From 68f8f3ac672553d47aa42c8dfe20f31c2258d3d9 Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sun, 10 May 2026 13:30:45 -0400 Subject: [PATCH 01/18] =?UTF-8?q?WIP:=20T-Anthropic-Wire=20coproduct=20sli?= =?UTF-8?q?ce=202=20=E2=80=94=20Anthropic=20tool=5Fresult=5Fcontent=20wire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dsl/extdeps/llm/anthropic.dag | 60 +++++++---- dsl/std/serialization.dag | 11 ++ src/v2/04_emit_info.dag | 4 + src/v2/04_infer.dag | 61 +++++++++++ src/v2/05_emit_rust.dag | 185 ++++++++++++++++++++++++++-------- 5 files changed, 261 insertions(+), 60 deletions(-) diff --git a/dsl/extdeps/llm/anthropic.dag b/dsl/extdeps/llm/anthropic.dag index b0c13cb7432..e075f1f4e26 100644 --- a/dsl/extdeps/llm/anthropic.dag +++ b/dsl/extdeps/llm/anthropic.dag @@ -8,7 +8,7 @@ // module extdeps.llm.anthropic -import extdeps.llm.llm { TokenUsage, llm_snake_wire_contract, ContentBlock } +import extdeps.llm.llm { TokenUsage, llm_snake_wire_contract, ImageSource } import std.errors { AnthropicErrorShape } import std.credentials { CredentialSource, EnvVar } import std.serialization { CoproductWireContract, VariantEncoding } @@ -32,6 +32,29 @@ data anthropic_assistant_content_block_wire_contract: CoproductWireContract = { encoding: InternallyTaggedObject { tag_field: "type", naming: StripPrefixSuffixAndSnakeCase { prefix: "Assistant", suffix: "Block" } } } +// Wire: tool_result `content` is either a scalar UTF-8 string or a JSON array of +// typed content blocks. CoproductWireContract + `UntaggedJsonStringOrArray` +// captures that dispatch for the v2 Rust emitter. +data anthropic_tool_result_content_wire_contract: CoproductWireContract = { + coproduct: "AnthropicToolResultContent", + encoding: UntaggedJsonStringOrArray { + string_variant: "ToolResultText", + string_field: "text", + array_variant: "ToolResultBlocks", + array_field: "blocks" + } +} + +// Nested blocks inside `ToolResultBlocks.blocks[]`: Anthropic-only kinds plus +// mirrored text/image coordinates (shared `ContentBlock` stays in `llm.dag`). +// 🟡 SCAFFOLD — trigger: Anthropic adds/removes tool-result nested block kinds +// beyond document, search_result, tool_reference; tighten to 🟢 when the +// Messages input block set is closed for modeled models. +data anthropic_tool_result_block_wire_contract: CoproductWireContract = { + coproduct: "AnthropicToolResultBlock", + encoding: InternallyTaggedObject { tag_field: "type", naming: StripPrefixSuffixAndSnakeCase { prefix: "Anthropic", suffix: "Block" } } +} + data anthropic_messages_200_content_block_wire_contract: CoproductWireContract = { coproduct: "AnthropicMessages200ContentBlock", encoding: InternallyTaggedObject { tag_field: "type", naming: StripPrefixSuffixAndSnakeCase { prefix: "Messages", suffix: "Block" } } @@ -60,18 +83,22 @@ data models: List = [ // -- Anthropic content blocks (provider-specific) --------------------- // Extends the shared ContentBlock (llm.dag) with tool-use blocks. -// 🟢 TERMINAL provider-domain coproduct for tool-result content. Anthropic -// accepts either a scalar text result or a nested content-block list for image -// capable tool responses. This keeps scalar text as an explicit arm and reuses -// the shared `ContentBlock` coordinates for nested text/image blocks. Document, -// search-result, and tool-reference nested blocks remain gap-carried below. +// 🟢 TERMINAL provider-domain coproduct for nested tool-result blocks. Text/image +// mirror shared wire tags; document, search_result, and tool_reference are +// Anthropic-only arms (see `anthropic_tool_result_block_wire_contract`). +type AnthropicToolResultBlock + = AnthropicTextBlock { text: String } + | AnthropicImageBlock { source: ImageSource } + | AnthropicDocumentBlock { source: Json } + | AnthropicSearchResultBlock { content: List, source: String, title: String } + | AnthropicToolReferenceBlock { tool_name: String } + +// 🟢 TERMINAL provider-domain coproduct for tool-result content. Scalar text vs +// nested block-array dispatch is ratcheted by `anthropic_tool_result_content_wire_contract` +// (`UntaggedJsonStringOrArray`); nested rows use `AnthropicToolResultBlock`. type AnthropicToolResultContent = ToolResultText { text: String } - | ToolResultBlocks { blocks: List } - -data structural_coverage_gap_anthropic_tool_result_additive_blocks: List = [ - "closure:anthropic_tool_result_additive_blocks|AnthropicToolResultContent.ToolResultBlocks|missing:document|missing:search_result|missing:tool_reference" -] + | ToolResultBlocks { blocks: List } // 🟢 TERMINAL provider-domain coproduct for user-message content. `UserTextBlock` // and `UserToolResultBlock` are role-legal Anthropic Messages content rows; the @@ -223,17 +250,12 @@ data structural_coverage_gap_anthropic_messages_200_residual: List = [ // Request wire: Messages API expects string `role` + flat `content[]` objects // keyed by `type` (https://docs.anthropic.com/en/api/messages). These rows are // now source-level `CoproductWireContract` authorities above; the v2 Rust -// emitter consumes them directly for serde attributes. Nested tool-result -// `content` scalar-vs-block-array wire shape remains gap-carried separately -// below; these paid rows cover the outer request coproduct discriminators only. +// emitter consumes them directly for serde attributes. data rest_request_wire_serde_alignment_receipt: List = [ "closure:rest_request_wire_serde_alignment|llm.Anthropic.Messages|AnthropicChatMessage|paid:role_internally_tagged_object_user_assistant", "closure:rest_request_wire_serde_alignment|llm.Anthropic.Messages|AnthropicUserContentBlock|paid:type_internally_tagged_object_text_tool_result", - "closure:rest_request_wire_serde_alignment|llm.Anthropic.Messages|AnthropicAssistantContentBlock|paid:type_internally_tagged_object_text_tool_use" -] - -data structural_coverage_gap_anthropic_tool_result_content_wire_shape: List = [ - "closure:rest_request_wire_serde_alignment|llm.Anthropic.Messages|AnthropicUserContentBlock.UserToolResultBlock.content|residue:tool_result_content_must_serialize_scalar_text_or_content_block_array|trigger:emitted serde for AnthropicToolResultContent serializes ToolResultText as scalar string and ToolResultBlocks as content block array" + "closure:rest_request_wire_serde_alignment|llm.Anthropic.Messages|AnthropicAssistantContentBlock|paid:type_internally_tagged_object_text_tool_use", + "closure:rest_request_wire_serde_alignment|llm.Anthropic.Messages|AnthropicUserContentBlock.UserToolResultBlock.content|paid:tool_result_content_scalar_or_block_array" ] // -- Service: REST transport wiring ------------------------------ diff --git a/dsl/std/serialization.dag b/dsl/std/serialization.dag index 38610827093..b243c7aee5f 100644 --- a/dsl/std/serialization.dag +++ b/dsl/std/serialization.dag @@ -47,11 +47,22 @@ type VariantNaming // UntaggedVariant: serde-style untagged alternatives. Use only when the wire // shape is determined by payload JSON shape rather than a discriminator field // (for example string-or-array provider request fields). +// UntaggedJsonStringOrArray: JSON union where one arm is a bare string and the +// other is a bare JSON array (Anthropic `tool_result.content`). The Rust emitter +// lowers the two named variants to `#[serde(untagged)]` tuple payloads so the +// string arm serializes as a scalar and the array arm as `Vec<...>` without a +// wrapper object (`{"blocks":[...]}` is rejected on the wire). type VariantEncoding = StringVariant { naming: VariantNaming } | InternallyTaggedObject { tag_field: String, naming: VariantNaming } | UntaggedVariant | TaggedVariant + | UntaggedJsonStringOrArray { + string_variant: String + string_field: String + array_variant: String + array_field: String + } // Declaration-level override. Selection order is: // 1. CoproductWireContract for the exact coproduct declaration. diff --git a/src/v2/04_emit_info.dag b/src/v2/04_emit_info.dag index f5aa70a365c..3fcbf3e3acc 100644 --- a/src/v2/04_emit_info.dag +++ b/src/v2/04_emit_info.dag @@ -74,6 +74,9 @@ type EmitGraphInfo { // Used by pattern emission to decide Variant vs Variant { .. }. // Keys are "EnumName::VariantName" for variants that carry fields. fielded_variants: Set + // Variants emitted as single-field tuple forms for `UntaggedJsonStringOrArray` + // wire contracts (same `EnumName::VariantName` keys as fielded_variants). + untagged_json_tuple_variants: Set // Per-type sharing decision: type names that need shared-pointer // wrapping (Rc in Rust). Computed from type_summaries × // recursive_type_set. The Rust emitter also adds collection types. @@ -117,6 +120,7 @@ fn empty_emit_graph_info() -> EmitGraphInfo { type_summaries: empty_map(), recursive_type_set: empty_set(), fielded_variants: empty_set(), + untagged_json_tuple_variants: empty_set(), shared_types: empty_set(), ownership_index: empty_map(), movable: empty_set(), diff --git a/src/v2/04_infer.dag b/src/v2/04_infer.dag index 8019664c75f..5d201146e04 100644 --- a/src/v2/04_infer.dag +++ b/src/v2/04_infer.dag @@ -5929,6 +5929,65 @@ fn collect_parent_envs(resolved: ResolvedModule, module_index: Map String? { + match n.expr_data { + ExprLiteral { value: lv } => match lv { + LitStr { value: s } => Some { value: s } + _ => none + } + _ => none + } +} + +fn infer_field_value_by_name(record: Node, field_name: String, source_indices: Map) -> Node? { + match record.children |> filter(fi => field_init_node_name_at(n: fi, source_indices: source_indices) == field_name) |> first { + Some { value: fi } => Some { value: field_init_node_value(n: fi) } + None => none + } +} + +fn infer_record_string_field(record: Node, field_name: String, source_indices: Map) -> String? { + match infer_field_value_by_name(record: record, field_name: field_name, source_indices: source_indices) { + Some { value: vn } => infer_literal_string_value(n: vn) + None => none + } +} + +fn build_untagged_json_tuple_variants(modules: List) -> Set { + modules |> fold(init: empty_set(), f: (acc, m) => + let si = m.type_env.source_indices + m.items |> fold(init: acc, f: (inner, item) => + if item_kind(item: item) == DataItem { + match item.body { + Some { value: body } => + match infer_record_string_field(record: body, field_name: "coproduct", source_indices: si) { + Some { value: coproduct_name } => + match infer_field_value_by_name(record: body, field_name: "encoding", source_indices: si) { + Some { value: enc_node } => + if authored_name_at(source_indices: si, node: enc_node) == "UntaggedJsonStringOrArray" { + match infer_record_string_field(record: enc_node, field_name: "string_variant", source_indices: si) { + Some { value: sv } => + match infer_record_string_field(record: enc_node, field_name: "array_variant", source_indices: si) { + Some { value: av } => + let k1 = concat(coproduct_name, "::", sv) + let k2 = concat(coproduct_name, "::", av) + set_insert(set_insert(inner, k1), k2) + None => inner + } + None => inner + } + } else { inner } + None => inner + } + None => inner + } + None => inner + } + } else { inner } + ) + ) +} + fn build_fielded_variants(modules: List, type_summaries: Map) -> Set { let result = modules |> fold(init: empty_set(), f: (acc, m) => @@ -5971,11 +6030,13 @@ fn build_emit_graph_info(modules: List) -> EmitGraphInfo { ) ) let fielded = build_fielded_variants(modules: modules, type_summaries: built.type_summaries) + let untagged_tuples = build_untagged_json_tuple_variants(modules: modules) let vtoe = derive_variant_to_enum(type_summaries: built.type_summaries) EmitGraphInfo { type_summaries: built.type_summaries, recursive_type_set: all_recursive, fielded_variants: fielded, + untagged_json_tuple_variants: untagged_tuples, shared_types: empty_set(), ownership_index: empty_map(), movable: empty_set(), diff --git a/src/v2/05_emit_rust.dag b/src/v2/05_emit_rust.dag index b71fabf7dbc..307b0eed43b 100644 --- a/src/v2/05_emit_rust.dag +++ b/src/v2/05_emit_rust.dag @@ -233,6 +233,10 @@ type RustEnumWireSerde { rename_suffix: String? rename_style: String? error_message: String? + untagged_string_variant: String? + untagged_string_field: String? + untagged_array_variant: String? + untagged_array_field: String? } fn rust_serde_policy(enum_attr: String, rename_prefix: String?, rename_suffix: String?, rename_style: String?) -> RustEnumWireSerde { @@ -241,7 +245,11 @@ fn rust_serde_policy(enum_attr: String, rename_prefix: String?, rename_suffix: S rename_prefix: rename_prefix, rename_suffix: rename_suffix, rename_style: rename_style, - error_message: none + error_message: none, + untagged_string_variant: none, + untagged_string_field: none, + untagged_array_variant: none, + untagged_array_field: none } } @@ -251,7 +259,11 @@ fn rust_serde_policy_error(message: String) -> RustEnumWireSerde { rename_prefix: none, rename_suffix: none, rename_style: none, - error_message: Some { value: message } + error_message: Some { value: message }, + untagged_string_variant: none, + untagged_string_field: none, + untagged_array_variant: none, + untagged_array_field: none } } @@ -424,6 +436,36 @@ fn rust_internal_policy_for_encoding(encoding: Node, source_indices: Map) -> RustEnumWireSerde { + match record_string_field(record: encoding, field_name: "string_variant", source_indices: source_indices) { + Some { value: sv } => + match record_string_field(record: encoding, field_name: "string_field", source_indices: source_indices) { + Some { value: sf } => + match record_string_field(record: encoding, field_name: "array_variant", source_indices: source_indices) { + Some { value: av } => + match record_string_field(record: encoding, field_name: "array_field", source_indices: source_indices) { + Some { value: af } => + RustEnumWireSerde { + enum_attr: "#[serde(untagged)]", + rename_prefix: none, + rename_suffix: none, + rename_style: none, + error_message: none, + untagged_string_variant: Some { value: sv }, + untagged_string_field: Some { value: sf }, + untagged_array_variant: Some { value: av }, + untagged_array_field: Some { value: af } + } + None => rust_serde_error_policy(message: "UntaggedJsonStringOrArray requires literal array_field") + } + None => rust_serde_error_policy(message: "UntaggedJsonStringOrArray requires literal array_variant") + } + None => rust_serde_error_policy(message: "UntaggedJsonStringOrArray requires literal string_field") + } + None => rust_serde_error_policy(message: "UntaggedJsonStringOrArray requires literal string_variant") + } +} + // Resolve serde enum attribute from a module-level wire_contract data item. // Reads WireContract.variant_encoding to determine the serde attribute: // StringVariant { naming: AsAuthored } → "" (serde default: unit variants as strings) @@ -447,6 +489,8 @@ fn resolve_wire_serde_policy_from_encoding_node(ve: Node, source_indices: Map String? { } fn wire_variant_rename_attr_for_policy(authored: String, policy: RustEnumWireSerde) -> String { - match policy.rename_style { - Some { value: style } => - if style == "StripAffixAndSnakeCase" { - let without_prefix = match policy.rename_prefix { - Some { value: prefix } => match string_without_prefix(value: authored, prefix: prefix) { - Some { value: stripped } => stripped - None => return "" - } - None => authored - } - let without_suffix = match policy.rename_suffix { - Some { value: suffix } => match string_without_suffix(value: without_prefix, suffix: suffix) { - Some { value: stripped } => stripped - None => return "" + match policy.untagged_string_variant { + Some { value: _ } => "" + None => + match policy.rename_style { + Some { value: style } => + if style == "StripAffixAndSnakeCase" { + let without_prefix = match policy.rename_prefix { + Some { value: prefix } => match string_without_prefix(value: authored, prefix: prefix) { + Some { value: stripped } => stripped + None => return "" + } + None => authored + } + let without_suffix = match policy.rename_suffix { + Some { value: suffix } => match string_without_suffix(value: without_prefix, suffix: suffix) { + Some { value: stripped } => stripped + None => return "" + } + None => without_prefix + } + concat(" #[serde(rename = \"", to_snake(name: without_suffix), "\")]\n") + } else { + "" } - None => without_prefix - } - concat(" #[serde(rename = \"", to_snake(name: without_suffix), "\")]\n") - } else { - "" + None => "" } - None => "" } } fn variant_rename_validation_for_policy(authored: String, policy: RustEnumWireSerde) -> String { - match policy.rename_style { - Some { value: style } => - if style == "StripAffixAndSnakeCase" { - let without_prefix = match policy.rename_prefix { - Some { value: prefix } => match string_without_prefix(value: authored, prefix: prefix) { - Some { value: stripped } => stripped - None => return emit_rust_compile_error_item(message: concat("variant ", authored, " does not satisfy declared wire rename prefix: ", prefix)) - } - None => authored - } - match policy.rename_suffix { - Some { value: suffix } => match string_without_suffix(value: without_prefix, suffix: suffix) { - Some { value: _ } => "" - None => emit_rust_compile_error_item(message: concat("variant ", authored, " does not satisfy declared wire rename suffix: ", suffix)) + match policy.untagged_string_variant { + Some { value: _ } => "" + None => + match policy.rename_style { + Some { value: style } => + if style == "StripAffixAndSnakeCase" { + let without_prefix = match policy.rename_prefix { + Some { value: prefix } => match string_without_prefix(value: authored, prefix: prefix) { + Some { value: stripped } => stripped + None => return emit_rust_compile_error_item(message: concat("variant ", authored, " does not satisfy declared wire rename prefix: ", prefix)) + } + None => authored + } + match policy.rename_suffix { + Some { value: suffix } => match string_without_suffix(value: without_prefix, suffix: suffix) { + Some { value: _ } => "" + None => emit_rust_compile_error_item(message: concat("variant ", authored, " does not satisfy declared wire rename suffix: ", suffix)) + } + None => "" + } + } else { + "" } - None => "" - } - } else { - "" + None => "" } - None => "" } } @@ -1833,6 +1885,57 @@ fn variant_rename_validations_for_policy(children: List, env: TypeEnv, ser |> join(separator: "\n") } +fn untagged_json_tuple_variant_shape_validations(children: List, env: TypeEnv, serde_policy: RustEnumWireSerde) -> String { + match serde_policy.untagged_string_variant { + Some { value: sv } => + let sf = match serde_policy.untagged_string_field { Some { value: x } => x, None => "" } + let av = match serde_policy.untagged_array_variant { Some { value: x } => x, None => "" } + let af = match serde_policy.untagged_array_field { Some { value: x } => x, None => "" } + if sf == "" || av == "" || af == "" { + emit_rust_compile_error_item(message: "UntaggedJsonStringOrArray requires string_field, array_variant, and array_field literals") + } else if children |> count != 2 { + emit_rust_compile_error_item(message: "UntaggedJsonStringOrArray coproduct must have exactly two variants") + } else { + let diags = children |> flat_map(child => + let nm = authored_name(env: env, node: child) + if child.children |> count == 0 { + [emit_rust_compile_error_item(message: concat("UntaggedJsonStringOrArray requires fielded variants; got unit ", nm))] + } else if nm == sv { + let field_names = child.children |> map(f => authored_name(env: env, node: f)) + if field_names |> count != 1 { + [emit_rust_compile_error_item(message: concat("UntaggedJsonStringOrArray string arm ", sv, " must declare exactly one field"))] + } else { + match field_names |> first { + Some { value: only } => + if only != sf { + [emit_rust_compile_error_item(message: concat("UntaggedJsonStringOrArray string arm field must be named ", sf))] + } else { [] } + None => [emit_rust_compile_error_item(message: "UntaggedJsonStringOrArray string arm field name missing")] + } + } + } else if nm == av { + let field_names = child.children |> map(f => authored_name(env: env, node: f)) + if field_names |> count != 1 { + [emit_rust_compile_error_item(message: concat("UntaggedJsonStringOrArray array arm ", av, " must declare exactly one field"))] + } else { + match field_names |> first { + Some { value: only } => + if only != af { + [emit_rust_compile_error_item(message: concat("UntaggedJsonStringOrArray array arm field must be named ", af))] + } else { [] } + None => [emit_rust_compile_error_item(message: "UntaggedJsonStringOrArray array arm field name missing")] + } + } + } else { + [emit_rust_compile_error_item(message: concat("UntaggedJsonStringOrArray unexpected variant ", nm))] + } + ) + diags |> filter(t => t != "") |> join(separator: "\n") + } + None => "" + } +} + fn emit_variant_from_child(child: Node, recursive_types: Set, shared_types: Set, env: TypeEnv, serde_policy: RustEnumWireSerde) -> String { let child_text = authored_name(env: env, node: child) let rename_attr = wire_variant_rename_attr_for_policy(authored: child_text, policy: serde_policy) From 231fb9d547b9a1d610b721845f60164da7bc7094 Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sun, 10 May 2026 13:34:53 -0400 Subject: [PATCH 02/18] =?UTF-8?q?WIP:=20T-Anthropic-Wire=20coproduct=20sli?= =?UTF-8?q?ce=202=20=E2=80=94=20Anthropic=20tool=5Fresult=5Fcontent=20wire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/v2/05_emit_rust.dag | 291 +++++++++++++++++++++++++++++----------- 1 file changed, 210 insertions(+), 81 deletions(-) diff --git a/src/v2/05_emit_rust.dag b/src/v2/05_emit_rust.dag index 307b0eed43b..b5b55cbcf3c 100644 --- a/src/v2/05_emit_rust.dag +++ b/src/v2/05_emit_rust.dag @@ -1052,6 +1052,7 @@ fn emit_rust(typed: ResolvedGraph) -> EmitResult { type_summaries: base_info.type_summaries, recursive_type_set: base_info.recursive_type_set, fielded_variants: base_info.fielded_variants, + untagged_json_tuple_variants: base_info.untagged_json_tuple_variants, shared_types: shared, ownership_index: ownership.ownership_index, movable: empty_set(), @@ -1170,6 +1171,7 @@ fn emit_module(typed_module: TypedModule, registry: Map) -> Te type_summaries: base_info.type_summaries, recursive_type_set: base_info.recursive_type_set, fielded_variants: base_info.fielded_variants, + untagged_json_tuple_variants: base_info.untagged_json_tuple_variants, shared_types: shared, ownership_index: base_info.ownership_index, movable: base_info.movable, @@ -1452,6 +1454,7 @@ fn emit_typed_item(item: Node, module_name: String, registry: Map, share } } let rename_validations = variant_rename_validations_for_policy(children: item.children, env: env, serde_policy: serde_policy) + let untagged_validations = untagged_json_tuple_variant_shape_validations(children: item.children, env: env, serde_policy: serde_policy) let policy_validation = match serde_policy.error_message { Some { value: message } => emit_rust_compile_error_item(message: message) None => "" } - let validations = if policy_validation == "" { + let validations1 = if policy_validation == "" { rename_validations } else if rename_validations == "" { policy_validation } else { concat(policy_validation, "\n", rename_validations) } + let validations2 = if validations1 == "" { + untagged_validations + } else if untagged_validations == "" { + validations1 + } else { + concat(validations1, "\n", untagged_validations) + } let enum_text = emit_enum_from_children(name: item_text, type_params: type_params, children: item.children, recursive_types: recursive_types, shared_types: shared_types, env: env, serde_policy: serde_policy) - if validations == "" { + if validations2 == "" { enum_text } else { - concat(validations, "\n", enum_text) + concat(validations2, "\n", enum_text) } } } @@ -1951,17 +1962,51 @@ fn emit_variant_from_child(child: Node, recursive_types: Set, shared_typ } else { ty } concat(rename_attr, " ", child_text, "(", final_ty, "),") } else { - // Fielded variant -- child's children are the variant's fields - let field_lines = child.children |> map(f => - let rt_f = resolved_type(n: f) - let ty = render_rust_type(n: rt_f, shared_types: shared_types, source_indices: env.source_indices) - let final_ty = if needs_box_wrapping(n: rt_f, recursive_types: recursive_types, shared_types: shared_types, source_indices: env.source_indices) { - concat("Box<", ty, ">") - } else { ty } - concat(" ", emit_ident(name: authored_name(env: env, node: f), target: Rust), ": ", final_ty, ",") - ) - let fields_str = field_lines |> join(separator: "\n") - concat(rename_attr, " ", child_text, " {\n", fields_str, "\n },") + match serde_policy.untagged_string_variant { + Some { value: sv } => + let sf = match serde_policy.untagged_string_field { Some { value: x } => x, None => "" } + let av = match serde_policy.untagged_array_variant { Some { value: x } => x, None => "" } + let af = match serde_policy.untagged_array_field { Some { value: x } => x, None => "" } + if child_text == sv { + let matched = child.children |> filter(f => authored_name(env: env, node: f) == sf) + match matched |> first { + Some { value: f } => + let rt_f = resolved_type(n: f) + let ty = render_rust_type(n: rt_f, shared_types: shared_types, source_indices: env.source_indices) + let final_ty = if needs_box_wrapping(n: rt_f, recursive_types: recursive_types, shared_types: shared_types, source_indices: env.source_indices) { + concat("Box<", ty, ">") + } else { ty } + concat(rename_attr, " ", child_text, "(", final_ty, "),") + None => concat(emit_rust_compile_error_item(message: concat("internal: UntaggedJsonStringOrArray missing field ", sf)), "\n ", child_text, "{},") + } + } else if child_text == av { + let matched = child.children |> filter(f => authored_name(env: env, node: f) == af) + match matched |> first { + Some { value: f } => + let rt_f = resolved_type(n: f) + let ty = render_rust_type(n: rt_f, shared_types: shared_types, source_indices: env.source_indices) + let final_ty = if needs_box_wrapping(n: rt_f, recursive_types: recursive_types, shared_types: shared_types, source_indices: env.source_indices) { + concat("Box<", ty, ">") + } else { ty } + concat(rename_attr, " ", child_text, "(", final_ty, "),") + None => concat(emit_rust_compile_error_item(message: concat("internal: UntaggedJsonStringOrArray missing field ", af)), "\n ", child_text, "{},") + } + } else { + concat(emit_rust_compile_error_item(message: concat("internal: UntaggedJsonStringOrArray unexpected variant ", child_text)), "\n ", child_text, "{},") + } + None => + // Fielded variant -- child's children are the variant's fields + let field_lines = child.children |> map(f => + let rt_f = resolved_type(n: f) + let ty = render_rust_type(n: rt_f, shared_types: shared_types, source_indices: env.source_indices) + let final_ty = if needs_box_wrapping(n: rt_f, recursive_types: recursive_types, shared_types: shared_types, source_indices: env.source_indices) { + concat("Box<", ty, ">") + } else { ty } + concat(" ", emit_ident(name: authored_name(env: env, node: f), target: Rust), ": ", final_ty, ",") + ) + let fields_str = field_lines |> join(separator: "\n") + concat(rename_attr, " ", child_text, " {\n", fields_str, "\n },") + } } } @@ -2363,58 +2408,89 @@ fn emit_variant_pattern(name: String, parent_enum: String?, field_bindings: List None => qualified } } else if field_bindings |> count == 0 { - // Check qualified key first, then try all enum prefixes as fallback - // (handles cases where scrut_type is missing for field access expressions). let fielded_key = match resolved_parent { Some { value: parent } => concat(parent, "::", name) None => name } - let is_fielded = match map_get(emit_info.fielded_variants, fielded_key) { - Some { value: true } => true - _ => - // Strict: also check display-qualified name. No suffix scanning. - match map_get(emit_info.fielded_variants, qualified) { - Some { value: true } => true - _ => false - } + let is_untagged_tuple = set_contains(emit_info.untagged_json_tuple_variants, fielded_key) || set_contains(emit_info.untagged_json_tuple_variants, qualified) + if is_untagged_tuple { + concat(qualified, "(..)") + } else { + let is_fielded = match map_get(emit_info.fielded_variants, fielded_key) { + Some { value: true } => true + _ => + match map_get(emit_info.fielded_variants, qualified) { + Some { value: true } => true + _ => false + } + } + if is_fielded { concat(qualified, " { .. }") } else { qualified } } - if is_fielded { concat(qualified, " { .. }") } else { qualified } } else { let effective_bindings = field_bindings |> filter(fb => match field_binding_pattern(n: fb) { Wildcard => false _ => true } ) if effective_bindings |> count == 0 { - // All bindings are wildcards — check fielded_variants (same as count == 0 branch). let fielded_key2 = match resolved_parent { Some { value: parent } => concat(parent, "::", name) None => name } - let is_fielded2 = match map_get(emit_info.fielded_variants, fielded_key2) { - Some { value: true } => true - _ => - match map_get(emit_info.fielded_variants, qualified) { - Some { value: true } => true - _ => false - } + let is_untagged_tuple2 = set_contains(emit_info.untagged_json_tuple_variants, fielded_key2) || set_contains(emit_info.untagged_json_tuple_variants, qualified) + if is_untagged_tuple2 { + concat(qualified, "(..)") + } else { + let is_fielded2 = match map_get(emit_info.fielded_variants, fielded_key2) { + Some { value: true } => true + _ => + match map_get(emit_info.fielded_variants, qualified) { + Some { value: true } => true + _ => false + } + } + if is_fielded2 { concat(qualified, " { .. }") } else { qualified } } - if is_fielded2 { concat(qualified, " { .. }") } else { qualified } } else { - let binding_strs = effective_bindings |> map(fb => - let fb_name = field_binding_name_at(n: fb, source_indices: source_indices) - let fb_pat = field_binding_pattern(n: fb) - if is_string_lit_pattern(p: fb_pat) { - concat("ref ", emit_ident(name: fb_name, target: Rust)) - } else { + let tuple_key = match resolved_parent { + Some { value: parent } => concat(parent, "::", name) + None => qualified + } + let is_untagged_tuple3 = set_contains(emit_info.untagged_json_tuple_variants, tuple_key) || set_contains(emit_info.untagged_json_tuple_variants, qualified) + if is_untagged_tuple3 && effective_bindings |> count == 1 { + match effective_bindings |> first { + Some { value: fb } => + let fb_name = field_binding_name_at(n: fb, source_indices: source_indices) + let fb_pat = field_binding_pattern(n: fb) + if is_string_lit_pattern(p: fb_pat) { + concat(qualified, "(ref ", emit_ident(name: fb_name, target: Rust), ")") + } else { + let is_shorthand = match fb_pat { Bind { name: n } => n == fb_name _ => false } + if is_shorthand { + concat(qualified, "(", emit_ident(name: fb_name, target: Rust), ")") + } else { + let pat_str = emit_pattern(pattern: fb_pat, shared_types: shared_types, scrut_type: "", source_indices: source_indices, emit_info: emit_info) + concat(qualified, "(", pat_str, ")") + } + } + None => concat(qualified, " { .. }") + } + } else { + let binding_strs = effective_bindings |> map(fb => + let fb_name = field_binding_name_at(n: fb, source_indices: source_indices) + let fb_pat = field_binding_pattern(n: fb) + if is_string_lit_pattern(p: fb_pat) { + concat("ref ", emit_ident(name: fb_name, target: Rust)) + } else { let is_shorthand = match fb_pat { Bind { name: n } => n == fb_name _ => false } if is_shorthand { emit_ident(name: fb_name, target: Rust) } else { let pat_str = emit_pattern(pattern: fb_pat, shared_types: shared_types, scrut_type: "", source_indices: source_indices, emit_info: emit_info) concat(emit_ident(name: fb_name, target: Rust), ": ", pat_str) } - } - ) - let bindings_str = binding_strs |> join(separator: ", ") - concat(qualified, " { ", bindings_str, ", .. }") + } + ) + let bindings_str = binding_strs |> join(separator: ", ") + concat(qualified, " { ", bindings_str, ", .. }") + } } } } @@ -2552,63 +2628,99 @@ fn emit_variant_pattern_rc_aware(name: String, parent_enum: String?, field_bindi None => qualified } } else if field_bindings |> count == 0 { - // Check qualified key first, then try all enum prefixes as fallback - // (handles cases where scrut_type is missing for field access expressions). let fielded_key = match resolved_parent { Some { value: parent } => concat(parent, "::", name) None => name } - let is_fielded = match map_get(emit_info.fielded_variants, fielded_key) { - Some { value: true } => true - _ => - // Strict: also check display-qualified name. No suffix scanning. - match map_get(emit_info.fielded_variants, qualified) { - Some { value: true } => true - _ => false - } + let is_untagged_tuple = set_contains(emit_info.untagged_json_tuple_variants, fielded_key) || set_contains(emit_info.untagged_json_tuple_variants, qualified) + if is_untagged_tuple { + concat(qualified, "(..)") + } else { + let is_fielded = match map_get(emit_info.fielded_variants, fielded_key) { + Some { value: true } => true + _ => + match map_get(emit_info.fielded_variants, qualified) { + Some { value: true } => true + _ => false + } + } + if is_fielded { concat(qualified, " { .. }") } else { qualified } } - if is_fielded { concat(qualified, " { .. }") } else { qualified } } else { let effective_bindings = field_bindings |> filter(fb => match field_binding_pattern(n: fb) { Wildcard => false _ => true } ) if effective_bindings |> count == 0 { - // All bindings are wildcards — check fielded_variants (same as count == 0 branch). let fielded_key2 = match resolved_parent { Some { value: parent } => concat(parent, "::", name) None => name } - let is_fielded2 = match map_get(emit_info.fielded_variants, fielded_key2) { - Some { value: true } => true - _ => - match map_get(emit_info.fielded_variants, qualified) { - Some { value: true } => true - _ => false - } + let is_untagged_tuple2 = set_contains(emit_info.untagged_json_tuple_variants, fielded_key2) || set_contains(emit_info.untagged_json_tuple_variants, qualified) + if is_untagged_tuple2 { + concat(qualified, "(..)") + } else { + let is_fielded2 = match map_get(emit_info.fielded_variants, fielded_key2) { + Some { value: true } => true + _ => + match map_get(emit_info.fielded_variants, qualified) { + Some { value: true } => true + _ => false + } + } + if is_fielded2 { concat(qualified, " { .. }") } else { qualified } } - if is_fielded2 { concat(qualified, " { .. }") } else { qualified } } else { - let binding_strs = effective_bindings |> map(fb => - let fb_name = field_binding_name_at(n: fb, source_indices: source_indices) - let fb_pat = field_binding_pattern(n: fb) - if is_string_lit_pattern(p: fb_pat) { - concat("ref ", emit_ident(name: fb_name, target: Rust)) - } else { - if field_needs_rc_ref(field_name: fb_name, rc_analysis: rc_analysis) { + let tuple_key = match resolved_parent { + Some { value: parent } => concat(parent, "::", name) + None => qualified + } + let is_untagged_tuple3 = set_contains(emit_info.untagged_json_tuple_variants, tuple_key) || set_contains(emit_info.untagged_json_tuple_variants, qualified) + if is_untagged_tuple3 && effective_bindings |> count == 1 { + match effective_bindings |> first { + Some { value: fb } => + let fb_name = field_binding_name_at(n: fb, source_indices: source_indices) + let fb_pat = field_binding_pattern(n: fb) + if is_string_lit_pattern(p: fb_pat) { + concat(qualified, "(ref ", emit_ident(name: fb_name, target: Rust), ")") + } else { + if field_needs_rc_ref(field_name: fb_name, rc_analysis: rc_analysis) { + concat(qualified, "(ref ", emit_ident(name: fb_name, target: Rust), ")") + } else { + let is_shorthand = match fb_pat { Bind { name: n } => n == fb_name _ => false } + if is_shorthand { + concat(qualified, "(", emit_ident(name: fb_name, target: Rust), ")") + } else { + let inner_analysis = analyze_rc_pattern(pattern: fb_pat, scrut_type: "", shared_types: shared_types, emit_info: emit_info, source_indices: source_indices) + let pat_str = emit_pattern_rc_aware(pattern: fb_pat, rc_analysis: inner_analysis, shared_types: shared_types, scrut_type: "", source_indices: source_indices, emit_info: emit_info) + concat(qualified, "(", pat_str, ")") + } + } + } + None => concat(qualified, " { .. }") + } + } else { + let binding_strs = effective_bindings |> map(fb => + let fb_name = field_binding_name_at(n: fb, source_indices: source_indices) + let fb_pat = field_binding_pattern(n: fb) + if is_string_lit_pattern(p: fb_pat) { concat("ref ", emit_ident(name: fb_name, target: Rust)) } else { - let is_shorthand = match fb_pat { Bind { name: n } => n == fb_name _ => false } - if is_shorthand { emit_ident(name: fb_name, target: Rust) } - else { - let inner_analysis = analyze_rc_pattern(pattern: fb_pat, scrut_type: "", shared_types: shared_types, emit_info: emit_info, source_indices: source_indices) - let pat_str = emit_pattern_rc_aware(pattern: fb_pat, rc_analysis: inner_analysis, shared_types: shared_types, scrut_type: "", source_indices: source_indices, emit_info: emit_info) - concat(emit_ident(name: fb_name, target: Rust), ": ", pat_str) + if field_needs_rc_ref(field_name: fb_name, rc_analysis: rc_analysis) { + concat("ref ", emit_ident(name: fb_name, target: Rust)) + } else { + let is_shorthand = match fb_pat { Bind { name: n } => n == fb_name _ => false } + if is_shorthand { emit_ident(name: fb_name, target: Rust) } + else { + let inner_analysis = analyze_rc_pattern(pattern: fb_pat, scrut_type: "", shared_types: shared_types, emit_info: emit_info, source_indices: source_indices) + let pat_str = emit_pattern_rc_aware(pattern: fb_pat, rc_analysis: inner_analysis, shared_types: shared_types, scrut_type: "", source_indices: source_indices, emit_info: emit_info) + concat(emit_ident(name: fb_name, target: Rust), ": ", pat_str) + } } } - } - ) - let bindings_str = binding_strs |> join(separator: ", ") - concat(qualified, " { ", bindings_str, ", .. }") + ) + let bindings_str = binding_strs |> join(separator: ", ") + concat(qualified, " { ", bindings_str, ", .. }") + } } } } @@ -3675,6 +3787,7 @@ fn emit_rust_fold_method_call(method_call_node: Node, fold_accumulator_type: Nod type_summaries: emit_info.type_summaries, recursive_type_set: emit_info.recursive_type_set, fielded_variants: emit_info.fielded_variants, + untagged_json_tuple_variants: emit_info.untagged_json_tuple_variants, shared_types: emit_info.shared_types, ownership_index: emit_info.ownership_index, movable: emit_info.movable, @@ -3697,6 +3810,7 @@ fn emit_rust_fold_method_call(method_call_node: Node, fold_accumulator_type: Nod type_summaries: emit_info.type_summaries, recursive_type_set: emit_info.recursive_type_set, fielded_variants: emit_info.fielded_variants, + untagged_json_tuple_variants: emit_info.untagged_json_tuple_variants, shared_types: emit_info.shared_types, ownership_index: emit_info.ownership_index, movable: map_insert(emit_info.movable, acc_name, true), @@ -4434,6 +4548,21 @@ fn emit_typed_record_lit(type_name: String?, fields: List, parent_enum: St // emit_typed_record_lit produces raw struct expressions. empty_raw } else { + if fields |> count == 1 && set_contains(emit_info.untagged_json_tuple_variants, display_tn) { + match fields |> first { + Some { value: f } => + let f_name = field_init_node_name_at(n: f, source_indices: scope.type_env.source_indices) + let f_value = field_init_node_value(n: f) + let val_str = emit_field_value_with_context(field_value: f_value, struct_node: resolved_type, outer_type_name: type_name, field_name: f_name, registry: registry, scope: scope, depth: depth, shared_types: shared_types, emit_info: emit_info) + let needs_wrap = is_optional_struct_field(emit_info: emit_info, struct_name: tn, field_name: f_name) + && is_already_optional(texpr: f_value, emit_info: emit_info, scope: scope) == false + let field_val = if needs_wrap { + concat("Some(", val_str, ")") + } else { val_str } + concat(display_tn, "(", field_val, ")") + None => concat(display_tn, " {}") + } + } else { let field_strs = fields |> map(f => let f_name = field_init_node_name_at(n: f, source_indices: scope.type_env.source_indices) let f_value = field_init_node_value(n: f) From d55d04adf1bd674dbee109e3f6c23adda5a14367 Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sun, 10 May 2026 13:40:28 -0400 Subject: [PATCH 03/18] =?UTF-8?q?WIP:=20T-Anthropic-Wire=20coproduct=20sli?= =?UTF-8?q?ce=202=20=E2=80=94=20Anthropic=20tool=5Fresult=5Fcontent=20wire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/v2/05_emit_rust.dag | 1 + 1 file changed, 1 insertion(+) diff --git a/src/v2/05_emit_rust.dag b/src/v2/05_emit_rust.dag index b5b55cbcf3c..f2874fea3a8 100644 --- a/src/v2/05_emit_rust.dag +++ b/src/v2/05_emit_rust.dag @@ -4616,6 +4616,7 @@ fn emit_typed_record_lit(type_name: String?, fields: List, parent_enum: St // Rc wrapping is the caller's responsibility (data_decl_body, emit_typed_expr, etc.). // emit_typed_record_lit produces raw struct expressions. raw + } } } } From 092a55f3b796c62b67ac7d3184a041de920c17ca Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sun, 10 May 2026 13:45:53 -0400 Subject: [PATCH 04/18] =?UTF-8?q?WIP:=20T-Anthropic-Wire=20coproduct=20sli?= =?UTF-8?q?ce=202=20=E2=80=94=20Anthropic=20tool=5Fresult=5Fcontent=20wire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/v2/04_infer.dag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/v2/04_infer.dag b/src/v2/04_infer.dag index 5d201146e04..3ee52ca7aca 100644 --- a/src/v2/04_infer.dag +++ b/src/v2/04_infer.dag @@ -5957,7 +5957,7 @@ fn build_untagged_json_tuple_variants(modules: List) -> Set modules |> fold(init: empty_set(), f: (acc, m) => let si = m.type_env.source_indices m.items |> fold(init: acc, f: (inner, item) => - if item_kind(item: item) == DataItem { + if (item_kind(item: item) == DataItem) { match item.body { Some { value: body } => match infer_record_string_field(record: body, field_name: "coproduct", source_indices: si) { From 594ac6e930f529fed3f88cb42a67118ce6cc6655 Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sun, 10 May 2026 13:49:16 -0400 Subject: [PATCH 05/18] =?UTF-8?q?WIP:=20T-Anthropic-Wire=20coproduct=20sli?= =?UTF-8?q?ce=202=20=E2=80=94=20Anthropic=20tool=5Fresult=5Fcontent=20wire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/v2/stage0/src/compiler_tests.rs | 598 +- .../stage0/src/extdeps_languages_dag_emit.rs | 6 +- .../src/extdeps_languages_dag_syntax.rs | 420 +- .../stage0/src/extdeps_languages_dag_types.rs | 8 +- .../stage0/src/extdeps_languages_go_emit.rs | 6 +- .../stage0/src/extdeps_languages_go_syntax.rs | 280 +- .../stage0/src/extdeps_languages_go_types.rs | 12 +- .../src/extdeps_languages_python_emit.rs | 6 +- .../src/extdeps_languages_python_syntax.rs | 296 +- .../src/extdeps_languages_python_types.rs | 10 +- .../stage0/src/extdeps_languages_rust_emit.rs | 100 +- .../src/extdeps_languages_rust_syntax.rs | 406 +- .../src/extdeps_languages_rust_types.rs | 20 +- .../generated_method_template_projection.rs | 6 +- src/v2/stage0/src/lib.rs | 82 +- src/v2/stage0/src/main.rs | 86 +- src/v2/stage0/src/std_algebra.rs | 1965 +- src/v2/stage0/src/std_coercion.rs | 32 +- src/v2/stage0/src/std_computation.rs | 270 +- src/v2/stage0/src/std_effects.rs | 267 +- src/v2/stage0/src/std_error_primitives.rs | 18 +- src/v2/stage0/src/std_graph.rs | 347 +- src/v2/stage0/src/std_http_path.rs | 335 +- src/v2/stage0/src/std_induction.rs | 1127 +- src/v2/stage0/src/std_iteration.rs | 8 +- src/v2/stage0/src/std_node.rs | 182 +- src/v2/stage0/src/std_syntax.rs | 86 +- src/v2/stage0/src/std_termination.rs | 201 +- src/v2/stage0/src/std_types.rs | 121 +- src/v2/stage0/src/v2_compiler_artifact.rs | 55 +- src/v2/stage0/src/v2_compiler_coercion.rs | 440 +- src/v2/stage0/src/v2_compiler_compile.rs | 2537 +- .../src/v2_compiler_compiler_tests_rust.rs | 231 +- src/v2/stage0/src/v2_compiler_complexity.rs | 12288 +++------- .../src/v2_compiler_effect_derivation.rs | 56 +- src/v2/stage0/src/v2_compiler_emit.rs | 6870 ++---- src/v2/stage0/src/v2_compiler_emit_go.rs | 1829 +- src/v2/stage0/src/v2_compiler_emit_python.rs | 1581 +- src/v2/stage0/src/v2_compiler_emit_rust.rs | 18420 ++++---------- src/v2/stage0/src/v2_compiler_infer.rs | 16115 +++++-------- src/v2/stage0/src/v2_compiler_infer_access.rs | 266 +- src/v2/stage0/src/v2_compiler_infer_cycle.rs | 366 +- .../stage0/src/v2_compiler_infer_emit_info.rs | 714 +- src/v2/stage0/src/v2_compiler_infer_env.rs | 279 +- src/v2/stage0/src/v2_compiler_infer_items.rs | 180 +- src/v2/stage0/src/v2_compiler_infer_lookup.rs | 751 +- src/v2/stage0/src/v2_compiler_infer_method.rs | 208 +- .../stage0/src/v2_compiler_infer_patterns.rs | 484 +- .../stage0/src/v2_compiler_infer_resolve.rs | 3834 ++- .../stage0/src/v2_compiler_infer_service.rs | 472 +- src/v2/stage0/src/v2_compiler_infer_sigs.rs | 572 +- src/v2/stage0/src/v2_compiler_infer_types.rs | 3226 +-- src/v2/stage0/src/v2_compiler_languages.rs | 1750 +- src/v2/stage0/src/v2_compiler_normalize.rs | 249 +- src/v2/stage0/src/v2_compiler_ownership.rs | 1492 +- src/v2/stage0/src/v2_compiler_parse.rs | 20067 +++++++--------- src/v2/stage0/src/v2_compiler_resolve.rs | 920 +- src/v2/stage0/src/v2_compiler_runtime_rust.rs | 88 +- src/v2/stage0/src/v2_compiler_tokenize.rs | 1000 +- src/v2/stage0/src/v2_compiler_trace.rs | 225 +- src/v2/stage0/src/v2_rt.rs | 187 +- src/v2/stage0/src/v2_std_core.rs | 3419 +-- 62 files changed, 36343 insertions(+), 72129 deletions(-) diff --git a/src/v2/stage0/src/compiler_tests.rs b/src/v2/stage0/src/compiler_tests.rs index 090fdc8a468..5b1482a6d38 100644 --- a/src/v2/stage0/src/compiler_tests.rs +++ b/src/v2/stage0/src/compiler_tests.rs @@ -1,7 +1,7 @@ #[cfg(test)] mod compiler_tests { - use crate::v2_compiler_tokenize::tokenize; use std::collections::HashMap; + use crate::v2_compiler_tokenize::tokenize; /// Find workspace root by walking up from the current directory looking for Cargo.toml + dsl/ fn workspace_root() -> std::path::PathBuf { @@ -92,11 +92,9 @@ mod compiler_tests { crate::v2_std_core::diagnostic_to_message(err.diagnostic.clone()) ); } - parsed - .result - .module - .clone() - .unwrap_or_else(|| panic!("{} produced no module while building source closure", path)) + parsed.result.module.clone().unwrap_or_else(|| { + panic!("{} produced no module while building source closure", path) + }) } fn module_path_from_source(path: &str, content: &str) -> String { @@ -111,7 +109,9 @@ mod compiler_tests { .collect() } - fn build_source_index(roots: &[&str]) -> HashMap { + fn build_source_index( + roots: &[&str], + ) -> HashMap { let mut index = HashMap::new(); for root in roots { for (path, content) in discover_dag_files(root) { @@ -119,7 +119,9 @@ mod compiler_tests { if let Some((existing, _)) = index.get(&module_path) { panic!( "duplicate module path '{}': declared in both {} and {}", - module_path, existing, path + module_path, + existing, + path ); } index.insert(module_path, (path, content)); @@ -133,8 +135,7 @@ mod compiler_tests { roots: &[&str], ) -> Vec> { let index = build_source_index(roots); - let mut seen = - HashMap::>::new(); + let mut seen = HashMap::>::new(); let mut queue = Vec::new(); for (path, content) in entry_pairs { @@ -214,10 +215,7 @@ mod compiler_tests { #[test] fn tokenize_produces_tokens() { - let tokens = tokenize( - &"fn foo() -> Int { 42 }".to_string(), - "test.dag".to_string(), - ); + let tokens = tokenize(&"fn foo() -> Int { 42 }".to_string(), "test.dag".to_string()); assert!( !tokens.is_empty(), "tokenize should produce at least one token" @@ -269,10 +267,7 @@ mod compiler_tests { &"module test\ntype Foo { x: Int }\n".to_string(), "test.dag".to_string(), ); - let result = crate::v2_compiler_parse::parse( - tokens, - std::rc::Rc::new(std::collections::HashMap::new()), - ); + let result = crate::v2_compiler_parse::parse(tokens, std::rc::Rc::new(std::collections::HashMap::new())); assert!( result.module.is_some(), "valid module should parse successfully" @@ -299,10 +294,7 @@ mod compiler_tests { last.shape ); - let result = crate::v2_compiler_parse::parse( - tokens, - std::rc::Rc::new(std::collections::HashMap::new()), - ); + let result = crate::v2_compiler_parse::parse(tokens, std::rc::Rc::new(std::collections::HashMap::new())); assert!( result.module.is_some(), @@ -379,10 +371,7 @@ mod compiler_tests { "{} should end with Eof", file ); - let result = crate::v2_compiler_parse::parse( - tokens, - std::rc::Rc::new(std::collections::HashMap::new()), - ); + let result = crate::v2_compiler_parse::parse(tokens, std::rc::Rc::new(std::collections::HashMap::new())); assert!( result.module.is_some(), "{} should parse successfully, error: {:?}", @@ -653,201 +642,81 @@ mod compiler_tests { #[test] fn coercion_rust_checkpoint_resolves_primitives() { use crate::v2_compiler_coercion::*; - assert_eq!( - coerce_primitive_type(RenderTarget::Rust, "Int".into()), - "i64" - ); - assert_eq!( - coerce_primitive_type(RenderTarget::Rust, "Float".into()), - "f64" - ); - assert_eq!( - coerce_primitive_type(RenderTarget::Rust, "Bool".into()), - "bool" - ); - assert_eq!( - coerce_primitive_type(RenderTarget::Rust, "Unit".into()), - "()" - ); - assert_eq!( - coerce_primitive_type(RenderTarget::Rust, "String".into()), - "String" - ); - assert_eq!( - coerce_primitive_type(RenderTarget::Rust, "Bytes".into()), - "Vec" - ); - assert_eq!( - coerce_primitive_type(RenderTarget::Rust, "Secret".into()), - "String" - ); - assert_eq!( - coerce_primitive_type(RenderTarget::Rust, "Json".into()), - "serde_json::Value" - ); + assert_eq!(coerce_primitive_type(RenderTarget::Rust, "Int".into()), "i64"); + assert_eq!(coerce_primitive_type(RenderTarget::Rust, "Float".into()), "f64"); + assert_eq!(coerce_primitive_type(RenderTarget::Rust, "Bool".into()), "bool"); + assert_eq!(coerce_primitive_type(RenderTarget::Rust, "Unit".into()), "()"); + assert_eq!(coerce_primitive_type(RenderTarget::Rust, "String".into()), "String"); + assert_eq!(coerce_primitive_type(RenderTarget::Rust, "Bytes".into()), "Vec"); + assert_eq!(coerce_primitive_type(RenderTarget::Rust, "Secret".into()), "String"); + assert_eq!(coerce_primitive_type(RenderTarget::Rust, "Json".into()), "serde_json::Value"); } + #[test] fn coercion_python_checkpoint_resolves_primitives() { use crate::v2_compiler_coercion::*; - assert_eq!( - coerce_primitive_type(RenderTarget::Python, "Int".into()), - "int" - ); - assert_eq!( - coerce_primitive_type(RenderTarget::Python, "Float".into()), - "float" - ); - assert_eq!( - coerce_primitive_type(RenderTarget::Python, "Bool".into()), - "bool" - ); - assert_eq!( - coerce_primitive_type(RenderTarget::Python, "Unit".into()), - "None" - ); - assert_eq!( - coerce_primitive_type(RenderTarget::Python, "String".into()), - "str" - ); - assert_eq!( - coerce_primitive_type(RenderTarget::Python, "Bytes".into()), - "bytes" - ); - assert_eq!( - coerce_primitive_type(RenderTarget::Python, "Secret".into()), - "str" - ); - assert_eq!( - coerce_primitive_type(RenderTarget::Python, "Json".into()), - "dict" - ); + assert_eq!(coerce_primitive_type(RenderTarget::Python, "Int".into()), "int"); + assert_eq!(coerce_primitive_type(RenderTarget::Python, "Float".into()), "float"); + assert_eq!(coerce_primitive_type(RenderTarget::Python, "Bool".into()), "bool"); + assert_eq!(coerce_primitive_type(RenderTarget::Python, "Unit".into()), "None"); + assert_eq!(coerce_primitive_type(RenderTarget::Python, "String".into()), "str"); + assert_eq!(coerce_primitive_type(RenderTarget::Python, "Bytes".into()), "bytes"); + assert_eq!(coerce_primitive_type(RenderTarget::Python, "Secret".into()), "str"); + assert_eq!(coerce_primitive_type(RenderTarget::Python, "Json".into()), "dict"); } + #[test] fn coercion_go_checkpoint_resolves_primitives() { use crate::v2_compiler_coercion::*; - assert_eq!( - coerce_primitive_type(RenderTarget::Go, "Int".into()), - "int64" - ); - assert_eq!( - coerce_primitive_type(RenderTarget::Go, "Float".into()), - "float64" - ); - assert_eq!( - coerce_primitive_type(RenderTarget::Go, "Bool".into()), - "bool" - ); - assert_eq!( - coerce_primitive_type(RenderTarget::Go, "Unit".into()), - "struct{}" - ); - assert_eq!( - coerce_primitive_type(RenderTarget::Go, "String".into()), - "string" - ); - assert_eq!( - coerce_primitive_type(RenderTarget::Go, "Bytes".into()), - "[]byte" - ); - assert_eq!( - coerce_primitive_type(RenderTarget::Go, "Secret".into()), - "string" - ); - assert_eq!( - coerce_primitive_type(RenderTarget::Go, "Json".into()), - "interface{}" - ); + assert_eq!(coerce_primitive_type(RenderTarget::Go, "Int".into()), "int64"); + assert_eq!(coerce_primitive_type(RenderTarget::Go, "Float".into()), "float64"); + assert_eq!(coerce_primitive_type(RenderTarget::Go, "Bool".into()), "bool"); + assert_eq!(coerce_primitive_type(RenderTarget::Go, "Unit".into()), "struct{}"); + assert_eq!(coerce_primitive_type(RenderTarget::Go, "String".into()), "string"); + assert_eq!(coerce_primitive_type(RenderTarget::Go, "Bytes".into()), "[]byte"); + assert_eq!(coerce_primitive_type(RenderTarget::Go, "Secret".into()), "string"); + assert_eq!(coerce_primitive_type(RenderTarget::Go, "Json".into()), "interface{}"); } + #[test] fn coercion_rust_inhabitant_resolves_containers() { use crate::v2_compiler_coercion::*; - assert_eq!( - coerce_container_template(RenderTarget::Rust, "BooleanAlgebra".into()), - Some("std::collections::BTreeSet<{0}>".to_string()) - ); - assert_eq!( - coerce_container_template(RenderTarget::Rust, "FreeMonoid".into()), - Some("Vec<{0}>".to_string()) - ); - assert_eq!( - coerce_container_template(RenderTarget::Rust, "List".into()), - Some("Vec<{0}>".to_string()) - ); - assert_eq!( - coerce_container_template(RenderTarget::Rust, "Map".into()), - Some("HashMap<{0}, {1}>".to_string()) - ); - assert_eq!( - coerce_container_template(RenderTarget::Rust, "PartialFunction".into()), - Some("HashMap<{0}, {1}>".to_string()) - ); - assert_eq!( - coerce_container_template(RenderTarget::Rust, "Set".into()), - Some("std::collections::BTreeSet<{0}>".to_string()) - ); + assert_eq!(coerce_container_template(RenderTarget::Rust, "BooleanAlgebra".into()), Some("std::collections::BTreeSet<{0}>".to_string())); + assert_eq!(coerce_container_template(RenderTarget::Rust, "FreeMonoid".into()), Some("Vec<{0}>".to_string())); + assert_eq!(coerce_container_template(RenderTarget::Rust, "List".into()), Some("Vec<{0}>".to_string())); + assert_eq!(coerce_container_template(RenderTarget::Rust, "Map".into()), Some("HashMap<{0}, {1}>".to_string())); + assert_eq!(coerce_container_template(RenderTarget::Rust, "PartialFunction".into()), Some("HashMap<{0}, {1}>".to_string())); + assert_eq!(coerce_container_template(RenderTarget::Rust, "Set".into()), Some("std::collections::BTreeSet<{0}>".to_string())); } + #[test] fn coercion_python_inhabitant_resolves_containers() { use crate::v2_compiler_coercion::*; - assert_eq!( - coerce_container_template(RenderTarget::Python, "BooleanAlgebra".into()), - Some("set[{0}]".to_string()) - ); - assert_eq!( - coerce_container_template(RenderTarget::Python, "FreeMonoid".into()), - Some("list[{0}]".to_string()) - ); - assert_eq!( - coerce_container_template(RenderTarget::Python, "List".into()), - Some("list[{0}]".to_string()) - ); - assert_eq!( - coerce_container_template(RenderTarget::Python, "Map".into()), - Some("dict[{0}, {1}]".to_string()) - ); - assert_eq!( - coerce_container_template(RenderTarget::Python, "PartialFunction".into()), - Some("dict[{0}, {1}]".to_string()) - ); - assert_eq!( - coerce_container_template(RenderTarget::Python, "Set".into()), - Some("set[{0}]".to_string()) - ); + assert_eq!(coerce_container_template(RenderTarget::Python, "BooleanAlgebra".into()), Some("set[{0}]".to_string())); + assert_eq!(coerce_container_template(RenderTarget::Python, "FreeMonoid".into()), Some("list[{0}]".to_string())); + assert_eq!(coerce_container_template(RenderTarget::Python, "List".into()), Some("list[{0}]".to_string())); + assert_eq!(coerce_container_template(RenderTarget::Python, "Map".into()), Some("dict[{0}, {1}]".to_string())); + assert_eq!(coerce_container_template(RenderTarget::Python, "PartialFunction".into()), Some("dict[{0}, {1}]".to_string())); + assert_eq!(coerce_container_template(RenderTarget::Python, "Set".into()), Some("set[{0}]".to_string())); } + #[test] fn coercion_go_inhabitant_resolves_containers() { use crate::v2_compiler_coercion::*; - assert_eq!( - coerce_container_template(RenderTarget::Go, "BooleanAlgebra".into()), - Some("map[{0}]struct{}".to_string()) - ); - assert_eq!( - coerce_container_template(RenderTarget::Go, "FreeMonoid".into()), - Some("[]{0}".to_string()) - ); - assert_eq!( - coerce_container_template(RenderTarget::Go, "List".into()), - Some("[]{0}".to_string()) - ); - assert_eq!( - coerce_container_template(RenderTarget::Go, "Map".into()), - Some("map[{0}]{1}".to_string()) - ); - assert_eq!( - coerce_container_template(RenderTarget::Go, "PartialFunction".into()), - Some("map[{0}]{1}".to_string()) - ); - assert_eq!( - coerce_container_template(RenderTarget::Go, "Set".into()), - Some("map[{0}]struct{}".to_string()) - ); + assert_eq!(coerce_container_template(RenderTarget::Go, "BooleanAlgebra".into()), Some("map[{0}]struct{}".to_string())); + assert_eq!(coerce_container_template(RenderTarget::Go, "FreeMonoid".into()), Some("[]{0}".to_string())); + assert_eq!(coerce_container_template(RenderTarget::Go, "List".into()), Some("[]{0}".to_string())); + assert_eq!(coerce_container_template(RenderTarget::Go, "Map".into()), Some("map[{0}]{1}".to_string())); + assert_eq!(coerce_container_template(RenderTarget::Go, "PartialFunction".into()), Some("map[{0}]{1}".to_string())); + assert_eq!(coerce_container_template(RenderTarget::Go, "Set".into()), Some("map[{0}]struct{}".to_string())); } + #[test] fn coercion_is_copy_from_checkpoint() { use crate::v2_compiler_coercion::*; @@ -861,45 +730,19 @@ mod compiler_tests { assert_eq!(is_copy(RenderTarget::Rust, "Json".into()), Some(false)); } + #[test] fn coercion_template_application() { use crate::v2_compiler_coercion::*; - assert_eq!( - apply_inhabitant_template1("Vec<{0}>".into(), "i64".into()), - "Vec" - ); - assert_eq!( - apply_inhabitant_template1("std::collections::BTreeSet<{0}>".into(), "i64".into()), - "std::collections::BTreeSet" - ); - assert_eq!( - apply_inhabitant_template2("HashMap<{0}, {1}>".into(), "String".into(), "i64".into()), - "HashMap" - ); - assert_eq!( - apply_inhabitant_template1("list[{0}]".into(), "int".into()), - "list[int]" - ); - assert_eq!( - apply_inhabitant_template1("set[{0}]".into(), "int".into()), - "set[int]" - ); - assert_eq!( - apply_inhabitant_template2("dict[{0}, {1}]".into(), "str".into(), "int".into()), - "dict[str, int]" - ); - assert_eq!( - apply_inhabitant_template1("[]{0}".into(), "int64".into()), - "[]int64" - ); - assert_eq!( - apply_inhabitant_template1("map[{0}]struct{}".into(), "int64".into()), - "map[int64]struct{}" - ); - assert_eq!( - apply_inhabitant_template2("map[{0}]{1}".into(), "string".into(), "int64".into()), - "map[string]int64" - ); + assert_eq!(apply_inhabitant_template1("Vec<{0}>".into(), "i64".into()), "Vec"); + assert_eq!(apply_inhabitant_template1("std::collections::BTreeSet<{0}>".into(), "i64".into()), "std::collections::BTreeSet"); + assert_eq!(apply_inhabitant_template2("HashMap<{0}, {1}>".into(), "String".into(), "i64".into()), "HashMap"); + assert_eq!(apply_inhabitant_template1("list[{0}]".into(), "int".into()), "list[int]"); + assert_eq!(apply_inhabitant_template1("set[{0}]".into(), "int".into()), "set[int]"); + assert_eq!(apply_inhabitant_template2("dict[{0}, {1}]".into(), "str".into(), "int".into()), "dict[str, int]"); + assert_eq!(apply_inhabitant_template1("[]{0}".into(), "int64".into()), "[]int64"); + assert_eq!(apply_inhabitant_template1("map[{0}]struct{}".into(), "int64".into()), "map[int64]struct{}"); + assert_eq!(apply_inhabitant_template2("map[{0}]{1}".into(), "string".into(), "int64".into()), "map[string]int64"); } /// Return current process RSS in bytes (macOS via mach_task_basic_info). @@ -1012,10 +855,7 @@ mod compiler_tests { let parsed = crate::v2_compiler_parse::parse_with_table( tokens, crate::v2_rt::rc_map_insert( - crate::v2_rt::rc_empty_map::< - String, - std::rc::Rc, - >(), + crate::v2_rt::rc_empty_map::>(), si.file.clone(), si.clone(), ), @@ -1029,9 +869,7 @@ mod compiler_tests { " parse {:>40}: {:>8.2?} (ok={})", sources[i].path, elapsed, ok ); - let m = result - .module - .clone() + let m = result.module.clone() .unwrap_or_else(|| panic!("parse failed for source {}", sources[i].path)); modules.push(m); } @@ -1040,25 +878,10 @@ mod compiler_tests { let t_stage = Instant::now(); let resolve_si = sources.iter().fold( - crate::v2_rt::rc_empty_map::< - String, - std::rc::Rc, - >(), - |acc, s| { - crate::v2_rt::rc_map_insert( - acc, - s.path.clone(), - crate::v2_std_core::build_newline_index( - s.path.clone(), - &s.content.clone(), - ), - ) - }, - ); - let graph = crate::v2_compiler_resolve::resolve_modules( - &std::rc::Rc::new(modules), - &resolve_si, + crate::v2_rt::rc_empty_map::>(), + |acc, s| crate::v2_rt::rc_map_insert(acc, s.path.clone(), crate::v2_std_core::build_newline_index(s.path.clone(), &s.content.clone())), ); + let graph = crate::v2_compiler_resolve::resolve_modules(&std::rc::Rc::new(modules), &resolve_si); let resolve_total = t_stage.elapsed(); let errors: Vec<_> = graph .diagnostics @@ -1145,10 +968,7 @@ mod compiler_tests { let parsed = crate::v2_compiler_parse::parse_with_table( tokens, crate::v2_rt::rc_map_insert( - crate::v2_rt::rc_empty_map::< - String, - std::rc::Rc, - >(), + crate::v2_rt::rc_empty_map::>(), si.file.clone(), si.clone(), ), @@ -1165,9 +985,7 @@ mod compiler_tests { " parse {:>40}: {:>8.2?} (ok={})", sources[i].path, elapsed, ok ); - let m = result - .module - .clone() + let m = result.module.clone() .unwrap_or_else(|| panic!("parse failed for source {}", sources[i].path)); modules.push(m); } @@ -1182,25 +1000,10 @@ mod compiler_tests { let t_stage = Instant::now(); let resolve_si = sources.iter().fold( - crate::v2_rt::rc_empty_map::< - String, - std::rc::Rc, - >(), - |acc, s| { - crate::v2_rt::rc_map_insert( - acc, - s.path.clone(), - crate::v2_std_core::build_newline_index( - s.path.clone(), - &s.content.clone(), - ), - ) - }, - ); - let graph = crate::v2_compiler_resolve::resolve_modules( - &std::rc::Rc::new(modules), - &resolve_si, + crate::v2_rt::rc_empty_map::>(), + |acc, s| crate::v2_rt::rc_map_insert(acc, s.path.clone(), crate::v2_std_core::build_newline_index(s.path.clone(), &s.content.clone())), ); + let graph = crate::v2_compiler_resolve::resolve_modules(&std::rc::Rc::new(modules), &resolve_si); let resolve_total = t_stage.elapsed(); let phase3_diags: usize = graph .diagnostics @@ -1229,11 +1032,7 @@ mod compiler_tests { acc }, ); - let typed = crate::v2_compiler_infer::reconcile( - graph, - std::rc::Rc::new(source_indices), - intern_table_p.clone(), - ); + let typed = crate::v2_compiler_infer::reconcile(graph, std::rc::Rc::new(source_indices), intern_table_p.clone()); let reconcile_total = t_stage.elapsed(); let phase4_diags: usize = typed .diagnostics @@ -1309,18 +1108,14 @@ mod compiler_tests { let source_count = sources.len(); let total_chars: usize = sources.iter().map(|s| s.content.len()).sum(); - eprintln!( - "\n=== FULL PIPELINE PROFILE ({} sources, {} chars) ===\n", - source_count, total_chars - ); + eprintln!("\n=== FULL PIPELINE PROFILE ({} sources, {} chars) ===\n", source_count, total_chars); // 1a. Tokenize + parse let t = Instant::now(); let mut token_lists = Vec::new(); for source in &sources { let tokens = crate::v2_compiler_tokenize::tokenize( - &source.content.clone(), - source.path.clone(), + &source.content.clone(), source.path.clone(), ); token_lists.push(tokens); } @@ -1337,10 +1132,7 @@ mod compiler_tests { let parsed = crate::v2_compiler_parse::parse_with_table( tokens, crate::v2_rt::rc_map_insert( - crate::v2_rt::rc_empty_map::< - String, - std::rc::Rc, - >(), + crate::v2_rt::rc_empty_map::>(), si.file.clone(), si.clone(), ), @@ -1348,9 +1140,7 @@ mod compiler_tests { ); let result = parsed.result.clone(); intern_table_fp = parsed.intern_table.clone(); - let m = result - .module - .clone() + let m = result.module.clone() .unwrap_or_else(|| panic!("parse failed for source {}", sources[i].path)); modules.push(m); } @@ -1358,200 +1148,91 @@ mod compiler_tests { // 1b. Resolve let t = Instant::now(); let resolve_si = sources.iter().fold( - crate::v2_rt::rc_empty_map::< - String, - std::rc::Rc, - >(), - |acc, s| { - crate::v2_rt::rc_map_insert( - acc, - s.path.clone(), - crate::v2_std_core::build_newline_index( - s.path.clone(), - &s.content.clone(), - ), - ) - }, - ); - let graph = crate::v2_compiler_resolve::resolve_modules( - &std::rc::Rc::new(modules), - &resolve_si, + crate::v2_rt::rc_empty_map::>(), + |acc, s| crate::v2_rt::rc_map_insert(acc, s.path.clone(), crate::v2_std_core::build_newline_index(s.path.clone(), &s.content.clone())), ); + let graph = crate::v2_compiler_resolve::resolve_modules(&std::rc::Rc::new(modules), &resolve_si); let resolve_elapsed = t.elapsed(); - let resolve_errors: usize = graph - .diagnostics - .iter() + let resolve_errors: usize = graph.diagnostics.iter() .filter(|d| crate::v2_std_core::is_error_diagnostic(d.diagnostic.clone())) .count(); // 1c. Newline indices let t = Instant::now(); - let newline_indices: Vec<_> = sources - .iter() - .map(|s| { - crate::v2_std_core::build_newline_index(s.path.clone(), &s.content.clone()) - }) - .collect(); + let newline_indices: Vec<_> = sources.iter().map(|s| { + crate::v2_std_core::build_newline_index(s.path.clone(), &s.content.clone()) + }).collect(); let newline_elapsed = t.elapsed(); - let frontend_elapsed = - tokenize_elapsed + parse_elapsed + resolve_elapsed + newline_elapsed; + let frontend_elapsed = tokenize_elapsed + parse_elapsed + resolve_elapsed + newline_elapsed; eprintln!(" Tokenize: {:>8.2?}", tokenize_elapsed); eprintln!(" Parse: {:>8.2?}", parse_elapsed); - eprintln!( - " Resolve: {:>8.2?} ({} resolve errors)", - resolve_elapsed, resolve_errors - ); + eprintln!(" Resolve: {:>8.2?} ({} resolve errors)", resolve_elapsed, resolve_errors); eprintln!(" Newline indices: {:>8.2?}", newline_elapsed); eprintln!(" Frontend total: {:>8.2?}", frontend_elapsed); // 2. Normalize let t = Instant::now(); let source_indices = newline_indices.iter().cloned().fold( - crate::v2_rt::rc_empty_map::< - String, - std::rc::Rc, - >(), - |acc, index| { - crate::v2_rt::rc_map_insert(acc, index.file.clone(), index.clone()) - }, + crate::v2_rt::rc_empty_map::>(), + |acc, index| crate::v2_rt::rc_map_insert(acc, index.file.clone(), index.clone()), ); - let norm = - crate::v2_compiler_normalize::normalize_graph(&graph, source_indices.clone()); + let norm = crate::v2_compiler_normalize::normalize_graph(&graph, source_indices.clone()); let normalize_elapsed = t.elapsed(); - eprintln!( - " Normalize: {:>8.2?}", - normalize_elapsed - ); + eprintln!(" Normalize: {:>8.2?}", normalize_elapsed); // 3. Reconcile let t = Instant::now(); - let typed = crate::v2_compiler_infer::reconcile( - norm.graph.clone(), - source_indices.clone(), - intern_table_fp.clone(), - ); + let typed = crate::v2_compiler_infer::reconcile(norm.graph.clone(), source_indices.clone(), intern_table_fp.clone()); let reconcile_elapsed = t.elapsed(); - let type_errors: usize = typed - .diagnostics - .iter() + let type_errors: usize = typed.diagnostics.iter() .filter(|d| crate::v2_std_core::is_error_diagnostic(d.diagnostic.clone())) .count(); - eprintln!( - " Reconcile: {:>8.2?} ({} type errors)", - reconcile_elapsed, type_errors - ); + eprintln!(" Reconcile: {:>8.2?} ({} type errors)", reconcile_elapsed, type_errors); // 4. Complexity let t = Instant::now(); let func_entries = crate::v2_compiler_compile::extract_func_entries(typed.clone()); let func_count = func_entries.len(); - let recursion_ctx = - crate::v2_compiler_compile::build_recursion_context(typed.clone()); + let recursion_ctx = crate::v2_compiler_compile::build_recursion_context(typed.clone()); let complexity = crate::v2_compiler_complexity::build_complexity_report( - &func_entries, - recursion_ctx, - source_indices.clone(), + &func_entries, recursion_ctx, source_indices.clone(), ); let complexity_elapsed = t.elapsed(); - let cx_diags = - crate::v2_compiler_compile::complexity_diagnostics(complexity.clone()); - eprintln!( - " Complexity: {:>8.2?} ({} funcs, {} diagnostics)", - complexity_elapsed, - func_count, - cx_diags.len() - ); + let cx_diags = crate::v2_compiler_compile::complexity_diagnostics(complexity.clone()); + eprintln!(" Complexity: {:>8.2?} ({} funcs, {} diagnostics)", complexity_elapsed, func_count, cx_diags.len()); // 5. Ownership let t = Instant::now(); let ownership = crate::v2_compiler_compile::extract_ownership_proofs(typed.clone()); let ownership_elapsed = t.elapsed(); - let own_diags = - crate::v2_compiler_compile::ownership_diagnostics(ownership.clone()); - eprintln!( - " Ownership: {:>8.2?} ({} proofs, {} diagnostics)", - ownership_elapsed, - ownership.len(), - own_diags.len() - ); + let own_diags = crate::v2_compiler_compile::ownership_diagnostics(ownership.clone()); + eprintln!(" Ownership: {:>8.2?} ({} proofs, {} diagnostics)", ownership_elapsed, ownership.len(), own_diags.len()); // 6. Emit let artifact_plan = crate::v2_compiler_compile::default_artifact_plan( - std::rc::Rc::new( - typed - .modules - .iter() - .map(|m| m.module.clone().name.clone()) - .collect(), - ), + std::rc::Rc::new(typed.modules.iter().map(|m| m.module.clone().name.clone()).collect()), crate::v2_compiler_artifact::RenderTarget::Rust, ); let t = Instant::now(); - let emit_result = crate::v2_compiler_compile::emit_from_artifact_plan( - typed.clone(), - &artifact_plan, - ); + let emit_result = crate::v2_compiler_compile::emit_from_artifact_plan(typed.clone(), &artifact_plan); let emit_elapsed = t.elapsed(); let emitted_files = emit_result.files.len(); let emitted_bytes: usize = emit_result.files.iter().map(|f| f.content.len()).sum(); - eprintln!( - " Emit: {:>8.2?} ({} files, {} bytes)", - emit_elapsed, emitted_files, emitted_bytes - ); + eprintln!(" Emit: {:>8.2?} ({} files, {} bytes)", emit_elapsed, emitted_files, emitted_bytes); - let total = frontend_elapsed - + normalize_elapsed - + reconcile_elapsed - + complexity_elapsed - + ownership_elapsed - + emit_elapsed; + let total = frontend_elapsed + normalize_elapsed + reconcile_elapsed + + complexity_elapsed + ownership_elapsed + emit_elapsed; eprintln!("\n=== SUMMARY ==="); - eprintln!( - " Tokenize: {:>8.2?} ({:.0}%)", - tokenize_elapsed, - tokenize_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0 - ); - eprintln!( - " Parse: {:>8.2?} ({:.0}%)", - parse_elapsed, - parse_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0 - ); - eprintln!( - " Resolve: {:>8.2?} ({:.0}%)", - resolve_elapsed, - resolve_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0 - ); - eprintln!( - " Newline: {:>8.2?} ({:.0}%)", - newline_elapsed, - newline_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0 - ); - eprintln!( - " Normalize: {:>8.2?} ({:.0}%)", - normalize_elapsed, - normalize_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0 - ); - eprintln!( - " Reconcile: {:>8.2?} ({:.0}%)", - reconcile_elapsed, - reconcile_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0 - ); - eprintln!( - " Complexity: {:>8.2?} ({:.0}%)", - complexity_elapsed, - complexity_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0 - ); - eprintln!( - " Ownership: {:>8.2?} ({:.0}%)", - ownership_elapsed, - ownership_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0 - ); - eprintln!( - " Emit: {:>8.2?} ({:.0}%)", - emit_elapsed, - emit_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0 - ); + eprintln!(" Tokenize: {:>8.2?} ({:.0}%)", tokenize_elapsed, tokenize_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0); + eprintln!(" Parse: {:>8.2?} ({:.0}%)", parse_elapsed, parse_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0); + eprintln!(" Resolve: {:>8.2?} ({:.0}%)", resolve_elapsed, resolve_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0); + eprintln!(" Newline: {:>8.2?} ({:.0}%)", newline_elapsed, newline_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0); + eprintln!(" Normalize: {:>8.2?} ({:.0}%)", normalize_elapsed, normalize_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0); + eprintln!(" Reconcile: {:>8.2?} ({:.0}%)", reconcile_elapsed, reconcile_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0); + eprintln!(" Complexity: {:>8.2?} ({:.0}%)", complexity_elapsed, complexity_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0); + eprintln!(" Ownership: {:>8.2?} ({:.0}%)", ownership_elapsed, ownership_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0); + eprintln!(" Emit: {:>8.2?} ({:.0}%)", emit_elapsed, emit_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0); eprintln!(" TOTAL: {:>8.2?}", total); }) .expect("failed to spawn thread") @@ -1590,10 +1271,7 @@ mod compiler_tests { let parsed = crate::v2_compiler_parse::parse_with_table( &tokens, crate::v2_rt::rc_map_insert( - crate::v2_rt::rc_empty_map::< - String, - std::rc::Rc, - >(), + crate::v2_rt::rc_empty_map::>(), si.file.clone(), si.clone(), ), @@ -1601,32 +1279,15 @@ mod compiler_tests { ); let result = parsed.result.clone(); intern_table = parsed.intern_table.clone(); - let m = result - .module - .clone() + let m = result.module.clone() .unwrap_or_else(|| panic!("parse failed for source {}", source.path)); modules.push(m); } let resolve_si = sources.iter().fold( - crate::v2_rt::rc_empty_map::< - String, - std::rc::Rc, - >(), - |acc, s| { - crate::v2_rt::rc_map_insert( - acc, - s.path.clone(), - crate::v2_std_core::build_newline_index( - s.path.clone(), - &s.content.clone(), - ), - ) - }, - ); - let graph = crate::v2_compiler_resolve::resolve_modules( - &std::rc::Rc::new(modules), - &resolve_si, + crate::v2_rt::rc_empty_map::>(), + |acc, s| crate::v2_rt::rc_map_insert(acc, s.path.clone(), crate::v2_std_core::build_newline_index(s.path.clone(), &s.content.clone())), ); + let graph = crate::v2_compiler_resolve::resolve_modules(&std::rc::Rc::new(modules), &resolve_si); let setup_time = t0.elapsed(); let rss_baseline = get_rss_bytes(); eprintln!( @@ -1777,4 +1438,5 @@ mod compiler_tests { .join(); result.expect("profile_reconcile_per_module panicked"); } + } diff --git a/src/v2/stage0/src/extdeps_languages_dag_emit.rs b/src/v2/stage0/src/extdeps_languages_dag_emit.rs index 557109d0c3b..1e1559de24c 100644 --- a/src/v2/stage0/src/extdeps_languages_dag_emit.rs +++ b/src/v2/stage0/src/extdeps_languages_dag_emit.rs @@ -1,11 +1,11 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.dag.emit -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; pub fn dag_keywords() -> Rc> { thread_local! { diff --git a/src/v2/stage0/src/extdeps_languages_dag_syntax.rs b/src/v2/stage0/src/extdeps_languages_dag_syntax.rs index e467f1c693d..75f3f1b3c54 100644 --- a/src/v2/stage0/src/extdeps_languages_dag_syntax.rs +++ b/src/v2/stage0/src/extdeps_languages_dag_syntax.rs @@ -1,121 +1,113 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.dag.syntax -use crate::std_syntax::BinOp::{ - Add, And, Div, Eq, Ge, Gt, Le, Lt, Mod, Mul, Ne, NullCoalesce, Or, Sub, -}; -use crate::std_syntax::BodyKind::{ - BlockBody, ExprBody, NoBody, ResourceBody, ServiceBody, TypeBody, ValueBody, -}; -use crate::std_syntax::ItemFormKind::{ - EnumForm, FuncForm, ModuleForm, OtherForm, StructForm, TypeAliasForm, -}; -use crate::std_syntax::LiteralValue::{LitBool, LitNull}; -pub use crate::std_syntax::{ - BinOp, BodyKind, ItemForm, ItemFormKind, LiteralValue, OperatorSpec, SyntaxSpec, -}; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_syntax::{ItemForm, ItemFormKind, BodyKind, OperatorSpec, SyntaxSpec, BinOp, LiteralValue}; +use crate::std_syntax::ItemFormKind::{FuncForm, StructForm, EnumForm, TypeAliasForm, ModuleForm, OtherForm}; +use crate::std_syntax::BodyKind::{ExprBody, BlockBody, TypeBody, ValueBody, NoBody, ResourceBody, ServiceBody}; +use crate::std_syntax::BinOp::{Add, Sub, Mul, Div, Mod, Eq, Ne, Lt, Gt, Le, Ge, And, Or, NullCoalesce}; +use crate::std_syntax::LiteralValue::{LitBool, LitNull}; pub fn dag_item_forms() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - Rc::new(vec![Rc::new(ItemForm { - kind: ItemFormKind::TypeAliasForm, - keyword: "type".to_string(), - has_type_params: true, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::TypeBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::FuncForm, - keyword: "fn".to_string(), - has_type_params: true, - has_params: true, - has_return_type: true, - return_required: true, - has_uses: false, - body_kind: BodyKind::ExprBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::FuncForm, - keyword: "func".to_string(), - has_type_params: false, - has_params: true, - has_return_type: true, - return_required: false, - has_uses: true, - body_kind: BodyKind::BlockBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::OtherForm, - keyword: "resource".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::ResourceBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::OtherForm, - keyword: "service".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::ServiceBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::OtherForm, - keyword: "data".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::ValueBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::OtherForm, - keyword: "pattern".to_string(), - has_type_params: false, - has_params: true, - has_return_type: true, - return_required: false, - has_uses: true, - body_kind: BodyKind::BlockBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::OtherForm, - keyword: "interface".to_string(), - has_type_params: false, - has_params: true, - has_return_type: true, - return_required: false, - has_uses: false, - body_kind: BodyKind::BlockBody, - })]) - }; - } + static CACHED: Rc>> = { + Rc::new(vec![Rc::new(ItemForm { + kind: ItemFormKind::TypeAliasForm, + keyword: "type".to_string(), + has_type_params: true, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::TypeBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::FuncForm, + keyword: "fn".to_string(), + has_type_params: true, + has_params: true, + has_return_type: true, + return_required: true, + has_uses: false, + body_kind: BodyKind::ExprBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::FuncForm, + keyword: "func".to_string(), + has_type_params: false, + has_params: true, + has_return_type: true, + return_required: false, + has_uses: true, + body_kind: BodyKind::BlockBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::OtherForm, + keyword: "resource".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::ResourceBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::OtherForm, + keyword: "service".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::ServiceBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::OtherForm, + keyword: "data".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::ValueBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::OtherForm, + keyword: "pattern".to_string(), + has_type_params: false, + has_params: true, + has_return_type: true, + return_required: false, + has_uses: true, + body_kind: BodyKind::BlockBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::OtherForm, + keyword: "interface".to_string(), + has_type_params: false, + has_params: true, + has_return_type: true, + return_required: false, + has_uses: false, + body_kind: BodyKind::BlockBody, +})]) + }; + } CACHED.with(|c| c.clone()) } pub fn dag_keyword_literals() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - let mut __m = HashMap::new(); - __m.insert("true".to_string(), Rc::new(LiteralValue::LitBool { - value: true, - })); - __m.insert("false".to_string(), Rc::new(LiteralValue::LitBool { - value: false, - })); - __m.insert("none".to_string(), Rc::new(LiteralValue::LitNull)); - __m.insert("null".to_string(), Rc::new(LiteralValue::LitNull)); - Rc::new(__m) - }; - } + static CACHED: Rc>> = { + let mut __m = HashMap::new(); + __m.insert("true".to_string(), Rc::new(LiteralValue::LitBool { + value: true, +})); + __m.insert("false".to_string(), Rc::new(LiteralValue::LitBool { + value: false, +})); + __m.insert("none".to_string(), Rc::new(LiteralValue::LitNull)); + __m.insert("null".to_string(), Rc::new(LiteralValue::LitNull)); + Rc::new(__m) + }; + } CACHED.with(|c| c.clone()) } @@ -182,106 +174,106 @@ pub fn dag_non_name_keywords() -> Rc> { pub fn dag_operators() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - Rc::new(vec![Rc::new(OperatorSpec { - symbol: "||".to_string(), - left_bp: 5, - right_bp: 6, - binop: Some(BinOp::Or), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "&&".to_string(), - left_bp: 7, - right_bp: 8, - binop: Some(BinOp::And), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "??".to_string(), - left_bp: 8, - right_bp: 9, - binop: Some(BinOp::NullCoalesce), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "==".to_string(), - left_bp: 9, - right_bp: 10, - binop: Some(BinOp::Eq), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "!=".to_string(), - left_bp: 9, - right_bp: 10, - binop: Some(BinOp::Ne), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "<".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Lt), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: ">".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Gt), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "<=".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Le), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: ">=".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Ge), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "+".to_string(), - left_bp: 13, - right_bp: 14, - binop: Some(BinOp::Add), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "-".to_string(), - left_bp: 13, - right_bp: 14, - binop: Some(BinOp::Sub), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "*".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Mul), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "/".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Div), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "%".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Mod), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "|>".to_string(), - left_bp: 17, - right_bp: 18, - binop: None, - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: ".".to_string(), - left_bp: 19, - right_bp: 20, - binop: None, - algebra_field: None, - })]) - }; - } + static CACHED: Rc>> = { + Rc::new(vec![Rc::new(OperatorSpec { + symbol: "||".to_string(), + left_bp: 5, + right_bp: 6, + binop: Some(BinOp::Or), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "&&".to_string(), + left_bp: 7, + right_bp: 8, + binop: Some(BinOp::And), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "??".to_string(), + left_bp: 8, + right_bp: 9, + binop: Some(BinOp::NullCoalesce), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "==".to_string(), + left_bp: 9, + right_bp: 10, + binop: Some(BinOp::Eq), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "!=".to_string(), + left_bp: 9, + right_bp: 10, + binop: Some(BinOp::Ne), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "<".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Lt), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: ">".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Gt), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "<=".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Le), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: ">=".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Ge), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "+".to_string(), + left_bp: 13, + right_bp: 14, + binop: Some(BinOp::Add), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "-".to_string(), + left_bp: 13, + right_bp: 14, + binop: Some(BinOp::Sub), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "*".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Mul), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "/".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Div), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "%".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Mod), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "|>".to_string(), + left_bp: 17, + right_bp: 18, + binop: None, + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: ".".to_string(), + left_bp: 19, + right_bp: 20, + binop: None, + algebra_field: None, +})]) + }; + } CACHED.with(|c| c.clone()) } @@ -311,14 +303,14 @@ pub fn v3_supported_dag_operators() -> Rc> { pub fn dag_syntax_spec() -> Rc { thread_local! { - static CACHED: Rc = { - Rc::new(SyntaxSpec { - item_forms: dag_item_forms(), - operators: dag_operators(), - keyword_literals: dag_keyword_literals(), - keyword_set: dag_keyword_set(), - }) - }; - } + static CACHED: Rc = { + Rc::new(SyntaxSpec { + item_forms: dag_item_forms(), + operators: dag_operators(), + keyword_literals: dag_keyword_literals(), + keyword_set: dag_keyword_set(), +}) + }; + } CACHED.with(|c| c.clone()) } diff --git a/src/v2/stage0/src/extdeps_languages_dag_types.rs b/src/v2/stage0/src/extdeps_languages_dag_types.rs index 747e7726ac8..c95c45171d0 100644 --- a/src/v2/stage0/src/extdeps_languages_dag_types.rs +++ b/src/v2/stage0/src/extdeps_languages_dag_types.rs @@ -1,12 +1,12 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.dag.types -pub use crate::std_coercion::TypeCheckpoint; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_coercion::{TypeCheckpoint}; pub fn dag_type_checkpoints() -> Rc>> { thread_local! { diff --git a/src/v2/stage0/src/extdeps_languages_go_emit.rs b/src/v2/stage0/src/extdeps_languages_go_emit.rs index c6ad3e3c756..a6ddd844b04 100644 --- a/src/v2/stage0/src/extdeps_languages_go_emit.rs +++ b/src/v2/stage0/src/extdeps_languages_go_emit.rs @@ -1,11 +1,11 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.go.emit -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; pub fn go_keywords() -> Rc> { thread_local! { diff --git a/src/v2/stage0/src/extdeps_languages_go_syntax.rs b/src/v2/stage0/src/extdeps_languages_go_syntax.rs index a488a4b3987..ea0c113871a 100644 --- a/src/v2/stage0/src/extdeps_languages_go_syntax.rs +++ b/src/v2/stage0/src/extdeps_languages_go_syntax.rs @@ -1,157 +1,153 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.go.syntax -use crate::std_syntax::BinOp::{ - Add, And, Div, Eq, Ge, Gt, Le, Lt, Mod, Mul, Ne, NullCoalesce, Or, Sub, -}; -use crate::std_syntax::BodyKind::{BlockBody, NoBody, TypeBody}; -use crate::std_syntax::ItemFormKind::{ - EnumForm, FuncForm, ModuleForm, OtherForm, StructForm, TypeAliasForm, -}; -pub use crate::std_syntax::{BinOp, BodyKind, ItemForm, ItemFormKind, OperatorSpec}; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_syntax::{ItemForm, ItemFormKind, BodyKind, OperatorSpec, BinOp}; +use crate::std_syntax::ItemFormKind::{FuncForm, StructForm, EnumForm, TypeAliasForm, ModuleForm, OtherForm}; +use crate::std_syntax::BodyKind::{BlockBody, TypeBody, NoBody}; +use crate::std_syntax::BinOp::{Add, Sub, Mul, Div, Mod, Eq, Ne, Lt, Gt, Le, Ge, And, Or, NullCoalesce}; pub fn go_item_forms() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - Rc::new(vec![Rc::new(ItemForm { - kind: ItemFormKind::FuncForm, - keyword: "func".to_string(), - has_type_params: false, - has_params: true, - has_return_type: true, - return_required: false, - has_uses: false, - body_kind: BodyKind::BlockBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::StructForm, - keyword: "struct".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::TypeBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::EnumForm, - keyword: "type".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::NoBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::TypeAliasForm, - keyword: "type".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::NoBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::ModuleForm, - keyword: "package".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::NoBody, - })]) - }; - } + static CACHED: Rc>> = { + Rc::new(vec![Rc::new(ItemForm { + kind: ItemFormKind::FuncForm, + keyword: "func".to_string(), + has_type_params: false, + has_params: true, + has_return_type: true, + return_required: false, + has_uses: false, + body_kind: BodyKind::BlockBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::StructForm, + keyword: "struct".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::TypeBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::EnumForm, + keyword: "type".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::NoBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::TypeAliasForm, + keyword: "type".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::NoBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::ModuleForm, + keyword: "package".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::NoBody, +})]) + }; + } CACHED.with(|c| c.clone()) } pub fn go_operators() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - Rc::new(vec![Rc::new(OperatorSpec { - symbol: "||".to_string(), - left_bp: 5, - right_bp: 6, - binop: Some(BinOp::Or), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "&&".to_string(), - left_bp: 7, - right_bp: 8, - binop: Some(BinOp::And), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "==".to_string(), - left_bp: 9, - right_bp: 10, - binop: Some(BinOp::Eq), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "!=".to_string(), - left_bp: 9, - right_bp: 10, - binop: Some(BinOp::Ne), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "<".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Lt), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: ">".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Gt), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "<=".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Le), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: ">=".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Ge), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "+".to_string(), - left_bp: 13, - right_bp: 14, - binop: Some(BinOp::Add), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "-".to_string(), - left_bp: 13, - right_bp: 14, - binop: Some(BinOp::Sub), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "*".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Mul), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "/".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Div), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "%".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Mod), - algebra_field: None, - })]) - }; - } + static CACHED: Rc>> = { + Rc::new(vec![Rc::new(OperatorSpec { + symbol: "||".to_string(), + left_bp: 5, + right_bp: 6, + binop: Some(BinOp::Or), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "&&".to_string(), + left_bp: 7, + right_bp: 8, + binop: Some(BinOp::And), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "==".to_string(), + left_bp: 9, + right_bp: 10, + binop: Some(BinOp::Eq), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "!=".to_string(), + left_bp: 9, + right_bp: 10, + binop: Some(BinOp::Ne), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "<".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Lt), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: ">".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Gt), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "<=".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Le), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: ">=".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Ge), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "+".to_string(), + left_bp: 13, + right_bp: 14, + binop: Some(BinOp::Add), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "-".to_string(), + left_bp: 13, + right_bp: 14, + binop: Some(BinOp::Sub), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "*".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Mul), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "/".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Div), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "%".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Mod), + algebra_field: None, +})]) + }; + } CACHED.with(|c| c.clone()) } diff --git a/src/v2/stage0/src/extdeps_languages_go_types.rs b/src/v2/stage0/src/extdeps_languages_go_types.rs index f76a6e48558..71c584f3f82 100644 --- a/src/v2/stage0/src/extdeps_languages_go_types.rs +++ b/src/v2/stage0/src/extdeps_languages_go_types.rs @@ -1,12 +1,12 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.go.types -pub use crate::std_coercion::{CallableRepr, CastSyntax, InhabitantDecl, TypeCheckpoint}; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_coercion::{TypeCheckpoint, InhabitantDecl, CallableRepr, CastSyntax}; pub fn go_type_checkpoints() -> Rc>> { thread_local! { @@ -74,9 +74,7 @@ pub fn nil_literal() -> String { CACHED.with(|c| c.clone()) } -pub fn visibility_by_case() -> bool { - true -} +pub fn visibility_by_case() -> bool { true } pub fn embedded_field_syntax() -> String { thread_local! { diff --git a/src/v2/stage0/src/extdeps_languages_python_emit.rs b/src/v2/stage0/src/extdeps_languages_python_emit.rs index 67bdcccec21..be02c40f3e0 100644 --- a/src/v2/stage0/src/extdeps_languages_python_emit.rs +++ b/src/v2/stage0/src/extdeps_languages_python_emit.rs @@ -1,11 +1,11 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.python.emit -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; pub fn python_keywords() -> Rc> { thread_local! { diff --git a/src/v2/stage0/src/extdeps_languages_python_syntax.rs b/src/v2/stage0/src/extdeps_languages_python_syntax.rs index 6fdeb0197c0..f70c8c577e9 100644 --- a/src/v2/stage0/src/extdeps_languages_python_syntax.rs +++ b/src/v2/stage0/src/extdeps_languages_python_syntax.rs @@ -1,166 +1,160 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.python.syntax -use crate::std_syntax::AlgebraFieldKind::{AlgQuotient, AlgReciprocal}; -use crate::std_syntax::BinOp::{ - Add, And, Div, Eq, Ge, Gt, Le, Lt, Mod, Mul, Ne, NullCoalesce, Or, Sub, -}; -use crate::std_syntax::BodyKind::{BlockBody, NoBody, TypeBody}; -use crate::std_syntax::ItemFormKind::{ - EnumForm, FuncForm, ModuleForm, OtherForm, StructForm, TypeAliasForm, -}; -pub use crate::std_syntax::{ - AlgebraFieldKind, BinOp, BodyKind, ItemForm, ItemFormKind, OperatorSpec, -}; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_syntax::{ItemForm, ItemFormKind, BodyKind, OperatorSpec, BinOp, AlgebraFieldKind}; +use crate::std_syntax::ItemFormKind::{FuncForm, StructForm, EnumForm, TypeAliasForm, ModuleForm, OtherForm}; +use crate::std_syntax::BodyKind::{BlockBody, TypeBody, NoBody}; +use crate::std_syntax::BinOp::{Add, Sub, Mul, Div, Mod, Eq, Ne, Lt, Gt, Le, Ge, And, Or, NullCoalesce}; +use crate::std_syntax::AlgebraFieldKind::{AlgReciprocal, AlgQuotient}; pub fn python_item_forms() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - Rc::new(vec![Rc::new(ItemForm { - kind: ItemFormKind::FuncForm, - keyword: "def".to_string(), - has_type_params: false, - has_params: true, - has_return_type: true, - return_required: false, - has_uses: false, - body_kind: BodyKind::BlockBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::StructForm, - keyword: "class".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::BlockBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::EnumForm, - keyword: "class".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::BlockBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::TypeAliasForm, - keyword: "".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::NoBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::ModuleForm, - keyword: "".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::NoBody, - })]) - }; - } + static CACHED: Rc>> = { + Rc::new(vec![Rc::new(ItemForm { + kind: ItemFormKind::FuncForm, + keyword: "def".to_string(), + has_type_params: false, + has_params: true, + has_return_type: true, + return_required: false, + has_uses: false, + body_kind: BodyKind::BlockBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::StructForm, + keyword: "class".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::BlockBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::EnumForm, + keyword: "class".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::BlockBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::TypeAliasForm, + keyword: "".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::NoBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::ModuleForm, + keyword: "".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::NoBody, +})]) + }; + } CACHED.with(|c| c.clone()) } pub fn python_operators() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - Rc::new(vec![Rc::new(OperatorSpec { - symbol: "or".to_string(), - left_bp: 5, - right_bp: 6, - binop: Some(BinOp::Or), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "and".to_string(), - left_bp: 7, - right_bp: 8, - binop: Some(BinOp::And), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "==".to_string(), - left_bp: 9, - right_bp: 10, - binop: Some(BinOp::Eq), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "!=".to_string(), - left_bp: 9, - right_bp: 10, - binop: Some(BinOp::Ne), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "<".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Lt), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: ">".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Gt), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "<=".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Le), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: ">=".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Ge), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "+".to_string(), - left_bp: 13, - right_bp: 14, - binop: Some(BinOp::Add), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "-".to_string(), - left_bp: 13, - right_bp: 14, - binop: Some(BinOp::Sub), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "*".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Mul), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "/".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Div), - algebra_field: Some(AlgebraFieldKind::AlgReciprocal), - }), Rc::new(OperatorSpec { - symbol: "//".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Div), - algebra_field: Some(AlgebraFieldKind::AlgQuotient), - }), Rc::new(OperatorSpec { - symbol: "%".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Mod), - algebra_field: None, - })]) - }; - } + static CACHED: Rc>> = { + Rc::new(vec![Rc::new(OperatorSpec { + symbol: "or".to_string(), + left_bp: 5, + right_bp: 6, + binop: Some(BinOp::Or), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "and".to_string(), + left_bp: 7, + right_bp: 8, + binop: Some(BinOp::And), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "==".to_string(), + left_bp: 9, + right_bp: 10, + binop: Some(BinOp::Eq), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "!=".to_string(), + left_bp: 9, + right_bp: 10, + binop: Some(BinOp::Ne), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "<".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Lt), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: ">".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Gt), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "<=".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Le), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: ">=".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Ge), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "+".to_string(), + left_bp: 13, + right_bp: 14, + binop: Some(BinOp::Add), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "-".to_string(), + left_bp: 13, + right_bp: 14, + binop: Some(BinOp::Sub), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "*".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Mul), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "/".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Div), + algebra_field: Some(AlgebraFieldKind::AlgReciprocal), +}), Rc::new(OperatorSpec { + symbol: "//".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Div), + algebra_field: Some(AlgebraFieldKind::AlgQuotient), +}), Rc::new(OperatorSpec { + symbol: "%".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Mod), + algebra_field: None, +})]) + }; + } CACHED.with(|c| c.clone()) } diff --git a/src/v2/stage0/src/extdeps_languages_python_types.rs b/src/v2/stage0/src/extdeps_languages_python_types.rs index c770af67413..3d5b6ca151f 100644 --- a/src/v2/stage0/src/extdeps_languages_python_types.rs +++ b/src/v2/stage0/src/extdeps_languages_python_types.rs @@ -1,13 +1,13 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.python.types -use self::PythonTypeKind::*; -pub use crate::std_coercion::{CallableRepr, CastSyntax, InhabitantDecl, TypeCheckpoint}; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_coercion::{TypeCheckpoint, InhabitantDecl, CallableRepr, CastSyntax}; +use self::PythonTypeKind::*; pub fn python_type_checkpoints() -> Rc>> { thread_local! { diff --git a/src/v2/stage0/src/extdeps_languages_rust_emit.rs b/src/v2/stage0/src/extdeps_languages_rust_emit.rs index 5e4c2f0bd8a..60cf5679de4 100644 --- a/src/v2/stage0/src/extdeps_languages_rust_emit.rs +++ b/src/v2/stage0/src/extdeps_languages_rust_emit.rs @@ -1,11 +1,11 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.rust.emit -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; pub fn rust_keywords() -> Rc> { thread_local! { @@ -59,32 +59,11 @@ pub fn rust_simple_method_specs() -> Rc>> { } pub fn rust_method_templates() -> Rc> { - rust_simple_method_specs().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, spec: Rc| { - v2_rt::rc_map_insert(acc, spec.method_name.clone(), spec.template.clone()) - }, - ) + rust_simple_method_specs().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, spec: Rc| v2_rt::rc_map_insert(acc, spec.method_name.clone(), spec.template.clone())) } pub fn rust_method_wraps_result() -> Rc> { - Rc::new({ - let mut __result = Vec::new(); - for s in rust_simple_method_specs().iter().cloned() { - if s.wraps_result.clone() { - __result.push(s); - } - } - __result - }) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, spec: Rc| { - v2_rt::rc_map_insert(acc, spec.method_name.clone(), true) - }, - ) + Rc::new({ let mut __result = Vec::new(); for s in rust_simple_method_specs().iter().cloned() { if s.wraps_result.clone() { __result.push(s); } } __result }).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, spec: Rc| v2_rt::rc_map_insert(acc, spec.method_name.clone(), true)) } pub fn rust_reserved() -> Rc> { @@ -422,7 +401,7 @@ pub struct RuntimeFunction { pub fn rt_function_registry() -> Rc>> { thread_local! { static CACHED: Rc>> = { - serde_json::from_value(serde_json::json!([{"name": "concat", "bridge_name": "concat", "passes_by_ref": false, "wraps_result": false}, {"name": "char_at", "bridge_name": "char_at", "passes_by_ref": true, "wraps_result": false}, {"name": "string_length", "bridge_name": "string_length", "passes_by_ref": true, "wraps_result": false}, {"name": "substring", "bridge_name": "substring", "passes_by_ref": true, "wraps_result": false}, {"name": "string_contains", "bridge_name": "string_contains", "passes_by_ref": true, "wraps_result": false}, {"name": "scan_while", "bridge_name": "scan_while", "passes_by_ref": true, "wraps_result": false}, {"name": "skip_horizontal_ws", "bridge_name": "skip_horizontal_ws", "passes_by_ref": true, "wraps_result": false}, {"name": "scan_to_eol", "bridge_name": "scan_to_eol", "passes_by_ref": true, "wraps_result": false}, {"name": "scan_string_end", "bridge_name": "scan_string_end", "passes_by_ref": true, "wraps_result": false}, {"name": "code_point", "bridge_name": "code_point", "passes_by_ref": false, "wraps_result": false}, {"name": "from_code_point", "bridge_name": "from_code_point", "passes_by_ref": false, "wraps_result": false}, {"name": "lookup", "bridge_name": "lookup", "passes_by_ref": true, "wraps_result": false}, {"name": "index_by", "bridge_name": "rc_index_by", "passes_by_ref": false, "wraps_result": false}, {"name": "empty_map", "bridge_name": "rc_empty_map", "passes_by_ref": false, "wraps_result": false}, {"name": "map_insert", "bridge_name": "rc_map_insert", "passes_by_ref": false, "wraps_result": false}, {"name": "map_merge", "bridge_name": "rc_map_merge", "passes_by_ref": false, "wraps_result": false}, {"name": "list_concat", "bridge_name": "rc_list_concat", "passes_by_ref": false, "wraps_result": false}, {"name": "str_eq", "bridge_name": "str_eq", "passes_by_ref": false, "wraps_result": false}, {"name": "filesystem_read", "bridge_name": "filesystem_read", "passes_by_ref": false, "wraps_result": false}, {"name": "list_push", "bridge_name": "rc_list_push", "passes_by_ref": false, "wraps_result": false}, {"name": "map_get", "bridge_name": "map_get", "passes_by_ref": true, "wraps_result": false}, {"name": "map_keys", "bridge_name": "map_keys", "passes_by_ref": true, "wraps_result": true}, {"name": "map_values", "bridge_name": "map_values", "passes_by_ref": true, "wraps_result": true}, {"name": "parse_int", "bridge_name": "parse_int", "passes_by_ref": false, "wraps_result": false}, {"name": "map_contains_key", "bridge_name": "map_contains_key", "passes_by_ref": true, "wraps_result": false}, {"name": "map_has", "bridge_name": "map_has", "passes_by_ref": true, "wraps_result": false}, {"name": "reverse", "bridge_name": "reverse", "passes_by_ref": false, "wraps_result": false}, {"name": "replace", "bridge_name": "replace", "passes_by_ref": false, "wraps_result": false}, {"name": "chars_to_string", "bridge_name": "chars_to_string", "passes_by_ref": true, "wraps_result": false}, {"name": "append", "bridge_name": "append", "passes_by_ref": false, "wraps_result": true}, {"name": "contains", "bridge_name": "contains", "passes_by_ref": false, "wraps_result": false}, {"name": "count", "bridge_name": "count", "passes_by_ref": false, "wraps_result": false}, {"name": "clamp", "bridge_name": "clamp", "passes_by_ref": false, "wraps_result": false}])) + serde_json::from_value(serde_json::json!([{"name": "concat", "bridge_name": "concat", "passes_by_ref": false, "wraps_result": false}, {"name": "char_at", "bridge_name": "char_at", "passes_by_ref": true, "wraps_result": false}, {"name": "string_length", "bridge_name": "string_length", "passes_by_ref": true, "wraps_result": false}, {"name": "substring", "bridge_name": "substring", "passes_by_ref": true, "wraps_result": false}, {"name": "string_contains", "bridge_name": "string_contains", "passes_by_ref": true, "wraps_result": false}, {"name": "scan_while", "bridge_name": "scan_while", "passes_by_ref": true, "wraps_result": false}, {"name": "skip_horizontal_ws", "bridge_name": "skip_horizontal_ws", "passes_by_ref": true, "wraps_result": false}, {"name": "scan_to_eol", "bridge_name": "scan_to_eol", "passes_by_ref": true, "wraps_result": false}, {"name": "scan_string_end", "bridge_name": "scan_string_end", "passes_by_ref": true, "wraps_result": false}, {"name": "code_point", "bridge_name": "code_point", "passes_by_ref": false, "wraps_result": false}, {"name": "from_code_point", "bridge_name": "from_code_point", "passes_by_ref": false, "wraps_result": false}, {"name": "lookup", "bridge_name": "lookup", "passes_by_ref": true, "wraps_result": false}, {"name": "index_by", "bridge_name": "rc_index_by", "passes_by_ref": false, "wraps_result": false}, {"name": "empty_map", "bridge_name": "rc_empty_map", "passes_by_ref": false, "wraps_result": false}, {"name": "empty_set", "bridge_name": "rc_empty_set", "passes_by_ref": false, "wraps_result": false}, {"name": "set_insert", "bridge_name": "rc_set_insert", "passes_by_ref": false, "wraps_result": false}, {"name": "set_union", "bridge_name": "rc_set_union", "passes_by_ref": false, "wraps_result": false}, {"name": "set_contains", "bridge_name": "set_contains", "passes_by_ref": true, "wraps_result": false}, {"name": "map_insert", "bridge_name": "rc_map_insert", "passes_by_ref": false, "wraps_result": false}, {"name": "map_merge", "bridge_name": "rc_map_merge", "passes_by_ref": false, "wraps_result": false}, {"name": "list_concat", "bridge_name": "rc_list_concat", "passes_by_ref": false, "wraps_result": false}, {"name": "str_eq", "bridge_name": "str_eq", "passes_by_ref": false, "wraps_result": false}, {"name": "filesystem_read", "bridge_name": "filesystem_read", "passes_by_ref": false, "wraps_result": false}, {"name": "list_push", "bridge_name": "rc_list_push", "passes_by_ref": false, "wraps_result": false}, {"name": "map_get", "bridge_name": "map_get", "passes_by_ref": true, "wraps_result": false}, {"name": "map_keys", "bridge_name": "map_keys", "passes_by_ref": true, "wraps_result": true}, {"name": "map_values", "bridge_name": "map_values", "passes_by_ref": true, "wraps_result": true}, {"name": "parse_int", "bridge_name": "parse_int", "passes_by_ref": false, "wraps_result": false}, {"name": "map_contains_key", "bridge_name": "map_contains_key", "passes_by_ref": true, "wraps_result": false}, {"name": "map_has", "bridge_name": "map_has", "passes_by_ref": true, "wraps_result": false}, {"name": "reverse", "bridge_name": "reverse", "passes_by_ref": false, "wraps_result": false}, {"name": "replace", "bridge_name": "replace", "passes_by_ref": false, "wraps_result": false}, {"name": "chars_to_string", "bridge_name": "chars_to_string", "passes_by_ref": true, "wraps_result": false}, {"name": "append", "bridge_name": "append", "passes_by_ref": false, "wraps_result": true}, {"name": "contains", "bridge_name": "contains", "passes_by_ref": false, "wraps_result": false}, {"name": "count", "bridge_name": "count", "passes_by_ref": false, "wraps_result": false}, {"name": "clamp", "bridge_name": "clamp", "passes_by_ref": false, "wraps_result": false}])) .expect("valid data definition") }; } @@ -430,72 +409,19 @@ pub fn rt_function_registry() -> Rc>> { } pub fn rt_functions() -> Rc> { - rt_function_registry().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, entry: Rc| { - v2_rt::rc_map_insert(acc, entry.name.clone(), true) - }, - ) + rt_function_registry().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, entry: Rc| v2_rt::rc_map_insert(acc, entry.name.clone(), true)) } pub fn rt_ref_map_functions() -> Rc> { - Rc::new({ - let mut __result = Vec::new(); - for f in rt_function_registry().iter().cloned() { - if f.passes_by_ref.clone() { - __result.push(f); - } - } - __result - }) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, entry: Rc| { - v2_rt::rc_map_insert(acc, entry.name.clone(), true) - }, - ) + Rc::new({ let mut __result = Vec::new(); for f in rt_function_registry().iter().cloned() { if f.passes_by_ref.clone() { __result.push(f); } } __result }).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, entry: Rc| v2_rt::rc_map_insert(acc, entry.name.clone(), true)) } pub fn rt_wraps_result() -> Rc> { - Rc::new({ - let mut __result = Vec::new(); - for f in rt_function_registry().iter().cloned() { - if f.wraps_result.clone() { - __result.push(f); - } - } - __result - }) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, entry: Rc| { - v2_rt::rc_map_insert(acc, entry.name.clone(), true) - }, - ) + Rc::new({ let mut __result = Vec::new(); for f in rt_function_registry().iter().cloned() { if f.wraps_result.clone() { __result.push(f); } } __result }).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, entry: Rc| v2_rt::rc_map_insert(acc, entry.name.clone(), true)) } pub fn rt_bridge_function_names() -> Rc> { - Rc::new({ - let mut __result = Vec::new(); - for f in rt_function_registry().iter().cloned() { - if (f.name.clone().as_str() != f.bridge_name.clone().as_str()) { - __result.push(f); - } - } - __result - }) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, entry: Rc| { - v2_rt::rc_map_insert(acc, entry.name.clone(), entry.bridge_name.clone()) - }, - ) + Rc::new({ let mut __result = Vec::new(); for f in rt_function_registry().iter().cloned() { if (f.name.clone().as_str() != f.bridge_name.clone().as_str()) { __result.push(f); } } __result }).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, entry: Rc| v2_rt::rc_map_insert(acc, entry.name.clone(), entry.bridge_name.clone())) } pub fn is_rt_function(name: String) -> bool { @@ -504,9 +430,9 @@ pub fn is_rt_function(name: String) -> bool { pub fn rt_bridge_name(name: String) -> String { match v2_rt::map_get(&rt_bridge_function_names(), name.clone()) { - Some(bridge) => bridge.clone(), - None => name.clone(), - } + Some(bridge) => bridge.clone(), + None => name.clone(), +} } pub fn rt_passes_by_ref(name: String) -> bool { diff --git a/src/v2/stage0/src/extdeps_languages_rust_syntax.rs b/src/v2/stage0/src/extdeps_languages_rust_syntax.rs index 41e62fe19b4..7ee94af98c8 100644 --- a/src/v2/stage0/src/extdeps_languages_rust_syntax.rs +++ b/src/v2/stage0/src/extdeps_languages_rust_syntax.rs @@ -1,124 +1,120 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.rust.syntax -use crate::std_syntax::BinOp::{Add, And, Div, Eq, Ge, Gt, Le, Lt, Mod, Mul, Ne, Or, Sub}; -use crate::std_syntax::BodyKind::{BlockBody, ExprBody, NoBody, TypeBody}; -use crate::std_syntax::ItemFormKind::{ - EnumForm, FuncForm, ModuleForm, OtherForm, StructForm, TypeAliasForm, -}; -use crate::std_syntax::LiteralValue::LitBool; -pub use crate::std_syntax::{ - BinOp, BodyKind, ItemForm, ItemFormKind, LiteralValue, OperatorSpec, SyntaxSpec, -}; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_syntax::{ItemForm, ItemFormKind, BodyKind, OperatorSpec, SyntaxSpec, BinOp, LiteralValue}; +use crate::std_syntax::ItemFormKind::{FuncForm, StructForm, EnumForm, TypeAliasForm, ModuleForm, OtherForm}; +use crate::std_syntax::BodyKind::{ExprBody, BlockBody, TypeBody, NoBody}; +use crate::std_syntax::BinOp::{Add, Sub, Mul, Div, Mod, Eq, Ne, Lt, Gt, Le, Ge, And, Or}; +use crate::std_syntax::LiteralValue::{LitBool}; pub fn rust_item_forms() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - Rc::new(vec![Rc::new(ItemForm { - kind: ItemFormKind::FuncForm, - keyword: "fn".to_string(), - has_type_params: true, - has_params: true, - has_return_type: true, - return_required: false, - has_uses: false, - body_kind: BodyKind::BlockBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::StructForm, - keyword: "struct".to_string(), - has_type_params: true, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::TypeBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::EnumForm, - keyword: "enum".to_string(), - has_type_params: true, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::TypeBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::TypeAliasForm, - keyword: "type".to_string(), - has_type_params: true, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::NoBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::OtherForm, - keyword: "trait".to_string(), - has_type_params: true, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::BlockBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::OtherForm, - keyword: "impl".to_string(), - has_type_params: true, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::BlockBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::OtherForm, - keyword: "const".to_string(), - has_type_params: false, - has_params: false, - has_return_type: true, - return_required: true, - has_uses: false, - body_kind: BodyKind::ExprBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::OtherForm, - keyword: "static".to_string(), - has_type_params: false, - has_params: false, - has_return_type: true, - return_required: true, - has_uses: false, - body_kind: BodyKind::ExprBody, - }), Rc::new(ItemForm { - kind: ItemFormKind::ModuleForm, - keyword: "mod".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::BlockBody, - })]) - }; - } + static CACHED: Rc>> = { + Rc::new(vec![Rc::new(ItemForm { + kind: ItemFormKind::FuncForm, + keyword: "fn".to_string(), + has_type_params: true, + has_params: true, + has_return_type: true, + return_required: false, + has_uses: false, + body_kind: BodyKind::BlockBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::StructForm, + keyword: "struct".to_string(), + has_type_params: true, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::TypeBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::EnumForm, + keyword: "enum".to_string(), + has_type_params: true, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::TypeBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::TypeAliasForm, + keyword: "type".to_string(), + has_type_params: true, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::NoBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::OtherForm, + keyword: "trait".to_string(), + has_type_params: true, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::BlockBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::OtherForm, + keyword: "impl".to_string(), + has_type_params: true, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::BlockBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::OtherForm, + keyword: "const".to_string(), + has_type_params: false, + has_params: false, + has_return_type: true, + return_required: true, + has_uses: false, + body_kind: BodyKind::ExprBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::OtherForm, + keyword: "static".to_string(), + has_type_params: false, + has_params: false, + has_return_type: true, + return_required: true, + has_uses: false, + body_kind: BodyKind::ExprBody, +}), Rc::new(ItemForm { + kind: ItemFormKind::ModuleForm, + keyword: "mod".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::BlockBody, +})]) + }; + } CACHED.with(|c| c.clone()) } pub fn rust_keyword_literals() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - let mut __m = HashMap::new(); - __m.insert("true".to_string(), Rc::new(LiteralValue::LitBool { - value: true, - })); - __m.insert("false".to_string(), Rc::new(LiteralValue::LitBool { - value: false, - })); - Rc::new(__m) - }; - } + static CACHED: Rc>> = { + let mut __m = HashMap::new(); + __m.insert("true".to_string(), Rc::new(LiteralValue::LitBool { + value: true, +})); + __m.insert("false".to_string(), Rc::new(LiteralValue::LitBool { + value: false, +})); + Rc::new(__m) + }; + } CACHED.with(|c| c.clone()) } @@ -171,107 +167,107 @@ pub fn rust_keyword_set() -> Rc> { pub fn rust_operators() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - Rc::new(vec![Rc::new(OperatorSpec { - symbol: "||".to_string(), - left_bp: 5, - right_bp: 6, - binop: Some(BinOp::Or), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "&&".to_string(), - left_bp: 7, - right_bp: 8, - binop: Some(BinOp::And), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "==".to_string(), - left_bp: 9, - right_bp: 10, - binop: Some(BinOp::Eq), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "!=".to_string(), - left_bp: 9, - right_bp: 10, - binop: Some(BinOp::Ne), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "<".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Lt), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: ">".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Gt), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "<=".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Le), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: ">=".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Ge), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "+".to_string(), - left_bp: 13, - right_bp: 14, - binop: Some(BinOp::Add), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "-".to_string(), - left_bp: 13, - right_bp: 14, - binop: Some(BinOp::Sub), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "*".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Mul), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "/".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Div), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: "%".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Mod), - algebra_field: None, - }), Rc::new(OperatorSpec { - symbol: ".".to_string(), - left_bp: 19, - right_bp: 20, - binop: None, - algebra_field: None, - })]) - }; - } + static CACHED: Rc>> = { + Rc::new(vec![Rc::new(OperatorSpec { + symbol: "||".to_string(), + left_bp: 5, + right_bp: 6, + binop: Some(BinOp::Or), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "&&".to_string(), + left_bp: 7, + right_bp: 8, + binop: Some(BinOp::And), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "==".to_string(), + left_bp: 9, + right_bp: 10, + binop: Some(BinOp::Eq), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "!=".to_string(), + left_bp: 9, + right_bp: 10, + binop: Some(BinOp::Ne), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "<".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Lt), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: ">".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Gt), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "<=".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Le), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: ">=".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Ge), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "+".to_string(), + left_bp: 13, + right_bp: 14, + binop: Some(BinOp::Add), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "-".to_string(), + left_bp: 13, + right_bp: 14, + binop: Some(BinOp::Sub), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "*".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Mul), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "/".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Div), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: "%".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Mod), + algebra_field: None, +}), Rc::new(OperatorSpec { + symbol: ".".to_string(), + left_bp: 19, + right_bp: 20, + binop: None, + algebra_field: None, +})]) + }; + } CACHED.with(|c| c.clone()) } pub fn rust_syntax_spec() -> Rc { thread_local! { - static CACHED: Rc = { - Rc::new(SyntaxSpec { - item_forms: rust_item_forms(), - operators: rust_operators(), - keyword_literals: rust_keyword_literals(), - keyword_set: rust_keyword_set(), - }) - }; - } + static CACHED: Rc = { + Rc::new(SyntaxSpec { + item_forms: rust_item_forms(), + operators: rust_operators(), + keyword_literals: rust_keyword_literals(), + keyword_set: rust_keyword_set(), +}) + }; + } CACHED.with(|c| c.clone()) } diff --git a/src/v2/stage0/src/extdeps_languages_rust_types.rs b/src/v2/stage0/src/extdeps_languages_rust_types.rs index dfc86341d78..ff74f611836 100644 --- a/src/v2/stage0/src/extdeps_languages_rust_types.rs +++ b/src/v2/stage0/src/extdeps_languages_rust_types.rs @@ -1,14 +1,14 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.rust.types -use self::OwnershipKind::*; -use self::SmartPointerKind::*; -pub use crate::std_coercion::{CallableRepr, CastRule, CastSyntax, InhabitantDecl, TypeCheckpoint}; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_coercion::{TypeCheckpoint, InhabitantDecl, CallableRepr, CastSyntax, CastRule}; +use self::OwnershipKind::*; +use self::SmartPointerKind::*; pub fn rust_type_checkpoints() -> Rc>> { thread_local! { @@ -76,13 +76,9 @@ pub enum OwnershipKind { RawPtr, } -pub fn pass_copy_by_value() -> bool { - true -} +pub fn pass_copy_by_value() -> bool { true } -pub fn pass_non_copy_by_ref() -> bool { - true -} +pub fn pass_non_copy_by_ref() -> bool { true } pub fn ref_prefix() -> String { thread_local! { diff --git a/src/v2/stage0/src/generated_method_template_projection.rs b/src/v2/stage0/src/generated_method_template_projection.rs index 0ec3341ea20..b6f8367137c 100644 --- a/src/v2/stage0/src/generated_method_template_projection.rs +++ b/src/v2/stage0/src/generated_method_template_projection.rs @@ -1,11 +1,11 @@ // Generated by v2 compiler -- do not edit. // Source module: generated.method_template_projection -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; pub fn rust_method_template_emit() -> Rc> { thread_local! { diff --git a/src/v2/stage0/src/lib.rs b/src/v2/stage0/src/lib.rs index 8ba13372286..8b07dea78cf 100644 --- a/src/v2/stage0/src/lib.rs +++ b/src/v2/stage0/src/lib.rs @@ -1,79 +1,69 @@ // Generated by v2 compiler -- do not edit. -#![allow( - unused_imports, - unused_variables, - unused_mut, - unused_parens, - dead_code, - unreachable_patterns, - non_shorthand_field_patterns, - suspicious_double_ref_op, - clippy::all -)] +#![allow(unused_imports, unused_variables, unused_mut, unused_parens, dead_code, unreachable_patterns, non_shorthand_field_patterns, suspicious_double_ref_op, clippy::all)] -pub mod cli_run; +pub mod std_error_primitives; +pub mod std_algebra; +pub mod std_types; pub mod extdeps_languages_dag_emit; +pub mod extdeps_languages_go_emit; +pub mod extdeps_languages_python_emit; +pub mod extdeps_languages_rust_emit; +pub mod generated_method_template_projection; +pub mod std_coercion; +pub mod std_http_path; +pub mod std_iteration; +pub mod std_syntax; +pub mod std_termination; +pub mod v2_compiler_runtime_rust; pub mod extdeps_languages_dag_syntax; pub mod extdeps_languages_dag_types; -pub mod extdeps_languages_go_emit; pub mod extdeps_languages_go_syntax; pub mod extdeps_languages_go_types; -pub mod extdeps_languages_python_emit; pub mod extdeps_languages_python_syntax; pub mod extdeps_languages_python_types; -pub mod extdeps_languages_rust_emit; pub mod extdeps_languages_rust_syntax; pub mod extdeps_languages_rust_types; -pub mod generated_method_template_projection; -pub mod rest_transport_facts; -pub mod std_algebra; -pub mod std_coercion; pub mod std_computation; pub mod std_effects; -pub mod std_error_primitives; pub mod std_graph; -pub mod std_http_path; pub mod std_induction; -pub mod std_iteration; +pub mod v2_compiler_effect_derivation; pub mod std_node; -pub mod std_syntax; -pub mod std_termination; -pub mod std_types; +pub mod v2_std_core; pub mod v2_compiler_artifact; +pub mod v2_compiler_infer_env; +pub mod v2_compiler_infer_types; +pub mod v2_compiler_resolve; +pub mod v2_compiler_tokenize; +pub mod v2_compiler_trace; pub mod v2_compiler_coercion; -pub mod v2_compiler_compile; -pub mod v2_compiler_compiler_tests_rust; -pub mod v2_compiler_complexity; -pub mod v2_compiler_effect_derivation; -pub mod v2_compiler_emit; -pub mod v2_compiler_emit_go; -pub mod v2_compiler_emit_python; -pub mod v2_compiler_emit_rust; -pub mod v2_compiler_infer; pub mod v2_compiler_infer_access; pub mod v2_compiler_infer_cycle; pub mod v2_compiler_infer_emit_info; -pub mod v2_compiler_infer_env; -pub mod v2_compiler_infer_items; -pub mod v2_compiler_infer_lookup; pub mod v2_compiler_infer_method; pub mod v2_compiler_infer_patterns; pub mod v2_compiler_infer_resolve; -pub mod v2_compiler_infer_service; pub mod v2_compiler_infer_sigs; -pub mod v2_compiler_infer_types; pub mod v2_compiler_languages; pub mod v2_compiler_normalize; -pub mod v2_compiler_ownership; +pub mod v2_compiler_compiler_tests_rust; +pub mod v2_compiler_infer_items; pub mod v2_compiler_parse; -pub mod v2_compiler_resolve; -pub mod v2_compiler_runtime_rust; -pub mod v2_compiler_tokenize; -pub mod v2_compiler_trace; -pub mod v2_interpreter; +pub mod v2_compiler_infer_service; +pub mod v2_compiler_infer_lookup; +pub mod v2_compiler_infer; +pub mod v2_compiler_emit; +pub mod v2_compiler_complexity; +pub mod v2_compiler_emit_go; +pub mod v2_compiler_emit_python; +pub mod v2_compiler_ownership; +pub mod v2_compiler_emit_rust; +pub mod v2_compiler_compile; pub mod v2_rt; -pub mod v2_std_core; +pub mod v2_interpreter; +pub mod cli_run; +pub mod rest_transport_facts; #[derive(Debug, Clone, PartialEq)] pub struct NonEmptyVec(Vec); diff --git a/src/v2/stage0/src/main.rs b/src/v2/stage0/src/main.rs index 229429e5f0d..ec899eedd43 100644 --- a/src/v2/stage0/src/main.rs +++ b/src/v2/stage0/src/main.rs @@ -6,14 +6,15 @@ use clap::{Parser, Subcommand}; use std::collections::HashMap; use std::rc::Rc; -use v2_compiler::cli_run; -use v2_compiler::v2_compiler_artifact; use v2_compiler::v2_compiler_compile; use v2_compiler::v2_compiler_compile::PipelineResult; +use v2_compiler::v2_compiler_artifact; use v2_compiler::v2_std_core::{ - byte_to_line_col, diagnostic_to_message, diagnostic_to_span, source_line_at, - CompilerDiagnostic, NewlineIndex, + diagnostic_to_message, diagnostic_to_span, + byte_to_line_col, source_line_at, NewlineIndex, + CompilerDiagnostic, }; +use v2_compiler::cli_run; #[derive(Parser)] #[command(name = "v2-compiled", about = "Generated CLI from DAG compiler")] @@ -42,7 +43,7 @@ enum Commands { #[arg(long, default_value = "rust")] target: String, }, - /// Execute a .dag program directly (interpreter) +/// Execute a .dag program directly (interpreter) Run { /// Source root directories (searched recursively for .dag files) #[arg(long = "source-root")] @@ -117,10 +118,8 @@ fn build_module_index(source_roots: &[String]) -> HashMap { +let _result = match cli.command { + Commands::Compile { source_roots, source_dir, output_dir, target } => { let render_target = match target.as_str() { "rust" => v2_compiler_artifact::RenderTarget::Rust, "python" => v2_compiler_artifact::RenderTarget::Python, "go" => v2_compiler_artifact::RenderTarget::Go, "dag" => v2_compiler_artifact::RenderTarget::Dag, other => { - eprintln!( - "unknown target: {}. supported: rust, python, go, dag", - other - ); + eprintln!("unknown target: {}. supported: rust, python, go, dag", other); std::process::exit(1); } }; @@ -195,11 +183,7 @@ fn main() { let sources = if !source_roots.is_empty() { // FF-9: Import-driven resolution from source roots let index = build_module_index(&source_roots); - eprintln!( - "indexed {} modules from {} source roots", - index.len(), - source_roots.len() - ); + eprintln!("indexed {} modules from {} source roots", index.len(), source_roots.len()); // Entry modules: all .dag files in the FIRST source root. // Additional roots are dependency pools resolved via imports. @@ -237,11 +221,9 @@ fn main() { resolved.push(Rc::new(v2_compiler_compile::SourceFile { path, content })); } } - eprintln!( - "resolved {} sources (transitive import closure)", - resolved.len() - ); + eprintln!("resolved {} sources (transitive import closure)", resolved.len()); resolved + } else if let Some(dir) = source_dir { // Legacy: flat directory scan (backward compatibility) let mut dag_paths = Vec::new(); @@ -256,13 +238,9 @@ fn main() { content, })); } - eprintln!( - "compiling {} .dag files from {} (target: {})", - sources.len(), - dir, - target - ); + eprintln!("compiling {} .dag files from {} (target: {})", sources.len(), dir, target); sources + } else { eprintln!("error: provide --source-root or --source-dir"); std::process::exit(1); @@ -280,18 +258,12 @@ fn main() { std::fs::write(&out_path, &*file.content) .unwrap_or_else(|e| panic!("failed to write {}: {}", file.path, e)); } - eprintln!( - "compiled: {} files emitted, {} diagnostics", - result.files.len(), - result.diagnostics.len() - ); + eprintln!("compiled: {} files emitted, {} diagnostics", + result.files.len(), result.diagnostics.len()); render_diagnostics(&result); // Complexity violations are non-blocking (analyzer limitations). let hard_errors = result.diagnostics.iter().any(|d| { - !matches!( - *d.diagnostic.clone(), - CompilerDiagnostic::ComplexityUnknown { .. } - ) + !matches!(*d.diagnostic.clone(), CompilerDiagnostic::ComplexityUnknown { .. }) }); if hard_errors { std::process::exit(1); @@ -300,14 +272,11 @@ fn main() { eprintln!("error: no files emitted"); std::process::exit(1); } - } + }, - Commands::Run { - source_roots, - function, - } => { + Commands::Run { source_roots, function } => { cli_run::handle_run(source_roots, function); - } + }, }; } @@ -373,10 +342,7 @@ fn render_one_diagnostic( indent, " ".repeat(gutter_width), " ".repeat(col_offset), - "^".repeat(std::cmp::min( - span_len, - line_text.len().saturating_sub(col_offset) - )) + "^".repeat(std::cmp::min(span_len, line_text.len().saturating_sub(col_offset))) ); } } diff --git a/src/v2/stage0/src/std_algebra.rs b/src/v2/stage0/src/std_algebra.rs index 81e3f747a1b..56137791ad0 100644 --- a/src/v2/stage0/src/std_algebra.rs +++ b/src/v2/stage0/src/std_algebra.rs @@ -1,20 +1,20 @@ // Generated by v2 compiler -- do not edit. // Source module: std.algebra +use std::collections::HashMap; +use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_error_primitives::{DivError, Result}; +use crate::std_error_primitives::DivError::*; +use crate::std_error_primitives::Result::*; +use self::Ordering::*; use self::AlgebraProfile::*; +use self::ContainerSource::*; use self::AlgebraTypeTemplate::*; use self::CollectionSizeEffect::*; -use self::ContainerSource::*; use self::CostShape::*; -use self::Ordering::*; -use crate::std_error_primitives::DivError::*; -use crate::std_error_primitives::Result::*; -pub use crate::std_error_primitives::{DivError, Result}; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; -use std::collections::HashMap; -use std::rc::Rc; #[derive(Clone)] pub struct Magma { @@ -52,6 +52,10 @@ pub struct AbelianGroup { pub inverse: Rc T>, } + + + + #[derive(Clone)] pub struct Semiring { pub add: Rc T>, @@ -192,7 +196,9 @@ pub enum AlgebraProfile { #[serde(tag = "_variant")] pub enum ContainerSource { SameAsReceiver, - Named { name: String }, + Named { + name: String, + }, } impl ContainerSource { pub fn name(&self) -> String { @@ -278,1127 +284,870 @@ pub fn kernel_algebra_profile() -> Rc> { } pub fn ordered_ring_templates() -> Rc>> { - Rc::new(vec![ - Rc::new(AlgebraFieldTemplate { - name: "add".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "zero".to_string(), - param_types: Rc::new(vec![]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "negate".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "mul".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "one".to_string(), - param_types: Rc::new(vec![]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "compare".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - ]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Ordering".to_string(), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "clamp".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: Some(CostShape::ShapeConstant), - callback_element_position: None, - }), - ]) + Rc::new(vec![Rc::new(AlgebraFieldTemplate { + name: "add".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "zero".to_string(), + param_types: Rc::new(vec![]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "negate".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "mul".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "one".to_string(), + param_types: Rc::new(vec![]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "compare".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Ordering".to_string(), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "clamp".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: Some(CostShape::ShapeConstant), + callback_element_position: None, +})]) } pub fn approximate_field_templates() -> Rc>> { - Rc::new(vec![ - Rc::new(AlgebraFieldTemplate { - name: "add".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "zero".to_string(), - param_types: Rc::new(vec![]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "negate".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "mul".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "one".to_string(), - param_types: Rc::new(vec![]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "reciprocal".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "compare".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - ]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Ordering".to_string(), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - ]) + Rc::new(vec![Rc::new(AlgebraFieldTemplate { + name: "add".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "zero".to_string(), + param_types: Rc::new(vec![]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "negate".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "mul".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "one".to_string(), + param_types: Rc::new(vec![]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "reciprocal".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "compare".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Ordering".to_string(), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +})]) } pub fn boolean_algebra_templates() -> Rc>> { - Rc::new(vec![ - Rc::new(AlgebraFieldTemplate { - name: "meet".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "join".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "complement".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "top".to_string(), - param_types: Rc::new(vec![]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "bottom".to_string(), - param_types: Rc::new(vec![]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - ]) + Rc::new(vec![Rc::new(AlgebraFieldTemplate { + name: "meet".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "join".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "complement".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "top".to_string(), + param_types: Rc::new(vec![]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "bottom".to_string(), + param_types: Rc::new(vec![]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +})]) } pub fn boolean_algebra_collection_templates() -> Rc>> { - Rc::new(vec![ - Rc::new(AlgebraFieldTemplate { - name: "union".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "intersect".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "diff".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "member".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverElement), - ]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "contains".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverElement), - ]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "filter".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - }), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: Some(CollectionSizeEffect::IdentityEffect), - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(0), - }), - Rc::new(AlgebraFieldTemplate { - name: "map".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "MappedElement".to_string(), - }), - }), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::SameAsReceiver), - element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "MappedElement".to_string(), - }), - }), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(0), - }), - Rc::new(AlgebraFieldTemplate { - name: "flat_map".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::SameAsReceiver), - element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "MappedElement".to_string(), - }), - }), - }), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::SameAsReceiver), - element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "MappedElement".to_string(), - }), - }), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(0), - }), - Rc::new(AlgebraFieldTemplate { - name: "fold".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "FoldAccumulator".to_string(), - }), - Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "FoldAccumulator".to_string(), - }), - Rc::new(AlgebraTypeTemplate::ReceiverElement), - ]), - return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "FoldAccumulator".to_string(), - }), - }), - ]), - return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "FoldAccumulator".to_string(), - }), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(1), - }), - Rc::new(AlgebraFieldTemplate { - name: "any".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - }), - ]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(0), - }), - Rc::new(AlgebraFieldTemplate { - name: "all".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - }), - ]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(0), - }), - Rc::new(AlgebraFieldTemplate { - name: "count".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), - }), - size_effect: None, - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "length".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), - }), - size_effect: None, - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, - }), - ]) + Rc::new(vec![Rc::new(AlgebraFieldTemplate { + name: "union".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "intersect".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "diff".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "member".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "contains".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "filter".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), +})]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: Some(CollectionSizeEffect::IdentityEffect), + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(0), +}), Rc::new(AlgebraFieldTemplate { + name: "map".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "MappedElement".to_string(), +}), +})]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::SameAsReceiver), + element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "MappedElement".to_string(), +}), +}), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(0), +}), Rc::new(AlgebraFieldTemplate { + name: "flat_map".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::SameAsReceiver), + element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "MappedElement".to_string(), +}), +}), +})]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::SameAsReceiver), + element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "MappedElement".to_string(), +}), +}), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(0), +}), Rc::new(AlgebraFieldTemplate { + name: "fold".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "FoldAccumulator".to_string(), +}), Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "FoldAccumulator".to_string(), +}), Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "FoldAccumulator".to_string(), +}), +})]), + return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "FoldAccumulator".to_string(), +}), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(1), +}), Rc::new(AlgebraFieldTemplate { + name: "any".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), +})]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(0), +}), Rc::new(AlgebraFieldTemplate { + name: "all".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), +})]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(0), +}), Rc::new(AlgebraFieldTemplate { + name: "count".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), +}), + size_effect: None, + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "length".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), +}), + size_effect: None, + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, +})]) } pub fn free_monoid_scalar_templates() -> Rc>> { - Rc::new(vec![ - Rc::new(AlgebraFieldTemplate { - name: "concat".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "empty".to_string(), - param_types: Rc::new(vec![]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "length".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "is_empty".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "chars".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::Named { - name: "List".to_string(), - }), - element: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), - }), - }), - size_effect: None, - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "split".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::Named { - name: "List".to_string(), - }), - element: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - }), - size_effect: None, - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "join".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::Named { - name: "List".to_string(), - }), - element: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - }), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "contains".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - ]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "starts_with".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - ]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "ends_with".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - ]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "trim".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "to_lower".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "to_upper".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "replace".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "substring".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), - }), - Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), - }), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "to_int".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "to_string".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "reverse".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - ]) + Rc::new(vec![Rc::new(AlgebraFieldTemplate { + name: "concat".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "empty".to_string(), + param_types: Rc::new(vec![]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "length".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "is_empty".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "chars".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::Named { + name: "List".to_string(), +}), + element: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), +}), +}), + size_effect: None, + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "split".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::Named { + name: "List".to_string(), +}), + element: Rc::new(AlgebraTypeTemplate::ReceiverSelf), +}), + size_effect: None, + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "join".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::Named { + name: "List".to_string(), +}), + element: Rc::new(AlgebraTypeTemplate::ReceiverSelf), +}), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "contains".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "starts_with".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "ends_with".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "trim".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "to_lower".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "to_upper".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "replace".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "substring".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), +}), Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), +})]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "to_int".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "to_string".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "reverse".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +})]) } pub fn free_monoid_collection_templates() -> Rc>> { - Rc::new(vec![ - Rc::new(AlgebraFieldTemplate { - name: "map".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "MappedElement".to_string(), - }), - }), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::SameAsReceiver), - element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "MappedElement".to_string(), - }), - }), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(0), - }), - Rc::new(AlgebraFieldTemplate { - name: "filter".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - }), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: Some(CollectionSizeEffect::IdentityEffect), - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(0), - }), - Rc::new(AlgebraFieldTemplate { - name: "flat_map".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::SameAsReceiver), - element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "MappedElement".to_string(), - }), - }), - }), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::SameAsReceiver), - element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "MappedElement".to_string(), - }), - }), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(0), - }), - Rc::new(AlgebraFieldTemplate { - name: "fold".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "FoldAccumulator".to_string(), - }), - Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "FoldAccumulator".to_string(), - }), - Rc::new(AlgebraTypeTemplate::ReceiverElement), - ]), - return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "FoldAccumulator".to_string(), - }), - }), - ]), - return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "FoldAccumulator".to_string(), - }), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(1), - }), - Rc::new(AlgebraFieldTemplate { - name: "any".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - }), - ]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(0), - }), - Rc::new(AlgebraFieldTemplate { - name: "all".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - }), - ]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(0), - }), - Rc::new(AlgebraFieldTemplate { - name: "count".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), - }), - size_effect: None, - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "first".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::OptionalOf { - inner: Rc::new(AlgebraTypeTemplate::ReceiverElement), - }), - size_effect: Some(CollectionSizeEffect::ProjectionEffect), - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "last".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::OptionalOf { - inner: Rc::new(AlgebraTypeTemplate::ReceiverElement), - }), - size_effect: Some(CollectionSizeEffect::ProjectionEffect), - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "skip".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), - }), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: Some(CollectionSizeEffect::ShrinkEffect), - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "take".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), - }), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "sort_by".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: Some(CollectionSizeEffect::IdentityEffect), - cost_shape: Some(CostShape::ShapeSortBody), - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "append".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverElement), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: Some(CostShape::ShapeConstant), - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "contains".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverElement), - ]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "enumerate".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::SameAsReceiver), - element: Rc::new(AlgebraTypeTemplate::TupleOf { - first: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), - }), - second: Rc::new(AlgebraTypeTemplate::ReceiverElement), - }), - }), - size_effect: Some(CollectionSizeEffect::IdentityEffect), - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "reverse".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: Some(CollectionSizeEffect::IdentityEffect), - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "join".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "String".to_string(), - }), - ]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "String".to_string(), - }), - size_effect: None, - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "concat".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "list_push".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverElement), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "length".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), - }), - size_effect: None, - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "is_empty".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - size_effect: None, - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, - }), - ]) + Rc::new(vec![Rc::new(AlgebraFieldTemplate { + name: "map".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "MappedElement".to_string(), +}), +})]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::SameAsReceiver), + element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "MappedElement".to_string(), +}), +}), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(0), +}), Rc::new(AlgebraFieldTemplate { + name: "filter".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), +})]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: Some(CollectionSizeEffect::IdentityEffect), + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(0), +}), Rc::new(AlgebraFieldTemplate { + name: "flat_map".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::SameAsReceiver), + element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "MappedElement".to_string(), +}), +}), +})]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::SameAsReceiver), + element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "MappedElement".to_string(), +}), +}), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(0), +}), Rc::new(AlgebraFieldTemplate { + name: "fold".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "FoldAccumulator".to_string(), +}), Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "FoldAccumulator".to_string(), +}), Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "FoldAccumulator".to_string(), +}), +})]), + return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "FoldAccumulator".to_string(), +}), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(1), +}), Rc::new(AlgebraFieldTemplate { + name: "any".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), +})]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(0), +}), Rc::new(AlgebraFieldTemplate { + name: "all".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), +})]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(0), +}), Rc::new(AlgebraFieldTemplate { + name: "count".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), +}), + size_effect: None, + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "first".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::OptionalOf { + inner: Rc::new(AlgebraTypeTemplate::ReceiverElement), +}), + size_effect: Some(CollectionSizeEffect::ProjectionEffect), + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "last".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::OptionalOf { + inner: Rc::new(AlgebraTypeTemplate::ReceiverElement), +}), + size_effect: Some(CollectionSizeEffect::ProjectionEffect), + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "skip".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), +})]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: Some(CollectionSizeEffect::ShrinkEffect), + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "take".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), +})]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "sort_by".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: Some(CollectionSizeEffect::IdentityEffect), + cost_shape: Some(CostShape::ShapeSortBody), + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "append".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: Some(CostShape::ShapeConstant), + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "contains".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "enumerate".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::SameAsReceiver), + element: Rc::new(AlgebraTypeTemplate::TupleOf { + first: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), +}), + second: Rc::new(AlgebraTypeTemplate::ReceiverElement), +}), +}), + size_effect: Some(CollectionSizeEffect::IdentityEffect), + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "reverse".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: Some(CollectionSizeEffect::IdentityEffect), + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "join".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "String".to_string(), +})]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "String".to_string(), +}), + size_effect: None, + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "concat".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "list_push".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "length".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), +}), + size_effect: None, + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "is_empty".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), + size_effect: None, + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, +})]) } pub fn partial_function_templates() -> Rc>> { - Rc::new(vec![ - Rc::new(AlgebraFieldTemplate { - name: "get".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverKey), - ]), - return_type: Rc::new(AlgebraTypeTemplate::OptionalOf { - inner: Rc::new(AlgebraTypeTemplate::ReceiverValue), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "map_get".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverKey), - ]), - return_type: Rc::new(AlgebraTypeTemplate::OptionalOf { - inner: Rc::new(AlgebraTypeTemplate::ReceiverValue), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "lookup".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverKey), - ]), - return_type: Rc::new(AlgebraTypeTemplate::OptionalOf { - inner: Rc::new(AlgebraTypeTemplate::ReceiverValue), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "map_insert".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverKey), - Rc::new(AlgebraTypeTemplate::ReceiverValue), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "map_merge".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "has".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverKey), - ]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "map_has".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverKey), - ]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "map_contains_key".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverKey), - ]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "keys".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::Named { - name: "List".to_string(), - }), - element: Rc::new(AlgebraTypeTemplate::ReceiverKey), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "map_keys".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::Named { - name: "List".to_string(), - }), - element: Rc::new(AlgebraTypeTemplate::ReceiverKey), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "values".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::Named { - name: "List".to_string(), - }), - element: Rc::new(AlgebraTypeTemplate::ReceiverValue), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "map_values".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::Named { - name: "List".to_string(), - }), - element: Rc::new(AlgebraTypeTemplate::ReceiverValue), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "with".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverKey), - Rc::new(AlgebraTypeTemplate::ReceiverValue), - ]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "contains".to_string(), - param_types: Rc::new(vec![ - Rc::new(AlgebraTypeTemplate::ReceiverSelf), - Rc::new(AlgebraTypeTemplate::ReceiverKey), - ]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - Rc::new(AlgebraFieldTemplate { - name: "length".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), - }), - size_effect: None, - cost_shape: None, - callback_element_position: None, - }), - ]) + Rc::new(vec![Rc::new(AlgebraFieldTemplate { + name: "get".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverKey)]), + return_type: Rc::new(AlgebraTypeTemplate::OptionalOf { + inner: Rc::new(AlgebraTypeTemplate::ReceiverValue), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "map_get".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverKey)]), + return_type: Rc::new(AlgebraTypeTemplate::OptionalOf { + inner: Rc::new(AlgebraTypeTemplate::ReceiverValue), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "lookup".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverKey)]), + return_type: Rc::new(AlgebraTypeTemplate::OptionalOf { + inner: Rc::new(AlgebraTypeTemplate::ReceiverValue), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "map_insert".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverKey), Rc::new(AlgebraTypeTemplate::ReceiverValue)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "map_merge".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "has".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverKey)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "map_has".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverKey)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "map_contains_key".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverKey)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "keys".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::Named { + name: "List".to_string(), +}), + element: Rc::new(AlgebraTypeTemplate::ReceiverKey), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "map_keys".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::Named { + name: "List".to_string(), +}), + element: Rc::new(AlgebraTypeTemplate::ReceiverKey), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "values".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::Named { + name: "List".to_string(), +}), + element: Rc::new(AlgebraTypeTemplate::ReceiverValue), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "map_values".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::Named { + name: "List".to_string(), +}), + element: Rc::new(AlgebraTypeTemplate::ReceiverValue), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "with".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverKey), Rc::new(AlgebraTypeTemplate::ReceiverValue)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "contains".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverKey)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +}), Rc::new(AlgebraFieldTemplate { + name: "length".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), +}), + size_effect: None, + cost_shape: None, + callback_element_position: None, +})]) } pub fn algebra_templates_for_profile(profile: AlgebraProfile) -> Rc>> { match profile { - AlgebraProfile::OrderedRingProfile => ordered_ring_templates(), - AlgebraProfile::ApproximateFieldProfile => approximate_field_templates(), - AlgebraProfile::BooleanAlgebraProfile => boolean_algebra_templates(), - AlgebraProfile::BooleanAlgebraCollectionProfile => boolean_algebra_collection_templates(), - AlgebraProfile::FreeMonoidScalarProfile => free_monoid_scalar_templates(), - AlgebraProfile::FreeMonoidCollectionProfile => free_monoid_collection_templates(), - AlgebraProfile::PartialFunctionProfile => partial_function_templates(), - } + AlgebraProfile::OrderedRingProfile => ordered_ring_templates(), + AlgebraProfile::ApproximateFieldProfile => approximate_field_templates(), + AlgebraProfile::BooleanAlgebraProfile => boolean_algebra_templates(), + AlgebraProfile::BooleanAlgebraCollectionProfile => boolean_algebra_collection_templates(), + AlgebraProfile::FreeMonoidScalarProfile => free_monoid_scalar_templates(), + AlgebraProfile::FreeMonoidCollectionProfile => free_monoid_collection_templates(), + AlgebraProfile::PartialFunctionProfile => partial_function_templates(), +} } pub fn algebra_type_param_names(profile: AlgebraProfile) -> Rc> { match profile { - AlgebraProfile::OrderedRingProfile => Rc::new(vec![]), - AlgebraProfile::ApproximateFieldProfile => Rc::new(vec![]), - AlgebraProfile::BooleanAlgebraProfile => Rc::new(vec![]), - AlgebraProfile::BooleanAlgebraCollectionProfile => Rc::new(vec!["T".to_string()]), - AlgebraProfile::FreeMonoidScalarProfile => Rc::new(vec![]), - AlgebraProfile::FreeMonoidCollectionProfile => Rc::new(vec!["T".to_string()]), - AlgebraProfile::PartialFunctionProfile => Rc::new(vec!["K".to_string(), "V".to_string()]), - } + AlgebraProfile::OrderedRingProfile => Rc::new(vec![]), + AlgebraProfile::ApproximateFieldProfile => Rc::new(vec![]), + AlgebraProfile::BooleanAlgebraProfile => Rc::new(vec![]), + AlgebraProfile::BooleanAlgebraCollectionProfile => Rc::new(vec!["T".to_string()]), + AlgebraProfile::FreeMonoidScalarProfile => Rc::new(vec![]), + AlgebraProfile::FreeMonoidCollectionProfile => Rc::new(vec!["T".to_string()]), + AlgebraProfile::PartialFunctionProfile => Rc::new(vec!["K".to_string(), "V".to_string()]), +} } diff --git a/src/v2/stage0/src/std_coercion.rs b/src/v2/stage0/src/std_coercion.rs index 84ed2736a2a..37e8e60fe56 100644 --- a/src/v2/stage0/src/std_coercion.rs +++ b/src/v2/stage0/src/std_coercion.rs @@ -1,11 +1,11 @@ // Generated by v2 compiler -- do not edit. // Source module: std.coercion -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct TypeCheckpoint { @@ -57,31 +57,9 @@ pub fn dag_cast_rules() -> Rc>> { } pub fn dag_can_cast(source_type: String, target_type: String) -> bool { - { - let mut __found = false; - for r in dag_cast_rules().iter().cloned() { - if ((r.from_type.clone().as_str() == source_type.clone().as_str()) - && (r.to_type.clone().as_str() == target_type.clone().as_str())) - { - __found = true; - break; - } - } - __found - } + { let mut __found = false; for r in dag_cast_rules().iter().cloned() { if ((r.from_type.clone().as_str() == source_type.clone().as_str()) && (r.to_type.clone().as_str() == target_type.clone().as_str())) { __found = true; break; } } __found } } pub fn is_dag_cast_domain_type(name: String) -> bool { - { - let mut __found = false; - for r in dag_cast_rules().iter().cloned() { - if ((r.from_type.clone().as_str() == name.clone().as_str()) - || (r.to_type.clone().as_str() == name.clone().as_str())) - { - __found = true; - break; - } - } - __found - } + { let mut __found = false; for r in dag_cast_rules().iter().cloned() { if ((r.from_type.clone().as_str() == name.clone().as_str()) || (r.to_type.clone().as_str() == name.clone().as_str())) { __found = true; break; } } __found } } diff --git a/src/v2/stage0/src/std_computation.rs b/src/v2/stage0/src/std_computation.rs index 73550cefcca..bf35aa694af 100644 --- a/src/v2/stage0/src/std_computation.rs +++ b/src/v2/stage0/src/std_computation.rs @@ -1,46 +1,53 @@ // Generated by v2 compiler -- do not edit. // Source module: std.computation -use self::CallPattern::*; -use self::IterationDimension::*; -use self::IterationPrimitive::*; -use self::ShrinkFactor::*; -use self::SizeBound::*; -use crate::std_algebra::AlgebraProfile::{ - ApproximateFieldProfile, BooleanAlgebraCollectionProfile, BooleanAlgebraProfile, - FreeMonoidCollectionProfile, FreeMonoidScalarProfile, OrderedRingProfile, - PartialFunctionProfile, -}; -pub use crate::std_algebra::{kernel_algebra_profile, AlgebraProfile}; -use crate::std_termination::DescentEvidence::DescentUnknown; -use crate::std_termination::PositiveDescentAmount::{AdditionalStep, OneStep}; -use crate::std_termination::ProportionalDivisor::{DivideByTwo, StrictlyLarger}; -use crate::std_termination::RankingDimension::*; -pub use crate::std_termination::{ - positive_descent_count, DescentEvidence, PositiveDescentAmount, ProportionalDivisor, - RankingDimension, -}; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_termination::{DescentEvidence, RankingDimension, PositiveDescentAmount, ProportionalDivisor, positive_descent_count}; +use crate::std_termination::DescentEvidence::{DescentUnknown}; +use crate::std_termination::PositiveDescentAmount::{OneStep, AdditionalStep}; +use crate::std_termination::ProportionalDivisor::{DivideByTwo, StrictlyLarger}; +use crate::std_termination::RankingDimension::*; +pub use crate::std_algebra::{AlgebraProfile, kernel_algebra_profile}; +use crate::std_algebra::AlgebraProfile::{OrderedRingProfile, ApproximateFieldProfile, BooleanAlgebraProfile, BooleanAlgebraCollectionProfile, FreeMonoidScalarProfile, FreeMonoidCollectionProfile, PartialFunctionProfile}; +use self::SizeBound::*; +use self::CallPattern::*; +use self::ShrinkFactor::*; +use self::IterationPrimitive::*; +use self::IterationDimension::*; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum SizeBound { - CollectionSize { param: String }, - ParserStreamSize { witness: String }, - WorklistDrainSize { element: String }, - TreeSize { param: String }, - ArithmeticParam { param: String }, + CollectionSize { + param: String, + }, + ParserStreamSize { + witness: String, + }, + WorklistDrainSize { + element: String, + }, + TreeSize { + param: String, + }, + ArithmeticParam { + param: String, + }, ExplicitCountZero, - ExplicitCountPositive { steps: Rc }, + ExplicitCountPositive { + steps: Rc, + }, Forever, } pub fn tree_size_bound(param: String) -> Rc { - Rc::new(SizeBound::TreeSize { param: param }) + Rc::new(SizeBound::TreeSize { + param: param, +}) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -77,8 +84,12 @@ pub enum CallPattern { #[serde(tag = "_variant")] pub enum ShrinkFactor { UnitShrink, - ConstantShrink { steps: Rc }, - ProportionalShrink { divisor: Rc }, + ConstantShrink { + steps: Rc, + }, + ProportionalShrink { + divisor: Rc, + }, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -99,94 +110,97 @@ pub enum IterationPrimitive { pub fn lower_call_pattern(pattern: Rc) -> Rc { match (*pattern).clone() { - CallPattern::ChildAccessorCall { accessor: a, .. } => Rc::new(LoweringTarget { - primitive: IterationPrimitive::Descend, - bound: Rc::new(SizeBound::TreeSize { param: a.clone() }), - evidence: DescentEvidence::Strict, - factor: None, - }), - CallPattern::CollectionShrinkCall { - amount: p, - collection: c, - .. - } => Rc::new(LoweringTarget { - primitive: IterationPrimitive::Fold, - bound: Rc::new(SizeBound::CollectionSize { param: c.clone() }), - evidence: DescentEvidence::Strict, - factor: Some(Rc::new(ShrinkFactor::ConstantShrink { steps: p.clone() })), - }), - CallPattern::ArithmeticSubtractCall { - steps: p, - ring_param: r, - .. - } => Rc::new(LoweringTarget { - primitive: IterationPrimitive::Repeat, - bound: Rc::new(SizeBound::ArithmeticParam { param: r.clone() }), - evidence: DescentEvidence::Strict, - factor: Some(Rc::new(ShrinkFactor::ConstantShrink { steps: p.clone() })), - }), - CallPattern::ArithmeticDivideCall { - divisor: d, - ring_param: r, - .. - } => Rc::new(LoweringTarget { - primitive: IterationPrimitive::Repeat, - bound: Rc::new(SizeBound::ArithmeticParam { param: r.clone() }), - evidence: DescentEvidence::Strict, - factor: Some(Rc::new(ShrinkFactor::ProportionalShrink { - divisor: d.clone(), - })), - }), - CallPattern::ParserAdvanceCall { witness: w, .. } => Rc::new(LoweringTarget { - primitive: IterationPrimitive::Fold, - bound: Rc::new(SizeBound::ParserStreamSize { witness: w.clone() }), - evidence: DescentEvidence::Strict, - factor: None, - }), - CallPattern::WorklistDrainCall { element: e, .. } => Rc::new(LoweringTarget { - primitive: IterationPrimitive::Fold, - bound: Rc::new(SizeBound::WorklistDrainSize { element: e.clone() }), - evidence: DescentEvidence::Strict, - factor: None, - }), - CallPattern::FoldBodyCall { - outer_collection: oc, - .. - } => Rc::new(LoweringTarget { - primitive: IterationPrimitive::Fold, - bound: Rc::new(SizeBound::CollectionSize { param: oc.clone() }), - evidence: DescentEvidence::NonIncreasing, - factor: None, - }), - CallPattern::SameArgumentCall => Rc::new(LoweringTarget { - primitive: IterationPrimitive::Repeat, - bound: Rc::new(SizeBound::Forever), - evidence: DescentEvidence::NonIncreasing, - factor: None, - }), - } + CallPattern::ChildAccessorCall { accessor: a, .. } => Rc::new(LoweringTarget { + primitive: IterationPrimitive::Descend, + bound: Rc::new(SizeBound::TreeSize { + param: a.clone(), +}), + evidence: DescentEvidence::Strict, + factor: None, +}), + CallPattern::CollectionShrinkCall { amount: p, collection: c, .. } => Rc::new(LoweringTarget { + primitive: IterationPrimitive::Fold, + bound: Rc::new(SizeBound::CollectionSize { + param: c.clone(), +}), + evidence: DescentEvidence::Strict, + factor: Some(Rc::new(ShrinkFactor::ConstantShrink { + steps: p.clone(), +})), +}), + CallPattern::ArithmeticSubtractCall { steps: p, ring_param: r, .. } => Rc::new(LoweringTarget { + primitive: IterationPrimitive::Repeat, + bound: Rc::new(SizeBound::ArithmeticParam { + param: r.clone(), +}), + evidence: DescentEvidence::Strict, + factor: Some(Rc::new(ShrinkFactor::ConstantShrink { + steps: p.clone(), +})), +}), + CallPattern::ArithmeticDivideCall { divisor: d, ring_param: r, .. } => Rc::new(LoweringTarget { + primitive: IterationPrimitive::Repeat, + bound: Rc::new(SizeBound::ArithmeticParam { + param: r.clone(), +}), + evidence: DescentEvidence::Strict, + factor: Some(Rc::new(ShrinkFactor::ProportionalShrink { + divisor: d.clone(), +})), +}), + CallPattern::ParserAdvanceCall { witness: w, .. } => Rc::new(LoweringTarget { + primitive: IterationPrimitive::Fold, + bound: Rc::new(SizeBound::ParserStreamSize { + witness: w.clone(), +}), + evidence: DescentEvidence::Strict, + factor: None, +}), + CallPattern::WorklistDrainCall { element: e, .. } => Rc::new(LoweringTarget { + primitive: IterationPrimitive::Fold, + bound: Rc::new(SizeBound::WorklistDrainSize { + element: e.clone(), +}), + evidence: DescentEvidence::Strict, + factor: None, +}), + CallPattern::FoldBodyCall { outer_collection: oc, .. } => Rc::new(LoweringTarget { + primitive: IterationPrimitive::Fold, + bound: Rc::new(SizeBound::CollectionSize { + param: oc.clone(), +}), + evidence: DescentEvidence::NonIncreasing, + factor: None, +}), + CallPattern::SameArgumentCall => Rc::new(LoweringTarget { + primitive: IterationPrimitive::Repeat, + bound: Rc::new(SizeBound::Forever), + evidence: DescentEvidence::NonIncreasing, + factor: None, +}), +} } pub fn size_bound_param(bound: Rc) -> Option { match (*bound).clone() { - SizeBound::TreeSize { param: p, .. } => Some(p.clone()), - SizeBound::CollectionSize { param: p, .. } => Some(p.clone()), - SizeBound::ParserStreamSize { witness: w, .. } => Some(w.clone()), - SizeBound::WorklistDrainSize { element: e, .. } => Some(e.clone()), - SizeBound::ArithmeticParam { param: p, .. } => Some(p.clone()), - SizeBound::ExplicitCountZero => None, - SizeBound::ExplicitCountPositive { .. } => None, - SizeBound::Forever => None, - } + SizeBound::TreeSize { param: p, .. } => Some(p.clone()), + SizeBound::CollectionSize { param: p, .. } => Some(p.clone()), + SizeBound::ParserStreamSize { witness: w, .. } => Some(w.clone()), + SizeBound::WorklistDrainSize { element: e, .. } => Some(e.clone()), + SizeBound::ArithmeticParam { param: p, .. } => Some(p.clone()), + SizeBound::ExplicitCountZero => None, + SizeBound::ExplicitCountPositive { .. } => None, + SizeBound::Forever => None, +} } pub fn is_constant_bound(bound: Rc) -> bool { match (*bound).clone() { - SizeBound::ExplicitCountZero => true, - SizeBound::ExplicitCountPositive { .. } => true, - SizeBound::Forever => true, - _ => false, - } + SizeBound::ExplicitCountZero => true, + SizeBound::ExplicitCountPositive { .. } => true, + SizeBound::Forever => true, + _ => false, +} } pub fn forever_iteration_bound() -> i64 { @@ -195,13 +209,11 @@ pub fn forever_iteration_bound() -> i64 { pub fn constant_bound_value(bound: Rc) -> Option { match (*bound).clone() { - SizeBound::ExplicitCountZero => Some(0), - SizeBound::ExplicitCountPositive { steps: s, .. } => { - Some(positive_descent_count(s.clone())) - } - SizeBound::Forever => Some(forever_iteration_bound()), - _ => None, - } + SizeBound::ExplicitCountZero => Some(0), + SizeBound::ExplicitCountPositive { steps: s, .. } => Some(positive_descent_count(s.clone())), + SizeBound::Forever => Some(forever_iteration_bound()), + _ => None, +} } #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] @@ -214,14 +226,14 @@ pub enum IterationDimension { pub fn algebra_profile_to_dimension(profile: AlgebraProfile) -> Option { match profile { - AlgebraProfile::FreeMonoidCollectionProfile => Some(IterationDimension::CollectionFold), - AlgebraProfile::FreeMonoidScalarProfile => Some(IterationDimension::CollectionFold), - AlgebraProfile::BooleanAlgebraCollectionProfile => Some(IterationDimension::CollectionFold), - AlgebraProfile::PartialFunctionProfile => Some(IterationDimension::CollectionFold), - AlgebraProfile::OrderedRingProfile => Some(IterationDimension::ArithmeticRepeat), - AlgebraProfile::ApproximateFieldProfile => Some(IterationDimension::ArithmeticRepeat), - AlgebraProfile::BooleanAlgebraProfile => None, - } + AlgebraProfile::FreeMonoidCollectionProfile => Some(IterationDimension::CollectionFold), + AlgebraProfile::FreeMonoidScalarProfile => Some(IterationDimension::CollectionFold), + AlgebraProfile::BooleanAlgebraCollectionProfile => Some(IterationDimension::CollectionFold), + AlgebraProfile::PartialFunctionProfile => Some(IterationDimension::CollectionFold), + AlgebraProfile::OrderedRingProfile => Some(IterationDimension::ArithmeticRepeat), + AlgebraProfile::ApproximateFieldProfile => Some(IterationDimension::ArithmeticRepeat), + AlgebraProfile::BooleanAlgebraProfile => None, +} } pub fn type_iteration_dimension(type_name: &String) -> Option { @@ -229,8 +241,8 @@ pub fn type_iteration_dimension(type_name: &String) -> Option algebra_profile_to_dimension(p.clone()), - None => None, - } + Some(p) => algebra_profile_to_dimension(p.clone()), + None => None, +} } } diff --git a/src/v2/stage0/src/std_effects.rs b/src/v2/stage0/src/std_effects.rs index d194f9b2508..baae2114f91 100644 --- a/src/v2/stage0/src/std_effects.rs +++ b/src/v2/stage0/src/std_effects.rs @@ -1,30 +1,32 @@ // Generated by v2 compiler -- do not edit. // Source module: std.effects -use self::CompositionVerdict::*; -use self::DeriveOpEffectResult::*; +use std::collections::HashMap; +use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_types::{HttpMethod}; +use crate::std_types::HttpMethod::{GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS}; +pub use crate::std_http_path::{PathTemplate, PathTemplateParseResult, parse_path_template, has_path_params, last_path_param}; +use crate::std_http_path::PathTemplateParseResult::{ParsedPathTemplate, MalformedPathTemplate}; use self::EffectShape::*; -use self::IdempotencyEvidence::*; use self::KeySource::*; +use self::IdempotencyEvidence::*; +use self::CompositionVerdict::*; +use self::DeriveOpEffectResult::*; use self::ModifierAgreement::*; -use crate::std_http_path::PathTemplateParseResult::{MalformedPathTemplate, ParsedPathTemplate}; -pub use crate::std_http_path::{ - has_path_params, last_path_param, parse_path_template, PathTemplate, PathTemplateParseResult, -}; -pub use crate::std_types::HttpMethod; -use crate::std_types::HttpMethod::{DELETE, GET, HEAD, OPTIONS, PATCH, POST, PUT}; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; -use std::collections::HashMap; -use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum EffectShape { ReadEffect, - UpsertEffect { key_source: Rc }, - DeleteEffect { key_source: Rc }, + UpsertEffect { + key_source: Rc, + }, + DeleteEffect { + key_source: Rc, + }, CreateEffect, AppendEffect, } @@ -32,12 +34,8 @@ impl EffectShape { pub fn key_source(&self) -> Rc { match self { EffectShape::ReadEffect => panic!("no key_source on unit variant"), - EffectShape::UpsertEffect { - key_source: __val, .. - } => __val.clone(), - EffectShape::DeleteEffect { - key_source: __val, .. - } => __val.clone(), + EffectShape::UpsertEffect { key_source: __val, .. } => __val.clone(), + EffectShape::DeleteEffect { key_source: __val, .. } => __val.clone(), EffectShape::CreateEffect => panic!("no key_source on unit variant"), EffectShape::AppendEffect => panic!("no key_source on unit variant"), } @@ -47,9 +45,15 @@ impl EffectShape { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum KeySource { - PathParam { param: String }, - InputField { field: String }, - CompositeKey { fields: Rc> }, + PathParam { + param: String, + }, + InputField { + field: String, + }, + CompositeKey { + fields: Rc>, + }, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -76,12 +80,12 @@ impl IdempotencyEvidence { pub fn is_idempotent_effect(shape: Rc) -> bool { match (*shape).clone() { - EffectShape::ReadEffect => true, - EffectShape::UpsertEffect { .. } => true, - EffectShape::DeleteEffect { .. } => true, - EffectShape::CreateEffect => false, - EffectShape::AppendEffect => false, - } + EffectShape::ReadEffect => true, + EffectShape::UpsertEffect { .. } => true, + EffectShape::DeleteEffect { .. } => true, + EffectShape::CreateEffect => false, + EffectShape::AppendEffect => false, +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -95,43 +99,32 @@ pub struct OperationEffect { #[serde(tag = "_variant")] pub enum CompositionVerdict { IdempotentComposition, - BrokenBy { first_breaker: Rc }, + BrokenBy { + first_breaker: Rc, + }, } impl CompositionVerdict { pub fn first_breaker(&self) -> Rc { match self { - CompositionVerdict::IdempotentComposition => { - panic!("no first_breaker on unit variant") - } - CompositionVerdict::BrokenBy { - first_breaker: __val, - .. - } => __val.clone(), + CompositionVerdict::IdempotentComposition => panic!("no first_breaker on unit variant"), + CompositionVerdict::BrokenBy { first_breaker: __val, .. } => __val.clone(), } } } pub fn compose_effects(effects: Rc>>) -> Rc { { - let non_idempotent = Rc::new({ - let mut __result = Vec::new(); - for e in effects.iter().cloned() { - if match (*e.evidence.clone()).clone() { - IdempotencyEvidence::NonIdempotent { .. } => true, - _ => false, - } { - __result.push(e); - } - } - __result - }); - match non_idempotent.first().cloned() { - Some(op) => Rc::new(CompositionVerdict::BrokenBy { - first_breaker: op.clone(), - }), - None => Rc::new(CompositionVerdict::IdempotentComposition), - } - } + let non_idempotent = Rc::new({ let mut __result = Vec::new(); for e in effects.iter().cloned() { if match (*e.evidence.clone()).clone() { + IdempotencyEvidence::NonIdempotent { .. } => true, + _ => false, +} { __result.push(e); } } __result }); +match non_idempotent.first().cloned() { + Some(op) => Rc::new(CompositionVerdict::BrokenBy { + first_breaker: op.clone(), +}), + None => Rc::new(CompositionVerdict::IdempotentComposition), +} +} } pub fn parse_http_method(raw: &String) -> Option { @@ -195,53 +188,61 @@ pub enum DeriveOpEffectResult { pub fn derive_effect_shape(method: HttpMethod, path: Rc) -> Rc { match method { - HttpMethod::GET => Rc::new(EffectShape::ReadEffect), - HttpMethod::HEAD => Rc::new(EffectShape::ReadEffect), - HttpMethod::OPTIONS => Rc::new(EffectShape::ReadEffect), - HttpMethod::POST => Rc::new(EffectShape::CreateEffect), - HttpMethod::DELETE => match last_path_param(path) { - Some(p) => Rc::new(EffectShape::DeleteEffect { - key_source: Rc::new(KeySource::PathParam { param: p.clone() }), - }), - None => Rc::new(EffectShape::CreateEffect), - }, - HttpMethod::PUT => match last_path_param(path) { - Some(p) => Rc::new(EffectShape::UpsertEffect { - key_source: Rc::new(KeySource::PathParam { param: p.clone() }), - }), - None => Rc::new(EffectShape::CreateEffect), - }, - HttpMethod::PATCH => match last_path_param(path) { - Some(p) => Rc::new(EffectShape::UpsertEffect { - key_source: Rc::new(KeySource::PathParam { param: p.clone() }), - }), - None => Rc::new(EffectShape::CreateEffect), - }, - } + HttpMethod::GET => Rc::new(EffectShape::ReadEffect), + HttpMethod::HEAD => Rc::new(EffectShape::ReadEffect), + HttpMethod::OPTIONS => Rc::new(EffectShape::ReadEffect), + HttpMethod::POST => Rc::new(EffectShape::CreateEffect), + HttpMethod::DELETE => match last_path_param(path) { + Some(p) => Rc::new(EffectShape::DeleteEffect { + key_source: Rc::new(KeySource::PathParam { + param: p.clone(), +}), +}), + None => Rc::new(EffectShape::CreateEffect), +}, + HttpMethod::PUT => match last_path_param(path) { + Some(p) => Rc::new(EffectShape::UpsertEffect { + key_source: Rc::new(KeySource::PathParam { + param: p.clone(), +}), +}), + None => Rc::new(EffectShape::CreateEffect), +}, + HttpMethod::PATCH => match last_path_param(path) { + Some(p) => Rc::new(EffectShape::UpsertEffect { + key_source: Rc::new(KeySource::PathParam { + param: p.clone(), +}), +}), + None => Rc::new(EffectShape::CreateEffect), +}, +} } -pub fn derive_op_effect( - operation_name: String, - method: HttpMethod, - path: Rc, -) -> Rc { - let shape = derive_effect_shape(method.clone(), path.clone()); - Rc::new(DeriveOpEffectResult::DerivedEffect { - effect: Rc::new(DerivedOpEffect { - operation_name: operation_name, - method: method.clone(), - path_template: path.clone(), - shape: shape, - }), - }) +pub fn derive_op_effect(operation_name: String, method: &HttpMethod, path: &Rc) -> Rc { + { + let shape = derive_effect_shape(method.clone(), path.clone()); +Rc::new(DeriveOpEffectResult::DerivedEffect { + effect: Rc::new(DerivedOpEffect { + operation_name: operation_name, + method: method.clone(), + path_template: path.clone(), + shape: shape, +}), +}) +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum ModifierAgreement { Agrees, - Disagrees { reason: String }, - DerivationUnknown { reason: String }, + Disagrees { + reason: String, + }, + DerivationUnknown { + reason: String, + }, } impl ModifierAgreement { pub fn reason(&self) -> String { @@ -262,14 +263,10 @@ pub struct ModifierCheck { pub agreement: Rc, } -pub fn check_modifier_vs_derivation( - op: &Rc, - declared_idempotent: &bool, - declared_readonly: &bool, -) -> Rc { +pub fn check_modifier_vs_derivation(op: &Rc, declared_idempotent: &bool, declared_readonly: &bool) -> Rc { { let derived_idempotent = is_idempotent_effect(op.shape.clone()); - let agreement = if (declared_idempotent.clone() && derived_idempotent.clone()) { +let agreement = if (declared_idempotent.clone() && derived_idempotent.clone()) { Rc::new(ModifierAgreement::Agrees) } else { if (declared_idempotent.clone() && !derived_idempotent.clone()) { @@ -284,27 +281,26 @@ pub fn check_modifier_vs_derivation( } else { if (!declared_idempotent.clone() && declared_readonly.clone()) { match op.method.clone() { - HttpMethod::GET => Rc::new(ModifierAgreement::Agrees), - HttpMethod::HEAD => Rc::new(ModifierAgreement::Agrees), - HttpMethod::OPTIONS => Rc::new(ModifierAgreement::Agrees), - _ => Rc::new(ModifierAgreement::Disagrees { - reason: "readonly declared but method is not GET/HEAD/OPTIONS" - .to_string(), - }), - } + HttpMethod::GET => Rc::new(ModifierAgreement::Agrees), + HttpMethod::HEAD => Rc::new(ModifierAgreement::Agrees), + HttpMethod::OPTIONS => Rc::new(ModifierAgreement::Agrees), + _ => Rc::new(ModifierAgreement::Disagrees { + reason: "readonly declared but method is not GET/HEAD/OPTIONS".to_string(), +}), +} } else { Rc::new(ModifierAgreement::Agrees) } } }; - Rc::new(ModifierCheck { - operation_name: op.operation_name.clone(), - declared_idempotent: declared_idempotent.clone(), - declared_readonly: declared_readonly.clone(), - derived_shape: op.shape.clone(), - agreement: agreement, - }) - } +Rc::new(ModifierCheck { + operation_name: op.operation_name.clone(), + declared_idempotent: declared_idempotent.clone(), + declared_readonly: declared_readonly.clone(), + derived_shape: op.shape.clone(), + agreement: agreement, +}) +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -315,32 +311,13 @@ pub struct IdempotencyTestObligation { pub witness_required: bool, } -pub fn generate_idempotency_obligations( - ops: Rc>>, -) -> Rc>> { - Rc::new({ - let mut __result = Vec::new(); - for o in Rc::new({ - let mut __result = Vec::new(); - for o in ops.iter().cloned() { - if is_idempotent_effect(o.shape.clone()) { - __result.push(o); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(Rc::new(IdempotencyTestObligation { - operation_name: o.operation_name.clone(), - effect_shape: o.shape.clone(), - claim: "f(f(x)) == f(x)".to_string(), - witness_required: true, - })); - } - __result - }) +pub fn generate_idempotency_obligations(ops: Rc>>) -> Rc>> { + Rc::new({ let mut __result = Vec::new(); for o in Rc::new({ let mut __result = Vec::new(); for o in ops.iter().cloned() { if is_idempotent_effect(o.shape.clone()) { __result.push(o); } } __result }).iter().cloned() { __result.push(Rc::new(IdempotencyTestObligation { + operation_name: o.operation_name.clone(), + effect_shape: o.shape.clone(), + claim: "f(f(x)) == f(x)".to_string(), + witness_required: true, +})); } __result }) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] diff --git a/src/v2/stage0/src/std_error_primitives.rs b/src/v2/stage0/src/std_error_primitives.rs index a3fc3d2d54b..52d156a47f2 100644 --- a/src/v2/stage0/src/std_error_primitives.rs +++ b/src/v2/stage0/src/std_error_primitives.rs @@ -3,19 +3,23 @@ #![allow(non_camel_case_types)] -use self::DivError::*; -use self::Result::*; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +use self::Result::*; +use self::DivError::*; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum Result { - Ok { value: Box }, - Err { value: Box }, + Ok { + value: Box, + }, + Err { + value: Box, + }, } #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] diff --git a/src/v2/stage0/src/std_graph.rs b/src/v2/stage0/src/std_graph.rs index 4f8f637f057..55158d87d5b 100644 --- a/src/v2/stage0/src/std_graph.rs +++ b/src/v2/stage0/src/std_graph.rs @@ -1,13 +1,13 @@ // Generated by v2 compiler -- do not edit. // Source module: std.graph -use crate::std_termination::DescentEvidence::{DescentUnknown, NonIncreasing, Strict}; -pub use crate::std_termination::{DescentEvidence, ProofEdge, TerminationProof}; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_termination::{ProofEdge, DescentEvidence, TerminationProof}; +use crate::std_termination::DescentEvidence::{Strict, NonIncreasing, DescentUnknown}; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct GraphEdge { @@ -28,177 +28,108 @@ pub struct CallGraphAdjacencyViews { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct DfsFinishAcc { - pub visited: Rc>, + pub visited: Rc>, pub order: Rc>, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct SccComponentAcc { - pub visited: Rc>, + pub visited: Rc>, pub members: Rc>, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct SccCycleAcc { - pub visited: Rc>, + pub visited: Rc>, pub has_cycle: bool, } -pub fn set_has(m: Rc>, key: String) -> bool { - (v2_rt::map_get(&m, key) != None) -} - pub fn seed_adjacency_map(names: Rc>) -> Rc>>> { - names.iter().cloned().fold( - v2_rt::rc_empty_map::>>(), - |acc: Rc>>>, name: String| { - v2_rt::rc_map_insert(acc, name.clone(), Rc::new(vec![])) - }, - ) + names.iter().cloned().fold(v2_rt::rc_empty_map::>>(), |acc: Rc>>>, name: String| v2_rt::rc_map_insert(acc, name.clone(), Rc::new(vec![]))) } -pub fn build_call_graph_from_proof_edges( - names: Rc>, - edges: Rc>>, -) -> Rc { +pub fn build_call_graph_from_proof_edges(names: Rc>, edges: Rc>>) -> Rc { Rc::new(CallGraph { - edges: Rc::new({ - let mut __result = Vec::new(); - for e in Rc::new({ - let mut __result = Vec::new(); - for e in edges.iter().cloned() { - if (e.caller.clone().as_str() != e.callee.clone().as_str()) { - __result.push(e); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(Rc::new(GraphEdge { - caller: e.caller.clone(), - callee: e.callee.clone(), - })); - } - __result - }), - }) + edges: Rc::new({ let mut __result = Vec::new(); for e in Rc::new({ let mut __result = Vec::new(); for e in edges.iter().cloned() { if (e.caller.clone().as_str() != e.callee.clone().as_str()) { __result.push(e); } } __result }).iter().cloned() { __result.push(Rc::new(GraphEdge { + caller: e.caller.clone(), + callee: e.callee.clone(), +})); } __result }), +}) } -pub fn build_adjacency_views( - names: &Rc>, - graph: Rc, -) -> Rc { +pub fn build_adjacency_views(names: &Rc>, graph: Rc) -> Rc { { let initial_forward = seed_adjacency_map(names.clone()); - let initial_reverse = seed_adjacency_map(names.clone()); - graph.edges.clone().iter().cloned().fold( - Rc::new(CallGraphAdjacencyViews { - forward: initial_forward, - reverse: initial_reverse, - }), - |acc: Rc, edge: Rc| { - let forward_neighbors = - match v2_rt::map_get(&acc.forward.clone(), edge.caller.clone()) { - Some(ns) => v2_rt::concat(ns.clone(), Rc::new(vec![edge.callee.clone()])), - None => Rc::new(vec![edge.callee.clone()]), - }; - let reverse_neighbors = - match v2_rt::map_get(&acc.reverse.clone(), edge.callee.clone()) { - Some(ns) => v2_rt::concat(ns.clone(), Rc::new(vec![edge.caller.clone()])), - None => Rc::new(vec![edge.caller.clone()]), - }; - Rc::new(CallGraphAdjacencyViews { - forward: v2_rt::rc_map_insert( - acc.forward.clone(), - edge.caller.clone(), - forward_neighbors.clone(), - ), - reverse: v2_rt::rc_map_insert( - acc.reverse.clone(), - edge.callee.clone(), - reverse_neighbors.clone(), - ), - }) - }, - ) - } -} - -pub fn forward_adjacency( - names: Rc>, - graph: Rc, -) -> Rc>>> { +let initial_reverse = seed_adjacency_map(names.clone()); +graph.edges.clone().iter().cloned().fold(Rc::new(CallGraphAdjacencyViews { + forward: initial_forward, + reverse: initial_reverse, +}), |acc: Rc, edge: Rc| { + let forward_neighbors = match v2_rt::map_get(&acc.forward.clone(), edge.caller.clone()) { + Some(ns) => v2_rt::concat(ns.clone(), Rc::new(vec![edge.callee.clone()])), + None => Rc::new(vec![edge.callee.clone()]), +}; +let reverse_neighbors = match v2_rt::map_get(&acc.reverse.clone(), edge.callee.clone()) { + Some(ns) => v2_rt::concat(ns.clone(), Rc::new(vec![edge.caller.clone()])), + None => Rc::new(vec![edge.caller.clone()]), +}; +Rc::new(CallGraphAdjacencyViews { + forward: v2_rt::rc_map_insert(acc.forward.clone(), edge.caller.clone(), forward_neighbors.clone()), + reverse: v2_rt::rc_map_insert(acc.reverse.clone(), edge.callee.clone(), reverse_neighbors.clone()), +}) +}) +} +} + +pub fn forward_adjacency(names: Rc>, graph: Rc) -> Rc>>> { build_adjacency_views(&names, graph).forward.clone() } -pub fn reverse_adjacency( - names: Rc>, - graph: Rc, -) -> Rc>>> { +pub fn reverse_adjacency(names: Rc>, graph: Rc) -> Rc>>> { build_adjacency_views(&names, graph).reverse.clone() } -pub fn dfs_finish_order( - node: &String, - adjacency: &Rc>>>, - acc: &Rc, -) -> Rc { +pub fn dfs_finish_order(node: &String, adjacency: &Rc>>>, acc: &Rc) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - if set_has(acc.visited.clone(), node.clone()) { + if set_contains(acc.visited.clone(), node.clone()) { acc.clone() } else { { - let next_visited = v2_rt::rc_map_insert(acc.visited.clone(), node.clone(), true); - let neighbors = match v2_rt::map_get(&adjacency, node.clone()) { - Some(ns) => ns.clone(), - None => Rc::new(vec![]), - }; - let explored = neighbors.iter().cloned().fold( - Rc::new(DfsFinishAcc { - visited: next_visited, - order: acc.order.clone(), - }), - |inner: Rc, neighbor: String| { - dfs_finish_order(&neighbor, &adjacency, &inner) - }, - ); - Rc::new(DfsFinishAcc { - visited: explored.visited.clone(), - order: v2_rt::rc_list_push(explored.order.clone(), node.clone()), - }) - } + let next_visited = set_insert(acc.visited.clone(), node.clone()); +let neighbors = match v2_rt::map_get(&adjacency, node.clone()) { + Some(ns) => ns.clone(), + None => Rc::new(vec![]), +}; +let explored = neighbors.iter().cloned().fold(Rc::new(DfsFinishAcc { + visited: next_visited, + order: acc.order.clone(), +}), |inner: Rc, neighbor: String| dfs_finish_order(&neighbor, &adjacency, &inner)); +Rc::new(DfsFinishAcc { + visited: explored.visited.clone(), + order: v2_rt::rc_list_push(explored.order.clone(), node.clone()), +}) +} } }) } -pub fn dfs_collect_component( - node: &String, - adjacency: &Rc>>>, - acc: &Rc, -) -> Rc { +pub fn dfs_collect_component(node: &String, adjacency: &Rc>>>, acc: &Rc) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - if set_has(acc.visited.clone(), node.clone()) { + if set_contains(acc.visited.clone(), node.clone()) { acc.clone() } else { { - let next_visited = v2_rt::rc_map_insert(acc.visited.clone(), node.clone(), true); - let next_members = v2_rt::rc_list_push(acc.members.clone(), node.clone()); - let neighbors = match v2_rt::map_get(&adjacency, node.clone()) { - Some(ns) => ns.clone(), - None => Rc::new(vec![]), - }; - neighbors.iter().cloned().fold( - Rc::new(SccComponentAcc { - visited: next_visited, - members: next_members, - }), - |inner: Rc, neighbor: String| { - dfs_collect_component(&neighbor, &adjacency, &inner) - }, - ) - } + let next_visited = set_insert(acc.visited.clone(), node.clone()); +let next_members = v2_rt::rc_list_push(acc.members.clone(), node.clone()); +let neighbors = match v2_rt::map_get(&adjacency, node.clone()) { + Some(ns) => ns.clone(), + None => Rc::new(vec![]), +}; +neighbors.iter().cloned().fold(Rc::new(SccComponentAcc { + visited: next_visited, + members: next_members, +}), |inner: Rc, neighbor: String| dfs_collect_component(&neighbor, &adjacency, &inner)) +} } }) } @@ -206,117 +137,61 @@ pub fn dfs_collect_component( pub fn graph_has_multi_node_scc(names: &Rc>, graph: Rc) -> bool { { let adjacency = build_adjacency_views(&names, graph); - let finish = names.clone().iter().cloned().fold( - Rc::new(DfsFinishAcc { - visited: v2_rt::rc_empty_map::(), - order: Rc::new(vec![]), - }), - |acc: Rc, name: String| { - dfs_finish_order(&name, &adjacency.forward.clone(), &acc) - }, - ); - let result = v2_rt::reverse(finish.order.clone()).iter().cloned().fold( - Rc::new(SccCycleAcc { - visited: v2_rt::rc_empty_map::(), - has_cycle: false, - }), - |acc: Rc, name: String| { - if (acc.has_cycle.clone() || set_has(acc.visited.clone(), name.clone())) { - acc.clone() - } else { - { - let component = dfs_collect_component( - &name, - &adjacency.reverse.clone(), - &Rc::new(SccComponentAcc { - visited: acc.visited.clone(), - members: Rc::new(vec![]), - }), - ); - Rc::new(SccCycleAcc { - visited: component.visited.clone(), - has_cycle: ((component.members.clone().len() as i64) > 1), - }) - } - } - }, - ); - result.has_cycle.clone() - } +let finish = names.clone().iter().cloned().fold(Rc::new(DfsFinishAcc { + visited: empty_set(), + order: Rc::new(vec![]), +}), |acc: Rc, name: String| dfs_finish_order(&name, &adjacency.forward.clone(), &acc)); +let result = v2_rt::reverse(finish.order.clone()).iter().cloned().fold(Rc::new(SccCycleAcc { + visited: empty_set(), + has_cycle: false, +}), |acc: Rc, name: String| if (acc.has_cycle.clone() || set_contains(acc.visited.clone(), name.clone())) { + acc.clone() + } else { + { + let component = dfs_collect_component(&name, &adjacency.reverse.clone(), &Rc::new(SccComponentAcc { + visited: acc.visited.clone(), + members: Rc::new(vec![]), +})); +Rc::new(SccCycleAcc { + visited: component.visited.clone(), + has_cycle: ((component.members.clone().len() as i64) > 1), +}) +} + }); +result.has_cycle.clone() +} } pub fn is_lexicographic_descent(mut evidence: Rc>) -> bool { loop { match evidence.clone().first().cloned() { - None => { - break false; - } - Some(e) => match e.clone() { - DescentEvidence::Strict => { - break true; - } - DescentEvidence::NonIncreasing => { - let __tco_0 = Rc::new( - evidence - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - evidence = __tco_0; - continue; - } - DescentEvidence::DescentUnknown => { - break false; - } - }, - } - } + None => { break false; }, + Some(e) => { match e.clone() { + DescentEvidence::Strict => { break true; }, + DescentEvidence::NonIncreasing => { { + let __tco_0 = Rc::new(evidence.iter().cloned().skip(1 as usize).collect::>()); +evidence = __tco_0; +continue; +} }, + DescentEvidence::DescentUnknown => { break false; }, +} }, +} +} } pub fn is_valid_proof(proof: Rc, edges: &Rc>>) -> bool { { let expected_dims = (proof.dimensions.clone().len() as i64); - let non_descending = Rc::new({ - let mut __result = Vec::new(); - for e in edges.clone().iter().cloned() { - if (((e.evidence.clone().len() as i64) != expected_dims.clone()) - || (is_lexicographic_descent(e.evidence.clone()) == false)) - { - __result.push(e); - } - } - __result - }); - let has_self_cycle = { - let mut __found = false; - for e in non_descending.clone().iter().cloned() { - if (e.caller.clone().as_str() == e.callee.clone().as_str()) { - __found = true; - break; - } - } - __found - }; - if has_self_cycle { +let non_descending = Rc::new({ let mut __result = Vec::new(); for e in edges.clone().iter().cloned() { if (((e.evidence.clone().len() as i64) != expected_dims.clone()) || (is_lexicographic_descent(e.evidence.clone()) == false)) { __result.push(e); } } __result }); +let has_self_cycle = { let mut __found = false; for e in non_descending.clone().iter().cloned() { if (e.caller.clone().as_str() == e.callee.clone().as_str()) { __found = true; break; } } __found }; +if has_self_cycle { false } else { { - let members = Rc::new({ - let mut __result = Vec::new(); - for e in edges.clone().iter().cloned() { - __result.extend( - (*Rc::new(vec![e.caller.clone(), e.callee.clone()])) - .iter() - .cloned(), - ); - } - __result - }); - let nd_graph = - build_call_graph_from_proof_edges(members.clone(), non_descending.clone()); - (graph_has_multi_node_scc(&members, nd_graph) == false) - } + let members = Rc::new({ let mut __result = Vec::new(); for e in edges.clone().iter().cloned() { __result.extend((*Rc::new(vec![e.caller.clone(), e.callee.clone()])).iter().cloned()); } __result }); +let nd_graph = build_call_graph_from_proof_edges(members.clone(), non_descending.clone()); +(graph_has_multi_node_scc(&members, nd_graph) == false) +} } - } +} } diff --git a/src/v2/stage0/src/std_http_path.rs b/src/v2/stage0/src/std_http_path.rs index c67a8d74b5f..273e30ca225 100644 --- a/src/v2/stage0/src/std_http_path.rs +++ b/src/v2/stage0/src/std_http_path.rs @@ -1,20 +1,24 @@ // Generated by v2 compiler -- do not edit. // Source module: std.http_path -use self::PathSegmentTokensResult::*; -use self::PathTemplateParseResult::*; -use self::UrlPathToken::*; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +use self::UrlPathToken::*; +use self::PathSegmentTokensResult::*; +use self::PathTemplateParseResult::*; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum UrlPathToken { - LiteralToken { text: String }, - ParamToken { name: String }, + LiteralToken { + text: String, + }, + ParamToken { + name: String, + }, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -25,8 +29,13 @@ pub struct PathTemplate { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum PathSegmentTokensResult { - ParsedSegmentTokens { tokens: Rc>> }, - MalformedPathSegment { segment: String, reason: String }, + ParsedSegmentTokens { + tokens: Rc>>, + }, + MalformedPathSegment { + segment: String, + reason: String, + }, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -44,242 +53,150 @@ pub enum PathTemplateParseResult { pub fn parse_path_template(raw: &String) -> Rc { { - let path_only = match Rc::new( - raw.clone() - .split(&"?".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .first() - .cloned() - { - Some(p) => p.clone(), - None => raw.clone(), - }; - let segments = Rc::new({ - let mut __result = Vec::new(); - for s in Rc::new( - path_only - .split(&"/".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .iter() - .cloned() - { - if (s.clone().as_str() != "".to_string().as_str()) { - __result.push(s); - } - } - __result - }); - match segments.clone().first().cloned() { - None => Rc::new(PathTemplateParseResult::ParsedPathTemplate { - template: Rc::new(PathTemplate { - tokens: Rc::new(vec![]), - }), - }), - Some(first_seg) => match (*parse_segment_tokens(&first_seg)).clone() { - PathSegmentTokensResult::MalformedPathSegment { - segment: s, - reason: r, - .. - } => Rc::new(PathTemplateParseResult::MalformedPathTemplate { - raw: raw.clone(), - segment: s.clone(), - reason: r.clone(), - }), - PathSegmentTokensResult::ParsedSegmentTokens { - tokens: first_tokens, - .. - } => { - let parsed = Rc::new( - segments - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ) - .iter() - .cloned() - .fold( - Rc::new(PathTemplateParseResult::ParsedPathTemplate { - template: Rc::new(PathTemplate { - tokens: first_tokens.clone(), - }), - }), - |acc: Rc, seg: String| match (*acc.clone()).clone() - { - PathTemplateParseResult::MalformedPathTemplate { .. } => acc.clone(), - PathTemplateParseResult::ParsedPathTemplate { - template: path, .. - } => match (*parse_segment_tokens(&seg)).clone() { - PathSegmentTokensResult::MalformedPathSegment { - segment: s, - reason: r, - .. - } => Rc::new(PathTemplateParseResult::MalformedPathTemplate { - raw: raw.clone(), - segment: s.clone(), - reason: r.clone(), - }), - PathSegmentTokensResult::ParsedSegmentTokens { - tokens: seg_tokens, - .. - } => Rc::new(PathTemplateParseResult::ParsedPathTemplate { - template: Rc::new(PathTemplate { - tokens: v2_rt::concat( - path.tokens.clone(), - seg_tokens.clone(), - ), - }), - }), - }, - }, - ); - parsed - } - }, - } - } + let path_only = match Rc::new(raw.clone().split(&"?".to_string()).map(|s| s.to_string()).collect::>()).first().cloned() { + Some(p) => p.clone(), + None => raw.clone(), +}; +let segments = Rc::new({ let mut __result = Vec::new(); for s in Rc::new(path_only.split(&"/".to_string()).map(|s| s.to_string()).collect::>()).iter().cloned() { if (s.clone().as_str() != "".to_string().as_str()) { __result.push(s); } } __result }); +match segments.clone().first().cloned() { + None => Rc::new(PathTemplateParseResult::ParsedPathTemplate { + template: Rc::new(PathTemplate { + tokens: Rc::new(vec![]), +}), +}), + Some(first_seg) => match (*parse_segment_tokens(&first_seg)).clone() { + PathSegmentTokensResult::MalformedPathSegment { segment: s, reason: r, .. } => Rc::new(PathTemplateParseResult::MalformedPathTemplate { + raw: raw.clone(), + segment: s.clone(), + reason: r.clone(), +}), + PathSegmentTokensResult::ParsedSegmentTokens { tokens: first_tokens, .. } => { + let parsed = Rc::new(segments.clone().iter().cloned().skip(1 as usize).collect::>()).iter().cloned().fold(Rc::new(PathTemplateParseResult::ParsedPathTemplate { + template: Rc::new(PathTemplate { + tokens: first_tokens.clone(), +}), +}), |acc: Rc, seg: String| match (*acc.clone()).clone() { + PathTemplateParseResult::MalformedPathTemplate { .. } => acc.clone(), + PathTemplateParseResult::ParsedPathTemplate { template: path, .. } => match (*parse_segment_tokens(&seg)).clone() { + PathSegmentTokensResult::MalformedPathSegment { segment: s, reason: r, .. } => Rc::new(PathTemplateParseResult::MalformedPathTemplate { + raw: raw.clone(), + segment: s.clone(), + reason: r.clone(), +}), + PathSegmentTokensResult::ParsedSegmentTokens { tokens: seg_tokens, .. } => Rc::new(PathTemplateParseResult::ParsedPathTemplate { + template: Rc::new(PathTemplate { + tokens: v2_rt::concat(path.tokens.clone(), seg_tokens.clone()), +}), +}), +}, +}); +parsed +}, +}, +} +} } pub fn parse_segment_tokens(seg: &String) -> Rc { if !v2_rt::contains(seg.clone(), "{".to_string()) { if v2_rt::contains(seg.clone(), "}".to_string()) { Rc::new(PathSegmentTokensResult::MalformedPathSegment { - segment: seg.clone(), - reason: "stray closing brace".to_string(), - }) + segment: seg.clone(), + reason: "stray closing brace".to_string(), +}) } else { Rc::new(PathSegmentTokensResult::ParsedSegmentTokens { - tokens: Rc::new(vec![Rc::new(UrlPathToken::LiteralToken { - text: seg.clone(), - })]), - }) + tokens: Rc::new(vec![Rc::new(UrlPathToken::LiteralToken { + text: seg.clone(), +})]), +}) } } else { { - let before_and_rest = Rc::new( - seg.clone() - .split(&"{".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ); - if ((before_and_rest.clone().len() as i64) != 2) { + let before_and_rest = Rc::new(seg.clone().split(&"{".to_string()).map(|s| s.to_string()).collect::>()); +if ((before_and_rest.clone().len() as i64) != 2) { return Rc::new(PathSegmentTokensResult::MalformedPathSegment { - segment: seg.clone(), - reason: "multiple opening braces in one segment".to_string(), - }); + segment: seg.clone(), + reason: "multiple opening braces in one segment".to_string(), +}) } - let prefix = match before_and_rest.clone().first().cloned() { - Some(p) => p.clone(), - None => "".to_string(), - }; - let after_open = match before_and_rest.clone().get(1 as usize).cloned() { - Some(r) => r.clone(), - None => "".to_string(), - }; - let name_and_suffix = Rc::new( - after_open - .split(&"}".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ); - if (v2_rt::contains(prefix.clone(), "}".to_string()) - || ((name_and_suffix.clone().len() as i64) != 2)) - { +let prefix = match before_and_rest.clone().first().cloned() { + Some(p) => p.clone(), + None => "".to_string(), +}; +let after_open = match before_and_rest.clone().get(1 as usize).cloned() { + Some(r) => r.clone(), + None => "".to_string(), +}; +let name_and_suffix = Rc::new(after_open.split(&"}".to_string()).map(|s| s.to_string()).collect::>()); +if (v2_rt::contains(prefix.clone(), "}".to_string()) || ((name_and_suffix.clone().len() as i64) != 2)) { return Rc::new(PathSegmentTokensResult::MalformedPathSegment { - segment: seg.clone(), - reason: "missing closing brace or extra closing brace".to_string(), - }); + segment: seg.clone(), + reason: "missing closing brace or extra closing brace".to_string(), +}) } - let param_name = match name_and_suffix.clone().first().cloned() { - Some(p) => p.clone(), - None => "".to_string(), - }; - let suffix = match name_and_suffix.clone().get(1 as usize).cloned() { - Some(s) => s.clone(), - None => "".to_string(), - }; - let prefix_tokens = if (prefix.clone().as_str() != "".to_string().as_str()) { +let param_name = match name_and_suffix.clone().first().cloned() { + Some(p) => p.clone(), + None => "".to_string(), +}; +let suffix = match name_and_suffix.clone().get(1 as usize).cloned() { + Some(s) => s.clone(), + None => "".to_string(), +}; +let prefix_tokens = if (prefix.clone().as_str() != "".to_string().as_str()) { Rc::new(vec![Rc::new(UrlPathToken::LiteralToken { - text: prefix.clone(), - })]) + text: prefix.clone(), +})]) } else { Rc::new(vec![]) }; - let param_tokens = if (param_name.clone().as_str() != "".to_string().as_str()) { +let param_tokens = if (param_name.clone().as_str() != "".to_string().as_str()) { Rc::new(vec![Rc::new(UrlPathToken::ParamToken { - name: param_name.clone(), - })]) + name: param_name.clone(), +})]) } else { Rc::new(vec![]) }; - let suffix_tokens = if (suffix.clone().as_str() != "".to_string().as_str()) { +let suffix_tokens = if (suffix.clone().as_str() != "".to_string().as_str()) { Rc::new(vec![Rc::new(UrlPathToken::LiteralToken { - text: suffix.clone(), - })]) + text: suffix.clone(), +})]) } else { Rc::new(vec![]) }; - if (((param_name.clone().as_str() == "".to_string().as_str()) - || v2_rt::contains(suffix.clone(), "{".to_string())) - || v2_rt::contains(suffix.clone(), "}".to_string())) - { +if (((param_name.clone().as_str() == "".to_string().as_str()) || v2_rt::contains(suffix.clone(), "{".to_string())) || v2_rt::contains(suffix.clone(), "}".to_string())) { Rc::new(PathSegmentTokensResult::MalformedPathSegment { - segment: seg.clone(), - reason: "invalid parameter segment structure".to_string(), - }) + segment: seg.clone(), + reason: "invalid parameter segment structure".to_string(), +}) } else { Rc::new(PathSegmentTokensResult::ParsedSegmentTokens { - tokens: v2_rt::concat( - v2_rt::concat(prefix_tokens, param_tokens), - suffix_tokens, - ), - }) + tokens: v2_rt::concat(v2_rt::concat(prefix_tokens, param_tokens), suffix_tokens), +}) } - } +} } } pub fn has_path_params(template: Rc) -> bool { - { - let mut __found = false; - for t in template.tokens.clone().iter().cloned() { - if match (*t.clone()).clone() { - UrlPathToken::ParamToken { .. } => true, - UrlPathToken::LiteralToken { .. } => false, - } { - __found = true; - break; - } - } - __found - } + { let mut __found = false; for t in template.tokens.clone().iter().cloned() { if match (*t.clone()).clone() { + UrlPathToken::ParamToken { .. } => true, + UrlPathToken::LiteralToken { .. } => false, +} { __found = true; break; } } __found } } pub fn last_path_param(template: Rc) -> Option { { - let params = Rc::new({ - let mut __result = Vec::new(); - for t in template.tokens.clone().iter().cloned() { - if match (*t.clone()).clone() { - UrlPathToken::ParamToken { .. } => true, - UrlPathToken::LiteralToken { .. } => false, - } { - __result.push(t); - } - } - __result - }); - match params.last().cloned() { - Some(tok) => match (*tok.clone()).clone() { - UrlPathToken::ParamToken { name: n, .. } => Some(n.clone()), - UrlPathToken::LiteralToken { .. } => None, - }, - None => None, - } - } + let params = Rc::new({ let mut __result = Vec::new(); for t in template.tokens.clone().iter().cloned() { if match (*t.clone()).clone() { + UrlPathToken::ParamToken { .. } => true, + UrlPathToken::LiteralToken { .. } => false, +} { __result.push(t); } } __result }); +match params.last().cloned() { + Some(tok) => match (*tok.clone()).clone() { + UrlPathToken::ParamToken { name: n, .. } => Some(n.clone()), + UrlPathToken::LiteralToken { .. } => None, +}, + None => None, +} +} } diff --git a/src/v2/stage0/src/std_induction.rs b/src/v2/stage0/src/std_induction.rs index ab652cf1049..9dccaee9577 100644 --- a/src/v2/stage0/src/std_induction.rs +++ b/src/v2/stage0/src/std_induction.rs @@ -1,35 +1,26 @@ // Generated by v2 compiler -- do not edit. // Source module: std.induction -use self::AtomicCost::*; -use self::CostBound::*; -use self::PolynomialExponent::*; -use self::RecursionShape::*; -use self::SubValueRelation::*; -use crate::std_computation::CallPattern::{ - ArithmeticDivideCall, ArithmeticSubtractCall, ChildAccessorCall, FoldBodyCall, SameArgumentCall, -}; -use crate::std_computation::IterationPrimitive::{Descend, Fold, Repeat}; -use crate::std_computation::ShrinkFactor::{ConstantShrink, ProportionalShrink, UnitShrink}; -use crate::std_computation::SizeBound::{ArithmeticParam, CollectionSize, Forever}; -pub use crate::std_computation::{ - tree_size_bound, CallPattern, IterationPrimitive, LoweringTarget, ShrinkFactor, SizeBound, -}; -use crate::std_termination::DescentEvidence::{DescentUnknown, NonIncreasing, Strict}; -use crate::std_termination::PositiveDescentAmount::{AdditionalStep, OneStep}; -use crate::std_termination::ProportionalDivisor::{DivideByTwo, StrictlyLarger}; -use crate::std_termination::RankingDimension::TreeSize; -pub use crate::std_termination::{ - peano_literal_materialization_cap, positive_descent_amount_from_positive_int, - positive_descent_count, proportional_divisor_from_int_at_least_two, - proportional_divisor_to_int, DescentEvidence, PositiveDescentAmount, ProportionalDivisor, - RankingDimension, -}; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_termination::{DescentEvidence, RankingDimension, PositiveDescentAmount, ProportionalDivisor, proportional_divisor_to_int, positive_descent_amount_from_positive_int, proportional_divisor_from_int_at_least_two, peano_literal_materialization_cap, positive_descent_count}; +use crate::std_termination::DescentEvidence::{Strict, NonIncreasing, DescentUnknown}; +use crate::std_termination::RankingDimension::{TreeSize}; +use crate::std_termination::PositiveDescentAmount::{OneStep, AdditionalStep}; +use crate::std_termination::ProportionalDivisor::{DivideByTwo, StrictlyLarger}; +pub use crate::std_computation::{CallPattern, LoweringTarget, IterationPrimitive, ShrinkFactor, tree_size_bound, SizeBound}; +use crate::std_computation::CallPattern::{ChildAccessorCall, FoldBodyCall, SameArgumentCall, ArithmeticSubtractCall, ArithmeticDivideCall}; +use crate::std_computation::IterationPrimitive::{Descend, Fold, Repeat}; +use crate::std_computation::ShrinkFactor::{UnitShrink, ConstantShrink, ProportionalShrink}; +use crate::std_computation::SizeBound::{CollectionSize, ArithmeticParam, Forever}; +use self::RecursionShape::*; +use self::SubValueRelation::*; +use self::PolynomialExponent::*; +use self::AtomicCost::*; +use self::CostBound::*; #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] @@ -52,42 +43,37 @@ pub struct InductiveField { pub fn recursion_shape_eq(a: RecursionShape, b: RecursionShape) -> bool { match a { - RecursionShape::DirectRecursion => match b { - RecursionShape::DirectRecursion => true, - _ => false, - }, - RecursionShape::ListRecursion => match b { - RecursionShape::ListRecursion => true, - _ => false, - }, - RecursionShape::OptionalRecursion => match b { - RecursionShape::OptionalRecursion => true, - _ => false, - }, - RecursionShape::SetRecursion => match b { - RecursionShape::SetRecursion => true, - _ => false, - }, - RecursionShape::MapValueRecursion => match b { - RecursionShape::MapValueRecursion => true, - _ => false, - }, - } + RecursionShape::DirectRecursion => match b { + RecursionShape::DirectRecursion => true, + _ => false, +}, + RecursionShape::ListRecursion => match b { + RecursionShape::ListRecursion => true, + _ => false, +}, + RecursionShape::OptionalRecursion => match b { + RecursionShape::OptionalRecursion => true, + _ => false, +}, + RecursionShape::SetRecursion => match b { + RecursionShape::SetRecursion => true, + _ => false, +}, + RecursionShape::MapValueRecursion => match b { + RecursionShape::MapValueRecursion => true, + _ => false, +}, +} } pub fn inductive_field_eq(a: &Rc, b: &Rc) -> bool { - (((((a.type_name.clone().as_str() == b.type_name.clone().as_str()) - && (a.variant_name.clone().as_str() == b.variant_name.clone().as_str())) - && (a.field_name.clone().as_str() == b.field_name.clone().as_str())) - && recursion_shape_eq(a.shape.clone(), b.shape.clone())) - && (a.element_type.clone().as_str() == b.element_type.clone().as_str())) + (((((a.type_name.clone().as_str() == b.type_name.clone().as_str()) && (a.variant_name.clone().as_str() == b.variant_name.clone().as_str())) && (a.field_name.clone().as_str() == b.field_name.clone().as_str())) && recursion_shape_eq(a.shape.clone(), b.shape.clone())) && (a.element_type.clone().as_str() == b.element_type.clone().as_str())) } -pub fn inductive_field_to_dimension( - field: Rc, - param: String, -) -> Rc { - Rc::new(RankingDimension::TreeSize { param: param }) +pub fn inductive_field_to_dimension(field: Rc, param: String) -> Rc { + Rc::new(RankingDimension::TreeSize { + param: param, +}) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -110,344 +96,256 @@ pub enum SubValueRelation { pub fn sub_value_to_evidence(relation: Rc) -> DescentEvidence { match (*relation).clone() { - SubValueRelation::StrictSubValue { factor: f, .. } => match (*f.clone()).clone() { - ShrinkFactor::UnitShrink => DescentEvidence::Strict, - ShrinkFactor::ConstantShrink { .. } => DescentEvidence::Strict, - ShrinkFactor::ProportionalShrink { .. } => DescentEvidence::Strict, - }, - SubValueRelation::IteratedSubValue { .. } => DescentEvidence::Strict, - SubValueRelation::ArithmeticDescent { factor: f, .. } => match (*f.clone()).clone() { - ShrinkFactor::UnitShrink => DescentEvidence::Strict, - ShrinkFactor::ConstantShrink { .. } => DescentEvidence::Strict, - ShrinkFactor::ProportionalShrink { .. } => DescentEvidence::Strict, - }, - SubValueRelation::PreservedValue => DescentEvidence::NonIncreasing, - SubValueRelation::SubValueUnknown => DescentEvidence::DescentUnknown, - } + SubValueRelation::StrictSubValue { factor: f, .. } => match (*f.clone()).clone() { + ShrinkFactor::UnitShrink => DescentEvidence::Strict, + ShrinkFactor::ConstantShrink { .. } => DescentEvidence::Strict, + ShrinkFactor::ProportionalShrink { .. } => DescentEvidence::Strict, +}, + SubValueRelation::IteratedSubValue { .. } => DescentEvidence::Strict, + SubValueRelation::ArithmeticDescent { factor: f, .. } => match (*f.clone()).clone() { + ShrinkFactor::UnitShrink => DescentEvidence::Strict, + ShrinkFactor::ConstantShrink { .. } => DescentEvidence::Strict, + ShrinkFactor::ProportionalShrink { .. } => DescentEvidence::Strict, +}, + SubValueRelation::PreservedValue => DescentEvidence::NonIncreasing, + SubValueRelation::SubValueUnknown => DescentEvidence::DescentUnknown, +} } pub fn shrink_factor_eq(a: Rc, b: Rc) -> bool { match (*a).clone() { - ShrinkFactor::UnitShrink => match (*b).clone() { - ShrinkFactor::UnitShrink => true, - _ => false, - }, - ShrinkFactor::ConstantShrink { steps: sa, .. } => match (*b).clone() { - ShrinkFactor::ConstantShrink { steps: sb, .. } => { - (positive_descent_count(sa.clone()) == positive_descent_count(sb.clone())) - } - _ => false, - }, - ShrinkFactor::ProportionalShrink { divisor: da, .. } => match (*b).clone() { - ShrinkFactor::ProportionalShrink { divisor: db, .. } => { - (proportional_divisor_to_int(da.clone()) == proportional_divisor_to_int(db.clone())) - } - _ => false, - }, - } + ShrinkFactor::UnitShrink => match (*b).clone() { + ShrinkFactor::UnitShrink => true, + _ => false, +}, + ShrinkFactor::ConstantShrink { steps: sa, .. } => match (*b).clone() { + ShrinkFactor::ConstantShrink { steps: sb, .. } => (positive_descent_count(sa.clone()) == positive_descent_count(sb.clone())), + _ => false, +}, + ShrinkFactor::ProportionalShrink { divisor: da, .. } => match (*b).clone() { + ShrinkFactor::ProportionalShrink { divisor: db, .. } => (proportional_divisor_to_int(da.clone()) == proportional_divisor_to_int(db.clone())), + _ => false, +}, +} } pub fn meet_sub_value(a: Rc, b: Rc) -> Rc { match (*a.clone()).clone() { - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - SubValueRelation::PreservedValue => match (*b).clone() { - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - _ => Rc::new(SubValueRelation::PreservedValue), - }, - SubValueRelation::StrictSubValue { - field: fa, - factor: fac_a, - .. - } => match (*b).clone() { - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - SubValueRelation::PreservedValue => Rc::new(SubValueRelation::PreservedValue), - SubValueRelation::StrictSubValue { - field: fb, - factor: fac_b, - .. - } => { - if inductive_field_eq(&fa, &fb) { - if shrink_factor_eq(fac_a.clone(), fac_b.clone()) { - Rc::new(SubValueRelation::StrictSubValue { - field: fa.clone(), - factor: fac_a.clone(), - }) - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } - } - _ => Rc::new(SubValueRelation::SubValueUnknown), - }, - SubValueRelation::IteratedSubValue { field: fa, .. } => match (*b).clone() { - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - SubValueRelation::PreservedValue => Rc::new(SubValueRelation::PreservedValue), - SubValueRelation::IteratedSubValue { field: fb, .. } => { - if inductive_field_eq(&fa, &fb) { - a.clone() - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } - } - _ => Rc::new(SubValueRelation::SubValueUnknown), - }, - SubValueRelation::ArithmeticDescent { - param: pa, - factor: fac_a, - .. - } => match (*b).clone() { - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - SubValueRelation::PreservedValue => Rc::new(SubValueRelation::PreservedValue), - SubValueRelation::ArithmeticDescent { - param: pb, - factor: fac_b, - .. - } => { - if (pa.clone().as_str() == pb.clone().as_str()) { - if shrink_factor_eq(fac_a.clone(), fac_b.clone()) { - Rc::new(SubValueRelation::ArithmeticDescent { - param: pa.clone(), - factor: fac_a.clone(), - }) - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } - } - _ => Rc::new(SubValueRelation::SubValueUnknown), - }, - } + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + SubValueRelation::PreservedValue => match (*b).clone() { + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + _ => Rc::new(SubValueRelation::PreservedValue), +}, + SubValueRelation::StrictSubValue { field: fa, factor: fac_a, .. } => match (*b).clone() { + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + SubValueRelation::PreservedValue => Rc::new(SubValueRelation::PreservedValue), + SubValueRelation::StrictSubValue { field: fb, factor: fac_b, .. } => if inductive_field_eq(&fa, &fb) { + if shrink_factor_eq(fac_a.clone(), fac_b.clone()) { + Rc::new(SubValueRelation::StrictSubValue { + field: fa.clone(), + factor: fac_a.clone(), +}) + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } + } else { + Rc::new(SubValueRelation::SubValueUnknown) + }, + _ => Rc::new(SubValueRelation::SubValueUnknown), +}, + SubValueRelation::IteratedSubValue { field: fa, .. } => match (*b).clone() { + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + SubValueRelation::PreservedValue => Rc::new(SubValueRelation::PreservedValue), + SubValueRelation::IteratedSubValue { field: fb, .. } => if inductive_field_eq(&fa, &fb) { + a.clone() + } else { + Rc::new(SubValueRelation::SubValueUnknown) + }, + _ => Rc::new(SubValueRelation::SubValueUnknown), +}, + SubValueRelation::ArithmeticDescent { param: pa, factor: fac_a, .. } => match (*b).clone() { + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + SubValueRelation::PreservedValue => Rc::new(SubValueRelation::PreservedValue), + SubValueRelation::ArithmeticDescent { param: pb, factor: fac_b, .. } => if (pa.clone().as_str() == pb.clone().as_str()) { + if shrink_factor_eq(fac_a.clone(), fac_b.clone()) { + Rc::new(SubValueRelation::ArithmeticDescent { + param: pa.clone(), + factor: fac_a.clone(), +}) + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } + } else { + Rc::new(SubValueRelation::SubValueUnknown) + }, + _ => Rc::new(SubValueRelation::SubValueUnknown), +}, +} } pub fn join_sub_value(a: Rc, b: Rc) -> Rc { match (*a.clone()).clone() { - SubValueRelation::SubValueUnknown => b.clone(), - SubValueRelation::PreservedValue => match (*b.clone()).clone() { - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::PreservedValue), - _ => b.clone(), - }, - SubValueRelation::StrictSubValue { - field: fa, - factor: fac_a, - .. - } => match (*b.clone()).clone() { - SubValueRelation::SubValueUnknown => a.clone(), - SubValueRelation::PreservedValue => a.clone(), - SubValueRelation::StrictSubValue { - field: fb, - factor: fac_b, - .. - } => { - if inductive_field_eq(&fa, &fb) { - if shrink_factor_eq(fac_a.clone(), fac_b.clone()) { - Rc::new(SubValueRelation::StrictSubValue { - field: fa.clone(), - factor: fac_a.clone(), - }) - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } - } - _ => Rc::new(SubValueRelation::SubValueUnknown), - }, - SubValueRelation::IteratedSubValue { field: fa, .. } => match (*b.clone()).clone() { - SubValueRelation::SubValueUnknown => a.clone(), - SubValueRelation::PreservedValue => a.clone(), - SubValueRelation::IteratedSubValue { field: fb, .. } => { - if inductive_field_eq(&fa, &fb) { - a.clone() - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } - } - _ => Rc::new(SubValueRelation::SubValueUnknown), - }, - SubValueRelation::ArithmeticDescent { - param: pa, - factor: fac_a, - .. - } => match (*b.clone()).clone() { - SubValueRelation::SubValueUnknown => a.clone(), - SubValueRelation::PreservedValue => a.clone(), - SubValueRelation::ArithmeticDescent { - param: pb, - factor: fac_b, - .. - } => { - if (pa.clone().as_str() == pb.clone().as_str()) { - if shrink_factor_eq(fac_a.clone(), fac_b.clone()) { - Rc::new(SubValueRelation::ArithmeticDescent { - param: pa.clone(), - factor: fac_a.clone(), - }) - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } - } - _ => Rc::new(SubValueRelation::SubValueUnknown), - }, - } + SubValueRelation::SubValueUnknown => b.clone(), + SubValueRelation::PreservedValue => match (*b.clone()).clone() { + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::PreservedValue), + _ => b.clone(), +}, + SubValueRelation::StrictSubValue { field: fa, factor: fac_a, .. } => match (*b.clone()).clone() { + SubValueRelation::SubValueUnknown => a.clone(), + SubValueRelation::PreservedValue => a.clone(), + SubValueRelation::StrictSubValue { field: fb, factor: fac_b, .. } => if inductive_field_eq(&fa, &fb) { + if shrink_factor_eq(fac_a.clone(), fac_b.clone()) { + Rc::new(SubValueRelation::StrictSubValue { + field: fa.clone(), + factor: fac_a.clone(), +}) + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } + } else { + Rc::new(SubValueRelation::SubValueUnknown) + }, + _ => Rc::new(SubValueRelation::SubValueUnknown), +}, + SubValueRelation::IteratedSubValue { field: fa, .. } => match (*b.clone()).clone() { + SubValueRelation::SubValueUnknown => a.clone(), + SubValueRelation::PreservedValue => a.clone(), + SubValueRelation::IteratedSubValue { field: fb, .. } => if inductive_field_eq(&fa, &fb) { + a.clone() + } else { + Rc::new(SubValueRelation::SubValueUnknown) + }, + _ => Rc::new(SubValueRelation::SubValueUnknown), +}, + SubValueRelation::ArithmeticDescent { param: pa, factor: fac_a, .. } => match (*b.clone()).clone() { + SubValueRelation::SubValueUnknown => a.clone(), + SubValueRelation::PreservedValue => a.clone(), + SubValueRelation::ArithmeticDescent { param: pb, factor: fac_b, .. } => if (pa.clone().as_str() == pb.clone().as_str()) { + if shrink_factor_eq(fac_a.clone(), fac_b.clone()) { + Rc::new(SubValueRelation::ArithmeticDescent { + param: pa.clone(), + factor: fac_a.clone(), +}) + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } + } else { + Rc::new(SubValueRelation::SubValueUnknown) + }, + _ => Rc::new(SubValueRelation::SubValueUnknown), +}, +} } -pub fn compose_sub_value( - base: Rc, - field: Rc, -) -> Rc { +pub fn compose_sub_value(base: Rc, field: Rc) -> Rc { match (*base).clone() { - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - _ => Rc::new(SubValueRelation::StrictSubValue { - field: field, - factor: Rc::new(ShrinkFactor::UnitShrink), - }), - } + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + _ => Rc::new(SubValueRelation::StrictSubValue { + field: field, + factor: Rc::new(ShrinkFactor::UnitShrink), +}), +} } -pub fn compose_sub_value_relations( - arg_rel: Rc, - callee_rel: Rc, -) -> Rc { +pub fn compose_sub_value_relations(arg_rel: Rc, callee_rel: Rc) -> Rc { match (*callee_rel.clone()).clone() { - SubValueRelation::PreservedValue => arg_rel, - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - SubValueRelation::StrictSubValue { .. } => match (*arg_rel).clone() { - SubValueRelation::PreservedValue => callee_rel.clone(), - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - SubValueRelation::StrictSubValue { field: f, .. } => { - Rc::new(SubValueRelation::StrictSubValue { - field: f.clone(), - factor: Rc::new(ShrinkFactor::UnitShrink), - }) - } - SubValueRelation::IteratedSubValue { field: f, .. } => { - Rc::new(SubValueRelation::StrictSubValue { - field: f.clone(), - factor: Rc::new(ShrinkFactor::UnitShrink), - }) - } - SubValueRelation::ArithmeticDescent { .. } => { - Rc::new(SubValueRelation::SubValueUnknown) - } - }, - SubValueRelation::IteratedSubValue { .. } => match (*arg_rel).clone() { - SubValueRelation::PreservedValue => callee_rel.clone(), - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - SubValueRelation::StrictSubValue { field: f, .. } => { - Rc::new(SubValueRelation::StrictSubValue { - field: f.clone(), - factor: Rc::new(ShrinkFactor::UnitShrink), - }) - } - SubValueRelation::IteratedSubValue { field: f, .. } => { - Rc::new(SubValueRelation::StrictSubValue { - field: f.clone(), - factor: Rc::new(ShrinkFactor::UnitShrink), - }) - } - SubValueRelation::ArithmeticDescent { .. } => { - Rc::new(SubValueRelation::SubValueUnknown) - } - }, - SubValueRelation::ArithmeticDescent { - param: p, - factor: f, - .. - } => match (*arg_rel).clone() { - SubValueRelation::PreservedValue => Rc::new(SubValueRelation::ArithmeticDescent { - param: p.clone(), - factor: f.clone(), - }), - _ => Rc::new(SubValueRelation::SubValueUnknown), - }, - } + SubValueRelation::PreservedValue => arg_rel, + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + SubValueRelation::StrictSubValue { .. } => match (*arg_rel).clone() { + SubValueRelation::PreservedValue => callee_rel.clone(), + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + SubValueRelation::StrictSubValue { field: f, .. } => Rc::new(SubValueRelation::StrictSubValue { + field: f.clone(), + factor: Rc::new(ShrinkFactor::UnitShrink), +}), + SubValueRelation::IteratedSubValue { field: f, .. } => Rc::new(SubValueRelation::StrictSubValue { + field: f.clone(), + factor: Rc::new(ShrinkFactor::UnitShrink), +}), + SubValueRelation::ArithmeticDescent { .. } => Rc::new(SubValueRelation::SubValueUnknown), +}, + SubValueRelation::IteratedSubValue { .. } => match (*arg_rel).clone() { + SubValueRelation::PreservedValue => callee_rel.clone(), + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + SubValueRelation::StrictSubValue { field: f, .. } => Rc::new(SubValueRelation::StrictSubValue { + field: f.clone(), + factor: Rc::new(ShrinkFactor::UnitShrink), +}), + SubValueRelation::IteratedSubValue { field: f, .. } => Rc::new(SubValueRelation::StrictSubValue { + field: f.clone(), + factor: Rc::new(ShrinkFactor::UnitShrink), +}), + SubValueRelation::ArithmeticDescent { .. } => Rc::new(SubValueRelation::SubValueUnknown), +}, + SubValueRelation::ArithmeticDescent { param: p, factor: f, .. } => match (*arg_rel).clone() { + SubValueRelation::PreservedValue => Rc::new(SubValueRelation::ArithmeticDescent { + param: p.clone(), + factor: f.clone(), +}), + _ => Rc::new(SubValueRelation::SubValueUnknown), +}, +} } pub fn sub_value_to_call_pattern(relation: Rc) -> Option> { match (*relation).clone() { - SubValueRelation::StrictSubValue { field: f, .. } => { - Some(Rc::new(CallPattern::ChildAccessorCall { - accessor: f.field_name.clone(), - })) - } - SubValueRelation::IteratedSubValue { field: f, .. } => { - Some(Rc::new(CallPattern::ChildAccessorCall { - accessor: f.field_name.clone(), - })) - } - SubValueRelation::ArithmeticDescent { - param: p, - factor: f, - .. - } => match (*f.clone()).clone() { - ShrinkFactor::ConstantShrink { steps, .. } => { - Some(Rc::new(CallPattern::ArithmeticSubtractCall { - steps: steps.clone(), - ring_param: p.clone(), - })) - } - ShrinkFactor::ProportionalShrink { divisor: d, .. } => { - Some(Rc::new(CallPattern::ArithmeticDivideCall { - divisor: d.clone(), - ring_param: p.clone(), - })) - } - ShrinkFactor::UnitShrink => Some(Rc::new(CallPattern::ArithmeticSubtractCall { - steps: Rc::new(PositiveDescentAmount::OneStep), - ring_param: p.clone(), - })), - }, - SubValueRelation::PreservedValue => Some(Rc::new(CallPattern::SameArgumentCall)), - SubValueRelation::SubValueUnknown => None, - } + SubValueRelation::StrictSubValue { field: f, .. } => Some(Rc::new(CallPattern::ChildAccessorCall { + accessor: f.field_name.clone(), +})), + SubValueRelation::IteratedSubValue { field: f, .. } => Some(Rc::new(CallPattern::ChildAccessorCall { + accessor: f.field_name.clone(), +})), + SubValueRelation::ArithmeticDescent { param: p, factor: f, .. } => match (*f.clone()).clone() { + ShrinkFactor::ConstantShrink { steps, .. } => Some(Rc::new(CallPattern::ArithmeticSubtractCall { + steps: steps.clone(), + ring_param: p.clone(), +})), + ShrinkFactor::ProportionalShrink { divisor: d, .. } => Some(Rc::new(CallPattern::ArithmeticDivideCall { + divisor: d.clone(), + ring_param: p.clone(), +})), + ShrinkFactor::UnitShrink => Some(Rc::new(CallPattern::ArithmeticSubtractCall { + steps: Rc::new(PositiveDescentAmount::OneStep), + ring_param: p.clone(), +})), +}, + SubValueRelation::PreservedValue => Some(Rc::new(CallPattern::SameArgumentCall)), + SubValueRelation::SubValueUnknown => None, +} } pub fn sub_value_to_lowering_target(relation: Rc) -> Option> { match (*relation).clone() { - SubValueRelation::StrictSubValue { - field: f, - factor: fac, - .. - } => Some(Rc::new(LoweringTarget { - primitive: IterationPrimitive::Descend, - bound: tree_size_bound(f.field_name.clone()), - evidence: DescentEvidence::Strict, - factor: Some(fac.clone()), - })), - SubValueRelation::IteratedSubValue { field: f, .. } => Some(Rc::new(LoweringTarget { - primitive: IterationPrimitive::Fold, - bound: Rc::new(SizeBound::CollectionSize { - param: f.field_name.clone(), - }), - evidence: DescentEvidence::Strict, - factor: None, - })), - SubValueRelation::ArithmeticDescent { - param: p, - factor: fac, - .. - } => Some(Rc::new(LoweringTarget { - primitive: IterationPrimitive::Repeat, - bound: Rc::new(SizeBound::ArithmeticParam { param: p.clone() }), - evidence: DescentEvidence::Strict, - factor: Some(fac.clone()), - })), - SubValueRelation::PreservedValue => Some(Rc::new(LoweringTarget { - primitive: IterationPrimitive::Repeat, - bound: Rc::new(SizeBound::Forever), - evidence: DescentEvidence::NonIncreasing, - factor: None, - })), - SubValueRelation::SubValueUnknown => None, - } + SubValueRelation::StrictSubValue { field: f, factor: fac, .. } => Some(Rc::new(LoweringTarget { + primitive: IterationPrimitive::Descend, + bound: tree_size_bound(f.field_name.clone()), + evidence: DescentEvidence::Strict, + factor: Some(fac.clone()), +})), + SubValueRelation::IteratedSubValue { field: f, .. } => Some(Rc::new(LoweringTarget { + primitive: IterationPrimitive::Fold, + bound: Rc::new(SizeBound::CollectionSize { + param: f.field_name.clone(), +}), + evidence: DescentEvidence::Strict, + factor: None, +})), + SubValueRelation::ArithmeticDescent { param: p, factor: fac, .. } => Some(Rc::new(LoweringTarget { + primitive: IterationPrimitive::Repeat, + bound: Rc::new(SizeBound::ArithmeticParam { + param: p.clone(), +}), + evidence: DescentEvidence::Strict, + factor: Some(fac.clone()), +})), + SubValueRelation::PreservedValue => Some(Rc::new(LoweringTarget { + primitive: IterationPrimitive::Repeat, + bound: Rc::new(SizeBound::Forever), + evidence: DescentEvidence::NonIncreasing, + factor: None, +})), + SubValueRelation::SubValueUnknown => None, +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -469,8 +367,8 @@ pub enum PolynomialExponent { pub fn poly_exp_degree_one() -> Rc { Rc::new(PolynomialExponent::IntegerExpPos { - degree: Rc::new(PositiveDescentAmount::OneStep), - }) + degree: Rc::new(PositiveDescentAmount::OneStep), +}) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -515,23 +413,23 @@ pub enum CostBound { pub fn sum_bound(terms: &Rc>>) -> Rc { match terms.clone().first().cloned() { - None => Rc::new(CostBound::ErrorBound), - Some(_) => Rc::new(CostBound::SumBound { - terms: terms.clone(), - }), - } + None => Rc::new(CostBound::ErrorBound), + Some(_) => Rc::new(CostBound::SumBound { + terms: terms.clone(), +}), +} } pub fn cost_bound_is_sum_bound(b: Rc) -> bool { match (*b).clone() { - CostBound::SumBound { .. } => true, - CostBound::ConstantBound => false, - CostBound::AtomicBound { .. } => false, - CostBound::ProductBound { .. } => false, - CostBound::SumOfProductsBound { .. } => false, - CostBound::ForeverBound => false, - CostBound::ErrorBound => false, - } + CostBound::SumBound { .. } => true, + CostBound::ConstantBound => false, + CostBound::AtomicBound { .. } => false, + CostBound::ProductBound { .. } => false, + CostBound::SumOfProductsBound { .. } => false, + CostBound::ForeverBound => false, + CostBound::ErrorBound => false, +} } pub fn cost_constant() -> Rc { @@ -540,11 +438,11 @@ pub fn cost_constant() -> Rc { pub fn cost_linear(param: String) -> Rc { Rc::new(CostBound::AtomicBound { - cost: Rc::new(AtomicCost::PolyCost { - param: param, - exponent: poly_exp_degree_one(), - }), - }) + cost: Rc::new(AtomicCost::PolyCost { + param: param, + exponent: poly_exp_degree_one(), +}), +}) } pub fn cost_poly(param: String, degree: i64) -> Rc { @@ -553,23 +451,23 @@ pub fn cost_poly(param: String, degree: i64) -> Rc { } else { if (degree.clone() == 0) { Rc::new(CostBound::AtomicBound { - cost: Rc::new(AtomicCost::PolyCost { - param: param, - exponent: Rc::new(PolynomialExponent::IntegerExpZero), - }), - }) + cost: Rc::new(AtomicCost::PolyCost { + param: param, + exponent: Rc::new(PolynomialExponent::IntegerExpZero), +}), +}) } else { match positive_descent_amount_from_positive_int(degree.clone()) { - Some(deg) => Rc::new(CostBound::AtomicBound { - cost: Rc::new(AtomicCost::PolyCost { - param: param, - exponent: Rc::new(PolynomialExponent::IntegerExpPos { - degree: deg.clone(), - }), - }), - }), - None => Rc::new(CostBound::ErrorBound), - } + Some(deg) => Rc::new(CostBound::AtomicBound { + cost: Rc::new(AtomicCost::PolyCost { + param: param, + exponent: Rc::new(PolynomialExponent::IntegerExpPos { + degree: deg.clone(), +}), +}), +}), + None => Rc::new(CostBound::ErrorBound), +} } } } @@ -579,17 +477,17 @@ pub fn cost_root(param: String, k: i64) -> Rc { Rc::new(CostBound::ErrorBound) } else { match positive_descent_amount_from_positive_int(k.clone()) { - Some(rw) => Rc::new(CostBound::AtomicBound { - cost: Rc::new(AtomicCost::PolyCost { - param: param, - exponent: Rc::new(PolynomialExponent::FractionExp { - numerator: Rc::new(PositiveDescentAmount::OneStep), - root: rw.clone(), - }), - }), - }), - None => Rc::new(CostBound::ErrorBound), - } + Some(rw) => Rc::new(CostBound::AtomicBound { + cost: Rc::new(AtomicCost::PolyCost { + param: param, + exponent: Rc::new(PolynomialExponent::FractionExp { + numerator: Rc::new(PositiveDescentAmount::OneStep), + root: rw.clone(), +}), +}), +}), + None => Rc::new(CostBound::ErrorBound), +} } } @@ -603,37 +501,33 @@ pub fn cost_cbrt(param: String) -> Rc { pub fn cost_log(param: String) -> Rc { Rc::new(CostBound::AtomicBound { - cost: Rc::new(AtomicCost::LogCost { param: param }), - }) + cost: Rc::new(AtomicCost::LogCost { + param: param, +}), +}) } pub fn cost_nlogn(param: &String) -> Rc { Rc::new(CostBound::ProductBound { - factors: Rc::new(vec![ - Rc::new(AtomicCost::PolyCost { - param: param.clone(), - exponent: poly_exp_degree_one(), - }), - Rc::new(AtomicCost::LogCost { - param: param.clone(), - }), - ]), - }) + factors: Rc::new(vec![Rc::new(AtomicCost::PolyCost { + param: param.clone(), + exponent: poly_exp_degree_one(), +}), Rc::new(AtomicCost::LogCost { + param: param.clone(), +})]), +}) } pub fn cost_graph_linear(v_param: String, e_param: String) -> Rc { Rc::new(CostBound::SumOfProductsBound { - terms: Rc::new(vec![ - Rc::new(vec![Rc::new(AtomicCost::PolyCost { - param: v_param, - exponent: poly_exp_degree_one(), - })]), - Rc::new(vec![Rc::new(AtomicCost::PolyCost { - param: e_param, - exponent: poly_exp_degree_one(), - })]), - ]), - }) + terms: Rc::new(vec![Rc::new(vec![Rc::new(AtomicCost::PolyCost { + param: v_param, + exponent: poly_exp_degree_one(), +})]), Rc::new(vec![Rc::new(AtomicCost::PolyCost { + param: e_param, + exponent: poly_exp_degree_one(), +})])]), +}) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -725,46 +619,41 @@ pub fn bounded_int_pow_exponent(k: i64) -> Option { } pub fn int_pow_bounded(base: i64, exp: i64) -> Option { - stacker::maybe_grow( - 512 * 1024, - 2 * 1024 * 1024, - || match bounded_int_pow_exponent(exp.clone()) { - None => None, - Some(e) => { - if (e.clone() == 0) { + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { + match bounded_int_pow_exponent(exp.clone()) { + None => None, + Some(e) => if (e.clone() == 0) { + Some(1) + } else { + if (base.clone() == 0) { + Some(0) + } else { + if (base.clone() == 1) { Some(1) } else { - if (base.clone() == 0) { - Some(0) - } else { - if (base.clone() == 1) { - Some(1) - } else { - if (base.clone() == (0 - 1)) { - { - let half = (e.clone() / 2); - if ((half.clone() + half.clone()) == e.clone()) { - Some(1) - } else { - Some((0 - 1)) - } - } + if (base.clone() == (0 - 1)) { + { + let half = (e.clone() / 2); +if ((half.clone() + half.clone()) == e.clone()) { + Some(1) } else { - match int_pow_bounded(base.clone(), (exp.clone() - 1)) { - Some(prev) => match int_mul_checked(base.clone(), prev.clone()) - { - Some(prod) => Some(prod.clone()), - None => None, - }, - None => None, - } + Some((0 - 1)) } - } +} + } else { + match int_pow_bounded(base.clone(), (exp.clone() - 1)) { + Some(prev) => match int_mul_checked(base.clone(), prev.clone()) { + Some(prod) => Some(prod.clone()), + None => None, +}, + None => None, +} } } } }, - ) +} + }) } pub fn ceil_log(base: i64, argument: i64) -> Option { @@ -779,97 +668,82 @@ pub fn ceil_log_iter(mut base: i64, mut argument: i64, mut k: i64, mut power: i6 loop { if (power.clone() >= argument.clone()) { break Some(k); - } else { +} else { match int_mul_checked(power.clone(), base.clone()) { - None => { - break None; - } - Some(next_power) => match int_add_checked(k, 1) { - None => { - break None; - } - Some(k1) => { - let __tco_0 = k1.clone(); - let __tco_1 = next_power.clone(); - k = __tco_0; - power = __tco_1; - continue; - } - }, - } - } - } + None => { break None; }, + Some(next_power) => { match int_add_checked(k, 1) { + None => { break None; }, + Some(k1) => { { + let __tco_0 = k1.clone(); +let __tco_1 = next_power.clone(); +k = __tco_0; +power = __tco_1; +continue; +} }, +} }, +} +} +} } pub fn master_theorem(form: &Rc) -> Rc { { let a = form.branches.clone(); - let b = form.divisor.clone(); - let d = form.work_exponent.clone(); - let n = form.param.clone(); - if ((a.clone() < 1) || (b.clone() < 2)) { +let b = form.divisor.clone(); +let d = form.work_exponent.clone(); +let n = form.param.clone(); +if ((a.clone() < 1) || (b.clone() < 2)) { Rc::new(CostBound::ErrorBound) } else { match bounded_int_pow_exponent(d) { - None => Rc::new(CostBound::ErrorBound), - Some(d_ok) => match int_pow_bounded(b.clone(), d_ok.clone()) { - None => Rc::new(CostBound::ErrorBound), - Some(b_to_d) => { - if (a.clone() < b_to_d.clone()) { - match d_ok.clone() { - 0 => Rc::new(CostBound::ConstantBound), - _ => cost_poly(n.clone(), d_ok.clone()), - } - } else { - if (a.clone() == b_to_d.clone()) { - match d_ok.clone() { - 0 => cost_log(n.clone()), - _ => match positive_descent_amount_from_positive_int( - d_ok.clone(), - ) { - Some(deg) => Rc::new(CostBound::ProductBound { - factors: Rc::new(vec![ - Rc::new(AtomicCost::PolyCost { - param: n.clone(), - exponent: Rc::new( - PolynomialExponent::IntegerExpPos { - degree: deg.clone(), - }, - ), - }), - Rc::new(AtomicCost::LogCost { param: n.clone() }), - ]), - }), - None => Rc::new(CostBound::ErrorBound), - }, - } - } else { - match proportional_divisor_from_int_at_least_two(b.clone()) { - Some(base_w) => { - match positive_descent_amount_from_positive_int(a.clone()) { - Some(arg_w) => Rc::new(CostBound::AtomicBound { - cost: Rc::new(AtomicCost::PolyCost { - param: n.clone(), - exponent: Rc::new( - PolynomialExponent::LogBasedExp { - base: base_w.clone(), - argument: arg_w.clone(), - }, - ), - }), - }), - None => Rc::new(CostBound::ErrorBound), - } - } - None => Rc::new(CostBound::ErrorBound), - } - } - } - } - }, - } + None => Rc::new(CostBound::ErrorBound), + Some(d_ok) => match int_pow_bounded(b.clone(), d_ok.clone()) { + None => Rc::new(CostBound::ErrorBound), + Some(b_to_d) => if (a.clone() < b_to_d.clone()) { + match d_ok.clone() { + 0 => Rc::new(CostBound::ConstantBound), + _ => cost_poly(n.clone(), d_ok.clone()), +} + } else { + if (a.clone() == b_to_d.clone()) { + match d_ok.clone() { + 0 => cost_log(n.clone()), + _ => match positive_descent_amount_from_positive_int(d_ok.clone()) { + Some(deg) => Rc::new(CostBound::ProductBound { + factors: Rc::new(vec![Rc::new(AtomicCost::PolyCost { + param: n.clone(), + exponent: Rc::new(PolynomialExponent::IntegerExpPos { + degree: deg.clone(), +}), +}), Rc::new(AtomicCost::LogCost { + param: n.clone(), +})]), +}), + None => Rc::new(CostBound::ErrorBound), +}, +} + } else { + match proportional_divisor_from_int_at_least_two(b.clone()) { + Some(base_w) => match positive_descent_amount_from_positive_int(a.clone()) { + Some(arg_w) => Rc::new(CostBound::AtomicBound { + cost: Rc::new(AtomicCost::PolyCost { + param: n.clone(), + exponent: Rc::new(PolynomialExponent::LogBasedExp { + base: base_w.clone(), + argument: arg_w.clone(), +}), +}), +}), + None => Rc::new(CostBound::ErrorBound), +}, + None => Rc::new(CostBound::ErrorBound), +} + } + }, +}, +} } - } +} } pub fn catamorphism_bound(param: String, nesting_depth: i64) -> Rc { @@ -884,42 +758,31 @@ pub fn catamorphism_bound(param: String, nesting_depth: i64) -> Rc { } } -pub fn derive_bound( - param: String, - branches: i64, - factor: Rc, - work_exponent: i64, -) -> Rc { +pub fn derive_bound(param: String, branches: i64, factor: Rc, work_exponent: i64) -> Rc { if (branches.clone() < 1) { Rc::new(CostBound::ErrorBound) } else { match bounded_int_pow_exponent(work_exponent.clone()) { - None => Rc::new(CostBound::ErrorBound), - Some(_) => match (*factor).clone() { - ShrinkFactor::UnitShrink => { - if (branches.clone() <= 1) { - cost_linear(param) - } else { - Rc::new(CostBound::ForeverBound) - } - } - ShrinkFactor::ConstantShrink { .. } => { - if (branches.clone() <= 1) { - cost_linear(param) - } else { - Rc::new(CostBound::ForeverBound) - } - } - ShrinkFactor::ProportionalShrink { divisor: d, .. } => { - master_theorem(&Rc::new(RecurrenceForm { - param: param, - branches: branches.clone(), - divisor: proportional_divisor_to_int(d.clone()), - work_exponent: work_exponent.clone(), - })) - } - }, - } + None => Rc::new(CostBound::ErrorBound), + Some(_) => match (*factor).clone() { + ShrinkFactor::UnitShrink => if (branches.clone() <= 1) { + cost_linear(param) + } else { + Rc::new(CostBound::ForeverBound) + }, + ShrinkFactor::ConstantShrink { .. } => if (branches.clone() <= 1) { + cost_linear(param) + } else { + Rc::new(CostBound::ForeverBound) + }, + ShrinkFactor::ProportionalShrink { divisor: d, .. } => master_theorem(&Rc::new(RecurrenceForm { + param: param, + branches: branches.clone(), + divisor: proportional_divisor_to_int(d.clone()), + work_exponent: work_exponent.clone(), +})), +}, +} } } @@ -936,47 +799,27 @@ pub fn linear_scan_bound() -> Rc { } pub fn binary_search_bound() -> Rc { - derive_bound( - "xs".to_string(), - 1, - Rc::new(ShrinkFactor::ProportionalShrink { - divisor: Rc::new(ProportionalDivisor::DivideByTwo), - }), - 0, - ) + derive_bound("xs".to_string(), 1, Rc::new(ShrinkFactor::ProportionalShrink { + divisor: Rc::new(ProportionalDivisor::DivideByTwo), +}), 0) } pub fn mergesort_bound() -> Rc { - derive_bound( - "xs".to_string(), - 2, - Rc::new(ShrinkFactor::ProportionalShrink { - divisor: Rc::new(ProportionalDivisor::DivideByTwo), - }), - 1, - ) + derive_bound("xs".to_string(), 2, Rc::new(ShrinkFactor::ProportionalShrink { + divisor: Rc::new(ProportionalDivisor::DivideByTwo), +}), 1) } pub fn karatsuba_bound() -> Rc { - derive_bound( - "digits".to_string(), - 3, - Rc::new(ShrinkFactor::ProportionalShrink { - divisor: Rc::new(ProportionalDivisor::DivideByTwo), - }), - 1, - ) + derive_bound("digits".to_string(), 3, Rc::new(ShrinkFactor::ProportionalShrink { + divisor: Rc::new(ProportionalDivisor::DivideByTwo), +}), 1) } pub fn strassen_bound() -> Rc { - derive_bound( - "n".to_string(), - 7, - Rc::new(ShrinkFactor::ProportionalShrink { - divisor: Rc::new(ProportionalDivisor::DivideByTwo), - }), - 2, - ) + derive_bound("n".to_string(), 7, Rc::new(ShrinkFactor::ProportionalShrink { + divisor: Rc::new(ProportionalDivisor::DivideByTwo), +}), 2) } pub fn trial_division_bound() -> Rc { @@ -997,42 +840,30 @@ pub fn bfs_dfs_bound() -> Rc { pub fn dijkstra_bound() -> Rc { Rc::new(CostBound::SumOfProductsBound { - terms: Rc::new(vec![ - Rc::new(vec![ - Rc::new(AtomicCost::PolyCost { - param: "V".to_string(), - exponent: poly_exp_degree_one(), - }), - Rc::new(AtomicCost::LogCost { - param: "V".to_string(), - }), - ]), - Rc::new(vec![ - Rc::new(AtomicCost::PolyCost { - param: "E".to_string(), - exponent: poly_exp_degree_one(), - }), - Rc::new(AtomicCost::LogCost { - param: "V".to_string(), - }), - ]), - ]), - }) + terms: Rc::new(vec![Rc::new(vec![Rc::new(AtomicCost::PolyCost { + param: "V".to_string(), + exponent: poly_exp_degree_one(), +}), Rc::new(AtomicCost::LogCost { + param: "V".to_string(), +})]), Rc::new(vec![Rc::new(AtomicCost::PolyCost { + param: "E".to_string(), + exponent: poly_exp_degree_one(), +}), Rc::new(AtomicCost::LogCost { + param: "V".to_string(), +})])]), +}) } pub fn bellman_ford_bound() -> Rc { Rc::new(CostBound::ProductBound { - factors: Rc::new(vec![ - Rc::new(AtomicCost::PolyCost { - param: "V".to_string(), - exponent: poly_exp_degree_one(), - }), - Rc::new(AtomicCost::PolyCost { - param: "E".to_string(), - exponent: poly_exp_degree_one(), - }), - ]), - }) + factors: Rc::new(vec![Rc::new(AtomicCost::PolyCost { + param: "V".to_string(), + exponent: poly_exp_degree_one(), +}), Rc::new(AtomicCost::PolyCost { + param: "E".to_string(), + exponent: poly_exp_degree_one(), +})]), +}) } pub fn floyd_warshall_bound() -> Rc { diff --git a/src/v2/stage0/src/std_iteration.rs b/src/v2/stage0/src/std_iteration.rs index 306aae0c49b..044b21e8651 100644 --- a/src/v2/stage0/src/std_iteration.rs +++ b/src/v2/stage0/src/std_iteration.rs @@ -1,8 +1,10 @@ // Generated by v2 compiler -- do not edit. // Source module: std.iteration -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; + + diff --git a/src/v2/stage0/src/std_node.rs b/src/v2/stage0/src/std_node.rs index 7837270511c..b388294735d 100644 --- a/src/v2/stage0/src/std_node.rs +++ b/src/v2/stage0/src/std_node.rs @@ -1,100 +1,98 @@ // Generated by v2 compiler -- do not edit. // Source module: std.node -use crate::std_induction::RecursionShape::{ - DirectRecursion, ListRecursion, MapValueRecursion, OptionalRecursion, SetRecursion, -}; -pub use crate::std_induction::{InductiveField, RecursionShape}; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_induction::{InductiveField, RecursionShape}; +use crate::std_induction::RecursionShape::{DirectRecursion, ListRecursion, OptionalRecursion, SetRecursion, MapValueRecursion}; pub fn compiler_inductive_fields() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - Rc::new(vec![Rc::new(InductiveField { - type_name: "Node".to_string(), - variant_name: "".to_string(), - field_name: "children".to_string(), - shape: RecursionShape::ListRecursion, - element_type: "Node".to_string(), - }), Rc::new(InductiveField { - type_name: "Node".to_string(), - variant_name: "".to_string(), - field_name: "params".to_string(), - shape: RecursionShape::ListRecursion, - element_type: "Node".to_string(), - }), Rc::new(InductiveField { - type_name: "Node".to_string(), - variant_name: "".to_string(), - field_name: "uses".to_string(), - shape: RecursionShape::ListRecursion, - element_type: "Node".to_string(), - }), Rc::new(InductiveField { - type_name: "Node".to_string(), - variant_name: "".to_string(), - field_name: "properties".to_string(), - shape: RecursionShape::ListRecursion, - element_type: "Node".to_string(), - }), Rc::new(InductiveField { - type_name: "Node".to_string(), - variant_name: "".to_string(), - field_name: "body".to_string(), - shape: RecursionShape::OptionalRecursion, - element_type: "Node".to_string(), - }), Rc::new(InductiveField { - type_name: "Node".to_string(), - variant_name: "".to_string(), - field_name: "transport".to_string(), - shape: RecursionShape::OptionalRecursion, - element_type: "Node".to_string(), - }), Rc::new(InductiveField { - type_name: "Node".to_string(), - variant_name: "".to_string(), - field_name: "type_annotation".to_string(), - shape: RecursionShape::OptionalRecursion, - element_type: "Node".to_string(), - }), Rc::new(InductiveField { - type_name: "Node".to_string(), - variant_name: "".to_string(), - field_name: "inferred".to_string(), - shape: RecursionShape::OptionalRecursion, - element_type: "InferredNode".to_string(), - }), Rc::new(InductiveField { - type_name: "InferredNode".to_string(), - variant_name: "Resolved".to_string(), - field_name: "node".to_string(), - shape: RecursionShape::DirectRecursion, - element_type: "Node".to_string(), - }), Rc::new(InductiveField { - type_name: "MatchPattern".to_string(), - variant_name: "VariantPattern".to_string(), - field_name: "field_bindings".to_string(), - shape: RecursionShape::ListRecursion, - element_type: "Node".to_string(), - }), Rc::new(InductiveField { - type_name: "MethodSemantics".to_string(), - variant_name: "AlgebraMethodSemantics".to_string(), - field_name: "method_def".to_string(), - shape: RecursionShape::DirectRecursion, - element_type: "Node".to_string(), - }), Rc::new(InductiveField { - type_name: "MethodSemantics".to_string(), - variant_name: "AlgebraMethodSemantics".to_string(), - field_name: "fold_accumulator_type".to_string(), - shape: RecursionShape::OptionalRecursion, - element_type: "Node".to_string(), - }), Rc::new(InductiveField { - type_name: "MethodSemantics".to_string(), - variant_name: "ServiceMethodSemantics".to_string(), - field_name: "op_params".to_string(), - shape: RecursionShape::ListRecursion, - element_type: "Node".to_string(), - })]) - }; - } + static CACHED: Rc>> = { + Rc::new(vec![Rc::new(InductiveField { + type_name: "Node".to_string(), + variant_name: "".to_string(), + field_name: "children".to_string(), + shape: RecursionShape::ListRecursion, + element_type: "Node".to_string(), +}), Rc::new(InductiveField { + type_name: "Node".to_string(), + variant_name: "".to_string(), + field_name: "params".to_string(), + shape: RecursionShape::ListRecursion, + element_type: "Node".to_string(), +}), Rc::new(InductiveField { + type_name: "Node".to_string(), + variant_name: "".to_string(), + field_name: "uses".to_string(), + shape: RecursionShape::ListRecursion, + element_type: "Node".to_string(), +}), Rc::new(InductiveField { + type_name: "Node".to_string(), + variant_name: "".to_string(), + field_name: "properties".to_string(), + shape: RecursionShape::ListRecursion, + element_type: "Node".to_string(), +}), Rc::new(InductiveField { + type_name: "Node".to_string(), + variant_name: "".to_string(), + field_name: "body".to_string(), + shape: RecursionShape::OptionalRecursion, + element_type: "Node".to_string(), +}), Rc::new(InductiveField { + type_name: "Node".to_string(), + variant_name: "".to_string(), + field_name: "transport".to_string(), + shape: RecursionShape::OptionalRecursion, + element_type: "Node".to_string(), +}), Rc::new(InductiveField { + type_name: "Node".to_string(), + variant_name: "".to_string(), + field_name: "type_annotation".to_string(), + shape: RecursionShape::OptionalRecursion, + element_type: "Node".to_string(), +}), Rc::new(InductiveField { + type_name: "Node".to_string(), + variant_name: "".to_string(), + field_name: "inferred".to_string(), + shape: RecursionShape::OptionalRecursion, + element_type: "InferredNode".to_string(), +}), Rc::new(InductiveField { + type_name: "InferredNode".to_string(), + variant_name: "Resolved".to_string(), + field_name: "node".to_string(), + shape: RecursionShape::DirectRecursion, + element_type: "Node".to_string(), +}), Rc::new(InductiveField { + type_name: "MatchPattern".to_string(), + variant_name: "VariantPattern".to_string(), + field_name: "field_bindings".to_string(), + shape: RecursionShape::ListRecursion, + element_type: "Node".to_string(), +}), Rc::new(InductiveField { + type_name: "MethodSemantics".to_string(), + variant_name: "AlgebraMethodSemantics".to_string(), + field_name: "method_def".to_string(), + shape: RecursionShape::DirectRecursion, + element_type: "Node".to_string(), +}), Rc::new(InductiveField { + type_name: "MethodSemantics".to_string(), + variant_name: "AlgebraMethodSemantics".to_string(), + field_name: "fold_accumulator_type".to_string(), + shape: RecursionShape::OptionalRecursion, + element_type: "Node".to_string(), +}), Rc::new(InductiveField { + type_name: "MethodSemantics".to_string(), + variant_name: "ServiceMethodSemantics".to_string(), + field_name: "op_params".to_string(), + shape: RecursionShape::ListRecursion, + element_type: "Node".to_string(), +})]) + }; + } CACHED.with(|c| c.clone()) } @@ -114,7 +112,7 @@ pub fn compiler_recursive_types() -> Rc> { pub fn is_compiler_recursive_type(name: String) -> bool { match v2_rt::map_get(&compiler_recursive_types(), name) { - Some(_) => true, - None => false, - } + Some(_) => true, + None => false, +} } diff --git a/src/v2/stage0/src/std_syntax.rs b/src/v2/stage0/src/std_syntax.rs index 3f1dc19b430..80c4dd8193d 100644 --- a/src/v2/stage0/src/std_syntax.rs +++ b/src/v2/stage0/src/std_syntax.rs @@ -1,16 +1,16 @@ // Generated by v2 compiler -- do not edit. // Source module: std.syntax -use self::AlgebraFieldKind::*; +use std::collections::HashMap; +use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; use self::BinOp::*; +use self::LiteralValue::*; use self::BodyKind::*; use self::ItemFormKind::*; -use self::LiteralValue::*; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; -use std::collections::HashMap; -use std::rc::Rc; +use self::AlgebraFieldKind::*; #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] @@ -34,10 +34,18 @@ pub enum BinOp { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum LiteralValue { - LitStr { value: String }, - LitInt { value: i64 }, - LitFloat { value: String }, - LitBool { value: bool }, + LitStr { + value: String, + }, + LitInt { + value: i64, + }, + LitFloat { + value: String, + }, + LitBool { + value: bool, + }, LitNull, } @@ -97,34 +105,34 @@ pub struct AlgebraFieldEntry { pub fn algebra_field_entries() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - Rc::new(vec![Rc::new(AlgebraFieldEntry { - kind: AlgebraFieldKind::AlgAdd, - field_name: "add".to_string(), - }), Rc::new(AlgebraFieldEntry { - kind: AlgebraFieldKind::AlgMul, - field_name: "mul".to_string(), - }), Rc::new(AlgebraFieldEntry { - kind: AlgebraFieldKind::AlgReciprocal, - field_name: "reciprocal".to_string(), - }), Rc::new(AlgebraFieldEntry { - kind: AlgebraFieldKind::AlgQuotient, - field_name: "quotient".to_string(), - }), Rc::new(AlgebraFieldEntry { - kind: AlgebraFieldKind::AlgRemainder, - field_name: "remainder".to_string(), - }), Rc::new(AlgebraFieldEntry { - kind: AlgebraFieldKind::AlgCompare, - field_name: "compare".to_string(), - }), Rc::new(AlgebraFieldEntry { - kind: AlgebraFieldKind::AlgMeet, - field_name: "meet".to_string(), - }), Rc::new(AlgebraFieldEntry { - kind: AlgebraFieldKind::AlgJoin, - field_name: "join".to_string(), - })]) - }; - } + static CACHED: Rc>> = { + Rc::new(vec![Rc::new(AlgebraFieldEntry { + kind: AlgebraFieldKind::AlgAdd, + field_name: "add".to_string(), +}), Rc::new(AlgebraFieldEntry { + kind: AlgebraFieldKind::AlgMul, + field_name: "mul".to_string(), +}), Rc::new(AlgebraFieldEntry { + kind: AlgebraFieldKind::AlgReciprocal, + field_name: "reciprocal".to_string(), +}), Rc::new(AlgebraFieldEntry { + kind: AlgebraFieldKind::AlgQuotient, + field_name: "quotient".to_string(), +}), Rc::new(AlgebraFieldEntry { + kind: AlgebraFieldKind::AlgRemainder, + field_name: "remainder".to_string(), +}), Rc::new(AlgebraFieldEntry { + kind: AlgebraFieldKind::AlgCompare, + field_name: "compare".to_string(), +}), Rc::new(AlgebraFieldEntry { + kind: AlgebraFieldKind::AlgMeet, + field_name: "meet".to_string(), +}), Rc::new(AlgebraFieldEntry { + kind: AlgebraFieldKind::AlgJoin, + field_name: "join".to_string(), +})]) + }; + } CACHED.with(|c| c.clone()) } diff --git a/src/v2/stage0/src/std_termination.rs b/src/v2/stage0/src/std_termination.rs index 0e132b78d33..fa1aa3dd700 100644 --- a/src/v2/stage0/src/std_termination.rs +++ b/src/v2/stage0/src/std_termination.rs @@ -1,18 +1,18 @@ // Generated by v2 compiler -- do not edit. // Source module: std.termination +use std::collections::HashMap; +use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_algebra::{Ordering}; +use crate::std_algebra::Ordering::*; use self::DescentEvidence::*; -use self::DescentSource::*; +use self::RankingDimension::*; use self::PositiveDescentAmount::*; use self::ProportionalDivisor::*; -use self::RankingDimension::*; -pub use crate::std_algebra::Ordering; -use crate::std_algebra::Ordering::*; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; -use std::collections::HashMap; -use std::rc::Rc; +use self::DescentSource::*; #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] @@ -24,83 +24,82 @@ pub enum DescentEvidence { pub fn evidence_rank(e: DescentEvidence) -> i64 { match e { - DescentEvidence::Strict => 2, - DescentEvidence::NonIncreasing => 1, - DescentEvidence::DescentUnknown => 0, - } + DescentEvidence::Strict => 2, + DescentEvidence::NonIncreasing => 1, + DescentEvidence::DescentUnknown => 0, +} } pub fn merge_evidence(a: DescentEvidence, b: DescentEvidence) -> DescentEvidence { match a { - DescentEvidence::Strict => match b { - DescentEvidence::Strict => DescentEvidence::Strict, - DescentEvidence::NonIncreasing => DescentEvidence::NonIncreasing, - _ => DescentEvidence::DescentUnknown, - }, - DescentEvidence::NonIncreasing => match b { - DescentEvidence::Strict => DescentEvidence::NonIncreasing, - DescentEvidence::NonIncreasing => DescentEvidence::NonIncreasing, - _ => DescentEvidence::DescentUnknown, - }, - _ => DescentEvidence::DescentUnknown, - } + DescentEvidence::Strict => match b { + DescentEvidence::Strict => DescentEvidence::Strict, + DescentEvidence::NonIncreasing => DescentEvidence::NonIncreasing, + _ => DescentEvidence::DescentUnknown, +}, + DescentEvidence::NonIncreasing => match b { + DescentEvidence::Strict => DescentEvidence::NonIncreasing, + DescentEvidence::NonIncreasing => DescentEvidence::NonIncreasing, + _ => DescentEvidence::DescentUnknown, +}, + _ => DescentEvidence::DescentUnknown, +} } pub fn join_evidence(a: DescentEvidence, b: DescentEvidence) -> DescentEvidence { match a { - DescentEvidence::DescentUnknown => b, - DescentEvidence::NonIncreasing => match b { - DescentEvidence::Strict => DescentEvidence::Strict, - _ => DescentEvidence::NonIncreasing, - }, - DescentEvidence::Strict => DescentEvidence::Strict, - } + DescentEvidence::DescentUnknown => b, + DescentEvidence::NonIncreasing => match b { + DescentEvidence::Strict => DescentEvidence::Strict, + _ => DescentEvidence::NonIncreasing, +}, + DescentEvidence::Strict => DescentEvidence::Strict, +} } pub fn promote_to_strict(evidence: DescentEvidence) -> DescentEvidence { match evidence { - DescentEvidence::NonIncreasing => DescentEvidence::NonIncreasing, - DescentEvidence::Strict => DescentEvidence::Strict, - _ => DescentEvidence::DescentUnknown, - } + DescentEvidence::NonIncreasing => DescentEvidence::NonIncreasing, + DescentEvidence::Strict => DescentEvidence::Strict, + _ => DescentEvidence::DescentUnknown, +} } -pub fn optional_evidence_meet( - a: Option, - b: Option, -) -> Option { +pub fn optional_evidence_meet(a: Option, b: Option) -> Option { match a.clone() { - None => b, - Some(va) => match b { - None => a.clone(), - Some(vb) => Some(merge_evidence(va.clone(), vb.clone())), - }, - } + None => b, + Some(va) => match b { + None => a.clone(), + Some(vb) => Some(merge_evidence(va.clone(), vb.clone())), +}, +} } -pub fn map_evidence_merge_at( - base: &Rc>, - key: &String, - new_val: DescentEvidence, -) -> Rc> { +pub fn map_evidence_merge_at(base: &Rc>, key: &String, new_val: DescentEvidence) -> Rc> { match v2_rt::map_get(&base, key.clone()) { - Some(existing) => v2_rt::rc_map_insert( - base.clone(), - key.clone(), - merge_evidence(existing.clone(), new_val), - ), - None => v2_rt::rc_map_insert(base.clone(), key.clone(), new_val), - } + Some(existing) => v2_rt::rc_map_insert(base.clone(), key.clone(), merge_evidence(existing.clone(), new_val)), + None => v2_rt::rc_map_insert(base.clone(), key.clone(), new_val), +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum RankingDimension { - TreeSize { param: String }, - ListLength { param: String }, - ArithmeticValue { param: String }, - TokenPosition { param: String }, - SetCardinality { param: String }, + TreeSize { + param: String, + }, + ListLength { + param: String, + }, + ArithmeticValue { + param: String, + }, + TokenPosition { + param: String, + }, + SetCardinality { + param: String, + }, } impl RankingDimension { pub fn param(&self) -> String { @@ -118,25 +117,25 @@ impl RankingDimension { #[serde(tag = "_variant")] pub enum PositiveDescentAmount { OneStep, - AdditionalStep { previous: Rc }, + AdditionalStep { + previous: Rc, + }, } impl PositiveDescentAmount { pub fn previous(&self) -> Rc { match self { PositiveDescentAmount::OneStep => panic!("no previous on unit variant"), - PositiveDescentAmount::AdditionalStep { - previous: __val, .. - } => __val.clone(), + PositiveDescentAmount::AdditionalStep { previous: __val, .. } => __val.clone(), } } } pub fn positive_descent_count(steps: Rc) -> i64 { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*steps).clone() { - PositiveDescentAmount::OneStep => 1, - PositiveDescentAmount::AdditionalStep { previous: p, .. } => { - (1 + positive_descent_count(p.clone())) - } + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { + match (*steps).clone() { + PositiveDescentAmount::OneStep => 1, + PositiveDescentAmount::AdditionalStep { previous: p, .. } => (1 + positive_descent_count(p.clone())), +} }) } @@ -144,7 +143,9 @@ pub fn positive_descent_count(steps: Rc) -> i64 { #[serde(tag = "_variant")] pub enum ProportionalDivisor { DivideByTwo, - StrictlyLarger { inner: Rc }, + StrictlyLarger { + inner: Rc, + }, } impl ProportionalDivisor { pub fn inner(&self) -> Rc { @@ -156,11 +157,11 @@ impl ProportionalDivisor { } pub fn proportional_divisor_to_int(d: Rc) -> i64 { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*d).clone() { - ProportionalDivisor::DivideByTwo => 2, - ProportionalDivisor::StrictlyLarger { inner: p, .. } => { - (1 + proportional_divisor_to_int(p.clone())) - } + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { + match (*d).clone() { + ProportionalDivisor::DivideByTwo => 2, + ProportionalDivisor::StrictlyLarger { inner: p, .. } => (1 + proportional_divisor_to_int(p.clone())), +} }) } @@ -180,11 +181,11 @@ pub fn positive_descent_amount_from_positive_int(k: i64) -> Option Some(Rc::new(PositiveDescentAmount::AdditionalStep { - previous: prev.clone(), - })), - None => None, - } + Some(prev) => Some(Rc::new(PositiveDescentAmount::AdditionalStep { + previous: prev.clone(), +})), + None => None, +} } } } @@ -203,11 +204,11 @@ pub fn proportional_divisor_from_int_at_least_two(k: i64) -> Option Some(Rc::new(ProportionalDivisor::StrictlyLarger { - inner: prev.clone(), - })), - None => None, - } + Some(prev) => Some(Rc::new(ProportionalDivisor::StrictlyLarger { + inner: prev.clone(), +})), + None => None, +} } } } @@ -217,12 +218,24 @@ pub fn proportional_divisor_from_int_at_least_two(k: i64) -> Option }, - ArithmeticSubtractDescent { steps: Rc }, - ArithmeticDivideDescent { divisor: Rc }, - ParserAdvance { witness: String }, - SetRemoval { element: String }, + ChildAccessor { + accessor: String, + }, + ListShrink { + amount: Rc, + }, + ArithmeticSubtractDescent { + steps: Rc, + }, + ArithmeticDivideDescent { + divisor: Rc, + }, + ParserAdvance { + witness: String, + }, + SetRemoval { + element: String, + }, FoldIteration, } diff --git a/src/v2/stage0/src/std_types.rs b/src/v2/stage0/src/std_types.rs index f04b8a90acf..95c1c47bf53 100644 --- a/src/v2/stage0/src/std_types.rs +++ b/src/v2/stage0/src/std_types.rs @@ -1,30 +1,28 @@ // Generated by v2 compiler -- do not edit. // Source module: std.types -use self::AbiEnv::*; -use self::Arch::*; -use self::AuthScheme::*; +use std::collections::HashMap; +use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_algebra::{BooleanAlgebra, FreeMonoid, PartialFunction, kernel_algebra_profile, algebra_type_param_names}; use self::Bool::*; -use self::CodegenBackend::*; -use self::CredentialFlow::*; +use self::Platform::*; +use self::TopologyNodeKind::*; use self::DocSourceKind::*; -use self::EntryKind::*; -use self::ExecutionEnv::*; use self::FermiDepth::*; -use self::HttpMethod::*; +use self::CredentialFlow::*; +use self::Arch::*; +use self::Vendor::*; use self::Os::*; -use self::Platform::*; +use self::AbiEnv::*; +use self::ExecutionEnv::*; +use self::EntryKind::*; use self::SymlinkTarget::*; -use self::TopologyNodeKind::*; -use self::Vendor::*; -pub use crate::std_algebra::{ - algebra_type_param_names, kernel_algebra_profile, BooleanAlgebra, FreeMonoid, PartialFunction, -}; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; -use std::collections::HashMap; -use std::rc::Rc; +use self::HttpMethod::*; +use self::AuthScheme::*; +use self::CodegenBackend::*; pub fn kernel_type_set() -> Rc> { thread_local! { @@ -46,9 +44,9 @@ pub fn kernel_type_set() -> Rc> { pub fn is_kernel_type(name: String) -> bool { match v2_rt::map_get(&kernel_type_set(), name) { - Some(_) => true, - None => false, - } + Some(_) => true, + None => false, +} } pub fn container_type_arity() -> Rc> { @@ -66,9 +64,9 @@ pub fn container_type_arity() -> Rc> { pub fn is_container_type(name: String) -> bool { match container_expected_arity(name) { - Some(_) => true, - None => false, - } + Some(_) => true, + None => false, +} } pub fn container_expected_arity(name: String) -> Option { @@ -77,49 +75,19 @@ pub fn container_expected_arity(name: String) -> Option { pub fn container_param_names_for(kind_name: String) -> Rc> { match v2_rt::map_get(&kernel_algebra_profile(), kind_name) { - Some(p) => algebra_type_param_names(p.clone()), - None => Rc::new(vec![]), - } + Some(p) => algebra_type_param_names(p.clone()), + None => Rc::new(vec![]), +} } pub fn container_param_name(kind_name: String, index: i64) -> Option { { let names = container_param_names_for(kind_name); - match Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - names - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - if (pair.0.clone() == index.clone()) { - __result.push(pair); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(pair.1.clone()); - } - __result - }) - .first() - .cloned() - { - Some(name) => Some(name.clone()), - None => None, - } - } +match Rc::new({ let mut __result = Vec::new(); for pair in Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(names.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (pair.0.clone() == index.clone()) { __result.push(pair); } } __result }).iter().cloned() { __result.push(pair.1.clone()); } __result }).first().cloned() { + Some(name) => Some(name.clone()), + None => None, +} +} } pub fn ordered_element_collections() -> Rc> { @@ -164,14 +132,7 @@ pub fn container_template_algebra(name: String) -> Option { } pub fn canonical_container_names() -> Rc> { - Rc::new(vec![ - "BooleanAlgebra".to_string(), - "FreeMonoid".to_string(), - "List".to_string(), - "Map".to_string(), - "PartialFunction".to_string(), - "Set".to_string(), - ]) + Rc::new(vec!["BooleanAlgebra".to_string(), "FreeMonoid".to_string(), "List".to_string(), "Map".to_string(), "PartialFunction".to_string(), "Set".to_string()]) } #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] @@ -181,12 +142,20 @@ pub enum Bool { False, } + + pub type Json = serde_json::Value; pub type Bytes = Vec; pub type Char = i64; + + + + + + pub type CommitSha = String; pub type Sha256 = String; @@ -452,8 +421,12 @@ pub enum HttpMethod { #[serde(tag = "_variant")] pub enum AuthScheme { Bearer, - Header { name: String }, - Basic { username: String }, + Header { + name: String, + }, + Basic { + username: String, + }, ApiKey, } @@ -647,3 +620,5 @@ pub struct DocSource { pub path: String, pub kind: DocSourceKind, } + + diff --git a/src/v2/stage0/src/v2_compiler_artifact.rs b/src/v2/stage0/src/v2_compiler_artifact.rs index d2e80ac7366..75e6b639642 100644 --- a/src/v2/stage0/src/v2_compiler_artifact.rs +++ b/src/v2/stage0/src/v2_compiler_artifact.rs @@ -1,16 +1,16 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.artifact +use std::collections::HashMap; +use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::v2_std_core::{TextFile}; +use self::RenderTarget::*; use self::ArtifactKind::*; use self::BoundaryKind::*; use self::PartitionRule::*; -use self::RenderTarget::*; -use crate::v2_rt; -pub use crate::v2_std_core::TextFile; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; -use std::collections::HashMap; -use std::rc::Rc; #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] @@ -66,27 +66,25 @@ pub struct ArtifactPlan { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum PartitionRule { - Explicit { artifacts: Rc>> }, + Explicit { + artifacts: Rc>>, + }, } impl PartitionRule { pub fn artifacts(&self) -> Rc>> { match self { - PartitionRule::Explicit { - artifacts: __val, .. - } => __val.clone(), + PartitionRule::Explicit { artifacts: __val, .. } => __val.clone(), } } } pub fn plan_artifacts(rule: Rc) -> Rc { match (*rule).clone() { - PartitionRule::Explicit { - artifacts: arts, .. - } => Rc::new(ArtifactPlan { - artifacts: arts.clone(), - boundaries: Rc::new(vec![]), - }), - } + PartitionRule::Explicit { artifacts: arts, .. } => Rc::new(ArtifactPlan { + artifacts: arts.clone(), + boundaries: Rc::new(vec![]), +}), +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -95,17 +93,14 @@ pub struct ArtifactOutput { pub files: Rc>>, } -pub fn default_artifact_plan( - root_modules: Rc>, - target: RenderTarget, -) -> Rc { +pub fn default_artifact_plan(root_modules: Rc>, target: RenderTarget) -> Rc { plan_artifacts(Rc::new(PartitionRule::Explicit { - artifacts: Rc::new(vec![Rc::new(Artifact { - name: "default".to_string(), - kind: ArtifactKind::ServiceBinary, - target: target, - entry_modules: root_modules, - dependencies: Rc::new(vec![]), - })]), - })) + artifacts: Rc::new(vec![Rc::new(Artifact { + name: "default".to_string(), + kind: ArtifactKind::ServiceBinary, + target: target, + entry_modules: root_modules, + dependencies: Rc::new(vec![]), +})]), +})) } diff --git a/src/v2/stage0/src/v2_compiler_coercion.rs b/src/v2/stage0/src/v2_compiler_coercion.rs index c803d00b647..e145655eaf9 100644 --- a/src/v2/stage0/src/v2_compiler_coercion.rs +++ b/src/v2/stage0/src/v2_compiler_coercion.rs @@ -1,174 +1,131 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.coercion -use self::CoercionAssertion::*; -pub use crate::extdeps_languages_dag_types::dag_type_checkpoints; -pub use crate::extdeps_languages_go_types::{ - go_algebra_inhabitants, go_callable, go_cast_syntax, go_optional_template, go_type_checkpoints, -}; -pub use crate::extdeps_languages_python_types::{ - python_algebra_inhabitants, python_callable, python_cast_syntax, python_optional_template, - python_type_checkpoints, -}; -pub use crate::extdeps_languages_rust_types::{ - rust_algebra_inhabitants, rust_callable, rust_cast_syntax, rust_optional_template, - rust_type_checkpoints, -}; -pub use crate::std_coercion::{CallableRepr, CastSyntax, InhabitantDecl, TypeCheckpoint}; -pub use crate::std_types::{canonical_container_names, container_template_algebra}; -pub use crate::v2_compiler_artifact::RenderTarget; -use crate::v2_compiler_artifact::RenderTarget::{Dag, Go, Python, Rust}; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::v2_compiler_artifact::{RenderTarget}; +use crate::v2_compiler_artifact::RenderTarget::{Rust, Python, Go, Dag}; +pub use crate::std_coercion::{TypeCheckpoint, InhabitantDecl, CallableRepr, CastSyntax}; +pub use crate::std_types::{container_template_algebra, canonical_container_names}; +pub use crate::extdeps_languages_rust_types::{rust_type_checkpoints, rust_algebra_inhabitants, rust_callable, rust_optional_template, rust_cast_syntax}; +pub use crate::extdeps_languages_python_types::{python_type_checkpoints, python_algebra_inhabitants, python_callable, python_optional_template, python_cast_syntax}; +pub use crate::extdeps_languages_go_types::{go_type_checkpoints, go_algebra_inhabitants, go_callable, go_optional_template, go_cast_syntax}; +pub use crate::extdeps_languages_dag_types::{dag_type_checkpoints}; +use self::CoercionAssertion::*; pub fn target_checkpoints(target: RenderTarget) -> Rc>> { match target { - RenderTarget::Rust => rust_type_checkpoints(), - RenderTarget::Python => python_type_checkpoints(), - RenderTarget::Go => go_type_checkpoints(), - RenderTarget::Dag => dag_type_checkpoints(), - } + RenderTarget::Rust => rust_type_checkpoints(), + RenderTarget::Python => python_type_checkpoints(), + RenderTarget::Go => go_type_checkpoints(), + RenderTarget::Dag => dag_type_checkpoints(), +} } pub fn target_inhabitants(target: RenderTarget) -> Rc>> { match target { - RenderTarget::Rust => rust_algebra_inhabitants(), - RenderTarget::Python => python_algebra_inhabitants(), - RenderTarget::Go => go_algebra_inhabitants(), - RenderTarget::Dag => Rc::new(vec![]), - } + RenderTarget::Rust => rust_algebra_inhabitants(), + RenderTarget::Python => python_algebra_inhabitants(), + RenderTarget::Go => go_algebra_inhabitants(), + RenderTarget::Dag => Rc::new(vec![]), +} } pub fn target_callable(target: RenderTarget) -> Rc { match target { - RenderTarget::Rust => rust_callable(), - RenderTarget::Python => python_callable(), - RenderTarget::Go => go_callable(), - RenderTarget::Dag => Rc::new(CallableRepr { - template: "fn({params}) -> {return}".to_string(), - param_separator: ", ".to_string(), - return_separator: " -> ".to_string(), - import_path: None, - }), - } + RenderTarget::Rust => rust_callable(), + RenderTarget::Python => python_callable(), + RenderTarget::Go => go_callable(), + RenderTarget::Dag => Rc::new(CallableRepr { + template: "fn({params}) -> {return}".to_string(), + param_separator: ", ".to_string(), + return_separator: " -> ".to_string(), + import_path: None, +}), +} } pub fn target_optional_template(target: RenderTarget) -> String { match target { - RenderTarget::Rust => rust_optional_template(), - RenderTarget::Python => python_optional_template(), - RenderTarget::Go => go_optional_template(), - RenderTarget::Dag => "{0}?".to_string(), - } + RenderTarget::Rust => rust_optional_template(), + RenderTarget::Python => python_optional_template(), + RenderTarget::Go => go_optional_template(), + RenderTarget::Dag => "{0}?".to_string(), +} } pub fn target_cast_syntax(target: RenderTarget) -> Option> { match target { - RenderTarget::Rust => Some(rust_cast_syntax()), - RenderTarget::Python => Some(python_cast_syntax()), - RenderTarget::Go => Some(go_cast_syntax()), - RenderTarget::Dag => None, - } + RenderTarget::Rust => Some(rust_cast_syntax()), + RenderTarget::Python => Some(python_cast_syntax()), + RenderTarget::Go => Some(go_cast_syntax()), + RenderTarget::Dag => None, +} } pub fn can_cast(target: RenderTarget, source_type: String, target_type: String) -> bool { match target_cast_syntax(target) { - Some(syntax) => { - let mut __found = false; - for r in syntax.cast_rules.clone().iter().cloned() { - if ((r.from_type.clone().as_str() == source_type.clone().as_str()) - && (r.to_type.clone().as_str() == target_type.clone().as_str())) - { - __found = true; - break; - } - } - __found - } - None => false, - } + Some(syntax) => { let mut __found = false; for r in syntax.cast_rules.clone().iter().cloned() { if ((r.from_type.clone().as_str() == source_type.clone().as_str()) && (r.to_type.clone().as_str() == target_type.clone().as_str())) { __found = true; break; } } __found }, + None => false, +} } pub fn render_cast(expr_str: String, type_str: String, target: RenderTarget) -> String { { let syntax = match target_cast_syntax(target) { - Some(s) => s.clone(), - None => Rc::new(CastSyntax { - template: "{expr}".to_string(), - cast_rules: Rc::new(vec![]), - }), - }; - v2_rt::replace( - v2_rt::replace(syntax.template.clone(), "{expr}".to_string(), expr_str), - "{type}".to_string(), - type_str, - ) - } + Some(s) => s.clone(), + None => Rc::new(CastSyntax { + template: "{expr}".to_string(), + cast_rules: Rc::new(vec![]), +}), +}; +v2_rt::replace(v2_rt::replace(syntax.template.clone(), "{expr}".to_string(), expr_str), "{type}".to_string(), type_str) +} } pub fn lookup_checkpoint(target: RenderTarget, dag_name: String) -> Option> { - Rc::new({ - let mut __result = Vec::new(); - for cp in target_checkpoints(target).iter().cloned() { - if (cp.dag_name.clone().as_str() == dag_name.clone().as_str()) { - __result.push(cp); - } - } - __result - }) - .first() - .cloned() + Rc::new({ let mut __result = Vec::new(); for cp in target_checkpoints(target).iter().cloned() { if (cp.dag_name.clone().as_str() == dag_name.clone().as_str()) { __result.push(cp); } } __result }).first().cloned() } pub fn coerce_primitive_type(target: RenderTarget, dag_name: String) -> String { match lookup_checkpoint(target, dag_name.clone()) { - Some(cp) => cp.target_type.clone(), - None => dag_name.clone(), - } + Some(cp) => cp.target_type.clone(), + None => dag_name.clone(), +} } pub fn is_copy(target: RenderTarget, dag_name: String) -> Option { match lookup_checkpoint(target, dag_name) { - Some(cp) => cp.is_copy.clone(), - None => None, - } + Some(cp) => cp.is_copy.clone(), + None => None, +} } pub fn literal_suffix(target: RenderTarget, dag_name: String) -> Option { match lookup_checkpoint(target, dag_name) { - Some(cp) => match cp.literal_suffix.clone() { - Some(s) => Some(s.clone()), - None => Some("".to_string()), - }, - None => None, - } + Some(cp) => match cp.literal_suffix.clone() { + Some(s) => Some(s.clone()), + None => Some("".to_string()), +}, + None => None, +} } pub fn lookup_inhabitant(target: RenderTarget, algebra: String) -> Option> { - Rc::new({ - let mut __result = Vec::new(); - for inh in target_inhabitants(target).iter().cloned() { - if (inh.algebra.clone().as_str() == algebra.clone().as_str()) { - __result.push(inh); - } - } - __result - }) - .first() - .cloned() + Rc::new({ let mut __result = Vec::new(); for inh in target_inhabitants(target).iter().cloned() { if (inh.algebra.clone().as_str() == algebra.clone().as_str()) { __result.push(inh); } } __result }).first().cloned() } pub fn coerce_container_template(target: RenderTarget, container_name: String) -> Option { match container_template_algebra(container_name) { - Some(algebra) => match lookup_inhabitant(target, algebra.clone()) { - Some(inh) => Some(inh.template.clone()), - None => None, - }, - None => None, - } + Some(algebra) => match lookup_inhabitant(target, algebra.clone()) { + Some(inh) => Some(inh.template.clone()), + None => None, +}, + None => None, +} } pub fn apply_inhabitant_template1(template: String, inner: String) -> String { @@ -176,11 +133,7 @@ pub fn apply_inhabitant_template1(template: String, inner: String) -> String { } pub fn apply_inhabitant_template2(template: String, first: String, second: String) -> String { - v2_rt::replace( - v2_rt::replace(template, "{0}".to_string(), first), - "{1}".to_string(), - second, - ) + v2_rt::replace(v2_rt::replace(template, "{0}".to_string(), first), "{1}".to_string(), second) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -216,39 +169,30 @@ pub struct CoercionTestEntry { pub fn target_label(target: RenderTarget) -> String { match target { - RenderTarget::Rust => "rust".to_string(), - RenderTarget::Python => "python".to_string(), - RenderTarget::Go => "go".to_string(), - RenderTarget::Dag => "dag".to_string(), - } + RenderTarget::Rust => "rust".to_string(), + RenderTarget::Python => "python".to_string(), + RenderTarget::Go => "go".to_string(), + RenderTarget::Dag => "dag".to_string(), +} } pub fn checkpoint_tests(target: &RenderTarget) -> Rc>> { { let label = target_label(target.clone()); - let cps = target_checkpoints(target.clone()); - if ((cps.clone().len() as i64) == 0) { +let cps = target_checkpoints(target.clone()); +if ((cps.clone().len() as i64) == 0) { Rc::new(vec![]) } else { Rc::new(vec![Rc::new(CoercionTestEntry { - test_name: v2_rt::concat( - v2_rt::concat("coercion_".to_string(), label), - "_checkpoint_resolves_primitives".to_string(), - ), - assertions: Rc::new({ - let mut __result = Vec::new(); - for cp in cps.clone().iter().cloned() { - __result.push(Rc::new(CoercionAssertion::CheckpointAssertion { - target: target.clone(), - dag_name: cp.dag_name.clone(), - expected_type: cp.target_type.clone(), - })); - } - __result - }), - })]) + test_name: v2_rt::concat(v2_rt::concat("coercion_".to_string(), label), "_checkpoint_resolves_primitives".to_string()), + assertions: Rc::new({ let mut __result = Vec::new(); for cp in cps.clone().iter().cloned() { __result.push(Rc::new(CoercionAssertion::CheckpointAssertion { + target: target.clone(), + dag_name: cp.dag_name.clone(), + expected_type: cp.target_type.clone(), +})); } __result }), +})]) } - } +} } pub fn inhabitant_test_names() -> Rc> { @@ -258,173 +202,89 @@ pub fn inhabitant_test_names() -> Rc> { pub fn inhabitant_tests(target: &RenderTarget) -> Rc>> { { let label = target_label(target.clone()); - let assertions = Rc::new({ - let mut __result = Vec::new(); - for name in inhabitant_test_names().iter().cloned() { - __result.extend( - (*match coerce_container_template(target.clone(), name.clone()) { - Some(tmpl) => { - Rc::new(vec![Rc::new(CoercionAssertion::ContainerAssertion { - target: target.clone(), - container_name: name.clone(), - expected_template: tmpl.clone(), - })]) - } - None => Rc::new(vec![]), - }) - .iter() - .cloned(), - ); - } - __result - }); - if ((assertions.clone().len() as i64) == 0) { +let assertions = Rc::new({ let mut __result = Vec::new(); for name in inhabitant_test_names().iter().cloned() { __result.extend((*match coerce_container_template(target.clone(), name.clone()) { + Some(tmpl) => Rc::new(vec![Rc::new(CoercionAssertion::ContainerAssertion { + target: target.clone(), + container_name: name.clone(), + expected_template: tmpl.clone(), +})]), + None => Rc::new(vec![]), +}).iter().cloned()); } __result }); +if ((assertions.clone().len() as i64) == 0) { Rc::new(vec![]) } else { Rc::new(vec![Rc::new(CoercionTestEntry { - test_name: v2_rt::concat( - v2_rt::concat("coercion_".to_string(), label), - "_inhabitant_resolves_containers".to_string(), - ), - assertions: assertions.clone(), - })]) + test_name: v2_rt::concat(v2_rt::concat("coercion_".to_string(), label), "_inhabitant_resolves_containers".to_string()), + assertions: assertions.clone(), +})]) } - } +} } pub fn copy_tests() -> Rc>> { { let cps = target_checkpoints(RenderTarget::Rust); - let copy_assertions = Rc::new({ - let mut __result = Vec::new(); - for cp in cps.iter().cloned() { - __result.extend( - (*match cp.is_copy.clone() { - Some(v) => Rc::new(vec![Rc::new(CoercionAssertion::CopyAssertion { - target: RenderTarget::Rust, - dag_name: cp.dag_name.clone(), - expected_copy: v.clone(), - })]), - None => Rc::new(vec![]), - }) - .iter() - .cloned(), - ); - } - __result - }); - if ((copy_assertions.clone().len() as i64) == 0) { +let copy_assertions = Rc::new({ let mut __result = Vec::new(); for cp in cps.iter().cloned() { __result.extend((*match cp.is_copy.clone() { + Some(v) => Rc::new(vec![Rc::new(CoercionAssertion::CopyAssertion { + target: RenderTarget::Rust, + dag_name: cp.dag_name.clone(), + expected_copy: v.clone(), +})]), + None => Rc::new(vec![]), +}).iter().cloned()); } __result }); +if ((copy_assertions.clone().len() as i64) == 0) { Rc::new(vec![]) } else { Rc::new(vec![Rc::new(CoercionTestEntry { - test_name: "coercion_is_copy_from_checkpoint".to_string(), - assertions: copy_assertions.clone(), - })]) + test_name: "coercion_is_copy_from_checkpoint".to_string(), + assertions: copy_assertions.clone(), +})]) } - } +} } pub fn template_application_tests() -> Rc>> { { - let targets = Rc::new(vec![ - RenderTarget::Rust, - RenderTarget::Python, - RenderTarget::Go, - ]); - let assertions = Rc::new({ - let mut __result = Vec::new(); - for t in targets.iter().cloned() { - __result.extend( - (*{ - let inhs = target_inhabitants(t.clone()); - let int_target = coerce_primitive_type(t.clone(), "Int".to_string()); - let str_target = coerce_primitive_type(t.clone(), "String".to_string()); - Rc::new({ - let mut __result = Vec::new(); - for inh in inhs.clone().iter().cloned() { - __result.extend( - (*if (inh.arity.clone() == 1) { - { - let expected = apply_inhabitant_template1( - inh.template.clone(), - int_target.clone(), - ); - Rc::new(vec![Rc::new( - CoercionAssertion::TemplateAssertion { - template: inh.template.clone(), - args: Rc::new(vec![int_target.clone()]), - expected: expected.clone(), - }, - )]) - } - } else { - if (inh.arity.clone() == 2) { - { - let expected = apply_inhabitant_template2( - inh.template.clone(), - str_target.clone(), - int_target.clone(), - ); - Rc::new(vec![Rc::new( - CoercionAssertion::TemplateAssertion { - template: inh.template.clone(), - args: Rc::new(vec![ - str_target.clone(), - int_target.clone(), - ]), - expected: expected.clone(), - }, - )]) - } - } else { - Rc::new(vec![]) - } - }) - .iter() - .cloned(), - ); - } - __result - }) - }) - .iter() - .cloned(), - ); - } - __result - }); - if ((assertions.clone().len() as i64) == 0) { + let targets = Rc::new(vec![RenderTarget::Rust, RenderTarget::Python, RenderTarget::Go]); +let assertions = Rc::new({ let mut __result = Vec::new(); for t in targets.iter().cloned() { __result.extend((*{ + let inhs = target_inhabitants(t.clone()); +let int_target = coerce_primitive_type(t.clone(), "Int".to_string()); +let str_target = coerce_primitive_type(t.clone(), "String".to_string()); +Rc::new({ let mut __result = Vec::new(); for inh in inhs.clone().iter().cloned() { __result.extend((*if (inh.arity.clone() == 1) { + { + let expected = apply_inhabitant_template1(inh.template.clone(), int_target.clone()); +Rc::new(vec![Rc::new(CoercionAssertion::TemplateAssertion { + template: inh.template.clone(), + args: Rc::new(vec![int_target.clone()]), + expected: expected.clone(), +})]) +} + } else { + if (inh.arity.clone() == 2) { + { + let expected = apply_inhabitant_template2(inh.template.clone(), str_target.clone(), int_target.clone()); +Rc::new(vec![Rc::new(CoercionAssertion::TemplateAssertion { + template: inh.template.clone(), + args: Rc::new(vec![str_target.clone(), int_target.clone()]), + expected: expected.clone(), +})]) +} + } else { + Rc::new(vec![]) + } + }).iter().cloned()); } __result }) +}).iter().cloned()); } __result }); +if ((assertions.clone().len() as i64) == 0) { Rc::new(vec![]) } else { Rc::new(vec![Rc::new(CoercionTestEntry { - test_name: "coercion_template_application".to_string(), - assertions: assertions.clone(), - })]) + test_name: "coercion_template_application".to_string(), + assertions: assertions.clone(), +})]) } - } +} } pub fn extract_coercion_tests() -> Rc>> { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - checkpoint_tests(&RenderTarget::Rust), - checkpoint_tests(&RenderTarget::Python), - ), - checkpoint_tests(&RenderTarget::Go), - ), - inhabitant_tests(&RenderTarget::Rust), - ), - inhabitant_tests(&RenderTarget::Python), - ), - inhabitant_tests(&RenderTarget::Go), - ), - copy_tests(), - ), - template_application_tests(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(checkpoint_tests(&RenderTarget::Rust), checkpoint_tests(&RenderTarget::Python)), checkpoint_tests(&RenderTarget::Go)), inhabitant_tests(&RenderTarget::Rust)), inhabitant_tests(&RenderTarget::Python)), inhabitant_tests(&RenderTarget::Go)), copy_tests()), template_application_tests()) } diff --git a/src/v2/stage0/src/v2_compiler_compile.rs b/src/v2/stage0/src/v2_compiler_compile.rs index 667fde627bc..d563415770e 100644 --- a/src/v2/stage0/src/v2_compiler_compile.rs +++ b/src/v2/stage0/src/v2_compiler_compile.rs @@ -1,76 +1,51 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.compile -use crate::std_induction::RecursionShape::{ - DirectRecursion, ListRecursion, MapValueRecursion, OptionalRecursion, SetRecursion, -}; -use crate::std_induction::ShrinkFactor::{ConstantShrink, ProportionalShrink, UnitShrink}; -use crate::std_induction::SubValueRelation::{ - IteratedSubValue, PreservedValue, StrictSubValue, SubValueUnknown, -}; -pub use crate::std_induction::{InductiveField, RecursionShape, ShrinkFactor, SubValueRelation}; -use crate::std_termination::PositiveDescentAmount::{AdditionalStep, OneStep}; -use crate::std_termination::ProportionalDivisor::{DivideByTwo, StrictlyLarger}; -pub use crate::std_termination::{PositiveDescentAmount, ProportionalDivisor}; -use crate::v2_compiler_artifact::RenderTarget::Dag; -pub use crate::v2_compiler_artifact::{ - default_artifact_plan, Artifact, ArtifactPlan, RenderTarget, -}; -pub use crate::v2_compiler_complexity::{ - build_complexity_report, empty_complexity_report, ComplexityReport, ComplexityViolation, - FuncEntry, RecursionContext, -}; -pub use crate::v2_compiler_emit::{escape_json_string, EmitResult}; -pub use crate::v2_compiler_emit_go::emit_go; -pub use crate::v2_compiler_emit_python::emit_python; -pub use crate::v2_compiler_emit_rust::emit_rust; -pub use crate::v2_compiler_infer::reconcile; -pub use crate::v2_compiler_infer_items::{ResolvedGraph, TypedModule}; -pub use crate::v2_compiler_infer_types::algebra_field_kind_name; -pub use crate::v2_compiler_normalize::{normalize_graph, NormalizeResult}; -use crate::v2_compiler_ownership::OwnershipDecision::SharedError; -pub use crate::v2_compiler_ownership::{analyze_ownership, OwnershipDecision, OwnershipProof}; -pub use crate::v2_compiler_parse::{parse_with_table, ParseResult}; -pub use crate::v2_compiler_resolve::{resolve_modules, ModuleGraph}; -pub use crate::v2_compiler_tokenize::tokenize; +use std::collections::HashMap; +use std::rc::Rc; use crate::v2_rt; -use crate::v2_std_core::BinOp::*; -use crate::v2_std_core::CallSemantics::*; -use crate::v2_std_core::Cardinality::*; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::v2_std_core::{CompileResult, TextFile, SourceSpan, authored_name_at, ErrorNode, CompilerDiagnostic, is_error_diagnostic, diagnostic_to_message, diagnostic_to_span, make_error_node, no_span, Connective, Cardinality, resource_use_name_at, resource_use_resource, param_node_name_at, param_node_type_expr, param_node_default_value, param_node_span, field_node_name_at, field_node_type_expr, field_node_cardinality, field_node_default_value, field_node_from_key, field_node_span, module_imports, module_items, import_is_all, import_specific_names_at, FieldAccessStyle, FieldValueShape, FieldSummary, InferredNode, VarBindingKind, CallSemantics, MethodSemantics, ExprErrorKind, ExprData, MatchPattern, field_binding_name_at, field_binding_pattern, arg_name_at, arg_value, arm_pattern, arm_guard, arm_body, field_init_node_name_at, field_init_node_value, LiteralValue, BinOp, UnaryOpKind, StringPart, Node, Token, NewlineIndex, build_newline_index, field_access_field_at, expr_call_func_at, lambda_param_names_at, record_lit_type_name_at, foreach_variable_at, expr_method_name_at, InternTable, InternResult, empty_intern_table, intern}; use crate::v2_std_core::CompilerDiagnostic::{InternalError, OwnershipViolation}; -use crate::v2_std_core::Connective::{Arrow, NoConnective}; -use crate::v2_std_core::ExprData::*; -use crate::v2_std_core::ExprErrorKind::*; +use crate::v2_std_core::Connective::{NoConnective, Arrow}; +use crate::v2_std_core::InferredNode::{Resolved, CompilerError, TypeVariable}; +use crate::v2_std_core::MethodSemantics::{PlainMethodSemantics, AlgebraMethodSemantics, ServiceMethodSemantics}; +use crate::v2_std_core::Cardinality::*; use crate::v2_std_core::FieldAccessStyle::*; use crate::v2_std_core::FieldValueShape::*; -use crate::v2_std_core::InferredNode::{CompilerError, Resolved, TypeVariable}; -use crate::v2_std_core::LiteralValue::*; +use crate::v2_std_core::VarBindingKind::*; +use crate::v2_std_core::CallSemantics::*; +use crate::v2_std_core::ExprErrorKind::*; +use crate::v2_std_core::ExprData::*; use crate::v2_std_core::MatchPattern::*; -use crate::v2_std_core::MethodSemantics::{ - AlgebraMethodSemantics, PlainMethodSemantics, ServiceMethodSemantics, -}; -use crate::v2_std_core::StringPart::*; +use crate::v2_std_core::LiteralValue::*; +use crate::v2_std_core::BinOp::*; use crate::v2_std_core::UnaryOpKind::*; -use crate::v2_std_core::VarBindingKind::*; -pub use crate::v2_std_core::{ - arg_name_at, arg_value, arm_body, arm_guard, arm_pattern, authored_name_at, - build_newline_index, diagnostic_to_message, diagnostic_to_span, empty_intern_table, - expr_call_func_at, expr_method_name_at, field_access_field_at, field_binding_name_at, - field_binding_pattern, field_init_node_name_at, field_init_node_value, field_node_cardinality, - field_node_default_value, field_node_from_key, field_node_name_at, field_node_span, - field_node_type_expr, foreach_variable_at, import_is_all, import_specific_names_at, intern, - is_error_diagnostic, lambda_param_names_at, make_error_node, module_imports, module_items, - no_span, param_node_default_value, param_node_name_at, param_node_span, param_node_type_expr, - record_lit_type_name_at, resource_use_name_at, resource_use_resource, BinOp, CallSemantics, - Cardinality, CompileResult, CompilerDiagnostic, Connective, ErrorNode, ExprData, ExprErrorKind, - FieldAccessStyle, FieldSummary, FieldValueShape, InferredNode, InternResult, InternTable, - LiteralValue, MatchPattern, MethodSemantics, NewlineIndex, Node, SourceSpan, StringPart, - TextFile, Token, UnaryOpKind, VarBindingKind, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; -use std::collections::HashMap; -use std::rc::Rc; +use crate::v2_std_core::StringPart::*; +pub use crate::v2_compiler_tokenize::{tokenize}; +pub use crate::v2_compiler_parse::{parse_with_table, ParseResult}; +pub use crate::v2_compiler_resolve::{resolve_modules, ModuleGraph}; +pub use crate::v2_compiler_normalize::{normalize_graph, NormalizeResult}; +pub use crate::v2_compiler_infer_items::{ResolvedGraph, TypedModule}; +pub use crate::v2_compiler_infer::{reconcile}; +pub use crate::v2_compiler_infer_types::{algebra_field_kind_name}; +pub use crate::v2_compiler_emit::{EmitResult, escape_json_string}; +pub use crate::v2_compiler_emit_rust::{emit_rust}; +pub use crate::v2_compiler_emit_python::{emit_python}; +pub use crate::v2_compiler_emit_go::{emit_go}; +pub use crate::v2_compiler_complexity::{ComplexityReport, ComplexityViolation, FuncEntry, RecursionContext, build_complexity_report, empty_complexity_report}; +pub use crate::std_induction::{SubValueRelation, InductiveField, ShrinkFactor, RecursionShape}; +use crate::std_induction::SubValueRelation::{StrictSubValue, IteratedSubValue, PreservedValue, SubValueUnknown}; +use crate::std_induction::ShrinkFactor::{UnitShrink, ConstantShrink, ProportionalShrink}; +use crate::std_induction::RecursionShape::{DirectRecursion, ListRecursion, OptionalRecursion, SetRecursion, MapValueRecursion}; +pub use crate::std_termination::{PositiveDescentAmount, ProportionalDivisor}; +use crate::std_termination::PositiveDescentAmount::{OneStep, AdditionalStep}; +use crate::std_termination::ProportionalDivisor::{DivideByTwo, StrictlyLarger}; +pub use crate::v2_compiler_ownership::{OwnershipProof, OwnershipDecision, analyze_ownership}; +use crate::v2_compiler_ownership::OwnershipDecision::{SharedError}; +pub use crate::v2_compiler_artifact::{ArtifactPlan, Artifact, RenderTarget, default_artifact_plan}; +use crate::v2_compiler_artifact::RenderTarget::{Dag}; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct SourceFile { @@ -104,64 +79,13 @@ pub struct FrontendAccum { } pub fn extract_func_entries(typed: Rc) -> Rc>> { - Rc::new({ - let mut __result = Vec::new(); - for m in Rc::new({ - let mut __result = Vec::new(); - for m in typed.modules.clone().iter().cloned() { - if { - let mut __found = false; - for item in m.items.clone().iter().cloned() { - if (item.body.clone() != None) { - __found = true; - break; - } - } - __found - } { - __result.push(m); - } - } - __result - }) - .iter() - .cloned() - { - __result.extend( - (*Rc::new({ - let mut __result = Vec::new(); - for item in Rc::new({ - let mut __result = Vec::new(); - for item in m.items.clone().iter().cloned() { - if (item.body.clone() != None) { - __result.push(item); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(Rc::new(FuncEntry { - name: authored_name_at( - m.type_env.clone().source_indices.clone(), - &item, - ), - body: item.body.clone().clone().unwrap(), - params: item.params.clone(), - span: item.span.clone(), - is_tail_recursive: (item.is_self_recursive.clone() - && (item.has_non_tail_self_call.clone() == false)), - })); - } - __result - })) - .iter() - .cloned(), - ); - } - __result - }) + Rc::new({ let mut __result = Vec::new(); for m in Rc::new({ let mut __result = Vec::new(); for m in typed.modules.clone().iter().cloned() { if { let mut __found = false; for item in m.items.clone().iter().cloned() { if (item.body.clone() != None) { __found = true; break; } } __found } { __result.push(m); } } __result }).iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for item in Rc::new({ let mut __result = Vec::new(); for item in m.items.clone().iter().cloned() { if (item.body.clone() != None) { __result.push(item); } } __result }).iter().cloned() { __result.push(Rc::new(FuncEntry { + name: authored_name_at(m.type_env.clone().source_indices.clone(), &item), + body: item.body.clone().clone().unwrap(), + params: item.params.clone(), + span: item.span.clone(), + is_tail_recursive: (item.is_self_recursive.clone() && (item.has_non_tail_self_call.clone() == false)), +})); } __result })).iter().cloned()); } __result }) } pub fn build_recursion_context(typed: Rc) -> RecursionContext { @@ -169,190 +93,86 @@ pub fn build_recursion_context(typed: Rc) -> RecursionContext { } pub fn extract_ownership_proofs(typed: Rc) -> Rc>> { - Rc::new({ - let mut __result = Vec::new(); - for m in Rc::new({ - let mut __result = Vec::new(); - for m in typed.modules.clone().iter().cloned() { - if { - let mut __found = false; - for item in m.items.clone().iter().cloned() { - if (item.body.clone() != None) { - __found = true; - break; - } - } - __found - } { - __result.push(m); - } - } - __result - }) - .iter() - .cloned() - { - __result.extend( - (*Rc::new({ - let mut __result = Vec::new(); - for item in Rc::new({ - let mut __result = Vec::new(); - for item in m.items.clone().iter().cloned() { - if (item.body.clone() != None) { - __result.push(item); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(analyze_ownership( - authored_name_at(m.type_env.clone().source_indices.clone(), &item), - item.params.clone(), - item.body.clone().clone().unwrap(), - &m.type_env.clone().source_indices.clone(), - )); - } - __result - })) - .iter() - .cloned(), - ); - } - __result - }) + Rc::new({ let mut __result = Vec::new(); for m in Rc::new({ let mut __result = Vec::new(); for m in typed.modules.clone().iter().cloned() { if { let mut __found = false; for item in m.items.clone().iter().cloned() { if (item.body.clone() != None) { __found = true; break; } } __found } { __result.push(m); } } __result }).iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for item in Rc::new({ let mut __result = Vec::new(); for item in m.items.clone().iter().cloned() { if (item.body.clone() != None) { __result.push(item); } } __result }).iter().cloned() { __result.push(analyze_ownership(authored_name_at(m.type_env.clone().source_indices.clone(), &item), item.params.clone(), item.body.clone().clone().unwrap(), &m.type_env.clone().source_indices.clone())); } __result })).iter().cloned()); } __result }) } pub fn ownership_diagnostics(proofs: Rc>>) -> Rc>> { - Rc::new({ - let mut __result = Vec::new(); - for proof in proofs.iter().cloned() { - __result.extend( - (*Rc::new({ - let mut __result = Vec::new(); - for decision in proof.decisions.clone().iter().cloned() { - __result.extend( - (*match (*decision.clone()).clone() { - OwnershipDecision::SharedError { - binding, - consumer_count: count, - sites, - .. - } => Rc::new(vec![make_error_node( - Rc::new(CompilerDiagnostic::OwnershipViolation { - binding: binding.clone(), - fn_name: proof.func_name.clone(), - consumers: count.clone(), - span: no_span(), - }), - proof.func_name.clone(), - )]), - _ => Rc::new(vec![]), - }) - .iter() - .cloned(), - ); - } - __result - })) - .iter() - .cloned(), - ); - } - __result - }) + Rc::new({ let mut __result = Vec::new(); for proof in proofs.iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for decision in proof.decisions.clone().iter().cloned() { __result.extend((*match (*decision.clone()).clone() { + OwnershipDecision::SharedError { binding, consumer_count: count, sites, .. } => Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::OwnershipViolation { + binding: binding.clone(), + fn_name: proof.func_name.clone(), + consumers: count.clone(), + span: no_span(), +}), proof.func_name.clone())]), + _ => Rc::new(vec![]), +}).iter().cloned()); } __result })).iter().cloned()); } __result }) } pub fn complexity_diagnostics(complexity: Rc) -> Rc>> { - Rc::new({ - let mut __result = Vec::new(); - for v in complexity.violations.clone().iter().cloned() { - __result.push(make_error_node( - Rc::new(CompilerDiagnostic::ComplexityUnknown { - func_name: v.func_name.clone(), - reason: v.reason.clone(), - span: v.span.clone(), - }), - v.func_name.clone(), - )); - } - __result - }) + Rc::new({ let mut __result = Vec::new(); for v in complexity.violations.clone().iter().cloned() { __result.push(make_error_node(Rc::new(CompilerDiagnostic::ComplexityUnknown { + func_name: v.func_name.clone(), + reason: v.reason.clone(), + span: v.span.clone(), +}), v.func_name.clone())); } __result }) } pub fn empty_artifact_plan() -> Rc { Rc::new(ArtifactPlan { - artifacts: Rc::new(vec![]), - boundaries: Rc::new(vec![]), - }) + artifacts: Rc::new(vec![]), + boundaries: Rc::new(vec![]), +}) } pub fn compile_bundle_error(message: String) -> Rc { - make_error_node( - Rc::new(CompilerDiagnostic::InternalError { - message: message, - span: no_span(), - }), - "".to_string(), - ) + make_error_node(Rc::new(CompilerDiagnostic::InternalError { + message: message, + span: no_span(), +}), "".to_string()) } pub fn emit_artifact(typed: Rc, artifact: Rc) -> Rc { match artifact.target.clone() { - RenderTarget::Rust => emit_rust(&typed), - RenderTarget::Python => emit_python(&typed), - RenderTarget::Go => emit_go(&typed), - RenderTarget::Dag => emit_dag_artifact(&typed), - } + RenderTarget::Rust => emit_rust(&typed), + RenderTarget::Python => emit_python(&typed), + RenderTarget::Go => emit_go(&typed), + RenderTarget::Dag => emit_dag_artifact(&typed), +} } pub fn json_quote(s: String) -> String { - v2_rt::concat( - v2_rt::concat("\"".to_string(), escape_json_string(s)), - "\"".to_string(), - ) + v2_rt::concat(v2_rt::concat("\"".to_string(), escape_json_string(s)), "\"".to_string()) } pub fn json_list(items: Rc>) -> String { - v2_rt::concat( - v2_rt::concat("[".to_string(), items.join(&", ".to_string())), - "]".to_string(), - ) + v2_rt::concat(v2_rt::concat("[".to_string(), items.join(&", ".to_string())), "]".to_string()) } pub fn json_optional_string(value: Option) -> String { match value { - Some(inner) => json_quote(inner.clone()), - None => "null".to_string(), - } + Some(inner) => json_quote(inner.clone()), + None => "null".to_string(), +} } -pub fn json_optional_node( - value: Option>, - source_indices: Rc>>, -) -> String { +pub fn json_optional_node(value: Option>, source_indices: Rc>>) -> String { match value { - Some(inner) => serialize_node(&inner, &source_indices), - None => "null".to_string(), - } + Some(inner) => serialize_node(&inner, &source_indices), + None => "null".to_string(), +} } -pub fn json_optional_inferred_node( - value: Option>, - source_indices: Rc>>, -) -> String { +pub fn json_optional_inferred_node(value: Option>, source_indices: Rc>>) -> String { match value { - Some(inner) => serialize_inferred_node(inner.clone(), source_indices), - None => "null".to_string(), - } + Some(inner) => serialize_inferred_node(inner.clone(), source_indices), + None => "null".to_string(), +} } pub fn json_optional_span(value: Option>) -> String { match value { - Some(inner) => serialize_span(&inner), - None => "null".to_string(), - } + Some(inner) => serialize_span(&inner), + None => "null".to_string(), +} } pub fn json_bool(value: bool) -> String { @@ -365,1197 +185,306 @@ pub fn json_bool(value: bool) -> String { pub fn connective_name(value: Connective) -> String { match value { - Connective::Conj => "Conj".to_string(), - Connective::Disj => "Disj".to_string(), - Connective::NoConnective => "NoConnective".to_string(), - Connective::Arrow => "Arrow".to_string(), - } + Connective::Conj => "Conj".to_string(), + Connective::Disj => "Disj".to_string(), + Connective::NoConnective => "NoConnective".to_string(), + Connective::Arrow => "Arrow".to_string(), +} } pub fn cardinality_name(value: Cardinality) -> String { match value { - Cardinality::Required => "Required".to_string(), - Cardinality::CardOptional => "CardOptional".to_string(), - } + Cardinality::Required => "Required".to_string(), + Cardinality::CardOptional => "CardOptional".to_string(), +} } pub fn field_access_style_name(value: FieldAccessStyle) -> String { match value { - FieldAccessStyle::StoredField => "StoredField".to_string(), - FieldAccessStyle::EnumAccessor => "EnumAccessor".to_string(), - FieldAccessStyle::OptionalUnwrap => "OptionalUnwrap".to_string(), - FieldAccessStyle::TupleFirst => "TupleFirst".to_string(), - FieldAccessStyle::TupleSecond => "TupleSecond".to_string(), - } + FieldAccessStyle::StoredField => "StoredField".to_string(), + FieldAccessStyle::EnumAccessor => "EnumAccessor".to_string(), + FieldAccessStyle::OptionalUnwrap => "OptionalUnwrap".to_string(), + FieldAccessStyle::TupleFirst => "TupleFirst".to_string(), + FieldAccessStyle::TupleSecond => "TupleSecond".to_string(), +} } pub fn field_value_shape_name(value: FieldValueShape) -> String { match value { - FieldValueShape::PlainValue => "PlainValue".to_string(), - FieldValueShape::OptionalValue => "OptionalValue".to_string(), - } + FieldValueShape::PlainValue => "PlainValue".to_string(), + FieldValueShape::OptionalValue => "OptionalValue".to_string(), +} } pub fn var_binding_kind_name(value: Rc) -> String { match (*value).clone() { - VarBindingKind::LocalValueBinding => "LocalValueBinding".to_string(), - VarBindingKind::FunctionValueBinding => "FunctionValueBinding".to_string(), - VarBindingKind::VariantValueBinding { .. } => "VariantValueBinding".to_string(), - VarBindingKind::MatchBoundBinding => "MatchBoundBinding".to_string(), - } + VarBindingKind::LocalValueBinding => "LocalValueBinding".to_string(), + VarBindingKind::FunctionValueBinding => "FunctionValueBinding".to_string(), + VarBindingKind::VariantValueBinding { .. } => "VariantValueBinding".to_string(), + VarBindingKind::MatchBoundBinding => "MatchBoundBinding".to_string(), +} } pub fn call_semantics_name(value: CallSemantics) -> String { match value { - CallSemantics::PlainCallSemantics => "PlainCallSemantics".to_string(), - CallSemantics::LookupCallSemantics => "LookupCallSemantics".to_string(), - } + CallSemantics::PlainCallSemantics => "PlainCallSemantics".to_string(), + CallSemantics::LookupCallSemantics => "LookupCallSemantics".to_string(), +} } pub fn expr_error_kind_name(value: ExprErrorKind) -> String { match value { - ExprErrorKind::ParseRecoveryError => "ParseRecoveryError".to_string(), - ExprErrorKind::SemanticExprError => "SemanticExprError".to_string(), - ExprErrorKind::InternalExprError => "InternalExprError".to_string(), - } + ExprErrorKind::ParseRecoveryError => "ParseRecoveryError".to_string(), + ExprErrorKind::SemanticExprError => "SemanticExprError".to_string(), + ExprErrorKind::InternalExprError => "InternalExprError".to_string(), +} } pub fn bin_op_name(value: BinOp) -> String { match value { - BinOp::Add => "Add".to_string(), - BinOp::Sub => "Sub".to_string(), - BinOp::Mul => "Mul".to_string(), - BinOp::Div => "Div".to_string(), - BinOp::Mod => "Mod".to_string(), - BinOp::Eq => "Eq".to_string(), - BinOp::Ne => "Ne".to_string(), - BinOp::Lt => "Lt".to_string(), - BinOp::Gt => "Gt".to_string(), - BinOp::Le => "Le".to_string(), - BinOp::Ge => "Ge".to_string(), - BinOp::And => "And".to_string(), - BinOp::Or => "Or".to_string(), - BinOp::NullCoalesce => "NullCoalesce".to_string(), - } + BinOp::Add => "Add".to_string(), + BinOp::Sub => "Sub".to_string(), + BinOp::Mul => "Mul".to_string(), + BinOp::Div => "Div".to_string(), + BinOp::Mod => "Mod".to_string(), + BinOp::Eq => "Eq".to_string(), + BinOp::Ne => "Ne".to_string(), + BinOp::Lt => "Lt".to_string(), + BinOp::Gt => "Gt".to_string(), + BinOp::Le => "Le".to_string(), + BinOp::Ge => "Ge".to_string(), + BinOp::And => "And".to_string(), + BinOp::Or => "Or".to_string(), + BinOp::NullCoalesce => "NullCoalesce".to_string(), +} } pub fn unary_op_name(value: UnaryOpKind) -> String { match value { - UnaryOpKind::Not => "Not".to_string(), - UnaryOpKind::Neg => "Neg".to_string(), - } + UnaryOpKind::Not => "Not".to_string(), + UnaryOpKind::Neg => "Neg".to_string(), +} } pub fn serialize_span(span: &Rc) -> String { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("{\"start\": ".to_string(), (span.start.clone()).to_string()), - ", \"end\": ".to_string(), - ), - (span.end.clone()).to_string(), - ), - "}".to_string(), - ) -} - -pub fn serialize_import_node( - imp: &Rc, - source_indices: &Rc>>, -) -> String { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"start\": ".to_string(), (span.start.clone()).to_string()), ", \"end\": ".to_string()), (span.end.clone()).to_string()), "}".to_string()) +} + +pub fn serialize_import_node(imp: &Rc, source_indices: &Rc>>) -> String { { let names_json = if import_is_all(imp.clone()) { "{\"kind\": \"ImportAll\"}".to_string() } else { - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ImportSpecific\", \"names\": ".to_string(), - json_list(Rc::new({ - let mut __result = Vec::new(); - for v in import_specific_names_at(imp.clone(), source_indices.clone()) - .iter() - .cloned() - { - __result.push(json_quote(v.clone())); - } - __result - })), - ), - "}".to_string(), - ) + v2_rt::concat(v2_rt::concat("{\"kind\": \"ImportSpecific\", \"names\": ".to_string(), json_list(Rc::new({ let mut __result = Vec::new(); for v in import_specific_names_at(imp.clone(), source_indices.clone()).iter().cloned() { __result.push(json_quote(v.clone())); } __result }))), "}".to_string()) }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"module_path\": ".to_string(), - json_quote(authored_name_at(source_indices.clone(), &imp)), - ), - ", \"names\": ".to_string(), - ), - names_json, - ), - ", \"span\": ".to_string(), - ), - serialize_span(&imp.span.clone()), - ), - "}".to_string(), - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"module_path\": ".to_string(), json_quote(authored_name_at(source_indices.clone(), &imp))), ", \"names\": ".to_string()), names_json), ", \"span\": ".to_string()), serialize_span(&imp.span.clone())), "}".to_string()) +} } pub fn serialize_field_summary(summary: &Rc) -> String { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"access_style\": ".to_string(), - json_quote(field_access_style_name(summary.access_style.clone())), - ), - ", \"value_shape\": ".to_string(), - ), - json_quote(field_value_shape_name(summary.value_shape.clone())), - ), - "}".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"access_style\": ".to_string(), json_quote(field_access_style_name(summary.access_style.clone()))), ", \"value_shape\": ".to_string()), json_quote(field_value_shape_name(summary.value_shape.clone()))), "}".to_string()) } pub fn serialize_literal(value: Rc) -> String { match (*value).clone() { - LiteralValue::LitStr { value: inner, .. } => v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"LitStr\", \"value\": ".to_string(), - json_quote(inner.clone()), - ), - "}".to_string(), - ), - LiteralValue::LitInt { value: inner, .. } => v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"LitInt\", \"value\": ".to_string(), - (inner.clone()).to_string(), - ), - "}".to_string(), - ), - LiteralValue::LitFloat { value: inner, .. } => v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"LitFloat\", \"value\": ".to_string(), - json_quote(inner.clone()), - ), - "}".to_string(), - ), - LiteralValue::LitBool { value: inner, .. } => v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"LitBool\", \"value\": ".to_string(), - json_bool(inner.clone()), - ), - "}".to_string(), - ), - LiteralValue::LitNull => "{\"kind\": \"LitNull\"}".to_string(), - } + LiteralValue::LitStr { value: inner, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"LitStr\", \"value\": ".to_string(), json_quote(inner.clone())), "}".to_string()), + LiteralValue::LitInt { value: inner, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"LitInt\", \"value\": ".to_string(), (inner.clone()).to_string()), "}".to_string()), + LiteralValue::LitFloat { value: inner, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"LitFloat\", \"value\": ".to_string(), json_quote(inner.clone())), "}".to_string()), + LiteralValue::LitBool { value: inner, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"LitBool\", \"value\": ".to_string(), json_bool(inner.clone())), "}".to_string()), + LiteralValue::LitNull => "{\"kind\": \"LitNull\"}".to_string(), +} } -pub fn serialize_field_binding( - binding: &Rc, - source_indices: &Rc>>, -) -> String { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"field_name\": ".to_string(), - json_quote(field_binding_name_at( - binding.clone(), - source_indices.clone(), - )), - ), - ", \"binding\": ".to_string(), - ), - serialize_match_pattern( - field_binding_pattern(binding.clone()), - source_indices.clone(), - ), - ), - "}".to_string(), - ) -} - -pub fn serialize_match_pattern( - pattern: Rc, - source_indices: Rc>>, -) -> String { +pub fn serialize_field_binding(binding: &Rc, source_indices: &Rc>>) -> String { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"field_name\": ".to_string(), json_quote(field_binding_name_at(binding.clone(), source_indices.clone()))), ", \"binding\": ".to_string()), serialize_match_pattern(field_binding_pattern(binding.clone()), source_indices.clone())), "}".to_string()) +} + +pub fn serialize_match_pattern(pattern: Rc, source_indices: Rc>>) -> String { match (*pattern).clone() { - MatchPattern::Bind { name: inner, .. } => v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"Bind\", \"name\": ".to_string(), - json_quote(inner.clone()), - ), - "}".to_string(), - ), - MatchPattern::LitPattern { value: inner, .. } => v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"LitPattern\", \"value\": ".to_string(), - serialize_literal(inner.clone()), - ), - "}".to_string(), - ), - MatchPattern::VariantPattern { - name: inner, - parent_enum, - field_bindings, - .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"VariantPattern\", \"name\": ".to_string(), - json_quote(inner.clone()), - ), - ", \"parent_enum\": ".to_string(), - ), - json_optional_string(parent_enum.clone()), - ), - ", \"field_bindings\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for fb in field_bindings.clone().iter().cloned() { - __result.push(serialize_field_binding(&fb, &source_indices)); - } - __result - })), - ), - "}".to_string(), - ), - MatchPattern::Wildcard => "{\"kind\": \"Wildcard\"}".to_string(), - } + MatchPattern::Bind { name: inner, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"Bind\", \"name\": ".to_string(), json_quote(inner.clone())), "}".to_string()), + MatchPattern::LitPattern { value: inner, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"LitPattern\", \"value\": ".to_string(), serialize_literal(inner.clone())), "}".to_string()), + MatchPattern::VariantPattern { name: inner, parent_enum, field_bindings, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"VariantPattern\", \"name\": ".to_string(), json_quote(inner.clone())), ", \"parent_enum\": ".to_string()), json_optional_string(parent_enum.clone())), ", \"field_bindings\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for fb in field_bindings.clone().iter().cloned() { __result.push(serialize_field_binding(&fb, &source_indices)); } __result }))), "}".to_string()), + MatchPattern::Wildcard => "{\"kind\": \"Wildcard\"}".to_string(), +} } -pub fn serialize_named_arg( - arg: &Rc, - source_indices: &Rc>>, -) -> String { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"name\": ".to_string(), - json_optional_string(arg_name_at(arg.clone(), source_indices.clone())), - ), - ", \"value\": ".to_string(), - ), - serialize_node(&arg_value(&arg), &source_indices), - ), - "}".to_string(), - ) -} - -pub fn serialize_match_arm( - arm: &Rc, - source_indices: &Rc>>, -) -> String { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"pattern\": ".to_string(), - serialize_match_pattern( - arm_pattern(arm.clone()), - source_indices.clone(), - ), - ), - ", \"guard\": ".to_string(), - ), - json_optional_node(arm_guard(&arm), source_indices.clone()), - ), - ", \"body\": ".to_string(), - ), - serialize_node(&arm_body(&arm), &source_indices), - ), - "}".to_string(), - ) -} - -pub fn serialize_field_init( - field_init: &Rc, - source_indices: &Rc>>, -) -> String { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"name\": ".to_string(), - json_quote(field_init_node_name_at( - field_init.clone(), - source_indices.clone(), - )), - ), - ", \"value\": ".to_string(), - ), - serialize_node(&field_init_node_value(&field_init), &source_indices), - ), - "}".to_string(), - ) -} - -pub fn serialize_string_part( - part: Rc, - source_indices: Rc>>, -) -> String { +pub fn serialize_named_arg(arg: &Rc, source_indices: &Rc>>) -> String { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"name\": ".to_string(), json_optional_string(arg_name_at(arg.clone(), source_indices.clone()))), ", \"value\": ".to_string()), serialize_node(&arg_value(&arg), &source_indices)), "}".to_string()) +} + +pub fn serialize_match_arm(arm: &Rc, source_indices: &Rc>>) -> String { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"pattern\": ".to_string(), serialize_match_pattern(arm_pattern(arm.clone()), source_indices.clone())), ", \"guard\": ".to_string()), json_optional_node(arm_guard(&arm), source_indices.clone())), ", \"body\": ".to_string()), serialize_node(&arm_body(&arm), &source_indices)), "}".to_string()) +} + +pub fn serialize_field_init(field_init: &Rc, source_indices: &Rc>>) -> String { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"name\": ".to_string(), json_quote(field_init_node_name_at(field_init.clone(), source_indices.clone()))), ", \"value\": ".to_string()), serialize_node(&field_init_node_value(&field_init), &source_indices)), "}".to_string()) +} + +pub fn serialize_string_part(part: Rc, source_indices: Rc>>) -> String { match (*part).clone() { - StringPart::Text { value: inner, .. } => v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"Text\", \"value\": ".to_string(), - json_quote(inner.clone()), - ), - "}".to_string(), - ), - StringPart::Interpolation { expr: inner, .. } => v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"Interpolation\", \"expr\": ".to_string(), - serialize_node(&inner, &source_indices), - ), - "}".to_string(), - ), - } + StringPart::Text { value: inner, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"Text\", \"value\": ".to_string(), json_quote(inner.clone())), "}".to_string()), + StringPart::Interpolation { expr: inner, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"Interpolation\", \"expr\": ".to_string(), serialize_node(&inner, &source_indices)), "}".to_string()), +} } pub fn serialize_call_semantics(value: Option) -> String { match value { - Some(inner) => v2_rt::concat( - v2_rt::concat( - "{\"kind\": ".to_string(), - json_quote(call_semantics_name(inner.clone())), - ), - "}".to_string(), - ), - None => "null".to_string(), - } + Some(inner) => v2_rt::concat(v2_rt::concat("{\"kind\": ".to_string(), json_quote(call_semantics_name(inner.clone()))), "}".to_string()), + None => "null".to_string(), +} } -pub fn serialize_method_semantics( - value: Option>, - source_indices: &Rc>>, -) -> String { +pub fn serialize_method_semantics(value: Option>, source_indices: &Rc>>) -> String { match value.as_deref().cloned() { - Some(MethodSemantics::PlainMethodSemantics) => { - "{\"kind\": \"PlainMethodSemantics\"}".to_string() - } - Some(MethodSemantics::AlgebraMethodSemantics { - method_def, - fold_accumulator_type, - .. - }) => { - let mn = authored_name_at(source_indices.clone(), &method_def); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"AlgebraMethodSemantics\", \"method_name\": ".to_string(), - json_quote(mn), - ), - ", \"fold_accumulator_type\": ".to_string(), - ), - json_optional_node(fold_accumulator_type.clone(), source_indices.clone()), - ), - "}".to_string(), - ) - } - Some(MethodSemantics::ServiceMethodSemantics { - service_name, - op_params, - .. - }) => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ServiceMethodSemantics\", \"service_name\": ".to_string(), - json_quote(service_name.clone()), - ), - ", \"op_params\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for p in op_params.clone().iter().cloned() { - __result.push(serialize_param(&p, &source_indices)); - } - __result - })), - ), - "}".to_string(), - ), - None => "null".to_string(), - } + Some(MethodSemantics::PlainMethodSemantics) => "{\"kind\": \"PlainMethodSemantics\"}".to_string(), + Some(MethodSemantics::AlgebraMethodSemantics { method_def, fold_accumulator_type, .. }) => { + let mn = authored_name_at(source_indices.clone(), &method_def); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"AlgebraMethodSemantics\", \"method_name\": ".to_string(), json_quote(mn)), ", \"fold_accumulator_type\": ".to_string()), json_optional_node(fold_accumulator_type.clone(), source_indices.clone())), "}".to_string()) +}, + Some(MethodSemantics::ServiceMethodSemantics { service_name, op_params, .. }) => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ServiceMethodSemantics\", \"service_name\": ".to_string(), json_quote(service_name.clone())), ", \"op_params\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for p in op_params.clone().iter().cloned() { __result.push(serialize_param(&p, &source_indices)); } __result }))), "}".to_string()), + None => "null".to_string(), +} } pub fn serialize_recursion_shape(shape: RecursionShape) -> String { match shape { - RecursionShape::DirectRecursion => "{\"_variant\": \"DirectRecursion\"}".to_string(), - RecursionShape::ListRecursion => "{\"_variant\": \"ListRecursion\"}".to_string(), - RecursionShape::OptionalRecursion => "{\"_variant\": \"OptionalRecursion\"}".to_string(), - RecursionShape::SetRecursion => "{\"_variant\": \"SetRecursion\"}".to_string(), - RecursionShape::MapValueRecursion => "{\"_variant\": \"MapValueRecursion\"}".to_string(), - } + RecursionShape::DirectRecursion => "{\"_variant\": \"DirectRecursion\"}".to_string(), + RecursionShape::ListRecursion => "{\"_variant\": \"ListRecursion\"}".to_string(), + RecursionShape::OptionalRecursion => "{\"_variant\": \"OptionalRecursion\"}".to_string(), + RecursionShape::SetRecursion => "{\"_variant\": \"SetRecursion\"}".to_string(), + RecursionShape::MapValueRecursion => "{\"_variant\": \"MapValueRecursion\"}".to_string(), +} } pub fn serialize_inductive_field(field: &Rc) -> String { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"type_name\": ".to_string(), - json_quote(field.type_name.clone()), - ), - ", \"variant_name\": ".to_string(), - ), - json_quote(field.variant_name.clone()), - ), - ", \"field_name\": ".to_string(), - ), - json_quote(field.field_name.clone()), - ), - ", \"shape\": ".to_string(), - ), - serialize_recursion_shape(field.shape.clone()), - ), - "}".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"type_name\": ".to_string(), json_quote(field.type_name.clone())), ", \"variant_name\": ".to_string()), json_quote(field.variant_name.clone())), ", \"field_name\": ".to_string()), json_quote(field.field_name.clone())), ", \"shape\": ".to_string()), serialize_recursion_shape(field.shape.clone())), "}".to_string()) } pub fn serialize_positive_descent_amount(steps: Rc) -> String { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*steps).clone() { - PositiveDescentAmount::OneStep => "{\"_variant\": \"OneStep\"}".to_string(), - PositiveDescentAmount::AdditionalStep { previous: p, .. } => v2_rt::concat( - v2_rt::concat( - "{\"_variant\": \"AdditionalStep\", \"previous\": ".to_string(), - serialize_positive_descent_amount(p.clone()), - ), - "}".to_string(), - ), + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { + match (*steps).clone() { + PositiveDescentAmount::OneStep => "{\"_variant\": \"OneStep\"}".to_string(), + PositiveDescentAmount::AdditionalStep { previous: p, .. } => v2_rt::concat(v2_rt::concat("{\"_variant\": \"AdditionalStep\", \"previous\": ".to_string(), serialize_positive_descent_amount(p.clone())), "}".to_string()), +} }) } pub fn serialize_proportional_divisor(d: Rc) -> String { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*d).clone() { - ProportionalDivisor::DivideByTwo => "{\"_variant\": \"DivideByTwo\"}".to_string(), - ProportionalDivisor::StrictlyLarger { inner: i, .. } => v2_rt::concat( - v2_rt::concat( - "{\"_variant\": \"StrictlyLarger\", \"inner\": ".to_string(), - serialize_proportional_divisor(i.clone()), - ), - "}".to_string(), - ), + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { + match (*d).clone() { + ProportionalDivisor::DivideByTwo => "{\"_variant\": \"DivideByTwo\"}".to_string(), + ProportionalDivisor::StrictlyLarger { inner: i, .. } => v2_rt::concat(v2_rt::concat("{\"_variant\": \"StrictlyLarger\", \"inner\": ".to_string(), serialize_proportional_divisor(i.clone())), "}".to_string()), +} }) } pub fn serialize_shrink_factor(factor: Rc) -> String { match (*factor).clone() { - ShrinkFactor::UnitShrink => "{\"_variant\": \"UnitShrink\"}".to_string(), - ShrinkFactor::ConstantShrink { steps: s, .. } => v2_rt::concat( - v2_rt::concat( - "{\"_variant\": \"ConstantShrink\", \"steps\": ".to_string(), - serialize_positive_descent_amount(s.clone()), - ), - "}".to_string(), - ), - ShrinkFactor::ProportionalShrink { divisor: d, .. } => v2_rt::concat( - v2_rt::concat( - "{\"_variant\": \"ProportionalShrink\", \"divisor\": ".to_string(), - serialize_proportional_divisor(d.clone()), - ), - "}".to_string(), - ), - } + ShrinkFactor::UnitShrink => "{\"_variant\": \"UnitShrink\"}".to_string(), + ShrinkFactor::ConstantShrink { steps: s, .. } => v2_rt::concat(v2_rt::concat("{\"_variant\": \"ConstantShrink\", \"steps\": ".to_string(), serialize_positive_descent_amount(s.clone())), "}".to_string()), + ShrinkFactor::ProportionalShrink { divisor: d, .. } => v2_rt::concat(v2_rt::concat("{\"_variant\": \"ProportionalShrink\", \"divisor\": ".to_string(), serialize_proportional_divisor(d.clone())), "}".to_string()), +} } pub fn serialize_sub_value_relation(rel: Rc) -> String { match (*rel).clone() { - SubValueRelation::StrictSubValue { - field: f, - factor: fac, - .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"_variant\": \"StrictSubValue\", \"field\": ".to_string(), - serialize_inductive_field(&f), - ), - ", \"factor\": ".to_string(), - ), - serialize_shrink_factor(fac.clone()), - ), - "}".to_string(), - ), - SubValueRelation::IteratedSubValue { field: f, .. } => v2_rt::concat( - v2_rt::concat( - "{\"_variant\": \"IteratedSubValue\", \"field\": ".to_string(), - serialize_inductive_field(&f), - ), - "}".to_string(), - ), - SubValueRelation::ArithmeticDescent { - param: p, - factor: fac, - .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"_variant\": \"ArithmeticDescent\", \"param\": ".to_string(), - json_quote(p.clone()), - ), - ", \"factor\": ".to_string(), - ), - serialize_shrink_factor(fac.clone()), - ), - "}".to_string(), - ), - SubValueRelation::PreservedValue => "{\"_variant\": \"PreservedValue\"}".to_string(), - SubValueRelation::SubValueUnknown => "{\"_variant\": \"SubValueUnknown\"}".to_string(), - } + SubValueRelation::StrictSubValue { field: f, factor: fac, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"_variant\": \"StrictSubValue\", \"field\": ".to_string(), serialize_inductive_field(&f)), ", \"factor\": ".to_string()), serialize_shrink_factor(fac.clone())), "}".to_string()), + SubValueRelation::IteratedSubValue { field: f, .. } => v2_rt::concat(v2_rt::concat("{\"_variant\": \"IteratedSubValue\", \"field\": ".to_string(), serialize_inductive_field(&f)), "}".to_string()), + SubValueRelation::ArithmeticDescent { param: p, factor: fac, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"_variant\": \"ArithmeticDescent\", \"param\": ".to_string(), json_quote(p.clone())), ", \"factor\": ".to_string()), serialize_shrink_factor(fac.clone())), "}".to_string()), + SubValueRelation::PreservedValue => "{\"_variant\": \"PreservedValue\"}".to_string(), + SubValueRelation::SubValueUnknown => "{\"_variant\": \"SubValueUnknown\"}".to_string(), +} } pub fn serialize_descent_evidence(de: Option>>>) -> String { match de { - Some(evidence) => json_list(Rc::new({ - let mut __result = Vec::new(); - for rel in evidence.clone().iter().cloned() { - __result.push(serialize_sub_value_relation(rel.clone())); - } - __result - })), - None => "null".to_string(), - } + Some(evidence) => json_list(Rc::new({ let mut __result = Vec::new(); for rel in evidence.clone().iter().cloned() { __result.push(serialize_sub_value_relation(rel.clone())); } __result })), + None => "null".to_string(), +} } -pub fn serialize_expr_data( - expr_node: &Rc, - source_indices: &Rc>>, -) -> String { +pub fn serialize_expr_data(expr_node: &Rc, source_indices: &Rc>>) -> String { { let ch = expr_node.children.clone(); - let name = authored_name_at(source_indices.clone(), &expr_node); - match (*expr_node.expr_data.clone()).clone() { - ExprData::NoExprData => "{\"kind\": \"NoExprData\"}".to_string(), - ExprData::ExprLiteral { value, .. } => v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ExprLiteral\", \"value\": ".to_string(), - serialize_literal(value.clone()), - ), - "}".to_string(), - ), - ExprData::ExprError { kind, message, .. } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ExprError\", \"error_kind\": ".to_string(), - json_quote(expr_error_kind_name(kind.clone())), - ), - ", \"message\": ".to_string(), - ), - json_quote(message.clone()), - ), - "}".to_string(), - ), - ExprData::ExprVar { binding_kind, .. } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ExprVar\", \"name\": ".to_string(), - json_quote(name), - ), - ", \"binding_kind\": ".to_string(), - ), - match binding_kind.clone() { - Some(inner) => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": ".to_string(), - json_quote(var_binding_kind_name(inner.clone())), - ), - match (*inner.clone()).clone() { - VarBindingKind::VariantValueBinding { parent_enum, .. } => { - v2_rt::concat( - ", \"parent_enum\": ".to_string(), - json_quote(parent_enum.clone()), - ) - } - _ => "".to_string(), - }, - ), - "}".to_string(), - ), - None => "null".to_string(), - }, - ), - "}".to_string(), - ), - ExprData::ExprFieldAccess { summary, .. } => { - let field = field_access_field_at(expr_node.clone(), source_indices.clone()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ExprFieldAccess\", \"field\": ".to_string(), - json_quote(field), - ), - ", \"summary\": ".to_string(), - ), - match summary.clone() { - Some(inner) => serialize_field_summary(&inner), - None => "null".to_string(), - }, - ), - ", \"children\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for c in ch.iter().cloned() { - __result.push(serialize_node(&c, &source_indices)); - } - __result - })), - ), - "}".to_string(), - ) - } - ExprData::ExprCall { - call_semantics, - descent_evidence: de, - .. - } => { - let func = expr_call_func_at(expr_node.clone(), source_indices.clone()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ExprCall\", \"func\": ".to_string(), - json_quote(func), - ), - ", \"call_semantics\": ".to_string(), - ), - serialize_call_semantics(call_semantics.clone()), - ), - ", \"descent_evidence\": ".to_string(), - ), - serialize_descent_evidence(de.clone()), - ), - ", \"children\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for c in ch.iter().cloned() { - __result.push(serialize_node(&c, &source_indices)); - } - __result - })), - ), - "}".to_string(), - ) - } - ExprData::ExprMethodCall { - method_semantics, .. - } => { - let method = expr_method_name_at(expr_node.clone(), source_indices.clone()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ExprMethodCall\", \"method\": ".to_string(), - json_quote(method), - ), - ", \"method_semantics\": ".to_string(), - ), - serialize_method_semantics( - method_semantics.clone(), - &source_indices, - ), - ), - ", \"children\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for c in ch.iter().cloned() { - __result.push(serialize_node(&c, &source_indices)); - } - __result - })), - ), - "}".to_string(), - ) - } - ExprData::ExprBinOp { - op, - algebra_field: af, - .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ExprBinOp\", \"op\": ".to_string(), - json_quote(bin_op_name(op.clone())), - ), - ", \"algebra_field\": ".to_string(), - ), - match af.clone() { - Some(f) => json_quote(algebra_field_kind_name(f.clone())), - None => "null".to_string(), - }, - ), - ", \"children\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for c in ch.iter().cloned() { - __result.push(serialize_node(&c, &source_indices)); - } - __result - })), - ), - "}".to_string(), - ), - ExprData::ExprUnaryOp { op, .. } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ExprUnaryOp\", \"op\": ".to_string(), - json_quote(unary_op_name(op.clone())), - ), - ", \"children\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for c in ch.iter().cloned() { - __result.push(serialize_node(&c, &source_indices)); - } - __result - })), - ), - "}".to_string(), - ), - ExprData::ExprLambda => { - let params = lambda_param_names_at(expr_node.clone(), source_indices.clone()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ExprLambda\", \"params\": ".to_string(), - json_list(Rc::new({ - let mut __result = Vec::new(); - for p in params.iter().cloned() { - __result.push(json_quote(p.clone())); - } - __result - })), - ), - ", \"children\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for c in ch.iter().cloned() { - __result.push(serialize_node(&c, &source_indices)); - } - __result - })), - ), - "}".to_string(), - ) - } - ExprData::ExprLet => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ExprLet\", \"name\": ".to_string(), - json_quote(name), - ), - ", \"children\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for c in ch.iter().cloned() { - __result.push(serialize_node(&c, &source_indices)); - } - __result - })), - ), - "}".to_string(), - ), - ExprData::ExprRecordLit { parent_enum, .. } => { - let type_name = record_lit_type_name_at(expr_node.clone(), source_indices.clone()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ExprRecordLit\", \"type_name\": ".to_string(), - json_optional_string(type_name), - ), - ", \"parent_enum\": ".to_string(), - ), - json_optional_string(parent_enum.clone()), - ), - ", \"children\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for c in ch.iter().cloned() { - __result.push(serialize_node(&c, &source_indices)); - } - __result - })), - ), - "}".to_string(), - ) - } - ExprData::ExprForEach => { - let variable = foreach_variable_at(expr_node.clone(), source_indices.clone()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ExprForEach\", \"variable\": ".to_string(), - json_quote(variable), - ), - ", \"children\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for c in ch.iter().cloned() { - __result.push(serialize_node(&c, &source_indices)); - } - __result - })), - ), - "}".to_string(), - ) - } - ExprData::ExprMatch => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ExprMatch\"".to_string(), - ", \"children\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for c in ch.iter().cloned() { - __result.push(serialize_node(&c, &source_indices)); - } - __result - })), - ), - "}".to_string(), - ), - ExprData::ExprIf => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ExprIf\"".to_string(), - ", \"children\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for c in ch.iter().cloned() { - __result.push(serialize_node(&c, &source_indices)); - } - __result - })), - ), - "}".to_string(), - ), - ExprData::ExprListLit => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ExprListLit\"".to_string(), - ", \"children\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for c in ch.iter().cloned() { - __result.push(serialize_node(&c, &source_indices)); - } - __result - })), - ), - "}".to_string(), - ), - ExprData::ExprStringInterp => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ExprStringInterp\"".to_string(), - ", \"children\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for c in ch.iter().cloned() { - __result.push(serialize_node(&c, &source_indices)); - } - __result - })), - ), - "}".to_string(), - ), - ExprData::ExprBlock => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ExprBlock\"".to_string(), - ", \"children\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for c in ch.iter().cloned() { - __result.push(serialize_node(&c, &source_indices)); - } - __result - })), - ), - "}".to_string(), - ), - ExprData::ExprCast => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ExprCast\"".to_string(), - ", \"children\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for c in ch.iter().cloned() { - __result.push(serialize_node(&c, &source_indices)); - } - __result - })), - ), - "}".to_string(), - ), - ExprData::ExprIndex => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ExprIndex\"".to_string(), - ", \"children\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for c in ch.iter().cloned() { - __result.push(serialize_node(&c, &source_indices)); - } - __result - })), - ), - "}".to_string(), - ), - ExprData::ExprSlice => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ExprSlice\"".to_string(), - ", \"children\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for c in ch.iter().cloned() { - __result.push(serialize_node(&c, &source_indices)); - } - __result - })), - ), - "}".to_string(), - ), - ExprData::ExprReturn => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"ExprReturn\"".to_string(), - ", \"children\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for c in ch.iter().cloned() { - __result.push(serialize_node(&c, &source_indices)); - } - __result - })), - ), - "}".to_string(), - ), - } - } +let name = authored_name_at(source_indices.clone(), &expr_node); +match (*expr_node.expr_data.clone()).clone() { + ExprData::NoExprData => "{\"kind\": \"NoExprData\"}".to_string(), + ExprData::ExprLiteral { value, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprLiteral\", \"value\": ".to_string(), serialize_literal(value.clone())), "}".to_string()), + ExprData::ExprError { kind, message, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprError\", \"error_kind\": ".to_string(), json_quote(expr_error_kind_name(kind.clone()))), ", \"message\": ".to_string()), json_quote(message.clone())), "}".to_string()), + ExprData::ExprVar { binding_kind, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprVar\", \"name\": ".to_string(), json_quote(name)), ", \"binding_kind\": ".to_string()), match binding_kind.clone() { + Some(inner) => v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": ".to_string(), json_quote(var_binding_kind_name(inner.clone()))), match (*inner.clone()).clone() { + VarBindingKind::VariantValueBinding { parent_enum, .. } => v2_rt::concat(", \"parent_enum\": ".to_string(), json_quote(parent_enum.clone())), + _ => "".to_string(), +}), "}".to_string()), + None => "null".to_string(), +}), "}".to_string()), + ExprData::ExprFieldAccess { summary, .. } => { + let field = field_access_field_at(expr_node.clone(), source_indices.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprFieldAccess\", \"field\": ".to_string(), json_quote(field)), ", \"summary\": ".to_string()), match summary.clone() { + Some(inner) => serialize_field_summary(&inner), + None => "null".to_string(), +}), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()) +}, + ExprData::ExprCall { call_semantics, descent_evidence: de, .. } => { + let func = expr_call_func_at(expr_node.clone(), source_indices.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprCall\", \"func\": ".to_string(), json_quote(func)), ", \"call_semantics\": ".to_string()), serialize_call_semantics(call_semantics.clone())), ", \"descent_evidence\": ".to_string()), serialize_descent_evidence(de.clone())), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()) +}, + ExprData::ExprMethodCall { method_semantics, .. } => { + let method = expr_method_name_at(expr_node.clone(), source_indices.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprMethodCall\", \"method\": ".to_string(), json_quote(method)), ", \"method_semantics\": ".to_string()), serialize_method_semantics(method_semantics.clone(), &source_indices)), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()) +}, + ExprData::ExprBinOp { op, algebra_field: af, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprBinOp\", \"op\": ".to_string(), json_quote(bin_op_name(op.clone()))), ", \"algebra_field\": ".to_string()), match af.clone() { + Some(f) => json_quote(algebra_field_kind_name(f.clone())), + None => "null".to_string(), +}), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), + ExprData::ExprUnaryOp { op, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprUnaryOp\", \"op\": ".to_string(), json_quote(unary_op_name(op.clone()))), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), + ExprData::ExprLambda => { + let params = lambda_param_names_at(expr_node.clone(), source_indices.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprLambda\", \"params\": ".to_string(), json_list(Rc::new({ let mut __result = Vec::new(); for p in params.iter().cloned() { __result.push(json_quote(p.clone())); } __result }))), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()) +}, + ExprData::ExprLet => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprLet\", \"name\": ".to_string(), json_quote(name)), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), + ExprData::ExprRecordLit { parent_enum, .. } => { + let type_name = record_lit_type_name_at(expr_node.clone(), source_indices.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprRecordLit\", \"type_name\": ".to_string(), json_optional_string(type_name)), ", \"parent_enum\": ".to_string()), json_optional_string(parent_enum.clone())), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()) +}, + ExprData::ExprForEach => { + let variable = foreach_variable_at(expr_node.clone(), source_indices.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprForEach\", \"variable\": ".to_string(), json_quote(variable)), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()) +}, + ExprData::ExprMatch => v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprMatch\"".to_string(), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), + ExprData::ExprIf => v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprIf\"".to_string(), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), + ExprData::ExprListLit => v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprListLit\"".to_string(), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), + ExprData::ExprStringInterp => v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprStringInterp\"".to_string(), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), + ExprData::ExprBlock => v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprBlock\"".to_string(), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), + ExprData::ExprCast => v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprCast\"".to_string(), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), + ExprData::ExprIndex => v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprIndex\"".to_string(), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), + ExprData::ExprSlice => v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprSlice\"".to_string(), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), + ExprData::ExprReturn => v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprReturn\"".to_string(), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), +} +} +} + +pub fn serialize_inferred_node(inferred: Rc, source_indices: Rc>>) -> String { + match (*inferred).clone() { + InferredNode::Resolved { node, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"Resolved\", \"node\": ".to_string(), serialize_node(&node, &source_indices)), "}".to_string()), + InferredNode::CompilerError { message, span, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"CompilerError\", \"message\": ".to_string(), json_quote(message.clone())), ", \"span\": ".to_string()), serialize_span(&span)), "}".to_string()), + InferredNode::TypeVariable { id, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"TypeVariable\", \"id\": ".to_string(), json_quote(id.clone())), "}".to_string()), +} } -pub fn serialize_inferred_node( - inferred: Rc, - source_indices: Rc>>, -) -> String { - match (*inferred).clone() { - InferredNode::Resolved { node, .. } => v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"Resolved\", \"node\": ".to_string(), - serialize_node(&node, &source_indices), - ), - "}".to_string(), - ), - InferredNode::CompilerError { message, span, .. } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"CompilerError\", \"message\": ".to_string(), - json_quote(message.clone()), - ), - ", \"span\": ".to_string(), - ), - serialize_span(&span), - ), - "}".to_string(), - ), - InferredNode::TypeVariable { id, .. } => v2_rt::concat( - v2_rt::concat( - "{\"kind\": \"TypeVariable\", \"id\": ".to_string(), - json_quote(id.clone()), - ), - "}".to_string(), - ), - } +pub fn serialize_resource_use(resource_use: &Rc, source_indices: &Rc>>) -> String { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"name\": ".to_string(), json_quote(resource_use_name_at(resource_use.clone(), source_indices.clone()))), ", \"resource\": ".to_string()), serialize_node(&resource_use_resource(&resource_use), &source_indices)), ", \"span\": ".to_string()), serialize_span(&resource_use.span.clone())), "}".to_string()) } -pub fn serialize_resource_use( - resource_use: &Rc, - source_indices: &Rc>>, -) -> String { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"name\": ".to_string(), - json_quote(resource_use_name_at( - resource_use.clone(), - source_indices.clone(), - )), - ), - ", \"resource\": ".to_string(), - ), - serialize_node(&resource_use_resource(&resource_use), &source_indices), - ), - ", \"span\": ".to_string(), - ), - serialize_span(&resource_use.span.clone()), - ), - "}".to_string(), - ) -} - -pub fn serialize_field( - field: &Rc, - source_indices: &Rc>>, -) -> String { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"name\": ".to_string(), - json_quote(field_node_name_at( - field.clone(), - source_indices.clone(), - )), - ), - ", \"type_expr\": ".to_string(), - ), - serialize_node( - &field_node_type_expr(&field), - &source_indices, - ), - ), - ", \"cardinality\": ".to_string(), - ), - json_quote(cardinality_name(field_node_cardinality( - field.clone(), - ))), - ), - ", \"default_value\": ".to_string(), - ), - json_optional_node( - field_node_default_value(&field), - source_indices.clone(), - ), - ), - ", \"from_key\": ".to_string(), - ), - json_optional_string(field_node_from_key( - field.clone(), - source_indices.clone(), - )), - ), - ", \"span\": ".to_string(), - ), - serialize_span(&field_node_span(field.clone())), - ), - "}".to_string(), - ) -} - -pub fn serialize_param( - param: &Rc, - source_indices: &Rc>>, -) -> String { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"name\": ".to_string(), - json_quote(param_node_name_at( - param.clone(), - source_indices.clone(), - )), - ), - ", \"type_expr\": ".to_string(), - ), - serialize_node(¶m_node_type_expr(¶m), &source_indices), - ), - ", \"default_value\": ".to_string(), - ), - json_optional_node(param_node_default_value(¶m), source_indices.clone()), - ), - ", \"span\": ".to_string(), - ), - serialize_span(¶m_node_span(param.clone())), - ), - "}".to_string(), - ) -} - -pub fn serialize_node( - node: &Rc, - source_indices: &Rc>>, -) -> String { +pub fn serialize_field(field: &Rc, source_indices: &Rc>>) -> String { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"name\": ".to_string(), json_quote(field_node_name_at(field.clone(), source_indices.clone()))), ", \"type_expr\": ".to_string()), serialize_node(&field_node_type_expr(&field), &source_indices)), ", \"cardinality\": ".to_string()), json_quote(cardinality_name(field_node_cardinality(field.clone())))), ", \"default_value\": ".to_string()), json_optional_node(field_node_default_value(&field), source_indices.clone())), ", \"from_key\": ".to_string()), json_optional_string(field_node_from_key(field.clone(), source_indices.clone()))), ", \"span\": ".to_string()), serialize_span(&field_node_span(field.clone()))), "}".to_string()) +} + +pub fn serialize_param(param: &Rc, source_indices: &Rc>>) -> String { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"name\": ".to_string(), json_quote(param_node_name_at(param.clone(), source_indices.clone()))), ", \"type_expr\": ".to_string()), serialize_node(¶m_node_type_expr(¶m), &source_indices)), ", \"default_value\": ".to_string()), json_optional_node(param_node_default_value(¶m), source_indices.clone())), ", \"span\": ".to_string()), serialize_span(¶m_node_span(param.clone()))), "}".to_string()) +} + +pub fn serialize_node(node: &Rc, source_indices: &Rc>>) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"name\": ".to_string(), json_quote(authored_name_at(source_indices.clone(), &node))), ", \"span\": ".to_string()), serialize_span(&node.span.clone())), ", \"ident_span\": ".to_string()), json_optional_span(node.ident_span.clone())), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for child in node.children.clone().iter().cloned() { __result.push(serialize_node(&child, &source_indices)); } __result }))), ", \"connective\": ".to_string()), match node.connective.clone() { Connective::Conj => json_quote(connective_name(Connective::Conj)), @@ -1566,546 +495,234 @@ pub fn serialize_node( }) } -pub fn serialize_module( - module: &Rc, - source_indices: &Rc>>, -) -> String { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"name\": ".to_string(), - json_quote(authored_name_at(source_indices.clone(), &module)), - ), - ", \"imports\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for imp in module_imports(module.clone()).iter().cloned() { - __result.push(serialize_import_node(&imp, &source_indices)); - } - __result - })), - ), - ", \"span\": ".to_string(), - ), - serialize_span(&module.span.clone()), - ), - "}".to_string(), - ) +pub fn serialize_module(module: &Rc, source_indices: &Rc>>) -> String { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"name\": ".to_string(), json_quote(authored_name_at(source_indices.clone(), &module))), ", \"imports\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for imp in module_imports(module.clone()).iter().cloned() { __result.push(serialize_import_node(&imp, &source_indices)); } __result }))), ", \"span\": ".to_string()), serialize_span(&module.span.clone())), "}".to_string()) } pub fn serialize_typed_module(module: &Rc) -> String { { let si = module.type_env.clone().source_indices.clone(); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"module\": ".to_string(), - serialize_module(&module.module.clone(), &si), - ), - ", \"items\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for item in module.items.clone().iter().cloned() { - __result.push(serialize_node(&item, &si)); - } - __result - })), - ), - ", \"item_registry_keys\": ".to_string(), - ), - json_list(Rc::new({ - let mut __result = Vec::new(); - for k in Rc::new(v2_rt::map_keys(&module.item_registry.clone())) - .iter() - .cloned() - { - __result.push(json_quote(k.clone())); - } - __result - })), - ), - "}".to_string(), - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"module\": ".to_string(), serialize_module(&module.module.clone(), &si)), ", \"items\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for item in module.items.clone().iter().cloned() { __result.push(serialize_node(&item, &si)); } __result }))), ", \"item_registry_keys\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for k in Rc::new(v2_rt::map_keys(&module.item_registry.clone())).iter().cloned() { __result.push(json_quote(k.clone())); } __result }))), "}".to_string()) +} } pub fn serialize_diagnostic(diagnostic: &Rc) -> String { { let severity = "error".to_string(); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\"severity\": ".to_string(), - json_quote(severity), - ), - ", \"message\": ".to_string(), - ), - json_quote(diagnostic_to_message( - diagnostic.diagnostic.clone(), - )), - ), - ", \"span\": ".to_string(), - ), - serialize_span(&diagnostic_to_span(diagnostic.diagnostic.clone())), - ), - ", \"module_name\": ".to_string(), - ), - json_optional_string(Some(diagnostic.module_name.clone())), - ), - ", \"category\": ".to_string(), - ), - "null".to_string(), - ), - "}".to_string(), - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"severity\": ".to_string(), json_quote(severity)), ", \"message\": ".to_string()), json_quote(diagnostic_to_message(diagnostic.diagnostic.clone()))), ", \"span\": ".to_string()), serialize_span(&diagnostic_to_span(diagnostic.diagnostic.clone()))), ", \"module_name\": ".to_string()), json_optional_string(Some(diagnostic.module_name.clone()))), ", \"category\": ".to_string()), "null".to_string()), "}".to_string()) +} } pub fn emit_dag_artifact(typed: &Rc) -> Rc { { - let modules_json = Rc::new({ - let mut __result = Vec::new(); - for m in typed.modules.clone().iter().cloned() { - __result.push(serialize_typed_module(&m)); - } - __result - }) - .join(&", ".to_string()); - let diagnostics_json = Rc::new({ - let mut __result = Vec::new(); - for d in typed.diagnostics.clone().iter().cloned() { - __result.push(serialize_diagnostic(&d)); - } - __result - }) - .join(&", ".to_string()); - let item_registry_json = Rc::new({ - let mut __result = Vec::new(); - for k in Rc::new(v2_rt::map_keys(&typed.item_registry.clone())) - .iter() - .cloned() - { - __result.push(json_quote(k.clone())); - } - __result - }) - .join(&", ".to_string()); - let json = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "{\n \"version\": \"0.1.0\",\n \"modules\": [".to_string(), - modules_json, - ), - "],\n \"item_registry_keys\": [".to_string(), - ), - item_registry_json, - ), - "],\n \"diagnostics\": [".to_string(), - ), - diagnostics_json, - ), - "],\n \"files\": []\n}".to_string(), - ); - Rc::new(EmitResult { - files: Rc::new(vec![Rc::new(TextFile { - path: "dag-artifact.json".to_string(), - content: json, - })]), - diagnostics: Rc::new(vec![]), - }) - } + let modules_json = Rc::new({ let mut __result = Vec::new(); for m in typed.modules.clone().iter().cloned() { __result.push(serialize_typed_module(&m)); } __result }).join(&", ".to_string()); +let diagnostics_json = Rc::new({ let mut __result = Vec::new(); for d in typed.diagnostics.clone().iter().cloned() { __result.push(serialize_diagnostic(&d)); } __result }).join(&", ".to_string()); +let item_registry_json = Rc::new({ let mut __result = Vec::new(); for k in Rc::new(v2_rt::map_keys(&typed.item_registry.clone())).iter().cloned() { __result.push(json_quote(k.clone())); } __result }).join(&", ".to_string()); +let json = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\n \"version\": \"0.1.0\",\n \"modules\": [".to_string(), modules_json), "],\n \"item_registry_keys\": [".to_string()), item_registry_json), "],\n \"diagnostics\": [".to_string()), diagnostics_json), "],\n \"files\": []\n}".to_string()); +Rc::new(EmitResult { + files: Rc::new(vec![Rc::new(TextFile { + path: "dag-artifact.json".to_string(), + content: json, +})]), + diagnostics: Rc::new(vec![]), +}) +} } pub fn boundary_ref_error(names: Rc>, ref_name: &String) -> Rc>> { - if { - let mut __found = false; - for n in names.iter().cloned() { - if (n.clone().as_str() == ref_name.clone().as_str()) { - __found = true; - break; - } - } - __found - } { + if { let mut __found = false; for n in names.iter().cloned() { if (n.clone().as_str() == ref_name.clone().as_str()) { __found = true; break; } } __found } { Rc::new(vec![]) } else { - Rc::new(vec![compile_bundle_error(v2_rt::concat( - v2_rt::concat( - "boundary references unknown artifact '".to_string(), - ref_name.clone(), - ), - "'".to_string(), - ))]) + Rc::new(vec![compile_bundle_error(v2_rt::concat(v2_rt::concat("boundary references unknown artifact '".to_string(), ref_name.clone()), "'".to_string()))]) } } pub fn validate_boundaries(plan: &Rc) -> Rc>> { { - let names = Rc::new({ - let mut __result = Vec::new(); - for a in plan.artifacts.clone().iter().cloned() { - __result.push(a.name.clone()); - } - __result - }); - Rc::new({ - let mut __result = Vec::new(); - for b in plan.boundaries.clone().iter().cloned() { - __result.extend( - (*v2_rt::concat( - boundary_ref_error(names.clone(), &b.from_artifact.clone()), - boundary_ref_error(names.clone(), &b.to_artifact.clone()), - )) - .iter() - .cloned(), - ); - } - __result - }) - } + let names = Rc::new({ let mut __result = Vec::new(); for a in plan.artifacts.clone().iter().cloned() { __result.push(a.name.clone()); } __result }); +Rc::new({ let mut __result = Vec::new(); for b in plan.boundaries.clone().iter().cloned() { __result.extend((*v2_rt::concat(boundary_ref_error(names.clone(), &b.from_artifact.clone()), boundary_ref_error(names.clone(), &b.to_artifact.clone()))).iter().cloned()); } __result }) +} } -pub fn emit_from_artifact_plan( - typed: Rc, - artifact_plan: &Rc, -) -> Rc { +pub fn emit_from_artifact_plan(typed: Rc, artifact_plan: &Rc) -> Rc { { if ((artifact_plan.artifacts.clone().len() as i64) == 0) { return Rc::new(EmitResult { - files: Rc::new(vec![]), - diagnostics: Rc::new(vec![compile_bundle_error( - "compile_sources planned no artifacts".to_string(), - )]), - }); + files: Rc::new(vec![]), + diagnostics: Rc::new(vec![compile_bundle_error("compile_sources planned no artifacts".to_string())]), +}) } - let boundary_diags = validate_boundaries(&artifact_plan); - if ((boundary_diags.clone().len() as i64) > 0) { +let boundary_diags = validate_boundaries(&artifact_plan); +if ((boundary_diags.clone().len() as i64) > 0) { return Rc::new(EmitResult { - files: Rc::new(vec![]), - diagnostics: boundary_diags.clone(), - }); + files: Rc::new(vec![]), + diagnostics: boundary_diags.clone(), +}) } - let results = Rc::new({ - let mut __result = Vec::new(); - for artifact in artifact_plan.artifacts.clone().iter().cloned() { - __result.push(emit_artifact(typed.clone(), artifact.clone())); - } - __result - }); - let all_files = Rc::new({ - let mut __result = Vec::new(); - for r in results.clone().iter().cloned() { - __result.extend((*r.files.clone()).iter().cloned()); - } - __result - }); - let all_diags = Rc::new({ - let mut __result = Vec::new(); - for r in results.clone().iter().cloned() { - __result.extend((*r.diagnostics.clone()).iter().cloned()); - } - __result - }); - Rc::new(EmitResult { - files: all_files, - diagnostics: all_diags, - }) - } +let results = Rc::new({ let mut __result = Vec::new(); for artifact in artifact_plan.artifacts.clone().iter().cloned() { __result.push(emit_artifact(typed.clone(), artifact.clone())); } __result }); +let all_files = Rc::new({ let mut __result = Vec::new(); for r in results.clone().iter().cloned() { __result.extend((*r.files.clone()).iter().cloned()); } __result }); +let all_diags = Rc::new({ let mut __result = Vec::new(); for r in results.clone().iter().cloned() { __result.extend((*r.diagnostics.clone()).iter().cloned()); } __result }); +Rc::new(EmitResult { + files: all_files, + diagnostics: all_diags, +}) +} } pub fn collect_diagnostics(parse_results: Rc>>) -> Rc>> { - parse_results.iter().cloned().fold( - Rc::new(vec![]), - |acc: Rc>>, pr: Rc| match pr.error.clone() { - Some(diag) => v2_rt::rc_list_push(acc.clone(), diag.clone()), - None => acc.clone(), - }, - ) + parse_results.iter().cloned().fold(Rc::new(vec![]), |acc: Rc>>, pr: Rc| match pr.error.clone() { + Some(diag) => v2_rt::rc_list_push(acc.clone(), diag.clone()), + None => acc.clone(), +}) } pub fn front_end_sources(sources: Rc>>) -> Rc { { - let acc = sources.iter().cloned().fold( - Rc::new(FrontendAccum { - parse_results: Rc::new(vec![]), - newline_indices: Rc::new(vec![]), - intern_table: empty_intern_table(), - }), - |acc: Rc, s: Rc| { - let acc = Rc::try_unwrap(acc).unwrap_or_else(|rc| (*rc).clone()); - { - let tokens = tokenize(&s.content.clone(), s.path.clone()); - let si = build_newline_index(s.path.clone(), &s.content.clone()); - let parsed = parse_with_table( - &tokens, - v2_rt::rc_map_insert( - v2_rt::rc_empty_map::>(), - si.file.clone(), - si.clone(), - ), - acc.intern_table, - ); - let pr = parsed.result.clone(); - Rc::new(FrontendAccum { - parse_results: v2_rt::rc_list_push(acc.parse_results, pr.clone()), - newline_indices: v2_rt::rc_list_push(acc.newline_indices, si.clone()), - intern_table: parsed.intern_table.clone(), - }) - } - }, - ); - let parse_results = acc.parse_results.clone(); - let newline_indices = acc.newline_indices.clone(); - let intern_table = acc.intern_table.clone(); - let parse_diagnostics = collect_diagnostics(parse_results.clone()); - let has_parse_errors = { - let mut __found = false; - for p in parse_results.clone().iter().cloned() { - if (p.error.clone() != None) { - __found = true; - break; - } - } - __found - }; - if has_parse_errors { + let acc = sources.iter().cloned().fold(Rc::new(FrontendAccum { + parse_results: Rc::new(vec![]), + newline_indices: Rc::new(vec![]), + intern_table: empty_intern_table(), +}), |acc: Rc, s: Rc| { let acc = Rc::try_unwrap(acc).unwrap_or_else(|rc| (*rc).clone()); { + let tokens = tokenize(&s.content.clone(), s.path.clone()); +let si = build_newline_index(s.path.clone(), &s.content.clone()); +let parsed = parse_with_table(&tokens, v2_rt::rc_map_insert(v2_rt::rc_empty_map::>(), si.file.clone(), si.clone()), acc.intern_table); +let pr = parsed.result.clone(); +Rc::new(FrontendAccum { + parse_results: v2_rt::rc_list_push(acc.parse_results, pr.clone()), + newline_indices: v2_rt::rc_list_push(acc.newline_indices, si.clone()), + intern_table: parsed.intern_table.clone(), +}) +} }); +let parse_results = acc.parse_results.clone(); +let newline_indices = acc.newline_indices.clone(); +let intern_table = acc.intern_table.clone(); +let parse_diagnostics = collect_diagnostics(parse_results.clone()); +let has_parse_errors = { let mut __found = false; for p in parse_results.clone().iter().cloned() { if (p.error.clone() != None) { __found = true; break; } } __found }; +if has_parse_errors { Rc::new(FrontendResult { - graph: None, - diagnostics: parse_diagnostics, - newline_indices: newline_indices.clone(), - intern_table: intern_table, - }) + graph: None, + diagnostics: parse_diagnostics, + newline_indices: newline_indices.clone(), + intern_table: intern_table, +}) } else { { - let modules = Rc::new({ - let mut __result = Vec::new(); - for p in parse_results.clone().iter().cloned() { - __result.push(p.module.clone().clone().unwrap()); - } - __result - }); - let source_indices = newline_indices.clone().iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, si: Rc| { - v2_rt::rc_map_insert(acc, si.file.clone(), si.clone()) - }, - ); - let graph = resolve_modules(&modules, &source_indices); - Rc::new(FrontendResult { - graph: Some(graph.clone()), - diagnostics: v2_rt::concat(parse_diagnostics, graph.diagnostics.clone()), - newline_indices: newline_indices.clone(), - intern_table: intern_table, - }) - } + let modules = Rc::new({ let mut __result = Vec::new(); for p in parse_results.clone().iter().cloned() { __result.push(p.module.clone().clone().unwrap()); } __result }); +let source_indices = newline_indices.clone().iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, si: Rc| v2_rt::rc_map_insert(acc, si.file.clone(), si.clone())); +let graph = resolve_modules(&modules, &source_indices); +Rc::new(FrontendResult { + graph: Some(graph.clone()), + diagnostics: v2_rt::concat(parse_diagnostics, graph.diagnostics.clone()), + newline_indices: newline_indices.clone(), + intern_table: intern_table, +}) +} } - } +} } pub fn resolve_sources(sources: Rc>>) -> Rc { { let frontend = front_end_sources(sources); - Rc::new(CompileResult { - files: Rc::new(vec![]), - diagnostics: frontend.diagnostics.clone(), - }) - } +Rc::new(CompileResult { + files: Rc::new(vec![]), + diagnostics: frontend.diagnostics.clone(), +}) +} } -pub fn compile_sources( - sources: Rc>>, - target: RenderTarget, -) -> Rc { +pub fn compile_sources(sources: Rc>>, target: RenderTarget) -> Rc { { let frontend = front_end_sources(sources); - let newline_indices = frontend.newline_indices.clone(); - match frontend.graph.clone() { - None => Rc::new(PipelineResult { - files: Rc::new(vec![]), - diagnostics: frontend.diagnostics.clone(), - complexity: empty_complexity_report(), - ownership: Rc::new(vec![]), - artifact_plan: empty_artifact_plan(), - newline_indices: newline_indices.clone(), - }), - Some(graph) => { - let graph_diags = graph.diagnostics.clone(); - let resolve_errors = Rc::new({ - let mut __result = Vec::new(); - for d in graph_diags.iter().cloned() { - if is_error_diagnostic(d.diagnostic.clone()) { - __result.push(d); - } - } - __result - }); - if ((resolve_errors.len() as i64) > 0) { - return Rc::new(PipelineResult { - files: Rc::new(vec![]), - diagnostics: frontend.diagnostics.clone(), - complexity: empty_complexity_report(), - ownership: Rc::new(vec![]), - artifact_plan: empty_artifact_plan(), - newline_indices: newline_indices.clone(), - }); - } - let source_indices = newline_indices.clone().iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, index: Rc| { - v2_rt::rc_map_insert(acc, index.file.clone(), index.clone()) - }, - ); - let norm = normalize_graph(&graph, source_indices.clone()); - let norm_diags = norm.diagnostics.clone(); - let norm_errors = Rc::new({ - let mut __result = Vec::new(); - for d in norm_diags.clone().iter().cloned() { - if is_error_diagnostic(d.diagnostic.clone()) { - __result.push(d); - } - } - __result - }); - if ((norm_errors.len() as i64) > 0) { - return Rc::new(PipelineResult { - files: Rc::new(vec![]), - diagnostics: v2_rt::concat( - frontend.diagnostics.clone(), - norm_diags.clone(), - ), - complexity: empty_complexity_report(), - ownership: Rc::new(vec![]), - artifact_plan: empty_artifact_plan(), - newline_indices: newline_indices.clone(), - }); - } - let typed = reconcile( - norm.graph.clone(), - source_indices.clone(), - frontend.intern_table.clone(), - ); - let typed_diags = typed.diagnostics.clone(); - let func_entries = extract_func_entries(typed.clone()); - let recursion_ctx = build_recursion_context(typed.clone()); - let complexity = - build_complexity_report(&func_entries, recursion_ctx, source_indices.clone()); - let complexity_diags = complexity_diagnostics(complexity.clone()); - let all_diags = v2_rt::concat(typed_diags.clone(), complexity_diags); - let type_errors = Rc::new({ - let mut __result = Vec::new(); - for d in typed_diags.clone().iter().cloned() { - if is_error_diagnostic(d.diagnostic.clone()) { - __result.push(d); - } - } - __result - }); - if ((type_errors.len() as i64) > 0) { - return Rc::new(PipelineResult { - files: Rc::new(vec![]), - diagnostics: v2_rt::concat( - v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), - all_diags.clone(), - ), - complexity: complexity.clone(), - ownership: Rc::new(vec![]), - artifact_plan: empty_artifact_plan(), - newline_indices: newline_indices.clone(), - }); - } - let ownership = extract_ownership_proofs(typed.clone()); - let ownership_diags = ownership_diagnostics(ownership.clone()); - let ownership_errors = Rc::new({ - let mut __result = Vec::new(); - for d in ownership_diags.clone().iter().cloned() { - if is_error_diagnostic(d.diagnostic.clone()) { - __result.push(d); - } - } - __result - }); - if ((ownership_errors.len() as i64) > 0) { - return Rc::new(PipelineResult { - files: Rc::new(vec![]), - diagnostics: v2_rt::concat( - v2_rt::concat( - v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), - all_diags.clone(), - ), - ownership_diags.clone(), - ), - complexity: complexity.clone(), - ownership: ownership.clone(), - artifact_plan: empty_artifact_plan(), - newline_indices: newline_indices.clone(), - }); - } - let artifact_plan = default_artifact_plan( - Rc::new({ - let mut __result = Vec::new(); - for m in typed.modules.clone().iter().cloned() { - __result - .push(authored_name_at(source_indices.clone(), &m.module.clone())); - } - __result - }), - target, - ); - let emit_result = emit_from_artifact_plan(typed.clone(), &artifact_plan); - let emit_files = emit_result.files.clone(); - let emit_diags = emit_result.diagnostics.clone(); - let emit_errors = Rc::new({ - let mut __result = Vec::new(); - for d in emit_diags.clone().iter().cloned() { - if is_error_diagnostic(d.diagnostic.clone()) { - __result.push(d); - } - } - __result - }); - let final_files = if ((emit_errors.len() as i64) > 0) { - Rc::new(vec![]) - } else { - emit_files - }; - Rc::new(PipelineResult { - files: final_files, - diagnostics: v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), - all_diags.clone(), - ), - ownership_diags.clone(), - ), - emit_diags.clone(), - ), - complexity: complexity.clone(), - ownership: ownership.clone(), - artifact_plan: artifact_plan.clone(), - newline_indices: newline_indices.clone(), - }) +let newline_indices = frontend.newline_indices.clone(); +match frontend.graph.clone() { + None => Rc::new(PipelineResult { + files: Rc::new(vec![]), + diagnostics: frontend.diagnostics.clone(), + complexity: empty_complexity_report(), + ownership: Rc::new(vec![]), + artifact_plan: empty_artifact_plan(), + newline_indices: newline_indices.clone(), +}), + Some(graph) => { + let graph_diags = graph.diagnostics.clone(); +let resolve_errors = Rc::new({ let mut __result = Vec::new(); for d in graph_diags.iter().cloned() { if is_error_diagnostic(d.diagnostic.clone()) { __result.push(d); } } __result }); +if ((resolve_errors.len() as i64) > 0) { + return Rc::new(PipelineResult { + files: Rc::new(vec![]), + diagnostics: frontend.diagnostics.clone(), + complexity: empty_complexity_report(), + ownership: Rc::new(vec![]), + artifact_plan: empty_artifact_plan(), + newline_indices: newline_indices.clone(), +}) } - } - } +let source_indices = newline_indices.clone().iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, index: Rc| v2_rt::rc_map_insert(acc, index.file.clone(), index.clone())); +let norm = normalize_graph(&graph, source_indices.clone()); +let norm_diags = norm.diagnostics.clone(); +let norm_errors = Rc::new({ let mut __result = Vec::new(); for d in norm_diags.clone().iter().cloned() { if is_error_diagnostic(d.diagnostic.clone()) { __result.push(d); } } __result }); +if ((norm_errors.len() as i64) > 0) { + return Rc::new(PipelineResult { + files: Rc::new(vec![]), + diagnostics: v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), + complexity: empty_complexity_report(), + ownership: Rc::new(vec![]), + artifact_plan: empty_artifact_plan(), + newline_indices: newline_indices.clone(), +}) + } +let typed = reconcile(norm.graph.clone(), source_indices.clone(), frontend.intern_table.clone()); +let typed_diags = typed.diagnostics.clone(); +let func_entries = extract_func_entries(typed.clone()); +let recursion_ctx = build_recursion_context(typed.clone()); +let complexity = build_complexity_report(&func_entries, recursion_ctx, source_indices.clone()); +let complexity_diags = complexity_diagnostics(complexity.clone()); +let all_diags = v2_rt::concat(typed_diags.clone(), complexity_diags); +let type_errors = Rc::new({ let mut __result = Vec::new(); for d in typed_diags.clone().iter().cloned() { if is_error_diagnostic(d.diagnostic.clone()) { __result.push(d); } } __result }); +if ((type_errors.len() as i64) > 0) { + return Rc::new(PipelineResult { + files: Rc::new(vec![]), + diagnostics: v2_rt::concat(v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), all_diags.clone()), + complexity: complexity.clone(), + ownership: Rc::new(vec![]), + artifact_plan: empty_artifact_plan(), + newline_indices: newline_indices.clone(), +}) + } +let ownership = extract_ownership_proofs(typed.clone()); +let ownership_diags = ownership_diagnostics(ownership.clone()); +let ownership_errors = Rc::new({ let mut __result = Vec::new(); for d in ownership_diags.clone().iter().cloned() { if is_error_diagnostic(d.diagnostic.clone()) { __result.push(d); } } __result }); +if ((ownership_errors.len() as i64) > 0) { + return Rc::new(PipelineResult { + files: Rc::new(vec![]), + diagnostics: v2_rt::concat(v2_rt::concat(v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), all_diags.clone()), ownership_diags.clone()), + complexity: complexity.clone(), + ownership: ownership.clone(), + artifact_plan: empty_artifact_plan(), + newline_indices: newline_indices.clone(), +}) + } +let artifact_plan = default_artifact_plan(Rc::new({ let mut __result = Vec::new(); for m in typed.modules.clone().iter().cloned() { __result.push(authored_name_at(source_indices.clone(), &m.module.clone())); } __result }), target); +let emit_result = emit_from_artifact_plan(typed.clone(), &artifact_plan); +let emit_files = emit_result.files.clone(); +let emit_diags = emit_result.diagnostics.clone(); +let emit_errors = Rc::new({ let mut __result = Vec::new(); for d in emit_diags.clone().iter().cloned() { if is_error_diagnostic(d.diagnostic.clone()) { __result.push(d); } } __result }); +let final_files = if ((emit_errors.len() as i64) > 0) { + Rc::new(vec![]) + } else { + emit_files + }; +Rc::new(PipelineResult { + files: final_files, + diagnostics: v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), all_diags.clone()), ownership_diags.clone()), emit_diags.clone()), + complexity: complexity.clone(), + ownership: ownership.clone(), + artifact_plan: artifact_plan.clone(), + newline_indices: newline_indices.clone(), +}) +}, +} +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -2121,143 +738,83 @@ pub struct ResolvedPipelineResult { pub fn compile_to_resolved(sources: Rc>>) -> Rc { { let frontend = front_end_sources(sources); - let newline_indices = frontend.newline_indices.clone(); - match frontend.graph.clone() { - None => Rc::new(ResolvedPipelineResult { - graph: None, - diagnostics: frontend.diagnostics.clone(), - source_indices: v2_rt::rc_empty_map::>(), - complexity: empty_complexity_report(), - ownership: Rc::new(vec![]), - newline_indices: newline_indices.clone(), - }), - Some(graph) => { - let graph_diags = graph.diagnostics.clone(); - let resolve_errors = Rc::new({ - let mut __result = Vec::new(); - for d in graph_diags.iter().cloned() { - if is_error_diagnostic(d.diagnostic.clone()) { - __result.push(d); - } - } - __result - }); - if ((resolve_errors.len() as i64) > 0) { - return Rc::new(ResolvedPipelineResult { - graph: None, - diagnostics: frontend.diagnostics.clone(), - source_indices: v2_rt::rc_empty_map::>(), - complexity: empty_complexity_report(), - ownership: Rc::new(vec![]), - newline_indices: newline_indices.clone(), - }); - } - let source_indices = newline_indices.clone().iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, index: Rc| { - v2_rt::rc_map_insert(acc, index.file.clone(), index.clone()) - }, - ); - let norm = normalize_graph(&graph, source_indices.clone()); - let norm_diags = norm.diagnostics.clone(); - let norm_errors = Rc::new({ - let mut __result = Vec::new(); - for d in norm_diags.clone().iter().cloned() { - if is_error_diagnostic(d.diagnostic.clone()) { - __result.push(d); - } - } - __result - }); - if ((norm_errors.len() as i64) > 0) { - return Rc::new(ResolvedPipelineResult { - graph: None, - diagnostics: v2_rt::concat( - frontend.diagnostics.clone(), - norm_diags.clone(), - ), - source_indices: source_indices.clone(), - complexity: empty_complexity_report(), - ownership: Rc::new(vec![]), - newline_indices: newline_indices.clone(), - }); - } - let typed = reconcile( - norm.graph.clone(), - source_indices.clone(), - frontend.intern_table.clone(), - ); - let typed_diags = typed.diagnostics.clone(); - let func_entries = extract_func_entries(typed.clone()); - let recursion_ctx = build_recursion_context(typed.clone()); - let complexity = - build_complexity_report(&func_entries, recursion_ctx, source_indices.clone()); - let complexity_diags = complexity_diagnostics(complexity.clone()); - let all_diags = v2_rt::concat(typed_diags.clone(), complexity_diags); - let type_errors = Rc::new({ - let mut __result = Vec::new(); - for d in typed_diags.clone().iter().cloned() { - if is_error_diagnostic(d.diagnostic.clone()) { - __result.push(d); - } - } - __result - }); - if ((type_errors.len() as i64) > 0) { - return Rc::new(ResolvedPipelineResult { - graph: None, - diagnostics: v2_rt::concat( - v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), - all_diags.clone(), - ), - source_indices: source_indices.clone(), - complexity: complexity.clone(), - ownership: Rc::new(vec![]), - newline_indices: newline_indices.clone(), - }); - } - let ownership = extract_ownership_proofs(typed.clone()); - let ownership_diags = ownership_diagnostics(ownership.clone()); - let ownership_errors = Rc::new({ - let mut __result = Vec::new(); - for d in ownership_diags.clone().iter().cloned() { - if is_error_diagnostic(d.diagnostic.clone()) { - __result.push(d); - } - } - __result - }); - if ((ownership_errors.len() as i64) > 0) { - return Rc::new(ResolvedPipelineResult { - graph: None, - diagnostics: v2_rt::concat( - v2_rt::concat( - v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), - all_diags.clone(), - ), - ownership_diags.clone(), - ), - source_indices: source_indices.clone(), - complexity: complexity.clone(), - ownership: ownership.clone(), - newline_indices: newline_indices.clone(), - }); - } - Rc::new(ResolvedPipelineResult { - graph: Some(typed.clone()), - diagnostics: v2_rt::concat( - v2_rt::concat( - v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), - all_diags.clone(), - ), - ownership_diags.clone(), - ), - source_indices: source_indices.clone(), - complexity: complexity.clone(), - ownership: ownership.clone(), - newline_indices: newline_indices.clone(), - }) +let newline_indices = frontend.newline_indices.clone(); +match frontend.graph.clone() { + None => Rc::new(ResolvedPipelineResult { + graph: None, + diagnostics: frontend.diagnostics.clone(), + source_indices: v2_rt::rc_empty_map::>(), + complexity: empty_complexity_report(), + ownership: Rc::new(vec![]), + newline_indices: newline_indices.clone(), +}), + Some(graph) => { + let graph_diags = graph.diagnostics.clone(); +let resolve_errors = Rc::new({ let mut __result = Vec::new(); for d in graph_diags.iter().cloned() { if is_error_diagnostic(d.diagnostic.clone()) { __result.push(d); } } __result }); +if ((resolve_errors.len() as i64) > 0) { + return Rc::new(ResolvedPipelineResult { + graph: None, + diagnostics: frontend.diagnostics.clone(), + source_indices: v2_rt::rc_empty_map::>(), + complexity: empty_complexity_report(), + ownership: Rc::new(vec![]), + newline_indices: newline_indices.clone(), +}) } - } - } +let source_indices = newline_indices.clone().iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, index: Rc| v2_rt::rc_map_insert(acc, index.file.clone(), index.clone())); +let norm = normalize_graph(&graph, source_indices.clone()); +let norm_diags = norm.diagnostics.clone(); +let norm_errors = Rc::new({ let mut __result = Vec::new(); for d in norm_diags.clone().iter().cloned() { if is_error_diagnostic(d.diagnostic.clone()) { __result.push(d); } } __result }); +if ((norm_errors.len() as i64) > 0) { + return Rc::new(ResolvedPipelineResult { + graph: None, + diagnostics: v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), + source_indices: source_indices.clone(), + complexity: empty_complexity_report(), + ownership: Rc::new(vec![]), + newline_indices: newline_indices.clone(), +}) + } +let typed = reconcile(norm.graph.clone(), source_indices.clone(), frontend.intern_table.clone()); +let typed_diags = typed.diagnostics.clone(); +let func_entries = extract_func_entries(typed.clone()); +let recursion_ctx = build_recursion_context(typed.clone()); +let complexity = build_complexity_report(&func_entries, recursion_ctx, source_indices.clone()); +let complexity_diags = complexity_diagnostics(complexity.clone()); +let all_diags = v2_rt::concat(typed_diags.clone(), complexity_diags); +let type_errors = Rc::new({ let mut __result = Vec::new(); for d in typed_diags.clone().iter().cloned() { if is_error_diagnostic(d.diagnostic.clone()) { __result.push(d); } } __result }); +if ((type_errors.len() as i64) > 0) { + return Rc::new(ResolvedPipelineResult { + graph: None, + diagnostics: v2_rt::concat(v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), all_diags.clone()), + source_indices: source_indices.clone(), + complexity: complexity.clone(), + ownership: Rc::new(vec![]), + newline_indices: newline_indices.clone(), +}) + } +let ownership = extract_ownership_proofs(typed.clone()); +let ownership_diags = ownership_diagnostics(ownership.clone()); +let ownership_errors = Rc::new({ let mut __result = Vec::new(); for d in ownership_diags.clone().iter().cloned() { if is_error_diagnostic(d.diagnostic.clone()) { __result.push(d); } } __result }); +if ((ownership_errors.len() as i64) > 0) { + return Rc::new(ResolvedPipelineResult { + graph: None, + diagnostics: v2_rt::concat(v2_rt::concat(v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), all_diags.clone()), ownership_diags.clone()), + source_indices: source_indices.clone(), + complexity: complexity.clone(), + ownership: ownership.clone(), + newline_indices: newline_indices.clone(), +}) + } +Rc::new(ResolvedPipelineResult { + graph: Some(typed.clone()), + diagnostics: v2_rt::concat(v2_rt::concat(v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), all_diags.clone()), ownership_diags.clone()), + source_indices: source_indices.clone(), + complexity: complexity.clone(), + ownership: ownership.clone(), + newline_indices: newline_indices.clone(), +}) +}, +} +} } diff --git a/src/v2/stage0/src/v2_compiler_compiler_tests_rust.rs b/src/v2/stage0/src/v2_compiler_compiler_tests_rust.rs index 1f2d41a19e1..664d4b467fa 100644 --- a/src/v2/stage0/src/v2_compiler_compiler_tests_rust.rs +++ b/src/v2/stage0/src/v2_compiler_compiler_tests_rust.rs @@ -1,31 +1,18 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.compiler_tests_rust -pub use crate::v2_compiler_artifact::RenderTarget; -use crate::v2_compiler_artifact::RenderTarget::{Go, Python, Rust}; -use crate::v2_compiler_coercion::CoercionAssertion::{ - CheckpointAssertion, ContainerAssertion, CopyAssertion, TemplateAssertion, -}; -pub use crate::v2_compiler_coercion::{ - extract_coercion_tests, CoercionAssertion, CoercionTestEntry, -}; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::v2_compiler_artifact::{RenderTarget}; +use crate::v2_compiler_artifact::RenderTarget::{Rust, Python, Go}; +pub use crate::v2_compiler_coercion::{extract_coercion_tests, CoercionTestEntry, CoercionAssertion}; +use crate::v2_compiler_coercion::CoercionAssertion::{CheckpointAssertion, ContainerAssertion, CopyAssertion, TemplateAssertion}; pub fn ct_module_header() -> String { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "#[cfg(test)]\n".to_string(), - "mod compiler_tests {\n".to_string(), - ), - " use std::collections::HashMap;\n".to_string(), - ), - " use crate::v2_compiler_tokenize::tokenize;\n\n".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat("#[cfg(test)]\n".to_string(), "mod compiler_tests {\n".to_string()), " use std::collections::HashMap;\n".to_string()), " use crate::v2_compiler_tokenize::tokenize;\n\n".to_string()) } pub fn ct_workspace_helpers() -> String { @@ -87,189 +74,67 @@ pub fn ct_type_size_test() -> String { pub fn ct_coercion_tests() -> String { { let entries = extract_coercion_tests(); - let test_fns = Rc::new({ - let mut __result = Vec::new(); - for e in entries.iter().cloned() { - __result.push(render_coercion_test_rust(&e)); - } - __result - }); - v2_rt::concat(v2_rt::concat(v2_rt::concat(" // =========================================================================\n".to_string(), " // Coercion registry tests (auto-generated from data declarations)\n".to_string()), " // =========================================================================\n\n".to_string()), test_fns.join(&"\n".to_string())) - } +let test_fns = Rc::new({ let mut __result = Vec::new(); for e in entries.iter().cloned() { __result.push(render_coercion_test_rust(&e)); } __result }); +v2_rt::concat(v2_rt::concat(v2_rt::concat(" // =========================================================================\n".to_string(), " // Coercion registry tests (auto-generated from data declarations)\n".to_string()), " // =========================================================================\n\n".to_string()), test_fns.join(&"\n".to_string())) +} } pub fn render_target_rust_enum(target: RenderTarget) -> String { match target { - RenderTarget::Rust => "RenderTarget::Rust".to_string(), - RenderTarget::Python => "RenderTarget::Python".to_string(), - RenderTarget::Go => "RenderTarget::Go".to_string(), - RenderTarget::Dag => "RenderTarget::Dag".to_string(), - } + RenderTarget::Rust => "RenderTarget::Rust".to_string(), + RenderTarget::Python => "RenderTarget::Python".to_string(), + RenderTarget::Go => "RenderTarget::Go".to_string(), + RenderTarget::Dag => "RenderTarget::Dag".to_string(), +} } pub fn render_coercion_test_rust(entry: &Rc) -> String { { - let assertions = Rc::new({ - let mut __result = Vec::new(); - for a in entry.assertions.clone().iter().cloned() { - __result.push(render_coercion_assertion_rust(a.clone())); - } - __result - }); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(" #[test]\n".to_string(), " fn ".to_string()), - entry.test_name.clone(), - ), - "() {\n".to_string(), - ), - " use crate::v2_compiler_coercion::*;\n".to_string(), - ), - assertions.join(&"".to_string()), - ), - " }\n\n".to_string(), - ) - } + let assertions = Rc::new({ let mut __result = Vec::new(); for a in entry.assertions.clone().iter().cloned() { __result.push(render_coercion_assertion_rust(a.clone())); } __result }); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" #[test]\n".to_string(), " fn ".to_string()), entry.test_name.clone()), "() {\n".to_string()), " use crate::v2_compiler_coercion::*;\n".to_string()), assertions.join(&"".to_string())), " }\n\n".to_string()) +} } pub fn first_or_empty(items: Rc>) -> String { match items.first().cloned() { - Some(v) => v.clone(), - None => "".to_string(), - } + Some(v) => v.clone(), + None => "".to_string(), +} } pub fn second_or_empty(items: Rc>) -> String { match items.get(1 as usize).cloned() { - Some(v) => v.clone(), - None => "".to_string(), - } + Some(v) => v.clone(), + None => "".to_string(), +} } pub fn render_coercion_assertion_rust(a: Rc) -> String { match (*a).clone() { - CoercionAssertion::CheckpointAssertion { - target: t, - dag_name: name, - expected_type: expected, - .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - " assert_eq!(coerce_primitive_type(".to_string(), - render_target_rust_enum(t.clone()), - ), - ", \"".to_string(), - ), - name.clone(), - ), - "\".into()), \"".to_string(), - ), - expected.clone(), - ), - "\");\n".to_string(), - ), - CoercionAssertion::ContainerAssertion { - target: t, - container_name: name, - expected_template: expected, - .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - " assert_eq!(coerce_container_template(".to_string(), - render_target_rust_enum(t.clone()), - ), - ", \"".to_string(), - ), - name.clone(), - ), - "\".into()), Some(\"".to_string(), - ), - expected.clone(), - ), - "\".to_string()));\n".to_string(), - ), - CoercionAssertion::CopyAssertion { - target: t, - dag_name: name, - expected_copy: expected, - .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - " assert_eq!(is_copy(".to_string(), - render_target_rust_enum(t.clone()), - ), - ", \"".to_string(), - ), - name.clone(), - ), - "\".into()), Some(".to_string(), - ), - if expected.clone() { - "true".to_string() - } else { - "false".to_string() - }, - ), - "));\n".to_string(), - ), - CoercionAssertion::TemplateAssertion { - template: tmpl, - args: arg_list, - expected, - .. - } => { - if ((arg_list.clone().len() as i64) == 1) { - { - let arg0 = first_or_empty(arg_list.clone()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - " assert_eq!(apply_inhabitant_template1(\"" - .to_string(), - tmpl.clone(), - ), - "\".into(), \"".to_string(), - ), - arg0, - ), - "\".into()), \"".to_string(), - ), - expected.clone(), - ), - "\");\n".to_string(), - ) - } - } else { - if ((arg_list.clone().len() as i64) == 2) { - { - let arg0 = first_or_empty(arg_list.clone()); - let arg1 = second_or_empty(arg_list.clone()); - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" assert_eq!(apply_inhabitant_template2(\"".to_string(), tmpl.clone()), "\".into(), \"".to_string()), arg0), "\".into(), \"".to_string()), arg1), "\".into()), \"".to_string()), expected.clone()), "\");\n".to_string()) - } - } else { - "".to_string() - } - } + CoercionAssertion::CheckpointAssertion { target: t, dag_name: name, expected_type: expected, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" assert_eq!(coerce_primitive_type(".to_string(), render_target_rust_enum(t.clone())), ", \"".to_string()), name.clone()), "\".into()), \"".to_string()), expected.clone()), "\");\n".to_string()), + CoercionAssertion::ContainerAssertion { target: t, container_name: name, expected_template: expected, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" assert_eq!(coerce_container_template(".to_string(), render_target_rust_enum(t.clone())), ", \"".to_string()), name.clone()), "\".into()), Some(\"".to_string()), expected.clone()), "\".to_string()));\n".to_string()), + CoercionAssertion::CopyAssertion { target: t, dag_name: name, expected_copy: expected, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" assert_eq!(is_copy(".to_string(), render_target_rust_enum(t.clone())), ", \"".to_string()), name.clone()), "\".into()), Some(".to_string()), if expected.clone() { + "true".to_string() + } else { + "false".to_string() + }), "));\n".to_string()), + CoercionAssertion::TemplateAssertion { template: tmpl, args: arg_list, expected, .. } => if ((arg_list.clone().len() as i64) == 1) { + { + let arg0 = first_or_empty(arg_list.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" assert_eq!(apply_inhabitant_template1(\"".to_string(), tmpl.clone()), "\".into(), \"".to_string()), arg0), "\".into()), \"".to_string()), expected.clone()), "\");\n".to_string()) +} + } else { + if ((arg_list.clone().len() as i64) == 2) { + { + let arg0 = first_or_empty(arg_list.clone()); +let arg1 = second_or_empty(arg_list.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" assert_eq!(apply_inhabitant_template2(\"".to_string(), tmpl.clone()), "\".into(), \"".to_string()), arg0), "\".into(), \"".to_string()), arg1), "\".into()), \"".to_string()), expected.clone()), "\");\n".to_string()) +} + } else { + "".to_string() } - } + }, +} } pub fn ct_profile_helpers() -> String { diff --git a/src/v2/stage0/src/v2_compiler_complexity.rs b/src/v2/stage0/src/v2_compiler_complexity.rs index 75bb4c413b2..5f2db179e95 100644 --- a/src/v2/stage0/src/v2_compiler_complexity.rs +++ b/src/v2/stage0/src/v2_compiler_complexity.rs @@ -1,93 +1,45 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.complexity -use self::Certainty::*; -use self::CostExpr::*; -use self::ParserResultSource::*; -use self::SizeExpr::*; -use crate::std_algebra::CollectionSizeEffect::{IdentityEffect, ProjectionEffect, ShrinkEffect}; -use crate::std_algebra::CostShape::{ - ShapeConstant, ShapeIterateBody, ShapeLinearScan, ShapeSortBody, -}; -pub use crate::std_algebra::{CollectionSizeEffect, CostShape}; -use crate::std_computation::CallPattern::{ - ArithmeticSubtractCall, ChildAccessorCall, CollectionShrinkCall, FoldBodyCall, - ParserAdvanceCall, SameArgumentCall, WorklistDrainCall, -}; -use crate::std_computation::IterationDimension::{ArithmeticRepeat, CollectionFold, TreeDescent}; -pub use crate::std_computation::{ - lower_call_pattern, size_bound_param, type_iteration_dimension, CallPattern, - IterationDimension, LoweringTarget, -}; -pub use crate::std_graph::{ - build_call_graph_from_proof_edges, dfs_collect_component, dfs_finish_order, forward_adjacency, - graph_has_multi_node_scc, is_lexicographic_descent, is_valid_proof, reverse_adjacency, - seed_adjacency_map, CallGraph, DfsFinishAcc, GraphEdge, SccComponentAcc, SccCycleAcc, -}; -use crate::std_induction::AtomicCost::PolyCost; -use crate::std_induction::CostBound::{AtomicBound, ConstantBound, ErrorBound, ForeverBound}; -use crate::std_induction::PolynomialExponent::*; -use crate::std_induction::ShrinkFactor::{ConstantShrink, ProportionalShrink, UnitShrink}; -use crate::std_induction::SubValueRelation::{ - ArithmeticDescent, IteratedSubValue, PreservedValue, StrictSubValue, SubValueUnknown, -}; -pub use crate::std_induction::{ - catamorphism_bound, derive_bound, sub_value_to_call_pattern, sub_value_to_evidence, - sub_value_to_lowering_target, AtomicCost, CostBound, PolynomialExponent, ShrinkFactor, - SubValueRelation, -}; -use crate::std_termination::DescentEvidence::{DescentUnknown, NonIncreasing, Strict}; -use crate::std_termination::DescentSource::{ - ArithmeticDivideDescent, ArithmeticSubtractDescent, ChildAccessor, FoldIteration, ListShrink, - ParserAdvance, SetRemoval, -}; -use crate::std_termination::PositiveDescentAmount::OneStep; -use crate::std_termination::RankingDimension::{ - ArithmeticValue, ListLength, SetCardinality, TokenPosition, TreeSize, -}; -pub use crate::std_termination::{ - evidence_rank, join_evidence, map_evidence_merge_at, merge_evidence, optional_evidence_meet, - DescentEvidence, DescentSource, PositiveDescentAmount, ProofEdge, RankingDimension, - TerminationProof, -}; -pub use crate::std_types::SourceSpan; -pub use crate::v2_compiler_emit::to_string; -pub use crate::v2_compiler_infer_types::{node_is_collection, resolved_type}; -use crate::v2_compiler_parse::ParserCallIdentity::{ParserCallFunction, ParserCallHelper}; -use crate::v2_compiler_parse::ParserResultWitness::{ - ParserWitnessAdvance, ParserWitnessCall, ParserWitnessEat, ParserWitnessExpect, - ParserWitnessOpaque, -}; -pub use crate::v2_compiler_parse::{ - parser_passthrough_state_expr, parser_progress_flag_var, parser_result_witness, - ParserCallIdentity, ParserResultWitness, -}; -use crate::v2_rt; -use crate::v2_std_core::BinOp::{Div, Sub}; -use crate::v2_std_core::ExprData::{ - ExprBinOp, ExprBlock, ExprCall, ExprError, ExprFieldAccess, ExprForEach, ExprIf, ExprLambda, - ExprLet, ExprLiteral, ExprMatch, ExprMethodCall, ExprRecordLit, ExprReturn, ExprUnaryOp, - ExprVar, -}; -use crate::v2_std_core::LiteralValue::{LitInt, LitNull}; -use crate::v2_std_core::MatchPattern::{Bind, VariantPattern}; -use crate::v2_std_core::MethodSemantics::{ - AlgebraMethodSemantics, PlainMethodSemantics, ServiceMethodSemantics, -}; -pub use crate::v2_std_core::{ - arg_name_at, arg_value, arm_body, arm_guard, arm_pattern, authored_name_at, binop_left, - binop_right, expr_call_func_at, expr_var_name_at, field_access_base, field_access_field_at, - field_binding_pattern, field_init_node_name_at, field_init_node_value, foreach_body, - foreach_collection, if_condition, if_else_branch, if_then_branch, is_child_accessor_in_model, - is_children_list_field, is_sub_value_field, is_tree_size_preserving, is_tree_size_reducing, - lambda_body, lambda_param_names_at, let_binding_name_at, let_body, let_value, match_arm_nodes, - match_scrutinee, method_arg_nodes, method_receiver, param_node_name_at, param_node_type_expr, - return_value, BinOp, ExprData, LiteralValue, MatchPattern, MethodSemantics, NewlineIndex, Node, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_types::{SourceSpan}; +pub use crate::v2_compiler_emit::{to_string}; +pub use crate::v2_compiler_parse::{ParserResultWitness, parser_progress_flag_var, parser_passthrough_state_expr, parser_result_witness, ParserCallIdentity}; +use crate::v2_compiler_parse::ParserResultWitness::{ParserWitnessAdvance, ParserWitnessExpect, ParserWitnessEat, ParserWitnessCall, ParserWitnessOpaque}; +use crate::v2_compiler_parse::ParserCallIdentity::{ParserCallHelper, ParserCallFunction}; +pub use crate::std_termination::{DescentEvidence, RankingDimension, DescentSource, TerminationProof, ProofEdge, merge_evidence, join_evidence, evidence_rank, optional_evidence_meet, map_evidence_merge_at, PositiveDescentAmount}; +use crate::std_termination::DescentEvidence::{Strict, NonIncreasing, DescentUnknown}; +use crate::std_termination::RankingDimension::{TreeSize, ListLength, ArithmeticValue, TokenPosition, SetCardinality}; +use crate::std_termination::DescentSource::{ChildAccessor, ListShrink, ArithmeticSubtractDescent, ArithmeticDivideDescent, ParserAdvance, SetRemoval, FoldIteration}; +use crate::std_termination::PositiveDescentAmount::{OneStep}; +pub use crate::std_computation::{CallPattern, LoweringTarget, lower_call_pattern, size_bound_param, IterationDimension, type_iteration_dimension}; +use crate::std_computation::CallPattern::{ChildAccessorCall, CollectionShrinkCall, ArithmeticSubtractCall, ParserAdvanceCall, WorklistDrainCall, FoldBodyCall, SameArgumentCall}; +use crate::std_computation::IterationDimension::{TreeDescent, CollectionFold, ArithmeticRepeat}; +pub use crate::std_induction::{SubValueRelation, ShrinkFactor, CostBound, AtomicCost, PolynomialExponent, sub_value_to_evidence, sub_value_to_call_pattern, sub_value_to_lowering_target, catamorphism_bound, derive_bound}; +use crate::std_induction::SubValueRelation::{StrictSubValue, IteratedSubValue, ArithmeticDescent, PreservedValue, SubValueUnknown}; +use crate::std_induction::ShrinkFactor::{UnitShrink, ConstantShrink, ProportionalShrink}; +use crate::std_induction::CostBound::{ConstantBound, AtomicBound, ForeverBound, ErrorBound}; +use crate::std_induction::AtomicCost::{PolyCost}; +use crate::std_induction::PolynomialExponent::*; +pub use crate::v2_std_core::{Node, NewlineIndex, ExprData, BinOp, MatchPattern, field_init_node_name_at, field_init_node_value, arg_name_at, arg_value, arm_body, arm_guard, arm_pattern, MethodSemantics, binop_left, binop_right, field_binding_pattern, foreach_collection, foreach_body, if_condition, if_then_branch, if_else_branch, let_value, let_body, let_binding_name_at, match_scrutinee, match_arm_nodes, method_receiver, method_arg_nodes, param_node_name_at, param_node_type_expr, return_value, expr_call_func_at, expr_var_name_at, field_access_base, field_access_field_at, LiteralValue, is_child_accessor_in_model, lambda_param_names_at, lambda_body, is_children_list_field, is_sub_value_field, is_tree_size_preserving, is_tree_size_reducing, authored_name_at}; +use crate::v2_std_core::ExprData::{ExprLiteral, ExprError, ExprVar, ExprFieldAccess, ExprCall, ExprMethodCall, ExprBinOp, ExprUnaryOp, ExprMatch, ExprIf, ExprLet, ExprRecordLit, ExprBlock, ExprForEach, ExprReturn, ExprLambda}; +use crate::v2_std_core::BinOp::{Sub, Div}; +use crate::v2_std_core::MatchPattern::{Bind, VariantPattern}; +use crate::v2_std_core::MethodSemantics::{AlgebraMethodSemantics, PlainMethodSemantics, ServiceMethodSemantics}; +use crate::v2_std_core::LiteralValue::{LitNull, LitInt}; +pub use crate::v2_compiler_infer_types::{resolved_type, node_is_collection}; +pub use crate::std_algebra::{CollectionSizeEffect, CostShape}; +use crate::std_algebra::CollectionSizeEffect::{ShrinkEffect, ProjectionEffect, IdentityEffect}; +use crate::std_algebra::CostShape::{ShapeConstant, ShapeLinearScan, ShapeIterateBody, ShapeSortBody}; +pub use crate::std_graph::{CallGraph, GraphEdge, DfsFinishAcc, SccComponentAcc, SccCycleAcc, seed_adjacency_map, build_call_graph_from_proof_edges, forward_adjacency, reverse_adjacency, dfs_finish_order, dfs_collect_component, graph_has_multi_node_scc, is_lexicographic_descent, is_valid_proof}; +use self::SizeExpr::*; +use self::CostExpr::*; +use self::Certainty::*; +use self::ParserResultSource::*; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] @@ -168,38 +120,31 @@ pub struct CostInternTable { pub fn empty_intern_table() -> Rc { Rc::new(CostInternTable { - summaries: v2_rt::rc_empty_map::>(), - }) + summaries: v2_rt::rc_empty_map::>(), +}) } -pub fn cache_summary( - table: Rc, - func_name: String, - summary: Rc, -) -> Rc { +pub fn cache_summary(table: Rc, func_name: String, summary: Rc) -> Rc { Rc::new(CostInternTable { - summaries: v2_rt::rc_map_insert(table.summaries.clone(), func_name, summary), - }) + summaries: v2_rt::rc_map_insert(table.summaries.clone(), func_name, summary), +}) } -pub fn lookup_summary( - table: Rc, - func_name: String, -) -> Option> { +pub fn lookup_summary(table: Rc, func_name: String) -> Option> { v2_rt::map_get(&table.summaries.clone(), func_name) } pub fn evict_summary(table: Rc, func_name: String) -> Rc { - cache_summary( - table, - func_name, - Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { value: 0 }), - span: Rc::new(CostExpr::CostConst { value: 0 }), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, - }), - ) + cache_summary(table, func_name, Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { + value: 0, +}), + span: Rc::new(CostExpr::CostConst { + value: 0, +}), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, +})) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -211,13 +156,13 @@ pub struct CallEdge { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct SccInfo { pub members: Rc>, - pub member_set: Rc>, + pub member_set: Rc>, pub pattern: Rc, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct SccBuildAcc { - pub assigned: Rc>, + pub assigned: Rc>, pub index: Rc>>, } @@ -308,56 +253,39 @@ pub struct SccEdgeBlockAcc { pub fn is_algebra_iteration_method(method_semantics: Option>) -> bool { match method_semantics.as_deref().cloned() { - Some(MethodSemantics::AlgebraMethodSemantics { .. }) => true, - _ => false, - } + Some(MethodSemantics::AlgebraMethodSemantics { .. }) => true, + _ => false, +} } -pub fn method_size_effect( - method_semantics: Option>, -) -> Option { +pub fn method_size_effect(method_semantics: Option>) -> Option { match method_semantics.as_deref().cloned() { - Some(MethodSemantics::AlgebraMethodSemantics { - size_effect: se, .. - }) => se.clone(), - _ => None, - } + Some(MethodSemantics::AlgebraMethodSemantics { size_effect: se, .. }) => se.clone(), + _ => None, +} } -pub fn method_callback_element_position( - method_semantics: Option>, -) -> Option { +pub fn method_callback_element_position(method_semantics: Option>) -> Option { match method_semantics.as_deref().cloned() { - Some(MethodSemantics::AlgebraMethodSemantics { - algebra_template: at, - .. - }) => match at.clone() { - Some(template) => template.callback_element_position.clone(), - None => None, - }, - _ => None, - } + Some(MethodSemantics::AlgebraMethodSemantics { algebra_template: at, .. }) => match at.clone() { + Some(template) => template.callback_element_position.clone(), + None => None, +}, + _ => None, +} } -pub fn iteration_element_name( - method_semantics: Option>, - lambda: Rc, - si: Rc>>, -) -> Option { +pub fn iteration_element_name(method_semantics: Option>, lambda: Rc, si: Rc>>) -> Option { { let params = lambda_param_names_at(lambda, si); - match method_callback_element_position(method_semantics) { - Some(pos) => params.get(pos.clone() as usize).cloned(), - None => None, - } - } +match method_callback_element_position(method_semantics) { + Some(pos) => params.get(pos.clone() as usize).cloned(), + None => None, +} +} } -pub fn proof_has_non_descending_cycle( - proof: Rc, - members: Rc>, - edges: Rc>>, -) -> bool { +pub fn proof_has_non_descending_cycle(proof: Rc, members: Rc>, edges: Rc>>) -> bool { (is_valid_proof(proof, &edges) == false) } @@ -367,1162 +295,483 @@ pub fn set_has(m: Rc>, key: String) -> bool { pub fn strict_after_parser_witness(input: DescentEvidence) -> DescentEvidence { match input { - DescentEvidence::DescentUnknown => DescentEvidence::DescentUnknown, - _ => DescentEvidence::Strict, - } + DescentEvidence::DescentUnknown => DescentEvidence::DescentUnknown, + _ => DescentEvidence::Strict, +} } pub fn empty_parser_progress_env() -> Rc { Rc::new(ParserProgressEnv { - state_aliases: v2_rt::rc_empty_map::(), - result_sources: v2_rt::rc_empty_map::>(), - }) + state_aliases: v2_rt::rc_empty_map::(), + result_sources: v2_rt::rc_empty_map::>(), +}) } -pub fn parser_state_param( - params: Rc>>, - si: Rc>>, -) -> Option> { - Rc::new( - params - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - .fold(None, |acc: _, pair: (i64, Rc)| { - if (acc.clone() != None) { - acc.clone() - } else { - { - let idx = pair.0.clone(); - let param = pair.1.clone(); - if (authored_name_at(si.clone(), ¶m_node_type_expr(¶m)).as_str() - == "ParserState".to_string().as_str()) - { - Some(Rc::new(ParserStateParam { - name: param_node_name_at(param.clone(), si.clone()), - index: idx.clone(), - })) - } else { - None - } +pub fn parser_state_param(params: Rc>>, si: Rc>>) -> Option> { + Rc::new(params.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(None, |acc: _, pair: (i64, Rc)| if (acc.clone() != None) { + acc.clone() + } else { + { + let idx = pair.0.clone(); +let param = pair.1.clone(); +if (authored_name_at(si.clone(), ¶m_node_type_expr(¶m)).as_str() == "ParserState".to_string().as_str()) { + Some(Rc::new(ParserStateParam { + name: param_node_name_at(param.clone(), si.clone()), + index: idx.clone(), +})) + } else { + None } - } +} }) } -pub fn parser_state_base_var( - expr: &Rc, - si: Rc>>, -) -> Option { +pub fn parser_state_base_var(expr: &Rc, si: Rc>>) -> Option { match (*expr.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => match expr.children.clone().first().cloned() { - Some(base) => match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => Some(expr_var_name_at(base.clone(), si)), - _ => None, - }, - None => None, - }, - _ => None, - } + ExprData::ExprFieldAccess { .. } => match expr.children.clone().first().cloned() { + Some(base) => match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => Some(expr_var_name_at(base.clone(), si)), + _ => None, +}, + None => None, +}, + _ => None, +} } -pub fn parser_result_state_progress( - source: Rc, - parser_always_advancing: Rc>, - consumed_true_set: Rc>, - result_name: String, -) -> DescentEvidence { +pub fn parser_result_state_progress(source: Rc, parser_always_advancing: Rc>, consumed_true_set: Rc>, result_name: String) -> DescentEvidence { match (*source).clone() { - ParserResultSource::ParserResultAdvance { input, .. } => { - strict_after_parser_witness(input.clone()) - } - ParserResultSource::ParserResultExpect { input, .. } => { - strict_after_parser_witness(input.clone()) - } - ParserResultSource::ParserResultEat { input, .. } => { - if set_has(consumed_true_set, result_name) { - strict_after_parser_witness(input.clone()) + ParserResultSource::ParserResultAdvance { input, .. } => strict_after_parser_witness(input.clone()), + ParserResultSource::ParserResultExpect { input, .. } => strict_after_parser_witness(input.clone()), + ParserResultSource::ParserResultEat { input, .. } => if set_has(consumed_true_set, result_name) { + strict_after_parser_witness(input.clone()) + } else { + input.clone() + }, + ParserResultSource::ParserResultCall { input, callee, .. } => if (set_has(consumed_true_set, result_name) || set_has(parser_always_advancing, callee.clone())) { + strict_after_parser_witness(input.clone()) + } else { + input.clone() + }, + ParserResultSource::ParserResultDirectState { input: p, .. } => p.clone(), + ParserResultSource::ParserResultOpaque => DescentEvidence::DescentUnknown, +} +} + +pub fn parser_state_arg_expr(call_node: Rc, state_param: Rc, si: Rc>>) -> Option> { + Rc::new(call_node.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(None, |acc: _, pair: (i64, Rc)| if (acc.clone() != None) { + acc.clone() + } else { + { + let idx = pair.0.clone(); +let arg_node = pair.1.clone(); +let matches_state = if (arg_name_at(arg_node.clone(), si.clone()).as_deref() != Some("".to_string().as_str())) { + (arg_name_at(arg_node.clone(), si.clone()).as_deref() == Some(state_param.name.clone().as_str())) } else { - input.clone() - } - } - ParserResultSource::ParserResultCall { input, callee, .. } => { - if (set_has(consumed_true_set, result_name) - || set_has(parser_always_advancing, callee.clone())) - { - strict_after_parser_witness(input.clone()) + (idx.clone() == state_param.index.clone()) + }; +if matches_state.clone() { + Some(arg_value(&arg_node)) } else { - input.clone() + None } - } - ParserResultSource::ParserResultDirectState { input: p, .. } => p.clone(), - ParserResultSource::ParserResultOpaque => DescentEvidence::DescentUnknown, - } } - -pub fn parser_state_arg_expr( - call_node: Rc, - state_param: Rc, - si: Rc>>, -) -> Option> { - Rc::new( - call_node - .children - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - .fold(None, |acc: _, pair: (i64, Rc)| { - if (acc.clone() != None) { - acc.clone() - } else { - { - let idx = pair.0.clone(); - let arg_node = pair.1.clone(); - let matches_state = if (arg_name_at(arg_node.clone(), si.clone()).as_deref() - != Some("".to_string().as_str())) - { - (arg_name_at(arg_node.clone(), si.clone()).as_deref() - == Some(state_param.name.clone().as_str())) - } else { - (idx.clone() == state_param.index.clone()) - }; - if matches_state.clone() { - Some(arg_value(&arg_node)) - } else { - None - } - } - } }) } -pub fn parser_state_expr_progress( - expr: &Rc, - state_param: &Rc, - env: &Rc, - parser_always_advancing: &Rc>, - consumed_true_set: &Rc>, - si: &Rc>>, -) -> DescentEvidence { +pub fn parser_state_expr_progress(expr: &Rc, state_param: &Rc, env: &Rc, parser_always_advancing: &Rc>, consumed_true_set: &Rc>, si: &Rc>>) -> DescentEvidence { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let name = expr_var_name_at(expr.clone(), si.clone()); - if (name.clone().as_str() == state_param.name.clone().as_str()) { - DescentEvidence::NonIncreasing - } else { - match v2_rt::map_get(&env.state_aliases.clone(), name.clone()) { - Some(progress) => progress.clone(), - None => DescentEvidence::DescentUnknown, - } - } - } - ExprData::ExprFieldAccess { .. } => { - if (field_access_field_at(expr.clone(), si.clone()).as_str() - == "state".to_string().as_str()) - { - match parser_state_base_var(&expr, si.clone()) { - Some(result_name) => { - match v2_rt::map_get(&env.result_sources.clone(), result_name.clone()) { - Some(source) => parser_result_state_progress( - source.clone(), - parser_always_advancing.clone(), - consumed_true_set.clone(), - result_name.clone(), - ), - None => DescentEvidence::DescentUnknown, - } - } - None => DescentEvidence::DescentUnknown, - } - } else { - DescentEvidence::DescentUnknown - } - } - ExprData::ExprCall { .. } => match parser_passthrough_state_expr(&expr, &si) { - Some(state_expr) => parser_state_expr_progress( - &state_expr, - &state_param, - &env, - &parser_always_advancing, - &consumed_true_set, - &si, - ), - None => DescentEvidence::DescentUnknown, - }, - ExprData::ExprIf => { - let cond = if_condition(expr.clone()); - let then_consumed = match parser_progress_flag_var(&cond, &si) { - Some(name) => { - v2_rt::rc_map_insert(consumed_true_set.clone(), name.clone(), true) - } - None => consumed_true_set.clone(), - }; - let then_progress = parser_state_expr_progress( - &if_then_branch(expr.clone()), - &state_param, - &env, - &parser_always_advancing, - &then_consumed, - &si, - ); - let else_progress = match if_else_branch(expr.clone()) { - Some(eb) => parser_state_expr_progress( - &eb, - &state_param, - &env, - &parser_always_advancing, - &consumed_true_set, - &si, - ), - None => DescentEvidence::DescentUnknown, - }; - merge_evidence(then_progress, else_progress) - } - ExprData::ExprLet => { - let next_env = parser_env_with_binding( - &let_binding_name_at(expr.clone(), si.clone()), - &let_value(expr.clone()), - &env, - &state_param, - &parser_always_advancing, - &consumed_true_set, - &si, - ); - match let_body(expr.clone()) { - Some(body) => parser_state_expr_progress( - &body, - &state_param, - &next_env, - &parser_always_advancing, - &consumed_true_set, - &si, - ), - None => DescentEvidence::DescentUnknown, - } - } - ExprData::ExprMatch => { - let arm_progresses = Rc::new({ - let mut __result = Vec::new(); - for arm_node in match_arm_nodes(expr.clone()).iter().cloned() { - __result.push(parser_state_expr_progress( - &arm_body(&arm_node), - &state_param, - &env, - &parser_always_advancing, - &consumed_true_set, - &si, - )); - } - __result - }); - match arm_progresses.clone().first().cloned() { - Some(initial) => arm_progresses.clone().iter().cloned().fold( - initial.clone(), - |acc: DescentEvidence, p: DescentEvidence| merge_evidence(acc, p.clone()), - ), - None => DescentEvidence::DescentUnknown, - } + ExprData::ExprVar { .. } => { + let name = expr_var_name_at(expr.clone(), si.clone()); +if (name.clone().as_str() == state_param.name.clone().as_str()) { + DescentEvidence::NonIncreasing + } else { + match v2_rt::map_get(&env.state_aliases.clone(), name.clone()) { + Some(progress) => progress.clone(), + None => DescentEvidence::DescentUnknown, +} } - ExprData::ExprBlock => parser_block_state_progress( - &expr.children.clone(), - &state_param, - env.clone(), - &parser_always_advancing, - &consumed_true_set, - &si, - ), - _ => DescentEvidence::DescentUnknown, - } +}, + ExprData::ExprFieldAccess { .. } => if (field_access_field_at(expr.clone(), si.clone()).as_str() == "state".to_string().as_str()) { + match parser_state_base_var(&expr, si.clone()) { + Some(result_name) => match v2_rt::map_get(&env.result_sources.clone(), result_name.clone()) { + Some(source) => parser_result_state_progress(source.clone(), parser_always_advancing.clone(), consumed_true_set.clone(), result_name.clone()), + None => DescentEvidence::DescentUnknown, +}, + None => DescentEvidence::DescentUnknown, +} + } else { + DescentEvidence::DescentUnknown + }, + ExprData::ExprCall { .. } => match parser_passthrough_state_expr(&expr, &si) { + Some(state_expr) => parser_state_expr_progress(&state_expr, &state_param, &env, &parser_always_advancing, &consumed_true_set, &si), + None => DescentEvidence::DescentUnknown, +}, + ExprData::ExprIf => { + let cond = if_condition(expr.clone()); +let then_consumed = match parser_progress_flag_var(&cond, &si) { + Some(name) => v2_rt::rc_map_insert(consumed_true_set.clone(), name.clone(), true), + None => consumed_true_set.clone(), +}; +let then_progress = parser_state_expr_progress(&if_then_branch(expr.clone()), &state_param, &env, &parser_always_advancing, &then_consumed, &si); +let else_progress = match if_else_branch(expr.clone()) { + Some(eb) => parser_state_expr_progress(&eb, &state_param, &env, &parser_always_advancing, &consumed_true_set, &si), + None => DescentEvidence::DescentUnknown, +}; +merge_evidence(then_progress, else_progress) +}, + ExprData::ExprLet => { + let next_env = parser_env_with_binding(&let_binding_name_at(expr.clone(), si.clone()), &let_value(expr.clone()), &env, &state_param, &parser_always_advancing, &consumed_true_set, &si); +match let_body(expr.clone()) { + Some(body) => parser_state_expr_progress(&body, &state_param, &next_env, &parser_always_advancing, &consumed_true_set, &si), + None => DescentEvidence::DescentUnknown, +} +}, + ExprData::ExprMatch => { + let arm_progresses = Rc::new({ let mut __result = Vec::new(); for arm_node in match_arm_nodes(expr.clone()).iter().cloned() { __result.push(parser_state_expr_progress(&arm_body(&arm_node), &state_param, &env, &parser_always_advancing, &consumed_true_set, &si)); } __result }); +match arm_progresses.clone().first().cloned() { + Some(initial) => arm_progresses.clone().iter().cloned().fold(initial.clone(), |acc: DescentEvidence, p: DescentEvidence| merge_evidence(acc, p.clone())), + None => DescentEvidence::DescentUnknown, +} +}, + ExprData::ExprBlock => parser_block_state_progress(&expr.children.clone(), &state_param, env.clone(), &parser_always_advancing, &consumed_true_set, &si), + _ => DescentEvidence::DescentUnknown, +} }) } -pub fn parser_block_state_progress( - stmts: &Rc>>, - state_param: &Rc, - env: Rc, - parser_always_advancing: &Rc>, - consumed_true_set: &Rc>, - si: &Rc>>, -) -> DescentEvidence { +pub fn parser_block_state_progress(stmts: &Rc>>, state_param: &Rc, env: Rc, parser_always_advancing: &Rc>, consumed_true_set: &Rc>, si: &Rc>>) -> DescentEvidence { match stmts.clone().last().cloned() { - None => DescentEvidence::DescentUnknown, - Some(last_stmt) => { - let leading = Rc::new( - stmts - .clone() - .iter() - .cloned() - .take(((stmts.clone().len() as i64) - 1) as usize) - .collect::>(), - ); - let final_env = leading.iter().cloned().fold( - env.clone(), - |acc_env: Rc, stmt: Rc| match (*stmt.expr_data.clone()) - .clone() - { - ExprData::ExprLet => match let_body(stmt.clone()) { - None => parser_env_with_binding( - &let_binding_name_at(stmt.clone(), si.clone()), - &let_value(stmt.clone()), - &acc_env, - &state_param, - &parser_always_advancing, - &consumed_true_set, - &si, - ), - Some(_) => acc_env.clone(), - }, - _ => acc_env.clone(), - }, - ); - parser_state_expr_progress( - &last_stmt, - &state_param, - &final_env, - &parser_always_advancing, - &consumed_true_set, - &si, - ) - } - } + None => DescentEvidence::DescentUnknown, + Some(last_stmt) => { + let leading = Rc::new(stmts.clone().iter().cloned().take(((stmts.clone().len() as i64) - 1) as usize).collect::>()); +let final_env = leading.iter().cloned().fold(env.clone(), |acc_env: Rc, stmt: Rc| match (*stmt.expr_data.clone()).clone() { + ExprData::ExprLet => match let_body(stmt.clone()) { + None => parser_env_with_binding(&let_binding_name_at(stmt.clone(), si.clone()), &let_value(stmt.clone()), &acc_env, &state_param, &parser_always_advancing, &consumed_true_set, &si), + Some(_) => acc_env.clone(), +}, + _ => acc_env.clone(), +}); +parser_state_expr_progress(&last_stmt, &state_param, &final_env, &parser_always_advancing, &consumed_true_set, &si) +}, +} } -pub fn parser_result_source_for_expr( - expr: &Rc, - state_param: &Rc, - env: Rc, - parser_always_advancing: Rc>, - consumed_true_set: Rc>, - si: &Rc>>, -) -> Rc { +pub fn parser_result_source_for_expr(expr: &Rc, state_param: &Rc, env: Rc, parser_always_advancing: Rc>, consumed_true_set: Rc>, si: &Rc>>) -> Rc { match (*expr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let input_progress = - match parser_state_arg_expr(expr.clone(), state_param.clone(), si.clone()) { - Some(state_expr) => parser_state_expr_progress( - &state_expr, - &state_param, - &env, - &parser_always_advancing, - &consumed_true_set, - &si, - ), - None => DescentEvidence::DescentUnknown, - }; - match (*parser_result_witness(&expr, si.clone())).clone() { - ParserResultWitness::ParserWitnessAdvance => { - Rc::new(ParserResultSource::ParserResultAdvance { - input: input_progress.clone(), - }) - } - ParserResultWitness::ParserWitnessExpect => { - Rc::new(ParserResultSource::ParserResultExpect { - input: input_progress.clone(), - }) - } - ParserResultWitness::ParserWitnessEat => { - Rc::new(ParserResultSource::ParserResultEat { - input: input_progress.clone(), - }) - } - ParserResultWitness::ParserWitnessCall { callee, .. } => { - match (*callee.clone()).clone() { - ParserCallIdentity::ParserCallHelper { .. } => { - Rc::new(ParserResultSource::ParserResultOpaque) - } - ParserCallIdentity::ParserCallFunction { name, .. } => { - match input_progress.clone() { - DescentEvidence::DescentUnknown => { - Rc::new(ParserResultSource::ParserResultOpaque) - } - _ => Rc::new(ParserResultSource::ParserResultCall { - input: input_progress.clone(), - callee: name.clone(), - }), - } - } - } - } - ParserResultWitness::ParserWitnessOpaque => { - Rc::new(ParserResultSource::ParserResultOpaque) - } - } - } - _ => { - let progress = parser_success_progress( - &expr, - &state_param, - &env, - &parser_always_advancing, - &consumed_true_set, - &si, - ); - match progress.clone() { - DescentEvidence::DescentUnknown => Rc::new(ParserResultSource::ParserResultOpaque), - _ => Rc::new(ParserResultSource::ParserResultDirectState { - input: progress.clone(), - }), - } - } - } + ExprData::ExprCall { .. } => { + let input_progress = match parser_state_arg_expr(expr.clone(), state_param.clone(), si.clone()) { + Some(state_expr) => parser_state_expr_progress(&state_expr, &state_param, &env, &parser_always_advancing, &consumed_true_set, &si), + None => DescentEvidence::DescentUnknown, +}; +match (*parser_result_witness(&expr, si.clone())).clone() { + ParserResultWitness::ParserWitnessAdvance => Rc::new(ParserResultSource::ParserResultAdvance { + input: input_progress.clone(), +}), + ParserResultWitness::ParserWitnessExpect => Rc::new(ParserResultSource::ParserResultExpect { + input: input_progress.clone(), +}), + ParserResultWitness::ParserWitnessEat => Rc::new(ParserResultSource::ParserResultEat { + input: input_progress.clone(), +}), + ParserResultWitness::ParserWitnessCall { callee, .. } => match (*callee.clone()).clone() { + ParserCallIdentity::ParserCallHelper { .. } => Rc::new(ParserResultSource::ParserResultOpaque), + ParserCallIdentity::ParserCallFunction { name, .. } => match input_progress.clone() { + DescentEvidence::DescentUnknown => Rc::new(ParserResultSource::ParserResultOpaque), + _ => Rc::new(ParserResultSource::ParserResultCall { + input: input_progress.clone(), + callee: name.clone(), +}), +}, +}, + ParserResultWitness::ParserWitnessOpaque => Rc::new(ParserResultSource::ParserResultOpaque), +} +}, + _ => { + let progress = parser_success_progress(&expr, &state_param, &env, &parser_always_advancing, &consumed_true_set, &si); +match progress.clone() { + DescentEvidence::DescentUnknown => Rc::new(ParserResultSource::ParserResultOpaque), + _ => Rc::new(ParserResultSource::ParserResultDirectState { + input: progress.clone(), +}), +} +}, +} } -pub fn parser_env_with_binding( - name: &String, - value_expr: &Rc, - env: &Rc, - state_param: &Rc, - parser_always_advancing: &Rc>, - consumed_true_set: &Rc>, - si: &Rc>>, -) -> Rc { +pub fn parser_env_with_binding(name: &String, value_expr: &Rc, env: &Rc, state_param: &Rc, parser_always_advancing: &Rc>, consumed_true_set: &Rc>, si: &Rc>>) -> Rc { { - let state_progress = parser_state_expr_progress( - &value_expr, - &state_param, - &env, - &parser_always_advancing, - &consumed_true_set, - &si, - ); - let result_source = parser_result_source_for_expr( - &value_expr, - &state_param, - env.clone(), - parser_always_advancing.clone(), - consumed_true_set.clone(), - &si, - ); - Rc::new(ParserProgressEnv { - state_aliases: v2_rt::rc_map_insert( - env.state_aliases.clone(), - name.clone(), - state_progress, - ), - result_sources: v2_rt::rc_map_insert( - env.result_sources.clone(), - name.clone(), - result_source, - ), - }) - } + let state_progress = parser_state_expr_progress(&value_expr, &state_param, &env, &parser_always_advancing, &consumed_true_set, &si); +let result_source = parser_result_source_for_expr(&value_expr, &state_param, env.clone(), parser_always_advancing.clone(), consumed_true_set.clone(), &si); +Rc::new(ParserProgressEnv { + state_aliases: v2_rt::rc_map_insert(env.state_aliases.clone(), name.clone(), state_progress), + result_sources: v2_rt::rc_map_insert(env.result_sources.clone(), name.clone(), result_source), +}) +} } -pub fn parser_call_edge_progress( - call_node: &Rc, - state_param: &Rc, - env: Rc, - parser_always_advancing: &Rc>, - consumed_true_set: Rc>, - si: &Rc>>, -) -> DescentEvidence { +pub fn parser_call_edge_progress(call_node: &Rc, state_param: &Rc, env: Rc, parser_always_advancing: &Rc>, consumed_true_set: Rc>, si: &Rc>>) -> DescentEvidence { match parser_state_arg_expr(call_node.clone(), state_param.clone(), si.clone()) { - Some(state_expr) => { - let input_progress = parser_state_expr_progress( - &state_expr, - &state_param, - &env, - &parser_always_advancing, - &consumed_true_set, - &si, - ); - if set_has( - parser_always_advancing.clone(), - expr_call_func_at(call_node.clone(), si.clone()), - ) { - strict_after_parser_witness(input_progress) - } else { - input_progress - } + Some(state_expr) => { + let input_progress = parser_state_expr_progress(&state_expr, &state_param, &env, &parser_always_advancing, &consumed_true_set, &si); +if set_has(parser_always_advancing.clone(), expr_call_func_at(call_node.clone(), si.clone())) { + strict_after_parser_witness(input_progress) + } else { + input_progress } - None => DescentEvidence::DescentUnknown, - } +}, + None => DescentEvidence::DescentUnknown, +} } -pub fn collect_parser_progress_block_edges( - caller: String, - stmts: Rc>>, - state_param: Rc, - scc_name_set: Rc>, - env: Rc, - parser_always_advancing: Rc>, - consumed_true_set: Rc>, - si: Rc>>, -) -> Rc>> { +pub fn collect_parser_progress_block_edges(caller: String, stmts: Rc>>, state_param: Rc, scc_name_set: Rc>, env: Rc, parser_always_advancing: Rc>, consumed_true_set: Rc>, si: Rc>>) -> Rc>> { { - let acc = stmts.iter().cloned().fold( - Rc::new(ParserProgressAcc { - edges: Rc::new(vec![]), - env: env, - }), - |acc: Rc, stmt: Rc| match (*stmt.expr_data.clone()).clone() { - ExprData::ExprLet => match let_body(stmt.clone()) { - None => { - let value_expr = let_value(stmt.clone()); - let value_edges = collect_parser_progress_edges( - &caller, - &value_expr, - &state_param, - &scc_name_set, - &acc.env.clone(), - &parser_always_advancing, - &consumed_true_set, - &si, - ); - let next_env = parser_env_with_binding( - &let_binding_name_at(stmt.clone(), si.clone()), - &value_expr, - &acc.env.clone(), - &state_param, - &parser_always_advancing, - &consumed_true_set, - &si, - ); - Rc::new(ParserProgressAcc { - edges: v2_rt::concat(acc.edges.clone(), value_edges.clone()), - env: next_env.clone(), - }) - } - Some(_) => { - let stmt_edges = collect_parser_progress_edges( - &caller, - &stmt, - &state_param, - &scc_name_set, - &acc.env.clone(), - &parser_always_advancing, - &consumed_true_set, - &si, - ); - Rc::new(ParserProgressAcc { - edges: v2_rt::concat(acc.edges.clone(), stmt_edges.clone()), - env: acc.env.clone(), - }) - } - }, - _ => { - let stmt_edges = collect_parser_progress_edges( - &caller, - &stmt, - &state_param, - &scc_name_set, - &acc.env.clone(), - &parser_always_advancing, - &consumed_true_set, - &si, - ); - Rc::new(ParserProgressAcc { - edges: v2_rt::concat(acc.edges.clone(), stmt_edges.clone()), - env: acc.env.clone(), - }) - } - }, - ); - acc.edges.clone() - } + let acc = stmts.iter().cloned().fold(Rc::new(ParserProgressAcc { + edges: Rc::new(vec![]), + env: env, +}), |acc: Rc, stmt: Rc| match (*stmt.expr_data.clone()).clone() { + ExprData::ExprLet => match let_body(stmt.clone()) { + None => { + let value_expr = let_value(stmt.clone()); +let value_edges = collect_parser_progress_edges(&caller, &value_expr, &state_param, &scc_name_set, &acc.env.clone(), &parser_always_advancing, &consumed_true_set, &si); +let next_env = parser_env_with_binding(&let_binding_name_at(stmt.clone(), si.clone()), &value_expr, &acc.env.clone(), &state_param, &parser_always_advancing, &consumed_true_set, &si); +Rc::new(ParserProgressAcc { + edges: v2_rt::concat(acc.edges.clone(), value_edges.clone()), + env: next_env.clone(), +}) +}, + Some(_) => { + let stmt_edges = collect_parser_progress_edges(&caller, &stmt, &state_param, &scc_name_set, &acc.env.clone(), &parser_always_advancing, &consumed_true_set, &si); +Rc::new(ParserProgressAcc { + edges: v2_rt::concat(acc.edges.clone(), stmt_edges.clone()), + env: acc.env.clone(), +}) +}, +}, + _ => { + let stmt_edges = collect_parser_progress_edges(&caller, &stmt, &state_param, &scc_name_set, &acc.env.clone(), &parser_always_advancing, &consumed_true_set, &si); +Rc::new(ParserProgressAcc { + edges: v2_rt::concat(acc.edges.clone(), stmt_edges.clone()), + env: acc.env.clone(), +}) +}, +}); +acc.edges.clone() +} } -pub fn collect_parser_progress_edges( - caller: &String, - body: &Rc, - state_param: &Rc, - scc_name_set: &Rc>, - env: &Rc, - parser_always_advancing: &Rc>, - consumed_true_set: &Rc>, - si: &Rc>>, -) -> Rc>> { +pub fn collect_parser_progress_edges(caller: &String, body: &Rc, state_param: &Rc, scc_name_set: &Rc>, env: &Rc, parser_always_advancing: &Rc>, consumed_true_set: &Rc>, si: &Rc>>) -> Rc>> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let own_edges = if set_has( - scc_name_set.clone(), - expr_call_func_at(body.clone(), si.clone()), - ) { - Rc::new(vec![Rc::new(ParserProgressEdge { - caller: caller.clone(), - callee: expr_call_func_at(body.clone(), si.clone()), - progress: parser_call_edge_progress( - &body, - &state_param, - env.clone(), - &parser_always_advancing, - consumed_true_set.clone(), - &si, - ), - })]) - } else { - Rc::new(vec![]) - }; - let child_edges = Rc::new({ - let mut __result = Vec::new(); - for child in body.children.clone().iter().cloned() { - __result.extend( - (*collect_parser_progress_edges( - &caller, - &child, - &state_param, - &scc_name_set, - &env, - &parser_always_advancing, - &consumed_true_set, - &si, - )) - .iter() - .cloned(), - ); - } - __result - }); - v2_rt::concat(own_edges, child_edges) - } - ExprData::ExprIf => { - let cond = if_condition(body.clone()); - let cond_edges = collect_parser_progress_edges( - &caller, - &cond, - &state_param, - &scc_name_set, - &env, - &parser_always_advancing, - &consumed_true_set, - &si, - ); - let then_consumed = match parser_progress_flag_var(&cond, &si) { - Some(name) => { - v2_rt::rc_map_insert(consumed_true_set.clone(), name.clone(), true) - } - None => consumed_true_set.clone(), - }; - let then_edges = collect_parser_progress_edges( - &caller, - &if_then_branch(body.clone()), - &state_param, - &scc_name_set, - &env, - &parser_always_advancing, - &then_consumed, - &si, - ); - let else_edges = match if_else_branch(body.clone()) { - Some(eb) => collect_parser_progress_edges( - &caller, - &eb, - &state_param, - &scc_name_set, - &env, - &parser_always_advancing, - &consumed_true_set, - &si, - ), - None => Rc::new(vec![]), - }; - v2_rt::concat(v2_rt::concat(cond_edges, then_edges), else_edges) - } - ExprData::ExprLet => { - let value_expr = let_value(body.clone()); - let value_edges = collect_parser_progress_edges( - &caller, - &value_expr, - &state_param, - &scc_name_set, - &env, - &parser_always_advancing, - &consumed_true_set, - &si, - ); - let next_env = parser_env_with_binding( - &let_binding_name_at(body.clone(), si.clone()), - &value_expr, - &env, - &state_param, - &parser_always_advancing, - &consumed_true_set, - &si, - ); - let body_edges = match let_body(body.clone()) { - Some(b) => collect_parser_progress_edges( - &caller, - &b, - &state_param, - &scc_name_set, - &next_env, - &parser_always_advancing, - &consumed_true_set, - &si, - ), - None => Rc::new(vec![]), - }; - v2_rt::concat(value_edges, body_edges) - } - ExprData::ExprBlock => collect_parser_progress_block_edges( - caller.clone(), - body.children.clone(), - state_param.clone(), - scc_name_set.clone(), - env.clone(), - parser_always_advancing.clone(), - consumed_true_set.clone(), - si.clone(), - ), - ExprData::ExprMatch => { - let scrut_edges = collect_parser_progress_edges( - &caller, - &match_scrutinee(body.clone()), - &state_param, - &scc_name_set, - &env, - &parser_always_advancing, - &consumed_true_set, - &si, - ); - let arm_edges = Rc::new({ - let mut __result = Vec::new(); - for arm_node in match_arm_nodes(body.clone()).iter().cloned() { - __result.extend( - (*collect_parser_progress_edges( - &caller, - &arm_body(&arm_node), - &state_param, - &scc_name_set, - &env, - &parser_always_advancing, - &consumed_true_set, - &si, - )) - .iter() - .cloned(), - ); - } - __result - }); - v2_rt::concat(scrut_edges, arm_edges) - } - _ => Rc::new({ - let mut __result = Vec::new(); - for child in body.children.clone().iter().cloned() { - __result.extend( - (*collect_parser_progress_edges( - &caller, - &child, - &state_param, - &scc_name_set, - &env, - &parser_always_advancing, - &consumed_true_set, - &si, - )) - .iter() - .cloned(), - ); - } - __result - }), - } + ExprData::ExprCall { .. } => { + let own_edges = if set_has(scc_name_set.clone(), expr_call_func_at(body.clone(), si.clone())) { + Rc::new(vec![Rc::new(ParserProgressEdge { + caller: caller.clone(), + callee: expr_call_func_at(body.clone(), si.clone()), + progress: parser_call_edge_progress(&body, &state_param, env.clone(), &parser_always_advancing, consumed_true_set.clone(), &si), +})]) + } else { + Rc::new(vec![]) + }; +let child_edges = Rc::new({ let mut __result = Vec::new(); for child in body.children.clone().iter().cloned() { __result.extend((*collect_parser_progress_edges(&caller, &child, &state_param, &scc_name_set, &env, &parser_always_advancing, &consumed_true_set, &si)).iter().cloned()); } __result }); +v2_rt::concat(own_edges, child_edges) +}, + ExprData::ExprIf => { + let cond = if_condition(body.clone()); +let cond_edges = collect_parser_progress_edges(&caller, &cond, &state_param, &scc_name_set, &env, &parser_always_advancing, &consumed_true_set, &si); +let then_consumed = match parser_progress_flag_var(&cond, &si) { + Some(name) => v2_rt::rc_map_insert(consumed_true_set.clone(), name.clone(), true), + None => consumed_true_set.clone(), +}; +let then_edges = collect_parser_progress_edges(&caller, &if_then_branch(body.clone()), &state_param, &scc_name_set, &env, &parser_always_advancing, &then_consumed, &si); +let else_edges = match if_else_branch(body.clone()) { + Some(eb) => collect_parser_progress_edges(&caller, &eb, &state_param, &scc_name_set, &env, &parser_always_advancing, &consumed_true_set, &si), + None => Rc::new(vec![]), +}; +v2_rt::concat(v2_rt::concat(cond_edges, then_edges), else_edges) +}, + ExprData::ExprLet => { + let value_expr = let_value(body.clone()); +let value_edges = collect_parser_progress_edges(&caller, &value_expr, &state_param, &scc_name_set, &env, &parser_always_advancing, &consumed_true_set, &si); +let next_env = parser_env_with_binding(&let_binding_name_at(body.clone(), si.clone()), &value_expr, &env, &state_param, &parser_always_advancing, &consumed_true_set, &si); +let body_edges = match let_body(body.clone()) { + Some(b) => collect_parser_progress_edges(&caller, &b, &state_param, &scc_name_set, &next_env, &parser_always_advancing, &consumed_true_set, &si), + None => Rc::new(vec![]), +}; +v2_rt::concat(value_edges, body_edges) +}, + ExprData::ExprBlock => collect_parser_progress_block_edges(caller.clone(), body.children.clone(), state_param.clone(), scc_name_set.clone(), env.clone(), parser_always_advancing.clone(), consumed_true_set.clone(), si.clone()), + ExprData::ExprMatch => { + let scrut_edges = collect_parser_progress_edges(&caller, &match_scrutinee(body.clone()), &state_param, &scc_name_set, &env, &parser_always_advancing, &consumed_true_set, &si); +let arm_edges = Rc::new({ let mut __result = Vec::new(); for arm_node in match_arm_nodes(body.clone()).iter().cloned() { __result.extend((*collect_parser_progress_edges(&caller, &arm_body(&arm_node), &state_param, &scc_name_set, &env, &parser_always_advancing, &consumed_true_set, &si)).iter().cloned()); } __result }); +v2_rt::concat(scrut_edges, arm_edges) +}, + _ => Rc::new({ let mut __result = Vec::new(); for child in body.children.clone().iter().cloned() { __result.extend((*collect_parser_progress_edges(&caller, &child, &state_param, &scc_name_set, &env, &parser_always_advancing, &consumed_true_set, &si)).iter().cloned()); } __result }), +} }) } -pub fn parser_record_field_value( - expr: Rc, - field_name: String, - si: Rc>>, -) -> Option> { - Rc::new({ - let mut __result = Vec::new(); - for child in Rc::new({ - let mut __result = Vec::new(); - for child in expr.children.clone().iter().cloned() { - if (field_init_node_name_at(child.clone(), si.clone()).as_str() - == field_name.clone().as_str()) - { - __result.push(child); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(field_init_node_value(&child)); - } - __result - }) - .first() - .cloned() +pub fn parser_record_field_value(expr: Rc, field_name: String, si: Rc>>) -> Option> { + Rc::new({ let mut __result = Vec::new(); for child in Rc::new({ let mut __result = Vec::new(); for child in expr.children.clone().iter().cloned() { if (field_init_node_name_at(child.clone(), si.clone()).as_str() == field_name.clone().as_str()) { __result.push(child); } } __result }).iter().cloned() { __result.push(field_init_node_value(&child)); } __result }).first().cloned() } pub fn parser_expr_is_none(expr: Rc) -> bool { match (*expr.expr_data.clone()).clone() { - ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitNull => true, - _ => false, - }, - _ => false, - } + ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitNull => true, + _ => false, +}, + _ => false, +} } -pub fn parser_success_progress( - expr: &Rc, - state_param: &Rc, - env: &Rc, - parser_always_advancing: &Rc>, - consumed_true_set: &Rc>, - si: &Rc>>, -) -> DescentEvidence { +pub fn parser_success_progress(expr: &Rc, state_param: &Rc, env: &Rc, parser_always_advancing: &Rc>, consumed_true_set: &Rc>, si: &Rc>>) -> DescentEvidence { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*expr.expr_data.clone()).clone() { - ExprData::ExprReturn => parser_success_progress( - &return_value(expr.clone()), - &state_param, - &env, - &parser_always_advancing, - &consumed_true_set, - &si, - ), - ExprData::ExprVar { .. } => match v2_rt::map_get( - &env.result_sources.clone(), - expr_var_name_at(expr.clone(), si.clone()), - ) { - Some(source) => parser_result_state_progress( - source.clone(), - parser_always_advancing.clone(), - consumed_true_set.clone(), - expr_var_name_at(expr.clone(), si.clone()), - ), - None => DescentEvidence::DescentUnknown, - }, - ExprData::ExprCall { .. } => parser_result_state_progress( - parser_result_source_for_expr( - &expr, - &state_param, - env.clone(), - parser_always_advancing.clone(), - consumed_true_set.clone(), - &si, - ), - parser_always_advancing.clone(), - consumed_true_set.clone(), - "".to_string(), - ), - ExprData::ExprRecordLit { .. } => { - match parser_record_field_value(expr.clone(), "err".to_string(), si.clone()) { - Some(err_expr) => { - if parser_expr_is_none(err_expr.clone()) { - match parser_record_field_value( - expr.clone(), - "state".to_string(), - si.clone(), - ) { - Some(state_expr) => parser_state_expr_progress( - &state_expr, - &state_param, - &env, - &parser_always_advancing, - &consumed_true_set, - &si, - ), - None => DescentEvidence::DescentUnknown, - } - } else { - DescentEvidence::DescentUnknown - } - } - None => DescentEvidence::DescentUnknown, - } - } - ExprData::ExprIf => { - let cond = if_condition(expr.clone()); - let then_consumed = match parser_progress_flag_var(&cond, &si) { - Some(name) => { - v2_rt::rc_map_insert(consumed_true_set.clone(), name.clone(), true) - } - None => consumed_true_set.clone(), - }; - let then_progress = parser_success_progress( - &if_then_branch(expr.clone()), - &state_param, - &env, - &parser_always_advancing, - &then_consumed, - &si, - ); - let else_progress = match if_else_branch(expr.clone()) { - Some(eb) => parser_success_progress( - &eb, - &state_param, - &env, - &parser_always_advancing, - &consumed_true_set, - &si, - ), - None => DescentEvidence::DescentUnknown, - }; - merge_evidence(then_progress, else_progress) - } - ExprData::ExprLet => { - let next_env = parser_env_with_binding( - &let_binding_name_at(expr.clone(), si.clone()), - &let_value(expr.clone()), - &env, - &state_param, - &parser_always_advancing, - &consumed_true_set, - &si, - ); - match let_body(expr.clone()) { - Some(body) => parser_success_progress( - &body, - &state_param, - &next_env, - &parser_always_advancing, - &consumed_true_set, - &si, - ), - None => DescentEvidence::DescentUnknown, - } - } - ExprData::ExprBlock => { - let prefix = v2_rt::reverse(Rc::new( - v2_rt::reverse(expr.children.clone()) - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - )); - let acc = prefix.iter().cloned().fold( - Rc::new(ParserProgressAcc { - edges: Rc::new(vec![]), - env: env.clone(), - }), - |acc: Rc, stmt: Rc| match (*stmt.expr_data.clone()) - .clone() - { - ExprData::ExprLet => match let_body(stmt.clone()) { - None => { - let next_env = parser_env_with_binding( - &let_binding_name_at(stmt.clone(), si.clone()), - &let_value(stmt.clone()), - &acc.env.clone(), - &state_param, - &parser_always_advancing, - &consumed_true_set, - &si, - ); - Rc::new(ParserProgressAcc { - edges: acc.edges.clone(), - env: next_env.clone(), - }) - } - Some(_) => acc.clone(), - }, - _ => acc.clone(), - }, - ); - match expr.children.clone().last().cloned() { - Some(last_stmt) => parser_success_progress( - &last_stmt, - &state_param, - &acc.env.clone(), - &parser_always_advancing, - &consumed_true_set, - &si, - ), - None => DescentEvidence::DescentUnknown, - } - } - _ => DescentEvidence::DescentUnknown, - } + ExprData::ExprReturn => parser_success_progress(&return_value(expr.clone()), &state_param, &env, &parser_always_advancing, &consumed_true_set, &si), + ExprData::ExprVar { .. } => match v2_rt::map_get(&env.result_sources.clone(), expr_var_name_at(expr.clone(), si.clone())) { + Some(source) => parser_result_state_progress(source.clone(), parser_always_advancing.clone(), consumed_true_set.clone(), expr_var_name_at(expr.clone(), si.clone())), + None => DescentEvidence::DescentUnknown, +}, + ExprData::ExprCall { .. } => parser_result_state_progress(parser_result_source_for_expr(&expr, &state_param, env.clone(), parser_always_advancing.clone(), consumed_true_set.clone(), &si), parser_always_advancing.clone(), consumed_true_set.clone(), "".to_string()), + ExprData::ExprRecordLit { .. } => match parser_record_field_value(expr.clone(), "err".to_string(), si.clone()) { + Some(err_expr) => if parser_expr_is_none(err_expr.clone()) { + match parser_record_field_value(expr.clone(), "state".to_string(), si.clone()) { + Some(state_expr) => parser_state_expr_progress(&state_expr, &state_param, &env, &parser_always_advancing, &consumed_true_set, &si), + None => DescentEvidence::DescentUnknown, +} + } else { + DescentEvidence::DescentUnknown + }, + None => DescentEvidence::DescentUnknown, +}, + ExprData::ExprIf => { + let cond = if_condition(expr.clone()); +let then_consumed = match parser_progress_flag_var(&cond, &si) { + Some(name) => v2_rt::rc_map_insert(consumed_true_set.clone(), name.clone(), true), + None => consumed_true_set.clone(), +}; +let then_progress = parser_success_progress(&if_then_branch(expr.clone()), &state_param, &env, &parser_always_advancing, &then_consumed, &si); +let else_progress = match if_else_branch(expr.clone()) { + Some(eb) => parser_success_progress(&eb, &state_param, &env, &parser_always_advancing, &consumed_true_set, &si), + None => DescentEvidence::DescentUnknown, +}; +merge_evidence(then_progress, else_progress) +}, + ExprData::ExprLet => { + let next_env = parser_env_with_binding(&let_binding_name_at(expr.clone(), si.clone()), &let_value(expr.clone()), &env, &state_param, &parser_always_advancing, &consumed_true_set, &si); +match let_body(expr.clone()) { + Some(body) => parser_success_progress(&body, &state_param, &next_env, &parser_always_advancing, &consumed_true_set, &si), + None => DescentEvidence::DescentUnknown, +} +}, + ExprData::ExprBlock => { + let prefix = v2_rt::reverse(Rc::new(v2_rt::reverse(expr.children.clone()).iter().cloned().skip(1 as usize).collect::>())); +let acc = prefix.iter().cloned().fold(Rc::new(ParserProgressAcc { + edges: Rc::new(vec![]), + env: env.clone(), +}), |acc: Rc, stmt: Rc| match (*stmt.expr_data.clone()).clone() { + ExprData::ExprLet => match let_body(stmt.clone()) { + None => { + let next_env = parser_env_with_binding(&let_binding_name_at(stmt.clone(), si.clone()), &let_value(stmt.clone()), &acc.env.clone(), &state_param, &parser_always_advancing, &consumed_true_set, &si); +Rc::new(ParserProgressAcc { + edges: acc.edges.clone(), + env: next_env.clone(), +}) +}, + Some(_) => acc.clone(), +}, + _ => acc.clone(), +}); +match expr.children.clone().last().cloned() { + Some(last_stmt) => parser_success_progress(&last_stmt, &state_param, &acc.env.clone(), &parser_always_advancing, &consumed_true_set, &si), + None => DescentEvidence::DescentUnknown, +} +}, + _ => DescentEvidence::DescentUnknown, +} }) } -pub fn parser_member_is_always_advancing( - entry: &Rc, - parser_name_set: Rc>, - proven: &Rc>, - si: &Rc>>, -) -> bool { +pub fn parser_member_is_always_advancing(entry: &Rc, parser_name_set: Rc>, proven: &Rc>, si: &Rc>>) -> bool { match parser_state_param(entry.params.clone(), si.clone()) { - Some(state_param) => { - let edges = collect_parser_progress_edges( - &entry.name.clone(), - &entry.body.clone(), - &state_param, - &parser_name_set, - &empty_parser_progress_env(), - &proven, - &v2_rt::rc_empty_map::(), - &si, - ); - ({ - let mut __all = true; - for edge in edges.iter().cloned() { - if !((edge.progress.clone() == DescentEvidence::Strict) - || ((edge.progress.clone() == DescentEvidence::NonIncreasing) - && set_has(proven.clone(), edge.callee.clone()))) - { - __all = false; - break; - } - } - __all - } && (parser_success_progress( - &entry.body.clone(), - &state_param, - &empty_parser_progress_env(), - &proven, - &v2_rt::rc_empty_map::(), - &si, - ) == DescentEvidence::Strict)) - } - None => false, - } + Some(state_param) => { + let edges = collect_parser_progress_edges(&entry.name.clone(), &entry.body.clone(), &state_param, &parser_name_set, &empty_parser_progress_env(), &proven, &v2_rt::rc_empty_map::(), &si); +({ let mut __all = true; for edge in edges.iter().cloned() { if !(((edge.progress.clone() == DescentEvidence::Strict) || ((edge.progress.clone() == DescentEvidence::NonIncreasing) && set_has(proven.clone(), edge.callee.clone())))) { __all = false; break; } } __all } && (parser_success_progress(&entry.body.clone(), &state_param, &empty_parser_progress_env(), &proven, &v2_rt::rc_empty_map::(), &si) == DescentEvidence::Strict)) +}, + None => false, +} } -pub fn infer_parser_always_advancing_members_worklist( - mut queue: Rc>, - mut func_index: Rc>>, - mut parser_name_set: Rc>, - mut reverse_graph: Rc>>>, - mut proven: Rc>, - mut si: Rc>>, -) -> Rc> { +pub fn infer_parser_always_advancing_members_worklist(mut queue: Rc>, mut func_index: Rc>>, mut parser_name_set: Rc>, mut reverse_graph: Rc>>>, mut proven: Rc>, mut si: Rc>>) -> Rc> { loop { match queue.clone().first().cloned() { - Some(name) => { - let rest = Rc::new( - queue - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - if set_has(proven.clone(), name.clone()) { - { - let __tco_0 = rest; - queue = __tco_0; - continue; - } - } else { - match v2_rt::map_get(&func_index, name.clone()) { - Some(entry) => { - if parser_member_is_always_advancing( - &entry, - parser_name_set.clone(), - &proven, - &si, - ) { - let callers = match v2_rt::map_get(&reverse_graph, name.clone()) { - Some(members) => members.clone(), - None => Rc::new(vec![]), - }; - { - let __tco_0 = deduplicate(v2_rt::concat(rest, callers)); - let __tco_1 = v2_rt::rc_map_insert(proven, name.clone(), true); - queue = __tco_0; - proven = __tco_1; - continue; - } - } else { - { - let __tco_0 = rest; - queue = __tco_0; - continue; - } - } - } - None => { - let __tco_0 = rest; - queue = __tco_0; - continue; - } - } - } - } - None => { - break proven.clone(); - } - } - } + Some(name) => { let rest = Rc::new(queue.clone().iter().cloned().skip(1 as usize).collect::>()); +if set_has(proven.clone(), name.clone()) { + { + let __tco_0 = rest; +queue = __tco_0; +continue; +} +} else { + match v2_rt::map_get(&func_index, name.clone()) { + Some(entry) => { if parser_member_is_always_advancing(&entry, parser_name_set.clone(), &proven, &si) { + let callers = match v2_rt::map_get(&reverse_graph, name.clone()) { + Some(members) => members.clone(), + None => Rc::new(vec![]), +}; +{ + let __tco_0 = deduplicate(v2_rt::concat(rest, callers)); +let __tco_1 = v2_rt::rc_map_insert(proven, name.clone(), true); +queue = __tco_0; +proven = __tco_1; +continue; +} +} else { + { + let __tco_0 = rest; +queue = __tco_0; +continue; +} +} }, + None => { { + let __tco_0 = rest; +queue = __tco_0; +continue; +} }, +} +} }, + None => { break proven.clone(); }, +} +} } -pub fn infer_parser_always_advancing_members( - members: &Rc>, - func_index: &Rc>>, - si: &Rc>>, -) -> Rc> { +pub fn infer_parser_always_advancing_members(members: &Rc>, func_index: &Rc>>, si: &Rc>>) -> Rc> { { - let parser_name_set = members.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, name: String| { - v2_rt::rc_map_insert(acc, name.clone(), true) - }, - ); - let parser_entries = Rc::new({ - let mut __result = Vec::new(); - for name in members.clone().iter().cloned() { - __result.extend( - (*match v2_rt::map_get(&func_index, name.clone()) { - Some(entry) => Rc::new(vec![entry.clone()]), - None => Rc::new(vec![]), - }) - .iter() - .cloned(), - ); - } - __result - }); - let call_graph = build_call_graph(&parser_entries, si.clone()); - let reverse_graph = reverse_adjacency(members.clone(), call_graph); - infer_parser_always_advancing_members_worklist( - members.clone(), - func_index.clone(), - parser_name_set, - reverse_graph, - v2_rt::rc_empty_map::(), - si.clone(), - ) - } + let parser_name_set = members.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, name.clone(), true)); +let parser_entries = Rc::new({ let mut __result = Vec::new(); for name in members.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { + Some(entry) => Rc::new(vec![entry.clone()]), + None => Rc::new(vec![]), +}).iter().cloned()); } __result }); +let call_graph = build_call_graph(&parser_entries, si.clone()); +let reverse_graph = reverse_adjacency(members.clone(), call_graph); +infer_parser_always_advancing_members_worklist(members.clone(), func_index.clone(), parser_name_set, reverse_graph, v2_rt::rc_empty_map::(), si.clone()) +} } -pub fn parser_function_names( - func_index: &Rc>>, - si: Rc>>, -) -> Rc> { - Rc::new({ - let mut __result = Vec::new(); - for name in Rc::new(v2_rt::map_keys(&func_index)).iter().cloned() { - if match v2_rt::map_get(&func_index, name.clone()) { - Some(entry) => (parser_state_param(entry.params.clone(), si.clone()) != None), - None => false, - } { - __result.push(name); - } - } - __result - }) +pub fn parser_function_names(func_index: &Rc>>, si: Rc>>) -> Rc> { + Rc::new({ let mut __result = Vec::new(); for name in Rc::new(v2_rt::map_keys(&func_index)).iter().cloned() { if match v2_rt::map_get(&func_index, name.clone()) { + Some(entry) => (parser_state_param(entry.params.clone(), si.clone()) != None), + None => false, +} { __result.push(name); } } __result }) } -pub fn infer_all_parser_always_advancing( - func_index: &Rc>>, - si: &Rc>>, -) -> Rc> { +pub fn infer_all_parser_always_advancing(func_index: &Rc>>, si: &Rc>>) -> Rc> { { let members = parser_function_names(&func_index, si.clone()); - infer_parser_always_advancing_members(&members, &func_index, &si) - } +infer_parser_always_advancing_members(&members, &func_index, &si) +} } pub fn seed_string_map(key: String, value: String) -> Rc> { @@ -1537,1245 +786,583 @@ pub fn seed_cost_map(key: String, value: Rc) -> Rc>(), key, value) } -pub fn seed_func_entry_map( - key: String, - value: Rc, -) -> Rc>> { +pub fn seed_func_entry_map(key: String, value: Rc) -> Rc>> { v2_rt::rc_map_insert(v2_rt::rc_empty_map::>(), key, value) } -pub fn build_call_graph_from_parser_edges( - names: Rc>, - edges: Rc>>, -) -> Rc { +pub fn build_call_graph_from_parser_edges(names: Rc>, edges: Rc>>) -> Rc { Rc::new(CallGraph { - edges: Rc::new({ - let mut __result = Vec::new(); - for edge in Rc::new({ - let mut __result = Vec::new(); - for edge in edges.iter().cloned() { - if (edge.caller.clone().as_str() != edge.callee.clone().as_str()) { - __result.push(edge); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(Rc::new(GraphEdge { - caller: edge.caller.clone(), - callee: edge.callee.clone(), - })); - } - __result - }), - }) + edges: Rc::new({ let mut __result = Vec::new(); for edge in Rc::new({ let mut __result = Vec::new(); for edge in edges.iter().cloned() { if (edge.caller.clone().as_str() != edge.callee.clone().as_str()) { __result.push(edge); } } __result }).iter().cloned() { __result.push(Rc::new(GraphEdge { + caller: edge.caller.clone(), + callee: edge.callee.clone(), +})); } __result }), +}) } -pub fn same_progress_subgraph_has_cycle( - members: &Rc>, - edges: Rc>>, -) -> bool { +pub fn same_progress_subgraph_has_cycle(members: &Rc>, edges: Rc>>) -> bool { { - let same_edges = Rc::new({ - let mut __result = Vec::new(); - for edge in edges.iter().cloned() { - if (edge.progress.clone() == DescentEvidence::NonIncreasing) { - __result.push(edge); - } - } - __result - }); - let has_self_cycle = { - let mut __found = false; - for edge in same_edges.clone().iter().cloned() { - if (edge.caller.clone().as_str() == edge.callee.clone().as_str()) { - __found = true; - break; - } - } - __found - }; - if has_self_cycle { + let same_edges = Rc::new({ let mut __result = Vec::new(); for edge in edges.iter().cloned() { if (edge.progress.clone() == DescentEvidence::NonIncreasing) { __result.push(edge); } } __result }); +let has_self_cycle = { let mut __found = false; for edge in same_edges.clone().iter().cloned() { if (edge.caller.clone().as_str() == edge.callee.clone().as_str()) { __found = true; break; } } __found }; +if has_self_cycle { true } else { { - let same_cross_edges = Rc::new({ - let mut __result = Vec::new(); - for edge in same_edges.clone().iter().cloned() { - if (edge.caller.clone().as_str() != edge.callee.clone().as_str()) { - __result.push(edge); - } - } - __result - }); - let graph = build_call_graph_from_parser_edges(members.clone(), same_cross_edges); - graph_has_multi_node_scc(&members, graph) - } + let same_cross_edges = Rc::new({ let mut __result = Vec::new(); for edge in same_edges.clone().iter().cloned() { if (edge.caller.clone().as_str() != edge.callee.clone().as_str()) { __result.push(edge); } } __result }); +let graph = build_call_graph_from_parser_edges(members.clone(), same_cross_edges); +graph_has_multi_node_scc(&members, graph) +} } - } +} } -pub fn collect_parser_edges_for_scc( - members: &Rc>, - func_index: &Rc>>, - scc_name_set: Rc>, - si: &Rc>>, -) -> Rc>> { +pub fn collect_parser_edges_for_scc(members: &Rc>, func_index: &Rc>>, scc_name_set: Rc>, si: &Rc>>) -> Rc>> { { - let all_have_state = { - let mut __all = true; - for name in members.clone().iter().cloned() { - if !(match v2_rt::map_get(&func_index, name.clone()) { - Some(entry) => (parser_state_param(entry.params.clone(), si.clone()) != None), - None => false, - }) { - __all = false; - break; - } - } - __all - }; - if (all_have_state == false) { + let all_have_state = { let mut __all = true; for name in members.clone().iter().cloned() { if !(match v2_rt::map_get(&func_index, name.clone()) { + Some(entry) => (parser_state_param(entry.params.clone(), si.clone()) != None), + None => false, +}) { __all = false; break; } } __all }; +if (all_have_state == false) { Rc::new(vec![]) } else { { - let proven = infer_parser_always_advancing_members( - &parser_function_names(&func_index, si.clone()), - &func_index, - &si, - ); - let parser_always_advancing = proven; - Rc::new({ - let mut __result = Vec::new(); - for name in members.clone().iter().cloned() { - __result.extend( - (*match v2_rt::map_get(&func_index, name.clone()) { - Some(entry) => { - match parser_state_param(entry.params.clone(), si.clone()) { - Some(state_param) => collect_parser_progress_edges( - &name, - &entry.body.clone(), - &state_param, - &scc_name_set, - &empty_parser_progress_env(), - &parser_always_advancing, - &v2_rt::rc_empty_map::(), - &si, - ), - None => Rc::new(vec![]), - } - } - None => Rc::new(vec![]), - }) - .iter() - .cloned(), - ); - } - __result - }) - } + let proven = infer_parser_always_advancing_members(&parser_function_names(&func_index, si.clone()), &func_index, &si); +let parser_always_advancing = proven; +Rc::new({ let mut __result = Vec::new(); for name in members.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { + Some(entry) => match parser_state_param(entry.params.clone(), si.clone()) { + Some(state_param) => collect_parser_progress_edges(&name, &entry.body.clone(), &state_param, &scc_name_set, &empty_parser_progress_env(), &parser_always_advancing, &v2_rt::rc_empty_map::(), &si), + None => Rc::new(vec![]), +}, + None => Rc::new(vec![]), +}).iter().cloned()); } __result }) +} } - } +} } -pub fn classify_parser_scc_recursion_pattern( - members: &Rc>, - func_index: Rc>>, - si: Rc>>, -) -> Option> { +pub fn classify_parser_scc_recursion_pattern(members: &Rc>, func_index: Rc>>, si: Rc>>) -> Option> { { - let scc_name_set = members.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, name: String| { - v2_rt::rc_map_insert(acc, name.clone(), true) - }, - ); - let edges = collect_parser_edges_for_scc(&members, &func_index, scc_name_set, &si); - if ((edges.clone().len() as i64) == 0) { + let scc_name_set = members.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, name.clone(), true)); +let edges = collect_parser_edges_for_scc(&members, &func_index, scc_name_set, &si); +if ((edges.clone().len() as i64) == 0) { None } else { { - let all_known = { - let mut __all = true; - for edge in edges.clone().iter().cloned() { - if !(edge.progress.clone() != DescentEvidence::DescentUnknown) { - __all = false; - break; - } - } - __all - }; - if (all_known - && (same_progress_subgraph_has_cycle(&members, edges.clone()) == false)) - { - Some(lower_call_pattern(Rc::new( - CallPattern::ParserAdvanceCall { - witness: "parser_state".to_string(), - }, - ))) + let all_known = { let mut __all = true; for edge in edges.clone().iter().cloned() { if !((edge.progress.clone() != DescentEvidence::DescentUnknown)) { __all = false; break; } } __all }; +if (all_known && (same_progress_subgraph_has_cycle(&members, edges.clone()) == false)) { + Some(lower_call_pattern(Rc::new(CallPattern::ParserAdvanceCall { + witness: "parser_state".to_string(), +}))) } else { None } - } +} } - } +} } -pub fn count_self_calls( - body: &Rc, - func_name: &String, - si: &Rc>>, -) -> i64 { +pub fn count_self_calls(body: &Rc, func_name: &String, si: &Rc>>) -> i64 { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let own = match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { + { + let own = match (*body.expr_data.clone()).clone() { + ExprData::ExprCall { .. } => { let f = expr_call_func_at(body.clone(), si.clone()); - if (f.as_str() == func_name.clone().as_str()) { +if (f.as_str() == func_name.clone().as_str()) { 1 } else { 0 } - } - _ => 0, - }; - let from_children = body - .children - .clone() - .iter() - .cloned() - .fold(0, |acc: i64, child: Rc| { - (acc + count_self_calls(&child, &func_name, &si)) - }); - (own + from_children) +}, + _ => 0, +}; +let from_children = body.children.clone().iter().cloned().fold(0, |acc: i64, child: Rc| (acc + count_self_calls(&child, &func_name, &si))); +(own + from_children) +} }) } -pub fn max_path_self_calls( - body: Rc, - func_name: String, - si: Rc>>, -) -> i64 { +pub fn max_path_self_calls(body: Rc, func_name: String, si: Rc>>) -> i64 { max_path_self_calls_with_cont(&body, &func_name, 0, &si) } -pub fn max_path_self_calls_with_cont( - body: &Rc, - func_name: &String, - continue_calls: i64, - si: &Rc>>, -) -> i64 { +pub fn max_path_self_calls_with_cont(body: &Rc, func_name: &String, continue_calls: i64, si: &Rc>>) -> i64 { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let f = expr_call_func_at(body.clone(), si.clone()); - let own = if (f.as_str() == func_name.clone().as_str()) { - 1 - } else { - 0 - }; - let arg_calls = - body.children - .clone() - .iter() - .cloned() - .fold(0, |acc: i64, child: Rc| { - let val = arg_value(&child); - match (*val.expr_data.clone()).clone() { - ExprData::ExprLambda => { - (acc.clone() - + max_path_self_calls_with_cont( - &lambda_body(val.clone()), - &func_name, - 0, - &si, - )) - } - _ => { - (acc.clone() - + max_path_self_calls_with_cont(&val, &func_name, 0, &si)) - } - } - }); - ((own + arg_calls) + continue_calls.clone()) - } - ExprData::ExprMatch => { - let scrut_calls = max_path_self_calls_with_cont( - &match_scrutinee(body.clone()), - &func_name, - 0, - &si, - ); - let max_arm = match_arm_nodes(body.clone()).iter().cloned().fold( - continue_calls.clone(), - |acc: i64, arm_node: Rc| { - let arm_calls = max_path_self_calls_with_cont( - &arm_body(&arm_node), - &func_name, - continue_calls.clone(), - &si, - ); - if (arm_calls.clone() > acc.clone()) { - arm_calls.clone() - } else { - acc.clone() - } - }, - ); - (scrut_calls + max_arm) - } - ExprData::ExprIf => { - let cond_calls = - max_path_self_calls_with_cont(&if_condition(body.clone()), &func_name, 0, &si); - let then_calls = max_path_self_calls_with_cont( - &if_then_branch(body.clone()), - &func_name, - continue_calls.clone(), - &si, - ); - let else_calls = match if_else_branch(body.clone()) { - Some(eb) => { - max_path_self_calls_with_cont(&eb, &func_name, continue_calls.clone(), &si) - } - None => continue_calls.clone(), - }; - let branch_max = if (then_calls.clone() > else_calls.clone()) { - then_calls.clone() + ExprData::ExprCall { .. } => { + let f = expr_call_func_at(body.clone(), si.clone()); +let own = if (f.as_str() == func_name.clone().as_str()) { + 1 + } else { + 0 + }; +let arg_calls = body.children.clone().iter().cloned().fold(0, |acc: i64, child: Rc| { + let val = arg_value(&child); +match (*val.expr_data.clone()).clone() { + ExprData::ExprLambda => (acc.clone() + max_path_self_calls_with_cont(&lambda_body(val.clone()), &func_name, 0, &si)), + _ => (acc.clone() + max_path_self_calls_with_cont(&val, &func_name, 0, &si)), +} +}); +((own + arg_calls) + continue_calls.clone()) +}, + ExprData::ExprMatch => { + let scrut_calls = max_path_self_calls_with_cont(&match_scrutinee(body.clone()), &func_name, 0, &si); +let max_arm = match_arm_nodes(body.clone()).iter().cloned().fold(continue_calls.clone(), |acc: i64, arm_node: Rc| { + let arm_calls = max_path_self_calls_with_cont(&arm_body(&arm_node), &func_name, continue_calls.clone(), &si); +if (arm_calls.clone() > acc.clone()) { + arm_calls.clone() } else { - else_calls.clone() - }; - (cond_calls + branch_max) - } - ExprData::ExprForEach => { - (max_path_self_calls_with_cont( - &foreach_collection(body.clone()), - &func_name, - 0, - &si, - ) + continue_calls.clone()) - } - ExprData::ExprLet => { - let val_calls = - max_path_self_calls_with_cont(&let_value(body.clone()), &func_name, 0, &si); - let body_calls = match let_body(body.clone()) { - Some(b) => { - max_path_self_calls_with_cont(&b, &func_name, continue_calls.clone(), &si) - } - None => continue_calls.clone(), - }; - (val_calls + body_calls) - } - ExprData::ExprBlock => v2_rt::reverse(body.children.clone()).iter().cloned().fold( - continue_calls.clone(), - |acc: i64, stmt: Rc| { - max_path_self_calls_with_cont(&stmt, &func_name, acc, &si) - }, - ), - ExprData::ExprMethodCall { .. } => { - let recv_calls = max_path_self_calls_with_cont( - &method_receiver(body.clone()), - &func_name, - 0, - &si, - ); - let arg_calls = method_arg_nodes(body.clone()).iter().cloned().fold( - 0, - |acc: i64, arg_node: Rc| { - let val = arg_value(&arg_node); - match (*val.expr_data.clone()).clone() { - ExprData::ExprLambda => { - (acc.clone() - + max_path_self_calls_with_cont( - &lambda_body(val.clone()), - &func_name, - 0, - &si, - )) - } - _ => { - (acc.clone() - + max_path_self_calls_with_cont(&val, &func_name, 0, &si)) - } - } - }, - ); - ((recv_calls + arg_calls) + continue_calls.clone()) - } - ExprData::ExprReturn => { - max_path_self_calls_with_cont(&return_value(body.clone()), &func_name, 0, &si) - } - _ => { - (body - .children - .clone() - .iter() - .cloned() - .fold(0, |acc: i64, child: Rc| { - (acc + max_path_self_calls_with_cont(&child, &func_name, 0, &si)) - }) - + continue_calls.clone()) - } - } + acc.clone() + } +}); +(scrut_calls + max_arm) +}, + ExprData::ExprIf => { + let cond_calls = max_path_self_calls_with_cont(&if_condition(body.clone()), &func_name, 0, &si); +let then_calls = max_path_self_calls_with_cont(&if_then_branch(body.clone()), &func_name, continue_calls.clone(), &si); +let else_calls = match if_else_branch(body.clone()) { + Some(eb) => max_path_self_calls_with_cont(&eb, &func_name, continue_calls.clone(), &si), + None => continue_calls.clone(), +}; +let branch_max = if (then_calls.clone() > else_calls.clone()) { + then_calls.clone() + } else { + else_calls.clone() + }; +(cond_calls + branch_max) +}, + ExprData::ExprForEach => (max_path_self_calls_with_cont(&foreach_collection(body.clone()), &func_name, 0, &si) + continue_calls.clone()), + ExprData::ExprLet => { + let val_calls = max_path_self_calls_with_cont(&let_value(body.clone()), &func_name, 0, &si); +let body_calls = match let_body(body.clone()) { + Some(b) => max_path_self_calls_with_cont(&b, &func_name, continue_calls.clone(), &si), + None => continue_calls.clone(), +}; +(val_calls + body_calls) +}, + ExprData::ExprBlock => v2_rt::reverse(body.children.clone()).iter().cloned().fold(continue_calls.clone(), |acc: i64, stmt: Rc| max_path_self_calls_with_cont(&stmt, &func_name, acc, &si)), + ExprData::ExprMethodCall { .. } => { + let recv_calls = max_path_self_calls_with_cont(&method_receiver(body.clone()), &func_name, 0, &si); +let arg_calls = method_arg_nodes(body.clone()).iter().cloned().fold(0, |acc: i64, arg_node: Rc| { + let val = arg_value(&arg_node); +match (*val.expr_data.clone()).clone() { + ExprData::ExprLambda => (acc.clone() + max_path_self_calls_with_cont(&lambda_body(val.clone()), &func_name, 0, &si)), + _ => (acc.clone() + max_path_self_calls_with_cont(&val, &func_name, 0, &si)), +} +}); +((recv_calls + arg_calls) + continue_calls.clone()) +}, + ExprData::ExprReturn => max_path_self_calls_with_cont(&return_value(body.clone()), &func_name, 0, &si), + _ => (body.children.clone().iter().cloned().fold(0, |acc: i64, child: Rc| (acc + max_path_self_calls_with_cont(&child, &func_name, 0, &si))) + continue_calls.clone()), +} }) } -pub fn max_path_self_calls_block( - stmts: Rc>>, - func_name: String, - continue_calls: i64, - si: Rc>>, -) -> i64 { - v2_rt::reverse(stmts) - .iter() - .cloned() - .fold(continue_calls.clone(), |acc: i64, stmt: Rc| { - max_path_self_calls_with_cont(&stmt, &func_name, acc, &si) - }) -} - -pub fn count_target_calls( - body: &Rc, - target_set: &Rc>, - si: &Rc>>, -) -> i64 { +pub fn max_path_self_calls_block(stmts: Rc>>, func_name: String, continue_calls: i64, si: Rc>>) -> i64 { + v2_rt::reverse(stmts).iter().cloned().fold(continue_calls.clone(), |acc: i64, stmt: Rc| max_path_self_calls_with_cont(&stmt, &func_name, acc, &si)) +} + +pub fn count_target_calls(body: &Rc, target_set: &Rc>, si: &Rc>>) -> i64 { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let own = match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { + { + let own = match (*body.expr_data.clone()).clone() { + ExprData::ExprCall { .. } => { let f = expr_call_func_at(body.clone(), si.clone()); - if set_has(target_set.clone(), f) { +if set_has(target_set.clone(), f) { 1 } else { 0 } - } - _ => 0, - }; - let from_children = body - .children - .clone() - .iter() - .cloned() - .fold(0, |acc: i64, child: Rc| { - (acc + count_target_calls(&child, &target_set, &si)) - }); - (own + from_children) +}, + _ => 0, +}; +let from_children = body.children.clone().iter().cloned().fold(0, |acc: i64, child: Rc| (acc + count_target_calls(&child, &target_set, &si))); +(own + from_children) +} }) } -pub fn max_path_target_calls( - body: Rc, - target_set: Rc>, - si: Rc>>, -) -> i64 { +pub fn max_path_target_calls(body: Rc, target_set: Rc>, si: Rc>>) -> i64 { max_path_target_calls_with_cont(&body, &target_set, 0, &si) } -pub fn max_path_target_calls_with_cont( - body: &Rc, - target_set: &Rc>, - continue_calls: i64, - si: &Rc>>, -) -> i64 { +pub fn max_path_target_calls_with_cont(body: &Rc, target_set: &Rc>, continue_calls: i64, si: &Rc>>) -> i64 { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let f = expr_call_func_at(body.clone(), si.clone()); - let own = if set_has(target_set.clone(), f) { 1 } else { 0 }; - let arg_calls = - body.children - .clone() - .iter() - .cloned() - .fold(0, |acc: i64, child: Rc| { - (acc + max_path_target_calls_with_cont( - &arg_value(&child), - &target_set, - 0, - &si, - )) - }); - ((own + arg_calls) + continue_calls.clone()) - } - ExprData::ExprMatch => { - let scrut_calls = max_path_target_calls_with_cont( - &match_scrutinee(body.clone()), - &target_set, - 0, - &si, - ); - let max_arm = match_arm_nodes(body.clone()).iter().cloned().fold( - continue_calls.clone(), - |acc: i64, arm_node: Rc| { - let arm_calls = max_path_target_calls_with_cont( - &arm_body(&arm_node), - &target_set, - continue_calls.clone(), - &si, - ); - if (arm_calls.clone() > acc.clone()) { - arm_calls.clone() - } else { - acc.clone() - } - }, - ); - (scrut_calls + max_arm) - } - ExprData::ExprIf => { - let cond_calls = max_path_target_calls_with_cont( - &if_condition(body.clone()), - &target_set, - 0, - &si, - ); - let then_calls = max_path_target_calls_with_cont( - &if_then_branch(body.clone()), - &target_set, - continue_calls.clone(), - &si, - ); - let else_calls = match if_else_branch(body.clone()) { - Some(eb) => max_path_target_calls_with_cont( - &eb, - &target_set, - continue_calls.clone(), - &si, - ), - None => continue_calls.clone(), - }; - let branch_max = if (then_calls.clone() > else_calls.clone()) { - then_calls.clone() + ExprData::ExprCall { .. } => { + let f = expr_call_func_at(body.clone(), si.clone()); +let own = if set_has(target_set.clone(), f) { + 1 + } else { + 0 + }; +let arg_calls = body.children.clone().iter().cloned().fold(0, |acc: i64, child: Rc| (acc + max_path_target_calls_with_cont(&arg_value(&child), &target_set, 0, &si))); +((own + arg_calls) + continue_calls.clone()) +}, + ExprData::ExprMatch => { + let scrut_calls = max_path_target_calls_with_cont(&match_scrutinee(body.clone()), &target_set, 0, &si); +let max_arm = match_arm_nodes(body.clone()).iter().cloned().fold(continue_calls.clone(), |acc: i64, arm_node: Rc| { + let arm_calls = max_path_target_calls_with_cont(&arm_body(&arm_node), &target_set, continue_calls.clone(), &si); +if (arm_calls.clone() > acc.clone()) { + arm_calls.clone() } else { - else_calls.clone() - }; - (cond_calls + branch_max) - } - ExprData::ExprForEach => { - (max_path_target_calls_with_cont( - &foreach_collection(body.clone()), - &target_set, - 0, - &si, - ) + continue_calls.clone()) - } - ExprData::ExprLet => { - let val_calls = - max_path_target_calls_with_cont(&let_value(body.clone()), &target_set, 0, &si); - let body_calls = match let_body(body.clone()) { - Some(b) => max_path_target_calls_with_cont( - &b, - &target_set, - continue_calls.clone(), - &si, - ), - None => continue_calls.clone(), - }; - (val_calls + body_calls) - } - ExprData::ExprBlock => v2_rt::reverse(body.children.clone()).iter().cloned().fold( - continue_calls.clone(), - |acc: i64, stmt: Rc| { - max_path_target_calls_with_cont(&stmt, &target_set, acc, &si) - }, - ), - ExprData::ExprMethodCall { .. } => { - let recv_calls = max_path_target_calls_with_cont( - &method_receiver(body.clone()), - &target_set, - 0, - &si, - ); - let arg_calls = method_arg_nodes(body.clone()).iter().cloned().fold( - 0, - |acc: i64, arg_node: Rc| { - let val = arg_value(&arg_node); - match (*val.expr_data.clone()).clone() { - ExprData::ExprLambda => { - (acc.clone() - + max_path_target_calls_with_cont( - &lambda_body(val.clone()), - &target_set, - 0, - &si, - )) - } - _ => { - (acc.clone() - + max_path_target_calls_with_cont(&val, &target_set, 0, &si)) - } - } - }, - ); - ((recv_calls + arg_calls) + continue_calls.clone()) - } - ExprData::ExprReturn => { - max_path_target_calls_with_cont(&return_value(body.clone()), &target_set, 0, &si) - } - _ => body.children.clone().iter().cloned().fold( - continue_calls.clone(), - |acc: i64, child: Rc| { - (acc + max_path_target_calls_with_cont(&child, &target_set, 0, &si)) - }, - ), - } + acc.clone() + } +}); +(scrut_calls + max_arm) +}, + ExprData::ExprIf => { + let cond_calls = max_path_target_calls_with_cont(&if_condition(body.clone()), &target_set, 0, &si); +let then_calls = max_path_target_calls_with_cont(&if_then_branch(body.clone()), &target_set, continue_calls.clone(), &si); +let else_calls = match if_else_branch(body.clone()) { + Some(eb) => max_path_target_calls_with_cont(&eb, &target_set, continue_calls.clone(), &si), + None => continue_calls.clone(), +}; +let branch_max = if (then_calls.clone() > else_calls.clone()) { + then_calls.clone() + } else { + else_calls.clone() + }; +(cond_calls + branch_max) +}, + ExprData::ExprForEach => (max_path_target_calls_with_cont(&foreach_collection(body.clone()), &target_set, 0, &si) + continue_calls.clone()), + ExprData::ExprLet => { + let val_calls = max_path_target_calls_with_cont(&let_value(body.clone()), &target_set, 0, &si); +let body_calls = match let_body(body.clone()) { + Some(b) => max_path_target_calls_with_cont(&b, &target_set, continue_calls.clone(), &si), + None => continue_calls.clone(), +}; +(val_calls + body_calls) +}, + ExprData::ExprBlock => v2_rt::reverse(body.children.clone()).iter().cloned().fold(continue_calls.clone(), |acc: i64, stmt: Rc| max_path_target_calls_with_cont(&stmt, &target_set, acc, &si)), + ExprData::ExprMethodCall { .. } => { + let recv_calls = max_path_target_calls_with_cont(&method_receiver(body.clone()), &target_set, 0, &si); +let arg_calls = method_arg_nodes(body.clone()).iter().cloned().fold(0, |acc: i64, arg_node: Rc| { + let val = arg_value(&arg_node); +match (*val.expr_data.clone()).clone() { + ExprData::ExprLambda => (acc.clone() + max_path_target_calls_with_cont(&lambda_body(val.clone()), &target_set, 0, &si)), + _ => (acc.clone() + max_path_target_calls_with_cont(&val, &target_set, 0, &si)), +} +}); +((recv_calls + arg_calls) + continue_calls.clone()) +}, + ExprData::ExprReturn => max_path_target_calls_with_cont(&return_value(body.clone()), &target_set, 0, &si), + _ => body.children.clone().iter().cloned().fold(continue_calls.clone(), |acc: i64, child: Rc| (acc + max_path_target_calls_with_cont(&child, &target_set, 0, &si))), +} }) } -pub fn build_scc_measure_params( - members: Rc>, - func_index: Rc>>, - si: Rc>>, -) -> Rc>>> { - members.iter().cloned().fold( - v2_rt::rc_empty_map::>>(), - |acc: Rc>>>, name: String| match v2_rt::map_get( - &func_index, - name.clone(), - ) { - Some(entry) => v2_rt::rc_map_insert( - acc.clone(), - name.clone(), - recursive_measure_param_names(&entry.body.clone(), &entry.params.clone(), &si), - ), - None => acc.clone(), - }, - ) +pub fn build_scc_measure_params(members: Rc>, func_index: Rc>>, si: Rc>>) -> Rc>>> { + members.iter().cloned().fold(v2_rt::rc_empty_map::>>(), |acc: Rc>>>, name: String| match v2_rt::map_get(&func_index, name.clone()) { + Some(entry) => v2_rt::rc_map_insert(acc.clone(), name.clone(), recursive_measure_param_names(&entry.body.clone(), &entry.params.clone(), &si)), + None => acc.clone(), +}) } -pub fn target_call_has_arithmetic_descent( - call_node: &Rc, - target_set: &Rc>, - func_index: Rc>>, - scc_measure_params: Rc>>>, - si: &Rc>>, -) -> bool { +pub fn target_call_has_arithmetic_descent(call_node: &Rc, target_set: &Rc>, func_index: Rc>>, scc_measure_params: Rc>>>, si: &Rc>>) -> bool { { let callee = expr_call_func_at(call_node.clone(), si.clone()); - if (set_has(target_set.clone(), callee.clone()) == false) { +if (set_has(target_set.clone(), callee.clone()) == false) { true } else { match v2_rt::map_get(&func_index, callee.clone()) { - Some(callee_entry) => { - let callee_measure_params = - match v2_rt::map_get(&scc_measure_params, callee.clone()) { - Some(params) => params.clone(), - None => v2_rt::rc_empty_map::(), - }; - { - let mut __found = false; - for pair in Rc::new( - call_node - .children - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - if { - let arg_expr = arg_value(&pair.1.clone()); - (((max_path_target_calls( - arg_expr.clone(), - target_set.clone(), - si.clone(), - ) == 0) - && is_descending_expr(&arg_expr)) - && match recursive_param_name_for_arg( - pair.0.clone(), - pair.1.clone(), - callee_entry.params.clone(), - &si, - ) { - Some(param_name) => { - (v2_rt::map_get( - &callee_measure_params, - param_name.clone(), - ) != None) - } - None => false, - }) - } { - __found = true; - break; - } - } - __found - } - } - None => false, - } + Some(callee_entry) => { + let callee_measure_params = match v2_rt::map_get(&scc_measure_params, callee.clone()) { + Some(params) => params.clone(), + None => v2_rt::rc_empty_map::(), +}; +{ let mut __found = false; for pair in Rc::new(call_node.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if { + let arg_expr = arg_value(&pair.1.clone()); +(((max_path_target_calls(arg_expr.clone(), target_set.clone(), si.clone()) == 0) && is_descending_expr(&arg_expr)) && match recursive_param_name_for_arg(pair.0.clone(), pair.1.clone(), callee_entry.params.clone(), &si) { + Some(param_name) => (v2_rt::map_get(&callee_measure_params, param_name.clone()) != None), + None => false, +}) +} { __found = true; break; } } __found } +}, + None => false, +} } - } +} } -pub fn scc_calls_have_arithmetic_descent( - body: &Rc, - target_set: &Rc>, - func_index: &Rc>>, - scc_measure_params: &Rc>>>, - si: &Rc>>, -) -> bool { +pub fn scc_calls_have_arithmetic_descent(body: &Rc, target_set: &Rc>, func_index: &Rc>>, scc_measure_params: &Rc>>>, si: &Rc>>) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - (target_call_has_arithmetic_descent( - &body, - &target_set, - func_index.clone(), - scc_measure_params.clone(), - &si, - ) && { - let mut __all = true; - for child in body.children.clone().iter().cloned() { - if !(scc_calls_have_arithmetic_descent( - &child, - &target_set, - &func_index, - &scc_measure_params, - &si, - )) { - __all = false; - break; - } - } - __all - }) - } - _ => { - let mut __all = true; - for child in body.children.clone().iter().cloned() { - if !(scc_calls_have_arithmetic_descent( - &child, - &target_set, - &func_index, - &scc_measure_params, - &si, - )) { - __all = false; - break; - } - } - __all - } - } + ExprData::ExprCall { .. } => (target_call_has_arithmetic_descent(&body, &target_set, func_index.clone(), scc_measure_params.clone(), &si) && { let mut __all = true; for child in body.children.clone().iter().cloned() { if !(scc_calls_have_arithmetic_descent(&child, &target_set, &func_index, &scc_measure_params, &si)) { __all = false; break; } } __all }), + _ => { let mut __all = true; for child in body.children.clone().iter().cloned() { if !(scc_calls_have_arithmetic_descent(&child, &target_set, &func_index, &scc_measure_params, &si)) { __all = false; break; } } __all }, +} }) } -pub fn descending_name_set_without_key( - names: &Rc>, - key: String, -) -> Rc> { - Rc::new(v2_rt::map_keys(&names)).iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, name: String| { - if (name.clone().as_str() == key.clone().as_str()) { - acc.clone() - } else { - match v2_rt::map_get(&names, name.clone()) { - Some(source) => v2_rt::rc_map_insert(acc.clone(), name.clone(), source.clone()), - None => acc.clone(), - } - } - }, - ) +pub fn descending_name_set_without_key(names: &Rc>, key: String) -> Rc> { + Rc::new(v2_rt::map_keys(&names)).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| if (name.clone().as_str() == key.clone().as_str()) { + acc.clone() + } else { + match v2_rt::map_get(&names, name.clone()) { + Some(source) => v2_rt::rc_map_insert(acc.clone(), name.clone(), source.clone()), + None => acc.clone(), +} + }) } -pub fn expr_descending_witness_source( - mut expr: Rc, - mut descending_witness_names: Rc>, - mut si: Rc>>, -) -> Option { +pub fn expr_descending_witness_source(mut expr: Rc, mut descending_witness_names: Rc>, mut si: Rc>>) -> Option { loop { match (*expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - break v2_rt::map_get( - &descending_witness_names, - expr_var_name_at(expr.clone(), si), - ); - } - ExprData::ExprBinOp { op, .. } => match op.clone() { - BinOp::Sub => { - let __tco_0 = binop_left(expr); - expr = __tco_0; - continue; - } - BinOp::Div => { - let __tco_0 = binop_left(expr); - expr = __tco_0; - continue; - } - _ => { - break None; - } - }, - _ => { - break None; - } - } - } -} - -pub fn condition_param_names( - expr: &Rc, - param_set: Rc>, - si: Rc>>, -) -> Rc> { + ExprData::ExprVar { .. } => { break v2_rt::map_get(&descending_witness_names, expr_var_name_at(expr.clone(), si)); }, + ExprData::ExprBinOp { op, .. } => { match op.clone() { + BinOp::Sub => { { + let __tco_0 = binop_left(expr); +expr = __tco_0; +continue; +} }, + BinOp::Div => { { + let __tco_0 = binop_left(expr); +expr = __tco_0; +continue; +} }, + _ => { break None; }, +} }, + _ => { break None; }, +} +} +} + +pub fn condition_param_names(expr: &Rc, param_set: Rc>, si: Rc>>) -> Rc> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let name = expr_var_name_at(expr.clone(), si.clone()); - match v2_rt::map_get(¶m_set, name.clone()) { - Some(_) => seed_string_map(name.clone(), name.clone()), - None => v2_rt::rc_empty_map::(), - } - } - _ => expr.children.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, child: Rc| { - v2_rt::rc_map_merge( - acc, - condition_param_names(&child, param_set.clone(), si.clone()), - ) - }, - ), - } + ExprData::ExprVar { .. } => { + let name = expr_var_name_at(expr.clone(), si.clone()); +match v2_rt::map_get(¶m_set, name.clone()) { + Some(_) => seed_string_map(name.clone(), name.clone()), + None => v2_rt::rc_empty_map::(), +} +}, + _ => expr.children.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, child: Rc| v2_rt::rc_map_merge(acc, condition_param_names(&child, param_set.clone(), si.clone()))), +} }) } -pub fn recursive_measure_param_names( - body: &Rc, - params: &Rc>>, - si: &Rc>>, -) -> Rc> { +pub fn recursive_measure_param_names(body: &Rc, params: &Rc>>, si: &Rc>>) -> Rc> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let param_set = params.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, param: Rc| { - v2_rt::rc_map_insert( - acc, - param_node_name_at(param.clone(), si.clone()), - param_node_name_at(param.clone(), si.clone()), - ) - }, - ); - match (*body.expr_data.clone()).clone() { - ExprData::ExprIf => { - let then_names = - recursive_measure_param_names(&if_then_branch(body.clone()), ¶ms, &si); - let else_names = match if_else_branch(body.clone()) { - Some(eb) => recursive_measure_param_names(&eb, ¶ms, &si), - None => v2_rt::rc_empty_map::(), - }; - v2_rt::rc_map_merge( - v2_rt::rc_map_merge( - condition_param_names(&if_condition(body.clone()), param_set, si.clone()), - then_names, - ), - else_names, - ) - } - ExprData::ExprMatch => { - let scrut_names = - condition_param_names(&match_scrutinee(body.clone()), param_set, si.clone()); - let arm_names = match_arm_nodes(body.clone()).iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, arm_node: Rc| { - v2_rt::rc_map_merge( - acc, - recursive_measure_param_names(&arm_body(&arm_node), ¶ms, &si), - ) - }, - ); - v2_rt::rc_map_merge(scrut_names, arm_names) - } - ExprData::ExprLet => match let_body(body.clone()) { - Some(b) => recursive_measure_param_names(&b, ¶ms, &si), - None => v2_rt::rc_empty_map::(), - }, - ExprData::ExprBlock => body.children.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, stmt: Rc| { - v2_rt::rc_map_merge(acc, recursive_measure_param_names(&stmt, ¶ms, &si)) - }, - ), - _ => body.children.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, child: Rc| { - v2_rt::rc_map_merge(acc, recursive_measure_param_names(&child, ¶ms, &si)) - }, - ), - } + { + let param_set = params.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, param: Rc| v2_rt::rc_map_insert(acc, param_node_name_at(param.clone(), si.clone()), param_node_name_at(param.clone(), si.clone()))); +match (*body.expr_data.clone()).clone() { + ExprData::ExprIf => { + let then_names = recursive_measure_param_names(&if_then_branch(body.clone()), ¶ms, &si); +let else_names = match if_else_branch(body.clone()) { + Some(eb) => recursive_measure_param_names(&eb, ¶ms, &si), + None => v2_rt::rc_empty_map::(), +}; +v2_rt::rc_map_merge(v2_rt::rc_map_merge(condition_param_names(&if_condition(body.clone()), param_set, si.clone()), then_names), else_names) +}, + ExprData::ExprMatch => { + let scrut_names = condition_param_names(&match_scrutinee(body.clone()), param_set, si.clone()); +let arm_names = match_arm_nodes(body.clone()).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, arm_node: Rc| v2_rt::rc_map_merge(acc, recursive_measure_param_names(&arm_body(&arm_node), ¶ms, &si))); +v2_rt::rc_map_merge(scrut_names, arm_names) +}, + ExprData::ExprLet => match let_body(body.clone()) { + Some(b) => recursive_measure_param_names(&b, ¶ms, &si), + None => v2_rt::rc_empty_map::(), +}, + ExprData::ExprBlock => body.children.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, stmt: Rc| v2_rt::rc_map_merge(acc, recursive_measure_param_names(&stmt, ¶ms, &si))), + _ => body.children.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, child: Rc| v2_rt::rc_map_merge(acc, recursive_measure_param_names(&child, ¶ms, &si))), +} +} }) } -pub fn recursive_param_name_for_arg( - idx: i64, - arg_node: Rc, - params: Rc>>, - si: &Rc>>, -) -> Option { +pub fn recursive_param_name_for_arg(idx: i64, arg_node: Rc, params: Rc>>, si: &Rc>>) -> Option { match arg_name_at(arg_node, si.clone()) { - Some(name) => Some(name.clone()), - None => Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - params - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - if (pair.0.clone() == idx.clone()) { - __result.push(pair); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(param_node_name_at(pair.1.clone(), si.clone())); - } - __result - }) - .first() - .cloned(), - } + Some(name) => Some(name.clone()), + None => Rc::new({ let mut __result = Vec::new(); for pair in Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(params.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (pair.0.clone() == idx.clone()) { __result.push(pair); } } __result }).iter().cloned() { __result.push(param_node_name_at(pair.1.clone(), si.clone())); } __result }).first().cloned(), +} } pub fn is_descending_expr(expr: &Rc) -> bool { match (*expr.expr_data.clone()).clone() { - ExprData::ExprBinOp { op, .. } => match op.clone() { - BinOp::Sub => match (*binop_left(expr.clone()).expr_data.clone()).clone() { - ExprData::ExprVar { .. } => true, - _ => false, - }, - BinOp::Div => match (*binop_left(expr.clone()).expr_data.clone()).clone() { - ExprData::ExprVar { .. } => true, - _ => false, - }, - _ => false, - }, - _ => false, - } + ExprData::ExprBinOp { op, .. } => match op.clone() { + BinOp::Sub => match (*binop_left(expr.clone()).expr_data.clone()).clone() { + ExprData::ExprVar { .. } => true, + _ => false, +}, + BinOp::Div => match (*binop_left(expr.clone()).expr_data.clone()).clone() { + ExprData::ExprVar { .. } => true, + _ => false, +}, + _ => false, +}, + _ => false, +} } -pub fn has_arithmetic_descent( - body: &Rc, - func_name: &String, - si: &Rc>>, -) -> bool { +pub fn has_arithmetic_descent(body: &Rc, func_name: &String, si: &Rc>>) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let own_ok = if (expr_call_func_at(body.clone(), si.clone()).as_str() - == func_name.clone().as_str()) - { - { - let mut __found = false; - for arg_node in body.children.clone().iter().cloned() { - if is_descending_expr(&arg_value(&arg_node)) { - __found = true; - break; - } - } - __found - } - } else { - false - }; - if own_ok { - true - } else { - { - let mut __found = false; - for c in body.children.clone().iter().cloned() { - if has_arithmetic_descent(&c, &func_name, &si) { - __found = true; - break; - } - } - __found - } - } - } - _ => { - let mut __found = false; - for c in body.children.clone().iter().cloned() { - if has_arithmetic_descent(&c, &func_name, &si) { - __found = true; - break; - } - } - __found + ExprData::ExprCall { .. } => { + let own_ok = if (expr_call_func_at(body.clone(), si.clone()).as_str() == func_name.clone().as_str()) { + { let mut __found = false; for arg_node in body.children.clone().iter().cloned() { if is_descending_expr(&arg_value(&arg_node)) { __found = true; break; } } __found } + } else { + false + }; +if own_ok { + true + } else { + { let mut __found = false; for c in body.children.clone().iter().cloned() { if has_arithmetic_descent(&c, &func_name, &si) { __found = true; break; } } __found } } - } +}, + _ => { let mut __found = false; for c in body.children.clone().iter().cloned() { if has_arithmetic_descent(&c, &func_name, &si) { __found = true; break; } } __found }, +} }) } -pub fn is_accessor_of_param( - expr: &Rc, - param_name: String, - vars: Rc>, - si: &Rc>>, -) -> bool { +pub fn is_accessor_of_param(expr: &Rc, param_name: String, vars: Rc>, si: &Rc>>) -> bool { match (*expr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let callee = expr_call_func_at(expr.clone(), si.clone()); - (is_child_accessor_in_model(callee) && { - let mut __found = false; - for arg_node in expr.children.clone().iter().cloned() { - if match (*arg_value(&arg_node).expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let vname = expr_var_name_at(arg_value(&arg_node), si.clone()); - ((vname.clone().as_str() == param_name.clone().as_str()) - || set_has(vars.clone(), vname.clone())) - } - _ => false, - } { - __found = true; - break; - } - } - __found - }) - } - _ => false, - } + ExprData::ExprCall { .. } => { + let callee = expr_call_func_at(expr.clone(), si.clone()); +(is_child_accessor_in_model(callee) && { let mut __found = false; for arg_node in expr.children.clone().iter().cloned() { if match (*arg_value(&arg_node).expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let vname = expr_var_name_at(arg_value(&arg_node), si.clone()); +((vname.clone().as_str() == param_name.clone().as_str()) || set_has(vars.clone(), vname.clone())) +}, + _ => false, +} { __found = true; break; } } __found }) +}, + _ => false, +} } -pub fn is_children_of_param( - mut expr: Rc, - mut param_name: String, - mut vars: Rc>, - mut si: Rc>>, -) -> bool { +pub fn is_children_of_param(mut expr: Rc, mut param_name: String, mut vars: Rc>, mut si: Rc>>) -> bool { loop { match (*expr.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(expr.clone()); - let field = field_access_field_at(expr.clone(), si.clone()); - break (is_children_list_field(field) - && match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - (expr_var_name_at(base.clone(), si.clone()).as_str() - == param_name.as_str()) - } - _ => false, - }); - } - ExprData::ExprVar { .. } => { - break set_has(vars, expr_var_name_at(expr.clone(), si.clone())); - } - ExprData::ExprMethodCall { - method_semantics: ms, - .. - } => match method_size_effect(ms.clone()) { - Some(CollectionSizeEffect::ShrinkEffect) => { - let __tco_0 = method_receiver(expr); - expr = __tco_0; - continue; - } - _ => { - break false; - } - }, - _ => { - break false; - } - } - } + ExprData::ExprFieldAccess { .. } => { let base = field_access_base(expr.clone()); +let field = field_access_field_at(expr.clone(), si.clone()); +break (is_children_list_field(field) && match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => (expr_var_name_at(base.clone(), si.clone()).as_str() == param_name.as_str()), + _ => false, +}); }, + ExprData::ExprVar { .. } => { break set_has(vars, expr_var_name_at(expr.clone(), si.clone())); }, + ExprData::ExprMethodCall { method_semantics: ms, .. } => { match method_size_effect(ms.clone()) { + Some(CollectionSizeEffect::ShrinkEffect) => { { + let __tco_0 = method_receiver(expr); +expr = __tco_0; +continue; +} }, + _ => { break false; }, +} }, + _ => { break false; }, +} +} } -pub fn is_structural_children( - expr: &Rc, - param_name: &String, - vars: &Rc>, - si: &Rc>>, -) -> bool { +pub fn is_structural_children(expr: &Rc, param_name: &String, vars: &Rc>, si: &Rc>>) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - (is_children_of_param(expr.clone(), param_name.clone(), vars.clone(), si.clone()) - || match (*expr.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(expr.clone()); - let field = field_access_field_at(expr.clone(), si.clone()); - (is_children_list_field(field) - && match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - set_has(vars.clone(), expr_var_name_at(base.clone(), si.clone())) - } - _ => false, - }) - } - ExprData::ExprMethodCall { - method_semantics: ms, - .. - } => match method_size_effect(ms.clone()) { - Some(CollectionSizeEffect::ShrinkEffect) => is_structural_children( - &method_receiver(expr.clone()), - ¶m_name, - &vars, - &si, - ), - Some(CollectionSizeEffect::IdentityEffect) => is_structural_children( - &method_receiver(expr.clone()), - ¶m_name, - &vars, - &si, - ), - _ => false, - }, - _ => false, - }) + (is_children_of_param(expr.clone(), param_name.clone(), vars.clone(), si.clone()) || match (*expr.expr_data.clone()).clone() { + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(expr.clone()); +let field = field_access_field_at(expr.clone(), si.clone()); +(is_children_list_field(field) && match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(base.clone(), si.clone())), + _ => false, +}) +}, + ExprData::ExprMethodCall { method_semantics: ms, .. } => match method_size_effect(ms.clone()) { + Some(CollectionSizeEffect::ShrinkEffect) => is_structural_children(&method_receiver(expr.clone()), ¶m_name, &vars, &si), + Some(CollectionSizeEffect::IdentityEffect) => is_structural_children(&method_receiver(expr.clone()), ¶m_name, &vars, &si), + _ => false, +}, + _ => false, +}) }) } -pub fn is_child_descent_expr( - expr: &Rc, - param_name: &String, - vars: &Rc>, - si: &Rc>>, -) -> bool { +pub fn is_child_descent_expr(expr: &Rc, param_name: &String, vars: &Rc>, si: &Rc>>) -> bool { if is_accessor_of_param(&expr, param_name.clone(), vars.clone(), &si) { true } else { match (*expr.expr_data.clone()).clone() { - ExprData::ExprMethodCall { - method_semantics: ms, - .. - } => match method_size_effect(ms.clone()) { - Some(CollectionSizeEffect::ProjectionEffect) => is_children_of_param( - method_receiver(expr.clone()), - param_name.clone(), - vars.clone(), - si.clone(), - ), - _ => false, - }, - _ => false, - } + ExprData::ExprMethodCall { method_semantics: ms, .. } => match method_size_effect(ms.clone()) { + Some(CollectionSizeEffect::ProjectionEffect) => is_children_of_param(method_receiver(expr.clone()), param_name.clone(), vars.clone(), si.clone()), + _ => false, +}, + _ => false, +} } } -pub fn is_tree_size_preserving_wrapper( - expr: &Rc, - si: Rc>>, -) -> bool { +pub fn is_tree_size_preserving_wrapper(expr: &Rc, si: Rc>>) -> bool { match (*expr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let callee = expr_call_func_at(expr.clone(), si); - is_tree_size_preserving(callee) - } - _ => false, - } + ExprData::ExprCall { .. } => { + let callee = expr_call_func_at(expr.clone(), si); +is_tree_size_preserving(callee) +}, + _ => false, +} } pub fn wrapper_inner_arg(expr: Rc) -> Rc { match expr.children.clone().first().cloned() { - Some(arg_node) => arg_value(&arg_node), - None => expr.clone(), - } + Some(arg_node) => arg_value(&arg_node), + None => expr.clone(), +} } pub fn is_sub_value_extractor(expr: &Rc, si: Rc>>) -> bool { match (*expr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let callee = expr_call_func_at(expr.clone(), si); - is_tree_size_reducing(callee) - } - _ => false, - } + ExprData::ExprCall { .. } => { + let callee = expr_call_func_at(expr.clone(), si); +is_tree_size_reducing(callee) +}, + _ => false, +} } pub fn extractor_inner_arg(expr: Rc) -> Rc { match expr.children.clone().first().cloned() { - Some(arg_node) => arg_value(&arg_node), - None => expr.clone(), - } + Some(arg_node) => arg_value(&arg_node), + None => expr.clone(), +} } -pub fn is_list_shrink_expr( - expr: &Rc, - param_name: String, - si: Rc>>, -) -> bool { +pub fn is_list_shrink_expr(expr: &Rc, param_name: String, si: Rc>>) -> bool { match (*expr.expr_data.clone()).clone() { - ExprData::ExprMethodCall { - method_semantics: ms, - .. - } => { - let is_shrink = match method_size_effect(ms.clone()) { - Some(CollectionSizeEffect::ShrinkEffect) => true, - _ => false, - }; - ((is_shrink - && match (*method_receiver(expr.clone()).expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - (expr_var_name_at(method_receiver(expr.clone()), si).as_str() - == param_name.as_str()) - } - _ => false, - }) - && match method_arg_nodes(expr.clone()).first().cloned() { - Some(arg_node) => match (*arg_value(&arg_node).expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitInt { value: n, .. } = value.as_ref() else { - unreachable!() - }; - (n.clone() > 0) - } - _ => false, - }, - None => false, - }) - } - _ => false, - } + ExprData::ExprMethodCall { method_semantics: ms, .. } => { + let is_shrink = match method_size_effect(ms.clone()) { + Some(CollectionSizeEffect::ShrinkEffect) => true, + _ => false, +}; +((is_shrink && match (*method_receiver(expr.clone()).expr_data.clone()).clone() { + ExprData::ExprVar { .. } => (expr_var_name_at(method_receiver(expr.clone()), si).as_str() == param_name.as_str()), + _ => false, +}) && match method_arg_nodes(expr.clone()).first().cloned() { + Some(arg_node) => match (*arg_value(&arg_node).expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: n, .. } = value.as_ref() else { unreachable!() }; (n.clone() > 0) }, + _ => false, +}, + None => false, +}) +}, + _ => false, +} } pub fn is_generalized_shrink(expr: &Rc, si: Rc>>) -> bool { match (*expr.expr_data.clone()).clone() { - ExprData::ExprMethodCall { - method_semantics: ms, - .. - } => { - let is_shrink = match method_size_effect(ms.clone()) { - Some(CollectionSizeEffect::ShrinkEffect) => true, - _ => false, - }; - (is_shrink - && match method_arg_nodes(expr.clone()).first().cloned() { - Some(arg_node) => match (*arg_value(&arg_node).expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitInt { value: n, .. } = value.as_ref() else { - unreachable!() - }; - (n.clone() > 0) - } - _ => false, - }, - None => false, - }) - } - _ => false, - } + ExprData::ExprMethodCall { method_semantics: ms, .. } => { + let is_shrink = match method_size_effect(ms.clone()) { + Some(CollectionSizeEffect::ShrinkEffect) => true, + _ => false, +}; +(is_shrink && match method_arg_nodes(expr.clone()).first().cloned() { + Some(arg_node) => match (*arg_value(&arg_node).expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: n, .. } = value.as_ref() else { unreachable!() }; (n.clone() > 0) }, + _ => false, +}, + None => false, +}) +}, + _ => false, +} } -pub fn list_passthrough_inner( - expr: Rc, - si: Rc>>, -) -> Option> { +pub fn list_passthrough_inner(expr: Rc, si: Rc>>) -> Option> { parser_passthrough_state_expr(&expr, &si) } @@ -2783,2780 +1370,1357 @@ pub fn is_list_passthrough_call(expr: Rc, si: Rc, - si: Rc>>, -) -> Option> { +pub fn list_passthrough_inner_arg(expr: Rc, si: Rc>>) -> Option> { list_passthrough_inner(expr, si) } -pub fn is_tokens_consuming_call( - expr: &Rc, - param_name: String, - vars: Rc>, - si: &Rc>>, -) -> bool { +pub fn is_tokens_consuming_call(expr: &Rc, param_name: String, vars: Rc>, si: &Rc>>) -> bool { match (*expr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => match consuming_tokens_arg(expr.clone(), si.clone()) { - Some(tokens_arg) => { - is_tokens_input_expr(tokens_arg.clone(), param_name, vars, si.clone()) - } - None => false, - }, - _ => false, - } + ExprData::ExprCall { .. } => match consuming_tokens_arg(expr.clone(), si.clone()) { + Some(tokens_arg) => is_tokens_input_expr(tokens_arg.clone(), param_name, vars, si.clone()), + None => false, +}, + _ => false, +} } -pub fn consuming_tokens_arg( - expr: Rc, - si: Rc>>, -) -> Option> { - expr.children - .clone() - .iter() - .cloned() - .fold(None, |acc: _, child: Rc| match acc.clone() { - Some(_) => acc.clone(), - None => match arg_name_at(child.clone(), si.clone()) { - Some(name) => { - if (name.clone().as_str() == "tokens".to_string().as_str()) { - Some(arg_value(&child)) - } else { - None - } - } - None => None, - }, - }) +pub fn consuming_tokens_arg(expr: Rc, si: Rc>>) -> Option> { + expr.children.clone().iter().cloned().fold(None, |acc: _, child: Rc| match acc.clone() { + Some(_) => acc.clone(), + None => match arg_name_at(child.clone(), si.clone()) { + Some(name) => if (name.clone().as_str() == "tokens".to_string().as_str()) { + Some(arg_value(&child)) + } else { + None + }, + None => None, +}, +}) } -pub fn is_tokens_input_expr( - mut expr: Rc, - mut param_name: String, - mut vars: Rc>, - mut si: Rc>>, -) -> bool { +pub fn is_tokens_input_expr(mut expr: Rc, mut param_name: String, mut vars: Rc>, mut si: Rc>>) -> bool { loop { match (*expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let vname = expr_var_name_at(expr.clone(), si.clone()); - break ((vname.clone().as_str() == param_name.clone().as_str()) - || set_has(vars, vname.clone())); - } - ExprData::ExprFieldAccess { .. } => { - let field = field_access_field_at(expr.clone(), si.clone()); - if (field.as_str() == param_name.clone().as_str()) { - break true; - } else { - let base = field_access_base(expr.clone()); - match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at(base.clone(), si.clone()); - break ((bname.clone().as_str() == param_name.clone().as_str()) - || set_has(vars, bname.clone())); - } - _ => { - break false; - } - } - } - } - ExprData::ExprMethodCall { - method_semantics: ms, - .. - } => match method_size_effect(ms.clone()) { - Some(CollectionSizeEffect::ShrinkEffect) => { - let __tco_0 = method_receiver(expr); - expr = __tco_0; - continue; - } - _ => { - break false; - } - }, - ExprData::ExprCall { .. } => { - if is_list_passthrough_call(expr.clone(), si.clone()) { - match list_passthrough_inner_arg(expr.clone(), si.clone()) { - Some(inner) => { - let __tco_0 = inner.clone(); - expr = __tco_0; - continue; - } - None => { - break false; - } - } - } else { - match consuming_tokens_arg(expr.clone(), si.clone()) { - Some(tokens_arg) => { - let __tco_0 = tokens_arg.clone(); - expr = __tco_0; - continue; - } - None => { - break false; - } - } - } - } - _ => { - break false; - } - } - } -} - -pub fn is_descent_arg( - expr: &Rc, - param_name: &String, - descent_vars: Rc>, - check_child: bool, - check_list: bool, - si: &Rc>>, -) -> bool { + ExprData::ExprVar { .. } => { let vname = expr_var_name_at(expr.clone(), si.clone()); +break ((vname.clone().as_str() == param_name.clone().as_str()) || set_has(vars, vname.clone())); }, + ExprData::ExprFieldAccess { .. } => { let field = field_access_field_at(expr.clone(), si.clone()); +if (field.as_str() == param_name.clone().as_str()) { + break true; +} else { + let base = field_access_base(expr.clone()); +match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { let bname = expr_var_name_at(base.clone(), si.clone()); +break ((bname.clone().as_str() == param_name.clone().as_str()) || set_has(vars, bname.clone())); }, + _ => { break false; }, +} +} }, + ExprData::ExprMethodCall { method_semantics: ms, .. } => { match method_size_effect(ms.clone()) { + Some(CollectionSizeEffect::ShrinkEffect) => { { + let __tco_0 = method_receiver(expr); +expr = __tco_0; +continue; +} }, + _ => { break false; }, +} }, + ExprData::ExprCall { .. } => { if is_list_passthrough_call(expr.clone(), si.clone()) { + match list_passthrough_inner_arg(expr.clone(), si.clone()) { + Some(inner) => { { + let __tco_0 = inner.clone(); +expr = __tco_0; +continue; +} }, + None => { break false; }, +} +} else { + match consuming_tokens_arg(expr.clone(), si.clone()) { + Some(tokens_arg) => { { + let __tco_0 = tokens_arg.clone(); +expr = __tco_0; +continue; +} }, + None => { break false; }, +} +} }, + _ => { break false; }, +} +} +} + +pub fn is_descent_arg(expr: &Rc, param_name: &String, descent_vars: Rc>, check_child: bool, check_list: bool, si: &Rc>>) -> bool { match (*expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let vname = expr_var_name_at(expr.clone(), si.clone()); - set_has(descent_vars, vname) - } - _ => { - ((check_child && is_child_descent_expr(&expr, ¶m_name, &descent_vars, &si)) - || (check_list && is_list_shrink_expr(&expr, param_name.clone(), si.clone()))) - } - } + ExprData::ExprVar { .. } => { + let vname = expr_var_name_at(expr.clone(), si.clone()); +set_has(descent_vars, vname) +}, + _ => ((check_child && is_child_descent_expr(&expr, ¶m_name, &descent_vars, &si)) || (check_list && is_list_shrink_expr(&expr, param_name.clone(), si.clone()))), +} } -pub fn expr_contains_descent( - expr: &Rc, - param_name: &String, - vars: &Rc>, - check_child: bool, - check_list: bool, - si: &Rc>>, -) -> bool { +pub fn expr_contains_descent(expr: &Rc, param_name: &String, vars: &Rc>, check_child: bool, check_list: bool, si: &Rc>>) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - if ((check_child.clone() && is_child_descent_expr(&expr, ¶m_name, &vars, &si)) - || (check_list.clone() && is_list_shrink_expr(&expr, param_name.clone(), si.clone()))) - { + if ((check_child.clone() && is_child_descent_expr(&expr, ¶m_name, &vars, &si)) || (check_list.clone() && is_list_shrink_expr(&expr, param_name.clone(), si.clone()))) { true } else { match (*expr.expr_data.clone()).clone() { - ExprData::ExprIf => { - (expr_contains_descent( - &if_then_branch(expr.clone()), - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - ) && match if_else_branch(expr.clone()) { - Some(eb) => expr_contains_descent( - &eb, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - ), - None => false, - }) - } - ExprData::ExprBlock => match expr.children.clone().last().cloned() { - Some(last_stmt) => expr_contains_descent( - &last_stmt, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - ), - None => false, - }, - ExprData::ExprVar { .. } => { - set_has(vars.clone(), expr_var_name_at(expr.clone(), si.clone())) - } - ExprData::ExprFieldAccess { .. } => { - let field = field_access_field_at(expr.clone(), si.clone()); - let base = field_access_base(expr.clone()); - (is_sub_value_field(field) - && match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at(base.clone(), si.clone()); - ((bname.clone().as_str() == param_name.clone().as_str()) - || set_has(vars.clone(), bname.clone())) - } - _ => false, - }) - } - ExprData::ExprMethodCall { - method_semantics: ms, - .. - } => { - let receiver = method_receiver(expr.clone()); - match method_size_effect(ms.clone()) { - Some(CollectionSizeEffect::ShrinkEffect) => expr_contains_descent( - &receiver, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - ), - Some(CollectionSizeEffect::ProjectionEffect) => expr_contains_descent( - &receiver, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - ), - Some(CollectionSizeEffect::IdentityEffect) => expr_contains_descent( - &receiver, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - ), - None => false, - } - } - _ => false, - } + ExprData::ExprIf => (expr_contains_descent(&if_then_branch(expr.clone()), ¶m_name, &vars, check_child.clone(), check_list.clone(), &si) && match if_else_branch(expr.clone()) { + Some(eb) => expr_contains_descent(&eb, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si), + None => false, +}), + ExprData::ExprBlock => match expr.children.clone().last().cloned() { + Some(last_stmt) => expr_contains_descent(&last_stmt, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si), + None => false, +}, + ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(expr.clone(), si.clone())), + ExprData::ExprFieldAccess { .. } => { + let field = field_access_field_at(expr.clone(), si.clone()); +let base = field_access_base(expr.clone()); +(is_sub_value_field(field) && match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at(base.clone(), si.clone()); +((bname.clone().as_str() == param_name.clone().as_str()) || set_has(vars.clone(), bname.clone())) +}, + _ => false, +}) +}, + ExprData::ExprMethodCall { method_semantics: ms, .. } => { + let receiver = method_receiver(expr.clone()); +match method_size_effect(ms.clone()) { + Some(CollectionSizeEffect::ShrinkEffect) => expr_contains_descent(&receiver, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si), + Some(CollectionSizeEffect::ProjectionEffect) => expr_contains_descent(&receiver, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si), + Some(CollectionSizeEffect::IdentityEffect) => expr_contains_descent(&receiver, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si), + None => false, +} +}, + _ => false, +} } }) } -pub fn collect_field_binding_names( - fb: Rc, - vars: Rc>, -) -> Rc> { - stacker::maybe_grow( - 512 * 1024, - 2 * 1024 * 1024, - || match (*field_binding_pattern(fb)).clone() { - MatchPattern::Bind { - name: binding_name, .. - } => v2_rt::rc_map_insert(vars, binding_name.clone(), true), - MatchPattern::VariantPattern { - field_bindings: nested, - .. - } => nested.clone().iter().cloned().fold( - vars, - |inner: Rc>, nested_fb: Rc| { - collect_field_binding_names(nested_fb.clone(), inner) - }, - ), - _ => vars, - }, - ) +pub fn collect_field_binding_names(fb: Rc, vars: Rc>) -> Rc> { + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { + match (*field_binding_pattern(fb)).clone() { + MatchPattern::Bind { name: binding_name, .. } => v2_rt::rc_map_insert(vars, binding_name.clone(), true), + MatchPattern::VariantPattern { field_bindings: nested, .. } => nested.clone().iter().cloned().fold(vars, |inner: Rc>, nested_fb: Rc| collect_field_binding_names(nested_fb.clone(), inner)), + _ => vars, +} + }) } -pub fn is_if_option_descent( - val: &Rc, - param_name: String, - vars: Rc>, - check_child: bool, - check_list: bool, - si: &Rc>>, -) -> bool { +pub fn is_if_option_descent(val: &Rc, param_name: String, vars: Rc>, check_child: bool, check_list: bool, si: &Rc>>) -> bool { match (*val.expr_data.clone()).clone() { - ExprData::ExprIf => { - let then_branch = if_then_branch(val.clone()); - let then_has_descent = expr_contains_descent( - &then_branch, - ¶m_name, - &vars, - check_child, - check_list, - &si, - ); - let else_is_none = match if_else_branch(val.clone()) { - Some(eb) => match (*eb.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - (expr_var_name_at(eb.clone(), si.clone()).as_str() - == "none".to_string().as_str()) - } - ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitNull => true, - _ => false, - }, - _ => false, - }, - None => true, - }; - (then_has_descent && else_is_none) - } - _ => false, - } + ExprData::ExprIf => { + let then_branch = if_then_branch(val.clone()); +let then_has_descent = expr_contains_descent(&then_branch, ¶m_name, &vars, check_child, check_list, &si); +let else_is_none = match if_else_branch(val.clone()) { + Some(eb) => match (*eb.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => (expr_var_name_at(eb.clone(), si.clone()).as_str() == "none".to_string().as_str()), + ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitNull => true, + _ => false, +}, + _ => false, +}, + None => true, +}; +(then_has_descent && else_is_none) +}, + _ => false, +} } -pub fn is_match_option_descent( - val: &Rc, - param_name: &String, - vars: Rc>, - check_child: bool, - check_list: bool, - si: &Rc>>, -) -> bool { +pub fn is_match_option_descent(val: &Rc, param_name: &String, vars: Rc>, check_child: bool, check_list: bool, si: &Rc>>) -> bool { match (*val.expr_data.clone()).clone() { - ExprData::ExprMatch => { - let scrut = match_scrutinee(val.clone()); - let scrut_has_descent = - expr_contains_descent(&scrut, ¶m_name, &vars, check_child, check_list, &si); - if scrut_has_descent { - { - let has_extraction = { - let mut __found = false; - for arm_node in match_arm_nodes(val.clone()).iter().cloned() { - if match (*arm_pattern(arm_node.clone())).clone() { - MatchPattern::VariantPattern { - field_bindings: bindings, - .. - } => { - let binding_names = bindings.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, fb: Rc| { - collect_field_binding_names(fb.clone(), acc) - }, - ); - let arm_b = arm_body(&arm_node); - match (*arm_b.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has( - binding_names.clone(), - expr_var_name_at(arm_b.clone(), si.clone()), - ), - _ => false, - } - } - _ => false, - } { - __found = true; - break; - } - } - __found - }; - let all_safe = { - let mut __all = true; - for arm_node in match_arm_nodes(val.clone()).iter().cloned() { - if !({ - let arm_b = arm_body(&arm_node); - match (*arm_b.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - (expr_var_name_at(arm_b.clone(), si.clone()).as_str() - != param_name.clone().as_str()) - } - _ => true, - } - }) { - __all = false; - break; - } - } - __all - }; - (has_extraction && all_safe) - } - } else { - false - } + ExprData::ExprMatch => { + let scrut = match_scrutinee(val.clone()); +let scrut_has_descent = expr_contains_descent(&scrut, ¶m_name, &vars, check_child, check_list, &si); +if scrut_has_descent { + { + let has_extraction = { let mut __found = false; for arm_node in match_arm_nodes(val.clone()).iter().cloned() { if match (*arm_pattern(arm_node.clone())).clone() { + MatchPattern::VariantPattern { field_bindings: bindings, .. } => { + let binding_names = bindings.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, fb: Rc| collect_field_binding_names(fb.clone(), acc)); +let arm_b = arm_body(&arm_node); +match (*arm_b.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has(binding_names.clone(), expr_var_name_at(arm_b.clone(), si.clone())), + _ => false, +} +}, + _ => false, +} { __found = true; break; } } __found }; +let all_safe = { let mut __all = true; for arm_node in match_arm_nodes(val.clone()).iter().cloned() { if !({ + let arm_b = arm_body(&arm_node); +match (*arm_b.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => (expr_var_name_at(arm_b.clone(), si.clone()).as_str() != param_name.clone().as_str()), + _ => true, +} +}) { __all = false; break; } } __all }; +(has_extraction && all_safe) +} + } else { + false } - _ => false, - } +}, + _ => false, +} } -pub fn collect_descent_vars( - body: &Rc, - param_name: &String, - vars: &Rc>, - check_child: bool, - check_list: bool, - si: &Rc>>, -) -> Rc> { +pub fn collect_descent_vars(body: &Rc, param_name: &String, vars: &Rc>, check_child: bool, check_list: bool, si: &Rc>>) -> Rc> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprLet => { - let val = let_value(body.clone()); - let is_direct_descent = ((check_child.clone() - && is_child_descent_expr(&val, ¶m_name, &vars, &si)) - || (check_list.clone() - && is_list_shrink_expr(&val, param_name.clone(), si.clone()))); - let is_descent_var = match (*val.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - set_has(vars.clone(), expr_var_name_at(val.clone(), si.clone())) - } - _ => false, - }; - let is_option_descent = is_if_option_descent( - &val, - param_name.clone(), - vars.clone(), - check_child.clone(), - check_list.clone(), - &si, - ); - let is_match_descent = is_match_option_descent( - &val, - ¶m_name, - vars.clone(), - check_child.clone(), - check_list.clone(), - &si, - ); - let is_wrapped_descent = if is_tree_size_preserving_wrapper(&val, si.clone()) { - { - let inner = wrapper_inner_arg(val.clone()); - let inner_is_descent = ((check_child.clone() - && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) - || (check_list.clone() - && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); - let inner_is_var = match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - set_has(vars.clone(), expr_var_name_at(inner.clone(), si.clone())) - } - _ => false, - }; - (inner_is_descent.clone() || inner_is_var.clone()) - } - } else { - false - }; - let is_extraction_descent = if is_sub_value_extractor(&val, si.clone()) { - { - let inner = extractor_inner_arg(val.clone()); - let inner_is_descent = ((check_child.clone() - && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) - || (check_list.clone() - && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); - let inner_is_var = match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - set_has(vars.clone(), expr_var_name_at(inner.clone(), si.clone())) - } - _ => false, - }; - let inner_is_param = match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - (expr_var_name_at(inner.clone(), si.clone()).as_str() - == param_name.clone().as_str()) - } - _ => false, - }; - ((inner_is_descent.clone() || inner_is_var.clone()) || inner_is_param) - } - } else { - false - }; - let is_children_list = match (*val.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(val.clone()); - let field = field_access_field_at(val.clone(), si.clone()); - (is_children_list_field(field) - && match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at(base.clone(), si.clone()); - ((bname.clone().as_str() == param_name.clone().as_str()) - || set_has(vars.clone(), bname.clone())) - } - _ => false, - }) - } - _ => false, - }; - let is_passthrough_descent = if is_list_passthrough_call(val.clone(), si.clone()) { - match list_passthrough_inner_arg(val.clone(), si.clone()) { - Some(inner) => { - (((check_child.clone() - && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) - || (check_list.clone() - && is_list_shrink_expr( - &inner, - param_name.clone(), - si.clone(), - ))) - || match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has( - vars.clone(), - expr_var_name_at(inner.clone(), si.clone()), - ), - _ => false, - }) - } - None => false, - } - } else { - false - }; - let is_consuming_helper = (check_list.clone() - && is_tokens_consuming_call(&val, param_name.clone(), vars.clone(), &si)); - let val_is_descent = ((((((((is_direct_descent || is_descent_var) - || is_option_descent) - || is_match_descent) - || is_wrapped_descent) - || is_extraction_descent) - || is_children_list) - || is_passthrough_descent) - || is_consuming_helper); - let next_vars = if val_is_descent { - v2_rt::rc_map_insert( - vars.clone(), - let_binding_name_at(body.clone(), si.clone()), - true, - ) - } else { - vars.clone() - }; - match let_body(body.clone()) { - Some(b) => collect_descent_vars( - &b, - ¶m_name, - &next_vars, - check_child.clone(), - check_list.clone(), - &si, - ), - None => next_vars, - } - } - ExprData::ExprMatch => { - let scrut = match_scrutinee(body.clone()); - let scrut_is_descent = expr_contains_descent( - &scrut, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - ); - let scrut_is_param = match (*scrut.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let sname = expr_var_name_at(scrut.clone(), si.clone()); - ((sname.clone().as_str() == param_name.clone().as_str()) - || set_has(vars.clone(), sname.clone())) - } - _ => false, - }; - let with_patterns = if (scrut_is_descent.clone() || scrut_is_param) { - match_arm_nodes(body.clone()).iter().cloned().fold( - vars.clone(), - |acc: Rc>, arm_node: Rc| match (*arm_pattern( - arm_node.clone(), - )) - .clone() - { - MatchPattern::VariantPattern { - field_bindings: bindings, - .. - } => bindings.clone().iter().cloned().fold( - acc.clone(), - |inner: Rc>, fb: Rc| { - collect_field_binding_names(fb.clone(), inner) - }, - ), - MatchPattern::Bind { - name: binding_name, .. - } => { - if scrut_is_descent.clone() { - v2_rt::rc_map_insert(acc.clone(), binding_name.clone(), true) - } else { - acc.clone() - } - } - _ => acc.clone(), - }, - ) + ExprData::ExprLet => { + let val = let_value(body.clone()); +let is_direct_descent = ((check_child.clone() && is_child_descent_expr(&val, ¶m_name, &vars, &si)) || (check_list.clone() && is_list_shrink_expr(&val, param_name.clone(), si.clone()))); +let is_descent_var = match (*val.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(val.clone(), si.clone())), + _ => false, +}; +let is_option_descent = is_if_option_descent(&val, param_name.clone(), vars.clone(), check_child.clone(), check_list.clone(), &si); +let is_match_descent = is_match_option_descent(&val, ¶m_name, vars.clone(), check_child.clone(), check_list.clone(), &si); +let is_wrapped_descent = if is_tree_size_preserving_wrapper(&val, si.clone()) { + { + let inner = wrapper_inner_arg(val.clone()); +let inner_is_descent = ((check_child.clone() && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) || (check_list.clone() && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); +let inner_is_var = match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(inner.clone(), si.clone())), + _ => false, +}; +(inner_is_descent.clone() || inner_is_var.clone()) +} + } else { + false + }; +let is_extraction_descent = if is_sub_value_extractor(&val, si.clone()) { + { + let inner = extractor_inner_arg(val.clone()); +let inner_is_descent = ((check_child.clone() && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) || (check_list.clone() && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); +let inner_is_var = match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(inner.clone(), si.clone())), + _ => false, +}; +let inner_is_param = match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => (expr_var_name_at(inner.clone(), si.clone()).as_str() == param_name.clone().as_str()), + _ => false, +}; +((inner_is_descent.clone() || inner_is_var.clone()) || inner_is_param) +} + } else { + false + }; +let is_children_list = match (*val.expr_data.clone()).clone() { + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(val.clone()); +let field = field_access_field_at(val.clone(), si.clone()); +(is_children_list_field(field) && match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at(base.clone(), si.clone()); +((bname.clone().as_str() == param_name.clone().as_str()) || set_has(vars.clone(), bname.clone())) +}, + _ => false, +}) +}, + _ => false, +}; +let is_passthrough_descent = if is_list_passthrough_call(val.clone(), si.clone()) { + match list_passthrough_inner_arg(val.clone(), si.clone()) { + Some(inner) => (((check_child.clone() && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) || (check_list.clone() && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))) || match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(inner.clone(), si.clone())), + _ => false, +}), + None => false, +} + } else { + false + }; +let is_consuming_helper = (check_list.clone() && is_tokens_consuming_call(&val, param_name.clone(), vars.clone(), &si)); +let val_is_descent = ((((((((is_direct_descent || is_descent_var) || is_option_descent) || is_match_descent) || is_wrapped_descent) || is_extraction_descent) || is_children_list) || is_passthrough_descent) || is_consuming_helper); +let next_vars = if val_is_descent { + v2_rt::rc_map_insert(vars.clone(), let_binding_name_at(body.clone(), si.clone()), true) + } else { + vars.clone() + }; +match let_body(body.clone()) { + Some(b) => collect_descent_vars(&b, ¶m_name, &next_vars, check_child.clone(), check_list.clone(), &si), + None => next_vars, +} +}, + ExprData::ExprMatch => { + let scrut = match_scrutinee(body.clone()); +let scrut_is_descent = expr_contains_descent(&scrut, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si); +let scrut_is_param = match (*scrut.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let sname = expr_var_name_at(scrut.clone(), si.clone()); +((sname.clone().as_str() == param_name.clone().as_str()) || set_has(vars.clone(), sname.clone())) +}, + _ => false, +}; +let with_patterns = if (scrut_is_descent.clone() || scrut_is_param) { + match_arm_nodes(body.clone()).iter().cloned().fold(vars.clone(), |acc: Rc>, arm_node: Rc| match (*arm_pattern(arm_node.clone())).clone() { + MatchPattern::VariantPattern { field_bindings: bindings, .. } => bindings.clone().iter().cloned().fold(acc.clone(), |inner: Rc>, fb: Rc| collect_field_binding_names(fb.clone(), inner)), + MatchPattern::Bind { name: binding_name, .. } => if scrut_is_descent.clone() { + v2_rt::rc_map_insert(acc.clone(), binding_name.clone(), true) } else { - vars.clone() - }; - match_arm_nodes(body.clone()).iter().cloned().fold( - with_patterns.clone(), - |acc: Rc>, arm_node: Rc| { - let arm_result = collect_descent_vars( - &arm_body(&arm_node), - ¶m_name, - &with_patterns, - check_child.clone(), - check_list.clone(), - &si, - ); - v2_rt::rc_map_merge(acc, arm_result.clone()) - }, - ) - } - ExprData::ExprIf => { - let then_vars = collect_descent_vars( - &if_then_branch(body.clone()), - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - ); - let else_vars = match if_else_branch(body.clone()) { - Some(eb) => collect_descent_vars( - &eb, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - ), - None => vars.clone(), - }; - v2_rt::rc_map_merge(then_vars, else_vars) - } - ExprData::ExprBlock => body.children.clone().iter().cloned().fold( - vars.clone(), - |acc: Rc>, stmt: Rc| { - collect_descent_vars( - &stmt, - ¶m_name, - &acc, - check_child.clone(), - check_list.clone(), - &si, - ) + acc.clone() }, - ), - ExprData::ExprReturn => match body.children.clone().first().cloned() { - Some(inner) => collect_descent_vars( - &inner, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - ), - None => vars.clone(), - }, - _ => vars.clone(), - } + _ => acc.clone(), +}) + } else { + vars.clone() + }; +match_arm_nodes(body.clone()).iter().cloned().fold(with_patterns.clone(), |acc: Rc>, arm_node: Rc| { + let arm_result = collect_descent_vars(&arm_body(&arm_node), ¶m_name, &with_patterns, check_child.clone(), check_list.clone(), &si); +v2_rt::rc_map_merge(acc, arm_result.clone()) +}) +}, + ExprData::ExprIf => { + let then_vars = collect_descent_vars(&if_then_branch(body.clone()), ¶m_name, &vars, check_child.clone(), check_list.clone(), &si); +let else_vars = match if_else_branch(body.clone()) { + Some(eb) => collect_descent_vars(&eb, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si), + None => vars.clone(), +}; +v2_rt::rc_map_merge(then_vars, else_vars) +}, + ExprData::ExprBlock => body.children.clone().iter().cloned().fold(vars.clone(), |acc: Rc>, stmt: Rc| collect_descent_vars(&stmt, ¶m_name, &acc, check_child.clone(), check_list.clone(), &si)), + ExprData::ExprReturn => match body.children.clone().first().cloned() { + Some(inner) => collect_descent_vars(&inner, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si), + None => vars.clone(), +}, + _ => vars.clone(), +} }) } -pub fn all_self_calls_descend( - body: Rc, - func_name: String, - param_name: String, - check_child: bool, - check_list: bool, - si: Rc>>, -) -> bool { - all_self_calls_descend_inc( - &body, - &func_name, - ¶m_name, - &v2_rt::rc_empty_map::(), - check_child, - check_list, - &si, - ) -} - -pub fn all_self_calls_descend_inc( - body: &Rc, - func_name: &String, - param_name: &String, - vars: &Rc>, - check_child: bool, - check_list: bool, - si: &Rc>>, -) -> bool { +pub fn all_self_calls_descend(body: Rc, func_name: String, param_name: String, check_child: bool, check_list: bool, si: Rc>>) -> bool { + all_self_calls_descend_inc(&body, &func_name, ¶m_name, &v2_rt::rc_empty_map::(), check_child, check_list, &si) +} + +pub fn all_self_calls_descend_inc(body: &Rc, func_name: &String, param_name: &String, vars: &Rc>, check_child: bool, check_list: bool, si: &Rc>>) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprLambda => true, - ExprData::ExprLet => { - let val = let_value(body.clone()); - let val_ok = all_self_calls_descend_inc( - &val, - &func_name, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - ); - let is_direct = ((check_child.clone() - && is_child_descent_expr(&val, ¶m_name, &vars, &si)) - || (check_list.clone() - && is_list_shrink_expr(&val, param_name.clone(), si.clone()))); - let is_var = match (*val.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - set_has(vars.clone(), expr_var_name_at(val.clone(), si.clone())) - } - _ => false, - }; - let is_option = is_if_option_descent( - &val, - param_name.clone(), - vars.clone(), - check_child.clone(), - check_list.clone(), - &si, - ); - let is_children_list = match (*val.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(val.clone()); - let field = field_access_field_at(val.clone(), si.clone()); - (is_children_list_field(field) - && match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at(base.clone(), si.clone()); - ((bname.clone().as_str() == param_name.clone().as_str()) - || set_has(vars.clone(), bname.clone())) - } - _ => false, - }) - } - _ => false, - }; - let next_vars = if (((is_direct || is_var) || is_option) || is_children_list) { - v2_rt::rc_map_insert( - vars.clone(), - let_binding_name_at(body.clone(), si.clone()), - true, - ) - } else { - vars.clone() - }; - let body_ok = match let_body(body.clone()) { - Some(b) => all_self_calls_descend_inc( - &b, - &func_name, - ¶m_name, - &next_vars, - check_child.clone(), - check_list.clone(), - &si, - ), - None => true, - }; - (val_ok && body_ok) - } - ExprData::ExprMatch => { - let scrut = match_scrutinee(body.clone()); - let scrut_ok = all_self_calls_descend_inc( - &scrut, - &func_name, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - ); - let scrut_is_descent = expr_contains_descent( - &scrut, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - ); - let scrut_is_param = match (*scrut.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let sname = expr_var_name_at(scrut.clone(), si.clone()); - ((sname.clone().as_str() == param_name.clone().as_str()) - || set_has(vars.clone(), sname.clone())) - } - _ => false, - }; - let arms_ok = { - let mut __all = true; - for arm_node in match_arm_nodes(body.clone()).iter().cloned() { - if !({ - let arm_vars = if (scrut_is_descent.clone() || scrut_is_param.clone()) { - match (*arm_pattern(arm_node.clone())).clone() { - MatchPattern::VariantPattern { - field_bindings: bindings, - .. - } => bindings.clone().iter().cloned().fold( - vars.clone(), - |inner: Rc>, fb: Rc| { - collect_field_binding_names(fb.clone(), inner) - }, - ), - MatchPattern::Bind { - name: binding_name, .. - } => { - if scrut_is_descent.clone() { - v2_rt::rc_map_insert( - vars.clone(), - binding_name.clone(), - true, - ) - } else { - vars.clone() - } - } - _ => vars.clone(), - } - } else { - vars.clone() - }; - all_self_calls_descend_inc( - &arm_body(&arm_node), - &func_name, - ¶m_name, - &arm_vars, - check_child.clone(), - check_list.clone(), - &si, - ) - }) { - __all = false; - break; - } - } - __all - }; - (scrut_ok && arms_ok) - } - ExprData::ExprIf => { - let cond_ok = all_self_calls_descend_inc( - &if_condition(body.clone()), - &func_name, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - ); - let then_ok = all_self_calls_descend_inc( - &if_then_branch(body.clone()), - &func_name, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - ); - let else_ok = match if_else_branch(body.clone()) { - Some(eb) => all_self_calls_descend_inc( - &eb, - &func_name, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - ), - None => true, - }; - ((cond_ok && then_ok) && else_ok) - } - ExprData::ExprBlock => { - let result = body.children.clone().iter().cloned().fold( - Rc::new(DescentCheckAcc { - ok: true, - vars: vars.clone(), - }), - |acc: Rc, stmt: Rc| { - if (acc.ok.clone() == false) { - acc.clone() - } else { - { - let stmt_ok = all_self_calls_descend_inc( - &stmt, - &func_name, - ¶m_name, - &acc.vars.clone(), - check_child.clone(), - check_list.clone(), - &si, - ); - let next_vars = collect_descent_vars( - &stmt, - ¶m_name, - &acc.vars.clone(), - check_child.clone(), - check_list.clone(), - &si, - ); - Rc::new(DescentCheckAcc { - ok: stmt_ok.clone(), - vars: next_vars.clone(), - }) - } - } + ExprData::ExprLambda => true, + ExprData::ExprLet => { + let val = let_value(body.clone()); +let val_ok = all_self_calls_descend_inc(&val, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si); +let is_direct = ((check_child.clone() && is_child_descent_expr(&val, ¶m_name, &vars, &si)) || (check_list.clone() && is_list_shrink_expr(&val, param_name.clone(), si.clone()))); +let is_var = match (*val.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(val.clone(), si.clone())), + _ => false, +}; +let is_option = is_if_option_descent(&val, param_name.clone(), vars.clone(), check_child.clone(), check_list.clone(), &si); +let is_children_list = match (*val.expr_data.clone()).clone() { + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(val.clone()); +let field = field_access_field_at(val.clone(), si.clone()); +(is_children_list_field(field) && match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at(base.clone(), si.clone()); +((bname.clone().as_str() == param_name.clone().as_str()) || set_has(vars.clone(), bname.clone())) +}, + _ => false, +}) +}, + _ => false, +}; +let next_vars = if (((is_direct || is_var) || is_option) || is_children_list) { + v2_rt::rc_map_insert(vars.clone(), let_binding_name_at(body.clone(), si.clone()), true) + } else { + vars.clone() + }; +let body_ok = match let_body(body.clone()) { + Some(b) => all_self_calls_descend_inc(&b, &func_name, ¶m_name, &next_vars, check_child.clone(), check_list.clone(), &si), + None => true, +}; +(val_ok && body_ok) +}, + ExprData::ExprMatch => { + let scrut = match_scrutinee(body.clone()); +let scrut_ok = all_self_calls_descend_inc(&scrut, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si); +let scrut_is_descent = expr_contains_descent(&scrut, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si); +let scrut_is_param = match (*scrut.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let sname = expr_var_name_at(scrut.clone(), si.clone()); +((sname.clone().as_str() == param_name.clone().as_str()) || set_has(vars.clone(), sname.clone())) +}, + _ => false, +}; +let arms_ok = { let mut __all = true; for arm_node in match_arm_nodes(body.clone()).iter().cloned() { if !({ + let arm_vars = if (scrut_is_descent.clone() || scrut_is_param.clone()) { + match (*arm_pattern(arm_node.clone())).clone() { + MatchPattern::VariantPattern { field_bindings: bindings, .. } => bindings.clone().iter().cloned().fold(vars.clone(), |inner: Rc>, fb: Rc| collect_field_binding_names(fb.clone(), inner)), + MatchPattern::Bind { name: binding_name, .. } => if scrut_is_descent.clone() { + v2_rt::rc_map_insert(vars.clone(), binding_name.clone(), true) + } else { + vars.clone() }, - ); - result.ok.clone() - } - ExprData::ExprCall { .. } => { - let callee = expr_call_func_at(body.clone(), si.clone()); - let own_ok = if (callee.as_str() == func_name.clone().as_str()) { - { - let mut __found = false; - for arg_node in body.children.clone().iter().cloned() { - if { - let targets_param = (arg_name_at(arg_node.clone(), si.clone()) - .as_deref() - == Some(param_name.clone()).as_deref()); - if (targets_param.clone() == false) { - false - } else { - is_descent_arg( - &arg_value(&arg_node), - ¶m_name, - vars.clone(), - check_child.clone(), - check_list.clone(), - &si, - ) - } - } { - __found = true; - break; - } - } - __found - } + _ => vars.clone(), +} } else { - true + vars.clone() }; - (own_ok && { - let mut __all = true; - for child in body.children.clone().iter().cloned() { - if !(all_self_calls_descend_inc( - &child, - &func_name, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - )) { - __all = false; - break; - } - } - __all - }) - } - ExprData::ExprMethodCall { - method_semantics: ms, - .. - } => { - let receiver = method_receiver(body.clone()); - let is_iter = is_algebra_iteration_method(ms.clone()); - let is_struct = is_structural_children(&receiver, ¶m_name, &vars, &si); - if (is_iter && is_struct) { - { - let recv_ok = all_self_calls_descend_inc( - &receiver, - &func_name, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - ); - let args_ok = { - let mut __all = true; - for arg_node in method_arg_nodes(body.clone()).iter().cloned() { - if !({ - let arg_val = arg_value(&arg_node); - match (*arg_val.expr_data.clone()).clone() { - ExprData::ExprLambda => match iteration_element_name( - ms.clone(), - arg_val.clone(), - si.clone(), - ) { - Some(iter_name) => { - let ext_vars = v2_rt::rc_map_insert( - vars.clone(), - iter_name.clone(), - true, - ); - all_self_calls_descend_inc( - &lambda_body(arg_val.clone()), - &func_name, - ¶m_name, - &ext_vars, - check_child.clone(), - check_list.clone(), - &si, - ) - } - None => true, - }, - _ => all_self_calls_descend_inc( - &arg_val, - &func_name, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - ), - } - }) { - __all = false; - break; - } - } - __all - }; - (recv_ok && args_ok) - } - } else { - { - let mut __all = true; - for child in body.children.clone().iter().cloned() { - if !(all_self_calls_descend_inc( - &child, - &func_name, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - )) { - __all = false; - break; - } - } - __all - } - } - } - _ => { - let mut __all = true; - for child in body.children.clone().iter().cloned() { - if !(all_self_calls_descend_inc( - &child, - &func_name, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - )) { - __all = false; - break; +all_self_calls_descend_inc(&arm_body(&arm_node), &func_name, ¶m_name, &arm_vars, check_child.clone(), check_list.clone(), &si) +}) { __all = false; break; } } __all }; +(scrut_ok && arms_ok) +}, + ExprData::ExprIf => { + let cond_ok = all_self_calls_descend_inc(&if_condition(body.clone()), &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si); +let then_ok = all_self_calls_descend_inc(&if_then_branch(body.clone()), &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si); +let else_ok = match if_else_branch(body.clone()) { + Some(eb) => all_self_calls_descend_inc(&eb, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si), + None => true, +}; +((cond_ok && then_ok) && else_ok) +}, + ExprData::ExprBlock => { + let result = body.children.clone().iter().cloned().fold(Rc::new(DescentCheckAcc { + ok: true, + vars: vars.clone(), +}), |acc: Rc, stmt: Rc| if (acc.ok.clone() == false) { + acc.clone() + } else { + { + let stmt_ok = all_self_calls_descend_inc(&stmt, &func_name, ¶m_name, &acc.vars.clone(), check_child.clone(), check_list.clone(), &si); +let next_vars = collect_descent_vars(&stmt, ¶m_name, &acc.vars.clone(), check_child.clone(), check_list.clone(), &si); +Rc::new(DescentCheckAcc { + ok: stmt_ok.clone(), + vars: next_vars.clone(), +}) +} + }); +result.ok.clone() +}, + ExprData::ExprCall { .. } => { + let callee = expr_call_func_at(body.clone(), si.clone()); +let own_ok = if (callee.as_str() == func_name.clone().as_str()) { + { let mut __found = false; for arg_node in body.children.clone().iter().cloned() { if { + let targets_param = (arg_name_at(arg_node.clone(), si.clone()).as_deref() == Some(param_name.clone()).as_deref()); +if (targets_param.clone() == false) { + false + } else { + is_descent_arg(&arg_value(&arg_node), ¶m_name, vars.clone(), check_child.clone(), check_list.clone(), &si) } - } - __all +} { __found = true; break; } } __found } + } else { + true + }; +(own_ok && { let mut __all = true; for child in body.children.clone().iter().cloned() { if !(all_self_calls_descend_inc(&child, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si)) { __all = false; break; } } __all }) +}, + ExprData::ExprMethodCall { method_semantics: ms, .. } => { + let receiver = method_receiver(body.clone()); +let is_iter = is_algebra_iteration_method(ms.clone()); +let is_struct = is_structural_children(&receiver, ¶m_name, &vars, &si); +if (is_iter && is_struct) { + { + let recv_ok = all_self_calls_descend_inc(&receiver, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si); +let args_ok = { let mut __all = true; for arg_node in method_arg_nodes(body.clone()).iter().cloned() { if !({ + let arg_val = arg_value(&arg_node); +match (*arg_val.expr_data.clone()).clone() { + ExprData::ExprLambda => match iteration_element_name(ms.clone(), arg_val.clone(), si.clone()) { + Some(iter_name) => { + let ext_vars = v2_rt::rc_map_insert(vars.clone(), iter_name.clone(), true); +all_self_calls_descend_inc(&lambda_body(arg_val.clone()), &func_name, ¶m_name, &ext_vars, check_child.clone(), check_list.clone(), &si) +}, + None => true, +}, + _ => all_self_calls_descend_inc(&arg_val, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si), +} +}) { __all = false; break; } } __all }; +(recv_ok && args_ok) +} + } else { + { let mut __all = true; for child in body.children.clone().iter().cloned() { if !(all_self_calls_descend_inc(&child, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si)) { __all = false; break; } } __all } } - } +}, + _ => { let mut __all = true; for child in body.children.clone().iter().cloned() { if !(all_self_calls_descend_inc(&child, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si)) { __all = false; break; } } __all }, +} }) } pub fn unwrap_to_match(mut body: Rc) -> Option> { loop { match (*body.expr_data.clone()).clone() { - ExprData::ExprMatch => { - break Some(body.clone()); - } - ExprData::ExprLet => match let_body(body.clone()) { - Some(b) => { - let __tco_0 = b.clone(); - body = __tco_0; - continue; - } - None => { - break None; - } - }, - ExprData::ExprBlock => match body.children.clone().last().cloned() { - Some(last_stmt) => { - let __tco_0 = last_stmt.clone(); - body = __tco_0; - continue; - } - None => { - break None; - } - }, - _ => { - break None; - } - } - } -} - -pub fn matches_on_sub_value_field( - body: Rc, - param_name: String, - si: &Rc>>, -) -> bool { + ExprData::ExprMatch => { break Some(body.clone()); }, + ExprData::ExprLet => { match let_body(body.clone()) { + Some(b) => { { + let __tco_0 = b.clone(); +body = __tco_0; +continue; +} }, + None => { break None; }, +} }, + ExprData::ExprBlock => { match body.children.clone().last().cloned() { + Some(last_stmt) => { { + let __tco_0 = last_stmt.clone(); +body = __tco_0; +continue; +} }, + None => { break None; }, +} }, + _ => { break None; }, +} +} +} + +pub fn matches_on_sub_value_field(body: Rc, param_name: String, si: &Rc>>) -> bool { match unwrap_to_match(body) { - Some(m) => { - let scrut = match_scrutinee(m.clone()); - match (*scrut.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(scrut.clone()); - let field = field_access_field_at(scrut.clone(), si.clone()); - (is_sub_value_field(field) - && match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - (expr_var_name_at(base.clone(), si.clone()).as_str() - == param_name.as_str()) - } - _ => false, - }) - } - _ => false, - } - } - None => false, - } + Some(m) => { + let scrut = match_scrutinee(m.clone()); +match (*scrut.expr_data.clone()).clone() { + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(scrut.clone()); +let field = field_access_field_at(scrut.clone(), si.clone()); +(is_sub_value_field(field) && match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => (expr_var_name_at(base.clone(), si.clone()).as_str() == param_name.as_str()), + _ => false, +}) +}, + _ => false, +} +}, + None => false, +} } -pub fn is_container_child_descent( - body: Rc, - func_name: String, - params: Rc>>, - si: Rc>>, -) -> bool { - { - let mut __found = false; - for p in params.iter().cloned() { - if { - let pname = param_node_name_at(p.clone(), si.clone()); - (matches_on_sub_value_field(body.clone(), pname.clone(), &si) - && all_self_calls_descend( - body.clone(), - func_name.clone(), - pname.clone(), - true, - false, - si.clone(), - )) - } { - __found = true; - break; - } - } - __found - } +pub fn is_container_child_descent(body: Rc, func_name: String, params: Rc>>, si: Rc>>) -> bool { + { let mut __found = false; for p in params.iter().cloned() { if { + let pname = param_node_name_at(p.clone(), si.clone()); +(matches_on_sub_value_field(body.clone(), pname.clone(), &si) && all_self_calls_descend(body.clone(), func_name.clone(), pname.clone(), true, false, si.clone())) +} { __found = true; break; } } __found } } -pub fn is_list_shrinkage_descent( - body: Rc, - func_name: String, - params: Rc>>, - si: Rc>>, -) -> bool { - { - let mut __found = false; - for p in params.iter().cloned() { - if { - let pname = param_node_name_at(p.clone(), si.clone()); - all_self_calls_descend( - body.clone(), - func_name.clone(), - pname.clone(), - false, - true, - si.clone(), - ) - } { - __found = true; - break; - } - } - __found - } +pub fn is_list_shrinkage_descent(body: Rc, func_name: String, params: Rc>>, si: Rc>>) -> bool { + { let mut __found = false; for p in params.iter().cloned() { if { + let pname = param_node_name_at(p.clone(), si.clone()); +all_self_calls_descend(body.clone(), func_name.clone(), pname.clone(), false, true, si.clone()) +} { __found = true; break; } } __found } } -pub fn is_arithmetic_descent_expr( - expr: &Rc, - param_name: String, - si: Rc>>, -) -> bool { +pub fn is_arithmetic_descent_expr(expr: &Rc, param_name: String, si: Rc>>) -> bool { match (*expr.expr_data.clone()).clone() { - ExprData::ExprBinOp { op: BinOp::Sub, .. } => { - let left = binop_left(expr.clone()); - let right = binop_right(expr.clone()); - match (*left.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - ((expr_var_name_at(left.clone(), si).as_str() == param_name.as_str()) - && match (*right.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitInt { value: n, .. } = value.as_ref() else { - unreachable!() - }; - (n.clone() > 0) - } - _ => false, - }) - } - _ => false, - } - } - _ => false, - } + ExprData::ExprBinOp { op: BinOp::Sub, .. } => { + let left = binop_left(expr.clone()); +let right = binop_right(expr.clone()); +match (*left.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => ((expr_var_name_at(left.clone(), si).as_str() == param_name.as_str()) && match (*right.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: n, .. } = value.as_ref() else { unreachable!() }; (n.clone() > 0) }, + _ => false, +}), + _ => false, +} +}, + _ => false, +} } -pub fn classify_self_call_evidence( - arg_expr: &Rc, - param_name: &String, - descent_vars: &Rc>, - check_child: bool, - check_list: bool, - si: &Rc>>, -) -> DescentEvidence { +pub fn classify_self_call_evidence(arg_expr: &Rc, param_name: &String, descent_vars: &Rc>, check_child: bool, check_list: bool, si: &Rc>>) -> DescentEvidence { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - if (check_child.clone() - && is_child_descent_expr(&arg_expr, ¶m_name, &descent_vars, &si)) - { + if (check_child.clone() && is_child_descent_expr(&arg_expr, ¶m_name, &descent_vars, &si)) { DescentEvidence::Strict } else { - if (check_list.clone() - && is_list_shrink_expr(&arg_expr, param_name.clone(), si.clone())) - { + if (check_list.clone() && is_list_shrink_expr(&arg_expr, param_name.clone(), si.clone())) { DescentEvidence::Strict } else { - if (((check_child.clone() == false) && (check_list.clone() == false)) - && is_arithmetic_descent_expr(&arg_expr, param_name.clone(), si.clone())) - { + if (((check_child.clone() == false) && (check_list.clone() == false)) && is_arithmetic_descent_expr(&arg_expr, param_name.clone(), si.clone())) { DescentEvidence::Strict } else { match (*arg_expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let vname = expr_var_name_at(arg_expr.clone(), si.clone()); - if set_has(descent_vars.clone(), vname.clone()) { - DescentEvidence::Strict + ExprData::ExprVar { .. } => { + let vname = expr_var_name_at(arg_expr.clone(), si.clone()); +if set_has(descent_vars.clone(), vname.clone()) { + DescentEvidence::Strict + } else { + if (vname.clone().as_str() == param_name.clone().as_str()) { + DescentEvidence::NonIncreasing } else { - if (vname.clone().as_str() == param_name.clone().as_str()) { - DescentEvidence::NonIncreasing - } else { - DescentEvidence::DescentUnknown - } + DescentEvidence::DescentUnknown } } - ExprData::ExprCall { .. } => { - if is_tree_size_preserving_wrapper(&arg_expr, si.clone()) { - classify_self_call_evidence( - &wrapper_inner_arg(arg_expr.clone()), - ¶m_name, - &descent_vars, - check_child.clone(), - check_list.clone(), - &si, - ) +}, + ExprData::ExprCall { .. } => if is_tree_size_preserving_wrapper(&arg_expr, si.clone()) { + classify_self_call_evidence(&wrapper_inner_arg(arg_expr.clone()), ¶m_name, &descent_vars, check_child.clone(), check_list.clone(), &si) + } else { + if is_sub_value_extractor(&arg_expr, si.clone()) { + { + let inner_ev = classify_self_call_evidence(&extractor_inner_arg(arg_expr.clone()), ¶m_name, &descent_vars, check_child.clone(), check_list.clone(), &si); +match inner_ev.clone() { + DescentEvidence::NonIncreasing => DescentEvidence::Strict, + _ => inner_ev.clone(), +} +} + } else { + if is_list_passthrough_call(arg_expr.clone(), si.clone()) { + match list_passthrough_inner_arg(arg_expr.clone(), si.clone()) { + Some(inner) => classify_self_call_evidence(&inner, ¶m_name, &descent_vars, check_child.clone(), check_list.clone(), &si), + None => DescentEvidence::DescentUnknown, +} } else { - if is_sub_value_extractor(&arg_expr, si.clone()) { - { - let inner_ev = classify_self_call_evidence( - &extractor_inner_arg(arg_expr.clone()), - ¶m_name, - &descent_vars, - check_child.clone(), - check_list.clone(), - &si, - ); - match inner_ev.clone() { - DescentEvidence::NonIncreasing => { - DescentEvidence::Strict - } - _ => inner_ev.clone(), - } - } - } else { - if is_list_passthrough_call(arg_expr.clone(), si.clone()) { - match list_passthrough_inner_arg( - arg_expr.clone(), - si.clone(), - ) { - Some(inner) => classify_self_call_evidence( - &inner, - ¶m_name, - &descent_vars, - check_child.clone(), - check_list.clone(), - &si, - ), - None => DescentEvidence::DescentUnknown, - } - } else { - DescentEvidence::DescentUnknown - } - } - } - } - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(arg_expr.clone()); - match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at(base.clone(), si.clone()); - if (set_has(descent_vars.clone(), bname.clone()) - || (bname.clone().as_str() == param_name.clone().as_str())) - { - DescentEvidence::Strict - } else { - { - let field = - field_access_field_at(arg_expr.clone(), si.clone()); - if (field.as_str() == param_name.clone().as_str()) { - DescentEvidence::NonIncreasing - } else { - DescentEvidence::DescentUnknown - } - } - } - } - _ => DescentEvidence::DescentUnknown, + DescentEvidence::DescentUnknown } } - ExprData::ExprMethodCall { - method_semantics: ms, - .. - } => { - if is_generalized_shrink(&arg_expr, si.clone()) { + }, + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(arg_expr.clone()); +match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at(base.clone(), si.clone()); +if (set_has(descent_vars.clone(), bname.clone()) || (bname.clone().as_str() == param_name.clone().as_str())) { + DescentEvidence::Strict + } else { { - let recv = method_receiver(arg_expr.clone()); - let recv_ev = classify_self_call_evidence( - &recv, - ¶m_name, - &descent_vars, - check_child.clone(), - check_list.clone(), - &si, - ); - match recv_ev { - DescentEvidence::Strict => DescentEvidence::Strict, - DescentEvidence::NonIncreasing => DescentEvidence::Strict, - DescentEvidence::DescentUnknown => { - DescentEvidence::DescentUnknown - } + let field = field_access_field_at(arg_expr.clone(), si.clone()); +if (field.as_str() == param_name.clone().as_str()) { + DescentEvidence::NonIncreasing + } else { + DescentEvidence::DescentUnknown } - } - } else { - DescentEvidence::DescentUnknown +} } - } - _ => DescentEvidence::DescentUnknown, - } +}, + _ => DescentEvidence::DescentUnknown, +} +}, + ExprData::ExprMethodCall { method_semantics: ms, .. } => if is_generalized_shrink(&arg_expr, si.clone()) { + { + let recv = method_receiver(arg_expr.clone()); +let recv_ev = classify_self_call_evidence(&recv, ¶m_name, &descent_vars, check_child.clone(), check_list.clone(), &si); +match recv_ev { + DescentEvidence::Strict => DescentEvidence::Strict, + DescentEvidence::NonIncreasing => DescentEvidence::Strict, + DescentEvidence::DescentUnknown => DescentEvidence::DescentUnknown, +} +} + } else { + DescentEvidence::DescentUnknown + }, + _ => DescentEvidence::DescentUnknown, +} } } } }) } -pub fn try_dimension_for_param( - body: Rc, - func_name: String, - param_name: String, - check_child: bool, - check_list: bool, - si: Rc>>, -) -> Option { - collect_evidence_incremental( - &body, - &func_name, - ¶m_name, - &v2_rt::rc_empty_map::(), - check_child, - check_list, - false, - &si, - ) -} - -pub fn try_branching_dimension_for_param( - body: Rc, - func_name: String, - param_name: String, - check_child: bool, - check_list: bool, - si: Rc>>, -) -> Option { - collect_evidence_incremental( - &body, - &func_name, - ¶m_name, - &v2_rt::rc_empty_map::(), - check_child, - check_list, - true, - &si, - ) -} - -pub fn merge_optional_evidence( - a: Option, - b: Option, -) -> Option { +pub fn try_dimension_for_param(body: Rc, func_name: String, param_name: String, check_child: bool, check_list: bool, si: Rc>>) -> Option { + collect_evidence_incremental(&body, &func_name, ¶m_name, &v2_rt::rc_empty_map::(), check_child, check_list, false, &si) +} + +pub fn try_branching_dimension_for_param(body: Rc, func_name: String, param_name: String, check_child: bool, check_list: bool, si: Rc>>) -> Option { + collect_evidence_incremental(&body, &func_name, ¶m_name, &v2_rt::rc_empty_map::(), check_child, check_list, true, &si) +} + +pub fn merge_optional_evidence(a: Option, b: Option) -> Option { optional_evidence_meet(a, b) } -pub fn collect_evidence_incremental( - body: &Rc, - func_name: &String, - param_name: &String, - vars: &Rc>, - check_child: bool, - check_list: bool, - branching_only: bool, - si: &Rc>>, -) -> Option { +pub fn collect_evidence_incremental(body: &Rc, func_name: &String, param_name: &String, vars: &Rc>, check_child: bool, check_list: bool, branching_only: bool, si: &Rc>>) -> Option { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprLambda => None, - ExprData::ExprLet => { - let val = let_value(body.clone()); - let val_ev = collect_evidence_incremental( - &val, - &func_name, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - branching_only.clone(), - &si, - ); - let is_direct = ((check_child.clone() - && is_child_descent_expr(&val, ¶m_name, &vars, &si)) - || (check_list.clone() - && is_list_shrink_expr(&val, param_name.clone(), si.clone()))); - let is_var = match (*val.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - set_has(vars.clone(), expr_var_name_at(val.clone(), si.clone())) - } - _ => false, - }; - let is_option = is_if_option_descent( - &val, - param_name.clone(), - vars.clone(), - check_child.clone(), - check_list.clone(), - &si, - ); - let is_match_descent = is_match_option_descent( - &val, - ¶m_name, - vars.clone(), - check_child.clone(), - check_list.clone(), - &si, - ); - let is_wrapped = if is_tree_size_preserving_wrapper(&val, si.clone()) { - { - let inner = wrapper_inner_arg(val.clone()); - let inner_d = ((check_child.clone() - && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) - || (check_list.clone() - && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); - let inner_v = match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - set_has(vars.clone(), expr_var_name_at(inner.clone(), si.clone())) - } - _ => false, - }; - (inner_d.clone() || inner_v.clone()) - } - } else { - false - }; - let is_extraction = if is_sub_value_extractor(&val, si.clone()) { - { - let inner = extractor_inner_arg(val.clone()); - let inner_d = ((check_child.clone() - && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) - || (check_list.clone() - && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); - let inner_v = match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - set_has(vars.clone(), expr_var_name_at(inner.clone(), si.clone())) - } - _ => false, - }; - let inner_p = match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - (expr_var_name_at(inner.clone(), si.clone()).as_str() - == param_name.clone().as_str()) - } - _ => false, - }; - ((inner_d.clone() || inner_v.clone()) || inner_p) - } - } else { - false - }; - let is_children_list = match (*val.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(val.clone()); - let field = field_access_field_at(val.clone(), si.clone()); - (is_children_list_field(field) - && match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at(base.clone(), si.clone()); - ((bname.clone().as_str() == param_name.clone().as_str()) - || set_has(vars.clone(), bname.clone())) - } - _ => false, - }) - } - _ => false, - }; - let is_passthrough = if is_list_passthrough_call(val.clone(), si.clone()) { - match list_passthrough_inner_arg(val.clone(), si.clone()) { - Some(inner) => { - (((check_child.clone() - && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) - || (check_list.clone() - && is_list_shrink_expr( - &inner, - param_name.clone(), - si.clone(), - ))) - || match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has( - vars.clone(), - expr_var_name_at(inner.clone(), si.clone()), - ), - _ => false, - }) - } - None => false, - } + ExprData::ExprLambda => None, + ExprData::ExprLet => { + let val = let_value(body.clone()); +let val_ev = collect_evidence_incremental(&val, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si); +let is_direct = ((check_child.clone() && is_child_descent_expr(&val, ¶m_name, &vars, &si)) || (check_list.clone() && is_list_shrink_expr(&val, param_name.clone(), si.clone()))); +let is_var = match (*val.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(val.clone(), si.clone())), + _ => false, +}; +let is_option = is_if_option_descent(&val, param_name.clone(), vars.clone(), check_child.clone(), check_list.clone(), &si); +let is_match_descent = is_match_option_descent(&val, ¶m_name, vars.clone(), check_child.clone(), check_list.clone(), &si); +let is_wrapped = if is_tree_size_preserving_wrapper(&val, si.clone()) { + { + let inner = wrapper_inner_arg(val.clone()); +let inner_d = ((check_child.clone() && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) || (check_list.clone() && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); +let inner_v = match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(inner.clone(), si.clone())), + _ => false, +}; +(inner_d.clone() || inner_v.clone()) +} + } else { + false + }; +let is_extraction = if is_sub_value_extractor(&val, si.clone()) { + { + let inner = extractor_inner_arg(val.clone()); +let inner_d = ((check_child.clone() && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) || (check_list.clone() && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); +let inner_v = match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(inner.clone(), si.clone())), + _ => false, +}; +let inner_p = match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => (expr_var_name_at(inner.clone(), si.clone()).as_str() == param_name.clone().as_str()), + _ => false, +}; +((inner_d.clone() || inner_v.clone()) || inner_p) +} + } else { + false + }; +let is_children_list = match (*val.expr_data.clone()).clone() { + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(val.clone()); +let field = field_access_field_at(val.clone(), si.clone()); +(is_children_list_field(field) && match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at(base.clone(), si.clone()); +((bname.clone().as_str() == param_name.clone().as_str()) || set_has(vars.clone(), bname.clone())) +}, + _ => false, +}) +}, + _ => false, +}; +let is_passthrough = if is_list_passthrough_call(val.clone(), si.clone()) { + match list_passthrough_inner_arg(val.clone(), si.clone()) { + Some(inner) => (((check_child.clone() && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) || (check_list.clone() && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))) || match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(inner.clone(), si.clone())), + _ => false, +}), + None => false, +} + } else { + false + }; +let is_consuming_helper = (check_list.clone() && is_tokens_consuming_call(&val, param_name.clone(), vars.clone(), &si)); +let next_vars = if ((((((((is_direct || is_var) || is_option) || is_match_descent) || is_wrapped) || is_extraction) || is_children_list) || is_passthrough) || is_consuming_helper) { + v2_rt::rc_map_insert(vars.clone(), let_binding_name_at(body.clone(), si.clone()), true) + } else { + vars.clone() + }; +let body_ev = match let_body(body.clone()) { + Some(b) => collect_evidence_incremental(&b, &func_name, ¶m_name, &next_vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si), + None => None, +}; +merge_optional_evidence(val_ev, body_ev) +}, + ExprData::ExprMatch => { + let scrut = match_scrutinee(body.clone()); +let scrut_ev = collect_evidence_incremental(&scrut, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si); +let scrut_is_descent = expr_contains_descent(&scrut, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si); +let scrut_is_param = match (*scrut.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let sname = expr_var_name_at(scrut.clone(), si.clone()); +((sname.clone().as_str() == param_name.clone().as_str()) || set_has(vars.clone(), sname.clone())) +}, + _ => false, +}; +let arms_ev = match_arm_nodes(body.clone()).iter().cloned().fold(None, |acc: _, arm_node: Rc| { + let is_base_case = if branching_only.clone() { + (max_path_self_calls(arm_body(&arm_node), func_name.clone(), si.clone()) == 0) } else { false }; - let is_consuming_helper = (check_list.clone() - && is_tokens_consuming_call(&val, param_name.clone(), vars.clone(), &si)); - let next_vars = if ((((((((is_direct || is_var) || is_option) - || is_match_descent) - || is_wrapped) - || is_extraction) - || is_children_list) - || is_passthrough) - || is_consuming_helper) - { - v2_rt::rc_map_insert( - vars.clone(), - let_binding_name_at(body.clone(), si.clone()), - true, - ) +if is_base_case.clone() { + acc.clone() } else { - vars.clone() - }; - let body_ev = match let_body(body.clone()) { - Some(b) => collect_evidence_incremental( - &b, - &func_name, - ¶m_name, - &next_vars, - check_child.clone(), - check_list.clone(), - branching_only.clone(), - &si, - ), - None => None, - }; - merge_optional_evidence(val_ev, body_ev) - } - ExprData::ExprMatch => { - let scrut = match_scrutinee(body.clone()); - let scrut_ev = collect_evidence_incremental( - &scrut, - &func_name, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - branching_only.clone(), - &si, - ); - let scrut_is_descent = expr_contains_descent( - &scrut, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - ); - let scrut_is_param = match (*scrut.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let sname = expr_var_name_at(scrut.clone(), si.clone()); - ((sname.clone().as_str() == param_name.clone().as_str()) - || set_has(vars.clone(), sname.clone())) - } - _ => false, - }; - let arms_ev = match_arm_nodes(body.clone()).iter().cloned().fold( - None, - |acc: _, arm_node: Rc| { - let is_base_case = if branching_only.clone() { - (max_path_self_calls( - arm_body(&arm_node), - func_name.clone(), - si.clone(), - ) == 0) + { + let arm_vars = if (scrut_is_descent.clone() || scrut_is_param.clone()) { + match (*arm_pattern(arm_node.clone())).clone() { + MatchPattern::VariantPattern { field_bindings: bindings, .. } => bindings.clone().iter().cloned().fold(vars.clone(), |inner: Rc>, fb: Rc| collect_field_binding_names(fb.clone(), inner)), + MatchPattern::Bind { name: binding_name, .. } => if scrut_is_descent.clone() { + v2_rt::rc_map_insert(vars.clone(), binding_name.clone(), true) + } else { + vars.clone() + }, + _ => vars.clone(), +} } else { - false + vars.clone() }; - if is_base_case.clone() { - acc.clone() +let arm_ev = collect_evidence_incremental(&arm_body(&arm_node), &func_name, ¶m_name, &arm_vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si); +merge_optional_evidence(acc.clone(), arm_ev.clone()) +} + } +}); +merge_optional_evidence(scrut_ev, arms_ev) +}, + ExprData::ExprIf => { + let cond_ev = collect_evidence_incremental(&if_condition(body.clone()), &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si); +let then_branch = if_then_branch(body.clone()); +let else_opt = if_else_branch(body.clone()); +let then_path = if branching_only.clone() { + max_path_self_calls(then_branch.clone(), func_name.clone(), si.clone()) + } else { + 0 + }; +let else_path = if branching_only.clone() { + match else_opt.clone() { + Some(eb) => max_path_self_calls(eb.clone(), func_name.clone(), si.clone()), + None => 0, +} + } else { + 0 + }; +let then_ev = if (branching_only.clone() && (then_path == 0)) { + None + } else { + collect_evidence_incremental(&then_branch, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si) + }; +let else_ev = if (branching_only.clone() && (else_path == 0)) { + None + } else { + match else_opt.clone() { + Some(eb) => collect_evidence_incremental(&eb, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si), + None => None, +} + }; +merge_optional_evidence(cond_ev, merge_optional_evidence(then_ev, else_ev)) +}, + ExprData::ExprCall { .. } => { + let callee = expr_call_func_at(body.clone(), si.clone()); +let own_evidence = if (callee.as_str() == func_name.clone().as_str()) { + { + let arg_evidence = body.children.clone().iter().cloned().fold(DescentEvidence::DescentUnknown, |acc: DescentEvidence, arg_node: Rc| { + let aname = arg_name_at(arg_node.clone(), si.clone()); +if (aname.clone().as_deref() == Some(param_name.clone()).as_deref()) { + classify_self_call_evidence(&arg_value(&arg_node), ¶m_name, &vars, check_child.clone(), check_list.clone(), &si) } else { - { - let arm_vars = - if (scrut_is_descent.clone() || scrut_is_param.clone()) { - match (*arm_pattern(arm_node.clone())).clone() { - MatchPattern::VariantPattern { - field_bindings: bindings, - .. - } => bindings.clone().iter().cloned().fold( - vars.clone(), - |inner: Rc>, fb: Rc| { - collect_field_binding_names(fb.clone(), inner) - }, - ), - MatchPattern::Bind { - name: binding_name, .. - } => { - if scrut_is_descent.clone() { - v2_rt::rc_map_insert( - vars.clone(), - binding_name.clone(), - true, - ) - } else { - vars.clone() - } - } - _ => vars.clone(), - } - } else { - vars.clone() - }; - let arm_ev = collect_evidence_incremental( - &arm_body(&arm_node), - &func_name, - ¶m_name, - &arm_vars, - check_child.clone(), - check_list.clone(), - branching_only.clone(), - &si, - ); - merge_optional_evidence(acc.clone(), arm_ev.clone()) - } + acc } - }, - ); - merge_optional_evidence(scrut_ev, arms_ev) - } - ExprData::ExprIf => { - let cond_ev = collect_evidence_incremental( - &if_condition(body.clone()), - &func_name, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - branching_only.clone(), - &si, - ); - let then_branch = if_then_branch(body.clone()); - let else_opt = if_else_branch(body.clone()); - let then_path = if branching_only.clone() { - max_path_self_calls(then_branch.clone(), func_name.clone(), si.clone()) - } else { - 0 - }; - let else_path = if branching_only.clone() { - match else_opt.clone() { - Some(eb) => max_path_self_calls(eb.clone(), func_name.clone(), si.clone()), - None => 0, - } - } else { - 0 - }; - let then_ev = if (branching_only.clone() && (then_path == 0)) { - None - } else { - collect_evidence_incremental( - &then_branch, - &func_name, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - branching_only.clone(), - &si, - ) - }; - let else_ev = if (branching_only.clone() && (else_path == 0)) { - None - } else { - match else_opt.clone() { - Some(eb) => collect_evidence_incremental( - &eb, - &func_name, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - branching_only.clone(), - &si, - ), - None => None, - } - }; - merge_optional_evidence(cond_ev, merge_optional_evidence(then_ev, else_ev)) - } - ExprData::ExprCall { .. } => { - let callee = expr_call_func_at(body.clone(), si.clone()); - let own_evidence = if (callee.as_str() == func_name.clone().as_str()) { - { - let arg_evidence = body.children.clone().iter().cloned().fold( - DescentEvidence::DescentUnknown, - |acc: DescentEvidence, arg_node: Rc| { - let aname = arg_name_at(arg_node.clone(), si.clone()); - if (aname.clone().as_deref() == Some(param_name.clone()).as_deref()) - { - classify_self_call_evidence( - &arg_value(&arg_node), - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - &si, - ) - } else { - acc - } - }, - ); - Some(arg_evidence) - } - } else { - None - }; - let child_evidence = - body.children - .clone() - .iter() - .cloned() - .fold(None, |acc: _, child: Rc| { - let ce = collect_evidence_incremental( - &child, - &func_name, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - branching_only.clone(), - &si, - ); - merge_optional_evidence(acc.clone(), ce.clone()) - }); - merge_optional_evidence(own_evidence, child_evidence) - } - ExprData::ExprBlock => { - let result = body.children.clone().iter().cloned().fold( - Rc::new(EvidenceBlockAcc { - evidence: None, - vars: vars.clone(), - }), - |acc: Rc, stmt: Rc| { - let stmt_ev = collect_evidence_incremental( - &stmt, - &func_name, - ¶m_name, - &acc.vars.clone(), - check_child.clone(), - check_list.clone(), - branching_only.clone(), - &si, - ); - let next_vars = collect_descent_vars( - &stmt, - ¶m_name, - &acc.vars.clone(), - check_child.clone(), - check_list.clone(), - &si, - ); - Rc::new(EvidenceBlockAcc { - evidence: merge_optional_evidence( - acc.evidence.clone(), - stmt_ev.clone(), - ), - vars: next_vars.clone(), - }) - }, - ); - result.evidence.clone() - } - ExprData::ExprMethodCall { - method_semantics: ms, - .. - } => { - let receiver = method_receiver(body.clone()); - let is_iter = is_algebra_iteration_method(ms.clone()); - let is_struct = is_structural_children(&receiver, ¶m_name, &vars, &si); - if (is_iter && is_struct) { - { - let recv_ev = collect_evidence_incremental( - &receiver, - &func_name, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - branching_only.clone(), - &si, - ); - let args_ev = method_arg_nodes(body.clone()).iter().cloned().fold( - None, - |acc: _, arg_node: Rc| { - let arg_val = arg_value(&arg_node); - let ev = match (*arg_val.expr_data.clone()).clone() { - ExprData::ExprLambda => match iteration_element_name( - ms.clone(), - arg_val.clone(), - si.clone(), - ) { - Some(iter_name) => { - let ext_vars = v2_rt::rc_map_insert( - vars.clone(), - iter_name.clone(), - true, - ); - collect_evidence_incremental( - &lambda_body(arg_val.clone()), - &func_name, - ¶m_name, - &ext_vars, - check_child.clone(), - check_list.clone(), - branching_only.clone(), - &si, - ) - } - None => None, - }, - _ => collect_evidence_incremental( - &arg_val, - &func_name, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - branching_only.clone(), - &si, - ), - }; - merge_optional_evidence(acc.clone(), ev.clone()) - }, - ); - merge_optional_evidence(recv_ev, args_ev) - } - } else { - body.children - .clone() - .iter() - .cloned() - .fold(None, |acc: _, child: Rc| { - let ce = collect_evidence_incremental( - &child, - &func_name, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - branching_only.clone(), - &si, - ); - merge_optional_evidence(acc.clone(), ce.clone()) - }) - } +}); +Some(arg_evidence) +} + } else { + None + }; +let child_evidence = body.children.clone().iter().cloned().fold(None, |acc: _, child: Rc| { + let ce = collect_evidence_incremental(&child, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si); +merge_optional_evidence(acc.clone(), ce.clone()) +}); +merge_optional_evidence(own_evidence, child_evidence) +}, + ExprData::ExprBlock => { + let result = body.children.clone().iter().cloned().fold(Rc::new(EvidenceBlockAcc { + evidence: None, + vars: vars.clone(), +}), |acc: Rc, stmt: Rc| { + let stmt_ev = collect_evidence_incremental(&stmt, &func_name, ¶m_name, &acc.vars.clone(), check_child.clone(), check_list.clone(), branching_only.clone(), &si); +let next_vars = collect_descent_vars(&stmt, ¶m_name, &acc.vars.clone(), check_child.clone(), check_list.clone(), &si); +Rc::new(EvidenceBlockAcc { + evidence: merge_optional_evidence(acc.evidence.clone(), stmt_ev.clone()), + vars: next_vars.clone(), +}) +}); +result.evidence.clone() +}, + ExprData::ExprMethodCall { method_semantics: ms, .. } => { + let receiver = method_receiver(body.clone()); +let is_iter = is_algebra_iteration_method(ms.clone()); +let is_struct = is_structural_children(&receiver, ¶m_name, &vars, &si); +if (is_iter && is_struct) { + { + let recv_ev = collect_evidence_incremental(&receiver, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si); +let args_ev = method_arg_nodes(body.clone()).iter().cloned().fold(None, |acc: _, arg_node: Rc| { + let arg_val = arg_value(&arg_node); +let ev = match (*arg_val.expr_data.clone()).clone() { + ExprData::ExprLambda => match iteration_element_name(ms.clone(), arg_val.clone(), si.clone()) { + Some(iter_name) => { + let ext_vars = v2_rt::rc_map_insert(vars.clone(), iter_name.clone(), true); +collect_evidence_incremental(&lambda_body(arg_val.clone()), &func_name, ¶m_name, &ext_vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si) +}, + None => None, +}, + _ => collect_evidence_incremental(&arg_val, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si), +}; +merge_optional_evidence(acc.clone(), ev.clone()) +}); +merge_optional_evidence(recv_ev, args_ev) +} + } else { + body.children.clone().iter().cloned().fold(None, |acc: _, child: Rc| { + let ce = collect_evidence_incremental(&child, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si); +merge_optional_evidence(acc.clone(), ce.clone()) +}) } - _ => body - .children - .clone() - .iter() - .cloned() - .fold(None, |acc: _, child: Rc| { - let ce = collect_evidence_incremental( - &child, - &func_name, - ¶m_name, - &vars, - check_child.clone(), - check_list.clone(), - branching_only.clone(), - &si, - ); - merge_optional_evidence(acc.clone(), ce.clone()) - }), - } +}, + _ => body.children.clone().iter().cloned().fold(None, |acc: _, child: Rc| { + let ce = collect_evidence_incremental(&child, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si); +merge_optional_evidence(acc.clone(), ce.clone()) +}), +} }) } -pub fn try_type_directed_dimension( - body: Rc, - func_name: String, - param_name: &String, - dim: IterationDimension, - si: Rc>>, -) -> Option> { +pub fn try_type_directed_dimension(body: Rc, func_name: String, param_name: &String, dim: IterationDimension, si: Rc>>) -> Option> { match dim { - IterationDimension::TreeDescent => { - match try_dimension_for_param(body, func_name, param_name.clone(), true, false, si) { - Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { - param: param_name.clone(), - })]), - })), - _ => None, - } - } - IterationDimension::CollectionFold => { - match try_dimension_for_param(body, func_name, param_name.clone(), false, true, si) { - Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::ListLength { - param: param_name.clone(), - })]), - })), - _ => None, - } - } - IterationDimension::ArithmeticRepeat => { - match try_dimension_for_param(body, func_name, param_name.clone(), false, false, si) { - Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::ArithmeticValue { - param: param_name.clone(), - })]), - })), - _ => None, - } - } - } + IterationDimension::TreeDescent => match try_dimension_for_param(body, func_name, param_name.clone(), true, false, si) { + Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { + param: param_name.clone(), +})]), +})), + _ => None, +}, + IterationDimension::CollectionFold => match try_dimension_for_param(body, func_name, param_name.clone(), false, true, si) { + Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::ListLength { + param: param_name.clone(), +})]), +})), + _ => None, +}, + IterationDimension::ArithmeticRepeat => match try_dimension_for_param(body, func_name, param_name.clone(), false, false, si) { + Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::ArithmeticValue { + param: param_name.clone(), +})]), +})), + _ => None, +}, +} } -pub fn construct_termination_proof( - func_name: &String, - body: &Rc, - params: &Rc>>, - parser_always_advancing: Rc>, - si: &Rc>>, -) -> Option> { +pub fn construct_termination_proof(func_name: &String, body: &Rc, params: &Rc>>, parser_always_advancing: Rc>, si: &Rc>>) -> Option> { { - let structural_proof = params - .clone() - .iter() - .cloned() - .fold(None, |best: _, p: Rc| match best.clone() { - Some(_) => best.clone(), - None => { - let pname = param_node_name_at(p.clone(), si.clone()); - let type_name = authored_name_at(si.clone(), ¶m_node_type_expr(&p)); - match type_iteration_dimension(&type_name) { - Some(dim) => try_type_directed_dimension( - body.clone(), - func_name.clone(), - &pname, - dim.clone(), - si.clone(), - ), - None => { - let tree_evidence = try_dimension_for_param( - body.clone(), - func_name.clone(), - pname.clone(), - true, - false, - si.clone(), - ); - match tree_evidence.clone() { - Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new( - RankingDimension::TreeSize { - param: pname.clone(), - }, - )]), - })), - _ => { - let list_evidence = try_dimension_for_param( - body.clone(), - func_name.clone(), - pname.clone(), - false, - true, - si.clone(), - ); - match list_evidence.clone() { - Some(DescentEvidence::Strict) => { - Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new( - RankingDimension::ListLength { - param: pname.clone(), - }, - )]), - })) - } - _ => { - let arith_evidence = try_dimension_for_param( - body.clone(), - func_name.clone(), - pname.clone(), - false, - false, - si.clone(), - ); - match arith_evidence.clone() { - Some(DescentEvidence::Strict) => { - Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new( - RankingDimension::ArithmeticValue { - param: pname.clone(), - }, - )]), - })) - } - _ => None, - } - } - } - } - } - } - } - } - }); - let single_dim_proof = match structural_proof.clone() { - Some(_) => structural_proof.clone(), - None => match parser_state_param(params.clone(), si.clone()) { - Some(state_param) => { - let self_set = seed_bool_map(func_name.clone()); - let edges = collect_parser_progress_edges( - &func_name, - &body, - &state_param, - &self_set, - &empty_parser_progress_env(), - &parser_always_advancing, - &v2_rt::rc_empty_map::(), - &si, - ); - if (((edges.clone().len() as i64) > 0) && { - let mut __all = true; - for edge in edges.clone().iter().cloned() { - if !(edge.progress.clone() == DescentEvidence::Strict) { - __all = false; - break; - } - } - __all - }) { - Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::TokenPosition { - param: state_param.name.clone(), - })]), - })) - } else { - None - } - } - None => None, - }, - }; - match single_dim_proof.clone() { - Some(_) => single_dim_proof.clone(), - None => { - let self_set = seed_bool_map(func_name.clone()); - let func_entry = Rc::new(FuncEntry { - name: func_name.clone(), - body: body.clone(), - params: params.clone(), - span: body.span.clone(), - is_tail_recursive: false, - }); - let func_index = seed_func_entry_map(func_name.clone(), func_entry); - construct_scc_termination_proof( - &Rc::new(vec![func_name.clone()]), - &func_index, - &self_set, - &si, - ) + let structural_proof = params.clone().iter().cloned().fold(None, |best: _, p: Rc| match best.clone() { + Some(_) => best.clone(), + None => { + let pname = param_node_name_at(p.clone(), si.clone()); +let type_name = authored_name_at(si.clone(), ¶m_node_type_expr(&p)); +match type_iteration_dimension(&type_name) { + Some(dim) => try_type_directed_dimension(body.clone(), func_name.clone(), &pname, dim.clone(), si.clone()), + None => { + let tree_evidence = try_dimension_for_param(body.clone(), func_name.clone(), pname.clone(), true, false, si.clone()); +match tree_evidence.clone() { + Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { + param: pname.clone(), +})]), +})), + _ => { + let list_evidence = try_dimension_for_param(body.clone(), func_name.clone(), pname.clone(), false, true, si.clone()); +match list_evidence.clone() { + Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::ListLength { + param: pname.clone(), +})]), +})), + _ => { + let arith_evidence = try_dimension_for_param(body.clone(), func_name.clone(), pname.clone(), false, false, si.clone()); +match arith_evidence.clone() { + Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::ArithmeticValue { + param: pname.clone(), +})]), +})), + _ => None, +} +}, +} +}, +} +}, +} +}, +}); +let single_dim_proof = match structural_proof.clone() { + Some(_) => structural_proof.clone(), + None => match parser_state_param(params.clone(), si.clone()) { + Some(state_param) => { + let self_set = seed_bool_map(func_name.clone()); +let edges = collect_parser_progress_edges(&func_name, &body, &state_param, &self_set, &empty_parser_progress_env(), &parser_always_advancing, &v2_rt::rc_empty_map::(), &si); +if (((edges.clone().len() as i64) > 0) && { let mut __all = true; for edge in edges.clone().iter().cloned() { if !((edge.progress.clone() == DescentEvidence::Strict)) { __all = false; break; } } __all }) { + Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::TokenPosition { + param: state_param.name.clone(), +})]), +})) + } else { + None } - } - } +}, + None => None, +}, +}; +match single_dim_proof.clone() { + Some(_) => single_dim_proof.clone(), + None => { + let self_set = seed_bool_map(func_name.clone()); +let func_entry = Rc::new(FuncEntry { + name: func_name.clone(), + body: body.clone(), + params: params.clone(), + span: body.span.clone(), + is_tail_recursive: false, +}); +let func_index = seed_func_entry_map(func_name.clone(), func_entry); +construct_scc_termination_proof(&Rc::new(vec![func_name.clone()]), &func_index, &self_set, &si) +}, +} +} } -pub fn construct_branching_termination_proof( - func_name: String, - body: Rc, - params: Rc>>, - si: Rc>>, -) -> Option> { - params - .iter() - .cloned() - .fold(None, |best: _, p: Rc| match best.clone() { - Some(_) => best.clone(), - None => { - let pname = param_node_name_at(p.clone(), si.clone()); - let type_name = authored_name_at(si.clone(), ¶m_node_type_expr(&p)); - match type_iteration_dimension(&type_name) { - Some(IterationDimension::TreeDescent) => { - match try_branching_dimension_for_param( - body.clone(), - func_name.clone(), - pname.clone(), - true, - false, - si.clone(), - ) { - Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { - param: pname.clone(), - })]), - })), - _ => None, - } - } - Some(IterationDimension::CollectionFold) => { - match try_branching_dimension_for_param( - body.clone(), - func_name.clone(), - pname.clone(), - false, - true, - si.clone(), - ) { - Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::ListLength { - param: pname.clone(), - })]), - })), - _ => None, - } - } - Some(IterationDimension::ArithmeticRepeat) => None, - None => { - let tree_ev = try_branching_dimension_for_param( - body.clone(), - func_name.clone(), - pname.clone(), - true, - false, - si.clone(), - ); - match tree_ev.clone() { - Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { - param: pname.clone(), - })]), - })), - _ => { - let list_ev = try_branching_dimension_for_param( - body.clone(), - func_name.clone(), - pname.clone(), - false, - true, - si.clone(), - ); - match list_ev.clone() { - Some(DescentEvidence::Strict) => { - Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new( - RankingDimension::ListLength { - param: pname.clone(), - }, - )]), - })) - } - _ => None, - } - } - } - } - } - } - }) +pub fn construct_branching_termination_proof(func_name: String, body: Rc, params: Rc>>, si: Rc>>) -> Option> { + params.iter().cloned().fold(None, |best: _, p: Rc| match best.clone() { + Some(_) => best.clone(), + None => { + let pname = param_node_name_at(p.clone(), si.clone()); +let type_name = authored_name_at(si.clone(), ¶m_node_type_expr(&p)); +match type_iteration_dimension(&type_name) { + Some(IterationDimension::TreeDescent) => match try_branching_dimension_for_param(body.clone(), func_name.clone(), pname.clone(), true, false, si.clone()) { + Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { + param: pname.clone(), +})]), +})), + _ => None, +}, + Some(IterationDimension::CollectionFold) => match try_branching_dimension_for_param(body.clone(), func_name.clone(), pname.clone(), false, true, si.clone()) { + Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::ListLength { + param: pname.clone(), +})]), +})), + _ => None, +}, + Some(IterationDimension::ArithmeticRepeat) => None, + None => { + let tree_ev = try_branching_dimension_for_param(body.clone(), func_name.clone(), pname.clone(), true, false, si.clone()); +match tree_ev.clone() { + Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { + param: pname.clone(), +})]), +})), + _ => { + let list_ev = try_branching_dimension_for_param(body.clone(), func_name.clone(), pname.clone(), false, true, si.clone()); +match list_ev.clone() { + Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::ListLength { + param: pname.clone(), +})]), +})), + _ => None, +} +}, +} +}, +} +}, +}) } pub fn proof_to_call_pattern(proof: Rc) -> Rc { match proof.dimensions.clone().first().cloned() { - Some(dim) => match (*dim.clone()).clone() { - RankingDimension::TreeSize { param: p, .. } => { - Rc::new(CallPattern::ChildAccessorCall { - accessor: p.clone(), - }) - } - RankingDimension::ListLength { param: p, .. } => { - Rc::new(CallPattern::CollectionShrinkCall { - amount: Rc::new(PositiveDescentAmount::OneStep), - collection: p.clone(), - }) - } - RankingDimension::ArithmeticValue { param: p, .. } => { - Rc::new(CallPattern::ArithmeticSubtractCall { - steps: Rc::new(PositiveDescentAmount::OneStep), - ring_param: p.clone(), - }) - } - RankingDimension::TokenPosition { param: p, .. } => { - Rc::new(CallPattern::ParserAdvanceCall { witness: p.clone() }) - } - RankingDimension::SetCardinality { param: p, .. } => { - Rc::new(CallPattern::WorklistDrainCall { element: p.clone() }) - } - }, - None => Rc::new(CallPattern::SameArgumentCall), - } + Some(dim) => match (*dim.clone()).clone() { + RankingDimension::TreeSize { param: p, .. } => Rc::new(CallPattern::ChildAccessorCall { + accessor: p.clone(), +}), + RankingDimension::ListLength { param: p, .. } => Rc::new(CallPattern::CollectionShrinkCall { + amount: Rc::new(PositiveDescentAmount::OneStep), + collection: p.clone(), +}), + RankingDimension::ArithmeticValue { param: p, .. } => Rc::new(CallPattern::ArithmeticSubtractCall { + steps: Rc::new(PositiveDescentAmount::OneStep), + ring_param: p.clone(), +}), + RankingDimension::TokenPosition { param: p, .. } => Rc::new(CallPattern::ParserAdvanceCall { + witness: p.clone(), +}), + RankingDimension::SetCardinality { param: p, .. } => Rc::new(CallPattern::WorklistDrainCall { + element: p.clone(), +}), +}, + None => Rc::new(CallPattern::SameArgumentCall), +} } -pub fn classify_recursion_pattern( - func_name: &String, - body: &Rc, - params: &Rc>>, - parser_always_advancing: Rc>, - si: &Rc>>, -) -> Rc { +pub fn classify_recursion_pattern(func_name: &String, body: &Rc, params: &Rc>>, parser_always_advancing: Rc>, si: &Rc>>) -> Rc { { let path_calls = max_path_self_calls(body.clone(), func_name.clone(), si.clone()); - if (path_calls.clone() == 0) { +if (path_calls.clone() == 0) { { let outer = match params.clone().first().cloned() { - Some(p0) => param_node_name_at(p0.clone(), si.clone()), - None => "_fold_body".to_string(), - }; - lower_call_pattern(Rc::new(CallPattern::FoldBodyCall { - outer_collection: outer, - })) - } + Some(p0) => param_node_name_at(p0.clone(), si.clone()), + None => "_fold_body".to_string(), +}; +lower_call_pattern(Rc::new(CallPattern::FoldBodyCall { + outer_collection: outer, +})) +} } else { { - let all_evidence = - collect_self_call_evidence(body.clone(), func_name.clone(), si.clone()); - let has_evidence = ((all_evidence.clone().len() as i64) > 0); - let all_structural = (has_evidence && { - let mut __all = true; - for call_ev in all_evidence.clone().iter().cloned() { - if !({ - let mut __found = false; - for rel in call_ev.clone().iter().cloned() { - if match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { .. } => true, - SubValueRelation::IteratedSubValue { .. } => true, - SubValueRelation::ArithmeticDescent { .. } => true, - _ => false, - } { - __found = true; - break; - } - } - __found - }) { - __all = false; - break; - } - } - __all - }); - if all_structural { + let all_evidence = collect_self_call_evidence(body.clone(), func_name.clone(), si.clone()); +let has_evidence = ((all_evidence.clone().len() as i64) > 0); +let all_structural = (has_evidence && { let mut __all = true; for call_ev in all_evidence.clone().iter().cloned() { if !({ let mut __found = false; for rel in call_ev.clone().iter().cloned() { if match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { .. } => true, + SubValueRelation::IteratedSubValue { .. } => true, + SubValueRelation::ArithmeticDescent { .. } => true, + _ => false, +} { __found = true; break; } } __found }) { __all = false; break; } } __all }); +if all_structural { { - let all_calls_arithmetic_only = { - let mut __all = true; - for call_ev in all_evidence.clone().iter().cloned() { - if !({ - let has_tree = { - let mut __found = false; - for rel in call_ev.clone().iter().cloned() { - if match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { .. } => true, - SubValueRelation::IteratedSubValue { .. } => true, - _ => false, - } { - __found = true; - break; - } - } - __found - }; - let has_arith = { - let mut __found = false; - for rel in call_ev.clone().iter().cloned() { - if match (*rel.clone()).clone() { - SubValueRelation::ArithmeticDescent { .. } => true, - _ => false, - } { - __found = true; - break; - } - } - __found - }; - (has_arith.clone() && !has_tree.clone()) - }) { - __all = false; - break; - } - } - __all - }; - let first_call = if all_calls_arithmetic_only { - Rc::new({ - let mut __result = Vec::new(); - for call_ev in all_evidence.clone().iter().cloned() { - __result.extend( - (*Rc::new({ - let mut __result = Vec::new(); - for rel in call_ev.clone().iter().cloned() { - if match (*rel.clone()).clone() { - SubValueRelation::ArithmeticDescent { - .. - } => true, - _ => false, - } { - __result.push(rel); - } - } - __result - })) - .iter() - .cloned(), - ); - } - __result - }) - .first() - .cloned() + let all_calls_arithmetic_only = { let mut __all = true; for call_ev in all_evidence.clone().iter().cloned() { if !({ + let has_tree = { let mut __found = false; for rel in call_ev.clone().iter().cloned() { if match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { .. } => true, + SubValueRelation::IteratedSubValue { .. } => true, + _ => false, +} { __found = true; break; } } __found }; +let has_arith = { let mut __found = false; for rel in call_ev.clone().iter().cloned() { if match (*rel.clone()).clone() { + SubValueRelation::ArithmeticDescent { .. } => true, + _ => false, +} { __found = true; break; } } __found }; +(has_arith.clone() && !has_tree.clone()) +}) { __all = false; break; } } __all }; +let first_call = if all_calls_arithmetic_only { + Rc::new({ let mut __result = Vec::new(); for call_ev in all_evidence.clone().iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for rel in call_ev.clone().iter().cloned() { if match (*rel.clone()).clone() { + SubValueRelation::ArithmeticDescent { .. } => true, + _ => false, +} { __result.push(rel); } } __result })).iter().cloned()); } __result }).first().cloned() } else { { - let tree_rels = - Rc::new({ - let mut __result = Vec::new(); - for call_ev in all_evidence.clone().iter().cloned() { - __result.extend( - (*Rc::new({ - let mut __result = Vec::new(); - for rel in call_ev.clone().iter().cloned() { - if match (*rel.clone()).clone() { + let tree_rels = Rc::new({ let mut __result = Vec::new(); for call_ev in all_evidence.clone().iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for rel in call_ev.clone().iter().cloned() { if match (*rel.clone()).clone() { SubValueRelation::StrictSubValue { .. } => true, SubValueRelation::IteratedSubValue { .. } => true, _ => false, -} { __result.push(rel); } - } - __result - })) - .iter() - .cloned(), - ); - } - __result - }); - match tree_rels.clone().first().cloned() { - Some(_) => tree_rels.clone().first().cloned(), - None => Rc::new({ - let mut __result = Vec::new(); - for call_ev in all_evidence.clone().iter().cloned() { - __result.extend( - (*Rc::new({ - let mut __result = Vec::new(); - for rel in call_ev.clone().iter().cloned() { - if match (*rel.clone()).clone() { +} { __result.push(rel); } } __result })).iter().cloned()); } __result }); +match tree_rels.clone().first().cloned() { + Some(_) => tree_rels.clone().first().cloned(), + None => Rc::new({ let mut __result = Vec::new(); for call_ev in all_evidence.clone().iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for rel in call_ev.clone().iter().cloned() { if match (*rel.clone()).clone() { SubValueRelation::ArithmeticDescent { .. } => true, _ => false, -} { __result.push(rel); } - } - __result - })) - .iter() - .cloned(), - ); - } - __result - }) - .first() - .cloned(), - } - } - }; - let is_arithmetic_branching = match first_call.clone() { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::ArithmeticDescent { .. } => { - (path_calls.clone() > 1) - } - _ => false, - }, - None => false, +} { __result.push(rel); } } __result })).iter().cloned()); } __result }).first().cloned(), +} +} }; - if is_arithmetic_branching { +let is_arithmetic_branching = match first_call.clone() { + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::ArithmeticDescent { .. } => (path_calls.clone() > 1), + _ => false, +}, + None => false, +}; +if is_arithmetic_branching { lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)) } else { match first_call.clone() { - Some(rel) => match sub_value_to_lowering_target(rel.clone()) { - Some(target) => target.clone(), - None => { - lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)) - } - }, - None => lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)), - } + Some(rel) => match sub_value_to_lowering_target(rel.clone()) { + Some(target) => target.clone(), + None => lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)), +}, + None => lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)), +} } - } +} } else { { - let proof = construct_termination_proof( - &func_name, - &body, - ¶ms, - parser_always_advancing, - &si, - ); - let proof_safe_for_branching = match proof.clone() { - Some(p) => { - if ((p.dimensions.clone().len() as i64) == 0) { - false - } else { - { - let mut __all = true; - for dim in p.dimensions.clone().iter().cloned() { - if !(match (*dim.clone()).clone() { - RankingDimension::TreeSize { .. } => true, - RankingDimension::ListLength { .. } => true, - _ => false, - }) { - __all = false; - break; - } - } - __all - } - } - } - None => false, - }; - let branching_proof = - if ((path_calls.clone() > 1) && !proof_safe_for_branching.clone()) { - construct_branching_termination_proof( - func_name.clone(), - body.clone(), - params.clone(), - si.clone(), - ) - } else { - None - }; - let branching_proof_safe = match branching_proof.clone() { - Some(bp) => { - if ((bp.dimensions.clone().len() as i64) == 0) { - false - } else { - { - let mut __all = true; - for dim in bp.dimensions.clone().iter().cloned() { - if !(match (*dim.clone()).clone() { - RankingDimension::TreeSize { .. } => true, - RankingDimension::ListLength { .. } => true, - _ => false, - }) { - __all = false; - break; - } - } - __all - } - } - } - None => false, + let proof = construct_termination_proof(&func_name, &body, ¶ms, parser_always_advancing, &si); +let proof_safe_for_branching = match proof.clone() { + Some(p) => if ((p.dimensions.clone().len() as i64) == 0) { + false + } else { + { let mut __all = true; for dim in p.dimensions.clone().iter().cloned() { if !(match (*dim.clone()).clone() { + RankingDimension::TreeSize { .. } => true, + RankingDimension::ListLength { .. } => true, + _ => false, +}) { __all = false; break; } } __all } + }, + None => false, +}; +let branching_proof = if ((path_calls.clone() > 1) && !proof_safe_for_branching.clone()) { + construct_branching_termination_proof(func_name.clone(), body.clone(), params.clone(), si.clone()) + } else { + None }; - match proof.clone() { - Some(p) => { - if ((path_calls.clone() == 1) || proof_safe_for_branching.clone()) { - lower_call_pattern(proof_to_call_pattern(p.clone())) - } else { - if branching_proof_safe { - match branching_proof.clone() { - Some(bp) => lower_call_pattern(proof_to_call_pattern( - bp.clone(), - )), - None => lower_call_pattern(Rc::new( - CallPattern::SameArgumentCall, - )), - } - } else { - lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)) - } - } - } - None => { - if (path_calls.clone() > 1) { - match branching_proof.clone() { - Some(bp) => { - if branching_proof_safe { - lower_call_pattern(proof_to_call_pattern( - bp.clone(), - )) - } else { - lower_call_pattern(Rc::new( - CallPattern::SameArgumentCall, - )) - } - } - None => lower_call_pattern(Rc::new( - CallPattern::SameArgumentCall, - )), - } - } else { - lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)) - } +let branching_proof_safe = match branching_proof.clone() { + Some(bp) => if ((bp.dimensions.clone().len() as i64) == 0) { + false + } else { + { let mut __all = true; for dim in bp.dimensions.clone().iter().cloned() { if !(match (*dim.clone()).clone() { + RankingDimension::TreeSize { .. } => true, + RankingDimension::ListLength { .. } => true, + _ => false, +}) { __all = false; break; } } __all } + }, + None => false, +}; +match proof.clone() { + Some(p) => if ((path_calls.clone() == 1) || proof_safe_for_branching.clone()) { + lower_call_pattern(proof_to_call_pattern(p.clone())) + } else { + if branching_proof_safe { + match branching_proof.clone() { + Some(bp) => lower_call_pattern(proof_to_call_pattern(bp.clone())), + None => lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)), +} + } else { + lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)) } - } - } + }, + None => if (path_calls.clone() > 1) { + match branching_proof.clone() { + Some(bp) => if branching_proof_safe { + lower_call_pattern(proof_to_call_pattern(bp.clone())) + } else { + lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)) + }, + None => lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)), +} + } else { + lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)) + }, +} +} } - } +} } - } +} } -pub fn bounded_recursive_cost( - target: Rc, - per_iter: Rc, - func_name: String, -) -> Rc { +pub fn bounded_recursive_cost(target: Rc, per_iter: Rc, func_name: String) -> Rc { { let p = size_bound_param(target.bound.clone()); - match p { - Some(v) => { - let var = v2_rt::concat("n_".to_string(), v.clone()); - Rc::new(CostExpr::CostSum { - binder: var.clone(), - upper: Rc::new(SizeExpr::SizeVar { name: var.clone() }), - body: simplify_cost(per_iter), - }) - } - None => Rc::new(CostExpr::CostUnknown { - reason: v2_rt::concat("same-argument recursion in ".to_string(), func_name), - }), - } - } +match p { + Some(v) => { + let var = v2_rt::concat("n_".to_string(), v.clone()); +Rc::new(CostExpr::CostSum { + binder: var.clone(), + upper: Rc::new(SizeExpr::SizeVar { + name: var.clone(), +}), + body: simplify_cost(per_iter), +}) +}, + None => Rc::new(CostExpr::CostUnknown { + reason: v2_rt::concat("same-argument recursion in ".to_string(), func_name), +}), +} +} } -pub fn bounded_scc_cost( - target: Rc, - per_iter: Rc, - members: Rc>, -) -> Rc { +pub fn bounded_scc_cost(target: Rc, per_iter: Rc, members: Rc>) -> Rc { { let p = size_bound_param(target.bound.clone()); - match p { - Some(v) => { - let var = v2_rt::concat("n_".to_string(), v.clone()); - Rc::new(CostExpr::CostSum { - binder: var.clone(), - upper: Rc::new(SizeExpr::SizeVar { name: var.clone() }), - body: simplify_cost(per_iter), - }) - } - None => Rc::new(CostExpr::CostUnknown { - reason: v2_rt::concat( - "same-argument mutual recursion in ".to_string(), - match members.first().cloned() { - Some(n) => n.clone(), - None => "scc".to_string(), - }, - ), - }), - } - } +match p { + Some(v) => { + let var = v2_rt::concat("n_".to_string(), v.clone()); +Rc::new(CostExpr::CostSum { + binder: var.clone(), + upper: Rc::new(SizeExpr::SizeVar { + name: var.clone(), +}), + body: simplify_cost(per_iter), +}) +}, + None => Rc::new(CostExpr::CostUnknown { + reason: v2_rt::concat("same-argument mutual recursion in ".to_string(), match members.first().cloned() { + Some(n) => n.clone(), + None => "scc".to_string(), +}), +}), +} +} } pub fn is_unknown_cost(expr: Rc) -> bool { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*expr).clone() { - CostExpr::CostUnknown { .. } => true, - CostExpr::CostAdd { - left: l, right: r, .. - } => (is_unknown_cost(l.clone()) || is_unknown_cost(r.clone())), - CostExpr::CostMul { - left: l, right: r, .. - } => (is_unknown_cost(l.clone()) || is_unknown_cost(r.clone())), - CostExpr::CostMax { - left: l, right: r, .. - } => (is_unknown_cost(l.clone()) || is_unknown_cost(r.clone())), - CostExpr::CostSum { body: bd, .. } => is_unknown_cost(bd.clone()), - _ => false, + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { + match (*expr).clone() { + CostExpr::CostUnknown { .. } => true, + CostExpr::CostAdd { left: l, right: r, .. } => (is_unknown_cost(l.clone()) || is_unknown_cost(r.clone())), + CostExpr::CostMul { left: l, right: r, .. } => (is_unknown_cost(l.clone()) || is_unknown_cost(r.clone())), + CostExpr::CostMax { left: l, right: r, .. } => (is_unknown_cost(l.clone()) || is_unknown_cost(r.clone())), + CostExpr::CostSum { body: bd, .. } => is_unknown_cost(bd.clone()), + _ => false, +} }) } pub fn extract_unknown_reason(mut expr: Rc) -> String { loop { match (*expr).clone() { - CostExpr::CostUnknown { reason: r, .. } => { - break r.clone(); - } - CostExpr::CostAdd { - left: l, right: r, .. - } => { - if is_unknown_cost(l.clone()) { - { - let __tco_0 = l.clone(); - expr = __tco_0; - continue; - } - } else { - { - let __tco_0 = r.clone(); - expr = __tco_0; - continue; - } - } - } - CostExpr::CostMul { - left: l, right: r, .. - } => { - if is_unknown_cost(l.clone()) { - { - let __tco_0 = l.clone(); - expr = __tco_0; - continue; - } - } else { - { - let __tco_0 = r.clone(); - expr = __tco_0; - continue; - } - } - } - CostExpr::CostMax { - left: l, right: r, .. - } => { - if is_unknown_cost(l.clone()) { - { - let __tco_0 = l.clone(); - expr = __tco_0; - continue; - } - } else { - { - let __tco_0 = r.clone(); - expr = __tco_0; - continue; - } - } - } - CostExpr::CostSum { body: bd, .. } => { - let __tco_0 = bd.clone(); - expr = __tco_0; - continue; - } - _ => { - break "unknown".to_string(); - } - } - } + CostExpr::CostUnknown { reason: r, .. } => { break r.clone(); }, + CostExpr::CostAdd { left: l, right: r, .. } => { if is_unknown_cost(l.clone()) { + { + let __tco_0 = l.clone(); +expr = __tco_0; +continue; +} +} else { + { + let __tco_0 = r.clone(); +expr = __tco_0; +continue; +} +} }, + CostExpr::CostMul { left: l, right: r, .. } => { if is_unknown_cost(l.clone()) { + { + let __tco_0 = l.clone(); +expr = __tco_0; +continue; +} +} else { + { + let __tco_0 = r.clone(); +expr = __tco_0; +continue; +} +} }, + CostExpr::CostMax { left: l, right: r, .. } => { if is_unknown_cost(l.clone()) { + { + let __tco_0 = l.clone(); +expr = __tco_0; +continue; +} +} else { + { + let __tco_0 = r.clone(); +expr = __tco_0; +continue; +} +} }, + CostExpr::CostSum { body: bd, .. } => { { + let __tco_0 = bd.clone(); +expr = __tco_0; +continue; +} }, + _ => { break "unknown".to_string(); }, +} +} } -pub fn collect_local_call_edges_in_expr( - caller: &String, - body: &Rc, - local_func_set: &Rc>, - si: &Rc>>, -) -> Rc>> { +pub fn collect_local_call_edges_in_expr(caller: &String, body: &Rc, local_func_set: &Rc>, si: &Rc>>) -> Rc>> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let this_edges = match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { + { + let this_edges = match (*body.expr_data.clone()).clone() { + ExprData::ExprCall { .. } => { let callee = expr_call_func_at(body.clone(), si.clone()); - if set_has(local_func_set.clone(), callee.clone()) { +if set_has(local_func_set.clone(), callee.clone()) { Rc::new(vec![Rc::new(CallEdge { - caller: caller.clone(), - callee: callee.clone(), - })]) + caller: caller.clone(), + callee: callee.clone(), +})]) } else { Rc::new(vec![]) } - } - _ => Rc::new(vec![]), - }; - let child_edges = Rc::new({ - let mut __result = Vec::new(); - for child in body.children.clone().iter().cloned() { - __result.extend( - (*collect_local_call_edges_in_expr(&caller, &child, &local_func_set, &si)) - .iter() - .cloned(), - ); - } - __result - }); - v2_rt::concat(this_edges, child_edges) +}, + _ => Rc::new(vec![]), +}; +let child_edges = Rc::new({ let mut __result = Vec::new(); for child in body.children.clone().iter().cloned() { __result.extend((*collect_local_call_edges_in_expr(&caller, &child, &local_func_set, &si)).iter().cloned()); } __result }); +v2_rt::concat(this_edges, child_edges) +} }) } -pub fn build_call_graph( - func_entries: &Rc>>, - si: Rc>>, -) -> Rc { +pub fn build_call_graph(func_entries: &Rc>>, si: Rc>>) -> Rc { { - let names = Rc::new({ - let mut __result = Vec::new(); - for entry in func_entries.clone().iter().cloned() { - __result.push(entry.name.clone()); - } - __result - }); - let local_func_set = names.iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, name: String| { - v2_rt::rc_map_insert(acc, name.clone(), true) - }, - ); - let edges = Rc::new({ - let mut __result = Vec::new(); - for entry in func_entries.clone().iter().cloned() { - __result.extend( - (*collect_local_call_edges_in_expr( - &entry.name.clone(), - &entry.body.clone(), - &local_func_set, - &si, - )) - .iter() - .cloned(), - ); - } - __result - }); - Rc::new(CallGraph { - edges: Rc::new({ - let mut __result = Vec::new(); - for edge in Rc::new({ - let mut __result = Vec::new(); - for edge in edges.iter().cloned() { - if (edge.caller.clone().as_str() != edge.callee.clone().as_str()) { - __result.push(edge); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(Rc::new(GraphEdge { - caller: edge.caller.clone(), - callee: edge.callee.clone(), - })); - } - __result - }), - }) - } + let names = Rc::new({ let mut __result = Vec::new(); for entry in func_entries.clone().iter().cloned() { __result.push(entry.name.clone()); } __result }); +let local_func_set = names.iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, name.clone(), true)); +let edges = Rc::new({ let mut __result = Vec::new(); for entry in func_entries.clone().iter().cloned() { __result.extend((*collect_local_call_edges_in_expr(&entry.name.clone(), &entry.body.clone(), &local_func_set, &si)).iter().cloned()); } __result }); +Rc::new(CallGraph { + edges: Rc::new({ let mut __result = Vec::new(); for edge in Rc::new({ let mut __result = Vec::new(); for edge in edges.iter().cloned() { if (edge.caller.clone().as_str() != edge.callee.clone().as_str()) { __result.push(edge); } } __result }).iter().cloned() { __result.push(Rc::new(GraphEdge { + caller: edge.caller.clone(), + callee: edge.callee.clone(), +})); } __result }), +}) +} } pub fn scc_label(members: Rc>) -> String { match members.first().cloned() { - Some(name) => name.clone(), - None => "scc".to_string(), - } + Some(name) => name.clone(), + None => "scc".to_string(), +} } -pub fn classify_scc_call_progress( - arg_expr: &Rc, - param_name: &String, - descent_vars: &Rc>, - si: &Rc>>, -) -> DescentEvidence { +pub fn classify_scc_call_progress(arg_expr: &Rc, param_name: &String, descent_vars: &Rc>, si: &Rc>>) -> DescentEvidence { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { if is_child_descent_expr(&arg_expr, ¶m_name, &descent_vars, &si) { DescentEvidence::Strict @@ -5565,715 +2729,314 @@ pub fn classify_scc_call_progress( DescentEvidence::Strict } else { match (*arg_expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let vname = expr_var_name_at(arg_expr.clone(), si.clone()); - if set_has(descent_vars.clone(), vname.clone()) { - DescentEvidence::Strict + ExprData::ExprVar { .. } => { + let vname = expr_var_name_at(arg_expr.clone(), si.clone()); +if set_has(descent_vars.clone(), vname.clone()) { + DescentEvidence::Strict + } else { + if (vname.clone().as_str() == param_name.clone().as_str()) { + DescentEvidence::NonIncreasing } else { - if (vname.clone().as_str() == param_name.clone().as_str()) { - DescentEvidence::NonIncreasing - } else { - DescentEvidence::DescentUnknown - } + DescentEvidence::DescentUnknown } } - ExprData::ExprCall { .. } => { - if is_tree_size_preserving_wrapper(&arg_expr, si.clone()) { - classify_scc_call_progress( - &wrapper_inner_arg(arg_expr.clone()), - ¶m_name, - &descent_vars, - &si, - ) +}, + ExprData::ExprCall { .. } => if is_tree_size_preserving_wrapper(&arg_expr, si.clone()) { + classify_scc_call_progress(&wrapper_inner_arg(arg_expr.clone()), ¶m_name, &descent_vars, &si) + } else { + if is_sub_value_extractor(&arg_expr, si.clone()) { + { + let inner_progress = classify_scc_call_progress(&extractor_inner_arg(arg_expr.clone()), ¶m_name, &descent_vars, &si); +match inner_progress.clone() { + DescentEvidence::NonIncreasing => DescentEvidence::Strict, + _ => inner_progress.clone(), +} +} + } else { + if is_list_passthrough_call(arg_expr.clone(), si.clone()) { + match list_passthrough_inner_arg(arg_expr.clone(), si.clone()) { + Some(inner) => classify_scc_call_progress(&inner, ¶m_name, &descent_vars, &si), + None => DescentEvidence::DescentUnknown, +} } else { - if is_sub_value_extractor(&arg_expr, si.clone()) { - { - let inner_progress = classify_scc_call_progress( - &extractor_inner_arg(arg_expr.clone()), - ¶m_name, - &descent_vars, - &si, - ); - match inner_progress.clone() { - DescentEvidence::NonIncreasing => DescentEvidence::Strict, - _ => inner_progress.clone(), - } - } - } else { - if is_list_passthrough_call(arg_expr.clone(), si.clone()) { - match list_passthrough_inner_arg(arg_expr.clone(), si.clone()) { - Some(inner) => classify_scc_call_progress( - &inner, - ¶m_name, - &descent_vars, - &si, - ), - None => DescentEvidence::DescentUnknown, - } - } else { - DescentEvidence::DescentUnknown - } - } - } - } - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(arg_expr.clone()); - match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at(base.clone(), si.clone()); - if (set_has(descent_vars.clone(), bname.clone()) - || (bname.clone().as_str() == param_name.clone().as_str())) - { - DescentEvidence::Strict - } else { - { - let field = - field_access_field_at(arg_expr.clone(), si.clone()); - if (field.as_str() == param_name.clone().as_str()) { - DescentEvidence::NonIncreasing - } else { - DescentEvidence::DescentUnknown - } - } - } - } - _ => DescentEvidence::DescentUnknown, + DescentEvidence::DescentUnknown } } - ExprData::ExprMethodCall { - method_semantics: ms, - .. - } => { - if is_generalized_shrink(&arg_expr, si.clone()) { + }, + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(arg_expr.clone()); +match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at(base.clone(), si.clone()); +if (set_has(descent_vars.clone(), bname.clone()) || (bname.clone().as_str() == param_name.clone().as_str())) { + DescentEvidence::Strict + } else { { - let recv = method_receiver(arg_expr.clone()); - let recv_progress = classify_scc_call_progress( - &recv, - ¶m_name, - &descent_vars, - &si, - ); - match recv_progress { - DescentEvidence::Strict => DescentEvidence::Strict, - DescentEvidence::NonIncreasing => DescentEvidence::Strict, - DescentEvidence::DescentUnknown => { - DescentEvidence::DescentUnknown - } + let field = field_access_field_at(arg_expr.clone(), si.clone()); +if (field.as_str() == param_name.clone().as_str()) { + DescentEvidence::NonIncreasing + } else { + DescentEvidence::DescentUnknown } - } - } else { - DescentEvidence::DescentUnknown +} } - } - _ => DescentEvidence::DescentUnknown, - } +}, + _ => DescentEvidence::DescentUnknown, +} +}, + ExprData::ExprMethodCall { method_semantics: ms, .. } => if is_generalized_shrink(&arg_expr, si.clone()) { + { + let recv = method_receiver(arg_expr.clone()); +let recv_progress = classify_scc_call_progress(&recv, ¶m_name, &descent_vars, &si); +match recv_progress { + DescentEvidence::Strict => DescentEvidence::Strict, + DescentEvidence::NonIncreasing => DescentEvidence::Strict, + DescentEvidence::DescentUnknown => DescentEvidence::DescentUnknown, +} +} + } else { + DescentEvidence::DescentUnknown + }, + _ => DescentEvidence::DescentUnknown, +} } } }) } -pub fn collect_scc_child_edges( - body: &Rc, - caller: &String, - param_name: &String, - descent_vars: &Rc>, - target_set: &Rc>, - check_child: bool, - check_list: bool, - scc_measure_params: &Rc>>>, - si: &Rc>>, -) -> Rc>> { +pub fn collect_scc_child_edges(body: &Rc, caller: &String, param_name: &String, descent_vars: &Rc>, target_set: &Rc>, check_child: bool, check_list: bool, scc_measure_params: &Rc>>>, si: &Rc>>) -> Rc>> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprLambda => Rc::new(vec![]), - ExprData::ExprCall { .. } => { - let callee = expr_call_func_at(body.clone(), si.clone()); - let own_edges = if set_has(target_set.clone(), callee.clone()) { - { - let callee_params = - match v2_rt::map_get(&scc_measure_params, callee.clone()) { - Some(p) => p.clone(), - None => v2_rt::rc_empty_map::(), - }; - let progress = body.children.clone().iter().cloned().fold( - DescentEvidence::DescentUnknown, - |acc: DescentEvidence, arg_node: Rc| { - let targets_measure = - match arg_name_at(arg_node.clone(), si.clone()) { - Some(aname) => { - (v2_rt::map_get(&callee_params, aname.clone()) != None) - } - None => false, - }; - if targets_measure.clone() { - { - let arg_progress = classify_scc_call_progress( - &arg_value(&arg_node), - ¶m_name, - &descent_vars, - &si, - ); - match arg_progress.clone() { - DescentEvidence::Strict => DescentEvidence::Strict, - DescentEvidence::NonIncreasing => match acc.clone() { - DescentEvidence::Strict => acc.clone(), - _ => DescentEvidence::NonIncreasing, - }, - DescentEvidence::DescentUnknown => acc.clone(), - } - } - } else { - acc.clone() - } - }, - ); - Rc::new(vec![Rc::new(ParserProgressEdge { - caller: caller.clone(), - callee: callee.clone(), - progress: progress, - })]) - } - } else { - Rc::new(vec![]) - }; - let child_edges = Rc::new({ - let mut __result = Vec::new(); - for child in body.children.clone().iter().cloned() { - __result.extend( - (*collect_scc_child_edges( - &child, - &caller, - ¶m_name, - &descent_vars, - &target_set, - check_child.clone(), - check_list.clone(), - &scc_measure_params, - &si, - )) - .iter() - .cloned(), - ); - } - __result - }); - v2_rt::concat(own_edges, child_edges) - } - ExprData::ExprMethodCall { - method_semantics: ms, - .. - } => { - let receiver = method_receiver(body.clone()); - let is_iter = is_algebra_iteration_method(ms.clone()); - let is_struct = is_structural_children(&receiver, ¶m_name, &descent_vars, &si); - if (is_iter && is_struct) { - { - let recv_edges = collect_scc_child_edges( - &receiver, - &caller, - ¶m_name, - &descent_vars, - &target_set, - check_child.clone(), - check_list.clone(), - &scc_measure_params, - &si, - ); - let args_edges = Rc::new({ - let mut __result = Vec::new(); - for arg_node in method_arg_nodes(body.clone()).iter().cloned() { - __result.extend( - (*{ - let arg_val = arg_value(&arg_node); - match (*arg_val.expr_data.clone()).clone() { - ExprData::ExprLambda => match iteration_element_name( - ms.clone(), - arg_val.clone(), - si.clone(), - ) { - Some(iter_name) => { - let ext_vars = v2_rt::rc_map_insert( - descent_vars.clone(), - iter_name.clone(), - true, - ); - collect_scc_child_edges( - &lambda_body(arg_val.clone()), - &caller, - ¶m_name, - &ext_vars, - &target_set, - check_child.clone(), - check_list.clone(), - &scc_measure_params, - &si, - ) - } - None => Rc::new(vec![]), - }, - _ => collect_scc_child_edges( - &arg_val, - &caller, - ¶m_name, - &descent_vars, - &target_set, - check_child.clone(), - check_list.clone(), - &scc_measure_params, - &si, - ), - } - }) - .iter() - .cloned(), - ); - } - __result - }); - v2_rt::concat(recv_edges, args_edges) - } - } else { - Rc::new({ - let mut __result = Vec::new(); - for child in body.children.clone().iter().cloned() { - __result.extend( - (*collect_scc_child_edges( - &child, - &caller, - ¶m_name, - &descent_vars, - &target_set, - check_child.clone(), - check_list.clone(), - &scc_measure_params, - &si, - )) - .iter() - .cloned(), - ); - } - __result - }) - } - } - ExprData::ExprLet => { - let val = let_value(body.clone()); - let val_edges = collect_scc_child_edges( - &val, - &caller, - ¶m_name, - &descent_vars, - &target_set, - check_child.clone(), - check_list.clone(), - &scc_measure_params, - &si, - ); - let is_direct = ((check_child.clone() - && is_child_descent_expr(&val, ¶m_name, &descent_vars, &si)) - || (check_list.clone() - && is_list_shrink_expr(&val, param_name.clone(), si.clone()))); - let is_var = match (*val.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has( - descent_vars.clone(), - expr_var_name_at(val.clone(), si.clone()), - ), - _ => false, - }; - let is_option = is_if_option_descent( - &val, - param_name.clone(), - descent_vars.clone(), - check_child.clone(), - check_list.clone(), - &si, - ); - let is_match_descent = is_match_option_descent( - &val, - ¶m_name, - descent_vars.clone(), - check_child.clone(), - check_list.clone(), - &si, - ); - let is_wrapped = if is_tree_size_preserving_wrapper(&val, si.clone()) { - { - let inner = wrapper_inner_arg(val.clone()); - let inner_d = ((check_child.clone() - && is_child_descent_expr(&inner, ¶m_name, &descent_vars, &si)) - || (check_list.clone() - && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); - let inner_v = match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has( - descent_vars.clone(), - expr_var_name_at(inner.clone(), si.clone()), - ), - _ => false, - }; - (inner_d.clone() || inner_v.clone()) - } - } else { - false - }; - let is_extraction = if is_sub_value_extractor(&val, si.clone()) { - { - let inner = extractor_inner_arg(val.clone()); - let inner_d = ((check_child.clone() - && is_child_descent_expr(&inner, ¶m_name, &descent_vars, &si)) - || (check_list.clone() - && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); - let inner_v = match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has( - descent_vars.clone(), - expr_var_name_at(inner.clone(), si.clone()), - ), - _ => false, - }; - let inner_p = match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - (expr_var_name_at(inner.clone(), si.clone()).as_str() - == param_name.clone().as_str()) - } - _ => false, - }; - ((inner_d.clone() || inner_v.clone()) || inner_p) - } - } else { - false - }; - let is_children_list = match (*val.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(val.clone()); - let field = field_access_field_at(val.clone(), si.clone()); - (is_children_list_field(field) - && match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at(base.clone(), si.clone()); - ((bname.clone().as_str() == param_name.clone().as_str()) - || set_has(descent_vars.clone(), bname.clone())) - } - _ => false, - }) - } - _ => false, - }; - let is_passthrough = if is_list_passthrough_call(val.clone(), si.clone()) { - match list_passthrough_inner_arg(val.clone(), si.clone()) { - Some(inner) => { - (((check_child.clone() - && is_child_descent_expr(&inner, ¶m_name, &descent_vars, &si)) - || (check_list.clone() - && is_list_shrink_expr( - &inner, - param_name.clone(), - si.clone(), - ))) - || match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has( - descent_vars.clone(), - expr_var_name_at(inner.clone(), si.clone()), - ), - _ => false, - }) - } - None => false, - } - } else { - false - }; - let is_consuming_helper = (check_list.clone() - && is_tokens_consuming_call( - &val, - param_name.clone(), - descent_vars.clone(), - &si, - )); - let next_vars = if ((((((((is_direct || is_var) || is_option) - || is_match_descent) - || is_wrapped) - || is_extraction) - || is_children_list) - || is_passthrough) - || is_consuming_helper) + ExprData::ExprLambda => Rc::new(vec![]), + ExprData::ExprCall { .. } => { + let callee = expr_call_func_at(body.clone(), si.clone()); +let own_edges = if set_has(target_set.clone(), callee.clone()) { { - v2_rt::rc_map_insert( - descent_vars.clone(), - let_binding_name_at(body.clone(), si.clone()), - true, - ) - } else { - descent_vars.clone() - }; - let body_edges = match let_body(body.clone()) { - Some(b) => collect_scc_child_edges( - &b, - &caller, - ¶m_name, - &next_vars, - &target_set, - check_child.clone(), - check_list.clone(), - &scc_measure_params, - &si, - ), - None => Rc::new(vec![]), - }; - v2_rt::concat(val_edges, body_edges) - } - ExprData::ExprMatch => { - let scrut = match_scrutinee(body.clone()); - let scrut_edges = collect_scc_child_edges( - &scrut, - &caller, - ¶m_name, - &descent_vars, - &target_set, - check_child.clone(), - check_list.clone(), - &scc_measure_params, - &si, - ); - let arms_edges = Rc::new({ - let mut __result = Vec::new(); - for arm_node in match_arm_nodes(body.clone()).iter().cloned() { - __result.extend( - (*collect_scc_child_edges( - &arm_body(&arm_node), - &caller, - ¶m_name, - &descent_vars, - &target_set, - check_child.clone(), - check_list.clone(), - &scc_measure_params, - &si, - )) - .iter() - .cloned(), - ); - } - __result - }); - v2_rt::concat(scrut_edges, arms_edges) - } - ExprData::ExprBlock => { - let result = body.children.clone().iter().cloned().fold( - Rc::new(SccEdgeBlockAcc { - edges: Rc::new(vec![]), - vars: descent_vars.clone(), - }), - |acc: Rc, stmt: Rc| { - let stmt_edges = collect_scc_child_edges( - &stmt, - &caller, - ¶m_name, - &acc.vars.clone(), - &target_set, - check_child.clone(), - check_list.clone(), - &scc_measure_params, - &si, - ); - let next_vars = collect_descent_vars( - &stmt, - ¶m_name, - &acc.vars.clone(), - check_child.clone(), - check_list.clone(), - &si, - ); - Rc::new(SccEdgeBlockAcc { - edges: v2_rt::concat(acc.edges.clone(), stmt_edges.clone()), - vars: next_vars.clone(), - }) - }, - ); - result.edges.clone() - } - ExprData::ExprIf => { - let cond_edges = collect_scc_child_edges( - &if_condition(body.clone()), - &caller, - ¶m_name, - &descent_vars, - &target_set, - check_child.clone(), - check_list.clone(), - &scc_measure_params, - &si, - ); - let then_branch = if_then_branch(body.clone()); - let else_opt = if_else_branch(body.clone()); - let then_edges = collect_scc_child_edges( - &then_branch, - &caller, - ¶m_name, - &descent_vars, - &target_set, - check_child.clone(), - check_list.clone(), - &scc_measure_params, - &si, - ); - let else_edges = match else_opt { - Some(eb) => collect_scc_child_edges( - &eb, - &caller, - ¶m_name, - &descent_vars, - &target_set, - check_child.clone(), - check_list.clone(), - &scc_measure_params, - &si, - ), - None => Rc::new(vec![]), - }; - v2_rt::concat(cond_edges, v2_rt::concat(then_edges, else_edges)) + let callee_params = match v2_rt::map_get(&scc_measure_params, callee.clone()) { + Some(p) => p.clone(), + None => v2_rt::rc_empty_map::(), +}; +let progress = body.children.clone().iter().cloned().fold(DescentEvidence::DescentUnknown, |acc: DescentEvidence, arg_node: Rc| { + let targets_measure = match arg_name_at(arg_node.clone(), si.clone()) { + Some(aname) => (v2_rt::map_get(&callee_params, aname.clone()) != None), + None => false, +}; +if targets_measure.clone() { + { + let arg_progress = classify_scc_call_progress(&arg_value(&arg_node), ¶m_name, &descent_vars, &si); +match arg_progress.clone() { + DescentEvidence::Strict => DescentEvidence::Strict, + DescentEvidence::NonIncreasing => match acc.clone() { + DescentEvidence::Strict => acc.clone(), + _ => DescentEvidence::NonIncreasing, +}, + DescentEvidence::DescentUnknown => acc.clone(), +} +} + } else { + acc.clone() + } +}); +Rc::new(vec![Rc::new(ParserProgressEdge { + caller: caller.clone(), + callee: callee.clone(), + progress: progress, +})]) +} + } else { + Rc::new(vec![]) + }; +let child_edges = Rc::new({ let mut __result = Vec::new(); for child in body.children.clone().iter().cloned() { __result.extend((*collect_scc_child_edges(&child, &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si)).iter().cloned()); } __result }); +v2_rt::concat(own_edges, child_edges) +}, + ExprData::ExprMethodCall { method_semantics: ms, .. } => { + let receiver = method_receiver(body.clone()); +let is_iter = is_algebra_iteration_method(ms.clone()); +let is_struct = is_structural_children(&receiver, ¶m_name, &descent_vars, &si); +if (is_iter && is_struct) { + { + let recv_edges = collect_scc_child_edges(&receiver, &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si); +let args_edges = Rc::new({ let mut __result = Vec::new(); for arg_node in method_arg_nodes(body.clone()).iter().cloned() { __result.extend((*{ + let arg_val = arg_value(&arg_node); +match (*arg_val.expr_data.clone()).clone() { + ExprData::ExprLambda => match iteration_element_name(ms.clone(), arg_val.clone(), si.clone()) { + Some(iter_name) => { + let ext_vars = v2_rt::rc_map_insert(descent_vars.clone(), iter_name.clone(), true); +collect_scc_child_edges(&lambda_body(arg_val.clone()), &caller, ¶m_name, &ext_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si) +}, + None => Rc::new(vec![]), +}, + _ => collect_scc_child_edges(&arg_val, &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si), +} +}).iter().cloned()); } __result }); +v2_rt::concat(recv_edges, args_edges) +} + } else { + Rc::new({ let mut __result = Vec::new(); for child in body.children.clone().iter().cloned() { __result.extend((*collect_scc_child_edges(&child, &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si)).iter().cloned()); } __result }) } - _ => Rc::new({ - let mut __result = Vec::new(); - for child in body.children.clone().iter().cloned() { - __result.extend( - (*collect_scc_child_edges( - &child, - &caller, - ¶m_name, - &descent_vars, - &target_set, - check_child.clone(), - check_list.clone(), - &scc_measure_params, - &si, - )) - .iter() - .cloned(), - ); - } - __result - }), - } +}, + ExprData::ExprLet => { + let val = let_value(body.clone()); +let val_edges = collect_scc_child_edges(&val, &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si); +let is_direct = ((check_child.clone() && is_child_descent_expr(&val, ¶m_name, &descent_vars, &si)) || (check_list.clone() && is_list_shrink_expr(&val, param_name.clone(), si.clone()))); +let is_var = match (*val.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has(descent_vars.clone(), expr_var_name_at(val.clone(), si.clone())), + _ => false, +}; +let is_option = is_if_option_descent(&val, param_name.clone(), descent_vars.clone(), check_child.clone(), check_list.clone(), &si); +let is_match_descent = is_match_option_descent(&val, ¶m_name, descent_vars.clone(), check_child.clone(), check_list.clone(), &si); +let is_wrapped = if is_tree_size_preserving_wrapper(&val, si.clone()) { + { + let inner = wrapper_inner_arg(val.clone()); +let inner_d = ((check_child.clone() && is_child_descent_expr(&inner, ¶m_name, &descent_vars, &si)) || (check_list.clone() && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); +let inner_v = match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has(descent_vars.clone(), expr_var_name_at(inner.clone(), si.clone())), + _ => false, +}; +(inner_d.clone() || inner_v.clone()) +} + } else { + false + }; +let is_extraction = if is_sub_value_extractor(&val, si.clone()) { + { + let inner = extractor_inner_arg(val.clone()); +let inner_d = ((check_child.clone() && is_child_descent_expr(&inner, ¶m_name, &descent_vars, &si)) || (check_list.clone() && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); +let inner_v = match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has(descent_vars.clone(), expr_var_name_at(inner.clone(), si.clone())), + _ => false, +}; +let inner_p = match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => (expr_var_name_at(inner.clone(), si.clone()).as_str() == param_name.clone().as_str()), + _ => false, +}; +((inner_d.clone() || inner_v.clone()) || inner_p) +} + } else { + false + }; +let is_children_list = match (*val.expr_data.clone()).clone() { + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(val.clone()); +let field = field_access_field_at(val.clone(), si.clone()); +(is_children_list_field(field) && match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at(base.clone(), si.clone()); +((bname.clone().as_str() == param_name.clone().as_str()) || set_has(descent_vars.clone(), bname.clone())) +}, + _ => false, +}) +}, + _ => false, +}; +let is_passthrough = if is_list_passthrough_call(val.clone(), si.clone()) { + match list_passthrough_inner_arg(val.clone(), si.clone()) { + Some(inner) => (((check_child.clone() && is_child_descent_expr(&inner, ¶m_name, &descent_vars, &si)) || (check_list.clone() && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))) || match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has(descent_vars.clone(), expr_var_name_at(inner.clone(), si.clone())), + _ => false, +}), + None => false, +} + } else { + false + }; +let is_consuming_helper = (check_list.clone() && is_tokens_consuming_call(&val, param_name.clone(), descent_vars.clone(), &si)); +let next_vars = if ((((((((is_direct || is_var) || is_option) || is_match_descent) || is_wrapped) || is_extraction) || is_children_list) || is_passthrough) || is_consuming_helper) { + v2_rt::rc_map_insert(descent_vars.clone(), let_binding_name_at(body.clone(), si.clone()), true) + } else { + descent_vars.clone() + }; +let body_edges = match let_body(body.clone()) { + Some(b) => collect_scc_child_edges(&b, &caller, ¶m_name, &next_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si), + None => Rc::new(vec![]), +}; +v2_rt::concat(val_edges, body_edges) +}, + ExprData::ExprMatch => { + let scrut = match_scrutinee(body.clone()); +let scrut_edges = collect_scc_child_edges(&scrut, &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si); +let arms_edges = Rc::new({ let mut __result = Vec::new(); for arm_node in match_arm_nodes(body.clone()).iter().cloned() { __result.extend((*collect_scc_child_edges(&arm_body(&arm_node), &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si)).iter().cloned()); } __result }); +v2_rt::concat(scrut_edges, arms_edges) +}, + ExprData::ExprBlock => { + let result = body.children.clone().iter().cloned().fold(Rc::new(SccEdgeBlockAcc { + edges: Rc::new(vec![]), + vars: descent_vars.clone(), +}), |acc: Rc, stmt: Rc| { + let stmt_edges = collect_scc_child_edges(&stmt, &caller, ¶m_name, &acc.vars.clone(), &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si); +let next_vars = collect_descent_vars(&stmt, ¶m_name, &acc.vars.clone(), check_child.clone(), check_list.clone(), &si); +Rc::new(SccEdgeBlockAcc { + edges: v2_rt::concat(acc.edges.clone(), stmt_edges.clone()), + vars: next_vars.clone(), +}) +}); +result.edges.clone() +}, + ExprData::ExprIf => { + let cond_edges = collect_scc_child_edges(&if_condition(body.clone()), &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si); +let then_branch = if_then_branch(body.clone()); +let else_opt = if_else_branch(body.clone()); +let then_edges = collect_scc_child_edges(&then_branch, &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si); +let else_edges = match else_opt { + Some(eb) => collect_scc_child_edges(&eb, &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si), + None => Rc::new(vec![]), +}; +v2_rt::concat(cond_edges, v2_rt::concat(then_edges, else_edges)) +}, + _ => Rc::new({ let mut __result = Vec::new(); for child in body.children.clone().iter().cloned() { __result.extend((*collect_scc_child_edges(&child, &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si)).iter().cloned()); } __result }), +} }) } -pub fn is_scc_container_child_descent( - members: &Rc>, - func_index: &Rc>>, - scc_name_set: Rc>, - si: &Rc>>, -) -> bool { +pub fn is_scc_container_child_descent(members: &Rc>, func_index: &Rc>>, scc_name_set: Rc>, si: &Rc>>) -> bool { { - let measure_params = - build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); - let edges = Rc::new({ - let mut __result = Vec::new(); - for name in members.clone().iter().cloned() { - __result.extend( - (*match v2_rt::map_get(&func_index, name.clone()) { - Some(entry) => { - let best_edges = entry.params.clone().iter().cloned().fold( - Rc::new(vec![]), - |best: _, p: Rc| { - let pname = param_node_name_at(p.clone(), si.clone()); - let descent_vars = collect_descent_vars( - &entry.body.clone(), - &pname, - &v2_rt::rc_empty_map::(), - true, - true, - &si, - ); - let param_edges = collect_scc_child_edges( - &entry.body.clone(), - &name, - &pname, - &descent_vars, - &scc_name_set, - true, - true, - &measure_params, - &si, - ); - let unknown_count = - count_unknown_progress_edges(param_edges.clone()); - let best_unknown = count_unknown_progress_edges(best.clone()); - if (((best.clone().len() as i64) == 0) - || (unknown_count.clone() < best_unknown.clone())) - { - param_edges.clone() - } else { - best.clone() - } - }, - ); - best_edges.clone() - } - None => Rc::new(vec![]), - }) - .iter() - .cloned(), - ); - } - __result - }); - let unknown_edge_count = count_unknown_progress_edges(edges.clone()); - (((unknown_edge_count == 0) && ((edges.clone().len() as i64) > 0)) - && (same_progress_subgraph_has_cycle(&members, edges.clone()) == false)) - } + let measure_params = build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); +let edges = Rc::new({ let mut __result = Vec::new(); for name in members.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { + Some(entry) => { + let best_edges = entry.params.clone().iter().cloned().fold(Rc::new(vec![]), |best: _, p: Rc| { + let pname = param_node_name_at(p.clone(), si.clone()); +let descent_vars = collect_descent_vars(&entry.body.clone(), &pname, &v2_rt::rc_empty_map::(), true, true, &si); +let param_edges = collect_scc_child_edges(&entry.body.clone(), &name, &pname, &descent_vars, &scc_name_set, true, true, &measure_params, &si); +let unknown_count = count_unknown_progress_edges(param_edges.clone()); +let best_unknown = count_unknown_progress_edges(best.clone()); +if (((best.clone().len() as i64) == 0) || (unknown_count.clone() < best_unknown.clone())) { + param_edges.clone() + } else { + best.clone() + } +}); +best_edges.clone() +}, + None => Rc::new(vec![]), +}).iter().cloned()); } __result }); +let unknown_edge_count = count_unknown_progress_edges(edges.clone()); +(((unknown_edge_count == 0) && ((edges.clone().len() as i64) > 0)) && (same_progress_subgraph_has_cycle(&members, edges.clone()) == false)) +} } pub fn progress_edge_to_proof_edge(pe: &Rc) -> Rc { Rc::new(ProofEdge { - caller: pe.caller.clone(), - callee: pe.callee.clone(), - evidence: Rc::new(vec![pe.progress.clone()]), - }) + caller: pe.caller.clone(), + callee: pe.callee.clone(), + evidence: Rc::new(vec![pe.progress.clone()]), +}) } pub fn count_unknown_progress_edges(edges: Rc>>) -> i64 { - (Rc::new({ - let mut __result = Vec::new(); - for e in edges.iter().cloned() { - if (e.progress.clone() == DescentEvidence::DescentUnknown) { - __result.push(e); - } - } - __result - }) - .len() as i64) + (Rc::new({ let mut __result = Vec::new(); for e in edges.iter().cloned() { if (e.progress.clone() == DescentEvidence::DescentUnknown) { __result.push(e); } } __result }).len() as i64) } pub fn count_unknown_proof_edges(edges: Rc>>) -> i64 { - (Rc::new({ - let mut __result = Vec::new(); - for e in edges.iter().cloned() { - if match e.evidence.clone().first().cloned() { - Some(DescentEvidence::DescentUnknown) => true, - _ => false, - } { - __result.push(e); - } - } - __result - }) - .len() as i64) + (Rc::new({ let mut __result = Vec::new(); for e in edges.iter().cloned() { if match e.evidence.clone().first().cloned() { + Some(DescentEvidence::DescentUnknown) => true, + _ => false, +} { __result.push(e); } } __result }).len() as i64) } -pub fn collect_scc_proof_edges_for_dim( - members: &Rc>, - func_index: &Rc>>, - scc_name_set: Rc>, - check_child: bool, - check_list: bool, - si: &Rc>>, -) -> Rc>> { +pub fn collect_scc_proof_edges_for_dim(members: &Rc>, func_index: &Rc>>, scc_name_set: Rc>, check_child: bool, check_list: bool, si: &Rc>>) -> Rc>> { { - let measure_params = - build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); - Rc::new({ - let mut __result = Vec::new(); - for name in members.clone().iter().cloned() { - __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { + let measure_params = build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); +Rc::new({ let mut __result = Vec::new(); for name in members.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { Some(entry) => { let best_map = entry.params.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |best: Rc>, p: Rc| { let pname = param_node_name_at(p.clone(), si.clone()); @@ -6295,40 +3058,22 @@ Rc::new(ProofEdge { }); } __result }) }, None => Rc::new(vec![]), -}).iter().cloned()); - } - __result - }) - } +}).iter().cloned()); } __result }) +} } -pub fn merge_edge_evidence( - acc_map: Rc>, - pe: &Rc, -) -> Rc> { +pub fn merge_edge_evidence(acc_map: Rc>, pe: &Rc) -> Rc> { map_evidence_merge_at(&acc_map, &pe.callee.clone(), pe.progress.clone()) } pub fn count_known_in_edge_map(m: &Rc>) -> i64 { - (Rc::new({ - let mut __result = Vec::new(); - for k in Rc::new(v2_rt::map_keys(&m)).iter().cloned() { - if match v2_rt::map_get(&m, k.clone()) { - Some(DescentEvidence::DescentUnknown) => false, - _ => true, - } { - __result.push(k); - } - } - __result - }) - .len() as i64) + (Rc::new({ let mut __result = Vec::new(); for k in Rc::new(v2_rt::map_keys(&m)).iter().cloned() { if match v2_rt::map_get(&m, k.clone()) { + Some(DescentEvidence::DescentUnknown) => false, + _ => true, +} { __result.push(k); } } __result }).len() as i64) } -pub fn pick_best_param_edges( - current: Rc>, - candidate: Rc>, -) -> Rc> { +pub fn pick_best_param_edges(current: Rc>, candidate: Rc>) -> Rc> { if (count_known_in_edge_map(&candidate) > count_known_in_edge_map(¤t)) { candidate.clone() } else { @@ -6336,19 +3081,10 @@ pub fn pick_best_param_edges( } } -pub fn collect_scc_independent_dim_edges( - members: &Rc>, - func_index: &Rc>>, - scc_name_set: Rc>, - si: &Rc>>, -) -> Rc>> { +pub fn collect_scc_independent_dim_edges(members: &Rc>, func_index: &Rc>>, scc_name_set: Rc>, si: &Rc>>) -> Rc>> { { - let measure_params = - build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); - Rc::new({ - let mut __result = Vec::new(); - for name in members.clone().iter().cloned() { - __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { + let measure_params = build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); +Rc::new({ let mut __result = Vec::new(); for name in members.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { Some(entry) => { let tree_edge_map = entry.params.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |best_map: Rc>, p: Rc| { let pname = param_node_name_at(p.clone(), si.clone()); @@ -6383,50 +3119,26 @@ Rc::new(ProofEdge { }); } __result }) }, None => Rc::new(vec![]), -}).iter().cloned()); - } - __result - }) - } +}).iter().cloned()); } __result }) +} } -pub fn collect_scc_parser_proof_edges( - members: Rc>, - func_index: Rc>>, - scc_name_set: Rc>, - si: Rc>>, -) -> Rc>> { +pub fn collect_scc_parser_proof_edges(members: Rc>, func_index: Rc>>, scc_name_set: Rc>, si: Rc>>) -> Rc>> { { let edges = collect_parser_edges_for_scc(&members, &func_index, scc_name_set, &si); - Rc::new({ - let mut __result = Vec::new(); - for pe in edges.iter().cloned() { - __result.push(progress_edge_to_proof_edge(&pe)); - } - __result - }) - } +Rc::new({ let mut __result = Vec::new(); for pe in edges.iter().cloned() { __result.push(progress_edge_to_proof_edge(&pe)); } __result }) +} } -pub fn collect_scc_tree_parser_dim_edges( - members: &Rc>, - func_index: &Rc>>, - scc_name_set: &Rc>, - si: &Rc>>, -) -> Rc>> { +pub fn collect_scc_tree_parser_dim_edges(members: &Rc>, func_index: &Rc>>, scc_name_set: &Rc>, si: &Rc>>) -> Rc>> { { - let all_parser_edges = - collect_parser_edges_for_scc(&members, &func_index, scc_name_set.clone(), &si); - if ((all_parser_edges.clone().len() as i64) == 0) { + let all_parser_edges = collect_parser_edges_for_scc(&members, &func_index, scc_name_set.clone(), &si); +if ((all_parser_edges.clone().len() as i64) == 0) { Rc::new(vec![]) } else { { - let measure_params = - build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); - Rc::new({ - let mut __result = Vec::new(); - for name in members.clone().iter().cloned() { - __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { + let measure_params = build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); +Rc::new({ let mut __result = Vec::new(); for name in members.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { Some(entry) => { let tree_edge_map = entry.params.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |best_map: Rc>, p: Rc| { let pname = param_node_name_at(p.clone(), si.clone()); @@ -6456,28 +3168,16 @@ Rc::new(ProofEdge { }); } __result }) }, None => Rc::new(vec![]), -}).iter().cloned()); - } - __result - }) - } +}).iter().cloned()); } __result }) +} } - } +} } -pub fn collect_scc_cx_l2_tree_edges( - members: &Rc>, - func_index: &Rc>>, - scc_name_set: Rc>, - si: &Rc>>, -) -> Rc>> { +pub fn collect_scc_cx_l2_tree_edges(members: &Rc>, func_index: &Rc>>, scc_name_set: Rc>, si: &Rc>>) -> Rc>> { { - let measure_params = - build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); - Rc::new({ - let mut __result = Vec::new(); - for name in members.clone().iter().cloned() { - __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { + let measure_params = build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); +Rc::new({ let mut __result = Vec::new(); for name in members.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { Some(entry) => { let self_evidence = collect_self_call_evidence(entry.body.clone(), name.clone(), si.clone()); let self_has_calls = ((self_evidence.clone().len() as i64) > 0); @@ -6551,562 +3251,303 @@ Rc::new(vec![Rc::new(ProofEdge { v2_rt::concat(self_edge.clone(), cross_edges.clone()) }, None => Rc::new(vec![]), -}).iter().cloned()); - } - __result - }) - } +}).iter().cloned()); } __result }) +} } -pub fn scc_descending_param( - members: Rc>, - func_index: Rc>>, - si: Rc>>, -) -> String { - members - .iter() - .cloned() - .fold("".to_string(), |found: String, name: String| { - if (found.clone().as_str() != "".to_string().as_str()) { - found.clone() +pub fn scc_descending_param(members: Rc>, func_index: Rc>>, si: Rc>>) -> String { + members.iter().cloned().fold("".to_string(), |found: String, name: String| if (found.clone().as_str() != "".to_string().as_str()) { + found.clone() + } else { + match v2_rt::map_get(&func_index, name.clone()) { + Some(entry) => { + let evidence = collect_self_call_evidence(entry.body.clone(), name.clone(), si.clone()); +match evidence.clone().first().cloned() { + Some(call_ev) => call_ev.clone().iter().cloned().fold("".to_string(), |p: String, rel: Rc| if (p.clone().as_str() != "".to_string().as_str()) { + p.clone() } else { - match v2_rt::map_get(&func_index, name.clone()) { - Some(entry) => { - let evidence = collect_self_call_evidence( - entry.body.clone(), - name.clone(), - si.clone(), - ); - match evidence.clone().first().cloned() { - Some(call_ev) => call_ev.clone().iter().cloned().fold( - "".to_string(), - |p: String, rel: Rc| { - if (p.clone().as_str() != "".to_string().as_str()) { - p.clone() - } else { - match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { - field: f, .. - } => f.element_type.clone(), - SubValueRelation::IteratedSubValue { - field: f, .. - } => f.element_type.clone(), - SubValueRelation::ArithmeticDescent { - param: ap, - .. - } => ap.clone(), - _ => "".to_string(), - } - } - }, - ), - None => "".to_string(), - } - } - None => "".to_string(), - } - } - }) + match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), + SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), + SubValueRelation::ArithmeticDescent { param: ap, .. } => ap.clone(), + _ => "".to_string(), +} + }), + None => "".to_string(), +} +}, + None => "".to_string(), +} + }) } -pub fn construct_scc_termination_proof( - members: &Rc>, - func_index: &Rc>>, - scc_name_set: &Rc>, - si: &Rc>>, -) -> Option> { +pub fn construct_scc_termination_proof(members: &Rc>, func_index: &Rc>>, scc_name_set: &Rc>, si: &Rc>>) -> Option> { { - let cx_l2_edges = - collect_scc_cx_l2_tree_edges(&members, &func_index, scc_name_set.clone(), &si); - let cx_l2_all_known = { - let mut __all = true; - for e in cx_l2_edges.clone().iter().cloned() { - if !(match e.evidence.clone().first().cloned() { - Some(DescentEvidence::DescentUnknown) => false, - _ => true, - }) { - __all = false; - break; - } - } - __all - }; - let cx_l2_param = scc_descending_param(members.clone(), func_index.clone(), si.clone()); - let cx_l2_proof = Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { - param: if (cx_l2_param.clone().as_str() != "".to_string().as_str()) { - cx_l2_param.clone() - } else { - "scc".to_string() - }, - })]), - }); - if ((cx_l2_all_known && ((cx_l2_edges.clone().len() as i64) > 0)) - && (proof_has_non_descending_cycle( - cx_l2_proof.clone(), - members.clone(), - cx_l2_edges.clone(), - ) == false)) - { + let cx_l2_edges = collect_scc_cx_l2_tree_edges(&members, &func_index, scc_name_set.clone(), &si); +let cx_l2_all_known = { let mut __all = true; for e in cx_l2_edges.clone().iter().cloned() { if !(match e.evidence.clone().first().cloned() { + Some(DescentEvidence::DescentUnknown) => false, + _ => true, +}) { __all = false; break; } } __all }; +let cx_l2_param = scc_descending_param(members.clone(), func_index.clone(), si.clone()); +let cx_l2_proof = Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { + param: if (cx_l2_param.clone().as_str() != "".to_string().as_str()) { + cx_l2_param.clone() + } else { + "scc".to_string() + }, +})]), +}); +if ((cx_l2_all_known && ((cx_l2_edges.clone().len() as i64) > 0)) && (proof_has_non_descending_cycle(cx_l2_proof.clone(), members.clone(), cx_l2_edges.clone()) == false)) { Some(cx_l2_proof.clone()) } else { { - let tree_edges = collect_scc_proof_edges_for_dim( - &members, - &func_index, - scc_name_set.clone(), - true, - false, - &si, - ); - let tree_all_known = { - let mut __all = true; - for e in tree_edges.clone().iter().cloned() { - if !(match e.evidence.clone().first().cloned() { - Some(DescentEvidence::DescentUnknown) => false, - _ => true, - }) { - __all = false; - break; - } - } - __all - }; - let tree_proof = Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { - param: "scc".to_string(), - })]), - }); - if ((tree_all_known && ((tree_edges.clone().len() as i64) > 0)) - && (proof_has_non_descending_cycle( - tree_proof.clone(), - members.clone(), - tree_edges.clone(), - ) == false)) - { + let tree_edges = collect_scc_proof_edges_for_dim(&members, &func_index, scc_name_set.clone(), true, false, &si); +let tree_all_known = { let mut __all = true; for e in tree_edges.clone().iter().cloned() { if !(match e.evidence.clone().first().cloned() { + Some(DescentEvidence::DescentUnknown) => false, + _ => true, +}) { __all = false; break; } } __all }; +let tree_proof = Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { + param: "scc".to_string(), +})]), +}); +if ((tree_all_known && ((tree_edges.clone().len() as i64) > 0)) && (proof_has_non_descending_cycle(tree_proof.clone(), members.clone(), tree_edges.clone()) == false)) { Some(tree_proof.clone()) } else { { - let list_edges = collect_scc_proof_edges_for_dim( - &members, - &func_index, - scc_name_set.clone(), - false, - true, - &si, - ); - let list_all_known = { - let mut __all = true; - for e in list_edges.clone().iter().cloned() { - if !(match e.evidence.clone().first().cloned() { - Some(DescentEvidence::DescentUnknown) => false, - _ => true, - }) { - __all = false; - break; - } - } - __all - }; - let list_proof = Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::ListLength { - param: "scc".to_string(), - })]), - }); - if ((list_all_known && ((list_edges.clone().len() as i64) > 0)) - && (proof_has_non_descending_cycle( - list_proof.clone(), - members.clone(), - list_edges.clone(), - ) == false)) - { + let list_edges = collect_scc_proof_edges_for_dim(&members, &func_index, scc_name_set.clone(), false, true, &si); +let list_all_known = { let mut __all = true; for e in list_edges.clone().iter().cloned() { if !(match e.evidence.clone().first().cloned() { + Some(DescentEvidence::DescentUnknown) => false, + _ => true, +}) { __all = false; break; } } __all }; +let list_proof = Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::ListLength { + param: "scc".to_string(), +})]), +}); +if ((list_all_known && ((list_edges.clone().len() as i64) > 0)) && (proof_has_non_descending_cycle(list_proof.clone(), members.clone(), list_edges.clone()) == false)) { Some(list_proof.clone()) } else { { - let parser_edges = collect_scc_parser_proof_edges( - members.clone(), - func_index.clone(), - scc_name_set.clone(), - si.clone(), - ); - let parser_all_known = { - let mut __all = true; - for e in parser_edges.clone().iter().cloned() { - if !(match e.evidence.clone().first().cloned() { - Some(DescentEvidence::DescentUnknown) => false, - _ => true, - }) { - __all = false; - break; - } - } - __all - }; - let parser_proof = Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new( - RankingDimension::TokenPosition { - param: "scc".to_string(), - }, - )]), - }); - if ((parser_all_known && ((parser_edges.clone().len() as i64) > 0)) - && (proof_has_non_descending_cycle( - parser_proof.clone(), - members.clone(), - parser_edges.clone(), - ) == false)) - { + let parser_edges = collect_scc_parser_proof_edges(members.clone(), func_index.clone(), scc_name_set.clone(), si.clone()); +let parser_all_known = { let mut __all = true; for e in parser_edges.clone().iter().cloned() { if !(match e.evidence.clone().first().cloned() { + Some(DescentEvidence::DescentUnknown) => false, + _ => true, +}) { __all = false; break; } } __all }; +let parser_proof = Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::TokenPosition { + param: "scc".to_string(), +})]), +}); +if ((parser_all_known && ((parser_edges.clone().len() as i64) > 0)) && (proof_has_non_descending_cycle(parser_proof.clone(), members.clone(), parser_edges.clone()) == false)) { Some(parser_proof.clone()) } else { { - let lex_edges = collect_scc_independent_dim_edges( - &members, - &func_index, - scc_name_set.clone(), - &si, - ); - let lex_all_known = { - let mut __all = true; - for e in lex_edges.clone().iter().cloned() { - if !(match e.evidence.clone().first().cloned() { - Some(ev) => match ev.clone() { - DescentEvidence::DescentUnknown => false, - _ => true, - }, - None => false, - }) { - __all = false; - break; - } - } - __all - }; - let lex_proof = Rc::new(TerminationProof { - dimensions: Rc::new(vec![ - Rc::new(RankingDimension::TreeSize { - param: "scc".to_string(), - }), - Rc::new(RankingDimension::ListLength { - param: "scc".to_string(), - }), - ]), - }); - if ((lex_all_known - && ((lex_edges.clone().len() as i64) > 0)) - && (proof_has_non_descending_cycle( - lex_proof.clone(), - members.clone(), - lex_edges.clone(), - ) == false)) - { + let lex_edges = collect_scc_independent_dim_edges(&members, &func_index, scc_name_set.clone(), &si); +let lex_all_known = { let mut __all = true; for e in lex_edges.clone().iter().cloned() { if !(match e.evidence.clone().first().cloned() { + Some(ev) => match ev.clone() { + DescentEvidence::DescentUnknown => false, + _ => true, +}, + None => false, +}) { __all = false; break; } } __all }; +let lex_proof = Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { + param: "scc".to_string(), +}), Rc::new(RankingDimension::ListLength { + param: "scc".to_string(), +})]), +}); +if ((lex_all_known && ((lex_edges.clone().len() as i64) > 0)) && (proof_has_non_descending_cycle(lex_proof.clone(), members.clone(), lex_edges.clone()) == false)) { Some(lex_proof.clone()) } else { { - let tree_parser_edges = - collect_scc_tree_parser_dim_edges( - &members, - &func_index, - &scc_name_set, - &si, - ); - let tp_all_known = { - let mut __all = true; - for e in - tree_parser_edges.clone().iter().cloned() - { - if !(match e - .evidence - .clone() - .first() - .cloned() - { - Some(ev) => match ev.clone() { - DescentEvidence::DescentUnknown => { - false - } - _ => true, - }, - None => false, - }) { - __all = false; - break; - } - } - __all - }; - let tp_proof = Rc::new(TerminationProof { - dimensions: Rc::new(vec![ - Rc::new(RankingDimension::TreeSize { - param: "scc".to_string(), - }), - Rc::new(RankingDimension::TokenPosition { - param: "scc".to_string(), - }), - ]), - }); - if ((tp_all_known - && ((tree_parser_edges.clone().len() as i64) - > 0)) - && (proof_has_non_descending_cycle( - tp_proof.clone(), - members.clone(), - tree_parser_edges.clone(), - ) == false)) - { + let tree_parser_edges = collect_scc_tree_parser_dim_edges(&members, &func_index, &scc_name_set, &si); +let tp_all_known = { let mut __all = true; for e in tree_parser_edges.clone().iter().cloned() { if !(match e.evidence.clone().first().cloned() { + Some(ev) => match ev.clone() { + DescentEvidence::DescentUnknown => false, + _ => true, +}, + None => false, +}) { __all = false; break; } } __all }; +let tp_proof = Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { + param: "scc".to_string(), +}), Rc::new(RankingDimension::TokenPosition { + param: "scc".to_string(), +})]), +}); +if ((tp_all_known && ((tree_parser_edges.clone().len() as i64) > 0)) && (proof_has_non_descending_cycle(tp_proof.clone(), members.clone(), tree_parser_edges.clone()) == false)) { Some(tp_proof.clone()) } else { None } - } +} } - } +} } - } +} } - } +} } - } +} } - } +} } -pub fn classify_scc_recursion_pattern( - members: &Rc>, - func_index: &Rc>>, - si: &Rc>>, -) -> Rc { +pub fn classify_scc_recursion_pattern(members: &Rc>, func_index: &Rc>>, si: &Rc>>) -> Rc { { - let scc_name_set = members.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, name: String| { - v2_rt::rc_map_insert(acc, name.clone(), true) - }, - ); - let proof = construct_scc_termination_proof(&members, &func_index, &scc_name_set, &si); - match proof { - Some(p) => lower_call_pattern(proof_to_call_pattern(p.clone())), - None => { - let scc_measure_params = - build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); - match classify_parser_scc_recursion_pattern( - &members, - func_index.clone(), - si.clone(), - ) { - Some(parser_target) => parser_target.clone(), - None => { - let all_arithmetic = { - let mut __all = true; - for name in members.clone().iter().cloned() { - if !(match v2_rt::map_get(&func_index, name.clone()) { - Some(entry) => { - ((max_path_target_calls( - entry.body.clone(), - scc_name_set.clone(), - si.clone(), - ) <= 1) - && scc_calls_have_arithmetic_descent( - &entry.body.clone(), - &scc_name_set, - &func_index, - &scc_measure_params, - &si, - )) - } - None => false, - }) { - __all = false; - break; - } - } - __all - }; - if all_arithmetic { - { - let ring_param = match members.clone().first().cloned() { - Some(m0) => { - match v2_rt::map_get(&scc_measure_params, m0.clone()) { - Some(pmap) => match Rc::new(v2_rt::map_keys(&pmap)) - .first() - .cloned() - { - Some(k) => k.clone(), - None => "_scc_arithmetic".to_string(), - }, - None => "_scc_arithmetic".to_string(), - } - } - None => "_scc_arithmetic".to_string(), - }; - lower_call_pattern(Rc::new(CallPattern::ArithmeticSubtractCall { - steps: Rc::new(PositiveDescentAmount::OneStep), - ring_param: ring_param, - })) - } - } else { - lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)) - } - } + let scc_name_set = members.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, name.clone(), true)); +let proof = construct_scc_termination_proof(&members, &func_index, &scc_name_set, &si); +match proof { + Some(p) => lower_call_pattern(proof_to_call_pattern(p.clone())), + None => { + let scc_measure_params = build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); +match classify_parser_scc_recursion_pattern(&members, func_index.clone(), si.clone()) { + Some(parser_target) => parser_target.clone(), + None => { + let all_arithmetic = { let mut __all = true; for name in members.clone().iter().cloned() { if !(match v2_rt::map_get(&func_index, name.clone()) { + Some(entry) => ((max_path_target_calls(entry.body.clone(), scc_name_set.clone(), si.clone()) <= 1) && scc_calls_have_arithmetic_descent(&entry.body.clone(), &scc_name_set, &func_index, &scc_measure_params, &si)), + None => false, +}) { __all = false; break; } } __all }; +if all_arithmetic { + { + let ring_param = match members.clone().first().cloned() { + Some(m0) => match v2_rt::map_get(&scc_measure_params, m0.clone()) { + Some(pmap) => match Rc::new(v2_rt::map_keys(&pmap)).first().cloned() { + Some(k) => k.clone(), + None => "_scc_arithmetic".to_string(), +}, + None => "_scc_arithmetic".to_string(), +}, + None => "_scc_arithmetic".to_string(), +}; +lower_call_pattern(Rc::new(CallPattern::ArithmeticSubtractCall { + steps: Rc::new(PositiveDescentAmount::OneStep), + ring_param: ring_param, +})) +} + } else { + lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)) } - } - } - } +}, +} +}, +} +} } -pub fn build_scc_index( - func_entries: &Rc>>, - func_index: Rc>>, - si: &Rc>>, -) -> Rc { +pub fn build_scc_index(func_entries: &Rc>>, func_index: Rc>>, si: &Rc>>) -> Rc { { - let names = Rc::new({ - let mut __result = Vec::new(); - for entry in func_entries.clone().iter().cloned() { - __result.push(entry.name.clone()); - } - __result - }); - let graph = build_call_graph(&func_entries, si.clone()); - let adjacency = forward_adjacency(names.clone(), graph.clone()); - let reverse_graph = reverse_adjacency(names.clone(), graph.clone()); - let finish = names.clone().iter().cloned().fold( - Rc::new(DfsFinishAcc { - visited: v2_rt::rc_empty_map::(), - order: Rc::new(vec![]), - }), - |acc: Rc, name: String| dfs_finish_order(&name, &adjacency, &acc), - ); - let topo_order = v2_rt::reverse(finish.order.clone()); - let result = topo_order.clone().iter().cloned().fold( - Rc::new(SccBuildAcc { - assigned: v2_rt::rc_empty_map::(), - index: v2_rt::rc_empty_map::>(), - }), - |acc: Rc, name: String| { - if set_has(acc.assigned.clone(), name.clone()) { - acc.clone() - } else { + let names = Rc::new({ let mut __result = Vec::new(); for entry in func_entries.clone().iter().cloned() { __result.push(entry.name.clone()); } __result }); +let graph = build_call_graph(&func_entries, si.clone()); +let adjacency = forward_adjacency(names.clone(), graph.clone()); +let reverse_graph = reverse_adjacency(names.clone(), graph.clone()); +let finish = names.clone().iter().cloned().fold(Rc::new(DfsFinishAcc { + visited: empty_set(), + order: Rc::new(vec![]), +}), |acc: Rc, name: String| dfs_finish_order(&name, &adjacency, &acc)); +let topo_order = v2_rt::reverse(finish.order.clone()); +let result = topo_order.clone().iter().cloned().fold(Rc::new(SccBuildAcc { + assigned: empty_set(), + index: v2_rt::rc_empty_map::>(), +}), |acc: Rc, name: String| if set_contains(acc.assigned.clone(), name.clone()) { + acc.clone() + } else { + { + let component = dfs_collect_component(&name, &reverse_graph, &Rc::new(SccComponentAcc { + visited: acc.assigned.clone(), + members: Rc::new(vec![]), +})); +let member_set = component.members.clone().iter().cloned().fold(empty_set(), |inner: Rc>, member: String| set_insert(inner, member.clone())); +let members = Rc::new({ let mut __result = Vec::new(); for member in names.clone().iter().cloned() { if set_contains(member_set.clone(), member.clone()) { __result.push(member); } } __result }); +let next_assigned = component.visited.clone(); +if ((members.clone().len() as i64) > 1) { { - let component = dfs_collect_component( - &name, - &reverse_graph, - &Rc::new(SccComponentAcc { - visited: acc.assigned.clone(), - members: Rc::new(vec![]), - }), - ); - let member_set = component.members.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |inner: Rc>, member: String| { - v2_rt::rc_map_insert(inner, member.clone(), true) - }, - ); - let members = Rc::new({ - let mut __result = Vec::new(); - for member in names.clone().iter().cloned() { - if set_has(member_set.clone(), member.clone()) { - __result.push(member); - } - } - __result - }); - let next_assigned = component.visited.clone(); - if ((members.clone().len() as i64) > 1) { - { - let info = Rc::new(SccInfo { - members: members.clone(), - member_set: member_set.clone(), - pattern: classify_scc_recursion_pattern( - &members, - &func_index, - &si, - ), - }); - let next_index = members.clone().iter().cloned().fold( - acc.index.clone(), - |inner: Rc>>, member: String| { - v2_rt::rc_map_insert(inner, member.clone(), info.clone()) - }, - ); - Rc::new(SccBuildAcc { - assigned: next_assigned.clone(), - index: next_index.clone(), - }) - } - } else { - Rc::new(SccBuildAcc { - assigned: next_assigned.clone(), - index: acc.index.clone(), - }) - } - } + let info = Rc::new(SccInfo { + members: members.clone(), + member_set: member_set.clone(), + pattern: classify_scc_recursion_pattern(&members, &func_index, &si), +}); +let next_index = members.clone().iter().cloned().fold(acc.index.clone(), |inner: Rc>>, member: String| v2_rt::rc_map_insert(inner, member.clone(), info.clone())); +Rc::new(SccBuildAcc { + assigned: next_assigned.clone(), + index: next_index.clone(), +}) +} + } else { + Rc::new(SccBuildAcc { + assigned: next_assigned.clone(), + index: acc.index.clone(), +}) } - }, - ); - Rc::new(SccResult { - index: result.index.clone(), - topo_order: topo_order.clone(), - processing_order: finish.order.clone(), - call_graph: graph.clone(), - }) - } +} + }); +Rc::new(SccResult { + index: result.index.clone(), + topo_order: topo_order.clone(), + processing_order: finish.order.clone(), + call_graph: graph.clone(), +}) +} } pub fn cost_seq(a: Rc, b: &Rc) -> Rc { match (*a.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => b.clone(), - _ => match (*b.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => a.clone(), - _ => Rc::new(CostExpr::CostAdd { - left: a.clone(), - right: b.clone(), - }), - }, - } + CostExpr::CostConst { value: 0, .. } => b.clone(), + _ => match (*b.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => a.clone(), + _ => Rc::new(CostExpr::CostAdd { + left: a.clone(), + right: b.clone(), +}), +}, +} } pub fn cost_par(a: Rc, b: &Rc) -> Rc { match (*a.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => b.clone(), - _ => match (*b.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => a.clone(), - _ => Rc::new(CostExpr::CostMax { - left: a.clone(), - right: b.clone(), - }), - }, - } + CostExpr::CostConst { value: 0, .. } => b.clone(), + _ => match (*b.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => a.clone(), + _ => Rc::new(CostExpr::CostMax { + left: a.clone(), + right: b.clone(), +}), +}, +} } pub fn cost_loop(binder: String, iterations: Rc, body: &Rc) -> Rc { match (*body.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => Rc::new(CostExpr::CostConst { value: 0 }), - _ => Rc::new(CostExpr::CostSum { - binder: binder, - upper: iterations, - body: body.clone(), - }), - } + CostExpr::CostConst { value: 0, .. } => Rc::new(CostExpr::CostConst { + value: 0, +}), + _ => Rc::new(CostExpr::CostSum { + binder: binder, + upper: iterations, + body: body.clone(), +}), +} } pub fn cost_conditional(condition: Rc, branches: Rc>>) -> Rc { { - let max_branch = branches.iter().cloned().fold( - Rc::new(CostExpr::CostConst { value: 0 }), - |acc: Rc, b: Rc| cost_par(acc, &b), - ); - cost_seq(condition, &max_branch) - } + let max_branch = branches.iter().cloned().fold(Rc::new(CostExpr::CostConst { + value: 0, +}), |acc: Rc, b: Rc| cost_par(acc, &b)); +cost_seq(condition, &max_branch) +} } pub fn collection_output(binder: String, size: Rc) -> Rc>> { { - let result = seed_cost_map( - "result".to_string(), - cost_loop(binder, size, &Rc::new(CostExpr::CostConst { value: 1 })), - ); - result - } + let result = seed_cost_map("result".to_string(), cost_loop(binder, size, &Rc::new(CostExpr::CostConst { + value: 1, +}))); +result +} } pub fn scalar_output() -> Rc>> { @@ -7118,305 +3559,194 @@ pub fn method_preserves_collection_size(method_semantics: &Option match se.clone() { - Some(CollectionSizeEffect::ShrinkEffect) => true, - Some(CollectionSizeEffect::IdentityEffect) => true, - _ => false, - }, - _ => false, - } + MethodSemantics::AlgebraMethodSemantics { size_effect: se, .. } => match se.clone() { + Some(CollectionSizeEffect::ShrinkEffect) => true, + Some(CollectionSizeEffect::IdentityEffect) => true, + _ => false, +}, + _ => false, +} } } -pub fn receiver_size_var( - mut recv: Rc, - mut si: Rc>>, -) -> Rc { +pub fn receiver_size_var(mut recv: Rc, mut si: Rc>>) -> Rc { loop { match (*recv.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - break Rc::new(SizeExpr::SizeLen { - collection: expr_var_name_at(recv.clone(), si), - }); - } - ExprData::ExprFieldAccess { .. } => { - break Rc::new(SizeExpr::SizeLen { - collection: field_access_field_at(recv.clone(), si), - }); - } - ExprData::ExprMethodCall { - method_semantics, .. - } => { - let inner_recv = match recv.children.clone().first().cloned() { - Some(r) => r.clone(), - None => recv.clone(), - }; - if method_preserves_collection_size(&method_semantics) { - { - let __tco_0 = inner_recv; - recv = __tco_0; - continue; - } - } else { - break Rc::new(SizeExpr::SizeLen { - collection: "__expr".to_string(), - }); - } - } - _ => { - break Rc::new(SizeExpr::SizeLen { - collection: "__expr".to_string(), - }); - } - } - } + ExprData::ExprVar { .. } => { break Rc::new(SizeExpr::SizeLen { + collection: expr_var_name_at(recv.clone(), si), +}); }, + ExprData::ExprFieldAccess { .. } => { break Rc::new(SizeExpr::SizeLen { + collection: field_access_field_at(recv.clone(), si), +}); }, + ExprData::ExprMethodCall { method_semantics, .. } => { let inner_recv = match recv.children.clone().first().cloned() { + Some(r) => r.clone(), + None => recv.clone(), +}; +if method_preserves_collection_size(&method_semantics) { + { + let __tco_0 = inner_recv; +recv = __tco_0; +continue; +} +} else { + break Rc::new(SizeExpr::SizeLen { + collection: "__expr".to_string(), +}); +} }, + _ => { break Rc::new(SizeExpr::SizeLen { + collection: "__expr".to_string(), +}); }, +} +} } pub fn size_binder_name(size: Rc) -> String { match (*size).clone() { - SizeExpr::SizeLen { collection: c, .. } => v2_rt::concat("_".to_string(), c.clone()), - SizeExpr::SizeVar { name: n, .. } => n.clone(), - _ => "_i".to_string(), - } + SizeExpr::SizeLen { collection: c, .. } => v2_rt::concat("_".to_string(), c.clone()), + SizeExpr::SizeVar { name: n, .. } => n.clone(), + _ => "_i".to_string(), +} } -pub fn resolve_lambda_arg( - mc_arg_nodes: &Rc>>, - si: Rc>>, -) -> Option> { +pub fn resolve_lambda_arg(mc_arg_nodes: &Rc>>, si: Rc>>) -> Option> { { - let f_arg = Rc::new({ - let mut __result = Vec::new(); - for a in mc_arg_nodes.clone().iter().cloned() { - if (authored_name_at(si.clone(), &a).as_str() == "f".to_string().as_str()) { - __result.push(a); - } - } - __result - }) - .first() - .cloned(); - match f_arg { - Some(fa) => Some(arg_value(&fa)), - None => Rc::new({ - let mut __result = Vec::new(); - for a in mc_arg_nodes.clone().iter().cloned() { - __result.push(arg_value(&a)); - } - __result - }) - .first() - .cloned(), - } - } + let f_arg = Rc::new({ let mut __result = Vec::new(); for a in mc_arg_nodes.clone().iter().cloned() { if (authored_name_at(si.clone(), &a).as_str() == "f".to_string().as_str()) { __result.push(a); } } __result }).first().cloned(); +match f_arg { + Some(fa) => Some(arg_value(&fa)), + None => Rc::new({ let mut __result = Vec::new(); for a in mc_arg_nodes.clone().iter().cloned() { __result.push(arg_value(&a)); } __result }).first().cloned(), +} +} } -pub fn resolve_callback_cost( - lambda_arg: Option>, - recv_r: Rc, - func_index: &Rc>>, - scc_index: Rc>>, - parser_always_advancing: Rc>, - recursion_ctx: RecursionContext, - si: &Rc>>, -) -> Rc { +pub fn resolve_callback_cost(lambda_arg: Option>, recv_r: Rc, func_index: &Rc>>, scc_index: Rc>>, parser_always_advancing: Rc>, recursion_ctx: RecursionContext, si: &Rc>>) -> Rc { match lambda_arg { - Some(la) => match (*la.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let fn_ref = expr_var_name_at(la.clone(), si.clone()); - match v2_rt::map_get(&func_index, fn_ref.clone()) { - Some(_) => get_or_compute_summary( - &fn_ref, - &func_index, - &scc_index, - &recv_r.table.clone(), - parser_always_advancing, - recursion_ctx, - si.clone(), - ), - None => cost_of_expr( - &la, - &func_index, - &scc_index, - recv_r.table.clone(), - &parser_always_advancing, - &recursion_ctx, - &si, - ), - } - } - _ => cost_of_expr( - &la, - &func_index, - &scc_index, - recv_r.table.clone(), - &parser_always_advancing, - &recursion_ctx, - &si, - ), - }, - None => Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { value: 1 }), - span: Rc::new(CostExpr::CostConst { value: 1 }), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Conservative, - }), - table: recv_r.table.clone(), - }), - } + Some(la) => match (*la.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let fn_ref = expr_var_name_at(la.clone(), si.clone()); +match v2_rt::map_get(&func_index, fn_ref.clone()) { + Some(_) => get_or_compute_summary(&fn_ref, &func_index, &scc_index, &recv_r.table.clone(), parser_always_advancing, recursion_ctx, si.clone()), + None => cost_of_expr(&la, &func_index, &scc_index, recv_r.table.clone(), &parser_always_advancing, &recursion_ctx, &si), } - -pub fn cost_of_method_by_shape( - shape: CostShape, - produces_collection: bool, - recv_r: &Rc, - mc_args: Rc>>, - size: &Rc, - binder: &String, - func_index: Rc>>, - scc_index: Rc>>, - parser_always_advancing: Rc>, - recursion_ctx: RecursionContext, - si: &Rc>>, -) -> Rc { +}, + _ => cost_of_expr(&la, &func_index, &scc_index, recv_r.table.clone(), &parser_always_advancing, &recursion_ctx, &si), +}, + None => Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { + value: 1, +}), + span: Rc::new(CostExpr::CostConst { + value: 1, +}), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Conservative, +}), + table: recv_r.table.clone(), +}), +} +} + +pub fn cost_of_method_by_shape(shape: CostShape, produces_collection: bool, recv_r: &Rc, mc_args: Rc>>, size: &Rc, binder: &String, func_index: Rc>>, scc_index: Rc>>, parser_always_advancing: Rc>, recursion_ctx: RecursionContext, si: &Rc>>) -> Rc { match shape { - CostShape::ShapeIterateBody => { - let lambda_arg = resolve_lambda_arg(&mc_args, si.clone()); - let body_result = resolve_callback_cost( - lambda_arg, - recv_r.clone(), - &func_index, - scc_index, - parser_always_advancing, - recursion_ctx, - &si, - ); - let loop_work = cost_loop( - binder.clone(), - size.clone(), - &body_result.summary.clone().work.clone(), - ); - let os = if (produces_collection == false) { - body_result.summary.clone().output_size.clone() - } else { - { - let r = seed_cost_map( - "result".to_string(), - cost_loop( - binder.clone(), - size.clone(), - &Rc::new(CostExpr::CostConst { value: 1 }), - ), - ); - r - } - }; - Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq(recv_r.summary.clone().work.clone(), &loop_work), - span: cost_seq(recv_r.summary.clone().span.clone(), &loop_work), - output_size: os, - certainty: body_result.summary.clone().certainty.clone(), - }), - table: body_result.table.clone(), - }) - } - CostShape::ShapeSortBody => { - let lambda_arg = resolve_lambda_arg(&mc_args, si.clone()); - let key_result = match lambda_arg { - Some(la) => cost_of_expr( - &la, - &func_index, - &scc_index, - recv_r.table.clone(), - &parser_always_advancing, - &recursion_ctx, - &si, - ), - None => Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { value: 1 }), - span: Rc::new(CostExpr::CostConst { value: 1 }), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, - }), - table: recv_r.table.clone(), - }), - }; - let log_factor = Rc::new(CostExpr::CostLog { - base: 2, - argument: size.clone(), - }); - let per_comparison = key_result.summary.clone().work.clone(); - let sort_work = Rc::new(CostExpr::CostMul { - left: cost_loop(binder.clone(), size.clone(), &per_comparison), - right: log_factor, - }); - let sort_os = seed_cost_map( - "result".to_string(), - cost_loop( - binder.clone(), - size.clone(), - &Rc::new(CostExpr::CostConst { value: 1 }), - ), - ); - Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq(recv_r.summary.clone().work.clone(), &sort_work), - span: cost_seq(recv_r.summary.clone().span.clone(), &sort_work), - output_size: sort_os, - certainty: key_result.summary.clone().certainty.clone(), - }), - table: key_result.table.clone(), - }) - } - CostShape::ShapeLinearScan => { - let loop_work = cost_loop( - binder.clone(), - size.clone(), - &Rc::new(CostExpr::CostConst { value: 1 }), - ); - let scan_os = if produces_collection { - seed_cost_map( - "result".to_string(), - cost_loop( - binder.clone(), - size.clone(), - &Rc::new(CostExpr::CostConst { value: 1 }), - ), - ) - } else { - v2_rt::rc_empty_map::>() - }; - Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq(recv_r.summary.clone().work.clone(), &loop_work), - span: cost_seq(recv_r.summary.clone().span.clone(), &loop_work), - output_size: scan_os, - certainty: recv_r.summary.clone().certainty.clone(), - }), - table: recv_r.table.clone(), - }) - } - CostShape::ShapeConstant => Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq( - recv_r.summary.clone().work.clone(), - &Rc::new(CostExpr::CostConst { value: 1 }), - ), - span: cost_seq( - recv_r.summary.clone().span.clone(), - &Rc::new(CostExpr::CostConst { value: 1 }), - ), - output_size: v2_rt::rc_empty_map::>(), - certainty: recv_r.summary.clone().certainty.clone(), - }), - table: recv_r.table.clone(), - }), - } + CostShape::ShapeIterateBody => { + let lambda_arg = resolve_lambda_arg(&mc_args, si.clone()); +let body_result = resolve_callback_cost(lambda_arg, recv_r.clone(), &func_index, scc_index, parser_always_advancing, recursion_ctx, &si); +let loop_work = cost_loop(binder.clone(), size.clone(), &body_result.summary.clone().work.clone()); +let os = if (produces_collection == false) { + body_result.summary.clone().output_size.clone() + } else { + { + let r = seed_cost_map("result".to_string(), cost_loop(binder.clone(), size.clone(), &Rc::new(CostExpr::CostConst { + value: 1, +}))); +r +} + }; +Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq(recv_r.summary.clone().work.clone(), &loop_work), + span: cost_seq(recv_r.summary.clone().span.clone(), &loop_work), + output_size: os, + certainty: body_result.summary.clone().certainty.clone(), +}), + table: body_result.table.clone(), +}) +}, + CostShape::ShapeSortBody => { + let lambda_arg = resolve_lambda_arg(&mc_args, si.clone()); +let key_result = match lambda_arg { + Some(la) => cost_of_expr(&la, &func_index, &scc_index, recv_r.table.clone(), &parser_always_advancing, &recursion_ctx, &si), + None => Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { + value: 1, +}), + span: Rc::new(CostExpr::CostConst { + value: 1, +}), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, +}), + table: recv_r.table.clone(), +}), +}; +let log_factor = Rc::new(CostExpr::CostLog { + base: 2, + argument: size.clone(), +}); +let per_comparison = key_result.summary.clone().work.clone(); +let sort_work = Rc::new(CostExpr::CostMul { + left: cost_loop(binder.clone(), size.clone(), &per_comparison), + right: log_factor, +}); +let sort_os = seed_cost_map("result".to_string(), cost_loop(binder.clone(), size.clone(), &Rc::new(CostExpr::CostConst { + value: 1, +}))); +Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq(recv_r.summary.clone().work.clone(), &sort_work), + span: cost_seq(recv_r.summary.clone().span.clone(), &sort_work), + output_size: sort_os, + certainty: key_result.summary.clone().certainty.clone(), +}), + table: key_result.table.clone(), +}) +}, + CostShape::ShapeLinearScan => { + let loop_work = cost_loop(binder.clone(), size.clone(), &Rc::new(CostExpr::CostConst { + value: 1, +})); +let scan_os = if produces_collection { + seed_cost_map("result".to_string(), cost_loop(binder.clone(), size.clone(), &Rc::new(CostExpr::CostConst { + value: 1, +}))) + } else { + v2_rt::rc_empty_map::>() + }; +Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq(recv_r.summary.clone().work.clone(), &loop_work), + span: cost_seq(recv_r.summary.clone().span.clone(), &loop_work), + output_size: scan_os, + certainty: recv_r.summary.clone().certainty.clone(), +}), + table: recv_r.table.clone(), +}) +}, + CostShape::ShapeConstant => Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq(recv_r.summary.clone().work.clone(), &Rc::new(CostExpr::CostConst { + value: 1, +})), + span: cost_seq(recv_r.summary.clone().span.clone(), &Rc::new(CostExpr::CostConst { + value: 1, +})), + output_size: v2_rt::rc_empty_map::>(), + certainty: recv_r.summary.clone().certainty.clone(), +}), + table: recv_r.table.clone(), +}), +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -7444,413 +3774,283 @@ pub struct ComplexityReport { pub fn empty_complexity_report() -> Rc { Rc::new(ComplexityReport { - function_classes: v2_rt::rc_empty_map::(), - violations: Rc::new(vec![]), - structural_bounds: Rc::new(vec![]), - }) + function_classes: v2_rt::rc_empty_map::(), + violations: Rc::new(vec![]), + structural_bounds: Rc::new(vec![]), +}) } pub fn simplify_cost(expr: Rc) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*expr.clone()).clone() { - CostExpr::CostConst { .. } => expr.clone(), - CostExpr::CostAdd { - left: l, right: r, .. - } => { - let sl = simplify_cost(l.clone()); - let sr = simplify_cost(r.clone()); - let simplified = match (*sl.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => sr.clone(), - CostExpr::CostConst { value: a, .. } => match (*sr.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => sl.clone(), - CostExpr::CostConst { value: b, .. } => Rc::new(CostExpr::CostConst { - value: (a.clone() + b.clone()), - }), - _ => Rc::new(CostExpr::CostAdd { - left: sl.clone(), - right: sr.clone(), - }), - }, - _ => match (*sr.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => sl.clone(), - _ => Rc::new(CostExpr::CostAdd { - left: sl.clone(), - right: sr.clone(), - }), - }, - }; - simplified - } - CostExpr::CostMul { - left: l, right: r, .. - } => { - let sl = simplify_cost(l.clone()); - let sr = simplify_cost(r.clone()); - let simplified = match (*sl.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => { - Rc::new(CostExpr::CostConst { value: 0 }) - } - CostExpr::CostConst { value: 1, .. } => sr.clone(), - _ => match (*sr.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => { - Rc::new(CostExpr::CostConst { value: 0 }) - } - CostExpr::CostConst { value: 1, .. } => sl.clone(), - _ => Rc::new(CostExpr::CostMul { - left: sl.clone(), - right: sr.clone(), - }), - }, - }; - simplified - } - CostExpr::CostMax { - left: l, right: r, .. - } => { - let sl = simplify_cost(l.clone()); - let sr = simplify_cost(r.clone()); - let simplified = match (*sl.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => sr.clone(), - CostExpr::CostConst { value: a, .. } => match (*sr.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => sl.clone(), - CostExpr::CostConst { value: b, .. } => { - if (a.clone() > b.clone()) { - sl.clone() - } else { - sr.clone() - } - } - _ => Rc::new(CostExpr::CostMax { - left: sl.clone(), - right: sr.clone(), - }), - }, - _ => match (*sr.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => sl.clone(), - _ => Rc::new(CostExpr::CostMax { - left: sl.clone(), - right: sr.clone(), - }), - }, - }; - simplified - } - CostExpr::CostSum { - binder: b, - upper: u, - body: bd, - .. - } => { - let sbd = simplify_cost(bd.clone()); - match (*sbd.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => { - Rc::new(CostExpr::CostConst { value: 0 }) - } - _ => Rc::new(CostExpr::CostSum { - binder: b.clone(), - upper: u.clone(), - body: sbd.clone(), - }), - } - } - CostExpr::CostLog { - base: b, - argument: a, - .. - } => Rc::new(CostExpr::CostLog { - base: b.clone(), - argument: a.clone(), - }), - CostExpr::CostExtern { .. } => expr.clone(), - CostExpr::CostUnknown { .. } => expr.clone(), - } + CostExpr::CostConst { .. } => expr.clone(), + CostExpr::CostAdd { left: l, right: r, .. } => { + let sl = simplify_cost(l.clone()); +let sr = simplify_cost(r.clone()); +let simplified = match (*sl.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => sr.clone(), + CostExpr::CostConst { value: a, .. } => match (*sr.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => sl.clone(), + CostExpr::CostConst { value: b, .. } => Rc::new(CostExpr::CostConst { + value: (a.clone() + b.clone()), +}), + _ => Rc::new(CostExpr::CostAdd { + left: sl.clone(), + right: sr.clone(), +}), +}, + _ => match (*sr.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => sl.clone(), + _ => Rc::new(CostExpr::CostAdd { + left: sl.clone(), + right: sr.clone(), +}), +}, +}; +simplified +}, + CostExpr::CostMul { left: l, right: r, .. } => { + let sl = simplify_cost(l.clone()); +let sr = simplify_cost(r.clone()); +let simplified = match (*sl.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => Rc::new(CostExpr::CostConst { + value: 0, +}), + CostExpr::CostConst { value: 1, .. } => sr.clone(), + _ => match (*sr.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => Rc::new(CostExpr::CostConst { + value: 0, +}), + CostExpr::CostConst { value: 1, .. } => sl.clone(), + _ => Rc::new(CostExpr::CostMul { + left: sl.clone(), + right: sr.clone(), +}), +}, +}; +simplified +}, + CostExpr::CostMax { left: l, right: r, .. } => { + let sl = simplify_cost(l.clone()); +let sr = simplify_cost(r.clone()); +let simplified = match (*sl.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => sr.clone(), + CostExpr::CostConst { value: a, .. } => match (*sr.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => sl.clone(), + CostExpr::CostConst { value: b, .. } => if (a.clone() > b.clone()) { + sl.clone() + } else { + sr.clone() + }, + _ => Rc::new(CostExpr::CostMax { + left: sl.clone(), + right: sr.clone(), +}), +}, + _ => match (*sr.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => sl.clone(), + _ => Rc::new(CostExpr::CostMax { + left: sl.clone(), + right: sr.clone(), +}), +}, +}; +simplified +}, + CostExpr::CostSum { binder: b, upper: u, body: bd, .. } => { + let sbd = simplify_cost(bd.clone()); +match (*sbd.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => Rc::new(CostExpr::CostConst { + value: 0, +}), + _ => Rc::new(CostExpr::CostSum { + binder: b.clone(), + upper: u.clone(), + body: sbd.clone(), +}), +} +}, + CostExpr::CostLog { base: b, argument: a, .. } => Rc::new(CostExpr::CostLog { + base: b.clone(), + argument: a.clone(), +}), + CostExpr::CostExtern { .. } => expr.clone(), + CostExpr::CostUnknown { .. } => expr.clone(), +} }) } pub fn format_size(size: Rc) -> String { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*size).clone() { - SizeExpr::SizeLen { collection: c, .. } => { - v2_rt::concat(v2_rt::concat("|".to_string(), c.clone()), "|".to_string()) - } - SizeExpr::SizeVar { name: n, .. } => n.clone(), - SizeExpr::SizeConst { value: v, .. } => (v.clone()).to_string(), - SizeExpr::SizeAdd { - left: l, right: r, .. - } => v2_rt::concat( - v2_rt::concat(format_size(l.clone()), " + ".to_string()), - format_size(r.clone()), - ), - SizeExpr::SizeMax { - left: l, right: r, .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("max(".to_string(), format_size(l.clone())), - ", ".to_string(), - ), - format_size(r.clone()), - ), - ")".to_string(), - ), + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { + match (*size).clone() { + SizeExpr::SizeLen { collection: c, .. } => v2_rt::concat(v2_rt::concat("|".to_string(), c.clone()), "|".to_string()), + SizeExpr::SizeVar { name: n, .. } => n.clone(), + SizeExpr::SizeConst { value: v, .. } => (v.clone()).to_string(), + SizeExpr::SizeAdd { left: l, right: r, .. } => v2_rt::concat(v2_rt::concat(format_size(l.clone()), " + ".to_string()), format_size(r.clone())), + SizeExpr::SizeMax { left: l, right: r, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("max(".to_string(), format_size(l.clone())), ", ".to_string()), format_size(r.clone())), ")".to_string()), +} }) } pub fn normalize_asymptotic(expr: Rc) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*expr.clone()).clone() { - CostExpr::CostConst { value: v, .. } => { - if (v.clone() <= 0) { - Rc::new(CostExpr::CostConst { value: 0 }) - } else { - Rc::new(CostExpr::CostConst { value: 1 }) - } - } - CostExpr::CostAdd { - left: l, right: r, .. - } => { - let nl = normalize_asymptotic(l.clone()); - let nr = normalize_asymptotic(r.clone()); - if (nl.clone() == nr.clone()) { - nl.clone() - } else { - match (*nl.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => nr.clone(), - CostExpr::CostConst { .. } => match (*nr.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => nl.clone(), - CostExpr::CostConst { .. } => Rc::new(CostExpr::CostConst { value: 1 }), - _ => nr.clone(), - }, - _ => match (*nr.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => nl.clone(), - CostExpr::CostConst { .. } => nl.clone(), - _ => Rc::new(CostExpr::CostAdd { - left: nl.clone(), - right: nr.clone(), - }), - }, - } - } - } - CostExpr::CostMax { - left: l, right: r, .. - } => { - let nl = normalize_asymptotic(l.clone()); - let nr = normalize_asymptotic(r.clone()); - if (nl.clone() == nr.clone()) { - nl.clone() - } else { - match (*nl.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => nr.clone(), - CostExpr::CostConst { .. } => match (*nr.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => nl.clone(), - CostExpr::CostConst { .. } => Rc::new(CostExpr::CostConst { value: 1 }), - _ => nr.clone(), - }, - _ => match (*nr.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => nl.clone(), - CostExpr::CostConst { .. } => nl.clone(), - _ => Rc::new(CostExpr::CostMax { - left: nl.clone(), - right: nr.clone(), - }), - }, - } - } - } - CostExpr::CostMul { - left: l, right: r, .. - } => { - let nl = normalize_asymptotic(l.clone()); - let nr = normalize_asymptotic(r.clone()); + CostExpr::CostConst { value: v, .. } => if (v.clone() <= 0) { + Rc::new(CostExpr::CostConst { + value: 0, +}) + } else { + Rc::new(CostExpr::CostConst { + value: 1, +}) + }, + CostExpr::CostAdd { left: l, right: r, .. } => { + let nl = normalize_asymptotic(l.clone()); +let nr = normalize_asymptotic(r.clone()); +if (nl.clone() == nr.clone()) { + nl.clone() + } else { match (*nl.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => { - Rc::new(CostExpr::CostConst { value: 0 }) - } - CostExpr::CostConst { .. } => nr.clone(), - _ => match (*nr.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => { - Rc::new(CostExpr::CostConst { value: 0 }) - } - CostExpr::CostConst { .. } => nl.clone(), - _ => Rc::new(CostExpr::CostMul { - left: nl.clone(), - right: nr.clone(), - }), - }, - } + CostExpr::CostConst { value: 0, .. } => nr.clone(), + CostExpr::CostConst { .. } => match (*nr.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => nl.clone(), + CostExpr::CostConst { .. } => Rc::new(CostExpr::CostConst { + value: 1, +}), + _ => nr.clone(), +}, + _ => match (*nr.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => nl.clone(), + CostExpr::CostConst { .. } => nl.clone(), + _ => Rc::new(CostExpr::CostAdd { + left: nl.clone(), + right: nr.clone(), +}), +}, +} } - CostExpr::CostSum { - binder: b, - upper: u, - body: bd, - .. - } => { - let nbd = normalize_asymptotic(bd.clone()); - match (*nbd.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => { - Rc::new(CostExpr::CostConst { value: 0 }) - } - _ => match (*u.clone()).clone() { - SizeExpr::SizeConst { .. } => nbd.clone(), - _ => Rc::new(CostExpr::CostSum { - binder: b.clone(), - upper: u.clone(), - body: nbd.clone(), - }), - }, - } +}, + CostExpr::CostMax { left: l, right: r, .. } => { + let nl = normalize_asymptotic(l.clone()); +let nr = normalize_asymptotic(r.clone()); +if (nl.clone() == nr.clone()) { + nl.clone() + } else { + match (*nl.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => nr.clone(), + CostExpr::CostConst { .. } => match (*nr.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => nl.clone(), + CostExpr::CostConst { .. } => Rc::new(CostExpr::CostConst { + value: 1, +}), + _ => nr.clone(), +}, + _ => match (*nr.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => nl.clone(), + CostExpr::CostConst { .. } => nl.clone(), + _ => Rc::new(CostExpr::CostMax { + left: nl.clone(), + right: nr.clone(), +}), +}, +} } - CostExpr::CostLog { - base: b, - argument: a, - .. - } => Rc::new(CostExpr::CostLog { - base: b.clone(), - argument: a.clone(), - }), - CostExpr::CostExtern { .. } => expr.clone(), - CostExpr::CostUnknown { .. } => expr.clone(), - } +}, + CostExpr::CostMul { left: l, right: r, .. } => { + let nl = normalize_asymptotic(l.clone()); +let nr = normalize_asymptotic(r.clone()); +match (*nl.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => Rc::new(CostExpr::CostConst { + value: 0, +}), + CostExpr::CostConst { .. } => nr.clone(), + _ => match (*nr.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => Rc::new(CostExpr::CostConst { + value: 0, +}), + CostExpr::CostConst { .. } => nl.clone(), + _ => Rc::new(CostExpr::CostMul { + left: nl.clone(), + right: nr.clone(), +}), +}, +} +}, + CostExpr::CostSum { binder: b, upper: u, body: bd, .. } => { + let nbd = normalize_asymptotic(bd.clone()); +match (*nbd.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => Rc::new(CostExpr::CostConst { + value: 0, +}), + _ => match (*u.clone()).clone() { + SizeExpr::SizeConst { .. } => nbd.clone(), + _ => Rc::new(CostExpr::CostSum { + binder: b.clone(), + upper: u.clone(), + body: nbd.clone(), +}), +}, +} +}, + CostExpr::CostLog { base: b, argument: a, .. } => Rc::new(CostExpr::CostLog { + base: b.clone(), + argument: a.clone(), +}), + CostExpr::CostExtern { .. } => expr.clone(), + CostExpr::CostUnknown { .. } => expr.clone(), +} }) } pub fn format_cost_class(expr: Rc) -> String { match (*expr).clone() { - CostExpr::CostConst { .. } => "O(1)".to_string(), - CostExpr::CostExtern { name: n, .. } => v2_rt::concat( - v2_rt::concat("O(extern(".to_string(), n.clone()), - "))".to_string(), - ), - CostExpr::CostUnknown { .. } => "O(?)".to_string(), - CostExpr::CostSum { - upper: u, body: bd, .. - } => match (*bd.clone()).clone() { - CostExpr::CostConst { .. } => v2_rt::concat( - v2_rt::concat("O(".to_string(), format_size(u.clone())), - ")".to_string(), - ), - _ => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("O(".to_string(), format_size(u.clone())), - " * ".to_string(), - ), - format_cost_inner(bd.clone()), - ), - ")".to_string(), - ), - }, - CostExpr::CostAdd { - left: l, right: r, .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("O(".to_string(), format_cost_inner(l.clone())), - " + ".to_string(), - ), - format_cost_inner(r.clone()), - ), - ")".to_string(), - ), - CostExpr::CostMul { - left: l, right: r, .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("O(".to_string(), parenthesize_additive_cost(&l)), - " * ".to_string(), - ), - parenthesize_additive_cost(&r), - ), - ")".to_string(), - ), - CostExpr::CostMax { - left: l, right: r, .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("O(max(".to_string(), format_cost_inner(l.clone())), - ", ".to_string(), - ), - format_cost_inner(r.clone()), - ), - "))".to_string(), - ), - CostExpr::CostLog { argument: a, .. } => v2_rt::concat( - v2_rt::concat("O(log ".to_string(), format_size(a.clone())), - ")".to_string(), - ), - } + CostExpr::CostConst { .. } => "O(1)".to_string(), + CostExpr::CostExtern { name: n, .. } => v2_rt::concat(v2_rt::concat("O(extern(".to_string(), n.clone()), "))".to_string()), + CostExpr::CostUnknown { .. } => "O(?)".to_string(), + CostExpr::CostSum { upper: u, body: bd, .. } => match (*bd.clone()).clone() { + CostExpr::CostConst { .. } => v2_rt::concat(v2_rt::concat("O(".to_string(), format_size(u.clone())), ")".to_string()), + _ => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("O(".to_string(), format_size(u.clone())), " * ".to_string()), format_cost_inner(bd.clone())), ")".to_string()), +}, + CostExpr::CostAdd { left: l, right: r, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("O(".to_string(), format_cost_inner(l.clone())), " + ".to_string()), format_cost_inner(r.clone())), ")".to_string()), + CostExpr::CostMul { left: l, right: r, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("O(".to_string(), parenthesize_additive_cost(&l)), " * ".to_string()), parenthesize_additive_cost(&r)), ")".to_string()), + CostExpr::CostMax { left: l, right: r, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("O(max(".to_string(), format_cost_inner(l.clone())), ", ".to_string()), format_cost_inner(r.clone())), "))".to_string()), + CostExpr::CostLog { argument: a, .. } => v2_rt::concat(v2_rt::concat("O(log ".to_string(), format_size(a.clone())), ")".to_string()), +} } pub fn format_cost_inner(expr: Rc) -> String { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*expr).clone() { - CostExpr::CostConst { .. } => "1".to_string(), - CostExpr::CostSum { - upper: u, body: bd, .. - } => match (*bd.clone()).clone() { - CostExpr::CostConst { .. } => format_size(u.clone()), - _ => v2_rt::concat( - v2_rt::concat(format_size(u.clone()), " * ".to_string()), - format_cost_inner(bd.clone()), - ), - }, - CostExpr::CostAdd { - left: l, right: r, .. - } => v2_rt::concat( - v2_rt::concat(format_cost_inner(l.clone()), " + ".to_string()), - format_cost_inner(r.clone()), - ), - CostExpr::CostMul { - left: l, right: r, .. - } => { + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { + match (*expr).clone() { + CostExpr::CostConst { .. } => "1".to_string(), + CostExpr::CostSum { upper: u, body: bd, .. } => match (*bd.clone()).clone() { + CostExpr::CostConst { .. } => format_size(u.clone()), + _ => v2_rt::concat(v2_rt::concat(format_size(u.clone()), " * ".to_string()), format_cost_inner(bd.clone())), +}, + CostExpr::CostAdd { left: l, right: r, .. } => v2_rt::concat(v2_rt::concat(format_cost_inner(l.clone()), " + ".to_string()), format_cost_inner(r.clone())), + CostExpr::CostMul { left: l, right: r, .. } => { let left_str = match (*l.clone()).clone() { - CostExpr::CostAdd { .. } => v2_rt::concat( - v2_rt::concat("(".to_string(), format_cost_inner(l.clone())), - ")".to_string(), - ), - _ => format_cost_inner(l.clone()), - }; - let right_str = match (*r.clone()).clone() { - CostExpr::CostAdd { .. } => v2_rt::concat( - v2_rt::concat("(".to_string(), format_cost_inner(r.clone())), - ")".to_string(), - ), - _ => format_cost_inner(r.clone()), - }; - v2_rt::concat(v2_rt::concat(left_str, " * ".to_string()), right_str) - } - CostExpr::CostMax { - left: l, right: r, .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("max(".to_string(), format_cost_inner(l.clone())), - ", ".to_string(), - ), - format_cost_inner(r.clone()), - ), - ")".to_string(), - ), - CostExpr::CostLog { argument: a, .. } => { - v2_rt::concat("log ".to_string(), format_size(a.clone())) - } - CostExpr::CostExtern { name: n, .. } => v2_rt::concat( - v2_rt::concat("extern(".to_string(), n.clone()), - ")".to_string(), - ), - CostExpr::CostUnknown { .. } => "?".to_string(), + CostExpr::CostAdd { .. } => v2_rt::concat(v2_rt::concat("(".to_string(), format_cost_inner(l.clone())), ")".to_string()), + _ => format_cost_inner(l.clone()), +}; +let right_str = match (*r.clone()).clone() { + CostExpr::CostAdd { .. } => v2_rt::concat(v2_rt::concat("(".to_string(), format_cost_inner(r.clone())), ")".to_string()), + _ => format_cost_inner(r.clone()), +}; +v2_rt::concat(v2_rt::concat(left_str, " * ".to_string()), right_str) +}, + CostExpr::CostMax { left: l, right: r, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("max(".to_string(), format_cost_inner(l.clone())), ", ".to_string()), format_cost_inner(r.clone())), ")".to_string()), + CostExpr::CostLog { argument: a, .. } => v2_rt::concat("log ".to_string(), format_size(a.clone())), + CostExpr::CostExtern { name: n, .. } => v2_rt::concat(v2_rt::concat("extern(".to_string(), n.clone()), ")".to_string()), + CostExpr::CostUnknown { .. } => "?".to_string(), +} }) } pub fn parenthesize_additive_cost(expr: &Rc) -> String { match (*expr.clone()).clone() { - CostExpr::CostAdd { .. } => v2_rt::concat( - v2_rt::concat("(".to_string(), format_cost_inner(expr.clone())), - ")".to_string(), - ), - _ => format_cost_inner(expr.clone()), - } + CostExpr::CostAdd { .. } => v2_rt::concat(v2_rt::concat("(".to_string(), format_cost_inner(expr.clone())), ")".to_string()), + _ => format_cost_inner(expr.clone()), +} } pub fn short_var_name(index: i64) -> String { @@ -7884,10 +4084,7 @@ pub fn short_var_name(index: i64) -> String { if (index.clone() == 9) { "w".to_string() } else { - v2_rt::concat( - "x".to_string(), - (index.clone()).to_string(), - ) + v2_rt::concat("x".to_string(), (index.clone()).to_string()) } } } @@ -7909,214 +4106,146 @@ pub struct Legend { pub fn build_legend(size_names: Rc>) -> Rc { { let unique = deduplicate(size_names); - if ((unique.clone().len() as i64) == 0) { +if ((unique.clone().len() as i64) == 0) { Rc::new(Legend { - substitution: v2_rt::rc_empty_map::(), - suffix: "".to_string(), - }) + substitution: v2_rt::rc_empty_map::(), + suffix: "".to_string(), +}) } else { if ((unique.clone().len() as i64) == 1) { match unique.clone().first().cloned() { - Some(name) => Rc::new(Legend { - substitution: v2_rt::rc_map_insert( - v2_rt::rc_empty_map::(), - name.clone(), - "n".to_string(), - ), - suffix: "".to_string(), - }), - None => Rc::new(Legend { - substitution: v2_rt::rc_empty_map::(), - suffix: "".to_string(), - }), - } + Some(name) => Rc::new(Legend { + substitution: v2_rt::rc_map_insert(v2_rt::rc_empty_map::(), name.clone(), "n".to_string()), + suffix: "".to_string(), +}), + None => Rc::new(Legend { + substitution: v2_rt::rc_empty_map::(), + suffix: "".to_string(), +}), +} } else { { - let indexed = unique.clone().iter().cloned().fold( - Rc::new(Legend { - substitution: v2_rt::rc_empty_map::(), - suffix: "".to_string(), - }), - |acc: Rc, name: String| { - let idx = - (Rc::new(v2_rt::map_keys(&acc.substitution.clone())).len() as i64); - let short = short_var_name(idx.clone()); - Rc::new(Legend { - substitution: v2_rt::rc_map_insert( - acc.substitution.clone(), - name.clone(), - short.clone(), - ), - suffix: if (acc.suffix.clone().as_str() == "".to_string().as_str()) - { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(" where ".to_string(), short.clone()), - " = ".to_string(), - ), - name.clone(), - ) - } else { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(acc.suffix.clone(), ", ".to_string()), - short.clone(), - ), - " = ".to_string(), - ), - name.clone(), - ) - }, - }) + let indexed = unique.clone().iter().cloned().fold(Rc::new(Legend { + substitution: v2_rt::rc_empty_map::(), + suffix: "".to_string(), +}), |acc: Rc, name: String| { + let idx = (Rc::new(v2_rt::map_keys(&acc.substitution.clone())).len() as i64); +let short = short_var_name(idx.clone()); +Rc::new(Legend { + substitution: v2_rt::rc_map_insert(acc.substitution.clone(), name.clone(), short.clone()), + suffix: if (acc.suffix.clone().as_str() == "".to_string().as_str()) { + v2_rt::concat(v2_rt::concat(v2_rt::concat(" where ".to_string(), short.clone()), " = ".to_string()), name.clone()) + } else { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(acc.suffix.clone(), ", ".to_string()), short.clone()), " = ".to_string()), name.clone()) }, - ); - indexed - } +}) +}); +indexed +} } } - } +} } pub fn substitute_size(size: Rc, legend: &Rc>) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*size.clone()).clone() { - SizeExpr::SizeLen { collection: c, .. } => match v2_rt::map_get(&legend, c.clone()) { - Some(short) => Rc::new(SizeExpr::SizeVar { - name: short.clone(), - }), - None => size.clone(), - }, - SizeExpr::SizeVar { name: n, .. } => match v2_rt::map_get(&legend, n.clone()) { - Some(short) => Rc::new(SizeExpr::SizeVar { - name: short.clone(), - }), - None => size.clone(), - }, - SizeExpr::SizeAdd { - left: l, right: r, .. - } => Rc::new(SizeExpr::SizeAdd { - left: substitute_size(l.clone(), &legend), - right: substitute_size(r.clone(), &legend), - }), - SizeExpr::SizeMax { - left: l, right: r, .. - } => Rc::new(SizeExpr::SizeMax { - left: substitute_size(l.clone(), &legend), - right: substitute_size(r.clone(), &legend), - }), - SizeExpr::SizeConst { .. } => size.clone(), - } + SizeExpr::SizeLen { collection: c, .. } => match v2_rt::map_get(&legend, c.clone()) { + Some(short) => Rc::new(SizeExpr::SizeVar { + name: short.clone(), +}), + None => size.clone(), +}, + SizeExpr::SizeVar { name: n, .. } => match v2_rt::map_get(&legend, n.clone()) { + Some(short) => Rc::new(SizeExpr::SizeVar { + name: short.clone(), +}), + None => size.clone(), +}, + SizeExpr::SizeAdd { left: l, right: r, .. } => Rc::new(SizeExpr::SizeAdd { + left: substitute_size(l.clone(), &legend), + right: substitute_size(r.clone(), &legend), +}), + SizeExpr::SizeMax { left: l, right: r, .. } => Rc::new(SizeExpr::SizeMax { + left: substitute_size(l.clone(), &legend), + right: substitute_size(r.clone(), &legend), +}), + SizeExpr::SizeConst { .. } => size.clone(), +} }) } pub fn substitute_cost(expr: Rc, legend: &Rc>) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*expr.clone()).clone() { - CostExpr::CostConst { .. } => expr.clone(), - CostExpr::CostAdd { - left: l, right: r, .. - } => Rc::new(CostExpr::CostAdd { - left: substitute_cost(l.clone(), &legend), - right: substitute_cost(r.clone(), &legend), - }), - CostExpr::CostMul { - left: l, right: r, .. - } => Rc::new(CostExpr::CostMul { - left: substitute_cost(l.clone(), &legend), - right: substitute_cost(r.clone(), &legend), - }), - CostExpr::CostMax { - left: l, right: r, .. - } => Rc::new(CostExpr::CostMax { - left: substitute_cost(l.clone(), &legend), - right: substitute_cost(r.clone(), &legend), - }), - CostExpr::CostSum { - binder: b, - upper: u, - body: bd, - .. - } => Rc::new(CostExpr::CostSum { - binder: b.clone(), - upper: substitute_size(u.clone(), &legend), - body: substitute_cost(bd.clone(), &legend), - }), - CostExpr::CostLog { - base: b, - argument: a, - .. - } => Rc::new(CostExpr::CostLog { - base: b.clone(), - argument: substitute_size(a.clone(), &legend), - }), - CostExpr::CostExtern { .. } => expr.clone(), - CostExpr::CostUnknown { .. } => expr.clone(), - } + CostExpr::CostConst { .. } => expr.clone(), + CostExpr::CostAdd { left: l, right: r, .. } => Rc::new(CostExpr::CostAdd { + left: substitute_cost(l.clone(), &legend), + right: substitute_cost(r.clone(), &legend), +}), + CostExpr::CostMul { left: l, right: r, .. } => Rc::new(CostExpr::CostMul { + left: substitute_cost(l.clone(), &legend), + right: substitute_cost(r.clone(), &legend), +}), + CostExpr::CostMax { left: l, right: r, .. } => Rc::new(CostExpr::CostMax { + left: substitute_cost(l.clone(), &legend), + right: substitute_cost(r.clone(), &legend), +}), + CostExpr::CostSum { binder: b, upper: u, body: bd, .. } => Rc::new(CostExpr::CostSum { + binder: b.clone(), + upper: substitute_size(u.clone(), &legend), + body: substitute_cost(bd.clone(), &legend), +}), + CostExpr::CostLog { base: b, argument: a, .. } => Rc::new(CostExpr::CostLog { + base: b.clone(), + argument: substitute_size(a.clone(), &legend), +}), + CostExpr::CostExtern { .. } => expr.clone(), + CostExpr::CostUnknown { .. } => expr.clone(), +} }) } pub fn classify_complexity(expr: Rc) -> String { { let normalized = normalize_asymptotic(simplify_cost(expr)); - let size_names = collect_size_vars(normalized.clone()); - let legend = build_legend(size_names); - let substituted = substitute_cost(normalized.clone(), &legend.substitution.clone()); - v2_rt::concat(format_cost_class(substituted), legend.suffix.clone()) - } +let size_names = collect_size_vars(normalized.clone()); +let legend = build_legend(size_names); +let substituted = substitute_cost(normalized.clone(), &legend.substitution.clone()); +v2_rt::concat(format_cost_class(substituted), legend.suffix.clone()) +} } pub fn collect_size_vars_from_size(size: Rc) -> Rc> { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*size).clone() { - SizeExpr::SizeLen { collection: c, .. } => { - if (c.clone().as_str() == "__expr".to_string().as_str()) { - Rc::new(vec![]) - } else { - Rc::new(vec![c.clone()]) - } - } - SizeExpr::SizeVar { name: n, .. } => { - if (n.clone().as_str() == "__k".to_string().as_str()) { - Rc::new(vec![]) - } else { - Rc::new(vec![n.clone()]) - } - } - SizeExpr::SizeAdd { - left: l, right: r, .. - } => v2_rt::concat( - collect_size_vars_from_size(l.clone()), - collect_size_vars_from_size(r.clone()), - ), - SizeExpr::SizeMax { - left: l, right: r, .. - } => v2_rt::concat( - collect_size_vars_from_size(l.clone()), - collect_size_vars_from_size(r.clone()), - ), - _ => Rc::new(vec![]), + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { + match (*size).clone() { + SizeExpr::SizeLen { collection: c, .. } => if (c.clone().as_str() == "__expr".to_string().as_str()) { + Rc::new(vec![]) + } else { + Rc::new(vec![c.clone()]) + }, + SizeExpr::SizeVar { name: n, .. } => if (n.clone().as_str() == "__k".to_string().as_str()) { + Rc::new(vec![]) + } else { + Rc::new(vec![n.clone()]) + }, + SizeExpr::SizeAdd { left: l, right: r, .. } => v2_rt::concat(collect_size_vars_from_size(l.clone()), collect_size_vars_from_size(r.clone())), + SizeExpr::SizeMax { left: l, right: r, .. } => v2_rt::concat(collect_size_vars_from_size(l.clone()), collect_size_vars_from_size(r.clone())), + _ => Rc::new(vec![]), +} }) } pub fn collect_size_vars(expr: Rc) -> Rc> { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*expr).clone() { - CostExpr::CostSum { - upper: u, body: bd, .. - } => v2_rt::concat( - collect_size_vars_from_size(u.clone()), - collect_size_vars(bd.clone()), - ), - CostExpr::CostAdd { - left: l, right: r, .. - } => v2_rt::concat(collect_size_vars(l.clone()), collect_size_vars(r.clone())), - CostExpr::CostMul { - left: l, right: r, .. - } => v2_rt::concat(collect_size_vars(l.clone()), collect_size_vars(r.clone())), - CostExpr::CostMax { - left: l, right: r, .. - } => v2_rt::concat(collect_size_vars(l.clone()), collect_size_vars(r.clone())), - CostExpr::CostLog { argument: a, .. } => collect_size_vars_from_size(a.clone()), - _ => Rc::new(vec![]), + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { + match (*expr).clone() { + CostExpr::CostSum { upper: u, body: bd, .. } => v2_rt::concat(collect_size_vars_from_size(u.clone()), collect_size_vars(bd.clone())), + CostExpr::CostAdd { left: l, right: r, .. } => v2_rt::concat(collect_size_vars(l.clone()), collect_size_vars(r.clone())), + CostExpr::CostMul { left: l, right: r, .. } => v2_rt::concat(collect_size_vars(l.clone()), collect_size_vars(r.clone())), + CostExpr::CostMax { left: l, right: r, .. } => v2_rt::concat(collect_size_vars(l.clone()), collect_size_vars(r.clone())), + CostExpr::CostLog { argument: a, .. } => collect_size_vars_from_size(a.clone()), + _ => Rc::new(vec![]), +} }) } @@ -8128,24 +4257,18 @@ pub struct DeduplicateAcc { pub fn deduplicate(items: Rc>) -> Rc> { { - let result = items.iter().cloned().fold( - Rc::new(DeduplicateAcc { - seen: v2_rt::rc_empty_map::(), - out: Rc::new(vec![]), - }), - |acc: Rc, item: String| match v2_rt::map_get( - &acc.seen.clone(), - item.clone(), - ) { - Some(_) => acc.clone(), - None => Rc::new(DeduplicateAcc { - seen: v2_rt::rc_map_insert(acc.seen.clone(), item.clone(), true), - out: v2_rt::rc_list_push(acc.out.clone(), item.clone()), - }), - }, - ); - result.out.clone() - } + let result = items.iter().cloned().fold(Rc::new(DeduplicateAcc { + seen: v2_rt::rc_empty_map::(), + out: Rc::new(vec![]), +}), |acc: Rc, item: String| match v2_rt::map_get(&acc.seen.clone(), item.clone()) { + Some(_) => acc.clone(), + None => Rc::new(DeduplicateAcc { + seen: v2_rt::rc_map_insert(acc.seen.clone(), item.clone(), true), + out: v2_rt::rc_list_push(acc.out.clone(), item.clone()), +}), +}); +result.out.clone() +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -8181,623 +4304,385 @@ pub struct MatchCostAccum { pub branch_costs: Rc>>, } -pub fn cost_of_expr( - texpr: &Rc, - func_index: &Rc>>, - scc_index: &Rc>>, - table: Rc, - parser_always_advancing: &Rc>, - recursion_ctx: &RecursionContext, - si: &Rc>>, -) -> Rc { +pub fn cost_of_expr(texpr: &Rc, func_index: &Rc>>, scc_index: &Rc>>, table: Rc, parser_always_advancing: &Rc>, recursion_ctx: &RecursionContext, si: &Rc>>) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprLiteral { .. } => Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { value: 1 }), - span: Rc::new(CostExpr::CostConst { value: 1 }), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, - }), - table: table, - }), - ExprData::ExprError { .. } => Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { value: 0 }), - span: Rc::new(CostExpr::CostConst { value: 0 }), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, - }), - table: table, - }), - ExprData::ExprVar { .. } => Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { value: 1 }), - span: Rc::new(CostExpr::CostConst { value: 1 }), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, - }), - table: table, - }), - ExprData::ExprBinOp { .. } => { - let l = binop_left(texpr.clone()); - let r = binop_right(texpr.clone()); - let lr = cost_of_expr( - &l, - &func_index, - &scc_index, - table, - &parser_always_advancing, - &recursion_ctx, - &si, - ); - let rr = cost_of_expr( - &r, - &func_index, - &scc_index, - lr.table.clone(), - &parser_always_advancing, - &recursion_ctx, - &si, - ); - Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq( - lr.summary.clone().work.clone(), - &cost_seq( - Rc::new(CostExpr::CostConst { value: 1 }), - &rr.summary.clone().work.clone(), - ), - ), - span: cost_seq( - lr.summary.clone().span.clone(), - &cost_seq( - Rc::new(CostExpr::CostConst { value: 1 }), - &rr.summary.clone().span.clone(), - ), - ), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, - }), - table: rr.table.clone(), - }) - } - ExprData::ExprCall { .. } => { - let fname = expr_call_func_at(texpr.clone(), si.clone()); - let callee_result = match v2_rt::map_get(&func_index, fname.clone()) { - Some(entry) => get_or_compute_summary( - &fname, - &func_index, - &scc_index, - &table, - parser_always_advancing.clone(), - recursion_ctx.clone(), - si.clone(), - ), - None => Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { value: 1 }), - span: Rc::new(CostExpr::CostConst { value: 1 }), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, - }), - table: table, - }), - }; - let args_result = texpr.children.clone().iter().cloned().fold( - Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { value: 0 }), - span: Rc::new(CostExpr::CostConst { value: 0 }), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, - }), - table: callee_result.table.clone(), - }), - |acc: Rc, a: Rc| { - let ar = cost_of_expr( - &arg_value(&a), - &func_index, - &scc_index, - acc.table.clone(), - &parser_always_advancing, - &recursion_ctx, - &si, - ); - Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq( - acc.summary.clone().work.clone(), - &ar.summary.clone().work.clone(), - ), - span: cost_seq( - acc.summary.clone().span.clone(), - &ar.summary.clone().span.clone(), - ), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, - }), - table: ar.table.clone(), - }) - }, - ); - Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq( - args_result.summary.clone().work.clone(), - &callee_result.summary.clone().work.clone(), - ), - span: cost_seq( - args_result.summary.clone().span.clone(), - &callee_result.summary.clone().span.clone(), - ), - output_size: callee_result.summary.clone().output_size.clone(), - certainty: callee_result.summary.clone().certainty.clone(), - }), - table: args_result.table.clone(), - }) - } - ExprData::ExprMethodCall { - method_semantics: ms, - .. - } => { - let recv = method_receiver(texpr.clone()); - let mc_args = method_arg_nodes(texpr.clone()); - let recv_r = cost_of_expr( - &recv, - &func_index, - &scc_index, - table, - &parser_always_advancing, - &recursion_ctx, - &si, - ); - let size = receiver_size_var(recv.clone(), si.clone()); - let binder = size_binder_name(size.clone()); - let method_cost_result = if (ms.clone() == None) { - None - } else { - match (*ms.clone().unwrap()).clone() { - MethodSemantics::AlgebraMethodSemantics { - method_def: md, - cost_shape: cs, - .. - } => { - let pc = node_is_collection(&resolved_type(texpr.clone()), si.clone()); - match cs.clone() { - Some(shape) => Some(cost_of_method_by_shape( - shape.clone(), - pc, - &recv_r, - mc_args.clone(), - &size, - &binder, - func_index.clone(), - scc_index.clone(), - parser_always_advancing.clone(), - recursion_ctx.clone(), - &si, - )), - None => Some(Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq( - recv_r.summary.clone().work.clone(), - &Rc::new(CostExpr::CostConst { value: 1 }), - ), - span: cost_seq( - recv_r.summary.clone().span.clone(), - &Rc::new(CostExpr::CostConst { value: 1 }), - ), - output_size: v2_rt::rc_empty_map::>(), - certainty: recv_r.summary.clone().certainty.clone(), - }), - table: recv_r.table.clone(), - })), - } - } - _ => None, - } - }; - match method_cost_result { - Some(result) => result.clone(), - _ => { - let args_result = mc_args.clone().iter().cloned().fold( - Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { value: 0 }), - span: Rc::new(CostExpr::CostConst { value: 0 }), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, - }), - table: recv_r.table.clone(), - }), - |acc: Rc, a: Rc| { - let ar = cost_of_expr( - &arg_value(&a), - &func_index, - &scc_index, - acc.table.clone(), - &parser_always_advancing, - &recursion_ctx, - &si, - ); - Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq( - acc.summary.clone().work.clone(), - &ar.summary.clone().work.clone(), - ), - span: cost_seq( - acc.summary.clone().span.clone(), - &ar.summary.clone().span.clone(), - ), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, - }), - table: ar.table.clone(), - }) - }, - ); - Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq( - recv_r.summary.clone().work.clone(), - &cost_seq( - Rc::new(CostExpr::CostConst { value: 1 }), - &args_result.summary.clone().work.clone(), - ), - ), - span: cost_seq( - recv_r.summary.clone().span.clone(), - &cost_seq( - Rc::new(CostExpr::CostConst { value: 1 }), - &args_result.summary.clone().span.clone(), - ), - ), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, - }), - table: args_result.table.clone(), - }) - } - } - } - ExprData::ExprMatch => { - let scrut = match_scrutinee(texpr.clone()); - let arm_nodes = match_arm_nodes(texpr.clone()); - let s_r = cost_of_expr( - &scrut, - &func_index, - &scc_index, - table, - &parser_always_advancing, - &recursion_ctx, - &si, - ); - let arms_accum = arm_nodes.iter().cloned().fold( - Rc::new(MatchCostAccum { - result: Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { value: 0 }), - span: Rc::new(CostExpr::CostConst { value: 0 }), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, - }), - table: s_r.table.clone(), - }), - branch_costs: Rc::new(vec![]), - }), - |acc: Rc, arm_node: Rc| { - let ar = cost_of_expr( - &arm_body(&arm_node), - &func_index, - &scc_index, - acc.result.clone().table.clone(), - &parser_always_advancing, - &recursion_ctx, - &si, - ); - Rc::new(MatchCostAccum { - result: Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_par( - acc.result.clone().summary.clone().work.clone(), - &ar.summary.clone().work.clone(), - ), - span: cost_par( - acc.result.clone().summary.clone().span.clone(), - &ar.summary.clone().span.clone(), - ), - output_size: ar.summary.clone().output_size.clone(), - certainty: ar.summary.clone().certainty.clone(), - }), - table: ar.table.clone(), - }), - branch_costs: v2_rt::concat( - acc.branch_costs.clone(), - Rc::new(vec![ar.summary.clone().work.clone()]), - ), - }) - }, - ); - Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_conditional( - s_r.summary.clone().work.clone(), - arms_accum.branch_costs.clone(), - ), - span: cost_conditional( - s_r.summary.clone().span.clone(), - Rc::new(vec![arms_accum.result.clone().summary.clone().span.clone()]), - ), - output_size: arms_accum - .result - .clone() - .summary - .clone() - .output_size - .clone(), - certainty: arms_accum.result.clone().summary.clone().certainty.clone(), - }), - table: arms_accum.result.clone().table.clone(), - }) - } - ExprData::ExprIf => { - let c = if_condition(texpr.clone()); - let t = if_then_branch(texpr.clone()); - let c_r = cost_of_expr( - &c, - &func_index, - &scc_index, - table, - &parser_always_advancing, - &recursion_ctx, - &si, - ); - let t_r = cost_of_expr( - &t, - &func_index, - &scc_index, - c_r.table.clone(), - &parser_always_advancing, - &recursion_ctx, - &si, - ); - let e_result = match if_else_branch(texpr.clone()) { - Some(eb) => { - let er = cost_of_expr( - &eb, - &func_index, - &scc_index, - t_r.table.clone(), - &parser_always_advancing, - &recursion_ctx, - &si, - ); - Rc::new(SummaryResult { - summary: er.summary.clone(), - table: er.table.clone(), - }) - } - None => Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { value: 0 }), - span: Rc::new(CostExpr::CostConst { value: 0 }), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, - }), - table: t_r.table.clone(), - }), - }; - Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_conditional( - c_r.summary.clone().work.clone(), - Rc::new(vec![ - t_r.summary.clone().work.clone(), - e_result.summary.clone().work.clone(), - ]), - ), - span: cost_conditional( - c_r.summary.clone().span.clone(), - Rc::new(vec![ - t_r.summary.clone().span.clone(), - e_result.summary.clone().span.clone(), - ]), - ), - output_size: t_r.summary.clone().output_size.clone(), - certainty: Certainty::Proven, - }), - table: e_result.table.clone(), - }) - } - ExprData::ExprLet => { - let v = let_value(texpr.clone()); - let v_r = cost_of_expr( - &v, - &func_index, - &scc_index, - table, - &parser_always_advancing, - &recursion_ctx, - &si, - ); - match let_body(texpr.clone()) { - Some(b) => { - let b_r = cost_of_expr( - &b, - &func_index, - &scc_index, - v_r.table.clone(), - &parser_always_advancing, - &recursion_ctx, - &si, - ); - Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq( - v_r.summary.clone().work.clone(), - &b_r.summary.clone().work.clone(), - ), - span: cost_seq( - v_r.summary.clone().span.clone(), - &b_r.summary.clone().span.clone(), - ), - output_size: b_r.summary.clone().output_size.clone(), - certainty: b_r.summary.clone().certainty.clone(), - }), - table: b_r.table.clone(), - }) - } - None => v_r.clone(), - } - } - ExprData::ExprBlock => texpr.children.clone().iter().cloned().fold( - Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { value: 0 }), - span: Rc::new(CostExpr::CostConst { value: 0 }), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, - }), - table: table, - }), - |acc: Rc, s: Rc| { - let sr = cost_of_expr( - &s, - &func_index, - &scc_index, - acc.table.clone(), - &parser_always_advancing, - &recursion_ctx, - &si, - ); - Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq( - acc.summary.clone().work.clone(), - &sr.summary.clone().work.clone(), - ), - span: cost_seq( - acc.summary.clone().span.clone(), - &sr.summary.clone().span.clone(), - ), - output_size: sr.summary.clone().output_size.clone(), - certainty: sr.summary.clone().certainty.clone(), - }), - table: sr.table.clone(), - }) - }, - ), - ExprData::ExprForEach => { - let c = foreach_collection(texpr.clone()); - let bd = foreach_body(texpr.clone()); - let c_r = cost_of_expr( - &c, - &func_index, - &scc_index, - table, - &parser_always_advancing, - &recursion_ctx, - &si, - ); - let bd_r = cost_of_expr( - &bd, - &func_index, - &scc_index, - c_r.table.clone(), - &parser_always_advancing, - &recursion_ctx, - &si, - ); - let size = receiver_size_var(c.clone(), si.clone()); - let binder = size_binder_name(size.clone()); - let loop_work = cost_loop(binder, size.clone(), &bd_r.summary.clone().work.clone()); - Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq(c_r.summary.clone().work.clone(), &loop_work), - span: cost_seq(c_r.summary.clone().span.clone(), &loop_work), - output_size: v2_rt::rc_empty_map::>(), - certainty: bd_r.summary.clone().certainty.clone(), - }), - table: bd_r.table.clone(), - }) - } - ExprData::NoExprData => texpr.children.clone().iter().cloned().fold( - Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { value: 0 }), - span: Rc::new(CostExpr::CostConst { value: 0 }), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, - }), - table: table, - }), - |acc: Rc, child: Rc| { - let cr = cost_of_expr( - &child, - &func_index, - &scc_index, - acc.table.clone(), - &parser_always_advancing, - &recursion_ctx, - &si, - ); - Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq( - acc.summary.clone().work.clone(), - &cr.summary.clone().work.clone(), - ), - span: cost_seq( - acc.summary.clone().span.clone(), - &cr.summary.clone().span.clone(), - ), - output_size: cr.summary.clone().output_size.clone(), - certainty: cr.summary.clone().certainty.clone(), - }), - table: cr.table.clone(), - }) - }, - ), - _ => texpr.children.clone().iter().cloned().fold( - Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { value: 1 }), - span: Rc::new(CostExpr::CostConst { value: 1 }), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, - }), - table: table, - }), - |acc: Rc, child: Rc| { - let cr = cost_of_expr( - &child, - &func_index, - &scc_index, - acc.table.clone(), - &parser_always_advancing, - &recursion_ctx, - &si, - ); - Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq( - acc.summary.clone().work.clone(), - &cr.summary.clone().work.clone(), - ), - span: cost_seq( - acc.summary.clone().span.clone(), - &cr.summary.clone().span.clone(), - ), - output_size: cr.summary.clone().output_size.clone(), - certainty: cr.summary.clone().certainty.clone(), - }), - table: cr.table.clone(), - }) - }, - ), - } + ExprData::ExprLiteral { .. } => Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { + value: 1, +}), + span: Rc::new(CostExpr::CostConst { + value: 1, +}), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, +}), + table: table, +}), + ExprData::ExprError { .. } => Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { + value: 0, +}), + span: Rc::new(CostExpr::CostConst { + value: 0, +}), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, +}), + table: table, +}), + ExprData::ExprVar { .. } => Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { + value: 1, +}), + span: Rc::new(CostExpr::CostConst { + value: 1, +}), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, +}), + table: table, +}), + ExprData::ExprBinOp { .. } => { + let l = binop_left(texpr.clone()); +let r = binop_right(texpr.clone()); +let lr = cost_of_expr(&l, &func_index, &scc_index, table, &parser_always_advancing, &recursion_ctx, &si); +let rr = cost_of_expr(&r, &func_index, &scc_index, lr.table.clone(), &parser_always_advancing, &recursion_ctx, &si); +Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq(lr.summary.clone().work.clone(), &cost_seq(Rc::new(CostExpr::CostConst { + value: 1, +}), &rr.summary.clone().work.clone())), + span: cost_seq(lr.summary.clone().span.clone(), &cost_seq(Rc::new(CostExpr::CostConst { + value: 1, +}), &rr.summary.clone().span.clone())), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, +}), + table: rr.table.clone(), +}) +}, + ExprData::ExprCall { .. } => { + let fname = expr_call_func_at(texpr.clone(), si.clone()); +let callee_result = match v2_rt::map_get(&func_index, fname.clone()) { + Some(entry) => get_or_compute_summary(&fname, &func_index, &scc_index, &table, parser_always_advancing.clone(), recursion_ctx.clone(), si.clone()), + None => Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { + value: 1, +}), + span: Rc::new(CostExpr::CostConst { + value: 1, +}), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, +}), + table: table, +}), +}; +let args_result = texpr.children.clone().iter().cloned().fold(Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { + value: 0, +}), + span: Rc::new(CostExpr::CostConst { + value: 0, +}), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, +}), + table: callee_result.table.clone(), +}), |acc: Rc, a: Rc| { + let ar = cost_of_expr(&arg_value(&a), &func_index, &scc_index, acc.table.clone(), &parser_always_advancing, &recursion_ctx, &si); +Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq(acc.summary.clone().work.clone(), &ar.summary.clone().work.clone()), + span: cost_seq(acc.summary.clone().span.clone(), &ar.summary.clone().span.clone()), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, +}), + table: ar.table.clone(), +}) +}); +Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq(args_result.summary.clone().work.clone(), &callee_result.summary.clone().work.clone()), + span: cost_seq(args_result.summary.clone().span.clone(), &callee_result.summary.clone().span.clone()), + output_size: callee_result.summary.clone().output_size.clone(), + certainty: callee_result.summary.clone().certainty.clone(), +}), + table: args_result.table.clone(), +}) +}, + ExprData::ExprMethodCall { method_semantics: ms, .. } => { + let recv = method_receiver(texpr.clone()); +let mc_args = method_arg_nodes(texpr.clone()); +let recv_r = cost_of_expr(&recv, &func_index, &scc_index, table, &parser_always_advancing, &recursion_ctx, &si); +let size = receiver_size_var(recv.clone(), si.clone()); +let binder = size_binder_name(size.clone()); +let method_cost_result = if (ms.clone() == None) { + None + } else { + match (*ms.clone().unwrap()).clone() { + MethodSemantics::AlgebraMethodSemantics { method_def: md, cost_shape: cs, .. } => { + let pc = node_is_collection(&resolved_type(texpr.clone()), si.clone()); +match cs.clone() { + Some(shape) => Some(cost_of_method_by_shape(shape.clone(), pc, &recv_r, mc_args.clone(), &size, &binder, func_index.clone(), scc_index.clone(), parser_always_advancing.clone(), recursion_ctx.clone(), &si)), + None => Some(Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq(recv_r.summary.clone().work.clone(), &Rc::new(CostExpr::CostConst { + value: 1, +})), + span: cost_seq(recv_r.summary.clone().span.clone(), &Rc::new(CostExpr::CostConst { + value: 1, +})), + output_size: v2_rt::rc_empty_map::>(), + certainty: recv_r.summary.clone().certainty.clone(), +}), + table: recv_r.table.clone(), +})), +} +}, + _ => None, +} + }; +match method_cost_result { + Some(result) => result.clone(), + _ => { + let args_result = mc_args.clone().iter().cloned().fold(Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { + value: 0, +}), + span: Rc::new(CostExpr::CostConst { + value: 0, +}), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, +}), + table: recv_r.table.clone(), +}), |acc: Rc, a: Rc| { + let ar = cost_of_expr(&arg_value(&a), &func_index, &scc_index, acc.table.clone(), &parser_always_advancing, &recursion_ctx, &si); +Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq(acc.summary.clone().work.clone(), &ar.summary.clone().work.clone()), + span: cost_seq(acc.summary.clone().span.clone(), &ar.summary.clone().span.clone()), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, +}), + table: ar.table.clone(), +}) +}); +Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq(recv_r.summary.clone().work.clone(), &cost_seq(Rc::new(CostExpr::CostConst { + value: 1, +}), &args_result.summary.clone().work.clone())), + span: cost_seq(recv_r.summary.clone().span.clone(), &cost_seq(Rc::new(CostExpr::CostConst { + value: 1, +}), &args_result.summary.clone().span.clone())), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, +}), + table: args_result.table.clone(), +}) +}, +} +}, + ExprData::ExprMatch => { + let scrut = match_scrutinee(texpr.clone()); +let arm_nodes = match_arm_nodes(texpr.clone()); +let s_r = cost_of_expr(&scrut, &func_index, &scc_index, table, &parser_always_advancing, &recursion_ctx, &si); +let arms_accum = arm_nodes.iter().cloned().fold(Rc::new(MatchCostAccum { + result: Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { + value: 0, +}), + span: Rc::new(CostExpr::CostConst { + value: 0, +}), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, +}), + table: s_r.table.clone(), +}), + branch_costs: Rc::new(vec![]), +}), |acc: Rc, arm_node: Rc| { + let ar = cost_of_expr(&arm_body(&arm_node), &func_index, &scc_index, acc.result.clone().table.clone(), &parser_always_advancing, &recursion_ctx, &si); +Rc::new(MatchCostAccum { + result: Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_par(acc.result.clone().summary.clone().work.clone(), &ar.summary.clone().work.clone()), + span: cost_par(acc.result.clone().summary.clone().span.clone(), &ar.summary.clone().span.clone()), + output_size: ar.summary.clone().output_size.clone(), + certainty: ar.summary.clone().certainty.clone(), +}), + table: ar.table.clone(), +}), + branch_costs: v2_rt::concat(acc.branch_costs.clone(), Rc::new(vec![ar.summary.clone().work.clone()])), +}) +}); +Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_conditional(s_r.summary.clone().work.clone(), arms_accum.branch_costs.clone()), + span: cost_conditional(s_r.summary.clone().span.clone(), Rc::new(vec![arms_accum.result.clone().summary.clone().span.clone()])), + output_size: arms_accum.result.clone().summary.clone().output_size.clone(), + certainty: arms_accum.result.clone().summary.clone().certainty.clone(), +}), + table: arms_accum.result.clone().table.clone(), +}) +}, + ExprData::ExprIf => { + let c = if_condition(texpr.clone()); +let t = if_then_branch(texpr.clone()); +let c_r = cost_of_expr(&c, &func_index, &scc_index, table, &parser_always_advancing, &recursion_ctx, &si); +let t_r = cost_of_expr(&t, &func_index, &scc_index, c_r.table.clone(), &parser_always_advancing, &recursion_ctx, &si); +let e_result = match if_else_branch(texpr.clone()) { + Some(eb) => { + let er = cost_of_expr(&eb, &func_index, &scc_index, t_r.table.clone(), &parser_always_advancing, &recursion_ctx, &si); +Rc::new(SummaryResult { + summary: er.summary.clone(), + table: er.table.clone(), +}) +}, + None => Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { + value: 0, +}), + span: Rc::new(CostExpr::CostConst { + value: 0, +}), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, +}), + table: t_r.table.clone(), +}), +}; +Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_conditional(c_r.summary.clone().work.clone(), Rc::new(vec![t_r.summary.clone().work.clone(), e_result.summary.clone().work.clone()])), + span: cost_conditional(c_r.summary.clone().span.clone(), Rc::new(vec![t_r.summary.clone().span.clone(), e_result.summary.clone().span.clone()])), + output_size: t_r.summary.clone().output_size.clone(), + certainty: Certainty::Proven, +}), + table: e_result.table.clone(), +}) +}, + ExprData::ExprLet => { + let v = let_value(texpr.clone()); +let v_r = cost_of_expr(&v, &func_index, &scc_index, table, &parser_always_advancing, &recursion_ctx, &si); +match let_body(texpr.clone()) { + Some(b) => { + let b_r = cost_of_expr(&b, &func_index, &scc_index, v_r.table.clone(), &parser_always_advancing, &recursion_ctx, &si); +Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq(v_r.summary.clone().work.clone(), &b_r.summary.clone().work.clone()), + span: cost_seq(v_r.summary.clone().span.clone(), &b_r.summary.clone().span.clone()), + output_size: b_r.summary.clone().output_size.clone(), + certainty: b_r.summary.clone().certainty.clone(), +}), + table: b_r.table.clone(), +}) +}, + None => v_r.clone(), +} +}, + ExprData::ExprBlock => texpr.children.clone().iter().cloned().fold(Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { + value: 0, +}), + span: Rc::new(CostExpr::CostConst { + value: 0, +}), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, +}), + table: table, +}), |acc: Rc, s: Rc| { + let sr = cost_of_expr(&s, &func_index, &scc_index, acc.table.clone(), &parser_always_advancing, &recursion_ctx, &si); +Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq(acc.summary.clone().work.clone(), &sr.summary.clone().work.clone()), + span: cost_seq(acc.summary.clone().span.clone(), &sr.summary.clone().span.clone()), + output_size: sr.summary.clone().output_size.clone(), + certainty: sr.summary.clone().certainty.clone(), +}), + table: sr.table.clone(), +}) +}), + ExprData::ExprForEach => { + let c = foreach_collection(texpr.clone()); +let bd = foreach_body(texpr.clone()); +let c_r = cost_of_expr(&c, &func_index, &scc_index, table, &parser_always_advancing, &recursion_ctx, &si); +let bd_r = cost_of_expr(&bd, &func_index, &scc_index, c_r.table.clone(), &parser_always_advancing, &recursion_ctx, &si); +let size = receiver_size_var(c.clone(), si.clone()); +let binder = size_binder_name(size.clone()); +let loop_work = cost_loop(binder, size.clone(), &bd_r.summary.clone().work.clone()); +Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq(c_r.summary.clone().work.clone(), &loop_work), + span: cost_seq(c_r.summary.clone().span.clone(), &loop_work), + output_size: v2_rt::rc_empty_map::>(), + certainty: bd_r.summary.clone().certainty.clone(), +}), + table: bd_r.table.clone(), +}) +}, + ExprData::NoExprData => texpr.children.clone().iter().cloned().fold(Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { + value: 0, +}), + span: Rc::new(CostExpr::CostConst { + value: 0, +}), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, +}), + table: table, +}), |acc: Rc, child: Rc| { + let cr = cost_of_expr(&child, &func_index, &scc_index, acc.table.clone(), &parser_always_advancing, &recursion_ctx, &si); +Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq(acc.summary.clone().work.clone(), &cr.summary.clone().work.clone()), + span: cost_seq(acc.summary.clone().span.clone(), &cr.summary.clone().span.clone()), + output_size: cr.summary.clone().output_size.clone(), + certainty: cr.summary.clone().certainty.clone(), +}), + table: cr.table.clone(), +}) +}), + _ => texpr.children.clone().iter().cloned().fold(Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { + value: 1, +}), + span: Rc::new(CostExpr::CostConst { + value: 1, +}), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, +}), + table: table, +}), |acc: Rc, child: Rc| { + let cr = cost_of_expr(&child, &func_index, &scc_index, acc.table.clone(), &parser_always_advancing, &recursion_ctx, &si); +Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq(acc.summary.clone().work.clone(), &cr.summary.clone().work.clone()), + span: cost_seq(acc.summary.clone().span.clone(), &cr.summary.clone().span.clone()), + output_size: cr.summary.clone().output_size.clone(), + certainty: cr.summary.clone().certainty.clone(), +}), + table: cr.table.clone(), +}) +}), +} }) } @@ -8806,740 +4691,437 @@ pub fn estimate_expr_size(texpr: Rc, budget: i64) -> i64 { if (budget.clone() <= 0) { 0 } else { - texpr - .children - .clone() - .iter() - .cloned() - .fold((budget.clone() - 1), |acc: i64, child: Rc| { - estimate_expr_size(child.clone(), acc) - }) + texpr.children.clone().iter().cloned().fold((budget.clone() - 1), |acc: i64, child: Rc| estimate_expr_size(child.clone(), acc)) } }) } -pub fn get_or_compute_summary( - func_name: &String, - func_index: &Rc>>, - scc_index: &Rc>>, - table: &Rc, - parser_always_advancing: Rc>, - recursion_ctx: RecursionContext, - si: Rc>>, -) -> Rc { +pub fn get_or_compute_summary(func_name: &String, func_index: &Rc>>, scc_index: &Rc>>, table: &Rc, parser_always_advancing: Rc>, recursion_ctx: RecursionContext, si: Rc>>) -> Rc { match lookup_summary(table.clone(), func_name.clone()) { - Some(cached) => Rc::new(SummaryResult { - summary: cached.clone(), - table: table.clone(), - }), - None => match v2_rt::map_get(&func_index, func_name.clone()) { - Some(entry) => { - let target = match v2_rt::map_get(&scc_index, func_name.clone()) { - Some(info) => Some(info.pattern.clone()), - None => None, - }; - let is_recursive = (target.clone() != None); - let zero_placeholder = Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { value: 0 }), - span: Rc::new(CostExpr::CostConst { value: 0 }), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Conservative, - }); - let table_prepped = if is_recursive { - cache_summary(table.clone(), func_name.clone(), zero_placeholder) - } else { - table.clone() - }; - let result = cost_of_expr( - &entry.body.clone(), - &func_index, - &scc_index, - table_prepped, - &parser_always_advancing, - &recursion_ctx, - &si, - ); - let scc_members = match v2_rt::map_get(&scc_index, func_name.clone()) { - Some(info) => info.members.clone(), - None => Rc::new(vec![]), - }; - let is_scc = ((scc_members.clone().len() as i64) > 1); - let bounded = match target.clone() { - Some(t) => { - if is_scc { - Rc::new(ComplexitySummary { - work: bounded_scc_cost( - t.clone(), - result.summary.clone().work.clone(), - scc_members.clone(), - ), - span: bounded_scc_cost( - t.clone(), - result.summary.clone().span.clone(), - scc_members.clone(), - ), - output_size: result.summary.clone().output_size.clone(), - certainty: Certainty::Conservative, - }) - } else { - Rc::new(ComplexitySummary { - work: bounded_recursive_cost( - t.clone(), - result.summary.clone().work.clone(), - func_name.clone(), - ), - span: bounded_recursive_cost( - t.clone(), - result.summary.clone().span.clone(), - func_name.clone(), - ), - output_size: result.summary.clone().output_size.clone(), - certainty: Certainty::Conservative, - }) - } - } - None => result.summary.clone(), - }; - let simplified = Rc::new(ComplexitySummary { - work: simplify_cost(bounded.work.clone()), - span: simplify_cost(bounded.span.clone()), - output_size: bounded.output_size.clone(), - certainty: bounded.certainty.clone(), - }); - let final_table = - cache_summary(result.table.clone(), func_name.clone(), simplified.clone()); - Rc::new(SummaryResult { - summary: simplified.clone(), - table: final_table, - }) - } - None => { - let is_unexpected_miss = (v2_rt::map_get(&scc_index, func_name.clone()) != None); - if is_unexpected_miss { - { - let miss_summary = Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostUnknown { - reason: v2_rt::concat( - "internal function missing from index: ".to_string(), - func_name.clone(), - ), - }), - span: Rc::new(CostExpr::CostUnknown { - reason: v2_rt::concat( - "internal function missing from index: ".to_string(), - func_name.clone(), - ), - }), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Conservative, - }); - Rc::new(SummaryResult { - summary: miss_summary, - table: table.clone(), - }) - } - } else { - { - let external_summary = Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostExtern { - name: func_name.clone(), - }), - span: Rc::new(CostExpr::CostExtern { - name: func_name.clone(), - }), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Conservative, - }); - Rc::new(SummaryResult { - summary: external_summary, - table: table.clone(), - }) - } - } - } + Some(cached) => Rc::new(SummaryResult { + summary: cached.clone(), + table: table.clone(), +}), + None => match v2_rt::map_get(&func_index, func_name.clone()) { + Some(entry) => { + let target = match v2_rt::map_get(&scc_index, func_name.clone()) { + Some(info) => Some(info.pattern.clone()), + None => None, +}; +let is_recursive = (target.clone() != None); +let zero_placeholder = Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { + value: 0, +}), + span: Rc::new(CostExpr::CostConst { + value: 0, +}), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Conservative, +}); +let table_prepped = if is_recursive { + cache_summary(table.clone(), func_name.clone(), zero_placeholder) + } else { + table.clone() + }; +let result = cost_of_expr(&entry.body.clone(), &func_index, &scc_index, table_prepped, &parser_always_advancing, &recursion_ctx, &si); +let scc_members = match v2_rt::map_get(&scc_index, func_name.clone()) { + Some(info) => info.members.clone(), + None => Rc::new(vec![]), +}; +let is_scc = ((scc_members.clone().len() as i64) > 1); +let bounded = match target.clone() { + Some(t) => if is_scc { + Rc::new(ComplexitySummary { + work: bounded_scc_cost(t.clone(), result.summary.clone().work.clone(), scc_members.clone()), + span: bounded_scc_cost(t.clone(), result.summary.clone().span.clone(), scc_members.clone()), + output_size: result.summary.clone().output_size.clone(), + certainty: Certainty::Conservative, +}) + } else { + Rc::new(ComplexitySummary { + work: bounded_recursive_cost(t.clone(), result.summary.clone().work.clone(), func_name.clone()), + span: bounded_recursive_cost(t.clone(), result.summary.clone().span.clone(), func_name.clone()), + output_size: result.summary.clone().output_size.clone(), + certainty: Certainty::Conservative, +}) }, - } + None => result.summary.clone(), +}; +let simplified = Rc::new(ComplexitySummary { + work: simplify_cost(bounded.work.clone()), + span: simplify_cost(bounded.span.clone()), + output_size: bounded.output_size.clone(), + certainty: bounded.certainty.clone(), +}); +let final_table = cache_summary(result.table.clone(), func_name.clone(), simplified.clone()); +Rc::new(SummaryResult { + summary: simplified.clone(), + table: final_table, +}) +}, + None => { + let is_unexpected_miss = (v2_rt::map_get(&scc_index, func_name.clone()) != None); +if is_unexpected_miss { + { + let miss_summary = Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostUnknown { + reason: v2_rt::concat("internal function missing from index: ".to_string(), func_name.clone()), +}), + span: Rc::new(CostExpr::CostUnknown { + reason: v2_rt::concat("internal function missing from index: ".to_string(), func_name.clone()), +}), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Conservative, +}); +Rc::new(SummaryResult { + summary: miss_summary, + table: table.clone(), +}) +} + } else { + { + let external_summary = Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostExtern { + name: func_name.clone(), +}), + span: Rc::new(CostExpr::CostExtern { + name: func_name.clone(), +}), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Conservative, +}); +Rc::new(SummaryResult { + summary: external_summary, + table: table.clone(), +}) +} + } +}, +}, +} } -pub fn collect_call_evidence( - body: &Rc, - target_set: &Rc>, - si: &Rc>>, -) -> Rc>>>> { +pub fn collect_call_evidence(body: &Rc, target_set: &Rc>, si: &Rc>>) -> Rc>>>> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { - descent_evidence: de, - .. - } => { - let callee = expr_call_func_at(body.clone(), si.clone()); - let own = if (v2_rt::map_get(&target_set, callee) != None) { - match de.clone() { - Some(evidence) => Rc::new(vec![evidence.clone()]), - None => Rc::new(vec![]), - } - } else { - Rc::new(vec![]) - }; - let from_children = body.children.clone().iter().cloned().fold( - Rc::new(vec![]), - |acc: _, child: Rc| { - v2_rt::concat(acc, collect_call_evidence(&child, &target_set, &si)) - }, - ); - v2_rt::concat(own, from_children) - } - _ => body.children.clone().iter().cloned().fold( - Rc::new(vec![]), - |acc: Rc>>>>, child: Rc| { - v2_rt::concat(acc, collect_call_evidence(&child, &target_set, &si)) - }, - ), - } + ExprData::ExprCall { descent_evidence: de, .. } => { + let callee = expr_call_func_at(body.clone(), si.clone()); +let own = if (v2_rt::map_get(&target_set, callee) != None) { + match de.clone() { + Some(evidence) => Rc::new(vec![evidence.clone()]), + None => Rc::new(vec![]), +} + } else { + Rc::new(vec![]) + }; +let from_children = body.children.clone().iter().cloned().fold(Rc::new(vec![]), |acc: _, child: Rc| v2_rt::concat(acc, collect_call_evidence(&child, &target_set, &si))); +v2_rt::concat(own, from_children) +}, + _ => body.children.clone().iter().cloned().fold(Rc::new(vec![]), |acc: Rc>>>>, child: Rc| v2_rt::concat(acc, collect_call_evidence(&child, &target_set, &si))), +} }) } -pub fn collect_self_call_evidence( - body: Rc, - fn_name: String, - si: Rc>>, -) -> Rc>>>> { - collect_call_evidence( - &body, - &v2_rt::rc_map_insert(v2_rt::rc_empty_map::(), fn_name, true), - &si, - ) +pub fn collect_self_call_evidence(body: Rc, fn_name: String, si: Rc>>) -> Rc>>>> { + collect_call_evidence(&body, &v2_rt::rc_map_insert(v2_rt::rc_empty_map::(), fn_name, true), &si) } -pub fn collect_callee_evidence( - body: Rc, - callee_name: String, - si: Rc>>, -) -> Rc>>>> { - collect_call_evidence( - &body, - &v2_rt::rc_map_insert(v2_rt::rc_empty_map::(), callee_name, true), - &si, - ) +pub fn collect_callee_evidence(body: Rc, callee_name: String, si: Rc>>) -> Rc>>>> { + collect_call_evidence(&body, &v2_rt::rc_map_insert(v2_rt::rc_empty_map::(), callee_name, true), &si) } pub fn derive_edge_evidence(all_calls: Rc>>>>) -> DescentEvidence { - all_calls.iter().cloned().fold( - DescentEvidence::Strict, - |worst: DescentEvidence, call_ev: Rc>>| { - let call_best = call_ev.clone().iter().cloned().fold( - DescentEvidence::DescentUnknown, - |best: DescentEvidence, rel: Rc| { - let ev = sub_value_to_evidence(rel.clone()); - match ev.clone() { - DescentEvidence::Strict => DescentEvidence::Strict, - _ => match best { - DescentEvidence::Strict => DescentEvidence::Strict, - DescentEvidence::NonIncreasing => DescentEvidence::NonIncreasing, - _ => ev.clone(), - }, - } - }, - ); - merge_evidence(worst, call_best.clone()) - }, - ) -} - -pub fn merge_param_evidence( - all_calls: Rc>>>>, - param_index: i64, -) -> DescentEvidence { - all_calls.iter().cloned().fold( - DescentEvidence::Strict, - |acc: DescentEvidence, call_evidence: Rc>>| match call_evidence - .clone() - .get(param_index.clone() as usize) - .cloned() - { - Some(rel) => merge_evidence(acc.clone(), sub_value_to_evidence(rel.clone())), - None => acc.clone(), - }, - ) + all_calls.iter().cloned().fold(DescentEvidence::Strict, |worst: DescentEvidence, call_ev: Rc>>| { + let call_best = call_ev.clone().iter().cloned().fold(DescentEvidence::DescentUnknown, |best: DescentEvidence, rel: Rc| { + let ev = sub_value_to_evidence(rel.clone()); +match ev.clone() { + DescentEvidence::Strict => DescentEvidence::Strict, + _ => match best { + DescentEvidence::Strict => DescentEvidence::Strict, + DescentEvidence::NonIncreasing => DescentEvidence::NonIncreasing, + _ => ev.clone(), +}, +} +}); +merge_evidence(worst, call_best.clone()) +}) } -pub fn extract_shrink_factor( - all_calls: Rc>>>>, - param_index: i64, -) -> Option> { - all_calls.iter().cloned().fold( - Some(Rc::new(ShrinkFactor::UnitShrink)), - |acc: Option>, call_evidence: Rc>>| match acc - .clone() - { - None => None, - Some(prev) => match call_evidence - .clone() - .get(param_index.clone() as usize) - .cloned() - { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { factor: f, .. } => { - match (*prev.clone()).clone() { - ShrinkFactor::UnitShrink => Some(f.clone()), - _ => { - if (prev.clone() == f.clone()) { - acc.clone() - } else { - None - } - } - } - } - SubValueRelation::ArithmeticDescent { factor: f, .. } => { - match (*prev.clone()).clone() { - ShrinkFactor::UnitShrink => Some(f.clone()), - _ => { - if (prev.clone() == f.clone()) { - acc.clone() - } else { - None - } - } - } - } - _ => acc.clone(), - }, - None => acc.clone(), - }, - }, - ) +pub fn merge_param_evidence(all_calls: Rc>>>>, param_index: i64) -> DescentEvidence { + all_calls.iter().cloned().fold(DescentEvidence::Strict, |acc: DescentEvidence, call_evidence: Rc>>| match call_evidence.clone().get(param_index.clone() as usize).cloned() { + Some(rel) => merge_evidence(acc.clone(), sub_value_to_evidence(rel.clone())), + None => acc.clone(), +}) +} + +pub fn extract_shrink_factor(all_calls: Rc>>>>, param_index: i64) -> Option> { + all_calls.iter().cloned().fold(Some(Rc::new(ShrinkFactor::UnitShrink)), |acc: Option>, call_evidence: Rc>>| match acc.clone() { + None => None, + Some(prev) => match call_evidence.clone().get(param_index.clone() as usize).cloned() { + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { factor: f, .. } => match (*prev.clone()).clone() { + ShrinkFactor::UnitShrink => Some(f.clone()), + _ => if (prev.clone() == f.clone()) { + acc.clone() + } else { + None + }, +}, + SubValueRelation::ArithmeticDescent { factor: f, .. } => match (*prev.clone()).clone() { + ShrinkFactor::UnitShrink => Some(f.clone()), + _ => if (prev.clone() == f.clone()) { + acc.clone() + } else { + None + }, +}, + _ => acc.clone(), +}, + None => acc.clone(), +}, +}) } -pub fn max_path_descending( - body: &Rc, - fn_name: &String, - param_index: i64, - si: &Rc>>, -) -> i64 { +pub fn max_path_descending(body: &Rc, fn_name: &String, param_index: i64, si: &Rc>>) -> i64 { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { - descent_evidence: de, - .. - } => { - let callee = expr_call_func_at(body.clone(), si.clone()); - let own = if (callee.as_str() == fn_name.clone().as_str()) { - match de.clone() { - Some(evidence) => { - match evidence.clone().get(param_index.clone() as usize).cloned() { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { .. } => 1, - SubValueRelation::IteratedSubValue { .. } => 1, - SubValueRelation::ArithmeticDescent { .. } => 1, - _ => 0, - }, - None => 0, - } - } - None => 0, - } - } else { - 0 - }; - let from_children = - body.children - .clone() - .iter() - .cloned() - .fold(0, |acc: i64, child: Rc| { - (acc + max_path_descending(&child, &fn_name, param_index.clone(), &si)) - }); - (own + from_children) - } - ExprData::ExprIf => { - let cond_count = max_path_descending( - &if_condition(body.clone()), - &fn_name, - param_index.clone(), - &si, - ); - let then_count = max_path_descending( - &if_then_branch(body.clone()), - &fn_name, - param_index.clone(), - &si, - ); - let else_branch = if_else_branch(body.clone()); - let else_count = match else_branch { - Some(eb) => max_path_descending(&eb, &fn_name, param_index.clone(), &si), - None => 0, - }; - let branch_max = if (then_count.clone() > else_count.clone()) { - then_count.clone() + ExprData::ExprCall { descent_evidence: de, .. } => { + let callee = expr_call_func_at(body.clone(), si.clone()); +let own = if (callee.as_str() == fn_name.clone().as_str()) { + match de.clone() { + Some(evidence) => match evidence.clone().get(param_index.clone() as usize).cloned() { + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { .. } => 1, + SubValueRelation::IteratedSubValue { .. } => 1, + SubValueRelation::ArithmeticDescent { .. } => 1, + _ => 0, +}, + None => 0, +}, + None => 0, +} + } else { + 0 + }; +let from_children = body.children.clone().iter().cloned().fold(0, |acc: i64, child: Rc| (acc + max_path_descending(&child, &fn_name, param_index.clone(), &si))); +(own + from_children) +}, + ExprData::ExprIf => { + let cond_count = max_path_descending(&if_condition(body.clone()), &fn_name, param_index.clone(), &si); +let then_count = max_path_descending(&if_then_branch(body.clone()), &fn_name, param_index.clone(), &si); +let else_branch = if_else_branch(body.clone()); +let else_count = match else_branch { + Some(eb) => max_path_descending(&eb, &fn_name, param_index.clone(), &si), + None => 0, +}; +let branch_max = if (then_count.clone() > else_count.clone()) { + then_count.clone() + } else { + else_count.clone() + }; +(cond_count + branch_max) +}, + ExprData::ExprMatch => { + let scrut_count = max_path_descending(&match_scrutinee(body.clone()), &fn_name, param_index.clone(), &si); +let arms = match_arm_nodes(body.clone()); +let arm_max = arms.iter().cloned().fold(0, |acc: i64, arm: Rc| { + let arm_count = max_path_descending(&arm_body(&arm), &fn_name, param_index.clone(), &si); +if (arm_count.clone() > acc.clone()) { + arm_count.clone() } else { - else_count.clone() - }; - (cond_count + branch_max) - } - ExprData::ExprMatch => { - let scrut_count = max_path_descending( - &match_scrutinee(body.clone()), - &fn_name, - param_index.clone(), - &si, - ); - let arms = match_arm_nodes(body.clone()); - let arm_max = arms.iter().cloned().fold(0, |acc: i64, arm: Rc| { - let arm_count = - max_path_descending(&arm_body(&arm), &fn_name, param_index.clone(), &si); - if (arm_count.clone() > acc.clone()) { - arm_count.clone() - } else { - acc.clone() - } - }); - (scrut_count + arm_max) - } - _ => body - .children - .clone() - .iter() - .cloned() - .fold(0, |acc: i64, child: Rc| { - (acc + max_path_descending(&child, &fn_name, param_index.clone(), &si)) - }), - } + acc.clone() + } +}); +(scrut_count + arm_max) +}, + _ => body.children.clone().iter().cloned().fold(0, |acc: i64, child: Rc| (acc + max_path_descending(&child, &fn_name, param_index.clone(), &si))), +} }) } -pub fn distinct_descended_fields( - all_calls: Rc>>>>, - param_index: i64, -) -> i64 { +pub fn distinct_descended_fields(all_calls: Rc>>>>, param_index: i64) -> i64 { { - let field_set = all_calls.iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, call_evidence: Rc>>| { - match call_evidence - .clone() - .get(param_index.clone() as usize) - .cloned() - { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { field: f, .. } => { - v2_rt::rc_map_insert(acc.clone(), f.field_name.clone(), true) - } - SubValueRelation::IteratedSubValue { field: f, .. } => { - v2_rt::rc_map_insert(acc.clone(), f.field_name.clone(), true) - } - _ => acc.clone(), - }, - None => acc.clone(), - } - }, - ); - (Rc::new(v2_rt::map_keys(&field_set)).len() as i64) - } + let field_set = all_calls.iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, call_evidence: Rc>>| match call_evidence.clone().get(param_index.clone() as usize).cloned() { + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { field: f, .. } => v2_rt::rc_map_insert(acc.clone(), f.field_name.clone(), true), + SubValueRelation::IteratedSubValue { field: f, .. } => v2_rt::rc_map_insert(acc.clone(), f.field_name.clone(), true), + _ => acc.clone(), +}, + None => acc.clone(), +}); +(Rc::new(v2_rt::map_keys(&field_set)).len() as i64) +} } -pub fn analyze_structural_bounds( - func_entries: Rc>>, - si: Rc>>, -) -> Rc>> { - func_entries.iter().cloned().fold( - Rc::new(vec![]), - |acc: Rc>>, entry: Rc| { - let all_calls = - collect_self_call_evidence(entry.body.clone(), entry.name.clone(), si.clone()); - if ((all_calls.clone().len() as i64) == 0) { - acc.clone() - } else { - { - let param_results = Rc::new( - entry - .params - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - .fold(Rc::new(vec![]), |pacc: _, pair: (i64, Rc)| { - let param_index = pair.0.clone(); - let param_node = pair.1.clone(); - let evidence = merge_param_evidence(all_calls.clone(), param_index.clone()); - match evidence.clone() { - DescentEvidence::Strict => { - let param_name = param_node_name_at(param_node.clone(), si.clone()); - let factor_opt = - extract_shrink_factor(all_calls.clone(), param_index.clone()); - match factor_opt.clone() { - Some(factor) => { - let branches = max_path_descending( - &entry.body.clone(), - &entry.name.clone(), - param_index.clone(), - &si, - ); - let recurrence = match (*factor.clone()).clone() { - ShrinkFactor::UnitShrink => { - let distinct_fields = distinct_descended_fields( - all_calls.clone(), - param_index.clone(), - ); - if (branches.clone() <= distinct_fields.clone()) { - catamorphism_bound(param_name.clone(), 1) - } else { - derive_bound( - param_name.clone(), - branches.clone(), - factor.clone(), - 0, - ) - } - } - ShrinkFactor::ConstantShrink { .. } => { - let distinct_fields = distinct_descended_fields( - all_calls.clone(), - param_index.clone(), - ); - if (branches.clone() <= distinct_fields.clone()) { - catamorphism_bound(param_name.clone(), 1) - } else { - derive_bound( - param_name.clone(), - branches.clone(), - factor.clone(), - 0, - ) - } - } - ShrinkFactor::ProportionalShrink { .. } => { - derive_bound( - param_name.clone(), - branches.clone(), - factor.clone(), - 0, - ) - } - }; - let stack_bound = if entry.is_tail_recursive.clone() { - Rc::new(CostBound::ConstantBound) - } else { - derive_bound(param_name.clone(), 1, factor.clone(), 0) - }; - v2_rt::concat( - pacc.clone(), - Rc::new(vec![Rc::new(StructuralBoundResult { - func_name: entry.name.clone(), - param: param_name.clone(), - recurrence_bound: recurrence.clone(), - stack_bound: stack_bound.clone(), - span: entry.span.clone(), - })]), - ) - } - None => pacc.clone(), +pub fn analyze_structural_bounds(func_entries: Rc>>, si: Rc>>) -> Rc>> { + func_entries.iter().cloned().fold(Rc::new(vec![]), |acc: Rc>>, entry: Rc| { + let all_calls = collect_self_call_evidence(entry.body.clone(), entry.name.clone(), si.clone()); +if ((all_calls.clone().len() as i64) == 0) { + acc.clone() + } else { + { + let param_results = Rc::new(entry.params.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(Rc::new(vec![]), |pacc: _, pair: (i64, Rc)| { + let param_index = pair.0.clone(); +let param_node = pair.1.clone(); +let evidence = merge_param_evidence(all_calls.clone(), param_index.clone()); +match evidence.clone() { + DescentEvidence::Strict => { + let param_name = param_node_name_at(param_node.clone(), si.clone()); +let factor_opt = extract_shrink_factor(all_calls.clone(), param_index.clone()); +match factor_opt.clone() { + Some(factor) => { + let branches = max_path_descending(&entry.body.clone(), &entry.name.clone(), param_index.clone(), &si); +let recurrence = match (*factor.clone()).clone() { + ShrinkFactor::UnitShrink => { + let distinct_fields = distinct_descended_fields(all_calls.clone(), param_index.clone()); +if (branches.clone() <= distinct_fields.clone()) { + catamorphism_bound(param_name.clone(), 1) + } else { + derive_bound(param_name.clone(), branches.clone(), factor.clone(), 0) } - } - _ => pacc.clone(), - } - }); - v2_rt::concat(acc.clone(), param_results.clone()) - } - } - }, - ) +}, + ShrinkFactor::ConstantShrink { .. } => { + let distinct_fields = distinct_descended_fields(all_calls.clone(), param_index.clone()); +if (branches.clone() <= distinct_fields.clone()) { + catamorphism_bound(param_name.clone(), 1) + } else { + derive_bound(param_name.clone(), branches.clone(), factor.clone(), 0) + } +}, + ShrinkFactor::ProportionalShrink { .. } => derive_bound(param_name.clone(), branches.clone(), factor.clone(), 0), +}; +let stack_bound = if entry.is_tail_recursive.clone() { + Rc::new(CostBound::ConstantBound) + } else { + derive_bound(param_name.clone(), 1, factor.clone(), 0) + }; +v2_rt::concat(pacc.clone(), Rc::new(vec![Rc::new(StructuralBoundResult { + func_name: entry.name.clone(), + param: param_name.clone(), + recurrence_bound: recurrence.clone(), + stack_bound: stack_bound.clone(), + span: entry.span.clone(), +})])) +}, + None => pacc.clone(), +} +}, + _ => pacc.clone(), +} +}); +v2_rt::concat(acc.clone(), param_results.clone()) +} + } +}) } -pub fn build_complexity_report( - func_entries: &Rc>>, - recursion_ctx: RecursionContext, - source_indices: Rc>>, -) -> Rc { +pub fn build_complexity_report(func_entries: &Rc>>, recursion_ctx: RecursionContext, source_indices: Rc>>) -> Rc { { let si = source_indices; - let func_index = func_entries.clone().iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, entry: Rc| { - v2_rt::rc_map_insert(acc, entry.name.clone(), entry.clone()) - }, - ); - let scc_result = build_scc_index(&func_entries, func_index.clone(), &si); - let parser_always_advancing = infer_all_parser_always_advancing(&func_index, &si); - let full_scc_index = func_entries.clone().iter().cloned().fold( - scc_result.index.clone(), - |acc: Rc>>, entry: Rc| match v2_rt::map_get( - &acc, - entry.name.clone(), - ) { - Some(_) => acc.clone(), - None => { - if (max_path_self_calls(entry.body.clone(), entry.name.clone(), si.clone()) > 0) - { - { - let pattern = classify_recursion_pattern( - &entry.name.clone(), - &entry.body.clone(), - &entry.params.clone(), - parser_always_advancing.clone(), - &si, - ); - let info = Rc::new(SccInfo { - members: Rc::new(vec![entry.name.clone()]), - member_set: v2_rt::rc_map_insert( - v2_rt::rc_empty_map::(), - entry.name.clone(), - true, - ), - pattern: pattern.clone(), - }); - v2_rt::rc_map_insert(acc.clone(), entry.name.clone(), info.clone()) - } - } else { - acc.clone() - } - } - }, - ); - let call_forward = forward_adjacency( - Rc::new({ - let mut __result = Vec::new(); - for entry in func_entries.clone().iter().cloned() { - __result.push(entry.name.clone()); - } - __result - }), - scc_result.call_graph.clone(), - ); - let fan_in = func_entries.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, entry: Rc| { - let callees = match v2_rt::map_get(&call_forward, entry.name.clone()) { - Some(cs) => cs.clone(), - None => Rc::new(vec![]), - }; - let unique_set = callees.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |s: Rc>, c: String| { - v2_rt::rc_map_insert(s, c.clone(), true) - }, - ); - Rc::new(v2_rt::map_keys(&unique_set)).iter().cloned().fold( - acc, - |inner: Rc>, callee: String| { - let current = match v2_rt::map_get(&inner, callee.clone()) { - Some(v) => v.clone(), - None => 0, - }; - v2_rt::rc_map_insert(inner.clone(), callee.clone(), (current.clone() + 1)) - }, - ) - }, - ); - let result = scc_result.processing_order.clone().iter().cloned().fold( - Rc::new(TopoBuildAcc { - table: empty_intern_table(), - classes: v2_rt::rc_empty_map::(), - violations: Rc::new(vec![]), - fan_in: fan_in, - processed: v2_rt::rc_empty_map::(), - }), - |acc: Rc, func_name: String| match v2_rt::map_get( - &func_index, - func_name.clone(), - ) { - Some(entry) => { - let sr = get_or_compute_summary( - &func_name, - &func_index, - &full_scc_index, - &acc.table.clone(), - parser_always_advancing.clone(), - recursion_ctx.clone(), - si.clone(), - ); - let class_str = classify_complexity(sr.summary.clone().work.clone()); - let new_classes = v2_rt::rc_map_insert( - acc.classes.clone(), - func_name.clone(), - class_str.clone(), - ); - let new_processed = - v2_rt::rc_map_insert(acc.processed.clone(), func_name.clone(), true); - let new_violations = if is_unknown_cost(sr.summary.clone().work.clone()) { - v2_rt::concat( - acc.violations.clone(), - Rc::new(vec![Rc::new(ComplexityViolation { - func_name: func_name.clone(), - reason: extract_unknown_reason(sr.summary.clone().work.clone()), - span: entry.span.clone(), - })]), - ) - } else { - acc.violations.clone() - }; - let callees = match v2_rt::map_get(&call_forward, func_name.clone()) { - Some(cs) => cs.clone(), - None => Rc::new(vec![]), - }; - let unique_set = callees.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |s: Rc>, c: String| { - v2_rt::rc_map_insert(s, c.clone(), true) - }, - ); - let unique_callees = Rc::new(v2_rt::map_keys(&unique_set)); - let new_fan_in = unique_callees.clone().iter().cloned().fold( - acc.fan_in.clone(), - |fi: Rc>, callee: String| { - let current = match v2_rt::map_get(&fi, callee.clone()) { - Some(v) => v.clone(), - None => 0, - }; - v2_rt::rc_map_insert(fi.clone(), callee.clone(), (current.clone() - 1)) - }, - ); - let evicted_table = unique_callees.clone().iter().cloned().fold( - sr.table.clone(), - |t: Rc, callee: String| { - let remaining = match v2_rt::map_get(&new_fan_in, callee.clone()) { - Some(v) => v.clone(), - None => 0, - }; - if ((remaining.clone() <= 0) - && set_has(new_processed.clone(), callee.clone())) - { - evict_summary(t.clone(), callee.clone()) - } else { - t.clone() - } - }, - ); - let self_fan_in = match v2_rt::map_get(&new_fan_in, func_name.clone()) { - Some(v) => v.clone(), - None => 0, - }; - let final_table = if (self_fan_in.clone() <= 0) { - evict_summary(evicted_table.clone(), func_name.clone()) - } else { - evicted_table.clone() - }; - Rc::new(TopoBuildAcc { - table: final_table.clone(), - classes: new_classes.clone(), - violations: new_violations.clone(), - fan_in: new_fan_in.clone(), - processed: new_processed.clone(), - }) +let func_index = func_entries.clone().iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, entry: Rc| v2_rt::rc_map_insert(acc, entry.name.clone(), entry.clone())); +let scc_result = build_scc_index(&func_entries, func_index.clone(), &si); +let parser_always_advancing = infer_all_parser_always_advancing(&func_index, &si); +let full_scc_index = func_entries.clone().iter().cloned().fold(scc_result.index.clone(), |acc: Rc>>, entry: Rc| match v2_rt::map_get(&acc, entry.name.clone()) { + Some(_) => acc.clone(), + None => if (max_path_self_calls(entry.body.clone(), entry.name.clone(), si.clone()) > 0) { + { + let pattern = classify_recursion_pattern(&entry.name.clone(), &entry.body.clone(), &entry.params.clone(), parser_always_advancing.clone(), &si); +let info = Rc::new(SccInfo { + members: Rc::new(vec![entry.name.clone()]), + member_set: set_insert(empty_set(), entry.name.clone()), + pattern: pattern.clone(), +}); +v2_rt::rc_map_insert(acc.clone(), entry.name.clone(), info.clone()) +} + } else { + acc.clone() + }, +}); +let call_forward = forward_adjacency(Rc::new({ let mut __result = Vec::new(); for entry in func_entries.clone().iter().cloned() { __result.push(entry.name.clone()); } __result }), scc_result.call_graph.clone()); +let fan_in = func_entries.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, entry: Rc| { + let callees = match v2_rt::map_get(&call_forward, entry.name.clone()) { + Some(cs) => cs.clone(), + None => Rc::new(vec![]), +}; +let unique_set = callees.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |s: Rc>, c: String| v2_rt::rc_map_insert(s, c.clone(), true)); +Rc::new(v2_rt::map_keys(&unique_set)).iter().cloned().fold(acc, |inner: Rc>, callee: String| { + let current = match v2_rt::map_get(&inner, callee.clone()) { + Some(v) => v.clone(), + None => 0, +}; +v2_rt::rc_map_insert(inner.clone(), callee.clone(), (current.clone() + 1)) +}) +}); +let result = scc_result.processing_order.clone().iter().cloned().fold(Rc::new(TopoBuildAcc { + table: empty_intern_table(), + classes: v2_rt::rc_empty_map::(), + violations: Rc::new(vec![]), + fan_in: fan_in, + processed: v2_rt::rc_empty_map::(), +}), |acc: Rc, func_name: String| match v2_rt::map_get(&func_index, func_name.clone()) { + Some(entry) => { + let sr = get_or_compute_summary(&func_name, &func_index, &full_scc_index, &acc.table.clone(), parser_always_advancing.clone(), recursion_ctx.clone(), si.clone()); +let class_str = classify_complexity(sr.summary.clone().work.clone()); +let new_classes = v2_rt::rc_map_insert(acc.classes.clone(), func_name.clone(), class_str.clone()); +let new_processed = v2_rt::rc_map_insert(acc.processed.clone(), func_name.clone(), true); +let new_violations = if is_unknown_cost(sr.summary.clone().work.clone()) { + v2_rt::concat(acc.violations.clone(), Rc::new(vec![Rc::new(ComplexityViolation { + func_name: func_name.clone(), + reason: extract_unknown_reason(sr.summary.clone().work.clone()), + span: entry.span.clone(), +})])) + } else { + acc.violations.clone() + }; +let callees = match v2_rt::map_get(&call_forward, func_name.clone()) { + Some(cs) => cs.clone(), + None => Rc::new(vec![]), +}; +let unique_set = callees.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |s: Rc>, c: String| v2_rt::rc_map_insert(s, c.clone(), true)); +let unique_callees = Rc::new(v2_rt::map_keys(&unique_set)); +let new_fan_in = unique_callees.clone().iter().cloned().fold(acc.fan_in.clone(), |fi: Rc>, callee: String| { + let current = match v2_rt::map_get(&fi, callee.clone()) { + Some(v) => v.clone(), + None => 0, +}; +v2_rt::rc_map_insert(fi.clone(), callee.clone(), (current.clone() - 1)) +}); +let evicted_table = unique_callees.clone().iter().cloned().fold(sr.table.clone(), |t: Rc, callee: String| { + let remaining = match v2_rt::map_get(&new_fan_in, callee.clone()) { + Some(v) => v.clone(), + None => 0, +}; +if ((remaining.clone() <= 0) && set_has(new_processed.clone(), callee.clone())) { + evict_summary(t.clone(), callee.clone()) + } else { + t.clone() } - None => acc.clone(), - }, - ); - let structural_bounds = analyze_structural_bounds(func_entries.clone(), si.clone()); - Rc::new(ComplexityReport { - function_classes: result.classes.clone(), - violations: result.violations.clone(), - structural_bounds: structural_bounds, - }) - } +}); +let self_fan_in = match v2_rt::map_get(&new_fan_in, func_name.clone()) { + Some(v) => v.clone(), + None => 0, +}; +let final_table = if (self_fan_in.clone() <= 0) { + evict_summary(evicted_table.clone(), func_name.clone()) + } else { + evicted_table.clone() + }; +Rc::new(TopoBuildAcc { + table: final_table.clone(), + classes: new_classes.clone(), + violations: new_violations.clone(), + fan_in: new_fan_in.clone(), + processed: new_processed.clone(), +}) +}, + None => acc.clone(), +}); +let structural_bounds = analyze_structural_bounds(func_entries.clone(), si.clone()); +Rc::new(ComplexityReport { + function_classes: result.classes.clone(), + violations: result.violations.clone(), + structural_bounds: structural_bounds, +}) +} } diff --git a/src/v2/stage0/src/v2_compiler_effect_derivation.rs b/src/v2/stage0/src/v2_compiler_effect_derivation.rs index b41f181c2e5..67af11fccbf 100644 --- a/src/v2/stage0/src/v2_compiler_effect_derivation.rs +++ b/src/v2/stage0/src/v2_compiler_effect_derivation.rs @@ -1,49 +1,29 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.effect_derivation -use crate::std_effects::DeriveOpEffectResult::{ - DerivedEffect, MalformedPathInput, UnknownHttpMethodInput, -}; -use crate::std_effects::EffectShape::{ - AppendEffect, CreateEffect, DeleteEffect, ReadEffect, UpsertEffect, -}; -use crate::std_effects::IdempotencyEvidence::{IdentityEffect, LatticeEffect, NonIdempotent}; -use crate::std_effects::KeySource::{CompositeKey, InputField, PathParam}; -use crate::std_effects::ModifierAgreement::{Agrees, DerivationUnknown, Disagrees}; -pub use crate::std_effects::{ - check_modifier_vs_derivation, compose_effects, derive_effect_shape, derive_op_effect, - generate_idempotency_obligations, is_idempotent_effect, parse_http_method, CompositionVerdict, - DeriveOpEffectResult, DerivedOpEffect, EffectShape, IdempotencyEvidence, - IdempotencyTestObligation, KeySource, ModifierAgreement, ModifierCheck, OperationEffect, - WorkflowEffectConcern, -}; -use crate::std_http_path::PathTemplateParseResult::{MalformedPathTemplate, ParsedPathTemplate}; -use crate::std_http_path::UrlPathToken::{LiteralToken, ParamToken}; -pub use crate::std_http_path::{ - has_path_params, last_path_param, parse_path_template, PathTemplate, PathTemplateParseResult, - UrlPathToken, -}; -pub use crate::std_types::HttpMethod; -use crate::std_types::HttpMethod::{DELETE, GET, HEAD, OPTIONS, PATCH, POST, PUT}; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_types::{HttpMethod}; +use crate::std_types::HttpMethod::{GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS}; +pub use crate::std_effects::{EffectShape, KeySource, DerivedOpEffect, DeriveOpEffectResult, ModifierAgreement, ModifierCheck, IdempotencyTestObligation, WorkflowEffectConcern, parse_http_method, derive_effect_shape, derive_op_effect, check_modifier_vs_derivation, generate_idempotency_obligations, is_idempotent_effect, compose_effects, OperationEffect, CompositionVerdict, IdempotencyEvidence}; +use crate::std_effects::EffectShape::{ReadEffect, UpsertEffect, DeleteEffect, CreateEffect, AppendEffect}; +use crate::std_effects::KeySource::{PathParam, InputField, CompositeKey}; +use crate::std_effects::DeriveOpEffectResult::{DerivedEffect, UnknownHttpMethodInput, MalformedPathInput}; +use crate::std_effects::ModifierAgreement::{Agrees, Disagrees, DerivationUnknown}; +use crate::std_effects::CompositionVerdict::{IdempotentComposition, BrokenBy}; +use crate::std_effects::IdempotencyEvidence::{LatticeEffect, IdentityEffect, NonIdempotent}; +pub use crate::std_http_path::{UrlPathToken, PathTemplate, PathTemplateParseResult, parse_path_template, has_path_params, last_path_param}; +use crate::std_http_path::UrlPathToken::{LiteralToken, ParamToken}; +use crate::std_http_path::PathTemplateParseResult::{ParsedPathTemplate, MalformedPathTemplate}; -pub fn re_export_derive_op_effect( - operation_name: String, - method: HttpMethod, - path: Rc, -) -> Rc { - derive_op_effect(operation_name, method, path) +pub fn re_export_derive_op_effect(operation_name: String, method: HttpMethod, path: Rc) -> Rc { + derive_op_effect(operation_name, &method, &path) } -pub fn re_export_check_modifier( - op: Rc, - declared_idempotent: bool, - declared_readonly: bool, -) -> Rc { +pub fn re_export_check_modifier(op: Rc, declared_idempotent: bool, declared_readonly: bool) -> Rc { check_modifier_vs_derivation(&op, &declared_idempotent, &declared_readonly) } diff --git a/src/v2/stage0/src/v2_compiler_emit.rs b/src/v2/stage0/src/v2_compiler_emit.rs index df72c0995f7..a8f5f99cc40 100644 --- a/src/v2/stage0/src/v2_compiler_emit.rs +++ b/src/v2/stage0/src/v2_compiler_emit.rs @@ -1,102 +1,57 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.emit -use self::BackendCapability::*; -use self::ExprCategory::*; -use self::FuncBodyShape::*; -use self::TcoExprShape::*; -pub use crate::generated_method_template_projection::{ - go_method_template_emit, python_method_template_emit, rust_method_template_emit, -}; -use crate::std_induction::SubValueRelation::SubValueUnknown; -pub use crate::std_induction::{InductiveField, SubValueRelation}; -pub use crate::std_types::{container_template_algebra, is_container_type}; -pub use crate::v2_compiler_artifact::RenderTarget; -use crate::v2_compiler_artifact::RenderTarget::{Dag, Go, Python, Rust}; -pub use crate::v2_compiler_coercion::{ - can_cast, coerce_container_template, coerce_primitive_type, literal_suffix, render_cast, - target_callable, target_optional_template, -}; -pub use crate::v2_compiler_infer::{build_params_scope, extend_scope, InferScope}; -pub use crate::v2_compiler_infer_emit_info::{EmitGraphInfo, TypeSummary}; -pub use crate::v2_compiler_infer_env::{authored_name, TypeBinding, TypeEnv}; -pub use crate::v2_compiler_infer_items::{ItemInfo, ResolvedGraph, TypedModule}; -pub use crate::v2_compiler_infer_service::{ - extract_typed_service_name, is_typed_service_call_receiver, OpEntry, UniqueAccum, -}; -pub use crate::v2_compiler_infer_sigs::{ResolvedFuncEnv, ResolvedFuncSig}; -pub use crate::v2_compiler_infer_types::{ - child_type_node, emit_map_has, for_each_element_type_node, is_unit_like, node_is_collection, - node_is_element_collection, node_is_keyed_collection, normalize_access_type_node, - resolved_type, -}; -use crate::v2_compiler_languages::IfValueForm::{ConditionalTernary, IfExpression, IfStatement}; -use crate::v2_compiler_languages::ImportTrigger::{ - AsyncUsageTrigger, ContainerUsageTrigger, DeriveMacroTrigger, TraitImplTrigger, - TypeUsageTrigger, -}; -use crate::v2_compiler_languages::InterpStyle::{FormatArgs, InlineExpr}; -use crate::v2_compiler_languages::NamingCase::{AsAuthored, CamelCase, PascalCase, SnakeCase}; -use crate::v2_compiler_languages::ReservedWordStrategy::{NoEscape, PrefixEscape, SuffixEscape}; -use crate::v2_compiler_languages::TestNameStyle::{PascalCaseTestNames, SnakeCaseTestNames}; -use crate::v2_compiler_languages::VisibilitySpec::{CaseVisibility, KeywordVisibility}; -pub use crate::v2_compiler_languages::{ - binop_symbol, is_string_like, language_spec_for_target, service_method_depth, - service_methods_inside_class, service_receiver_str, service_return_str, service_self_param, - target_keyword, test_conventions_for_target, wrap_shared_type, BlockSyntax, EscapePair, - ExpressionSemantics, IfValueForm, ImportRule, ImportTrigger, InterpStyle, LanguageSpec, - NamingCase, RecordLitSyntax, ReservedWordStrategy, ServiceFieldTemplates, StringInterpSyntax, - TcoSyntax, TestConventions, TestNameStyle, VariantPatternSyntax, VisibilitySpec, -}; +use std::collections::HashMap; +use std::rc::Rc; use crate::v2_rt; -use crate::v2_std_core::AlgebraFieldKind::*; -use crate::v2_std_core::BinOp::NullCoalesce; -use crate::v2_std_core::Cardinality::CardOptional; -use crate::v2_std_core::Connective::{Arrow, Conj, Disj, NoConnective}; -use crate::v2_std_core::ExprData::{ - ExprBinOp, ExprBlock, ExprCall, ExprCast, ExprError, ExprFieldAccess, ExprForEach, ExprIf, - ExprIndex, ExprLambda, ExprLet, ExprListLit, ExprLiteral, ExprMatch, ExprMethodCall, - ExprRecordLit, ExprReturn, ExprSlice, ExprStringInterp, ExprUnaryOp, ExprVar, NoExprData, -}; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::v2_std_core::{Node, ErrorNode, InferredNode, is_compiler_error, module_imports, module_items, param_node_name_at, param_node_type_expr, param_node_default_value, NewlineIndex, authored_name_at, empty_intern_table, expr_var_name_at, expr_call_func_at, let_binding_name_at, field_access_field_at, ExprData, VarBindingKind, StringPart, LiteralValue, TextFile, SourceSpan, BinOp, UnaryOpKind, AlgebraFieldKind, DeclaredFuncSig, MethodSemantics, MatchPattern, field_binding_name_at, field_binding_pattern, FieldSummary, expr_method_name_at, method_arg_nodes, expr_method_call_semantics, expr_field_access_summary, lambda_param_names_at, record_lit_type_name_at, arm_body, arm_pattern, arm_guard, arg_name_at, arg_value, field_init_node_name_at, field_init_node_value, if_condition, if_then_branch, if_else_branch, match_scrutinee, match_arm_nodes, let_value, let_body, field_access_base, method_receiver, lambda_body, cast_expr, cast_target, return_value, binop_left, binop_right, foreach_variable_at, foreach_collection, foreach_body, index_base, index_expr, slice_base, slice_start, slice_end, unaryop_operand, expr_has_self_call, expr_has_non_tail_self_call, local_transport_node, is_rest_transport, is_shell_transport, is_file_transport, is_local_transport, transport_has_auth, field_init_operation_modifier, operation_modifier_name, with_required_cardinality, tuple_type_name, find_child_named, Connective, FieldAccessStyle, Cardinality}; +use crate::v2_std_core::InferredNode::{Resolved, CompilerError, TypeVariable}; +use crate::v2_std_core::ExprData::{NoExprData, ExprLiteral, ExprVar, ExprFieldAccess, ExprCall, ExprMethodCall, ExprMatch, ExprIf, ExprLet, ExprRecordLit, ExprListLit, ExprBinOp, ExprUnaryOp, ExprLambda, ExprStringInterp, ExprBlock, ExprCast, ExprForEach, ExprIndex, ExprSlice, ExprError, ExprReturn}; +use crate::v2_std_core::StringPart::{Text, Interpolation}; +use crate::v2_std_core::BinOp::{NullCoalesce}; +use crate::v2_std_core::MethodSemantics::{PlainMethodSemantics, AlgebraMethodSemantics, ServiceMethodSemantics}; +use crate::v2_std_core::MatchPattern::{Wildcard, Bind, LitPattern, VariantPattern}; use crate::v2_std_core::FieldAccessStyle::{TupleFirst, TupleSecond}; -use crate::v2_std_core::InferredNode::{CompilerError, Resolved, TypeVariable}; +use crate::v2_std_core::Connective::{Conj, Disj, NoConnective, Arrow}; +use crate::v2_std_core::Cardinality::{CardOptional}; +use crate::v2_std_core::VarBindingKind::*; use crate::v2_std_core::LiteralValue::*; -use crate::v2_std_core::MatchPattern::{Bind, LitPattern, VariantPattern, Wildcard}; -use crate::v2_std_core::MethodSemantics::{ - AlgebraMethodSemantics, PlainMethodSemantics, ServiceMethodSemantics, -}; -use crate::v2_std_core::StringPart::{Interpolation, Text}; use crate::v2_std_core::UnaryOpKind::*; -use crate::v2_std_core::VarBindingKind::*; -pub use crate::v2_std_core::{ - arg_name_at, arg_value, arm_body, arm_guard, arm_pattern, authored_name_at, binop_left, - binop_right, cast_expr, cast_target, empty_intern_table, expr_call_func_at, - expr_field_access_summary, expr_has_non_tail_self_call, expr_has_self_call, - expr_method_call_semantics, expr_method_name_at, expr_var_name_at, field_access_base, - field_access_field_at, field_binding_name_at, field_binding_pattern, field_init_node_name_at, - field_init_node_value, field_init_operation_modifier, find_child_named, foreach_body, - foreach_collection, foreach_variable_at, if_condition, if_else_branch, if_then_branch, - index_base, index_expr, is_compiler_error, is_file_transport, is_local_transport, - is_rest_transport, is_shell_transport, lambda_body, lambda_param_names_at, let_binding_name_at, - let_body, let_value, local_transport_node, match_arm_nodes, match_scrutinee, method_arg_nodes, - method_receiver, module_imports, module_items, operation_modifier_name, - param_node_default_value, param_node_name_at, param_node_type_expr, record_lit_type_name_at, - return_value, slice_base, slice_end, slice_start, transport_has_auth, tuple_type_name, - unaryop_operand, with_required_cardinality, AlgebraFieldKind, BinOp, Cardinality, Connective, - DeclaredFuncSig, ErrorNode, ExprData, FieldAccessStyle, FieldSummary, InferredNode, - LiteralValue, MatchPattern, MethodSemantics, NewlineIndex, Node, SourceSpan, StringPart, - TextFile, UnaryOpKind, VarBindingKind, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; -use std::collections::HashMap; -use std::rc::Rc; +use crate::v2_std_core::AlgebraFieldKind::*; +pub use crate::v2_compiler_infer_env::{TypeEnv, TypeBinding, authored_name}; +pub use crate::std_induction::{InductiveField, SubValueRelation}; +use crate::std_induction::SubValueRelation::{SubValueUnknown}; +pub use crate::v2_compiler_infer_types::{resolved_type, child_type_node, emit_map_has, node_is_collection, node_is_keyed_collection, node_is_element_collection, normalize_access_type_node, for_each_element_type_node, is_unit_like}; +pub use crate::std_types::{is_container_type, container_template_algebra}; +pub use crate::v2_compiler_coercion::{coerce_primitive_type, coerce_container_template, target_optional_template, target_callable, can_cast, render_cast, literal_suffix}; +pub use crate::v2_compiler_infer_sigs::{ResolvedFuncSig, ResolvedFuncEnv}; +pub use crate::v2_compiler_infer_items::{TypedModule, ResolvedGraph, ItemInfo}; +pub use crate::v2_compiler_infer_service::{UniqueAccum, OpEntry, is_typed_service_call_receiver, extract_typed_service_name}; +pub use crate::v2_compiler_infer::{InferScope, build_params_scope, extend_scope}; +pub use crate::v2_compiler_infer_emit_info::{TypeSummary, EmitGraphInfo}; +pub use crate::v2_compiler_artifact::{RenderTarget}; +use crate::v2_compiler_artifact::RenderTarget::{Rust, Python, Go, Dag}; +pub use crate::generated_method_template_projection::{rust_method_template_emit, python_method_template_emit, go_method_template_emit}; +pub use crate::v2_compiler_languages::{LanguageSpec, TestConventions, ServiceFieldTemplates, BlockSyntax, TcoSyntax, ExpressionSemantics, VariantPatternSyntax, IfValueForm, VisibilitySpec, NamingCase, ReservedWordStrategy, StringInterpSyntax, InterpStyle, EscapePair, RecordLitSyntax, ImportRule, language_spec_for_target, is_string_like, test_conventions_for_target, target_keyword, binop_symbol, wrap_shared_type, service_self_param, service_receiver_str, service_method_depth, service_methods_inside_class, service_return_str, TestNameStyle, ImportTrigger}; +use crate::v2_compiler_languages::TestNameStyle::{SnakeCaseTestNames, PascalCaseTestNames}; +use crate::v2_compiler_languages::IfValueForm::{IfExpression, ConditionalTernary, IfStatement}; +use crate::v2_compiler_languages::VisibilitySpec::{KeywordVisibility, CaseVisibility}; +use crate::v2_compiler_languages::NamingCase::{PascalCase, SnakeCase, CamelCase, AsAuthored}; +use crate::v2_compiler_languages::ReservedWordStrategy::{PrefixEscape, SuffixEscape, NoEscape}; +use crate::v2_compiler_languages::InterpStyle::{FormatArgs, InlineExpr}; +use crate::v2_compiler_languages::ImportTrigger::{TypeUsageTrigger, TraitImplTrigger, DeriveMacroTrigger, ContainerUsageTrigger, AsyncUsageTrigger}; +use self::BackendCapability::*; +use self::ExprCategory::*; +use self::FuncBodyShape::*; +use self::TcoExprShape::*; pub fn is_type_variable(inferred: Rc) -> bool { match (*inferred).clone() { - InferredNode::TypeVariable { .. } => true, - _ => false, - } + InferredNode::TypeVariable { .. } => true, + _ => false, +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -161,210 +116,46 @@ pub fn has_mock_prefix(name: &String) -> bool { } pub fn extract_test_projections(typed: Rc) -> Rc>> { - Rc::new({ - let mut __result = Vec::new(); - for tm in typed.modules.clone().iter().cloned() { - __result.extend( - (*Rc::new({ - let mut __result = Vec::new(); - for item in Rc::new({ - let mut __result = Vec::new(); - for item in tm.items.clone().iter().cloned() { - if is_service_item(&item) { - __result.push(item); - } - } - __result - }) - .iter() - .cloned() - { - __result.extend( - (*Rc::new({ - let mut __result = Vec::new(); - for c in Rc::new({ - let mut __result = Vec::new(); - for c in item.children.clone().iter().cloned() { - if { - let mut __found = false; - for p in c.properties.clone().iter().cloned() { - if has_mock_prefix(&field_init_node_name_at( - p.clone(), - tm.type_env.clone().source_indices.clone(), - )) { - __found = true; - break; - } - } - __found - } { - __result.push(c); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(Rc::new(TestProjection { - module_name: authored_name_at( - tm.type_env.clone().source_indices.clone(), - &tm.module.clone(), - ), - service_name: authored_name_at( - tm.type_env.clone().source_indices.clone(), - &item, - ), - operation_name: authored_name_at( - tm.type_env.clone().source_indices.clone(), - &c, - ), - inferred: resolved_type(c.clone()), - params: c.params.clone(), - mock_field_inits: Rc::new({ - let mut __result = Vec::new(); - for p in c.properties.clone().iter().cloned() { - if has_mock_prefix(&field_init_node_name_at( - p.clone(), - tm.type_env.clone().source_indices.clone(), - )) { - __result.push(p); - } - } - __result - }), - source_indices: tm.type_env.clone().source_indices.clone(), - })); - } - __result - })) - .iter() - .cloned(), - ); - } - __result - })) - .iter() - .cloned(), - ); - } - __result - }) + Rc::new({ let mut __result = Vec::new(); for tm in typed.modules.clone().iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for item in Rc::new({ let mut __result = Vec::new(); for item in tm.items.clone().iter().cloned() { if is_service_item(&item) { __result.push(item); } } __result }).iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for c in Rc::new({ let mut __result = Vec::new(); for c in item.children.clone().iter().cloned() { if { let mut __found = false; for p in c.properties.clone().iter().cloned() { if has_mock_prefix(&field_init_node_name_at(p.clone(), tm.type_env.clone().source_indices.clone())) { __found = true; break; } } __found } { __result.push(c); } } __result }).iter().cloned() { __result.push(Rc::new(TestProjection { + module_name: authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone()), + service_name: authored_name_at(tm.type_env.clone().source_indices.clone(), &item), + operation_name: authored_name_at(tm.type_env.clone().source_indices.clone(), &c), + inferred: resolved_type(c.clone()), + params: c.params.clone(), + mock_field_inits: Rc::new({ let mut __result = Vec::new(); for p in c.properties.clone().iter().cloned() { if has_mock_prefix(&field_init_node_name_at(p.clone(), tm.type_env.clone().source_indices.clone())) { __result.push(p); } } __result }), + source_indices: tm.type_env.clone().source_indices.clone(), +})); } __result })).iter().cloned()); } __result })).iter().cloned()); } __result }) } -pub fn derive_module_imports( - items: &Rc>>, - import_rules: Rc>>, - target: RenderTarget, - source_indices: Rc>>, -) -> Rc> { +pub fn derive_module_imports(items: &Rc>>, import_rules: Rc>>, target: RenderTarget, source_indices: Rc>>) -> Rc> { { - let has_async = { - let mut __found = false; - for item in items.clone().iter().cloned() { - if ((item.uses.clone().len() as i64) > 0) { - __found = true; - break; - } - } - __found - }; - let type_names = collect_type_names_from_items(items.clone(), source_indices); - Rc::new({ - let mut __result = Vec::new(); - for path in Rc::new({ - let mut __result = Vec::new(); - for rule in Rc::new({ - let mut __result = Vec::new(); - for rule in import_rules.iter().cloned() { - if match (*rule.trigger.clone()).clone() { - ImportTrigger::TypeUsageTrigger { type_name: t, .. } => { - let mut __found = false; - for n in type_names.clone().iter().cloned() { - if (n.clone().as_str() == t.clone().as_str()) { - __found = true; - break; - } - } - __found - } - ImportTrigger::TraitImplTrigger { .. } => false, - ImportTrigger::DeriveMacroTrigger { .. } => false, - ImportTrigger::ContainerUsageTrigger { container: c, .. } => { - let mut __found = false; - for n in type_names.clone().iter().cloned() { - if (n.clone().as_str() == c.clone().as_str()) { - __found = true; - break; - } - } - __found - } - ImportTrigger::AsyncUsageTrigger => has_async.clone(), - } { - __result.push(rule); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(rule.import_path.clone()); - } - __result - }) - .iter() - .cloned() - { - if (path.clone().as_str() != "".to_string().as_str()) { - __result.push(path); - } - } - __result - }) - } + let has_async = { let mut __found = false; for item in items.clone().iter().cloned() { if ((item.uses.clone().len() as i64) > 0) { __found = true; break; } } __found }; +let type_names = collect_type_names_from_items(items.clone(), source_indices); +Rc::new({ let mut __result = Vec::new(); for path in Rc::new({ let mut __result = Vec::new(); for rule in Rc::new({ let mut __result = Vec::new(); for rule in import_rules.iter().cloned() { if match (*rule.trigger.clone()).clone() { + ImportTrigger::TypeUsageTrigger { type_name: t, .. } => { let mut __found = false; for n in type_names.clone().iter().cloned() { if (n.clone().as_str() == t.clone().as_str()) { __found = true; break; } } __found }, + ImportTrigger::TraitImplTrigger { .. } => false, + ImportTrigger::DeriveMacroTrigger { .. } => false, + ImportTrigger::ContainerUsageTrigger { container: c, .. } => { let mut __found = false; for n in type_names.clone().iter().cloned() { if (n.clone().as_str() == c.clone().as_str()) { __found = true; break; } } __found }, + ImportTrigger::AsyncUsageTrigger => has_async.clone(), +} { __result.push(rule); } } __result }).iter().cloned() { __result.push(rule.import_path.clone()); } __result }).iter().cloned() { if (path.clone().as_str() != "".to_string().as_str()) { __result.push(path); } } __result }) +} } -pub fn collect_type_names_from_items( - items: Rc>>, - source_indices: Rc>>, -) -> Rc> { - Rc::new({ - let mut __result = Vec::new(); - for item in items.iter().cloned() { - __result.extend( - (*collect_type_names_from_node(&item, &source_indices)) - .iter() - .cloned(), - ); - } - __result - }) +pub fn collect_type_names_from_items(items: Rc>>, source_indices: Rc>>) -> Rc> { + Rc::new({ let mut __result = Vec::new(); for item in items.iter().cloned() { __result.extend((*collect_type_names_from_node(&item, &source_indices)).iter().cloned()); } __result }) } -pub fn collect_type_names_from_node( - n: &Rc, - source_indices: &Rc>>, -) -> Rc> { +pub fn collect_type_names_from_node(n: &Rc, source_indices: &Rc>>) -> Rc> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let self_name = if (n.ident_span.clone() != None) { - Rc::new(vec![authored_name_at(source_indices.clone(), &n)]) - } else { - Rc::new(vec![]) - }; - let child_names = Rc::new({ - let mut __result = Vec::new(); - for child in n.children.clone().iter().cloned() { - __result.extend( - (*collect_type_names_from_node(&child, &source_indices)) - .iter() - .cloned(), - ); - } - __result - }); - v2_rt::concat(self_name, child_names) + { + let self_name = if (n.ident_span.clone() != None) { + Rc::new(vec![authored_name_at(source_indices.clone(), &n)]) + } else { + Rc::new(vec![]) + }; +let child_names = Rc::new({ let mut __result = Vec::new(); for child in n.children.clone().iter().cloned() { __result.extend((*collect_type_names_from_node(&child, &source_indices)).iter().cloned()); } __result }); +v2_rt::concat(self_name, child_names) +} }) } @@ -374,650 +165,345 @@ pub struct InterpPart { pub arg_expr: String, } -pub fn emit_simple_expr( - expr: &Rc, - target: &RenderTarget, - source_indices: &Rc>>, -) -> String { +pub fn emit_simple_expr(expr: &Rc, target: &RenderTarget, source_indices: &Rc>>) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*expr.expr_data.clone()).clone() { - ExprData::ExprLiteral { value: v, .. } => emit_literal(v.clone(), &target), - ExprData::ExprError { message, .. } => emit_error_expr(message.clone(), target.clone()), - ExprData::ExprVar { .. } => emit_ident( - expr_var_name_at(expr.clone(), source_indices.clone()), - target.clone(), - ), - ExprData::ExprFieldAccess { .. } => { - let f = field_access_field_at(expr.clone(), source_indices.clone()); - let b = field_access_base(expr.clone()); - if is_typed_service_call_receiver(&expr, source_indices.clone()) { - match extract_typed_service_name(&expr, &source_indices) { - Some(svc_name) => service_var_name(svc_name.clone()), - None => v2_rt::concat( - v2_rt::concat( - emit_simple_expr(&b, &target, &source_indices), - ".".to_string(), - ), - emit_ident(f.clone(), target.clone()), - ), - } - } else { - { - let base_is_fn = match (*b.expr_data.clone()).clone() { - ExprData::ExprVar { - binding_kind: bk, .. - } => match bk.clone().as_deref().cloned() { - Some(VarBindingKind::MatchBoundBinding) => false, - Some(VarBindingKind::VariantValueBinding { .. }) => false, - _ => true, - }, - _ => false, - }; - let base_str = emit_simple_expr(&b, &target, &source_indices); - let base_call = if base_is_fn.clone() { - v2_rt::concat(base_str, "()".to_string()) - } else { - base_str - }; - let field_str = v2_rt::concat( - v2_rt::concat(base_call, ".".to_string()), - emit_ident(f.clone(), target.clone()), - ); - let needs_clone = (base_is_fn.clone() - && match target.clone() { - RenderTarget::Rust => true, - _ => false, - }); - if needs_clone { - v2_rt::concat(field_str, ".clone()".to_string()) - } else { - field_str - } - } - } - } - ExprData::ExprStringInterp => { - let ps = Rc::new({ - let mut __result = Vec::new(); - for child in expr.children.clone().iter().cloned() { - __result.push(match (*child.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitStr { value: text, .. } = value.as_ref() - else { - unreachable!() - }; - Rc::new(StringPart::Text { - value: text.clone(), - }) - } - _ => Rc::new(StringPart::Interpolation { - expr: arg_value(&child), - }), - }); + ExprData::ExprLiteral { value: v, .. } => emit_literal(v.clone(), &target), + ExprData::ExprError { message, .. } => emit_error_expr(message.clone(), target.clone()), + ExprData::ExprVar { .. } => emit_ident(expr_var_name_at(expr.clone(), source_indices.clone()), target.clone()), + ExprData::ExprFieldAccess { .. } => { + let f = field_access_field_at(expr.clone(), source_indices.clone()); +let b = field_access_base(expr.clone()); +if is_typed_service_call_receiver(&expr, source_indices.clone()) { + match extract_typed_service_name(&expr, &source_indices) { + Some(svc_name) => service_var_name(svc_name.clone()), + None => v2_rt::concat(v2_rt::concat(emit_simple_expr(&b, &target, &source_indices), ".".to_string()), emit_ident(f.clone(), target.clone())), +} + } else { + { + let base_is_fn = match (*b.expr_data.clone()).clone() { + ExprData::ExprVar { binding_kind: bk, .. } => match bk.clone().as_deref().cloned() { + Some(VarBindingKind::MatchBoundBinding) => false, + Some(VarBindingKind::VariantValueBinding { .. }) => false, + _ => true, +}, + _ => false, +}; +let base_str = emit_simple_expr(&b, &target, &source_indices); +let base_call = if base_is_fn.clone() { + v2_rt::concat(base_str, "()".to_string()) + } else { + base_str + }; +let field_str = v2_rt::concat(v2_rt::concat(base_call, ".".to_string()), emit_ident(f.clone(), target.clone())); +let needs_clone = (base_is_fn.clone() && match target.clone() { + RenderTarget::Rust => true, + _ => false, +}); +if needs_clone { + v2_rt::concat(field_str, ".clone()".to_string()) + } else { + field_str } - __result - }); - emit_simple_string_interp(&ps, &target, source_indices.clone()) +} } - ExprData::ExprListLit => match target.clone() { - RenderTarget::Go => emit_error_expr( - "list literal in simple expr not yet supported for Go".to_string(), - target.clone(), - ), - _ => { - let el_strs = Rc::new({ - let mut __result = Vec::new(); - for e in expr.children.clone().iter().cloned() { - __result.push(emit_simple_expr(&e, &target, &source_indices)); - } - __result - }); - v2_rt::concat( - v2_rt::concat("[".to_string(), el_strs.join(&", ".to_string())), - "]".to_string(), - ) - } - }, - ExprData::ExprRecordLit { .. } => match target.clone() { - RenderTarget::Go => emit_error_expr( - "record literal in simple expr not yet supported for Go".to_string(), - target.clone(), - ), - _ => { - let field_strs = Rc::new({ - let mut __result = Vec::new(); - for f in expr.children.clone().iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "\"".to_string(), - field_init_node_name_at(f.clone(), source_indices.clone()), - ), - "\": ".to_string(), - ), - emit_simple_expr( - &field_init_node_value(&f), - &target, - &source_indices, - ), - )); - } - __result - }); - v2_rt::concat( - v2_rt::concat("{".to_string(), field_strs.join(&", ".to_string())), - "}".to_string(), - ) - } - }, - _ => emit_error_expr( - "unsupported simple expr in test/mock binding".to_string(), - target.clone(), - ), - } +}, + ExprData::ExprStringInterp => { + let ps = Rc::new({ let mut __result = Vec::new(); for child in expr.children.clone().iter().cloned() { __result.push(match (*child.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: text, .. } = value.as_ref() else { unreachable!() }; Rc::new(StringPart::Text { + value: text.clone(), +}) }, + _ => Rc::new(StringPart::Interpolation { + expr: arg_value(&child), +}), +}); } __result }); +emit_simple_string_interp(&ps, &target, source_indices.clone()) +}, + ExprData::ExprListLit => match target.clone() { + RenderTarget::Go => emit_error_expr("list literal in simple expr not yet supported for Go".to_string(), target.clone()), + _ => { + let el_strs = Rc::new({ let mut __result = Vec::new(); for e in expr.children.clone().iter().cloned() { __result.push(emit_simple_expr(&e, &target, &source_indices)); } __result }); +v2_rt::concat(v2_rt::concat("[".to_string(), el_strs.join(&", ".to_string())), "]".to_string()) +}, +}, + ExprData::ExprRecordLit { .. } => match target.clone() { + RenderTarget::Go => emit_error_expr("record literal in simple expr not yet supported for Go".to_string(), target.clone()), + _ => { + let field_strs = Rc::new({ let mut __result = Vec::new(); for f in expr.children.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat("\"".to_string(), field_init_node_name_at(f.clone(), source_indices.clone())), "\": ".to_string()), emit_simple_expr(&field_init_node_value(&f), &target, &source_indices))); } __result }); +v2_rt::concat(v2_rt::concat("{".to_string(), field_strs.join(&", ".to_string())), "}".to_string()) +}, +}, + _ => emit_error_expr("unsupported simple expr in test/mock binding".to_string(), target.clone()), +} }) } -pub fn emit_simple_string_interp( - parts: &Rc>>, - target: &RenderTarget, - source_indices: Rc>>, -) -> String { +pub fn emit_simple_string_interp(parts: &Rc>>, target: &RenderTarget, source_indices: Rc>>) -> String { { let spec = language_spec(target.clone()); - let interp = spec.string_interp.clone(); - let has_interpolations = { - let mut __found = false; - for p in parts.clone().iter().cloned() { - if match (*p.clone()).clone() { - StringPart::Interpolation { .. } => true, - _ => false, - } { - __found = true; - break; - } +let interp = spec.string_interp.clone(); +let has_interpolations = { let mut __found = false; for p in parts.clone().iter().cloned() { if match (*p.clone()).clone() { + StringPart::Interpolation { .. } => true, + _ => false, +} { __found = true; break; } } __found }; +match (*interp.style.clone()).clone() { + InterpStyle::FormatArgs { placeholder: ph, .. } => { + let fmt_parts = Rc::new({ let mut __result = Vec::new(); for p in parts.clone().iter().cloned() { __result.push(match (*p.clone()).clone() { + StringPart::Text { value: v, .. } => { + let base = escape_string_literal_body(v.clone()); +let escaped = if has_interpolations.clone() { + apply_escape_pairs(base.clone(), interp.escape_pairs.clone()) + } else { + base.clone() + }; +Rc::new(InterpPart { + format_segment: escaped.clone(), + arg_expr: "".to_string(), +}) +}, + StringPart::Interpolation { expr: e, .. } => Rc::new(InterpPart { + format_segment: ph.clone(), + arg_expr: emit_simple_expr(&e, &target, &source_indices), +}), +}); } __result }); +let fmt_str = Rc::new({ let mut __result = Vec::new(); for p in fmt_parts.clone().iter().cloned() { __result.push(p.format_segment.clone()); } __result }).join(&"".to_string()); +let args = Rc::new({ let mut __result = Vec::new(); for a in Rc::new({ let mut __result = Vec::new(); for p in fmt_parts.clone().iter().cloned() { __result.push(p.arg_expr.clone()); } __result }).iter().cloned() { if (a.clone().as_str() != "".to_string().as_str()) { __result.push(a); } } __result }); +if ((args.clone().len() as i64) == 0) { + apply_type_template1(interp.plain_template.clone(), fmt_str) + } else { + { + let args_str = args.clone().join(&", ".to_string()); +apply_type_template2(interp.format_template.clone(), fmt_str, args_str) +} } - __found - }; - match (*interp.style.clone()).clone() { - InterpStyle::FormatArgs { - placeholder: ph, .. - } => { - let fmt_parts = Rc::new({ - let mut __result = Vec::new(); - for p in parts.clone().iter().cloned() { - __result.push(match (*p.clone()).clone() { - StringPart::Text { value: v, .. } => { - let base = escape_string_literal_body(v.clone()); - let escaped = if has_interpolations.clone() { - apply_escape_pairs(base.clone(), interp.escape_pairs.clone()) - } else { - base.clone() - }; - Rc::new(InterpPart { - format_segment: escaped.clone(), - arg_expr: "".to_string(), - }) - } - StringPart::Interpolation { expr: e, .. } => Rc::new(InterpPart { - format_segment: ph.clone(), - arg_expr: emit_simple_expr(&e, &target, &source_indices), - }), - }); - } - __result - }); - let fmt_str = Rc::new({ - let mut __result = Vec::new(); - for p in fmt_parts.clone().iter().cloned() { - __result.push(p.format_segment.clone()); - } - __result - }) - .join(&"".to_string()); - let args = Rc::new({ - let mut __result = Vec::new(); - for a in Rc::new({ - let mut __result = Vec::new(); - for p in fmt_parts.clone().iter().cloned() { - __result.push(p.arg_expr.clone()); - } - __result - }) - .iter() - .cloned() - { - if (a.clone().as_str() != "".to_string().as_str()) { - __result.push(a); - } - } - __result - }); - if ((args.clone().len() as i64) == 0) { - apply_type_template1(interp.plain_template.clone(), fmt_str) +}, + InterpStyle::InlineExpr => { + let segments = Rc::new({ let mut __result = Vec::new(); for p in parts.clone().iter().cloned() { __result.push(match (*p.clone()).clone() { + StringPart::Text { value: v, .. } => { + let base = escape_string_literal_body(v.clone()); +if has_interpolations.clone() { + apply_escape_pairs(base.clone(), interp.escape_pairs.clone()) } else { - { - let args_str = args.clone().join(&", ".to_string()); - apply_type_template2(interp.format_template.clone(), fmt_str, args_str) - } + base.clone() } - } - InterpStyle::InlineExpr => { - let segments = Rc::new({ - let mut __result = Vec::new(); - for p in parts.clone().iter().cloned() { - __result.push(match (*p.clone()).clone() { - StringPart::Text { value: v, .. } => { - let base = escape_string_literal_body(v.clone()); - if has_interpolations.clone() { - apply_escape_pairs(base.clone(), interp.escape_pairs.clone()) - } else { - base.clone() - } - } - StringPart::Interpolation { expr: e, .. } => v2_rt::concat( - v2_rt::concat( - "{".to_string(), - emit_simple_expr(&e, &target, &source_indices), - ), - "}".to_string(), - ), - }); - } - __result - }); - apply_type_template1( - interp.format_template.clone(), - segments.join(&"".to_string()), - ) - } - } - } +}, + StringPart::Interpolation { expr: e, .. } => v2_rt::concat(v2_rt::concat("{".to_string(), emit_simple_expr(&e, &target, &source_indices)), "}".to_string()), +}); } __result }); +apply_type_template1(interp.format_template.clone(), segments.join(&"".to_string())) +}, +} +} } pub fn empty_emit_scope() -> Rc { Rc::new(InferScope { - type_env: Rc::new(TypeEnv { - bindings: v2_rt::rc_empty_map::>(), - recursive_types: Rc::new(vec![]), - recursive_type_set: v2_rt::rc_empty_map::(), - inductive_fields: v2_rt::rc_empty_map::>>>(), - source_indices: v2_rt::rc_empty_map::>(), - intern_table: empty_intern_table(), - }), - func_env: Rc::new(ResolvedFuncEnv { - signatures: v2_rt::rc_empty_map::>(), - }), - locals: v2_rt::rc_empty_map::>(), - match_bound_names: v2_rt::rc_empty_map::(), - module_name: "".to_string(), - service_registry: v2_rt::rc_empty_map::>>>(), - item_registry: v2_rt::rc_empty_map::>(), - lambda_param_provenance: v2_rt::rc_empty_map::>(), - }) + type_env: Rc::new(TypeEnv { + bindings: v2_rt::rc_empty_map::>(), + recursive_types: Rc::new(vec![]), + recursive_type_set: v2_rt::rc_empty_map::(), + inductive_fields: v2_rt::rc_empty_map::>>>(), + source_indices: v2_rt::rc_empty_map::>(), + intern_table: empty_intern_table(), +}), + func_env: Rc::new(ResolvedFuncEnv { + signatures: v2_rt::rc_empty_map::>(), +}), + locals: v2_rt::rc_empty_map::>(), + match_bound_names: v2_rt::rc_empty_map::(), + module_name: "".to_string(), + service_registry: v2_rt::rc_empty_map::>>>(), + item_registry: v2_rt::rc_empty_map::>(), + lambda_param_provenance: v2_rt::rc_empty_map::>(), +}) } pub fn module_emit_scope(typed_module: &Rc) -> Rc { Rc::new(InferScope { - type_env: typed_module.type_env.clone(), - func_env: typed_module.func_env.clone(), - locals: v2_rt::rc_empty_map::>(), - match_bound_names: v2_rt::rc_empty_map::(), - module_name: authored_name_at( - typed_module.type_env.clone().source_indices.clone(), - &typed_module.module.clone(), - ), - service_registry: v2_rt::rc_empty_map::>>>(), - item_registry: typed_module.item_registry.clone(), - lambda_param_provenance: v2_rt::rc_empty_map::>(), - }) + type_env: typed_module.type_env.clone(), + func_env: typed_module.func_env.clone(), + locals: v2_rt::rc_empty_map::>(), + match_bound_names: v2_rt::rc_empty_map::(), + module_name: authored_name_at(typed_module.type_env.clone().source_indices.clone(), &typed_module.module.clone()), + service_registry: v2_rt::rc_empty_map::>>>(), + item_registry: typed_module.item_registry.clone(), + lambda_param_provenance: v2_rt::rc_empty_map::>(), +}) } pub fn scope_after_expr(texpr: &Rc, scope: &Rc) -> Rc { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprLet => { - let ch = texpr.children.clone(); - let has_body = ((ch.len() as i64) > 1); - if (has_body == false) { - { - let value = let_value(texpr.clone()); - extend_scope( - &scope, - &let_binding_name_at( - texpr.clone(), - scope.type_env.clone().source_indices.clone(), - ), - resolved_type(value), - Rc::new(SubValueRelation::SubValueUnknown), - ) - } - } else { - scope.clone() - } + ExprData::ExprLet => { + let ch = texpr.children.clone(); +let has_body = ((ch.len() as i64) > 1); +if (has_body == false) { + { + let value = let_value(texpr.clone()); +extend_scope(&scope, &let_binding_name_at(texpr.clone(), scope.type_env.clone().source_indices.clone()), resolved_type(value), Rc::new(SubValueRelation::SubValueUnknown)) +} + } else { + scope.clone() } - _ => scope.clone(), - } +}, + _ => scope.clone(), +} } -pub fn lookup_item( - registry: Rc>>, - name: String, -) -> Option> { +pub fn lookup_item(registry: Rc>>, name: String) -> Option> { v2_rt::map_get(®istry, name) } -pub fn lookup_func_sig_in_scope( - scope: Rc, - name: String, -) -> Option> { +pub fn lookup_func_sig_in_scope(scope: Rc, name: String) -> Option> { v2_rt::map_get(&scope.func_env.clone().signatures.clone(), name) } -pub fn typed_named_arg_matches( - arg: Rc, - name: String, - source_indices: Rc>>, -) -> bool { +pub fn typed_named_arg_matches(arg: Rc, name: String, source_indices: Rc>>) -> bool { { let n = arg_name_at(arg, source_indices); - if (n.clone() == None) { +if (n.clone() == None) { false } else { (n.clone().unwrap().as_str() == name.as_str()) } - } +} } -pub fn order_typed_call_args( - args: &Rc>>, - func: String, - scope: &Rc, -) -> Rc>> { +pub fn order_typed_call_args(args: &Rc>>, func: String, scope: &Rc) -> Rc>> { { - let has_unnamed = { - let mut __found = false; - for arg in args.clone().iter().cloned() { - if (arg_name_at(arg.clone(), scope.type_env.clone().source_indices.clone()) == None) - { - __found = true; - break; - } - } - __found - }; - if has_unnamed { + let has_unnamed = { let mut __found = false; for arg in args.clone().iter().cloned() { if (arg_name_at(arg.clone(), scope.type_env.clone().source_indices.clone()) == None) { __found = true; break; } } __found }; +if has_unnamed { args.clone() } else { match lookup_func_sig_in_scope(scope.clone(), func) { - None => args.clone(), - Some(sig) => { - let arg_map = args.clone().iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, arg: Rc| { - let n = arg_name_at( - arg.clone(), - scope.type_env.clone().source_indices.clone(), - ); - if (n.clone() != None) { - v2_rt::rc_map_insert(acc.clone(), n.clone().unwrap(), arg.clone()) - } else { - acc.clone() - } - }, - ); - let param_name_set = sig.params.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, param: Rc| { - v2_rt::rc_map_insert( - acc, - param_node_name_at( - param.clone(), - scope.type_env.clone().source_indices.clone(), - ), - true, - ) - }, - ); - let ordered = Rc::new({ - let mut __result = Vec::new(); - for param in sig.params.clone().iter().cloned() { - __result.extend( - (*match v2_rt::map_get( - &arg_map, - param_node_name_at( - param.clone(), - scope.type_env.clone().source_indices.clone(), - ), - ) { - Some(arg) => Rc::new(vec![arg.clone()]), - None => Rc::new(vec![]), - }) - .iter() - .cloned(), - ); - } - __result - }); - let leftovers = Rc::new({ - let mut __result = Vec::new(); - for arg in args.clone().iter().cloned() { - if { - let n = arg_name_at( - arg.clone(), - scope.type_env.clone().source_indices.clone(), - ); - if (n.clone() == None) { - true - } else { - (emit_map_has(param_name_set.clone(), n.clone().unwrap()) - == false) - } - } { - __result.push(arg); - } - } - __result - }); - v2_rt::concat(ordered, leftovers) - } - } + None => args.clone(), + Some(sig) => { + let arg_map = args.clone().iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, arg: Rc| { + let n = arg_name_at(arg.clone(), scope.type_env.clone().source_indices.clone()); +if (n.clone() != None) { + v2_rt::rc_map_insert(acc.clone(), n.clone().unwrap(), arg.clone()) + } else { + acc.clone() + } +}); +let param_name_set = sig.params.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, param: Rc| v2_rt::rc_map_insert(acc, param_node_name_at(param.clone(), scope.type_env.clone().source_indices.clone()), true)); +let ordered = Rc::new({ let mut __result = Vec::new(); for param in sig.params.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&arg_map, param_node_name_at(param.clone(), scope.type_env.clone().source_indices.clone())) { + Some(arg) => Rc::new(vec![arg.clone()]), + None => Rc::new(vec![]), +}).iter().cloned()); } __result }); +let leftovers = Rc::new({ let mut __result = Vec::new(); for arg in args.clone().iter().cloned() { if { + let n = arg_name_at(arg.clone(), scope.type_env.clone().source_indices.clone()); +if (n.clone() == None) { + true + } else { + (emit_map_has(param_name_set.clone(), n.clone().unwrap()) == false) + } +} { __result.push(arg); } } __result }); +v2_rt::concat(ordered, leftovers) +}, +} } - } +} } pub fn unique_strings(items: Rc>) -> Rc> { { - let result = items.iter().cloned().fold( + let result = items.iter().cloned().fold(Rc::new(UniqueAccum { + seen: v2_rt::rc_empty_map::(), + result: Rc::new(vec![]), +}), |acc: Rc, item: String| if emit_map_has(acc.seen.clone(), item.clone()) { + acc.clone() + } else { Rc::new(UniqueAccum { - seen: v2_rt::rc_empty_map::(), - result: Rc::new(vec![]), - }), - |acc: Rc, item: String| { - if emit_map_has(acc.seen.clone(), item.clone()) { - acc.clone() - } else { - Rc::new(UniqueAccum { - seen: v2_rt::rc_map_insert(acc.seen.clone(), item.clone(), true), - result: v2_rt::rc_list_push(acc.result.clone(), item.clone()), - }) - } - }, - ); - result.result.clone() - } + seen: v2_rt::rc_map_insert(acc.seen.clone(), item.clone(), true), + result: v2_rt::rc_list_push(acc.result.clone(), item.clone()), +}) + }); +result.result.clone() +} } -pub fn has_nested_records_node( - mut n: Rc, - mut source_indices: Rc>>, -) -> bool { +pub fn has_nested_records_node(mut n: Rc, mut source_indices: Rc>>) -> bool { loop { let is_product = (n.connective.clone() == Connective::Conj); - let is_coproduct = (n.connective.clone() == Connective::Disj); - if is_product { +let is_coproduct = (n.connective.clone() == Connective::Disj); +if is_product { break true; - } else { +} else { if is_coproduct { let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); - if is_optional { +if is_optional { { let __tco_0 = with_required_cardinality(&n); - n = __tco_0; - continue; - } - } else { +n = __tco_0; +continue; +} +} else { break false; - } - } else { +} +} else { let is_map = node_is_keyed_collection(&n, source_indices.clone()); - if is_map { +if is_map { match n.children.clone().get(1 as usize).cloned() { - Some(val_child) => { - let __tco_0 = child_type_node(&val_child); - n = __tco_0; - continue; - } - None => { - break false; - } - } - } else { + Some(val_child) => { { + let __tco_0 = child_type_node(&val_child); +n = __tco_0; +continue; +} }, + None => { break false; }, +} +} else { if ((n.children.clone().len() as i64) == 1) { match n.children.clone().first().cloned() { - Some(el) => { - let __tco_0 = child_type_node(&el); - n = __tco_0; - continue; - } - None => { - break false; - } - } - } else { + Some(el) => { { + let __tco_0 = child_type_node(&el); +n = __tco_0; +continue; +} }, + None => { break false; }, +} +} else { break false; - } - } - } - } - } +} +} +} +} +} } -pub fn emit_data_value_json( - value: &Rc, - source_indices: Rc>>, -) -> String { +pub fn emit_data_value_json(value: &Rc, source_indices: Rc>>) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*value.expr_data.clone()).clone() { - ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitStr { value: s, .. } => v2_rt::concat( - v2_rt::concat("\"".to_string(), escape_json_string(s.clone())), - "\"".to_string(), - ), - LiteralValue::LitInt { value: i, .. } => (i.clone()).to_string(), - LiteralValue::LitFloat { value: f, .. } => f.clone(), - LiteralValue::LitBool { value: b, .. } => { - if b.clone() { - "true".to_string() - } else { - "false".to_string() - } - } - LiteralValue::LitNull => "null".to_string(), - }, - ExprData::ExprListLit => { - let el_strs = Rc::new({ - let mut __result = Vec::new(); - for e in value.children.clone().iter().cloned() { - __result.push(emit_data_value_json(&e, source_indices.clone())); - } - __result - }); - v2_rt::concat( - v2_rt::concat("[".to_string(), el_strs.join(&", ".to_string())), - "]".to_string(), - ) - } - ExprData::ExprRecordLit { .. } => { - let field_strs = Rc::new({ - let mut __result = Vec::new(); - for f in value.children.clone().iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "\"".to_string(), - escape_json_string(field_init_node_name_at( - f.clone(), - source_indices.clone(), - )), - ), - "\": ".to_string(), - ), - emit_data_value_json( - &field_init_node_value(&f), - source_indices.clone(), - ), - )); - } - __result - }); - v2_rt::concat( - v2_rt::concat("{".to_string(), field_strs.join(&", ".to_string())), - "}".to_string(), - ) - } - ExprData::ExprVar { .. } => v2_rt::concat( - v2_rt::concat( - "\"".to_string(), - escape_json_string(expr_var_name_at(value.clone(), source_indices.clone())), - ), - "\"".to_string(), - ), - ExprData::ExprUnaryOp { - op: UnaryOpKind::Neg, - .. - } => v2_rt::concat( - "-".to_string(), - emit_data_value_json(&unaryop_operand(value.clone()), source_indices.clone()), - ), - _ => "\"compile_error!(unsupported mock expression)\"".to_string(), - } + ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitStr { value: s, .. } => v2_rt::concat(v2_rt::concat("\"".to_string(), escape_json_string(s.clone())), "\"".to_string()), + LiteralValue::LitInt { value: i, .. } => (i.clone()).to_string(), + LiteralValue::LitFloat { value: f, .. } => f.clone(), + LiteralValue::LitBool { value: b, .. } => if b.clone() { + "true".to_string() + } else { + "false".to_string() + }, + LiteralValue::LitNull => "null".to_string(), +}, + ExprData::ExprListLit => { + let el_strs = Rc::new({ let mut __result = Vec::new(); for e in value.children.clone().iter().cloned() { __result.push(emit_data_value_json(&e, source_indices.clone())); } __result }); +v2_rt::concat(v2_rt::concat("[".to_string(), el_strs.join(&", ".to_string())), "]".to_string()) +}, + ExprData::ExprRecordLit { .. } => { + let field_strs = Rc::new({ let mut __result = Vec::new(); for f in value.children.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat("\"".to_string(), escape_json_string(field_init_node_name_at(f.clone(), source_indices.clone()))), "\": ".to_string()), emit_data_value_json(&field_init_node_value(&f), source_indices.clone()))); } __result }); +v2_rt::concat(v2_rt::concat("{".to_string(), field_strs.join(&", ".to_string())), "}".to_string()) +}, + ExprData::ExprVar { .. } => v2_rt::concat(v2_rt::concat("\"".to_string(), escape_json_string(expr_var_name_at(value.clone(), source_indices.clone()))), "\"".to_string()), + ExprData::ExprUnaryOp { op: UnaryOpKind::Neg, .. } => v2_rt::concat("-".to_string(), emit_data_value_json(&unaryop_operand(value.clone()), source_indices.clone())), + _ => "\"compile_error!(unsupported mock expression)\"".to_string(), +} }) } pub fn escape_json_string(s: String) -> String { - Rc::new( - Rc::new( - Rc::new( - Rc::new( - s.split(&"\\".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .join(&"\\\\".to_string()) - .split(&"\"".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .join(&"\\\"".to_string()) - .split(&"\n".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .join(&"\\n".to_string()) - .split(&"\t".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .join(&"\\t".to_string()) + Rc::new(Rc::new(Rc::new(Rc::new(s.split(&"\\".to_string()).map(|s| s.to_string()).collect::>()).join(&"\\\\".to_string()).split(&"\"".to_string()).map(|s| s.to_string()).collect::>()).join(&"\\\"".to_string()).split(&"\n".to_string()).map(|s| s.to_string()).collect::>()).join(&"\\n".to_string()).split(&"\t".to_string()).map(|s| s.to_string()).collect::>()).join(&"\\t".to_string()) } pub fn module_to_filename(name: String) -> String { - Rc::new( - name.split(&".".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .join(&"_".to_string()) + Rc::new(name.split(&".".to_string()).map(|s| s.to_string()).collect::>()).join(&"_".to_string()) } pub fn make_indent(level: i64) -> String { @@ -1033,26 +519,15 @@ pub fn make_indent(level: i64) -> String { pub fn to_string(value: i64) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { if (value.clone() < 0) { - v2_rt::concat("-".to_string(), (0 - value.clone()).to_string()) + v2_rt::concat("-".to_string(), ((0 - value.clone())).to_string()) } else { if (value.clone() == 0) { "0".to_string() } else { { - let digit_chars = Rc::new(vec![ - "0".to_string(), - "1".to_string(), - "2".to_string(), - "3".to_string(), - "4".to_string(), - "5".to_string(), - "6".to_string(), - "7".to_string(), - "8".to_string(), - "9".to_string(), - ]); - to_string_helper(value.clone(), Rc::new(vec![])).join(&"".to_string()) - } + let digit_chars = Rc::new(vec!["0".to_string(), "1".to_string(), "2".to_string(), "3".to_string(), "4".to_string(), "5".to_string(), "6".to_string(), "7".to_string(), "8".to_string(), "9".to_string()]); +to_string_helper(value.clone(), Rc::new(vec![])).join(&"".to_string()) +} } } }) @@ -1062,169 +537,68 @@ pub fn to_string_helper(mut value: i64, mut acc: Rc>) -> Rc>(), - ) - .iter() - .cloned() - { - if (p.0.clone() == digit.clone()) { - __result.push(p); - } - } - __result - }) - .first() - .cloned() - { - Some(p) => p.1.clone(), - None => "?".to_string(), - }; - { +let digit = (value.clone() - (rest.clone() * 10)); +let digit_chars = Rc::new(vec!["0".to_string(), "1".to_string(), "2".to_string(), "3".to_string(), "4".to_string(), "5".to_string(), "6".to_string(), "7".to_string(), "8".to_string(), "9".to_string()]); +let ch = match Rc::new({ let mut __result = Vec::new(); for p in Rc::new(digit_chars.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (p.0.clone() == digit.clone()) { __result.push(p); } } __result }).first().cloned() { + Some(p) => p.1.clone(), + None => "?".to_string(), +}; +{ let __tco_0 = rest.clone(); - let __tco_1 = v2_rt::concat(Rc::new(vec![ch]), acc); - value = __tco_0; - acc = __tco_1; - continue; - } - } - } +let __tco_1 = v2_rt::concat(Rc::new(vec![ch]), acc); +value = __tco_0; +acc = __tco_1; +continue; +} +} +} } pub fn to_snake(name: String) -> String { { let chars_list = Rc::new(name.chars().map(|c| c as i64).collect::>()); - let result = Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - chars_list - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - __result.push({ - let idx = pair.0.clone(); - let ch = pair.1.clone(); - if is_upper(ch.clone()) { - if (idx.clone() == 0) { - to_lower_char(ch.clone()) - } else { - v2_rt::concat("_".to_string(), to_lower_char(ch.clone())) - } - } else { - v2_rt::from_code_point(ch.clone()) - } - }); +let result = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(chars_list.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ + let idx = pair.0.clone(); +let ch = pair.1.clone(); +if is_upper(ch.clone()) { + if (idx.clone() == 0) { + to_lower_char(ch.clone()) + } else { + v2_rt::concat("_".to_string(), to_lower_char(ch.clone())) + } + } else { + v2_rt::from_code_point(ch.clone()) } - __result - }); - result.join(&"".to_string()) - } +}); } __result }); +result.join(&"".to_string()) +} } pub fn to_screaming_snake(name: String) -> String { { let snake = to_snake(name); - Rc::new({ - let mut __result = Vec::new(); - for ch in Rc::new(snake.chars().map(|c| c as i64).collect::>()) - .iter() - .cloned() - { - __result.push(to_upper_char(ch.clone())); - } - __result - }) - .join(&"".to_string()) - } +Rc::new({ let mut __result = Vec::new(); for ch in Rc::new(snake.chars().map(|c| c as i64).collect::>()).iter().cloned() { __result.push(to_upper_char(ch.clone())); } __result }).join(&"".to_string()) +} } pub fn to_camel(name: String) -> String { { - let parts = Rc::new( - name.clone() - .split(&"_".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ); - if ((parts.clone().len() as i64) == 0) { + let parts = Rc::new(name.clone().split(&"_".to_string()).map(|s| s.to_string()).collect::>()); +if ((parts.clone().len() as i64) == 0) { name.clone() } else { { let first_part = match parts.clone().first().cloned() { - Some(p) => Rc::new({ - let mut __result = Vec::new(); - for c in Rc::new(p.clone().chars().map(|c| c as i64).collect::>()) - .iter() - .cloned() - { - __result.push(to_lower_char(c.clone())); - } - __result - }) - .join(&"".to_string()), - None => "".to_string(), - }; - let rest_parts = Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - parts - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - if (pair.0.clone() > 0) { - __result.push(pair); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(capitalize_first(pair.1.clone())); - } - __result - }); - v2_rt::concat(first_part, rest_parts.join(&"".to_string())) - } + Some(p) => Rc::new({ let mut __result = Vec::new(); for c in Rc::new(p.clone().chars().map(|c| c as i64).collect::>()).iter().cloned() { __result.push(to_lower_char(c.clone())); } __result }).join(&"".to_string()), + None => "".to_string(), +}; +let rest_parts = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(parts.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (pair.0.clone() > 0) { __result.push(pair); } } __result }).iter().cloned() { __result.push(capitalize_first(pair.1.clone())); } __result }); +v2_rt::concat(first_part, rest_parts.join(&"".to_string())) +} } - } +} } pub fn is_upper(ch: i64) -> bool { @@ -1234,123 +608,74 @@ pub fn is_upper(ch: i64) -> bool { pub fn to_lower_char(ch: i64) -> String { { let cp = ch.clone(); - if ((cp.clone() >= 65) && (cp.clone() <= 90)) { +if ((cp.clone() >= 65) && (cp.clone() <= 90)) { { let lower_cp = (cp.clone() + 32); - v2_rt::from_code_point(lower_cp) - } +v2_rt::from_code_point(lower_cp) +} } else { v2_rt::from_code_point(ch.clone()) } - } +} } pub fn to_upper_char(ch: i64) -> String { { let cp = ch.clone(); - if ((cp.clone() >= 97) && (cp.clone() <= 122)) { +if ((cp.clone() >= 97) && (cp.clone() <= 122)) { { let upper_cp = (cp.clone() - 32); - v2_rt::from_code_point(upper_cp) - } +v2_rt::from_code_point(upper_cp) +} } else { v2_rt::from_code_point(ch.clone()) } - } +} } pub fn sanitize_service_name(name: String) -> String { { - let parts = Rc::new( - name.split(&".".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ); - let pascal_parts = Rc::new({ - let mut __result = Vec::new(); - for p in parts.iter().cloned() { - __result.push(capitalize_first(p.clone())); - } - __result - }); - pascal_parts.join(&"".to_string()) - } + let parts = Rc::new(name.split(&".".to_string()).map(|s| s.to_string()).collect::>()); +let pascal_parts = Rc::new({ let mut __result = Vec::new(); for p in parts.iter().cloned() { __result.push(capitalize_first(p.clone())); } __result }); +pascal_parts.join(&"".to_string()) +} } pub fn capitalize_first(s: String) -> String { { let chars_list = Rc::new(s.chars().map(|c| c as i64).collect::>()); - if ((chars_list.clone().len() as i64) == 0) { +if ((chars_list.clone().len() as i64) == 0) { "".to_string() } else { - Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - chars_list - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - __result.push(if (pair.0.clone() == 0) { - to_upper_char(pair.1.clone()) - } else { - v2_rt::from_code_point(pair.1.clone()) - }); - } - __result - }) - .join(&"".to_string()) + Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(chars_list.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push(if (pair.0.clone() == 0) { + to_upper_char(pair.1.clone()) + } else { + v2_rt::from_code_point(pair.1.clone()) + }); } __result }).join(&"".to_string()) } - } +} } pub fn to_pascal(name: String) -> String { { let snake = to_snake(name); - let parts = Rc::new( - snake - .split(&"_".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ); - let pascal_parts = Rc::new({ - let mut __result = Vec::new(); - for p in parts.iter().cloned() { - __result.push(capitalize_first(p.clone())); - } - __result - }); - pascal_parts.join(&"".to_string()) - } +let parts = Rc::new(snake.split(&"_".to_string()).map(|s| s.to_string()).collect::>()); +let pascal_parts = Rc::new({ let mut __result = Vec::new(); for p in parts.iter().cloned() { __result.push(capitalize_first(p.clone())); } __result }); +pascal_parts.join(&"".to_string()) +} } pub fn apply_naming_case(name: String, case_style: NamingCase) -> String { match case_style { - NamingCase::PascalCase => { - let parts = Rc::new( - name.split(&"_".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ); - let pascal_parts = Rc::new({ - let mut __result = Vec::new(); - for p in parts.iter().cloned() { - __result.push(capitalize_first(p.clone())); - } - __result - }); - pascal_parts.join(&"".to_string()) - } - NamingCase::SnakeCase => to_snake(name), - NamingCase::CamelCase => to_camel(name), - NamingCase::AsAuthored => name, - } + NamingCase::PascalCase => { + let parts = Rc::new(name.split(&"_".to_string()).map(|s| s.to_string()).collect::>()); +let pascal_parts = Rc::new({ let mut __result = Vec::new(); for p in parts.iter().cloned() { __result.push(capitalize_first(p.clone())); } __result }); +pascal_parts.join(&"".to_string()) +}, + NamingCase::SnakeCase => to_snake(name), + NamingCase::CamelCase => to_camel(name), + NamingCase::AsAuthored => name, +} } pub fn service_var_name(service_name: String) -> String { @@ -1360,176 +685,71 @@ pub fn service_var_name(service_name: String) -> String { pub fn test_file_path(module_name: String, target: &RenderTarget) -> String { { let conventions = test_conventions_for_target(target.clone()); - let file_dir = match conventions.file_dir.clone() { - Some(dir) => dir.clone(), - None => "".to_string(), - }; - let filename = module_to_filename(module_name); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(file_dir, conventions.file_prefix.clone()), - filename, - ), - conventions.file_suffix.clone(), - ), - language_spec(target.clone()) - .scaffold - .clone() - .source_file_extension - .clone(), - ) - } +let file_dir = match conventions.file_dir.clone() { + Some(dir) => dir.clone(), + None => "".to_string(), +}; +let filename = module_to_filename(module_name); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(file_dir, conventions.file_prefix.clone()), filename), conventions.file_suffix.clone()), language_spec(target.clone()).scaffold.clone().source_file_extension.clone()) +} } pub fn test_function_name(projection: &Rc, target: RenderTarget) -> String { { let conventions = test_conventions_for_target(target); - let formatted = match conventions.name_style.clone() { - TestNameStyle::SnakeCaseTestNames => v2_rt::concat( - v2_rt::concat( - to_snake(sanitize_service_name(projection.service_name.clone())), - "_".to_string(), - ), - to_snake(projection.operation_name.clone()), - ), - TestNameStyle::PascalCaseTestNames => v2_rt::concat( - to_pascal(sanitize_service_name(projection.service_name.clone())), - to_pascal(projection.operation_name.clone()), - ), - }; - v2_rt::concat(conventions.function_prefix.clone(), formatted) - } +let formatted = match conventions.name_style.clone() { + TestNameStyle::SnakeCaseTestNames => v2_rt::concat(v2_rt::concat(to_snake(sanitize_service_name(projection.service_name.clone())), "_".to_string()), to_snake(projection.operation_name.clone())), + TestNameStyle::PascalCaseTestNames => v2_rt::concat(to_pascal(sanitize_service_name(projection.service_name.clone())), to_pascal(projection.operation_name.clone())), +}; +v2_rt::concat(conventions.function_prefix.clone(), formatted) +} } pub fn apply_type_template1(template: String, arg0: String) -> String { - Rc::new( - template - .split(&"{0}".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .join(&arg0) + Rc::new(template.split(&"{0}".to_string()).map(|s| s.to_string()).collect::>()).join(&arg0) } pub fn apply_type_template2(template: String, arg0: String, arg1: String) -> String { { - let parts = Rc::new( - template - .split(&"{0}".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ); - let replaced = Rc::new({ - let mut __result = Vec::new(); - for p in parts.iter().cloned() { - __result.push( - Rc::new( - p.clone() - .split(&"{1}".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .join(&arg1.clone()), - ); - } - __result - }); - replaced.join(&arg0) - } + let parts = Rc::new(template.split(&"{0}".to_string()).map(|s| s.to_string()).collect::>()); +let replaced = Rc::new({ let mut __result = Vec::new(); for p in parts.iter().cloned() { __result.push(Rc::new(p.clone().split(&"{1}".to_string()).map(|s| s.to_string()).collect::>()).join(&arg1.clone())); } __result }); +replaced.join(&arg0) +} } pub fn apply_type_template3(template: String, arg0: String, arg1: String, arg2: String) -> String { { - let parts0 = Rc::new( - template - .split(&"{0}".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ); - let replaced = Rc::new({ - let mut __result = Vec::new(); - for p0 in parts0.iter().cloned() { - __result.push({ - let parts1 = Rc::new( - p0.clone() - .split(&"{1}".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ); - let inner = Rc::new({ - let mut __result = Vec::new(); - for p1 in parts1.clone().iter().cloned() { - __result.push( - Rc::new( - p1.clone() - .split(&"{2}".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .join(&arg2.clone()), - ); - } - __result - }); - inner.clone().join(&arg1.clone()) - }); - } - __result - }); - replaced.join(&arg0) - } + let parts0 = Rc::new(template.split(&"{0}".to_string()).map(|s| s.to_string()).collect::>()); +let replaced = Rc::new({ let mut __result = Vec::new(); for p0 in parts0.iter().cloned() { __result.push({ + let parts1 = Rc::new(p0.clone().split(&"{1}".to_string()).map(|s| s.to_string()).collect::>()); +let inner = Rc::new({ let mut __result = Vec::new(); for p1 in parts1.clone().iter().cloned() { __result.push(Rc::new(p1.clone().split(&"{2}".to_string()).map(|s| s.to_string()).collect::>()).join(&arg2.clone())); } __result }); +inner.clone().join(&arg1.clone()) +}); } __result }); +replaced.join(&arg0) +} } pub fn apply_named_template(template: String, bindings: &Rc>) -> String { apply_named_template_nested(template, &bindings, &Rc::new(v2_rt::map_keys(&bindings))) } -pub fn apply_named_template_nested( - template: String, - bindings: &Rc>, - keys: &Rc>, -) -> String { +pub fn apply_named_template_nested(template: String, bindings: &Rc>, keys: &Rc>) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match keys.clone().first().cloned() { - None => template, - Some(key) => { - let rest = Rc::new( - keys.clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - let placeholder = - v2_rt::concat(v2_rt::concat("{".to_string(), key.clone()), "}".to_string()); - match v2_rt::map_get(&bindings, key.clone()) { - Some(val) => { - let parts = Rc::new( - template - .split(&placeholder) - .map(|s| s.to_string()) - .collect::>(), - ); - let processed = Rc::new({ - let mut __result = Vec::new(); - for part in parts.iter().cloned() { - __result.push(apply_named_template_nested( - part.clone(), - &bindings, - &rest, - )); - } - __result - }); - processed.join(&val.clone()) - } - None => { - v2_rt::concat("TEMPLATE_ERROR_MISSING_BINDING_".to_string(), key.clone()) - } - } - } - } + None => template, + Some(key) => { + let rest = Rc::new(keys.clone().iter().cloned().skip(1 as usize).collect::>()); +let placeholder = v2_rt::concat(v2_rt::concat("{".to_string(), key.clone()), "}".to_string()); +match v2_rt::map_get(&bindings, key.clone()) { + Some(val) => { + let parts = Rc::new(template.split(&placeholder).map(|s| s.to_string()).collect::>()); +let processed = Rc::new({ let mut __result = Vec::new(); for part in parts.iter().cloned() { __result.push(apply_named_template_nested(part.clone(), &bindings, &rest)); } __result }); +processed.join(&val.clone()) +}, + None => v2_rt::concat("TEMPLATE_ERROR_MISSING_BINDING_".to_string(), key.clone()), +} +}, +} }) } @@ -1538,163 +758,74 @@ pub fn language_spec(target: RenderTarget) -> Rc { } pub fn reserved_prefix(target: RenderTarget) -> String { - match (*language_spec(target) - .reserved_words - .clone() - .strategy - .clone()) - .clone() - { - ReservedWordStrategy::PrefixEscape { prefix, .. } => prefix.clone(), - _ => "".to_string(), - } + match (*language_spec(target).reserved_words.clone().strategy.clone()).clone() { + ReservedWordStrategy::PrefixEscape { prefix, .. } => prefix.clone(), + _ => "".to_string(), +} } pub fn reserved_suffix(target: RenderTarget) -> String { - match (*language_spec(target) - .reserved_words - .clone() - .strategy - .clone()) - .clone() - { - ReservedWordStrategy::SuffixEscape { suffix, .. } => suffix.clone(), - _ => "".to_string(), - } + match (*language_spec(target).reserved_words.clone().strategy.clone()).clone() { + ReservedWordStrategy::SuffixEscape { suffix, .. } => suffix.clone(), + _ => "".to_string(), +} } pub fn escape_string_literal_body(s: String) -> String { { - let escaped_backslash = Rc::new( - s.split(&"\\".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .join(&"\\\\".to_string()); - let escaped_quote = Rc::new( - escaped_backslash - .split(&"\"".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .join(&"\\\"".to_string()); - let escaped_newline = Rc::new( - escaped_quote - .split(&"\n".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .join(&"\\n".to_string()); - let escaped_return = Rc::new( - escaped_newline - .split(&"\\r".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .join(&"\\r".to_string()); - Rc::new( - escaped_return - .split(&"\t".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .join(&"\\t".to_string()) - } + let escaped_backslash = Rc::new(s.split(&"\\".to_string()).map(|s| s.to_string()).collect::>()).join(&"\\\\".to_string()); +let escaped_quote = Rc::new(escaped_backslash.split(&"\"".to_string()).map(|s| s.to_string()).collect::>()).join(&"\\\"".to_string()); +let escaped_newline = Rc::new(escaped_quote.split(&"\n".to_string()).map(|s| s.to_string()).collect::>()).join(&"\\n".to_string()); +let escaped_return = Rc::new(escaped_newline.split(&"\\r".to_string()).map(|s| s.to_string()).collect::>()).join(&"\\r".to_string()); +Rc::new(escaped_return.split(&"\t".to_string()).map(|s| s.to_string()).collect::>()).join(&"\\t".to_string()) +} } pub fn escape_rust_interp_text(s: String) -> String { { - let escaped = Rc::new( - escape_string_literal_body(s) - .split(&"{".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .join(&"{{".to_string()); - Rc::new( - escaped - .split(&"}".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .join(&"}}".to_string()) - } + let escaped = Rc::new(escape_string_literal_body(s).split(&"{".to_string()).map(|s| s.to_string()).collect::>()).join(&"{{".to_string()); +Rc::new(escaped.split(&"}".to_string()).map(|s| s.to_string()).collect::>()).join(&"}}".to_string()) +} } pub fn escape_go_interp_text(s: String) -> String { - Rc::new( - escape_string_literal_body(s) - .split(&"%".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .join(&"%%".to_string()) + Rc::new(escape_string_literal_body(s).split(&"%".to_string()).map(|s| s.to_string()).collect::>()).join(&"%%".to_string()) } pub fn escape_python_interp_text(s: String) -> String { { - let escaped = Rc::new( - escape_string_literal_body(s) - .split(&"{".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .join(&"{{".to_string()); - Rc::new( - escaped - .split(&"}".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .join(&"}}".to_string()) - } + let escaped = Rc::new(escape_string_literal_body(s).split(&"{".to_string()).map(|s| s.to_string()).collect::>()).join(&"{{".to_string()); +Rc::new(escaped.split(&"}".to_string()).map(|s| s.to_string()).collect::>()).join(&"}}".to_string()) +} } pub fn apply_escape_pairs(s: String, pairs: Rc>>) -> String { - pairs - .iter() - .cloned() - .fold(s.clone(), |acc: String, pair: Rc| { - Rc::new( - acc.split(&pair.from.clone()) - .map(|s| s.to_string()) - .collect::>(), - ) - .join(&pair.to.clone()) - }) + pairs.iter().cloned().fold(s.clone(), |acc: String, pair: Rc| Rc::new(acc.split(&pair.from.clone()).map(|s| s.to_string()).collect::>()).join(&pair.to.clone())) } pub fn emit_string_literal(s: String, suffix: String) -> String { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("\"".to_string(), escape_string_literal_body(s)), - "\"".to_string(), - ), - suffix, - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat("\"".to_string(), escape_string_literal_body(s)), "\"".to_string()), suffix) } pub fn is_null_coalesce(op: BinOp) -> bool { match op { - BinOp::NullCoalesce => true, - _ => false, - } + BinOp::NullCoalesce => true, + _ => false, +} } pub fn rust_literal_for_pattern(value: Rc) -> String { match (*value).clone() { - LiteralValue::LitStr { value: s, .. } => emit_string_literal(s.clone(), "".to_string()), - LiteralValue::LitInt { value: i, .. } => (i.clone()).to_string(), - LiteralValue::LitFloat { value: f, .. } => f.clone(), - LiteralValue::LitBool { value: b, .. } => { - if b.clone() { - emit_keyword("true".to_string(), RenderTarget::Rust) - } else { - emit_keyword("false".to_string(), RenderTarget::Rust) - } - } - LiteralValue::LitNull => emit_keyword("null".to_string(), RenderTarget::Rust), - } + LiteralValue::LitStr { value: s, .. } => emit_string_literal(s.clone(), "".to_string()), + LiteralValue::LitInt { value: i, .. } => (i.clone()).to_string(), + LiteralValue::LitFloat { value: f, .. } => f.clone(), + LiteralValue::LitBool { value: b, .. } => if b.clone() { + emit_keyword("true".to_string(), RenderTarget::Rust) + } else { + emit_keyword("false".to_string(), RenderTarget::Rust) + }, + LiteralValue::LitNull => emit_keyword("null".to_string(), RenderTarget::Rust), +} } pub fn emit_keyword(key: String, target: RenderTarget) -> String { @@ -1703,41 +834,29 @@ pub fn emit_keyword(key: String, target: RenderTarget) -> String { pub fn emit_literal(value: Rc, target: &RenderTarget) -> String { match (*value).clone() { - LiteralValue::LitStr { value: s, .. } => { - let suffix = match literal_suffix(target.clone(), "String".to_string()) { - Some(sfx) => sfx.clone(), - None => emit_error_expr( - "missing TypeCheckpoint for String literal suffix".to_string(), - target.clone(), - ), - }; - emit_string_literal(s.clone(), suffix) - } - LiteralValue::LitInt { value: i, .. } => (i.clone()).to_string(), - LiteralValue::LitFloat { value: f, .. } => f.clone(), - LiteralValue::LitBool { value: b, .. } => { - if b.clone() { - emit_keyword("true".to_string(), target.clone()) - } else { - emit_keyword("false".to_string(), target.clone()) - } - } - LiteralValue::LitNull => emit_keyword("null".to_string(), target.clone()), - } + LiteralValue::LitStr { value: s, .. } => { + let suffix = match literal_suffix(target.clone(), "String".to_string()) { + Some(sfx) => sfx.clone(), + None => emit_error_expr("missing TypeCheckpoint for String literal suffix".to_string(), target.clone()), +}; +emit_string_literal(s.clone(), suffix) +}, + LiteralValue::LitInt { value: i, .. } => (i.clone()).to_string(), + LiteralValue::LitFloat { value: f, .. } => f.clone(), + LiteralValue::LitBool { value: b, .. } => if b.clone() { + emit_keyword("true".to_string(), target.clone()) + } else { + emit_keyword("false".to_string(), target.clone()) + }, + LiteralValue::LitNull => emit_keyword("null".to_string(), target.clone()), +} } -pub fn emit_bin_op_symbol( - op: BinOp, - target: &RenderTarget, - algebra_field: Option, -) -> String { +pub fn emit_bin_op_symbol(op: BinOp, target: &RenderTarget, algebra_field: Option) -> String { match binop_symbol(target.clone(), op, algebra_field) { - Some(sym) => sym.clone(), - None => emit_error_expr( - "missing OperatorSpec for BinOp in target language".to_string(), - target.clone(), - ), - } + Some(sym) => sym.clone(), + None => emit_error_expr("missing OperatorSpec for BinOp in target language".to_string(), target.clone()), +} } pub fn emit_container(kind: &String, inner: String, target: &RenderTarget) -> String { @@ -1745,467 +864,303 @@ pub fn emit_container(kind: &String, inner: String, target: &RenderTarget) -> St apply_type_template1(target_optional_template(target.clone()), inner) } else { match coerce_container_template(target.clone(), kind.clone()) { - Some(template) => apply_type_template1(template.clone(), inner), - None => { - let spec = language_spec(target.clone()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(kind.clone(), spec.type_arg_open.clone()), - inner, - ), - spec.type_arg_close.clone(), - ) - } - } + Some(template) => apply_type_template1(template.clone(), inner), + None => { + let spec = language_spec(target.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(kind.clone(), spec.type_arg_open.clone()), inner), spec.type_arg_close.clone()) +}, +} } } pub fn emit_map_type(key_type: String, val_type: String, target: RenderTarget) -> String { match coerce_container_template(target, "map".to_string()) { - Some(template) => apply_type_template2(template.clone(), key_type, val_type), - None => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("Map<".to_string(), key_type), - ", ".to_string(), - ), - val_type, - ), - ">".to_string(), - ), - } + Some(template) => apply_type_template2(template.clone(), key_type, val_type), + None => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("Map<".to_string(), key_type), ", ".to_string()), val_type), ">".to_string()), +} +} + +pub fn emit_node_type(n: Rc, target: RenderTarget, source_indices: Rc>>) -> String { + render_node_type(&n, &target, &empty_set(), &source_indices) } -pub fn emit_node_type( - n: Rc, - target: RenderTarget, - source_indices: Rc>>, -) -> String { - render_node_type( - &n, - &target, - &v2_rt::rc_empty_map::(), - &source_indices, - ) -} - -pub fn render_node_type( - n: &Rc, - target: &RenderTarget, - shared_types: &Rc>, - source_indices: &Rc>>, -) -> String { +pub fn render_node_type(n: &Rc, target: &RenderTarget, shared_types: &Rc>, source_indices: &Rc>>) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let tn = authored_name_at(source_indices.clone(), &n); - let n_is_error = if (n.inferred.clone() != None) { - is_compiler_error(n.inferred.clone().clone().unwrap()) - } else { - false - }; - let n_is_type_var = if (n.inferred.clone() != None) { - is_type_variable(n.inferred.clone().clone().unwrap()) - } else { - false - }; - if ((n_is_type_var || n_is_error.clone()) && ((n.children.clone().len() as i64) == 0)) { - { - let label = if n_is_error.clone() { - "CompilerError".to_string() - } else { - "TypeVariable".to_string() - }; - let spec = language_spec(target.clone()); - let err_str = apply_type_template1( - spec.error_type_template.clone(), - v2_rt::concat("UNRESOLVED_".to_string(), label), - ); - return err_str; + { + let tn = authored_name_at(source_indices.clone(), &n); +let n_is_error = if (n.inferred.clone() != None) { + is_compiler_error(n.inferred.clone().clone().unwrap()) + } else { + false + }; +let n_is_type_var = if (n.inferred.clone() != None) { + is_type_variable(n.inferred.clone().clone().unwrap()) + } else { + false + }; +if ((n_is_type_var || n_is_error.clone()) && ((n.children.clone().len() as i64) == 0)) { + { + let label = if n_is_error.clone() { + "CompilerError".to_string() + } else { + "TypeVariable".to_string() + }; +let spec = language_spec(target.clone()); +let err_str = apply_type_template1(spec.error_type_template.clone(), v2_rt::concat("UNRESOLVED_".to_string(), label)); +return err_str +} } - } - let is_arrow = (n.connective.clone() == Connective::Arrow); - if is_arrow { - { - let repr = target_callable(target.clone()); - let param_strs = Rc::new({ - let mut __result = Vec::new(); - for p in n.params.clone().iter().cloned() { - __result.push(render_node_type( - ¶m_node_type_expr(&p), - &target, - &shared_types, - &source_indices, - )); - } - __result - }); - let param_str = param_strs.join(&repr.param_separator.clone()); - let ret_str = match n.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - render_node_type(&rt, &target, &shared_types, &source_indices) - } - _ => language_spec(target.clone()).void_type.clone(), - }; - let spec = language_spec(target.clone()); - let result = match spec.callable_type_template.clone() { - Some(t) => v2_rt::replace( - v2_rt::replace(t.clone(), "{params}".to_string(), param_str), - "{return}".to_string(), - ret_str.clone(), - ), - None => { - if (ret_str.clone().as_str() == "".to_string().as_str()) { - { - let void_template = v2_rt::replace( - repr.template.clone(), - v2_rt::concat( - repr.return_separator.clone(), - "{return}".to_string(), - ), - "".to_string(), - ); - v2_rt::replace(void_template, "{params}".to_string(), param_str) - } - } else { - v2_rt::replace( - v2_rt::replace( - repr.template.clone(), - "{params}".to_string(), - param_str, - ), - "{return}".to_string(), - ret_str.clone(), - ) - } - } - }; - return result; +let is_arrow = (n.connective.clone() == Connective::Arrow); +if is_arrow { + { + let repr = target_callable(target.clone()); +let param_strs = Rc::new({ let mut __result = Vec::new(); for p in n.params.clone().iter().cloned() { __result.push(render_node_type(¶m_node_type_expr(&p), &target, &shared_types, &source_indices)); } __result }); +let param_str = param_strs.join(&repr.param_separator.clone()); +let ret_str = match n.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => render_node_type(&rt, &target, &shared_types, &source_indices), + _ => language_spec(target.clone()).void_type.clone(), +}; +let spec = language_spec(target.clone()); +let result = match spec.callable_type_template.clone() { + Some(t) => v2_rt::replace(v2_rt::replace(t.clone(), "{params}".to_string(), param_str), "{return}".to_string(), ret_str.clone()), + None => if (ret_str.clone().as_str() == "".to_string().as_str()) { + { + let void_template = v2_rt::replace(repr.template.clone(), v2_rt::concat(repr.return_separator.clone(), "{return}".to_string()), "".to_string()); +v2_rt::replace(void_template, "{params}".to_string(), param_str) +} + } else { + v2_rt::replace(v2_rt::replace(repr.template.clone(), "{params}".to_string(), param_str), "{return}".to_string(), ret_str.clone()) + }, +}; +return result +} } - } - let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); - if is_optional { - { - let inner_str = render_node_type( - &with_required_cardinality(&n), - &target, - &shared_types, - &source_indices, - ); - let opt_str = emit_container(&"optional".to_string(), inner_str, &target); - return opt_str; +let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); +if is_optional { + { + let inner_str = render_node_type(&with_required_cardinality(&n), &target, &shared_types, &source_indices); +let opt_str = emit_container(&"optional".to_string(), inner_str, &target); +return opt_str +} } - } - let is_conj = (n.connective.clone() == Connective::Conj); - let is_disj = (n.connective.clone() == Connective::Disj); - let shared = emit_map_has(shared_types.clone(), tn.clone()); - if is_disj { - { - let base = if (n.ident_span.clone() != None) { - coerce_primitive_type(target.clone(), tn.clone()) - } else { - { - let spec = language_spec(target.clone()); - apply_type_template1( - spec.error_type_template.clone(), - "ANONYMOUS_COPRODUCT".to_string(), - ) - } - }; - let disj_str = if shared.clone() { - wrap_shared_type(target.clone(), base.clone()) - } else { - base.clone() - }; - return disj_str; +let is_conj = (n.connective.clone() == Connective::Conj); +let is_disj = (n.connective.clone() == Connective::Disj); +let shared = set_contains(shared_types.clone(), tn.clone()); +if is_disj { + { + let base = if (n.ident_span.clone() != None) { + coerce_primitive_type(target.clone(), tn.clone()) + } else { + { + let spec = language_spec(target.clone()); +apply_type_template1(spec.error_type_template.clone(), "ANONYMOUS_COPRODUCT".to_string()) +} + }; +let disj_str = if shared.clone() { + wrap_shared_type(target.clone(), base.clone()) + } else { + base.clone() + }; +return disj_str +} } - } - if is_conj { - { - if (n.type_annotation.clone() != None) { - { - let refined_str = match n.children.clone().first().cloned() { - Some(base) => { - render_node_type(&base, &target, &shared_types, &source_indices) - } - None => coerce_primitive_type(target.clone(), "Refined".to_string()), - }; - return refined_str; +if is_conj { + { + if (n.type_annotation.clone() != None) { + { + let refined_str = match n.children.clone().first().cloned() { + Some(base) => render_node_type(&base, &target, &shared_types, &source_indices), + None => coerce_primitive_type(target.clone(), "Refined".to_string()), +}; +return refined_str +} } - } - let is_pair = (((n.connective.clone() == Connective::Conj) - && (n.ident_span.clone() == None)) - && ((n.children.clone().len() as i64) == 2)); - if is_pair { - { - let first_child = match n.children.clone().first().cloned() { - Some(c) => { - if (c.inferred.clone() != None) { - render_node_type( - &resolved_type(c.clone()), - &target, - &shared_types, - &source_indices, - ) - } else { - render_node_type(&c, &target, &shared_types, &source_indices) - } - } - None => "_".to_string(), - }; - let second_child = match n.children.clone().get(1 as usize).cloned() { - Some(c) => { - if (c.inferred.clone() != None) { - render_node_type( - &resolved_type(c.clone()), - &target, - &shared_types, - &source_indices, - ) - } else { - render_node_type(&c, &target, &shared_types, &source_indices) - } - } - None => "_".to_string(), - }; - let tuple_str = render_tuple_parts( - &Rc::new(vec![first_child, second_child]), - target.clone(), - ); - return tuple_str; +let is_pair = (((n.connective.clone() == Connective::Conj) && (n.ident_span.clone() == None)) && ((n.children.clone().len() as i64) == 2)); +if is_pair { + { + let first_child = match n.children.clone().first().cloned() { + Some(c) => if (c.inferred.clone() != None) { + render_node_type(&resolved_type(c.clone()), &target, &shared_types, &source_indices) + } else { + render_node_type(&c, &target, &shared_types, &source_indices) + }, + None => "_".to_string(), +}; +let second_child = match n.children.clone().get(1 as usize).cloned() { + Some(c) => if (c.inferred.clone() != None) { + render_node_type(&resolved_type(c.clone()), &target, &shared_types, &source_indices) + } else { + render_node_type(&c, &target, &shared_types, &source_indices) + }, + None => "_".to_string(), +}; +let tuple_str = render_tuple_parts(&Rc::new(vec![first_child, second_child]), target.clone()); +return tuple_str +} } - } - if (n.ident_span.clone() != None) { - { - let snake = to_snake(tn.clone()); - let has_template = match container_template_algebra(snake.clone()) { - Some(_) => true, - None => false, - }; - if has_template { - { - let base = if (snake.clone().as_str() == "map".to_string().as_str()) +if (n.ident_span.clone() != None) { + { + let snake = to_snake(tn.clone()); +let has_template = match container_template_algebra(snake.clone()) { + Some(_) => true, + None => false, +}; +if has_template { { - emit_map_type("_".to_string(), "_".to_string(), target.clone()) - } else { - emit_container(&snake, "_".to_string(), &target) - }; - let conj_container_str = if shared.clone() { - wrap_shared_type(target.clone(), base.clone()) - } else { - base.clone() - }; - return conj_container_str; + let base = if (snake.clone().as_str() == "map".to_string().as_str()) { + emit_map_type("_".to_string(), "_".to_string(), target.clone()) + } else { + emit_container(&snake, "_".to_string(), &target) + }; +let conj_container_str = if shared.clone() { + wrap_shared_type(target.clone(), base.clone()) + } else { + base.clone() + }; +return conj_container_str +} } - } - let base = coerce_primitive_type(target.clone(), tn.clone()); - let conj_named_str = if shared.clone() { - wrap_shared_type(target.clone(), base.clone()) - } else { - base.clone() - }; - return conj_named_str; - } - } - let parts = Rc::new({ - let mut __result = Vec::new(); - for child in n.children.clone().iter().cloned() { - __result.push(render_node_type( - &resolved_type(child.clone()), - &target, - &shared_types, - &source_indices, - )); +let base = coerce_primitive_type(target.clone(), tn.clone()); +let conj_named_str = if shared.clone() { + wrap_shared_type(target.clone(), base.clone()) + } else { + base.clone() + }; +return conj_named_str +} } - __result - }); - let anon_str = render_tuple_parts(&parts, target.clone()); - return anon_str; +let parts = Rc::new({ let mut __result = Vec::new(); for child in n.children.clone().iter().cloned() { __result.push(render_node_type(&resolved_type(child.clone()), &target, &shared_types, &source_indices)); } __result }); +let anon_str = render_tuple_parts(&parts, target.clone()); +return anon_str +} } - } - if ((n.children.clone().len() as i64) == 0) { - { - let bare_is_map = (is_container_type(tn.clone()) - && (to_snake(tn.clone()).as_str() == "map".to_string().as_str())); - let bare_is_collection = (is_container_type(tn.clone()) && !bare_is_map.clone()); - let has_container_template = match container_template_algebra(to_snake(tn.clone())) +if ((n.children.clone().len() as i64) == 0) { { - Some(_) => true, - None => false, - }; - let param_count = (n.params.clone().len() as i64); - let base = if bare_is_map.clone() { - emit_map_type("_".to_string(), "_".to_string(), target.clone()) - } else { - if bare_is_collection { - emit_container(&to_snake(tn.clone()), "_".to_string(), &target) + let bare_is_map = (is_container_type(tn.clone()) && (to_snake(tn.clone()).as_str() == "map".to_string().as_str())); +let bare_is_collection = (is_container_type(tn.clone()) && !bare_is_map.clone()); +let has_container_template = match container_template_algebra(to_snake(tn.clone())) { + Some(_) => true, + None => false, +}; +let param_count = (n.params.clone().len() as i64); +let base = if bare_is_map.clone() { + emit_map_type("_".to_string(), "_".to_string(), target.clone()) } else { - if (has_container_template && (param_count == 1)) { - { - let inner = match n.params.clone().first().cloned() { - Some(p) => render_node_type( - ¶m_node_type_expr(&p), - &target, - &shared_types, - &source_indices, - ), - None => "_".to_string(), - }; - emit_container(&to_snake(tn.clone()), inner, &target) - } + if bare_is_collection { + emit_container(&to_snake(tn.clone()), "_".to_string(), &target) } else { - if (tn.clone().as_str() == tuple_type_name().as_str()) { - render_tuple_parts(&Rc::new(vec![]), target.clone()) + if (has_container_template && (param_count == 1)) { + { + let inner = match n.params.clone().first().cloned() { + Some(p) => render_node_type(¶m_node_type_expr(&p), &target, &shared_types, &source_indices), + None => "_".to_string(), +}; +emit_container(&to_snake(tn.clone()), inner, &target) +} } else { - coerce_primitive_type(target.clone(), tn.clone()) + if (tn.clone().as_str() == tuple_type_name().as_str()) { + render_tuple_parts(&Rc::new(vec![]), target.clone()) + } else { + coerce_primitive_type(target.clone(), tn.clone()) + } } } - } - }; - let bare_str = if shared.clone() { - wrap_shared_type(target.clone(), base.clone()) - } else { - base.clone() - }; - return bare_str; + }; +let bare_str = if shared.clone() { + wrap_shared_type(target.clone(), base.clone()) + } else { + base.clone() + }; +return bare_str +} } - } - let is_map = node_is_keyed_collection(&n, source_indices.clone()); - if is_map { - { - let k = match n.children.clone().first().cloned() { - Some(kn) => render_node_type( - &child_type_node(&kn), - &target, - &shared_types, - &source_indices, - ), - None => "_".to_string(), - }; - let v = match n.children.clone().get(1 as usize).cloned() { - Some(vn) => render_node_type( - &child_type_node(&vn), - &target, - &shared_types, - &source_indices, - ), - None => "_".to_string(), - }; - let base = emit_map_type(k, v, target.clone()); - let map_str = if shared.clone() { - wrap_shared_type(target.clone(), base.clone()) - } else { - base.clone() - }; - return map_str; +let is_map = node_is_keyed_collection(&n, source_indices.clone()); +if is_map { + { + let k = match n.children.clone().first().cloned() { + Some(kn) => render_node_type(&child_type_node(&kn), &target, &shared_types, &source_indices), + None => "_".to_string(), +}; +let v = match n.children.clone().get(1 as usize).cloned() { + Some(vn) => render_node_type(&child_type_node(&vn), &target, &shared_types, &source_indices), + None => "_".to_string(), +}; +let base = emit_map_type(k, v, target.clone()); +let map_str = if shared.clone() { + wrap_shared_type(target.clone(), base.clone()) + } else { + base.clone() + }; +return map_str +} } - } - if ((n.children.clone().len() as i64) == 1) { - { - let child_str = match n.children.clone().first().cloned() { - Some(child) => render_node_type( - &child_type_node(&child), - &target, - &shared_types, - &source_indices, - ), - None => "_".to_string(), - }; - let is_container = node_is_collection(&n, source_indices.clone()); - let base = if is_container { - emit_container(&to_snake(tn.clone()), child_str, &target) - } else { - { - let type_base = coerce_primitive_type(target.clone(), tn.clone()); - let spec = language_spec(target.clone()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(type_base.clone(), spec.type_arg_open.clone()), - child_str, - ), - spec.type_arg_close.clone(), - ) - } - }; - let single_str = if shared.clone() { - wrap_shared_type(target.clone(), base.clone()) - } else { - base.clone() - }; - return single_str; +if ((n.children.clone().len() as i64) == 1) { + { + let child_str = match n.children.clone().first().cloned() { + Some(child) => render_node_type(&child_type_node(&child), &target, &shared_types, &source_indices), + None => "_".to_string(), +}; +let is_container = node_is_collection(&n, source_indices.clone()); +let base = if is_container { + emit_container(&to_snake(tn.clone()), child_str, &target) + } else { + { + let type_base = coerce_primitive_type(target.clone(), tn.clone()); +let spec = language_spec(target.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(type_base.clone(), spec.type_arg_open.clone()), child_str), spec.type_arg_close.clone()) +} + }; +let single_str = if shared.clone() { + wrap_shared_type(target.clone(), base.clone()) + } else { + base.clone() + }; +return single_str +} } - } - let child_strs = Rc::new({ - let mut __result = Vec::new(); - for c in n.children.clone().iter().cloned() { - __result.push(render_node_type( - &child_type_node(&c), - &target, - &shared_types, - &source_indices, - )); +let child_strs = Rc::new({ let mut __result = Vec::new(); for c in n.children.clone().iter().cloned() { __result.push(render_node_type(&child_type_node(&c), &target, &shared_types, &source_indices)); } __result }); +if (tn.clone().as_str() == tuple_type_name().as_str()) { + { + let multi_tuple_str = render_tuple_parts(&child_strs, target.clone()); +return multi_tuple_str +} } - __result - }); - if (tn.clone().as_str() == tuple_type_name().as_str()) { - { - let multi_tuple_str = render_tuple_parts(&child_strs, target.clone()); - return multi_tuple_str; +let type_base = coerce_primitive_type(target.clone(), tn.clone()); +let args_joined = child_strs.clone().join(&", ".to_string()); +let spec = language_spec(target.clone()); +let base = v2_rt::concat(v2_rt::concat(v2_rt::concat(type_base.clone(), spec.type_arg_open.clone()), args_joined), spec.type_arg_close.clone()); +if shared.clone() { + wrap_shared_type(target.clone(), base.clone()) + } else { + base.clone() } - } - let type_base = coerce_primitive_type(target.clone(), tn.clone()); - let args_joined = child_strs.clone().join(&", ".to_string()); - let spec = language_spec(target.clone()); - let base = v2_rt::concat( - v2_rt::concat( - v2_rt::concat(type_base.clone(), spec.type_arg_open.clone()), - args_joined, - ), - spec.type_arg_close.clone(), - ); - if shared.clone() { - wrap_shared_type(target.clone(), base.clone()) - } else { - base.clone() - } +} }) } pub fn render_tuple_parts(parts: &Rc>, target: RenderTarget) -> String { { let spec = language_spec(target); - let ts = spec.tuple_syntax.clone(); - if ((parts.clone().len() as i64) > 0) { +let ts = spec.tuple_syntax.clone(); +if ((parts.clone().len() as i64) > 0) { if ((parts.clone().len() as i64) == 2) { match parts.clone().first().cloned() { - Some(p0) => match parts.clone().get(1 as usize).cloned() { - Some(p1) => { - apply_type_template2(ts.pair_template.clone(), p0.clone(), p1.clone()) - } - None => apply_type_template1( - ts.multi_template.clone(), - parts.clone().join(&ts.separator.clone()), - ), - }, - None => apply_type_template1( - ts.multi_template.clone(), - parts.clone().join(&ts.separator.clone()), - ), - } + Some(p0) => match parts.clone().get(1 as usize).cloned() { + Some(p1) => apply_type_template2(ts.pair_template.clone(), p0.clone(), p1.clone()), + None => apply_type_template1(ts.multi_template.clone(), parts.clone().join(&ts.separator.clone())), +}, + None => apply_type_template1(ts.multi_template.clone(), parts.clone().join(&ts.separator.clone())), +} } else { - apply_type_template1( - ts.multi_template.clone(), - parts.clone().join(&ts.separator.clone()), - ) + apply_type_template1(ts.multi_template.clone(), parts.clone().join(&ts.separator.clone())) } } else { ts.empty.clone() } - } +} } -pub fn is_type_alias_return_node( - n: Rc, - source_indices: Rc>>, -) -> bool { +pub fn is_type_alias_return_node(n: Rc, source_indices: Rc>>) -> bool { (authored_name_at(source_indices, &n).as_str() != "Unit".to_string().as_str()) } @@ -2214,25 +1169,7 @@ pub fn is_service_item(item: &Rc) -> bool { } pub fn has_service_items(typed: Rc) -> bool { - { - let mut __found = false; - for tm in typed.modules.clone().iter().cloned() { - if { - let mut __found = false; - for item in tm.items.clone().iter().cloned() { - if is_service_item(&item) { - __found = true; - break; - } - } - __found - } { - __found = true; - break; - } - } - __found - } + { let mut __found = false; for tm in typed.modules.clone().iter().cloned() { if { let mut __found = false; for item in tm.items.clone().iter().cloned() { if is_service_item(&item) { __found = true; break; } } __found } { __found = true; break; } } __found } } pub fn service_fallback_transport(item: &Rc) -> Rc { @@ -2245,144 +1182,76 @@ pub fn service_fallback_transport(item: &Rc) -> Rc { pub fn effective_operation_transport(op_node: Rc, fallback: Rc) -> Rc { match op_node.transport.clone() { - Some(op_transport) => op_transport.clone(), - None => fallback, - } + Some(op_transport) => op_transport.clone(), + None => fallback, +} } -pub fn service_has_rest( - fallback_transport: Rc, - op_children: Rc>>, - source_indices: &Rc>>, -) -> bool { +pub fn service_has_rest(fallback_transport: Rc, op_children: Rc>>, source_indices: &Rc>>) -> bool { { let from_fallback = is_rest_transport(fallback_transport, source_indices.clone()); - let from_ops = { - let mut __found = false; - for op in op_children.iter().cloned() { - if if (op.transport.clone() != None) { - is_rest_transport( - op.transport.clone().clone().unwrap(), - source_indices.clone(), - ) - } else { - false - } { - __found = true; - break; - } - } - __found - }; - (from_fallback || from_ops) - } +let from_ops = { let mut __found = false; for op in op_children.iter().cloned() { if if (op.transport.clone() != None) { + is_rest_transport(op.transport.clone().clone().unwrap(), source_indices.clone()) + } else { + false + } { __found = true; break; } } __found }; +(from_fallback || from_ops) +} } pub fn service_has_shell(fallback_transport: Rc, op_children: Rc>>) -> bool { { let from_fallback = is_shell_transport(fallback_transport); - let from_ops = { - let mut __found = false; - for op in op_children.iter().cloned() { - if if (op.transport.clone() != None) { - is_shell_transport(op.transport.clone().clone().unwrap()) - } else { - false - } { - __found = true; - break; - } - } - __found - }; - (from_fallback || from_ops) - } +let from_ops = { let mut __found = false; for op in op_children.iter().cloned() { if if (op.transport.clone() != None) { + is_shell_transport(op.transport.clone().clone().unwrap()) + } else { + false + } { __found = true; break; } } __found }; +(from_fallback || from_ops) +} } -pub fn service_has_file( - fallback_transport: Rc, - op_children: Rc>>, - source_indices: &Rc>>, -) -> bool { +pub fn service_has_file(fallback_transport: Rc, op_children: Rc>>, source_indices: &Rc>>) -> bool { { let from_fallback = is_file_transport(fallback_transport, source_indices.clone()); - let from_ops = { - let mut __found = false; - for op in op_children.iter().cloned() { - if if (op.transport.clone() != None) { - is_file_transport( - op.transport.clone().clone().unwrap(), - source_indices.clone(), - ) - } else { - false - } { - __found = true; - break; - } - } - __found - }; - (from_fallback || from_ops) - } +let from_ops = { let mut __found = false; for op in op_children.iter().cloned() { if if (op.transport.clone() != None) { + is_file_transport(op.transport.clone().clone().unwrap(), source_indices.clone()) + } else { + false + } { __found = true; break; } } __found }; +(from_fallback || from_ops) +} } -pub fn service_has_rest_auth( - fallback_transport: &Rc, - op_children: Rc>>, - source_indices: &Rc>>, -) -> bool { +pub fn service_has_rest_auth(fallback_transport: &Rc, op_children: Rc>>, source_indices: &Rc>>) -> bool { { - let fallback_is_rest = - is_rest_transport(fallback_transport.clone(), source_indices.clone()); - let from_fallback = if fallback_is_rest { + let fallback_is_rest = is_rest_transport(fallback_transport.clone(), source_indices.clone()); +let from_fallback = if fallback_is_rest { transport_has_auth(fallback_transport.clone(), source_indices.clone()) } else { false }; - let from_ops = { - let mut __found = false; - for op in op_children.iter().cloned() { - if if (op.transport.clone() != None) { - { - let t = op.transport.clone().clone().unwrap(); - if is_rest_transport(t.clone(), source_indices.clone()) { - transport_has_auth(t.clone(), source_indices.clone()) - } else { - false - } - } +let from_ops = { let mut __found = false; for op in op_children.iter().cloned() { if if (op.transport.clone() != None) { + { + let t = op.transport.clone().clone().unwrap(); +if is_rest_transport(t.clone(), source_indices.clone()) { + transport_has_auth(t.clone(), source_indices.clone()) } else { false - } { - __found = true; - break; } - } - __found - }; - (from_fallback || from_ops) - } +} + } else { + false + } { __found = true; break; } } __found }; +(from_fallback || from_ops) +} } -pub fn extract_modifier_names( - properties: Rc>>, - source_indices: Rc>>, -) -> Rc> { - Rc::new({ - let mut __result = Vec::new(); - for p in properties.iter().cloned() { - __result.extend( - (*match field_init_operation_modifier(p.clone(), source_indices.clone()) { - Some(modifier) => Rc::new(vec![operation_modifier_name(modifier.clone())]), - None => Rc::new(vec![]), - }) - .iter() - .cloned(), - ); - } - __result - }) +pub fn extract_modifier_names(properties: Rc>>, source_indices: Rc>>) -> Rc> { + Rc::new({ let mut __result = Vec::new(); for p in properties.iter().cloned() { __result.extend((*match field_init_operation_modifier(p.clone(), source_indices.clone()) { + Some(modifier) => Rc::new(vec![operation_modifier_name(modifier.clone())]), + None => Rc::new(vec![]), +}).iter().cloned()); } __result }) } #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] @@ -2393,93 +1262,70 @@ pub struct ServiceFieldSet { pub has_auth: bool, } -pub fn compute_service_fields( - fallback_transport: &Rc, - op_children: &Rc>>, - source_indices: &Rc>>, -) -> ServiceFieldSet { +pub fn compute_service_fields(fallback_transport: &Rc, op_children: &Rc>>, source_indices: &Rc>>) -> ServiceFieldSet { ServiceFieldSet { - has_rest: service_has_rest( - fallback_transport.clone(), - op_children.clone(), - &source_indices, - ), - has_shell: service_has_shell(fallback_transport.clone(), op_children.clone()), - has_file: service_has_file( - fallback_transport.clone(), - op_children.clone(), - &source_indices, - ), - has_auth: service_has_rest_auth(&fallback_transport, op_children.clone(), &source_indices), - } + has_rest: service_has_rest(fallback_transport.clone(), op_children.clone(), &source_indices), + has_shell: service_has_shell(fallback_transport.clone(), op_children.clone()), + has_file: service_has_file(fallback_transport.clone(), op_children.clone(), &source_indices), + has_auth: service_has_rest_auth(&fallback_transport, op_children.clone(), &source_indices), +} } pub fn service_field_decls(fs: &ServiceFieldSet, t: &Rc) -> Rc> { { let result = Rc::new(vec![]); - let result = if fs.has_rest.clone() { +let result = if fs.has_rest.clone() { v2_rt::concat(result.clone(), Rc::new(vec![t.rest_decl.clone()])) } else { result.clone() }; - let result = if fs.has_auth.clone() { +let result = if fs.has_auth.clone() { v2_rt::concat(result.clone(), Rc::new(vec![t.auth_decl.clone()])) } else { result.clone() }; - let result = if fs.has_shell.clone() { +let result = if fs.has_shell.clone() { v2_rt::concat(result.clone(), Rc::new(vec![t.shell_decl.clone()])) } else { result.clone() }; - let result = if fs.has_file.clone() { +let result = if fs.has_file.clone() { v2_rt::concat(result.clone(), Rc::new(vec![t.file_decl.clone()])) } else { result.clone() }; - result.clone() - } +result.clone() +} } pub fn service_field_ctors(fs: &ServiceFieldSet, t: &Rc) -> Rc> { { let result = Rc::new(vec![]); - let result = if fs.has_rest.clone() { +let result = if fs.has_rest.clone() { v2_rt::concat(result.clone(), Rc::new(vec![t.rest_ctor.clone()])) } else { result.clone() }; - let result = if fs.has_auth.clone() { +let result = if fs.has_auth.clone() { v2_rt::concat(result.clone(), Rc::new(vec![t.auth_ctor.clone()])) } else { result.clone() }; - let result = if fs.has_shell.clone() { +let result = if fs.has_shell.clone() { v2_rt::concat(result.clone(), Rc::new(vec![t.shell_ctor.clone()])) } else { result.clone() }; - let result = if fs.has_file.clone() { +let result = if fs.has_file.clone() { v2_rt::concat(result.clone(), Rc::new(vec![t.file_ctor.clone()])) } else { result.clone() }; - result.clone() - } +result.clone() +} } -pub fn emit_unified_transport_dispatch( - transport: &Rc, - op_name: String, - source_indices: &Rc>>, - depth: i64, - target: RenderTarget, - render_rest: impl Fn(String, Rc, i64, Rc>>) -> String + Clone, - render_shell: impl Fn(String, Rc, i64, Rc>>) -> String - + Clone, - render_file: impl Fn(String, i64) -> String + Clone, - render_local: impl Fn(String, i64) -> String + Clone, -) -> String { +pub fn emit_unified_transport_dispatch(transport: &Rc, op_name: String, source_indices: &Rc>>, depth: i64, target: RenderTarget, render_rest: impl Fn(String, Rc, i64, Rc>>) -> String + Clone, render_shell: impl Fn(String, Rc, i64, Rc>>) -> String + Clone, render_file: impl Fn(String, i64) -> String + Clone, render_local: impl Fn(String, i64) -> String + Clone) -> String { if is_rest_transport(transport.clone(), source_indices.clone()) { render_rest(op_name, transport.clone(), depth, source_indices.clone()) } else { @@ -2499,167 +1345,56 @@ pub fn emit_unified_transport_dispatch( } } -pub fn emit_unified_operation_method( - service_name: String, - fallback_transport: Rc, - op_node: &Rc, - target: &RenderTarget, - registry: Rc>>, - env: &Rc, - render_transport_body: impl Fn(Rc, String, Rc>>, i64) -> String - + Clone, -) -> String { +pub fn emit_unified_operation_method(service_name: String, fallback_transport: Rc, op_node: &Rc, target: &RenderTarget, registry: Rc>>, env: &Rc, render_transport_body: impl Fn(Rc, String, Rc>>, i64) -> String + Clone) -> String { { let spec = language_spec(target.clone()); - let si = env.source_indices.clone(); - let op_text = authored_name(env.clone(), op_node.clone()); - let params_str = emit_params_shared(op_node.params.clone(), &target, si.clone()); - let sp = service_self_param(spec.clone()); - let all_params = if (sp.clone().as_str() == "".to_string().as_str()) { +let si = env.source_indices.clone(); +let op_text = authored_name(env.clone(), op_node.clone()); +let params_str = emit_params_shared(op_node.params.clone(), &target, si.clone()); +let sp = service_self_param(spec.clone()); +let all_params = if (sp.clone().as_str() == "".to_string().as_str()) { params_str.clone() } else { if (params_str.clone().as_str() == "".to_string().as_str()) { sp.clone() } else { - v2_rt::concat( - v2_rt::concat(sp.clone(), ", ".to_string()), - params_str.clone(), - ) + v2_rt::concat(v2_rt::concat(sp.clone(), ", ".to_string()), params_str.clone()) } }; - let receiver_str = service_receiver_str(spec.clone(), service_name); - let method_depth = service_method_depth(spec.clone()); - let ret_type = emit_node_type(resolved_type(op_node.clone()), target.clone(), si.clone()); - let ret_str = service_return_str(&spec, ret_type); - let method_name = match (*spec.visibility.clone()).clone() { - VisibilitySpec::CaseVisibility { .. } => emit_export_ident(op_text.clone(), &target), - _ => emit_ident(op_text.clone(), target.clone()), - }; - let eff_transport = effective_operation_transport(op_node.clone(), fallback_transport); - let body = render_transport_body( - eff_transport, - op_text.clone(), - si.clone(), - (method_depth.clone() + 1), - ); - let sig = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - spec.items.clone().async_prefix.clone(), - spec.items.clone().func_keyword.clone(), - ), - " ".to_string(), - ), - receiver_str, - ), - method_name, - ), - "(".to_string(), - ), - all_params, - ), - ")".to_string(), - ), - ret_str, - ); - if spec.block_syntax.clone().significant_whitespace.clone() { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(sig, spec.block_syntax.clone().block_open.clone()), - make_indent((method_depth.clone() + 1)), - ), - body, - ) +let receiver_str = service_receiver_str(spec.clone(), service_name); +let method_depth = service_method_depth(spec.clone()); +let ret_type = emit_node_type(resolved_type(op_node.clone()), target.clone(), si.clone()); +let ret_str = service_return_str(&spec, ret_type); +let method_name = match (*spec.visibility.clone()).clone() { + VisibilitySpec::CaseVisibility { .. } => emit_export_ident(op_text.clone(), &target), + _ => emit_ident(op_text.clone(), target.clone()), +}; +let eff_transport = effective_operation_transport(op_node.clone(), fallback_transport); +let body = render_transport_body(eff_transport, op_text.clone(), si.clone(), (method_depth.clone() + 1)); +let sig = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(spec.items.clone().async_prefix.clone(), spec.items.clone().func_keyword.clone()), " ".to_string()), receiver_str), method_name), "(".to_string()), all_params), ")".to_string()), ret_str); +if spec.block_syntax.clone().significant_whitespace.clone() { + v2_rt::concat(v2_rt::concat(v2_rt::concat(sig, spec.block_syntax.clone().block_open.clone()), make_indent((method_depth.clone() + 1))), body) } else { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(sig, spec.block_syntax.clone().block_open.clone()), - body, - ), - "\n".to_string(), - ), - make_indent(method_depth.clone()), - ), - spec.block_syntax.clone().block_close.clone(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(sig, spec.block_syntax.clone().block_open.clone()), body), "\n".to_string()), make_indent(method_depth.clone())), spec.block_syntax.clone().block_close.clone()) } - } +} } -pub fn emit_unified_service_def( - item: &Rc, - target: &RenderTarget, - registry: Rc>>, - env: &Rc, - render_service_fields: impl Fn(String, Rc, Rc>>, Rc>>) -> String - + Clone, - render_transport_body: impl Fn(Rc, String, Rc>>, i64) -> String - + Clone, -) -> String { +pub fn emit_unified_service_def(item: &Rc, target: &RenderTarget, registry: Rc>>, env: &Rc, render_service_fields: impl Fn(String, Rc, Rc>>, Rc>>) -> String + Clone, render_transport_body: impl Fn(Rc, String, Rc>>, i64) -> String + Clone) -> String { { let spec = language_spec(target.clone()); - let safe_name = sanitize_service_name(authored_name(env.clone(), item.clone())); - let transport = service_fallback_transport(&item); - let op_children = item.children.clone(); - let fields_str = render_service_fields( - safe_name.clone(), - transport.clone(), - op_children.clone(), - env.source_indices.clone(), - ); - let methods = Rc::new({ - let mut __result = Vec::new(); - for op_node in op_children.clone().iter().cloned() { - __result.push(emit_unified_operation_method( - safe_name.clone(), - transport.clone(), - &op_node, - &target, - registry.clone(), - &env, - render_transport_body.clone(), - )); - } - __result - }); - let methods_str = methods.join(&"\n\n".to_string()); - if service_methods_inside_class(spec.clone()) { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - spec.items.clone().struct_keyword.clone(), - " ".to_string(), - ), - safe_name.clone(), - ), - ":\n".to_string(), - ), - make_indent(1), - ), - fields_str, - ), - "\n\n".to_string(), - ), - make_indent(1), - ), - methods_str, - ) +let safe_name = sanitize_service_name(authored_name(env.clone(), item.clone())); +let transport = service_fallback_transport(&item); +let op_children = item.children.clone(); +let fields_str = render_service_fields(safe_name.clone(), transport.clone(), op_children.clone(), env.source_indices.clone()); +let methods = Rc::new({ let mut __result = Vec::new(); for op_node in op_children.clone().iter().cloned() { __result.push(emit_unified_operation_method(safe_name.clone(), transport.clone(), &op_node, &target, registry.clone(), &env, render_transport_body.clone())); } __result }); +let methods_str = methods.join(&"\n\n".to_string()); +if service_methods_inside_class(spec.clone()) { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(spec.items.clone().struct_keyword.clone(), " ".to_string()), safe_name.clone()), ":\n".to_string()), make_indent(1)), fields_str), "\n\n".to_string()), make_indent(1)), methods_str) } else { v2_rt::concat(v2_rt::concat(fields_str, "\n\n".to_string()), methods_str) } - } +} } pub fn is_type_def_item(item: &Rc) -> bool { @@ -2667,29 +1402,15 @@ pub fn is_type_def_item(item: &Rc) -> bool { } pub fn is_bare_leaf_item(item: &Rc) -> bool { - (((((item.connective.clone() == Connective::NoConnective) && (item.body.clone() == None)) - && ((item.params.clone().len() as i64) == 0)) - && (item.transport.clone() == None)) - && ((item.children.clone().len() as i64) == 0)) + (((((item.connective.clone() == Connective::NoConnective) && (item.body.clone() == None)) && ((item.params.clone().len() as i64) == 0)) && (item.transport.clone() == None)) && ((item.children.clone().len() as i64) == 0)) } -pub fn is_type_alias_item( - item: &Rc, - source_indices: Rc>>, -) -> bool { - (is_bare_leaf_item(&item) - && is_type_alias_return_node(resolved_type(item.clone()), source_indices)) +pub fn is_type_alias_item(item: &Rc, source_indices: Rc>>) -> bool { + (is_bare_leaf_item(&item) && is_type_alias_return_node(resolved_type(item.clone()), source_indices)) } -pub fn is_type_decl_item( - item: &Rc, - source_indices: Rc>>, -) -> bool { - ((is_bare_leaf_item(&item) - && !is_type_alias_return_node(resolved_type(item.clone()), source_indices)) - || (((((item.params.clone().len() as i64) > 0) && (item.body.clone() == None)) - && (item.transport.clone() == None)) - && ((item.children.clone().len() as i64) == 0))) +pub fn is_type_decl_item(item: &Rc, source_indices: Rc>>) -> bool { + ((is_bare_leaf_item(&item) && !is_type_alias_return_node(resolved_type(item.clone()), source_indices)) || (((((item.params.clone().len() as i64) > 0) && (item.body.clone() == None)) && (item.transport.clone() == None)) && ((item.children.clone().len() as i64) == 0))) } pub fn is_function_item(item: &Rc) -> bool { @@ -2705,10 +1426,7 @@ pub fn is_service_def_item(item: &Rc) -> bool { } pub fn is_resource_def_item(item: &Rc) -> bool { - (((item.transport.clone() == None) && ((item.children.clone().len() as i64) > 0)) - || ((((item.transport.clone() == None) && ((item.children.clone().len() as i64) == 0)) - && ((item.properties.clone().len() as i64) > 0)) - && (item.body.clone() == None))) + (((item.transport.clone() == None) && ((item.children.clone().len() as i64) > 0)) || ((((item.transport.clone() == None) && ((item.children.clone().len() as i64) == 0)) && ((item.properties.clone().len() as i64) > 0)) && (item.body.clone() == None))) } #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] @@ -2724,30 +1442,30 @@ pub enum ExprCategory { pub fn classify_expr(texpr: Rc) -> ExprCategory { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprLiteral { .. } => ExprCategory::ExprCatLeaf, - ExprData::ExprError { .. } => ExprCategory::ExprCatLeaf, - ExprData::ExprVar { .. } => ExprCategory::ExprCatLeaf, - ExprData::ExprFieldAccess { .. } => ExprCategory::ExprCatCompound, - ExprData::ExprCall { .. } => ExprCategory::ExprCatCompound, - ExprData::ExprMethodCall { .. } => ExprCategory::ExprCatCompound, - ExprData::ExprRecordLit { .. } => ExprCategory::ExprCatCompound, - ExprData::ExprListLit => ExprCategory::ExprCatCompound, - ExprData::ExprBinOp { .. } => ExprCategory::ExprCatCompound, - ExprData::ExprUnaryOp { .. } => ExprCategory::ExprCatCompound, - ExprData::ExprLambda => ExprCategory::ExprCatCompound, - ExprData::ExprStringInterp => ExprCategory::ExprCatCompound, - ExprData::ExprCast => ExprCategory::ExprCatCompound, - ExprData::ExprIndex => ExprCategory::ExprCatCompound, - ExprData::ExprSlice => ExprCategory::ExprCatCompound, - ExprData::ExprMatch => ExprCategory::ExprCatControlFlow, - ExprData::ExprIf => ExprCategory::ExprCatControlFlow, - ExprData::ExprForEach => ExprCategory::ExprCatControlFlow, - ExprData::ExprBlock => ExprCategory::ExprCatControlFlow, - ExprData::ExprLet => ExprCategory::ExprCatBinding, - ExprData::ExprReturn => ExprCategory::ExprCatControlFlow, - ExprData::NoExprData => ExprCategory::ExprCatNone, - _ => ExprCategory::ExprCatNone, - } + ExprData::ExprLiteral { .. } => ExprCategory::ExprCatLeaf, + ExprData::ExprError { .. } => ExprCategory::ExprCatLeaf, + ExprData::ExprVar { .. } => ExprCategory::ExprCatLeaf, + ExprData::ExprFieldAccess { .. } => ExprCategory::ExprCatCompound, + ExprData::ExprCall { .. } => ExprCategory::ExprCatCompound, + ExprData::ExprMethodCall { .. } => ExprCategory::ExprCatCompound, + ExprData::ExprRecordLit { .. } => ExprCategory::ExprCatCompound, + ExprData::ExprListLit => ExprCategory::ExprCatCompound, + ExprData::ExprBinOp { .. } => ExprCategory::ExprCatCompound, + ExprData::ExprUnaryOp { .. } => ExprCategory::ExprCatCompound, + ExprData::ExprLambda => ExprCategory::ExprCatCompound, + ExprData::ExprStringInterp => ExprCategory::ExprCatCompound, + ExprData::ExprCast => ExprCategory::ExprCatCompound, + ExprData::ExprIndex => ExprCategory::ExprCatCompound, + ExprData::ExprSlice => ExprCategory::ExprCatCompound, + ExprData::ExprMatch => ExprCategory::ExprCatControlFlow, + ExprData::ExprIf => ExprCategory::ExprCatControlFlow, + ExprData::ExprForEach => ExprCategory::ExprCatControlFlow, + ExprData::ExprBlock => ExprCategory::ExprCatControlFlow, + ExprData::ExprLet => ExprCategory::ExprCatBinding, + ExprData::ExprReturn => ExprCategory::ExprCatControlFlow, + ExprData::NoExprData => ExprCategory::ExprCatNone, + _ => ExprCategory::ExprCatNone, +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -2766,26 +1484,25 @@ pub enum FuncBodyShape { }, } -pub fn classify_func_body( - body: &Rc, - source_indices: Rc>>, -) -> Rc { +pub fn classify_func_body(body: &Rc, source_indices: Rc>>) -> Rc { match (*body.expr_data.clone()).clone() { - ExprData::ExprLet => { - let n = let_binding_name_at(body.clone(), source_indices); - let v = let_value(body.clone()); - let rest = let_body(body.clone()); - Rc::new(FuncBodyShape::FuncBodyLet { - name: n, - value: v, - rest: rest, - }) - } - ExprData::ExprBlock => Rc::new(FuncBodyShape::FuncBodyBlock { - stmts: body.children.clone(), - }), - _ => Rc::new(FuncBodyShape::FuncBodyExpr { expr: body.clone() }), - } + ExprData::ExprLet => { + let n = let_binding_name_at(body.clone(), source_indices); +let v = let_value(body.clone()); +let rest = let_body(body.clone()); +Rc::new(FuncBodyShape::FuncBodyLet { + name: n, + value: v, + rest: rest, +}) +}, + ExprData::ExprBlock => Rc::new(FuncBodyShape::FuncBodyBlock { + stmts: body.children.clone(), +}), + _ => Rc::new(FuncBodyShape::FuncBodyExpr { + expr: body.clone(), +}), +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -2817,1258 +1534,446 @@ pub enum TcoExprShape { }, } -pub fn classify_tco_expr( - texpr: &Rc, - source_indices: Rc>>, -) -> Rc { +pub fn classify_tco_expr(texpr: &Rc, source_indices: Rc>>) -> Rc { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => Rc::new(TcoExprShape::TcoCall { - func: expr_call_func_at(texpr.clone(), source_indices), - args: texpr.children.clone(), - }), - ExprData::ExprIf => { - let c = if_condition(texpr.clone()); - let t = if_then_branch(texpr.clone()); - let e = if_else_branch(texpr.clone()); - Rc::new(TcoExprShape::TcoIf { - condition: c, - then_branch: t, - else_branch: e, - }) - } - ExprData::ExprMatch => { - let scrut = match_scrutinee(texpr.clone()); - let arm_list = match_arm_nodes(texpr.clone()); - Rc::new(TcoExprShape::TcoMatch { - scrutinee: scrut, - arms: arm_list, - }) - } - ExprData::ExprLet => { - let n = let_binding_name_at(texpr.clone(), source_indices); - let v = let_value(texpr.clone()); - let bd = let_body(texpr.clone()); - Rc::new(TcoExprShape::TcoLet { - name: n, - value: v, - body: bd, - }) - } - ExprData::ExprBlock => Rc::new(TcoExprShape::TcoBlock { - stmts: texpr.children.clone(), - }), - _ => Rc::new(TcoExprShape::TcoOther { - expr: texpr.clone(), - }), - } + ExprData::ExprCall { .. } => Rc::new(TcoExprShape::TcoCall { + func: expr_call_func_at(texpr.clone(), source_indices), + args: texpr.children.clone(), +}), + ExprData::ExprIf => { + let c = if_condition(texpr.clone()); +let t = if_then_branch(texpr.clone()); +let e = if_else_branch(texpr.clone()); +Rc::new(TcoExprShape::TcoIf { + condition: c, + then_branch: t, + else_branch: e, +}) +}, + ExprData::ExprMatch => { + let scrut = match_scrutinee(texpr.clone()); +let arm_list = match_arm_nodes(texpr.clone()); +Rc::new(TcoExprShape::TcoMatch { + scrutinee: scrut, + arms: arm_list, +}) +}, + ExprData::ExprLet => { + let n = let_binding_name_at(texpr.clone(), source_indices); +let v = let_value(texpr.clone()); +let bd = let_body(texpr.clone()); +Rc::new(TcoExprShape::TcoLet { + name: n, + value: v, + body: bd, +}) +}, + ExprData::ExprBlock => Rc::new(TcoExprShape::TcoBlock { + stmts: texpr.children.clone(), +}), + _ => Rc::new(TcoExprShape::TcoOther { + expr: texpr.clone(), +}), +} } pub fn block_stmts_init(stmts: &Rc>>) -> Rc>> { if ((stmts.clone().len() as i64) <= 1) { Rc::new(vec![]) } else { - Rc::new( - stmts - .clone() - .iter() - .cloned() - .take(((stmts.clone().len() as i64) - 1) as usize) - .collect::>(), - ) + Rc::new(stmts.clone().iter().cloned().take(((stmts.clone().len() as i64) - 1) as usize).collect::>()) } } -pub fn is_tco_eligible( - name: &String, - body: &Rc, - registry: Rc>>, - source_indices: &Rc>>, -) -> bool { +pub fn is_tco_eligible(name: &String, body: &Rc, registry: Rc>>, source_indices: &Rc>>) -> bool { match lookup_item(registry, name.clone()) { - Some(info) => { - (info.is_self_recursive.clone() && (info.has_non_tail_self_call.clone() == false)) - } - None => { - (expr_has_self_call(&body, &name, &source_indices) - && (expr_has_non_tail_self_call(&body, &name, true, &source_indices) == false)) - } - } + Some(info) => (info.is_self_recursive.clone() && (info.has_non_tail_self_call.clone() == false)), + None => (expr_has_self_call(&body, &name, &source_indices) && (expr_has_non_tail_self_call(&body, &name, true, &source_indices) == false)), +} } -pub fn is_self_recursive( - name: &String, - body: Rc, - registry: Rc>>, - source_indices: Rc>>, -) -> bool { +pub fn is_self_recursive(name: &String, body: Rc, registry: Rc>>, source_indices: Rc>>) -> bool { match lookup_item(registry, name.clone()) { - Some(info) => info.is_self_recursive.clone(), - None => expr_has_self_call(&body, &name, &source_indices), - } + Some(info) => info.is_self_recursive.clone(), + None => expr_has_self_call(&body, &name, &source_indices), +} } -pub fn tco_reassign_core( - ordered_args: Rc>, - param_names: Rc>, - temp_var_prefix: String, - temp_decl_prefix: String, - temp_assign_op: String, - stmt_terminator: String, - continue_str: String, - line_prefix: &String, -) -> Rc> { +pub fn tco_reassign_core(ordered_args: Rc>, param_names: Rc>, temp_var_prefix: String, temp_decl_prefix: String, temp_assign_op: String, stmt_terminator: String, continue_str: String, line_prefix: &String) -> Rc> { { - let temp_lets = Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - ordered_args - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - __result.push(v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(line_prefix.clone(), temp_decl_prefix.clone()), - temp_var_prefix.clone(), - ), - (pair.0.clone()).to_string(), - ), - temp_assign_op.clone(), - ), - pair.1.clone(), - ), - stmt_terminator.clone(), - )); - } - __result - }); - let assigns = Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - param_names - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - __result.push(v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(line_prefix.clone(), pair.1.clone()), - " = ".to_string(), - ), - temp_var_prefix.clone(), - ), - (pair.0.clone()).to_string(), - ), - stmt_terminator.clone(), - )); - } - __result - }); - v2_rt::concat( - v2_rt::concat(temp_lets, assigns), - Rc::new(vec![v2_rt::concat(line_prefix.clone(), continue_str)]), - ) - } + let temp_lets = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(ordered_args.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(line_prefix.clone(), temp_decl_prefix.clone()), temp_var_prefix.clone()), (pair.0.clone()).to_string()), temp_assign_op.clone()), pair.1.clone()), stmt_terminator.clone())); } __result }); +let assigns = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(param_names.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(line_prefix.clone(), pair.1.clone()), " = ".to_string()), temp_var_prefix.clone()), (pair.0.clone()).to_string()), stmt_terminator.clone())); } __result }); +v2_rt::concat(v2_rt::concat(temp_lets, assigns), Rc::new(vec![v2_rt::concat(line_prefix.clone(), continue_str)])) +} } -pub fn emit_shared_tco_expr( - mut frame: Rc, - mut fn_name: String, - mut emit_self_call_reassign: impl Fn(Rc) -> String + Clone, - mut emit_non_self_call: impl Fn(Rc) -> String + Clone, - mut emit_if: impl Fn(Rc) -> String + Clone, - mut emit_match: impl Fn(Rc) -> String + Clone, - mut emit_let: impl Fn(Rc) -> String + Clone, - mut emit_block: impl Fn(Rc) -> String + Clone, - mut emit_default_return: impl Fn(Rc) -> String + Clone, -) -> String { +pub fn emit_shared_tco_expr(mut frame: Rc, mut fn_name: String, mut emit_self_call_reassign: impl Fn(Rc) -> String + Clone, mut emit_non_self_call: impl Fn(Rc) -> String + Clone, mut emit_if: impl Fn(Rc) -> String + Clone, mut emit_match: impl Fn(Rc) -> String + Clone, mut emit_let: impl Fn(Rc) -> String + Clone, mut emit_block: impl Fn(Rc) -> String + Clone, mut emit_default_return: impl Fn(Rc) -> String + Clone) -> String { loop { let si = frame.scope.clone().type_env.clone().source_indices.clone(); - match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - if (expr_call_func_at(frame.expr.clone(), si).as_str() == fn_name.as_str()) { - break emit_self_call_reassign(Rc::new(TcoReassignInput { - args: frame.expr.clone().children.clone(), - scope: frame.scope.clone(), - depth: frame.depth.clone(), - })); - } else { - break emit_non_self_call(frame.clone()); - } - } - ExprData::ExprReturn => { - let inner = return_value(frame.expr.clone()); - { - let __tco_0 = Rc::new(TcoFrame { - expr: inner, - scope: frame.scope.clone(), - depth: frame.depth.clone(), - }); - frame = __tco_0; - continue; - } - } - ExprData::ExprIf => { - break emit_if(frame.clone()); - } - ExprData::ExprMatch => { - break emit_match(frame.clone()); - } - ExprData::ExprLet => { - break emit_let(frame.clone()); - } - ExprData::ExprBlock => { - break emit_block(frame.clone()); - } - _ => { - break emit_default_return(frame.clone()); - } - } - } +match (*frame.expr.clone().expr_data.clone()).clone() { + ExprData::ExprCall { .. } => { if (expr_call_func_at(frame.expr.clone(), si).as_str() == fn_name.as_str()) { + break emit_self_call_reassign(Rc::new(TcoReassignInput { + args: frame.expr.clone().children.clone(), + scope: frame.scope.clone(), + depth: frame.depth.clone(), +})); +} else { + break emit_non_self_call(frame.clone()); +} }, + ExprData::ExprReturn => { let inner = return_value(frame.expr.clone()); +{ + let __tco_0 = Rc::new(TcoFrame { + expr: inner, + scope: frame.scope.clone(), + depth: frame.depth.clone(), +}); +frame = __tco_0; +continue; +} }, + ExprData::ExprIf => { break emit_if(frame.clone()); }, + ExprData::ExprMatch => { break emit_match(frame.clone()); }, + ExprData::ExprLet => { break emit_let(frame.clone()); }, + ExprData::ExprBlock => { break emit_block(frame.clone()); }, + _ => { break emit_default_return(frame.clone()); }, +} +} } pub fn shared_tco_body(inner: String, depth: i64, spec: &Rc) -> String { { let syntax = spec.block_syntax.clone(); - let tco = spec.tco.clone(); - if syntax.significant_whitespace.clone() { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(tco.loop_keyword.clone(), syntax.block_open.clone()), - make_indent((depth + 1)), - ), - inner, - ) +let tco = spec.tco.clone(); +if syntax.significant_whitespace.clone() { + v2_rt::concat(v2_rt::concat(v2_rt::concat(tco.loop_keyword.clone(), syntax.block_open.clone()), make_indent((depth + 1))), inner) } else { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(tco.loop_keyword.clone(), syntax.block_open.clone()), - make_indent((depth + 1)), - ), - inner, - ), - "\n".to_string(), - ), - syntax.block_close.clone(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(tco.loop_keyword.clone(), syntax.block_open.clone()), make_indent((depth + 1))), inner), "\n".to_string()), syntax.block_close.clone()) } - } +} } -pub fn shared_tco_default_return( - frame: &Rc, - spec: Rc, - recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, -) -> String { +pub fn shared_tco_default_return(frame: &Rc, spec: Rc, recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone) -> String { { let val_str = recurse_expr(frame.expr.clone(), frame.scope.clone(), frame.depth.clone()); - v2_rt::concat( - v2_rt::concat(spec.tco.clone().break_return.clone(), " ".to_string()), - val_str, - ) - } +v2_rt::concat(v2_rt::concat(spec.tco.clone().break_return.clone(), " ".to_string()), val_str) +} } -pub fn shared_tco_non_self_call( - frame: &Rc, - target: RenderTarget, - spec: Rc, - recurse_call: impl Fn(String, Rc>>, Rc, i64) -> String + Clone, -) -> String { +pub fn shared_tco_non_self_call(frame: &Rc, target: RenderTarget, spec: Rc, recurse_call: impl Fn(String, Rc>>, Rc, i64) -> String + Clone) -> String { match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let f = expr_call_func_at( - frame.expr.clone(), - frame.scope.clone().type_env.clone().source_indices.clone(), - ); - let call_str = recurse_call( - f, - frame.expr.clone().children.clone(), - frame.scope.clone(), - frame.depth.clone(), - ); - v2_rt::concat( - v2_rt::concat(spec.tco.clone().break_return.clone(), " ".to_string()), - call_str, - ) - } - _ => emit_error_expr( - "shared_tco_non_self_call expected ExprCall".to_string(), - target, - ), - } + ExprData::ExprCall { .. } => { + let f = expr_call_func_at(frame.expr.clone(), frame.scope.clone().type_env.clone().source_indices.clone()); +let call_str = recurse_call(f, frame.expr.clone().children.clone(), frame.scope.clone(), frame.depth.clone()); +v2_rt::concat(v2_rt::concat(spec.tco.clone().break_return.clone(), " ".to_string()), call_str) +}, + _ => emit_error_expr("shared_tco_non_self_call expected ExprCall".to_string(), target), +} } -pub fn shared_tco_if( - frame: &Rc, - fn_name: String, - params: Rc>>, - target: RenderTarget, - spec: Rc, - recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, - recurse_tco: impl Fn(Rc, Rc, i64) -> String + Clone, -) -> String { +pub fn shared_tco_if(frame: &Rc, fn_name: String, params: Rc>>, target: RenderTarget, spec: Rc, recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, recurse_tco: impl Fn(Rc, Rc, i64) -> String + Clone) -> String { { let syntax = spec.block_syntax.clone(); - match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprIf => { - let c = if_condition(frame.expr.clone()); - let t = if_then_branch(frame.expr.clone()); - let e = if_else_branch(frame.expr.clone()); - let cond_str = recurse_expr(c, frame.scope.clone(), frame.depth.clone()); - let then_str = recurse_tco(t, frame.scope.clone(), (frame.depth.clone() + 1)); - let else_prefix = if syntax.significant_whitespace.clone() { - make_indent(frame.depth.clone()) +match (*frame.expr.clone().expr_data.clone()).clone() { + ExprData::ExprIf => { + let c = if_condition(frame.expr.clone()); +let t = if_then_branch(frame.expr.clone()); +let e = if_else_branch(frame.expr.clone()); +let cond_str = recurse_expr(c, frame.scope.clone(), frame.depth.clone()); +let then_str = recurse_tco(t, frame.scope.clone(), (frame.depth.clone() + 1)); +let else_prefix = if syntax.significant_whitespace.clone() { + make_indent(frame.depth.clone()) + } else { + "".to_string() + }; +match e { + Some(eb) => { + let else_str = recurse_tco(eb.clone(), frame.scope.clone(), (frame.depth.clone() + 1)); +if syntax.significant_whitespace.clone() { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("if ".to_string(), cond_str), syntax.block_open.clone()), make_indent((frame.depth.clone() + 1))), then_str), "\n".to_string()), else_prefix), syntax.else_clause.clone()), make_indent((frame.depth.clone() + 1))), else_str) } else { - "".to_string() - }; - match e { - Some(eb) => { - let else_str = - recurse_tco(eb.clone(), frame.scope.clone(), (frame.depth.clone() + 1)); - if syntax.significant_whitespace.clone() { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "if ".to_string(), - cond_str, - ), - syntax.block_open.clone(), - ), - make_indent((frame.depth.clone() + 1)), - ), - then_str, - ), - "\n".to_string(), - ), - else_prefix, - ), - syntax.else_clause.clone(), - ), - make_indent((frame.depth.clone() + 1)), - ), - else_str, - ) - } else { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "if ".to_string(), - cond_str, - ), - syntax.block_open.clone(), - ), - make_indent((frame.depth.clone() + 1)), - ), - then_str, - ), - "\n".to_string(), - ), - syntax.else_clause.clone(), - ), - make_indent((frame.depth.clone() + 1)), - ), - else_str, - ), - "\n".to_string(), - ), - syntax.block_close.clone(), - ) - } - } - None => { - if syntax.significant_whitespace.clone() { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("if ".to_string(), cond_str), - syntax.block_open.clone(), - ), - make_indent((frame.depth.clone() + 1)), - ), - then_str, - ) - } else { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("if ".to_string(), cond_str), - syntax.block_open.clone(), - ), - make_indent((frame.depth.clone() + 1)), - ), - then_str, - ), - "\n".to_string(), - ), - syntax.block_close.clone(), - ) - } - } + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("if ".to_string(), cond_str), syntax.block_open.clone()), make_indent((frame.depth.clone() + 1))), then_str), "\n".to_string()), syntax.else_clause.clone()), make_indent((frame.depth.clone() + 1))), else_str), "\n".to_string()), syntax.block_close.clone()) } - } - _ => emit_error_expr("shared_tco_if expected ExprIf".to_string(), target), - } - } +}, + None => if syntax.significant_whitespace.clone() { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("if ".to_string(), cond_str), syntax.block_open.clone()), make_indent((frame.depth.clone() + 1))), then_str) + } else { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("if ".to_string(), cond_str), syntax.block_open.clone()), make_indent((frame.depth.clone() + 1))), then_str), "\n".to_string()), syntax.block_close.clone()) + }, +} +}, + _ => emit_error_expr("shared_tco_if expected ExprIf".to_string(), target), +} +} } -pub fn shared_tco_let( - frame: &Rc, - fn_name: String, - params: Rc>>, - target: RenderTarget, - recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, - recurse_tco: impl Fn(Rc, Rc, i64) -> String + Clone, -) -> String { +pub fn shared_tco_let(frame: &Rc, fn_name: String, params: Rc>>, target: RenderTarget, recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, recurse_tco: impl Fn(Rc, Rc, i64) -> String + Clone) -> String { match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprLet => { - let n = let_binding_name_at( - frame.expr.clone(), - frame.scope.clone().type_env.clone().source_indices.clone(), - ); - let v = let_value(frame.expr.clone()); - let bd = let_body(frame.expr.clone()); - let val_str = recurse_expr(v.clone(), frame.scope.clone(), frame.depth.clone()); - let let_line = emit_let_binding(n.clone(), val_str, &target); - let next_scope = extend_scope( - &frame.scope.clone(), - &n, - resolved_type(v.clone()), - Rc::new(SubValueRelation::SubValueUnknown), - ); - match bd { - Some(b) => v2_rt::concat( - v2_rt::concat(let_line, "\n".to_string()), - recurse_tco(b.clone(), next_scope, frame.depth.clone()), - ), - None => let_line, - } - } - _ => emit_error_expr("shared_tco_let expected ExprLet".to_string(), target), - } + ExprData::ExprLet => { + let n = let_binding_name_at(frame.expr.clone(), frame.scope.clone().type_env.clone().source_indices.clone()); +let v = let_value(frame.expr.clone()); +let bd = let_body(frame.expr.clone()); +let val_str = recurse_expr(v.clone(), frame.scope.clone(), frame.depth.clone()); +let let_line = emit_let_binding(n.clone(), val_str, &target); +let next_scope = extend_scope(&frame.scope.clone(), &n, resolved_type(v.clone()), Rc::new(SubValueRelation::SubValueUnknown)); +match bd { + Some(b) => v2_rt::concat(v2_rt::concat(let_line, "\n".to_string()), recurse_tco(b.clone(), next_scope, frame.depth.clone())), + None => let_line, +} +}, + _ => emit_error_expr("shared_tco_let expected ExprLet".to_string(), target), +} } -pub fn shared_tco_block( - frame: &Rc, - fn_name: String, - params: Rc>>, - target: RenderTarget, - spec: Rc, - emit_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone, - recurse_tco: impl Fn(Rc, Rc, i64) -> String + Clone, -) -> String { +pub fn shared_tco_block(frame: &Rc, fn_name: String, params: Rc>>, target: RenderTarget, spec: Rc, emit_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone, recurse_tco: impl Fn(Rc, Rc, i64) -> String + Clone) -> String { match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprBlock => { - let ss = frame.expr.clone().children.clone(); - if ((ss.clone().len() as i64) == 0) { - spec.tco.clone().break_return.clone() - } else { - { - let init_state = - emit_init_stmts(ss.clone(), frame.scope.clone(), frame.depth.clone()); - let last_str = match ss.clone().last().cloned() { - Some(last_expr) => recurse_tco( - last_expr.clone(), - init_state.scope.clone(), - frame.depth.clone(), - ), - None => spec.tco.clone().break_return.clone(), - }; - if ((init_state.text.clone().len() as i64) == 0) { - last_str - } else { - v2_rt::concat( - v2_rt::concat( - init_state.text.clone().join(&"\n".to_string()), - "\n".to_string(), - ), - last_str, - ) - } + ExprData::ExprBlock => { + let ss = frame.expr.clone().children.clone(); +if ((ss.clone().len() as i64) == 0) { + spec.tco.clone().break_return.clone() + } else { + { + let init_state = emit_init_stmts(ss.clone(), frame.scope.clone(), frame.depth.clone()); +let last_str = match ss.clone().last().cloned() { + Some(last_expr) => recurse_tco(last_expr.clone(), init_state.scope.clone(), frame.depth.clone()), + None => spec.tco.clone().break_return.clone(), +}; +if ((init_state.text.clone().len() as i64) == 0) { + last_str + } else { + v2_rt::concat(v2_rt::concat(init_state.text.clone().join(&"\n".to_string()), "\n".to_string()), last_str) } - } +} } - _ => emit_error_expr("shared_tco_block expected ExprBlock".to_string(), target), - } +}, + _ => emit_error_expr("shared_tco_block expected ExprBlock".to_string(), target), +} } -pub fn shared_tco_reassign( - ordered_args: Rc>, - param_names: Rc>, - spec: &Rc, -) -> String { +pub fn shared_tco_reassign(ordered_args: Rc>, param_names: Rc>, spec: &Rc) -> String { { - let all_lines = tco_reassign_core( - ordered_args, - param_names, - spec.tco.clone().temp_var_prefix.clone(), - spec.tco.clone().temp_decl_prefix.clone(), - spec.tco.clone().temp_assign_op.clone(), - spec.block_syntax.clone().stmt_terminator.clone(), - spec.tco.clone().continue_str.clone(), - &"".to_string(), - ); - all_lines.join(&"\n".to_string()) - } + let all_lines = tco_reassign_core(ordered_args, param_names, spec.tco.clone().temp_var_prefix.clone(), spec.tco.clone().temp_decl_prefix.clone(), spec.tco.clone().temp_assign_op.clone(), spec.block_syntax.clone().stmt_terminator.clone(), spec.tco.clone().continue_str.clone(), &"".to_string()); +all_lines.join(&"\n".to_string()) +} +} + +pub fn unified_tco_recurse(expr: Rc, scope: Rc, depth: i64, fn_name: String, params: Rc>>, target: RenderTarget, registry: Rc>>, recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, render_match: impl Fn(Rc) -> String + Clone, render_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone) -> String { + emit_unified_tco_expr(&Rc::new(TcoFrame { + expr: expr, + scope: scope, + depth: depth, +}), &fn_name, params, &target, registry, recurse_expr, render_match, render_init_stmts) } -pub fn unified_tco_recurse( - expr: Rc, - scope: Rc, - depth: i64, - fn_name: String, - params: Rc>>, - target: RenderTarget, - registry: Rc>>, - recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, - render_match: impl Fn(Rc) -> String + Clone, - render_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone, -) -> String { - emit_unified_tco_expr( - &Rc::new(TcoFrame { - expr: expr, - scope: scope, - depth: depth, - }), - &fn_name, - params, - &target, - registry, - recurse_expr, - render_match, - render_init_stmts, - ) -} - -pub fn emit_unified_tco_expr( - frame: &Rc, - fn_name: &String, - params: Rc>>, - target: &RenderTarget, - registry: Rc>>, - recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, - render_match: impl Fn(Rc) -> String + Clone, - render_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone, -) -> String { +pub fn emit_unified_tco_expr(frame: &Rc, fn_name: &String, params: Rc>>, target: &RenderTarget, registry: Rc>>, recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, render_match: impl Fn(Rc) -> String + Clone, render_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone) -> String { { let spec = language_spec(target.clone()); - emit_shared_tco_expr( - frame.clone(), - fn_name.clone(), - |input| { - emit_typed_tco_reassign_shared( - input.args.clone(), - params.clone(), - &target, - |child| recurse_expr(child.clone(), input.scope.clone(), input.depth.clone()), - input.scope.clone().type_env.clone().source_indices.clone(), - ) - }, - |frame| { - shared_tco_non_self_call( - &frame, - target.clone(), - spec.clone(), - |f, args, scope, depth| { - emit_typed_call_unified( - &f, - args.clone(), - &target, - registry.clone(), - scope.clone(), - |n| recurse_expr(n.clone(), scope.clone(), depth.clone()), - ) - }, - ) - }, - |frame| { - shared_tco_if( - &frame, - fn_name.clone(), - params.clone(), - target.clone(), - spec.clone(), - recurse_expr.clone(), - |expr, scope, depth| { - unified_tco_recurse( - expr.clone(), - scope.clone(), - depth.clone(), - fn_name.clone(), - params.clone(), - target.clone(), - registry.clone(), - recurse_expr.clone(), - render_match.clone(), - render_init_stmts.clone(), - ) - }, - ) - }, - render_match.clone(), - |frame| { - shared_tco_let( - &frame, - fn_name.clone(), - params.clone(), - target.clone(), - recurse_expr.clone(), - |expr, scope, depth| { - unified_tco_recurse( - expr.clone(), - scope.clone(), - depth.clone(), - fn_name.clone(), - params.clone(), - target.clone(), - registry.clone(), - recurse_expr.clone(), - render_match.clone(), - render_init_stmts.clone(), - ) - }, - ) - }, - |frame| { - shared_tco_block( - &frame, - fn_name.clone(), - params.clone(), - target.clone(), - spec.clone(), - render_init_stmts.clone(), - |expr, scope, depth| { - unified_tco_recurse( - expr.clone(), - scope.clone(), - depth.clone(), - fn_name.clone(), - params.clone(), - target.clone(), - registry.clone(), - recurse_expr.clone(), - render_match.clone(), - render_init_stmts.clone(), - ) - }, - ) - }, - |frame| shared_tco_default_return(&frame, spec.clone(), recurse_expr.clone()), - ) - } +emit_shared_tco_expr(frame.clone(), fn_name.clone(), |input| emit_typed_tco_reassign_shared(input.args.clone(), params.clone(), &target, |child| recurse_expr(child.clone(), input.scope.clone(), input.depth.clone()), input.scope.clone().type_env.clone().source_indices.clone()), |frame| shared_tco_non_self_call(&frame, target.clone(), spec.clone(), |f, args, scope, depth| emit_typed_call_unified(&f, args.clone(), &target, registry.clone(), scope.clone(), |n| recurse_expr(n.clone(), scope.clone(), depth.clone()))), |frame| shared_tco_if(&frame, fn_name.clone(), params.clone(), target.clone(), spec.clone(), recurse_expr.clone(), |expr, scope, depth| unified_tco_recurse(expr.clone(), scope.clone(), depth.clone(), fn_name.clone(), params.clone(), target.clone(), registry.clone(), recurse_expr.clone(), render_match.clone(), render_init_stmts.clone())), render_match.clone(), |frame| shared_tco_let(&frame, fn_name.clone(), params.clone(), target.clone(), recurse_expr.clone(), |expr, scope, depth| unified_tco_recurse(expr.clone(), scope.clone(), depth.clone(), fn_name.clone(), params.clone(), target.clone(), registry.clone(), recurse_expr.clone(), render_match.clone(), render_init_stmts.clone())), |frame| shared_tco_block(&frame, fn_name.clone(), params.clone(), target.clone(), spec.clone(), render_init_stmts.clone(), |expr, scope, depth| unified_tco_recurse(expr.clone(), scope.clone(), depth.clone(), fn_name.clone(), params.clone(), target.clone(), registry.clone(), recurse_expr.clone(), render_match.clone(), render_init_stmts.clone())), |frame| shared_tco_default_return(&frame, spec.clone(), recurse_expr.clone())) +} } -pub fn emit_unified_tco_body( - texpr: Rc, - fn_name: String, - params: Rc>>, - target: &RenderTarget, - registry: Rc>>, - scope: Rc, - depth: i64, - recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, - render_match: impl Fn(Rc) -> String + Clone, - render_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone, -) -> String { +pub fn emit_unified_tco_body(texpr: Rc, fn_name: String, params: Rc>>, target: &RenderTarget, registry: Rc>>, scope: Rc, depth: i64, recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, render_match: impl Fn(Rc) -> String + Clone, render_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone) -> String { { let spec = language_spec(target.clone()); - let inner = emit_unified_tco_expr( - &Rc::new(TcoFrame { - expr: texpr, - scope: scope, - depth: (depth.clone() + 1), - }), - &fn_name, - params, - &target, - registry, - recurse_expr, - render_match, - render_init_stmts, - ); - shared_tco_body(inner, depth.clone(), &spec) - } +let inner = emit_unified_tco_expr(&Rc::new(TcoFrame { + expr: texpr, + scope: scope, + depth: (depth.clone() + 1), +}), &fn_name, params, &target, registry, recurse_expr, render_match, render_init_stmts); +shared_tco_body(inner, depth.clone(), &spec) +} } -pub fn emit_unified_init_block_stmts( - remaining: Rc>>, - text: Rc>, - scope: Rc, - depth: i64, - target: &RenderTarget, - registry: Rc>>, - render_pattern: impl Fn(Rc) -> String + Clone, -) -> Rc { +pub fn emit_unified_init_block_stmts(remaining: Rc>>, text: Rc>, scope: Rc, depth: i64, target: &RenderTarget, registry: Rc>>, render_pattern: impl Fn(Rc) -> String + Clone) -> Rc { { - let prepend = if language_spec(target.clone()) - .block_syntax - .clone() - .significant_whitespace - .clone() - { + let prepend = if language_spec(target.clone()).block_syntax.clone().significant_whitespace.clone() { false } else { true }; - emit_init_block_stmts_shared(remaining, text, scope, depth, prepend, |stmt, sc, d| { - emit_unified_typed_expr( - stmt.clone(), - &target, - registry.clone(), - &sc, - d.clone(), - 1024, - render_pattern.clone(), - ) - }) - } +emit_init_block_stmts_shared(remaining, text, scope, depth, prepend, |stmt, sc, d| emit_unified_typed_expr(stmt.clone(), &target, registry.clone(), &sc, d.clone(), 1024, render_pattern.clone())) +} } -pub fn emit_unified_tco_match( - frame: &Rc, - fn_name: String, - params: Rc>>, - target: &RenderTarget, - registry: &Rc>>, - render_pattern: impl Fn(Rc) -> String + Clone, - render_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone, -) -> String { +pub fn emit_unified_tco_match(frame: &Rc, fn_name: String, params: Rc>>, target: &RenderTarget, registry: &Rc>>, render_pattern: impl Fn(Rc) -> String + Clone, render_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone) -> String { match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprMatch => { - let s = match_scrutinee(frame.expr.clone()); - let arm_list = match_arm_nodes(frame.expr.clone()); - let scrut_str = emit_unified_typed_expr( - s, - &target, - registry.clone(), - &frame.scope.clone(), - frame.depth.clone(), - 1024, - render_pattern.clone(), - ); - let arm_strs = Rc::new({ - let mut __result = Vec::new(); - for arm in arm_list.iter().cloned() { - __result.push(emit_unified_tco_match_arm( - &arm, - &fn_name, - ¶ms, - &target, - ®istry, - &frame.scope.clone(), - frame.depth.clone(), - render_pattern.clone(), - render_init_stmts.clone(), - )); - } - __result - }); - let arms_str = arm_strs.join(&"\n".to_string()); - let bs = language_spec(target.clone()).block_syntax.clone(); - if (bs.block_close.clone().as_str() == "".to_string().as_str()) { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(bs.match_keyword.clone(), scrut_str), - bs.block_open.clone(), - ), - arms_str, - ) - } else { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(bs.match_keyword.clone(), scrut_str), - bs.block_open.clone(), - ), - arms_str, - ), - "\n".to_string(), - ), - bs.block_close.clone(), - ) - } + ExprData::ExprMatch => { + let s = match_scrutinee(frame.expr.clone()); +let arm_list = match_arm_nodes(frame.expr.clone()); +let scrut_str = emit_unified_typed_expr(s, &target, registry.clone(), &frame.scope.clone(), frame.depth.clone(), 1024, render_pattern.clone()); +let arm_strs = Rc::new({ let mut __result = Vec::new(); for arm in arm_list.iter().cloned() { __result.push(emit_unified_tco_match_arm(&arm, &fn_name, ¶ms, &target, ®istry, &frame.scope.clone(), frame.depth.clone(), render_pattern.clone(), render_init_stmts.clone())); } __result }); +let arms_str = arm_strs.join(&"\n".to_string()); +let bs = language_spec(target.clone()).block_syntax.clone(); +if (bs.block_close.clone().as_str() == "".to_string().as_str()) { + v2_rt::concat(v2_rt::concat(v2_rt::concat(bs.match_keyword.clone(), scrut_str), bs.block_open.clone()), arms_str) + } else { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(bs.match_keyword.clone(), scrut_str), bs.block_open.clone()), arms_str), "\n".to_string()), bs.block_close.clone()) } - _ => emit_error_expr( - "emit_unified_tco_match expected ExprMatch".to_string(), - target.clone(), - ), - } +}, + _ => emit_error_expr("emit_unified_tco_match expected ExprMatch".to_string(), target.clone()), +} } -pub fn emit_unified_tco_match_arm( - arm: &Rc, - fn_name: &String, - params: &Rc>>, - target: &RenderTarget, - registry: &Rc>>, - scope: &Rc, - depth: i64, - render_pattern: impl Fn(Rc) -> String + Clone, - render_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone, -) -> String { +pub fn emit_unified_tco_match_arm(arm: &Rc, fn_name: &String, params: &Rc>>, target: &RenderTarget, registry: &Rc>>, scope: &Rc, depth: i64, render_pattern: impl Fn(Rc) -> String + Clone, render_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone) -> String { { let bs = language_spec(target.clone()).block_syntax.clone(); - let case_depth = if bs.significant_whitespace.clone() { +let case_depth = if bs.significant_whitespace.clone() { (depth.clone() + 1) } else { depth.clone() }; - let body_depth = (case_depth.clone() + 1); - let guard_str = emit_arm_guard(arm.clone(), &target, |g| { - emit_unified_typed_expr( - g.clone(), - &target, - registry.clone(), - &scope, - depth.clone(), - 1024, - render_pattern.clone(), - ) - }); - let body_str = emit_unified_tco_expr( - &Rc::new(TcoFrame { - expr: arm_body(&arm), - scope: scope.clone(), - depth: body_depth.clone(), - }), - &fn_name, - params.clone(), - &target, - registry.clone(), - |expr, scope, depth| { - emit_unified_typed_expr( - expr.clone(), - &target, - registry.clone(), - &scope, - depth.clone(), - 1024, - render_pattern.clone(), - ) - }, - |frame| { - emit_unified_tco_match( - &frame, - fn_name.clone(), - params.clone(), - &target, - ®istry, - render_pattern.clone(), - render_init_stmts.clone(), - ) - }, - render_init_stmts.clone(), - ); - emit_match_arm_line( - arm.clone(), - target.clone(), - case_depth.clone(), - body_depth.clone(), - body_str, - guard_str, - render_pattern.clone(), - ) - } +let body_depth = (case_depth.clone() + 1); +let guard_str = emit_arm_guard(arm.clone(), &target, |g| emit_unified_typed_expr(g.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone())); +let body_str = emit_unified_tco_expr(&Rc::new(TcoFrame { + expr: arm_body(&arm), + scope: scope.clone(), + depth: body_depth.clone(), +}), &fn_name, params.clone(), &target, registry.clone(), |expr, scope, depth| emit_unified_typed_expr(expr.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone()), |frame| emit_unified_tco_match(&frame, fn_name.clone(), params.clone(), &target, ®istry, render_pattern.clone(), render_init_stmts.clone()), render_init_stmts.clone()); +emit_match_arm_line(arm.clone(), target.clone(), case_depth.clone(), body_depth.clone(), body_str, guard_str, render_pattern.clone()) +} } -pub fn emit_tco_unified( - texpr: Rc, - fn_name: &String, - params: &Rc>>, - target: &RenderTarget, - registry: &Rc>>, - scope: &Rc, - depth: i64, - render_pattern: impl Fn(Rc) -> String + Clone, -) -> String { - emit_unified_tco_body( - texpr, - fn_name.clone(), - params.clone(), - &target, - registry.clone(), - scope.clone(), - depth.clone(), - |expr, scope, depth| { - emit_unified_typed_expr( - expr.clone(), - &target, - registry.clone(), - &scope, - depth.clone(), - 1024, - render_pattern.clone(), - ) - }, - |frame| { - emit_unified_tco_match( - &frame, - fn_name.clone(), - params.clone(), - &target, - ®istry, - render_pattern.clone(), - |stmts, scope, depth| { - emit_unified_init_block_stmts( - stmts.clone(), - Rc::new(vec![]), - scope.clone(), - depth.clone(), - &target, - registry.clone(), - render_pattern.clone(), - ) - }, - ) - }, - |stmts, scope, depth| { - emit_unified_init_block_stmts( - stmts.clone(), - Rc::new(vec![]), - scope.clone(), - depth.clone(), - &target, - registry.clone(), - render_pattern.clone(), - ) - }, - ) +pub fn emit_tco_unified(texpr: Rc, fn_name: &String, params: &Rc>>, target: &RenderTarget, registry: &Rc>>, scope: &Rc, depth: i64, render_pattern: impl Fn(Rc) -> String + Clone) -> String { + emit_unified_tco_body(texpr, fn_name.clone(), params.clone(), &target, registry.clone(), scope.clone(), depth.clone(), |expr, scope, depth| emit_unified_typed_expr(expr.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone()), |frame| emit_unified_tco_match(&frame, fn_name.clone(), params.clone(), &target, ®istry, render_pattern.clone(), |stmts, scope, depth| emit_unified_init_block_stmts(stmts.clone(), Rc::new(vec![]), scope.clone(), depth.clone(), &target, registry.clone(), render_pattern.clone())), |stmts, scope, depth| emit_unified_init_block_stmts(stmts.clone(), Rc::new(vec![]), scope.clone(), depth.clone(), &target, registry.clone(), render_pattern.clone())) } -pub fn emit_unified_typed_func_body( - body: &Rc, - target: &RenderTarget, - registry: &Rc>>, - scope: &Rc, - depth: i64, -) -> String { +pub fn emit_unified_typed_func_body(body: &Rc, target: &RenderTarget, registry: &Rc>>, scope: &Rc, depth: i64) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let es = language_spec(target.clone()).expression_semantics.clone(); - let bs = language_spec(target.clone()).block_syntax.clone(); - let si = scope.type_env.clone().source_indices.clone(); - let prefix = if bs.significant_whitespace.clone() { - "".to_string() - } else { - make_indent(depth.clone()) - }; - match (*body.expr_data.clone()).clone() { - ExprData::ExprLet => { + { + let es = language_spec(target.clone()).expression_semantics.clone(); +let bs = language_spec(target.clone()).block_syntax.clone(); +let si = scope.type_env.clone().source_indices.clone(); +let prefix = if bs.significant_whitespace.clone() { + "".to_string() + } else { + make_indent(depth.clone()) + }; +match (*body.expr_data.clone()).clone() { + ExprData::ExprLet => { let n = let_binding_name_at(body.clone(), si.clone()); - let ch = body.children.clone(); - let v = let_value(body.clone()); - let inner = let_body(body.clone()); - let val_str = emit_unified_typed_expr( - v.clone(), - &target, - registry.clone(), - &scope, - depth.clone(), - 1024, - |pat| emit_unified_pattern(pat.clone(), target.clone(), si.clone()), - ); - let let_line = v2_rt::concat(prefix, emit_let_binding(n.clone(), val_str, &target)); - let next_scope = extend_scope( - &scope, - &n, - resolved_type(v.clone()), - Rc::new(SubValueRelation::SubValueUnknown), - ); - match inner { - Some(bd) => v2_rt::concat( - v2_rt::concat(let_line, "\n".to_string()), - emit_unified_typed_func_body( - &bd, - &target, - ®istry, - &next_scope, - depth.clone(), - ), - ), - None => let_line, - } - } - ExprData::ExprBlock => { +let ch = body.children.clone(); +let v = let_value(body.clone()); +let inner = let_body(body.clone()); +let val_str = emit_unified_typed_expr(v.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, |pat| emit_unified_pattern(pat.clone(), target.clone(), si.clone())); +let let_line = v2_rt::concat(prefix, emit_let_binding(n.clone(), val_str, &target)); +let next_scope = extend_scope(&scope, &n, resolved_type(v.clone()), Rc::new(SubValueRelation::SubValueUnknown)); +match inner { + Some(bd) => v2_rt::concat(v2_rt::concat(let_line, "\n".to_string()), emit_unified_typed_func_body(&bd, &target, ®istry, &next_scope, depth.clone())), + None => let_line, +} +}, + ExprData::ExprBlock => { let ss = body.children.clone(); - if ((ss.clone().len() as i64) == 0) { - v2_rt::concat( - v2_rt::concat(prefix, "return ".to_string()), - es.empty_return_value.clone(), - ) +if ((ss.clone().len() as i64) == 0) { + v2_rt::concat(v2_rt::concat(prefix, "return ".to_string()), es.empty_return_value.clone()) } else { { - let init_state = emit_unified_init_block_stmts( - ss.clone(), - Rc::new(vec![]), - scope.clone(), - depth.clone(), - &target, - registry.clone(), - |pat| emit_unified_pattern(pat.clone(), target.clone(), si.clone()), - ); - let last_stmt = ss.clone().last().cloned(); - let last_str = match last_stmt { - Some(s) => v2_rt::concat( - v2_rt::concat( - v2_rt::concat(prefix, "return ".to_string()), - emit_unified_typed_expr( - s.clone(), - &target, - registry.clone(), - &init_state.scope.clone(), - depth.clone(), - 1024, - |pat| { - emit_unified_pattern( - pat.clone(), - target.clone(), - si.clone(), - ) - }, - ), - ), - es.return_suffix.clone(), - ), - None => v2_rt::concat( - v2_rt::concat(prefix, "return ".to_string()), - es.empty_return_value.clone(), - ), - }; - if ((init_state.text.clone().len() as i64) == 0) { + let init_state = emit_unified_init_block_stmts(ss.clone(), Rc::new(vec![]), scope.clone(), depth.clone(), &target, registry.clone(), |pat| emit_unified_pattern(pat.clone(), target.clone(), si.clone())); +let last_stmt = ss.clone().last().cloned(); +let last_str = match last_stmt { + Some(s) => v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix, "return ".to_string()), emit_unified_typed_expr(s.clone(), &target, registry.clone(), &init_state.scope.clone(), depth.clone(), 1024, |pat| emit_unified_pattern(pat.clone(), target.clone(), si.clone()))), es.return_suffix.clone()), + None => v2_rt::concat(v2_rt::concat(prefix, "return ".to_string()), es.empty_return_value.clone()), +}; +if ((init_state.text.clone().len() as i64) == 0) { last_str } else { - v2_rt::concat( - v2_rt::concat( - init_state.text.clone().join(&"\n".to_string()), - "\n".to_string(), - ), - last_str, - ) + v2_rt::concat(v2_rt::concat(init_state.text.clone().join(&"\n".to_string()), "\n".to_string()), last_str) } - } +} } - } - _ => v2_rt::concat( - v2_rt::concat( - v2_rt::concat(prefix, "return ".to_string()), - emit_unified_typed_expr( - body.clone(), - &target, - registry.clone(), - &scope, - depth.clone(), - 1024, - |pat| emit_unified_pattern(pat.clone(), target.clone(), si.clone()), - ), - ), - es.return_suffix.clone(), - ), - } +}, + _ => v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix, "return ".to_string()), emit_unified_typed_expr(body.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, |pat| emit_unified_pattern(pat.clone(), target.clone(), si.clone()))), es.return_suffix.clone()), +} +} }) } -pub fn is_tco_candidate( - texpr: &Rc, - func_name: &String, - source_indices: &Rc>>, -) -> bool { +pub fn is_tco_candidate(texpr: &Rc, func_name: &String, source_indices: &Rc>>) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - (expr_call_func_at(texpr.clone(), source_indices.clone()).as_str() - == func_name.clone().as_str()) - } - ExprData::ExprReturn => { - is_tco_candidate(&return_value(texpr.clone()), &func_name, &source_indices) - } - ExprData::ExprIf => { - let then_cand = - is_tco_candidate(&if_then_branch(texpr.clone()), &func_name, &source_indices); - let else_cand = match if_else_branch(texpr.clone()) { - Some(e) => is_tco_candidate(&e, &func_name, &source_indices), - None => false, - }; - (then_cand || else_cand) - } - ExprData::ExprMatch => { - let mut __found = false; - for arm_node in match_arm_nodes(texpr.clone()).iter().cloned() { - if is_tco_candidate(&arm_body(&arm_node), &func_name, &source_indices) { - __found = true; - break; - } - } - __found - } - ExprData::ExprLet => match let_body(texpr.clone()) { - Some(b) => is_tco_candidate(&b, &func_name, &source_indices), - None => false, - }, - ExprData::ExprBlock => { - let mut __found = false; - for s in texpr.children.clone().iter().cloned() { - if is_tco_candidate(&s, &func_name, &source_indices) { - __found = true; - break; - } - } - __found - } - ExprData::NoExprData => { - let mut __found = false; - for child in texpr.children.clone().iter().cloned() { - if is_tco_candidate(&child, &func_name, &source_indices) { - __found = true; - break; - } - } - __found - } - _ => false, - } + ExprData::ExprCall { .. } => (expr_call_func_at(texpr.clone(), source_indices.clone()).as_str() == func_name.clone().as_str()), + ExprData::ExprReturn => is_tco_candidate(&return_value(texpr.clone()), &func_name, &source_indices), + ExprData::ExprIf => { + let then_cand = is_tco_candidate(&if_then_branch(texpr.clone()), &func_name, &source_indices); +let else_cand = match if_else_branch(texpr.clone()) { + Some(e) => is_tco_candidate(&e, &func_name, &source_indices), + None => false, +}; +(then_cand || else_cand) +}, + ExprData::ExprMatch => { let mut __found = false; for arm_node in match_arm_nodes(texpr.clone()).iter().cloned() { if is_tco_candidate(&arm_body(&arm_node), &func_name, &source_indices) { __found = true; break; } } __found }, + ExprData::ExprLet => match let_body(texpr.clone()) { + Some(b) => is_tco_candidate(&b, &func_name, &source_indices), + None => false, +}, + ExprData::ExprBlock => { let mut __found = false; for s in texpr.children.clone().iter().cloned() { if is_tco_candidate(&s, &func_name, &source_indices) { __found = true; break; } } __found }, + ExprData::NoExprData => { let mut __found = false; for child in texpr.children.clone().iter().cloned() { if is_tco_candidate(&child, &func_name, &source_indices) { __found = true; break; } } __found }, + _ => false, +} }) } pub fn emit_ident(name: String, target: RenderTarget) -> String { { let spec = language_spec(target); - let converted = match spec.naming_case.clone() { - NamingCase::SnakeCase => to_snake(name), - NamingCase::CamelCase => to_camel(name), - NamingCase::PascalCase => capitalize_first(to_camel(name)), - NamingCase::AsAuthored => name, - }; - let is_reserved = { - let mut __found = false; - for r in spec.reserved_words.clone().keywords.clone().iter().cloned() { - if (r.clone().as_str() == converted.clone().as_str()) { - __found = true; - break; - } - } - __found - }; - if is_reserved { +let converted = match spec.naming_case.clone() { + NamingCase::SnakeCase => to_snake(name), + NamingCase::CamelCase => to_camel(name), + NamingCase::PascalCase => capitalize_first(to_camel(name)), + NamingCase::AsAuthored => name, +}; +let is_reserved = { let mut __found = false; for r in spec.reserved_words.clone().keywords.clone().iter().cloned() { if (r.clone().as_str() == converted.clone().as_str()) { __found = true; break; } } __found }; +if is_reserved { match (*spec.reserved_words.clone().strategy.clone()).clone() { - ReservedWordStrategy::PrefixEscape { prefix: p, .. } => { - v2_rt::concat(p.clone(), converted.clone()) - } - ReservedWordStrategy::SuffixEscape { suffix: s, .. } => { - v2_rt::concat(converted.clone(), s.clone()) - } - ReservedWordStrategy::NoEscape => converted.clone(), - } + ReservedWordStrategy::PrefixEscape { prefix: p, .. } => v2_rt::concat(p.clone(), converted.clone()), + ReservedWordStrategy::SuffixEscape { suffix: s, .. } => v2_rt::concat(converted.clone(), s.clone()), + ReservedWordStrategy::NoEscape => converted.clone(), +} } else { converted.clone() } - } +} } pub fn emit_export_ident(name: String, target: &RenderTarget) -> String { { let spec = language_spec(target.clone()); - match (*spec.visibility.clone()).clone() { - VisibilitySpec::CaseVisibility { - export_case: ec, .. - } => { - let result = apply_naming_case(name, ec.clone()); - let is_reserved = { - let mut __found = false; - for r in spec.reserved_words.clone().keywords.clone().iter().cloned() { - if (r.clone().as_str() == result.clone().as_str()) { - __found = true; - break; - } - } - __found - }; - if is_reserved { - match (*spec.reserved_words.clone().strategy.clone()).clone() { - ReservedWordStrategy::SuffixEscape { suffix: s, .. } => { - v2_rt::concat(result.clone(), s.clone()) - } - ReservedWordStrategy::PrefixEscape { prefix: p, .. } => { - v2_rt::concat(p.clone(), result.clone()) - } - ReservedWordStrategy::NoEscape => result.clone(), - } - } else { - result.clone() - } +match (*spec.visibility.clone()).clone() { + VisibilitySpec::CaseVisibility { export_case: ec, .. } => { + let result = apply_naming_case(name, ec.clone()); +let is_reserved = { let mut __found = false; for r in spec.reserved_words.clone().keywords.clone().iter().cloned() { if (r.clone().as_str() == result.clone().as_str()) { __found = true; break; } } __found }; +if is_reserved { + match (*spec.reserved_words.clone().strategy.clone()).clone() { + ReservedWordStrategy::SuffixEscape { suffix: s, .. } => v2_rt::concat(result.clone(), s.clone()), + ReservedWordStrategy::PrefixEscape { prefix: p, .. } => v2_rt::concat(p.clone(), result.clone()), + ReservedWordStrategy::NoEscape => result.clone(), +} + } else { + result.clone() } - VisibilitySpec::KeywordVisibility { .. } => emit_ident(name, target.clone()), - } - } +}, + VisibilitySpec::KeywordVisibility { .. } => emit_ident(name, target.clone()), +} +} } -pub fn apply_bridge_method_overrides( - name: String, - overrides: Rc>, -) -> String { +pub fn apply_bridge_method_overrides(name: String, overrides: Rc>) -> String { match v2_rt::lookup(&overrides, name.clone()) { - Some(replacement) => replacement.clone(), - None => name.clone(), - } + Some(replacement) => replacement.clone(), + None => name.clone(), +} } pub fn emit_let_binding(name: String, value: String, target: &RenderTarget) -> String { { let spec = language_spec(target.clone()); - apply_type_template2( - spec.annotations.clone().let_binding_inferred.clone(), - emit_ident(name, target.clone()), - value, - ) - } +apply_type_template2(spec.annotations.clone().let_binding_inferred.clone(), emit_ident(name, target.clone()), value) +} } -pub fn emit_let_binding_annotated( - name: String, - type_str: String, - value: String, - target: &RenderTarget, -) -> String { +pub fn emit_let_binding_annotated(name: String, type_str: String, value: String, target: &RenderTarget) -> String { { let spec = language_spec(target.clone()); - apply_type_template3( - spec.annotations.clone().let_binding_annotated.clone(), - emit_ident(name, target.clone()), - type_str, - value, - ) - } +apply_type_template3(spec.annotations.clone().let_binding_annotated.clone(), emit_ident(name, target.clone()), type_str, value) +} } pub fn emit_return(value: String, target: RenderTarget) -> String { @@ -4077,2010 +1982,771 @@ pub fn emit_return(value: String, target: RenderTarget) -> String { pub fn emit_unary_op(op: UnaryOpKind, operand_str: String, target: RenderTarget) -> String { match op { - UnaryOpKind::Not => v2_rt::concat(emit_keyword("not".to_string(), target), operand_str), - UnaryOpKind::Neg => v2_rt::concat("-".to_string(), operand_str), - } + UnaryOpKind::Not => v2_rt::concat(emit_keyword("not".to_string(), target), operand_str), + UnaryOpKind::Neg => v2_rt::concat("-".to_string(), operand_str), +} } pub fn emit_lambda(params_str: String, body_str: String, target: RenderTarget) -> String { { let spec = language_spec(target); - apply_type_template2(spec.lambda_template.clone(), params_str, body_str) - } +apply_type_template2(spec.lambda_template.clone(), params_str, body_str) +} } pub fn emit_error_expr(message: String, target: RenderTarget) -> String { { let msg = emit_string_literal(message, "".to_string()); - let spec = language_spec(target); - apply_type_template1(spec.error_expr_template.clone(), msg) - } +let spec = language_spec(target); +apply_type_template1(spec.error_expr_template.clone(), msg) +} } pub fn emit_lambda_params(param_names: Rc>, target: &RenderTarget) -> String { { let spec = language_spec(target.clone()); - let param_strs = Rc::new({ - let mut __result = Vec::new(); - for p in param_names.iter().cloned() { - __result.push(apply_type_template1( - spec.annotations.clone().lambda_param_untyped.clone(), - emit_ident(p.clone(), target.clone()), - )); - } - __result - }); - param_strs.join(&", ".to_string()) - } +let param_strs = Rc::new({ let mut __result = Vec::new(); for p in param_names.iter().cloned() { __result.push(apply_type_template1(spec.annotations.clone().lambda_param_untyped.clone(), emit_ident(p.clone(), target.clone()))); } __result }); +param_strs.join(&", ".to_string()) +} } pub fn emit_list_lit_expr(element_strs: &Rc>, target: RenderTarget) -> String { { let spec = language_spec(target); - if ((element_strs.clone().len() as i64) == 0) { +if ((element_strs.clone().len() as i64) == 0) { spec.list_literal_empty.clone() } else { { let els_str = element_strs.clone().join(&", ".to_string()); - apply_type_template1(spec.list_literal_template.clone(), els_str) - } +apply_type_template1(spec.list_literal_template.clone(), els_str) +} } - } +} } pub fn emit_null_coalesce(l_str: String, r_str: String, target: RenderTarget) -> String { { let spec = language_spec(target); - apply_type_template2(spec.null_coalesce_template.clone(), l_str, r_str) - } +apply_type_template2(spec.null_coalesce_template.clone(), l_str, r_str) +} } -pub fn emit_expr_var_shared( - expr: Rc, - target: RenderTarget, - source_indices: Rc>>, -) -> String { +pub fn emit_expr_var_shared(expr: Rc, target: RenderTarget, source_indices: Rc>>) -> String { { let n = expr_var_name_at(expr, source_indices); - if (n.clone().as_str() == "none".to_string().as_str()) { +if (n.clone().as_str() == "none".to_string().as_str()) { emit_keyword("null".to_string(), target) } else { - if ((n.clone().as_str() == "true".to_string().as_str()) - || (n.clone().as_str() == "false".to_string().as_str())) - { + if ((n.clone().as_str() == "true".to_string().as_str()) || (n.clone().as_str() == "false".to_string().as_str())) { emit_keyword(n.clone(), target) } else { emit_ident(n.clone(), target) } } - } +} } -pub fn emit_expr_field_access_shared( - expr: &Rc, - target: RenderTarget, - emit_field: impl Fn(Rc) -> String + Clone, - source_indices: &Rc>>, -) -> String { +pub fn emit_expr_field_access_shared(expr: &Rc, target: RenderTarget, emit_field: impl Fn(Rc) -> String + Clone, source_indices: &Rc>>) -> String { if is_typed_service_call_receiver(&expr, source_indices.clone()) { match extract_typed_service_name(&expr, &source_indices) { - Some(svc_name) => service_var_name(svc_name.clone()), - None => emit_field(expr.clone()), - } + Some(svc_name) => service_var_name(svc_name.clone()), + None => emit_field(expr.clone()), +} } else { emit_field(expr.clone()) } } pub fn extract_string_interp_parts(expr: Rc) -> Rc>> { - Rc::new({ - let mut __result = Vec::new(); - for child in expr.children.clone().iter().cloned() { - __result.push(match (*child.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitStr { value: text, .. } = value.as_ref() else { - unreachable!() - }; - Rc::new(StringPart::Text { - value: text.clone(), - }) - } - _ => Rc::new(StringPart::Interpolation { - expr: arg_value(&child), - }), - }); - } - __result - }) + Rc::new({ let mut __result = Vec::new(); for child in expr.children.clone().iter().cloned() { __result.push(match (*child.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: text, .. } = value.as_ref() else { unreachable!() }; Rc::new(StringPart::Text { + value: text.clone(), +}) }, + _ => Rc::new(StringPart::Interpolation { + expr: arg_value(&child), +}), +}); } __result }) } -pub fn emit_typed_cast_shared( - expr: &Rc, - cast_target_node: Rc, - target: &RenderTarget, - recurse: impl Fn(Rc) -> String + Clone, - source_indices: &Rc>>, -) -> String { +pub fn emit_typed_cast_shared(expr: &Rc, cast_target_node: Rc, target: &RenderTarget, recurse: impl Fn(Rc) -> String + Clone, source_indices: &Rc>>) -> String { { let expr_str = recurse(expr.clone()); - let ty_str = emit_node_type(cast_target_node, target.clone(), source_indices.clone()); - let src_ty = match expr.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: n, .. }) => { - emit_node_type(n.clone(), target.clone(), source_indices.clone()) - } - _ => "".to_string(), - }; - if ((src_ty.clone().as_str() != "".to_string().as_str()) - && (src_ty.clone().as_str() == ty_str.clone().as_str())) - { +let ty_str = emit_node_type(cast_target_node, target.clone(), source_indices.clone()); +let src_ty = match expr.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: n, .. }) => emit_node_type(n.clone(), target.clone(), source_indices.clone()), + _ => "".to_string(), +}; +if ((src_ty.clone().as_str() != "".to_string().as_str()) && (src_ty.clone().as_str() == ty_str.clone().as_str())) { expr_str } else { if can_cast(target.clone(), src_ty.clone(), ty_str.clone()) { render_cast(expr_str, ty_str.clone(), target.clone()) } else { - emit_error_expr( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("unsupported cast from ".to_string(), src_ty.clone()), - " to ".to_string(), - ), - ty_str.clone(), - ), - target.clone(), - ) + emit_error_expr(v2_rt::concat(v2_rt::concat(v2_rt::concat("unsupported cast from ".to_string(), src_ty.clone()), " to ".to_string()), ty_str.clone()), target.clone()) } } - } +} } -pub fn emit_typed_for_each_shared( - variable: &String, - collection: &Rc, - body: Rc, - target: &RenderTarget, - depth: i64, - source_indices: Rc>>, - recurse: impl Fn(Rc, Rc, i64) -> String + Clone, - scope: &Rc, -) -> String { +pub fn emit_typed_for_each_shared(variable: &String, collection: &Rc, body: Rc, target: &RenderTarget, depth: i64, source_indices: Rc>>, recurse: impl Fn(Rc, Rc, i64) -> String + Clone, scope: &Rc) -> String { { let coll_str = recurse(collection.clone(), scope.clone(), depth.clone()); - let elem_type = - for_each_element_type_node(resolved_type(collection.clone()), source_indices); - let body_scope = extend_scope( - &scope, - &variable, - elem_type, - Rc::new(SubValueRelation::SubValueUnknown), - ); - let body_str = recurse(body, body_scope, (depth.clone() + 1)); - let var_str = emit_ident(variable.clone(), target.clone()); - let spec = language_spec(target.clone()); - let fes = spec.for_each_syntax.clone(); - let bs = spec.block_syntax.clone(); - let body_indent = make_indent((depth.clone() + 1)); - if bs.significant_whitespace.clone() { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(fes.prefix.clone(), var_str), - fes.separator.clone(), - ), - coll_str, - ), - bs.block_open.clone(), - ), - body_indent, - ), - body_str, - ) +let elem_type = for_each_element_type_node(resolved_type(collection.clone()), source_indices); +let body_scope = extend_scope(&scope, &variable, elem_type, Rc::new(SubValueRelation::SubValueUnknown)); +let body_str = recurse(body, body_scope, (depth.clone() + 1)); +let var_str = emit_ident(variable.clone(), target.clone()); +let spec = language_spec(target.clone()); +let fes = spec.for_each_syntax.clone(); +let bs = spec.block_syntax.clone(); +let body_indent = make_indent((depth.clone() + 1)); +if bs.significant_whitespace.clone() { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(fes.prefix.clone(), var_str), fes.separator.clone()), coll_str), bs.block_open.clone()), body_indent), body_str) } else { { let close_indent = make_indent(depth.clone()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(fes.prefix.clone(), var_str), - fes.separator.clone(), - ), - coll_str, - ), - bs.block_open.clone(), - ), - body_indent, - ), - body_str, - ), - "\n".to_string(), - ), - close_indent, - ), - bs.block_close.clone(), - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(fes.prefix.clone(), var_str), fes.separator.clone()), coll_str), bs.block_open.clone()), body_indent), body_str), "\n".to_string()), close_indent), bs.block_close.clone()) +} } - } +} } -pub fn emit_typed_index_shared( - base: &Rc, - index: Rc, - target: &RenderTarget, - recurse: impl Fn(Rc) -> String + Clone, - source_indices: &Rc>>, -) -> String { +pub fn emit_typed_index_shared(base: &Rc, index: Rc, target: &RenderTarget, recurse: impl Fn(Rc) -> String + Clone, source_indices: &Rc>>) -> String { { let spec = language_spec(target.clone()); - let base_str = recurse(base.clone()); - let index_str = recurse(index); - let base_node = normalize_access_type_node(resolved_type(base.clone())); - let is_map = node_is_keyed_collection(&base_node, source_indices.clone()); - if is_string_like( - target.clone(), - authored_name_at(source_indices.clone(), &base_node), - ) { - apply_type_template2( - spec.indexing.clone().string_index.clone(), - base_str, - index_str, - ) +let base_str = recurse(base.clone()); +let index_str = recurse(index); +let base_node = normalize_access_type_node(resolved_type(base.clone())); +let is_map = node_is_keyed_collection(&base_node, source_indices.clone()); +if is_string_like(target.clone(), authored_name_at(source_indices.clone(), &base_node)) { + apply_type_template2(spec.indexing.clone().string_index.clone(), base_str, index_str) } else { if is_map { apply_type_template2(spec.indexing.clone().map_index.clone(), base_str, index_str) } else { - apply_type_template2( - spec.indexing.clone().list_index.clone(), - base_str, - index_str, - ) + apply_type_template2(spec.indexing.clone().list_index.clone(), base_str, index_str) } } - } +} } -pub fn emit_typed_slice_shared( - base: &Rc, - start: Rc, - end: Rc, - target: &RenderTarget, - recurse: impl Fn(Rc) -> String + Clone, - source_indices: Rc>>, -) -> String { +pub fn emit_typed_slice_shared(base: &Rc, start: Rc, end: Rc, target: &RenderTarget, recurse: impl Fn(Rc) -> String + Clone, source_indices: Rc>>) -> String { { let spec = language_spec(target.clone()); - let base_str = recurse(base.clone()); - let start_str = recurse(start); - let end_str = recurse(end); - let base_node = normalize_access_type_node(resolved_type(base.clone())); - if is_string_like(target.clone(), authored_name_at(source_indices, &base_node)) { +let base_str = recurse(base.clone()); +let start_str = recurse(start); +let end_str = recurse(end); +let base_node = normalize_access_type_node(resolved_type(base.clone())); +if is_string_like(target.clone(), authored_name_at(source_indices, &base_node)) { match spec.indexing.clone().string_slice.clone() { - Some(tmpl) => apply_type_template3(tmpl.clone(), base_str, start_str, end_str), - None => emit_error_expr( - "unsupported string slice for target".to_string(), - target.clone(), - ), - } + Some(tmpl) => apply_type_template3(tmpl.clone(), base_str, start_str, end_str), + None => emit_error_expr("unsupported string slice for target".to_string(), target.clone()), +} } else { match spec.indexing.clone().list_slice.clone() { - Some(tmpl) => apply_type_template3(tmpl.clone(), base_str, start_str, end_str), - None => emit_error_expr("unsupported slice for target".to_string(), target.clone()), - } - } - } + Some(tmpl) => apply_type_template3(tmpl.clone(), base_str, start_str, end_str), + None => emit_error_expr("unsupported slice for target".to_string(), target.clone()), } - -pub fn emit_shared_expr( - texpr: &Rc, - target: &RenderTarget, - source_indices: Rc>>, - wrap_result: impl Fn(String) -> String + Clone, - recurse: impl Fn(Rc) -> String + Clone, - emit_var: impl Fn(Rc) -> String + Clone, - emit_field_access: impl Fn(Rc) -> String + Clone, - emit_call: impl Fn(Rc) -> String + Clone, - emit_method_call: impl Fn(Rc) -> String + Clone, - emit_match: impl Fn(Rc) -> String + Clone, - emit_if: impl Fn(Rc) -> String + Clone, - emit_let: impl Fn(Rc) -> String + Clone, - emit_record_lit: impl Fn(Rc) -> String + Clone, - emit_string_interp: impl Fn(Rc) -> String + Clone, - emit_block: impl Fn(Rc) -> String + Clone, - emit_cast: impl Fn(Rc) -> String + Clone, - emit_for_each: impl Fn(Rc) -> String + Clone, - emit_index: impl Fn(Rc) -> String + Clone, - emit_slice: impl Fn(Rc) -> String + Clone, - emit_bin_op: impl Fn(Rc) -> String + Clone, -) -> String { - match (*texpr.expr_data.clone()).clone() { - ExprData::ExprLiteral { value: v, .. } => wrap_result(emit_literal(v.clone(), &target)), - ExprData::ExprError { message, .. } => { - wrap_result(emit_error_expr(message.clone(), target.clone())) - } - ExprData::ExprVar { .. } => emit_var(texpr.clone()), - ExprData::ExprFieldAccess { .. } => emit_field_access(texpr.clone()), - ExprData::ExprCall { .. } => emit_call(texpr.clone()), - ExprData::ExprMethodCall { .. } => emit_method_call(texpr.clone()), - ExprData::ExprMatch => emit_match(texpr.clone()), - ExprData::ExprIf => emit_if(texpr.clone()), - ExprData::ExprLet => emit_let(texpr.clone()), - ExprData::ExprRecordLit { .. } => emit_record_lit(texpr.clone()), - ExprData::ExprBinOp { .. } => emit_bin_op(texpr.clone()), - ExprData::ExprUnaryOp { op, .. } => { - let operand = unaryop_operand(texpr.clone()); - wrap_result(emit_unary_op(op.clone(), recurse(operand), target.clone())) - } - ExprData::ExprLambda => { - let body = lambda_body(texpr.clone()); - wrap_result(emit_lambda( - emit_lambda_params( - lambda_param_names_at(texpr.clone(), source_indices), - &target, - ), - recurse(body), - target.clone(), - )) - } - ExprData::ExprStringInterp => emit_string_interp(texpr.clone()), - ExprData::ExprBlock => emit_block(texpr.clone()), - ExprData::ExprCast => emit_cast(texpr.clone()), - ExprData::ExprForEach => emit_for_each(texpr.clone()), - ExprData::ExprIndex => emit_index(texpr.clone()), - ExprData::ExprSlice => emit_slice(texpr.clone()), - ExprData::ExprListLit => wrap_result(emit_list_lit_expr( - &Rc::new({ - let mut __result = Vec::new(); - for el in texpr.children.clone().iter().cloned() { - __result.push(recurse(el.clone())); - } - __result - }), - target.clone(), - )), - ExprData::ExprReturn => { - let ret_val = return_value(texpr.clone()); - wrap_result(emit_return(recurse(ret_val), target.clone())) } - ExprData::NoExprData => wrap_result("".to_string()), - } +} } -pub fn emit_default_bin_op( - texpr: &Rc, - target: RenderTarget, - source_indices: Rc>>, - recurse: impl Fn(Rc) -> String + Clone, - wrap_result: impl Fn(String) -> String + Clone, -) -> String { +pub fn emit_shared_expr(texpr: &Rc, target: &RenderTarget, source_indices: Rc>>, wrap_result: impl Fn(String) -> String + Clone, recurse: impl Fn(Rc) -> String + Clone, emit_var: impl Fn(Rc) -> String + Clone, emit_field_access: impl Fn(Rc) -> String + Clone, emit_call: impl Fn(Rc) -> String + Clone, emit_method_call: impl Fn(Rc) -> String + Clone, emit_match: impl Fn(Rc) -> String + Clone, emit_if: impl Fn(Rc) -> String + Clone, emit_let: impl Fn(Rc) -> String + Clone, emit_record_lit: impl Fn(Rc) -> String + Clone, emit_string_interp: impl Fn(Rc) -> String + Clone, emit_block: impl Fn(Rc) -> String + Clone, emit_cast: impl Fn(Rc) -> String + Clone, emit_for_each: impl Fn(Rc) -> String + Clone, emit_index: impl Fn(Rc) -> String + Clone, emit_slice: impl Fn(Rc) -> String + Clone, emit_bin_op: impl Fn(Rc) -> String + Clone) -> String { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprBinOp { - op, - algebra_field: algebra, - .. - } => { - let left = binop_left(texpr.clone()); - let right = binop_right(texpr.clone()); - let left_str = recurse(left); - let right_str = recurse(right); - if is_null_coalesce(op.clone()) { - wrap_result(emit_null_coalesce(left_str, right_str, target)) - } else { - { - let op_str = emit_bin_op_symbol(op.clone(), &target, algebra.clone()); - wrap_result(v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("(".to_string(), left_str), - " ".to_string(), - ), - op_str, - ), - " ".to_string(), - ), - right_str, - ), - ")".to_string(), - )) - } - } + ExprData::ExprLiteral { value: v, .. } => wrap_result(emit_literal(v.clone(), &target)), + ExprData::ExprError { message, .. } => wrap_result(emit_error_expr(message.clone(), target.clone())), + ExprData::ExprVar { .. } => emit_var(texpr.clone()), + ExprData::ExprFieldAccess { .. } => emit_field_access(texpr.clone()), + ExprData::ExprCall { .. } => emit_call(texpr.clone()), + ExprData::ExprMethodCall { .. } => emit_method_call(texpr.clone()), + ExprData::ExprMatch => emit_match(texpr.clone()), + ExprData::ExprIf => emit_if(texpr.clone()), + ExprData::ExprLet => emit_let(texpr.clone()), + ExprData::ExprRecordLit { .. } => emit_record_lit(texpr.clone()), + ExprData::ExprBinOp { .. } => emit_bin_op(texpr.clone()), + ExprData::ExprUnaryOp { op, .. } => { + let operand = unaryop_operand(texpr.clone()); +wrap_result(emit_unary_op(op.clone(), recurse(operand), target.clone())) +}, + ExprData::ExprLambda => { + let body = lambda_body(texpr.clone()); +wrap_result(emit_lambda(emit_lambda_params(lambda_param_names_at(texpr.clone(), source_indices), &target), recurse(body), target.clone())) +}, + ExprData::ExprStringInterp => emit_string_interp(texpr.clone()), + ExprData::ExprBlock => emit_block(texpr.clone()), + ExprData::ExprCast => emit_cast(texpr.clone()), + ExprData::ExprForEach => emit_for_each(texpr.clone()), + ExprData::ExprIndex => emit_index(texpr.clone()), + ExprData::ExprSlice => emit_slice(texpr.clone()), + ExprData::ExprListLit => wrap_result(emit_list_lit_expr(&Rc::new({ let mut __result = Vec::new(); for el in texpr.children.clone().iter().cloned() { __result.push(recurse(el.clone())); } __result }), target.clone())), + ExprData::ExprReturn => { + let ret_val = return_value(texpr.clone()); +wrap_result(emit_return(recurse(ret_val), target.clone())) +}, + ExprData::NoExprData => wrap_result("".to_string()), +} +} + +pub fn emit_default_bin_op(texpr: &Rc, target: RenderTarget, source_indices: Rc>>, recurse: impl Fn(Rc) -> String + Clone, wrap_result: impl Fn(String) -> String + Clone) -> String { + match (*texpr.expr_data.clone()).clone() { + ExprData::ExprBinOp { op, algebra_field: algebra, .. } => { + let left = binop_left(texpr.clone()); +let right = binop_right(texpr.clone()); +let left_str = recurse(left); +let right_str = recurse(right); +if is_null_coalesce(op.clone()) { + wrap_result(emit_null_coalesce(left_str, right_str, target)) + } else { + { + let op_str = emit_bin_op_symbol(op.clone(), &target, algebra.clone()); +wrap_result(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("(".to_string(), left_str), " ".to_string()), op_str), " ".to_string()), right_str), ")".to_string())) +} } - _ => wrap_result(emit_error_expr( - "emit_default_bin_op expected ExprBinOp".to_string(), - target, - )), - } +}, + _ => wrap_result(emit_error_expr("emit_default_bin_op expected ExprBinOp".to_string(), target)), +} } -pub fn emit_block_stmts_shared( - mut remaining: Rc>>, - mut text: Rc>, - mut scope: Rc, - mut depth: i64, - mut prepend_indent: bool, - mut emit_expr: impl Fn(Rc, Rc, i64) -> String + Clone, -) -> Rc { +pub fn emit_block_stmts_shared(mut remaining: Rc>>, mut text: Rc>, mut scope: Rc, mut depth: i64, mut prepend_indent: bool, mut emit_expr: impl Fn(Rc, Rc, i64) -> String + Clone) -> Rc { loop { match remaining.clone().first().cloned() { - None => { - break Rc::new(BlockEmitState { - text: text, - scope: scope.clone(), - }); - } - Some(stmt) => { - let raw = emit_expr(stmt.clone(), scope.clone(), depth.clone()); - let line = if prepend_indent.clone() { - v2_rt::concat(make_indent(depth.clone()), raw) - } else { - raw - }; - let next_scope = scope_after_expr(&stmt, &scope); - { - let __tco_0 = Rc::new( - remaining - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - let __tco_1 = v2_rt::rc_list_push(text, line); - let __tco_2 = next_scope; - remaining = __tco_0; - text = __tco_1; - scope = __tco_2; - continue; - } - } - } - } + None => { break Rc::new(BlockEmitState { + text: text, + scope: scope.clone(), +}); }, + Some(stmt) => { let raw = emit_expr(stmt.clone(), scope.clone(), depth.clone()); +let line = if prepend_indent.clone() { + v2_rt::concat(make_indent(depth.clone()), raw) + } else { + raw + }; +let next_scope = scope_after_expr(&stmt, &scope); +{ + let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); +let __tco_1 = v2_rt::rc_list_push(text, line); +let __tco_2 = next_scope; +remaining = __tco_0; +text = __tco_1; +scope = __tco_2; +continue; +} }, +} +} } -pub fn emit_init_block_stmts_shared( - mut remaining: Rc>>, - mut text: Rc>, - mut scope: Rc, - mut depth: i64, - mut prepend_indent: bool, - mut emit_expr: impl Fn(Rc, Rc, i64) -> String + Clone, -) -> Rc { +pub fn emit_init_block_stmts_shared(mut remaining: Rc>>, mut text: Rc>, mut scope: Rc, mut depth: i64, mut prepend_indent: bool, mut emit_expr: impl Fn(Rc, Rc, i64) -> String + Clone) -> Rc { loop { match remaining.clone().first().cloned() { - None => { - break Rc::new(BlockEmitState { - text: text, - scope: scope.clone(), - }); - } - Some(stmt) => { - let rest = Rc::new( - remaining - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - match rest.clone().first().cloned() { - None => { - break Rc::new(BlockEmitState { - text: text, - scope: scope.clone(), - }); - } - Some(_) => { - let raw = emit_expr(stmt.clone(), scope.clone(), depth.clone()); - let line = if prepend_indent.clone() { - v2_rt::concat(make_indent(depth.clone()), raw) - } else { - raw - }; - let next_scope = scope_after_expr(&stmt, &scope); - { - let __tco_0 = rest.clone(); - let __tco_1 = v2_rt::rc_list_push(text, line); - let __tco_2 = next_scope; - remaining = __tco_0; - text = __tco_1; - scope = __tco_2; - continue; - } - } - } - } - } - } + None => { break Rc::new(BlockEmitState { + text: text, + scope: scope.clone(), +}); }, + Some(stmt) => { let rest = Rc::new(remaining.clone().iter().cloned().skip(1 as usize).collect::>()); +match rest.clone().first().cloned() { + None => { break Rc::new(BlockEmitState { + text: text, + scope: scope.clone(), +}); }, + Some(_) => { let raw = emit_expr(stmt.clone(), scope.clone(), depth.clone()); +let line = if prepend_indent.clone() { + v2_rt::concat(make_indent(depth.clone()), raw) + } else { + raw + }; +let next_scope = scope_after_expr(&stmt, &scope); +{ + let __tco_0 = rest.clone(); +let __tco_1 = v2_rt::rc_list_push(text, line); +let __tco_2 = next_scope; +remaining = __tco_0; +text = __tco_1; +scope = __tco_2; +continue; +} }, +} }, +} +} } -pub fn emit_typed_let_shared( - name: &String, - value_str: String, - body: Option>, - target: RenderTarget, - recurse: impl Fn(Rc, Rc) -> String + Clone, - scope: Rc, - value_node: Rc, -) -> String { +pub fn emit_typed_let_shared(name: &String, value_str: String, body: Option>, target: RenderTarget, recurse: impl Fn(Rc, Rc) -> String + Clone, scope: Rc, value_node: Rc) -> String { { let let_line = emit_let_binding(name.clone(), value_str, &target); - match body { - Some(bd) => { - let next_scope = extend_scope( - &scope, - &name, - resolved_type(value_node), - Rc::new(SubValueRelation::SubValueUnknown), - ); - v2_rt::concat( - v2_rt::concat(let_line, "\n".to_string()), - recurse(bd.clone(), next_scope), - ) - } - None => let_line, - } - } +match body { + Some(bd) => { + let next_scope = extend_scope(&scope, &name, resolved_type(value_node), Rc::new(SubValueRelation::SubValueUnknown)); +v2_rt::concat(v2_rt::concat(let_line, "\n".to_string()), recurse(bd.clone(), next_scope)) +}, + None => let_line, +} +} } -pub fn emit_typed_if_shared( - cond_str: String, - then_branch: &Rc, - else_branch: Option>, - if_result_type: Option>, - depth: i64, - target: &RenderTarget, - source_indices: Rc>>, - recurse: impl Fn(Rc, i64) -> String + Clone, -) -> String { +pub fn emit_typed_if_shared(cond_str: String, then_branch: &Rc, else_branch: Option>, if_result_type: Option>, depth: i64, target: &RenderTarget, source_indices: Rc>>, recurse: impl Fn(Rc, i64) -> String + Clone) -> String { { let spec = language_spec(target.clone()); - let es = spec.expression_semantics.clone(); - let bs = spec.block_syntax.clone(); - match else_branch { - Some(eb) => match es.if_value_form.clone() { - IfValueForm::IfExpression => { - let then_str = recurse(then_branch.clone(), (depth.clone() + 1)); - let else_str = recurse(eb.clone(), (depth.clone() + 1)); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "if ".to_string(), - cond_str, - ), - bs.block_open.clone(), - ), - make_indent((depth.clone() + 1)), - ), - then_str, - ), - "\n".to_string(), - ), - make_indent(depth.clone()), - ), - bs.else_clause.clone(), - ), - make_indent((depth.clone() + 1)), - ), - else_str, - ), - "\n".to_string(), - ), - make_indent(depth.clone()), - ), - bs.block_close.clone(), - ) - } - IfValueForm::ConditionalTernary => { - let then_str = recurse(then_branch.clone(), depth.clone()); - let else_str = recurse(eb.clone(), depth.clone()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("(".to_string(), then_str), - ") if (".to_string(), - ), - cond_str, - ), - ") else (".to_string(), - ), - else_str, - ), - ")".to_string(), - ) - } - IfValueForm::IfStatement => { - let result_type = match if_result_type { - Some(rt) => emit_node_type(rt.clone(), target.clone(), source_indices), - None => emit_node_type( - resolved_type(then_branch.clone()), - target.clone(), - source_indices, - ), - }; - let then_str = recurse(then_branch.clone(), depth.clone()); - let else_str = recurse(eb.clone(), depth.clone()); - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("func() ".to_string(), result_type), " { if ".to_string()), cond_str), bs.block_open.clone()), make_indent((depth.clone() + 1))), "return ".to_string()), then_str), "\n".to_string()), make_indent(depth.clone())), bs.else_clause.clone()), make_indent((depth.clone() + 1))), "return ".to_string()), else_str), "\n".to_string()), make_indent(depth.clone())), bs.block_close.clone()), " }()".to_string()) - } - }, - None => { - if bs.significant_whitespace.clone() { - { - let then_str = recurse(then_branch.clone(), depth.clone()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("if ".to_string(), cond_str), - bs.block_open.clone(), - ), - make_indent((depth.clone() + 1)), - ), - then_str, - ) - } - } else { - { - let then_str = recurse(then_branch.clone(), (depth.clone() + 1)); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("if ".to_string(), cond_str), - bs.block_open.clone(), - ), - make_indent((depth.clone() + 1)), - ), - then_str, - ), - "\n".to_string(), - ), - make_indent(depth.clone()), - ), - bs.block_close.clone(), - ) - } - } - } - } - } +let es = spec.expression_semantics.clone(); +let bs = spec.block_syntax.clone(); +match else_branch { + Some(eb) => match es.if_value_form.clone() { + IfValueForm::IfExpression => { + let then_str = recurse(then_branch.clone(), (depth.clone() + 1)); +let else_str = recurse(eb.clone(), (depth.clone() + 1)); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("if ".to_string(), cond_str), bs.block_open.clone()), make_indent((depth.clone() + 1))), then_str), "\n".to_string()), make_indent(depth.clone())), bs.else_clause.clone()), make_indent((depth.clone() + 1))), else_str), "\n".to_string()), make_indent(depth.clone())), bs.block_close.clone()) +}, + IfValueForm::ConditionalTernary => { + let then_str = recurse(then_branch.clone(), depth.clone()); +let else_str = recurse(eb.clone(), depth.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("(".to_string(), then_str), ") if (".to_string()), cond_str), ") else (".to_string()), else_str), ")".to_string()) +}, + IfValueForm::IfStatement => { + let result_type = match if_result_type { + Some(rt) => emit_node_type(rt.clone(), target.clone(), source_indices), + None => emit_node_type(resolved_type(then_branch.clone()), target.clone(), source_indices), +}; +let then_str = recurse(then_branch.clone(), depth.clone()); +let else_str = recurse(eb.clone(), depth.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("func() ".to_string(), result_type), " { if ".to_string()), cond_str), bs.block_open.clone()), make_indent((depth.clone() + 1))), "return ".to_string()), then_str), "\n".to_string()), make_indent(depth.clone())), bs.else_clause.clone()), make_indent((depth.clone() + 1))), "return ".to_string()), else_str), "\n".to_string()), make_indent(depth.clone())), bs.block_close.clone()), " }()".to_string()) +}, +}, + None => if bs.significant_whitespace.clone() { + { + let then_str = recurse(then_branch.clone(), depth.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("if ".to_string(), cond_str), bs.block_open.clone()), make_indent((depth.clone() + 1))), then_str) +} + } else { + { + let then_str = recurse(then_branch.clone(), (depth.clone() + 1)); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("if ".to_string(), cond_str), bs.block_open.clone()), make_indent((depth.clone() + 1))), then_str), "\n".to_string()), make_indent(depth.clone())), bs.block_close.clone()) +} + }, +} +} } -pub fn emit_param_shared( - param: &Rc, - target: &RenderTarget, - source_indices: &Rc>>, -) -> String { +pub fn emit_param_shared(param: &Rc, target: &RenderTarget, source_indices: &Rc>>) -> String { { - let ty = emit_node_type( - param_node_type_expr(¶m), - target.clone(), - source_indices.clone(), - ); - v2_rt::concat( - v2_rt::concat( - emit_ident( - param_node_name_at(param.clone(), source_indices.clone()), - target.clone(), - ), - language_spec(target.clone()) - .items - .clone() - .param_type_sep - .clone(), - ), - ty, - ) - } + let ty = emit_node_type(param_node_type_expr(¶m), target.clone(), source_indices.clone()); +v2_rt::concat(v2_rt::concat(emit_ident(param_node_name_at(param.clone(), source_indices.clone()), target.clone()), language_spec(target.clone()).items.clone().param_type_sep.clone()), ty) +} } -pub fn emit_params_shared( - params: Rc>>, - target: &RenderTarget, - source_indices: Rc>>, -) -> String { +pub fn emit_params_shared(params: Rc>>, target: &RenderTarget, source_indices: Rc>>) -> String { { - let strs = Rc::new({ - let mut __result = Vec::new(); - for p in params.iter().cloned() { - __result.push(emit_param_shared(&p, &target, &source_indices)); - } - __result - }); - strs.join( - &language_spec(target.clone()) - .items - .clone() - .param_separator - .clone(), - ) - } + let strs = Rc::new({ let mut __result = Vec::new(); for p in params.iter().cloned() { __result.push(emit_param_shared(&p, &target, &source_indices)); } __result }); +strs.join(&language_spec(target.clone()).items.clone().param_separator.clone()) +} } -pub fn emit_inferred_shared( - inferred: &Rc, - target: &RenderTarget, - source_indices: Rc>>, -) -> String { - if language_spec(target.clone()) - .expression_semantics - .clone() - .suppress_unit_return - .clone() - { +pub fn emit_inferred_shared(inferred: &Rc, target: &RenderTarget, source_indices: Rc>>) -> String { + if language_spec(target.clone()).expression_semantics.clone().suppress_unit_return.clone() { if is_unit_like(&inferred) { "".to_string() } else { - v2_rt::concat( - language_spec(target.clone()) - .items - .clone() - .return_arrow - .clone(), - emit_node_type(inferred.clone(), target.clone(), source_indices), - ) + v2_rt::concat(language_spec(target.clone()).items.clone().return_arrow.clone(), emit_node_type(inferred.clone(), target.clone(), source_indices)) } } else { - v2_rt::concat( - language_spec(target.clone()) - .items - .clone() - .return_arrow - .clone(), - emit_node_type(inferred.clone(), target.clone(), source_indices), - ) + v2_rt::concat(language_spec(target.clone()).items.clone().return_arrow.clone(), emit_node_type(inferred.clone(), target.clone(), source_indices)) } } -pub fn emit_typed_block_join( - stmts: Rc>>, - scope: Rc, - depth: i64, - emit_block_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone, -) -> String { +pub fn emit_typed_block_join(stmts: Rc>>, scope: Rc, depth: i64, emit_block_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone) -> String { { let state = emit_block_stmts(stmts, scope, depth); - state.text.clone().join(&"\n".to_string()) - } +state.text.clone().join(&"\n".to_string()) +} } -pub fn method_template_emit_for_target( - target: RenderTarget, -) -> Option>> { +pub fn method_template_emit_for_target(target: RenderTarget) -> Option>> { match target { - RenderTarget::Rust => Some(rust_method_template_emit()), - RenderTarget::Python => Some(python_method_template_emit()), - RenderTarget::Go => Some(go_method_template_emit()), - RenderTarget::Dag => None, - } + RenderTarget::Rust => Some(rust_method_template_emit()), + RenderTarget::Python => Some(python_method_template_emit()), + RenderTarget::Go => Some(go_method_template_emit()), + RenderTarget::Dag => None, +} } -pub fn emit_algebra_method_template( - method_name: String, - recv_str: String, - first_arg_str: String, - target: RenderTarget, -) -> Option { +pub fn emit_algebra_method_template(method_name: String, recv_str: String, first_arg_str: String, target: RenderTarget) -> Option { match method_template_emit_for_target(target) { - Some(templates) => match v2_rt::map_get(&templates, method_name) { - Some(tmpl) => { - let bindings = v2_rt::rc_map_insert( - seed_bindings("recv".to_string(), recv_str), - "arg".to_string(), - first_arg_str, - ); - Some(apply_named_template(tmpl.clone(), &bindings)) - } - None => None, - }, - None => None, - } + Some(templates) => match v2_rt::map_get(&templates, method_name) { + Some(tmpl) => { + let bindings = v2_rt::rc_map_insert(seed_bindings("recv".to_string(), recv_str), "arg".to_string(), first_arg_str); +Some(apply_named_template(tmpl.clone(), &bindings)) +}, + None => None, +}, + None => None, +} } -pub fn emit_typed_first_arg_shared( - args: Rc>>, - target: RenderTarget, - recurse: impl Fn(Rc) -> String + Clone, -) -> String { +pub fn emit_typed_first_arg_shared(args: Rc>>, target: RenderTarget, recurse: impl Fn(Rc) -> String + Clone) -> String { match args.first().cloned() { - Some(a) => recurse(arg_value(&a)), - None => emit_error_expr("missing method argument".to_string(), target), - } + Some(a) => recurse(arg_value(&a)), + None => emit_error_expr("missing method argument".to_string(), target), +} } -pub fn emit_typed_string_interp_unified( - parts: &Rc>>, - target: RenderTarget, - recurse: impl Fn(Rc) -> String + Clone, -) -> String { +pub fn emit_typed_string_interp_unified(parts: &Rc>>, target: RenderTarget, recurse: impl Fn(Rc) -> String + Clone) -> String { { let spec = language_spec(target); - let interp = spec.string_interp.clone(); - let has_interpolations = { - let mut __found = false; - for p in parts.clone().iter().cloned() { - if match (*p.clone()).clone() { - StringPart::Interpolation { .. } => true, - _ => false, - } { - __found = true; - break; - } +let interp = spec.string_interp.clone(); +let has_interpolations = { let mut __found = false; for p in parts.clone().iter().cloned() { if match (*p.clone()).clone() { + StringPart::Interpolation { .. } => true, + _ => false, +} { __found = true; break; } } __found }; +match (*interp.style.clone()).clone() { + InterpStyle::FormatArgs { placeholder: ph, .. } => { + let fmt_parts = Rc::new({ let mut __result = Vec::new(); for p in parts.clone().iter().cloned() { __result.push(match (*p.clone()).clone() { + StringPart::Text { value: v, .. } => { + let base = escape_string_literal_body(v.clone()); +let escaped = if has_interpolations.clone() { + apply_escape_pairs(base.clone(), interp.escape_pairs.clone()) + } else { + base.clone() + }; +Rc::new(InterpPart { + format_segment: escaped.clone(), + arg_expr: "".to_string(), +}) +}, + StringPart::Interpolation { expr: e, .. } => Rc::new(InterpPart { + format_segment: ph.clone(), + arg_expr: recurse(e.clone()), +}), +}); } __result }); +let fmt_str = Rc::new({ let mut __result = Vec::new(); for p in fmt_parts.clone().iter().cloned() { __result.push(p.format_segment.clone()); } __result }).join(&"".to_string()); +let args = Rc::new({ let mut __result = Vec::new(); for a in Rc::new({ let mut __result = Vec::new(); for p in fmt_parts.clone().iter().cloned() { __result.push(p.arg_expr.clone()); } __result }).iter().cloned() { if (a.clone().as_str() != "".to_string().as_str()) { __result.push(a); } } __result }); +if ((args.clone().len() as i64) == 0) { + apply_type_template1(interp.plain_template.clone(), fmt_str) + } else { + { + let args_str = args.clone().join(&", ".to_string()); +apply_type_template2(interp.format_template.clone(), fmt_str, args_str) +} } - __found - }; - match (*interp.style.clone()).clone() { - InterpStyle::FormatArgs { - placeholder: ph, .. - } => { - let fmt_parts = Rc::new({ - let mut __result = Vec::new(); - for p in parts.clone().iter().cloned() { - __result.push(match (*p.clone()).clone() { - StringPart::Text { value: v, .. } => { - let base = escape_string_literal_body(v.clone()); - let escaped = if has_interpolations.clone() { - apply_escape_pairs(base.clone(), interp.escape_pairs.clone()) - } else { - base.clone() - }; - Rc::new(InterpPart { - format_segment: escaped.clone(), - arg_expr: "".to_string(), - }) - } - StringPart::Interpolation { expr: e, .. } => Rc::new(InterpPart { - format_segment: ph.clone(), - arg_expr: recurse(e.clone()), - }), - }); - } - __result - }); - let fmt_str = Rc::new({ - let mut __result = Vec::new(); - for p in fmt_parts.clone().iter().cloned() { - __result.push(p.format_segment.clone()); - } - __result - }) - .join(&"".to_string()); - let args = Rc::new({ - let mut __result = Vec::new(); - for a in Rc::new({ - let mut __result = Vec::new(); - for p in fmt_parts.clone().iter().cloned() { - __result.push(p.arg_expr.clone()); - } - __result - }) - .iter() - .cloned() - { - if (a.clone().as_str() != "".to_string().as_str()) { - __result.push(a); - } - } - __result - }); - if ((args.clone().len() as i64) == 0) { - apply_type_template1(interp.plain_template.clone(), fmt_str) +}, + InterpStyle::InlineExpr => { + let segments = Rc::new({ let mut __result = Vec::new(); for p in parts.clone().iter().cloned() { __result.push(match (*p.clone()).clone() { + StringPart::Text { value: v, .. } => { + let base = escape_string_literal_body(v.clone()); +if has_interpolations.clone() { + apply_escape_pairs(base.clone(), interp.escape_pairs.clone()) } else { - { - let args_str = args.clone().join(&", ".to_string()); - apply_type_template2(interp.format_template.clone(), fmt_str, args_str) - } + base.clone() } - } - InterpStyle::InlineExpr => { - let segments = Rc::new({ - let mut __result = Vec::new(); - for p in parts.clone().iter().cloned() { - __result.push(match (*p.clone()).clone() { - StringPart::Text { value: v, .. } => { - let base = escape_string_literal_body(v.clone()); - if has_interpolations.clone() { - apply_escape_pairs(base.clone(), interp.escape_pairs.clone()) - } else { - base.clone() - } - } - StringPart::Interpolation { expr: e, .. } => v2_rt::concat( - v2_rt::concat("{".to_string(), recurse(e.clone())), - "}".to_string(), - ), - }); - } - __result - }); - apply_type_template1( - interp.format_template.clone(), - segments.join(&"".to_string()), - ) - } - } - } +}, + StringPart::Interpolation { expr: e, .. } => v2_rt::concat(v2_rt::concat("{".to_string(), recurse(e.clone())), "}".to_string()), +}); } __result }); +apply_type_template1(interp.format_template.clone(), segments.join(&"".to_string())) +}, +} +} } -pub fn emit_typed_record_lit_unified( - type_name: Option, - fields: &Rc>>, - target: &RenderTarget, - source_indices: Rc>>, - recurse: impl Fn(Rc) -> String + Clone, -) -> String { +pub fn emit_typed_record_lit_unified(type_name: Option, fields: &Rc>>, target: &RenderTarget, source_indices: Rc>>, recurse: impl Fn(Rc) -> String + Clone) -> String { { let rls = language_spec(target.clone()).record_lit.clone(); - match type_name { - None => { - if ((fields.clone().len() as i64) == 0) { - rls.anon_empty.clone() - } else { - { - let field_strs = Rc::new({ - let mut __result = Vec::new(); - for f in fields.clone().iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - rls.anon_field_indent.clone(), - "\"".to_string(), - ), - field_init_node_name_at( - f.clone(), - source_indices.clone(), - ), - ), - "\": ".to_string(), - ), - recurse(field_init_node_value(&f)), - ), - ",".to_string(), - )); - } - __result - }); - let fields_str = field_strs.join(&"\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(rls.anon_prefix.clone(), fields_str), - "\n".to_string(), - ), - rls.anon_suffix.clone(), - ) - } - } - } - Some(tn) => { - if ((fields.clone().len() as i64) == 0) { - v2_rt::concat(tn.clone(), rls.named_empty.clone()) - } else { - { - let field_strs = Rc::new({ - let mut __result = Vec::new(); - for f in fields.clone().iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - emit_export_ident( - field_init_node_name_at( - f.clone(), - source_indices.clone(), - ), - &target, - ), - rls.named_field_sep.clone(), - ), - recurse(field_init_node_value(&f)), - )); - } - __result - }); - let fields_str = field_strs.join(&rls.named_field_join.clone()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(tn.clone(), rls.named_open.clone()), - fields_str, - ), - rls.named_close.clone(), - ) - } - } - } - } - } +match type_name { + None => if ((fields.clone().len() as i64) == 0) { + rls.anon_empty.clone() + } else { + { + let field_strs = Rc::new({ let mut __result = Vec::new(); for f in fields.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rls.anon_field_indent.clone(), "\"".to_string()), field_init_node_name_at(f.clone(), source_indices.clone())), "\": ".to_string()), recurse(field_init_node_value(&f))), ",".to_string())); } __result }); +let fields_str = field_strs.join(&"\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(rls.anon_prefix.clone(), fields_str), "\n".to_string()), rls.anon_suffix.clone()) +} + }, + Some(tn) => if ((fields.clone().len() as i64) == 0) { + v2_rt::concat(tn.clone(), rls.named_empty.clone()) + } else { + { + let field_strs = Rc::new({ let mut __result = Vec::new(); for f in fields.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(emit_export_ident(field_init_node_name_at(f.clone(), source_indices.clone()), &target), rls.named_field_sep.clone()), recurse(field_init_node_value(&f)))); } __result }); +let fields_str = field_strs.join(&rls.named_field_join.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(tn.clone(), rls.named_open.clone()), fields_str), rls.named_close.clone()) +} + }, +} +} } -pub fn emit_typed_call_unified( - func: &String, - args: Rc>>, - target: &RenderTarget, - registry: Rc>>, - scope: Rc, - recurse: impl Fn(Rc) -> String + Clone, -) -> String { +pub fn emit_typed_call_unified(func: &String, args: Rc>>, target: &RenderTarget, registry: Rc>>, scope: Rc, recurse: impl Fn(Rc) -> String + Clone) -> String { { let spec = language_spec(target.clone()); - let ordered_args = order_typed_call_args(&args, func.clone(), &scope); - let arg_strs = Rc::new({ - let mut __result = Vec::new(); - for a in ordered_args.iter().cloned() { - __result.push(recurse(arg_value(&a))); - } - __result - }); - let callee = lookup_item(registry, func.clone()); - let extra_args = match callee.clone() { - Some(info) => { - let has_effects = (((info.service_names.clone().len() as i64) > 0) - || ((info.resource_names.clone().len() as i64) > 0)); - if has_effects.clone() { - { - let resource_args = Rc::new({ - let mut __result = Vec::new(); - for rn in info.resource_names.clone().iter().cloned() { - __result.push(emit_ident(rn.clone(), target.clone())); - } - __result - }); - let service_args = Rc::new({ - let mut __result = Vec::new(); - for sn in info.service_names.clone().iter().cloned() { - __result.push(service_var_name(sn.clone())); - } - __result - }); - v2_rt::concat(resource_args, service_args) - } - } else { - Rc::new(vec![]) - } +let ordered_args = order_typed_call_args(&args, func.clone(), &scope); +let arg_strs = Rc::new({ let mut __result = Vec::new(); for a in ordered_args.iter().cloned() { __result.push(recurse(arg_value(&a))); } __result }); +let callee = lookup_item(registry, func.clone()); +let extra_args = match callee.clone() { + Some(info) => { + let has_effects = (((info.service_names.clone().len() as i64) > 0) || ((info.resource_names.clone().len() as i64) > 0)); +if has_effects.clone() { + { + let resource_args = Rc::new({ let mut __result = Vec::new(); for rn in info.resource_names.clone().iter().cloned() { __result.push(emit_ident(rn.clone(), target.clone())); } __result }); +let service_args = Rc::new({ let mut __result = Vec::new(); for sn in info.service_names.clone().iter().cloned() { __result.push(service_var_name(sn.clone())); } __result }); +v2_rt::concat(resource_args, service_args) +} + } else { + Rc::new(vec![]) } - None => Rc::new(vec![]), - }; - let all_args = v2_rt::concat(arg_strs, extra_args); - let args_str = all_args.join(&", ".to_string()); - let call_str = v2_rt::concat( - v2_rt::concat( - v2_rt::concat(emit_export_ident(func.clone(), &target), "(".to_string()), - args_str, - ), - ")".to_string(), - ); - match callee.clone() { - Some(info) => { - let has_effects = (((info.service_names.clone().len() as i64) > 0) - || ((info.resource_names.clone().len() as i64) > 0)); - if has_effects.clone() { - v2_rt::concat(spec.async_call_prefix.clone(), call_str) - } else { - call_str - } +}, + None => Rc::new(vec![]), +}; +let all_args = v2_rt::concat(arg_strs, extra_args); +let args_str = all_args.join(&", ".to_string()); +let call_str = v2_rt::concat(v2_rt::concat(v2_rt::concat(emit_export_ident(func.clone(), &target), "(".to_string()), args_str), ")".to_string()); +match callee.clone() { + Some(info) => { + let has_effects = (((info.service_names.clone().len() as i64) > 0) || ((info.resource_names.clone().len() as i64) > 0)); +if has_effects.clone() { + v2_rt::concat(spec.async_call_prefix.clone(), call_str) + } else { + call_str } - None => call_str, - } - } +}, + None => call_str, +} +} } pub fn bridge_method_name_unified(method_name: String, target: RenderTarget) -> String { { let spec = language_spec(target); - let overridden = - apply_bridge_method_overrides(method_name, spec.bridge_method_overrides.clone()); - apply_naming_case(overridden, spec.bridge_method_case.clone()) - } +let overridden = apply_bridge_method_overrides(method_name, spec.bridge_method_overrides.clone()); +apply_naming_case(overridden, spec.bridge_method_case.clone()) +} } -pub fn emit_algebra_method_call_unified( - method_name: &String, - receiver: Rc, - args: Rc>>, - target: &RenderTarget, - first_arg_str: String, - recurse: impl Fn(Rc) -> String + Clone, -) -> String { +pub fn emit_algebra_method_call_unified(method_name: &String, receiver: Rc, args: Rc>>, target: &RenderTarget, first_arg_str: String, recurse: impl Fn(Rc) -> String + Clone) -> String { { let spec = language_spec(target.clone()); - let recv_str = recurse(receiver); - match emit_algebra_method_template( - method_name.clone(), - recv_str.clone(), - first_arg_str, - target.clone(), - ) { - Some(result) => result.clone(), - None => { - let function_name = bridge_method_name_unified(method_name.clone(), target.clone()); - let arg_strs = Rc::new({ - let mut __result = Vec::new(); - for a in args.iter().cloned() { - __result.push(recurse(arg_value(&a))); - } - __result - }); - let all_args = v2_rt::concat(Rc::new(vec![recv_str.clone()]), arg_strs); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - spec.bridge_method_prefix.clone(), - emit_export_ident(function_name, &target), - ), - "(".to_string(), - ), - all_args.join(&", ".to_string()), - ), - ")".to_string(), - ) - } - } - } +let recv_str = recurse(receiver); +match emit_algebra_method_template(method_name.clone(), recv_str.clone(), first_arg_str, target.clone()) { + Some(result) => result.clone(), + None => { + let function_name = bridge_method_name_unified(method_name.clone(), target.clone()); +let arg_strs = Rc::new({ let mut __result = Vec::new(); for a in args.iter().cloned() { __result.push(recurse(arg_value(&a))); } __result }); +let all_args = v2_rt::concat(Rc::new(vec![recv_str.clone()]), arg_strs); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(spec.bridge_method_prefix.clone(), emit_export_ident(function_name, &target)), "(".to_string()), all_args.join(&", ".to_string())), ")".to_string()) +}, +} +} } -pub fn emit_plain_method_call_unified( - receiver: Rc, - method: String, - args: Rc>>, - target: RenderTarget, - recurse: impl Fn(Rc) -> String + Clone, -) -> String { +pub fn emit_plain_method_call_unified(receiver: Rc, method: String, args: Rc>>, target: RenderTarget, recurse: impl Fn(Rc) -> String + Clone) -> String { { let recv_str = recurse(receiver); - let arg_strs = Rc::new({ - let mut __result = Vec::new(); - for a in args.iter().cloned() { - __result.push(recurse(arg_value(&a))); - } - __result - }); - let args_str = arg_strs.join(&", ".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(recv_str, ".".to_string()), - emit_export_ident(method, &target), - ), - "(".to_string(), - ), - args_str, - ), - ")".to_string(), - ) - } +let arg_strs = Rc::new({ let mut __result = Vec::new(); for a in args.iter().cloned() { __result.push(recurse(arg_value(&a))); } __result }); +let args_str = arg_strs.join(&", ".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(recv_str, ".".to_string()), emit_export_ident(method, &target)), "(".to_string()), args_str), ")".to_string()) +} } -pub fn emit_typed_method_call_unified( - receiver: &Rc, - method: String, - args: &Rc>>, - method_semantics: &Option>, - target: &RenderTarget, - registry: Rc>>, - scope: Rc, - depth: i64, - recurse: impl Fn(Rc) -> String + Clone, -) -> String { +pub fn emit_typed_method_call_unified(receiver: &Rc, method: String, args: &Rc>>, method_semantics: &Option>, target: &RenderTarget, registry: Rc>>, scope: Rc, depth: i64, recurse: impl Fn(Rc) -> String + Clone) -> String { { let spec = language_spec(target.clone()); - let source_indices = scope.type_env.clone().source_indices.clone(); - if (method_semantics.clone() != None) { +let source_indices = scope.type_env.clone().source_indices.clone(); +if (method_semantics.clone() != None) { match (*method_semantics.clone().unwrap()).clone() { - MethodSemantics::ServiceMethodSemantics { - service_name: svc_name, - .. - } => { - let var_name = service_var_name(svc_name.clone()); - let arg_strs = Rc::new({ - let mut __result = Vec::new(); - for a in args.clone().iter().cloned() { - __result.push(recurse(arg_value(&a))); - } - __result - }); - let args_str = arg_strs.join(&", ".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(spec.async_call_prefix.clone(), var_name), - ".".to_string(), - ), - emit_export_ident(method, &target), - ), - "(".to_string(), - ), - args_str, - ), - ")".to_string(), - ) - } - MethodSemantics::AlgebraMethodSemantics { method_def, .. } => { - let mn = authored_name_at(source_indices.clone(), &method_def); - let first_arg_str = - emit_typed_first_arg_shared(args.clone(), target.clone(), recurse.clone()); - emit_algebra_method_call_unified( - &mn, - receiver.clone(), - args.clone(), - &target, - first_arg_str, - recurse.clone(), - ) - } - MethodSemantics::PlainMethodSemantics => emit_plain_method_call_unified( - receiver.clone(), - method, - args.clone(), - target.clone(), - recurse.clone(), - ), - } + MethodSemantics::ServiceMethodSemantics { service_name: svc_name, .. } => { + let var_name = service_var_name(svc_name.clone()); +let arg_strs = Rc::new({ let mut __result = Vec::new(); for a in args.clone().iter().cloned() { __result.push(recurse(arg_value(&a))); } __result }); +let args_str = arg_strs.join(&", ".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(spec.async_call_prefix.clone(), var_name), ".".to_string()), emit_export_ident(method, &target)), "(".to_string()), args_str), ")".to_string()) +}, + MethodSemantics::AlgebraMethodSemantics { method_def, .. } => { + let mn = authored_name_at(source_indices.clone(), &method_def); +let first_arg_str = emit_typed_first_arg_shared(args.clone(), target.clone(), recurse.clone()); +emit_algebra_method_call_unified(&mn, receiver.clone(), args.clone(), &target, first_arg_str, recurse.clone()) +}, + MethodSemantics::PlainMethodSemantics => emit_plain_method_call_unified(receiver.clone(), method, args.clone(), target.clone(), recurse.clone()), +} } else { if is_typed_service_call_receiver(&receiver, source_indices.clone()) { match extract_typed_service_name(&receiver, &source_indices) { - Some(svc_name) => { - let var_name = service_var_name(svc_name.clone()); - let arg_strs = Rc::new({ - let mut __result = Vec::new(); - for a in args.clone().iter().cloned() { - __result.push(recurse(arg_value(&a))); - } - __result - }); - let args_str = arg_strs.join(&", ".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(spec.async_call_prefix.clone(), var_name), - ".".to_string(), - ), - emit_export_ident(method, &target), - ), - "(".to_string(), - ), - args_str, - ), - ")".to_string(), - ) - } - None => { - emit_error_expr("unsupported service receiver".to_string(), target.clone()) - } - } + Some(svc_name) => { + let var_name = service_var_name(svc_name.clone()); +let arg_strs = Rc::new({ let mut __result = Vec::new(); for a in args.clone().iter().cloned() { __result.push(recurse(arg_value(&a))); } __result }); +let args_str = arg_strs.join(&", ".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(spec.async_call_prefix.clone(), var_name), ".".to_string()), emit_export_ident(method, &target)), "(".to_string()), args_str), ")".to_string()) +}, + None => emit_error_expr("unsupported service receiver".to_string(), target.clone()), +} } else { - emit_plain_method_call_unified( - receiver.clone(), - method, - args.clone(), - target.clone(), - recurse.clone(), - ) + emit_plain_method_call_unified(receiver.clone(), method, args.clone(), target.clone(), recurse.clone()) } } - } +} } -pub fn emit_unified_pattern( - pattern: Rc, - target: RenderTarget, - source_indices: Rc>>, -) -> String { +pub fn emit_unified_pattern(pattern: Rc, target: RenderTarget, source_indices: Rc>>) -> String { match (*pattern).clone() { - MatchPattern::Bind { name: n, .. } => emit_ident(n.clone(), target), - MatchPattern::LitPattern { value: v, .. } => emit_literal(v.clone(), &target), - MatchPattern::VariantPattern { - name: n, - field_bindings: fbs, - .. - } => emit_unified_variant_pattern(n.clone(), &fbs, &target, source_indices), - MatchPattern::Wildcard => "_".to_string(), - } + MatchPattern::Bind { name: n, .. } => emit_ident(n.clone(), target), + MatchPattern::LitPattern { value: v, .. } => emit_literal(v.clone(), &target), + MatchPattern::VariantPattern { name: n, field_bindings: fbs, .. } => emit_unified_variant_pattern(n.clone(), &fbs, &target, source_indices), + MatchPattern::Wildcard => "_".to_string(), +} } -pub fn emit_unified_variant_pattern( - name: String, - field_bindings: &Rc>>, - target: &RenderTarget, - source_indices: Rc>>, -) -> String { +pub fn emit_unified_variant_pattern(name: String, field_bindings: &Rc>>, target: &RenderTarget, source_indices: Rc>>) -> String { { let es = language_spec(target.clone()).expression_semantics.clone(); - match es.variant_pattern.clone() { - Some(vps) => { - if ((field_bindings.clone().len() as i64) == 0) { - v2_rt::concat(name, vps.empty_suffix.clone()) - } else { - { - let binding_strs = Rc::new({ - let mut __result = Vec::new(); - for fb in field_bindings.clone().iter().cloned() { - __result.push({ - let pat_str = emit_unified_pattern( - field_binding_pattern(fb.clone()), - target.clone(), - source_indices.clone(), - ); - v2_rt::concat( - v2_rt::concat( - emit_ident( - field_binding_name_at( - fb.clone(), - source_indices.clone(), - ), - target.clone(), - ), - vps.binding_sep.clone(), - ), - pat_str.clone(), - ) - }); - } - __result - }); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(name, vps.open.clone()), - binding_strs.join(&", ".to_string()), - ), - vps.close.clone(), - ) - } - } - } - None => { - if ((field_bindings.clone().len() as i64) > 0) { - emit_error_expr( - v2_rt::concat( - "variant pattern has bindings but target has no destructuring syntax: " - .to_string(), - name, - ), - target.clone(), - ) - } else { - name - } - } - } - } +match es.variant_pattern.clone() { + Some(vps) => if ((field_bindings.clone().len() as i64) == 0) { + v2_rt::concat(name, vps.empty_suffix.clone()) + } else { + { + let binding_strs = Rc::new({ let mut __result = Vec::new(); for fb in field_bindings.clone().iter().cloned() { __result.push({ + let pat_str = emit_unified_pattern(field_binding_pattern(fb.clone()), target.clone(), source_indices.clone()); +v2_rt::concat(v2_rt::concat(emit_ident(field_binding_name_at(fb.clone(), source_indices.clone()), target.clone()), vps.binding_sep.clone()), pat_str.clone()) +}); } __result }); +v2_rt::concat(v2_rt::concat(v2_rt::concat(name, vps.open.clone()), binding_strs.join(&", ".to_string())), vps.close.clone()) +} + }, + None => if ((field_bindings.clone().len() as i64) > 0) { + emit_error_expr(v2_rt::concat("variant pattern has bindings but target has no destructuring syntax: ".to_string(), name), target.clone()) + } else { + name + }, +} +} } -pub fn emit_match_arm_line( - arm: Rc, - target: RenderTarget, - case_depth: i64, - body_depth: i64, - body_str: String, - guard_str: String, - render_pattern: impl Fn(Rc) -> String + Clone, -) -> String { +pub fn emit_match_arm_line(arm: Rc, target: RenderTarget, case_depth: i64, body_depth: i64, body_str: String, guard_str: String, render_pattern: impl Fn(Rc) -> String + Clone) -> String { { let spec = language_spec(target); - let bs = spec.block_syntax.clone(); - let es = spec.expression_semantics.clone(); - let pat = arm_pattern(arm); - let case_kw = match (*pat.clone()).clone() { - MatchPattern::Wildcard => match es.wildcard_case.clone() { - Some(wc) => wc.clone(), - None => v2_rt::concat(bs.case_keyword.clone(), render_pattern(pat.clone())), - }, - _ => v2_rt::concat(bs.case_keyword.clone(), render_pattern(pat.clone())), - }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(v2_rt::concat(make_indent(case_depth), case_kw), guard_str), - ":\n".to_string(), - ), - make_indent(body_depth), - ), - body_str, - ) - } +let bs = spec.block_syntax.clone(); +let es = spec.expression_semantics.clone(); +let pat = arm_pattern(arm); +let case_kw = match (*pat.clone()).clone() { + MatchPattern::Wildcard => match es.wildcard_case.clone() { + Some(wc) => wc.clone(), + None => v2_rt::concat(bs.case_keyword.clone(), render_pattern(pat.clone())), +}, + _ => v2_rt::concat(bs.case_keyword.clone(), render_pattern(pat.clone())), +}; +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(make_indent(case_depth), case_kw), guard_str), ":\n".to_string()), make_indent(body_depth)), body_str) +} } -pub fn emit_arm_guard( - arm: Rc, - target: &RenderTarget, - render_guard_expr: impl Fn(Rc) -> String + Clone, -) -> String { +pub fn emit_arm_guard(arm: Rc, target: &RenderTarget, render_guard_expr: impl Fn(Rc) -> String + Clone) -> String { { let es = language_spec(target.clone()).expression_semantics.clone(); - match arm_guard(&arm) { - Some(g) => match es.guard_prefix.clone() { - Some(prefix) => v2_rt::concat(prefix.clone(), render_guard_expr(g.clone())), - None => emit_error_expr( - "target does not support pattern guards".to_string(), - target.clone(), - ), - }, - None => "".to_string(), - } - } +match arm_guard(&arm) { + Some(g) => match es.guard_prefix.clone() { + Some(prefix) => v2_rt::concat(prefix.clone(), render_guard_expr(g.clone())), + None => emit_error_expr("target does not support pattern guards".to_string(), target.clone()), +}, + None => "".to_string(), +} +} } -pub fn emit_typed_match_unified( - scrutinee_str: String, - arms: Rc>>, - target: &RenderTarget, - depth: i64, - recurse: impl Fn(Rc, i64) -> String + Clone, - render_pattern: impl Fn(Rc) -> String + Clone, - source_indices: Rc>>, -) -> String { +pub fn emit_typed_match_unified(scrutinee_str: String, arms: Rc>>, target: &RenderTarget, depth: i64, recurse: impl Fn(Rc, i64) -> String + Clone, render_pattern: impl Fn(Rc) -> String + Clone, source_indices: Rc>>) -> String { { let bs = language_spec(target.clone()).block_syntax.clone(); - let case_depth = if bs.significant_whitespace.clone() { +let case_depth = if bs.significant_whitespace.clone() { (depth.clone() + 1) } else { depth.clone() }; - let body_depth = (case_depth.clone() + 1); - let arm_strs = Rc::new({ - let mut __result = Vec::new(); - for arm in arms.iter().cloned() { - __result.push({ - let body_str = recurse(arm_body(&arm), body_depth.clone()); - let guard_str = - emit_arm_guard(arm.clone(), &target, |g| recurse(g.clone(), depth.clone())); - emit_match_arm_line( - arm.clone(), - target.clone(), - case_depth.clone(), - body_depth.clone(), - body_str.clone(), - guard_str.clone(), - render_pattern.clone(), - ) - }); - } - __result - }); - let arms_str = arm_strs.join(&"\n".to_string()); - if (bs.block_close.clone().as_str() == "".to_string().as_str()) { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(bs.match_keyword.clone(), scrutinee_str), - bs.block_open.clone(), - ), - arms_str, - ) +let body_depth = (case_depth.clone() + 1); +let arm_strs = Rc::new({ let mut __result = Vec::new(); for arm in arms.iter().cloned() { __result.push({ + let body_str = recurse(arm_body(&arm), body_depth.clone()); +let guard_str = emit_arm_guard(arm.clone(), &target, |g| recurse(g.clone(), depth.clone())); +emit_match_arm_line(arm.clone(), target.clone(), case_depth.clone(), body_depth.clone(), body_str.clone(), guard_str.clone(), render_pattern.clone()) +}); } __result }); +let arms_str = arm_strs.join(&"\n".to_string()); +if (bs.block_close.clone().as_str() == "".to_string().as_str()) { + v2_rt::concat(v2_rt::concat(v2_rt::concat(bs.match_keyword.clone(), scrutinee_str), bs.block_open.clone()), arms_str) } else { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(bs.match_keyword.clone(), scrutinee_str), - bs.block_open.clone(), - ), - arms_str, - ), - "\n".to_string(), - ), - make_indent(depth.clone()), - ), - bs.block_close.clone(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(bs.match_keyword.clone(), scrutinee_str), bs.block_open.clone()), arms_str), "\n".to_string()), make_indent(depth.clone())), bs.block_close.clone()) } - } +} } -pub fn emit_field_access_unified( - base_str: String, - field: String, - summary: Option>, - target: &RenderTarget, -) -> String { +pub fn emit_field_access_unified(base_str: String, field: String, summary: Option>, target: &RenderTarget) -> String { { let ts = language_spec(target.clone()).tuple_syntax.clone(); - match summary { - Some(fs) => match fs.access_style.clone() { - FieldAccessStyle::TupleFirst => v2_rt::concat(base_str, ts.first_accessor.clone()), - FieldAccessStyle::TupleSecond => { - v2_rt::concat(base_str, ts.second_accessor.clone()) - } - _ => v2_rt::concat( - v2_rt::concat(base_str, ".".to_string()), - emit_export_ident(field, &target), - ), - }, - None => v2_rt::concat( - v2_rt::concat(base_str, ".".to_string()), - emit_export_ident(field, &target), - ), - } - } +match summary { + Some(fs) => match fs.access_style.clone() { + FieldAccessStyle::TupleFirst => v2_rt::concat(base_str, ts.first_accessor.clone()), + FieldAccessStyle::TupleSecond => v2_rt::concat(base_str, ts.second_accessor.clone()), + _ => v2_rt::concat(v2_rt::concat(base_str, ".".to_string()), emit_export_ident(field, &target)), +}, + None => v2_rt::concat(v2_rt::concat(base_str, ".".to_string()), emit_export_ident(field, &target)), +} +} } -pub fn emit_unified_typed_expr( - texpr: Rc, - target: &RenderTarget, - registry: Rc>>, - scope: &Rc, - depth: i64, - fuel: i64, - render_pattern: impl Fn(Rc) -> String + Clone, -) -> String { +pub fn emit_unified_typed_expr(texpr: Rc, target: &RenderTarget, registry: Rc>>, scope: &Rc, depth: i64, fuel: i64, render_pattern: impl Fn(Rc) -> String + Clone) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let si = scope.type_env.clone().source_indices.clone(); - let spec = language_spec(target.clone()); - emit_shared_expr( - &texpr, - &target, - si.clone(), - |result| result.clone(), - |child| { - emit_unified_typed_expr( - child.clone(), - &target, - registry.clone(), - &scope, - depth.clone(), - (fuel.clone() - 1), - render_pattern.clone(), - ) - }, - |expr| emit_expr_var_shared(expr.clone(), target.clone(), si.clone()), - |expr| { + { + let si = scope.type_env.clone().source_indices.clone(); +let spec = language_spec(target.clone()); +emit_shared_expr(&texpr, &target, si.clone(), |result| result.clone(), |child| emit_unified_typed_expr(child.clone(), &target, registry.clone(), &scope, depth.clone(), (fuel.clone() - 1), render_pattern.clone()), |expr| emit_expr_var_shared(expr.clone(), target.clone(), si.clone()), |expr| { let fa_si = scope.type_env.clone().source_indices.clone(); - if is_typed_service_call_receiver(&expr, fa_si.clone()) { +if is_typed_service_call_receiver(&expr, fa_si.clone()) { match extract_typed_service_name(&expr, &fa_si) { - Some(svc_name) => service_var_name(svc_name.clone()), - None => { - let base_str = emit_unified_typed_expr( - field_access_base(expr.clone()), - &target, - registry.clone(), - &scope, - depth.clone(), - 1024, - render_pattern.clone(), - ); - emit_field_access_unified( - base_str.clone(), - field_access_field_at(expr.clone(), fa_si.clone()), - expr_field_access_summary(expr.clone()), - &target, - ) - } - } + Some(svc_name) => service_var_name(svc_name.clone()), + None => { + let base_str = emit_unified_typed_expr(field_access_base(expr.clone()), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone()); +emit_field_access_unified(base_str.clone(), field_access_field_at(expr.clone(), fa_si.clone()), expr_field_access_summary(expr.clone()), &target) +}, +} } else { { - let base_str = emit_unified_typed_expr( - field_access_base(expr.clone()), - &target, - registry.clone(), - &scope, - depth.clone(), - 1024, - render_pattern.clone(), - ); - emit_field_access_unified( - base_str.clone(), - field_access_field_at(expr.clone(), fa_si.clone()), - expr_field_access_summary(expr.clone()), - &target, - ) - } - } - }, - |expr| { - emit_typed_call_unified( - &expr_call_func_at(expr.clone(), si.clone()), - expr.children.clone(), - &target, - registry.clone(), - scope.clone(), - |n| { - emit_unified_typed_expr( - n.clone(), - &target, - registry.clone(), - &scope, - depth.clone(), - 1024, - render_pattern.clone(), - ) - }, - ) - }, - |expr| { - emit_typed_method_call_unified( - &method_receiver(expr.clone()), - expr_method_name_at(expr.clone(), si.clone()), - &method_arg_nodes(expr.clone()), - &expr_method_call_semantics(expr.clone()), - &target, - registry.clone(), - scope.clone(), - depth.clone(), - |n| { - emit_unified_typed_expr( - n.clone(), - &target, - registry.clone(), - &scope, - depth.clone(), - 1024, - render_pattern.clone(), - ) - }, - ) - }, - |expr| { - let scrut_str = emit_unified_typed_expr( - match_scrutinee(expr.clone()), - &target, - registry.clone(), - &scope, - depth.clone(), - 1024, - render_pattern.clone(), - ); - emit_typed_match_unified( - scrut_str.clone(), - match_arm_nodes(expr.clone()), - &target, - depth.clone(), - |node, d| { - emit_unified_typed_expr( - node.clone(), - &target, - registry.clone(), - &scope, - d.clone(), - 1024, - render_pattern.clone(), - ) - }, - render_pattern.clone(), - si.clone(), - ) - }, - |expr| { - let cond_str = emit_unified_typed_expr( - if_condition(expr.clone()), - &target, - registry.clone(), - &scope, - depth.clone(), - 1024, - render_pattern.clone(), - ); - let if_result_type = match spec.expression_semantics.clone().if_value_form.clone() { - IfValueForm::IfStatement => Some(resolved_type(expr.clone())), - _ => None, + let base_str = emit_unified_typed_expr(field_access_base(expr.clone()), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone()); +emit_field_access_unified(base_str.clone(), field_access_field_at(expr.clone(), fa_si.clone()), expr_field_access_summary(expr.clone()), &target) +} + } +}, |expr| emit_typed_call_unified(&expr_call_func_at(expr.clone(), si.clone()), expr.children.clone(), &target, registry.clone(), scope.clone(), |n| emit_unified_typed_expr(n.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone())), |expr| emit_typed_method_call_unified(&method_receiver(expr.clone()), expr_method_name_at(expr.clone(), si.clone()), &method_arg_nodes(expr.clone()), &expr_method_call_semantics(expr.clone()), &target, registry.clone(), scope.clone(), depth.clone(), |n| emit_unified_typed_expr(n.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone())), |expr| { + let scrut_str = emit_unified_typed_expr(match_scrutinee(expr.clone()), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone()); +emit_typed_match_unified(scrut_str.clone(), match_arm_nodes(expr.clone()), &target, depth.clone(), |node, d| emit_unified_typed_expr(node.clone(), &target, registry.clone(), &scope, d.clone(), 1024, render_pattern.clone()), render_pattern.clone(), si.clone()) +}, |expr| { + let cond_str = emit_unified_typed_expr(if_condition(expr.clone()), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone()); +let if_result_type = match spec.expression_semantics.clone().if_value_form.clone() { + IfValueForm::IfStatement => Some(resolved_type(expr.clone())), + _ => None, +}; +emit_typed_if_shared(cond_str.clone(), &if_then_branch(expr.clone()), if_else_branch(expr.clone()), if_result_type.clone(), depth.clone(), &target, si.clone(), |node, d| emit_unified_typed_expr(node.clone(), &target, registry.clone(), &scope, d.clone(), 1024, render_pattern.clone())) +}, |expr| { + let val_str = emit_unified_typed_expr(let_value(expr.clone()), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone()); +emit_typed_let_shared(&let_binding_name_at(expr.clone(), si.clone()), val_str.clone(), let_body(expr.clone()), target.clone(), |bd, sc| emit_unified_typed_expr(bd.clone(), &target, registry.clone(), &sc, depth.clone(), 1024, render_pattern.clone()), scope.clone(), let_value(expr.clone())) +}, |expr| emit_typed_record_lit_unified(record_lit_type_name_at(expr.clone(), si.clone()), &expr.children.clone(), &target, si.clone(), |n| emit_unified_typed_expr(n.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone())), |expr| emit_typed_string_interp_unified(&extract_string_interp_parts(expr.clone()), target.clone(), |e| emit_unified_typed_expr(e.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone())), |expr| emit_typed_block_join(expr.children.clone(), scope.clone(), depth.clone(), |remaining, sc, d| { + let prepend = if spec.block_syntax.clone().significant_whitespace.clone() { + false + } else { + true }; - emit_typed_if_shared( - cond_str.clone(), - &if_then_branch(expr.clone()), - if_else_branch(expr.clone()), - if_result_type.clone(), - depth.clone(), - &target, - si.clone(), - |node, d| { - emit_unified_typed_expr( - node.clone(), - &target, - registry.clone(), - &scope, - d.clone(), - 1024, - render_pattern.clone(), - ) - }, - ) - }, - |expr| { - let val_str = emit_unified_typed_expr( - let_value(expr.clone()), - &target, - registry.clone(), - &scope, - depth.clone(), - 1024, - render_pattern.clone(), - ); - emit_typed_let_shared( - &let_binding_name_at(expr.clone(), si.clone()), - val_str.clone(), - let_body(expr.clone()), - target.clone(), - |bd, sc| { - emit_unified_typed_expr( - bd.clone(), - &target, - registry.clone(), - &sc, - depth.clone(), - 1024, - render_pattern.clone(), - ) - }, - scope.clone(), - let_value(expr.clone()), - ) - }, - |expr| { - emit_typed_record_lit_unified( - record_lit_type_name_at(expr.clone(), si.clone()), - &expr.children.clone(), - &target, - si.clone(), - |n| { - emit_unified_typed_expr( - n.clone(), - &target, - registry.clone(), - &scope, - depth.clone(), - 1024, - render_pattern.clone(), - ) - }, - ) - }, - |expr| { - emit_typed_string_interp_unified( - &extract_string_interp_parts(expr.clone()), - target.clone(), - |e| { - emit_unified_typed_expr( - e.clone(), - &target, - registry.clone(), - &scope, - depth.clone(), - 1024, - render_pattern.clone(), - ) - }, - ) - }, - |expr| { - emit_typed_block_join( - expr.children.clone(), - scope.clone(), - depth.clone(), - |remaining, sc, d| { - let prepend = if spec.block_syntax.clone().significant_whitespace.clone() { - false - } else { - true - }; - emit_block_stmts_shared( - remaining.clone(), - Rc::new(vec![]), - sc.clone(), - d.clone(), - prepend.clone(), - |stmt, s, dd| { - emit_unified_typed_expr( - stmt.clone(), - &target, - registry.clone(), - &s, - dd.clone(), - 1024, - render_pattern.clone(), - ) - }, - ) - }, - ) - }, - |expr| { - emit_typed_cast_shared( - &cast_expr(expr.clone()), - cast_target(expr.clone()), - &target, - |child| { - emit_unified_typed_expr( - child.clone(), - &target, - registry.clone(), - &scope, - depth.clone(), - 1024, - render_pattern.clone(), - ) - }, - &si, - ) - }, - |expr| { - emit_typed_for_each_shared( - &foreach_variable_at(expr.clone(), si.clone()), - &foreach_collection(expr.clone()), - foreach_body(expr.clone()), - &target, - depth.clone(), - si.clone(), - |child, s, d| { - emit_unified_typed_expr( - child.clone(), - &target, - registry.clone(), - &s, - d.clone(), - 1024, - render_pattern.clone(), - ) - }, - &scope, - ) - }, - |expr| { - emit_typed_index_shared( - &index_base(expr.clone()), - index_expr(expr.clone()), - &target, - |child| { - emit_unified_typed_expr( - child.clone(), - &target, - registry.clone(), - &scope, - depth.clone(), - 1024, - render_pattern.clone(), - ) - }, - &si, - ) - }, - |expr| { - emit_typed_slice_shared( - &slice_base(expr.clone()), - slice_start(expr.clone()), - slice_end(expr.clone()), - &target, - |child| { - emit_unified_typed_expr( - child.clone(), - &target, - registry.clone(), - &scope, - depth.clone(), - 1024, - render_pattern.clone(), - ) - }, - si.clone(), - ) - }, - |expr| { - emit_default_bin_op( - &expr, - target.clone(), - si.clone(), - |child| { - emit_unified_typed_expr( - child.clone(), - &target, - registry.clone(), - &scope, - depth.clone(), - (fuel.clone() - 1), - render_pattern.clone(), - ) - }, - |result| result.clone(), - ) - }, - ) +emit_block_stmts_shared(remaining.clone(), Rc::new(vec![]), sc.clone(), d.clone(), prepend.clone(), |stmt, s, dd| emit_unified_typed_expr(stmt.clone(), &target, registry.clone(), &s, dd.clone(), 1024, render_pattern.clone())) +}), |expr| emit_typed_cast_shared(&cast_expr(expr.clone()), cast_target(expr.clone()), &target, |child| emit_unified_typed_expr(child.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone()), &si), |expr| emit_typed_for_each_shared(&foreach_variable_at(expr.clone(), si.clone()), &foreach_collection(expr.clone()), foreach_body(expr.clone()), &target, depth.clone(), si.clone(), |child, s, d| emit_unified_typed_expr(child.clone(), &target, registry.clone(), &s, d.clone(), 1024, render_pattern.clone()), &scope), |expr| emit_typed_index_shared(&index_base(expr.clone()), index_expr(expr.clone()), &target, |child| emit_unified_typed_expr(child.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone()), &si), |expr| emit_typed_slice_shared(&slice_base(expr.clone()), slice_start(expr.clone()), slice_end(expr.clone()), &target, |child| emit_unified_typed_expr(child.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone()), si.clone()), |expr| emit_default_bin_op(&expr, target.clone(), si.clone(), |child| emit_unified_typed_expr(child.clone(), &target, registry.clone(), &scope, depth.clone(), (fuel.clone() - 1), render_pattern.clone()), |result| result.clone())) +} }) } -pub fn is_tco_identity_passthrough( - arg_val: &Rc, - param_name: String, - si: Rc>>, -) -> bool { +pub fn is_tco_identity_passthrough(arg_val: &Rc, param_name: String, si: Rc>>) -> bool { match (*arg_val.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - (expr_var_name_at(arg_val.clone(), si).as_str() == param_name.as_str()) - } - _ => false, - } + ExprData::ExprVar { .. } => (expr_var_name_at(arg_val.clone(), si).as_str() == param_name.as_str()), + _ => false, +} } -pub fn emit_typed_tco_reassign_shared( - args: Rc>>, - params: Rc>>, - target: &RenderTarget, - recurse: impl Fn(Rc) -> String + Clone, - source_indices: Rc>>, -) -> String { +pub fn emit_typed_tco_reassign_shared(args: Rc>>, params: Rc>>, target: &RenderTarget, recurse: impl Fn(Rc) -> String + Clone, source_indices: Rc>>) -> String { { - let arg_values = Rc::new({ - let mut __result = Vec::new(); - for a in args.iter().cloned() { - __result.push(arg_value(&a)); - } - __result - }); - let pairs = Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - params - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - if { - let pname = param_node_name_at(pair.1.clone(), source_indices.clone()); - let av = match arg_values.clone().get(pair.0.clone() as usize).cloned() { - Some(v) => v.clone(), - None => pair.1.clone(), - }; - !is_tco_identity_passthrough(&av, pname.clone(), source_indices.clone()) - } { - __result.push(pair); - } - } - __result - }); - let filtered_arg_values = Rc::new({ - let mut __result = Vec::new(); - for pair in pairs.clone().iter().cloned() { - __result.push( - match arg_values.clone().get(pair.0.clone() as usize).cloned() { - Some(v) => v.clone(), - None => pair.1.clone(), - }, - ); - } - __result - }); - let ordered_args = Rc::new({ - let mut __result = Vec::new(); - for av in filtered_arg_values.iter().cloned() { - __result.push(recurse(av.clone())); - } - __result - }); - let param_names = Rc::new({ - let mut __result = Vec::new(); - for pair in pairs.clone().iter().cloned() { - __result.push(emit_ident( - param_node_name_at(pair.1.clone(), source_indices.clone()), - target.clone(), - )); - } - __result - }); - shared_tco_reassign(ordered_args, param_names, &language_spec(target.clone())) - } + let arg_values = Rc::new({ let mut __result = Vec::new(); for a in args.iter().cloned() { __result.push(arg_value(&a)); } __result }); +let pairs = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(params.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if { + let pname = param_node_name_at(pair.1.clone(), source_indices.clone()); +let av = match arg_values.clone().get(pair.0.clone() as usize).cloned() { + Some(v) => v.clone(), + None => pair.1.clone(), +}; +!is_tco_identity_passthrough(&av, pname.clone(), source_indices.clone()) +} { __result.push(pair); } } __result }); +let filtered_arg_values = Rc::new({ let mut __result = Vec::new(); for pair in pairs.clone().iter().cloned() { __result.push(match arg_values.clone().get(pair.0.clone() as usize).cloned() { + Some(v) => v.clone(), + None => pair.1.clone(), +}); } __result }); +let ordered_args = Rc::new({ let mut __result = Vec::new(); for av in filtered_arg_values.iter().cloned() { __result.push(recurse(av.clone())); } __result }); +let param_names = Rc::new({ let mut __result = Vec::new(); for pair in pairs.clone().iter().cloned() { __result.push(emit_ident(param_node_name_at(pair.1.clone(), source_indices.clone()), target.clone())); } __result }); +shared_tco_reassign(ordered_args, param_names, &language_spec(target.clone())) +} } pub fn seed_bindings(key: String, value: String) -> Rc> { diff --git a/src/v2/stage0/src/v2_compiler_emit_go.rs b/src/v2/stage0/src/v2_compiler_emit_go.rs index c84b2b03217..5dfc39fc302 100644 --- a/src/v2/stage0/src/v2_compiler_emit_go.rs +++ b/src/v2/stage0/src/v2_compiler_emit_go.rs @@ -1,683 +1,220 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.emit_go -pub use crate::extdeps_languages_go_emit::{go_reserved, go_reserved_escape_suffix}; -pub use crate::std_induction::SubValueRelation; -use crate::std_induction::SubValueRelation::SubValueUnknown; -pub use crate::v2_compiler_artifact::RenderTarget; -use crate::v2_compiler_artifact::RenderTarget::Go; -pub use crate::v2_compiler_emit::{ - apply_named_template, apply_naming_case, apply_type_template1, apply_type_template2, - apply_type_template3, capitalize_first, compute_service_fields, effective_operation_transport, - emit_algebra_method_template, emit_bin_op_symbol, emit_container, emit_default_bin_op, - emit_error_expr, emit_expr_field_access_shared, emit_expr_var_shared, emit_ident, - emit_inferred_shared, emit_keyword, emit_lambda, emit_lambda_params, emit_let_binding, - emit_list_lit_expr, emit_literal, emit_map_type, emit_node_type, emit_null_coalesce, - emit_param_shared, emit_params_shared, emit_return, emit_shared_expr, emit_simple_expr, - emit_string_literal, emit_tco_unified, emit_typed_block_join, emit_typed_call_unified, - emit_typed_cast_shared, emit_typed_first_arg_shared, emit_typed_for_each_shared, - emit_typed_if_shared, emit_typed_index_shared, emit_typed_let_shared, emit_typed_match_unified, - emit_typed_method_call_unified, emit_typed_record_lit_unified, emit_typed_slice_shared, - emit_typed_string_interp_unified, emit_unary_op, emit_unified_init_block_stmts, - emit_unified_operation_method, emit_unified_pattern, emit_unified_service_def, - emit_unified_transport_dispatch, emit_unified_typed_expr, emit_unified_typed_func_body, - empty_emit_scope, escape_go_interp_text, escape_json_string, escape_string_literal_body, - extract_string_interp_parts, extract_test_projections, has_nested_records_node, - is_data_def_item, is_function_item, is_null_coalesce, is_resource_def_item, - is_service_def_item, is_service_item, is_tco_eligible, is_type_alias_item, - is_type_alias_return_node, is_type_decl_item, is_type_def_item, is_upper, language_spec, - lookup_item, make_indent, module_emit_scope, module_to_filename, order_typed_call_args, - sanitize_service_name, scope_after_expr, seed_bindings, service_fallback_transport, - service_field_decls, service_var_name, test_file_path, test_function_name, to_lower_char, - to_screaming_snake, to_snake, to_string, to_string_helper, to_upper_char, - typed_named_arg_matches, unique_strings, BlockEmitState, EmitResult, InterpPart, - ServiceFieldSet, TestProjection, -}; -pub use crate::v2_compiler_infer::{build_params_scope, expr_span, extend_scope, InferScope}; -pub use crate::v2_compiler_infer_env::{authored_name, TypeBinding, TypeEnv}; -pub use crate::v2_compiler_infer_items::{ItemInfo, ResolvedGraph, TypedModule}; -pub use crate::v2_compiler_infer_service::{ - extract_typed_service_name, is_typed_service_call_receiver, -}; -pub use crate::v2_compiler_infer_sigs::{ResolvedFuncEnv, ResolvedFuncSig}; -pub use crate::v2_compiler_infer_types::{ - node_is_keyed_collection, normalize_access_type_node, resolved_type, -}; -use crate::v2_compiler_languages::VisibilitySpec::CaseVisibility; -pub use crate::v2_compiler_languages::{ - is_string_like, scaffold_for_target, test_conventions_for_target, ItemKeywords, - TestConventions, VisibilitySpec, -}; +use std::collections::HashMap; +use std::rc::Rc; use crate::v2_rt; -use crate::v2_std_core::BinOp::NullCoalesce; -use crate::v2_std_core::Cardinality::CardOptional; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::v2_std_core::{Node, InferredNode, VarBindingKind, import_is_all, module_imports, module_items, param_node_type_expr, authored_name_at, NewlineIndex, expr_var_name_at, expr_call_func_at, expr_method_name_at, let_binding_name_at, param_node_name_at, resource_use_name_at, MatchPattern, LiteralValue, TextFile, SourceSpan, resource_use_resource, BinOp, UnaryOpKind, StringPart, DeclaredFuncSig, transport_has_auth, transport_auth_header_name, transport_headers, transport_env, ExprData, make_expr_node, MethodSemantics, FieldSummary, FieldAccessStyle, arg_value, arm_body, arm_pattern, arm_guard, field_init_node_name_at, field_init_node_value, if_condition, if_then_branch, if_else_branch, match_scrutinee, match_arm_nodes, let_value, let_body, field_access_base, field_access_field_at, method_receiver, expr_field_access_summary, expr_method_call_semantics, record_lit_type_name_at, lambda_body, cast_expr, cast_target, return_value, foreach_variable_at, foreach_collection, foreach_body, method_arg_nodes, index_base, index_expr, slice_base, slice_start, slice_end, with_required_cardinality, Connective, is_rest_transport, is_shell_transport, is_file_transport, Cardinality}; +use crate::v2_std_core::InferredNode::{Resolved, CompilerError}; +use crate::v2_std_core::VarBindingKind::{FunctionValueBinding}; +use crate::v2_std_core::BinOp::{NullCoalesce}; +use crate::v2_std_core::ExprData::{NoExprData, ExprLiteral, ExprError, ExprVar, ExprFieldAccess, ExprCall, ExprMethodCall, ExprMatch, ExprIf, ExprLet, ExprRecordLit, ExprListLit, ExprBinOp, ExprUnaryOp, ExprLambda, ExprStringInterp, ExprBlock, ExprCast, ExprForEach, ExprIndex, ExprSlice, ExprReturn}; +use crate::v2_std_core::MethodSemantics::{PlainMethodSemantics, AlgebraMethodSemantics, ServiceMethodSemantics}; +use crate::v2_std_core::StringPart::{Text, Interpolation}; +use crate::v2_std_core::FieldAccessStyle::{StoredField, EnumAccessor, OptionalUnwrap, TupleFirst, TupleSecond}; use crate::v2_std_core::Connective::{Conj, Disj}; -use crate::v2_std_core::ExprData::{ - ExprBinOp, ExprBlock, ExprCall, ExprCast, ExprError, ExprFieldAccess, ExprForEach, ExprIf, - ExprIndex, ExprLambda, ExprLet, ExprListLit, ExprLiteral, ExprMatch, ExprMethodCall, - ExprRecordLit, ExprReturn, ExprSlice, ExprStringInterp, ExprUnaryOp, ExprVar, NoExprData, -}; -use crate::v2_std_core::FieldAccessStyle::{ - EnumAccessor, OptionalUnwrap, StoredField, TupleFirst, TupleSecond, -}; -use crate::v2_std_core::InferredNode::{CompilerError, Resolved}; -use crate::v2_std_core::LiteralValue::*; +use crate::v2_std_core::Cardinality::{CardOptional}; use crate::v2_std_core::MatchPattern::*; -use crate::v2_std_core::MethodSemantics::{ - AlgebraMethodSemantics, PlainMethodSemantics, ServiceMethodSemantics, -}; -use crate::v2_std_core::StringPart::{Interpolation, Text}; +use crate::v2_std_core::LiteralValue::*; use crate::v2_std_core::UnaryOpKind::*; -use crate::v2_std_core::VarBindingKind::FunctionValueBinding; -pub use crate::v2_std_core::{ - arg_value, arm_body, arm_guard, arm_pattern, authored_name_at, cast_expr, cast_target, - expr_call_func_at, expr_field_access_summary, expr_method_call_semantics, expr_method_name_at, - expr_var_name_at, field_access_base, field_access_field_at, field_init_node_name_at, - field_init_node_value, foreach_body, foreach_collection, foreach_variable_at, if_condition, - if_else_branch, if_then_branch, import_is_all, index_base, index_expr, is_file_transport, - is_rest_transport, is_shell_transport, lambda_body, let_binding_name_at, let_body, let_value, - make_expr_node, match_arm_nodes, match_scrutinee, method_arg_nodes, method_receiver, - module_imports, module_items, param_node_name_at, param_node_type_expr, - record_lit_type_name_at, resource_use_name_at, resource_use_resource, return_value, slice_base, - slice_end, slice_start, transport_auth_header_name, transport_env, transport_has_auth, - transport_headers, with_required_cardinality, BinOp, Cardinality, Connective, DeclaredFuncSig, - ExprData, FieldAccessStyle, FieldSummary, InferredNode, LiteralValue, MatchPattern, - MethodSemantics, NewlineIndex, Node, SourceSpan, StringPart, TextFile, UnaryOpKind, - VarBindingKind, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; -use std::collections::HashMap; -use std::rc::Rc; +pub use crate::v2_compiler_artifact::{RenderTarget}; +use crate::v2_compiler_artifact::RenderTarget::{Go}; +pub use crate::extdeps_languages_go_emit::{go_reserved, go_reserved_escape_suffix}; +pub use crate::v2_compiler_languages::{scaffold_for_target, TestConventions, ItemKeywords, test_conventions_for_target, is_string_like, VisibilitySpec}; +use crate::v2_compiler_languages::VisibilitySpec::{CaseVisibility}; +pub use crate::v2_compiler_infer_env::{TypeEnv, TypeBinding, authored_name}; +pub use crate::v2_compiler_infer_types::{resolved_type, normalize_access_type_node, node_is_keyed_collection}; +pub use crate::v2_compiler_infer_sigs::{ResolvedFuncSig, ResolvedFuncEnv}; +pub use crate::v2_compiler_infer_items::{ResolvedGraph, TypedModule, ItemInfo}; +pub use crate::v2_compiler_infer_service::{is_typed_service_call_receiver, extract_typed_service_name}; +pub use crate::v2_compiler_infer::{InferScope, build_params_scope, extend_scope, expr_span}; +pub use crate::std_induction::{SubValueRelation}; +use crate::std_induction::SubValueRelation::{SubValueUnknown}; +pub use crate::v2_compiler_emit::{EmitResult, BlockEmitState, InterpPart, TestProjection, emit_literal, emit_bin_op_symbol, emit_keyword, emit_container, emit_map_type, emit_node_type, emit_ident, emit_let_binding, emit_simple_expr, emit_unary_op, emit_lambda, emit_error_expr, emit_return, emit_lambda_params, emit_list_lit_expr, emit_shared_expr, emit_default_bin_op, emit_string_literal, escape_go_interp_text, escape_string_literal_body, empty_emit_scope, module_emit_scope, scope_after_expr, lookup_item, unique_strings, escape_json_string, module_to_filename, make_indent, to_string, to_string_helper, to_snake, to_screaming_snake, is_upper, to_lower_char, to_upper_char, capitalize_first, sanitize_service_name, service_var_name, test_function_name, apply_type_template1, apply_type_template2, apply_type_template3, apply_named_template, language_spec, is_null_coalesce, emit_null_coalesce, is_type_alias_return_node, has_nested_records_node, is_service_item, typed_named_arg_matches, order_typed_call_args, is_type_def_item, is_type_alias_item, is_type_decl_item, is_function_item, is_data_def_item, is_service_def_item, is_resource_def_item, extract_test_projections, is_tco_eligible, service_fallback_transport, effective_operation_transport, ServiceFieldSet, compute_service_fields, service_field_decls, seed_bindings, emit_expr_var_shared, emit_expr_field_access_shared, extract_string_interp_parts, emit_typed_cast_shared, emit_typed_for_each_shared, emit_typed_index_shared, emit_typed_slice_shared, emit_unified_init_block_stmts, emit_typed_if_shared, emit_typed_let_shared, emit_param_shared, emit_params_shared, apply_naming_case, emit_inferred_shared, emit_typed_block_join, emit_typed_first_arg_shared, emit_algebra_method_template, emit_typed_string_interp_unified, emit_typed_record_lit_unified, emit_typed_call_unified, emit_typed_method_call_unified, emit_typed_match_unified, emit_unified_typed_expr, emit_tco_unified, emit_unified_pattern, test_file_path, emit_unified_typed_func_body, emit_unified_service_def, emit_unified_operation_method, emit_unified_transport_dispatch}; pub fn emit_go(typed: &Rc) -> Rc { { let registry = typed.item_registry.clone(); - let test_projections = extract_test_projections(typed.clone()); - let module_files = Rc::new({ - let mut __result = Vec::new(); - for tm in typed.modules.clone().iter().cloned() { - __result.push(emit_go_module(&tm, registry.clone())); - } - __result - }); - let test_files = Rc::new({ - let mut __result = Vec::new(); - for f in Rc::new({ - let mut __result = Vec::new(); - for tm in typed.modules.clone().iter().cloned() { - __result.push(emit_go_test_file( - &authored_name_at( - tm.type_env.clone().source_indices.clone(), - &tm.module.clone(), - ), - &Rc::new({ - let mut __result = Vec::new(); - for p in test_projections.clone().iter().cloned() { - if (p.module_name.clone().as_str() - == authored_name_at( - tm.type_env.clone().source_indices.clone(), - &tm.module.clone(), - ) - .as_str()) - { - __result.push(p); - } - } - __result - }), - )); - } - __result - }) - .iter() - .cloned() - { - if (f.path.clone().as_str() != "".to_string().as_str()) { - __result.push(f); - } - } - __result - }); - let go_mod = emit_go_mod("generated".to_string()); - let files = v2_rt::concat( - v2_rt::concat(Rc::new(vec![go_mod]), module_files), - test_files, - ); - Rc::new(EmitResult { - files: files, - diagnostics: Rc::new(vec![]), - }) - } +let test_projections = extract_test_projections(typed.clone()); +let module_files = Rc::new({ let mut __result = Vec::new(); for tm in typed.modules.clone().iter().cloned() { __result.push(emit_go_module(&tm, registry.clone())); } __result }); +let test_files = Rc::new({ let mut __result = Vec::new(); for f in Rc::new({ let mut __result = Vec::new(); for tm in typed.modules.clone().iter().cloned() { __result.push(emit_go_test_file(&authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone()), &Rc::new({ let mut __result = Vec::new(); for p in test_projections.clone().iter().cloned() { if (p.module_name.clone().as_str() == authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone()).as_str()) { __result.push(p); } } __result }))); } __result }).iter().cloned() { if (f.path.clone().as_str() != "".to_string().as_str()) { __result.push(f); } } __result }); +let go_mod = emit_go_mod("generated".to_string()); +let files = v2_rt::concat(v2_rt::concat(Rc::new(vec![go_mod]), module_files), test_files); +Rc::new(EmitResult { + files: files, + diagnostics: Rc::new(vec![]), +}) +} } pub fn emit_go_mod(module_name: String) -> Rc { { let manifest_path = match scaffold_for_target(RenderTarget::Go).manifest_file.clone() { - Some(path) => path.clone(), - None => "go.mod".to_string(), - }; - let content = v2_rt::concat( - v2_rt::concat("module ".to_string(), module_name), - "\n\ngo 1.21\n".to_string(), - ); - Rc::new(TextFile { - path: manifest_path, - content: content, - }) - } + Some(path) => path.clone(), + None => "go.mod".to_string(), +}; +let content = v2_rt::concat(v2_rt::concat("module ".to_string(), module_name), "\n\ngo 1.21\n".to_string()); +Rc::new(TextFile { + path: manifest_path, + content: content, +}) +} } -pub fn go_mock_expr_uses_fmt( - expr: Rc, - source_indices: Rc>>, -) -> bool { +pub fn go_mock_expr_uses_fmt(expr: Rc, source_indices: Rc>>) -> bool { { let rendered = emit_simple_expr(&expr, &RenderTarget::Go, &source_indices); - ((Rc::new( - rendered - .split(&"fmt.Sprintf(".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .len() as i64) - > 1) - } +((Rc::new(rendered.split(&"fmt.Sprintf(".to_string()).map(|s| s.to_string()).collect::>()).len() as i64) > 1) +} } pub fn go_test_import_block(projections: Rc>>) -> String { { - let needs_fmt = { - let mut __found = false; - for p in projections.iter().cloned() { - if { - let mut __found = false; - for mp in p.mock_field_inits.clone().iter().cloned() { - if go_mock_expr_uses_fmt( - field_init_node_value(&mp), - p.source_indices.clone(), - ) { - __found = true; - break; - } - } - __found - } { - __found = true; - break; - } - } - __found - }; - if needs_fmt { + let needs_fmt = { let mut __found = false; for p in projections.iter().cloned() { if { let mut __found = false; for mp in p.mock_field_inits.clone().iter().cloned() { if go_mock_expr_uses_fmt(field_init_node_value(&mp), p.source_indices.clone()) { __found = true; break; } } __found } { __found = true; break; } } __found }; +if needs_fmt { "import (\n\t\"fmt\"\n\t\"testing\"\n)\n\n".to_string() } else { "import \"testing\"\n\n".to_string() } - } +} } pub fn go_test_signature_comment(projection: &Rc) -> String { { - let params_str = Rc::new({ - let mut __result = Vec::new(); - for p in projection.params.clone().iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - param_node_name_at(p.clone(), projection.source_indices.clone()), - " ".to_string(), - ), - emit_node_type( - param_node_type_expr(&p), - RenderTarget::Go, - projection.source_indices.clone(), - ), - )); - } - __result - }) - .join(&", ".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "// Signature: ".to_string(), - sanitize_service_name(projection.service_name.clone()), - ), - ".".to_string(), - ), - projection.operation_name.clone(), - ), - "(".to_string(), - ), - params_str, - ), - ") ".to_string(), - ), - emit_node_type( - projection.inferred.clone(), - RenderTarget::Go, - projection.source_indices.clone(), - ), - ) - } + let params_str = Rc::new({ let mut __result = Vec::new(); for p in projection.params.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(param_node_name_at(p.clone(), projection.source_indices.clone()), " ".to_string()), emit_node_type(param_node_type_expr(&p), RenderTarget::Go, projection.source_indices.clone()))); } __result }).join(&", ".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("// Signature: ".to_string(), sanitize_service_name(projection.service_name.clone())), ".".to_string()), projection.operation_name.clone()), "(".to_string()), params_str), ") ".to_string()), emit_node_type(projection.inferred.clone(), RenderTarget::Go, projection.source_indices.clone())) +} } -pub fn emit_go_test_file( - module_name: &String, - projections: &Rc>>, -) -> Rc { +pub fn emit_go_test_file(module_name: &String, projections: &Rc>>) -> Rc { if ((projections.clone().len() as i64) == 0) { Rc::new(TextFile { - path: "".to_string(), - content: "".to_string(), - }) + path: "".to_string(), + content: "".to_string(), +}) } else { { let package_name = go_package_name(module_name.clone()); - let tests_str = Rc::new({ - let mut __result = Vec::new(); - for p in projections.clone().iter().cloned() { - __result.push(emit_go_operation_test(&p, 0)); - } - __result - }) - .join(&"\n\n".to_string()); - let content = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "// Generated tests -- do not edit.\n" - .to_string(), - "// Source module: ".to_string(), - ), - module_name.clone(), - ), - "\n\n".to_string(), - ), - language_spec(RenderTarget::Go) - .items - .clone() - .module_keyword - .clone(), - ), - " ".to_string(), - ), - package_name, - ), - "\n\n".to_string(), - ), - go_test_import_block(projections.clone()), - ), - tests_str, - ), - "\n".to_string(), - ); - Rc::new(TextFile { - path: test_file_path(module_name.clone(), &RenderTarget::Go), - content: content, - }) - } +let tests_str = Rc::new({ let mut __result = Vec::new(); for p in projections.clone().iter().cloned() { __result.push(emit_go_operation_test(&p, 0)); } __result }).join(&"\n\n".to_string()); +let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("// Generated tests -- do not edit.\n".to_string(), "// Source module: ".to_string()), module_name.clone()), "\n\n".to_string()), language_spec(RenderTarget::Go).items.clone().module_keyword.clone()), " ".to_string()), package_name), "\n\n".to_string()), go_test_import_block(projections.clone())), tests_str), "\n".to_string()); +Rc::new(TextFile { + path: test_file_path(module_name.clone(), &RenderTarget::Go), + content: content, +}) +} } } pub fn emit_go_operation_test(projection: &Rc, depth: i64) -> String { { let test_name = test_function_name(&projection, RenderTarget::Go); - let struct_name = sanitize_service_name(projection.service_name.clone()); - let indent = make_indent((depth.clone() + 1)); - let mock_setup = Rc::new({ - let mut __result = Vec::new(); - for mp in projection.mock_field_inits.clone().iter().cloned() { - __result.push(emit_go_mock_prop_setup( - &mp, - (depth.clone() + 1), - &projection.source_indices.clone(), - )); - } - __result - }) - .join(&"\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - language_spec( - RenderTarget::Go, - ) - .items - .clone() - .func_keyword - .clone(), - " ".to_string(), - ), - test_name, - ), - "(t *testing.T) {\n".to_string(), - ), - indent.clone(), - ), - go_test_signature_comment(&projection), - ), - "\n".to_string(), - ), - indent.clone(), - ), - "_ = ".to_string(), - ), - struct_name, - ), - "{}\n".to_string(), - ), - indent.clone(), - ), - mock_setup, - ), - "\n".to_string(), - ), - indent.clone(), - ), - "// TODO: add dry-run support to Go service emission for full invocation tests\n" - .to_string(), - ), - "}".to_string(), - ) - } +let struct_name = sanitize_service_name(projection.service_name.clone()); +let indent = make_indent((depth.clone() + 1)); +let mock_setup = Rc::new({ let mut __result = Vec::new(); for mp in projection.mock_field_inits.clone().iter().cloned() { __result.push(emit_go_mock_prop_setup(&mp, (depth.clone() + 1), &projection.source_indices.clone())); } __result }).join(&"\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().func_keyword.clone(), " ".to_string()), test_name), "(t *testing.T) {\n".to_string()), indent.clone()), go_test_signature_comment(&projection)), "\n".to_string()), indent.clone()), "_ = ".to_string()), struct_name), "{}\n".to_string()), indent.clone()), mock_setup), "\n".to_string()), indent.clone()), "// TODO: add dry-run support to Go service emission for full invocation tests\n".to_string()), "}".to_string()) +} } -pub fn emit_go_mock_prop_setup( - mock_prop: &Rc, - depth: i64, - source_indices: &Rc>>, -) -> String { - v2_rt::concat( - v2_rt::concat( - emit_ident( - field_init_node_name_at(mock_prop.clone(), source_indices.clone()), - RenderTarget::Go, - ), - " := ".to_string(), - ), - emit_simple_expr( - &field_init_node_value(&mock_prop), - &RenderTarget::Go, - &source_indices, - ), - ) +pub fn emit_go_mock_prop_setup(mock_prop: &Rc, depth: i64, source_indices: &Rc>>) -> String { + v2_rt::concat(v2_rt::concat(emit_ident(field_init_node_name_at(mock_prop.clone(), source_indices.clone()), RenderTarget::Go), " := ".to_string()), emit_simple_expr(&field_init_node_value(&mock_prop), &RenderTarget::Go, &source_indices)) } -pub fn emit_go_module( - typed_module: &Rc, - registry: Rc>>, -) -> Rc { +pub fn emit_go_module(typed_module: &Rc, registry: Rc>>) -> Rc { { let m = typed_module.module.clone(); - let scope = module_emit_scope(&typed_module); - let si = typed_module.type_env.clone().source_indices.clone(); - let mod_name_str = authored_name_at(si.clone(), &m); - let pkg_name = go_package_name(mod_name_str.clone()); - let pkg_decl = v2_rt::concat( - v2_rt::concat( - language_spec(RenderTarget::Go) - .items - .clone() - .module_keyword - .clone(), - " ".to_string(), - ), - pkg_name, - ); - let imports_str = emit_go_imports( - &typed_module.items.clone(), - module_imports(m.clone()), - si.clone(), - ); - let imports_section = if (imports_str.clone().as_str() == "".to_string().as_str()) { +let scope = module_emit_scope(&typed_module); +let si = typed_module.type_env.clone().source_indices.clone(); +let mod_name_str = authored_name_at(si.clone(), &m); +let pkg_name = go_package_name(mod_name_str.clone()); +let pkg_decl = v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().module_keyword.clone(), " ".to_string()), pkg_name); +let imports_str = emit_go_imports(&typed_module.items.clone(), module_imports(m.clone()), si.clone()); +let imports_section = if (imports_str.clone().as_str() == "".to_string().as_str()) { "".to_string() } else { v2_rt::concat("\n\n".to_string(), imports_str.clone()) }; - let items_str = Rc::new({ - let mut __result = Vec::new(); - for item in typed_module.items.clone().iter().cloned() { - __result.push(emit_go_typed_item(&item, registry.clone(), &scope)); - } - __result - }) - .join(&"\n\n".to_string()); - let filename = module_to_filename(mod_name_str.clone()); - let content = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "// Generated by v2 compiler -- do not edit.\n".to_string(), - "// Source module: ".to_string(), - ), - mod_name_str.clone(), - ), - "\n\n".to_string(), - ), - pkg_decl, - ), - imports_section, - ), - "\n\n".to_string(), - ), - items_str, - ), - "\n".to_string(), - ); - Rc::new(TextFile { - path: v2_rt::concat( - filename, - scaffold_for_target(RenderTarget::Go) - .source_file_extension - .clone(), - ), - content: content, - }) - } +let items_str = Rc::new({ let mut __result = Vec::new(); for item in typed_module.items.clone().iter().cloned() { __result.push(emit_go_typed_item(&item, registry.clone(), &scope)); } __result }).join(&"\n\n".to_string()); +let filename = module_to_filename(mod_name_str.clone()); +let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("// Generated by v2 compiler -- do not edit.\n".to_string(), "// Source module: ".to_string()), mod_name_str.clone()), "\n\n".to_string()), pkg_decl), imports_section), "\n\n".to_string()), items_str), "\n".to_string()); +Rc::new(TextFile { + path: v2_rt::concat(filename, scaffold_for_target(RenderTarget::Go).source_file_extension.clone()), + content: content, +}) +} } pub fn go_package_name(module_name: String) -> String { { - let parts = Rc::new( - module_name - .split(&".".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ); - match parts.last().cloned() { - Some(last_part) => Rc::new({ - let mut __result = Vec::new(); - for c in Rc::new( - last_part - .clone() - .chars() - .map(|c| c as i64) - .collect::>(), - ) - .iter() - .cloned() - { - __result.push(to_lower_char(c.clone())); - } - __result - }) - .join(&"".to_string()), - None => "main".to_string(), - } - } + let parts = Rc::new(module_name.split(&".".to_string()).map(|s| s.to_string()).collect::>()); +match parts.last().cloned() { + Some(last_part) => Rc::new({ let mut __result = Vec::new(); for c in Rc::new(last_part.clone().chars().map(|c| c as i64).collect::>()).iter().cloned() { __result.push(to_lower_char(c.clone())); } __result }).join(&"".to_string()), + None => "main".to_string(), +} +} } -pub fn emit_go_imports( - items: &Rc>>, - imports: Rc>>, - source_indices: Rc>>, -) -> String { +pub fn emit_go_imports(items: &Rc>>, imports: Rc>>, source_indices: Rc>>) -> String { { - let has_services = { - let mut __found = false; - for item in items.clone().iter().cloned() { - if is_service_item(&item) { - __found = true; - break; - } - } - __found - }; - let has_types = { - let mut __found = false; - for item in items.clone().iter().cloned() { - if is_type_def_item(&item) { - __found = true; - break; - } - } - __found - }; - let has_functions = { - let mut __found = false; - for item in items.clone().iter().cloned() { - if is_function_item(&item) { - __found = true; - break; - } - } - __found - }; - let std_imports = collect_go_std_imports(&has_services, has_types, has_functions); - let pkg_imports = Rc::new({ - let mut __result = Vec::new(); - for imp in imports.iter().cloned() { - __result.push({ - let mod_name = - module_to_filename(authored_name_at(source_indices.clone(), &imp)); - v2_rt::concat( - v2_rt::concat("\t\"generated/".to_string(), mod_name.clone()), - "\"".to_string(), - ) - }); - } - __result - }); - let all_imports = v2_rt::concat(std_imports, pkg_imports); - if ((all_imports.clone().len() as i64) == 0) { + let has_services = { let mut __found = false; for item in items.clone().iter().cloned() { if is_service_item(&item) { __found = true; break; } } __found }; +let has_types = { let mut __found = false; for item in items.clone().iter().cloned() { if is_type_def_item(&item) { __found = true; break; } } __found }; +let has_functions = { let mut __found = false; for item in items.clone().iter().cloned() { if is_function_item(&item) { __found = true; break; } } __found }; +let std_imports = collect_go_std_imports(&has_services, has_types, has_functions); +let pkg_imports = Rc::new({ let mut __result = Vec::new(); for imp in imports.iter().cloned() { __result.push({ + let mod_name = module_to_filename(authored_name_at(source_indices.clone(), &imp)); +v2_rt::concat(v2_rt::concat("\t\"generated/".to_string(), mod_name.clone()), "\"".to_string()) +}); } __result }); +let all_imports = v2_rt::concat(std_imports, pkg_imports); +if ((all_imports.clone().len() as i64) == 0) { "".to_string() } else { { let imports_str = all_imports.clone().join(&"\n".to_string()); - v2_rt::concat( - v2_rt::concat("import (\n".to_string(), imports_str), - "\n)".to_string(), - ) - } +v2_rt::concat(v2_rt::concat("import (\n".to_string(), imports_str), "\n)".to_string()) +} } - } +} } -pub fn collect_go_std_imports( - has_services: &bool, - has_types: bool, - has_functions: bool, -) -> Rc> { +pub fn collect_go_std_imports(has_services: &bool, has_types: bool, has_functions: bool) -> Rc> { { let fmt_import = if ((has_types || has_functions) || has_services.clone()) { Rc::new(vec!["\t\"fmt\"".to_string()]) } else { Rc::new(vec![]) }; - let net_imports = if has_services.clone() { - Rc::new(vec![ - "\t\"net/http\"".to_string(), - "\t\"encoding/json\"".to_string(), - "\t\"bytes\"".to_string(), - "\t\"io\"".to_string(), - ]) +let net_imports = if has_services.clone() { + Rc::new(vec!["\t\"net/http\"".to_string(), "\t\"encoding/json\"".to_string(), "\t\"bytes\"".to_string(), "\t\"io\"".to_string()]) } else { Rc::new(vec![]) }; - v2_rt::concat(fmt_import, net_imports) - } +v2_rt::concat(fmt_import, net_imports) +} } -pub fn emit_go_typed_item( - item: &Rc, - registry: Rc>>, - scope: &Rc, -) -> String { +pub fn emit_go_typed_item(item: &Rc, registry: Rc>>, scope: &Rc) -> String { { let env = scope.type_env.clone(); - let item_text = authored_name(env.clone(), item.clone()); - if is_type_def_item(&item) { +let item_text = authored_name(env.clone(), item.clone()); +if is_type_def_item(&item) { emit_go_type_def_from_connective(&item, &env) } else { if is_type_alias_item(&item, env.source_indices.clone()) { - emit_go_type_alias( - item_text, - resolved_type(item.clone()), - env.source_indices.clone(), - ) + emit_go_type_alias(item_text, resolved_type(item.clone()), env.source_indices.clone()) } else { if is_type_decl_item(&item, env.source_indices.clone()) { "".to_string() } else { if is_function_item(&item) { if ((item.uses.clone().len() as i64) > 0) { - emit_go_func_def( - &item_text, - &item.params.clone(), - resolved_type(item.clone()), - &item.uses.clone(), - item.body.clone().clone().unwrap(), - ®istry, - &scope, - ) + emit_go_func_def(&item_text, &item.params.clone(), resolved_type(item.clone()), &item.uses.clone(), item.body.clone().clone().unwrap(), ®istry, &scope) } else { - emit_go_fn_def( - &item_text, - &item.params.clone(), - resolved_type(item.clone()), - &item.body.clone().clone().unwrap(), - ®istry, - &scope, - ) + emit_go_fn_def(&item_text, &item.params.clone(), resolved_type(item.clone()), &item.body.clone().clone().unwrap(), ®istry, &scope) } } else { if is_data_def_item(&item) { - emit_go_data_def( - item_text, - item.type_annotation.clone().clone().unwrap(), - item.body.clone().clone().unwrap(), - registry, - &scope, - 0, - ) + emit_go_data_def(item_text, item.type_annotation.clone().clone().unwrap(), item.body.clone().clone().unwrap(), registry, &scope, 0) } else { if is_service_def_item(&item) { emit_go_service_def(item.clone(), registry, env.clone()) @@ -685,21 +222,7 @@ pub fn emit_go_typed_item( if is_resource_def_item(&item) { emit_go_resource_def(&item, &env) } else { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - language_spec(RenderTarget::Go) - .items - .clone() - .func_keyword - .clone(), - " init() { panic(\"EMIT BUG: unhandled item: " - .to_string(), - ), - item_text, - ), - "\") }".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().func_keyword.clone(), " init() { panic(\"EMIT BUG: unhandled item: ".to_string()), item_text), "\") }".to_string()) } } } @@ -707,1065 +230,255 @@ pub fn emit_go_typed_item( } } } - } +} } pub fn emit_go_type_def_from_connective(item: &Rc, env: &Rc) -> String { { let item_text = authored_name(env.clone(), item.clone()); - let is_product = (item.connective.clone() == Connective::Conj); - if is_product { +let is_product = (item.connective.clone() == Connective::Conj); +if is_product { emit_go_struct_from_children(item_text, &item.children.clone(), env.clone()) } else { emit_go_sum_from_children(&item_text, &item.children.clone(), env.clone()) } - } +} } -pub fn emit_go_struct_from_children( - name: String, - children: &Rc>>, - env: Rc, -) -> String { +pub fn emit_go_struct_from_children(name: String, children: &Rc>>, env: Rc) -> String { if ((children.clone().len() as i64) == 0) { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - language_spec(RenderTarget::Go) - .items - .clone() - .type_alias_keyword - .clone(), - " ".to_string(), - ), - name, - ), - " ".to_string(), - ), - language_spec(RenderTarget::Go) - .items - .clone() - .struct_keyword - .clone(), - ), - "{}".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().type_alias_keyword.clone(), " ".to_string()), name), " ".to_string()), language_spec(RenderTarget::Go).items.clone().struct_keyword.clone()), "{}".to_string()) } else { { - let field_lines = Rc::new({ - let mut __result = Vec::new(); - for child in children.clone().iter().cloned() { - __result.push(emit_go_struct_field_from_child(&child, &env)); - } - __result - }); - let fields_str = field_lines.join(&"\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - language_spec(RenderTarget::Go) - .items - .clone() - .type_alias_keyword - .clone(), - " ".to_string(), - ), - name, - ), - " ".to_string(), - ), - language_spec(RenderTarget::Go) - .items - .clone() - .struct_keyword - .clone(), - ), - " {\n".to_string(), - ), - fields_str, - ), - "\n}".to_string(), - ) - } + let field_lines = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { __result.push(emit_go_struct_field_from_child(&child, &env)); } __result }); +let fields_str = field_lines.join(&"\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().type_alias_keyword.clone(), " ".to_string()), name), " ".to_string()), language_spec(RenderTarget::Go).items.clone().struct_keyword.clone()), " {\n".to_string()), fields_str), "\n}".to_string()) +} } } pub fn emit_go_struct_field_from_child(child: &Rc, env: &Rc) -> String { { let child_text = authored_name(env.clone(), child.clone()); - let ty = emit_node_type( - resolved_type(child.clone()), - RenderTarget::Go, - env.source_indices.clone(), - ); - let json_tag = v2_rt::concat( - v2_rt::concat(" `json:\"".to_string(), to_snake(child_text.clone())), - "\"`".to_string(), - ); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("\t".to_string(), go_export_ident(child_text.clone())), - " ".to_string(), - ), - ty, - ), - json_tag, - ) - } +let ty = emit_node_type(resolved_type(child.clone()), RenderTarget::Go, env.source_indices.clone()); +let json_tag = v2_rt::concat(v2_rt::concat(" `json:\"".to_string(), to_snake(child_text.clone())), "\"`".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("\t".to_string(), go_export_ident(child_text.clone())), " ".to_string()), ty), json_tag) +} } -pub fn emit_go_sum_from_children( - name: &String, - children: &Rc>>, - env: Rc, -) -> String { +pub fn emit_go_sum_from_children(name: &String, children: &Rc>>, env: Rc) -> String { { - let has_data = { - let mut __found = false; - for child in children.clone().iter().cloned() { - if ((child.children.clone().len() as i64) > 0) { - __found = true; - break; - } - } - __found - }; - if has_data { + let has_data = { let mut __found = false; for child in children.clone().iter().cloned() { if ((child.children.clone().len() as i64) > 0) { __found = true; break; } } __found }; +if has_data { { - let iface = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - language_spec(RenderTarget::Go) - .items - .clone() - .type_alias_keyword - .clone(), - " ".to_string(), - ), - name.clone(), - ), - " interface {\n\tis".to_string(), - ), - name.clone(), - ), - "()\n}".to_string(), - ); - let variant_structs = Rc::new({ - let mut __result = Vec::new(); - for child in children.clone().iter().cloned() { - __result.push(emit_go_variant_struct(&name, &child, &env)); - } - __result - }); - let structs_str = variant_structs.join(&"\n\n".to_string()); - v2_rt::concat(v2_rt::concat(iface, "\n\n".to_string()), structs_str) - } + let iface = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().type_alias_keyword.clone(), " ".to_string()), name.clone()), " interface {\n\tis".to_string()), name.clone()), "()\n}".to_string()); +let variant_structs = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { __result.push(emit_go_variant_struct(&name, &child, &env)); } __result }); +let structs_str = variant_structs.join(&"\n\n".to_string()); +v2_rt::concat(v2_rt::concat(iface, "\n\n".to_string()), structs_str) +} } else { { - let type_decl = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - language_spec(RenderTarget::Go) - .items - .clone() - .enum_keyword - .clone(), - " ".to_string(), - ), - name.clone(), - ), - " int".to_string(), - ); - let variant_consts = Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - children - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - __result.push({ - let child = pair.1.clone(); - let child_text = authored_name(env.clone(), child.clone()); - if (pair.0.clone() == 0) { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("\t".to_string(), name.clone()), - child_text.clone(), - ), - " ".to_string(), - ), - name.clone(), - ), - " = iota".to_string(), - ) - } else { - v2_rt::concat( - v2_rt::concat("\t".to_string(), name.clone()), - child_text.clone(), - ) - } - }); + let type_decl = v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().enum_keyword.clone(), " ".to_string()), name.clone()), " int".to_string()); +let variant_consts = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ + let child = pair.1.clone(); +let child_text = authored_name(env.clone(), child.clone()); +if (pair.0.clone() == 0) { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("\t".to_string(), name.clone()), child_text.clone()), " ".to_string()), name.clone()), " = iota".to_string()) + } else { + v2_rt::concat(v2_rt::concat("\t".to_string(), name.clone()), child_text.clone()) } - __result - }); - let consts_str = variant_consts.join(&"\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(type_decl, "\n\nconst (\n".to_string()), - consts_str, - ), - "\n)".to_string(), - ) - } +}); } __result }); +let consts_str = variant_consts.join(&"\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(type_decl, "\n\nconst (\n".to_string()), consts_str), "\n)".to_string()) +} } - } +} } pub fn emit_go_variant_struct(parent_name: &String, child: &Rc, env: &Rc) -> String { { - let struct_name = v2_rt::concat( - parent_name.clone(), - authored_name(env.clone(), child.clone()), - ); - let marker_method = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - language_spec(RenderTarget::Go) - .items - .clone() - .func_keyword - .clone(), - " (".to_string(), - ), - struct_name.clone(), - ), - ") is".to_string(), - ), - parent_name.clone(), - ), - "() {}".to_string(), - ); - if ((child.children.clone().len() as i64) == 0) { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - language_spec(RenderTarget::Go) - .items - .clone() - .type_alias_keyword - .clone(), - " ".to_string(), - ), - struct_name.clone(), - ), - " ".to_string(), - ), - language_spec(RenderTarget::Go) - .items - .clone() - .struct_keyword - .clone(), - ), - "{}\n\n".to_string(), - ), - marker_method, - ) + let struct_name = v2_rt::concat(parent_name.clone(), authored_name(env.clone(), child.clone())); +let marker_method = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().func_keyword.clone(), " (".to_string()), struct_name.clone()), ") is".to_string()), parent_name.clone()), "() {}".to_string()); +if ((child.children.clone().len() as i64) == 0) { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().type_alias_keyword.clone(), " ".to_string()), struct_name.clone()), " ".to_string()), language_spec(RenderTarget::Go).items.clone().struct_keyword.clone()), "{}\n\n".to_string()), marker_method) } else { { - let field_lines = Rc::new({ - let mut __result = Vec::new(); - for f in child.children.clone().iter().cloned() { - __result.push(emit_go_struct_field_from_child(&f, &env)); - } - __result - }); - let fields_str = field_lines.join(&"\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - language_spec(RenderTarget::Go) - .items - .clone() - .type_alias_keyword - .clone(), - " ".to_string(), - ), - struct_name.clone(), - ), - " ".to_string(), - ), - language_spec(RenderTarget::Go) - .items - .clone() - .struct_keyword - .clone(), - ), - " {\n".to_string(), - ), - fields_str, - ), - "\n}\n\n".to_string(), - ), - marker_method, - ) - } + let field_lines = Rc::new({ let mut __result = Vec::new(); for f in child.children.clone().iter().cloned() { __result.push(emit_go_struct_field_from_child(&f, &env)); } __result }); +let fields_str = field_lines.join(&"\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().type_alias_keyword.clone(), " ".to_string()), struct_name.clone()), " ".to_string()), language_spec(RenderTarget::Go).items.clone().struct_keyword.clone()), " {\n".to_string()), fields_str), "\n}\n\n".to_string()), marker_method) +} } - } +} } -pub fn emit_go_type_alias( - name: String, - base: Rc, - source_indices: Rc>>, -) -> String { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - language_spec(RenderTarget::Go) - .items - .clone() - .type_alias_keyword - .clone(), - " ".to_string(), - ), - name, - ), - " = ".to_string(), - ), - emit_node_type(base, RenderTarget::Go, source_indices), - ) +pub fn emit_go_type_alias(name: String, base: Rc, source_indices: Rc>>) -> String { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().type_alias_keyword.clone(), " ".to_string()), name), " = ".to_string()), emit_node_type(base, RenderTarget::Go, source_indices)) } -pub fn emit_go_fn_def( - name: &String, - params: &Rc>>, - inferred: Rc, - body: &Rc, - registry: &Rc>>, - scope: &Rc, -) -> String { +pub fn emit_go_fn_def(name: &String, params: &Rc>>, inferred: Rc, body: &Rc, registry: &Rc>>, scope: &Rc) -> String { { let si = scope.type_env.clone().source_indices.clone(); - let params_str = emit_params_shared(params.clone(), &RenderTarget::Go, si.clone()); - let ret_str = emit_inferred_shared(&inferred, &RenderTarget::Go, si.clone()); - let body_scope = build_params_scope(&scope, params.clone()); - let use_tco = is_tco_eligible(&name, &body, registry.clone(), &si); - if use_tco { +let params_str = emit_params_shared(params.clone(), &RenderTarget::Go, si.clone()); +let ret_str = emit_inferred_shared(&inferred, &RenderTarget::Go, si.clone()); +let body_scope = build_params_scope(&scope, params.clone()); +let use_tco = is_tco_eligible(&name, &body, registry.clone(), &si); +if use_tco { { - let body_str = emit_tco_unified( - body.clone(), - &name, - ¶ms, - &RenderTarget::Go, - ®istry, - &body_scope, - 1, - |pat| emit_unified_pattern(pat.clone(), RenderTarget::Go, si.clone()), - ); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - language_spec(RenderTarget::Go) - .items - .clone() - .func_keyword - .clone(), - " ".to_string(), - ), - go_export_ident(name.clone()), - ), - "(".to_string(), - ), - params_str, - ), - ")".to_string(), - ), - ret_str, - ), - " {\n".to_string(), - ), - body_str, - ), - "\n}".to_string(), - ) - } + let body_str = emit_tco_unified(body.clone(), &name, ¶ms, &RenderTarget::Go, ®istry, &body_scope, 1, |pat| emit_unified_pattern(pat.clone(), RenderTarget::Go, si.clone())); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().func_keyword.clone(), " ".to_string()), go_export_ident(name.clone())), "(".to_string()), params_str), ")".to_string()), ret_str), " {\n".to_string()), body_str), "\n}".to_string()) +} } else { { - let body_str = - emit_go_typed_expr(body.clone(), registry.clone(), &body_scope, 1, 1024); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - language_spec(RenderTarget::Go) - .items - .clone() - .func_keyword - .clone(), - " ".to_string(), - ), - go_export_ident(name.clone()), - ), - "(".to_string(), - ), - params_str, - ), - ")".to_string(), - ), - ret_str, - ), - " {\n".to_string(), - ), - make_indent(1), - ), - "return ".to_string(), - ), - body_str, - ), - "\n}".to_string(), - ) - } + let body_str = emit_go_typed_expr(body.clone(), registry.clone(), &body_scope, 1, 1024); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().func_keyword.clone(), " ".to_string()), go_export_ident(name.clone())), "(".to_string()), params_str), ")".to_string()), ret_str), " {\n".to_string()), make_indent(1)), "return ".to_string()), body_str), "\n}".to_string()) +} } - } +} } -pub fn emit_go_func_def( - name: &String, - params: &Rc>>, - inferred: Rc, - uses: &Rc>>, - body: Rc, - registry: &Rc>>, - scope: &Rc, -) -> String { +pub fn emit_go_func_def(name: &String, params: &Rc>>, inferred: Rc, uses: &Rc>>, body: Rc, registry: &Rc>>, scope: &Rc) -> String { { let service_names = match lookup_item(registry.clone(), name.clone()) { - Some(info) => info.service_names.clone(), - None => Rc::new(vec![]), - }; - let params_str = emit_go_func_params( - params.clone(), - uses.clone(), - service_names, - scope.type_env.clone().source_indices.clone(), - ); - let ret_type = emit_node_type( - inferred, - RenderTarget::Go, - scope.type_env.clone().source_indices.clone(), - ); - let body_scope = build_params_scope(&scope, params.clone()); - let si = scope.type_env.clone().source_indices.clone(); - let body_scope = uses.clone().iter().cloned().fold( - body_scope.clone(), - |s: Rc, u: Rc| { - extend_scope( - &s, - &resource_use_name_at(u.clone(), si.clone()), - resource_use_resource(&u), - Rc::new(SubValueRelation::SubValueUnknown), - ) - }, - ); - let body_str = - emit_unified_typed_func_body(&body, &RenderTarget::Go, ®istry, &body_scope, 1); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - language_spec(RenderTarget::Go) - .items - .clone() - .func_keyword - .clone(), - " ".to_string(), - ), - go_export_ident(name.clone()), - ), - "(".to_string(), - ), - params_str, - ), - ") (".to_string(), - ), - ret_type, - ), - ", error) {\n".to_string(), - ), - body_str, - ), - "\n}".to_string(), - ) - } + Some(info) => info.service_names.clone(), + None => Rc::new(vec![]), +}; +let params_str = emit_go_func_params(params.clone(), uses.clone(), service_names, scope.type_env.clone().source_indices.clone()); +let ret_type = emit_node_type(inferred, RenderTarget::Go, scope.type_env.clone().source_indices.clone()); +let body_scope = build_params_scope(&scope, params.clone()); +let si = scope.type_env.clone().source_indices.clone(); +let body_scope = uses.clone().iter().cloned().fold(body_scope.clone(), |s: Rc, u: Rc| extend_scope(&s, &resource_use_name_at(u.clone(), si.clone()), resource_use_resource(&u), Rc::new(SubValueRelation::SubValueUnknown))); +let body_str = emit_unified_typed_func_body(&body, &RenderTarget::Go, ®istry, &body_scope, 1); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().func_keyword.clone(), " ".to_string()), go_export_ident(name.clone())), "(".to_string()), params_str), ") (".to_string()), ret_type), ", error) {\n".to_string()), body_str), "\n}".to_string()) +} } -pub fn emit_go_func_params( - params: Rc>>, - uses: Rc>>, - service_names: Rc>, - source_indices: Rc>>, -) -> String { +pub fn emit_go_func_params(params: Rc>>, uses: Rc>>, service_names: Rc>, source_indices: Rc>>) -> String { { - let param_strs = Rc::new({ - let mut __result = Vec::new(); - for p in params.iter().cloned() { - __result.push(emit_param_shared(&p, &RenderTarget::Go, &source_indices)); - } - __result - }); - let resource_strs = Rc::new({ - let mut __result = Vec::new(); - for u in uses.iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - emit_ident( - resource_use_name_at(u.clone(), source_indices.clone()), - RenderTarget::Go, - ), - " ".to_string(), - ), - emit_node_type( - resource_use_resource(&u), - RenderTarget::Go, - source_indices.clone(), - ), - )); - } - __result - }); - let service_strs = Rc::new({ - let mut __result = Vec::new(); - for sn in service_names.iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat(service_var_name(sn.clone()), " *".to_string()), - sanitize_service_name(sn.clone()), - )); - } - __result - }); - let all_params = v2_rt::concat(v2_rt::concat(param_strs, resource_strs), service_strs); - all_params.join(&", ".to_string()) - } + let param_strs = Rc::new({ let mut __result = Vec::new(); for p in params.iter().cloned() { __result.push(emit_param_shared(&p, &RenderTarget::Go, &source_indices)); } __result }); +let resource_strs = Rc::new({ let mut __result = Vec::new(); for u in uses.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(emit_ident(resource_use_name_at(u.clone(), source_indices.clone()), RenderTarget::Go), " ".to_string()), emit_node_type(resource_use_resource(&u), RenderTarget::Go, source_indices.clone()))); } __result }); +let service_strs = Rc::new({ let mut __result = Vec::new(); for sn in service_names.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(service_var_name(sn.clone()), " *".to_string()), sanitize_service_name(sn.clone()))); } __result }); +let all_params = v2_rt::concat(v2_rt::concat(param_strs, resource_strs), service_strs); +all_params.join(&", ".to_string()) +} } -pub fn emit_go_typed_expr( - texpr: Rc, - registry: Rc>>, - scope: &Rc, - depth: i64, - fuel: i64, -) -> String { - emit_unified_typed_expr( - texpr, - &RenderTarget::Go, - registry, - &scope, - depth, - fuel, - |pat| { - emit_unified_pattern( - pat.clone(), - RenderTarget::Go, - scope.type_env.clone().source_indices.clone(), - ) - }, - ) +pub fn emit_go_typed_expr(texpr: Rc, registry: Rc>>, scope: &Rc, depth: i64, fuel: i64) -> String { + emit_unified_typed_expr(texpr, &RenderTarget::Go, registry, &scope, depth, fuel, |pat| emit_unified_pattern(pat.clone(), RenderTarget::Go, scope.type_env.clone().source_indices.clone())) } -pub fn emit_go_transport_body( - transport: Rc, - op_name: String, - source_indices: Rc>>, - depth: i64, -) -> String { - emit_unified_transport_dispatch( - &transport, - op_name, - &source_indices, - depth, - RenderTarget::Go, - |n, t, d, si| emit_go_rest_call(n.clone(), &t, d.clone(), &si), - |n, t, d, si| emit_go_shell_call(n.clone(), t.clone(), d.clone(), &si), - |n, d| emit_go_file_call(n.clone(), d.clone()), - |n, d| emit_go_local_call(n.clone(), d.clone()), - ) +pub fn emit_go_transport_body(transport: Rc, op_name: String, source_indices: Rc>>, depth: i64) -> String { + emit_unified_transport_dispatch(&transport, op_name, &source_indices, depth, RenderTarget::Go, |n, t, d, si| emit_go_rest_call(n.clone(), &t, d.clone(), &si), |n, t, d, si| emit_go_shell_call(n.clone(), t.clone(), d.clone(), &si), |n, d| emit_go_file_call(n.clone(), d.clone()), |n, d| emit_go_local_call(n.clone(), d.clone())) } -pub fn emit_go_service_def( - item: Rc, - registry: Rc>>, - env: Rc, -) -> String { - emit_unified_service_def( - &item, - &RenderTarget::Go, - registry, - &env, - |name, transport, ops, si| { - emit_go_service_struct(name.clone(), transport.clone(), ops.clone(), si.clone()) - }, - |transport, op_name, si, depth| { - emit_go_transport_body( - transport.clone(), - op_name.clone(), - si.clone(), - depth.clone(), - ) - }, - ) +pub fn emit_go_service_def(item: Rc, registry: Rc>>, env: Rc) -> String { + emit_unified_service_def(&item, &RenderTarget::Go, registry, &env, |name, transport, ops, si| emit_go_service_struct(name.clone(), transport.clone(), ops.clone(), si.clone()), |transport, op_name, si, depth| emit_go_transport_body(transport.clone(), op_name.clone(), si.clone(), depth.clone())) } -pub fn emit_go_service_struct( - name: String, - fallback_transport: Rc, - op_children: Rc>>, - source_indices: Rc>>, -) -> String { +pub fn emit_go_service_struct(name: String, fallback_transport: Rc, op_children: Rc>>, source_indices: Rc>>) -> String { { let fs = compute_service_fields(&fallback_transport, &op_children, &source_indices); - let decls = - service_field_decls(&fs, &language_spec(RenderTarget::Go).service_fields.clone()); - if ((decls.clone().len() as i64) == 0) { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - language_spec(RenderTarget::Go) - .items - .clone() - .type_alias_keyword - .clone(), - " ".to_string(), - ), - name, - ), - " ".to_string(), - ), - language_spec(RenderTarget::Go) - .items - .clone() - .struct_keyword - .clone(), - ), - "{}".to_string(), - ) +let decls = service_field_decls(&fs, &language_spec(RenderTarget::Go).service_fields.clone()); +if ((decls.clone().len() as i64) == 0) { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().type_alias_keyword.clone(), " ".to_string()), name), " ".to_string()), language_spec(RenderTarget::Go).items.clone().struct_keyword.clone()), "{}".to_string()) } else { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - language_spec(RenderTarget::Go) - .items - .clone() - .type_alias_keyword - .clone(), - " ".to_string(), - ), - name, - ), - " ".to_string(), - ), - language_spec(RenderTarget::Go) - .items - .clone() - .struct_keyword - .clone(), - ), - " {\n".to_string(), - ), - decls.clone().join(&"\n".to_string()), - ), - "\n}".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().type_alias_keyword.clone(), " ".to_string()), name), " ".to_string()), language_spec(RenderTarget::Go).items.clone().struct_keyword.clone()), " {\n".to_string()), decls.clone().join(&"\n".to_string())), "\n}".to_string()) } - } +} } -pub fn emit_go_rest_call( - op_name: String, - transport: &Rc, - depth: i64, - source_indices: &Rc>>, -) -> String { +pub fn emit_go_rest_call(op_name: String, transport: &Rc, depth: i64, source_indices: &Rc>>) -> String { { let prefix = make_indent(depth); - let url_line = v2_rt::concat( - v2_rt::concat( - v2_rt::concat(prefix.clone(), "url := fmt.Sprintf(\"%s/".to_string()), - to_snake(op_name), - ), - "\", c.BaseURL)".to_string(), - ); - let body_line = v2_rt::concat( - prefix.clone(), - "reqBody := bytes.NewBuffer(nil)".to_string(), - ); - let req_line = v2_rt::concat( - v2_rt::concat( - prefix.clone(), - "req, err := http.NewRequest(\"POST\", url, reqBody)\n".to_string(), - ), - "if err != nil {\n\treturn nil, fmt.Errorf(\"creating request: %w\", err)\n}" - .to_string(), - ); - let auth_line = if transport_has_auth(transport.clone(), source_indices.clone()) { +let url_line = v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix.clone(), "url := fmt.Sprintf(\"%s/".to_string()), to_snake(op_name)), "\", c.BaseURL)".to_string()); +let body_line = v2_rt::concat(prefix.clone(), "reqBody := bytes.NewBuffer(nil)".to_string()); +let req_line = v2_rt::concat(v2_rt::concat(prefix.clone(), "req, err := http.NewRequest(\"POST\", url, reqBody)\n".to_string()), "if err != nil {\n\treturn nil, fmt.Errorf(\"creating request: %w\", err)\n}".to_string()); +let auth_line = if transport_has_auth(transport.clone(), source_indices.clone()) { { - let header_name = - match transport_auth_header_name(transport.clone(), source_indices.clone()) { - Some(h) => h.clone(), - None => "Authorization".to_string(), - }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(prefix.clone(), "req.Header.Set(\"".to_string()), - header_name, - ), - "\", c.AuthToken)".to_string(), - ) - } + let header_name = match transport_auth_header_name(transport.clone(), source_indices.clone()) { + Some(h) => h.clone(), + None => "Authorization".to_string(), +}; +v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix.clone(), "req.Header.Set(\"".to_string()), header_name), "\", c.AuthToken)".to_string()) +} } else { "".to_string() }; - let hdrs = transport_headers(transport.clone(), source_indices.clone()); - let header_lines = Rc::new({ - let mut __result = Vec::new(); - for h in hdrs.iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(prefix.clone(), "req.Header.Set(\"".to_string()), - field_init_node_name_at(h.clone(), source_indices.clone()), - ), - "\", ".to_string(), - ), - emit_simple_expr( - &field_init_node_value(&h), - &RenderTarget::Go, - &source_indices, - ), - ), - ")".to_string(), - )); - } - __result - }); - let send_lines = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix.clone(), "resp, err := http.DefaultClient.Do(req)\n".to_string()), "if err != nil {\n\treturn nil, fmt.Errorf(\"sending request: %w\", err)\n}\n".to_string()), "defer resp.Body.Close()\n".to_string()), "body, err := io.ReadAll(resp.Body)\n".to_string()), "if err != nil {\n\treturn nil, fmt.Errorf(\"reading response: %w\", err)\n}\n".to_string()), "var result interface{}\n".to_string()), "if err := json.Unmarshal(body, &result); err != nil {\n".to_string()), "\treturn nil, fmt.Errorf(\"decoding response: %w\", err)\n}\n".to_string()), "return result, nil".to_string()); - let all_lines = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - Rc::new(vec![url_line, body_line, req_line]), - if (auth_line.clone().as_str() == "".to_string().as_str()) { - Rc::new(vec![]) - } else { - Rc::new(vec![auth_line.clone()]) - }, - ), - header_lines, - ), - Rc::new(vec![send_lines]), - ); - all_lines.join(&"\n".to_string()) - } +let hdrs = transport_headers(transport.clone(), source_indices.clone()); +let header_lines = Rc::new({ let mut __result = Vec::new(); for h in hdrs.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix.clone(), "req.Header.Set(\"".to_string()), field_init_node_name_at(h.clone(), source_indices.clone())), "\", ".to_string()), emit_simple_expr(&field_init_node_value(&h), &RenderTarget::Go, &source_indices)), ")".to_string())); } __result }); +let send_lines = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix.clone(), "resp, err := http.DefaultClient.Do(req)\n".to_string()), "if err != nil {\n\treturn nil, fmt.Errorf(\"sending request: %w\", err)\n}\n".to_string()), "defer resp.Body.Close()\n".to_string()), "body, err := io.ReadAll(resp.Body)\n".to_string()), "if err != nil {\n\treturn nil, fmt.Errorf(\"reading response: %w\", err)\n}\n".to_string()), "var result interface{}\n".to_string()), "if err := json.Unmarshal(body, &result); err != nil {\n".to_string()), "\treturn nil, fmt.Errorf(\"decoding response: %w\", err)\n}\n".to_string()), "return result, nil".to_string()); +let all_lines = v2_rt::concat(v2_rt::concat(v2_rt::concat(Rc::new(vec![url_line, body_line, req_line]), if (auth_line.clone().as_str() == "".to_string().as_str()) { + Rc::new(vec![]) + } else { + Rc::new(vec![auth_line.clone()]) + }), header_lines), Rc::new(vec![send_lines])); +all_lines.join(&"\n".to_string()) +} } -pub fn emit_go_shell_call( - op_name: String, - transport: Rc, - depth: i64, - source_indices: &Rc>>, -) -> String { +pub fn emit_go_shell_call(op_name: String, transport: Rc, depth: i64, source_indices: &Rc>>) -> String { { let prefix = make_indent(depth); - let cmd_line = v2_rt::concat( - v2_rt::concat( - v2_rt::concat(prefix.clone(), "cmd := exec.Command(\"".to_string()), - to_snake(op_name), - ), - "\")".to_string(), - ); - let dir_line = v2_rt::concat(prefix.clone(), "cmd.Dir = c.WorkingDir".to_string()); - let envs = transport_env(transport, source_indices.clone()); - let env_lines = Rc::new({ - let mut __result = Vec::new(); - for e in envs.iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - prefix.clone(), - "cmd.Env = append(cmd.Env, \"".to_string(), - ), - field_init_node_name_at(e.clone(), source_indices.clone()), - ), - "=\" + ".to_string(), - ), - emit_simple_expr( - &field_init_node_value(&e), - &RenderTarget::Go, - &source_indices, - ), - ), - ")".to_string(), - )); - } - __result - }); - let run_lines = v2_rt::concat( - v2_rt::concat( - v2_rt::concat(prefix.clone(), "output, err := cmd.Output()\n".to_string()), - "if err != nil {\n\treturn \"\", fmt.Errorf(\"running command: %w\", err)\n}\n" - .to_string(), - ), - "return string(output), nil".to_string(), - ); - let all_lines = v2_rt::concat( - v2_rt::concat(Rc::new(vec![cmd_line, dir_line]), env_lines), - Rc::new(vec![run_lines]), - ); - all_lines.join(&"\n".to_string()) - } +let cmd_line = v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix.clone(), "cmd := exec.Command(\"".to_string()), to_snake(op_name)), "\")".to_string()); +let dir_line = v2_rt::concat(prefix.clone(), "cmd.Dir = c.WorkingDir".to_string()); +let envs = transport_env(transport, source_indices.clone()); +let env_lines = Rc::new({ let mut __result = Vec::new(); for e in envs.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix.clone(), "cmd.Env = append(cmd.Env, \"".to_string()), field_init_node_name_at(e.clone(), source_indices.clone())), "=\" + ".to_string()), emit_simple_expr(&field_init_node_value(&e), &RenderTarget::Go, &source_indices)), ")".to_string())); } __result }); +let run_lines = v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix.clone(), "output, err := cmd.Output()\n".to_string()), "if err != nil {\n\treturn \"\", fmt.Errorf(\"running command: %w\", err)\n}\n".to_string()), "return string(output), nil".to_string()); +let all_lines = v2_rt::concat(v2_rt::concat(Rc::new(vec![cmd_line, dir_line]), env_lines), Rc::new(vec![run_lines])); +all_lines.join(&"\n".to_string()) +} } pub fn emit_go_file_call(op_name: String, depth: i64) -> String { { let prefix = make_indent(depth); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(prefix, "path := fmt.Sprintf(\"%s/".to_string()), - to_snake(op_name), - ), - "\", c.BasePath)\n".to_string(), - ), - "data, err := os.ReadFile(path)\n".to_string(), - ), - "if err != nil {\n\treturn \"\", fmt.Errorf(\"reading file: %w\", err)\n}\n" - .to_string(), - ), - "return string(data), nil".to_string(), - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix, "path := fmt.Sprintf(\"%s/".to_string()), to_snake(op_name)), "\", c.BasePath)\n".to_string()), "data, err := os.ReadFile(path)\n".to_string()), "if err != nil {\n\treturn \"\", fmt.Errorf(\"reading file: %w\", err)\n}\n".to_string()), "return string(data), nil".to_string()) +} } pub fn emit_go_local_call(op_name: String, depth: i64) -> String { { let prefix = make_indent(depth); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - prefix, - "// Local binding -- direct function call\n".to_string(), - ), - "return ".to_string(), - ), - go_export_ident(op_name), - ), - "(), nil".to_string(), - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix, "// Local binding -- direct function call\n".to_string()), "return ".to_string()), go_export_ident(op_name)), "(), nil".to_string()) +} } pub fn emit_go_resource_def(item: &Rc, env: &Rc) -> String { { let item_text = authored_name(env.clone(), item.clone()); - let cap_children = Rc::new({ - let mut __result = Vec::new(); - for c in item.children.clone().iter().cloned() { - if ((c.params.clone().len() as i64) > 0) { - __result.push(c); - } - } - __result - }); - let methods = Rc::new({ - let mut __result = Vec::new(); - for c in cap_children.iter().cloned() { - __result.push(emit_go_capability_method(&c, 1, &env)); - } - __result - }); - let methods_str = methods.join(&"\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - language_spec(RenderTarget::Go) - .items - .clone() - .type_alias_keyword - .clone(), - " ".to_string(), - ), - item_text, - ), - " interface {\n".to_string(), - ), - methods_str, - ), - "\n}".to_string(), - ) - } +let cap_children = Rc::new({ let mut __result = Vec::new(); for c in item.children.clone().iter().cloned() { if ((c.params.clone().len() as i64) > 0) { __result.push(c); } } __result }); +let methods = Rc::new({ let mut __result = Vec::new(); for c in cap_children.iter().cloned() { __result.push(emit_go_capability_method(&c, 1, &env)); } __result }); +let methods_str = methods.join(&"\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().type_alias_keyword.clone(), " ".to_string()), item_text), " interface {\n".to_string()), methods_str), "\n}".to_string()) +} } pub fn emit_go_capability_method(cap_node: &Rc, depth: i64, env: &Rc) -> String { { - let input_params = Rc::new({ - let mut __result = Vec::new(); - for p in cap_node.params.clone().iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - emit_ident( - param_node_name_at(p.clone(), env.source_indices.clone()), - RenderTarget::Go, - ), - " ".to_string(), - ), - emit_node_type( - param_node_type_expr(&p), - RenderTarget::Go, - env.source_indices.clone(), - ), - )); - } - __result - }); - let params_str = input_params.join(&", ".to_string()); - let ret = emit_node_type( - resolved_type(cap_node.clone()), - RenderTarget::Go, - env.source_indices.clone(), - ); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - make_indent(depth), - go_export_ident(authored_name(env.clone(), cap_node.clone())), - ), - "(".to_string(), - ), - params_str, - ), - ") (".to_string(), - ), - ret, - ), - ", error)".to_string(), - ) - } + let input_params = Rc::new({ let mut __result = Vec::new(); for p in cap_node.params.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(emit_ident(param_node_name_at(p.clone(), env.source_indices.clone()), RenderTarget::Go), " ".to_string()), emit_node_type(param_node_type_expr(&p), RenderTarget::Go, env.source_indices.clone()))); } __result }); +let params_str = input_params.join(&", ".to_string()); +let ret = emit_node_type(resolved_type(cap_node.clone()), RenderTarget::Go, env.source_indices.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(make_indent(depth), go_export_ident(authored_name(env.clone(), cap_node.clone()))), "(".to_string()), params_str), ") (".to_string()), ret), ", error)".to_string()) +} } -pub fn emit_go_data_def( - name: String, - type_node: Rc, - value: Rc, - registry: Rc>>, - scope: &Rc, - depth: i64, -) -> String { +pub fn emit_go_data_def(name: String, type_node: Rc, value: Rc, registry: Rc>>, scope: &Rc, depth: i64) -> String { { - let ty_str = emit_node_type( - type_node, - RenderTarget::Go, - scope.type_env.clone().source_indices.clone(), - ); - let val_str = emit_go_typed_expr(value, registry, &scope, depth, 1024); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("var ".to_string(), go_export_ident(name)), - " ".to_string(), - ), - ty_str, - ), - " = ".to_string(), - ), - val_str, - ) - } + let ty_str = emit_node_type(type_node, RenderTarget::Go, scope.type_env.clone().source_indices.clone()); +let val_str = emit_go_typed_expr(value, registry, &scope, depth, 1024); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("var ".to_string(), go_export_ident(name)), " ".to_string()), ty_str), " = ".to_string()), val_str) +} } pub fn go_export_ident(name: String) -> String { match (*language_spec(RenderTarget::Go).visibility.clone()).clone() { - VisibilitySpec::CaseVisibility { - export_case: ec, .. - } => { - let result = apply_naming_case(name, ec.clone()); - if { - let mut __found = false; - for r in go_reserved().iter().cloned() { - if (r.clone().as_str() == result.clone().as_str()) { - __found = true; - break; - } - } - __found - } { - v2_rt::concat(result.clone(), go_reserved_escape_suffix()) - } else { - result.clone() - } + VisibilitySpec::CaseVisibility { export_case: ec, .. } => { + let result = apply_naming_case(name, ec.clone()); +if { let mut __found = false; for r in go_reserved().iter().cloned() { if (r.clone().as_str() == result.clone().as_str()) { __found = true; break; } } __found } { + v2_rt::concat(result.clone(), go_reserved_escape_suffix()) + } else { + result.clone() } - _ => "__GO_VISIBILITY_SPEC_MISMATCH__".to_string(), - } +}, + _ => "__GO_VISIBILITY_SPEC_MISMATCH__".to_string(), +} } diff --git a/src/v2/stage0/src/v2_compiler_emit_python.rs b/src/v2/stage0/src/v2_compiler_emit_python.rs index 3ca12b846ae..280d452ed08 100644 --- a/src/v2/stage0/src/v2_compiler_emit_python.rs +++ b/src/v2/stage0/src/v2_compiler_emit_python.rs @@ -1,615 +1,229 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.emit_python -pub use crate::std_induction::SubValueRelation; -use crate::std_induction::SubValueRelation::SubValueUnknown; -pub use crate::v2_compiler_artifact::RenderTarget; -use crate::v2_compiler_artifact::RenderTarget::Python; -pub use crate::v2_compiler_emit::{ - apply_named_template, apply_type_template1, apply_type_template2, apply_type_template3, - capitalize_first, compute_service_fields, effective_operation_transport, - emit_algebra_method_template, emit_bin_op_symbol, emit_container, emit_default_bin_op, - emit_error_expr, emit_expr_field_access_shared, emit_expr_var_shared, emit_ident, - emit_inferred_shared, emit_keyword, emit_lambda, emit_lambda_params, emit_let_binding, - emit_list_lit_expr, emit_literal, emit_map_type, emit_node_type, emit_null_coalesce, - emit_param_shared, emit_params_shared, emit_return, emit_shared_expr, emit_simple_expr, - emit_string_literal, emit_tco_unified, emit_typed_block_join, emit_typed_call_unified, - emit_typed_cast_shared, emit_typed_first_arg_shared, emit_typed_for_each_shared, - emit_typed_if_shared, emit_typed_index_shared, emit_typed_let_shared, emit_typed_match_unified, - emit_typed_method_call_unified, emit_typed_record_lit_unified, emit_typed_slice_shared, - emit_typed_string_interp_unified, emit_unary_op, emit_unified_init_block_stmts, - emit_unified_operation_method, emit_unified_pattern, emit_unified_service_def, - emit_unified_transport_dispatch, emit_unified_typed_expr, emit_unified_typed_func_body, - empty_emit_scope, escape_json_string, escape_python_interp_text, escape_string_literal_body, - extract_string_interp_parts, extract_test_projections, has_nested_records_node, - has_service_items, is_data_def_item, is_function_item, is_null_coalesce, is_resource_def_item, - is_service_def_item, is_service_item, is_tco_eligible, is_type_alias_item, - is_type_alias_return_node, is_type_decl_item, is_type_def_item, is_upper, language_spec, - lookup_item, make_indent, module_emit_scope, module_to_filename, order_typed_call_args, - sanitize_service_name, scope_after_expr, seed_bindings, service_fallback_transport, - service_field_ctors, service_field_decls, service_var_name, test_file_path, test_function_name, - to_lower_char, to_screaming_snake, to_snake, to_string, to_string_helper, to_upper_char, - typed_named_arg_matches, unique_strings, BlockEmitState, EmitResult, InterpPart, - ServiceFieldSet, TestProjection, -}; -pub use crate::v2_compiler_infer::{build_params_scope, expr_span, extend_scope, InferScope}; -pub use crate::v2_compiler_infer_env::{authored_name, TypeBinding, TypeEnv}; -pub use crate::v2_compiler_infer_items::{ItemInfo, ResolvedGraph, TypedModule}; -pub use crate::v2_compiler_infer_service::{ - extract_typed_service_name, is_typed_service_call_receiver, -}; -pub use crate::v2_compiler_infer_sigs::{ResolvedFuncEnv, ResolvedFuncSig}; -pub use crate::v2_compiler_infer_types::{ - node_is_keyed_collection, normalize_access_type_node, resolved_type, -}; -pub use crate::v2_compiler_languages::{ - is_string_like, scaffold_for_target, serialization_for_target, test_conventions_for_target, - ItemKeywords, TestConventions, -}; +use std::collections::HashMap; +use std::rc::Rc; use crate::v2_rt; -use crate::v2_std_core::BinOp::NullCoalesce; -use crate::v2_std_core::Cardinality::CardOptional; -use crate::v2_std_core::Connective::{Conj, Disj}; -use crate::v2_std_core::ExprData::{ - ExprBinOp, ExprBlock, ExprCall, ExprCast, ExprError, ExprFieldAccess, ExprForEach, ExprIf, - ExprIndex, ExprLambda, ExprLet, ExprListLit, ExprLiteral, ExprMatch, ExprMethodCall, - ExprRecordLit, ExprReturn, ExprSlice, ExprStringInterp, ExprUnaryOp, ExprVar, NoExprData, -}; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::v2_std_core::{Node, InferredNode, VarBindingKind, import_is_all, import_specific_names_at, module_imports, module_items, param_node_type_expr, authored_name_at, NewlineIndex, expr_var_name_at, expr_call_func_at, expr_method_name_at, let_binding_name_at, param_node_name_at, resource_use_name_at, MatchPattern, LiteralValue, TextFile, SourceSpan, resource_use_resource, BinOp, UnaryOpKind, StringPart, DeclaredFuncSig, transport_has_auth, transport_auth_header_name, transport_headers, transport_env, ExprData, make_expr_node, MethodSemantics, FieldSummary, arg_value, arm_body, arm_pattern, arm_guard, field_init_node_name_at, field_init_node_value, if_condition, if_then_branch, if_else_branch, match_scrutinee, match_arm_nodes, let_value, let_body, field_access_base, field_access_field_at, method_receiver, expr_field_access_summary, expr_method_call_semantics, record_lit_type_name_at, lambda_body, cast_expr, cast_target, return_value, foreach_variable_at, foreach_collection, foreach_body, method_arg_nodes, index_base, index_expr, slice_base, slice_start, slice_end, with_required_cardinality, Connective, is_rest_transport, is_shell_transport, is_file_transport, FieldAccessStyle, Cardinality}; +use crate::v2_std_core::InferredNode::{Resolved, CompilerError}; +use crate::v2_std_core::VarBindingKind::{FunctionValueBinding}; +use crate::v2_std_core::BinOp::{NullCoalesce}; +use crate::v2_std_core::ExprData::{NoExprData, ExprLiteral, ExprError, ExprVar, ExprFieldAccess, ExprCall, ExprMethodCall, ExprMatch, ExprIf, ExprLet, ExprRecordLit, ExprListLit, ExprBinOp, ExprUnaryOp, ExprLambda, ExprStringInterp, ExprBlock, ExprCast, ExprForEach, ExprIndex, ExprSlice, ExprReturn}; +use crate::v2_std_core::MethodSemantics::{PlainMethodSemantics, AlgebraMethodSemantics, ServiceMethodSemantics}; use crate::v2_std_core::FieldAccessStyle::{TupleFirst, TupleSecond}; -use crate::v2_std_core::InferredNode::{CompilerError, Resolved}; -use crate::v2_std_core::LiteralValue::*; +use crate::v2_std_core::StringPart::{Text, Interpolation}; +use crate::v2_std_core::Connective::{Conj, Disj}; +use crate::v2_std_core::Cardinality::{CardOptional}; use crate::v2_std_core::MatchPattern::*; -use crate::v2_std_core::MethodSemantics::{ - AlgebraMethodSemantics, PlainMethodSemantics, ServiceMethodSemantics, -}; -use crate::v2_std_core::StringPart::{Interpolation, Text}; +use crate::v2_std_core::LiteralValue::*; use crate::v2_std_core::UnaryOpKind::*; -use crate::v2_std_core::VarBindingKind::FunctionValueBinding; -pub use crate::v2_std_core::{ - arg_value, arm_body, arm_guard, arm_pattern, authored_name_at, cast_expr, cast_target, - expr_call_func_at, expr_field_access_summary, expr_method_call_semantics, expr_method_name_at, - expr_var_name_at, field_access_base, field_access_field_at, field_init_node_name_at, - field_init_node_value, foreach_body, foreach_collection, foreach_variable_at, if_condition, - if_else_branch, if_then_branch, import_is_all, import_specific_names_at, index_base, - index_expr, is_file_transport, is_rest_transport, is_shell_transport, lambda_body, - let_binding_name_at, let_body, let_value, make_expr_node, match_arm_nodes, match_scrutinee, - method_arg_nodes, method_receiver, module_imports, module_items, param_node_name_at, - param_node_type_expr, record_lit_type_name_at, resource_use_name_at, resource_use_resource, - return_value, slice_base, slice_end, slice_start, transport_auth_header_name, transport_env, - transport_has_auth, transport_headers, with_required_cardinality, BinOp, Cardinality, - Connective, DeclaredFuncSig, ExprData, FieldAccessStyle, FieldSummary, InferredNode, - LiteralValue, MatchPattern, MethodSemantics, NewlineIndex, Node, SourceSpan, StringPart, - TextFile, UnaryOpKind, VarBindingKind, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; -use std::collections::HashMap; -use std::rc::Rc; +pub use crate::v2_compiler_artifact::{RenderTarget}; +use crate::v2_compiler_artifact::RenderTarget::{Python}; +pub use crate::v2_compiler_languages::{scaffold_for_target, serialization_for_target, TestConventions, ItemKeywords, test_conventions_for_target, is_string_like}; +pub use crate::v2_compiler_infer_env::{TypeEnv, TypeBinding, authored_name}; +pub use crate::v2_compiler_infer_types::{resolved_type, normalize_access_type_node, node_is_keyed_collection}; +pub use crate::v2_compiler_infer_sigs::{ResolvedFuncSig, ResolvedFuncEnv}; +pub use crate::v2_compiler_infer_items::{ResolvedGraph, TypedModule, ItemInfo}; +pub use crate::v2_compiler_infer_service::{is_typed_service_call_receiver, extract_typed_service_name}; +pub use crate::v2_compiler_infer::{InferScope, build_params_scope, extend_scope, expr_span}; +pub use crate::std_induction::{SubValueRelation}; +use crate::std_induction::SubValueRelation::{SubValueUnknown}; +pub use crate::v2_compiler_emit::{EmitResult, BlockEmitState, InterpPart, TestProjection, emit_literal, emit_bin_op_symbol, emit_keyword, emit_container, emit_map_type, emit_node_type, emit_ident, emit_let_binding, emit_simple_expr, emit_unary_op, emit_lambda, emit_error_expr, emit_return, emit_lambda_params, emit_list_lit_expr, emit_shared_expr, emit_default_bin_op, emit_string_literal, escape_python_interp_text, escape_string_literal_body, empty_emit_scope, module_emit_scope, scope_after_expr, lookup_item, typed_named_arg_matches, order_typed_call_args, unique_strings, has_nested_records_node, escape_json_string, module_to_filename, make_indent, to_string, to_string_helper, to_snake, to_screaming_snake, is_upper, to_lower_char, to_upper_char, capitalize_first, sanitize_service_name, service_var_name, test_function_name, apply_type_template1, apply_type_template2, apply_type_template3, apply_named_template, language_spec, is_null_coalesce, emit_null_coalesce, is_type_alias_return_node, is_service_item, has_service_items, is_type_def_item, is_type_alias_item, is_type_decl_item, is_function_item, is_data_def_item, is_service_def_item, is_resource_def_item, extract_test_projections, is_tco_eligible, service_fallback_transport, effective_operation_transport, ServiceFieldSet, compute_service_fields, service_field_decls, service_field_ctors, seed_bindings, emit_expr_var_shared, emit_expr_field_access_shared, extract_string_interp_parts, emit_typed_cast_shared, emit_typed_for_each_shared, emit_typed_index_shared, emit_typed_slice_shared, emit_unified_init_block_stmts, emit_typed_if_shared, emit_typed_let_shared, emit_param_shared, emit_params_shared, emit_inferred_shared, emit_typed_block_join, emit_typed_first_arg_shared, emit_algebra_method_template, emit_typed_string_interp_unified, emit_typed_record_lit_unified, emit_typed_call_unified, emit_typed_method_call_unified, emit_typed_match_unified, emit_unified_typed_expr, emit_tco_unified, emit_unified_pattern, test_file_path, emit_unified_typed_func_body, emit_unified_service_def, emit_unified_operation_method, emit_unified_transport_dispatch}; pub fn emit_python(typed: &Rc) -> Rc { { let registry = typed.item_registry.clone(); - let test_projections = extract_test_projections(typed.clone()); - let module_files = Rc::new({ - let mut __result = Vec::new(); - for tm in typed.modules.clone().iter().cloned() { - __result.push(emit_py_module(&tm, registry.clone())); - } - __result - }); - let test_files = Rc::new({ - let mut __result = Vec::new(); - for f in Rc::new({ - let mut __result = Vec::new(); - for tm in typed.modules.clone().iter().cloned() { - __result.push(emit_py_test_file( - &authored_name_at( - tm.type_env.clone().source_indices.clone(), - &tm.module.clone(), - ), - &Rc::new({ - let mut __result = Vec::new(); - for p in test_projections.clone().iter().cloned() { - if (p.module_name.clone().as_str() - == authored_name_at( - tm.type_env.clone().source_indices.clone(), - &tm.module.clone(), - ) - .as_str()) - { - __result.push(p); - } - } - __result - }), - )); - } - __result - }) - .iter() - .cloned() - { - if (f.path.clone().as_str() != "".to_string().as_str()) { - __result.push(f); - } - } - __result - }); - let init_file = emit_init_py(typed.modules.clone()); - let requirements = emit_requirements_txt(has_service_items(typed.clone())); - let files = v2_rt::concat( - v2_rt::concat(Rc::new(vec![requirements, init_file]), module_files), - test_files, - ); - Rc::new(EmitResult { - files: files, - diagnostics: Rc::new(vec![]), - }) - } +let test_projections = extract_test_projections(typed.clone()); +let module_files = Rc::new({ let mut __result = Vec::new(); for tm in typed.modules.clone().iter().cloned() { __result.push(emit_py_module(&tm, registry.clone())); } __result }); +let test_files = Rc::new({ let mut __result = Vec::new(); for f in Rc::new({ let mut __result = Vec::new(); for tm in typed.modules.clone().iter().cloned() { __result.push(emit_py_test_file(&authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone()), &Rc::new({ let mut __result = Vec::new(); for p in test_projections.clone().iter().cloned() { if (p.module_name.clone().as_str() == authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone()).as_str()) { __result.push(p); } } __result }))); } __result }).iter().cloned() { if (f.path.clone().as_str() != "".to_string().as_str()) { __result.push(f); } } __result }); +let init_file = emit_init_py(typed.modules.clone()); +let requirements = emit_requirements_txt(has_service_items(typed.clone())); +let files = v2_rt::concat(v2_rt::concat(Rc::new(vec![requirements, init_file]), module_files), test_files); +Rc::new(EmitResult { + files: files, + diagnostics: Rc::new(vec![]), +}) +} } pub fn py_derive_attribute() -> String { - match serialization_for_target(RenderTarget::Python) - .derive_attribute - .clone() - { - Some(attr) => attr.clone(), - None => "@dataclass".to_string(), - } + match serialization_for_target(RenderTarget::Python).derive_attribute.clone() { + Some(attr) => attr.clone(), + None => "@dataclass".to_string(), +} } pub fn py_default_value() -> String { - match serialization_for_target(RenderTarget::Python) - .default_value - .clone() - { - Some(value) => value.clone(), - None => "None".to_string(), - } + match serialization_for_target(RenderTarget::Python).default_value.clone() { + Some(value) => value.clone(), + None => "None".to_string(), +} } pub fn emit_init_py(modules: Rc>>) -> Rc { { - let import_lines = Rc::new({ - let mut __result = Vec::new(); - for tm in modules.iter().cloned() { - __result.push({ - let mod_name = module_to_filename(authored_name_at( - tm.type_env.clone().source_indices.clone(), - &tm.module.clone(), - )); - let items = language_spec(RenderTarget::Python).items.clone(); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(items.import_from_keyword.clone(), " . ".to_string()), - items.import_keyword.clone(), - ), - " ".to_string(), - ), - mod_name.clone(), - ) - }); - } - __result - }); - let content = v2_rt::concat( - v2_rt::concat( - "# Generated by v2 compiler -- do not edit.\n\n".to_string(), - import_lines.join(&"\n".to_string()), - ), - "\n".to_string(), - ); - let init_path = match scaffold_for_target(RenderTarget::Python) - .module_init_file - .clone() - { - Some(path) => path.clone(), - None => "__init__.py".to_string(), - }; - Rc::new(TextFile { - path: init_path, - content: content, - }) - } + let import_lines = Rc::new({ let mut __result = Vec::new(); for tm in modules.iter().cloned() { __result.push({ + let mod_name = module_to_filename(authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone())); +let items = language_spec(RenderTarget::Python).items.clone(); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(items.import_from_keyword.clone(), " . ".to_string()), items.import_keyword.clone()), " ".to_string()), mod_name.clone()) +}); } __result }); +let content = v2_rt::concat(v2_rt::concat("# Generated by v2 compiler -- do not edit.\n\n".to_string(), import_lines.join(&"\n".to_string())), "\n".to_string()); +let init_path = match scaffold_for_target(RenderTarget::Python).module_init_file.clone() { + Some(path) => path.clone(), + None => "__init__.py".to_string(), +}; +Rc::new(TextFile { + path: init_path, + content: content, +}) +} } pub fn python_test_signature_comment(projection: &Rc) -> String { { - let params_str = Rc::new({ - let mut __result = Vec::new(); - for p in projection.params.clone().iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - param_node_name_at(p.clone(), projection.source_indices.clone()), - ": ".to_string(), - ), - emit_node_type( - param_node_type_expr(&p), - RenderTarget::Python, - projection.source_indices.clone(), - ), - )); - } - __result - }) - .join(&", ".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "# Signature: ".to_string(), - sanitize_service_name(projection.service_name.clone()), - ), - ".".to_string(), - ), - projection.operation_name.clone(), - ), - "(".to_string(), - ), - params_str, - ), - ") -> ".to_string(), - ), - emit_node_type( - projection.inferred.clone(), - RenderTarget::Python, - projection.source_indices.clone(), - ), - ) - } + let params_str = Rc::new({ let mut __result = Vec::new(); for p in projection.params.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(param_node_name_at(p.clone(), projection.source_indices.clone()), ": ".to_string()), emit_node_type(param_node_type_expr(&p), RenderTarget::Python, projection.source_indices.clone()))); } __result }).join(&", ".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("# Signature: ".to_string(), sanitize_service_name(projection.service_name.clone())), ".".to_string()), projection.operation_name.clone()), "(".to_string()), params_str), ") -> ".to_string()), emit_node_type(projection.inferred.clone(), RenderTarget::Python, projection.source_indices.clone())) +} } -pub fn emit_py_test_file( - module_name: &String, - projections: &Rc>>, -) -> Rc { +pub fn emit_py_test_file(module_name: &String, projections: &Rc>>) -> Rc { if ((projections.clone().len() as i64) == 0) { Rc::new(TextFile { - path: "".to_string(), - content: "".to_string(), - }) + path: "".to_string(), + content: "".to_string(), +}) } else { { - let tests_str = Rc::new({ - let mut __result = Vec::new(); - for p in projections.clone().iter().cloned() { - __result.push(emit_py_operation_test(&p, 0)); - } - __result - }) - .join(&"\n\n".to_string()); - let content = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "# Generated tests -- do not edit.\n".to_string(), - "# Source module: ".to_string(), - ), - module_name.clone(), - ), - "\n\n".to_string(), - ), - tests_str, - ), - "\n".to_string(), - ); - Rc::new(TextFile { - path: test_file_path(module_name.clone(), &RenderTarget::Python), - content: content, - }) - } + let tests_str = Rc::new({ let mut __result = Vec::new(); for p in projections.clone().iter().cloned() { __result.push(emit_py_operation_test(&p, 0)); } __result }).join(&"\n\n".to_string()); +let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("# Generated tests -- do not edit.\n".to_string(), "# Source module: ".to_string()), module_name.clone()), "\n\n".to_string()), tests_str), "\n".to_string()); +Rc::new(TextFile { + path: test_file_path(module_name.clone(), &RenderTarget::Python), + content: content, +}) +} } } pub fn emit_py_operation_test(projection: &Rc, depth: i64) -> String { { let test_name = test_function_name(&projection, RenderTarget::Python); - let indent = make_indent((depth.clone() + 1)); - let mock_setup = Rc::new({ - let mut __result = Vec::new(); - for mp in projection.mock_field_inits.clone().iter().cloned() { - __result.push(emit_py_mock_prop_setup( - &mp, - (depth.clone() + 1), - &projection.source_indices.clone(), - )); - } - __result - }) - .join(&"\n".to_string()); - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Python).items.clone().func_keyword.clone(), " ".to_string()), test_name), "() -> None:\n".to_string()), indent.clone()), python_test_signature_comment(&projection)), "\n".to_string()), indent.clone()), mock_setup), "\n".to_string()), indent.clone()), "# TODO: add dry-run support to Python service emission for full invocation tests\n".to_string()), indent.clone()), "assert True # mock data setup verified\n".to_string()) - } +let indent = make_indent((depth.clone() + 1)); +let mock_setup = Rc::new({ let mut __result = Vec::new(); for mp in projection.mock_field_inits.clone().iter().cloned() { __result.push(emit_py_mock_prop_setup(&mp, (depth.clone() + 1), &projection.source_indices.clone())); } __result }).join(&"\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Python).items.clone().func_keyword.clone(), " ".to_string()), test_name), "() -> None:\n".to_string()), indent.clone()), python_test_signature_comment(&projection)), "\n".to_string()), indent.clone()), mock_setup), "\n".to_string()), indent.clone()), "# TODO: add dry-run support to Python service emission for full invocation tests\n".to_string()), indent.clone()), "assert True # mock data setup verified\n".to_string()) +} } -pub fn emit_py_mock_prop_setup( - mock_prop: &Rc, - depth: i64, - source_indices: &Rc>>, -) -> String { - v2_rt::concat( - v2_rt::concat( - emit_ident( - field_init_node_name_at(mock_prop.clone(), source_indices.clone()), - RenderTarget::Python, - ), - " = ".to_string(), - ), - emit_simple_expr( - &field_init_node_value(&mock_prop), - &RenderTarget::Python, - &source_indices, - ), - ) +pub fn emit_py_mock_prop_setup(mock_prop: &Rc, depth: i64, source_indices: &Rc>>) -> String { + v2_rt::concat(v2_rt::concat(emit_ident(field_init_node_name_at(mock_prop.clone(), source_indices.clone()), RenderTarget::Python), " = ".to_string()), emit_simple_expr(&field_init_node_value(&mock_prop), &RenderTarget::Python, &source_indices)) } -pub fn emit_py_module( - typed_module: &Rc, - registry: Rc>>, -) -> Rc { +pub fn emit_py_module(typed_module: &Rc, registry: Rc>>) -> Rc { { let m = typed_module.module.clone(); - let scope = module_emit_scope(&typed_module); - let si = scope.type_env.clone().source_indices.clone(); - let mod_name_str = authored_name_at(si.clone(), &m); - let prelude = emit_py_prelude(typed_module.clone()); - let imports_str = emit_py_imports(&module_imports(m.clone()), si.clone()); - let imports_section = if (imports_str.clone().as_str() == "".to_string().as_str()) { +let scope = module_emit_scope(&typed_module); +let si = scope.type_env.clone().source_indices.clone(); +let mod_name_str = authored_name_at(si.clone(), &m); +let prelude = emit_py_prelude(typed_module.clone()); +let imports_str = emit_py_imports(&module_imports(m.clone()), si.clone()); +let imports_section = if (imports_str.clone().as_str() == "".to_string().as_str()) { "".to_string() } else { v2_rt::concat("\n".to_string(), imports_str.clone()) }; - let items_str = Rc::new({ - let mut __result = Vec::new(); - for item in typed_module.items.clone().iter().cloned() { - __result.push(emit_py_typed_item(&item, registry.clone(), &scope)); - } - __result - }) - .join(&"\n\n\n".to_string()); - let filename = module_to_filename(mod_name_str.clone()); - let content = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "# Generated by v2 compiler -- do not edit.\n".to_string(), - "# Source module: ".to_string(), - ), - mod_name_str.clone(), - ), - "\n\n".to_string(), - ), - prelude, - ), - imports_section, - ), - "\n\n\n".to_string(), - ), - items_str, - ), - "\n".to_string(), - ); - Rc::new(TextFile { - path: v2_rt::concat( - filename, - scaffold_for_target(RenderTarget::Python) - .source_file_extension - .clone(), - ), - content: content, - }) - } +let items_str = Rc::new({ let mut __result = Vec::new(); for item in typed_module.items.clone().iter().cloned() { __result.push(emit_py_typed_item(&item, registry.clone(), &scope)); } __result }).join(&"\n\n\n".to_string()); +let filename = module_to_filename(mod_name_str.clone()); +let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("# Generated by v2 compiler -- do not edit.\n".to_string(), "# Source module: ".to_string()), mod_name_str.clone()), "\n\n".to_string()), prelude), imports_section), "\n\n\n".to_string()), items_str), "\n".to_string()); +Rc::new(TextFile { + path: v2_rt::concat(filename, scaffold_for_target(RenderTarget::Python).source_file_extension.clone()), + content: content, +}) +} } -pub fn emit_py_imports( - imports: &Rc>>, - source_indices: Rc>>, -) -> String { +pub fn emit_py_imports(imports: &Rc>>, source_indices: Rc>>) -> String { if ((imports.clone().len() as i64) == 0) { "".to_string() } else { { - let import_lines = Rc::new({ - let mut __result = Vec::new(); - for imp in imports.clone().iter().cloned() { - __result.push({ - let mod_name = - module_to_filename(authored_name_at(source_indices.clone(), &imp)); - let items = language_spec(RenderTarget::Python).items.clone(); - if import_is_all(imp.clone()) { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - items.import_from_keyword.clone(), - " ".to_string(), - ), - mod_name.clone(), - ), - " ".to_string(), - ), - items.import_keyword.clone(), - ), - " *".to_string(), - ) + let import_lines = Rc::new({ let mut __result = Vec::new(); for imp in imports.clone().iter().cloned() { __result.push({ + let mod_name = module_to_filename(authored_name_at(source_indices.clone(), &imp)); +let items = language_spec(RenderTarget::Python).items.clone(); +if import_is_all(imp.clone()) { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(items.import_from_keyword.clone(), " ".to_string()), mod_name.clone()), " ".to_string()), items.import_keyword.clone()), " *".to_string()) + } else { + { + let specific_names = import_specific_names_at(imp.clone(), source_indices.clone()); +if ((specific_names.clone().len() as i64) == 0) { + "".to_string() } else { { - let specific_names = - import_specific_names_at(imp.clone(), source_indices.clone()); - if ((specific_names.clone().len() as i64) == 0) { - "".to_string() - } else { - { - let names_str = - specific_names.clone().join(&", ".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - items.import_from_keyword.clone(), - " ".to_string(), - ), - mod_name.clone(), - ), - " ".to_string(), - ), - items.import_keyword.clone(), - ), - " ".to_string(), - ), - names_str.clone(), - ) - } - } - } + let names_str = specific_names.clone().join(&", ".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(items.import_from_keyword.clone(), " ".to_string()), mod_name.clone()), " ".to_string()), items.import_keyword.clone()), " ".to_string()), names_str.clone()) +} } - }); - } - __result - }); - Rc::new({ - let mut __result = Vec::new(); - for line in import_lines.iter().cloned() { - if (line.clone().as_str() != "".to_string().as_str()) { - __result.push(line); - } +} } - __result - }) - .join(&"\n".to_string()) - } +}); } __result }); +Rc::new({ let mut __result = Vec::new(); for line in import_lines.iter().cloned() { if (line.clone().as_str() != "".to_string().as_str()) { __result.push(line); } } __result }).join(&"\n".to_string()) +} } } pub fn emit_py_prelude(typed_module: Rc) -> String { { let items = typed_module.items.clone(); - let has_structs = { - let mut __found = false; - for item in items.clone().iter().cloned() { - if (is_type_def_item(&item) && (item.connective.clone() == Connective::Conj)) { - __found = true; - break; - } - } - __found - }; - let has_enums = { - let mut __found = false; - for item in items.clone().iter().cloned() { - if (is_type_def_item(&item) && (item.connective.clone() == Connective::Disj)) { - __found = true; - break; - } - } - __found - }; - let has_services = { - let mut __found = false; - for item in items.clone().iter().cloned() { - if is_service_item(&item) { - __found = true; - break; - } - } - __found - }; - let future_import = "from __future__ import annotations\n".to_string(); - let dc_import = if has_structs.clone() { +let has_structs = { let mut __found = false; for item in items.clone().iter().cloned() { if (is_type_def_item(&item) && (item.connective.clone() == Connective::Conj)) { __found = true; break; } } __found }; +let has_enums = { let mut __found = false; for item in items.clone().iter().cloned() { if (is_type_def_item(&item) && (item.connective.clone() == Connective::Disj)) { __found = true; break; } } __found }; +let has_services = { let mut __found = false; for item in items.clone().iter().cloned() { if is_service_item(&item) { __found = true; break; } } __found }; +let future_import = "from __future__ import annotations\n".to_string(); +let dc_import = if has_structs.clone() { "from dataclasses import dataclass, field\n".to_string() } else { "".to_string() }; - let enum_import = if has_enums.clone() { +let enum_import = if has_enums.clone() { "from enum import Enum, auto\n".to_string() } else { "".to_string() }; - let typing_import = if (has_structs.clone() || has_enums.clone()) { +let typing_import = if (has_structs.clone() || has_enums.clone()) { "from typing import Optional, Union\n".to_string() } else { "".to_string() }; - let async_import = if has_services { +let async_import = if has_services { "import aiohttp\n".to_string() } else { "".to_string() }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(v2_rt::concat(future_import, dc_import), enum_import), - typing_import, - ), - async_import, - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(future_import, dc_import), enum_import), typing_import), async_import) +} } -pub fn emit_py_typed_item( - item: &Rc, - registry: Rc>>, - scope: &Rc, -) -> String { +pub fn emit_py_typed_item(item: &Rc, registry: Rc>>, scope: &Rc) -> String { { let env = scope.type_env.clone(); - let item_text = authored_name(env.clone(), item.clone()); - if is_type_def_item(&item) { +let item_text = authored_name(env.clone(), item.clone()); +if is_type_def_item(&item) { emit_py_type_def_from_connective(&item, &env) } else { if is_type_alias_item(&item, env.source_indices.clone()) { - v2_rt::concat( - v2_rt::concat(item_text, " = ".to_string()), - emit_node_type( - resolved_type(item.clone()), - RenderTarget::Python, - env.source_indices.clone(), - ), - ) + v2_rt::concat(v2_rt::concat(item_text, " = ".to_string()), emit_node_type(resolved_type(item.clone()), RenderTarget::Python, env.source_indices.clone())) } else { if is_type_decl_item(&item, env.source_indices.clone()) { "".to_string() } else { if is_function_item(&item) { if ((item.uses.clone().len() as i64) > 0) { - emit_py_func_def( - &item_text, - &item.params.clone(), - resolved_type(item.clone()), - &item.uses.clone(), - item.body.clone().clone().unwrap(), - ®istry, - &scope, - ) + emit_py_func_def(&item_text, &item.params.clone(), resolved_type(item.clone()), &item.uses.clone(), item.body.clone().clone().unwrap(), ®istry, &scope) } else { - emit_py_fn_def( - &item_text, - &item.params.clone(), - resolved_type(item.clone()), - &item.body.clone().clone().unwrap(), - ®istry, - &scope, - ) + emit_py_fn_def(&item_text, &item.params.clone(), resolved_type(item.clone()), &item.body.clone().clone().unwrap(), ®istry, &scope) } } else { if is_data_def_item(&item) { - emit_py_data_def( - item_text, - item.type_annotation.clone().clone().unwrap(), - item.body.clone().clone().unwrap(), - registry, - &scope, - ) + emit_py_data_def(item_text, item.type_annotation.clone().clone().unwrap(), item.body.clone().clone().unwrap(), registry, &scope) } else { if is_service_def_item(&item) { emit_py_service_def(item.clone(), registry, env.clone()) @@ -625,915 +239,262 @@ pub fn emit_py_typed_item( } } } - } +} } pub fn emit_py_type_def_from_connective(item: &Rc, env: &Rc) -> String { { let item_text = authored_name(env.clone(), item.clone()); - let is_product = (item.connective.clone() == Connective::Conj); - if is_product { +let is_product = (item.connective.clone() == Connective::Conj); +if is_product { emit_py_dataclass_from_children(item_text, &item.children.clone(), env.clone()) } else { emit_py_enum_from_children(&item_text, &item.children.clone(), env.clone()) } - } +} } -pub fn emit_py_dataclass_from_children( - name: String, - children: &Rc>>, - env: Rc, -) -> String { +pub fn emit_py_dataclass_from_children(name: String, children: &Rc>>, env: Rc) -> String { if ((children.clone().len() as i64) == 0) { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(py_derive_attribute(), "\nclass ".to_string()), - name, - ), - ":\n pass".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(py_derive_attribute(), "\nclass ".to_string()), name), ":\n pass".to_string()) } else { { - let field_lines = Rc::new({ - let mut __result = Vec::new(); - for child in children.clone().iter().cloned() { - __result.push(emit_py_dataclass_field_from_child(&child, &env)); - } - __result - }); - let fields_str = field_lines.join(&"\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(py_derive_attribute(), "\nclass ".to_string()), - name, - ), - ":\n".to_string(), - ), - fields_str, - ) - } + let field_lines = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { __result.push(emit_py_dataclass_field_from_child(&child, &env)); } __result }); +let fields_str = field_lines.join(&"\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(py_derive_attribute(), "\nclass ".to_string()), name), ":\n".to_string()), fields_str) +} } } pub fn emit_py_dataclass_field_from_child(child: &Rc, env: &Rc) -> String { { - let ty = emit_node_type( - resolved_type(child.clone()), - RenderTarget::Python, - env.source_indices.clone(), - ); - let is_optional = - (resolved_type(child.clone()).return_cardinality.clone() == Cardinality::CardOptional); - let default_str = if is_optional { + let ty = emit_node_type(resolved_type(child.clone()), RenderTarget::Python, env.source_indices.clone()); +let is_optional = (resolved_type(child.clone()).return_cardinality.clone() == Cardinality::CardOptional); +let default_str = if is_optional { v2_rt::concat(" = ".to_string(), py_default_value()) } else { "".to_string() }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - " ".to_string(), - emit_ident( - authored_name(env.clone(), child.clone()), - RenderTarget::Python, - ), - ), - ": ".to_string(), - ), - ty, - ), - default_str, - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), emit_ident(authored_name(env.clone(), child.clone()), RenderTarget::Python)), ": ".to_string()), ty), default_str) +} } -pub fn emit_py_enum_from_children( - name: &String, - children: &Rc>>, - env: Rc, -) -> String { +pub fn emit_py_enum_from_children(name: &String, children: &Rc>>, env: Rc) -> String { { - let has_data = { - let mut __found = false; - for child in children.clone().iter().cloned() { - if ((child.children.clone().len() as i64) > 0) { - __found = true; - break; - } - } - __found - }; - if has_data { + let has_data = { let mut __found = false; for child in children.clone().iter().cloned() { if ((child.children.clone().len() as i64) > 0) { __found = true; break; } } __found }; +if has_data { { - let variant_classes = Rc::new({ - let mut __result = Vec::new(); - for child in children.clone().iter().cloned() { - __result.push(emit_py_variant_class_from_child(name.clone(), &child, &env)); - } - __result - }); - let variant_names = Rc::new({ - let mut __result = Vec::new(); - for child in children.clone().iter().cloned() { - __result.push(v2_rt::concat( - name.clone(), - authored_name(env.clone(), child.clone()), - )); - } - __result - }); - let union_str = variant_names.join(&", ".to_string()); - let classes_str = variant_classes.join(&"\n\n\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(classes_str, "\n\n\n".to_string()), - name.clone(), - ), - " = Union[".to_string(), - ), - union_str, - ), - "]".to_string(), - ) - } + let variant_classes = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { __result.push(emit_py_variant_class_from_child(name.clone(), &child, &env)); } __result }); +let variant_names = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { __result.push(v2_rt::concat(name.clone(), authored_name(env.clone(), child.clone()))); } __result }); +let union_str = variant_names.join(&", ".to_string()); +let classes_str = variant_classes.join(&"\n\n\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(classes_str, "\n\n\n".to_string()), name.clone()), " = Union[".to_string()), union_str), "]".to_string()) +} } else { { - let variant_lines = Rc::new({ - let mut __result = Vec::new(); - for child in children.clone().iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - " ".to_string(), - authored_name(env.clone(), child.clone()), - ), - " = auto()".to_string(), - )); - } - __result - }); - let variants_str = variant_lines.join(&"\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - language_spec(RenderTarget::Python) - .items - .clone() - .enum_keyword - .clone(), - " ".to_string(), - ), - name.clone(), - ), - "(Enum):\n".to_string(), - ), - variants_str, - ) - } + let variant_lines = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(" ".to_string(), authored_name(env.clone(), child.clone())), " = auto()".to_string())); } __result }); +let variants_str = variant_lines.join(&"\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Python).items.clone().enum_keyword.clone(), " ".to_string()), name.clone()), "(Enum):\n".to_string()), variants_str) +} } - } +} } -pub fn emit_py_variant_class_from_child( - parent_name: String, - child: &Rc, - env: &Rc, -) -> String { +pub fn emit_py_variant_class_from_child(parent_name: String, child: &Rc, env: &Rc) -> String { { let class_name = v2_rt::concat(parent_name, authored_name(env.clone(), child.clone())); - if ((child.children.clone().len() as i64) == 0) { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(py_derive_attribute(), "\nclass ".to_string()), - class_name, - ), - ":\n pass".to_string(), - ) +if ((child.children.clone().len() as i64) == 0) { + v2_rt::concat(v2_rt::concat(v2_rt::concat(py_derive_attribute(), "\nclass ".to_string()), class_name), ":\n pass".to_string()) } else { { - let field_lines = Rc::new({ - let mut __result = Vec::new(); - for f in child.children.clone().iter().cloned() { - __result.push(emit_py_dataclass_field_from_child(&f, &env)); - } - __result - }); - let fields_str = field_lines.join(&"\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(py_derive_attribute(), "\nclass ".to_string()), - class_name, - ), - ":\n".to_string(), - ), - fields_str, - ) - } + let field_lines = Rc::new({ let mut __result = Vec::new(); for f in child.children.clone().iter().cloned() { __result.push(emit_py_dataclass_field_from_child(&f, &env)); } __result }); +let fields_str = field_lines.join(&"\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(py_derive_attribute(), "\nclass ".to_string()), class_name), ":\n".to_string()), fields_str) +} } - } +} } -pub fn emit_py_fn_def( - name: &String, - params: &Rc>>, - inferred: Rc, - body: &Rc, - registry: &Rc>>, - scope: &Rc, -) -> String { +pub fn emit_py_fn_def(name: &String, params: &Rc>>, inferred: Rc, body: &Rc, registry: &Rc>>, scope: &Rc) -> String { { let depth = 0; - let si = scope.type_env.clone().source_indices.clone(); - let params_str = emit_params_shared(params.clone(), &RenderTarget::Python, si.clone()); - let ret_str = emit_inferred_shared(&inferred, &RenderTarget::Python, si.clone()); - let body_scope = build_params_scope(&scope, params.clone()); - let use_tco = is_tco_eligible(&name, &body, registry.clone(), &si); - if use_tco { +let si = scope.type_env.clone().source_indices.clone(); +let params_str = emit_params_shared(params.clone(), &RenderTarget::Python, si.clone()); +let ret_str = emit_inferred_shared(&inferred, &RenderTarget::Python, si.clone()); +let body_scope = build_params_scope(&scope, params.clone()); +let use_tco = is_tco_eligible(&name, &body, registry.clone(), &si); +if use_tco { { - let body_str = emit_tco_unified( - body.clone(), - &name, - ¶ms, - &RenderTarget::Python, - ®istry, - &body_scope, - (depth.clone() + 1), - |pat| emit_unified_pattern(pat.clone(), RenderTarget::Python, si.clone()), - ); - let kw = language_spec(RenderTarget::Python) - .items - .clone() - .func_keyword - .clone(); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(kw, " ".to_string()), - emit_ident(name.clone(), RenderTarget::Python), - ), - "(".to_string(), - ), - params_str, - ), - ")".to_string(), - ), - ret_str, - ), - ":\n".to_string(), - ), - make_indent((depth.clone() + 1)), - ), - body_str, - ) - } + let body_str = emit_tco_unified(body.clone(), &name, ¶ms, &RenderTarget::Python, ®istry, &body_scope, (depth.clone() + 1), |pat| emit_unified_pattern(pat.clone(), RenderTarget::Python, si.clone())); +let kw = language_spec(RenderTarget::Python).items.clone().func_keyword.clone(); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(kw, " ".to_string()), emit_ident(name.clone(), RenderTarget::Python)), "(".to_string()), params_str), ")".to_string()), ret_str), ":\n".to_string()), make_indent((depth.clone() + 1))), body_str) +} } else { { - let body_str = emit_py_typed_expr( - body.clone(), - registry.clone(), - &body_scope, - (depth.clone() + 1), - 1024, - ); - let kw = language_spec(RenderTarget::Python) - .items - .clone() - .func_keyword - .clone(); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(kw, " ".to_string()), - emit_ident(name.clone(), RenderTarget::Python), - ), - "(".to_string(), - ), - params_str, - ), - ")".to_string(), - ), - ret_str, - ), - ":\n".to_string(), - ), - make_indent((depth.clone() + 1)), - ), - "return ".to_string(), - ), - body_str, - ) - } + let body_str = emit_py_typed_expr(body.clone(), registry.clone(), &body_scope, (depth.clone() + 1), 1024); +let kw = language_spec(RenderTarget::Python).items.clone().func_keyword.clone(); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(kw, " ".to_string()), emit_ident(name.clone(), RenderTarget::Python)), "(".to_string()), params_str), ")".to_string()), ret_str), ":\n".to_string()), make_indent((depth.clone() + 1))), "return ".to_string()), body_str) +} } - } +} } -pub fn emit_py_func_def( - name: &String, - params: &Rc>>, - inferred: Rc, - uses: &Rc>>, - body: Rc, - registry: &Rc>>, - scope: &Rc, -) -> String { +pub fn emit_py_func_def(name: &String, params: &Rc>>, inferred: Rc, uses: &Rc>>, body: Rc, registry: &Rc>>, scope: &Rc) -> String { { let depth = 0; - let service_names = match lookup_item(registry.clone(), name.clone()) { - Some(info) => info.service_names.clone(), - None => Rc::new(vec![]), - }; - let params_str = emit_py_func_params( - params.clone(), - uses.clone(), - service_names, - scope.type_env.clone().source_indices.clone(), - ); - let ret_str = emit_inferred_shared( - &inferred, - &RenderTarget::Python, - scope.type_env.clone().source_indices.clone(), - ); - let body_scope = build_params_scope(&scope, params.clone()); - let si = scope.type_env.clone().source_indices.clone(); - let body_scope = uses.clone().iter().cloned().fold( - body_scope.clone(), - |s: Rc, u: Rc| { - extend_scope( - &s, - &resource_use_name_at(u.clone(), si.clone()), - resource_use_resource(&u), - Rc::new(SubValueRelation::SubValueUnknown), - ) - }, - ); - let body_str = emit_unified_typed_func_body( - &body, - &RenderTarget::Python, - ®istry, - &body_scope, - (depth.clone() + 1), - ); - let items = language_spec(RenderTarget::Python).items.clone(); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - items.async_prefix.clone(), - items.func_keyword.clone(), - ), - " ".to_string(), - ), - emit_ident(name.clone(), RenderTarget::Python), - ), - "(".to_string(), - ), - params_str, - ), - ")".to_string(), - ), - ret_str, - ), - ":\n".to_string(), - ), - make_indent((depth.clone() + 1)), - ), - body_str, - ) - } +let service_names = match lookup_item(registry.clone(), name.clone()) { + Some(info) => info.service_names.clone(), + None => Rc::new(vec![]), +}; +let params_str = emit_py_func_params(params.clone(), uses.clone(), service_names, scope.type_env.clone().source_indices.clone()); +let ret_str = emit_inferred_shared(&inferred, &RenderTarget::Python, scope.type_env.clone().source_indices.clone()); +let body_scope = build_params_scope(&scope, params.clone()); +let si = scope.type_env.clone().source_indices.clone(); +let body_scope = uses.clone().iter().cloned().fold(body_scope.clone(), |s: Rc, u: Rc| extend_scope(&s, &resource_use_name_at(u.clone(), si.clone()), resource_use_resource(&u), Rc::new(SubValueRelation::SubValueUnknown))); +let body_str = emit_unified_typed_func_body(&body, &RenderTarget::Python, ®istry, &body_scope, (depth.clone() + 1)); +let items = language_spec(RenderTarget::Python).items.clone(); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(items.async_prefix.clone(), items.func_keyword.clone()), " ".to_string()), emit_ident(name.clone(), RenderTarget::Python)), "(".to_string()), params_str), ")".to_string()), ret_str), ":\n".to_string()), make_indent((depth.clone() + 1))), body_str) +} } -pub fn emit_py_func_params( - params: Rc>>, - uses: Rc>>, - service_names: Rc>, - source_indices: Rc>>, -) -> String { +pub fn emit_py_func_params(params: Rc>>, uses: Rc>>, service_names: Rc>, source_indices: Rc>>) -> String { { - let param_strs = Rc::new({ - let mut __result = Vec::new(); - for p in params.iter().cloned() { - __result.push(emit_param_shared( - &p, - &RenderTarget::Python, - &source_indices, - )); - } - __result - }); - let resource_strs = Rc::new({ - let mut __result = Vec::new(); - for u in uses.iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - emit_ident( - resource_use_name_at(u.clone(), source_indices.clone()), - RenderTarget::Python, - ), - ": ".to_string(), - ), - emit_node_type( - resource_use_resource(&u), - RenderTarget::Python, - source_indices.clone(), - ), - )); - } - __result - }); - let service_strs = Rc::new({ - let mut __result = Vec::new(); - for sn in service_names.iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat(service_var_name(sn.clone()), ": ".to_string()), - sanitize_service_name(sn.clone()), - )); - } - __result - }); - let all_params = v2_rt::concat(v2_rt::concat(param_strs, resource_strs), service_strs); - all_params.join(&", ".to_string()) - } + let param_strs = Rc::new({ let mut __result = Vec::new(); for p in params.iter().cloned() { __result.push(emit_param_shared(&p, &RenderTarget::Python, &source_indices)); } __result }); +let resource_strs = Rc::new({ let mut __result = Vec::new(); for u in uses.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(emit_ident(resource_use_name_at(u.clone(), source_indices.clone()), RenderTarget::Python), ": ".to_string()), emit_node_type(resource_use_resource(&u), RenderTarget::Python, source_indices.clone()))); } __result }); +let service_strs = Rc::new({ let mut __result = Vec::new(); for sn in service_names.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(service_var_name(sn.clone()), ": ".to_string()), sanitize_service_name(sn.clone()))); } __result }); +let all_params = v2_rt::concat(v2_rt::concat(param_strs, resource_strs), service_strs); +all_params.join(&", ".to_string()) +} } -pub fn emit_py_typed_expr( - texpr: Rc, - registry: Rc>>, - scope: &Rc, - depth: i64, - fuel: i64, -) -> String { - emit_unified_typed_expr( - texpr, - &RenderTarget::Python, - registry, - &scope, - depth, - fuel, - |pat| { - emit_unified_pattern( - pat.clone(), - RenderTarget::Python, - scope.type_env.clone().source_indices.clone(), - ) - }, - ) +pub fn emit_py_typed_expr(texpr: Rc, registry: Rc>>, scope: &Rc, depth: i64, fuel: i64) -> String { + emit_unified_typed_expr(texpr, &RenderTarget::Python, registry, &scope, depth, fuel, |pat| emit_unified_pattern(pat.clone(), RenderTarget::Python, scope.type_env.clone().source_indices.clone())) } -pub fn emit_py_transport_body( - transport: Rc, - op_name: String, - source_indices: Rc>>, - depth: i64, -) -> String { - emit_unified_transport_dispatch( - &transport, - op_name, - &source_indices, - depth, - RenderTarget::Python, - |n, t, d, si| emit_py_rest_call(n.clone(), t.clone(), si.clone()), - |n, t, d, si| emit_py_shell_call(n.clone(), t.clone(), &si), - |n, d| emit_py_file_call(n.clone()), - |n, d| emit_py_local_call(n.clone()), - ) +pub fn emit_py_transport_body(transport: Rc, op_name: String, source_indices: Rc>>, depth: i64) -> String { + emit_unified_transport_dispatch(&transport, op_name, &source_indices, depth, RenderTarget::Python, |n, t, d, si| emit_py_rest_call(n.clone(), t.clone(), si.clone()), |n, t, d, si| emit_py_shell_call(n.clone(), t.clone(), &si), |n, d| emit_py_file_call(n.clone()), |n, d| emit_py_local_call(n.clone())) } -pub fn emit_py_service_def( - item: Rc, - registry: Rc>>, - env: Rc, -) -> String { - emit_unified_service_def( - &item, - &RenderTarget::Python, - registry, - &env, - |name, transport, ops, si| emit_py_service_init(transport.clone(), ops.clone(), si.clone()), - |transport, op_name, si, depth| { - emit_py_transport_body( - transport.clone(), - op_name.clone(), - si.clone(), - depth.clone(), - ) - }, - ) +pub fn emit_py_service_def(item: Rc, registry: Rc>>, env: Rc) -> String { + emit_unified_service_def(&item, &RenderTarget::Python, registry, &env, |name, transport, ops, si| emit_py_service_init(transport.clone(), ops.clone(), si.clone()), |transport, op_name, si, depth| emit_py_transport_body(transport.clone(), op_name.clone(), si.clone(), depth.clone())) } -pub fn emit_py_service_init( - fallback_transport: Rc, - op_children: Rc>>, - source_indices: Rc>>, -) -> String { +pub fn emit_py_service_init(fallback_transport: Rc, op_children: Rc>>, source_indices: Rc>>) -> String { { let fs = compute_service_fields(&fallback_transport, &op_children, &source_indices); - let params = service_field_decls( - &fs, - &language_spec(RenderTarget::Python).service_fields.clone(), - ); - let assigns = service_field_ctors( - &fs, - &language_spec(RenderTarget::Python).service_fields.clone(), - ); - if ((params.clone().len() as i64) == 0) { +let params = service_field_decls(&fs, &language_spec(RenderTarget::Python).service_fields.clone()); +let assigns = service_field_ctors(&fs, &language_spec(RenderTarget::Python).service_fields.clone()); +if ((params.clone().len() as i64) == 0) { "def __init__(self):\n pass".to_string() } else { { - let params_str = - v2_rt::concat("self, ".to_string(), params.clone().join(&", ".to_string())); - let assigns_str = Rc::new({ - let mut __result = Vec::new(); - for a in assigns.iter().cloned() { - __result.push(v2_rt::concat(" ".to_string(), a.clone())); - } - __result - }) - .join(&"\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("def __init__(".to_string(), params_str), - "):\n".to_string(), - ), - assigns_str, - ) - } + let params_str = v2_rt::concat("self, ".to_string(), params.clone().join(&", ".to_string())); +let assigns_str = Rc::new({ let mut __result = Vec::new(); for a in assigns.iter().cloned() { __result.push(v2_rt::concat(" ".to_string(), a.clone())); } __result }).join(&"\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat("def __init__(".to_string(), params_str), "):\n".to_string()), assigns_str) +} } - } +} } -pub fn emit_py_rest_call( - op_name: String, - transport: Rc, - source_indices: Rc>>, -) -> String { +pub fn emit_py_rest_call(op_name: String, transport: Rc, source_indices: Rc>>) -> String { { - let self_base_url = v2_rt::concat( - v2_rt::concat("{".to_string(), "self.base_url".to_string()), - "}".to_string(), - ); - let url_line = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("url = f\"".to_string(), self_base_url), - "/".to_string(), - ), - emit_ident(op_name, RenderTarget::Python), - ), - "\"".to_string(), - ); - let headers_dict = emit_py_headers_dict(&transport, &source_indices); - let session_lines = v2_rt::concat( - v2_rt::concat( - "async with aiohttp.ClientSession() as session:\n".to_string(), - " async with session.post(url, headers=headers) as response:\n".to_string(), - ), - " return await response.json()".to_string(), - ); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(v2_rt::concat(url_line, "\n".to_string()), headers_dict), - "\n".to_string(), - ), - session_lines, - ) - } + let self_base_url = v2_rt::concat(v2_rt::concat("{".to_string(), "self.base_url".to_string()), "}".to_string()); +let url_line = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("url = f\"".to_string(), self_base_url), "/".to_string()), emit_ident(op_name, RenderTarget::Python)), "\"".to_string()); +let headers_dict = emit_py_headers_dict(&transport, &source_indices); +let session_lines = v2_rt::concat(v2_rt::concat("async with aiohttp.ClientSession() as session:\n".to_string(), " async with session.post(url, headers=headers) as response:\n".to_string()), " return await response.json()".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(url_line, "\n".to_string()), headers_dict), "\n".to_string()), session_lines) +} } -pub fn emit_py_headers_dict( - transport: &Rc, - source_indices: &Rc>>, -) -> String { +pub fn emit_py_headers_dict(transport: &Rc, source_indices: &Rc>>) -> String { { let auth_entry = if transport_has_auth(transport.clone(), source_indices.clone()) { { - let header_name = - match transport_auth_header_name(transport.clone(), source_indices.clone()) { - Some(h) => h.clone(), - None => "Authorization".to_string(), - }; - v2_rt::concat( - v2_rt::concat("\"".to_string(), header_name), - "\": self.auth_token, ".to_string(), - ) - } + let header_name = match transport_auth_header_name(transport.clone(), source_indices.clone()) { + Some(h) => h.clone(), + None => "Authorization".to_string(), +}; +v2_rt::concat(v2_rt::concat("\"".to_string(), header_name), "\": self.auth_token, ".to_string()) +} } else { "".to_string() }; - let hdrs = transport_headers(transport.clone(), source_indices.clone()); - let header_entries = Rc::new({ - let mut __result = Vec::new(); - for h in hdrs.iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "\"".to_string(), - field_init_node_name_at(h.clone(), source_indices.clone()), - ), - "\": ".to_string(), - ), - emit_simple_expr( - &field_init_node_value(&h), - &RenderTarget::Python, - &source_indices, - ), - )); - } - __result - }); - let all_entries = if (auth_entry.clone().as_str() == "".to_string().as_str()) { +let hdrs = transport_headers(transport.clone(), source_indices.clone()); +let header_entries = Rc::new({ let mut __result = Vec::new(); for h in hdrs.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat("\"".to_string(), field_init_node_name_at(h.clone(), source_indices.clone())), "\": ".to_string()), emit_simple_expr(&field_init_node_value(&h), &RenderTarget::Python, &source_indices))); } __result }); +let all_entries = if (auth_entry.clone().as_str() == "".to_string().as_str()) { header_entries.join(&", ".to_string()) } else { v2_rt::concat(auth_entry.clone(), header_entries.join(&", ".to_string())) }; - v2_rt::concat( - v2_rt::concat("headers = {".to_string(), all_entries), - "}".to_string(), - ) - } +v2_rt::concat(v2_rt::concat("headers = {".to_string(), all_entries), "}".to_string()) +} } -pub fn emit_py_shell_call( - op_name: String, - transport: Rc, - source_indices: &Rc>>, -) -> String { +pub fn emit_py_shell_call(op_name: String, transport: Rc, source_indices: &Rc>>) -> String { { let envs = transport_env(transport, source_indices.clone()); - let env_dict_entries = Rc::new({ - let mut __result = Vec::new(); - for e in envs.iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "\"".to_string(), - field_init_node_name_at(e.clone(), source_indices.clone()), - ), - "\": ".to_string(), - ), - emit_simple_expr( - &field_init_node_value(&e), - &RenderTarget::Python, - &source_indices, - ), - )); - } - __result - }); - let env_str = v2_rt::concat( - v2_rt::concat("{".to_string(), env_dict_entries.join(&", ".to_string())), - "}".to_string(), - ); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "import subprocess\n".to_string(), - "result = subprocess.run(\n".to_string(), - ), - " [\"".to_string(), - ), - emit_ident(op_name, RenderTarget::Python), - ), - "\"],\n".to_string(), - ), - " cwd=self.working_dir or \".\",\n".to_string(), - ), - " env=".to_string(), - ), - env_str, - ), - ",\n".to_string(), - ), - " capture_output=True, text=True,\n".to_string(), - ), - ")\n".to_string(), - ), - "return result.stdout".to_string(), - ) - } +let env_dict_entries = Rc::new({ let mut __result = Vec::new(); for e in envs.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat("\"".to_string(), field_init_node_name_at(e.clone(), source_indices.clone())), "\": ".to_string()), emit_simple_expr(&field_init_node_value(&e), &RenderTarget::Python, &source_indices))); } __result }); +let env_str = v2_rt::concat(v2_rt::concat("{".to_string(), env_dict_entries.join(&", ".to_string())), "}".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("import subprocess\n".to_string(), "result = subprocess.run(\n".to_string()), " [\"".to_string()), emit_ident(op_name, RenderTarget::Python)), "\"],\n".to_string()), " cwd=self.working_dir or \".\",\n".to_string()), " env=".to_string()), env_str), ",\n".to_string()), " capture_output=True, text=True,\n".to_string()), ")\n".to_string()), "return result.stdout".to_string()) +} } pub fn emit_py_file_call(op_name: String) -> String { { - let self_base_path = v2_rt::concat( - v2_rt::concat("{".to_string(), "self.base_path".to_string()), - "}".to_string(), - ); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("path = f\"".to_string(), self_base_path), - "/".to_string(), - ), - emit_ident(op_name, RenderTarget::Python), - ), - "\"\n".to_string(), - ), - "with open(path) as f:\n".to_string(), - ), - " return f.read()".to_string(), - ) - } + let self_base_path = v2_rt::concat(v2_rt::concat("{".to_string(), "self.base_path".to_string()), "}".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("path = f\"".to_string(), self_base_path), "/".to_string()), emit_ident(op_name, RenderTarget::Python)), "\"\n".to_string()), "with open(path) as f:\n".to_string()), " return f.read()".to_string()) +} } pub fn emit_py_local_call(op_name: String) -> String { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "# Local binding -- direct function call\n".to_string(), - "return ".to_string(), - ), - emit_ident(op_name, RenderTarget::Python), - ), - "()".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat("# Local binding -- direct function call\n".to_string(), "return ".to_string()), emit_ident(op_name, RenderTarget::Python)), "()".to_string()) } pub fn emit_py_resource_def(item: &Rc, env: &Rc) -> String { { let item_text = authored_name(env.clone(), item.clone()); - let depth = 0; - let cap_children = item.children.clone(); - let methods = Rc::new({ - let mut __result = Vec::new(); - for c in cap_children.iter().cloned() { - __result.push(emit_py_capability_method(&c, &env)); - } - __result - }); - let methods_str = methods.join(&"\n\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "from abc import ABC, abstractmethod\n\n".to_string(), - language_spec(RenderTarget::Python) - .items - .clone() - .struct_keyword - .clone(), - ), - " ".to_string(), - ), - item_text, - ), - "(ABC):\n".to_string(), - ), - make_indent((depth + 1)), - ), - methods_str, - ) - } +let depth = 0; +let cap_children = item.children.clone(); +let methods = Rc::new({ let mut __result = Vec::new(); for c in cap_children.iter().cloned() { __result.push(emit_py_capability_method(&c, &env)); } __result }); +let methods_str = methods.join(&"\n\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("from abc import ABC, abstractmethod\n\n".to_string(), language_spec(RenderTarget::Python).items.clone().struct_keyword.clone()), " ".to_string()), item_text), "(ABC):\n".to_string()), make_indent((depth + 1))), methods_str) +} } pub fn emit_py_capability_method(cap_node: &Rc, env: &Rc) -> String { { - let input_params = Rc::new({ - let mut __result = Vec::new(); - for p in cap_node.params.clone().iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - emit_ident( - param_node_name_at(p.clone(), env.source_indices.clone()), - RenderTarget::Python, - ), - ": ".to_string(), - ), - emit_node_type( - param_node_type_expr(&p), - RenderTarget::Python, - env.source_indices.clone(), - ), - )); - } - __result - }); - let params_str = input_params.join(&", ".to_string()); - let all_params = if (params_str.clone().as_str() == "".to_string().as_str()) { + let input_params = Rc::new({ let mut __result = Vec::new(); for p in cap_node.params.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(emit_ident(param_node_name_at(p.clone(), env.source_indices.clone()), RenderTarget::Python), ": ".to_string()), emit_node_type(param_node_type_expr(&p), RenderTarget::Python, env.source_indices.clone()))); } __result }); +let params_str = input_params.join(&", ".to_string()); +let all_params = if (params_str.clone().as_str() == "".to_string().as_str()) { "self".to_string() } else { v2_rt::concat("self, ".to_string(), params_str.clone()) }; - let ret = emit_node_type( - resolved_type(cap_node.clone()), - RenderTarget::Python, - env.source_indices.clone(), - ); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "@abstractmethod\n".to_string(), - language_spec(RenderTarget::Python) - .items - .clone() - .async_prefix - .clone(), - ), - language_spec(RenderTarget::Python) - .items - .clone() - .func_keyword - .clone(), - ), - " ".to_string(), - ), - emit_ident( - authored_name(env.clone(), cap_node.clone()), - RenderTarget::Python, - ), - ), - "(".to_string(), - ), - all_params, - ), - ") -> ".to_string(), - ), - ret, - ), - ":\n".to_string(), - ), - " ...".to_string(), - ) - } +let ret = emit_node_type(resolved_type(cap_node.clone()), RenderTarget::Python, env.source_indices.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("@abstractmethod\n".to_string(), language_spec(RenderTarget::Python).items.clone().async_prefix.clone()), language_spec(RenderTarget::Python).items.clone().func_keyword.clone()), " ".to_string()), emit_ident(authored_name(env.clone(), cap_node.clone()), RenderTarget::Python)), "(".to_string()), all_params), ") -> ".to_string()), ret), ":\n".to_string()), " ...".to_string()) +} } -pub fn emit_py_data_def( - name: String, - type_node: Rc, - value: Rc, - registry: Rc>>, - scope: &Rc, -) -> String { +pub fn emit_py_data_def(name: String, type_node: Rc, value: Rc, registry: Rc>>, scope: &Rc) -> String { { - let ty_str = emit_node_type( - type_node, - RenderTarget::Python, - scope.type_env.clone().source_indices.clone(), - ); - let upper_name = to_screaming_snake(name); - let val_str = emit_py_typed_expr(value, registry, &scope, 0, 1024); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(v2_rt::concat(upper_name, ": ".to_string()), ty_str), - " = ".to_string(), - ), - val_str, - ) - } + let ty_str = emit_node_type(type_node, RenderTarget::Python, scope.type_env.clone().source_indices.clone()); +let upper_name = to_screaming_snake(name); +let val_str = emit_py_typed_expr(value, registry, &scope, 0, 1024); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(upper_name, ": ".to_string()), ty_str), " = ".to_string()), val_str) +} } pub fn emit_requirements_txt(has_services: bool) -> Rc { { let base_deps = "".to_string(); - let async_deps = if has_services { +let async_deps = if has_services { "aiohttp>=3.9\n".to_string() } else { "".to_string() }; - Rc::new(TextFile { - path: "requirements.txt".to_string(), - content: v2_rt::concat(base_deps, async_deps), - }) - } +Rc::new(TextFile { + path: "requirements.txt".to_string(), + content: v2_rt::concat(base_deps, async_deps), +}) +} } diff --git a/src/v2/stage0/src/v2_compiler_emit_rust.rs b/src/v2/stage0/src/v2_compiler_emit_rust.rs index c737e0ecf97..fc2064df653 100644 --- a/src/v2/stage0/src/v2_compiler_emit_rust.rs +++ b/src/v2/stage0/src/v2_compiler_emit_rust.rs @@ -1,211 +1,121 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.emit_rust -pub use crate::extdeps_languages_rust_emit::{ - rt_bridge_function_names, rt_functions, rt_ref_map_functions, rt_wraps_result, - rust_container_templates, rust_enum_derives, rust_enum_derives_copy, rust_higher_order_methods, - rust_method_wraps_result, rust_struct_derives, rust_struct_derives_copy, HigherOrderMethodSpec, -}; -pub use crate::generated_method_template_projection::rust_method_template_emit; -pub use crate::std_induction::SubValueRelation; -use crate::std_induction::SubValueRelation::SubValueUnknown; -pub use crate::std_types::is_container_type; -pub use crate::v2_compiler_artifact::RenderTarget; -use crate::v2_compiler_artifact::RenderTarget::Rust; -pub use crate::v2_compiler_coercion::{coerce_primitive_type, is_copy, lookup_checkpoint}; -pub use crate::v2_compiler_compiler_tests_rust::compiler_tests_source; -pub use crate::v2_compiler_emit::{ - apply_named_template, apply_type_template1, apply_type_template2, apply_type_template3, - capitalize_first, compute_service_fields, effective_operation_transport, emit_bin_op_symbol, - emit_data_value_json, emit_error_expr, emit_ident, emit_keyword, emit_lambda, - emit_lambda_params, emit_let_binding, emit_let_binding_annotated, emit_list_lit_expr, - emit_literal, emit_node_type, emit_null_coalesce, emit_return, emit_shared_expr, - emit_shared_tco_expr, emit_simple_expr, emit_string_literal, emit_typed_cast_shared, - emit_typed_if_shared, emit_typed_let_shared, emit_unary_op, escape_json_string, - escape_rust_interp_text, escape_string_literal_body, extract_modifier_names, - extract_test_projections, has_mock_prefix, has_nested_records_node, has_service_items, - is_data_def_item, is_function_item, is_null_coalesce, is_resource_def_item, is_self_recursive, - is_service_def_item, is_service_item, is_tco_eligible, is_tco_identity_passthrough, - is_type_alias_item, is_type_alias_return_node, is_type_decl_item, is_type_def_item, is_upper, - language_spec, lookup_item, make_indent, module_emit_scope, module_to_filename, - order_typed_call_args, render_node_type, rust_literal_for_pattern, sanitize_service_name, - scope_after_expr, seed_bindings, service_fallback_transport, service_field_ctors, - service_field_decls, service_var_name, tco_reassign_core, test_function_name, to_lower_char, - to_pascal, to_screaming_snake, to_snake, to_string, to_string_helper, to_upper_char, - typed_named_arg_matches, unique_strings, BlockEmitState, EmitResult, InterpPart, - ServiceFieldSet, TcoFrame, TcoReassignInput, TestProjection, -}; -pub use crate::v2_compiler_infer::{ - build_emit_graph_info, build_params_scope, expr_span, extend_scope, InferScope, -}; -use crate::v2_compiler_infer_emit_info::TypeRepr::{EnumRepr, StructRepr}; -pub use crate::v2_compiler_infer_emit_info::{ - find_variant_parent, is_enum_in_summaries, is_known_variant, lookup_emit_type_summary, - variant_belongs_to_enum, EmitGraphInfo, TypeRepr, TypeSummary, -}; -pub use crate::v2_compiler_infer_env::{authored_name, lookup_type_by_name, TypeBinding, TypeEnv}; -use crate::v2_compiler_infer_items::ItemKind::DataItem; -pub use crate::v2_compiler_infer_items::{ItemInfo, ItemKind, ResolvedGraph, TypedModule}; -pub use crate::v2_compiler_infer_service::{ - extract_typed_service_name, is_typed_service_call_receiver, -}; -pub use crate::v2_compiler_infer_sigs::ResolvedFuncEnv; -pub use crate::v2_compiler_infer_types::{ - child_type_node, emit_map_has, for_each_element_type_node, is_coproduct_type, is_product_type, - is_unit_like, node_is_collection, node_is_element_collection, node_is_keyed_collection, - normalize_access_type_node, resolved_type, -}; -use crate::v2_compiler_languages::VisibilitySpec::KeywordVisibility; -pub use crate::v2_compiler_languages::{ - is_string_like, scaffold_for_target, serialization_for_target, sharing_for_target, - test_conventions_for_target, visibility_for_target, ItemKeywords, TestConventions, - VisibilitySpec, -}; -pub use crate::v2_compiler_ownership::{ - analyze_ownership, analyze_single_fold, build_movable_set, build_read_only_params, - collect_callable_refs, OwnershipProof, -}; -pub use crate::v2_compiler_runtime_rust::rust_runtime_source; +use std::collections::HashMap; +use std::rc::Rc; use crate::v2_rt; -use crate::v2_std_core::AlgebraFieldKind::*; -use crate::v2_std_core::BinOp::*; -use crate::v2_std_core::CallSemantics::{LookupCallSemantics, PlainCallSemantics}; -use crate::v2_std_core::Cardinality::{CardOptional, Required}; -use crate::v2_std_core::CompilerDiagnostic::InternalError; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::v2_std_core::{Node, InferredNode, is_compiler_error, import_is_all, import_specific_names_at, module_imports, module_items, param_node_type_expr, param_node_default_value, authored_name_at, NewlineIndex, find_child_named, expr_var_name_at, expr_call_func_at, field_access_field_at, param_node_name_at, resource_use_name_at, field_binding_name_at, generic_param_name_at, LiteralValue, ExprData, make_expr_node, FieldSummary, VarBindingKind, CallSemantics, MethodSemantics, MatchPattern, field_binding_pattern, TextFile, ErrorNode, make_error_node, SourceSpan, resource_use_resource, BinOp, AlgebraFieldKind, UnaryOpKind, StringPart, transport_base_url, transport_has_auth, transport_auth_token, transport_auth_header_name, transport_headers, transport_env, transport_method, transport_path_template, transport_query, transport_request_body, transport_stdin, transport_response_format, service_config_auth, service_config_auth_input, service_config_auth_source, service_config_endpoint, expr_has_self_call, expr_has_non_tail_self_call, field_access_base, foreach_variable_at, expr_method_name_at, let_binding_name_at, record_lit_type_name_at, arg_name_at, arg_value, arm_body, arm_pattern, arm_guard, field_init_node_name_at, field_init_node_value, make_arg_node, make_named_expr_node, let_value, let_body, lambda_body, lambda_param_names_at, foreach_collection, foreach_body, method_receiver, method_arg_nodes, match_scrutinee, match_arm_nodes, if_condition, if_then_branch, if_else_branch, index_base, index_expr, slice_base, slice_start, slice_end, cast_target, cast_expr, return_value, binop_left, binop_right, make_span, with_required_cardinality, Connective, Cardinality, is_rest_transport, is_shell_transport, is_file_transport, FieldAccessStyle, FieldValueShape, CompilerDiagnostic}; +use crate::v2_std_core::InferredNode::{Resolved, CompilerError, TypeVariable}; +use crate::v2_std_core::ExprData::{NoExprData, ExprLiteral, ExprError, ExprVar, ExprFieldAccess, ExprCall, ExprMethodCall, ExprMatch, ExprIf, ExprLet, ExprRecordLit, ExprListLit, ExprBinOp, ExprUnaryOp, ExprLambda, ExprStringInterp, ExprBlock, ExprCast, ExprForEach, ExprIndex, ExprSlice, ExprReturn}; +use crate::v2_std_core::FieldAccessStyle::{StoredField, EnumAccessor, OptionalUnwrap, TupleFirst, TupleSecond}; +use crate::v2_std_core::FieldValueShape::{OptionalValue}; +use crate::v2_std_core::VarBindingKind::{LocalValueBinding, FunctionValueBinding, VariantValueBinding, MatchBoundBinding}; +use crate::v2_std_core::CallSemantics::{PlainCallSemantics, LookupCallSemantics}; +use crate::v2_std_core::MethodSemantics::{PlainMethodSemantics, AlgebraMethodSemantics, ServiceMethodSemantics}; +use crate::v2_std_core::CompilerDiagnostic::{InternalError}; +use crate::v2_std_core::StringPart::{Text, Interpolation}; use crate::v2_std_core::Connective::{Conj, Disj, NoConnective}; -use crate::v2_std_core::ExprData::{ - ExprBinOp, ExprBlock, ExprCall, ExprCast, ExprError, ExprFieldAccess, ExprForEach, ExprIf, - ExprIndex, ExprLambda, ExprLet, ExprListLit, ExprLiteral, ExprMatch, ExprMethodCall, - ExprRecordLit, ExprReturn, ExprSlice, ExprStringInterp, ExprUnaryOp, ExprVar, NoExprData, -}; -use crate::v2_std_core::FieldAccessStyle::{ - EnumAccessor, OptionalUnwrap, StoredField, TupleFirst, TupleSecond, -}; -use crate::v2_std_core::FieldValueShape::OptionalValue; -use crate::v2_std_core::InferredNode::{CompilerError, Resolved, TypeVariable}; +use crate::v2_std_core::Cardinality::{Required, CardOptional}; use crate::v2_std_core::LiteralValue::*; use crate::v2_std_core::MatchPattern::*; -use crate::v2_std_core::MethodSemantics::{ - AlgebraMethodSemantics, PlainMethodSemantics, ServiceMethodSemantics, -}; -use crate::v2_std_core::StringPart::{Interpolation, Text}; +use crate::v2_std_core::BinOp::*; +use crate::v2_std_core::AlgebraFieldKind::*; use crate::v2_std_core::UnaryOpKind::*; -use crate::v2_std_core::VarBindingKind::{ - FunctionValueBinding, LocalValueBinding, MatchBoundBinding, VariantValueBinding, -}; -pub use crate::v2_std_core::{ - arg_name_at, arg_value, arm_body, arm_guard, arm_pattern, authored_name_at, binop_left, - binop_right, cast_expr, cast_target, expr_call_func_at, expr_has_non_tail_self_call, - expr_has_self_call, expr_method_name_at, expr_var_name_at, field_access_base, - field_access_field_at, field_binding_name_at, field_binding_pattern, field_init_node_name_at, - field_init_node_value, find_child_named, foreach_body, foreach_collection, foreach_variable_at, - generic_param_name_at, if_condition, if_else_branch, if_then_branch, import_is_all, - import_specific_names_at, index_base, index_expr, is_compiler_error, is_file_transport, - is_rest_transport, is_shell_transport, lambda_body, lambda_param_names_at, let_binding_name_at, - let_body, let_value, make_arg_node, make_error_node, make_expr_node, make_named_expr_node, - make_span, match_arm_nodes, match_scrutinee, method_arg_nodes, method_receiver, module_imports, - module_items, param_node_default_value, param_node_name_at, param_node_type_expr, - record_lit_type_name_at, resource_use_name_at, resource_use_resource, return_value, - service_config_auth, service_config_auth_input, service_config_auth_source, - service_config_endpoint, slice_base, slice_end, slice_start, transport_auth_header_name, - transport_auth_token, transport_base_url, transport_env, transport_has_auth, transport_headers, - transport_method, transport_path_template, transport_query, transport_request_body, - transport_response_format, transport_stdin, with_required_cardinality, AlgebraFieldKind, BinOp, - CallSemantics, Cardinality, CompilerDiagnostic, Connective, ErrorNode, ExprData, - FieldAccessStyle, FieldSummary, FieldValueShape, InferredNode, LiteralValue, MatchPattern, - MethodSemantics, NewlineIndex, Node, SourceSpan, StringPart, TextFile, UnaryOpKind, - VarBindingKind, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; -use std::collections::HashMap; -use std::rc::Rc; - -pub fn render_rust_type( - n: Rc, - shared_types: Rc>, - source_indices: Rc>>, -) -> String { +pub use crate::v2_compiler_artifact::{RenderTarget}; +use crate::v2_compiler_artifact::RenderTarget::{Rust}; +pub use crate::generated_method_template_projection::{rust_method_template_emit}; +pub use crate::extdeps_languages_rust_emit::{rt_functions, rt_ref_map_functions, rt_wraps_result, rt_bridge_function_names, rust_container_templates, rust_method_wraps_result, rust_struct_derives, rust_struct_derives_copy, rust_enum_derives, rust_enum_derives_copy, HigherOrderMethodSpec, rust_higher_order_methods}; +pub use crate::v2_compiler_languages::{scaffold_for_target, serialization_for_target, TestConventions, ItemKeywords, test_conventions_for_target, visibility_for_target, sharing_for_target, is_string_like, VisibilitySpec}; +use crate::v2_compiler_languages::VisibilitySpec::{KeywordVisibility}; +pub use crate::v2_compiler_runtime_rust::{rust_runtime_source}; +pub use crate::v2_compiler_compiler_tests_rust::{compiler_tests_source}; +pub use crate::v2_compiler_coercion::{coerce_primitive_type, is_copy, lookup_checkpoint}; +pub use crate::std_types::{is_container_type}; +pub use crate::v2_compiler_infer_env::{TypeEnv, TypeBinding, authored_name, lookup_type_by_name}; +pub use crate::v2_compiler_infer_types::{resolved_type, normalize_access_type_node, for_each_element_type_node, child_type_node, emit_map_has, node_is_keyed_collection, node_is_element_collection, node_is_collection, is_product_type, is_coproduct_type, is_unit_like}; +pub use crate::v2_compiler_infer_sigs::{ResolvedFuncEnv}; +pub use crate::v2_compiler_infer_items::{ResolvedGraph, TypedModule, ItemInfo, ItemKind}; +use crate::v2_compiler_infer_items::ItemKind::{DataItem}; +pub use crate::v2_compiler_infer_service::{is_typed_service_call_receiver, extract_typed_service_name}; +pub use crate::v2_compiler_infer::{InferScope, build_params_scope, extend_scope, build_emit_graph_info, expr_span}; +pub use crate::v2_compiler_infer_emit_info::{EmitGraphInfo, TypeSummary, lookup_emit_type_summary, is_enum_in_summaries, find_variant_parent, is_known_variant, variant_belongs_to_enum, TypeRepr}; +use crate::v2_compiler_infer_emit_info::TypeRepr::{StructRepr, EnumRepr}; +pub use crate::v2_compiler_ownership::{OwnershipProof, analyze_ownership, analyze_single_fold, build_movable_set, build_read_only_params, collect_callable_refs}; +pub use crate::std_induction::{SubValueRelation}; +use crate::std_induction::SubValueRelation::{SubValueUnknown}; +pub use crate::v2_compiler_emit::{EmitResult, BlockEmitState, TestProjection, TcoFrame, TcoReassignInput, InterpPart, rust_literal_for_pattern, emit_literal, emit_bin_op_symbol, emit_keyword, emit_node_type, render_node_type, emit_ident, emit_let_binding, emit_let_binding_annotated, emit_return, emit_unary_op, emit_lambda, emit_error_expr, emit_lambda_params, emit_null_coalesce, emit_list_lit_expr, emit_shared_expr, emit_typed_cast_shared, emit_string_literal, emit_simple_expr, escape_rust_interp_text, escape_string_literal_body, module_emit_scope, scope_after_expr, lookup_item, unique_strings, has_nested_records_node, emit_data_value_json, escape_json_string, module_to_filename, make_indent, to_string, to_string_helper, to_snake, to_screaming_snake, to_pascal, is_upper, to_lower_char, to_upper_char, capitalize_first, sanitize_service_name, service_var_name, test_function_name, apply_type_template1, apply_type_template2, apply_type_template3, apply_named_template, language_spec, is_null_coalesce, is_type_alias_return_node, is_service_item, has_service_items, typed_named_arg_matches, order_typed_call_args, is_type_def_item, is_type_alias_item, is_type_decl_item, is_function_item, is_data_def_item, is_service_def_item, is_resource_def_item, has_mock_prefix, extract_test_projections, is_tco_eligible, is_self_recursive, emit_shared_tco_expr, tco_reassign_core, is_tco_identity_passthrough, service_fallback_transport, effective_operation_transport, ServiceFieldSet, compute_service_fields, service_field_decls, service_field_ctors, extract_modifier_names, seed_bindings, emit_typed_if_shared, emit_typed_let_shared}; + +pub fn render_rust_type(n: Rc, shared_types: Rc>, source_indices: Rc>>) -> String { render_node_type(&n, &RenderTarget::Rust, &shared_types, &source_indices) } pub fn type_variable_node(id: String) -> Rc { Rc::new(Node { - name: "".to_string(), - span: make_span(0, 0), - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::TypeVariable { id: id })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) + name: "".to_string(), + span: make_span(0, 0), + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::TypeVariable { + id: id, +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) } pub fn is_type_variable(inferred: Rc) -> bool { match (*inferred).clone() { - InferredNode::TypeVariable { .. } => true, - _ => false, - } + InferredNode::TypeVariable { .. } => true, + _ => false, +} } -pub fn is_rust_value_type( - n: Rc, - source_indices: Rc>>, -) -> bool { +pub fn is_rust_value_type(n: Rc, source_indices: Rc>>) -> bool { { let normed = normalize_access_type_node(n); - match is_copy( - RenderTarget::Rust, - authored_name_at(source_indices, &normed), - ) { - Some(v) => v.clone(), - None => false, - } - } +match is_copy(RenderTarget::Rust, authored_name_at(source_indices, &normed)) { + Some(v) => v.clone(), + None => false, +} +} } -pub fn is_rust_string_like( - n: Rc, - source_indices: Rc>>, -) -> bool { +pub fn is_rust_string_like(n: Rc, source_indices: Rc>>) -> bool { { let normed = normalize_access_type_node(n); - is_string_like( - RenderTarget::Rust, - authored_name_at(source_indices, &normed), - ) - } +is_string_like(RenderTarget::Rust, authored_name_at(source_indices, &normed)) +} } pub fn rust_source_root() -> String { match scaffold_for_target(RenderTarget::Rust).source_dir.clone() { - Some(dir) => dir.clone(), - None => "".to_string(), - } + Some(dir) => dir.clone(), + None => "".to_string(), +} } pub fn rust_source_ext() -> String { - scaffold_for_target(RenderTarget::Rust) - .source_file_extension - .clone() + scaffold_for_target(RenderTarget::Rust).source_file_extension.clone() } pub fn rust_visibility_prefix() -> String { match (*visibility_for_target(RenderTarget::Rust)).clone() { - VisibilitySpec::KeywordVisibility { prefix: p, .. } => p.clone(), - _ => "__VISIBILITY_SPEC_MISMATCH__".to_string(), - } + VisibilitySpec::KeywordVisibility { prefix: p, .. } => p.clone(), + _ => "__VISIBILITY_SPEC_MISMATCH__".to_string(), +} } pub fn rust_items() -> Rc { @@ -229,16 +139,10 @@ pub fn rust_enum_derives_copy_text() -> String { } pub fn rust_serde_tag_attr() -> String { - match serialization_for_target(RenderTarget::Rust) - .tag_attribute - .clone() - { - Some(attr) => attr.clone(), - None => emit_error_expr( - "missing serde tag_attribute for Rust".to_string(), - RenderTarget::Rust, - ), - } + match serialization_for_target(RenderTarget::Rust).tag_attribute.clone() { + Some(attr) => attr.clone(), + None => emit_error_expr("missing serde tag_attribute for Rust".to_string(), RenderTarget::Rust), +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -248,41 +152,44 @@ pub struct RustEnumWireSerde { pub rename_suffix: Option, pub rename_style: Option, pub error_message: Option, + pub untagged_string_variant: Option, + pub untagged_string_field: Option, + pub untagged_array_variant: Option, + pub untagged_array_field: Option, } -pub fn rust_serde_policy( - enum_attr: String, - rename_prefix: Option, - rename_suffix: Option, - rename_style: Option, -) -> Rc { +pub fn rust_serde_policy(enum_attr: String, rename_prefix: Option, rename_suffix: Option, rename_style: Option) -> Rc { Rc::new(RustEnumWireSerde { - enum_attr: enum_attr, - rename_prefix: rename_prefix, - rename_suffix: rename_suffix, - rename_style: rename_style, - error_message: None, - }) + enum_attr: enum_attr, + rename_prefix: rename_prefix, + rename_suffix: rename_suffix, + rename_style: rename_style, + error_message: None, + untagged_string_variant: None, + untagged_string_field: None, + untagged_array_variant: None, + untagged_array_field: None, +}) } pub fn rust_serde_policy_error(message: String) -> Rc { Rc::new(RustEnumWireSerde { - enum_attr: "".to_string(), - rename_prefix: None, - rename_suffix: None, - rename_style: None, - error_message: Some(message), - }) + enum_attr: "".to_string(), + rename_prefix: None, + rename_suffix: None, + rename_style: None, + error_message: Some(message), + untagged_string_variant: None, + untagged_string_field: None, + untagged_array_variant: None, + untagged_array_field: None, +}) } pub fn rust_tagged_object_policy() -> Rc { rust_serde_policy(rust_serde_tag_attr(), None, None, None) } -pub fn rust_untagged_policy() -> Rc { - rust_serde_policy("#[serde(untagged)]".to_string(), None, None, None) -} - pub fn rust_serde_error_policy(message: String) -> Rc { rust_serde_policy_error(message) } @@ -292,656 +199,333 @@ pub fn rust_string_as_authored_policy() -> Rc { } pub fn rust_snake_string_policy() -> Rc { - rust_serde_policy( - "#[serde(rename_all = \"snake_case\")]".to_string(), - None, - None, - None, - ) -} - -pub fn field_value_by_name( - record: Rc, - field_name: String, - source_indices: Rc>>, -) -> Option> { - match Rc::new({ - let mut __result = Vec::new(); - for fi in record.children.clone().iter().cloned() { - if (field_init_node_name_at(fi.clone(), source_indices.clone()).as_str() - == field_name.clone().as_str()) - { - __result.push(fi); - } - } - __result - }) - .first() - .cloned() - { - Some(fi) => Some(field_init_node_value(&fi)), - None => None, - } + rust_serde_policy("#[serde(rename_all = \"snake_case\")]".to_string(), None, None, None) +} + +pub fn field_value_by_name(record: Rc, field_name: String, source_indices: Rc>>) -> Option> { + match Rc::new({ let mut __result = Vec::new(); for fi in record.children.clone().iter().cloned() { if (field_init_node_name_at(fi.clone(), source_indices.clone()).as_str() == field_name.clone().as_str()) { __result.push(fi); } } __result }).first().cloned() { + Some(fi) => Some(field_init_node_value(&fi)), + None => None, +} } pub fn literal_string_value(n: Rc) -> Option { match (*n.expr_data.clone()).clone() { - ExprData::ExprLiteral { value: lv, .. } => match (*lv.clone()).clone() { - LiteralValue::LitStr { value: s, .. } => Some(s.clone()), - _ => None, - }, - _ => None, - } + ExprData::ExprLiteral { value: lv, .. } => match (*lv.clone()).clone() { + LiteralValue::LitStr { value: s, .. } => Some(s.clone()), + _ => None, +}, + _ => None, +} } -pub fn record_string_field( - record: Rc, - field_name: String, - source_indices: Rc>>, -) -> Option { +pub fn record_string_field(record: Rc, field_name: String, source_indices: Rc>>) -> Option { match field_value_by_name(record, field_name, source_indices) { - Some(value_node) => literal_string_value(value_node.clone()), - None => None, - } + Some(value_node) => literal_string_value(value_node.clone()), + None => None, +} } -pub fn naming_policy_node( - encoding: Rc, - source_indices: Rc>>, -) -> Option> { +pub fn naming_policy_node(encoding: Rc, source_indices: Rc>>) -> Option> { field_value_by_name(encoding, "naming".to_string(), source_indices) } -pub fn optional_string_record_field( - record: Rc, - field_name: String, - source_indices: Rc>>, -) -> Option { +pub fn optional_string_record_field(record: Rc, field_name: String, source_indices: Rc>>) -> Option { match field_value_by_name(record, field_name, source_indices) { - Some(n) => literal_string_value(n.clone()), - None => None, - } + Some(n) => literal_string_value(n.clone()), + None => None, +} } -pub fn required_literal_string_policy_field( - record: Rc, - field_name: String, - source_indices: Rc>>, -) -> Option { +pub fn required_literal_string_policy_field(record: Rc, field_name: String, source_indices: Rc>>) -> Option { match field_value_by_name(record, field_name, source_indices) { - Some(n) => literal_string_value(n.clone()), - None => None, - } + Some(n) => literal_string_value(n.clone()), + None => None, +} } -pub fn rust_string_policy_for_naming( - naming: &Rc, - source_indices: &Rc>>, -) -> Rc { +pub fn rust_string_policy_for_naming(naming: &Rc, source_indices: &Rc>>) -> Rc { { let naming_name = authored_name_at(source_indices.clone(), &naming); - if (naming_name.clone().as_str() == "AsAuthored".to_string().as_str()) { +if (naming_name.clone().as_str() == "AsAuthored".to_string().as_str()) { rust_string_as_authored_policy() } else { if (naming_name.clone().as_str() == "SnakeCase".to_string().as_str()) { rust_snake_string_policy() } else { - if (naming_name.clone().as_str() == "StripPrefixAndSnakeCase".to_string().as_str()) - { - match required_literal_string_policy_field( - naming.clone(), - "prefix".to_string(), - source_indices.clone(), - ) { - Some(prefix) => rust_serde_policy( - "".to_string(), - Some(prefix.clone()), - None, - Some("StripAffixAndSnakeCase".to_string()), - ), - None => rust_serde_error_policy( - "StripPrefixAndSnakeCase requires a literal prefix".to_string(), - ), - } + if (naming_name.clone().as_str() == "StripPrefixAndSnakeCase".to_string().as_str()) { + match required_literal_string_policy_field(naming.clone(), "prefix".to_string(), source_indices.clone()) { + Some(prefix) => rust_serde_policy("".to_string(), Some(prefix.clone()), None, Some("StripAffixAndSnakeCase".to_string())), + None => rust_serde_error_policy("StripPrefixAndSnakeCase requires a literal prefix".to_string()), +} } else { - if (naming_name.clone().as_str() - == "StripSuffixAndSnakeCase".to_string().as_str()) - { - match required_literal_string_policy_field( - naming.clone(), - "suffix".to_string(), - source_indices.clone(), - ) { - Some(suffix) => rust_serde_policy( - "".to_string(), - None, - Some(suffix.clone()), - Some("StripAffixAndSnakeCase".to_string()), - ), - None => rust_serde_error_policy( - "StripSuffixAndSnakeCase requires a literal suffix".to_string(), - ), - } + if (naming_name.clone().as_str() == "StripSuffixAndSnakeCase".to_string().as_str()) { + match required_literal_string_policy_field(naming.clone(), "suffix".to_string(), source_indices.clone()) { + Some(suffix) => rust_serde_policy("".to_string(), None, Some(suffix.clone()), Some("StripAffixAndSnakeCase".to_string())), + None => rust_serde_error_policy("StripSuffixAndSnakeCase requires a literal suffix".to_string()), +} } else { - if (naming_name.clone().as_str() - == "StripPrefixSuffixAndSnakeCase".to_string().as_str()) - { - match required_literal_string_policy_field( - naming.clone(), - "prefix".to_string(), - source_indices.clone(), - ) { - Some(prefix) => match required_literal_string_policy_field( - naming.clone(), - "suffix".to_string(), - source_indices.clone(), - ) { - Some(suffix) => rust_serde_policy( - "".to_string(), - Some(prefix.clone()), - Some(suffix.clone()), - Some("StripAffixAndSnakeCase".to_string()), - ), - None => rust_serde_error_policy( - "StripPrefixSuffixAndSnakeCase requires a literal suffix" - .to_string(), - ), - }, - None => rust_serde_error_policy( - "StripPrefixSuffixAndSnakeCase requires a literal prefix" - .to_string(), - ), - } + if (naming_name.clone().as_str() == "StripPrefixSuffixAndSnakeCase".to_string().as_str()) { + match required_literal_string_policy_field(naming.clone(), "prefix".to_string(), source_indices.clone()) { + Some(prefix) => match required_literal_string_policy_field(naming.clone(), "suffix".to_string(), source_indices.clone()) { + Some(suffix) => rust_serde_policy("".to_string(), Some(prefix.clone()), Some(suffix.clone()), Some("StripAffixAndSnakeCase".to_string())), + None => rust_serde_error_policy("StripPrefixSuffixAndSnakeCase requires a literal suffix".to_string()), +}, + None => rust_serde_error_policy("StripPrefixSuffixAndSnakeCase requires a literal prefix".to_string()), +} } else { - rust_serde_error_policy(v2_rt::concat( - "unsupported VariantNaming: ".to_string(), - naming_name.clone(), - )) + rust_serde_error_policy(v2_rt::concat("unsupported VariantNaming: ".to_string(), naming_name.clone())) } } } } } - } +} } -pub fn rust_internal_policy_for_naming( - tag_field: String, - naming: &Rc, - source_indices: &Rc>>, -) -> Rc { +pub fn rust_internal_policy_for_naming(tag_field: String, naming: &Rc, source_indices: &Rc>>) -> Rc { { let naming_name = authored_name_at(source_indices.clone(), &naming); - if (naming_name.clone().as_str() == "AsAuthored".to_string().as_str()) { - rust_serde_policy( - v2_rt::concat( - v2_rt::concat("#[serde(tag = \"".to_string(), tag_field), - "\")]".to_string(), - ), - None, - None, - None, - ) +if (naming_name.clone().as_str() == "AsAuthored".to_string().as_str()) { + rust_serde_policy(v2_rt::concat(v2_rt::concat("#[serde(tag = \"".to_string(), tag_field), "\")]".to_string()), None, None, None) } else { if (naming_name.clone().as_str() == "SnakeCase".to_string().as_str()) { - rust_serde_policy( - v2_rt::concat( - v2_rt::concat("#[serde(tag = \"".to_string(), tag_field), - "\", rename_all = \"snake_case\")]".to_string(), - ), - None, - None, - None, - ) + rust_serde_policy(v2_rt::concat(v2_rt::concat("#[serde(tag = \"".to_string(), tag_field), "\", rename_all = \"snake_case\")]".to_string()), None, None, None) } else { - if (naming_name.clone().as_str() == "StripPrefixAndSnakeCase".to_string().as_str()) - { - match required_literal_string_policy_field( - naming.clone(), - "prefix".to_string(), - source_indices.clone(), - ) { - Some(prefix) => rust_serde_policy( - v2_rt::concat( - v2_rt::concat("#[serde(tag = \"".to_string(), tag_field), - "\")]".to_string(), - ), - Some(prefix.clone()), - None, - Some("StripAffixAndSnakeCase".to_string()), - ), - None => rust_serde_error_policy( - "StripPrefixAndSnakeCase requires a literal prefix".to_string(), - ), - } + if (naming_name.clone().as_str() == "StripPrefixAndSnakeCase".to_string().as_str()) { + match required_literal_string_policy_field(naming.clone(), "prefix".to_string(), source_indices.clone()) { + Some(prefix) => rust_serde_policy(v2_rt::concat(v2_rt::concat("#[serde(tag = \"".to_string(), tag_field), "\")]".to_string()), Some(prefix.clone()), None, Some("StripAffixAndSnakeCase".to_string())), + None => rust_serde_error_policy("StripPrefixAndSnakeCase requires a literal prefix".to_string()), +} } else { - if (naming_name.clone().as_str() - == "StripSuffixAndSnakeCase".to_string().as_str()) - { - match required_literal_string_policy_field( - naming.clone(), - "suffix".to_string(), - source_indices.clone(), - ) { - Some(suffix) => rust_serde_policy( - v2_rt::concat( - v2_rt::concat("#[serde(tag = \"".to_string(), tag_field), - "\")]".to_string(), - ), - None, - Some(suffix.clone()), - Some("StripAffixAndSnakeCase".to_string()), - ), - None => rust_serde_error_policy( - "StripSuffixAndSnakeCase requires a literal suffix".to_string(), - ), - } + if (naming_name.clone().as_str() == "StripSuffixAndSnakeCase".to_string().as_str()) { + match required_literal_string_policy_field(naming.clone(), "suffix".to_string(), source_indices.clone()) { + Some(suffix) => rust_serde_policy(v2_rt::concat(v2_rt::concat("#[serde(tag = \"".to_string(), tag_field), "\")]".to_string()), None, Some(suffix.clone()), Some("StripAffixAndSnakeCase".to_string())), + None => rust_serde_error_policy("StripSuffixAndSnakeCase requires a literal suffix".to_string()), +} } else { - if (naming_name.clone().as_str() - == "StripPrefixSuffixAndSnakeCase".to_string().as_str()) - { - match required_literal_string_policy_field( - naming.clone(), - "prefix".to_string(), - source_indices.clone(), - ) { - Some(prefix) => match required_literal_string_policy_field( - naming.clone(), - "suffix".to_string(), - source_indices.clone(), - ) { - Some(suffix) => rust_serde_policy( - v2_rt::concat( - v2_rt::concat( - "#[serde(tag = \"".to_string(), - tag_field, - ), - "\")]".to_string(), - ), - Some(prefix.clone()), - Some(suffix.clone()), - Some("StripAffixAndSnakeCase".to_string()), - ), - None => rust_serde_error_policy( - "StripPrefixSuffixAndSnakeCase requires a literal suffix" - .to_string(), - ), - }, - None => rust_serde_error_policy( - "StripPrefixSuffixAndSnakeCase requires a literal prefix" - .to_string(), - ), - } + if (naming_name.clone().as_str() == "StripPrefixSuffixAndSnakeCase".to_string().as_str()) { + match required_literal_string_policy_field(naming.clone(), "prefix".to_string(), source_indices.clone()) { + Some(prefix) => match required_literal_string_policy_field(naming.clone(), "suffix".to_string(), source_indices.clone()) { + Some(suffix) => rust_serde_policy(v2_rt::concat(v2_rt::concat("#[serde(tag = \"".to_string(), tag_field), "\")]".to_string()), Some(prefix.clone()), Some(suffix.clone()), Some("StripAffixAndSnakeCase".to_string())), + None => rust_serde_error_policy("StripPrefixSuffixAndSnakeCase requires a literal suffix".to_string()), +}, + None => rust_serde_error_policy("StripPrefixSuffixAndSnakeCase requires a literal prefix".to_string()), +} } else { - rust_serde_error_policy(v2_rt::concat( - "unsupported VariantNaming: ".to_string(), - naming_name.clone(), - )) + rust_serde_error_policy(v2_rt::concat("unsupported VariantNaming: ".to_string(), naming_name.clone())) } } } } } - } +} } -pub fn rust_internal_policy_for_encoding( - encoding: &Rc, - source_indices: &Rc>>, -) -> Rc { - match record_string_field( - encoding.clone(), - "tag_field".to_string(), - source_indices.clone(), - ) { - Some(tag_field) => match naming_policy_node(encoding.clone(), source_indices.clone()) { - Some(naming) => { - rust_internal_policy_for_naming(tag_field.clone(), &naming, &source_indices) - } - None => rust_serde_error_policy( - "InternallyTaggedObject requires a naming policy".to_string(), - ), - }, - None => rust_serde_error_policy( - "InternallyTaggedObject requires a literal tag_field".to_string(), - ), - } +pub fn rust_internal_policy_for_encoding(encoding: &Rc, source_indices: &Rc>>) -> Rc { + match record_string_field(encoding.clone(), "tag_field".to_string(), source_indices.clone()) { + Some(tag_field) => match naming_policy_node(encoding.clone(), source_indices.clone()) { + Some(naming) => rust_internal_policy_for_naming(tag_field.clone(), &naming, &source_indices), + None => rust_serde_error_policy("InternallyTaggedObject requires a naming policy".to_string()), +}, + None => rust_serde_error_policy("InternallyTaggedObject requires a literal tag_field".to_string()), +} +} + +pub fn rust_untagged_json_string_or_array_policy(encoding: &Rc, source_indices: &Rc>>) -> Rc { + match record_string_field(encoding.clone(), "string_variant".to_string(), source_indices.clone()) { + Some(sv) => match record_string_field(encoding.clone(), "string_field".to_string(), source_indices.clone()) { + Some(sf) => match record_string_field(encoding.clone(), "array_variant".to_string(), source_indices.clone()) { + Some(av) => match record_string_field(encoding.clone(), "array_field".to_string(), source_indices.clone()) { + Some(af) => Rc::new(RustEnumWireSerde { + enum_attr: "#[serde(untagged)]".to_string(), + rename_prefix: None, + rename_suffix: None, + rename_style: None, + error_message: None, + untagged_string_variant: Some(sv.clone()), + untagged_string_field: Some(sf.clone()), + untagged_array_variant: Some(av.clone()), + untagged_array_field: Some(af.clone()), +}), + None => rust_serde_error_policy("UntaggedJsonStringOrArray requires literal array_field".to_string()), +}, + None => rust_serde_error_policy("UntaggedJsonStringOrArray requires literal array_variant".to_string()), +}, + None => rust_serde_error_policy("UntaggedJsonStringOrArray requires literal string_field".to_string()), +}, + None => rust_serde_error_policy("UntaggedJsonStringOrArray requires literal string_variant".to_string()), +} } -pub fn resolve_wire_serde_policy_from_encoding_node( - ve: &Rc, - source_indices: &Rc>>, -) -> Rc { +pub fn resolve_wire_serde_policy_from_encoding_node(ve: &Rc, source_indices: &Rc>>) -> Rc { { let encoding_name = authored_name_at(source_indices.clone(), &ve); - if (encoding_name.clone().as_str() == "InternallyTaggedObject".to_string().as_str()) { +if (encoding_name.clone().as_str() == "InternallyTaggedObject".to_string().as_str()) { rust_internal_policy_for_encoding(&ve, &source_indices) } else { if (encoding_name.clone().as_str() == "StringVariant".to_string().as_str()) { match naming_policy_node(ve.clone(), source_indices.clone()) { - Some(nv) => rust_string_policy_for_naming(&nv, &source_indices), - None => rust_serde_error_policy( - "StringVariant requires a naming policy".to_string(), - ), - } + Some(nv) => rust_string_policy_for_naming(&nv, &source_indices), + None => rust_serde_error_policy("StringVariant requires a naming policy".to_string()), +} } else { - if (encoding_name.clone().as_str() == "UntaggedVariant".to_string().as_str()) { - rust_untagged_policy() - } else if (encoding_name.clone().as_str() == "TaggedVariant".to_string().as_str()) { + if (encoding_name.clone().as_str() == "TaggedVariant".to_string().as_str()) { rust_tagged_object_policy() } else { - rust_serde_error_policy(v2_rt::concat( - "unsupported VariantEncoding: ".to_string(), - encoding_name.clone(), - )) + if (encoding_name.clone().as_str() == "UntaggedJsonStringOrArray".to_string().as_str()) { + rust_untagged_json_string_or_array_policy(&ve, &source_indices) + } else { + rust_serde_error_policy(v2_rt::concat("unsupported VariantEncoding: ".to_string(), encoding_name.clone())) + } } } } - } +} } -pub fn resolve_wire_serde_policy( - wire_item: &Rc, - source_indices: Rc>>, -) -> Rc { +pub fn resolve_wire_serde_policy(wire_item: &Rc, source_indices: Rc>>) -> Rc { match wire_item.body.clone() { - Some(ve) => resolve_wire_serde_policy_from_encoding_node(&ve, &source_indices), - None => match (*wire_item.expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => { - resolve_wire_serde_policy_from_encoding_node(&wire_item, &source_indices) - } - _ => rust_tagged_object_policy(), - }, - } + Some(ve) => resolve_wire_serde_policy_from_encoding_node(&ve, &source_indices), + None => match (*wire_item.expr_data.clone()).clone() { + ExprData::ExprRecordLit { .. } => resolve_wire_serde_policy_from_encoding_node(&wire_item, &source_indices), + _ => rust_tagged_object_policy(), +}, +} } pub fn item_binding_is_named(env: Rc, node: &Rc, name: &String) -> bool { - ((authored_name(env, node.clone()).as_str() == name.clone().as_str()) - || (node.name.clone().as_str() == name.clone().as_str())) -} - -pub fn resolve_wire_serde_policy_for_coproduct( - wire_contract_item: Option>, - source_indices: Rc>>, - data_items: Rc>>>>, -) -> Rc { - resolve_wire_serde_policy_for_coproduct_seen( - wire_contract_item, - source_indices, - data_items, - v2_rt::rc_empty_map::(), - 32, - ) -} - -pub fn resolve_wire_serde_policy_for_coproduct_seen( - mut wire_contract_item: Option>, - mut source_indices: Rc>>, - mut data_items: Rc>>>>, - mut seen_aliases: Rc>, - mut fuel: i64, -) -> Rc { + ((authored_name(env, node.clone()).as_str() == name.clone().as_str()) || (node.name.clone().as_str() == name.clone().as_str())) +} + +pub fn resolve_wire_serde_policy_for_coproduct(wire_contract_item: Option>, source_indices: Rc>>, data_items: Rc>>>>) -> Rc { + resolve_wire_serde_policy_for_coproduct_seen(wire_contract_item, source_indices, data_items, v2_rt::rc_empty_map::(), 32) +} + +pub fn resolve_wire_serde_policy_for_coproduct_seen(mut wire_contract_item: Option>, mut source_indices: Rc>>, mut data_items: Rc>>>>, mut seen_aliases: Rc>, mut fuel: i64) -> Rc { loop { if (fuel.clone() <= 0) { - break rust_serde_error_policy( - "wire_contract: VariantEncoding alias chain exceeded recursion limit".to_string(), - ); - } else { + break rust_serde_error_policy("wire_contract: VariantEncoding alias chain exceeded recursion limit".to_string()); +} else { match wire_contract_item { - None => { - break rust_tagged_object_policy(); - } - Some(wc) => { - if is_data_def_item(&wc) { - match wc.body.clone() { - None => { - break rust_serde_error_policy( - "wire_contract: data item has no initializer body".to_string(), - ); - } - Some(init) => match (*init.expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => { - break resolve_wire_serde_policy(&init, source_indices.clone()); - } - ExprData::ExprVar { .. } => { - let alias_name = - expr_var_name_at(init.clone(), source_indices.clone()); - if (v2_rt::map_get(&seen_aliases, alias_name.clone()) != None) { - break rust_serde_error_policy(v2_rt::concat( - "wire_contract: cyclic VariantEncoding alias: " - .to_string(), - alias_name.clone(), - )); - } else { - match v2_rt::map_get(&data_items, alias_name.clone()) { - Some(candidates) => { - if ((candidates.clone().len() as i64) == 1) { - match candidates.clone().first().cloned() { - Some(aliased_data) => { - let __tco_0 = - Some(aliased_data.clone()); - let __tco_1 = v2_rt::rc_map_insert( - seen_aliases, - alias_name.clone(), - true, - ); - let __tco_2 = (fuel - 1); - wire_contract_item = __tco_0; - seen_aliases = __tco_1; - fuel = __tco_2; - continue; - } - None => { - break rust_serde_error_policy(v2_rt::concat("wire_contract: missing VariantEncoding data alias: ".to_string(), alias_name.clone())); - } - } - } else { - break rust_serde_error_policy(v2_rt::concat("wire_contract: ambiguous VariantEncoding data alias: ".to_string(), alias_name.clone())); - } - } - None => match init.inferred.clone() { - None => { - break rust_serde_error_policy("wire_contract: missing type inference on initializer (cannot resolve VariantEncoding alias)".to_string()); - } - Some(inf) => match (*inf.clone()).clone() { - InferredNode::Resolved { node, .. } => { - if is_data_def_item(&node) { - { - let __tco_0 = Some(node.clone()); - let __tco_1 = v2_rt::rc_map_insert( - seen_aliases, - alias_name.clone(), - true, - ); - let __tco_2 = (fuel - 1); - wire_contract_item = __tco_0; - seen_aliases = __tco_1; - fuel = __tco_2; - continue; - } - } else { - break resolve_wire_serde_policy( - &node, - source_indices.clone(), - ); - } - } - InferredNode::CompilerError { - message, .. - } => { - break rust_serde_error_policy( - v2_rt::concat( - "wire_contract: ".to_string(), - message.clone(), - ), - ); - } - InferredNode::TypeVariable { .. } => { - break rust_serde_error_policy("wire_contract: unresolved type variable in wire_contract initializer".to_string()); - } - }, - }, - } - } - } - _ => match init.inferred.clone() { - None => { - break rust_serde_error_policy("wire_contract: missing type inference on initializer (cannot resolve VariantEncoding alias)".to_string()); - } - Some(inf) => match (*inf.clone()).clone() { - InferredNode::Resolved { node, .. } => { - if is_data_def_item(&node) { - { - let __tco_0 = Some(node.clone()); - let __tco_1 = (fuel - 1); - wire_contract_item = __tco_0; - fuel = __tco_1; - continue; - } - } else { - break resolve_wire_serde_policy( - &node, - source_indices.clone(), - ); - } - } - InferredNode::CompilerError { message, .. } => { - break rust_serde_error_policy(v2_rt::concat( - "wire_contract: ".to_string(), - message.clone(), - )); - } - InferredNode::TypeVariable { .. } => { - break rust_serde_error_policy("wire_contract: unresolved type variable in wire_contract initializer".to_string()); - } - }, - }, - }, - } - } else { - break resolve_wire_serde_policy(&wc, source_indices.clone()); - } - } - } - } - } + None => { break rust_tagged_object_policy(); }, + Some(wc) => { if is_data_def_item(&wc) { + match wc.body.clone() { + None => { break rust_serde_error_policy("wire_contract: data item has no initializer body".to_string()); }, + Some(init) => { match (*init.expr_data.clone()).clone() { + ExprData::ExprRecordLit { .. } => { break resolve_wire_serde_policy(&init, source_indices.clone()); }, + ExprData::ExprVar { .. } => { let alias_name = expr_var_name_at(init.clone(), source_indices.clone()); +if (v2_rt::map_get(&seen_aliases, alias_name.clone()) != None) { + break rust_serde_error_policy(v2_rt::concat("wire_contract: cyclic VariantEncoding alias: ".to_string(), alias_name.clone())); +} else { + match v2_rt::map_get(&data_items, alias_name.clone()) { + Some(candidates) => { if ((candidates.clone().len() as i64) == 1) { + match candidates.clone().first().cloned() { + Some(aliased_data) => { { + let __tco_0 = Some(aliased_data.clone()); +let __tco_1 = v2_rt::rc_map_insert(seen_aliases, alias_name.clone(), true); +let __tco_2 = (fuel - 1); +wire_contract_item = __tco_0; +seen_aliases = __tco_1; +fuel = __tco_2; +continue; +} }, + None => { break rust_serde_error_policy(v2_rt::concat("wire_contract: missing VariantEncoding data alias: ".to_string(), alias_name.clone())); }, +} +} else { + break rust_serde_error_policy(v2_rt::concat("wire_contract: ambiguous VariantEncoding data alias: ".to_string(), alias_name.clone())); +} }, + None => { match init.inferred.clone() { + None => { break rust_serde_error_policy("wire_contract: missing type inference on initializer (cannot resolve VariantEncoding alias)".to_string()); }, + Some(inf) => { match (*inf.clone()).clone() { + InferredNode::Resolved { node, .. } => { if is_data_def_item(&node) { + { + let __tco_0 = Some(node.clone()); +let __tco_1 = v2_rt::rc_map_insert(seen_aliases, alias_name.clone(), true); +let __tco_2 = (fuel - 1); +wire_contract_item = __tco_0; +seen_aliases = __tco_1; +fuel = __tco_2; +continue; +} +} else { + break resolve_wire_serde_policy(&node, source_indices.clone()); +} }, + InferredNode::CompilerError { message, .. } => { break rust_serde_error_policy(v2_rt::concat("wire_contract: ".to_string(), message.clone())); }, + InferredNode::TypeVariable { .. } => { break rust_serde_error_policy("wire_contract: unresolved type variable in wire_contract initializer".to_string()); }, +} }, +} }, +} +} }, + _ => { match init.inferred.clone() { + None => { break rust_serde_error_policy("wire_contract: missing type inference on initializer (cannot resolve VariantEncoding alias)".to_string()); }, + Some(inf) => { match (*inf.clone()).clone() { + InferredNode::Resolved { node, .. } => { if is_data_def_item(&node) { + { + let __tco_0 = Some(node.clone()); +let __tco_1 = (fuel - 1); +wire_contract_item = __tco_0; +fuel = __tco_1; +continue; +} +} else { + break resolve_wire_serde_policy(&node, source_indices.clone()); +} }, + InferredNode::CompilerError { message, .. } => { break rust_serde_error_policy(v2_rt::concat("wire_contract: ".to_string(), message.clone())); }, + InferredNode::TypeVariable { .. } => { break rust_serde_error_policy("wire_contract: unresolved type variable in wire_contract initializer".to_string()); }, +} }, +} }, +} }, +} +} else { + break resolve_wire_serde_policy(&wc, source_indices.clone()); +} }, +} +} +} } -pub fn coproduct_wire_contract_encoding( - contract_item: Rc, - source_indices: Rc>>, -) -> Option> { +pub fn coproduct_wire_contract_encoding(contract_item: Rc, source_indices: Rc>>) -> Option> { match contract_item.body.clone() { - Some(body) => field_value_by_name(body.clone(), "encoding".to_string(), source_indices), - None => None, - } + Some(body) => field_value_by_name(body.clone(), "encoding".to_string(), source_indices), + None => None, +} } -pub fn variant_encoding_is_string_variant( - encoding: Rc, - source_indices: Rc>>, -) -> bool { +pub fn variant_encoding_is_string_variant(encoding: Rc, source_indices: Rc>>) -> bool { (authored_name_at(source_indices, &encoding).as_str() == "StringVariant".to_string().as_str()) } -pub fn coproduct_wire_contract_targets( - contract_item: Rc, - coproduct_name: String, - source_indices: Rc>>, -) -> bool { +pub fn coproduct_wire_contract_targets(contract_item: Rc, coproduct_name: String, source_indices: Rc>>) -> bool { match contract_item.body.clone() { - Some(body) => { - match record_string_field(body.clone(), "coproduct".to_string(), source_indices) { - Some(target_name) => (target_name.clone().as_str() == coproduct_name.as_str()), - None => false, - } - } - None => false, - } + Some(body) => match record_string_field(body.clone(), "coproduct".to_string(), source_indices) { + Some(target_name) => (target_name.clone().as_str() == coproduct_name.as_str()), + None => false, +}, + None => false, +} } pub fn emit_rust_compile_error_item(message: String) -> String { - v2_rt::concat( - v2_rt::concat("compile_error!(\"".to_string(), message), - "\");".to_string(), - ) -} - -pub fn module_imports_std_serialization_coproduct_wire_contract( - imports: Rc>>, - source_indices: Rc>>, -) -> bool { - { - let mut __found = false; - for imp in imports.iter().cloned() { - if ((authored_name_at(source_indices.clone(), &imp).as_str() - == "std.serialization".to_string().as_str()) - && (import_is_all(imp.clone()) || { - let mut __found = false; - for name in import_specific_names_at(imp.clone(), source_indices.clone()) - .iter() - .cloned() - { - if (name.clone().as_str() == "CoproductWireContract".to_string().as_str()) { - __found = true; - break; - } - } - __found - })) - { - __found = true; - break; - } - } - __found - } + v2_rt::concat(v2_rt::concat("compile_error!(\"".to_string(), message), "\");".to_string()) +} + +pub fn module_imports_std_serialization_coproduct_wire_contract(imports: Rc>>, source_indices: Rc>>) -> bool { + { let mut __found = false; for imp in imports.iter().cloned() { if ((authored_name_at(source_indices.clone(), &imp).as_str() == "std.serialization".to_string().as_str()) && (import_is_all(imp.clone()) || { let mut __found = false; for name in import_specific_names_at(imp.clone(), source_indices.clone()).iter().cloned() { if (name.clone().as_str() == "CoproductWireContract".to_string().as_str()) { __found = true; break; } } __found })) { __found = true; break; } } __found } } -pub fn data_item_type_is_coproduct_wire_contract( - item: Rc, - imports: Rc>>, - source_indices: &Rc>>, -) -> bool { +pub fn data_item_type_is_coproduct_wire_contract(item: Rc, imports: Rc>>, source_indices: &Rc>>) -> bool { match item.type_annotation.clone() { - Some(type_node) => { - ((authored_name_at(source_indices.clone(), &type_node).as_str() - == "CoproductWireContract".to_string().as_str()) - && module_imports_std_serialization_coproduct_wire_contract( - imports, - source_indices.clone(), - )) - } - None => false, - } + Some(type_node) => ((authored_name_at(source_indices.clone(), &type_node).as_str() == "CoproductWireContract".to_string().as_str()) && module_imports_std_serialization_coproduct_wire_contract(imports, source_indices.clone())), + None => false, +} } -pub fn module_defines_local_coproduct_wire_contract_type( - module_items: Rc>>, - source_indices: Rc>>, -) -> bool { - { - let mut __found = false; - for item in module_items.iter().cloned() { - if (((is_type_def_item(&item) || is_type_alias_item(&item, source_indices.clone())) - || is_type_decl_item(&item, source_indices.clone())) - && (authored_name_at(source_indices.clone(), &item).as_str() - == "CoproductWireContract".to_string().as_str())) - { - __found = true; - break; - } - } - __found - } +pub fn module_defines_local_coproduct_wire_contract_type(module_items: Rc>>, source_indices: Rc>>) -> bool { + { let mut __found = false; for item in module_items.iter().cloned() { if (((is_type_def_item(&item) || is_type_alias_item(&item, source_indices.clone())) || is_type_decl_item(&item, source_indices.clone())) && (authored_name_at(source_indices.clone(), &item).as_str() == "CoproductWireContract".to_string().as_str())) { __found = true; break; } } __found } } -pub fn is_coproduct_wire_contract_row( - item: &Rc, - module_items: Rc>>, - imports: Rc>>, - source_indices: &Rc>>, -) -> bool { +pub fn is_coproduct_wire_contract_row(item: &Rc, module_items: Rc>>, imports: Rc>>, source_indices: &Rc>>) -> bool { if !is_data_def_item(&item) { false } else { @@ -952,335 +536,116 @@ pub fn is_coproduct_wire_contract_row( false } else { match item.body.clone() { - Some(body) => { - ((field_value_by_name( - body.clone(), - "coproduct".to_string(), - source_indices.clone(), - ) != None) - && (field_value_by_name( - body.clone(), - "encoding".to_string(), - source_indices.clone(), - ) != None)) - } - None => false, - } + Some(body) => ((field_value_by_name(body.clone(), "coproduct".to_string(), source_indices.clone()) != None) && (field_value_by_name(body.clone(), "encoding".to_string(), source_indices.clone()) != None)), + None => false, +} } } } } -pub fn emit_coproduct_wire_contract_target_validation( - contract_item: Rc, - local_coproduct_names: Rc>, - source_indices: Rc>>, -) -> String { +pub fn emit_coproduct_wire_contract_target_validation(contract_item: Rc, local_coproduct_names: Rc>, source_indices: Rc>>) -> String { match contract_item.body.clone() { - Some(body) => { - match record_string_field(body.clone(), "coproduct".to_string(), source_indices) { - Some(target_name) => { - if { - let mut __found = false; - for name in local_coproduct_names.iter().cloned() { - if (name.clone().as_str() == target_name.clone().as_str()) { - __found = true; - break; - } - } - __found - } { - "".to_string() - } else { - emit_rust_compile_error_item(v2_rt::concat( - "CoproductWireContract target does not name a local coproduct: " - .to_string(), - target_name.clone(), - )) - } - } - None => emit_rust_compile_error_item( - "CoproductWireContract.coproduct must be a string declaration name".to_string(), - ), - } - } - None => emit_rust_compile_error_item( - "CoproductWireContract row missing initializer body".to_string(), - ), - } + Some(body) => match record_string_field(body.clone(), "coproduct".to_string(), source_indices) { + Some(target_name) => if { let mut __found = false; for name in local_coproduct_names.iter().cloned() { if (name.clone().as_str() == target_name.clone().as_str()) { __found = true; break; } } __found } { + "".to_string() + } else { + emit_rust_compile_error_item(v2_rt::concat("CoproductWireContract target does not name a local coproduct: ".to_string(), target_name.clone())) + }, + None => emit_rust_compile_error_item("CoproductWireContract.coproduct must be a string declaration name".to_string()), +}, + None => emit_rust_compile_error_item("CoproductWireContract row missing initializer body".to_string()), +} } -pub fn emit_coproduct_wire_contract_validations( - module_items: &Rc>>, - imports: Rc>>, - local_coproduct_names: Rc>, - source_indices: Rc>>, -) -> String { - Rc::new({ - let mut __result = Vec::new(); - for text in Rc::new({ - let mut __result = Vec::new(); - for item in Rc::new({ - let mut __result = Vec::new(); - for item in module_items.clone().iter().cloned() { - if is_coproduct_wire_contract_row( - &item, - module_items.clone(), - imports.clone(), - &source_indices, - ) { - __result.push(item); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(emit_coproduct_wire_contract_target_validation( - item.clone(), - local_coproduct_names.clone(), - source_indices.clone(), - )); - } - __result - }) - .iter() - .cloned() - { - if (text.clone().as_str() != "".to_string().as_str()) { - __result.push(text); - } - } - __result - }) - .join(&"\n".to_string()) -} - -pub fn resolve_local_coproduct_wire_policy( - coproduct_name: &String, - all_unit_variants: bool, - module_items: &Rc>>, - imports: Rc>>, - source_indices: &Rc>>, -) -> Option> { - { - let contracts = Rc::new({ - let mut __result = Vec::new(); - for item in module_items.clone().iter().cloned() { - if (is_coproduct_wire_contract_row( - &item, - module_items.clone(), - imports.clone(), - &source_indices, - ) && coproduct_wire_contract_targets( - item.clone(), - coproduct_name.clone(), - source_indices.clone(), - )) { - __result.push(item); - } - } - __result - }); - if ((contracts.clone().len() as i64) == 0) { +pub fn emit_coproduct_wire_contract_validations(module_items: &Rc>>, imports: Rc>>, local_coproduct_names: Rc>, source_indices: Rc>>) -> String { + Rc::new({ let mut __result = Vec::new(); for text in Rc::new({ let mut __result = Vec::new(); for item in Rc::new({ let mut __result = Vec::new(); for item in module_items.clone().iter().cloned() { if is_coproduct_wire_contract_row(&item, module_items.clone(), imports.clone(), &source_indices) { __result.push(item); } } __result }).iter().cloned() { __result.push(emit_coproduct_wire_contract_target_validation(item.clone(), local_coproduct_names.clone(), source_indices.clone())); } __result }).iter().cloned() { if (text.clone().as_str() != "".to_string().as_str()) { __result.push(text); } } __result }).join(&"\n".to_string()) +} + +pub fn resolve_local_coproduct_wire_policy(coproduct_name: &String, all_unit_variants: bool, module_items: &Rc>>, imports: Rc>>, source_indices: &Rc>>) -> Option> { + { + let contracts = Rc::new({ let mut __result = Vec::new(); for item in module_items.clone().iter().cloned() { if (is_coproduct_wire_contract_row(&item, module_items.clone(), imports.clone(), &source_indices) && coproduct_wire_contract_targets(item.clone(), coproduct_name.clone(), source_indices.clone())) { __result.push(item); } } __result }); +if ((contracts.clone().len() as i64) == 0) { None } else { if ((contracts.clone().len() as i64) == 1) { match contracts.clone().first().cloned() { - Some(contract) => match coproduct_wire_contract_encoding( - contract.clone(), - source_indices.clone(), - ) { - Some(encoding) => { - if (variant_encoding_is_string_variant( - encoding.clone(), - source_indices.clone(), - ) && !all_unit_variants) - { - Some(rust_serde_error_policy(v2_rt::concat("CoproductWireContract StringVariant requires a nullary-only coproduct: ".to_string(), coproduct_name.clone()))) - } else { - Some(resolve_wire_serde_policy_from_encoding_node( - &encoding, - &source_indices, - )) - } - } - None => Some(rust_serde_error_policy(v2_rt::concat( - "CoproductWireContract missing encoding for ".to_string(), - coproduct_name.clone(), - ))), - }, - None => None, - } + Some(contract) => match coproduct_wire_contract_encoding(contract.clone(), source_indices.clone()) { + Some(encoding) => if (variant_encoding_is_string_variant(encoding.clone(), source_indices.clone()) && !all_unit_variants) { + Some(rust_serde_error_policy(v2_rt::concat("CoproductWireContract StringVariant requires a nullary-only coproduct: ".to_string(), coproduct_name.clone()))) + } else { + Some(resolve_wire_serde_policy_from_encoding_node(&encoding, &source_indices)) + }, + None => Some(rust_serde_error_policy(v2_rt::concat("CoproductWireContract missing encoding for ".to_string(), coproduct_name.clone()))), +}, + None => None, +} } else { - Some(rust_serde_error_policy(v2_rt::concat( - "ambiguous CoproductWireContract rows for ".to_string(), - coproduct_name.clone(), - ))) + Some(rust_serde_error_policy(v2_rt::concat("ambiguous CoproductWireContract rows for ".to_string(), coproduct_name.clone()))) } } - } +} } pub fn build_data_item_index(modules: Rc>>) -> Rc>> { - modules.iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, tm: Rc| { - let module_name = authored_name_at( - tm.type_env.clone().source_indices.clone(), - &tm.module.clone(), - ); - Rc::new({ - let mut __result = Vec::new(); - for item in tm.items.clone().iter().cloned() { - if is_data_def_item(&item) { - __result.push(item); - } - } - __result - }) - .iter() - .cloned() - .fold( - acc, - |item_acc: Rc>>, item: Rc| { - let item_name = - authored_name_at(tm.type_env.clone().source_indices.clone(), &item); - let qualified_name = v2_rt::concat( - v2_rt::concat(module_name.clone(), ".".to_string()), - item_name.clone(), - ); - v2_rt::rc_map_insert(item_acc, qualified_name.clone(), item.clone()) - }, - ) - }, - ) + modules.iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, tm: Rc| { + let module_name = authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone()); +Rc::new({ let mut __result = Vec::new(); for item in tm.items.clone().iter().cloned() { if is_data_def_item(&item) { __result.push(item); } } __result }).iter().cloned().fold(acc, |item_acc: Rc>>, item: Rc| { + let item_name = authored_name_at(tm.type_env.clone().source_indices.clone(), &item); +let qualified_name = v2_rt::concat(v2_rt::concat(module_name.clone(), ".".to_string()), item_name.clone()); +v2_rt::rc_map_insert(item_acc, qualified_name.clone(), item.clone()) +}) +}) } -pub fn insert_scoped_data_item( - scoped: &Rc>>>>, - name: &String, - item: Rc, -) -> Rc>>>> { +pub fn insert_scoped_data_item(scoped: &Rc>>>>, name: &String, item: Rc) -> Rc>>>> { { let existing = match v2_rt::map_get(&scoped, name.clone()) { - Some(entries) => entries.clone(), - None => Rc::new(vec![]), - }; - v2_rt::rc_map_insert( - scoped.clone(), - name.clone(), - v2_rt::concat(existing, Rc::new(vec![item])), - ) - } + Some(entries) => entries.clone(), + None => Rc::new(vec![]), +}; +v2_rt::rc_map_insert(scoped.clone(), name.clone(), v2_rt::concat(existing, Rc::new(vec![item]))) +} } -pub fn build_scoped_data_item_index( - typed_module: &Rc, - data_items: Rc>>, -) -> Rc>>>> { - { - let module_name = authored_name_at( - typed_module.type_env.clone().source_indices.clone(), - &typed_module.module.clone(), - ); - let local = Rc::new({ - let mut __result = Vec::new(); - for item in typed_module.items.clone().iter().cloned() { - if is_data_def_item(&item) { - __result.push(item); - } +pub fn build_scoped_data_item_index(typed_module: &Rc, data_items: Rc>>) -> Rc>>>> { + { + let module_name = authored_name_at(typed_module.type_env.clone().source_indices.clone(), &typed_module.module.clone()); +let local = Rc::new({ let mut __result = Vec::new(); for item in typed_module.items.clone().iter().cloned() { if is_data_def_item(&item) { __result.push(item); } } __result }).iter().cloned().fold(v2_rt::rc_empty_map::>>>(), |acc: Rc>>>>, item: Rc| insert_scoped_data_item(&acc, &authored_name_at(typed_module.type_env.clone().source_indices.clone(), &item), item.clone())); +module_imports(typed_module.module.clone()).iter().cloned().fold(local.clone(), |acc: Rc>>>>, imp: Rc| { + let import_path = authored_name_at(typed_module.type_env.clone().source_indices.clone(), &imp); +if import_is_all(imp.clone()) { + acc.clone() + } else { + import_specific_names_at(imp.clone(), typed_module.type_env.clone().source_indices.clone()).iter().cloned().fold(acc.clone(), |inner: Rc>>>>, imported_name: String| { + let qualified = v2_rt::concat(v2_rt::concat(import_path.clone(), ".".to_string()), imported_name.clone()); +match v2_rt::map_get(&data_items, qualified.clone()) { + Some(imported_item) => insert_scoped_data_item(&inner, &imported_name, imported_item.clone()), + None => inner.clone(), +} +}) } - __result - }) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::>>>(), - |acc: Rc>>>>, item: Rc| { - insert_scoped_data_item( - &acc, - &authored_name_at(typed_module.type_env.clone().source_indices.clone(), &item), - item.clone(), - ) - }, - ); - module_imports(typed_module.module.clone()) - .iter() - .cloned() - .fold( - local.clone(), - |acc: Rc>>>>, imp: Rc| { - let import_path = authored_name_at( - typed_module.type_env.clone().source_indices.clone(), - &imp, - ); - if import_is_all(imp.clone()) { - acc.clone() - } else { - import_specific_names_at( - imp.clone(), - typed_module.type_env.clone().source_indices.clone(), - ) - .iter() - .cloned() - .fold( - acc.clone(), - |inner: Rc>>>>, - imported_name: String| { - let qualified = v2_rt::concat( - v2_rt::concat(import_path.clone(), ".".to_string()), - imported_name.clone(), - ); - match v2_rt::map_get(&data_items, qualified.clone()) { - Some(imported_item) => insert_scoped_data_item( - &inner, - &imported_name, - imported_item.clone(), - ), - None => inner.clone(), - } - }, - ) - } - }, - ) - } +}) +} } pub fn rust_serde_rename_template_text() -> String { - match serialization_for_target(RenderTarget::Rust) - .rename_attribute_template - .clone() - { - Some(template) => template.clone(), - None => emit_error_expr( - "missing serde rename_attribute_template for Rust".to_string(), - RenderTarget::Rust, - ), - } + match serialization_for_target(RenderTarget::Rust).rename_attribute_template.clone() { + Some(template) => template.clone(), + None => emit_error_expr("missing serde rename_attribute_template for Rust".to_string(), RenderTarget::Rust), +} } pub fn rust_test_file_path(module_name: String) -> String { { let conventions = test_conventions_for_target(RenderTarget::Rust); - let file_dir = match conventions.file_dir.clone() { - Some(dir) => dir.clone(), - None => "".to_string(), - }; - let filename = module_to_filename(module_name); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(file_dir, conventions.file_prefix.clone()), - filename, - ), - conventions.file_suffix.clone(), - ), - rust_source_ext(), - ) - } +let file_dir = match conventions.file_dir.clone() { + Some(dir) => dir.clone(), + None => "".to_string(), +}; +let filename = module_to_filename(module_name); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(file_dir, conventions.file_prefix.clone()), filename), conventions.file_suffix.clone()), rust_source_ext()) +} } pub fn rust_test_name(projection: Rc) -> String { @@ -1288,1474 +653,549 @@ pub fn rust_test_name(projection: Rc) -> String { } pub fn rust_async_test_decorator() -> String { - match test_conventions_for_target(RenderTarget::Rust) - .async_decorator - .clone() - { - Some(decorator) => decorator.clone(), - None => emit_error_expr( - "missing async_decorator for Rust test conventions".to_string(), - RenderTarget::Rust, - ), - } + match test_conventions_for_target(RenderTarget::Rust).async_decorator.clone() { + Some(decorator) => decorator.clone(), + None => emit_error_expr("missing async_decorator for Rust test conventions".to_string(), RenderTarget::Rust), +} } -pub fn emit_rust_block_stmts( - mut remaining: Rc>>, - mut text: Rc>, - mut scope: Rc, - mut registry: Rc>>, - mut depth: i64, - mut shared_types: Rc>, - mut emit_info: Rc, -) -> Rc { +pub fn emit_rust_block_stmts(mut remaining: Rc>>, mut text: Rc>, mut scope: Rc, mut registry: Rc>>, mut depth: i64, mut shared_types: Rc>, mut emit_info: Rc) -> Rc { loop { match remaining.clone().first().cloned() { - None => { - break Rc::new(BlockEmitState { - text: text, - scope: scope.clone(), - }); - } - Some(stmt) => { - let line = emit_typed_expr( - stmt.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let next_scope = scope_after_expr(&stmt, &scope); - { - let __tco_0 = Rc::new( - remaining - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - let __tco_1 = v2_rt::rc_list_push(text, line); - let __tco_2 = next_scope; - remaining = __tco_0; - text = __tco_1; - scope = __tco_2; - continue; - } - } - } - } -} - -pub fn emit_rust_init_block_stmts( - mut remaining: Rc>>, - mut text: Rc>, - mut scope: Rc, - mut registry: Rc>>, - mut depth: i64, - mut shared_types: Rc>, - mut emit_info: Rc, -) -> Rc { + None => { break Rc::new(BlockEmitState { + text: text, + scope: scope.clone(), +}); }, + Some(stmt) => { let line = emit_typed_expr(stmt.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let next_scope = scope_after_expr(&stmt, &scope); +{ + let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); +let __tco_1 = v2_rt::rc_list_push(text, line); +let __tco_2 = next_scope; +remaining = __tco_0; +text = __tco_1; +scope = __tco_2; +continue; +} }, +} +} +} + +pub fn emit_rust_init_block_stmts(mut remaining: Rc>>, mut text: Rc>, mut scope: Rc, mut registry: Rc>>, mut depth: i64, mut shared_types: Rc>, mut emit_info: Rc) -> Rc { loop { match remaining.clone().first().cloned() { - None => { - break Rc::new(BlockEmitState { - text: text, - scope: scope.clone(), - }); - } - Some(stmt) => { - let rest = Rc::new( - remaining - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - match rest.clone().first().cloned() { - None => { - break Rc::new(BlockEmitState { - text: text, - scope: scope.clone(), - }); - } - Some(_) => { - let raw_line = emit_typed_expr( - stmt.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let is_let = match (*stmt.expr_data.clone()).clone() { - ExprData::ExprLet => true, - _ => false, - }; - let line = if is_let { - raw_line - } else { - v2_rt::concat(raw_line, ";".to_string()) - }; - let next_scope = scope_after_expr(&stmt, &scope); - { - let __tco_0 = rest.clone(); - let __tco_1 = v2_rt::rc_list_push(text, line); - let __tco_2 = next_scope; - remaining = __tco_0; - text = __tco_1; - scope = __tco_2; - continue; - } - } - } - } - } - } + None => { break Rc::new(BlockEmitState { + text: text, + scope: scope.clone(), +}); }, + Some(stmt) => { let rest = Rc::new(remaining.clone().iter().cloned().skip(1 as usize).collect::>()); +match rest.clone().first().cloned() { + None => { break Rc::new(BlockEmitState { + text: text, + scope: scope.clone(), +}); }, + Some(_) => { let raw_line = emit_typed_expr(stmt.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let is_let = match (*stmt.expr_data.clone()).clone() { + ExprData::ExprLet => true, + _ => false, +}; +let line = if is_let { + raw_line + } else { + v2_rt::concat(raw_line, ";".to_string()) + }; +let next_scope = scope_after_expr(&stmt, &scope); +{ + let __tco_0 = rest.clone(); +let __tco_1 = v2_rt::rc_list_push(text, line); +let __tco_2 = next_scope; +remaining = __tco_0; +text = __tco_1; +scope = __tco_2; +continue; +} }, +} }, +} +} } pub fn has_complex_variants(item: &Rc) -> bool { if ((item.children.clone().len() as i64) == 0) { false } else { - { - let mut __found = false; - for c in item.children.clone().iter().cloned() { - if (c.connective.clone() != Connective::NoConnective) { - __found = true; - break; - } - } - __found - } + { let mut __found = false; for c in item.children.clone().iter().cloned() { if (c.connective.clone() != Connective::NoConnective) { __found = true; break; } } __found } } } pub fn is_simple_disj(item: Rc) -> bool { { - let complex = Rc::new({ - let mut __result = Vec::new(); - for v in item.children.clone().iter().cloned() { - if ((v.children.clone().len() as i64) > 0) { - __result.push(v); - } - } - __result - }); - ((complex.len() as i64) == 0) - } + let complex = Rc::new({ let mut __result = Vec::new(); for v in item.children.clone().iter().cloned() { if ((v.children.clone().len() as i64) > 0) { __result.push(v); } } __result }); +((complex.len() as i64) == 0) +} } pub fn is_dag_value_type_name(name: String) -> bool { match is_copy(RenderTarget::Rust, name) { - Some(v) => v.clone(), - None => false, - } + Some(v) => v.clone(), + None => false, +} } -pub fn is_type_constant( - summary: &Rc, - recursive_type_set: Rc>, -) -> bool { +pub fn is_type_constant(summary: &Rc, recursive_type_set: Rc>) -> bool { { - let is_recursive = v2_rt::map_contains_key(&recursive_type_set, summary.name.clone()); - let has_generics = ((summary.generic_param_names.clone().len() as i64) > 0); - match (*summary.repr.clone()).clone() { - TypeRepr::EnumRepr { unit_only, .. } => { - (((unit_only.clone() && !is_recursive) && !has_generics) - && !summary.has_fn_fields.clone()) - } - TypeRepr::StructRepr => { - if ((is_recursive || has_generics) || summary.has_fn_fields.clone()) { + let is_recursive = set_contains(recursive_type_set, summary.name.clone()); +let has_generics = ((summary.generic_param_names.clone().len() as i64) > 0); +match (*summary.repr.clone()).clone() { + TypeRepr::EnumRepr { unit_only, .. } => (((unit_only.clone() && !is_recursive) && !has_generics) && !summary.has_fn_fields.clone()), + TypeRepr::StructRepr => if ((is_recursive || has_generics) || summary.has_fn_fields.clone()) { + false + } else { + { + let field_count = (Rc::new(v2_rt::map_keys(&summary.field_summaries.clone())).len() as i64); +let ft_count = (Rc::new(v2_rt::map_keys(&summary.field_type_map.clone())).len() as i64); +if (ft_count < field_count) { false } else { - { - let field_count = - (Rc::new(v2_rt::map_keys(&summary.field_summaries.clone())).len() - as i64); - let ft_count = (Rc::new(v2_rt::map_keys(&summary.field_type_map.clone())) - .len() as i64); - if (ft_count < field_count) { - false - } else { - { - let mut __all = true; - for tn in - Rc::new(v2_rt::map_values(&summary.field_type_map.clone())) - .iter() - .cloned() - { - if !(is_dag_value_type_name(tn.clone())) { - __all = false; - break; - } - } - __all - } - } - } + { let mut __all = true; for tn in Rc::new(v2_rt::map_values(&summary.field_type_map.clone())).iter().cloned() { if !(is_dag_value_type_name(tn.clone())) { __all = false; break; } } __all } } - } - } - } +} + }, +} +} } -pub fn maybe_mark_shared_type( - acc: Rc>, - summary: &Rc, - recursive_type_set: Rc>, - target_needs_sharing: bool, -) -> Rc> { +pub fn maybe_mark_shared_type(acc: Rc>, summary: &Rc, recursive_type_set: Rc>, target_needs_sharing: bool) -> Rc> { { - let needs_sharing = (target_needs_sharing - && match (*summary.repr.clone()).clone() { - TypeRepr::StructRepr => true, - TypeRepr::EnumRepr { unit_only, .. } => (unit_only.clone() == false), - }); - if (needs_sharing && !is_type_constant(&summary, recursive_type_set)) { - v2_rt::rc_map_insert(acc, summary.name.clone(), true) + let needs_sharing = (target_needs_sharing && match (*summary.repr.clone()).clone() { + TypeRepr::StructRepr => true, + TypeRepr::EnumRepr { unit_only, .. } => (unit_only.clone() == false), +}); +if (needs_sharing && !is_type_constant(&summary, recursive_type_set)) { + set_insert(acc, summary.name.clone()) } else { acc } - } +} } -pub fn build_shared_types( - type_summaries: Rc>>, - recursive_type_set: Rc>, - target: RenderTarget, -) -> Rc> { +pub fn build_shared_types(type_summaries: Rc>>, recursive_type_set: Rc>, target: RenderTarget) -> Rc> { { let sharing = sharing_for_target(target); - let user_shared = Rc::new(v2_rt::map_values(&type_summaries)) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, summary: Rc| { - maybe_mark_shared_type( - acc, - &summary, - recursive_type_set.clone(), - sharing.needs_sharing.clone(), - ) - }, - ); - let collection_keys = Rc::new({ - let mut __result = Vec::new(); - for k in Rc::new(v2_rt::map_keys(&rust_container_templates())) - .iter() - .cloned() - { - if ((sharing.needs_sharing.clone() - && (k.clone().as_str() != "optional".to_string().as_str())) - && (k.clone().as_str() != "boolean_algebra".to_string().as_str())) - { - __result.push(k); - } - } - __result - }); - collection_keys.iter().cloned().fold( - user_shared.clone(), - |acc: Rc>, key: String| { - let pascal = to_pascal(key.clone()); - v2_rt::rc_map_insert(acc, pascal.clone(), true) - }, - ) - } +let user_shared = Rc::new(v2_rt::map_values(&type_summaries)).iter().cloned().fold(empty_set(), |acc: Rc>, summary: Rc| maybe_mark_shared_type(acc, &summary, recursive_type_set.clone(), sharing.needs_sharing.clone())); +let collection_keys = Rc::new({ let mut __result = Vec::new(); for k in Rc::new(v2_rt::map_keys(&rust_container_templates())).iter().cloned() { if ((sharing.needs_sharing.clone() && (k.clone().as_str() != "optional".to_string().as_str())) && (k.clone().as_str() != "boolean_algebra".to_string().as_str())) { __result.push(k); } } __result }); +collection_keys.iter().cloned().fold(user_shared.clone(), |acc: Rc>, key: String| { + let pascal = to_pascal(key.clone()); +set_insert(acc, pascal.clone()) +}) +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct OwnershipProofEntry { pub name: String, pub proof: Rc, - pub param_names: Rc>, + pub param_names: Rc>, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct OwnershipBuildResult { - pub ownership_index: Rc>>>, - pub read_only_params_index: Rc>>>, + pub ownership_index: Rc>>>, + pub read_only_params_index: Rc>>>, } pub fn build_ownership_results(modules: &Rc>>) -> Rc { { - let callable_set = modules.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, m: Rc| { - Rc::new({ - let mut __result = Vec::new(); - for item in m.items.clone().iter().cloned() { - if (item.body.clone() != None) { - __result.push(item); - } - } - __result - }) - .iter() - .cloned() - .fold(acc, |inner: Rc>, item: Rc| { - v2_rt::rc_map_merge( - inner, - collect_callable_refs( - &item.body.clone().clone().unwrap(), - &m.type_env.clone().source_indices.clone(), - ), - ) - }) - }, - ); - let proofs = Rc::new({ - let mut __result = Vec::new(); - for m in modules.clone().iter().cloned() { - __result.extend( - (*Rc::new({ - let mut __result = Vec::new(); - for item in Rc::new({ - let mut __result = Vec::new(); - for item in m.items.clone().iter().cloned() { - if (item.body.clone() != None) { - __result.push(item); - } - } - __result - }) - .iter() - .cloned() - { - __result.push({ - let pnames = item.params.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, p: Rc| { - v2_rt::rc_map_insert( - acc, - param_node_name_at( - p.clone(), - m.type_env.clone().source_indices.clone(), - ), - true, - ) - }, - ); - let si = m.type_env.clone().source_indices.clone(); - let qualified = v2_rt::concat( - v2_rt::concat( - authored_name_at(si.clone(), &m.module.clone()), - ".".to_string(), - ), - authored_name_at(si.clone(), &item), - ); - Rc::new(OwnershipProofEntry { - name: qualified.clone(), - proof: analyze_ownership( - authored_name_at(si.clone(), &item), - item.params.clone(), - item.body.clone().clone().unwrap(), - &si, - ), - param_names: pnames.clone(), - }) - }); - } - __result - })) - .iter() - .cloned(), - ); - } - __result - }); - proofs.iter().cloned().fold( - Rc::new(OwnershipBuildResult { - ownership_index: v2_rt::rc_empty_map::>>(), - read_only_params_index: v2_rt::rc_empty_map::>>(), - }), - |acc: Rc, entry: Rc| { - let acc = Rc::try_unwrap(acc).unwrap_or_else(|rc| (*rc).clone()); - { - let read_only = if v2_rt::map_contains_key( - &callable_set, - entry.proof.clone().func_name.clone(), - ) { - v2_rt::rc_empty_map::() - } else { - build_read_only_params(entry.proof.clone(), entry.param_names.clone()) - }; - let movable = build_movable_set(entry.proof.clone()); - Rc::new(OwnershipBuildResult { - ownership_index: v2_rt::rc_map_insert( - acc.ownership_index, - entry.name.clone(), - movable.clone(), - ), - read_only_params_index: v2_rt::rc_map_insert( - acc.read_only_params_index, - entry.name.clone(), - read_only.clone(), - ), - }) - } - }, - ) - } + let callable_set = modules.clone().iter().cloned().fold(empty_set(), |acc: Rc>, m: Rc| Rc::new({ let mut __result = Vec::new(); for item in m.items.clone().iter().cloned() { if (item.body.clone() != None) { __result.push(item); } } __result }).iter().cloned().fold(acc, |inner: Rc>, item: Rc| set_union(inner, collect_callable_refs(&item.body.clone().clone().unwrap(), &m.type_env.clone().source_indices.clone())))); +let proofs = Rc::new({ let mut __result = Vec::new(); for m in modules.clone().iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for item in Rc::new({ let mut __result = Vec::new(); for item in m.items.clone().iter().cloned() { if (item.body.clone() != None) { __result.push(item); } } __result }).iter().cloned() { __result.push({ + let pnames = item.params.clone().iter().cloned().fold(empty_set(), |acc: Rc>, p: Rc| set_insert(acc, param_node_name_at(p.clone(), m.type_env.clone().source_indices.clone()))); +let si = m.type_env.clone().source_indices.clone(); +let qualified = v2_rt::concat(v2_rt::concat(authored_name_at(si.clone(), &m.module.clone()), ".".to_string()), authored_name_at(si.clone(), &item)); +Rc::new(OwnershipProofEntry { + name: qualified.clone(), + proof: analyze_ownership(authored_name_at(si.clone(), &item), item.params.clone(), item.body.clone().clone().unwrap(), &si), + param_names: pnames.clone(), +}) +}); } __result })).iter().cloned()); } __result }); +proofs.iter().cloned().fold(Rc::new(OwnershipBuildResult { + ownership_index: v2_rt::rc_empty_map::>>(), + read_only_params_index: v2_rt::rc_empty_map::>>(), +}), |acc: Rc, entry: Rc| { let acc = Rc::try_unwrap(acc).unwrap_or_else(|rc| (*rc).clone()); { + let read_only = if set_contains(callable_set.clone(), entry.proof.clone().func_name.clone()) { + empty_set() + } else { + build_read_only_params(entry.proof.clone(), entry.param_names.clone()) + }; +let movable = build_movable_set(entry.proof.clone()); +Rc::new(OwnershipBuildResult { + ownership_index: v2_rt::rc_map_insert(acc.ownership_index, entry.name.clone(), movable.clone()), + read_only_params_index: v2_rt::rc_map_insert(acc.read_only_params_index, entry.name.clone(), read_only.clone()), +}) +} }) +} } pub fn emit_rust(typed: &Rc) -> Rc { { let base_info = build_emit_graph_info(&typed.modules.clone()); - let ownership = build_ownership_results(&typed.modules.clone()); - let shared = build_shared_types( - base_info.type_summaries.clone(), - base_info.recursive_type_set.clone(), - RenderTarget::Rust, - ); - let emit_info = Rc::new(EmitGraphInfo { - type_summaries: base_info.type_summaries.clone(), - recursive_type_set: base_info.recursive_type_set.clone(), - fielded_variants: base_info.fielded_variants.clone(), - shared_types: shared, - ownership_index: ownership.ownership_index.clone(), - movable: v2_rt::rc_empty_map::(), - variant_to_enum: base_info.variant_to_enum.clone(), - owned_bindings: v2_rt::rc_empty_map::(), - read_only_params_index: ownership.read_only_params_index.clone(), - read_only_params: v2_rt::rc_empty_map::(), - }); - let shared_types = emit_info.shared_types.clone(); - let registry = typed.item_registry.clone(); - let data_items = build_data_item_index(typed.modules.clone()); - let workflow_funcs = collect_workflow_funcs( - typed.modules.clone(), - registry.clone(), - emit_info.read_only_params_index.clone(), - ); - let workflow_default_diags = validate_workflow_param_defaults(workflow_funcs.clone()); - if ((workflow_default_diags.clone().len() as i64) > 0) { +let ownership = build_ownership_results(&typed.modules.clone()); +let shared = build_shared_types(base_info.type_summaries.clone(), base_info.recursive_type_set.clone(), RenderTarget::Rust); +let emit_info = Rc::new(EmitGraphInfo { + type_summaries: base_info.type_summaries.clone(), + recursive_type_set: base_info.recursive_type_set.clone(), + fielded_variants: base_info.fielded_variants.clone(), + untagged_json_tuple_variants: base_info.untagged_json_tuple_variants.clone(), + shared_types: shared, + ownership_index: ownership.ownership_index.clone(), + movable: empty_set(), + variant_to_enum: base_info.variant_to_enum.clone(), + owned_bindings: empty_set(), + read_only_params_index: ownership.read_only_params_index.clone(), + read_only_params: empty_set(), +}); +let shared_types = emit_info.shared_types.clone(); +let registry = typed.item_registry.clone(); +let data_items = build_data_item_index(typed.modules.clone()); +let workflow_funcs = collect_workflow_funcs(typed.modules.clone(), registry.clone(), emit_info.read_only_params_index.clone()); +let workflow_default_diags = validate_workflow_param_defaults(workflow_funcs.clone()); +if ((workflow_default_diags.clone().len() as i64) > 0) { return Rc::new(EmitResult { - files: Rc::new(vec![]), - diagnostics: workflow_default_diags.clone(), - }); - } - let svc_module_map = typed.modules.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, tm: Rc| { - let svc_items = Rc::new({ - let mut __result = Vec::new(); - for item in tm.items.clone().iter().cloned() { - if is_service_item(&item) { - __result.push(item); - } - } - __result - }); - let mod_filename = module_to_filename(authored_name_at( - tm.type_env.clone().source_indices.clone(), - &tm.module.clone(), - )); - svc_items.clone().iter().cloned().fold( - acc, - |a: Rc>, svc: Rc| { - v2_rt::rc_map_insert( - a, - authored_name_at(tm.type_env.clone().source_indices.clone(), &svc), - mod_filename.clone(), - ) - }, - ) - }, - ); - let test_projections = extract_test_projections(typed.clone()); - let module_files = Rc::new({ - let mut __result = Vec::new(); - for tm in typed.modules.clone().iter().cloned() { - __result.push(emit_module_full( - &tm, - ®istry, - &emit_info, - shared_types.clone(), - svc_module_map.clone(), - data_items.clone(), - )); - } - __result - }); - let test_files = Rc::new({ - let mut __result = Vec::new(); - for f in Rc::new({ - let mut __result = Vec::new(); - for tm in typed.modules.clone().iter().cloned() { - __result.push(emit_test_file( - &authored_name_at( - tm.type_env.clone().source_indices.clone(), - &tm.module.clone(), - ), - Rc::new({ - let mut __result = Vec::new(); - for p in test_projections.clone().iter().cloned() { - if (p.module_name.clone().as_str() - == authored_name_at( - tm.type_env.clone().source_indices.clone(), - &tm.module.clone(), - ) - .as_str()) - { - __result.push(p); - } - } - __result - }), - )); - } - __result - }) - .iter() - .cloned() - { - if (f.path.clone().as_str() != "".to_string().as_str()) { - __result.push(f); - } - } - __result - }); - let has_services = has_service_items(typed.clone()); - let has_pipeline = { - let mut __found = false; - for m in typed.modules.clone().iter().cloned() { - if (authored_name_at(m.type_env.clone().source_indices.clone(), &m.module.clone()) - .as_str() - == "v2.compiler.compile".to_string().as_str()) - { - __found = true; - break; - } - } - __found - }; - let crate_name = if has_pipeline.clone() { + files: Rc::new(vec![]), + diagnostics: workflow_default_diags.clone(), +}) + } +let svc_module_map = typed.modules.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, tm: Rc| { + let svc_items = Rc::new({ let mut __result = Vec::new(); for item in tm.items.clone().iter().cloned() { if is_service_item(&item) { __result.push(item); } } __result }); +let mod_filename = module_to_filename(authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone())); +svc_items.clone().iter().cloned().fold(acc, |a: Rc>, svc: Rc| v2_rt::rc_map_insert(a, authored_name_at(tm.type_env.clone().source_indices.clone(), &svc), mod_filename.clone())) +}); +let test_projections = extract_test_projections(typed.clone()); +let module_files = Rc::new({ let mut __result = Vec::new(); for tm in typed.modules.clone().iter().cloned() { __result.push(emit_module_full(&tm, ®istry, &emit_info, shared_types.clone(), svc_module_map.clone(), data_items.clone())); } __result }); +let test_files = Rc::new({ let mut __result = Vec::new(); for f in Rc::new({ let mut __result = Vec::new(); for tm in typed.modules.clone().iter().cloned() { __result.push(emit_test_file(&authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone()), Rc::new({ let mut __result = Vec::new(); for p in test_projections.clone().iter().cloned() { if (p.module_name.clone().as_str() == authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone()).as_str()) { __result.push(p); } } __result }))); } __result }).iter().cloned() { if (f.path.clone().as_str() != "".to_string().as_str()) { __result.push(f); } } __result }); +let has_services = has_service_items(typed.clone()); +let has_pipeline = { let mut __found = false; for m in typed.modules.clone().iter().cloned() { if (authored_name_at(m.type_env.clone().source_indices.clone(), &m.module.clone()).as_str() == "v2.compiler.compile".to_string().as_str()) { __found = true; break; } } __found }; +let crate_name = if has_pipeline.clone() { "v2_compiler".to_string() } else { "v2_compiled".to_string() }; - let cargo = emit_cargo_toml(crate_name.clone(), has_services.clone()); - let main_file = emit_main_rs( - &workflow_funcs, - &typed.modules.clone(), - &has_services, - &crate_name, - svc_module_map.clone(), - ); - let rt_file = emit_v2_rt_module(); - let compiler_tests_file = if has_pipeline.clone() { +let cargo = emit_cargo_toml(crate_name.clone(), has_services.clone()); +let main_file = emit_main_rs(&workflow_funcs, &typed.modules.clone(), &has_services, &crate_name, svc_module_map.clone()); +let rt_file = emit_v2_rt_module(); +let compiler_tests_file = if has_pipeline.clone() { Rc::new(vec![emit_compiler_tests_module()]) } else { Rc::new(vec![]) }; - let dry_run_file = if has_services.clone() { +let dry_run_file = if has_services.clone() { Rc::new(vec![emit_dry_run_module()]) } else { Rc::new(vec![]) }; - let all_mod_files = v2_rt::concat( - v2_rt::concat(module_files, Rc::new(vec![rt_file])), - dry_run_file, - ); - let lib_file = emit_lib_rs_from_files(all_mod_files.clone(), &has_pipeline); - let files = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - Rc::new(vec![cargo, lib_file, main_file]), - all_mod_files.clone(), - ), - compiler_tests_file, - ), - test_files, - ); - Rc::new(EmitResult { - files: files, - diagnostics: Rc::new(vec![]), - }) - } +let all_mod_files = v2_rt::concat(v2_rt::concat(module_files, Rc::new(vec![rt_file])), dry_run_file); +let lib_file = emit_lib_rs_from_files(all_mod_files.clone(), &has_pipeline); +let files = v2_rt::concat(v2_rt::concat(v2_rt::concat(Rc::new(vec![cargo, lib_file, main_file]), all_mod_files.clone()), compiler_tests_file), test_files); +Rc::new(EmitResult { + files: files, + diagnostics: Rc::new(vec![]), +}) +} } pub fn emit_v2_rt_module() -> Rc { Rc::new(TextFile { - path: v2_rt::concat( - v2_rt::concat(rust_source_root(), "v2_rt".to_string()), - rust_source_ext(), - ), - content: rust_runtime_source(), - }) + path: v2_rt::concat(v2_rt::concat(rust_source_root(), "v2_rt".to_string()), rust_source_ext()), + content: rust_runtime_source(), +}) } pub fn emit_compiler_tests_module() -> Rc { Rc::new(TextFile { - path: v2_rt::concat( - v2_rt::concat(rust_source_root(), "compiler_tests".to_string()), - rust_source_ext(), - ), - content: compiler_tests_source(), - }) + path: v2_rt::concat(v2_rt::concat(rust_source_root(), "compiler_tests".to_string()), rust_source_ext()), + content: compiler_tests_source(), +}) } -pub fn emit_lib_rs_from_files( - all_module_files: Rc>>, - has_compiler_tests: &bool, -) -> Rc { +pub fn emit_lib_rs_from_files(all_module_files: Rc>>, has_compiler_tests: &bool) -> Rc { { let src_prefix_len = v2_rt::string_length(&rust_source_root()); - let ext_len = v2_rt::string_length(&rust_source_ext()); - let mod_decls = Rc::new({ - let mut __result = Vec::new(); - for f in all_module_files.iter().cloned() { - __result.push({ - let path_len = v2_rt::string_length(&f.path.clone()); - let mod_name = v2_rt::substring( - &f.path.clone(), - src_prefix_len.clone(), - (path_len.clone() - ext_len.clone()), - ); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - rust_visibility_prefix(), - rust_items().module_keyword.clone(), - ), - " ".to_string(), - ), - mod_name.clone(), - ), - ";".to_string(), - ) - }); - } - __result - }); - let hand_maintained_mods = if has_compiler_tests.clone() { +let ext_len = v2_rt::string_length(&rust_source_ext()); +let mod_decls = Rc::new({ let mut __result = Vec::new(); for f in all_module_files.iter().cloned() { __result.push({ + let path_len = v2_rt::string_length(&f.path.clone()); +let mod_name = v2_rt::substring(&f.path.clone(), src_prefix_len.clone(), (path_len.clone() - ext_len.clone())); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), rust_items().module_keyword.clone()), " ".to_string()), mod_name.clone()), ";".to_string()) +}); } __result }); +let hand_maintained_mods = if has_compiler_tests.clone() { "\npub mod v2_interpreter;\npub mod cli_run;\npub mod rest_transport_facts;".to_string() } else { "".to_string() }; - let test_mod = if has_compiler_tests.clone() { +let test_mod = if has_compiler_tests.clone() { "\n\n#[cfg(test)]\nmod compiler_tests;".to_string() } else { "".to_string() }; - let shared_types = emit_non_empty_wrappers(); - let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("// Generated by v2 compiler -- do not edit.\n\n".to_string(), "#![allow(unused_imports, unused_variables, unused_mut, unused_parens, dead_code, unreachable_patterns, non_shorthand_field_patterns, suspicious_double_ref_op, clippy::all)]\n\n".to_string()), mod_decls.join(&"\n".to_string())), hand_maintained_mods), "\n\n".to_string()), shared_types), test_mod); - Rc::new(TextFile { - path: v2_rt::concat( - v2_rt::concat(rust_source_root(), "lib".to_string()), - rust_source_ext(), - ), - content: v2_rt::concat(content, "\n".to_string()), - }) - } +let shared_types = emit_non_empty_wrappers(); +let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("// Generated by v2 compiler -- do not edit.\n\n".to_string(), "#![allow(unused_imports, unused_variables, unused_mut, unused_parens, dead_code, unreachable_patterns, non_shorthand_field_patterns, suspicious_double_ref_op, clippy::all)]\n\n".to_string()), mod_decls.join(&"\n".to_string())), hand_maintained_mods), "\n\n".to_string()), shared_types), test_mod); +Rc::new(TextFile { + path: v2_rt::concat(v2_rt::concat(rust_source_root(), "lib".to_string()), rust_source_ext()), + content: v2_rt::concat(content, "\n".to_string()), +}) +} } -pub fn emit_module( - typed_module: &Rc, - registry: Rc>>, -) -> Rc { +pub fn emit_module(typed_module: &Rc, registry: Rc>>) -> Rc { { let base_info = build_emit_graph_info(&Rc::new(vec![typed_module.clone()])); - let shared = build_shared_types( - base_info.type_summaries.clone(), - base_info.recursive_type_set.clone(), - RenderTarget::Rust, - ); - let emit_info = Rc::new(EmitGraphInfo { - type_summaries: base_info.type_summaries.clone(), - recursive_type_set: base_info.recursive_type_set.clone(), - fielded_variants: base_info.fielded_variants.clone(), - shared_types: shared, - ownership_index: base_info.ownership_index.clone(), - movable: base_info.movable.clone(), - variant_to_enum: base_info.variant_to_enum.clone(), - owned_bindings: v2_rt::rc_empty_map::(), - read_only_params_index: base_info.read_only_params_index.clone(), - read_only_params: v2_rt::rc_empty_map::(), - }); - let shared_types = emit_info.shared_types.clone(); - emit_module_full( - &typed_module, - ®istry, - &emit_info, - shared_types, - v2_rt::rc_empty_map::(), - build_data_item_index(Rc::new(vec![typed_module.clone()])), - ) - } +let shared = build_shared_types(base_info.type_summaries.clone(), base_info.recursive_type_set.clone(), RenderTarget::Rust); +let emit_info = Rc::new(EmitGraphInfo { + type_summaries: base_info.type_summaries.clone(), + recursive_type_set: base_info.recursive_type_set.clone(), + fielded_variants: base_info.fielded_variants.clone(), + untagged_json_tuple_variants: base_info.untagged_json_tuple_variants.clone(), + shared_types: shared, + ownership_index: base_info.ownership_index.clone(), + movable: base_info.movable.clone(), + variant_to_enum: base_info.variant_to_enum.clone(), + owned_bindings: empty_set(), + read_only_params_index: base_info.read_only_params_index.clone(), + read_only_params: empty_set(), +}); +let shared_types = emit_info.shared_types.clone(); +emit_module_full(&typed_module, ®istry, &emit_info, shared_types, v2_rt::rc_empty_map::(), build_data_item_index(Rc::new(vec![typed_module.clone()]))) +} } -pub fn emit_module_full( - typed_module: &Rc, - registry: &Rc>>, - emit_info: &Rc, - shared_types: Rc>, - svc_module_map: Rc>, - data_items: Rc>>, -) -> Rc { +pub fn emit_module_full(typed_module: &Rc, registry: &Rc>>, emit_info: &Rc, shared_types: Rc>, svc_module_map: Rc>, data_items: Rc>>) -> Rc { { let m = typed_module.module.clone(); - let scope = module_emit_scope(&typed_module); - let scoped_data_items = build_scoped_data_item_index(&typed_module, data_items); - let prelude = emit_prelude(); - let local_type_names = Rc::new({ - let mut __result = Vec::new(); - for item in Rc::new({ - let mut __result = Vec::new(); - for item in typed_module.items.clone().iter().cloned() { - if ((is_type_def_item(&item) - || is_type_alias_item( - &item, - scope.type_env.clone().source_indices.clone(), - )) - || is_type_decl_item(&item, scope.type_env.clone().source_indices.clone())) - { - __result.push(item); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(authored_name(scope.type_env.clone(), item.clone())); - } - __result - }); - let imports_str = emit_imports( - &module_imports(m.clone()), - emit_info.clone(), - registry.clone(), - local_type_names, - scope.type_env.clone().source_indices.clone(), - ); - let imports_section = if (imports_str.clone().as_str() == "".to_string().as_str()) { +let scope = module_emit_scope(&typed_module); +let scoped_data_items = build_scoped_data_item_index(&typed_module, data_items); +let prelude = emit_prelude(); +let local_type_names = Rc::new({ let mut __result = Vec::new(); for item in Rc::new({ let mut __result = Vec::new(); for item in typed_module.items.clone().iter().cloned() { if ((is_type_def_item(&item) || is_type_alias_item(&item, scope.type_env.clone().source_indices.clone())) || is_type_decl_item(&item, scope.type_env.clone().source_indices.clone())) { __result.push(item); } } __result }).iter().cloned() { __result.push(authored_name(scope.type_env.clone(), item.clone())); } __result }); +let imports_str = emit_imports(&module_imports(m.clone()), emit_info.clone(), registry.clone(), local_type_names, scope.type_env.clone().source_indices.clone()); +let imports_section = if (imports_str.clone().as_str() == "".to_string().as_str()) { "".to_string() } else { v2_rt::concat("\n".to_string(), imports_str.clone()) }; - let this_mod_filename = - module_to_filename(authored_name(scope.type_env.clone(), m.clone())); - let all_svc_names = Rc::new({ - let mut __result = Vec::new(); - for item in typed_module.items.clone().iter().cloned() { - __result.extend( - (*match v2_rt::map_get( - ®istry, - authored_name(scope.type_env.clone(), item.clone()), - ) { - Some(info) => info.service_names.clone(), - None => Rc::new(vec![]), - }) - .iter() - .cloned(), - ); - } - __result - }); - let extern_svc_imports = Rc::new({ - let mut __result = Vec::new(); - for sn in unique_strings(all_svc_names).iter().cloned() { - __result.extend( - (*match v2_rt::map_get(&svc_module_map, sn.clone()) { - Some(mod_file) => { - if (mod_file.clone().as_str() == this_mod_filename.clone().as_str()) { - Rc::new(vec![]) - } else { - Rc::new(vec![v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - rust_visibility_prefix(), - "use crate::".to_string(), - ), - mod_file.clone(), - ), - "::".to_string(), - ), - sanitize_service_name(sn.clone()), - ), - ";".to_string(), - )]) - } - } - None => Rc::new(vec![]), - }) - .iter() - .cloned(), - ); - } - __result - }); - let svc_imports_str = if ((extern_svc_imports.clone().len() as i64) == 0) { +let this_mod_filename = module_to_filename(authored_name(scope.type_env.clone(), m.clone())); +let all_svc_names = Rc::new({ let mut __result = Vec::new(); for item in typed_module.items.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(®istry, authored_name(scope.type_env.clone(), item.clone())) { + Some(info) => info.service_names.clone(), + None => Rc::new(vec![]), +}).iter().cloned()); } __result }); +let extern_svc_imports = Rc::new({ let mut __result = Vec::new(); for sn in unique_strings(all_svc_names).iter().cloned() { __result.extend((*match v2_rt::map_get(&svc_module_map, sn.clone()) { + Some(mod_file) => if (mod_file.clone().as_str() == this_mod_filename.clone().as_str()) { + Rc::new(vec![]) + } else { + Rc::new(vec![v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), "use crate::".to_string()), mod_file.clone()), "::".to_string()), sanitize_service_name(sn.clone())), ";".to_string())]) + }, + None => Rc::new(vec![]), +}).iter().cloned()); } __result }); +let svc_imports_str = if ((extern_svc_imports.clone().len() as i64) == 0) { "".to_string() } else { - v2_rt::concat( - "\n".to_string(), - extern_svc_imports.clone().join(&"\n".to_string()), - ) + v2_rt::concat("\n".to_string(), extern_svc_imports.clone().join(&"\n".to_string())) }; - let local_enum_uses = Rc::new({ - let mut __result = Vec::new(); - for item in Rc::new({ - let mut __result = Vec::new(); - for item in typed_module.items.clone().iter().cloned() { - if (is_type_def_item(&item) && is_coproduct_type(item.clone())) { - __result.push(item); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(v2_rt::concat( - v2_rt::concat( - "use self::".to_string(), - authored_name(scope.type_env.clone(), item.clone()), - ), - "::*;".to_string(), - )); - } - __result - }); - let local_coproduct_names = Rc::new({ - let mut __result = Vec::new(); - for item in Rc::new({ - let mut __result = Vec::new(); - for item in typed_module.items.clone().iter().cloned() { - if (is_type_def_item(&item) && is_coproduct_type(item.clone())) { - __result.push(item); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(authored_name(scope.type_env.clone(), item.clone())); - } - __result - }); - let module_import_items = module_imports(m.clone()); - let coproduct_wire_contract_validations = emit_coproduct_wire_contract_validations( - &typed_module.items.clone(), - module_import_items.clone(), - local_coproduct_names, - scope.type_env.clone().source_indices.clone(), - ); - let coproduct_wire_contract_validation_section = - if (coproduct_wire_contract_validations.clone().as_str() == "".to_string().as_str()) { - "".to_string() - } else { - v2_rt::concat( - coproduct_wire_contract_validations.clone(), - "\n\n".to_string(), - ) - }; - let local_uses_str = if ((local_enum_uses.clone().len() as i64) == 0) { +let local_enum_uses = Rc::new({ let mut __result = Vec::new(); for item in Rc::new({ let mut __result = Vec::new(); for item in typed_module.items.clone().iter().cloned() { if (is_type_def_item(&item) && is_coproduct_type(item.clone())) { __result.push(item); } } __result }).iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat("use self::".to_string(), authored_name(scope.type_env.clone(), item.clone())), "::*;".to_string())); } __result }); +let local_coproduct_names = Rc::new({ let mut __result = Vec::new(); for item in Rc::new({ let mut __result = Vec::new(); for item in typed_module.items.clone().iter().cloned() { if (is_type_def_item(&item) && is_coproduct_type(item.clone())) { __result.push(item); } } __result }).iter().cloned() { __result.push(authored_name(scope.type_env.clone(), item.clone())); } __result }); +let module_import_items = module_imports(m.clone()); +let coproduct_wire_contract_validations = emit_coproduct_wire_contract_validations(&typed_module.items.clone(), module_import_items.clone(), local_coproduct_names, scope.type_env.clone().source_indices.clone()); +let coproduct_wire_contract_validation_section = if (coproduct_wire_contract_validations.clone().as_str() == "".to_string().as_str()) { "".to_string() } else { - v2_rt::concat( - "\n".to_string(), - local_enum_uses.clone().join(&"\n".to_string()), - ) + v2_rt::concat(coproduct_wire_contract_validations.clone(), "\n\n".to_string()) }; - let wire_contract_item = Rc::new({ - let mut __result = Vec::new(); - for i in typed_module.items.clone().iter().cloned() { - if (item_binding_is_named(scope.type_env.clone(), &i, &"wire_contract".to_string()) - && match v2_rt::map_get( - &scope.item_registry.clone(), - "wire_contract".to_string(), - ) { - Some(info) => (info.kind.clone() == ItemKind::DataItem), - None => false, - }) - { - __result.push(i); - } - } - __result - }) - .first() - .cloned(); - let items_str = Rc::new({ - let mut __result = Vec::new(); - for item in typed_module.items.clone().iter().cloned() { - __result.push(emit_typed_item( - &item, - authored_name(scope.type_env.clone(), m.clone()), - ®istry, - &scope, - shared_types.clone(), - &emit_info, - wire_contract_item.clone(), - scoped_data_items.clone(), - typed_module.items.clone(), - module_import_items.clone(), - )); - } - __result - }) - .join(&"\n\n".to_string()); - let raw_filename = module_to_filename(authored_name(scope.type_env.clone(), m.clone())); - let filename = if (raw_filename.clone().as_str() == "main".to_string().as_str()) { +let local_uses_str = if ((local_enum_uses.clone().len() as i64) == 0) { + "".to_string() + } else { + v2_rt::concat("\n".to_string(), local_enum_uses.clone().join(&"\n".to_string())) + }; +let wire_contract_item = Rc::new({ let mut __result = Vec::new(); for i in typed_module.items.clone().iter().cloned() { if (item_binding_is_named(scope.type_env.clone(), &i, &"wire_contract".to_string()) && match v2_rt::map_get(&scope.item_registry.clone(), "wire_contract".to_string()) { + Some(info) => (info.kind.clone() == ItemKind::DataItem), + None => false, +}) { __result.push(i); } } __result }).first().cloned(); +let items_str = Rc::new({ let mut __result = Vec::new(); for item in typed_module.items.clone().iter().cloned() { __result.push(emit_typed_item(&item, authored_name(scope.type_env.clone(), m.clone()), ®istry, &scope, shared_types.clone(), &emit_info, wire_contract_item.clone(), scoped_data_items.clone(), typed_module.items.clone(), module_import_items.clone())); } __result }).join(&"\n\n".to_string()); +let raw_filename = module_to_filename(authored_name(scope.type_env.clone(), m.clone())); +let filename = if (raw_filename.clone().as_str() == "main".to_string().as_str()) { "main_mod".to_string() } else { raw_filename.clone() }; - let module_attrs = if (authored_name(scope.type_env.clone(), m.clone()).as_str() - == "std.error_primitives".to_string().as_str()) - { +let module_attrs = if (authored_name(scope.type_env.clone(), m.clone()).as_str() == "std.error_primitives".to_string().as_str()) { "#![allow(non_camel_case_types)]\n\n".to_string() } else { "".to_string() }; - let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("// Generated by v2 compiler -- do not edit.\n".to_string(), "// Source module: ".to_string()), authored_name(scope.type_env.clone(), m.clone())), "\n\n".to_string()), module_attrs), prelude), imports_section), svc_imports_str), local_uses_str), "\n\n".to_string()), coproduct_wire_contract_validation_section), items_str), "\n".to_string()); - Rc::new(TextFile { - path: v2_rt::concat( - v2_rt::concat(rust_source_root(), filename), - rust_source_ext(), - ), - content: content, - }) - } +let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("// Generated by v2 compiler -- do not edit.\n".to_string(), "// Source module: ".to_string()), authored_name(scope.type_env.clone(), m.clone())), "\n\n".to_string()), module_attrs), prelude), imports_section), svc_imports_str), local_uses_str), "\n\n".to_string()), coproduct_wire_contract_validation_section), items_str), "\n".to_string()); +Rc::new(TextFile { + path: v2_rt::concat(v2_rt::concat(rust_source_root(), filename), rust_source_ext()), + content: content, +}) +} } pub fn emit_import_name(n: &String, registry: Rc>>) -> String { { let is_data = match v2_rt::map_get(®istry, n.clone()) { - Some(info) => (info.kind.clone() == ItemKind::DataItem), - None => false, - }; - if is_data { + Some(info) => (info.kind.clone() == ItemKind::DataItem), + None => false, +}; +if is_data { to_snake(n.clone()) } else { n.clone() } - } +} } -pub fn emit_imports( - imports: &Rc>>, - emit_info: Rc, - registry: Rc>>, - local_names: Rc>, - source_indices: Rc>>, -) -> String { +pub fn emit_imports(imports: &Rc>>, emit_info: Rc, registry: Rc>>, local_names: Rc>, source_indices: Rc>>) -> String { if ((imports.clone().len() as i64) == 0) { "".to_string() } else { { let type_summaries = emit_info.type_summaries.clone(); - let import_lines = Rc::new({ - let mut __result = Vec::new(); - for imp in imports.clone().iter().cloned() { - __result.push({ - let mod_name = - module_to_filename(authored_name_at(source_indices.clone(), &imp)); - if import_is_all(imp.clone()) { - v2_rt::concat( - v2_rt::concat("use crate::".to_string(), mod_name.clone()), - "::*;".to_string(), - ) +let import_lines = Rc::new({ let mut __result = Vec::new(); for imp in imports.clone().iter().cloned() { __result.push({ + let mod_name = module_to_filename(authored_name_at(source_indices.clone(), &imp)); +if import_is_all(imp.clone()) { + v2_rt::concat(v2_rt::concat("use crate::".to_string(), mod_name.clone()), "::*;".to_string()) + } else { + { + let specific_names = import_specific_names_at(imp.clone(), source_indices.clone()); +let filtered_names = Rc::new({ let mut __result = Vec::new(); for n in specific_names.clone().iter().cloned() { if { let mut __all = true; for ln in local_names.clone().iter().cloned() { if !((ln.clone().as_str() != n.clone().as_str())) { __all = false; break; } } __all } { __result.push(n); } } __result }); +if ((filtered_names.clone().len() as i64) == 0) { + "".to_string() } else { { - let specific_names = - import_specific_names_at(imp.clone(), source_indices.clone()); - let filtered_names = Rc::new({ - let mut __result = Vec::new(); - for n in specific_names.clone().iter().cloned() { - if { - let mut __all = true; - for ln in local_names.clone().iter().cloned() { - if !(ln.clone().as_str() != n.clone().as_str()) { - __all = false; - break; - } - } - __all - } { - __result.push(n); - } - } - __result - }); - if ((filtered_names.clone().len() as i64) == 0) { + let deduped_names = unique_strings(filtered_names.clone()); +let top_level = Rc::new({ let mut __result = Vec::new(); for n in deduped_names.clone().iter().cloned() { if if is_known_variant(type_summaries.clone(), n.clone()) { + is_enum_in_summaries(type_summaries.clone(), n.clone()) + } else { + true + } { __result.push(n); } } __result }); +let all_enum_names = Rc::new({ let mut __result = Vec::new(); for n in Rc::new(v2_rt::map_keys(&type_summaries)).iter().cloned() { if is_enum_in_summaries(type_summaries.clone(), n.clone()) { __result.push(n); } } __result }); +let imported_enums = Rc::new({ let mut __result = Vec::new(); for n in deduped_names.clone().iter().cloned() { if is_enum_in_summaries(type_summaries.clone(), n.clone()) { __result.push(n); } } __result }); +let all_parents = Rc::new({ let mut __result = Vec::new(); for p in Rc::new({ let mut __result = Vec::new(); for n in deduped_names.clone().iter().cloned() { __result.push(if is_enum_in_summaries(type_summaries.clone(), n.clone()) { "".to_string() } else { + match find_variant_parent(type_summaries.clone(), n.clone(), imported_enums.clone()) { + Some(parent) => parent.clone(), + None => match find_variant_parent(type_summaries.clone(), n.clone(), all_enum_names.clone()) { + Some(parent) => parent.clone(), + None => "".to_string(), +}, +} + }); } __result }).iter().cloned() { if (p.clone().as_str() != "".to_string().as_str()) { __result.push(p); } } __result }); +let parent_list = unique_strings(all_parents.clone()); +let top_with_parents = unique_strings(v2_rt::concat(top_level.clone(), parent_list.clone())); +let main_line = if ((top_with_parents.clone().len() as i64) > 0) { { - let deduped_names = unique_strings(filtered_names.clone()); - let top_level = Rc::new({ - let mut __result = Vec::new(); - for n in deduped_names.clone().iter().cloned() { - if if is_known_variant( - type_summaries.clone(), - n.clone(), - ) { - is_enum_in_summaries( - type_summaries.clone(), - n.clone(), - ) - } else { - true - } { - __result.push(n); - } - } - __result - }); - let all_enum_names = Rc::new({ - let mut __result = Vec::new(); - for n in Rc::new(v2_rt::map_keys(&type_summaries)) - .iter() - .cloned() - { - if is_enum_in_summaries( - type_summaries.clone(), - n.clone(), - ) { - __result.push(n); - } - } - __result - }); - let imported_enums = Rc::new({ - let mut __result = Vec::new(); - for n in deduped_names.clone().iter().cloned() { - if is_enum_in_summaries( - type_summaries.clone(), - n.clone(), - ) { - __result.push(n); - } - } - __result - }); - let all_parents = Rc::new({ - let mut __result = Vec::new(); - for p in Rc::new({ - let mut __result = Vec::new(); - for n in deduped_names.clone().iter().cloned() { - __result.push( - if is_enum_in_summaries( - type_summaries.clone(), - n.clone(), - ) { - "".to_string() - } else { - match find_variant_parent( - type_summaries.clone(), - n.clone(), - imported_enums.clone(), - ) { - Some(parent) => parent.clone(), - None => match find_variant_parent( - type_summaries.clone(), - n.clone(), - all_enum_names.clone(), - ) { - Some(parent) => parent.clone(), - None => "".to_string(), - }, - } - }, - ); - } - __result - }) - .iter() - .cloned() - { - if (p.clone().as_str() != "".to_string().as_str()) { - __result.push(p); - } - } - __result - }); - let parent_list = unique_strings(all_parents.clone()); - let top_with_parents = unique_strings(v2_rt::concat( - top_level.clone(), - parent_list.clone(), - )); - let main_line = - if ((top_with_parents.clone().len() as i64) > 0) { - { - let names_str = Rc::new({ - let mut __result = Vec::new(); - for n in - top_with_parents.clone().iter().cloned() - { - __result.push(emit_import_name( - &n, - registry.clone(), - )); - } - __result - }) - .join(&", ".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - rust_visibility_prefix(), - "use crate::".to_string(), - ), - mod_name.clone(), - ), - "::{".to_string(), - ), - names_str.clone(), - ), - "};".to_string(), - ) - } - } else { - "".to_string() - }; - let variant_lines = Rc::new({ - let mut __result = Vec::new(); - for parent in parent_list.clone().iter().cloned() { - __result.push({ - let variants = Rc::new({ - let mut __result = Vec::new(); - for n in - deduped_names.clone().iter().cloned() - { - if if is_enum_in_summaries( - type_summaries.clone(), - n.clone(), - ) { - false - } else { - match find_variant_parent( - type_summaries.clone(), - n.clone(), - Rc::new(vec![parent.clone()]), - ) { - Some(_) => true, - None => false, - } - } { - __result.push(n); - } - } - __result - }); - let vars_str = - variants.clone().join(&", ".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "use crate::" - .to_string(), - mod_name.clone(), - ), - "::".to_string(), - ), - parent.clone(), - ), - "::{".to_string(), - ), - vars_str.clone(), - ), - "};".to_string(), - ) - }); - } - __result - }); - let imported_enums = Rc::new({ - let mut __result = Vec::new(); - for n in top_level.clone().iter().cloned() { - if is_enum_in_summaries( - type_summaries.clone(), - n.clone(), - ) { - __result.push(n); - } - } - __result - }); - let wildcard_enum_lines = Rc::new({ - let mut __result = Vec::new(); - for en in Rc::new({ - let mut __result = Vec::new(); - for en in imported_enums.clone().iter().cloned() { - if ({ - let mut __found = false; - for p in parent_list.clone().iter().cloned() - { - if (p.clone().as_str() - == en.clone().as_str()) - { - __found = true; - break; - } - } - __found - } == false) - { - __result.push(en); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "use crate::".to_string(), - mod_name.clone(), - ), - "::".to_string(), - ), - en.clone(), - ), - "::*;".to_string(), - )); - } - __result - }); - let all_lines = if (main_line.clone().as_str() - != "".to_string().as_str()) - { - v2_rt::concat( - v2_rt::concat( - Rc::new(vec![main_line.clone()]), - Rc::new({ - let mut __result = Vec::new(); - for l in - variant_lines.clone().iter().cloned() - { - if (l.clone().as_str() - != "".to_string().as_str()) - { - __result.push(l); - } - } - __result - }), - ), - wildcard_enum_lines.clone(), - ) - } else { - v2_rt::concat( - Rc::new({ - let mut __result = Vec::new(); - for l in variant_lines.clone().iter().cloned() { - if (l.clone().as_str() - != "".to_string().as_str()) - { - __result.push(l); - } - } - __result - }), - wildcard_enum_lines.clone(), - ) - }; - all_lines.clone().join(&"\n".to_string()) - } - } - } + let names_str = Rc::new({ let mut __result = Vec::new(); for n in top_with_parents.clone().iter().cloned() { __result.push(emit_import_name(&n, registry.clone())); } __result }).join(&", ".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), "use crate::".to_string()), mod_name.clone()), "::{".to_string()), names_str.clone()), "};".to_string()) +} + } else { + "".to_string() + }; +let variant_lines = Rc::new({ let mut __result = Vec::new(); for parent in parent_list.clone().iter().cloned() { __result.push({ + let variants = Rc::new({ let mut __result = Vec::new(); for n in deduped_names.clone().iter().cloned() { if if is_enum_in_summaries(type_summaries.clone(), n.clone()) { + false + } else { + match find_variant_parent(type_summaries.clone(), n.clone(), Rc::new(vec![parent.clone()])) { + Some(_) => true, + None => false, +} + } { __result.push(n); } } __result }); +let vars_str = variants.clone().join(&", ".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("use crate::".to_string(), mod_name.clone()), "::".to_string()), parent.clone()), "::{".to_string()), vars_str.clone()), "};".to_string()) +}); } __result }); +let imported_enums = Rc::new({ let mut __result = Vec::new(); for n in top_level.clone().iter().cloned() { if is_enum_in_summaries(type_summaries.clone(), n.clone()) { __result.push(n); } } __result }); +let wildcard_enum_lines = Rc::new({ let mut __result = Vec::new(); for en in Rc::new({ let mut __result = Vec::new(); for en in imported_enums.clone().iter().cloned() { if ({ let mut __found = false; for p in parent_list.clone().iter().cloned() { if (p.clone().as_str() == en.clone().as_str()) { __found = true; break; } } __found } == false) { __result.push(en); } } __result }).iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("use crate::".to_string(), mod_name.clone()), "::".to_string()), en.clone()), "::*;".to_string())); } __result }); +let all_lines = if (main_line.clone().as_str() != "".to_string().as_str()) { + v2_rt::concat(v2_rt::concat(Rc::new(vec![main_line.clone()]), Rc::new({ let mut __result = Vec::new(); for l in variant_lines.clone().iter().cloned() { if (l.clone().as_str() != "".to_string().as_str()) { __result.push(l); } } __result })), wildcard_enum_lines.clone()) + } else { + v2_rt::concat(Rc::new({ let mut __result = Vec::new(); for l in variant_lines.clone().iter().cloned() { if (l.clone().as_str() != "".to_string().as_str()) { __result.push(l); } } __result }), wildcard_enum_lines.clone()) + }; +all_lines.clone().join(&"\n".to_string()) +} } - }); - } - __result - }); - Rc::new({ - let mut __result = Vec::new(); - for line in import_lines.iter().cloned() { - if (line.clone().as_str() != "".to_string().as_str()) { - __result.push(line); - } +} } - __result - }) - .join(&"\n".to_string()) - } +}); } __result }); +Rc::new({ let mut __result = Vec::new(); for line in import_lines.iter().cloned() { if (line.clone().as_str() != "".to_string().as_str()) { __result.push(line); } } __result }).join(&"\n".to_string()) +} } } pub fn emit_prelude() -> String { { - let use_line = - "use std::collections::HashMap;\nuse std::rc::Rc;\nuse crate::v2_rt;".to_string(); - let wrapper_use = "use crate::NonEmptyVec;\nuse crate::NonEmptyBTreeSet;".to_string(); - v2_rt::concat(v2_rt::concat(use_line, "\n".to_string()), wrapper_use) - } + let use_line = "use std::collections::HashMap;\nuse std::rc::Rc;\nuse crate::v2_rt;".to_string(); +let wrapper_use = "use crate::NonEmptyVec;\nuse crate::NonEmptyBTreeSet;".to_string(); +v2_rt::concat(v2_rt::concat(use_line, "\n".to_string()), wrapper_use) +} } pub fn emit_non_empty_wrappers() -> String { { let vec_wrapper = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("#[derive(Debug, Clone, PartialEq)]\n".to_string(), "pub struct NonEmptyVec(Vec);\n\n".to_string()), "impl NonEmptyVec {\n".to_string()), " pub fn new(items: Vec) -> Result {\n".to_string()), " if items.is_empty() {\n".to_string()), " Err(\"NonEmptyVec requires at least one element\")\n".to_string()), " } else {\n".to_string()), " Ok(Self(items))\n".to_string()), " }\n".to_string()), " }\n\n".to_string()), " pub fn as_slice(&self) -> &[T] {\n".to_string()), " &self.0\n".to_string()), " }\n\n".to_string()), " pub fn into_vec(self) -> Vec {\n".to_string()), " self.0\n".to_string()), " }\n".to_string()), "}".to_string()); - let set_wrapper = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("#[derive(Debug, Clone, PartialEq)]\n".to_string(), "pub struct NonEmptyBTreeSet(std::collections::BTreeSet);\n\n".to_string()), "impl NonEmptyBTreeSet {\n".to_string()), " pub fn new(items: std::collections::BTreeSet) -> Result {\n".to_string()), " if items.is_empty() {\n".to_string()), " Err(\"NonEmptyBTreeSet requires at least one element\")\n".to_string()), " } else {\n".to_string()), " Ok(Self(items))\n".to_string()), " }\n".to_string()), " }\n\n".to_string()), " pub fn as_set(&self) -> &std::collections::BTreeSet {\n".to_string()), " &self.0\n".to_string()), " }\n\n".to_string()), " pub fn into_set(self) -> std::collections::BTreeSet {\n".to_string()), " self.0\n".to_string()), " }\n".to_string()), "}".to_string()); - v2_rt::concat(v2_rt::concat(vec_wrapper, "\n\n".to_string()), set_wrapper) - } +let set_wrapper = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("#[derive(Debug, Clone, PartialEq)]\n".to_string(), "pub struct NonEmptyBTreeSet(std::collections::BTreeSet);\n\n".to_string()), "impl NonEmptyBTreeSet {\n".to_string()), " pub fn new(items: std::collections::BTreeSet) -> Result {\n".to_string()), " if items.is_empty() {\n".to_string()), " Err(\"NonEmptyBTreeSet requires at least one element\")\n".to_string()), " } else {\n".to_string()), " Ok(Self(items))\n".to_string()), " }\n".to_string()), " }\n\n".to_string()), " pub fn as_set(&self) -> &std::collections::BTreeSet {\n".to_string()), " &self.0\n".to_string()), " }\n\n".to_string()), " pub fn into_set(self) -> std::collections::BTreeSet {\n".to_string()), " self.0\n".to_string()), " }\n".to_string()), "}".to_string()); +v2_rt::concat(v2_rt::concat(vec_wrapper, "\n\n".to_string()), set_wrapper) +} } -pub fn emit_typed_item( - item: &Rc, - module_name: String, - registry: &Rc>>, - scope: &Rc, - shared_types: Rc>, - emit_info: &Rc, - wire_contract_item: Option>, - data_items: Rc>>>>, - module_items: Rc>>, - imports: Rc>>, -) -> String { +pub fn emit_typed_item(item: &Rc, module_name: String, registry: &Rc>>, scope: &Rc, shared_types: Rc>, emit_info: &Rc, wire_contract_item: Option>, data_items: Rc>>>>, module_items: Rc>>, imports: Rc>>) -> String { { let env = scope.type_env.clone(); - let qualified_name = v2_rt::concat( - v2_rt::concat(module_name, ".".to_string()), - authored_name(env.clone(), item.clone()), - ); - let item_text = authored_name(env.clone(), item.clone()); - if is_type_def_item(&item) { - emit_type_def_from_connective( - &item, - emit_info.recursive_type_set.clone(), - shared_types, - &env, - emit_info.clone(), - &wire_contract_item, - data_items, - module_items, - imports, - ) +let qualified_name = v2_rt::concat(v2_rt::concat(module_name, ".".to_string()), authored_name(env.clone(), item.clone())); +let item_text = authored_name(env.clone(), item.clone()); +if is_type_def_item(&item) { + emit_type_def_from_connective(&item, emit_info.recursive_type_set.clone(), shared_types, &env, emit_info.clone(), &wire_contract_item, data_items, module_items, imports) } else { if is_type_alias_item(&item, env.source_indices.clone()) { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - rust_visibility_prefix(), - rust_items().type_alias_keyword.clone(), - ), - " ".to_string(), - ), - item_text, - ), - " = ".to_string(), - ), - render_rust_type( - resolved_type(item.clone()), - shared_types, - env.source_indices.clone(), - ), - ), - ";".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), rust_items().type_alias_keyword.clone()), " ".to_string()), item_text), " = ".to_string()), render_rust_type(resolved_type(item.clone()), shared_types, env.source_indices.clone())), ";".to_string()) } else { if is_type_decl_item(&item, env.source_indices.clone()) { "".to_string() } else { if is_function_item(&item) { { - let fn_movable = match v2_rt::map_get( - &emit_info.ownership_index.clone(), - qualified_name.clone(), - ) { - Some(m) => m.clone(), - None => v2_rt::rc_empty_map::(), - }; - let item_is_tco = is_tco_eligible( - &authored_name(env.clone(), item.clone()), - &item.body.clone().clone().unwrap(), - registry.clone(), - &env.source_indices.clone(), - ); - let fn_read_only = if item_is_tco { - v2_rt::rc_empty_map::() + let fn_movable = match v2_rt::map_get(&emit_info.ownership_index.clone(), qualified_name.clone()) { + Some(m) => m.clone(), + None => empty_set(), +}; +let item_is_tco = is_tco_eligible(&authored_name(env.clone(), item.clone()), &item.body.clone().clone().unwrap(), registry.clone(), &env.source_indices.clone()); +let fn_read_only = if item_is_tco { + empty_set() } else { - match v2_rt::map_get( - &emit_info.read_only_params_index.clone(), - qualified_name.clone(), - ) { - Some(m) => m.clone(), - None => v2_rt::rc_empty_map::(), - } - }; - let fn_emit_info = Rc::new(EmitGraphInfo { - type_summaries: emit_info.type_summaries.clone(), - recursive_type_set: emit_info.recursive_type_set.clone(), - fielded_variants: emit_info.fielded_variants.clone(), - shared_types: emit_info.shared_types.clone(), - ownership_index: emit_info.ownership_index.clone(), - movable: fn_movable, - variant_to_enum: emit_info.variant_to_enum.clone(), - owned_bindings: v2_rt::rc_empty_map::(), - read_only_params_index: emit_info.read_only_params_index.clone(), - read_only_params: fn_read_only, - }); - let is_effectful = match lookup_item( - registry.clone(), - authored_name(env.clone(), item.clone()), - ) { - Some(info) => { - (((info.service_names.clone().len() as i64) > 0) - || ((info.resource_names.clone().len() as i64) > 0)) - } - None => false, + match v2_rt::map_get(&emit_info.read_only_params_index.clone(), qualified_name.clone()) { + Some(m) => m.clone(), + None => empty_set(), +} }; - if is_effectful { - emit_func_def( - &item_text, - &item.params.clone(), - resolved_type(item.clone()), - &item.uses.clone(), - item.body.clone().clone().unwrap(), - ®istry, - &scope, - &shared_types, - &fn_emit_info, - ) +let fn_emit_info = Rc::new(EmitGraphInfo { + type_summaries: emit_info.type_summaries.clone(), + recursive_type_set: emit_info.recursive_type_set.clone(), + fielded_variants: emit_info.fielded_variants.clone(), + untagged_json_tuple_variants: emit_info.untagged_json_tuple_variants.clone(), + shared_types: emit_info.shared_types.clone(), + ownership_index: emit_info.ownership_index.clone(), + movable: fn_movable, + variant_to_enum: emit_info.variant_to_enum.clone(), + owned_bindings: empty_set(), + read_only_params_index: emit_info.read_only_params_index.clone(), + read_only_params: fn_read_only, +}); +let is_effectful = match lookup_item(registry.clone(), authored_name(env.clone(), item.clone())) { + Some(info) => (((info.service_names.clone().len() as i64) > 0) || ((info.resource_names.clone().len() as i64) > 0)), + None => false, +}; +if is_effectful { + emit_func_def(&item_text, &item.params.clone(), resolved_type(item.clone()), &item.uses.clone(), item.body.clone().clone().unwrap(), ®istry, &scope, &shared_types, &fn_emit_info) } else { - emit_fn_def( - &item_text, - &item.params.clone(), - resolved_type(item.clone()), - &item.body.clone().clone().unwrap(), - ®istry, - &scope, - &shared_types, - &fn_emit_info, - ) + emit_fn_def(&item_text, &item.params.clone(), resolved_type(item.clone()), &item.body.clone().clone().unwrap(), ®istry, &scope, &shared_types, &fn_emit_info) } - } +} } else { if is_data_def_item(&item) { - emit_data_def( - item_text, - &item.type_annotation.clone().clone().unwrap(), - item.body.clone().clone().unwrap(), - registry.clone(), - &scope, - 0, - &shared_types, - emit_info.clone(), - ) + emit_data_def(item_text, &item.type_annotation.clone().clone().unwrap(), item.body.clone().clone().unwrap(), registry.clone(), &scope, 0, &shared_types, emit_info.clone()) } else { if is_service_def_item(&item) { emit_service_def(&item, registry.clone(), shared_types, &env) @@ -2763,13 +1203,7 @@ pub fn emit_typed_item( if is_resource_def_item(&item) { emit_resource_def(&item, shared_types, &env) } else { - v2_rt::concat( - v2_rt::concat( - "compile_error!(\"unhandled item: ".to_string(), - item_text, - ), - "\");".to_string(), - ) + v2_rt::concat(v2_rt::concat("compile_error!(\"unhandled item: ".to_string(), item_text), "\");".to_string()) } } } @@ -2777,845 +1211,306 @@ pub fn emit_typed_item( } } } - } +} } -pub fn needs_box_wrapping( - mut n: Rc, - mut recursive_types: Rc>, - mut shared_types: Rc>, - mut source_indices: Rc>>, -) -> bool { +pub fn needs_box_wrapping(mut n: Rc, mut recursive_types: Rc>, mut shared_types: Rc>, mut source_indices: Rc>>) -> bool { loop { if ((n.children.clone().len() as i64) == 0) { let name = authored_name_at(source_indices, &n); - if emit_map_has(shared_types, name.clone()) { +if set_contains(shared_types, name.clone()) { break false; - } else { - break emit_map_has(recursive_types, name.clone()); - } - } else { +} else { + break set_contains(recursive_types, name.clone()); +} +} else { let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); - if is_optional { +if is_optional { { let __tco_0 = with_required_cardinality(&n); - n = __tco_0; - continue; - } - } else { +n = __tco_0; +continue; +} +} else { break false; - } - } - } +} +} +} } -pub fn emit_type_params( - params: &Rc>>, - source_indices: Rc>>, -) -> String { +pub fn emit_type_params(params: &Rc>>, source_indices: Rc>>) -> String { if ((params.clone().len() as i64) == 0) { "".to_string() } else { { - let names = Rc::new({ - let mut __result = Vec::new(); - for p in params.clone().iter().cloned() { - __result.push(generic_param_name_at(p.clone(), source_indices.clone())); - } - __result - }); - v2_rt::concat( - v2_rt::concat("<".to_string(), names.join(&", ".to_string())), - ">".to_string(), - ) - } + let names = Rc::new({ let mut __result = Vec::new(); for p in params.clone().iter().cloned() { __result.push(generic_param_name_at(p.clone(), source_indices.clone())); } __result }); +v2_rt::concat(v2_rt::concat("<".to_string(), names.join(&", ".to_string())), ">".to_string()) +} } } pub fn is_function_type_param(param: &Rc) -> bool { { let type_expr = param_node_type_expr(¶m); - let type_expr_is_var = match type_expr.inferred.clone() { - Some(inf) => is_type_variable(inf.clone()), - None => false, - }; - ((type_expr_is_var && (param.name.clone().as_str() != "".to_string().as_str())) - && (param.name.clone().as_str() == type_expr.name.clone().as_str())) - } +let type_expr_is_var = match type_expr.inferred.clone() { + Some(inf) => is_type_variable(inf.clone()), + None => false, +}; +((type_expr_is_var && (param.name.clone().as_str() != "".to_string().as_str())) && (param.name.clone().as_str() == type_expr.name.clone().as_str())) +} } pub fn function_type_params(params: Rc>>) -> Rc>> { - Rc::new({ - let mut __result = Vec::new(); - for p in params.iter().cloned() { - if is_function_type_param(&p) { - __result.push(p); - } - } - __result - }) + Rc::new({ let mut __result = Vec::new(); for p in params.iter().cloned() { if is_function_type_param(&p) { __result.push(p); } } __result }) } pub fn function_value_params(params: Rc>>) -> Rc>> { - Rc::new({ - let mut __result = Vec::new(); - for p in params.iter().cloned() { - if !is_function_type_param(&p) { - __result.push(p); - } - } - __result - }) + Rc::new({ let mut __result = Vec::new(); for p in params.iter().cloned() { if !is_function_type_param(&p) { __result.push(p); } } __result }) } pub fn function_type_params_have_collision(type_params: Rc>>) -> bool { { - let names = Rc::new({ - let mut __result = Vec::new(); - for p in type_params.iter().cloned() { - __result.push(p.name.clone()); - } - __result - }); - ((names.clone().len() as i64) > (unique_strings(names.clone()).len() as i64)) - } + let names = Rc::new({ let mut __result = Vec::new(); for p in type_params.iter().cloned() { __result.push(p.name.clone()); } __result }); +((names.clone().len() as i64) > (unique_strings(names.clone()).len() as i64)) +} } -pub fn emit_type_def_from_connective( - item: &Rc, - recursive_types: Rc>, - shared_types: Rc>, - env: &Rc, - emit_info: Rc, - wire_contract_item: &Option>, - data_items: Rc>>>>, - module_items: Rc>>, - imports: Rc>>, -) -> String { +pub fn emit_type_def_from_connective(item: &Rc, recursive_types: Rc>, shared_types: Rc>, env: &Rc, emit_info: Rc, wire_contract_item: &Option>, data_items: Rc>>>>, module_items: Rc>>, imports: Rc>>) -> String { { let type_params = emit_type_params(&item.params.clone(), env.source_indices.clone()); - let item_text = authored_name(env.clone(), item.clone()); - let is_product = is_product_type(item.clone()); - if is_product { - emit_struct_from_children( - &item_text, - type_params, - &item.children.clone(), - recursive_types, - &shared_types, - env.clone(), - emit_info, - ) +let item_text = authored_name(env.clone(), item.clone()); +let is_product = is_product_type(item.clone()); +if is_product { + emit_struct_from_children(&item_text, type_params, &item.children.clone(), recursive_types, &shared_types, env.clone(), emit_info) } else { { - let all_unit_variants = { - let mut __all = true; - for child in item.children.clone().iter().cloned() { - if !((child.children.clone().len() as i64) == 0) { - __all = false; - break; - } - } - __all - }; - let serde_policy = match resolve_local_coproduct_wire_policy( - &item_text, - all_unit_variants.clone(), - &module_items, - imports, - &env.source_indices.clone(), - ) { - Some(local_policy) => local_policy.clone(), - None => { - if all_unit_variants.clone() { - match wire_contract_item.clone() { - Some(_) => resolve_wire_serde_policy_for_coproduct( - wire_contract_item.clone(), - env.source_indices.clone(), - data_items, - ), - None => rust_tagged_object_policy(), - } - } else { - rust_tagged_object_policy() - } - } - }; - let rename_validations = variant_rename_validations_for_policy( - item.children.clone(), - env.clone(), - serde_policy.clone(), - ); - let policy_validation = match serde_policy.error_message.clone() { - Some(message) => emit_rust_compile_error_item(message.clone()), - None => "".to_string(), - }; - let validations = if (policy_validation.clone().as_str() == "".to_string().as_str()) - { + let all_unit_variants = { let mut __all = true; for child in item.children.clone().iter().cloned() { if !(((child.children.clone().len() as i64) == 0)) { __all = false; break; } } __all }; +let serde_policy = match resolve_local_coproduct_wire_policy(&item_text, all_unit_variants.clone(), &module_items, imports, &env.source_indices.clone()) { + Some(local_policy) => local_policy.clone(), + None => if all_unit_variants.clone() { + match wire_contract_item.clone() { + Some(_) => resolve_wire_serde_policy_for_coproduct(wire_contract_item.clone(), env.source_indices.clone(), data_items), + None => rust_tagged_object_policy(), +} + } else { + rust_tagged_object_policy() + }, +}; +let rename_validations = variant_rename_validations_for_policy(item.children.clone(), env.clone(), serde_policy.clone()); +let untagged_validations = untagged_json_tuple_variant_shape_validations(&item.children.clone(), env.clone(), &serde_policy); +let policy_validation = match serde_policy.error_message.clone() { + Some(message) => emit_rust_compile_error_item(message.clone()), + None => "".to_string(), +}; +let validations1 = if (policy_validation.clone().as_str() == "".to_string().as_str()) { rename_validations.clone() } else { if (rename_validations.clone().as_str() == "".to_string().as_str()) { policy_validation.clone() } else { - v2_rt::concat( - v2_rt::concat(policy_validation.clone(), "\n".to_string()), - rename_validations.clone(), - ) + v2_rt::concat(v2_rt::concat(policy_validation.clone(), "\n".to_string()), rename_validations.clone()) + } + }; +let validations2 = if (validations1.clone().as_str() == "".to_string().as_str()) { + untagged_validations.clone() + } else { + if (untagged_validations.clone().as_str() == "".to_string().as_str()) { + validations1.clone() + } else { + v2_rt::concat(v2_rt::concat(validations1.clone(), "\n".to_string()), untagged_validations.clone()) } }; - let enum_text = emit_enum_from_children( - &item_text, - &type_params, - &item.children.clone(), - &recursive_types, - &shared_types, - &env, - &serde_policy, - ); - if (validations.clone().as_str() == "".to_string().as_str()) { +let enum_text = emit_enum_from_children(&item_text, &type_params, &item.children.clone(), &recursive_types, &shared_types, &env, &serde_policy); +if (validations2.clone().as_str() == "".to_string().as_str()) { enum_text } else { - v2_rt::concat( - v2_rt::concat(validations.clone(), "\n".to_string()), - enum_text, - ) + v2_rt::concat(v2_rt::concat(validations2.clone(), "\n".to_string()), enum_text) } - } +} } - } +} } -pub fn emit_struct_from_children( - name: &String, - type_params: String, - children: &Rc>>, - recursive_types: Rc>, - shared_types: &Rc>, - env: Rc, - emit_info: Rc, -) -> String { +pub fn emit_struct_from_children(name: &String, type_params: String, children: &Rc>>, recursive_types: Rc>, shared_types: &Rc>, env: Rc, emit_info: Rc) -> String { { let has_fn_fields = match v2_rt::map_get(&emit_info.type_summaries.clone(), name.clone()) { - Some(ts) => ts.has_fn_fields.clone(), - None => false, - }; - let derives = if has_fn_fields { + Some(ts) => ts.has_fn_fields.clone(), + None => false, +}; +let derives = if has_fn_fields { "#[derive(Clone)]".to_string() } else { - if emit_map_has(shared_types.clone(), name.clone()) { + if set_contains(shared_types.clone(), name.clone()) { rust_struct_derives_text() } else { rust_struct_derives_copy_text() } }; - if ((children.clone().len() as i64) == 0) { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(derives, "\n".to_string()), - rust_visibility_prefix(), - ), - rust_items().struct_keyword.clone(), - ), - " ".to_string(), - ), - name.clone(), - ), - type_params, - ), - ";".to_string(), - ) +if ((children.clone().len() as i64) == 0) { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(derives, "\n".to_string()), rust_visibility_prefix()), rust_items().struct_keyword.clone()), " ".to_string()), name.clone()), type_params), ";".to_string()) } else { { - let field_lines = Rc::new({ - let mut __result = Vec::new(); - for child in children.clone().iter().cloned() { - __result.push(emit_struct_field_from_child( - &child, - recursive_types.clone(), - &shared_types, - &env, - )); - } - __result - }); - let fields_str = field_lines.join(&"\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(derives, "\n".to_string()), - rust_visibility_prefix(), - ), - rust_items().struct_keyword.clone(), - ), - " ".to_string(), - ), - name.clone(), - ), - type_params, - ), - " {\n".to_string(), - ), - fields_str, - ), - "\n}".to_string(), - ) - } + let field_lines = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { __result.push(emit_struct_field_from_child(&child, recursive_types.clone(), &shared_types, &env)); } __result }); +let fields_str = field_lines.join(&"\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(derives, "\n".to_string()), rust_visibility_prefix()), rust_items().struct_keyword.clone()), " ".to_string()), name.clone()), type_params), " {\n".to_string()), fields_str), "\n}".to_string()) +} } - } +} } -pub fn emit_struct_field_from_child( - child: &Rc, - recursive_types: Rc>, - shared_types: &Rc>, - env: &Rc, -) -> String { +pub fn emit_struct_field_from_child(child: &Rc, recursive_types: Rc>, shared_types: &Rc>, env: &Rc) -> String { { let rt_child = resolved_type(child.clone()); - let ty = if ((is_product_type(rt_child.clone()) && (rt_child.ident_span.clone() != None)) - && ((rt_child.children.clone().len() as i64) > 2)) - { +let ty = if ((is_product_type(rt_child.clone()) && (rt_child.ident_span.clone() != None)) && ((rt_child.children.clone().len() as i64) > 2)) { { let rt_child_name = authored_name_at(env.source_indices.clone(), &rt_child); - match lookup_type_by_name(&env, rt_child_name.clone()) { - Some(resolved) => { - if ((resolved.params.clone().len() as i64) > 0) { - { - let base = coerce_primitive_type( - RenderTarget::Rust, - rt_child_name.clone(), - ); - let param_names = Rc::new({ - let mut __result = Vec::new(); - for p in resolved.params.clone().iter().cloned() { - __result.push(generic_param_name_at( - p.clone(), - env.source_indices.clone(), - )); - } - __result - }); - let with_params = v2_rt::concat( - v2_rt::concat( - v2_rt::concat(base, "<".to_string()), - param_names.join(&", ".to_string()), - ), - ">".to_string(), - ); - if emit_map_has(shared_types.clone(), rt_child_name.clone()) { - v2_rt::concat( - v2_rt::concat("Rc<".to_string(), with_params), - ">".to_string(), - ) - } else { - with_params - } - } +match lookup_type_by_name(&env, rt_child_name.clone()) { + Some(resolved) => if ((resolved.params.clone().len() as i64) > 0) { + { + let base = coerce_primitive_type(RenderTarget::Rust, rt_child_name.clone()); +let param_names = Rc::new({ let mut __result = Vec::new(); for p in resolved.params.clone().iter().cloned() { __result.push(generic_param_name_at(p.clone(), env.source_indices.clone())); } __result }); +let with_params = v2_rt::concat(v2_rt::concat(v2_rt::concat(base, "<".to_string()), param_names.join(&", ".to_string())), ">".to_string()); +if set_contains(shared_types.clone(), rt_child_name.clone()) { + v2_rt::concat(v2_rt::concat("Rc<".to_string(), with_params), ">".to_string()) } else { - render_rust_type( - rt_child.clone(), - shared_types.clone(), - env.source_indices.clone(), - ) + with_params } - } - None => render_rust_type( - rt_child.clone(), - shared_types.clone(), - env.source_indices.clone(), - ), - } - } +} + } else { + render_rust_type(rt_child.clone(), shared_types.clone(), env.source_indices.clone()) + }, + None => render_rust_type(rt_child.clone(), shared_types.clone(), env.source_indices.clone()), +} +} } else { - render_rust_type( - rt_child.clone(), - shared_types.clone(), - env.source_indices.clone(), - ) + render_rust_type(rt_child.clone(), shared_types.clone(), env.source_indices.clone()) }; - let final_ty = if needs_box_wrapping( - rt_child.clone(), - recursive_types, - shared_types.clone(), - env.source_indices.clone(), - ) { +let final_ty = if needs_box_wrapping(rt_child.clone(), recursive_types, shared_types.clone(), env.source_indices.clone()) { v2_rt::concat(v2_rt::concat("Box<".to_string(), ty), ">".to_string()) } else { ty }; - let rename_attr = match Rc::new({ - let mut __result = Vec::new(); - for p in child.properties.clone().iter().cloned() { - if (field_init_node_name_at(p.clone(), env.source_indices.clone()).as_str() - == "from_key".to_string().as_str()) - { - __result.push(p); - } - } - __result - }) - .first() - .cloned() - { - Some(prop) => match (*field_init_node_value(&prop).expr_data.clone()).clone() { - ExprData::ExprLiteral { value: lv, .. } => match (*lv.clone()).clone() { - LiteralValue::LitStr { value: key, .. } => v2_rt::concat( - v2_rt::concat( - " ".to_string(), - apply_type_template1(rust_serde_rename_template_text(), key.clone()), - ), - "\n".to_string(), - ), - _ => "".to_string(), - }, - _ => "".to_string(), - }, - None => "".to_string(), - }; - let authored = authored_name(env.clone(), child.clone()); - let snake = to_snake(authored.clone()); - let is_reserved = { - let mut __found = false; - for r in language_spec(RenderTarget::Rust) - .reserved_words - .clone() - .keywords - .clone() - .iter() - .cloned() - { - if (r.clone().as_str() == snake.clone().as_str()) { - __found = true; - break; - } - } - __found +let rename_attr = match Rc::new({ let mut __result = Vec::new(); for p in child.properties.clone().iter().cloned() { if (field_init_node_name_at(p.clone(), env.source_indices.clone()).as_str() == "from_key".to_string().as_str()) { __result.push(p); } } __result }).first().cloned() { + Some(prop) => match (*field_init_node_value(&prop).expr_data.clone()).clone() { + ExprData::ExprLiteral { value: lv, .. } => match (*lv.clone()).clone() { + LiteralValue::LitStr { value: key, .. } => v2_rt::concat(v2_rt::concat(" ".to_string(), apply_type_template1(rust_serde_rename_template_text(), key.clone())), "\n".to_string()), + _ => "".to_string(), +}, + _ => "".to_string(), +}, + None => "".to_string(), +}; +let authored = authored_name(env.clone(), child.clone()); +let snake = to_snake(authored.clone()); +let is_reserved = { let mut __found = false; for r in language_spec(RenderTarget::Rust).reserved_words.clone().keywords.clone().iter().cloned() { if (r.clone().as_str() == snake.clone().as_str()) { __found = true; break; } } __found }; +let keyword_rename = if (is_reserved && (rename_attr.clone().as_str() == "".to_string().as_str())) { + v2_rt::concat(v2_rt::concat(" #[serde(rename = \"".to_string(), snake.clone()), "\")]\n".to_string()) + } else { + "".to_string() }; - let keyword_rename = - if (is_reserved && (rename_attr.clone().as_str() == "".to_string().as_str())) { - v2_rt::concat( - v2_rt::concat(" #[serde(rename = \"".to_string(), snake.clone()), - "\")]\n".to_string(), - ) - } else { - "".to_string() - }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(keyword_rename, rename_attr.clone()), - " ".to_string(), - ), - rust_visibility_prefix(), - ), - emit_ident(authored.clone(), RenderTarget::Rust), - ), - ": ".to_string(), - ), - final_ty, - ), - ",".to_string(), - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(keyword_rename, rename_attr.clone()), " ".to_string()), rust_visibility_prefix()), emit_ident(authored.clone(), RenderTarget::Rust)), ": ".to_string()), final_ty), ",".to_string()) +} } pub fn enum_derives(children: Rc>>) -> String { { - let complex = Rc::new({ - let mut __result = Vec::new(); - for v in children.iter().cloned() { - if ((v.children.clone().len() as i64) > 0) { - __result.push(v); - } - } - __result - }); - match ((complex.len() as i64) == 0) { - true => rust_enum_derives_copy_text(), - false => rust_enum_derives_text(), - } - } + let complex = Rc::new({ let mut __result = Vec::new(); for v in children.iter().cloned() { if ((v.children.clone().len() as i64) > 0) { __result.push(v); } } __result }); +match ((complex.len() as i64) == 0) { + true => rust_enum_derives_copy_text(), + false => rust_enum_derives_text(), +} +} } -pub fn emit_enum_from_children( - name: &String, - type_params: &String, - children: &Rc>>, - recursive_types: &Rc>, - shared_types: &Rc>, - env: &Rc, - serde_policy: &Rc, -) -> String { +pub fn emit_enum_from_children(name: &String, type_params: &String, children: &Rc>>, recursive_types: &Rc>, shared_types: &Rc>, env: &Rc, serde_policy: &Rc) -> String { { let derives = enum_derives(children.clone()); - let variant_lines = Rc::new({ - let mut __result = Vec::new(); - for child in children.clone().iter().cloned() { - __result.push(emit_variant_from_child( - &child, - recursive_types.clone(), - shared_types.clone(), - &env, - serde_policy.clone(), - )); - } - __result - }); - let variants_str = variant_lines.join(&"\n".to_string()); - let tag_line = if (serde_policy.enum_attr.clone().as_str() == "".to_string().as_str()) { +let variant_lines = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { __result.push(emit_variant_from_child(&child, recursive_types.clone(), &shared_types, &env, &serde_policy)); } __result }); +let variants_str = variant_lines.join(&"\n".to_string()); +let tag_line = if (serde_policy.enum_attr.clone().as_str() == "".to_string().as_str()) { "".to_string() } else { v2_rt::concat(serde_policy.enum_attr.clone(), "\n".to_string()) }; - let enum_def = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(derives, "\n".to_string()), - tag_line, - ), - rust_visibility_prefix(), - ), - rust_items().enum_keyword.clone(), - ), - " ".to_string(), - ), - name.clone(), - ), - type_params.clone(), - ), - " {\n".to_string(), - ), - variants_str, - ), - "\n}".to_string(), - ); - let accessor_impl = emit_enum_shared_accessors( - &name, - &type_params, - &children, - recursive_types.clone(), - shared_types.clone(), - &env, - ); - if (accessor_impl.clone().as_str() == "".to_string().as_str()) { +let enum_def = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(derives, "\n".to_string()), tag_line), rust_visibility_prefix()), rust_items().enum_keyword.clone()), " ".to_string()), name.clone()), type_params.clone()), " {\n".to_string()), variants_str), "\n}".to_string()); +let accessor_impl = emit_enum_shared_accessors(&name, &type_params, &children, recursive_types.clone(), shared_types.clone(), &env); +if (accessor_impl.clone().as_str() == "".to_string().as_str()) { enum_def } else { - v2_rt::concat( - v2_rt::concat(enum_def, "\n".to_string()), - accessor_impl.clone(), - ) + v2_rt::concat(v2_rt::concat(enum_def, "\n".to_string()), accessor_impl.clone()) } - } +} } pub fn find_shared_enum_fields(children: Rc>>, env: Rc) -> Rc> { { - let fielded = Rc::new({ - let mut __result = Vec::new(); - for child in children.iter().cloned() { - if ((child.children.clone().len() as i64) > 0) { - __result.push(child); - } - } - __result - }); - if ((fielded.clone().len() as i64) == 0) { - return Rc::new(vec![]); + let fielded = Rc::new({ let mut __result = Vec::new(); for child in children.iter().cloned() { if ((child.children.clone().len() as i64) > 0) { __result.push(child); } } __result }); +if ((fielded.clone().len() as i64) == 0) { + return Rc::new(vec![]) } - let first_fields = match fielded.clone().first().cloned() { - Some(v) => Rc::new({ - let mut __result = Vec::new(); - for f in v.children.clone().iter().cloned() { - __result.push(authored_name(env.clone(), f.clone())); - } - __result - }), - None => Rc::new(vec![]), - }; - Rc::new({ - let mut __result = Vec::new(); - for fname in first_fields.iter().cloned() { - if { - let mut __all = true; - for variant in fielded.clone().iter().cloned() { - if !({ - let mut __found = false; - for f in variant.children.clone().iter().cloned() { - if (authored_name(env.clone(), f.clone()).as_str() - == fname.clone().as_str()) - { - __found = true; - break; - } - } - __found - }) { - __all = false; - break; - } - } - __all - } { - __result.push(fname); - } - } - __result - }) - } +let first_fields = match fielded.clone().first().cloned() { + Some(v) => Rc::new({ let mut __result = Vec::new(); for f in v.children.clone().iter().cloned() { __result.push(authored_name(env.clone(), f.clone())); } __result }), + None => Rc::new(vec![]), +}; +Rc::new({ let mut __result = Vec::new(); for fname in first_fields.iter().cloned() { if { let mut __all = true; for variant in fielded.clone().iter().cloned() { if !({ let mut __found = false; for f in variant.children.clone().iter().cloned() { if (authored_name(env.clone(), f.clone()).as_str() == fname.clone().as_str()) { __found = true; break; } } __found }) { __all = false; break; } } __all } { __result.push(fname); } } __result }) +} } -pub fn emit_enum_shared_accessors( - name: &String, - type_params: &String, - children: &Rc>>, - recursive_types: Rc>, - shared_types: Rc>, - env: &Rc, -) -> String { +pub fn emit_enum_shared_accessors(name: &String, type_params: &String, children: &Rc>>, recursive_types: Rc>, shared_types: Rc>, env: &Rc) -> String { { let all_shared = find_shared_enum_fields(children.clone(), env.clone()); - if ((all_shared.clone().len() as i64) == 0) { - return "".to_string(); +if ((all_shared.clone().len() as i64) == 0) { + return "".to_string() } - let fielded = Rc::new({ - let mut __result = Vec::new(); - for child in children.clone().iter().cloned() { - if ((child.children.clone().len() as i64) > 0) { - __result.push(child); - } - } - __result - }); - if ((fielded.clone().len() as i64) == 0) { - return "compile_error!(\"enum shared accessor missing fielded variant\")".to_string(); +let fielded = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { if ((child.children.clone().len() as i64) > 0) { __result.push(child); } } __result }); +if ((fielded.clone().len() as i64) == 0) { + return "compile_error!(\"enum shared accessor missing fielded variant\")".to_string() } - let first_fielded = fielded.clone().first().cloned().clone().unwrap(); - let shared = Rc::new({ - let mut __result = Vec::new(); - for fname in all_shared.clone().iter().cloned() { - if { - let types = Rc::new({ - let mut __result = Vec::new(); - for variant in fielded.clone().iter().cloned() { - __result.push( - match Rc::new({ - let mut __result = Vec::new(); - for f in variant.children.clone().iter().cloned() { - if (authored_name(env.clone(), f.clone()).as_str() - == fname.clone().as_str()) - { - __result.push(f); - } - } - __result - }) - .first() - .cloned() - { - Some(f) => render_rust_type( - resolved_type(f.clone()), - shared_types.clone(), - env.source_indices.clone(), - ), - None => "".to_string(), - }, - ); - } - __result - }); - let first_type = match types.clone().first().cloned() { - Some(t) => t.clone(), - None => "".to_string(), - }; +let first_fielded = fielded.clone().first().cloned().clone().unwrap(); +let shared = Rc::new({ let mut __result = Vec::new(); for fname in all_shared.clone().iter().cloned() { if { + let types = Rc::new({ let mut __result = Vec::new(); for variant in fielded.clone().iter().cloned() { __result.push(match Rc::new({ let mut __result = Vec::new(); for f in variant.children.clone().iter().cloned() { if (authored_name(env.clone(), f.clone()).as_str() == fname.clone().as_str()) { __result.push(f); } } __result }).first().cloned() { + Some(f) => render_rust_type(resolved_type(f.clone()), shared_types.clone(), env.source_indices.clone()), + None => "".to_string(), +}); } __result }); +let first_type = match types.clone().first().cloned() { + Some(t) => t.clone(), + None => "".to_string(), +}; +{ let mut __all = true; for t in types.clone().iter().cloned() { if !((t.clone().as_str() == first_type.clone().as_str())) { __all = false; break; } } __all } +} { __result.push(fname); } } __result }); +if ((shared.clone().len() as i64) == 0) { + return "".to_string() + } +let accessor_fns = Rc::new({ let mut __result = Vec::new(); for fname in shared.clone().iter().cloned() { __result.push({ + let ty = match Rc::new({ let mut __result = Vec::new(); for f in first_fielded.children.clone().iter().cloned() { if (authored_name(env.clone(), f.clone()).as_str() == fname.clone().as_str()) { __result.push(f); } } __result }).first().cloned() { + Some(f) => render_rust_type(resolved_type(f.clone()), shared_types.clone(), env.source_indices.clone()), + None => "compile_error!(\"enum shared accessor missing field metadata\")".to_string(), +}; +let arms = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { __result.push({ + let child_text = authored_name(env.clone(), child.clone()); +if ((child.children.clone().len() as i64) == 0) { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), name.clone()), "::".to_string()), child_text.clone()), " => panic!(\"no ".to_string()), fname.clone()), " on unit variant\"),".to_string()) + } else { { - let mut __all = true; - for t in types.clone().iter().cloned() { - if !(t.clone().as_str() == first_type.clone().as_str()) { - __all = false; - break; - } - } - __all - } - } { - __result.push(fname); + let sharing = language_spec(RenderTarget::Rust).sharing.clone(); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), name.clone()), "::".to_string()), child_text.clone()), " { ".to_string()), emit_ident(fname.clone(), RenderTarget::Rust)), ": __val, .. } => ".to_string()), apply_type_template1(sharing.clone_value.clone(), "__val".to_string())), ",".to_string()) +} } - } - __result - }); - if ((shared.clone().len() as i64) == 0) { - return "".to_string(); - } - let accessor_fns = Rc::new({ - let mut __result = Vec::new(); - for fname in shared.clone().iter().cloned() { - __result.push({ - let ty = match Rc::new({ - let mut __result = Vec::new(); - for f in first_fielded.children.clone().iter().cloned() { - if (authored_name(env.clone(), f.clone()).as_str() - == fname.clone().as_str()) - { - __result.push(f); - } - } - __result - }) - .first() - .cloned() - { - Some(f) => render_rust_type( - resolved_type(f.clone()), - shared_types.clone(), - env.source_indices.clone(), - ), - None => "compile_error!(\"enum shared accessor missing field metadata\")" - .to_string(), - }; - let arms = Rc::new({ - let mut __result = Vec::new(); - for child in children.clone().iter().cloned() { - __result.push({ - let child_text = authored_name(env.clone(), child.clone()); - if ((child.children.clone().len() as i64) == 0) { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - " ".to_string(), - name.clone(), - ), - "::".to_string(), - ), - child_text.clone(), - ), - " => panic!(\"no ".to_string(), - ), - fname.clone(), - ), - " on unit variant\"),".to_string(), - ) - } else { - { - let sharing = - language_spec(RenderTarget::Rust).sharing.clone(); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - " ".to_string(), - name.clone(), - ), - "::".to_string(), - ), - child_text.clone(), - ), - " { ".to_string(), - ), - emit_ident( - fname.clone(), - RenderTarget::Rust, - ), - ), - ": __val, .. } => ".to_string(), - ), - apply_type_template1( - sharing.clone_value.clone(), - "__val".to_string(), - ), - ), - ",".to_string(), - ) - } - } - }); - } - __result - }); - let arms_str = arms.clone().join(&"\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - " pub fn ".to_string(), - emit_ident(fname.clone(), RenderTarget::Rust), - ), - "(&self) -> ".to_string(), - ), - ty.clone(), - ), - " {\n match self {\n".to_string(), - ), - arms_str.clone(), - ), - "\n }\n }".to_string(), - ) - }); - } - __result - }); - let fns_str = accessor_fns.join(&"\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("impl".to_string(), type_params.clone()), - " ".to_string(), - ), - name.clone(), - ), - type_params.clone(), - ), - " {\n".to_string(), - ), - fns_str, - ), - "\n}".to_string(), - ) - } +}); } __result }); +let arms_str = arms.clone().join(&"\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" pub fn ".to_string(), emit_ident(fname.clone(), RenderTarget::Rust)), "(&self) -> ".to_string()), ty.clone()), " {\n match self {\n".to_string()), arms_str.clone()), "\n }\n }".to_string()) +}); } __result }); +let fns_str = accessor_fns.join(&"\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("impl".to_string(), type_params.clone()), " ".to_string()), name.clone()), type_params.clone()), " {\n".to_string()), fns_str), "\n}".to_string()) +} } pub fn string_without_prefix(value: &String, prefix: &String) -> Option { if (v2_rt::string_length(&prefix) == 0) { None } else { - if ((v2_rt::string_length(&value) >= v2_rt::string_length(&prefix)) - && (v2_rt::substring(&value, 0, v2_rt::string_length(&prefix)).as_str() - == prefix.clone().as_str())) - { - Some(v2_rt::substring( - &value, - v2_rt::string_length(&prefix), - v2_rt::string_length(&value), - )) + if ((v2_rt::string_length(&value) >= v2_rt::string_length(&prefix)) && (v2_rt::substring(&value, 0, v2_rt::string_length(&prefix)).as_str() == prefix.clone().as_str())) { + Some(v2_rt::substring(&value, v2_rt::string_length(&prefix), v2_rt::string_length(&value))) } else { None } @@ -3626,1164 +1521,511 @@ pub fn string_without_suffix(value: &String, suffix: &String) -> Option if (v2_rt::string_length(&suffix) == 0) { None } else { - if ((v2_rt::string_length(&value) >= v2_rt::string_length(&suffix)) - && (v2_rt::substring( - &value, - (v2_rt::string_length(&value) - v2_rt::string_length(&suffix)), - v2_rt::string_length(&value), - ) - .as_str() - == suffix.clone().as_str())) - { - Some(v2_rt::substring( - &value, - 0, - (v2_rt::string_length(&value) - v2_rt::string_length(&suffix)), - )) + if ((v2_rt::string_length(&value) >= v2_rt::string_length(&suffix)) && (v2_rt::substring(&value, (v2_rt::string_length(&value) - v2_rt::string_length(&suffix)), v2_rt::string_length(&value)).as_str() == suffix.clone().as_str())) { + Some(v2_rt::substring(&value, 0, (v2_rt::string_length(&value) - v2_rt::string_length(&suffix)))) } else { None } } } -pub fn wire_variant_rename_attr_for_policy( - authored: String, - policy: &Rc, -) -> String { - match policy.rename_style.clone() { - Some(style) => { - if (style.clone().as_str() == "StripAffixAndSnakeCase".to_string().as_str()) { - { - let without_prefix = match policy.rename_prefix.clone() { - Some(prefix) => match string_without_prefix(&authored, &prefix) { - Some(stripped) => stripped.clone(), - None => return "".to_string(), - }, - None => authored, - }; - let without_suffix = match policy.rename_suffix.clone() { - Some(suffix) => match string_without_suffix(&without_prefix, &suffix) { - Some(stripped) => stripped.clone(), - None => return "".to_string(), - }, - None => without_prefix, - }; - v2_rt::concat( - v2_rt::concat( - " #[serde(rename = \"".to_string(), - to_snake(without_suffix), - ), - "\")]\n".to_string(), - ) - } - } else { - "".to_string() - } - } - None => "".to_string(), - } +pub fn wire_variant_rename_attr_for_policy(authored: String, policy: &Rc) -> String { + match policy.untagged_string_variant.clone() { + Some(_) => "".to_string(), + None => match policy.rename_style.clone() { + Some(style) => if (style.clone().as_str() == "StripAffixAndSnakeCase".to_string().as_str()) { + { + let without_prefix = match policy.rename_prefix.clone() { + Some(prefix) => match string_without_prefix(&authored, &prefix) { + Some(stripped) => stripped.clone(), + None => return "".to_string(), +}, + None => authored, +}; +let without_suffix = match policy.rename_suffix.clone() { + Some(suffix) => match string_without_suffix(&without_prefix, &suffix) { + Some(stripped) => stripped.clone(), + None => return "".to_string(), +}, + None => without_prefix, +}; +v2_rt::concat(v2_rt::concat(" #[serde(rename = \"".to_string(), to_snake(without_suffix)), "\")]\n".to_string()) +} + } else { + "".to_string() + }, + None => "".to_string(), +}, +} } -pub fn variant_rename_validation_for_policy( - authored: &String, - policy: &Rc, -) -> String { - match policy.rename_style.clone() { - Some(style) => { - if (style.clone().as_str() == "StripAffixAndSnakeCase".to_string().as_str()) { +pub fn variant_rename_validation_for_policy(authored: &String, policy: &Rc) -> String { + match policy.untagged_string_variant.clone() { + Some(_) => "".to_string(), + None => match policy.rename_style.clone() { + Some(style) => if (style.clone().as_str() == "StripAffixAndSnakeCase".to_string().as_str()) { + { + let without_prefix = match policy.rename_prefix.clone() { + Some(prefix) => match string_without_prefix(&authored, &prefix) { + Some(stripped) => stripped.clone(), + None => return emit_rust_compile_error_item(v2_rt::concat(v2_rt::concat(v2_rt::concat("variant ".to_string(), authored.clone()), " does not satisfy declared wire rename prefix: ".to_string()), prefix.clone())), +}, + None => authored.clone(), +}; +match policy.rename_suffix.clone() { + Some(suffix) => match string_without_suffix(&without_prefix, &suffix) { + Some(_) => "".to_string(), + None => emit_rust_compile_error_item(v2_rt::concat(v2_rt::concat(v2_rt::concat("variant ".to_string(), authored.clone()), " does not satisfy declared wire rename suffix: ".to_string()), suffix.clone())), +}, + None => "".to_string(), +} +} + } else { + "".to_string() + }, + None => "".to_string(), +}, +} +} + +pub fn variant_rename_validations_for_policy(children: Rc>>, env: Rc, serde_policy: Rc) -> String { + Rc::new({ let mut __result = Vec::new(); for text in Rc::new({ let mut __result = Vec::new(); for child in children.iter().cloned() { __result.push(variant_rename_validation_for_policy(&authored_name(env.clone(), child.clone()), &serde_policy)); } __result }).iter().cloned() { if (text.clone().as_str() != "".to_string().as_str()) { __result.push(text); } } __result }).join(&"\n".to_string()) +} + +pub fn untagged_json_tuple_variant_shape_validations(children: &Rc>>, env: Rc, serde_policy: &Rc) -> String { + match serde_policy.untagged_string_variant.clone() { + Some(sv) => { + let sf = match serde_policy.untagged_string_field.clone() { + Some(x) => x.clone(), + None => "".to_string(), +}; +let av = match serde_policy.untagged_array_variant.clone() { + Some(x) => x.clone(), + None => "".to_string(), +}; +let af = match serde_policy.untagged_array_field.clone() { + Some(x) => x.clone(), + None => "".to_string(), +}; +if (((sf.clone().as_str() == "".to_string().as_str()) || (av.clone().as_str() == "".to_string().as_str())) || (af.clone().as_str() == "".to_string().as_str())) { + emit_rust_compile_error_item("UntaggedJsonStringOrArray requires string_field, array_variant, and array_field literals".to_string()) + } else { + if ((children.clone().len() as i64) != 2) { + emit_rust_compile_error_item("UntaggedJsonStringOrArray coproduct must have exactly two variants".to_string()) + } else { { - let without_prefix = match policy.rename_prefix.clone() { - Some(prefix) => match string_without_prefix(&authored, &prefix) { - Some(stripped) => stripped.clone(), - None => { - return emit_rust_compile_error_item(v2_rt::concat( - v2_rt::concat( - v2_rt::concat("variant ".to_string(), authored.clone()), - " does not satisfy declared wire rename prefix: " - .to_string(), - ), - prefix.clone(), - )) + let diags = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { __result.extend((*{ + let nm = authored_name(env.clone(), child.clone()); +if ((child.children.clone().len() as i64) == 0) { + Rc::new(vec![emit_rust_compile_error_item(v2_rt::concat("UntaggedJsonStringOrArray requires fielded variants; got unit ".to_string(), nm.clone()))]) + } else { + if (nm.clone().as_str() == sv.clone().as_str()) { + { + let field_names = Rc::new({ let mut __result = Vec::new(); for f in child.children.clone().iter().cloned() { __result.push(authored_name(env.clone(), f.clone())); } __result }); +if ((field_names.clone().len() as i64) != 1) { + Rc::new(vec![emit_rust_compile_error_item(v2_rt::concat(v2_rt::concat("UntaggedJsonStringOrArray string arm ".to_string(), sv.clone()), " must declare exactly one field".to_string()))]) + } else { + match field_names.clone().first().cloned() { + Some(only) => if (only.clone().as_str() != sf.clone().as_str()) { + Rc::new(vec![emit_rust_compile_error_item(v2_rt::concat("UntaggedJsonStringOrArray string arm field must be named ".to_string(), sf.clone()))]) + } else { + Rc::new(vec![]) + }, + None => Rc::new(vec![emit_rust_compile_error_item("UntaggedJsonStringOrArray string arm field name missing".to_string())]), +} + } +} + } else { + if (nm.clone().as_str() == av.clone().as_str()) { + { + let field_names = Rc::new({ let mut __result = Vec::new(); for f in child.children.clone().iter().cloned() { __result.push(authored_name(env.clone(), f.clone())); } __result }); +if ((field_names.clone().len() as i64) != 1) { + Rc::new(vec![emit_rust_compile_error_item(v2_rt::concat(v2_rt::concat("UntaggedJsonStringOrArray array arm ".to_string(), av.clone()), " must declare exactly one field".to_string()))]) + } else { + match field_names.clone().first().cloned() { + Some(only) => if (only.clone().as_str() != af.clone().as_str()) { + Rc::new(vec![emit_rust_compile_error_item(v2_rt::concat("UntaggedJsonStringOrArray array arm field must be named ".to_string(), af.clone()))]) + } else { + Rc::new(vec![]) + }, + None => Rc::new(vec![emit_rust_compile_error_item("UntaggedJsonStringOrArray array arm field name missing".to_string())]), +} + } +} + } else { + Rc::new(vec![emit_rust_compile_error_item(v2_rt::concat("UntaggedJsonStringOrArray unexpected variant ".to_string(), nm.clone()))]) + } } - }, - None => authored.clone(), - }; - match policy.rename_suffix.clone() { - Some(suffix) => match string_without_suffix(&without_prefix, &suffix) { - Some(_) => "".to_string(), - None => emit_rust_compile_error_item(v2_rt::concat( - v2_rt::concat( - v2_rt::concat("variant ".to_string(), authored.clone()), - " does not satisfy declared wire rename suffix: ".to_string(), - ), - suffix.clone(), - )), - }, - None => "".to_string(), - } - } - } else { - "".to_string() - } - } - None => "".to_string(), - } + } +}).iter().cloned()); } __result }); +Rc::new({ let mut __result = Vec::new(); for t in diags.iter().cloned() { if (t.clone().as_str() != "".to_string().as_str()) { __result.push(t); } } __result }).join(&"\n".to_string()) } - -pub fn variant_rename_validations_for_policy( - children: Rc>>, - env: Rc, - serde_policy: Rc, -) -> String { - Rc::new({ - let mut __result = Vec::new(); - for text in Rc::new({ - let mut __result = Vec::new(); - for child in children.iter().cloned() { - __result.push(variant_rename_validation_for_policy( - &authored_name(env.clone(), child.clone()), - &serde_policy, - )); - } - __result - }) - .iter() - .cloned() - { - if (text.clone().as_str() != "".to_string().as_str()) { - __result.push(text); } } - __result - }) - .join(&"\n".to_string()) +}, + None => "".to_string(), +} } -pub fn emit_variant_from_child( - child: &Rc, - recursive_types: Rc>, - shared_types: Rc>, - env: &Rc, - serde_policy: Rc, -) -> String { +pub fn emit_variant_from_child(child: &Rc, recursive_types: Rc>, shared_types: &Rc>, env: &Rc, serde_policy: &Rc) -> String { { let child_text = authored_name(env.clone(), child.clone()); - let rename_attr = wire_variant_rename_attr_for_policy(child_text.clone(), &serde_policy); - if ((child.children.clone().len() as i64) == 0) { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(rename_attr, " ".to_string()), - child_text.clone(), - ), - ",".to_string(), - ) - } else if (serde_policy.enum_attr.clone().as_str() - == "#[serde(untagged)]".to_string().as_str()) - && ((child.children.clone().len() as i64) == 1) - { - let f = child.children[0].clone(); - let rt_f = resolved_type(f.clone()); - let ty = render_rust_type( - rt_f.clone(), - shared_types.clone(), - env.source_indices.clone(), - ); - let final_ty = if needs_box_wrapping( - rt_f.clone(), - recursive_types.clone(), - shared_types.clone(), - env.source_indices.clone(), - ) { - v2_rt::concat( - v2_rt::concat("Box<".to_string(), ty.clone()), - ">".to_string(), - ) - } else { - ty.clone() - }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(rename_attr, " ".to_string()), - child_text.clone(), - ), - "(".to_string(), - ), - v2_rt::concat(final_ty, "),".to_string()), - ) - } else { - { - let field_lines = Rc::new({ - let mut __result = Vec::new(); - for f in child.children.clone().iter().cloned() { - __result.push({ +let rename_attr = wire_variant_rename_attr_for_policy(child_text.clone(), &serde_policy); +if ((child.children.clone().len() as i64) == 0) { + v2_rt::concat(v2_rt::concat(v2_rt::concat(rename_attr, " ".to_string()), child_text.clone()), ",".to_string()) + } else { + match serde_policy.untagged_string_variant.clone() { + Some(sv) => { + let sf = match serde_policy.untagged_string_field.clone() { + Some(x) => x.clone(), + None => "".to_string(), +}; +let av = match serde_policy.untagged_array_variant.clone() { + Some(x) => x.clone(), + None => "".to_string(), +}; +let af = match serde_policy.untagged_array_field.clone() { + Some(x) => x.clone(), + None => "".to_string(), +}; +if (child_text.clone().as_str() == sv.clone().as_str()) { + { + let matched = Rc::new({ let mut __result = Vec::new(); for f in child.children.clone().iter().cloned() { if (authored_name(env.clone(), f.clone()).as_str() == sf.clone().as_str()) { __result.push(f); } } __result }); +match matched.first().cloned() { + Some(f) => { let rt_f = resolved_type(f.clone()); - let ty = render_rust_type( - rt_f.clone(), - shared_types.clone(), - env.source_indices.clone(), - ); - let final_ty = if needs_box_wrapping( - rt_f.clone(), - recursive_types.clone(), - shared_types.clone(), - env.source_indices.clone(), - ) { - v2_rt::concat( - v2_rt::concat("Box<".to_string(), ty.clone()), - ">".to_string(), - ) +let ty = render_rust_type(rt_f.clone(), shared_types.clone(), env.source_indices.clone()); +let final_ty = if needs_box_wrapping(rt_f.clone(), recursive_types.clone(), shared_types.clone(), env.source_indices.clone()) { + v2_rt::concat(v2_rt::concat("Box<".to_string(), ty.clone()), ">".to_string()) } else { ty.clone() }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - " ".to_string(), - emit_ident( - authored_name(env.clone(), f.clone()), - RenderTarget::Rust, - ), - ), - ": ".to_string(), - ), - final_ty.clone(), - ), - ",".to_string(), - ) - }); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rename_attr, " ".to_string()), child_text.clone()), "(".to_string()), final_ty.clone()), "),".to_string()) +}, + None => v2_rt::concat(v2_rt::concat(v2_rt::concat(emit_rust_compile_error_item(v2_rt::concat("internal: UntaggedJsonStringOrArray missing field ".to_string(), sf.clone())), "\n ".to_string()), child_text.clone()), "{},".to_string()), +} +} + } else { + if (child_text.clone().as_str() == av.as_str()) { + { + let matched = Rc::new({ let mut __result = Vec::new(); for f in child.children.clone().iter().cloned() { if (authored_name(env.clone(), f.clone()).as_str() == af.clone().as_str()) { __result.push(f); } } __result }); +match matched.first().cloned() { + Some(f) => { + let rt_f = resolved_type(f.clone()); +let ty = render_rust_type(rt_f.clone(), shared_types.clone(), env.source_indices.clone()); +let final_ty = if needs_box_wrapping(rt_f.clone(), recursive_types.clone(), shared_types.clone(), env.source_indices.clone()) { + v2_rt::concat(v2_rt::concat("Box<".to_string(), ty.clone()), ">".to_string()) + } else { + ty.clone() + }; +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rename_attr, " ".to_string()), child_text.clone()), "(".to_string()), final_ty.clone()), "),".to_string()) +}, + None => v2_rt::concat(v2_rt::concat(v2_rt::concat(emit_rust_compile_error_item(v2_rt::concat("internal: UntaggedJsonStringOrArray missing field ".to_string(), af.clone())), "\n ".to_string()), child_text.clone()), "{},".to_string()), +} +} + } else { + v2_rt::concat(v2_rt::concat(v2_rt::concat(emit_rust_compile_error_item(v2_rt::concat("internal: UntaggedJsonStringOrArray unexpected variant ".to_string(), child_text.clone())), "\n ".to_string()), child_text.clone()), "{},".to_string()) } - __result - }); - let fields_str = field_lines.join(&"\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(rename_attr, " ".to_string()), - child_text.clone(), - ), - " {\n".to_string(), - ), - fields_str, - ), - "\n },".to_string(), - ) - } + } +}, + None => { + let field_lines = Rc::new({ let mut __result = Vec::new(); for f in child.children.clone().iter().cloned() { __result.push({ + let rt_f = resolved_type(f.clone()); +let ty = render_rust_type(rt_f.clone(), shared_types.clone(), env.source_indices.clone()); +let final_ty = if needs_box_wrapping(rt_f.clone(), recursive_types.clone(), shared_types.clone(), env.source_indices.clone()) { + v2_rt::concat(v2_rt::concat("Box<".to_string(), ty.clone()), ">".to_string()) + } else { + ty.clone() + }; +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), emit_ident(authored_name(env.clone(), f.clone()), RenderTarget::Rust)), ": ".to_string()), final_ty.clone()), ",".to_string()) +}); } __result }); +let fields_str = field_lines.join(&"\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rename_attr, " ".to_string()), child_text.clone()), " {\n".to_string()), fields_str), "\n },".to_string()) +}, +} } - } +} } -pub fn emit_fn_def( - name: &String, - params: &Rc>>, - inferred: Rc, - body: &Rc, - registry: &Rc>>, - scope: &Rc, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { +pub fn emit_fn_def(name: &String, params: &Rc>>, inferred: Rc, body: &Rc, registry: &Rc>>, scope: &Rc, shared_types: &Rc>, emit_info: &Rc) -> String { { let si = scope.type_env.clone().source_indices.clone(); - let type_params = function_type_params(params.clone()); - let value_params = function_value_params(params.clone()); - if function_type_params_have_collision(type_params.clone()) { - return v2_rt::concat(v2_rt::concat("compile_error!(\"type param name collides with a value param in fn '".to_string(), name.clone()), "' — a value param shares its name with a declared type param; rename the value param or dissolve via ParamKind/params-slot partition\");\n".to_string()); - } - let type_params_str = emit_type_params(&type_params, si.clone()); - let params_str = emit_params( - value_params.clone(), - shared_types.clone(), - si.clone(), - emit_info.read_only_params.clone(), - ); - let ret_str = emit_inferred(inferred, shared_types.clone(), si.clone()); - let body_scope = build_params_scope(&scope, value_params.clone()); - let depth = 0; - let use_tco = is_tco_eligible(&name, &body, registry.clone(), &si); - let needs_stacker = (is_self_recursive(&name, body.clone(), registry.clone(), si.clone()) - && (use_tco.clone() == false)); - if use_tco.clone() { +let type_params = function_type_params(params.clone()); +let value_params = function_value_params(params.clone()); +if function_type_params_have_collision(type_params.clone()) { + return v2_rt::concat(v2_rt::concat("compile_error!(\"type param name collides with a value param in fn '".to_string(), name.clone()), "' — a value param shares its name with a declared type param; rename the value param or dissolve via ParamKind/params-slot partition\");\n".to_string()) + } +let type_params_str = emit_type_params(&type_params, si.clone()); +let params_str = emit_params(value_params.clone(), shared_types.clone(), si.clone(), emit_info.read_only_params.clone()); +let ret_str = emit_inferred(inferred, shared_types.clone(), si.clone()); +let body_scope = build_params_scope(&scope, value_params.clone()); +let depth = 0; +let use_tco = is_tco_eligible(&name, &body, registry.clone(), &si); +let needs_stacker = (is_self_recursive(&name, body.clone(), registry.clone(), si.clone()) && (use_tco.clone() == false)); +if use_tco.clone() { { - let tco_params_str = - emit_tco_params(value_params.clone(), shared_types.clone(), si.clone()); - let body_str = emit_typed_tco_body( - body.clone(), - name.clone(), - value_params.clone(), - registry.clone(), - body_scope, - (depth.clone() + 1), - shared_types.clone(), - emit_info.clone(), - ); - let kw = rust_items().func_keyword.clone(); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - rust_visibility_prefix(), - kw, - ), - " ".to_string(), - ), - emit_ident( - name.clone(), - RenderTarget::Rust, - ), - ), - type_params_str, - ), - "(".to_string(), - ), - tco_params_str, - ), - ")".to_string(), - ), - ret_str, - ), - " {\n".to_string(), - ), - make_indent((depth.clone() + 1)), - ), - body_str, - ), - "\n}".to_string(), - ) - } + let tco_params_str = emit_tco_params(value_params.clone(), shared_types.clone(), si.clone()); +let body_str = emit_typed_tco_body(body.clone(), name.clone(), value_params.clone(), registry.clone(), body_scope, (depth.clone() + 1), shared_types.clone(), emit_info.clone()); +let kw = rust_items().func_keyword.clone(); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), kw), " ".to_string()), emit_ident(name.clone(), RenderTarget::Rust)), type_params_str), "(".to_string()), tco_params_str), ")".to_string()), ret_str), " {\n".to_string()), make_indent((depth.clone() + 1))), body_str), "\n}".to_string()) +} } else { - emit_fn_def_non_tco( - name.clone(), - type_params_str, - params_str, - ret_str, - body.clone(), - registry.clone(), - body_scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - needs_stacker, - ) + emit_fn_def_non_tco(name.clone(), type_params_str, params_str, ret_str, body.clone(), registry.clone(), body_scope, depth.clone(), shared_types.clone(), emit_info.clone(), needs_stacker) } - } +} } -pub fn emit_fn_def_non_tco( - name: String, - type_params_str: String, - params_str: String, - ret_str: String, - body: Rc, - registry: Rc>>, - scope: Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, - needs_stacker: bool, -) -> String { +pub fn emit_fn_def_non_tco(name: String, type_params_str: String, params_str: String, ret_str: String, body: Rc, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc, needs_stacker: bool) -> String { if needs_stacker { { - let body_str = emit_typed_expr( - body, - registry, - &scope, - (depth.clone() + 2), - shared_types, - emit_info, - 1024, - ); - let kw = rust_items().func_keyword.clone(); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - rust_visibility_prefix( - ), - kw, - ), - " ".to_string(), - ), - emit_ident( - name, - RenderTarget::Rust, - ), - ), - type_params_str, - ), - "(".to_string(), - ), - params_str, - ), - ")".to_string(), - ), - ret_str, - ), - " {\n".to_string(), - ), - make_indent((depth.clone() + 1)), - ), - "stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || {\n" - .to_string(), - ), - make_indent((depth.clone() + 2)), - ), - body_str, - ), - "\n".to_string(), - ), - make_indent((depth.clone() + 1)), - ), - "})\n}".to_string(), - ) - } + let body_str = emit_typed_expr(body, registry, &scope, (depth.clone() + 2), shared_types, emit_info, 1024); +let kw = rust_items().func_keyword.clone(); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), kw), " ".to_string()), emit_ident(name, RenderTarget::Rust)), type_params_str), "(".to_string()), params_str), ")".to_string()), ret_str), " {\n".to_string()), make_indent((depth.clone() + 1))), "stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || {\n".to_string()), make_indent((depth.clone() + 2))), body_str), "\n".to_string()), make_indent((depth.clone() + 1))), "})\n}".to_string()) +} } else { { - let body_str = emit_typed_expr( - body, - registry, - &scope, - (depth.clone() + 1), - shared_types, - emit_info, - 1024, - ); - let kw = rust_items().func_keyword.clone(); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(rust_visibility_prefix(), kw), - " ".to_string(), - ), - emit_ident(name, RenderTarget::Rust), - ), - type_params_str, - ), - "(".to_string(), - ), - params_str, - ), - ")".to_string(), - ), - ret_str, - ), - " {\n".to_string(), - ), - make_indent((depth.clone() + 1)), - ), - body_str, - ), - "\n}".to_string(), - ) - } + let body_str = emit_typed_expr(body, registry, &scope, (depth.clone() + 1), shared_types, emit_info, 1024); +let kw = rust_items().func_keyword.clone(); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), kw), " ".to_string()), emit_ident(name, RenderTarget::Rust)), type_params_str), "(".to_string()), params_str), ")".to_string()), ret_str), " {\n".to_string()), make_indent((depth.clone() + 1))), body_str), "\n}".to_string()) +} } } -pub fn emit_func_def( - name: &String, - params: &Rc>>, - inferred: Rc, - uses: &Rc>>, - body: Rc, - registry: &Rc>>, - scope: &Rc, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { +pub fn emit_func_def(name: &String, params: &Rc>>, inferred: Rc, uses: &Rc>>, body: Rc, registry: &Rc>>, scope: &Rc, shared_types: &Rc>, emit_info: &Rc) -> String { { if ((function_type_params(params.clone()).len() as i64) > 0) { - return v2_rt::concat(v2_rt::concat("compile_error!(\"emit_func_def saw type params in `".to_string(), name.clone()), "` — func/pattern/interface don't route through the generic-fn split today; the parser invariant at parse_block_body_from_prefix has changed. Plumb type_params through this path or dissolve via ParamKind/params-slot partition.\");\n".to_string()); + return v2_rt::concat(v2_rt::concat("compile_error!(\"emit_func_def saw type params in `".to_string(), name.clone()), "` — func/pattern/interface don't route through the generic-fn split today; the parser invariant at parse_block_body_from_prefix has changed. Plumb type_params through this path or dissolve via ParamKind/params-slot partition.\");\n".to_string()) } - let depth = 0; - let service_names = match lookup_item(registry.clone(), name.clone()) { - Some(info) => info.service_names.clone(), - None => Rc::new(vec![]), - }; - let params_str = emit_func_params( - params.clone(), - uses.clone(), - service_names, - shared_types.clone(), - scope.type_env.clone().source_indices.clone(), - emit_info.read_only_params.clone(), - ); - let ret_str = emit_func_inferred( - inferred, - shared_types.clone(), - scope.type_env.clone().source_indices.clone(), - ); - let body_scope = build_params_scope(&scope, params.clone()); - let si = scope.type_env.clone().source_indices.clone(); - let body_scope = uses.clone().iter().cloned().fold( - body_scope.clone(), - |s: Rc, u: Rc| { - extend_scope( - &s, - &resource_use_name_at(u.clone(), si.clone()), - resource_use_resource(&u), - Rc::new(SubValueRelation::SubValueUnknown), - ) - }, - ); - let body_str = emit_func_body( - &body, - ®istry, - &body_scope, - (depth.clone() + 1), - &shared_types, - &emit_info, - ); - let items = rust_items(); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - rust_visibility_prefix(), - items.async_prefix.clone(), - ), - items.func_keyword.clone(), - ), - " ".to_string(), - ), - emit_ident(name.clone(), RenderTarget::Rust), - ), - "(".to_string(), - ), - params_str, - ), - ")".to_string(), - ), - ret_str, - ), - " {\n".to_string(), - ), - make_indent((depth.clone() + 1)), - ), - body_str, - ), - "\n}".to_string(), - ) - } +let depth = 0; +let service_names = match lookup_item(registry.clone(), name.clone()) { + Some(info) => info.service_names.clone(), + None => Rc::new(vec![]), +}; +let params_str = emit_func_params(params.clone(), uses.clone(), service_names, shared_types.clone(), scope.type_env.clone().source_indices.clone(), emit_info.read_only_params.clone()); +let ret_str = emit_func_inferred(inferred, shared_types.clone(), scope.type_env.clone().source_indices.clone()); +let body_scope = build_params_scope(&scope, params.clone()); +let si = scope.type_env.clone().source_indices.clone(); +let body_scope = uses.clone().iter().cloned().fold(body_scope.clone(), |s: Rc, u: Rc| extend_scope(&s, &resource_use_name_at(u.clone(), si.clone()), resource_use_resource(&u), Rc::new(SubValueRelation::SubValueUnknown))); +let body_str = emit_func_body(&body, ®istry, &body_scope, (depth.clone() + 1), &shared_types, &emit_info); +let items = rust_items(); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), items.async_prefix.clone()), items.func_keyword.clone()), " ".to_string()), emit_ident(name.clone(), RenderTarget::Rust)), "(".to_string()), params_str), ")".to_string()), ret_str), " {\n".to_string()), make_indent((depth.clone() + 1))), body_str), "\n}".to_string()) +} } -pub fn emit_func_body( - body: &Rc, - registry: &Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { +pub fn emit_func_body(body: &Rc, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let si = scope.type_env.clone().source_indices.clone(); - match (*body.expr_data.clone()).clone() { - ExprData::ExprLet => { + { + let si = scope.type_env.clone().source_indices.clone(); +match (*body.expr_data.clone()).clone() { + ExprData::ExprLet => { let n = let_binding_name_at(body.clone(), si); - let v = let_value(body.clone()); - let inner = let_body(body.clone()); - let val_str = emit_typed_expr( - v.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let let_line = emit_let_binding(n.clone(), val_str, &RenderTarget::Rust); - let next_scope = extend_scope( - &scope, - &n, - resolved_type(v.clone()), - Rc::new(SubValueRelation::SubValueUnknown), - ); - match inner { - Some(bd) => v2_rt::concat( - v2_rt::concat(let_line, "\n".to_string()), - emit_func_body( - &bd, - ®istry, - &next_scope, - depth.clone(), - &shared_types, - &emit_info, - ), - ), - None => let_line, - } - } - ExprData::ExprBlock => { +let v = let_value(body.clone()); +let inner = let_body(body.clone()); +let val_str = emit_typed_expr(v.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let let_line = emit_let_binding(n.clone(), val_str, &RenderTarget::Rust); +let next_scope = extend_scope(&scope, &n, resolved_type(v.clone()), Rc::new(SubValueRelation::SubValueUnknown)); +match inner { + Some(bd) => v2_rt::concat(v2_rt::concat(let_line, "\n".to_string()), emit_func_body(&bd, ®istry, &next_scope, depth.clone(), &shared_types, &emit_info)), + None => let_line, +} +}, + ExprData::ExprBlock => { let ss = body.children.clone(); - if ((ss.clone().len() as i64) == 0) { +if ((ss.clone().len() as i64) == 0) { "Ok(())".to_string() } else { { - let init_state = emit_rust_init_block_stmts( - ss.clone(), - Rc::new(vec![]), - scope.clone(), - registry.clone(), - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ); - let last_stmt = ss.clone().last().cloned(); - let last_str = match last_stmt { - Some(s) => match (*s.expr_data.clone()).clone() { - ExprData::ExprReturn => v2_rt::concat( - v2_rt::concat( - "return Ok(".to_string(), - emit_typed_expr( - return_value(s.clone()), - registry.clone(), - &init_state.scope.clone(), - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ), - ), - ")".to_string(), - ), - _ => v2_rt::concat( - v2_rt::concat( - "Ok(".to_string(), - emit_typed_expr( - s.clone(), - registry.clone(), - &init_state.scope.clone(), - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ), - ), - ")".to_string(), - ), - }, - None => "Ok(())".to_string(), - }; - if ((init_state.text.clone().len() as i64) == 0) { + let init_state = emit_rust_init_block_stmts(ss.clone(), Rc::new(vec![]), scope.clone(), registry.clone(), depth.clone(), shared_types.clone(), emit_info.clone()); +let last_stmt = ss.clone().last().cloned(); +let last_str = match last_stmt { + Some(s) => match (*s.expr_data.clone()).clone() { + ExprData::ExprReturn => v2_rt::concat(v2_rt::concat("return Ok(".to_string(), emit_typed_expr(return_value(s.clone()), registry.clone(), &init_state.scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone(), 1024)), ")".to_string()), + _ => v2_rt::concat(v2_rt::concat("Ok(".to_string(), emit_typed_expr(s.clone(), registry.clone(), &init_state.scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone(), 1024)), ")".to_string()), +}, + None => "Ok(())".to_string(), +}; +if ((init_state.text.clone().len() as i64) == 0) { last_str } else { - v2_rt::concat( - v2_rt::concat( - init_state.text.clone().join(&"\n".to_string()), - "\n".to_string(), - ), - last_str, - ) + v2_rt::concat(v2_rt::concat(init_state.text.clone().join(&"\n".to_string()), "\n".to_string()), last_str) } - } +} } - } - ExprData::ExprReturn => v2_rt::concat( - v2_rt::concat( - "return Ok(".to_string(), - emit_typed_expr( - return_value(body.clone()), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ), - ), - ")".to_string(), - ), - _ => v2_rt::concat( - v2_rt::concat( - "Ok(".to_string(), - emit_typed_expr( - body.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ), - ), - ")".to_string(), - ), - } +}, + ExprData::ExprReturn => v2_rt::concat(v2_rt::concat("return Ok(".to_string(), emit_typed_expr(return_value(body.clone()), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024)), ")".to_string()), + _ => v2_rt::concat(v2_rt::concat("Ok(".to_string(), emit_typed_expr(body.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024)), ")".to_string()), +} +} }) } -pub fn emit_tco_params( - params: Rc>>, - shared_types: Rc>, - source_indices: Rc>>, -) -> String { +pub fn emit_tco_params(params: Rc>>, shared_types: Rc>, source_indices: Rc>>) -> String { { - let strs = Rc::new({ - let mut __result = Vec::new(); - for p in params.iter().cloned() { - __result.push(emit_tco_param(&p, shared_types.clone(), &source_indices)); - } - __result - }); - strs.join(&", ".to_string()) - } + let strs = Rc::new({ let mut __result = Vec::new(); for p in params.iter().cloned() { __result.push(emit_tco_param(&p, shared_types.clone(), &source_indices)); } __result }); +strs.join(&", ".to_string()) +} } -pub fn emit_tco_param( - param: &Rc, - shared_types: Rc>, - source_indices: &Rc>>, -) -> String { +pub fn emit_tco_param(param: &Rc, shared_types: Rc>, source_indices: &Rc>>) -> String { { let n = param_node_type_expr(¶m); - let ty = emit_rust_param_type(&n, &shared_types, &source_indices); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "mut ".to_string(), - emit_ident( - param_node_name_at(param.clone(), source_indices.clone()), - RenderTarget::Rust, - ), - ), - rust_items().param_type_sep.clone(), - ), - ty, - ) - } +let ty = emit_rust_param_type(&n, &shared_types, &source_indices); +v2_rt::concat(v2_rt::concat(v2_rt::concat("mut ".to_string(), emit_ident(param_node_name_at(param.clone(), source_indices.clone()), RenderTarget::Rust)), rust_items().param_type_sep.clone()), ty) +} } -pub fn emit_func_params( - params: Rc>>, - uses: Rc>>, - service_names: Rc>, - shared_types: Rc>, - source_indices: Rc>>, - read_only_params: Rc>, -) -> String { - { - let param_strs = Rc::new({ - let mut __result = Vec::new(); - for p in params.iter().cloned() { - __result.push(emit_param( - &p, - shared_types.clone(), - &source_indices, - read_only_params.clone(), - )); - } - __result - }); - let resource_strs = Rc::new({ - let mut __result = Vec::new(); - for u in uses.iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - emit_ident( - resource_use_name_at(u.clone(), source_indices.clone()), - RenderTarget::Rust, - ), - ": &".to_string(), - ), - render_rust_type( - resource_use_resource(&u), - shared_types.clone(), - source_indices.clone(), - ), - )); - } - __result - }); - let service_strs = Rc::new({ - let mut __result = Vec::new(); - for sn in service_names.iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat(service_var_name(sn.clone()), ": &".to_string()), - sanitize_service_name(sn.clone()), - )); - } - __result - }); - let all_params = v2_rt::concat(v2_rt::concat(param_strs, resource_strs), service_strs); - all_params.join(&", ".to_string()) - } +pub fn emit_func_params(params: Rc>>, uses: Rc>>, service_names: Rc>, shared_types: Rc>, source_indices: Rc>>, read_only_params: Rc>) -> String { + { + let param_strs = Rc::new({ let mut __result = Vec::new(); for p in params.iter().cloned() { __result.push(emit_param(&p, shared_types.clone(), &source_indices, read_only_params.clone())); } __result }); +let resource_strs = Rc::new({ let mut __result = Vec::new(); for u in uses.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(emit_ident(resource_use_name_at(u.clone(), source_indices.clone()), RenderTarget::Rust), ": &".to_string()), render_rust_type(resource_use_resource(&u), shared_types.clone(), source_indices.clone()))); } __result }); +let service_strs = Rc::new({ let mut __result = Vec::new(); for sn in service_names.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(service_var_name(sn.clone()), ": &".to_string()), sanitize_service_name(sn.clone()))); } __result }); +let all_params = v2_rt::concat(v2_rt::concat(param_strs, resource_strs), service_strs); +all_params.join(&", ".to_string()) +} } -pub fn emit_func_inferred( - inferred: Rc, - shared_types: Rc>, - source_indices: Rc>>, -) -> String { - v2_rt::concat( - v2_rt::concat( - " -> Result<".to_string(), - render_rust_type(inferred, shared_types, source_indices), - ), - ", Box>".to_string(), - ) -} - -pub fn emit_params( - params: Rc>>, - shared_types: Rc>, - source_indices: Rc>>, - read_only_params: Rc>, -) -> String { - { - let strs = Rc::new({ - let mut __result = Vec::new(); - for p in params.iter().cloned() { - __result.push(emit_param( - &p, - shared_types.clone(), - &source_indices, - read_only_params.clone(), - )); - } - __result - }); - strs.join(&", ".to_string()) - } +pub fn emit_func_inferred(inferred: Rc, shared_types: Rc>, source_indices: Rc>>) -> String { + v2_rt::concat(v2_rt::concat(" -> Result<".to_string(), render_rust_type(inferred, shared_types, source_indices)), ", Box>".to_string()) +} + +pub fn emit_params(params: Rc>>, shared_types: Rc>, source_indices: Rc>>, read_only_params: Rc>) -> String { + { + let strs = Rc::new({ let mut __result = Vec::new(); for p in params.iter().cloned() { __result.push(emit_param(&p, shared_types.clone(), &source_indices, read_only_params.clone())); } __result }); +strs.join(&", ".to_string()) +} } -pub fn emit_rust_param_type( - n: &Rc, - shared_types: &Rc>, - source_indices: &Rc>>, -) -> String { +pub fn emit_rust_param_type(n: &Rc, shared_types: &Rc>, source_indices: &Rc>>) -> String { if ((n.params.clone().len() as i64) > 0) { { - let param_types = Rc::new({ - let mut __result = Vec::new(); - for p in n.params.clone().iter().cloned() { - __result.push(render_rust_type( - param_node_type_expr(&p), - shared_types.clone(), - source_indices.clone(), - )); - } - __result - }); - let param_str = param_types.join(&", ".to_string()); - let ret_str = match n.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - render_rust_type(rt.clone(), shared_types.clone(), source_indices.clone()) - } - _ => "()".to_string(), - }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("impl Fn(".to_string(), param_str), - ") -> ".to_string(), - ), - ret_str, - ), - " + Clone".to_string(), - ) - } + let param_types = Rc::new({ let mut __result = Vec::new(); for p in n.params.clone().iter().cloned() { __result.push(render_rust_type(param_node_type_expr(&p), shared_types.clone(), source_indices.clone())); } __result }); +let param_str = param_types.join(&", ".to_string()); +let ret_str = match n.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => render_rust_type(rt.clone(), shared_types.clone(), source_indices.clone()), + _ => "()".to_string(), +}; +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("impl Fn(".to_string(), param_str), ") -> ".to_string()), ret_str), " + Clone".to_string()) +} } else { render_rust_type(n.clone(), shared_types.clone(), source_indices.clone()) } } -pub fn emit_param( - param: &Rc, - shared_types: Rc>, - source_indices: &Rc>>, - read_only_params: Rc>, -) -> String { +pub fn emit_param(param: &Rc, shared_types: Rc>, source_indices: &Rc>>, read_only_params: Rc>) -> String { { let n = param_node_type_expr(¶m); - let ty = emit_rust_param_type(&n, &shared_types, &source_indices); - let pname = param_node_name_at(param.clone(), source_indices.clone()); - let is_callable_param = ((n.params.clone().len() as i64) > 0); - let is_borrowable = ((v2_rt::map_contains_key(&read_only_params, pname.clone()) - && (is_callable_param == false)) - && needs_reference_node(&n, source_indices.clone())); - let final_ty = if is_borrowable { - apply_type_template1( - sharing_for_target(RenderTarget::Rust) - .borrow_param_template - .clone(), - ty, - ) +let ty = emit_rust_param_type(&n, &shared_types, &source_indices); +let pname = param_node_name_at(param.clone(), source_indices.clone()); +let is_callable_param = ((n.params.clone().len() as i64) > 0); +let is_borrowable = ((set_contains(read_only_params, pname.clone()) && (is_callable_param == false)) && needs_reference_node(&n, source_indices.clone())); +let final_ty = if is_borrowable { + apply_type_template1(sharing_for_target(RenderTarget::Rust).borrow_param_template.clone(), ty) } else { ty }; - v2_rt::concat( - v2_rt::concat( - emit_ident(pname.clone(), RenderTarget::Rust), - rust_items().param_type_sep.clone(), - ), - final_ty, - ) - } +v2_rt::concat(v2_rt::concat(emit_ident(pname.clone(), RenderTarget::Rust), rust_items().param_type_sep.clone()), final_ty) +} } -pub fn emit_inferred( - inferred: Rc, - shared_types: Rc>, - source_indices: Rc>>, -) -> String { - v2_rt::concat( - rust_items().return_arrow.clone(), - render_rust_type(inferred, shared_types, source_indices), - ) +pub fn emit_inferred(inferred: Rc, shared_types: Rc>, source_indices: Rc>>) -> String { + v2_rt::concat(rust_items().return_arrow.clone(), render_rust_type(inferred, shared_types, source_indices)) } -pub fn needs_reference_node( - n: &Rc, - source_indices: Rc>>, -) -> bool { - if ((n.connective.clone() != Connective::NoConnective) - || ((n.children.clone().len() as i64) > 0)) - { +pub fn needs_reference_node(n: &Rc, source_indices: Rc>>) -> bool { + if ((n.connective.clone() != Connective::NoConnective) || ((n.children.clone().len() as i64) > 0)) { true } else { { - let is_copy = (is_rust_value_type(n.clone(), source_indices) - || (is_product_type(n.clone()) && ((n.children.clone().len() as i64) == 0))); - (is_copy == false) - } + let is_copy = (is_rust_value_type(n.clone(), source_indices) || (is_product_type(n.clone()) && ((n.children.clone().len() as i64) == 0))); +(is_copy == false) +} } } pub fn is_string_lit_pattern(p: Rc) -> bool { match (*p).clone() { - MatchPattern::LitPattern { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitStr { .. } => true, - _ => false, - }, - _ => false, - } + MatchPattern::LitPattern { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitStr { .. } => true, + _ => false, +}, + _ => false, +} } -pub fn collect_pattern_string_guards( - mut pattern: Rc, - mut source_indices: Rc>>, -) -> String { +pub fn collect_pattern_string_guards(mut pattern: Rc, mut source_indices: Rc>>) -> String { loop { match (*pattern).clone() { - MatchPattern::VariantPattern { - name: n, - field_bindings: fbs, - .. - } => { - if ((n.clone().as_str() == "Some".to_string().as_str()) - && ((fbs.clone().len() as i64) == 1)) + MatchPattern::VariantPattern { name: n, field_bindings: fbs, .. } => { if ((n.clone().as_str() == "Some".to_string().as_str()) && ((fbs.clone().len() as i64) == 1)) { + match fbs.clone().first().cloned() { + Some(fb) => { let fb_pat = field_binding_pattern(fb.clone()); +if is_string_lit_pattern(fb_pat.clone()) { + match (*fb_pat.clone()).clone() { + MatchPattern::LitPattern { ref value, .. } => { let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { unreachable!() }; break v2_rt::concat("__some_val == ".to_string(), emit_string_literal(s.clone(), "".to_string())); }, + _ => { break "".to_string(); }, +} +} else { { - match fbs.clone().first().cloned() { - Some(fb) => { - let fb_pat = field_binding_pattern(fb.clone()); - if is_string_lit_pattern(fb_pat.clone()) { - match (*fb_pat.clone()).clone() { - MatchPattern::LitPattern { ref value, .. } => { - let LiteralValue::LitStr { value: s, .. } = value.as_ref() - else { - unreachable!() - }; - break v2_rt::concat( - "__some_val == ".to_string(), - emit_string_literal(s.clone(), "".to_string()), - ); - } - _ => { - break "".to_string(); - } - } - } else { - { - let __tco_0 = fb_pat.clone(); - pattern = __tco_0; - continue; - } - } - } - None => { - break "".to_string(); - } - } - } else { - let str_bindings = Rc::new({ - let mut __result = Vec::new(); - for fb in fbs.clone().iter().cloned() { - if is_string_lit_pattern(field_binding_pattern(fb.clone())) { - __result.push(fb); - } - } - __result - }); - let guards = Rc::new({ - let mut __result = Vec::new(); - for fb in str_bindings.iter().cloned() { - __result.push(match (*field_binding_pattern(fb.clone())).clone() { - MatchPattern::LitPattern { ref value, .. } => { - let LiteralValue::LitStr { value: s, .. } = value.as_ref() - else { - unreachable!() - }; - v2_rt::concat( - v2_rt::concat( - emit_ident( - field_binding_name_at( - fb.clone(), - source_indices.clone(), - ), - RenderTarget::Rust, - ), - " == ".to_string(), - ), - emit_string_literal(s.clone(), "".to_string()), - ) - } - _ => "".to_string(), - }); - } - __result - }); - break guards.join(&" && ".to_string()); - } - } - _ => { - break "".to_string(); - } - } - } + let __tco_0 = fb_pat.clone(); +pattern = __tco_0; +continue; +} +} }, + None => { break "".to_string(); }, +} +} else { + let str_bindings = Rc::new({ let mut __result = Vec::new(); for fb in fbs.clone().iter().cloned() { if is_string_lit_pattern(field_binding_pattern(fb.clone())) { __result.push(fb); } } __result }); +let guards = Rc::new({ let mut __result = Vec::new(); for fb in str_bindings.iter().cloned() { __result.push(match (*field_binding_pattern(fb.clone())).clone() { + MatchPattern::LitPattern { ref value, .. } => { let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { unreachable!() }; v2_rt::concat(v2_rt::concat(emit_ident(field_binding_name_at(fb.clone(), source_indices.clone()), RenderTarget::Rust), " == ".to_string()), emit_string_literal(s.clone(), "".to_string())) }, + _ => "".to_string(), +}); } __result }); +break guards.join(&" && ".to_string()); +} }, + _ => { break "".to_string(); }, +} +} } pub fn all_arms_are_string_lit(arms: &Rc>>) -> bool { - ({ - let mut __all = true; - for arm in arms.clone().iter().cloned() { - if !(match (*arm_pattern(arm.clone())).clone() { - MatchPattern::LitPattern { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitStr { .. } => true, - _ => false, - }, - MatchPattern::Wildcard => true, - _ => false, - }) { - __all = false; - break; - } - } - __all - } && ((arms.clone().len() as i64) > 0)) + ({ let mut __all = true; for arm in arms.clone().iter().cloned() { if !(match (*arm_pattern(arm.clone())).clone() { + MatchPattern::LitPattern { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitStr { .. } => true, + _ => false, +}, + MatchPattern::Wildcard => true, + _ => false, +}) { __all = false; break; } } __all } && ((arms.clone().len() as i64) > 0)) } pub fn has_string_lit_with_bind(arms: &Rc>>) -> bool { { - let has_lit = { - let mut __found = false; - for arm in arms.clone().iter().cloned() { - if match (*arm_pattern(arm.clone())).clone() { - MatchPattern::LitPattern { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitStr { .. } => true, - _ => false, - }, - _ => false, - } { - __found = true; - break; - } - } - __found - }; - let has_bind = { - let mut __found = false; - for arm in arms.clone().iter().cloned() { - if match (*arm_pattern(arm.clone())).clone() { - MatchPattern::Bind { .. } => true, - _ => false, - } { - __found = true; - break; - } - } - __found - }; - (has_lit && has_bind) - } + let has_lit = { let mut __found = false; for arm in arms.clone().iter().cloned() { if match (*arm_pattern(arm.clone())).clone() { + MatchPattern::LitPattern { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitStr { .. } => true, + _ => false, +}, + _ => false, +} { __found = true; break; } } __found }; +let has_bind = { let mut __found = false; for arm in arms.clone().iter().cloned() { if match (*arm_pattern(arm.clone())).clone() { + MatchPattern::Bind { .. } => true, + _ => false, +} { __found = true; break; } } __found }; +(has_lit && has_bind) +} } -pub fn emit_pattern( - pattern: Rc, - shared_types: Rc>, - scrut_type: String, - source_indices: Rc>>, - emit_info: Rc, -) -> String { +pub fn emit_pattern(pattern: Rc, shared_types: Rc>, scrut_type: String, source_indices: Rc>>, emit_info: Rc) -> String { match (*pattern).clone() { - MatchPattern::Bind { name: n, .. } => emit_ident(n.clone(), RenderTarget::Rust), - MatchPattern::LitPattern { value: v, .. } => rust_literal_for_pattern(v.clone()), - MatchPattern::VariantPattern { - name: n, - parent_enum, - field_bindings: fbs, - .. - } => emit_variant_pattern( - &n, - parent_enum.clone(), - &fbs, - shared_types, - &scrut_type, - source_indices, - &emit_info, - ), - MatchPattern::Wildcard => "_".to_string(), - } + MatchPattern::Bind { name: n, .. } => emit_ident(n.clone(), RenderTarget::Rust), + MatchPattern::LitPattern { value: v, .. } => rust_literal_for_pattern(v.clone()), + MatchPattern::VariantPattern { name: n, parent_enum, field_bindings: fbs, .. } => emit_variant_pattern(&n, parent_enum.clone(), &fbs, shared_types, &scrut_type, &source_indices, &emit_info), + MatchPattern::Wildcard => "_".to_string(), +} } -pub fn pattern_parent_enum( - name: &String, - parent_enum: Option, - scrut_type: &String, - type_summaries: Rc>>, -) -> Option { +pub fn pattern_parent_enum(name: &String, parent_enum: Option, scrut_type: &String, type_summaries: Rc>>) -> Option { { - let scrut_is_known_enum = ((scrut_type.clone().as_str() != "".to_string().as_str()) - && is_enum_type_name(scrut_type.clone(), type_summaries)); - if ((name.clone().as_str() == "Some".to_string().as_str()) - || (name.clone().as_str() == "None".to_string().as_str())) - { + let scrut_is_known_enum = ((scrut_type.clone().as_str() != "".to_string().as_str()) && is_enum_type_name(scrut_type.clone(), type_summaries)); +if ((name.clone().as_str() == "Some".to_string().as_str()) || (name.clone().as_str() == "None".to_string().as_str())) { None } else { if scrut_is_known_enum { @@ -4792,201 +2034,161 @@ pub fn pattern_parent_enum( parent_enum } } - } +} } -pub fn emit_variant_pattern( - name: &String, - parent_enum: Option, - field_bindings: &Rc>>, - shared_types: Rc>, - scrut_type: &String, - source_indices: Rc>>, - emit_info: &Rc, -) -> String { +pub fn emit_variant_pattern(name: &String, parent_enum: Option, field_bindings: &Rc>>, shared_types: Rc>, scrut_type: &String, source_indices: &Rc>>, emit_info: &Rc) -> String { { - let resolved_parent = if ((name.clone().as_str() == "Some".to_string().as_str()) - || (name.clone().as_str() == "None".to_string().as_str())) - { + let resolved_parent = if ((name.clone().as_str() == "Some".to_string().as_str()) || (name.clone().as_str() == "None".to_string().as_str())) { None } else { - pattern_parent_enum( - &name, - parent_enum, - &scrut_type, - emit_info.type_summaries.clone(), - ) - }; - let qualified = match resolved_parent.clone() { - Some(parent) => v2_rt::concat( - v2_rt::concat(parent.clone(), "::".to_string()), - name.clone(), - ), - None => name.clone(), + pattern_parent_enum(&name, parent_enum, &scrut_type, emit_info.type_summaries.clone()) }; - if ((name.clone().as_str() == "Some".to_string().as_str()) - && ((field_bindings.clone().len() as i64) == 1)) - { +let qualified = match resolved_parent.clone() { + Some(parent) => v2_rt::concat(v2_rt::concat(parent.clone(), "::".to_string()), name.clone()), + None => name.clone(), +}; +if ((name.clone().as_str() == "Some".to_string().as_str()) && ((field_bindings.clone().len() as i64) == 1)) { match field_bindings.clone().first().cloned() { - Some(fb) => { - let fb_pat = field_binding_pattern(fb.clone()); - if is_string_lit_pattern(fb_pat.clone()) { - "Some(ref __some_val)".to_string() - } else { - { - let inner_pat = emit_pattern( - fb_pat.clone(), - shared_types.clone(), - scrut_type.clone(), - source_indices.clone(), - emit_info.clone(), - ); - v2_rt::concat( - v2_rt::concat("Some(".to_string(), inner_pat), - ")".to_string(), - ) - } - } + Some(fb) => { + let fb_pat = field_binding_pattern(fb.clone()); +if is_string_lit_pattern(fb_pat.clone()) { + "Some(ref __some_val)".to_string() + } else { + { + let inner_pat = emit_pattern(fb_pat.clone(), shared_types.clone(), scrut_type.clone(), source_indices.clone(), emit_info.clone()); +v2_rt::concat(v2_rt::concat("Some(".to_string(), inner_pat), ")".to_string()) +} } - None => qualified.clone(), - } +}, + None => qualified.clone(), +} } else { if ((field_bindings.clone().len() as i64) == 0) { { let fielded_key = match resolved_parent.clone() { - Some(parent) => v2_rt::concat( - v2_rt::concat(parent.clone(), "::".to_string()), - name.clone(), - ), - None => name.clone(), - }; - let is_fielded = - match v2_rt::map_get(&emit_info.fielded_variants.clone(), fielded_key) { - Some(true) => true, - _ => match v2_rt::map_get( - &emit_info.fielded_variants.clone(), - qualified.clone(), - ) { - Some(true) => true, - _ => false, - }, - }; - if is_fielded { - v2_rt::concat(qualified.clone(), " { .. }".to_string()) + Some(parent) => v2_rt::concat(v2_rt::concat(parent.clone(), "::".to_string()), name.clone()), + None => name.clone(), +}; +let is_untagged_tuple = (set_contains(emit_info.untagged_json_tuple_variants.clone(), fielded_key.clone()) || set_contains(emit_info.untagged_json_tuple_variants.clone(), qualified.clone())); +if is_untagged_tuple { + v2_rt::concat(qualified.clone(), "(..)".to_string()) } else { - qualified.clone() + { + let is_fielded = match v2_rt::map_get(&emit_info.fielded_variants.clone(), fielded_key.clone()) { + Some(true) => true, + _ => match v2_rt::map_get(&emit_info.fielded_variants.clone(), qualified.clone()) { + Some(true) => true, + _ => false, +}, +}; +if is_fielded { + v2_rt::concat(qualified.clone(), " { .. }".to_string()) + } else { + qualified.clone() + } +} } - } +} } else { { - let effective_bindings = Rc::new({ - let mut __result = Vec::new(); - for fb in field_bindings.clone().iter().cloned() { - if match (*field_binding_pattern(fb.clone())).clone() { - MatchPattern::Wildcard => false, - _ => true, - } { - __result.push(fb); - } - } - __result - }); - if ((effective_bindings.clone().len() as i64) == 0) { + let effective_bindings = Rc::new({ let mut __result = Vec::new(); for fb in field_bindings.clone().iter().cloned() { if match (*field_binding_pattern(fb.clone())).clone() { + MatchPattern::Wildcard => false, + _ => true, +} { __result.push(fb); } } __result }); +if ((effective_bindings.clone().len() as i64) == 0) { { let fielded_key2 = match resolved_parent.clone() { - Some(parent) => v2_rt::concat( - v2_rt::concat(parent.clone(), "::".to_string()), - name.clone(), - ), - None => name.clone(), - }; - let is_fielded2 = match v2_rt::map_get( - &emit_info.fielded_variants.clone(), - fielded_key2, - ) { - Some(true) => true, - _ => match v2_rt::map_get( - &emit_info.fielded_variants.clone(), - qualified.clone(), - ) { - Some(true) => true, - _ => false, - }, - }; - if is_fielded2 { - v2_rt::concat(qualified.clone(), " { .. }".to_string()) + Some(parent) => v2_rt::concat(v2_rt::concat(parent.clone(), "::".to_string()), name.clone()), + None => name.clone(), +}; +let is_untagged_tuple2 = (set_contains(emit_info.untagged_json_tuple_variants.clone(), fielded_key2.clone()) || set_contains(emit_info.untagged_json_tuple_variants.clone(), qualified.clone())); +if is_untagged_tuple2 { + v2_rt::concat(qualified.clone(), "(..)".to_string()) } else { - qualified.clone() + { + let is_fielded2 = match v2_rt::map_get(&emit_info.fielded_variants.clone(), fielded_key2.clone()) { + Some(true) => true, + _ => match v2_rt::map_get(&emit_info.fielded_variants.clone(), qualified.clone()) { + Some(true) => true, + _ => false, +}, +}; +if is_fielded2 { + v2_rt::concat(qualified.clone(), " { .. }".to_string()) + } else { + qualified.clone() + } +} } - } +} } else { { - let binding_strs = Rc::new({ - let mut __result = Vec::new(); - for fb in effective_bindings.clone().iter().cloned() { - __result.push({ - let fb_name = field_binding_name_at( - fb.clone(), - source_indices.clone(), - ); - let fb_pat = field_binding_pattern(fb.clone()); - if is_string_lit_pattern(fb_pat.clone()) { - v2_rt::concat( - "ref ".to_string(), - emit_ident(fb_name.clone(), RenderTarget::Rust), - ) + let tuple_key = match resolved_parent.clone() { + Some(parent) => v2_rt::concat(v2_rt::concat(parent.clone(), "::".to_string()), name.clone()), + None => qualified.clone(), +}; +let is_untagged_tuple3 = (set_contains(emit_info.untagged_json_tuple_variants.clone(), tuple_key) || set_contains(emit_info.untagged_json_tuple_variants.clone(), qualified.clone())); +if (is_untagged_tuple3 && ((effective_bindings.clone().len() as i64) == 1)) { + match effective_bindings.clone().first().cloned() { + Some(fb) => { + let fb_name = field_binding_name_at(fb.clone(), source_indices.clone()); +let fb_pat = field_binding_pattern(fb.clone()); +if is_string_lit_pattern(fb_pat.clone()) { + v2_rt::concat(v2_rt::concat(v2_rt::concat(qualified.clone(), "(ref ".to_string()), emit_ident(fb_name.clone(), RenderTarget::Rust)), ")".to_string()) + } else { + { + let is_shorthand = match (*fb_pat.clone()).clone() { + MatchPattern::Bind { name: n, .. } => (n.clone().as_str() == fb_name.clone().as_str()), + _ => false, +}; +if is_shorthand.clone() { + v2_rt::concat(v2_rt::concat(v2_rt::concat(qualified.clone(), "(".to_string()), emit_ident(fb_name.clone(), RenderTarget::Rust)), ")".to_string()) + } else { + { + let pat_str = emit_pattern(fb_pat.clone(), shared_types.clone(), "".to_string(), source_indices.clone(), emit_info.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(qualified.clone(), "(".to_string()), pat_str.clone()), ")".to_string()) +} + } +} + } +}, + None => v2_rt::concat(qualified.clone(), " { .. }".to_string()), +} + } else { + { + let binding_strs = Rc::new({ let mut __result = Vec::new(); for fb in effective_bindings.clone().iter().cloned() { __result.push({ + let fb_name = field_binding_name_at(fb.clone(), source_indices.clone()); +let fb_pat = field_binding_pattern(fb.clone()); +if is_string_lit_pattern(fb_pat.clone()) { + v2_rt::concat("ref ".to_string(), emit_ident(fb_name.clone(), RenderTarget::Rust)) } else { { let is_shorthand = match (*fb_pat.clone()).clone() { - MatchPattern::Bind { name: n, .. } => { - (n.clone().as_str() - == fb_name.clone().as_str()) - } - _ => false, - }; - if is_shorthand.clone() { + MatchPattern::Bind { name: n, .. } => (n.clone().as_str() == fb_name.clone().as_str()), + _ => false, +}; +if is_shorthand.clone() { emit_ident(fb_name.clone(), RenderTarget::Rust) } else { { - let pat_str = emit_pattern( - fb_pat.clone(), - shared_types.clone(), - "".to_string(), - source_indices.clone(), - emit_info.clone(), - ); - v2_rt::concat( - v2_rt::concat( - emit_ident( - fb_name.clone(), - RenderTarget::Rust, - ), - ": ".to_string(), - ), - pat_str.clone(), - ) - } + let pat_str = emit_pattern(fb_pat.clone(), shared_types.clone(), "".to_string(), source_indices.clone(), emit_info.clone()); +v2_rt::concat(v2_rt::concat(emit_ident(fb_name.clone(), RenderTarget::Rust), ": ".to_string()), pat_str.clone()) +} } - } +} } - }); - } - __result - }); - let bindings_str = binding_strs.join(&", ".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(qualified.clone(), " { ".to_string()), - bindings_str, - ), - ", .. }".to_string(), - ) - } +}); } __result }); +let bindings_str = binding_strs.join(&", ".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(qualified.clone(), " { ".to_string()), bindings_str), ", .. }".to_string()) +} + } +} } - } +} } } - } +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -5005,574 +2207,323 @@ pub struct RcMatchAnalysis { pub fn empty_rc_pattern_analysis() -> Rc { Rc::new(RcPatternAnalysis { - matches_rc_variant: false, - matches_option_rc_variant: false, - needs_rc_pattern: false, - ref_bound_fields: Rc::new(vec![]), - }) + matches_rc_variant: false, + matches_option_rc_variant: false, + needs_rc_pattern: false, + ref_bound_fields: Rc::new(vec![]), +}) } pub fn field_needs_rc_ref(field_name: String, rc_analysis: Rc) -> bool { - { - let mut __found = false; - for name in rc_analysis.ref_bound_fields.clone().iter().cloned() { - if (name.clone().as_str() == field_name.clone().as_str()) { - __found = true; - break; - } - } - __found - } + { let mut __found = false; for name in rc_analysis.ref_bound_fields.clone().iter().cloned() { if (name.clone().as_str() == field_name.clone().as_str()) { __found = true; break; } } __found } } -pub fn analyze_rc_pattern( - pattern: Rc, - scrut_type: String, - shared_types: &Rc>, - emit_info: &Rc, - source_indices: Rc>>, -) -> Rc { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*pattern).clone() { - MatchPattern::VariantPattern { - name: n, - parent_enum, - field_bindings: fbs, - .. - } => { - if ((n.clone().as_str() == "Some".to_string().as_str()) - || (n.clone().as_str() == "None".to_string().as_str())) - { - if ((fbs.clone().len() as i64) == 1) { - match fbs.clone().first().cloned() { - Some(fb) => { - let inner = analyze_rc_pattern( - field_binding_pattern(fb.clone()), - "".to_string(), - &shared_types, - &emit_info, - source_indices.clone(), - ); - Rc::new(RcPatternAnalysis { - matches_rc_variant: false, - matches_option_rc_variant: ((n.clone().as_str() - == "Some".to_string().as_str()) - && inner.matches_rc_variant.clone()), - needs_rc_pattern: inner.needs_rc_pattern.clone(), - ref_bound_fields: Rc::new(vec![]), - }) - } - None => empty_rc_pattern_analysis(), - } - } else { - empty_rc_pattern_analysis() - } +pub fn analyze_rc_pattern(pattern: Rc, scrut_type: String, shared_types: &Rc>, emit_info: &Rc, source_indices: Rc>>) -> Rc { + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { + match (*pattern).clone() { + MatchPattern::VariantPattern { name: n, parent_enum, field_bindings: fbs, .. } => if ((n.clone().as_str() == "Some".to_string().as_str()) || (n.clone().as_str() == "None".to_string().as_str())) { + if ((fbs.clone().len() as i64) == 1) { + match fbs.clone().first().cloned() { + Some(fb) => { + let inner = analyze_rc_pattern(field_binding_pattern(fb.clone()), "".to_string(), &shared_types, &emit_info, source_indices.clone()); +Rc::new(RcPatternAnalysis { + matches_rc_variant: false, + matches_option_rc_variant: ((n.clone().as_str() == "Some".to_string().as_str()) && inner.matches_rc_variant.clone()), + needs_rc_pattern: inner.needs_rc_pattern.clone(), + ref_bound_fields: Rc::new(vec![]), +}) +}, + None => empty_rc_pattern_analysis(), +} } else { - { - let matches_rc_variant = match pattern_parent_enum( - &n, - parent_enum.clone(), - &scrut_type, - emit_info.type_summaries.clone(), - ) { - Some(enum_name) => emit_map_has(shared_types.clone(), enum_name.clone()), - None => false, - }; - let ref_bound_fields = Rc::new({ - let mut __result = Vec::new(); - for fb in fbs.clone().iter().cloned() { - __result.extend( - (*if analyze_rc_pattern( - field_binding_pattern(fb.clone()), - "".to_string(), - &shared_types, - &emit_info, - source_indices.clone(), - ) - .matches_rc_variant - .clone() - { - Rc::new(vec![field_binding_name_at( - fb.clone(), - source_indices.clone(), - )]) - } else { - Rc::new(vec![]) - }) - .iter() - .cloned(), - ); - } - __result - }); - Rc::new(RcPatternAnalysis { - matches_rc_variant: matches_rc_variant, - matches_option_rc_variant: false, - needs_rc_pattern: ((ref_bound_fields.clone().len() as i64) > 0), - ref_bound_fields: ref_bound_fields.clone(), - }) - } + empty_rc_pattern_analysis() } - } - _ => empty_rc_pattern_analysis(), + } else { + { + let matches_rc_variant = match pattern_parent_enum(&n, parent_enum.clone(), &scrut_type, emit_info.type_summaries.clone()) { + Some(enum_name) => set_contains(shared_types.clone(), enum_name.clone()), + None => false, +}; +let ref_bound_fields = Rc::new({ let mut __result = Vec::new(); for fb in fbs.clone().iter().cloned() { __result.extend((*if analyze_rc_pattern(field_binding_pattern(fb.clone()), "".to_string(), &shared_types, &emit_info, source_indices.clone()).matches_rc_variant.clone() { + Rc::new(vec![field_binding_name_at(fb.clone(), source_indices.clone())]) + } else { + Rc::new(vec![]) + }).iter().cloned()); } __result }); +Rc::new(RcPatternAnalysis { + matches_rc_variant: matches_rc_variant, + matches_option_rc_variant: false, + needs_rc_pattern: ((ref_bound_fields.clone().len() as i64) > 0), + ref_bound_fields: ref_bound_fields.clone(), +}) +} + }, + _ => empty_rc_pattern_analysis(), +} }) } -pub fn analyze_rc_match( - scrutinee: &Rc, - arms: Rc>>, - scrut_type: String, - shared_types: &Rc>, - emit_info: Rc, - source_indices: &Rc>>, -) -> RcMatchAnalysis { - { - let arm_analyses = Rc::new({ - let mut __result = Vec::new(); - for arm in arms.iter().cloned() { - __result.push(analyze_rc_pattern( - arm_pattern(arm.clone()), - scrut_type.clone(), - &shared_types, - &emit_info, - source_indices.clone(), - )); - } - __result - }); - let scrutinee_is_optional = match scrutinee.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - (rt.return_cardinality.clone() == Cardinality::CardOptional) - } - _ => false, - }; - let scrutinee_is_rc_wrapped = match scrutinee.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - if (((rt.children.clone().len() as i64) == 0) && (rt.ident_span.clone() != None)) { - emit_map_has( - shared_types.clone(), - authored_name_at(source_indices.clone(), &rt), - ) - } else { - false - } - } - _ => false, - }; - let arms_want_option = { - let mut __found = false; - for a in arm_analyses.clone().iter().cloned() { - if a.matches_option_rc_variant.clone() { - __found = true; - break; - } - } - __found - }; - let arms_want_deref = { - let mut __found = false; - for a in arm_analyses.clone().iter().cloned() { - if a.matches_rc_variant.clone() { - __found = true; - break; - } - } - __found - }; - RcMatchAnalysis { - needs_option_deref: arms_want_option, - needs_deref: if scrutinee_is_optional { - false - } else { - (scrutinee_is_rc_wrapped || arms_want_deref) - }, - } - } +pub fn analyze_rc_match(scrutinee: &Rc, arms: Rc>>, scrut_type: String, shared_types: &Rc>, emit_info: Rc, source_indices: &Rc>>) -> RcMatchAnalysis { + { + let arm_analyses = Rc::new({ let mut __result = Vec::new(); for arm in arms.iter().cloned() { __result.push(analyze_rc_pattern(arm_pattern(arm.clone()), scrut_type.clone(), &shared_types, &emit_info, source_indices.clone())); } __result }); +let scrutinee_is_optional = match scrutinee.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => (rt.return_cardinality.clone() == Cardinality::CardOptional), + _ => false, +}; +let scrutinee_is_rc_wrapped = match scrutinee.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => if (((rt.children.clone().len() as i64) == 0) && (rt.ident_span.clone() != None)) { + set_contains(shared_types.clone(), authored_name_at(source_indices.clone(), &rt)) + } else { + false + }, + _ => false, +}; +let arms_want_option = { let mut __found = false; for a in arm_analyses.clone().iter().cloned() { if a.matches_option_rc_variant.clone() { __found = true; break; } } __found }; +let arms_want_deref = { let mut __found = false; for a in arm_analyses.clone().iter().cloned() { if a.matches_rc_variant.clone() { __found = true; break; } } __found }; +RcMatchAnalysis { + needs_option_deref: arms_want_option, + needs_deref: if scrutinee_is_optional { + false + } else { + (scrutinee_is_rc_wrapped || arms_want_deref) + }, +} +} } -pub fn emit_pattern_rc_aware( - pattern: Rc, - rc_analysis: Rc, - shared_types: Rc>, - scrut_type: String, - source_indices: Rc>>, - emit_info: Rc, -) -> String { +pub fn emit_pattern_rc_aware(pattern: Rc, rc_analysis: Rc, shared_types: Rc>, scrut_type: String, source_indices: Rc>>, emit_info: Rc) -> String { match (*pattern).clone() { - MatchPattern::Bind { name: n, .. } => emit_ident(n.clone(), RenderTarget::Rust), - MatchPattern::LitPattern { value: v, .. } => rust_literal_for_pattern(v.clone()), - MatchPattern::VariantPattern { - name: n, - parent_enum, - field_bindings: fbs, - .. - } => emit_variant_pattern_rc_aware( - &n, - parent_enum.clone(), - &fbs, - rc_analysis, - &shared_types, - &scrut_type, - &source_indices, - &emit_info, - ), - MatchPattern::Wildcard => "_".to_string(), - } + MatchPattern::Bind { name: n, .. } => emit_ident(n.clone(), RenderTarget::Rust), + MatchPattern::LitPattern { value: v, .. } => rust_literal_for_pattern(v.clone()), + MatchPattern::VariantPattern { name: n, parent_enum, field_bindings: fbs, .. } => emit_variant_pattern_rc_aware(&n, parent_enum.clone(), &fbs, rc_analysis, &shared_types, &scrut_type, &source_indices, &emit_info), + MatchPattern::Wildcard => "_".to_string(), +} } -pub fn emit_variant_pattern_rc_aware( - name: &String, - parent_enum: Option, - field_bindings: &Rc>>, - rc_analysis: Rc, - shared_types: &Rc>, - scrut_type: &String, - source_indices: &Rc>>, - emit_info: &Rc, -) -> String { +pub fn emit_variant_pattern_rc_aware(name: &String, parent_enum: Option, field_bindings: &Rc>>, rc_analysis: Rc, shared_types: &Rc>, scrut_type: &String, source_indices: &Rc>>, emit_info: &Rc) -> String { { - let resolved_parent = if ((name.clone().as_str() == "Some".to_string().as_str()) - || (name.clone().as_str() == "None".to_string().as_str())) - { + let resolved_parent = if ((name.clone().as_str() == "Some".to_string().as_str()) || (name.clone().as_str() == "None".to_string().as_str())) { None } else { - pattern_parent_enum( - &name, - parent_enum, - &scrut_type, - emit_info.type_summaries.clone(), - ) + pattern_parent_enum(&name, parent_enum, &scrut_type, emit_info.type_summaries.clone()) }; - let qualified = match resolved_parent.clone() { - Some(parent) => v2_rt::concat( - v2_rt::concat(parent.clone(), "::".to_string()), - name.clone(), - ), - None => name.clone(), - }; - if ((name.clone().as_str() == "Some".to_string().as_str()) - && ((field_bindings.clone().len() as i64) == 1)) - { +let qualified = match resolved_parent.clone() { + Some(parent) => v2_rt::concat(v2_rt::concat(parent.clone(), "::".to_string()), name.clone()), + None => name.clone(), +}; +if ((name.clone().as_str() == "Some".to_string().as_str()) && ((field_bindings.clone().len() as i64) == 1)) { match field_bindings.clone().first().cloned() { - Some(fb) => { - let fb_pat = field_binding_pattern(fb.clone()); - if is_string_lit_pattern(fb_pat.clone()) { - "Some(ref __some_val)".to_string() - } else { - { - let inner_analysis = analyze_rc_pattern( - fb_pat.clone(), - scrut_type.clone(), - &shared_types, - &emit_info, - source_indices.clone(), - ); - let inner_pat = emit_pattern_rc_aware( - fb_pat.clone(), - inner_analysis.clone(), - shared_types.clone(), - scrut_type.clone(), - source_indices.clone(), - emit_info.clone(), - ); - v2_rt::concat( - v2_rt::concat("Some(".to_string(), inner_pat), - ")".to_string(), - ) - } - } + Some(fb) => { + let fb_pat = field_binding_pattern(fb.clone()); +if is_string_lit_pattern(fb_pat.clone()) { + "Some(ref __some_val)".to_string() + } else { + { + let inner_analysis = analyze_rc_pattern(fb_pat.clone(), scrut_type.clone(), &shared_types, &emit_info, source_indices.clone()); +let inner_pat = emit_pattern_rc_aware(fb_pat.clone(), inner_analysis.clone(), shared_types.clone(), scrut_type.clone(), source_indices.clone(), emit_info.clone()); +v2_rt::concat(v2_rt::concat("Some(".to_string(), inner_pat), ")".to_string()) +} } - None => qualified.clone(), - } - } else { +}, + None => qualified.clone(), +} + } else { if ((field_bindings.clone().len() as i64) == 0) { { let fielded_key = match resolved_parent.clone() { - Some(parent) => v2_rt::concat( - v2_rt::concat(parent.clone(), "::".to_string()), - name.clone(), - ), - None => name.clone(), - }; - let is_fielded = - match v2_rt::map_get(&emit_info.fielded_variants.clone(), fielded_key) { - Some(true) => true, - _ => match v2_rt::map_get( - &emit_info.fielded_variants.clone(), - qualified.clone(), - ) { - Some(true) => true, - _ => false, - }, - }; - if is_fielded { - v2_rt::concat(qualified.clone(), " { .. }".to_string()) + Some(parent) => v2_rt::concat(v2_rt::concat(parent.clone(), "::".to_string()), name.clone()), + None => name.clone(), +}; +let is_untagged_tuple = (set_contains(emit_info.untagged_json_tuple_variants.clone(), fielded_key.clone()) || set_contains(emit_info.untagged_json_tuple_variants.clone(), qualified.clone())); +if is_untagged_tuple { + v2_rt::concat(qualified.clone(), "(..)".to_string()) } else { - qualified.clone() + { + let is_fielded = match v2_rt::map_get(&emit_info.fielded_variants.clone(), fielded_key.clone()) { + Some(true) => true, + _ => match v2_rt::map_get(&emit_info.fielded_variants.clone(), qualified.clone()) { + Some(true) => true, + _ => false, +}, +}; +if is_fielded { + v2_rt::concat(qualified.clone(), " { .. }".to_string()) + } else { + qualified.clone() + } +} } - } +} } else { { - let effective_bindings = Rc::new({ - let mut __result = Vec::new(); - for fb in field_bindings.clone().iter().cloned() { - if match (*field_binding_pattern(fb.clone())).clone() { - MatchPattern::Wildcard => false, - _ => true, - } { - __result.push(fb); - } - } - __result - }); - if ((effective_bindings.clone().len() as i64) == 0) { + let effective_bindings = Rc::new({ let mut __result = Vec::new(); for fb in field_bindings.clone().iter().cloned() { if match (*field_binding_pattern(fb.clone())).clone() { + MatchPattern::Wildcard => false, + _ => true, +} { __result.push(fb); } } __result }); +if ((effective_bindings.clone().len() as i64) == 0) { { let fielded_key2 = match resolved_parent.clone() { - Some(parent) => v2_rt::concat( - v2_rt::concat(parent.clone(), "::".to_string()), - name.clone(), - ), - None => name.clone(), - }; - let is_fielded2 = match v2_rt::map_get( - &emit_info.fielded_variants.clone(), - fielded_key2, - ) { - Some(true) => true, - _ => match v2_rt::map_get( - &emit_info.fielded_variants.clone(), - qualified.clone(), - ) { - Some(true) => true, - _ => false, - }, - }; - if is_fielded2 { - v2_rt::concat(qualified.clone(), " { .. }".to_string()) + Some(parent) => v2_rt::concat(v2_rt::concat(parent.clone(), "::".to_string()), name.clone()), + None => name.clone(), +}; +let is_untagged_tuple2 = (set_contains(emit_info.untagged_json_tuple_variants.clone(), fielded_key2.clone()) || set_contains(emit_info.untagged_json_tuple_variants.clone(), qualified.clone())); +if is_untagged_tuple2 { + v2_rt::concat(qualified.clone(), "(..)".to_string()) } else { - qualified.clone() + { + let is_fielded2 = match v2_rt::map_get(&emit_info.fielded_variants.clone(), fielded_key2.clone()) { + Some(true) => true, + _ => match v2_rt::map_get(&emit_info.fielded_variants.clone(), qualified.clone()) { + Some(true) => true, + _ => false, +}, +}; +if is_fielded2 { + v2_rt::concat(qualified.clone(), " { .. }".to_string()) + } else { + qualified.clone() + } +} } - } +} } else { { - let binding_strs = Rc::new({ - let mut __result = Vec::new(); - for fb in effective_bindings.clone().iter().cloned() { - __result.push({ - let fb_name = field_binding_name_at( - fb.clone(), - source_indices.clone(), - ); - let fb_pat = field_binding_pattern(fb.clone()); - if is_string_lit_pattern(fb_pat.clone()) { - v2_rt::concat( - "ref ".to_string(), - emit_ident(fb_name.clone(), RenderTarget::Rust), - ) + let tuple_key = match resolved_parent.clone() { + Some(parent) => v2_rt::concat(v2_rt::concat(parent.clone(), "::".to_string()), name.clone()), + None => qualified.clone(), +}; +let is_untagged_tuple3 = (set_contains(emit_info.untagged_json_tuple_variants.clone(), tuple_key) || set_contains(emit_info.untagged_json_tuple_variants.clone(), qualified.clone())); +if (is_untagged_tuple3 && ((effective_bindings.clone().len() as i64) == 1)) { + match effective_bindings.clone().first().cloned() { + Some(fb) => { + let fb_name = field_binding_name_at(fb.clone(), source_indices.clone()); +let fb_pat = field_binding_pattern(fb.clone()); +if is_string_lit_pattern(fb_pat.clone()) { + v2_rt::concat(v2_rt::concat(v2_rt::concat(qualified.clone(), "(ref ".to_string()), emit_ident(fb_name.clone(), RenderTarget::Rust)), ")".to_string()) + } else { + if field_needs_rc_ref(fb_name.clone(), rc_analysis.clone()) { + v2_rt::concat(v2_rt::concat(v2_rt::concat(qualified.clone(), "(ref ".to_string()), emit_ident(fb_name.clone(), RenderTarget::Rust)), ")".to_string()) + } else { + { + let is_shorthand = match (*fb_pat.clone()).clone() { + MatchPattern::Bind { name: n, .. } => (n.clone().as_str() == fb_name.clone().as_str()), + _ => false, +}; +if is_shorthand.clone() { + v2_rt::concat(v2_rt::concat(v2_rt::concat(qualified.clone(), "(".to_string()), emit_ident(fb_name.clone(), RenderTarget::Rust)), ")".to_string()) + } else { + { + let inner_analysis = analyze_rc_pattern(fb_pat.clone(), "".to_string(), &shared_types, &emit_info, source_indices.clone()); +let pat_str = emit_pattern_rc_aware(fb_pat.clone(), inner_analysis.clone(), shared_types.clone(), "".to_string(), source_indices.clone(), emit_info.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(qualified.clone(), "(".to_string()), pat_str.clone()), ")".to_string()) +} + } +} + } + } +}, + None => v2_rt::concat(qualified.clone(), " { .. }".to_string()), +} + } else { + { + let binding_strs = Rc::new({ let mut __result = Vec::new(); for fb in effective_bindings.clone().iter().cloned() { __result.push({ + let fb_name = field_binding_name_at(fb.clone(), source_indices.clone()); +let fb_pat = field_binding_pattern(fb.clone()); +if is_string_lit_pattern(fb_pat.clone()) { + v2_rt::concat("ref ".to_string(), emit_ident(fb_name.clone(), RenderTarget::Rust)) } else { - if field_needs_rc_ref( - fb_name.clone(), - rc_analysis.clone(), - ) { - v2_rt::concat( - "ref ".to_string(), - emit_ident(fb_name.clone(), RenderTarget::Rust), - ) + if field_needs_rc_ref(fb_name.clone(), rc_analysis.clone()) { + v2_rt::concat("ref ".to_string(), emit_ident(fb_name.clone(), RenderTarget::Rust)) } else { { - let is_shorthand = match (*fb_pat.clone()) - .clone() - { - MatchPattern::Bind { name: n, .. } => { - (n.clone().as_str() - == fb_name.clone().as_str()) - } - _ => false, - }; - if is_shorthand.clone() { - emit_ident( - fb_name.clone(), - RenderTarget::Rust, - ) + let is_shorthand = match (*fb_pat.clone()).clone() { + MatchPattern::Bind { name: n, .. } => (n.clone().as_str() == fb_name.clone().as_str()), + _ => false, +}; +if is_shorthand.clone() { + emit_ident(fb_name.clone(), RenderTarget::Rust) } else { { - let inner_analysis = analyze_rc_pattern( - fb_pat.clone(), - "".to_string(), - &shared_types, - &emit_info, - source_indices.clone(), - ); - let pat_str = emit_pattern_rc_aware( - fb_pat.clone(), - inner_analysis.clone(), - shared_types.clone(), - "".to_string(), - source_indices.clone(), - emit_info.clone(), - ); - v2_rt::concat( - v2_rt::concat( - emit_ident( - fb_name.clone(), - RenderTarget::Rust, - ), - ": ".to_string(), - ), - pat_str.clone(), - ) - } + let inner_analysis = analyze_rc_pattern(fb_pat.clone(), "".to_string(), &shared_types, &emit_info, source_indices.clone()); +let pat_str = emit_pattern_rc_aware(fb_pat.clone(), inner_analysis.clone(), shared_types.clone(), "".to_string(), source_indices.clone(), emit_info.clone()); +v2_rt::concat(v2_rt::concat(emit_ident(fb_name.clone(), RenderTarget::Rust), ": ".to_string()), pat_str.clone()) +} } - } +} } } - }); - } - __result - }); - let bindings_str = binding_strs.join(&", ".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(qualified.clone(), " { ".to_string()), - bindings_str, - ), - ", .. }".to_string(), - ) - } +}); } __result }); +let bindings_str = binding_strs.join(&", ".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(qualified.clone(), " { ".to_string()), bindings_str), ", .. }".to_string()) +} + } +} } - } +} } } - } +} } -pub fn rc_pattern_preludes( - mut pattern: Rc, - mut rc_analysis: Rc, - mut shared_types: Rc>, - mut source_indices: Rc>>, - mut emit_info: Rc, -) -> String { +pub fn rc_pattern_preludes(mut pattern: Rc, mut rc_analysis: Rc, mut shared_types: Rc>, mut source_indices: Rc>>, mut emit_info: Rc) -> String { loop { match (*pattern).clone() { - MatchPattern::VariantPattern { - name: n, - field_bindings: fbs, - .. - } => { - if ((n.clone().as_str() == "Some".to_string().as_str()) - || (n.clone().as_str() == "None".to_string().as_str())) - { - if ((fbs.clone().len() as i64) == 1) { - match fbs.clone().first().cloned() { - Some(fb) => { - let fb_pat = field_binding_pattern(fb.clone()); - let inner_analysis = analyze_rc_pattern( - fb_pat.clone(), - "".to_string(), - &shared_types, - &emit_info, - source_indices.clone(), - ); - { - let __tco_0 = fb_pat.clone(); - let __tco_1 = inner_analysis; - pattern = __tco_0; - rc_analysis = __tco_1; - continue; - } - } - None => { - break "".to_string(); - } - } - } else { - break "".to_string(); - } - } else { - let preludes = Rc::new({ - let mut __result = Vec::new(); - for fb in fbs.clone().iter().cloned() { - __result.extend( - (*if field_needs_rc_ref( - field_binding_name_at(fb.clone(), source_indices.clone()), - rc_analysis.clone(), - ) { - Rc::new(vec![v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "let ".to_string(), - emit_pattern( - field_binding_pattern(fb.clone()), - shared_types.clone(), - "".to_string(), - source_indices.clone(), - emit_info.clone(), - ), - ), - " = ".to_string(), - ), - emit_ident( - field_binding_name_at( - fb.clone(), - source_indices.clone(), - ), - RenderTarget::Rust, - ), - ), - ".as_ref() else { unreachable!() };".to_string(), - )]) - } else { - Rc::new(vec![]) - }) - .iter() - .cloned(), - ); - } - __result - }); - break preludes.join(&" ".to_string()); - } - } - _ => { + MatchPattern::VariantPattern { name: n, field_bindings: fbs, .. } => { if ((n.clone().as_str() == "Some".to_string().as_str()) || (n.clone().as_str() == "None".to_string().as_str())) { + if ((fbs.clone().len() as i64) == 1) { + match fbs.clone().first().cloned() { + Some(fb) => { let fb_pat = field_binding_pattern(fb.clone()); +let inner_analysis = analyze_rc_pattern(fb_pat.clone(), "".to_string(), &shared_types, &emit_info, source_indices.clone()); +{ + let __tco_0 = fb_pat.clone(); +let __tco_1 = inner_analysis; +pattern = __tco_0; +rc_analysis = __tco_1; +continue; +} }, + None => { break "".to_string(); }, +} +} else { break "".to_string(); - } - } - } +} +} else { + let preludes = Rc::new({ let mut __result = Vec::new(); for fb in fbs.clone().iter().cloned() { __result.extend((*if field_needs_rc_ref(field_binding_name_at(fb.clone(), source_indices.clone()), rc_analysis.clone()) { + Rc::new(vec![v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let ".to_string(), emit_pattern(field_binding_pattern(fb.clone()), shared_types.clone(), "".to_string(), source_indices.clone(), emit_info.clone())), " = ".to_string()), emit_ident(field_binding_name_at(fb.clone(), source_indices.clone()), RenderTarget::Rust)), ".as_ref() else { unreachable!() };".to_string())]) + } else { + Rc::new(vec![]) + }).iter().cloned()); } __result }); +break preludes.join(&" ".to_string()); +} }, + _ => { break "".to_string(); }, +} +} } -pub fn explicit_record_struct_name( - type_name: Option, - inferred_node: &Rc, - shared_types: Rc>, - source_indices: Rc>>, -) -> Option { +pub fn explicit_record_struct_name(type_name: Option, inferred_node: &Rc, shared_types: Rc>, source_indices: Rc>>) -> Option { { let is_optional = (inferred_node.return_cardinality.clone() == Cardinality::CardOptional); - if is_optional { +if is_optional { { let result = type_name.clone(); - return result; - } +return result +} } - let has_structure = (inferred_node.connective.clone() != Connective::NoConnective); - let n = if ((inferred_node.type_annotation.clone() != None) && has_structure) { +let has_structure = (inferred_node.connective.clone() != Connective::NoConnective); +let n = if ((inferred_node.type_annotation.clone() != None) && has_structure) { match inferred_node.children.clone().first().cloned() { - Some(base) => base.clone(), - None => inferred_node.clone(), - } + Some(base) => base.clone(), + None => inferred_node.clone(), +} } else { inferred_node.clone() }; - let is_product = is_product_type(n.clone()); - let is_coproduct = is_coproduct_type(n.clone()); - let n_is_error = if (n.inferred.clone() != None) { +let is_product = is_product_type(n.clone()); +let is_coproduct = is_coproduct_type(n.clone()); +let n_is_error = if (n.inferred.clone() != None) { is_compiler_error(n.inferred.clone().clone().unwrap()) } else { false }; - let nname = authored_name_at(source_indices, &n); - if (nname.clone().as_str() == "__EmitTypeCacheMiss".to_string().as_str()) { +let nname = authored_name_at(source_indices, &n); +if (nname.clone().as_str() == "__EmitTypeCacheMiss".to_string().as_str()) { type_name.clone() } else { if n_is_error { @@ -5588,9 +2539,7 @@ pub fn explicit_record_struct_name( if is_coproduct { type_name.clone() } else { - if (((n.children.clone().len() as i64) == 0) - && (n.ident_span.clone() != None)) - { + if (((n.children.clone().len() as i64) == 0) && (n.ident_span.clone() != None)) { Some(nname.clone()) } else { type_name.clone() @@ -5599,502 +2548,293 @@ pub fn explicit_record_struct_name( } } } - } +} } -pub fn is_simple_type_node( - n: Rc, - source_indices: Rc>>, -) -> bool { +pub fn is_simple_type_node(n: Rc, source_indices: Rc>>) -> bool { is_rust_value_type(n, source_indices) } -pub fn variant_parent_from_binding_kind( - binding_kind: Option>, -) -> Option { +pub fn variant_parent_from_binding_kind(binding_kind: Option>) -> Option { match binding_kind.as_deref().cloned() { - Some(VarBindingKind::VariantValueBinding { parent_enum, .. }) => Some(parent_enum.clone()), - _ => None, - } + Some(VarBindingKind::VariantValueBinding { parent_enum, .. }) => Some(parent_enum.clone()), + _ => None, +} } pub fn apply_clone(expr: String) -> String { - apply_type_template1( - sharing_for_target(RenderTarget::Rust).clone_value.clone(), - expr, - ) + apply_type_template1(sharing_for_target(RenderTarget::Rust).clone_value.clone(), expr) } pub fn apply_deref_clone(expr: String) -> String { - apply_type_template1( - sharing_for_target(RenderTarget::Rust).deref_clone.clone(), - expr, - ) + apply_type_template1(sharing_for_target(RenderTarget::Rust).deref_clone.clone(), expr) } pub fn apply_field_clone(expr: String, field: String) -> String { - apply_type_template2( - sharing_for_target(RenderTarget::Rust).field_clone.clone(), - expr, - field, - ) + apply_type_template2(sharing_for_target(RenderTarget::Rust).field_clone.clone(), expr, field) } pub fn clone_iterator_suffix() -> String { sharing_for_target(RenderTarget::Rust).clone_suffix.clone() } -pub fn effective_variant_parent( - name: &String, - binding_kind: Option>, - resolved_type: Option>, - emit_info: &Rc, - source_indices: Rc>>, -) -> Option { +pub fn effective_variant_parent(name: &String, binding_kind: Option>, resolved_type: Option>, emit_info: &Rc, source_indices: Rc>>) -> Option { { let cached = match v2_rt::map_get(&emit_info.variant_to_enum.clone(), name.clone()) { - Some(p) => { - if (p.clone().as_str() != "".to_string().as_str()) { - Some(p.clone()) - } else { - None - } + Some(p) => if (p.clone().as_str() != "".to_string().as_str()) { + Some(p.clone()) + } else { + None + }, + None => None, +}; +match cached { + Some(parent) => Some(parent.clone()), + None => match resolved_type.as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + let rt_name = authored_name_at(source_indices, &rt); +if (((rt.ident_span.clone() != None) && (rt_name.clone().as_str() != name.clone().as_str())) && variant_belongs_to_enum(emit_info.type_summaries.clone(), name.clone(), rt_name.clone())) { + Some(rt_name.clone()) + } else { + variant_parent_from_binding_kind(binding_kind) } - None => None, - }; - match cached { - Some(parent) => Some(parent.clone()), - None => match resolved_type.as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - let rt_name = authored_name_at(source_indices, &rt); - if (((rt.ident_span.clone() != None) - && (rt_name.clone().as_str() != name.clone().as_str())) - && variant_belongs_to_enum( - emit_info.type_summaries.clone(), - name.clone(), - rt_name.clone(), - )) - { - Some(rt_name.clone()) - } else { - variant_parent_from_binding_kind(binding_kind) - } - } - _ => variant_parent_from_binding_kind(binding_kind), - }, - } - } +}, + _ => variant_parent_from_binding_kind(binding_kind), +}, +} +} } -pub fn emit_var_ref( - name: &String, - binding_kind: &Option>, - resolved_type: &Option>, - shared_types: Rc>, - registry: Rc>>, - emit_info: &Rc, - source_indices: Rc>>, -) -> String { - if ((name.clone().as_str() == "none".to_string().as_str()) - || (name.clone().as_str() == "None".to_string().as_str())) - { +pub fn emit_var_ref(name: &String, binding_kind: &Option>, resolved_type: &Option>, shared_types: Rc>, registry: Rc>>, emit_info: &Rc, source_indices: Rc>>) -> String { + if ((name.clone().as_str() == "none".to_string().as_str()) || (name.clone().as_str() == "None".to_string().as_str())) { emit_keyword("null".to_string(), RenderTarget::Rust) } else { - if ((name.clone().as_str() == "true".to_string().as_str()) - || (name.clone().as_str() == "false".to_string().as_str())) - { + if ((name.clone().as_str() == "true".to_string().as_str()) || (name.clone().as_str() == "false".to_string().as_str())) { emit_keyword(name.clone(), RenderTarget::Rust) } else { { - let moves_by_value = emit_map_has(emit_info.movable.clone(), name.clone()); - let sharing = language_spec(RenderTarget::Rust).sharing.clone(); - let variant_parent = effective_variant_parent( - &name, - binding_kind.clone(), - resolved_type.clone(), - &emit_info, - source_indices, - ); - let ref_str = match variant_parent { - Some(enum_name) => { - let qualified = v2_rt::concat( - v2_rt::concat(enum_name.clone(), "::".to_string()), - name.clone(), - ); - if emit_map_has(shared_types, enum_name.clone()) { - v2_rt::concat( - v2_rt::concat("Rc::new(".to_string(), qualified), - ")".to_string(), - ) - } else { - qualified - } + let moves_by_value = set_contains(emit_info.movable.clone(), name.clone()); +let sharing = language_spec(RenderTarget::Rust).sharing.clone(); +let variant_parent = effective_variant_parent(&name, binding_kind.clone(), resolved_type.clone(), &emit_info, source_indices); +let ref_str = match variant_parent { + Some(enum_name) => { + let qualified = v2_rt::concat(v2_rt::concat(enum_name.clone(), "::".to_string()), name.clone()); +if set_contains(shared_types, enum_name.clone()) { + v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), qualified), ")".to_string()) + } else { + qualified } - None => match v2_rt::map_get(®istry, name.clone()) { - Some(info) => { - let is_data = (info.kind.clone() == ItemKind::DataItem); - if is_data { - v2_rt::concat(to_snake(name.clone()), "()".to_string()) - } else { - { - let is_function_value = - match binding_kind.clone().as_deref().cloned() { - Some(VarBindingKind::FunctionValueBinding) => true, - _ => false, - }; - let ident = emit_ident(name.clone(), RenderTarget::Rust); - let ident_str = if is_function_value { - ident - } else { - if moves_by_value { - ident - } else { - match resolved_type.clone() { - Some(_) => apply_type_template1( - sharing.clone_value.clone(), - ident, - ), - _ => ident, - } - } - }; - ident_str - } - } - } - None => { - let ident = emit_ident(name.clone(), RenderTarget::Rust); - let ident_str = if moves_by_value { +}, + None => match v2_rt::map_get(®istry, name.clone()) { + Some(info) => { + let is_data = (info.kind.clone() == ItemKind::DataItem); +if is_data { + v2_rt::concat(to_snake(name.clone()), "()".to_string()) + } else { + { + let is_function_value = match binding_kind.clone().as_deref().cloned() { + Some(VarBindingKind::FunctionValueBinding) => true, + _ => false, +}; +let ident = emit_ident(name.clone(), RenderTarget::Rust); +let ident_str = if is_function_value { ident } else { - match resolved_type.clone() { - Some(_) => { - apply_type_template1(sharing.clone_value.clone(), ident) - } - _ => ident, + if moves_by_value { + ident + } else { + match resolved_type.clone() { + Some(_) => apply_type_template1(sharing.clone_value.clone(), ident), + _ => ident, +} } }; - ident_str - } - }, - }; - ref_str - } +ident_str +} + } +}, + None => { + let ident = emit_ident(name.clone(), RenderTarget::Rust); +let ident_str = if moves_by_value { + ident + } else { + match resolved_type.clone() { + Some(_) => apply_type_template1(sharing.clone_value.clone(), ident), + _ => ident, +} + }; +ident_str +}, +}, +}; +ref_str +} } } } -pub fn emit_typed_expr_base( - texpr: &Rc, - registry: Rc>>, - scope: &Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { +pub fn emit_typed_expr_base(texpr: &Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { { let si = scope.type_env.clone().source_indices.clone(); - match (*texpr.expr_data.clone()).clone() { - ExprData::ExprVar { binding_kind, .. } => { - let n = expr_var_name_at(texpr.clone(), si.clone()); - if ((n.clone().as_str() == "none".to_string().as_str()) - || (n.clone().as_str() == "None".to_string().as_str())) - { - emit_keyword("null".to_string(), RenderTarget::Rust) +match (*texpr.expr_data.clone()).clone() { + ExprData::ExprVar { binding_kind, .. } => { + let n = expr_var_name_at(texpr.clone(), si.clone()); +if ((n.clone().as_str() == "none".to_string().as_str()) || (n.clone().as_str() == "None".to_string().as_str())) { + emit_keyword("null".to_string(), RenderTarget::Rust) + } else { + if ((n.clone().as_str() == "true".to_string().as_str()) || (n.clone().as_str() == "false".to_string().as_str())) { + emit_keyword(n.clone(), RenderTarget::Rust) } else { - if ((n.clone().as_str() == "true".to_string().as_str()) - || (n.clone().as_str() == "false".to_string().as_str())) { - emit_keyword(n.clone(), RenderTarget::Rust) - } else { - { - let variant_parent = effective_variant_parent( - &n, - binding_kind.clone(), - texpr.inferred.clone(), - &emit_info, - si.clone(), - ); - match variant_parent { - Some(enum_name) => { - let qualified = v2_rt::concat( - v2_rt::concat(enum_name.clone(), "::".to_string()), - n.clone(), - ); - if emit_map_has(shared_types, enum_name.clone()) { - v2_rt::concat( - v2_rt::concat("Rc::new(".to_string(), qualified), - ")".to_string(), - ) - } else { - qualified - } - } - None => match v2_rt::map_get(®istry, n.clone()) { - Some(info) => { - let is_data = (info.kind.clone() == ItemKind::DataItem); - if is_data { - v2_rt::concat(to_snake(n.clone()), "()".to_string()) - } else { - emit_ident(n.clone(), RenderTarget::Rust) - } - } - None => emit_ident(n.clone(), RenderTarget::Rust), - }, + let variant_parent = effective_variant_parent(&n, binding_kind.clone(), texpr.inferred.clone(), &emit_info, si.clone()); +match variant_parent { + Some(enum_name) => { + let qualified = v2_rt::concat(v2_rt::concat(enum_name.clone(), "::".to_string()), n.clone()); +if set_contains(shared_types, enum_name.clone()) { + v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), qualified), ")".to_string()) + } else { + qualified } - } - } +}, + None => match v2_rt::map_get(®istry, n.clone()) { + Some(info) => { + let is_data = (info.kind.clone() == ItemKind::DataItem); +if is_data { + v2_rt::concat(to_snake(n.clone()), "()".to_string()) + } else { + emit_ident(n.clone(), RenderTarget::Rust) + } +}, + None => emit_ident(n.clone(), RenderTarget::Rust), +}, +} +} } } - _ => emit_typed_expr( - texpr.clone(), - registry, - &scope, - depth, - shared_types, - emit_info, - 1024, - ), - } - } +}, + _ => emit_typed_expr(texpr.clone(), registry, &scope, depth, shared_types, emit_info, 1024), +} +} } -pub fn emit_typed_field_access( - base: &Rc, - field: &String, - summary: Option>, - registry: &Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { - { - let base_str = emit_typed_expr_base( - &base, - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ); - let base_is_anon_record = match base.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: bt, .. }) => { - let is_product = is_product_type(bt.clone()); - if (is_product && (bt.ident_span.clone() == None)) { - true - } else { - false - } +pub fn emit_typed_field_access(base: &Rc, field: &String, summary: Option>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { + { + let base_str = emit_typed_expr_base(&base, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone()); +let base_is_anon_record = match base.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: bt, .. }) => { + let is_product = is_product_type(bt.clone()); +if (is_product && (bt.ident_span.clone() == None)) { + true + } else { + false } - _ => false, - }; - if base_is_anon_record { +}, + _ => false, +}; +if base_is_anon_record { { let bt = resolved_type(base.clone()); - if ((bt.children.clone().len() as i64) == 1) { - emit_typed_expr( - base.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ) +if ((bt.children.clone().len() as i64) == 1) { + emit_typed_expr(base.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024) } else { { - let matches = Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - bt.children - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - if (authored_name_at( - scope.type_env.clone().source_indices.clone(), - &pair.1.clone(), - ) - .as_str() - == field.clone().as_str()) - { - __result.push(pair); - } - } - __result - }); - match matches.first().cloned() { - Some(m) => { - let sharing = language_spec(RenderTarget::Rust).sharing.clone(); - apply_type_template1( - sharing.clone_value.clone(), - v2_rt::concat( - v2_rt::concat(base_str, ".".to_string()), - (m.0.clone()).to_string(), - ), - ) - } - None => v2_rt::concat( - v2_rt::concat( - "compile_error!(\"anonymous record field not found: " - .to_string(), - field.clone(), - ), - "\")".to_string(), - ), - } - } + let matches = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(bt.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (authored_name_at(scope.type_env.clone().source_indices.clone(), &pair.1.clone()).as_str() == field.clone().as_str()) { __result.push(pair); } } __result }); +match matches.first().cloned() { + Some(m) => { + let sharing = language_spec(RenderTarget::Rust).sharing.clone(); +apply_type_template1(sharing.clone_value.clone(), v2_rt::concat(v2_rt::concat(base_str, ".".to_string()), (m.0.clone()).to_string())) +}, + None => v2_rt::concat(v2_rt::concat("compile_error!(\"anonymous record field not found: ".to_string(), field.clone()), "\")".to_string()), +} +} } - } +} } else { { let sharing = language_spec(RenderTarget::Rust).sharing.clone(); - match summary { - Some(field_summary) => match field_summary.access_style.clone() { - FieldAccessStyle::TupleFirst => apply_type_template1( - sharing.clone_value.clone(), - v2_rt::concat(base_str, ".0".to_string()), - ), - FieldAccessStyle::TupleSecond => apply_type_template1( - sharing.clone_value.clone(), - v2_rt::concat(base_str, ".1".to_string()), - ), - FieldAccessStyle::OptionalUnwrap => v2_rt::concat( - apply_type_template1(sharing.clone_value.clone(), base_str), - ".unwrap()".to_string(), - ), - FieldAccessStyle::EnumAccessor => v2_rt::concat( - v2_rt::concat( - v2_rt::concat(base_str, ".".to_string()), - emit_ident(field.clone(), RenderTarget::Rust), - ), - "()".to_string(), - ), - FieldAccessStyle::StoredField => { - let base_is_owned = match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let base_name = expr_var_name_at( - base.clone(), - scope.type_env.clone().source_indices.clone(), - ); - emit_map_has(emit_info.owned_bindings.clone(), base_name) - } - _ => false, - }; - if base_is_owned { - v2_rt::concat( - v2_rt::concat(base_str, ".".to_string()), - emit_ident(field.clone(), RenderTarget::Rust), - ) - } else { - apply_type_template1( - sharing.clone_value.clone(), - v2_rt::concat( - v2_rt::concat(base_str, ".".to_string()), - emit_ident(field.clone(), RenderTarget::Rust), - ), - ) - } - } - }, - None => v2_rt::concat( - v2_rt::concat( - "compile_error!(\"field access missing reconcile summary for '" - .to_string(), - field.clone(), - ), - "'\")".to_string(), - ), - } - } +match summary { + Some(field_summary) => match field_summary.access_style.clone() { + FieldAccessStyle::TupleFirst => apply_type_template1(sharing.clone_value.clone(), v2_rt::concat(base_str, ".0".to_string())), + FieldAccessStyle::TupleSecond => apply_type_template1(sharing.clone_value.clone(), v2_rt::concat(base_str, ".1".to_string())), + FieldAccessStyle::OptionalUnwrap => v2_rt::concat(apply_type_template1(sharing.clone_value.clone(), base_str), ".unwrap()".to_string()), + FieldAccessStyle::EnumAccessor => v2_rt::concat(v2_rt::concat(v2_rt::concat(base_str, ".".to_string()), emit_ident(field.clone(), RenderTarget::Rust)), "()".to_string()), + FieldAccessStyle::StoredField => { + let base_is_owned = match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let base_name = expr_var_name_at(base.clone(), scope.type_env.clone().source_indices.clone()); +set_contains(emit_info.owned_bindings.clone(), base_name) +}, + _ => false, +}; +if base_is_owned { + v2_rt::concat(v2_rt::concat(base_str, ".".to_string()), emit_ident(field.clone(), RenderTarget::Rust)) + } else { + apply_type_template1(sharing.clone_value.clone(), v2_rt::concat(v2_rt::concat(base_str, ".".to_string()), emit_ident(field.clone(), RenderTarget::Rust))) + } +}, +}, + None => v2_rt::concat(v2_rt::concat("compile_error!(\"field access missing reconcile summary for '".to_string(), field.clone()), "'\")".to_string()), +} +} } - } +} } -pub fn type_needs_rc( - type_node: Rc, - source_indices: Rc>>, -) -> bool { - type_needs_rc_seen( - type_node, - v2_rt::rc_empty_map::(), - source_indices, - ) +pub fn type_needs_rc(type_node: Rc, source_indices: Rc>>) -> bool { + type_needs_rc_seen(type_node, v2_rt::rc_empty_map::(), source_indices) } -pub fn type_needs_rc_seen( - mut type_node: Rc, - mut seen: Rc>, - mut source_indices: Rc>>, -) -> bool { +pub fn type_needs_rc_seen(mut type_node: Rc, mut seen: Rc>, mut source_indices: Rc>>) -> bool { loop { let normed = normalize_access_type_node(type_node); - let is_product = is_product_type(normed.clone()); - let is_coproduct = is_coproduct_type(normed.clone()); - if is_product { +let is_product = is_product_type(normed.clone()); +let is_coproduct = is_coproduct_type(normed.clone()); +if is_product { break true; - } else { +} else { if is_coproduct { - break { - let mut __found = false; - for child in normed.children.clone().iter().cloned() { - if ((child.children.clone().len() as i64) > 0) { - __found = true; - break; - } - } - __found - }; - } else { + break { let mut __found = false; for child in normed.children.clone().iter().cloned() { if ((child.children.clone().len() as i64) > 0) { __found = true; break; } } __found }; +} else { let canonical = authored_name_at(source_indices.clone(), &normed); - if (normed.inferred.clone() != None) { +if (normed.inferred.clone() != None) { let next_seen = if (canonical.clone().as_str() == "".to_string().as_str()) { seen.clone() } else { v2_rt::rc_map_insert(seen.clone(), canonical.clone(), true) }; - { +{ let __tco_0 = resolved_type(normed.clone()); - let __tco_1 = next_seen; - type_node = __tco_0; - seen = __tco_1; - continue; - } - } else { - if ((canonical.clone().as_str() != "".to_string().as_str()) - && emit_map_has(seen.clone(), canonical.clone())) - { +let __tco_1 = next_seen; +type_node = __tco_0; +seen = __tco_1; +continue; +} +} else { + if ((canonical.clone().as_str() != "".to_string().as_str()) && emit_map_has(seen.clone(), canonical.clone())) { break false; - } else { +} else { let next_seen = if (canonical.clone().as_str() == "".to_string().as_str()) { seen.clone() } else { v2_rt::rc_map_insert(seen.clone(), canonical.clone(), true) }; - let has_structure = (normed.connective.clone() != Connective::NoConnective); - if (!has_structure && ((normed.children.clone().len() as i64) == 0)) { +let has_structure = (normed.connective.clone() != Connective::NoConnective); +if (!has_structure && ((normed.children.clone().len() as i64) == 0)) { break false; - } else { +} else { { let __tco_0 = normed.clone(); - let __tco_1 = next_seen; - type_node = __tco_0; - seen = __tco_1; - continue; - } - } - } - } - } - } - } +let __tco_1 = next_seen; +type_node = __tco_0; +seen = __tco_1; +continue; +} +} +} +} +} +} +} } pub fn rust_runtime_bridge_passes_receiver_by_ref(function_name: String) -> bool { @@ -6103,3701 +2843,1349 @@ pub fn rust_runtime_bridge_passes_receiver_by_ref(function_name: String) -> bool pub fn rust_runtime_bridge_name(function_name: String) -> String { match v2_rt::map_get(&rt_bridge_function_names(), function_name.clone()) { - Some(runtime_name) => runtime_name.clone(), - None => function_name.clone(), - } + Some(runtime_name) => runtime_name.clone(), + None => function_name.clone(), +} } -pub fn rust_empty_map_value_type_str( - map_type: Rc, - shared_types: Rc>, - source_indices: Rc>>, -) -> String { +pub fn rust_empty_map_value_type_str(map_type: Rc, shared_types: Rc>, source_indices: Rc>>) -> String { match map_type.children.clone().get(1 as usize).cloned() { - Some(value_child) => { - let rendered = - render_rust_type(child_type_node(&value_child), shared_types, source_indices); - if (rendered.clone().as_str() == "".to_string().as_str()) { - "".to_string() - } else { - rendered.clone() - } + Some(value_child) => { + let rendered = render_rust_type(child_type_node(&value_child), shared_types, source_indices); +if (rendered.clone().as_str() == "".to_string().as_str()) { + "".to_string() + } else { + rendered.clone() } - None => "".to_string(), - } +}, + None => "".to_string(), +} } -pub fn rust_empty_map_kv_type_str( - map_type: &Rc, - shared_types: &Rc>, - source_indices: &Rc>>, -) -> String { +pub fn rust_empty_map_kv_type_str(map_type: &Rc, shared_types: &Rc>, source_indices: &Rc>>) -> String { { let key_str = match map_type.children.clone().first().cloned() { - Some(key_child) => render_rust_type( - child_type_node(&key_child), - shared_types.clone(), - source_indices.clone(), - ), - None => "".to_string(), - }; - let val_str = rust_empty_map_value_type_str( - map_type.clone(), - shared_types.clone(), - source_indices.clone(), - ); - if ((key_str.clone().as_str() != "".to_string().as_str()) - && (val_str.clone().as_str() != "".to_string().as_str())) - { - v2_rt::concat( - v2_rt::concat(key_str.clone(), ", ".to_string()), - val_str.clone(), - ) + Some(key_child) => render_rust_type(child_type_node(&key_child), shared_types.clone(), source_indices.clone()), + None => "".to_string(), +}; +let val_str = rust_empty_map_value_type_str(map_type.clone(), shared_types.clone(), source_indices.clone()); +if ((key_str.clone().as_str() != "".to_string().as_str()) && (val_str.clone().as_str() != "".to_string().as_str())) { + v2_rt::concat(v2_rt::concat(key_str.clone(), ", ".to_string()), val_str.clone()) } else { "".to_string() } - } +} } pub fn rust_runtime_bridge_wraps_collection_result_in_rc(function_name: &String) -> bool { - (v2_rt::map_contains_key(&rt_wraps_result(), function_name.clone()) - || v2_rt::map_contains_key(&rust_method_wraps_result(), function_name.clone())) + (v2_rt::map_contains_key(&rt_wraps_result(), function_name.clone()) || v2_rt::map_contains_key(&rust_method_wraps_result(), function_name.clone())) } -pub fn rust_runtime_bridge_collection_result_needs_rc_elements( - function_name: String, - result_type: Option>, -) -> bool { +pub fn rust_runtime_bridge_collection_result_needs_rc_elements(function_name: String, result_type: Option>) -> bool { false } -pub fn rust_wrap_runtime_collection_result( - call_str: String, - function_name: &String, - result_type: Option>, -) -> String { +pub fn rust_wrap_runtime_collection_result(call_str: String, function_name: &String, result_type: Option>) -> String { if rust_runtime_bridge_wraps_collection_result_in_rc(&function_name) { - if rust_runtime_bridge_collection_result_needs_rc_elements( - function_name.clone(), - result_type, - ) { - v2_rt::concat( - v2_rt::concat("Rc::new((".to_string(), call_str), - ").into_iter().map(Rc::new).collect::>())".to_string(), - ) - } else { - v2_rt::concat( - v2_rt::concat("Rc::new(".to_string(), call_str), - ")".to_string(), - ) + if rust_runtime_bridge_collection_result_needs_rc_elements(function_name.clone(), result_type) { + v2_rt::concat(v2_rt::concat("Rc::new((".to_string(), call_str), ").into_iter().map(Rc::new).collect::>())".to_string()) + } else { + v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), call_str), ")".to_string()) } } else { call_str } } -pub fn emit_rust_expr_var( - expr: &Rc, - registry: Rc>>, - shared_types: Rc>, - emit_info: Rc, - source_indices: &Rc>>, -) -> String { +pub fn emit_rust_expr_var(expr: &Rc, registry: Rc>>, shared_types: Rc>, emit_info: Rc, source_indices: &Rc>>) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprVar { binding_kind, .. } => { - let n = expr_var_name_at(expr.clone(), source_indices.clone()); - emit_var_ref( - &n, - &binding_kind, - &expr.inferred.clone(), - shared_types, - registry, - &emit_info, - source_indices.clone(), - ) - } - _ => emit_error_expr( - "emit_rust_expr_var expected ExprVar".to_string(), - RenderTarget::Rust, - ), - } + ExprData::ExprVar { binding_kind, .. } => { + let n = expr_var_name_at(expr.clone(), source_indices.clone()); +emit_var_ref(&n, &binding_kind, &expr.inferred.clone(), shared_types, registry, &emit_info, source_indices.clone()) +}, + _ => emit_error_expr("emit_rust_expr_var expected ExprVar".to_string(), RenderTarget::Rust), +} } -pub fn emit_rust_expr_field_access( - expr: &Rc, - registry: Rc>>, - scope: &Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { +pub fn emit_rust_expr_field_access(expr: &Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { { let si = scope.type_env.clone().source_indices.clone(); - match (*expr.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { summary, .. } => { - let f = field_access_field_at(expr.clone(), si); - let b = field_access_base(expr.clone()); - if is_typed_service_call_receiver( - &expr, - scope.type_env.clone().source_indices.clone(), - ) { - match extract_typed_service_name( - &expr, - &scope.type_env.clone().source_indices.clone(), - ) { - Some(svc_name) => service_var_name(svc_name.clone()), - None => emit_typed_field_access( - &b, - &f, - summary.clone(), - ®istry, - &scope, - depth, - &shared_types, - &emit_info, - ), - } - } else { - emit_typed_field_access( - &b, - &f, - summary.clone(), - ®istry, - &scope, - depth, - &shared_types, - &emit_info, - ) - } +match (*expr.expr_data.clone()).clone() { + ExprData::ExprFieldAccess { summary, .. } => { + let f = field_access_field_at(expr.clone(), si); +let b = field_access_base(expr.clone()); +if is_typed_service_call_receiver(&expr, scope.type_env.clone().source_indices.clone()) { + match extract_typed_service_name(&expr, &scope.type_env.clone().source_indices.clone()) { + Some(svc_name) => service_var_name(svc_name.clone()), + None => emit_typed_field_access(&b, &f, summary.clone(), ®istry, &scope, depth, &shared_types, &emit_info), +} + } else { + emit_typed_field_access(&b, &f, summary.clone(), ®istry, &scope, depth, &shared_types, &emit_info) } - _ => emit_error_expr( - "emit_rust_expr_field_access expected ExprFieldAccess".to_string(), - RenderTarget::Rust, - ), - } - } +}, + _ => emit_error_expr("emit_rust_expr_field_access expected ExprFieldAccess".to_string(), RenderTarget::Rust), +} +} } -pub fn emit_rust_expr_call( - expr: &Rc, - registry: Rc>>, - scope: &Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { +pub fn emit_rust_expr_call(expr: &Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let f = expr_call_func_at(expr.clone(), scope.type_env.clone().source_indices.clone()); - emit_typed_call_expr( - &f, - expr.children.clone(), - expr.inferred.clone(), - registry, - scope.clone(), - depth, - shared_types, - emit_info, - ) - } - _ => emit_error_expr( - "emit_rust_expr_call expected ExprCall".to_string(), - RenderTarget::Rust, - ), - } + ExprData::ExprCall { .. } => { + let f = expr_call_func_at(expr.clone(), scope.type_env.clone().source_indices.clone()); +emit_typed_call_expr(&f, expr.children.clone(), expr.inferred.clone(), registry, scope.clone(), depth, shared_types, emit_info) +}, + _ => emit_error_expr("emit_rust_expr_call expected ExprCall".to_string(), RenderTarget::Rust), +} } -pub fn emit_rust_expr_method_call( - expr: &Rc, - registry: Rc>>, - scope: &Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { +pub fn emit_rust_expr_method_call(expr: &Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprMethodCall { - method_semantics, .. - } => { - let r = method_receiver(expr.clone()); - let a = method_arg_nodes(expr.clone()); - let m = - expr_method_name_at(expr.clone(), scope.type_env.clone().source_indices.clone()); - emit_typed_method_call( - expr.clone(), - &r, - m, - &a, - expr.inferred.clone(), - &method_semantics, - ®istry, - &scope, - depth, - &shared_types, - &emit_info, - ) - } - _ => emit_error_expr( - "emit_rust_expr_method_call expected ExprMethodCall".to_string(), - RenderTarget::Rust, - ), - } + ExprData::ExprMethodCall { method_semantics, .. } => { + let r = method_receiver(expr.clone()); +let a = method_arg_nodes(expr.clone()); +let m = expr_method_name_at(expr.clone(), scope.type_env.clone().source_indices.clone()); +emit_typed_method_call(expr.clone(), &r, m, &a, expr.inferred.clone(), &method_semantics, ®istry, &scope, depth, &shared_types, &emit_info) +}, + _ => emit_error_expr("emit_rust_expr_method_call expected ExprMethodCall".to_string(), RenderTarget::Rust), +} } -pub fn emit_rust_expr_match( - expr: &Rc, - registry: Rc>>, - scope: Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { +pub fn emit_rust_expr_match(expr: &Rc, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprMatch => { - let s = match_scrutinee(expr.clone()); - let arm_list = match_arm_nodes(expr.clone()); - emit_typed_match( - &s, - &arm_list, - ®istry, - &scope, - depth, - &shared_types, - &emit_info, - ) - } - _ => emit_error_expr( - "emit_rust_expr_match expected ExprMatch".to_string(), - RenderTarget::Rust, - ), - } + ExprData::ExprMatch => { + let s = match_scrutinee(expr.clone()); +let arm_list = match_arm_nodes(expr.clone()); +emit_typed_match(&s, &arm_list, ®istry, &scope, depth, &shared_types, &emit_info) +}, + _ => emit_error_expr("emit_rust_expr_match expected ExprMatch".to_string(), RenderTarget::Rust), +} } -pub fn emit_rust_expr_if( - expr: &Rc, - registry: Rc>>, - scope: Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { +pub fn emit_rust_expr_if(expr: &Rc, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprIf => { - let c = if_condition(expr.clone()); - let t = if_then_branch(expr.clone()); - let e = if_else_branch(expr.clone()); - emit_typed_if(c, t, e, ®istry, &scope, depth, &shared_types, &emit_info) - } - _ => emit_error_expr( - "emit_rust_expr_if expected ExprIf".to_string(), - RenderTarget::Rust, - ), - } + ExprData::ExprIf => { + let c = if_condition(expr.clone()); +let t = if_then_branch(expr.clone()); +let e = if_else_branch(expr.clone()); +emit_typed_if(c, t, e, ®istry, &scope, depth, &shared_types, &emit_info) +}, + _ => emit_error_expr("emit_rust_expr_if expected ExprIf".to_string(), RenderTarget::Rust), +} } -pub fn emit_rust_expr_let( - expr: &Rc, - registry: Rc>>, - scope: &Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { +pub fn emit_rust_expr_let(expr: &Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprLet => { - let n = - let_binding_name_at(expr.clone(), scope.type_env.clone().source_indices.clone()); - let v = let_value(expr.clone()); - let bd = let_body(expr.clone()); - emit_typed_let( - n, - &v, - bd, - ®istry, - &scope, - depth, - &shared_types, - &emit_info, - ) - } - _ => emit_error_expr( - "emit_rust_expr_let expected ExprLet".to_string(), - RenderTarget::Rust, - ), - } + ExprData::ExprLet => { + let n = let_binding_name_at(expr.clone(), scope.type_env.clone().source_indices.clone()); +let v = let_value(expr.clone()); +let bd = let_body(expr.clone()); +emit_typed_let(n, &v, bd, ®istry, &scope, depth, &shared_types, &emit_info) +}, + _ => emit_error_expr("emit_rust_expr_let expected ExprLet".to_string(), RenderTarget::Rust), +} } -pub fn emit_rust_expr_record_lit( - expr: &Rc, - registry: Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: Rc, -) -> String { +pub fn emit_rust_expr_record_lit(expr: &Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: Rc) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprRecordLit { parent_enum, .. } => { - let tn = record_lit_type_name_at( - expr.clone(), - scope.type_env.clone().source_indices.clone(), - ); - let fs = expr.children.clone(); - let raw = emit_typed_record_lit( - &tn, - &fs, - &parent_enum, - &resolved_type(expr.clone()), - registry, - &scope, - depth, - &shared_types, - &emit_info, - ); - let rc_name = match parent_enum.clone() { - Some(en) => en.clone(), - None => match tn.clone() { - Some(n) => n.clone(), - None => "".to_string(), - }, - }; - if ((rc_name.clone().as_str() != "".to_string().as_str()) - && emit_map_has(shared_types.clone(), rc_name.clone())) - { - v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) - } else { - raw - } + ExprData::ExprRecordLit { parent_enum, .. } => { + let tn = record_lit_type_name_at(expr.clone(), scope.type_env.clone().source_indices.clone()); +let fs = expr.children.clone(); +let raw = emit_typed_record_lit(&tn, &fs, &parent_enum, &resolved_type(expr.clone()), registry, &scope, depth, &shared_types, &emit_info); +let rc_name = match parent_enum.clone() { + Some(en) => en.clone(), + None => match tn.clone() { + Some(n) => n.clone(), + None => "".to_string(), +}, +}; +if ((rc_name.clone().as_str() != "".to_string().as_str()) && set_contains(shared_types.clone(), rc_name.clone())) { + v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) + } else { + raw } - _ => emit_error_expr( - "emit_rust_expr_record_lit expected ExprRecordLit".to_string(), - RenderTarget::Rust, - ), - } +}, + _ => emit_error_expr("emit_rust_expr_record_lit expected ExprRecordLit".to_string(), RenderTarget::Rust), +} } -pub fn emit_rust_expr_string_interp( - expr: &Rc, - registry: Rc>>, - scope: Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { +pub fn emit_rust_expr_string_interp(expr: &Rc, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprStringInterp => { - let ps = Rc::new({ - let mut __result = Vec::new(); - for child in expr.children.clone().iter().cloned() { - __result.push(match (*child.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitStr { value: text, .. } = value.as_ref() else { - unreachable!() - }; - Rc::new(StringPart::Text { - value: text.clone(), - }) - } - _ => Rc::new(StringPart::Interpolation { - expr: arg_value(&child), - }), - }); - } - __result - }); - emit_typed_string_interp(&ps, registry, scope, depth, shared_types, emit_info) - } - _ => emit_error_expr( - "emit_rust_expr_string_interp expected ExprStringInterp".to_string(), - RenderTarget::Rust, - ), - } + ExprData::ExprStringInterp => { + let ps = Rc::new({ let mut __result = Vec::new(); for child in expr.children.clone().iter().cloned() { __result.push(match (*child.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: text, .. } = value.as_ref() else { unreachable!() }; Rc::new(StringPart::Text { + value: text.clone(), +}) }, + _ => Rc::new(StringPart::Interpolation { + expr: arg_value(&child), +}), +}); } __result }); +emit_typed_string_interp(&ps, registry, scope, depth, shared_types, emit_info) +}, + _ => emit_error_expr("emit_rust_expr_string_interp expected ExprStringInterp".to_string(), RenderTarget::Rust), +} } -pub fn emit_rust_expr_block( - expr: &Rc, - registry: Rc>>, - scope: Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { +pub fn emit_rust_expr_block(expr: &Rc, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprBlock => emit_typed_block( - expr.children.clone(), - registry, - scope, - depth, - shared_types, - emit_info, - ), - _ => emit_error_expr( - "emit_rust_expr_block expected ExprBlock".to_string(), - RenderTarget::Rust, - ), - } + ExprData::ExprBlock => emit_typed_block(expr.children.clone(), registry, scope, depth, shared_types, emit_info), + _ => emit_error_expr("emit_rust_expr_block expected ExprBlock".to_string(), RenderTarget::Rust), +} } -pub fn emit_rust_expr_cast( - expr: &Rc, - registry: Rc>>, - scope: &Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { +pub fn emit_rust_expr_cast(expr: &Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprCast => emit_typed_cast_shared( - &cast_expr(expr.clone()), - cast_target(expr.clone()), - &RenderTarget::Rust, - |child| { - emit_typed_expr( - child.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ) - }, - &scope.type_env.clone().source_indices.clone(), - ), - _ => emit_error_expr( - "emit_rust_expr_cast expected ExprCast".to_string(), - RenderTarget::Rust, - ), - } + ExprData::ExprCast => emit_typed_cast_shared(&cast_expr(expr.clone()), cast_target(expr.clone()), &RenderTarget::Rust, |child| emit_typed_expr(child.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024), &scope.type_env.clone().source_indices.clone()), + _ => emit_error_expr("emit_rust_expr_cast expected ExprCast".to_string(), RenderTarget::Rust), +} } -pub fn emit_rust_expr_for_each( - expr: &Rc, - registry: Rc>>, - scope: &Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { +pub fn emit_rust_expr_for_each(expr: &Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprForEach => { - let v = - foreach_variable_at(expr.clone(), scope.type_env.clone().source_indices.clone()); - let c = foreach_collection(expr.clone()); - let bd = foreach_body(expr.clone()); - emit_typed_for_each( - &v, - &c, - bd, - ®istry, - &scope, - depth, - &shared_types, - &emit_info, - ) - } - _ => emit_error_expr( - "emit_rust_expr_for_each expected ExprForEach".to_string(), - RenderTarget::Rust, - ), - } + ExprData::ExprForEach => { + let v = foreach_variable_at(expr.clone(), scope.type_env.clone().source_indices.clone()); +let c = foreach_collection(expr.clone()); +let bd = foreach_body(expr.clone()); +emit_typed_for_each(&v, &c, bd, ®istry, &scope, depth, &shared_types, &emit_info) +}, + _ => emit_error_expr("emit_rust_expr_for_each expected ExprForEach".to_string(), RenderTarget::Rust), +} } -pub fn emit_rust_expr_index( - expr: &Rc, - registry: Rc>>, - scope: Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { +pub fn emit_rust_expr_index(expr: &Rc, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprIndex => { - let b = index_base(expr.clone()); - let i = index_expr(expr.clone()); - emit_typed_index(&b, i, ®istry, &scope, depth, &shared_types, &emit_info) - } - _ => emit_error_expr( - "emit_rust_expr_index expected ExprIndex".to_string(), - RenderTarget::Rust, - ), - } + ExprData::ExprIndex => { + let b = index_base(expr.clone()); +let i = index_expr(expr.clone()); +emit_typed_index(&b, i, ®istry, &scope, depth, &shared_types, &emit_info) +}, + _ => emit_error_expr("emit_rust_expr_index expected ExprIndex".to_string(), RenderTarget::Rust), +} } -pub fn emit_rust_expr_slice( - expr: &Rc, - registry: Rc>>, - scope: Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { +pub fn emit_rust_expr_slice(expr: &Rc, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprSlice => { - let b = slice_base(expr.clone()); - let s = slice_start(expr.clone()); - let e = slice_end(expr.clone()); - emit_typed_slice( - &b, - s, - e, - ®istry, - &scope, - depth, - &shared_types, - &emit_info, - ) - } - _ => emit_error_expr( - "emit_rust_expr_slice expected ExprSlice".to_string(), - RenderTarget::Rust, - ), - } + ExprData::ExprSlice => { + let b = slice_base(expr.clone()); +let s = slice_start(expr.clone()); +let e = slice_end(expr.clone()); +emit_typed_slice(&b, s, e, ®istry, &scope, depth, &shared_types, &emit_info) +}, + _ => emit_error_expr("emit_rust_expr_slice expected ExprSlice".to_string(), RenderTarget::Rust), +} } -pub fn emit_rust_expr_bin_op( - expr: &Rc, - registry: Rc>>, - scope: Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { +pub fn emit_rust_expr_bin_op(expr: &Rc, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprBinOp { - op, - algebra_field: algebra, - .. - } => emit_typed_bin_op( - &op, - algebra.clone(), - &binop_left(expr.clone()), - &binop_right(expr.clone()), - ®istry, - &scope, - depth, - &shared_types, - &emit_info, - ), - _ => emit_error_expr( - "emit_rust_expr_bin_op expected ExprBinOp".to_string(), - RenderTarget::Rust, - ), - } + ExprData::ExprBinOp { op, algebra_field: algebra, .. } => emit_typed_bin_op(&op, algebra.clone(), &binop_left(expr.clone()), &binop_right(expr.clone()), ®istry, &scope, depth, &shared_types, &emit_info), + _ => emit_error_expr("emit_rust_expr_bin_op expected ExprBinOp".to_string(), RenderTarget::Rust), +} } -pub fn emit_typed_expr( - texpr: Rc, - registry: Rc>>, - scope: &Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, - fuel: i64, -) -> String { +pub fn emit_typed_expr(texpr: Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: Rc, fuel: i64) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - emit_shared_expr( - &texpr, - &RenderTarget::Rust, - scope.type_env.clone().source_indices.clone(), - |result| result.clone(), - |child| { - emit_typed_expr( - child.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - (fuel.clone() - 1), - ) - }, - |expr| { - emit_rust_expr_var( - &expr, - registry.clone(), - shared_types.clone(), - emit_info.clone(), - &scope.type_env.clone().source_indices.clone(), - ) - }, - |expr| { - emit_rust_expr_field_access( - &expr, - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ) - }, - |expr| { - emit_rust_expr_call( - &expr, - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ) - }, - |expr| { - emit_rust_expr_method_call( - &expr, - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ) - }, - |expr| { - emit_rust_expr_match( - &expr, - registry.clone(), - scope.clone(), - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ) - }, - |expr| { - emit_rust_expr_if( - &expr, - registry.clone(), - scope.clone(), - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ) - }, - |expr| { - emit_rust_expr_let( - &expr, - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ) - }, - |expr| { - emit_rust_expr_record_lit( - &expr, - registry.clone(), - &scope, - depth.clone(), - &shared_types, - emit_info.clone(), - ) - }, - |expr| { - emit_rust_expr_string_interp( - &expr, - registry.clone(), - scope.clone(), - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ) - }, - |expr| { - emit_rust_expr_block( - &expr, - registry.clone(), - scope.clone(), - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ) - }, - |expr| { - emit_rust_expr_cast( - &expr, - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ) - }, - |expr| { - emit_rust_expr_for_each( - &expr, - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ) - }, - |expr| { - emit_rust_expr_index( - &expr, - registry.clone(), - scope.clone(), - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ) - }, - |expr| { - emit_rust_expr_slice( - &expr, - registry.clone(), - scope.clone(), - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ) - }, - |expr| { - emit_rust_expr_bin_op( - &expr, - registry.clone(), - scope.clone(), - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ) - }, - ) + emit_shared_expr(&texpr, &RenderTarget::Rust, scope.type_env.clone().source_indices.clone(), |result| result.clone(), |child| emit_typed_expr(child.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), (fuel.clone() - 1)), |expr| emit_rust_expr_var(&expr, registry.clone(), shared_types.clone(), emit_info.clone(), &scope.type_env.clone().source_indices.clone()), |expr| emit_rust_expr_field_access(&expr, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_call(&expr, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_method_call(&expr, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_match(&expr, registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_if(&expr, registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_let(&expr, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_record_lit(&expr, registry.clone(), &scope, depth.clone(), &shared_types, emit_info.clone()), |expr| emit_rust_expr_string_interp(&expr, registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_block(&expr, registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_cast(&expr, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_for_each(&expr, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_index(&expr, registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_slice(&expr, registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_bin_op(&expr, registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone())) }) } -pub fn emit_cloned_arg( - texpr: Rc, - registry: Rc>>, - scope: Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { - emit_typed_expr( - texpr, - registry, - &scope, - depth, - shared_types, - emit_info, - 1024, - ) -} - -pub fn is_enum_type_name( - type_name: String, - type_summaries: Rc>>, -) -> bool { +pub fn emit_cloned_arg(texpr: Rc, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { + emit_typed_expr(texpr, registry, &scope, depth, shared_types, emit_info, 1024) +} + +pub fn is_enum_type_name(type_name: String, type_summaries: Rc>>) -> bool { is_enum_in_summaries(type_summaries, type_name) } -pub fn contextual_variant_parent( - variant_name: &String, - parent_enum: Option, - resolved_type: &Rc, - emit_info: Rc, - source_indices: Rc>>, -) -> Option { +pub fn contextual_variant_parent(variant_name: &String, parent_enum: Option, resolved_type: &Rc, emit_info: Rc, source_indices: Rc>>) -> Option { match parent_enum { - Some(explicit_parent) => { - if variant_belongs_to_enum( - emit_info.type_summaries.clone(), - variant_name.clone(), - explicit_parent.clone(), - ) { - Some(explicit_parent.clone()) - } else { - None - } - } - None => { - let rt_name = authored_name_at(source_indices, &resolved_type); - if (((resolved_type.ident_span.clone() != None) - && (rt_name.clone().as_str() != variant_name.clone().as_str())) - && variant_belongs_to_enum( - emit_info.type_summaries.clone(), - variant_name.clone(), - rt_name.clone(), - )) - { - Some(rt_name.clone()) - } else { - None - } + Some(explicit_parent) => if variant_belongs_to_enum(emit_info.type_summaries.clone(), variant_name.clone(), explicit_parent.clone()) { + Some(explicit_parent.clone()) + } else { + None + }, + None => { + let rt_name = authored_name_at(source_indices, &resolved_type); +if (((resolved_type.ident_span.clone() != None) && (rt_name.clone().as_str() != variant_name.clone().as_str())) && variant_belongs_to_enum(emit_info.type_summaries.clone(), variant_name.clone(), rt_name.clone())) { + Some(rt_name.clone()) + } else { + None } - } +}, +} } -pub fn is_map_typed_expr( - texpr: Rc, - source_indices: Rc>>, -) -> bool { +pub fn is_map_typed_expr(texpr: Rc, source_indices: Rc>>) -> bool { match texpr.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: n, .. }) => { - node_is_keyed_collection(&n, source_indices) - } - _ => false, - } + Some(InferredNode::Resolved { node: n, .. }) => node_is_keyed_collection(&n, source_indices), + _ => false, +} } -pub fn emit_typed_call_expr( - func: &String, - args: Rc>>, - inferred: Option>, - registry: Rc>>, - scope: Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { +pub fn emit_typed_call_expr(func: &String, args: Rc>>, inferred: Option>, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { { let call_str = if (func.clone().as_str() == "empty_map".to_string().as_str()) { match inferred.as_deref().cloned() { - Some(InferredNode::Resolved { node: ret_type, .. }) => { - let kv_type_str = rust_empty_map_kv_type_str( - &ret_type, - &shared_types, - &scope.type_env.clone().source_indices.clone(), - ); - if (kv_type_str.clone().as_str() != "".to_string().as_str()) { - v2_rt::concat( - v2_rt::concat( - "v2_rt::rc_empty_map::<".to_string(), - kv_type_str.clone(), - ), - ">()".to_string(), - ) - } else { - "Rc::new(HashMap::new()) /* BRIDGE: empty_map value type unresolved */" - .to_string() - } + Some(InferredNode::Resolved { node: ret_type, .. }) => { + let kv_type_str = rust_empty_map_kv_type_str(&ret_type, &shared_types, &scope.type_env.clone().source_indices.clone()); +if (kv_type_str.clone().as_str() != "".to_string().as_str()) { + v2_rt::concat(v2_rt::concat("v2_rt::rc_empty_map::<".to_string(), kv_type_str.clone()), ">()".to_string()) + } else { + "Rc::new(HashMap::new()) /* BRIDGE: empty_map value type unresolved */".to_string() } - _ => "Rc::new(HashMap::new()) /* BRIDGE: empty_map return type unresolved */" - .to_string(), - } +}, + _ => "Rc::new(HashMap::new()) /* BRIDGE: empty_map return type unresolved */".to_string(), +} } else { - emit_typed_call( - &func, - &args, - ®istry, - &scope, - depth, - &shared_types, - &emit_info, - ) + emit_typed_call(&func, &args, ®istry, &scope, depth, &shared_types, &emit_info) }; - if rust_runtime_bridge_wraps_collection_result_in_rc(&func) { - v2_rt::concat( - v2_rt::concat("Rc::new(".to_string(), call_str), - ")".to_string(), - ) +if rust_runtime_bridge_wraps_collection_result_in_rc(&func) { + v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), call_str), ")".to_string()) } else { call_str } - } +} } -pub fn emit_typed_call( - func: &String, - args: &Rc>>, - registry: &Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { +pub fn emit_typed_call(func: &String, args: &Rc>>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { { if (func.clone().as_str() == "get".to_string().as_str()) { { let get_args = order_typed_call_args(&args, func.clone(), &scope); - let get_list = get_args.clone().first().cloned(); - let get_idx = get_args.clone().get(1 as usize).cloned(); - let get_result = match get_list { - Some(list_arg) => match get_idx { - Some(idx_arg) => { - let list_str = emit_typed_expr( - arg_value(&list_arg), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let index_str = emit_typed_expr( - arg_value(&idx_arg), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(list_str, ".get((".to_string()), - index_str, - ), - ") as usize)".to_string(), - ), - clone_iterator_suffix(), - ) - } - None => "compile_error!(\"get call missing index argument\")".to_string(), - }, - None => "compile_error!(\"get call missing list argument\")".to_string(), - }; - return get_result; - } +let get_list = get_args.clone().first().cloned(); +let get_idx = get_args.clone().get(1 as usize).cloned(); +let get_result = match get_list { + Some(list_arg) => match get_idx { + Some(idx_arg) => { + let list_str = emit_typed_expr(arg_value(&list_arg), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let index_str = emit_typed_expr(arg_value(&idx_arg), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(list_str, ".get((".to_string()), index_str), ") as usize)".to_string()), clone_iterator_suffix()) +}, + None => "compile_error!(\"get call missing index argument\")".to_string(), +}, + None => "compile_error!(\"get call missing list argument\")".to_string(), +}; +return get_result +} } - if (func.clone().as_str() == "with".to_string().as_str()) { +if (func.clone().as_str() == "with".to_string().as_str()) { { let with_args = order_typed_call_args(&args, func.clone(), &scope); - if ((with_args.clone().len() as i64) == 0) { - return "compile_error!(\"with call missing base record\")".to_string(); +if ((with_args.clone().len() as i64) == 0) { + return "compile_error!(\"with call missing base record\")".to_string() } - let base_arg = arg_value(&with_args.clone().first().cloned().clone().unwrap()); - if ((with_args.clone().len() as i64) < 2) { - return "compile_error!(\"with call missing update record\")".to_string(); +let base_arg = arg_value(&with_args.clone().first().cloned().clone().unwrap()); +if ((with_args.clone().len() as i64) < 2) { + return "compile_error!(\"with call missing update record\")".to_string() } - let update_arg = - arg_value(&with_args.clone().get(1 as usize).cloned().clone().unwrap()); - let base_str = emit_typed_expr( - base_arg.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let type_name = if (base_arg.inferred.clone() != None) { - authored_name_at( - scope.type_env.clone().source_indices.clone(), - &resolved_type(base_arg.clone()), - ) +let update_arg = arg_value(&with_args.clone().get(1 as usize).cloned().clone().unwrap()); +let base_str = emit_typed_expr(base_arg.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let type_name = if (base_arg.inferred.clone() != None) { + authored_name_at(scope.type_env.clone().source_indices.clone(), &resolved_type(base_arg.clone())) } else { "compile_error!(\"with call missing resolved record type\")".to_string() }; - let field_strs = match (*update_arg.expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => Rc::new({ - let mut __result = Vec::new(); - for f in update_arg.children.clone().iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - emit_ident( - field_init_node_name_at( - f.clone(), - scope.type_env.clone().source_indices.clone(), - ), - RenderTarget::Rust, - ), - ": ".to_string(), - ), - emit_typed_expr( - field_init_node_value(&f), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ), - )); - } - __result - }), - _ => Rc::new(vec![emit_typed_expr( - update_arg.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - )]), - }; - let fields_str = field_strs.join(&", ".to_string()); - let needs_rc = emit_map_has(shared_types.clone(), type_name.clone()); - let sharing = language_spec(RenderTarget::Rust).sharing.clone(); - let spread = if needs_rc.clone() { +let field_strs = match (*update_arg.expr_data.clone()).clone() { + ExprData::ExprRecordLit { .. } => Rc::new({ let mut __result = Vec::new(); for f in update_arg.children.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(emit_ident(field_init_node_name_at(f.clone(), scope.type_env.clone().source_indices.clone()), RenderTarget::Rust), ": ".to_string()), emit_typed_expr(field_init_node_value(&f), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024))); } __result }), + _ => Rc::new(vec![emit_typed_expr(update_arg.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024)]), +}; +let fields_str = field_strs.join(&", ".to_string()); +let needs_rc = set_contains(shared_types.clone(), type_name.clone()); +let sharing = language_spec(RenderTarget::Rust).sharing.clone(); +let spread = if needs_rc.clone() { apply_type_template1(sharing.deref_clone.clone(), base_str) } else { apply_type_template1(sharing.clone_value.clone(), base_str) }; - let raw = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(type_name.clone(), " { ".to_string()), - fields_str, - ), - ", ..".to_string(), - ), - spread, - ), - " }".to_string(), - ); - if needs_rc.clone() { - return v2_rt::concat( - v2_rt::concat("Rc::new(".to_string(), raw), - ")".to_string(), - ); +let raw = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(type_name.clone(), " { ".to_string()), fields_str), ", ..".to_string()), spread), " }".to_string()); +if needs_rc.clone() { + return v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) } else { - return raw; + return raw } - } +} } - if (func.clone().as_str() == "to_string".to_string().as_str()) { +if (func.clone().as_str() == "to_string".to_string().as_str()) { { let to_string_args = order_typed_call_args(&args, func.clone(), &scope); - let ts_result = match to_string_args.first().cloned() { - Some(value_arg) => v2_rt::concat( - v2_rt::concat( - "(".to_string(), - emit_typed_expr( - arg_value(&value_arg), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ), - ), - ").to_string()".to_string(), - ), - None => "compile_error!(\"to_string call missing value argument\")".to_string(), - }; - return ts_result; - } +let ts_result = match to_string_args.first().cloned() { + Some(value_arg) => v2_rt::concat(v2_rt::concat("(".to_string(), emit_typed_expr(arg_value(&value_arg), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024)), ").to_string()".to_string()), + None => "compile_error!(\"to_string call missing value argument\")".to_string(), +}; +return ts_result +} } - let collection_scope = if ((((func.clone().as_str() == "map".to_string().as_str()) - || (func.clone().as_str() == "filter".to_string().as_str())) - || (func.clone().as_str() == "flat_map".to_string().as_str())) - || (func.clone().as_str() == "fold".to_string().as_str())) - { +let collection_scope = if ((((func.clone().as_str() == "map".to_string().as_str()) || (func.clone().as_str() == "filter".to_string().as_str())) || (func.clone().as_str() == "flat_map".to_string().as_str())) || (func.clone().as_str() == "fold".to_string().as_str())) { { let call_args = order_typed_call_args(&args, func.clone(), &scope); - match call_args.last().cloned() { - Some(a) => match (*arg_value(&a).expr_data.clone()).clone() { - ExprData::ExprLambda => { - let lps = lambda_param_names_at( - arg_value(&a), - scope.type_env.clone().source_indices.clone(), - ); - lambda_scope_from_children( - scope.clone(), - lps, - Rc::new( - arg_value(&a) - .children - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ) - } - _ => scope.clone(), - }, - None => scope.clone(), - } - } +match call_args.last().cloned() { + Some(a) => match (*arg_value(&a).expr_data.clone()).clone() { + ExprData::ExprLambda => { + let lps = lambda_param_names_at(arg_value(&a), scope.type_env.clone().source_indices.clone()); +lambda_scope_from_children(scope.clone(), lps, Rc::new(arg_value(&a).children.clone().iter().cloned().skip(1 as usize).collect::>())) +}, + _ => scope.clone(), +}, + None => scope.clone(), +} +} } else { scope.clone() }; - let ordered_args = order_typed_call_args(&args, func.clone(), &collection_scope); - let callee = lookup_item(registry.clone(), func.clone()); - let filled_args = fill_default_args( - &ordered_args, - callee.clone(), - registry.clone(), - collection_scope.clone(), - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ); - let is_rt = v2_rt::map_contains_key(&rt_functions(), func.clone()); - let is_rt_ref_map = v2_rt::map_contains_key(&rt_ref_map_functions(), func.clone()); - let callee_qualified = match callee.clone() { - Some(info) => v2_rt::concat( - v2_rt::concat(info.module_name.clone(), ".".to_string()), - func.clone(), - ), - None => func.clone(), - }; - let callee_read_only = - match v2_rt::map_get(&emit_info.read_only_params_index.clone(), callee_qualified) { - Some(m) => m.clone(), - None => v2_rt::rc_empty_map::(), - }; - let callee_is_tco = match callee.clone() { - Some(info) => { - (info.is_self_recursive.clone() && (info.has_non_tail_self_call.clone() == false)) - } - None => false, - }; - let callee_borrow_positions = if callee_is_tco { +let ordered_args = order_typed_call_args(&args, func.clone(), &collection_scope); +let callee = lookup_item(registry.clone(), func.clone()); +let filled_args = fill_default_args(&ordered_args, callee.clone(), registry.clone(), collection_scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()); +let is_rt = v2_rt::map_contains_key(&rt_functions(), func.clone()); +let is_rt_ref_map = v2_rt::map_contains_key(&rt_ref_map_functions(), func.clone()); +let callee_qualified = match callee.clone() { + Some(info) => v2_rt::concat(v2_rt::concat(info.module_name.clone(), ".".to_string()), func.clone()), + None => func.clone(), +}; +let callee_read_only = match v2_rt::map_get(&emit_info.read_only_params_index.clone(), callee_qualified) { + Some(m) => m.clone(), + None => empty_set(), +}; +let callee_is_tco = match callee.clone() { + Some(info) => (info.is_self_recursive.clone() && (info.has_non_tail_self_call.clone() == false)), + None => false, +}; +let callee_borrow_positions = if callee_is_tco { v2_rt::rc_empty_map::() } else { match callee.clone() { - Some(info) => Rc::new( - info.params - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, pair: (i64, Rc)| { - let pname = param_node_name_at( - pair.1.clone(), - collection_scope.type_env.clone().source_indices.clone(), - ); - let n = param_node_type_expr(&pair.1.clone()); - let is_callable = ((n.params.clone().len() as i64) > 0); - let is_borrowable = - ((v2_rt::map_contains_key(&callee_read_only, pname.clone()) - && (is_callable.clone() == false)) - && needs_reference_node( - &n, - collection_scope.type_env.clone().source_indices.clone(), - )); - if is_borrowable.clone() { - v2_rt::rc_map_insert(acc.clone(), (pair.0.clone()).to_string(), true) - } else { - acc.clone() - } - }, - ), - None => v2_rt::rc_empty_map::(), - } + Some(info) => Rc::new(info.params.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, pair: (i64, Rc)| { + let pname = param_node_name_at(pair.1.clone(), collection_scope.type_env.clone().source_indices.clone()); +let n = param_node_type_expr(&pair.1.clone()); +let is_callable = ((n.params.clone().len() as i64) > 0); +let is_borrowable = ((set_contains(callee_read_only.clone(), pname.clone()) && (is_callable.clone() == false)) && needs_reference_node(&n, collection_scope.type_env.clone().source_indices.clone())); +if is_borrowable.clone() { + v2_rt::rc_map_insert(acc.clone(), (pair.0.clone()).to_string(), true) + } else { + acc.clone() + } +}), + None => v2_rt::rc_empty_map::(), +} }; - let arg_strs = Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - filled_args - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - __result.push({ - let idx = pair.0.clone(); - let a = pair.1.clone(); - if (is_rt_ref_map.clone() && (idx.clone() == 0)) { - { - let base = emit_typed_expr_base( - &arg_value(&a), - registry.clone(), - &collection_scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ); - v2_rt::concat("&".to_string(), base.clone()) - } - } else { - if v2_rt::map_contains_key( - &callee_borrow_positions, - (idx.clone()).to_string(), - ) { - { - let base = emit_typed_expr_base( - &arg_value(&a), - registry.clone(), - &collection_scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ); - apply_type_template1( - sharing_for_target(RenderTarget::Rust) - .borrow_arg_template - .clone(), - base.clone(), - ) - } - } else { - emit_cloned_arg( - arg_value(&a), - registry.clone(), - collection_scope.clone(), - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ) - } - } - }); - } - __result - }); - let extra_args = match callee.clone() { - Some(info) => { - let has_effects = (((info.service_names.clone().len() as i64) > 0) - || ((info.resource_names.clone().len() as i64) > 0)); - if has_effects.clone() { +let arg_strs = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(filled_args.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ + let idx = pair.0.clone(); +let a = pair.1.clone(); +if (is_rt_ref_map.clone() && (idx.clone() == 0)) { + { + let base = emit_typed_expr_base(&arg_value(&a), registry.clone(), &collection_scope, depth.clone(), shared_types.clone(), emit_info.clone()); +v2_rt::concat("&".to_string(), base.clone()) +} + } else { + if v2_rt::map_contains_key(&callee_borrow_positions, (idx.clone()).to_string()) { { - let resource_args = Rc::new({ - let mut __result = Vec::new(); - for rn in info.resource_names.clone().iter().cloned() { - __result.push(v2_rt::concat( - "&".to_string(), - emit_ident(rn.clone(), RenderTarget::Rust), - )); - } - __result - }); - let service_args = Rc::new({ - let mut __result = Vec::new(); - for sn in info.service_names.clone().iter().cloned() { - __result.push(service_var_name(sn.clone())); - } - __result - }); - v2_rt::concat(resource_args, service_args) - } + let base = emit_typed_expr_base(&arg_value(&a), registry.clone(), &collection_scope, depth.clone(), shared_types.clone(), emit_info.clone()); +apply_type_template1(sharing_for_target(RenderTarget::Rust).borrow_arg_template.clone(), base.clone()) +} } else { - Rc::new(vec![]) + emit_cloned_arg(arg_value(&a), registry.clone(), collection_scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()) } } - None => Rc::new(vec![]), - }; - let all_args = v2_rt::concat(arg_strs, extra_args); - let args_str = all_args.clone().join(&", ".to_string()); - let runtime_name = rust_runtime_bridge_name(func.clone()); - let func_name = if is_rt.clone() { - v2_rt::concat( - "v2_rt::".to_string(), - emit_ident(runtime_name, RenderTarget::Rust), - ) +}); } __result }); +let extra_args = match callee.clone() { + Some(info) => { + let has_effects = (((info.service_names.clone().len() as i64) > 0) || ((info.resource_names.clone().len() as i64) > 0)); +if has_effects.clone() { + { + let resource_args = Rc::new({ let mut __result = Vec::new(); for rn in info.resource_names.clone().iter().cloned() { __result.push(v2_rt::concat("&".to_string(), emit_ident(rn.clone(), RenderTarget::Rust))); } __result }); +let service_args = Rc::new({ let mut __result = Vec::new(); for sn in info.service_names.clone().iter().cloned() { __result.push(service_var_name(sn.clone())); } __result }); +v2_rt::concat(resource_args, service_args) +} + } else { + Rc::new(vec![]) + } +}, + None => Rc::new(vec![]), +}; +let all_args = v2_rt::concat(arg_strs, extra_args); +let args_str = all_args.clone().join(&", ".to_string()); +let runtime_name = rust_runtime_bridge_name(func.clone()); +let func_name = if is_rt.clone() { + v2_rt::concat("v2_rt::".to_string(), emit_ident(runtime_name, RenderTarget::Rust)) } else { emit_ident(func.clone(), RenderTarget::Rust) }; - let call_str = if ((is_rt.clone() - && (func.clone().as_str() == "concat".to_string().as_str())) - && ((all_args.clone().len() as i64) > 2)) - { +let call_str = if ((is_rt.clone() && (func.clone().as_str() == "concat".to_string().as_str())) && ((all_args.clone().len() as i64) > 2)) { emit_nested_rt_concat(all_args.clone(), "".to_string(), shared_types.clone()) } else { - v2_rt::concat( - v2_rt::concat(v2_rt::concat(func_name, "(".to_string()), args_str), - ")".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(func_name, "(".to_string()), args_str), ")".to_string()) }; - match callee.clone() { - Some(info) => { - let has_effects = (((info.service_names.clone().len() as i64) > 0) - || ((info.resource_names.clone().len() as i64) > 0)); - if has_effects.clone() { - v2_rt::concat(call_str, ".await?".to_string()) - } else { - call_str - } +match callee.clone() { + Some(info) => { + let has_effects = (((info.service_names.clone().len() as i64) > 0) || ((info.resource_names.clone().len() as i64) > 0)); +if has_effects.clone() { + v2_rt::concat(call_str, ".await?".to_string()) + } else { + call_str } - None => call_str, - } - } +}, + None => call_str, +} +} } -pub fn fill_default_args( - ordered: &Rc>>, - callee: Option>, - registry: Rc>>, - scope: Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> Rc>> { +pub fn fill_default_args(ordered: &Rc>>, callee: Option>, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> Rc>> { match callee { - Some(info) => { - let provided_names = Rc::new({ - let mut __result = Vec::new(); - for a in ordered.clone().iter().cloned() { - __result.push( - match arg_name_at(a.clone(), scope.type_env.clone().source_indices.clone()) - { - Some(n) => n.clone(), - None => "".to_string(), - }, - ); - } - __result - }); - let missing_with_defaults = Rc::new({ - let mut __result = Vec::new(); - for p in info.params.clone().iter().cloned() { - if { - let is_provided = { - let mut __found = false; - for n in provided_names.clone().iter().cloned() { - if (n.clone().as_str() - == param_node_name_at( - p.clone(), - scope.type_env.clone().source_indices.clone(), - ) - .as_str()) - { - __found = true; - break; - } - } - __found - }; - if is_provided.clone() { - false - } else { - (param_node_default_value(&p) != None) - } - } { - __result.push(p); - } - } - __result - }); - let default_args = Rc::new({ - let mut __result = Vec::new(); - for p in missing_with_defaults.iter().cloned() { - __result.push(make_arg_node( - Some(param_node_name_at( - p.clone(), - scope.type_env.clone().source_indices.clone(), - )), - param_node_default_value(&p).clone().unwrap(), - p.span.clone(), - p.span.clone(), - )); - } - __result - }); - v2_rt::concat(ordered.clone(), default_args) - } - None => ordered.clone(), - } + Some(info) => { + let provided_names = Rc::new({ let mut __result = Vec::new(); for a in ordered.clone().iter().cloned() { __result.push(match arg_name_at(a.clone(), scope.type_env.clone().source_indices.clone()) { + Some(n) => n.clone(), + None => "".to_string(), +}); } __result }); +let missing_with_defaults = Rc::new({ let mut __result = Vec::new(); for p in info.params.clone().iter().cloned() { if { + let is_provided = { let mut __found = false; for n in provided_names.clone().iter().cloned() { if (n.clone().as_str() == param_node_name_at(p.clone(), scope.type_env.clone().source_indices.clone()).as_str()) { __found = true; break; } } __found }; +if is_provided.clone() { + false + } else { + (param_node_default_value(&p) != None) + } +} { __result.push(p); } } __result }); +let default_args = Rc::new({ let mut __result = Vec::new(); for p in missing_with_defaults.iter().cloned() { __result.push(make_arg_node(Some(param_node_name_at(p.clone(), scope.type_env.clone().source_indices.clone())), param_node_default_value(&p).clone().unwrap(), p.span.clone(), p.span.clone())); } __result }); +v2_rt::concat(ordered.clone(), default_args) +}, + None => ordered.clone(), +} } -pub fn fill_op_default_args( - ordered: &Rc>>, - op_params: Rc>>, - registry: Rc>>, - scope: Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> Rc>> { +pub fn fill_op_default_args(ordered: &Rc>>, op_params: Rc>>, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> Rc>> { { let si = scope.type_env.clone().source_indices.clone(); - let arg_map = ordered.clone().iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, a: Rc| match arg_name_at( - a.clone(), - si.clone(), - ) { - Some(n) => v2_rt::rc_map_insert(acc.clone(), n.clone(), a.clone()), - None => acc.clone(), +let arg_map = ordered.clone().iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, a: Rc| match arg_name_at(a.clone(), si.clone()) { + Some(n) => v2_rt::rc_map_insert(acc.clone(), n.clone(), a.clone()), + None => acc.clone(), +}); +let unnamed_args = Rc::new({ let mut __result = Vec::new(); for a in ordered.clone().iter().cloned() { if (arg_name_at(a.clone(), si.clone()) == None) { __result.push(a); } } __result }); +let named_ordered = Rc::new({ let mut __result = Vec::new(); for p in op_params.iter().cloned() { __result.extend((*{ + let pname = param_node_name_at(p.clone(), si.clone()); +match v2_rt::map_get(&arg_map, pname.clone()) { + Some(arg) => Rc::new(vec![arg.clone()]), + None => if (param_node_default_value(&p) != None) { + Rc::new(vec![make_arg_node(Some(pname.clone()), param_node_default_value(&p).clone().unwrap(), p.span.clone(), p.span.clone())]) + } else { + Rc::new(vec![]) }, - ); - let unnamed_args = Rc::new({ - let mut __result = Vec::new(); - for a in ordered.clone().iter().cloned() { - if (arg_name_at(a.clone(), si.clone()) == None) { - __result.push(a); - } - } - __result - }); - let named_ordered = Rc::new({ - let mut __result = Vec::new(); - for p in op_params.iter().cloned() { - __result.extend( - (*{ - let pname = param_node_name_at(p.clone(), si.clone()); - match v2_rt::map_get(&arg_map, pname.clone()) { - Some(arg) => Rc::new(vec![arg.clone()]), - None => { - if (param_node_default_value(&p) != None) { - Rc::new(vec![make_arg_node( - Some(pname.clone()), - param_node_default_value(&p).clone().unwrap(), - p.span.clone(), - p.span.clone(), - )]) - } else { - Rc::new(vec![]) - } - } - } - }) - .iter() - .cloned(), - ); - } - __result - }); - v2_rt::concat(named_ordered, unnamed_args) - } +} +}).iter().cloned()); } __result }); +v2_rt::concat(named_ordered, unnamed_args) +} } -pub fn emit_nested_rt_concat( - mut remaining: Rc>, - mut acc: String, - mut shared_types: Rc>, -) -> String { +pub fn emit_nested_rt_concat(mut remaining: Rc>, mut acc: String, mut shared_types: Rc>) -> String { loop { match remaining.clone().first().cloned() { - None => { - break acc.clone(); - } - Some(arg) => { - let next_acc = if (acc.clone().as_str() == "".to_string().as_str()) { - arg.clone() - } else { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("v2_rt::concat(".to_string(), acc.clone()), - ", ".to_string(), - ), - arg.clone(), - ), - ")".to_string(), - ) - }; - { - let __tco_0 = Rc::new( - remaining - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - let __tco_1 = next_acc; - remaining = __tco_0; - acc = __tco_1; - continue; - } - } - } - } + None => { break acc.clone(); }, + Some(arg) => { let next_acc = if (acc.clone().as_str() == "".to_string().as_str()) { + arg.clone() + } else { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("v2_rt::concat(".to_string(), acc.clone()), ", ".to_string()), arg.clone()), ")".to_string()) + }; +{ + let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); +let __tco_1 = next_acc; +remaining = __tco_0; +acc = __tco_1; +continue; +} }, } - -pub fn emit_typed_for_each( - variable: &String, - collection: &Rc, - body: Rc, - registry: &Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { +} +} + +pub fn emit_typed_for_each(variable: &String, collection: &Rc, body: Rc, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { { let sharing = language_spec(RenderTarget::Rust).sharing.clone(); - let coll_str = emit_typed_expr( - collection.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let elem_type = for_each_element_type_node( - resolved_type(collection.clone()), - scope.type_env.clone().source_indices.clone(), - ); - let body_scope = extend_scope( - &scope, - &variable, - elem_type, - Rc::new(SubValueRelation::SubValueUnknown), - ); - let body_str = emit_typed_expr( - body, - registry.clone(), - &body_scope, - (depth.clone() + 2), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let ind1 = make_indent((depth.clone() + 1)); - let ind2 = make_indent((depth.clone() + 2)); - let ind0 = make_indent(depth.clone()); - let iter_str = apply_type_template1(sharing.iter_owned.clone(), coll_str); - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\n".to_string(), ind1.clone()), "let mut __collect = Vec::new();\n".to_string()), ind1.clone()), "for ".to_string()), emit_ident(variable.clone(), RenderTarget::Rust)), " in ".to_string()), iter_str), " {\n".to_string()), ind2), "__collect.push(".to_string()), body_str), ");\n".to_string()), ind1.clone()), "}\n".to_string()), ind1.clone()), "Rc::new(__collect)\n".to_string()), ind0), "}".to_string()) - } +let coll_str = emit_typed_expr(collection.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let elem_type = for_each_element_type_node(resolved_type(collection.clone()), scope.type_env.clone().source_indices.clone()); +let body_scope = extend_scope(&scope, &variable, elem_type, Rc::new(SubValueRelation::SubValueUnknown)); +let body_str = emit_typed_expr(body, registry.clone(), &body_scope, (depth.clone() + 2), shared_types.clone(), emit_info.clone(), 1024); +let ind1 = make_indent((depth.clone() + 1)); +let ind2 = make_indent((depth.clone() + 2)); +let ind0 = make_indent(depth.clone()); +let iter_str = apply_type_template1(sharing.iter_owned.clone(), coll_str); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\n".to_string(), ind1.clone()), "let mut __collect = Vec::new();\n".to_string()), ind1.clone()), "for ".to_string()), emit_ident(variable.clone(), RenderTarget::Rust)), " in ".to_string()), iter_str), " {\n".to_string()), ind2), "__collect.push(".to_string()), body_str), ");\n".to_string()), ind1.clone()), "}\n".to_string()), ind1.clone()), "Rc::new(__collect)\n".to_string()), ind0), "}".to_string()) +} } -pub fn emit_typed_index( - base: &Rc, - index: Rc, - registry: &Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { +pub fn emit_typed_index(base: &Rc, index: Rc, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { { let spec = language_spec(RenderTarget::Rust); - let base_str = emit_typed_expr( - base.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let index_str = emit_typed_expr( - index, - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let base_node = normalize_access_type_node(resolved_type(base.clone())); - let is_map = - node_is_keyed_collection(&base_node, scope.type_env.clone().source_indices.clone()); - if is_rust_string_like( - base_node.clone(), - scope.type_env.clone().source_indices.clone(), - ) { - apply_type_template2( - spec.indexing.clone().string_index.clone(), - base_str, - index_str, - ) +let base_str = emit_typed_expr(base.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let index_str = emit_typed_expr(index, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let base_node = normalize_access_type_node(resolved_type(base.clone())); +let is_map = node_is_keyed_collection(&base_node, scope.type_env.clone().source_indices.clone()); +if is_rust_string_like(base_node.clone(), scope.type_env.clone().source_indices.clone()) { + apply_type_template2(spec.indexing.clone().string_index.clone(), base_str, index_str) } else { if is_map { apply_type_template2(spec.indexing.clone().map_index.clone(), base_str, index_str) } else { - apply_type_template2( - spec.indexing.clone().list_index.clone(), - base_str, - index_str, - ) + apply_type_template2(spec.indexing.clone().list_index.clone(), base_str, index_str) } } - } +} } -pub fn emit_typed_slice( - base: &Rc, - start: Rc, - end: Rc, - registry: &Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { +pub fn emit_typed_slice(base: &Rc, start: Rc, end: Rc, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { { let spec = language_spec(RenderTarget::Rust); - let base_str = emit_typed_expr( - base.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let start_str = emit_typed_expr( - start, - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let end_str = emit_typed_expr( - end, - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let base_node = normalize_access_type_node(resolved_type(base.clone())); - if is_rust_string_like(base_node, scope.type_env.clone().source_indices.clone()) { +let base_str = emit_typed_expr(base.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let start_str = emit_typed_expr(start, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let end_str = emit_typed_expr(end, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let base_node = normalize_access_type_node(resolved_type(base.clone())); +if is_rust_string_like(base_node, scope.type_env.clone().source_indices.clone()) { match spec.indexing.clone().string_slice.clone() { - Some(tmpl) => apply_type_template3(tmpl.clone(), base_str, start_str, end_str), - None => emit_error_expr( - "unsupported string slice for target".to_string(), - RenderTarget::Rust, - ), - } + Some(tmpl) => apply_type_template3(tmpl.clone(), base_str, start_str, end_str), + None => emit_error_expr("unsupported string slice for target".to_string(), RenderTarget::Rust), +} } else { match spec.indexing.clone().list_slice.clone() { - Some(tmpl) => apply_type_template3(tmpl.clone(), base_str, start_str, end_str), - None => emit_error_expr( - "unsupported list slice for target".to_string(), - RenderTarget::Rust, - ), - } - } - } + Some(tmpl) => apply_type_template3(tmpl.clone(), base_str, start_str, end_str), + None => emit_error_expr("unsupported list slice for target".to_string(), RenderTarget::Rust), } - -pub fn collection_element_type( - receiver_type: Option>, - shared_types: Rc>, - source_indices: &Rc>>, -) -> String { - match receiver_type.as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - let __rt_is_container = node_is_element_collection(&rt, source_indices.clone()); - if __rt_is_container { - match rt.children.clone().first().cloned() { - Some(elem_child) => { - let elem_node = child_type_node(&elem_child); - let elem_is_error = if (elem_node.inferred.clone() != None) { - is_compiler_error(elem_node.inferred.clone().clone().unwrap()) - } else { - false - }; - let elem_is_type_var = if (elem_node.inferred.clone() != None) { - is_type_variable(elem_node.inferred.clone().clone().unwrap()) - } else { - false - }; - if (elem_is_error || elem_is_type_var) { - "_".to_string() - } else { - render_rust_type( - elem_node.clone(), - shared_types, - source_indices.clone(), - ) - } - } - None => "_".to_string(), - } - } else { - "_".to_string() - } } - _ => "_".to_string(), - } } - -pub fn lambda_scope_from_children( - scope: Rc, - params: Rc>, - param_nodes: Rc>>, -) -> Rc { - Rc::new( - params - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - .fold(scope.clone(), |acc: Rc, pair: (i64, String)| { - let idx = pair.0.clone(); - let param_name = pair.1.clone(); - let param_type = match param_nodes.clone().get(idx.clone() as usize).cloned() { - Some(pn) => match pn.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { - node: resolved_type, - .. - }) => resolved_type.clone(), - _ => type_variable_node("lambda_param".to_string()), - }, - None => type_variable_node("lambda_param".to_string()), - }; - extend_scope( - &acc, - ¶m_name, - param_type.clone(), - Rc::new(SubValueRelation::SubValueUnknown), - ) - }) } -pub fn lambda_param_type_strs( - params: Rc>, - param_nodes: Rc>>, - fallback_types: Rc>, - shared_types: Rc>, - source_indices: Rc>>, -) -> Rc> { - Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - params - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - __result.push({ - let idx = pair.0.clone(); - let param_name = pair.1.clone(); - let inferred_type = match param_nodes.clone().get(idx.clone() as usize).cloned() { - Some(pn) => match pn.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { - node: param_type, .. - }) => { - let param_is_error = if (param_type.inferred.clone() != None) { - is_compiler_error(param_type.inferred.clone().clone().unwrap()) - } else { - false - }; - let param_is_type_var = if (param_type.inferred.clone() != None) { - is_type_variable(param_type.inferred.clone().clone().unwrap()) - } else { - false - }; - if (param_is_type_var.clone() || param_is_error.clone()) { - None - } else { - Some(render_rust_type( - param_type.clone(), - shared_types.clone(), - source_indices.clone(), - )) - } - } - _ => None, - }, - None => None, +pub fn collection_element_type(receiver_type: Option>, shared_types: Rc>, source_indices: &Rc>>) -> String { + match receiver_type.as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + let __rt_is_container = node_is_element_collection(&rt, source_indices.clone()); +if __rt_is_container { + match rt.children.clone().first().cloned() { + Some(elem_child) => { + let elem_node = child_type_node(&elem_child); +let elem_is_error = if (elem_node.inferred.clone() != None) { + is_compiler_error(elem_node.inferred.clone().clone().unwrap()) + } else { + false }; - let fallback_type = match fallback_types.clone().get(idx.clone() as usize).cloned() - { - Some(ty) => ty.clone(), - None => "_".to_string(), +let elem_is_type_var = if (elem_node.inferred.clone() != None) { + is_type_variable(elem_node.inferred.clone().clone().unwrap()) + } else { + false }; - let spec = language_spec(RenderTarget::Rust); - let ident = emit_ident(param_name.clone(), RenderTarget::Rust); - match inferred_type.clone() { - Some(ty) => apply_type_template2( - spec.annotations.clone().lambda_param_typed.clone(), - ident.clone(), - ty.clone(), - ), - None => apply_type_template2( - spec.annotations.clone().lambda_param_typed.clone(), - ident.clone(), - fallback_type.clone(), - ), +if (elem_is_error || elem_is_type_var) { + "_".to_string() + } else { + render_rust_type(elem_node.clone(), shared_types, source_indices.clone()) } - }); +}, + None => "_".to_string(), +} + } else { + "_".to_string() } - __result - }) +}, + _ => "_".to_string(), +} } -pub fn emit_typed_collection_lambda( - lambda_expr: &Rc, - elem_type_str: String, - registry: Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: Rc, -) -> String { - match (*lambda_expr.expr_data.clone()).clone() { - ExprData::ExprLambda => { - let ps = lambda_param_names_at( - lambda_expr.clone(), - scope.type_env.clone().source_indices.clone(), - ); - let bd = lambda_body(lambda_expr.clone()); - let pn = Rc::new( - lambda_expr - .children - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - let param_strs = lambda_param_type_strs( - ps.clone(), - pn.clone(), - Rc::new(vec![elem_type_str]), - shared_types.clone(), - scope.type_env.clone().source_indices.clone(), - ); - let params_str = param_strs.join(&", ".to_string()); - let lambda_scope = lambda_scope_from_children(scope.clone(), ps.clone(), pn.clone()); - let body_str = emit_typed_expr( - bd, - registry, - &lambda_scope, - depth, - shared_types.clone(), - emit_info, - 1024, - ); - v2_rt::concat( - v2_rt::concat(v2_rt::concat("|".to_string(), params_str), "| ".to_string()), - body_str, - ) - } - _ => emit_typed_expr( - lambda_expr.clone(), - registry, - &scope, - depth, - shared_types.clone(), - emit_info, - 1024, - ), - } +pub fn lambda_scope_from_children(scope: Rc, params: Rc>, param_nodes: Rc>>) -> Rc { + Rc::new(params.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(scope.clone(), |acc: Rc, pair: (i64, String)| { + let idx = pair.0.clone(); +let param_name = pair.1.clone(); +let param_type = match param_nodes.clone().get(idx.clone() as usize).cloned() { + Some(pn) => match pn.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: resolved_type, .. }) => resolved_type.clone(), + _ => type_variable_node("lambda_param".to_string()), +}, + None => type_variable_node("lambda_param".to_string()), +}; +extend_scope(&acc, ¶m_name, param_type.clone(), Rc::new(SubValueRelation::SubValueUnknown)) +}) } -pub fn emit_typed_fold_lambda( - lambda_expr: &Rc, - acc_type_str: &String, - elem_type_str: String, - registry: Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { - match (*lambda_expr.expr_data.clone()).clone() { - ExprData::ExprLambda => { - let ps = lambda_param_names_at( - lambda_expr.clone(), - scope.type_env.clone().source_indices.clone(), - ); - let bd = lambda_body(lambda_expr.clone()); - let pn = Rc::new( - lambda_expr - .children - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - let safe_acc_type = if (((acc_type_str.clone().as_str() - == "Rc>".to_string().as_str()) - || (acc_type_str.clone().as_str() == "Vec<()>".to_string().as_str())) - || (acc_type_str.clone().as_str() == "Option<()>".to_string().as_str())) - { - "_".to_string() +pub fn lambda_param_type_strs(params: Rc>, param_nodes: Rc>>, fallback_types: Rc>, shared_types: Rc>, source_indices: Rc>>) -> Rc> { + Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(params.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ + let idx = pair.0.clone(); +let param_name = pair.1.clone(); +let inferred_type = match param_nodes.clone().get(idx.clone() as usize).cloned() { + Some(pn) => match pn.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: param_type, .. }) => { + let param_is_error = if (param_type.inferred.clone() != None) { + is_compiler_error(param_type.inferred.clone().clone().unwrap()) } else { - acc_type_str.clone() + false }; - let fallback_types = Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - ps.clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - __result.push(if (pair.0.clone() == 0) { - safe_acc_type.clone() - } else { - elem_type_str.clone() - }); - } - __result - }); - let param_strs = lambda_param_type_strs( - ps.clone(), - Rc::new(vec![]), - fallback_types, - shared_types.clone(), - scope.type_env.clone().source_indices.clone(), - ); - let params_str = param_strs.join(&", ".to_string()); - let lambda_scope = lambda_scope_from_children(scope.clone(), ps.clone(), pn); - let body_str = emit_typed_expr( - bd, - registry, - &lambda_scope, - depth, - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let acc_name = match ps.clone().first().cloned() { - Some(n) => n.clone(), - None => "".to_string(), +let param_is_type_var = if (param_type.inferred.clone() != None) { + is_type_variable(param_type.inferred.clone().clone().unwrap()) + } else { + false }; - let needs_unwrap = ((acc_name.clone().as_str() != "".to_string().as_str()) - && emit_map_has(emit_info.owned_bindings.clone(), acc_name.clone())); - if needs_unwrap { - { - let acc_ident = emit_ident(acc_name.clone(), RenderTarget::Rust); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("|".to_string(), params_str), - "| { let ".to_string(), - ), - acc_ident.clone(), - ), - " = Rc::try_unwrap(".to_string(), - ), - acc_ident.clone(), - ), - ").unwrap_or_else(|rc| (*rc).clone()); ".to_string(), - ), - body_str, - ), - " }".to_string(), - ) - } +if (param_is_type_var.clone() || param_is_error.clone()) { + None } else { - v2_rt::concat( - v2_rt::concat(v2_rt::concat("|".to_string(), params_str), "| ".to_string()), - body_str, - ) + Some(render_rust_type(param_type.clone(), shared_types.clone(), source_indices.clone())) } - } - _ => emit_typed_expr( - lambda_expr.clone(), - registry, - &scope, - depth, - shared_types.clone(), - emit_info.clone(), - 1024, - ), - } +}, + _ => None, +}, + None => None, +}; +let fallback_type = match fallback_types.clone().get(idx.clone() as usize).cloned() { + Some(ty) => ty.clone(), + None => "_".to_string(), +}; +let spec = language_spec(RenderTarget::Rust); +let ident = emit_ident(param_name.clone(), RenderTarget::Rust); +match inferred_type.clone() { + Some(ty) => apply_type_template2(spec.annotations.clone().lambda_param_typed.clone(), ident.clone(), ty.clone()), + None => apply_type_template2(spec.annotations.clone().lambda_param_typed.clone(), ident.clone(), fallback_type.clone()), +} +}); } __result }) } -pub fn emit_rust_fold_method_call( - method_call_node: Rc, - fold_accumulator_type: Option>, - result_type: Option>, - receiver: &Rc, - args: &Rc>>, - registry: &Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { - { - let recv_str = emit_typed_expr( - receiver.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let elem_type_str = collection_element_type( - receiver.inferred.clone(), - shared_types.clone(), - &scope.type_env.clone().source_indices.clone(), - ); - let contextual_acc_type = match result_type.as_deref().cloned() { - Some(InferredNode::Resolved { - node: method_result_type, - .. - }) => Some(method_result_type.clone()), - _ => None, - }; - let acc_type_node = match fold_accumulator_type { - Some(acc_type) => { - let acc_children_have_unit = ({ - let mut __found = false; - for c in acc_type.children.clone().iter().cloned() { - if (is_unit_like(&c) || (c.ident_span.clone() == None)) { - __found = true; - break; - } - } - __found - } || { - let mut __found = false; - for c in acc_type.children.clone().iter().cloned() { - if { - let mut __found = false; - for gc in c.children.clone().iter().cloned() { - if (is_unit_like(&gc) || (gc.ident_span.clone() == None)) { - __found = true; - break; - } - } - __found - } { - __found = true; - break; - } - } - __found - }); - let is_under_resolved_map = (node_is_keyed_collection( - &acc_type, - scope.type_env.clone().source_indices.clone(), - ) && (((acc_type.children.clone().len() as i64) - == 0) - || acc_children_have_unit)); - let is_under_resolved_list = (node_is_element_collection( - &acc_type, - scope.type_env.clone().source_indices.clone(), - ) && ((acc_type.children.clone().len() as i64) == 0)); - let is_under_resolved_non_collection = ((!node_is_keyed_collection( - &acc_type, - scope.type_env.clone().source_indices.clone(), - ) && !node_is_element_collection( - &acc_type, - scope.type_env.clone().source_indices.clone(), - )) && !node_is_collection( - &acc_type, - scope.type_env.clone().source_indices.clone(), - )); - if ((is_under_resolved_map || is_under_resolved_list) - || is_under_resolved_non_collection) - { - match contextual_acc_type { - Some(concrete_type) => concrete_type.clone(), - None => acc_type.clone(), - } - } else { - acc_type.clone() - } - } - None => match contextual_acc_type { - Some(concrete_type) => concrete_type.clone(), - None => match args.clone().first().cloned() { - Some(init_arg) => { - if (arg_value(&init_arg).inferred.clone() != None) { - resolved_type(arg_value(&init_arg)) - } else { - type_variable_node("fold_accum".to_string()) - } - } - None => type_variable_node("fold_accum".to_string()), - }, - }, - }; - let acc_type_name = authored_name_at( - scope.type_env.clone().source_indices.clone(), - &acc_type_node, - ); - let fold_lambda_node = match args.clone().get(1 as usize).cloned() { - Some(a) => arg_value(&a), - None => type_variable_node("".to_string()), +pub fn emit_typed_collection_lambda(lambda_expr: &Rc, elem_type_str: String, registry: Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: Rc) -> String { + match (*lambda_expr.expr_data.clone()).clone() { + ExprData::ExprLambda => { + let ps = lambda_param_names_at(lambda_expr.clone(), scope.type_env.clone().source_indices.clone()); +let bd = lambda_body(lambda_expr.clone()); +let pn = Rc::new(lambda_expr.children.clone().iter().cloned().skip(1 as usize).collect::>()); +let param_strs = lambda_param_type_strs(ps.clone(), pn.clone(), Rc::new(vec![elem_type_str]), shared_types.clone(), scope.type_env.clone().source_indices.clone()); +let params_str = param_strs.join(&", ".to_string()); +let lambda_scope = lambda_scope_from_children(scope.clone(), ps.clone(), pn.clone()); +let body_str = emit_typed_expr(bd, registry, &lambda_scope, depth, shared_types.clone(), emit_info, 1024); +v2_rt::concat(v2_rt::concat(v2_rt::concat("|".to_string(), params_str), "| ".to_string()), body_str) +}, + _ => emit_typed_expr(lambda_expr.clone(), registry, &scope, depth, shared_types.clone(), emit_info, 1024), +} +} + +pub fn emit_typed_fold_lambda(lambda_expr: &Rc, acc_type_str: &String, elem_type_str: String, registry: Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { + match (*lambda_expr.expr_data.clone()).clone() { + ExprData::ExprLambda => { + let ps = lambda_param_names_at(lambda_expr.clone(), scope.type_env.clone().source_indices.clone()); +let bd = lambda_body(lambda_expr.clone()); +let pn = Rc::new(lambda_expr.children.clone().iter().cloned().skip(1 as usize).collect::>()); +let safe_acc_type = if (((acc_type_str.clone().as_str() == "Rc>".to_string().as_str()) || (acc_type_str.clone().as_str() == "Vec<()>".to_string().as_str())) || (acc_type_str.clone().as_str() == "Option<()>".to_string().as_str())) { + "_".to_string() + } else { + acc_type_str.clone() }; - let acc_param_name = match (*fold_lambda_node.expr_data.clone()).clone() { - ExprData::ExprLambda => match lambda_param_names_at( - fold_lambda_node.clone(), - scope.type_env.clone().source_indices.clone(), - ) - .first() - .cloned() +let fallback_types = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(ps.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push(if (pair.0.clone() == 0) { + safe_acc_type.clone() + } else { + elem_type_str.clone() + }); } __result }); +let param_strs = lambda_param_type_strs(ps.clone(), Rc::new(vec![]), fallback_types, shared_types.clone(), scope.type_env.clone().source_indices.clone()); +let params_str = param_strs.join(&", ".to_string()); +let lambda_scope = lambda_scope_from_children(scope.clone(), ps.clone(), pn); +let body_str = emit_typed_expr(bd, registry, &lambda_scope, depth, shared_types.clone(), emit_info.clone(), 1024); +let acc_name = match ps.clone().first().cloned() { + Some(n) => n.clone(), + None => "".to_string(), +}; +let needs_unwrap = ((acc_name.clone().as_str() != "".to_string().as_str()) && set_contains(emit_info.owned_bindings.clone(), acc_name.clone())); +if needs_unwrap { { - Some(n) => n.clone(), - None => "".to_string(), - }, - _ => "".to_string(), - }; - let fold_proof = analyze_single_fold( - &method_call_node, - &scope.type_env.clone().source_indices.clone(), - ); - let structural_unwrap = ((fold_proof.eligible.clone() - && fold_proof.body_constructs_acc.clone()) - && fold_proof.safe_field_moves.clone()); - let structural_move = - (fold_proof.eligible.clone() && fold_proof.whole_acc_single_use.clone()); - let acc_unwrap = - (structural_unwrap && emit_map_has(shared_types.clone(), acc_type_name.clone())); - let fold_emit_info = if acc_unwrap { - match (*fold_lambda_node.expr_data.clone()).clone() { - ExprData::ExprLambda => { - let ps = lambda_param_names_at( - fold_lambda_node.clone(), - scope.type_env.clone().source_indices.clone(), - ); - match ps.first().cloned() { - Some(acc_name) => Rc::new(EmitGraphInfo { - type_summaries: emit_info.type_summaries.clone(), - recursive_type_set: emit_info.recursive_type_set.clone(), - fielded_variants: emit_info.fielded_variants.clone(), - shared_types: emit_info.shared_types.clone(), - ownership_index: emit_info.ownership_index.clone(), - movable: emit_info.movable.clone(), - variant_to_enum: emit_info.variant_to_enum.clone(), - owned_bindings: v2_rt::rc_map_insert( - emit_info.owned_bindings.clone(), - acc_name.clone(), - true, - ), - read_only_params_index: emit_info.read_only_params_index.clone(), - read_only_params: emit_info.read_only_params.clone(), - }), - None => emit_info.clone(), - } - } - _ => emit_info.clone(), + let acc_ident = emit_ident(acc_name.clone(), RenderTarget::Rust); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("|".to_string(), params_str), "| { let ".to_string()), acc_ident.clone()), " = Rc::try_unwrap(".to_string()), acc_ident.clone()), ").unwrap_or_else(|rc| (*rc).clone()); ".to_string()), body_str), " }".to_string()) +} + } else { + v2_rt::concat(v2_rt::concat(v2_rt::concat("|".to_string(), params_str), "| ".to_string()), body_str) + } +}, + _ => emit_typed_expr(lambda_expr.clone(), registry, &scope, depth, shared_types.clone(), emit_info.clone(), 1024), +} +} + +pub fn emit_rust_fold_method_call(method_call_node: Rc, fold_accumulator_type: Option>, result_type: Option>, receiver: &Rc, args: &Rc>>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { + { + let recv_str = emit_typed_expr(receiver.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let elem_type_str = collection_element_type(receiver.inferred.clone(), shared_types.clone(), &scope.type_env.clone().source_indices.clone()); +let contextual_acc_type = match result_type.as_deref().cloned() { + Some(InferredNode::Resolved { node: method_result_type, .. }) => Some(method_result_type.clone()), + _ => None, +}; +let acc_type_node = match fold_accumulator_type { + Some(acc_type) => { + let acc_children_have_unit = ({ let mut __found = false; for c in acc_type.children.clone().iter().cloned() { if (is_unit_like(&c) || (c.ident_span.clone() == None)) { __found = true; break; } } __found } || { let mut __found = false; for c in acc_type.children.clone().iter().cloned() { if { let mut __found = false; for gc in c.children.clone().iter().cloned() { if (is_unit_like(&gc) || (gc.ident_span.clone() == None)) { __found = true; break; } } __found } { __found = true; break; } } __found }); +let is_under_resolved_map = (node_is_keyed_collection(&acc_type, scope.type_env.clone().source_indices.clone()) && (((acc_type.children.clone().len() as i64) == 0) || acc_children_have_unit)); +let is_under_resolved_list = (node_is_element_collection(&acc_type, scope.type_env.clone().source_indices.clone()) && ((acc_type.children.clone().len() as i64) == 0)); +let is_under_resolved_non_collection = ((!node_is_keyed_collection(&acc_type, scope.type_env.clone().source_indices.clone()) && !node_is_element_collection(&acc_type, scope.type_env.clone().source_indices.clone())) && !node_is_collection(&acc_type, scope.type_env.clone().source_indices.clone())); +if ((is_under_resolved_map || is_under_resolved_list) || is_under_resolved_non_collection) { + match contextual_acc_type { + Some(concrete_type) => concrete_type.clone(), + None => acc_type.clone(), +} + } else { + acc_type.clone() } +}, + None => match contextual_acc_type { + Some(concrete_type) => concrete_type.clone(), + None => match args.clone().first().cloned() { + Some(init_arg) => if (arg_value(&init_arg).inferred.clone() != None) { + resolved_type(arg_value(&init_arg)) + } else { + type_variable_node("fold_accum".to_string()) + }, + None => type_variable_node("fold_accum".to_string()), +}, +}, +}; +let acc_type_name = authored_name_at(scope.type_env.clone().source_indices.clone(), &acc_type_node); +let fold_lambda_node = match args.clone().get(1 as usize).cloned() { + Some(a) => arg_value(&a), + None => type_variable_node("".to_string()), +}; +let acc_param_name = match (*fold_lambda_node.expr_data.clone()).clone() { + ExprData::ExprLambda => match lambda_param_names_at(fold_lambda_node.clone(), scope.type_env.clone().source_indices.clone()).first().cloned() { + Some(n) => n.clone(), + None => "".to_string(), +}, + _ => "".to_string(), +}; +let fold_proof = analyze_single_fold(&method_call_node, &scope.type_env.clone().source_indices.clone()); +let structural_unwrap = ((fold_proof.eligible.clone() && fold_proof.body_constructs_acc.clone()) && fold_proof.safe_field_moves.clone()); +let structural_move = (fold_proof.eligible.clone() && fold_proof.whole_acc_single_use.clone()); +let acc_unwrap = (structural_unwrap && set_contains(shared_types.clone(), acc_type_name.clone())); +let fold_emit_info = if acc_unwrap { + match (*fold_lambda_node.expr_data.clone()).clone() { + ExprData::ExprLambda => { + let ps = lambda_param_names_at(fold_lambda_node.clone(), scope.type_env.clone().source_indices.clone()); +match ps.first().cloned() { + Some(acc_name) => Rc::new(EmitGraphInfo { + type_summaries: emit_info.type_summaries.clone(), + recursive_type_set: emit_info.recursive_type_set.clone(), + fielded_variants: emit_info.fielded_variants.clone(), + untagged_json_tuple_variants: emit_info.untagged_json_tuple_variants.clone(), + shared_types: emit_info.shared_types.clone(), + ownership_index: emit_info.ownership_index.clone(), + movable: emit_info.movable.clone(), + variant_to_enum: emit_info.variant_to_enum.clone(), + owned_bindings: v2_rt::rc_map_insert(emit_info.owned_bindings.clone(), acc_name.clone(), true), + read_only_params_index: emit_info.read_only_params_index.clone(), + read_only_params: emit_info.read_only_params.clone(), +}), + None => emit_info.clone(), +} +}, + _ => emit_info.clone(), +} } else { if structural_move { match (*fold_lambda_node.expr_data.clone()).clone() { - ExprData::ExprLambda => { - let ps = lambda_param_names_at( - fold_lambda_node.clone(), - scope.type_env.clone().source_indices.clone(), - ); - match ps.first().cloned() { - Some(acc_name) => Rc::new(EmitGraphInfo { - type_summaries: emit_info.type_summaries.clone(), - recursive_type_set: emit_info.recursive_type_set.clone(), - fielded_variants: emit_info.fielded_variants.clone(), - shared_types: emit_info.shared_types.clone(), - ownership_index: emit_info.ownership_index.clone(), - movable: v2_rt::rc_map_insert( - emit_info.movable.clone(), - acc_name.clone(), - true, - ), - variant_to_enum: emit_info.variant_to_enum.clone(), - owned_bindings: emit_info.owned_bindings.clone(), - read_only_params_index: emit_info.read_only_params_index.clone(), - read_only_params: emit_info.read_only_params.clone(), - }), - None => emit_info.clone(), - } - } - _ => emit_info.clone(), - } + ExprData::ExprLambda => { + let ps = lambda_param_names_at(fold_lambda_node.clone(), scope.type_env.clone().source_indices.clone()); +match ps.first().cloned() { + Some(acc_name) => Rc::new(EmitGraphInfo { + type_summaries: emit_info.type_summaries.clone(), + recursive_type_set: emit_info.recursive_type_set.clone(), + fielded_variants: emit_info.fielded_variants.clone(), + untagged_json_tuple_variants: emit_info.untagged_json_tuple_variants.clone(), + shared_types: emit_info.shared_types.clone(), + ownership_index: emit_info.ownership_index.clone(), + movable: v2_rt::rc_map_insert(emit_info.movable.clone(), acc_name.clone(), true), + variant_to_enum: emit_info.variant_to_enum.clone(), + owned_bindings: emit_info.owned_bindings.clone(), + read_only_params_index: emit_info.read_only_params_index.clone(), + read_only_params: emit_info.read_only_params.clone(), +}), + None => emit_info.clone(), +} +}, + _ => emit_info.clone(), +} } else { emit_info.clone() } }; - let acc_type_str = render_rust_type( - acc_type_node.clone(), - shared_types.clone(), - scope.type_env.clone().source_indices.clone(), - ); - let is_bare_container = (((acc_type_node.children.clone().len() as i64) == 0) - && is_container_type(acc_type_name.clone())); - let lambda_acc_type_str = if is_bare_container { +let acc_type_str = render_rust_type(acc_type_node.clone(), shared_types.clone(), scope.type_env.clone().source_indices.clone()); +let is_bare_container = (((acc_type_node.children.clone().len() as i64) == 0) && is_container_type(acc_type_name.clone())); +let lambda_acc_type_str = if is_bare_container { "_".to_string() } else { acc_type_str.clone() }; - let acc_has_unit_child = ({ - let mut __found = false; - for c in acc_type_node.children.clone().iter().cloned() { - if (is_unit_like(&c) || (c.ident_span.clone() == None)) { - __found = true; - break; - } - } - __found - } || { - let mut __found = false; - for c in acc_type_node.children.clone().iter().cloned() { - if { - let mut __found = false; - for gc in c.children.clone().iter().cloned() { - if (is_unit_like(&gc) || (gc.ident_span.clone() == None)) { - __found = true; - break; - } - } - __found - } { - __found = true; - break; - } - } - __found - }); - let init_str = match args.clone().first().cloned() { - Some(init_arg) => match (*arg_value(&init_arg).expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let init_func = expr_call_func_at( - arg_value(&init_arg), - scope.type_env.clone().source_indices.clone(), - ); - if ((((init_func.clone().as_str() == "empty_map".to_string().as_str()) - && (acc_type_str.clone().as_str() != "_".to_string().as_str())) - && (acc_type_str.clone().as_str() != "".to_string().as_str())) - && !acc_has_unit_child) - { - { - let kv_type_str = rust_empty_map_kv_type_str( - &acc_type_node, - &shared_types, - &scope.type_env.clone().source_indices.clone(), - ); - if (kv_type_str.clone().as_str() != "".to_string().as_str()) { - v2_rt::concat( - v2_rt::concat( - "v2_rt::rc_empty_map::<".to_string(), - kv_type_str.clone(), - ), - ">()".to_string(), - ) - } else { - "Rc::new(HashMap::new()) /* BRIDGE: fold empty_map value type unresolved */".to_string() - } - } +let acc_has_unit_child = ({ let mut __found = false; for c in acc_type_node.children.clone().iter().cloned() { if (is_unit_like(&c) || (c.ident_span.clone() == None)) { __found = true; break; } } __found } || { let mut __found = false; for c in acc_type_node.children.clone().iter().cloned() { if { let mut __found = false; for gc in c.children.clone().iter().cloned() { if (is_unit_like(&gc) || (gc.ident_span.clone() == None)) { __found = true; break; } } __found } { __found = true; break; } } __found }); +let init_str = match args.clone().first().cloned() { + Some(init_arg) => match (*arg_value(&init_arg).expr_data.clone()).clone() { + ExprData::ExprCall { .. } => { + let init_func = expr_call_func_at(arg_value(&init_arg), scope.type_env.clone().source_indices.clone()); +if ((((init_func.clone().as_str() == "empty_map".to_string().as_str()) && (acc_type_str.clone().as_str() != "_".to_string().as_str())) && (acc_type_str.clone().as_str() != "".to_string().as_str())) && !acc_has_unit_child) { + { + let kv_type_str = rust_empty_map_kv_type_str(&acc_type_node, &shared_types, &scope.type_env.clone().source_indices.clone()); +if (kv_type_str.clone().as_str() != "".to_string().as_str()) { + v2_rt::concat(v2_rt::concat("v2_rt::rc_empty_map::<".to_string(), kv_type_str.clone()), ">()".to_string()) } else { - if (init_func.clone().as_str() == "empty_map".to_string().as_str()) { - "Rc::new(HashMap::new()) /* BRIDGE: fold empty_map accumulator type unresolved */".to_string() - } else { - emit_typed_expr( - arg_value(&init_arg), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - fold_emit_info.clone(), - 1024, - ) - } + "Rc::new(HashMap::new()) /* BRIDGE: fold empty_map value type unresolved */".to_string() } - } - _ => emit_typed_expr( - arg_value(&init_arg), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - fold_emit_info.clone(), - 1024, - ), - }, - None => "compile_error!(\"missing fold init argument\")".to_string(), - }; - let fold_fn = match args.clone().get(1 as usize).cloned() { - Some(a) => emit_typed_fold_lambda( - &arg_value(&a), - &lambda_acc_type_str, - elem_type_str, - registry.clone(), - &scope, - depth.clone(), - &shared_types, - &fold_emit_info, - ), - None => "compile_error!(\"missing fold function argument\")".to_string(), - }; - let sharing = language_spec(RenderTarget::Rust).sharing.clone(); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - apply_type_template1(sharing.iter_owned.clone(), recv_str), - ".fold(".to_string(), - ), - init_str, - ), - ", ".to_string(), - ), - fold_fn, - ), - ")".to_string(), - ) - } } - -pub fn emit_rust_sort_by_method_call( - receiver: &Rc, - args: Rc>>, - registry: &Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { - { - let recv_str = emit_typed_expr( - receiver.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let elem_type_str = match receiver.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - let resolved = rt.clone(); - let elem = for_each_element_type_node( - resolved, - scope.type_env.clone().source_indices.clone(), - ); - let elem_is_type_var = if (elem.inferred.clone() != None) { - is_type_variable(elem.inferred.clone().clone().unwrap()) - } else { - false - }; - if ((elem.ident_span.clone() != None) && !elem_is_type_var) { - render_rust_type( - elem.clone(), - shared_types.clone(), - scope.type_env.clone().source_indices.clone(), - ) + } else { + if (init_func.clone().as_str() == "empty_map".to_string().as_str()) { + "Rc::new(HashMap::new()) /* BRIDGE: fold empty_map accumulator type unresolved */".to_string() } else { - "_".to_string() + emit_typed_expr(arg_value(&init_arg), registry.clone(), &scope, depth.clone(), shared_types.clone(), fold_emit_info.clone(), 1024) } } - _ => "_".to_string(), - }; - let sort_key_fn = match args.first().cloned() { - Some(a) => emit_typed_collection_lambda( - &arg_value(&a), - elem_type_str.clone(), - registry.clone(), - &scope, - depth.clone(), - &shared_types, - emit_info.clone(), - ), - None => "compile_error!(\"missing sort_by key function argument\")".to_string(), - }; - let sharing = language_spec(RenderTarget::Rust).sharing.clone(); - let iter_str = apply_type_template1(sharing.iter_owned.clone(), recv_str); - let a_clone = apply_type_template1(sharing.clone_value.clone(), "a".to_string()); - let b_clone = apply_type_template1(sharing.clone_value.clone(), "b".to_string()); - if (elem_type_str.clone().as_str() == "_".to_string().as_str()) { +}, + _ => emit_typed_expr(arg_value(&init_arg), registry.clone(), &scope, depth.clone(), shared_types.clone(), fold_emit_info.clone(), 1024), +}, + None => "compile_error!(\"missing fold init argument\")".to_string(), +}; +let fold_fn = match args.clone().get(1 as usize).cloned() { + Some(a) => emit_typed_fold_lambda(&arg_value(&a), &lambda_acc_type_str, elem_type_str, registry.clone(), &scope, depth.clone(), &shared_types, &fold_emit_info), + None => "compile_error!(\"missing fold function argument\")".to_string(), +}; +let sharing = language_spec(RenderTarget::Rust).sharing.clone(); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(apply_type_template1(sharing.iter_owned.clone(), recv_str), ".fold(".to_string()), init_str), ", ".to_string()), fold_fn), ")".to_string()) +} +} + +pub fn emit_rust_sort_by_method_call(receiver: &Rc, args: Rc>>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { + { + let recv_str = emit_typed_expr(receiver.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let elem_type_str = match receiver.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + let resolved = rt.clone(); +let elem = for_each_element_type_node(resolved, scope.type_env.clone().source_indices.clone()); +let elem_is_type_var = if (elem.inferred.clone() != None) { + is_type_variable(elem.inferred.clone().clone().unwrap()) + } else { + false + }; +if ((elem.ident_span.clone() != None) && !elem_is_type_var) { + render_rust_type(elem.clone(), shared_types.clone(), scope.type_env.clone().source_indices.clone()) + } else { + "_".to_string() + } +}, + _ => "_".to_string(), +}; +let sort_key_fn = match args.first().cloned() { + Some(a) => emit_typed_collection_lambda(&arg_value(&a), elem_type_str.clone(), registry.clone(), &scope, depth.clone(), &shared_types, emit_info.clone()), + None => "compile_error!(\"missing sort_by key function argument\")".to_string(), +}; +let sharing = language_spec(RenderTarget::Rust).sharing.clone(); +let iter_str = apply_type_template1(sharing.iter_owned.clone(), recv_str); +let a_clone = apply_type_template1(sharing.clone_value.clone(), "a".to_string()); +let b_clone = apply_type_template1(sharing.clone_value.clone(), "b".to_string()); +if (elem_type_str.clone().as_str() == "_".to_string().as_str()) { v2_rt::concat(v2_rt::concat("Rc::new({ let mut __sorted: Vec<_> = ".to_string(), iter_str), ".collect(); __sorted.sort_by(|a, b| { a.partial_cmp(b).unwrap_or(std::cmp::Ordering::Equal) }); __sorted })".to_string()) } else { v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("Rc::new({ let mut __sorted: Vec<_> = ".to_string(), iter_str), ".collect(); __sorted.sort_by(|a: &".to_string()), elem_type_str.clone()), ", b: &".to_string()), elem_type_str.clone()), "| { let __ka = (".to_string()), sort_key_fn.clone()), ")(".to_string()), a_clone), "); let __kb = (".to_string()), sort_key_fn.clone()), ")(".to_string()), b_clone), "); __ka.partial_cmp(&__kb).unwrap_or(std::cmp::Ordering::Equal) }); __sorted })".to_string()) } - } +} } -pub fn emit_rust_map_method_call( - receiver: &Rc, - args: &Rc>>, - registry: &Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { - { - let recv_str = emit_typed_expr( - receiver.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let first_arg_str = emit_typed_first_arg( - args.clone(), - registry.clone(), - scope.clone(), - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ); - let recv_is_optional = match receiver.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - (rt.return_cardinality.clone() == Cardinality::CardOptional) - } - _ => false, - }; - if recv_is_optional { +pub fn emit_rust_map_method_call(receiver: &Rc, args: &Rc>>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { + { + let recv_str = emit_typed_expr(receiver.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let first_arg_str = emit_typed_first_arg(args.clone(), registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()); +let recv_is_optional = match receiver.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => (rt.return_cardinality.clone() == Cardinality::CardOptional), + _ => false, +}; +if recv_is_optional { match args.clone().first().cloned() { - Some(a) => match (*arg_value(&a).expr_data.clone()).clone() { - ExprData::ExprLambda => { - let bd = match arg_value(&a).children.clone().first().cloned() { - Some(v) => v.clone(), - None => arg_value(&a), - }; - let ps = lambda_param_names_at( - arg_value(&a), - scope.type_env.clone().source_indices.clone(), - ); - let dag_name = match ps.clone().first().cloned() { - Some(n) => n.clone(), - None => "__x".to_string(), - }; - let p = emit_ident(dag_name, RenderTarget::Rust); - let lambda_scope = lambda_scope_from_children( - scope.clone(), - ps.clone(), - Rc::new( - arg_value(&a) - .children - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ); - let body_str = emit_typed_expr( - bd, - registry.clone(), - &lambda_scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(v2_rt::concat(recv_str, ".map(|".to_string()), p), - "| ".to_string(), - ), - body_str, - ), - ")".to_string(), - ) - } - _ => v2_rt::concat( - v2_rt::concat(v2_rt::concat(recv_str, ".map(".to_string()), first_arg_str), - ")".to_string(), - ), - }, - None => v2_rt::concat( - v2_rt::concat(v2_rt::concat(recv_str, ".map(".to_string()), first_arg_str), - ")".to_string(), - ), - } + Some(a) => match (*arg_value(&a).expr_data.clone()).clone() { + ExprData::ExprLambda => { + let bd = match arg_value(&a).children.clone().first().cloned() { + Some(v) => v.clone(), + None => arg_value(&a), +}; +let ps = lambda_param_names_at(arg_value(&a), scope.type_env.clone().source_indices.clone()); +let dag_name = match ps.clone().first().cloned() { + Some(n) => n.clone(), + None => "__x".to_string(), +}; +let p = emit_ident(dag_name, RenderTarget::Rust); +let lambda_scope = lambda_scope_from_children(scope.clone(), ps.clone(), Rc::new(arg_value(&a).children.clone().iter().cloned().skip(1 as usize).collect::>())); +let body_str = emit_typed_expr(bd, registry.clone(), &lambda_scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(recv_str, ".map(|".to_string()), p), "| ".to_string()), body_str), ")".to_string()) +}, + _ => v2_rt::concat(v2_rt::concat(v2_rt::concat(recv_str, ".map(".to_string()), first_arg_str), ")".to_string()), +}, + None => v2_rt::concat(v2_rt::concat(v2_rt::concat(recv_str, ".map(".to_string()), first_arg_str), ")".to_string()), +} } else { { let sharing = language_spec(RenderTarget::Rust).sharing.clone(); - let iter_str = apply_type_template1(sharing.iter_owned.clone(), recv_str); - match args.clone().first().cloned() { - Some(a) => { - match (*arg_value(&a).expr_data.clone()).clone() { - ExprData::ExprLambda => { - let bd = match arg_value(&a).children.clone().first().cloned() { - Some(v) => v.clone(), - None => arg_value(&a), - }; - let ps = lambda_param_names_at( - arg_value(&a), - scope.type_env.clone().source_indices.clone(), - ); - let dag_name = match ps.clone().first().cloned() { - Some(n) => n.clone(), - None => "__x".to_string(), - }; - let p = emit_ident(dag_name, RenderTarget::Rust); - let lambda_scope = lambda_scope_from_children( - scope.clone(), - ps.clone(), - Rc::new( - arg_value(&a) - .children - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ); - let body_str = emit_typed_expr( - bd, - registry.clone(), - &lambda_scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("Rc::new({ let mut __result = Vec::new(); for ".to_string(), p), " in ".to_string()), iter_str), " { __result.push(".to_string()), body_str), "); } __result })".to_string()) - } - _ => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("Rc::new(".to_string(), iter_str), - ".map(".to_string(), - ), - first_arg_str, - ), - ").collect::>())".to_string(), - ), - } - } - None => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("Rc::new(".to_string(), iter_str), - ".map(".to_string(), - ), - first_arg_str, - ), - ").collect::>())".to_string(), - ), - } - } +let iter_str = apply_type_template1(sharing.iter_owned.clone(), recv_str); +match args.clone().first().cloned() { + Some(a) => match (*arg_value(&a).expr_data.clone()).clone() { + ExprData::ExprLambda => { + let bd = match arg_value(&a).children.clone().first().cloned() { + Some(v) => v.clone(), + None => arg_value(&a), +}; +let ps = lambda_param_names_at(arg_value(&a), scope.type_env.clone().source_indices.clone()); +let dag_name = match ps.clone().first().cloned() { + Some(n) => n.clone(), + None => "__x".to_string(), +}; +let p = emit_ident(dag_name, RenderTarget::Rust); +let lambda_scope = lambda_scope_from_children(scope.clone(), ps.clone(), Rc::new(arg_value(&a).children.clone().iter().cloned().skip(1 as usize).collect::>())); +let body_str = emit_typed_expr(bd, registry.clone(), &lambda_scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("Rc::new({ let mut __result = Vec::new(); for ".to_string(), p), " in ".to_string()), iter_str), " { __result.push(".to_string()), body_str), "); } __result })".to_string()) +}, + _ => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), iter_str), ".map(".to_string()), first_arg_str), ").collect::>())".to_string()), +}, + None => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), iter_str), ".map(".to_string()), first_arg_str), ").collect::>())".to_string()), +} +} } - } +} } -pub fn emit_rust_higher_order_method( - ho_spec: &Rc, - receiver: Rc, - args: &Rc>>, - registry: &Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { +pub fn emit_rust_higher_order_method(ho_spec: &Rc, receiver: Rc, args: &Rc>>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { { let sharing = language_spec(RenderTarget::Rust).sharing.clone(); - let recv_str = emit_typed_expr( - receiver, - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let first_arg_str = emit_typed_first_arg( - args.clone(), - registry.clone(), - scope.clone(), - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ); - let iter_str = apply_type_template1(sharing.iter_owned.clone(), recv_str); - match args.clone().first().cloned() { - Some(a) => match (*arg_value(&a).expr_data.clone()).clone() { - ExprData::ExprLambda => { - let bd = match arg_value(&a).children.clone().first().cloned() { - Some(v) => v.clone(), - None => arg_value(&a), - }; - let ps = lambda_param_names_at( - arg_value(&a), - scope.type_env.clone().source_indices.clone(), - ); - let dag_name = match ps.clone().first().cloned() { - Some(n) => n.clone(), - None => "__x".to_string(), - }; - let p = emit_ident(dag_name, RenderTarget::Rust); - let lambda_scope = lambda_scope_from_children( - scope.clone(), - ps.clone(), - Rc::new( - arg_value(&a) - .children - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ); - let body_str = emit_typed_expr( - bd, - registry.clone(), - &lambda_scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let inner_iter = apply_type_template1( - sharing.iter_owned.clone(), - v2_rt::concat( - v2_rt::concat("(*".to_string(), body_str.clone()), - ")".to_string(), - ), - ); - let bindings = v2_rt::rc_map_insert( - v2_rt::rc_map_insert( - v2_rt::rc_map_insert( - seed_bindings("param".to_string(), p), - "body".to_string(), - body_str.clone(), - ), - "iter".to_string(), - iter_str, - ), - "inner_iter".to_string(), - inner_iter, - ); - let raw = apply_named_template(ho_spec.inline_template.clone(), &bindings); - if ho_spec.wraps_in_sharing.clone() { - v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) - } else { - raw - } - } - _ => { - let bindings = v2_rt::rc_map_insert( - seed_bindings("iter".to_string(), iter_str), - "arg".to_string(), - first_arg_str, - ); - let raw = apply_named_template(ho_spec.fn_ref_template.clone(), &bindings); - if ho_spec.wraps_in_sharing.clone() { - v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) - } else { - raw - } - } - }, - None => { - let bindings = v2_rt::rc_map_insert( - seed_bindings("iter".to_string(), iter_str), - "arg".to_string(), - first_arg_str, - ); - let raw = apply_named_template(ho_spec.fn_ref_template.clone(), &bindings); - if ho_spec.wraps_in_sharing.clone() { - v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) - } else { - raw - } +let recv_str = emit_typed_expr(receiver, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let first_arg_str = emit_typed_first_arg(args.clone(), registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()); +let iter_str = apply_type_template1(sharing.iter_owned.clone(), recv_str); +match args.clone().first().cloned() { + Some(a) => match (*arg_value(&a).expr_data.clone()).clone() { + ExprData::ExprLambda => { + let bd = match arg_value(&a).children.clone().first().cloned() { + Some(v) => v.clone(), + None => arg_value(&a), +}; +let ps = lambda_param_names_at(arg_value(&a), scope.type_env.clone().source_indices.clone()); +let dag_name = match ps.clone().first().cloned() { + Some(n) => n.clone(), + None => "__x".to_string(), +}; +let p = emit_ident(dag_name, RenderTarget::Rust); +let lambda_scope = lambda_scope_from_children(scope.clone(), ps.clone(), Rc::new(arg_value(&a).children.clone().iter().cloned().skip(1 as usize).collect::>())); +let body_str = emit_typed_expr(bd, registry.clone(), &lambda_scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let inner_iter = apply_type_template1(sharing.iter_owned.clone(), v2_rt::concat(v2_rt::concat("(*".to_string(), body_str.clone()), ")".to_string())); +let bindings = v2_rt::rc_map_insert(v2_rt::rc_map_insert(v2_rt::rc_map_insert(seed_bindings("param".to_string(), p), "body".to_string(), body_str.clone()), "iter".to_string(), iter_str), "inner_iter".to_string(), inner_iter); +let raw = apply_named_template(ho_spec.inline_template.clone(), &bindings); +if ho_spec.wraps_in_sharing.clone() { + v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) + } else { + raw } - } - } +}, + _ => { + let bindings = v2_rt::rc_map_insert(seed_bindings("iter".to_string(), iter_str), "arg".to_string(), first_arg_str); +let raw = apply_named_template(ho_spec.fn_ref_template.clone(), &bindings); +if ho_spec.wraps_in_sharing.clone() { + v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) + } else { + raw + } +}, +}, + None => { + let bindings = v2_rt::rc_map_insert(seed_bindings("iter".to_string(), iter_str), "arg".to_string(), first_arg_str); +let raw = apply_named_template(ho_spec.fn_ref_template.clone(), &bindings); +if ho_spec.wraps_in_sharing.clone() { + v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) + } else { + raw + } +}, +} +} } -pub fn emit_rust_get_method_call( - receiver: &Rc, - args: Rc>>, - registry: &Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { - { - let recv_str = emit_typed_expr( - receiver.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let index_str = match args.first().cloned() { - Some(a) => emit_typed_expr( - arg_value(&a), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ), - None => "compile_error!(\"get method missing index\")".to_string(), - }; - let receiver_resolved = match receiver.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { .. }) => true, - _ => false, - }; - if is_map_typed_expr( - receiver.clone(), - scope.type_env.clone().source_indices.clone(), - ) { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("v2_rt::map_get(&".to_string(), recv_str), - ", ".to_string(), - ), - index_str, - ), - ")".to_string(), - ) +pub fn emit_rust_get_method_call(receiver: &Rc, args: Rc>>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { + { + let recv_str = emit_typed_expr(receiver.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let index_str = match args.first().cloned() { + Some(a) => emit_typed_expr(arg_value(&a), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024), + None => "compile_error!(\"get method missing index\")".to_string(), +}; +let receiver_resolved = match receiver.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { .. }) => true, + _ => false, +}; +if is_map_typed_expr(receiver.clone(), scope.type_env.clone().source_indices.clone()) { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("v2_rt::map_get(&".to_string(), recv_str), ", ".to_string()), index_str), ")".to_string()) } else { if receiver_resolved { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(v2_rt::concat(recv_str, ".get((".to_string()), index_str), - ") as usize)".to_string(), - ), - clone_iterator_suffix(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(recv_str, ".get((".to_string()), index_str), ") as usize)".to_string()), clone_iterator_suffix()) } else { "compile_error!(\"get: receiver type unresolved\")".to_string() } } - } +} } -pub fn emit_rust_with_method_call( - receiver: &Rc, - args: &Rc>>, - registry: &Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { - { - let base_str = emit_typed_expr( - receiver.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let type_name = match receiver.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - let rt_is_error = if (rt.inferred.clone() != None) { - is_compiler_error(rt.inferred.clone().clone().unwrap()) - } else { - false - }; - if (rt_is_error || (rt.ident_span.clone() == None)) { - "compile_error!(\"with method missing resolved record type\")".to_string() - } else { - authored_name_at(scope.type_env.clone().source_indices.clone(), &rt) - } +pub fn emit_rust_with_method_call(receiver: &Rc, args: &Rc>>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { + { + let base_str = emit_typed_expr(receiver.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let type_name = match receiver.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + let rt_is_error = if (rt.inferred.clone() != None) { + is_compiler_error(rt.inferred.clone().clone().unwrap()) + } else { + false + }; +if (rt_is_error || (rt.ident_span.clone() == None)) { + "compile_error!(\"with method missing resolved record type\")".to_string() + } else { + authored_name_at(scope.type_env.clone().source_indices.clone(), &rt) } - _ => "compile_error!(\"with method missing resolved record type\")".to_string(), - }; - if ((args.clone().len() as i64) == 0) { - return "compile_error!(\"with method missing update record\")".to_string(); +}, + _ => "compile_error!(\"with method missing resolved record type\")".to_string(), +}; +if ((args.clone().len() as i64) == 0) { + return "compile_error!(\"with method missing update record\")".to_string() } - let update_arg = arg_value(&args.clone().first().cloned().clone().unwrap()); - let field_strs = match (*update_arg.expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => Rc::new({ - let mut __result = Vec::new(); - for f in update_arg.children.clone().iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - emit_ident( - field_init_node_name_at( - f.clone(), - scope.type_env.clone().source_indices.clone(), - ), - RenderTarget::Rust, - ), - ": ".to_string(), - ), - emit_typed_expr( - field_init_node_value(&f), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ), - )); - } - __result - }), - _ => Rc::new(vec![emit_typed_expr( - update_arg.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - )]), - }; - let fields_str = field_strs.join(&", ".to_string()); - let needs_rc = emit_map_has(shared_types.clone(), type_name.clone()); - let sharing = language_spec(RenderTarget::Rust).sharing.clone(); - let spread = if needs_rc.clone() { +let update_arg = arg_value(&args.clone().first().cloned().clone().unwrap()); +let field_strs = match (*update_arg.expr_data.clone()).clone() { + ExprData::ExprRecordLit { .. } => Rc::new({ let mut __result = Vec::new(); for f in update_arg.children.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(emit_ident(field_init_node_name_at(f.clone(), scope.type_env.clone().source_indices.clone()), RenderTarget::Rust), ": ".to_string()), emit_typed_expr(field_init_node_value(&f), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024))); } __result }), + _ => Rc::new(vec![emit_typed_expr(update_arg.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024)]), +}; +let fields_str = field_strs.join(&", ".to_string()); +let needs_rc = set_contains(shared_types.clone(), type_name.clone()); +let sharing = language_spec(RenderTarget::Rust).sharing.clone(); +let spread = if needs_rc.clone() { apply_type_template1(sharing.deref_clone.clone(), base_str) } else { apply_type_template1(sharing.clone_value.clone(), base_str) }; - let raw = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(type_name.clone(), " { ".to_string()), - fields_str, - ), - ", ..".to_string(), - ), - spread, - ), - " }".to_string(), - ); - if needs_rc.clone() { +let raw = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(type_name.clone(), " { ".to_string()), fields_str), ", ..".to_string()), spread), " }".to_string()); +if needs_rc.clone() { v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) } else { raw } - } +} } -pub fn emit_rust_first_method_call( - receiver: &Rc, - registry: &Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { +pub fn emit_rust_first_method_call(receiver: &Rc, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { match (*receiver.expr_data.clone()).clone() { - ExprData::ExprMethodCall { .. } => { - if (expr_method_name_at( - receiver.clone(), - scope.type_env.clone().source_indices.clone(), - ) - .as_str() - == "skip".to_string().as_str()) - { - { - let skip_recv = method_receiver(receiver.clone()); - let skip_args = method_arg_nodes(receiver.clone()); - let recv_str = emit_typed_expr( - skip_recv, - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let arg_str = emit_typed_first_arg( - skip_args, - registry.clone(), - scope.clone(), - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ); - v2_rt::concat( - v2_rt::concat(v2_rt::concat(recv_str, ".get(".to_string()), arg_str), - " as usize).cloned()".to_string(), - ) - } - } else { - { - let recv_str = emit_typed_expr( - receiver.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - v2_rt::concat(recv_str, ".first().cloned()".to_string()) - } - } - } - _ => { - let recv_str = emit_typed_expr( - receiver.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - v2_rt::concat(recv_str, ".first().cloned()".to_string()) - } - } + ExprData::ExprMethodCall { .. } => if (expr_method_name_at(receiver.clone(), scope.type_env.clone().source_indices.clone()).as_str() == "skip".to_string().as_str()) { + { + let skip_recv = method_receiver(receiver.clone()); +let skip_args = method_arg_nodes(receiver.clone()); +let recv_str = emit_typed_expr(skip_recv, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let arg_str = emit_typed_first_arg(skip_args, registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(recv_str, ".get(".to_string()), arg_str), " as usize).cloned()".to_string()) +} + } else { + { + let recv_str = emit_typed_expr(receiver.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +v2_rt::concat(recv_str, ".first().cloned()".to_string()) +} + }, + _ => { + let recv_str = emit_typed_expr(receiver.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +v2_rt::concat(recv_str, ".first().cloned()".to_string()) +}, +} } -pub fn emit_rust_generic_method_call( - method_name: String, - receiver: Rc, - args: Rc>>, - result_type: Option>, - registry: &Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { +pub fn emit_rust_generic_method_call(method_name: String, receiver: Rc, args: Rc>>, result_type: Option>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { { let function_name = method_name; - let recv_str = if rust_runtime_bridge_passes_receiver_by_ref(function_name.clone()) { - v2_rt::concat( - "&".to_string(), - emit_typed_expr_base( - &receiver, - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ), - ) - } else { - emit_cloned_arg( - receiver, - registry.clone(), - scope.clone(), - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ) +let recv_str = if rust_runtime_bridge_passes_receiver_by_ref(function_name.clone()) { + v2_rt::concat("&".to_string(), emit_typed_expr_base(&receiver, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone())) + } else { + emit_cloned_arg(receiver, registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()) }; - let arg_strs = Rc::new({ - let mut __result = Vec::new(); - for a in args.iter().cloned() { - __result.push(emit_cloned_arg( - arg_value(&a), - registry.clone(), - scope.clone(), - depth.clone(), - shared_types.clone(), - emit_info.clone(), - )); - } - __result - }); - let all_strs = v2_rt::concat(Rc::new(vec![recv_str]), arg_strs); - let bridge_name = rust_runtime_bridge_name(function_name.clone()); - let lowered = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "v2_rt::".to_string(), - emit_ident(bridge_name, RenderTarget::Rust), - ), - "(".to_string(), - ), - all_strs.join(&", ".to_string()), - ), - ")".to_string(), - ); - if rust_runtime_bridge_wraps_collection_result_in_rc(&function_name) { - v2_rt::concat( - v2_rt::concat("Rc::new(".to_string(), lowered), - ")".to_string(), - ) +let arg_strs = Rc::new({ let mut __result = Vec::new(); for a in args.iter().cloned() { __result.push(emit_cloned_arg(arg_value(&a), registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone())); } __result }); +let all_strs = v2_rt::concat(Rc::new(vec![recv_str]), arg_strs); +let bridge_name = rust_runtime_bridge_name(function_name.clone()); +let lowered = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("v2_rt::".to_string(), emit_ident(bridge_name, RenderTarget::Rust)), "(".to_string()), all_strs.join(&", ".to_string())), ")".to_string()); +if rust_runtime_bridge_wraps_collection_result_in_rc(&function_name) { + v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), lowered), ")".to_string()) } else { lowered } - } +} } -pub fn emit_typed_method_call( - method_call_node: Rc, - receiver: &Rc, - method: String, - args: &Rc>>, - result_type: Option>, - method_semantics: &Option>, - registry: &Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { +pub fn emit_typed_method_call(method_call_node: Rc, receiver: &Rc, method: String, args: &Rc>>, result_type: Option>, method_semantics: &Option>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { if (method_semantics.clone() != None) { match (*method_semantics.clone().unwrap()).clone() { - MethodSemantics::ServiceMethodSemantics { - service_name: svc_name, - op_params, - .. - } => { - let var_name = service_var_name(svc_name.clone()); - let si = scope.type_env.clone().source_indices.clone(); - let filled_args = fill_op_default_args( - &args, - op_params.clone(), - registry.clone(), - scope.clone(), - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ); - let optional_param_set = Rc::new({ - let mut __result = Vec::new(); - for p in op_params.clone().iter().cloned() { - if (param_node_type_expr(&p).return_cardinality.clone() - == Cardinality::CardOptional) - { - __result.push(p); - } - } - __result - }) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, p: Rc| { - v2_rt::rc_map_insert(acc, param_node_name_at(p.clone(), si.clone()), true) - }, - ); - let json_param_set = Rc::new({ - let mut __result = Vec::new(); - for p in op_params.clone().iter().cloned() { - if (coerce_primitive_type( - RenderTarget::Rust, - authored_name_at(si.clone(), ¶m_node_type_expr(&p)), - ) - .as_str() - == "serde_json::Value".to_string().as_str()) - { - __result.push(p); - } - } - __result - }) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, p: Rc| { - v2_rt::rc_map_insert(acc, param_node_name_at(p.clone(), si.clone()), true) - }, - ); - let arg_strs = Rc::new({ - let mut __result = Vec::new(); - for a in filled_args.iter().cloned() { - __result.push({ - let arg_str = emit_typed_expr( - arg_value(&a), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let aname = match arg_name_at(a.clone(), si.clone()) { - Some(n) => n.clone(), - None => "".to_string(), - }; - let param_is_json = match v2_rt::map_get(&json_param_set, aname.clone()) - { - Some(_) => true, - None => false, - }; - let param_is_optional = - match v2_rt::map_get(&optional_param_set, aname.clone()) { - Some(_) => true, - None => false, - }; - let needs_optional = (param_is_optional.clone() - && (is_already_optional( - &arg_value(&a), - emit_info.clone(), - &scope, - ) == false)); - let coerced = if (param_is_json.clone() - && is_string_typed_expr(arg_value(&a), si.clone())) - { - v2_rt::concat( - v2_rt::concat( - "serde_json::from_str(&".to_string(), - arg_str.clone(), - ), - ").unwrap()".to_string(), - ) - } else { - arg_str.clone() - }; - if needs_optional.clone() { - v2_rt::concat( - v2_rt::concat("Some(".to_string(), coerced.clone()), - ")".to_string(), - ) - } else { - coerced.clone() - } - }); - } - __result - }); - let args_str = arg_strs.join(&", ".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(var_name, ".".to_string()), - emit_ident(method, RenderTarget::Rust), - ), - "(".to_string(), - ), - args_str, - ), - ").await?".to_string(), - ) - } - MethodSemantics::AlgebraMethodSemantics { - method_def, - fold_accumulator_type, - .. - } => { - let method_name = - authored_name_at(scope.type_env.clone().source_indices.clone(), &method_def); - if (method_name.clone().as_str() == "fold".to_string().as_str()) { - emit_rust_fold_method_call( - method_call_node, - fold_accumulator_type.clone(), - result_type, - &receiver, - &args, - ®istry, - &scope, - depth.clone(), - &shared_types, - &emit_info, - ) + MethodSemantics::ServiceMethodSemantics { service_name: svc_name, op_params, .. } => { + let var_name = service_var_name(svc_name.clone()); +let si = scope.type_env.clone().source_indices.clone(); +let filled_args = fill_op_default_args(&args, op_params.clone(), registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()); +let optional_param_set = Rc::new({ let mut __result = Vec::new(); for p in op_params.clone().iter().cloned() { if (param_node_type_expr(&p).return_cardinality.clone() == Cardinality::CardOptional) { __result.push(p); } } __result }).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, p: Rc| v2_rt::rc_map_insert(acc, param_node_name_at(p.clone(), si.clone()), true)); +let json_param_set = Rc::new({ let mut __result = Vec::new(); for p in op_params.clone().iter().cloned() { if (coerce_primitive_type(RenderTarget::Rust, authored_name_at(si.clone(), ¶m_node_type_expr(&p))).as_str() == "serde_json::Value".to_string().as_str()) { __result.push(p); } } __result }).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, p: Rc| v2_rt::rc_map_insert(acc, param_node_name_at(p.clone(), si.clone()), true)); +let arg_strs = Rc::new({ let mut __result = Vec::new(); for a in filled_args.iter().cloned() { __result.push({ + let arg_str = emit_typed_expr(arg_value(&a), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let aname = match arg_name_at(a.clone(), si.clone()) { + Some(n) => n.clone(), + None => "".to_string(), +}; +let param_is_json = match v2_rt::map_get(&json_param_set, aname.clone()) { + Some(_) => true, + None => false, +}; +let param_is_optional = match v2_rt::map_get(&optional_param_set, aname.clone()) { + Some(_) => true, + None => false, +}; +let needs_optional = (param_is_optional.clone() && (is_already_optional(&arg_value(&a), emit_info.clone(), &scope) == false)); +let coerced = if (param_is_json.clone() && is_string_typed_expr(arg_value(&a), si.clone())) { + v2_rt::concat(v2_rt::concat("serde_json::from_str(&".to_string(), arg_str.clone()), ").unwrap()".to_string()) + } else { + arg_str.clone() + }; +if needs_optional.clone() { + v2_rt::concat(v2_rt::concat("Some(".to_string(), coerced.clone()), ")".to_string()) } else { - if (method_name.clone().as_str() == "sort_by".to_string().as_str()) { - emit_rust_sort_by_method_call( - &receiver, - args.clone(), - ®istry, - &scope, - depth.clone(), - &shared_types, - &emit_info, - ) + coerced.clone() + } +}); } __result }); +let args_str = arg_strs.join(&", ".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(var_name, ".".to_string()), emit_ident(method, RenderTarget::Rust)), "(".to_string()), args_str), ").await?".to_string()) +}, + MethodSemantics::AlgebraMethodSemantics { method_def, fold_accumulator_type, .. } => { + let method_name = authored_name_at(scope.type_env.clone().source_indices.clone(), &method_def); +if (method_name.clone().as_str() == "fold".to_string().as_str()) { + emit_rust_fold_method_call(method_call_node, fold_accumulator_type.clone(), result_type, &receiver, &args, ®istry, &scope, depth.clone(), &shared_types, &emit_info) + } else { + if (method_name.clone().as_str() == "sort_by".to_string().as_str()) { + emit_rust_sort_by_method_call(&receiver, args.clone(), ®istry, &scope, depth.clone(), &shared_types, &emit_info) + } else { + if (method_name.clone().as_str() == "map".to_string().as_str()) { + emit_rust_map_method_call(&receiver, &args, ®istry, &scope, depth.clone(), &shared_types, &emit_info) } else { - if (method_name.clone().as_str() == "map".to_string().as_str()) { - emit_rust_map_method_call( - &receiver, - &args, - ®istry, - &scope, - depth.clone(), - &shared_types, - &emit_info, - ) + match Rc::new({ let mut __result = Vec::new(); for s in rust_higher_order_methods().iter().cloned() { if (s.method_name.clone().as_str() == method_name.clone().as_str()) { __result.push(s); } } __result }).first().cloned() { + Some(ho_spec) => emit_rust_higher_order_method(&ho_spec, receiver.clone(), &args, ®istry, &scope, depth.clone(), &shared_types, &emit_info), + None => if (method_name.clone().as_str() == "get".to_string().as_str()) { + emit_rust_get_method_call(&receiver, args.clone(), ®istry, &scope, depth.clone(), &shared_types, &emit_info) } else { - match Rc::new({ - let mut __result = Vec::new(); - for s in rust_higher_order_methods().iter().cloned() { - if (s.method_name.clone().as_str() - == method_name.clone().as_str()) - { - __result.push(s); - } - } - __result - }) - .first() - .cloned() - { - Some(ho_spec) => emit_rust_higher_order_method( - &ho_spec, - receiver.clone(), - &args, - ®istry, - &scope, - depth.clone(), - &shared_types, - &emit_info, - ), - None => { - if (method_name.clone().as_str() == "get".to_string().as_str()) - { - emit_rust_get_method_call( - &receiver, - args.clone(), - ®istry, - &scope, - depth.clone(), - &shared_types, - &emit_info, - ) - } else { - if (method_name.clone().as_str() - == "with".to_string().as_str()) + if (method_name.clone().as_str() == "with".to_string().as_str()) { + emit_rust_with_method_call(&receiver, &args, ®istry, &scope, depth.clone(), &shared_types, &emit_info) + } else { + if (method_name.clone().as_str() == "string_contains".to_string().as_str()) { + emit_rust_generic_method_call("string_contains".to_string(), receiver.clone(), args.clone(), result_type, ®istry, &scope, depth.clone(), &shared_types, &emit_info) + } else { + if (method_name.clone().as_str() == "concat".to_string().as_str()) { { - emit_rust_with_method_call( - &receiver, - &args, - ®istry, - &scope, - depth.clone(), - &shared_types, - &emit_info, - ) + let recv_str = emit_typed_expr(receiver.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let arg_strs = Rc::new({ let mut __result = Vec::new(); for a in args.clone().iter().cloned() { __result.push(emit_typed_expr(arg_value(&a), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024)); } __result }); +let all_arg_strs = v2_rt::concat(Rc::new(vec![recv_str]), arg_strs); +emit_nested_rt_concat(all_arg_strs, "".to_string(), shared_types.clone()) +} + } else { + if (method_name.clone().as_str() == "first".to_string().as_str()) { + emit_rust_first_method_call(&receiver, ®istry, &scope, depth.clone(), &shared_types, &emit_info) } else { - if (method_name.clone().as_str() - == "string_contains".to_string().as_str()) { - emit_rust_generic_method_call( - "string_contains".to_string(), - receiver.clone(), - args.clone(), - result_type, - ®istry, - &scope, - depth.clone(), - &shared_types, - &emit_info, - ) - } else { - if (method_name.clone().as_str() - == "concat".to_string().as_str()) - { - { - let recv_str = emit_typed_expr( - receiver.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let arg_strs = Rc::new({ - let mut __result = Vec::new(); - for a in args.clone().iter().cloned() { - __result.push(emit_typed_expr( - arg_value(&a), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - )); - } - __result - }); - let all_arg_strs = v2_rt::concat( - Rc::new(vec![recv_str]), - arg_strs, - ); - emit_nested_rt_concat( - all_arg_strs, - "".to_string(), - shared_types.clone(), - ) - } - } else { - if (method_name.clone().as_str() - == "first".to_string().as_str()) - { - emit_rust_first_method_call( - &receiver, - ®istry, - &scope, - depth.clone(), - &shared_types, - &emit_info, - ) - } else { - { - let recv_str = emit_typed_expr( - receiver.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let first_arg_str = - emit_typed_first_arg( - args.clone(), - registry.clone(), - scope.clone(), - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ); - match v2_rt::map_get( - &rust_method_template_emit(), - method_name.clone(), - ) { - Some(tmpl) => { - let bindings = - v2_rt::rc_map_insert( - seed_bindings( - "recv".to_string(), - recv_str, - ), - "arg".to_string(), - first_arg_str, - ); - let raw = apply_named_template( - tmpl.clone(), - &bindings, - ); - if rust_runtime_bridge_wraps_collection_result_in_rc(&method_name) { + let recv_str = emit_typed_expr(receiver.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let first_arg_str = emit_typed_first_arg(args.clone(), registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()); +match v2_rt::map_get(&rust_method_template_emit(), method_name.clone()) { + Some(tmpl) => { + let bindings = v2_rt::rc_map_insert(seed_bindings("recv".to_string(), recv_str), "arg".to_string(), first_arg_str); +let raw = apply_named_template(tmpl.clone(), &bindings); +if rust_runtime_bridge_wraps_collection_result_in_rc(&method_name) { v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) } else { raw } - } - None => { - emit_rust_generic_method_call( - method_name.clone(), - receiver.clone(), - args.clone(), - result_type, - ®istry, - &scope, - depth.clone(), - &shared_types, - &emit_info, - ) - } - } - } - } - } - } +}, + None => emit_rust_generic_method_call(method_name.clone(), receiver.clone(), args.clone(), result_type, ®istry, &scope, depth.clone(), &shared_types, &emit_info), +} +} } } } } - } + }, +} } } } - MethodSemantics::PlainMethodSemantics => { - let recv_str = emit_typed_expr( - receiver.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let arg_strs = Rc::new({ - let mut __result = Vec::new(); - for a in args.clone().iter().cloned() { - __result.push(emit_typed_expr( - arg_value(&a), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - )); - } - __result - }); - let args_str = arg_strs.join(&", ".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(recv_str, ".".to_string()), - emit_ident(method, RenderTarget::Rust), - ), - "(".to_string(), - ), - args_str, - ), - ")".to_string(), - ) - } - } +}, + MethodSemantics::PlainMethodSemantics => { + let recv_str = emit_typed_expr(receiver.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let arg_strs = Rc::new({ let mut __result = Vec::new(); for a in args.clone().iter().cloned() { __result.push(emit_typed_expr(arg_value(&a), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024)); } __result }); +let args_str = arg_strs.join(&", ".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(recv_str, ".".to_string()), emit_ident(method, RenderTarget::Rust)), "(".to_string()), args_str), ")".to_string()) +}, +} } else { "compile_error!(\"method call missing reconcile semantics\")".to_string() } } -pub fn emit_typed_first_arg( - args: Rc>>, - registry: Rc>>, - scope: Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { +pub fn emit_typed_first_arg(args: Rc>>, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { match args.first().cloned() { - Some(a) => emit_typed_expr( - arg_value(&a), - registry, - &scope, - depth, - shared_types, - emit_info, - 1024, - ), - None => "compile_error!(\"missing method argument\")".to_string(), - } + Some(a) => emit_typed_expr(arg_value(&a), registry, &scope, depth, shared_types, emit_info, 1024), + None => "compile_error!(\"missing method argument\")".to_string(), +} } -pub fn emit_typed_match( - scrutinee: &Rc, - arms: &Rc>>, - registry: &Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { - { - let scrut_str = emit_typed_expr( - scrutinee.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let scrut_type = match scrutinee.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - let is_optional = (rt.return_cardinality.clone() == Cardinality::CardOptional); - if is_optional { - authored_name_at( - scope.type_env.clone().source_indices.clone(), - &with_required_cardinality(&rt), - ) - } else { - authored_name_at(scope.type_env.clone().source_indices.clone(), &rt) - } - } - _ => "".to_string(), - }; - let rc_match = analyze_rc_match( - &scrutinee, - arms.clone(), - scrut_type.clone(), - &shared_types, - emit_info.clone(), - &scope.type_env.clone().source_indices.clone(), - ); - let match_result_type = match arms.clone().first().cloned() { - Some(first_arm) => resolved_type(arm_body(&first_arm)), - None => type_variable_node("match_result".to_string()), - }; - let arm_strs = Rc::new({ - let mut __result = Vec::new(); - for arm in arms.clone().iter().cloned() { - __result.push(emit_typed_match_arm( - &arm, - ®istry, - &scope, - depth.clone(), - &shared_types, - &emit_info, - &scrut_type, - match_result_type.clone(), - false, - )); +pub fn emit_typed_match(scrutinee: &Rc, arms: &Rc>>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { + { + let scrut_str = emit_typed_expr(scrutinee.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let scrut_type = match scrutinee.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + let is_optional = (rt.return_cardinality.clone() == Cardinality::CardOptional); +if is_optional { + authored_name_at(scope.type_env.clone().source_indices.clone(), &with_required_cardinality(&rt)) + } else { + authored_name_at(scope.type_env.clone().source_indices.clone(), &rt) } - __result - }); - let arms_str = arm_strs.join(&"\n".to_string()); - let needs_as_str = (all_arms_are_string_lit(&arms) && ((arms.clone().len() as i64) > 0)); - let needs_string_from = has_string_lit_with_bind(&arms); - if rc_match.needs_option_deref.clone() { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("match ".to_string(), scrut_str), - ".as_deref()".to_string(), - ), - clone_iterator_suffix(), - ), - " {\n".to_string(), - ), - arms_str, - ), - "\n}".to_string(), - ) +}, + _ => "".to_string(), +}; +let rc_match = analyze_rc_match(&scrutinee, arms.clone(), scrut_type.clone(), &shared_types, emit_info.clone(), &scope.type_env.clone().source_indices.clone()); +let match_result_type = match arms.clone().first().cloned() { + Some(first_arm) => resolved_type(arm_body(&first_arm)), + None => type_variable_node("match_result".to_string()), +}; +let arm_strs = Rc::new({ let mut __result = Vec::new(); for arm in arms.clone().iter().cloned() { __result.push(emit_typed_match_arm(&arm, ®istry, &scope, depth.clone(), &shared_types, &emit_info, &scrut_type, match_result_type.clone(), false)); } __result }); +let arms_str = arm_strs.join(&"\n".to_string()); +let needs_as_str = (all_arms_are_string_lit(&arms) && ((arms.clone().len() as i64) > 0)); +let needs_string_from = has_string_lit_with_bind(&arms); +if rc_match.needs_option_deref.clone() { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("match ".to_string(), scrut_str), ".as_deref()".to_string()), clone_iterator_suffix()), " {\n".to_string()), arms_str), "\n}".to_string()) } else { if rc_match.needs_deref.clone() { { let sharing = language_spec(RenderTarget::Rust).sharing.clone(); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "match ".to_string(), - apply_type_template1(sharing.deref_clone.clone(), scrut_str), - ), - " {\n".to_string(), - ), - arms_str, - ), - "\n}".to_string(), - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("match ".to_string(), apply_type_template1(sharing.deref_clone.clone(), scrut_str)), " {\n".to_string()), arms_str), "\n}".to_string()) +} } else { if needs_as_str { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("match ".to_string(), scrut_str), - ".as_str() {\n".to_string(), - ), - arms_str, - ), - "\n}".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("match ".to_string(), scrut_str), ".as_str() {\n".to_string()), arms_str), "\n}".to_string()) } else { if needs_string_from { { - let sf_arm_strs = Rc::new({ - let mut __result = Vec::new(); - for arm in arms.clone().iter().cloned() { - __result.push(emit_typed_match_arm( - &arm, - ®istry, - &scope, - depth.clone(), - &shared_types, - &emit_info, - &scrut_type, - match_result_type.clone(), - true, - )); - } - __result - }); - let sf_arms_str = sf_arm_strs.join(&"\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("match ".to_string(), scrut_str), - " {\n".to_string(), - ), - sf_arms_str, - ), - "\n}".to_string(), - ) - } + let sf_arm_strs = Rc::new({ let mut __result = Vec::new(); for arm in arms.clone().iter().cloned() { __result.push(emit_typed_match_arm(&arm, ®istry, &scope, depth.clone(), &shared_types, &emit_info, &scrut_type, match_result_type.clone(), true)); } __result }); +let sf_arms_str = sf_arm_strs.join(&"\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("match ".to_string(), scrut_str), " {\n".to_string()), sf_arms_str), "\n}".to_string()) +} } else { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("match ".to_string(), scrut_str), - " {\n".to_string(), - ), - arms_str, - ), - "\n}".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("match ".to_string(), scrut_str), " {\n".to_string()), arms_str), "\n}".to_string()) } } } } - } +} } -pub fn emit_typed_match_arm( - arm: &Rc, - registry: &Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, - scrut_type: &String, - match_result_type: Rc, - string_from_mode: bool, -) -> String { +pub fn emit_typed_match_arm(arm: &Rc, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc, scrut_type: &String, match_result_type: Rc, string_from_mode: bool) -> String { { let arm_pat = arm_pattern(arm.clone()); - let arm_g = arm_guard(&arm); - let arm_b = arm_body(&arm); - let si = scope.type_env.clone().source_indices.clone(); - let rc_analysis = analyze_rc_pattern( - arm_pat.clone(), - scrut_type.clone(), - &shared_types, - &emit_info, - si.clone(), - ); - let pat_str = if string_from_mode { +let arm_g = arm_guard(&arm); +let arm_b = arm_body(&arm); +let si = scope.type_env.clone().source_indices.clone(); +let rc_analysis = analyze_rc_pattern(arm_pat.clone(), scrut_type.clone(), &shared_types, &emit_info, si.clone()); +let pat_str = if string_from_mode { match (*arm_pat.clone()).clone() { - MatchPattern::LitPattern { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitStr { value: s, .. } => v2_rt::concat( - v2_rt::concat( - "ref __s if __s == \"".to_string(), - escape_string_literal_body(s.clone()), - ), - "\"".to_string(), - ), - _ => rust_literal_for_pattern(v.clone()), - }, - _ => emit_pattern( - arm_pat.clone(), - shared_types.clone(), - scrut_type.clone(), - si.clone(), - emit_info.clone(), - ), - } + MatchPattern::LitPattern { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitStr { value: s, .. } => v2_rt::concat(v2_rt::concat("ref __s if __s == \"".to_string(), escape_string_literal_body(s.clone())), "\"".to_string()), + _ => rust_literal_for_pattern(v.clone()), +}, + _ => emit_pattern(arm_pat.clone(), shared_types.clone(), scrut_type.clone(), si.clone(), emit_info.clone()), +} } else { if rc_analysis.needs_rc_pattern.clone() { - emit_pattern_rc_aware( - arm_pat.clone(), - rc_analysis.clone(), - shared_types.clone(), - scrut_type.clone(), - si.clone(), - emit_info.clone(), - ) + emit_pattern_rc_aware(arm_pat.clone(), rc_analysis.clone(), shared_types.clone(), scrut_type.clone(), si.clone(), emit_info.clone()) } else { - emit_pattern( - arm_pat.clone(), - shared_types.clone(), - scrut_type.clone(), - si.clone(), - emit_info.clone(), - ) + emit_pattern(arm_pat.clone(), shared_types.clone(), scrut_type.clone(), si.clone(), emit_info.clone()) } }; - let field_guards = collect_pattern_string_guards(arm_pat.clone(), si.clone()); - let arm_guard_str = match arm_g { - Some(g) => emit_typed_expr( - g.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ), - None => "".to_string(), - }; - let guard_str = if ((field_guards.clone().as_str() != "".to_string().as_str()) - && (arm_guard_str.clone().as_str() != "".to_string().as_str())) - { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(" if ".to_string(), field_guards.clone()), - " && ".to_string(), - ), - arm_guard_str.clone(), - ) +let field_guards = collect_pattern_string_guards(arm_pat.clone(), si.clone()); +let arm_guard_str = match arm_g { + Some(g) => emit_typed_expr(g.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024), + None => "".to_string(), +}; +let guard_str = if ((field_guards.clone().as_str() != "".to_string().as_str()) && (arm_guard_str.clone().as_str() != "".to_string().as_str())) { + v2_rt::concat(v2_rt::concat(v2_rt::concat(" if ".to_string(), field_guards.clone()), " && ".to_string()), arm_guard_str.clone()) } else { if (field_guards.clone().as_str() != "".to_string().as_str()) { v2_rt::concat(" if ".to_string(), field_guards.clone()) @@ -9809,913 +4197,420 @@ pub fn emit_typed_match_arm( } } }; - let body_str = match (*arm_b.expr_data.clone()).clone() { - ExprData::ExprVar { - binding_kind: body_binding_kind, - .. - } => { - let body_name = expr_var_name_at(arm_b.clone(), si.clone()); - if (variant_parent_from_binding_kind(body_binding_kind.clone()) != None) { - emit_var_ref( - &body_name, - &body_binding_kind, - &Some(Rc::new(InferredNode::Resolved { - node: match_result_type, - })), - shared_types.clone(), - registry.clone(), - &emit_info, - si.clone(), - ) - } else { - emit_typed_expr( - arm_b.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ) - } +let body_str = match (*arm_b.expr_data.clone()).clone() { + ExprData::ExprVar { binding_kind: body_binding_kind, .. } => { + let body_name = expr_var_name_at(arm_b.clone(), si.clone()); +if (variant_parent_from_binding_kind(body_binding_kind.clone()) != None) { + emit_var_ref(&body_name, &body_binding_kind, &Some(Rc::new(InferredNode::Resolved { + node: match_result_type, +})), shared_types.clone(), registry.clone(), &emit_info, si.clone()) + } else { + emit_typed_expr(arm_b.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024) } - _ => emit_typed_expr( - arm_b.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ), - }; - if rc_analysis.needs_rc_pattern.clone() { +}, + _ => emit_typed_expr(arm_b.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024), +}; +if rc_analysis.needs_rc_pattern.clone() { { - let prelude = rc_pattern_preludes( - arm_pat.clone(), - rc_analysis.clone(), - shared_types.clone(), - si.clone(), - emit_info.clone(), - ); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(" ".to_string(), pat_str), - guard_str, - ), - " => { ".to_string(), - ), - prelude, - ), - " ".to_string(), - ), - body_str, - ), - " },".to_string(), - ) - } + let prelude = rc_pattern_preludes(arm_pat.clone(), rc_analysis.clone(), shared_types.clone(), si.clone(), emit_info.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), pat_str), guard_str), " => { ".to_string()), prelude), " ".to_string()), body_str), " },".to_string()) +} } else { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(v2_rt::concat(" ".to_string(), pat_str), guard_str), - " => ".to_string(), - ), - body_str, - ), - ",".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), pat_str), guard_str), " => ".to_string()), body_str), ",".to_string()) } - } +} } -pub fn emit_typed_if( - condition: Rc, - then_branch: Rc, - else_branch: Option>, - registry: &Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { - { - let cond_str = emit_typed_expr( - condition, - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - emit_typed_if_shared( - cond_str, - &then_branch, - else_branch, - None, - depth.clone(), - &RenderTarget::Rust, - scope.type_env.clone().source_indices.clone(), - |node, d| { - emit_typed_expr( - node.clone(), - registry.clone(), - &scope, - d.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ) - }, - ) - } +pub fn emit_typed_if(condition: Rc, then_branch: Rc, else_branch: Option>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { + { + let cond_str = emit_typed_expr(condition, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +emit_typed_if_shared(cond_str, &then_branch, else_branch, None, depth.clone(), &RenderTarget::Rust, scope.type_env.clone().source_indices.clone(), |node, d| emit_typed_expr(node.clone(), registry.clone(), &scope, d.clone(), shared_types.clone(), emit_info.clone(), 1024)) +} } -pub fn emit_typed_let( - name: String, - value: &Rc, - body: Option>, - registry: &Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { - { - let val_str = emit_typed_expr( - value.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - emit_typed_let_shared( - &name, - val_str, - body, - RenderTarget::Rust, - |bd, sc| { - emit_typed_expr( - bd.clone(), - registry.clone(), - &sc, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ) - }, - scope.clone(), - value.clone(), - ) - } +pub fn emit_typed_let(name: String, value: &Rc, body: Option>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { + { + let val_str = emit_typed_expr(value.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +emit_typed_let_shared(&name, val_str, body, RenderTarget::Rust, |bd, sc| emit_typed_expr(bd.clone(), registry.clone(), &sc, depth.clone(), shared_types.clone(), emit_info.clone(), 1024), scope.clone(), value.clone()) +} } -pub fn is_optional_struct_field( - emit_info: Rc, - struct_name: String, - field_name: String, -) -> bool { +pub fn is_optional_struct_field(emit_info: Rc, struct_name: String, field_name: String) -> bool { match lookup_emit_type_summary(emit_info, struct_name) { - Some(summary) => match v2_rt::map_get(&summary.field_summaries.clone(), field_name) { - Some(field_summary) => match field_summary.value_shape.clone() { - FieldValueShape::OptionalValue => true, - _ => false, - }, - None => false, - }, - None => false, - } + Some(summary) => match v2_rt::map_get(&summary.field_summaries.clone(), field_name) { + Some(field_summary) => match field_summary.value_shape.clone() { + FieldValueShape::OptionalValue => true, + _ => false, +}, + None => false, +}, + None => false, +} } -pub fn is_already_optional( - texpr: &Rc, - emit_info: Rc, - scope: &Rc, -) -> bool { +pub fn is_already_optional(texpr: &Rc, emit_info: Rc, scope: &Rc) -> bool { { let si = scope.type_env.clone().source_indices.clone(); - let n = expr_var_name_at(texpr.clone(), si.clone()); - let tn = record_lit_type_name_at(texpr.clone(), si.clone()); - let f = field_access_field_at(texpr.clone(), si.clone()); - match (*texpr.expr_data.clone()).clone() { - ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitNull => true, - _ => false, - }, - ExprData::ExprVar { .. } => { - if ((n.clone().as_str() == "none".to_string().as_str()) - || (n.clone().as_str() == "None".to_string().as_str())) - { - true - } else { - match texpr.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - (rt.return_cardinality.clone() == Cardinality::CardOptional) - } - _ => match v2_rt::map_get(&scope.locals.clone(), n.clone()) { - Some(binding) => { - (binding.resolved.clone().return_cardinality.clone() - == Cardinality::CardOptional) - } - None => false, - }, - } - } - } - ExprData::ExprRecordLit { .. } => match tn { - Some(name) => { - ((name.clone().as_str() == "Some".to_string().as_str()) - || (name.clone().as_str() == "None".to_string().as_str())) - } - None => false, - }, - ExprData::ExprFieldAccess { - summary: fa_summary, - .. - } => { - let b = field_access_base(texpr.clone()); - let summary_says_optional = match fa_summary.clone() { - Some(fs) => match fs.value_shape.clone() { - FieldValueShape::OptionalValue => true, - _ => false, - }, - None => false, - }; - if summary_says_optional { - true - } else { - match b.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { - node: base_type, .. - }) => { - let resolved_base = base_type.clone(); - if is_optional_struct_field( - emit_info, - authored_name_at( - scope.type_env.clone().source_indices.clone(), - &resolved_base, - ), - f, - ) { - true - } else { - match texpr.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - (rt.return_cardinality.clone() == Cardinality::CardOptional) - } - _ => false, - } - } - } - _ => match texpr.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - (rt.return_cardinality.clone() == Cardinality::CardOptional) - } - _ => false, - }, +let n = expr_var_name_at(texpr.clone(), si.clone()); +let tn = record_lit_type_name_at(texpr.clone(), si.clone()); +let f = field_access_field_at(texpr.clone(), si.clone()); +match (*texpr.expr_data.clone()).clone() { + ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitNull => true, + _ => false, +}, + ExprData::ExprVar { .. } => if ((n.clone().as_str() == "none".to_string().as_str()) || (n.clone().as_str() == "None".to_string().as_str())) { + true + } else { + match texpr.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => (rt.return_cardinality.clone() == Cardinality::CardOptional), + _ => match v2_rt::map_get(&scope.locals.clone(), n.clone()) { + Some(binding) => (binding.resolved.clone().return_cardinality.clone() == Cardinality::CardOptional), + None => false, +}, +} + }, + ExprData::ExprRecordLit { .. } => match tn { + Some(name) => ((name.clone().as_str() == "Some".to_string().as_str()) || (name.clone().as_str() == "None".to_string().as_str())), + None => false, +}, + ExprData::ExprFieldAccess { summary: fa_summary, .. } => { + let b = field_access_base(texpr.clone()); +let summary_says_optional = match fa_summary.clone() { + Some(fs) => match fs.value_shape.clone() { + FieldValueShape::OptionalValue => true, + _ => false, +}, + None => false, +}; +if summary_says_optional { + true + } else { + match b.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: base_type, .. }) => { + let resolved_base = base_type.clone(); +if is_optional_struct_field(emit_info, authored_name_at(scope.type_env.clone().source_indices.clone(), &resolved_base), f) { + true + } else { + match texpr.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => (rt.return_cardinality.clone() == Cardinality::CardOptional), + _ => false, +} } - } - } - _ => match texpr.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - (rt.return_cardinality.clone() == Cardinality::CardOptional) - } - _ => false, - }, - } - } +}, + _ => match texpr.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => (rt.return_cardinality.clone() == Cardinality::CardOptional), + _ => false, +}, +} + } +}, + _ => match texpr.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => (rt.return_cardinality.clone() == Cardinality::CardOptional), + _ => false, +}, +} +} } -pub fn lookup_struct_field_type_name( - struct_node: &Rc, - field_name: &String, - variant_name: Option, - source_indices: &Rc>>, -) -> Option { - { - let direct = match find_child_named( - struct_node.clone(), - field_name.clone(), - source_indices.clone(), - ) { - Some(field_child) => { - if (field_child.inferred.clone() != None) { - { - let field_type = resolved_type(field_child.clone()); - let ft_is_type_var = if (field_type.inferred.clone() != None) { - is_type_variable(field_type.inferred.clone().clone().unwrap()) - } else { - false - }; - if ((field_type.ident_span.clone() != None) && !ft_is_type_var.clone()) { - Some(authored_name_at(source_indices.clone(), &field_type)) - } else { - None - } - } +pub fn lookup_struct_field_type_name(struct_node: &Rc, field_name: &String, variant_name: Option, source_indices: &Rc>>) -> Option { + { + let direct = match find_child_named(struct_node.clone(), field_name.clone(), source_indices.clone()) { + Some(field_child) => if (field_child.inferred.clone() != None) { + { + let field_type = resolved_type(field_child.clone()); +let ft_is_type_var = if (field_type.inferred.clone() != None) { + is_type_variable(field_type.inferred.clone().clone().unwrap()) + } else { + false + }; +if ((field_type.ident_span.clone() != None) && !ft_is_type_var.clone()) { + Some(authored_name_at(source_indices.clone(), &field_type)) } else { None } - } - None => None, - }; - match direct.clone() { - Some(_) => direct.clone(), - None => match variant_name { - Some(vn) => { - match find_child_named(struct_node.clone(), vn.clone(), source_indices.clone()) - { - Some(variant_child) => match find_child_named( - variant_child.clone(), - field_name.clone(), - source_indices.clone(), - ) { - Some(field_child) => { - if (field_child.inferred.clone() != None) { - { - let field_type = resolved_type(field_child.clone()); - let ft_is_type_var = - if (field_type.inferred.clone() != None) { - is_type_variable( - field_type.inferred.clone().clone().unwrap(), - ) - } else { - false - }; - if ((field_type.ident_span.clone() != None) - && !ft_is_type_var.clone()) - { - Some(authored_name_at( - source_indices.clone(), - &field_type, - )) - } else { - None - } - } - } else { - None - } - } - None => None, - }, - None => None, - } +} + } else { + None + }, + None => None, +}; +match direct.clone() { + Some(_) => direct.clone(), + None => match variant_name { + Some(vn) => match find_child_named(struct_node.clone(), vn.clone(), source_indices.clone()) { + Some(variant_child) => match find_child_named(variant_child.clone(), field_name.clone(), source_indices.clone()) { + Some(field_child) => if (field_child.inferred.clone() != None) { + { + let field_type = resolved_type(field_child.clone()); +let ft_is_type_var = if (field_type.inferred.clone() != None) { + is_type_variable(field_type.inferred.clone().clone().unwrap()) + } else { + false + }; +if ((field_type.ident_span.clone() != None) && !ft_is_type_var.clone()) { + Some(authored_name_at(source_indices.clone(), &field_type)) + } else { + None } - None => None, - }, - } - } +} + } else { + None + }, + None => None, +}, + None => None, +}, + None => None, +}, +} +} } -pub fn emit_field_value_with_context( - field_value: &Rc, - struct_node: &Rc, - outer_type_name: Option, - field_name: &String, - registry: Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { +pub fn emit_field_value_with_context(field_value: &Rc, struct_node: &Rc, outer_type_name: Option, field_name: &String, registry: Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { match (*field_value.expr_data.clone()).clone() { - ExprData::ExprRecordLit { - parent_enum: pe, .. - } => { - let inner_fields = field_value.children.clone(); - let tn = record_lit_type_name_at( - field_value.clone(), - scope.type_env.clone().source_indices.clone(), - ); - match tn.clone() { - Some(variant_name) => { - let node_lookup = lookup_struct_field_type_name( - &struct_node, - &field_name, - outer_type_name, - &scope.type_env.clone().source_indices.clone(), - ); - let expected_type = match node_lookup.clone() { - Some(_) => node_lookup.clone(), - None => { - if (struct_node.ident_span.clone() != None) { - match lookup_emit_type_summary( - emit_info.clone(), - authored_name_at( - scope.type_env.clone().source_indices.clone(), - &struct_node, - ), - ) { - Some(summary) => v2_rt::map_get( - &summary.field_type_map.clone(), - field_name.clone(), - ), - None => None, - } - } else { - None - } - } - }; - let corrected_parent = match expected_type { - Some(et) => { - if variant_belongs_to_enum( - emit_info.type_summaries.clone(), - variant_name.clone(), - et.clone(), - ) { - Some(et.clone()) - } else { - pe.clone() - } - } - None => pe.clone(), - }; - let raw = emit_typed_record_lit( - &tn, - &inner_fields, - &corrected_parent, - &resolved_type(field_value.clone()), - registry, - &scope, - depth, - &shared_types, - &emit_info, - ); - let rc_name = match corrected_parent.clone() { - Some(en) => en.clone(), - None => variant_name.clone(), - }; - if ((rc_name.clone().as_str() != "".to_string().as_str()) - && emit_map_has(shared_types.clone(), rc_name.clone())) - { - v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) - } else { - raw - } - } - None => emit_typed_expr( - field_value.clone(), - registry, - &scope, - depth, - shared_types.clone(), - emit_info.clone(), - 1024, - ), + ExprData::ExprRecordLit { parent_enum: pe, .. } => { + let inner_fields = field_value.children.clone(); +let tn = record_lit_type_name_at(field_value.clone(), scope.type_env.clone().source_indices.clone()); +match tn.clone() { + Some(variant_name) => { + let node_lookup = lookup_struct_field_type_name(&struct_node, &field_name, outer_type_name, &scope.type_env.clone().source_indices.clone()); +let expected_type = match node_lookup.clone() { + Some(_) => node_lookup.clone(), + None => if (struct_node.ident_span.clone() != None) { + match lookup_emit_type_summary(emit_info.clone(), authored_name_at(scope.type_env.clone().source_indices.clone(), &struct_node)) { + Some(summary) => v2_rt::map_get(&summary.field_type_map.clone(), field_name.clone()), + None => None, +} + } else { + None + }, +}; +let corrected_parent = match expected_type { + Some(et) => if variant_belongs_to_enum(emit_info.type_summaries.clone(), variant_name.clone(), et.clone()) { + Some(et.clone()) + } else { + pe.clone() + }, + None => pe.clone(), +}; +let raw = emit_typed_record_lit(&tn, &inner_fields, &corrected_parent, &resolved_type(field_value.clone()), registry, &scope, depth, &shared_types, &emit_info); +let rc_name = match corrected_parent.clone() { + Some(en) => en.clone(), + None => variant_name.clone(), +}; +if ((rc_name.clone().as_str() != "".to_string().as_str()) && set_contains(shared_types.clone(), rc_name.clone())) { + v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) + } else { + raw } - } - _ => emit_typed_expr( - field_value.clone(), - registry, - &scope, - depth, - shared_types.clone(), - emit_info.clone(), - 1024, - ), - } +}, + None => emit_typed_expr(field_value.clone(), registry, &scope, depth, shared_types.clone(), emit_info.clone(), 1024), +} +}, + _ => emit_typed_expr(field_value.clone(), registry, &scope, depth, shared_types.clone(), emit_info.clone(), 1024), +} } -pub fn find_struct_name_by_fields( - field_names: &Rc>, - type_summaries: Rc>>, -) -> Option { +pub fn find_struct_name_by_fields(field_names: &Rc>, type_summaries: Rc>>) -> Option { { let n_fields = (field_names.clone().len() as i64); - if (n_fields.clone() == 0) { - return None; - } - let candidates = Rc::new({ - let mut __result = Vec::new(); - for summary in Rc::new(v2_rt::map_values(&type_summaries)).iter().cloned() { - if match (*summary.repr.clone()).clone() { - TypeRepr::StructRepr => { - let ftm_keys = Rc::new(v2_rt::map_keys(&summary.field_type_map.clone())); - if ((ftm_keys.clone().len() as i64) == n_fields.clone()) { - { - let mut __all = true; - for fn_name in field_names.clone().iter().cloned() { - if !(v2_rt::map_contains_key( - &summary.field_type_map.clone(), - fn_name.clone(), - )) { - __all = false; - break; - } - } - __all - } - } else { - false - } - } - _ => false, - } { - __result.push(summary); - } +if (n_fields.clone() == 0) { + return None + } +let candidates = Rc::new({ let mut __result = Vec::new(); for summary in Rc::new(v2_rt::map_values(&type_summaries)).iter().cloned() { if match (*summary.repr.clone()).clone() { + TypeRepr::StructRepr => { + let ftm_keys = Rc::new(v2_rt::map_keys(&summary.field_type_map.clone())); +if ((ftm_keys.clone().len() as i64) == n_fields.clone()) { + { let mut __all = true; for fn_name in field_names.clone().iter().cloned() { if !(v2_rt::map_contains_key(&summary.field_type_map.clone(), fn_name.clone())) { __all = false; break; } } __all } + } else { + false } - __result - }); - match candidates.first().cloned() { - Some(s) => Some(s.name.clone()), - None => None, - } - } +}, + _ => false, +} { __result.push(summary); } } __result }); +match candidates.first().cloned() { + Some(s) => Some(s.name.clone()), + None => None, +} +} } -pub fn emit_typed_record_lit( - type_name: &Option, - fields: &Rc>>, - parent_enum: &Option, - resolved_type: &Rc, - registry: Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { - { - let struct_name = explicit_record_struct_name( - type_name.clone(), - &resolved_type, - shared_types.clone(), - scope.type_env.clone().source_indices.clone(), - ); - let qualified_name = match struct_name { - Some(sn) => Some(sn.clone()), - None => { - let rt_name = authored_name_at( - scope.type_env.clone().source_indices.clone(), - &resolved_type, - ); - if ((resolved_type.ident_span.clone() != None) - && v2_rt::map_contains_key(&emit_info.type_summaries.clone(), rt_name.clone())) - { - Some(rt_name.clone()) - } else { - None - } +pub fn emit_typed_record_lit(type_name: &Option, fields: &Rc>>, parent_enum: &Option, resolved_type: &Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { + { + let struct_name = explicit_record_struct_name(type_name.clone(), &resolved_type, shared_types.clone(), scope.type_env.clone().source_indices.clone()); +let qualified_name = match struct_name { + Some(sn) => Some(sn.clone()), + None => { + let rt_name = authored_name_at(scope.type_env.clone().source_indices.clone(), &resolved_type); +if ((resolved_type.ident_span.clone() != None) && v2_rt::map_contains_key(&emit_info.type_summaries.clone(), rt_name.clone())) { + Some(rt_name.clone()) + } else { + None } - }; - match qualified_name { - None => { - let is_product = is_product_type(resolved_type.clone()); - if (is_product && (resolved_type.ident_span.clone() == None)) { - if ((fields.clone().len() as i64) == 1) { - match fields.clone().first().cloned() { - Some(f) => emit_typed_expr( - field_init_node_value(&f), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ), - None => { - "compile_error!(\"empty anonymous record literal\")".to_string() - } - } - } else { - { - let lit_field_names = Rc::new({ - let mut __result = Vec::new(); - for f in fields.clone().iter().cloned() { - __result.push(field_init_node_name_at( - f.clone(), - scope.type_env.clone().source_indices.clone(), - )); - } - __result - }); - match find_struct_name_by_fields( - &lit_field_names, - emit_info.type_summaries.clone(), - ) { - Some(resolved_sn) => { - let field_strs = Rc::new({ - let mut __result = Vec::new(); - for f in fields.clone().iter().cloned() { - __result.push({ - let fname = field_init_node_name_at( - f.clone(), - scope.type_env.clone().source_indices.clone(), - ); - let fval = emit_typed_expr( - field_init_node_value(&f), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - " ".to_string(), - emit_ident( - fname.clone(), - RenderTarget::Rust, - ), - ), - ": ".to_string(), - ), - fval.clone(), - ), - ",".to_string(), - ) - }); - } - __result - }); - let body = field_strs.join(&"\n".to_string()); - let struct_lit = v2_rt::concat( - v2_rt::concat( - v2_rt::concat(resolved_sn.clone(), " {\n".to_string()), - body, - ), - "\n}".to_string(), - ); - if emit_map_has(shared_types.clone(), resolved_sn.clone()) { - v2_rt::concat( - v2_rt::concat("Rc::new(".to_string(), struct_lit), - ")".to_string(), - ) - } else { - struct_lit - } - } - None => { - let vals = Rc::new({ - let mut __result = Vec::new(); - for f in fields.clone().iter().cloned() { - __result.push(emit_typed_expr( - field_init_node_value(&f), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - )); - } - __result - }); - v2_rt::concat( - v2_rt::concat( - "(".to_string(), - vals.join(&", ".to_string()), - ), - ")".to_string(), - ) - } - } - } - } +}, +}; +match qualified_name { + None => { + let is_product = is_product_type(resolved_type.clone()); +if (is_product && (resolved_type.ident_span.clone() == None)) { + if ((fields.clone().len() as i64) == 1) { + match fields.clone().first().cloned() { + Some(f) => emit_typed_expr(field_init_node_value(&f), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024), + None => "compile_error!(\"empty anonymous record literal\")".to_string(), +} } else { - "compile_error!(\"cannot resolve anonymous record type in emitter\")" - .to_string() + { + let lit_field_names = Rc::new({ let mut __result = Vec::new(); for f in fields.clone().iter().cloned() { __result.push(field_init_node_name_at(f.clone(), scope.type_env.clone().source_indices.clone())); } __result }); +match find_struct_name_by_fields(&lit_field_names, emit_info.type_summaries.clone()) { + Some(resolved_sn) => { + let field_strs = Rc::new({ let mut __result = Vec::new(); for f in fields.clone().iter().cloned() { __result.push({ + let fname = field_init_node_name_at(f.clone(), scope.type_env.clone().source_indices.clone()); +let fval = emit_typed_expr(field_init_node_value(&f), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), emit_ident(fname.clone(), RenderTarget::Rust)), ": ".to_string()), fval.clone()), ",".to_string()) +}); } __result }); +let body = field_strs.join(&"\n".to_string()); +let struct_lit = v2_rt::concat(v2_rt::concat(v2_rt::concat(resolved_sn.clone(), " {\n".to_string()), body), "\n}".to_string()); +if set_contains(shared_types.clone(), resolved_sn.clone()) { + v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), struct_lit), ")".to_string()) + } else { + struct_lit + } +}, + None => { + let vals = Rc::new({ let mut __result = Vec::new(); for f in fields.clone().iter().cloned() { __result.push(emit_typed_expr(field_init_node_value(&f), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024)); } __result }); +v2_rt::concat(v2_rt::concat("(".to_string(), vals.join(&", ".to_string())), ")".to_string()) +}, +} +} } + } else { + "compile_error!(\"cannot resolve anonymous record type in emitter\")".to_string() } - Some(tn) => { - let si = scope.type_env.clone().source_indices.clone(); - let context_lookup = contextual_variant_parent( - &tn, - parent_enum.clone(), - &resolved_type, - emit_info.clone(), - si.clone(), - ); - let effective_parent = match context_lookup { - Some(context_parent) => Some(context_parent.clone()), - None => { - let rt_is_type_var = if (resolved_type.inferred.clone() != None) { - is_type_variable(resolved_type.inferred.clone().clone().unwrap()) - } else { - false - }; - let rt_name = authored_name_at(si.clone(), &resolved_type); - if ((((resolved_type.ident_span.clone() != None) - && (rt_name.clone().as_str() != tn.clone().as_str())) - && !rt_is_type_var) - && (rt_name.clone().as_str() != "Error".to_string().as_str())) - { - Some(rt_name.clone()) - } else { - parent_enum.clone() - } - } - }; - let display_tn = if ((tn.clone().as_str() == "Some".to_string().as_str()) - || (tn.clone().as_str() == "None".to_string().as_str())) - { - tn.clone() +}, + Some(tn) => { + let si = scope.type_env.clone().source_indices.clone(); +let context_lookup = contextual_variant_parent(&tn, parent_enum.clone(), &resolved_type, emit_info.clone(), si.clone()); +let effective_parent = match context_lookup { + Some(context_parent) => Some(context_parent.clone()), + None => { + let rt_is_type_var = if (resolved_type.inferred.clone() != None) { + is_type_variable(resolved_type.inferred.clone().clone().unwrap()) } else { - match effective_parent { - Some(resolved_parent_enum) => v2_rt::concat( - v2_rt::concat(resolved_parent_enum.clone(), "::".to_string()), - tn.clone(), - ), - None => tn.clone(), - } + false }; - if ((tn.clone().as_str() == "Some".to_string().as_str()) - && ((fields.clone().len() as i64) == 1)) - { - match fields.clone().first().cloned() { - Some(f) => { - let inner = emit_typed_expr( - field_init_node_value(&f), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - v2_rt::concat( - v2_rt::concat("Some(".to_string(), inner), - ")".to_string(), - ) - } - None => v2_rt::concat(display_tn, " {}".to_string()), - } +let rt_name = authored_name_at(si.clone(), &resolved_type); +if ((((resolved_type.ident_span.clone() != None) && (rt_name.clone().as_str() != tn.clone().as_str())) && !rt_is_type_var) && (rt_name.clone().as_str() != "Error".to_string().as_str())) { + Some(rt_name.clone()) } else { - if ((fields.clone().len() as i64) == 0) { - { - let empty_raw = v2_rt::concat(display_tn, " {}".to_string()); - let record_parent_enum = match parent_enum.clone() { - Some(en) => en.clone(), - None => "".to_string(), + parent_enum.clone() + } +}, +}; +let display_tn = if ((tn.clone().as_str() == "Some".to_string().as_str()) || (tn.clone().as_str() == "None".to_string().as_str())) { + tn.clone() + } else { + match effective_parent { + Some(resolved_parent_enum) => v2_rt::concat(v2_rt::concat(resolved_parent_enum.clone(), "::".to_string()), tn.clone()), + None => tn.clone(), +} + }; +if ((tn.clone().as_str() == "Some".to_string().as_str()) && ((fields.clone().len() as i64) == 1)) { + match fields.clone().first().cloned() { + Some(f) => { + let inner = emit_typed_expr(field_init_node_value(&f), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +v2_rt::concat(v2_rt::concat("Some(".to_string(), inner), ")".to_string()) +}, + None => v2_rt::concat(display_tn.clone(), " {}".to_string()), +} + } else { + if ((fields.clone().len() as i64) == 0) { + { + let empty_raw = v2_rt::concat(display_tn.clone(), " {}".to_string()); +let record_parent_enum = match parent_enum.clone() { + Some(en) => en.clone(), + None => "".to_string(), +}; +empty_raw +} + } else { + if (((fields.clone().len() as i64) == 1) && set_contains(emit_info.untagged_json_tuple_variants.clone(), display_tn.clone())) { + match fields.clone().first().cloned() { + Some(f) => { + let f_name = field_init_node_name_at(f.clone(), scope.type_env.clone().source_indices.clone()); +let f_value = field_init_node_value(&f); +let val_str = emit_field_value_with_context(&f_value, &resolved_type, type_name.clone(), &f_name, registry.clone(), &scope, depth.clone(), &shared_types, &emit_info); +let needs_wrap = (is_optional_struct_field(emit_info.clone(), tn.clone(), f_name.clone()) && (is_already_optional(&f_value, emit_info.clone(), &scope) == false)); +let field_val = if needs_wrap.clone() { + v2_rt::concat(v2_rt::concat("Some(".to_string(), val_str.clone()), ")".to_string()) + } else { + val_str.clone() }; - empty_raw - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(display_tn.clone(), "(".to_string()), field_val.clone()), ")".to_string()) +}, + None => v2_rt::concat(display_tn.clone(), " {}".to_string()), +} } else { { - let field_strs = Rc::new({ - let mut __result = Vec::new(); - for f in fields.clone().iter().cloned() { - __result.push({ - let f_name = field_init_node_name_at( - f.clone(), - scope.type_env.clone().source_indices.clone(), - ); - let f_value = field_init_node_value(&f); - let val_str = emit_field_value_with_context( - &f_value, - &resolved_type, - type_name.clone(), - &f_name, - registry.clone(), - &scope, - depth.clone(), - &shared_types, - &emit_info, - ); - let needs_wrap = (is_optional_struct_field( - emit_info.clone(), - tn.clone(), - f_name.clone(), - ) && (is_already_optional( - &f_value, - emit_info.clone(), - &scope, - ) == false)); - let field_val = if needs_wrap.clone() { - v2_rt::concat( - v2_rt::concat("Some(".to_string(), val_str.clone()), - ")".to_string(), - ) - } else { - val_str.clone() - }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - " ".to_string(), - emit_ident( - f_name.clone(), - RenderTarget::Rust, - ), - ), - ": ".to_string(), - ), - field_val.clone(), - ), - ",".to_string(), - ) - }); - } - __result - }); - let provided_names = Rc::new({ - let mut __result = Vec::new(); - for f in fields.clone().iter().cloned() { - __result.push(field_init_node_name_at( - f.clone(), - scope.type_env.clone().source_indices.clone(), - )); - } - __result - }); - let provided_set = provided_names.iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, n: String| { - v2_rt::rc_map_insert(acc, n.clone(), true) - }, - ); - let summary = lookup_emit_type_summary(emit_info.clone(), tn.clone()); - let default_strs = match summary { - Some(s) => { - let fs = s.field_summaries.clone(); - let ftm = s.field_type_map.clone(); - let missing = Rc::new({ - let mut __result = Vec::new(); - for k in Rc::new(v2_rt::map_keys(&fs)).iter().cloned() { - if !emit_map_has(provided_set.clone(), k.clone()) { - __result.push(k); - } - } - __result - }); - let all_defaultable = { - let mut __all = true; - for fname in missing.clone().iter().cloned() { - if !({ - let has_zv = - match v2_rt::map_get(&ftm, fname.clone()) { - Some(ft) => match rust_zero_value(&ft) { - Some(_) => true, - None => false, - }, - None => false, - }; - (has_zv.clone() - || is_optional_struct_field( - emit_info.clone(), - tn.clone(), - fname.clone(), - )) - }) { - __all = false; - break; - } - } - __all - }; - if all_defaultable { - Rc::new({ - let mut __result = Vec::new(); - for fname in missing.clone().iter().cloned() { - __result.extend((*if is_optional_struct_field(emit_info.clone(), tn.clone(), fname.clone()) { - Rc::new(vec![v2_rt::concat(v2_rt::concat(" ".to_string(), emit_ident(fname.clone(), RenderTarget::Rust)), ": None,".to_string())]) + let field_strs = Rc::new({ let mut __result = Vec::new(); for f in fields.clone().iter().cloned() { __result.push({ + let f_name = field_init_node_name_at(f.clone(), scope.type_env.clone().source_indices.clone()); +let f_value = field_init_node_value(&f); +let val_str = emit_field_value_with_context(&f_value, &resolved_type, type_name.clone(), &f_name, registry.clone(), &scope, depth.clone(), &shared_types, &emit_info); +let needs_wrap = (is_optional_struct_field(emit_info.clone(), tn.clone(), f_name.clone()) && (is_already_optional(&f_value, emit_info.clone(), &scope) == false)); +let field_val = if needs_wrap.clone() { + v2_rt::concat(v2_rt::concat("Some(".to_string(), val_str.clone()), ")".to_string()) } else { - match v2_rt::map_get(&ftm, fname.clone()) { + val_str.clone() + }; +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), emit_ident(f_name.clone(), RenderTarget::Rust)), ": ".to_string()), field_val.clone()), ",".to_string()) +}); } __result }); +let provided_names = Rc::new({ let mut __result = Vec::new(); for f in fields.clone().iter().cloned() { __result.push(field_init_node_name_at(f.clone(), scope.type_env.clone().source_indices.clone())); } __result }); +let provided_set = provided_names.iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, n: String| v2_rt::rc_map_insert(acc, n.clone(), true)); +let summary = lookup_emit_type_summary(emit_info.clone(), tn.clone()); +let default_strs = match summary { + Some(s) => { + let fs = s.field_summaries.clone(); +let ftm = s.field_type_map.clone(); +let missing = Rc::new({ let mut __result = Vec::new(); for k in Rc::new(v2_rt::map_keys(&fs)).iter().cloned() { if !emit_map_has(provided_set.clone(), k.clone()) { __result.push(k); } } __result }); +let all_defaultable = { let mut __all = true; for fname in missing.clone().iter().cloned() { if !({ + let has_zv = match v2_rt::map_get(&ftm, fname.clone()) { + Some(ft) => match rust_zero_value(&ft) { + Some(_) => true, + None => false, +}, + None => false, +}; +(has_zv.clone() || is_optional_struct_field(emit_info.clone(), tn.clone(), fname.clone())) +}) { __all = false; break; } } __all }; +if all_defaultable { + Rc::new({ let mut __result = Vec::new(); for fname in missing.clone().iter().cloned() { __result.extend((*if is_optional_struct_field(emit_info.clone(), tn.clone(), fname.clone()) { + Rc::new(vec![v2_rt::concat(v2_rt::concat(" ".to_string(), emit_ident(fname.clone(), RenderTarget::Rust)), ": None,".to_string())]) + } else { + match v2_rt::map_get(&ftm, fname.clone()) { Some(ft) => match rust_zero_value(&ft) { Some(zv) => Rc::new(vec![v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), emit_ident(fname.clone(), RenderTarget::Rust)), ": ".to_string()), zv.clone()), ",".to_string())]), None => Rc::new(vec![]), }, None => Rc::new(vec![]), } - }).iter().cloned()); - } - __result - }) - } else { - Rc::new(vec![]) - } + }).iter().cloned()); } __result }) + } else { + Rc::new(vec![]) } - None => Rc::new(vec![]), - }; - let all_field_strs = v2_rt::concat(field_strs, default_strs); - let fields_str = all_field_strs.join(&"\n".to_string()); - let raw = v2_rt::concat( - v2_rt::concat( - v2_rt::concat(display_tn, " {\n".to_string()), - fields_str, - ), - "\n}".to_string(), - ); - raw - } +}, + None => Rc::new(vec![]), +}; +let all_field_strs = v2_rt::concat(field_strs, default_strs); +let fields_str = all_field_strs.join(&"\n".to_string()); +let raw = v2_rt::concat(v2_rt::concat(v2_rt::concat(display_tn.clone(), " {\n".to_string()), fields_str), "\n}".to_string()); +raw +} } } } - } - } +}, +} +} } pub fn rust_zero_value(type_name: &String) -> Option { @@ -10726,10 +4621,7 @@ pub fn rust_zero_value(type_name: &String) -> Option { Some("false".to_string()) } else { if (type_name.clone().as_str() == "String".to_string().as_str()) { - Some(v2_rt::concat( - "\"\"".to_string(), - ".to_string()".to_string(), - )) + Some(v2_rt::concat("\"\"".to_string(), ".to_string()".to_string())) } else { None } @@ -10737,1058 +4629,330 @@ pub fn rust_zero_value(type_name: &String) -> Option { } } -pub fn emit_typed_bin_op( - op: &BinOp, - algebra_field: Option, - left: &Rc, - right: &Rc, - registry: &Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { - { - let l_str = emit_typed_expr( - left.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let r_str = emit_typed_expr( - right.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - if is_null_coalesce(op.clone()) { +pub fn emit_typed_bin_op(op: &BinOp, algebra_field: Option, left: &Rc, right: &Rc, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { + { + let l_str = emit_typed_expr(left.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let r_str = emit_typed_expr(right.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +if is_null_coalesce(op.clone()) { emit_null_coalesce(l_str, r_str, RenderTarget::Rust) } else { { let op_str = emit_bin_op_symbol(op.clone(), &RenderTarget::Rust, algebra_field); - if is_string_comparison( - op.clone(), - left.clone(), - right.clone(), - &scope.type_env.clone().source_indices.clone(), - ) { +if is_string_comparison(op.clone(), left.clone(), right.clone(), &scope.type_env.clone().source_indices.clone()) { { let l_optional = is_optional_typed_expr(left.clone()); - let r_optional = is_optional_typed_expr(right.clone()); - if (l_optional.clone() || r_optional.clone()) { +let r_optional = is_optional_typed_expr(right.clone()); +if (l_optional.clone() || r_optional.clone()) { { let l_cmp = if l_optional.clone() { v2_rt::concat(l_str, ".as_deref()".to_string()) } else { - v2_rt::concat( - v2_rt::concat("Some(".to_string(), l_str), - ".as_str())".to_string(), - ) + v2_rt::concat(v2_rt::concat("Some(".to_string(), l_str), ".as_str())".to_string()) }; - let r_cmp = if r_optional.clone() { +let r_cmp = if r_optional.clone() { v2_rt::concat(r_str, ".as_deref()".to_string()) } else { - v2_rt::concat( - v2_rt::concat("Some(".to_string(), r_str), - ".as_str())".to_string(), - ) + v2_rt::concat(v2_rt::concat("Some(".to_string(), r_str), ".as_str())".to_string()) }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("(".to_string(), l_cmp), - " ".to_string(), - ), - op_str, - ), - " ".to_string(), - ), - r_cmp, - ), - ")".to_string(), - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("(".to_string(), l_cmp), " ".to_string()), op_str), " ".to_string()), r_cmp), ")".to_string()) +} } else { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("(".to_string(), l_str), - ".as_str() ".to_string(), - ), - op_str, - ), - " ".to_string(), - ), - r_str, - ), - ".as_str())".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("(".to_string(), l_str), ".as_str() ".to_string()), op_str), " ".to_string()), r_str), ".as_str())".to_string()) } - } +} } else { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("(".to_string(), l_str), - " ".to_string(), - ), - op_str, - ), - " ".to_string(), - ), - r_str, - ), - ")".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("(".to_string(), l_str), " ".to_string()), op_str), " ".to_string()), r_str), ")".to_string()) } - } +} } - } +} } pub fn is_optional_typed_expr(e: Rc) -> bool { match e.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - (rt.return_cardinality.clone() == Cardinality::CardOptional) - } - _ => false, - } + Some(InferredNode::Resolved { node: rt, .. }) => (rt.return_cardinality.clone() == Cardinality::CardOptional), + _ => false, +} } -pub fn is_string_comparison( - op: BinOp, - left: Rc, - right: Rc, - source_indices: &Rc>>, -) -> bool { +pub fn is_string_comparison(op: BinOp, left: Rc, right: Rc, source_indices: &Rc>>) -> bool { match op { - BinOp::Eq => { - (is_string_typed_expr(left, source_indices.clone()) - && is_string_typed_expr(right, source_indices.clone())) - } - BinOp::Ne => { - (is_string_typed_expr(left, source_indices.clone()) - && is_string_typed_expr(right, source_indices.clone())) - } - _ => false, - } + BinOp::Eq => (is_string_typed_expr(left, source_indices.clone()) && is_string_typed_expr(right, source_indices.clone())), + BinOp::Ne => (is_string_typed_expr(left, source_indices.clone()) && is_string_typed_expr(right, source_indices.clone())), + _ => false, +} } -pub fn is_string_typed_expr( - e: Rc, - source_indices: Rc>>, -) -> bool { +pub fn is_string_typed_expr(e: Rc, source_indices: Rc>>) -> bool { match e.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - let is_optional = (rt.return_cardinality.clone() == Cardinality::CardOptional); - let inner = if is_optional { - with_required_cardinality(&rt) - } else { - rt.clone() - }; - is_rust_string_like(inner, source_indices) - } - _ => false, - } + Some(InferredNode::Resolved { node: rt, .. }) => { + let is_optional = (rt.return_cardinality.clone() == Cardinality::CardOptional); +let inner = if is_optional { + with_required_cardinality(&rt) + } else { + rt.clone() + }; +is_rust_string_like(inner, source_indices) +}, + _ => false, +} } -pub fn emit_typed_string_interp( - parts: &Rc>>, - registry: Rc>>, - scope: Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { - { - let has_interpolations = { - let mut __found = false; - for p in parts.clone().iter().cloned() { - if match (*p.clone()).clone() { - StringPart::Interpolation { .. } => true, - _ => false, - } { - __found = true; - break; - } - } - __found - }; - let fmt_parts = Rc::new({ - let mut __result = Vec::new(); - for p in parts.clone().iter().cloned() { - __result.push(typed_interp_format_part( - p.clone(), - registry.clone(), - scope.clone(), - depth.clone(), - shared_types.clone(), - emit_info.clone(), - has_interpolations.clone(), - )); - } - __result - }); - let fmt_str = Rc::new({ - let mut __result = Vec::new(); - for p in fmt_parts.clone().iter().cloned() { - __result.push(p.format_segment.clone()); - } - __result - }) - .join(&"".to_string()); - let args = Rc::new({ - let mut __result = Vec::new(); - for a in Rc::new({ - let mut __result = Vec::new(); - for p in fmt_parts.clone().iter().cloned() { - __result.push(p.arg_expr.clone()); - } - __result - }) - .iter() - .cloned() - { - if (a.clone().as_str() != "".to_string().as_str()) { - __result.push(a); - } - } - __result - }); - if ((args.clone().len() as i64) == 0) { - v2_rt::concat( - v2_rt::concat("\"".to_string(), fmt_str), - "\".to_string()".to_string(), - ) +pub fn emit_typed_string_interp(parts: &Rc>>, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { + { + let has_interpolations = { let mut __found = false; for p in parts.clone().iter().cloned() { if match (*p.clone()).clone() { + StringPart::Interpolation { .. } => true, + _ => false, +} { __found = true; break; } } __found }; +let fmt_parts = Rc::new({ let mut __result = Vec::new(); for p in parts.clone().iter().cloned() { __result.push(typed_interp_format_part(p.clone(), registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone(), has_interpolations.clone())); } __result }); +let fmt_str = Rc::new({ let mut __result = Vec::new(); for p in fmt_parts.clone().iter().cloned() { __result.push(p.format_segment.clone()); } __result }).join(&"".to_string()); +let args = Rc::new({ let mut __result = Vec::new(); for a in Rc::new({ let mut __result = Vec::new(); for p in fmt_parts.clone().iter().cloned() { __result.push(p.arg_expr.clone()); } __result }).iter().cloned() { if (a.clone().as_str() != "".to_string().as_str()) { __result.push(a); } } __result }); +if ((args.clone().len() as i64) == 0) { + v2_rt::concat(v2_rt::concat("\"".to_string(), fmt_str), "\".to_string()".to_string()) } else { { let args_str = args.clone().join(&", ".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("format!(\"".to_string(), fmt_str), - "\", ".to_string(), - ), - args_str, - ), - ")".to_string(), - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("format!(\"".to_string(), fmt_str), "\", ".to_string()), args_str), ")".to_string()) +} } - } +} } -pub fn typed_interp_format_part( - part: Rc, - registry: Rc>>, - scope: Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, - has_interpolations: bool, -) -> Rc { +pub fn typed_interp_format_part(part: Rc, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc, has_interpolations: bool) -> Rc { match (*part).clone() { - StringPart::Text { value: v, .. } => { - let escaped = if has_interpolations { - escape_rust_interp_text(v.clone()) - } else { - escape_string_literal_body(v.clone()) - }; - Rc::new(InterpPart { - format_segment: escaped, - arg_expr: "".to_string(), - }) - } - StringPart::Interpolation { expr: e, .. } => Rc::new(InterpPart { - format_segment: "{}".to_string(), - arg_expr: emit_typed_expr( - e.clone(), - registry, - &scope, - depth, - shared_types, - emit_info, - 1024, - ), - }), - } + StringPart::Text { value: v, .. } => { + let escaped = if has_interpolations { + escape_rust_interp_text(v.clone()) + } else { + escape_string_literal_body(v.clone()) + }; +Rc::new(InterpPart { + format_segment: escaped, + arg_expr: "".to_string(), +}) +}, + StringPart::Interpolation { expr: e, .. } => Rc::new(InterpPart { + format_segment: "{}".to_string(), + arg_expr: emit_typed_expr(e.clone(), registry, &scope, depth, shared_types, emit_info, 1024), +}), +} } -pub fn emit_typed_block( - stmts: Rc>>, - registry: Rc>>, - scope: Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { - { - let state = emit_rust_block_stmts( - stmts, - Rc::new(vec![]), - scope, - registry, - (depth.clone() + 1), - shared_types, - emit_info, - ); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("{\n".to_string(), make_indent((depth.clone() + 1))), - state.text.clone().join(&"\n".to_string()), - ), - "\n}".to_string(), - ) - } +pub fn emit_typed_block(stmts: Rc>>, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { + { + let state = emit_rust_block_stmts(stmts, Rc::new(vec![]), scope, registry, (depth.clone() + 1), shared_types, emit_info); +v2_rt::concat(v2_rt::concat(v2_rt::concat("{\n".to_string(), make_indent((depth.clone() + 1))), state.text.clone().join(&"\n".to_string())), "\n}".to_string()) +} } -pub fn emit_tco_init_block_stmts( - mut remaining: Rc>>, - mut text: Rc>, - mut scope: Rc, - mut registry: Rc>>, - mut depth: i64, - mut shared_types: Rc>, - mut emit_info: Rc, - mut params: Rc>>, -) -> Rc { +pub fn emit_tco_init_block_stmts(mut remaining: Rc>>, mut text: Rc>, mut scope: Rc, mut registry: Rc>>, mut depth: i64, mut shared_types: Rc>, mut emit_info: Rc, mut params: Rc>>) -> Rc { loop { match remaining.clone().first().cloned() { - None => { - break Rc::new(BlockEmitState { - text: text, - scope: scope.clone(), - }); - } - Some(stmt) => { - let rest = Rc::new( - remaining - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - match rest.clone().first().cloned() { - None => { - break Rc::new(BlockEmitState { - text: text, - scope: scope.clone(), - }); - } - Some(_) => { - let line = emit_tco_init_stmt( - &stmt, - params.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ); - let next_scope = scope_after_expr(&stmt, &scope); - { - let __tco_0 = rest.clone(); - let __tco_1 = v2_rt::rc_list_push(text, line); - let __tco_2 = next_scope; - remaining = __tco_0; - text = __tco_1; - scope = __tco_2; - continue; - } - } - } - } - } - } -} - -pub fn emit_tco_init_stmt( - stmt: &Rc, - params: Rc>>, - registry: Rc>>, - scope: &Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { + None => { break Rc::new(BlockEmitState { + text: text, + scope: scope.clone(), +}); }, + Some(stmt) => { let rest = Rc::new(remaining.clone().iter().cloned().skip(1 as usize).collect::>()); +match rest.clone().first().cloned() { + None => { break Rc::new(BlockEmitState { + text: text, + scope: scope.clone(), +}); }, + Some(_) => { let line = emit_tco_init_stmt(&stmt, params.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone()); +let next_scope = scope_after_expr(&stmt, &scope); +{ + let __tco_0 = rest.clone(); +let __tco_1 = v2_rt::rc_list_push(text, line); +let __tco_2 = next_scope; +remaining = __tco_0; +text = __tco_1; +scope = __tco_2; +continue; +} }, +} }, +} +} +} + +pub fn emit_tco_init_stmt(stmt: &Rc, params: Rc>>, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { match (*stmt.expr_data.clone()).clone() { - ExprData::ExprLet => { - let n = - let_binding_name_at(stmt.clone(), scope.type_env.clone().source_indices.clone()); - let v = let_value(stmt.clone()); - let val_str = - emit_typed_expr(v, registry, &scope, depth, shared_types, emit_info, 1024); - let is_param = { - let mut __found = false; - for p in params.iter().cloned() { - if (param_node_name_at( - p.clone(), - scope.type_env.clone().source_indices.clone(), - ) - .as_str() - == n.clone().as_str()) - { - __found = true; - break; - } - } - __found - }; - if is_param { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(emit_ident(n.clone(), RenderTarget::Rust), " = ".to_string()), - val_str, - ), - ";".to_string(), - ) - } else { - emit_let_binding(n.clone(), val_str, &RenderTarget::Rust) - } + ExprData::ExprLet => { + let n = let_binding_name_at(stmt.clone(), scope.type_env.clone().source_indices.clone()); +let v = let_value(stmt.clone()); +let val_str = emit_typed_expr(v, registry, &scope, depth, shared_types, emit_info, 1024); +let is_param = { let mut __found = false; for p in params.iter().cloned() { if (param_node_name_at(p.clone(), scope.type_env.clone().source_indices.clone()).as_str() == n.clone().as_str()) { __found = true; break; } } __found }; +if is_param { + v2_rt::concat(v2_rt::concat(v2_rt::concat(emit_ident(n.clone(), RenderTarget::Rust), " = ".to_string()), val_str), ";".to_string()) + } else { + emit_let_binding(n.clone(), val_str, &RenderTarget::Rust) } - _ => emit_typed_expr( - stmt.clone(), - registry, - &scope, - depth, - shared_types, - emit_info, - 1024, - ), - } +}, + _ => emit_typed_expr(stmt.clone(), registry, &scope, depth, shared_types, emit_info, 1024), +} } -pub fn emit_typed_tco_body( - texpr: Rc, - fn_name: String, - params: Rc>>, - registry: Rc>>, - scope: Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { - { - let inner = emit_typed_tco_expr( - texpr, - &fn_name, - params, - registry, - scope, - (depth.clone() + 1), - shared_types, - emit_info, - ); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("loop {\n".to_string(), make_indent((depth.clone() + 1))), - inner, - ), - "\n}".to_string(), - ) - } +pub fn emit_typed_tco_body(texpr: Rc, fn_name: String, params: Rc>>, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { + { + let inner = emit_typed_tco_expr(texpr, &fn_name, params, registry, scope, (depth.clone() + 1), shared_types, emit_info); +v2_rt::concat(v2_rt::concat(v2_rt::concat("loop {\n".to_string(), make_indent((depth.clone() + 1))), inner), "\n}".to_string()) +} } -pub fn emit_rust_tco_non_self_call( - frame: &Rc, - registry: Rc>>, - shared_types: Rc>, - emit_info: Rc, -) -> String { +pub fn emit_rust_tco_non_self_call(frame: &Rc, registry: Rc>>, shared_types: Rc>, emit_info: Rc) -> String { match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let f = expr_call_func_at( - frame.expr.clone(), - frame.scope.clone().type_env.clone().source_indices.clone(), - ); - let call_str = emit_typed_call( - &f, - &frame.expr.clone().children.clone(), - ®istry, - &frame.scope.clone(), - frame.depth.clone(), - &shared_types, - &emit_info, - ); - v2_rt::concat( - v2_rt::concat("break ".to_string(), call_str), - ";".to_string(), - ) - } - _ => emit_error_expr( - "emit_rust_tco_non_self_call expected ExprCall".to_string(), - RenderTarget::Rust, - ), - } + ExprData::ExprCall { .. } => { + let f = expr_call_func_at(frame.expr.clone(), frame.scope.clone().type_env.clone().source_indices.clone()); +let call_str = emit_typed_call(&f, &frame.expr.clone().children.clone(), ®istry, &frame.scope.clone(), frame.depth.clone(), &shared_types, &emit_info); +v2_rt::concat(v2_rt::concat("break ".to_string(), call_str), ";".to_string()) +}, + _ => emit_error_expr("emit_rust_tco_non_self_call expected ExprCall".to_string(), RenderTarget::Rust), +} } -pub fn emit_rust_tco_if( - frame: &Rc, - fn_name: &String, - params: &Rc>>, - registry: &Rc>>, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { +pub fn emit_rust_tco_if(frame: &Rc, fn_name: &String, params: &Rc>>, registry: &Rc>>, shared_types: &Rc>, emit_info: &Rc) -> String { match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprIf => { - let c = if_condition(frame.expr.clone()); - let t = if_then_branch(frame.expr.clone()); - let e = if_else_branch(frame.expr.clone()); - let cond_str = emit_typed_expr( - c, - registry.clone(), - &frame.scope.clone(), - frame.depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let then_str = emit_typed_tco_expr( - t, - &fn_name, - params.clone(), - registry.clone(), - frame.scope.clone(), - (frame.depth.clone() + 1), - shared_types.clone(), - emit_info.clone(), - ); - match e { - Some(eb) => { - let else_str = emit_typed_tco_expr( - eb.clone(), - &fn_name, - params.clone(), - registry.clone(), - frame.scope.clone(), - (frame.depth.clone() + 1), - shared_types.clone(), - emit_info.clone(), - ); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("if ".to_string(), cond_str), - " {\n".to_string(), - ), - make_indent((frame.depth.clone() + 1)), - ), - then_str, - ), - "\n} else {\n".to_string(), - ), - make_indent((frame.depth.clone() + 1)), - ), - else_str, - ), - "\n}".to_string(), - ) - } - None => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("if ".to_string(), cond_str), - " {\n".to_string(), - ), - make_indent((frame.depth.clone() + 1)), - ), - then_str, - ), - "\n}".to_string(), - ), - } - } - _ => emit_error_expr( - "emit_rust_tco_if expected ExprIf".to_string(), - RenderTarget::Rust, - ), - } + ExprData::ExprIf => { + let c = if_condition(frame.expr.clone()); +let t = if_then_branch(frame.expr.clone()); +let e = if_else_branch(frame.expr.clone()); +let cond_str = emit_typed_expr(c, registry.clone(), &frame.scope.clone(), frame.depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let then_str = emit_typed_tco_expr(t, &fn_name, params.clone(), registry.clone(), frame.scope.clone(), (frame.depth.clone() + 1), shared_types.clone(), emit_info.clone()); +match e { + Some(eb) => { + let else_str = emit_typed_tco_expr(eb.clone(), &fn_name, params.clone(), registry.clone(), frame.scope.clone(), (frame.depth.clone() + 1), shared_types.clone(), emit_info.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("if ".to_string(), cond_str), " {\n".to_string()), make_indent((frame.depth.clone() + 1))), then_str), "\n} else {\n".to_string()), make_indent((frame.depth.clone() + 1))), else_str), "\n}".to_string()) +}, + None => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("if ".to_string(), cond_str), " {\n".to_string()), make_indent((frame.depth.clone() + 1))), then_str), "\n}".to_string()), +} +}, + _ => emit_error_expr("emit_rust_tco_if expected ExprIf".to_string(), RenderTarget::Rust), +} } -pub fn emit_rust_tco_match( - frame: &Rc, - fn_name: String, - params: Rc>>, - registry: &Rc>>, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { +pub fn emit_rust_tco_match(frame: &Rc, fn_name: String, params: Rc>>, registry: &Rc>>, shared_types: &Rc>, emit_info: &Rc) -> String { match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprMatch => { - let s = match_scrutinee(frame.expr.clone()); - let arm_list = match_arm_nodes(frame.expr.clone()); - let scrut_str = emit_typed_expr( - s.clone(), - registry.clone(), - &frame.scope.clone(), - frame.depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let tco_scrut_type = match s.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - let is_optional = (rt.return_cardinality.clone() == Cardinality::CardOptional); - if is_optional { - authored_name_at( - frame.scope.clone().type_env.clone().source_indices.clone(), - &with_required_cardinality(&rt), - ) - } else { - authored_name_at( - frame.scope.clone().type_env.clone().source_indices.clone(), - &rt, - ) - } - } - _ => "".to_string(), - }; - let rc_match = analyze_rc_match( - &s, - arm_list.clone(), - tco_scrut_type.clone(), - &shared_types, - emit_info.clone(), - &frame.scope.clone().type_env.clone().source_indices.clone(), - ); - let arm_strs = Rc::new({ - let mut __result = Vec::new(); - for arm in arm_list.clone().iter().cloned() { - __result.push(emit_typed_tco_match_arm( - &arm, - fn_name.clone(), - params.clone(), - ®istry, - &frame.scope.clone(), - frame.depth.clone(), - &shared_types, - &emit_info, - &tco_scrut_type, - )); - } - __result - }); - let arms_str = arm_strs.join(&"\n".to_string()); - let tco_needs_as_str = - (all_arms_are_string_lit(&arm_list) && ((arm_list.clone().len() as i64) > 0)); - if rc_match.needs_option_deref.clone() { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("match ".to_string(), scrut_str), - ".as_deref()".to_string(), - ), - clone_iterator_suffix(), - ), - " {\n".to_string(), - ), - arms_str, - ), - "\n}".to_string(), - ) + ExprData::ExprMatch => { + let s = match_scrutinee(frame.expr.clone()); +let arm_list = match_arm_nodes(frame.expr.clone()); +let scrut_str = emit_typed_expr(s.clone(), registry.clone(), &frame.scope.clone(), frame.depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let tco_scrut_type = match s.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + let is_optional = (rt.return_cardinality.clone() == Cardinality::CardOptional); +if is_optional { + authored_name_at(frame.scope.clone().type_env.clone().source_indices.clone(), &with_required_cardinality(&rt)) } else { - if rc_match.needs_deref.clone() { - { - let sharing = language_spec(RenderTarget::Rust).sharing.clone(); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "match ".to_string(), - apply_type_template1( - sharing.deref_clone.clone(), - scrut_str, - ), - ), - " {\n".to_string(), - ), - arms_str, - ), - "\n}".to_string(), - ) - } + authored_name_at(frame.scope.clone().type_env.clone().source_indices.clone(), &rt) + } +}, + _ => "".to_string(), +}; +let rc_match = analyze_rc_match(&s, arm_list.clone(), tco_scrut_type.clone(), &shared_types, emit_info.clone(), &frame.scope.clone().type_env.clone().source_indices.clone()); +let arm_strs = Rc::new({ let mut __result = Vec::new(); for arm in arm_list.clone().iter().cloned() { __result.push(emit_typed_tco_match_arm(&arm, fn_name.clone(), params.clone(), ®istry, &frame.scope.clone(), frame.depth.clone(), &shared_types, &emit_info, &tco_scrut_type)); } __result }); +let arms_str = arm_strs.join(&"\n".to_string()); +let tco_needs_as_str = (all_arms_are_string_lit(&arm_list) && ((arm_list.clone().len() as i64) > 0)); +if rc_match.needs_option_deref.clone() { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("match ".to_string(), scrut_str), ".as_deref()".to_string()), clone_iterator_suffix()), " {\n".to_string()), arms_str), "\n}".to_string()) + } else { + if rc_match.needs_deref.clone() { + { + let sharing = language_spec(RenderTarget::Rust).sharing.clone(); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("match ".to_string(), apply_type_template1(sharing.deref_clone.clone(), scrut_str)), " {\n".to_string()), arms_str), "\n}".to_string()) +} + } else { + if tco_needs_as_str { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("match ".to_string(), scrut_str), ".as_str() {\n".to_string()), arms_str), "\n}".to_string()) } else { - if tco_needs_as_str { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("match ".to_string(), scrut_str), - ".as_str() {\n".to_string(), - ), - arms_str, - ), - "\n}".to_string(), - ) - } else { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("match ".to_string(), scrut_str), - " {\n".to_string(), - ), - arms_str, - ), - "\n}".to_string(), - ) - } + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("match ".to_string(), scrut_str), " {\n".to_string()), arms_str), "\n}".to_string()) } } } - _ => emit_error_expr( - "emit_rust_tco_match expected ExprMatch".to_string(), - RenderTarget::Rust, - ), - } +}, + _ => emit_error_expr("emit_rust_tco_match expected ExprMatch".to_string(), RenderTarget::Rust), +} } -pub fn emit_rust_tco_let( - frame: &Rc, - fn_name: String, - params: &Rc>>, - registry: &Rc>>, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { +pub fn emit_rust_tco_let(frame: &Rc, fn_name: String, params: &Rc>>, registry: &Rc>>, shared_types: &Rc>, emit_info: &Rc) -> String { match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprLet => { - let n = let_binding_name_at( - frame.expr.clone(), - frame.scope.clone().type_env.clone().source_indices.clone(), - ); - let v = let_value(frame.expr.clone()); - let bd = let_body(frame.expr.clone()); - let val_str = emit_typed_expr( - v.clone(), - registry.clone(), - &frame.scope.clone(), - frame.depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let is_param = { - let mut __found = false; - for p in params.clone().iter().cloned() { - if (param_node_name_at( - p.clone(), - frame.scope.clone().type_env.clone().source_indices.clone(), - ) - .as_str() - == n.clone().as_str()) - { - __found = true; - break; - } - } - __found - }; - let let_line = if is_param { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(emit_ident(n.clone(), RenderTarget::Rust), " = ".to_string()), - val_str, - ), - ";".to_string(), - ) - } else { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "let ".to_string(), - emit_ident(n.clone(), RenderTarget::Rust), - ), - " = ".to_string(), - ), - val_str, - ), - ";".to_string(), - ) - }; - let next_scope = extend_scope( - &frame.scope.clone(), - &n, - resolved_type(v.clone()), - Rc::new(SubValueRelation::SubValueUnknown), - ); - match bd { - Some(b) => v2_rt::concat( - v2_rt::concat(let_line, "\n".to_string()), - emit_typed_tco_expr( - b.clone(), - &fn_name, - params.clone(), - registry.clone(), - next_scope, - frame.depth.clone(), - shared_types.clone(), - emit_info.clone(), - ), - ), - None => let_line, - } - } - _ => emit_error_expr( - "emit_rust_tco_let expected ExprLet".to_string(), - RenderTarget::Rust, - ), - } + ExprData::ExprLet => { + let n = let_binding_name_at(frame.expr.clone(), frame.scope.clone().type_env.clone().source_indices.clone()); +let v = let_value(frame.expr.clone()); +let bd = let_body(frame.expr.clone()); +let val_str = emit_typed_expr(v.clone(), registry.clone(), &frame.scope.clone(), frame.depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let is_param = { let mut __found = false; for p in params.clone().iter().cloned() { if (param_node_name_at(p.clone(), frame.scope.clone().type_env.clone().source_indices.clone()).as_str() == n.clone().as_str()) { __found = true; break; } } __found }; +let let_line = if is_param { + v2_rt::concat(v2_rt::concat(v2_rt::concat(emit_ident(n.clone(), RenderTarget::Rust), " = ".to_string()), val_str), ";".to_string()) + } else { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let ".to_string(), emit_ident(n.clone(), RenderTarget::Rust)), " = ".to_string()), val_str), ";".to_string()) + }; +let next_scope = extend_scope(&frame.scope.clone(), &n, resolved_type(v.clone()), Rc::new(SubValueRelation::SubValueUnknown)); +match bd { + Some(b) => v2_rt::concat(v2_rt::concat(let_line, "\n".to_string()), emit_typed_tco_expr(b.clone(), &fn_name, params.clone(), registry.clone(), next_scope, frame.depth.clone(), shared_types.clone(), emit_info.clone())), + None => let_line, +} +}, + _ => emit_error_expr("emit_rust_tco_let expected ExprLet".to_string(), RenderTarget::Rust), +} } -pub fn emit_rust_tco_block( - frame: &Rc, - fn_name: String, - params: &Rc>>, - registry: &Rc>>, - shared_types: &Rc>, - emit_info: &Rc, -) -> String { +pub fn emit_rust_tco_block(frame: &Rc, fn_name: String, params: &Rc>>, registry: &Rc>>, shared_types: &Rc>, emit_info: &Rc) -> String { match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprBlock => { - let ss = frame.expr.clone().children.clone(); - if ((ss.clone().len() as i64) == 0) { - "break;".to_string() - } else { - { - let init_state = emit_tco_init_block_stmts( - ss.clone(), - Rc::new(vec![]), - frame.scope.clone(), - registry.clone(), - frame.depth.clone(), - shared_types.clone(), - emit_info.clone(), - params.clone(), - ); - let last_str = match ss.clone().last().cloned() { - Some(last_expr) => emit_typed_tco_expr( - last_expr.clone(), - &fn_name, - params.clone(), - registry.clone(), - init_state.scope.clone(), - frame.depth.clone(), - shared_types.clone(), - emit_info.clone(), - ), - None => "break;".to_string(), - }; - if ((init_state.text.clone().len() as i64) == 0) { - last_str - } else { - v2_rt::concat( - v2_rt::concat( - init_state.text.clone().join(&"\n".to_string()), - "\n".to_string(), - ), - last_str, - ) - } + ExprData::ExprBlock => { + let ss = frame.expr.clone().children.clone(); +if ((ss.clone().len() as i64) == 0) { + "break;".to_string() + } else { + { + let init_state = emit_tco_init_block_stmts(ss.clone(), Rc::new(vec![]), frame.scope.clone(), registry.clone(), frame.depth.clone(), shared_types.clone(), emit_info.clone(), params.clone()); +let last_str = match ss.clone().last().cloned() { + Some(last_expr) => emit_typed_tco_expr(last_expr.clone(), &fn_name, params.clone(), registry.clone(), init_state.scope.clone(), frame.depth.clone(), shared_types.clone(), emit_info.clone()), + None => "break;".to_string(), +}; +if ((init_state.text.clone().len() as i64) == 0) { + last_str + } else { + v2_rt::concat(v2_rt::concat(init_state.text.clone().join(&"\n".to_string()), "\n".to_string()), last_str) } - } +} } - _ => emit_error_expr( - "emit_rust_tco_block expected ExprBlock".to_string(), - RenderTarget::Rust, - ), - } +}, + _ => emit_error_expr("emit_rust_tco_block expected ExprBlock".to_string(), RenderTarget::Rust), +} } -pub fn emit_rust_tco_default_return( - frame: &Rc, - registry: Rc>>, - shared_types: Rc>, - emit_info: Rc, -) -> String { - { - let val_str = emit_typed_expr( - frame.expr.clone(), - registry, - &frame.scope.clone(), - frame.depth.clone(), - shared_types, - emit_info, - 1024, - ); - v2_rt::concat( - v2_rt::concat("break ".to_string(), val_str), - ";".to_string(), - ) - } +pub fn emit_rust_tco_default_return(frame: &Rc, registry: Rc>>, shared_types: Rc>, emit_info: Rc) -> String { + { + let val_str = emit_typed_expr(frame.expr.clone(), registry, &frame.scope.clone(), frame.depth.clone(), shared_types, emit_info, 1024); +v2_rt::concat(v2_rt::concat("break ".to_string(), val_str), ";".to_string()) +} } -pub fn emit_typed_tco_expr( - texpr: Rc, - fn_name: &String, - params: Rc>>, - registry: Rc>>, - scope: Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, -) -> String { - emit_shared_tco_expr( - Rc::new(TcoFrame { - expr: texpr, - scope: scope, - depth: depth, - }), - fn_name.clone(), - |input| { - emit_typed_tco_reassign( - input.args.clone(), - ¶ms, - registry.clone(), - &input.scope.clone(), - input.depth.clone(), - shared_types.clone(), - &emit_info, - ) - }, - |frame| { - emit_rust_tco_non_self_call( - &frame, - registry.clone(), - shared_types.clone(), - emit_info.clone(), - ) - }, - |frame| { - emit_rust_tco_if( - &frame, - &fn_name, - ¶ms, - ®istry, - &shared_types, - &emit_info, - ) - }, - |frame| { - emit_rust_tco_match( - &frame, - fn_name.clone(), - params.clone(), - ®istry, - &shared_types, - &emit_info, - ) - }, - |frame| { - emit_rust_tco_let( - &frame, - fn_name.clone(), - ¶ms, - ®istry, - &shared_types, - &emit_info, - ) - }, - |frame| { - emit_rust_tco_block( - &frame, - fn_name.clone(), - ¶ms, - ®istry, - &shared_types, - &emit_info, - ) - }, - |frame| { - emit_rust_tco_default_return( - &frame, - registry.clone(), - shared_types.clone(), - emit_info.clone(), - ) - }, - ) +pub fn emit_typed_tco_expr(texpr: Rc, fn_name: &String, params: Rc>>, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { + emit_shared_tco_expr(Rc::new(TcoFrame { + expr: texpr, + scope: scope, + depth: depth, +}), fn_name.clone(), |input| emit_typed_tco_reassign(input.args.clone(), ¶ms, registry.clone(), &input.scope.clone(), input.depth.clone(), shared_types.clone(), &emit_info), |frame| emit_rust_tco_non_self_call(&frame, registry.clone(), shared_types.clone(), emit_info.clone()), |frame| emit_rust_tco_if(&frame, &fn_name, ¶ms, ®istry, &shared_types, &emit_info), |frame| emit_rust_tco_match(&frame, fn_name.clone(), params.clone(), ®istry, &shared_types, &emit_info), |frame| emit_rust_tco_let(&frame, fn_name.clone(), ¶ms, ®istry, &shared_types, &emit_info), |frame| emit_rust_tco_block(&frame, fn_name.clone(), ¶ms, ®istry, &shared_types, &emit_info), |frame| emit_rust_tco_default_return(&frame, registry.clone(), shared_types.clone(), emit_info.clone())) } -pub fn emit_typed_tco_match_arm( - arm: &Rc, - fn_name: String, - params: Rc>>, - registry: &Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: &Rc, - scrut_type: &String, -) -> String { +pub fn emit_typed_tco_match_arm(arm: &Rc, fn_name: String, params: Rc>>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc, scrut_type: &String) -> String { { let arm_pat = arm_pattern(arm.clone()); - let arm_g = arm_guard(&arm); - let arm_b = arm_body(&arm); - let si = scope.type_env.clone().source_indices.clone(); - let rc_analysis = analyze_rc_pattern( - arm_pat.clone(), - scrut_type.clone(), - &shared_types, - &emit_info, - si.clone(), - ); - let pat_str = if rc_analysis.needs_rc_pattern.clone() { - emit_pattern_rc_aware( - arm_pat.clone(), - rc_analysis.clone(), - shared_types.clone(), - scrut_type.clone(), - si.clone(), - emit_info.clone(), - ) - } else { - emit_pattern( - arm_pat.clone(), - shared_types.clone(), - scrut_type.clone(), - si.clone(), - emit_info.clone(), - ) +let arm_g = arm_guard(&arm); +let arm_b = arm_body(&arm); +let si = scope.type_env.clone().source_indices.clone(); +let rc_analysis = analyze_rc_pattern(arm_pat.clone(), scrut_type.clone(), &shared_types, &emit_info, si.clone()); +let pat_str = if rc_analysis.needs_rc_pattern.clone() { + emit_pattern_rc_aware(arm_pat.clone(), rc_analysis.clone(), shared_types.clone(), scrut_type.clone(), si.clone(), emit_info.clone()) + } else { + emit_pattern(arm_pat.clone(), shared_types.clone(), scrut_type.clone(), si.clone(), emit_info.clone()) }; - let field_guards = collect_pattern_string_guards(arm_pat.clone(), si.clone()); - let arm_guard_str = match arm_g { - Some(g) => emit_typed_expr( - g.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ), - None => "".to_string(), - }; - let guard_str = if ((field_guards.clone().as_str() != "".to_string().as_str()) - && (arm_guard_str.clone().as_str() != "".to_string().as_str())) - { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(" if ".to_string(), field_guards.clone()), - " && ".to_string(), - ), - arm_guard_str.clone(), - ) +let field_guards = collect_pattern_string_guards(arm_pat.clone(), si.clone()); +let arm_guard_str = match arm_g { + Some(g) => emit_typed_expr(g.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024), + None => "".to_string(), +}; +let guard_str = if ((field_guards.clone().as_str() != "".to_string().as_str()) && (arm_guard_str.clone().as_str() != "".to_string().as_str())) { + v2_rt::concat(v2_rt::concat(v2_rt::concat(" if ".to_string(), field_guards.clone()), " && ".to_string()), arm_guard_str.clone()) } else { if (field_guards.clone().as_str() != "".to_string().as_str()) { v2_rt::concat(" if ".to_string(), field_guards.clone()) @@ -11800,529 +4964,199 @@ pub fn emit_typed_tco_match_arm( } } }; - let body_str = emit_typed_tco_expr( - arm_b, - &fn_name, - params, - registry.clone(), - scope.clone(), - depth.clone(), - shared_types.clone(), - emit_info.clone(), - ); - if rc_analysis.needs_rc_pattern.clone() { +let body_str = emit_typed_tco_expr(arm_b, &fn_name, params, registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()); +if rc_analysis.needs_rc_pattern.clone() { { - let prelude = rc_pattern_preludes( - arm_pat.clone(), - rc_analysis.clone(), - shared_types.clone(), - si.clone(), - emit_info.clone(), - ); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(" ".to_string(), pat_str), - guard_str, - ), - " => { ".to_string(), - ), - prelude, - ), - " ".to_string(), - ), - body_str, - ), - " },".to_string(), - ) - } + let prelude = rc_pattern_preludes(arm_pat.clone(), rc_analysis.clone(), shared_types.clone(), si.clone(), emit_info.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), pat_str), guard_str), " => { ".to_string()), prelude), " ".to_string()), body_str), " },".to_string()) +} } else { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(v2_rt::concat(" ".to_string(), pat_str), guard_str), - " => { ".to_string(), - ), - body_str, - ), - " },".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), pat_str), guard_str), " => { ".to_string()), body_str), " },".to_string()) } - } +} } -pub fn expr_references_var( - node: &Rc, - var_name: String, - source_indices: Rc>>, -) -> bool { +pub fn expr_references_var(node: &Rc, var_name: String, source_indices: Rc>>) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*node.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - (expr_var_name_at(node.clone(), source_indices.clone()).as_str() - == var_name.clone().as_str()) - } - _ => { - let mut __found = false; - for c in node.children.clone().iter().cloned() { - if expr_references_var(&c, var_name.clone(), source_indices.clone()) { - __found = true; - break; - } - } - __found - } - } + ExprData::ExprVar { .. } => (expr_var_name_at(node.clone(), source_indices.clone()).as_str() == var_name.clone().as_str()), + _ => { let mut __found = false; for c in node.children.clone().iter().cloned() { if expr_references_var(&c, var_name.clone(), source_indices.clone()) { __found = true; break; } } __found }, +} }) } -pub fn emit_typed_tco_reassign( - args: Rc>>, - params: &Rc>>, - registry: Rc>>, - scope: &Rc, - depth: i64, - shared_types: Rc>, - emit_info: &Rc, -) -> String { +pub fn emit_typed_tco_reassign(args: Rc>>, params: &Rc>>, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: &Rc) -> String { { let si = scope.type_env.clone().source_indices.clone(); - let arg_values = Rc::new({ - let mut __result = Vec::new(); - for a in args.iter().cloned() { - __result.push(arg_value(&a)); - } - __result - }); - let identity_params = Rc::new( - params - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::(), - |m: Rc>, pair: (i64, Rc)| { - let pname = param_node_name_at(pair.1.clone(), si.clone()); - let av = match arg_values.clone().get(pair.0.clone() as usize).cloned() { - Some(v) => v.clone(), - None => pair.1.clone(), - }; - if is_tco_identity_passthrough(&av, pname.clone(), si.clone()) { - v2_rt::rc_map_insert(m.clone(), pname.clone(), true) - } else { - m.clone() - } - }, - ); - let filtered_arg_values = Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - params - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - if match v2_rt::map_get( - &identity_params, - param_node_name_at(pair.1.clone(), si.clone()), - ) { - Some(_) => false, - None => true, - } { - __result.push(pair); - } - } - __result - }) - .iter() - .cloned() - { - __result.push( - match arg_values.clone().get(pair.0.clone() as usize).cloned() { - Some(v) => v.clone(), - None => pair.1.clone(), - }, - ); - } - __result - }); - let filtered_params = Rc::new({ - let mut __result = Vec::new(); - for p in params.clone().iter().cloned() { - if match v2_rt::map_get(&identity_params, param_node_name_at(p.clone(), si.clone())) - { - Some(_) => false, - None => true, - } { - __result.push(p); - } - } - __result - }); - let tco_movable = - filtered_params.clone().iter().cloned().fold( - emit_info.movable.clone(), - |m: Rc>, p: Rc| { - let pname = param_node_name_at(p.clone(), si.clone()); - let ref_count = filtered_arg_values.clone().iter().cloned().fold( - 0, - |n: i64, av: Rc| { - if expr_references_var(&av, pname.clone(), si.clone()) { - (n.clone() + 1) - } else { - n.clone() - } - }, - ); - if (ref_count.clone() <= 1) { - v2_rt::rc_map_insert(m.clone(), pname.clone(), true) - } else { - m.clone() - } - }, - ); - let tco_emit_info = Rc::new(EmitGraphInfo { - movable: tco_movable, - ..(*emit_info.clone()).clone() - }); - let ordered_args = Rc::new({ - let mut __result = Vec::new(); - for av in filtered_arg_values.clone().iter().cloned() { - __result.push(emit_typed_expr( - av.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - tco_emit_info.clone(), - 1024, - )); +let arg_values = Rc::new({ let mut __result = Vec::new(); for a in args.iter().cloned() { __result.push(arg_value(&a)); } __result }); +let identity_params = Rc::new(params.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(v2_rt::rc_empty_map::(), |m: Rc>, pair: (i64, Rc)| { + let pname = param_node_name_at(pair.1.clone(), si.clone()); +let av = match arg_values.clone().get(pair.0.clone() as usize).cloned() { + Some(v) => v.clone(), + None => pair.1.clone(), +}; +if is_tco_identity_passthrough(&av, pname.clone(), si.clone()) { + v2_rt::rc_map_insert(m.clone(), pname.clone(), true) + } else { + m.clone() } - __result - }); - let param_names = Rc::new({ - let mut __result = Vec::new(); - for p in filtered_params.clone().iter().cloned() { - __result.push(emit_ident( - param_node_name_at(p.clone(), si.clone()), - RenderTarget::Rust, - )); +}); +let filtered_arg_values = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(params.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if match v2_rt::map_get(&identity_params, param_node_name_at(pair.1.clone(), si.clone())) { + Some(_) => false, + None => true, +} { __result.push(pair); } } __result }).iter().cloned() { __result.push(match arg_values.clone().get(pair.0.clone() as usize).cloned() { + Some(v) => v.clone(), + None => pair.1.clone(), +}); } __result }); +let filtered_params = Rc::new({ let mut __result = Vec::new(); for p in params.clone().iter().cloned() { if match v2_rt::map_get(&identity_params, param_node_name_at(p.clone(), si.clone())) { + Some(_) => false, + None => true, +} { __result.push(p); } } __result }); +let tco_movable = filtered_params.clone().iter().cloned().fold(emit_info.movable.clone(), |m: Rc>, p: Rc| { + let pname = param_node_name_at(p.clone(), si.clone()); +let ref_count = filtered_arg_values.clone().iter().cloned().fold(0, |n: i64, av: Rc| if expr_references_var(&av, pname.clone(), si.clone()) { + (n.clone() + 1) + } else { + n.clone() + }); +if (ref_count.clone() <= 1) { + set_insert(m.clone(), pname.clone()) + } else { + m.clone() } - __result - }); - let all_lines = tco_reassign_core( - ordered_args, - param_names, - "__tco_".to_string(), - "let ".to_string(), - " = ".to_string(), - ";".to_string(), - "continue;".to_string(), - &"".to_string(), - ); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("{\n".to_string(), make_indent((depth.clone() + 1))), - all_lines.join(&"\n".to_string()), - ), - "\n}".to_string(), - ) - } +}); +let tco_emit_info = Rc::new(EmitGraphInfo { movable: tco_movable, ..(*emit_info.clone()).clone() }); +let ordered_args = Rc::new({ let mut __result = Vec::new(); for av in filtered_arg_values.clone().iter().cloned() { __result.push(emit_typed_expr(av.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), tco_emit_info.clone(), 1024)); } __result }); +let param_names = Rc::new({ let mut __result = Vec::new(); for p in filtered_params.clone().iter().cloned() { __result.push(emit_ident(param_node_name_at(p.clone(), si.clone()), RenderTarget::Rust)); } __result }); +let all_lines = tco_reassign_core(ordered_args, param_names, "__tco_".to_string(), "let ".to_string(), " = ".to_string(), ";".to_string(), "continue;".to_string(), &"".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat("{\n".to_string(), make_indent((depth.clone() + 1))), all_lines.join(&"\n".to_string())), "\n}".to_string()) +} } -pub fn emit_service_def( - item: &Rc, - registry: Rc>>, - shared_types: Rc>, - env: &Rc, -) -> String { +pub fn emit_service_def(item: &Rc, registry: Rc>>, shared_types: Rc>, env: &Rc) -> String { { let safe_name = sanitize_service_name(authored_name(env.clone(), item.clone())); - let fallback_transport = service_fallback_transport(&item); - let op_children = item.children.clone(); - let struct_def = emit_service_struct( - safe_name.clone(), - fallback_transport.clone(), - op_children.clone(), - item.clone(), - env.source_indices.clone(), - ); - let impl_block = emit_service_impl( - &safe_name, - &fallback_transport, - &op_children, - registry, - shared_types, - &env, - &item, - ); - v2_rt::concat(v2_rt::concat(struct_def, "\n\n".to_string()), impl_block) - } +let fallback_transport = service_fallback_transport(&item); +let op_children = item.children.clone(); +let struct_def = emit_service_struct(safe_name.clone(), fallback_transport.clone(), op_children.clone(), item.clone(), env.source_indices.clone()); +let impl_block = emit_service_impl(&safe_name, &fallback_transport, &op_children, registry, shared_types, &env, &item); +v2_rt::concat(v2_rt::concat(struct_def, "\n\n".to_string()), impl_block) +} } -pub fn emit_service_struct( - name: String, - fallback_transport: Rc, - op_children: Rc>>, - service_item: Rc, - source_indices: Rc>>, -) -> String { +pub fn emit_service_struct(name: String, fallback_transport: Rc, op_children: Rc>>, service_item: Rc, source_indices: Rc>>) -> String { { let derives = "#[derive(Debug, Clone)]".to_string(); - let config_fields = emit_service_config_fields( - fallback_transport, - op_children, - service_item, - &source_indices, - ); - let dry_run_field = "\n pub dry_run: crate::dry_run::DryRunMode,".to_string(); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(v2_rt::concat(derives, "\npub struct ".to_string()), name), - " {\n".to_string(), - ), - config_fields, - ), - dry_run_field, - ), - "\n}".to_string(), - ) - } +let config_fields = emit_service_config_fields(fallback_transport, op_children, service_item, &source_indices); +let dry_run_field = "\n pub dry_run: crate::dry_run::DryRunMode,".to_string(); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(derives, "\npub struct ".to_string()), name), " {\n".to_string()), config_fields), dry_run_field), "\n}".to_string()) +} } -pub fn emit_service_config_fields( - fallback_transport: Rc, - op_children: Rc>>, - service_item: Rc, - source_indices: &Rc>>, -) -> String { +pub fn emit_service_config_fields(fallback_transport: Rc, op_children: Rc>>, service_item: Rc, source_indices: &Rc>>) -> String { { let fs = compute_service_fields(&fallback_transport, &op_children, &source_indices); - let has_svc_auth = match service_config_auth_source(service_item, source_indices.clone()) { - Some(_) => true, - None => false, - }; - let fs = if has_svc_auth { +let has_svc_auth = match service_config_auth_source(service_item, source_indices.clone()) { + Some(_) => true, + None => false, +}; +let fs = if has_svc_auth { ServiceFieldSet { - has_rest: fs.has_rest.clone(), - has_shell: fs.has_shell.clone(), - has_file: fs.has_file.clone(), - has_auth: true, - } + has_rest: fs.has_rest.clone(), + has_shell: fs.has_shell.clone(), + has_file: fs.has_file.clone(), + has_auth: true, +} } else { fs.clone() }; - let decls = service_field_decls( - &fs, - &language_spec(RenderTarget::Rust).service_fields.clone(), - ); - if ((decls.clone().len() as i64) == 0) { +let decls = service_field_decls(&fs, &language_spec(RenderTarget::Rust).service_fields.clone()); +if ((decls.clone().len() as i64) == 0) { " // No configuration needed for local binding.\n".to_string() } else { decls.clone().join(&"".to_string()) } - } +} } -pub fn emit_service_impl( - name: &String, - transport: &Rc, - op_children: &Rc>>, - registry: Rc>>, - shared_types: Rc>, - env: &Rc, - service_item: &Rc, -) -> String { +pub fn emit_service_impl(name: &String, transport: &Rc, op_children: &Rc>>, registry: Rc>>, shared_types: Rc>, env: &Rc, service_item: &Rc) -> String { { let depth = 0; - let new_method = emit_service_new_method( - name.clone(), - &transport, - op_children.clone(), - &service_item, - &env.source_indices.clone(), - ); - let method_strs = Rc::new({ - let mut __result = Vec::new(); - for op_node in op_children.clone().iter().cloned() { - __result.push(emit_operation_method( - name.clone(), - transport.clone(), - &op_node, - ®istry, - (depth.clone() + 1), - &shared_types, - &env, - service_item.clone(), - )); - } - __result - }); - let all_methods = v2_rt::concat(Rc::new(vec![new_method]), method_strs); - let methods_str = all_methods.join(&"\n\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("impl ".to_string(), name.clone()), - " {\n".to_string(), - ), - make_indent((depth.clone() + 1)), - ), - methods_str, - ), - "\n}".to_string(), - ) - } +let new_method = emit_service_new_method(name.clone(), &transport, op_children.clone(), &service_item, &env.source_indices.clone()); +let method_strs = Rc::new({ let mut __result = Vec::new(); for op_node in op_children.clone().iter().cloned() { __result.push(emit_operation_method(name.clone(), transport.clone(), &op_node, ®istry, (depth.clone() + 1), &shared_types, &env, service_item.clone())); } __result }); +let all_methods = v2_rt::concat(Rc::new(vec![new_method]), method_strs); +let methods_str = all_methods.join(&"\n\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("impl ".to_string(), name.clone()), " {\n".to_string()), make_indent((depth.clone() + 1))), methods_str), "\n}".to_string()) +} } -pub fn emit_service_new_method( - name: String, - fallback_transport: &Rc, - op_children: Rc>>, - service_item: &Rc, - source_indices: &Rc>>, -) -> String { +pub fn emit_service_new_method(name: String, fallback_transport: &Rc, op_children: Rc>>, service_item: &Rc, source_indices: &Rc>>) -> String { { let fs = compute_service_fields(&fallback_transport, &op_children, &source_indices); - let has_svc_auth = - match service_config_auth_source(service_item.clone(), source_indices.clone()) { - Some(_) => true, - None => false, - }; - let fs = if has_svc_auth { +let has_svc_auth = match service_config_auth_source(service_item.clone(), source_indices.clone()) { + Some(_) => true, + None => false, +}; +let fs = if has_svc_auth { ServiceFieldSet { - has_rest: fs.has_rest.clone(), - has_shell: fs.has_shell.clone(), - has_file: fs.has_file.clone(), - has_auth: true, - } + has_rest: fs.has_rest.clone(), + has_shell: fs.has_shell.clone(), + has_file: fs.has_file.clone(), + has_auth: true, +} } else { fs.clone() }; - let from_config = - match service_config_endpoint(service_item.clone(), source_indices.clone()) { - Some(ep) => match (*ep.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { - unreachable!() - }; - s.clone() - } - _ => "".to_string(), - }, - None => "".to_string(), - }; - let base_url_default = if (from_config.clone().as_str() != "".to_string().as_str()) { +let from_config = match service_config_endpoint(service_item.clone(), source_indices.clone()) { + Some(ep) => match (*ep.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { unreachable!() }; s.clone() }, + _ => "".to_string(), +}, + None => "".to_string(), +}; +let base_url_default = if (from_config.clone().as_str() != "".to_string().as_str()) { from_config.clone() } else { if fs.has_rest.clone() { { - let fallback_is_rest = - is_rest_transport(fallback_transport.clone(), source_indices.clone()); - let from_fallback = if fallback_is_rest { - match transport_base_url(fallback_transport.clone(), source_indices.clone()) - { - Some(bu) => match (*bu.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitStr { value: s, .. } = value.as_ref() - else { - unreachable!() - }; - s.clone() - } - _ => "".to_string(), - }, - None => "".to_string(), - } + let fallback_is_rest = is_rest_transport(fallback_transport.clone(), source_indices.clone()); +let from_fallback = if fallback_is_rest { + match transport_base_url(fallback_transport.clone(), source_indices.clone()) { + Some(bu) => match (*bu.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { unreachable!() }; s.clone() }, + _ => "".to_string(), +}, + None => "".to_string(), +} } else { "".to_string() }; - if (from_fallback.clone().as_str() != "".to_string().as_str()) { +if (from_fallback.clone().as_str() != "".to_string().as_str()) { from_fallback.clone() } else { "http://localhost".to_string() } - } +} } else { "".to_string() } }; - let ctors = service_field_ctors( - &fs, - &language_spec(RenderTarget::Rust).service_fields.clone(), - ); - let ctors = Rc::new({ - let mut __result = Vec::new(); - for c in ctors.clone().iter().cloned() { - __result.push(apply_type_template1(c.clone(), base_url_default.clone())); - } - __result - }); - let ctors = match service_config_auth_source(service_item.clone(), source_indices.clone()) { - Some(src) => Rc::new({ - let mut __result = Vec::new(); - for c in ctors.clone().iter().cloned() { - __result.push(if v2_rt::contains(c.clone(), "auth_token".to_string()) { - emit_auth_source_ctor(&src, source_indices.clone()) - } else { - c.clone() - }); - } - __result - }), - None => ctors.clone(), - }; - let inits = ctors.clone().join(&"".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "pub fn new(dry_run: crate::dry_run::DryRunMode) -> Self {\n" - .to_string(), - " ".to_string(), - ), - name, - ), - " {\n".to_string(), - ), - inits, - ), - " dry_run,\n".to_string(), - ), - " }\n".to_string(), - ), - "}".to_string(), - ) - } +let ctors = service_field_ctors(&fs, &language_spec(RenderTarget::Rust).service_fields.clone()); +let ctors = Rc::new({ let mut __result = Vec::new(); for c in ctors.clone().iter().cloned() { __result.push(apply_type_template1(c.clone(), base_url_default.clone())); } __result }); +let ctors = match service_config_auth_source(service_item.clone(), source_indices.clone()) { + Some(src) => Rc::new({ let mut __result = Vec::new(); for c in ctors.clone().iter().cloned() { __result.push(if v2_rt::contains(c.clone(), "auth_token".to_string()) { + emit_auth_source_ctor(&src, source_indices.clone()) + } else { + c.clone() + }); } __result }), + None => ctors.clone(), +}; +let inits = ctors.clone().join(&"".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("pub fn new(dry_run: crate::dry_run::DryRunMode) -> Self {\n".to_string(), " ".to_string()), name), " {\n".to_string()), inits), " dry_run,\n".to_string()), " }\n".to_string()), "}".to_string()) +} } -pub fn emit_auth_source_ctor( - source_expr: &Rc, - source_indices: Rc>>, -) -> String { +pub fn emit_auth_source_ctor(source_expr: &Rc, source_indices: Rc>>) -> String { match (*source_expr.expr_data.clone()).clone() { ExprData::ExprRecordLit { .. } => match record_lit_type_name_at(source_expr.clone(), source_indices) { Some(variant) => if (variant.clone().as_str() == "EnvVar".to_string().as_str()) { @@ -12342,195 +5176,47 @@ pub fn emit_auth_source_ctor( } } -pub fn emit_modifier_doc_from_props( - properties: Rc>>, - source_indices: Rc>>, -) -> String { +pub fn emit_modifier_doc_from_props(properties: Rc>>, source_indices: Rc>>) -> String { { let names = extract_modifier_names(properties, source_indices); - if ((names.clone().len() as i64) == 0) { +if ((names.clone().len() as i64) == 0) { "".to_string() } else { - v2_rt::concat( - v2_rt::concat( - "/// Modifiers: ".to_string(), - names.clone().join(&", ".to_string()), - ), - "\n".to_string(), - ) + v2_rt::concat(v2_rt::concat("/// Modifiers: ".to_string(), names.clone().join(&", ".to_string())), "\n".to_string()) } - } +} } -pub fn emit_operation_method( - service_name: String, - transport: Rc, - op_node: &Rc, - registry: &Rc>>, - depth: i64, - shared_types: &Rc>, - env: &Rc, - service_item: Rc, -) -> String { +pub fn emit_operation_method(service_name: String, transport: Rc, op_node: &Rc, registry: &Rc>>, depth: i64, shared_types: &Rc>, env: &Rc, service_item: Rc) -> String { { let op_text = authored_name(env.clone(), op_node.clone()); - let input_params = Rc::new({ - let mut __result = Vec::new(); - for p in op_node.params.clone().iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - emit_ident( - param_node_name_at(p.clone(), env.source_indices.clone()), - RenderTarget::Rust, - ), - rust_items().param_type_sep.clone(), - ), - emit_rust_param_type( - ¶m_node_type_expr(&p), - &shared_types, - &env.source_indices.clone(), - ), - )); - } - __result - }); - let params_str = input_params.join(&", ".to_string()); - let all_params = if (params_str.clone().as_str() == "".to_string().as_str()) { +let input_params = Rc::new({ let mut __result = Vec::new(); for p in op_node.params.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(emit_ident(param_node_name_at(p.clone(), env.source_indices.clone()), RenderTarget::Rust), rust_items().param_type_sep.clone()), emit_rust_param_type(¶m_node_type_expr(&p), &shared_types, &env.source_indices.clone()))); } __result }); +let params_str = input_params.join(&", ".to_string()); +let all_params = if (params_str.clone().as_str() == "".to_string().as_str()) { "&self".to_string() } else { v2_rt::concat("&self, ".to_string(), params_str.clone()) }; - let ret_type = render_rust_type( - resolved_type(op_node.clone()), - shared_types.clone(), - env.source_indices.clone(), - ); - let eff_transport = effective_operation_transport(op_node.clone(), transport); - let op_inferred = resolved_type(op_node.clone()); - let real_body = emit_transport_call( - &eff_transport, - op_text.clone(), - registry.clone(), - (depth.clone() + 2), - op_inferred, - service_item, - op_node.clone(), - &env.source_indices.clone(), - shared_types.clone(), - env.clone(), - ); - let mock_props = Rc::new({ - let mut __result = Vec::new(); - for p in op_node.properties.clone().iter().cloned() { - if has_mock_prefix(&field_init_node_name_at( - p.clone(), - env.source_indices.clone(), - )) { - __result.push(p); - } - } - __result - }); - let dry_run_body = emit_dry_run_branch_from_props( - &op_text, - &resolved_type(op_node.clone()), - &mock_props, - registry.clone(), - &env.source_indices.clone(), - &op_node, - env.clone(), - shared_types.clone(), - ); - let body = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "if self.dry_run.is_dry_run() {\n".to_string(), - make_indent((depth.clone() + 2)), - ), - dry_run_body, - ), - "\n".to_string(), - ), - "} else {\n".to_string(), - ), - make_indent((depth.clone() + 2)), - ), - real_body, - ), - "\n".to_string(), - ), - "}".to_string(), - ); - let modifier_doc = - emit_modifier_doc_from_props(op_node.properties.clone(), env.source_indices.clone()); - let items = rust_items(); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - modifier_doc, - rust_visibility_prefix(), - ), - items.async_prefix.clone(), - ), - items.func_keyword.clone(), - ), - " ".to_string(), - ), - emit_ident(op_text.clone(), RenderTarget::Rust), - ), - "(".to_string(), - ), - all_params, - ), - ") -> Result<".to_string(), - ), - ret_type, - ), - ", Box> {\n".to_string(), - ), - make_indent((depth.clone() + 1)), - ), - body, - ), - "\n}".to_string(), - ) - } +let ret_type = render_rust_type(resolved_type(op_node.clone()), shared_types.clone(), env.source_indices.clone()); +let eff_transport = effective_operation_transport(op_node.clone(), transport); +let op_inferred = resolved_type(op_node.clone()); +let real_body = emit_transport_call(&eff_transport, op_text.clone(), registry.clone(), (depth.clone() + 2), op_inferred, service_item, op_node.clone(), &env.source_indices.clone(), shared_types.clone(), env.clone()); +let mock_props = Rc::new({ let mut __result = Vec::new(); for p in op_node.properties.clone().iter().cloned() { if has_mock_prefix(&field_init_node_name_at(p.clone(), env.source_indices.clone())) { __result.push(p); } } __result }); +let dry_run_body = emit_dry_run_branch_from_props(&op_text, &resolved_type(op_node.clone()), &mock_props, registry.clone(), &env.source_indices.clone(), &op_node, env.clone(), shared_types.clone()); +let body = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("if self.dry_run.is_dry_run() {\n".to_string(), make_indent((depth.clone() + 2))), dry_run_body), "\n".to_string()), "} else {\n".to_string()), make_indent((depth.clone() + 2))), real_body), "\n".to_string()), "}".to_string()); +let modifier_doc = emit_modifier_doc_from_props(op_node.properties.clone(), env.source_indices.clone()); +let items = rust_items(); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(modifier_doc, rust_visibility_prefix()), items.async_prefix.clone()), items.func_keyword.clone()), " ".to_string()), emit_ident(op_text.clone(), RenderTarget::Rust)), "(".to_string()), all_params), ") -> Result<".to_string()), ret_type), ", Box> {\n".to_string()), make_indent((depth.clone() + 1))), body), "\n}".to_string()) +} } -pub fn emit_dry_run_branch_from_props( - op_name: &String, - inferred: &Rc, - mock_props: &Rc>>, - registry: Rc>>, - source_indices: &Rc>>, - op_node: &Rc, - env: Rc, - shared_types: Rc>, -) -> String { - { - let log_line = v2_rt::concat( - v2_rt::concat("eprintln!(\"[dry-run] ".to_string(), op_name.clone()), - "\");".to_string(), - ); - if ((mock_props.clone().len() as i64) > 0) { +pub fn emit_dry_run_branch_from_props(op_name: &String, inferred: &Rc, mock_props: &Rc>>, registry: Rc>>, source_indices: &Rc>>, op_node: &Rc, env: Rc, shared_types: Rc>) -> String { + { + let log_line = v2_rt::concat(v2_rt::concat("eprintln!(\"[dry-run] ".to_string(), op_name.clone()), "\");".to_string()); +if ((mock_props.clone().len() as i64) > 0) { { let first_mock = mock_props.clone().first().cloned(); - match first_mock { +match first_mock { Some(mp) => { let mock_json = emit_data_value_json(&field_init_node_value(&mp), source_indices.clone()); let is_multi_field_conj = ((inferred.connective.clone() == Connective::Conj) && ((inferred.children.clone().len() as i64) > 1)); @@ -12598,58 +5284,19 @@ v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::con }, None => v2_rt::concat(log_line, "\ncompile_error!(\"mock property list was non-empty but first() returned None\")".to_string()), } - } +} } else { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - log_line, - "\ncompile_error!(\"no mock data available for dry-run operation: " - .to_string(), - ), - op_name.clone(), - ), - "\")".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(log_line, "\ncompile_error!(\"no mock data available for dry-run operation: ".to_string()), op_name.clone()), "\")".to_string()) } - } +} } -pub fn emit_transport_call( - transport: &Rc, - op_name: String, - registry: Rc>>, - depth: i64, - inferred: Rc, - service_item: Rc, - op_node: Rc, - source_indices: &Rc>>, - shared_types: Rc>, - env: Rc, -) -> String { +pub fn emit_transport_call(transport: &Rc, op_name: String, registry: Rc>>, depth: i64, inferred: Rc, service_item: Rc, op_node: Rc, source_indices: &Rc>>, shared_types: Rc>, env: Rc) -> String { if is_rest_transport(transport.clone(), source_indices.clone()) { - emit_rest_call( - op_name, - &transport, - registry, - depth, - service_item, - op_node, - &source_indices, - shared_types, - env, - ) + emit_rest_call(op_name, &transport, registry, depth, service_item, op_node, &source_indices, shared_types, env) } else { if is_shell_transport(transport.clone()) { - emit_shell_call( - op_name, - &transport, - registry, - depth, - inferred, - &op_node, - &source_indices, - ) + emit_shell_call(op_name, &transport, registry, depth, inferred, &op_node, &source_indices) } else { if is_file_transport(transport.clone(), source_indices.clone()) { emit_file_call(op_name, inferred) @@ -12660,250 +5307,104 @@ pub fn emit_transport_call( } } -pub fn emit_rest_call( - op_name: String, - transport: &Rc, - registry: Rc>>, - depth: i64, - service_item: Rc, - op_node: Rc, - source_indices: &Rc>>, - shared_types: Rc>, - env: Rc, -) -> String { - { - let client_init = - "let client = reqwest::Client::builder().user_agent(\"gunbc/1.0\").build()?;" - .to_string(); - let url_line = emit_rest_url_line(transport.clone(), op_name, &source_indices); - let http_method = emit_rest_http_method(transport.clone(), &source_indices); - let auth_line = - emit_rest_auth_line(&transport, &service_item, http_method, &source_indices); - let query_line = emit_rest_query_line(transport.clone(), &source_indices); - let body_line = emit_rest_body_line(transport.clone(), &source_indices); - let headers = transport_headers(transport.clone(), source_indices.clone()); - let header_lines = Rc::new({ - let mut __result = Vec::new(); - for h in headers.iter().cloned() { - __result.push({ - let hval = field_init_node_value(&h); - let val_str = emit_simple_expr(&hval, &RenderTarget::Rust, &source_indices); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "let request = request.header(\"".to_string(), - field_init_node_name_at(h.clone(), source_indices.clone()), - ), - "\", ".to_string(), - ), - val_str.clone(), - ), - ");".to_string(), - ) - }); - } - __result - }); - let send_line = "let response = request.send().await?;".to_string(); - let response_handling = emit_response_code_handling( - &op_node, - transport.clone(), - &source_indices, - shared_types, - env, - ); - let all_lines = Rc::new({ - let mut __result = Vec::new(); - for l in v2_rt::concat( - v2_rt::concat( - Rc::new(vec![client_init, url_line, auth_line]), - header_lines, - ), - Rc::new(vec![query_line, body_line, send_line, response_handling]), - ) - .iter() - .cloned() - { - if (l.clone().as_str() != "".to_string().as_str()) { - __result.push(l); - } - } - __result - }); - all_lines.join(&"\n".to_string()) - } +pub fn emit_rest_call(op_name: String, transport: &Rc, registry: Rc>>, depth: i64, service_item: Rc, op_node: Rc, source_indices: &Rc>>, shared_types: Rc>, env: Rc) -> String { + { + let client_init = "let client = reqwest::Client::builder().user_agent(\"gunbc/1.0\").build()?;".to_string(); +let url_line = emit_rest_url_line(transport.clone(), op_name, &source_indices); +let http_method = emit_rest_http_method(transport.clone(), &source_indices); +let auth_line = emit_rest_auth_line(&transport, &service_item, http_method, &source_indices); +let query_line = emit_rest_query_line(transport.clone(), &source_indices); +let body_line = emit_rest_body_line(transport.clone(), &source_indices); +let headers = transport_headers(transport.clone(), source_indices.clone()); +let header_lines = Rc::new({ let mut __result = Vec::new(); for h in headers.iter().cloned() { __result.push({ + let hval = field_init_node_value(&h); +let val_str = emit_simple_expr(&hval, &RenderTarget::Rust, &source_indices); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let request = request.header(\"".to_string(), field_init_node_name_at(h.clone(), source_indices.clone())), "\", ".to_string()), val_str.clone()), ");".to_string()) +}); } __result }); +let send_line = "let response = request.send().await?;".to_string(); +let response_handling = emit_response_code_handling(&op_node, transport.clone(), &source_indices, shared_types, env); +let all_lines = Rc::new({ let mut __result = Vec::new(); for l in v2_rt::concat(v2_rt::concat(Rc::new(vec![client_init, url_line, auth_line]), header_lines), Rc::new(vec![query_line, body_line, send_line, response_handling])).iter().cloned() { if (l.clone().as_str() != "".to_string().as_str()) { __result.push(l); } } __result }); +all_lines.join(&"\n".to_string()) +} } -pub fn emit_rest_http_method( - transport: Rc, - source_indices: &Rc>>, -) -> String { +pub fn emit_rest_http_method(transport: Rc, source_indices: &Rc>>) -> String { match transport_method(transport, source_indices.clone()) { - Some(m) => match m.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { .. }) => { - let method_name = expr_var_name_at(m.clone(), source_indices.clone()); - Rc::new({ - let mut __result = Vec::new(); - for ch in Rc::new(method_name.chars().map(|c| c as i64).collect::>()) - .iter() - .cloned() - { - __result.push(to_lower_char(ch.clone())); - } - __result - }) - .join(&"".to_string()) - } - _ => "compile_error!(\"transport method type not resolved\")".to_string(), - }, - None => "compile_error!(\"transport method not specified\")".to_string(), - } + Some(m) => match m.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { .. }) => { + let method_name = expr_var_name_at(m.clone(), source_indices.clone()); +Rc::new({ let mut __result = Vec::new(); for ch in Rc::new(method_name.chars().map(|c| c as i64).collect::>()).iter().cloned() { __result.push(to_lower_char(ch.clone())); } __result }).join(&"".to_string()) +}, + _ => "compile_error!(\"transport method type not resolved\")".to_string(), +}, + None => "compile_error!(\"transport method not specified\")".to_string(), +} } -pub fn emit_rest_url_line( - transport: Rc, - op_name: String, - source_indices: &Rc>>, -) -> String { +pub fn emit_rest_url_line(transport: Rc, op_name: String, source_indices: &Rc>>) -> String { match transport_path_template(transport, source_indices.clone()) { - Some(path_node) => match (*path_node.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitStr { - value: path_str, .. - } = value.as_ref() - else { - unreachable!() - }; - v2_rt::concat( - v2_rt::concat( - "let url = format!(\"{}".to_string(), - escape_string_literal_body(path_str.clone()), - ), - "\", self.base_url);".to_string(), - ) - } - ExprData::ExprStringInterp => { - let parts = Rc::new({ - let mut __result = Vec::new(); - for child in path_node.children.clone().iter().cloned() { - __result.push(match (*child.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitStr { value: text, .. } = value.as_ref() - else { - unreachable!() - }; - Rc::new(StringPart::Text { - value: text.clone(), - }) - } - _ => Rc::new(StringPart::Interpolation { - expr: arg_value(&child), - }), - }); - } - __result - }); - let fmt_segments = Rc::new({ - let mut __result = Vec::new(); - for p in parts.clone().iter().cloned() { - __result.push(match (*p.clone()).clone() { - StringPart::Text { value: v, .. } => escape_rust_interp_text(v.clone()), - StringPart::Interpolation { .. } => "{}".to_string(), - }); - } - __result - }); - let fmt_str = fmt_segments.join(&"".to_string()); - let args = Rc::new({ - let mut __result = Vec::new(); - for p in parts.clone().iter().cloned() { - __result.extend( - (*match (*p.clone()).clone() { - StringPart::Text { .. } => Rc::new(vec![]), - StringPart::Interpolation { expr: e, .. } => { - let var_name = emit_ident( - expr_var_name_at(e.clone(), source_indices.clone()), - RenderTarget::Rust, - ); - let is_opt = is_optional_typed_expr(e.clone()); - if is_opt.clone() { - Rc::new(vec![v2_rt::concat( - var_name.clone(), - ".as_deref().unwrap_or(\"\")".to_string(), - )]) - } else { - Rc::new(vec![var_name.clone()]) - } - } - }) - .iter() - .cloned(), - ); - } - __result - }); - if ((args.clone().len() as i64) == 0) { - v2_rt::concat( - v2_rt::concat("let url = format!(\"{}".to_string(), fmt_str), - "\", self.base_url);".to_string(), - ) - } else { - { - let args_str = args.clone().join(&", ".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("let url = format!(\"{}".to_string(), fmt_str), - "\", self.base_url, ".to_string(), - ), - args_str, - ), - ");".to_string(), - ) - } - } + Some(path_node) => match (*path_node.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: path_str, .. } = value.as_ref() else { unreachable!() }; v2_rt::concat(v2_rt::concat("let url = format!(\"{}".to_string(), escape_string_literal_body(path_str.clone())), "\", self.base_url);".to_string()) }, + ExprData::ExprStringInterp => { + let parts = Rc::new({ let mut __result = Vec::new(); for child in path_node.children.clone().iter().cloned() { __result.push(match (*child.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: text, .. } = value.as_ref() else { unreachable!() }; Rc::new(StringPart::Text { + value: text.clone(), +}) }, + _ => Rc::new(StringPart::Interpolation { + expr: arg_value(&child), +}), +}); } __result }); +let fmt_segments = Rc::new({ let mut __result = Vec::new(); for p in parts.clone().iter().cloned() { __result.push(match (*p.clone()).clone() { + StringPart::Text { value: v, .. } => escape_rust_interp_text(v.clone()), + StringPart::Interpolation { .. } => "{}".to_string(), +}); } __result }); +let fmt_str = fmt_segments.join(&"".to_string()); +let args = Rc::new({ let mut __result = Vec::new(); for p in parts.clone().iter().cloned() { __result.extend((*match (*p.clone()).clone() { + StringPart::Text { .. } => Rc::new(vec![]), + StringPart::Interpolation { expr: e, .. } => { + let var_name = emit_ident(expr_var_name_at(e.clone(), source_indices.clone()), RenderTarget::Rust); +let is_opt = is_optional_typed_expr(e.clone()); +if is_opt.clone() { + Rc::new(vec![v2_rt::concat(var_name.clone(), ".as_deref().unwrap_or(\"\")".to_string())]) + } else { + Rc::new(vec![var_name.clone()]) } - _ => "compile_error!(\"transport path must be a string literal or interpolation\");" - .to_string(), - }, - None => v2_rt::concat( - v2_rt::concat( - "let url = format!(\"{}/{}\", self.base_url, \"".to_string(), - emit_ident(op_name, RenderTarget::Rust), - ), - "\");".to_string(), - ), - } +}, +}).iter().cloned()); } __result }); +if ((args.clone().len() as i64) == 0) { + v2_rt::concat(v2_rt::concat("let url = format!(\"{}".to_string(), fmt_str), "\", self.base_url);".to_string()) + } else { + { + let args_str = args.clone().join(&", ".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let url = format!(\"{}".to_string(), fmt_str), "\", self.base_url, ".to_string()), args_str), ");".to_string()) +} + } +}, + _ => "compile_error!(\"transport path must be a string literal or interpolation\");".to_string(), +}, + None => v2_rt::concat(v2_rt::concat("let url = format!(\"{}/{}\", self.base_url, \"".to_string(), emit_ident(op_name, RenderTarget::Rust)), "\");".to_string()), +} } -pub fn emit_rest_auth_line( - transport: &Rc, - service_item: &Rc, - http_method: String, - source_indices: &Rc>>, -) -> String { +pub fn emit_rest_auth_line(transport: &Rc, service_item: &Rc, http_method: String, source_indices: &Rc>>) -> String { { let auth_scheme = service_config_auth(service_item.clone(), source_indices.clone()); - let auth_input = service_config_auth_input(service_item.clone(), source_indices.clone()); - match auth_scheme { - Some(auth) => { - let has_auth_source = match service_config_auth_source( - service_item.clone(), - source_indices.clone(), - ) { - Some(_) => true, - None => false, - }; - let token_param = if has_auth_source { - "self.auth_token.clone()".to_string() - } else { - match auth_input { +let auth_input = service_config_auth_input(service_item.clone(), source_indices.clone()); +match auth_scheme { + Some(auth) => { + let has_auth_source = match service_config_auth_source(service_item.clone(), source_indices.clone()) { + Some(_) => true, + None => false, +}; +let token_param = if has_auth_source { + "self.auth_token.clone()".to_string() + } else { + match auth_input { Some(ai) => emit_simple_expr(&ai, &RenderTarget::Rust, &source_indices), None => "compile_error!(\"service config has auth but no auth_input or auth_source\")".to_string(), } - }; - match (*auth.expr_data.clone()).clone() { + }; +match (*auth.expr_data.clone()).clone() { ExprData::ExprVar { .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let request = client.".to_string(), http_method), "(&url)\n .header(\"Authorization\", format!(\"Bearer {}\", ".to_string()), token_param), "));".to_string()), ExprData::ExprCall { .. } => { let header_name = match auth.children.clone().first().cloned() { @@ -12917,104 +5418,41 @@ v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::con }, _ => v2_rt::concat(v2_rt::concat("compile_error!(\"unrecognized auth scheme expression shape\"); let request = client.".to_string(), http_method), "(&url);".to_string()), } - } - None => { - if transport_has_auth(transport.clone(), source_indices.clone()) { - { - let header_name = match transport_auth_header_name( - transport.clone(), - source_indices.clone(), - ) { - Some(h) => h.clone(), - None => "Authorization".to_string(), - }; - let token_node = - match transport_auth_token(transport.clone(), source_indices.clone()) { - Some(tn) => { - emit_simple_expr(&tn, &RenderTarget::Rust, &source_indices) - } - None => "\"\"".to_string(), - }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "let request = client.".to_string(), - http_method, - ), - "(&url)\n .header(\"".to_string(), - ), - header_name, - ), - "\", ".to_string(), - ), - token_node, - ), - ");".to_string(), - ) - } - } else { - v2_rt::concat( - v2_rt::concat("let request = client.".to_string(), http_method), - "(&url);".to_string(), - ) - } - } - } - } +}, + None => if transport_has_auth(transport.clone(), source_indices.clone()) { + { + let header_name = match transport_auth_header_name(transport.clone(), source_indices.clone()) { + Some(h) => h.clone(), + None => "Authorization".to_string(), +}; +let token_node = match transport_auth_token(transport.clone(), source_indices.clone()) { + Some(tn) => emit_simple_expr(&tn, &RenderTarget::Rust, &source_indices), + None => "\"\"".to_string(), +}; +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let request = client.".to_string(), http_method), "(&url)\n .header(\"".to_string()), header_name), "\", ".to_string()), token_node), ");".to_string()) +} + } else { + v2_rt::concat(v2_rt::concat("let request = client.".to_string(), http_method), "(&url);".to_string()) + }, +} +} } -pub fn emit_rest_query_line( - transport: Rc, - source_indices: &Rc>>, -) -> String { +pub fn emit_rest_query_line(transport: Rc, source_indices: &Rc>>) -> String { match transport_query(transport, source_indices.clone()) { - Some(q) => { - let pairs = Rc::new({ - let mut __result = Vec::new(); - for fi in q.children.clone().iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "(\"".to_string(), - field_init_node_name_at(fi.clone(), source_indices.clone()), - ), - "\", &".to_string(), - ), - emit_simple_expr( - &field_init_node_value(&fi), - &RenderTarget::Rust, - &source_indices, - ), - ), - ".to_string())".to_string(), - )); - } - __result - }); - if ((pairs.clone().len() as i64) > 0) { - v2_rt::concat( - v2_rt::concat( - "let request = request.query(&[".to_string(), - pairs.clone().join(&", ".to_string()), - ), - "]);".to_string(), - ) - } else { - "".to_string() - } + Some(q) => { + let pairs = Rc::new({ let mut __result = Vec::new(); for fi in q.children.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("(\"".to_string(), field_init_node_name_at(fi.clone(), source_indices.clone())), "\", &".to_string()), emit_simple_expr(&field_init_node_value(&fi), &RenderTarget::Rust, &source_indices)), ".to_string())".to_string())); } __result }); +if ((pairs.clone().len() as i64) > 0) { + v2_rt::concat(v2_rt::concat("let request = request.query(&[".to_string(), pairs.clone().join(&", ".to_string())), "]);".to_string()) + } else { + "".to_string() } - None => "".to_string(), - } +}, + None => "".to_string(), +} } -pub fn emit_rest_body_line( - transport: Rc, - source_indices: &Rc>>, -) -> String { +pub fn emit_rest_body_line(transport: Rc, source_indices: &Rc>>) -> String { match transport_request_body(transport, source_indices.clone()) { Some(b) => match (*b.expr_data.clone()).clone() { ExprData::ExprRecordLit { .. } => { @@ -13054,161 +5492,74 @@ pub fn has_response_prefix(name: &String) -> bool { } } -pub fn child_from_key( - ch: Rc, - source_indices: Rc>>, -) -> Option { - match Rc::new({ - let mut __result = Vec::new(); - for p in ch.properties.clone().iter().cloned() { - if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() - == "from_key".to_string().as_str()) - { - __result.push(p); - } - } - __result - }) - .first() - .cloned() - { - Some(prop) => match (*field_init_node_value(&prop).expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { - unreachable!() - }; - Some(s.clone()) - } - _ => None, - }, - None => None, - } +pub fn child_from_key(ch: Rc, source_indices: Rc>>) -> Option { + match Rc::new({ let mut __result = Vec::new(); for p in ch.properties.clone().iter().cloned() { if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() == "from_key".to_string().as_str()) { __result.push(p); } } __result }).first().cloned() { + Some(prop) => match (*field_init_node_value(&prop).expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { unreachable!() }; Some(s.clone()) }, + _ => None, +}, + None => None, +} } -pub fn has_from_key_fields( - op_node: Rc, - source_indices: Rc>>, -) -> bool { +pub fn has_from_key_fields(op_node: Rc, source_indices: Rc>>) -> bool { { let rt = resolved_type(op_node); - let is_conj = (rt.connective.clone() == Connective::Conj); - let from_key_count = (Rc::new({ - let mut __result = Vec::new(); - for ch in rt.children.clone().iter().cloned() { - if match child_from_key(ch.clone(), source_indices.clone()) { - Some(_) => true, - None => false, - } { - __result.push(ch); - } - } - __result - }) - .len() as i64); - (is_conj && (from_key_count > 0)) - } +let is_conj = (rt.connective.clone() == Connective::Conj); +let from_key_count = (Rc::new({ let mut __result = Vec::new(); for ch in rt.children.clone().iter().cloned() { if match child_from_key(ch.clone(), source_indices.clone()) { + Some(_) => true, + None => false, +} { __result.push(ch); } } __result }).len() as i64); +(is_conj && (from_key_count > 0)) +} } -pub fn has_response_200_property( - op_node: Rc, - source_indices: Rc>>, -) -> bool { - { - let mut __found = false; - for p in op_node.properties.clone().iter().cloned() { - if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() - == "response_200".to_string().as_str()) - { - __found = true; - break; - } - } - __found - } +pub fn has_response_200_property(op_node: Rc, source_indices: Rc>>) -> bool { + { let mut __found = false; for p in op_node.properties.clone().iter().cloned() { if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() == "response_200".to_string().as_str()) { __found = true; break; } } __found } } -pub fn operation_response_200_resolved_type( - op_node: Rc, - source_indices: &Rc>>, - env: Rc, -) -> Option> { - match Rc::new({ - let mut __result = Vec::new(); - for p in op_node.properties.clone().iter().cloned() { - if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() - == "response_200".to_string().as_str()) - { - __result.push(p); - } - } - __result - }) - .first() - .cloned() - { - Some(p) => { - let v = field_init_node_value(&p); - match v.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: tn, .. }) => Some(tn.clone()), - _ => { - let type_name = authored_name_at( - source_indices.clone(), - &normalize_access_type_node(v.clone()), - ); - if (type_name.clone().as_str() == "".to_string().as_str()) { - None - } else { - lookup_type_by_name(&env, type_name.clone()) - } - } +pub fn operation_response_200_resolved_type(op_node: Rc, source_indices: &Rc>>, env: Rc) -> Option> { + match Rc::new({ let mut __result = Vec::new(); for p in op_node.properties.clone().iter().cloned() { if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() == "response_200".to_string().as_str()) { __result.push(p); } } __result }).first().cloned() { + Some(p) => { + let v = field_init_node_value(&p); +match v.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: tn, .. }) => Some(tn.clone()), + _ => { + let type_name = authored_name_at(source_indices.clone(), &normalize_access_type_node(v.clone())); +if (type_name.clone().as_str() == "".to_string().as_str()) { + None + } else { + lookup_type_by_name(&env, type_name.clone()) } - } - None => None, - } +}, +} +}, + None => None, +} } -pub fn is_json_wire_declaration_type( - t: Rc, - source_indices: Rc>>, -) -> bool { +pub fn is_json_wire_declaration_type(t: Rc, source_indices: Rc>>) -> bool { { let n = authored_name_at(source_indices, &normalize_access_type_node(t)); - if (n.clone().as_str() == "Json".to_string().as_str()) { +if (n.clone().as_str() == "Json".to_string().as_str()) { true } else { { - let parts = Rc::new( - n.clone() - .split(&".".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ); - match parts.last().cloned() { - Some(last) => (last.clone().as_str() == "Json".to_string().as_str()), - None => false, - } - } + let parts = Rc::new(n.clone().split(&".".to_string()).map(|s| s.to_string()).collect::>()); +match parts.last().cloned() { + Some(last) => (last.clone().as_str() == "Json".to_string().as_str()), + None => false, +} +} } - } +} } pub fn path_segment_is_list_index(seg: &String) -> bool { if (v2_rt::string_length(&seg) == 0) { false } else { - { - let mut __all = true; - for c in Rc::new(seg.clone().chars().map(|c| c as i64).collect::>()) - .iter() - .cloned() - { - if !((c.clone() >= 48) && (c.clone() <= 57)) { - __all = false; - break; - } - } - __all - } + { let mut __all = true; for c in Rc::new(seg.clone().chars().map(|c| c as i64).collect::>()).iter().cloned() { if !(((c.clone() >= 48) && (c.clone() <= 57))) { __all = false; break; } } __all } } } @@ -13219,337 +5570,146 @@ pub struct WirePathProjection { pub ok: bool, } -pub fn wire_child_for_segment( - wire_node: Rc, - seg: String, - source_indices: Rc>>, -) -> Option> { +pub fn wire_child_for_segment(wire_node: Rc, seg: String, source_indices: Rc>>) -> Option> { { let normed = normalize_access_type_node(wire_node); - match Rc::new({ - let mut __result = Vec::new(); - for ch in normed.children.clone().iter().cloned() { - if { - let authored = authored_name_at(source_indices.clone(), &ch); - let wire_key = match child_from_key(ch.clone(), source_indices.clone()) { - Some(k) => k.clone(), - None => authored.clone(), - }; - (wire_key.clone().as_str() == seg.clone().as_str()) - } { - __result.push(ch); - } - } - __result - }) - .first() - .cloned() - { - Some(ch) => Some(ch.clone()), - None => None, - } - } +match Rc::new({ let mut __result = Vec::new(); for ch in normed.children.clone().iter().cloned() { if { + let authored = authored_name_at(source_indices.clone(), &ch); +let wire_key = match child_from_key(ch.clone(), source_indices.clone()) { + Some(k) => k.clone(), + None => authored.clone(), +}; +(wire_key.clone().as_str() == seg.clone().as_str()) +} { __result.push(ch); } } __result }).first().cloned() { + Some(ch) => Some(ch.clone()), + None => None, +} +} } -pub fn advance_wire_path_projection( - state: &Rc, - seg: &String, - full_path: String, - source_indices: &Rc>>, -) -> Rc { +pub fn advance_wire_path_projection(state: &Rc, seg: &String, full_path: String, source_indices: &Rc>>) -> Rc { if !state.ok.clone() { state.clone() } else { if path_segment_is_list_index(&seg) { { let next_node = match state.node.clone() { - Some(n) => Some(for_each_element_type_node( - n.clone(), - source_indices.clone(), - )), - None => None, - }; - Rc::new(WirePathProjection { - expr: v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("(".to_string(), state.expr.clone()), - ").get(".to_string(), - ), - seg.clone(), - ), - ").ok_or_else(|| format!(\"REST path missing index " - .to_string(), - ), - seg.clone(), - ), - " at ".to_string(), - ), - full_path, - ), - "\"))?".to_string(), - ), - node: next_node, - ok: true, - }) - } + Some(n) => Some(for_each_element_type_node(n.clone(), source_indices.clone())), + None => None, +}; +Rc::new(WirePathProjection { + expr: v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("(".to_string(), state.expr.clone()), ").get(".to_string()), seg.clone()), ").ok_or_else(|| format!(\"REST path missing index ".to_string()), seg.clone()), " at ".to_string()), full_path), "\"))?".to_string()), + node: next_node, + ok: true, +}) +} } else { match state.node.clone() { - Some(n) => { - match wire_child_for_segment(n.clone(), seg.clone(), source_indices.clone()) { - Some(ch) => Rc::new(WirePathProjection { - expr: v2_rt::concat( - v2_rt::concat( - v2_rt::concat("(".to_string(), state.expr.clone()), - ").".to_string(), - ), - emit_ident( - authored_name_at(source_indices.clone(), &ch), - RenderTarget::Rust, - ), - ), - node: Some(resolved_type(ch.clone())), - ok: true, - }), - None => Rc::new(WirePathProjection { - expr: state.expr.clone(), - node: None, - ok: false, - }), - } - } - None => Rc::new(WirePathProjection { - expr: state.expr.clone(), - node: None, - ok: false, - }), - } + Some(n) => match wire_child_for_segment(n.clone(), seg.clone(), source_indices.clone()) { + Some(ch) => Rc::new(WirePathProjection { + expr: v2_rt::concat(v2_rt::concat(v2_rt::concat("(".to_string(), state.expr.clone()), ").".to_string()), emit_ident(authored_name_at(source_indices.clone(), &ch), RenderTarget::Rust)), + node: Some(resolved_type(ch.clone())), + ok: true, +}), + None => Rc::new(WirePathProjection { + expr: state.expr.clone(), + node: None, + ok: false, +}), +}, + None => Rc::new(WirePathProjection { + expr: state.expr.clone(), + node: None, + ok: false, +}), +} } } } -pub fn emit_wire_struct_path_chain( - base: String, - wire_node: Rc, - from_path: &String, - source_indices: Rc>>, -) -> Rc { - { - let segs = Rc::new({ - let mut __result = Vec::new(); - for s in Rc::new( - from_path - .clone() - .split(&"/".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .iter() - .cloned() - { - if (s.clone().as_str() != "".to_string().as_str()) { - __result.push(s); - } - } - __result - }); - segs.iter().cloned().fold( - Rc::new(WirePathProjection { - expr: base, - node: Some(wire_node), - ok: true, - }), - |acc: Rc, seg: String| { - advance_wire_path_projection(&acc, &seg, from_path.clone(), &source_indices) - }, - ) - } +pub fn emit_wire_struct_path_chain(base: String, wire_node: Rc, from_path: &String, source_indices: Rc>>) -> Rc { + { + let segs = Rc::new({ let mut __result = Vec::new(); for s in Rc::new(from_path.clone().split(&"/".to_string()).map(|s| s.to_string()).collect::>()).iter().cloned() { if (s.clone().as_str() != "".to_string().as_str()) { __result.push(s); } } __result }); +segs.iter().cloned().fold(Rc::new(WirePathProjection { + expr: base, + node: Some(wire_node), + ok: true, +}), |acc: Rc, seg: String| advance_wire_path_projection(&acc, &seg, from_path.clone(), &source_indices)) +} } -pub fn emit_typed_wire_field_assign( - field_name: String, - from_path: &String, - wire_node: Rc, - source_indices: Rc>>, -) -> String { - { - let projection = emit_wire_struct_path_chain( - "__rest_wire".to_string(), - wire_node, - &from_path, - source_indices, - ); - if projection.ok.clone() { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("let ".to_string(), field_name), - " = ".to_string(), - ), - projection.expr.clone(), - ), - ".clone();\n".to_string(), - ) +pub fn emit_typed_wire_field_assign(field_name: String, from_path: &String, wire_node: Rc, source_indices: Rc>>) -> String { + { + let projection = emit_wire_struct_path_chain("__rest_wire".to_string(), wire_node, &from_path, source_indices); +if projection.ok.clone() { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let ".to_string(), field_name), " = ".to_string()), projection.expr.clone()), ".clone();\n".to_string()) } else { v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let ".to_string(), field_name), " = compile_error!(\"REST typed response path could not be resolved against declared 200 body: ".to_string()), from_path.clone()), "\");\n".to_string()) } - } +} } pub fn escape_json_pointer_segment(seg: String) -> String { - v2_rt::replace( - v2_rt::replace(seg, "~".to_string(), "~0".to_string()), - "/".to_string(), - "~1".to_string(), - ) -} - -pub fn emit_json_value_extract( - var_name: String, - from_path: &String, - dag_type_name: String, -) -> String { - { - let escaped_path = Rc::new({ - let mut __result = Vec::new(); - for seg in Rc::new( - from_path - .clone() - .split(&"/".to_string()) - .map(|s| s.to_string()) - .collect::>(), - ) - .iter() - .cloned() - { - __result.push(escape_json_pointer_segment(seg.clone())); - } - __result - }) - .join(&"/".to_string()); - let pointer = v2_rt::concat("/".to_string(), escaped_path); - let rust_type = coerce_primitive_type(RenderTarget::Rust, dag_type_name); - let accessor = if (rust_type.clone().as_str() == "String".to_string().as_str()) { - v2_rt::concat( - v2_rt::concat( - ".and_then(|v| v.as_str()).map(|s| s.to_string()).ok_or(\"missing field: " - .to_string(), - from_path.clone(), - ), - "\")?".to_string(), - ) + v2_rt::replace(v2_rt::replace(seg, "~".to_string(), "~0".to_string()), "/".to_string(), "~1".to_string()) +} + +pub fn emit_json_value_extract(var_name: String, from_path: &String, dag_type_name: String) -> String { + { + let escaped_path = Rc::new({ let mut __result = Vec::new(); for seg in Rc::new(from_path.clone().split(&"/".to_string()).map(|s| s.to_string()).collect::>()).iter().cloned() { __result.push(escape_json_pointer_segment(seg.clone())); } __result }).join(&"/".to_string()); +let pointer = v2_rt::concat("/".to_string(), escaped_path); +let rust_type = coerce_primitive_type(RenderTarget::Rust, dag_type_name); +let accessor = if (rust_type.clone().as_str() == "String".to_string().as_str()) { + v2_rt::concat(v2_rt::concat(".and_then(|v| v.as_str()).map(|s| s.to_string()).ok_or(\"missing field: ".to_string(), from_path.clone()), "\")?".to_string()) } else { if (rust_type.clone().as_str() == "i64".to_string().as_str()) { - v2_rt::concat( - v2_rt::concat( - ".and_then(|v| v.as_i64()).ok_or(\"missing field: ".to_string(), - from_path.clone(), - ), - "\")?".to_string(), - ) + v2_rt::concat(v2_rt::concat(".and_then(|v| v.as_i64()).ok_or(\"missing field: ".to_string(), from_path.clone()), "\")?".to_string()) } else { if (rust_type.clone().as_str() == "f64".to_string().as_str()) { - v2_rt::concat( - v2_rt::concat( - ".and_then(|v| v.as_f64()).ok_or(\"missing field: ".to_string(), - from_path.clone(), - ), - "\")?".to_string(), - ) + v2_rt::concat(v2_rt::concat(".and_then(|v| v.as_f64()).ok_or(\"missing field: ".to_string(), from_path.clone()), "\")?".to_string()) } else { if (rust_type.clone().as_str() == "bool".to_string().as_str()) { - v2_rt::concat( - v2_rt::concat( - ".and_then(|v| v.as_bool()).ok_or(\"missing field: ".to_string(), - from_path.clone(), - ), - "\")?".to_string(), - ) + v2_rt::concat(v2_rt::concat(".and_then(|v| v.as_bool()).ok_or(\"missing field: ".to_string(), from_path.clone()), "\")?".to_string()) } else { v2_rt::concat(v2_rt::concat(".cloned().map(|v| serde_json::from_value(v)).transpose()?.ok_or(\"missing field: ".to_string(), from_path.clone()), "\")?".to_string()) } } } }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("let ".to_string(), var_name), - " = json_body.pointer(\"".to_string(), - ), - pointer, - ), - "\")".to_string(), - ), - accessor, - ), - ";".to_string(), - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let ".to_string(), var_name), " = json_body.pointer(\"".to_string()), pointer), "\")".to_string()), accessor), ";".to_string()) +} } -pub fn emit_from_key_extraction( - op_node: &Rc, - source_indices: &Rc>>, - shared_types: Rc>, - env: Rc, -) -> String { +pub fn emit_from_key_extraction(op_node: &Rc, source_indices: &Rc>>, shared_types: Rc>, env: Rc) -> String { { let rt = resolved_type(op_node.clone()); - let children = rt.children.clone(); - let wire_opt = operation_response_200_resolved_type(op_node.clone(), &source_indices, env); - if (has_response_200_property(op_node.clone(), source_indices.clone()) - && match wire_opt.clone() { - None => true, - Some(_) => false, - }) - { +let children = rt.children.clone(); +let wire_opt = operation_response_200_resolved_type(op_node.clone(), &source_indices, env); +if (has_response_200_property(op_node.clone(), source_indices.clone()) && match wire_opt.clone() { + None => true, + Some(_) => false, +}) { "compile_error!(\"REST response_200: declared HTTP 200 body type is present but could not be resolved (empty name, missing TypeEnv binding, or inference gap); illegal state\");\n".to_string() } else { { let use_typed_wire = match wire_opt.clone() { - Some(tn) => !is_json_wire_declaration_type(tn.clone(), source_indices.clone()), - None => false, - }; - let prelude = match wire_opt.clone() { - Some(tn) => { - if is_json_wire_declaration_type(tn.clone(), source_indices.clone()) { - "let json_body: serde_json::Value = response.json().await?;\n" - .to_string() - } else { - { - let wire_ty = match tn.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => rt.clone(), - _ => tn.clone(), - }; - v2_rt::concat( - v2_rt::concat( - "let __rest_wire: ".to_string(), - render_rust_type( - wire_ty, - shared_types, - source_indices.clone(), - ), - ), - " = response.json().await?;\n".to_string(), - ) - } - } - } - None => { - "let json_body: serde_json::Value = response.json().await?;\n".to_string() - } - }; - let extract_lines = Rc::new({ - let mut __result = Vec::new(); - for ch in children.clone().iter().cloned() { - __result.push({ + Some(tn) => !is_json_wire_declaration_type(tn.clone(), source_indices.clone()), + None => false, +}; +let prelude = match wire_opt.clone() { + Some(tn) => if is_json_wire_declaration_type(tn.clone(), source_indices.clone()) { + "let json_body: serde_json::Value = response.json().await?;\n".to_string() + } else { + { + let wire_ty = match tn.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => rt.clone(), + _ => tn.clone(), +}; +v2_rt::concat(v2_rt::concat("let __rest_wire: ".to_string(), render_rust_type(wire_ty, shared_types, source_indices.clone())), " = response.json().await?;\n".to_string()) +} + }, + None => "let json_body: serde_json::Value = response.json().await?;\n".to_string(), +}; +let extract_lines = Rc::new({ let mut __result = Vec::new(); for ch in children.clone().iter().cloned() { __result.push({ let ch_name = authored_name_at(source_indices.clone(), &ch); let field_name = emit_ident(ch_name.clone(), RenderTarget::Rust); let from_path = match child_from_key(ch.clone(), source_indices.clone()) { @@ -13567,201 +5727,83 @@ match ch.inferred.clone().as_deref().cloned() { }, _ => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let ".to_string(), field_name.clone()), " = compile_error!(\"unresolved type for output field: ".to_string()), ch_name.clone()), "\");".to_string()), } -}); - } - __result - }); - let field_names = Rc::new({ - let mut __result = Vec::new(); - for ch in children.clone().iter().cloned() { - __result.push(emit_ident( - authored_name_at(source_indices.clone(), &ch), - RenderTarget::Rust, - )); - } - __result - }); - let tuple_body = if ((field_names.clone().len() as i64) == 1) { - v2_rt::concat( - v2_rt::concat( - "(".to_string(), - field_names.clone().first().cloned().clone().unwrap(), - ), - ",)".to_string(), - ) +}); } __result }); +let field_names = Rc::new({ let mut __result = Vec::new(); for ch in children.clone().iter().cloned() { __result.push(emit_ident(authored_name_at(source_indices.clone(), &ch), RenderTarget::Rust)); } __result }); +let tuple_body = if ((field_names.clone().len() as i64) == 1) { + v2_rt::concat(v2_rt::concat("(".to_string(), field_names.clone().first().cloned().clone().unwrap()), ",)".to_string()) } else { - v2_rt::concat( - v2_rt::concat("(".to_string(), field_names.clone().join(&", ".to_string())), - ")".to_string(), - ) + v2_rt::concat(v2_rt::concat("(".to_string(), field_names.clone().join(&", ".to_string())), ")".to_string()) }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(prelude, extract_lines.join(&"\n".to_string())), - "\nOk(".to_string(), - ), - tuple_body, - ), - ")".to_string(), - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(prelude, extract_lines.join(&"\n".to_string())), "\nOk(".to_string()), tuple_body), ")".to_string()) +} } - } +} } -pub fn emit_plain_response_body( - op_node: Rc, - transport: Rc, - source_indices: &Rc>>, -) -> String { +pub fn emit_plain_response_body(op_node: Rc, transport: Rc, source_indices: &Rc>>) -> String { { let is_text = match transport_response_format(transport, source_indices.clone()) { - Some(fmt) => { - (authored_name_at(source_indices.clone(), &fmt).as_str() - == "Text".to_string().as_str()) - } - None => false, - }; - if is_text { + Some(fmt) => (authored_name_at(source_indices.clone(), &fmt).as_str() == "Text".to_string().as_str()), + None => false, +}; +if is_text { "let result = response.text().await?;\nOk(result)".to_string() } else { "let result = response.json().await?;\nOk(result)".to_string() } - } +} } -pub fn emit_response_code_handling( - op_node: &Rc, - transport: Rc, - source_indices: &Rc>>, - shared_types: Rc>, - env: Rc, -) -> String { +pub fn emit_response_code_handling(op_node: &Rc, transport: Rc, source_indices: &Rc>>, shared_types: Rc>, env: Rc) -> String { { let use_from_key = has_from_key_fields(op_node.clone(), source_indices.clone()); - let response_props = Rc::new({ - let mut __result = Vec::new(); - for p in op_node.properties.clone().iter().cloned() { - if has_response_prefix(&field_init_node_name_at(p.clone(), source_indices.clone())) - { - __result.push(p); - } - } - __result - }); - if ((response_props.clone().len() as i64) == 0) { +let response_props = Rc::new({ let mut __result = Vec::new(); for p in op_node.properties.clone().iter().cloned() { if has_response_prefix(&field_init_node_name_at(p.clone(), source_indices.clone())) { __result.push(p); } } __result }); +if ((response_props.clone().len() as i64) == 0) { if use_from_key.clone() { - emit_from_key_extraction( - &op_node, - &source_indices, - shared_types.clone(), - env.clone(), - ) + emit_from_key_extraction(&op_node, &source_indices, shared_types.clone(), env.clone()) } else { emit_plain_response_body(op_node.clone(), transport.clone(), &source_indices) } } else { { - let arms = Rc::new({ - let mut __result = Vec::new(); - for p in response_props.clone().iter().cloned() { - __result.push(emit_response_arm( - p.clone(), - op_node.clone(), - use_from_key.clone(), - transport.clone(), - &source_indices, - shared_types.clone(), - env.clone(), - )); - } - __result - }); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "let status = response.status().as_u16();\n".to_string(), - "match status {\n".to_string(), - ), - arms.join(&"\n".to_string()), - ), - "\n _ => Err(format!(\"unexpected status code: {}\", status).into())\n" - .to_string(), - ), - "}".to_string(), - ) - } + let arms = Rc::new({ let mut __result = Vec::new(); for p in response_props.clone().iter().cloned() { __result.push(emit_response_arm(p.clone(), op_node.clone(), use_from_key.clone(), transport.clone(), &source_indices, shared_types.clone(), env.clone())); } __result }); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let status = response.status().as_u16();\n".to_string(), "match status {\n".to_string()), arms.join(&"\n".to_string())), "\n _ => Err(format!(\"unexpected status code: {}\", status).into())\n".to_string()), "}".to_string()) +} } - } +} } -pub fn emit_response_arm( - prop: Rc, - op_node: Rc, - use_from_key: bool, - transport: Rc, - source_indices: &Rc>>, - shared_types: Rc>, - env: Rc, -) -> String { +pub fn emit_response_arm(prop: Rc, op_node: Rc, use_from_key: bool, transport: Rc, source_indices: &Rc>>, shared_types: Rc>, env: Rc) -> String { { let name = field_init_node_name_at(prop, source_indices.clone()); - let code_str = v2_rt::substring(&name, 9, v2_rt::string_length(&name)); - let is_success = if (v2_rt::string_length(&code_str) >= 1) { +let code_str = v2_rt::substring(&name, 9, v2_rt::string_length(&name)); +let is_success = if (v2_rt::string_length(&code_str) >= 1) { (v2_rt::substring(&code_str, 0, 1).as_str() == "2".to_string().as_str()) } else { false }; - let pattern = if (code_str.clone().as_str() == "nonzero".to_string().as_str()) { +let pattern = if (code_str.clone().as_str() == "nonzero".to_string().as_str()) { "_".to_string() } else { - if ((v2_rt::string_length(&code_str) == 3) - && (v2_rt::substring(&code_str, 1, 3).as_str() == "xx".to_string().as_str())) - { + if ((v2_rt::string_length(&code_str) == 3) && (v2_rt::substring(&code_str, 1, 3).as_str() == "xx".to_string().as_str())) { { let prefix = v2_rt::substring(&code_str, 0, 1); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(prefix.clone(), "00..=".to_string()), - prefix.clone(), - ), - "99".to_string(), - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix.clone(), "00..=".to_string()), prefix.clone()), "99".to_string()) +} } else { code_str.clone() } }; - if is_success { +if is_success { if use_from_key { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(" ".to_string(), pattern), - " => { ".to_string(), - ), - emit_from_key_extraction(&op_node, &source_indices, shared_types, env), - ), - " },".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), pattern), " => { ".to_string()), emit_from_key_extraction(&op_node, &source_indices, shared_types, env)), " },".to_string()) } else { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(" ".to_string(), pattern), - " => { ".to_string(), - ), - emit_plain_response_body(op_node, transport, &source_indices), - ), - " },".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), pattern), " => { ".to_string()), emit_plain_response_body(op_node, transport, &source_indices)), " },".to_string()) } } else { v2_rt::concat(v2_rt::concat(" ".to_string(), pattern), " => { let err_body = response.text().await.unwrap_or_default(); Err(format!(\"HTTP {}: {}\", status, err_body).into()) },".to_string()) } - } +} } pub fn has_exit_prefix(name: &String) -> bool { @@ -13772,472 +5814,205 @@ pub fn has_exit_prefix(name: &String) -> bool { } } -pub fn emit_exit_code_handling( - op_node: Rc, - inferred: Rc, - source_indices: Rc>>, -) -> String { +pub fn emit_exit_code_handling(op_node: Rc, inferred: Rc, source_indices: Rc>>) -> String { { - let exit_props = Rc::new({ - let mut __result = Vec::new(); - for p in op_node.properties.clone().iter().cloned() { - if has_exit_prefix(&field_init_node_name_at(p.clone(), source_indices.clone())) { - __result.push(p); - } - } - __result - }); - if ((exit_props.clone().len() as i64) == 0) { + let exit_props = Rc::new({ let mut __result = Vec::new(); for p in op_node.properties.clone().iter().cloned() { if has_exit_prefix(&field_init_node_name_at(p.clone(), source_indices.clone())) { __result.push(p); } } __result }); +if ((exit_props.clone().len() as i64) == 0) { emit_shell_return(inferred.clone(), &source_indices) } else { { - let has_nonzero = { - let mut __found = false; - for p in exit_props.clone().iter().cloned() { - if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() - == "exit_nonzero".to_string().as_str()) - { - __found = true; - break; - } - } - __found - }; - let exit_arms = Rc::new({ - let mut __result = Vec::new(); - for p in exit_props.clone().iter().cloned() { - __result.push(emit_exit_arm(p.clone(), inferred.clone(), &source_indices)); - } - __result - }); - let default_arm = if has_nonzero { + let has_nonzero = { let mut __found = false; for p in exit_props.clone().iter().cloned() { if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() == "exit_nonzero".to_string().as_str()) { __found = true; break; } } __found }; +let exit_arms = Rc::new({ let mut __result = Vec::new(); for p in exit_props.clone().iter().cloned() { __result.push(emit_exit_arm(p.clone(), inferred.clone(), &source_indices)); } __result }); +let default_arm = if has_nonzero { "".to_string() } else { "\n _ => { let stderr = String::from_utf8_lossy(&output.stderr).to_string(); Err(stderr.into()) },".to_string() }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "let exit_code = output.status.code().unwrap_or(-1);\n".to_string(), - "match exit_code {\n".to_string(), - ), - exit_arms.join(&"\n".to_string()), - ), - default_arm, - ), - "\n}".to_string(), - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let exit_code = output.status.code().unwrap_or(-1);\n".to_string(), "match exit_code {\n".to_string()), exit_arms.join(&"\n".to_string())), default_arm), "\n}".to_string()) +} } - } +} } -pub fn emit_exit_arm( - prop: Rc, - inferred: Rc, - source_indices: &Rc>>, -) -> String { +pub fn emit_exit_arm(prop: Rc, inferred: Rc, source_indices: &Rc>>) -> String { { let name = field_init_node_name_at(prop, source_indices.clone()); - let code_str = v2_rt::substring(&name, 5, v2_rt::string_length(&name)); - let pattern = if (code_str.clone().as_str() == "nonzero".to_string().as_str()) { +let code_str = v2_rt::substring(&name, 5, v2_rt::string_length(&name)); +let pattern = if (code_str.clone().as_str() == "nonzero".to_string().as_str()) { "_".to_string() } else { code_str.clone() }; - let is_success = (code_str.clone().as_str() == "0".to_string().as_str()); - if is_success { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(" ".to_string(), pattern), - " => { ".to_string(), - ), - emit_shell_return(inferred, &source_indices), - ), - " },".to_string(), - ) +let is_success = (code_str.clone().as_str() == "0".to_string().as_str()); +if is_success { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), pattern), " => { ".to_string()), emit_shell_return(inferred, &source_indices)), " },".to_string()) } else { v2_rt::concat(v2_rt::concat(" ".to_string(), pattern), " => { let stderr = String::from_utf8_lossy(&output.stderr).to_string(); Err(stderr.into()) },".to_string()) } - } +} } -pub fn emit_shell_call( - op_name: String, - transport: &Rc, - registry: Rc>>, - depth: i64, - inferred: Rc, - op_node: &Rc, - source_indices: &Rc>>, -) -> String { +pub fn emit_shell_call(op_name: String, transport: &Rc, registry: Rc>>, depth: i64, inferred: Rc, op_node: &Rc, source_indices: &Rc>>) -> String { { let argv = transport.children.clone(); - let optional_params = Rc::new({ - let mut __result = Vec::new(); - for p in op_node.params.clone().iter().cloned() { - if (param_node_type_expr(&p).return_cardinality.clone() - == Cardinality::CardOptional) - { - __result.push(p); - } - } - __result - }) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, p: Rc| { - v2_rt::rc_map_insert( - acc, - param_node_name_at(p.clone(), source_indices.clone()), - true, - ) - }, - ); - let has_stdin = match transport_stdin(transport.clone(), source_indices.clone()) { - Some(_) => true, - None => false, - }; - let let_kw = if has_stdin.clone() { +let optional_params = Rc::new({ let mut __result = Vec::new(); for p in op_node.params.clone().iter().cloned() { if (param_node_type_expr(&p).return_cardinality.clone() == Cardinality::CardOptional) { __result.push(p); } } __result }).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, p: Rc| v2_rt::rc_map_insert(acc, param_node_name_at(p.clone(), source_indices.clone()), true)); +let has_stdin = match transport_stdin(transport.clone(), source_indices.clone()) { + Some(_) => true, + None => false, +}; +let let_kw = if has_stdin.clone() { "let mut output".to_string() } else { "let output".to_string() }; - let cmd_line = if ((argv.clone().len() as i64) > 0) { +let cmd_line = if ((argv.clone().len() as i64) > 0) { match argv.clone().first().cloned() { - Some(first_arg) => v2_rt::concat( - v2_rt::concat( - v2_rt::concat(let_kw, " = std::process::Command::new(".to_string()), - emit_shell_argv_element( - &first_arg, - optional_params.clone(), - source_indices.clone(), - ), - ), - ")".to_string(), - ), - None => v2_rt::concat( - v2_rt::concat( - v2_rt::concat(let_kw, " = std::process::Command::new(\"".to_string()), - emit_ident(op_name, RenderTarget::Rust), - ), - "\")".to_string(), - ), - } + Some(first_arg) => v2_rt::concat(v2_rt::concat(v2_rt::concat(let_kw, " = std::process::Command::new(".to_string()), emit_shell_argv_element(&first_arg, optional_params.clone(), source_indices.clone())), ")".to_string()), + None => v2_rt::concat(v2_rt::concat(v2_rt::concat(let_kw, " = std::process::Command::new(\"".to_string()), emit_ident(op_name, RenderTarget::Rust)), "\")".to_string()), +} } else { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(let_kw, " = std::process::Command::new(\"".to_string()), - emit_ident(op_name, RenderTarget::Rust), - ), - "\")".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(let_kw, " = std::process::Command::new(\"".to_string()), emit_ident(op_name, RenderTarget::Rust)), "\")".to_string()) }; - let arg_lines = if ((argv.clone().len() as i64) > 1) { - Rc::new({ - let mut __result = Vec::new(); - for arg in Rc::new( - argv.clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ) - .iter() - .cloned() - { - __result.push(v2_rt::concat( - v2_rt::concat( - " .arg(".to_string(), - emit_shell_argv_element( - &arg, - optional_params.clone(), - source_indices.clone(), - ), - ), - ")".to_string(), - )); - } - __result - }) +let arg_lines = if ((argv.clone().len() as i64) > 1) { + Rc::new({ let mut __result = Vec::new(); for arg in Rc::new(argv.clone().iter().cloned().skip(1 as usize).collect::>()).iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(" .arg(".to_string(), emit_shell_argv_element(&arg, optional_params.clone(), source_indices.clone())), ")".to_string())); } __result }) } else { Rc::new(vec![]) }; - let env_entries = transport_env(transport.clone(), source_indices.clone()); - let env_lines = Rc::new({ - let mut __result = Vec::new(); - for e in env_entries.iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - " .env(\"".to_string(), - field_init_node_name_at(e.clone(), source_indices.clone()), - ), - "\", ".to_string(), - ), - emit_simple_expr( - &field_init_node_value(&e), - &RenderTarget::Rust, - &source_indices, - ), - ), - ")".to_string(), - )); - } - __result - }); - let wd_line = " .current_dir(self.working_dir.as_deref().unwrap_or(\".\"))".to_string(); - if has_stdin.clone() { +let env_entries = transport_env(transport.clone(), source_indices.clone()); +let env_lines = Rc::new({ let mut __result = Vec::new(); for e in env_entries.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" .env(\"".to_string(), field_init_node_name_at(e.clone(), source_indices.clone())), "\", ".to_string()), emit_simple_expr(&field_init_node_value(&e), &RenderTarget::Rust, &source_indices)), ")".to_string())); } __result }); +let wd_line = " .current_dir(self.working_dir.as_deref().unwrap_or(\".\"))".to_string(); +if has_stdin.clone() { { - let stdin_expr = transport_stdin(transport.clone(), source_indices.clone()) - .clone() - .unwrap(); - let stdin_var = match (*stdin_expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => emit_ident( - expr_var_name_at(stdin_expr.clone(), source_indices.clone()), - RenderTarget::Rust, - ), - _ => emit_simple_expr(&stdin_expr, &RenderTarget::Rust, &source_indices), - }; - let spawn_line = " .stdin(std::process::Stdio::piped())\n .stdout(std::process::Stdio::piped())\n .stderr(std::process::Stdio::piped())".to_string(); - let spawn_exec = " .spawn()?;".to_string(); - let write_block = v2_rt::concat(v2_rt::concat("{\n use std::io::Write;\n if let Some(mut stdin) = output.stdin.take() {\n stdin.write_all(".to_string(), stdin_var), ".as_bytes())?;\n }\n}".to_string()); - let wait_line = "let output = output.wait_with_output()?;".to_string(); - let check_line = - "let stdout = String::from_utf8_lossy(&output.stdout).to_string();".to_string(); - let return_line = - emit_exit_code_handling(op_node.clone(), inferred, source_indices.clone()); - let all_lines = v2_rt::concat( - v2_rt::concat(v2_rt::concat(Rc::new(vec![cmd_line]), arg_lines), env_lines), - Rc::new(vec![ - wd_line, - spawn_line, - spawn_exec, - write_block, - wait_line, - check_line, - return_line, - ]), - ); - all_lines.join(&"\n".to_string()) - } + let stdin_expr = transport_stdin(transport.clone(), source_indices.clone()).clone().unwrap(); +let stdin_var = match (*stdin_expr.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => emit_ident(expr_var_name_at(stdin_expr.clone(), source_indices.clone()), RenderTarget::Rust), + _ => emit_simple_expr(&stdin_expr, &RenderTarget::Rust, &source_indices), +}; +let spawn_line = " .stdin(std::process::Stdio::piped())\n .stdout(std::process::Stdio::piped())\n .stderr(std::process::Stdio::piped())".to_string(); +let spawn_exec = " .spawn()?;".to_string(); +let write_block = v2_rt::concat(v2_rt::concat("{\n use std::io::Write;\n if let Some(mut stdin) = output.stdin.take() {\n stdin.write_all(".to_string(), stdin_var), ".as_bytes())?;\n }\n}".to_string()); +let wait_line = "let output = output.wait_with_output()?;".to_string(); +let check_line = "let stdout = String::from_utf8_lossy(&output.stdout).to_string();".to_string(); +let return_line = emit_exit_code_handling(op_node.clone(), inferred, source_indices.clone()); +let all_lines = v2_rt::concat(v2_rt::concat(v2_rt::concat(Rc::new(vec![cmd_line]), arg_lines), env_lines), Rc::new(vec![wd_line, spawn_line, spawn_exec, write_block, wait_line, check_line, return_line])); +all_lines.join(&"\n".to_string()) +} } else { { let output_line = " .output()?;".to_string(); - let check_line = - "let stdout = String::from_utf8_lossy(&output.stdout).to_string();".to_string(); - let return_line = - emit_exit_code_handling(op_node.clone(), inferred, source_indices.clone()); - let all_lines = v2_rt::concat( - v2_rt::concat(v2_rt::concat(Rc::new(vec![cmd_line]), arg_lines), env_lines), - Rc::new(vec![wd_line, output_line, check_line, return_line]), - ); - all_lines.join(&"\n".to_string()) - } +let check_line = "let stdout = String::from_utf8_lossy(&output.stdout).to_string();".to_string(); +let return_line = emit_exit_code_handling(op_node.clone(), inferred, source_indices.clone()); +let all_lines = v2_rt::concat(v2_rt::concat(v2_rt::concat(Rc::new(vec![cmd_line]), arg_lines), env_lines), Rc::new(vec![wd_line, output_line, check_line, return_line])); +all_lines.join(&"\n".to_string()) +} } - } +} } -pub fn emit_shell_argv_element( - arg: &Rc, - optional_params: Rc>, - source_indices: Rc>>, -) -> String { +pub fn emit_shell_argv_element(arg: &Rc, optional_params: Rc>, source_indices: Rc>>) -> String { match (*arg.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { - unreachable!() - }; - v2_rt::concat( - v2_rt::concat("\"".to_string(), escape_string_literal_body(s.clone())), - "\"".to_string(), - ) - } - ExprData::ExprStringInterp => { - let parts = Rc::new({ - let mut __result = Vec::new(); - for child in arg.children.clone().iter().cloned() { - __result.push(match (*child.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitStr { value: text, .. } = value.as_ref() else { - unreachable!() - }; - Rc::new(StringPart::Text { - value: text.clone(), - }) - } - _ => Rc::new(StringPart::Interpolation { - expr: arg_value(&child), - }), - }); - } - __result - }); - let fmt_segments = Rc::new({ - let mut __result = Vec::new(); - for p in parts.clone().iter().cloned() { - __result.push(match (*p.clone()).clone() { - StringPart::Text { value: v, .. } => escape_rust_interp_text(v.clone()), - StringPart::Interpolation { .. } => "{}".to_string(), - }); - } - __result - }); - let fmt_str = fmt_segments.join(&"".to_string()); - let args = Rc::new({ - let mut __result = Vec::new(); - for p in parts.clone().iter().cloned() { - __result.extend( - (*match (*p.clone()).clone() { - StringPart::Text { .. } => Rc::new(vec![]), - StringPart::Interpolation { expr: e, .. } => { - let name = expr_var_name_at(e.clone(), source_indices.clone()); - let var_name = emit_ident(name.clone(), RenderTarget::Rust); - let is_opt = (is_optional_typed_expr(e.clone()) - || match v2_rt::map_get(&optional_params, name.clone()) { - Some(_) => true, - None => false, - }); - if is_opt.clone() { - Rc::new(vec![v2_rt::concat( - var_name.clone(), - ".as_deref().unwrap_or(\"\")".to_string(), - )]) - } else { - Rc::new(vec![var_name.clone()]) - } - } - }) - .iter() - .cloned(), - ); - } - __result - }); - let args_str = args.join(&", ".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("&format!(\"".to_string(), fmt_str), - "\", ".to_string(), - ), - args_str, - ), - ")".to_string(), - ) - } - ExprData::ExprVar { .. } => { - let name = expr_var_name_at(arg.clone(), source_indices.clone()); - let var_name = emit_ident(name.clone(), RenderTarget::Rust); - let is_opt = (is_optional_typed_expr(arg.clone()) - || match v2_rt::map_get(&optional_params, name.clone()) { - Some(_) => true, - None => false, - }); - if is_opt.clone() { - v2_rt::concat( - v2_rt::concat("&".to_string(), var_name.clone()), - ".as_deref().unwrap_or(\"\").to_string()".to_string(), - ) + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { unreachable!() }; v2_rt::concat(v2_rt::concat("\"".to_string(), escape_string_literal_body(s.clone())), "\"".to_string()) }, + ExprData::ExprStringInterp => { + let parts = Rc::new({ let mut __result = Vec::new(); for child in arg.children.clone().iter().cloned() { __result.push(match (*child.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: text, .. } = value.as_ref() else { unreachable!() }; Rc::new(StringPart::Text { + value: text.clone(), +}) }, + _ => Rc::new(StringPart::Interpolation { + expr: arg_value(&child), +}), +}); } __result }); +let fmt_segments = Rc::new({ let mut __result = Vec::new(); for p in parts.clone().iter().cloned() { __result.push(match (*p.clone()).clone() { + StringPart::Text { value: v, .. } => escape_rust_interp_text(v.clone()), + StringPart::Interpolation { .. } => "{}".to_string(), +}); } __result }); +let fmt_str = fmt_segments.join(&"".to_string()); +let args = Rc::new({ let mut __result = Vec::new(); for p in parts.clone().iter().cloned() { __result.extend((*match (*p.clone()).clone() { + StringPart::Text { .. } => Rc::new(vec![]), + StringPart::Interpolation { expr: e, .. } => { + let name = expr_var_name_at(e.clone(), source_indices.clone()); +let var_name = emit_ident(name.clone(), RenderTarget::Rust); +let is_opt = (is_optional_typed_expr(e.clone()) || match v2_rt::map_get(&optional_params, name.clone()) { + Some(_) => true, + None => false, +}); +if is_opt.clone() { + Rc::new(vec![v2_rt::concat(var_name.clone(), ".as_deref().unwrap_or(\"\")".to_string())]) } else { - v2_rt::concat( - v2_rt::concat("&".to_string(), var_name.clone()), - ".to_string()".to_string(), - ) + Rc::new(vec![var_name.clone()]) } +}, +}).iter().cloned()); } __result }); +let args_str = args.join(&", ".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("&format!(\"".to_string(), fmt_str), "\", ".to_string()), args_str), ")".to_string()) +}, + ExprData::ExprVar { .. } => { + let name = expr_var_name_at(arg.clone(), source_indices.clone()); +let var_name = emit_ident(name.clone(), RenderTarget::Rust); +let is_opt = (is_optional_typed_expr(arg.clone()) || match v2_rt::map_get(&optional_params, name.clone()) { + Some(_) => true, + None => false, +}); +if is_opt.clone() { + v2_rt::concat(v2_rt::concat("&".to_string(), var_name.clone()), ".as_deref().unwrap_or(\"\").to_string()".to_string()) + } else { + v2_rt::concat(v2_rt::concat("&".to_string(), var_name.clone()), ".to_string()".to_string()) } - _ => emit_simple_expr(&arg, &RenderTarget::Rust, &source_indices), - } +}, + _ => emit_simple_expr(&arg, &RenderTarget::Rust, &source_indices), +} } -pub fn emit_shell_return( - inferred: Rc, - source_indices: &Rc>>, -) -> String { +pub fn emit_shell_return(inferred: Rc, source_indices: &Rc>>) -> String { { let effective = unwrap_single_field_product(inferred); - let is_product = is_product_type(effective.clone()); - let single_from = - if (is_product.clone() && ((effective.children.clone().len() as i64) == 1)) { - match effective.children.clone().first().cloned() { - Some(ch) => child_from_key(ch.clone(), source_indices.clone()), - None => None, - } - } else { - None - }; - match single_from { - Some(channel) => { - let is_optional = - (effective.return_cardinality.clone() == Cardinality::CardOptional); - emit_shell_channel_expr(&channel, is_optional.clone()) - } - None => { - if (is_product.clone() && ((effective.children.clone().len() as i64) > 1)) { - { - let needs_stderr = { - let mut __found = false; - for ch in effective.children.clone().iter().cloned() { - if match child_from_key(ch.clone(), source_indices.clone()) { - Some(ref __some_val) if __some_val == "stderr" => true, - _ => false, - } { - __found = true; - break; - } - } - __found - }; - let stderr_line = if needs_stderr { - "let stderr = String::from_utf8_lossy(&output.stderr).to_string();" - .to_string() - } else { - "".to_string() - }; - let field_exprs = Rc::new({ - let mut __result = Vec::new(); - for ch in effective.children.clone().iter().cloned() { - __result.push({ - let is_optional = (ch.return_cardinality.clone() - == Cardinality::CardOptional); - let channel = - match child_from_key(ch.clone(), source_indices.clone()) { - Some(c) => c.clone(), - None => "stdout".to_string(), - }; - emit_shell_channel_expr(&channel, is_optional.clone()) - }); - } - __result - }); - let lines = if (stderr_line.clone().as_str() != "".to_string().as_str()) { - v2_rt::concat(stderr_line.clone(), "\n".to_string()) - } else { - "".to_string() - }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(lines, "Ok((".to_string()), - field_exprs.join(&", ".to_string()), - ), - "))".to_string(), - ) - } +let is_product = is_product_type(effective.clone()); +let single_from = if (is_product.clone() && ((effective.children.clone().len() as i64) == 1)) { + match effective.children.clone().first().cloned() { + Some(ch) => child_from_key(ch.clone(), source_indices.clone()), + None => None, +} + } else { + None + }; +match single_from { + Some(channel) => { + let is_optional = (effective.return_cardinality.clone() == Cardinality::CardOptional); +emit_shell_channel_expr(&channel, is_optional.clone()) +}, + None => if (is_product.clone() && ((effective.children.clone().len() as i64) > 1)) { + { + let needs_stderr = { let mut __found = false; for ch in effective.children.clone().iter().cloned() { if match child_from_key(ch.clone(), source_indices.clone()) { + Some(ref __some_val) if __some_val == "stderr" => true, + _ => false, +} { __found = true; break; } } __found }; +let stderr_line = if needs_stderr { + "let stderr = String::from_utf8_lossy(&output.stderr).to_string();".to_string() } else { - { - let is_optional = - (effective.return_cardinality.clone() == Cardinality::CardOptional); - emit_shell_channel_expr(&"stdout".to_string(), is_optional.clone()) - } - } - } - } - } + "".to_string() + }; +let field_exprs = Rc::new({ let mut __result = Vec::new(); for ch in effective.children.clone().iter().cloned() { __result.push({ + let is_optional = (ch.return_cardinality.clone() == Cardinality::CardOptional); +let channel = match child_from_key(ch.clone(), source_indices.clone()) { + Some(c) => c.clone(), + None => "stdout".to_string(), +}; +emit_shell_channel_expr(&channel, is_optional.clone()) +}); } __result }); +let lines = if (stderr_line.clone().as_str() != "".to_string().as_str()) { + v2_rt::concat(stderr_line.clone(), "\n".to_string()) + } else { + "".to_string() + }; +v2_rt::concat(v2_rt::concat(v2_rt::concat(lines, "Ok((".to_string()), field_exprs.join(&", ".to_string())), "))".to_string()) +} + } else { + { + let is_optional = (effective.return_cardinality.clone() == Cardinality::CardOptional); +emit_shell_channel_expr(&"stdout".to_string(), is_optional.clone()) +} + }, +} +} } pub fn emit_shell_channel_expr(channel: &String, is_optional: bool) -> String { @@ -14255,709 +6030,252 @@ pub fn emit_shell_channel_expr(channel: &String, is_optional: bool) -> String { } } }; - if is_optional { +if is_optional { v2_rt::concat(v2_rt::concat("Some(".to_string(), base), ")".to_string()) } else { base } - } +} } pub fn unwrap_single_field_product(n: Rc) -> Rc { { let is_product = is_product_type(n.clone()); - if ((is_product && (n.ident_span.clone() == None)) - && ((n.children.clone().len() as i64) == 1)) - { +if ((is_product && (n.ident_span.clone() == None)) && ((n.children.clone().len() as i64) == 1)) { match n.children.clone().first().cloned() { - Some(field_node) => resolved_type(field_node.clone()), - None => n.clone(), - } + Some(field_node) => resolved_type(field_node.clone()), + None => n.clone(), +} } else { n.clone() } - } +} } pub fn emit_file_call(op_name: String, inferred: Rc) -> String { { let effective = unwrap_single_field_product(inferred); - let is_product = is_product_type(effective.clone()); - let parse_line = if (is_product && ((effective.children.clone().len() as i64) > 1)) { +let is_product = is_product_type(effective.clone()); +let parse_line = if (is_product && ((effective.children.clone().len() as i64) > 1)) { "let parsed: serde_json::Value = serde_json::from_str(&content)?;\nOk(serde_json::from_value(parsed)?)".to_string() } else { "Ok(content)".to_string() }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "let path = format!(\"{}/{}\", self.base_path, \"".to_string(), - emit_ident(op_name, RenderTarget::Rust), - ), - "\");\n".to_string(), - ), - "let content = std::fs::read_to_string(&path)?;\n".to_string(), - ), - parse_line, - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let path = format!(\"{}/{}\", self.base_path, \"".to_string(), emit_ident(op_name, RenderTarget::Rust)), "\");\n".to_string()), "let content = std::fs::read_to_string(&path)?;\n".to_string()), parse_line) +} } pub fn emit_local_call(op_name: String) -> String { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "// Local binding -- direct function call\n".to_string(), - "Ok(".to_string(), - ), - emit_ident(op_name, RenderTarget::Rust), - ), - "())".to_string(), - ) -} - -pub fn emit_resource_def( - item: &Rc, - shared_types: Rc>, - env: &Rc, -) -> String { + v2_rt::concat(v2_rt::concat(v2_rt::concat("// Local binding -- direct function call\n".to_string(), "Ok(".to_string()), emit_ident(op_name, RenderTarget::Rust)), "())".to_string()) +} + +pub fn emit_resource_def(item: &Rc, shared_types: Rc>, env: &Rc) -> String { { let item_text = authored_name(env.clone(), item.clone()); - let cap_children = item.children.clone(); - if ((cap_children.clone().len() as i64) == 0) { - v2_rt::concat( - v2_rt::concat( - "#[derive(Debug, Clone)]\npub struct ".to_string(), - item_text, - ), - ";".to_string(), - ) +let cap_children = item.children.clone(); +if ((cap_children.clone().len() as i64) == 0) { + v2_rt::concat(v2_rt::concat("#[derive(Debug, Clone)]\npub struct ".to_string(), item_text), ";".to_string()) } else { { let depth = 0; - let cap_methods = Rc::new({ - let mut __result = Vec::new(); - for c in cap_children.clone().iter().cloned() { - __result.push(emit_capability_method(&c, &shared_types, &env)); - } - __result - }); - let methods_str = cap_methods.join(&"\n\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "#[async_trait::async_trait]\npub trait ".to_string(), - item_text, - ), - " {\n".to_string(), - ), - make_indent((depth + 1)), - ), - methods_str, - ), - "\n}".to_string(), - ) - } +let cap_methods = Rc::new({ let mut __result = Vec::new(); for c in cap_children.clone().iter().cloned() { __result.push(emit_capability_method(&c, &shared_types, &env)); } __result }); +let methods_str = cap_methods.join(&"\n\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("#[async_trait::async_trait]\npub trait ".to_string(), item_text), " {\n".to_string()), make_indent((depth + 1))), methods_str), "\n}".to_string()) +} } - } +} } -pub fn emit_capability_method( - cap_node: &Rc, - shared_types: &Rc>, - env: &Rc, -) -> String { - { - let input_params = Rc::new({ - let mut __result = Vec::new(); - for p in cap_node.params.clone().iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - emit_ident( - param_node_name_at(p.clone(), env.source_indices.clone()), - RenderTarget::Rust, - ), - rust_items().param_type_sep.clone(), - ), - emit_rust_param_type( - ¶m_node_type_expr(&p), - &shared_types, - &env.source_indices.clone(), - ), - )); - } - __result - }); - let params_str = input_params.join(&", ".to_string()); - let all_params = if (params_str.clone().as_str() == "".to_string().as_str()) { +pub fn emit_capability_method(cap_node: &Rc, shared_types: &Rc>, env: &Rc) -> String { + { + let input_params = Rc::new({ let mut __result = Vec::new(); for p in cap_node.params.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(emit_ident(param_node_name_at(p.clone(), env.source_indices.clone()), RenderTarget::Rust), rust_items().param_type_sep.clone()), emit_rust_param_type(¶m_node_type_expr(&p), &shared_types, &env.source_indices.clone()))); } __result }); +let params_str = input_params.join(&", ".to_string()); +let all_params = if (params_str.clone().as_str() == "".to_string().as_str()) { "&self".to_string() } else { v2_rt::concat("&self, ".to_string(), params_str.clone()) }; - let ret = render_rust_type( - resolved_type(cap_node.clone()), - shared_types.clone(), - env.source_indices.clone(), - ); - let items = rust_items(); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - items.async_prefix.clone(), - items.func_keyword.clone(), - ), - " ".to_string(), - ), - emit_ident( - authored_name(env.clone(), cap_node.clone()), - RenderTarget::Rust, - ), - ), - "(".to_string(), - ), - all_params, - ), - ") -> Result<".to_string(), - ), - ret, - ), - ", Box>;".to_string(), - ) - } +let ret = render_rust_type(resolved_type(cap_node.clone()), shared_types.clone(), env.source_indices.clone()); +let items = rust_items(); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(items.async_prefix.clone(), items.func_keyword.clone()), " ".to_string()), emit_ident(authored_name(env.clone(), cap_node.clone()), RenderTarget::Rust)), "(".to_string()), all_params), ") -> Result<".to_string()), ret), ", Box>;".to_string()) +} } pub fn data_value_has_cross_refs(value: &Rc) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*value.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => true, - ExprData::ExprListLit => { - let mut __found = false; - for c in value.children.clone().iter().cloned() { - if data_value_has_cross_refs(&c) { - __found = true; - break; - } - } - __found - } - ExprData::ExprRecordLit { .. } => { - let mut __found = false; - for f in value.children.clone().iter().cloned() { - if data_value_has_cross_refs(&field_init_node_value(&f)) { - __found = true; - break; - } - } - __found - } - _ => false, - } + ExprData::ExprVar { .. } => true, + ExprData::ExprListLit => { let mut __found = false; for c in value.children.clone().iter().cloned() { if data_value_has_cross_refs(&c) { __found = true; break; } } __found }, + ExprData::ExprRecordLit { .. } => { let mut __found = false; for f in value.children.clone().iter().cloned() { if data_value_has_cross_refs(&field_init_node_value(&f)) { __found = true; break; } } __found }, + _ => false, +} }) } -pub fn emit_data_def( - name: String, - type_node: &Rc, - value: Rc, - registry: Rc>>, - scope: &Rc, - depth: i64, - shared_types: &Rc>, - emit_info: Rc, -) -> String { - { - let ty_str = render_rust_type( - type_node.clone(), - shared_types.clone(), - scope.type_env.clone().source_indices.clone(), - ); - let fn_name = to_snake(name); - let needs_rc = v2_rt::map_contains_key( - &shared_types, - authored_name_at(scope.type_env.clone().source_indices.clone(), &type_node), - ); - if is_simple_type_node( - type_node.clone(), - scope.type_env.clone().source_indices.clone(), - ) { +pub fn emit_data_def(name: String, type_node: &Rc, value: Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: Rc) -> String { + { + let ty_str = render_rust_type(type_node.clone(), shared_types.clone(), scope.type_env.clone().source_indices.clone()); +let fn_name = to_snake(name); +let needs_rc = set_contains(shared_types.clone(), authored_name_at(scope.type_env.clone().source_indices.clone(), &type_node)); +if is_simple_type_node(type_node.clone(), scope.type_env.clone().source_indices.clone()) { { - let val_str = emit_typed_expr( - value, - registry, - &scope, - depth, - shared_types.clone(), - emit_info, - 1024, - ); - let kw = rust_items().func_keyword.clone(); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(rust_visibility_prefix(), kw), - " ".to_string(), - ), - fn_name, - ), - "() -> ".to_string(), - ), - ty_str.clone(), - ), - " { ".to_string(), - ), - val_str, - ), - " }".to_string(), - ) - } + let val_str = emit_typed_expr(value, registry, &scope, depth, shared_types.clone(), emit_info, 1024); +let kw = rust_items().func_keyword.clone(); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), kw), " ".to_string()), fn_name), "() -> ".to_string()), ty_str.clone()), " { ".to_string()), val_str), " }".to_string()) +} } else { { - let body = emit_data_def_body( - &type_node, - &value, - registry, - &scope, - depth, - shared_types.clone(), - emit_info, - &needs_rc, - ); - let kw = rust_items().func_keyword.clone(); - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), kw), " ".to_string()), fn_name), "() -> ".to_string()), ty_str.clone()), " {\n".to_string()), " thread_local! {\n".to_string()), " static CACHED: ".to_string()), ty_str.clone()), " = {\n".to_string()), body), "\n".to_string()), " };\n".to_string()), " }\n".to_string()), " CACHED.with(|c| c.clone())\n".to_string()), "}".to_string()) - } + let body = emit_data_def_body(&type_node, &value, registry, &scope, depth, shared_types.clone(), emit_info, &needs_rc); +let kw = rust_items().func_keyword.clone(); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), kw), " ".to_string()), fn_name), "() -> ".to_string()), ty_str.clone()), " {\n".to_string()), " thread_local! {\n".to_string()), " static CACHED: ".to_string()), ty_str.clone()), " = {\n".to_string()), body), "\n".to_string()), " };\n".to_string()), " }\n".to_string()), " CACHED.with(|c| c.clone())\n".to_string()), "}".to_string()) +} } - } +} } -pub fn emit_data_def_body( - type_node: &Rc, - value: &Rc, - registry: Rc>>, - scope: &Rc, - depth: i64, - shared_types: Rc>, - emit_info: Rc, - needs_rc: &bool, -) -> String { - if (has_nested_records_node( - type_node.clone(), - scope.type_env.clone().source_indices.clone(), - ) && !data_value_has_cross_refs(&value)) - { +pub fn emit_data_def_body(type_node: &Rc, value: &Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: Rc, needs_rc: &bool) -> String { + if (has_nested_records_node(type_node.clone(), scope.type_env.clone().source_indices.clone()) && !data_value_has_cross_refs(&value)) { { - let json_str = - emit_data_value_json(&value, scope.type_env.clone().source_indices.clone()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - " serde_json::from_value(serde_json::json!(".to_string(), - json_str, - ), - "))\n".to_string(), - ), - " .expect(\"valid data definition\")".to_string(), - ) - } + let json_str = emit_data_value_json(&value, scope.type_env.clone().source_indices.clone()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(" serde_json::from_value(serde_json::json!(".to_string(), json_str), "))\n".to_string()), " .expect(\"valid data definition\")".to_string()) +} } else { { - let is_map = - node_is_keyed_collection(&type_node, scope.type_env.clone().source_indices.clone()); - if is_map { + let is_map = node_is_keyed_collection(&type_node, scope.type_env.clone().source_indices.clone()); +if is_map { match (*value.expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => { - let inserts = Rc::new({ - let mut __result = Vec::new(); - for f in value.children.clone().iter().cloned() { - __result.push({ - let val_str = emit_typed_expr( - field_init_node_value(&f), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - " __m.insert(\"".to_string(), - field_init_node_name_at( - f.clone(), - scope - .type_env - .clone() - .source_indices - .clone(), - ), - ), - "\".to_string(), ".to_string(), - ), - val_str.clone(), - ), - ");".to_string(), - ) - }); - } - __result - }); - let inserts_str = inserts.join(&"\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - " let mut __m = HashMap::new();\n".to_string(), - inserts_str, - ), - "\n".to_string(), - ), - " Rc::new(__m)".to_string(), - ) - } - _ => { - let val_str = emit_typed_expr( - value.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - v2_rt::concat(" ".to_string(), val_str.clone()) - } - } + ExprData::ExprRecordLit { .. } => { + let inserts = Rc::new({ let mut __result = Vec::new(); for f in value.children.clone().iter().cloned() { __result.push({ + let val_str = emit_typed_expr(field_init_node_value(&f), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" __m.insert(\"".to_string(), field_init_node_name_at(f.clone(), scope.type_env.clone().source_indices.clone())), "\".to_string(), ".to_string()), val_str.clone()), ");".to_string()) +}); } __result }); +let inserts_str = inserts.join(&"\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(" let mut __m = HashMap::new();\n".to_string(), inserts_str), "\n".to_string()), " Rc::new(__m)".to_string()) +}, + _ => { + let val_str = emit_typed_expr(value.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +v2_rt::concat(" ".to_string(), val_str.clone()) +}, +} } else { { - let val_str = emit_typed_expr( - value.clone(), - registry.clone(), - &scope, - depth.clone(), - shared_types.clone(), - emit_info.clone(), - 1024, - ); - let is_already_wrapped = match (*value.expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => true, - ExprData::ExprListLit => true, - _ => false, - }; - let wrap_start = if (needs_rc.clone() && !is_already_wrapped.clone()) { + let val_str = emit_typed_expr(value.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); +let is_already_wrapped = match (*value.expr_data.clone()).clone() { + ExprData::ExprRecordLit { .. } => true, + ExprData::ExprListLit => true, + _ => false, +}; +let wrap_start = if (needs_rc.clone() && !is_already_wrapped.clone()) { "Rc::new(".to_string() } else { "".to_string() }; - let wrap_end = if (needs_rc.clone() && !is_already_wrapped.clone()) { +let wrap_end = if (needs_rc.clone() && !is_already_wrapped.clone()) { ")".to_string() } else { "".to_string() }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(" ".to_string(), wrap_start), - val_str.clone(), - ), - wrap_end, - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), wrap_start), val_str.clone()), wrap_end) +} } - } +} } } -pub fn emit_test_file( - module_name: &String, - projections: Rc>>, -) -> Rc { +pub fn emit_test_file(module_name: &String, projections: Rc>>) -> Rc { { let depth = 0; - let test_fns = Rc::new({ - let mut __result = Vec::new(); - for p in projections.iter().cloned() { - __result.push(emit_operation_test(&p, (depth.clone() + 1))); - } - __result - }); - if ((test_fns.clone().len() as i64) == 0) { +let test_fns = Rc::new({ let mut __result = Vec::new(); for p in projections.iter().cloned() { __result.push(emit_operation_test(&p, (depth.clone() + 1))); } __result }); +if ((test_fns.clone().len() as i64) == 0) { Rc::new(TextFile { - path: "".to_string(), - content: "".to_string(), - }) + path: "".to_string(), + content: "".to_string(), +}) } else { { let filename = module_to_filename(module_name.clone()); - let tests_str = test_fns.clone().join(&"\n\n".to_string()); - let content = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "// Generated tests -- do not edit.\n" - .to_string(), - "// Source module: ".to_string(), - ), - module_name.clone(), - ), - "\n\n".to_string(), - ), - "#[cfg(test)]\nmod tests {\n".to_string(), - ), - " use super::*;\n\n".to_string(), - ), - make_indent((depth.clone() + 1)), - ), - tests_str, - ), - "\n".to_string(), - ), - "}\n".to_string(), - ); - Rc::new(TextFile { - path: rust_test_file_path(module_name.clone()), - content: content, - }) - } +let tests_str = test_fns.clone().join(&"\n\n".to_string()); +let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("// Generated tests -- do not edit.\n".to_string(), "// Source module: ".to_string()), module_name.clone()), "\n\n".to_string()), "#[cfg(test)]\nmod tests {\n".to_string()), " use super::*;\n\n".to_string()), make_indent((depth.clone() + 1))), tests_str), "\n".to_string()), "}\n".to_string()); +Rc::new(TextFile { + path: rust_test_file_path(module_name.clone()), + content: content, +}) +} } - } +} } pub fn rust_test_signature_comment(projection: &Rc) -> String { { - let params_str = Rc::new({ - let mut __result = Vec::new(); - for p in projection.params.clone().iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - param_node_name_at(p.clone(), projection.source_indices.clone()), - ": ".to_string(), - ), - emit_rust_param_type( - ¶m_node_type_expr(&p), - &v2_rt::rc_empty_map::(), - &projection.source_indices.clone(), - ), - )); - } - __result - }) - .join(&", ".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "// Signature: ".to_string(), - sanitize_service_name(projection.service_name.clone()), - ), - ".".to_string(), - ), - projection.operation_name.clone(), - ), - "(".to_string(), - ), - params_str, - ), - ") -> ".to_string(), - ), - emit_node_type( - projection.inferred.clone(), - RenderTarget::Rust, - projection.source_indices.clone(), - ), - ) - } + let params_str = Rc::new({ let mut __result = Vec::new(); for p in projection.params.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(param_node_name_at(p.clone(), projection.source_indices.clone()), ": ".to_string()), emit_rust_param_type(¶m_node_type_expr(&p), &empty_set(), &projection.source_indices.clone()))); } __result }).join(&", ".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("// Signature: ".to_string(), sanitize_service_name(projection.service_name.clone())), ".".to_string()), projection.operation_name.clone()), "(".to_string()), params_str), ") -> ".to_string()), emit_node_type(projection.inferred.clone(), RenderTarget::Rust, projection.source_indices.clone())) +} } pub fn emit_operation_test(projection: &Rc, depth: i64) -> String { { let test_name = rust_test_name(projection.clone()); - let struct_name = sanitize_service_name(projection.service_name.clone()); - let op_method = to_snake(projection.operation_name.clone()); - let indent = make_indent((depth + 1)); - let param_args = Rc::new({ - let mut __result = Vec::new(); - for p in projection.params.clone().iter().cloned() { - __result.push(emit_rust_default_value( - p.clone(), - projection.source_indices.clone(), - )); - } - __result - }); - let args_str = param_args.join(&", ".to_string()); - let call_args = if (args_str.clone().as_str() == "".to_string().as_str()) { +let struct_name = sanitize_service_name(projection.service_name.clone()); +let op_method = to_snake(projection.operation_name.clone()); +let indent = make_indent((depth + 1)); +let param_args = Rc::new({ let mut __result = Vec::new(); for p in projection.params.clone().iter().cloned() { __result.push(emit_rust_default_value(p.clone(), projection.source_indices.clone())); } __result }); +let args_str = param_args.join(&", ".to_string()); +let call_args = if (args_str.clone().as_str() == "".to_string().as_str()) { "".to_string() } else { args_str.clone() }; - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_async_test_decorator(), "\nasync fn ".to_string()), test_name), "() {\n".to_string()), indent.clone()), rust_test_signature_comment(&projection)), "\n".to_string()), indent.clone()), "let service = ".to_string()), struct_name.clone()), "::new(crate::dry_run::DryRunMode(true));\n".to_string()), indent.clone()), "let result = service.".to_string()), emit_ident(op_method, RenderTarget::Rust)), "(".to_string()), call_args), ").await;\n".to_string()), indent.clone()), "assert!(result.is_ok(), \"".to_string()), struct_name.clone()), ".".to_string()), projection.operation_name.clone()), " should succeed in dry-run mode: {:?}\", result.err());\n".to_string()), "}".to_string()) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_async_test_decorator(), "\nasync fn ".to_string()), test_name), "() {\n".to_string()), indent.clone()), rust_test_signature_comment(&projection)), "\n".to_string()), indent.clone()), "let service = ".to_string()), struct_name.clone()), "::new(crate::dry_run::DryRunMode(true));\n".to_string()), indent.clone()), "let result = service.".to_string()), emit_ident(op_method, RenderTarget::Rust)), "(".to_string()), call_args), ").await;\n".to_string()), indent.clone()), "assert!(result.is_ok(), \"".to_string()), struct_name.clone()), ".".to_string()), projection.operation_name.clone()), " should succeed in dry-run mode: {:?}\", result.err());\n".to_string()), "}".to_string()) +} } -pub fn emit_rust_default_value( - param: Rc, - source_indices: Rc>>, -) -> String { +pub fn emit_rust_default_value(param: Rc, source_indices: Rc>>) -> String { { let type_name = authored_name_at(source_indices, ¶m_node_type_expr(¶m)); - match lookup_checkpoint(RenderTarget::Rust, type_name.clone()) { - Some(cp) => match cp.default_expr.clone() { - Some(expr) => expr.clone(), - None => v2_rt::concat( - v2_rt::concat( - "compile_error!(\"no test default for type: ".to_string(), - type_name.clone(), - ), - "\")".to_string(), - ), - }, - None => v2_rt::concat( - v2_rt::concat( - "compile_error!(\"no test default for type: ".to_string(), - type_name.clone(), - ), - "\")".to_string(), - ), - } - } +match lookup_checkpoint(RenderTarget::Rust, type_name.clone()) { + Some(cp) => match cp.default_expr.clone() { + Some(expr) => expr.clone(), + None => v2_rt::concat(v2_rt::concat("compile_error!(\"no test default for type: ".to_string(), type_name.clone()), "\")".to_string()), +}, + None => v2_rt::concat(v2_rt::concat("compile_error!(\"no test default for type: ".to_string(), type_name.clone()), "\")".to_string()), +} +} } -pub fn emit_mock_prop_setup( - mock_prop: &Rc, - depth: i64, - source_indices: &Rc>>, -) -> String { - { - let body_str = emit_simple_expr( - &field_init_node_value(&mock_prop), - &RenderTarget::Rust, - &source_indices, - ); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "let ".to_string(), - field_init_node_name_at(mock_prop.clone(), source_indices.clone()), - ), - " = ".to_string(), - ), - body_str, - ), - ";".to_string(), - ) - } +pub fn emit_mock_prop_setup(mock_prop: &Rc, depth: i64, source_indices: &Rc>>) -> String { + { + let body_str = emit_simple_expr(&field_init_node_value(&mock_prop), &RenderTarget::Rust, &source_indices); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let ".to_string(), field_init_node_name_at(mock_prop.clone(), source_indices.clone())), " = ".to_string()), body_str), ";".to_string()) +} } pub fn emit_cargo_dep(name: String, version: String, features: &Rc>) -> String { if ((features.clone().len() as i64) > 0) { { - let feat_strs = Rc::new({ - let mut __result = Vec::new(); - for f in features.clone().iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat("\"".to_string(), f.clone()), - "\"".to_string(), - )); - } - __result - }); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(name, " = { version = \"".to_string()), - version, - ), - "\", features = [".to_string(), - ), - feat_strs.join(&", ".to_string()), - ), - "] }\n".to_string(), - ) - } + let feat_strs = Rc::new({ let mut __result = Vec::new(); for f in features.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat("\"".to_string(), f.clone()), "\"".to_string())); } __result }); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(name, " = { version = \"".to_string()), version), "\", features = [".to_string()), feat_strs.join(&", ".to_string())), "] }\n".to_string()) +} } else { - v2_rt::concat( - v2_rt::concat(v2_rt::concat(name, " = \"".to_string()), version), - "\"\n".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(name, " = \"".to_string()), version), "\"\n".to_string()) } } pub fn emit_cargo_toml(crate_name: String, has_services: bool) -> Rc { { - let header = v2_rt::concat( - v2_rt::concat("[package]\nname = \"".to_string(), crate_name), - "\"\nversion = \"0.1.0\"\nedition = \"2021\"\n".to_string(), - ); - let workspace = "\n[workspace]\n".to_string(); - let base_deps = Rc::new(vec![ - emit_cargo_dep( - "serde".to_string(), - "1".to_string(), - &Rc::new(vec!["derive".to_string(), "rc".to_string()]), - ), - emit_cargo_dep("serde_json".to_string(), "1".to_string(), &Rc::new(vec![])), - emit_cargo_dep("stacker".to_string(), "0.1".to_string(), &Rc::new(vec![])), - emit_cargo_dep( - "clap".to_string(), - "4".to_string(), - &Rc::new(vec!["derive".to_string()]), - ), - emit_cargo_dep("lazy_static".to_string(), "1".to_string(), &Rc::new(vec![])), - ]); - let async_deps = if has_services { - Rc::new(vec![ - emit_cargo_dep( - "tokio".to_string(), - "1".to_string(), - &Rc::new(vec!["full".to_string()]), - ), - emit_cargo_dep( - "reqwest".to_string(), - "0.12".to_string(), - &Rc::new(vec!["json".to_string()]), - ), - emit_cargo_dep( - "async-trait".to_string(), - "0.1".to_string(), - &Rc::new(vec![]), - ), - ]) + let header = v2_rt::concat(v2_rt::concat("[package]\nname = \"".to_string(), crate_name), "\"\nversion = \"0.1.0\"\nedition = \"2021\"\n".to_string()); +let workspace = "\n[workspace]\n".to_string(); +let base_deps = Rc::new(vec![emit_cargo_dep("serde".to_string(), "1".to_string(), &Rc::new(vec!["derive".to_string(), "rc".to_string()])), emit_cargo_dep("serde_json".to_string(), "1".to_string(), &Rc::new(vec![])), emit_cargo_dep("stacker".to_string(), "0.1".to_string(), &Rc::new(vec![])), emit_cargo_dep("clap".to_string(), "4".to_string(), &Rc::new(vec!["derive".to_string()])), emit_cargo_dep("lazy_static".to_string(), "1".to_string(), &Rc::new(vec![]))]); +let async_deps = if has_services { + Rc::new(vec![emit_cargo_dep("tokio".to_string(), "1".to_string(), &Rc::new(vec!["full".to_string()])), emit_cargo_dep("reqwest".to_string(), "0.12".to_string(), &Rc::new(vec!["json".to_string()])), emit_cargo_dep("async-trait".to_string(), "0.1".to_string(), &Rc::new(vec![]))]) } else { Rc::new(vec![]) }; - let all_deps = v2_rt::concat(base_deps, async_deps); - Rc::new(TextFile { - path: "Cargo.toml".to_string(), - content: v2_rt::concat( - v2_rt::concat( - v2_rt::concat(header, workspace), - "\n[dependencies]\n".to_string(), - ), - all_deps.join(&"".to_string()), - ), - }) - } +let all_deps = v2_rt::concat(base_deps, async_deps); +Rc::new(TextFile { + path: "Cargo.toml".to_string(), + content: v2_rt::concat(v2_rt::concat(v2_rt::concat(header, workspace), "\n[dependencies]\n".to_string()), all_deps.join(&"".to_string())), +}) +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -14969,125 +6287,79 @@ pub struct WorkflowFunc { pub uses: Rc>>, pub service_names: Rc>, pub resolved_defaults: Rc>, - pub read_only_params: Rc>, + pub read_only_params: Rc>, pub source_indices: Rc>>, } pub fn extract_literal_string(expr: Rc) -> Option { match (*expr.expr_data.clone()).clone() { - ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitStr { value: s, .. } => Some(s.clone()), - LiteralValue::LitBool { value: b, .. } => Some(if b.clone() { - "true".to_string() - } else { - "false".to_string() - }), - _ => None, - }, - _ => None, - } + ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitStr { value: s, .. } => Some(s.clone()), + LiteralValue::LitBool { value: b, .. } => Some(if b.clone() { + "true".to_string() + } else { + "false".to_string() + }), + _ => None, +}, + _ => None, +} } -pub fn resolve_param_default( - param: Rc, - registry: Rc>>, - module_items: Rc>>, - source_indices: &Rc>>, -) -> Option { +pub fn resolve_param_default(param: Rc, registry: Rc>>, module_items: Rc>>, source_indices: &Rc>>) -> Option { match param_node_default_value(¶m) { - Some(dv) => match (*dv.expr_data.clone()).clone() { - ExprData::ExprLiteral { .. } => extract_literal_string(dv.clone()), - ExprData::ExprVar { .. } => { - match lookup_item(registry, authored_name_at(source_indices.clone(), &dv)) { - Some(info) => match info.kind.clone() { - ItemKind::DataItem => match Rc::new({ - let mut __result = Vec::new(); - for i in module_items.iter().cloned() { - if (authored_name_at(source_indices.clone(), &i).as_str() - == authored_name_at(source_indices.clone(), &dv).as_str()) - { - __result.push(i); - } - } - __result - }) - .first() - .cloned() - { - Some(data_item) => match data_item.body.clone() { - Some(body) => extract_literal_string(body.clone()), - None => None, - }, - None => None, - }, - _ => None, - }, - None => None, - } - } - _ => None, - }, - None => None, - } + Some(dv) => match (*dv.expr_data.clone()).clone() { + ExprData::ExprLiteral { .. } => extract_literal_string(dv.clone()), + ExprData::ExprVar { .. } => match lookup_item(registry, authored_name_at(source_indices.clone(), &dv)) { + Some(info) => match info.kind.clone() { + ItemKind::DataItem => match Rc::new({ let mut __result = Vec::new(); for i in module_items.iter().cloned() { if (authored_name_at(source_indices.clone(), &i).as_str() == authored_name_at(source_indices.clone(), &dv).as_str()) { __result.push(i); } } __result }).first().cloned() { + Some(data_item) => match data_item.body.clone() { + Some(body) => extract_literal_string(body.clone()), + None => None, +}, + None => None, +}, + _ => None, +}, + None => None, +}, + _ => None, +}, + None => None, +} } -pub fn to_workflow_func( - item: &Rc, - module_name: &String, - registry: &Rc>>, - module_items: Rc>>, - source_indices: &Rc>>, - read_only_params_index: Rc>>>, -) -> Rc { +pub fn to_workflow_func(item: &Rc, module_name: &String, registry: &Rc>>, module_items: Rc>>, source_indices: &Rc>>, read_only_params_index: Rc>>>) -> Rc { { let item_name = authored_name_at(source_indices.clone(), &item); - let svc_names = match lookup_item(registry.clone(), item_name.clone()) { - Some(info) => info.service_names.clone(), - None => Rc::new(vec![]), - }; - let defaults = item.params.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, p: Rc| match resolve_param_default( - p.clone(), - registry.clone(), - module_items.clone(), - &source_indices, - ) { - Some(lit) => v2_rt::rc_map_insert( - acc.clone(), - param_node_name_at(p.clone(), source_indices.clone()), - lit.clone(), - ), - None => acc.clone(), - }, - ); - let qualified = v2_rt::concat( - v2_rt::concat(module_name.clone(), ".".to_string()), - item_name.clone(), - ); - let ro_params = match v2_rt::map_get(&read_only_params_index, qualified) { - Some(m) => m.clone(), - None => v2_rt::rc_empty_map::(), - }; - Rc::new(WorkflowFunc { - name: item_name.clone(), - module_name: module_name.clone(), - params: item.params.clone(), - inferred: resolved_type(item.clone()), - uses: item.uses.clone(), - service_names: svc_names, - resolved_defaults: defaults, - read_only_params: ro_params, - source_indices: source_indices.clone(), - }) - } +let svc_names = match lookup_item(registry.clone(), item_name.clone()) { + Some(info) => info.service_names.clone(), + None => Rc::new(vec![]), +}; +let defaults = item.params.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, p: Rc| match resolve_param_default(p.clone(), registry.clone(), module_items.clone(), &source_indices) { + Some(lit) => v2_rt::rc_map_insert(acc.clone(), param_node_name_at(p.clone(), source_indices.clone()), lit.clone()), + None => acc.clone(), +}); +let qualified = v2_rt::concat(v2_rt::concat(module_name.clone(), ".".to_string()), item_name.clone()); +let ro_params = match v2_rt::map_get(&read_only_params_index, qualified) { + Some(m) => m.clone(), + None => empty_set(), +}; +Rc::new(WorkflowFunc { + name: item_name.clone(), + module_name: module_name.clone(), + params: item.params.clone(), + inferred: resolved_type(item.clone()), + uses: item.uses.clone(), + service_names: svc_names, + resolved_defaults: defaults, + read_only_params: ro_params, + source_indices: source_indices.clone(), +}) +} } -pub fn is_workflow_item( - item: &Rc, - registry: Rc>>, - source_indices: Rc>>, -) -> bool { +pub fn is_workflow_item(item: &Rc, registry: Rc>>, source_indices: Rc>>) -> bool { if (item.body.clone() == None) { false } else { @@ -15095,89 +6367,36 @@ pub fn is_workflow_item( true } else { match lookup_item(registry, authored_name_at(source_indices, &item)) { - Some(info) => { - (((info.service_names.clone().len() as i64) > 0) - || ((info.resource_names.clone().len() as i64) > 0)) - } - None => true, - } + Some(info) => (((info.service_names.clone().len() as i64) > 0) || ((info.resource_names.clone().len() as i64) > 0)), + None => true, +} } } } -pub fn collect_workflow_funcs( - modules: Rc>>, - registry: Rc>>, - read_only_params_index: Rc>>>, -) -> Rc>> { - Rc::new({ - let mut __result = Vec::new(); - for tm in modules.iter().cloned() { - __result.extend( - (*Rc::new({ - let mut __result = Vec::new(); - for item in Rc::new({ - let mut __result = Vec::new(); - for item in tm.items.clone().iter().cloned() { - if is_workflow_item( - &item, - registry.clone(), - tm.type_env.clone().source_indices.clone(), - ) { - __result.push(item); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(to_workflow_func( - &item, - &authored_name_at( - tm.type_env.clone().source_indices.clone(), - &tm.module.clone(), - ), - ®istry, - tm.items.clone(), - &tm.type_env.clone().source_indices.clone(), - read_only_params_index.clone(), - )); - } - __result - })) - .iter() - .cloned(), - ); - } - __result - }) +pub fn collect_workflow_funcs(modules: Rc>>, registry: Rc>>, read_only_params_index: Rc>>>) -> Rc>> { + Rc::new({ let mut __result = Vec::new(); for tm in modules.iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for item in Rc::new({ let mut __result = Vec::new(); for item in tm.items.clone().iter().cloned() { if is_workflow_item(&item, registry.clone(), tm.type_env.clone().source_indices.clone()) { __result.push(item); } } __result }).iter().cloned() { __result.push(to_workflow_func(&item, &authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone()), ®istry, tm.items.clone(), &tm.type_env.clone().source_indices.clone(), read_only_params_index.clone())); } __result })).iter().cloned()); } __result }) } pub fn cli_default_literal_value(expr: Rc) -> Option { match (*expr.expr_data.clone()).clone() { - ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitStr { value: s, .. } => Some(s.clone()), - LiteralValue::LitInt { value: i, .. } => Some((i.clone()).to_string()), - LiteralValue::LitFloat { value: f, .. } => Some(f.clone()), - LiteralValue::LitBool { value: b, .. } => Some(if b.clone() { - emit_keyword("true".to_string(), RenderTarget::Rust) - } else { - emit_keyword("false".to_string(), RenderTarget::Rust) - }), - LiteralValue::LitNull => None, - }, - _ => None, - } + ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitStr { value: s, .. } => Some(s.clone()), + LiteralValue::LitInt { value: i, .. } => Some((i.clone()).to_string()), + LiteralValue::LitFloat { value: f, .. } => Some(f.clone()), + LiteralValue::LitBool { value: b, .. } => Some(if b.clone() { + emit_keyword("true".to_string(), RenderTarget::Rust) + } else { + emit_keyword("false".to_string(), RenderTarget::Rust) + }), + LiteralValue::LitNull => None, +}, + _ => None, +} } -pub fn validate_workflow_param_defaults( - workflow_funcs: Rc>>, -) -> Rc>> { - Rc::new({ - let mut __result = Vec::new(); - for wf in workflow_funcs.iter().cloned() { - __result.extend((*Rc::new({ let mut __result = Vec::new(); for param in wf.params.clone().iter().cloned() { __result.extend((*match param_node_default_value(¶m) { +pub fn validate_workflow_param_defaults(workflow_funcs: Rc>>) -> Rc>> { + Rc::new({ let mut __result = Vec::new(); for wf in workflow_funcs.iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for param in wf.params.clone().iter().cloned() { __result.extend((*match param_node_default_value(¶m) { Some(dv) => { let param_name = authored_name_at(wf.source_indices.clone(), ¶m); let resolved = match v2_rt::map_get(&wf.resolved_defaults.clone(), param_name.clone()) { @@ -15197,617 +6416,257 @@ if resolved.clone() { } }, None => Rc::new(vec![]), -}).iter().cloned()); } __result })).iter().cloned()); - } - __result - }) +}).iter().cloned()); } __result })).iter().cloned()); } __result }) } pub fn find_resource_module(resource_name: String, modules: Rc>>) -> String { { - let matching = Rc::new({ - let mut __result = Vec::new(); - for m in modules.iter().cloned() { - if { - let mut __found = false; - for item in m.items.clone().iter().cloned() { - if (authored_name_at(m.type_env.clone().source_indices.clone(), &item) - .as_str() - == resource_name.clone().as_str()) - { - __found = true; - break; - } - } - __found - } { - __result.push(m); - } - } - __result - }); - let result = match matching.first().cloned() { - Some(tm) => module_to_filename(authored_name_at( - tm.type_env.clone().source_indices.clone(), - &tm.module.clone(), - )), - None => "".to_string(), - }; - result - } + let matching = Rc::new({ let mut __result = Vec::new(); for m in modules.iter().cloned() { if { let mut __found = false; for item in m.items.clone().iter().cloned() { if (authored_name_at(m.type_env.clone().source_indices.clone(), &item).as_str() == resource_name.clone().as_str()) { __found = true; break; } } __found } { __result.push(m); } } __result }); +let result = match matching.first().cloned() { + Some(tm) => module_to_filename(authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone())), + None => "".to_string(), +}; +result +} } -pub fn emit_main_rs( - workflow_funcs: &Rc>>, - modules: &Rc>>, - has_services: &bool, - crate_name: &String, - svc_module_map: Rc>, -) -> Rc { - { - let has_pipeline = { - let mut __found = false; - for m in modules.clone().iter().cloned() { - if (authored_name_at(m.type_env.clone().source_indices.clone(), &m.module.clone()) - .as_str() - == "v2.compiler.compile".to_string().as_str()) - { - __found = true; - break; - } - } - __found - }; - let resource_type_names = Rc::new({ - let mut __result = Vec::new(); - for wf in workflow_funcs.clone().iter().cloned() { - __result.extend( - (*Rc::new({ - let mut __result = Vec::new(); - for u in wf.uses.clone().iter().cloned() { - __result.push(authored_name_at( - wf.source_indices.clone(), - &resource_use_resource(&u), - )); - } - __result - })) - .iter() - .cloned(), - ); - } - __result - }); - let unique_resource_types = unique_strings(resource_type_names); - let resource_imports = Rc::new({ - let mut __result = Vec::new(); - for rname in unique_resource_types.iter().cloned() { - __result.extend( - (*{ - let mod_name = find_resource_module(rname.clone(), modules.clone()); - if (mod_name.clone().as_str() != "".to_string().as_str()) { - Rc::new(vec![v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "use ".to_string(), - crate_name.clone(), - ), - "::".to_string(), - ), - mod_name.clone(), - ), - "::".to_string(), - ), - rname.clone(), - ), - ";".to_string(), - )]) - } else { - Rc::new(vec![]) - } - }) - .iter() - .cloned(), - ); - } - __result - }); - let resource_imports_str = resource_imports.join(&"\n".to_string()); - let all_svc_names = Rc::new({ - let mut __result = Vec::new(); - for wf in workflow_funcs.clone().iter().cloned() { - __result.extend((*wf.service_names.clone()).iter().cloned()); - } - __result - }); - let unique_svc_names = unique_strings(all_svc_names); - let svc_imports = Rc::new({ - let mut __result = Vec::new(); - for sn in unique_svc_names.iter().cloned() { - __result.extend( - (*{ - let struct_name = sanitize_service_name(sn.clone()); - match v2_rt::map_get(&svc_module_map, sn.clone()) { - Some(mod_name) => Rc::new(vec![v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "use ".to_string(), - crate_name.clone(), - ), - "::".to_string(), - ), - mod_name.clone(), - ), - "::".to_string(), - ), - struct_name.clone(), - ), - ";".to_string(), - )]), - None => Rc::new(vec![]), - } - }) - .iter() - .cloned(), - ); - } - __result - }); - let svc_imports_str = svc_imports.join(&"\n".to_string()); - let header = v2_rt::concat( - v2_rt::concat( - "// Generated by v2 compiler -- do not edit.\n\n".to_string(), - "#![allow(unused_parens, clippy::all, clippy::disallowed_macros)]\n\n".to_string(), - ), - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("use clap::".to_string(), "{".to_string()), - "Parser, Subcommand".to_string(), - ), - "}".to_string(), - ), - ";\n".to_string(), - ), - ); - let crate_use = if has_services.clone() { - v2_rt::concat( - v2_rt::concat("use ".to_string(), crate_name.clone()), - "::dry_run::DryRunMode;\n".to_string(), - ) +pub fn emit_main_rs(workflow_funcs: &Rc>>, modules: &Rc>>, has_services: &bool, crate_name: &String, svc_module_map: Rc>) -> Rc { + { + let has_pipeline = { let mut __found = false; for m in modules.clone().iter().cloned() { if (authored_name_at(m.type_env.clone().source_indices.clone(), &m.module.clone()).as_str() == "v2.compiler.compile".to_string().as_str()) { __found = true; break; } } __found }; +let resource_type_names = Rc::new({ let mut __result = Vec::new(); for wf in workflow_funcs.clone().iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for u in wf.uses.clone().iter().cloned() { __result.push(authored_name_at(wf.source_indices.clone(), &resource_use_resource(&u))); } __result })).iter().cloned()); } __result }); +let unique_resource_types = unique_strings(resource_type_names); +let resource_imports = Rc::new({ let mut __result = Vec::new(); for rname in unique_resource_types.iter().cloned() { __result.extend((*{ + let mod_name = find_resource_module(rname.clone(), modules.clone()); +if (mod_name.clone().as_str() != "".to_string().as_str()) { + Rc::new(vec![v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("use ".to_string(), crate_name.clone()), "::".to_string()), mod_name.clone()), "::".to_string()), rname.clone()), ";".to_string())]) + } else { + Rc::new(vec![]) + } +}).iter().cloned()); } __result }); +let resource_imports_str = resource_imports.join(&"\n".to_string()); +let all_svc_names = Rc::new({ let mut __result = Vec::new(); for wf in workflow_funcs.clone().iter().cloned() { __result.extend((*wf.service_names.clone()).iter().cloned()); } __result }); +let unique_svc_names = unique_strings(all_svc_names); +let svc_imports = Rc::new({ let mut __result = Vec::new(); for sn in unique_svc_names.iter().cloned() { __result.extend((*{ + let struct_name = sanitize_service_name(sn.clone()); +match v2_rt::map_get(&svc_module_map, sn.clone()) { + Some(mod_name) => Rc::new(vec![v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("use ".to_string(), crate_name.clone()), "::".to_string()), mod_name.clone()), "::".to_string()), struct_name.clone()), ";".to_string())]), + None => Rc::new(vec![]), +} +}).iter().cloned()); } __result }); +let svc_imports_str = svc_imports.join(&"\n".to_string()); +let header = v2_rt::concat(v2_rt::concat("// Generated by v2 compiler -- do not edit.\n\n".to_string(), "#![allow(unused_parens, clippy::all, clippy::disallowed_macros)]\n\n".to_string()), v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("use clap::".to_string(), "{".to_string()), "Parser, Subcommand".to_string()), "}".to_string()), ";\n".to_string())); +let crate_use = if has_services.clone() { + v2_rt::concat(v2_rt::concat("use ".to_string(), crate_name.clone()), "::dry_run::DryRunMode;\n".to_string()) } else { "".to_string() }; - let resource_use = if (resource_imports_str.clone().as_str() != "".to_string().as_str()) { +let resource_use = if (resource_imports_str.clone().as_str() != "".to_string().as_str()) { v2_rt::concat(resource_imports_str.clone(), "\n".to_string()) } else { "".to_string() }; - let svc_use = if (svc_imports_str.clone().as_str() != "".to_string().as_str()) { +let svc_use = if (svc_imports_str.clone().as_str() != "".to_string().as_str()) { v2_rt::concat(svc_imports_str.clone(), "\n".to_string()) } else { "".to_string() }; - let mod_uses = - emit_main_mod_uses(workflow_funcs.clone(), has_pipeline.clone(), &crate_name); - let cli_struct = emit_cli_struct(workflow_funcs.clone()); - let subcommand_enum = emit_subcommand_enum(workflow_funcs.clone(), &has_pipeline); - let pipeline_fns = if has_pipeline.clone() { +let mod_uses = emit_main_mod_uses(workflow_funcs.clone(), has_pipeline.clone(), &crate_name); +let cli_struct = emit_cli_struct(workflow_funcs.clone()); +let subcommand_enum = emit_subcommand_enum(workflow_funcs.clone(), &has_pipeline); +let pipeline_fns = if has_pipeline.clone() { emit_main_pipeline_fns(crate_name.clone()) } else { "".to_string() }; - let main_fn = emit_main_fn( - workflow_funcs.clone(), - &has_services, - &has_pipeline, - &crate_name, - ); - let diagnostic_fns = if has_pipeline.clone() { +let main_fn = emit_main_fn(workflow_funcs.clone(), &has_services, &has_pipeline, &crate_name); +let diagnostic_fns = if has_pipeline.clone() { emit_main_diagnostic_fns(crate_name.clone()) } else { "".to_string() }; - let content = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(header, crate_use), - resource_use, - ), - svc_use, - ), - mod_uses, - ), - "\n".to_string(), - ), - cli_struct, - ), - "\n\n".to_string(), - ), - subcommand_enum, - ), - "\n\n".to_string(), - ), - pipeline_fns, - ), - main_fn, - ), - "\n".to_string(), - ), - diagnostic_fns, - ); - Rc::new(TextFile { - path: v2_rt::concat( - v2_rt::concat(rust_source_root(), "main".to_string()), - rust_source_ext(), - ), - content: content, - }) - } +let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(header, crate_use), resource_use), svc_use), mod_uses), "\n".to_string()), cli_struct), "\n\n".to_string()), subcommand_enum), "\n\n".to_string()), pipeline_fns), main_fn), "\n".to_string()), diagnostic_fns); +Rc::new(TextFile { + path: v2_rt::concat(v2_rt::concat(rust_source_root(), "main".to_string()), rust_source_ext()), + content: content, +}) +} } -pub fn emit_main_mod_uses( - workflow_funcs: Rc>>, - has_pipeline: bool, - crate_name: &String, -) -> String { +pub fn emit_main_mod_uses(workflow_funcs: Rc>>, has_pipeline: bool, crate_name: &String) -> String { { - let mod_names = Rc::new({ - let mut __result = Vec::new(); - for wf in workflow_funcs.iter().cloned() { - __result.push(module_to_filename(wf.module_name.clone())); - } - __result - }); - let unique_mods = unique_strings(mod_names); - let use_lines = Rc::new({ - let mut __result = Vec::new(); - for m in unique_mods.iter().cloned() { - __result.push(v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("use ".to_string(), crate_name.clone()), - "::".to_string(), - ), - m.clone(), - ), - ";".to_string(), - )); - } - __result - }); - let base = use_lines.join(&"\n".to_string()); - if has_pipeline { + let mod_names = Rc::new({ let mut __result = Vec::new(); for wf in workflow_funcs.iter().cloned() { __result.push(module_to_filename(wf.module_name.clone())); } __result }); +let unique_mods = unique_strings(mod_names); +let use_lines = Rc::new({ let mut __result = Vec::new(); for m in unique_mods.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("use ".to_string(), crate_name.clone()), "::".to_string()), m.clone()), ";".to_string())); } __result }); +let base = use_lines.join(&"\n".to_string()); +if has_pipeline { { let pipeline_mod = module_to_filename("v2.compiler.compile".to_string()); - let artifact_mod = module_to_filename("v2.compiler.artifact".to_string()); - let core_mod = module_to_filename("v2.std.core".to_string()); - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(base, "\nuse std::collections::HashMap;\n".to_string()), "use std::rc::Rc;\n".to_string()), "use ".to_string()), crate_name.clone()), "::".to_string()), pipeline_mod.clone()), ";\n".to_string()), "use ".to_string()), crate_name.clone()), "::".to_string()), pipeline_mod.clone()), "::PipelineResult;\n".to_string()), "use ".to_string()), crate_name.clone()), "::".to_string()), artifact_mod), ";\n".to_string()), "use ".to_string()), crate_name.clone()), "::".to_string()), core_mod), "::".to_string()), "{".to_string()), "\n diagnostic_to_message, diagnostic_to_span,\n".to_string()), " byte_to_line_col, source_line_at, NewlineIndex,\n".to_string()), " CompilerDiagnostic,\n".to_string()), "}".to_string()), ";\n".to_string()), "use ".to_string()), crate_name.clone()), "::cli_run;\n".to_string()) - } +let artifact_mod = module_to_filename("v2.compiler.artifact".to_string()); +let core_mod = module_to_filename("v2.std.core".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(base, "\nuse std::collections::HashMap;\n".to_string()), "use std::rc::Rc;\n".to_string()), "use ".to_string()), crate_name.clone()), "::".to_string()), pipeline_mod.clone()), ";\n".to_string()), "use ".to_string()), crate_name.clone()), "::".to_string()), pipeline_mod.clone()), "::PipelineResult;\n".to_string()), "use ".to_string()), crate_name.clone()), "::".to_string()), artifact_mod), ";\n".to_string()), "use ".to_string()), crate_name.clone()), "::".to_string()), core_mod), "::".to_string()), "{".to_string()), "\n diagnostic_to_message, diagnostic_to_span,\n".to_string()), " byte_to_line_col, source_line_at, NewlineIndex,\n".to_string()), " CompilerDiagnostic,\n".to_string()), "}".to_string()), ";\n".to_string()), "use ".to_string()), crate_name.clone()), "::cli_run;\n".to_string()) +} } else { base } - } +} } pub fn emit_cli_struct(workflow_funcs: Rc>>) -> String { v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("#[derive(Parser)]\n".to_string(), "#[command(name = \"v2-compiled\", about = \"Generated CLI from DAG compiler\")]\n".to_string()), "struct Cli {\n".to_string()), " #[command(subcommand)]\n".to_string()), " command: Commands,\n".to_string()), " /// Run in dry-run mode (mock all service calls)\n".to_string()), " #[arg(long, global = true)]\n".to_string()), " dry_run: bool,\n".to_string()), "}".to_string()) } -pub fn emit_subcommand_enum( - workflow_funcs: Rc>>, - has_pipeline: &bool, -) -> String { +pub fn emit_subcommand_enum(workflow_funcs: Rc>>, has_pipeline: &bool) -> String { { let depth = 0; - let variants = Rc::new({ - let mut __result = Vec::new(); - for wf in workflow_funcs.iter().cloned() { - __result.push(emit_subcommand_variant(&wf, (depth.clone() + 1))); - } - __result - }); - let compile_variant = if has_pipeline.clone() { +let variants = Rc::new({ let mut __result = Vec::new(); for wf in workflow_funcs.iter().cloned() { __result.push(emit_subcommand_variant(&wf, (depth.clone() + 1))); } __result }); +let compile_variant = if has_pipeline.clone() { v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("/// Compile .dag source files to a target language\n".to_string(), make_indent((depth.clone() + 1))), "Compile {\n".to_string()), make_indent((depth.clone() + 2))), "/// Source root directories (searched recursively for .dag files).\n".to_string()), make_indent((depth.clone() + 2))), "/// Module imports are resolved transitively from these roots.\n".to_string()), make_indent((depth.clone() + 2))), "#[arg(long = \"source-root\")]\n".to_string()), make_indent((depth.clone() + 2))), "source_roots: Vec,\n".to_string()), make_indent((depth.clone() + 2))), "/// Legacy: single source directory (all .dag files loaded, no import resolution)\n".to_string()), make_indent((depth.clone() + 2))), "#[arg(long = \"source-dir\")]\n".to_string()), make_indent((depth.clone() + 2))), "source_dir: Option,\n".to_string()), make_indent((depth.clone() + 2))), "#[arg(long)]\n".to_string()), make_indent((depth.clone() + 2))), "output_dir: String,\n".to_string()), make_indent((depth.clone() + 2))), "/// Target language: rust, python, go, dag\n".to_string()), make_indent((depth.clone() + 2))), "#[arg(long, default_value = \"rust\")]\n".to_string()), make_indent((depth.clone() + 2))), "target: String,\n".to_string()), make_indent((depth.clone() + 1))), "},".to_string()) } else { "".to_string() }; - let run_variant = if has_pipeline.clone() { +let run_variant = if has_pipeline.clone() { v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("/// Execute a .dag program directly (interpreter)\n".to_string(), make_indent((depth.clone() + 1))), "Run {\n".to_string()), make_indent((depth.clone() + 2))), "/// Source root directories (searched recursively for .dag files)\n".to_string()), make_indent((depth.clone() + 2))), "#[arg(long = \"source-root\")]\n".to_string()), make_indent((depth.clone() + 2))), "source_roots: Vec,\n".to_string()), make_indent((depth.clone() + 2))), "/// Entry function to execute (default: \"main\")\n".to_string()), make_indent((depth.clone() + 2))), "#[arg(long, default_value = \"main\")]\n".to_string()), make_indent((depth.clone() + 2))), "function: String,\n".to_string()), make_indent((depth.clone() + 1))), "},".to_string()) } else { "".to_string() }; - let all_variants = if has_pipeline.clone() { +let all_variants = if has_pipeline.clone() { v2_rt::concat(variants, Rc::new(vec![compile_variant, run_variant])) } else { variants }; - let variants_str = all_variants.join(&"\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "#[derive(Subcommand)]\n".to_string(), - "enum Commands {\n".to_string(), - ), - make_indent((depth.clone() + 1)), - ), - variants_str, - ), - "\n".to_string(), - ), - "}".to_string(), - ) - } +let variants_str = all_variants.join(&"\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("#[derive(Subcommand)]\n".to_string(), "enum Commands {\n".to_string()), make_indent((depth.clone() + 1))), variants_str), "\n".to_string()), "}".to_string()) +} } pub fn emit_subcommand_variant(wf: &Rc, depth: i64) -> String { { let variant_name = to_pascal(wf.name.clone()); - let doc_line = v2_rt::concat( - v2_rt::concat("/// Run the ".to_string(), wf.name.clone()), - " workflow".to_string(), - ); - if ((wf.params.clone().len() as i64) == 0) { - v2_rt::concat( - v2_rt::concat(v2_rt::concat(doc_line, "\n".to_string()), variant_name), - ",".to_string(), - ) +let doc_line = v2_rt::concat(v2_rt::concat("/// Run the ".to_string(), wf.name.clone()), " workflow".to_string()); +if ((wf.params.clone().len() as i64) == 0) { + v2_rt::concat(v2_rt::concat(v2_rt::concat(doc_line, "\n".to_string()), variant_name), ",".to_string()) } else { { - let fields = Rc::new({ - let mut __result = Vec::new(); - for p in wf.params.clone().iter().cloned() { - __result.push(emit_subcommand_field( - &p, - &wf.source_indices.clone(), - wf.resolved_defaults.clone(), - )); - } - __result - }); - let fields_str = fields.join(&"\n".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(doc_line, "\n".to_string()), - variant_name, - ), - " {\n".to_string(), - ), - make_indent((depth + 1)), - ), - fields_str, - ), - "\n".to_string(), - ), - "},".to_string(), - ) - } + let fields = Rc::new({ let mut __result = Vec::new(); for p in wf.params.clone().iter().cloned() { __result.push(emit_subcommand_field(&p, &wf.source_indices.clone(), wf.resolved_defaults.clone())); } __result }); +let fields_str = fields.join(&"\n".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(doc_line, "\n".to_string()), variant_name), " {\n".to_string()), make_indent((depth + 1))), fields_str), "\n".to_string()), "},".to_string()) +} } - } +} } -pub fn emit_subcommand_field( - param: &Rc, - source_indices: &Rc>>, - resolved_defaults: Rc>, -) -> String { - { - let field_name = emit_ident( - param_node_name_at(param.clone(), source_indices.clone()), - RenderTarget::Rust, - ); - let param_name = param_node_name_at(param.clone(), source_indices.clone()); - let field_type = - emit_cli_param_type_node(¶m_node_type_expr(¶m), source_indices.clone()); - let default_attr = match v2_rt::map_get(&resolved_defaults, param_name) { - Some(resolved) => v2_rt::concat( - v2_rt::concat( - "#[arg(long, default_value = \"".to_string(), - resolved.clone(), - ), - "\")]\n".to_string(), - ), - None => match param_node_default_value(¶m) { - Some(dv) => match cli_default_literal_value(dv.clone()) { - Some(default_value) => v2_rt::concat( - v2_rt::concat( - "#[arg(long, default_value = \"".to_string(), - default_value.clone(), - ), - "\")]\n".to_string(), - ), - None => "#[arg(long)]\n".to_string(), - }, - None => "#[arg(long)]\n".to_string(), - }, - }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(v2_rt::concat(default_attr, field_name), ": ".to_string()), - field_type, - ), - ",".to_string(), - ) - } +pub fn emit_subcommand_field(param: &Rc, source_indices: &Rc>>, resolved_defaults: Rc>) -> String { + { + let field_name = emit_ident(param_node_name_at(param.clone(), source_indices.clone()), RenderTarget::Rust); +let param_name = param_node_name_at(param.clone(), source_indices.clone()); +let field_type = emit_cli_param_type_node(¶m_node_type_expr(¶m), source_indices.clone()); +let default_attr = match v2_rt::map_get(&resolved_defaults, param_name) { + Some(resolved) => v2_rt::concat(v2_rt::concat("#[arg(long, default_value = \"".to_string(), resolved.clone()), "\")]\n".to_string()), + None => match param_node_default_value(¶m) { + Some(dv) => match cli_default_literal_value(dv.clone()) { + Some(default_value) => v2_rt::concat(v2_rt::concat("#[arg(long, default_value = \"".to_string(), default_value.clone()), "\")]\n".to_string()), + None => "#[arg(long)]\n".to_string(), +}, + None => "#[arg(long)]\n".to_string(), +}, +}; +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(default_attr, field_name), ": ".to_string()), field_type), ",".to_string()) +} } -pub fn emit_cli_param_type_node( - n: &Rc, - source_indices: Rc>>, -) -> String { +pub fn emit_cli_param_type_node(n: &Rc, source_indices: Rc>>) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); - let has_structure = (n.connective.clone() != Connective::NoConnective); - if is_optional { - v2_rt::concat( - v2_rt::concat( - "Option<".to_string(), - emit_cli_param_type_node(&with_required_cardinality(&n), source_indices), - ), - ">".to_string(), - ) - } else { - if has_structure { - "String".to_string() + { + let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); +let has_structure = (n.connective.clone() != Connective::NoConnective); +if is_optional { + v2_rt::concat(v2_rt::concat("Option<".to_string(), emit_cli_param_type_node(&with_required_cardinality(&n), source_indices)), ">".to_string()) } else { - if ((n.children.clone().len() as i64) == 0) { - { - let nname = authored_name_at(source_indices, &n); - let mapped = coerce_primitive_type(RenderTarget::Rust, nname.clone()); - if (mapped.clone().as_str() != nname.clone().as_str()) { - mapped.clone() - } else { - "String".to_string() - } - } - } else { + if has_structure { "String".to_string() + } else { + if ((n.children.clone().len() as i64) == 0) { + { + let nname = authored_name_at(source_indices, &n); +let mapped = coerce_primitive_type(RenderTarget::Rust, nname.clone()); +if (mapped.clone().as_str() != nname.clone().as_str()) { + mapped.clone() + } else { + "String".to_string() + } +} + } else { + "String".to_string() + } } } - } +} }) } -pub fn emit_main_fn( - workflow_funcs: Rc>>, - has_services: &bool, - has_pipeline: &bool, - crate_name: &String, -) -> String { +pub fn emit_main_fn(workflow_funcs: Rc>>, has_services: &bool, has_pipeline: &bool, crate_name: &String) -> String { { let depth = 0; - let async_attr = if has_services.clone() { +let async_attr = if has_services.clone() { "#[tokio::main]\nasync fn main() ".to_string() } else { "fn main() ".to_string() }; - let parse_line = "let cli = Cli::parse();".to_string(); - let dry_run_line = if has_services.clone() { +let parse_line = "let cli = Cli::parse();".to_string(); +let dry_run_line = if has_services.clone() { "let dry_run = DryRunMode(cli.dry_run);".to_string() } else { "".to_string() }; - let match_arms = Rc::new({ - let mut __result = Vec::new(); - for wf in workflow_funcs.iter().cloned() { - __result.push(emit_main_match_arm(&wf, &has_services)); - } - __result - }); - let compile_arm = if has_pipeline.clone() { +let match_arms = Rc::new({ let mut __result = Vec::new(); for wf in workflow_funcs.iter().cloned() { __result.push(emit_main_match_arm(&wf, &has_services)); } __result }); +let compile_arm = if has_pipeline.clone() { emit_compile_match_arm(crate_name.clone()) } else { "".to_string() }; - let run_arm = if has_pipeline.clone() { +let run_arm = if has_pipeline.clone() { emit_run_match_arm(crate_name.clone()) } else { "".to_string() }; - let all_arms = if has_pipeline.clone() { +let all_arms = if has_pipeline.clone() { v2_rt::concat(match_arms, Rc::new(vec![compile_arm, run_arm])) } else { match_arms }; - let arms_str = all_arms.join(&"\n".to_string()); - let match_block = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "match cli.command {\n".to_string(), - make_indent((depth.clone() + 2)), - ), - arms_str, - ), - "\n }".to_string(), - ); - let result_handling = if has_services.clone() { +let arms_str = all_arms.join(&"\n".to_string()); +let match_block = v2_rt::concat(v2_rt::concat(v2_rt::concat("match cli.command {\n".to_string(), make_indent((depth.clone() + 2))), arms_str), "\n }".to_string()); +let result_handling = if has_services.clone() { match_block } else { - v2_rt::concat( - v2_rt::concat("let _result = ".to_string(), match_block), - ";".to_string(), - ) + v2_rt::concat(v2_rt::concat("let _result = ".to_string(), match_block), ";".to_string()) }; - let body_lines = if (dry_run_line.clone().as_str() == "".to_string().as_str()) { +let body_lines = if (dry_run_line.clone().as_str() == "".to_string().as_str()) { v2_rt::concat(v2_rt::concat(parse_line, "\n".to_string()), result_handling) } else { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(parse_line, "\n".to_string()), - dry_run_line.clone(), - ), - "\n".to_string(), - ), - result_handling, - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(parse_line, "\n".to_string()), dry_run_line.clone()), "\n".to_string()), result_handling) }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(async_attr, "{\n".to_string()), - make_indent((depth.clone() + 1)), - ), - body_lines, - ), - "\n}".to_string(), - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(async_attr, "{\n".to_string()), make_indent((depth.clone() + 1))), body_lines), "\n}".to_string()) +} } pub fn emit_compile_match_arm(crate_name: String) -> String { { let pipeline_mod = module_to_filename("v2.compiler.compile".to_string()); - let artifact_mod = module_to_filename("v2.compiler.artifact".to_string()); - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("Commands::Compile { source_roots, source_dir, output_dir, target } => {\n".to_string(), " let render_target = match target.as_str() {\n".to_string()), " \"rust\" => ".to_string()), artifact_mod.clone()), "::RenderTarget::Rust,\n".to_string()), " \"python\" => ".to_string()), artifact_mod.clone()), "::RenderTarget::Python,\n".to_string()), " \"go\" => ".to_string()), artifact_mod.clone()), "::RenderTarget::Go,\n".to_string()), " \"dag\" => ".to_string()), artifact_mod.clone()), "::RenderTarget::Dag,\n".to_string()), " other => {\n".to_string()), " eprintln!(\"unknown target: {}. supported: rust, python, go, dag\", other);\n".to_string()), " std::process::exit(1);\n".to_string()), " }\n".to_string()), " };\n".to_string()), "\n".to_string()), " let sources = if !source_roots.is_empty() {\n".to_string()), " // FF-9: Import-driven resolution from source roots\n".to_string()), " let index = build_module_index(&source_roots);\n".to_string()), " eprintln!(\"indexed {} modules from {} source roots\", index.len(), source_roots.len());\n".to_string()), "\n".to_string()), " // Entry modules: all .dag files in the FIRST source root.\n".to_string()), " // Additional roots are dependency pools resolved via imports.\n".to_string()), " // This is intentional: --source-root src/v2 --source-root dsl\n".to_string()), " // means 'compile src/v2, using dsl as a dependency pool.'\n".to_string()), " let first_root = std::path::Path::new(&source_roots[0]);\n".to_string()), " let mut entry_files = Vec::new();\n".to_string()), " if first_root.is_dir() {\n".to_string()), " let mut dag_paths = Vec::new();\n".to_string()), " collect_dag_files(first_root, &mut dag_paths);\n".to_string()), " for path in dag_paths {\n".to_string()), " let content = std::fs::read_to_string(&path)\n".to_string()), " .unwrap_or_else(|e| panic!(\"failed to read {:?}: {}\", path, e));\n".to_string()), " entry_files.push((path.to_string_lossy().to_string(), content));\n".to_string()), " }\n".to_string()), " }\n".to_string()), "\n".to_string()), " let mut seen: HashMap> = HashMap::new();\n".to_string()), " let mut entry_for_queue = Vec::new();\n".to_string()), " for (path, content) in &entry_files {\n".to_string()), " if let Some(mod_path) = extract_module_path(content) {\n".to_string()), " let source = Rc::new(".to_string()), pipeline_mod.clone()), "::SourceFile {\n".to_string()), " path: path.clone(),\n".to_string()), " content: content.clone(),\n".to_string()), " });\n".to_string()), " seen.insert(mod_path, source);\n".to_string()), " }\n".to_string()), " entry_for_queue.push((path.clone(), content.clone()));\n".to_string()), " }\n".to_string()), "\n".to_string()), " let mut resolved = resolve_transitively_with_seen(entry_for_queue, &index, seen);\n".to_string()), " for (path, content) in entry_files {\n".to_string()), " let already_there = resolved.iter().any(|s| s.path == path);\n".to_string()), " if !already_there {\n".to_string()), " resolved.push(Rc::new(".to_string()), pipeline_mod.clone()), "::SourceFile { path, content }));\n".to_string()), " }\n".to_string()), " }\n".to_string()), " eprintln!(\"resolved {} sources (transitive import closure)\", resolved.len());\n".to_string()), " resolved\n".to_string()), "\n".to_string()), " } else if let Some(dir) = source_dir {\n".to_string()), " // Legacy: flat directory scan (backward compatibility)\n".to_string()), " let mut dag_paths = Vec::new();\n".to_string()), " collect_dag_files(std::path::Path::new(&dir), &mut dag_paths);\n".to_string()), " let mut sources = Vec::new();\n".to_string()), " for path in &dag_paths {\n".to_string()), " let content = std::fs::read_to_string(path)\n".to_string()), " .unwrap_or_else(|e| panic!(\"failed to read {:?}: {}\", path, e));\n".to_string()), " let filename = path.file_name().unwrap().to_string_lossy().to_string();\n".to_string()), " sources.push(Rc::new(".to_string()), pipeline_mod.clone()), "::SourceFile {\n".to_string()), " path: filename,\n".to_string()), " content,\n".to_string()), " }));\n".to_string()), " }\n".to_string()), " eprintln!(\"compiling {} .dag files from {} (target: {})\", sources.len(), dir, target);\n".to_string()), " sources\n".to_string()), "\n".to_string()), " } else {\n".to_string()), " eprintln!(\"error: provide --source-root or --source-dir\");\n".to_string()), " std::process::exit(1);\n".to_string()), " };\n".to_string()), "\n".to_string()), " let result = ".to_string()), pipeline_mod.clone()), "::compile_sources(Rc::new(sources), render_target);\n".to_string()), "\n".to_string()), " std::fs::create_dir_all(format!(\"{}/src\", output_dir))\n".to_string()), " .unwrap_or_else(|e| panic!(\"failed to create output dir: {}\", e));\n".to_string()), " for file in result.files.iter() {\n".to_string()), " let out_path = format!(\"{}/{}\", output_dir, file.path);\n".to_string()), " if let Some(parent) = std::path::Path::new(&out_path).parent() {\n".to_string()), " std::fs::create_dir_all(parent).ok();\n".to_string()), " }\n".to_string()), " std::fs::write(&out_path, &*file.content)\n".to_string()), " .unwrap_or_else(|e| panic!(\"failed to write {}: {}\", file.path, e));\n".to_string()), " }\n".to_string()), " eprintln!(\"compiled: {} files emitted, {} diagnostics\",\n".to_string()), " result.files.len(), result.diagnostics.len());\n".to_string()), " render_diagnostics(&result);\n".to_string()), " // Complexity violations are non-blocking (analyzer limitations).\n".to_string()), " let hard_errors = result.diagnostics.iter().any(|d| {\n".to_string()), " !matches!(*d.diagnostic.clone(), CompilerDiagnostic::ComplexityUnknown { .. })\n".to_string()), " });\n".to_string()), " if hard_errors {\n".to_string()), " std::process::exit(1);\n".to_string()), " }\n".to_string()), " if result.files.is_empty() {\n".to_string()), " eprintln!(\"error: no files emitted\");\n".to_string()), " std::process::exit(1);\n".to_string()), " }\n".to_string()), " },".to_string()) - } +let artifact_mod = module_to_filename("v2.compiler.artifact".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("Commands::Compile { source_roots, source_dir, output_dir, target } => {\n".to_string(), " let render_target = match target.as_str() {\n".to_string()), " \"rust\" => ".to_string()), artifact_mod.clone()), "::RenderTarget::Rust,\n".to_string()), " \"python\" => ".to_string()), artifact_mod.clone()), "::RenderTarget::Python,\n".to_string()), " \"go\" => ".to_string()), artifact_mod.clone()), "::RenderTarget::Go,\n".to_string()), " \"dag\" => ".to_string()), artifact_mod.clone()), "::RenderTarget::Dag,\n".to_string()), " other => {\n".to_string()), " eprintln!(\"unknown target: {}. supported: rust, python, go, dag\", other);\n".to_string()), " std::process::exit(1);\n".to_string()), " }\n".to_string()), " };\n".to_string()), "\n".to_string()), " let sources = if !source_roots.is_empty() {\n".to_string()), " // FF-9: Import-driven resolution from source roots\n".to_string()), " let index = build_module_index(&source_roots);\n".to_string()), " eprintln!(\"indexed {} modules from {} source roots\", index.len(), source_roots.len());\n".to_string()), "\n".to_string()), " // Entry modules: all .dag files in the FIRST source root.\n".to_string()), " // Additional roots are dependency pools resolved via imports.\n".to_string()), " // This is intentional: --source-root src/v2 --source-root dsl\n".to_string()), " // means 'compile src/v2, using dsl as a dependency pool.'\n".to_string()), " let first_root = std::path::Path::new(&source_roots[0]);\n".to_string()), " let mut entry_files = Vec::new();\n".to_string()), " if first_root.is_dir() {\n".to_string()), " let mut dag_paths = Vec::new();\n".to_string()), " collect_dag_files(first_root, &mut dag_paths);\n".to_string()), " for path in dag_paths {\n".to_string()), " let content = std::fs::read_to_string(&path)\n".to_string()), " .unwrap_or_else(|e| panic!(\"failed to read {:?}: {}\", path, e));\n".to_string()), " entry_files.push((path.to_string_lossy().to_string(), content));\n".to_string()), " }\n".to_string()), " }\n".to_string()), "\n".to_string()), " let mut seen: HashMap> = HashMap::new();\n".to_string()), " let mut entry_for_queue = Vec::new();\n".to_string()), " for (path, content) in &entry_files {\n".to_string()), " if let Some(mod_path) = extract_module_path(content) {\n".to_string()), " let source = Rc::new(".to_string()), pipeline_mod.clone()), "::SourceFile {\n".to_string()), " path: path.clone(),\n".to_string()), " content: content.clone(),\n".to_string()), " });\n".to_string()), " seen.insert(mod_path, source);\n".to_string()), " }\n".to_string()), " entry_for_queue.push((path.clone(), content.clone()));\n".to_string()), " }\n".to_string()), "\n".to_string()), " let mut resolved = resolve_transitively_with_seen(entry_for_queue, &index, seen);\n".to_string()), " for (path, content) in entry_files {\n".to_string()), " let already_there = resolved.iter().any(|s| s.path == path);\n".to_string()), " if !already_there {\n".to_string()), " resolved.push(Rc::new(".to_string()), pipeline_mod.clone()), "::SourceFile { path, content }));\n".to_string()), " }\n".to_string()), " }\n".to_string()), " eprintln!(\"resolved {} sources (transitive import closure)\", resolved.len());\n".to_string()), " resolved\n".to_string()), "\n".to_string()), " } else if let Some(dir) = source_dir {\n".to_string()), " // Legacy: flat directory scan (backward compatibility)\n".to_string()), " let mut dag_paths = Vec::new();\n".to_string()), " collect_dag_files(std::path::Path::new(&dir), &mut dag_paths);\n".to_string()), " let mut sources = Vec::new();\n".to_string()), " for path in &dag_paths {\n".to_string()), " let content = std::fs::read_to_string(path)\n".to_string()), " .unwrap_or_else(|e| panic!(\"failed to read {:?}: {}\", path, e));\n".to_string()), " let filename = path.file_name().unwrap().to_string_lossy().to_string();\n".to_string()), " sources.push(Rc::new(".to_string()), pipeline_mod.clone()), "::SourceFile {\n".to_string()), " path: filename,\n".to_string()), " content,\n".to_string()), " }));\n".to_string()), " }\n".to_string()), " eprintln!(\"compiling {} .dag files from {} (target: {})\", sources.len(), dir, target);\n".to_string()), " sources\n".to_string()), "\n".to_string()), " } else {\n".to_string()), " eprintln!(\"error: provide --source-root or --source-dir\");\n".to_string()), " std::process::exit(1);\n".to_string()), " };\n".to_string()), "\n".to_string()), " let result = ".to_string()), pipeline_mod.clone()), "::compile_sources(Rc::new(sources), render_target);\n".to_string()), "\n".to_string()), " std::fs::create_dir_all(format!(\"{}/src\", output_dir))\n".to_string()), " .unwrap_or_else(|e| panic!(\"failed to create output dir: {}\", e));\n".to_string()), " for file in result.files.iter() {\n".to_string()), " let out_path = format!(\"{}/{}\", output_dir, file.path);\n".to_string()), " if let Some(parent) = std::path::Path::new(&out_path).parent() {\n".to_string()), " std::fs::create_dir_all(parent).ok();\n".to_string()), " }\n".to_string()), " std::fs::write(&out_path, &*file.content)\n".to_string()), " .unwrap_or_else(|e| panic!(\"failed to write {}: {}\", file.path, e));\n".to_string()), " }\n".to_string()), " eprintln!(\"compiled: {} files emitted, {} diagnostics\",\n".to_string()), " result.files.len(), result.diagnostics.len());\n".to_string()), " render_diagnostics(&result);\n".to_string()), " // Complexity violations are non-blocking (analyzer limitations).\n".to_string()), " let hard_errors = result.diagnostics.iter().any(|d| {\n".to_string()), " !matches!(*d.diagnostic.clone(), CompilerDiagnostic::ComplexityUnknown { .. })\n".to_string()), " });\n".to_string()), " if hard_errors {\n".to_string()), " std::process::exit(1);\n".to_string()), " }\n".to_string()), " if result.files.is_empty() {\n".to_string()), " eprintln!(\"error: no files emitted\");\n".to_string()), " std::process::exit(1);\n".to_string()), " }\n".to_string()), " },".to_string()) +} } pub fn emit_run_match_arm(crate_name: String) -> String { - v2_rt::concat( - v2_rt::concat( - "\n Commands::Run { source_roots, function } => {\n".to_string(), - " cli_run::handle_run(source_roots, function);\n".to_string(), - ), - " },".to_string(), - ) + v2_rt::concat(v2_rt::concat("\n Commands::Run { source_roots, function } => {\n".to_string(), " cli_run::handle_run(source_roots, function);\n".to_string()), " },".to_string()) } pub fn emit_main_pipeline_fns(crate_name: String) -> String { { let pipeline_mod = module_to_filename("v2.compiler.compile".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(emit_collect_dag_files_fn(), emit_extract_module_path_fn()), - emit_extract_import_paths_fn(), - ), - emit_build_module_index_fn(), - ), - emit_resolve_transitively_fn(&crate_name, &pipeline_mod), - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(emit_collect_dag_files_fn(), emit_extract_module_path_fn()), emit_extract_import_paths_fn()), emit_build_module_index_fn()), emit_resolve_transitively_fn(&crate_name, &pipeline_mod)) +} } pub fn emit_collect_dag_files_fn() -> String { @@ -15833,183 +6692,96 @@ pub fn emit_resolve_transitively_fn(crate_name: &String, pipeline_mod: &String) pub fn emit_main_diagnostic_fns(crate_name: String) -> String { { let core_mod = module_to_filename("v2.std.core".to_string()); - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("\nfn render_diagnostics(result: &PipelineResult) {\n".to_string(), " if result.diagnostics.is_empty() {\n".to_string()), " return;\n".to_string()), " }\n".to_string()), "\n".to_string()), " let index_map: HashMap> = result\n".to_string()), " .newline_indices\n".to_string()), " .iter()\n".to_string()), " .map(|idx| (idx.file.clone(), idx.clone()))\n".to_string()), " .collect();\n".to_string()), "\n".to_string()), " for d in result.diagnostics.iter() {\n".to_string()), " render_one_diagnostic(d, &index_map, \"\");\n".to_string()), " }\n".to_string()), "\n".to_string()), " eprintln!(\"\\n{} error(s)\", result.diagnostics.len());\n".to_string()), "}\n".to_string()), "\n".to_string()), "fn render_one_diagnostic(\n".to_string()), " d: &".to_string()), crate_name), "::".to_string()), core_mod), "::ErrorNode,\n".to_string()), " index_map: &HashMap>,\n".to_string()), " indent: &str,\n".to_string()), ") {\n".to_string()), " let severity = \"error\";\n".to_string()), " let message = diagnostic_to_message(d.diagnostic.clone());\n".to_string()), " let span = diagnostic_to_span(d.diagnostic.clone());\n".to_string()), "\n".to_string()), " let location = if !span.file.is_empty() {\n".to_string()), " if let Some(idx) = index_map.get(&span.file) {\n".to_string()), " let lc = byte_to_line_col(idx, span.start);\n".to_string()), " format!(\"{}:{}:{}\", span.file, lc.line, lc.col)\n".to_string()), " } else {\n".to_string()), " span.file.clone()\n".to_string()), " }\n".to_string()), " } else if !d.module_name.is_empty() {\n".to_string()), " d.module_name.clone()\n".to_string()), " } else {\n".to_string()), " String::new()\n".to_string()), " };\n".to_string()), "\n".to_string()), " if location.is_empty() {\n".to_string()), " eprintln!(\"{}{}: {}\", indent, severity, message);\n".to_string()), " } else {\n".to_string()), " eprintln!(\"{}{}[{}]: {}\", indent, severity, location, message);\n".to_string()), " }\n".to_string()), "\n".to_string()), " if !span.file.is_empty() {\n".to_string()), " if let Some(idx) = index_map.get(&span.file) {\n".to_string()), " let lc = byte_to_line_col(idx, span.start);\n".to_string()), " let line_text = source_line_at(idx, lc.line);\n".to_string()), " let line_num = format!(\"{}\", lc.line);\n".to_string()), " let gutter_width = line_num.len();\n".to_string()), " eprintln!(\"{} {} |\", indent, \" \".repeat(gutter_width));\n".to_string()), " eprintln!(\"{} {} | {}\", indent, line_num, line_text);\n".to_string()), "\n".to_string()), " let span_len = std::cmp::max(1, (span.end - span.start) as usize);\n".to_string()), " let col_offset = (lc.col - 1) as usize;\n".to_string()), " eprintln!(\n".to_string()), " \"{} {} | {}{}\",\n".to_string()), " indent,\n".to_string()), " \" \".repeat(gutter_width),\n".to_string()), " \" \".repeat(col_offset),\n".to_string()), " \"^\".repeat(std::cmp::min(span_len, line_text.len().saturating_sub(col_offset)))\n".to_string()), " );\n".to_string()), " }\n".to_string()), " }\n".to_string()), "}\n".to_string()) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("\nfn render_diagnostics(result: &PipelineResult) {\n".to_string(), " if result.diagnostics.is_empty() {\n".to_string()), " return;\n".to_string()), " }\n".to_string()), "\n".to_string()), " let index_map: HashMap> = result\n".to_string()), " .newline_indices\n".to_string()), " .iter()\n".to_string()), " .map(|idx| (idx.file.clone(), idx.clone()))\n".to_string()), " .collect();\n".to_string()), "\n".to_string()), " for d in result.diagnostics.iter() {\n".to_string()), " render_one_diagnostic(d, &index_map, \"\");\n".to_string()), " }\n".to_string()), "\n".to_string()), " eprintln!(\"\\n{} error(s)\", result.diagnostics.len());\n".to_string()), "}\n".to_string()), "\n".to_string()), "fn render_one_diagnostic(\n".to_string()), " d: &".to_string()), crate_name), "::".to_string()), core_mod), "::ErrorNode,\n".to_string()), " index_map: &HashMap>,\n".to_string()), " indent: &str,\n".to_string()), ") {\n".to_string()), " let severity = \"error\";\n".to_string()), " let message = diagnostic_to_message(d.diagnostic.clone());\n".to_string()), " let span = diagnostic_to_span(d.diagnostic.clone());\n".to_string()), "\n".to_string()), " let location = if !span.file.is_empty() {\n".to_string()), " if let Some(idx) = index_map.get(&span.file) {\n".to_string()), " let lc = byte_to_line_col(idx, span.start);\n".to_string()), " format!(\"{}:{}:{}\", span.file, lc.line, lc.col)\n".to_string()), " } else {\n".to_string()), " span.file.clone()\n".to_string()), " }\n".to_string()), " } else if !d.module_name.is_empty() {\n".to_string()), " d.module_name.clone()\n".to_string()), " } else {\n".to_string()), " String::new()\n".to_string()), " };\n".to_string()), "\n".to_string()), " if location.is_empty() {\n".to_string()), " eprintln!(\"{}{}: {}\", indent, severity, message);\n".to_string()), " } else {\n".to_string()), " eprintln!(\"{}{}[{}]: {}\", indent, severity, location, message);\n".to_string()), " }\n".to_string()), "\n".to_string()), " if !span.file.is_empty() {\n".to_string()), " if let Some(idx) = index_map.get(&span.file) {\n".to_string()), " let lc = byte_to_line_col(idx, span.start);\n".to_string()), " let line_text = source_line_at(idx, lc.line);\n".to_string()), " let line_num = format!(\"{}\", lc.line);\n".to_string()), " let gutter_width = line_num.len();\n".to_string()), " eprintln!(\"{} {} |\", indent, \" \".repeat(gutter_width));\n".to_string()), " eprintln!(\"{} {} | {}\", indent, line_num, line_text);\n".to_string()), "\n".to_string()), " let span_len = std::cmp::max(1, (span.end - span.start) as usize);\n".to_string()), " let col_offset = (lc.col - 1) as usize;\n".to_string()), " eprintln!(\n".to_string()), " \"{} {} | {}{}\",\n".to_string()), " indent,\n".to_string()), " \" \".repeat(gutter_width),\n".to_string()), " \" \".repeat(col_offset),\n".to_string()), " \"^\".repeat(std::cmp::min(span_len, line_text.len().saturating_sub(col_offset)))\n".to_string()), " );\n".to_string()), " }\n".to_string()), " }\n".to_string()), "}\n".to_string()) +} } pub fn emit_main_match_arm(wf: &Rc, has_services: &bool) -> String { { let variant_name = to_pascal(wf.name.clone()); - let mod_name = module_to_filename(wf.module_name.clone()); - let fn_name = emit_ident(wf.name.clone(), RenderTarget::Rust); - let await_suffix = if has_services.clone() { +let mod_name = module_to_filename(wf.module_name.clone()); +let fn_name = emit_ident(wf.name.clone(), RenderTarget::Rust); +let await_suffix = if has_services.clone() { ".await".to_string() } else { "".to_string() }; - let call_expr = if ((wf.params.clone().len() as i64) == 0) { +let call_expr = if ((wf.params.clone().len() as i64) == 0) { { let service_args = emit_main_service_args(wf.clone(), has_services.clone()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(v2_rt::concat(mod_name, "::".to_string()), fn_name), - "(".to_string(), - ), - service_args, - ), - ")".to_string(), - ), - await_suffix, - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(mod_name, "::".to_string()), fn_name), "(".to_string()), service_args), ")".to_string()), await_suffix) +} } else { { let call_args = emit_main_call_args(&wf, has_services.clone()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(v2_rt::concat(mod_name, "::".to_string()), fn_name), - "(".to_string(), - ), - call_args, - ), - ")".to_string(), - ), - await_suffix, - ) - } +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(mod_name, "::".to_string()), fn_name), "(".to_string()), call_args), ")".to_string()), await_suffix) +} }; - let pattern = if ((wf.params.clone().len() as i64) == 0) { +let pattern = if ((wf.params.clone().len() as i64) == 0) { v2_rt::concat("Commands::".to_string(), variant_name) } else { { - let field_binds = Rc::new({ - let mut __result = Vec::new(); - for p in wf.params.clone().iter().cloned() { - __result.push(emit_ident( - param_node_name_at(p.clone(), wf.source_indices.clone()), - RenderTarget::Rust, - )); - } - __result - }); - let binds_str = field_binds.join(&", ".to_string()); - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("Commands::".to_string(), variant_name), - " { ".to_string(), - ), - binds_str, - ), - " }".to_string(), - ) - } + let field_binds = Rc::new({ let mut __result = Vec::new(); for p in wf.params.clone().iter().cloned() { __result.push(emit_ident(param_node_name_at(p.clone(), wf.source_indices.clone()), RenderTarget::Rust)); } __result }); +let binds_str = field_binds.join(&", ".to_string()); +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("Commands::".to_string(), variant_name), " { ".to_string()), binds_str), " }".to_string()) +} }; - if has_services.clone() { +if has_services.clone() { v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(pattern, " => {\n".to_string()), " match ".to_string()), call_expr), " {\n".to_string()), " Ok(value) => {\n".to_string()), " let json = serde_json::to_string_pretty(&value).unwrap_or_else(|_| format!(\"{:?}\", value));\n".to_string()), " println!(\"{}\", json);\n".to_string()), " }\n".to_string()), " Err(e) => {\n".to_string()), " eprintln!(\"Error: {}\", e);\n".to_string()), " std::process::exit(1);\n".to_string()), " }\n".to_string()), " }\n".to_string()), " }".to_string()) } else { - v2_rt::concat( - v2_rt::concat(v2_rt::concat(pattern, " => ".to_string()), call_expr), - ",".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(pattern, " => ".to_string()), call_expr), ",".to_string()) } - } +} } pub fn emit_main_call_args(wf: &Rc, has_services: bool) -> String { { - let param_args = Rc::new({ - let mut __result = Vec::new(); - for p in wf.params.clone().iter().cloned() { - __result.push({ - let pname = param_node_name_at(p.clone(), wf.source_indices.clone()); - let ident = emit_ident(pname.clone(), RenderTarget::Rust); - let n = param_node_type_expr(&p); - let is_borrowable = - ((v2_rt::map_contains_key(&wf.read_only_params.clone(), pname.clone()) - && ((n.params.clone().len() as i64) == 0)) - && needs_reference_node(&n, wf.source_indices.clone())); - if is_borrowable.clone() { - v2_rt::concat("&".to_string(), ident.clone()) - } else { - ident.clone() - } - }); + let param_args = Rc::new({ let mut __result = Vec::new(); for p in wf.params.clone().iter().cloned() { __result.push({ + let pname = param_node_name_at(p.clone(), wf.source_indices.clone()); +let ident = emit_ident(pname.clone(), RenderTarget::Rust); +let n = param_node_type_expr(&p); +let is_borrowable = ((set_contains(wf.read_only_params.clone(), pname.clone()) && ((n.params.clone().len() as i64) == 0)) && needs_reference_node(&n, wf.source_indices.clone())); +if is_borrowable.clone() { + v2_rt::concat("&".to_string(), ident.clone()) + } else { + ident.clone() } - __result - }); - let service_args = emit_main_service_arg_list(&wf, has_services); - let all_args = v2_rt::concat(param_args, service_args); - all_args.join(&", ".to_string()) - } +}); } __result }); +let service_args = emit_main_service_arg_list(&wf, has_services); +let all_args = v2_rt::concat(param_args, service_args); +all_args.join(&", ".to_string()) +} } pub fn emit_main_service_args(wf: Rc, has_services: bool) -> String { { let service_args = emit_main_service_arg_list(&wf, has_services); - service_args.join(&", ".to_string()) - } +service_args.join(&", ".to_string()) +} } pub fn emit_main_service_arg_list(wf: &Rc, has_services: bool) -> Rc> { { let sharing = language_spec(RenderTarget::Rust).sharing.clone(); - let resource_args = Rc::new({ - let mut __result = Vec::new(); - for u in wf.uses.clone().iter().cloned() { - __result.push(v2_rt::concat( - "&".to_string(), - authored_name_at(wf.source_indices.clone(), &resource_use_resource(&u)), - )); - } - __result - }); - let svc_args = Rc::new({ - let mut __result = Vec::new(); - for sn in wf.service_names.clone().iter().cloned() { - __result.push({ - let struct_name = sanitize_service_name(sn.clone()); - if has_services.clone() { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("&".to_string(), struct_name.clone()), - "::new(".to_string(), - ), - apply_type_template1( - sharing.clone_value.clone(), - "dry_run".to_string(), - ), - ), - ")".to_string(), - ) - } else { - v2_rt::concat( - v2_rt::concat("&".to_string(), struct_name.clone()), - "::new()".to_string(), - ) - } - }); +let resource_args = Rc::new({ let mut __result = Vec::new(); for u in wf.uses.clone().iter().cloned() { __result.push(v2_rt::concat("&".to_string(), authored_name_at(wf.source_indices.clone(), &resource_use_resource(&u)))); } __result }); +let svc_args = Rc::new({ let mut __result = Vec::new(); for sn in wf.service_names.clone().iter().cloned() { __result.push({ + let struct_name = sanitize_service_name(sn.clone()); +if has_services.clone() { + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("&".to_string(), struct_name.clone()), "::new(".to_string()), apply_type_template1(sharing.clone_value.clone(), "dry_run".to_string())), ")".to_string()) + } else { + v2_rt::concat(v2_rt::concat("&".to_string(), struct_name.clone()), "::new()".to_string()) } - __result - }); - v2_rt::concat(resource_args, svc_args) - } +}); } __result }); +v2_rt::concat(resource_args, svc_args) +} } pub fn emit_dry_run_module() -> Rc { { let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("// Generated by v2 compiler -- do not edit.\n".to_string(), "//\n".to_string()), "// Dry-run support: when DryRunMode(true), service methods return\n".to_string()), "// mock data instead of performing real I/O.\n\n".to_string()), "#[derive(Debug, Clone)]\n".to_string()), "pub struct DryRunMode(pub bool);\n\n".to_string()), "impl DryRunMode {\n".to_string()), " pub fn is_dry_run(&self) -> bool {\n".to_string()), " self.0\n".to_string()), " }\n".to_string()), "}\n\n".to_string()), "impl Default for DryRunMode {\n".to_string()), " fn default() -> Self {\n".to_string()), " DryRunMode(false)\n".to_string()), " }\n".to_string()), "}\n".to_string()); - Rc::new(TextFile { - path: v2_rt::concat( - v2_rt::concat(rust_source_root(), "dry_run".to_string()), - rust_source_ext(), - ), - content: content, - }) - } +Rc::new(TextFile { + path: v2_rt::concat(v2_rt::concat(rust_source_root(), "dry_run".to_string()), rust_source_ext()), + content: content, +}) +} } diff --git a/src/v2/stage0/src/v2_compiler_infer.rs b/src/v2/stage0/src/v2_compiler_infer.rs index 8a2797bae99..8219ebe662a 100644 --- a/src/v2/stage0/src/v2_compiler_infer.rs +++ b/src/v2/stage0/src/v2_compiler_infer.rs @@ -1,143 +1,56 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer -use self::SizeExpr::*; -pub use crate::std_algebra::CollectionSizeEffect; -use crate::std_algebra::CollectionSizeEffect::ShrinkEffect; -pub use crate::std_coercion::{dag_can_cast, is_dag_cast_domain_type}; -use crate::std_induction::RecursionShape::{ - DirectRecursion, ListRecursion, MapValueRecursion, OptionalRecursion, SetRecursion, -}; -use crate::std_induction::ShrinkFactor::{ConstantShrink, ProportionalShrink, UnitShrink}; -use crate::std_induction::SubValueRelation::{ - ArithmeticDescent, IteratedSubValue, PreservedValue, StrictSubValue, SubValueUnknown, -}; -pub use crate::std_induction::{ - compose_sub_value, compose_sub_value_relations, join_sub_value, meet_sub_value, - sub_value_to_evidence, InductiveField, RecursionShape, ShrinkFactor, SubValueRelation, -}; -pub use crate::std_node::{compiler_inductive_fields, compiler_recursive_types}; -use crate::std_termination::PositiveDescentAmount::OneStep; -pub use crate::std_termination::{ - positive_descent_amount_from_positive_int, proportional_divisor_from_int_at_least_two, - PositiveDescentAmount, -}; -pub use crate::std_types::{container_param_name, SourceSpan}; -pub use crate::v2_compiler_infer_access::{ - check_index_access_node, check_slice_access_node, AccessCheckResultNode, -}; -pub use crate::v2_compiler_infer_cycle::detect_type_cycles_kahn; -use crate::v2_compiler_infer_emit_info::TypeRepr::{EnumRepr, StructRepr}; -pub use crate::v2_compiler_infer_emit_info::{ - add_emit_item_summary, build_enum_field_summaries, build_struct_field_summaries, - derive_variant_to_enum, empty_emit_graph_info, lookup_emit_type_summary, EmitGraphInfo, - EmitInfoBuildState, TypeRepr, TypeSummary, -}; -pub use crate::v2_compiler_infer_env::{ - inductive_fields_for, inductive_fields_list_to_map, is_recursive_type, - is_recursive_type_by_name, lookup_type, lookup_type_by_name, lookup_type_for, merge_envs, - merge_inductive_fields, put_inductive_field, put_inductive_field_cross, TypeBinding, TypeEnv, -}; -use crate::v2_compiler_infer_items::ItemKind::{ - DataItem, FnItem, FuncItem, OtherItem, ServiceItem, TypeItem, -}; -pub use crate::v2_compiler_infer_items::{ - inferred_to_outputs, item_kind, variant_locals_from_items, ItemInfo, ItemKind, ResolvedGraph, - TypedGraph, TypedModule, -}; -pub use crate::v2_compiler_infer_lookup::{ - field_summary_for_type, lookup_coproduct_common_field_node, lookup_field_type_node, - lookup_func_sig, lookup_in_scope, map_key_type_in_env, map_value_type_in_env, - resolve_known_method_node, resolve_scrutinee_type_node, KnownMethodResolution, -}; -pub use crate::v2_compiler_infer_method::{ - builtin_kernel_seed_diagnostics, infer_builtin_call_type, resolve_builtin_call_type, -}; -use crate::v2_compiler_infer_patterns::PatternSubject::*; -pub use crate::v2_compiler_infer_patterns::{ - check_match_exhaustiveness, lookup_field_in_variant, lookup_result_subject, - lookup_variant_in_type, pattern_binding_type, pattern_subject_from_inferred, - pattern_subject_from_node, NodeLookupResult, PatternSubject, -}; -pub use crate::v2_compiler_infer_resolve::{ - resolve_item_types, resolve_node, ItemResult, NodeResolveResult, -}; -pub use crate::v2_compiler_infer_service::{ - check_service_field_access_node, check_service_method_call_node, collect_called_func_names, - collect_typed_service_calls, expand_transitive_services, extract_typed_service_name, - is_typed_service_call_receiver, service_op_entry, OpEntry, ServiceMethodResult, UniqueAccum, -}; -pub use crate::v2_compiler_infer_sigs::{ - resolve_func_sigs, ResolveFuncSigsResult, ResolvedFuncEnv, ResolvedFuncSig, -}; -pub use crate::v2_compiler_infer_types::{ - bare_map_node, callable_inferred, child_type_node, emit_map_has, extract_optional_inner_node, - for_each_element_type_node, infer_binop_type_node, infer_literal_node, is_fully_resolved, - make_callable_type, make_container_type, method_receiver_element_node, node_is_collection, - node_is_element_collection, node_is_keyed_collection, node_type_compatible, node_type_deps, - node_type_equals, node_type_shape, nominal_type_ref, normalize_access_type_node, - prefer_specific_type, resolve_type_variables_from_template, resolved_type, - template_return_has_variables, template_return_is_receiver_self, KernelTypeBuild, -}; -pub use crate::v2_compiler_resolve::{ModuleGraph, ResolvedImport, ResolvedModule}; +use std::collections::HashMap; +use std::rc::Rc; use crate::v2_rt; -use crate::v2_std_core::BinOp::{ - Add, And, Div, Eq, Ge, Gt, Le, Lt, Mod, Mul, Ne, NullCoalesce, Or, Sub, -}; -use crate::v2_std_core::CallSemantics::{LookupCallSemantics, PlainCallSemantics}; -use crate::v2_std_core::Cardinality::{CardOptional, Required}; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_types::{SourceSpan, container_param_name}; +pub use crate::std_coercion::{dag_can_cast, is_dag_cast_domain_type}; +pub use crate::v2_std_core::{Node, InternTable, intern, intern_str, authored_name_at, NewlineIndex, has_child_named, build_newline_index, module_node, module_imports, module_items, import_is_all, make_param_node, param_node_name_at, param_node_type_expr, field_node_type_expr, Connective, ExprData, make_expr_node, make_named_expr_node, make_expr_error_node, expr_var_name_at, field_access_base, field_access_field_at, expr_call_func_at, expr_method_name_at, let_binding_name_at, foreach_variable_at, lambda_param_names_at, record_lit_type_name_at, make_arg_node, make_arm_node, arm_pattern, arm_guard, arm_body, make_field_init_node, field_init_node_name_at, field_init_node_value, make_text_part_node, make_interp_part_node, map_children, arg_value, arg_name_at, has_inferred, is_compiler_error, InferredNode, Cardinality, ErrorNode, make_error_node, is_error_diagnostic, resource_use_name_at, resource_use_resource, kernel_type_set, is_kernel_type, is_child_accessor_in_model, is_tree_size_reducing, is_property_contraction, expr_has_self_call, expr_has_non_tail_self_call, DeclaredFuncSig, DeclaredFuncEnv, LiteralValue, FieldAccessStyle, FieldValueShape, FieldSummary, VarBindingKind, CallSemantics, MethodSemantics, ExprErrorKind, BinOp, UnaryOpKind, unaryop_operand, MatchPattern, StringPart, make_field_binding_node, field_binding_name_at, field_binding_pattern, let_value, let_body, lambda_body, foreach_collection, foreach_body, method_receiver, method_arg_nodes, match_scrutinee, match_arm_nodes, if_condition, if_then_branch, if_else_branch, index_base, index_expr, slice_base, slice_start, slice_end, cast_target, cast_expr, return_value, binop_left, binop_right, make_transport_node, local_transport_node, with_optional_cardinality, with_required_cardinality, no_span, make_span, unit_type, bool_type, string_type, int_type, float_type, none_type, error_type, is_container_type, container_expected_arity, default_ident_span, node_name_span, CompilerDiagnostic}; +use crate::v2_std_core::Connective::{Conj, Disj, NoConnective, Arrow}; +use crate::v2_std_core::ExprData::{NoExprData, ExprLiteral, ExprError, ExprVar, ExprFieldAccess, ExprCall, ExprMethodCall, ExprMatch, ExprIf, ExprLet, ExprRecordLit, ExprListLit, ExprBinOp, ExprUnaryOp, ExprLambda, ExprStringInterp, ExprBlock, ExprCast, ExprForEach, ExprIndex, ExprSlice, ExprReturn}; +use crate::v2_std_core::InferredNode::{Resolved, CompilerError, TypeVariable}; +use crate::v2_std_core::Cardinality::{Required, CardOptional}; use crate::v2_std_core::CompilerDiagnostic::{InternalError, TypeMismatch, VariantCollision}; -use crate::v2_std_core::Connective::{Arrow, Conj, Disj, NoConnective}; -use crate::v2_std_core::ExprData::{ - ExprBinOp, ExprBlock, ExprCall, ExprCast, ExprError, ExprFieldAccess, ExprForEach, ExprIf, - ExprIndex, ExprLambda, ExprLet, ExprListLit, ExprLiteral, ExprMatch, ExprMethodCall, - ExprRecordLit, ExprReturn, ExprSlice, ExprStringInterp, ExprUnaryOp, ExprVar, NoExprData, -}; -use crate::v2_std_core::ExprErrorKind::{InternalExprError, ParseRecoveryError, SemanticExprError}; -use crate::v2_std_core::FieldAccessStyle::{ - EnumAccessor, OptionalUnwrap, StoredField, TupleFirst, TupleSecond, -}; -use crate::v2_std_core::FieldValueShape::{OptionalValue, PlainValue}; -use crate::v2_std_core::InferredNode::{CompilerError, Resolved, TypeVariable}; -use crate::v2_std_core::LiteralValue::{LitBool, LitFloat, LitInt, LitNull, LitStr}; +use crate::v2_std_core::LiteralValue::{LitStr, LitInt, LitFloat, LitBool, LitNull}; +use crate::v2_std_core::FieldAccessStyle::{StoredField, EnumAccessor, OptionalUnwrap, TupleFirst, TupleSecond}; +use crate::v2_std_core::FieldValueShape::{PlainValue, OptionalValue}; +use crate::v2_std_core::VarBindingKind::{LocalValueBinding, FunctionValueBinding, VariantValueBinding, MatchBoundBinding}; +use crate::v2_std_core::CallSemantics::{PlainCallSemantics, LookupCallSemantics}; +use crate::v2_std_core::MethodSemantics::{PlainMethodSemantics, AlgebraMethodSemantics, ServiceMethodSemantics}; +use crate::v2_std_core::ExprErrorKind::{ParseRecoveryError, SemanticExprError, InternalExprError}; +use crate::v2_std_core::BinOp::{Add, Sub, Mul, Div, Mod, Eq, Ne, Lt, Gt, Le, Ge, And, Or, NullCoalesce}; +use crate::v2_std_core::UnaryOpKind::{Not, Neg}; use crate::v2_std_core::MatchPattern::{Bind, VariantPattern, Wildcard}; -use crate::v2_std_core::MethodSemantics::{ - AlgebraMethodSemantics, PlainMethodSemantics, ServiceMethodSemantics, -}; -use crate::v2_std_core::StringPart::{Interpolation, Text}; -use crate::v2_std_core::UnaryOpKind::{Neg, Not}; -use crate::v2_std_core::VarBindingKind::{ - FunctionValueBinding, LocalValueBinding, MatchBoundBinding, VariantValueBinding, -}; -pub use crate::v2_std_core::{ - arg_name_at, arg_value, arm_body, arm_guard, arm_pattern, authored_name_at, binop_left, - binop_right, bool_type, build_newline_index, cast_expr, cast_target, container_expected_arity, - default_ident_span, error_type, expr_call_func_at, expr_has_non_tail_self_call, - expr_has_self_call, expr_method_name_at, expr_var_name_at, field_access_base, - field_access_field_at, field_binding_name_at, field_binding_pattern, field_init_node_name_at, - field_init_node_value, field_node_type_expr, float_type, foreach_body, foreach_collection, - foreach_variable_at, has_child_named, has_inferred, if_condition, if_else_branch, - if_then_branch, import_is_all, index_base, index_expr, int_type, intern, intern_str, - is_child_accessor_in_model, is_compiler_error, is_container_type, is_error_diagnostic, - is_kernel_type, is_property_contraction, is_tree_size_reducing, kernel_type_set, lambda_body, - lambda_param_names_at, let_binding_name_at, let_body, let_value, local_transport_node, - make_arg_node, make_arm_node, make_error_node, make_expr_error_node, make_expr_node, - make_field_binding_node, make_field_init_node, make_interp_part_node, make_named_expr_node, - make_param_node, make_span, make_text_part_node, make_transport_node, map_children, - match_arm_nodes, match_scrutinee, method_arg_nodes, method_receiver, module_imports, - module_items, module_node, no_span, node_name_span, none_type, param_node_name_at, - param_node_type_expr, record_lit_type_name_at, resource_use_name_at, resource_use_resource, - return_value, slice_base, slice_end, slice_start, string_type, unaryop_operand, unit_type, - with_optional_cardinality, with_required_cardinality, BinOp, CallSemantics, Cardinality, - CompilerDiagnostic, Connective, DeclaredFuncEnv, DeclaredFuncSig, ErrorNode, ExprData, - ExprErrorKind, FieldAccessStyle, FieldSummary, FieldValueShape, InferredNode, InternTable, - LiteralValue, MatchPattern, MethodSemantics, NewlineIndex, Node, StringPart, UnaryOpKind, - VarBindingKind, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; -use std::collections::HashMap; -use std::rc::Rc; +use crate::v2_std_core::StringPart::{Text, Interpolation}; +pub use crate::v2_compiler_resolve::{ModuleGraph, ResolvedModule, ResolvedImport}; +pub use crate::v2_compiler_infer_types::{nominal_type_ref, make_container_type, make_callable_type, KernelTypeBuild, node_is_keyed_collection, node_is_element_collection, node_is_collection, node_is_set_collection, is_fully_resolved, resolve_type_variables_from_template, template_return_has_variables, template_return_is_receiver_self, bare_map_node, bare_set_node, callable_inferred, normalize_access_type_node, node_type_shape, node_type_compatible, node_type_equals, prefer_specific_type, node_type_deps, method_receiver_element_node, infer_literal_node, infer_binop_type_node, extract_optional_inner_node, for_each_element_type_node, resolved_type, child_type_node, emit_map_has}; +pub use crate::v2_compiler_infer_method::{builtin_kernel_seed_diagnostics, infer_builtin_call_type, resolve_builtin_call_type}; +pub use crate::v2_compiler_infer_cycle::{detect_type_cycles_kahn}; +pub use crate::v2_compiler_infer_env::{TypeEnv, TypeBinding, is_recursive_type, is_recursive_type_by_name, lookup_type, lookup_type_by_name, lookup_type_for, merge_envs, put_inductive_field, put_inductive_field_cross, merge_inductive_fields, inductive_fields_for, inductive_fields_list_to_map}; +pub use crate::std_node::{compiler_inductive_fields, compiler_recursive_types}; +pub use crate::std_induction::{InductiveField, RecursionShape, SubValueRelation, ShrinkFactor, sub_value_to_evidence, meet_sub_value, join_sub_value, compose_sub_value, compose_sub_value_relations}; +use crate::std_induction::RecursionShape::{DirectRecursion, ListRecursion, OptionalRecursion, SetRecursion, MapValueRecursion}; +use crate::std_induction::SubValueRelation::{StrictSubValue, IteratedSubValue, ArithmeticDescent, PreservedValue, SubValueUnknown}; +use crate::std_induction::ShrinkFactor::{UnitShrink, ConstantShrink, ProportionalShrink}; +pub use crate::std_termination::{positive_descent_amount_from_positive_int, proportional_divisor_from_int_at_least_two, PositiveDescentAmount}; +use crate::std_termination::PositiveDescentAmount::{OneStep}; +pub use crate::std_algebra::{CollectionSizeEffect}; +use crate::std_algebra::CollectionSizeEffect::{ShrinkEffect}; +pub use crate::v2_compiler_infer_resolve::{resolve_node, resolve_item_types, NodeResolveResult, ItemResult}; +pub use crate::v2_compiler_infer_sigs::{ResolvedFuncSig, ResolvedFuncEnv, ResolveFuncSigsResult, resolve_func_sigs}; +pub use crate::v2_compiler_infer_emit_info::{TypeRepr, TypeSummary, EmitGraphInfo, EmitInfoBuildState, empty_emit_graph_info, lookup_emit_type_summary, build_struct_field_summaries, build_enum_field_summaries, add_emit_item_summary, derive_variant_to_enum}; +use crate::v2_compiler_infer_emit_info::TypeRepr::{StructRepr, EnumRepr}; +pub use crate::v2_compiler_infer_items::{ItemKind, ItemInfo, TypedModule, TypedGraph, ResolvedGraph, inferred_to_outputs, item_kind, variant_locals_from_items}; +use crate::v2_compiler_infer_items::ItemKind::{FnItem, FuncItem, TypeItem, DataItem, ServiceItem, OtherItem}; +pub use crate::v2_compiler_infer_service::{UniqueAccum, OpEntry, ServiceMethodResult, is_typed_service_call_receiver, extract_typed_service_name, collect_typed_service_calls, collect_called_func_names, expand_transitive_services, check_service_field_access_node, check_service_method_call_node, service_op_entry}; +pub use crate::v2_compiler_infer_patterns::{NodeLookupResult, PatternSubject, lookup_variant_in_type, lookup_field_in_variant, pattern_subject_from_inferred, pattern_subject_from_node, lookup_result_subject, pattern_binding_type, check_match_exhaustiveness}; +use crate::v2_compiler_infer_patterns::PatternSubject::*; +pub use crate::v2_compiler_infer_lookup::{KnownMethodResolution, resolve_known_method_node, resolve_scrutinee_type_node, field_summary_for_type, lookup_field_type_node, lookup_coproduct_common_field_node, map_value_type_in_env, map_key_type_in_env, set_element_type_in_env, lookup_in_scope, lookup_func_sig}; +pub use crate::v2_compiler_infer_access::{AccessCheckResultNode, check_index_access_node, check_slice_access_node}; +use self::SizeExpr::*; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct ItemContribution { @@ -191,57 +104,43 @@ pub struct BlockInferState { pub typed_stmts: Rc>>, } -pub fn infer_block_stmts( - mut remaining: Rc>>, - mut remaining_count: i64, - mut scope: Rc, - mut typed_stmts: Rc>>, - mut diag_chunks: Rc>>>>, - mut last_type: Rc, - mut expected: Option>, -) -> Rc { +pub fn infer_block_stmts(mut remaining: Rc>>, mut remaining_count: i64, mut scope: Rc, mut typed_stmts: Rc>>, mut diag_chunks: Rc>>>>, mut last_type: Rc, mut expected: Option>) -> Rc { loop { match remaining.clone().first().cloned() { - None => { - break Rc::new(BlockInferState { - scope: scope.clone(), - diag_chunks: diag_chunks, - last_type: last_type, - typed_stmts: typed_stmts, - }); - } - Some(stmt) => { - let is_last = (remaining_count.clone() == 1); - let stmt_expected = if is_last { expected.clone() } else { None }; - let stmt_result = infer_expr(&stmt, &scope, &stmt_expected); - let stmt_typed = stmt_result.typed.clone(); - let stmt_diags = stmt_result.diagnostics.clone(); - let stmt_rt = resolved_type(stmt_typed.clone()); - let next_scope = scope_after_stmt_node(&stmt, stmt_rt.clone(), &scope); - { - let __tco_0 = Rc::new( - remaining - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - let __tco_1 = (remaining_count - 1); - let __tco_2 = next_scope; - let __tco_3 = v2_rt::rc_list_push(typed_stmts, stmt_typed.clone()); - let __tco_4 = v2_rt::rc_list_push(diag_chunks, stmt_diags); - let __tco_5 = stmt_rt.clone(); - remaining = __tco_0; - remaining_count = __tco_1; - scope = __tco_2; - typed_stmts = __tco_3; - diag_chunks = __tco_4; - last_type = __tco_5; - continue; - } - } - } - } + None => { break Rc::new(BlockInferState { + scope: scope.clone(), + diag_chunks: diag_chunks, + last_type: last_type, + typed_stmts: typed_stmts, +}); }, + Some(stmt) => { let is_last = (remaining_count.clone() == 1); +let stmt_expected = if is_last { + expected.clone() + } else { + None + }; +let stmt_result = infer_expr(&stmt, &scope, &stmt_expected); +let stmt_typed = stmt_result.typed.clone(); +let stmt_diags = stmt_result.diagnostics.clone(); +let stmt_rt = resolved_type(stmt_typed.clone()); +let next_scope = scope_after_stmt_node(&stmt, stmt_rt.clone(), &scope); +{ + let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); +let __tco_1 = (remaining_count - 1); +let __tco_2 = next_scope; +let __tco_3 = v2_rt::rc_list_push(typed_stmts, stmt_typed.clone()); +let __tco_4 = v2_rt::rc_list_push(diag_chunks, stmt_diags); +let __tco_5 = stmt_rt.clone(); +remaining = __tco_0; +remaining_count = __tco_1; +scope = __tco_2; +typed_stmts = __tco_3; +diag_chunks = __tco_4; +last_type = __tco_5; +continue; +} }, +} +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -323,163 +222,81 @@ pub struct LocalContributionState { pub diag_chunks: Rc>>>>, } -pub fn merge_scope_from_imports( - mut remaining: Rc>>, - mut parent_index: Rc>>, - mut env: Rc, - mut func_sigs: Rc>>, - mut svc_registry: Rc>>>>, - mut svc_locals: Rc>>, -) -> Rc { +pub fn merge_scope_from_imports(mut remaining: Rc>>, mut parent_index: Rc>>, mut env: Rc, mut func_sigs: Rc>>, mut svc_registry: Rc>>>>, mut svc_locals: Rc>>) -> Rc { loop { match remaining.clone().first().cloned() { - None => { - break Rc::new(InferScopeComponents { - func_sigs: func_sigs, - svc_registry: svc_registry, - svc_locals: svc_locals, - }); + None => { break Rc::new(InferScopeComponents { + func_sigs: func_sigs, + svc_registry: svc_registry, + svc_locals: svc_locals, +}); }, + Some(imp) => { match v2_rt::map_get(&parent_index, imp.module_path.clone()) { + Some(typed_parent) => { let next_func_sigs = Rc::new(v2_rt::map_values(&typed_parent.func_env.clone().signatures.clone())).iter().cloned().fold(func_sigs, |acc: Rc>>, rsig: Rc| { + let sig_key = rsig.name.clone(); +let sig_params = rsig.params.clone(); +let sig_rt = rsig.inferred.clone(); +let sig_async = rsig.is_async.clone(); +v2_rt::rc_map_insert(acc, sig_key.clone(), Rc::new(DeclaredFuncSig { + name: sig_key.clone(), + params: sig_params.clone(), + inferred: Some(sig_rt.clone()), + is_async: sig_async.clone(), + output_provenance: rsig.output_provenance.clone(), + variant_provenance: rsig.variant_provenance.clone(), +})) +}); +let parent_result = typed_parent.items.clone().iter().cloned().fold(Rc::new(InferScopeComponents { + func_sigs: next_func_sigs, + svc_registry: svc_registry, + svc_locals: svc_locals, +}), |acc: Rc, titem: Rc| if ((titem.transport.clone() != None) && ((titem.children.clone().len() as i64) > 0)) { + { + let entries = Rc::new({ let mut __result = Vec::new(); for c in titem.children.clone().iter().cloned() { __result.push(Rc::new(OpEntry { + name: authored_name_at(env.source_indices.clone(), &c), + outputs: inferred_to_outputs(&c.inferred.clone(), c.span.clone(), env.source_indices.clone()), + params: c.params.clone(), +})); } __result }); +let root = namespace_root_from_properties(titem.properties.clone(), authored_name_at(env.source_indices.clone(), &titem), env.source_indices.clone()); +Rc::new(InferScopeComponents { + func_sigs: acc.func_sigs.clone(), + svc_registry: v2_rt::rc_map_insert(acc.svc_registry.clone(), authored_name_at(env.source_indices.clone(), &titem), entries.clone()), + svc_locals: v2_rt::rc_map_insert(acc.svc_locals.clone(), root.clone(), nominal_type_binding(&root)), +}) +} + } else { + if (((((titem.body.clone() != None) && ((titem.params.clone().len() as i64) == 0)) && (titem.transport.clone() == None)) && (titem.connective.clone() == Connective::NoConnective)) && (titem.inferred.clone() != None)) { + Rc::new(InferScopeComponents { + func_sigs: acc.func_sigs.clone(), + svc_registry: acc.svc_registry.clone(), + svc_locals: v2_rt::rc_map_insert(acc.svc_locals.clone(), authored_name_at(env.source_indices.clone(), &titem), Rc::new(TypeBinding { + name: authored_name_at(env.source_indices.clone(), &titem), + resolved: resolved_type(titem.clone()), + provenance: Rc::new(SubValueRelation::SubValueUnknown), +})), +}) + } else { + acc.clone() } - Some(imp) => match v2_rt::map_get(&parent_index, imp.module_path.clone()) { - Some(typed_parent) => { - let next_func_sigs = Rc::new(v2_rt::map_values( - &typed_parent.func_env.clone().signatures.clone(), - )) - .iter() - .cloned() - .fold( - func_sigs, - |acc: Rc>>, - rsig: Rc| { - let sig_key = rsig.name.clone(); - let sig_params = rsig.params.clone(); - let sig_rt = rsig.inferred.clone(); - let sig_async = rsig.is_async.clone(); - v2_rt::rc_map_insert( - acc, - sig_key.clone(), - Rc::new(DeclaredFuncSig { - name: sig_key.clone(), - params: sig_params.clone(), - inferred: Some(sig_rt.clone()), - is_async: sig_async.clone(), - output_provenance: rsig.output_provenance.clone(), - variant_provenance: rsig.variant_provenance.clone(), - }), - ) - }, - ); - let parent_result = typed_parent.items.clone().iter().cloned().fold( - Rc::new(InferScopeComponents { - func_sigs: next_func_sigs, - svc_registry: svc_registry, - svc_locals: svc_locals, - }), - |acc: Rc, titem: Rc| { - if ((titem.transport.clone() != None) - && ((titem.children.clone().len() as i64) > 0)) - { - { - let entries = Rc::new({ - let mut __result = Vec::new(); - for c in titem.children.clone().iter().cloned() { - __result.push(Rc::new(OpEntry { - name: authored_name_at( - env.source_indices.clone(), - &c, - ), - outputs: inferred_to_outputs( - &c.inferred.clone(), - c.span.clone(), - env.source_indices.clone(), - ), - params: c.params.clone(), - })); - } - __result - }); - let root = namespace_root_from_properties( - titem.properties.clone(), - authored_name_at(env.source_indices.clone(), &titem), - env.source_indices.clone(), - ); - Rc::new(InferScopeComponents { - func_sigs: acc.func_sigs.clone(), - svc_registry: v2_rt::rc_map_insert( - acc.svc_registry.clone(), - authored_name_at(env.source_indices.clone(), &titem), - entries.clone(), - ), - svc_locals: v2_rt::rc_map_insert( - acc.svc_locals.clone(), - root.clone(), - nominal_type_binding(&root), - ), - }) - } - } else { - if (((((titem.body.clone() != None) - && ((titem.params.clone().len() as i64) == 0)) - && (titem.transport.clone() == None)) - && (titem.connective.clone() == Connective::NoConnective)) - && (titem.inferred.clone() != None)) - { - Rc::new(InferScopeComponents { - func_sigs: acc.func_sigs.clone(), - svc_registry: acc.svc_registry.clone(), - svc_locals: v2_rt::rc_map_insert( - acc.svc_locals.clone(), - authored_name_at(env.source_indices.clone(), &titem), - Rc::new(TypeBinding { - name: authored_name_at( - env.source_indices.clone(), - &titem, - ), - resolved: resolved_type(titem.clone()), - provenance: Rc::new( - SubValueRelation::SubValueUnknown, - ), - }), - ), - }) - } else { - acc.clone() - } - } - }, - ); - { - let __tco_0 = Rc::new( - remaining - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - let __tco_1 = parent_result.func_sigs.clone(); - let __tco_2 = parent_result.svc_registry.clone(); - let __tco_3 = parent_result.svc_locals.clone(); - remaining = __tco_0; - func_sigs = __tco_1; - svc_registry = __tco_2; - svc_locals = __tco_3; - continue; - } - } - None => { - let __tco_0 = Rc::new( - remaining - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - remaining = __tco_0; - continue; - } - }, - } - } + }); +{ + let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); +let __tco_1 = parent_result.func_sigs.clone(); +let __tco_2 = parent_result.svc_registry.clone(); +let __tco_3 = parent_result.svc_locals.clone(); +remaining = __tco_0; +func_sigs = __tco_1; +svc_registry = __tco_2; +svc_locals = __tco_3; +continue; +} }, + None => { { + let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); +remaining = __tco_0; +continue; +} }, +} }, +} +} } pub fn nominal_leaf_type(name: String) -> Rc { @@ -488,17 +305,10 @@ pub fn nominal_leaf_type(name: String) -> Rc { pub fn nominal_type_binding(name: &String) -> Rc { Rc::new(TypeBinding { - name: name.clone(), - resolved: nominal_leaf_type(name.clone()), - provenance: Rc::new(SubValueRelation::SubValueUnknown), - }) -} - -pub fn set_has(m: Rc>, key: String) -> bool { - match v2_rt::map_get(&m, key) { - Some(_) => true, - None => false, - } + name: name.clone(), + resolved: nominal_leaf_type(name.clone()), + provenance: Rc::new(SubValueRelation::SubValueUnknown), +}) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -507,242 +317,147 @@ pub struct FieldRecursionResult { pub element_type: String, } -pub fn classify_field_recursion( - field_node: &Rc, - parent_name: &String, - recursive_type_set: Rc>, - source_indices: &Rc>>, -) -> Option> { +pub fn classify_field_recursion(field_node: &Rc, parent_name: &String, recursive_type_set: Rc>, source_indices: &Rc>>) -> Option> { { let type_expr = match field_node.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => rt.clone(), - _ => field_node_type_expr(&field_node), - }; - let field_type_name = authored_name_at(source_indices.clone(), &type_expr); - if (field_type_name.clone().as_str() == parent_name.clone().as_str()) { + Some(InferredNode::Resolved { node: rt, .. }) => rt.clone(), + _ => field_node_type_expr(&field_node), +}; +let field_type_name = authored_name_at(source_indices.clone(), &type_expr); +if (field_type_name.clone().as_str() == parent_name.clone().as_str()) { match field_node.return_cardinality.clone() { - Cardinality::CardOptional => Some(Rc::new(FieldRecursionResult { - shape: RecursionShape::OptionalRecursion, - element_type: parent_name.clone(), - })), - _ => Some(Rc::new(FieldRecursionResult { - shape: RecursionShape::DirectRecursion, - element_type: parent_name.clone(), - })), - } + Cardinality::CardOptional => Some(Rc::new(FieldRecursionResult { + shape: RecursionShape::OptionalRecursion, + element_type: parent_name.clone(), +})), + _ => Some(Rc::new(FieldRecursionResult { + shape: RecursionShape::DirectRecursion, + element_type: parent_name.clone(), +})), +} } else { if is_container_type(field_type_name.clone()) { { let arity = match container_expected_arity(field_type_name.clone()) { - Some(a) => a.clone(), - None => 0, - }; - let value_index = if (arity == 2) { 1 } else { 0 }; - let value_type = match type_expr - .children - .clone() - .get(value_index as usize) - .cloned() - { - Some(t) => authored_name_at(source_indices.clone(), &t), - None => "".to_string(), + Some(a) => a.clone(), + None => 0, +}; +let value_index = if (arity == 2) { + 1 + } else { + 0 }; - let is_recursive_element = ((value_type.clone().as_str() - == parent_name.clone().as_str()) - || set_has(recursive_type_set, value_type.clone())); - if is_recursive_element { +let value_type = match type_expr.children.clone().get(value_index as usize).cloned() { + Some(t) => authored_name_at(source_indices.clone(), &t), + None => "".to_string(), +}; +let is_recursive_element = ((value_type.clone().as_str() == parent_name.clone().as_str()) || set_contains(recursive_type_set, value_type.clone())); +if is_recursive_element { { - let elem = - if (value_type.clone().as_str() == parent_name.clone().as_str()) { - parent_name.clone() - } else { - value_type.clone() - }; - match field_type_name.clone().as_str() { - "List" => Some(Rc::new(FieldRecursionResult { - shape: RecursionShape::ListRecursion, - element_type: elem, - })), - "Set" => Some(Rc::new(FieldRecursionResult { - shape: RecursionShape::SetRecursion, - element_type: elem, - })), - "Map" => Some(Rc::new(FieldRecursionResult { - shape: RecursionShape::MapValueRecursion, - element_type: elem, - })), - _ => None, - } - } + let elem = if (value_type.clone().as_str() == parent_name.clone().as_str()) { + parent_name.clone() + } else { + value_type.clone() + }; +match field_type_name.clone().as_str() { + "List" => Some(Rc::new(FieldRecursionResult { + shape: RecursionShape::ListRecursion, + element_type: elem, +})), + "Set" => Some(Rc::new(FieldRecursionResult { + shape: RecursionShape::SetRecursion, + element_type: elem, +})), + "Map" => Some(Rc::new(FieldRecursionResult { + shape: RecursionShape::MapValueRecursion, + element_type: elem, +})), + _ => None, +} +} } else { None } - } +} } else { - if set_has(recursive_type_set, field_type_name.clone()) { + if set_contains(recursive_type_set, field_type_name.clone()) { match field_node.return_cardinality.clone() { - Cardinality::CardOptional => Some(Rc::new(FieldRecursionResult { - shape: RecursionShape::OptionalRecursion, - element_type: field_type_name.clone(), - })), - _ => Some(Rc::new(FieldRecursionResult { - shape: RecursionShape::DirectRecursion, - element_type: field_type_name.clone(), - })), - } + Cardinality::CardOptional => Some(Rc::new(FieldRecursionResult { + shape: RecursionShape::OptionalRecursion, + element_type: field_type_name.clone(), +})), + _ => Some(Rc::new(FieldRecursionResult { + shape: RecursionShape::DirectRecursion, + element_type: field_type_name.clone(), +})), +} } else { None } } } - } +} } -pub fn collect_fields_inductive( - fields: Rc>>, - parent_name: String, - variant_name: String, - recursive_type_set: Rc>, - acc: Rc>>>>, - source_indices: Rc>>, -) -> Rc>>>> { - fields.iter().cloned().fold( - acc.clone(), - |field_acc: Rc>>>>, field_node: Rc| { - match classify_field_recursion( - &field_node, - &parent_name, - recursive_type_set.clone(), - &source_indices, - ) { - Some(result) => put_inductive_field_cross( - &field_acc, - &parent_name, - variant_name.clone(), - authored_name_at(source_indices.clone(), &field_node), - result.shape.clone(), - result.element_type.clone(), - ), - None => field_acc.clone(), - } - }, - ) +pub fn collect_fields_inductive(fields: Rc>>, parent_name: String, variant_name: String, recursive_type_set: Rc>, acc: Rc>>>>, source_indices: Rc>>) -> Rc>>>> { + fields.iter().cloned().fold(acc.clone(), |field_acc: Rc>>>>, field_node: Rc| match classify_field_recursion(&field_node, &parent_name, recursive_type_set.clone(), &source_indices) { + Some(result) => put_inductive_field_cross(&field_acc, &parent_name, variant_name.clone(), authored_name_at(source_indices.clone(), &field_node), result.shape.clone(), result.element_type.clone()), + None => field_acc.clone(), +}) } -pub fn collect_item_inductive_fields( - item: &Rc, - recursive_type_set: Rc>, - source_indices: &Rc>>, -) -> Rc>>>> { +pub fn collect_item_inductive_fields(item: &Rc, recursive_type_set: Rc>, source_indices: &Rc>>) -> Rc>>>> { { let item_name = authored_name_at(source_indices.clone(), &item); - match item.connective.clone() { - Connective::Disj => item.children.clone().iter().cloned().fold( - v2_rt::rc_empty_map::>>>(), - |variant_acc: Rc>>>>, - variant_node: Rc| { - collect_fields_inductive( - variant_node.children.clone(), - item_name.clone(), - authored_name_at(source_indices.clone(), &variant_node), - recursive_type_set.clone(), - variant_acc, - source_indices.clone(), - ) - }, - ), - Connective::Conj => collect_fields_inductive( - item.children.clone(), - item_name.clone(), - "".to_string(), - recursive_type_set.clone(), - v2_rt::rc_empty_map::>>>(), - source_indices.clone(), - ), - _ => v2_rt::rc_empty_map::>>>(), - } - } +match item.connective.clone() { + Connective::Disj => item.children.clone().iter().cloned().fold(v2_rt::rc_empty_map::>>>(), |variant_acc: Rc>>>>, variant_node: Rc| collect_fields_inductive(variant_node.children.clone(), item_name.clone(), authored_name_at(source_indices.clone(), &variant_node), recursive_type_set.clone(), variant_acc, source_indices.clone())), + Connective::Conj => collect_fields_inductive(item.children.clone(), item_name.clone(), "".to_string(), recursive_type_set.clone(), v2_rt::rc_empty_map::>>>(), source_indices.clone()), + _ => v2_rt::rc_empty_map::>>>(), +} +} } -pub fn build_item_inductive_fields( - items: Rc>>, - recursive_type_set: Rc>, - source_indices: Rc>>, -) -> Rc>>>> { - items.iter().cloned().fold( - v2_rt::rc_empty_map::>>>(), - |acc: Rc>>>>, item: Rc| { - merge_inductive_fields( - acc, - &collect_item_inductive_fields(&item, recursive_type_set.clone(), &source_indices), - ) - }, - ) +pub fn build_item_inductive_fields(items: Rc>>, recursive_type_set: Rc>, source_indices: Rc>>) -> Rc>>>> { + items.iter().cloned().fold(v2_rt::rc_empty_map::>>>(), |acc: Rc>>>>, item: Rc| merge_inductive_fields(acc, &collect_item_inductive_fields(&item, recursive_type_set.clone(), &source_indices))) } -pub fn nominal_ref_node( - name: &String, - span: Rc, - ident_span: Option>, -) -> Rc { +pub fn nominal_ref_node(name: &String, span: Rc, ident_span: Option>) -> Rc { Rc::new(Node { - name: name.clone(), - span: span, - ident_span: ident_span, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: nominal_leaf_type(name.clone()), - })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) + name: name.clone(), + span: span, + ident_span: ident_span, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: nominal_leaf_type(name.clone()), +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) } pub fn resolved_callable_type(func_params: Rc>>, ret: Rc) -> Rc { make_callable_type(func_params, ret) } -pub fn namespace_root_from_properties( - properties: Rc>>, - name: String, - source_indices: Rc>>, -) -> String { - match Rc::new({ - let mut __result = Vec::new(); - for p in properties.iter().cloned() { - if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() - == "namespace_root".to_string().as_str()) - { - __result.push(p); - } - } - __result - }) - .first() - .cloned() - { - Some(ns_prop) => match (*field_init_node_value(&ns_prop).expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitStr { value: root, .. } = value.as_ref() else { - unreachable!() - }; - root.clone() - } - _ => name, - }, - None => name, - } +pub fn namespace_root_from_properties(properties: Rc>>, name: String, source_indices: Rc>>) -> String { + match Rc::new({ let mut __result = Vec::new(); for p in properties.iter().cloned() { if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() == "namespace_root".to_string().as_str()) { __result.push(p); } } __result }).first().cloned() { + Some(ns_prop) => match (*field_init_node_value(&ns_prop).expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: root, .. } = value.as_ref() else { unreachable!() }; root.clone() }, + _ => name, +}, + None => name, +} } pub fn expr_span(texpr: Rc) -> Rc { @@ -751,9 +466,9 @@ pub fn expr_span(texpr: Rc) -> Rc { pub fn ok_infer(texpr: Rc) -> Rc { Rc::new(InferResult { - typed: texpr, - diagnostics: Rc::new(vec![]), - }) + typed: texpr, + diagnostics: Rc::new(vec![]), +}) } pub fn semantic_expr_error_node(message: String, span: Rc) -> Rc { @@ -766,137 +481,82 @@ pub fn internal_expr_error_node(message: String, span: Rc) -> Rc, name: &String) -> Option { match v2_rt::map_get(&scope.locals.clone(), name.clone()) { - Some(binding) => { - match lookup_type_for(&scope.type_env.clone(), &binding.resolved.clone()) { - Some(parent) => { - let is_coproduct = (parent.connective.clone() == Connective::Disj); - if is_coproduct { - if has_child_named( - parent.clone(), - name.clone(), - scope.type_env.clone().source_indices.clone(), - ) { - Some(authored_name_at( - scope.type_env.clone().source_indices.clone(), - &binding.resolved.clone(), - )) - } else { - None - } - } else { - None - } - } - None => None, + Some(binding) => match lookup_type_for(&scope.type_env.clone(), &binding.resolved.clone()) { + Some(parent) => { + let is_coproduct = (parent.connective.clone() == Connective::Disj); +if is_coproduct { + if has_child_named(parent.clone(), name.clone(), scope.type_env.clone().source_indices.clone()) { + Some(authored_name_at(scope.type_env.clone().source_indices.clone(), &binding.resolved.clone())) + } else { + None } + } else { + None } - None => None, - } +}, + None => None, +}, + None => None, +} } pub fn infer_var_binding_kind(scope: &Rc, name: &String) -> Rc { match lookup_variant_parent_enum(&scope, &name) { - Some(parent_enum) => Rc::new(VarBindingKind::VariantValueBinding { - parent_enum: parent_enum.clone(), - }), - None => match v2_rt::map_get(&scope.locals.clone(), name.clone()) { - Some(_) => { - if v2_rt::map_has(&scope.match_bound_names.clone(), name.clone()) { - Rc::new(VarBindingKind::MatchBoundBinding) - } else { - Rc::new(VarBindingKind::LocalValueBinding) - } - } - None => Rc::new(VarBindingKind::FunctionValueBinding), - }, - } + Some(parent_enum) => Rc::new(VarBindingKind::VariantValueBinding { + parent_enum: parent_enum.clone(), +}), + None => match v2_rt::map_get(&scope.locals.clone(), name.clone()) { + Some(_) => if v2_rt::map_has(&scope.match_bound_names.clone(), name.clone()) { + Rc::new(VarBindingKind::MatchBoundBinding) + } else { + Rc::new(VarBindingKind::LocalValueBinding) + }, + None => Rc::new(VarBindingKind::FunctionValueBinding), +}, +} +} + +pub fn inference_error(message: String, span: Rc, module_name: String) -> Rc { + make_error_node(Rc::new(CompilerDiagnostic::InternalError { + message: message, + span: span, +}), module_name) +} + +pub fn type_mismatch_error(expected: String, got: String, span: Rc, module_name: String) -> Rc { + make_error_node(Rc::new(CompilerDiagnostic::TypeMismatch { + expected: expected, + got: got, + span: span, +}), module_name) } -pub fn inference_error( - message: String, - span: Rc, - module_name: String, -) -> Rc { - make_error_node( - Rc::new(CompilerDiagnostic::InternalError { - message: message, - span: span, - }), - module_name, - ) -} - -pub fn type_mismatch_error( - expected: String, - got: String, - span: Rc, - module_name: String, -) -> Rc { - make_error_node( - Rc::new(CompilerDiagnostic::TypeMismatch { - expected: expected, - got: got, - span: span, - }), - module_name, - ) -} - -pub fn rejects_string_for_optional_coproduct_field( - expected: &Rc, - got: Rc, - source_indices: Rc>>, -) -> bool { +pub fn rejects_string_for_optional_coproduct_field(expected: &Rc, got: Rc, source_indices: Rc>>) -> bool { { let expected_inner = with_required_cardinality(&expected); - let expected_is_optional_coproduct = ((expected.return_cardinality.clone() - == Cardinality::CardOptional) - && (expected_inner.connective.clone() == Connective::Disj)); - let got_is_string = - (authored_name_at(source_indices, &got).as_str() == "String".to_string().as_str()); - (expected_is_optional_coproduct && got_is_string) - } +let expected_is_optional_coproduct = ((expected.return_cardinality.clone() == Cardinality::CardOptional) && (expected_inner.connective.clone() == Connective::Disj)); +let got_is_string = (authored_name_at(source_indices, &got).as_str() == "String".to_string().as_str()); +(expected_is_optional_coproduct && got_is_string) +} } -pub fn record_lit_expected_fields( - type_name: Option, - scope: &Rc, -) -> Rc>> { +pub fn record_lit_expected_fields(type_name: Option, scope: &Rc) -> Rc>> { match type_name { - Some(tn) => match lookup_type_by_name(&scope.type_env.clone(), tn.clone()) { - Some(direct) => direct.children.clone(), - None => match lookup_variant_parent_enum(&scope, &tn) { - Some(parent_name) => { - match lookup_type_by_name(&scope.type_env.clone(), parent_name.clone()) { - Some(parent) => match Rc::new({ - let mut __result = Vec::new(); - for v in parent.children.clone().iter().cloned() { - if (authored_name_at( - scope.type_env.clone().source_indices.clone(), - &v, - ) - .as_str() - == tn.clone().as_str()) - { - __result.push(v); - } - } - __result - }) - .first() - .cloned() - { - Some(variant) => variant.children.clone(), - None => Rc::new(vec![]), - }, - None => Rc::new(vec![]), - } - } - None => Rc::new(vec![]), - }, - }, - None => Rc::new(vec![]), - } + Some(tn) => match lookup_type_by_name(&scope.type_env.clone(), tn.clone()) { + Some(direct) => direct.children.clone(), + None => match lookup_variant_parent_enum(&scope, &tn) { + Some(parent_name) => match lookup_type_by_name(&scope.type_env.clone(), parent_name.clone()) { + Some(parent) => match Rc::new({ let mut __result = Vec::new(); for v in parent.children.clone().iter().cloned() { if (authored_name_at(scope.type_env.clone().source_indices.clone(), &v).as_str() == tn.clone().as_str()) { __result.push(v); } } __result }).first().cloned() { + Some(variant) => variant.children.clone(), + None => Rc::new(vec![]), +}, + None => Rc::new(vec![]), +}, + None => Rc::new(vec![]), +}, +}, + None => Rc::new(vec![]), +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -908,11 +568,11 @@ pub struct KernelListTyDiag { pub fn list_kernel_ty_from_element(element: Rc) -> Rc { { let b = make_container_type(&"List".to_string(), element); - Rc::new(KernelListTyDiag { - ty: b.ty.clone(), - miss_diags: b.diagnostics.clone(), - }) - } +Rc::new(KernelListTyDiag { + ty: b.ty.clone(), + miss_diags: b.diagnostics.clone(), +}) +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -921,118 +581,93 @@ pub struct Tier2bBt { pub kernel_diags: Rc>>, } -pub fn infer_tier2b_builtin_with_kernel_diags( - func_name: &String, - typed_args: Rc>>, - scope: Rc, - span: Rc, -) -> Rc { - if ((func_name.clone().as_str() == "lookup".to_string().as_str()) - || (func_name.clone().as_str() == "map_get".to_string().as_str())) - { +pub fn infer_tier2b_builtin_with_kernel_diags(func_name: &String, typed_args: Rc>>, scope: Rc, span: Rc) -> Rc { + if ((func_name.clone().as_str() == "lookup".to_string().as_str()) || (func_name.clone().as_str() == "map_get".to_string().as_str())) { Rc::new(Tier2bBt { - bt: match typed_args.first().cloned() { - Some(receiver_arg) => match arg_value(&receiver_arg) - .inferred - .clone() - .as_deref() - .cloned() - { - Some(InferredNode::Resolved { - node: receiver_type, - .. - }) => { - match map_value_type_in_env(receiver_type.clone(), &scope.type_env.clone()) - { - Some(value_type) => with_optional_cardinality(&value_type), - None => resolve_builtin_call_type(func_name.clone()), - } - } - _ => resolve_builtin_call_type(func_name.clone()), - }, - None => resolve_builtin_call_type(func_name.clone()), - }, - kernel_diags: Rc::new(vec![]), - }) + bt: match typed_args.first().cloned() { + Some(receiver_arg) => match arg_value(&receiver_arg).inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: receiver_type, .. }) => match map_value_type_in_env(receiver_type.clone(), &scope.type_env.clone()) { + Some(value_type) => with_optional_cardinality(&value_type), + None => resolve_builtin_call_type(func_name.clone()), +}, + _ => resolve_builtin_call_type(func_name.clone()), +}, + None => resolve_builtin_call_type(func_name.clone()), +}, + kernel_diags: Rc::new(vec![]), +}) } else { if (func_name.clone().as_str() == "map_keys".to_string().as_str()) { match typed_args.first().cloned() { - Some(receiver_arg) => match arg_value(&receiver_arg) - .inferred - .clone() - .as_deref() - .cloned() - { - Some(InferredNode::Resolved { - node: receiver_type, - .. - }) => match map_key_type_in_env(receiver_type.clone(), &scope.type_env.clone()) - { - Some(key_type) => { - let lk = list_kernel_ty_from_element(key_type.clone()); - Rc::new(Tier2bBt { - bt: lk.ty.clone(), - kernel_diags: lk.miss_diags.clone(), - }) - } - None => Rc::new(Tier2bBt { - bt: resolve_builtin_call_type(func_name.clone()), - kernel_diags: Rc::new(vec![]), - }), - }, - _ => Rc::new(Tier2bBt { - bt: resolve_builtin_call_type(func_name.clone()), - kernel_diags: Rc::new(vec![]), - }), - }, - None => Rc::new(Tier2bBt { - bt: resolve_builtin_call_type(func_name.clone()), - kernel_diags: Rc::new(vec![]), - }), - } + Some(receiver_arg) => match arg_value(&receiver_arg).inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: receiver_type, .. }) => match map_key_type_in_env(receiver_type.clone(), &scope.type_env.clone()) { + Some(key_type) => { + let lk = list_kernel_ty_from_element(key_type.clone()); +Rc::new(Tier2bBt { + bt: lk.ty.clone(), + kernel_diags: lk.miss_diags.clone(), +}) +}, + None => Rc::new(Tier2bBt { + bt: resolve_builtin_call_type(func_name.clone()), + kernel_diags: Rc::new(vec![]), +}), +}, + _ => Rc::new(Tier2bBt { + bt: resolve_builtin_call_type(func_name.clone()), + kernel_diags: Rc::new(vec![]), +}), +}, + None => Rc::new(Tier2bBt { + bt: resolve_builtin_call_type(func_name.clone()), + kernel_diags: Rc::new(vec![]), +}), +} } else { if (func_name.clone().as_str() == "map_values".to_string().as_str()) { match typed_args.first().cloned() { - Some(receiver_arg) => match arg_value(&receiver_arg) - .inferred - .clone() - .as_deref() - .cloned() - { - Some(InferredNode::Resolved { - node: receiver_type, - .. - }) => match map_value_type_in_env( - receiver_type.clone(), - &scope.type_env.clone(), - ) { - Some(value_type) => { - let lv = list_kernel_ty_from_element(value_type.clone()); - Rc::new(Tier2bBt { - bt: lv.ty.clone(), - kernel_diags: lv.miss_diags.clone(), - }) - } - None => Rc::new(Tier2bBt { - bt: resolve_builtin_call_type(func_name.clone()), - kernel_diags: Rc::new(vec![]), - }), - }, - _ => Rc::new(Tier2bBt { - bt: resolve_builtin_call_type(func_name.clone()), - kernel_diags: Rc::new(vec![]), - }), - }, - None => Rc::new(Tier2bBt { - bt: resolve_builtin_call_type(func_name.clone()), - kernel_diags: Rc::new(vec![]), - }), - } + Some(receiver_arg) => match arg_value(&receiver_arg).inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: receiver_type, .. }) => match map_value_type_in_env(receiver_type.clone(), &scope.type_env.clone()) { + Some(value_type) => { + let lv = list_kernel_ty_from_element(value_type.clone()); +Rc::new(Tier2bBt { + bt: lv.ty.clone(), + kernel_diags: lv.miss_diags.clone(), +}) +}, + None => Rc::new(Tier2bBt { + bt: resolve_builtin_call_type(func_name.clone()), + kernel_diags: Rc::new(vec![]), +}), +}, + _ => Rc::new(Tier2bBt { + bt: resolve_builtin_call_type(func_name.clone()), + kernel_diags: Rc::new(vec![]), +}), +}, + None => Rc::new(Tier2bBt { + bt: resolve_builtin_call_type(func_name.clone()), + kernel_diags: Rc::new(vec![]), +}), +} } else { - Rc::new(Tier2bBt { - bt: resolve_builtin_call_type(func_name.clone()), - kernel_diags: Rc::new(vec![]), - }) + if ((func_name.clone().as_str() == "set_insert".to_string().as_str()) || (func_name.clone().as_str() == "set_union".to_string().as_str())) { + Rc::new(Tier2bBt { + bt: match typed_args.first().cloned() { + Some(receiver_arg) => match arg_value(&receiver_arg).inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: receiver_type, .. }) => receiver_type.clone(), + _ => resolve_builtin_call_type(func_name.clone()), +}, + None => resolve_builtin_call_type(func_name.clone()), +}, + kernel_diags: Rc::new(vec![]), +}) + } else { + Rc::new(Tier2bBt { + bt: resolve_builtin_call_type(func_name.clone()), + kernel_diags: Rc::new(vec![]), +}) + } } } } @@ -1044,571 +679,344 @@ pub struct MethodPipeFallback { pub kernel_diags: Rc>>, } -pub fn method_pipe_map_keys_values_fallback( - recv_rt: &Rc, - method_name: &String, - scope: Rc, - span: Rc, -) -> Rc { +pub fn method_pipe_map_keys_values_fallback(recv_rt: &Rc, method_name: &String, scope: Rc, span: Rc) -> Rc { if (method_name.clone().as_str() == "map_keys".to_string().as_str()) { match map_key_type_in_env(recv_rt.clone(), &scope.type_env.clone()) { - Some(key_type) => { - let lk = list_kernel_ty_from_element(key_type.clone()); - Rc::new(MethodPipeFallback { - result_ty: lk.ty.clone(), - kernel_diags: lk.miss_diags.clone(), - }) - } - None => Rc::new(MethodPipeFallback { - result_ty: recv_rt.clone(), - kernel_diags: Rc::new(vec![]), - }), - } + Some(key_type) => { + let lk = list_kernel_ty_from_element(key_type.clone()); +Rc::new(MethodPipeFallback { + result_ty: lk.ty.clone(), + kernel_diags: lk.miss_diags.clone(), +}) +}, + None => Rc::new(MethodPipeFallback { + result_ty: recv_rt.clone(), + kernel_diags: Rc::new(vec![]), +}), +} } else { if (method_name.clone().as_str() == "map_values".to_string().as_str()) { match map_value_type_in_env(recv_rt.clone(), &scope.type_env.clone()) { - Some(value_type) => { - let lv = list_kernel_ty_from_element(value_type.clone()); - Rc::new(MethodPipeFallback { - result_ty: lv.ty.clone(), - kernel_diags: lv.miss_diags.clone(), - }) - } - None => Rc::new(MethodPipeFallback { - result_ty: recv_rt.clone(), - kernel_diags: Rc::new(vec![]), - }), - } + Some(value_type) => { + let lv = list_kernel_ty_from_element(value_type.clone()); +Rc::new(MethodPipeFallback { + result_ty: lv.ty.clone(), + kernel_diags: lv.miss_diags.clone(), +}) +}, + None => Rc::new(MethodPipeFallback { + result_ty: recv_rt.clone(), + kernel_diags: Rc::new(vec![]), +}), +} } else { Rc::new(MethodPipeFallback { - result_ty: recv_rt.clone(), - kernel_diags: Rc::new(vec![]), - }) + result_ty: recv_rt.clone(), + kernel_diags: Rc::new(vec![]), +}) } } } -pub fn categorized_error( - message: String, - span: Rc, - module_name: String, - category: String, -) -> Rc { - make_error_node( - Rc::new(CompilerDiagnostic::InternalError { - message: message, - span: span, - }), - module_name, - ) -} - -pub fn validate_cast( - source_inferred: Option>, - target_name: &String, - span: Rc, - source_indices: Rc>>, - module_name: String, -) -> Option> { +pub fn categorized_error(message: String, span: Rc, module_name: String, category: String) -> Rc { + make_error_node(Rc::new(CompilerDiagnostic::InternalError { + message: message, + span: span, +}), module_name) +} + +pub fn validate_cast(source_inferred: Option>, target_name: &String, span: Rc, source_indices: Rc>>, module_name: String) -> Option> { match source_inferred.as_deref().cloned() { - Some(InferredNode::Resolved { node: src_node, .. }) => { - let source_name = authored_name_at(source_indices, &src_node); - if (source_name.clone().as_str() == target_name.clone().as_str()) { + Some(InferredNode::Resolved { node: src_node, .. }) => { + let source_name = authored_name_at(source_indices, &src_node); +if (source_name.clone().as_str() == target_name.clone().as_str()) { + None + } else { + if !is_dag_cast_domain_type(source_name.clone()) { None } else { - if !is_dag_cast_domain_type(source_name.clone()) { + if !is_dag_cast_domain_type(target_name.clone()) { None } else { - if !is_dag_cast_domain_type(target_name.clone()) { + if dag_can_cast(source_name.clone(), target_name.clone()) { None } else { - if dag_can_cast(source_name.clone(), target_name.clone()) { - None - } else { - { - let msg = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "invalid cast: ".to_string(), - source_name.clone(), - ), - " as ".to_string(), - ), - target_name.clone(), - ); - let diag = Rc::new(CompilerDiagnostic::InternalError { - message: msg, - span: span, - }); - Some(make_error_node(diag, module_name)) - } - } + { + let msg = v2_rt::concat(v2_rt::concat(v2_rt::concat("invalid cast: ".to_string(), source_name.clone()), " as ".to_string()), target_name.clone()); +let diag = Rc::new(CompilerDiagnostic::InternalError { + message: msg, + span: span, +}); +Some(make_error_node(diag, module_name)) +} } } } } - _ => None, - } +}, + _ => None, +} } pub fn type_variable_node(id: String) -> Rc { Rc::new(Node { - name: "".to_string(), - span: make_span(0, 0), - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::TypeVariable { id: id })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) + name: "".to_string(), + span: make_span(0, 0), + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::TypeVariable { + id: id, +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) } pub fn is_type_variable(inferred: Rc) -> bool { match (*inferred).clone() { - InferredNode::TypeVariable { .. } => true, - _ => false, - } + InferredNode::TypeVariable { .. } => true, + _ => false, +} } -pub fn inferred_or_error( - result: Option>, - fallback_message: String, - fallback_span: Rc, -) -> Rc { +pub fn inferred_or_error(result: Option>, fallback_message: String, fallback_span: Rc) -> Rc { match result { - Some(inferred) => inferred.clone(), - None => Rc::new(InferredNode::CompilerError { - message: fallback_message, - span: fallback_span, - }), - } + Some(inferred) => inferred.clone(), + None => Rc::new(InferredNode::CompilerError { + message: fallback_message, + span: fallback_span, +}), +} } -pub fn resolve_pattern_subject( - scope: Rc, - scrutinee_subject: Rc, -) -> Rc { +pub fn resolve_pattern_subject(scope: Rc, scrutinee_subject: Rc) -> Rc { match (*scrutinee_subject).clone() { - PatternSubject::PatternResolved { - node: scrutinee_type, - .. - } => pattern_subject_from_node(&resolve_scrutinee_type_node( - scope.type_env.clone(), - scrutinee_type.clone(), - )), - PatternSubject::PatternDynamic { - span: dynamic_span, .. - } => Rc::new(PatternSubject::PatternDynamic { - span: dynamic_span.clone(), - }), - PatternSubject::PatternLookupBlocked => Rc::new(PatternSubject::PatternLookupBlocked), - } + PatternSubject::PatternResolved { node: scrutinee_type, .. } => pattern_subject_from_node(&resolve_scrutinee_type_node(scope.type_env.clone(), scrutinee_type.clone())), + PatternSubject::PatternDynamic { span: dynamic_span, .. } => Rc::new(PatternSubject::PatternDynamic { + span: dynamic_span.clone(), +}), + PatternSubject::PatternLookupBlocked => Rc::new(PatternSubject::PatternLookupBlocked), +} } -pub fn annotate_pattern_parent_enums( - pattern: Rc, - scrutinee_subject: Rc, - scope: &Rc, -) -> Rc { +pub fn annotate_pattern_parent_enums(pattern: Rc, scrutinee_subject: Rc, scope: &Rc) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*pattern.clone()).clone() { - MatchPattern::VariantPattern { - name: variant_name, - field_bindings: bindings, - .. - } => { - let resolved_scrut = resolve_pattern_subject(scope.clone(), scrutinee_subject); - let inferred_parent = match (*resolved_scrut.clone()).clone() { - PatternSubject::PatternResolved { - node: resolved_scrut_node, - .. - } => { - if ((resolved_scrut_node.return_cardinality.clone() - == Cardinality::CardOptional) - && ((variant_name.clone().as_str() == "Some".to_string().as_str()) - || (variant_name.clone().as_str() == "None".to_string().as_str()))) - { - Some("Optional".to_string()) - } else { - { - let is_coproduct = - (resolved_scrut_node.connective.clone() == Connective::Disj); - if is_coproduct { - Some(authored_name_at( - scope.type_env.clone().source_indices.clone(), - &resolved_scrut_node, - )) - } else { - None - } - } - } - } - PatternSubject::PatternDynamic { .. } => None, - PatternSubject::PatternLookupBlocked => None, - }; - let variant_lookup = lookup_variant_in_type( - resolved_scrut.clone(), - &variant_name, - scope.module_name.clone(), - &scope.type_env.clone().source_indices.clone(), - ); - let variant_subject = lookup_result_subject(variant_lookup); - let annotated_bindings = Rc::new({ - let mut __result = Vec::new(); - for binding in bindings.clone().iter().cloned() { - __result.push({ - let field_lookup = lookup_field_in_variant( - variant_subject.clone(), - &field_binding_name_at( - binding.clone(), - scope.type_env.clone().source_indices.clone(), - ), - scope.module_name.clone(), - &scope.type_env.clone().source_indices.clone(), - ); - let field_subject = lookup_result_subject(field_lookup.clone()); - make_field_binding_node( - &field_binding_name_at( - binding.clone(), - scope.type_env.clone().source_indices.clone(), - ), - annotate_pattern_parent_enums( - field_binding_pattern(binding.clone()), - field_subject.clone(), - &scope, - ), - binding.span.clone(), - node_name_span(&binding), - ) - }); + MatchPattern::VariantPattern { name: variant_name, field_bindings: bindings, .. } => { + let resolved_scrut = resolve_pattern_subject(scope.clone(), scrutinee_subject); +let inferred_parent = match (*resolved_scrut.clone()).clone() { + PatternSubject::PatternResolved { node: resolved_scrut_node, .. } => if ((resolved_scrut_node.return_cardinality.clone() == Cardinality::CardOptional) && ((variant_name.clone().as_str() == "Some".to_string().as_str()) || (variant_name.clone().as_str() == "None".to_string().as_str()))) { + Some("Optional".to_string()) + } else { + { + let is_coproduct = (resolved_scrut_node.connective.clone() == Connective::Disj); +if is_coproduct { + Some(authored_name_at(scope.type_env.clone().source_indices.clone(), &resolved_scrut_node)) + } else { + None } - __result - }); - match inferred_parent { - Some(parent_name) => Rc::new(MatchPattern::VariantPattern { - name: variant_name.clone(), - parent_enum: Some(parent_name.clone()), - field_bindings: annotated_bindings, - }), - None => Rc::new(MatchPattern::VariantPattern { - name: variant_name.clone(), - parent_enum: None, - field_bindings: annotated_bindings, - }), - } - } - _ => pattern.clone(), - } +} + }, + PatternSubject::PatternDynamic { .. } => None, + PatternSubject::PatternLookupBlocked => None, +}; +let variant_lookup = lookup_variant_in_type(resolved_scrut.clone(), &variant_name, scope.module_name.clone(), &scope.type_env.clone().source_indices.clone()); +let variant_subject = lookup_result_subject(variant_lookup); +let annotated_bindings = Rc::new({ let mut __result = Vec::new(); for binding in bindings.clone().iter().cloned() { __result.push({ + let field_lookup = lookup_field_in_variant(variant_subject.clone(), &field_binding_name_at(binding.clone(), scope.type_env.clone().source_indices.clone()), scope.module_name.clone(), &scope.type_env.clone().source_indices.clone()); +let field_subject = lookup_result_subject(field_lookup.clone()); +make_field_binding_node(&field_binding_name_at(binding.clone(), scope.type_env.clone().source_indices.clone()), annotate_pattern_parent_enums(field_binding_pattern(binding.clone()), field_subject.clone(), &scope), binding.span.clone(), node_name_span(&binding)) +}); } __result }); +match inferred_parent { + Some(parent_name) => Rc::new(MatchPattern::VariantPattern { + name: variant_name.clone(), + parent_enum: Some(parent_name.clone()), + field_bindings: annotated_bindings, +}), + None => Rc::new(MatchPattern::VariantPattern { + name: variant_name.clone(), + parent_enum: None, + field_bindings: annotated_bindings, +}), +} +}, + _ => pattern.clone(), +} }) } pub fn build_params_scope(scope: &Rc, params: Rc>>) -> Rc { { - let new_locals = params.iter().cloned().fold( - scope.locals.clone(), - |acc: Rc>>, p: Rc| { - v2_rt::rc_map_insert( - acc, - param_node_name_at(p.clone(), scope.type_env.clone().source_indices.clone()), - Rc::new(TypeBinding { - name: param_node_name_at( - p.clone(), - scope.type_env.clone().source_indices.clone(), - ), - resolved: param_node_type_expr(&p), - provenance: Rc::new(SubValueRelation::PreservedValue), - }), - ) - }, - ); - Rc::new(InferScope { - type_env: scope.type_env.clone(), - func_env: scope.func_env.clone(), - locals: new_locals, - match_bound_names: scope.match_bound_names.clone(), - module_name: scope.module_name.clone(), - service_registry: scope.service_registry.clone(), - item_registry: scope.item_registry.clone(), - lambda_param_provenance: v2_rt::rc_empty_map::>(), - }) - } + let new_locals = params.iter().cloned().fold(scope.locals.clone(), |acc: Rc>>, p: Rc| v2_rt::rc_map_insert(acc, param_node_name_at(p.clone(), scope.type_env.clone().source_indices.clone()), Rc::new(TypeBinding { + name: param_node_name_at(p.clone(), scope.type_env.clone().source_indices.clone()), + resolved: param_node_type_expr(&p), + provenance: Rc::new(SubValueRelation::PreservedValue), +}))); +Rc::new(InferScope { + type_env: scope.type_env.clone(), + func_env: scope.func_env.clone(), + locals: new_locals, + match_bound_names: scope.match_bound_names.clone(), + module_name: scope.module_name.clone(), + service_registry: scope.service_registry.clone(), + item_registry: scope.item_registry.clone(), + lambda_param_provenance: v2_rt::rc_empty_map::>(), +}) +} } -pub fn extend_scope( - scope: &Rc, - name: &String, - resolved: Rc, - provenance: Rc, -) -> Rc { +pub fn extend_scope(scope: &Rc, name: &String, resolved: Rc, provenance: Rc) -> Rc { Rc::new(InferScope { - type_env: scope.type_env.clone(), - func_env: scope.func_env.clone(), - locals: v2_rt::rc_map_insert( - scope.locals.clone(), - name.clone(), - Rc::new(TypeBinding { - name: name.clone(), - resolved: resolved, - provenance: provenance, - }), - ), - match_bound_names: scope.match_bound_names.clone(), - module_name: scope.module_name.clone(), - service_registry: scope.service_registry.clone(), - item_registry: scope.item_registry.clone(), - lambda_param_provenance: scope.lambda_param_provenance.clone(), - }) + type_env: scope.type_env.clone(), + func_env: scope.func_env.clone(), + locals: v2_rt::rc_map_insert(scope.locals.clone(), name.clone(), Rc::new(TypeBinding { + name: name.clone(), + resolved: resolved, + provenance: provenance, +})), + match_bound_names: scope.match_bound_names.clone(), + module_name: scope.module_name.clone(), + service_registry: scope.service_registry.clone(), + item_registry: scope.item_registry.clone(), + lambda_param_provenance: scope.lambda_param_provenance.clone(), +}) } -pub fn extend_scope_match_bound( - scope: &Rc, - name: &String, - resolved: Rc, - provenance: Rc, -) -> Rc { +pub fn extend_scope_match_bound(scope: &Rc, name: &String, resolved: Rc, provenance: Rc) -> Rc { Rc::new(InferScope { - type_env: scope.type_env.clone(), - func_env: scope.func_env.clone(), - locals: v2_rt::rc_map_insert( - scope.locals.clone(), - name.clone(), - Rc::new(TypeBinding { - name: name.clone(), - resolved: resolved, - provenance: provenance, - }), - ), - match_bound_names: v2_rt::rc_map_insert( - scope.match_bound_names.clone(), - name.clone(), - true, - ), - module_name: scope.module_name.clone(), - service_registry: scope.service_registry.clone(), - item_registry: scope.item_registry.clone(), - lambda_param_provenance: scope.lambda_param_provenance.clone(), - }) + type_env: scope.type_env.clone(), + func_env: scope.func_env.clone(), + locals: v2_rt::rc_map_insert(scope.locals.clone(), name.clone(), Rc::new(TypeBinding { + name: name.clone(), + resolved: resolved, + provenance: provenance, +})), + match_bound_names: v2_rt::rc_map_insert(scope.match_bound_names.clone(), name.clone(), true), + module_name: scope.module_name.clone(), + service_registry: scope.service_registry.clone(), + item_registry: scope.item_registry.clone(), + lambda_param_provenance: scope.lambda_param_provenance.clone(), +}) } pub fn extend_scope_with_params(scope: &Rc, params: Rc>) -> Rc { { - let new_locals = params.iter().cloned().fold( - scope.locals.clone(), - |acc: Rc>>, p: String| { - v2_rt::rc_map_insert( - acc, - p.clone(), - Rc::new(TypeBinding { - name: p.clone(), - resolved: type_variable_node("lambda_param".to_string()), - provenance: Rc::new(SubValueRelation::SubValueUnknown), - }), - ) - }, - ); - Rc::new(InferScope { - type_env: scope.type_env.clone(), - func_env: scope.func_env.clone(), - locals: new_locals, - match_bound_names: scope.match_bound_names.clone(), - module_name: scope.module_name.clone(), - service_registry: scope.service_registry.clone(), - item_registry: scope.item_registry.clone(), - lambda_param_provenance: scope.lambda_param_provenance.clone(), - }) - } + let new_locals = params.iter().cloned().fold(scope.locals.clone(), |acc: Rc>>, p: String| v2_rt::rc_map_insert(acc, p.clone(), Rc::new(TypeBinding { + name: p.clone(), + resolved: type_variable_node("lambda_param".to_string()), + provenance: Rc::new(SubValueRelation::SubValueUnknown), +}))); +Rc::new(InferScope { + type_env: scope.type_env.clone(), + func_env: scope.func_env.clone(), + locals: new_locals, + match_bound_names: scope.match_bound_names.clone(), + module_name: scope.module_name.clone(), + service_registry: scope.service_registry.clone(), + item_registry: scope.item_registry.clone(), + lambda_param_provenance: scope.lambda_param_provenance.clone(), +}) +} } -pub fn scope_after_stmt_node( - stmt: &Rc, - stmt_type: Rc, - scope: &Rc, -) -> Rc { +pub fn scope_after_stmt_node(stmt: &Rc, stmt_type: Rc, scope: &Rc) -> Rc { match (*stmt.expr_data.clone()).clone() { - ExprData::ExprLet => { - if ((stmt.children.clone().len() as i64) <= 1) { - { - let val = match stmt.children.clone().first().cloned() { - Some(v) => v.clone(), - None => stmt.clone(), - }; - extend_scope( - &scope, - &let_binding_name_at( - stmt.clone(), - scope.type_env.clone().source_indices.clone(), - ), - stmt_type, - classify_binding_provenance(&val, &scope), - ) - } - } else { - scope.clone() - } - } - _ => scope.clone(), - } + ExprData::ExprLet => if ((stmt.children.clone().len() as i64) <= 1) { + { + let val = match stmt.children.clone().first().cloned() { + Some(v) => v.clone(), + None => stmt.clone(), +}; +extend_scope(&scope, &let_binding_name_at(stmt.clone(), scope.type_env.clone().source_indices.clone()), stmt_type, classify_binding_provenance(&val, &scope)) +} + } else { + scope.clone() + }, + _ => scope.clone(), +} } -pub fn derive_field_provenance( - scope: &Rc, - scrutinee_provenance: &Rc, - scrutinee_subject: Rc, - variant_name: String, - field_name: String, -) -> Rc { +pub fn derive_field_provenance(scope: &Rc, scrutinee_provenance: &Rc, scrutinee_subject: Rc, variant_name: String, field_name: String) -> Rc { match (*scrutinee_provenance.clone()).clone() { - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - _ => { - let scrut_type_name = match (*scrutinee_subject).clone() { - PatternSubject::PatternResolved { node: n, .. } => authored_name_at( - scope.type_env.clone().source_indices.clone(), - &resolved_type(n.clone()), - ), - _ => "".to_string(), - }; - if (scrut_type_name.clone().as_str() == "".to_string().as_str()) { - Rc::new(SubValueRelation::SubValueUnknown) - } else { - { - let ind_fields = - inductive_fields_for(scope.type_env.clone(), scrut_type_name.clone()); - let matching = Rc::new({ - let mut __result = Vec::new(); - for f in ind_fields.iter().cloned() { - if ((f.variant_name.clone().as_str() == variant_name.clone().as_str()) - && (f.field_name.clone().as_str() == field_name.clone().as_str())) - { - __result.push(f); - } - } - __result - }) - .first() - .cloned(); - match matching { - Some(ind_field) => { - compose_sub_value(scrutinee_provenance.clone(), ind_field.clone()) - } - None => Rc::new(SubValueRelation::SubValueUnknown), - } - } - } + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + _ => { + let scrut_type_name = match (*scrutinee_subject).clone() { + PatternSubject::PatternResolved { node: n, .. } => authored_name_at(scope.type_env.clone().source_indices.clone(), &resolved_type(n.clone())), + _ => "".to_string(), +}; +if (scrut_type_name.clone().as_str() == "".to_string().as_str()) { + Rc::new(SubValueRelation::SubValueUnknown) + } else { + { + let ind_fields = inductive_fields_for(scope.type_env.clone(), scrut_type_name.clone()); +let matching = Rc::new({ let mut __result = Vec::new(); for f in ind_fields.iter().cloned() { if ((f.variant_name.clone().as_str() == variant_name.clone().as_str()) && (f.field_name.clone().as_str() == field_name.clone().as_str())) { __result.push(f); } } __result }).first().cloned(); +match matching { + Some(ind_field) => compose_sub_value(scrutinee_provenance.clone(), ind_field.clone()), + None => Rc::new(SubValueRelation::SubValueUnknown), +} +} } - } +}, +} } -pub fn extend_scope_with_pattern_node( - scope: &Rc, - pattern: Rc, - scrutinee_subject: &Rc, - scrutinee_provenance: Rc, -) -> Rc { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*pattern).clone() { - MatchPattern::Bind { name: n, .. } => Rc::new(PatternScopeResult { - scope: extend_scope_match_bound( - &scope, - &n, - pattern_binding_type(scrutinee_subject.clone()), - scrutinee_provenance.clone(), - ), - diagnostics: Rc::new(vec![]), - }), - MatchPattern::Wildcard => Rc::new(PatternScopeResult { - scope: scope.clone(), - diagnostics: Rc::new(vec![]), - }), - MatchPattern::LitPattern { .. } => Rc::new(PatternScopeResult { - scope: scope.clone(), - diagnostics: Rc::new(vec![]), - }), - MatchPattern::VariantPattern { - name: vname, - field_bindings: bindings, - .. - } => { +pub fn extend_scope_with_pattern_node(scope: &Rc, pattern: Rc, scrutinee_subject: &Rc, scrutinee_provenance: Rc) -> Rc { + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { + match (*pattern).clone() { + MatchPattern::Bind { name: n, .. } => Rc::new(PatternScopeResult { + scope: extend_scope_match_bound(&scope, &n, pattern_binding_type(scrutinee_subject.clone()), scrutinee_provenance.clone()), + diagnostics: Rc::new(vec![]), +}), + MatchPattern::Wildcard => Rc::new(PatternScopeResult { + scope: scope.clone(), + diagnostics: Rc::new(vec![]), +}), + MatchPattern::LitPattern { .. } => Rc::new(PatternScopeResult { + scope: scope.clone(), + diagnostics: Rc::new(vec![]), +}), + MatchPattern::VariantPattern { name: vname, field_bindings: bindings, .. } => { let resolved_scrut = resolve_pattern_subject(scope.clone(), scrutinee_subject.clone()); - let variant_lookup = lookup_variant_in_type( - resolved_scrut, - &vname, - scope.module_name.clone(), - &scope.type_env.clone().source_indices.clone(), - ); - let variant_subject = lookup_result_subject(variant_lookup.clone()); - let variant_diags = variant_lookup.diagnostics.clone(); - bindings.clone().iter().cloned().fold( - Rc::new(PatternScopeResult { - scope: scope.clone(), - diagnostics: variant_diags, - }), - |acc: Rc, fb: Rc| { - let field_name = field_binding_name_at( - fb.clone(), - scope.type_env.clone().source_indices.clone(), - ); - let field_lookup = lookup_field_in_variant( - variant_subject.clone(), - &field_name, - scope.module_name.clone(), - &scope.type_env.clone().source_indices.clone(), - ); - let field_subject = lookup_result_subject(field_lookup.clone()); - let field_type = pattern_binding_type(field_subject.clone()); - let field_provenance = derive_field_provenance( - &scope, - &scrutinee_provenance, - scrutinee_subject.clone(), - vname.clone(), - field_name.clone(), - ); - let fb_pattern = field_binding_pattern(fb.clone()); - match (*fb_pattern.clone()).clone() { - MatchPattern::Bind { name: n, .. } => Rc::new(PatternScopeResult { - scope: extend_scope_match_bound( - &acc.scope.clone(), - &n, - field_type.clone(), - field_provenance.clone(), - ), - diagnostics: v2_rt::concat( - acc.diagnostics.clone(), - field_lookup.diagnostics.clone(), - ), - }), - _ => { - let nested = extend_scope_with_pattern_node( - &acc.scope.clone(), - fb_pattern.clone(), - &field_subject, - field_provenance.clone(), - ); - Rc::new(PatternScopeResult { - scope: nested.scope.clone(), - diagnostics: v2_rt::concat( - acc.diagnostics.clone(), - v2_rt::concat( - field_lookup.diagnostics.clone(), - nested.diagnostics.clone(), - ), - ), - }) - } - } - }, - ) - } +let variant_lookup = lookup_variant_in_type(resolved_scrut, &vname, scope.module_name.clone(), &scope.type_env.clone().source_indices.clone()); +let variant_subject = lookup_result_subject(variant_lookup.clone()); +let variant_diags = variant_lookup.diagnostics.clone(); +bindings.clone().iter().cloned().fold(Rc::new(PatternScopeResult { + scope: scope.clone(), + diagnostics: variant_diags, +}), |acc: Rc, fb: Rc| { + let field_name = field_binding_name_at(fb.clone(), scope.type_env.clone().source_indices.clone()); +let field_lookup = lookup_field_in_variant(variant_subject.clone(), &field_name, scope.module_name.clone(), &scope.type_env.clone().source_indices.clone()); +let field_subject = lookup_result_subject(field_lookup.clone()); +let field_type = pattern_binding_type(field_subject.clone()); +let field_provenance = derive_field_provenance(&scope, &scrutinee_provenance, scrutinee_subject.clone(), vname.clone(), field_name.clone()); +let fb_pattern = field_binding_pattern(fb.clone()); +match (*fb_pattern.clone()).clone() { + MatchPattern::Bind { name: n, .. } => Rc::new(PatternScopeResult { + scope: extend_scope_match_bound(&acc.scope.clone(), &n, field_type.clone(), field_provenance.clone()), + diagnostics: v2_rt::concat(acc.diagnostics.clone(), field_lookup.diagnostics.clone()), +}), + _ => { + let nested = extend_scope_with_pattern_node(&acc.scope.clone(), fb_pattern.clone(), &field_subject, field_provenance.clone()); +Rc::new(PatternScopeResult { + scope: nested.scope.clone(), + diagnostics: v2_rt::concat(acc.diagnostics.clone(), v2_rt::concat(field_lookup.diagnostics.clone(), nested.diagnostics.clone())), +}) +}, +} +}) +}, +} }) } @@ -1620,298 +1028,164 @@ pub fn method_name_is(opt: &Option, expected: String) -> bool { } } -pub fn arg_has_name( - arg: Rc, - name: String, - source_indices: Rc>>, -) -> bool { +pub fn arg_has_name(arg: Rc, name: String, source_indices: Rc>>) -> bool { { let n = arg_name_at(arg, source_indices); - if (n.clone() == None) { +if (n.clone() == None) { false } else { (n.clone().unwrap().as_str() == name.as_str()) } - } +} } -pub fn extract_fold_init_info( - method_name: Option, - method_args: &Rc>>, - min_args: i64, - scope: &Rc, - expected: Option>, -) -> Option> { +pub fn extract_fold_init_info(method_name: Option, method_args: &Rc>>, min_args: i64, scope: &Rc, expected: Option>) -> Option> { { let is_fold = method_name_is(&method_name, "fold".to_string()); - if (is_fold && ((method_args.clone().len() as i64) >= min_args)) { +if (is_fold && ((method_args.clone().len() as i64) >= min_args)) { { - let init_arg = match Rc::new({ - let mut __result = Vec::new(); - for a in method_args.clone().iter().cloned() { - if arg_has_name( - a.clone(), - "init".to_string(), - scope.type_env.clone().source_indices.clone(), - ) { - __result.push(a); - } - } - __result - }) - .first() - .cloned() - { - Some(a) => Some(a.clone()), - None => method_args.clone().first().cloned(), - }; - match init_arg { - Some(ia) => { - let init_result = infer_expr(&arg_value(&ia), &scope, &expected); - Some(Rc::new(ArgInferResult { - typed_arg: make_arg_node( - arg_name_at( - ia.clone(), - scope.type_env.clone().source_indices.clone(), - ), - init_result.typed.clone(), - ia.span.clone(), - ia.span.clone(), - ), - diagnostics: init_result.diagnostics.clone(), - })) - } - None => None, - } - } + let init_arg = match Rc::new({ let mut __result = Vec::new(); for a in method_args.clone().iter().cloned() { if arg_has_name(a.clone(), "init".to_string(), scope.type_env.clone().source_indices.clone()) { __result.push(a); } } __result }).first().cloned() { + Some(a) => Some(a.clone()), + None => method_args.clone().first().cloned(), +}; +match init_arg { + Some(ia) => { + let init_result = infer_expr(&arg_value(&ia), &scope, &expected); +Some(Rc::new(ArgInferResult { + typed_arg: make_arg_node(arg_name_at(ia.clone(), scope.type_env.clone().source_indices.clone()), init_result.typed.clone(), ia.span.clone(), ia.span.clone()), + diagnostics: init_result.diagnostics.clone(), +})) +}, + None => None, +} +} } else { None } - } +} } -pub fn derive_element_provenance( - coll_expr: Rc, - elem_type: &Rc, - scope: &Rc, -) -> Rc { +pub fn derive_element_provenance(coll_expr: Rc, elem_type: &Rc, scope: &Rc) -> Rc { { let coll_prov = classify_binding_provenance(&coll_expr, &scope); - match (*coll_prov).clone() { - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - _ => { - if (authored_name_at(scope.type_env.clone().source_indices.clone(), &elem_type) - .as_str() - == "".to_string().as_str()) - { - Rc::new(SubValueRelation::SubValueUnknown) - } else { - { - let ind_fields = inductive_fields_for( - scope.type_env.clone(), - authored_name_at( - scope.type_env.clone().source_indices.clone(), - &elem_type, - ), - ); - let list_field = Rc::new({ - let mut __result = Vec::new(); - for f in ind_fields.iter().cloned() { - if match f.shape.clone() { - RecursionShape::ListRecursion => true, - _ => false, - } { - __result.push(f); - } - } - __result - }) - .first() - .cloned(); - match list_field { - Some(f) => { - Rc::new(SubValueRelation::IteratedSubValue { field: f.clone() }) - } - None => Rc::new(SubValueRelation::SubValueUnknown), - } - } - } - } - } - } +match (*coll_prov).clone() { + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + _ => if (authored_name_at(scope.type_env.clone().source_indices.clone(), &elem_type).as_str() == "".to_string().as_str()) { + Rc::new(SubValueRelation::SubValueUnknown) + } else { + { + let ind_fields = inductive_fields_for(scope.type_env.clone(), authored_name_at(scope.type_env.clone().source_indices.clone(), &elem_type)); +let list_field = Rc::new({ let mut __result = Vec::new(); for f in ind_fields.iter().cloned() { if match f.shape.clone() { + RecursionShape::ListRecursion => true, + _ => false, +} { __result.push(f); } } __result }).first().cloned(); +match list_field { + Some(f) => Rc::new(SubValueRelation::IteratedSubValue { + field: f.clone(), +}), + None => Rc::new(SubValueRelation::SubValueUnknown), +} +} + }, +} +} } -pub fn infer_method_args_with_fold( - method_name: Option, - method_args: Rc>>, - fold_info: Option>, - fold_acc_type: Rc, - element_type: Rc, - elem_provenance: Rc, - scope: Rc, -) -> Rc>> { +pub fn infer_method_args_with_fold(method_name: Option, method_args: Rc>>, fold_info: Option>, fold_acc_type: Rc, element_type: Rc, elem_provenance: Rc, scope: Rc) -> Rc>> { { let is_fold = method_name_is(&method_name, "fold".to_string()); - Rc::new({ - let mut __result = Vec::new(); - for idx_pair in Rc::new( - method_args - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - __result.push({ - let a = idx_pair.1.clone(); - let idx = idx_pair.0.clone(); - let is_init_arg = (arg_has_name( - a.clone(), - "init".to_string(), - scope.type_env.clone().source_indices.clone(), - ) || ((arg_name_at( - a.clone(), - scope.type_env.clone().source_indices.clone(), - ) == None) - && (idx.clone() == 0))); - if ((is_fold.clone() && (fold_info.clone() != None)) && is_init_arg.clone()) { - match fold_info.clone() { - Some(fi) => fi.clone(), - None => infer_arg_with_element_type(&a, element_type.clone(), &scope), - } - } else { - if (is_fold.clone() && (fold_info.clone() != None)) { - { - let fold_params = Rc::new(vec![ - make_param_node( - &"acc".to_string(), - fold_acc_type.clone(), - None, - no_span(), - no_span(), - ), - make_param_node( - &"elem".to_string(), - element_type.clone(), - None, - no_span(), - no_span(), - ), - ]); - let fold_callable = Rc::new(Node { - name: "".to_string(), - span: no_span(), - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: fold_params.clone(), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let lam_value = arg_value(&a); - let prov_map = match (*elem_provenance.clone()).clone() { - SubValueRelation::SubValueUnknown => { - v2_rt::rc_empty_map::>() - } - _ => v2_rt::rc_map_insert( - v2_rt::rc_empty_map::>(), - "elem".to_string(), - elem_provenance.clone(), - ), - }; - let fold_scope = Rc::new(InferScope { - type_env: scope.type_env.clone(), - func_env: scope.func_env.clone(), - locals: scope.locals.clone(), - match_bound_names: scope.match_bound_names.clone(), - module_name: scope.module_name.clone(), - service_registry: scope.service_registry.clone(), - item_registry: scope.item_registry.clone(), - lambda_param_provenance: prov_map.clone(), - }); - let ar = infer_expr( - &lam_value, - &fold_scope, - &Some(fold_callable.clone()), - ); - Rc::new(ArgInferResult { - typed_arg: make_arg_node( - arg_name_at( - a.clone(), - scope.type_env.clone().source_indices.clone(), - ), - ar.typed.clone(), - a.span.clone(), - a.span.clone(), - ), - diagnostics: ar.diagnostics.clone(), - }) - } +Rc::new({ let mut __result = Vec::new(); for idx_pair in Rc::new(method_args.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ + let a = idx_pair.1.clone(); +let idx = idx_pair.0.clone(); +let is_init_arg = (arg_has_name(a.clone(), "init".to_string(), scope.type_env.clone().source_indices.clone()) || ((arg_name_at(a.clone(), scope.type_env.clone().source_indices.clone()) == None) && (idx.clone() == 0))); +if ((is_fold.clone() && (fold_info.clone() != None)) && is_init_arg.clone()) { + match fold_info.clone() { + Some(fi) => fi.clone(), + None => infer_arg_with_element_type(&a, element_type.clone(), &scope), +} + } else { + if (is_fold.clone() && (fold_info.clone() != None)) { + { + let fold_params = Rc::new(vec![make_param_node(&"acc".to_string(), fold_acc_type.clone(), None, no_span(), no_span()), make_param_node(&"elem".to_string(), element_type.clone(), None, no_span(), no_span())]); +let fold_callable = Rc::new(Node { + name: "".to_string(), + span: no_span(), + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: fold_params.clone(), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let lam_value = arg_value(&a); +let prov_map = match (*elem_provenance.clone()).clone() { + SubValueRelation::SubValueUnknown => v2_rt::rc_empty_map::>(), + _ => v2_rt::rc_map_insert(v2_rt::rc_empty_map::>(), "elem".to_string(), elem_provenance.clone()), +}; +let fold_scope = Rc::new(InferScope { + type_env: scope.type_env.clone(), + func_env: scope.func_env.clone(), + locals: scope.locals.clone(), + match_bound_names: scope.match_bound_names.clone(), + module_name: scope.module_name.clone(), + service_registry: scope.service_registry.clone(), + item_registry: scope.item_registry.clone(), + lambda_param_provenance: prov_map.clone(), +}); +let ar = infer_expr(&lam_value, &fold_scope, &Some(fold_callable.clone())); +Rc::new(ArgInferResult { + typed_arg: make_arg_node(arg_name_at(a.clone(), scope.type_env.clone().source_indices.clone()), ar.typed.clone(), a.span.clone(), a.span.clone()), + diagnostics: ar.diagnostics.clone(), +}) +} + } else { + { + let nf_lam_value = arg_value(&a); +let nf_prov_map = match (*elem_provenance.clone()).clone() { + SubValueRelation::SubValueUnknown => v2_rt::rc_empty_map::>(), + _ => v2_rt::rc_map_insert(v2_rt::rc_empty_map::>(), "elem".to_string(), elem_provenance.clone()), +}; +let nf_scope = if is_lambda_expr(nf_lam_value.clone()) { + Rc::new(InferScope { + type_env: scope.type_env.clone(), + func_env: scope.func_env.clone(), + locals: scope.locals.clone(), + match_bound_names: scope.match_bound_names.clone(), + module_name: scope.module_name.clone(), + service_registry: scope.service_registry.clone(), + item_registry: scope.item_registry.clone(), + lambda_param_provenance: nf_prov_map.clone(), +}) } else { - { - let nf_lam_value = arg_value(&a); - let nf_prov_map = match (*elem_provenance.clone()).clone() { - SubValueRelation::SubValueUnknown => { - v2_rt::rc_empty_map::>() - } - _ => v2_rt::rc_map_insert( - v2_rt::rc_empty_map::>(), - "elem".to_string(), - elem_provenance.clone(), - ), - }; - let nf_scope = if is_lambda_expr(nf_lam_value.clone()) { - Rc::new(InferScope { - type_env: scope.type_env.clone(), - func_env: scope.func_env.clone(), - locals: scope.locals.clone(), - match_bound_names: scope.match_bound_names.clone(), - module_name: scope.module_name.clone(), - service_registry: scope.service_registry.clone(), - item_registry: scope.item_registry.clone(), - lambda_param_provenance: nf_prov_map.clone(), - }) - } else { - scope.clone() - }; - infer_arg_with_element_type(&a, element_type.clone(), &nf_scope) - } - } - } - }); + scope.clone() + }; +infer_arg_with_element_type(&a, element_type.clone(), &nf_scope) +} + } } - __result - }) - } +}); } __result }) +} } pub fn is_lambda_expr(e: Rc) -> bool { match (*e.expr_data.clone()).clone() { - ExprData::ExprLambda => true, - _ => false, - } + ExprData::ExprLambda => true, + _ => false, +} } pub fn seed_override_map() -> Rc>> { - Rc::new(vec!["".to_string()]).iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, k: String| { - v2_rt::rc_map_insert(acc, k.clone(), unit_type()) - }, - ) + Rc::new(vec!["".to_string()]).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, k: String| v2_rt::rc_map_insert(acc, k.clone(), unit_type())) } pub fn fold_override_map(key: String, value: Rc) -> Rc>> { @@ -1922,704 +1196,355 @@ pub fn empty_override_map() -> Rc>> { seed_override_map() } -pub fn infer_arg_with_element_type( - arg: &Rc, - element_type: Rc, - scope: &Rc, -) -> Rc { +pub fn infer_arg_with_element_type(arg: &Rc, element_type: Rc, scope: &Rc) -> Rc { { let ar = infer_expr(&arg_value(&arg), &scope, &Some(element_type)); - Rc::new(ArgInferResult { - typed_arg: make_arg_node( - arg_name_at(arg.clone(), scope.type_env.clone().source_indices.clone()), - ar.typed.clone(), - arg.span.clone(), - arg.span.clone(), - ), - diagnostics: ar.diagnostics.clone(), - }) - } +Rc::new(ArgInferResult { + typed_arg: make_arg_node(arg_name_at(arg.clone(), scope.type_env.clone().source_indices.clone()), ar.typed.clone(), arg.span.clone(), arg.span.clone()), + diagnostics: ar.diagnostics.clone(), +}) +} } -pub fn infer_expr( - texpr: &Rc, - scope: &Rc, - expected: &Option>, -) -> Rc { +pub fn infer_expr(texpr: &Rc, scope: &Rc, expected: &Option>) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprLiteral { value: lit, .. } => { - let span = texpr.span.clone(); - ok_infer(make_expr_node( - Rc::new(ExprData::ExprLiteral { value: lit.clone() }), - Rc::new(vec![]), - Some(Rc::new(InferredNode::Resolved { - node: infer_literal_node(lit.clone()), - })), - span.clone(), - )) - } - ExprData::ExprError { kind, message, .. } => { - let span = texpr.span.clone(); + ExprData::ExprLiteral { value: lit, .. } => { + let span = texpr.span.clone(); +ok_infer(make_expr_node(Rc::new(ExprData::ExprLiteral { + value: lit.clone(), +}), Rc::new(vec![]), Some(Rc::new(InferredNode::Resolved { + node: infer_literal_node(lit.clone()), +})), span.clone())) +}, + ExprData::ExprError { kind, message, .. } => { + let span = texpr.span.clone(); +Rc::new(InferResult { + typed: make_expr_error_node(kind.clone(), &message, &span), + diagnostics: Rc::new(vec![]), +}) +}, + ExprData::ExprVar { .. } => { + let name = expr_var_name_at(texpr.clone(), scope.type_env.clone().source_indices.clone()); +let span = texpr.span.clone(); +match v2_rt::map_get(&scope.locals.clone(), name.clone()) { + Some(binding) => { + let binding_kind = infer_var_binding_kind(&scope, &name); +ok_infer(make_named_expr_node(&name, Rc::new(ExprData::ExprVar { + binding_kind: Some(binding_kind), +}), Rc::new(vec![]), Some(Rc::new(InferredNode::Resolved { + node: binding.resolved.clone(), +})), span.clone(), span.clone())) +}, + None => match lookup_func_sig(scope.func_env.clone(), name.clone()) { + Some(fsig) => if ((fsig.params.clone().len() as i64) == 0) { + ok_infer(make_named_expr_node(&name, Rc::new(ExprData::ExprCall { + call_semantics: Some(CallSemantics::PlainCallSemantics), + descent_evidence: None, +}), Rc::new(vec![]), Some(Rc::new(InferredNode::Resolved { + node: fsig.inferred.clone(), +})), span.clone(), span.clone())) + } else { + ok_infer(make_named_expr_node(&name, Rc::new(ExprData::ExprVar { + binding_kind: Some(Rc::new(VarBindingKind::FunctionValueBinding)), +}), Rc::new(vec![]), Some(Rc::new(InferredNode::Resolved { + node: resolved_callable_type(fsig.params.clone(), fsig.inferred.clone()), +})), span.clone(), span.clone())) + }, + None => { + let err_texpr = make_named_expr_node(&name, Rc::new(ExprData::ExprVar { + binding_kind: None, +}), Rc::new(vec![]), Some(Rc::new(InferredNode::Resolved { + node: error_type(), +})), span.clone(), span.clone()); +Rc::new(InferResult { + typed: err_texpr, + diagnostics: Rc::new(vec![inference_error(v2_rt::concat(v2_rt::concat("undefined variable '".to_string(), name.clone()), "'".to_string()), span.clone(), scope.module_name.clone())]), +}) +}, +}, +} +}, + ExprData::ExprFieldAccess { .. } => { + let field_name = field_access_field_at(texpr.clone(), scope.type_env.clone().source_indices.clone()); +let span = texpr.span.clone(); +let base_expr = field_access_base(texpr.clone()); +let base_result = infer_expr(&base_expr, &scope, &None); +let base_typed = base_result.typed.clone(); +let base_diags = base_result.diagnostics.clone(); +let base_rt = resolved_type(base_typed.clone()); +let resolved_base = resolve_scrutinee_type_node(scope.type_env.clone(), base_rt.clone()); +let resolved_base_is_error = if (resolved_base.inferred.clone() != None) { + is_compiler_error(resolved_base.inferred.clone().clone().unwrap()) + } else { + false + }; +if resolved_base_is_error { Rc::new(InferResult { - typed: make_expr_error_node(kind.clone(), &message, &span), - diagnostics: Rc::new(vec![]), - }) - } - ExprData::ExprVar { .. } => { - let name = - expr_var_name_at(texpr.clone(), scope.type_env.clone().source_indices.clone()); - let span = texpr.span.clone(); - match v2_rt::map_get(&scope.locals.clone(), name.clone()) { - Some(binding) => { - let binding_kind = infer_var_binding_kind(&scope, &name); - ok_infer(make_named_expr_node( - &name, - Rc::new(ExprData::ExprVar { - binding_kind: Some(binding_kind), - }), - Rc::new(vec![]), - Some(Rc::new(InferredNode::Resolved { - node: binding.resolved.clone(), - })), - span.clone(), - span.clone(), - )) + typed: make_expr_error_node(ExprErrorKind::SemanticExprError, &"error type cascade".to_string(), &span), + diagnostics: base_diags, +}) + } else { + match lookup_field_type_node(&resolved_base, &field_name, scope.type_env.clone().source_indices.clone()) { + Some(field_type) => { + let field_summary = field_summary_for_type(base_rt.clone(), &scope.type_env.clone(), &field_name); +let fa_texpr = make_named_expr_node(&field_name, Rc::new(ExprData::ExprFieldAccess { + summary: field_summary, +}), Rc::new(vec![base_typed.clone()]), Some(Rc::new(InferredNode::Resolved { + node: field_type.clone(), +})), span.clone(), node_name_span(&texpr)); +Rc::new(InferResult { + typed: fa_texpr, + diagnostics: base_diags, +}) +}, + None => { + let base_is_type_var = if (resolved_base.inferred.clone() != None) { + is_type_variable(resolved_base.inferred.clone().clone().unwrap()) + } else { + false + }; +if base_is_type_var { + { + let fa_texpr = make_named_expr_node(&field_name, Rc::new(ExprData::ExprFieldAccess { + summary: Some(Rc::new(FieldSummary { + access_style: FieldAccessStyle::StoredField, + value_shape: FieldValueShape::PlainValue, +})), +}), Rc::new(vec![base_typed.clone()]), Some(Rc::new(InferredNode::TypeVariable { + id: "field_of_type_var".to_string(), +})), span.clone(), node_name_span(&texpr)); +Rc::new(InferResult { + typed: fa_texpr, + diagnostics: base_diags, +}) +} + } else { + match check_service_field_access_node(&base_rt, field_name.clone(), scope.service_registry.clone(), scope.type_env.clone().source_indices.clone()) { + Some(svc_type) => { + let fa_texpr = make_named_expr_node(&field_name, Rc::new(ExprData::ExprFieldAccess { + summary: Some(Rc::new(FieldSummary { + access_style: FieldAccessStyle::StoredField, + value_shape: FieldValueShape::PlainValue, +})), +}), Rc::new(vec![base_typed.clone()]), Some(Rc::new(InferredNode::Resolved { + node: svc_type.clone(), +})), span.clone(), node_name_span(&texpr)); +Rc::new(InferResult { + typed: fa_texpr, + diagnostics: base_diags, +}) +}, + None => { + let error_message = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("no field '".to_string(), field_name.clone()), "' on type '".to_string()), authored_name_at(scope.type_env.clone().source_indices.clone(), &resolved_base)), "'".to_string()); +let fa_texpr = make_expr_error_node(ExprErrorKind::SemanticExprError, &error_message, &span); +Rc::new(InferResult { + typed: fa_texpr, + diagnostics: v2_rt::concat(base_diags, Rc::new(vec![inference_error(error_message.clone(), span.clone(), scope.module_name.clone())])), +}) +}, +} } - None => match lookup_func_sig(scope.func_env.clone(), name.clone()) { - Some(fsig) => { - if ((fsig.params.clone().len() as i64) == 0) { - ok_infer(make_named_expr_node( - &name, - Rc::new(ExprData::ExprCall { - call_semantics: Some(CallSemantics::PlainCallSemantics), - descent_evidence: None, - }), - Rc::new(vec![]), - Some(Rc::new(InferredNode::Resolved { - node: fsig.inferred.clone(), - })), - span.clone(), - span.clone(), - )) - } else { - ok_infer(make_named_expr_node( - &name, - Rc::new(ExprData::ExprVar { - binding_kind: Some(Rc::new( - VarBindingKind::FunctionValueBinding, - )), - }), - Rc::new(vec![]), - Some(Rc::new(InferredNode::Resolved { - node: resolved_callable_type( - fsig.params.clone(), - fsig.inferred.clone(), - ), - })), - span.clone(), - span.clone(), - )) - } - } - None => { - let err_texpr = make_named_expr_node( - &name, - Rc::new(ExprData::ExprVar { binding_kind: None }), - Rc::new(vec![]), - Some(Rc::new(InferredNode::Resolved { node: error_type() })), - span.clone(), - span.clone(), - ); - Rc::new(InferResult { - typed: err_texpr, - diagnostics: Rc::new(vec![inference_error( - v2_rt::concat( - v2_rt::concat( - "undefined variable '".to_string(), - name.clone(), - ), - "'".to_string(), - ), - span.clone(), - scope.module_name.clone(), - )]), - }) - } - }, - } +}, +} } - ExprData::ExprFieldAccess { .. } => { - let field_name = field_access_field_at( - texpr.clone(), - scope.type_env.clone().source_indices.clone(), - ); - let span = texpr.span.clone(); - let base_expr = field_access_base(texpr.clone()); - let base_result = infer_expr(&base_expr, &scope, &None); - let base_typed = base_result.typed.clone(); - let base_diags = base_result.diagnostics.clone(); - let base_rt = resolved_type(base_typed.clone()); - let resolved_base = - resolve_scrutinee_type_node(scope.type_env.clone(), base_rt.clone()); - let resolved_base_is_error = if (resolved_base.inferred.clone() != None) { - is_compiler_error(resolved_base.inferred.clone().clone().unwrap()) - } else { - false - }; - if resolved_base_is_error { - Rc::new(InferResult { - typed: make_expr_error_node( - ExprErrorKind::SemanticExprError, - &"error type cascade".to_string(), - &span, - ), - diagnostics: base_diags, - }) - } else { - match lookup_field_type_node( - &resolved_base, - &field_name, - scope.type_env.clone().source_indices.clone(), - ) { - Some(field_type) => { - let field_summary = field_summary_for_type( - base_rt.clone(), - &scope.type_env.clone(), - &field_name, - ); - let fa_texpr = make_named_expr_node( - &field_name, - Rc::new(ExprData::ExprFieldAccess { - summary: field_summary, - }), - Rc::new(vec![base_typed.clone()]), - Some(Rc::new(InferredNode::Resolved { - node: field_type.clone(), - })), - span.clone(), - node_name_span(&texpr), - ); - Rc::new(InferResult { - typed: fa_texpr, - diagnostics: base_diags, - }) - } - None => { - let base_is_type_var = if (resolved_base.inferred.clone() != None) { - is_type_variable(resolved_base.inferred.clone().clone().unwrap()) - } else { - false - }; - if base_is_type_var { - { - let fa_texpr = make_named_expr_node( - &field_name, - Rc::new(ExprData::ExprFieldAccess { - summary: Some(Rc::new(FieldSummary { - access_style: FieldAccessStyle::StoredField, - value_shape: FieldValueShape::PlainValue, - })), - }), - Rc::new(vec![base_typed.clone()]), - Some(Rc::new(InferredNode::TypeVariable { - id: "field_of_type_var".to_string(), - })), - span.clone(), - node_name_span(&texpr), - ); - Rc::new(InferResult { - typed: fa_texpr, - diagnostics: base_diags, - }) - } - } else { - match check_service_field_access_node( - &base_rt, - field_name.clone(), - scope.service_registry.clone(), - scope.type_env.clone().source_indices.clone(), - ) { - Some(svc_type) => { - let fa_texpr = make_named_expr_node( - &field_name, - Rc::new(ExprData::ExprFieldAccess { - summary: Some(Rc::new(FieldSummary { - access_style: FieldAccessStyle::StoredField, - value_shape: FieldValueShape::PlainValue, - })), - }), - Rc::new(vec![base_typed.clone()]), - Some(Rc::new(InferredNode::Resolved { - node: svc_type.clone(), - })), - span.clone(), - node_name_span(&texpr), - ); - Rc::new(InferResult { - typed: fa_texpr, - diagnostics: base_diags, - }) - } - None => { - let error_message = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "no field '".to_string(), - field_name.clone(), - ), - "' on type '".to_string(), - ), - authored_name_at( - scope.type_env.clone().source_indices.clone(), - &resolved_base, - ), - ), - "'".to_string(), - ); - let fa_texpr = make_expr_error_node( - ExprErrorKind::SemanticExprError, - &error_message, - &span, - ); - Rc::new(InferResult { - typed: fa_texpr, - diagnostics: v2_rt::concat( - base_diags, - Rc::new(vec![inference_error( - error_message.clone(), - span.clone(), - scope.module_name.clone(), - )]), - ), - }) - } - } - } - } - } - } - } - ExprData::ExprCall { .. } => { - let func_name = - expr_call_func_at(texpr.clone(), scope.type_env.clone().source_indices.clone()); - let span = texpr.span.clone(); - let call_args = texpr.children.clone(); - let sig = lookup_func_sig(scope.func_env.clone(), func_name.clone()); - let sig_params = match sig.clone() { - Some(s) => s.params.clone(), - None => Rc::new(vec![]), - }; - let has_lambda = { - let mut __found = false; - for a in call_args.clone().iter().cloned() { - if is_lambda_expr(arg_value(&a)) { - __found = true; - break; - } - } - __found - }; - let call_method_args = Rc::new( - call_args - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - let call_method_name = Some(func_name.clone()); - let call_fold_info = extract_fold_init_info( - call_method_name.clone(), - &call_method_args, - 2, - &scope, - expected.clone(), - ); - let call_fold_acc_type = match call_fold_info.clone() { - Some(fi) => resolved_type(arg_value(&fi.typed_arg.clone())), - None => error_type(), - }; - let arg_infer_results = if ((has_lambda && ((call_args.clone().len() as i64) >= 2)) - && (sig.clone() == None)) +}, + ExprData::ExprCall { .. } => { + let func_name = expr_call_func_at(texpr.clone(), scope.type_env.clone().source_indices.clone()); +let span = texpr.span.clone(); +let call_args = texpr.children.clone(); +let sig = lookup_func_sig(scope.func_env.clone(), func_name.clone()); +let sig_params = match sig.clone() { + Some(s) => s.params.clone(), + None => Rc::new(vec![]), +}; +let has_lambda = { let mut __found = false; for a in call_args.clone().iter().cloned() { if is_lambda_expr(arg_value(&a)) { __found = true; break; } } __found }; +let call_method_args = Rc::new(call_args.clone().iter().cloned().skip(1 as usize).collect::>()); +let call_method_name = Some(func_name.clone()); +let call_fold_info = extract_fold_init_info(call_method_name.clone(), &call_method_args, 2, &scope, expected.clone()); +let call_fold_acc_type = match call_fold_info.clone() { + Some(fi) => resolved_type(arg_value(&fi.typed_arg.clone())), + None => error_type(), +}; +let arg_infer_results = if ((has_lambda && ((call_args.clone().len() as i64) >= 2)) && (sig.clone() == None)) { + match call_args.clone().first().cloned() { + Some(first_arg) => { + let first_result = infer_expr(&arg_value(&first_arg), &scope, &None); +let first_type = resolved_type(first_result.typed.clone()); +let elem_type = for_each_element_type_node(first_type, scope.type_env.clone().source_indices.clone()); +let call_elem_provenance = derive_element_provenance(first_result.typed.clone(), &elem_type, &scope); +let remaining_results = infer_method_args_with_fold(call_method_name.clone(), call_method_args.clone(), call_fold_info.clone(), call_fold_acc_type.clone(), elem_type.clone(), call_elem_provenance, scope.clone()); +v2_rt::concat(Rc::new(vec![Rc::new(ArgInferResult { + typed_arg: make_arg_node(arg_name_at(first_arg.clone(), scope.type_env.clone().source_indices.clone()), first_result.typed.clone(), first_arg.span.clone(), first_arg.span.clone()), + diagnostics: first_result.diagnostics.clone(), +})]), remaining_results) +}, + None => Rc::new(vec![]), +} + } else { + Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(call_args.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ + let a = pair.1.clone(); +let formal_param_type = match sig_params.clone().get(pair.0.clone() as usize).cloned() { + Some(p) => param_node_type_expr(&p), + None => type_variable_node("callable_param".to_string()), +}; +let has_formal = match sig_params.clone().get(pair.0.clone() as usize).cloned() { + Some(_) => true, + None => false, +}; +let expected = if has_formal.clone() { + Some(formal_param_type.clone()) + } else { + None + }; +let ar = infer_expr(&arg_value(&a), &scope, &expected); +Rc::new(ArgInferResult { + typed_arg: make_arg_node(arg_name_at(a.clone(), scope.type_env.clone().source_indices.clone()), ar.typed.clone(), a.span.clone(), a.span.clone()), + diagnostics: ar.diagnostics.clone(), +}) +}); } __result }) + }; +let typed_args = Rc::new({ let mut __result = Vec::new(); for air in arg_infer_results.clone().iter().cloned() { __result.push(air.typed_arg.clone()); } __result }); +let arg_diags = Rc::new({ let mut __result = Vec::new(); for air in arg_infer_results.clone().iter().cloned() { __result.extend((*air.diagnostics.clone()).iter().cloned()); } __result }); +let typed_arg_nodes = typed_args.clone(); +if (sig.clone() != None) { { - match call_args.clone().first().cloned() { - Some(first_arg) => { - let first_result = infer_expr(&arg_value(&first_arg), &scope, &None); - let first_type = resolved_type(first_result.typed.clone()); - let elem_type = for_each_element_type_node( - first_type, - scope.type_env.clone().source_indices.clone(), - ); - let call_elem_provenance = derive_element_provenance( - first_result.typed.clone(), - &elem_type, - &scope, - ); - let remaining_results = infer_method_args_with_fold( - call_method_name.clone(), - call_method_args.clone(), - call_fold_info.clone(), - call_fold_acc_type.clone(), - elem_type.clone(), - call_elem_provenance, - scope.clone(), - ); - v2_rt::concat( - Rc::new(vec![Rc::new(ArgInferResult { - typed_arg: make_arg_node( - arg_name_at( - first_arg.clone(), - scope.type_env.clone().source_indices.clone(), - ), - first_result.typed.clone(), - first_arg.span.clone(), - first_arg.span.clone(), - ), - diagnostics: first_result.diagnostics.clone(), - })]), - remaining_results, - ) - } - None => Rc::new(vec![]), - } - } else { - Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - call_args - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() + let resolved_type = match sig.clone() { + Some(s) => s.inferred.clone(), + None => error_type(), +}; +Rc::new(InferResult { + typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprCall { + call_semantics: Some(CallSemantics::PlainCallSemantics), + descent_evidence: None, +}), typed_arg_nodes, Some(Rc::new(InferredNode::Resolved { + node: resolved_type, +})), span.clone(), node_name_span(&texpr)), + diagnostics: arg_diags, +}) +} + } else { + { + let first_arg_type = match typed_args.clone().first().cloned() { + Some(ta) => resolved_type(arg_value(&ta)), + None => unit_type(), +}; +let method_receiver = match typed_args.clone().first().cloned() { + Some(ta) => arg_value(&ta), + None => internal_expr_error_node("method bridge missing receiver".to_string(), span.clone()), +}; +let call_acc_is_under_resolved = !is_fully_resolved(&call_fold_acc_type, &scope.type_env.clone().source_indices.clone()); +let refined_call_fold_acc_type = if ((call_fold_info.clone() != None) && call_acc_is_under_resolved) { + match Rc::new({ let mut __result = Vec::new(); for a in typed_args.clone().iter().cloned() { if is_lambda_expr(arg_value(&a)) { __result.push(a); } } __result }).first().cloned() { + Some(lambda_arg) => resolved_type(arg_value(&lambda_arg)), + None => call_fold_acc_type.clone(), +} + } else { + call_fold_acc_type.clone() + }; +let method_resolution = resolve_known_method_node(method_receiver.clone(), &first_arg_type, &func_name, if (call_fold_info.clone() != None) { + Some(refined_call_fold_acc_type.clone()) + } else { + None + }, scope.service_registry.clone(), &scope.type_env.clone().source_indices.clone()); +let is_known_method = (method_resolution.result_type.clone() != None); +if (is_known_method && ((typed_args.clone().len() as i64) > 0)) { { - __result.push({ - let a = pair.1.clone(); - let formal_param_type = match sig_params - .clone() - .get(pair.0.clone() as usize) - .cloned() - { - Some(p) => param_node_type_expr(&p), - None => type_variable_node("callable_param".to_string()), - }; - let has_formal = match sig_params - .clone() - .get(pair.0.clone() as usize) - .cloned() - { - Some(_) => true, - None => false, - }; - let expected = if has_formal.clone() { - Some(formal_param_type.clone()) + let receiver = method_receiver.clone(); +let remaining = Rc::new(typed_args.clone().iter().cloned().skip(1 as usize).collect::>()); +let base_result_type = match method_resolution.result_type.clone() { + Some(mt) => mt.clone(), + None => error_type(), +}; +let method_tv = if (method_resolution.semantics.clone() == None) { + Rc::new(KernelTypeBuild { + ty: base_result_type.clone(), + diagnostics: Rc::new(vec![]), +}) + } else { + match (*method_resolution.semantics.clone().clone().unwrap()).clone() { + MethodSemantics::AlgebraMethodSemantics { algebra_template: at, .. } => match at.clone() { + Some(t) => if (template_return_has_variables(t.clone()) || !is_fully_resolved(&base_result_type, &scope.type_env.clone().source_indices.clone())) { + { + let call_arg_types = Rc::new({ let mut __result = Vec::new(); for a in remaining.clone().iter().cloned() { __result.push(resolved_type(arg_value(&a))); } __result }); +let fold_overrides = if (call_fold_info.clone() != None) { + fold_override_map("FoldAccumulator".to_string(), refined_call_fold_acc_type.clone()) + } else { + empty_override_map() + }; +resolve_type_variables_from_template(&t, call_arg_types, &first_arg_type, fold_overrides, &scope.type_env.clone().source_indices.clone()) +} } else { - None - }; - let ar = infer_expr(&arg_value(&a), &scope, &expected); - Rc::new(ArgInferResult { - typed_arg: make_arg_node( - arg_name_at( - a.clone(), - scope.type_env.clone().source_indices.clone(), - ), - ar.typed.clone(), - a.span.clone(), - a.span.clone(), - ), - diagnostics: ar.diagnostics.clone(), - }) - }); - } - __result - }) - }; - let typed_args = Rc::new({ - let mut __result = Vec::new(); - for air in arg_infer_results.clone().iter().cloned() { - __result.push(air.typed_arg.clone()); - } - __result - }); - let arg_diags = Rc::new({ - let mut __result = Vec::new(); - for air in arg_infer_results.clone().iter().cloned() { - __result.extend((*air.diagnostics.clone()).iter().cloned()); - } - __result - }); - let typed_arg_nodes = typed_args.clone(); - if (sig.clone() != None) { - { - let resolved_type = match sig.clone() { - Some(s) => s.inferred.clone(), - None => error_type(), - }; - Rc::new(InferResult { - typed: make_named_expr_node( - &func_name, - Rc::new(ExprData::ExprCall { - call_semantics: Some(CallSemantics::PlainCallSemantics), - descent_evidence: None, - }), - typed_arg_nodes, - Some(Rc::new(InferredNode::Resolved { - node: resolved_type, - })), - span.clone(), - node_name_span(&texpr), - ), - diagnostics: arg_diags, - }) - } - } else { - { - let first_arg_type = match typed_args.clone().first().cloned() { - Some(ta) => resolved_type(arg_value(&ta)), - None => unit_type(), - }; - let method_receiver = match typed_args.clone().first().cloned() { - Some(ta) => arg_value(&ta), - None => internal_expr_error_node( - "method bridge missing receiver".to_string(), - span.clone(), - ), - }; - let call_acc_is_under_resolved = !is_fully_resolved( - &call_fold_acc_type, - &scope.type_env.clone().source_indices.clone(), - ); - let refined_call_fold_acc_type = - if ((call_fold_info.clone() != None) && call_acc_is_under_resolved) { - match Rc::new({ - let mut __result = Vec::new(); - for a in typed_args.clone().iter().cloned() { - if is_lambda_expr(arg_value(&a)) { - __result.push(a); - } - } - __result - }) - .first() - .cloned() - { - Some(lambda_arg) => resolved_type(arg_value(&lambda_arg)), - None => call_fold_acc_type.clone(), - } + Rc::new(KernelTypeBuild { + ty: base_result_type.clone(), + diagnostics: Rc::new(vec![]), +}) + }, + None => Rc::new(KernelTypeBuild { + ty: base_result_type.clone(), + diagnostics: Rc::new(vec![]), +}), +}, + _ => Rc::new(KernelTypeBuild { + ty: base_result_type.clone(), + diagnostics: Rc::new(vec![]), +}), +} + }; +let bridge_result_type = method_tv.ty.clone(); +let template_subst_diags = method_tv.diagnostics.clone(); +let returns_receiver_self = if (method_resolution.semantics.clone() == None) { + false } else { - call_fold_acc_type.clone() + match (*method_resolution.semantics.clone().clone().unwrap()).clone() { + MethodSemantics::AlgebraMethodSemantics { algebra_template: at, .. } => match at.clone() { + Some(t) => template_return_is_receiver_self(t.clone()), + None => false, +}, + _ => false, +} }; - let method_resolution = resolve_known_method_node( - method_receiver.clone(), - &first_arg_type, - &func_name, - if (call_fold_info.clone() != None) { - Some(refined_call_fold_acc_type.clone()) +let final_receiver = if ((returns_receiver_self && is_fully_resolved(&bridge_result_type, &scope.type_env.clone().source_indices.clone())) && !is_fully_resolved(&first_arg_type, &scope.type_env.clone().source_indices.clone())) { + Rc::new(Node { + name: receiver.name.clone(), + span: receiver.span.clone(), + ident_span: receiver.ident_span.clone(), + children: bridge_result_type.children.clone(), + connective: receiver.connective.clone(), + params: receiver.params.clone(), + inferred: Some(Rc::new(InferredNode::Resolved { + node: bridge_result_type.clone(), +})), + return_cardinality: receiver.return_cardinality.clone(), + uses: receiver.uses.clone(), + body: receiver.body.clone(), + transport: receiver.transport.clone(), + properties: receiver.properties.clone(), + type_annotation: receiver.type_annotation.clone(), + is_self_recursive: receiver.is_self_recursive.clone(), + has_non_tail_self_call: receiver.has_non_tail_self_call.clone(), + match_pattern: receiver.match_pattern.clone(), + expr_data: receiver.expr_data.clone(), + ident: None, +}) } else { - None - }, - scope.service_registry.clone(), - &scope.type_env.clone().source_indices.clone(), - ); - let is_known_method = (method_resolution.result_type.clone() != None); - if (is_known_method && ((typed_args.clone().len() as i64) > 0)) { + receiver.clone() + }; +let remaining_arg_nodes = Rc::new({ let mut __result = Vec::new(); for ta in remaining.clone().iter().cloned() { __result.push(make_arg_node(arg_name_at(ta.clone(), scope.type_env.clone().source_indices.clone()), arg_value(&ta), span.clone(), span.clone())); } __result }); +Rc::new(InferResult { + typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprMethodCall { + method_semantics: method_resolution.semantics.clone(), +}), v2_rt::concat(Rc::new(vec![final_receiver]), remaining_arg_nodes), Some(Rc::new(InferredNode::Resolved { + node: bridge_result_type.clone(), +})), span.clone(), node_name_span(&texpr)), + diagnostics: v2_rt::concat(v2_rt::concat(arg_diags, method_resolution.diagnostics.clone()), template_subst_diags), +}) +} + } else { + if (func_name.clone().as_str() == "empty_map".to_string().as_str()) { { - let receiver = method_receiver.clone(); - let remaining = Rc::new( - typed_args - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - let base_result_type = match method_resolution.result_type.clone() { - Some(mt) => mt.clone(), - None => error_type(), - }; - let method_tv = if (method_resolution.semantics.clone() == None) { - Rc::new(KernelTypeBuild { - ty: base_result_type.clone(), - diagnostics: Rc::new(vec![]), - }) - } else { - match (*method_resolution.semantics.clone().clone().unwrap()) - .clone() - { - MethodSemantics::AlgebraMethodSemantics { - algebra_template: at, - .. - } => match at.clone() { - Some(t) => { - if (template_return_has_variables(t.clone()) - || !is_fully_resolved( - &base_result_type, - &scope - .type_env - .clone() - .source_indices - .clone(), - )) - { - { - let call_arg_types = Rc::new({ - let mut __result = Vec::new(); - for a in - remaining.clone().iter().cloned() - { - __result.push(resolved_type( - arg_value(&a), - )); - } - __result - }); - let fold_overrides = - if (call_fold_info.clone() != None) { - fold_override_map( - "FoldAccumulator".to_string(), - refined_call_fold_acc_type - .clone(), - ) - } else { - empty_override_map() - }; - resolve_type_variables_from_template( - &t, - call_arg_types, - &first_arg_type, - fold_overrides, - &scope - .type_env - .clone() - .source_indices - .clone(), - ) - } - } else { - Rc::new(KernelTypeBuild { - ty: base_result_type.clone(), - diagnostics: Rc::new(vec![]), - }) - } - } - None => Rc::new(KernelTypeBuild { - ty: base_result_type.clone(), - diagnostics: Rc::new(vec![]), - }), - }, - _ => Rc::new(KernelTypeBuild { - ty: base_result_type.clone(), - diagnostics: Rc::new(vec![]), - }), - } - }; - let bridge_result_type = method_tv.ty.clone(); - let template_subst_diags = method_tv.diagnostics.clone(); - let returns_receiver_self = if (method_resolution.semantics.clone() - == None) - { - false - } else { - match (*method_resolution.semantics.clone().clone().unwrap()) - .clone() - { - MethodSemantics::AlgebraMethodSemantics { - algebra_template: at, - .. - } => match at.clone() { - Some(t) => template_return_is_receiver_self(t.clone()), - None => false, - }, - _ => false, - } - }; - let final_receiver = if ((returns_receiver_self - && is_fully_resolved( - &bridge_result_type, - &scope.type_env.clone().source_indices.clone(), - )) - && !is_fully_resolved( - &first_arg_type, - &scope.type_env.clone().source_indices.clone(), - )) { - Rc::new(Node { - name: receiver.name.clone(), - span: receiver.span.clone(), - ident_span: receiver.ident_span.clone(), - children: bridge_result_type.children.clone(), - connective: receiver.connective.clone(), - params: receiver.params.clone(), - inferred: Some(Rc::new(InferredNode::Resolved { - node: bridge_result_type.clone(), - })), - return_cardinality: receiver.return_cardinality.clone(), - uses: receiver.uses.clone(), - body: receiver.body.clone(), - transport: receiver.transport.clone(), - properties: receiver.properties.clone(), - type_annotation: receiver.type_annotation.clone(), - is_self_recursive: receiver.is_self_recursive.clone(), - has_non_tail_self_call: receiver - .has_non_tail_self_call - .clone(), - match_pattern: receiver.match_pattern.clone(), - expr_data: receiver.expr_data.clone(), - ident: None, - }) - } else { - receiver.clone() - }; - let remaining_arg_nodes = Rc::new({ - let mut __result = Vec::new(); - for ta in remaining.clone().iter().cloned() { - __result.push(make_arg_node( - arg_name_at( - ta.clone(), - scope.type_env.clone().source_indices.clone(), - ), - arg_value(&ta), - span.clone(), - span.clone(), - )); - } - __result - }); - Rc::new(InferResult { - typed: make_named_expr_node( - &func_name, - Rc::new(ExprData::ExprMethodCall { - method_semantics: method_resolution.semantics.clone(), - }), - v2_rt::concat( - Rc::new(vec![final_receiver]), - remaining_arg_nodes, - ), - Some(Rc::new(InferredNode::Resolved { - node: bridge_result_type.clone(), - })), - span.clone(), - node_name_span(&texpr), - ), - diagnostics: v2_rt::concat( - v2_rt::concat( - arg_diags, - method_resolution.diagnostics.clone(), - ), - template_subst_diags, - ), - }) - } - } else { - if (func_name.clone().as_str() == "empty_map".to_string().as_str()) { - { - let bare_m = bare_map_node(); - match expected.clone() { + let bare_m = bare_map_node(); +match expected.clone() { Some(exp) => if node_is_keyed_collection(&exp, scope.type_env.clone().source_indices.clone()) { Rc::new(InferResult { typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprCall { @@ -2678,1777 +1603,1045 @@ match bare_m { }), }, } - } +} + } else { + if (func_name.clone().as_str() == "empty_set".to_string().as_str()) { + { + let bare_s = bare_set_node(); +match expected.clone() { + Some(exp) => if node_is_set_collection(&exp, &scope.type_env.clone().source_indices.clone()) { + Rc::new(InferResult { + typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprCall { + call_semantics: Some(CallSemantics::PlainCallSemantics), + descent_evidence: None, +}), typed_arg_nodes, Some(Rc::new(InferredNode::Resolved { + node: exp.clone(), +})), span.clone(), node_name_span(&texpr)), + diagnostics: arg_diags, +}) + } else { + { + let empty_set_diags = v2_rt::concat(arg_diags, Rc::new(vec![inference_error("empty_set(): expected type is not Set<...>".to_string(), span.clone(), scope.module_name.clone())])); +match bare_s { + Some(set_t) => Rc::new(InferResult { + typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprCall { + call_semantics: Some(CallSemantics::PlainCallSemantics), + descent_evidence: None, +}), typed_arg_nodes, Some(Rc::new(InferredNode::Resolved { + node: set_t.clone(), +})), span.clone(), node_name_span(&texpr)), + diagnostics: empty_set_diags, +}), + None => Rc::new(InferResult { + typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprCall { + call_semantics: Some(CallSemantics::PlainCallSemantics), + descent_evidence: None, +}), typed_arg_nodes, Some(Rc::new(InferredNode::CompilerError { + message: "empty_set(): Set kernel container profile missing (compiler misconfigured)".to_string(), + span: span.clone(), +})), span.clone(), node_name_span(&texpr)), + diagnostics: v2_rt::concat(empty_set_diags, Rc::new(vec![inference_error("empty_set(): Set kernel container profile missing".to_string(), span.clone(), scope.module_name.clone())])), +}), +} +} + }, + None => match bare_s { + Some(set_t) => Rc::new(InferResult { + typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprCall { + call_semantics: Some(CallSemantics::PlainCallSemantics), + descent_evidence: None, +}), typed_arg_nodes, Some(Rc::new(InferredNode::Resolved { + node: set_t.clone(), +})), span.clone(), node_name_span(&texpr)), + diagnostics: arg_diags, +}), + None => Rc::new(InferResult { + typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprCall { + call_semantics: Some(CallSemantics::PlainCallSemantics), + descent_evidence: None, +}), typed_arg_nodes, Some(Rc::new(InferredNode::CompilerError { + message: "empty_set(): Set kernel container profile missing (compiler misconfigured)".to_string(), + span: span.clone(), +})), span.clone(), node_name_span(&texpr)), + diagnostics: v2_rt::concat(arg_diags, Rc::new(vec![inference_error("empty_set(): Set kernel container profile missing".to_string(), span.clone(), scope.module_name.clone())])), +}), +}, +} +} } else { if (infer_builtin_call_type(func_name.clone()) != None) { { - let tier2b = infer_tier2b_builtin_with_kernel_diags( - &func_name, - typed_args.clone(), - scope.clone(), - span.clone(), - ); - let bt = tier2b.bt.clone(); - let call_semantics = if (func_name.clone().as_str() - == "lookup".to_string().as_str()) - { + let tier2b = infer_tier2b_builtin_with_kernel_diags(&func_name, typed_args.clone(), scope.clone(), span.clone()); +let bt = tier2b.bt.clone(); +let call_semantics = if (func_name.clone().as_str() == "lookup".to_string().as_str()) { Some(CallSemantics::LookupCallSemantics) } else { Some(CallSemantics::PlainCallSemantics) }; - Rc::new(InferResult { - typed: make_named_expr_node( - &func_name, - Rc::new(ExprData::ExprCall { - call_semantics: call_semantics, - descent_evidence: None, - }), - typed_arg_nodes, - Some(Rc::new(InferredNode::Resolved { node: bt })), - span.clone(), - node_name_span(&texpr), - ), - diagnostics: v2_rt::concat( - arg_diags, - tier2b.kernel_diags.clone(), - ), - }) - } +Rc::new(InferResult { + typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprCall { + call_semantics: call_semantics, + descent_evidence: None, +}), typed_arg_nodes, Some(Rc::new(InferredNode::Resolved { + node: bt, +})), span.clone(), node_name_span(&texpr)), + diagnostics: v2_rt::concat(arg_diags, tier2b.kernel_diags.clone()), +}) +} } else { { - let callable_local = match v2_rt::map_get( - &scope.locals.clone(), - func_name.clone(), - ) { - Some(binding) => { - if ((binding.resolved.clone().params.clone().len() - as i64) - > 0) - { - Some(binding.resolved.clone()) - } else { - None - } - } - None => None, - }; - if (callable_local.clone() != None) { + let callable_local = match v2_rt::map_get(&scope.locals.clone(), func_name.clone()) { + Some(binding) => if ((binding.resolved.clone().params.clone().len() as i64) > 0) { + Some(binding.resolved.clone()) + } else { + None + }, + None => None, +}; +if (callable_local.clone() != None) { { let callable_type = match callable_local.clone() { - Some(ct) => ct.clone(), - None => error_type(), - }; - let resolved_type = - callable_inferred(&callable_type); - Rc::new(InferResult { - typed: make_named_expr_node( - &func_name, - Rc::new(ExprData::ExprCall { - call_semantics: Some( - CallSemantics::PlainCallSemantics, - ), - descent_evidence: None, - }), - typed_arg_nodes, - Some(Rc::new(InferredNode::Resolved { - node: resolved_type, - })), - span.clone(), - node_name_span(&texpr), - ), - diagnostics: arg_diags, - }) - } + Some(ct) => ct.clone(), + None => error_type(), +}; +let resolved_type = callable_inferred(&callable_type); +Rc::new(InferResult { + typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprCall { + call_semantics: Some(CallSemantics::PlainCallSemantics), + descent_evidence: None, +}), typed_arg_nodes, Some(Rc::new(InferredNode::Resolved { + node: resolved_type, +})), span.clone(), node_name_span(&texpr)), + diagnostics: arg_diags, +}) +} } else { { - let type_match = lookup_type_by_name( - &scope.type_env.clone(), - func_name.clone(), - ); - let resolved_type = match type_match.clone() { - Some(tn) => tn.clone(), - None => error_type(), - }; - let call_diags = match type_match.clone() { - Some(_) => Rc::new(vec![]), - None => Rc::new(vec![inference_error( - v2_rt::concat( - v2_rt::concat( - "function '".to_string(), - func_name.clone(), - ), - "' not found in scope".to_string(), - ), - span.clone(), - scope.module_name.clone(), - )]), - }; - Rc::new(InferResult { - typed: make_named_expr_node( - &func_name, - Rc::new(ExprData::ExprCall { - call_semantics: Some( - CallSemantics::PlainCallSemantics, - ), - descent_evidence: None, - }), - typed_arg_nodes, - Some(Rc::new(InferredNode::Resolved { - node: resolved_type, - })), - span.clone(), - node_name_span(&texpr), - ), - diagnostics: v2_rt::concat( - arg_diags, call_diags, - ), - }) - } + let type_match = lookup_type_by_name(&scope.type_env.clone(), func_name.clone()); +let resolved_type = match type_match.clone() { + Some(tn) => tn.clone(), + None => error_type(), +}; +let call_diags = match type_match.clone() { + Some(_) => Rc::new(vec![]), + None => Rc::new(vec![inference_error(v2_rt::concat(v2_rt::concat("function '".to_string(), func_name.clone()), "' not found in scope".to_string()), span.clone(), scope.module_name.clone())]), +}; +Rc::new(InferResult { + typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprCall { + call_semantics: Some(CallSemantics::PlainCallSemantics), + descent_evidence: None, +}), typed_arg_nodes, Some(Rc::new(InferredNode::Resolved { + node: resolved_type, +})), span.clone(), node_name_span(&texpr)), + diagnostics: v2_rt::concat(arg_diags, call_diags), +}) +} } - } +} } } } } - } +} } - ExprData::ExprMethodCall { .. } => { - let method_name = expr_method_name_at( - texpr.clone(), - scope.type_env.clone().source_indices.clone(), - ); - let span = texpr.span.clone(); - let recv = method_receiver(texpr.clone()); - let mc_args = method_arg_nodes(texpr.clone()); - let recv_result = infer_expr(&recv, &scope, &None); - let recv_typed = recv_result.typed.clone(); - let recv_diags = recv_result.diagnostics.clone(); - let recv_rt = resolved_type(recv_typed.clone()); - let recv_elem_type = for_each_element_type_node( - recv_rt.clone(), - scope.type_env.clone().source_indices.clone(), - ); - let mc_method_name = Some(method_name.clone()); - let fold_info = extract_fold_init_info( - mc_method_name.clone(), - &mc_args, - 2, - &scope, - expected.clone(), - ); - let fold_acc_type = match fold_info.clone() { - Some(fi) => resolved_type(arg_value(&fi.typed_arg.clone())), - None => error_type(), - }; - let mc_elem_provenance = - derive_element_provenance(recv_typed.clone(), &recv_elem_type, &scope); - let mc_arg_infer_results = infer_method_args_with_fold( - mc_method_name.clone(), - mc_args.clone(), - fold_info.clone(), - fold_acc_type.clone(), - recv_elem_type.clone(), - mc_elem_provenance, - scope.clone(), - ); - let typed_mc_args = Rc::new({ - let mut __result = Vec::new(); - for air in mc_arg_infer_results.clone().iter().cloned() { - __result.push(air.typed_arg.clone()); - } - __result - }); - let mc_arg_diags = Rc::new({ - let mut __result = Vec::new(); - for air in mc_arg_infer_results.clone().iter().cloned() { - __result.extend((*air.diagnostics.clone()).iter().cloned()); - } - __result - }); - let mc_acc_is_under_resolved = !is_fully_resolved( - &fold_acc_type, - &scope.type_env.clone().source_indices.clone(), - ); - let refined_fold_acc_type = - if ((fold_info.clone() != None) && mc_acc_is_under_resolved) { - match Rc::new({ - let mut __result = Vec::new(); - for a in typed_mc_args.clone().iter().cloned() { - if is_lambda_expr(arg_value(&a)) { - __result.push(a); - } - } - __result - }) - .first() - .cloned() - { - Some(lambda_arg) => resolved_type(arg_value(&lambda_arg)), - None => fold_acc_type.clone(), - } - } else { - fold_acc_type.clone() - }; - let method_resolution = resolve_known_method_node( - recv_typed.clone(), - &recv_rt, - &method_name, - if (fold_info.clone() != None) { - Some(refined_fold_acc_type.clone()) - } else { - None - }, - scope.service_registry.clone(), - &scope.type_env.clone().source_indices.clone(), - ); - let pipe_fb = match method_resolution.result_type.clone() { - Some(rt) => Rc::new(MethodPipeFallback { - result_ty: rt.clone(), - kernel_diags: Rc::new(vec![]), - }), - None => method_pipe_map_keys_values_fallback( - &recv_rt, - &method_name, - scope.clone(), - span.clone(), - ), - }; - let base_result_type = pipe_fb.result_ty.clone(); - let method_tv_mc = if (method_resolution.semantics.clone() == None) { +}, + ExprData::ExprMethodCall { .. } => { + let method_name = expr_method_name_at(texpr.clone(), scope.type_env.clone().source_indices.clone()); +let span = texpr.span.clone(); +let recv = method_receiver(texpr.clone()); +let mc_args = method_arg_nodes(texpr.clone()); +let recv_result = infer_expr(&recv, &scope, &None); +let recv_typed = recv_result.typed.clone(); +let recv_diags = recv_result.diagnostics.clone(); +let recv_rt = resolved_type(recv_typed.clone()); +let recv_elem_type = for_each_element_type_node(recv_rt.clone(), scope.type_env.clone().source_indices.clone()); +let mc_method_name = Some(method_name.clone()); +let fold_info = extract_fold_init_info(mc_method_name.clone(), &mc_args, 2, &scope, expected.clone()); +let fold_acc_type = match fold_info.clone() { + Some(fi) => resolved_type(arg_value(&fi.typed_arg.clone())), + None => error_type(), +}; +let mc_elem_provenance = derive_element_provenance(recv_typed.clone(), &recv_elem_type, &scope); +let mc_arg_infer_results = infer_method_args_with_fold(mc_method_name.clone(), mc_args.clone(), fold_info.clone(), fold_acc_type.clone(), recv_elem_type.clone(), mc_elem_provenance, scope.clone()); +let typed_mc_args = Rc::new({ let mut __result = Vec::new(); for air in mc_arg_infer_results.clone().iter().cloned() { __result.push(air.typed_arg.clone()); } __result }); +let mc_arg_diags = Rc::new({ let mut __result = Vec::new(); for air in mc_arg_infer_results.clone().iter().cloned() { __result.extend((*air.diagnostics.clone()).iter().cloned()); } __result }); +let mc_acc_is_under_resolved = !is_fully_resolved(&fold_acc_type, &scope.type_env.clone().source_indices.clone()); +let refined_fold_acc_type = if ((fold_info.clone() != None) && mc_acc_is_under_resolved) { + match Rc::new({ let mut __result = Vec::new(); for a in typed_mc_args.clone().iter().cloned() { if is_lambda_expr(arg_value(&a)) { __result.push(a); } } __result }).first().cloned() { + Some(lambda_arg) => resolved_type(arg_value(&lambda_arg)), + None => fold_acc_type.clone(), +} + } else { + fold_acc_type.clone() + }; +let method_resolution = resolve_known_method_node(recv_typed.clone(), &recv_rt, &method_name, if (fold_info.clone() != None) { + Some(refined_fold_acc_type.clone()) + } else { + None + }, scope.service_registry.clone(), &scope.type_env.clone().source_indices.clone()); +let pipe_fb = match method_resolution.result_type.clone() { + Some(rt) => Rc::new(MethodPipeFallback { + result_ty: rt.clone(), + kernel_diags: Rc::new(vec![]), +}), + None => method_pipe_map_keys_values_fallback(&recv_rt, &method_name, scope.clone(), span.clone()), +}; +let base_result_type = pipe_fb.result_ty.clone(); +let method_tv_mc = if (method_resolution.semantics.clone() == None) { + Rc::new(KernelTypeBuild { + ty: base_result_type.clone(), + diagnostics: Rc::new(vec![]), +}) + } else { + match (*method_resolution.semantics.clone().clone().unwrap()).clone() { + MethodSemantics::AlgebraMethodSemantics { algebra_template: at, .. } => match at.clone() { + Some(t) => if (template_return_has_variables(t.clone()) || !is_fully_resolved(&base_result_type, &scope.type_env.clone().source_indices.clone())) { + { + let mc_arg_types = Rc::new({ let mut __result = Vec::new(); for a in typed_mc_args.clone().iter().cloned() { __result.push(resolved_type(arg_value(&a))); } __result }); +let mc_fold_overrides = if (fold_info.clone() != None) { + fold_override_map("FoldAccumulator".to_string(), refined_fold_acc_type.clone()) + } else { + empty_override_map() + }; +resolve_type_variables_from_template(&t, mc_arg_types, &recv_rt, mc_fold_overrides, &scope.type_env.clone().source_indices.clone()) +} + } else { Rc::new(KernelTypeBuild { - ty: base_result_type.clone(), - diagnostics: Rc::new(vec![]), - }) + ty: base_result_type.clone(), + diagnostics: Rc::new(vec![]), +}) + }, + None => Rc::new(KernelTypeBuild { + ty: base_result_type.clone(), + diagnostics: Rc::new(vec![]), +}), +}, + _ => Rc::new(KernelTypeBuild { + ty: base_result_type.clone(), + diagnostics: Rc::new(vec![]), +}), +} + }; +let result_type = method_tv_mc.ty.clone(); +let mc_template_diags = method_tv_mc.diagnostics.clone(); +let method_semantics = if (method_resolution.semantics.clone() != None) { + method_resolution.semantics.clone() + } else { + Some(Rc::new(MethodSemantics::PlainMethodSemantics)) + }; +let typed_mc_arg_nodes = typed_mc_args.clone(); +let mc_texpr = make_named_expr_node(&method_name, Rc::new(ExprData::ExprMethodCall { + method_semantics: method_semantics, +}), v2_rt::concat(Rc::new(vec![recv_typed.clone()]), typed_mc_arg_nodes), Some(Rc::new(InferredNode::Resolved { + node: result_type, +})), span.clone(), node_name_span(&texpr)); +Rc::new(InferResult { + typed: mc_texpr, + diagnostics: v2_rt::concat(v2_rt::concat(v2_rt::concat(recv_diags, mc_arg_diags), pipe_fb.kernel_diags.clone()), v2_rt::concat(method_resolution.diagnostics.clone(), mc_template_diags)), +}) +}, + ExprData::ExprMatch => { + let span = texpr.span.clone(); +let scrut = match_scrutinee(texpr.clone()); +let arm_nodes = match_arm_nodes(texpr.clone()); +let scrut_result = infer_expr(&scrut, &scope, &None); +let scrut_typed = scrut_result.typed.clone(); +let scrut_diags = scrut_result.diagnostics.clone(); +let scrut_rt = resolved_type(scrut_typed.clone()); +let scrut_subject = pattern_subject_from_inferred(scrut_typed.inferred.clone()); +let scrut_provenance = classify_binding_provenance(&scrut, &scope); +let arm_infer_results = Rc::new({ let mut __result = Vec::new(); for arm_node in arm_nodes.clone().iter().cloned() { __result.push({ + let arm_pat = arm_pattern(arm_node.clone()); +let arm_g = arm_guard(&arm_node); +let arm_b = arm_body(&arm_node); +let typed_pattern = annotate_pattern_parent_enums(arm_pat.clone(), scrut_subject.clone(), &scope); +let pattern_result = extend_scope_with_pattern_node(&scope, typed_pattern.clone(), &scrut_subject, scrut_provenance.clone()); +let arm_scope = pattern_result.scope.clone(); +let pattern_diags = pattern_result.diagnostics.clone(); +let guard_result = if (arm_g.clone() != None) { + Some(infer_expr(&arm_g.clone().unwrap(), &arm_scope, &None)) } else { - match (*method_resolution.semantics.clone().clone().unwrap()).clone() { - MethodSemantics::AlgebraMethodSemantics { - algebra_template: at, - .. - } => match at.clone() { - Some(t) => { - if (template_return_has_variables(t.clone()) - || !is_fully_resolved( - &base_result_type, - &scope.type_env.clone().source_indices.clone(), - )) - { - { - let mc_arg_types = Rc::new({ - let mut __result = Vec::new(); - for a in typed_mc_args.clone().iter().cloned() { - __result.push(resolved_type(arg_value(&a))); - } - __result - }); - let mc_fold_overrides = if (fold_info.clone() != None) { - fold_override_map( - "FoldAccumulator".to_string(), - refined_fold_acc_type.clone(), - ) - } else { - empty_override_map() - }; - resolve_type_variables_from_template( - &t, - mc_arg_types, - &recv_rt, - mc_fold_overrides, - &scope.type_env.clone().source_indices.clone(), - ) - } - } else { - Rc::new(KernelTypeBuild { - ty: base_result_type.clone(), - diagnostics: Rc::new(vec![]), - }) - } - } - None => Rc::new(KernelTypeBuild { - ty: base_result_type.clone(), - diagnostics: Rc::new(vec![]), - }), - }, - _ => Rc::new(KernelTypeBuild { - ty: base_result_type.clone(), - diagnostics: Rc::new(vec![]), - }), - } + None }; - let result_type = method_tv_mc.ty.clone(); - let mc_template_diags = method_tv_mc.diagnostics.clone(); - let method_semantics = if (method_resolution.semantics.clone() != None) { - method_resolution.semantics.clone() +let body_result = infer_expr(&arm_b, &arm_scope, &expected); +let body_typed = body_result.typed.clone(); +let body_diags = body_result.diagnostics.clone(); +let guard_unwrapped = match guard_result.clone() { + Some(gr) => gr.clone(), + None => Rc::new(InferResult { + typed: arm_b.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +let guard_diags = if (guard_result.clone() != None) { + guard_unwrapped.diagnostics.clone() } else { - Some(Rc::new(MethodSemantics::PlainMethodSemantics)) + Rc::new(vec![]) }; - let typed_mc_arg_nodes = typed_mc_args.clone(); - let mc_texpr = make_named_expr_node( - &method_name, - Rc::new(ExprData::ExprMethodCall { - method_semantics: method_semantics, - }), - v2_rt::concat(Rc::new(vec![recv_typed.clone()]), typed_mc_arg_nodes), - Some(Rc::new(InferredNode::Resolved { node: result_type })), - span.clone(), - node_name_span(&texpr), - ); - Rc::new(InferResult { - typed: mc_texpr, - diagnostics: v2_rt::concat( - v2_rt::concat( - v2_rt::concat(recv_diags, mc_arg_diags), - pipe_fb.kernel_diags.clone(), - ), - v2_rt::concat(method_resolution.diagnostics.clone(), mc_template_diags), - ), - }) - } - ExprData::ExprMatch => { - let span = texpr.span.clone(); - let scrut = match_scrutinee(texpr.clone()); - let arm_nodes = match_arm_nodes(texpr.clone()); - let scrut_result = infer_expr(&scrut, &scope, &None); - let scrut_typed = scrut_result.typed.clone(); - let scrut_diags = scrut_result.diagnostics.clone(); - let scrut_rt = resolved_type(scrut_typed.clone()); - let scrut_subject = pattern_subject_from_inferred(scrut_typed.inferred.clone()); - let scrut_provenance = classify_binding_provenance(&scrut, &scope); - let arm_infer_results = Rc::new({ - let mut __result = Vec::new(); - for arm_node in arm_nodes.clone().iter().cloned() { - __result.push({ +Rc::new(ArmInferResult { + typed_arm: make_arm_node(typed_pattern.clone(), if (guard_result.clone() != None) { + Some(guard_unwrapped.typed.clone()) + } else { + None + }, body_typed.clone(), span.clone()), + diagnostics: v2_rt::concat(pattern_diags.clone(), v2_rt::concat(guard_diags.clone(), body_diags.clone())), + body_type: resolved_type(body_typed.clone()), +}) +}); } __result }); +let arm_body_types = Rc::new({ let mut __result = Vec::new(); for ar in arm_infer_results.clone().iter().cloned() { __result.push(ar.body_type.clone()); } __result }); +let unified_arm_type = match arm_body_types.clone().first().cloned() { + Some(first_type) => Rc::new(arm_body_types.clone().iter().cloned().skip(1 as usize).collect::>()).iter().cloned().fold(first_type, |acc: Rc, t: Rc| prefer_specific_type(acc, t.clone(), &scope.type_env.clone().source_indices.clone())), + None => scrut_rt.clone(), +}; +let arm_infer_results = if is_fully_resolved(&unified_arm_type, &scope.type_env.clone().source_indices.clone()) { + Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(arm_nodes.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ + let idx = pair.0.clone(); +let arm_node = pair.1.clone(); +let original_list = Rc::new({ let mut __result = Vec::new(); for ap in Rc::new({ let mut __result = Vec::new(); for ap in Rc::new(arm_infer_results.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (ap.0.clone() == idx.clone()) { __result.push(ap); } } __result }).iter().cloned() { __result.push(ap.1.clone()); } __result }); +let original = match original_list.clone().first().cloned() { + Some(ar) => ar.clone(), + None => Rc::new(ArmInferResult { + typed_arm: arm_node.clone(), + diagnostics: Rc::new(vec![]), + body_type: scrut_rt.clone(), +}), +}; +if !is_fully_resolved(&original.body_type.clone(), &scope.type_env.clone().source_indices.clone()) { + { let arm_pat = arm_pattern(arm_node.clone()); - let arm_g = arm_guard(&arm_node); - let arm_b = arm_body(&arm_node); - let typed_pattern = annotate_pattern_parent_enums( - arm_pat.clone(), - scrut_subject.clone(), - &scope, - ); - let pattern_result = extend_scope_with_pattern_node( - &scope, - typed_pattern.clone(), - &scrut_subject, - scrut_provenance.clone(), - ); - let arm_scope = pattern_result.scope.clone(); - let pattern_diags = pattern_result.diagnostics.clone(); - let guard_result = if (arm_g.clone() != None) { +let arm_g = arm_guard(&arm_node); +let arm_b = arm_body(&arm_node); +let typed_pattern = annotate_pattern_parent_enums(arm_pat.clone(), scrut_subject.clone(), &scope); +let pattern_result = extend_scope_with_pattern_node(&scope, typed_pattern.clone(), &scrut_subject, scrut_provenance.clone()); +let arm_scope = pattern_result.scope.clone(); +let pattern_diags = pattern_result.diagnostics.clone(); +let guard_result = if (arm_g.clone() != None) { Some(infer_expr(&arm_g.clone().unwrap(), &arm_scope, &None)) } else { None }; - let body_result = infer_expr(&arm_b, &arm_scope, &expected); - let body_typed = body_result.typed.clone(); - let body_diags = body_result.diagnostics.clone(); - let guard_unwrapped = match guard_result.clone() { - Some(gr) => gr.clone(), - None => Rc::new(InferResult { - typed: arm_b.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - let guard_diags = if (guard_result.clone() != None) { +let body_result = infer_expr(&arm_b, &arm_scope, &Some(unified_arm_type.clone())); +let body_typed = body_result.typed.clone(); +let body_diags = body_result.diagnostics.clone(); +let guard_unwrapped = match guard_result.clone() { + Some(gr) => gr.clone(), + None => Rc::new(InferResult { + typed: arm_b.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +let guard_diags = if (guard_result.clone() != None) { guard_unwrapped.diagnostics.clone() } else { Rc::new(vec![]) }; - Rc::new(ArmInferResult { - typed_arm: make_arm_node( - typed_pattern.clone(), - if (guard_result.clone() != None) { - Some(guard_unwrapped.typed.clone()) - } else { - None - }, - body_typed.clone(), - span.clone(), - ), - diagnostics: v2_rt::concat( - pattern_diags.clone(), - v2_rt::concat(guard_diags.clone(), body_diags.clone()), - ), - body_type: resolved_type(body_typed.clone()), - }) - }); - } - __result - }); - let arm_body_types = Rc::new({ - let mut __result = Vec::new(); - for ar in arm_infer_results.clone().iter().cloned() { - __result.push(ar.body_type.clone()); +Rc::new(ArmInferResult { + typed_arm: make_arm_node(typed_pattern.clone(), if (guard_result.clone() != None) { + Some(guard_unwrapped.typed.clone()) + } else { + None + }, body_typed.clone(), span.clone()), + diagnostics: v2_rt::concat(pattern_diags.clone(), v2_rt::concat(guard_diags.clone(), body_diags.clone())), + body_type: resolved_type(body_typed.clone()), +}) +} + } else { + original.clone() } - __result - }); - let unified_arm_type = match arm_body_types.clone().first().cloned() { - Some(first_type) => Rc::new( - arm_body_types - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ) - .iter() - .cloned() - .fold(first_type, |acc: Rc, t: Rc| { - prefer_specific_type( - acc, - t.clone(), - &scope.type_env.clone().source_indices.clone(), - ) - }), - None => scrut_rt.clone(), - }; - let arm_infer_results = if is_fully_resolved( - &unified_arm_type, - &scope.type_env.clone().source_indices.clone(), - ) { - Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - arm_nodes - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - __result.push({ - let idx = pair.0.clone(); - let arm_node = pair.1.clone(); - let original_list = Rc::new({ - let mut __result = Vec::new(); - for ap in Rc::new({ - let mut __result = Vec::new(); - for ap in Rc::new( - arm_infer_results - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - if (ap.0.clone() == idx.clone()) { - __result.push(ap); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(ap.1.clone()); - } - __result - }); - let original = match original_list.clone().first().cloned() { - Some(ar) => ar.clone(), - None => Rc::new(ArmInferResult { - typed_arm: arm_node.clone(), - diagnostics: Rc::new(vec![]), - body_type: scrut_rt.clone(), - }), - }; - if !is_fully_resolved( - &original.body_type.clone(), - &scope.type_env.clone().source_indices.clone(), - ) { - { - let arm_pat = arm_pattern(arm_node.clone()); - let arm_g = arm_guard(&arm_node); - let arm_b = arm_body(&arm_node); - let typed_pattern = annotate_pattern_parent_enums( - arm_pat.clone(), - scrut_subject.clone(), - &scope, - ); - let pattern_result = extend_scope_with_pattern_node( - &scope, - typed_pattern.clone(), - &scrut_subject, - scrut_provenance.clone(), - ); - let arm_scope = pattern_result.scope.clone(); - let pattern_diags = pattern_result.diagnostics.clone(); - let guard_result = if (arm_g.clone() != None) { - Some(infer_expr( - &arm_g.clone().unwrap(), - &arm_scope, - &None, - )) - } else { - None - }; - let body_result = infer_expr( - &arm_b, - &arm_scope, - &Some(unified_arm_type.clone()), - ); - let body_typed = body_result.typed.clone(); - let body_diags = body_result.diagnostics.clone(); - let guard_unwrapped = match guard_result.clone() { - Some(gr) => gr.clone(), - None => Rc::new(InferResult { - typed: arm_b.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - let guard_diags = if (guard_result.clone() != None) { - guard_unwrapped.diagnostics.clone() - } else { - Rc::new(vec![]) - }; - Rc::new(ArmInferResult { - typed_arm: make_arm_node( - typed_pattern.clone(), - if (guard_result.clone() != None) { - Some(guard_unwrapped.typed.clone()) - } else { - None - }, - body_typed.clone(), - span.clone(), - ), - diagnostics: v2_rt::concat( - pattern_diags.clone(), - v2_rt::concat( - guard_diags.clone(), - body_diags.clone(), - ), - ), - body_type: resolved_type(body_typed.clone()), - }) - } - } else { - original.clone() - } - }); - } - __result - }) +}); } __result }) + } else { + arm_infer_results.clone() + }; +let typed_arms = Rc::new({ let mut __result = Vec::new(); for ar in arm_infer_results.clone().iter().cloned() { __result.push(ar.typed_arm.clone()); } __result }); +let arm_diags = Rc::new({ let mut __result = Vec::new(); for ar in arm_infer_results.clone().iter().cloned() { __result.extend((*ar.diagnostics.clone()).iter().cloned()); } __result }); +let result_type = unified_arm_type.clone(); +let empty_arms_diags = if ((arm_infer_results.clone().len() as i64) == 0) { + Rc::new(vec![inference_error("match expression has no arms".to_string(), span.clone(), scope.module_name.clone())]) + } else { + Rc::new(vec![]) + }; +let exhaustiveness_diags = match (*resolve_pattern_subject(scope.clone(), scrut_subject.clone())).clone() { + PatternSubject::PatternResolved { node: resolved_scrutinee, .. } => check_match_exhaustiveness(&resolved_scrutinee, &typed_arms, &scope.type_env.clone(), span.clone(), scope.module_name.clone()), + PatternSubject::PatternDynamic { .. } => Rc::new(vec![]), + PatternSubject::PatternLookupBlocked => Rc::new(vec![]), +}; +let match_texpr = make_expr_node(Rc::new(ExprData::ExprMatch), v2_rt::concat(Rc::new(vec![scrut_typed.clone()]), typed_arms.clone()), Some(Rc::new(InferredNode::Resolved { + node: result_type, +})), span.clone()); +Rc::new(InferResult { + typed: match_texpr, + diagnostics: v2_rt::concat(v2_rt::concat(v2_rt::concat(scrut_diags, arm_diags), empty_arms_diags), exhaustiveness_diags), +}) +}, + ExprData::ExprIf => { + let span = texpr.span.clone(); +let cond = if_condition(texpr.clone()); +let then_expr = if_then_branch(texpr.clone()); +let else_expr = if_else_branch(texpr.clone()); +let cond_result = infer_expr(&cond, &scope, &None); +let cond_typed = cond_result.typed.clone(); +let cond_diags = cond_result.diagnostics.clone(); +let then_result = infer_expr(&then_expr, &scope, &expected); +let then_typed = then_result.typed.clone(); +let then_diags = then_result.diagnostics.clone(); +match else_expr { + Some(else_branch) => { + let else_result = infer_expr(&else_branch, &scope, &expected); +let then_rt = resolved_type(then_result.typed.clone()); +let else_rt = resolved_type(else_result.typed.clone()); +let then_result = if (!is_fully_resolved(&then_rt, &scope.type_env.clone().source_indices.clone()) && is_fully_resolved(&else_rt, &scope.type_env.clone().source_indices.clone())) { + infer_expr(&then_expr, &scope, &Some(else_rt.clone())) } else { - arm_infer_results.clone() + then_result.clone() }; - let typed_arms = Rc::new({ - let mut __result = Vec::new(); - for ar in arm_infer_results.clone().iter().cloned() { - __result.push(ar.typed_arm.clone()); - } - __result - }); - let arm_diags = Rc::new({ - let mut __result = Vec::new(); - for ar in arm_infer_results.clone().iter().cloned() { - __result.extend((*ar.diagnostics.clone()).iter().cloned()); - } - __result - }); - let result_type = unified_arm_type.clone(); - let empty_arms_diags = if ((arm_infer_results.clone().len() as i64) == 0) { - Rc::new(vec![inference_error( - "match expression has no arms".to_string(), - span.clone(), - scope.module_name.clone(), - )]) +let else_result = if (!is_fully_resolved(&else_rt, &scope.type_env.clone().source_indices.clone()) && is_fully_resolved(&then_rt, &scope.type_env.clone().source_indices.clone())) { + infer_expr(&else_branch, &scope, &Some(then_rt.clone())) } else { + else_result.clone() + }; +let then_typed = then_result.typed.clone(); +let then_diags = then_result.diagnostics.clone(); +let else_typed = else_result.typed.clone(); +let else_diags = else_result.diagnostics.clone(); +let then_rt = resolved_type(then_typed.clone()); +let else_rt = resolved_type(else_typed.clone()); +let unified = prefer_specific_type(then_rt.clone(), else_rt.clone(), &scope.type_env.clone().source_indices.clone()); +let branch_diags = if node_type_compatible(then_rt.clone(), else_rt.clone(), scope.type_env.clone().source_indices.clone()) { Rc::new(vec![]) + } else { + Rc::new(vec![inference_error(v2_rt::concat(v2_rt::concat(v2_rt::concat("if branches resolve to incompatible types: ".to_string(), node_type_shape(&then_rt, &scope.type_env.clone().source_indices.clone())), " vs ".to_string()), node_type_shape(&else_rt, &scope.type_env.clone().source_indices.clone())), span.clone(), scope.module_name.clone())]) }; - let exhaustiveness_diags = match (*resolve_pattern_subject( - scope.clone(), - scrut_subject.clone(), - )) - .clone() +let if_texpr = make_expr_node(Rc::new(ExprData::ExprIf), Rc::new(vec![cond_typed, then_typed.clone(), else_typed.clone()]), Some(Rc::new(InferredNode::Resolved { + node: unified, +})), span.clone()); +Rc::new(InferResult { + typed: if_texpr, + diagnostics: v2_rt::concat(v2_rt::concat(v2_rt::concat(cond_diags, then_diags), else_diags), branch_diags), +}) +}, + None => { + let if_texpr2 = make_expr_node(Rc::new(ExprData::ExprIf), Rc::new(vec![cond_typed, then_typed.clone()]), Some(Rc::new(InferredNode::Resolved { + node: unit_type(), +})), span.clone()); +Rc::new(InferResult { + typed: if_texpr2, + diagnostics: v2_rt::concat(cond_diags, then_diags), +}) +}, +} +}, + ExprData::ExprLet => { + let let_name = let_binding_name_at(texpr.clone(), scope.type_env.clone().source_indices.clone()); +let span = texpr.span.clone(); +let val_expr = let_value(texpr.clone()); +let body_expr = let_body(texpr.clone()); +let is_tail_return = match body_expr.clone() { + Some(bd) => match (*bd.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => (authored_name_at(scope.type_env.clone().source_indices.clone(), &bd).as_str() == let_name.clone().as_str()), + _ => false, +}, + None => false, +}; +let val_expected = if is_tail_return { + expected.clone() + } else { + None + }; +let val_result = infer_expr(&val_expr, &scope, &val_expected); +let val_typed = val_result.typed.clone(); +let val_diags = val_result.diagnostics.clone(); +let val_type = resolved_type(val_typed.clone()); +if (body_expr.clone() == None) { { - PatternSubject::PatternResolved { - node: resolved_scrutinee, - .. - } => check_match_exhaustiveness( - &resolved_scrutinee, - &typed_arms, - &scope.type_env.clone(), - span.clone(), - scope.module_name.clone(), - ), - PatternSubject::PatternDynamic { .. } => Rc::new(vec![]), - PatternSubject::PatternLookupBlocked => Rc::new(vec![]), - }; - let match_texpr = make_expr_node( - Rc::new(ExprData::ExprMatch), - v2_rt::concat(Rc::new(vec![scrut_typed.clone()]), typed_arms.clone()), - Some(Rc::new(InferredNode::Resolved { node: result_type })), - span.clone(), - ); - Rc::new(InferResult { - typed: match_texpr, - diagnostics: v2_rt::concat( - v2_rt::concat(v2_rt::concat(scrut_diags, arm_diags), empty_arms_diags), - exhaustiveness_diags, - ), - }) - } - ExprData::ExprIf => { - let span = texpr.span.clone(); - let cond = if_condition(texpr.clone()); - let then_expr = if_then_branch(texpr.clone()); - let else_expr = if_else_branch(texpr.clone()); - let cond_result = infer_expr(&cond, &scope, &None); - let cond_typed = cond_result.typed.clone(); - let cond_diags = cond_result.diagnostics.clone(); - let then_result = infer_expr(&then_expr, &scope, &expected); - let then_typed = then_result.typed.clone(); - let then_diags = then_result.diagnostics.clone(); - match else_expr { - Some(else_branch) => { - let else_result = infer_expr(&else_branch, &scope, &expected); - let then_rt = resolved_type(then_result.typed.clone()); - let else_rt = resolved_type(else_result.typed.clone()); - let then_result = if (!is_fully_resolved( - &then_rt, - &scope.type_env.clone().source_indices.clone(), - ) && is_fully_resolved( - &else_rt, - &scope.type_env.clone().source_indices.clone(), - )) { - infer_expr(&then_expr, &scope, &Some(else_rt.clone())) - } else { - then_result.clone() - }; - let else_result = if (!is_fully_resolved( - &else_rt, - &scope.type_env.clone().source_indices.clone(), - ) && is_fully_resolved( - &then_rt, - &scope.type_env.clone().source_indices.clone(), - )) { - infer_expr(&else_branch, &scope, &Some(then_rt.clone())) - } else { - else_result.clone() - }; - let then_typed = then_result.typed.clone(); - let then_diags = then_result.diagnostics.clone(); - let else_typed = else_result.typed.clone(); - let else_diags = else_result.diagnostics.clone(); - let then_rt = resolved_type(then_typed.clone()); - let else_rt = resolved_type(else_typed.clone()); - let unified = prefer_specific_type( - then_rt.clone(), - else_rt.clone(), - &scope.type_env.clone().source_indices.clone(), - ); - let branch_diags = if node_type_compatible( - then_rt.clone(), - else_rt.clone(), - scope.type_env.clone().source_indices.clone(), - ) { - Rc::new(vec![]) - } else { - Rc::new(vec![inference_error( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "if branches resolve to incompatible types: " - .to_string(), - node_type_shape( - &then_rt, - &scope.type_env.clone().source_indices.clone(), - ), - ), - " vs ".to_string(), - ), - node_type_shape( - &else_rt, - &scope.type_env.clone().source_indices.clone(), - ), - ), - span.clone(), - scope.module_name.clone(), - )]) - }; - let if_texpr = make_expr_node( - Rc::new(ExprData::ExprIf), - Rc::new(vec![cond_typed, then_typed.clone(), else_typed.clone()]), - Some(Rc::new(InferredNode::Resolved { node: unified })), - span.clone(), - ); - Rc::new(InferResult { - typed: if_texpr, - diagnostics: v2_rt::concat( - v2_rt::concat(v2_rt::concat(cond_diags, then_diags), else_diags), - branch_diags, - ), - }) - } - None => { - let if_texpr2 = make_expr_node( - Rc::new(ExprData::ExprIf), - Rc::new(vec![cond_typed, then_typed.clone()]), - Some(Rc::new(InferredNode::Resolved { node: unit_type() })), - span.clone(), - ); - Rc::new(InferResult { - typed: if_texpr2, - diagnostics: v2_rt::concat(cond_diags, then_diags), - }) - } - } + let let_texpr = make_named_expr_node(&let_name, Rc::new(ExprData::ExprLet), Rc::new(vec![val_typed.clone()]), Some(Rc::new(InferredNode::Resolved { + node: val_type, +})), span.clone(), node_name_span(&texpr)); +Rc::new(InferResult { + typed: let_texpr, + diagnostics: val_diags, +}) +} + } else { + { + let extended = extend_scope(&scope, &let_name, val_type, classify_binding_provenance(&val_typed, &scope)); +let body_result = infer_expr(&body_expr.clone().unwrap(), &extended, &expected); +let body_typed = body_result.typed.clone(); +let body_diags = body_result.diagnostics.clone(); +let let_texpr2 = make_named_expr_node(&let_name, Rc::new(ExprData::ExprLet), Rc::new(vec![val_typed.clone(), body_typed.clone()]), body_typed.inferred.clone(), span.clone(), node_name_span(&texpr)); +Rc::new(InferResult { + typed: let_texpr2, + diagnostics: v2_rt::concat(val_diags, body_diags.clone()), +}) +} } - ExprData::ExprLet => { - let let_name = let_binding_name_at( - texpr.clone(), - scope.type_env.clone().source_indices.clone(), - ); - let span = texpr.span.clone(); - let val_expr = let_value(texpr.clone()); - let body_expr = let_body(texpr.clone()); - let is_tail_return = match body_expr.clone() { - Some(bd) => match (*bd.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - (authored_name_at(scope.type_env.clone().source_indices.clone(), &bd) - .as_str() - == let_name.clone().as_str()) - } - _ => false, - }, - None => false, - }; - let val_expected = if is_tail_return { - expected.clone() +}, + ExprData::ExprRecordLit { .. } => { + let span = texpr.span.clone(); +let field_inits = texpr.children.clone(); +infer_record_lit(&record_lit_type_name_at(texpr.clone(), scope.type_env.clone().source_indices.clone()), field_inits, &span, node_name_span(&texpr), &scope) +}, + ExprData::ExprListLit => { + let span = texpr.span.clone(); +let elements = texpr.children.clone(); +let elem_expected = match expected.clone() { + Some(exp) => if node_is_element_collection(&exp, scope.type_env.clone().source_indices.clone()) { + match exp.children.clone().first().cloned() { + Some(elem) => Some(child_type_node(&elem)), + None => None, +} + } else { + None + }, + None => None, +}; +let elem_results = Rc::new({ let mut __result = Vec::new(); for e in elements.iter().cloned() { __result.push(infer_expr(&e, &scope, &elem_expected)); } __result }); +let typed_elements = Rc::new({ let mut __result = Vec::new(); for r in elem_results.clone().iter().cloned() { __result.push(r.typed.clone()); } __result }); +let elem_diags = Rc::new({ let mut __result = Vec::new(); for r in elem_results.clone().iter().cloned() { __result.extend((*r.diagnostics.clone()).iter().cloned()); } __result }); +let elem_type_node = if ((elem_results.clone().len() as i64) > 0) { + match elem_results.clone().first().cloned() { + Some(r) => resolved_type(r.typed.clone()), + None => unit_type(), +} + } else { + match expected.clone() { + Some(exp) => if node_is_element_collection(&exp, scope.type_env.clone().source_indices.clone()) { + match exp.children.clone().first().cloned() { + Some(elem) => child_type_node(&elem), + None => unit_type(), +} } else { - None - }; - let val_result = infer_expr(&val_expr, &scope, &val_expected); - let val_typed = val_result.typed.clone(); - let val_diags = val_result.diagnostics.clone(); - let val_type = resolved_type(val_typed.clone()); - if (body_expr.clone() == None) { - { - let let_texpr = make_named_expr_node( - &let_name, - Rc::new(ExprData::ExprLet), - Rc::new(vec![val_typed.clone()]), - Some(Rc::new(InferredNode::Resolved { node: val_type })), - span.clone(), - node_name_span(&texpr), - ); - Rc::new(InferResult { - typed: let_texpr, - diagnostics: val_diags, - }) - } + unit_type() + }, + None => unit_type(), +} + }; +let empty_list_diags = if ((elem_results.clone().len() as i64) == 0) { + match expected.clone() { + Some(exp) => if node_is_element_collection(&exp, scope.type_env.clone().source_indices.clone()) { + match exp.children.clone().first().cloned() { + Some(_) => Rc::new(vec![]), + None => Rc::new(vec![inference_error("empty list literal: expected type has no element type".to_string(), span.clone(), scope.module_name.clone())]), +} } else { - { - let extended = extend_scope( - &scope, - &let_name, - val_type, - classify_binding_provenance(&val_typed, &scope), - ); - let body_result = - infer_expr(&body_expr.clone().unwrap(), &extended, &expected); - let body_typed = body_result.typed.clone(); - let body_diags = body_result.diagnostics.clone(); - let let_texpr2 = make_named_expr_node( - &let_name, - Rc::new(ExprData::ExprLet), - Rc::new(vec![val_typed.clone(), body_typed.clone()]), - body_typed.inferred.clone(), - span.clone(), - node_name_span(&texpr), - ); - Rc::new(InferResult { - typed: let_texpr2, - diagnostics: v2_rt::concat(val_diags, body_diags.clone()), - }) - } - } - } - ExprData::ExprRecordLit { .. } => { - let span = texpr.span.clone(); - let field_inits = texpr.children.clone(); - infer_record_lit( - &record_lit_type_name_at( - texpr.clone(), - scope.type_env.clone().source_indices.clone(), - ), - field_inits, - &span, - node_name_span(&texpr), - &scope, - ) - } - ExprData::ExprListLit => { - let span = texpr.span.clone(); - let elements = texpr.children.clone(); - let elem_expected = match expected.clone() { - Some(exp) => { - if node_is_element_collection( - &exp, - scope.type_env.clone().source_indices.clone(), - ) { - match exp.children.clone().first().cloned() { - Some(elem) => Some(child_type_node(&elem)), - None => None, - } + Rc::new(vec![inference_error("empty list literal: expected type is not a collection".to_string(), span.clone(), scope.module_name.clone())]) + }, + None => Rc::new(vec![]), +} + } else { + Rc::new(vec![]) + }; +let list_k = list_kernel_ty_from_element(elem_type_node.clone()); +let ll_texpr = make_expr_node(Rc::new(ExprData::ExprListLit), typed_elements, Some(Rc::new(InferredNode::Resolved { + node: list_k.ty.clone(), +})), span.clone()); +Rc::new(InferResult { + typed: ll_texpr, + diagnostics: v2_rt::concat(v2_rt::concat(elem_diags, empty_list_diags), list_k.miss_diags.clone()), +}) +}, + ExprData::ExprBinOp { op, .. } => { + let span = texpr.span.clone(); +let left_expr = binop_left(texpr.clone()); +let right_expr = binop_right(texpr.clone()); +let left_result = infer_expr(&left_expr, &scope, &None); +let left_typed = left_result.typed.clone(); +let left_diags = left_result.diagnostics.clone(); +let right_result = infer_expr(&right_expr, &scope, &None); +let right_typed = right_result.typed.clone(); +let right_diags = right_result.diagnostics.clone(); +let binop_info = infer_binop_type_node(&op, &resolved_type(left_typed.clone()), scope.type_env.clone().source_indices.clone()); +let bo_texpr = make_expr_node(Rc::new(ExprData::ExprBinOp { + op: op.clone(), + algebra_field: binop_info.algebra_field.clone(), +}), Rc::new(vec![left_typed.clone(), right_typed]), Some(Rc::new(InferredNode::Resolved { + node: binop_info.result_type.clone(), +})), span.clone()); +Rc::new(InferResult { + typed: bo_texpr, + diagnostics: v2_rt::concat(left_diags, right_diags), +}) +}, + ExprData::ExprUnaryOp { op, .. } => { + let span = texpr.span.clone(); +let operand_expr = unaryop_operand(texpr.clone()); +let operand_result = infer_expr(&operand_expr, &scope, &None); +let operand_typed = operand_result.typed.clone(); +let operand_diags = operand_result.diagnostics.clone(); +let result_type = match op.clone() { + UnaryOpKind::Not => bool_type(), + UnaryOpKind::Neg => resolved_type(operand_typed.clone()), +}; +let uo_texpr = make_expr_node(Rc::new(ExprData::ExprUnaryOp { + op: op.clone(), +}), Rc::new(vec![operand_typed.clone()]), Some(Rc::new(InferredNode::Resolved { + node: result_type, +})), span.clone()); +Rc::new(InferResult { + typed: uo_texpr, + diagnostics: operand_diags, +}) +}, + ExprData::ExprLambda => { + let span = texpr.span.clone(); +let lam_body = lambda_body(texpr.clone()); +let lam_params = lambda_param_names_at(texpr.clone(), scope.type_env.clone().source_indices.clone()); +let lam_param_nodes = Rc::new(texpr.children.clone().iter().cloned().skip(1 as usize).collect::>()); +let elem_prov = match v2_rt::map_get(&scope.lambda_param_provenance.clone(), "elem".to_string()) { + Some(p) => p.clone(), + None => Rc::new(SubValueRelation::SubValueUnknown), +}; +let lam_scope = if (expected.clone() != None) { + { + let exp = expected.clone().unwrap(); +if ((exp.params.clone().len() as i64) > 0) { + Rc::new(lam_params.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(scope.clone(), |acc: Rc, pair: (i64, String)| { + let param_prov = if (pair.0.clone() == ((lam_params.clone().len() as i64) - 1)) { + elem_prov.clone() + } else { + Rc::new(SubValueRelation::SubValueUnknown) + }; +match exp.params.clone().get(pair.0.clone() as usize).cloned() { + Some(cp) => extend_scope(&acc, &pair.1.clone(), param_node_type_expr(&cp), param_prov.clone()), + None => extend_scope(&acc, &pair.1.clone(), type_variable_node("callable_param".to_string()), param_prov.clone()), +} +}) + } else { + if ((lam_params.clone().len() as i64) == 1) { + match lam_params.clone().first().cloned() { + Some(p) => extend_scope(&scope, &p, exp.clone(), elem_prov.clone()), + None => scope.clone(), +} } else { - None - } - } - None => None, - }; - let elem_results = Rc::new({ - let mut __result = Vec::new(); - for e in elements.iter().cloned() { - __result.push(infer_expr(&e, &scope, &elem_expected)); - } - __result - }); - let typed_elements = Rc::new({ - let mut __result = Vec::new(); - for r in elem_results.clone().iter().cloned() { - __result.push(r.typed.clone()); - } - __result - }); - let elem_diags = Rc::new({ - let mut __result = Vec::new(); - for r in elem_results.clone().iter().cloned() { - __result.extend((*r.diagnostics.clone()).iter().cloned()); - } - __result - }); - let elem_type_node = if ((elem_results.clone().len() as i64) > 0) { - match elem_results.clone().first().cloned() { - Some(r) => resolved_type(r.typed.clone()), - None => unit_type(), - } - } else { - match expected.clone() { - Some(exp) => { - if node_is_element_collection( - &exp, - scope.type_env.clone().source_indices.clone(), - ) { - match exp.children.clone().first().cloned() { - Some(elem) => child_type_node(&elem), - None => unit_type(), + Rc::new(lam_params.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(scope.clone(), |acc: Rc, pair: (i64, String)| { + let param_prov = if (pair.0.clone() == ((lam_params.clone().len() as i64) - 1)) { + elem_prov.clone() + } else { + Rc::new(SubValueRelation::SubValueUnknown) + }; +if (pair.0.clone() == ((lam_params.clone().len() as i64) - 1)) { + extend_scope(&acc, &pair.1.clone(), exp.clone(), param_prov.clone()) + } else { + extend_scope(&acc, &pair.1.clone(), type_variable_node("lambda_param".to_string()), param_prov.clone()) } - } else { - unit_type() - } +}) } - None => unit_type(), } - }; - let empty_list_diags = if ((elem_results.clone().len() as i64) == 0) { - match expected.clone() { - Some(exp) => { - if node_is_element_collection( - &exp, - scope.type_env.clone().source_indices.clone(), - ) { - match exp.children.clone().first().cloned() { - Some(_) => Rc::new(vec![]), - None => Rc::new(vec![inference_error( - "empty list literal: expected type has no element type" - .to_string(), - span.clone(), - scope.module_name.clone(), - )]), - } - } else { - Rc::new(vec![inference_error( - "empty list literal: expected type is not a collection" - .to_string(), - span.clone(), - scope.module_name.clone(), - )]) - } - } - None => Rc::new(vec![]), +} + } else { + extend_scope_with_params(&scope, lam_params.clone()) + }; +let body_expected = if (expected.clone() != None) { + { + let exp = expected.clone().unwrap(); +if ((exp.params.clone().len() as i64) > 0) { + Some(callable_inferred(&exp)) + } else { + None } +} + } else { + None + }; +let body_scope = Rc::new(InferScope { + type_env: lam_scope.type_env.clone(), + func_env: lam_scope.func_env.clone(), + locals: lam_scope.locals.clone(), + match_bound_names: lam_scope.match_bound_names.clone(), + module_name: lam_scope.module_name.clone(), + service_registry: lam_scope.service_registry.clone(), + item_registry: lam_scope.item_registry.clone(), + lambda_param_provenance: v2_rt::rc_empty_map::>(), +}); +let body_result = infer_expr(&lam_body, &body_scope, &body_expected); +let body_typed = body_result.typed.clone(); +let body_diags = body_result.diagnostics.clone(); +let typed_param_nodes = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(lam_param_nodes.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ + let pn = pair.1.clone(); +let param_name = match lam_params.clone().get(pair.0.clone() as usize).cloned() { + Some(n) => n.clone(), + None => "".to_string(), +}; +let param_type = match v2_rt::map_get(&lam_scope.locals.clone(), param_name.clone()) { + Some(binding) => Some(Rc::new(InferredNode::Resolved { + node: binding.resolved.clone(), +})), + None => None, +}; +Rc::new(Node { + name: pn.name.clone(), + ident: pn.ident.clone(), + span: pn.span.clone(), + ident_span: pn.ident_span.clone(), + children: pn.children.clone(), + connective: pn.connective.clone(), + params: pn.params.clone(), + inferred: param_type.clone(), + return_cardinality: pn.return_cardinality.clone(), + uses: pn.uses.clone(), + body: pn.body.clone(), + transport: pn.transport.clone(), + properties: pn.properties.clone(), + type_annotation: pn.type_annotation.clone(), + is_self_recursive: pn.is_self_recursive.clone(), + has_non_tail_self_call: pn.has_non_tail_self_call.clone(), + match_pattern: pn.match_pattern.clone(), + expr_data: pn.expr_data.clone(), +}) +}); } __result }); +let lam_texpr = make_expr_node(Rc::new(ExprData::ExprLambda), v2_rt::concat(Rc::new(vec![body_typed.clone()]), typed_param_nodes), body_typed.inferred.clone(), span.clone()); +Rc::new(InferResult { + typed: lam_texpr, + diagnostics: body_diags.clone(), +}) +}, + ExprData::ExprStringInterp => { + let span = texpr.span.clone(); +let typed_part_nodes = Rc::new({ let mut __result = Vec::new(); for part_node in texpr.children.clone().iter().cloned() { __result.push(match (*part_node.expr_data.clone()).clone() { + ExprData::ExprLiteral { .. } => part_node.clone(), + _ => match part_node.children.clone().first().cloned() { + Some(inner) => { + let r = infer_expr(&inner, &scope, &None); +make_interp_part_node(r.typed.clone(), part_node.span.clone()) +}, + None => part_node.clone(), +}, +}); } __result }); +let interp_diags = Rc::new({ let mut __result = Vec::new(); for part_node in texpr.children.clone().iter().cloned() { __result.extend((*match (*part_node.expr_data.clone()).clone() { + ExprData::ExprLiteral { .. } => Rc::new(vec![]), + _ => match part_node.children.clone().first().cloned() { + Some(inner) => { + let r = infer_expr(&inner, &scope, &None); +r.diagnostics.clone() +}, + None => Rc::new(vec![]), +}, +}).iter().cloned()); } __result }); +let si_texpr = make_expr_node(Rc::new(ExprData::ExprStringInterp), typed_part_nodes, Some(Rc::new(InferredNode::Resolved { + node: string_type(), +})), span.clone()); +Rc::new(InferResult { + typed: si_texpr, + diagnostics: interp_diags, +}) +}, + ExprData::ExprBlock => { + let span = texpr.span.clone(); +let stmts = texpr.children.clone(); +if ((stmts.clone().len() as i64) > 0) { + { + let state = infer_block_stmts(stmts.clone(), (stmts.clone().len() as i64), scope.clone(), Rc::new(vec![]), Rc::new(vec![]), unit_type(), expected.clone()); +let blk_texpr = make_expr_node(Rc::new(ExprData::ExprBlock), state.typed_stmts.clone(), Some(Rc::new(InferredNode::Resolved { + node: state.last_type.clone(), +})), span.clone()); +Rc::new(InferResult { + typed: blk_texpr, + diagnostics: Rc::new({ let mut __result = Vec::new(); for c in state.diag_chunks.clone().iter().cloned() { __result.extend((*c.clone()).iter().cloned()); } __result }), +}) +} + } else { + ok_infer(make_expr_node(Rc::new(ExprData::ExprBlock), Rc::new(vec![]), Some(Rc::new(InferredNode::Resolved { + node: unit_type(), +})), span.clone())) + } +}, + ExprData::ExprCast => { + let span = texpr.span.clone(); +let cast_inner = cast_expr(texpr.clone()); +let target_type = cast_target(texpr.clone()); +let inner_result = infer_expr(&cast_inner, &scope, &None); +let inner_typed = inner_result.typed.clone(); +let inner_diags = inner_result.diagnostics.clone(); +let si = scope.type_env.clone().source_indices.clone(); +let target_name = authored_name_at(si.clone(), &target_type); +let cast_diag = validate_cast(inner_typed.inferred.clone(), &target_name, span.clone(), si.clone(), scope.module_name.clone()); +let cast_diags = match cast_diag { + Some(d) => Rc::new(vec![d.clone()]), + None => Rc::new(vec![]), +}; +let cast_texpr = make_expr_node(Rc::new(ExprData::ExprCast), Rc::new(vec![inner_typed.clone(), target_type.clone()]), Some(Rc::new(InferredNode::Resolved { + node: target_type.clone(), +})), span.clone()); +Rc::new(InferResult { + typed: cast_texpr, + diagnostics: v2_rt::concat(inner_diags, cast_diags), +}) +}, + ExprData::ExprForEach => { + let variable = foreach_variable_at(texpr.clone(), scope.type_env.clone().source_indices.clone()); +let span = texpr.span.clone(); +let coll = foreach_collection(texpr.clone()); +let body_expr = foreach_body(texpr.clone()); +let coll_result = infer_expr(&coll, &scope, &None); +let coll_typed = coll_result.typed.clone(); +let coll_diags = coll_result.diagnostics.clone(); +let elem_type_node = for_each_element_type_node(resolved_type(coll_typed.clone()), scope.type_env.clone().source_indices.clone()); +let elem_provenance = derive_element_provenance(coll_typed.clone(), &elem_type_node, &scope); +let body_scope = extend_scope(&scope, &variable, elem_type_node.clone(), elem_provenance); +let body_result = infer_expr(&body_expr, &body_scope, &None); +let body_typed = body_result.typed.clone(); +let body_diags = body_result.diagnostics.clone(); +let fe_texpr = make_named_expr_node(&variable, Rc::new(ExprData::ExprForEach), Rc::new(vec![coll_typed.clone(), body_typed.clone()]), body_typed.inferred.clone(), span.clone(), node_name_span(&texpr)); +Rc::new(InferResult { + typed: fe_texpr, + diagnostics: v2_rt::concat(coll_diags, body_diags.clone()), +}) +}, + ExprData::ExprIndex => { + let span = texpr.span.clone(); +let base_expr = index_base(texpr.clone()); +let idx_key = index_expr(texpr.clone()); +let base_result = infer_expr(&base_expr, &scope, &None); +let base_typed = base_result.typed.clone(); +let base_diags = base_result.diagnostics.clone(); +let index_result = infer_expr(&idx_key, &scope, &None); +let index_typed = index_result.typed.clone(); +let index_diags = index_result.diagnostics.clone(); +let index_check = match base_typed.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: base_type, .. }) => match index_typed.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: index_type, .. }) => Some(check_index_access_node(base_type.clone(), index_type.clone(), &span, scope.module_name.clone(), &scope.type_env.clone().source_indices.clone())), + _ => None, +}, + _ => None, +}; +let access_failure_inferred = match base_typed.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { .. }) => index_typed.inferred.clone(), + _ => base_typed.inferred.clone(), +}; +let idx_inferred = match index_check.clone() { + Some(checked) => checked.inferred.clone(), + None => Some(inferred_or_error(access_failure_inferred, "invalid index access".to_string(), span.clone())), +}; +let index_access_diags = match index_check.clone() { + Some(checked) => checked.diagnostics.clone(), + None => Rc::new(vec![]), +}; +let idx_texpr = make_expr_node(Rc::new(ExprData::ExprIndex), Rc::new(vec![base_typed.clone(), index_typed.clone()]), idx_inferred, span.clone()); +Rc::new(InferResult { + typed: idx_texpr, + diagnostics: v2_rt::concat(v2_rt::concat(base_diags, index_diags), index_access_diags), +}) +}, + ExprData::ExprSlice => { + let span = texpr.span.clone(); +let base_expr = slice_base(texpr.clone()); +let start_expr = slice_start(texpr.clone()); +let end_expr = slice_end(texpr.clone()); +let base_result = infer_expr(&base_expr, &scope, &None); +let base_typed = base_result.typed.clone(); +let base_diags = base_result.diagnostics.clone(); +let start_result = infer_expr(&start_expr, &scope, &None); +let start_typed = start_result.typed.clone(); +let start_diags = start_result.diagnostics.clone(); +let end_result = infer_expr(&end_expr, &scope, &None); +let end_typed = end_result.typed.clone(); +let end_diags = end_result.diagnostics.clone(); +let slice_check = match base_typed.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: base_type, .. }) => match start_typed.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: start_type, .. }) => match end_typed.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: end_type, .. }) => Some(check_slice_access_node(base_type.clone(), start_type.clone(), end_type.clone(), &span, &scope.module_name.clone(), &scope.type_env.clone().source_indices.clone())), + _ => None, +}, + _ => None, +}, + _ => None, +}; +let access_failure_inferred = match base_typed.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { .. }) => match start_typed.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { .. }) => end_typed.inferred.clone(), + _ => start_typed.inferred.clone(), +}, + _ => base_typed.inferred.clone(), +}; +let slc_inferred = match slice_check.clone() { + Some(checked) => checked.inferred.clone(), + None => Some(inferred_or_error(access_failure_inferred, "invalid slice access".to_string(), span.clone())), +}; +let slice_access_diags = match slice_check.clone() { + Some(checked) => checked.diagnostics.clone(), + None => Rc::new(vec![]), +}; +let slc_texpr = make_expr_node(Rc::new(ExprData::ExprSlice), Rc::new(vec![base_typed.clone(), start_typed.clone(), end_typed.clone()]), slc_inferred, span.clone()); +Rc::new(InferResult { + typed: slc_texpr, + diagnostics: v2_rt::concat(v2_rt::concat(v2_rt::concat(base_diags, start_diags), end_diags), slice_access_diags), +}) +}, + ExprData::ExprReturn => { + let span = texpr.span.clone(); +let inner_expr = return_value(texpr.clone()); +let inner_result = infer_expr(&inner_expr, &scope, &expected); +let ret_texpr = make_expr_node(Rc::new(ExprData::ExprReturn), Rc::new(vec![inner_result.typed.clone()]), inner_result.typed.clone().inferred.clone(), span.clone()); +Rc::new(InferResult { + typed: ret_texpr, + diagnostics: inner_result.diagnostics.clone(), +}) +}, + _ => { + let span = texpr.span.clone(); +Rc::new(InferResult { + typed: make_expr_error_node(ExprErrorKind::InternalExprError, &"unhandled expression variant in infer_expr".to_string(), &span), + diagnostics: Rc::new(vec![inference_error("unhandled expression variant in infer_expr".to_string(), span.clone(), scope.module_name.clone())]), +}) +}, +} + }) +} + +pub fn infer_record_lit(type_name: &Option, field_inits: Rc>>, span: &Rc, name_span: Rc, scope: &Rc) -> Rc { + { + let struct_fields = record_lit_expected_fields(type_name.clone(), &scope); +let fi_infer_results = Rc::new({ let mut __result = Vec::new(); for fi in field_inits.iter().cloned() { __result.push({ + let fi_name = field_init_node_name_at(fi.clone(), scope.type_env.clone().source_indices.clone()); +let field_expected = match Rc::new({ let mut __result = Vec::new(); for sf in struct_fields.clone().iter().cloned() { if (authored_name_at(scope.type_env.clone().source_indices.clone(), &sf).as_str() == fi_name.clone().as_str()) { __result.push(sf); } } __result }).first().cloned() { + Some(sf) => { + let ft = resolved_type(sf.clone()); +if (ft.ident_span.clone() != None) { + Some(ft.clone()) + } else { + None + } +}, + None => None, +}; +let ar = infer_expr(&field_init_node_value(&fi), &scope, &field_expected); +let ar_typed = ar.typed.clone(); +let ar_diags = ar.diagnostics.clone(); +let field_type_diags = match field_expected.clone() { + Some(expected_node) => { + let got_node = resolved_type(ar_typed.clone()); +if rejects_string_for_optional_coproduct_field(&expected_node, got_node.clone(), scope.type_env.clone().source_indices.clone()) { + Rc::new(vec![type_mismatch_error(node_type_shape(&expected_node, &scope.type_env.clone().source_indices.clone()), node_type_shape(&got_node, &scope.type_env.clone().source_indices.clone()), ar_typed.span.clone(), scope.module_name.clone())]) } else { Rc::new(vec![]) + } +}, + None => Rc::new(vec![]), +}; +Rc::new(FieldInferResult { + typed_field: make_field_init_node(&fi_name, ar_typed.clone(), fi.span.clone(), node_name_span(&fi)), + infer_result: ar.clone(), + diagnostics: v2_rt::concat(ar_diags.clone(), field_type_diags.clone()), +}) +}); } __result }); +let typed_fields = Rc::new({ let mut __result = Vec::new(); for fir in fi_infer_results.clone().iter().cloned() { __result.push(fir.typed_field.clone()); } __result }); +let fi_diags = Rc::new({ let mut __result = Vec::new(); for fir in fi_infer_results.clone().iter().cloned() { __result.extend((*fir.diagnostics.clone()).iter().cloned()); } __result }); +if (type_name.clone() == None) { + { + let child_nodes = Rc::new({ let mut __result = Vec::new(); for fir in fi_infer_results.clone().iter().cloned() { __result.push(Rc::new(Node { + name: field_init_node_name_at(fir.typed_field.clone(), scope.type_env.clone().source_indices.clone()), + span: fir.typed_field.clone().span.clone(), + ident_span: fir.typed_field.clone().ident_span.clone(), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: fir.infer_result.clone().typed.clone().inferred.clone(), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +})); } __result }); +let anon_node = Rc::new(Node { + name: "".to_string(), + span: no_span(), + ident_span: None, + children: child_nodes, + connective: Connective::Conj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let typed_field_nodes = typed_fields; +let texpr = make_expr_node(Rc::new(ExprData::ExprRecordLit { + parent_enum: None, +}), typed_field_nodes, Some(Rc::new(InferredNode::Resolved { + node: anon_node, +})), span.clone()); +Rc::new(InferResult { + typed: texpr, + diagnostics: fi_diags, +}) +} + } else { + { + let type_lookup = lookup_type_by_name(&scope.type_env.clone(), type_name.clone().unwrap()); +let local_variant_parent = lookup_variant_parent_enum(&scope, &type_name.clone().unwrap()); +let effective_lookup = match type_lookup.clone() { + Some(_) => type_lookup.clone(), + None => { + let local_lookup = lookup_in_scope(scope.locals.clone(), type_name.clone().unwrap()); +match local_lookup { + Some(local_node) => lookup_type_for(&scope.type_env.clone(), &local_node), + None => None, +} +}, +}; +let raw_resolved = match effective_lookup.clone() { + Some(tn) => tn.clone(), + None => error_type(), +}; +let expected_optional_parent = Some("Optional".to_string()); +let is_some_ctor = ((type_name.clone().unwrap().as_str() == "Some".to_string().as_str()) && (local_variant_parent.clone().as_deref() == expected_optional_parent.as_deref())); +let resolved_node = if is_some_ctor { + { + let val_field = Rc::new({ let mut __result = Vec::new(); for fir in fi_infer_results.clone().iter().cloned() { if (field_init_node_name_at(fir.typed_field.clone(), scope.type_env.clone().source_indices.clone()).as_str() == "value".to_string().as_str()) { __result.push(fir); } } __result }).first().cloned(); +match val_field { + Some(val_fir) => with_optional_cardinality(&resolved_type(val_fir.infer_result.clone().typed.clone())), + None => raw_resolved, +} +} + } else { + raw_resolved }; - let list_k = list_kernel_ty_from_element(elem_type_node.clone()); - let ll_texpr = make_expr_node( - Rc::new(ExprData::ExprListLit), - typed_elements, - Some(Rc::new(InferredNode::Resolved { - node: list_k.ty.clone(), - })), - span.clone(), - ); - Rc::new(InferResult { - typed: ll_texpr, - diagnostics: v2_rt::concat( - v2_rt::concat(elem_diags, empty_list_diags), - list_k.miss_diags.clone(), - ), - }) - } - ExprData::ExprBinOp { op, .. } => { - let span = texpr.span.clone(); - let left_expr = binop_left(texpr.clone()); - let right_expr = binop_right(texpr.clone()); - let left_result = infer_expr(&left_expr, &scope, &None); - let left_typed = left_result.typed.clone(); - let left_diags = left_result.diagnostics.clone(); - let right_result = infer_expr(&right_expr, &scope, &None); - let right_typed = right_result.typed.clone(); - let right_diags = right_result.diagnostics.clone(); - let binop_info = infer_binop_type_node( - &op, - &resolved_type(left_typed.clone()), - scope.type_env.clone().source_indices.clone(), - ); - let bo_texpr = make_expr_node( - Rc::new(ExprData::ExprBinOp { - op: op.clone(), - algebra_field: binop_info.algebra_field.clone(), - }), - Rc::new(vec![left_typed.clone(), right_typed]), - Some(Rc::new(InferredNode::Resolved { - node: binop_info.result_type.clone(), - })), - span.clone(), - ); - Rc::new(InferResult { - typed: bo_texpr, - diagnostics: v2_rt::concat(left_diags, right_diags), - }) - } - ExprData::ExprUnaryOp { op, .. } => { - let span = texpr.span.clone(); - let operand_expr = unaryop_operand(texpr.clone()); - let operand_result = infer_expr(&operand_expr, &scope, &None); - let operand_typed = operand_result.typed.clone(); - let operand_diags = operand_result.diagnostics.clone(); - let result_type = match op.clone() { - UnaryOpKind::Not => bool_type(), - UnaryOpKind::Neg => resolved_type(operand_typed.clone()), - }; - let uo_texpr = make_expr_node( - Rc::new(ExprData::ExprUnaryOp { op: op.clone() }), - Rc::new(vec![operand_typed.clone()]), - Some(Rc::new(InferredNode::Resolved { node: result_type })), - span.clone(), - ); - Rc::new(InferResult { - typed: uo_texpr, - diagnostics: operand_diags, - }) - } - ExprData::ExprLambda => { - let span = texpr.span.clone(); - let lam_body = lambda_body(texpr.clone()); - let lam_params = lambda_param_names_at( - texpr.clone(), - scope.type_env.clone().source_indices.clone(), - ); - let lam_param_nodes = Rc::new( - texpr - .children - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - let elem_prov = match v2_rt::map_get( - &scope.lambda_param_provenance.clone(), - "elem".to_string(), - ) { - Some(p) => p.clone(), - None => Rc::new(SubValueRelation::SubValueUnknown), - }; - let lam_scope = if (expected.clone() != None) { - { - let exp = expected.clone().unwrap(); - if ((exp.params.clone().len() as i64) > 0) { - Rc::new( - lam_params - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - .fold( - scope.clone(), - |acc: Rc, pair: (i64, String)| { - let param_prov = if (pair.0.clone() - == ((lam_params.clone().len() as i64) - 1)) - { - elem_prov.clone() - } else { - Rc::new(SubValueRelation::SubValueUnknown) - }; - match exp.params.clone().get(pair.0.clone() as usize).cloned() { - Some(cp) => extend_scope( - &acc, - &pair.1.clone(), - param_node_type_expr(&cp), - param_prov.clone(), - ), - None => extend_scope( - &acc, - &pair.1.clone(), - type_variable_node("callable_param".to_string()), - param_prov.clone(), - ), - } - }, - ) - } else { - if ((lam_params.clone().len() as i64) == 1) { - match lam_params.clone().first().cloned() { - Some(p) => { - extend_scope(&scope, &p, exp.clone(), elem_prov.clone()) - } - None => scope.clone(), - } - } else { - Rc::new( - lam_params - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - .fold( - scope.clone(), - |acc: Rc, pair: (i64, String)| { - let param_prov = if (pair.0.clone() - == ((lam_params.clone().len() as i64) - 1)) - { - elem_prov.clone() - } else { - Rc::new(SubValueRelation::SubValueUnknown) - }; - if (pair.0.clone() - == ((lam_params.clone().len() as i64) - 1)) - { - extend_scope( - &acc, - &pair.1.clone(), - exp.clone(), - param_prov.clone(), - ) - } else { - extend_scope( - &acc, - &pair.1.clone(), - type_variable_node("lambda_param".to_string()), - param_prov.clone(), - ) - } - }, - ) - } - } - } - } else { - extend_scope_with_params(&scope, lam_params.clone()) - }; - let body_expected = if (expected.clone() != None) { - { - let exp = expected.clone().unwrap(); - if ((exp.params.clone().len() as i64) > 0) { - Some(callable_inferred(&exp)) - } else { - None - } - } - } else { - None - }; - let body_scope = Rc::new(InferScope { - type_env: lam_scope.type_env.clone(), - func_env: lam_scope.func_env.clone(), - locals: lam_scope.locals.clone(), - match_bound_names: lam_scope.match_bound_names.clone(), - module_name: lam_scope.module_name.clone(), - service_registry: lam_scope.service_registry.clone(), - item_registry: lam_scope.item_registry.clone(), - lambda_param_provenance: v2_rt::rc_empty_map::>(), - }); - let body_result = infer_expr(&lam_body, &body_scope, &body_expected); - let body_typed = body_result.typed.clone(); - let body_diags = body_result.diagnostics.clone(); - let typed_param_nodes = Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - lam_param_nodes - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - __result.push({ - let pn = pair.1.clone(); - let param_name = - match lam_params.clone().get(pair.0.clone() as usize).cloned() { - Some(n) => n.clone(), - None => "".to_string(), - }; - let param_type = - match v2_rt::map_get(&lam_scope.locals.clone(), param_name.clone()) - { - Some(binding) => Some(Rc::new(InferredNode::Resolved { - node: binding.resolved.clone(), - })), - None => None, - }; - Rc::new(Node { - name: pn.name.clone(), - ident: pn.ident.clone(), - span: pn.span.clone(), - ident_span: pn.ident_span.clone(), - children: pn.children.clone(), - connective: pn.connective.clone(), - params: pn.params.clone(), - inferred: param_type.clone(), - return_cardinality: pn.return_cardinality.clone(), - uses: pn.uses.clone(), - body: pn.body.clone(), - transport: pn.transport.clone(), - properties: pn.properties.clone(), - type_annotation: pn.type_annotation.clone(), - is_self_recursive: pn.is_self_recursive.clone(), - has_non_tail_self_call: pn.has_non_tail_self_call.clone(), - match_pattern: pn.match_pattern.clone(), - expr_data: pn.expr_data.clone(), - }) - }); - } - __result - }); - let lam_texpr = make_expr_node( - Rc::new(ExprData::ExprLambda), - v2_rt::concat(Rc::new(vec![body_typed.clone()]), typed_param_nodes), - body_typed.inferred.clone(), - span.clone(), - ); - Rc::new(InferResult { - typed: lam_texpr, - diagnostics: body_diags.clone(), - }) - } - ExprData::ExprStringInterp => { - let span = texpr.span.clone(); - let typed_part_nodes = Rc::new({ - let mut __result = Vec::new(); - for part_node in texpr.children.clone().iter().cloned() { - __result.push(match (*part_node.expr_data.clone()).clone() { - ExprData::ExprLiteral { .. } => part_node.clone(), - _ => match part_node.children.clone().first().cloned() { - Some(inner) => { - let r = infer_expr(&inner, &scope, &None); - make_interp_part_node(r.typed.clone(), part_node.span.clone()) - } - None => part_node.clone(), - }, - }); - } - __result - }); - let interp_diags = Rc::new({ - let mut __result = Vec::new(); - for part_node in texpr.children.clone().iter().cloned() { - __result.extend( - (*match (*part_node.expr_data.clone()).clone() { - ExprData::ExprLiteral { .. } => Rc::new(vec![]), - _ => match part_node.children.clone().first().cloned() { - Some(inner) => { - let r = infer_expr(&inner, &scope, &None); - r.diagnostics.clone() - } - None => Rc::new(vec![]), - }, - }) - .iter() - .cloned(), - ); - } - __result - }); - let si_texpr = make_expr_node( - Rc::new(ExprData::ExprStringInterp), - typed_part_nodes, - Some(Rc::new(InferredNode::Resolved { - node: string_type(), - })), - span.clone(), - ); - Rc::new(InferResult { - typed: si_texpr, - diagnostics: interp_diags, - }) - } - ExprData::ExprBlock => { - let span = texpr.span.clone(); - let stmts = texpr.children.clone(); - if ((stmts.clone().len() as i64) > 0) { - { - let state = infer_block_stmts( - stmts.clone(), - (stmts.clone().len() as i64), - scope.clone(), - Rc::new(vec![]), - Rc::new(vec![]), - unit_type(), - expected.clone(), - ); - let blk_texpr = make_expr_node( - Rc::new(ExprData::ExprBlock), - state.typed_stmts.clone(), - Some(Rc::new(InferredNode::Resolved { - node: state.last_type.clone(), - })), - span.clone(), - ); - Rc::new(InferResult { - typed: blk_texpr, - diagnostics: Rc::new({ - let mut __result = Vec::new(); - for c in state.diag_chunks.clone().iter().cloned() { - __result.extend((*c.clone()).iter().cloned()); - } - __result - }), - }) - } - } else { - ok_infer(make_expr_node( - Rc::new(ExprData::ExprBlock), - Rc::new(vec![]), - Some(Rc::new(InferredNode::Resolved { node: unit_type() })), - span.clone(), - )) - } - } - ExprData::ExprCast => { - let span = texpr.span.clone(); - let cast_inner = cast_expr(texpr.clone()); - let target_type = cast_target(texpr.clone()); - let inner_result = infer_expr(&cast_inner, &scope, &None); - let inner_typed = inner_result.typed.clone(); - let inner_diags = inner_result.diagnostics.clone(); - let si = scope.type_env.clone().source_indices.clone(); - let target_name = authored_name_at(si.clone(), &target_type); - let cast_diag = validate_cast( - inner_typed.inferred.clone(), - &target_name, - span.clone(), - si.clone(), - scope.module_name.clone(), - ); - let cast_diags = match cast_diag { - Some(d) => Rc::new(vec![d.clone()]), - None => Rc::new(vec![]), - }; - let cast_texpr = make_expr_node( - Rc::new(ExprData::ExprCast), - Rc::new(vec![inner_typed.clone(), target_type.clone()]), - Some(Rc::new(InferredNode::Resolved { - node: target_type.clone(), - })), - span.clone(), - ); - Rc::new(InferResult { - typed: cast_texpr, - diagnostics: v2_rt::concat(inner_diags, cast_diags), - }) - } - ExprData::ExprForEach => { - let variable = foreach_variable_at( - texpr.clone(), - scope.type_env.clone().source_indices.clone(), - ); - let span = texpr.span.clone(); - let coll = foreach_collection(texpr.clone()); - let body_expr = foreach_body(texpr.clone()); - let coll_result = infer_expr(&coll, &scope, &None); - let coll_typed = coll_result.typed.clone(); - let coll_diags = coll_result.diagnostics.clone(); - let elem_type_node = for_each_element_type_node( - resolved_type(coll_typed.clone()), - scope.type_env.clone().source_indices.clone(), - ); - let elem_provenance = - derive_element_provenance(coll_typed.clone(), &elem_type_node, &scope); - let body_scope = - extend_scope(&scope, &variable, elem_type_node.clone(), elem_provenance); - let body_result = infer_expr(&body_expr, &body_scope, &None); - let body_typed = body_result.typed.clone(); - let body_diags = body_result.diagnostics.clone(); - let fe_texpr = make_named_expr_node( - &variable, - Rc::new(ExprData::ExprForEach), - Rc::new(vec![coll_typed.clone(), body_typed.clone()]), - body_typed.inferred.clone(), - span.clone(), - node_name_span(&texpr), - ); - Rc::new(InferResult { - typed: fe_texpr, - diagnostics: v2_rt::concat(coll_diags, body_diags.clone()), - }) - } - ExprData::ExprIndex => { - let span = texpr.span.clone(); - let base_expr = index_base(texpr.clone()); - let idx_key = index_expr(texpr.clone()); - let base_result = infer_expr(&base_expr, &scope, &None); - let base_typed = base_result.typed.clone(); - let base_diags = base_result.diagnostics.clone(); - let index_result = infer_expr(&idx_key, &scope, &None); - let index_typed = index_result.typed.clone(); - let index_diags = index_result.diagnostics.clone(); - let index_check = match base_typed.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { - node: base_type, .. - }) => match index_typed.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { - node: index_type, .. - }) => Some(check_index_access_node( - base_type.clone(), - index_type.clone(), - &span, - scope.module_name.clone(), - &scope.type_env.clone().source_indices.clone(), - )), - _ => None, - }, - _ => None, - }; - let access_failure_inferred = match base_typed.inferred.clone().as_deref().cloned() - { - Some(InferredNode::Resolved { .. }) => index_typed.inferred.clone(), - _ => base_typed.inferred.clone(), - }; - let idx_inferred = match index_check.clone() { - Some(checked) => checked.inferred.clone(), - None => Some(inferred_or_error( - access_failure_inferred, - "invalid index access".to_string(), - span.clone(), - )), - }; - let index_access_diags = match index_check.clone() { - Some(checked) => checked.diagnostics.clone(), - None => Rc::new(vec![]), - }; - let idx_texpr = make_expr_node( - Rc::new(ExprData::ExprIndex), - Rc::new(vec![base_typed.clone(), index_typed.clone()]), - idx_inferred, - span.clone(), - ); - Rc::new(InferResult { - typed: idx_texpr, - diagnostics: v2_rt::concat( - v2_rt::concat(base_diags, index_diags), - index_access_diags, - ), - }) - } - ExprData::ExprSlice => { - let span = texpr.span.clone(); - let base_expr = slice_base(texpr.clone()); - let start_expr = slice_start(texpr.clone()); - let end_expr = slice_end(texpr.clone()); - let base_result = infer_expr(&base_expr, &scope, &None); - let base_typed = base_result.typed.clone(); - let base_diags = base_result.diagnostics.clone(); - let start_result = infer_expr(&start_expr, &scope, &None); - let start_typed = start_result.typed.clone(); - let start_diags = start_result.diagnostics.clone(); - let end_result = infer_expr(&end_expr, &scope, &None); - let end_typed = end_result.typed.clone(); - let end_diags = end_result.diagnostics.clone(); - let slice_check = match base_typed.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { - node: base_type, .. - }) => match start_typed.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { - node: start_type, .. - }) => match end_typed.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: end_type, .. }) => { - Some(check_slice_access_node( - base_type.clone(), - start_type.clone(), - end_type.clone(), - &span, - &scope.module_name.clone(), - &scope.type_env.clone().source_indices.clone(), - )) - } - _ => None, - }, - _ => None, - }, - _ => None, - }; - let access_failure_inferred = match base_typed.inferred.clone().as_deref().cloned() - { - Some(InferredNode::Resolved { .. }) => { - match start_typed.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { .. }) => end_typed.inferred.clone(), - _ => start_typed.inferred.clone(), - } - } - _ => base_typed.inferred.clone(), - }; - let slc_inferred = match slice_check.clone() { - Some(checked) => checked.inferred.clone(), - None => Some(inferred_or_error( - access_failure_inferred, - "invalid slice access".to_string(), - span.clone(), - )), - }; - let slice_access_diags = match slice_check.clone() { - Some(checked) => checked.diagnostics.clone(), - None => Rc::new(vec![]), - }; - let slc_texpr = make_expr_node( - Rc::new(ExprData::ExprSlice), - Rc::new(vec![ - base_typed.clone(), - start_typed.clone(), - end_typed.clone(), - ]), - slc_inferred, - span.clone(), - ); - Rc::new(InferResult { - typed: slc_texpr, - diagnostics: v2_rt::concat( - v2_rt::concat(v2_rt::concat(base_diags, start_diags), end_diags), - slice_access_diags, - ), - }) - } - ExprData::ExprReturn => { - let span = texpr.span.clone(); - let inner_expr = return_value(texpr.clone()); - let inner_result = infer_expr(&inner_expr, &scope, &expected); - let ret_texpr = make_expr_node( - Rc::new(ExprData::ExprReturn), - Rc::new(vec![inner_result.typed.clone()]), - inner_result.typed.clone().inferred.clone(), - span.clone(), - ); - Rc::new(InferResult { - typed: ret_texpr, - diagnostics: inner_result.diagnostics.clone(), - }) - } - _ => { - let span = texpr.span.clone(); - Rc::new(InferResult { - typed: make_expr_error_node( - ExprErrorKind::InternalExprError, - &"unhandled expression variant in infer_expr".to_string(), - &span, - ), - diagnostics: Rc::new(vec![inference_error( - "unhandled expression variant in infer_expr".to_string(), - span.clone(), - scope.module_name.clone(), - )]), - }) - } - } - }) +let type_diags = match effective_lookup.clone() { + Some(_) => Rc::new(vec![]), + None => Rc::new(vec![inference_error(v2_rt::concat(v2_rt::concat("type '".to_string(), type_name.clone().unwrap()), "' not found in scope".to_string()), span.clone(), scope.module_name.clone())]), +}; +let typed_field_nodes2 = typed_fields; +let rl_name = match type_name.clone() { + Some(tn_val) => tn_val.clone(), + None => "".to_string(), +}; +let texpr = make_named_expr_node(&rl_name, Rc::new(ExprData::ExprRecordLit { + parent_enum: local_variant_parent.clone(), +}), typed_field_nodes2, Some(Rc::new(InferredNode::Resolved { + node: resolved_node, +})), span.clone(), name_span); +Rc::new(InferResult { + typed: texpr, + diagnostics: v2_rt::concat(fi_diags, type_diags), +}) } - -pub fn infer_record_lit( - type_name: &Option, - field_inits: Rc>>, - span: &Rc, - name_span: Rc, - scope: &Rc, -) -> Rc { - { - let struct_fields = record_lit_expected_fields(type_name.clone(), &scope); - let fi_infer_results = Rc::new({ - let mut __result = Vec::new(); - for fi in field_inits.iter().cloned() { - __result.push({ - let fi_name = field_init_node_name_at( - fi.clone(), - scope.type_env.clone().source_indices.clone(), - ); - let field_expected = match Rc::new({ - let mut __result = Vec::new(); - for sf in struct_fields.clone().iter().cloned() { - if (authored_name_at( - scope.type_env.clone().source_indices.clone(), - &sf, - ) - .as_str() - == fi_name.clone().as_str()) - { - __result.push(sf); - } - } - __result - }) - .first() - .cloned() - { - Some(sf) => { - let ft = resolved_type(sf.clone()); - if (ft.ident_span.clone() != None) { - Some(ft.clone()) - } else { - None - } - } - None => None, - }; - let ar = infer_expr(&field_init_node_value(&fi), &scope, &field_expected); - let ar_typed = ar.typed.clone(); - let ar_diags = ar.diagnostics.clone(); - let field_type_diags = match field_expected.clone() { - Some(expected_node) => { - let got_node = resolved_type(ar_typed.clone()); - if rejects_string_for_optional_coproduct_field( - &expected_node, - got_node.clone(), - scope.type_env.clone().source_indices.clone(), - ) { - Rc::new(vec![type_mismatch_error( - node_type_shape( - &expected_node, - &scope.type_env.clone().source_indices.clone(), - ), - node_type_shape( - &got_node, - &scope.type_env.clone().source_indices.clone(), - ), - ar_typed.span.clone(), - scope.module_name.clone(), - )]) - } else { - Rc::new(vec![]) - } - } - None => Rc::new(vec![]), - }; - Rc::new(FieldInferResult { - typed_field: make_field_init_node( - &fi_name, - ar_typed.clone(), - fi.span.clone(), - node_name_span(&fi), - ), - infer_result: ar.clone(), - diagnostics: v2_rt::concat(ar_diags.clone(), field_type_diags.clone()), - }) - }); - } - __result - }); - let typed_fields = Rc::new({ - let mut __result = Vec::new(); - for fir in fi_infer_results.clone().iter().cloned() { - __result.push(fir.typed_field.clone()); - } - __result - }); - let fi_diags = Rc::new({ - let mut __result = Vec::new(); - for fir in fi_infer_results.clone().iter().cloned() { - __result.extend((*fir.diagnostics.clone()).iter().cloned()); - } - __result - }); - if (type_name.clone() == None) { - { - let child_nodes = Rc::new({ - let mut __result = Vec::new(); - for fir in fi_infer_results.clone().iter().cloned() { - __result.push(Rc::new(Node { - name: field_init_node_name_at( - fir.typed_field.clone(), - scope.type_env.clone().source_indices.clone(), - ), - span: fir.typed_field.clone().span.clone(), - ident_span: fir.typed_field.clone().ident_span.clone(), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: fir.infer_result.clone().typed.clone().inferred.clone(), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - })); - } - __result - }); - let anon_node = Rc::new(Node { - name: "".to_string(), - span: no_span(), - ident_span: None, - children: child_nodes, - connective: Connective::Conj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let typed_field_nodes = typed_fields; - let texpr = make_expr_node( - Rc::new(ExprData::ExprRecordLit { parent_enum: None }), - typed_field_nodes, - Some(Rc::new(InferredNode::Resolved { node: anon_node })), - span.clone(), - ); - Rc::new(InferResult { - typed: texpr, - diagnostics: fi_diags, - }) - } - } else { - { - let type_lookup = - lookup_type_by_name(&scope.type_env.clone(), type_name.clone().unwrap()); - let local_variant_parent = - lookup_variant_parent_enum(&scope, &type_name.clone().unwrap()); - let effective_lookup = match type_lookup.clone() { - Some(_) => type_lookup.clone(), - None => { - let local_lookup = - lookup_in_scope(scope.locals.clone(), type_name.clone().unwrap()); - match local_lookup { - Some(local_node) => { - lookup_type_for(&scope.type_env.clone(), &local_node) - } - None => None, - } - } - }; - let raw_resolved = match effective_lookup.clone() { - Some(tn) => tn.clone(), - None => error_type(), - }; - let expected_optional_parent = Some("Optional".to_string()); - let is_some_ctor = ((type_name.clone().unwrap().as_str() - == "Some".to_string().as_str()) - && (local_variant_parent.clone().as_deref() - == expected_optional_parent.as_deref())); - let resolved_node = if is_some_ctor { - { - let val_field = Rc::new({ - let mut __result = Vec::new(); - for fir in fi_infer_results.clone().iter().cloned() { - if (field_init_node_name_at( - fir.typed_field.clone(), - scope.type_env.clone().source_indices.clone(), - ) - .as_str() - == "value".to_string().as_str()) - { - __result.push(fir); - } - } - __result - }) - .first() - .cloned(); - match val_field { - Some(val_fir) => with_optional_cardinality(&resolved_type( - val_fir.infer_result.clone().typed.clone(), - )), - None => raw_resolved, - } - } - } else { - raw_resolved - }; - let type_diags = match effective_lookup.clone() { - Some(_) => Rc::new(vec![]), - None => Rc::new(vec![inference_error( - v2_rt::concat( - v2_rt::concat("type '".to_string(), type_name.clone().unwrap()), - "' not found in scope".to_string(), - ), - span.clone(), - scope.module_name.clone(), - )]), - }; - let typed_field_nodes2 = typed_fields; - let rl_name = match type_name.clone() { - Some(tn_val) => tn_val.clone(), - None => "".to_string(), - }; - let texpr = make_named_expr_node( - &rl_name, - Rc::new(ExprData::ExprRecordLit { - parent_enum: local_variant_parent.clone(), - }), - typed_field_nodes2, - Some(Rc::new(InferredNode::Resolved { - node: resolved_node, - })), - span.clone(), - name_span, - ); - Rc::new(InferResult { - typed: texpr, - diagnostics: v2_rt::concat(fi_diags, type_diags), - }) - } } - } +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum SizeExpr { - ParamSize { param: String }, - DividedSize { param: String, divisor: i64 }, + ParamSize { + param: String, + }, + DividedSize { + param: String, + divisor: i64, + }, } impl SizeExpr { pub fn param(&self) -> String { @@ -4474,182 +2667,119 @@ pub struct DescentContext { pub fn classify_size_expr(val: &Rc, ctx: &Rc) -> Option> { match (*val.expr_data.clone()).clone() { - ExprData::ExprMethodCall { .. } => { - let mname = - expr_method_name_at(val.clone(), ctx.type_env.clone().source_indices.clone()); - if (mname.as_str() == "count".to_string().as_str()) { - { - let receiver = method_receiver(val.clone()); - match (*receiver.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let rname = expr_var_name_at( - receiver.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - match v2_rt::map_get(&ctx.param_names.clone(), rname.clone()) { - Some(_) => Some(Rc::new(SizeExpr::ParamSize { - param: rname.clone(), - })), - None => None, - } - } - _ => None, - } - } + ExprData::ExprMethodCall { .. } => { + let mname = expr_method_name_at(val.clone(), ctx.type_env.clone().source_indices.clone()); +if (mname.as_str() == "count".to_string().as_str()) { + { + let receiver = method_receiver(val.clone()); +match (*receiver.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let rname = expr_var_name_at(receiver.clone(), ctx.type_env.clone().source_indices.clone()); +match v2_rt::map_get(&ctx.param_names.clone(), rname.clone()) { + Some(_) => Some(Rc::new(SizeExpr::ParamSize { + param: rname.clone(), +})), + None => None, +} +}, + _ => None, +} +} + } else { + None + } +}, + ExprData::ExprBinOp { .. } => { + let left = binop_left(val.clone()); +let right = binop_right(val.clone()); +match (*val.expr_data.clone()).clone() { + ExprData::ExprBinOp { op: BinOp::Div, .. } => match (*left.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let lname = expr_var_name_at(left.clone(), ctx.type_env.clone().source_indices.clone()); +match v2_rt::map_get(&ctx.size_aliases.clone(), lname).as_deref().cloned() { + Some(SizeExpr::ParamSize { param: p, .. }) => match (*right.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: d, .. } = value.as_ref() else { unreachable!() }; if (d.clone() > 0) { + Some(Rc::new(SizeExpr::DividedSize { + param: p.clone(), + divisor: d.clone(), +})) } else { None - } - } - ExprData::ExprBinOp { .. } => { - let left = binop_left(val.clone()); - let right = binop_right(val.clone()); - match (*val.expr_data.clone()).clone() { - ExprData::ExprBinOp { op: BinOp::Div, .. } => match (*left.expr_data.clone()) - .clone() - { - ExprData::ExprVar { .. } => { - let lname = expr_var_name_at( - left.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - match v2_rt::map_get(&ctx.size_aliases.clone(), lname) - .as_deref() - .cloned() - { - Some(SizeExpr::ParamSize { param: p, .. }) => { - match (*right.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitInt { value: d, .. } = value.as_ref() - else { - unreachable!() - }; - if (d.clone() > 0) { - Some(Rc::new(SizeExpr::DividedSize { - param: p.clone(), - divisor: d.clone(), - })) - } else { - None - } - } - _ => None, - } - } - _ => None, - } - } - _ => None, - }, - _ => None, - } - } - _ => None, - } + } }, + _ => None, +}, + _ => None, +} +}, + _ => None, +}, + _ => None, +} +}, + _ => None, +} } -pub fn proportional_skip_alias_plus_literal( - alias_expr: &Rc, - lit_expr: Rc, - param_name: &String, - ctx: &Rc, -) -> Option> { +pub fn proportional_skip_alias_plus_literal(alias_expr: &Rc, lit_expr: Rc, param_name: &String, ctx: &Rc) -> Option> { match (*alias_expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let aname = expr_var_name_at( - alias_expr.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - match v2_rt::map_get(&ctx.size_aliases.clone(), aname) - .as_deref() - .cloned() - { - Some(SizeExpr::DividedSize { - param: p, - divisor: d, - .. - }) => { - if (p.clone().as_str() == param_name.clone().as_str()) { - match (*lit_expr.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitInt { value: k, .. } = value.as_ref() else { - unreachable!() - }; - if (k.clone() > 0) { - match proportional_divisor_from_int_at_least_two(d.clone()) { - Some(div_w) => { - let synth_field = Rc::new(InductiveField { - type_name: param_name.clone(), - variant_name: "".to_string(), - field_name: "skip".to_string(), - shape: RecursionShape::ListRecursion, - element_type: param_name.clone(), - }); - Some(Rc::new(SubValueRelation::StrictSubValue { - field: synth_field, - factor: Rc::new(ShrinkFactor::ProportionalShrink { - divisor: div_w.clone(), - }), - })) - } - None => None, - } - } else { - None - } - } - _ => None, - } - } else { - None - } - } - _ => None, - } - } - _ => None, - } + ExprData::ExprVar { .. } => { + let aname = expr_var_name_at(alias_expr.clone(), ctx.type_env.clone().source_indices.clone()); +match v2_rt::map_get(&ctx.size_aliases.clone(), aname).as_deref().cloned() { + Some(SizeExpr::DividedSize { param: p, divisor: d, .. }) => if (p.clone().as_str() == param_name.clone().as_str()) { + match (*lit_expr.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: k, .. } = value.as_ref() else { unreachable!() }; if (k.clone() > 0) { + match proportional_divisor_from_int_at_least_two(d.clone()) { + Some(div_w) => { + let synth_field = Rc::new(InductiveField { + type_name: param_name.clone(), + variant_name: "".to_string(), + field_name: "skip".to_string(), + shape: RecursionShape::ListRecursion, + element_type: param_name.clone(), +}); +Some(Rc::new(SubValueRelation::StrictSubValue { + field: synth_field, + factor: Rc::new(ShrinkFactor::ProportionalShrink { + divisor: div_w.clone(), +}), +})) +}, + None => None, +} + } else { + None + } }, + _ => None, +} + } else { + None + }, + _ => None, +} +}, + _ => None, +} } -pub fn classify_collection_shrink( - arg_expr: &Rc, - param_name: &String, - ctx: &Rc, -) -> Rc { +pub fn classify_collection_shrink(arg_expr: &Rc, param_name: &String, ctx: &Rc) -> Rc { match (*arg_expr.expr_data.clone()).clone() { - ExprData::ExprMethodCall { .. } => { - let mname = expr_method_name_at( - arg_expr.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - if ((mname.clone().as_str() == "take".to_string().as_str()) - || (mname.clone().as_str() == "skip".to_string().as_str())) + ExprData::ExprMethodCall { .. } => { + let mname = expr_method_name_at(arg_expr.clone(), ctx.type_env.clone().source_indices.clone()); +if ((mname.clone().as_str() == "take".to_string().as_str()) || (mname.clone().as_str() == "skip".to_string().as_str())) { { - { - let receiver = method_receiver(arg_expr.clone()); - match (*receiver.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let rname = expr_var_name_at( - receiver.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - if (rname.as_str() == param_name.clone().as_str()) { - { - let args = method_arg_nodes(arg_expr.clone()); - match args.first().cloned() { - Some(arg_node) => { - let arg_val = arg_value(&arg_node); - match (*arg_val.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitInt { value: k, .. } = - value.as_ref() - else { - unreachable!() - }; - if ((k.clone() > 0) - && (mname.clone().as_str() - == "skip".to_string().as_str())) - { - match positive_descent_amount_from_positive_int(k.clone()) { + let receiver = method_receiver(arg_expr.clone()); +match (*receiver.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let rname = expr_var_name_at(receiver.clone(), ctx.type_env.clone().source_indices.clone()); +if (rname.as_str() == param_name.clone().as_str()) { + { + let args = method_arg_nodes(arg_expr.clone()); +match args.first().cloned() { + Some(arg_node) => { + let arg_val = arg_value(&arg_node); +match (*arg_val.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: k, .. } = value.as_ref() else { unreachable!() }; if ((k.clone() > 0) && (mname.clone().as_str() == "skip".to_string().as_str())) { + match positive_descent_amount_from_positive_int(k.clone()) { Some(steps) => { let synth_field = Rc::new(InductiveField { type_name: param_name.clone(), @@ -4667,31 +2797,14 @@ Rc::new(SubValueRelation::StrictSubValue { }, None => Rc::new(SubValueRelation::SubValueUnknown), } - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } - } - ExprData::ExprVar { .. } => { - let aname = expr_var_name_at( - arg_val.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - match v2_rt::map_get( - &ctx.size_aliases.clone(), - aname, - ) - .as_deref() - .cloned() - { - Some(SizeExpr::DividedSize { - param: p, - divisor: d, - .. - }) => { - if (p.clone().as_str() - == param_name.clone().as_str()) - { - match proportional_divisor_from_int_at_least_two(d.clone()) { + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } }, + ExprData::ExprVar { .. } => { + let aname = expr_var_name_at(arg_val.clone(), ctx.type_env.clone().source_indices.clone()); +match v2_rt::map_get(&ctx.size_aliases.clone(), aname).as_deref().cloned() { + Some(SizeExpr::DividedSize { param: p, divisor: d, .. }) => if (p.clone().as_str() == param_name.clone().as_str()) { + match proportional_divisor_from_int_at_least_two(d.clone()) { Some(div_w) => { let synth_field = Rc::new(InductiveField { type_name: param_name.clone(), @@ -4709,940 +2822,518 @@ Rc::new(SubValueRelation::StrictSubValue { }, None => Rc::new(SubValueRelation::SubValueUnknown), } - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } - } - _ => Rc::new( - SubValueRelation::SubValueUnknown, - ), - } - } - ExprData::ExprBinOp { op, .. } => { - match op.clone() { - BinOp::Add => { - if (mname.clone().as_str() - == "skip".to_string().as_str()) - { - { - let left = - binop_left(arg_val.clone()); - let right = binop_right( - arg_val.clone(), - ); - match proportional_skip_alias_plus_literal(&left, right.clone(), ¶m_name, &ctx) { + } else { + Rc::new(SubValueRelation::SubValueUnknown) + }, + _ => Rc::new(SubValueRelation::SubValueUnknown), +} +}, + ExprData::ExprBinOp { op, .. } => match op.clone() { + BinOp::Add => if (mname.clone().as_str() == "skip".to_string().as_str()) { + { + let left = binop_left(arg_val.clone()); +let right = binop_right(arg_val.clone()); +match proportional_skip_alias_plus_literal(&left, right.clone(), ¶m_name, &ctx) { Some(rel) => rel.clone(), None => match proportional_skip_alias_plus_literal(&right, left.clone(), ¶m_name, &ctx) { Some(rel) => rel.clone(), None => Rc::new(SubValueRelation::SubValueUnknown), }, } - } - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } - } - BinOp::Sub => Rc::new( - SubValueRelation::SubValueUnknown, - ), - _ => Rc::new( - SubValueRelation::SubValueUnknown, - ), - } - } - _ => Rc::new(SubValueRelation::SubValueUnknown), - } - } - None => Rc::new(SubValueRelation::SubValueUnknown), - } - } - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } - } - _ => Rc::new(SubValueRelation::SubValueUnknown), - } - } - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } - } - _ => Rc::new(SubValueRelation::SubValueUnknown), - } } - -#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] -pub struct BlockAnnotateAcc { - pub ctx: Rc, - pub children: Rc>>, + } else { + Rc::new(SubValueRelation::SubValueUnknown) + }, + BinOp::Sub => Rc::new(SubValueRelation::SubValueUnknown), + _ => Rc::new(SubValueRelation::SubValueUnknown), +}, + _ => Rc::new(SubValueRelation::SubValueUnknown), +} +}, + None => Rc::new(SubValueRelation::SubValueUnknown), +} +} + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } +}, + _ => Rc::new(SubValueRelation::SubValueUnknown), +} +} + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } +}, + _ => Rc::new(SubValueRelation::SubValueUnknown), +} +} + +#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] +pub struct BlockAnnotateAcc { + pub ctx: Rc, + pub children: Rc>>, } pub fn method_callback_element_position(semantics: Option>) -> Option { match semantics.as_deref().cloned() { - Some(MethodSemantics::AlgebraMethodSemantics { - algebra_template: at, - .. - }) => match at.clone() { - Some(template) => template.callback_element_position.clone(), - None => None, - }, - _ => None, - } + Some(MethodSemantics::AlgebraMethodSemantics { algebra_template: at, .. }) => match at.clone() { + Some(template) => template.callback_element_position.clone(), + None => None, +}, + _ => None, +} } -pub fn maybe_insert_composed_field_relation( - acc: Rc>>, - fname: String, - composed: Option>, -) -> Rc>> { +pub fn maybe_insert_composed_field_relation(acc: Rc>>, fname: String, composed: Option>) -> Rc>> { match composed { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::SubValueUnknown => acc, - _ => v2_rt::rc_map_insert(acc, fname, rel.clone()), - }, - None => acc, - } + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::SubValueUnknown => acc, + _ => v2_rt::rc_map_insert(acc, fname, rel.clone()), +}, + None => acc, +} } -pub fn maybe_insert_output_field_relation( - acc: Rc>>, - idx: i64, - fname: String, - sig: Rc, - val: Rc, - ctx: Rc, -) -> Rc>> { +pub fn maybe_insert_output_field_relation(acc: Rc>>, idx: i64, fname: String, sig: Rc, val: Rc, ctx: Rc) -> Rc>> { { let composed = match sig.output_provenance.clone().get(idx as usize).cloned() { - Some(param_map) => classify_call_via_provenance(val, ¶m_map, ctx), - None => None, - }; - maybe_insert_composed_field_relation(acc, fname, composed) - } + Some(param_map) => classify_call_via_provenance(val, ¶m_map, ctx), + None => None, +}; +maybe_insert_composed_field_relation(acc, fname, composed) +} } -pub fn maybe_insert_match_field_relation( - fp_acc: Rc>>, - pname: &String, - field_label: String, - vname: String, - scrut_rel: Option>, - param_types: Rc>, - type_env: Rc, -) -> Rc>> { +pub fn maybe_insert_match_field_relation(fp_acc: Rc>>, pname: &String, field_label: String, vname: String, scrut_rel: Option>, param_types: Rc>, type_env: Rc) -> Rc>> { match scrut_rel { - Some(rel) => { - let lookup_type = match (*rel.clone()).clone() { - SubValueRelation::PreservedValue => { - match v2_rt::map_get(¶m_types, pname.clone()) { - Some(t) => t.clone(), - None => "".to_string(), - } - } - SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), - SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), - _ => "".to_string(), - }; - if (lookup_type.clone().as_str() != "".to_string().as_str()) { - { - let ind_fields = inductive_fields_for(type_env, lookup_type.clone()); - let matching = Rc::new({ - let mut __result = Vec::new(); - for f in ind_fields.iter().cloned() { - if ((f.field_name.clone().as_str() == field_label.clone().as_str()) - && ((f.variant_name.clone().as_str() == vname.clone().as_str()) - || (f.variant_name.clone().as_str() - == "".to_string().as_str()))) - { - __result.push(f); - } - } - __result - }) - .first() - .cloned(); - match matching { - Some(ind_field) => v2_rt::rc_map_insert( - fp_acc, - pname.clone(), - compose_sub_value(rel.clone(), ind_field.clone()), - ), - None => fp_acc, - } - } - } else { - fp_acc - } + Some(rel) => { + let lookup_type = match (*rel.clone()).clone() { + SubValueRelation::PreservedValue => match v2_rt::map_get(¶m_types, pname.clone()) { + Some(t) => t.clone(), + None => "".to_string(), +}, + SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), + SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), + _ => "".to_string(), +}; +if (lookup_type.clone().as_str() != "".to_string().as_str()) { + { + let ind_fields = inductive_fields_for(type_env, lookup_type.clone()); +let matching = Rc::new({ let mut __result = Vec::new(); for f in ind_fields.iter().cloned() { if ((f.field_name.clone().as_str() == field_label.clone().as_str()) && ((f.variant_name.clone().as_str() == vname.clone().as_str()) || (f.variant_name.clone().as_str() == "".to_string().as_str()))) { __result.push(f); } } __result }).first().cloned(); +match matching { + Some(ind_field) => v2_rt::rc_map_insert(fp_acc, pname.clone(), compose_sub_value(rel.clone(), ind_field.clone())), + None => fp_acc, +} +} + } else { + fp_acc } - None => fp_acc, - } +}, + None => fp_acc, +} } -pub fn build_per_field_for_let( - val: &Rc, - binding_name: String, - ctx: &Rc, -) -> Rc>>>> { +pub fn build_per_field_for_let(val: &Rc, binding_name: String, ctx: &Rc) -> Rc>>>> { match (*val.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let callee = - expr_call_func_at(val.clone(), ctx.type_env.clone().source_indices.clone()); - match v2_rt::map_get(&ctx.func_sigs.clone(), callee) { - Some(sig) => { - if ((sig.output_provenance.clone().len() as i64) > 1) { - { - let return_type = sig.inferred.clone(); - let field_map = Rc::new( - return_type - .children - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, - pair: (i64, Rc)| { - let idx = pair.0.clone(); - let field_node = pair.1.clone(); - let fname = authored_name_at( - ctx.type_env.clone().source_indices.clone(), - &field_node, - ); - maybe_insert_output_field_relation( - acc, - idx.clone(), - fname.clone(), - sig.clone(), - val.clone(), - ctx.clone(), - ) - }, - ); - if ((Rc::new(v2_rt::map_keys(&field_map)).len() as i64) > 0) { - v2_rt::rc_map_insert( - ctx.per_field_vars.clone(), - binding_name, - field_map.clone(), - ) - } else { - ctx.per_field_vars.clone() - } - } - } else { - ctx.per_field_vars.clone() - } + ExprData::ExprCall { .. } => { + let callee = expr_call_func_at(val.clone(), ctx.type_env.clone().source_indices.clone()); +match v2_rt::map_get(&ctx.func_sigs.clone(), callee) { + Some(sig) => if ((sig.output_provenance.clone().len() as i64) > 1) { + { + let return_type = sig.inferred.clone(); +let field_map = Rc::new(return_type.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, pair: (i64, Rc)| { + let idx = pair.0.clone(); +let field_node = pair.1.clone(); +let fname = authored_name_at(ctx.type_env.clone().source_indices.clone(), &field_node); +maybe_insert_output_field_relation(acc, idx.clone(), fname.clone(), sig.clone(), val.clone(), ctx.clone()) +}); +if ((Rc::new(v2_rt::map_keys(&field_map)).len() as i64) > 0) { + v2_rt::rc_map_insert(ctx.per_field_vars.clone(), binding_name, field_map.clone()) + } else { + ctx.per_field_vars.clone() } - None => ctx.per_field_vars.clone(), - } - } - ExprData::ExprMethodCall { .. } => { - let callee = - expr_method_name_at(val.clone(), ctx.type_env.clone().source_indices.clone()); - match v2_rt::map_get(&ctx.func_sigs.clone(), callee) { - Some(sig) => { - if ((sig.output_provenance.clone().len() as i64) > 1) { - { - let return_type = sig.inferred.clone(); - let field_map = Rc::new( - return_type - .children - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, - pair: (i64, Rc)| { - let idx = pair.0.clone(); - let field_node = pair.1.clone(); - let fname = authored_name_at( - ctx.type_env.clone().source_indices.clone(), - &field_node, - ); - maybe_insert_output_field_relation( - acc, - idx.clone(), - fname.clone(), - sig.clone(), - val.clone(), - ctx.clone(), - ) - }, - ); - if ((Rc::new(v2_rt::map_keys(&field_map)).len() as i64) > 0) { - v2_rt::rc_map_insert( - ctx.per_field_vars.clone(), - binding_name, - field_map.clone(), - ) - } else { - ctx.per_field_vars.clone() - } - } - } else { - ctx.per_field_vars.clone() - } +} + } else { + ctx.per_field_vars.clone() + }, + None => ctx.per_field_vars.clone(), +} +}, + ExprData::ExprMethodCall { .. } => { + let callee = expr_method_name_at(val.clone(), ctx.type_env.clone().source_indices.clone()); +match v2_rt::map_get(&ctx.func_sigs.clone(), callee) { + Some(sig) => if ((sig.output_provenance.clone().len() as i64) > 1) { + { + let return_type = sig.inferred.clone(); +let field_map = Rc::new(return_type.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, pair: (i64, Rc)| { + let idx = pair.0.clone(); +let field_node = pair.1.clone(); +let fname = authored_name_at(ctx.type_env.clone().source_indices.clone(), &field_node); +maybe_insert_output_field_relation(acc, idx.clone(), fname.clone(), sig.clone(), val.clone(), ctx.clone()) +}); +if ((Rc::new(v2_rt::map_keys(&field_map)).len() as i64) > 0) { + v2_rt::rc_map_insert(ctx.per_field_vars.clone(), binding_name, field_map.clone()) + } else { + ctx.per_field_vars.clone() } - None => ctx.per_field_vars.clone(), - } - } - _ => ctx.per_field_vars.clone(), - } +} + } else { + ctx.per_field_vars.clone() + }, + None => ctx.per_field_vars.clone(), +} +}, + _ => ctx.per_field_vars.clone(), +} } -pub fn resolve_collection_field( - mut expr: Rc, - mut ctx: Rc, -) -> Option> { +pub fn resolve_collection_field(mut expr: Rc, mut ctx: Rc) -> Option> { loop { match (*expr.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(expr.clone()); - let fname = field_access_field_at( - expr.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at( - base.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - let base_type = - match v2_rt::map_get(&ctx.param_names.clone(), bname.clone()) { - Some(t) => t.clone(), - None => { - match v2_rt::map_get(&ctx.sub_value_vars.clone(), bname.clone()) - { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { - field: f, .. - } => f.element_type.clone(), - SubValueRelation::IteratedSubValue { - field: f, .. - } => f.element_type.clone(), - _ => "".to_string(), - }, - None => "".to_string(), - } - } - }; - if (base_type.clone().as_str() != "".to_string().as_str()) { - break Rc::new({ - let mut __result = Vec::new(); - for f in Rc::new({ - let mut __result = Vec::new(); - for f in inductive_fields_for( - ctx.type_env.clone(), - base_type.clone(), - ) - .iter() - .cloned() - { - if (f.field_name.clone().as_str() == fname.clone().as_str()) - { - __result.push(f); - } - } - __result - }) - .iter() - .cloned() - { - if match f.shape.clone() { - RecursionShape::ListRecursion => true, - _ => false, - } { - __result.push(f); - } - } - __result - }) - .first() - .cloned(); - } else { - break None; - } - } - _ => { - break None; - } - } - } - ExprData::ExprVar { .. } => { - let rname = - expr_var_name_at(expr.clone(), ctx.type_env.clone().source_indices.clone()); - match v2_rt::map_get(&ctx.sub_value_vars.clone(), rname) { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { field: f, .. } => { - match f.shape.clone() { - RecursionShape::ListRecursion => { - break Some(f.clone()); - } - _ => { - break None; - } - } - } - SubValueRelation::IteratedSubValue { field: f, .. } => { - match f.shape.clone() { - RecursionShape::ListRecursion => { - break Some(f.clone()); - } - _ => { - break None; - } - } - } - _ => { - break None; - } - }, - None => { - break None; - } - } - } - ExprData::ExprMethodCall { .. } => { - let inner_mname = - expr_method_name_at(expr.clone(), ctx.type_env.clone().source_indices.clone()); - let is_collection_preserving = (((((inner_mname.clone().as_str() - == "enumerate".to_string().as_str()) - || (inner_mname.clone().as_str() == "skip".to_string().as_str())) - || (inner_mname.clone().as_str() == "take".to_string().as_str())) - || (inner_mname.clone().as_str() == "filter".to_string().as_str())) - || (inner_mname.clone().as_str() == "reverse".to_string().as_str())); - if is_collection_preserving { - { - let __tco_0 = method_receiver(expr); - expr = __tco_0; - continue; - } - } else { - break None; - } - } - _ => { - break None; - } - } - } + ExprData::ExprFieldAccess { .. } => { let base = field_access_base(expr.clone()); +let fname = field_access_field_at(expr.clone(), ctx.type_env.clone().source_indices.clone()); +match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { let bname = expr_var_name_at(base.clone(), ctx.type_env.clone().source_indices.clone()); +let base_type = match v2_rt::map_get(&ctx.param_names.clone(), bname.clone()) { + Some(t) => t.clone(), + None => match v2_rt::map_get(&ctx.sub_value_vars.clone(), bname.clone()) { + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), + SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), + _ => "".to_string(), +}, + None => "".to_string(), +}, +}; +if (base_type.clone().as_str() != "".to_string().as_str()) { + break Rc::new({ let mut __result = Vec::new(); for f in Rc::new({ let mut __result = Vec::new(); for f in inductive_fields_for(ctx.type_env.clone(), base_type.clone()).iter().cloned() { if (f.field_name.clone().as_str() == fname.clone().as_str()) { __result.push(f); } } __result }).iter().cloned() { if match f.shape.clone() { + RecursionShape::ListRecursion => true, + _ => false, +} { __result.push(f); } } __result }).first().cloned(); +} else { + break None; +} }, + _ => { break None; }, +} }, + ExprData::ExprVar { .. } => { let rname = expr_var_name_at(expr.clone(), ctx.type_env.clone().source_indices.clone()); +match v2_rt::map_get(&ctx.sub_value_vars.clone(), rname) { + Some(rel) => { match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { field: f, .. } => { match f.shape.clone() { + RecursionShape::ListRecursion => { break Some(f.clone()); }, + _ => { break None; }, +} }, + SubValueRelation::IteratedSubValue { field: f, .. } => { match f.shape.clone() { + RecursionShape::ListRecursion => { break Some(f.clone()); }, + _ => { break None; }, +} }, + _ => { break None; }, +} }, + None => { break None; }, +} }, + ExprData::ExprMethodCall { .. } => { let inner_mname = expr_method_name_at(expr.clone(), ctx.type_env.clone().source_indices.clone()); +let is_collection_preserving = (((((inner_mname.clone().as_str() == "enumerate".to_string().as_str()) || (inner_mname.clone().as_str() == "skip".to_string().as_str())) || (inner_mname.clone().as_str() == "take".to_string().as_str())) || (inner_mname.clone().as_str() == "filter".to_string().as_str())) || (inner_mname.clone().as_str() == "reverse".to_string().as_str())); +if is_collection_preserving { + { + let __tco_0 = method_receiver(expr); +expr = __tco_0; +continue; +} +} else { + break None; +} }, + _ => { break None; }, +} +} } pub fn classify_binding_provenance(val: &Rc, scope: &Rc) -> Rc { match (*val.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let vname = - expr_var_name_at(val.clone(), scope.type_env.clone().source_indices.clone()); - match v2_rt::map_get(&scope.locals.clone(), vname) { - Some(binding) => binding.provenance.clone(), - None => Rc::new(SubValueRelation::SubValueUnknown), - } - } - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(val.clone()); - let field = - field_access_field_at(val.clone(), scope.type_env.clone().source_indices.clone()); - match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at( - base.clone(), - scope.type_env.clone().source_indices.clone(), - ); - match v2_rt::map_get(&scope.locals.clone(), bname) { - Some(binding) => { - let fields = inductive_fields_for( - scope.type_env.clone(), - authored_name_at( - scope.type_env.clone().source_indices.clone(), - &binding.resolved.clone(), - ), - ); - let matching = Rc::new({ - let mut __result = Vec::new(); - for f in fields.iter().cloned() { - if (f.field_name.clone().as_str() == field.clone().as_str()) { - __result.push(f); - } - } - __result - }) - .first() - .cloned(); - match matching { - Some(ind_field) => { - compose_sub_value(binding.provenance.clone(), ind_field.clone()) - } - None => Rc::new(SubValueRelation::SubValueUnknown), - } - } - None => Rc::new(SubValueRelation::SubValueUnknown), - } - } - _ => Rc::new(SubValueRelation::SubValueUnknown), - } - } - _ => Rc::new(SubValueRelation::SubValueUnknown), - } + ExprData::ExprVar { .. } => { + let vname = expr_var_name_at(val.clone(), scope.type_env.clone().source_indices.clone()); +match v2_rt::map_get(&scope.locals.clone(), vname) { + Some(binding) => binding.provenance.clone(), + None => Rc::new(SubValueRelation::SubValueUnknown), +} +}, + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(val.clone()); +let field = field_access_field_at(val.clone(), scope.type_env.clone().source_indices.clone()); +match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at(base.clone(), scope.type_env.clone().source_indices.clone()); +match v2_rt::map_get(&scope.locals.clone(), bname) { + Some(binding) => { + let fields = inductive_fields_for(scope.type_env.clone(), authored_name_at(scope.type_env.clone().source_indices.clone(), &binding.resolved.clone())); +let matching = Rc::new({ let mut __result = Vec::new(); for f in fields.iter().cloned() { if (f.field_name.clone().as_str() == field.clone().as_str()) { __result.push(f); } } __result }).first().cloned(); +match matching { + Some(ind_field) => compose_sub_value(binding.provenance.clone(), ind_field.clone()), + None => Rc::new(SubValueRelation::SubValueUnknown), +} +}, + None => Rc::new(SubValueRelation::SubValueUnknown), +} +}, + _ => Rc::new(SubValueRelation::SubValueUnknown), +} +}, + _ => Rc::new(SubValueRelation::SubValueUnknown), +} } -pub fn classify_let_value( - val: &Rc, - ctx: &Rc, -) -> Option> { +pub fn classify_let_value(val: &Rc, ctx: &Rc) -> Option> { match (*val.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let vname = expr_var_name_at(val.clone(), ctx.type_env.clone().source_indices.clone()); - match v2_rt::map_get(&ctx.scope_locals.clone(), vname) { - Some(binding) => match (*binding.provenance.clone()).clone() { - SubValueRelation::SubValueUnknown => None, - _ => Some(binding.provenance.clone()), - }, - None => None, - } - } - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(val.clone()); - let field = - field_access_field_at(val.clone(), ctx.type_env.clone().source_indices.clone()); - match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = - expr_var_name_at(base.clone(), ctx.type_env.clone().source_indices.clone()); - let from_per_field = - match v2_rt::map_get(&ctx.per_field_vars.clone(), bname.clone()) { - Some(field_map) => v2_rt::map_get(&field_map, field.clone()), - None => None, - }; - match from_per_field { - Some(rel) => Some(rel.clone()), - None => { - let type_name = - match v2_rt::map_get(&ctx.scope_locals.clone(), bname.clone()) { - Some(binding) => authored_name_at( - ctx.type_env.clone().source_indices.clone(), - &binding.resolved.clone(), - ), - None => match v2_rt::map_get( - &ctx.param_names.clone(), - bname.clone(), - ) { - Some(t) => t.clone(), - None => "".to_string(), - }, - }; - if (type_name.clone().as_str() != "".to_string().as_str()) { - { - let fields = inductive_fields_for( - ctx.type_env.clone(), - type_name.clone(), - ); - let matching = Rc::new({ - let mut __result = Vec::new(); - for f in fields.iter().cloned() { - if (f.field_name.clone().as_str() - == field.clone().as_str()) - { - __result.push(f); - } - } - __result - }) - .first() - .cloned(); - match matching { - Some(ind_field) => { - Some(Rc::new(SubValueRelation::StrictSubValue { - field: ind_field.clone(), - factor: Rc::new(ShrinkFactor::UnitShrink), - })) - } - None => None, - } - } - } else { - None - } - } - } - } - _ => None, - } - } - ExprData::ExprCall { .. } => { - let callee = - expr_call_func_at(val.clone(), ctx.type_env.clone().source_indices.clone()); - let from_provenance = match v2_rt::map_get(&ctx.func_sigs.clone(), callee.clone()) { - Some(sig) => match sig.output_provenance.clone().first().cloned() { - Some(param_map) => { - classify_call_via_provenance(val.clone(), ¶m_map, ctx.clone()) - } - None => None, - }, - None => None, - }; - match from_provenance.clone() { - Some(_) => from_provenance.clone(), - None => { - if (is_child_accessor_in_model(callee.clone()) - || is_tree_size_reducing(callee.clone())) + ExprData::ExprVar { .. } => { + let vname = expr_var_name_at(val.clone(), ctx.type_env.clone().source_indices.clone()); +match v2_rt::map_get(&ctx.scope_locals.clone(), vname) { + Some(binding) => match (*binding.provenance.clone()).clone() { + SubValueRelation::SubValueUnknown => None, + _ => Some(binding.provenance.clone()), +}, + None => None, +} +}, + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(val.clone()); +let field = field_access_field_at(val.clone(), ctx.type_env.clone().source_indices.clone()); +match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at(base.clone(), ctx.type_env.clone().source_indices.clone()); +let from_per_field = match v2_rt::map_get(&ctx.per_field_vars.clone(), bname.clone()) { + Some(field_map) => v2_rt::map_get(&field_map, field.clone()), + None => None, +}; +match from_per_field { + Some(rel) => Some(rel.clone()), + None => { + let type_name = match v2_rt::map_get(&ctx.scope_locals.clone(), bname.clone()) { + Some(binding) => authored_name_at(ctx.type_env.clone().source_indices.clone(), &binding.resolved.clone()), + None => match v2_rt::map_get(&ctx.param_names.clone(), bname.clone()) { + Some(t) => t.clone(), + None => "".to_string(), +}, +}; +if (type_name.clone().as_str() != "".to_string().as_str()) { { - { - let call_args = val.children.clone(); - match call_args.first().cloned() { - Some(first_arg) => { - let inner = arg_value(&first_arg); - match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let iname = expr_var_name_at( - inner.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - let inner_type = match v2_rt::map_get( - &ctx.param_names.clone(), - iname.clone(), - ) { - Some(t) => t.clone(), - None => match v2_rt::map_get( - &ctx.sub_value_vars.clone(), - iname.clone(), - ) { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { - field: f, - .. - } => f.element_type.clone(), - SubValueRelation::IteratedSubValue { - field: f, - .. - } => f.element_type.clone(), - _ => "".to_string(), - }, - None => "".to_string(), - }, - }; - if (inner_type.clone().as_str() - != "".to_string().as_str()) - { - { - let fields = inductive_fields_for( - ctx.type_env.clone(), - inner_type.clone(), - ); - let cf = - Rc::new({ - let mut __result = Vec::new(); - for f in fields.iter().cloned() { - if match f.shape.clone() { + let fields = inductive_fields_for(ctx.type_env.clone(), type_name.clone()); +let matching = Rc::new({ let mut __result = Vec::new(); for f in fields.iter().cloned() { if (f.field_name.clone().as_str() == field.clone().as_str()) { __result.push(f); } } __result }).first().cloned(); +match matching { + Some(ind_field) => Some(Rc::new(SubValueRelation::StrictSubValue { + field: ind_field.clone(), + factor: Rc::new(ShrinkFactor::UnitShrink), +})), + None => None, +} +} + } else { + None + } +}, +} +}, + _ => None, +} +}, + ExprData::ExprCall { .. } => { + let callee = expr_call_func_at(val.clone(), ctx.type_env.clone().source_indices.clone()); +let from_provenance = match v2_rt::map_get(&ctx.func_sigs.clone(), callee.clone()) { + Some(sig) => match sig.output_provenance.clone().first().cloned() { + Some(param_map) => classify_call_via_provenance(val.clone(), ¶m_map, ctx.clone()), + None => None, +}, + None => None, +}; +match from_provenance.clone() { + Some(_) => from_provenance.clone(), + None => if (is_child_accessor_in_model(callee.clone()) || is_tree_size_reducing(callee.clone())) { + { + let call_args = val.children.clone(); +match call_args.first().cloned() { + Some(first_arg) => { + let inner = arg_value(&first_arg); +match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let iname = expr_var_name_at(inner.clone(), ctx.type_env.clone().source_indices.clone()); +let inner_type = match v2_rt::map_get(&ctx.param_names.clone(), iname.clone()) { + Some(t) => t.clone(), + None => match v2_rt::map_get(&ctx.sub_value_vars.clone(), iname.clone()) { + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), + SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), + _ => "".to_string(), +}, + None => "".to_string(), +}, +}; +if (inner_type.clone().as_str() != "".to_string().as_str()) { + { + let fields = inductive_fields_for(ctx.type_env.clone(), inner_type.clone()); +let cf = Rc::new({ let mut __result = Vec::new(); for f in fields.iter().cloned() { if match f.shape.clone() { RecursionShape::ListRecursion => true, _ => false, -} { __result.push(f); } - } - __result - }) - .first() - .cloned(); - match cf { - Some(ind_field) => Some(Rc::new( - SubValueRelation::StrictSubValue { - field: ind_field.clone(), - factor: Rc::new( - ShrinkFactor::UnitShrink, - ), - }, - )), - None => None, - } - } - } else { - None - } - } - _ => None, - } - } - None => None, - } +} { __result.push(f); } } __result }).first().cloned(); +match cf { + Some(ind_field) => Some(Rc::new(SubValueRelation::StrictSubValue { + field: ind_field.clone(), + factor: Rc::new(ShrinkFactor::UnitShrink), +})), + None => None, +} +} + } else { + None } - } else { - None - } +}, + _ => None, +} +}, + None => None, +} +} + } else { + None + }, +} +}, + _ => { + let type_based = match val.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => if is_container_type(authored_name_at(ctx.type_env.clone().source_indices.clone(), &rt)) { + { + let elem = match rt.children.clone().first().cloned() { + Some(c) => authored_name_at(ctx.type_env.clone().source_indices.clone(), &c), + None => "".to_string(), +}; +if ((elem.clone().as_str() != "".to_string().as_str()) && is_recursive_type_by_name(&ctx.type_env.clone(), elem.clone())) { + { + let fields = inductive_fields_for(ctx.type_env.clone(), elem.clone()); +let cf = Rc::new({ let mut __result = Vec::new(); for f in fields.iter().cloned() { if match f.shape.clone() { + RecursionShape::ListRecursion => true, + _ => false, +} { __result.push(f); } } __result }).first().cloned(); +match cf { + Some(ind_field) => Some(Rc::new(SubValueRelation::StrictSubValue { + field: ind_field.clone(), + factor: Rc::new(ShrinkFactor::UnitShrink), +})), + None => None, +} +} + } else { + None } - } - } - _ => { - let type_based = match val.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - if is_container_type(authored_name_at( - ctx.type_env.clone().source_indices.clone(), - &rt, - )) { - { - let elem = match rt.children.clone().first().cloned() { - Some(c) => authored_name_at( - ctx.type_env.clone().source_indices.clone(), - &c, - ), - None => "".to_string(), - }; - if ((elem.clone().as_str() != "".to_string().as_str()) - && is_recursive_type_by_name(&ctx.type_env.clone(), elem.clone())) - { - { - let fields = - inductive_fields_for(ctx.type_env.clone(), elem.clone()); - let cf = Rc::new({ - let mut __result = Vec::new(); - for f in fields.iter().cloned() { - if match f.shape.clone() { - RecursionShape::ListRecursion => true, - _ => false, - } { - __result.push(f); - } - } - __result - }) - .first() - .cloned(); - match cf { - Some(ind_field) => { - Some(Rc::new(SubValueRelation::StrictSubValue { - field: ind_field.clone(), - factor: Rc::new(ShrinkFactor::UnitShrink), - })) - } - None => None, - } - } - } else { - None - } - } +} + } else { + None + }, + _ => None, +}; +match type_based.clone() { + Some(_) => type_based.clone(), + None => match (*val.expr_data.clone()).clone() { + ExprData::ExprBinOp { op, .. } => { + let left = binop_left(val.clone()); +let right = binop_right(val.clone()); +match op.clone() { + BinOp::Sub => match (*left.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let lname = expr_var_name_at(left.clone(), ctx.type_env.clone().source_indices.clone()); +if ((v2_rt::map_get(&ctx.param_names.clone(), lname.clone()) != None) || (v2_rt::map_get(&ctx.sub_value_vars.clone(), lname.clone()) != None)) { + match (*right.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: k, .. } = value.as_ref() else { unreachable!() }; match positive_descent_amount_from_positive_int(k.clone()) { + Some(steps) => Some(Rc::new(SubValueRelation::ArithmeticDescent { + param: lname.clone(), + factor: Rc::new(ShrinkFactor::ConstantShrink { + steps: steps.clone(), +}), +})), + None => None, +} }, + _ => None, +} + } else { + None + } +}, + _ => None, +}, + BinOp::Div => { + let left_name = match (*left.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let lname = expr_var_name_at(left.clone(), ctx.type_env.clone().source_indices.clone()); +if ((v2_rt::map_get(&ctx.param_names.clone(), lname.clone()) != None) || (v2_rt::map_get(&ctx.sub_value_vars.clone(), lname.clone()) != None)) { + lname.clone() } else { - None + "".to_string() } - } - _ => None, - }; - match type_based.clone() { - Some(_) => type_based.clone(), - None => match (*val.expr_data.clone()).clone() { - ExprData::ExprBinOp { op, .. } => { - let left = binop_left(val.clone()); - let right = binop_right(val.clone()); - match op.clone() { - BinOp::Sub => match (*left.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let lname = expr_var_name_at( - left.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - if ((v2_rt::map_get(&ctx.param_names.clone(), lname.clone()) - != None) - || (v2_rt::map_get( - &ctx.sub_value_vars.clone(), - lname.clone(), - ) != None)) - { - match (*right.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitInt { value: k, .. } = - value.as_ref() - else { - unreachable!() - }; - match positive_descent_amount_from_positive_int( - k.clone(), - ) { - Some(steps) => Some(Rc::new( - SubValueRelation::ArithmeticDescent { - param: lname.clone(), - factor: Rc::new( - ShrinkFactor::ConstantShrink { - steps: steps.clone(), - }, - ), - }, - )), - None => None, - } - } - _ => None, - } - } else { - None - } - } - _ => None, - }, - BinOp::Div => { - let left_name = match (*left.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let lname = expr_var_name_at( - left.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - if ((v2_rt::map_get( - &ctx.param_names.clone(), - lname.clone(), - ) != None) - || (v2_rt::map_get( - &ctx.sub_value_vars.clone(), - lname.clone(), - ) != None)) - { - lname.clone() - } else { - "".to_string() - } - } - ExprData::ExprBinOp { op: BinOp::Sub, .. } => { - let inner_left = binop_left(left.clone()); - match (*inner_left.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let lname = expr_var_name_at( - inner_left.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - if ((v2_rt::map_get( - &ctx.param_names.clone(), - lname.clone(), - ) != None) - || (v2_rt::map_get( - &ctx.sub_value_vars.clone(), - lname.clone(), - ) != None)) - { - lname.clone() - } else { - "".to_string() - } - } - _ => "".to_string(), - } - } - _ => "".to_string(), - }; - if (left_name.clone().as_str() != "".to_string().as_str()) { - match (*right.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitInt { value: k, .. } = - value.as_ref() - else { - unreachable!() - }; - match proportional_divisor_from_int_at_least_two( - k.clone(), - ) { - Some(div_w) => Some(Rc::new( - SubValueRelation::ArithmeticDescent { - param: left_name.clone(), - factor: Rc::new( - ShrinkFactor::ProportionalShrink { - divisor: div_w.clone(), - }, - ), - }, - )), - None => None, - } - } - _ => None, - } - } else { - None - } - } - BinOp::Add => None, - _ => None, +}, + ExprData::ExprBinOp { op: BinOp::Sub, .. } => { + let inner_left = binop_left(left.clone()); +match (*inner_left.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let lname = expr_var_name_at(inner_left.clone(), ctx.type_env.clone().source_indices.clone()); +if ((v2_rt::map_get(&ctx.param_names.clone(), lname.clone()) != None) || (v2_rt::map_get(&ctx.sub_value_vars.clone(), lname.clone()) != None)) { + lname.clone() + } else { + "".to_string() } - } - ExprData::ExprMethodCall { .. } => { - let mname = expr_method_name_at( - val.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - let is_collection_preserving = (((((mname.clone().as_str() - == "skip".to_string().as_str()) - || (mname.clone().as_str() == "filter".to_string().as_str())) - || (mname.clone().as_str() == "take".to_string().as_str())) - || (mname.clone().as_str() == "enumerate".to_string().as_str())) - || (mname.clone().as_str() == "reverse".to_string().as_str())); - if is_collection_preserving { - { - let receiver = method_receiver(val.clone()); - let coll_field = - resolve_collection_field(receiver.clone(), ctx.clone()); - match coll_field { - Some(ind_field) => { - Some(Rc::new(SubValueRelation::StrictSubValue { - field: ind_field.clone(), - factor: Rc::new(ShrinkFactor::UnitShrink), - })) - } - None => { - if (mname.clone().as_str() == "skip".to_string().as_str()) { - { - let skip_args = method_arg_nodes(val.clone()); - let skip_amount = match skip_args.first().cloned() { - Some(a) => match (*arg_value(&a) - .expr_data - .clone()) - .clone() - { - ExprData::ExprLiteral { - ref value, .. - } => { - let LiteralValue::LitInt { - value: k, - .. - } = value.as_ref() - else { - unreachable!() - }; - if (k.clone() > 0) { - k.clone() - } else { - 0 - } - } - _ => 0, - }, - None => 0, - }; - if (skip_amount.clone() > 0) { - match (*receiver.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let rname = expr_var_name_at( - receiver.clone(), - ctx.type_env - .clone() - .source_indices - .clone(), - ); - if ((v2_rt::map_get( - &ctx.param_names.clone(), - rname.clone(), - ) != None) - || (v2_rt::map_get( - &ctx.sub_value_vars.clone(), - rname.clone(), - ) != None)) - { - match positive_descent_amount_from_positive_int(skip_amount.clone()) { +}, + _ => "".to_string(), +} +}, + _ => "".to_string(), +}; +if (left_name.clone().as_str() != "".to_string().as_str()) { + match (*right.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: k, .. } = value.as_ref() else { unreachable!() }; match proportional_divisor_from_int_at_least_two(k.clone()) { + Some(div_w) => Some(Rc::new(SubValueRelation::ArithmeticDescent { + param: left_name.clone(), + factor: Rc::new(ShrinkFactor::ProportionalShrink { + divisor: div_w.clone(), +}), +})), + None => None, +} }, + _ => None, +} + } else { + None + } +}, + BinOp::Add => None, + _ => None, +} +}, + ExprData::ExprMethodCall { .. } => { + let mname = expr_method_name_at(val.clone(), ctx.type_env.clone().source_indices.clone()); +let is_collection_preserving = (((((mname.clone().as_str() == "skip".to_string().as_str()) || (mname.clone().as_str() == "filter".to_string().as_str())) || (mname.clone().as_str() == "take".to_string().as_str())) || (mname.clone().as_str() == "enumerate".to_string().as_str())) || (mname.clone().as_str() == "reverse".to_string().as_str())); +if is_collection_preserving { + { + let receiver = method_receiver(val.clone()); +let coll_field = resolve_collection_field(receiver.clone(), ctx.clone()); +match coll_field { + Some(ind_field) => Some(Rc::new(SubValueRelation::StrictSubValue { + field: ind_field.clone(), + factor: Rc::new(ShrinkFactor::UnitShrink), +})), + None => if (mname.clone().as_str() == "skip".to_string().as_str()) { + { + let skip_args = method_arg_nodes(val.clone()); +let skip_amount = match skip_args.first().cloned() { + Some(a) => match (*arg_value(&a).expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: k, .. } = value.as_ref() else { unreachable!() }; if (k.clone() > 0) { + k.clone() + } else { + 0 + } }, + _ => 0, +}, + None => 0, +}; +if (skip_amount.clone() > 0) { + match (*receiver.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let rname = expr_var_name_at(receiver.clone(), ctx.type_env.clone().source_indices.clone()); +if ((v2_rt::map_get(&ctx.param_names.clone(), rname.clone()) != None) || (v2_rt::map_get(&ctx.sub_value_vars.clone(), rname.clone()) != None)) { + match positive_descent_amount_from_positive_int(skip_amount.clone()) { Some(steps) => { let synth_field = Rc::new(InductiveField { type_name: rname.clone(), @@ -5660,628 +3351,350 @@ Some(Rc::new(SubValueRelation::StrictSubValue { }, None => None, } - } else { - None - } - } - _ => None, - } - } else { - None - } - } - } else { - None - } + } else { + None } - } +}, + _ => None, +} + } else { + None } - } else { - None - } - } - _ => None, - }, +} + } else { + None + }, +} +} + } else { + None } - } - } +}, + _ => None, +}, +} +}, +} } -pub fn classify_call_via_provenance( - call: Rc, - param_map: &Rc>>, - ctx: Rc, -) -> Option> { +pub fn classify_call_via_provenance(call: Rc, param_map: &Rc>>, ctx: Rc) -> Option> { { let call_args = call.children.clone(); - let arg_by_name = call_args.iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, arg_node: Rc| match arg_name_at( - arg_node.clone(), - ctx.type_env.clone().source_indices.clone(), - ) { - Some(aname) => { - v2_rt::rc_map_insert(acc.clone(), aname.clone(), arg_value(&arg_node)) - } - None => acc.clone(), - }, - ); - Rc::new(v2_rt::map_keys(¶m_map)).iter().cloned().fold( - None, - |result: _, callee_pname: String| match v2_rt::map_get(¶m_map, callee_pname.clone()) - { - Some(callee_rel) => match v2_rt::map_get(&arg_by_name, callee_pname.clone()) { - Some(arg_expr) => { - let arg_rel = classify_call_arg_provenance(&arg_expr, &ctx); - match arg_rel.clone() { - Some(arel) => { - let composed = - compose_output_relations(arel.clone(), callee_rel.clone()); - match result.clone() { - Some(prev) => { - Some(meet_sub_value(prev.clone(), composed.clone())) - } - None => Some(composed.clone()), - } - } - None => result.clone(), - } - } - None => result.clone(), - }, - None => result.clone(), - }, - ) - } +let arg_by_name = call_args.iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, arg_node: Rc| match arg_name_at(arg_node.clone(), ctx.type_env.clone().source_indices.clone()) { + Some(aname) => v2_rt::rc_map_insert(acc.clone(), aname.clone(), arg_value(&arg_node)), + None => acc.clone(), +}); +Rc::new(v2_rt::map_keys(¶m_map)).iter().cloned().fold(None, |result: _, callee_pname: String| match v2_rt::map_get(¶m_map, callee_pname.clone()) { + Some(callee_rel) => match v2_rt::map_get(&arg_by_name, callee_pname.clone()) { + Some(arg_expr) => { + let arg_rel = classify_call_arg_provenance(&arg_expr, &ctx); +match arg_rel.clone() { + Some(arel) => { + let composed = compose_output_relations(arel.clone(), callee_rel.clone()); +match result.clone() { + Some(prev) => Some(meet_sub_value(prev.clone(), composed.clone())), + None => Some(composed.clone()), +} +}, + None => result.clone(), +} +}, + None => result.clone(), +}, + None => result.clone(), +}) +} } -pub fn classify_call_arg_provenance( - arg_expr: &Rc, - ctx: &Rc, -) -> Option> { +pub fn classify_call_arg_provenance(arg_expr: &Rc, ctx: &Rc) -> Option> { match (*arg_expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let name = expr_var_name_at( - arg_expr.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - if (v2_rt::map_get(&ctx.param_names.clone(), name.clone()) != None) { - Some(Rc::new(SubValueRelation::PreservedValue)) - } else { - v2_rt::map_get(&ctx.sub_value_vars.clone(), name.clone()) - } + ExprData::ExprVar { .. } => { + let name = expr_var_name_at(arg_expr.clone(), ctx.type_env.clone().source_indices.clone()); +if (v2_rt::map_get(&ctx.param_names.clone(), name.clone()) != None) { + Some(Rc::new(SubValueRelation::PreservedValue)) + } else { + v2_rt::map_get(&ctx.sub_value_vars.clone(), name.clone()) } - _ => classify_let_value(&arg_expr, &ctx), - } +}, + _ => classify_let_value(&arg_expr, &ctx), +} } pub fn merge_argument_relations(rels: &Rc>>) -> Rc { match rels.clone().first().cloned() { - None => Rc::new(SubValueRelation::SubValueUnknown), - Some(first_rel) => Rc::new( - rels.clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ) - .iter() - .cloned() - .fold( - first_rel.clone(), - |acc: Rc, rel: Rc| meet_sub_value(acc, rel.clone()), - ), - } + None => Rc::new(SubValueRelation::SubValueUnknown), + Some(first_rel) => Rc::new(rels.clone().iter().cloned().skip(1 as usize).collect::>()).iter().cloned().fold(first_rel.clone(), |acc: Rc, rel: Rc| meet_sub_value(acc, rel.clone())), +} } -pub fn classify_argument( - arg_expr: &Rc, - param_name: &String, - ctx: &Rc, -) -> Rc { +pub fn classify_argument(arg_expr: &Rc, param_name: &String, ctx: &Rc) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*arg_expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let vname = expr_var_name_at( - arg_expr.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - if (vname.clone().as_str() == param_name.clone().as_str()) { - Rc::new(SubValueRelation::PreservedValue) - } else { - match v2_rt::map_get(&ctx.sub_value_vars.clone(), vname.clone()) { - Some(rel) => rel.clone(), - None => Rc::new(SubValueRelation::SubValueUnknown), - } - } - } - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(arg_expr.clone()); - let field = field_access_field_at( - arg_expr.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at( - base.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - let type_name = - match v2_rt::map_get(&ctx.param_names.clone(), bname.clone()) { - Some(t) => t.clone(), - None => { - match v2_rt::map_get(&ctx.sub_value_vars.clone(), bname.clone()) - { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { - field: f, .. - } => f.element_type.clone(), - SubValueRelation::IteratedSubValue { - field: f, .. - } => f.element_type.clone(), - _ => "".to_string(), - }, - None => "".to_string(), - } - } - }; - let fields = inductive_fields_for(ctx.type_env.clone(), type_name); - let matching = Rc::new({ - let mut __result = Vec::new(); - for f in fields.iter().cloned() { - if (f.field_name.clone().as_str() == field.clone().as_str()) { - __result.push(f); - } - } - __result - }) - .first() - .cloned(); - match matching { - Some(ind_field) => Rc::new(SubValueRelation::StrictSubValue { - field: ind_field.clone(), - factor: Rc::new(ShrinkFactor::UnitShrink), - }), - None => Rc::new(SubValueRelation::SubValueUnknown), - } - } - _ => Rc::new(SubValueRelation::SubValueUnknown), - } - } - ExprData::ExprCall { .. } => { - let call_args = arg_expr.children.clone(); - match call_args.first().cloned() { - Some(first_arg) => { - let inner = arg_value(&first_arg); - let inner_rel = classify_argument(&inner, ¶m_name, &ctx); - match (*inner_rel.clone()).clone() { - SubValueRelation::StrictSubValue { .. } => inner_rel.clone(), - SubValueRelation::IteratedSubValue { .. } => inner_rel.clone(), - SubValueRelation::ArithmeticDescent { .. } => inner_rel.clone(), - SubValueRelation::PreservedValue => { - let callee = expr_call_func_at( - arg_expr.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - let from_provenance = - match v2_rt::map_get(&ctx.func_sigs.clone(), callee.clone()) { - Some(sig) => { - match sig.output_provenance.clone().first().cloned() { - Some(param_map) => classify_call_via_provenance( - arg_expr.clone(), - ¶m_map, - ctx.clone(), - ), - None => None, - } - } - None => None, - }; - match from_provenance { - Some(prov_rel) => prov_rel.clone(), - None => { - if (is_child_accessor_in_model(callee.clone()) - || is_tree_size_reducing(callee.clone())) - { - { - let type_name = match v2_rt::map_get( - &ctx.param_names.clone(), - param_name.clone(), - ) { - Some(t) => t.clone(), - None => "".to_string(), - }; - let fields = inductive_fields_for( - ctx.type_env.clone(), - type_name, - ); - let cf = Rc::new({ - let mut __result = Vec::new(); - for f in fields.iter().cloned() { - if match f.shape.clone() { - RecursionShape::ListRecursion => true, - _ => false, - } { - __result.push(f); - } - } - __result - }) - .first() - .cloned(); - match cf { - Some(ind_field) => { - Rc::new(SubValueRelation::StrictSubValue { - field: ind_field.clone(), - factor: Rc::new( - ShrinkFactor::UnitShrink, - ), - }) - } - None => { - Rc::new(SubValueRelation::PreservedValue) - } - } - } - } else { - if is_property_contraction(callee.clone()) { - Rc::new(SubValueRelation::ArithmeticDescent { - param: param_name.clone(), - factor: Rc::new(ShrinkFactor::ConstantShrink { - steps: Rc::new( - PositiveDescentAmount::OneStep, - ), - }), - }) - } else { - Rc::new(SubValueRelation::PreservedValue) - } - } - } - } - } - SubValueRelation::SubValueUnknown => { - Rc::new(SubValueRelation::SubValueUnknown) - } - } - } - None => Rc::new(SubValueRelation::SubValueUnknown), - } - } - ExprData::ExprMethodCall { .. } => { - classify_collection_shrink(&arg_expr, ¶m_name, &ctx) + ExprData::ExprVar { .. } => { + let vname = expr_var_name_at(arg_expr.clone(), ctx.type_env.clone().source_indices.clone()); +if (vname.clone().as_str() == param_name.clone().as_str()) { + Rc::new(SubValueRelation::PreservedValue) + } else { + match v2_rt::map_get(&ctx.sub_value_vars.clone(), vname.clone()) { + Some(rel) => rel.clone(), + None => Rc::new(SubValueRelation::SubValueUnknown), +} } - ExprData::ExprBinOp { op, .. } => { - let left = binop_left(arg_expr.clone()); - let right = binop_right(arg_expr.clone()); - match op.clone() { - BinOp::Sub => { - let left_is_param = match (*left.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - ((expr_var_name_at( - left.clone(), - ctx.type_env.clone().source_indices.clone(), - ) - .as_str() - == param_name.clone().as_str()) - || (v2_rt::map_get( - &ctx.sub_value_vars.clone(), - expr_var_name_at( - left.clone(), - ctx.type_env.clone().source_indices.clone(), - ), - ) != None)) - } - _ => false, - }; - if left_is_param { - match (*right.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitInt { value: k, .. } = value.as_ref() - else { - unreachable!() - }; - match positive_descent_amount_from_positive_int(k.clone()) { - Some(steps) => { - Rc::new(SubValueRelation::ArithmeticDescent { - param: param_name.clone(), - factor: Rc::new(ShrinkFactor::ConstantShrink { - steps: steps.clone(), - }), - }) - } - None => Rc::new(SubValueRelation::SubValueUnknown), - } - } - _ => Rc::new(SubValueRelation::SubValueUnknown), - } - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } - } - BinOp::Div => { - let left_is_param = match (*left.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - ((expr_var_name_at( - left.clone(), - ctx.type_env.clone().source_indices.clone(), - ) - .as_str() - == param_name.clone().as_str()) - || (v2_rt::map_get( - &ctx.sub_value_vars.clone(), - expr_var_name_at( - left.clone(), - ctx.type_env.clone().source_indices.clone(), - ), - ) != None)) - } - ExprData::ExprBinOp { op: BinOp::Sub, .. } => { - let inner_left = binop_left(left.clone()); - match (*inner_left.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - ((expr_var_name_at( - inner_left.clone(), - ctx.type_env.clone().source_indices.clone(), - ) - .as_str() - == param_name.clone().as_str()) - || (v2_rt::map_get( - &ctx.sub_value_vars.clone(), - expr_var_name_at( - inner_left.clone(), - ctx.type_env.clone().source_indices.clone(), - ), - ) != None)) - } - _ => false, - } - } - _ => false, - }; - if left_is_param { - match (*right.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitInt { value: k, .. } = value.as_ref() - else { - unreachable!() - }; - match proportional_divisor_from_int_at_least_two(k.clone()) { - Some(div_w) => { - Rc::new(SubValueRelation::ArithmeticDescent { - param: param_name.clone(), - factor: Rc::new(ShrinkFactor::ProportionalShrink { - divisor: div_w.clone(), - }), - }) - } - None => Rc::new(SubValueRelation::SubValueUnknown), - } - } - _ => Rc::new(SubValueRelation::SubValueUnknown), - } +}, + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(arg_expr.clone()); +let field = field_access_field_at(arg_expr.clone(), ctx.type_env.clone().source_indices.clone()); +match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at(base.clone(), ctx.type_env.clone().source_indices.clone()); +let type_name = match v2_rt::map_get(&ctx.param_names.clone(), bname.clone()) { + Some(t) => t.clone(), + None => match v2_rt::map_get(&ctx.sub_value_vars.clone(), bname.clone()) { + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), + SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), + _ => "".to_string(), +}, + None => "".to_string(), +}, +}; +let fields = inductive_fields_for(ctx.type_env.clone(), type_name); +let matching = Rc::new({ let mut __result = Vec::new(); for f in fields.iter().cloned() { if (f.field_name.clone().as_str() == field.clone().as_str()) { __result.push(f); } } __result }).first().cloned(); +match matching { + Some(ind_field) => Rc::new(SubValueRelation::StrictSubValue { + field: ind_field.clone(), + factor: Rc::new(ShrinkFactor::UnitShrink), +}), + None => Rc::new(SubValueRelation::SubValueUnknown), +} +}, + _ => Rc::new(SubValueRelation::SubValueUnknown), +} +}, + ExprData::ExprCall { .. } => { + let call_args = arg_expr.children.clone(); +match call_args.first().cloned() { + Some(first_arg) => { + let inner = arg_value(&first_arg); +let inner_rel = classify_argument(&inner, ¶m_name, &ctx); +match (*inner_rel.clone()).clone() { + SubValueRelation::StrictSubValue { .. } => inner_rel.clone(), + SubValueRelation::IteratedSubValue { .. } => inner_rel.clone(), + SubValueRelation::ArithmeticDescent { .. } => inner_rel.clone(), + SubValueRelation::PreservedValue => { + let callee = expr_call_func_at(arg_expr.clone(), ctx.type_env.clone().source_indices.clone()); +let from_provenance = match v2_rt::map_get(&ctx.func_sigs.clone(), callee.clone()) { + Some(sig) => match sig.output_provenance.clone().first().cloned() { + Some(param_map) => classify_call_via_provenance(arg_expr.clone(), ¶m_map, ctx.clone()), + None => None, +}, + None => None, +}; +match from_provenance { + Some(prov_rel) => prov_rel.clone(), + None => if (is_child_accessor_in_model(callee.clone()) || is_tree_size_reducing(callee.clone())) { + { + let type_name = match v2_rt::map_get(&ctx.param_names.clone(), param_name.clone()) { + Some(t) => t.clone(), + None => "".to_string(), +}; +let fields = inductive_fields_for(ctx.type_env.clone(), type_name); +let cf = Rc::new({ let mut __result = Vec::new(); for f in fields.iter().cloned() { if match f.shape.clone() { + RecursionShape::ListRecursion => true, + _ => false, +} { __result.push(f); } } __result }).first().cloned(); +match cf { + Some(ind_field) => Rc::new(SubValueRelation::StrictSubValue { + field: ind_field.clone(), + factor: Rc::new(ShrinkFactor::UnitShrink), +}), + None => Rc::new(SubValueRelation::PreservedValue), +} +} + } else { + if is_property_contraction(callee.clone()) { + Rc::new(SubValueRelation::ArithmeticDescent { + param: param_name.clone(), + factor: Rc::new(ShrinkFactor::ConstantShrink { + steps: Rc::new(PositiveDescentAmount::OneStep), +}), +}) } else { - Rc::new(SubValueRelation::SubValueUnknown) + Rc::new(SubValueRelation::PreservedValue) } - } - BinOp::Add => Rc::new(SubValueRelation::SubValueUnknown), - _ => Rc::new(SubValueRelation::SubValueUnknown), + }, +} +}, + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), +} +}, + None => Rc::new(SubValueRelation::SubValueUnknown), +} +}, + ExprData::ExprMethodCall { .. } => classify_collection_shrink(&arg_expr, ¶m_name, &ctx), + ExprData::ExprBinOp { op, .. } => { + let left = binop_left(arg_expr.clone()); +let right = binop_right(arg_expr.clone()); +match op.clone() { + BinOp::Sub => { + let left_is_param = match (*left.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => ((expr_var_name_at(left.clone(), ctx.type_env.clone().source_indices.clone()).as_str() == param_name.clone().as_str()) || (v2_rt::map_get(&ctx.sub_value_vars.clone(), expr_var_name_at(left.clone(), ctx.type_env.clone().source_indices.clone())) != None)), + _ => false, +}; +if left_is_param { + match (*right.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: k, .. } = value.as_ref() else { unreachable!() }; match positive_descent_amount_from_positive_int(k.clone()) { + Some(steps) => Rc::new(SubValueRelation::ArithmeticDescent { + param: param_name.clone(), + factor: Rc::new(ShrinkFactor::ConstantShrink { + steps: steps.clone(), +}), +}), + None => Rc::new(SubValueRelation::SubValueUnknown), +} }, + _ => Rc::new(SubValueRelation::SubValueUnknown), +} + } else { + Rc::new(SubValueRelation::SubValueUnknown) } - } - ExprData::ExprMatch => { - let arm_rels = Rc::new({ - let mut __result = Vec::new(); - for arm in match_arm_nodes(arg_expr.clone()).iter().cloned() { - __result.push(classify_argument(&arm_body(&arm), ¶m_name, &ctx)); - } - __result - }); - merge_argument_relations(&arm_rels) - } - ExprData::ExprIf => { - let then_rel = - classify_argument(&if_then_branch(arg_expr.clone()), ¶m_name, &ctx); - let else_rel = match if_else_branch(arg_expr.clone()) { - Some(e) => classify_argument(&e, ¶m_name, &ctx), - None => Rc::new(SubValueRelation::SubValueUnknown), - }; - merge_argument_relations(&Rc::new(vec![then_rel, else_rel])) - } - ExprData::ExprBlock => match arg_expr.children.clone().last().cloned() { - Some(last_expr) => classify_argument(&last_expr, ¶m_name, &ctx), - None => Rc::new(SubValueRelation::SubValueUnknown), - }, - ExprData::ExprLet => match let_body(arg_expr.clone()) { - Some(body) => classify_argument(&body, ¶m_name, &ctx), - None => Rc::new(SubValueRelation::SubValueUnknown), - }, - ExprData::ExprCast => { - classify_argument(&cast_expr(arg_expr.clone()), ¶m_name, &ctx) - } - ExprData::ExprReturn => match arg_expr.children.clone().first().cloned() { - Some(inner) => classify_argument(&inner, ¶m_name, &ctx), - None => Rc::new(SubValueRelation::SubValueUnknown), - }, - _ => Rc::new(SubValueRelation::SubValueUnknown), - } +}, + BinOp::Div => { + let left_is_param = match (*left.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => ((expr_var_name_at(left.clone(), ctx.type_env.clone().source_indices.clone()).as_str() == param_name.clone().as_str()) || (v2_rt::map_get(&ctx.sub_value_vars.clone(), expr_var_name_at(left.clone(), ctx.type_env.clone().source_indices.clone())) != None)), + ExprData::ExprBinOp { op: BinOp::Sub, .. } => { + let inner_left = binop_left(left.clone()); +match (*inner_left.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => ((expr_var_name_at(inner_left.clone(), ctx.type_env.clone().source_indices.clone()).as_str() == param_name.clone().as_str()) || (v2_rt::map_get(&ctx.sub_value_vars.clone(), expr_var_name_at(inner_left.clone(), ctx.type_env.clone().source_indices.clone())) != None)), + _ => false, +} +}, + _ => false, +}; +if left_is_param { + match (*right.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: k, .. } = value.as_ref() else { unreachable!() }; match proportional_divisor_from_int_at_least_two(k.clone()) { + Some(div_w) => Rc::new(SubValueRelation::ArithmeticDescent { + param: param_name.clone(), + factor: Rc::new(ShrinkFactor::ProportionalShrink { + divisor: div_w.clone(), +}), +}), + None => Rc::new(SubValueRelation::SubValueUnknown), +} }, + _ => Rc::new(SubValueRelation::SubValueUnknown), +} + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } +}, + BinOp::Add => Rc::new(SubValueRelation::SubValueUnknown), + _ => Rc::new(SubValueRelation::SubValueUnknown), +} +}, + ExprData::ExprMatch => { + let arm_rels = Rc::new({ let mut __result = Vec::new(); for arm in match_arm_nodes(arg_expr.clone()).iter().cloned() { __result.push(classify_argument(&arm_body(&arm), ¶m_name, &ctx)); } __result }); +merge_argument_relations(&arm_rels) +}, + ExprData::ExprIf => { + let then_rel = classify_argument(&if_then_branch(arg_expr.clone()), ¶m_name, &ctx); +let else_rel = match if_else_branch(arg_expr.clone()) { + Some(e) => classify_argument(&e, ¶m_name, &ctx), + None => Rc::new(SubValueRelation::SubValueUnknown), +}; +merge_argument_relations(&Rc::new(vec![then_rel, else_rel])) +}, + ExprData::ExprBlock => match arg_expr.children.clone().last().cloned() { + Some(last_expr) => classify_argument(&last_expr, ¶m_name, &ctx), + None => Rc::new(SubValueRelation::SubValueUnknown), +}, + ExprData::ExprLet => match let_body(arg_expr.clone()) { + Some(body) => classify_argument(&body, ¶m_name, &ctx), + None => Rc::new(SubValueRelation::SubValueUnknown), +}, + ExprData::ExprCast => classify_argument(&cast_expr(arg_expr.clone()), ¶m_name, &ctx), + ExprData::ExprReturn => match arg_expr.children.clone().first().cloned() { + Some(inner) => classify_argument(&inner, ¶m_name, &ctx), + None => Rc::new(SubValueRelation::SubValueUnknown), +}, + _ => Rc::new(SubValueRelation::SubValueUnknown), +} }) } -pub fn read_arg_provenance( - arg_expr: &Rc, - param_name: String, - ctx: &Rc, -) -> Rc { +pub fn read_arg_provenance(arg_expr: &Rc, param_name: String, ctx: &Rc) -> Rc { match (*arg_expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let vname = expr_var_name_at( - arg_expr.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - match v2_rt::map_get(&ctx.scope_locals.clone(), vname) { - Some(binding) => match (*binding.provenance.clone()).clone() { - SubValueRelation::SubValueUnknown => { - classify_argument(&arg_expr, ¶m_name, &ctx) - } - _ => binding.provenance.clone(), - }, - None => classify_argument(&arg_expr, ¶m_name, &ctx), - } - } - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(arg_expr.clone()); - let field = field_access_field_at( - arg_expr.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = - expr_var_name_at(base.clone(), ctx.type_env.clone().source_indices.clone()); - match v2_rt::map_get(&ctx.scope_locals.clone(), bname) { - Some(binding) => match (*binding.provenance.clone()).clone() { - SubValueRelation::SubValueUnknown => { - classify_argument(&arg_expr, ¶m_name, &ctx) - } - _ => { - let fields = inductive_fields_for( - ctx.type_env.clone(), - authored_name_at( - ctx.type_env.clone().source_indices.clone(), - &binding.resolved.clone(), - ), - ); - let matching = Rc::new({ - let mut __result = Vec::new(); - for f in fields.iter().cloned() { - if (f.field_name.clone().as_str() == field.clone().as_str()) - { - __result.push(f); - } - } - __result - }) - .first() - .cloned(); - match matching { - Some(ind_field) => compose_sub_value( - binding.provenance.clone(), - ind_field.clone(), - ), - None => Rc::new(SubValueRelation::SubValueUnknown), - } - } - }, - None => classify_argument(&arg_expr, ¶m_name, &ctx), - } - } - _ => Rc::new(SubValueRelation::SubValueUnknown), - } - } - ExprData::ExprCall { .. } => classify_argument(&arg_expr, ¶m_name, &ctx), - ExprData::ExprMethodCall { .. } => classify_argument(&arg_expr, ¶m_name, &ctx), - ExprData::ExprBinOp { .. } => classify_argument(&arg_expr, ¶m_name, &ctx), - ExprData::ExprMatch => classify_argument(&arg_expr, ¶m_name, &ctx), - ExprData::ExprIf => classify_argument(&arg_expr, ¶m_name, &ctx), - ExprData::ExprBlock => classify_argument(&arg_expr, ¶m_name, &ctx), - ExprData::ExprLet => classify_argument(&arg_expr, ¶m_name, &ctx), - ExprData::ExprCast => classify_argument(&arg_expr, ¶m_name, &ctx), - ExprData::ExprReturn => classify_argument(&arg_expr, ¶m_name, &ctx), - _ => Rc::new(SubValueRelation::SubValueUnknown), - } + ExprData::ExprVar { .. } => { + let vname = expr_var_name_at(arg_expr.clone(), ctx.type_env.clone().source_indices.clone()); +match v2_rt::map_get(&ctx.scope_locals.clone(), vname) { + Some(binding) => match (*binding.provenance.clone()).clone() { + SubValueRelation::SubValueUnknown => classify_argument(&arg_expr, ¶m_name, &ctx), + _ => binding.provenance.clone(), +}, + None => classify_argument(&arg_expr, ¶m_name, &ctx), +} +}, + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(arg_expr.clone()); +let field = field_access_field_at(arg_expr.clone(), ctx.type_env.clone().source_indices.clone()); +match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at(base.clone(), ctx.type_env.clone().source_indices.clone()); +match v2_rt::map_get(&ctx.scope_locals.clone(), bname) { + Some(binding) => match (*binding.provenance.clone()).clone() { + SubValueRelation::SubValueUnknown => classify_argument(&arg_expr, ¶m_name, &ctx), + _ => { + let fields = inductive_fields_for(ctx.type_env.clone(), authored_name_at(ctx.type_env.clone().source_indices.clone(), &binding.resolved.clone())); +let matching = Rc::new({ let mut __result = Vec::new(); for f in fields.iter().cloned() { if (f.field_name.clone().as_str() == field.clone().as_str()) { __result.push(f); } } __result }).first().cloned(); +match matching { + Some(ind_field) => compose_sub_value(binding.provenance.clone(), ind_field.clone()), + None => Rc::new(SubValueRelation::SubValueUnknown), +} +}, +}, + None => classify_argument(&arg_expr, ¶m_name, &ctx), +} +}, + _ => Rc::new(SubValueRelation::SubValueUnknown), +} +}, + ExprData::ExprCall { .. } => classify_argument(&arg_expr, ¶m_name, &ctx), + ExprData::ExprMethodCall { .. } => classify_argument(&arg_expr, ¶m_name, &ctx), + ExprData::ExprBinOp { .. } => classify_argument(&arg_expr, ¶m_name, &ctx), + ExprData::ExprMatch => classify_argument(&arg_expr, ¶m_name, &ctx), + ExprData::ExprIf => classify_argument(&arg_expr, ¶m_name, &ctx), + ExprData::ExprBlock => classify_argument(&arg_expr, ¶m_name, &ctx), + ExprData::ExprLet => classify_argument(&arg_expr, ¶m_name, &ctx), + ExprData::ExprCast => classify_argument(&arg_expr, ¶m_name, &ctx), + ExprData::ExprReturn => classify_argument(&arg_expr, ¶m_name, &ctx), + _ => Rc::new(SubValueRelation::SubValueUnknown), +} +} + +pub fn build_call_evidence(call_node: &Rc, ctx: &Rc) -> Rc>> { + { + let arg_map = Rc::new(call_node.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, pair: (i64, Rc)| { + let idx = pair.0.clone(); +let arg_node = pair.1.clone(); +let aname = arg_name_at(arg_node.clone(), ctx.type_env.clone().source_indices.clone()); +match aname.clone() { + Some(pname) => v2_rt::rc_map_insert(acc.clone(), pname.clone(), arg_value(&arg_node)), + None => acc.clone(), +} +}); +let positional_args = Rc::new({ let mut __result = Vec::new(); for arg_node in Rc::new({ let mut __result = Vec::new(); for arg_node in call_node.children.clone().iter().cloned() { if (arg_name_at(arg_node.clone(), ctx.type_env.clone().source_indices.clone()) == None) { __result.push(arg_node); } } __result }).iter().cloned() { __result.push(arg_value(&arg_node)); } __result }); +let positional_idx = 0; +Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(ctx.param_order.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ + let def_idx = pair.0.clone(); +let pname = pair.1.clone(); +match v2_rt::map_get(&arg_map, pname.clone()) { + Some(arg_val) => read_arg_provenance(&arg_val, pname.clone(), &ctx), + None => match positional_args.clone().get(def_idx.clone() as usize).cloned() { + Some(arg_val) => read_arg_provenance(&arg_val, pname.clone(), &ctx), + None => Rc::new(SubValueRelation::SubValueUnknown), +}, +} +}); } __result }) } - -pub fn build_call_evidence( - call_node: &Rc, - ctx: &Rc, -) -> Rc>> { - { - let arg_map = Rc::new( - call_node - .children - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, pair: (i64, Rc)| { - let idx = pair.0.clone(); - let arg_node = pair.1.clone(); - let aname = arg_name_at( - arg_node.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - match aname.clone() { - Some(pname) => { - v2_rt::rc_map_insert(acc.clone(), pname.clone(), arg_value(&arg_node)) - } - None => acc.clone(), - } - }, - ); - let positional_args = Rc::new({ - let mut __result = Vec::new(); - for arg_node in Rc::new({ - let mut __result = Vec::new(); - for arg_node in call_node.children.clone().iter().cloned() { - if (arg_name_at( - arg_node.clone(), - ctx.type_env.clone().source_indices.clone(), - ) == None) - { - __result.push(arg_node); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(arg_value(&arg_node)); - } - __result - }); - let positional_idx = 0; - Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - ctx.param_order - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - __result.push({ - let def_idx = pair.0.clone(); - let pname = pair.1.clone(); - match v2_rt::map_get(&arg_map, pname.clone()) { - Some(arg_val) => read_arg_provenance(&arg_val, pname.clone(), &ctx), - None => match positional_args - .clone() - .get(def_idx.clone() as usize) - .cloned() - { - Some(arg_val) => read_arg_provenance(&arg_val, pname.clone(), &ctx), - None => Rc::new(SubValueRelation::SubValueUnknown), - }, - } - }); - } - __result - }) - } } pub fn descent_source_type(found: String, arg_node: &Rc, ctx: &Rc) -> String { @@ -6289,334 +3702,188 @@ pub fn descent_source_type(found: String, arg_node: &Rc, ctx: &Rc found.clone(), - _ => { - let arg_val = arg_value(&arg_node); - match (*arg_val.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let vname = expr_var_name_at( - arg_val.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - match v2_rt::map_get(&ctx.param_names.clone(), vname) { - Some(t) => t.clone(), - None => "".to_string(), - } - } - _ => "".to_string(), - } - } - } + ExprData::ExprLambda => found.clone(), + _ => { + let arg_val = arg_value(&arg_node); +match (*arg_val.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let vname = expr_var_name_at(arg_val.clone(), ctx.type_env.clone().source_indices.clone()); +match v2_rt::map_get(&ctx.param_names.clone(), vname) { + Some(t) => t.clone(), + None => "".to_string(), +} +}, + _ => "".to_string(), +} +}, +} } } pub fn annotate_descent(body: &Rc, ctx: &Rc) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { - call_semantics: cs, .. - } => { - let evidence = build_call_evidence(&body, &ctx); - let source_type = - body.children.clone().iter().cloned().fold( - "".to_string(), - |found: String, arg_node: Rc| { - descent_source_type(found, &arg_node, &ctx) + ExprData::ExprCall { call_semantics: cs, .. } => { + let evidence = build_call_evidence(&body, &ctx); +let source_type = body.children.clone().iter().cloned().fold("".to_string(), |found: String, arg_node: Rc| descent_source_type(found, &arg_node, &ctx)); +let annotated_children = Rc::new({ let mut __result = Vec::new(); for child in body.children.clone().iter().cloned() { __result.push({ + let arg_val = arg_value(&child); +match (*arg_val.expr_data.clone()).clone() { + ExprData::ExprLambda => if (source_type.clone().as_str() != "".to_string().as_str()) { + { + let lparams = lambda_param_names_at(arg_val.clone(), ctx.type_env.clone().source_indices.clone()); +let p1 = match lparams.clone().first().cloned() { + Some(n) => n.clone(), + None => "".to_string(), +}; +let p2 = match lparams.clone().get(1 as usize).cloned() { + Some(n) => n.clone(), + None => "".to_string(), +}; +let lambda_ctx = Rc::new(DescentContext { + fn_name: ctx.fn_name.clone(), + param_names: if (p2.clone().as_str() != "".to_string().as_str()) { + v2_rt::rc_map_insert(v2_rt::rc_map_insert(ctx.param_names.clone(), p1.clone(), source_type.clone()), p2.clone(), source_type.clone()) + } else { + if (p1.clone().as_str() != "".to_string().as_str()) { + v2_rt::rc_map_insert(ctx.param_names.clone(), p1.clone(), source_type.clone()) + } else { + ctx.param_names.clone() + } }, - ); - let annotated_children = Rc::new({ - let mut __result = Vec::new(); - for child in body.children.clone().iter().cloned() { - __result.push({ - let arg_val = arg_value(&child); - match (*arg_val.expr_data.clone()).clone() { - ExprData::ExprLambda => { - if (source_type.clone().as_str() != "".to_string().as_str()) { - { - let lparams = lambda_param_names_at( - arg_val.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - let p1 = match lparams.clone().first().cloned() { - Some(n) => n.clone(), - None => "".to_string(), - }; - let p2 = match lparams.clone().get(1 as usize).cloned() - { - Some(n) => n.clone(), - None => "".to_string(), - }; - let lambda_ctx = Rc::new(DescentContext { - fn_name: ctx.fn_name.clone(), - param_names: if (p2.clone().as_str() - != "".to_string().as_str()) - { - v2_rt::rc_map_insert( - v2_rt::rc_map_insert( - ctx.param_names.clone(), - p1.clone(), - source_type.clone(), - ), - p2.clone(), - source_type.clone(), - ) - } else { - if (p1.clone().as_str() - != "".to_string().as_str()) - { - v2_rt::rc_map_insert( - ctx.param_names.clone(), - p1.clone(), - source_type.clone(), - ) - } else { - ctx.param_names.clone() - } - }, - param_order: ctx.param_order.clone(), - type_env: ctx.type_env.clone(), - sub_value_vars: if (p1.clone().as_str() - != "".to_string().as_str()) - { - { - let source_fields = inductive_fields_for( - ctx.type_env.clone(), - source_type.clone(), - ); - let cf = Rc::new({ - let mut __result = Vec::new(); - for f in source_fields - .clone() - .iter() - .cloned() - { - if match f.shape.clone() { + param_order: ctx.param_order.clone(), + type_env: ctx.type_env.clone(), + sub_value_vars: if (p1.clone().as_str() != "".to_string().as_str()) { + { + let source_fields = inductive_fields_for(ctx.type_env.clone(), source_type.clone()); +let cf = Rc::new({ let mut __result = Vec::new(); for f in source_fields.clone().iter().cloned() { if match f.shape.clone() { RecursionShape::ListRecursion => true, _ => false, -} { __result.push(f); } - } - __result - }) - .first() - .cloned(); - let rel = match cf.clone() { +} { __result.push(f); } } __result }).first().cloned(); +let rel = match cf.clone() { Some(f) => Rc::new(SubValueRelation::IteratedSubValue { field: f.clone(), }), None => Rc::new(SubValueRelation::PreservedValue), }; - if (p2.clone().as_str() - != "".to_string().as_str()) - { - v2_rt::rc_map_insert( - v2_rt::rc_map_insert( - ctx.sub_value_vars.clone(), - p1.clone(), - rel.clone(), - ), - p2.clone(), - rel.clone(), - ) - } else { - v2_rt::rc_map_insert( - ctx.sub_value_vars.clone(), - p1.clone(), - rel.clone(), - ) - } - } - } else { - ctx.sub_value_vars.clone() - }, - size_aliases: ctx.size_aliases.clone(), - scope_locals: ctx.scope_locals.clone(), - func_sigs: ctx.func_sigs.clone(), - per_field_vars: ctx.per_field_vars.clone(), - }); - make_arg_node( - arg_name_at( - child.clone(), - ctx.type_env.clone().source_indices.clone(), - ), - annotate_descent(&arg_val, &lambda_ctx), - child.span.clone(), - child.span.clone(), - ) - } - } else { - make_arg_node( - arg_name_at( - child.clone(), - ctx.type_env.clone().source_indices.clone(), - ), - annotate_descent(&arg_val, &ctx), - child.span.clone(), - child.span.clone(), - ) - } - } - _ => make_arg_node( - arg_name_at( - child.clone(), - ctx.type_env.clone().source_indices.clone(), - ), - annotate_descent(&arg_val, &ctx), - child.span.clone(), - child.span.clone(), - ), - } - }); - } - __result - }); - Rc::new(Node { - name: body.name.clone(), - span: body.span.clone(), - ident_span: body.ident_span.clone(), - children: annotated_children, - connective: body.connective.clone(), - params: body.params.clone(), - inferred: body.inferred.clone(), - return_cardinality: body.return_cardinality.clone(), - uses: body.uses.clone(), - body: body.body.clone(), - transport: body.transport.clone(), - properties: body.properties.clone(), - type_annotation: body.type_annotation.clone(), - is_self_recursive: body.is_self_recursive.clone(), - has_non_tail_self_call: body.has_non_tail_self_call.clone(), - match_pattern: body.match_pattern.clone(), - expr_data: Rc::new(ExprData::ExprCall { - call_semantics: cs.clone(), - descent_evidence: Some(evidence), - }), - ident: None, - }) - } - ExprData::ExprMatch => { - let scrut = match_scrutinee(body.clone()); - let scrut_type = match (*scrut.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let sname = expr_var_name_at( - scrut.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - match v2_rt::map_get(&ctx.param_names.clone(), sname.clone()) { - Some(t) => t.clone(), - None => { - match v2_rt::map_get(&ctx.sub_value_vars.clone(), sname.clone()) { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { field: f, .. } => { - f.element_type.clone() - } - SubValueRelation::IteratedSubValue { field: f, .. } => { - f.element_type.clone() - } - _ => "".to_string(), - }, - None => "".to_string(), - } - } - } - } - _ => "".to_string(), - }; - let scrut_inducing_field = match (*scrut.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(scrut.clone()); - let fname = field_access_field_at( - scrut.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at( - base.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - let base_type = - match v2_rt::map_get(&ctx.param_names.clone(), bname.clone()) { - Some(t) => t.clone(), - None => "".to_string(), - }; - if (base_type.clone().as_str() != "".to_string().as_str()) { - { - let ind_fields = inductive_fields_for( - ctx.type_env.clone(), - base_type.clone(), - ); - Rc::new({ - let mut __result = Vec::new(); - for f in ind_fields.clone().iter().cloned() { - if (f.field_name.clone().as_str() - == fname.clone().as_str()) - { - __result.push(f); - } - } - __result - }) - .first() - .cloned() - } +if (p2.clone().as_str() != "".to_string().as_str()) { + v2_rt::rc_map_insert(v2_rt::rc_map_insert(ctx.sub_value_vars.clone(), p1.clone(), rel.clone()), p2.clone(), rel.clone()) } else { - None + v2_rt::rc_map_insert(ctx.sub_value_vars.clone(), p1.clone(), rel.clone()) } - } - _ => None, - } - } - ExprData::ExprMethodCall { .. } => { - let mname = expr_method_name_at( - scrut.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - if ((mname.clone().as_str() == "first".to_string().as_str()) - || (mname.clone().as_str() == "last".to_string().as_str())) - { - { - let receiver = method_receiver(scrut.clone()); - resolve_collection_field(receiver.clone(), ctx.clone()) - } +} } else { - None - } - } - _ => None, - }; - let scrut_has_inductive = (((scrut_type.clone().as_str() - != "".to_string().as_str()) - && ((inductive_fields_for(ctx.type_env.clone(), scrut_type.clone()).len() - as i64) - > 0)) - || (scrut_inducing_field.clone() != None)); - let scrut_variant_sig = match (*scrut.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let callee = expr_call_func_at( - scrut.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - match v2_rt::map_get(&ctx.func_sigs.clone(), callee) { - Some(sig) => { - if ((Rc::new(v2_rt::map_keys(&sig.variant_provenance.clone())).len() - as i64) - > 0) - { - Some(sig.clone()) - } else { - None - } - } - None => None, - } + ctx.sub_value_vars.clone() + }, + size_aliases: ctx.size_aliases.clone(), + scope_locals: ctx.scope_locals.clone(), + func_sigs: ctx.func_sigs.clone(), + per_field_vars: ctx.per_field_vars.clone(), +}); +make_arg_node(arg_name_at(child.clone(), ctx.type_env.clone().source_indices.clone()), annotate_descent(&arg_val, &lambda_ctx), child.span.clone(), child.span.clone()) +} + } else { + make_arg_node(arg_name_at(child.clone(), ctx.type_env.clone().source_indices.clone()), annotate_descent(&arg_val, &ctx), child.span.clone(), child.span.clone()) + }, + _ => make_arg_node(arg_name_at(child.clone(), ctx.type_env.clone().source_indices.clone()), annotate_descent(&arg_val, &ctx), child.span.clone(), child.span.clone()), +} +}); } __result }); +Rc::new(Node { + name: body.name.clone(), + span: body.span.clone(), + ident_span: body.ident_span.clone(), + children: annotated_children, + connective: body.connective.clone(), + params: body.params.clone(), + inferred: body.inferred.clone(), + return_cardinality: body.return_cardinality.clone(), + uses: body.uses.clone(), + body: body.body.clone(), + transport: body.transport.clone(), + properties: body.properties.clone(), + type_annotation: body.type_annotation.clone(), + is_self_recursive: body.is_self_recursive.clone(), + has_non_tail_self_call: body.has_non_tail_self_call.clone(), + match_pattern: body.match_pattern.clone(), + expr_data: Rc::new(ExprData::ExprCall { + call_semantics: cs.clone(), + descent_evidence: Some(evidence), +}), + ident: None, +}) +}, + ExprData::ExprMatch => { + let scrut = match_scrutinee(body.clone()); +let scrut_type = match (*scrut.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let sname = expr_var_name_at(scrut.clone(), ctx.type_env.clone().source_indices.clone()); +match v2_rt::map_get(&ctx.param_names.clone(), sname.clone()) { + Some(t) => t.clone(), + None => match v2_rt::map_get(&ctx.sub_value_vars.clone(), sname.clone()) { + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), + SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), + _ => "".to_string(), +}, + None => "".to_string(), +}, +} +}, + _ => "".to_string(), +}; +let scrut_inducing_field = match (*scrut.expr_data.clone()).clone() { + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(scrut.clone()); +let fname = field_access_field_at(scrut.clone(), ctx.type_env.clone().source_indices.clone()); +match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at(base.clone(), ctx.type_env.clone().source_indices.clone()); +let base_type = match v2_rt::map_get(&ctx.param_names.clone(), bname.clone()) { + Some(t) => t.clone(), + None => "".to_string(), +}; +if (base_type.clone().as_str() != "".to_string().as_str()) { + { + let ind_fields = inductive_fields_for(ctx.type_env.clone(), base_type.clone()); +Rc::new({ let mut __result = Vec::new(); for f in ind_fields.clone().iter().cloned() { if (f.field_name.clone().as_str() == fname.clone().as_str()) { __result.push(f); } } __result }).first().cloned() +} + } else { + None } - _ => None, - }; - let annotated_scrut = annotate_descent(&scrut, &ctx); - let annotated_arms = Rc::new({ - let mut __result = Vec::new(); - for arm_node in match_arm_nodes(body.clone()).iter().cloned() { - __result.push({ +}, + _ => None, +} +}, + ExprData::ExprMethodCall { .. } => { + let mname = expr_method_name_at(scrut.clone(), ctx.type_env.clone().source_indices.clone()); +if ((mname.clone().as_str() == "first".to_string().as_str()) || (mname.clone().as_str() == "last".to_string().as_str())) { + { + let receiver = method_receiver(scrut.clone()); +resolve_collection_field(receiver.clone(), ctx.clone()) +} + } else { + None + } +}, + _ => None, +}; +let scrut_has_inductive = (((scrut_type.clone().as_str() != "".to_string().as_str()) && ((inductive_fields_for(ctx.type_env.clone(), scrut_type.clone()).len() as i64) > 0)) || (scrut_inducing_field.clone() != None)); +let scrut_variant_sig = match (*scrut.expr_data.clone()).clone() { + ExprData::ExprCall { .. } => { + let callee = expr_call_func_at(scrut.clone(), ctx.type_env.clone().source_indices.clone()); +match v2_rt::map_get(&ctx.func_sigs.clone(), callee) { + Some(sig) => if ((Rc::new(v2_rt::map_keys(&sig.variant_provenance.clone())).len() as i64) > 0) { + Some(sig.clone()) + } else { + None + }, + None => None, +} +}, + _ => None, +}; +let annotated_scrut = annotate_descent(&scrut, &ctx); +let annotated_arms = Rc::new({ let mut __result = Vec::new(); for arm_node in match_arm_nodes(body.clone()).iter().cloned() { __result.push({ let variant_arm_ctx = match scrut_variant_sig.clone() { Some(sig) => arm_ctx_from_variant_provenance(arm_node.clone(), sig.clone(), scrut.clone(), &ctx), None => None, @@ -6751,905 +4018,550 @@ match matching.clone() { }; let annotated_body = annotate_descent(&arm_body(&arm_node), &arm_ctx); make_arm_node(arm_pattern(arm_node.clone()), arm_guard(&arm_node), annotated_body.clone(), arm_node.span.clone()) -}); - } - __result - }); - Rc::new(Node { - name: body.name.clone(), - span: body.span.clone(), - ident_span: body.ident_span.clone(), - children: v2_rt::concat(Rc::new(vec![annotated_scrut]), annotated_arms), - connective: body.connective.clone(), - params: body.params.clone(), - inferred: body.inferred.clone(), - return_cardinality: body.return_cardinality.clone(), - uses: body.uses.clone(), - body: body.body.clone(), - transport: body.transport.clone(), - properties: body.properties.clone(), - type_annotation: body.type_annotation.clone(), - is_self_recursive: body.is_self_recursive.clone(), - has_non_tail_self_call: body.has_non_tail_self_call.clone(), - match_pattern: body.match_pattern.clone(), - expr_data: body.expr_data.clone(), - ident: None, - }) - } - ExprData::ExprLet => { - let val = let_value(body.clone()); - let binding_name = - let_binding_name_at(body.clone(), ctx.type_env.clone().source_indices.clone()); - let val_relation = classify_let_value(&val, &ctx); - let size_alias = classify_size_expr(&val, &ctx); - let inner_size_aliases = match size_alias { - Some(se) => v2_rt::rc_map_insert( - ctx.size_aliases.clone(), - binding_name.clone(), - se.clone(), - ), - None => ctx.size_aliases.clone(), - }; - let inner_per_field = build_per_field_for_let(&val, binding_name.clone(), &ctx); - let inner_ctx = match val_relation { - Some(rel) => { +}); } __result }); +Rc::new(Node { + name: body.name.clone(), + span: body.span.clone(), + ident_span: body.ident_span.clone(), + children: v2_rt::concat(Rc::new(vec![annotated_scrut]), annotated_arms), + connective: body.connective.clone(), + params: body.params.clone(), + inferred: body.inferred.clone(), + return_cardinality: body.return_cardinality.clone(), + uses: body.uses.clone(), + body: body.body.clone(), + transport: body.transport.clone(), + properties: body.properties.clone(), + type_annotation: body.type_annotation.clone(), + is_self_recursive: body.is_self_recursive.clone(), + has_non_tail_self_call: body.has_non_tail_self_call.clone(), + match_pattern: body.match_pattern.clone(), + expr_data: body.expr_data.clone(), + ident: None, +}) +}, + ExprData::ExprLet => { + let val = let_value(body.clone()); +let binding_name = let_binding_name_at(body.clone(), ctx.type_env.clone().source_indices.clone()); +let val_relation = classify_let_value(&val, &ctx); +let size_alias = classify_size_expr(&val, &ctx); +let inner_size_aliases = match size_alias { + Some(se) => v2_rt::rc_map_insert(ctx.size_aliases.clone(), binding_name.clone(), se.clone()), + None => ctx.size_aliases.clone(), +}; +let inner_per_field = build_per_field_for_let(&val, binding_name.clone(), &ctx); +let inner_ctx = match val_relation { + Some(rel) => { + let sub_type = match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), + SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), + _ => "".to_string(), +}; +Rc::new(DescentContext { + fn_name: ctx.fn_name.clone(), + param_names: if (sub_type.clone().as_str() != "".to_string().as_str()) { + v2_rt::rc_map_insert(ctx.param_names.clone(), binding_name.clone(), sub_type.clone()) + } else { + ctx.param_names.clone() + }, + param_order: ctx.param_order.clone(), + type_env: ctx.type_env.clone(), + sub_value_vars: v2_rt::rc_map_insert(ctx.sub_value_vars.clone(), binding_name.clone(), rel.clone()), + size_aliases: inner_size_aliases, + scope_locals: v2_rt::rc_map_insert(ctx.scope_locals.clone(), binding_name.clone(), Rc::new(TypeBinding { + name: binding_name.clone(), + resolved: resolved_type(val.clone()), + provenance: rel.clone(), +})), + func_sigs: ctx.func_sigs.clone(), + per_field_vars: inner_per_field, +}) +}, + None => Rc::new(DescentContext { + fn_name: ctx.fn_name.clone(), + param_names: ctx.param_names.clone(), + param_order: ctx.param_order.clone(), + type_env: ctx.type_env.clone(), + sub_value_vars: ctx.sub_value_vars.clone(), + size_aliases: inner_size_aliases, + scope_locals: v2_rt::rc_map_insert(ctx.scope_locals.clone(), binding_name.clone(), Rc::new(TypeBinding { + name: binding_name.clone(), + resolved: resolved_type(val.clone()), + provenance: Rc::new(SubValueRelation::SubValueUnknown), +})), + func_sigs: ctx.func_sigs.clone(), + per_field_vars: inner_per_field, +}), +}; +let annotated_value = annotate_descent(&val, &ctx); +let annotated_children = match let_body(body.clone()) { + Some(body_child) => Rc::new(vec![annotated_value, annotate_descent(&body_child, &inner_ctx)]), + None => Rc::new(vec![annotated_value]), +}; +Rc::new(Node { + name: body.name.clone(), + span: body.span.clone(), + ident_span: body.ident_span.clone(), + children: annotated_children, + connective: body.connective.clone(), + params: body.params.clone(), + inferred: body.inferred.clone(), + return_cardinality: body.return_cardinality.clone(), + uses: body.uses.clone(), + body: body.body.clone(), + transport: body.transport.clone(), + properties: body.properties.clone(), + type_annotation: body.type_annotation.clone(), + is_self_recursive: body.is_self_recursive.clone(), + has_non_tail_self_call: body.has_non_tail_self_call.clone(), + match_pattern: body.match_pattern.clone(), + expr_data: body.expr_data.clone(), + ident: None, +}) +}, + ExprData::ExprBlock => { + let threaded = body.children.clone().iter().cloned().fold(Rc::new(BlockAnnotateAcc { + ctx: ctx.clone(), + children: Rc::new(vec![]), +}), |acc: Rc, child: Rc| { + let annotated = annotate_descent(&child, &acc.ctx.clone()); +let next_ctx = match (*child.expr_data.clone()).clone() { + ExprData::ExprLet => { + let val = let_value(child.clone()); +let bname = let_binding_name_at(child.clone(), ctx.type_env.clone().source_indices.clone()); +let val_rel = classify_let_value(&val, &acc.ctx.clone()); +let sa = classify_size_expr(&val, &acc.ctx.clone()); +let new_sa = match sa.clone() { + Some(se) => v2_rt::rc_map_insert(acc.ctx.clone().size_aliases.clone(), bname.clone(), se.clone()), + None => acc.ctx.clone().size_aliases.clone(), +}; +match val_rel.clone() { + Some(rel) => { let sub_type = match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { field: f, .. } => { - f.element_type.clone() - } - SubValueRelation::IteratedSubValue { field: f, .. } => { - f.element_type.clone() - } - _ => "".to_string(), - }; - Rc::new(DescentContext { - fn_name: ctx.fn_name.clone(), - param_names: if (sub_type.clone().as_str() != "".to_string().as_str()) { - v2_rt::rc_map_insert( - ctx.param_names.clone(), - binding_name.clone(), - sub_type.clone(), - ) + SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), + SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), + _ => "".to_string(), +}; +Rc::new(DescentContext { + fn_name: acc.ctx.clone().fn_name.clone(), + param_names: if (sub_type.clone().as_str() != "".to_string().as_str()) { + v2_rt::rc_map_insert(acc.ctx.clone().param_names.clone(), bname.clone(), sub_type.clone()) + } else { + acc.ctx.clone().param_names.clone() + }, + param_order: acc.ctx.clone().param_order.clone(), + type_env: acc.ctx.clone().type_env.clone(), + sub_value_vars: v2_rt::rc_map_insert(acc.ctx.clone().sub_value_vars.clone(), bname.clone(), rel.clone()), + size_aliases: new_sa.clone(), + scope_locals: v2_rt::rc_map_insert(acc.ctx.clone().scope_locals.clone(), bname.clone(), Rc::new(TypeBinding { + name: bname.clone(), + resolved: resolved_type(val.clone()), + provenance: rel.clone(), +})), + func_sigs: acc.ctx.clone().func_sigs.clone(), + per_field_vars: acc.ctx.clone().per_field_vars.clone(), +}) +}, + None => Rc::new(DescentContext { + fn_name: acc.ctx.clone().fn_name.clone(), + param_names: acc.ctx.clone().param_names.clone(), + param_order: acc.ctx.clone().param_order.clone(), + type_env: acc.ctx.clone().type_env.clone(), + sub_value_vars: acc.ctx.clone().sub_value_vars.clone(), + size_aliases: new_sa.clone(), + scope_locals: v2_rt::rc_map_insert(acc.ctx.clone().scope_locals.clone(), bname.clone(), Rc::new(TypeBinding { + name: bname.clone(), + resolved: resolved_type(val.clone()), + provenance: Rc::new(SubValueRelation::SubValueUnknown), +})), + func_sigs: acc.ctx.clone().func_sigs.clone(), + per_field_vars: acc.ctx.clone().per_field_vars.clone(), +}), +} +}, + _ => acc.ctx.clone(), +}; +Rc::new(BlockAnnotateAcc { + ctx: next_ctx.clone(), + children: v2_rt::concat(acc.children.clone(), Rc::new(vec![annotated.clone()])), +}) +}); +Rc::new(Node { + name: body.name.clone(), + span: body.span.clone(), + ident_span: body.ident_span.clone(), + children: threaded.children.clone(), + connective: body.connective.clone(), + params: body.params.clone(), + inferred: body.inferred.clone(), + return_cardinality: body.return_cardinality.clone(), + uses: body.uses.clone(), + body: body.body.clone(), + transport: body.transport.clone(), + properties: body.properties.clone(), + type_annotation: body.type_annotation.clone(), + is_self_recursive: body.is_self_recursive.clone(), + has_non_tail_self_call: body.has_non_tail_self_call.clone(), + match_pattern: body.match_pattern.clone(), + expr_data: body.expr_data.clone(), + ident: None, +}) +}, + ExprData::ExprMethodCall { method_semantics: ms, .. } => { + let mname = expr_method_name_at(body.clone(), ctx.type_env.clone().source_indices.clone()); +let elem_position = method_callback_element_position(ms.clone()); +if (elem_position.clone() != None) { + { + let raw_receiver = method_receiver(body.clone()); +let receiver = match (*raw_receiver.expr_data.clone()).clone() { + ExprData::ExprMethodCall { .. } => { + let inner_mname = expr_method_name_at(raw_receiver.clone(), ctx.type_env.clone().source_indices.clone()); +if (inner_mname.as_str() == "enumerate".to_string().as_str()) { + method_receiver(raw_receiver.clone()) + } else { + raw_receiver.clone() + } +}, + _ => raw_receiver.clone(), +}; +let receiver_field = match (*receiver.expr_data.clone()).clone() { + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(receiver.clone()); +let fname = field_access_field_at(receiver.clone(), ctx.type_env.clone().source_indices.clone()); +match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at(base.clone(), ctx.type_env.clone().source_indices.clone()); +let base_type = match v2_rt::map_get(&ctx.param_names.clone(), bname.clone()) { + Some(t) => t.clone(), + None => match v2_rt::map_get(&ctx.sub_value_vars.clone(), bname.clone()) { + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), + SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), + _ => "".to_string(), +}, + None => "".to_string(), +}, +}; +if (base_type.clone().as_str() != "".to_string().as_str()) { + Rc::new({ let mut __result = Vec::new(); for f in inductive_fields_for(ctx.type_env.clone(), base_type.clone()).iter().cloned() { if (f.field_name.clone().as_str() == fname.clone().as_str()) { __result.push(f); } } __result }).first().cloned() } else { - ctx.param_names.clone() - }, - param_order: ctx.param_order.clone(), - type_env: ctx.type_env.clone(), - sub_value_vars: v2_rt::rc_map_insert( - ctx.sub_value_vars.clone(), - binding_name.clone(), - rel.clone(), - ), - size_aliases: inner_size_aliases, - scope_locals: v2_rt::rc_map_insert( - ctx.scope_locals.clone(), - binding_name.clone(), - Rc::new(TypeBinding { - name: binding_name.clone(), - resolved: resolved_type(val.clone()), - provenance: rel.clone(), - }), - ), - func_sigs: ctx.func_sigs.clone(), - per_field_vars: inner_per_field, - }) - } - None => Rc::new(DescentContext { - fn_name: ctx.fn_name.clone(), - param_names: ctx.param_names.clone(), - param_order: ctx.param_order.clone(), - type_env: ctx.type_env.clone(), - sub_value_vars: ctx.sub_value_vars.clone(), - size_aliases: inner_size_aliases, - scope_locals: v2_rt::rc_map_insert( - ctx.scope_locals.clone(), - binding_name.clone(), - Rc::new(TypeBinding { - name: binding_name.clone(), - resolved: resolved_type(val.clone()), - provenance: Rc::new(SubValueRelation::SubValueUnknown), - }), - ), - func_sigs: ctx.func_sigs.clone(), - per_field_vars: inner_per_field, - }), - }; - let annotated_value = annotate_descent(&val, &ctx); - let annotated_children = match let_body(body.clone()) { - Some(body_child) => Rc::new(vec![ - annotated_value, - annotate_descent(&body_child, &inner_ctx), - ]), - None => Rc::new(vec![annotated_value]), - }; - Rc::new(Node { - name: body.name.clone(), - span: body.span.clone(), - ident_span: body.ident_span.clone(), - children: annotated_children, - connective: body.connective.clone(), - params: body.params.clone(), - inferred: body.inferred.clone(), - return_cardinality: body.return_cardinality.clone(), - uses: body.uses.clone(), - body: body.body.clone(), - transport: body.transport.clone(), - properties: body.properties.clone(), - type_annotation: body.type_annotation.clone(), - is_self_recursive: body.is_self_recursive.clone(), - has_non_tail_self_call: body.has_non_tail_self_call.clone(), - match_pattern: body.match_pattern.clone(), - expr_data: body.expr_data.clone(), - ident: None, - }) - } - ExprData::ExprBlock => { - let threaded = body.children.clone().iter().cloned().fold( - Rc::new(BlockAnnotateAcc { - ctx: ctx.clone(), - children: Rc::new(vec![]), - }), - |acc: Rc, child: Rc| { - let annotated = annotate_descent(&child, &acc.ctx.clone()); - let next_ctx = match (*child.expr_data.clone()).clone() { - ExprData::ExprLet => { - let val = let_value(child.clone()); - let bname = let_binding_name_at( - child.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - let val_rel = classify_let_value(&val, &acc.ctx.clone()); - let sa = classify_size_expr(&val, &acc.ctx.clone()); - let new_sa = match sa.clone() { - Some(se) => v2_rt::rc_map_insert( - acc.ctx.clone().size_aliases.clone(), - bname.clone(), - se.clone(), - ), - None => acc.ctx.clone().size_aliases.clone(), - }; - match val_rel.clone() { - Some(rel) => { - let sub_type = match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { - field: f, .. - } => f.element_type.clone(), - SubValueRelation::IteratedSubValue { - field: f, .. - } => f.element_type.clone(), - _ => "".to_string(), - }; - Rc::new(DescentContext { - fn_name: acc.ctx.clone().fn_name.clone(), - param_names: if (sub_type.clone().as_str() - != "".to_string().as_str()) - { - v2_rt::rc_map_insert( - acc.ctx.clone().param_names.clone(), - bname.clone(), - sub_type.clone(), - ) - } else { - acc.ctx.clone().param_names.clone() - }, - param_order: acc.ctx.clone().param_order.clone(), - type_env: acc.ctx.clone().type_env.clone(), - sub_value_vars: v2_rt::rc_map_insert( - acc.ctx.clone().sub_value_vars.clone(), - bname.clone(), - rel.clone(), - ), - size_aliases: new_sa.clone(), - scope_locals: v2_rt::rc_map_insert( - acc.ctx.clone().scope_locals.clone(), - bname.clone(), - Rc::new(TypeBinding { - name: bname.clone(), - resolved: resolved_type(val.clone()), - provenance: rel.clone(), - }), - ), - func_sigs: acc.ctx.clone().func_sigs.clone(), - per_field_vars: acc.ctx.clone().per_field_vars.clone(), - }) - } - None => Rc::new(DescentContext { - fn_name: acc.ctx.clone().fn_name.clone(), - param_names: acc.ctx.clone().param_names.clone(), - param_order: acc.ctx.clone().param_order.clone(), - type_env: acc.ctx.clone().type_env.clone(), - sub_value_vars: acc.ctx.clone().sub_value_vars.clone(), - size_aliases: new_sa.clone(), - scope_locals: v2_rt::rc_map_insert( - acc.ctx.clone().scope_locals.clone(), - bname.clone(), - Rc::new(TypeBinding { - name: bname.clone(), - resolved: resolved_type(val.clone()), - provenance: Rc::new( - SubValueRelation::SubValueUnknown, - ), - }), - ), - func_sigs: acc.ctx.clone().func_sigs.clone(), - per_field_vars: acc.ctx.clone().per_field_vars.clone(), - }), - } + None } - _ => acc.ctx.clone(), - }; - Rc::new(BlockAnnotateAcc { - ctx: next_ctx.clone(), - children: v2_rt::concat( - acc.children.clone(), - Rc::new(vec![annotated.clone()]), - ), - }) +}, + _ => None, +} +}, + ExprData::ExprVar { .. } => { + let rname = expr_var_name_at(receiver.clone(), ctx.type_env.clone().source_indices.clone()); +match v2_rt::map_get(&ctx.sub_value_vars.clone(), rname) { + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { field: f, .. } => match f.shape.clone() { + RecursionShape::ListRecursion => Some(f.clone()), + _ => None, +}, + SubValueRelation::IteratedSubValue { field: f, .. } => match f.shape.clone() { + RecursionShape::ListRecursion => Some(f.clone()), + _ => None, +}, + _ => None, +}, + None => None, +} +}, + _ => None, +}; +let method_args = method_arg_nodes(body.clone()); +let lambda_arg = Rc::new({ let mut __result = Vec::new(); for a in method_args.iter().cloned() { if match (*arg_value(&a).expr_data.clone()).clone() { + ExprData::ExprLambda => true, + _ => false, +} { __result.push(a); } } __result }).first().cloned(); +let lambda_elem_info = match lambda_arg { + Some(la) => { + let lambda_node = arg_value(&la); +let lparams = lambda_param_names_at(lambda_node, ctx.type_env.clone().source_indices.clone()); +lparams.clone().get(elem_position.clone().unwrap() as usize).cloned() +}, + None => None, +}; +let is_fold = (elem_position.clone().unwrap() > 0); +let inner_ctx = match lambda_elem_info { + Some(elem_name) => match receiver_field { + Some(ind_field) => Rc::new(DescentContext { + fn_name: ctx.fn_name.clone(), + param_names: v2_rt::rc_map_insert(ctx.param_names.clone(), elem_name.clone(), ind_field.element_type.clone()), + param_order: ctx.param_order.clone(), + type_env: ctx.type_env.clone(), + sub_value_vars: if is_fold { + v2_rt::rc_map_insert(v2_rt::rc_empty_map::>(), elem_name.clone(), Rc::new(SubValueRelation::IteratedSubValue { + field: ind_field.clone(), +})) + } else { + v2_rt::rc_map_insert(ctx.sub_value_vars.clone(), elem_name.clone(), Rc::new(SubValueRelation::IteratedSubValue { + field: ind_field.clone(), +})) }, - ); - Rc::new(Node { - name: body.name.clone(), - span: body.span.clone(), - ident_span: body.ident_span.clone(), - children: threaded.children.clone(), - connective: body.connective.clone(), - params: body.params.clone(), - inferred: body.inferred.clone(), - return_cardinality: body.return_cardinality.clone(), - uses: body.uses.clone(), - body: body.body.clone(), - transport: body.transport.clone(), - properties: body.properties.clone(), - type_annotation: body.type_annotation.clone(), - is_self_recursive: body.is_self_recursive.clone(), - has_non_tail_self_call: body.has_non_tail_self_call.clone(), - match_pattern: body.match_pattern.clone(), - expr_data: body.expr_data.clone(), - ident: None, - }) - } - ExprData::ExprMethodCall { - method_semantics: ms, - .. - } => { - let mname = - expr_method_name_at(body.clone(), ctx.type_env.clone().source_indices.clone()); - let elem_position = method_callback_element_position(ms.clone()); - if (elem_position.clone() != None) { - { - let raw_receiver = method_receiver(body.clone()); - let receiver = match (*raw_receiver.expr_data.clone()).clone() { - ExprData::ExprMethodCall { .. } => { - let inner_mname = expr_method_name_at( - raw_receiver.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - if (inner_mname.as_str() == "enumerate".to_string().as_str()) { - method_receiver(raw_receiver.clone()) - } else { - raw_receiver.clone() - } - } - _ => raw_receiver.clone(), - }; - let receiver_field = match (*receiver.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(receiver.clone()); - let fname = field_access_field_at( - receiver.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at( - base.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - let base_type = match v2_rt::map_get( - &ctx.param_names.clone(), - bname.clone(), - ) { - Some(t) => t.clone(), - None => match v2_rt::map_get( - &ctx.sub_value_vars.clone(), - bname.clone(), - ) { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { - field: f, - .. - } => f.element_type.clone(), - SubValueRelation::IteratedSubValue { - field: f, - .. - } => f.element_type.clone(), - _ => "".to_string(), - }, - None => "".to_string(), - }, - }; - if (base_type.clone().as_str() != "".to_string().as_str()) { - Rc::new({ - let mut __result = Vec::new(); - for f in inductive_fields_for( - ctx.type_env.clone(), - base_type.clone(), - ) - .iter() - .cloned() - { - if (f.field_name.clone().as_str() - == fname.clone().as_str()) - { - __result.push(f); - } - } - __result - }) - .first() - .cloned() - } else { - None - } - } - _ => None, - } - } - ExprData::ExprVar { .. } => { - let rname = expr_var_name_at( - receiver.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - match v2_rt::map_get(&ctx.sub_value_vars.clone(), rname) { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { field: f, .. } => { - match f.shape.clone() { - RecursionShape::ListRecursion => Some(f.clone()), - _ => None, - } - } - SubValueRelation::IteratedSubValue { field: f, .. } => { - match f.shape.clone() { - RecursionShape::ListRecursion => Some(f.clone()), - _ => None, - } - } - _ => None, - }, - None => None, - } - } - _ => None, - }; - let method_args = method_arg_nodes(body.clone()); - let lambda_arg = Rc::new({ - let mut __result = Vec::new(); - for a in method_args.iter().cloned() { - if match (*arg_value(&a).expr_data.clone()).clone() { - ExprData::ExprLambda => true, - _ => false, - } { - __result.push(a); - } - } - __result - }) - .first() - .cloned(); - let lambda_elem_info = match lambda_arg { - Some(la) => { - let lambda_node = arg_value(&la); - let lparams = lambda_param_names_at( - lambda_node, - ctx.type_env.clone().source_indices.clone(), - ); - lparams - .clone() - .get(elem_position.clone().unwrap() as usize) - .cloned() - } - None => None, - }; - let is_fold = (elem_position.clone().unwrap() > 0); - let inner_ctx = match lambda_elem_info { - Some(elem_name) => match receiver_field { - Some(ind_field) => Rc::new(DescentContext { - fn_name: ctx.fn_name.clone(), - param_names: v2_rt::rc_map_insert( - ctx.param_names.clone(), - elem_name.clone(), - ind_field.element_type.clone(), - ), - param_order: ctx.param_order.clone(), - type_env: ctx.type_env.clone(), - sub_value_vars: if is_fold { - v2_rt::rc_map_insert( - v2_rt::rc_empty_map::>(), - elem_name.clone(), - Rc::new(SubValueRelation::IteratedSubValue { - field: ind_field.clone(), - }), - ) - } else { - v2_rt::rc_map_insert( - ctx.sub_value_vars.clone(), - elem_name.clone(), - Rc::new(SubValueRelation::IteratedSubValue { - field: ind_field.clone(), - }), - ) - }, - size_aliases: ctx.size_aliases.clone(), - scope_locals: ctx.scope_locals.clone(), - func_sigs: ctx.func_sigs.clone(), - per_field_vars: ctx.per_field_vars.clone(), - }), - None => Rc::new(DescentContext { - fn_name: ctx.fn_name.clone(), - param_names: ctx.param_names.clone(), - param_order: ctx.param_order.clone(), - type_env: ctx.type_env.clone(), - sub_value_vars: if is_fold { - v2_rt::rc_empty_map::>() - } else { - ctx.sub_value_vars.clone() - }, - size_aliases: ctx.size_aliases.clone(), - scope_locals: ctx.scope_locals.clone(), - func_sigs: ctx.func_sigs.clone(), - per_field_vars: ctx.per_field_vars.clone(), - }), - }, - None => ctx.clone(), - }; - let annotated_receiver = - annotate_descent(&method_receiver(body.clone()), &ctx); - let annotated_args = Rc::new({ - let mut __result = Vec::new(); - for arg_node in method_arg_nodes(body.clone()).iter().cloned() { - __result.push({ - let arg_val = arg_value(&arg_node); - let is_lambda = match (*arg_val.expr_data.clone()).clone() { - ExprData::ExprLambda => true, - _ => false, - }; - if is_lambda.clone() { - make_arg_node( - match arg_name_at( - arg_node.clone(), - ctx.type_env.clone().source_indices.clone(), - ) { - Some(n) => Some(n.clone()), - None => None, - }, - annotate_descent(&arg_val, &inner_ctx), - arg_node.span.clone(), - arg_node.span.clone(), - ) - } else { - make_arg_node( - match arg_name_at( - arg_node.clone(), - ctx.type_env.clone().source_indices.clone(), - ) { - Some(n) => Some(n.clone()), - None => None, - }, - annotate_descent(&arg_val, &ctx), - arg_node.span.clone(), - arg_node.span.clone(), - ) - } - }); - } - __result - }); - Rc::new(Node { - name: body.name.clone(), - span: body.span.clone(), - ident_span: body.ident_span.clone(), - children: v2_rt::concat( - Rc::new(vec![annotated_receiver]), - annotated_args, - ), - connective: body.connective.clone(), - params: body.params.clone(), - inferred: body.inferred.clone(), - return_cardinality: body.return_cardinality.clone(), - uses: body.uses.clone(), - body: body.body.clone(), - transport: body.transport.clone(), - properties: body.properties.clone(), - type_annotation: body.type_annotation.clone(), - is_self_recursive: body.is_self_recursive.clone(), - has_non_tail_self_call: body.has_non_tail_self_call.clone(), - match_pattern: body.match_pattern.clone(), - expr_data: body.expr_data.clone(), - ident: None, - }) - } - } else { - map_children(&body, |child| annotate_descent(&child, &ctx)) - } - } - ExprData::ExprForEach => { - let coll = foreach_collection(body.clone()); - let fe_body = foreach_body(body.clone()); - let fe_var = - foreach_variable_at(body.clone(), ctx.type_env.clone().source_indices.clone()); - let coll_field = resolve_collection_field(coll.clone(), ctx.clone()); - let inner_ctx = match coll_field { - Some(ind_field) => Rc::new(DescentContext { - fn_name: ctx.fn_name.clone(), - param_names: v2_rt::rc_map_insert( - ctx.param_names.clone(), - fe_var.clone(), - ind_field.element_type.clone(), - ), - param_order: ctx.param_order.clone(), - type_env: ctx.type_env.clone(), - sub_value_vars: v2_rt::rc_map_insert( - v2_rt::rc_empty_map::>(), - fe_var.clone(), - Rc::new(SubValueRelation::IteratedSubValue { - field: ind_field.clone(), - }), - ), - size_aliases: ctx.size_aliases.clone(), - scope_locals: ctx.scope_locals.clone(), - func_sigs: ctx.func_sigs.clone(), - per_field_vars: ctx.per_field_vars.clone(), - }), - None => Rc::new(DescentContext { - fn_name: ctx.fn_name.clone(), - param_names: ctx.param_names.clone(), - param_order: ctx.param_order.clone(), - type_env: ctx.type_env.clone(), - sub_value_vars: v2_rt::rc_empty_map::>(), - size_aliases: ctx.size_aliases.clone(), - scope_locals: ctx.scope_locals.clone(), - func_sigs: ctx.func_sigs.clone(), - per_field_vars: ctx.per_field_vars.clone(), - }), - }; - let annotated_coll = annotate_descent(&coll, &ctx); - let annotated_body = annotate_descent(&fe_body, &inner_ctx); - Rc::new(Node { - name: body.name.clone(), - span: body.span.clone(), - ident_span: body.ident_span.clone(), - children: Rc::new(vec![annotated_coll, annotated_body.clone()]), - connective: body.connective.clone(), - params: body.params.clone(), - inferred: body.inferred.clone(), - return_cardinality: body.return_cardinality.clone(), - uses: body.uses.clone(), - body: body.body.clone(), - transport: body.transport.clone(), - properties: body.properties.clone(), - type_annotation: body.type_annotation.clone(), - is_self_recursive: body.is_self_recursive.clone(), - has_non_tail_self_call: body.has_non_tail_self_call.clone(), - match_pattern: body.match_pattern.clone(), - expr_data: body.expr_data.clone(), - ident: None, - }) + size_aliases: ctx.size_aliases.clone(), + scope_locals: ctx.scope_locals.clone(), + func_sigs: ctx.func_sigs.clone(), + per_field_vars: ctx.per_field_vars.clone(), +}), + None => Rc::new(DescentContext { + fn_name: ctx.fn_name.clone(), + param_names: ctx.param_names.clone(), + param_order: ctx.param_order.clone(), + type_env: ctx.type_env.clone(), + sub_value_vars: if is_fold { + v2_rt::rc_empty_map::>() + } else { + ctx.sub_value_vars.clone() + }, + size_aliases: ctx.size_aliases.clone(), + scope_locals: ctx.scope_locals.clone(), + func_sigs: ctx.func_sigs.clone(), + per_field_vars: ctx.per_field_vars.clone(), +}), +}, + None => ctx.clone(), +}; +let annotated_receiver = annotate_descent(&method_receiver(body.clone()), &ctx); +let annotated_args = Rc::new({ let mut __result = Vec::new(); for arg_node in method_arg_nodes(body.clone()).iter().cloned() { __result.push({ + let arg_val = arg_value(&arg_node); +let is_lambda = match (*arg_val.expr_data.clone()).clone() { + ExprData::ExprLambda => true, + _ => false, +}; +if is_lambda.clone() { + make_arg_node(match arg_name_at(arg_node.clone(), ctx.type_env.clone().source_indices.clone()) { + Some(n) => Some(n.clone()), + None => None, +}, annotate_descent(&arg_val, &inner_ctx), arg_node.span.clone(), arg_node.span.clone()) + } else { + make_arg_node(match arg_name_at(arg_node.clone(), ctx.type_env.clone().source_indices.clone()) { + Some(n) => Some(n.clone()), + None => None, +}, annotate_descent(&arg_val, &ctx), arg_node.span.clone(), arg_node.span.clone()) + } +}); } __result }); +Rc::new(Node { + name: body.name.clone(), + span: body.span.clone(), + ident_span: body.ident_span.clone(), + children: v2_rt::concat(Rc::new(vec![annotated_receiver]), annotated_args), + connective: body.connective.clone(), + params: body.params.clone(), + inferred: body.inferred.clone(), + return_cardinality: body.return_cardinality.clone(), + uses: body.uses.clone(), + body: body.body.clone(), + transport: body.transport.clone(), + properties: body.properties.clone(), + type_annotation: body.type_annotation.clone(), + is_self_recursive: body.is_self_recursive.clone(), + has_non_tail_self_call: body.has_non_tail_self_call.clone(), + match_pattern: body.match_pattern.clone(), + expr_data: body.expr_data.clone(), + ident: None, +}) +} + } else { + map_children(&body, |child| annotate_descent(&child, &ctx)) } - _ => map_children(&body, |child| annotate_descent(&child, &ctx)), - } +}, + ExprData::ExprForEach => { + let coll = foreach_collection(body.clone()); +let fe_body = foreach_body(body.clone()); +let fe_var = foreach_variable_at(body.clone(), ctx.type_env.clone().source_indices.clone()); +let coll_field = resolve_collection_field(coll.clone(), ctx.clone()); +let inner_ctx = match coll_field { + Some(ind_field) => Rc::new(DescentContext { + fn_name: ctx.fn_name.clone(), + param_names: v2_rt::rc_map_insert(ctx.param_names.clone(), fe_var.clone(), ind_field.element_type.clone()), + param_order: ctx.param_order.clone(), + type_env: ctx.type_env.clone(), + sub_value_vars: v2_rt::rc_map_insert(v2_rt::rc_empty_map::>(), fe_var.clone(), Rc::new(SubValueRelation::IteratedSubValue { + field: ind_field.clone(), +})), + size_aliases: ctx.size_aliases.clone(), + scope_locals: ctx.scope_locals.clone(), + func_sigs: ctx.func_sigs.clone(), + per_field_vars: ctx.per_field_vars.clone(), +}), + None => Rc::new(DescentContext { + fn_name: ctx.fn_name.clone(), + param_names: ctx.param_names.clone(), + param_order: ctx.param_order.clone(), + type_env: ctx.type_env.clone(), + sub_value_vars: v2_rt::rc_empty_map::>(), + size_aliases: ctx.size_aliases.clone(), + scope_locals: ctx.scope_locals.clone(), + func_sigs: ctx.func_sigs.clone(), + per_field_vars: ctx.per_field_vars.clone(), +}), +}; +let annotated_coll = annotate_descent(&coll, &ctx); +let annotated_body = annotate_descent(&fe_body, &inner_ctx); +Rc::new(Node { + name: body.name.clone(), + span: body.span.clone(), + ident_span: body.ident_span.clone(), + children: Rc::new(vec![annotated_coll, annotated_body.clone()]), + connective: body.connective.clone(), + params: body.params.clone(), + inferred: body.inferred.clone(), + return_cardinality: body.return_cardinality.clone(), + uses: body.uses.clone(), + body: body.body.clone(), + transport: body.transport.clone(), + properties: body.properties.clone(), + type_annotation: body.type_annotation.clone(), + is_self_recursive: body.is_self_recursive.clone(), + has_non_tail_self_call: body.has_non_tail_self_call.clone(), + match_pattern: body.match_pattern.clone(), + expr_data: body.expr_data.clone(), + ident: None, +}) +}, + _ => map_children(&body, |child| annotate_descent(&child, &ctx)), +} }) } -pub fn resolved_type_name( - n: &Rc, - source_indices: Rc>>, -) -> String { +pub fn resolved_type_name(n: &Rc, source_indices: Rc>>) -> String { match n.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => authored_name_at(source_indices, &rt), - _ => match n.children.clone().first().cloned() { - Some(c) => authored_name_at(source_indices, &c), - None => "".to_string(), - }, - } + Some(InferredNode::Resolved { node: rt, .. }) => authored_name_at(source_indices, &rt), + _ => match n.children.clone().first().cloned() { + Some(c) => authored_name_at(source_indices, &c), + None => "".to_string(), +}, +} } -pub fn infer_output_provenance( - body: &Rc, - params: &Rc>>, - type_env: &Rc, - scope_locals: Rc>>, - func_sigs: &Rc>>, -) -> Rc>>>> { +pub fn infer_output_provenance(body: &Rc, params: &Rc>>, type_env: &Rc, scope_locals: Rc>>, func_sigs: &Rc>>) -> Rc>>>> { { - let param_names = Rc::new({ - let mut __result = Vec::new(); - for p in params.clone().iter().cloned() { - __result.push(param_node_name_at( - p.clone(), - type_env.source_indices.clone(), - )); + let param_names = Rc::new({ let mut __result = Vec::new(); for p in params.clone().iter().cloned() { __result.push(param_node_name_at(p.clone(), type_env.source_indices.clone())); } __result }); +let param_types = params.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, p: Rc| { + let pname = param_node_name_at(p.clone(), type_env.source_indices.clone()); +let ptype = resolved_type_name(&p, type_env.source_indices.clone()); +if ((pname.clone().as_str() != "".to_string().as_str()) && (ptype.clone().as_str() != "".to_string().as_str())) { + v2_rt::rc_map_insert(acc.clone(), pname.clone(), ptype.clone()) + } else { + acc.clone() } - __result - }); - let param_types = params.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, p: Rc| { - let pname = param_node_name_at(p.clone(), type_env.source_indices.clone()); - let ptype = resolved_type_name(&p, type_env.source_indices.clone()); - if ((pname.clone().as_str() != "".to_string().as_str()) - && (ptype.clone().as_str() != "".to_string().as_str())) - { - v2_rt::rc_map_insert(acc.clone(), pname.clone(), ptype.clone()) - } else { - acc.clone() - } - }, - ); - let scalar = classify_body_provenance( - &body, - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &v2_rt::rc_empty_map::>>>(), - ); - if ((Rc::new(v2_rt::map_keys(&scalar)).len() as i64) > 0) { +}); +let scalar = classify_body_provenance(&body, ¶m_names, ¶m_types, &type_env, &func_sigs, &v2_rt::rc_empty_map::>>>()); +if ((Rc::new(v2_rt::map_keys(&scalar)).len() as i64) > 0) { Rc::new(vec![scalar.clone()]) } else { { - let per_field = classify_body_per_field( - body.clone(), - param_names.clone(), - param_types.clone(), - &type_env, - func_sigs.clone(), - v2_rt::rc_empty_map::>>>(), - ); - if (((per_field.clone().len() as i64) > 0) && { - let mut __found = false; - for m in per_field.clone().iter().cloned() { - if ((Rc::new(v2_rt::map_keys(&m)).len() as i64) > 0) { - __found = true; - break; - } - } - __found - }) { + let per_field = classify_body_per_field(body.clone(), param_names.clone(), param_types.clone(), &type_env, func_sigs.clone(), v2_rt::rc_empty_map::>>>()); +if (((per_field.clone().len() as i64) > 0) && { let mut __found = false; for m in per_field.clone().iter().cloned() { if ((Rc::new(v2_rt::map_keys(&m)).len() as i64) > 0) { __found = true; break; } } __found }) { per_field.clone() } else { Rc::new(vec![]) } - } +} } - } +} } -pub fn classify_body_provenance( - expr: &Rc, - param_names: &Rc>, - param_types: &Rc>, - type_env: &Rc, - func_sigs: &Rc>>, - let_prov: &Rc>>>>, -) -> Rc>> { +pub fn classify_body_provenance(expr: &Rc, param_names: &Rc>, param_types: &Rc>, type_env: &Rc, func_sigs: &Rc>>, let_prov: &Rc>>>>) -> Rc>> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let vname = expr_var_name_at(expr.clone(), type_env.source_indices.clone()); - match v2_rt::map_get(&let_prov, vname.clone()) { - Some(prov) => prov.clone(), - None => { - if { - let mut __found = false; - for pn in param_names.clone().iter().cloned() { - if (pn.clone().as_str() == vname.clone().as_str()) { - __found = true; - break; - } - } - __found - } { - v2_rt::rc_map_insert( - v2_rt::rc_empty_map::>(), - vname.clone(), - Rc::new(SubValueRelation::PreservedValue), - ) - } else { - v2_rt::rc_empty_map::>() - } - } - } - } - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(expr.clone()); - let field = field_access_field_at(expr.clone(), type_env.source_indices.clone()); - let base_prov = classify_body_provenance( - &base, - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &let_prov, - ); - Rc::new(v2_rt::map_keys(&base_prov)).iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, pname: String| { - match v2_rt::map_get(&base_prov, pname.clone()) { - Some(base_rel) => { - let type_for_lookup = match (*base_rel.clone()).clone() { - SubValueRelation::PreservedValue => { - match v2_rt::map_get(¶m_types, pname.clone()) { - Some(t) => t.clone(), - None => "".to_string(), - } - } - SubValueRelation::StrictSubValue { field: f, .. } => { - f.element_type.clone() - } - SubValueRelation::IteratedSubValue { field: f, .. } => { - f.element_type.clone() - } - _ => "".to_string(), - }; - if (type_for_lookup.clone().as_str() != "".to_string().as_str()) { - { - let fields = inductive_fields_for( - type_env.clone(), - type_for_lookup.clone(), - ); - let matching = Rc::new({ - let mut __result = Vec::new(); - for f in fields.clone().iter().cloned() { - if (f.field_name.clone().as_str() - == field.clone().as_str()) - { - __result.push(f); - } - } - __result - }) - .first() - .cloned(); - match matching.clone() { - Some(ind_field) => v2_rt::rc_map_insert( - acc.clone(), - pname.clone(), - compose_sub_value( - base_rel.clone(), - ind_field.clone(), - ), - ), - None => acc.clone(), - } - } - } else { - acc.clone() - } - } - None => acc.clone(), - } - }, - ) - } - ExprData::ExprCall { .. } => { - let callee = expr_call_func_at(expr.clone(), type_env.source_indices.clone()); - compose_callee_provenance( - callee, - call_args_by_name(expr.clone(), type_env.source_indices.clone()), - param_names.clone(), - param_types.clone(), - type_env.clone(), - &func_sigs, - let_prov.clone(), - ) - } - ExprData::ExprMethodCall { - method_semantics: ms, - .. - } => { - let mname = expr_method_name_at(expr.clone(), type_env.source_indices.clone()); - let callee_result = compose_callee_provenance( - mname.clone(), - method_call_args_by_name( - &expr, - func_sigs.clone(), - &type_env.source_indices.clone(), - ), - param_names.clone(), - param_types.clone(), - type_env.clone(), - &func_sigs, - let_prov.clone(), - ); - if ((Rc::new(v2_rt::map_keys(&callee_result)).len() as i64) > 0) { - callee_result.clone() - } else { + ExprData::ExprVar { .. } => { + let vname = expr_var_name_at(expr.clone(), type_env.source_indices.clone()); +match v2_rt::map_get(&let_prov, vname.clone()) { + Some(prov) => prov.clone(), + None => if { let mut __found = false; for pn in param_names.clone().iter().cloned() { if (pn.clone().as_str() == vname.clone().as_str()) { __found = true; break; } } __found } { + v2_rt::rc_map_insert(v2_rt::rc_empty_map::>(), vname.clone(), Rc::new(SubValueRelation::PreservedValue)) + } else { + v2_rt::rc_empty_map::>() + }, +} +}, + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(expr.clone()); +let field = field_access_field_at(expr.clone(), type_env.source_indices.clone()); +let base_prov = classify_body_provenance(&base, ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov); +Rc::new(v2_rt::map_keys(&base_prov)).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, pname: String| match v2_rt::map_get(&base_prov, pname.clone()) { + Some(base_rel) => { + let type_for_lookup = match (*base_rel.clone()).clone() { + SubValueRelation::PreservedValue => match v2_rt::map_get(¶m_types, pname.clone()) { + Some(t) => t.clone(), + None => "".to_string(), +}, + SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), + SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), + _ => "".to_string(), +}; +if (type_for_lookup.clone().as_str() != "".to_string().as_str()) { { - let is_shrink = match ms.clone().as_deref().cloned() { - Some(MethodSemantics::AlgebraMethodSemantics { - size_effect: se, - .. - }) => match se.clone() { - Some(CollectionSizeEffect::ShrinkEffect) => true, - _ => false, - }, - _ => false, - }; - if (is_shrink - && match method_arg_nodes(expr.clone()).first().cloned() { - Some(arg_node) => match (*arg_value(&arg_node).expr_data.clone()) - .clone() - { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitInt { value: n, .. } = value.as_ref() - else { - unreachable!() - }; - (n.clone() > 0) - } - _ => false, - }, - None => false, - }) + let fields = inductive_fields_for(type_env.clone(), type_for_lookup.clone()); +let matching = Rc::new({ let mut __result = Vec::new(); for f in fields.clone().iter().cloned() { if (f.field_name.clone().as_str() == field.clone().as_str()) { __result.push(f); } } __result }).first().cloned(); +match matching.clone() { + Some(ind_field) => v2_rt::rc_map_insert(acc.clone(), pname.clone(), compose_sub_value(base_rel.clone(), ind_field.clone())), + None => acc.clone(), +} +} + } else { + acc.clone() + } +}, + None => acc.clone(), +}) +}, + ExprData::ExprCall { .. } => { + let callee = expr_call_func_at(expr.clone(), type_env.source_indices.clone()); +compose_callee_provenance(callee, call_args_by_name(expr.clone(), type_env.source_indices.clone()), param_names.clone(), param_types.clone(), type_env.clone(), &func_sigs, let_prov.clone()) +}, + ExprData::ExprMethodCall { method_semantics: ms, .. } => { + let mname = expr_method_name_at(expr.clone(), type_env.source_indices.clone()); +let callee_result = compose_callee_provenance(mname.clone(), method_call_args_by_name(&expr, func_sigs.clone(), &type_env.source_indices.clone()), param_names.clone(), param_types.clone(), type_env.clone(), &func_sigs, let_prov.clone()); +if ((Rc::new(v2_rt::map_keys(&callee_result)).len() as i64) > 0) { + callee_result.clone() + } else { + { + let is_shrink = match ms.clone().as_deref().cloned() { + Some(MethodSemantics::AlgebraMethodSemantics { size_effect: se, .. }) => match se.clone() { + Some(CollectionSizeEffect::ShrinkEffect) => true, + _ => false, +}, + _ => false, +}; +if (is_shrink && match method_arg_nodes(expr.clone()).first().cloned() { + Some(arg_node) => match (*arg_value(&arg_node).expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: n, .. } = value.as_ref() else { unreachable!() }; (n.clone() > 0) }, + _ => false, +}, + None => false, +}) { { - { - let recv = method_receiver(expr.clone()); - let recv_prov = classify_body_provenance( - &recv, - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &let_prov, - ); - Rc::new(v2_rt::map_keys(&recv_prov)).iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, - pname: String| { - match v2_rt::map_get(&recv_prov, pname.clone()) { - Some(recv_rel) => { - let synth_field = Rc::new(InductiveField { - type_name: pname.clone(), - variant_name: "".to_string(), - field_name: mname.clone(), - shape: RecursionShape::ListRecursion, - element_type: pname.clone(), - }); - v2_rt::rc_map_insert( - acc.clone(), - pname.clone(), - compose_sub_value( - recv_rel.clone(), - synth_field.clone(), - ), - ) - } - None => acc.clone(), - } - }, - ) - } - } else { - v2_rt::rc_empty_map::>() - } + let recv = method_receiver(expr.clone()); +let recv_prov = classify_body_provenance(&recv, ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov); +Rc::new(v2_rt::map_keys(&recv_prov)).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, pname: String| match v2_rt::map_get(&recv_prov, pname.clone()) { + Some(recv_rel) => { + let synth_field = Rc::new(InductiveField { + type_name: pname.clone(), + variant_name: "".to_string(), + field_name: mname.clone(), + shape: RecursionShape::ListRecursion, + element_type: pname.clone(), +}); +v2_rt::rc_map_insert(acc.clone(), pname.clone(), compose_sub_value(recv_rel.clone(), synth_field.clone())) +}, + None => acc.clone(), +}) +} + } else { + v2_rt::rc_empty_map::>() } - } +} } - ExprData::ExprMatch => { - let scrut = match_scrutinee(expr.clone()); - let scrut_prov = classify_body_provenance( - &scrut, - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &let_prov, - ); - let arms = match_arm_nodes(expr.clone()); - let arm_provs = Rc::new({ - let mut __result = Vec::new(); - for arm in arms.iter().cloned() { - __result.push({ +}, + ExprData::ExprMatch => { + let scrut = match_scrutinee(expr.clone()); +let scrut_prov = classify_body_provenance(&scrut, ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov); +let arms = match_arm_nodes(expr.clone()); +let arm_provs = Rc::new({ let mut __result = Vec::new(); for arm in arms.iter().cloned() { __result.push({ let arm_let_prov = match (*arm_pattern(arm.clone())).clone() { MatchPattern::VariantPattern { name: vname, field_bindings: bindings, .. } => bindings.clone().iter().cloned().fold(let_prov.clone(), |acc: Rc>>>>, binding: Rc| { let field_label = field_binding_name_at(binding.clone(), type_env.source_indices.clone()); @@ -7670,141 +4582,64 @@ v2_rt::rc_map_insert(acc.clone(), bind_name.clone(), field_prov.clone()) _ => let_prov.clone(), }; classify_body_provenance(&arm_body(&arm), ¶m_names, ¶m_types, &type_env, &func_sigs, &arm_let_prov) +}); } __result }); +meet_body_provenance_maps(&arm_provs) +}, + ExprData::ExprIf => { + let then_prov = classify_body_provenance(&if_then_branch(expr.clone()), ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov); +match if_else_branch(expr.clone()) { + Some(else_expr) => { + let else_prov = classify_body_provenance(&else_expr, ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov); +meet_body_provenance_maps(&Rc::new(vec![then_prov, else_prov])) +}, + None => then_prov, +} +}, + ExprData::ExprLet => { + let value = let_value(expr.clone()); +let bname = let_binding_name_at(expr.clone(), type_env.source_indices.clone()); +let value_prov = classify_body_provenance(&value, ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov); +let updated = v2_rt::rc_map_insert(let_prov.clone(), bname.clone(), value_prov.clone()); +match let_body(expr.clone()) { + Some(body) => classify_body_provenance(&body, ¶m_names, ¶m_types, &type_env, &func_sigs, &updated), + None => v2_rt::rc_empty_map::>(), +} +}, + ExprData::ExprBlock => { + let block_result = expr.children.clone().iter().cloned().fold(Rc::new(BlockProvFoldState { + prov: let_prov.clone(), + last: empty_prov_map(), +}), |state: Rc, stmt: Rc| match (*stmt.expr_data.clone()).clone() { + ExprData::ExprLet => { + let bname = let_binding_name_at(stmt.clone(), type_env.source_indices.clone()); +let value = let_value(stmt.clone()); +let value_prov = classify_body_provenance(&value, ¶m_names, ¶m_types, &type_env, &func_sigs, &state.prov.clone()); +let updated_prov = v2_rt::rc_map_insert(state.prov.clone(), bname.clone(), value_prov.clone()); +match let_body(stmt.clone()) { + Some(body) => Rc::new(BlockProvFoldState { + prov: state.prov.clone(), + last: classify_body_provenance(&body, ¶m_names, ¶m_types, &type_env, &func_sigs, &updated_prov), +}), + None => Rc::new(BlockProvFoldState { + prov: updated_prov.clone(), + last: value_prov.clone(), +}), +} +}, + _ => Rc::new(BlockProvFoldState { + prov: state.prov.clone(), + last: classify_body_provenance(&stmt, ¶m_names, ¶m_types, &type_env, &func_sigs, &state.prov.clone()), +}), }); - } - __result - }); - meet_body_provenance_maps(&arm_provs) - } - ExprData::ExprIf => { - let then_prov = classify_body_provenance( - &if_then_branch(expr.clone()), - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &let_prov, - ); - match if_else_branch(expr.clone()) { - Some(else_expr) => { - let else_prov = classify_body_provenance( - &else_expr, - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &let_prov, - ); - meet_body_provenance_maps(&Rc::new(vec![then_prov, else_prov])) - } - None => then_prov, - } - } - ExprData::ExprLet => { - let value = let_value(expr.clone()); - let bname = let_binding_name_at(expr.clone(), type_env.source_indices.clone()); - let value_prov = classify_body_provenance( - &value, - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &let_prov, - ); - let updated = - v2_rt::rc_map_insert(let_prov.clone(), bname.clone(), value_prov.clone()); - match let_body(expr.clone()) { - Some(body) => classify_body_provenance( - &body, - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &updated, - ), - None => v2_rt::rc_empty_map::>(), - } - } - ExprData::ExprBlock => { - let block_result = expr.children.clone().iter().cloned().fold( - Rc::new(BlockProvFoldState { - prov: let_prov.clone(), - last: empty_prov_map(), - }), - |state: Rc, stmt: Rc| match (*stmt.expr_data.clone()) - .clone() - { - ExprData::ExprLet => { - let bname = - let_binding_name_at(stmt.clone(), type_env.source_indices.clone()); - let value = let_value(stmt.clone()); - let value_prov = classify_body_provenance( - &value, - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &state.prov.clone(), - ); - let updated_prov = v2_rt::rc_map_insert( - state.prov.clone(), - bname.clone(), - value_prov.clone(), - ); - match let_body(stmt.clone()) { - Some(body) => Rc::new(BlockProvFoldState { - prov: state.prov.clone(), - last: classify_body_provenance( - &body, - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &updated_prov, - ), - }), - None => Rc::new(BlockProvFoldState { - prov: updated_prov.clone(), - last: value_prov.clone(), - }), - } - } - _ => Rc::new(BlockProvFoldState { - prov: state.prov.clone(), - last: classify_body_provenance( - &stmt, - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &state.prov.clone(), - ), - }), - }, - ); - block_result.last.clone() - } - ExprData::ExprCast => classify_body_provenance( - &cast_expr(expr.clone()), - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &let_prov, - ), - ExprData::ExprReturn => match expr.children.clone().first().cloned() { - Some(inner) => classify_body_provenance( - &inner, - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &let_prov, - ), - None => v2_rt::rc_empty_map::>(), - }, - _ => v2_rt::rc_empty_map::>(), - } +block_result.last.clone() +}, + ExprData::ExprCast => classify_body_provenance(&cast_expr(expr.clone()), ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov), + ExprData::ExprReturn => match expr.children.clone().first().cloned() { + Some(inner) => classify_body_provenance(&inner, ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov), + None => v2_rt::rc_empty_map::>(), +}, + _ => v2_rt::rc_empty_map::>(), +} }) } @@ -7814,275 +4649,112 @@ pub struct BlockProvFoldState { pub last: Rc>>, } -pub fn call_args_by_name( - call: Rc, - source_indices: Rc>>, -) -> Rc>> { - call.children.clone().iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, arg_node: Rc| match arg_name_at( - arg_node.clone(), - source_indices.clone(), - ) { - Some(aname) => v2_rt::rc_map_insert(acc.clone(), aname.clone(), arg_value(&arg_node)), - None => acc.clone(), - }, - ) +pub fn call_args_by_name(call: Rc, source_indices: Rc>>) -> Rc>> { + call.children.clone().iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, arg_node: Rc| match arg_name_at(arg_node.clone(), source_indices.clone()) { + Some(aname) => v2_rt::rc_map_insert(acc.clone(), aname.clone(), arg_value(&arg_node)), + None => acc.clone(), +}) } -pub fn method_call_args_by_name( - call: &Rc, - func_sigs: Rc>>, - source_indices: &Rc>>, -) -> Rc>> { +pub fn method_call_args_by_name(call: &Rc, func_sigs: Rc>>, source_indices: &Rc>>) -> Rc>> { { let mname = expr_method_name_at(call.clone(), source_indices.clone()); - let recv = method_receiver(call.clone()); - let mc_args = method_arg_nodes(call.clone()); - let base = match v2_rt::map_get(&func_sigs, mname) { - Some(sig) => match sig.params.clone().first().cloned() { - Some(first_p) => { - let first_pname = param_node_name_at(first_p.clone(), source_indices.clone()); - if (first_pname.clone().as_str() != "".to_string().as_str()) { - v2_rt::rc_map_insert( - v2_rt::rc_empty_map::>(), - first_pname.clone(), - recv, - ) - } else { - v2_rt::rc_empty_map::>() - } - } - None => v2_rt::rc_empty_map::>(), - }, - None => v2_rt::rc_empty_map::>(), - }; - mc_args.iter().cloned().fold( - base, - |acc: Rc>>, arg_node: Rc| match arg_name_at( - arg_node.clone(), - source_indices.clone(), - ) { - Some(aname) => { - v2_rt::rc_map_insert(acc.clone(), aname.clone(), arg_value(&arg_node)) - } - None => acc.clone(), - }, - ) - } +let recv = method_receiver(call.clone()); +let mc_args = method_arg_nodes(call.clone()); +let base = match v2_rt::map_get(&func_sigs, mname) { + Some(sig) => match sig.params.clone().first().cloned() { + Some(first_p) => { + let first_pname = param_node_name_at(first_p.clone(), source_indices.clone()); +if (first_pname.clone().as_str() != "".to_string().as_str()) { + v2_rt::rc_map_insert(v2_rt::rc_empty_map::>(), first_pname.clone(), recv) + } else { + v2_rt::rc_empty_map::>() + } +}, + None => v2_rt::rc_empty_map::>(), +}, + None => v2_rt::rc_empty_map::>(), +}; +mc_args.iter().cloned().fold(base, |acc: Rc>>, arg_node: Rc| match arg_name_at(arg_node.clone(), source_indices.clone()) { + Some(aname) => v2_rt::rc_map_insert(acc.clone(), aname.clone(), arg_value(&arg_node)), + None => acc.clone(), +}) +} } -pub fn compose_callee_provenance( - callee: String, - arg_by_name: Rc>>, - param_names: Rc>, - param_types: Rc>, - type_env: Rc, - func_sigs: &Rc>>, - let_prov: Rc>>>>, -) -> Rc>> { +pub fn compose_callee_provenance(callee: String, arg_by_name: Rc>>, param_names: Rc>, param_types: Rc>, type_env: Rc, func_sigs: &Rc>>, let_prov: Rc>>>>) -> Rc>> { match v2_rt::map_get(&func_sigs, callee) { - Some(sig) => match sig.output_provenance.clone().first().cloned() { - Some(callee_prov) => Rc::new(v2_rt::map_keys(&callee_prov)).iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, callee_pname: String| { - match v2_rt::map_get(&callee_prov, callee_pname.clone()) { - Some(callee_rel) => { - match v2_rt::map_get(&arg_by_name, callee_pname.clone()) { - Some(arg) => { - let arg_prov = classify_body_provenance( - &arg, - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &let_prov, - ); - Rc::new(v2_rt::map_keys(&arg_prov)).iter().cloned().fold( - acc.clone(), - |inner: Rc>>, - pname: String| { - match v2_rt::map_get(&arg_prov, pname.clone()) { - Some(arg_rel) => { - let composed = compose_sub_value_relations( - arg_rel.clone(), - callee_rel.clone(), - ); - match (*composed.clone()).clone() { - SubValueRelation::SubValueUnknown => { - inner.clone() - } - _ => match v2_rt::map_get( - &inner, - pname.clone(), - ) { - Some(existing) => v2_rt::rc_map_insert( - inner.clone(), - pname.clone(), - meet_sub_value( - existing.clone(), - composed.clone(), - ), - ), - None => v2_rt::rc_map_insert( - inner.clone(), - pname.clone(), - composed.clone(), - ), - }, - } - } - None => inner.clone(), - } - }, - ) - } - None => acc.clone(), - } - } - None => acc.clone(), - } - }, - ), - None => v2_rt::rc_empty_map::>(), - }, - None => v2_rt::rc_empty_map::>(), - } + Some(sig) => match sig.output_provenance.clone().first().cloned() { + Some(callee_prov) => Rc::new(v2_rt::map_keys(&callee_prov)).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, callee_pname: String| match v2_rt::map_get(&callee_prov, callee_pname.clone()) { + Some(callee_rel) => match v2_rt::map_get(&arg_by_name, callee_pname.clone()) { + Some(arg) => { + let arg_prov = classify_body_provenance(&arg, ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov); +Rc::new(v2_rt::map_keys(&arg_prov)).iter().cloned().fold(acc.clone(), |inner: Rc>>, pname: String| match v2_rt::map_get(&arg_prov, pname.clone()) { + Some(arg_rel) => { + let composed = compose_sub_value_relations(arg_rel.clone(), callee_rel.clone()); +match (*composed.clone()).clone() { + SubValueRelation::SubValueUnknown => inner.clone(), + _ => match v2_rt::map_get(&inner, pname.clone()) { + Some(existing) => v2_rt::rc_map_insert(inner.clone(), pname.clone(), meet_sub_value(existing.clone(), composed.clone())), + None => v2_rt::rc_map_insert(inner.clone(), pname.clone(), composed.clone()), +}, +} +}, + None => inner.clone(), +}) +}, + None => acc.clone(), +}, + None => acc.clone(), +}), + None => v2_rt::rc_empty_map::>(), +}, + None => v2_rt::rc_empty_map::>(), +} } -pub fn classify_body_per_field( - expr: Rc, - param_names: Rc>, - param_types: Rc>, - type_env: &Rc, - func_sigs: Rc>>, - let_prov: Rc>>>>, -) -> Rc>>>> { +pub fn classify_body_per_field(expr: Rc, param_names: Rc>, param_types: Rc>, type_env: &Rc, func_sigs: Rc>>, let_prov: Rc>>>>) -> Rc>>>> { { let unwrapped = unwrap_body_terminal(&expr, let_prov, type_env.clone()); - let terminal = unwrapped.expr.clone(); - let terminal_prov = unwrapped.let_prov.clone(); - classify_terminal_per_field( - &terminal, - param_names, - param_types, - &type_env, - func_sigs, - terminal_prov, - ) - } +let terminal = unwrapped.expr.clone(); +let terminal_prov = unwrapped.let_prov.clone(); +classify_terminal_per_field(&terminal, param_names, param_types, &type_env, func_sigs, terminal_prov) +} } -pub fn classify_terminal_per_field( - expr: &Rc, - param_names: Rc>, - param_types: Rc>, - type_env: &Rc, - func_sigs: Rc>>, - let_prov: Rc>>>>, -) -> Rc>>>> { +pub fn classify_terminal_per_field(expr: &Rc, param_names: Rc>, param_types: Rc>, type_env: &Rc, func_sigs: Rc>>, let_prov: Rc>>>>) -> Rc>>>> { match (*expr.expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => Rc::new({ - let mut __result = Vec::new(); - for fi in expr.children.clone().iter().cloned() { - __result.push(classify_body_provenance( - &field_init_node_value(&fi), - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &let_prov, - )); - } - __result - }), - ExprData::ExprMatch => { - let arm_results = Rc::new({ - let mut __result = Vec::new(); - for arm in match_arm_nodes(expr.clone()).iter().cloned() { - __result.push({ - let arm_unwrapped = unwrap_body_terminal( - &arm_body(&arm), - let_prov.clone(), - type_env.clone(), - ); - match (*arm_unwrapped.expr.clone().expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => Rc::new({ - let mut __result = Vec::new(); - for fi in - arm_unwrapped.expr.clone().children.clone().iter().cloned() - { - __result.push(classify_body_provenance( - &field_init_node_value(&fi), - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &arm_unwrapped.let_prov.clone(), - )); - } - __result - }), - _ => Rc::new(vec![]), - } - }); - } - __result - }); - meet_per_field_results(&arm_results) - } - ExprData::ExprIf => { - let then_unwrapped = unwrap_body_terminal( - &if_then_branch(expr.clone()), - let_prov.clone(), - type_env.clone(), - ); - let then_result = match (*then_unwrapped.expr.clone().expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => Rc::new({ - let mut __result = Vec::new(); - for fi in then_unwrapped.expr.clone().children.clone().iter().cloned() { - __result.push(classify_body_provenance( - &field_init_node_value(&fi), - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &then_unwrapped.let_prov.clone(), - )); - } - __result - }), - _ => Rc::new(vec![]), - }; - match if_else_branch(expr.clone()) { - Some(else_expr) => { - let else_unwrapped = - unwrap_body_terminal(&else_expr, let_prov.clone(), type_env.clone()); - let else_result = match (*else_unwrapped.expr.clone().expr_data.clone()).clone() - { - ExprData::ExprRecordLit { .. } => Rc::new({ - let mut __result = Vec::new(); - for fi in else_unwrapped.expr.clone().children.clone().iter().cloned() { - __result.push(classify_body_provenance( - &field_init_node_value(&fi), - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &else_unwrapped.let_prov.clone(), - )); - } - __result - }), - _ => Rc::new(vec![]), - }; - meet_per_field_results(&Rc::new(vec![then_result, else_result])) - } - None => then_result, - } - } - _ => Rc::new(vec![]), - } + ExprData::ExprRecordLit { .. } => Rc::new({ let mut __result = Vec::new(); for fi in expr.children.clone().iter().cloned() { __result.push(classify_body_provenance(&field_init_node_value(&fi), ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov)); } __result }), + ExprData::ExprMatch => { + let arm_results = Rc::new({ let mut __result = Vec::new(); for arm in match_arm_nodes(expr.clone()).iter().cloned() { __result.push({ + let arm_unwrapped = unwrap_body_terminal(&arm_body(&arm), let_prov.clone(), type_env.clone()); +match (*arm_unwrapped.expr.clone().expr_data.clone()).clone() { + ExprData::ExprRecordLit { .. } => Rc::new({ let mut __result = Vec::new(); for fi in arm_unwrapped.expr.clone().children.clone().iter().cloned() { __result.push(classify_body_provenance(&field_init_node_value(&fi), ¶m_names, ¶m_types, &type_env, &func_sigs, &arm_unwrapped.let_prov.clone())); } __result }), + _ => Rc::new(vec![]), +} +}); } __result }); +meet_per_field_results(&arm_results) +}, + ExprData::ExprIf => { + let then_unwrapped = unwrap_body_terminal(&if_then_branch(expr.clone()), let_prov.clone(), type_env.clone()); +let then_result = match (*then_unwrapped.expr.clone().expr_data.clone()).clone() { + ExprData::ExprRecordLit { .. } => Rc::new({ let mut __result = Vec::new(); for fi in then_unwrapped.expr.clone().children.clone().iter().cloned() { __result.push(classify_body_provenance(&field_init_node_value(&fi), ¶m_names, ¶m_types, &type_env, &func_sigs, &then_unwrapped.let_prov.clone())); } __result }), + _ => Rc::new(vec![]), +}; +match if_else_branch(expr.clone()) { + Some(else_expr) => { + let else_unwrapped = unwrap_body_terminal(&else_expr, let_prov.clone(), type_env.clone()); +let else_result = match (*else_unwrapped.expr.clone().expr_data.clone()).clone() { + ExprData::ExprRecordLit { .. } => Rc::new({ let mut __result = Vec::new(); for fi in else_unwrapped.expr.clone().children.clone().iter().cloned() { __result.push(classify_body_provenance(&field_init_node_value(&fi), ¶m_names, ¶m_types, &type_env, &func_sigs, &else_unwrapped.let_prov.clone())); } __result }), + _ => Rc::new(vec![]), +}; +meet_per_field_results(&Rc::new(vec![then_result, else_result])) +}, + None => then_result, +} +}, + _ => Rc::new(vec![]), +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -8091,884 +4763,401 @@ pub struct BodyTerminal { pub let_prov: Rc>>>>, } -pub fn unwrap_body_terminal( - expr: &Rc, - let_prov: Rc>>>>, - type_env: Rc, -) -> Rc { +pub fn unwrap_body_terminal(expr: &Rc, let_prov: Rc>>>>, type_env: Rc) -> Rc { match (*expr.expr_data.clone()).clone() { - ExprData::ExprBlock => match expr.children.clone().last().cloned() { - Some(last_stmt) => Rc::new(BodyTerminal { - expr: last_stmt.clone(), - let_prov: let_prov, - }), - None => Rc::new(BodyTerminal { - expr: expr.clone(), - let_prov: let_prov, - }), - }, - _ => Rc::new(BodyTerminal { - expr: expr.clone(), - let_prov: let_prov, - }), - } + ExprData::ExprBlock => match expr.children.clone().last().cloned() { + Some(last_stmt) => Rc::new(BodyTerminal { + expr: last_stmt.clone(), + let_prov: let_prov, +}), + None => Rc::new(BodyTerminal { + expr: expr.clone(), + let_prov: let_prov, +}), +}, + _ => Rc::new(BodyTerminal { + expr: expr.clone(), + let_prov: let_prov, +}), +} } -pub fn meet_per_field_results( - results: &Rc>>>>>>, -) -> Rc>>>> { +pub fn meet_per_field_results(results: &Rc>>>>>>) -> Rc>>>> { match results.clone().first().cloned() { - None => Rc::new(vec![]), - Some(first_result) => { - if ((first_result.clone().len() as i64) == 0) { + None => Rc::new(vec![]), + Some(first_result) => if ((first_result.clone().len() as i64) == 0) { + Rc::new(vec![]) + } else { + { + let all_same_count = { let mut __all = true; for r in results.clone().iter().cloned() { if !(((r.clone().len() as i64) == (first_result.clone().len() as i64))) { __all = false; break; } } __all }; +if !all_same_count { Rc::new(vec![]) } else { - { - let all_same_count = { - let mut __all = true; - for r in results.clone().iter().cloned() { - if !((r.clone().len() as i64) == (first_result.clone().len() as i64)) { - __all = false; - break; - } - } - __all - }; - if !all_same_count { - Rc::new(vec![]) - } else { - Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - first_result - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - __result.push({ - let idx = pair.0.clone(); - let field_provs = Rc::new({ - let mut __result = Vec::new(); - for r in results.clone().iter().cloned() { - __result.push( - match r.clone().get(idx.clone() as usize).cloned() { - Some(m) => m.clone(), - None => empty_prov_map(), - }, - ); - } - __result - }); - meet_body_provenance_maps(&field_provs) - }); - } - __result - }) - } - } + Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(first_result.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ + let idx = pair.0.clone(); +let field_provs = Rc::new({ let mut __result = Vec::new(); for r in results.clone().iter().cloned() { __result.push(match r.clone().get(idx.clone() as usize).cloned() { + Some(m) => m.clone(), + None => empty_prov_map(), +}); } __result }); +meet_body_provenance_maps(&field_provs) +}); } __result }) } - } - } +} + }, +} } pub fn empty_prov_map() -> Rc>> { v2_rt::rc_empty_map::>() } -pub fn meet_body_provenance_maps( - provs: &Rc>>>>, -) -> Rc>> { +pub fn meet_body_provenance_maps(provs: &Rc>>>>) -> Rc>> { match provs.clone().first().cloned() { - None => empty_prov_map(), - Some(first_prov) => Rc::new( - provs - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ) - .iter() - .cloned() - .fold( - first_prov.clone(), - |acc: Rc>>, - prov: Rc>>| { - intersect_prov_maps(&acc, prov.clone()) - }, - ), - } + None => empty_prov_map(), + Some(first_prov) => Rc::new(provs.clone().iter().cloned().skip(1 as usize).collect::>()).iter().cloned().fold(first_prov.clone(), |acc: Rc>>, prov: Rc>>| intersect_prov_maps(&acc, prov.clone())), +} } -pub fn intersect_prov_maps( - a: &Rc>>, - b: Rc>>, -) -> Rc>> { - Rc::new(v2_rt::map_keys(&a)).iter().cloned().fold( - empty_prov_map(), - |result: Rc>>, key: String| match v2_rt::map_get( - &b, - key.clone(), - ) { - Some(b_rel) => match v2_rt::map_get(&a, key.clone()) { - Some(a_rel) => v2_rt::rc_map_insert( - result.clone(), - key.clone(), - meet_sub_value(a_rel.clone(), b_rel.clone()), - ), - None => result.clone(), - }, - None => result.clone(), - }, - ) +pub fn intersect_prov_maps(a: &Rc>>, b: Rc>>) -> Rc>> { + Rc::new(v2_rt::map_keys(&a)).iter().cloned().fold(empty_prov_map(), |result: Rc>>, key: String| match v2_rt::map_get(&b, key.clone()) { + Some(b_rel) => match v2_rt::map_get(&a, key.clone()) { + Some(a_rel) => v2_rt::rc_map_insert(result.clone(), key.clone(), meet_sub_value(a_rel.clone(), b_rel.clone())), + None => result.clone(), +}, + None => result.clone(), +}) } -pub fn arm_ctx_from_variant_provenance( - arm_node: Rc, - sig: Rc, - scrut: Rc, - ctx: &Rc, -) -> Option> { +pub fn arm_ctx_from_variant_provenance(arm_node: Rc, sig: Rc, scrut: Rc, ctx: &Rc) -> Option> { match (*arm_pattern(arm_node)).clone() { - MatchPattern::VariantPattern { - name: vname, - field_bindings: bindings, - .. - } => match v2_rt::map_get(&sig.variant_provenance.clone(), vname.clone()) { - Some(variant_field_map) => { - let call_args = - call_args_by_name(scrut, ctx.type_env.clone().source_indices.clone()); - let extended = bindings.clone().iter().cloned().fold( - ctx.clone(), - |c: Rc, fb: Rc| { - let field_label = field_binding_name_at( - fb.clone(), - ctx.type_env.clone().source_indices.clone(), - ); - let bind_name = match (*field_binding_pattern(fb.clone())).clone() { - MatchPattern::Bind { name: bn, .. } => bn.clone(), - _ => "".to_string(), - }; - if ((bind_name.clone().as_str() == "".to_string().as_str()) - || (field_label.clone().as_str() == "".to_string().as_str())) - { - c.clone() - } else { - match v2_rt::map_get(&variant_field_map, field_label.clone()) { - Some(param_map) => { - let composed = compose_callee_param_map( - ¶m_map, - call_args.clone(), - c.param_order.clone(), - c.param_names.clone(), - c.type_env.clone(), - c.func_sigs.clone(), - v2_rt::rc_empty_map::< - String, - Rc>>, - >(), - ); - let all_rels = Rc::new({ - let mut __result = Vec::new(); - for k in Rc::new(v2_rt::map_keys(&composed)).iter().cloned() - { - __result.push( - match v2_rt::map_get(&composed, k.clone()) { - Some(r) => r.clone(), - None => { - Rc::new(SubValueRelation::SubValueUnknown) - } - }, - ); - } - __result - }); - let best = merge_argument_relations(&all_rels); - match (*best.clone()).clone() { - SubValueRelation::SubValueUnknown => c.clone(), - _ => Rc::new(DescentContext { - fn_name: c.fn_name.clone(), - param_names: c.param_names.clone(), - param_order: c.param_order.clone(), - type_env: c.type_env.clone(), - sub_value_vars: v2_rt::rc_map_insert( - c.sub_value_vars.clone(), - bind_name.clone(), - best.clone(), - ), - size_aliases: c.size_aliases.clone(), - scope_locals: c.scope_locals.clone(), - func_sigs: c.func_sigs.clone(), - per_field_vars: c.per_field_vars.clone(), - }), - } - } - None => c.clone(), - } - } - }, - ); - Some(extended) + MatchPattern::VariantPattern { name: vname, field_bindings: bindings, .. } => match v2_rt::map_get(&sig.variant_provenance.clone(), vname.clone()) { + Some(variant_field_map) => { + let call_args = call_args_by_name(scrut, ctx.type_env.clone().source_indices.clone()); +let extended = bindings.clone().iter().cloned().fold(ctx.clone(), |c: Rc, fb: Rc| { + let field_label = field_binding_name_at(fb.clone(), ctx.type_env.clone().source_indices.clone()); +let bind_name = match (*field_binding_pattern(fb.clone())).clone() { + MatchPattern::Bind { name: bn, .. } => bn.clone(), + _ => "".to_string(), +}; +if ((bind_name.clone().as_str() == "".to_string().as_str()) || (field_label.clone().as_str() == "".to_string().as_str())) { + c.clone() + } else { + match v2_rt::map_get(&variant_field_map, field_label.clone()) { + Some(param_map) => { + let composed = compose_callee_param_map(¶m_map, call_args.clone(), c.param_order.clone(), c.param_names.clone(), c.type_env.clone(), c.func_sigs.clone(), v2_rt::rc_empty_map::>>>()); +let all_rels = Rc::new({ let mut __result = Vec::new(); for k in Rc::new(v2_rt::map_keys(&composed)).iter().cloned() { __result.push(match v2_rt::map_get(&composed, k.clone()) { + Some(r) => r.clone(), + None => Rc::new(SubValueRelation::SubValueUnknown), +}); } __result }); +let best = merge_argument_relations(&all_rels); +match (*best.clone()).clone() { + SubValueRelation::SubValueUnknown => c.clone(), + _ => Rc::new(DescentContext { + fn_name: c.fn_name.clone(), + param_names: c.param_names.clone(), + param_order: c.param_order.clone(), + type_env: c.type_env.clone(), + sub_value_vars: v2_rt::rc_map_insert(c.sub_value_vars.clone(), bind_name.clone(), best.clone()), + size_aliases: c.size_aliases.clone(), + scope_locals: c.scope_locals.clone(), + func_sigs: c.func_sigs.clone(), + per_field_vars: c.per_field_vars.clone(), +}), +} +}, + None => c.clone(), +} } - None => None, - }, - _ => None, - } +}); +Some(extended) +}, + None => None, +}, + _ => None, +} } -pub fn compose_callee_param_map( - callee_prov: &Rc>>, - arg_by_name: Rc>>, - param_names: Rc>, - param_types: Rc>, - type_env: Rc, - func_sigs: Rc>>, - let_prov: Rc>>>>, -) -> Rc>> { - Rc::new(v2_rt::map_keys(&callee_prov)).iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, callee_pname: String| match v2_rt::map_get( - &callee_prov, - callee_pname.clone(), - ) { - Some(callee_rel) => match v2_rt::map_get(&arg_by_name, callee_pname.clone()) { - Some(arg) => { - let arg_prov = classify_body_provenance( - &arg, - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &let_prov, - ); - Rc::new(v2_rt::map_keys(&arg_prov)).iter().cloned().fold( - acc.clone(), - |inner: Rc>>, pname: String| { - match v2_rt::map_get(&arg_prov, pname.clone()) { - Some(arg_rel) => { - let composed = compose_sub_value_relations( - arg_rel.clone(), - callee_rel.clone(), - ); - match (*composed.clone()).clone() { - SubValueRelation::SubValueUnknown => inner.clone(), - _ => v2_rt::rc_map_insert( - inner.clone(), - pname.clone(), - composed.clone(), - ), - } - } - None => inner.clone(), - } - }, - ) - } - None => acc.clone(), - }, - None => acc.clone(), - }, - ) +pub fn compose_callee_param_map(callee_prov: &Rc>>, arg_by_name: Rc>>, param_names: Rc>, param_types: Rc>, type_env: Rc, func_sigs: Rc>>, let_prov: Rc>>>>) -> Rc>> { + Rc::new(v2_rt::map_keys(&callee_prov)).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, callee_pname: String| match v2_rt::map_get(&callee_prov, callee_pname.clone()) { + Some(callee_rel) => match v2_rt::map_get(&arg_by_name, callee_pname.clone()) { + Some(arg) => { + let arg_prov = classify_body_provenance(&arg, ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov); +Rc::new(v2_rt::map_keys(&arg_prov)).iter().cloned().fold(acc.clone(), |inner: Rc>>, pname: String| match v2_rt::map_get(&arg_prov, pname.clone()) { + Some(arg_rel) => { + let composed = compose_sub_value_relations(arg_rel.clone(), callee_rel.clone()); +match (*composed.clone()).clone() { + SubValueRelation::SubValueUnknown => inner.clone(), + _ => v2_rt::rc_map_insert(inner.clone(), pname.clone(), composed.clone()), +} +}, + None => inner.clone(), +}) +}, + None => acc.clone(), +}, + None => acc.clone(), +}) } -pub fn compose_output_relations( - arg_rel: Rc, - callee_rel: Rc, -) -> Rc { +pub fn compose_output_relations(arg_rel: Rc, callee_rel: Rc) -> Rc { compose_sub_value_relations(arg_rel, callee_rel) } -pub fn compute_variant_provenance( - body: Rc, - return_type: Rc, - params: &Rc>>, - type_env: &Rc, - func_sigs: Rc>>, -) -> Rc>>>>>> { +pub fn compute_variant_provenance(body: Rc, return_type: Rc, params: &Rc>>, type_env: &Rc, func_sigs: Rc>>) -> Rc>>>>>> { { let rt_name = authored_name_at(type_env.source_indices.clone(), &return_type); - let rt_def = lookup_type_by_name(&type_env, rt_name.clone()); - match rt_def { - Some(def_node) => match def_node.connective.clone() { - Connective::Disj => { - let param_names = Rc::new({ - let mut __result = Vec::new(); - for p in params.clone().iter().cloned() { - __result.push(param_node_name_at( - p.clone(), - type_env.source_indices.clone(), - )); - } - __result - }); - let param_types = params.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, p: Rc| { - let pname = - param_node_name_at(p.clone(), type_env.source_indices.clone()); - let ptype = resolved_type_name(&p, type_env.source_indices.clone()); - if ((pname.clone().as_str() != "".to_string().as_str()) - && (ptype.clone().as_str() != "".to_string().as_str())) - { - v2_rt::rc_map_insert(acc.clone(), pname.clone(), ptype.clone()) - } else { - acc.clone() - } - }, - ); - collect_variant_constructors( - &body, - rt_name.clone(), - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - v2_rt::rc_empty_map::>>>(), - &v2_rt::rc_empty_map::< - String, - Rc>>>>, - >(), - ) +let rt_def = lookup_type_by_name(&type_env, rt_name.clone()); +match rt_def { + Some(def_node) => match def_node.connective.clone() { + Connective::Disj => { + let param_names = Rc::new({ let mut __result = Vec::new(); for p in params.clone().iter().cloned() { __result.push(param_node_name_at(p.clone(), type_env.source_indices.clone())); } __result }); +let param_types = params.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, p: Rc| { + let pname = param_node_name_at(p.clone(), type_env.source_indices.clone()); +let ptype = resolved_type_name(&p, type_env.source_indices.clone()); +if ((pname.clone().as_str() != "".to_string().as_str()) && (ptype.clone().as_str() != "".to_string().as_str())) { + v2_rt::rc_map_insert(acc.clone(), pname.clone(), ptype.clone()) + } else { + acc.clone() } - _ => v2_rt::rc_empty_map::< - String, - Rc>>>>, - >(), - }, - None => v2_rt::rc_empty_map::< - String, - Rc>>>>, - >(), - } - } +}); +collect_variant_constructors(&body, rt_name.clone(), ¶m_names, ¶m_types, &type_env, &func_sigs, v2_rt::rc_empty_map::>>>(), &v2_rt::rc_empty_map::>>>>>()) +}, + _ => v2_rt::rc_empty_map::>>>>>(), +}, + None => v2_rt::rc_empty_map::>>>>>(), +} +} } -pub fn collect_variant_constructors( - body: &Rc, - parent_enum: String, - param_names: &Rc>, - param_types: &Rc>, - type_env: &Rc, - func_sigs: &Rc>>, - let_prov: Rc>>>>, - acc: &Rc>>>>>>, -) -> Rc>>>>>> { +pub fn collect_variant_constructors(body: &Rc, parent_enum: String, param_names: &Rc>, param_types: &Rc>, type_env: &Rc, func_sigs: &Rc>>, let_prov: Rc>>>>, acc: &Rc>>>>>>) -> Rc>>>>>> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprRecordLit { - parent_enum: pe, .. - } => match pe.clone() { - Some(enum_name) => { - if (enum_name.clone().as_str() == parent_enum.clone().as_str()) { - { - let variant_name = body.name.clone(); - let field_prov_map = body.children.clone().iter().cloned().fold( - v2_rt::rc_empty_map::< - String, - Rc>>, - >(), - |m: Rc< - HashMap>>>, - >, - fi: Rc| { - let fname = field_init_node_name_at( - fi.clone(), - type_env.source_indices.clone(), - ); - let fprov = classify_body_provenance( - &field_init_node_value(&fi), - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &let_prov, - ); - if (fname.clone().as_str() != "".to_string().as_str()) { - v2_rt::rc_map_insert( - m.clone(), - fname.clone(), - fprov.clone(), - ) - } else { - m.clone() - } - }, - ); - match v2_rt::map_get(&acc, variant_name.clone()) { - Some(existing) => { - let merged = merge_field_prov_maps(&existing, &field_prov_map); - v2_rt::rc_map_insert(acc.clone(), variant_name.clone(), merged) - } - None => v2_rt::rc_map_insert( - acc.clone(), - variant_name.clone(), - field_prov_map, - ), - } - } + ExprData::ExprRecordLit { parent_enum: pe, .. } => match pe.clone() { + Some(enum_name) => if (enum_name.clone().as_str() == parent_enum.clone().as_str()) { + { + let variant_name = body.name.clone(); +let field_prov_map = body.children.clone().iter().cloned().fold(v2_rt::rc_empty_map::>>>(), |m: Rc>>>>, fi: Rc| { + let fname = field_init_node_name_at(fi.clone(), type_env.source_indices.clone()); +let fprov = classify_body_provenance(&field_init_node_value(&fi), ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov); +if (fname.clone().as_str() != "".to_string().as_str()) { + v2_rt::rc_map_insert(m.clone(), fname.clone(), fprov.clone()) } else { - acc.clone() - } - } - None => acc.clone(), - }, - ExprData::ExprMatch => match_arm_nodes(body.clone()).iter().cloned().fold( - acc.clone(), - |a: Rc< - HashMap>>>>>, - >, - arm: Rc| { - collect_variant_constructors( - &arm_body(&arm), - parent_enum.clone(), - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - let_prov.clone(), - &a, - ) - }, - ), - ExprData::ExprIf => { - let then_acc = collect_variant_constructors( - &if_then_branch(body.clone()), - parent_enum.clone(), - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - let_prov.clone(), - &acc, - ); - match if_else_branch(body.clone()) { - Some(eb) => collect_variant_constructors( - &eb, - parent_enum.clone(), - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - let_prov.clone(), - &then_acc, - ), - None => then_acc, - } - } - ExprData::ExprLet => match let_body(body.clone()) { - Some(b) => { - let bname = let_binding_name_at(body.clone(), type_env.source_indices.clone()); - let value_prov = classify_body_provenance( - &let_value(body.clone()), - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &let_prov, - ); - let new_lp = v2_rt::rc_map_insert(let_prov.clone(), bname.clone(), value_prov); - collect_variant_constructors( - &b, - parent_enum.clone(), - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - new_lp, - &acc, - ) - } - None => acc.clone(), - }, - ExprData::ExprBlock => { - let stmts = body.children.clone(); - let stmt_count = (stmts.clone().len() as i64); - if (stmt_count.clone() == 0) { - acc.clone() - } else { - { - let final_lp = Rc::new( - stmts - .clone() - .iter() - .cloned() - .take((stmt_count.clone() - 1) as usize) - .collect::>(), - ) - .iter() - .cloned() - .fold( - let_prov.clone(), - |lp: Rc>>>>, - stmt: Rc| match (*stmt - .expr_data - .clone()) - .clone() - { - ExprData::ExprLet => { - let bname = let_binding_name_at( - stmt.clone(), - type_env.source_indices.clone(), - ); - let vprov = classify_body_provenance( - &let_value(stmt.clone()), - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - &lp, - ); - v2_rt::rc_map_insert(lp.clone(), bname.clone(), vprov.clone()) - } - _ => lp.clone(), - }, - ); - match stmts - .clone() - .get((stmt_count.clone() - 1) as usize) - .cloned() - { - Some(last) => collect_variant_constructors( - &last, - parent_enum.clone(), - ¶m_names, - ¶m_types, - &type_env, - &func_sigs, - final_lp, - &acc, - ), - None => acc.clone(), - } + m.clone() } - } +}); +match v2_rt::map_get(&acc, variant_name.clone()) { + Some(existing) => { + let merged = merge_field_prov_maps(&existing, &field_prov_map); +v2_rt::rc_map_insert(acc.clone(), variant_name.clone(), merged) +}, + None => v2_rt::rc_map_insert(acc.clone(), variant_name.clone(), field_prov_map), +} +} + } else { + acc.clone() + }, + None => acc.clone(), +}, + ExprData::ExprMatch => match_arm_nodes(body.clone()).iter().cloned().fold(acc.clone(), |a: Rc>>>>>>, arm: Rc| collect_variant_constructors(&arm_body(&arm), parent_enum.clone(), ¶m_names, ¶m_types, &type_env, &func_sigs, let_prov.clone(), &a)), + ExprData::ExprIf => { + let then_acc = collect_variant_constructors(&if_then_branch(body.clone()), parent_enum.clone(), ¶m_names, ¶m_types, &type_env, &func_sigs, let_prov.clone(), &acc); +match if_else_branch(body.clone()) { + Some(eb) => collect_variant_constructors(&eb, parent_enum.clone(), ¶m_names, ¶m_types, &type_env, &func_sigs, let_prov.clone(), &then_acc), + None => then_acc, +} +}, + ExprData::ExprLet => match let_body(body.clone()) { + Some(b) => { + let bname = let_binding_name_at(body.clone(), type_env.source_indices.clone()); +let value_prov = classify_body_provenance(&let_value(body.clone()), ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov); +let new_lp = v2_rt::rc_map_insert(let_prov.clone(), bname.clone(), value_prov); +collect_variant_constructors(&b, parent_enum.clone(), ¶m_names, ¶m_types, &type_env, &func_sigs, new_lp, &acc) +}, + None => acc.clone(), +}, + ExprData::ExprBlock => { + let stmts = body.children.clone(); +let stmt_count = (stmts.clone().len() as i64); +if (stmt_count.clone() == 0) { + acc.clone() + } else { + { + let final_lp = Rc::new(stmts.clone().iter().cloned().take((stmt_count.clone() - 1) as usize).collect::>()).iter().cloned().fold(let_prov.clone(), |lp: Rc>>>>, stmt: Rc| match (*stmt.expr_data.clone()).clone() { + ExprData::ExprLet => { + let bname = let_binding_name_at(stmt.clone(), type_env.source_indices.clone()); +let vprov = classify_body_provenance(&let_value(stmt.clone()), ¶m_names, ¶m_types, &type_env, &func_sigs, &lp); +v2_rt::rc_map_insert(lp.clone(), bname.clone(), vprov.clone()) +}, + _ => lp.clone(), +}); +match stmts.clone().get((stmt_count.clone() - 1) as usize).cloned() { + Some(last) => collect_variant_constructors(&last, parent_enum.clone(), ¶m_names, ¶m_types, &type_env, &func_sigs, final_lp, &acc), + None => acc.clone(), +} +} } - _ => acc.clone(), - } +}, + _ => acc.clone(), +} }) } -pub fn merge_field_prov_maps( - a: &Rc>>>>, - b: &Rc>>>>, -) -> Rc>>>> { +pub fn merge_field_prov_maps(a: &Rc>>>>, b: &Rc>>>>) -> Rc>>>> { { - let from_a = Rc::new(v2_rt::map_keys(&a)).iter().cloned().fold( - v2_rt::rc_empty_map::>>>(), - |result: Rc>>>>, - fname: String| match v2_rt::map_get(&a, fname.clone()) { - Some(a_prov) => match v2_rt::map_get(&b, fname.clone()) { - Some(b_prov) => v2_rt::rc_map_insert( - result.clone(), - fname.clone(), - union_prov_maps(&a_prov, &b_prov), - ), - None => v2_rt::rc_map_insert(result.clone(), fname.clone(), a_prov.clone()), - }, - None => result.clone(), - }, - ); - Rc::new(v2_rt::map_keys(&b)).iter().cloned().fold( - from_a, - |result: Rc>>>>, - fname: String| { - if (v2_rt::map_get(&result, fname.clone()) != None) { - result.clone() - } else { - match v2_rt::map_get(&b, fname.clone()) { - Some(b_prov) => { - v2_rt::rc_map_insert(result.clone(), fname.clone(), b_prov.clone()) - } - None => result.clone(), - } - } - }, - ) - } + let from_a = Rc::new(v2_rt::map_keys(&a)).iter().cloned().fold(v2_rt::rc_empty_map::>>>(), |result: Rc>>>>, fname: String| match v2_rt::map_get(&a, fname.clone()) { + Some(a_prov) => match v2_rt::map_get(&b, fname.clone()) { + Some(b_prov) => v2_rt::rc_map_insert(result.clone(), fname.clone(), union_prov_maps(&a_prov, &b_prov)), + None => v2_rt::rc_map_insert(result.clone(), fname.clone(), a_prov.clone()), +}, + None => result.clone(), +}); +Rc::new(v2_rt::map_keys(&b)).iter().cloned().fold(from_a, |result: Rc>>>>, fname: String| if (v2_rt::map_get(&result, fname.clone()) != None) { + result.clone() + } else { + match v2_rt::map_get(&b, fname.clone()) { + Some(b_prov) => v2_rt::rc_map_insert(result.clone(), fname.clone(), b_prov.clone()), + None => result.clone(), +} + }) +} } -pub fn union_prov_maps( - a: &Rc>>, - b: &Rc>>, -) -> Rc>> { +pub fn union_prov_maps(a: &Rc>>, b: &Rc>>) -> Rc>> { { - let from_a = Rc::new(v2_rt::map_keys(&a)).iter().cloned().fold( - empty_prov_map(), - |result: Rc>>, key: String| match v2_rt::map_get( - &a, - key.clone(), - ) { - Some(a_rel) => match v2_rt::map_get(&b, key.clone()) { - Some(b_rel) => v2_rt::rc_map_insert( - result.clone(), - key.clone(), - join_sub_value(a_rel.clone(), b_rel.clone()), - ), - None => v2_rt::rc_map_insert(result.clone(), key.clone(), a_rel.clone()), - }, - None => result.clone(), - }, - ); - Rc::new(v2_rt::map_keys(&b)).iter().cloned().fold( - from_a, - |result: Rc>>, key: String| { - if (v2_rt::map_get(&result, key.clone()) != None) { - result.clone() - } else { - match v2_rt::map_get(&b, key.clone()) { - Some(b_rel) => { - v2_rt::rc_map_insert(result.clone(), key.clone(), b_rel.clone()) - } - None => result.clone(), - } - } - }, - ) - } + let from_a = Rc::new(v2_rt::map_keys(&a)).iter().cloned().fold(empty_prov_map(), |result: Rc>>, key: String| match v2_rt::map_get(&a, key.clone()) { + Some(a_rel) => match v2_rt::map_get(&b, key.clone()) { + Some(b_rel) => v2_rt::rc_map_insert(result.clone(), key.clone(), join_sub_value(a_rel.clone(), b_rel.clone())), + None => v2_rt::rc_map_insert(result.clone(), key.clone(), a_rel.clone()), +}, + None => result.clone(), +}); +Rc::new(v2_rt::map_keys(&b)).iter().cloned().fold(from_a, |result: Rc>>, key: String| if (v2_rt::map_get(&result, key.clone()) != None) { + result.clone() + } else { + match v2_rt::map_get(&b, key.clone()) { + Some(b_rel) => v2_rt::rc_map_insert(result.clone(), key.clone(), b_rel.clone()), + None => result.clone(), +} + }) +} } -pub fn populate_output_provenance( - typed_items: Rc>>, - func_env: Rc, - type_env: Rc, - locals: Rc>>, -) -> Rc { +pub fn populate_output_provenance(typed_items: Rc>>, func_env: Rc, type_env: Rc, locals: Rc>>) -> Rc { { - let updated_sigs = typed_items.iter().cloned().fold( - func_env.signatures.clone(), - |acc: Rc>>, item: Rc| { - if ((item.params.clone().len() as i64) > 0) { - { - let fn_name = authored_name_at(type_env.source_indices.clone(), &item); - if (is_child_accessor_in_model(fn_name.clone()) - || is_tree_size_reducing(fn_name.clone())) - { - match item.params.clone().first().cloned() { - Some(first_param) => { - let pname = param_node_name_at( - first_param.clone(), - type_env.source_indices.clone(), - ); - let ptype = resolved_type_name( - &first_param, - type_env.source_indices.clone(), - ); - if ((ptype.clone().as_str() != "".to_string().as_str()) - && (pname.clone().as_str() != "".to_string().as_str())) - { - { - let fields = inductive_fields_for( - type_env.clone(), - ptype.clone(), - ); - let list_field = Rc::new({ - let mut __result = Vec::new(); - for f in fields.clone().iter().cloned() { - if match f.shape.clone() { - RecursionShape::ListRecursion => true, - _ => false, - } { - __result.push(f); - } - } - __result - }) - .first() - .cloned(); - match list_field.clone() { - Some(ind_field) => { - let provenance = - Rc::new(vec![v2_rt::rc_map_insert( - v2_rt::rc_empty_map::< - String, - Rc, - >( - ), - pname.clone(), - Rc::new( - SubValueRelation::StrictSubValue { - field: ind_field.clone(), - factor: Rc::new( - ShrinkFactor::UnitShrink, - ), - }, - ), - )]); - match v2_rt::map_get(&acc, fn_name.clone()) { - Some(sig) => v2_rt::rc_map_insert( - acc.clone(), - fn_name.clone(), - Rc::new(ResolvedFuncSig { - name: sig.name.clone(), - params: sig.params.clone(), - inferred: sig.inferred.clone(), - is_async: sig.is_async.clone(), - output_provenance: provenance - .clone(), - variant_provenance: sig - .variant_provenance - .clone(), - }), - ), - None => acc.clone(), - } - } - None => acc.clone(), - } - } - } else { - acc.clone() - } - } - None => acc.clone(), - } + let updated_sigs = typed_items.iter().cloned().fold(func_env.signatures.clone(), |acc: Rc>>, item: Rc| if ((item.params.clone().len() as i64) > 0) { + { + let fn_name = authored_name_at(type_env.source_indices.clone(), &item); +if (is_child_accessor_in_model(fn_name.clone()) || is_tree_size_reducing(fn_name.clone())) { + match item.params.clone().first().cloned() { + Some(first_param) => { + let pname = param_node_name_at(first_param.clone(), type_env.source_indices.clone()); +let ptype = resolved_type_name(&first_param, type_env.source_indices.clone()); +if ((ptype.clone().as_str() != "".to_string().as_str()) && (pname.clone().as_str() != "".to_string().as_str())) { + { + let fields = inductive_fields_for(type_env.clone(), ptype.clone()); +let list_field = Rc::new({ let mut __result = Vec::new(); for f in fields.clone().iter().cloned() { if match f.shape.clone() { + RecursionShape::ListRecursion => true, + _ => false, +} { __result.push(f); } } __result }).first().cloned(); +match list_field.clone() { + Some(ind_field) => { + let provenance = Rc::new(vec![v2_rt::rc_map_insert(v2_rt::rc_empty_map::>(), pname.clone(), Rc::new(SubValueRelation::StrictSubValue { + field: ind_field.clone(), + factor: Rc::new(ShrinkFactor::UnitShrink), +}))]); +match v2_rt::map_get(&acc, fn_name.clone()) { + Some(sig) => v2_rt::rc_map_insert(acc.clone(), fn_name.clone(), Rc::new(ResolvedFuncSig { + name: sig.name.clone(), + params: sig.params.clone(), + inferred: sig.inferred.clone(), + is_async: sig.is_async.clone(), + output_provenance: provenance.clone(), + variant_provenance: sig.variant_provenance.clone(), +})), + None => acc.clone(), +} +}, + None => acc.clone(), +} +} } else { - match item.body.clone() { - Some(body) => { - if !expr_has_self_call( - &body, - &fn_name, - &type_env.source_indices.clone(), - ) { - { - let provenance = infer_output_provenance( - &body, - &item.params.clone(), - &type_env, - locals.clone(), - &acc, - ); - let variant_prov = - match item.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { - node: rt, - .. - }) => compute_variant_provenance( - body.clone(), - rt.clone(), - &item.params.clone(), - &type_env, - acc.clone(), - ), - _ => v2_rt::rc_empty_map::< - String, - Rc< - HashMap< - String, - Rc< - HashMap< - String, - Rc, - >, - >, - >, - >, - >( - ), - }; - let has_scalar = - ((provenance.clone().len() as i64) > 0); - let has_variant = - ((Rc::new(v2_rt::map_keys(&variant_prov)).len() - as i64) - > 0); - if (has_scalar.clone() || has_variant.clone()) { - match v2_rt::map_get(&acc, fn_name.clone()) { - Some(sig) => v2_rt::rc_map_insert( - acc.clone(), - fn_name.clone(), - Rc::new(ResolvedFuncSig { - name: sig.name.clone(), - params: sig.params.clone(), - inferred: sig.inferred.clone(), - is_async: sig.is_async.clone(), - output_provenance: if has_scalar.clone() - { - provenance.clone() - } else { - sig.output_provenance.clone() - }, - variant_provenance: if has_variant - .clone() - { - variant_prov.clone() - } else { - sig.variant_provenance.clone() - }, - }), - ), - None => acc.clone(), - } - } else { - acc.clone() - } - } - } else { - acc.clone() - } - } - None => acc.clone(), - } + acc.clone() } - } +}, + None => acc.clone(), +} } else { - acc.clone() + match item.body.clone() { + Some(body) => if !expr_has_self_call(&body, &fn_name, &type_env.source_indices.clone()) { + { + let provenance = infer_output_provenance(&body, &item.params.clone(), &type_env, locals.clone(), &acc); +let variant_prov = match item.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => compute_variant_provenance(body.clone(), rt.clone(), &item.params.clone(), &type_env, acc.clone()), + _ => v2_rt::rc_empty_map::>>>>>(), +}; +let has_scalar = ((provenance.clone().len() as i64) > 0); +let has_variant = ((Rc::new(v2_rt::map_keys(&variant_prov)).len() as i64) > 0); +if (has_scalar.clone() || has_variant.clone()) { + match v2_rt::map_get(&acc, fn_name.clone()) { + Some(sig) => v2_rt::rc_map_insert(acc.clone(), fn_name.clone(), Rc::new(ResolvedFuncSig { + name: sig.name.clone(), + params: sig.params.clone(), + inferred: sig.inferred.clone(), + is_async: sig.is_async.clone(), + output_provenance: if has_scalar.clone() { + provenance.clone() + } else { + sig.output_provenance.clone() + }, + variant_provenance: if has_variant.clone() { + variant_prov.clone() + } else { + sig.variant_provenance.clone() + }, +})), + None => acc.clone(), +} + } else { + acc.clone() + } +} + } else { + acc.clone() + }, + None => acc.clone(), +} } - }, - ); - Rc::new(ResolvedFuncEnv { - signatures: updated_sigs, - }) - } +} + } else { + acc.clone() + }); +Rc::new(ResolvedFuncEnv { + signatures: updated_sigs, +}) +} } -pub fn annotate_descent_evidence( - body: Rc, - fn_name: String, - params: &Rc>>, - type_env: &Rc, - scope_locals: Rc>>, - func_sigs: Rc>>, -) -> Rc { +pub fn annotate_descent_evidence(body: Rc, fn_name: String, params: &Rc>>, type_env: &Rc, scope_locals: Rc>>, func_sigs: Rc>>) -> Rc { { - let param_name_map = params.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, p: Rc| { - let pname = param_node_name_at(p.clone(), type_env.source_indices.clone()); - let ptype = resolved_type_name(&p, type_env.source_indices.clone()); - v2_rt::rc_map_insert(acc, pname.clone(), ptype.clone()) - }, - ); - let param_order_list = Rc::new({ - let mut __result = Vec::new(); - for p in params.clone().iter().cloned() { - __result.push(param_node_name_at( - p.clone(), - type_env.source_indices.clone(), - )); - } - __result - }); - let ctx = Rc::new(DescentContext { - fn_name: fn_name, - param_names: param_name_map, - param_order: param_order_list, - type_env: type_env.clone(), - sub_value_vars: v2_rt::rc_empty_map::>(), - size_aliases: v2_rt::rc_empty_map::>(), - scope_locals: scope_locals, - func_sigs: func_sigs, - per_field_vars: v2_rt::rc_empty_map::>>>( - ), - }); - annotate_descent(&body, &ctx) - } + let param_name_map = params.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, p: Rc| { + let pname = param_node_name_at(p.clone(), type_env.source_indices.clone()); +let ptype = resolved_type_name(&p, type_env.source_indices.clone()); +v2_rt::rc_map_insert(acc, pname.clone(), ptype.clone()) +}); +let param_order_list = Rc::new({ let mut __result = Vec::new(); for p in params.clone().iter().cloned() { __result.push(param_node_name_at(p.clone(), type_env.source_indices.clone())); } __result }); +let ctx = Rc::new(DescentContext { + fn_name: fn_name, + param_names: param_name_map, + param_order: param_order_list, + type_env: type_env.clone(), + sub_value_vars: v2_rt::rc_empty_map::>(), + size_aliases: v2_rt::rc_empty_map::>(), + scope_locals: scope_locals, + func_sigs: func_sigs, + per_field_vars: v2_rt::rc_empty_map::>>>(), +}); +annotate_descent(&body, &ctx) +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -8983,1938 +5172,1146 @@ pub struct InferTransportResult { pub diagnostics: Rc>>, } -pub fn infer_property_values( - props: Rc>>, - scope: Rc, -) -> Rc { +pub fn infer_property_values(props: Rc>>, scope: Rc) -> Rc { { - let results = Rc::new({ - let mut __result = Vec::new(); - for p in props.iter().cloned() { - __result.push({ - let val = field_init_node_value(&p); - let val_result = infer_expr(&val, &scope, &None); - ( - Rc::new(Node { - name: p.name.clone(), - span: p.span.clone(), - ident_span: p.ident_span.clone(), - children: Rc::new(vec![val_result.typed.clone()]), - connective: p.connective.clone(), - params: p.params.clone(), - inferred: p.inferred.clone(), - return_cardinality: p.return_cardinality.clone(), - uses: p.uses.clone(), - body: p.body.clone(), - transport: p.transport.clone(), - properties: p.properties.clone(), - type_annotation: p.type_annotation.clone(), - is_self_recursive: p.is_self_recursive.clone(), - has_non_tail_self_call: p.has_non_tail_self_call.clone(), - match_pattern: p.match_pattern.clone(), - expr_data: p.expr_data.clone(), - ident: None, - }), - val_result.diagnostics.clone(), - ) - }); - } - __result - }); - Rc::new(InferPropertiesResult { - props: Rc::new({ - let mut __result = Vec::new(); - for r in results.clone().iter().cloned() { - __result.push(r.0.clone()); - } - __result - }), - diagnostics: Rc::new({ - let mut __result = Vec::new(); - for r in results.clone().iter().cloned() { - __result.extend((*r.1.clone()).iter().cloned()); - } - __result - }), - }) - } + let results = Rc::new({ let mut __result = Vec::new(); for p in props.iter().cloned() { __result.push({ + let val = field_init_node_value(&p); +let val_result = infer_expr(&val, &scope, &None); +(Rc::new(Node { + name: p.name.clone(), + span: p.span.clone(), + ident_span: p.ident_span.clone(), + children: Rc::new(vec![val_result.typed.clone()]), + connective: p.connective.clone(), + params: p.params.clone(), + inferred: p.inferred.clone(), + return_cardinality: p.return_cardinality.clone(), + uses: p.uses.clone(), + body: p.body.clone(), + transport: p.transport.clone(), + properties: p.properties.clone(), + type_annotation: p.type_annotation.clone(), + is_self_recursive: p.is_self_recursive.clone(), + has_non_tail_self_call: p.has_non_tail_self_call.clone(), + match_pattern: p.match_pattern.clone(), + expr_data: p.expr_data.clone(), + ident: None, +}), val_result.diagnostics.clone()) +}); } __result }); +Rc::new(InferPropertiesResult { + props: Rc::new({ let mut __result = Vec::new(); for r in results.clone().iter().cloned() { __result.push(r.0.clone()); } __result }), + diagnostics: Rc::new({ let mut __result = Vec::new(); for r in results.clone().iter().cloned() { __result.extend((*r.1.clone()).iter().cloned()); } __result }), +}) +} } -pub fn infer_auth_source_properties( - props: Rc>>, - scope: Rc, -) -> Rc { +pub fn infer_auth_source_properties(props: Rc>>, scope: Rc) -> Rc { { - let results = Rc::new({ - let mut __result = Vec::new(); - for p in props.iter().cloned() { - __result.push( - if (field_init_node_name_at( - p.clone(), - scope.type_env.clone().source_indices.clone(), - ) - .as_str() - == "svc_auth_source".to_string().as_str()) - { - { - let val = field_init_node_value(&p); - let val_result = infer_expr(&val, &scope, &None); - ( - Rc::new(Node { - name: p.name.clone(), - span: p.span.clone(), - ident_span: p.ident_span.clone(), - children: Rc::new(vec![val_result.typed.clone()]), - connective: p.connective.clone(), - params: p.params.clone(), - inferred: p.inferred.clone(), - return_cardinality: p.return_cardinality.clone(), - uses: p.uses.clone(), - body: p.body.clone(), - transport: p.transport.clone(), - properties: p.properties.clone(), - type_annotation: p.type_annotation.clone(), - is_self_recursive: p.is_self_recursive.clone(), - has_non_tail_self_call: p.has_non_tail_self_call.clone(), - match_pattern: p.match_pattern.clone(), - expr_data: p.expr_data.clone(), - ident: None, - }), - val_result.diagnostics.clone(), - ) - } - } else { - (p.clone(), Rc::new(vec![])) - }, - ); - } - __result - }); - Rc::new(InferPropertiesResult { - props: Rc::new({ - let mut __result = Vec::new(); - for r in results.clone().iter().cloned() { - __result.push(r.0.clone()); - } - __result - }), - diagnostics: Rc::new({ - let mut __result = Vec::new(); - for r in results.clone().iter().cloned() { - __result.extend((*r.1.clone()).iter().cloned()); - } - __result - }), - }) - } + let results = Rc::new({ let mut __result = Vec::new(); for p in props.iter().cloned() { __result.push(if (field_init_node_name_at(p.clone(), scope.type_env.clone().source_indices.clone()).as_str() == "svc_auth_source".to_string().as_str()) { + { + let val = field_init_node_value(&p); +let val_result = infer_expr(&val, &scope, &None); +(Rc::new(Node { + name: p.name.clone(), + span: p.span.clone(), + ident_span: p.ident_span.clone(), + children: Rc::new(vec![val_result.typed.clone()]), + connective: p.connective.clone(), + params: p.params.clone(), + inferred: p.inferred.clone(), + return_cardinality: p.return_cardinality.clone(), + uses: p.uses.clone(), + body: p.body.clone(), + transport: p.transport.clone(), + properties: p.properties.clone(), + type_annotation: p.type_annotation.clone(), + is_self_recursive: p.is_self_recursive.clone(), + has_non_tail_self_call: p.has_non_tail_self_call.clone(), + match_pattern: p.match_pattern.clone(), + expr_data: p.expr_data.clone(), + ident: None, +}), val_result.diagnostics.clone()) +} + } else { + (p.clone(), Rc::new(vec![])) + }); } __result }); +Rc::new(InferPropertiesResult { + props: Rc::new({ let mut __result = Vec::new(); for r in results.clone().iter().cloned() { __result.push(r.0.clone()); } __result }), + diagnostics: Rc::new({ let mut __result = Vec::new(); for r in results.clone().iter().cloned() { __result.extend((*r.1.clone()).iter().cloned()); } __result }), +}) } - -pub fn infer_transport_node( - transport: Option>, - scope: Rc, -) -> Rc { - match transport { - None => Rc::new(InferTransportResult { - transport: None, - diagnostics: Rc::new(vec![]), - }), - Some(t) => { - let prop_result = infer_property_values(t.properties.clone(), scope); - Rc::new(InferTransportResult { - transport: Some(Rc::new(Node { - name: t.name.clone(), - span: t.span.clone(), - ident_span: t.ident_span.clone(), - children: t.children.clone(), - connective: t.connective.clone(), - params: t.params.clone(), - inferred: t.inferred.clone(), - return_cardinality: t.return_cardinality.clone(), - uses: t.uses.clone(), - body: t.body.clone(), - transport: t.transport.clone(), - properties: prop_result.props.clone(), - type_annotation: t.type_annotation.clone(), - is_self_recursive: t.is_self_recursive.clone(), - has_non_tail_self_call: t.has_non_tail_self_call.clone(), - match_pattern: t.match_pattern.clone(), - expr_data: t.expr_data.clone(), - ident: None, - })), - diagnostics: prop_result.diagnostics.clone(), - }) - } - } } -pub fn infer_item(item: &Rc, scope: &Rc) -> Rc { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let typed_anno = item.type_annotation.clone(); - let transport_scope = if ((item.params.clone().len() as i64) > 0) { - build_params_scope(&scope, item.params.clone()) - } else { - scope.clone() - }; - let transport_result = infer_transport_node(item.transport.clone(), transport_scope); - let typed_transport = transport_result.transport.clone(); - let transport_diags = transport_result.diagnostics.clone(); - let props_result = infer_auth_source_properties(item.properties.clone(), scope.clone()); - let typed_properties = props_result.props.clone(); - let props_diags = props_result.diagnostics.clone(); - if ((item.connective.clone() != Connective::NoConnective) - && (item.transport.clone() == None)) - { - Rc::new(TypedItemResult { - item: Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: Rc::new({ - let mut __result = Vec::new(); - for c in item.children.clone().iter().cloned() { - __result.push(infer_item(&c, &scope).item.clone()); - } - __result - }), - params: item.params.clone(), - inferred: Some(Rc::new(InferredNode::Resolved { node: unit_type() })), - return_cardinality: item.return_cardinality.clone(), - uses: item.uses.clone(), - body: None, - connective: item.connective.clone(), - transport: typed_transport, - properties: typed_properties, - type_annotation: typed_anno, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - diagnostics: v2_rt::concat(transport_diags, props_diags), - }) - } else { - if ((item.body.clone() != None) && ((item.params.clone().len() as i64) > 0)) { - { - let fn_scope = build_params_scope(&scope, item.params.clone()); - let fn_scope = item.uses.clone().iter().cloned().fold( - fn_scope.clone(), - |s: Rc, u: Rc| { - extend_scope( - &s, - &resource_use_name_at( - u.clone(), - scope.type_env.clone().source_indices.clone(), - ), - resource_use_resource(&u), - Rc::new(SubValueRelation::SubValueUnknown), - ) - }, - ); - let fn_return_expected = if (item.inferred.clone() != None) { - Some(resolved_type(item.clone())) - } else { - None - }; - let body_result = infer_expr( - &item.body.clone().clone().unwrap(), - &fn_scope, - &fn_return_expected, - ); - let body_typed = body_result.typed.clone(); - let body_diags = body_result.diagnostics.clone(); - let inferred_ret = if (item.inferred.clone() != None) { - item.inferred.clone() - } else { - body_typed.inferred.clone() - }; - let is_recursive = expr_has_self_call( - &body_typed, - &authored_name_at(scope.type_env.clone().source_indices.clone(), &item), - &scope.type_env.clone().source_indices.clone(), - ); - let annotated_body = if is_recursive.clone() { - annotate_descent_evidence( - body_typed.clone(), - authored_name_at(scope.type_env.clone().source_indices.clone(), &item), - &item.params.clone(), - &scope.type_env.clone(), - fn_scope.locals.clone(), - scope.func_env.clone().signatures.clone(), - ) - } else { - body_typed.clone() - }; - Rc::new(TypedItemResult { - item: Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: Rc::new({ - let mut __result = Vec::new(); - for c in item.children.clone().iter().cloned() { - __result.push(infer_item(&c, &scope).item.clone()); - } - __result - }), - params: item.params.clone(), - inferred: inferred_ret, - return_cardinality: item.return_cardinality.clone(), - uses: item.uses.clone(), - body: Some(annotated_body), - connective: Connective::NoConnective, - transport: typed_transport, - properties: typed_properties, - type_annotation: typed_anno, - is_self_recursive: is_recursive.clone(), - has_non_tail_self_call: expr_has_non_tail_self_call( - &body_typed, - &authored_name_at( - scope.type_env.clone().source_indices.clone(), - &item, - ), - true, - &scope.type_env.clone().source_indices.clone(), - ), - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - diagnostics: v2_rt::concat( - v2_rt::concat(transport_diags, props_diags), - body_diags, - ), - }) - } +pub fn infer_transport_node(transport: Option>, scope: Rc) -> Rc { + match transport { + None => Rc::new(InferTransportResult { + transport: None, + diagnostics: Rc::new(vec![]), +}), + Some(t) => { + let prop_result = infer_property_values(t.properties.clone(), scope); +Rc::new(InferTransportResult { + transport: Some(Rc::new(Node { + name: t.name.clone(), + span: t.span.clone(), + ident_span: t.ident_span.clone(), + children: t.children.clone(), + connective: t.connective.clone(), + params: t.params.clone(), + inferred: t.inferred.clone(), + return_cardinality: t.return_cardinality.clone(), + uses: t.uses.clone(), + body: t.body.clone(), + transport: t.transport.clone(), + properties: prop_result.props.clone(), + type_annotation: t.type_annotation.clone(), + is_self_recursive: t.is_self_recursive.clone(), + has_non_tail_self_call: t.has_non_tail_self_call.clone(), + match_pattern: t.match_pattern.clone(), + expr_data: t.expr_data.clone(), + ident: None, +})), + diagnostics: prop_result.diagnostics.clone(), +}) +}, +} +} + +pub fn infer_item(item: &Rc, scope: &Rc) -> Rc { + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { + { + let typed_anno = item.type_annotation.clone(); +let transport_scope = if ((item.params.clone().len() as i64) > 0) { + build_params_scope(&scope, item.params.clone()) } else { - if (((item.body.clone() != None) && ((item.params.clone().len() as i64) == 0)) - && (item.inferred.clone() != None)) - { + scope.clone() + }; +let transport_result = infer_transport_node(item.transport.clone(), transport_scope); +let typed_transport = transport_result.transport.clone(); +let transport_diags = transport_result.diagnostics.clone(); +let props_result = infer_auth_source_properties(item.properties.clone(), scope.clone()); +let typed_properties = props_result.props.clone(); +let props_diags = props_result.diagnostics.clone(); +if ((item.connective.clone() != Connective::NoConnective) && (item.transport.clone() == None)) { + Rc::new(TypedItemResult { + item: Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: Rc::new({ let mut __result = Vec::new(); for c in item.children.clone().iter().cloned() { __result.push(infer_item(&c, &scope).item.clone()); } __result }), + params: item.params.clone(), + inferred: Some(Rc::new(InferredNode::Resolved { + node: unit_type(), +})), + return_cardinality: item.return_cardinality.clone(), + uses: item.uses.clone(), + body: None, + connective: item.connective.clone(), + transport: typed_transport, + properties: typed_properties, + type_annotation: typed_anno, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), + diagnostics: v2_rt::concat(transport_diags, props_diags), +}) + } else { + if ((item.body.clone() != None) && ((item.params.clone().len() as i64) > 0)) { { - let fn_scope = scope.clone(); - let body_result = infer_expr( - &item.body.clone().clone().unwrap(), - &fn_scope, - &Some(resolved_type(item.clone())), - ); - let body_typed = body_result.typed.clone(); - let body_diags = body_result.diagnostics.clone(); - Rc::new(TypedItemResult { - item: Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: item.inferred.clone(), - return_cardinality: item.return_cardinality.clone(), - uses: Rc::new(vec![]), - body: Some(body_typed.clone()), - connective: Connective::NoConnective, - transport: typed_transport, - properties: typed_properties, - type_annotation: typed_anno, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - diagnostics: v2_rt::concat( - v2_rt::concat(transport_diags, props_diags), - body_diags, - ), - }) - } + let fn_scope = build_params_scope(&scope, item.params.clone()); +let fn_scope = item.uses.clone().iter().cloned().fold(fn_scope.clone(), |s: Rc, u: Rc| extend_scope(&s, &resource_use_name_at(u.clone(), scope.type_env.clone().source_indices.clone()), resource_use_resource(&u), Rc::new(SubValueRelation::SubValueUnknown))); +let fn_return_expected = if (item.inferred.clone() != None) { + Some(resolved_type(item.clone())) + } else { + None + }; +let body_result = infer_expr(&item.body.clone().clone().unwrap(), &fn_scope, &fn_return_expected); +let body_typed = body_result.typed.clone(); +let body_diags = body_result.diagnostics.clone(); +let inferred_ret = if (item.inferred.clone() != None) { + item.inferred.clone() + } else { + body_typed.inferred.clone() + }; +let is_recursive = expr_has_self_call(&body_typed, &authored_name_at(scope.type_env.clone().source_indices.clone(), &item), &scope.type_env.clone().source_indices.clone()); +let annotated_body = if is_recursive.clone() { + annotate_descent_evidence(body_typed.clone(), authored_name_at(scope.type_env.clone().source_indices.clone(), &item), &item.params.clone(), &scope.type_env.clone(), fn_scope.locals.clone(), scope.func_env.clone().signatures.clone()) + } else { + body_typed.clone() + }; +Rc::new(TypedItemResult { + item: Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: Rc::new({ let mut __result = Vec::new(); for c in item.children.clone().iter().cloned() { __result.push(infer_item(&c, &scope).item.clone()); } __result }), + params: item.params.clone(), + inferred: inferred_ret, + return_cardinality: item.return_cardinality.clone(), + uses: item.uses.clone(), + body: Some(annotated_body), + connective: Connective::NoConnective, + transport: typed_transport, + properties: typed_properties, + type_annotation: typed_anno, + is_self_recursive: is_recursive.clone(), + has_non_tail_self_call: expr_has_non_tail_self_call(&body_typed, &authored_name_at(scope.type_env.clone().source_indices.clone(), &item), true, &scope.type_env.clone().source_indices.clone()), + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), + diagnostics: v2_rt::concat(v2_rt::concat(transport_diags, props_diags), body_diags), +}) +} } else { - if ((item.body.clone() != None) && ((item.params.clone().len() as i64) == 0)) { + if (((item.body.clone() != None) && ((item.params.clone().len() as i64) == 0)) && (item.inferred.clone() != None)) { { - let data_expected = if (item.type_annotation.clone() != None) { - Some(item.type_annotation.clone().clone().unwrap()) - } else { - None - }; - let val_result = infer_expr( - &item.body.clone().clone().unwrap(), - &scope, - &data_expected, - ); - let val_typed = val_result.typed.clone(); - let val_diags = val_result.diagnostics.clone(); - let inferred_ret = if (item.type_annotation.clone() != None) { - Some(Rc::new(InferredNode::Resolved { - node: item.type_annotation.clone().clone().unwrap(), - })) - } else { - val_typed.inferred.clone() - }; - Rc::new(TypedItemResult { - item: Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: inferred_ret, - return_cardinality: item.return_cardinality.clone(), - uses: Rc::new(vec![]), - body: Some(val_typed.clone()), - connective: Connective::NoConnective, - transport: typed_transport, - properties: typed_properties, - type_annotation: typed_anno, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - diagnostics: v2_rt::concat( - v2_rt::concat(transport_diags, props_diags), - val_diags, - ), - }) - } + let fn_scope = scope.clone(); +let body_result = infer_expr(&item.body.clone().clone().unwrap(), &fn_scope, &Some(resolved_type(item.clone()))); +let body_typed = body_result.typed.clone(); +let body_diags = body_result.diagnostics.clone(); +Rc::new(TypedItemResult { + item: Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: item.inferred.clone(), + return_cardinality: item.return_cardinality.clone(), + uses: Rc::new(vec![]), + body: Some(body_typed.clone()), + connective: Connective::NoConnective, + transport: typed_transport, + properties: typed_properties, + type_annotation: typed_anno, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), + diagnostics: v2_rt::concat(v2_rt::concat(transport_diags, props_diags), body_diags), +}) +} } else { - if (((item.params.clone().len() as i64) > 0) && (item.body.clone() == None)) - { - Rc::new(TypedItemResult { - item: Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: Rc::new({ - let mut __result = Vec::new(); - for c in item.children.clone().iter().cloned() { - __result.push(infer_item(&c, &scope).item.clone()); - } - __result - }), - params: item.params.clone(), - inferred: if (item.inferred.clone() != None) { - item.inferred.clone() - } else { - Some(Rc::new(InferredNode::Resolved { node: unit_type() })) - }, - return_cardinality: item.return_cardinality.clone(), - uses: item.uses.clone(), - body: None, - connective: Connective::NoConnective, - transport: typed_transport, - properties: typed_properties, - type_annotation: typed_anno, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - diagnostics: v2_rt::concat(transport_diags, props_diags), - }) + if ((item.body.clone() != None) && ((item.params.clone().len() as i64) == 0)) { + { + let data_expected = if (item.type_annotation.clone() != None) { + Some(item.type_annotation.clone().clone().unwrap()) + } else { + None + }; +let val_result = infer_expr(&item.body.clone().clone().unwrap(), &scope, &data_expected); +let val_typed = val_result.typed.clone(); +let val_diags = val_result.diagnostics.clone(); +let inferred_ret = if (item.type_annotation.clone() != None) { + Some(Rc::new(InferredNode::Resolved { + node: item.type_annotation.clone().clone().unwrap(), +})) + } else { + val_typed.inferred.clone() + }; +Rc::new(TypedItemResult { + item: Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: inferred_ret, + return_cardinality: item.return_cardinality.clone(), + uses: Rc::new(vec![]), + body: Some(val_typed.clone()), + connective: Connective::NoConnective, + transport: typed_transport, + properties: typed_properties, + type_annotation: typed_anno, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), + diagnostics: v2_rt::concat(v2_rt::concat(transport_diags, props_diags), val_diags), +}) +} } else { - Rc::new(TypedItemResult { - item: Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: Rc::new({ - let mut __result = Vec::new(); - for c in item.children.clone().iter().cloned() { - __result.push(infer_item(&c, &scope).item.clone()); - } - __result - }), - params: item.params.clone(), - inferred: if (item.inferred.clone() != None) { - item.inferred.clone() - } else { - Some(Rc::new(InferredNode::Resolved { node: unit_type() })) - }, - return_cardinality: item.return_cardinality.clone(), - uses: item.uses.clone(), - body: None, - connective: item.connective.clone(), - transport: typed_transport, - properties: typed_properties, - type_annotation: typed_anno, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - diagnostics: v2_rt::concat(transport_diags, props_diags), - }) + if (((item.params.clone().len() as i64) > 0) && (item.body.clone() == None)) { + Rc::new(TypedItemResult { + item: Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: Rc::new({ let mut __result = Vec::new(); for c in item.children.clone().iter().cloned() { __result.push(infer_item(&c, &scope).item.clone()); } __result }), + params: item.params.clone(), + inferred: if (item.inferred.clone() != None) { + item.inferred.clone() + } else { + Some(Rc::new(InferredNode::Resolved { + node: unit_type(), +})) + }, + return_cardinality: item.return_cardinality.clone(), + uses: item.uses.clone(), + body: None, + connective: Connective::NoConnective, + transport: typed_transport, + properties: typed_properties, + type_annotation: typed_anno, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), + diagnostics: v2_rt::concat(transport_diags, props_diags), +}) + } else { + Rc::new(TypedItemResult { + item: Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: Rc::new({ let mut __result = Vec::new(); for c in item.children.clone().iter().cloned() { __result.push(infer_item(&c, &scope).item.clone()); } __result }), + params: item.params.clone(), + inferred: if (item.inferred.clone() != None) { + item.inferred.clone() + } else { + Some(Rc::new(InferredNode::Resolved { + node: unit_type(), +})) + }, + return_cardinality: item.return_cardinality.clone(), + uses: item.uses.clone(), + body: None, + connective: item.connective.clone(), + transport: typed_transport, + properties: typed_properties, + type_annotation: typed_anno, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), + diagnostics: v2_rt::concat(transport_diags, props_diags), +}) + } } } } } - } +} }) } -pub fn infer_items( - items: Rc>>, - scope: Rc, -) -> Rc>> { - Rc::new({ - let mut __result = Vec::new(); - for item in items.iter().cloned() { - __result.push(infer_item(&item, &scope)); - } - __result - }) +pub fn infer_items(items: Rc>>, scope: Rc) -> Rc>> { + Rc::new({ let mut __result = Vec::new(); for item in items.iter().cloned() { __result.push(infer_item(&item, &scope)); } __result }) } pub fn is_type_variable_name(name: &String) -> bool { - (((((name.clone().as_str() == "T".to_string().as_str()) - || (name.clone().as_str() == "K".to_string().as_str())) - || (name.clone().as_str() == "V".to_string().as_str())) - || (name.clone().as_str() == "MappedElement".to_string().as_str())) - || (name.clone().as_str() == "FoldAccumulator".to_string().as_str())) -} - -pub fn collect_parent_bindings_filtered( - envs: Rc>>, -) -> Rc>> { - envs.iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, env: Rc| { - Rc::new(v2_rt::map_keys(&env.bindings.clone())) - .iter() - .cloned() - .fold( - acc, - |bacc: Rc>>, ident: i64| { - let name = intern_str(env.intern_table.clone(), ident.clone()); - if is_type_variable_name(&name) { - bacc.clone() - } else { - match v2_rt::map_get(&env.bindings.clone(), ident.clone()) { - Some(binding) => v2_rt::rc_map_insert( - bacc.clone(), - ident.clone(), - binding.clone(), - ), - None => bacc.clone(), - } - } - }, - ) - }, - ) + (((((name.clone().as_str() == "T".to_string().as_str()) || (name.clone().as_str() == "K".to_string().as_str())) || (name.clone().as_str() == "V".to_string().as_str())) || (name.clone().as_str() == "MappedElement".to_string().as_str())) || (name.clone().as_str() == "FoldAccumulator".to_string().as_str())) +} + +pub fn collect_parent_bindings_filtered(envs: Rc>>) -> Rc>> { + envs.iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, env: Rc| Rc::new(v2_rt::map_keys(&env.bindings.clone())).iter().cloned().fold(acc, |bacc: Rc>>, ident: i64| { + let name = intern_str(env.intern_table.clone(), ident.clone()); +if is_type_variable_name(&name) { + bacc.clone() + } else { + match v2_rt::map_get(&env.bindings.clone(), ident.clone()) { + Some(binding) => v2_rt::rc_map_insert(bacc.clone(), ident.clone(), binding.clone()), + None => bacc.clone(), +} + } +})) } pub fn kernel_span(name: &String) -> Rc { Rc::new(SourceSpan { - file: v2_rt::concat( - v2_rt::concat("".to_string(), - ), - start: 0, - end: v2_rt::string_length(&name), - }) + file: v2_rt::concat(v2_rt::concat("".to_string()), + start: 0, + end: v2_rt::string_length(&name), +}) } -pub fn build_type_env( - module: &Rc, - parent_index: &Rc>>, - source_indices: &Rc>>, - intern_table: &Rc, -) -> Rc { +pub fn build_type_env(module: &Rc, parent_index: &Rc>>, source_indices: &Rc>>, intern_table: &Rc) -> Rc { { - let source_indices = Rc::new(v2_rt::map_keys(&kernel_type_set())) - .iter() - .cloned() - .fold( - source_indices.clone(), - |acc: Rc>>, name: String| { - v2_rt::rc_map_insert( - acc, - v2_rt::concat( - v2_rt::concat("".to_string(), - ), - build_newline_index( - v2_rt::concat( - v2_rt::concat("".to_string(), - ), - &name, - ), - ) - }, - ); - let source_indices = Rc::new(vec![ - "Optional".to_string(), - "Some".to_string(), - "None".to_string(), - "value".to_string(), - "none".to_string(), - ]) - .iter() - .cloned() - .fold( - source_indices.clone(), - |acc: Rc>>, name: String| { - v2_rt::rc_map_insert( - acc, - v2_rt::concat( - v2_rt::concat("".to_string(), - ), - build_newline_index( - v2_rt::concat( - v2_rt::concat("".to_string(), - ), - &name, - ), - ) - }, - ); - let intern_table = Rc::new(v2_rt::map_keys(&kernel_type_set())) - .iter() - .cloned() - .fold(intern_table.clone(), |t: Rc, name: String| { - intern(&t, &name).table.clone() - }); - let intern_table = Rc::new(vec![ - "Optional".to_string(), - "Some".to_string(), - "None".to_string(), - "value".to_string(), - "none".to_string(), - ]) - .iter() - .cloned() - .fold(intern_table.clone(), |t: Rc, name: String| { - intern(&t, &name).table.clone() - }); - let intern_table = Rc::new(v2_rt::map_keys(&compiler_recursive_types())) - .iter() - .cloned() - .fold(intern_table.clone(), |t: Rc, name: String| { - intern(&t, &name).table.clone() - }); - let kernel_bindings_base = Rc::new(v2_rt::map_keys(&kernel_type_set())) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, name: String| { - v2_rt::rc_map_insert( - acc, - intern(&intern_table, &name).id.clone(), - Rc::new(TypeBinding { - name: name.clone(), - resolved: Rc::new(Node { - name: name.clone(), - span: kernel_span(&name), - ident_span: Some(kernel_span(&name)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - provenance: Rc::new(SubValueRelation::SubValueUnknown), - }), - ) - }, - ); - let unit_span = kernel_span(&"Unit".to_string()); - let kernel_bindings = v2_rt::rc_map_insert( - kernel_bindings_base, - intern(&intern_table, &"Unit".to_string()).id.clone(), - Rc::new(TypeBinding { - name: "Unit".to_string(), - resolved: Rc::new(Node { - name: "Unit".to_string(), - span: unit_span.clone(), - ident_span: Some(unit_span.clone()), - children: Rc::new(vec![]), - connective: Connective::Conj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - provenance: Rc::new(SubValueRelation::SubValueUnknown), - }), - ); - let some_value_field = Rc::new(Node { - name: "value".to_string(), - span: kernel_span(&"value".to_string()), - ident_span: Some(kernel_span(&"value".to_string())), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::TypeVariable { - id: "some_value".to_string(), - })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let some_variant = Rc::new(Node { - name: "Some".to_string(), - span: kernel_span(&"Some".to_string()), - ident_span: Some(kernel_span(&"Some".to_string())), - children: Rc::new(vec![some_value_field]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let kernel_optional = Rc::new(Node { - name: "Optional".to_string(), - span: kernel_span(&"Optional".to_string()), - ident_span: Some(kernel_span(&"Optional".to_string())), - children: Rc::new(vec![some_variant, none_type()]), - connective: Connective::Disj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let kernel_bindings = v2_rt::rc_map_insert( - kernel_bindings.clone(), - intern(&intern_table, &"Optional".to_string()).id.clone(), - Rc::new(TypeBinding { - name: "Optional".to_string(), - resolved: kernel_optional, - provenance: Rc::new(SubValueRelation::SubValueUnknown), - }), - ); - let node_fields = inductive_fields_list_to_map(compiler_inductive_fields()); - let kernel_recursive_types = Rc::new({ - let mut __result = Vec::new(); - for name in Rc::new(v2_rt::map_keys(&compiler_recursive_types())) - .iter() - .cloned() - { - __result.push(intern(&intern_table, &name).id.clone()); - } - __result - }); - let kernel_recursive_type_set = Rc::new(v2_rt::map_keys(&compiler_recursive_types())) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, name: String| { - v2_rt::rc_map_insert(acc, intern(&intern_table, &name).id.clone(), true) - }, - ); - let kernel = Rc::new(TypeEnv { - bindings: kernel_bindings.clone(), - recursive_types: kernel_recursive_types, - recursive_type_set: kernel_recursive_type_set, - inductive_fields: node_fields, - source_indices: source_indices.clone(), - intern_table: intern_table.clone(), - }); - let imports_std_types = { - let mut __found = false; - for imp in module.resolved_imports.clone().iter().cloned() { - if (imp.module_path.clone().as_str() == "std.types".to_string().as_str()) { - __found = true; - break; - } - } - __found - }; - let module_name_str = authored_name_at(source_indices.clone(), &module.module.clone()); - let std_types_parent_env = if ((module_name_str.clone().as_str() - != "std.types".to_string().as_str()) - && (imports_std_types == false)) - { + let source_indices = Rc::new(v2_rt::map_keys(&kernel_type_set())).iter().cloned().fold(source_indices.clone(), |acc: Rc>>, name: String| v2_rt::rc_map_insert(acc, v2_rt::concat(v2_rt::concat("".to_string()), build_newline_index(v2_rt::concat(v2_rt::concat("".to_string()), &name))); +let source_indices = Rc::new(vec!["Optional".to_string(), "Some".to_string(), "None".to_string(), "value".to_string(), "none".to_string()]).iter().cloned().fold(source_indices.clone(), |acc: Rc>>, name: String| v2_rt::rc_map_insert(acc, v2_rt::concat(v2_rt::concat("".to_string()), build_newline_index(v2_rt::concat(v2_rt::concat("".to_string()), &name))); +let intern_table = Rc::new(v2_rt::map_keys(&kernel_type_set())).iter().cloned().fold(intern_table.clone(), |t: Rc, name: String| intern(&t, &name).table.clone()); +let intern_table = Rc::new(vec!["Optional".to_string(), "Some".to_string(), "None".to_string(), "value".to_string(), "none".to_string()]).iter().cloned().fold(intern_table.clone(), |t: Rc, name: String| intern(&t, &name).table.clone()); +let intern_table = Rc::new(v2_rt::map_keys(&compiler_recursive_types())).iter().cloned().fold(intern_table.clone(), |t: Rc, name: String| intern(&t, &name).table.clone()); +let kernel_bindings_base = Rc::new(v2_rt::map_keys(&kernel_type_set())).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, name: String| v2_rt::rc_map_insert(acc, intern(&intern_table, &name).id.clone(), Rc::new(TypeBinding { + name: name.clone(), + resolved: Rc::new(Node { + name: name.clone(), + span: kernel_span(&name), + ident_span: Some(kernel_span(&name)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), + provenance: Rc::new(SubValueRelation::SubValueUnknown), +}))); +let unit_span = kernel_span(&"Unit".to_string()); +let kernel_bindings = v2_rt::rc_map_insert(kernel_bindings_base, intern(&intern_table, &"Unit".to_string()).id.clone(), Rc::new(TypeBinding { + name: "Unit".to_string(), + resolved: Rc::new(Node { + name: "Unit".to_string(), + span: unit_span.clone(), + ident_span: Some(unit_span.clone()), + children: Rc::new(vec![]), + connective: Connective::Conj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), + provenance: Rc::new(SubValueRelation::SubValueUnknown), +})); +let some_value_field = Rc::new(Node { + name: "value".to_string(), + span: kernel_span(&"value".to_string()), + ident_span: Some(kernel_span(&"value".to_string())), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::TypeVariable { + id: "some_value".to_string(), +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let some_variant = Rc::new(Node { + name: "Some".to_string(), + span: kernel_span(&"Some".to_string()), + ident_span: Some(kernel_span(&"Some".to_string())), + children: Rc::new(vec![some_value_field]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let kernel_optional = Rc::new(Node { + name: "Optional".to_string(), + span: kernel_span(&"Optional".to_string()), + ident_span: Some(kernel_span(&"Optional".to_string())), + children: Rc::new(vec![some_variant, none_type()]), + connective: Connective::Disj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let kernel_bindings = v2_rt::rc_map_insert(kernel_bindings.clone(), intern(&intern_table, &"Optional".to_string()).id.clone(), Rc::new(TypeBinding { + name: "Optional".to_string(), + resolved: kernel_optional, + provenance: Rc::new(SubValueRelation::SubValueUnknown), +})); +let node_fields = inductive_fields_list_to_map(compiler_inductive_fields()); +let kernel_recursive_types = Rc::new({ let mut __result = Vec::new(); for name in Rc::new(v2_rt::map_keys(&compiler_recursive_types())).iter().cloned() { __result.push(intern(&intern_table, &name).id.clone()); } __result }); +let kernel_recursive_type_set = Rc::new(v2_rt::map_keys(&compiler_recursive_types())).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, intern(&intern_table, &name).id.clone(), true)); +let kernel = Rc::new(TypeEnv { + bindings: kernel_bindings.clone(), + recursive_types: kernel_recursive_types, + recursive_type_set: kernel_recursive_type_set, + inductive_fields: node_fields, + source_indices: source_indices.clone(), + intern_table: intern_table.clone(), +}); +let imports_std_types = { let mut __found = false; for imp in module.resolved_imports.clone().iter().cloned() { if (imp.module_path.clone().as_str() == "std.types".to_string().as_str()) { __found = true; break; } } __found }; +let module_name_str = authored_name_at(source_indices.clone(), &module.module.clone()); +let std_types_parent_env = if ((module_name_str.clone().as_str() != "std.types".to_string().as_str()) && (imports_std_types == false)) { match v2_rt::map_get(&parent_index, "std.types".to_string()) { - Some(typed_std) => Rc::new(vec![typed_std.type_env.clone()]), - None => Rc::new(vec![]), - } + Some(typed_std) => Rc::new(vec![typed_std.type_env.clone()]), + None => Rc::new(vec![]), +} } else { Rc::new(vec![]) }; - let imported_parent_envs = Rc::new({ - let mut __result = Vec::new(); - for imp in module.resolved_imports.clone().iter().cloned() { - __result.extend( - (*match v2_rt::map_get(&parent_index, imp.module_path.clone()) { - Some(typed_parent) => Rc::new(vec![typed_parent.type_env.clone()]), - None => Rc::new(vec![]), - }) - .iter() - .cloned(), - ); - } - __result - }); - let parent_envs = v2_rt::concat(std_types_parent_env.clone(), imported_parent_envs); - let std_import_bindings = collect_parent_bindings_filtered(std_types_parent_env.clone()); - let import_bindings = module.resolved_imports.clone().iter().cloned().fold( - std_import_bindings, - |acc: Rc>>, imp: Rc| match v2_rt::map_get( - &parent_index, - imp.module_path.clone(), - ) { - Some(typed_parent) => { - if (imp.module_path.clone().as_str() == "std.types".to_string().as_str()) { - Rc::new(v2_rt::map_keys( - &typed_parent.type_env.clone().bindings.clone(), - )) - .iter() - .cloned() - .fold( - acc.clone(), - |bacc: Rc>>, ident: i64| { - let name = intern_str( - typed_parent.type_env.clone().intern_table.clone(), - ident.clone(), - ); - if is_type_variable_name(&name) { - bacc.clone() - } else { - match v2_rt::map_get( - &typed_parent.type_env.clone().bindings.clone(), - ident.clone(), - ) { - Some(binding) => v2_rt::rc_map_insert( - bacc.clone(), - ident.clone(), - binding.clone(), - ), - None => bacc.clone(), - } - } - }, - ) - } else { - v2_rt::rc_map_merge( - acc.clone(), - typed_parent.type_env.clone().bindings.clone(), - ) - } +let imported_parent_envs = Rc::new({ let mut __result = Vec::new(); for imp in module.resolved_imports.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&parent_index, imp.module_path.clone()) { + Some(typed_parent) => Rc::new(vec![typed_parent.type_env.clone()]), + None => Rc::new(vec![]), +}).iter().cloned()); } __result }); +let parent_envs = v2_rt::concat(std_types_parent_env.clone(), imported_parent_envs); +let std_import_bindings = collect_parent_bindings_filtered(std_types_parent_env.clone()); +let import_bindings = module.resolved_imports.clone().iter().cloned().fold(std_import_bindings, |acc: Rc>>, imp: Rc| match v2_rt::map_get(&parent_index, imp.module_path.clone()) { + Some(typed_parent) => if (imp.module_path.clone().as_str() == "std.types".to_string().as_str()) { + Rc::new(v2_rt::map_keys(&typed_parent.type_env.clone().bindings.clone())).iter().cloned().fold(acc.clone(), |bacc: Rc>>, ident: i64| { + let name = intern_str(typed_parent.type_env.clone().intern_table.clone(), ident.clone()); +if is_type_variable_name(&name) { + bacc.clone() + } else { + match v2_rt::map_get(&typed_parent.type_env.clone().bindings.clone(), ident.clone()) { + Some(binding) => v2_rt::rc_map_insert(bacc.clone(), ident.clone(), binding.clone()), + None => bacc.clone(), +} } - None => acc.clone(), - }, - ); - let import_recursive = parent_envs - .clone() - .iter() - .cloned() - .fold(Rc::new(vec![]), |acc: _, env: Rc| { - v2_rt::concat(acc, env.recursive_types.clone()) - }); - let import_recursive_set = parent_envs.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, env: Rc| { - v2_rt::rc_map_merge(acc, env.recursive_type_set.clone()) - }, - ); - let import_inductive_fields = parent_envs.clone().iter().cloned().fold( - v2_rt::rc_empty_map::>>>(), - |acc: Rc>>>>, env: Rc| { - merge_inductive_fields(acc, &env.inductive_fields.clone()) - }, - ); - let import_env = Rc::new(TypeEnv { - bindings: import_bindings, - recursive_types: import_recursive, - recursive_type_set: import_recursive_set, - inductive_fields: import_inductive_fields, - source_indices: source_indices.clone(), - intern_table: intern_table.clone(), - }); - let import_diags = Rc::new({ - let mut __result = Vec::new(); - for imp in module.resolved_imports.clone().iter().cloned() { - __result.extend( - (*match v2_rt::map_get(&parent_index, imp.module_path.clone()) { - Some(_) => Rc::new(vec![]), - None => Rc::new(vec![make_error_node( - Rc::new(CompilerDiagnostic::InternalError { - message: v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "missing parent environment for imported module '" - .to_string(), - imp.module_path.clone(), - ), - "' while typechecking '".to_string(), - ), - module_name_str.clone(), - ), - "'".to_string(), - ), - span: imp.target_module.clone().clone().unwrap().span.clone(), - }), - module_name_str.clone(), - )]), - }) - .iter() - .cloned(), - ); - } - __result - }); - let local_bindings = module_items(module.module.clone()).iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, item: Rc| { - let item_ident = intern( - &intern_table, - &authored_name_at(source_indices.clone(), &item), - ) - .id - .clone(); - let has_structure = (item.connective.clone() != Connective::NoConnective); - if has_structure.clone() { +}) + } else { + v2_rt::rc_map_merge(acc.clone(), typed_parent.type_env.clone().bindings.clone()) + }, + None => acc.clone(), +}); +let import_recursive = parent_envs.clone().iter().cloned().fold(Rc::new(vec![]), |acc: _, env: Rc| v2_rt::concat(acc, env.recursive_types.clone())); +let import_recursive_set = parent_envs.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, env: Rc| v2_rt::rc_map_merge(acc, env.recursive_type_set.clone())); +let import_inductive_fields = parent_envs.clone().iter().cloned().fold(v2_rt::rc_empty_map::>>>(), |acc: Rc>>>>, env: Rc| merge_inductive_fields(acc, &env.inductive_fields.clone())); +let import_env = Rc::new(TypeEnv { + bindings: import_bindings, + recursive_types: import_recursive, + recursive_type_set: import_recursive_set, + inductive_fields: import_inductive_fields, + source_indices: source_indices.clone(), + intern_table: intern_table.clone(), +}); +let import_diags = Rc::new({ let mut __result = Vec::new(); for imp in module.resolved_imports.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&parent_index, imp.module_path.clone()) { + Some(_) => Rc::new(vec![]), + None => Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::InternalError { + message: v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("missing parent environment for imported module '".to_string(), imp.module_path.clone()), "' while typechecking '".to_string()), module_name_str.clone()), "'".to_string()), + span: imp.target_module.clone().clone().unwrap().span.clone(), +}), module_name_str.clone())]), +}).iter().cloned()); } __result }); +let local_bindings = module_items(module.module.clone()).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, item: Rc| { + let item_ident = intern(&intern_table, &authored_name_at(source_indices.clone(), &item)).id.clone(); +let has_structure = (item.connective.clone() != Connective::NoConnective); +if has_structure.clone() { + { + let type_node = Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: item.children.clone(), + connective: item.connective.clone(), + params: item.params.clone(), + inferred: None, + return_cardinality: item.return_cardinality.clone(), + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +v2_rt::rc_map_insert(acc.clone(), item_ident.clone(), Rc::new(TypeBinding { + name: authored_name_at(source_indices.clone(), &item), + resolved: type_node.clone(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), +})) +} + } else { + if (((item.inferred.clone() != None) && ((item.params.clone().len() as i64) == 0)) && (item.body.clone() == None)) { { - let type_node = Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: item.children.clone(), - connective: item.connective.clone(), - params: item.params.clone(), - inferred: None, - return_cardinality: item.return_cardinality.clone(), - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - v2_rt::rc_map_insert( - acc.clone(), - item_ident.clone(), - Rc::new(TypeBinding { - name: authored_name_at(source_indices.clone(), &item), - resolved: type_node.clone(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), - }), - ) - } + let alias_node = Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: item.inferred.clone(), + return_cardinality: item.return_cardinality.clone(), + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +v2_rt::rc_map_insert(acc.clone(), item_ident.clone(), Rc::new(TypeBinding { + name: authored_name_at(source_indices.clone(), &item), + resolved: alias_node.clone(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), +})) +} } else { - if (((item.inferred.clone() != None) - && ((item.params.clone().len() as i64) == 0)) - && (item.body.clone() == None)) - { + if ((item.transport.clone() == None) && ((item.children.clone().len() as i64) > 0)) { { - let alias_node = Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: item.inferred.clone(), - return_cardinality: item.return_cardinality.clone(), - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - v2_rt::rc_map_insert( - acc.clone(), - item_ident.clone(), - Rc::new(TypeBinding { - name: authored_name_at(source_indices.clone(), &item), - resolved: alias_node.clone(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), - }), - ) - } + let ref_node = nominal_ref_node(&authored_name_at(source_indices.clone(), &item), item.span.clone(), item.ident_span.clone()); +v2_rt::rc_map_insert(acc.clone(), item_ident.clone(), Rc::new(TypeBinding { + name: authored_name_at(source_indices.clone(), &item), + resolved: ref_node.clone(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), +})) +} } else { - if ((item.transport.clone() == None) - && ((item.children.clone().len() as i64) > 0)) - { + if (((((item.params.clone().len() as i64) > 0) && (item.connective.clone() == Connective::NoConnective)) && (item.body.clone() == None)) && (item.transport.clone() == None)) { { - let ref_node = nominal_ref_node( - &authored_name_at(source_indices.clone(), &item), - item.span.clone(), - item.ident_span.clone(), - ); - v2_rt::rc_map_insert( - acc.clone(), - item_ident.clone(), - Rc::new(TypeBinding { - name: authored_name_at(source_indices.clone(), &item), - resolved: ref_node.clone(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), - }), - ) - } + let bare_node = Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: item.params.clone(), + inferred: item.inferred.clone(), + return_cardinality: item.return_cardinality.clone(), + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +v2_rt::rc_map_insert(acc.clone(), item_ident.clone(), Rc::new(TypeBinding { + name: authored_name_at(source_indices.clone(), &item), + resolved: bare_node.clone(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), +})) +} } else { - if (((((item.params.clone().len() as i64) > 0) - && (item.connective.clone() == Connective::NoConnective)) - && (item.body.clone() == None)) - && (item.transport.clone() == None)) - { - { - let bare_node = Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: item.params.clone(), - inferred: item.inferred.clone(), - return_cardinality: item.return_cardinality.clone(), - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - v2_rt::rc_map_insert( - acc.clone(), - item_ident.clone(), - Rc::new(TypeBinding { - name: authored_name_at(source_indices.clone(), &item), - resolved: bare_node.clone(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), - }), - ) - } + if ((((((item.properties.clone().len() as i64) > 0) && (item.connective.clone() == Connective::NoConnective)) && (item.transport.clone() == None)) && (item.inferred.clone() == None)) && ((item.params.clone().len() as i64) == 0)) { + v2_rt::rc_map_insert(acc.clone(), item_ident.clone(), nominal_type_binding(&authored_name_at(source_indices.clone(), &item))) } else { - if ((((((item.properties.clone().len() as i64) > 0) - && (item.connective.clone() == Connective::NoConnective)) - && (item.transport.clone() == None)) - && (item.inferred.clone() == None)) - && ((item.params.clone().len() as i64) == 0)) - { - v2_rt::rc_map_insert( - acc.clone(), - item_ident.clone(), - nominal_type_binding(&authored_name_at( - source_indices.clone(), - &item, - )), - ) - } else { - acc.clone() - } + acc.clone() } } } } - }, - ); - let param_bindings = module_items(module.module.clone()).iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, item: Rc| { - let is_type_decl = match v2_rt::map_get( - &local_bindings, - intern( - &intern_table, - &authored_name_at(source_indices.clone(), &item), - ) - .id - .clone(), - ) { - Some(_) => true, - None => false, - }; - if (((item.params.clone().len() as i64) > 0) && is_type_decl.clone()) { - { - let result = item.params.clone().iter().cloned().fold( - acc.clone(), - |pacc: Rc>>, p: Rc| { - v2_rt::rc_map_insert( - pacc, - intern( - &intern_table, - &authored_name_at(source_indices.clone(), &p), - ) - .id - .clone(), - nominal_type_binding(&authored_name_at( - source_indices.clone(), - &p, - )), - ) - }, - ); - result.clone() - } - } else { - acc.clone() - } - }, - ); - let local_name_set = Rc::new(v2_rt::map_keys(&local_bindings)) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, ident: i64| { - v2_rt::rc_map_insert(acc, ident.clone(), true) - }, - ); - let all_local_bindings = v2_rt::rc_map_merge(local_bindings.clone(), param_bindings); - let pre_local_env = Rc::new(TypeEnv { - bindings: all_local_bindings, - recursive_types: Rc::new(vec![]), - recursive_type_set: v2_rt::rc_empty_map::(), - inductive_fields: v2_rt::rc_empty_map::>>>(), - source_indices: source_indices.clone(), - intern_table: intern_table.clone(), - }); - let merged = merge_envs(&Rc::new(vec![kernel, import_env, pre_local_env])); - let all_deps_map = Rc::new(v2_rt::map_values(&merged.bindings.clone())) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::>>(), - |acc: Rc>>>, b: Rc| { - v2_rt::rc_map_insert( - acc, - b.name.clone(), - node_type_deps(&b.resolved.clone(), &source_indices), - ) - }, - ); - let str_bindings = Rc::new(v2_rt::map_values(&merged.bindings.clone())) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, b: Rc| { - v2_rt::rc_map_insert(acc, b.name.clone(), b.clone()) - }, - ); - let cycle_set_str = detect_type_cycles_kahn(&all_deps_map, str_bindings); - let cycle_set = Rc::new({ - let mut __result = Vec::new(); - for name in cycle_set_str.clone().iter().cloned() { - __result.push(intern(&intern_table, &name).id.clone()); } - __result - }); - let cycle_map = cycle_set_str.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, name: String| { - v2_rt::rc_map_insert(acc, name.clone(), true) - }, - ); - let cross_type_set_str = v2_rt::rc_map_merge(cycle_map, compiler_recursive_types()); - let cross_type_set = Rc::new(v2_rt::map_keys(&cross_type_set_str)) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, name: String| { - v2_rt::rc_map_insert(acc, intern(&intern_table, &name).id.clone(), true) - }, - ); - let local_inductive_fields = build_item_inductive_fields( - module_items(module.module.clone()), - cross_type_set_str.clone(), - source_indices.clone(), - ); - let merged_inductive_fields = - merge_inductive_fields(merged.inductive_fields.clone(), &local_inductive_fields); - let unresolved_env = Rc::new(TypeEnv { - bindings: merged.bindings.clone(), - recursive_types: cycle_set, - recursive_type_set: cross_type_set, - inductive_fields: merged_inductive_fields, - source_indices: source_indices.clone(), - intern_table: intern_table.clone(), - }); - let resolved = resolve_env_bindings( - &unresolved_env, - module_name_str.clone(), - &local_name_set, - all_deps_map.clone(), - ); - let resolved_env_out = resolved.env.clone(); - let resolved_diags = resolved.diagnostics.clone(); - let final_env = Rc::new(TypeEnv { - bindings: resolved_env_out.bindings.clone(), - recursive_types: resolved_env_out.recursive_types.clone(), - recursive_type_set: resolved_env_out.recursive_type_set.clone(), - inductive_fields: resolved_env_out.inductive_fields.clone(), - source_indices: resolved_env_out.source_indices.clone(), - intern_table: intern_table.clone(), - }); - Rc::new(BuildTypeEnvResult { - env: final_env, - diagnostics: v2_rt::concat(import_diags, resolved_diags), - }) - } +}); +let param_bindings = module_items(module.module.clone()).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, item: Rc| { + let is_type_decl = match v2_rt::map_get(&local_bindings, intern(&intern_table, &authored_name_at(source_indices.clone(), &item)).id.clone()) { + Some(_) => true, + None => false, +}; +if (((item.params.clone().len() as i64) > 0) && is_type_decl.clone()) { + { + let result = item.params.clone().iter().cloned().fold(acc.clone(), |pacc: Rc>>, p: Rc| v2_rt::rc_map_insert(pacc, intern(&intern_table, &authored_name_at(source_indices.clone(), &p)).id.clone(), nominal_type_binding(&authored_name_at(source_indices.clone(), &p)))); +result.clone() +} + } else { + acc.clone() + } +}); +let local_name_set = Rc::new(v2_rt::map_keys(&local_bindings)).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, ident: i64| v2_rt::rc_map_insert(acc, ident.clone(), true)); +let all_local_bindings = v2_rt::rc_map_merge(local_bindings.clone(), param_bindings); +let pre_local_env = Rc::new(TypeEnv { + bindings: all_local_bindings, + recursive_types: Rc::new(vec![]), + recursive_type_set: v2_rt::rc_empty_map::(), + inductive_fields: v2_rt::rc_empty_map::>>>(), + source_indices: source_indices.clone(), + intern_table: intern_table.clone(), +}); +let merged = merge_envs(&Rc::new(vec![kernel, import_env, pre_local_env])); +let all_deps_map = Rc::new(v2_rt::map_values(&merged.bindings.clone())).iter().cloned().fold(v2_rt::rc_empty_map::>>(), |acc: Rc>>>, b: Rc| v2_rt::rc_map_insert(acc, b.name.clone(), node_type_deps(&b.resolved.clone(), &source_indices))); +let str_bindings = Rc::new(v2_rt::map_values(&merged.bindings.clone())).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, b: Rc| v2_rt::rc_map_insert(acc, b.name.clone(), b.clone())); +let cycle_set_str = detect_type_cycles_kahn(&all_deps_map, str_bindings); +let cycle_set = Rc::new({ let mut __result = Vec::new(); for name in cycle_set_str.clone().iter().cloned() { __result.push(intern(&intern_table, &name).id.clone()); } __result }); +let cross_type_all_names = v2_rt::concat(cycle_set_str.clone(), Rc::new(v2_rt::map_keys(&compiler_recursive_types()))); +let cross_type_set_str = cross_type_all_names.clone().iter().cloned().fold(empty_set(), |acc: Rc>, name: String| set_insert(acc, name.clone())); +let cross_type_set = cross_type_all_names.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, intern(&intern_table, &name).id.clone(), true)); +let local_inductive_fields = build_item_inductive_fields(module_items(module.module.clone()), cross_type_set_str, source_indices.clone()); +let merged_inductive_fields = merge_inductive_fields(merged.inductive_fields.clone(), &local_inductive_fields); +let unresolved_env = Rc::new(TypeEnv { + bindings: merged.bindings.clone(), + recursive_types: cycle_set, + recursive_type_set: cross_type_set, + inductive_fields: merged_inductive_fields, + source_indices: source_indices.clone(), + intern_table: intern_table.clone(), +}); +let resolved = resolve_env_bindings(&unresolved_env, module_name_str.clone(), &local_name_set, all_deps_map.clone()); +let resolved_env_out = resolved.env.clone(); +let resolved_diags = resolved.diagnostics.clone(); +let final_env = Rc::new(TypeEnv { + bindings: resolved_env_out.bindings.clone(), + recursive_types: resolved_env_out.recursive_types.clone(), + recursive_type_set: resolved_env_out.recursive_type_set.clone(), + inductive_fields: resolved_env_out.inductive_fields.clone(), + source_indices: resolved_env_out.source_indices.clone(), + intern_table: intern_table.clone(), +}); +Rc::new(BuildTypeEnvResult { + env: final_env, + diagnostics: v2_rt::concat(import_diags, resolved_diags), +}) +} } -pub fn build_type_env_unresolved( - module: &Rc, - parent_index: &Rc>>, - source_indices: &Rc>>, - intern_table: &Rc, -) -> Rc { +pub fn build_type_env_unresolved(module: &Rc, parent_index: &Rc>>, source_indices: &Rc>>, intern_table: &Rc) -> Rc { { - let intern_table = Rc::new(v2_rt::map_keys(&kernel_type_set())) - .iter() - .cloned() - .fold(intern_table.clone(), |t: Rc, name: String| { - intern(&t, &name).table.clone() - }); - let intern_table = Rc::new(vec!["Optional".to_string()]) - .iter() - .cloned() - .fold(intern_table.clone(), |t: Rc, name: String| { - intern(&t, &name).table.clone() - }); - let zero_span = make_span(0, 0); - let kernel_bindings = Rc::new(v2_rt::map_keys(&kernel_type_set())) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, name: String| { - v2_rt::rc_map_insert( - acc, - intern(&intern_table, &name).id.clone(), - Rc::new(TypeBinding { - name: name.clone(), - resolved: Rc::new(Node { - name: name.clone(), - span: kernel_span(&name), - ident_span: Some(kernel_span(&name)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - provenance: Rc::new(SubValueRelation::SubValueUnknown), - }), - ) - }, - ); - let some_value_field = Rc::new(Node { - name: "value".to_string(), - span: kernel_span(&"value".to_string()), - ident_span: Some(kernel_span(&"value".to_string())), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::TypeVariable { - id: "some_value".to_string(), - })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let some_variant = Rc::new(Node { - name: "Some".to_string(), - span: kernel_span(&"Some".to_string()), - ident_span: Some(kernel_span(&"Some".to_string())), - children: Rc::new(vec![some_value_field]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let kernel_optional = Rc::new(Node { - name: "Optional".to_string(), - span: kernel_span(&"Optional".to_string()), - ident_span: Some(kernel_span(&"Optional".to_string())), - children: Rc::new(vec![some_variant, none_type()]), - connective: Connective::Disj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let kernel_bindings = v2_rt::rc_map_insert( - kernel_bindings.clone(), - intern(&intern_table, &"Optional".to_string()).id.clone(), - Rc::new(TypeBinding { - name: "Optional".to_string(), - resolved: kernel_optional, - provenance: Rc::new(SubValueRelation::SubValueUnknown), - }), - ); - let kernel = Rc::new(TypeEnv { - bindings: kernel_bindings.clone(), - recursive_types: Rc::new(vec![]), - recursive_type_set: v2_rt::rc_empty_map::(), - inductive_fields: v2_rt::rc_empty_map::>>>(), - source_indices: source_indices.clone(), - intern_table: intern_table.clone(), - }); - let imports_std_types = { - let mut __found = false; - for imp in module.resolved_imports.clone().iter().cloned() { - if (imp.module_path.clone().as_str() == "std.types".to_string().as_str()) { - __found = true; - break; - } - } - __found - }; - let module_name_str = authored_name_at(source_indices.clone(), &module.module.clone()); - let std_types_parent_env = if ((module_name_str.as_str() - != "std.types".to_string().as_str()) - && (imports_std_types == false)) - { + let intern_table = Rc::new(v2_rt::map_keys(&kernel_type_set())).iter().cloned().fold(intern_table.clone(), |t: Rc, name: String| intern(&t, &name).table.clone()); +let intern_table = Rc::new(vec!["Optional".to_string()]).iter().cloned().fold(intern_table.clone(), |t: Rc, name: String| intern(&t, &name).table.clone()); +let zero_span = make_span(0, 0); +let kernel_bindings = Rc::new(v2_rt::map_keys(&kernel_type_set())).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, name: String| v2_rt::rc_map_insert(acc, intern(&intern_table, &name).id.clone(), Rc::new(TypeBinding { + name: name.clone(), + resolved: Rc::new(Node { + name: name.clone(), + span: kernel_span(&name), + ident_span: Some(kernel_span(&name)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), + provenance: Rc::new(SubValueRelation::SubValueUnknown), +}))); +let some_value_field = Rc::new(Node { + name: "value".to_string(), + span: kernel_span(&"value".to_string()), + ident_span: Some(kernel_span(&"value".to_string())), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::TypeVariable { + id: "some_value".to_string(), +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let some_variant = Rc::new(Node { + name: "Some".to_string(), + span: kernel_span(&"Some".to_string()), + ident_span: Some(kernel_span(&"Some".to_string())), + children: Rc::new(vec![some_value_field]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let kernel_optional = Rc::new(Node { + name: "Optional".to_string(), + span: kernel_span(&"Optional".to_string()), + ident_span: Some(kernel_span(&"Optional".to_string())), + children: Rc::new(vec![some_variant, none_type()]), + connective: Connective::Disj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let kernel_bindings = v2_rt::rc_map_insert(kernel_bindings.clone(), intern(&intern_table, &"Optional".to_string()).id.clone(), Rc::new(TypeBinding { + name: "Optional".to_string(), + resolved: kernel_optional, + provenance: Rc::new(SubValueRelation::SubValueUnknown), +})); +let kernel = Rc::new(TypeEnv { + bindings: kernel_bindings.clone(), + recursive_types: Rc::new(vec![]), + recursive_type_set: v2_rt::rc_empty_map::(), + inductive_fields: v2_rt::rc_empty_map::>>>(), + source_indices: source_indices.clone(), + intern_table: intern_table.clone(), +}); +let imports_std_types = { let mut __found = false; for imp in module.resolved_imports.clone().iter().cloned() { if (imp.module_path.clone().as_str() == "std.types".to_string().as_str()) { __found = true; break; } } __found }; +let module_name_str = authored_name_at(source_indices.clone(), &module.module.clone()); +let std_types_parent_env = if ((module_name_str.as_str() != "std.types".to_string().as_str()) && (imports_std_types == false)) { match v2_rt::map_get(&parent_index, "std.types".to_string()) { - Some(typed_std) => Rc::new(vec![typed_std.type_env.clone()]), - None => Rc::new(vec![]), - } + Some(typed_std) => Rc::new(vec![typed_std.type_env.clone()]), + None => Rc::new(vec![]), +} } else { Rc::new(vec![]) }; - let imported_parent_envs = Rc::new({ - let mut __result = Vec::new(); - for imp in module.resolved_imports.clone().iter().cloned() { - __result.extend( - (*match v2_rt::map_get(&parent_index, imp.module_path.clone()) { - Some(typed_parent) => Rc::new(vec![typed_parent.type_env.clone()]), - None => Rc::new(vec![]), - }) - .iter() - .cloned(), - ); - } - __result - }); - let parent_envs = v2_rt::concat(std_types_parent_env.clone(), imported_parent_envs); - let std_import_bindings = collect_parent_bindings_filtered(std_types_parent_env.clone()); - let import_bindings = module.resolved_imports.clone().iter().cloned().fold( - std_import_bindings, - |acc: Rc>>, imp: Rc| match v2_rt::map_get( - &parent_index, - imp.module_path.clone(), - ) { - Some(typed_parent) => { - if (imp.module_path.clone().as_str() == "std.types".to_string().as_str()) { - Rc::new(v2_rt::map_keys( - &typed_parent.type_env.clone().bindings.clone(), - )) - .iter() - .cloned() - .fold( - acc.clone(), - |bacc: Rc>>, ident: i64| { - let name = intern_str( - typed_parent.type_env.clone().intern_table.clone(), - ident.clone(), - ); - if is_type_variable_name(&name) { - bacc.clone() - } else { - match v2_rt::map_get( - &typed_parent.type_env.clone().bindings.clone(), - ident.clone(), - ) { - Some(binding) => v2_rt::rc_map_insert( - bacc.clone(), - ident.clone(), - binding.clone(), - ), - None => bacc.clone(), - } - } - }, - ) - } else { - v2_rt::rc_map_merge( - acc.clone(), - typed_parent.type_env.clone().bindings.clone(), - ) - } +let imported_parent_envs = Rc::new({ let mut __result = Vec::new(); for imp in module.resolved_imports.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&parent_index, imp.module_path.clone()) { + Some(typed_parent) => Rc::new(vec![typed_parent.type_env.clone()]), + None => Rc::new(vec![]), +}).iter().cloned()); } __result }); +let parent_envs = v2_rt::concat(std_types_parent_env.clone(), imported_parent_envs); +let std_import_bindings = collect_parent_bindings_filtered(std_types_parent_env.clone()); +let import_bindings = module.resolved_imports.clone().iter().cloned().fold(std_import_bindings, |acc: Rc>>, imp: Rc| match v2_rt::map_get(&parent_index, imp.module_path.clone()) { + Some(typed_parent) => if (imp.module_path.clone().as_str() == "std.types".to_string().as_str()) { + Rc::new(v2_rt::map_keys(&typed_parent.type_env.clone().bindings.clone())).iter().cloned().fold(acc.clone(), |bacc: Rc>>, ident: i64| { + let name = intern_str(typed_parent.type_env.clone().intern_table.clone(), ident.clone()); +if is_type_variable_name(&name) { + bacc.clone() + } else { + match v2_rt::map_get(&typed_parent.type_env.clone().bindings.clone(), ident.clone()) { + Some(binding) => v2_rt::rc_map_insert(bacc.clone(), ident.clone(), binding.clone()), + None => bacc.clone(), +} } - None => acc.clone(), - }, - ); - let import_recursive = parent_envs - .clone() - .iter() - .cloned() - .fold(Rc::new(vec![]), |acc: _, env: Rc| { - v2_rt::concat(acc, env.recursive_types.clone()) - }); - let import_recursive_set = parent_envs.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, env: Rc| { - v2_rt::rc_map_merge(acc, env.recursive_type_set.clone()) - }, - ); - let import_inductive_fields = parent_envs.clone().iter().cloned().fold( - v2_rt::rc_empty_map::>>>(), - |acc: Rc>>>>, env: Rc| { - merge_inductive_fields(acc, &env.inductive_fields.clone()) - }, - ); - let import_env = Rc::new(TypeEnv { - bindings: import_bindings, - recursive_types: import_recursive, - recursive_type_set: import_recursive_set, - inductive_fields: import_inductive_fields, - source_indices: source_indices.clone(), - intern_table: intern_table.clone(), - }); - let local_bindings = module_items(module.module.clone()).iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, item: Rc| { - let item_ident = intern( - &intern_table, - &authored_name_at(source_indices.clone(), &item), - ) - .id - .clone(); - let has_structure = (item.connective.clone() != Connective::NoConnective); - if has_structure.clone() { +}) + } else { + v2_rt::rc_map_merge(acc.clone(), typed_parent.type_env.clone().bindings.clone()) + }, + None => acc.clone(), +}); +let import_recursive = parent_envs.clone().iter().cloned().fold(Rc::new(vec![]), |acc: _, env: Rc| v2_rt::concat(acc, env.recursive_types.clone())); +let import_recursive_set = parent_envs.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, env: Rc| v2_rt::rc_map_merge(acc, env.recursive_type_set.clone())); +let import_inductive_fields = parent_envs.clone().iter().cloned().fold(v2_rt::rc_empty_map::>>>(), |acc: Rc>>>>, env: Rc| merge_inductive_fields(acc, &env.inductive_fields.clone())); +let import_env = Rc::new(TypeEnv { + bindings: import_bindings, + recursive_types: import_recursive, + recursive_type_set: import_recursive_set, + inductive_fields: import_inductive_fields, + source_indices: source_indices.clone(), + intern_table: intern_table.clone(), +}); +let local_bindings = module_items(module.module.clone()).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, item: Rc| { + let item_ident = intern(&intern_table, &authored_name_at(source_indices.clone(), &item)).id.clone(); +let has_structure = (item.connective.clone() != Connective::NoConnective); +if has_structure.clone() { + { + let type_node = Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: item.children.clone(), + connective: item.connective.clone(), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: item.return_cardinality.clone(), + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +v2_rt::rc_map_insert(acc.clone(), item_ident.clone(), Rc::new(TypeBinding { + name: authored_name_at(source_indices.clone(), &item), + resolved: type_node.clone(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), +})) +} + } else { + if (((item.inferred.clone() != None) && ((item.params.clone().len() as i64) == 0)) && (item.body.clone() == None)) { { - let type_node = Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: item.children.clone(), - connective: item.connective.clone(), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: item.return_cardinality.clone(), - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - v2_rt::rc_map_insert( - acc.clone(), - item_ident.clone(), - Rc::new(TypeBinding { - name: authored_name_at(source_indices.clone(), &item), - resolved: type_node.clone(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), - }), - ) - } + let alias_node = Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: item.inferred.clone(), + return_cardinality: item.return_cardinality.clone(), + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +v2_rt::rc_map_insert(acc.clone(), item_ident.clone(), Rc::new(TypeBinding { + name: authored_name_at(source_indices.clone(), &item), + resolved: alias_node.clone(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), +})) +} } else { - if (((item.inferred.clone() != None) - && ((item.params.clone().len() as i64) == 0)) - && (item.body.clone() == None)) - { + if ((item.transport.clone() == None) && ((item.children.clone().len() as i64) > 0)) { { - let alias_node = Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: item.inferred.clone(), - return_cardinality: item.return_cardinality.clone(), - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - v2_rt::rc_map_insert( - acc.clone(), - item_ident.clone(), - Rc::new(TypeBinding { - name: authored_name_at(source_indices.clone(), &item), - resolved: alias_node.clone(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), - }), - ) - } + let ref_node = nominal_ref_node(&authored_name_at(source_indices.clone(), &item), item.span.clone(), item.ident_span.clone()); +v2_rt::rc_map_insert(acc.clone(), item_ident.clone(), Rc::new(TypeBinding { + name: authored_name_at(source_indices.clone(), &item), + resolved: ref_node.clone(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), +})) +} } else { - if ((item.transport.clone() == None) - && ((item.children.clone().len() as i64) > 0)) - { - { - let ref_node = nominal_ref_node( - &authored_name_at(source_indices.clone(), &item), - item.span.clone(), - item.ident_span.clone(), - ); - v2_rt::rc_map_insert( - acc.clone(), - item_ident.clone(), - Rc::new(TypeBinding { - name: authored_name_at(source_indices.clone(), &item), - resolved: ref_node.clone(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), - }), - ) - } + if ((((((item.properties.clone().len() as i64) > 0) && (item.connective.clone() == Connective::NoConnective)) && (item.transport.clone() == None)) && (item.inferred.clone() == None)) && ((item.params.clone().len() as i64) == 0)) { + v2_rt::rc_map_insert(acc.clone(), item_ident.clone(), nominal_type_binding(&authored_name_at(source_indices.clone(), &item))) } else { - if ((((((item.properties.clone().len() as i64) > 0) - && (item.connective.clone() == Connective::NoConnective)) - && (item.transport.clone() == None)) - && (item.inferred.clone() == None)) - && ((item.params.clone().len() as i64) == 0)) - { - v2_rt::rc_map_insert( - acc.clone(), - item_ident.clone(), - nominal_type_binding(&authored_name_at( - source_indices.clone(), - &item, - )), - ) - } else { - acc.clone() - } + acc.clone() } } } - }, - ); - let pre_local_env = Rc::new(TypeEnv { - bindings: local_bindings, - recursive_types: Rc::new(vec![]), - recursive_type_set: v2_rt::rc_empty_map::(), - inductive_fields: v2_rt::rc_empty_map::>>>(), - source_indices: source_indices.clone(), - intern_table: intern_table.clone(), - }); - let merged = merge_envs(&Rc::new(vec![kernel, import_env, pre_local_env])); - let all_deps_map = Rc::new(v2_rt::map_values(&merged.bindings.clone())) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::>>(), - |acc: Rc>>>, b: Rc| { - v2_rt::rc_map_insert( - acc, - b.name.clone(), - node_type_deps(&b.resolved.clone(), &source_indices), - ) - }, - ); - let str_bindings = Rc::new(v2_rt::map_values(&merged.bindings.clone())) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, b: Rc| { - v2_rt::rc_map_insert(acc, b.name.clone(), b.clone()) - }, - ); - let cycle_set_str = detect_type_cycles_kahn(&all_deps_map, str_bindings); - let cycle_set = Rc::new({ - let mut __result = Vec::new(); - for name in cycle_set_str.clone().iter().cloned() { - __result.push(intern(&intern_table, &name).id.clone()); } - __result - }); - let cycle_map = cycle_set_str.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, name: String| { - v2_rt::rc_map_insert(acc, name.clone(), true) - }, - ); - let cross_type_set_str = v2_rt::rc_map_merge(cycle_map, compiler_recursive_types()); - let cross_type_set = Rc::new(v2_rt::map_keys(&cross_type_set_str)) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, name: String| { - v2_rt::rc_map_insert(acc, intern(&intern_table, &name).id.clone(), true) - }, - ); - let local_inductive_fields = build_item_inductive_fields( - module_items(module.module.clone()), - cross_type_set_str.clone(), - source_indices.clone(), - ); - let merged_inductive_fields = - merge_inductive_fields(merged.inductive_fields.clone(), &local_inductive_fields); - let unresolved_env = Rc::new(TypeEnv { - bindings: merged.bindings.clone(), - recursive_types: cycle_set, - recursive_type_set: cross_type_set, - inductive_fields: merged_inductive_fields, - source_indices: source_indices.clone(), - intern_table: intern_table.clone(), - }); - Rc::new(BuildTypeEnvResult { - env: unresolved_env, - diagnostics: Rc::new(vec![]), - }) - } +}); +let pre_local_env = Rc::new(TypeEnv { + bindings: local_bindings, + recursive_types: Rc::new(vec![]), + recursive_type_set: v2_rt::rc_empty_map::(), + inductive_fields: v2_rt::rc_empty_map::>>>(), + source_indices: source_indices.clone(), + intern_table: intern_table.clone(), +}); +let merged = merge_envs(&Rc::new(vec![kernel, import_env, pre_local_env])); +let all_deps_map = Rc::new(v2_rt::map_values(&merged.bindings.clone())).iter().cloned().fold(v2_rt::rc_empty_map::>>(), |acc: Rc>>>, b: Rc| v2_rt::rc_map_insert(acc, b.name.clone(), node_type_deps(&b.resolved.clone(), &source_indices))); +let str_bindings = Rc::new(v2_rt::map_values(&merged.bindings.clone())).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, b: Rc| v2_rt::rc_map_insert(acc, b.name.clone(), b.clone())); +let cycle_set_str = detect_type_cycles_kahn(&all_deps_map, str_bindings); +let cycle_set = Rc::new({ let mut __result = Vec::new(); for name in cycle_set_str.clone().iter().cloned() { __result.push(intern(&intern_table, &name).id.clone()); } __result }); +let cross_type_all_names = v2_rt::concat(cycle_set_str.clone(), Rc::new(v2_rt::map_keys(&compiler_recursive_types()))); +let cross_type_set_str = cross_type_all_names.clone().iter().cloned().fold(empty_set(), |acc: Rc>, name: String| set_insert(acc, name.clone())); +let cross_type_set = cross_type_all_names.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, intern(&intern_table, &name).id.clone(), true)); +let local_inductive_fields = build_item_inductive_fields(module_items(module.module.clone()), cross_type_set_str, source_indices.clone()); +let merged_inductive_fields = merge_inductive_fields(merged.inductive_fields.clone(), &local_inductive_fields); +let unresolved_env = Rc::new(TypeEnv { + bindings: merged.bindings.clone(), + recursive_types: cycle_set, + recursive_type_set: cross_type_set, + inductive_fields: merged_inductive_fields, + source_indices: source_indices.clone(), + intern_table: intern_table.clone(), +}); +Rc::new(BuildTypeEnvResult { + env: unresolved_env, + diagnostics: Rc::new(vec![]), +}) +} } -pub fn build_item_info( - item: &Rc, - source_indices: &Rc>>, - module_name: String, -) -> Rc { +pub fn build_item_info(item: &Rc, source_indices: &Rc>>, module_name: String) -> Rc { { let kind = item_kind(&item); - let res_names = Rc::new({ - let mut __result = Vec::new(); - for u in item.uses.clone().iter().cloned() { - __result.push(resource_use_name_at(u.clone(), source_indices.clone())); - } - __result - }); - let item_name_str = authored_name_at(source_indices.clone(), &item); - match kind.clone() { - ItemKind::FuncItem => Rc::new(ItemInfo { - name: item_name_str.clone(), - module_name: module_name, - kind: kind.clone(), - service_names: if (item.body.clone() == None) { - Rc::new(vec![]) - } else { - collect_typed_service_calls( - item.body.clone().clone().unwrap(), - source_indices.clone(), - ) - }, - resource_names: res_names, - params: item.params.clone(), - is_self_recursive: false, - has_non_tail_self_call: false, - }), - ItemKind::FnItem => Rc::new(ItemInfo { - name: item_name_str.clone(), - module_name: module_name, - kind: kind.clone(), - service_names: if (item.body.clone() == None) { - Rc::new(vec![]) - } else { - collect_typed_service_calls( - item.body.clone().clone().unwrap(), - source_indices.clone(), - ) - }, - resource_names: res_names, - params: item.params.clone(), - is_self_recursive: if (item.body.clone() == None) { - false - } else { - expr_has_self_call( - &item.body.clone().clone().unwrap(), - &item_name_str, - &source_indices, - ) - }, - has_non_tail_self_call: if (item.body.clone() == None) { - false - } else { - expr_has_non_tail_self_call( - &item.body.clone().clone().unwrap(), - &item_name_str, - true, - &source_indices, - ) - }, - }), - _ => Rc::new(ItemInfo { - name: item_name_str.clone(), - module_name: module_name, - kind: kind.clone(), - service_names: Rc::new(vec![]), - resource_names: res_names, - params: item.params.clone(), - is_self_recursive: false, - has_non_tail_self_call: false, - }), - } - } +let res_names = Rc::new({ let mut __result = Vec::new(); for u in item.uses.clone().iter().cloned() { __result.push(resource_use_name_at(u.clone(), source_indices.clone())); } __result }); +let item_name_str = authored_name_at(source_indices.clone(), &item); +match kind.clone() { + ItemKind::FuncItem => Rc::new(ItemInfo { + name: item_name_str.clone(), + module_name: module_name, + kind: kind.clone(), + service_names: if (item.body.clone() == None) { + Rc::new(vec![]) + } else { + collect_typed_service_calls(item.body.clone().clone().unwrap(), source_indices.clone()) + }, + resource_names: res_names, + params: item.params.clone(), + is_self_recursive: false, + has_non_tail_self_call: false, +}), + ItemKind::FnItem => Rc::new(ItemInfo { + name: item_name_str.clone(), + module_name: module_name, + kind: kind.clone(), + service_names: if (item.body.clone() == None) { + Rc::new(vec![]) + } else { + collect_typed_service_calls(item.body.clone().clone().unwrap(), source_indices.clone()) + }, + resource_names: res_names, + params: item.params.clone(), + is_self_recursive: if (item.body.clone() == None) { + false + } else { + expr_has_self_call(&item.body.clone().clone().unwrap(), &item_name_str, &source_indices) + }, + has_non_tail_self_call: if (item.body.clone() == None) { + false + } else { + expr_has_non_tail_self_call(&item.body.clone().clone().unwrap(), &item_name_str, true, &source_indices) + }, +}), + _ => Rc::new(ItemInfo { + name: item_name_str.clone(), + module_name: module_name, + kind: kind.clone(), + service_names: Rc::new(vec![]), + resource_names: res_names, + params: item.params.clone(), + is_self_recursive: false, + has_non_tail_self_call: false, +}), +} +} } -pub fn analyze_item( - item: Rc, - env: &Rc, - module_name: &String, -) -> Rc { +pub fn analyze_item(item: Rc, env: &Rc, module_name: &String) -> Rc { { let resolved = resolve_item_types(&item, &env, &module_name); - let ritem = resolved.item.clone(); - let is_func = ((ritem.params.clone().len() as i64) > 0); - let is_zero_arg_func = ((((ritem.params.clone().len() as i64) == 0) - && (ritem.inferred.clone() != None)) - && (ritem.body.clone() != None)); - let func_sig = if (is_func || is_zero_arg_func) { +let ritem = resolved.item.clone(); +let is_func = ((ritem.params.clone().len() as i64) > 0); +let is_zero_arg_func = ((((ritem.params.clone().len() as i64) == 0) && (ritem.inferred.clone() != None)) && (ritem.body.clone() != None)); +let func_sig = if (is_func || is_zero_arg_func) { { let declared_rt = if (ritem.inferred.clone() != None) { Some(resolved_type(ritem.clone())) } else { None }; - Some(Rc::new(DeclaredFuncSig { - name: authored_name_at(env.source_indices.clone(), &ritem), - params: ritem.params.clone(), - inferred: declared_rt, - is_async: ((ritem.uses.clone().len() as i64) > 0), - output_provenance: Rc::new(vec![]), - variant_provenance: v2_rt::rc_empty_map::< - String, - Rc>>>>, - >(), - })) - } +Some(Rc::new(DeclaredFuncSig { + name: authored_name_at(env.source_indices.clone(), &ritem), + params: ritem.params.clone(), + inferred: declared_rt, + is_async: ((ritem.uses.clone().len() as i64) > 0), + output_provenance: Rc::new(vec![]), + variant_provenance: v2_rt::rc_empty_map::>>>>>(), +})) +} } else { None }; - let svc_entries = - if ((ritem.transport.clone() != None) && ((ritem.children.clone().len() as i64) > 0)) { - Rc::new({ - let mut __result = Vec::new(); - for c in ritem.children.clone().iter().cloned() { - __result.push(service_op_entry(&c, &env.source_indices.clone())); - } - __result - }) - } else { - Rc::new(vec![]) - }; - let svc_local = - if ((ritem.transport.clone() != None) && ((ritem.children.clone().len() as i64) > 0)) { - { - let root = namespace_root_from_properties( - ritem.properties.clone(), - authored_name_at(env.source_indices.clone(), &ritem), - env.source_indices.clone(), - ); - Some(nominal_type_binding(&root)) - } - } else { - None - }; - Rc::new(ItemContribution { - resolved_item: ritem.clone(), - resolve_diagnostics: resolved.diagnostics.clone(), - func_sig: func_sig, - svc_entries: svc_entries, - svc_local: svc_local, - item_info: build_item_info(&ritem, &env.source_indices.clone(), module_name.clone()), - }) - } +let svc_entries = if ((ritem.transport.clone() != None) && ((ritem.children.clone().len() as i64) > 0)) { + Rc::new({ let mut __result = Vec::new(); for c in ritem.children.clone().iter().cloned() { __result.push(service_op_entry(&c, &env.source_indices.clone())); } __result }) + } else { + Rc::new(vec![]) + }; +let svc_local = if ((ritem.transport.clone() != None) && ((ritem.children.clone().len() as i64) > 0)) { + { + let root = namespace_root_from_properties(ritem.properties.clone(), authored_name_at(env.source_indices.clone(), &ritem), env.source_indices.clone()); +Some(nominal_type_binding(&root)) +} + } else { + None + }; +Rc::new(ItemContribution { + resolved_item: ritem.clone(), + resolve_diagnostics: resolved.diagnostics.clone(), + func_sig: func_sig, + svc_entries: svc_entries, + svc_local: svc_local, + item_info: build_item_info(&ritem, &env.source_indices.clone(), module_name.clone()), +}) +} } -pub fn fold_module_contributions( - mut remaining: Rc>>, - mut resolved_items: Rc>>, - mut func_sigs: Rc>>, - mut svc_registry: Rc>>>>, - mut svc_locals: Rc>>, - mut item_registry: Rc>>, - mut diag_chunks: Rc>>>>, - mut source_indices: Rc>>, -) -> Rc { +pub fn fold_module_contributions(mut remaining: Rc>>, mut resolved_items: Rc>>, mut func_sigs: Rc>>, mut svc_registry: Rc>>>>, mut svc_locals: Rc>>, mut item_registry: Rc>>, mut diag_chunks: Rc>>>>, mut source_indices: Rc>>) -> Rc { loop { match remaining.clone().first().cloned() { - None => { - break Rc::new(LocalContributionState { - resolved_items: resolved_items, - func_sigs: func_sigs, - svc_registry: svc_registry, - svc_locals: svc_locals, - item_registry: item_registry, - diag_chunks: diag_chunks, - }); - } - Some(contribution) => { - let next_func_sigs = match contribution.func_sig.clone() { - Some(sig) => v2_rt::rc_map_insert(func_sigs, sig.name.clone(), sig.clone()), - None => func_sigs, - }; - let next_svc_registry = if ((contribution.svc_entries.clone().len() as i64) > 0) { - v2_rt::rc_map_insert( - svc_registry, - authored_name_at( - source_indices.clone(), - &contribution.resolved_item.clone(), - ), - contribution.svc_entries.clone(), - ) - } else { - svc_registry - }; - let next_svc_locals = match contribution.svc_local.clone() { - Some(binding) => { - v2_rt::rc_map_insert(svc_locals, binding.name.clone(), binding.clone()) - } - None => svc_locals, - }; - { - let __tco_0 = Rc::new( - remaining - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - let __tco_1 = - v2_rt::rc_list_push(resolved_items, contribution.resolved_item.clone()); - let __tco_2 = next_func_sigs; - let __tco_3 = next_svc_registry; - let __tco_4 = next_svc_locals; - let __tco_5 = v2_rt::rc_map_insert( - item_registry, - contribution.item_info.clone().name.clone(), - contribution.item_info.clone(), - ); - let __tco_6 = - v2_rt::rc_list_push(diag_chunks, contribution.resolve_diagnostics.clone()); - remaining = __tco_0; - resolved_items = __tco_1; - func_sigs = __tco_2; - svc_registry = __tco_3; - svc_locals = __tco_4; - item_registry = __tco_5; - diag_chunks = __tco_6; - continue; - } - } - } - } -} - -pub fn build_module_context( - contributions: Rc>>, - parent_index: Rc>>, - resolved_imports: &Rc>>, - env: &Rc, - module_name: &String, -) -> Rc { + None => { break Rc::new(LocalContributionState { + resolved_items: resolved_items, + func_sigs: func_sigs, + svc_registry: svc_registry, + svc_locals: svc_locals, + item_registry: item_registry, + diag_chunks: diag_chunks, +}); }, + Some(contribution) => { let next_func_sigs = match contribution.func_sig.clone() { + Some(sig) => v2_rt::rc_map_insert(func_sigs, sig.name.clone(), sig.clone()), + None => func_sigs, +}; +let next_svc_registry = if ((contribution.svc_entries.clone().len() as i64) > 0) { + v2_rt::rc_map_insert(svc_registry, authored_name_at(source_indices.clone(), &contribution.resolved_item.clone()), contribution.svc_entries.clone()) + } else { + svc_registry + }; +let next_svc_locals = match contribution.svc_local.clone() { + Some(binding) => v2_rt::rc_map_insert(svc_locals, binding.name.clone(), binding.clone()), + None => svc_locals, +}; +{ + let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); +let __tco_1 = v2_rt::rc_list_push(resolved_items, contribution.resolved_item.clone()); +let __tco_2 = next_func_sigs; +let __tco_3 = next_svc_registry; +let __tco_4 = next_svc_locals; +let __tco_5 = v2_rt::rc_map_insert(item_registry, contribution.item_info.clone().name.clone(), contribution.item_info.clone()); +let __tco_6 = v2_rt::rc_list_push(diag_chunks, contribution.resolve_diagnostics.clone()); +remaining = __tco_0; +resolved_items = __tco_1; +func_sigs = __tco_2; +svc_registry = __tco_3; +svc_locals = __tco_4; +item_registry = __tco_5; +diag_chunks = __tco_6; +continue; +} }, +} +} +} + +pub fn build_module_context(contributions: Rc>>, parent_index: Rc>>, resolved_imports: &Rc>>, env: &Rc, module_name: &String) -> Rc { { - let local = fold_module_contributions( - contributions, - Rc::new(vec![]), - v2_rt::rc_empty_map::>(), - v2_rt::rc_empty_map::>>>(), - v2_rt::rc_empty_map::>(), - v2_rt::rc_empty_map::>(), - Rc::new(vec![]), - env.source_indices.clone(), - ); - let imported_enum_names = resolved_imports.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, imp: Rc| { - imp.specific_names.clone().iter().cloned().fold( - acc, - |inner: Rc>, n: String| { - v2_rt::rc_map_insert(inner, n.clone(), true) - }, - ) - }, - ); - let variant_fold = Rc::new(v2_rt::map_values(&env.bindings.clone())).iter().cloned().fold(Rc::new(VariantFoldState { + let local = fold_module_contributions(contributions, Rc::new(vec![]), v2_rt::rc_empty_map::>(), v2_rt::rc_empty_map::>>>(), v2_rt::rc_empty_map::>(), v2_rt::rc_empty_map::>(), Rc::new(vec![]), env.source_indices.clone()); +let imported_enum_names = resolved_imports.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, imp: Rc| imp.specific_names.clone().iter().cloned().fold(acc, |inner: Rc>, n: String| v2_rt::rc_map_insert(inner, n.clone(), true))); +let variant_fold = Rc::new(v2_rt::map_values(&env.bindings.clone())).iter().cloned().fold(Rc::new(VariantFoldState { locals: v2_rt::rc_empty_map::>(), collision_errors: Rc::new(vec![]), }), |acc: Rc, binding: Rc| { @@ -10964,59 +6361,22 @@ if (curr_is_imported.clone() && prev_is_imported.clone()) { acc.clone() } }); - let imported_variant_locals = variant_fold.locals.clone(); - let variant_collision_errors = variant_fold.collision_errors.clone(); - let env_variant_locals = variant_locals_from_items( - local.resolved_items.clone(), - imported_variant_locals, - env.source_indices.clone(), - ); - let merged_scope = merge_scope_from_imports( - resolved_imports.clone(), - parent_index, - env.clone(), - v2_rt::rc_empty_map::>(), - local.svc_registry.clone(), - local.svc_locals.clone(), - ); - let all_declared_sigs = - v2_rt::rc_map_merge(merged_scope.func_sigs.clone(), local.func_sigs.clone()); - let resolve_result = resolve_func_sigs( - &all_declared_sigs, - &local.resolved_items.clone(), - module_name.clone(), - &env.source_indices.clone(), - ); - let all_locals = Rc::new(v2_rt::map_values(&merged_scope.svc_locals.clone())) - .iter() - .cloned() - .fold( - env_variant_locals, - |acc: Rc>>, binding: Rc| { - v2_rt::rc_map_insert(acc, binding.name.clone(), binding.clone()) - }, - ); - Rc::new(ModuleContext { - resolved_items: local.resolved_items.clone(), - func_env: resolve_result.func_env.clone(), - svc_registry: merged_scope.svc_registry.clone(), - locals: all_locals, - item_registry: local.item_registry.clone(), - diagnostics: v2_rt::concat( - v2_rt::concat( - Rc::new({ - let mut __result = Vec::new(); - for c in local.diag_chunks.clone().iter().cloned() { - __result.extend((*c.clone()).iter().cloned()); - } - __result - }), - resolve_result.diagnostics.clone(), - ), - variant_collision_errors, - ), - }) - } +let imported_variant_locals = variant_fold.locals.clone(); +let variant_collision_errors = variant_fold.collision_errors.clone(); +let env_variant_locals = variant_locals_from_items(local.resolved_items.clone(), imported_variant_locals, env.source_indices.clone()); +let merged_scope = merge_scope_from_imports(resolved_imports.clone(), parent_index, env.clone(), v2_rt::rc_empty_map::>(), local.svc_registry.clone(), local.svc_locals.clone()); +let all_declared_sigs = v2_rt::rc_map_merge(merged_scope.func_sigs.clone(), local.func_sigs.clone()); +let resolve_result = resolve_func_sigs(&all_declared_sigs, &local.resolved_items.clone(), module_name.clone(), &env.source_indices.clone()); +let all_locals = Rc::new(v2_rt::map_values(&merged_scope.svc_locals.clone())).iter().cloned().fold(env_variant_locals, |acc: Rc>>, binding: Rc| v2_rt::rc_map_insert(acc, binding.name.clone(), binding.clone())); +Rc::new(ModuleContext { + resolved_items: local.resolved_items.clone(), + func_env: resolve_result.func_env.clone(), + svc_registry: merged_scope.svc_registry.clone(), + locals: all_locals, + item_registry: local.item_registry.clone(), + diagnostics: v2_rt::concat(v2_rt::concat(Rc::new({ let mut __result = Vec::new(); for c in local.diag_chunks.clone().iter().cloned() { __result.extend((*c.clone()).iter().cloned()); } __result }), resolve_result.diagnostics.clone()), variant_collision_errors), +}) +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -11025,174 +6385,90 @@ pub struct TypecheckModuleResult { pub diagnostics: Rc>>, } -pub fn typecheck_module( - resolved: &Rc, - parent_index: &Rc>>, - source_indices: &Rc>>, - intern_table: Rc, -) -> Rc { +pub fn typecheck_module(resolved: &Rc, parent_index: &Rc>>, source_indices: &Rc>>, intern_table: Rc) -> Rc { { let env_result = build_type_env(&resolved, &parent_index, &source_indices, &intern_table); - let env = env_result.env.clone(); - let env_diags = env_result.diagnostics.clone(); - let env_errors = Rc::new({ - let mut __result = Vec::new(); - for d in env_diags.clone().iter().cloned() { - if is_error_diagnostic(d.diagnostic.clone()) { - __result.push(d); - } - } - __result - }); - let seed_diags = builtin_kernel_seed_diagnostics(); - if ((env_errors.len() as i64) > 0) { +let env = env_result.env.clone(); +let env_diags = env_result.diagnostics.clone(); +let env_errors = Rc::new({ let mut __result = Vec::new(); for d in env_diags.clone().iter().cloned() { if is_error_diagnostic(d.diagnostic.clone()) { __result.push(d); } } __result }); +let seed_diags = builtin_kernel_seed_diagnostics(); +if ((env_errors.len() as i64) > 0) { return Rc::new(TypecheckModuleResult { - typed: Rc::new(TypedModule { - module: resolved.module.clone(), - items: Rc::new(vec![]), - type_env: env.clone(), - func_env: Rc::new(ResolvedFuncEnv { - signatures: v2_rt::rc_empty_map::>(), - }), - item_registry: v2_rt::rc_empty_map::>(), - }), - diagnostics: v2_rt::concat(env_diags.clone(), seed_diags.clone()), - }); + typed: Rc::new(TypedModule { + module: resolved.module.clone(), + items: Rc::new(vec![]), + type_env: env.clone(), + func_env: Rc::new(ResolvedFuncEnv { + signatures: v2_rt::rc_empty_map::>(), +}), + item_registry: v2_rt::rc_empty_map::>(), +}), + diagnostics: v2_rt::concat(env_diags.clone(), seed_diags.clone()), +}) } - let resolved_module_name = - authored_name_at(source_indices.clone(), &resolved.module.clone()); - let contributions = Rc::new({ - let mut __result = Vec::new(); - for item in module_items(resolved.module.clone()).iter().cloned() { - __result.push(analyze_item(item.clone(), &env, &resolved_module_name)); - } - __result - }); - let ctx = build_module_context( - contributions, - parent_index.clone(), - &resolved.resolved_imports.clone(), - &env, - &resolved_module_name, - ); - let data_locals = ctx.resolved_items.clone().iter().cloned().fold( - ctx.locals.clone(), - |acc: Rc>>, item: Rc| { - if ((((item.body.clone() != None) && ((item.params.clone().len() as i64) == 0)) - && (item.inferred.clone() == None)) - && (item.type_annotation.clone() != None)) - { - v2_rt::rc_map_insert( - acc.clone(), - authored_name_at(source_indices.clone(), &item), - Rc::new(TypeBinding { - name: authored_name_at(source_indices.clone(), &item), - resolved: item.type_annotation.clone().clone().unwrap(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), - }), - ) - } else { - acc.clone() - } - }, - ); - let infer_scope = Rc::new(InferScope { - type_env: env.clone(), - func_env: ctx.func_env.clone(), - locals: data_locals.clone(), - match_bound_names: v2_rt::rc_empty_map::(), - module_name: resolved_module_name.clone(), - service_registry: ctx.svc_registry.clone(), - item_registry: ctx.item_registry.clone(), - lambda_param_provenance: v2_rt::rc_empty_map::>(), - }); - let typed_item_results = infer_items(ctx.resolved_items.clone(), infer_scope); - let typed_items = Rc::new({ - let mut __result = Vec::new(); - for tir in typed_item_results.clone().iter().cloned() { - __result.push(tir.item.clone()); - } - __result - }); - let infer_diags = Rc::new({ - let mut __result = Vec::new(); - for tir in typed_item_results.clone().iter().cloned() { - __result.extend((*tir.diagnostics.clone()).iter().cloned()); - } - __result - }); - let updated_func_env = populate_output_provenance( - typed_items.clone(), - ctx.func_env.clone(), - env.clone(), - data_locals.clone(), - ); - let reannotated_items = Rc::new({ - let mut __result = Vec::new(); - for item in typed_items.clone().iter().cloned() { - __result.push( - if (item.is_self_recursive.clone() && (item.body.clone() != None)) { - Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: item.children.clone(), - params: item.params.clone(), - inferred: item.inferred.clone(), - return_cardinality: item.return_cardinality.clone(), - uses: item.uses.clone(), - body: Some(annotate_descent_evidence( - item.body.clone().clone().unwrap(), - authored_name_at(source_indices.clone(), &item), - &item.params.clone(), - &env, - data_locals.clone(), - updated_func_env.signatures.clone(), - )), - connective: item.connective.clone(), - transport: item.transport.clone(), - properties: item.properties.clone(), - type_annotation: item.type_annotation.clone(), - is_self_recursive: item.is_self_recursive.clone(), - has_non_tail_self_call: item.has_non_tail_self_call.clone(), - match_pattern: item.match_pattern.clone(), - expr_data: item.expr_data.clone(), - ident: None, - }) - } else { - item.clone() - }, - ); - } - __result - }); - let typed_base = module_node( - &resolved_module_name, - module_imports(resolved.module.clone()), - ctx.resolved_items.clone(), - &resolved.module.clone().span.clone(), - ); - let typed_module = Rc::new(Node { - ident_span: resolved.module.clone().ident_span.clone(), - ..(*typed_base).clone() +let resolved_module_name = authored_name_at(source_indices.clone(), &resolved.module.clone()); +let contributions = Rc::new({ let mut __result = Vec::new(); for item in module_items(resolved.module.clone()).iter().cloned() { __result.push(analyze_item(item.clone(), &env, &resolved_module_name)); } __result }); +let ctx = build_module_context(contributions, parent_index.clone(), &resolved.resolved_imports.clone(), &env, &resolved_module_name); +let data_locals = ctx.resolved_items.clone().iter().cloned().fold(ctx.locals.clone(), |acc: Rc>>, item: Rc| if ((((item.body.clone() != None) && ((item.params.clone().len() as i64) == 0)) && (item.inferred.clone() == None)) && (item.type_annotation.clone() != None)) { + v2_rt::rc_map_insert(acc.clone(), authored_name_at(source_indices.clone(), &item), Rc::new(TypeBinding { + name: authored_name_at(source_indices.clone(), &item), + resolved: item.type_annotation.clone().clone().unwrap(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), +})) + } else { + acc.clone() }); - Rc::new(TypecheckModuleResult { - typed: Rc::new(TypedModule { - module: typed_module, - items: reannotated_items, - type_env: env.clone(), - func_env: updated_func_env.clone(), - item_registry: ctx.item_registry.clone(), - }), - diagnostics: v2_rt::concat( - v2_rt::concat( - v2_rt::concat(env_diags.clone(), ctx.diagnostics.clone()), - infer_diags, - ), - seed_diags.clone(), - ), - }) - } +let infer_scope = Rc::new(InferScope { + type_env: env.clone(), + func_env: ctx.func_env.clone(), + locals: data_locals.clone(), + match_bound_names: v2_rt::rc_empty_map::(), + module_name: resolved_module_name.clone(), + service_registry: ctx.svc_registry.clone(), + item_registry: ctx.item_registry.clone(), + lambda_param_provenance: v2_rt::rc_empty_map::>(), +}); +let typed_item_results = infer_items(ctx.resolved_items.clone(), infer_scope); +let typed_items = Rc::new({ let mut __result = Vec::new(); for tir in typed_item_results.clone().iter().cloned() { __result.push(tir.item.clone()); } __result }); +let infer_diags = Rc::new({ let mut __result = Vec::new(); for tir in typed_item_results.clone().iter().cloned() { __result.extend((*tir.diagnostics.clone()).iter().cloned()); } __result }); +let updated_func_env = populate_output_provenance(typed_items.clone(), ctx.func_env.clone(), env.clone(), data_locals.clone()); +let reannotated_items = Rc::new({ let mut __result = Vec::new(); for item in typed_items.clone().iter().cloned() { __result.push(if (item.is_self_recursive.clone() && (item.body.clone() != None)) { + Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: item.children.clone(), + params: item.params.clone(), + inferred: item.inferred.clone(), + return_cardinality: item.return_cardinality.clone(), + uses: item.uses.clone(), + body: Some(annotate_descent_evidence(item.body.clone().clone().unwrap(), authored_name_at(source_indices.clone(), &item), &item.params.clone(), &env, data_locals.clone(), updated_func_env.signatures.clone())), + connective: item.connective.clone(), + transport: item.transport.clone(), + properties: item.properties.clone(), + type_annotation: item.type_annotation.clone(), + is_self_recursive: item.is_self_recursive.clone(), + has_non_tail_self_call: item.has_non_tail_self_call.clone(), + match_pattern: item.match_pattern.clone(), + expr_data: item.expr_data.clone(), + ident: None, +}) + } else { + item.clone() + }); } __result }); +let typed_base = module_node(&resolved_module_name, module_imports(resolved.module.clone()), ctx.resolved_items.clone(), &resolved.module.clone().span.clone()); +let typed_module = Rc::new(Node { ident_span: resolved.module.clone().ident_span.clone(), ..(*typed_base).clone() }); +Rc::new(TypecheckModuleResult { + typed: Rc::new(TypedModule { + module: typed_module, + items: reannotated_items, + type_env: env.clone(), + func_env: updated_func_env.clone(), + item_registry: ctx.item_registry.clone(), +}), + diagnostics: v2_rt::concat(v2_rt::concat(v2_rt::concat(env_diags.clone(), ctx.diagnostics.clone()), infer_diags), seed_diags.clone()), +}) +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -11213,494 +6489,287 @@ pub struct BindingsAccum { pub diagnostics: Rc>>, } -pub fn resolve_env_bindings( - env: &Rc, - module_name: String, - local_names: &Rc>, - deps_map: Rc>>>, -) -> Rc { +pub fn resolve_env_bindings(env: &Rc, module_name: String, local_names: &Rc>, deps_map: Rc>>>) -> Rc { { - let remaining = Rc::new({ - let mut __result = Vec::new(); - for b in Rc::new({ - let mut __result = Vec::new(); - for b in Rc::new(v2_rt::map_values(&env.bindings.clone())) - .iter() - .cloned() - { - if v2_rt::map_contains_key( - &local_names, - intern(&env.intern_table.clone(), &b.name.clone()) - .id - .clone(), - ) { - __result.push(b); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(b.name.clone()); - } - __result - }); - topo_resolve_types( - remaining.clone(), - env.clone(), - module_name, - Rc::new(vec![]), - local_names.clone(), - deps_map, - (remaining.clone().len() as i64), - ) - } + let remaining = Rc::new({ let mut __result = Vec::new(); for b in Rc::new({ let mut __result = Vec::new(); for b in Rc::new(v2_rt::map_values(&env.bindings.clone())).iter().cloned() { if v2_rt::map_contains_key(&local_names, intern(&env.intern_table.clone(), &b.name.clone()).id.clone()) { __result.push(b); } } __result }).iter().cloned() { __result.push(b.name.clone()); } __result }); +topo_resolve_types(remaining.clone(), env.clone(), module_name, Rc::new(vec![]), local_names.clone(), deps_map, (remaining.clone().len() as i64)) +} } -pub fn topo_resolve_types( - mut remaining: Rc>, - mut env: Rc, - mut module_name: String, - mut diagnostics: Rc>>, - mut local_names: Rc>, - mut deps_map: Rc>>>, - mut fuel: i64, -) -> Rc { +pub fn topo_resolve_types(mut remaining: Rc>, mut env: Rc, mut module_name: String, mut diagnostics: Rc>>, mut local_names: Rc>, mut deps_map: Rc>>>, mut fuel: i64) -> Rc { loop { if ((remaining.clone().len() as i64) == 0) { return Rc::new(EnvResolveResult { - env: env.clone(), - diagnostics: diagnostics.clone(), - }); + env: env.clone(), + diagnostics: diagnostics.clone(), +}) } - let remaining_set = remaining.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, name: String| { - v2_rt::rc_map_insert(acc, name.clone(), true) - }, - ); - let ready = Rc::new({ - let mut __result = Vec::new(); - for name in remaining.clone().iter().cloned() { - if match v2_rt::map_get(&deps_map, name.clone()) { - Some(deps) => { - let mut __all = true; - for dep in deps.clone().iter().cloned() { - if !((((is_kernel_type(dep.clone()) - || (dep.clone().as_str() == "None".to_string().as_str())) - || (dep.clone().as_str() == "".to_string().as_str())) - || is_recursive_type_by_name(&env, dep.clone())) - || (emit_map_has(remaining_set.clone(), dep.clone()) == false)) - { - __all = false; - break; - } - } - __all - } - None => true, - } { - __result.push(name); - } - } - __result - }); - if ((ready.clone().len() as i64) == 0) { +let remaining_set = remaining.clone().iter().cloned().fold(empty_set(), |acc: Rc>, name: String| set_insert(acc, name.clone())); +let ready = Rc::new({ let mut __result = Vec::new(); for name in remaining.clone().iter().cloned() { if match v2_rt::map_get(&deps_map, name.clone()) { + Some(deps) => { let mut __all = true; for dep in deps.clone().iter().cloned() { if !(((((is_kernel_type(dep.clone()) || (dep.clone().as_str() == "None".to_string().as_str())) || (dep.clone().as_str() == "".to_string().as_str())) || is_recursive_type_by_name(&env, dep.clone())) || (set_contains(remaining_set.clone(), dep.clone()) == false))) { __all = false; break; } } __all }, + None => true, +} { __result.push(name); } } __result }); +if ((ready.clone().len() as i64) == 0) { { - let stuck_accum = remaining.clone().iter().cloned().fold( - Rc::new(BindingsAccum { - bindings: env.bindings.clone(), - diagnostics: Rc::new(vec![]), - }), - |acc: Rc, name: String| { - let ident = intern(&env.intern_table.clone(), &name).id.clone(); - match v2_rt::map_get(&env.bindings.clone(), ident.clone()) { - Some(binding) => { - let result = resolve_node( - binding.resolved.clone(), - env.clone(), - module_name.clone(), - ); - Rc::new(BindingsAccum { - bindings: v2_rt::rc_map_insert( - acc.bindings.clone(), - ident.clone(), - Rc::new(TypeBinding { - name: name.clone(), - resolved: result.resolved.clone(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), - }), - ), - diagnostics: v2_rt::concat( - acc.diagnostics.clone(), - result.diagnostics.clone(), - ), - }) - } - None => acc.clone(), - } - }, - ); - return Rc::new(EnvResolveResult { - env: Rc::new(TypeEnv { - bindings: stuck_accum.bindings.clone(), - recursive_types: env.recursive_types.clone(), - recursive_type_set: env.recursive_type_set.clone(), - inductive_fields: env.inductive_fields.clone(), - source_indices: env.source_indices.clone(), - intern_table: env.intern_table.clone(), - }), - diagnostics: v2_rt::concat( - diagnostics.clone(), - stuck_accum.diagnostics.clone(), - ), - }); - } + let stuck_accum = remaining.clone().iter().cloned().fold(Rc::new(BindingsAccum { + bindings: env.bindings.clone(), + diagnostics: Rc::new(vec![]), +}), |acc: Rc, name: String| { + let ident = intern(&env.intern_table.clone(), &name).id.clone(); +match v2_rt::map_get(&env.bindings.clone(), ident.clone()) { + Some(binding) => { + let result = resolve_node(binding.resolved.clone(), env.clone(), module_name.clone()); +Rc::new(BindingsAccum { + bindings: v2_rt::rc_map_insert(acc.bindings.clone(), ident.clone(), Rc::new(TypeBinding { + name: name.clone(), + resolved: result.resolved.clone(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), +})), + diagnostics: v2_rt::concat(acc.diagnostics.clone(), result.diagnostics.clone()), +}) +}, + None => acc.clone(), +} +}); +return Rc::new(EnvResolveResult { + env: Rc::new(TypeEnv { + bindings: stuck_accum.bindings.clone(), + recursive_types: env.recursive_types.clone(), + recursive_type_set: env.recursive_type_set.clone(), + inductive_fields: env.inductive_fields.clone(), + source_indices: env.source_indices.clone(), + intern_table: env.intern_table.clone(), +}), + diagnostics: v2_rt::concat(diagnostics.clone(), stuck_accum.diagnostics.clone()), +}) +} } - let ready_accum = ready.clone().iter().cloned().fold( - Rc::new(BindingsAccum { - bindings: env.bindings.clone(), - diagnostics: Rc::new(vec![]), - }), - |acc: Rc, name: String| { - let ident = intern(&env.intern_table.clone(), &name).id.clone(); - match v2_rt::map_get(&env.bindings.clone(), ident.clone()) { - Some(binding) => { - let result = resolve_node( - binding.resolved.clone(), - env.clone(), - module_name.clone(), - ); - Rc::new(BindingsAccum { - bindings: v2_rt::rc_map_insert( - acc.bindings.clone(), - ident.clone(), - Rc::new(TypeBinding { - name: name.clone(), - resolved: result.resolved.clone(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), - }), - ), - diagnostics: v2_rt::concat( - acc.diagnostics.clone(), - result.diagnostics.clone(), - ), - }) - } - None => acc.clone(), - } - }, - ); - let ready_set = ready.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, name: String| { - v2_rt::rc_map_insert(acc, name.clone(), true) - }, - ); - let next_remaining = Rc::new({ - let mut __result = Vec::new(); - for name in remaining.clone().iter().cloned() { - if (emit_map_has(ready_set.clone(), name.clone()) == false) { - __result.push(name); - } - } - __result - }); - { +let ready_accum = ready.clone().iter().cloned().fold(Rc::new(BindingsAccum { + bindings: env.bindings.clone(), + diagnostics: Rc::new(vec![]), +}), |acc: Rc, name: String| { + let ident = intern(&env.intern_table.clone(), &name).id.clone(); +match v2_rt::map_get(&env.bindings.clone(), ident.clone()) { + Some(binding) => { + let result = resolve_node(binding.resolved.clone(), env.clone(), module_name.clone()); +Rc::new(BindingsAccum { + bindings: v2_rt::rc_map_insert(acc.bindings.clone(), ident.clone(), Rc::new(TypeBinding { + name: name.clone(), + resolved: result.resolved.clone(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), +})), + diagnostics: v2_rt::concat(acc.diagnostics.clone(), result.diagnostics.clone()), +}) +}, + None => acc.clone(), +} +}); +let ready_set = ready.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, name.clone(), true)); +let next_remaining = Rc::new({ let mut __result = Vec::new(); for name in remaining.clone().iter().cloned() { if (emit_map_has(ready_set.clone(), name.clone()) == false) { __result.push(name); } } __result }); +{ let __tco_0 = next_remaining; - let __tco_1 = Rc::new(TypeEnv { - bindings: ready_accum.bindings.clone(), - recursive_types: env.recursive_types.clone(), - recursive_type_set: env.recursive_type_set.clone(), - inductive_fields: env.inductive_fields.clone(), - source_indices: env.source_indices.clone(), - intern_table: env.intern_table.clone(), - }); - let __tco_2 = v2_rt::concat(diagnostics, ready_accum.diagnostics.clone()); - let __tco_3 = (fuel - 1); - remaining = __tco_0; - env = __tco_1; - diagnostics = __tco_2; - fuel = __tco_3; - continue; - } - } +let __tco_1 = Rc::new(TypeEnv { + bindings: ready_accum.bindings.clone(), + recursive_types: env.recursive_types.clone(), + recursive_type_set: env.recursive_type_set.clone(), + inductive_fields: env.inductive_fields.clone(), + source_indices: env.source_indices.clone(), + intern_table: env.intern_table.clone(), +}); +let __tco_2 = v2_rt::concat(diagnostics, ready_accum.diagnostics.clone()); +let __tco_3 = (fuel - 1); +remaining = __tco_0; +env = __tco_1; +diagnostics = __tco_2; +fuel = __tco_3; +continue; +} +} } -pub fn collect_parent_envs( - resolved: &Rc, - module_index: Rc>>, - source_indices: Rc>>, -) -> Rc { +pub fn collect_parent_envs(resolved: &Rc, module_index: Rc>>, source_indices: Rc>>) -> Rc { { - let modules = Rc::new({ - let mut __result = Vec::new(); - for imp in resolved.resolved_imports.clone().iter().cloned() { - __result.extend( - (*match v2_rt::map_get(&module_index, imp.module_path.clone()) { - Some(typed) => Rc::new(vec![typed.clone()]), - None => Rc::new(vec![]), - }) - .iter() - .cloned(), - ); - } - __result - }); - let resolved_mod_name = authored_name_at(source_indices, &resolved.module.clone()); - let diagnostics = Rc::new({ - let mut __result = Vec::new(); - for imp in resolved.resolved_imports.clone().iter().cloned() { - __result.extend( - (*match v2_rt::map_get(&module_index, imp.module_path.clone()) { - Some(_) => Rc::new(vec![]), - None => Rc::new(vec![make_error_node( - Rc::new(CompilerDiagnostic::InternalError { - message: v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "missing parent environment for imported module '" - .to_string(), - imp.module_path.clone(), - ), - "' while ordering '".to_string(), - ), - resolved_mod_name.clone(), - ), - "'".to_string(), - ), - span: imp.target_module.clone().clone().unwrap().span.clone(), - }), - resolved_mod_name.clone(), - )]), - }) - .iter() - .cloned(), - ); - } - __result - }); - Rc::new(ParentModulesResult { - modules: modules, - diagnostics: diagnostics, + let modules = Rc::new({ let mut __result = Vec::new(); for imp in resolved.resolved_imports.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&module_index, imp.module_path.clone()) { + Some(typed) => Rc::new(vec![typed.clone()]), + None => Rc::new(vec![]), +}).iter().cloned()); } __result }); +let resolved_mod_name = authored_name_at(source_indices, &resolved.module.clone()); +let diagnostics = Rc::new({ let mut __result = Vec::new(); for imp in resolved.resolved_imports.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&module_index, imp.module_path.clone()) { + Some(_) => Rc::new(vec![]), + None => Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::InternalError { + message: v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("missing parent environment for imported module '".to_string(), imp.module_path.clone()), "' while ordering '".to_string()), resolved_mod_name.clone()), "'".to_string()), + span: imp.target_module.clone().clone().unwrap().span.clone(), +}), resolved_mod_name.clone())]), +}).iter().cloned()); } __result }); +Rc::new(ParentModulesResult { + modules: modules, + diagnostics: diagnostics, +}) +} +} + +pub fn infer_literal_string_value(n: Rc) -> Option { + match (*n.expr_data.clone()).clone() { + ExprData::ExprLiteral { value: lv, .. } => match (*lv.clone()).clone() { + LiteralValue::LitStr { value: s, .. } => Some(s.clone()), + _ => None, +}, + _ => None, +} +} + +pub fn infer_field_value_by_name(record: Rc, field_name: String, source_indices: Rc>>) -> Option> { + match Rc::new({ let mut __result = Vec::new(); for fi in record.children.clone().iter().cloned() { if (field_init_node_name_at(fi.clone(), source_indices.clone()).as_str() == field_name.clone().as_str()) { __result.push(fi); } } __result }).first().cloned() { + Some(fi) => Some(field_init_node_value(&fi)), + None => None, +} +} + +pub fn infer_record_string_field(record: Rc, field_name: String, source_indices: Rc>>) -> Option { + match infer_field_value_by_name(record, field_name, source_indices) { + Some(vn) => infer_literal_string_value(vn.clone()), + None => None, +} +} + +pub fn build_untagged_json_tuple_variants(modules: Rc>>) -> Rc> { + modules.iter().cloned().fold(empty_set(), |acc: Rc>, m: Rc| { + let si = m.type_env.clone().source_indices.clone(); +m.items.clone().iter().cloned().fold(acc, |inner: Rc>, item: Rc| if (item_kind(&item) == ItemKind::DataItem) { + match item.body.clone() { + Some(body) => match infer_record_string_field(body.clone(), "coproduct".to_string(), si.clone()) { + Some(coproduct_name) => match infer_field_value_by_name(body.clone(), "encoding".to_string(), si.clone()) { + Some(enc_node) => if (authored_name_at(si.clone(), &enc_node).as_str() == "UntaggedJsonStringOrArray".to_string().as_str()) { + match infer_record_string_field(enc_node.clone(), "string_variant".to_string(), si.clone()) { + Some(sv) => match infer_record_string_field(enc_node.clone(), "array_variant".to_string(), si.clone()) { + Some(av) => { + let k1 = v2_rt::concat(v2_rt::concat(coproduct_name.clone(), "::".to_string()), sv.clone()); +let k2 = v2_rt::concat(v2_rt::concat(coproduct_name.clone(), "::".to_string()), av.clone()); +set_insert(set_insert(inner.clone(), k1.clone()), k2.clone()) +}, + None => inner.clone(), +}, + None => inner.clone(), +} + } else { + inner.clone() + }, + None => inner.clone(), +}, + None => inner.clone(), +}, + None => inner.clone(), +} + } else { + inner.clone() }) - } +}) } -pub fn build_fielded_variants( - modules: Rc>>, - type_summaries: Rc>>, -) -> Rc> { +pub fn build_fielded_variants(modules: Rc>>, type_summaries: Rc>>) -> Rc> { { - let result = modules.iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, m: Rc| { - let items = m.items.clone(); - let si = m.type_env.clone().source_indices.clone(); - items.clone().iter().cloned().fold( - acc, - |inner: Rc>, item: Rc| { - let is_enum = match v2_rt::map_get( - &type_summaries, - authored_name_at(si.clone(), &item), - ) { - Some(summary) => match (*summary.repr.clone()).clone() { - TypeRepr::EnumRepr { .. } => true, - _ => false, - }, - None => false, - }; - if is_enum.clone() { - { - let enum_name = authored_name_at(si.clone(), &item); - let variants = item.children.clone(); - variants.clone().iter().cloned().fold( - inner.clone(), - |vacc: Rc>, variant: Rc| { - let has_fields = - ((variant.children.clone().len() as i64) > 0); - if has_fields.clone() { - v2_rt::rc_map_insert( - vacc.clone(), - v2_rt::concat( - v2_rt::concat( - enum_name.clone(), - "::".to_string(), - ), - authored_name_at(si.clone(), &variant), - ), - true, - ) - } else { - vacc.clone() - } - }, - ) + let result = modules.iter().cloned().fold(empty_set(), |acc: Rc>, m: Rc| { + let items = m.items.clone(); +let si = m.type_env.clone().source_indices.clone(); +items.clone().iter().cloned().fold(acc, |inner: Rc>, item: Rc| { + let is_enum = match v2_rt::map_get(&type_summaries, authored_name_at(si.clone(), &item)) { + Some(summary) => match (*summary.repr.clone()).clone() { + TypeRepr::EnumRepr { .. } => true, + _ => false, +}, + None => false, +}; +if is_enum.clone() { + { + let enum_name = authored_name_at(si.clone(), &item); +let variants = item.children.clone(); +variants.clone().iter().cloned().fold(inner.clone(), |vacc: Rc>, variant: Rc| { + let has_fields = ((variant.children.clone().len() as i64) > 0); +if has_fields.clone() { + set_insert(vacc.clone(), v2_rt::concat(v2_rt::concat(enum_name.clone(), "::".to_string()), authored_name_at(si.clone(), &variant))) + } else { + vacc.clone() } - } else { - inner.clone() - } - }, - ) - }, - ); - result - } +}) +} + } else { + inner.clone() + } +}) +}); +result +} } pub fn build_emit_graph_info(modules: &Rc>>) -> Rc { { let init = Rc::new(EmitInfoBuildState { - type_summaries: v2_rt::rc_empty_map::>(), - }); - let built = modules.clone().iter().cloned().fold( - init.clone(), - |state: Rc, typed_module: Rc| { - typed_module.items.clone().iter().cloned().fold( - state, - |inner_state: Rc, item: Rc| { - add_emit_item_summary( - inner_state, - &item, - &typed_module.type_env.clone().source_indices.clone(), - ) - }, - ) - }, - ); - let all_recursive = modules.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, m: Rc| { - Rc::new(v2_rt::map_keys( - &m.type_env.clone().recursive_type_set.clone(), - )) - .iter() - .cloned() - .fold(acc, |inner: Rc>, ident: i64| { - v2_rt::rc_map_insert( - inner, - intern_str(m.type_env.clone().intern_table.clone(), ident.clone()), - true, - ) - }) - }, - ); - let fielded = build_fielded_variants(modules.clone(), built.type_summaries.clone()); - let vtoe = derive_variant_to_enum(built.type_summaries.clone()); - Rc::new(EmitGraphInfo { - type_summaries: built.type_summaries.clone(), - recursive_type_set: all_recursive, - fielded_variants: fielded, - shared_types: v2_rt::rc_empty_map::(), - ownership_index: v2_rt::rc_empty_map::>>(), - movable: v2_rt::rc_empty_map::(), - variant_to_enum: vtoe, - owned_bindings: v2_rt::rc_empty_map::(), - read_only_params_index: v2_rt::rc_empty_map::>>(), - read_only_params: v2_rt::rc_empty_map::(), - }) - } + type_summaries: v2_rt::rc_empty_map::>(), +}); +let built = modules.clone().iter().cloned().fold(init.clone(), |state: Rc, typed_module: Rc| typed_module.items.clone().iter().cloned().fold(state, |inner_state: Rc, item: Rc| add_emit_item_summary(inner_state, &item, &typed_module.type_env.clone().source_indices.clone()))); +let all_recursive = modules.clone().iter().cloned().fold(empty_set(), |acc: Rc>, m: Rc| Rc::new(v2_rt::map_keys(&m.type_env.clone().recursive_type_set.clone())).iter().cloned().fold(acc, |inner: Rc>, ident: i64| set_insert(inner, intern_str(m.type_env.clone().intern_table.clone(), ident.clone())))); +let fielded = build_fielded_variants(modules.clone(), built.type_summaries.clone()); +let untagged_tuples = build_untagged_json_tuple_variants(modules.clone()); +let vtoe = derive_variant_to_enum(built.type_summaries.clone()); +Rc::new(EmitGraphInfo { + type_summaries: built.type_summaries.clone(), + recursive_type_set: all_recursive, + fielded_variants: fielded, + untagged_json_tuple_variants: untagged_tuples, + shared_types: empty_set(), + ownership_index: v2_rt::rc_empty_map::>>(), + movable: empty_set(), + variant_to_enum: vtoe, + owned_bindings: empty_set(), + read_only_params_index: v2_rt::rc_empty_map::>>(), + read_only_params: empty_set(), +}) +} } -pub fn typecheck( - graph: Rc, - source_indices: Rc>>, - intern_table: Rc, -) -> Rc { - typecheck_modules( - graph.modules.clone(), - Rc::new(vec![]), - v2_rt::rc_empty_map::>(), - v2_rt::rc_empty_map::>(), - Rc::new(vec![]), - source_indices, - intern_table, - ) -} - -pub fn typecheck_modules( - mut remaining: Rc>>, - mut modules: Rc>>, - mut module_index: Rc>>, - mut item_registry: Rc>>, - mut diag_chunks: Rc>>>>, - mut source_indices: Rc>>, - mut intern_table: Rc, -) -> Rc { - loop { - match remaining.clone().first().cloned() { - None => { - let expanded_registry = - expand_transitive_services(modules.clone(), item_registry, 5); - break Rc::new(TypedGraph { - modules: modules.clone(), - item_registry: expanded_registry, - diagnostics: Rc::new({ - let mut __result = Vec::new(); - for c in diag_chunks.iter().cloned() { - __result.extend((*c.clone()).iter().cloned()); - } - __result - }), - }); - } - Some(resolved) => { - let parent_result = - collect_parent_envs(&resolved, module_index.clone(), source_indices.clone()); - let tc_result = typecheck_module( - &resolved, - &module_index, - &source_indices, - intern_table.clone(), - ); - let typed = tc_result.typed.clone(); - let tc_diags = tc_result.diagnostics.clone(); - { - let __tco_0 = Rc::new( - remaining - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - let __tco_1 = v2_rt::rc_list_push(modules, typed.clone()); - let __tco_2 = v2_rt::rc_map_insert( - module_index, - authored_name_at(source_indices.clone(), &typed.module.clone()), - typed.clone(), - ); - let __tco_3 = v2_rt::rc_map_merge(item_registry, typed.item_registry.clone()); - let __tco_4 = v2_rt::rc_list_push( - v2_rt::rc_list_push(diag_chunks, parent_result.diagnostics.clone()), - tc_diags, - ); - remaining = __tco_0; - modules = __tco_1; - module_index = __tco_2; - item_registry = __tco_3; - diag_chunks = __tco_4; - continue; - } - } - } - } +pub fn typecheck(graph: Rc, source_indices: Rc>>, intern_table: Rc) -> Rc { + typecheck_modules(graph.modules.clone(), Rc::new(vec![]), v2_rt::rc_empty_map::>(), v2_rt::rc_empty_map::>(), Rc::new(vec![]), source_indices, intern_table) } -pub fn reconcile( - graph: Rc, - source_indices: Rc>>, - intern_table: Rc, -) -> Rc { +pub fn typecheck_modules(mut remaining: Rc>>, mut modules: Rc>>, mut module_index: Rc>>, mut item_registry: Rc>>, mut diag_chunks: Rc>>>>, mut source_indices: Rc>>, mut intern_table: Rc) -> Rc { + loop { + match remaining.clone().first().cloned() { + None => { let expanded_registry = expand_transitive_services(modules.clone(), item_registry, 5); +break Rc::new(TypedGraph { + modules: modules.clone(), + item_registry: expanded_registry, + diagnostics: Rc::new({ let mut __result = Vec::new(); for c in diag_chunks.iter().cloned() { __result.extend((*c.clone()).iter().cloned()); } __result }), +}); }, + Some(resolved) => { let parent_result = collect_parent_envs(&resolved, module_index.clone(), source_indices.clone()); +let tc_result = typecheck_module(&resolved, &module_index, &source_indices, intern_table.clone()); +let typed = tc_result.typed.clone(); +let tc_diags = tc_result.diagnostics.clone(); +{ + let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); +let __tco_1 = v2_rt::rc_list_push(modules, typed.clone()); +let __tco_2 = v2_rt::rc_map_insert(module_index, authored_name_at(source_indices.clone(), &typed.module.clone()), typed.clone()); +let __tco_3 = v2_rt::rc_map_merge(item_registry, typed.item_registry.clone()); +let __tco_4 = v2_rt::rc_list_push(v2_rt::rc_list_push(diag_chunks, parent_result.diagnostics.clone()), tc_diags); +remaining = __tco_0; +modules = __tco_1; +module_index = __tco_2; +item_registry = __tco_3; +diag_chunks = __tco_4; +continue; +} }, +} +} +} + +pub fn reconcile(graph: Rc, source_indices: Rc>>, intern_table: Rc) -> Rc { { let typed = typecheck(graph, source_indices, intern_table); - let emit_info = build_emit_graph_info(&typed.modules.clone()); - Rc::new(ResolvedGraph { - modules: typed.modules.clone(), - item_registry: typed.item_registry.clone(), - diagnostics: typed.diagnostics.clone(), - emit_graph_info: emit_info, - }) - } +let emit_info = build_emit_graph_info(&typed.modules.clone()); +Rc::new(ResolvedGraph { + modules: typed.modules.clone(), + item_registry: typed.item_registry.clone(), + diagnostics: typed.diagnostics.clone(), + emit_graph_info: emit_info, +}) +} } diff --git a/src/v2/stage0/src/v2_compiler_infer_access.rs b/src/v2/stage0/src/v2_compiler_infer_access.rs index 5351728cdb0..88ef0d55a1d 100644 --- a/src/v2/stage0/src/v2_compiler_infer_access.rs +++ b/src/v2/stage0/src/v2_compiler_infer_access.rs @@ -1,22 +1,16 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_access -pub use crate::std_types::{is_ordered_element_collection, SourceSpan}; -pub use crate::v2_compiler_infer_types::{ - for_each_element_type_node, node_is_element_collection, node_is_keyed_collection, - node_type_equals, normalize_access_type_node, resolved_type, -}; -use crate::v2_rt; -use crate::v2_std_core::CompilerDiagnostic::InternalError; -use crate::v2_std_core::InferredNode::{CompilerError, Resolved}; -pub use crate::v2_std_core::{ - authored_name_at, diagnostic_to_message, int_type, make_error_node, string_type, unit_type, - with_optional_cardinality, CompilerDiagnostic, ErrorNode, InferredNode, NewlineIndex, Node, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_types::{SourceSpan, is_ordered_element_collection}; +pub use crate::v2_std_core::{Node, NewlineIndex, authored_name_at, InferredNode, ErrorNode, make_error_node, diagnostic_to_message, with_optional_cardinality, unit_type, string_type, int_type, CompilerDiagnostic}; +use crate::v2_std_core::InferredNode::{Resolved, CompilerError}; +use crate::v2_std_core::CompilerDiagnostic::{InternalError}; +pub use crate::v2_compiler_infer_types::{resolved_type, normalize_access_type_node, node_type_equals, node_is_keyed_collection, node_is_element_collection, for_each_element_type_node}; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct AccessCheckResultNode { @@ -31,210 +25,124 @@ pub struct KeyedCollectionParts { } pub fn access_error(message: String, span: Rc, module_name: String) -> Rc { - make_error_node( - Rc::new(CompilerDiagnostic::InternalError { - message: message, - span: span, - }), - module_name, - ) + make_error_node(Rc::new(CompilerDiagnostic::InternalError { + message: message, + span: span, +}), module_name) } -pub fn access_result( - inferred: Rc, - diagnostics: &Rc>>, - span: Rc, - fallback_message: String, -) -> Rc { +pub fn access_result(inferred: Rc, diagnostics: &Rc>>, span: Rc, fallback_message: String) -> Rc { if ((diagnostics.clone().len() as i64) == 0) { Rc::new(AccessCheckResultNode { - inferred: Some(Rc::new(InferredNode::Resolved { node: inferred })), - diagnostics: diagnostics.clone(), - }) + inferred: Some(Rc::new(InferredNode::Resolved { + node: inferred, +})), + diagnostics: diagnostics.clone(), +}) } else { { let message = match diagnostics.clone().first().cloned() { - Some(diag) => diagnostic_to_message(diag.diagnostic.clone()), - None => fallback_message, - }; - Rc::new(AccessCheckResultNode { - inferred: Some(Rc::new(InferredNode::CompilerError { - message: message, - span: span, - })), - diagnostics: diagnostics.clone(), - }) - } + Some(diag) => diagnostic_to_message(diag.diagnostic.clone()), + None => fallback_message, +}; +Rc::new(AccessCheckResultNode { + inferred: Some(Rc::new(InferredNode::CompilerError { + message: message, + span: span, +})), + diagnostics: diagnostics.clone(), +}) +} } } -pub fn keyed_collection_parts( - n: &Rc, - source_indices: Rc>>, -) -> Option> { +pub fn keyed_collection_parts(n: &Rc, source_indices: Rc>>) -> Option> { if (node_is_keyed_collection(&n, source_indices) && ((n.children.clone().len() as i64) >= 2)) { match n.children.clone().first().cloned() { - Some(key_child) => match n.children.clone().get(1 as usize).cloned() { - Some(value_child) => Some(Rc::new(KeyedCollectionParts { - key_type: resolved_type(key_child.clone()), - value_type: resolved_type(value_child.clone()), - })), - None => None, - }, - None => None, - } + Some(key_child) => match n.children.clone().get(1 as usize).cloned() { + Some(value_child) => Some(Rc::new(KeyedCollectionParts { + key_type: resolved_type(key_child.clone()), + value_type: resolved_type(value_child.clone()), +})), + None => None, +}, + None => None, +} } else { None } } -pub fn check_index_access_node( - base_type: Rc, - index_type: Rc, - span: &Rc, - module_name: String, - source_indices: &Rc>>, -) -> Rc { +pub fn check_index_access_node(base_type: Rc, index_type: Rc, span: &Rc, module_name: String, source_indices: &Rc>>) -> Rc { { let normed = normalize_access_type_node(base_type); - let normed_index = normalize_access_type_node(index_type); - let base_is_string = node_type_equals(&normed, &string_type(), source_indices.clone()); - let index_is_int = node_type_equals(&normed_index, &int_type(), source_indices.clone()); - if base_is_string { +let normed_index = normalize_access_type_node(index_type); +let base_is_string = node_type_equals(&normed, &string_type(), source_indices.clone()); +let index_is_int = node_type_equals(&normed_index, &int_type(), source_indices.clone()); +if base_is_string { { let diags = if index_is_int { Rc::new(vec![]) } else { - Rc::new(vec![access_error( - "string index requires an Int index".to_string(), - span.clone(), - module_name, - )]) + Rc::new(vec![access_error("string index requires an Int index".to_string(), span.clone(), module_name)]) }; - access_result( - string_type(), - &diags, - span.clone(), - "invalid string index access".to_string(), - ) - } +access_result(string_type(), &diags, span.clone(), "invalid string index access".to_string()) +} } else { match keyed_collection_parts(&normed, source_indices.clone()) { - Some(parts) => { - let key_diags = if node_type_equals( - &parts.key_type.clone(), - &normed_index, - source_indices.clone(), - ) { - Rc::new(vec![]) - } else { - Rc::new(vec![access_error("keyed collection index key type does not match the collection key type".to_string(), span.clone(), module_name)]) - }; - access_result( - with_optional_cardinality(&parts.value_type.clone()), - &key_diags, - span.clone(), - "invalid keyed collection index access".to_string(), - ) - } - None => { - if node_is_keyed_collection(&normed, source_indices.clone()) { - { - let malformed_diags = Rc::new(vec![access_error( - "malformed keyed collection type in index access".to_string(), - span.clone(), - module_name, - )]); - access_result( - unit_type(), - &malformed_diags, - span.clone(), - "malformed keyed collection type in index access".to_string(), - ) - } - } else { - if ((is_ordered_element_collection(authored_name_at( - source_indices.clone(), - &normed, - )) && node_is_element_collection(&normed, source_indices.clone())) - && index_is_int) - { - { - let elem = for_each_element_type_node( - normed.clone(), - source_indices.clone(), - ); - access_result( - with_optional_cardinality(&elem), - &Rc::new(vec![]), - span.clone(), - "list index access".to_string(), - ) - } - } else { - { - let diags = Rc::new(vec![access_error("indexing is only supported for String, keyed collection, and list values".to_string(), span.clone(), module_name)]); - access_result( - unit_type(), - &diags, - span.clone(), - "invalid index access".to_string(), - ) - } - } - } + Some(parts) => { + let key_diags = if node_type_equals(&parts.key_type.clone(), &normed_index, source_indices.clone()) { + Rc::new(vec![]) + } else { + Rc::new(vec![access_error("keyed collection index key type does not match the collection key type".to_string(), span.clone(), module_name)]) + }; +access_result(with_optional_cardinality(&parts.value_type.clone()), &key_diags, span.clone(), "invalid keyed collection index access".to_string()) +}, + None => if node_is_keyed_collection(&normed, source_indices.clone()) { + { + let malformed_diags = Rc::new(vec![access_error("malformed keyed collection type in index access".to_string(), span.clone(), module_name)]); +access_result(unit_type(), &malformed_diags, span.clone(), "malformed keyed collection type in index access".to_string()) +} + } else { + if ((is_ordered_element_collection(authored_name_at(source_indices.clone(), &normed)) && node_is_element_collection(&normed, source_indices.clone())) && index_is_int) { + { + let elem = for_each_element_type_node(normed.clone(), source_indices.clone()); +access_result(with_optional_cardinality(&elem), &Rc::new(vec![]), span.clone(), "list index access".to_string()) +} + } else { + { + let diags = Rc::new(vec![access_error("indexing is only supported for String, keyed collection, and list values".to_string(), span.clone(), module_name)]); +access_result(unit_type(), &diags, span.clone(), "invalid index access".to_string()) +} } - } + }, +} } - } +} } -pub fn check_slice_access_node( - base_type: Rc, - start_type: Rc, - end_type: Rc, - span: &Rc, - module_name: &String, - source_indices: &Rc>>, -) -> Rc { +pub fn check_slice_access_node(base_type: Rc, start_type: Rc, end_type: Rc, span: &Rc, module_name: &String, source_indices: &Rc>>) -> Rc { { let normed_base = normalize_access_type_node(base_type); - let base_is_string = node_type_equals(&normed_base, &string_type(), source_indices.clone()); - let base_diags = if base_is_string { +let base_is_string = node_type_equals(&normed_base, &string_type(), source_indices.clone()); +let base_diags = if base_is_string { Rc::new(vec![]) } else { - Rc::new(vec![access_error( - "slice is only supported for String values".to_string(), - span.clone(), - module_name.clone(), - )]) + Rc::new(vec![access_error("slice is only supported for String values".to_string(), span.clone(), module_name.clone())]) }; - let normed_start = normalize_access_type_node(start_type); - let start_diags = if node_type_equals(&normed_start, &int_type(), source_indices.clone()) { +let normed_start = normalize_access_type_node(start_type); +let start_diags = if node_type_equals(&normed_start, &int_type(), source_indices.clone()) { Rc::new(vec![]) } else { - Rc::new(vec![access_error( - "slice start requires an Int index".to_string(), - span.clone(), - module_name.clone(), - )]) + Rc::new(vec![access_error("slice start requires an Int index".to_string(), span.clone(), module_name.clone())]) }; - let normed_end = normalize_access_type_node(end_type); - let end_diags = if node_type_equals(&normed_end, &int_type(), source_indices.clone()) { +let normed_end = normalize_access_type_node(end_type); +let end_diags = if node_type_equals(&normed_end, &int_type(), source_indices.clone()) { Rc::new(vec![]) } else { - Rc::new(vec![access_error( - "slice end requires an Int index".to_string(), - span.clone(), - module_name.clone(), - )]) + Rc::new(vec![access_error("slice end requires an Int index".to_string(), span.clone(), module_name.clone())]) }; - let all_diags = v2_rt::concat(v2_rt::concat(base_diags, start_diags), end_diags); - access_result( - string_type(), - &all_diags, - span.clone(), - "invalid slice access".to_string(), - ) - } +let all_diags = v2_rt::concat(v2_rt::concat(base_diags, start_diags), end_diags); +access_result(string_type(), &all_diags, span.clone(), "invalid slice access".to_string()) +} } diff --git a/src/v2/stage0/src/v2_compiler_infer_cycle.rs b/src/v2/stage0/src/v2_compiler_infer_cycle.rs index f174744c84e..6b4a4441abf 100644 --- a/src/v2/stage0/src/v2_compiler_infer_cycle.rs +++ b/src/v2/stage0/src/v2_compiler_infer_cycle.rs @@ -1,144 +1,67 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_cycle -pub use crate::v2_compiler_infer_env::TypeBinding; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::v2_compiler_infer_env::{TypeBinding}; -pub fn set_has(m: Rc>, key: String) -> bool { +pub fn compute_in_graph_deps(all_names: Rc>, deps_map: Rc>>>, name_set: Rc>) -> Rc>>> { { - let result = match v2_rt::map_get(&m, key) { - Some(_) => true, - None => false, - }; - result - } + let result = all_names.iter().cloned().fold(v2_rt::rc_empty_map::>>(), |acc: Rc>>>, name: String| match v2_rt::map_get(&deps_map, name.clone()) { + Some(deps) => { + let local = Rc::new({ let mut __result = Vec::new(); for d in deps.clone().iter().cloned() { if ((d.clone().as_str() != name.clone().as_str()) && set_contains(name_set.clone(), d.clone())) { __result.push(d); } } __result }); +v2_rt::rc_map_insert(acc.clone(), name.clone(), local.clone()) +}, + None => v2_rt::rc_map_insert(acc.clone(), name.clone(), Rc::new(vec![])), +}); +result } - -pub fn compute_in_graph_deps( - all_names: Rc>, - deps_map: Rc>>>, - name_set: Rc>, -) -> Rc>>> { - { - let result = all_names.iter().cloned().fold( - v2_rt::rc_empty_map::>>(), - |acc: Rc>>>, name: String| match v2_rt::map_get( - &deps_map, - name.clone(), - ) { - Some(deps) => { - let local = Rc::new({ - let mut __result = Vec::new(); - for d in deps.clone().iter().cloned() { - if ((d.clone().as_str() != name.clone().as_str()) - && set_has(name_set.clone(), d.clone())) - { - __result.push(d); - } - } - __result - }); - v2_rt::rc_map_insert(acc.clone(), name.clone(), local.clone()) - } - None => v2_rt::rc_map_insert(acc.clone(), name.clone(), Rc::new(vec![])), - }, - ); - result - } } -pub fn build_reverse_adj( - all_names: Rc>, - local_deps: Rc>>>, -) -> Rc>>> { - all_names.iter().cloned().fold( - v2_rt::rc_empty_map::>>(), - |acc: Rc>>>, name: String| match v2_rt::map_get( - &local_deps, - name.clone(), - ) { - Some(deps) => deps.clone().iter().cloned().fold( - acc.clone(), - |inner_acc: Rc>>>, dep: String| { - let existing = match v2_rt::map_get(&inner_acc, dep.clone()) { - Some(v) => v.clone(), - None => Rc::new(vec![]), - }; - v2_rt::rc_map_insert( - inner_acc.clone(), - dep.clone(), - v2_rt::rc_list_push(existing.clone(), name.clone()), - ) - }, - ), - None => acc.clone(), - }, - ) +pub fn build_reverse_adj(all_names: Rc>, local_deps: Rc>>>) -> Rc>>> { + all_names.iter().cloned().fold(v2_rt::rc_empty_map::>>(), |acc: Rc>>>, name: String| match v2_rt::map_get(&local_deps, name.clone()) { + Some(deps) => deps.clone().iter().cloned().fold(acc.clone(), |inner_acc: Rc>>>, dep: String| { + let existing = match v2_rt::map_get(&inner_acc, dep.clone()) { + Some(v) => v.clone(), + None => Rc::new(vec![]), +}; +v2_rt::rc_map_insert(inner_acc.clone(), dep.clone(), v2_rt::rc_list_push(existing.clone(), name.clone())) +}), + None => acc.clone(), +}) } -pub fn build_in_degree( - all_names: Rc>, - local_deps: Rc>>>, -) -> Rc> { - all_names.iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, name: String| { - let deg = match v2_rt::map_get(&local_deps, name.clone()) { - Some(deps) => (deps.clone().len() as i64), - None => 0, - }; - v2_rt::rc_map_insert(acc, name.clone(), deg.clone()) - }, - ) +pub fn build_in_degree(all_names: Rc>, local_deps: Rc>>>) -> Rc> { + all_names.iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| { + let deg = match v2_rt::map_get(&local_deps, name.clone()) { + Some(deps) => (deps.clone().len() as i64), + None => 0, +}; +v2_rt::rc_map_insert(acc, name.clone(), deg.clone()) +}) } -pub fn kahn_remove_loop( - remaining: &Rc>, - local_deps: &Rc>>>, -) -> Rc> { +pub fn kahn_remove_loop(remaining: &Rc>, local_deps: &Rc>>>) -> Rc> { { let reverse_adj = build_reverse_adj(remaining.clone(), local_deps.clone()); - let in_degree = build_in_degree(remaining.clone(), local_deps.clone()); - let initial_queue = Rc::new({ - let mut __result = Vec::new(); - for n in remaining.clone().iter().cloned() { - if match v2_rt::map_get(&in_degree, n.clone()) { - Some(d) => (d.clone() == 0), - None => true, - } { - __result.push(n); - } - } - __result - }); - let final_state = kahn_cycle_drain( - initial_queue, - in_degree.clone(), - reverse_adj, - 0, - (remaining.clone().len() as i64), - ); - if (final_state.removed_count.clone() == (remaining.clone().len() as i64)) { +let in_degree = build_in_degree(remaining.clone(), local_deps.clone()); +let initial_queue = Rc::new({ let mut __result = Vec::new(); for n in remaining.clone().iter().cloned() { if match v2_rt::map_get(&in_degree, n.clone()) { + Some(d) => (d.clone() == 0), + None => true, +} { __result.push(n); } } __result }); +let final_state = kahn_cycle_drain(initial_queue, in_degree.clone(), reverse_adj, 0, (remaining.clone().len() as i64)); +if (final_state.removed_count.clone() == (remaining.clone().len() as i64)) { Rc::new(vec![]) } else { - Rc::new({ - let mut __result = Vec::new(); - for n in remaining.clone().iter().cloned() { - if match v2_rt::map_get(&final_state.in_degree.clone(), n.clone()) { - Some(d) => (d.clone() > 0), - None => false, - } { - __result.push(n); - } - } - __result - }) + Rc::new({ let mut __result = Vec::new(); for n in remaining.clone().iter().cloned() { if match v2_rt::map_get(&final_state.in_degree.clone(), n.clone()) { + Some(d) => (d.clone() > 0), + None => false, +} { __result.push(n); } } __result }) } - } +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -147,147 +70,78 @@ pub struct KahnState { pub removed_count: i64, } -pub fn kahn_cycle_drain( - mut queue: Rc>, - mut in_degree: Rc>, - mut reverse_adj: Rc>>>, - mut removed_count: i64, - mut fuel: i64, -) -> Rc { +pub fn kahn_cycle_drain(mut queue: Rc>, mut in_degree: Rc>, mut reverse_adj: Rc>>>, mut removed_count: i64, mut fuel: i64) -> Rc { loop { if ((queue.clone().len() as i64) == 0) { return Rc::new(KahnState { - in_degree: in_degree.clone(), - removed_count: removed_count.clone(), - }); + in_degree: in_degree.clone(), + removed_count: removed_count.clone(), +}) } - let result = queue.clone().iter().cloned().fold( - Rc::new(KahnState { - in_degree: in_degree.clone(), - removed_count: removed_count.clone(), - }), - |state: Rc, node: String| { - let state = Rc::try_unwrap(state).unwrap_or_else(|rc| (*rc).clone()); - { - let dependents = match v2_rt::map_get(&reverse_adj, node.clone()) { - Some(v) => v.clone(), - None => Rc::new(vec![]), - }; - let new_deg = dependents.clone().iter().cloned().fold( - state.in_degree, - |deg_acc: Rc>, dep: String| { - let old = match v2_rt::map_get(°_acc, dep.clone()) { - Some(d) => d.clone(), - None => 0, - }; - v2_rt::rc_map_insert(deg_acc.clone(), dep.clone(), (old.clone() - 1)) - }, - ); - Rc::new(KahnState { - in_degree: new_deg.clone(), - removed_count: (state.removed_count + 1), - }) +let result = queue.clone().iter().cloned().fold(Rc::new(KahnState { + in_degree: in_degree.clone(), + removed_count: removed_count.clone(), +}), |state: Rc, node: String| { let state = Rc::try_unwrap(state).unwrap_or_else(|rc| (*rc).clone()); { + let dependents = match v2_rt::map_get(&reverse_adj, node.clone()) { + Some(v) => v.clone(), + None => Rc::new(vec![]), +}; +let new_deg = dependents.clone().iter().cloned().fold(state.in_degree, |deg_acc: Rc>, dep: String| { + let old = match v2_rt::map_get(°_acc, dep.clone()) { + Some(d) => d.clone(), + None => 0, +}; +v2_rt::rc_map_insert(deg_acc.clone(), dep.clone(), (old.clone() - 1)) +}); +Rc::new(KahnState { + in_degree: new_deg.clone(), + removed_count: (state.removed_count + 1), +}) +} }); +let next_queue = queue.clone().iter().cloned().fold(Rc::new(vec![]), |acc: _, node: String| { + let dependents = match v2_rt::map_get(&reverse_adj, node.clone()) { + Some(v) => v.clone(), + None => Rc::new(vec![]), +}; +dependents.clone().iter().cloned().fold(acc, |inner_acc: _, dep: String| { + let deg = match v2_rt::map_get(&result.in_degree.clone(), dep.clone()) { + Some(d) => d.clone(), + None => 0, +}; +if (deg.clone() == 0) { + v2_rt::rc_list_push(inner_acc.clone(), dep.clone()) + } else { + inner_acc.clone() } - }, - ); - let next_queue = - queue - .clone() - .iter() - .cloned() - .fold(Rc::new(vec![]), |acc: _, node: String| { - let dependents = match v2_rt::map_get(&reverse_adj, node.clone()) { - Some(v) => v.clone(), - None => Rc::new(vec![]), - }; - dependents - .clone() - .iter() - .cloned() - .fold(acc, |inner_acc: _, dep: String| { - let deg = match v2_rt::map_get(&result.in_degree.clone(), dep.clone()) { - Some(d) => d.clone(), - None => 0, - }; - if (deg.clone() == 0) { - v2_rt::rc_list_push(inner_acc.clone(), dep.clone()) - } else { - inner_acc.clone() - } - }) - }); - { +}) +}); +{ let __tco_0 = next_queue; - let __tco_1 = result.in_degree.clone(); - let __tco_2 = result.removed_count.clone(); - let __tco_3 = (fuel - 1); - queue = __tco_0; - in_degree = __tco_1; - removed_count = __tco_2; - fuel = __tco_3; - continue; - } - } +let __tco_1 = result.in_degree.clone(); +let __tco_2 = result.removed_count.clone(); +let __tco_3 = (fuel - 1); +queue = __tco_0; +in_degree = __tco_1; +removed_count = __tco_2; +fuel = __tco_3; +continue; +} +} } -pub fn detect_type_cycles_kahn( - deps_map: &Rc>>>, - bindings: Rc>>, -) -> Rc> { +pub fn detect_type_cycles_kahn(deps_map: &Rc>>>, bindings: Rc>>) -> Rc> { { - let all_names = Rc::new({ - let mut __result = Vec::new(); - for b in Rc::new(v2_rt::map_values(&bindings)).iter().cloned() { - __result.push(b.name.clone()); - } - __result - }); - let name_set = all_names.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, n: String| v2_rt::rc_map_insert(acc, n.clone(), true), - ); - let local_deps = compute_in_graph_deps(all_names.clone(), deps_map.clone(), name_set); - let self_refs = Rc::new({ - let mut __result = Vec::new(); - for name in all_names.clone().iter().cloned() { - if match v2_rt::map_get(&deps_map, name.clone()) { - Some(deps) => { - let mut __found = false; - for d in deps.clone().iter().cloned() { - if (d.clone().as_str() == name.clone().as_str()) { - __found = true; - break; - } - } - __found - } - None => false, - } { - __result.push(name); - } - } - __result - }); - let cycle_members = kahn_remove_loop(&all_names, &local_deps); - let sr_set = self_refs.iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, n: String| v2_rt::rc_map_insert(acc, n.clone(), true), - ); - let cm_set = cycle_members - .iter() - .cloned() - .fold(sr_set, |acc: Rc>, n: String| { - v2_rt::rc_map_insert(acc, n.clone(), true) - }); - let result = Rc::new({ - let mut __result = Vec::new(); - for n in all_names.clone().iter().cloned() { - if set_has(cm_set.clone(), n.clone()) { - __result.push(n); - } - } - __result - }); - result - } + let all_names = Rc::new({ let mut __result = Vec::new(); for b in Rc::new(v2_rt::map_values(&bindings)).iter().cloned() { __result.push(b.name.clone()); } __result }); +let name_set = all_names.clone().iter().cloned().fold(empty_set(), |acc: Rc>, n: String| set_insert(acc, n.clone())); +let local_deps = compute_in_graph_deps(all_names.clone(), deps_map.clone(), name_set); +let self_refs = Rc::new({ let mut __result = Vec::new(); for name in all_names.clone().iter().cloned() { if match v2_rt::map_get(&deps_map, name.clone()) { + Some(deps) => { let mut __found = false; for d in deps.clone().iter().cloned() { if (d.clone().as_str() == name.clone().as_str()) { __found = true; break; } } __found }, + None => false, +} { __result.push(name); } } __result }); +let cycle_members = kahn_remove_loop(&all_names, &local_deps); +let sr_set = self_refs.iter().cloned().fold(empty_set(), |acc: Rc>, n: String| set_insert(acc, n.clone())); +let cm_set = cycle_members.iter().cloned().fold(sr_set, |acc: Rc>, n: String| set_insert(acc, n.clone())); +let result = Rc::new({ let mut __result = Vec::new(); for n in all_names.clone().iter().cloned() { if set_contains(cm_set.clone(), n.clone()) { __result.push(n); } } __result }); +result +} } diff --git a/src/v2/stage0/src/v2_compiler_infer_emit_info.rs b/src/v2/stage0/src/v2_compiler_infer_emit_info.rs index 67d890b8ea6..d3b94c905b6 100644 --- a/src/v2/stage0/src/v2_compiler_infer_emit_info.rs +++ b/src/v2/stage0/src/v2_compiler_infer_emit_info.rs @@ -1,46 +1,40 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_emit_info -use self::TypeRepr::*; -pub use crate::v2_compiler_infer_types::{ - child_type_node, emit_map_has, node_type_equals, normalize_access_type_node, -}; -use crate::v2_rt; -use crate::v2_std_core::Cardinality::CardOptional; -use crate::v2_std_core::Connective::{Arrow, Conj, NoConnective}; -use crate::v2_std_core::FieldAccessStyle::{EnumAccessor, StoredField, TupleFirst, TupleSecond}; -use crate::v2_std_core::FieldValueShape::{OptionalValue, PlainValue}; -use crate::v2_std_core::InferredNode::{Resolved, TypeVariable}; -pub use crate::v2_std_core::{ - authored_name_at, find_child_named, has_child_named, param_node_name_at, - with_required_cardinality, Cardinality, Connective, FieldAccessStyle, FieldSummary, - FieldValueShape, InferredNode, NewlineIndex, Node, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::v2_std_core::{Node, authored_name_at, NewlineIndex, find_child_named, has_child_named, InferredNode, FieldAccessStyle, FieldValueShape, FieldSummary, with_required_cardinality, Connective, param_node_name_at, Cardinality}; +use crate::v2_std_core::InferredNode::{Resolved, TypeVariable}; +use crate::v2_std_core::FieldAccessStyle::{StoredField, EnumAccessor, TupleFirst, TupleSecond}; +use crate::v2_std_core::FieldValueShape::{PlainValue, OptionalValue}; +use crate::v2_std_core::Connective::{Conj, NoConnective, Arrow}; +use crate::v2_std_core::Cardinality::{CardOptional}; +pub use crate::v2_compiler_infer_types::{normalize_access_type_node, child_type_node, emit_map_has, node_type_equals}; +use self::TypeRepr::*; pub fn is_type_variable(inferred: Rc) -> bool { match (*inferred).clone() { - InferredNode::TypeVariable { .. } => true, - _ => false, - } + InferredNode::TypeVariable { .. } => true, + _ => false, +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum TypeRepr { StructRepr, - EnumRepr { unit_only: bool }, + EnumRepr { + unit_only: bool, + }, } impl TypeRepr { pub fn unit_only(&self) -> bool { match self { TypeRepr::StructRepr => panic!("no unit_only on unit variant"), - TypeRepr::EnumRepr { - unit_only: __val, .. - } => __val.clone(), + TypeRepr::EnumRepr { unit_only: __val, .. } => __val.clone(), } } } @@ -59,15 +53,16 @@ pub struct TypeSummary { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct EmitGraphInfo { pub type_summaries: Rc>>, - pub recursive_type_set: Rc>, - pub fielded_variants: Rc>, - pub shared_types: Rc>, - pub ownership_index: Rc>>>, - pub movable: Rc>, + pub recursive_type_set: Rc>, + pub fielded_variants: Rc>, + pub untagged_json_tuple_variants: Rc>, + pub shared_types: Rc>, + pub ownership_index: Rc>>>, + pub movable: Rc>, pub variant_to_enum: Rc>, - pub owned_bindings: Rc>, - pub read_only_params_index: Rc>>>, - pub read_only_params: Rc>, + pub owned_bindings: Rc>, + pub read_only_params_index: Rc>>>, + pub read_only_params: Rc>, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -77,532 +72,251 @@ pub struct EmitInfoBuildState { pub fn empty_emit_graph_info() -> Rc { Rc::new(EmitGraphInfo { - type_summaries: v2_rt::rc_empty_map::>(), - recursive_type_set: v2_rt::rc_empty_map::(), - fielded_variants: v2_rt::rc_empty_map::(), - shared_types: v2_rt::rc_empty_map::(), - ownership_index: v2_rt::rc_empty_map::>>(), - movable: v2_rt::rc_empty_map::(), - variant_to_enum: v2_rt::rc_empty_map::(), - owned_bindings: v2_rt::rc_empty_map::(), - read_only_params_index: v2_rt::rc_empty_map::>>(), - read_only_params: v2_rt::rc_empty_map::(), - }) + type_summaries: v2_rt::rc_empty_map::>(), + recursive_type_set: empty_set(), + fielded_variants: empty_set(), + untagged_json_tuple_variants: empty_set(), + shared_types: empty_set(), + ownership_index: v2_rt::rc_empty_map::>>(), + movable: empty_set(), + variant_to_enum: v2_rt::rc_empty_map::(), + owned_bindings: empty_set(), + read_only_params_index: v2_rt::rc_empty_map::>>(), + read_only_params: empty_set(), +}) } -pub fn variant_has_fields( - emit_info: Rc, - enum_name: String, - variant_name: String, -) -> bool { +pub fn variant_has_fields(emit_info: Rc, enum_name: String, variant_name: String) -> bool { { let key = v2_rt::concat(v2_rt::concat(enum_name, "::".to_string()), variant_name); - match v2_rt::map_get(&emit_info.fielded_variants.clone(), key) { - Some(v) => v.clone(), - None => false, - } - } +set_contains(emit_info.fielded_variants.clone(), key) +} } -pub fn lookup_emit_type_summary( - emit_info: Rc, - type_name: String, -) -> Option> { +pub fn lookup_emit_type_summary(emit_info: Rc, type_name: String) -> Option> { v2_rt::map_get(&emit_info.type_summaries.clone(), type_name) } -pub fn derive_variant_to_enum( - type_summaries: Rc>>, -) -> Rc> { - Rc::new(v2_rt::map_values(&type_summaries)) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, summary: Rc| match (*summary - .repr - .clone()) - .clone() - { - TypeRepr::EnumRepr { .. } => { - Rc::new(v2_rt::map_keys(&summary.variant_name_set.clone())) - .iter() - .cloned() - .fold( - acc.clone(), - |inner: Rc>, vn: String| match v2_rt::map_get( - &inner, - vn.clone(), - ) { - Some(_) => { - v2_rt::rc_map_insert(inner.clone(), vn.clone(), "".to_string()) - } - None => v2_rt::rc_map_insert( - inner.clone(), - vn.clone(), - summary.name.clone(), - ), - }, - ) - } - _ => acc.clone(), - }, - ) +pub fn derive_variant_to_enum(type_summaries: Rc>>) -> Rc> { + Rc::new(v2_rt::map_values(&type_summaries)).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, summary: Rc| match (*summary.repr.clone()).clone() { + TypeRepr::EnumRepr { .. } => Rc::new(v2_rt::map_keys(&summary.variant_name_set.clone())).iter().cloned().fold(acc.clone(), |inner: Rc>, vn: String| match v2_rt::map_get(&inner, vn.clone()) { + Some(_) => v2_rt::rc_map_insert(inner.clone(), vn.clone(), "".to_string()), + None => v2_rt::rc_map_insert(inner.clone(), vn.clone(), summary.name.clone()), +}), + _ => acc.clone(), +}) } -pub fn is_known_variant( - type_summaries: Rc>>, - name: String, -) -> bool { - { - let mut __found = false; - for summary in Rc::new(v2_rt::map_values(&type_summaries)).iter().cloned() { - if match (*summary.repr.clone()).clone() { - TypeRepr::EnumRepr { .. } => { - emit_map_has(summary.variant_name_set.clone(), name.clone()) - } - _ => false, - } { - __found = true; - break; - } - } - __found - } +pub fn is_known_variant(type_summaries: Rc>>, name: String) -> bool { + { let mut __found = false; for summary in Rc::new(v2_rt::map_values(&type_summaries)).iter().cloned() { if match (*summary.repr.clone()).clone() { + TypeRepr::EnumRepr { .. } => emit_map_has(summary.variant_name_set.clone(), name.clone()), + _ => false, +} { __found = true; break; } } __found } } -pub fn variant_belongs_to_enum( - type_summaries: Rc>>, - variant_name: String, - enum_name: String, -) -> bool { +pub fn variant_belongs_to_enum(type_summaries: Rc>>, variant_name: String, enum_name: String) -> bool { match v2_rt::map_get(&type_summaries, enum_name) { - Some(summary) => match (*summary.repr.clone()).clone() { - TypeRepr::EnumRepr { .. } => { - emit_map_has(summary.variant_name_set.clone(), variant_name) - } - _ => false, - }, - None => false, - } + Some(summary) => match (*summary.repr.clone()).clone() { + TypeRepr::EnumRepr { .. } => emit_map_has(summary.variant_name_set.clone(), variant_name), + _ => false, +}, + None => false, +} } -pub fn is_enum_in_summaries( - type_summaries: Rc>>, - type_name: String, -) -> bool { +pub fn is_enum_in_summaries(type_summaries: Rc>>, type_name: String) -> bool { match v2_rt::map_get(&type_summaries, type_name) { - Some(summary) => match (*summary.repr.clone()).clone() { - TypeRepr::EnumRepr { .. } => true, - _ => false, - }, - None => false, - } + Some(summary) => match (*summary.repr.clone()).clone() { + TypeRepr::EnumRepr { .. } => true, + _ => false, +}, + None => false, +} } -pub fn find_variant_parent( - type_summaries: Rc>>, - variant_name: String, - scope_enums: Rc>, -) -> Option { - Rc::new({ - let mut __result = Vec::new(); - for en in scope_enums.iter().cloned() { - if variant_belongs_to_enum(type_summaries.clone(), variant_name.clone(), en.clone()) { - __result.push(en); - } - } - __result - }) - .first() - .cloned() +pub fn find_variant_parent(type_summaries: Rc>>, variant_name: String, scope_enums: Rc>) -> Option { + Rc::new({ let mut __result = Vec::new(); for en in scope_enums.iter().cloned() { if variant_belongs_to_enum(type_summaries.clone(), variant_name.clone(), en.clone()) { __result.push(en); } } __result }).first().cloned() } pub fn field_value_shape_from_type_node(type_node: Rc) -> FieldValueShape { { let normed = normalize_access_type_node(type_node); - let is_optional = (normed.return_cardinality.clone() == Cardinality::CardOptional); - if is_optional { +let is_optional = (normed.return_cardinality.clone() == Cardinality::CardOptional); +if is_optional { FieldValueShape::OptionalValue } else { FieldValueShape::PlainValue } - } +} } pub fn is_tuple_type(n: &Rc) -> bool { - (((n.connective.clone() == Connective::Conj) && (n.ident_span.clone() == None)) - && ((n.children.clone().len() as i64) == 2)) + (((n.connective.clone() == Connective::Conj) && (n.ident_span.clone() == None)) && ((n.children.clone().len() as i64) == 2)) } -pub fn build_struct_field_summaries( - parent: &Rc, - source_indices: Rc>>, -) -> Rc>> { +pub fn build_struct_field_summaries(parent: &Rc, source_indices: Rc>>) -> Rc>> { { let is_pair = is_tuple_type(&parent); - Rc::new( - parent - .children - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, pair: (i64, Rc)| { - let idx = pair.0.clone(); - let child = pair.1.clone(); - if (child.inferred.clone() == None) { - acc.clone() - } else { - { - let style = if is_pair.clone() { - if (idx.clone() == 0) { - FieldAccessStyle::TupleFirst - } else { - FieldAccessStyle::TupleSecond - } +Rc::new(parent.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, pair: (i64, Rc)| { + let idx = pair.0.clone(); +let child = pair.1.clone(); +if (child.inferred.clone() == None) { + acc.clone() + } else { + { + let style = if is_pair.clone() { + if (idx.clone() == 0) { + FieldAccessStyle::TupleFirst } else { - FieldAccessStyle::StoredField - }; - let key = authored_name_at(source_indices.clone(), &child); - v2_rt::rc_map_insert( - acc.clone(), - key.clone(), - Rc::new(FieldSummary { - access_style: style.clone(), - value_shape: field_value_shape_from_type_node(child_type_node( - &child, - )), - }), - ) - } - } - }, - ) - } + FieldAccessStyle::TupleSecond + } + } else { + FieldAccessStyle::StoredField + }; +let key = authored_name_at(source_indices.clone(), &child); +v2_rt::rc_map_insert(acc.clone(), key.clone(), Rc::new(FieldSummary { + access_style: style.clone(), + value_shape: field_value_shape_from_type_node(child_type_node(&child)), +})) +} + } +}) +} } -pub fn find_first_enum_field_node( - variants: Rc>>, - field_name: String, - source_indices: Rc>>, -) -> Option> { +pub fn find_first_enum_field_node(variants: Rc>>, field_name: String, source_indices: Rc>>) -> Option> { match variants.first().cloned() { - Some(variant) => match find_child_named(variant.clone(), field_name, source_indices) { - Some(field_child) => Some(field_child.clone()), - None => None, - }, - None => None, - } + Some(variant) => match find_child_named(variant.clone(), field_name, source_indices) { + Some(field_child) => Some(field_child.clone()), + None => None, +}, + None => None, +} } -pub fn enum_field_present_in_all_variants( - variants: Rc>>, - field_name: String, - source_indices: Rc>>, -) -> bool { - { - let mut __all = true; - for variant in variants.iter().cloned() { - if !(has_child_named(variant.clone(), field_name.clone(), source_indices.clone())) { - __all = false; - break; - } - } - __all - } +pub fn enum_field_present_in_all_variants(variants: Rc>>, field_name: String, source_indices: Rc>>) -> bool { + { let mut __all = true; for variant in variants.iter().cloned() { if !(has_child_named(variant.clone(), field_name.clone(), source_indices.clone())) { __all = false; break; } } __all } } -pub fn enum_field_type_consistent( - variants: Rc>>, - field_name: String, - expected: Rc, - source_indices: Rc>>, -) -> bool { - { - let mut __all = true; - for variant in variants.iter().cloned() { - if !(match find_child_named(variant.clone(), field_name.clone(), source_indices.clone()) - { - Some(field_child) => node_type_equals( - &child_type_node(&field_child), - &expected, - source_indices.clone(), - ), - None => false, - }) { - __all = false; - break; - } - } - __all - } +pub fn enum_field_type_consistent(variants: Rc>>, field_name: String, expected: Rc, source_indices: Rc>>) -> bool { + { let mut __all = true; for variant in variants.iter().cloned() { if !(match find_child_named(variant.clone(), field_name.clone(), source_indices.clone()) { + Some(field_child) => node_type_equals(&child_type_node(&field_child), &expected, source_indices.clone()), + None => false, +}) { __all = false; break; } } __all } } -pub fn build_enum_field_summaries( - variants: &Rc>>, - source_indices: Rc>>, -) -> Rc>> { +pub fn build_enum_field_summaries(variants: &Rc>>, source_indices: Rc>>) -> Rc>> { { let first_field_names = match variants.clone().first().cloned() { - Some(first_variant) => Rc::new({ - let mut __result = Vec::new(); - for f in first_variant.children.clone().iter().cloned() { - __result.push(authored_name_at(source_indices.clone(), &f)); - } - __result - }), - None => Rc::new(vec![]), - }; - let shared = Rc::new({ - let mut __result = Vec::new(); - for field_name in first_field_names.iter().cloned() { - if enum_field_present_in_all_variants( - variants.clone(), - field_name.clone(), - source_indices.clone(), - ) { - __result.push(field_name); - } - } - __result - }); - let consistent = Rc::new({ - let mut __result = Vec::new(); - for field_name in shared.iter().cloned() { - if match find_first_enum_field_node( - variants.clone(), - field_name.clone(), - source_indices.clone(), - ) { - Some(first_field) => enum_field_type_consistent( - variants.clone(), - field_name.clone(), - child_type_node(&first_field), - source_indices.clone(), - ), - None => false, - } { - __result.push(field_name); - } - } - __result - }); - consistent.iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, field_name: String| { - match find_first_enum_field_node( - variants.clone(), - field_name.clone(), - source_indices.clone(), - ) { - Some(first_field) => v2_rt::rc_map_insert( - acc.clone(), - field_name.clone(), - Rc::new(FieldSummary { - access_style: FieldAccessStyle::EnumAccessor, - value_shape: field_value_shape_from_type_node(child_type_node( - &first_field, - )), - }), - ), - None => acc.clone(), - } - }, - ) - } + Some(first_variant) => Rc::new({ let mut __result = Vec::new(); for f in first_variant.children.clone().iter().cloned() { __result.push(authored_name_at(source_indices.clone(), &f)); } __result }), + None => Rc::new(vec![]), +}; +let shared = Rc::new({ let mut __result = Vec::new(); for field_name in first_field_names.iter().cloned() { if enum_field_present_in_all_variants(variants.clone(), field_name.clone(), source_indices.clone()) { __result.push(field_name); } } __result }); +let consistent = Rc::new({ let mut __result = Vec::new(); for field_name in shared.iter().cloned() { if match find_first_enum_field_node(variants.clone(), field_name.clone(), source_indices.clone()) { + Some(first_field) => enum_field_type_consistent(variants.clone(), field_name.clone(), child_type_node(&first_field), source_indices.clone()), + None => false, +} { __result.push(field_name); } } __result }); +consistent.iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, field_name: String| match find_first_enum_field_node(variants.clone(), field_name.clone(), source_indices.clone()) { + Some(first_field) => v2_rt::rc_map_insert(acc.clone(), field_name.clone(), Rc::new(FieldSummary { + access_style: FieldAccessStyle::EnumAccessor, + value_shape: field_value_shape_from_type_node(child_type_node(&first_field)), +})), + None => acc.clone(), +}) +} } -pub fn build_field_type_map( - children: Rc>>, - source_indices: Rc>>, -) -> Rc> { - children.iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, child: Rc| match child - .inferred - .clone() - .as_deref() - .cloned() - { - Some(InferredNode::Resolved { node: ft, .. }) => { - let resolved_name = authored_name_at( - source_indices.clone(), - &normalize_access_type_node(ft.clone()), - ); - let ft_is_type_var = if (ft.inferred.clone() != None) { - is_type_variable(ft.inferred.clone().clone().unwrap()) - } else { - false - }; - let key = authored_name_at(source_indices.clone(), &child); - if (((resolved_name.clone().as_str() != "".to_string().as_str()) - && !ft_is_type_var.clone()) - && (resolved_name.clone().as_str() != "Dynamic".to_string().as_str())) - { - v2_rt::rc_map_insert(acc.clone(), key.clone(), resolved_name.clone()) - } else { - acc.clone() - } - } - _ => acc.clone(), - }, - ) +pub fn build_field_type_map(children: Rc>>, source_indices: Rc>>) -> Rc> { + children.iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, child: Rc| match child.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: ft, .. }) => { + let resolved_name = authored_name_at(source_indices.clone(), &normalize_access_type_node(ft.clone())); +let ft_is_type_var = if (ft.inferred.clone() != None) { + is_type_variable(ft.inferred.clone().clone().unwrap()) + } else { + false + }; +let key = authored_name_at(source_indices.clone(), &child); +if (((resolved_name.clone().as_str() != "".to_string().as_str()) && !ft_is_type_var.clone()) && (resolved_name.clone().as_str() != "Dynamic".to_string().as_str())) { + v2_rt::rc_map_insert(acc.clone(), key.clone(), resolved_name.clone()) + } else { + acc.clone() + } +}, + _ => acc.clone(), +}) } -pub fn build_type_summary( - item: &Rc, - source_indices: &Rc>>, -) -> Option> { +pub fn build_type_summary(item: &Rc, source_indices: &Rc>>) -> Option> { { - if (((item.connective.clone() == Connective::NoConnective) - || (item.connective.clone() == Connective::Arrow)) - || (item.transport.clone() != None)) - { - return None; + if (((item.connective.clone() == Connective::NoConnective) || (item.connective.clone() == Connective::Arrow)) || (item.transport.clone() != None)) { + return None } - let gpn = Rc::new({ - let mut __result = Vec::new(); - for p in item.params.clone().iter().cloned() { - __result.push(param_node_name_at(p.clone(), source_indices.clone())); - } - __result - }); - let is_product = (item.connective.clone() == Connective::Conj); - let has_fn = { - let mut __found = false; - for child in item.children.clone().iter().cloned() { - if match child.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - (rt.connective.clone() == Connective::Arrow) - } - _ => false, - } { - __found = true; - break; - } - } - __found - }; - if is_product { +let gpn = Rc::new({ let mut __result = Vec::new(); for p in item.params.clone().iter().cloned() { __result.push(param_node_name_at(p.clone(), source_indices.clone())); } __result }); +let is_product = (item.connective.clone() == Connective::Conj); +let has_fn = { let mut __found = false; for child in item.children.clone().iter().cloned() { if match child.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => (rt.connective.clone() == Connective::Arrow), + _ => false, +} { __found = true; break; } } __found }; +if is_product { Some(Rc::new(TypeSummary { - name: authored_name_at(source_indices.clone(), &item), - repr: Rc::new(TypeRepr::StructRepr), - field_summaries: build_struct_field_summaries(&item, source_indices.clone()), - field_type_map: build_field_type_map(item.children.clone(), source_indices.clone()), - variant_name_set: v2_rt::rc_empty_map::(), - generic_param_names: gpn, - has_fn_fields: has_fn, - })) + name: authored_name_at(source_indices.clone(), &item), + repr: Rc::new(TypeRepr::StructRepr), + field_summaries: build_struct_field_summaries(&item, source_indices.clone()), + field_type_map: build_field_type_map(item.children.clone(), source_indices.clone()), + variant_name_set: v2_rt::rc_empty_map::(), + generic_param_names: gpn, + has_fn_fields: has_fn, +})) } else { { - let unit_only = { - let mut __all = true; - for child in item.children.clone().iter().cloned() { - if !((child.children.clone().len() as i64) == 0) { - __all = false; - break; - } - } - __all - }; - Some(Rc::new(TypeSummary { - name: authored_name_at(source_indices.clone(), &item), - repr: Rc::new(TypeRepr::EnumRepr { - unit_only: unit_only, - }), - field_summaries: build_enum_field_summaries( - &item.children.clone(), - source_indices.clone(), - ), - field_type_map: v2_rt::rc_empty_map::(), - variant_name_set: item.children.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, child: Rc| { - v2_rt::rc_map_insert( - acc, - authored_name_at(source_indices.clone(), &child), - true, - ) - }, - ), - generic_param_names: gpn, - has_fn_fields: has_fn, - })) - } + let unit_only = { let mut __all = true; for child in item.children.clone().iter().cloned() { if !(((child.children.clone().len() as i64) == 0)) { __all = false; break; } } __all }; +Some(Rc::new(TypeSummary { + name: authored_name_at(source_indices.clone(), &item), + repr: Rc::new(TypeRepr::EnumRepr { + unit_only: unit_only, +}), + field_summaries: build_enum_field_summaries(&item.children.clone(), source_indices.clone()), + field_type_map: v2_rt::rc_empty_map::(), + variant_name_set: item.children.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, child: Rc| v2_rt::rc_map_insert(acc, authored_name_at(source_indices.clone(), &child), true)), + generic_param_names: gpn, + has_fn_fields: has_fn, +})) +} } - } +} } -pub fn add_emit_item_summary( - state: Rc, - item: &Rc, - source_indices: &Rc>>, -) -> Rc { +pub fn add_emit_item_summary(state: Rc, item: &Rc, source_indices: &Rc>>) -> Rc { match build_type_summary(&item, &source_indices) { - Some(summary) => { - let with_variants = match (*summary.repr.clone()).clone() { - TypeRepr::EnumRepr { .. } => item.children.clone().iter().cloned().fold( - state.type_summaries.clone(), - |acc: Rc>>, variant: Rc| { - if ((variant.children.clone().len() as i64) > 0) { - { - let v_has_fn = { - let mut __found = false; - for vc in variant.children.clone().iter().cloned() { - if match vc.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - (rt.connective.clone() == Connective::Arrow) - } - _ => false, - } { - __found = true; - break; - } - } - __found - }; - let vname = authored_name_at(source_indices.clone(), &variant); - v2_rt::rc_map_insert( - acc.clone(), - vname.clone(), - Rc::new(TypeSummary { - name: vname.clone(), - repr: Rc::new(TypeRepr::StructRepr), - field_summaries: build_struct_field_summaries( - &variant, - source_indices.clone(), - ), - field_type_map: build_field_type_map( - variant.children.clone(), - source_indices.clone(), - ), - variant_name_set: v2_rt::rc_empty_map::(), - generic_param_names: Rc::new(vec![]), - has_fn_fields: v_has_fn.clone(), - }), - ) - } - } else { - acc.clone() - } - }, - ), - _ => state.type_summaries.clone(), - }; - let next_summaries = - v2_rt::rc_map_insert(with_variants, summary.name.clone(), summary.clone()); - Rc::new(EmitInfoBuildState { - type_summaries: next_summaries, - }) - } - None => state, - } + Some(summary) => { + let with_variants = match (*summary.repr.clone()).clone() { + TypeRepr::EnumRepr { .. } => item.children.clone().iter().cloned().fold(state.type_summaries.clone(), |acc: Rc>>, variant: Rc| if ((variant.children.clone().len() as i64) > 0) { + { + let v_has_fn = { let mut __found = false; for vc in variant.children.clone().iter().cloned() { if match vc.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => (rt.connective.clone() == Connective::Arrow), + _ => false, +} { __found = true; break; } } __found }; +let vname = authored_name_at(source_indices.clone(), &variant); +v2_rt::rc_map_insert(acc.clone(), vname.clone(), Rc::new(TypeSummary { + name: vname.clone(), + repr: Rc::new(TypeRepr::StructRepr), + field_summaries: build_struct_field_summaries(&variant, source_indices.clone()), + field_type_map: build_field_type_map(variant.children.clone(), source_indices.clone()), + variant_name_set: v2_rt::rc_empty_map::(), + generic_param_names: Rc::new(vec![]), + has_fn_fields: v_has_fn.clone(), +})) +} + } else { + acc.clone() + }), + _ => state.type_summaries.clone(), +}; +let next_summaries = v2_rt::rc_map_insert(with_variants, summary.name.clone(), summary.clone()); +Rc::new(EmitInfoBuildState { + type_summaries: next_summaries, +}) +}, + None => state, +} } diff --git a/src/v2/stage0/src/v2_compiler_infer_env.rs b/src/v2/stage0/src/v2_compiler_infer_env.rs index 0fce851de90..d3dc148b5eb 100644 --- a/src/v2/stage0/src/v2_compiler_infer_env.rs +++ b/src/v2/stage0/src/v2_compiler_infer_env.rs @@ -1,18 +1,15 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_env -use crate::std_induction::RecursionShape::{DirectRecursion, ListRecursion, OptionalRecursion}; -use crate::std_induction::SubValueRelation::{PreservedValue, SubValueUnknown}; -pub use crate::std_induction::{InductiveField, RecursionShape, SubValueRelation}; -use crate::v2_rt; -pub use crate::v2_std_core::{ - authored_name_at, empty_intern_table, intern, intern_find, intern_str, merge_intern_tables, - source_text_at, InternTable, NewlineIndex, Node, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::v2_std_core::{Node, NewlineIndex, InternTable, empty_intern_table, merge_intern_tables, intern, intern_find, intern_str, source_text_at, authored_name_at}; +pub use crate::std_induction::{InductiveField, RecursionShape, SubValueRelation}; +use crate::std_induction::RecursionShape::{DirectRecursion, ListRecursion, OptionalRecursion}; +use crate::std_induction::SubValueRelation::{SubValueUnknown, PreservedValue}; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct TypeEnv { @@ -33,30 +30,30 @@ pub struct TypeBinding { pub fn is_recursive_type(env: Rc, ident: i64) -> bool { match v2_rt::map_get(&env.recursive_type_set.clone(), ident) { - Some(_) => true, - _ => false, - } + Some(_) => true, + _ => false, +} } pub fn is_recursive_type_by_name(env: &Rc, name: String) -> bool { match intern_find(env.intern_table.clone(), name) { - Some(id) => is_recursive_type(env.clone(), id.clone()), - None => false, - } + Some(id) => is_recursive_type(env.clone(), id.clone()), + None => false, +} } pub fn lookup_type(env: Rc, ident: i64) -> Option> { match v2_rt::map_get(&env.bindings.clone(), ident) { - Some(binding) => Some(binding.resolved.clone()), - None => None, - } + Some(binding) => Some(binding.resolved.clone()), + None => None, +} } pub fn lookup_type_by_name(env: &Rc, name: String) -> Option> { match intern_find(env.intern_table.clone(), name) { - Some(id) => lookup_type(env.clone(), id.clone()), - None => None, - } + Some(id) => lookup_type(env.clone(), id.clone()), + None => None, +} } pub fn authored_name(env: Rc, node: Rc) -> String { @@ -65,192 +62,102 @@ pub fn authored_name(env: Rc, node: Rc) -> String { pub fn lookup_type_for(env: &Rc, node: &Rc) -> Option> { match node.ident.clone() { - Some(id) => lookup_type(env.clone(), id.clone()), - None => lookup_type_by_name(&env, authored_name(env.clone(), node.clone())), - } + Some(id) => lookup_type(env.clone(), id.clone()), + None => lookup_type_by_name(&env, authored_name(env.clone(), node.clone())), +} } pub fn is_recursive_type_for(env: &Rc, node: &Rc) -> bool { match node.ident.clone() { - Some(id) => is_recursive_type(env.clone(), id.clone()), - None => is_recursive_type_by_name(&env, authored_name(env.clone(), node.clone())), - } + Some(id) => is_recursive_type(env.clone(), id.clone()), + None => is_recursive_type_by_name(&env, authored_name(env.clone(), node.clone())), +} } pub fn inductive_fields_for(env: Rc, type_name: String) -> Rc>> { match v2_rt::map_get(&env.inductive_fields.clone(), type_name) { - Some(fields) => fields.clone(), - None => Rc::new(vec![]), - } + Some(fields) => fields.clone(), + None => Rc::new(vec![]), +} } -pub fn is_inductive_field( - env: Rc, - type_name: String, - variant_name: String, - field_name: String, -) -> bool { - { - let mut __found = false; - for f in inductive_fields_for(env, type_name).iter().cloned() { - if ((f.variant_name.clone().as_str() == variant_name.clone().as_str()) - && (f.field_name.clone().as_str() == field_name.clone().as_str())) - { - __found = true; - break; - } - } - __found - } +pub fn is_inductive_field(env: Rc, type_name: String, variant_name: String, field_name: String) -> bool { + { let mut __found = false; for f in inductive_fields_for(env, type_name).iter().cloned() { if ((f.variant_name.clone().as_str() == variant_name.clone().as_str()) && (f.field_name.clone().as_str() == field_name.clone().as_str())) { __found = true; break; } } __found } } -pub fn put_inductive_field( - fields: &Rc>>>>, - type_name: &String, - variant_name: String, - field_name: String, - shape: RecursionShape, -) -> Rc>>>> { +pub fn put_inductive_field(fields: &Rc>>>>, type_name: &String, variant_name: String, field_name: String, shape: RecursionShape) -> Rc>>>> { { let existing = match v2_rt::map_get(&fields, type_name.clone()) { - Some(fs) => fs.clone(), - None => Rc::new(vec![]), - }; - v2_rt::rc_map_insert( - fields.clone(), - type_name.clone(), - v2_rt::concat( - existing, - Rc::new(vec![Rc::new(InductiveField { - type_name: type_name.clone(), - variant_name: variant_name, - field_name: field_name, - shape: shape, - element_type: type_name.clone(), - })]), - ), - ) - } + Some(fs) => fs.clone(), + None => Rc::new(vec![]), +}; +v2_rt::rc_map_insert(fields.clone(), type_name.clone(), v2_rt::concat(existing, Rc::new(vec![Rc::new(InductiveField { + type_name: type_name.clone(), + variant_name: variant_name, + field_name: field_name, + shape: shape, + element_type: type_name.clone(), +})]))) +} } -pub fn put_inductive_field_cross( - fields: &Rc>>>>, - type_name: &String, - variant_name: String, - field_name: String, - shape: RecursionShape, - element_type: String, -) -> Rc>>>> { +pub fn put_inductive_field_cross(fields: &Rc>>>>, type_name: &String, variant_name: String, field_name: String, shape: RecursionShape, element_type: String) -> Rc>>>> { { let existing = match v2_rt::map_get(&fields, type_name.clone()) { - Some(fs) => fs.clone(), - None => Rc::new(vec![]), - }; - v2_rt::rc_map_insert( - fields.clone(), - type_name.clone(), - v2_rt::concat( - existing, - Rc::new(vec![Rc::new(InductiveField { - type_name: type_name.clone(), - variant_name: variant_name, - field_name: field_name, - shape: shape, - element_type: element_type, - })]), - ), - ) - } -} - -pub fn merge_inductive_fields( - left: Rc>>>>, - right: &Rc>>>>, -) -> Rc>>>> { - Rc::new(v2_rt::map_keys(&right)).iter().cloned().fold( - left.clone(), - |acc: Rc>>>>, type_name: String| { - match v2_rt::map_get(&right, type_name.clone()) { - Some(incoming) => { - let existing = match v2_rt::map_get(&acc, type_name.clone()) { - Some(fs) => fs.clone(), - None => Rc::new(vec![]), - }; - v2_rt::rc_map_insert( - acc.clone(), - type_name.clone(), - v2_rt::concat(existing.clone(), incoming.clone()), - ) - } - None => acc.clone(), - } - }, - ) + Some(fs) => fs.clone(), + None => Rc::new(vec![]), +}; +v2_rt::rc_map_insert(fields.clone(), type_name.clone(), v2_rt::concat(existing, Rc::new(vec![Rc::new(InductiveField { + type_name: type_name.clone(), + variant_name: variant_name, + field_name: field_name, + shape: shape, + element_type: element_type, +})]))) +} +} + +pub fn merge_inductive_fields(left: Rc>>>>, right: &Rc>>>>) -> Rc>>>> { + Rc::new(v2_rt::map_keys(&right)).iter().cloned().fold(left.clone(), |acc: Rc>>>>, type_name: String| match v2_rt::map_get(&right, type_name.clone()) { + Some(incoming) => { + let existing = match v2_rt::map_get(&acc, type_name.clone()) { + Some(fs) => fs.clone(), + None => Rc::new(vec![]), +}; +v2_rt::rc_map_insert(acc.clone(), type_name.clone(), v2_rt::concat(existing.clone(), incoming.clone())) +}, + None => acc.clone(), +}) } -pub fn inductive_fields_list_to_map( - fields: Rc>>, -) -> Rc>>>> { - fields.iter().cloned().fold( - v2_rt::rc_empty_map::>>>(), - |acc: Rc>>>>, field: Rc| { - let existing = match v2_rt::map_get(&acc, field.type_name.clone()) { - Some(fs) => fs.clone(), - None => Rc::new(vec![]), - }; - v2_rt::rc_map_insert( - acc.clone(), - field.type_name.clone(), - v2_rt::concat(existing.clone(), Rc::new(vec![field.clone()])), - ) - }, - ) +pub fn inductive_fields_list_to_map(fields: Rc>>) -> Rc>>>> { + fields.iter().cloned().fold(v2_rt::rc_empty_map::>>>(), |acc: Rc>>>>, field: Rc| { + let existing = match v2_rt::map_get(&acc, field.type_name.clone()) { + Some(fs) => fs.clone(), + None => Rc::new(vec![]), +}; +v2_rt::rc_map_insert(acc.clone(), field.type_name.clone(), v2_rt::concat(existing.clone(), Rc::new(vec![field.clone()]))) +}) } pub fn merge_envs(envs: &Rc>>) -> Rc { { - let merged_bindings = envs.clone().iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, env: Rc| { - v2_rt::rc_map_merge(acc, env.bindings.clone()) - }, - ); - let merged_recursive = envs - .clone() - .iter() - .cloned() - .fold(Rc::new(vec![]), |acc: _, env: Rc| { - v2_rt::concat(acc, env.recursive_types.clone()) - }); - let merged_recursive_set = envs.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, env: Rc| { - v2_rt::rc_map_merge(acc, env.recursive_type_set.clone()) - }, - ); - let merged_inductive_fields = envs.clone().iter().cloned().fold( - v2_rt::rc_empty_map::>>>(), - |acc: Rc>>>>, env: Rc| { - merge_inductive_fields(acc, &env.inductive_fields.clone()) - }, - ); - let merged_source_indices = envs.clone().iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, env: Rc| { - v2_rt::rc_map_merge(acc, env.source_indices.clone()) - }, - ); - let merged_intern_table = match envs.clone().first().cloned() { - Some(first_env) => first_env.intern_table.clone(), - None => empty_intern_table(), - }; - Rc::new(TypeEnv { - bindings: merged_bindings, - recursive_types: merged_recursive, - recursive_type_set: merged_recursive_set, - inductive_fields: merged_inductive_fields, - source_indices: merged_source_indices, - intern_table: merged_intern_table, - }) - } + let merged_bindings = envs.clone().iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, env: Rc| v2_rt::rc_map_merge(acc, env.bindings.clone())); +let merged_recursive = envs.clone().iter().cloned().fold(Rc::new(vec![]), |acc: _, env: Rc| v2_rt::concat(acc, env.recursive_types.clone())); +let merged_recursive_set = envs.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, env: Rc| v2_rt::rc_map_merge(acc, env.recursive_type_set.clone())); +let merged_inductive_fields = envs.clone().iter().cloned().fold(v2_rt::rc_empty_map::>>>(), |acc: Rc>>>>, env: Rc| merge_inductive_fields(acc, &env.inductive_fields.clone())); +let merged_source_indices = envs.clone().iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, env: Rc| v2_rt::rc_map_merge(acc, env.source_indices.clone())); +let merged_intern_table = match envs.clone().first().cloned() { + Some(first_env) => first_env.intern_table.clone(), + None => empty_intern_table(), +}; +Rc::new(TypeEnv { + bindings: merged_bindings, + recursive_types: merged_recursive, + recursive_type_set: merged_recursive_set, + inductive_fields: merged_inductive_fields, + source_indices: merged_source_indices, + intern_table: merged_intern_table, +}) +} } diff --git a/src/v2/stage0/src/v2_compiler_infer_items.rs b/src/v2/stage0/src/v2_compiler_infer_items.rs index 59c2ce01482..774ee8dfc9e 100644 --- a/src/v2/stage0/src/v2_compiler_infer_items.rs +++ b/src/v2/stage0/src/v2_compiler_infer_items.rs @@ -1,27 +1,23 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_items -use self::ItemKind::*; -pub use crate::std_induction::SubValueRelation; -use crate::std_induction::SubValueRelation::SubValueUnknown; -pub use crate::std_types::SourceSpan; -pub use crate::v2_compiler_infer_emit_info::EmitGraphInfo; -pub use crate::v2_compiler_infer_env::{TypeBinding, TypeEnv}; -pub use crate::v2_compiler_infer_sigs::ResolvedFuncEnv; -pub use crate::v2_compiler_infer_types::child_type_node; -use crate::v2_rt; -use crate::v2_std_core::Cardinality::Required; -use crate::v2_std_core::Connective::{Conj, Disj, NoConnective}; -use crate::v2_std_core::InferredNode::{CompilerError, Resolved, TypeVariable}; -pub use crate::v2_std_core::{ - authored_name_at, expr_has_non_tail_self_call, expr_has_self_call, make_field_node, - make_param_node, no_span, node_name_span, param_node_name_at, param_node_type_expr, - Cardinality, Connective, ErrorNode, InferredNode, NewlineIndex, Node, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_types::{SourceSpan}; +pub use crate::v2_std_core::{Node, ErrorNode, make_param_node, param_node_name_at, param_node_type_expr, make_field_node, InferredNode, Cardinality, expr_has_self_call, expr_has_non_tail_self_call, Connective, node_name_span, no_span, NewlineIndex, authored_name_at}; +use crate::v2_std_core::InferredNode::{Resolved, CompilerError, TypeVariable}; +use crate::v2_std_core::Cardinality::{Required}; +use crate::v2_std_core::Connective::{Conj, Disj, NoConnective}; +pub use crate::v2_compiler_infer_types::{child_type_node}; +pub use crate::std_induction::{SubValueRelation}; +use crate::std_induction::SubValueRelation::{SubValueUnknown}; +pub use crate::v2_compiler_infer_env::{TypeEnv, TypeBinding}; +pub use crate::v2_compiler_infer_sigs::{ResolvedFuncEnv}; +pub use crate::v2_compiler_infer_emit_info::{EmitGraphInfo}; +use self::ItemKind::*; #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] @@ -70,92 +66,46 @@ pub struct ResolvedGraph { pub emit_graph_info: Rc, } -pub fn inferred_to_outputs( - inferred: &Option>, - span: Rc, - source_indices: Rc>>, -) -> Rc>> { +pub fn inferred_to_outputs(inferred: &Option>, span: Rc, source_indices: Rc>>) -> Rc>> { if (inferred.clone() == None) { Rc::new(vec![]) } else { match (*inferred.clone().unwrap()).clone() { - InferredNode::CompilerError { .. } => Rc::new(vec![]), - InferredNode::TypeVariable { .. } => Rc::new(vec![]), - InferredNode::Resolved { node: rt, .. } => { - let has_structure = (rt.connective.clone() != Connective::NoConnective); - if has_structure { - { - let is_product = (rt.connective.clone() == Connective::Conj); - if is_product { - if (rt.ident_span.clone() == None) { - Rc::new({ - let mut __result = Vec::new(); - for child in rt.children.clone().iter().cloned() { - __result.push({ - let child_type = child_type_node(&child); - make_field_node( - &authored_name_at(source_indices.clone(), &child), - child_type.clone(), - Cardinality::Required, - None, - None, - span.clone(), - node_name_span(&child), - ) - }); - } - __result - }) - } else { - Rc::new(vec![make_field_node( - &"value".to_string(), - rt.clone(), - Cardinality::Required, - None, - None, - span.clone(), - no_span(), - )]) - } + InferredNode::CompilerError { .. } => Rc::new(vec![]), + InferredNode::TypeVariable { .. } => Rc::new(vec![]), + InferredNode::Resolved { node: rt, .. } => { + let has_structure = (rt.connective.clone() != Connective::NoConnective); +if has_structure { + { + let is_product = (rt.connective.clone() == Connective::Conj); +if is_product { + if (rt.ident_span.clone() == None) { + Rc::new({ let mut __result = Vec::new(); for child in rt.children.clone().iter().cloned() { __result.push({ + let child_type = child_type_node(&child); +make_field_node(&authored_name_at(source_indices.clone(), &child), child_type.clone(), Cardinality::Required, None, None, span.clone(), node_name_span(&child)) +}); } __result }) } else { - Rc::new(vec![make_field_node( - &"value".to_string(), - rt.clone(), - Cardinality::Required, - None, - None, - span.clone(), - no_span(), - )]) + Rc::new(vec![make_field_node(&"value".to_string(), rt.clone(), Cardinality::Required, None, None, span.clone(), no_span())]) } - } - } else { - if ((rt.connective.clone() == Connective::Conj) - && ((rt.children.clone().len() as i64) == 0)) - { - Rc::new(vec![]) } else { - Rc::new(vec![make_field_node( - &"value".to_string(), - rt.clone(), - Cardinality::Required, - None, - None, - span.clone(), - no_span(), - )]) + Rc::new(vec![make_field_node(&"value".to_string(), rt.clone(), Cardinality::Required, None, None, span.clone(), no_span())]) } +} + } else { + if ((rt.connective.clone() == Connective::Conj) && ((rt.children.clone().len() as i64) == 0)) { + Rc::new(vec![]) + } else { + Rc::new(vec![make_field_node(&"value".to_string(), rt.clone(), Cardinality::Required, None, None, span.clone(), no_span())]) } } - } +}, +} } } pub fn item_kind(item: &Rc) -> ItemKind { { - let kind = if ((item.connective.clone() != Connective::NoConnective) - && (item.transport.clone() == None)) - { + let kind = if ((item.connective.clone() != Connective::NoConnective) && (item.transport.clone() == None)) { ItemKind::TypeItem } else { if (item.transport.clone() != None) { @@ -180,38 +130,24 @@ pub fn item_kind(item: &Rc) -> ItemKind { } } }; - kind - } +kind +} } -pub fn variant_locals_from_items( - items: Rc>>, - init: Rc>>, - source_indices: Rc>>, -) -> Rc>> { - items.iter().cloned().fold( - init, - |acc: Rc>>, item: Rc| { - let is_coproduct = (item.connective.clone() == Connective::Disj); - if is_coproduct.clone() { - item.children.clone().iter().cloned().fold( - acc.clone(), - |vacc: Rc>>, child: Rc| { - let child_name = authored_name_at(source_indices.clone(), &child); - v2_rt::rc_map_insert( - vacc, - child_name.clone(), - Rc::new(TypeBinding { - name: child_name.clone(), - resolved: item.clone(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), - }), - ) - }, - ) - } else { - acc.clone() - } - }, - ) +pub fn variant_locals_from_items(items: Rc>>, init: Rc>>, source_indices: Rc>>) -> Rc>> { + items.iter().cloned().fold(init, |acc: Rc>>, item: Rc| { + let is_coproduct = (item.connective.clone() == Connective::Disj); +if is_coproduct.clone() { + item.children.clone().iter().cloned().fold(acc.clone(), |vacc: Rc>>, child: Rc| { + let child_name = authored_name_at(source_indices.clone(), &child); +v2_rt::rc_map_insert(vacc, child_name.clone(), Rc::new(TypeBinding { + name: child_name.clone(), + resolved: item.clone(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), +})) +}) + } else { + acc.clone() + } +}) } diff --git a/src/v2/stage0/src/v2_compiler_infer_lookup.rs b/src/v2/stage0/src/v2_compiler_infer_lookup.rs index 9b5cdb6a1fc..4791a5cb760 100644 --- a/src/v2/stage0/src/v2_compiler_infer_lookup.rs +++ b/src/v2/stage0/src/v2_compiler_infer_lookup.rs @@ -1,53 +1,34 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_lookup -use crate::std_algebra::AlgebraTypeTemplate::{ContainerOf, ReceiverSelf}; -use crate::std_algebra::CollectionSizeEffect::*; -use crate::std_algebra::ContainerSource::{Named, SameAsReceiver}; -use crate::std_algebra::CostShape::*; -pub use crate::std_algebra::{ - algebra_templates_for_profile, kernel_algebra_profile, AlgebraFieldTemplate, - AlgebraTypeTemplate, CollectionSizeEffect, ContainerSource, CostShape, -}; -pub use crate::v2_compiler_infer_emit_info::{ - build_enum_field_summaries, build_struct_field_summaries, -}; -pub use crate::v2_compiler_infer_env::{ - authored_name, is_recursive_type, lookup_type, lookup_type_for, TypeBinding, TypeEnv, -}; -pub use crate::v2_compiler_infer_service::{ - check_service_method_call_node, OpEntry, ServiceMethodResult, -}; -pub use crate::v2_compiler_infer_sigs::{ResolvedFuncEnv, ResolvedFuncSig}; -pub use crate::v2_compiler_infer_types::{ - child_type_node, emit_map_has, enrich_kernel_type, method_receiver_element_node, - node_is_keyed_collection, nominal_type_ref, normalize_access_type_node, -}; -use crate::v2_rt; -use crate::v2_std_core::Cardinality::{CardOptional, Required}; -use crate::v2_std_core::Connective::{Conj, Disj, NoConnective}; -use crate::v2_std_core::FieldAccessStyle::OptionalUnwrap; -use crate::v2_std_core::FieldValueShape::{OptionalValue, PlainValue}; -use crate::v2_std_core::InferredNode::{Resolved, TypeVariable}; -use crate::v2_std_core::MethodSemantics::{ - AlgebraMethodSemantics, PlainMethodSemantics, ServiceMethodSemantics, -}; -pub use crate::v2_std_core::{ - authored_name_at, find_child_named, has_child_named, param_node_type_expr, - with_optional_cardinality, with_required_cardinality, Cardinality, Connective, ErrorNode, - FieldAccessStyle, FieldSummary, FieldValueShape, InferredNode, MethodSemantics, NewlineIndex, - Node, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::v2_std_core::{Node, param_node_type_expr, authored_name_at, NewlineIndex, find_child_named, has_child_named, InferredNode, Cardinality, MethodSemantics, FieldAccessStyle, FieldValueShape, FieldSummary, with_optional_cardinality, with_required_cardinality, Connective, ErrorNode}; +use crate::v2_std_core::InferredNode::{Resolved, TypeVariable}; +use crate::v2_std_core::Cardinality::{Required, CardOptional}; +use crate::v2_std_core::MethodSemantics::{PlainMethodSemantics, AlgebraMethodSemantics, ServiceMethodSemantics}; +use crate::v2_std_core::FieldAccessStyle::{OptionalUnwrap}; +use crate::v2_std_core::FieldValueShape::{PlainValue, OptionalValue}; +use crate::v2_std_core::Connective::{Conj, Disj, NoConnective}; +pub use crate::std_algebra::{CollectionSizeEffect, CostShape, AlgebraFieldTemplate, AlgebraTypeTemplate, ContainerSource, kernel_algebra_profile, algebra_templates_for_profile}; +use crate::std_algebra::AlgebraTypeTemplate::{ReceiverSelf, ContainerOf}; +use crate::std_algebra::ContainerSource::{SameAsReceiver, Named}; +use crate::std_algebra::CollectionSizeEffect::*; +use crate::std_algebra::CostShape::*; +pub use crate::v2_compiler_infer_types::{child_type_node, nominal_type_ref, normalize_access_type_node, node_is_keyed_collection, node_is_set_collection, method_receiver_element_node, emit_map_has, enrich_kernel_type}; +pub use crate::v2_compiler_infer_env::{TypeEnv, TypeBinding, authored_name, is_recursive_type, lookup_type, lookup_type_for}; +pub use crate::v2_compiler_infer_emit_info::{build_struct_field_summaries, build_enum_field_summaries}; +pub use crate::v2_compiler_infer_sigs::{ResolvedFuncSig, ResolvedFuncEnv}; +pub use crate::v2_compiler_infer_service::{OpEntry, ServiceMethodResult, check_service_method_call_node}; pub fn is_type_variable(inferred: Rc) -> bool { match (*inferred).clone() { - InferredNode::TypeVariable { .. } => true, - _ => false, - } + InferredNode::TypeVariable { .. } => true, + _ => false, +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -57,296 +38,237 @@ pub struct KnownMethodResolution { pub diagnostics: Rc>>, } -pub fn lookup_in_scope( - locals: Rc>>, - name: String, -) -> Option> { +pub fn lookup_in_scope(locals: Rc>>, name: String) -> Option> { match v2_rt::map_get(&locals, name) { - Some(binding) => Some(binding.resolved.clone()), - None => None, - } + Some(binding) => Some(binding.resolved.clone()), + None => None, +} } pub fn lookup_func_sig(func_env: Rc, name: String) -> Option> { v2_rt::map_get(&func_env.signatures.clone(), name) } -pub fn lookup_field_type_node( - n: &Rc, - field_name: &String, - source_indices: Rc>>, -) -> Option> { +pub fn lookup_field_type_node(n: &Rc, field_name: &String, source_indices: Rc>>) -> Option> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); - if is_optional { - { - let inner = with_required_cardinality(&n); - if (field_name.clone().as_str() == "value".to_string().as_str()) { - Some(inner) - } else { - match lookup_field_type_node(&inner, &field_name, source_indices) { - Some(inner_result) => Some(with_optional_cardinality(&inner_result)), - None => None, + { + let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); +if is_optional { + { + let inner = with_required_cardinality(&n); +if (field_name.clone().as_str() == "value".to_string().as_str()) { + Some(inner) + } else { + match lookup_field_type_node(&inner, &field_name, source_indices) { + Some(inner_result) => Some(with_optional_cardinality(&inner_result)), + None => None, +} } - } - } - } else { - { - let has_structure = (n.connective.clone() != Connective::NoConnective); - if has_structure { - { - let is_product = (n.connective.clone() == Connective::Conj); - if is_product { - match find_child_named(n.clone(), field_name.clone(), source_indices) { - Some(field_child) => Some(child_type_node(&field_child)), - None => None, +} + } else { + { + let has_structure = (n.connective.clone() != Connective::NoConnective); +if has_structure { + { + let is_product = (n.connective.clone() == Connective::Conj); +if is_product { + match find_child_named(n.clone(), field_name.clone(), source_indices) { + Some(field_child) => Some(child_type_node(&field_child)), + None => None, +} + } else { + lookup_coproduct_common_field_node(&n.children.clone(), &field_name, &source_indices) } - } else { - lookup_coproduct_common_field_node( - &n.children.clone(), - &field_name, - &source_indices, - ) - } +} + } else { + None } - } else { - None - } +} } - } +} }) } -pub fn lookup_coproduct_common_field_node( - variants: &Rc>>, - field_name: &String, - source_indices: &Rc>>, -) -> Option> { +pub fn lookup_coproduct_common_field_node(variants: &Rc>>, field_name: &String, source_indices: &Rc>>) -> Option> { { - let found_in_all = { - let mut __all = true; - for v in variants.clone().iter().cloned() { - if !(has_child_named(v.clone(), field_name.clone(), source_indices.clone())) { - __all = false; - break; - } - } - __all - }; - let first_field = if found_in_all { + let found_in_all = { let mut __all = true; for v in variants.clone().iter().cloned() { if !(has_child_named(v.clone(), field_name.clone(), source_indices.clone())) { __all = false; break; } } __all }; +let first_field = if found_in_all { match variants.clone().first().cloned() { - Some(first_variant) => find_child_named( - first_variant.clone(), - field_name.clone(), - source_indices.clone(), - ), - None => None, - } + Some(first_variant) => find_child_named(first_variant.clone(), field_name.clone(), source_indices.clone()), + None => None, +} } else { None }; - match first_field { - Some(field_child) => Some(child_type_node(&field_child)), - None => None, - } - } +match first_field { + Some(field_child) => Some(child_type_node(&field_child)), + None => None, +} +} } pub fn resolve_scrutinee_type_node(env: Rc, n: Rc) -> Rc { resolve_scrutinee_type_node_seen(&env, n, &v2_rt::rc_empty_map::()) } -pub fn resolve_scrutinee_type_node_seen( - env: &Rc, - n: Rc, - seen: &Rc>, -) -> Rc { +pub fn resolve_scrutinee_type_node_seen(env: &Rc, n: Rc, seen: &Rc>) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let n_is_type_var = if (n.inferred.clone() != None) { - is_type_variable(n.inferred.clone().clone().unwrap()) - } else { - false - }; - if n_is_type_var { - return n.clone(); - } - let normed = normalize_access_type_node(n.clone()); - if ((normed.connective.clone() == Connective::NoConnective) - && ((normed.children.clone().len() as i64) == 0)) { - { - let canonical = authored_name(env.clone(), normed.clone()); - if (normed.inferred.clone() != None) { - { - let next_seen = if (canonical.clone().as_str() == "".to_string().as_str()) { - seen.clone() - } else { - v2_rt::rc_map_insert(seen.clone(), canonical.clone(), true) - }; - match normed.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: target, .. }) => { - if ((((authored_name(env.clone(), target.clone()).as_str() - == canonical.clone().as_str()) - && (target.inferred.clone() == None)) - && (target.connective.clone() == Connective::NoConnective)) - && ((target.children.clone().len() as i64) == 0)) - { - normed.clone() - } else { - resolve_scrutinee_type_node_seen( - &env, - target.clone(), - &next_seen, - ) - } - } - _ => normed.clone(), - } - } - } else { - if ((canonical.clone().as_str() != "".to_string().as_str()) - && emit_map_has(seen.clone(), canonical.clone())) - { - nominal_type_ref(&canonical) - } else { + let n_is_type_var = if (n.inferred.clone() != None) { + is_type_variable(n.inferred.clone().clone().unwrap()) + } else { + false + }; +if n_is_type_var { + return n.clone() + } +let normed = normalize_access_type_node(n.clone()); +if ((normed.connective.clone() == Connective::NoConnective) && ((normed.children.clone().len() as i64) == 0)) { + { + let canonical = authored_name(env.clone(), normed.clone()); +if (normed.inferred.clone() != None) { { - let next_seen = - if (canonical.clone().as_str() == "".to_string().as_str()) { + let next_seen = if (canonical.clone().as_str() == "".to_string().as_str()) { + seen.clone() + } else { + v2_rt::rc_map_insert(seen.clone(), canonical.clone(), true) + }; +match normed.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: target, .. }) => if ((((authored_name(env.clone(), target.clone()).as_str() == canonical.clone().as_str()) && (target.inferred.clone() == None)) && (target.connective.clone() == Connective::NoConnective)) && ((target.children.clone().len() as i64) == 0)) { + normed.clone() + } else { + resolve_scrutinee_type_node_seen(&env, target.clone(), &next_seen) + }, + _ => normed.clone(), +} +} + } else { + if ((canonical.clone().as_str() != "".to_string().as_str()) && emit_map_has(seen.clone(), canonical.clone())) { + nominal_type_ref(&canonical) + } else { + { + let next_seen = if (canonical.clone().as_str() == "".to_string().as_str()) { seen.clone() } else { v2_rt::rc_map_insert(seen.clone(), canonical.clone(), true) }; - match lookup_type_for(&env, &normed) { - Some(resolved) => { - if ((((authored_name(env.clone(), resolved.clone()).as_str() - == canonical.clone().as_str()) - && (resolved.inferred.clone() == None)) - && (resolved.connective.clone() - == Connective::NoConnective)) - && ((resolved.children.clone().len() as i64) == 0)) +match lookup_type_for(&env, &normed) { + Some(resolved) => if ((((authored_name(env.clone(), resolved.clone()).as_str() == canonical.clone().as_str()) && (resolved.inferred.clone() == None)) && (resolved.connective.clone() == Connective::NoConnective)) && ((resolved.children.clone().len() as i64) == 0)) { + normed.clone() + } else { { - normed.clone() - } else { - { - let result = resolve_scrutinee_type_node_seen( - &env, - resolved.clone(), - &next_seen, - ); - let is_optional = (normed.return_cardinality.clone() - == Cardinality::CardOptional); - if is_optional { - with_optional_cardinality(&result) - } else { - result - } + let result = resolve_scrutinee_type_node_seen(&env, resolved.clone(), &next_seen); +let is_optional = (normed.return_cardinality.clone() == Cardinality::CardOptional); +if is_optional { + with_optional_cardinality(&result) + } else { + result } - } - } - None => normed.clone(), - } +} + }, + None => normed.clone(), +} +} } } - } +} + } else { + normed.clone() } - } else { - normed.clone() - } +} }) } pub fn map_value_type_in_env(type_node: Rc, env: &Rc) -> Option> { { let normed = normalize_access_type_node(type_node); - let resolved = resolve_scrutinee_type_node(env.clone(), normed); - let map_type = normalize_access_type_node(resolved); - if (node_is_keyed_collection(&map_type, env.source_indices.clone()) - && ((map_type.children.clone().len() as i64) >= 2)) - { +let resolved = resolve_scrutinee_type_node(env.clone(), normed); +let map_type = normalize_access_type_node(resolved); +if (node_is_keyed_collection(&map_type, env.source_indices.clone()) && ((map_type.children.clone().len() as i64) >= 2)) { match map_type.children.clone().get(1 as usize).cloned() { - Some(value_type) => Some(value_type.clone()), - None => None, - } + Some(value_type) => Some(value_type.clone()), + None => None, +} } else { None } - } +} } pub fn map_key_type_in_env(type_node: Rc, env: &Rc) -> Option> { { let normed = normalize_access_type_node(type_node); - let resolved = resolve_scrutinee_type_node(env.clone(), normed); - let map_type = normalize_access_type_node(resolved); - if (node_is_keyed_collection(&map_type, env.source_indices.clone()) - && ((map_type.children.clone().len() as i64) >= 1)) - { +let resolved = resolve_scrutinee_type_node(env.clone(), normed); +let map_type = normalize_access_type_node(resolved); +if (node_is_keyed_collection(&map_type, env.source_indices.clone()) && ((map_type.children.clone().len() as i64) >= 1)) { match map_type.children.clone().first().cloned() { - Some(key_type) => Some(key_type.clone()), - None => None, - } + Some(key_type) => Some(key_type.clone()), + None => None, +} } else { None } - } +} } -pub fn field_summary_for_type( - base_type: Rc, - env: &Rc, - field: &String, -) -> Option> { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let resolved = resolve_scrutinee_type_node(env.clone(), base_type); - let normed = normalize_access_type_node(resolved.clone()); - let normed_opt = (normed.return_cardinality.clone() == Cardinality::CardOptional); - if ((field.clone().as_str() == "value".to_string().as_str()) && normed_opt.clone()) { - Some(Rc::new(FieldSummary { - access_style: FieldAccessStyle::OptionalUnwrap, - value_shape: FieldValueShape::PlainValue, - })) +pub fn set_element_type_in_env(type_node: Rc, env: &Rc) -> Option> { + { + let normed = normalize_access_type_node(type_node); +let resolved = resolve_scrutinee_type_node(env.clone(), normed); +let set_type = normalize_access_type_node(resolved); +if (node_is_set_collection(&set_type, &env.source_indices.clone()) && ((set_type.children.clone().len() as i64) >= 1)) { + match set_type.children.clone().first().cloned() { + Some(elem_type) => Some(elem_type.clone()), + None => None, +} } else { - if normed_opt.clone() { - { - let inner = with_required_cardinality(&normed); - match field_summary_for_type(inner, &env, &field) { - Some(inner_summary) => Some(Rc::new(FieldSummary { - access_style: inner_summary.access_style.clone(), - value_shape: FieldValueShape::OptionalValue, - })), - None => None, - } - } + None + } +} +} + +pub fn field_summary_for_type(base_type: Rc, env: &Rc, field: &String) -> Option> { + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { + { + let resolved = resolve_scrutinee_type_node(env.clone(), base_type); +let normed = normalize_access_type_node(resolved.clone()); +let normed_opt = (normed.return_cardinality.clone() == Cardinality::CardOptional); +if ((field.clone().as_str() == "value".to_string().as_str()) && normed_opt.clone()) { + Some(Rc::new(FieldSummary { + access_style: FieldAccessStyle::OptionalUnwrap, + value_shape: FieldValueShape::PlainValue, +})) } else { - { - let no_structure = (resolved.connective.clone() == Connective::NoConnective); - if no_structure { - None - } else { - { - let is_product = (resolved.connective.clone() == Connective::Conj); - if is_product { - v2_rt::map_get( - &build_struct_field_summaries( - &resolved, - env.source_indices.clone(), - ), - field.clone(), - ) - } else { - v2_rt::map_get( - &build_enum_field_summaries( - &resolved.children.clone(), - env.source_indices.clone(), - ), - field.clone(), - ) - } + if normed_opt.clone() { + { + let inner = with_required_cardinality(&normed); +match field_summary_for_type(inner, &env, &field) { + Some(inner_summary) => Some(Rc::new(FieldSummary { + access_style: inner_summary.access_style.clone(), + value_shape: FieldValueShape::OptionalValue, +})), + None => None, +} +} + } else { + { + let no_structure = (resolved.connective.clone() == Connective::NoConnective); +if no_structure { + None + } else { + { + let is_product = (resolved.connective.clone() == Connective::Conj); +if is_product { + v2_rt::map_get(&build_struct_field_summaries(&resolved, env.source_indices.clone()), field.clone()) + } else { + v2_rt::map_get(&build_enum_field_summaries(&resolved.children.clone(), env.source_indices.clone()), field.clone()) + } +} } - } +} } } - } +} }) } @@ -365,199 +287,136 @@ pub struct StructuralMethodLookup { pub kernel_diagnostics: Rc>>, } -pub fn lookup_field_in_product( - product: Rc, - method_name: String, - source_indices: Rc>>, -) -> Option> { +pub fn lookup_field_in_product(product: Rc, method_name: String, source_indices: Rc>>) -> Option> { { - let matching = Rc::new({ - let mut __result = Vec::new(); - for c in product.children.clone().iter().cloned() { - if (authored_name_at(source_indices.clone(), &c).as_str() - == method_name.clone().as_str()) - { - __result.push(c); - } - } - __result - }); - match matching.first().cloned() { - Some(field) => match field.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - if ((rt.params.clone().len() as i64) > 0) { - match rt.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { - node: return_type, .. - }) => Some(Rc::new(MethodFieldResult { - field_node: field.clone(), - result_type: return_type.clone(), - size_effect: None, - cost_shape: None, - algebra_template: None, - })), - _ => Some(Rc::new(MethodFieldResult { - field_node: field.clone(), - result_type: rt.clone(), - size_effect: None, - cost_shape: None, - algebra_template: None, - })), - } - } else { - Some(Rc::new(MethodFieldResult { - field_node: field.clone(), - result_type: rt.clone(), - size_effect: None, - cost_shape: None, - algebra_template: None, - })) - } - } - _ => None, - }, - None => None, - } - } + let matching = Rc::new({ let mut __result = Vec::new(); for c in product.children.clone().iter().cloned() { if (authored_name_at(source_indices.clone(), &c).as_str() == method_name.clone().as_str()) { __result.push(c); } } __result }); +match matching.first().cloned() { + Some(field) => match field.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => if ((rt.params.clone().len() as i64) > 0) { + match rt.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: return_type, .. }) => Some(Rc::new(MethodFieldResult { + field_node: field.clone(), + result_type: return_type.clone(), + size_effect: None, + cost_shape: None, + algebra_template: None, +})), + _ => Some(Rc::new(MethodFieldResult { + field_node: field.clone(), + result_type: rt.clone(), + size_effect: None, + cost_shape: None, + algebra_template: None, +})), +} + } else { + Some(Rc::new(MethodFieldResult { + field_node: field.clone(), + result_type: rt.clone(), + size_effect: None, + cost_shape: None, + algebra_template: None, +})) + }, + _ => None, +}, + None => None, +} +} } -pub fn lookup_structural_method( - receiver_type: &Rc, - method_name: &String, - source_indices: &Rc>>, -) -> Rc { +pub fn lookup_structural_method(receiver_type: &Rc, method_name: &String, source_indices: &Rc>>) -> Rc { { let is_product = (receiver_type.connective.clone() == Connective::Conj); - if is_product { +if is_product { { - let direct = lookup_field_in_product( - receiver_type.clone(), - method_name.clone(), - source_indices.clone(), - ); - Rc::new(StructuralMethodLookup { - resolution: direct, - kernel_diagnostics: Rc::new(vec![]), - }) - } + let direct = lookup_field_in_product(receiver_type.clone(), method_name.clone(), source_indices.clone()); +Rc::new(StructuralMethodLookup { + resolution: direct, + kernel_diagnostics: Rc::new(vec![]), +}) +} } else { { - let enriched = enrich_kernel_type( - &authored_name_at(source_indices.clone(), &receiver_type), - &receiver_type, - source_indices.clone(), - ); - if ((enriched.ty.clone().connective.clone() == Connective::Conj) - && ((enriched.ty.clone().children.clone().len() as i64) > 0)) - { + let enriched = enrich_kernel_type(&authored_name_at(source_indices.clone(), &receiver_type), &receiver_type, source_indices.clone()); +if ((enriched.ty.clone().connective.clone() == Connective::Conj) && ((enriched.ty.clone().children.clone().len() as i64) > 0)) { { - let base_result = lookup_field_in_product( - enriched.ty.clone(), - method_name.clone(), - source_indices.clone(), - ); - match base_result.clone() { - Some(mfr) => { - let profile = v2_rt::map_get( - &kernel_algebra_profile(), - authored_name_at(source_indices.clone(), &receiver_type), - ); - let template_match = match profile { - Some(p) => { - let templates = algebra_templates_for_profile(p.clone()); - Rc::new({ - let mut __result = Vec::new(); - for t in templates.iter().cloned() { - if (t.name.clone().as_str() - == method_name.clone().as_str()) - { - __result.push(t); - } - } - __result - }) - .first() - .cloned() - } - None => None, - }; - let resolution = match template_match { - Some(t) => Some(Rc::new(MethodFieldResult { - field_node: mfr.field_node.clone(), - result_type: mfr.result_type.clone(), - size_effect: t.size_effect.clone(), - cost_shape: t.cost_shape.clone(), - algebra_template: Some(t.clone()), - })), - None => base_result.clone(), - }; - Rc::new(StructuralMethodLookup { - resolution: resolution, - kernel_diagnostics: enriched.diagnostics.clone(), - }) - } - None => Rc::new(StructuralMethodLookup { - resolution: None, - kernel_diagnostics: enriched.diagnostics.clone(), - }), - } - } + let base_result = lookup_field_in_product(enriched.ty.clone(), method_name.clone(), source_indices.clone()); +match base_result.clone() { + Some(mfr) => { + let profile = v2_rt::map_get(&kernel_algebra_profile(), authored_name_at(source_indices.clone(), &receiver_type)); +let template_match = match profile { + Some(p) => { + let templates = algebra_templates_for_profile(p.clone()); +Rc::new({ let mut __result = Vec::new(); for t in templates.iter().cloned() { if (t.name.clone().as_str() == method_name.clone().as_str()) { __result.push(t); } } __result }).first().cloned() +}, + None => None, +}; +let resolution = match template_match { + Some(t) => Some(Rc::new(MethodFieldResult { + field_node: mfr.field_node.clone(), + result_type: mfr.result_type.clone(), + size_effect: t.size_effect.clone(), + cost_shape: t.cost_shape.clone(), + algebra_template: Some(t.clone()), +})), + None => base_result.clone(), +}; +Rc::new(StructuralMethodLookup { + resolution: resolution, + kernel_diagnostics: enriched.diagnostics.clone(), +}) +}, + None => Rc::new(StructuralMethodLookup { + resolution: None, + kernel_diagnostics: enriched.diagnostics.clone(), +}), +} +} } else { Rc::new(StructuralMethodLookup { - resolution: None, - kernel_diagnostics: enriched.diagnostics.clone(), - }) + resolution: None, + kernel_diagnostics: enriched.diagnostics.clone(), +}) } - } +} } - } +} } -pub fn resolve_known_method_node( - receiver: Rc, - receiver_type: &Rc, - method_name: &String, - fold_accumulator_type: Option>, - service_registry: Rc>>>>, - source_indices: &Rc>>, -) -> Rc { +pub fn resolve_known_method_node(receiver: Rc, receiver_type: &Rc, method_name: &String, fold_accumulator_type: Option>, service_registry: Rc>>>>, source_indices: &Rc>>) -> Rc { { let tier0 = lookup_structural_method(&receiver_type, &method_name, &source_indices); - match tier0.resolution.clone() { - Some(mfr) => { - let semantics = Rc::new(MethodSemantics::AlgebraMethodSemantics { - method_def: mfr.field_node.clone(), - fold_accumulator_type: fold_accumulator_type, - size_effect: mfr.size_effect.clone(), - cost_shape: mfr.cost_shape.clone(), - algebra_template: mfr.algebra_template.clone(), - }); - Rc::new(KnownMethodResolution { - semantics: Some(semantics), - result_type: Some(mfr.result_type.clone()), - diagnostics: tier0.kernel_diagnostics.clone(), - }) - } - None => match check_service_method_call_node( - &receiver_type, - method_name.clone(), - service_registry, - source_indices.clone(), - ) { - Some(svc_result) => Rc::new(KnownMethodResolution { - semantics: Some(Rc::new(MethodSemantics::ServiceMethodSemantics { - service_name: authored_name_at(source_indices.clone(), &receiver_type), - op_params: svc_result.op_params.clone(), - })), - result_type: Some(svc_result.result_type.clone()), - diagnostics: tier0.kernel_diagnostics.clone(), - }), - None => Rc::new(KnownMethodResolution { - semantics: None, - result_type: None, - diagnostics: tier0.kernel_diagnostics.clone(), - }), - }, - } - } +match tier0.resolution.clone() { + Some(mfr) => { + let semantics = Rc::new(MethodSemantics::AlgebraMethodSemantics { + method_def: mfr.field_node.clone(), + fold_accumulator_type: fold_accumulator_type, + size_effect: mfr.size_effect.clone(), + cost_shape: mfr.cost_shape.clone(), + algebra_template: mfr.algebra_template.clone(), +}); +Rc::new(KnownMethodResolution { + semantics: Some(semantics), + result_type: Some(mfr.result_type.clone()), + diagnostics: tier0.kernel_diagnostics.clone(), +}) +}, + None => match check_service_method_call_node(&receiver_type, method_name.clone(), service_registry, source_indices.clone()) { + Some(svc_result) => Rc::new(KnownMethodResolution { + semantics: Some(Rc::new(MethodSemantics::ServiceMethodSemantics { + service_name: authored_name_at(source_indices.clone(), &receiver_type), + op_params: svc_result.op_params.clone(), +})), + result_type: Some(svc_result.result_type.clone()), + diagnostics: tier0.kernel_diagnostics.clone(), +}), + None => Rc::new(KnownMethodResolution { + semantics: None, + result_type: None, + diagnostics: tier0.kernel_diagnostics.clone(), +}), +}, +} +} } diff --git a/src/v2/stage0/src/v2_compiler_infer_method.rs b/src/v2/stage0/src/v2_compiler_infer_method.rs index a81cb662c63..985628d0f74 100644 --- a/src/v2/stage0/src/v2_compiler_infer_method.rs +++ b/src/v2/stage0/src/v2_compiler_infer_method.rs @@ -1,58 +1,50 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_method -pub use crate::std_types::SourceSpan; -pub use crate::v2_compiler_infer_types::{make_container_type, make_map_type}; -use crate::v2_rt; -use crate::v2_std_core::Cardinality::Required; -use crate::v2_std_core::Connective::NoConnective; -use crate::v2_std_core::ExprData::NoExprData; -use crate::v2_std_core::InferredNode::{Resolved, TypeVariable}; -pub use crate::v2_std_core::{ - bool_type, int_type, make_span, string_type, unit_type, with_optional_cardinality, Cardinality, - Connective, ErrorNode, ExprData, InferredNode, Node, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_types::{SourceSpan}; +pub use crate::v2_std_core::{Node, ErrorNode, make_span, with_optional_cardinality, unit_type, bool_type, string_type, int_type, InferredNode, Connective, Cardinality, ExprData}; +use crate::v2_std_core::InferredNode::{TypeVariable, Resolved}; +use crate::v2_std_core::Connective::{NoConnective}; +use crate::v2_std_core::Cardinality::{Required}; +use crate::v2_std_core::ExprData::{NoExprData}; +pub use crate::v2_compiler_infer_types::{make_container_type, make_map_type}; pub fn type_variable_node(id: String) -> Rc { Rc::new(Node { - name: "".to_string(), - span: make_span(0, 0), - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::TypeVariable { id: id })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) + name: "".to_string(), + span: make_span(0, 0), + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::TypeVariable { + id: id, +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) } pub fn map_of_type_variables() -> Rc { - make_map_type( - type_variable_node("map_key".to_string()), - type_variable_node("map_value".to_string()), - ) - .ty - .clone() + make_map_type(type_variable_node("map_key".to_string()), type_variable_node("map_value".to_string())).ty.clone() } pub fn list_of_type_variable(id: String) -> Rc { - make_container_type(&"List".to_string(), type_variable_node(id)) - .ty - .clone() + make_container_type(&"List".to_string(), type_variable_node(id)).ty.clone() } pub fn list_of_element(element: Rc) -> Rc { @@ -64,104 +56,46 @@ pub fn seed_node_map(key: String, value: Rc) -> Rc Rc>> { - v2_rt::concat( - v2_rt::concat( - make_map_type( - type_variable_node("map_key".to_string()), - type_variable_node("map_value".to_string()), - ) - .diagnostics - .clone(), - make_container_type( - &"List".to_string(), - type_variable_node("collection_element".to_string()), - ) - .diagnostics - .clone(), - ), - make_container_type( - &"Set".to_string(), - type_variable_node("set_elem".to_string()), - ) - .diagnostics - .clone(), - ) + v2_rt::concat(v2_rt::concat(make_map_type(type_variable_node("map_key".to_string()), type_variable_node("map_value".to_string())).diagnostics.clone(), make_container_type(&"List".to_string(), type_variable_node("collection_element".to_string())).diagnostics.clone()), make_container_type(&"Set".to_string(), type_variable_node("set_elem".to_string())).diagnostics.clone()) } pub fn builtin_function_registry() -> Rc>> { { let m = seed_node_map("count".to_string(), int_type()); - let m = v2_rt::rc_map_insert(m.clone(), "string_length".to_string(), int_type()); - let m = v2_rt::rc_map_insert(m.clone(), "code_point".to_string(), int_type()); - let m = v2_rt::rc_map_insert(m.clone(), "to_int".to_string(), int_type()); - let m = v2_rt::rc_map_insert(m.clone(), "scan_while".to_string(), int_type()); - let m = v2_rt::rc_map_insert(m.clone(), "scan_string_end".to_string(), int_type()); - let m = v2_rt::rc_map_insert(m.clone(), "scan_to_eol".to_string(), int_type()); - let m = v2_rt::rc_map_insert(m.clone(), "skip_horizontal_ws".to_string(), int_type()); - let m = v2_rt::rc_map_insert( - m.clone(), - "parse_int".to_string(), - with_optional_cardinality(&int_type()), - ); - let m = v2_rt::rc_map_insert(m.clone(), "char_at".to_string(), string_type()); - let m = v2_rt::rc_map_insert(m.clone(), "substring".to_string(), string_type()); - let m = v2_rt::rc_map_insert(m.clone(), "from_code_point".to_string(), string_type()); - let m = v2_rt::rc_map_insert(m.clone(), "chars_to_string".to_string(), string_type()); - let m = v2_rt::rc_map_insert(m.clone(), "to_string".to_string(), string_type()); - let m = v2_rt::rc_map_insert(m.clone(), "concat".to_string(), string_type()); - let m = v2_rt::rc_map_insert(m.clone(), "map_insert".to_string(), map_of_type_variables()); - let m = v2_rt::rc_map_insert(m.clone(), "map_merge".to_string(), map_of_type_variables()); - let m = v2_rt::rc_map_insert(m.clone(), "with".to_string(), map_of_type_variables()); - let set_ty = make_container_type( - &"Set".to_string(), - type_variable_node("set_elem".to_string()), - ) - .ty - .clone(); - let m = v2_rt::rc_map_insert(m.clone(), "empty_set".to_string(), set_ty.clone()); - let m = v2_rt::rc_map_insert(m.clone(), "set_insert".to_string(), set_ty.clone()); - let m = v2_rt::rc_map_insert(m.clone(), "set_union".to_string(), set_ty); - let m = v2_rt::rc_map_insert(m.clone(), "map_contains_key".to_string(), bool_type()); - let m = v2_rt::rc_map_insert(m.clone(), "map_has".to_string(), bool_type()); - let m = v2_rt::rc_map_insert(m.clone(), "emit_map_has".to_string(), bool_type()); - let m = v2_rt::rc_map_insert(m.clone(), "set_contains".to_string(), bool_type()); - let m = v2_rt::rc_map_insert( - m.clone(), - "lookup".to_string(), - with_optional_cardinality(&type_variable_node("map_value".to_string())), - ); - let m = v2_rt::rc_map_insert( - m.clone(), - "map_get".to_string(), - with_optional_cardinality(&type_variable_node("map_value".to_string())), - ); - let m = v2_rt::rc_map_insert( - m.clone(), - "Some".to_string(), - with_optional_cardinality(&type_variable_node("some_inner".to_string())), - ); - let m = v2_rt::rc_map_insert( - m.clone(), - "map_keys".to_string(), - list_of_type_variable("collection_element".to_string()), - ); - let m = v2_rt::rc_map_insert( - m.clone(), - "map_values".to_string(), - list_of_type_variable("collection_element".to_string()), - ); - let m = v2_rt::rc_map_insert( - m.clone(), - "reverse".to_string(), - list_of_type_variable("collection_element".to_string()), - ); - let m = v2_rt::rc_map_insert( - m.clone(), - "list_push".to_string(), - list_of_type_variable("collection_element".to_string()), - ); - m.clone() - } +let m = v2_rt::rc_map_insert(m.clone(), "string_length".to_string(), int_type()); +let m = v2_rt::rc_map_insert(m.clone(), "code_point".to_string(), int_type()); +let m = v2_rt::rc_map_insert(m.clone(), "to_int".to_string(), int_type()); +let m = v2_rt::rc_map_insert(m.clone(), "scan_while".to_string(), int_type()); +let m = v2_rt::rc_map_insert(m.clone(), "scan_string_end".to_string(), int_type()); +let m = v2_rt::rc_map_insert(m.clone(), "scan_to_eol".to_string(), int_type()); +let m = v2_rt::rc_map_insert(m.clone(), "skip_horizontal_ws".to_string(), int_type()); +let m = v2_rt::rc_map_insert(m.clone(), "parse_int".to_string(), with_optional_cardinality(&int_type())); +let m = v2_rt::rc_map_insert(m.clone(), "char_at".to_string(), string_type()); +let m = v2_rt::rc_map_insert(m.clone(), "substring".to_string(), string_type()); +let m = v2_rt::rc_map_insert(m.clone(), "from_code_point".to_string(), string_type()); +let m = v2_rt::rc_map_insert(m.clone(), "chars_to_string".to_string(), string_type()); +let m = v2_rt::rc_map_insert(m.clone(), "to_string".to_string(), string_type()); +let m = v2_rt::rc_map_insert(m.clone(), "concat".to_string(), string_type()); +let m = v2_rt::rc_map_insert(m.clone(), "map_insert".to_string(), map_of_type_variables()); +let m = v2_rt::rc_map_insert(m.clone(), "map_merge".to_string(), map_of_type_variables()); +let m = v2_rt::rc_map_insert(m.clone(), "with".to_string(), map_of_type_variables()); +let set_ty = make_container_type(&"Set".to_string(), type_variable_node("set_elem".to_string())).ty.clone(); +let m = v2_rt::rc_map_insert(m.clone(), "empty_set".to_string(), set_ty.clone()); +let m = v2_rt::rc_map_insert(m.clone(), "set_insert".to_string(), set_ty.clone()); +let m = v2_rt::rc_map_insert(m.clone(), "set_union".to_string(), set_ty.clone()); +let m = v2_rt::rc_map_insert(m.clone(), "map_contains_key".to_string(), bool_type()); +let m = v2_rt::rc_map_insert(m.clone(), "map_has".to_string(), bool_type()); +let m = v2_rt::rc_map_insert(m.clone(), "emit_map_has".to_string(), bool_type()); +let m = v2_rt::rc_map_insert(m.clone(), "set_contains".to_string(), bool_type()); +let m = v2_rt::rc_map_insert(m.clone(), "lookup".to_string(), with_optional_cardinality(&type_variable_node("map_value".to_string()))); +let m = v2_rt::rc_map_insert(m.clone(), "map_get".to_string(), with_optional_cardinality(&type_variable_node("map_value".to_string()))); +let m = v2_rt::rc_map_insert(m.clone(), "Some".to_string(), with_optional_cardinality(&type_variable_node("some_inner".to_string()))); +let m = v2_rt::rc_map_insert(m.clone(), "map_keys".to_string(), list_of_type_variable("collection_element".to_string())); +let m = v2_rt::rc_map_insert(m.clone(), "map_values".to_string(), list_of_type_variable("collection_element".to_string())); +let m = v2_rt::rc_map_insert(m.clone(), "reverse".to_string(), list_of_type_variable("collection_element".to_string())); +let m = v2_rt::rc_map_insert(m.clone(), "list_push".to_string(), list_of_type_variable("collection_element".to_string())); +m.clone() +} } pub fn infer_builtin_call_type(name: String) -> Option> { @@ -170,7 +104,7 @@ pub fn infer_builtin_call_type(name: String) -> Option> { pub fn resolve_builtin_call_type(name: String) -> Rc { match infer_builtin_call_type(name) { - Some(v) => v.clone(), - None => unit_type(), - } + Some(v) => v.clone(), + None => unit_type(), +} } diff --git a/src/v2/stage0/src/v2_compiler_infer_patterns.rs b/src/v2/stage0/src/v2_compiler_infer_patterns.rs index 4bcb95f3031..54c48623cc0 100644 --- a/src/v2/stage0/src/v2_compiler_infer_patterns.rs +++ b/src/v2/stage0/src/v2_compiler_infer_patterns.rs @@ -1,31 +1,24 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_patterns -use self::NodeLookupStatus::*; -use self::PatternSubject::*; -pub use crate::std_types::SourceSpan; -pub use crate::v2_compiler_infer_env::{lookup_type, lookup_type_by_name, TypeEnv}; -pub use crate::v2_compiler_infer_types::{ - child_type_node, emit_map_has, extract_optional_inner_node, -}; -use crate::v2_rt; -use crate::v2_std_core::Cardinality::{CardOptional, Required}; -use crate::v2_std_core::CompilerDiagnostic::{FieldNotFound, NonExhaustiveMatch, VariantNotFound}; -use crate::v2_std_core::Connective::{Disj, NoConnective}; -use crate::v2_std_core::ExprData::NoExprData; -use crate::v2_std_core::InferredNode::{CompilerError, Resolved, TypeVariable}; -use crate::v2_std_core::LiteralValue::LitBool; -use crate::v2_std_core::MatchPattern::LitPattern; -pub use crate::v2_std_core::{ - arm_pattern, authored_name_at, error_type, find_child_named, is_compiler_error, kernel_span, - make_error_node, no_span, none_type, with_optional_cardinality, Cardinality, - CompilerDiagnostic, Connective, ErrorNode, ExprData, InferredNode, LiteralValue, MatchPattern, - NewlineIndex, Node, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_types::{SourceSpan}; +pub use crate::v2_std_core::{Node, find_child_named, NewlineIndex, authored_name_at, ExprData, InferredNode, is_compiler_error, Cardinality, Connective, ErrorNode, make_error_node, MatchPattern, arm_pattern, LiteralValue, with_optional_cardinality, none_type, error_type, no_span, kernel_span, CompilerDiagnostic}; +use crate::v2_std_core::ExprData::{NoExprData}; +use crate::v2_std_core::InferredNode::{Resolved, CompilerError, TypeVariable}; +use crate::v2_std_core::Cardinality::{Required, CardOptional}; +use crate::v2_std_core::Connective::{Disj, NoConnective}; +use crate::v2_std_core::CompilerDiagnostic::{VariantNotFound, FieldNotFound, NonExhaustiveMatch}; +use crate::v2_std_core::MatchPattern::{LitPattern}; +use crate::v2_std_core::LiteralValue::{LitBool}; +pub use crate::v2_compiler_infer_types::{child_type_node, extract_optional_inner_node, emit_map_has}; +pub use crate::v2_compiler_infer_env::{TypeEnv, lookup_type, lookup_type_by_name}; +use self::NodeLookupStatus::*; +use self::PatternSubject::*; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct NodeLookupResult { @@ -36,7 +29,9 @@ pub struct NodeLookupResult { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum NodeLookupStatus { - LookupResolved { node: Rc }, + LookupResolved { + node: Rc, + }, LookupFailed, } impl NodeLookupStatus { @@ -51,63 +46,69 @@ impl NodeLookupStatus { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum PatternSubject { - PatternResolved { node: Rc }, - PatternDynamic { span: Rc }, + PatternResolved { + node: Rc, + }, + PatternDynamic { + span: Rc, + }, PatternLookupBlocked, } pub fn is_type_variable(inferred: Rc) -> bool { match (*inferred).clone() { - InferredNode::TypeVariable { .. } => true, - _ => false, - } + InferredNode::TypeVariable { .. } => true, + _ => false, +} } pub fn synthesize_optional_some_variant(scrut: &Rc) -> Rc { { let inner = extract_optional_inner_node(&scrut); - let value_field = Rc::new(Node { - name: "value".to_string(), - span: scrut.span.clone(), - ident_span: Some(kernel_span(&"value".to_string())), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { node: inner })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let some_node = Rc::new(Node { - name: "Some".to_string(), - span: scrut.span.clone(), - ident_span: Some(kernel_span(&"Some".to_string())), - children: Rc::new(vec![value_field]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - some_node - } +let value_field = Rc::new(Node { + name: "value".to_string(), + span: scrut.span.clone(), + ident_span: Some(kernel_span(&"value".to_string())), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: inner, +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let some_node = Rc::new(Node { + name: "Some".to_string(), + span: scrut.span.clone(), + ident_span: Some(kernel_span(&"Some".to_string())), + children: Rc::new(vec![value_field]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +some_node +} } pub fn pattern_subject_from_node(n: &Rc) -> Rc { @@ -117,290 +118,179 @@ pub fn pattern_subject_from_node(n: &Rc) -> Rc { } else { false }; - if is_error { +if is_error { Rc::new(PatternSubject::PatternLookupBlocked) } else { - Rc::new(PatternSubject::PatternResolved { node: n.clone() }) + Rc::new(PatternSubject::PatternResolved { + node: n.clone(), +}) } - } +} } pub fn pattern_subject_from_inferred(n: Option>) -> Rc { match n.as_deref().cloned() { - Some(InferredNode::Resolved { node: resolved, .. }) => pattern_subject_from_node(&resolved), - _ => Rc::new(PatternSubject::PatternLookupBlocked), - } + Some(InferredNode::Resolved { node: resolved, .. }) => pattern_subject_from_node(&resolved), + _ => Rc::new(PatternSubject::PatternLookupBlocked), +} } pub fn node_lookup_resolved(node: Rc) -> Rc { Rc::new(NodeLookupResult { - status: Rc::new(NodeLookupStatus::LookupResolved { node: node }), - diagnostics: Rc::new(vec![]), - }) + status: Rc::new(NodeLookupStatus::LookupResolved { + node: node, +}), + diagnostics: Rc::new(vec![]), +}) } pub fn node_lookup_failed(diagnostics: Rc>>) -> Rc { Rc::new(NodeLookupResult { - status: Rc::new(NodeLookupStatus::LookupFailed), - diagnostics: diagnostics, - }) + status: Rc::new(NodeLookupStatus::LookupFailed), + diagnostics: diagnostics, +}) } pub fn lookup_result_subject(result: Rc) -> Rc { match (*result.status.clone()).clone() { - NodeLookupStatus::LookupResolved { node: resolved, .. } => { - pattern_subject_from_node(&resolved) - } - NodeLookupStatus::LookupFailed => Rc::new(PatternSubject::PatternLookupBlocked), - } + NodeLookupStatus::LookupResolved { node: resolved, .. } => pattern_subject_from_node(&resolved), + NodeLookupStatus::LookupFailed => Rc::new(PatternSubject::PatternLookupBlocked), +} } pub fn pattern_binding_type(subject: Rc) -> Rc { match (*subject).clone() { - PatternSubject::PatternResolved { node: resolved, .. } => resolved.clone(), - PatternSubject::PatternDynamic { .. } => error_type(), - PatternSubject::PatternLookupBlocked => error_type(), - } + PatternSubject::PatternResolved { node: resolved, .. } => resolved.clone(), + PatternSubject::PatternDynamic { .. } => error_type(), + PatternSubject::PatternLookupBlocked => error_type(), +} } -pub fn variant_not_found_result( - scrut: &Rc, - variant_name: String, - module_name: String, - source_indices: Rc>>, -) -> Rc { - node_lookup_failed(Rc::new(vec![make_error_node( - Rc::new(CompilerDiagnostic::VariantNotFound { - variant: variant_name, - type_name: authored_name_at(source_indices, &scrut), - span: scrut.span.clone(), - }), - module_name, - )])) +pub fn variant_not_found_result(scrut: &Rc, variant_name: String, module_name: String, source_indices: Rc>>) -> Rc { + node_lookup_failed(Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::VariantNotFound { + variant: variant_name, + type_name: authored_name_at(source_indices, &scrut), + span: scrut.span.clone(), +}), module_name)])) } -pub fn lookup_variant_in_type( - scrut: Rc, - variant_name: &String, - module_name: String, - source_indices: &Rc>>, -) -> Rc { +pub fn lookup_variant_in_type(scrut: Rc, variant_name: &String, module_name: String, source_indices: &Rc>>) -> Rc { match (*scrut).clone() { - PatternSubject::PatternLookupBlocked => node_lookup_failed(Rc::new(vec![])), - PatternSubject::PatternDynamic { - span: dynamic_span, .. - } => node_lookup_failed(Rc::new(vec![make_error_node( - Rc::new(CompilerDiagnostic::VariantNotFound { - variant: variant_name.clone(), - type_name: "unresolved".to_string(), - span: dynamic_span.clone(), - }), - module_name, - )])), - PatternSubject::PatternResolved { - node: scrut_node, .. - } => { - let scrut_opt = (scrut_node.return_cardinality.clone() == Cardinality::CardOptional); - if (((scrut_node.connective.clone() == Connective::NoConnective) - && ((scrut_node.children.clone().len() as i64) == 0)) - && (scrut_opt.clone() == false)) + PatternSubject::PatternLookupBlocked => node_lookup_failed(Rc::new(vec![])), + PatternSubject::PatternDynamic { span: dynamic_span, .. } => node_lookup_failed(Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::VariantNotFound { + variant: variant_name.clone(), + type_name: "unresolved".to_string(), + span: dynamic_span.clone(), +}), module_name)])), + PatternSubject::PatternResolved { node: scrut_node, .. } => { + let scrut_opt = (scrut_node.return_cardinality.clone() == Cardinality::CardOptional); +if (((scrut_node.connective.clone() == Connective::NoConnective) && ((scrut_node.children.clone().len() as i64) == 0)) && (scrut_opt.clone() == false)) { + node_lookup_failed(Rc::new(vec![])) + } else { { - node_lookup_failed(Rc::new(vec![])) - } else { - { - let direct_match = find_child_named( - scrut_node.clone(), - variant_name.clone(), - source_indices.clone(), - ); - let fallback = if (scrut_opt.clone() - && (variant_name.clone().as_str() == "Some".to_string().as_str())) - { - node_lookup_resolved(synthesize_optional_some_variant(&scrut_node)) + let direct_match = find_child_named(scrut_node.clone(), variant_name.clone(), source_indices.clone()); +let fallback = if (scrut_opt.clone() && (variant_name.clone().as_str() == "Some".to_string().as_str())) { + node_lookup_resolved(synthesize_optional_some_variant(&scrut_node)) + } else { + if (scrut_opt.clone() && (variant_name.clone().as_str() == "None".to_string().as_str())) { + node_lookup_resolved(none_type()) } else { - if (scrut_opt.clone() - && (variant_name.clone().as_str() == "None".to_string().as_str())) - { - node_lookup_resolved(none_type()) - } else { - variant_not_found_result( - &scrut_node, - variant_name.clone(), - module_name, - source_indices.clone(), - ) - } - }; - match direct_match { - Some(v) => node_lookup_resolved(v.clone()), - None => fallback, + variant_not_found_result(&scrut_node, variant_name.clone(), module_name, source_indices.clone()) } - } - } + }; +match direct_match { + Some(v) => node_lookup_resolved(v.clone()), + None => fallback, +} +} } - } +}, +} } -pub fn lookup_field_in_variant( - variant: Rc, - field_name: &String, - module_name: String, - source_indices: &Rc>>, -) -> Rc { +pub fn lookup_field_in_variant(variant: Rc, field_name: &String, module_name: String, source_indices: &Rc>>) -> Rc { match (*variant).clone() { - PatternSubject::PatternLookupBlocked => node_lookup_failed(Rc::new(vec![])), - PatternSubject::PatternDynamic { - span: dynamic_span, .. - } => node_lookup_failed(Rc::new(vec![make_error_node( - Rc::new(CompilerDiagnostic::FieldNotFound { - field: field_name.clone(), - type_name: "unresolved".to_string(), - span: dynamic_span.clone(), - }), - module_name, - )])), - PatternSubject::PatternResolved { - node: variant_node, .. - } => match find_child_named( - variant_node.clone(), - field_name.clone(), - source_indices.clone(), - ) { - Some(field_child) => { - let resolved = child_type_node(&field_child); - node_lookup_resolved(resolved) - } - None => node_lookup_failed(Rc::new(vec![make_error_node( - Rc::new(CompilerDiagnostic::FieldNotFound { - field: field_name.clone(), - type_name: authored_name_at(source_indices.clone(), &variant_node), - span: variant_node.span.clone(), - }), - module_name, - )])), - }, - } + PatternSubject::PatternLookupBlocked => node_lookup_failed(Rc::new(vec![])), + PatternSubject::PatternDynamic { span: dynamic_span, .. } => node_lookup_failed(Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::FieldNotFound { + field: field_name.clone(), + type_name: "unresolved".to_string(), + span: dynamic_span.clone(), +}), module_name)])), + PatternSubject::PatternResolved { node: variant_node, .. } => match find_child_named(variant_node.clone(), field_name.clone(), source_indices.clone()) { + Some(field_child) => { + let resolved = child_type_node(&field_child); +node_lookup_resolved(resolved) +}, + None => node_lookup_failed(Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::FieldNotFound { + field: field_name.clone(), + type_name: authored_name_at(source_indices.clone(), &variant_node), + span: variant_node.span.clone(), +}), module_name)])), +}, +} } -pub fn check_match_exhaustiveness( - scrutinee_type: &Rc, - arms: &Rc>>, - env: &Rc, - span: Rc, - module_name: String, -) -> Rc>> { +pub fn check_match_exhaustiveness(scrutinee_type: &Rc, arms: &Rc>>, env: &Rc, span: Rc, module_name: String) -> Rc>> { { - let scrut_is_optional = - (scrutinee_type.return_cardinality.clone() == Cardinality::CardOptional); - let has_structure = (scrutinee_type.connective.clone() != Connective::NoConnective); - let resolved_raw = if has_structure { + let scrut_is_optional = (scrutinee_type.return_cardinality.clone() == Cardinality::CardOptional); +let has_structure = (scrutinee_type.connective.clone() != Connective::NoConnective); +let resolved_raw = if has_structure { scrutinee_type.clone() } else { - match lookup_type_by_name( - &env, - authored_name_at(env.source_indices.clone(), &scrutinee_type), - ) { - Some(def) => def.clone(), - None => scrutinee_type.clone(), - } + match lookup_type_by_name(&env, authored_name_at(env.source_indices.clone(), &scrutinee_type)) { + Some(def) => def.clone(), + None => scrutinee_type.clone(), +} }; - let resolved = if scrut_is_optional { +let resolved = if scrut_is_optional { with_optional_cardinality(&resolved_raw) } else { resolved_raw }; - let is_coproduct = (resolved.connective.clone() == Connective::Disj); - let resolved_is_optional = - (resolved.return_cardinality.clone() == Cardinality::CardOptional); - if (is_coproduct || resolved_is_optional.clone()) { +let is_coproduct = (resolved.connective.clone() == Connective::Disj); +let resolved_is_optional = (resolved.return_cardinality.clone() == Cardinality::CardOptional); +if (is_coproduct || resolved_is_optional.clone()) { { let variant_names = if resolved_is_optional.clone() { Rc::new(vec!["Some".to_string(), "None".to_string()]) } else { - Rc::new({ - let mut __result = Vec::new(); - for c in resolved.children.clone().iter().cloned() { - __result.push(authored_name_at(env.source_indices.clone(), &c)); - } - __result - }) - }; - let has_catch_all = { - let mut __found = false; - for arm in arms.clone().iter().cloned() { - if match (*arm_pattern(arm.clone())).clone() { - MatchPattern::Wildcard => true, - MatchPattern::Bind { .. } => true, - _ => false, - } { - __found = true; - break; - } - } - __found + Rc::new({ let mut __result = Vec::new(); for c in resolved.children.clone().iter().cloned() { __result.push(authored_name_at(env.source_indices.clone(), &c)); } __result }) }; - if has_catch_all { +let has_catch_all = { let mut __found = false; for arm in arms.clone().iter().cloned() { if match (*arm_pattern(arm.clone())).clone() { + MatchPattern::Wildcard => true, + MatchPattern::Bind { .. } => true, + _ => false, +} { __found = true; break; } } __found }; +if has_catch_all { Rc::new(vec![]) } else { { - let covered_set = arms.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, arm: Rc| match (*arm_pattern( - arm.clone(), - )) - .clone() - { - MatchPattern::VariantPattern { name: n, .. } => { - v2_rt::rc_map_insert(acc.clone(), n.clone(), true) - } - MatchPattern::LitPattern { value: v, .. } => { - match (*v.clone()).clone() { - LiteralValue::LitBool { value: b, .. } => { - if b.clone() { - v2_rt::rc_map_insert( - acc.clone(), - "True".to_string(), - true, - ) - } else { - v2_rt::rc_map_insert( - acc.clone(), - "False".to_string(), - true, - ) - } - } - _ => acc.clone(), - } - } - _ => acc.clone(), - }, - ); - let uncovered = Rc::new({ - let mut __result = Vec::new(); - for v in variant_names.iter().cloned() { - if (emit_map_has(covered_set.clone(), v.clone()) == false) { - __result.push(v); - } - } - __result - }); - if ((uncovered.clone().len() as i64) > 0) { - Rc::new(vec![make_error_node( - Rc::new(CompilerDiagnostic::NonExhaustiveMatch { - missing: uncovered.clone(), - span: span, - }), - module_name, - )]) + let covered_set = arms.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, arm: Rc| match (*arm_pattern(arm.clone())).clone() { + MatchPattern::VariantPattern { name: n, .. } => v2_rt::rc_map_insert(acc.clone(), n.clone(), true), + MatchPattern::LitPattern { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitBool { value: b, .. } => if b.clone() { + v2_rt::rc_map_insert(acc.clone(), "True".to_string(), true) + } else { + v2_rt::rc_map_insert(acc.clone(), "False".to_string(), true) + }, + _ => acc.clone(), +}, + _ => acc.clone(), +}); +let uncovered = Rc::new({ let mut __result = Vec::new(); for v in variant_names.iter().cloned() { if (emit_map_has(covered_set.clone(), v.clone()) == false) { __result.push(v); } } __result }); +if ((uncovered.clone().len() as i64) > 0) { + Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::NonExhaustiveMatch { + missing: uncovered.clone(), + span: span, +}), module_name)]) } else { Rc::new(vec![]) } - } +} } - } +} } else { Rc::new(vec![]) } - } +} } diff --git a/src/v2/stage0/src/v2_compiler_infer_resolve.rs b/src/v2/stage0/src/v2_compiler_infer_resolve.rs index 53f5cbf2aaf..7aa5398c202 100644 --- a/src/v2/stage0/src/v2_compiler_infer_resolve.rs +++ b/src/v2/stage0/src/v2_compiler_infer_resolve.rs @@ -1,55 +1,32 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_resolve -use self::AliasKind::*; -pub use crate::std_induction::SubValueRelation; -use crate::std_induction::SubValueRelation::SubValueUnknown; -pub use crate::std_types::{container_param_name, SourceSpan}; -pub use crate::v2_compiler_infer_env::{ - authored_name, is_recursive_type, is_recursive_type_by_name, is_recursive_type_for, - lookup_type, lookup_type_by_name, lookup_type_for, TypeBinding, TypeEnv, -}; -pub use crate::v2_compiler_infer_types::{ - child_type_node, node_is_keyed_collection, resolved_type, -}; -use crate::v2_rt; -use crate::v2_std_core::Cardinality::{CardOptional, Required}; -use crate::v2_std_core::CompilerDiagnostic::{ArityMismatch, InternalError, UnresolvedType}; -use crate::v2_std_core::Connective::{Conj, Disj, NoConnective}; -use crate::v2_std_core::ExprData::{ - ExprBinOp, ExprBlock, ExprCall, ExprCast, ExprError, ExprFieldAccess, ExprForEach, ExprIf, - ExprIndex, ExprLambda, ExprLet, ExprListLit, ExprLiteral, ExprMatch, ExprMethodCall, - ExprRecordLit, ExprReturn, ExprSlice, ExprStringInterp, ExprUnaryOp, ExprVar, NoExprData, -}; -use crate::v2_std_core::ExprErrorKind::SemanticExprError; -use crate::v2_std_core::InferredNode::{CompilerError, Resolved, TypeVariable}; -use crate::v2_std_core::MatchPattern::Wildcard; -use crate::v2_std_core::StringPart::{Interpolation, Text}; -pub use crate::v2_std_core::{ - arg_name_at, arg_value, arm_body, arm_guard, arm_pattern, authored_name_at, default_ident_span, - expr_call_func_at, expr_method_name_at, field_init_node_name_at, field_init_node_value, - field_node_cardinality, field_node_default_value, field_node_from_key, field_node_name_at, - field_node_type_expr, foreach_variable_at, intern, is_compiler_error, is_container_type, - is_kernel_type, is_local_transport, kernel_span, let_binding_name_at, local_transport_node, - make_arg_node, make_arm_node, make_error_node, make_expr_error_node, make_expr_node, - make_field_init_node, make_field_node, make_interp_part_node, make_named_expr_node, - make_param_node, make_resource_use_node, make_text_part_node, make_transport_node, - map_children, no_span, node_name_span, param_node_default_value, param_node_name_at, - param_node_type_expr, resource_use_name_at, resource_use_resource, string_type, - transport_request_body, unit_type, with_optional_cardinality, with_required_cardinality, - Cardinality, CompilerDiagnostic, Connective, ErrorNode, ExprData, ExprErrorKind, InferredNode, - MatchPattern, NewlineIndex, Node, StringPart, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_types::{SourceSpan, container_param_name}; +pub use crate::v2_std_core::{Node, authored_name_at, NewlineIndex, make_param_node, param_node_name_at, param_node_type_expr, param_node_default_value, make_field_node, field_node_name_at, field_node_type_expr, field_node_cardinality, field_node_default_value, field_node_from_key, InferredNode, is_compiler_error, ErrorNode, make_error_node, Cardinality, StringPart, MatchPattern, ExprData, ExprErrorKind, make_expr_node, make_named_expr_node, make_expr_error_node, map_children, expr_call_func_at, expr_method_name_at, let_binding_name_at, foreach_variable_at, make_arg_node, arg_name_at, arg_value, make_arm_node, arm_pattern, arm_guard, arm_body, make_field_init_node, field_init_node_name_at, field_init_node_value, make_resource_use_node, resource_use_name_at, resource_use_resource, make_text_part_node, make_interp_part_node, make_transport_node, local_transport_node, is_local_transport, transport_request_body, is_kernel_type, is_container_type, with_optional_cardinality, with_required_cardinality, Connective, no_span, unit_type, string_type, default_ident_span, kernel_span, node_name_span, intern, CompilerDiagnostic}; +use crate::v2_std_core::InferredNode::{Resolved, CompilerError, TypeVariable}; +use crate::v2_std_core::CompilerDiagnostic::{InternalError, ArityMismatch, UnresolvedType}; +use crate::v2_std_core::Cardinality::{Required, CardOptional}; +use crate::v2_std_core::StringPart::{Text, Interpolation}; +use crate::v2_std_core::MatchPattern::{Wildcard}; +use crate::v2_std_core::ExprData::{NoExprData, ExprLiteral, ExprError, ExprVar, ExprFieldAccess, ExprCall, ExprMethodCall, ExprMatch, ExprIf, ExprLet, ExprRecordLit, ExprListLit, ExprBinOp, ExprUnaryOp, ExprLambda, ExprStringInterp, ExprBlock, ExprCast, ExprForEach, ExprIndex, ExprSlice, ExprReturn}; +use crate::v2_std_core::ExprErrorKind::{SemanticExprError}; +use crate::v2_std_core::Connective::{Conj, Disj, NoConnective}; +pub use crate::v2_compiler_infer_types::{resolved_type, child_type_node, node_is_keyed_collection}; +pub use crate::std_induction::{SubValueRelation}; +use crate::std_induction::SubValueRelation::{SubValueUnknown}; +pub use crate::v2_compiler_infer_env::{TypeEnv, TypeBinding, lookup_type, lookup_type_by_name, lookup_type_for, is_recursive_type, is_recursive_type_by_name, is_recursive_type_for, authored_name}; +use self::AliasKind::*; pub fn is_type_variable(inferred: Rc) -> bool { match (*inferred).clone() { - InferredNode::TypeVariable { .. } => true, - _ => false, - } + InferredNode::TypeVariable { .. } => true, + _ => false, +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -125,139 +102,96 @@ pub fn resolve_node(n: Rc, env: Rc, module_name: String) -> Rc, env: &Rc) -> bool { { let has_structure = (n.connective.clone() != Connective::NoConnective); - if has_structure { +if has_structure { false } else { match lookup_type_for(&env, &n) { - Some(decl) => { - if ((decl.params.clone().len() as i64) > 0) { - if is_container_type(authored_name(env.clone(), n.clone())) { - false - } else { - if (decl.inferred.clone() != None) { - true - } else { - true - } - } + Some(decl) => if ((decl.params.clone().len() as i64) > 0) { + if is_container_type(authored_name(env.clone(), n.clone())) { + false + } else { + if (decl.inferred.clone() != None) { + true } else { - false + true } } - None => false, - } + } else { + false + }, + None => false, +} } - } +} } -pub fn substitute_type_slots( - n: &Rc, - slot_bindings: &Rc>>, - decl_name: &String, - source_indices: &Rc>>, -) -> Rc { +pub fn substitute_type_slots(n: &Rc, slot_bindings: &Rc>>, decl_name: &String, source_indices: &Rc>>) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let is_slot = (((((n.children.clone().len() as i64) == 0) - && (n.connective.clone() == Connective::NoConnective)) - && (n.body.clone() == None)) - && (n.inferred.clone() == None)); - if is_slot { - match v2_rt::map_get(&slot_bindings, authored_name_at(source_indices.clone(), &n)) { - Some(concrete) => concrete.clone(), - None => n.clone(), - } - } else { - { - let new_children = Rc::new({ - let mut __result = Vec::new(); - for child in n.children.clone().iter().cloned() { - __result.push( - if (authored_name_at(source_indices.clone(), &child).as_str() - == decl_name.clone().as_str()) - { - { - let substituted_args = Rc::new({ - let mut __result = Vec::new(); - for arg in child.children.clone().iter().cloned() { - __result.push(substitute_type_slots( - &arg, - &slot_bindings, - &decl_name, - &source_indices, - )); - } - __result - }); - Rc::new(Node { - name: child.name.clone(), - span: child.span.clone(), - ident_span: child.ident_span.clone(), - children: substituted_args.clone(), - connective: child.connective.clone(), - params: child.params.clone(), - inferred: child.inferred.clone(), - return_cardinality: child.return_cardinality.clone(), - uses: child.uses.clone(), - body: child.body.clone(), - transport: child.transport.clone(), - properties: child.properties.clone(), - type_annotation: child.type_annotation.clone(), - is_self_recursive: child.is_self_recursive.clone(), - has_non_tail_self_call: child - .has_non_tail_self_call - .clone(), - match_pattern: child.match_pattern.clone(), - expr_data: child.expr_data.clone(), - ident: None, - }) - } - } else { - substitute_type_slots( - &child, - &slot_bindings, - &decl_name, - &source_indices, - ) - }, - ); - } - __result - }); - let new_inferred = match n.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - Some(Rc::new(InferredNode::Resolved { - node: substitute_type_slots( - &rt, - &slot_bindings, - &decl_name, - &source_indices, - ), - })) - } - _ => n.inferred.clone(), - }; - Rc::new(Node { - name: n.name.clone(), - span: n.span.clone(), - ident_span: n.ident_span.clone(), - children: new_children, - connective: n.connective.clone(), - params: n.params.clone(), - inferred: new_inferred, - return_cardinality: n.return_cardinality.clone(), - uses: n.uses.clone(), - body: n.body.clone(), - transport: n.transport.clone(), - properties: n.properties.clone(), - type_annotation: n.type_annotation.clone(), - is_self_recursive: n.is_self_recursive.clone(), - has_non_tail_self_call: n.has_non_tail_self_call.clone(), - match_pattern: n.match_pattern.clone(), - expr_data: n.expr_data.clone(), - ident: None, - }) + { + let is_slot = (((((n.children.clone().len() as i64) == 0) && (n.connective.clone() == Connective::NoConnective)) && (n.body.clone() == None)) && (n.inferred.clone() == None)); +if is_slot { + match v2_rt::map_get(&slot_bindings, authored_name_at(source_indices.clone(), &n)) { + Some(concrete) => concrete.clone(), + None => n.clone(), +} + } else { + { + let new_children = Rc::new({ let mut __result = Vec::new(); for child in n.children.clone().iter().cloned() { __result.push(if (authored_name_at(source_indices.clone(), &child).as_str() == decl_name.clone().as_str()) { + { + let substituted_args = Rc::new({ let mut __result = Vec::new(); for arg in child.children.clone().iter().cloned() { __result.push(substitute_type_slots(&arg, &slot_bindings, &decl_name, &source_indices)); } __result }); +Rc::new(Node { + name: child.name.clone(), + span: child.span.clone(), + ident_span: child.ident_span.clone(), + children: substituted_args.clone(), + connective: child.connective.clone(), + params: child.params.clone(), + inferred: child.inferred.clone(), + return_cardinality: child.return_cardinality.clone(), + uses: child.uses.clone(), + body: child.body.clone(), + transport: child.transport.clone(), + properties: child.properties.clone(), + type_annotation: child.type_annotation.clone(), + is_self_recursive: child.is_self_recursive.clone(), + has_non_tail_self_call: child.has_non_tail_self_call.clone(), + match_pattern: child.match_pattern.clone(), + expr_data: child.expr_data.clone(), + ident: None, +}) +} + } else { + substitute_type_slots(&child, &slot_bindings, &decl_name, &source_indices) + }); } __result }); +let new_inferred = match n.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => Some(Rc::new(InferredNode::Resolved { + node: substitute_type_slots(&rt, &slot_bindings, &decl_name, &source_indices), +})), + _ => n.inferred.clone(), +}; +Rc::new(Node { + name: n.name.clone(), + span: n.span.clone(), + ident_span: n.ident_span.clone(), + children: new_children, + connective: n.connective.clone(), + params: n.params.clone(), + inferred: new_inferred, + return_cardinality: n.return_cardinality.clone(), + uses: n.uses.clone(), + body: n.body.clone(), + transport: n.transport.clone(), + properties: n.properties.clone(), + type_annotation: n.type_annotation.clone(), + is_self_recursive: n.is_self_recursive.clone(), + has_non_tail_self_call: n.has_non_tail_self_call.clone(), + match_pattern: n.match_pattern.clone(), + expr_data: n.expr_data.clone(), + ident: None, +}) +} } - } +} }) } @@ -272,286 +206,185 @@ pub enum AliasKind { pub fn classify_alias(target: &Rc) -> AliasKind { { let nc = (target.connective.clone() == Connective::NoConnective); - if (((target.children.clone().len() as i64) > 0) && nc.clone()) { +if (((target.children.clone().len() as i64) > 0) && nc.clone()) { AliasKind::AliasParameterized } else { - if ((((target.children.clone().len() as i64) == 0) && nc.clone()) - && (target.ident_span.clone() != None)) - { + if ((((target.children.clone().len() as i64) == 0) && nc.clone()) && (target.ident_span.clone() != None)) { AliasKind::AliasLeaf } else { AliasKind::AliasPassthrough } } - } +} } -pub fn resolve_alias_target( - target: Rc, - env: &Rc, - module_name: String, - depth: i64, -) -> Rc { +pub fn resolve_alias_target(target: Rc, env: &Rc, module_name: String, depth: i64) -> Rc { match classify_alias(&target) { - AliasKind::AliasParameterized => { - resolve_node_bounded(&target, &env, &module_name, (depth + 1)) - .resolved - .clone() - } - AliasKind::AliasLeaf => { - match lookup_type_by_name(&env, authored_name_at(env.source_indices.clone(), &target)) { - Some(env_target) => env_target.clone(), - None => target.clone(), - } - } - AliasKind::AliasPassthrough => target.clone(), - } + AliasKind::AliasParameterized => resolve_node_bounded(&target, &env, &module_name, (depth + 1)).resolved.clone(), + AliasKind::AliasLeaf => match lookup_type_by_name(&env, authored_name_at(env.source_indices.clone(), &target)) { + Some(env_target) => env_target.clone(), + None => target.clone(), +}, + AliasKind::AliasPassthrough => target.clone(), +} } -pub fn resolve_node_bounded( - n: &Rc, - env: &Rc, - module_name: &String, - depth: i64, -) -> Rc { +pub fn resolve_node_bounded(n: &Rc, env: &Rc, module_name: &String, depth: i64) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - if (depth.clone() > 100) { - return Rc::new(NodeResolveResult { - resolved: n.clone(), - diagnostics: Rc::new(vec![make_error_node( - Rc::new(CompilerDiagnostic::InternalError { - message: v2_rt::concat( - v2_rt::concat( - "internal: type resolution exceeded depth 100 for '".to_string(), - authored_name(env.clone(), n.clone()), - ), - "'".to_string(), - ), - span: n.span.clone(), - }), - module_name.clone(), - )]), - }); - } - let has_structure = (n.connective.clone() != Connective::NoConnective); - if has_structure { - { - let is_product = (n.connective.clone() == Connective::Conj); - if is_product { - if (n.type_annotation.clone() != None) { - match n.children.clone().first().cloned() { - Some(base) => { - let base_result = resolve_node_bounded( - &base, - &env, - &module_name, - (depth.clone() + 1), - ); - let base_resolved = base_result.resolved.clone(); - let base_diags = base_result.diagnostics.clone(); - Rc::new(NodeResolveResult { - resolved: Rc::new(Node { - name: n.name.clone(), - span: n.span.clone(), - ident_span: n.ident_span.clone(), - children: Rc::new(vec![base_resolved]), - connective: n.connective.clone(), - params: n.params.clone(), - inferred: n.inferred.clone(), - return_cardinality: n.return_cardinality.clone(), - uses: n.uses.clone(), - body: n.body.clone(), - transport: n.transport.clone(), - properties: n.properties.clone(), - type_annotation: n.type_annotation.clone(), - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - diagnostics: base_diags, - }) - } - None => Rc::new(NodeResolveResult { - resolved: n.clone(), - diagnostics: Rc::new(vec![]), - }), + { + if (depth.clone() > 100) { + return Rc::new(NodeResolveResult { + resolved: n.clone(), + diagnostics: Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::InternalError { + message: v2_rt::concat(v2_rt::concat("internal: type resolution exceeded depth 100 for '".to_string(), authored_name(env.clone(), n.clone())), "'".to_string()), + span: n.span.clone(), +}), module_name.clone())]), +}) + } +let has_structure = (n.connective.clone() != Connective::NoConnective); +if has_structure { + { + let is_product = (n.connective.clone() == Connective::Conj); +if is_product { + if (n.type_annotation.clone() != None) { + match n.children.clone().first().cloned() { + Some(base) => { + let base_result = resolve_node_bounded(&base, &env, &module_name, (depth.clone() + 1)); +let base_resolved = base_result.resolved.clone(); +let base_diags = base_result.diagnostics.clone(); +Rc::new(NodeResolveResult { + resolved: Rc::new(Node { + name: n.name.clone(), + span: n.span.clone(), + ident_span: n.ident_span.clone(), + children: Rc::new(vec![base_resolved]), + connective: n.connective.clone(), + params: n.params.clone(), + inferred: n.inferred.clone(), + return_cardinality: n.return_cardinality.clone(), + uses: n.uses.clone(), + body: n.body.clone(), + transport: n.transport.clone(), + properties: n.properties.clone(), + type_annotation: n.type_annotation.clone(), + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), + diagnostics: base_diags, +}) +}, + None => Rc::new(NodeResolveResult { + resolved: n.clone(), + diagnostics: Rc::new(vec![]), +}), +} + } else { + { + let child_results = Rc::new({ let mut __result = Vec::new(); for child in n.children.clone().iter().cloned() { __result.push(if (child.inferred.clone() == None) { + Rc::new(NodeResolveResult { + resolved: child.clone(), + diagnostics: Rc::new(vec![]), +}) + } else { + { + let child_rt = resolved_type(child.clone()); +let rt_result = resolve_node_bounded(&child_rt, &env, &module_name, (depth.clone() + 1)); +let rt_resolved = rt_result.resolved.clone(); +let rt_diags = rt_result.diagnostics.clone(); +Rc::new(NodeResolveResult { + resolved: Rc::new(Node { + name: child.name.clone(), + span: child.span.clone(), + ident_span: child.ident_span.clone(), + children: child.children.clone(), + connective: child.connective.clone(), + params: child.params.clone(), + inferred: Some(Rc::new(InferredNode::Resolved { + node: rt_resolved.clone(), +})), + return_cardinality: child.return_cardinality.clone(), + uses: child.uses.clone(), + body: child.body.clone(), + transport: child.transport.clone(), + properties: child.properties.clone(), + type_annotation: child.type_annotation.clone(), + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), + diagnostics: rt_diags.clone(), +}) +} + }); } __result }); +let resolved_children = Rc::new({ let mut __result = Vec::new(); for cr in child_results.clone().iter().cloned() { __result.push(cr.resolved.clone()); } __result }); +let all_diags = Rc::new({ let mut __result = Vec::new(); for cr in child_results.clone().iter().cloned() { __result.extend((*cr.diagnostics.clone()).iter().cloned()); } __result }); +Rc::new(NodeResolveResult { + resolved: Rc::new(Node { + name: n.name.clone(), + span: n.span.clone(), + ident_span: n.ident_span.clone(), + children: resolved_children, + connective: n.connective.clone(), + params: n.params.clone(), + inferred: n.inferred.clone(), + return_cardinality: n.return_cardinality.clone(), + uses: n.uses.clone(), + body: n.body.clone(), + transport: n.transport.clone(), + properties: n.properties.clone(), + type_annotation: n.type_annotation.clone(), + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), + diagnostics: all_diags, +}) +} } } else { { - let child_results = Rc::new({ - let mut __result = Vec::new(); - for child in n.children.clone().iter().cloned() { - __result.push(if (child.inferred.clone() == None) { - Rc::new(NodeResolveResult { - resolved: child.clone(), - diagnostics: Rc::new(vec![]), - }) - } else { - { - let child_rt = resolved_type(child.clone()); - let rt_result = resolve_node_bounded( - &child_rt, - &env, - &module_name, - (depth.clone() + 1), - ); - let rt_resolved = rt_result.resolved.clone(); - let rt_diags = rt_result.diagnostics.clone(); + let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); +if is_optional { + { + let inner = with_required_cardinality(&n); +let inner_result = resolve_node_bounded(&inner, &env, &module_name, (depth.clone() + 1)); +let inner_resolved = inner_result.resolved.clone(); +let inner_diags = inner_result.diagnostics.clone(); +Rc::new(NodeResolveResult { + resolved: with_optional_cardinality(&inner_resolved), + diagnostics: inner_diags, +}) +} + } else { + { + let variant_results = Rc::new({ let mut __result = Vec::new(); for variant_child in n.children.clone().iter().cloned() { __result.push({ + let field_results = Rc::new({ let mut __result = Vec::new(); for field_child in variant_child.children.clone().iter().cloned() { __result.push(if (field_child.inferred.clone() == None) { Rc::new(NodeResolveResult { - resolved: Rc::new(Node { - name: child.name.clone(), - span: child.span.clone(), - ident_span: child.ident_span.clone(), - children: child.children.clone(), - connective: child.connective.clone(), - params: child.params.clone(), - inferred: Some(Rc::new( - InferredNode::Resolved { - node: rt_resolved.clone(), - }, - )), - return_cardinality: child - .return_cardinality - .clone(), - uses: child.uses.clone(), - body: child.body.clone(), - transport: child.transport.clone(), - properties: child.properties.clone(), - type_annotation: child.type_annotation.clone(), - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - diagnostics: rt_diags.clone(), - }) - } - }); - } - __result - }); - let resolved_children = Rc::new({ - let mut __result = Vec::new(); - for cr in child_results.clone().iter().cloned() { - __result.push(cr.resolved.clone()); - } - __result - }); - let all_diags = Rc::new({ - let mut __result = Vec::new(); - for cr in child_results.clone().iter().cloned() { - __result.extend((*cr.diagnostics.clone()).iter().cloned()); - } - __result - }); - Rc::new(NodeResolveResult { - resolved: Rc::new(Node { - name: n.name.clone(), - span: n.span.clone(), - ident_span: n.ident_span.clone(), - children: resolved_children, - connective: n.connective.clone(), - params: n.params.clone(), - inferred: n.inferred.clone(), - return_cardinality: n.return_cardinality.clone(), - uses: n.uses.clone(), - body: n.body.clone(), - transport: n.transport.clone(), - properties: n.properties.clone(), - type_annotation: n.type_annotation.clone(), - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - diagnostics: all_diags, - }) - } - } - } else { - { - let is_optional = - (n.return_cardinality.clone() == Cardinality::CardOptional); - if is_optional { - { - let inner = with_required_cardinality(&n); - let inner_result = resolve_node_bounded( - &inner, - &env, - &module_name, - (depth.clone() + 1), - ); - let inner_resolved = inner_result.resolved.clone(); - let inner_diags = inner_result.diagnostics.clone(); - Rc::new(NodeResolveResult { - resolved: with_optional_cardinality(&inner_resolved), - diagnostics: inner_diags, - }) - } - } else { - { - let variant_results = Rc::new({ - let mut __result = Vec::new(); - for variant_child in n.children.clone().iter().cloned() { - __result.push({ - let field_results = Rc::new({ - let mut __result = Vec::new(); - for field_child in - variant_child.children.clone().iter().cloned() - { - __result.push( - if (field_child.inferred.clone() == None) { - Rc::new(NodeResolveResult { - resolved: field_child.clone(), - diagnostics: Rc::new(vec![]), - }) - } else { - { - let field_rt = resolved_type( - field_child.clone(), - ); - let is_self_ref = ((authored_name( - env.clone(), - field_rt.clone(), - ) - .as_str() - == authored_name( - env.clone(), - n.clone(), - ) - .as_str()) - && ((field_rt - .children - .clone() - .len() - as i64) - > 0)); - let rt_result = if is_self_ref - .clone() - { - Rc::new(NodeResolveResult { - resolved: field_rt.clone(), - diagnostics: Rc::new( - vec![], - ), - }) - } else { - resolve_node_bounded( - &field_rt, - &env, - &module_name, - (depth.clone() + 1), - ) - }; - let rt_resolved = - rt_result.resolved.clone(); - let rt_diags = - rt_result.diagnostics.clone(); - Rc::new(NodeResolveResult { + resolved: field_child.clone(), + diagnostics: Rc::new(vec![]), +}) + } else { + { + let field_rt = resolved_type(field_child.clone()); +let is_self_ref = ((authored_name(env.clone(), field_rt.clone()).as_str() == authored_name(env.clone(), n.clone()).as_str()) && ((field_rt.children.clone().len() as i64) > 0)); +let rt_result = if is_self_ref.clone() { + Rc::new(NodeResolveResult { + resolved: field_rt.clone(), + diagnostics: Rc::new(vec![]), +}) + } else { + resolve_node_bounded(&field_rt, &env, &module_name, (depth.clone() + 1)) + }; +let rt_resolved = rt_result.resolved.clone(); +let rt_diags = rt_result.diagnostics.clone(); +Rc::new(NodeResolveResult { resolved: Rc::new(Node { name: field_child.name.clone(), span: field_child.span.clone(), @@ -576,2106 +409,1249 @@ pub fn resolve_node_bounded( }), diagnostics: rt_diags.clone(), }) - } - }, - ); - } - __result - }); - let resolved_fields = Rc::new({ - let mut __result = Vec::new(); - for fr in field_results.clone().iter().cloned() { - __result.push(fr.resolved.clone()); - } - __result - }); - let field_diags = Rc::new({ - let mut __result = Vec::new(); - for fr in field_results.clone().iter().cloned() { - __result.extend( - (*fr.diagnostics.clone()).iter().cloned(), - ); - } - __result - }); - Rc::new(NodeResolveResult { - resolved: Rc::new(Node { - name: variant_child.name.clone(), - span: variant_child.span.clone(), - ident_span: variant_child.ident_span.clone(), - children: resolved_fields.clone(), - connective: variant_child.connective.clone(), - params: variant_child.params.clone(), - inferred: variant_child.inferred.clone(), - return_cardinality: variant_child - .return_cardinality - .clone(), - uses: variant_child.uses.clone(), - body: variant_child.body.clone(), - transport: variant_child.transport.clone(), - properties: variant_child.properties.clone(), - type_annotation: variant_child - .type_annotation - .clone(), - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - diagnostics: field_diags.clone(), - }) - }); - } - __result - }); - let resolved_variants = Rc::new({ - let mut __result = Vec::new(); - for vr in variant_results.clone().iter().cloned() { - __result.push(vr.resolved.clone()); - } - __result - }); - let all_diags = Rc::new({ - let mut __result = Vec::new(); - for vr in variant_results.clone().iter().cloned() { - __result.extend((*vr.diagnostics.clone()).iter().cloned()); - } - __result - }); - Rc::new(NodeResolveResult { - resolved: Rc::new(Node { - name: n.name.clone(), - span: n.span.clone(), - ident_span: n.ident_span.clone(), - children: resolved_variants, - connective: n.connective.clone(), - params: n.params.clone(), - inferred: n.inferred.clone(), - return_cardinality: n.return_cardinality.clone(), - uses: n.uses.clone(), - body: n.body.clone(), - transport: n.transport.clone(), - properties: n.properties.clone(), - type_annotation: n.type_annotation.clone(), - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - diagnostics: all_diags, - }) +} + }); } __result }); +let resolved_fields = Rc::new({ let mut __result = Vec::new(); for fr in field_results.clone().iter().cloned() { __result.push(fr.resolved.clone()); } __result }); +let field_diags = Rc::new({ let mut __result = Vec::new(); for fr in field_results.clone().iter().cloned() { __result.extend((*fr.diagnostics.clone()).iter().cloned()); } __result }); +Rc::new(NodeResolveResult { + resolved: Rc::new(Node { + name: variant_child.name.clone(), + span: variant_child.span.clone(), + ident_span: variant_child.ident_span.clone(), + children: resolved_fields.clone(), + connective: variant_child.connective.clone(), + params: variant_child.params.clone(), + inferred: variant_child.inferred.clone(), + return_cardinality: variant_child.return_cardinality.clone(), + uses: variant_child.uses.clone(), + body: variant_child.body.clone(), + transport: variant_child.transport.clone(), + properties: variant_child.properties.clone(), + type_annotation: variant_child.type_annotation.clone(), + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), + diagnostics: field_diags.clone(), +}) +}); } __result }); +let resolved_variants = Rc::new({ let mut __result = Vec::new(); for vr in variant_results.clone().iter().cloned() { __result.push(vr.resolved.clone()); } __result }); +let all_diags = Rc::new({ let mut __result = Vec::new(); for vr in variant_results.clone().iter().cloned() { __result.extend((*vr.diagnostics.clone()).iter().cloned()); } __result }); +Rc::new(NodeResolveResult { + resolved: Rc::new(Node { + name: n.name.clone(), + span: n.span.clone(), + ident_span: n.ident_span.clone(), + children: resolved_variants, + connective: n.connective.clone(), + params: n.params.clone(), + inferred: n.inferred.clone(), + return_cardinality: n.return_cardinality.clone(), + uses: n.uses.clone(), + body: n.body.clone(), + transport: n.transport.clone(), + properties: n.properties.clone(), + type_annotation: n.type_annotation.clone(), + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), + diagnostics: all_diags, +}) +} } - } +} } - } - } - } else { - if (((n.children.clone().len() as i64) > 0) && is_user_generic_use_site(&n, &env)) { - { - let type_name = authored_name(env.clone(), n.clone()); - let decl = match lookup_type_for(&env, &n) { - Some(d) => d.clone(), - None => n.clone(), - }; - let expected_arity = (decl.params.clone().len() as i64); - let actual_arity = (n.children.clone().len() as i64); - let arity_diags = if (expected_arity.clone() != actual_arity.clone()) { - Rc::new(vec![make_error_node( - Rc::new(CompilerDiagnostic::ArityMismatch { - name: type_name.clone(), - expected: expected_arity.clone(), - got: actual_arity.clone(), - span: n.span.clone(), - }), - module_name.clone(), - )]) - } else { - Rc::new(vec![]) - }; - let arg_results = Rc::new({ - let mut __result = Vec::new(); - for child in n.children.clone().iter().cloned() { - __result.push(resolve_node_bounded( - &child, - &env, - &module_name, - (depth.clone() + 1), - )); - } - __result - }); - let resolved_args = Rc::new({ - let mut __result = Vec::new(); - for ar in arg_results.clone().iter().cloned() { - __result.push(ar.resolved.clone()); - } - __result - }); - let arg_diags = Rc::new({ - let mut __result = Vec::new(); - for ar in arg_results.clone().iter().cloned() { - __result.extend((*ar.diagnostics.clone()).iter().cloned()); - } - __result - }); - let slot_bindings = Rc::new( - decl.params - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, pair: (i64, Rc)| { +} + } else { + if (((n.children.clone().len() as i64) > 0) && is_user_generic_use_site(&n, &env)) { + { + let type_name = authored_name(env.clone(), n.clone()); +let decl = match lookup_type_for(&env, &n) { + Some(d) => d.clone(), + None => n.clone(), +}; +let expected_arity = (decl.params.clone().len() as i64); +let actual_arity = (n.children.clone().len() as i64); +let arity_diags = if (expected_arity.clone() != actual_arity.clone()) { + Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::ArityMismatch { + name: type_name.clone(), + expected: expected_arity.clone(), + got: actual_arity.clone(), + span: n.span.clone(), +}), module_name.clone())]) + } else { + Rc::new(vec![]) + }; +let arg_results = Rc::new({ let mut __result = Vec::new(); for child in n.children.clone().iter().cloned() { __result.push(resolve_node_bounded(&child, &env, &module_name, (depth.clone() + 1))); } __result }); +let resolved_args = Rc::new({ let mut __result = Vec::new(); for ar in arg_results.clone().iter().cloned() { __result.push(ar.resolved.clone()); } __result }); +let arg_diags = Rc::new({ let mut __result = Vec::new(); for ar in arg_results.clone().iter().cloned() { __result.extend((*ar.diagnostics.clone()).iter().cloned()); } __result }); +let slot_bindings = Rc::new(decl.params.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, pair: (i64, Rc)| { let idx = pair.0.clone(); - let slot_name = - authored_name_at(env.source_indices.clone(), &pair.1.clone()); - match Rc::new({ - let mut __result = Vec::new(); - for p in Rc::new({ - let mut __result = Vec::new(); - for p in Rc::new( - resolved_args - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - if (p.0.clone() == idx.clone()) { - __result.push(p); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(p.1.clone()); - } - __result - }) - .first() - .cloned() +let slot_name = authored_name_at(env.source_indices.clone(), &pair.1.clone()); +match Rc::new({ let mut __result = Vec::new(); for p in Rc::new({ let mut __result = Vec::new(); for p in Rc::new(resolved_args.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (p.0.clone() == idx.clone()) { __result.push(p); } } __result }).iter().cloned() { __result.push(p.1.clone()); } __result }).first().cloned() { + Some(arg) => v2_rt::rc_map_insert(acc.clone(), slot_name.clone(), arg.clone()), + None => acc.clone(), +} +}); +let is_parameterized_alias = (((decl.inferred.clone() != None) && ((decl.children.clone().len() as i64) == 0)) && (decl.connective.clone() == Connective::NoConnective)); +if is_parameterized_alias { { - Some(arg) => v2_rt::rc_map_insert( - acc.clone(), - slot_name.clone(), - arg.clone(), - ), - None => acc.clone(), - } - }, - ); - let is_parameterized_alias = (((decl.inferred.clone() != None) - && ((decl.children.clone().len() as i64) == 0)) - && (decl.connective.clone() == Connective::NoConnective)); - if is_parameterized_alias { - { - let alias_target = match decl.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: target, .. }) => { - substitute_type_slots( - &target, - &slot_bindings, - &type_name, - &env.source_indices.clone(), - ) - } - _ => n.clone(), - }; - let target_result = resolve_node_bounded( - &alias_target, - &env, - &module_name, - (depth.clone() + 1), - ); - let is_recursive = is_recursive_type_by_name(&env, type_name.clone()); - let resolved_node = Rc::new(Node { - name: type_name.clone(), - span: n.span.clone(), - ident_span: n.ident_span.clone(), - children: target_result.resolved.clone().children.clone(), - connective: target_result.resolved.clone().connective.clone(), - params: Rc::new(vec![]), - inferred: n.inferred.clone(), - return_cardinality: n.return_cardinality.clone(), - uses: n.uses.clone(), - body: n.body.clone(), - transport: n.transport.clone(), - properties: target_result.resolved.clone().properties.clone(), - type_annotation: n.type_annotation.clone(), - is_self_recursive: is_recursive, - has_non_tail_self_call: n.has_non_tail_self_call.clone(), - match_pattern: n.match_pattern.clone(), - expr_data: n.expr_data.clone(), - ident: None, - }); - Rc::new(NodeResolveResult { - resolved: resolved_node, - diagnostics: v2_rt::concat( - v2_rt::concat(arity_diags, arg_diags), - target_result.diagnostics.clone(), - ), - }) - } - } else { - { - let substituted_children = Rc::new({ - let mut __result = Vec::new(); - for child in decl.children.clone().iter().cloned() { - __result.push(substitute_type_slots( - &child, - &slot_bindings, - &type_name, - &env.source_indices.clone(), - )); - } - __result - }); - let is_recursive = is_recursive_type_by_name(&env, type_name.clone()); - let result = Rc::new(NodeResolveResult { - resolved: Rc::new(Node { - name: type_name.clone(), - span: n.span.clone(), - ident_span: n.ident_span.clone(), - children: substituted_children, - connective: decl.connective.clone(), - params: Rc::new(vec![]), - inferred: n.inferred.clone(), - return_cardinality: n.return_cardinality.clone(), - uses: n.uses.clone(), - body: n.body.clone(), - transport: n.transport.clone(), - properties: decl.properties.clone(), - type_annotation: n.type_annotation.clone(), - is_self_recursive: is_recursive, - has_non_tail_self_call: n.has_non_tail_self_call.clone(), - match_pattern: n.match_pattern.clone(), - expr_data: n.expr_data.clone(), - ident: None, - }), - diagnostics: v2_rt::concat(arity_diags, arg_diags), - }); - result - } - } - } - } else { - { - let is_map = node_is_keyed_collection(&n, env.source_indices.clone()); - if is_map { - { - let type_name = authored_name(env.clone(), n.clone()); - let key_child_node = match n.children.clone().first().cloned() { - Some(k) => k.clone(), - None => unit_type(), - }; - let val_child_node = match n.children.clone().get(1 as usize).cloned() { - Some(v) => v.clone(), - None => unit_type(), - }; - let key_type = child_type_node(&key_child_node); - let val_type = child_type_node(&val_child_node); - let key_result = resolve_node_bounded( - &key_type, - &env, - &module_name, - (depth.clone() + 1), - ); - let key_resolved = key_result.resolved.clone(); - let key_diags = key_result.diagnostics.clone(); - let val_result = resolve_node_bounded( - &val_type, - &env, - &module_name, - (depth.clone() + 1), - ); - let val_resolved = val_result.resolved.clone(); - let val_diags = val_result.diagnostics.clone(); - let key_param_name = if (key_child_node.inferred.clone() != None) { - authored_name(env.clone(), key_child_node.clone()) - } else { - match container_param_name(type_name.clone(), 0) { - Some(pn) => pn.clone(), - None => authored_name(env.clone(), key_child_node.clone()), - } - }; - let val_param_name = if (val_child_node.inferred.clone() != None) { - authored_name(env.clone(), val_child_node.clone()) - } else { - match container_param_name(type_name.clone(), 1) { - Some(pn) => pn.clone(), - None => authored_name(env.clone(), val_child_node.clone()), - } - }; - let resolved_key_child = Rc::new(Node { - name: key_param_name, - span: key_child_node.span.clone(), - ident_span: key_child_node.ident_span.clone(), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: key_resolved, - })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let resolved_val_child = Rc::new(Node { - name: val_param_name, - span: val_child_node.span.clone(), - ident_span: val_child_node.ident_span.clone(), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: val_resolved, - })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - Rc::new(NodeResolveResult { - resolved: Rc::new(Node { - name: type_name.clone(), - span: n.span.clone(), - ident_span: n.ident_span.clone(), - children: Rc::new(vec![resolved_key_child, resolved_val_child]), - connective: n.connective.clone(), - params: n.params.clone(), - inferred: n.inferred.clone(), - return_cardinality: n.return_cardinality.clone(), - uses: n.uses.clone(), - body: n.body.clone(), - transport: n.transport.clone(), - properties: n.properties.clone(), - type_annotation: n.type_annotation.clone(), - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - diagnostics: v2_rt::concat(key_diags, val_diags), - }) + let alias_target = match decl.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: target, .. }) => substitute_type_slots(&target, &slot_bindings, &type_name, &env.source_indices.clone()), + _ => n.clone(), +}; +let target_result = resolve_node_bounded(&alias_target, &env, &module_name, (depth.clone() + 1)); +let is_recursive = is_recursive_type_by_name(&env, type_name.clone()); +let resolved_node = Rc::new(Node { + name: type_name.clone(), + span: n.span.clone(), + ident_span: n.ident_span.clone(), + children: target_result.resolved.clone().children.clone(), + connective: target_result.resolved.clone().connective.clone(), + params: Rc::new(vec![]), + inferred: n.inferred.clone(), + return_cardinality: n.return_cardinality.clone(), + uses: n.uses.clone(), + body: n.body.clone(), + transport: n.transport.clone(), + properties: target_result.resolved.clone().properties.clone(), + type_annotation: n.type_annotation.clone(), + is_self_recursive: is_recursive, + has_non_tail_self_call: n.has_non_tail_self_call.clone(), + match_pattern: n.match_pattern.clone(), + expr_data: n.expr_data.clone(), + ident: None, +}); +Rc::new(NodeResolveResult { + resolved: resolved_node, + diagnostics: v2_rt::concat(v2_rt::concat(arity_diags, arg_diags), target_result.diagnostics.clone()), +}) +} + } else { + { + let substituted_children = Rc::new({ let mut __result = Vec::new(); for child in decl.children.clone().iter().cloned() { __result.push(substitute_type_slots(&child, &slot_bindings, &type_name, &env.source_indices.clone())); } __result }); +let is_recursive = is_recursive_type_by_name(&env, type_name.clone()); +let result = Rc::new(NodeResolveResult { + resolved: Rc::new(Node { + name: type_name.clone(), + span: n.span.clone(), + ident_span: n.ident_span.clone(), + children: substituted_children, + connective: decl.connective.clone(), + params: Rc::new(vec![]), + inferred: n.inferred.clone(), + return_cardinality: n.return_cardinality.clone(), + uses: n.uses.clone(), + body: n.body.clone(), + transport: n.transport.clone(), + properties: decl.properties.clone(), + type_annotation: n.type_annotation.clone(), + is_self_recursive: is_recursive, + has_non_tail_self_call: n.has_non_tail_self_call.clone(), + match_pattern: n.match_pattern.clone(), + expr_data: n.expr_data.clone(), + ident: None, +}), + diagnostics: v2_rt::concat(arity_diags, arg_diags), +}); +result +} } - } else { - if ((n.children.clone().len() as i64) == 1) { +} + } else { + { + let is_map = node_is_keyed_collection(&n, env.source_indices.clone()); +if is_map { { let type_name = authored_name(env.clone(), n.clone()); - match n.children.clone().first().cloned() { - Some(child_node) => { +let key_child_node = match n.children.clone().first().cloned() { + Some(k) => k.clone(), + None => unit_type(), +}; +let val_child_node = match n.children.clone().get(1 as usize).cloned() { + Some(v) => v.clone(), + None => unit_type(), +}; +let key_type = child_type_node(&key_child_node); +let val_type = child_type_node(&val_child_node); +let key_result = resolve_node_bounded(&key_type, &env, &module_name, (depth.clone() + 1)); +let key_resolved = key_result.resolved.clone(); +let key_diags = key_result.diagnostics.clone(); +let val_result = resolve_node_bounded(&val_type, &env, &module_name, (depth.clone() + 1)); +let val_resolved = val_result.resolved.clone(); +let val_diags = val_result.diagnostics.clone(); +let key_param_name = if (key_child_node.inferred.clone() != None) { + authored_name(env.clone(), key_child_node.clone()) + } else { + match container_param_name(type_name.clone(), 0) { + Some(pn) => pn.clone(), + None => authored_name(env.clone(), key_child_node.clone()), +} + }; +let val_param_name = if (val_child_node.inferred.clone() != None) { + authored_name(env.clone(), val_child_node.clone()) + } else { + match container_param_name(type_name.clone(), 1) { + Some(pn) => pn.clone(), + None => authored_name(env.clone(), val_child_node.clone()), +} + }; +let resolved_key_child = Rc::new(Node { + name: key_param_name, + span: key_child_node.span.clone(), + ident_span: key_child_node.ident_span.clone(), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: key_resolved, +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let resolved_val_child = Rc::new(Node { + name: val_param_name, + span: val_child_node.span.clone(), + ident_span: val_child_node.ident_span.clone(), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: val_resolved, +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +Rc::new(NodeResolveResult { + resolved: Rc::new(Node { + name: type_name.clone(), + span: n.span.clone(), + ident_span: n.ident_span.clone(), + children: Rc::new(vec![resolved_key_child, resolved_val_child]), + connective: n.connective.clone(), + params: n.params.clone(), + inferred: n.inferred.clone(), + return_cardinality: n.return_cardinality.clone(), + uses: n.uses.clone(), + body: n.body.clone(), + transport: n.transport.clone(), + properties: n.properties.clone(), + type_annotation: n.type_annotation.clone(), + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), + diagnostics: v2_rt::concat(key_diags, val_diags), +}) +} + } else { + if ((n.children.clone().len() as i64) == 1) { + { + let type_name = authored_name(env.clone(), n.clone()); +match n.children.clone().first().cloned() { + Some(child_node) => { let el_type = child_type_node(&child_node); - let el_result = resolve_node_bounded( - &el_type, - &env, - &module_name, - (depth.clone() + 1), - ); - let el_resolved = el_result.resolved.clone(); - let el_diags = el_result.diagnostics.clone(); - let el_param_name = if (child_node.inferred.clone() != None) - { +let el_result = resolve_node_bounded(&el_type, &env, &module_name, (depth.clone() + 1)); +let el_resolved = el_result.resolved.clone(); +let el_diags = el_result.diagnostics.clone(); +let el_param_name = if (child_node.inferred.clone() != None) { authored_name(env.clone(), child_node.clone()) } else { match container_param_name(type_name.clone(), 0) { - Some(pn) => pn.clone(), - None => { - authored_name(env.clone(), child_node.clone()) - } - } + Some(pn) => pn.clone(), + None => authored_name(env.clone(), child_node.clone()), +} }; - let resolved_child = Rc::new(Node { - name: el_param_name, - span: child_node.span.clone(), - ident_span: child_node.ident_span.clone(), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: el_resolved, - })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); +let resolved_child = Rc::new(Node { + name: el_param_name, + span: child_node.span.clone(), + ident_span: child_node.ident_span.clone(), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: el_resolved, +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +Rc::new(NodeResolveResult { + resolved: Rc::new(Node { + name: type_name.clone(), + span: n.span.clone(), + ident_span: n.ident_span.clone(), + children: Rc::new(vec![resolved_child]), + connective: n.connective.clone(), + params: n.params.clone(), + inferred: n.inferred.clone(), + return_cardinality: n.return_cardinality.clone(), + uses: n.uses.clone(), + body: n.body.clone(), + transport: n.transport.clone(), + properties: n.properties.clone(), + type_annotation: n.type_annotation.clone(), + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), + diagnostics: el_diags, +}) +}, + None => Rc::new(NodeResolveResult { + resolved: n.clone(), + diagnostics: Rc::new(vec![]), +}), +} +} + } else { + if ((n.children.clone().len() as i64) == 0) { + if is_recursive_type_for(&env, &n) { Rc::new(NodeResolveResult { - resolved: Rc::new(Node { - name: type_name.clone(), - span: n.span.clone(), - ident_span: n.ident_span.clone(), - children: Rc::new(vec![resolved_child]), - connective: n.connective.clone(), - params: n.params.clone(), - inferred: n.inferred.clone(), - return_cardinality: n.return_cardinality.clone(), - uses: n.uses.clone(), - body: n.body.clone(), - transport: n.transport.clone(), - properties: n.properties.clone(), - type_annotation: n.type_annotation.clone(), - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - diagnostics: el_diags, - }) - } - None => Rc::new(NodeResolveResult { - resolved: n.clone(), - diagnostics: Rc::new(vec![]), - }), - } - } - } else { - if ((n.children.clone().len() as i64) == 0) { - if is_recursive_type_for(&env, &n) { - Rc::new(NodeResolveResult { - resolved: n.clone(), - diagnostics: Rc::new(vec![]), - }) - } else { - match lookup_type_for(&env, &n) { - Some(resolved) => { - let structurally_resolved = if (((resolved - .connective - .clone() - == Connective::NoConnective) - && ((resolved.children.clone().len() as i64) == 0)) - && (resolved.inferred.clone() != None)) - { - match resolved.inferred.clone().as_deref().cloned() - { - Some(InferredNode::Resolved { - node: target, - .. - }) => target.clone(), - _ => resolved.clone(), - } + resolved: n.clone(), + diagnostics: Rc::new(vec![]), +}) + } else { + match lookup_type_for(&env, &n) { + Some(resolved) => { + let structurally_resolved = if (((resolved.connective.clone() == Connective::NoConnective) && ((resolved.children.clone().len() as i64) == 0)) && (resolved.inferred.clone() != None)) { + match resolved.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: target, .. }) => target.clone(), + _ => resolved.clone(), +} } else { resolved.clone() }; - let is_optional = (n.return_cardinality.clone() - == Cardinality::CardOptional); - let final_resolved = if is_optional { +let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); +let final_resolved = if is_optional { with_optional_cardinality(&structurally_resolved) } else { structurally_resolved }; - Rc::new(NodeResolveResult { - resolved: final_resolved, - diagnostics: Rc::new(vec![]), - }) - } - None => { +Rc::new(NodeResolveResult { + resolved: final_resolved, + diagnostics: Rc::new(vec![]), +}) +}, + None => { let n_is_error = if (n.inferred.clone() != None) { - is_compiler_error( - n.inferred.clone().clone().unwrap(), - ) + is_compiler_error(n.inferred.clone().clone().unwrap()) } else { false }; - let n_is_callable = - ((n.params.clone().len() as i64) > 0); - let n_is_type_var = if (n.inferred.clone() != None) { - is_type_variable( - n.inferred.clone().clone().unwrap(), - ) +let n_is_callable = ((n.params.clone().len() as i64) > 0); +let n_is_type_var = if (n.inferred.clone() != None) { + is_type_variable(n.inferred.clone().clone().unwrap()) } else { false }; - if (((is_kernel_type(authored_name( - env.clone(), - n.clone(), - )) || n_is_type_var) - || n_is_error) - || n_is_callable) - { +if (((is_kernel_type(authored_name(env.clone(), n.clone())) || n_is_type_var) || n_is_error) || n_is_callable) { Rc::new(NodeResolveResult { - resolved: n.clone(), - diagnostics: Rc::new(vec![]), - }) + resolved: n.clone(), + diagnostics: Rc::new(vec![]), +}) } else { Rc::new(NodeResolveResult { - resolved: n.clone(), - diagnostics: Rc::new(vec![make_error_node( - Rc::new( - CompilerDiagnostic::UnresolvedType { - name: authored_name( - env.clone(), - n.clone(), - ), - span: n.span.clone(), - }, - ), - module_name.clone(), - )]), - }) + resolved: n.clone(), + diagnostics: Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::UnresolvedType { + name: authored_name(env.clone(), n.clone()), + span: n.span.clone(), +}), module_name.clone())]), +}) } - } +}, +} } + } else { + Rc::new(NodeResolveResult { + resolved: n.clone(), + diagnostics: Rc::new(vec![]), +}) } - } else { - Rc::new(NodeResolveResult { - resolved: n.clone(), - diagnostics: Rc::new(vec![]), - }) } } - } +} } } - } +} }) } -pub fn resolve_optional_node( - n: &Option>, - env: Rc, - module_name: String, -) -> Rc { +pub fn resolve_optional_node(n: &Option>, env: Rc, module_name: String) -> Rc { if (n.clone() == None) { Rc::new(NodeResolveResult { - resolved: unit_type(), - diagnostics: Rc::new(vec![]), - }) + resolved: unit_type(), + diagnostics: Rc::new(vec![]), +}) } else { match (*n.clone().unwrap()).clone() { - InferredNode::Resolved { node: inner, .. } => { - resolve_node(inner.clone(), env, module_name) - } - InferredNode::CompilerError { - message: msg, - span: sp, - .. - } => Rc::new(NodeResolveResult { - resolved: make_expr_error_node(ExprErrorKind::SemanticExprError, &msg, &sp), - diagnostics: Rc::new(vec![make_error_node( - Rc::new(CompilerDiagnostic::InternalError { - message: msg.clone(), - span: sp.clone(), - }), - module_name, - )]), - }), - InferredNode::TypeVariable { .. } => Rc::new(NodeResolveResult { - resolved: unit_type(), - diagnostics: Rc::new(vec![]), - }), - } + InferredNode::Resolved { node: inner, .. } => resolve_node(inner.clone(), env, module_name), + InferredNode::CompilerError { message: msg, span: sp, .. } => Rc::new(NodeResolveResult { + resolved: make_expr_error_node(ExprErrorKind::SemanticExprError, &msg, &sp), + diagnostics: Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::InternalError { + message: msg.clone(), + span: sp.clone(), +}), module_name)]), +}), + InferredNode::TypeVariable { .. } => Rc::new(NodeResolveResult { + resolved: unit_type(), + diagnostics: Rc::new(vec![]), +}), +} } } pub fn resolve_field(field: &Rc, env: &Rc, module_name: &String) -> Rc { { - let type_result = resolve_node( - field_node_type_expr(&field), - env.clone(), - module_name.clone(), - ); - let type_resolved = type_result.resolved.clone(); - let type_diags = type_result.diagnostics.clone(); - let default_resolved = match field_node_default_value(&field) { - Some(default_value) => Some(resolve_expr_types( - &default_value, - &env, - module_name.clone(), - )), - None => None, - }; - let default_diags = match default_resolved.clone() { - Some(result) => result.diagnostics.clone(), - None => Rc::new(vec![]), - }; - Rc::new(FieldResult { - field: make_field_node( - &field_node_name_at(field.clone(), env.source_indices.clone()), - type_resolved, - field_node_cardinality(field.clone()), - match default_resolved.clone() { - Some(result) => Some(result.expr.clone()), - None => None, - }, - field_node_from_key(field.clone(), env.source_indices.clone()), - field.span.clone(), - node_name_span(&field), - ), - diagnostics: v2_rt::concat(type_diags, default_diags), - }) - } + let type_result = resolve_node(field_node_type_expr(&field), env.clone(), module_name.clone()); +let type_resolved = type_result.resolved.clone(); +let type_diags = type_result.diagnostics.clone(); +let default_resolved = match field_node_default_value(&field) { + Some(default_value) => Some(resolve_expr_types(&default_value, &env, module_name.clone())), + None => None, +}; +let default_diags = match default_resolved.clone() { + Some(result) => result.diagnostics.clone(), + None => Rc::new(vec![]), +}; +Rc::new(FieldResult { + field: make_field_node(&field_node_name_at(field.clone(), env.source_indices.clone()), type_resolved, field_node_cardinality(field.clone()), match default_resolved.clone() { + Some(result) => Some(result.expr.clone()), + None => None, +}, field_node_from_key(field.clone(), env.source_indices.clone()), field.span.clone(), node_name_span(&field)), + diagnostics: v2_rt::concat(type_diags, default_diags), +}) +} } pub fn resolve_param(param: &Rc, env: &Rc, module_name: &String) -> Rc { { - let type_result = resolve_node( - param_node_type_expr(¶m), - env.clone(), - module_name.clone(), - ); - let type_resolved = type_result.resolved.clone(); - let type_diags = type_result.diagnostics.clone(); - let default_resolved = match param_node_default_value(¶m) { - Some(default_value) => Some(resolve_expr_types( - &default_value, - &env, - module_name.clone(), - )), - None => None, - }; - let default_diags = match default_resolved.clone() { - Some(result) => result.diagnostics.clone(), - None => Rc::new(vec![]), - }; - Rc::new(ParamResult { - param: make_param_node( - ¶m_node_name_at(param.clone(), env.source_indices.clone()), - type_resolved, - match default_resolved.clone() { - Some(result) => Some(result.expr.clone()), - None => None, - }, - param.span.clone(), - node_name_span(¶m), - ), - diagnostics: v2_rt::concat(type_diags, default_diags), - }) - } + let type_result = resolve_node(param_node_type_expr(¶m), env.clone(), module_name.clone()); +let type_resolved = type_result.resolved.clone(); +let type_diags = type_result.diagnostics.clone(); +let default_resolved = match param_node_default_value(¶m) { + Some(default_value) => Some(resolve_expr_types(&default_value, &env, module_name.clone())), + None => None, +}; +let default_diags = match default_resolved.clone() { + Some(result) => result.diagnostics.clone(), + None => Rc::new(vec![]), +}; +Rc::new(ParamResult { + param: make_param_node(¶m_node_name_at(param.clone(), env.source_indices.clone()), type_resolved, match default_resolved.clone() { + Some(result) => Some(result.expr.clone()), + None => None, +}, param.span.clone(), node_name_span(¶m)), + diagnostics: v2_rt::concat(type_diags, default_diags), +}) +} } -pub fn resolve_resource_use( - ru: &Rc, - env: &Rc, - module_name: String, -) -> Rc { +pub fn resolve_resource_use(ru: &Rc, env: &Rc, module_name: String) -> Rc { { let type_result = resolve_node(resource_use_resource(&ru), env.clone(), module_name); - let type_resolved = type_result.resolved.clone(); - let type_diags = type_result.diagnostics.clone(); - Rc::new(ResourceUseResult { - resource_use: make_resource_use_node( - &resource_use_name_at(ru.clone(), env.source_indices.clone()), - type_resolved, - ru.span.clone(), - node_name_span(&ru), - ), - diagnostics: type_diags, - }) - } +let type_resolved = type_result.resolved.clone(); +let type_diags = type_result.diagnostics.clone(); +Rc::new(ResourceUseResult { + resource_use: make_resource_use_node(&resource_use_name_at(ru.clone(), env.source_indices.clone()), type_resolved, ru.span.clone(), node_name_span(&ru)), + diagnostics: type_diags, +}) +} } -pub fn resolve_named_arg( - arg: &Rc, - env: &Rc, - module_name: String, -) -> Rc { +pub fn resolve_named_arg(arg: &Rc, env: &Rc, module_name: String) -> Rc { { let value_result = resolve_expr_types(&arg_value(&arg), &env, module_name); - let value_expr = value_result.expr.clone(); - let value_diags = value_result.diagnostics.clone(); - Rc::new(NamedArgResolveResult { - arg: make_arg_node( - arg_name_at(arg.clone(), env.source_indices.clone()), - value_expr, - arg.span.clone(), - node_name_span(&arg), - ), - diagnostics: value_diags, - }) - } +let value_expr = value_result.expr.clone(); +let value_diags = value_result.diagnostics.clone(); +Rc::new(NamedArgResolveResult { + arg: make_arg_node(arg_name_at(arg.clone(), env.source_indices.clone()), value_expr, arg.span.clone(), node_name_span(&arg)), + diagnostics: value_diags, +}) +} } -pub fn resolve_field_init( - field_init: &Rc, - env: &Rc, - module_name: String, -) -> Rc { +pub fn resolve_field_init(field_init: &Rc, env: &Rc, module_name: String) -> Rc { { - let value_result = - resolve_expr_types(&field_init_node_value(&field_init), &env, module_name); - let value_expr = value_result.expr.clone(); - let value_diags = value_result.diagnostics.clone(); - Rc::new(FieldInitResolveResult { - field_init: make_field_init_node( - &field_init_node_name_at(field_init.clone(), env.source_indices.clone()), - value_expr, - field_init.span.clone(), - node_name_span(&field_init), - ), - diagnostics: value_diags, - }) - } + let value_result = resolve_expr_types(&field_init_node_value(&field_init), &env, module_name); +let value_expr = value_result.expr.clone(); +let value_diags = value_result.diagnostics.clone(); +Rc::new(FieldInitResolveResult { + field_init: make_field_init_node(&field_init_node_name_at(field_init.clone(), env.source_indices.clone()), value_expr, field_init.span.clone(), node_name_span(&field_init)), + diagnostics: value_diags, +}) +} } -pub fn resolve_match_arm( - arm: &Rc, - env: &Rc, - module_name: &String, -) -> Rc { +pub fn resolve_match_arm(arm: &Rc, env: &Rc, module_name: &String) -> Rc { { let arm_g = arm_guard(&arm); - let guard_result = match arm_g { - Some(guard) => Some(resolve_expr_types(&guard, &env, module_name.clone())), - None => None, - }; - let guard_diags = match guard_result.clone() { - Some(result) => result.diagnostics.clone(), - None => Rc::new(vec![]), - }; - let body_result = resolve_expr_types(&arm_body(&arm), &env, module_name.clone()); - let body_expr = body_result.expr.clone(); - let body_diags = body_result.diagnostics.clone(); - Rc::new(MatchArmResolveResult { - arm: make_arm_node( - arm_pattern(arm.clone()), - match guard_result.clone() { - Some(result) => Some(result.expr.clone()), - None => None, - }, - body_expr, - arm.span.clone(), - ), - diagnostics: v2_rt::concat(guard_diags, body_diags), - }) - } +let guard_result = match arm_g { + Some(guard) => Some(resolve_expr_types(&guard, &env, module_name.clone())), + None => None, +}; +let guard_diags = match guard_result.clone() { + Some(result) => result.diagnostics.clone(), + None => Rc::new(vec![]), +}; +let body_result = resolve_expr_types(&arm_body(&arm), &env, module_name.clone()); +let body_expr = body_result.expr.clone(); +let body_diags = body_result.diagnostics.clone(); +Rc::new(MatchArmResolveResult { + arm: make_arm_node(arm_pattern(arm.clone()), match guard_result.clone() { + Some(result) => Some(result.expr.clone()), + None => None, +}, body_expr, arm.span.clone()), + diagnostics: v2_rt::concat(guard_diags, body_diags), +}) +} } -pub fn resolve_string_part( - part: Rc, - env: Rc, - module_name: String, -) -> Rc { +pub fn resolve_string_part(part: Rc, env: Rc, module_name: String) -> Rc { match (*part).clone() { - StringPart::Text { value, .. } => Rc::new(StringPartResolveResult { - part: Rc::new(StringPart::Text { - value: value.clone(), - }), - diagnostics: Rc::new(vec![]), - }), - StringPart::Interpolation { expr, .. } => { - let expr_result = resolve_expr_types(&expr, &env, module_name); - let resolved_expr = expr_result.expr.clone(); - let expr_diags = expr_result.diagnostics.clone(); - Rc::new(StringPartResolveResult { - part: Rc::new(StringPart::Interpolation { - expr: resolved_expr, - }), - diagnostics: expr_diags, - }) - } - } + StringPart::Text { value, .. } => Rc::new(StringPartResolveResult { + part: Rc::new(StringPart::Text { + value: value.clone(), +}), + diagnostics: Rc::new(vec![]), +}), + StringPart::Interpolation { expr, .. } => { + let expr_result = resolve_expr_types(&expr, &env, module_name); +let resolved_expr = expr_result.expr.clone(); +let expr_diags = expr_result.diagnostics.clone(); +Rc::new(StringPartResolveResult { + part: Rc::new(StringPart::Interpolation { + expr: resolved_expr, +}), + diagnostics: expr_diags, +}) +}, +} } -pub fn resolve_transport_binding( - transport: &Rc, - env: &Rc, - module_name: &String, -) -> Rc { +pub fn resolve_transport_binding(transport: &Rc, env: &Rc, module_name: &String) -> Rc { if is_local_transport(&transport, &env.source_indices.clone()) { Rc::new(TransportResolveResult { - transport: transport.clone(), - diagnostics: Rc::new(vec![]), - }) + transport: transport.clone(), + diagnostics: Rc::new(vec![]), +}) } else { { - let prop_results = Rc::new({ - let mut __result = Vec::new(); - for p in transport.properties.clone().iter().cloned() { - __result.push({ - let val_result = resolve_expr_types( - &field_init_node_value(&p), - &env, - module_name.clone(), - ); - Rc::new(FieldInitResolveResult { - field_init: make_field_init_node( - &field_init_node_name_at(p.clone(), env.source_indices.clone()), - val_result.expr.clone(), - p.span.clone(), - node_name_span(&p), - ), - diagnostics: val_result.diagnostics.clone(), - }) - }); - } - __result - }); - let resolved_props = Rc::new({ - let mut __result = Vec::new(); - for pr in prop_results.clone().iter().cloned() { - __result.push(pr.field_init.clone()); - } - __result - }); - let prop_diags = Rc::new({ - let mut __result = Vec::new(); - for pr in prop_results.clone().iter().cloned() { - __result.extend((*pr.diagnostics.clone()).iter().cloned()); - } - __result - }); - let child_results = Rc::new({ - let mut __result = Vec::new(); - for c in transport.children.clone().iter().cloned() { - __result.push(resolve_expr_types(&c, &env, module_name.clone())); - } - __result - }); - let resolved_children = Rc::new({ - let mut __result = Vec::new(); - for cr in child_results.clone().iter().cloned() { - __result.push(cr.expr.clone()); - } - __result - }); - let child_diags = Rc::new({ - let mut __result = Vec::new(); - for cr in child_results.clone().iter().cloned() { - __result.extend((*cr.diagnostics.clone()).iter().cloned()); - } - __result - }); - let body_diags = - match transport_request_body(transport.clone(), env.source_indices.clone()) { - Some(b) => match (*b.expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => Rc::new(vec![]), - _ => Rc::new( - vec![make_error_node(Rc::new(CompilerDiagnostic::InternalError { + let prop_results = Rc::new({ let mut __result = Vec::new(); for p in transport.properties.clone().iter().cloned() { __result.push({ + let val_result = resolve_expr_types(&field_init_node_value(&p), &env, module_name.clone()); +Rc::new(FieldInitResolveResult { + field_init: make_field_init_node(&field_init_node_name_at(p.clone(), env.source_indices.clone()), val_result.expr.clone(), p.span.clone(), node_name_span(&p)), + diagnostics: val_result.diagnostics.clone(), +}) +}); } __result }); +let resolved_props = Rc::new({ let mut __result = Vec::new(); for pr in prop_results.clone().iter().cloned() { __result.push(pr.field_init.clone()); } __result }); +let prop_diags = Rc::new({ let mut __result = Vec::new(); for pr in prop_results.clone().iter().cloned() { __result.extend((*pr.diagnostics.clone()).iter().cloned()); } __result }); +let child_results = Rc::new({ let mut __result = Vec::new(); for c in transport.children.clone().iter().cloned() { __result.push(resolve_expr_types(&c, &env, module_name.clone())); } __result }); +let resolved_children = Rc::new({ let mut __result = Vec::new(); for cr in child_results.clone().iter().cloned() { __result.push(cr.expr.clone()); } __result }); +let child_diags = Rc::new({ let mut __result = Vec::new(); for cr in child_results.clone().iter().cloned() { __result.extend((*cr.diagnostics.clone()).iter().cloned()); } __result }); +let body_diags = match transport_request_body(transport.clone(), env.source_indices.clone()) { + Some(b) => match (*b.expr_data.clone()).clone() { + ExprData::ExprRecordLit { .. } => Rc::new(vec![]), + _ => Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::InternalError { message: "transport body must be a record expression { field: value, ... }".to_string(), span: b.span.clone(), -}), module_name.clone())], - ), - }, - None => Rc::new(vec![]), - }; - Rc::new(TransportResolveResult { - transport: make_transport_node( - resolved_props, - resolved_children, - transport.body.clone(), - transport.span.clone(), - ), - diagnostics: v2_rt::concat(v2_rt::concat(prop_diags, child_diags), body_diags), - }) - } +}), module_name.clone())]), +}, + None => Rc::new(vec![]), +}; +Rc::new(TransportResolveResult { + transport: make_transport_node(resolved_props, resolved_children, transport.body.clone(), transport.span.clone()), + diagnostics: v2_rt::concat(v2_rt::concat(prop_diags, child_diags), body_diags), +}) +} } } -pub fn resolve_expr_types( - texpr: &Rc, - env: &Rc, - module_name: String, -) -> Rc { +pub fn resolve_expr_types(texpr: &Rc, env: &Rc, module_name: String) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprLiteral { .. } => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), - }), - ExprData::ExprError { kind, message, .. } => Rc::new(ExprResolveResult { - expr: make_expr_error_node(kind.clone(), &message, &texpr.span.clone()), - diagnostics: Rc::new(vec![make_error_node( - Rc::new(CompilerDiagnostic::InternalError { - message: message.clone(), - span: texpr.span.clone(), - }), - module_name.clone(), - )]), - }), - ExprData::ExprVar { .. } => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), - }), - ExprData::ExprFieldAccess { .. } => { - let r = match texpr.children.clone().first().cloned() { - Some(base) => resolve_expr_types(&base, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - Rc::new(ExprResolveResult { - expr: map_children(&texpr, |child| r.expr.clone()), - diagnostics: r.diagnostics.clone(), - }) - } - ExprData::ExprCall { - call_semantics: cs, - descent_evidence: de, - .. - } => { - let resolved_children = Rc::new({ - let mut __result = Vec::new(); - for arg_node in texpr.children.clone().iter().cloned() { - __result.push({ - let val = match arg_node.children.clone().first().cloned() { - Some(v) => v.clone(), - None => arg_node.clone(), - }; - let vr = resolve_expr_types(&val, &env, module_name.clone()); - make_arg_node( - if (arg_node.ident_span.clone() == None) { - None - } else { - Some(authored_name(env.clone(), arg_node.clone())) - }, - vr.expr.clone(), - arg_node.span.clone(), - node_name_span(&arg_node), - ) - }); - } - __result - }); - let all_diags = Rc::new({ - let mut __result = Vec::new(); - for arg_node in texpr.children.clone().iter().cloned() { - __result.extend( - (*{ - let val = match arg_node.children.clone().first().cloned() { - Some(v) => v.clone(), - None => arg_node.clone(), - }; - let vr = resolve_expr_types(&val, &env, module_name.clone()); - vr.diagnostics.clone() - }) - .iter() - .cloned(), - ); - } - __result - }); - Rc::new(ExprResolveResult { - expr: make_named_expr_node( - &expr_call_func_at(texpr.clone(), env.source_indices.clone()), - Rc::new(ExprData::ExprCall { - call_semantics: cs.clone(), - descent_evidence: de.clone(), - }), - resolved_children, - texpr.inferred.clone(), - texpr.span.clone(), - node_name_span(&texpr), - ), - diagnostics: all_diags, - }) - } - ExprData::ExprMethodCall { - method_semantics: ms, - .. - } => { - let resolved_children = Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - texpr - .children - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() + ExprData::ExprLiteral { .. } => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), +}), + ExprData::ExprError { kind, message, .. } => Rc::new(ExprResolveResult { + expr: make_expr_error_node(kind.clone(), &message, &texpr.span.clone()), + diagnostics: Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::InternalError { + message: message.clone(), + span: texpr.span.clone(), +}), module_name.clone())]), +}), + ExprData::ExprVar { .. } => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), +}), + ExprData::ExprFieldAccess { .. } => { + let r = match texpr.children.clone().first().cloned() { + Some(base) => resolve_expr_types(&base, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +Rc::new(ExprResolveResult { + expr: map_children(&texpr, |child| r.expr.clone()), + diagnostics: r.diagnostics.clone(), +}) +}, + ExprData::ExprCall { call_semantics: cs, descent_evidence: de, .. } => { + let resolved_children = Rc::new({ let mut __result = Vec::new(); for arg_node in texpr.children.clone().iter().cloned() { __result.push({ + let val = match arg_node.children.clone().first().cloned() { + Some(v) => v.clone(), + None => arg_node.clone(), +}; +let vr = resolve_expr_types(&val, &env, module_name.clone()); +make_arg_node(if (arg_node.ident_span.clone() == None) { + None + } else { + Some(authored_name(env.clone(), arg_node.clone())) + }, vr.expr.clone(), arg_node.span.clone(), node_name_span(&arg_node)) +}); } __result }); +let all_diags = Rc::new({ let mut __result = Vec::new(); for arg_node in texpr.children.clone().iter().cloned() { __result.extend((*{ + let val = match arg_node.children.clone().first().cloned() { + Some(v) => v.clone(), + None => arg_node.clone(), +}; +let vr = resolve_expr_types(&val, &env, module_name.clone()); +vr.diagnostics.clone() +}).iter().cloned()); } __result }); +Rc::new(ExprResolveResult { + expr: make_named_expr_node(&expr_call_func_at(texpr.clone(), env.source_indices.clone()), Rc::new(ExprData::ExprCall { + call_semantics: cs.clone(), + descent_evidence: de.clone(), +}), resolved_children, texpr.inferred.clone(), texpr.span.clone(), node_name_span(&texpr)), + diagnostics: all_diags, +}) +}, + ExprData::ExprMethodCall { method_semantics: ms, .. } => { + let resolved_children = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(texpr.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ + let idx = pair.0.clone(); +let child = pair.1.clone(); +if (idx.clone() == 0) { { - __result.push({ - let idx = pair.0.clone(); - let child = pair.1.clone(); - if (idx.clone() == 0) { - { - let rr = resolve_expr_types(&child, &env, module_name.clone()); - rr.expr.clone() - } - } else { - { - let val = match child.children.clone().first().cloned() { - Some(v) => v.clone(), - None => child.clone(), - }; - let vr = resolve_expr_types(&val, &env, module_name.clone()); - make_arg_node( - if (child.ident_span.clone() == None) { - None - } else { - Some(authored_name_at( - env.source_indices.clone(), - &child, - )) - }, - vr.expr.clone(), - child.span.clone(), - node_name_span(&child), - ) - } - } - }); - } - __result - }); - let all_diags = Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - texpr - .children - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() + let rr = resolve_expr_types(&child, &env, module_name.clone()); +rr.expr.clone() +} + } else { { - __result.extend( - (*{ - let idx = pair.0.clone(); - let child = pair.1.clone(); - if (idx.clone() == 0) { - { - let rr = - resolve_expr_types(&child, &env, module_name.clone()); - rr.diagnostics.clone() - } - } else { - { - let val = match child.children.clone().first().cloned() { - Some(v) => v.clone(), - None => child.clone(), - }; - let vr = - resolve_expr_types(&val, &env, module_name.clone()); - vr.diagnostics.clone() - } - } - }) - .iter() - .cloned(), - ); - } - __result - }); - Rc::new(ExprResolveResult { - expr: make_named_expr_node( - &expr_method_name_at(texpr.clone(), env.source_indices.clone()), - Rc::new(ExprData::ExprMethodCall { - method_semantics: ms.clone(), - }), - resolved_children, - texpr.inferred.clone(), - texpr.span.clone(), - node_name_span(&texpr), - ), - diagnostics: all_diags, - }) - } - ExprData::ExprMatch => { - let resolved_children = Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - texpr - .children - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() + let val = match child.children.clone().first().cloned() { + Some(v) => v.clone(), + None => child.clone(), +}; +let vr = resolve_expr_types(&val, &env, module_name.clone()); +make_arg_node(if (child.ident_span.clone() == None) { + None + } else { + Some(authored_name_at(env.source_indices.clone(), &child)) + }, vr.expr.clone(), child.span.clone(), node_name_span(&child)) +} + } +}); } __result }); +let all_diags = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(texpr.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.extend((*{ + let idx = pair.0.clone(); +let child = pair.1.clone(); +if (idx.clone() == 0) { { - __result.push({ - let idx = pair.0.clone(); - let child = pair.1.clone(); - if (idx.clone() == 0) { - { - let sr = resolve_expr_types(&child, &env, module_name.clone()); - sr.expr.clone() - } - } else { - { - let arm_ch = child.children.clone(); - let has_guard = ((arm_ch.clone().len() as i64) == 2); - if has_guard.clone() { - { - let guard_r = match arm_ch.clone().first().cloned() { - Some(g) => resolve_expr_types( - &g, - &env, - module_name.clone(), - ), - None => Rc::new(ExprResolveResult { - expr: child.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - let body_r = - match arm_ch.clone().get(1 as usize).cloned() { - Some(b) => resolve_expr_types( - &b, - &env, - module_name.clone(), - ), - None => Rc::new(ExprResolveResult { - expr: child.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - make_arm_node( - match child.match_pattern.clone() { - Some(p) => p.clone(), - None => Rc::new(MatchPattern::Wildcard), - }, - Some(guard_r.expr.clone()), - body_r.expr.clone(), - child.span.clone(), - ) - } - } else { - { - let body_r = match arm_ch.clone().first().cloned() { - Some(b) => resolve_expr_types( - &b, - &env, - module_name.clone(), - ), - None => Rc::new(ExprResolveResult { - expr: child.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - make_arm_node( - match child.match_pattern.clone() { - Some(p) => p.clone(), - None => Rc::new(MatchPattern::Wildcard), - }, - None, - body_r.expr.clone(), - child.span.clone(), - ) - } - } - } - } - }); - } - __result - }); - let all_diags = Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - texpr - .children - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() + let rr = resolve_expr_types(&child, &env, module_name.clone()); +rr.diagnostics.clone() +} + } else { { - __result.extend( - (*{ - let idx = pair.0.clone(); - let child = pair.1.clone(); - if (idx.clone() == 0) { - { - let sr = - resolve_expr_types(&child, &env, module_name.clone()); - sr.diagnostics.clone() - } - } else { - { - let arm_ch = child.children.clone(); - let has_guard = ((arm_ch.clone().len() as i64) == 2); - if has_guard.clone() { - { - let guard_r = match arm_ch.clone().first().cloned() - { - Some(g) => resolve_expr_types( - &g, - &env, - module_name.clone(), - ), - None => Rc::new(ExprResolveResult { - expr: child.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - let body_r = - match arm_ch.clone().get(1 as usize).cloned() { - Some(b) => resolve_expr_types( - &b, - &env, - module_name.clone(), - ), - None => Rc::new(ExprResolveResult { - expr: child.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - v2_rt::concat( - guard_r.diagnostics.clone(), - body_r.diagnostics.clone(), - ) - } - } else { - { - let body_r = match arm_ch.clone().first().cloned() { - Some(b) => resolve_expr_types( - &b, - &env, - module_name.clone(), - ), - None => Rc::new(ExprResolveResult { - expr: child.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - body_r.diagnostics.clone() - } - } - } - } - }) - .iter() - .cloned(), - ); - } - __result - }); - Rc::new(ExprResolveResult { - expr: make_expr_node( - Rc::new(ExprData::ExprMatch), - resolved_children, - texpr.inferred.clone(), - texpr.span.clone(), - ), - diagnostics: all_diags, - }) - } - ExprData::ExprIf => { - let ch = texpr.children.clone(); - let cr = match ch.clone().first().cloned() { - Some(c) => resolve_expr_types(&c, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - let tr = match ch.clone().get(1 as usize).cloned() { - Some(t) => resolve_expr_types(&t, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - let er = match ch.clone().get(2 as usize).cloned() { - Some(e) => Some(resolve_expr_types(&e, &env, module_name.clone())), - None => None, - }; - let resolved_children = match er.clone() { - Some(r) => Rc::new(vec![cr.expr.clone(), tr.expr.clone(), r.expr.clone()]), - None => Rc::new(vec![cr.expr.clone(), tr.expr.clone()]), - }; - Rc::new(ExprResolveResult { - expr: make_expr_node( - Rc::new(ExprData::ExprIf), - resolved_children, - texpr.inferred.clone(), - texpr.span.clone(), - ), - diagnostics: v2_rt::concat( - v2_rt::concat(cr.diagnostics.clone(), tr.diagnostics.clone()), - match er.clone() { - Some(r) => r.diagnostics.clone(), - None => Rc::new(vec![]), - }, - ), - }) - } - ExprData::ExprLet => { - let ch = texpr.children.clone(); - let vr = match ch.clone().first().cloned() { - Some(v) => resolve_expr_types(&v, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - let br = match ch.clone().get(1 as usize).cloned() { - Some(bd) => Some(resolve_expr_types(&bd, &env, module_name.clone())), - None => None, - }; - let resolved_children = match br.clone() { - Some(r) => Rc::new(vec![vr.expr.clone(), r.expr.clone()]), - None => Rc::new(vec![vr.expr.clone()]), - }; - Rc::new(ExprResolveResult { - expr: make_named_expr_node( - &let_binding_name_at(texpr.clone(), env.source_indices.clone()), - Rc::new(ExprData::ExprLet), - resolved_children, - texpr.inferred.clone(), - texpr.span.clone(), - node_name_span(&texpr), - ), - diagnostics: v2_rt::concat( - vr.diagnostics.clone(), - match br.clone() { - Some(r) => r.diagnostics.clone(), - None => Rc::new(vec![]), - }, - ), - }) - } - ExprData::ExprRecordLit { - parent_enum: pe, .. - } => { - let resolved_children = Rc::new({ - let mut __result = Vec::new(); - for fi_node in texpr.children.clone().iter().cloned() { - __result.push({ - let val = match fi_node.children.clone().first().cloned() { - Some(v) => v.clone(), - None => fi_node.clone(), - }; - let vr = resolve_expr_types(&val, &env, module_name.clone()); - make_field_init_node( - &authored_name(env.clone(), fi_node.clone()), - vr.expr.clone(), - fi_node.span.clone(), - node_name_span(&fi_node), - ) - }); - } - __result - }); - let all_diags = Rc::new({ - let mut __result = Vec::new(); - for fi_node in texpr.children.clone().iter().cloned() { - __result.extend( - (*{ - let val = match fi_node.children.clone().first().cloned() { - Some(v) => v.clone(), - None => fi_node.clone(), - }; - let vr = resolve_expr_types(&val, &env, module_name.clone()); - vr.diagnostics.clone() - }) - .iter() - .cloned(), - ); - } - __result - }); - Rc::new(ExprResolveResult { - expr: make_named_expr_node( - &authored_name_at(env.source_indices.clone(), &texpr), - Rc::new(ExprData::ExprRecordLit { - parent_enum: pe.clone(), - }), - resolved_children, - texpr.inferred.clone(), - texpr.span.clone(), - node_name_span(&texpr), - ), - diagnostics: all_diags, - }) - } - ExprData::ExprListLit => { - let el_results = Rc::new({ - let mut __result = Vec::new(); - for el in texpr.children.clone().iter().cloned() { - __result.push(resolve_expr_types(&el, &env, module_name.clone())); - } - __result - }); - let resolved_children = Rc::new({ - let mut __result = Vec::new(); - for r in el_results.clone().iter().cloned() { - __result.push(r.expr.clone()); - } - __result - }); - let all_diags = Rc::new({ - let mut __result = Vec::new(); - for r in el_results.clone().iter().cloned() { - __result.extend((*r.diagnostics.clone()).iter().cloned()); - } - __result - }); - Rc::new(ExprResolveResult { - expr: make_expr_node( - Rc::new(ExprData::ExprListLit), - resolved_children, - texpr.inferred.clone(), - texpr.span.clone(), - ), - diagnostics: all_diags, - }) - } - ExprData::ExprBinOp { - op, - algebra_field: af, - .. - } => { - let ch = texpr.children.clone(); - let lr = match ch.clone().first().cloned() { - Some(l) => resolve_expr_types(&l, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - let rr = match ch.clone().get(1 as usize).cloned() { - Some(r) => resolve_expr_types(&r, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - Rc::new(ExprResolveResult { - expr: make_expr_node( - Rc::new(ExprData::ExprBinOp { - op: op.clone(), - algebra_field: af.clone(), - }), - Rc::new(vec![lr.expr.clone(), rr.expr.clone()]), - texpr.inferred.clone(), - texpr.span.clone(), - ), - diagnostics: v2_rt::concat(lr.diagnostics.clone(), rr.diagnostics.clone()), - }) - } - ExprData::ExprUnaryOp { op, .. } => { - let r = match texpr.children.clone().first().cloned() { - Some(o) => resolve_expr_types(&o, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - Rc::new(ExprResolveResult { - expr: make_expr_node( - Rc::new(ExprData::ExprUnaryOp { op: op.clone() }), - Rc::new(vec![r.expr.clone()]), - texpr.inferred.clone(), - texpr.span.clone(), - ), - diagnostics: r.diagnostics.clone(), - }) - } - ExprData::ExprLambda => { - let lam_param_nodes = Rc::new( - texpr - .children - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - let r = match texpr.children.clone().first().cloned() { - Some(b) => resolve_expr_types(&b, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - Rc::new(ExprResolveResult { - expr: make_expr_node( - Rc::new(ExprData::ExprLambda), - v2_rt::concat(Rc::new(vec![r.expr.clone()]), lam_param_nodes), - texpr.inferred.clone(), - texpr.span.clone(), - ), - diagnostics: r.diagnostics.clone(), - }) - } - ExprData::ExprStringInterp => { - let resolved_children = Rc::new({ - let mut __result = Vec::new(); - for part_node in texpr.children.clone().iter().cloned() { - __result.push(match (*part_node.expr_data.clone()).clone() { - ExprData::ExprLiteral { .. } => part_node.clone(), - _ => match part_node.children.clone().first().cloned() { - Some(inner) => { - let r = resolve_expr_types(&inner, &env, module_name.clone()); - make_interp_part_node(r.expr.clone(), part_node.span.clone()) - } - None => part_node.clone(), - }, - }); - } - __result - }); - let all_diags = Rc::new({ - let mut __result = Vec::new(); - for part_node in texpr.children.clone().iter().cloned() { - __result.extend( - (*match (*part_node.expr_data.clone()).clone() { - ExprData::ExprLiteral { .. } => Rc::new(vec![]), - _ => match part_node.children.clone().first().cloned() { - Some(inner) => { - let r = - resolve_expr_types(&inner, &env, module_name.clone()); - r.diagnostics.clone() - } - None => Rc::new(vec![]), - }, - }) - .iter() - .cloned(), - ); - } - __result - }); - Rc::new(ExprResolveResult { - expr: make_expr_node( - Rc::new(ExprData::ExprStringInterp), - resolved_children, - texpr.inferred.clone(), - texpr.span.clone(), - ), - diagnostics: all_diags, - }) - } - ExprData::ExprBlock => { - let stmt_results = Rc::new({ - let mut __result = Vec::new(); - for s in texpr.children.clone().iter().cloned() { - __result.push(resolve_expr_types(&s, &env, module_name.clone())); - } - __result - }); - let resolved_children = Rc::new({ - let mut __result = Vec::new(); - for r in stmt_results.clone().iter().cloned() { - __result.push(r.expr.clone()); - } - __result - }); - let all_diags = Rc::new({ - let mut __result = Vec::new(); - for r in stmt_results.clone().iter().cloned() { - __result.extend((*r.diagnostics.clone()).iter().cloned()); - } - __result - }); - Rc::new(ExprResolveResult { - expr: make_expr_node( - Rc::new(ExprData::ExprBlock), - resolved_children, - texpr.inferred.clone(), - texpr.span.clone(), - ), - diagnostics: all_diags, - }) - } - ExprData::ExprCast => { - let ch = texpr.children.clone(); - let r = match ch.clone().first().cloned() { - Some(inner) => resolve_expr_types(&inner, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - let tr = match ch.clone().get(1 as usize).cloned() { - Some(target) => resolve_node(target.clone(), env.clone(), module_name.clone()), - None => Rc::new(NodeResolveResult { - resolved: unit_type(), - diagnostics: Rc::new(vec![]), - }), - }; - Rc::new(ExprResolveResult { - expr: make_expr_node( - Rc::new(ExprData::ExprCast), - Rc::new(vec![r.expr.clone(), tr.resolved.clone()]), - texpr.inferred.clone(), - texpr.span.clone(), - ), - diagnostics: v2_rt::concat(r.diagnostics.clone(), tr.diagnostics.clone()), - }) - } - ExprData::ExprForEach => { - let ch = texpr.children.clone(); - let cr = match ch.clone().first().cloned() { - Some(c) => resolve_expr_types(&c, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - let br = match ch.clone().get(1 as usize).cloned() { - Some(b) => resolve_expr_types(&b, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - Rc::new(ExprResolveResult { - expr: make_named_expr_node( - &foreach_variable_at(texpr.clone(), env.source_indices.clone()), - Rc::new(ExprData::ExprForEach), - Rc::new(vec![cr.expr.clone(), br.expr.clone()]), - texpr.inferred.clone(), - texpr.span.clone(), - node_name_span(&texpr), - ), - diagnostics: v2_rt::concat(cr.diagnostics.clone(), br.diagnostics.clone()), - }) - } - ExprData::ExprIndex => { - let ch = texpr.children.clone(); - let br = match ch.clone().first().cloned() { - Some(base) => resolve_expr_types(&base, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - let ir = match ch.clone().get(1 as usize).cloned() { - Some(index) => resolve_expr_types(&index, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - Rc::new(ExprResolveResult { - expr: make_expr_node( - Rc::new(ExprData::ExprIndex), - Rc::new(vec![br.expr.clone(), ir.expr.clone()]), - texpr.inferred.clone(), - texpr.span.clone(), - ), - diagnostics: v2_rt::concat(br.diagnostics.clone(), ir.diagnostics.clone()), - }) - } - ExprData::ExprSlice => { - let ch = texpr.children.clone(); - let br = match ch.clone().first().cloned() { - Some(base) => resolve_expr_types(&base, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - let sr = match ch.clone().get(1 as usize).cloned() { - Some(start) => resolve_expr_types(&start, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - let er = match ch.clone().get(2 as usize).cloned() { - Some(end_e) => resolve_expr_types(&end_e, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - Rc::new(ExprResolveResult { - expr: make_expr_node( - Rc::new(ExprData::ExprSlice), - Rc::new(vec![br.expr.clone(), sr.expr.clone(), er.expr.clone()]), - texpr.inferred.clone(), - texpr.span.clone(), - ), - diagnostics: v2_rt::concat( - v2_rt::concat(br.diagnostics.clone(), sr.diagnostics.clone()), - er.diagnostics.clone(), - ), - }) - } - ExprData::ExprReturn => { - let r = match texpr.children.clone().first().cloned() { - Some(inner) => resolve_expr_types(&inner, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), - }), - }; - Rc::new(ExprResolveResult { - expr: make_expr_node( - Rc::new(ExprData::ExprReturn), - Rc::new(vec![r.expr.clone()]), - texpr.inferred.clone(), - texpr.span.clone(), - ), - diagnostics: r.diagnostics.clone(), - }) - } - ExprData::NoExprData => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), - }), - } - }) + let val = match child.children.clone().first().cloned() { + Some(v) => v.clone(), + None => child.clone(), +}; +let vr = resolve_expr_types(&val, &env, module_name.clone()); +vr.diagnostics.clone() } - -pub fn fn_type_param_names( - item: Rc, - source_indices: Rc>>, -) -> Rc> { - Rc::new({ - let mut __result = Vec::new(); - for p in Rc::new({ - let mut __result = Vec::new(); - for p in item.params.clone().iter().cloned() { - if (param_node_name_at(p.clone(), source_indices.clone()).as_str() - == authored_name_at(source_indices.clone(), ¶m_node_type_expr(&p)).as_str()) - { - __result.push(p); } - } - __result - }) - .iter() - .cloned() - { - __result.push(param_node_name_at(p.clone(), source_indices.clone())); - } - __result - }) +}).iter().cloned()); } __result }); +Rc::new(ExprResolveResult { + expr: make_named_expr_node(&expr_method_name_at(texpr.clone(), env.source_indices.clone()), Rc::new(ExprData::ExprMethodCall { + method_semantics: ms.clone(), +}), resolved_children, texpr.inferred.clone(), texpr.span.clone(), node_name_span(&texpr)), + diagnostics: all_diags, +}) +}, + ExprData::ExprMatch => { + let resolved_children = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(texpr.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ + let idx = pair.0.clone(); +let child = pair.1.clone(); +if (idx.clone() == 0) { + { + let sr = resolve_expr_types(&child, &env, module_name.clone()); +sr.expr.clone() } - -pub fn has_duplicate_type_param_name(names: &Rc>) -> bool { - { - let mut __found = false; - for pair in Rc::new( - names - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - if { + } else { + { + let arm_ch = child.children.clone(); +let has_guard = ((arm_ch.clone().len() as i64) == 2); +if has_guard.clone() { + { + let guard_r = match arm_ch.clone().first().cloned() { + Some(g) => resolve_expr_types(&g, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: child.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +let body_r = match arm_ch.clone().get(1 as usize).cloned() { + Some(b) => resolve_expr_types(&b, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: child.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +make_arm_node(match child.match_pattern.clone() { + Some(p) => p.clone(), + None => Rc::new(MatchPattern::Wildcard), +}, Some(guard_r.expr.clone()), body_r.expr.clone(), child.span.clone()) +} + } else { + { + let body_r = match arm_ch.clone().first().cloned() { + Some(b) => resolve_expr_types(&b, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: child.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +make_arm_node(match child.match_pattern.clone() { + Some(p) => p.clone(), + None => Rc::new(MatchPattern::Wildcard), +}, None, body_r.expr.clone(), child.span.clone()) +} + } +} + } +}); } __result }); +let all_diags = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(texpr.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.extend((*{ let idx = pair.0.clone(); - let s = pair.1.clone(); - { - let mut __found = false; - for other in Rc::new( - names - .clone() - .iter() - .cloned() - .skip((idx.clone() + 1) as usize) - .collect::>(), - ) - .iter() - .cloned() +let child = pair.1.clone(); +if (idx.clone() == 0) { { - if (other.clone().as_str() == s.clone().as_str()) { - __found = true; - break; + let sr = resolve_expr_types(&child, &env, module_name.clone()); +sr.diagnostics.clone() +} + } else { + { + let arm_ch = child.children.clone(); +let has_guard = ((arm_ch.clone().len() as i64) == 2); +if has_guard.clone() { + { + let guard_r = match arm_ch.clone().first().cloned() { + Some(g) => resolve_expr_types(&g, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: child.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +let body_r = match arm_ch.clone().get(1 as usize).cloned() { + Some(b) => resolve_expr_types(&b, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: child.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +v2_rt::concat(guard_r.diagnostics.clone(), body_r.diagnostics.clone()) +} + } else { + { + let body_r = match arm_ch.clone().first().cloned() { + Some(b) => resolve_expr_types(&b, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: child.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +body_r.diagnostics.clone() +} } - } - __found +} } - } { - __found = true; - break; - } - } - __found - } +}).iter().cloned()); } __result }); +Rc::new(ExprResolveResult { + expr: make_expr_node(Rc::new(ExprData::ExprMatch), resolved_children, texpr.inferred.clone(), texpr.span.clone()), + diagnostics: all_diags, +}) +}, + ExprData::ExprIf => { + let ch = texpr.children.clone(); +let cr = match ch.clone().first().cloned() { + Some(c) => resolve_expr_types(&c, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +let tr = match ch.clone().get(1 as usize).cloned() { + Some(t) => resolve_expr_types(&t, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +let er = match ch.clone().get(2 as usize).cloned() { + Some(e) => Some(resolve_expr_types(&e, &env, module_name.clone())), + None => None, +}; +let resolved_children = match er.clone() { + Some(r) => Rc::new(vec![cr.expr.clone(), tr.expr.clone(), r.expr.clone()]), + None => Rc::new(vec![cr.expr.clone(), tr.expr.clone()]), +}; +Rc::new(ExprResolveResult { + expr: make_expr_node(Rc::new(ExprData::ExprIf), resolved_children, texpr.inferred.clone(), texpr.span.clone()), + diagnostics: v2_rt::concat(v2_rt::concat(cr.diagnostics.clone(), tr.diagnostics.clone()), match er.clone() { + Some(r) => r.diagnostics.clone(), + None => Rc::new(vec![]), +}), +}) +}, + ExprData::ExprLet => { + let ch = texpr.children.clone(); +let vr = match ch.clone().first().cloned() { + Some(v) => resolve_expr_types(&v, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +let br = match ch.clone().get(1 as usize).cloned() { + Some(bd) => Some(resolve_expr_types(&bd, &env, module_name.clone())), + None => None, +}; +let resolved_children = match br.clone() { + Some(r) => Rc::new(vec![vr.expr.clone(), r.expr.clone()]), + None => Rc::new(vec![vr.expr.clone()]), +}; +Rc::new(ExprResolveResult { + expr: make_named_expr_node(&let_binding_name_at(texpr.clone(), env.source_indices.clone()), Rc::new(ExprData::ExprLet), resolved_children, texpr.inferred.clone(), texpr.span.clone(), node_name_span(&texpr)), + diagnostics: v2_rt::concat(vr.diagnostics.clone(), match br.clone() { + Some(r) => r.diagnostics.clone(), + None => Rc::new(vec![]), +}), +}) +}, + ExprData::ExprRecordLit { parent_enum: pe, .. } => { + let resolved_children = Rc::new({ let mut __result = Vec::new(); for fi_node in texpr.children.clone().iter().cloned() { __result.push({ + let val = match fi_node.children.clone().first().cloned() { + Some(v) => v.clone(), + None => fi_node.clone(), +}; +let vr = resolve_expr_types(&val, &env, module_name.clone()); +make_field_init_node(&authored_name(env.clone(), fi_node.clone()), vr.expr.clone(), fi_node.span.clone(), node_name_span(&fi_node)) +}); } __result }); +let all_diags = Rc::new({ let mut __result = Vec::new(); for fi_node in texpr.children.clone().iter().cloned() { __result.extend((*{ + let val = match fi_node.children.clone().first().cloned() { + Some(v) => v.clone(), + None => fi_node.clone(), +}; +let vr = resolve_expr_types(&val, &env, module_name.clone()); +vr.diagnostics.clone() +}).iter().cloned()); } __result }); +Rc::new(ExprResolveResult { + expr: make_named_expr_node(&authored_name_at(env.source_indices.clone(), &texpr), Rc::new(ExprData::ExprRecordLit { + parent_enum: pe.clone(), +}), resolved_children, texpr.inferred.clone(), texpr.span.clone(), node_name_span(&texpr)), + diagnostics: all_diags, +}) +}, + ExprData::ExprListLit => { + let el_results = Rc::new({ let mut __result = Vec::new(); for el in texpr.children.clone().iter().cloned() { __result.push(resolve_expr_types(&el, &env, module_name.clone())); } __result }); +let resolved_children = Rc::new({ let mut __result = Vec::new(); for r in el_results.clone().iter().cloned() { __result.push(r.expr.clone()); } __result }); +let all_diags = Rc::new({ let mut __result = Vec::new(); for r in el_results.clone().iter().cloned() { __result.extend((*r.diagnostics.clone()).iter().cloned()); } __result }); +Rc::new(ExprResolveResult { + expr: make_expr_node(Rc::new(ExprData::ExprListLit), resolved_children, texpr.inferred.clone(), texpr.span.clone()), + diagnostics: all_diags, +}) +}, + ExprData::ExprBinOp { op, algebra_field: af, .. } => { + let ch = texpr.children.clone(); +let lr = match ch.clone().first().cloned() { + Some(l) => resolve_expr_types(&l, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +let rr = match ch.clone().get(1 as usize).cloned() { + Some(r) => resolve_expr_types(&r, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +Rc::new(ExprResolveResult { + expr: make_expr_node(Rc::new(ExprData::ExprBinOp { + op: op.clone(), + algebra_field: af.clone(), +}), Rc::new(vec![lr.expr.clone(), rr.expr.clone()]), texpr.inferred.clone(), texpr.span.clone()), + diagnostics: v2_rt::concat(lr.diagnostics.clone(), rr.diagnostics.clone()), +}) +}, + ExprData::ExprUnaryOp { op, .. } => { + let r = match texpr.children.clone().first().cloned() { + Some(o) => resolve_expr_types(&o, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +Rc::new(ExprResolveResult { + expr: make_expr_node(Rc::new(ExprData::ExprUnaryOp { + op: op.clone(), +}), Rc::new(vec![r.expr.clone()]), texpr.inferred.clone(), texpr.span.clone()), + diagnostics: r.diagnostics.clone(), +}) +}, + ExprData::ExprLambda => { + let lam_param_nodes = Rc::new(texpr.children.clone().iter().cloned().skip(1 as usize).collect::>()); +let r = match texpr.children.clone().first().cloned() { + Some(b) => resolve_expr_types(&b, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +Rc::new(ExprResolveResult { + expr: make_expr_node(Rc::new(ExprData::ExprLambda), v2_rt::concat(Rc::new(vec![r.expr.clone()]), lam_param_nodes), texpr.inferred.clone(), texpr.span.clone()), + diagnostics: r.diagnostics.clone(), +}) +}, + ExprData::ExprStringInterp => { + let resolved_children = Rc::new({ let mut __result = Vec::new(); for part_node in texpr.children.clone().iter().cloned() { __result.push(match (*part_node.expr_data.clone()).clone() { + ExprData::ExprLiteral { .. } => part_node.clone(), + _ => match part_node.children.clone().first().cloned() { + Some(inner) => { + let r = resolve_expr_types(&inner, &env, module_name.clone()); +make_interp_part_node(r.expr.clone(), part_node.span.clone()) +}, + None => part_node.clone(), +}, +}); } __result }); +let all_diags = Rc::new({ let mut __result = Vec::new(); for part_node in texpr.children.clone().iter().cloned() { __result.extend((*match (*part_node.expr_data.clone()).clone() { + ExprData::ExprLiteral { .. } => Rc::new(vec![]), + _ => match part_node.children.clone().first().cloned() { + Some(inner) => { + let r = resolve_expr_types(&inner, &env, module_name.clone()); +r.diagnostics.clone() +}, + None => Rc::new(vec![]), +}, +}).iter().cloned()); } __result }); +Rc::new(ExprResolveResult { + expr: make_expr_node(Rc::new(ExprData::ExprStringInterp), resolved_children, texpr.inferred.clone(), texpr.span.clone()), + diagnostics: all_diags, +}) +}, + ExprData::ExprBlock => { + let stmt_results = Rc::new({ let mut __result = Vec::new(); for s in texpr.children.clone().iter().cloned() { __result.push(resolve_expr_types(&s, &env, module_name.clone())); } __result }); +let resolved_children = Rc::new({ let mut __result = Vec::new(); for r in stmt_results.clone().iter().cloned() { __result.push(r.expr.clone()); } __result }); +let all_diags = Rc::new({ let mut __result = Vec::new(); for r in stmt_results.clone().iter().cloned() { __result.extend((*r.diagnostics.clone()).iter().cloned()); } __result }); +Rc::new(ExprResolveResult { + expr: make_expr_node(Rc::new(ExprData::ExprBlock), resolved_children, texpr.inferred.clone(), texpr.span.clone()), + diagnostics: all_diags, +}) +}, + ExprData::ExprCast => { + let ch = texpr.children.clone(); +let r = match ch.clone().first().cloned() { + Some(inner) => resolve_expr_types(&inner, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +let tr = match ch.clone().get(1 as usize).cloned() { + Some(target) => resolve_node(target.clone(), env.clone(), module_name.clone()), + None => Rc::new(NodeResolveResult { + resolved: unit_type(), + diagnostics: Rc::new(vec![]), +}), +}; +Rc::new(ExprResolveResult { + expr: make_expr_node(Rc::new(ExprData::ExprCast), Rc::new(vec![r.expr.clone(), tr.resolved.clone()]), texpr.inferred.clone(), texpr.span.clone()), + diagnostics: v2_rt::concat(r.diagnostics.clone(), tr.diagnostics.clone()), +}) +}, + ExprData::ExprForEach => { + let ch = texpr.children.clone(); +let cr = match ch.clone().first().cloned() { + Some(c) => resolve_expr_types(&c, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +let br = match ch.clone().get(1 as usize).cloned() { + Some(b) => resolve_expr_types(&b, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +Rc::new(ExprResolveResult { + expr: make_named_expr_node(&foreach_variable_at(texpr.clone(), env.source_indices.clone()), Rc::new(ExprData::ExprForEach), Rc::new(vec![cr.expr.clone(), br.expr.clone()]), texpr.inferred.clone(), texpr.span.clone(), node_name_span(&texpr)), + diagnostics: v2_rt::concat(cr.diagnostics.clone(), br.diagnostics.clone()), +}) +}, + ExprData::ExprIndex => { + let ch = texpr.children.clone(); +let br = match ch.clone().first().cloned() { + Some(base) => resolve_expr_types(&base, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +let ir = match ch.clone().get(1 as usize).cloned() { + Some(index) => resolve_expr_types(&index, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +Rc::new(ExprResolveResult { + expr: make_expr_node(Rc::new(ExprData::ExprIndex), Rc::new(vec![br.expr.clone(), ir.expr.clone()]), texpr.inferred.clone(), texpr.span.clone()), + diagnostics: v2_rt::concat(br.diagnostics.clone(), ir.diagnostics.clone()), +}) +}, + ExprData::ExprSlice => { + let ch = texpr.children.clone(); +let br = match ch.clone().first().cloned() { + Some(base) => resolve_expr_types(&base, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +let sr = match ch.clone().get(1 as usize).cloned() { + Some(start) => resolve_expr_types(&start, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +let er = match ch.clone().get(2 as usize).cloned() { + Some(end_e) => resolve_expr_types(&end_e, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +Rc::new(ExprResolveResult { + expr: make_expr_node(Rc::new(ExprData::ExprSlice), Rc::new(vec![br.expr.clone(), sr.expr.clone(), er.expr.clone()]), texpr.inferred.clone(), texpr.span.clone()), + diagnostics: v2_rt::concat(v2_rt::concat(br.diagnostics.clone(), sr.diagnostics.clone()), er.diagnostics.clone()), +}) +}, + ExprData::ExprReturn => { + let r = match texpr.children.clone().first().cloned() { + Some(inner) => resolve_expr_types(&inner, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), +}), +}; +Rc::new(ExprResolveResult { + expr: make_expr_node(Rc::new(ExprData::ExprReturn), Rc::new(vec![r.expr.clone()]), texpr.inferred.clone(), texpr.span.clone()), + diagnostics: r.diagnostics.clone(), +}) +}, + ExprData::NoExprData => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), +}), +} + }) +} + +pub fn fn_type_param_names(item: Rc, source_indices: Rc>>) -> Rc> { + Rc::new({ let mut __result = Vec::new(); for p in Rc::new({ let mut __result = Vec::new(); for p in item.params.clone().iter().cloned() { if (param_node_name_at(p.clone(), source_indices.clone()).as_str() == authored_name_at(source_indices.clone(), ¶m_node_type_expr(&p)).as_str()) { __result.push(p); } } __result }).iter().cloned() { __result.push(param_node_name_at(p.clone(), source_indices.clone())); } __result }) +} + +pub fn has_duplicate_type_param_name(names: &Rc>) -> bool { + { let mut __found = false; for pair in Rc::new(names.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if { + let idx = pair.0.clone(); +let s = pair.1.clone(); +{ let mut __found = false; for other in Rc::new(names.clone().iter().cloned().skip((idx.clone() + 1) as usize).collect::>()).iter().cloned() { if (other.clone().as_str() == s.clone().as_str()) { __found = true; break; } } __found } +} { __found = true; break; } } __found } } -pub fn resolve_item_types( - item: &Rc, - env: &Rc, - module_name: &String, -) -> Rc { +pub fn resolve_item_types(item: &Rc, env: &Rc, module_name: &String) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let tp_names = fn_type_param_names(item.clone(), env.source_indices.clone()); - let collision_diags = if has_duplicate_type_param_name(&tp_names) { - Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::InternalError { + { + let tp_names = fn_type_param_names(item.clone(), env.source_indices.clone()); +let collision_diags = if has_duplicate_type_param_name(&tp_names) { + Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::InternalError { message: v2_rt::concat(v2_rt::concat("type param name collides with a value param in fn '".to_string(), authored_name_at(env.source_indices.clone(), &item)), "' — a value param shares its name with a declared type param (e.g., `fn f(T: T)`). Rename the value param, or dissolve via ParamKind / params-slot partition.".to_string()), span: item.span.clone(), }), module_name.clone())]) - } else { - Rc::new(vec![]) - }; - let env = tp_names.clone().iter().cloned().fold( - env.clone(), - |e: Rc, tp_name: String| { - Rc::new(TypeEnv { - bindings: v2_rt::rc_map_insert( - e.bindings.clone(), - intern(&e.intern_table.clone(), &tp_name).id.clone(), - Rc::new(TypeBinding { - name: tp_name.clone(), - resolved: Rc::new(Node { - name: tp_name.clone(), - span: kernel_span(&tp_name), - ident_span: Some(kernel_span(&tp_name)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::TypeVariable { - id: tp_name.clone(), - })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - provenance: Rc::new(SubValueRelation::SubValueUnknown), - }), - ), - recursive_types: e.recursive_types.clone(), - recursive_type_set: e.recursive_type_set.clone(), - inductive_fields: e.inductive_fields.clone(), - source_indices: e.source_indices.clone(), - intern_table: e.intern_table.clone(), - }) - }, - ); - let param_results = Rc::new({ - let mut __result = Vec::new(); - for p in item.params.clone().iter().cloned() { - __result.push(resolve_param(&p, &env, &module_name)); - } - __result - }); - let resolved_params = Rc::new({ - let mut __result = Vec::new(); - for pr in param_results.clone().iter().cloned() { - __result.push(pr.param.clone()); - } - __result - }); - let param_diags = Rc::new({ - let mut __result = Vec::new(); - for pr in param_results.clone().iter().cloned() { - __result.extend((*pr.diagnostics.clone()).iter().cloned()); - } - __result - }); - let ret_result = - resolve_optional_node(&item.inferred.clone(), env.clone(), module_name.clone()); - let ret_resolved = ret_result.resolved.clone(); - let ret_diags = ret_result.diagnostics.clone(); - let resolved_ret = if (item.inferred.clone() == None) { - None - } else { - Some(Rc::new(InferredNode::Resolved { node: ret_resolved })) - }; - let use_results = Rc::new({ - let mut __result = Vec::new(); - for u in item.uses.clone().iter().cloned() { - __result.push(resolve_resource_use(&u, &env, module_name.clone())); - } - __result - }); - let resolved_uses = Rc::new({ - let mut __result = Vec::new(); - for ur in use_results.clone().iter().cloned() { - __result.push(ur.resource_use.clone()); - } - __result - }); - let use_diags = Rc::new({ - let mut __result = Vec::new(); - for ur in use_results.clone().iter().cloned() { - __result.extend((*ur.diagnostics.clone()).iter().cloned()); - } - __result - }); - let body_resolved = if (item.body.clone() == None) { - Rc::new(ExprResolveResult { - expr: item.clone(), - diagnostics: Rc::new(vec![]), - }) - } else { - resolve_expr_types( - &item.body.clone().clone().unwrap(), - &env, - module_name.clone(), - ) - }; - let resolved_body = if (item.body.clone() == None) { - None - } else { - Some(body_resolved.expr.clone()) - }; - let body_diags = if (item.body.clone() == None) { - Rc::new(vec![]) - } else { - body_resolved.diagnostics.clone() - }; - let anno_resolved = if (item.type_annotation.clone() == None) { - Rc::new(NodeResolveResult { - resolved: unit_type(), - diagnostics: Rc::new(vec![]), - }) - } else { - resolve_node( - item.type_annotation.clone().clone().unwrap(), - env.clone(), - module_name.clone(), - ) - }; - let resolved_anno = if (item.type_annotation.clone() == None) { - None - } else { - Some(anno_resolved.resolved.clone()) - }; - let anno_diags = anno_resolved.diagnostics.clone(); - let transport_resolved = if (item.transport.clone() == None) { - Rc::new(TransportResolveResult { - transport: local_transport_node(no_span()), - diagnostics: Rc::new(vec![]), - }) - } else { - resolve_transport_binding(&item.transport.clone().clone().unwrap(), &env, &module_name) - }; - let resolved_transport = if (item.transport.clone() == None) { - None - } else { - Some(transport_resolved.transport.clone()) - }; - let transport_diags = transport_resolved.diagnostics.clone(); - let prop_results = Rc::new({ - let mut __result = Vec::new(); - for p in item.properties.clone().iter().cloned() { - __result.push(resolve_field_init(&p, &env, module_name.clone())); - } - __result - }); - let resolved_props = Rc::new({ - let mut __result = Vec::new(); - for pr in prop_results.clone().iter().cloned() { - __result.push(pr.field_init.clone()); - } - __result - }); - let prop_diags = Rc::new({ - let mut __result = Vec::new(); - for pr in prop_results.clone().iter().cloned() { - __result.extend((*pr.diagnostics.clone()).iter().cloned()); - } - __result - }); - let child_results = Rc::new({ - let mut __result = Vec::new(); - for child in item.children.clone().iter().cloned() { - __result.push(resolve_item_types(&child, &env, &module_name)); - } - __result - }); - let resolved_children = Rc::new({ - let mut __result = Vec::new(); - for cr in child_results.clone().iter().cloned() { - __result.push(cr.item.clone()); - } - __result - }); - let child_diags = Rc::new({ - let mut __result = Vec::new(); - for cr in child_results.clone().iter().cloned() { - __result.extend((*cr.diagnostics.clone()).iter().cloned()); - } - __result - }); - Rc::new(ItemResult { - item: Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: resolved_children, - params: resolved_params, - inferred: resolved_ret, - return_cardinality: item.return_cardinality.clone(), - uses: resolved_uses, - body: resolved_body, - connective: item.connective.clone(), - transport: resolved_transport, - properties: resolved_props, - type_annotation: resolved_anno, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - diagnostics: v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(collision_diags, param_diags), - ret_diags, - ), - use_diags, - ), - body_diags, - ), - anno_diags, - ), - transport_diags, - ), - prop_diags, - ), - child_diags, - ), - }) + } else { + Rc::new(vec![]) + }; +let env = tp_names.clone().iter().cloned().fold(env.clone(), |e: Rc, tp_name: String| Rc::new(TypeEnv { + bindings: v2_rt::rc_map_insert(e.bindings.clone(), intern(&e.intern_table.clone(), &tp_name).id.clone(), Rc::new(TypeBinding { + name: tp_name.clone(), + resolved: Rc::new(Node { + name: tp_name.clone(), + span: kernel_span(&tp_name), + ident_span: Some(kernel_span(&tp_name)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::TypeVariable { + id: tp_name.clone(), +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), + provenance: Rc::new(SubValueRelation::SubValueUnknown), +})), + recursive_types: e.recursive_types.clone(), + recursive_type_set: e.recursive_type_set.clone(), + inductive_fields: e.inductive_fields.clone(), + source_indices: e.source_indices.clone(), + intern_table: e.intern_table.clone(), +})); +let param_results = Rc::new({ let mut __result = Vec::new(); for p in item.params.clone().iter().cloned() { __result.push(resolve_param(&p, &env, &module_name)); } __result }); +let resolved_params = Rc::new({ let mut __result = Vec::new(); for pr in param_results.clone().iter().cloned() { __result.push(pr.param.clone()); } __result }); +let param_diags = Rc::new({ let mut __result = Vec::new(); for pr in param_results.clone().iter().cloned() { __result.extend((*pr.diagnostics.clone()).iter().cloned()); } __result }); +let ret_result = resolve_optional_node(&item.inferred.clone(), env.clone(), module_name.clone()); +let ret_resolved = ret_result.resolved.clone(); +let ret_diags = ret_result.diagnostics.clone(); +let resolved_ret = if (item.inferred.clone() == None) { + None + } else { + Some(Rc::new(InferredNode::Resolved { + node: ret_resolved, +})) + }; +let use_results = Rc::new({ let mut __result = Vec::new(); for u in item.uses.clone().iter().cloned() { __result.push(resolve_resource_use(&u, &env, module_name.clone())); } __result }); +let resolved_uses = Rc::new({ let mut __result = Vec::new(); for ur in use_results.clone().iter().cloned() { __result.push(ur.resource_use.clone()); } __result }); +let use_diags = Rc::new({ let mut __result = Vec::new(); for ur in use_results.clone().iter().cloned() { __result.extend((*ur.diagnostics.clone()).iter().cloned()); } __result }); +let body_resolved = if (item.body.clone() == None) { + Rc::new(ExprResolveResult { + expr: item.clone(), + diagnostics: Rc::new(vec![]), +}) + } else { + resolve_expr_types(&item.body.clone().clone().unwrap(), &env, module_name.clone()) + }; +let resolved_body = if (item.body.clone() == None) { + None + } else { + Some(body_resolved.expr.clone()) + }; +let body_diags = if (item.body.clone() == None) { + Rc::new(vec![]) + } else { + body_resolved.diagnostics.clone() + }; +let anno_resolved = if (item.type_annotation.clone() == None) { + Rc::new(NodeResolveResult { + resolved: unit_type(), + diagnostics: Rc::new(vec![]), +}) + } else { + resolve_node(item.type_annotation.clone().clone().unwrap(), env.clone(), module_name.clone()) + }; +let resolved_anno = if (item.type_annotation.clone() == None) { + None + } else { + Some(anno_resolved.resolved.clone()) + }; +let anno_diags = anno_resolved.diagnostics.clone(); +let transport_resolved = if (item.transport.clone() == None) { + Rc::new(TransportResolveResult { + transport: local_transport_node(no_span()), + diagnostics: Rc::new(vec![]), +}) + } else { + resolve_transport_binding(&item.transport.clone().clone().unwrap(), &env, &module_name) + }; +let resolved_transport = if (item.transport.clone() == None) { + None + } else { + Some(transport_resolved.transport.clone()) + }; +let transport_diags = transport_resolved.diagnostics.clone(); +let prop_results = Rc::new({ let mut __result = Vec::new(); for p in item.properties.clone().iter().cloned() { __result.push(resolve_field_init(&p, &env, module_name.clone())); } __result }); +let resolved_props = Rc::new({ let mut __result = Vec::new(); for pr in prop_results.clone().iter().cloned() { __result.push(pr.field_init.clone()); } __result }); +let prop_diags = Rc::new({ let mut __result = Vec::new(); for pr in prop_results.clone().iter().cloned() { __result.extend((*pr.diagnostics.clone()).iter().cloned()); } __result }); +let child_results = Rc::new({ let mut __result = Vec::new(); for child in item.children.clone().iter().cloned() { __result.push(resolve_item_types(&child, &env, &module_name)); } __result }); +let resolved_children = Rc::new({ let mut __result = Vec::new(); for cr in child_results.clone().iter().cloned() { __result.push(cr.item.clone()); } __result }); +let child_diags = Rc::new({ let mut __result = Vec::new(); for cr in child_results.clone().iter().cloned() { __result.extend((*cr.diagnostics.clone()).iter().cloned()); } __result }); +Rc::new(ItemResult { + item: Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: resolved_children, + params: resolved_params, + inferred: resolved_ret, + return_cardinality: item.return_cardinality.clone(), + uses: resolved_uses, + body: resolved_body, + connective: item.connective.clone(), + transport: resolved_transport, + properties: resolved_props, + type_annotation: resolved_anno, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), + diagnostics: v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(collision_diags, param_diags), ret_diags), use_diags), body_diags), anno_diags), transport_diags), prop_diags), child_diags), +}) +} }) } diff --git a/src/v2/stage0/src/v2_compiler_infer_service.rs b/src/v2/stage0/src/v2_compiler_infer_service.rs index 8dfabfec682..5049a189788 100644 --- a/src/v2/stage0/src/v2_compiler_infer_service.rs +++ b/src/v2/stage0/src/v2_compiler_infer_service.rs @@ -1,26 +1,20 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_service -pub use crate::std_types::SourceSpan; -use crate::v2_compiler_infer_items::ItemKind::FuncItem; -pub use crate::v2_compiler_infer_items::{inferred_to_outputs, ItemInfo, ItemKind, TypedModule}; -pub use crate::v2_compiler_infer_types::{emit_map_has, nominal_type_ref}; -use crate::v2_rt; -use crate::v2_std_core::Cardinality::Required; -use crate::v2_std_core::Connective::{Conj, NoConnective}; -use crate::v2_std_core::ExprData::{ - ExprCall, ExprFieldAccess, ExprMethodCall, ExprVar, NoExprData, -}; -use crate::v2_std_core::InferredNode::Resolved; -pub use crate::v2_std_core::{ - authored_name_at, expr_call_func_at, expr_var_name_at, field_access_base, - field_access_field_at, method_receiver, no_span, param_node_type_expr, unit_type, Cardinality, - Connective, ExprData, InferredNode, NewlineIndex, Node, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_types::{SourceSpan}; +pub use crate::v2_std_core::{Node, Connective, ExprData, Cardinality, InferredNode, NewlineIndex, no_span, unit_type, expr_var_name_at, expr_call_func_at, field_access_field_at, field_access_base, method_receiver, param_node_type_expr, authored_name_at}; +use crate::v2_std_core::Connective::{Conj, NoConnective}; +use crate::v2_std_core::ExprData::{NoExprData, ExprFieldAccess, ExprMethodCall, ExprCall, ExprVar}; +use crate::v2_std_core::Cardinality::{Required}; +use crate::v2_std_core::InferredNode::{Resolved}; +pub use crate::v2_compiler_infer_types::{emit_map_has, nominal_type_ref}; +pub use crate::v2_compiler_infer_items::{ItemInfo, ItemKind, TypedModule, inferred_to_outputs}; +use crate::v2_compiler_infer_items::ItemKind::{FuncItem}; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct UniqueAccum { @@ -41,165 +35,114 @@ pub struct ServiceMethodResult { pub op_params: Rc>>, } -pub fn is_typed_service_call_receiver( - receiver: &Rc, - source_indices: Rc>>, -) -> bool { +pub fn is_typed_service_call_receiver(receiver: &Rc, source_indices: Rc>>) -> bool { match (*receiver.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let f = field_access_field_at(receiver.clone(), source_indices); - let b = field_access_base(receiver.clone()); - match (*b.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - match Rc::new(f.chars().map(|c| c as i64).collect::>()) - .first() - .cloned() - { - Some(ch) => ((ch.clone() >= 65) && (ch.clone() <= 90)), - None => false, - } - } - _ => false, - } - } - _ => false, - } + ExprData::ExprFieldAccess { .. } => { + let f = field_access_field_at(receiver.clone(), source_indices); +let b = field_access_base(receiver.clone()); +match (*b.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => match Rc::new(f.chars().map(|c| c as i64).collect::>()).first().cloned() { + Some(ch) => ((ch.clone() >= 65) && (ch.clone() <= 90)), + None => false, +}, + _ => false, +} +}, + _ => false, +} } -pub fn extract_typed_service_name( - receiver: &Rc, - source_indices: &Rc>>, -) -> Option { +pub fn extract_typed_service_name(receiver: &Rc, source_indices: &Rc>>) -> Option { match (*receiver.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let f = field_access_field_at(receiver.clone(), source_indices.clone()); - let b = field_access_base(receiver.clone()); - match (*b.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let ns = expr_var_name_at(b.clone(), source_indices.clone()); - Some(v2_rt::concat(v2_rt::concat(ns, ".".to_string()), f)) - } - _ => None, - } - } - _ => None, - } + ExprData::ExprFieldAccess { .. } => { + let f = field_access_field_at(receiver.clone(), source_indices.clone()); +let b = field_access_base(receiver.clone()); +match (*b.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let ns = expr_var_name_at(b.clone(), source_indices.clone()); +Some(v2_rt::concat(v2_rt::concat(ns, ".".to_string()), f)) +}, + _ => None, +} +}, + _ => None, +} } -pub fn collect_typed_service_calls( - texpr: Rc, - source_indices: Rc>>, -) -> Rc> { +pub fn collect_typed_service_calls(texpr: Rc, source_indices: Rc>>) -> Rc> { { - let result = collect_typed_service_calls_into( - &texpr, - &Rc::new(UniqueAccum { - seen: v2_rt::rc_empty_map::(), - result: Rc::new(vec![]), - }), - &source_indices, - ); - result.result.clone() - } + let result = collect_typed_service_calls_into(&texpr, &Rc::new(UniqueAccum { + seen: v2_rt::rc_empty_map::(), + result: Rc::new(vec![]), +}), &source_indices); +result.result.clone() +} } -pub fn collect_typed_service_calls_into( - texpr: &Rc, - acc: &Rc, - source_indices: &Rc>>, -) -> Rc { +pub fn collect_typed_service_calls_into(texpr: &Rc, acc: &Rc, source_indices: &Rc>>) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let this_acc = match (*texpr.expr_data.clone()).clone() { - ExprData::ExprMethodCall { .. } => { + { + let this_acc = match (*texpr.expr_data.clone()).clone() { + ExprData::ExprMethodCall { .. } => { let r = method_receiver(texpr.clone()); - if is_typed_service_call_receiver(&r, source_indices.clone()) { +if is_typed_service_call_receiver(&r, source_indices.clone()) { match extract_typed_service_name(&r, &source_indices) { - Some(service_name) => { - if emit_map_has(acc.seen.clone(), service_name.clone()) { - acc.clone() - } else { - Rc::new(UniqueAccum { - seen: v2_rt::rc_map_insert( - acc.seen.clone(), - service_name.clone(), - true, - ), - result: v2_rt::rc_list_push( - acc.result.clone(), - service_name.clone(), - ), - }) - } - } - None => acc.clone(), - } + Some(service_name) => if emit_map_has(acc.seen.clone(), service_name.clone()) { + acc.clone() + } else { + Rc::new(UniqueAccum { + seen: v2_rt::rc_map_insert(acc.seen.clone(), service_name.clone(), true), + result: v2_rt::rc_list_push(acc.result.clone(), service_name.clone()), +}) + }, + None => acc.clone(), +} } else { acc.clone() } - } - _ => acc.clone(), - }; - let result = texpr.children.clone().iter().cloned().fold( - this_acc.clone(), - |a: Rc, child: Rc| { - collect_typed_service_calls_into(&child, &a, &source_indices) - }, - ); - result +}, + _ => acc.clone(), +}; +let result = texpr.children.clone().iter().cloned().fold(this_acc.clone(), |a: Rc, child: Rc| collect_typed_service_calls_into(&child, &a, &source_indices)); +result +} }) } -pub fn collect_called_func_names_into( - texpr: &Rc, - acc: &Rc, - source_indices: &Rc>>, -) -> Rc { +pub fn collect_called_func_names_into(texpr: &Rc, acc: &Rc, source_indices: &Rc>>) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let this_acc = match (*texpr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { + { + let this_acc = match (*texpr.expr_data.clone()).clone() { + ExprData::ExprCall { .. } => { let f = expr_call_func_at(texpr.clone(), source_indices.clone()); - if emit_map_has(acc.seen.clone(), f.clone()) { +if emit_map_has(acc.seen.clone(), f.clone()) { acc.clone() } else { Rc::new(UniqueAccum { - seen: v2_rt::rc_map_insert(acc.seen.clone(), f.clone(), true), - result: v2_rt::rc_list_push(acc.result.clone(), f.clone()), - }) + seen: v2_rt::rc_map_insert(acc.seen.clone(), f.clone(), true), + result: v2_rt::rc_list_push(acc.result.clone(), f.clone()), +}) } - } - _ => acc.clone(), - }; - let result = texpr.children.clone().iter().cloned().fold( - this_acc.clone(), - |a: Rc, child: Rc| { - collect_called_func_names_into(&child, &a, &source_indices) - }, - ); - result +}, + _ => acc.clone(), +}; +let result = texpr.children.clone().iter().cloned().fold(this_acc.clone(), |a: Rc, child: Rc| collect_called_func_names_into(&child, &a, &source_indices)); +result +} }) } -pub fn collect_called_func_names( - texpr: Rc, - source_indices: Rc>>, -) -> Rc> { +pub fn collect_called_func_names(texpr: Rc, source_indices: Rc>>) -> Rc> { { - let result = collect_called_func_names_into( - &texpr, - &Rc::new(UniqueAccum { - seen: v2_rt::rc_empty_map::(), - result: Rc::new(vec![]), - }), - &source_indices, - ); - result.result.clone() - } + let result = collect_called_func_names_into(&texpr, &Rc::new(UniqueAccum { + seen: v2_rt::rc_empty_map::(), + result: Rc::new(vec![]), +}), &source_indices); +result.result.clone() +} } -pub fn expand_transitive_services_once( - modules: Rc>>, - registry: Rc>>, -) -> Rc>> { +pub fn expand_transitive_services_once(modules: Rc>>, registry: Rc>>) -> Rc>> { modules.iter().cloned().fold(registry.clone(), |reg: Rc>>, m: Rc| m.items.clone().iter().cloned().fold(reg, |reg2: Rc>>, item: Rc| { let item_name = authored_name_at(m.type_env.clone().source_indices.clone(), &item); match v2_rt::map_get(®2, item_name.clone()) { @@ -243,172 +186,117 @@ if same_count.clone() { } pub fn total_service_count(registry: Rc>>) -> i64 { - Rc::new(v2_rt::map_values(®istry)) - .iter() - .cloned() - .fold(0, |acc: i64, info: Rc| { - (acc + (info.service_names.clone().len() as i64)) - }) + Rc::new(v2_rt::map_values(®istry)).iter().cloned().fold(0, |acc: i64, info: Rc| (acc + (info.service_names.clone().len() as i64))) } -pub fn expand_transitive_services( - mut modules: Rc>>, - mut registry: Rc>>, - mut remaining_passes: i64, -) -> Rc>> { +pub fn expand_transitive_services(mut modules: Rc>>, mut registry: Rc>>, mut remaining_passes: i64) -> Rc>> { loop { if (remaining_passes.clone() <= 0) { break registry.clone(); - } else { +} else { let before = total_service_count(registry.clone()); - let next = expand_transitive_services_once(modules.clone(), registry.clone()); - let after = total_service_count(next.clone()); - if (before == after) { +let next = expand_transitive_services_once(modules.clone(), registry.clone()); +let after = total_service_count(next.clone()); +if (before == after) { break registry.clone(); - } else { +} else { { let __tco_0 = next.clone(); - let __tco_1 = (remaining_passes - 1); - registry = __tco_0; - remaining_passes = __tco_1; - continue; - } - } - } - } +let __tco_1 = (remaining_passes - 1); +registry = __tco_0; +remaining_passes = __tco_1; +continue; +} +} +} +} } -pub fn check_service_field_access_node( - base_type: &Rc, - field: String, - service_registry: Rc>>>>, - source_indices: Rc>>, -) -> Option> { - if ((base_type.connective.clone() == Connective::NoConnective) - && ((base_type.children.clone().len() as i64) == 0)) - { +pub fn check_service_field_access_node(base_type: &Rc, field: String, service_registry: Rc>>>>, source_indices: Rc>>) -> Option> { + if ((base_type.connective.clone() == Connective::NoConnective) && ((base_type.children.clone().len() as i64) == 0)) { { - let path = v2_rt::concat( - v2_rt::concat( - authored_name_at(source_indices, &base_type), - ".".to_string(), - ), - field, - ); - match v2_rt::map_get(&service_registry, path.clone()) { - Some(_) => Some(nominal_type_ref(&path)), - None => None, - } - } + let path = v2_rt::concat(v2_rt::concat(authored_name_at(source_indices, &base_type), ".".to_string()), field); +match v2_rt::map_get(&service_registry, path.clone()) { + Some(_) => Some(nominal_type_ref(&path)), + None => None, +} +} } else { None } } -pub fn check_service_method_call_node( - receiver_type: &Rc, - method: String, - service_registry: Rc>>>>, - source_indices: Rc>>, -) -> Option> { - if ((receiver_type.connective.clone() == Connective::NoConnective) - && ((receiver_type.children.clone().len() as i64) == 0)) - { - match v2_rt::map_get( - &service_registry, - authored_name_at(source_indices, &receiver_type), - ) { - Some(ops) => { - let matching = Rc::new({ - let mut __result = Vec::new(); - for op in ops.clone().iter().cloned() { - if (op.name.clone().as_str() == method.clone().as_str()) { - __result.push(op); - } - } - __result - }); - match matching.first().cloned() { - Some(op) => { - if ((op.outputs.clone().len() as i64) == 0) { - Some(Rc::new(ServiceMethodResult { - result_type: unit_type(), - op_params: op.params.clone(), - })) - } else { - Some(Rc::new(ServiceMethodResult { - result_type: Rc::new(Node { - name: "".to_string(), - span: no_span(), - ident_span: None, - children: Rc::new({ - let mut __result = Vec::new(); - for f in op.outputs.clone().iter().cloned() { - __result.push(Rc::new(Node { - name: f.name.clone(), - span: f.span.clone(), - ident_span: f.ident_span.clone(), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: param_node_type_expr(&f), - })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - })); - } - __result - }), - connective: Connective::Conj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - op_params: op.params.clone(), - })) - } - } - None => None, - } - } - None => None, - } +pub fn check_service_method_call_node(receiver_type: &Rc, method: String, service_registry: Rc>>>>, source_indices: Rc>>) -> Option> { + if ((receiver_type.connective.clone() == Connective::NoConnective) && ((receiver_type.children.clone().len() as i64) == 0)) { + match v2_rt::map_get(&service_registry, authored_name_at(source_indices, &receiver_type)) { + Some(ops) => { + let matching = Rc::new({ let mut __result = Vec::new(); for op in ops.clone().iter().cloned() { if (op.name.clone().as_str() == method.clone().as_str()) { __result.push(op); } } __result }); +match matching.first().cloned() { + Some(op) => if ((op.outputs.clone().len() as i64) == 0) { + Some(Rc::new(ServiceMethodResult { + result_type: unit_type(), + op_params: op.params.clone(), +})) + } else { + Some(Rc::new(ServiceMethodResult { + result_type: Rc::new(Node { + name: "".to_string(), + span: no_span(), + ident_span: None, + children: Rc::new({ let mut __result = Vec::new(); for f in op.outputs.clone().iter().cloned() { __result.push(Rc::new(Node { + name: f.name.clone(), + span: f.span.clone(), + ident_span: f.ident_span.clone(), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: param_node_type_expr(&f), +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +})); } __result }), + connective: Connective::Conj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), + op_params: op.params.clone(), +})) + }, + None => None, +} +}, + None => None, +} } else { None } } -pub fn service_op_entry( - child: &Rc, - source_indices: &Rc>>, -) -> Rc { +pub fn service_op_entry(child: &Rc, source_indices: &Rc>>) -> Rc { Rc::new(OpEntry { - name: authored_name_at(source_indices.clone(), &child), - outputs: inferred_to_outputs( - &child.inferred.clone(), - child.span.clone(), - source_indices.clone(), - ), - params: child.params.clone(), - }) + name: authored_name_at(source_indices.clone(), &child), + outputs: inferred_to_outputs(&child.inferred.clone(), child.span.clone(), source_indices.clone()), + params: child.params.clone(), +}) } diff --git a/src/v2/stage0/src/v2_compiler_infer_sigs.rs b/src/v2/stage0/src/v2_compiler_infer_sigs.rs index 31d6c47dcbe..5cdd9f3214c 100644 --- a/src/v2/stage0/src/v2_compiler_infer_sigs.rs +++ b/src/v2/stage0/src/v2_compiler_infer_sigs.rs @@ -1,20 +1,17 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_sigs -pub use crate::std_induction::SubValueRelation; -use crate::std_induction::SubValueRelation::*; -pub use crate::v2_compiler_infer_types::emit_map_has; -use crate::v2_rt; -use crate::v2_std_core::CompilerDiagnostic::MissingAnnotation; -use crate::v2_std_core::ExprData::ExprCall; -pub use crate::v2_std_core::{ - authored_name_at, expr_call_func_at, make_error_node, no_span, CompilerDiagnostic, - DeclaredFuncSig, ErrorNode, ExprData, NewlineIndex, Node, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::v2_std_core::{Node, ExprData, expr_call_func_at, ErrorNode, make_error_node, no_span, DeclaredFuncSig, NewlineIndex, authored_name_at, CompilerDiagnostic}; +use crate::v2_std_core::ExprData::{ExprCall}; +use crate::v2_std_core::CompilerDiagnostic::{MissingAnnotation}; +pub use crate::v2_compiler_infer_types::{emit_map_has}; +pub use crate::std_induction::{SubValueRelation}; +use crate::std_induction::SubValueRelation::*; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct ResolvedFuncSig { @@ -23,8 +20,7 @@ pub struct ResolvedFuncSig { pub inferred: Rc, pub is_async: bool, pub output_provenance: Rc>>>>, - pub variant_provenance: - Rc>>>>>>, + pub variant_provenance: Rc>>>>>>, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -50,457 +46,191 @@ pub struct CallEdge { pub callee: String, } -pub fn collect_func_call_edges( - items: Rc>>, - local_func_set: Rc>, - source_indices: Rc>>, -) -> Rc>> { - Rc::new({ - let mut __result = Vec::new(); - for item in items.iter().cloned() { - __result.extend( - (*if (((item.params.clone().len() as i64) > 0) && (item.body.clone() != None)) { - collect_calls_in_expr( - &authored_name_at(source_indices.clone(), &item), - &item.body.clone().clone().unwrap(), - &local_func_set, - &source_indices, - ) - } else { - Rc::new(vec![]) - }) - .iter() - .cloned(), - ); - } - __result - }) +pub fn collect_func_call_edges(items: Rc>>, local_func_set: Rc>, source_indices: Rc>>) -> Rc>> { + Rc::new({ let mut __result = Vec::new(); for item in items.iter().cloned() { __result.extend((*if (((item.params.clone().len() as i64) > 0) && (item.body.clone() != None)) { + collect_calls_in_expr(&authored_name_at(source_indices.clone(), &item), &item.body.clone().clone().unwrap(), &local_func_set, &source_indices) + } else { + Rc::new(vec![]) + }).iter().cloned()); } __result }) } -pub fn collect_calls_in_expr( - caller: &String, - texpr: &Rc, - local_func_set: &Rc>, - source_indices: &Rc>>, -) -> Rc>> { +pub fn collect_calls_in_expr(caller: &String, texpr: &Rc, local_func_set: &Rc>, source_indices: &Rc>>) -> Rc>> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let this_edges = match (*texpr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { + { + let this_edges = match (*texpr.expr_data.clone()).clone() { + ExprData::ExprCall { .. } => { let f = expr_call_func_at(texpr.clone(), source_indices.clone()); - if emit_map_has(local_func_set.clone(), f.clone()) { +if emit_map_has(local_func_set.clone(), f.clone()) { Rc::new(vec![Rc::new(CallEdge { - caller: caller.clone(), - callee: f.clone(), - })]) + caller: caller.clone(), + callee: f.clone(), +})]) } else { Rc::new(vec![]) } - } - _ => Rc::new(vec![]), - }; - let child_edges = Rc::new({ - let mut __result = Vec::new(); - for child in texpr.children.clone().iter().cloned() { - __result.extend( - (*collect_calls_in_expr(&caller, &child, &local_func_set, &source_indices)) - .iter() - .cloned(), - ); - } - __result - }); - let result = v2_rt::concat(this_edges, child_edges); - result +}, + _ => Rc::new(vec![]), +}; +let child_edges = Rc::new({ let mut __result = Vec::new(); for child in texpr.children.clone().iter().cloned() { __result.extend((*collect_calls_in_expr(&caller, &child, &local_func_set, &source_indices)).iter().cloned()); } __result }); +let result = v2_rt::concat(this_edges, child_edges); +result +} }) } -pub fn func_reaches_self( - root: String, - current: &String, - call_edges: &Rc>>, - visited: &Rc>, -) -> bool { +pub fn func_reaches_self(root: String, current: &String, call_edges: &Rc>>, visited: &Rc>) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { if emit_map_has(visited.clone(), current.clone()) { false } else { { let next_visited = v2_rt::rc_map_insert(visited.clone(), current.clone(), true); - let callees = Rc::new({ - let mut __result = Vec::new(); - for e in Rc::new({ - let mut __result = Vec::new(); - for e in call_edges.clone().iter().cloned() { - if (e.caller.clone().as_str() == current.clone().as_str()) { - __result.push(e); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(e.callee.clone()); - } - __result - }); - { - let mut __found = false; - for c in callees.iter().cloned() { - if if (c.clone().as_str() == root.clone().as_str()) { - true - } else { - func_reaches_self(root.clone(), &c, &call_edges, &next_visited) - } { - __found = true; - break; - } - } - __found - } - } +let callees = Rc::new({ let mut __result = Vec::new(); for e in Rc::new({ let mut __result = Vec::new(); for e in call_edges.clone().iter().cloned() { if (e.caller.clone().as_str() == current.clone().as_str()) { __result.push(e); } } __result }).iter().cloned() { __result.push(e.callee.clone()); } __result }); +{ let mut __found = false; for c in callees.iter().cloned() { if if (c.clone().as_str() == root.clone().as_str()) { + true + } else { + func_reaches_self(root.clone(), &c, &call_edges, &next_visited) + } { __found = true; break; } } __found } +} } }) } pub fn build_name_set(names: Rc>) -> Rc> { - names.iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, name: String| { - v2_rt::rc_map_insert(acc, name.clone(), true) - }, - ) + names.iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, name.clone(), true)) } -pub fn collect_parent_resolved_sigs( - declared_sigs: Rc>>, - local_func_set: Rc>, -) -> Rc>> { - Rc::new(v2_rt::map_values(&declared_sigs)) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, dsig: Rc| { - if emit_map_has(local_func_set.clone(), dsig.name.clone()) { - acc.clone() - } else { - if (dsig.inferred.clone() != None) { - v2_rt::rc_map_insert( - acc.clone(), - dsig.name.clone(), - declared_to_resolved(&dsig), - ) - } else { - acc.clone() - } - } - }, - ) +pub fn collect_parent_resolved_sigs(declared_sigs: Rc>>, local_func_set: Rc>) -> Rc>> { + Rc::new(v2_rt::map_values(&declared_sigs)).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, dsig: Rc| if emit_map_has(local_func_set.clone(), dsig.name.clone()) { + acc.clone() + } else { + if (dsig.inferred.clone() != None) { + v2_rt::rc_map_insert(acc.clone(), dsig.name.clone(), declared_to_resolved(&dsig)) + } else { + acc.clone() + } + }) } pub fn declared_to_resolved(dsig: &Rc) -> Rc { Rc::new(ResolvedFuncSig { - name: dsig.name.clone(), - params: dsig.params.clone(), - inferred: dsig.inferred.clone().clone().unwrap(), - is_async: dsig.is_async.clone(), - output_provenance: dsig.output_provenance.clone(), - variant_provenance: dsig.variant_provenance.clone(), - }) + name: dsig.name.clone(), + params: dsig.params.clone(), + inferred: dsig.inferred.clone().clone().unwrap(), + is_async: dsig.is_async.clone(), + output_provenance: dsig.output_provenance.clone(), + variant_provenance: dsig.variant_provenance.clone(), +}) } -pub fn merge_remaining_declared( - declared_sigs: Rc>>, - resolved: Rc>>, -) -> Rc>> { - Rc::new(v2_rt::map_values(&declared_sigs)) - .iter() - .cloned() - .fold( - resolved, - |acc: Rc>>, dsig: Rc| { - if (dsig.inferred.clone() != None) { - v2_rt::rc_map_insert( - acc.clone(), - dsig.name.clone(), - declared_to_resolved(&dsig), - ) - } else { - acc.clone() - } - }, - ) +pub fn merge_remaining_declared(declared_sigs: Rc>>, resolved: Rc>>) -> Rc>> { + Rc::new(v2_rt::map_values(&declared_sigs)).iter().cloned().fold(resolved, |acc: Rc>>, dsig: Rc| if (dsig.inferred.clone() != None) { + v2_rt::rc_map_insert(acc.clone(), dsig.name.clone(), declared_to_resolved(&dsig)) + } else { + acc.clone() + }) } -pub fn topo_resolve_loop( - mut remaining: Rc>, - mut resolved: Rc>>, - mut declared_sigs: Rc>>, - mut call_edges: Rc>>, - mut local_func_set: Rc>, - mut module_name: String, - mut diagnostics: Rc>>, - mut fuel: i64, -) -> Rc { +pub fn topo_resolve_loop(mut remaining: Rc>, mut resolved: Rc>>, mut declared_sigs: Rc>>, mut call_edges: Rc>>, mut local_func_set: Rc>, mut module_name: String, mut diagnostics: Rc>>, mut fuel: i64) -> Rc { loop { if ((remaining.clone().len() as i64) == 0) { { - let all_resolved = Rc::new(v2_rt::map_values(&declared_sigs)) - .iter() - .cloned() - .fold( - resolved.clone(), - |acc: Rc>>, - dsig: Rc| { - if (dsig.inferred.clone() != None) { - v2_rt::rc_map_insert( - acc.clone(), - dsig.name.clone(), - declared_to_resolved(&dsig), - ) - } else { - acc.clone() - } - }, - ); - return Rc::new(ResolveFuncSigsResult { - func_env: Rc::new(ResolvedFuncEnv { - signatures: all_resolved.clone(), - }), - diagnostics: diagnostics.clone(), + let all_resolved = Rc::new(v2_rt::map_values(&declared_sigs)).iter().cloned().fold(resolved.clone(), |acc: Rc>>, dsig: Rc| if (dsig.inferred.clone() != None) { + v2_rt::rc_map_insert(acc.clone(), dsig.name.clone(), declared_to_resolved(&dsig)) + } else { + acc.clone() }); - } +return Rc::new(ResolveFuncSigsResult { + func_env: Rc::new(ResolvedFuncEnv { + signatures: all_resolved.clone(), +}), + diagnostics: diagnostics.clone(), +}) +} } - let ready = Rc::new({ - let mut __result = Vec::new(); - for fn_name in remaining.clone().iter().cloned() { - if { - let local_callees = Rc::new({ - let mut __result = Vec::new(); - for c in Rc::new({ - let mut __result = Vec::new(); - for e in Rc::new({ - let mut __result = Vec::new(); - for e in call_edges.clone().iter().cloned() { - if (e.caller.clone().as_str() == fn_name.clone().as_str()) { - __result.push(e); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(e.callee.clone()); - } - __result - }) - .iter() - .cloned() - { - if emit_map_has(local_func_set.clone(), c.clone()) { - __result.push(c); - } - } - __result - }); - { - let mut __all = true; - for c in local_callees.clone().iter().cloned() { - if !(v2_rt::map_get(&resolved, c.clone()) != None) { - __all = false; - break; - } - } - __all - } - } { - __result.push(fn_name); - } - } - __result - }); - if ((ready.clone().len() as i64) == 0) { +let ready = Rc::new({ let mut __result = Vec::new(); for fn_name in remaining.clone().iter().cloned() { if { + let local_callees = Rc::new({ let mut __result = Vec::new(); for c in Rc::new({ let mut __result = Vec::new(); for e in Rc::new({ let mut __result = Vec::new(); for e in call_edges.clone().iter().cloned() { if (e.caller.clone().as_str() == fn_name.clone().as_str()) { __result.push(e); } } __result }).iter().cloned() { __result.push(e.callee.clone()); } __result }).iter().cloned() { if emit_map_has(local_func_set.clone(), c.clone()) { __result.push(c); } } __result }); +{ let mut __all = true; for c in local_callees.clone().iter().cloned() { if !((v2_rt::map_get(&resolved, c.clone()) != None)) { __all = false; break; } } __all } +} { __result.push(fn_name); } } __result }); +if ((ready.clone().len() as i64) == 0) { { - let cycle_accum = remaining.clone().iter().cloned().fold( + let cycle_accum = remaining.clone().iter().cloned().fold(Rc::new(SigsAccum { + signatures: resolved.clone(), + diagnostics: Rc::new(vec![]), +}), |acc: Rc, fn_name: String| match v2_rt::map_get(&declared_sigs, fn_name.clone()) { + Some(dsig) => if (dsig.inferred.clone() != None) { + Rc::new(SigsAccum { + signatures: v2_rt::rc_map_insert(acc.signatures.clone(), fn_name.clone(), declared_to_resolved(&dsig)), + diagnostics: acc.diagnostics.clone(), +}) + } else { Rc::new(SigsAccum { - signatures: resolved.clone(), - diagnostics: Rc::new(vec![]), - }), - |acc: Rc, fn_name: String| match v2_rt::map_get( - &declared_sigs, - fn_name.clone(), - ) { - Some(dsig) => { - if (dsig.inferred.clone() != None) { - Rc::new(SigsAccum { - signatures: v2_rt::rc_map_insert( - acc.signatures.clone(), - fn_name.clone(), - declared_to_resolved(&dsig), - ), - diagnostics: acc.diagnostics.clone(), - }) - } else { - Rc::new(SigsAccum { - signatures: acc.signatures.clone(), - diagnostics: v2_rt::rc_list_push( - acc.diagnostics.clone(), - make_error_node( - Rc::new(CompilerDiagnostic::MissingAnnotation { - fn_name: fn_name.clone(), - what: "return type (recursive)".to_string(), - span: no_span(), - }), - module_name.clone(), - ), - ), - }) - } - } - None => acc.clone(), - }, - ); - let all_resolved = Rc::new(v2_rt::map_values(&declared_sigs)) - .iter() - .cloned() - .fold( - cycle_accum.signatures.clone(), - |acc: Rc>>, - dsig: Rc| { - if (dsig.inferred.clone() != None) { - v2_rt::rc_map_insert( - acc.clone(), - dsig.name.clone(), - declared_to_resolved(&dsig), - ) - } else { - acc.clone() - } - }, - ); - return Rc::new(ResolveFuncSigsResult { - func_env: Rc::new(ResolvedFuncEnv { - signatures: all_resolved.clone(), - }), - diagnostics: v2_rt::concat( - diagnostics.clone(), - cycle_accum.diagnostics.clone(), - ), + signatures: acc.signatures.clone(), + diagnostics: v2_rt::rc_list_push(acc.diagnostics.clone(), make_error_node(Rc::new(CompilerDiagnostic::MissingAnnotation { + fn_name: fn_name.clone(), + what: "return type (recursive)".to_string(), + span: no_span(), +}), module_name.clone())), +}) + }, + None => acc.clone(), +}); +let all_resolved = Rc::new(v2_rt::map_values(&declared_sigs)).iter().cloned().fold(cycle_accum.signatures.clone(), |acc: Rc>>, dsig: Rc| if (dsig.inferred.clone() != None) { + v2_rt::rc_map_insert(acc.clone(), dsig.name.clone(), declared_to_resolved(&dsig)) + } else { + acc.clone() }); - } +return Rc::new(ResolveFuncSigsResult { + func_env: Rc::new(ResolvedFuncEnv { + signatures: all_resolved.clone(), +}), + diagnostics: v2_rt::concat(diagnostics.clone(), cycle_accum.diagnostics.clone()), +}) +} } - let ready_accum = ready.clone().iter().cloned().fold( +let ready_accum = ready.clone().iter().cloned().fold(Rc::new(SigsAccum { + signatures: resolved.clone(), + diagnostics: diagnostics.clone(), +}), |acc: Rc, fn_name: String| match v2_rt::map_get(&declared_sigs, fn_name.clone()) { + Some(dsig) => if (dsig.inferred.clone() != None) { Rc::new(SigsAccum { - signatures: resolved.clone(), - diagnostics: diagnostics.clone(), - }), - |acc: Rc, fn_name: String| match v2_rt::map_get( - &declared_sigs, - fn_name.clone(), - ) { - Some(dsig) => { - if (dsig.inferred.clone() != None) { - Rc::new(SigsAccum { - signatures: v2_rt::rc_map_insert( - acc.signatures.clone(), - fn_name.clone(), - declared_to_resolved(&dsig), - ), - diagnostics: acc.diagnostics.clone(), - }) - } else { - Rc::new(SigsAccum { - signatures: acc.signatures.clone(), - diagnostics: v2_rt::rc_list_push( - acc.diagnostics.clone(), - make_error_node( - Rc::new(CompilerDiagnostic::MissingAnnotation { - fn_name: fn_name.clone(), - what: "return type".to_string(), - span: no_span(), - }), - module_name.clone(), - ), - ), - }) - } - } - None => acc.clone(), - }, - ); - let ready_set = ready.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, fn_name: String| { - v2_rt::rc_map_insert(acc, fn_name.clone(), true) - }, - ); - let next_remaining = Rc::new({ - let mut __result = Vec::new(); - for fn_name in remaining.clone().iter().cloned() { - if (emit_map_has(ready_set.clone(), fn_name.clone()) == false) { - __result.push(fn_name); - } - } - __result - }); - { + signatures: v2_rt::rc_map_insert(acc.signatures.clone(), fn_name.clone(), declared_to_resolved(&dsig)), + diagnostics: acc.diagnostics.clone(), +}) + } else { + Rc::new(SigsAccum { + signatures: acc.signatures.clone(), + diagnostics: v2_rt::rc_list_push(acc.diagnostics.clone(), make_error_node(Rc::new(CompilerDiagnostic::MissingAnnotation { + fn_name: fn_name.clone(), + what: "return type".to_string(), + span: no_span(), +}), module_name.clone())), +}) + }, + None => acc.clone(), +}); +let ready_set = ready.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, fn_name: String| v2_rt::rc_map_insert(acc, fn_name.clone(), true)); +let next_remaining = Rc::new({ let mut __result = Vec::new(); for fn_name in remaining.clone().iter().cloned() { if (emit_map_has(ready_set.clone(), fn_name.clone()) == false) { __result.push(fn_name); } } __result }); +{ let __tco_0 = next_remaining; - let __tco_1 = ready_accum.signatures.clone(); - let __tco_2 = ready_accum.diagnostics.clone(); - let __tco_3 = (fuel - 1); - remaining = __tco_0; - resolved = __tco_1; - diagnostics = __tco_2; - fuel = __tco_3; - continue; - } - } +let __tco_1 = ready_accum.signatures.clone(); +let __tco_2 = ready_accum.diagnostics.clone(); +let __tco_3 = (fuel - 1); +remaining = __tco_0; +resolved = __tco_1; +diagnostics = __tco_2; +fuel = __tco_3; +continue; +} +} } -pub fn resolve_func_sigs( - declared_sigs: &Rc>>, - items: &Rc>>, - module_name: String, - source_indices: &Rc>>, -) -> Rc { +pub fn resolve_func_sigs(declared_sigs: &Rc>>, items: &Rc>>, module_name: String, source_indices: &Rc>>) -> Rc { { - let local_func_names = Rc::new({ - let mut __result = Vec::new(); - for item in Rc::new({ - let mut __result = Vec::new(); - for item in items.clone().iter().cloned() { - if (((item.params.clone().len() as i64) > 0) && (item.body.clone() != None)) { - __result.push(item); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(authored_name_at(source_indices.clone(), &item)); - } - __result - }); - let local_func_set = build_name_set(local_func_names.clone()); - let call_edges = collect_func_call_edges( - items.clone(), - local_func_set.clone(), - source_indices.clone(), - ); - let parent_resolved = - collect_parent_resolved_sigs(declared_sigs.clone(), local_func_set.clone()); - topo_resolve_loop( - local_func_names.clone(), - parent_resolved, - declared_sigs.clone(), - call_edges, - local_func_set.clone(), - module_name, - Rc::new(vec![]), - (local_func_names.clone().len() as i64), - ) - } + let local_func_names = Rc::new({ let mut __result = Vec::new(); for item in Rc::new({ let mut __result = Vec::new(); for item in items.clone().iter().cloned() { if (((item.params.clone().len() as i64) > 0) && (item.body.clone() != None)) { __result.push(item); } } __result }).iter().cloned() { __result.push(authored_name_at(source_indices.clone(), &item)); } __result }); +let local_func_set = build_name_set(local_func_names.clone()); +let call_edges = collect_func_call_edges(items.clone(), local_func_set.clone(), source_indices.clone()); +let parent_resolved = collect_parent_resolved_sigs(declared_sigs.clone(), local_func_set.clone()); +topo_resolve_loop(local_func_names.clone(), parent_resolved, declared_sigs.clone(), call_edges, local_func_set.clone(), module_name, Rc::new(vec![]), (local_func_names.clone().len() as i64)) +} } diff --git a/src/v2/stage0/src/v2_compiler_infer_types.rs b/src/v2/stage0/src/v2_compiler_infer_types.rs index 139b9825b17..aa4ea191107 100644 --- a/src/v2/stage0/src/v2_compiler_infer_types.rs +++ b/src/v2/stage0/src/v2_compiler_infer_types.rs @@ -1,83 +1,64 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_types -use crate::std_algebra::AlgebraProfile::{ - ApproximateFieldProfile, BooleanAlgebraCollectionProfile, BooleanAlgebraProfile, - FreeMonoidCollectionProfile, FreeMonoidScalarProfile, OrderedRingProfile, - PartialFunctionProfile, -}; -use crate::std_algebra::AlgebraTypeTemplate::{ - AlgebraTypeVariable, ContainerOf, NamedTemplate, OptionalOf, ReceiverElement, ReceiverKey, - ReceiverSelf, ReceiverValue, TupleOf, -}; -use crate::std_algebra::ContainerSource::{Named, SameAsReceiver}; -pub use crate::std_algebra::{ - algebra_templates_for_profile, kernel_algebra_profile, AlgebraFieldTemplate, AlgebraProfile, - AlgebraTypeTemplate, ContainerSource, -}; -pub use crate::std_types::{ - container_expected_arity, container_param_name, is_container_type, SourceSpan, -}; -use crate::v2_rt; -use crate::v2_std_core::AlgebraFieldKind::{ - AlgAdd, AlgCompare, AlgJoin, AlgMeet, AlgMul, AlgQuotient, AlgReciprocal, AlgRemainder, -}; -use crate::v2_std_core::BinOp::{And, Eq, Ge, Gt, Le, Lt, Ne, NullCoalesce, Or}; -use crate::v2_std_core::Cardinality::{CardOptional, Required}; -use crate::v2_std_core::CompilerDiagnostic::InternalError; -use crate::v2_std_core::Connective::{Conj, Disj, NoConnective}; -use crate::v2_std_core::ExprData::{ExprError, ExprLiteral, NoExprData}; -use crate::v2_std_core::ExprErrorKind::{InternalExprError, SemanticExprError}; -use crate::v2_std_core::InferredNode::{CompilerError, Resolved, TypeVariable}; -use crate::v2_std_core::LiteralValue::{LitBool, LitFloat, LitInt, LitNull, LitStr}; -pub use crate::v2_std_core::{ - authored_name_at, bool_type, default_ident_span, error_type, find_child_named, float_type, - has_inferred, int_type, is_compiler_error, is_kernel_type, kernel_span, leaf_node_with_span, - make_error_node, make_expr_error_node, make_expr_node, make_param_node, make_span, no_span, - none_type, param_node_type_expr, string_type, unit_type, with_optional_cardinality, - with_required_cardinality, AlgebraFieldKind, BinOp, Cardinality, CompilerDiagnostic, - Connective, ErrorNode, ExprData, ExprErrorKind, InferredNode, LiteralValue, NewlineIndex, Node, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_types::{SourceSpan, is_container_type, container_expected_arity, container_param_name}; +pub use crate::std_algebra::{AlgebraProfile, AlgebraTypeTemplate, ContainerSource, AlgebraFieldTemplate, kernel_algebra_profile, algebra_templates_for_profile}; +use crate::std_algebra::AlgebraProfile::{OrderedRingProfile, ApproximateFieldProfile, BooleanAlgebraProfile, BooleanAlgebraCollectionProfile, FreeMonoidScalarProfile, FreeMonoidCollectionProfile, PartialFunctionProfile}; +use crate::std_algebra::AlgebraTypeTemplate::{ReceiverSelf, ReceiverElement, ReceiverKey, ReceiverValue, NamedTemplate, ContainerOf, OptionalOf, TupleOf, AlgebraTypeVariable}; +use crate::std_algebra::ContainerSource::{SameAsReceiver, Named}; +pub use crate::v2_std_core::{Node, make_param_node, param_node_type_expr, find_child_named, NewlineIndex, Connective, Cardinality, ExprErrorKind, make_expr_node, make_expr_error_node, LiteralValue, is_kernel_type, BinOp, AlgebraFieldKind, InferredNode, has_inferred, is_compiler_error, leaf_node_with_span, no_span, make_span, with_optional_cardinality, with_required_cardinality, unit_type, bool_type, string_type, int_type, float_type, none_type, error_type, default_ident_span, kernel_span, authored_name_at, ErrorNode, make_error_node, ExprData, CompilerDiagnostic}; +use crate::v2_std_core::Connective::{Conj, Disj, NoConnective}; +use crate::v2_std_core::Cardinality::{Required, CardOptional}; +use crate::v2_std_core::ExprData::{NoExprData, ExprLiteral, ExprError}; +use crate::v2_std_core::ExprErrorKind::{SemanticExprError, InternalExprError}; +use crate::v2_std_core::LiteralValue::{LitStr, LitInt, LitFloat, LitBool, LitNull}; +use crate::v2_std_core::BinOp::{Eq, Ne, Lt, Gt, Le, Ge, And, Or, NullCoalesce}; +use crate::v2_std_core::AlgebraFieldKind::{AlgAdd, AlgMul, AlgReciprocal, AlgQuotient, AlgRemainder, AlgCompare, AlgMeet, AlgJoin}; +use crate::v2_std_core::InferredNode::{Resolved, CompilerError, TypeVariable}; +use crate::v2_std_core::CompilerDiagnostic::{InternalError}; pub fn is_type_variable(inferred: Rc) -> bool { match (*inferred).clone() { - InferredNode::TypeVariable { .. } => true, - _ => false, - } + InferredNode::TypeVariable { .. } => true, + _ => false, +} } pub fn type_variable_node(id: String) -> Rc { Rc::new(Node { - name: "".to_string(), - span: make_span(0, 0), - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::TypeVariable { id: id })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) + name: "".to_string(), + span: make_span(0, 0), + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::TypeVariable { + id: id, +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) } pub fn resolved_type(n: Rc) -> Rc { match n.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => rt.clone(), - _ => error_type(), - } + Some(InferredNode::Resolved { node: rt, .. }) => rt.clone(), + _ => error_type(), +} } pub fn child_type_node(ch: &Rc) -> Rc { @@ -90,34 +71,27 @@ pub fn child_type_node(ch: &Rc) -> Rc { pub fn child_type_at(n: Rc, index: i64) -> Option> { match n.children.clone().get(index as usize).cloned() { - Some(ch) => Some(child_type_node(&ch)), - None => None, - } + Some(ch) => Some(child_type_node(&ch)), + None => None, +} } -pub fn node_is_collection( - n: &Rc, - source_indices: Rc>>, -) -> bool { - ((((n.children.clone().len() as i64) > 0) - && (n.connective.clone() == Connective::NoConnective)) - && is_container_type(authored_name_at(source_indices, &n))) +pub fn node_is_collection(n: &Rc, source_indices: Rc>>) -> bool { + ((((n.children.clone().len() as i64) > 0) && (n.connective.clone() == Connective::NoConnective)) && is_container_type(authored_name_at(source_indices, &n))) } -pub fn node_is_keyed_collection( - n: &Rc, - source_indices: Rc>>, -) -> bool { +pub fn node_is_keyed_collection(n: &Rc, source_indices: Rc>>) -> bool { (node_is_collection(&n, source_indices) && ((n.children.clone().len() as i64) == 2)) } -pub fn node_is_element_collection( - n: &Rc, - source_indices: Rc>>, -) -> bool { +pub fn node_is_element_collection(n: &Rc, source_indices: Rc>>) -> bool { (node_is_collection(&n, source_indices) && ((n.children.clone().len() as i64) == 1)) } +pub fn node_is_set_collection(n: &Rc, source_indices: &Rc>>) -> bool { + (node_is_element_collection(&n, source_indices.clone()) && (authored_name_at(source_indices.clone(), &n).as_str() == "Set".to_string().as_str())) +} + pub fn is_product_type(n: Rc) -> bool { (n.connective.clone() == Connective::Conj) } @@ -134,160 +108,190 @@ pub fn is_unit_like(n: &Rc) -> bool { ((n.connective.clone() == Connective::Conj) && ((n.children.clone().len() as i64) == 0)) } -pub fn is_fully_resolved( - n: &Rc, - source_indices: &Rc>>, -) -> bool { +pub fn is_fully_resolved(n: &Rc, source_indices: &Rc>>) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let self_is_type_var = match n.inferred.clone() { - Some(inf) => is_type_variable(inf.clone()), - None => false, - }; - if self_is_type_var { - false - } else { - { - let under_param = - match container_expected_arity(authored_name_at(source_indices.clone(), &n)) { - Some(expected) => ((n.children.clone().len() as i64) < expected.clone()), - None => false, - }; - if under_param { - false - } else { - { - let mut __all = true; - for ch in n.children.clone().iter().cloned() { - if !(is_fully_resolved(&child_type_node(&ch), &source_indices)) { - __all = false; - break; - } - } - __all + { + let self_is_type_var = match n.inferred.clone() { + Some(inf) => is_type_variable(inf.clone()), + None => false, +}; +if self_is_type_var { + false + } else { + { + let under_param = match container_expected_arity(authored_name_at(source_indices.clone(), &n)) { + Some(expected) => ((n.children.clone().len() as i64) < expected.clone()), + None => false, +}; +if under_param { + false + } else { + { let mut __all = true; for ch in n.children.clone().iter().cloned() { if !(is_fully_resolved(&child_type_node(&ch), &source_indices)) { __all = false; break; } } __all } } - } +} } - } +} }) } pub fn bare_map_node() -> Option> { match container_param_name("Map".to_string(), 0) { - Some(key_id) => match container_param_name("Map".to_string(), 1) { - Some(val_id) => Some(Rc::new(Node { - name: "Map".to_string(), - span: make_span(0, 0), - ident_span: Some(make_span(0, 0)), - children: Rc::new(vec![ - Rc::new(Node { - name: key_id.clone(), - span: make_span(0, 0), - ident_span: Some(make_span(0, 0)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: type_variable_node(key_id.clone()), - })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - Rc::new(Node { - name: val_id.clone(), - span: make_span(0, 0), - ident_span: Some(make_span(0, 0)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: type_variable_node(val_id.clone()), - })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - ]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - })), - None => None, - }, - None => None, - } + Some(key_id) => match container_param_name("Map".to_string(), 1) { + Some(val_id) => Some(Rc::new(Node { + name: "Map".to_string(), + span: make_span(0, 0), + ident_span: Some(make_span(0, 0)), + children: Rc::new(vec![Rc::new(Node { + name: key_id.clone(), + span: make_span(0, 0), + ident_span: Some(make_span(0, 0)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: type_variable_node(key_id.clone()), +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), Rc::new(Node { + name: val_id.clone(), + span: make_span(0, 0), + ident_span: Some(make_span(0, 0)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: type_variable_node(val_id.clone()), +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +})]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +})), + None => None, +}, + None => None, +} +} + +pub fn bare_set_node() -> Option> { + match container_param_name("Set".to_string(), 0) { + Some(elem_id) => Some(Rc::new(Node { + name: "Set".to_string(), + span: make_span(0, 0), + ident_span: Some(make_span(0, 0)), + children: Rc::new(vec![Rc::new(Node { + name: elem_id.clone(), + span: make_span(0, 0), + ident_span: Some(make_span(0, 0)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: type_variable_node(elem_id.clone()), +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +})]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +})), + None => None, +} } pub fn kernel_container_profile_miss_diagnostic(kind_name: String) -> Rc { { let msg = v2_rt::concat("missing kernel container profile: ".to_string(), kind_name); - make_error_node( - Rc::new(CompilerDiagnostic::InternalError { - message: msg, - span: make_span(0, 0), - }), - "v2.compiler.infer_types".to_string(), - ) - } +make_error_node(Rc::new(CompilerDiagnostic::InternalError { + message: msg, + span: make_span(0, 0), +}), "v2.compiler.infer_types".to_string()) +} } pub fn missing_kernel_container_profile_type(kind_name: String) -> Rc { { let msg = v2_rt::concat("missing kernel container profile: ".to_string(), kind_name); - Rc::new(Node { - name: "".to_string(), - span: make_span(0, 0), - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::CompilerError { - message: msg.clone(), - span: make_span(0, 0), - })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::ExprError { - kind: ExprErrorKind::InternalExprError, - message: msg.clone(), - }), - ident: None, - }) - } +Rc::new(Node { + name: "".to_string(), + span: make_span(0, 0), + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::CompilerError { + message: msg.clone(), + span: make_span(0, 0), +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::ExprError { + kind: ExprErrorKind::InternalExprError, + message: msg.clone(), +}), + ident: None, +}) +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -298,318 +302,302 @@ pub struct KernelTypeBuild { pub fn make_container_type(kind_name: &String, element: Rc) -> Rc { match container_param_name(kind_name.clone(), 0) { - Some(param_name) => Rc::new(KernelTypeBuild { - ty: Rc::new(Node { - name: kind_name.clone(), - span: kernel_span(&kind_name), - ident_span: Some(kernel_span(&kind_name)), - children: Rc::new(vec![Rc::new(Node { - name: param_name.clone(), - span: kernel_span(¶m_name), - ident_span: Some(kernel_span(¶m_name)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { node: element })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - })]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - diagnostics: Rc::new(vec![]), - }), - None => Rc::new(KernelTypeBuild { - ty: missing_kernel_container_profile_type(kind_name.clone()), - diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic( - kind_name.clone(), - )]), - }), - } + Some(param_name) => Rc::new(KernelTypeBuild { + ty: Rc::new(Node { + name: kind_name.clone(), + span: kernel_span(&kind_name), + ident_span: Some(kernel_span(&kind_name)), + children: Rc::new(vec![Rc::new(Node { + name: param_name.clone(), + span: kernel_span(¶m_name), + ident_span: Some(kernel_span(¶m_name)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: element, +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +})]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), + diagnostics: Rc::new(vec![]), +}), + None => Rc::new(KernelTypeBuild { + ty: missing_kernel_container_profile_type(kind_name.clone()), + diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic(kind_name.clone())]), +}), +} } pub fn make_map_type(key: Rc, value: Rc) -> Rc { match container_param_name("Map".to_string(), 0) { - Some(key_name) => match container_param_name("Map".to_string(), 1) { - Some(val_name) => Rc::new(KernelTypeBuild { - ty: Rc::new(Node { - name: "Map".to_string(), - span: kernel_span(&"Map".to_string()), - ident_span: Some(kernel_span(&"Map".to_string())), - children: Rc::new(vec![ - Rc::new(Node { - name: key_name.clone(), - span: kernel_span(&key_name), - ident_span: Some(kernel_span(&key_name)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { node: key })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - Rc::new(Node { - name: val_name.clone(), - span: kernel_span(&val_name), - ident_span: Some(kernel_span(&val_name)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { node: value })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - ]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - diagnostics: Rc::new(vec![]), - }), - None => Rc::new(KernelTypeBuild { - ty: missing_kernel_container_profile_type("Map".to_string()), - diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic( - "Map".to_string(), - )]), - }), - }, - None => Rc::new(KernelTypeBuild { - ty: missing_kernel_container_profile_type("Map".to_string()), - diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic( - "Map".to_string(), - )]), - }), - } + Some(key_name) => match container_param_name("Map".to_string(), 1) { + Some(val_name) => Rc::new(KernelTypeBuild { + ty: Rc::new(Node { + name: "Map".to_string(), + span: kernel_span(&"Map".to_string()), + ident_span: Some(kernel_span(&"Map".to_string())), + children: Rc::new(vec![Rc::new(Node { + name: key_name.clone(), + span: kernel_span(&key_name), + ident_span: Some(kernel_span(&key_name)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: key, +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), Rc::new(Node { + name: val_name.clone(), + span: kernel_span(&val_name), + ident_span: Some(kernel_span(&val_name)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: value, +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +})]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), + diagnostics: Rc::new(vec![]), +}), + None => Rc::new(KernelTypeBuild { + ty: missing_kernel_container_profile_type("Map".to_string()), + diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic("Map".to_string())]), +}), +}, + None => Rc::new(KernelTypeBuild { + ty: missing_kernel_container_profile_type("Map".to_string()), + diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic("Map".to_string())]), +}), +} } pub fn make_callable_type(func_params: Rc>>, ret: Rc) -> Rc { Rc::new(Node { - name: "Callable".to_string(), - span: kernel_span(&"Callable".to_string()), - ident_span: Some(kernel_span(&"Callable".to_string())), - children: Rc::new(vec![]), - connective: Connective::Arrow, - params: func_params, - inferred: Some(Rc::new(InferredNode::Resolved { node: ret })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) + name: "Callable".to_string(), + span: kernel_span(&"Callable".to_string()), + ident_span: Some(kernel_span(&"Callable".to_string())), + children: Rc::new(vec![]), + connective: Connective::Arrow, + params: func_params, + inferred: Some(Rc::new(InferredNode::Resolved { + node: ret, +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) } pub fn make_tuple_type(first: Rc, second: Rc) -> Rc { Rc::new(Node { - name: "".to_string(), - span: make_span(0, 0), - ident_span: None, - children: Rc::new(vec![ - Rc::new(Node { - name: "first".to_string(), - span: kernel_span(&"first".to_string()), - ident_span: Some(kernel_span(&"first".to_string())), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { node: first })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - Rc::new(Node { - name: "second".to_string(), - span: kernel_span(&"second".to_string()), - ident_span: Some(kernel_span(&"second".to_string())), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { node: second })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - ]), - connective: Connective::Conj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) + name: "".to_string(), + span: make_span(0, 0), + ident_span: None, + children: Rc::new(vec![Rc::new(Node { + name: "first".to_string(), + span: kernel_span(&"first".to_string()), + ident_span: Some(kernel_span(&"first".to_string())), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: first, +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), Rc::new(Node { + name: "second".to_string(), + span: kernel_span(&"second".to_string()), + ident_span: Some(kernel_span(&"second".to_string())), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: second, +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +})]), + connective: Connective::Conj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) } pub fn algebra_value_field(name: &String, type_node: Rc) -> Rc { Rc::new(Node { - name: name.clone(), - span: kernel_span(&name), - ident_span: Some(kernel_span(&name)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { node: type_node })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) + name: name.clone(), + span: kernel_span(&name), + ident_span: Some(kernel_span(&name)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: type_node, +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) } -pub fn algebra_method_field( - name: &String, - param_types: Rc>>, - return_type: Rc, -) -> Rc { +pub fn algebra_method_field(name: &String, param_types: Rc>>, return_type: Rc) -> Rc { { - let params = Rc::new({ - let mut __result = Vec::new(); - for t in param_types.iter().cloned() { - __result.push(make_param_node( - &"_".to_string(), - t.clone(), - None, - no_span(), - no_span(), - )); - } - __result - }); - let callable = make_callable_type(params, return_type); - Rc::new(Node { - name: name.clone(), - span: kernel_span(&name), - ident_span: Some(kernel_span(&name)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { node: callable })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) - } + let params = Rc::new({ let mut __result = Vec::new(); for t in param_types.iter().cloned() { __result.push(make_param_node(&"_".to_string(), t.clone(), None, no_span(), no_span())); } __result }); +let callable = make_callable_type(params, return_type); +Rc::new(Node { + name: name.clone(), + span: kernel_span(&name), + ident_span: Some(kernel_span(&name)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: callable, +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) +} } -pub fn enrich_base_with_fields( - name: String, - base: &Rc, - fields: Rc>>, -) -> Rc { +pub fn enrich_base_with_fields(name: String, base: &Rc, fields: Rc>>) -> Rc { Rc::new(Node { - name: name, - span: base.span.clone(), - ident_span: base.ident_span.clone(), - children: fields, - connective: Connective::Conj, - params: base.params.clone(), - inferred: base.inferred.clone(), - return_cardinality: base.return_cardinality.clone(), - uses: base.uses.clone(), - body: base.body.clone(), - transport: base.transport.clone(), - properties: base.properties.clone(), - type_annotation: base.type_annotation.clone(), - is_self_recursive: base.is_self_recursive.clone(), - has_non_tail_self_call: base.has_non_tail_self_call.clone(), - match_pattern: base.match_pattern.clone(), - expr_data: base.expr_data.clone(), - ident: None, - }) + name: name, + span: base.span.clone(), + ident_span: base.ident_span.clone(), + children: fields, + connective: Connective::Conj, + params: base.params.clone(), + inferred: base.inferred.clone(), + return_cardinality: base.return_cardinality.clone(), + uses: base.uses.clone(), + body: base.body.clone(), + transport: base.transport.clone(), + properties: base.properties.clone(), + type_annotation: base.type_annotation.clone(), + is_self_recursive: base.is_self_recursive.clone(), + has_non_tail_self_call: base.has_non_tail_self_call.clone(), + match_pattern: base.match_pattern.clone(), + expr_data: base.expr_data.clone(), + ident: None, +}) } pub fn placeholder_type_node(name: String) -> Rc { @@ -620,748 +608,410 @@ pub fn nominal_type_ref(name: &String) -> Rc { leaf_node_with_span(&name, &kernel_span(&name)) } -pub fn algebra_child_or_placeholder( - base: Rc, - child_index: i64, - placeholder: String, -) -> Rc { - match Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - base.children - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - if (pair.0.clone() == child_index.clone()) { - __result.push(pair); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(pair.1.clone()); - } - __result - }) - .first() - .cloned() - { - Some(child) => child_type_node(&child), - None => type_variable_node(placeholder), - } +pub fn algebra_child_or_placeholder(base: Rc, child_index: i64, placeholder: String) -> Rc { + match Rc::new({ let mut __result = Vec::new(); for pair in Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(base.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (pair.0.clone() == child_index.clone()) { __result.push(pair); } } __result }).iter().cloned() { __result.push(pair.1.clone()); } __result }).first().cloned() { + Some(child) => child_type_node(&child), + None => type_variable_node(placeholder), +} } -pub fn instantiate_algebra_type( - template: Rc, - base: &Rc, - source_indices: &Rc>>, -) -> Rc { +pub fn instantiate_algebra_type(template: Rc, base: &Rc, source_indices: &Rc>>) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let elem = algebra_child_or_placeholder(base.clone(), 0, "T".to_string()); - let key_node = algebra_child_or_placeholder(base.clone(), 0, "K".to_string()); - let val_node = algebra_child_or_placeholder(base.clone(), 1, "V".to_string()); - match (*template).clone() { - AlgebraTypeTemplate::ReceiverSelf => Rc::new(KernelTypeBuild { - ty: base.clone(), - diagnostics: Rc::new(vec![]), - }), - AlgebraTypeTemplate::ReceiverElement => Rc::new(KernelTypeBuild { - ty: elem, - diagnostics: Rc::new(vec![]), - }), - AlgebraTypeTemplate::ReceiverKey => Rc::new(KernelTypeBuild { - ty: key_node, - diagnostics: Rc::new(vec![]), - }), - AlgebraTypeTemplate::ReceiverValue => Rc::new(KernelTypeBuild { - ty: val_node, - diagnostics: Rc::new(vec![]), - }), - AlgebraTypeTemplate::NamedTemplate { name: n, .. } => Rc::new(KernelTypeBuild { - ty: nominal_type_ref(&n), - diagnostics: Rc::new(vec![]), - }), - AlgebraTypeTemplate::AlgebraTypeVariable { id: var_id, .. } => { - Rc::new(KernelTypeBuild { - ty: type_variable_node(var_id.clone()), - diagnostics: Rc::new(vec![]), - }) - } - AlgebraTypeTemplate::ContainerOf { - source: src, - element: inner, - .. - } => { + { + let elem = algebra_child_or_placeholder(base.clone(), 0, "T".to_string()); +let key_node = algebra_child_or_placeholder(base.clone(), 0, "K".to_string()); +let val_node = algebra_child_or_placeholder(base.clone(), 1, "V".to_string()); +match (*template).clone() { + AlgebraTypeTemplate::ReceiverSelf => Rc::new(KernelTypeBuild { + ty: base.clone(), + diagnostics: Rc::new(vec![]), +}), + AlgebraTypeTemplate::ReceiverElement => Rc::new(KernelTypeBuild { + ty: elem, + diagnostics: Rc::new(vec![]), +}), + AlgebraTypeTemplate::ReceiverKey => Rc::new(KernelTypeBuild { + ty: key_node, + diagnostics: Rc::new(vec![]), +}), + AlgebraTypeTemplate::ReceiverValue => Rc::new(KernelTypeBuild { + ty: val_node, + diagnostics: Rc::new(vec![]), +}), + AlgebraTypeTemplate::NamedTemplate { name: n, .. } => Rc::new(KernelTypeBuild { + ty: nominal_type_ref(&n), + diagnostics: Rc::new(vec![]), +}), + AlgebraTypeTemplate::AlgebraTypeVariable { id: var_id, .. } => Rc::new(KernelTypeBuild { + ty: type_variable_node(var_id.clone()), + diagnostics: Rc::new(vec![]), +}), + AlgebraTypeTemplate::ContainerOf { source: src, element: inner, .. } => { let kind_name = match (*src.clone()).clone() { - ContainerSource::SameAsReceiver => { - authored_name_at(source_indices.clone(), &base) - } - ContainerSource::Named { name: n, .. } => n.clone(), - }; - let inner_b = instantiate_algebra_type(inner.clone(), &base, &source_indices); - let built = make_container_type(&kind_name, inner_b.ty.clone()); - Rc::new(KernelTypeBuild { - ty: built.ty.clone(), - diagnostics: v2_rt::concat( - inner_b.diagnostics.clone(), - built.diagnostics.clone(), - ), - }) - } - AlgebraTypeTemplate::OptionalOf { inner, .. } => { + ContainerSource::SameAsReceiver => authored_name_at(source_indices.clone(), &base), + ContainerSource::Named { name: n, .. } => n.clone(), +}; +let inner_b = instantiate_algebra_type(inner.clone(), &base, &source_indices); +let built = make_container_type(&kind_name, inner_b.ty.clone()); +Rc::new(KernelTypeBuild { + ty: built.ty.clone(), + diagnostics: v2_rt::concat(inner_b.diagnostics.clone(), built.diagnostics.clone()), +}) +}, + AlgebraTypeTemplate::OptionalOf { inner, .. } => { let ib = instantiate_algebra_type(inner.clone(), &base, &source_indices); - Rc::new(KernelTypeBuild { - ty: with_optional_cardinality(&ib.ty.clone()), - diagnostics: ib.diagnostics.clone(), - }) - } - AlgebraTypeTemplate::TupleOf { first, second, .. } => { +Rc::new(KernelTypeBuild { + ty: with_optional_cardinality(&ib.ty.clone()), + diagnostics: ib.diagnostics.clone(), +}) +}, + AlgebraTypeTemplate::TupleOf { first, second, .. } => { let fb = instantiate_algebra_type(first.clone(), &base, &source_indices); - let sb = instantiate_algebra_type(second.clone(), &base, &source_indices); - Rc::new(KernelTypeBuild { - ty: make_tuple_type(fb.ty.clone(), sb.ty.clone()), - diagnostics: v2_rt::concat(fb.diagnostics.clone(), sb.diagnostics.clone()), - }) - } - AlgebraTypeTemplate::CallableOf { - params: p, - return_type: r, - .. - } => { - let param_bs = Rc::new({ - let mut __result = Vec::new(); - for tp in p.clone().iter().cloned() { - __result.push(instantiate_algebra_type(tp.clone(), &base, &source_indices)); - } - __result - }); - let param_diags = Rc::new({ - let mut __result = Vec::new(); - for b in param_bs.clone().iter().cloned() { - __result.extend((*b.diagnostics.clone()).iter().cloned()); - } - __result - }); - let param_nodes = Rc::new({ - let mut __result = Vec::new(); - for b in param_bs.clone().iter().cloned() { - __result.push(b.ty.clone()); - } - __result - }); - let rb = instantiate_algebra_type(r.clone(), &base, &source_indices); - Rc::new(KernelTypeBuild { - ty: make_callable_type(param_nodes, rb.ty.clone()), - diagnostics: v2_rt::concat(param_diags, rb.diagnostics.clone()), - }) - } - } +let sb = instantiate_algebra_type(second.clone(), &base, &source_indices); +Rc::new(KernelTypeBuild { + ty: make_tuple_type(fb.ty.clone(), sb.ty.clone()), + diagnostics: v2_rt::concat(fb.diagnostics.clone(), sb.diagnostics.clone()), +}) +}, + AlgebraTypeTemplate::CallableOf { params: p, return_type: r, .. } => { + let param_bs = Rc::new({ let mut __result = Vec::new(); for tp in p.clone().iter().cloned() { __result.push(instantiate_algebra_type(tp.clone(), &base, &source_indices)); } __result }); +let param_diags = Rc::new({ let mut __result = Vec::new(); for b in param_bs.clone().iter().cloned() { __result.extend((*b.diagnostics.clone()).iter().cloned()); } __result }); +let param_nodes = Rc::new({ let mut __result = Vec::new(); for b in param_bs.clone().iter().cloned() { __result.push(b.ty.clone()); } __result }); +let rb = instantiate_algebra_type(r.clone(), &base, &source_indices); +Rc::new(KernelTypeBuild { + ty: make_callable_type(param_nodes, rb.ty.clone()), + diagnostics: v2_rt::concat(param_diags, rb.diagnostics.clone()), +}) +}, +} +} }) } -pub fn instantiate_algebra_field( - template: &Rc, - base: &Rc, - source_indices: &Rc>>, -) -> Rc { +pub fn instantiate_algebra_field(template: &Rc, base: &Rc, source_indices: &Rc>>) -> Rc { { - let param_bs = Rc::new({ - let mut __result = Vec::new(); - for tp in template.param_types.clone().iter().cloned() { - __result.push(instantiate_algebra_type(tp.clone(), &base, &source_indices)); - } - __result - }); - let param_types = Rc::new({ - let mut __result = Vec::new(); - for b in param_bs.clone().iter().cloned() { - __result.push(b.ty.clone()); - } - __result - }); - let param_diags = Rc::new({ - let mut __result = Vec::new(); - for b in param_bs.clone().iter().cloned() { - __result.extend((*b.diagnostics.clone()).iter().cloned()); - } - __result - }); - let return_b = - instantiate_algebra_type(template.return_type.clone(), &base, &source_indices); - let field_ty = if ((param_types.clone().len() as i64) > 0) { - algebra_method_field( - &template.name.clone(), - param_types.clone(), - return_b.ty.clone(), - ) + let param_bs = Rc::new({ let mut __result = Vec::new(); for tp in template.param_types.clone().iter().cloned() { __result.push(instantiate_algebra_type(tp.clone(), &base, &source_indices)); } __result }); +let param_types = Rc::new({ let mut __result = Vec::new(); for b in param_bs.clone().iter().cloned() { __result.push(b.ty.clone()); } __result }); +let param_diags = Rc::new({ let mut __result = Vec::new(); for b in param_bs.clone().iter().cloned() { __result.extend((*b.diagnostics.clone()).iter().cloned()); } __result }); +let return_b = instantiate_algebra_type(template.return_type.clone(), &base, &source_indices); +let field_ty = if ((param_types.clone().len() as i64) > 0) { + algebra_method_field(&template.name.clone(), param_types.clone(), return_b.ty.clone()) } else { algebra_value_field(&template.name.clone(), return_b.ty.clone()) }; - Rc::new(KernelTypeBuild { - ty: field_ty, - diagnostics: v2_rt::concat(param_diags, return_b.diagnostics.clone()), - }) - } +Rc::new(KernelTypeBuild { + ty: field_ty, + diagnostics: v2_rt::concat(param_diags, return_b.diagnostics.clone()), +}) +} } -pub fn enrich_kernel_type( - name: &String, - base: &Rc, - source_indices: Rc>>, -) -> Rc { +pub fn enrich_kernel_type(name: &String, base: &Rc, source_indices: Rc>>) -> Rc { { let profile = v2_rt::map_get(&kernel_algebra_profile(), name.clone()); - match profile { - Some(p) => { - let field_bs = Rc::new({ - let mut __result = Vec::new(); - for template in algebra_templates_for_profile(p.clone()).iter().cloned() { - __result.push(instantiate_algebra_field(&template, &base, &source_indices)); - } - __result - }); - let fields = Rc::new({ - let mut __result = Vec::new(); - for b in field_bs.clone().iter().cloned() { - __result.push(b.ty.clone()); - } - __result - }); - let field_diags = Rc::new({ - let mut __result = Vec::new(); - for b in field_bs.clone().iter().cloned() { - __result.extend((*b.diagnostics.clone()).iter().cloned()); - } - __result - }); - Rc::new(KernelTypeBuild { - ty: enrich_base_with_fields(name.clone(), &base, fields), - diagnostics: field_diags, - }) - } - None => Rc::new(KernelTypeBuild { - ty: base.clone(), - diagnostics: Rc::new(vec![]), - }), - } - } +match profile { + Some(p) => { + let field_bs = Rc::new({ let mut __result = Vec::new(); for template in algebra_templates_for_profile(p.clone()).iter().cloned() { __result.push(instantiate_algebra_field(&template, &base, &source_indices)); } __result }); +let fields = Rc::new({ let mut __result = Vec::new(); for b in field_bs.clone().iter().cloned() { __result.push(b.ty.clone()); } __result }); +let field_diags = Rc::new({ let mut __result = Vec::new(); for b in field_bs.clone().iter().cloned() { __result.extend((*b.diagnostics.clone()).iter().cloned()); } __result }); +Rc::new(KernelTypeBuild { + ty: enrich_base_with_fields(name.clone(), &base, fields), + diagnostics: field_diags, +}) +}, + None => Rc::new(KernelTypeBuild { + ty: base.clone(), + diagnostics: Rc::new(vec![]), +}), +} +} } -pub fn unify_template( - template: Rc, - concrete: &Rc, - receiver: &Rc, - subst: Rc>>, - source_indices: &Rc>>, -) -> Rc>> { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*template).clone() { - AlgebraTypeTemplate::AlgebraTypeVariable { id: var_id, .. } => { - if (v2_rt::map_get(&subst, var_id.clone()) != None) { - subst.clone() - } else { - v2_rt::rc_map_insert(subst.clone(), var_id.clone(), concrete.clone()) - } - } - AlgebraTypeTemplate::ReceiverSelf => { +pub fn unify_template(template: Rc, concrete: &Rc, receiver: &Rc, subst: Rc>>, source_indices: &Rc>>) -> Rc>> { + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { + match (*template).clone() { + AlgebraTypeTemplate::AlgebraTypeVariable { id: var_id, .. } => if (v2_rt::map_get(&subst, var_id.clone()) != None) { + subst.clone() + } else { + v2_rt::rc_map_insert(subst.clone(), var_id.clone(), concrete.clone()) + }, + AlgebraTypeTemplate::ReceiverSelf => { let s1 = match concrete.children.clone().first().cloned() { - Some(k) => { - if (v2_rt::map_get(&subst, "__key__".to_string()) != None) { - subst.clone() - } else { - v2_rt::rc_map_insert( - subst.clone(), - "__key__".to_string(), - child_type_node(&k), - ) - } - } - None => subst.clone(), - }; - match concrete.children.clone().get(1 as usize).cloned() { - Some(v) => { - if (v2_rt::map_get(&s1, "__value__".to_string()) != None) { - s1.clone() - } else { - v2_rt::rc_map_insert( - s1.clone(), - "__value__".to_string(), - child_type_node(&v), - ) - } - } - None => s1.clone(), - } - } - AlgebraTypeTemplate::ReceiverKey => { - if (v2_rt::map_get(&subst, "__key__".to_string()) != None) { + Some(k) => if (v2_rt::map_get(&subst, "__key__".to_string()) != None) { subst.clone() } else { - v2_rt::rc_map_insert(subst.clone(), "__key__".to_string(), concrete.clone()) - } - } - AlgebraTypeTemplate::ReceiverValue => { - if (v2_rt::map_get(&subst, "__value__".to_string()) != None) { - subst.clone() - } else { - v2_rt::rc_map_insert(subst.clone(), "__value__".to_string(), concrete.clone()) - } - } - AlgebraTypeTemplate::ReceiverElement => { - if (v2_rt::map_get(&subst, "__element__".to_string()) != None) { - subst.clone() + v2_rt::rc_map_insert(subst.clone(), "__key__".to_string(), child_type_node(&k)) + }, + None => subst.clone(), +}; +match concrete.children.clone().get(1 as usize).cloned() { + Some(v) => if (v2_rt::map_get(&s1, "__value__".to_string()) != None) { + s1.clone() } else { - v2_rt::rc_map_insert(subst.clone(), "__element__".to_string(), concrete.clone()) - } - } - AlgebraTypeTemplate::CallableOf { - return_type: ret_template, - .. - } => unify_template( - ret_template.clone(), - &concrete, - &receiver, - subst.clone(), - &source_indices, - ), - AlgebraTypeTemplate::ContainerOf { - source: src, - element: elem_template, - .. - } => { + v2_rt::rc_map_insert(s1.clone(), "__value__".to_string(), child_type_node(&v)) + }, + None => s1.clone(), +} +}, + AlgebraTypeTemplate::ReceiverKey => if (v2_rt::map_get(&subst, "__key__".to_string()) != None) { + subst.clone() + } else { + v2_rt::rc_map_insert(subst.clone(), "__key__".to_string(), concrete.clone()) + }, + AlgebraTypeTemplate::ReceiverValue => if (v2_rt::map_get(&subst, "__value__".to_string()) != None) { + subst.clone() + } else { + v2_rt::rc_map_insert(subst.clone(), "__value__".to_string(), concrete.clone()) + }, + AlgebraTypeTemplate::ReceiverElement => if (v2_rt::map_get(&subst, "__element__".to_string()) != None) { + subst.clone() + } else { + v2_rt::rc_map_insert(subst.clone(), "__element__".to_string(), concrete.clone()) + }, + AlgebraTypeTemplate::CallableOf { return_type: ret_template, .. } => unify_template(ret_template.clone(), &concrete, &receiver, subst.clone(), &source_indices), + AlgebraTypeTemplate::ContainerOf { source: src, element: elem_template, .. } => { let expected_name = match (*src.clone()).clone() { - ContainerSource::SameAsReceiver => { - authored_name_at(source_indices.clone(), &receiver) - } - ContainerSource::Named { name: n, .. } => n.clone(), - }; - if (authored_name_at(source_indices.clone(), &concrete).as_str() - != expected_name.as_str()) - { + ContainerSource::SameAsReceiver => authored_name_at(source_indices.clone(), &receiver), + ContainerSource::Named { name: n, .. } => n.clone(), +}; +if (authored_name_at(source_indices.clone(), &concrete).as_str() != expected_name.as_str()) { subst.clone() } else { match concrete.children.clone().first().cloned() { - Some(child) => unify_template( - elem_template.clone(), - &child_type_node(&child), - &receiver, - subst.clone(), - &source_indices, - ), - None => subst.clone(), - } + Some(child) => unify_template(elem_template.clone(), &child_type_node(&child), &receiver, subst.clone(), &source_indices), + None => subst.clone(), +} } - } - AlgebraTypeTemplate::OptionalOf { - inner: inner_template, - .. - } => match concrete.children.clone().first().cloned() { - Some(child) => unify_template( - inner_template.clone(), - &child_type_node(&child), - &receiver, - subst.clone(), - &source_indices, - ), - None => subst.clone(), - }, - AlgebraTypeTemplate::TupleOf { - first: ft, - second: st, - .. - } => { +}, + AlgebraTypeTemplate::OptionalOf { inner: inner_template, .. } => match concrete.children.clone().first().cloned() { + Some(child) => unify_template(inner_template.clone(), &child_type_node(&child), &receiver, subst.clone(), &source_indices), + None => subst.clone(), +}, + AlgebraTypeTemplate::TupleOf { first: ft, second: st, .. } => { let s2 = match concrete.children.clone().first().cloned() { - Some(c) => unify_template( - ft.clone(), - &child_type_node(&c), - &receiver, - subst.clone(), - &source_indices, - ), - None => subst.clone(), - }; - match concrete.children.clone().get(1 as usize).cloned() { - Some(c) => unify_template( - st.clone(), - &child_type_node(&c), - &receiver, - s2, - &source_indices, - ), - None => s2, - } - } - _ => subst.clone(), + Some(c) => unify_template(ft.clone(), &child_type_node(&c), &receiver, subst.clone(), &source_indices), + None => subst.clone(), +}; +match concrete.children.clone().get(1 as usize).cloned() { + Some(c) => unify_template(st.clone(), &child_type_node(&c), &receiver, s2, &source_indices), + None => s2, +} +}, + _ => subst.clone(), +} }) } pub fn is_receiver_self(t: Rc) -> bool { match (*t).clone() { - AlgebraTypeTemplate::ReceiverSelf => true, - _ => false, - } + AlgebraTypeTemplate::ReceiverSelf => true, + _ => false, +} } -pub fn build_type_substitution( - param_templates: &Rc>>, - arg_types: Rc>>, - receiver: Rc, - base_subst: Rc>>, - source_indices: Rc>>, -) -> Rc>> { +pub fn build_type_substitution(param_templates: &Rc>>, arg_types: Rc>>, receiver: Rc, base_subst: Rc>>, source_indices: Rc>>) -> Rc>> { { let first_is_self = match param_templates.clone().first().cloned() { - Some(t) => is_receiver_self(t.clone()), - None => false, - }; - let non_receiver_templates = if first_is_self { - Rc::new( - param_templates - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ) + Some(t) => is_receiver_self(t.clone()), + None => false, +}; +let non_receiver_templates = if first_is_self { + Rc::new(param_templates.clone().iter().cloned().skip(1 as usize).collect::>()) } else { param_templates.clone() }; - let pairs = Rc::new({ - let mut __result = Vec::new(); - for pair in Rc::new( - non_receiver_templates - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - if (pair.0.clone() < (arg_types.clone().len() as i64)) { - __result.push(pair); - } - } - __result - }); - pairs.iter().cloned().fold( - base_subst.clone(), - |subst: Rc>>, pair: (i64, Rc)| { - let arg_type = match Rc::new({ - let mut __result = Vec::new(); - for ap in Rc::new({ - let mut __result = Vec::new(); - for ap in Rc::new( - arg_types - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - if (ap.0.clone() == pair.0.clone()) { - __result.push(ap); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(ap.1.clone()); - } - __result - }) - .first() - .cloned() - { - Some(a) => a.clone(), - None => error_type(), - }; - unify_template(pair.1.clone(), &arg_type, &receiver, subst, &source_indices) - }, - ) - } +let pairs = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(non_receiver_templates.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (pair.0.clone() < (arg_types.clone().len() as i64)) { __result.push(pair); } } __result }); +pairs.iter().cloned().fold(base_subst.clone(), |subst: Rc>>, pair: (i64, Rc)| { + let arg_type = match Rc::new({ let mut __result = Vec::new(); for ap in Rc::new({ let mut __result = Vec::new(); for ap in Rc::new(arg_types.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (ap.0.clone() == pair.0.clone()) { __result.push(ap); } } __result }).iter().cloned() { __result.push(ap.1.clone()); } __result }).first().cloned() { + Some(a) => a.clone(), + None => error_type(), +}; +unify_template(pair.1.clone(), &arg_type, &receiver, subst, &source_indices) +}) +} } -pub fn apply_type_substitution( - template: Rc, - subst: &Rc>>, - receiver: &Rc, - source_indices: &Rc>>, -) -> Rc { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*template).clone() { - AlgebraTypeTemplate::AlgebraTypeVariable { id: var_id, .. } => { - match v2_rt::map_get(&subst, var_id.clone()) { - Some(resolved) => Rc::new(KernelTypeBuild { - ty: resolved.clone(), - diagnostics: Rc::new(vec![]), - }), - None => Rc::new(KernelTypeBuild { - ty: type_variable_node(var_id.clone()), - diagnostics: Rc::new(vec![]), - }), - } - } - AlgebraTypeTemplate::ReceiverSelf => { +pub fn apply_type_substitution(template: Rc, subst: &Rc>>, receiver: &Rc, source_indices: &Rc>>) -> Rc { + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { + match (*template).clone() { + AlgebraTypeTemplate::AlgebraTypeVariable { id: var_id, .. } => match v2_rt::map_get(&subst, var_id.clone()) { + Some(resolved) => Rc::new(KernelTypeBuild { + ty: resolved.clone(), + diagnostics: Rc::new(vec![]), +}), + None => Rc::new(KernelTypeBuild { + ty: type_variable_node(var_id.clone()), + diagnostics: Rc::new(vec![]), +}), +}, + AlgebraTypeTemplate::ReceiverSelf => { let receiver_name_str = authored_name_at(source_indices.clone(), &receiver); - let is_bare = (is_container_type(receiver_name_str.clone()) && { - let mut __all = true; - for ch in receiver.children.clone().iter().cloned() { - if !({ - let inner = child_type_node(&ch); - if (inner.inferred.clone() != None) { - is_type_variable(inner.inferred.clone().clone().unwrap()) - } else { - ((inner.ident_span.clone() == None) - || !is_kernel_type(authored_name_at( - source_indices.clone(), - &inner, - ))) - } - }) { - __all = false; - break; - } +let is_bare = (is_container_type(receiver_name_str.clone()) && { let mut __all = true; for ch in receiver.children.clone().iter().cloned() { if !({ + let inner = child_type_node(&ch); +if (inner.inferred.clone() != None) { + is_type_variable(inner.inferred.clone().clone().unwrap()) + } else { + ((inner.ident_span.clone() == None) || !is_kernel_type(authored_name_at(source_indices.clone(), &inner))) } - __all - }); - if is_bare { +}) { __all = false; break; } } __all }); +if is_bare { { let arity = container_expected_arity(receiver_name_str.clone()); - if (arity.clone() == Some(2)) { +if (arity.clone() == Some(2)) { match v2_rt::map_get(&subst, "__key__".to_string()) { - Some(key) => { - let val = match v2_rt::map_get(&subst, "__value__".to_string()) { - Some(v) => v.clone(), - None => type_variable_node("V".to_string()), - }; - make_map_type(key.clone(), val) - } - None => Rc::new(KernelTypeBuild { - ty: receiver.clone(), - diagnostics: Rc::new(vec![]), - }), - } + Some(key) => { + let val = match v2_rt::map_get(&subst, "__value__".to_string()) { + Some(v) => v.clone(), + None => type_variable_node("V".to_string()), +}; +make_map_type(key.clone(), val) +}, + None => Rc::new(KernelTypeBuild { + ty: receiver.clone(), + diagnostics: Rc::new(vec![]), +}), +} } else { if (arity.clone() == Some(1)) { match v2_rt::map_get(&subst, "__element__".to_string()) { - Some(elem) => make_container_type(&receiver_name_str, elem.clone()), - None => Rc::new(KernelTypeBuild { - ty: receiver.clone(), - diagnostics: Rc::new(vec![]), - }), - } + Some(elem) => make_container_type(&receiver_name_str, elem.clone()), + None => Rc::new(KernelTypeBuild { + ty: receiver.clone(), + diagnostics: Rc::new(vec![]), +}), +} } else { Rc::new(KernelTypeBuild { - ty: receiver.clone(), - diagnostics: Rc::new(vec![]), - }) + ty: receiver.clone(), + diagnostics: Rc::new(vec![]), +}) } } - } +} } else { Rc::new(KernelTypeBuild { - ty: receiver.clone(), - diagnostics: Rc::new(vec![]), - }) - } - } - AlgebraTypeTemplate::ReceiverElement => match receiver.children.clone().first().cloned() { - Some(child) => Rc::new(KernelTypeBuild { - ty: child_type_node(&child), - diagnostics: Rc::new(vec![]), - }), - None => match v2_rt::map_get(&subst, "__element__".to_string()) { - Some(elem) => Rc::new(KernelTypeBuild { - ty: elem.clone(), - diagnostics: Rc::new(vec![]), - }), - None => { - let rname = authored_name_at(source_indices.clone(), &receiver); - match container_param_name(rname.clone(), 0) { - Some(n) => Rc::new(KernelTypeBuild { - ty: type_variable_node(n.clone()), - diagnostics: Rc::new(vec![]), - }), - None => Rc::new(KernelTypeBuild { - ty: missing_kernel_container_profile_type(rname.clone()), - diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic( - rname.clone(), - )]), - }), - } - } - }, - }, - AlgebraTypeTemplate::ReceiverKey => match receiver.children.clone().first().cloned() { - Some(child) => Rc::new(KernelTypeBuild { - ty: child_type_node(&child), - diagnostics: Rc::new(vec![]), - }), - None => match v2_rt::map_get(&subst, "__key__".to_string()) { - Some(key) => Rc::new(KernelTypeBuild { - ty: key.clone(), - diagnostics: Rc::new(vec![]), - }), - None => { - let rname = authored_name_at(source_indices.clone(), &receiver); - match container_param_name(rname.clone(), 0) { - Some(n) => Rc::new(KernelTypeBuild { - ty: type_variable_node(n.clone()), - diagnostics: Rc::new(vec![]), - }), - None => Rc::new(KernelTypeBuild { - ty: missing_kernel_container_profile_type(rname.clone()), - diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic( - rname.clone(), - )]), - }), - } - } - }, - }, - AlgebraTypeTemplate::ReceiverValue => { - match receiver.children.clone().get(1 as usize).cloned() { - Some(child) => Rc::new(KernelTypeBuild { - ty: child_type_node(&child), - diagnostics: Rc::new(vec![]), - }), - None => match v2_rt::map_get(&subst, "__value__".to_string()) { - Some(val) => Rc::new(KernelTypeBuild { - ty: val, - diagnostics: Rc::new(vec![]), - }), - None => { - let rname = authored_name_at(source_indices.clone(), &receiver); - match container_param_name(rname.clone(), 1) { - Some(n) => Rc::new(KernelTypeBuild { - ty: type_variable_node(n.clone()), - diagnostics: Rc::new(vec![]), - }), - None => Rc::new(KernelTypeBuild { - ty: missing_kernel_container_profile_type(rname.clone()), - diagnostics: Rc::new(vec![ - kernel_container_profile_miss_diagnostic(rname.clone()), - ]), - }), - } - } - }, + ty: receiver.clone(), + diagnostics: Rc::new(vec![]), +}) } - } - AlgebraTypeTemplate::NamedTemplate { name: n, .. } => Rc::new(KernelTypeBuild { - ty: nominal_type_ref(&n), - diagnostics: Rc::new(vec![]), - }), - AlgebraTypeTemplate::ContainerOf { - source: src, - element: inner, - .. - } => { +}, + AlgebraTypeTemplate::ReceiverElement => match receiver.children.clone().first().cloned() { + Some(child) => Rc::new(KernelTypeBuild { + ty: child_type_node(&child), + diagnostics: Rc::new(vec![]), +}), + None => match v2_rt::map_get(&subst, "__element__".to_string()) { + Some(elem) => Rc::new(KernelTypeBuild { + ty: elem.clone(), + diagnostics: Rc::new(vec![]), +}), + None => { + let rname = authored_name_at(source_indices.clone(), &receiver); +match container_param_name(rname.clone(), 0) { + Some(n) => Rc::new(KernelTypeBuild { + ty: type_variable_node(n.clone()), + diagnostics: Rc::new(vec![]), +}), + None => Rc::new(KernelTypeBuild { + ty: missing_kernel_container_profile_type(rname.clone()), + diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic(rname.clone())]), +}), +} +}, +}, +}, + AlgebraTypeTemplate::ReceiverKey => match receiver.children.clone().first().cloned() { + Some(child) => Rc::new(KernelTypeBuild { + ty: child_type_node(&child), + diagnostics: Rc::new(vec![]), +}), + None => match v2_rt::map_get(&subst, "__key__".to_string()) { + Some(key) => Rc::new(KernelTypeBuild { + ty: key.clone(), + diagnostics: Rc::new(vec![]), +}), + None => { + let rname = authored_name_at(source_indices.clone(), &receiver); +match container_param_name(rname.clone(), 0) { + Some(n) => Rc::new(KernelTypeBuild { + ty: type_variable_node(n.clone()), + diagnostics: Rc::new(vec![]), +}), + None => Rc::new(KernelTypeBuild { + ty: missing_kernel_container_profile_type(rname.clone()), + diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic(rname.clone())]), +}), +} +}, +}, +}, + AlgebraTypeTemplate::ReceiverValue => match receiver.children.clone().get(1 as usize).cloned() { + Some(child) => Rc::new(KernelTypeBuild { + ty: child_type_node(&child), + diagnostics: Rc::new(vec![]), +}), + None => match v2_rt::map_get(&subst, "__value__".to_string()) { + Some(val) => Rc::new(KernelTypeBuild { + ty: val, + diagnostics: Rc::new(vec![]), +}), + None => { + let rname = authored_name_at(source_indices.clone(), &receiver); +match container_param_name(rname.clone(), 1) { + Some(n) => Rc::new(KernelTypeBuild { + ty: type_variable_node(n.clone()), + diagnostics: Rc::new(vec![]), +}), + None => Rc::new(KernelTypeBuild { + ty: missing_kernel_container_profile_type(rname.clone()), + diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic(rname.clone())]), +}), +} +}, +}, +}, + AlgebraTypeTemplate::NamedTemplate { name: n, .. } => Rc::new(KernelTypeBuild { + ty: nominal_type_ref(&n), + diagnostics: Rc::new(vec![]), +}), + AlgebraTypeTemplate::ContainerOf { source: src, element: inner, .. } => { let kind_name = match (*src.clone()).clone() { - ContainerSource::SameAsReceiver => { - authored_name_at(source_indices.clone(), &receiver) - } - ContainerSource::Named { name: n, .. } => n.clone(), - }; - let inner_applied = - apply_type_substitution(inner.clone(), &subst, &receiver, &source_indices); - let built = make_container_type(&kind_name, inner_applied.ty.clone()); - Rc::new(KernelTypeBuild { - ty: built.ty.clone(), - diagnostics: v2_rt::concat( - inner_applied.diagnostics.clone(), - built.diagnostics.clone(), - ), - }) - } - AlgebraTypeTemplate::OptionalOf { inner, .. } => { + ContainerSource::SameAsReceiver => authored_name_at(source_indices.clone(), &receiver), + ContainerSource::Named { name: n, .. } => n.clone(), +}; +let inner_applied = apply_type_substitution(inner.clone(), &subst, &receiver, &source_indices); +let built = make_container_type(&kind_name, inner_applied.ty.clone()); +Rc::new(KernelTypeBuild { + ty: built.ty.clone(), + diagnostics: v2_rt::concat(inner_applied.diagnostics.clone(), built.diagnostics.clone()), +}) +}, + AlgebraTypeTemplate::OptionalOf { inner, .. } => { let ib = apply_type_substitution(inner.clone(), &subst, &receiver, &source_indices); - Rc::new(KernelTypeBuild { - ty: with_optional_cardinality(&ib.ty.clone()), - diagnostics: ib.diagnostics.clone(), - }) - } - AlgebraTypeTemplate::TupleOf { - first: ft, - second: st, - .. - } => { +Rc::new(KernelTypeBuild { + ty: with_optional_cardinality(&ib.ty.clone()), + diagnostics: ib.diagnostics.clone(), +}) +}, + AlgebraTypeTemplate::TupleOf { first: ft, second: st, .. } => { let fb = apply_type_substitution(ft.clone(), &subst, &receiver, &source_indices); - let sb = apply_type_substitution(st.clone(), &subst, &receiver, &source_indices); - Rc::new(KernelTypeBuild { - ty: make_tuple_type(fb.ty.clone(), sb.ty.clone()), - diagnostics: v2_rt::concat(fb.diagnostics.clone(), sb.diagnostics.clone()), - }) - } - AlgebraTypeTemplate::CallableOf { - params: p, - return_type: r, - .. - } => { - let param_bs = Rc::new({ - let mut __result = Vec::new(); - for tp in p.clone().iter().cloned() { - __result.push(apply_type_substitution( - tp.clone(), - &subst, - &receiver, - &source_indices, - )); - } - __result - }); - let param_nodes = Rc::new({ - let mut __result = Vec::new(); - for b in param_bs.clone().iter().cloned() { - __result.push(b.ty.clone()); - } - __result - }); - let param_diags = Rc::new({ - let mut __result = Vec::new(); - for b in param_bs.clone().iter().cloned() { - __result.extend((*b.diagnostics.clone()).iter().cloned()); - } - __result - }); - let rb = apply_type_substitution(r.clone(), &subst, &receiver, &source_indices); - Rc::new(KernelTypeBuild { - ty: make_callable_type( - Rc::new({ - let mut __result = Vec::new(); - for pn in param_nodes.iter().cloned() { - __result.push(make_param_node( - &"_".to_string(), - pn.clone(), - None, - no_span(), - no_span(), - )); - } - __result - }), - rb.ty.clone(), - ), - diagnostics: v2_rt::concat(param_diags, rb.diagnostics.clone()), - }) - } +let sb = apply_type_substitution(st.clone(), &subst, &receiver, &source_indices); +Rc::new(KernelTypeBuild { + ty: make_tuple_type(fb.ty.clone(), sb.ty.clone()), + diagnostics: v2_rt::concat(fb.diagnostics.clone(), sb.diagnostics.clone()), +}) +}, + AlgebraTypeTemplate::CallableOf { params: p, return_type: r, .. } => { + let param_bs = Rc::new({ let mut __result = Vec::new(); for tp in p.clone().iter().cloned() { __result.push(apply_type_substitution(tp.clone(), &subst, &receiver, &source_indices)); } __result }); +let param_nodes = Rc::new({ let mut __result = Vec::new(); for b in param_bs.clone().iter().cloned() { __result.push(b.ty.clone()); } __result }); +let param_diags = Rc::new({ let mut __result = Vec::new(); for b in param_bs.clone().iter().cloned() { __result.extend((*b.diagnostics.clone()).iter().cloned()); } __result }); +let rb = apply_type_substitution(r.clone(), &subst, &receiver, &source_indices); +Rc::new(KernelTypeBuild { + ty: make_callable_type(Rc::new({ let mut __result = Vec::new(); for pn in param_nodes.iter().cloned() { __result.push(make_param_node(&"_".to_string(), pn.clone(), None, no_span(), no_span())); } __result }), rb.ty.clone()), + diagnostics: v2_rt::concat(param_diags, rb.diagnostics.clone()), +}) +}, +} }) } @@ -1374,341 +1024,255 @@ pub fn template_return_has_variables(template: Rc) -> bool } pub fn has_type_variable(t: Rc) -> bool { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*t).clone() { - AlgebraTypeTemplate::AlgebraTypeVariable { .. } => true, - AlgebraTypeTemplate::ContainerOf { element: inner, .. } => has_type_variable(inner.clone()), - AlgebraTypeTemplate::OptionalOf { inner, .. } => has_type_variable(inner.clone()), - AlgebraTypeTemplate::TupleOf { - first: f, - second: s, - .. - } => (has_type_variable(f.clone()) || has_type_variable(s.clone())), - AlgebraTypeTemplate::CallableOf { return_type: r, .. } => has_type_variable(r.clone()), - _ => false, + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { + match (*t).clone() { + AlgebraTypeTemplate::AlgebraTypeVariable { .. } => true, + AlgebraTypeTemplate::ContainerOf { element: inner, .. } => has_type_variable(inner.clone()), + AlgebraTypeTemplate::OptionalOf { inner, .. } => has_type_variable(inner.clone()), + AlgebraTypeTemplate::TupleOf { first: f, second: s, .. } => (has_type_variable(f.clone()) || has_type_variable(s.clone())), + AlgebraTypeTemplate::CallableOf { return_type: r, .. } => has_type_variable(r.clone()), + _ => false, +} }) } -pub fn resolve_type_variables_from_template( - template: &Rc, - arg_types: Rc>>, - receiver_type: &Rc, - overrides: Rc>>, - source_indices: &Rc>>, -) -> Rc { +pub fn resolve_type_variables_from_template(template: &Rc, arg_types: Rc>>, receiver_type: &Rc, overrides: Rc>>, source_indices: &Rc>>) -> Rc { { - let subst = build_type_substitution( - &template.param_types.clone(), - arg_types, - receiver_type.clone(), - overrides, - source_indices.clone(), - ); - apply_type_substitution( - template.return_type.clone(), - &subst, - &receiver_type, - &source_indices, - ) - } + let subst = build_type_substitution(&template.param_types.clone(), arg_types, receiver_type.clone(), overrides, source_indices.clone()); +apply_type_substitution(template.return_type.clone(), &subst, &receiver_type, &source_indices) +} } pub fn callable_inferred(n: &Rc) -> Rc { { let is_callable = ((n.params.clone().len() as i64) > 0); - if is_callable { +if is_callable { match n.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: ret, .. }) => ret.clone(), - None => error_type(), - _ => error_type(), - } + Some(InferredNode::Resolved { node: ret, .. }) => ret.clone(), + None => error_type(), + _ => error_type(), +} } else { n.clone() } - } +} } pub fn normalize_access_type_node(mut n: Rc) -> Rc { loop { let has_structure = (n.connective.clone() != Connective::NoConnective); - let unwrapped = if ((n.type_annotation.clone() != None) && has_structure) { +let unwrapped = if ((n.type_annotation.clone() != None) && has_structure) { n.children.clone().first().cloned() } else { None }; - match unwrapped { - Some(base) => { - let __tco_0 = base.clone(); - n = __tco_0; - continue; - } - None => { - break n.clone(); - } - } - } +match unwrapped { + Some(base) => { { + let __tco_0 = base.clone(); +n = __tco_0; +continue; +} }, + None => { break n.clone(); }, +} +} } -pub fn node_type_shape( - n: &Rc, - source_indices: &Rc>>, -) -> String { +pub fn node_type_shape(n: &Rc, source_indices: &Rc>>) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let __is_leaf = (((n.connective.clone() == Connective::NoConnective) - && ((n.children.clone().len() as i64) == 0)) - && ((n.properties.clone().len() as i64) == 0)); - let n_name = authored_name_at(source_indices.clone(), &n); - if __is_leaf { - { - let __is_named_ref = match n.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - (((((rt.connective.clone() == Connective::NoConnective) - && ((rt.children.clone().len() as i64) == 0)) - && (rt.ident_span.clone() != None)) - && (authored_name_at(source_indices.clone(), &rt).as_str() - != "None".to_string().as_str())) - && (is_kernel_type(authored_name_at(source_indices.clone(), &rt)) - == false)) - } - _ => false, - }; - if __is_named_ref { - v2_rt::concat(v2_rt::concat("Named(".to_string(), n_name), ")".to_string()) - } else { - v2_rt::concat( - v2_rt::concat("Primitive(".to_string(), n_name), - ")".to_string(), - ) - } - } - } else { - { - let is_product = (n.connective.clone() == Connective::Conj); - let is_coproduct = (n.connective.clone() == Connective::Disj); - if is_product { - if (n.ident_span.clone() == None) { - "Product()".to_string() + { + let __is_leaf = (((n.connective.clone() == Connective::NoConnective) && ((n.children.clone().len() as i64) == 0)) && ((n.properties.clone().len() as i64) == 0)); +let n_name = authored_name_at(source_indices.clone(), &n); +if __is_leaf { + { + let __is_named_ref = match n.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => (((((rt.connective.clone() == Connective::NoConnective) && ((rt.children.clone().len() as i64) == 0)) && (rt.ident_span.clone() != None)) && (authored_name_at(source_indices.clone(), &rt).as_str() != "None".to_string().as_str())) && (is_kernel_type(authored_name_at(source_indices.clone(), &rt)) == false)), + _ => false, +}; +if __is_named_ref { + v2_rt::concat(v2_rt::concat("Named(".to_string(), n_name), ")".to_string()) } else { - v2_rt::concat( - v2_rt::concat("Product(".to_string(), n_name), - ")".to_string(), - ) + v2_rt::concat(v2_rt::concat("Primitive(".to_string(), n_name), ")".to_string()) } - } else { - if is_coproduct { +} + } else { + { + let is_product = (n.connective.clone() == Connective::Conj); +let is_coproduct = (n.connective.clone() == Connective::Disj); +if is_product { if (n.ident_span.clone() == None) { - "Coproduct()".to_string() + "Product()".to_string() } else { - v2_rt::concat( - v2_rt::concat("Coproduct(".to_string(), n_name), - ")".to_string(), - ) + v2_rt::concat(v2_rt::concat("Product(".to_string(), n_name), ")".to_string()) } } else { - { - let __is_container = - node_is_element_collection(&n, source_indices.clone()); - let is_optional = - (n.return_cardinality.clone() == Cardinality::CardOptional); - let is_map = node_is_keyed_collection(&n, source_indices.clone()); - if __is_container { - { - let elem_shape = match n.children.clone().first().cloned() { - Some(el) => { - node_type_shape(&child_type_node(&el), &source_indices) - } - None => "?".to_string(), - }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("Container(".to_string(), n_name), - ",".to_string(), - ), - elem_shape, - ), - ")".to_string(), - ) - } + if is_coproduct { + if (n.ident_span.clone() == None) { + "Coproduct()".to_string() } else { - if is_optional { + v2_rt::concat(v2_rt::concat("Coproduct(".to_string(), n_name), ")".to_string()) + } + } else { + { + let __is_container = node_is_element_collection(&n, source_indices.clone()); +let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); +let is_map = node_is_keyed_collection(&n, source_indices.clone()); +if __is_container { { - let inner_shape = node_type_shape( - &with_required_cardinality(&n), - &source_indices, - ); - v2_rt::concat( - v2_rt::concat("Optional(".to_string(), inner_shape), - ")".to_string(), - ) - } + let elem_shape = match n.children.clone().first().cloned() { + Some(el) => node_type_shape(&child_type_node(&el), &source_indices), + None => "?".to_string(), +}; +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("Container(".to_string(), n_name), ",".to_string()), elem_shape), ")".to_string()) +} } else { - if is_map { - "Map(...)".to_string() + if is_optional { + { + let inner_shape = node_type_shape(&with_required_cardinality(&n), &source_indices); +v2_rt::concat(v2_rt::concat("Optional(".to_string(), inner_shape), ")".to_string()) +} } else { - v2_rt::concat( - v2_rt::concat("Node(".to_string(), n_name), - ")".to_string(), - ) + if is_map { + "Map(...)".to_string() + } else { + v2_rt::concat(v2_rt::concat("Node(".to_string(), n_name), ")".to_string()) + } } } - } +} } } - } +} } - } +} }) } -pub fn node_type_compatible( - mut left: Rc, - mut right: Rc, - mut source_indices: Rc>>, -) -> bool { +pub fn node_type_compatible(mut left: Rc, mut right: Rc, mut source_indices: Rc>>) -> bool { loop { let left_err = if (left.inferred.clone() != None) { is_compiler_error(left.inferred.clone().clone().unwrap()) } else { false }; - let right_err = if (right.inferred.clone() != None) { +let right_err = if (right.inferred.clone() != None) { is_compiler_error(right.inferred.clone().clone().unwrap()) } else { false }; - let left_tv = if (left.inferred.clone() != None) { +let left_tv = if (left.inferred.clone() != None) { is_type_variable(left.inferred.clone().clone().unwrap()) } else { false }; - let right_tv = if (right.inferred.clone() != None) { +let right_tv = if (right.inferred.clone() != None) { is_type_variable(right.inferred.clone().clone().unwrap()) } else { false }; - let left_opt = (left.return_cardinality.clone() == Cardinality::CardOptional); - let right_opt = (right.return_cardinality.clone() == Cardinality::CardOptional); - let right_is_unit = is_unit_like(&right); - let left_is_unit = is_unit_like(&left); - if (left_err || right_err) { +let left_opt = (left.return_cardinality.clone() == Cardinality::CardOptional); +let right_opt = (right.return_cardinality.clone() == Cardinality::CardOptional); +let right_is_unit = is_unit_like(&right); +let left_is_unit = is_unit_like(&left); +if (left_err || right_err) { break true; - } else { +} else { if (left_tv || right_tv) { break true; - } else { +} else { if (left_opt.clone() && right_is_unit) { break true; - } else { +} else { if (left_is_unit && right_opt.clone()) { break true; - } else { - let left_is_container = - node_is_element_collection(&left, source_indices.clone()); - let right_is_container = - node_is_element_collection(&right, source_indices.clone()); - if (left_is_container && right_is_container) { - if (authored_name_at(source_indices.clone(), &left).as_str() - != authored_name_at(source_indices.clone(), &right).as_str()) - { +} else { + let left_is_container = node_is_element_collection(&left, source_indices.clone()); +let right_is_container = node_is_element_collection(&right, source_indices.clone()); +if (left_is_container && right_is_container) { + if (authored_name_at(source_indices.clone(), &left).as_str() != authored_name_at(source_indices.clone(), &right).as_str()) { break false; - } else { +} else { match left.children.clone().first().cloned() { - Some(left_ch) => { - match right.children.clone().first().cloned() { - Some(right_ch) => { - let left_el = child_type_node(&left_ch); - let right_el = child_type_node(&right_ch); - let left_el_is_unit = is_unit_like(&left_el); - let right_el_is_unit = is_unit_like(&right_el); - if (left_el_is_unit || right_el_is_unit) { - break true; - } else { - { - let __tco_0 = left_el.clone(); - let __tco_1 = right_el.clone(); - left = __tco_0; - right = __tco_1; - continue; - } - } - } - None => { - break true; - } - } - } - None => { - break true; - } - } - } - } else { + Some(left_ch) => { match right.children.clone().first().cloned() { + Some(right_ch) => { let left_el = child_type_node(&left_ch); +let right_el = child_type_node(&right_ch); +let left_el_is_unit = is_unit_like(&left_el); +let right_el_is_unit = is_unit_like(&right_el); +if (left_el_is_unit || right_el_is_unit) { + break true; +} else { + { + let __tco_0 = left_el.clone(); +let __tco_1 = right_el.clone(); +left = __tco_0; +right = __tco_1; +continue; +} +} }, + None => { break true; }, +} }, + None => { break true; }, +} +} +} else { if (left_opt.clone() && right_opt.clone()) { let left_inner = with_required_cardinality(&left); - let right_inner = with_required_cardinality(&right); - let left_inner_is_unit = is_unit_like(&left_inner); - let right_inner_is_unit = is_unit_like(&right_inner); - if (left_inner_is_unit || right_inner_is_unit) { +let right_inner = with_required_cardinality(&right); +let left_inner_is_unit = is_unit_like(&left_inner); +let right_inner_is_unit = is_unit_like(&right_inner); +if (left_inner_is_unit || right_inner_is_unit) { break true; - } else { +} else { { let __tco_0 = left_inner.clone(); - let __tco_1 = right_inner.clone(); - left = __tco_0; - right = __tco_1; - continue; - } - } - } else { +let __tco_1 = right_inner.clone(); +left = __tco_0; +right = __tco_1; +continue; +} +} +} else { if (left_opt.clone() || right_opt.clone()) { break false; - } else { - break (authored_name_at(source_indices.clone(), &left) - .as_str() - == authored_name_at(source_indices.clone(), &right) - .as_str()); - } - } - } - } - } - } - } - } +} else { + break (authored_name_at(source_indices.clone(), &left).as_str() == authored_name_at(source_indices.clone(), &right).as_str()); +} +} +} +} +} +} +} +} } -pub fn prefer_specific_type( - left: Rc, - right: Rc, - source_indices: &Rc>>, -) -> Rc { +pub fn prefer_specific_type(left: Rc, right: Rc, source_indices: &Rc>>) -> Rc { { let left_is_container = node_is_element_collection(&left, source_indices.clone()); - let left_is_optional = (left.return_cardinality.clone() == Cardinality::CardOptional); - let left_first_child = left.children.clone().first().cloned(); - let left_norm_name = authored_name_at(source_indices.clone(), &left); - let left_is_unit_inner = if left_is_container.clone() { +let left_is_optional = (left.return_cardinality.clone() == Cardinality::CardOptional); +let left_first_child = left.children.clone().first().cloned(); +let left_norm_name = authored_name_at(source_indices.clone(), &left); +let left_is_unit_inner = if left_is_container.clone() { match left_first_child { - Some(ch) => { - let el = child_type_node(&ch); - let el_is_unit = is_unit_like(&el); - el_is_unit - } - None => false, - } + Some(ch) => { + let el = child_type_node(&ch); +let el_is_unit = is_unit_like(&el); +el_is_unit +}, + None => false, +} } else { if left_is_optional.clone() { { let left_is_unit = is_unit_like(&left); - left_is_unit - } +left_is_unit +} } else { false } }; - let right_is_container = node_is_element_collection(&right, source_indices.clone()); - let right_is_optional = (right.return_cardinality.clone() == Cardinality::CardOptional); - let same_kind = if (left_is_container.clone() && right_is_container) { +let right_is_container = node_is_element_collection(&right, source_indices.clone()); +let right_is_optional = (right.return_cardinality.clone() == Cardinality::CardOptional); +let same_kind = if (left_is_container.clone() && right_is_container) { (left_norm_name.as_str() == authored_name_at(source_indices.clone(), &right).as_str()) } else { if (left_is_optional.clone() && right_is_optional) { @@ -1717,51 +1281,45 @@ pub fn prefer_specific_type( false } }; - if (same_kind && left_is_unit_inner) { +if (same_kind && left_is_unit_inner) { right.clone() } else { - if (is_fully_resolved(&right, &source_indices) - && !is_fully_resolved(&left, &source_indices)) - { + if (is_fully_resolved(&right, &source_indices) && !is_fully_resolved(&left, &source_indices)) { right.clone() } else { left.clone() } } - } +} } -pub fn node_type_equals( - left: &Rc, - right: &Rc, - source_indices: Rc>>, -) -> bool { +pub fn node_type_equals(left: &Rc, right: &Rc, source_indices: Rc>>) -> bool { { let left_err = if (left.inferred.clone() != None) { is_compiler_error(left.inferred.clone().clone().unwrap()) } else { false }; - let right_err = if (right.inferred.clone() != None) { +let right_err = if (right.inferred.clone() != None) { is_compiler_error(right.inferred.clone().clone().unwrap()) } else { false }; - let left_tv = if (left.inferred.clone() != None) { +let left_tv = if (left.inferred.clone() != None) { is_type_variable(left.inferred.clone().clone().unwrap()) } else { false }; - let right_tv = if (right.inferred.clone() != None) { +let right_tv = if (right.inferred.clone() != None) { is_type_variable(right.inferred.clone().clone().unwrap()) } else { false }; - let left_opt = (left.return_cardinality.clone() == Cardinality::CardOptional); - let right_opt = (right.return_cardinality.clone() == Cardinality::CardOptional); - let right_is_unit_eq = is_unit_like(&right); - let left_is_unit_eq = is_unit_like(&left); - if (left_err || right_err) { +let left_opt = (left.return_cardinality.clone() == Cardinality::CardOptional); +let right_opt = (right.return_cardinality.clone() == Cardinality::CardOptional); +let right_is_unit_eq = is_unit_like(&right); +let left_is_unit_eq = is_unit_like(&left); +if (left_err || right_err) { true } else { if (left_tv.clone() && right_tv.clone()) { @@ -1777,11 +1335,7 @@ pub fn node_type_equals( true } else { if (left_opt.clone() && right_opt.clone()) { - node_type_equals_core( - &with_required_cardinality(&left), - &with_required_cardinality(&right), - &source_indices, - ) + node_type_equals_core(&with_required_cardinality(&left), &with_required_cardinality(&right), &source_indices) } else { node_type_equals_core(&left, &right, &source_indices) } @@ -1790,75 +1344,34 @@ pub fn node_type_equals( } } } - } +} } -pub fn node_type_equals_core( - left: &Rc, - right: &Rc, - source_indices: &Rc>>, -) -> bool { +pub fn node_type_equals_core(left: &Rc, right: &Rc, source_indices: &Rc>>) -> bool { { - let left_leaf = (((left.connective.clone() == Connective::NoConnective) - && ((left.children.clone().len() as i64) == 0)) - && ((left.properties.clone().len() as i64) == 0)); - let right_leaf = (((right.connective.clone() == Connective::NoConnective) - && ((right.children.clone().len() as i64) == 0)) - && ((right.properties.clone().len() as i64) == 0)); - let left_struct = (left.connective.clone() != Connective::NoConnective); - let right_struct = (right.connective.clone() != Connective::NoConnective); - let left_name = authored_name_at(source_indices.clone(), &left); - let right_name = authored_name_at(source_indices.clone(), &right); - if (left_leaf.clone() && right_leaf.clone()) { + let left_leaf = (((left.connective.clone() == Connective::NoConnective) && ((left.children.clone().len() as i64) == 0)) && ((left.properties.clone().len() as i64) == 0)); +let right_leaf = (((right.connective.clone() == Connective::NoConnective) && ((right.children.clone().len() as i64) == 0)) && ((right.properties.clone().len() as i64) == 0)); +let left_struct = (left.connective.clone() != Connective::NoConnective); +let right_struct = (right.connective.clone() != Connective::NoConnective); +let left_name = authored_name_at(source_indices.clone(), &left); +let right_name = authored_name_at(source_indices.clone(), &right); +if (left_leaf.clone() && right_leaf.clone()) { (left_name.as_str() == right_name.as_str()) } else { if (left_struct.clone() && right_struct.clone()) { if (left_name.as_str() != right_name.as_str()) { false } else { - if ((left.connective.clone() == Connective::Conj) - != (right.connective.clone() == Connective::Conj)) - { + if ((left.connective.clone() == Connective::Conj) != (right.connective.clone() == Connective::Conj)) { false } else { - if ((left.children.clone().len() as i64) - != (right.children.clone().len() as i64)) - { + if ((left.children.clone().len() as i64) != (right.children.clone().len() as i64)) { false } else { - { - let mut __all = true; - for pair in Rc::new( - left.children - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - if !(match right - .children - .clone() - .get(pair.0.clone() as usize) - .cloned() - { - Some(right_child) => node_type_equals( - &pair.1.clone(), - &right_child, - source_indices.clone(), - ), - None => false, - }) { - __all = false; - break; - } - } - __all - } + { let mut __all = true; for pair in Rc::new(left.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if !(match right.children.clone().get(pair.0.clone() as usize).cloned() { + Some(right_child) => node_type_equals(&pair.1.clone(), &right_child, source_indices.clone()), + None => false, +}) { __all = false; break; } } __all } } } } @@ -1870,370 +1383,222 @@ pub fn node_type_equals_core( (left_name.as_str() == right_name.as_str()) } else { { - let left_is_container = - node_is_element_collection(&left, source_indices.clone()); - let right_is_container = - node_is_element_collection(&right, source_indices.clone()); - if (left_is_container && right_is_container) { + let left_is_container = node_is_element_collection(&left, source_indices.clone()); +let right_is_container = node_is_element_collection(&right, source_indices.clone()); +if (left_is_container && right_is_container) { if (left_name.as_str() != right_name.as_str()) { false } else { match left.children.clone().first().cloned() { - Some(left_ch) => { - match right.children.clone().first().cloned() { - Some(right_ch) => node_type_equals( - &child_type_node(&left_ch), - &child_type_node(&right_ch), - source_indices.clone(), - ), - None => false, - } - } - None => false, - } + Some(left_ch) => match right.children.clone().first().cloned() { + Some(right_ch) => node_type_equals(&child_type_node(&left_ch), &child_type_node(&right_ch), source_indices.clone()), + None => false, +}, + None => false, +} } } else { { - let both_maps = - (node_is_keyed_collection(&left, source_indices.clone()) - && node_is_keyed_collection( - &right, - source_indices.clone(), - )); - if both_maps { - if (((left.children.clone().len() as i64) == 2) - && ((right.children.clone().len() as i64) == 2)) - { + let both_maps = (node_is_keyed_collection(&left, source_indices.clone()) && node_is_keyed_collection(&right, source_indices.clone())); +if both_maps { + if (((left.children.clone().len() as i64) == 2) && ((right.children.clone().len() as i64) == 2)) { match left.children.clone().first().cloned() { - Some(left_first) => match right - .children - .clone() - .first() - .cloned() - { - Some(right_first) => match left - .children - .clone() - .get(1 as usize) - .cloned() - { - Some(left_second) => match right - .children - .clone() - .get(1 as usize) - .cloned() - { - Some(right_second) => { - (node_type_equals( - &child_type_node(&left_first), - &child_type_node(&right_first), - source_indices.clone(), - ) && node_type_equals( - &child_type_node(&left_second), - &child_type_node(&right_second), - source_indices.clone(), - )) - } - None => false, - }, - None => false, - }, - None => false, - }, - None => false, - } + Some(left_first) => match right.children.clone().first().cloned() { + Some(right_first) => match left.children.clone().get(1 as usize).cloned() { + Some(left_second) => match right.children.clone().get(1 as usize).cloned() { + Some(right_second) => (node_type_equals(&child_type_node(&left_first), &child_type_node(&right_first), source_indices.clone()) && node_type_equals(&child_type_node(&left_second), &child_type_node(&right_second), source_indices.clone())), + None => false, +}, + None => false, +}, + None => false, +}, + None => false, +} } else { false } } else { - if (((left.params.clone().len() as i64) > 0) - && ((right.params.clone().len() as i64) > 0)) - { - if ((left.params.clone().len() as i64) - != (right.params.clone().len() as i64)) - { + if (((left.params.clone().len() as i64) > 0) && ((right.params.clone().len() as i64) > 0)) { + if ((left.params.clone().len() as i64) != (right.params.clone().len() as i64)) { false } else { { - let params_eq = { - let mut __all = true; - for pair in Rc::new( - left.params - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - if !(match right - .params - .clone() - .get(pair.0.clone() as usize) - .cloned() - { - Some(right_param) => { - node_type_equals( - ¶m_node_type_expr( - &pair.1.clone(), - ), - ¶m_node_type_expr( - &right_param, - ), - source_indices.clone(), - ) - } - None => false, - }) { - __all = false; - break; - } - } - __all - }; - if (params_eq == false) { + let params_eq = { let mut __all = true; for pair in Rc::new(left.params.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if !(match right.params.clone().get(pair.0.clone() as usize).cloned() { + Some(right_param) => node_type_equals(¶m_node_type_expr(&pair.1.clone()), ¶m_node_type_expr(&right_param), source_indices.clone()), + None => false, +}) { __all = false; break; } } __all }; +if (params_eq == false) { false } else { - match left - .inferred - .clone() - .as_deref() - .cloned() - { - Some(InferredNode::Resolved { - node: left_ret, - .. - }) => match right - .inferred - .clone() - .as_deref() - .cloned() - { - Some(InferredNode::Resolved { - node: right_ret, - .. - }) => node_type_equals( - &left_ret, - &right_ret, - source_indices.clone(), - ), - None => false, - _ => false, - }, - None => { - (right.inferred.clone() == None) - } - _ => false, - } + match left.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: left_ret, .. }) => match right.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: right_ret, .. }) => node_type_equals(&left_ret, &right_ret, source_indices.clone()), + None => false, + _ => false, +}, + None => (right.inferred.clone() == None), + _ => false, +} } - } +} } } else { false } } - } +} } - } +} } } } } - } +} } -pub fn node_type_deps( - n: &Rc, - source_indices: &Rc>>, -) -> Rc> { +pub fn node_type_deps(n: &Rc, source_indices: &Rc>>) -> Rc> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let n_is_type_var = if (n.inferred.clone() != None) { - is_type_variable(n.inferred.clone().clone().unwrap()) - } else { - false - }; - if n_is_type_var { - return Rc::new(vec![]); - } - let __is_named_ref = if (n.inferred.clone() == None) { - false - } else { - match n.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - (((((rt.connective.clone() == Connective::NoConnective) - && ((rt.children.clone().len() as i64) == 0)) - && (rt.ident_span.clone() != None)) - && (authored_name_at(source_indices.clone(), &rt).as_str() - != "None".to_string().as_str())) - && (is_kernel_type(authored_name_at(source_indices.clone(), &rt)) == false)) - } - _ => false, - } - }; - let has_structure = (n.connective.clone() != Connective::NoConnective); - let n_name = authored_name_at(source_indices.clone(), &n); - if __is_named_ref { - match n.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - Rc::new(vec![authored_name_at(source_indices.clone(), &rt)]) - } - _ => Rc::new(vec![]), + { + let n_is_type_var = if (n.inferred.clone() != None) { + is_type_variable(n.inferred.clone().clone().unwrap()) + } else { + false + }; +if n_is_type_var { + return Rc::new(vec![]) } - } else { - if has_structure { - Rc::new({ - let mut __result = Vec::new(); - for child in n.children.clone().iter().cloned() { - __result.extend( - (*match child.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - node_type_deps(&rt, &source_indices) - } - _ => { - if (child.inferred.clone() == None) { - node_type_deps(&child, &source_indices) - } else { - Rc::new(vec![]) - } - } - }) - .iter() - .cloned(), - ); - } - __result - }) +let __is_named_ref = if (n.inferred.clone() == None) { + false } else { - if (n.inferred.clone() != None) { - match n.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - node_type_deps(&rt, &source_indices) - } - _ => Rc::new(vec![]), - } + match n.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => (((((rt.connective.clone() == Connective::NoConnective) && ((rt.children.clone().len() as i64) == 0)) && (rt.ident_span.clone() != None)) && (authored_name_at(source_indices.clone(), &rt).as_str() != "None".to_string().as_str())) && (is_kernel_type(authored_name_at(source_indices.clone(), &rt)) == false)), + _ => false, +} + }; +let has_structure = (n.connective.clone() != Connective::NoConnective); +let n_name = authored_name_at(source_indices.clone(), &n); +if __is_named_ref { + match n.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => Rc::new(vec![authored_name_at(source_indices.clone(), &rt)]), + _ => Rc::new(vec![]), +} + } else { + if has_structure { + Rc::new({ let mut __result = Vec::new(); for child in n.children.clone().iter().cloned() { __result.extend((*match child.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => node_type_deps(&rt, &source_indices), + _ => if (child.inferred.clone() == None) { + node_type_deps(&child, &source_indices) + } else { + Rc::new(vec![]) + }, +}).iter().cloned()); } __result }) } else { - if ((n.children.clone().len() as i64) > 0) { - { - let child_deps = Rc::new({ - let mut __result = Vec::new(); - for child in n.children.clone().iter().cloned() { - __result.extend( - (*node_type_deps(&child, &source_indices)).iter().cloned(), - ); - } - __result - }); - if ((n.ident_span.clone() != None) - && (is_kernel_type(n_name.clone()) == false)) + if (n.inferred.clone() != None) { + match n.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => node_type_deps(&rt, &source_indices), + _ => Rc::new(vec![]), +} + } else { + if ((n.children.clone().len() as i64) > 0) { { - v2_rt::concat(Rc::new(vec![n_name.clone()]), child_deps) + let child_deps = Rc::new({ let mut __result = Vec::new(); for child in n.children.clone().iter().cloned() { __result.extend((*node_type_deps(&child, &source_indices)).iter().cloned()); } __result }); +if ((n.ident_span.clone() != None) && (is_kernel_type(n_name.clone()) == false)) { + v2_rt::concat(Rc::new(vec![n_name.clone()]), child_deps) + } else { + child_deps + } +} + } else { + if ((is_kernel_type(n_name.clone()) || (n_name.clone().as_str() == "None".to_string().as_str())) || (n.ident_span.clone() == None)) { + Rc::new(vec![]) } else { - child_deps + Rc::new(vec![n_name.clone()]) } } - } else { - if ((is_kernel_type(n_name.clone()) - || (n_name.clone().as_str() == "None".to_string().as_str())) - || (n.ident_span.clone() == None)) - { - Rc::new(vec![]) - } else { - Rc::new(vec![n_name.clone()]) - } } } } - } +} }) } pub fn infer_literal_node(lit: Rc) -> Rc { match (*lit).clone() { - LiteralValue::LitStr { .. } => string_type(), - LiteralValue::LitInt { .. } => int_type(), - LiteralValue::LitFloat { .. } => float_type(), - LiteralValue::LitBool { .. } => bool_type(), - LiteralValue::LitNull => with_optional_cardinality(&unit_type()), - } + LiteralValue::LitStr { .. } => string_type(), + LiteralValue::LitInt { .. } => int_type(), + LiteralValue::LitFloat { .. } => float_type(), + LiteralValue::LitBool { .. } => bool_type(), + LiteralValue::LitNull => with_optional_cardinality(&unit_type()), +} } -pub fn method_receiver_element_node( - receiver_type: Rc, - source_indices: Rc>>, -) -> Rc { +pub fn method_receiver_element_node(receiver_type: Rc, source_indices: Rc>>) -> Rc { { let normed = normalize_access_type_node(receiver_type.clone()); - let maybe_element = if node_is_keyed_collection(&normed, source_indices) { +let maybe_element = if node_is_keyed_collection(&normed, source_indices) { match normed.children.clone().get(1 as usize).cloned() { - Some(ch) => Some(child_type_node(&ch)), - None => None, - } + Some(ch) => Some(child_type_node(&ch)), + None => None, +} } else { - if ((normed.connective.clone() == Connective::NoConnective) - && ((normed.children.clone().len() as i64) == 1)) - { + if ((normed.connective.clone() == Connective::NoConnective) && ((normed.children.clone().len() as i64) == 1)) { match normed.children.clone().first().cloned() { - Some(ch) => Some(child_type_node(&ch)), - None => None, - } + Some(ch) => Some(child_type_node(&ch)), + None => None, +} } else { None } }; - match maybe_element { - Some(el) => el.clone(), - None => receiver_type.clone(), - } - } +match maybe_element { + Some(el) => el.clone(), + None => receiver_type.clone(), +} +} } pub fn extract_optional_inner_node(n: &Rc) -> Rc { { let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); - if is_optional { +if is_optional { with_required_cardinality(&n) } else { n.clone() } - } +} } pub fn algebra_field_kind_name(kind: AlgebraFieldKind) -> String { match kind { - AlgebraFieldKind::AlgAdd => "add".to_string(), - AlgebraFieldKind::AlgMul => "mul".to_string(), - AlgebraFieldKind::AlgReciprocal => "reciprocal".to_string(), - AlgebraFieldKind::AlgQuotient => "quotient".to_string(), - AlgebraFieldKind::AlgRemainder => "remainder".to_string(), - AlgebraFieldKind::AlgCompare => "compare".to_string(), - AlgebraFieldKind::AlgMeet => "meet".to_string(), - AlgebraFieldKind::AlgJoin => "join".to_string(), - } + AlgebraFieldKind::AlgAdd => "add".to_string(), + AlgebraFieldKind::AlgMul => "mul".to_string(), + AlgebraFieldKind::AlgReciprocal => "reciprocal".to_string(), + AlgebraFieldKind::AlgQuotient => "quotient".to_string(), + AlgebraFieldKind::AlgRemainder => "remainder".to_string(), + AlgebraFieldKind::AlgCompare => "compare".to_string(), + AlgebraFieldKind::AlgMeet => "meet".to_string(), + AlgebraFieldKind::AlgJoin => "join".to_string(), +} } pub fn binop_algebra_fields(op: BinOp) -> Rc> { match op { - BinOp::Add => Rc::new(vec![AlgebraFieldKind::AlgAdd]), - BinOp::Sub => Rc::new(vec![AlgebraFieldKind::AlgAdd]), - BinOp::Mul => Rc::new(vec![AlgebraFieldKind::AlgMul]), - BinOp::Div => Rc::new(vec![ - AlgebraFieldKind::AlgReciprocal, - AlgebraFieldKind::AlgQuotient, - ]), - BinOp::Mod => Rc::new(vec![AlgebraFieldKind::AlgRemainder]), - BinOp::Eq => Rc::new(vec![AlgebraFieldKind::AlgCompare]), - BinOp::Ne => Rc::new(vec![AlgebraFieldKind::AlgCompare]), - BinOp::Lt => Rc::new(vec![AlgebraFieldKind::AlgCompare]), - BinOp::Gt => Rc::new(vec![AlgebraFieldKind::AlgCompare]), - BinOp::Le => Rc::new(vec![AlgebraFieldKind::AlgCompare]), - BinOp::Ge => Rc::new(vec![AlgebraFieldKind::AlgCompare]), - BinOp::And => Rc::new(vec![AlgebraFieldKind::AlgMeet]), - BinOp::Or => Rc::new(vec![AlgebraFieldKind::AlgJoin]), - BinOp::NullCoalesce => Rc::new(vec![]), - } + BinOp::Add => Rc::new(vec![AlgebraFieldKind::AlgAdd]), + BinOp::Sub => Rc::new(vec![AlgebraFieldKind::AlgAdd]), + BinOp::Mul => Rc::new(vec![AlgebraFieldKind::AlgMul]), + BinOp::Div => Rc::new(vec![AlgebraFieldKind::AlgReciprocal, AlgebraFieldKind::AlgQuotient]), + BinOp::Mod => Rc::new(vec![AlgebraFieldKind::AlgRemainder]), + BinOp::Eq => Rc::new(vec![AlgebraFieldKind::AlgCompare]), + BinOp::Ne => Rc::new(vec![AlgebraFieldKind::AlgCompare]), + BinOp::Lt => Rc::new(vec![AlgebraFieldKind::AlgCompare]), + BinOp::Gt => Rc::new(vec![AlgebraFieldKind::AlgCompare]), + BinOp::Le => Rc::new(vec![AlgebraFieldKind::AlgCompare]), + BinOp::Ge => Rc::new(vec![AlgebraFieldKind::AlgCompare]), + BinOp::And => Rc::new(vec![AlgebraFieldKind::AlgMeet]), + BinOp::Or => Rc::new(vec![AlgebraFieldKind::AlgJoin]), + BinOp::NullCoalesce => Rc::new(vec![]), +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -2242,43 +1607,23 @@ pub struct AlgebraFieldMatch { pub field_node: Rc, } -pub fn first_matching_algebra_field( - mut n: Rc, - mut candidates: Rc>, - mut source_indices: Rc>>, -) -> Option> { +pub fn first_matching_algebra_field(mut n: Rc, mut candidates: Rc>, mut source_indices: Rc>>) -> Option> { loop { match candidates.clone().first().cloned() { - None => { - break None; - } - Some(kind) => { - match find_child_named( - n.clone(), - algebra_field_kind_name(kind.clone()), - source_indices.clone(), - ) { - Some(f) => { - break Some(Rc::new(AlgebraFieldMatch { - field_kind: kind.clone(), - field_node: f.clone(), - })); - } - None => { - let __tco_0 = Rc::new( - candidates - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - candidates = __tco_0; - continue; - } - } - } - } - } + None => { break None; }, + Some(kind) => { match find_child_named(n.clone(), algebra_field_kind_name(kind.clone()), source_indices.clone()) { + Some(f) => { break Some(Rc::new(AlgebraFieldMatch { + field_kind: kind.clone(), + field_node: f.clone(), +})); }, + None => { { + let __tco_0 = Rc::new(candidates.iter().cloned().skip(1 as usize).collect::>()); +candidates = __tco_0; +continue; +} }, +} }, +} +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -2287,132 +1632,113 @@ pub struct BinOpInferred { pub algebra_field: Option, } -pub fn infer_binop_type_node( - op: &BinOp, - left_type: &Rc, - source_indices: Rc>>, -) -> Rc { +pub fn infer_binop_type_node(op: &BinOp, left_type: &Rc, source_indices: Rc>>) -> Rc { match op.clone() { - BinOp::Eq => Rc::new(BinOpInferred { - result_type: bool_type(), - algebra_field: None, - }), - BinOp::Ne => Rc::new(BinOpInferred { - result_type: bool_type(), - algebra_field: None, - }), - BinOp::Lt => Rc::new(BinOpInferred { - result_type: bool_type(), - algebra_field: None, - }), - BinOp::Gt => Rc::new(BinOpInferred { - result_type: bool_type(), - algebra_field: None, - }), - BinOp::Le => Rc::new(BinOpInferred { - result_type: bool_type(), - algebra_field: None, - }), - BinOp::Ge => Rc::new(BinOpInferred { - result_type: bool_type(), - algebra_field: None, - }), - BinOp::And => Rc::new(BinOpInferred { - result_type: bool_type(), - algebra_field: None, - }), - BinOp::Or => Rc::new(BinOpInferred { - result_type: bool_type(), - algebra_field: None, - }), - BinOp::NullCoalesce => Rc::new(BinOpInferred { - result_type: extract_optional_inner_node(&left_type), - algebra_field: None, - }), - _ => { - let candidates = binop_algebra_fields(op.clone()); - let is_product = (left_type.connective.clone() == Connective::Conj); - if is_product { - match first_matching_algebra_field(left_type.clone(), candidates, source_indices) { - Some(m) => match m.field_node.clone().inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - if ((rt.params.clone().len() as i64) > 0) { - match rt.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { - node: return_type, .. - }) => Rc::new(BinOpInferred { - result_type: return_type.clone(), - algebra_field: Some(m.field_kind.clone()), - }), - _ => Rc::new(BinOpInferred { - result_type: left_type.clone(), - algebra_field: Some(m.field_kind.clone()), - }), - } - } else { - Rc::new(BinOpInferred { - result_type: rt.clone(), - algebra_field: Some(m.field_kind.clone()), - }) - } - } - _ => Rc::new(BinOpInferred { - result_type: left_type.clone(), - algebra_field: None, - }), - }, - None => Rc::new(BinOpInferred { - result_type: left_type.clone(), - algebra_field: None, - }), - } + BinOp::Eq => Rc::new(BinOpInferred { + result_type: bool_type(), + algebra_field: None, +}), + BinOp::Ne => Rc::new(BinOpInferred { + result_type: bool_type(), + algebra_field: None, +}), + BinOp::Lt => Rc::new(BinOpInferred { + result_type: bool_type(), + algebra_field: None, +}), + BinOp::Gt => Rc::new(BinOpInferred { + result_type: bool_type(), + algebra_field: None, +}), + BinOp::Le => Rc::new(BinOpInferred { + result_type: bool_type(), + algebra_field: None, +}), + BinOp::Ge => Rc::new(BinOpInferred { + result_type: bool_type(), + algebra_field: None, +}), + BinOp::And => Rc::new(BinOpInferred { + result_type: bool_type(), + algebra_field: None, +}), + BinOp::Or => Rc::new(BinOpInferred { + result_type: bool_type(), + algebra_field: None, +}), + BinOp::NullCoalesce => Rc::new(BinOpInferred { + result_type: extract_optional_inner_node(&left_type), + algebra_field: None, +}), + _ => { + let candidates = binop_algebra_fields(op.clone()); +let is_product = (left_type.connective.clone() == Connective::Conj); +if is_product { + match first_matching_algebra_field(left_type.clone(), candidates, source_indices) { + Some(m) => match m.field_node.clone().inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => if ((rt.params.clone().len() as i64) > 0) { + match rt.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: return_type, .. }) => Rc::new(BinOpInferred { + result_type: return_type.clone(), + algebra_field: Some(m.field_kind.clone()), +}), + _ => Rc::new(BinOpInferred { + result_type: left_type.clone(), + algebra_field: Some(m.field_kind.clone()), +}), +} } else { Rc::new(BinOpInferred { - result_type: left_type.clone(), - algebra_field: None, - }) - } + result_type: rt.clone(), + algebra_field: Some(m.field_kind.clone()), +}) + }, + _ => Rc::new(BinOpInferred { + result_type: left_type.clone(), + algebra_field: None, +}), +}, + None => Rc::new(BinOpInferred { + result_type: left_type.clone(), + algebra_field: None, +}), +} + } else { + Rc::new(BinOpInferred { + result_type: left_type.clone(), + algebra_field: None, +}) } - } +}, +} } -pub fn for_each_element_type_node( - n: Rc, - source_indices: Rc>>, -) -> Rc { +pub fn for_each_element_type_node(n: Rc, source_indices: Rc>>) -> Rc { { let normed = normalize_access_type_node(n); - let is_single_child = ((normed.connective.clone() == Connective::NoConnective) - && ((normed.children.clone().len() as i64) == 1)); - let extracted = if is_single_child { +let is_single_child = ((normed.connective.clone() == Connective::NoConnective) && ((normed.children.clone().len() as i64) == 1)); +let extracted = if is_single_child { match normed.children.clone().first().cloned() { - Some(ch) => Some(child_type_node(&ch)), - None => None, - } + Some(ch) => Some(child_type_node(&ch)), + None => None, +} } else { None }; - match extracted { - Some(el) => el.clone(), - None => { - if ((((normed.connective.clone() == Connective::NoConnective) - && ((normed.children.clone().len() as i64) == 0)) - && ((normed.properties.clone().len() as i64) == 0)) - && (authored_name_at(source_indices, &normed).as_str() - == "String".to_string().as_str())) - { - string_type() - } else { - normed.clone() - } - } - } - } +match extracted { + Some(el) => el.clone(), + None => if ((((normed.connective.clone() == Connective::NoConnective) && ((normed.children.clone().len() as i64) == 0)) && ((normed.properties.clone().len() as i64) == 0)) && (authored_name_at(source_indices, &normed).as_str() == "String".to_string().as_str())) { + string_type() + } else { + normed.clone() + }, +} +} } pub fn emit_map_has(m: Rc>, key: String) -> bool { match v2_rt::map_get(&m, key) { - Some(_) => true, - None => false, - } + Some(_) => true, + None => false, +} } diff --git a/src/v2/stage0/src/v2_compiler_languages.rs b/src/v2/stage0/src/v2_compiler_languages.rs index 5656cb0a11b..13c3f2be93f 100644 --- a/src/v2/stage0/src/v2_compiler_languages.rs +++ b/src/v2/stage0/src/v2_compiler_languages.rs @@ -1,89 +1,47 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.languages -use self::IfValueForm::*; +use std::collections::HashMap; +use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::v2_compiler_artifact::{RenderTarget}; +use crate::v2_compiler_artifact::RenderTarget::{Rust, Python, Go, Dag}; +pub use crate::v2_std_core::{BinOp, LiteralValue}; +use crate::v2_std_core::BinOp::{Add, Sub, Mul, Div, Mod, Eq, Ne, Lt, Gt, Le, Ge, And, Or, NullCoalesce}; +use crate::v2_std_core::LiteralValue::*; +pub use crate::std_syntax::{ItemForm, ItemFormKind, OperatorSpec, SyntaxSpec, AlgebraFieldKind, BodyKind}; +use crate::std_syntax::ItemFormKind::{FuncForm, StructForm, EnumForm, TypeAliasForm, ModuleForm, OtherForm}; +use crate::std_syntax::BodyKind::{ExprBody, BlockBody, TypeBody, ValueBody, NoBody, ServiceBody, ResourceBody}; +use crate::std_syntax::AlgebraFieldKind::*; +pub use crate::extdeps_languages_rust_syntax::{rust_operators, rust_item_forms}; +pub use crate::extdeps_languages_python_syntax::{python_operators, python_item_forms}; +pub use crate::extdeps_languages_go_syntax::{go_operators, go_item_forms}; +pub use crate::extdeps_languages_dag_syntax::{dag_operators}; +pub use crate::extdeps_languages_rust_emit::{rust_keywords, rust_container_templates, rust_reserved, rust_reserved_escape_prefix, rust_struct_derives, rust_struct_derives_copy, rust_enum_derives, rust_enum_derives_copy, rust_serde_tag, rust_serde_rename_template, rust_source_extension, rust_source_dir, rust_visibility, rust_string_types, rust_method_templates, rust_func_keyword, rust_async_prefix, rust_struct_keyword, rust_enum_keyword, rust_type_alias_keyword, rust_param_separator, rust_return_arrow, rust_param_type_sep, rust_module_keyword, rust_import_keyword, rust_import_from_keyword, rust_lambda_template, rust_error_expr_template, rust_list_literal_empty, rust_list_literal_template, rust_null_coalesce_template, rust_error_type_template, rust_type_arg_open, rust_type_arg_close, rust_void_type, rust_tuple_empty, rust_tuple_pair_template, rust_tuple_multi_template, rust_tuple_separator}; +pub use crate::extdeps_languages_python_emit::{python_keywords, python_reserved, python_reserved_escape_suffix, python_derive_attribute, python_default_value, python_source_extension, python_module_init, python_method_templates, python_string_types, python_func_keyword, python_async_prefix, python_struct_keyword, python_enum_keyword, python_type_alias_keyword, python_param_separator, python_return_arrow, python_param_type_sep, python_module_keyword, python_import_keyword, python_import_from_keyword, python_lambda_template, python_error_expr_template, python_list_literal_empty, python_list_literal_template, python_null_coalesce_template, python_error_type_template, python_type_arg_open, python_type_arg_close, python_void_type, python_tuple_empty, python_tuple_pair_template, python_tuple_multi_template, python_tuple_separator}; +pub use crate::extdeps_languages_go_emit::{go_keywords, go_reserved, go_reserved_escape_suffix, go_manifest_file, go_source_extension, go_method_templates, go_string_types, go_func_keyword, go_async_prefix, go_struct_keyword, go_enum_keyword, go_type_alias_keyword, go_param_separator, go_return_arrow, go_param_type_sep, go_module_keyword, go_import_keyword, go_import_from_keyword, go_lambda_template, go_error_expr_template, go_list_literal_empty, go_list_literal_template, go_null_coalesce_template, go_error_type_template, go_type_arg_open, go_type_arg_close, go_void_type, go_tuple_empty, go_tuple_pair_template, go_tuple_multi_template, go_tuple_separator}; +pub use crate::extdeps_languages_dag_emit::{dag_keywords, dag_container_templates, dag_reserved, dag_string_types, dag_func_keyword, dag_async_prefix, dag_struct_keyword, dag_enum_keyword, dag_type_alias_keyword, dag_param_separator, dag_return_arrow, dag_param_type_sep, dag_module_keyword, dag_import_keyword, dag_import_from_keyword, dag_source_extension, dag_lambda_template, dag_error_expr_template, dag_list_literal_empty, dag_list_literal_template, dag_null_coalesce_template, dag_error_type_template, dag_type_arg_open, dag_type_arg_close, dag_void_type, dag_tuple_empty, dag_tuple_pair_template, dag_tuple_multi_template, dag_tuple_separator}; +use self::ReservedWordStrategy::*; +use self::TestNameStyle::*; use self::ImportTrigger::*; -use self::InterpStyle::*; +use self::IfValueForm::*; use self::NamingCase::*; -use self::ReservedWordStrategy::*; +use self::VisibilitySpec::*; use self::ServiceMethodStrategy::*; use self::ServiceReturnStrategy::*; -use self::TestNameStyle::*; -use self::VisibilitySpec::*; -pub use crate::extdeps_languages_dag_emit::{ - dag_async_prefix, dag_container_templates, dag_enum_keyword, dag_error_expr_template, - dag_error_type_template, dag_func_keyword, dag_import_from_keyword, dag_import_keyword, - dag_keywords, dag_lambda_template, dag_list_literal_empty, dag_list_literal_template, - dag_module_keyword, dag_null_coalesce_template, dag_param_separator, dag_param_type_sep, - dag_reserved, dag_return_arrow, dag_source_extension, dag_string_types, dag_struct_keyword, - dag_tuple_empty, dag_tuple_multi_template, dag_tuple_pair_template, dag_tuple_separator, - dag_type_alias_keyword, dag_type_arg_close, dag_type_arg_open, dag_void_type, -}; -pub use crate::extdeps_languages_dag_syntax::dag_operators; -pub use crate::extdeps_languages_go_emit::{ - go_async_prefix, go_enum_keyword, go_error_expr_template, go_error_type_template, - go_func_keyword, go_import_from_keyword, go_import_keyword, go_keywords, go_lambda_template, - go_list_literal_empty, go_list_literal_template, go_manifest_file, go_method_templates, - go_module_keyword, go_null_coalesce_template, go_param_separator, go_param_type_sep, - go_reserved, go_reserved_escape_suffix, go_return_arrow, go_source_extension, go_string_types, - go_struct_keyword, go_tuple_empty, go_tuple_multi_template, go_tuple_pair_template, - go_tuple_separator, go_type_alias_keyword, go_type_arg_close, go_type_arg_open, go_void_type, -}; -pub use crate::extdeps_languages_go_syntax::{go_item_forms, go_operators}; -pub use crate::extdeps_languages_python_emit::{ - python_async_prefix, python_default_value, python_derive_attribute, python_enum_keyword, - python_error_expr_template, python_error_type_template, python_func_keyword, - python_import_from_keyword, python_import_keyword, python_keywords, python_lambda_template, - python_list_literal_empty, python_list_literal_template, python_method_templates, - python_module_init, python_module_keyword, python_null_coalesce_template, - python_param_separator, python_param_type_sep, python_reserved, python_reserved_escape_suffix, - python_return_arrow, python_source_extension, python_string_types, python_struct_keyword, - python_tuple_empty, python_tuple_multi_template, python_tuple_pair_template, - python_tuple_separator, python_type_alias_keyword, python_type_arg_close, python_type_arg_open, - python_void_type, -}; -pub use crate::extdeps_languages_python_syntax::{python_item_forms, python_operators}; -pub use crate::extdeps_languages_rust_emit::{ - rust_async_prefix, rust_container_templates, rust_enum_derives, rust_enum_derives_copy, - rust_enum_keyword, rust_error_expr_template, rust_error_type_template, rust_func_keyword, - rust_import_from_keyword, rust_import_keyword, rust_keywords, rust_lambda_template, - rust_list_literal_empty, rust_list_literal_template, rust_method_templates, - rust_module_keyword, rust_null_coalesce_template, rust_param_separator, rust_param_type_sep, - rust_reserved, rust_reserved_escape_prefix, rust_return_arrow, rust_serde_rename_template, - rust_serde_tag, rust_source_dir, rust_source_extension, rust_string_types, rust_struct_derives, - rust_struct_derives_copy, rust_struct_keyword, rust_tuple_empty, rust_tuple_multi_template, - rust_tuple_pair_template, rust_tuple_separator, rust_type_alias_keyword, rust_type_arg_close, - rust_type_arg_open, rust_visibility, rust_void_type, -}; -pub use crate::extdeps_languages_rust_syntax::{rust_item_forms, rust_operators}; -use crate::std_syntax::AlgebraFieldKind::*; -use crate::std_syntax::BodyKind::{ - BlockBody, ExprBody, NoBody, ResourceBody, ServiceBody, TypeBody, ValueBody, -}; -use crate::std_syntax::ItemFormKind::{ - EnumForm, FuncForm, ModuleForm, OtherForm, StructForm, TypeAliasForm, -}; -pub use crate::std_syntax::{ - AlgebraFieldKind, BodyKind, ItemForm, ItemFormKind, OperatorSpec, SyntaxSpec, -}; -pub use crate::v2_compiler_artifact::RenderTarget; -use crate::v2_compiler_artifact::RenderTarget::{Dag, Go, Python, Rust}; -use crate::v2_rt; -use crate::v2_std_core::BinOp::{ - Add, And, Div, Eq, Ge, Gt, Le, Lt, Mod, Mul, Ne, NullCoalesce, Or, Sub, -}; -use crate::v2_std_core::LiteralValue::*; -pub use crate::v2_std_core::{BinOp, LiteralValue}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; -use std::collections::HashMap; -use std::rc::Rc; +use self::InterpStyle::*; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum ReservedWordStrategy { - PrefixEscape { prefix: String }, - SuffixEscape { suffix: String }, + PrefixEscape { + prefix: String, + }, + SuffixEscape { + suffix: String, + }, NoEscape, } @@ -133,10 +91,18 @@ pub struct TestConventions { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum ImportTrigger { - TypeUsageTrigger { type_name: String }, - TraitImplTrigger { trait_name: String }, - DeriveMacroTrigger { macro_name: String }, - ContainerUsageTrigger { container: String }, + TypeUsageTrigger { + type_name: String, + }, + TraitImplTrigger { + trait_name: String, + }, + DeriveMacroTrigger { + macro_name: String, + }, + ContainerUsageTrigger { + container: String, + }, AsyncUsageTrigger, } @@ -245,8 +211,12 @@ pub enum NamingCase { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum VisibilitySpec { - KeywordVisibility { prefix: String }, - CaseVisibility { export_case: NamingCase }, + KeywordVisibility { + prefix: String, + }, + CaseVisibility { + export_case: NamingCase, + }, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -262,74 +232,64 @@ pub struct TcoSyntax { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum ServiceMethodStrategy { - SelfInParams { self_param: String }, - ExternalReceiver { var_name: String }, + SelfInParams { + self_param: String, + }, + ExternalReceiver { + var_name: String, + }, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum ServiceReturnStrategy { ArrowReturn, - ErrorTupleReturn { error_type: String }, + ErrorTupleReturn { + error_type: String, + }, } impl ServiceReturnStrategy { pub fn error_type(&self) -> String { match self { ServiceReturnStrategy::ArrowReturn => panic!("no error_type on unit variant"), - ServiceReturnStrategy::ErrorTupleReturn { - error_type: __val, .. - } => __val.clone(), + ServiceReturnStrategy::ErrorTupleReturn { error_type: __val, .. } => __val.clone(), } } } pub fn service_self_param(spec: Rc) -> String { match (*spec.service_method.clone()).clone() { - ServiceMethodStrategy::SelfInParams { self_param: sp, .. } => sp.clone(), - ServiceMethodStrategy::ExternalReceiver { .. } => "".to_string(), - } + ServiceMethodStrategy::SelfInParams { self_param: sp, .. } => sp.clone(), + ServiceMethodStrategy::ExternalReceiver { .. } => "".to_string(), +} } pub fn service_receiver_str(spec: Rc, service_name: String) -> String { match (*spec.service_method.clone()).clone() { - ServiceMethodStrategy::SelfInParams { .. } => "".to_string(), - ServiceMethodStrategy::ExternalReceiver { var_name: v, .. } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat(v2_rt::concat("(".to_string(), v.clone()), " *".to_string()), - service_name, - ), - ") ".to_string(), - ), - } + ServiceMethodStrategy::SelfInParams { .. } => "".to_string(), + ServiceMethodStrategy::ExternalReceiver { var_name: v, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("(".to_string(), v.clone()), " *".to_string()), service_name), ") ".to_string()), +} } pub fn service_method_depth(spec: Rc) -> i64 { match (*spec.service_method.clone()).clone() { - ServiceMethodStrategy::SelfInParams { .. } => 1, - ServiceMethodStrategy::ExternalReceiver { .. } => 0, - } + ServiceMethodStrategy::SelfInParams { .. } => 1, + ServiceMethodStrategy::ExternalReceiver { .. } => 0, +} } pub fn service_methods_inside_class(spec: Rc) -> bool { match (*spec.service_method.clone()).clone() { - ServiceMethodStrategy::SelfInParams { .. } => true, - ServiceMethodStrategy::ExternalReceiver { .. } => false, - } + ServiceMethodStrategy::SelfInParams { .. } => true, + ServiceMethodStrategy::ExternalReceiver { .. } => false, +} } pub fn service_return_str(spec: &Rc, ret_type: String) -> String { match (*spec.service_return.clone()).clone() { - ServiceReturnStrategy::ArrowReturn => { - v2_rt::concat(spec.items.clone().return_arrow.clone(), ret_type) - } - ServiceReturnStrategy::ErrorTupleReturn { error_type: et, .. } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat(v2_rt::concat(" (".to_string(), ret_type), ", ".to_string()), - et.clone(), - ), - ")".to_string(), - ), - } + ServiceReturnStrategy::ArrowReturn => v2_rt::concat(spec.items.clone().return_arrow.clone(), ret_type), + ServiceReturnStrategy::ErrorTupleReturn { error_type: et, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" (".to_string(), ret_type), ", ".to_string()), et.clone()), ")".to_string()), +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -349,20 +309,12 @@ pub struct ItemKeywords { pub fn item_keyword_for_kind(forms: Rc>>, kind: ItemFormKind) -> String { { - let matching = Rc::new({ - let mut __result = Vec::new(); - for f in forms.iter().cloned() { - if (f.kind.clone() == kind.clone()) { - __result.push(f); - } - } - __result - }); - match matching.first().cloned() { - Some(f) => f.keyword.clone(), - None => "__MISSING_ITEM_KEYWORD__".to_string(), - } - } + let matching = Rc::new({ let mut __result = Vec::new(); for f in forms.iter().cloned() { if (f.kind.clone() == kind.clone()) { __result.push(f); } } __result }); +match matching.first().cloned() { + Some(f) => f.keyword.clone(), + None => "__MISSING_ITEM_KEYWORD__".to_string(), +} +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -431,15 +383,15 @@ pub struct RecordLitSyntax { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum InterpStyle { - FormatArgs { placeholder: String }, + FormatArgs { + placeholder: String, + }, InlineExpr, } impl InterpStyle { pub fn placeholder(&self) -> String { match self { - InterpStyle::FormatArgs { - placeholder: __val, .. - } => __val.clone(), + InterpStyle::FormatArgs { placeholder: __val, .. } => __val.clone(), InterpStyle::InlineExpr => panic!("no placeholder on unit variant"), } } @@ -461,838 +413,760 @@ pub struct StringInterpSyntax { pub fn rust_spec() -> Rc { Rc::new(LanguageSpec { - target_name: "rust".to_string(), - reserved_words: Rc::new(ReservedWords { - keywords: rust_reserved(), - strategy: Rc::new(ReservedWordStrategy::PrefixEscape { - prefix: rust_reserved_escape_prefix(), - }), - }), - scaffold: Rc::new(ProjectScaffold { - manifest_file: Some("Cargo.toml".to_string()), - module_init_file: None, - source_file_extension: rust_source_extension(), - source_dir: Some(rust_source_dir()), - }), - serialization: Rc::new(SerializationSpec { - struct_derives: Some(rust_struct_derives()), - struct_derives_copy: Some(rust_struct_derives_copy()), - enum_derives: Some(rust_enum_derives()), - enum_derives_copy: Some(rust_enum_derives_copy()), - tag_attribute: Some(rust_serde_tag()), - rename_attribute_template: Some(rust_serde_rename_template()), - derive_attribute: None, - default_value: None, - }), - test_conventions: Rc::new(TestConventions { - file_prefix: "".to_string(), - file_suffix: "_test".to_string(), - file_dir: Some("tests/".to_string()), - function_prefix: "test_".to_string(), - name_style: TestNameStyle::SnakeCaseTestNames, - async_decorator: Some("#[tokio::test]".to_string()), - }), - visibility: Rc::new(VisibilitySpec::KeywordVisibility { - prefix: rust_visibility(), - }), - sharing: Rc::new(SharingStrategy { - needs_sharing: true, - wrap_template: "Rc<{0}>".to_string(), - clone_value: "{0}.clone()".to_string(), - deref_clone: "(*{0}).clone()".to_string(), - field_clone: "{0}.{1}.clone()".to_string(), - iter_owned: "{0}.iter().cloned()".to_string(), - clone_suffix: ".cloned()".to_string(), - borrow_param_template: "&{0}".to_string(), - borrow_arg_template: "&{0}".to_string(), - }), - indexing: Rc::new(IndexingSemantics { - list_index: "{0}[({1}) as usize].clone()".to_string(), - map_index: "({0}).get(&{1}).cloned()".to_string(), - string_index: "v2_rt::char_at(&{0}, {1})".to_string(), - list_slice: None, - string_slice: Some("v2_rt::substring(&{0}, {1}, {2})".to_string()), - }), - annotations: Rc::new(AnnotationRequirements { - let_binding_inferred: "let {0} = {1};".to_string(), - let_binding_annotated: "let {0}: {1} = {2};".to_string(), - lambda_param_typed: "{0}: {1}".to_string(), - lambda_param_untyped: "{0}".to_string(), - }), - method_templates: Some(rust_method_templates()), - service_fields: Rc::new(ServiceFieldTemplates { - rest_decl: " pub base_url: String,\n".to_string(), - auth_decl: " pub auth_token: String,\n".to_string(), - shell_decl: " pub working_dir: Option,\n".to_string(), - file_decl: " pub base_path: String,\n".to_string(), - rest_ctor: " base_url: \"{0}\".to_string(),\n".to_string(), - auth_ctor: " auth_token: String::new(),\n".to_string(), - shell_ctor: " working_dir: None,\n".to_string(), - file_ctor: " base_path: \".\".to_string(),\n".to_string(), - }), - block_syntax: Rc::new(BlockSyntax { - block_open: " {\n".to_string(), - block_close: "}".to_string(), - else_clause: "} else {\n".to_string(), - match_keyword: "match ".to_string(), - case_keyword: "".to_string(), - arm_separator: ",".to_string(), - stmt_terminator: ";".to_string(), - significant_whitespace: false, - }), - for_each_syntax: Rc::new(ForEachSyntax { - prefix: "for ".to_string(), - separator: " in ".to_string(), - }), - tco: Rc::new(TcoSyntax { - loop_keyword: "loop".to_string(), - break_return: "break".to_string(), - continue_str: "continue;".to_string(), - temp_var_prefix: "__tco_".to_string(), - temp_decl_prefix: "let ".to_string(), - temp_assign_op: " = ".to_string(), - }), - items: Rc::new(ItemKeywords { - func_keyword: item_keyword_for_kind(rust_item_forms(), ItemFormKind::FuncForm), - async_prefix: rust_async_prefix(), - struct_keyword: item_keyword_for_kind(rust_item_forms(), ItemFormKind::StructForm), - enum_keyword: item_keyword_for_kind(rust_item_forms(), ItemFormKind::EnumForm), - type_alias_keyword: item_keyword_for_kind( - rust_item_forms(), - ItemFormKind::TypeAliasForm, - ), - param_separator: rust_param_separator(), - return_arrow: rust_return_arrow(), - param_type_sep: rust_param_type_sep(), - module_keyword: item_keyword_for_kind(rust_item_forms(), ItemFormKind::ModuleForm), - import_keyword: rust_import_keyword(), - import_from_keyword: rust_import_from_keyword(), - }), - expression_semantics: Rc::new(ExpressionSemantics { - if_value_form: IfValueForm::IfExpression, - wildcard_case: None, - variant_pattern: Some(Rc::new(VariantPatternSyntax { - open: " { ".to_string(), - close: " }".to_string(), - binding_sep: ": ".to_string(), - empty_suffix: "".to_string(), - })), - guard_prefix: Some(" if ".to_string()), - empty_return_value: "()".to_string(), - return_suffix: "".to_string(), - suppress_unit_return: false, - }), - lambda_template: rust_lambda_template(), - error_expr_template: rust_error_expr_template(), - list_literal_empty: rust_list_literal_empty(), - list_literal_template: rust_list_literal_template(), - null_coalesce_template: rust_null_coalesce_template(), - error_type_template: rust_error_type_template(), - type_arg_open: rust_type_arg_open(), - type_arg_close: rust_type_arg_close(), - void_type: rust_void_type(), - tuple_syntax: Rc::new(TupleSyntax { - empty: rust_tuple_empty(), - pair_template: rust_tuple_pair_template(), - multi_template: rust_tuple_multi_template(), - separator: rust_tuple_separator(), - first_accessor: ".0".to_string(), - second_accessor: ".1".to_string(), - }), - string_interp: Rc::new(StringInterpSyntax { - style: Rc::new(InterpStyle::FormatArgs { - placeholder: "{}".to_string(), - }), - format_template: "format!(\"{0}\", {1})".to_string(), - plain_template: "\"{0}\".to_string()".to_string(), - escape_pairs: Rc::new(vec![ - Rc::new(EscapePair { - from: "{".to_string(), - to: "{{".to_string(), - }), - Rc::new(EscapePair { - from: "}".to_string(), - to: "}}".to_string(), - }), - ]), - }), - callable_type_template: Some("Rc {return}>".to_string()), - naming_case: NamingCase::SnakeCase, - async_call_prefix: "".to_string(), - bridge_method_prefix: "".to_string(), - bridge_method_case: NamingCase::SnakeCase, - bridge_method_overrides: v2_rt::rc_empty_map::(), - record_lit: Rc::new(RecordLitSyntax { - named_open: " {".to_string(), - named_close: "}".to_string(), - named_empty: " {}".to_string(), - named_field_sep: ": ".to_string(), - named_field_join: ", ".to_string(), - anon_empty: "{}".to_string(), - anon_prefix: "{\n".to_string(), - anon_suffix: "}".to_string(), - anon_field_indent: " ".to_string(), - }), - service_method: Rc::new(ServiceMethodStrategy::SelfInParams { - self_param: "&self".to_string(), - }), - service_return: Rc::new(ServiceReturnStrategy::ArrowReturn), - }) + target_name: "rust".to_string(), + reserved_words: Rc::new(ReservedWords { + keywords: rust_reserved(), + strategy: Rc::new(ReservedWordStrategy::PrefixEscape { + prefix: rust_reserved_escape_prefix(), +}), +}), + scaffold: Rc::new(ProjectScaffold { + manifest_file: Some("Cargo.toml".to_string()), + module_init_file: None, + source_file_extension: rust_source_extension(), + source_dir: Some(rust_source_dir()), +}), + serialization: Rc::new(SerializationSpec { + struct_derives: Some(rust_struct_derives()), + struct_derives_copy: Some(rust_struct_derives_copy()), + enum_derives: Some(rust_enum_derives()), + enum_derives_copy: Some(rust_enum_derives_copy()), + tag_attribute: Some(rust_serde_tag()), + rename_attribute_template: Some(rust_serde_rename_template()), + derive_attribute: None, + default_value: None, +}), + test_conventions: Rc::new(TestConventions { + file_prefix: "".to_string(), + file_suffix: "_test".to_string(), + file_dir: Some("tests/".to_string()), + function_prefix: "test_".to_string(), + name_style: TestNameStyle::SnakeCaseTestNames, + async_decorator: Some("#[tokio::test]".to_string()), +}), + visibility: Rc::new(VisibilitySpec::KeywordVisibility { + prefix: rust_visibility(), +}), + sharing: Rc::new(SharingStrategy { + needs_sharing: true, + wrap_template: "Rc<{0}>".to_string(), + clone_value: "{0}.clone()".to_string(), + deref_clone: "(*{0}).clone()".to_string(), + field_clone: "{0}.{1}.clone()".to_string(), + iter_owned: "{0}.iter().cloned()".to_string(), + clone_suffix: ".cloned()".to_string(), + borrow_param_template: "&{0}".to_string(), + borrow_arg_template: "&{0}".to_string(), +}), + indexing: Rc::new(IndexingSemantics { + list_index: "{0}[({1}) as usize].clone()".to_string(), + map_index: "({0}).get(&{1}).cloned()".to_string(), + string_index: "v2_rt::char_at(&{0}, {1})".to_string(), + list_slice: None, + string_slice: Some("v2_rt::substring(&{0}, {1}, {2})".to_string()), +}), + annotations: Rc::new(AnnotationRequirements { + let_binding_inferred: "let {0} = {1};".to_string(), + let_binding_annotated: "let {0}: {1} = {2};".to_string(), + lambda_param_typed: "{0}: {1}".to_string(), + lambda_param_untyped: "{0}".to_string(), +}), + method_templates: Some(rust_method_templates()), + service_fields: Rc::new(ServiceFieldTemplates { + rest_decl: " pub base_url: String,\n".to_string(), + auth_decl: " pub auth_token: String,\n".to_string(), + shell_decl: " pub working_dir: Option,\n".to_string(), + file_decl: " pub base_path: String,\n".to_string(), + rest_ctor: " base_url: \"{0}\".to_string(),\n".to_string(), + auth_ctor: " auth_token: String::new(),\n".to_string(), + shell_ctor: " working_dir: None,\n".to_string(), + file_ctor: " base_path: \".\".to_string(),\n".to_string(), +}), + block_syntax: Rc::new(BlockSyntax { + block_open: " {\n".to_string(), + block_close: "}".to_string(), + else_clause: "} else {\n".to_string(), + match_keyword: "match ".to_string(), + case_keyword: "".to_string(), + arm_separator: ",".to_string(), + stmt_terminator: ";".to_string(), + significant_whitespace: false, +}), + for_each_syntax: Rc::new(ForEachSyntax { + prefix: "for ".to_string(), + separator: " in ".to_string(), +}), + tco: Rc::new(TcoSyntax { + loop_keyword: "loop".to_string(), + break_return: "break".to_string(), + continue_str: "continue;".to_string(), + temp_var_prefix: "__tco_".to_string(), + temp_decl_prefix: "let ".to_string(), + temp_assign_op: " = ".to_string(), +}), + items: Rc::new(ItemKeywords { + func_keyword: item_keyword_for_kind(rust_item_forms(), ItemFormKind::FuncForm), + async_prefix: rust_async_prefix(), + struct_keyword: item_keyword_for_kind(rust_item_forms(), ItemFormKind::StructForm), + enum_keyword: item_keyword_for_kind(rust_item_forms(), ItemFormKind::EnumForm), + type_alias_keyword: item_keyword_for_kind(rust_item_forms(), ItemFormKind::TypeAliasForm), + param_separator: rust_param_separator(), + return_arrow: rust_return_arrow(), + param_type_sep: rust_param_type_sep(), + module_keyword: item_keyword_for_kind(rust_item_forms(), ItemFormKind::ModuleForm), + import_keyword: rust_import_keyword(), + import_from_keyword: rust_import_from_keyword(), +}), + expression_semantics: Rc::new(ExpressionSemantics { + if_value_form: IfValueForm::IfExpression, + wildcard_case: None, + variant_pattern: Some(Rc::new(VariantPatternSyntax { + open: " { ".to_string(), + close: " }".to_string(), + binding_sep: ": ".to_string(), + empty_suffix: "".to_string(), +})), + guard_prefix: Some(" if ".to_string()), + empty_return_value: "()".to_string(), + return_suffix: "".to_string(), + suppress_unit_return: false, +}), + lambda_template: rust_lambda_template(), + error_expr_template: rust_error_expr_template(), + list_literal_empty: rust_list_literal_empty(), + list_literal_template: rust_list_literal_template(), + null_coalesce_template: rust_null_coalesce_template(), + error_type_template: rust_error_type_template(), + type_arg_open: rust_type_arg_open(), + type_arg_close: rust_type_arg_close(), + void_type: rust_void_type(), + tuple_syntax: Rc::new(TupleSyntax { + empty: rust_tuple_empty(), + pair_template: rust_tuple_pair_template(), + multi_template: rust_tuple_multi_template(), + separator: rust_tuple_separator(), + first_accessor: ".0".to_string(), + second_accessor: ".1".to_string(), +}), + string_interp: Rc::new(StringInterpSyntax { + style: Rc::new(InterpStyle::FormatArgs { + placeholder: "{}".to_string(), +}), + format_template: "format!(\"{0}\", {1})".to_string(), + plain_template: "\"{0}\".to_string()".to_string(), + escape_pairs: Rc::new(vec![Rc::new(EscapePair { + from: "{".to_string(), + to: "{{".to_string(), +}), Rc::new(EscapePair { + from: "}".to_string(), + to: "}}".to_string(), +})]), +}), + callable_type_template: Some("Rc {return}>".to_string()), + naming_case: NamingCase::SnakeCase, + async_call_prefix: "".to_string(), + bridge_method_prefix: "".to_string(), + bridge_method_case: NamingCase::SnakeCase, + bridge_method_overrides: v2_rt::rc_empty_map::(), + record_lit: Rc::new(RecordLitSyntax { + named_open: " {".to_string(), + named_close: "}".to_string(), + named_empty: " {}".to_string(), + named_field_sep: ": ".to_string(), + named_field_join: ", ".to_string(), + anon_empty: "{}".to_string(), + anon_prefix: "{\n".to_string(), + anon_suffix: "}".to_string(), + anon_field_indent: " ".to_string(), +}), + service_method: Rc::new(ServiceMethodStrategy::SelfInParams { + self_param: "&self".to_string(), +}), + service_return: Rc::new(ServiceReturnStrategy::ArrowReturn), +}) } pub fn python_spec() -> Rc { Rc::new(LanguageSpec { - target_name: "python".to_string(), - reserved_words: Rc::new(ReservedWords { - keywords: python_reserved(), - strategy: Rc::new(ReservedWordStrategy::SuffixEscape { - suffix: python_reserved_escape_suffix(), - }), - }), - scaffold: Rc::new(ProjectScaffold { - manifest_file: Some("requirements.txt".to_string()), - module_init_file: Some(python_module_init()), - source_file_extension: python_source_extension(), - source_dir: None, - }), - serialization: Rc::new(SerializationSpec { - struct_derives: None, - struct_derives_copy: None, - enum_derives: None, - enum_derives_copy: None, - tag_attribute: None, - rename_attribute_template: None, - derive_attribute: Some(python_derive_attribute()), - default_value: Some(python_default_value()), - }), - test_conventions: Rc::new(TestConventions { - file_prefix: "test_".to_string(), - file_suffix: "".to_string(), - file_dir: Some("tests/".to_string()), - function_prefix: "test_".to_string(), - name_style: TestNameStyle::SnakeCaseTestNames, - async_decorator: None, - }), - visibility: Rc::new(VisibilitySpec::KeywordVisibility { - prefix: "".to_string(), - }), - sharing: Rc::new(SharingStrategy { - needs_sharing: false, - wrap_template: "{0}".to_string(), - clone_value: "{0}".to_string(), - deref_clone: "{0}".to_string(), - field_clone: "{0}.{1}".to_string(), - iter_owned: "{0}".to_string(), - clone_suffix: "".to_string(), - borrow_param_template: "{0}".to_string(), - borrow_arg_template: "{0}".to_string(), - }), - indexing: Rc::new(IndexingSemantics { - list_index: "{0}[{1}]".to_string(), - map_index: "{0}[{1}]".to_string(), - string_index: "{0}[{1}]".to_string(), - list_slice: Some("{0}[{1}:{2}]".to_string()), - string_slice: Some("{0}[{1}:{2}]".to_string()), - }), - annotations: Rc::new(AnnotationRequirements { - let_binding_inferred: "{0} = {1}".to_string(), - let_binding_annotated: "{0}: {1} = {2}".to_string(), - lambda_param_typed: "{0}: {1}".to_string(), - lambda_param_untyped: "{0}".to_string(), - }), - method_templates: Some(python_method_templates()), - service_fields: Rc::new(ServiceFieldTemplates { - rest_decl: "base_url: str".to_string(), - auth_decl: "auth_token: str".to_string(), - shell_decl: "working_dir: str | None = None".to_string(), - file_decl: "base_path: str".to_string(), - rest_ctor: "self.base_url = base_url".to_string(), - auth_ctor: "self.auth_token = auth_token".to_string(), - shell_ctor: "self.working_dir = working_dir".to_string(), - file_ctor: "self.base_path = base_path".to_string(), - }), - block_syntax: Rc::new(BlockSyntax { - block_open: ":\n".to_string(), - block_close: "".to_string(), - else_clause: "else:\n".to_string(), - match_keyword: "match ".to_string(), - case_keyword: "case ".to_string(), - arm_separator: "\n".to_string(), - stmt_terminator: "".to_string(), - significant_whitespace: true, - }), - for_each_syntax: Rc::new(ForEachSyntax { - prefix: "for ".to_string(), - separator: " in ".to_string(), - }), - tco: Rc::new(TcoSyntax { - loop_keyword: "while True".to_string(), - break_return: "return".to_string(), - continue_str: "continue".to_string(), - temp_var_prefix: "__tco_".to_string(), - temp_decl_prefix: "".to_string(), - temp_assign_op: " = ".to_string(), - }), - items: Rc::new(ItemKeywords { - func_keyword: item_keyword_for_kind(python_item_forms(), ItemFormKind::FuncForm), - async_prefix: python_async_prefix(), - struct_keyword: item_keyword_for_kind(python_item_forms(), ItemFormKind::StructForm), - enum_keyword: item_keyword_for_kind(python_item_forms(), ItemFormKind::EnumForm), - type_alias_keyword: item_keyword_for_kind( - python_item_forms(), - ItemFormKind::TypeAliasForm, - ), - param_separator: python_param_separator(), - return_arrow: python_return_arrow(), - param_type_sep: python_param_type_sep(), - module_keyword: item_keyword_for_kind(python_item_forms(), ItemFormKind::ModuleForm), - import_keyword: python_import_keyword(), - import_from_keyword: python_import_from_keyword(), - }), - expression_semantics: Rc::new(ExpressionSemantics { - if_value_form: IfValueForm::ConditionalTernary, - wildcard_case: None, - variant_pattern: Some(Rc::new(VariantPatternSyntax { - open: "(".to_string(), - close: ")".to_string(), - binding_sep: "=".to_string(), - empty_suffix: "()".to_string(), - })), - guard_prefix: Some(" if ".to_string()), - empty_return_value: "None".to_string(), - return_suffix: "".to_string(), - suppress_unit_return: false, - }), - lambda_template: python_lambda_template(), - error_expr_template: python_error_expr_template(), - list_literal_empty: python_list_literal_empty(), - list_literal_template: python_list_literal_template(), - null_coalesce_template: python_null_coalesce_template(), - error_type_template: python_error_type_template(), - type_arg_open: python_type_arg_open(), - type_arg_close: python_type_arg_close(), - void_type: python_void_type(), - tuple_syntax: Rc::new(TupleSyntax { - empty: python_tuple_empty(), - pair_template: python_tuple_pair_template(), - multi_template: python_tuple_multi_template(), - separator: python_tuple_separator(), - first_accessor: "[0]".to_string(), - second_accessor: "[1]".to_string(), - }), - string_interp: Rc::new(StringInterpSyntax { - style: Rc::new(InterpStyle::InlineExpr), - format_template: "f\"{0}\"".to_string(), - plain_template: "f\"{0}\"".to_string(), - escape_pairs: Rc::new(vec![ - Rc::new(EscapePair { - from: "{".to_string(), - to: "{{".to_string(), - }), - Rc::new(EscapePair { - from: "}".to_string(), - to: "}}".to_string(), - }), - ]), - }), - callable_type_template: None, - naming_case: NamingCase::SnakeCase, - async_call_prefix: "await ".to_string(), - bridge_method_prefix: "".to_string(), - bridge_method_case: NamingCase::SnakeCase, - bridge_method_overrides: v2_rt::rc_map_insert( - v2_rt::rc_empty_map::(), - "with".to_string(), - "with_update".to_string(), - ), - record_lit: Rc::new(RecordLitSyntax { - named_open: "(".to_string(), - named_close: ")".to_string(), - named_empty: "()".to_string(), - named_field_sep: "=".to_string(), - named_field_join: ", ".to_string(), - anon_empty: "{}".to_string(), - anon_prefix: "{\n".to_string(), - anon_suffix: "}".to_string(), - anon_field_indent: " ".to_string(), - }), - service_method: Rc::new(ServiceMethodStrategy::SelfInParams { - self_param: "self".to_string(), - }), - service_return: Rc::new(ServiceReturnStrategy::ArrowReturn), - }) + target_name: "python".to_string(), + reserved_words: Rc::new(ReservedWords { + keywords: python_reserved(), + strategy: Rc::new(ReservedWordStrategy::SuffixEscape { + suffix: python_reserved_escape_suffix(), +}), +}), + scaffold: Rc::new(ProjectScaffold { + manifest_file: Some("requirements.txt".to_string()), + module_init_file: Some(python_module_init()), + source_file_extension: python_source_extension(), + source_dir: None, +}), + serialization: Rc::new(SerializationSpec { + struct_derives: None, + struct_derives_copy: None, + enum_derives: None, + enum_derives_copy: None, + tag_attribute: None, + rename_attribute_template: None, + derive_attribute: Some(python_derive_attribute()), + default_value: Some(python_default_value()), +}), + test_conventions: Rc::new(TestConventions { + file_prefix: "test_".to_string(), + file_suffix: "".to_string(), + file_dir: Some("tests/".to_string()), + function_prefix: "test_".to_string(), + name_style: TestNameStyle::SnakeCaseTestNames, + async_decorator: None, +}), + visibility: Rc::new(VisibilitySpec::KeywordVisibility { + prefix: "".to_string(), +}), + sharing: Rc::new(SharingStrategy { + needs_sharing: false, + wrap_template: "{0}".to_string(), + clone_value: "{0}".to_string(), + deref_clone: "{0}".to_string(), + field_clone: "{0}.{1}".to_string(), + iter_owned: "{0}".to_string(), + clone_suffix: "".to_string(), + borrow_param_template: "{0}".to_string(), + borrow_arg_template: "{0}".to_string(), +}), + indexing: Rc::new(IndexingSemantics { + list_index: "{0}[{1}]".to_string(), + map_index: "{0}[{1}]".to_string(), + string_index: "{0}[{1}]".to_string(), + list_slice: Some("{0}[{1}:{2}]".to_string()), + string_slice: Some("{0}[{1}:{2}]".to_string()), +}), + annotations: Rc::new(AnnotationRequirements { + let_binding_inferred: "{0} = {1}".to_string(), + let_binding_annotated: "{0}: {1} = {2}".to_string(), + lambda_param_typed: "{0}: {1}".to_string(), + lambda_param_untyped: "{0}".to_string(), +}), + method_templates: Some(python_method_templates()), + service_fields: Rc::new(ServiceFieldTemplates { + rest_decl: "base_url: str".to_string(), + auth_decl: "auth_token: str".to_string(), + shell_decl: "working_dir: str | None = None".to_string(), + file_decl: "base_path: str".to_string(), + rest_ctor: "self.base_url = base_url".to_string(), + auth_ctor: "self.auth_token = auth_token".to_string(), + shell_ctor: "self.working_dir = working_dir".to_string(), + file_ctor: "self.base_path = base_path".to_string(), +}), + block_syntax: Rc::new(BlockSyntax { + block_open: ":\n".to_string(), + block_close: "".to_string(), + else_clause: "else:\n".to_string(), + match_keyword: "match ".to_string(), + case_keyword: "case ".to_string(), + arm_separator: "\n".to_string(), + stmt_terminator: "".to_string(), + significant_whitespace: true, +}), + for_each_syntax: Rc::new(ForEachSyntax { + prefix: "for ".to_string(), + separator: " in ".to_string(), +}), + tco: Rc::new(TcoSyntax { + loop_keyword: "while True".to_string(), + break_return: "return".to_string(), + continue_str: "continue".to_string(), + temp_var_prefix: "__tco_".to_string(), + temp_decl_prefix: "".to_string(), + temp_assign_op: " = ".to_string(), +}), + items: Rc::new(ItemKeywords { + func_keyword: item_keyword_for_kind(python_item_forms(), ItemFormKind::FuncForm), + async_prefix: python_async_prefix(), + struct_keyword: item_keyword_for_kind(python_item_forms(), ItemFormKind::StructForm), + enum_keyword: item_keyword_for_kind(python_item_forms(), ItemFormKind::EnumForm), + type_alias_keyword: item_keyword_for_kind(python_item_forms(), ItemFormKind::TypeAliasForm), + param_separator: python_param_separator(), + return_arrow: python_return_arrow(), + param_type_sep: python_param_type_sep(), + module_keyword: item_keyword_for_kind(python_item_forms(), ItemFormKind::ModuleForm), + import_keyword: python_import_keyword(), + import_from_keyword: python_import_from_keyword(), +}), + expression_semantics: Rc::new(ExpressionSemantics { + if_value_form: IfValueForm::ConditionalTernary, + wildcard_case: None, + variant_pattern: Some(Rc::new(VariantPatternSyntax { + open: "(".to_string(), + close: ")".to_string(), + binding_sep: "=".to_string(), + empty_suffix: "()".to_string(), +})), + guard_prefix: Some(" if ".to_string()), + empty_return_value: "None".to_string(), + return_suffix: "".to_string(), + suppress_unit_return: false, +}), + lambda_template: python_lambda_template(), + error_expr_template: python_error_expr_template(), + list_literal_empty: python_list_literal_empty(), + list_literal_template: python_list_literal_template(), + null_coalesce_template: python_null_coalesce_template(), + error_type_template: python_error_type_template(), + type_arg_open: python_type_arg_open(), + type_arg_close: python_type_arg_close(), + void_type: python_void_type(), + tuple_syntax: Rc::new(TupleSyntax { + empty: python_tuple_empty(), + pair_template: python_tuple_pair_template(), + multi_template: python_tuple_multi_template(), + separator: python_tuple_separator(), + first_accessor: "[0]".to_string(), + second_accessor: "[1]".to_string(), +}), + string_interp: Rc::new(StringInterpSyntax { + style: Rc::new(InterpStyle::InlineExpr), + format_template: "f\"{0}\"".to_string(), + plain_template: "f\"{0}\"".to_string(), + escape_pairs: Rc::new(vec![Rc::new(EscapePair { + from: "{".to_string(), + to: "{{".to_string(), +}), Rc::new(EscapePair { + from: "}".to_string(), + to: "}}".to_string(), +})]), +}), + callable_type_template: None, + naming_case: NamingCase::SnakeCase, + async_call_prefix: "await ".to_string(), + bridge_method_prefix: "".to_string(), + bridge_method_case: NamingCase::SnakeCase, + bridge_method_overrides: v2_rt::rc_map_insert(v2_rt::rc_empty_map::(), "with".to_string(), "with_update".to_string()), + record_lit: Rc::new(RecordLitSyntax { + named_open: "(".to_string(), + named_close: ")".to_string(), + named_empty: "()".to_string(), + named_field_sep: "=".to_string(), + named_field_join: ", ".to_string(), + anon_empty: "{}".to_string(), + anon_prefix: "{\n".to_string(), + anon_suffix: "}".to_string(), + anon_field_indent: " ".to_string(), +}), + service_method: Rc::new(ServiceMethodStrategy::SelfInParams { + self_param: "self".to_string(), +}), + service_return: Rc::new(ServiceReturnStrategy::ArrowReturn), +}) } pub fn go_spec() -> Rc { Rc::new(LanguageSpec { - target_name: "go".to_string(), - reserved_words: Rc::new(ReservedWords { - keywords: go_reserved(), - strategy: Rc::new(ReservedWordStrategy::SuffixEscape { - suffix: go_reserved_escape_suffix(), - }), - }), - scaffold: Rc::new(ProjectScaffold { - manifest_file: Some("go.mod".to_string()), - module_init_file: None, - source_file_extension: ".go".to_string(), - source_dir: None, - }), - serialization: Rc::new(SerializationSpec { - struct_derives: None, - struct_derives_copy: None, - enum_derives: None, - enum_derives_copy: None, - tag_attribute: None, - rename_attribute_template: None, - derive_attribute: None, - default_value: None, - }), - test_conventions: Rc::new(TestConventions { - file_prefix: "".to_string(), - file_suffix: "_test".to_string(), - file_dir: None, - function_prefix: "Test".to_string(), - name_style: TestNameStyle::PascalCaseTestNames, - async_decorator: None, - }), - visibility: Rc::new(VisibilitySpec::CaseVisibility { - export_case: NamingCase::PascalCase, - }), - sharing: Rc::new(SharingStrategy { - needs_sharing: false, - wrap_template: "{0}".to_string(), - clone_value: "{0}".to_string(), - deref_clone: "{0}".to_string(), - field_clone: "{0}.{1}".to_string(), - iter_owned: "{0}".to_string(), - clone_suffix: "".to_string(), - borrow_param_template: "{0}".to_string(), - borrow_arg_template: "{0}".to_string(), - }), - indexing: Rc::new(IndexingSemantics { - list_index: "{0}[{1}]".to_string(), - map_index: "{0}[{1}]".to_string(), - string_index: "{0}[{1}]".to_string(), - list_slice: Some("{0}[{1}:{2}]".to_string()), - string_slice: Some("{0}[{1}:{2}]".to_string()), - }), - annotations: Rc::new(AnnotationRequirements { - let_binding_inferred: "{0} := {1}".to_string(), - let_binding_annotated: "var {0} {1} = {2}".to_string(), - lambda_param_typed: "{0} {1}".to_string(), - lambda_param_untyped: "{0} interface{}".to_string(), - }), - method_templates: Some(go_method_templates()), - service_fields: Rc::new(ServiceFieldTemplates { - rest_decl: "\tBaseURL string".to_string(), - auth_decl: "\tAuthToken string".to_string(), - shell_decl: "\tWorkingDir string".to_string(), - file_decl: "\tBasePath string".to_string(), - rest_ctor: "".to_string(), - auth_ctor: "".to_string(), - shell_ctor: "".to_string(), - file_ctor: "".to_string(), - }), - block_syntax: Rc::new(BlockSyntax { - block_open: " {\n".to_string(), - block_close: "}".to_string(), - else_clause: "} else {\n".to_string(), - match_keyword: "switch ".to_string(), - case_keyword: "case ".to_string(), - arm_separator: "\n".to_string(), - stmt_terminator: "".to_string(), - significant_whitespace: false, - }), - for_each_syntax: Rc::new(ForEachSyntax { - prefix: "for _, ".to_string(), - separator: " := range ".to_string(), - }), - tco: Rc::new(TcoSyntax { - loop_keyword: "for".to_string(), - break_return: "return".to_string(), - continue_str: "continue".to_string(), - temp_var_prefix: "tco".to_string(), - temp_decl_prefix: "".to_string(), - temp_assign_op: " := ".to_string(), - }), - items: Rc::new(ItemKeywords { - func_keyword: item_keyword_for_kind(go_item_forms(), ItemFormKind::FuncForm), - async_prefix: go_async_prefix(), - struct_keyword: item_keyword_for_kind(go_item_forms(), ItemFormKind::StructForm), - enum_keyword: item_keyword_for_kind(go_item_forms(), ItemFormKind::EnumForm), - type_alias_keyword: item_keyword_for_kind(go_item_forms(), ItemFormKind::TypeAliasForm), - param_separator: go_param_separator(), - return_arrow: go_return_arrow(), - param_type_sep: go_param_type_sep(), - module_keyword: item_keyword_for_kind(go_item_forms(), ItemFormKind::ModuleForm), - import_keyword: go_import_keyword(), - import_from_keyword: go_import_from_keyword(), - }), - expression_semantics: Rc::new(ExpressionSemantics { - if_value_form: IfValueForm::IfStatement, - wildcard_case: Some("default".to_string()), - variant_pattern: None, - guard_prefix: None, - empty_return_value: "struct{}{}, nil".to_string(), - return_suffix: ", nil".to_string(), - suppress_unit_return: true, - }), - lambda_template: go_lambda_template(), - error_expr_template: go_error_expr_template(), - list_literal_empty: go_list_literal_empty(), - list_literal_template: go_list_literal_template(), - null_coalesce_template: go_null_coalesce_template(), - error_type_template: go_error_type_template(), - type_arg_open: go_type_arg_open(), - type_arg_close: go_type_arg_close(), - void_type: go_void_type(), - tuple_syntax: Rc::new(TupleSyntax { - empty: go_tuple_empty(), - pair_template: go_tuple_pair_template(), - multi_template: go_tuple_multi_template(), - separator: go_tuple_separator(), - first_accessor: ".First".to_string(), - second_accessor: ".Second".to_string(), - }), - string_interp: Rc::new(StringInterpSyntax { - style: Rc::new(InterpStyle::FormatArgs { - placeholder: "%v".to_string(), - }), - format_template: "fmt.Sprintf(\"{0}\", {1})".to_string(), - plain_template: "\"{0}\"".to_string(), - escape_pairs: Rc::new(vec![Rc::new(EscapePair { - from: "%".to_string(), - to: "%%".to_string(), - })]), - }), - callable_type_template: None, - naming_case: NamingCase::CamelCase, - async_call_prefix: "".to_string(), - bridge_method_prefix: "v2rt.".to_string(), - bridge_method_case: NamingCase::PascalCase, - bridge_method_overrides: v2_rt::rc_empty_map::(), - record_lit: Rc::new(RecordLitSyntax { - named_open: "{".to_string(), - named_close: "}".to_string(), - named_empty: "{}".to_string(), - named_field_sep: ": ".to_string(), - named_field_join: ", ".to_string(), - anon_empty: "map[string]interface{}{}".to_string(), - anon_prefix: "map[string]interface{}{\n".to_string(), - anon_suffix: "}".to_string(), - anon_field_indent: "\t".to_string(), - }), - service_method: Rc::new(ServiceMethodStrategy::ExternalReceiver { - var_name: "c".to_string(), - }), - service_return: Rc::new(ServiceReturnStrategy::ErrorTupleReturn { - error_type: "error".to_string(), - }), - }) + target_name: "go".to_string(), + reserved_words: Rc::new(ReservedWords { + keywords: go_reserved(), + strategy: Rc::new(ReservedWordStrategy::SuffixEscape { + suffix: go_reserved_escape_suffix(), +}), +}), + scaffold: Rc::new(ProjectScaffold { + manifest_file: Some("go.mod".to_string()), + module_init_file: None, + source_file_extension: ".go".to_string(), + source_dir: None, +}), + serialization: Rc::new(SerializationSpec { + struct_derives: None, + struct_derives_copy: None, + enum_derives: None, + enum_derives_copy: None, + tag_attribute: None, + rename_attribute_template: None, + derive_attribute: None, + default_value: None, +}), + test_conventions: Rc::new(TestConventions { + file_prefix: "".to_string(), + file_suffix: "_test".to_string(), + file_dir: None, + function_prefix: "Test".to_string(), + name_style: TestNameStyle::PascalCaseTestNames, + async_decorator: None, +}), + visibility: Rc::new(VisibilitySpec::CaseVisibility { + export_case: NamingCase::PascalCase, +}), + sharing: Rc::new(SharingStrategy { + needs_sharing: false, + wrap_template: "{0}".to_string(), + clone_value: "{0}".to_string(), + deref_clone: "{0}".to_string(), + field_clone: "{0}.{1}".to_string(), + iter_owned: "{0}".to_string(), + clone_suffix: "".to_string(), + borrow_param_template: "{0}".to_string(), + borrow_arg_template: "{0}".to_string(), +}), + indexing: Rc::new(IndexingSemantics { + list_index: "{0}[{1}]".to_string(), + map_index: "{0}[{1}]".to_string(), + string_index: "{0}[{1}]".to_string(), + list_slice: Some("{0}[{1}:{2}]".to_string()), + string_slice: Some("{0}[{1}:{2}]".to_string()), +}), + annotations: Rc::new(AnnotationRequirements { + let_binding_inferred: "{0} := {1}".to_string(), + let_binding_annotated: "var {0} {1} = {2}".to_string(), + lambda_param_typed: "{0} {1}".to_string(), + lambda_param_untyped: "{0} interface{}".to_string(), +}), + method_templates: Some(go_method_templates()), + service_fields: Rc::new(ServiceFieldTemplates { + rest_decl: "\tBaseURL string".to_string(), + auth_decl: "\tAuthToken string".to_string(), + shell_decl: "\tWorkingDir string".to_string(), + file_decl: "\tBasePath string".to_string(), + rest_ctor: "".to_string(), + auth_ctor: "".to_string(), + shell_ctor: "".to_string(), + file_ctor: "".to_string(), +}), + block_syntax: Rc::new(BlockSyntax { + block_open: " {\n".to_string(), + block_close: "}".to_string(), + else_clause: "} else {\n".to_string(), + match_keyword: "switch ".to_string(), + case_keyword: "case ".to_string(), + arm_separator: "\n".to_string(), + stmt_terminator: "".to_string(), + significant_whitespace: false, +}), + for_each_syntax: Rc::new(ForEachSyntax { + prefix: "for _, ".to_string(), + separator: " := range ".to_string(), +}), + tco: Rc::new(TcoSyntax { + loop_keyword: "for".to_string(), + break_return: "return".to_string(), + continue_str: "continue".to_string(), + temp_var_prefix: "tco".to_string(), + temp_decl_prefix: "".to_string(), + temp_assign_op: " := ".to_string(), +}), + items: Rc::new(ItemKeywords { + func_keyword: item_keyword_for_kind(go_item_forms(), ItemFormKind::FuncForm), + async_prefix: go_async_prefix(), + struct_keyword: item_keyword_for_kind(go_item_forms(), ItemFormKind::StructForm), + enum_keyword: item_keyword_for_kind(go_item_forms(), ItemFormKind::EnumForm), + type_alias_keyword: item_keyword_for_kind(go_item_forms(), ItemFormKind::TypeAliasForm), + param_separator: go_param_separator(), + return_arrow: go_return_arrow(), + param_type_sep: go_param_type_sep(), + module_keyword: item_keyword_for_kind(go_item_forms(), ItemFormKind::ModuleForm), + import_keyword: go_import_keyword(), + import_from_keyword: go_import_from_keyword(), +}), + expression_semantics: Rc::new(ExpressionSemantics { + if_value_form: IfValueForm::IfStatement, + wildcard_case: Some("default".to_string()), + variant_pattern: None, + guard_prefix: None, + empty_return_value: "struct{}{}, nil".to_string(), + return_suffix: ", nil".to_string(), + suppress_unit_return: true, +}), + lambda_template: go_lambda_template(), + error_expr_template: go_error_expr_template(), + list_literal_empty: go_list_literal_empty(), + list_literal_template: go_list_literal_template(), + null_coalesce_template: go_null_coalesce_template(), + error_type_template: go_error_type_template(), + type_arg_open: go_type_arg_open(), + type_arg_close: go_type_arg_close(), + void_type: go_void_type(), + tuple_syntax: Rc::new(TupleSyntax { + empty: go_tuple_empty(), + pair_template: go_tuple_pair_template(), + multi_template: go_tuple_multi_template(), + separator: go_tuple_separator(), + first_accessor: ".First".to_string(), + second_accessor: ".Second".to_string(), +}), + string_interp: Rc::new(StringInterpSyntax { + style: Rc::new(InterpStyle::FormatArgs { + placeholder: "%v".to_string(), +}), + format_template: "fmt.Sprintf(\"{0}\", {1})".to_string(), + plain_template: "\"{0}\"".to_string(), + escape_pairs: Rc::new(vec![Rc::new(EscapePair { + from: "%".to_string(), + to: "%%".to_string(), +})]), +}), + callable_type_template: None, + naming_case: NamingCase::CamelCase, + async_call_prefix: "".to_string(), + bridge_method_prefix: "v2rt.".to_string(), + bridge_method_case: NamingCase::PascalCase, + bridge_method_overrides: v2_rt::rc_empty_map::(), + record_lit: Rc::new(RecordLitSyntax { + named_open: "{".to_string(), + named_close: "}".to_string(), + named_empty: "{}".to_string(), + named_field_sep: ": ".to_string(), + named_field_join: ", ".to_string(), + anon_empty: "map[string]interface{}{}".to_string(), + anon_prefix: "map[string]interface{}{\n".to_string(), + anon_suffix: "}".to_string(), + anon_field_indent: "\t".to_string(), +}), + service_method: Rc::new(ServiceMethodStrategy::ExternalReceiver { + var_name: "c".to_string(), +}), + service_return: Rc::new(ServiceReturnStrategy::ErrorTupleReturn { + error_type: "error".to_string(), +}), +}) } pub fn dag_spec() -> Rc { Rc::new(LanguageSpec { - target_name: "dag".to_string(), - reserved_words: Rc::new(ReservedWords { - keywords: dag_reserved(), - strategy: Rc::new(ReservedWordStrategy::NoEscape), - }), - scaffold: Rc::new(ProjectScaffold { - manifest_file: None, - module_init_file: None, - source_file_extension: dag_source_extension(), - source_dir: None, - }), - serialization: Rc::new(SerializationSpec { - struct_derives: None, - struct_derives_copy: None, - enum_derives: None, - enum_derives_copy: None, - tag_attribute: None, - rename_attribute_template: None, - derive_attribute: None, - default_value: None, - }), - test_conventions: Rc::new(TestConventions { - file_prefix: "test_".to_string(), - file_suffix: "".to_string(), - file_dir: Some("tests/".to_string()), - function_prefix: "test_".to_string(), - name_style: TestNameStyle::SnakeCaseTestNames, - async_decorator: None, - }), - visibility: Rc::new(VisibilitySpec::KeywordVisibility { - prefix: "".to_string(), - }), - sharing: Rc::new(SharingStrategy { - needs_sharing: true, - wrap_template: "Rc<{0}>".to_string(), - clone_value: "{0}.clone()".to_string(), - deref_clone: "(*{0}).clone()".to_string(), - field_clone: "{0}.{1}.clone()".to_string(), - iter_owned: "{0}.iter().cloned()".to_string(), - clone_suffix: ".cloned()".to_string(), - borrow_param_template: "&{0}".to_string(), - borrow_arg_template: "&{0}".to_string(), - }), - indexing: Rc::new(IndexingSemantics { - list_index: "{0}[({1}) as usize].clone()".to_string(), - map_index: "({0}).get(&{1}).cloned()".to_string(), - string_index: "v2_rt::char_at(&{0}, {1})".to_string(), - list_slice: None, - string_slice: Some("v2_rt::substring(&{0}, {1}, {2})".to_string()), - }), - annotations: Rc::new(AnnotationRequirements { - let_binding_inferred: "let {0} = {1}".to_string(), - let_binding_annotated: "let {0}: {1} = {2}".to_string(), - lambda_param_typed: "{0}: {1}".to_string(), - lambda_param_untyped: "{0}".to_string(), - }), - method_templates: Some(rust_method_templates()), - service_fields: Rc::new(ServiceFieldTemplates { - rest_decl: " pub base_url: String,\n".to_string(), - auth_decl: " pub auth_token: String,\n".to_string(), - shell_decl: " pub working_dir: Option,\n".to_string(), - file_decl: " pub base_path: String,\n".to_string(), - rest_ctor: " base_url: \"{0}\".to_string(),\n".to_string(), - auth_ctor: " auth_token: String::new(),\n".to_string(), - shell_ctor: " working_dir: None,\n".to_string(), - file_ctor: " base_path: \".\".to_string(),\n".to_string(), - }), - block_syntax: Rc::new(BlockSyntax { - block_open: " {\n".to_string(), - block_close: "}".to_string(), - else_clause: "} else {\n".to_string(), - match_keyword: "match ".to_string(), - case_keyword: "".to_string(), - arm_separator: ",".to_string(), - stmt_terminator: ";".to_string(), - significant_whitespace: false, - }), - for_each_syntax: Rc::new(ForEachSyntax { - prefix: "for ".to_string(), - separator: " in ".to_string(), - }), - tco: Rc::new(TcoSyntax { - loop_keyword: "loop".to_string(), - break_return: "break".to_string(), - continue_str: "continue;".to_string(), - temp_var_prefix: "__tco_".to_string(), - temp_decl_prefix: "let ".to_string(), - temp_assign_op: " = ".to_string(), - }), - items: Rc::new(ItemKeywords { - func_keyword: dag_func_keyword(), - async_prefix: dag_async_prefix(), - struct_keyword: dag_struct_keyword(), - enum_keyword: dag_enum_keyword(), - type_alias_keyword: dag_type_alias_keyword(), - param_separator: dag_param_separator(), - return_arrow: dag_return_arrow(), - param_type_sep: dag_param_type_sep(), - module_keyword: dag_module_keyword(), - import_keyword: dag_import_keyword(), - import_from_keyword: dag_import_from_keyword(), - }), - expression_semantics: Rc::new(ExpressionSemantics { - if_value_form: IfValueForm::IfExpression, - wildcard_case: None, - variant_pattern: Some(Rc::new(VariantPatternSyntax { - open: " { ".to_string(), - close: " }".to_string(), - binding_sep: ": ".to_string(), - empty_suffix: "".to_string(), - })), - guard_prefix: Some(" if ".to_string()), - empty_return_value: "()".to_string(), - return_suffix: "".to_string(), - suppress_unit_return: false, - }), - lambda_template: dag_lambda_template(), - error_expr_template: dag_error_expr_template(), - list_literal_empty: dag_list_literal_empty(), - list_literal_template: dag_list_literal_template(), - null_coalesce_template: dag_null_coalesce_template(), - error_type_template: dag_error_type_template(), - type_arg_open: dag_type_arg_open(), - type_arg_close: dag_type_arg_close(), - void_type: dag_void_type(), - tuple_syntax: Rc::new(TupleSyntax { - empty: dag_tuple_empty(), - pair_template: dag_tuple_pair_template(), - multi_template: dag_tuple_multi_template(), - separator: dag_tuple_separator(), - first_accessor: ".0".to_string(), - second_accessor: ".1".to_string(), - }), - string_interp: Rc::new(StringInterpSyntax { - style: Rc::new(InterpStyle::InlineExpr), - format_template: "\"{0}\"".to_string(), - plain_template: "\"{0}\"".to_string(), - escape_pairs: Rc::new(vec![ - Rc::new(EscapePair { - from: "{".to_string(), - to: "\\{".to_string(), - }), - Rc::new(EscapePair { - from: "}".to_string(), - to: "\\}".to_string(), - }), - ]), - }), - callable_type_template: None, - naming_case: NamingCase::AsAuthored, - async_call_prefix: "".to_string(), - bridge_method_prefix: "".to_string(), - bridge_method_case: NamingCase::SnakeCase, - bridge_method_overrides: v2_rt::rc_empty_map::(), - record_lit: Rc::new(RecordLitSyntax { - named_open: " {".to_string(), - named_close: "}".to_string(), - named_empty: " {}".to_string(), - named_field_sep: ": ".to_string(), - named_field_join: ", ".to_string(), - anon_empty: "{}".to_string(), - anon_prefix: "{\n".to_string(), - anon_suffix: "}".to_string(), - anon_field_indent: " ".to_string(), - }), - service_method: Rc::new(ServiceMethodStrategy::SelfInParams { - self_param: "".to_string(), - }), - service_return: Rc::new(ServiceReturnStrategy::ArrowReturn), - }) + target_name: "dag".to_string(), + reserved_words: Rc::new(ReservedWords { + keywords: dag_reserved(), + strategy: Rc::new(ReservedWordStrategy::NoEscape), +}), + scaffold: Rc::new(ProjectScaffold { + manifest_file: None, + module_init_file: None, + source_file_extension: dag_source_extension(), + source_dir: None, +}), + serialization: Rc::new(SerializationSpec { + struct_derives: None, + struct_derives_copy: None, + enum_derives: None, + enum_derives_copy: None, + tag_attribute: None, + rename_attribute_template: None, + derive_attribute: None, + default_value: None, +}), + test_conventions: Rc::new(TestConventions { + file_prefix: "test_".to_string(), + file_suffix: "".to_string(), + file_dir: Some("tests/".to_string()), + function_prefix: "test_".to_string(), + name_style: TestNameStyle::SnakeCaseTestNames, + async_decorator: None, +}), + visibility: Rc::new(VisibilitySpec::KeywordVisibility { + prefix: "".to_string(), +}), + sharing: Rc::new(SharingStrategy { + needs_sharing: true, + wrap_template: "Rc<{0}>".to_string(), + clone_value: "{0}.clone()".to_string(), + deref_clone: "(*{0}).clone()".to_string(), + field_clone: "{0}.{1}.clone()".to_string(), + iter_owned: "{0}.iter().cloned()".to_string(), + clone_suffix: ".cloned()".to_string(), + borrow_param_template: "&{0}".to_string(), + borrow_arg_template: "&{0}".to_string(), +}), + indexing: Rc::new(IndexingSemantics { + list_index: "{0}[({1}) as usize].clone()".to_string(), + map_index: "({0}).get(&{1}).cloned()".to_string(), + string_index: "v2_rt::char_at(&{0}, {1})".to_string(), + list_slice: None, + string_slice: Some("v2_rt::substring(&{0}, {1}, {2})".to_string()), +}), + annotations: Rc::new(AnnotationRequirements { + let_binding_inferred: "let {0} = {1}".to_string(), + let_binding_annotated: "let {0}: {1} = {2}".to_string(), + lambda_param_typed: "{0}: {1}".to_string(), + lambda_param_untyped: "{0}".to_string(), +}), + method_templates: Some(rust_method_templates()), + service_fields: Rc::new(ServiceFieldTemplates { + rest_decl: " pub base_url: String,\n".to_string(), + auth_decl: " pub auth_token: String,\n".to_string(), + shell_decl: " pub working_dir: Option,\n".to_string(), + file_decl: " pub base_path: String,\n".to_string(), + rest_ctor: " base_url: \"{0}\".to_string(),\n".to_string(), + auth_ctor: " auth_token: String::new(),\n".to_string(), + shell_ctor: " working_dir: None,\n".to_string(), + file_ctor: " base_path: \".\".to_string(),\n".to_string(), +}), + block_syntax: Rc::new(BlockSyntax { + block_open: " {\n".to_string(), + block_close: "}".to_string(), + else_clause: "} else {\n".to_string(), + match_keyword: "match ".to_string(), + case_keyword: "".to_string(), + arm_separator: ",".to_string(), + stmt_terminator: ";".to_string(), + significant_whitespace: false, +}), + for_each_syntax: Rc::new(ForEachSyntax { + prefix: "for ".to_string(), + separator: " in ".to_string(), +}), + tco: Rc::new(TcoSyntax { + loop_keyword: "loop".to_string(), + break_return: "break".to_string(), + continue_str: "continue;".to_string(), + temp_var_prefix: "__tco_".to_string(), + temp_decl_prefix: "let ".to_string(), + temp_assign_op: " = ".to_string(), +}), + items: Rc::new(ItemKeywords { + func_keyword: dag_func_keyword(), + async_prefix: dag_async_prefix(), + struct_keyword: dag_struct_keyword(), + enum_keyword: dag_enum_keyword(), + type_alias_keyword: dag_type_alias_keyword(), + param_separator: dag_param_separator(), + return_arrow: dag_return_arrow(), + param_type_sep: dag_param_type_sep(), + module_keyword: dag_module_keyword(), + import_keyword: dag_import_keyword(), + import_from_keyword: dag_import_from_keyword(), +}), + expression_semantics: Rc::new(ExpressionSemantics { + if_value_form: IfValueForm::IfExpression, + wildcard_case: None, + variant_pattern: Some(Rc::new(VariantPatternSyntax { + open: " { ".to_string(), + close: " }".to_string(), + binding_sep: ": ".to_string(), + empty_suffix: "".to_string(), +})), + guard_prefix: Some(" if ".to_string()), + empty_return_value: "()".to_string(), + return_suffix: "".to_string(), + suppress_unit_return: false, +}), + lambda_template: dag_lambda_template(), + error_expr_template: dag_error_expr_template(), + list_literal_empty: dag_list_literal_empty(), + list_literal_template: dag_list_literal_template(), + null_coalesce_template: dag_null_coalesce_template(), + error_type_template: dag_error_type_template(), + type_arg_open: dag_type_arg_open(), + type_arg_close: dag_type_arg_close(), + void_type: dag_void_type(), + tuple_syntax: Rc::new(TupleSyntax { + empty: dag_tuple_empty(), + pair_template: dag_tuple_pair_template(), + multi_template: dag_tuple_multi_template(), + separator: dag_tuple_separator(), + first_accessor: ".0".to_string(), + second_accessor: ".1".to_string(), +}), + string_interp: Rc::new(StringInterpSyntax { + style: Rc::new(InterpStyle::InlineExpr), + format_template: "\"{0}\"".to_string(), + plain_template: "\"{0}\"".to_string(), + escape_pairs: Rc::new(vec![Rc::new(EscapePair { + from: "{".to_string(), + to: "\\{".to_string(), +}), Rc::new(EscapePair { + from: "}".to_string(), + to: "\\}".to_string(), +})]), +}), + callable_type_template: None, + naming_case: NamingCase::AsAuthored, + async_call_prefix: "".to_string(), + bridge_method_prefix: "".to_string(), + bridge_method_case: NamingCase::SnakeCase, + bridge_method_overrides: v2_rt::rc_empty_map::(), + record_lit: Rc::new(RecordLitSyntax { + named_open: " {".to_string(), + named_close: "}".to_string(), + named_empty: " {}".to_string(), + named_field_sep: ": ".to_string(), + named_field_join: ", ".to_string(), + anon_empty: "{}".to_string(), + anon_prefix: "{\n".to_string(), + anon_suffix: "}".to_string(), + anon_field_indent: " ".to_string(), +}), + service_method: Rc::new(ServiceMethodStrategy::SelfInParams { + self_param: "".to_string(), +}), + service_return: Rc::new(ServiceReturnStrategy::ArrowReturn), +}) } pub fn language_spec_for_target(target: RenderTarget) -> Rc { match target { - RenderTarget::Rust => rust_spec(), - RenderTarget::Go => go_spec(), - RenderTarget::Python => python_spec(), - RenderTarget::Dag => dag_spec(), - } + RenderTarget::Rust => rust_spec(), + RenderTarget::Go => go_spec(), + RenderTarget::Python => python_spec(), + RenderTarget::Dag => dag_spec(), +} } pub fn target_keyword(target: RenderTarget, key: String) -> String { match target { - RenderTarget::Rust => match v2_rt::lookup(&rust_keywords(), key.clone()) { - Some(kw) => kw.clone(), - None => key.clone(), - }, - RenderTarget::Go => match v2_rt::lookup(&go_keywords(), key.clone()) { - Some(kw) => kw.clone(), - None => key.clone(), - }, - RenderTarget::Python => match v2_rt::lookup(&python_keywords(), key.clone()) { - Some(kw) => kw.clone(), - None => key.clone(), - }, - RenderTarget::Dag => key.clone(), - } + RenderTarget::Rust => match v2_rt::lookup(&rust_keywords(), key.clone()) { + Some(kw) => kw.clone(), + None => key.clone(), +}, + RenderTarget::Go => match v2_rt::lookup(&go_keywords(), key.clone()) { + Some(kw) => kw.clone(), + None => key.clone(), +}, + RenderTarget::Python => match v2_rt::lookup(&python_keywords(), key.clone()) { + Some(kw) => kw.clone(), + None => key.clone(), +}, + RenderTarget::Dag => key.clone(), +} } pub fn target_operators(target: RenderTarget) -> Rc>> { match target { - RenderTarget::Rust => rust_operators(), - RenderTarget::Python => python_operators(), - RenderTarget::Go => go_operators(), - RenderTarget::Dag => dag_operators(), - } + RenderTarget::Rust => rust_operators(), + RenderTarget::Python => python_operators(), + RenderTarget::Go => go_operators(), + RenderTarget::Dag => dag_operators(), +} } -pub fn binop_symbol( - target: RenderTarget, - op: BinOp, - algebra_field: Option, -) -> Option { +pub fn binop_symbol(target: RenderTarget, op: BinOp, algebra_field: Option) -> Option { { let ops = target_operators(target); - let op_matching = Rc::new({ - let mut __result = Vec::new(); - for spec in ops.iter().cloned() { - if match spec.binop.clone() { - Some(b) => (b.clone() == op.clone()), - None => false, - } { - __result.push(spec); - } - } - __result - }); - let specific = match algebra_field { - Some(af) => Rc::new({ - let mut __result = Vec::new(); - for spec in op_matching.clone().iter().cloned() { - if match spec.algebra_field.clone() { - Some(sf) => (sf.clone() == af.clone()), - _ => false, - } { - __result.push(spec); - } - } - __result - }) - .first() - .cloned(), - None => None, - }; - let result = match specific.clone() { - Some(_) => specific.clone(), - None => Rc::new({ - let mut __result = Vec::new(); - for spec in op_matching.clone().iter().cloned() { - if (spec.algebra_field.clone() == None) { - __result.push(spec); - } - } - __result - }) - .first() - .cloned(), - }; - match result { - Some(spec) => Some(spec.symbol.clone()), - None => None, - } - } +let op_matching = Rc::new({ let mut __result = Vec::new(); for spec in ops.iter().cloned() { if match spec.binop.clone() { + Some(b) => (b.clone() == op.clone()), + None => false, +} { __result.push(spec); } } __result }); +let specific = match algebra_field { + Some(af) => Rc::new({ let mut __result = Vec::new(); for spec in op_matching.clone().iter().cloned() { if match spec.algebra_field.clone() { + Some(sf) => (sf.clone() == af.clone()), + _ => false, +} { __result.push(spec); } } __result }).first().cloned(), + None => None, +}; +let result = match specific.clone() { + Some(_) => specific.clone(), + None => Rc::new({ let mut __result = Vec::new(); for spec in op_matching.clone().iter().cloned() { if (spec.algebra_field.clone() == None) { __result.push(spec); } } __result }).first().cloned(), +}; +match result { + Some(spec) => Some(spec.symbol.clone()), + None => None, +} +} } pub fn is_string_like(target: RenderTarget, name: String) -> bool { match target { - RenderTarget::Rust => { - let mut __found = false; - for t in rust_string_types().iter().cloned() { - if (t.clone().as_str() == name.clone().as_str()) { - __found = true; - break; - } - } - __found - } - RenderTarget::Go => { - let mut __found = false; - for t in go_string_types().iter().cloned() { - if (t.clone().as_str() == name.clone().as_str()) { - __found = true; - break; - } - } - __found - } - RenderTarget::Python => { - let mut __found = false; - for t in python_string_types().iter().cloned() { - if (t.clone().as_str() == name.clone().as_str()) { - __found = true; - break; - } - } - __found - } - RenderTarget::Dag => false, - } + RenderTarget::Rust => { let mut __found = false; for t in rust_string_types().iter().cloned() { if (t.clone().as_str() == name.clone().as_str()) { __found = true; break; } } __found }, + RenderTarget::Go => { let mut __found = false; for t in go_string_types().iter().cloned() { if (t.clone().as_str() == name.clone().as_str()) { __found = true; break; } } __found }, + RenderTarget::Python => { let mut __found = false; for t in python_string_types().iter().cloned() { if (t.clone().as_str() == name.clone().as_str()) { __found = true; break; } } __found }, + RenderTarget::Dag => false, +} } pub fn scaffold_for_target(target: RenderTarget) -> Rc { @@ -1316,14 +1190,12 @@ pub fn sharing_for_target(target: RenderTarget) -> Rc { } pub fn expression_semantics_for_target(target: RenderTarget) -> Rc { - language_spec_for_target(target) - .expression_semantics - .clone() + language_spec_for_target(target).expression_semantics.clone() } pub fn wrap_shared_type(target: RenderTarget, inner: String) -> String { { let tmpl = sharing_for_target(target).wrap_template.clone(); - v2_rt::replace(tmpl, "{0}".to_string(), inner) - } +v2_rt::replace(tmpl, "{0}".to_string(), inner) +} } diff --git a/src/v2/stage0/src/v2_compiler_normalize.rs b/src/v2/stage0/src/v2_compiler_normalize.rs index a3adf7bac7f..165dbb3cf6f 100644 --- a/src/v2/stage0/src/v2_compiler_normalize.rs +++ b/src/v2/stage0/src/v2_compiler_normalize.rs @@ -1,21 +1,18 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.normalize -pub use crate::std_types::container_expected_arity; -pub use crate::v2_compiler_resolve::{ModuleGraph, ResolvedModule}; -use crate::v2_rt; -use crate::v2_std_core::CompilerDiagnostic::ArityMismatch; -use crate::v2_std_core::Connective::NoConnective; -use crate::v2_std_core::ExprData::NoExprData; -use crate::v2_std_core::InferredNode::{CompilerError, Resolved}; -pub use crate::v2_std_core::{ - authored_name_at, make_error_node, module_items, CompilerDiagnostic, Connective, ErrorNode, - ExprData, InferredNode, NewlineIndex, Node, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::v2_std_core::{Node, ErrorNode, NewlineIndex, InferredNode, ExprData, make_error_node, module_items, authored_name_at, Connective, CompilerDiagnostic}; +use crate::v2_std_core::InferredNode::{Resolved, CompilerError}; +use crate::v2_std_core::ExprData::{NoExprData}; +use crate::v2_std_core::Connective::{NoConnective}; +use crate::v2_std_core::CompilerDiagnostic::{ArityMismatch}; +pub use crate::v2_compiler_resolve::{ModuleGraph, ResolvedModule}; +pub use crate::std_types::{container_expected_arity}; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct NormalizeResult { @@ -23,174 +20,72 @@ pub struct NormalizeResult { pub diagnostics: Rc>>, } -pub fn check_bare_containers( - n: &Rc, - module_name: &String, - source_indices: &Rc>>, -) -> Rc>> { +pub fn check_bare_containers(n: &Rc, module_name: &String, source_indices: &Rc>>) -> Rc>> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let has_structure = ((match n.body.clone() { - Some(_) => true, - None => false, - } || ((n.uses.clone().len() as i64) > 0)) - || ((n.properties.clone().len() as i64) > 0)); - let is_expr = match (*n.expr_data.clone()).clone() { - ExprData::NoExprData => false, - _ => true, - }; - let nname = authored_name_at(source_indices.clone(), &n); - let self_diags = if is_expr { - Rc::new(vec![]) - } else { - match container_expected_arity(nname.clone()) { - Some(expected) => { - if (((((n.children.clone().len() as i64) == 0) - && ((n.params.clone().len() as i64) == 0)) - && (n.connective.clone() == Connective::NoConnective)) - && !has_structure) - { - Rc::new(vec![make_error_node( - Rc::new(CompilerDiagnostic::ArityMismatch { - name: nname.clone(), - expected: expected.clone(), - got: 0, - span: n.span.clone(), - }), - module_name.clone(), - )]) - } else { - Rc::new(vec![]) - } - } - None => Rc::new(vec![]), - } - }; - let child_diags = Rc::new({ - let mut __result = Vec::new(); - for c in n.children.clone().iter().cloned() { - __result.extend( - (*check_bare_containers(&c, &module_name, &source_indices)) - .iter() - .cloned(), - ); - } - __result - }); - let param_diags = Rc::new({ - let mut __result = Vec::new(); - for p in n.params.clone().iter().cloned() { - __result.extend( - (*check_bare_containers(&p, &module_name, &source_indices)) - .iter() - .cloned(), - ); - } - __result - }); - let type_ann_diags = match n.type_annotation.clone() { - Some(ta) => check_bare_containers(&ta, &module_name, &source_indices), - None => Rc::new(vec![]), - }; - let body_diags = match n.body.clone() { - Some(b) => check_bare_containers(&b, &module_name, &source_indices), - None => Rc::new(vec![]), - }; - let inferred_diags = if ((n.params.clone().len() as i64) > 0) { - Rc::new(vec![]) - } else { - match n.inferred.clone() { - Some(inf) => match (*inf.clone()).clone() { - InferredNode::Resolved { node: rn, .. } => { - check_bare_containers(&rn, &module_name, &source_indices) - } - _ => Rc::new(vec![]), + { + let has_structure = ((match n.body.clone() { + Some(_) => true, + None => false, +} || ((n.uses.clone().len() as i64) > 0)) || ((n.properties.clone().len() as i64) > 0)); +let is_expr = match (*n.expr_data.clone()).clone() { + ExprData::NoExprData => false, + _ => true, +}; +let nname = authored_name_at(source_indices.clone(), &n); +let self_diags = if is_expr { + Rc::new(vec![]) + } else { + match container_expected_arity(nname.clone()) { + Some(expected) => if (((((n.children.clone().len() as i64) == 0) && ((n.params.clone().len() as i64) == 0)) && (n.connective.clone() == Connective::NoConnective)) && !has_structure) { + Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::ArityMismatch { + name: nname.clone(), + expected: expected.clone(), + got: 0, + span: n.span.clone(), +}), module_name.clone())]) + } else { + Rc::new(vec![]) }, - None => Rc::new(vec![]), - } - }; - let uses_diags = Rc::new({ - let mut __result = Vec::new(); - for u in n.uses.clone().iter().cloned() { - __result.extend( - (*check_bare_containers(&u, &module_name, &source_indices)) - .iter() - .cloned(), - ); - } - __result - }); - let prop_diags = Rc::new({ - let mut __result = Vec::new(); - for p in n.properties.clone().iter().cloned() { - __result.extend( - (*check_bare_containers(&p, &module_name, &source_indices)) - .iter() - .cloned(), - ); - } - __result - }); - Rc::new({ - let mut __result = Vec::new(); - for d in Rc::new(vec![ - self_diags, - child_diags, - param_diags, - type_ann_diags, - inferred_diags, - body_diags, - uses_diags, - prop_diags, - ]) - .iter() - .cloned() - { - __result.extend((*d.clone()).iter().cloned()); - } - __result - }) + None => Rc::new(vec![]), +} + }; +let child_diags = Rc::new({ let mut __result = Vec::new(); for c in n.children.clone().iter().cloned() { __result.extend((*check_bare_containers(&c, &module_name, &source_indices)).iter().cloned()); } __result }); +let param_diags = Rc::new({ let mut __result = Vec::new(); for p in n.params.clone().iter().cloned() { __result.extend((*check_bare_containers(&p, &module_name, &source_indices)).iter().cloned()); } __result }); +let type_ann_diags = match n.type_annotation.clone() { + Some(ta) => check_bare_containers(&ta, &module_name, &source_indices), + None => Rc::new(vec![]), +}; +let body_diags = match n.body.clone() { + Some(b) => check_bare_containers(&b, &module_name, &source_indices), + None => Rc::new(vec![]), +}; +let inferred_diags = if ((n.params.clone().len() as i64) > 0) { + Rc::new(vec![]) + } else { + match n.inferred.clone() { + Some(inf) => match (*inf.clone()).clone() { + InferredNode::Resolved { node: rn, .. } => check_bare_containers(&rn, &module_name, &source_indices), + _ => Rc::new(vec![]), +}, + None => Rc::new(vec![]), +} + }; +let uses_diags = Rc::new({ let mut __result = Vec::new(); for u in n.uses.clone().iter().cloned() { __result.extend((*check_bare_containers(&u, &module_name, &source_indices)).iter().cloned()); } __result }); +let prop_diags = Rc::new({ let mut __result = Vec::new(); for p in n.properties.clone().iter().cloned() { __result.extend((*check_bare_containers(&p, &module_name, &source_indices)).iter().cloned()); } __result }); +Rc::new({ let mut __result = Vec::new(); for d in Rc::new(vec![self_diags, child_diags, param_diags, type_ann_diags, inferred_diags, body_diags, uses_diags, prop_diags]).iter().cloned() { __result.extend((*d.clone()).iter().cloned()); } __result }) +} }) } -pub fn normalize_graph( - graph: &Rc, - source_indices: Rc>>, -) -> Rc { +pub fn normalize_graph(graph: &Rc, source_indices: Rc>>) -> Rc { { - let diags = Rc::new({ - let mut __result = Vec::new(); - for m in graph.modules.clone().iter().cloned() { - __result.extend( - (*{ - let items = module_items(m.module.clone()); - Rc::new({ - let mut __result = Vec::new(); - for item in items.clone().iter().cloned() { - __result.extend( - (*check_bare_containers( - &item, - &authored_name_at( - source_indices.clone(), - &m.module.clone(), - ), - &source_indices, - )) - .iter() - .cloned(), - ); - } - __result - }) - }) - .iter() - .cloned(), - ); - } - __result - }); - Rc::new(NormalizeResult { - graph: graph.clone(), - diagnostics: diags, - }) - } + let diags = Rc::new({ let mut __result = Vec::new(); for m in graph.modules.clone().iter().cloned() { __result.extend((*{ + let items = module_items(m.module.clone()); +Rc::new({ let mut __result = Vec::new(); for item in items.clone().iter().cloned() { __result.extend((*check_bare_containers(&item, &authored_name_at(source_indices.clone(), &m.module.clone()), &source_indices)).iter().cloned()); } __result }) +}).iter().cloned()); } __result }); +Rc::new(NormalizeResult { + graph: graph.clone(), + diagnostics: diags, +}) +} } diff --git a/src/v2/stage0/src/v2_compiler_ownership.rs b/src/v2/stage0/src/v2_compiler_ownership.rs index 2abaab65c4d..27f235518dc 100644 --- a/src/v2/stage0/src/v2_compiler_ownership.rs +++ b/src/v2/stage0/src/v2_compiler_ownership.rs @@ -1,28 +1,19 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.ownership -use self::EdgeKind::*; -use self::OwnershipDecision::*; -pub use crate::v2_compiler_emit::to_string; -use crate::v2_rt; -use crate::v2_std_core::Cardinality::Required; -use crate::v2_std_core::ExprData::{ - ExprBlock, ExprCall, ExprError, ExprFieldAccess, ExprForEach, ExprIf, ExprLambda, ExprLet, - ExprLiteral, ExprMatch, ExprMethodCall, ExprRecordLit, ExprReturn, ExprVar, NoExprData, -}; -use crate::v2_std_core::InferredNode::Resolved; -use crate::v2_std_core::VarBindingKind::{FunctionValueBinding, LocalValueBinding}; -pub use crate::v2_std_core::{ - arg_value, arm_body, authored_name_at, expr_call_func_at, expr_method_name_at, - expr_var_name_at, field_access_base, field_access_field_at, foreach_body, foreach_collection, - if_condition, if_else_branch, if_then_branch, lambda_body, lambda_param_names_at, let_body, - let_value, match_arm_nodes, match_scrutinee, method_arg_nodes, method_receiver, Cardinality, - ExprData, InferredNode, NewlineIndex, Node, VarBindingKind, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::v2_std_core::{Node, ExprData, VarBindingKind, InferredNode, Cardinality, arg_value, arm_body, field_access_base, if_condition, if_then_branch, if_else_branch, let_value, let_body, lambda_body, lambda_param_names_at, match_scrutinee, match_arm_nodes, method_receiver, method_arg_nodes, foreach_collection, foreach_body, expr_var_name_at, expr_call_func_at, expr_method_name_at, field_access_field_at, authored_name_at, NewlineIndex}; +use crate::v2_std_core::ExprData::{NoExprData, ExprError, ExprLiteral, ExprVar, ExprFieldAccess, ExprCall, ExprMethodCall, ExprMatch, ExprIf, ExprLet, ExprBlock, ExprReturn, ExprLambda, ExprForEach, ExprRecordLit}; +use crate::v2_std_core::VarBindingKind::{LocalValueBinding, FunctionValueBinding}; +use crate::v2_std_core::InferredNode::{Resolved}; +use crate::v2_std_core::Cardinality::{Required}; +pub use crate::v2_compiler_emit::{to_string}; +use self::EdgeKind::*; +use self::OwnershipDecision::*; #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] @@ -48,35 +39,17 @@ pub struct BindingUsage { } pub fn semantic_consumer_count(usage: Rc) -> i64 { - (Rc::new({ - let mut __result = Vec::new(); - for c in usage.consumers.clone().iter().cloned() { - if match c.kind.clone() { - EdgeKind::Consumed => true, - _ => false, - } { - __result.push(c); - } - } - __result - }) - .len() as i64) + (Rc::new({ let mut __result = Vec::new(); for c in usage.consumers.clone().iter().cloned() { if match c.kind.clone() { + EdgeKind::Consumed => true, + _ => false, +} { __result.push(c); } } __result }).len() as i64) } pub fn binding_fan_out(usage: Rc) -> i64 { - (Rc::new({ - let mut __result = Vec::new(); - for c in usage.consumers.clone().iter().cloned() { - if match c.kind.clone() { - EdgeKind::Threaded => false, - _ => true, - } { - __result.push(c); - } - } - __result - }) - .len() as i64) + (Rc::new({ let mut __result = Vec::new(); for c in usage.consumers.clone().iter().cloned() { if match c.kind.clone() { + EdgeKind::Threaded => false, + _ => true, +} { __result.push(c); } } __result }).len() as i64) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -140,48 +113,41 @@ pub struct UsageAccum { pub fn empty_usage_accum() -> Rc { Rc::new(UsageAccum { - bindings: v2_rt::rc_empty_map::>(), - fold_call_nodes: Rc::new(vec![]), - }) + bindings: v2_rt::rc_empty_map::>(), + fold_call_nodes: Rc::new(vec![]), +}) } -pub fn record_use( - accum: &Rc, - name: &String, - kind: EdgeKind, - site: String, - binding_kind: Option>, - span_start: i64, -) -> Rc { +pub fn record_use(accum: &Rc, name: &String, kind: EdgeKind, site: String, binding_kind: Option>, span_start: i64) -> Rc { { let edge = Rc::new(EdgeClassification { - kind: kind, - site: site, - span_start: span_start, - }); - let existing = match v2_rt::map_get(&accum.bindings.clone(), name.clone()) { - Some(usage) => usage.clone(), - None => Rc::new(BindingUsage { - name: name.clone(), - binding_kind: None, - consumers: Rc::new(vec![]), - }), - }; - let effective_kind = if (existing.binding_kind.clone() != None) { + kind: kind, + site: site, + span_start: span_start, +}); +let existing = match v2_rt::map_get(&accum.bindings.clone(), name.clone()) { + Some(usage) => usage.clone(), + None => Rc::new(BindingUsage { + name: name.clone(), + binding_kind: None, + consumers: Rc::new(vec![]), +}), +}; +let effective_kind = if (existing.binding_kind.clone() != None) { existing.binding_kind.clone() } else { binding_kind }; - let updated = Rc::new(BindingUsage { - name: name.clone(), - binding_kind: effective_kind, - consumers: v2_rt::rc_list_push(existing.consumers.clone(), edge), - }); - Rc::new(UsageAccum { - bindings: v2_rt::rc_map_insert(accum.bindings.clone(), name.clone(), updated), - fold_call_nodes: accum.fold_call_nodes.clone(), - }) - } +let updated = Rc::new(BindingUsage { + name: name.clone(), + binding_kind: effective_kind, + consumers: v2_rt::rc_list_push(existing.consumers.clone(), edge), +}); +Rc::new(UsageAccum { + bindings: v2_rt::rc_map_insert(accum.bindings.clone(), name.clone(), updated), + fold_call_nodes: accum.fold_call_nodes.clone(), +}) +} } pub fn max_usage_by_fan_out(a: Rc, b: Rc) -> Rc { @@ -192,1014 +158,510 @@ pub fn max_usage_by_fan_out(a: Rc, b: Rc) -> Rc>>, - key: &String, - new_val: Rc, -) -> Rc>> { +pub fn map_usage_merge_at(base: &Rc>>, key: &String, new_val: Rc) -> Rc>> { match v2_rt::map_get(&base, key.clone()) { - Some(existing) => v2_rt::rc_map_insert( - base.clone(), - key.clone(), - max_usage_by_fan_out(existing.clone(), new_val), - ), - None => v2_rt::rc_map_insert(base.clone(), key.clone(), new_val), - } + Some(existing) => v2_rt::rc_map_insert(base.clone(), key.clone(), max_usage_by_fan_out(existing.clone(), new_val)), + None => v2_rt::rc_map_insert(base.clone(), key.clone(), new_val), +} } -pub fn merge_branch_usages( - base: &Rc, - branches: &Rc>>, -) -> Rc { +pub fn merge_branch_usages(base: &Rc, branches: &Rc>>) -> Rc { { - let binding_merged = branches.clone().iter().cloned().fold( - base.bindings.clone(), - |merged: Rc>>, branch: Rc| { - Rc::new(v2_rt::map_values(&branch.bindings.clone())) - .iter() - .cloned() - .fold( - merged, - |acc: Rc>>, usage: Rc| { - map_usage_merge_at(&acc, &usage.name.clone(), usage.clone()) - }, - ) - }, - ); - let base_fold_count = (base.fold_call_nodes.clone().len() as i64); - let branch_fold_nodes = Rc::new({ - let mut __result = Vec::new(); - for b in branches.clone().iter().cloned() { - __result.extend( - (*Rc::new( - b.fold_call_nodes - .clone() - .iter() - .cloned() - .skip(base_fold_count.clone() as usize) - .collect::>(), - )) - .iter() - .cloned(), - ); - } - __result - }); - Rc::new(UsageAccum { - bindings: binding_merged, - fold_call_nodes: v2_rt::concat(base.fold_call_nodes.clone(), branch_fold_nodes), - }) - } + let binding_merged = branches.clone().iter().cloned().fold(base.bindings.clone(), |merged: Rc>>, branch: Rc| Rc::new(v2_rt::map_values(&branch.bindings.clone())).iter().cloned().fold(merged, |acc: Rc>>, usage: Rc| map_usage_merge_at(&acc, &usage.name.clone(), usage.clone()))); +let base_fold_count = (base.fold_call_nodes.clone().len() as i64); +let branch_fold_nodes = Rc::new({ let mut __result = Vec::new(); for b in branches.clone().iter().cloned() { __result.extend((*Rc::new(b.fold_call_nodes.clone().iter().cloned().skip(base_fold_count.clone() as usize).collect::>())).iter().cloned()); } __result }); +Rc::new(UsageAccum { + bindings: binding_merged, + fold_call_nodes: v2_rt::concat(base.fold_call_nodes.clone(), branch_fold_nodes), +}) +} } -pub fn walk_expr( - accum: Rc, - texpr: &Rc, - in_tail: bool, - si: &Rc>>, -) -> Rc { +pub fn walk_expr(accum: Rc, texpr: &Rc, in_tail: bool, si: &Rc>>) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprVar { - binding_kind: bk, .. - } => { - let n = expr_var_name_at(texpr.clone(), si.clone()); - if in_tail.clone() { - record_use( - &accum, - &n, - EdgeKind::Consumed, - "return".to_string(), - bk.clone(), - texpr.span.clone().start.clone(), - ) - } else { - record_use( - &accum, - &n, - EdgeKind::Read, - "read".to_string(), - bk.clone(), - texpr.span.clone().start.clone(), - ) - } - } - ExprData::ExprLiteral { .. } => accum, - ExprData::ExprFieldAccess { .. } => { - let base_node = field_access_base(texpr.clone()); - match (*base_node.expr_data.clone()).clone() { - ExprData::ExprVar { - binding_kind: bk, .. - } => { - let vn = expr_var_name_at(base_node.clone(), si.clone()); - let f = field_access_field_at(texpr.clone(), si.clone()); - record_use( - &accum, - &vn, - EdgeKind::Projected, - v2_rt::concat(".".to_string(), f), - bk.clone(), - texpr.span.clone().start.clone(), - ) - } - _ => walk_expr(accum, &base_node, false, &si), - } - } - ExprData::ExprCall { .. } => { - let fname = expr_call_func_at(texpr.clone(), si.clone()); - if (fname.as_str() == "fold".to_string().as_str()) { - { - let init_arg = Rc::new({ - let mut __result = Vec::new(); - for a in texpr.children.clone().iter().cloned() { - if (authored_name_at(si.clone(), &a).as_str() - == "init".to_string().as_str()) - { - __result.push(a); - } - } - __result - }) - .first() - .cloned(); - let threaded_accum = match init_arg { - Some(ia) => { - let ia_val = arg_value(&ia); - match (*ia_val.expr_data.clone()).clone() { - ExprData::ExprVar { - binding_kind: bk, .. - } => { - let vn = expr_var_name_at(ia_val.clone(), si.clone()); - record_use( - &accum, - &vn, - EdgeKind::Threaded, - "fold_init".to_string(), - bk.clone(), - ia_val.span.clone().start.clone(), - ) - } - _ => walk_expr(accum, &ia_val, false, &si), - } - } - None => accum, - }; - let non_init = Rc::new({ - let mut __result = Vec::new(); - for a in texpr.children.clone().iter().cloned() { - if (authored_name_at(si.clone(), &a).as_str() - != "init".to_string().as_str()) - { - __result.push(a); - } - } - __result - }); - non_init.iter().cloned().fold( - threaded_accum.clone(), - |acc: Rc, a: Rc| { - walk_expr(acc, &arg_value(&a), false, &si) - }, - ) - } - } else { - texpr.children.clone().iter().cloned().fold( - accum, - |acc: Rc, a: Rc| { - walk_expr(acc, &arg_value(&a), false, &si) - }, - ) - } - } - ExprData::ExprMethodCall { .. } => { - let recv = method_receiver(texpr.clone()); - let mc_args = method_arg_nodes(texpr.clone()); - let mname = expr_method_name_at(texpr.clone(), si.clone()); - if (mname.as_str() == "fold".to_string().as_str()) { - { - let recv_accum = walk_expr(accum, &recv, false, &si); - let init_arg = Rc::new({ - let mut __result = Vec::new(); - for a in mc_args.clone().iter().cloned() { - if (authored_name_at(si.clone(), &a).as_str() - == "init".to_string().as_str()) - { - __result.push(a); - } - } - __result - }) - .first() - .cloned(); - let threaded_accum = match init_arg { - Some(ia) => { - let ia_val = arg_value(&ia); - match (*ia_val.expr_data.clone()).clone() { - ExprData::ExprVar { - binding_kind: bk, .. - } => { - let vn = expr_var_name_at(ia_val.clone(), si.clone()); - record_use( - &recv_accum, - &vn, - EdgeKind::Threaded, - "fold_init".to_string(), - bk.clone(), - ia_val.span.clone().start.clone(), - ) - } - _ => walk_expr(recv_accum, &ia_val, false, &si), - } - } - None => recv_accum, - }; - let non_init = Rc::new({ - let mut __result = Vec::new(); - for a in mc_args.clone().iter().cloned() { - if (authored_name_at(si.clone(), &a).as_str() - != "init".to_string().as_str()) - { - __result.push(a); - } - } - __result - }); - let walked = non_init.iter().cloned().fold( - threaded_accum.clone(), - |acc: Rc, a: Rc| { - walk_expr(acc, &arg_value(&a), false, &si) - }, - ); - Rc::new(UsageAccum { - bindings: walked.bindings.clone(), - fold_call_nodes: v2_rt::rc_list_push( - walked.fold_call_nodes.clone(), - texpr.clone(), - ), - }) - } - } else { - { - let recv_accum = walk_expr(accum, &recv, false, &si); - mc_args.clone().iter().cloned().fold( - recv_accum, - |acc: Rc, a: Rc| { - walk_expr(acc, &arg_value(&a), false, &si) - }, - ) - } - } - } - ExprData::ExprMatch => { - let scrut = match_scrutinee(texpr.clone()); - let arm_nodes = match_arm_nodes(texpr.clone()); - let s_accum = walk_expr(accum, &scrut, false, &si); - let branch_accums = Rc::new({ - let mut __result = Vec::new(); - for arm_node in arm_nodes.iter().cloned() { - __result.push(walk_expr( - s_accum.clone(), - &arm_body(&arm_node), - in_tail.clone(), - &si, - )); - } - __result - }); - merge_branch_usages(&s_accum, &branch_accums) - } - ExprData::ExprIf => { - let c = if_condition(texpr.clone()); - let t = if_then_branch(texpr.clone()); - let c_accum = walk_expr(accum, &c, false, &si); - let t_accum = walk_expr(c_accum.clone(), &t, in_tail.clone(), &si); - let e_accum = match if_else_branch(texpr.clone()) { - Some(eb) => walk_expr(c_accum.clone(), &eb, in_tail.clone(), &si), - None => c_accum.clone(), - }; - merge_branch_usages(&c_accum, &Rc::new(vec![t_accum, e_accum])) - } - ExprData::ExprLet => { - let v = let_value(texpr.clone()); - let v_accum = walk_expr(accum, &v, false, &si); - match let_body(texpr.clone()) { - Some(b) => walk_expr(v_accum, &b, in_tail.clone(), &si), - None => v_accum, - } - } - ExprData::ExprBlock => { - let ss = texpr.children.clone(); - let ss_count = (ss.clone().len() as i64); - if (ss_count.clone() == 0) { - accum - } else { - { - let init_accum = Rc::new({ - let mut __result = Vec::new(); - for p in Rc::new( - ss.clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - if (p.0.clone() < (ss_count.clone() - 1)) { - __result.push(p); - } - } - __result - }) - .iter() - .cloned() - .fold( - accum, - |acc: Rc, p: (i64, Rc)| { - walk_expr(acc, &p.1.clone(), false, &si) - }, - ); - match ss.clone().last().cloned() { - Some(last_expr) => { - walk_expr(init_accum, &last_expr, in_tail.clone(), &si) - } - None => init_accum, - } - } - } - } - ExprData::ExprReturn => texpr - .children - .clone() - .iter() - .cloned() - .fold(accum, |acc: Rc, child: Rc| { - walk_expr(acc, &child, true, &si) - }), - ExprData::ExprLambda => { - let body = lambda_body(texpr.clone()); - let inner = walk_expr(empty_usage_accum(), &body, false, &si); - let binding_merged = Rc::new(v2_rt::map_values(&inner.bindings.clone())) - .iter() - .cloned() - .fold(accum, |acc: Rc, usage: Rc| { - let a1 = record_use( - &acc, - &usage.name.clone(), - EdgeKind::Read, - "lambda-capture".to_string(), - None, - 0, - ); - record_use( - &a1, - &usage.name.clone(), - EdgeKind::Read, - "lambda-capture".to_string(), - None, - 0, - ) - }); - Rc::new(UsageAccum { - bindings: binding_merged.bindings.clone(), - fold_call_nodes: v2_rt::concat( - binding_merged.fold_call_nodes.clone(), - inner.fold_call_nodes.clone(), - ), - }) - } - ExprData::ExprForEach => { - let coll = foreach_collection(texpr.clone()); - let coll_accum = walk_expr(accum, &coll, false, &si); - let body = foreach_body(texpr.clone()); - let inner = walk_expr(empty_usage_accum(), &body, false, &si); - let binding_merged = Rc::new(v2_rt::map_values(&inner.bindings.clone())) - .iter() - .cloned() - .fold( - coll_accum.clone(), - |acc: Rc, usage: Rc| { - let a1 = record_use( - &acc, - &usage.name.clone(), - EdgeKind::Read, - "foreach-capture".to_string(), - None, - 0, - ); - record_use( - &a1, - &usage.name.clone(), - EdgeKind::Read, - "foreach-capture".to_string(), - None, - 0, - ) - }, - ); - Rc::new(UsageAccum { - bindings: binding_merged.bindings.clone(), - fold_call_nodes: v2_rt::concat( - binding_merged.fold_call_nodes.clone(), - inner.fold_call_nodes.clone(), - ), - }) - } - _ => texpr - .children - .clone() - .iter() - .cloned() - .fold(accum, |acc: Rc, child: Rc| { - walk_expr(acc, &child, false, &si) - }), - } + ExprData::ExprVar { binding_kind: bk, .. } => { + let n = expr_var_name_at(texpr.clone(), si.clone()); +if in_tail.clone() { + record_use(&accum, &n, EdgeKind::Consumed, "return".to_string(), bk.clone(), texpr.span.clone().start.clone()) + } else { + record_use(&accum, &n, EdgeKind::Read, "read".to_string(), bk.clone(), texpr.span.clone().start.clone()) + } +}, + ExprData::ExprLiteral { .. } => accum, + ExprData::ExprFieldAccess { .. } => { + let base_node = field_access_base(texpr.clone()); +match (*base_node.expr_data.clone()).clone() { + ExprData::ExprVar { binding_kind: bk, .. } => { + let vn = expr_var_name_at(base_node.clone(), si.clone()); +let f = field_access_field_at(texpr.clone(), si.clone()); +record_use(&accum, &vn, EdgeKind::Projected, v2_rt::concat(".".to_string(), f), bk.clone(), texpr.span.clone().start.clone()) +}, + _ => walk_expr(accum, &base_node, false, &si), +} +}, + ExprData::ExprCall { .. } => { + let fname = expr_call_func_at(texpr.clone(), si.clone()); +if (fname.as_str() == "fold".to_string().as_str()) { + { + let init_arg = Rc::new({ let mut __result = Vec::new(); for a in texpr.children.clone().iter().cloned() { if (authored_name_at(si.clone(), &a).as_str() == "init".to_string().as_str()) { __result.push(a); } } __result }).first().cloned(); +let threaded_accum = match init_arg { + Some(ia) => { + let ia_val = arg_value(&ia); +match (*ia_val.expr_data.clone()).clone() { + ExprData::ExprVar { binding_kind: bk, .. } => { + let vn = expr_var_name_at(ia_val.clone(), si.clone()); +record_use(&accum, &vn, EdgeKind::Threaded, "fold_init".to_string(), bk.clone(), ia_val.span.clone().start.clone()) +}, + _ => walk_expr(accum, &ia_val, false, &si), +} +}, + None => accum, +}; +let non_init = Rc::new({ let mut __result = Vec::new(); for a in texpr.children.clone().iter().cloned() { if (authored_name_at(si.clone(), &a).as_str() != "init".to_string().as_str()) { __result.push(a); } } __result }); +non_init.iter().cloned().fold(threaded_accum.clone(), |acc: Rc, a: Rc| walk_expr(acc, &arg_value(&a), false, &si)) +} + } else { + texpr.children.clone().iter().cloned().fold(accum, |acc: Rc, a: Rc| walk_expr(acc, &arg_value(&a), false, &si)) + } +}, + ExprData::ExprMethodCall { .. } => { + let recv = method_receiver(texpr.clone()); +let mc_args = method_arg_nodes(texpr.clone()); +let mname = expr_method_name_at(texpr.clone(), si.clone()); +if (mname.as_str() == "fold".to_string().as_str()) { + { + let recv_accum = walk_expr(accum, &recv, false, &si); +let init_arg = Rc::new({ let mut __result = Vec::new(); for a in mc_args.clone().iter().cloned() { if (authored_name_at(si.clone(), &a).as_str() == "init".to_string().as_str()) { __result.push(a); } } __result }).first().cloned(); +let threaded_accum = match init_arg { + Some(ia) => { + let ia_val = arg_value(&ia); +match (*ia_val.expr_data.clone()).clone() { + ExprData::ExprVar { binding_kind: bk, .. } => { + let vn = expr_var_name_at(ia_val.clone(), si.clone()); +record_use(&recv_accum, &vn, EdgeKind::Threaded, "fold_init".to_string(), bk.clone(), ia_val.span.clone().start.clone()) +}, + _ => walk_expr(recv_accum, &ia_val, false, &si), +} +}, + None => recv_accum, +}; +let non_init = Rc::new({ let mut __result = Vec::new(); for a in mc_args.clone().iter().cloned() { if (authored_name_at(si.clone(), &a).as_str() != "init".to_string().as_str()) { __result.push(a); } } __result }); +let walked = non_init.iter().cloned().fold(threaded_accum.clone(), |acc: Rc, a: Rc| walk_expr(acc, &arg_value(&a), false, &si)); +Rc::new(UsageAccum { + bindings: walked.bindings.clone(), + fold_call_nodes: v2_rt::rc_list_push(walked.fold_call_nodes.clone(), texpr.clone()), +}) +} + } else { + { + let recv_accum = walk_expr(accum, &recv, false, &si); +mc_args.clone().iter().cloned().fold(recv_accum, |acc: Rc, a: Rc| walk_expr(acc, &arg_value(&a), false, &si)) +} + } +}, + ExprData::ExprMatch => { + let scrut = match_scrutinee(texpr.clone()); +let arm_nodes = match_arm_nodes(texpr.clone()); +let s_accum = walk_expr(accum, &scrut, false, &si); +let branch_accums = Rc::new({ let mut __result = Vec::new(); for arm_node in arm_nodes.iter().cloned() { __result.push(walk_expr(s_accum.clone(), &arm_body(&arm_node), in_tail.clone(), &si)); } __result }); +merge_branch_usages(&s_accum, &branch_accums) +}, + ExprData::ExprIf => { + let c = if_condition(texpr.clone()); +let t = if_then_branch(texpr.clone()); +let c_accum = walk_expr(accum, &c, false, &si); +let t_accum = walk_expr(c_accum.clone(), &t, in_tail.clone(), &si); +let e_accum = match if_else_branch(texpr.clone()) { + Some(eb) => walk_expr(c_accum.clone(), &eb, in_tail.clone(), &si), + None => c_accum.clone(), +}; +merge_branch_usages(&c_accum, &Rc::new(vec![t_accum, e_accum])) +}, + ExprData::ExprLet => { + let v = let_value(texpr.clone()); +let v_accum = walk_expr(accum, &v, false, &si); +match let_body(texpr.clone()) { + Some(b) => walk_expr(v_accum, &b, in_tail.clone(), &si), + None => v_accum, +} +}, + ExprData::ExprBlock => { + let ss = texpr.children.clone(); +let ss_count = (ss.clone().len() as i64); +if (ss_count.clone() == 0) { + accum + } else { + { + let init_accum = Rc::new({ let mut __result = Vec::new(); for p in Rc::new(ss.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (p.0.clone() < (ss_count.clone() - 1)) { __result.push(p); } } __result }).iter().cloned().fold(accum, |acc: Rc, p: (i64, Rc)| walk_expr(acc, &p.1.clone(), false, &si)); +match ss.clone().last().cloned() { + Some(last_expr) => walk_expr(init_accum, &last_expr, in_tail.clone(), &si), + None => init_accum, +} +} + } +}, + ExprData::ExprReturn => texpr.children.clone().iter().cloned().fold(accum, |acc: Rc, child: Rc| walk_expr(acc, &child, true, &si)), + ExprData::ExprLambda => { + let body = lambda_body(texpr.clone()); +let inner = walk_expr(empty_usage_accum(), &body, false, &si); +let binding_merged = Rc::new(v2_rt::map_values(&inner.bindings.clone())).iter().cloned().fold(accum, |acc: Rc, usage: Rc| { + let a1 = record_use(&acc, &usage.name.clone(), EdgeKind::Read, "lambda-capture".to_string(), None, 0); +record_use(&a1, &usage.name.clone(), EdgeKind::Read, "lambda-capture".to_string(), None, 0) +}); +Rc::new(UsageAccum { + bindings: binding_merged.bindings.clone(), + fold_call_nodes: v2_rt::concat(binding_merged.fold_call_nodes.clone(), inner.fold_call_nodes.clone()), +}) +}, + ExprData::ExprForEach => { + let coll = foreach_collection(texpr.clone()); +let coll_accum = walk_expr(accum, &coll, false, &si); +let body = foreach_body(texpr.clone()); +let inner = walk_expr(empty_usage_accum(), &body, false, &si); +let binding_merged = Rc::new(v2_rt::map_values(&inner.bindings.clone())).iter().cloned().fold(coll_accum.clone(), |acc: Rc, usage: Rc| { + let a1 = record_use(&acc, &usage.name.clone(), EdgeKind::Read, "foreach-capture".to_string(), None, 0); +record_use(&a1, &usage.name.clone(), EdgeKind::Read, "foreach-capture".to_string(), None, 0) +}); +Rc::new(UsageAccum { + bindings: binding_merged.bindings.clone(), + fold_call_nodes: v2_rt::concat(binding_merged.fold_call_nodes.clone(), inner.fold_call_nodes.clone()), +}) +}, + _ => texpr.children.clone().iter().cloned().fold(accum, |acc: Rc, child: Rc| walk_expr(acc, &child, false, &si)), +} }) } pub fn make_decision(usage: &Rc) -> Rc { { let sc = semantic_consumer_count(usage.clone()); - if (sc.clone() == 1) { +if (sc.clone() == 1) { { - let consumed_sites = Rc::new({ - let mut __result = Vec::new(); - for c in usage.consumers.clone().iter().cloned() { - if match c.kind.clone() { - EdgeKind::Consumed => true, - _ => false, - } { - __result.push(c); - } - } - __result - }); - let site = match consumed_sites.first().cloned() { - Some(c) => c.site.clone(), - None => "unknown".to_string(), - }; - Rc::new(OwnershipDecision::SoleOwner { - binding: usage.name.clone(), - site: site, - }) - } + let consumed_sites = Rc::new({ let mut __result = Vec::new(); for c in usage.consumers.clone().iter().cloned() { if match c.kind.clone() { + EdgeKind::Consumed => true, + _ => false, +} { __result.push(c); } } __result }); +let site = match consumed_sites.first().cloned() { + Some(c) => c.site.clone(), + None => "unknown".to_string(), +}; +Rc::new(OwnershipDecision::SoleOwner { + binding: usage.name.clone(), + site: site, +}) +} } else { if (sc.clone() > 1) { { - let sites = Rc::new({ - let mut __result = Vec::new(); - for c in Rc::new({ - let mut __result = Vec::new(); - for c in usage.consumers.clone().iter().cloned() { - if match c.kind.clone() { - EdgeKind::Consumed => true, - _ => false, - } { - __result.push(c); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(c.site.clone()); - } - __result - }); - Rc::new(OwnershipDecision::SharedError { - binding: usage.name.clone(), - consumer_count: sc.clone(), - sites: sites, - }) - } + let sites = Rc::new({ let mut __result = Vec::new(); for c in Rc::new({ let mut __result = Vec::new(); for c in usage.consumers.clone().iter().cloned() { if match c.kind.clone() { + EdgeKind::Consumed => true, + _ => false, +} { __result.push(c); } } __result }).iter().cloned() { __result.push(c.site.clone()); } __result }); +Rc::new(OwnershipDecision::SharedError { + binding: usage.name.clone(), + consumer_count: sc.clone(), + sites: sites, +}) +} } else { Rc::new(OwnershipDecision::Unclassified { - binding: usage.name.clone(), - reason: "no consumers found".to_string(), - }) + binding: usage.name.clone(), + reason: "no consumers found".to_string(), +}) } } - } +} } pub fn is_owned_local(kind: Option>) -> bool { match kind.as_deref().cloned() { - Some(VarBindingKind::LocalValueBinding) => true, - _ => false, - } + Some(VarBindingKind::LocalValueBinding) => true, + _ => false, +} } -pub fn build_movable_set(proof: Rc) -> Rc> { - Rc::new({ - let mut __result = Vec::new(); - for usage in Rc::new(v2_rt::map_values(&proof.bindings.clone())) - .iter() - .cloned() - { - if ((binding_fan_out(usage.clone()) == 1) && is_owned_local(usage.binding_kind.clone())) - { - __result.push(usage); - } - } - __result - }) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, usage: Rc| { - v2_rt::rc_map_insert(acc, usage.name.clone(), true) - }, - ) +pub fn build_movable_set(proof: Rc) -> Rc> { + Rc::new({ let mut __result = Vec::new(); for usage in Rc::new(v2_rt::map_values(&proof.bindings.clone())).iter().cloned() { if ((binding_fan_out(usage.clone()) == 1) && is_owned_local(usage.binding_kind.clone())) { __result.push(usage); } } __result }).iter().cloned().fold(empty_set(), |acc: Rc>, usage: Rc| set_insert(acc, usage.name.clone())) } -pub fn build_read_only_params( - proof: Rc, - param_names: Rc>, -) -> Rc> { - Rc::new({ - let mut __result = Vec::new(); - for usage in Rc::new(v2_rt::map_values(&proof.bindings.clone())) - .iter() - .cloned() - { - if (((v2_rt::map_contains_key(¶m_names, usage.name.clone()) - && is_owned_local(usage.binding_kind.clone())) - && (binding_fan_out(usage.clone()) > 1)) - && { - let mut __all = true; - for c in usage.consumers.clone().iter().cloned() { - if !(match c.kind.clone() { - EdgeKind::Read => true, - EdgeKind::Projected => true, - EdgeKind::Threaded => true, - _ => false, - }) { - __all = false; - break; - } - } - __all - }) - { - __result.push(usage); - } - } - __result - }) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, usage: Rc| { - v2_rt::rc_map_insert(acc, usage.name.clone(), true) - }, - ) +pub fn build_read_only_params(proof: Rc, param_names: Rc>) -> Rc> { + Rc::new({ let mut __result = Vec::new(); for usage in Rc::new(v2_rt::map_values(&proof.bindings.clone())).iter().cloned() { if (((set_contains(param_names.clone(), usage.name.clone()) && is_owned_local(usage.binding_kind.clone())) && (binding_fan_out(usage.clone()) > 1)) && { let mut __all = true; for c in usage.consumers.clone().iter().cloned() { if !(match c.kind.clone() { + EdgeKind::Read => true, + EdgeKind::Projected => true, + EdgeKind::Threaded => true, + _ => false, +}) { __all = false; break; } } __all }) { __result.push(usage); } } __result }).iter().cloned().fold(empty_set(), |acc: Rc>, usage: Rc| set_insert(acc, usage.name.clone())) } -pub fn collect_callable_refs( - texpr: &Rc, - si: &Rc>>, -) -> Rc> { +pub fn collect_callable_refs(texpr: &Rc, si: &Rc>>) -> Rc> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprVar { - binding_kind: bk, .. - } => match bk.clone().as_deref().cloned() { - Some(VarBindingKind::FunctionValueBinding) => { - let n = expr_var_name_at(texpr.clone(), si.clone()); - v2_rt::rc_map_insert(v2_rt::rc_empty_map::(), n, true) - } - _ => v2_rt::rc_empty_map::(), - }, - ExprData::ExprLiteral { .. } => v2_rt::rc_empty_map::(), - ExprData::ExprFieldAccess { .. } => { - collect_callable_refs(&field_access_base(texpr.clone()), &si) - } - ExprData::ExprCall { .. } => texpr.children.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, a: Rc| { - v2_rt::rc_map_merge(acc, collect_callable_refs(&arg_value(&a), &si)) - }, - ), - ExprData::ExprMethodCall { .. } => { - let recv = collect_callable_refs(&method_receiver(texpr.clone()), &si); - method_arg_nodes(texpr.clone()).iter().cloned().fold( - recv.clone(), - |acc: Rc>, a: Rc| { - v2_rt::rc_map_merge(acc, collect_callable_refs(&arg_value(&a), &si)) - }, - ) - } - ExprData::ExprIf => { - let cond = collect_callable_refs(&if_condition(texpr.clone()), &si); - let then_br = collect_callable_refs(&if_then_branch(texpr.clone()), &si); - let else_br = match if_else_branch(texpr.clone()) { - Some(eb) => collect_callable_refs(&eb, &si), - None => v2_rt::rc_empty_map::(), - }; - v2_rt::rc_map_merge(v2_rt::rc_map_merge(cond, then_br), else_br) - } - ExprData::ExprMatch => { - let scrut = collect_callable_refs(&match_scrutinee(texpr.clone()), &si); - match_arm_nodes(texpr.clone()).iter().cloned().fold( - scrut.clone(), - |acc: Rc>, arm: Rc| { - v2_rt::rc_map_merge(acc, collect_callable_refs(&arm_body(&arm), &si)) - }, - ) - } - ExprData::ExprLet => { - let val = collect_callable_refs(&let_value(texpr.clone()), &si); - match let_body(texpr.clone()) { - Some(lb) => v2_rt::rc_map_merge(val, collect_callable_refs(&lb, &si)), - None => val, - } - } - ExprData::ExprBlock => texpr.children.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, child: Rc| { - v2_rt::rc_map_merge(acc, collect_callable_refs(&child, &si)) - }, - ), - ExprData::ExprReturn => match texpr.children.clone().first().cloned() { - Some(child) => collect_callable_refs(&child, &si), - None => v2_rt::rc_empty_map::(), - }, - ExprData::ExprLambda => collect_callable_refs(&lambda_body(texpr.clone()), &si), - ExprData::ExprForEach => { - let col = collect_callable_refs(&foreach_collection(texpr.clone()), &si); - v2_rt::rc_map_merge( - col, - collect_callable_refs(&foreach_body(texpr.clone()), &si), - ) - } - ExprData::ExprRecordLit { .. } => texpr.children.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, field: Rc| { - v2_rt::rc_map_merge(acc, collect_callable_refs(&arg_value(&field), &si)) - }, - ), - _ => v2_rt::rc_empty_map::(), - } + ExprData::ExprVar { binding_kind: bk, .. } => match bk.clone().as_deref().cloned() { + Some(VarBindingKind::FunctionValueBinding) => { + let n = expr_var_name_at(texpr.clone(), si.clone()); +set_insert(empty_set(), n) +}, + _ => empty_set(), +}, + ExprData::ExprLiteral { .. } => empty_set(), + ExprData::ExprFieldAccess { .. } => collect_callable_refs(&field_access_base(texpr.clone()), &si), + ExprData::ExprCall { .. } => texpr.children.clone().iter().cloned().fold(empty_set(), |acc: Rc>, a: Rc| set_union(acc, collect_callable_refs(&arg_value(&a), &si))), + ExprData::ExprMethodCall { .. } => { + let recv = collect_callable_refs(&method_receiver(texpr.clone()), &si); +method_arg_nodes(texpr.clone()).iter().cloned().fold(recv.clone(), |acc: Rc>, a: Rc| set_union(acc, collect_callable_refs(&arg_value(&a), &si))) +}, + ExprData::ExprIf => { + let cond = collect_callable_refs(&if_condition(texpr.clone()), &si); +let then_br = collect_callable_refs(&if_then_branch(texpr.clone()), &si); +let else_br = match if_else_branch(texpr.clone()) { + Some(eb) => collect_callable_refs(&eb, &si), + None => empty_set(), +}; +set_union(set_union(cond, then_br), else_br) +}, + ExprData::ExprMatch => { + let scrut = collect_callable_refs(&match_scrutinee(texpr.clone()), &si); +match_arm_nodes(texpr.clone()).iter().cloned().fold(scrut.clone(), |acc: Rc>, arm: Rc| set_union(acc, collect_callable_refs(&arm_body(&arm), &si))) +}, + ExprData::ExprLet => { + let val = collect_callable_refs(&let_value(texpr.clone()), &si); +match let_body(texpr.clone()) { + Some(lb) => set_union(val, collect_callable_refs(&lb, &si)), + None => val, +} +}, + ExprData::ExprBlock => texpr.children.clone().iter().cloned().fold(empty_set(), |acc: Rc>, child: Rc| set_union(acc, collect_callable_refs(&child, &si))), + ExprData::ExprReturn => match texpr.children.clone().first().cloned() { + Some(child) => collect_callable_refs(&child, &si), + None => empty_set(), +}, + ExprData::ExprLambda => collect_callable_refs(&lambda_body(texpr.clone()), &si), + ExprData::ExprForEach => { + let col = collect_callable_refs(&foreach_collection(texpr.clone()), &si); +set_union(col, collect_callable_refs(&foreach_body(texpr.clone()), &si)) +}, + ExprData::ExprRecordLit { .. } => texpr.children.clone().iter().cloned().fold(empty_set(), |acc: Rc>, field: Rc| set_union(acc, collect_callable_refs(&arg_value(&field), &si))), + _ => empty_set(), +} }) } pub fn fold_terminal_expr(mut body: Rc) -> Rc { loop { match (*body.expr_data.clone()).clone() { - ExprData::ExprLet => match let_body(body.clone()) { - Some(inner) => { - let __tco_0 = inner.clone(); - body = __tco_0; - continue; - } - None => { - break body.clone(); - } - }, - ExprData::ExprBlock => match body.children.clone().last().cloned() { - Some(last_child) => { - let __tco_0 = last_child.clone(); - body = __tco_0; - continue; - } - None => { - break body.clone(); - } - }, - _ => { - break body.clone(); - } - } - } + ExprData::ExprLet => { match let_body(body.clone()) { + Some(inner) => { { + let __tco_0 = inner.clone(); +body = __tco_0; +continue; +} }, + None => { break body.clone(); }, +} }, + ExprData::ExprBlock => { match body.children.clone().last().cloned() { + Some(last_child) => { { + let __tco_0 = last_child.clone(); +body = __tco_0; +continue; +} }, + None => { break body.clone(); }, +} }, + _ => { break body.clone(); }, +} +} } pub fn empty_fold_acc_use_summary() -> Rc { Rc::new(FoldAccUseSummary { - whole_acc_uses: 0, - field_moves: Rc::new(vec![]), - nested_acc_refs: false, - }) + whole_acc_uses: 0, + field_moves: Rc::new(vec![]), + nested_acc_refs: false, +}) } -pub fn merge_fold_acc_use_summaries( - left: &Rc, - right: &Rc, -) -> Rc { +pub fn merge_fold_acc_use_summaries(left: &Rc, right: &Rc) -> Rc { Rc::new(FoldAccUseSummary { - whole_acc_uses: (left.whole_acc_uses.clone() + right.whole_acc_uses.clone()), - field_moves: v2_rt::concat(left.field_moves.clone(), right.field_moves.clone()), - nested_acc_refs: (left.nested_acc_refs.clone() || right.nested_acc_refs.clone()), - }) + whole_acc_uses: (left.whole_acc_uses.clone() + right.whole_acc_uses.clone()), + field_moves: v2_rt::concat(left.field_moves.clone(), right.field_moves.clone()), + nested_acc_refs: (left.nested_acc_refs.clone() || right.nested_acc_refs.clone()), +}) } -pub fn summarize_fold_acc_uses( - node: &Rc, - acc_name: &String, - si: &Rc>>, - inside_nested: bool, -) -> Rc { +pub fn summarize_fold_acc_uses(node: &Rc, acc_name: &String, si: &Rc>>, inside_nested: bool) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*node.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - if (expr_var_name_at(node.clone(), si.clone()).as_str() - == acc_name.clone().as_str()) - { - if inside_nested.clone() { - Rc::new(FoldAccUseSummary { - whole_acc_uses: 0, - field_moves: Rc::new(vec![]), - nested_acc_refs: true, - }) - } else { - Rc::new(FoldAccUseSummary { - whole_acc_uses: 1, - field_moves: Rc::new(vec![]), - nested_acc_refs: false, - }) - } - } else { - empty_fold_acc_use_summary() - } - } - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(node.clone()); - let is_direct = match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - (expr_var_name_at(base.clone(), si.clone()).as_str() - == acc_name.clone().as_str()) - } - _ => false, - }; - if is_direct { - if inside_nested.clone() { - Rc::new(FoldAccUseSummary { - whole_acc_uses: 0, - field_moves: Rc::new(vec![]), - nested_acc_refs: true, - }) - } else { - Rc::new(FoldAccUseSummary { - whole_acc_uses: 0, - field_moves: Rc::new(vec![field_access_field_at( - node.clone(), - si.clone(), - )]), - nested_acc_refs: false, - }) - } - } else { - node.children.clone().iter().cloned().fold( - empty_fold_acc_use_summary(), - |acc: Rc, child: Rc| { - merge_fold_acc_use_summaries( - &acc, - &summarize_fold_acc_uses( - &child, - &acc_name, - &si, - inside_nested.clone(), - ), - ) - }, - ) - } + ExprData::ExprVar { .. } => if (expr_var_name_at(node.clone(), si.clone()).as_str() == acc_name.clone().as_str()) { + if inside_nested.clone() { + Rc::new(FoldAccUseSummary { + whole_acc_uses: 0, + field_moves: Rc::new(vec![]), + nested_acc_refs: true, +}) + } else { + Rc::new(FoldAccUseSummary { + whole_acc_uses: 1, + field_moves: Rc::new(vec![]), + nested_acc_refs: false, +}) } - ExprData::ExprLambda => { - let body_summary = - summarize_fold_acc_uses(&lambda_body(node.clone()), &acc_name, &si, true); - if (((body_summary.whole_acc_uses.clone() > 0) - || ((body_summary.field_moves.clone().len() as i64) > 0)) - || body_summary.nested_acc_refs.clone()) - { + } else { + empty_fold_acc_use_summary() + }, + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(node.clone()); +let is_direct = match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => (expr_var_name_at(base.clone(), si.clone()).as_str() == acc_name.clone().as_str()), + _ => false, +}; +if is_direct { + if inside_nested.clone() { Rc::new(FoldAccUseSummary { - whole_acc_uses: 0, - field_moves: Rc::new(vec![]), - nested_acc_refs: true, - }) + whole_acc_uses: 0, + field_moves: Rc::new(vec![]), + nested_acc_refs: true, +}) } else { - empty_fold_acc_use_summary() - } - } - ExprData::ExprForEach => { - let coll_summary = summarize_fold_acc_uses( - &foreach_collection(node.clone()), - &acc_name, - &si, - inside_nested.clone(), - ); - let body_summary = - summarize_fold_acc_uses(&foreach_body(node.clone()), &acc_name, &si, true); - let nested_summary = if (((body_summary.whole_acc_uses.clone() > 0) - || ((body_summary.field_moves.clone().len() as i64) > 0)) - || body_summary.nested_acc_refs.clone()) - { Rc::new(FoldAccUseSummary { - whole_acc_uses: 0, - field_moves: Rc::new(vec![]), - nested_acc_refs: true, - }) - } else { - empty_fold_acc_use_summary() - }; - merge_fold_acc_use_summaries(&coll_summary, &nested_summary) - } - _ => node.children.clone().iter().cloned().fold( - empty_fold_acc_use_summary(), - |acc: Rc, child: Rc| { - merge_fold_acc_use_summaries( - &acc, - &summarize_fold_acc_uses(&child, &acc_name, &si, inside_nested.clone()), - ) - }, - ), - } + whole_acc_uses: 0, + field_moves: Rc::new(vec![field_access_field_at(node.clone(), si.clone())]), + nested_acc_refs: false, +}) + } + } else { + node.children.clone().iter().cloned().fold(empty_fold_acc_use_summary(), |acc: Rc, child: Rc| merge_fold_acc_use_summaries(&acc, &summarize_fold_acc_uses(&child, &acc_name, &si, inside_nested.clone()))) + } +}, + ExprData::ExprLambda => { + let body_summary = summarize_fold_acc_uses(&lambda_body(node.clone()), &acc_name, &si, true); +if (((body_summary.whole_acc_uses.clone() > 0) || ((body_summary.field_moves.clone().len() as i64) > 0)) || body_summary.nested_acc_refs.clone()) { + Rc::new(FoldAccUseSummary { + whole_acc_uses: 0, + field_moves: Rc::new(vec![]), + nested_acc_refs: true, +}) + } else { + empty_fold_acc_use_summary() + } +}, + ExprData::ExprForEach => { + let coll_summary = summarize_fold_acc_uses(&foreach_collection(node.clone()), &acc_name, &si, inside_nested.clone()); +let body_summary = summarize_fold_acc_uses(&foreach_body(node.clone()), &acc_name, &si, true); +let nested_summary = if (((body_summary.whole_acc_uses.clone() > 0) || ((body_summary.field_moves.clone().len() as i64) > 0)) || body_summary.nested_acc_refs.clone()) { + Rc::new(FoldAccUseSummary { + whole_acc_uses: 0, + field_moves: Rc::new(vec![]), + nested_acc_refs: true, +}) + } else { + empty_fold_acc_use_summary() + }; +merge_fold_acc_use_summaries(&coll_summary, &nested_summary) +}, + _ => node.children.clone().iter().cloned().fold(empty_fold_acc_use_summary(), |acc: Rc, child: Rc| merge_fold_acc_use_summaries(&acc, &summarize_fold_acc_uses(&child, &acc_name, &si, inside_nested.clone()))), +} }) } -pub fn fold_lambda_acc_use_summary( - lambda_node: &Rc, - acc_name: String, - si: Rc>>, -) -> Rc { +pub fn fold_lambda_acc_use_summary(lambda_node: &Rc, acc_name: String, si: Rc>>) -> Rc { match (*lambda_node.expr_data.clone()).clone() { - ExprData::ExprLambda => { - summarize_fold_acc_uses(&lambda_body(lambda_node.clone()), &acc_name, &si, false) - } - _ => empty_fold_acc_use_summary(), - } + ExprData::ExprLambda => summarize_fold_acc_uses(&lambda_body(lambda_node.clone()), &acc_name, &si, false), + _ => empty_fold_acc_use_summary(), +} } -pub fn fold_body_constructs_acc_struct( - lambda_node: &Rc, - acc_type_name: String, - si: Rc>>, -) -> bool { +pub fn fold_body_constructs_acc_struct(lambda_node: &Rc, acc_type_name: String, si: Rc>>) -> bool { match (*lambda_node.expr_data.clone()).clone() { - ExprData::ExprLambda => { - let body = lambda_body(lambda_node.clone()); - let terminal = fold_terminal_expr(body); - match (*terminal.expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => { - (authored_name_at(si, &terminal).as_str() == acc_type_name.as_str()) - } - _ => false, - } - } - _ => false, - } + ExprData::ExprLambda => { + let body = lambda_body(lambda_node.clone()); +let terminal = fold_terminal_expr(body); +match (*terminal.expr_data.clone()).clone() { + ExprData::ExprRecordLit { .. } => (authored_name_at(si, &terminal).as_str() == acc_type_name.as_str()), + _ => false, +} +}, + _ => false, +} } -pub fn fold_body_safe_field_moves( - lambda_node: Rc, - acc_name: String, - si: Rc>>, -) -> bool { +pub fn fold_body_safe_field_moves(lambda_node: Rc, acc_name: String, si: Rc>>) -> bool { { let summary = fold_lambda_acc_use_summary(&lambda_node, acc_name, si); - let deduped = summary.field_moves.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |seen: Rc>, field: String| { - v2_rt::rc_map_insert(seen, field.clone(), true) - }, - ); - ((!summary.nested_acc_refs.clone() && (summary.whole_acc_uses.clone() == 0)) - && ((Rc::new(v2_rt::map_keys(&deduped)).len() as i64) - == (summary.field_moves.clone().len() as i64))) - } +let deduped = summary.field_moves.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |seen: Rc>, field: String| v2_rt::rc_map_insert(seen, field.clone(), true)); +((!summary.nested_acc_refs.clone() && (summary.whole_acc_uses.clone() == 0)) && ((Rc::new(v2_rt::map_keys(&deduped)).len() as i64) == (summary.field_moves.clone().len() as i64))) +} } -pub fn fold_body_consumes_acc_once( - lambda_node: Rc, - acc_name: String, - si: Rc>>, -) -> bool { +pub fn fold_body_consumes_acc_once(lambda_node: Rc, acc_name: String, si: Rc>>) -> bool { { let summary = fold_lambda_acc_use_summary(&lambda_node, acc_name, si); - ((!summary.nested_acc_refs.clone() && (summary.whole_acc_uses.clone() == 1)) - && ((summary.field_moves.clone().len() as i64) == 0)) - } +((!summary.nested_acc_refs.clone() && (summary.whole_acc_uses.clone() == 1)) && ((summary.field_moves.clone().len() as i64) == 0)) +} } -pub fn analyze_single_fold( - method_call: &Rc, - si: &Rc>>, -) -> Rc { +pub fn analyze_single_fold(method_call: &Rc, si: &Rc>>) -> Rc { { let args = method_arg_nodes(method_call.clone()); - let init_arg_node = match args.clone().first().cloned() { - Some(a) => arg_value(&a), - None => method_call.clone(), - }; - let fold_lambda_node = match args.clone().get(1 as usize).cloned() { - Some(a) => arg_value(&a), - None => method_call.clone(), - }; - let acc_param_name = match (*fold_lambda_node.expr_data.clone()).clone() { - ExprData::ExprLambda => { - match lambda_param_names_at(fold_lambda_node.clone(), si.clone()) - .first() - .cloned() - { - Some(n) => n.clone(), - None => "".to_string(), - } - } - _ => "".to_string(), - }; - let acc_type_name = match init_arg_node.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { - node: type_node, .. - }) => authored_name_at(si.clone(), &type_node), - _ => "".to_string(), - }; - let cond_required = match init_arg_node.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { - node: type_node, .. - }) => (type_node.return_cardinality.clone() == Cardinality::Required), - _ => false, - }; - let cond_struct = - fold_body_constructs_acc_struct(&fold_lambda_node, acc_type_name.clone(), si.clone()); - let cond_whole_acc = fold_body_consumes_acc_once( - fold_lambda_node.clone(), - acc_param_name.clone(), - si.clone(), - ); - let cond_safe = fold_body_safe_field_moves( - fold_lambda_node.clone(), - acc_param_name.clone(), - si.clone(), - ); - let eligible = ((cond_required - && (acc_type_name.clone().as_str() != "".to_string().as_str())) - && ((cond_struct.clone() && cond_safe.clone()) || cond_whole_acc.clone())); - Rc::new(FoldAccUnwrapProof { - site_key: (method_call.span.clone().start.clone()).to_string(), - acc_param_name: acc_param_name.clone(), - acc_type_name: acc_type_name.clone(), - body_constructs_acc: cond_struct.clone(), - whole_acc_single_use: cond_whole_acc.clone(), - safe_field_moves: cond_safe.clone(), - eligible: eligible, - }) - } -} - -pub fn analyze_ownership( - func_name: String, - params: Rc>>, - body: Rc, - si: &Rc>>, -) -> Rc { +let init_arg_node = match args.clone().first().cloned() { + Some(a) => arg_value(&a), + None => method_call.clone(), +}; +let fold_lambda_node = match args.clone().get(1 as usize).cloned() { + Some(a) => arg_value(&a), + None => method_call.clone(), +}; +let acc_param_name = match (*fold_lambda_node.expr_data.clone()).clone() { + ExprData::ExprLambda => match lambda_param_names_at(fold_lambda_node.clone(), si.clone()).first().cloned() { + Some(n) => n.clone(), + None => "".to_string(), +}, + _ => "".to_string(), +}; +let acc_type_name = match init_arg_node.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: type_node, .. }) => authored_name_at(si.clone(), &type_node), + _ => "".to_string(), +}; +let cond_required = match init_arg_node.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: type_node, .. }) => (type_node.return_cardinality.clone() == Cardinality::Required), + _ => false, +}; +let cond_struct = fold_body_constructs_acc_struct(&fold_lambda_node, acc_type_name.clone(), si.clone()); +let cond_whole_acc = fold_body_consumes_acc_once(fold_lambda_node.clone(), acc_param_name.clone(), si.clone()); +let cond_safe = fold_body_safe_field_moves(fold_lambda_node.clone(), acc_param_name.clone(), si.clone()); +let eligible = ((cond_required && (acc_type_name.clone().as_str() != "".to_string().as_str())) && ((cond_struct.clone() && cond_safe.clone()) || cond_whole_acc.clone())); +Rc::new(FoldAccUnwrapProof { + site_key: (method_call.span.clone().start.clone()).to_string(), + acc_param_name: acc_param_name.clone(), + acc_type_name: acc_type_name.clone(), + body_constructs_acc: cond_struct.clone(), + whole_acc_single_use: cond_whole_acc.clone(), + safe_field_moves: cond_safe.clone(), + eligible: eligible, +}) +} +} + +pub fn analyze_ownership(func_name: String, params: Rc>>, body: Rc, si: &Rc>>) -> Rc { { - let initial = - params - .iter() - .cloned() - .fold(empty_usage_accum(), |acc: Rc, p: Rc| { - let acc = Rc::try_unwrap(acc).unwrap_or_else(|rc| (*rc).clone()); - { - let p_name = authored_name_at(si.clone(), &p); - Rc::new(UsageAccum { - bindings: v2_rt::rc_map_insert( - acc.bindings, - p_name.clone(), - Rc::new(BindingUsage { - name: p_name.clone(), - binding_kind: None, - consumers: Rc::new(vec![]), - }), - ), - fold_call_nodes: acc.fold_call_nodes, - }) - } - }); - let result = walk_expr(initial, &body, true, &si); - let binding_list = Rc::new(v2_rt::map_values(&result.bindings.clone())); - let decisions = Rc::new({ - let mut __result = Vec::new(); - for usage in binding_list.iter().cloned() { - __result.push(make_decision(&usage)); - } - __result - }); - let fold_proofs = Rc::new({ - let mut __result = Vec::new(); - for n in result.fold_call_nodes.clone().iter().cloned() { - __result.push(analyze_single_fold(&n, &si)); - } - __result - }); - Rc::new(OwnershipProof { - func_name: func_name, - bindings: result.bindings.clone(), - decisions: decisions, - fold_acc_unwrap: fold_proofs, - }) - } + let initial = params.iter().cloned().fold(empty_usage_accum(), |acc: Rc, p: Rc| { let acc = Rc::try_unwrap(acc).unwrap_or_else(|rc| (*rc).clone()); { + let p_name = authored_name_at(si.clone(), &p); +Rc::new(UsageAccum { + bindings: v2_rt::rc_map_insert(acc.bindings, p_name.clone(), Rc::new(BindingUsage { + name: p_name.clone(), + binding_kind: None, + consumers: Rc::new(vec![]), +})), + fold_call_nodes: acc.fold_call_nodes, +}) +} }); +let result = walk_expr(initial, &body, true, &si); +let binding_list = Rc::new(v2_rt::map_values(&result.bindings.clone())); +let decisions = Rc::new({ let mut __result = Vec::new(); for usage in binding_list.iter().cloned() { __result.push(make_decision(&usage)); } __result }); +let fold_proofs = Rc::new({ let mut __result = Vec::new(); for n in result.fold_call_nodes.clone().iter().cloned() { __result.push(analyze_single_fold(&n, &si)); } __result }); +Rc::new(OwnershipProof { + func_name: func_name, + bindings: result.bindings.clone(), + decisions: decisions, + fold_acc_unwrap: fold_proofs, +}) +} } diff --git a/src/v2/stage0/src/v2_compiler_parse.rs b/src/v2/stage0/src/v2_compiler_parse.rs index f70bb1e0fd1..7c21933f300 100644 --- a/src/v2/stage0/src/v2_compiler_parse.rs +++ b/src/v2/stage0/src/v2_compiler_parse.rs @@ -1,68 +1,35 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.parse +use std::collections::HashMap; +use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::v2_std_core::{module_node, import_node, Node, InferredNode, Connective, is_container_type, Cardinality, make_param_node, param_node_type_expr, param_node_default_value, make_field_node, field_node_name_at, field_node_type_expr, field_node_cardinality, field_node_default_value, field_node_from_key, make_variant_node, variant_node_name_at, variant_node_fields, leaf_node_with_span, ExprData, make_expr_node, make_named_expr_node, make_expr_error_node, expr_var_name_at, field_access_field_at, expr_call_func_at, make_arg_node, arg_name_at, arg_value, make_arm_node, make_field_init_node, make_resource_use_node, make_text_part_node, make_interp_part_node, MatchPattern, make_field_binding_node, field_binding_pattern, LiteralValue, ExprErrorKind, BinOp, UnaryOpKind, StringPart, local_transport_node, rest_transport_node, shell_transport_node, file_transport_node, transport_url_key, transport_path_key, transport_method_key, transport_path_template_key, transport_query_key, transport_body_key, transport_stdin_key, transport_response_format_key, transport_headers_key, service_config_properties, OperationModifier, Token, TokenShape, SourceSpan, make_span, ErrorNode, make_error_node, with_required_cardinality, error_type, is_compiler_error, node_name_span, no_span, NewlineIndex, authored_name_at, InternTable, InternResult, empty_intern_table, intern, pre_intern_tokens, CompilerDiagnostic}; +use crate::v2_std_core::InferredNode::{Resolved, CompilerError, TypeVariable}; +use crate::v2_std_core::Connective::{Conj, Disj, NoConnective, Arrow}; +use crate::v2_std_core::Cardinality::{Required, CardOptional}; +use crate::v2_std_core::ExprData::{NoExprData, ExprLiteral, ExprVar, ExprFieldAccess, ExprCall, ExprMethodCall, ExprMatch, ExprIf, ExprLet, ExprRecordLit, ExprListLit, ExprBinOp, ExprUnaryOp, ExprLambda, ExprStringInterp, ExprBlock, ExprCast, ExprForEach, ExprIndex, ExprSlice, ExprReturn}; +use crate::v2_std_core::MatchPattern::{Bind, LitPattern, VariantPattern, Wildcard}; +use crate::v2_std_core::LiteralValue::{LitStr, LitInt, LitFloat, LitBool, LitNull}; +use crate::v2_std_core::ExprErrorKind::{ParseRecoveryError}; +use crate::v2_std_core::BinOp::{Add, Sub, Mul, Div, Mod, Eq, Ne, Lt, Gt, Le, Ge, And, Or, NullCoalesce}; +use crate::v2_std_core::UnaryOpKind::{Not, Neg}; +use crate::v2_std_core::StringPart::{Text, Interpolation}; +use crate::v2_std_core::OperationModifier::{Idempotent, Readonly, Hermetic}; +use crate::v2_std_core::TokenShape::{ShKeyword, ShLBrace, ShRBrace, ShLParen, ShRParen, ShLBracket, ShRBracket, ShLt, ShGt, ShLe, ShGe, ShFatArrow, ShArrow, ShColon, ShComma, ShDot, ShDotDot, ShEq, ShEqEq, ShNe, ShPlus, ShMinus, ShStar, ShSlash, ShPercent, ShBang, ShAnd, ShOr, ShQuestion, ShNullCoalesce, ShPipe, ShPipeArrow, ShLitStr, ShLitInt, ShLitFloat, ShIdent, ShStrBegin, ShStrMid, ShStrEnd, ShNewline, ShEof, ShUnknown}; +use crate::v2_std_core::CompilerDiagnostic::{ParseError}; +pub use crate::v2_compiler_languages::{ItemForm, ItemFormKind, BodyKind, OperatorSpec, SyntaxSpec}; +use crate::v2_compiler_languages::ItemFormKind::{OtherForm}; +use crate::v2_compiler_languages::BodyKind::{ExprBody, BlockBody, TypeBody, ValueBody, NoBody, ServiceBody, ResourceBody}; +pub use crate::extdeps_languages_dag_syntax::{dag_syntax_spec, dag_non_name_keywords}; use self::AdvanceResult::*; use self::EatResult::*; use self::ExpectedToken::*; -use self::ParserCallIdentity::*; use self::ParserHelperIdentity::*; +use self::ParserCallIdentity::*; use self::ParserResultWitness::*; -pub use crate::extdeps_languages_dag_syntax::{dag_non_name_keywords, dag_syntax_spec}; -use crate::v2_compiler_languages::BodyKind::{ - BlockBody, ExprBody, NoBody, ResourceBody, ServiceBody, TypeBody, ValueBody, -}; -use crate::v2_compiler_languages::ItemFormKind::OtherForm; -pub use crate::v2_compiler_languages::{ - BodyKind, ItemForm, ItemFormKind, OperatorSpec, SyntaxSpec, -}; -use crate::v2_rt; -use crate::v2_std_core::BinOp::{ - Add, And, Div, Eq, Ge, Gt, Le, Lt, Mod, Mul, Ne, NullCoalesce, Or, Sub, -}; -use crate::v2_std_core::Cardinality::{CardOptional, Required}; -use crate::v2_std_core::CompilerDiagnostic::ParseError; -use crate::v2_std_core::Connective::{Arrow, Conj, Disj, NoConnective}; -use crate::v2_std_core::ExprData::{ - ExprBinOp, ExprBlock, ExprCall, ExprCast, ExprFieldAccess, ExprForEach, ExprIf, ExprIndex, - ExprLambda, ExprLet, ExprListLit, ExprLiteral, ExprMatch, ExprMethodCall, ExprRecordLit, - ExprReturn, ExprSlice, ExprStringInterp, ExprUnaryOp, ExprVar, NoExprData, -}; -use crate::v2_std_core::ExprErrorKind::ParseRecoveryError; -use crate::v2_std_core::InferredNode::{CompilerError, Resolved, TypeVariable}; -use crate::v2_std_core::LiteralValue::{LitBool, LitFloat, LitInt, LitNull, LitStr}; -use crate::v2_std_core::MatchPattern::{Bind, LitPattern, VariantPattern, Wildcard}; -use crate::v2_std_core::OperationModifier::{Hermetic, Idempotent, Readonly}; -use crate::v2_std_core::StringPart::{Interpolation, Text}; -use crate::v2_std_core::TokenShape::{ - ShAnd, ShArrow, ShBang, ShColon, ShComma, ShDot, ShDotDot, ShEof, ShEq, ShEqEq, ShFatArrow, - ShGe, ShGt, ShIdent, ShKeyword, ShLBrace, ShLBracket, ShLParen, ShLe, ShLitFloat, ShLitInt, - ShLitStr, ShLt, ShMinus, ShNe, ShNewline, ShNullCoalesce, ShOr, ShPercent, ShPipe, ShPipeArrow, - ShPlus, ShQuestion, ShRBrace, ShRBracket, ShRParen, ShSlash, ShStar, ShStrBegin, ShStrEnd, - ShStrMid, ShUnknown, -}; -use crate::v2_std_core::UnaryOpKind::{Neg, Not}; -pub use crate::v2_std_core::{ - arg_name_at, arg_value, authored_name_at, empty_intern_table, error_type, expr_call_func_at, - expr_var_name_at, field_access_field_at, field_binding_pattern, field_node_cardinality, - field_node_default_value, field_node_from_key, field_node_name_at, field_node_type_expr, - file_transport_node, import_node, intern, is_compiler_error, is_container_type, - leaf_node_with_span, local_transport_node, make_arg_node, make_arm_node, make_error_node, - make_expr_error_node, make_expr_node, make_field_binding_node, make_field_init_node, - make_field_node, make_interp_part_node, make_named_expr_node, make_param_node, - make_resource_use_node, make_span, make_text_part_node, make_variant_node, module_node, - no_span, node_name_span, param_node_default_value, param_node_type_expr, pre_intern_tokens, - rest_transport_node, service_config_properties, shell_transport_node, transport_body_key, - transport_headers_key, transport_method_key, transport_path_key, transport_path_template_key, - transport_query_key, transport_response_format_key, transport_stdin_key, transport_url_key, - variant_node_fields, variant_node_name_at, with_required_cardinality, BinOp, Cardinality, - CompilerDiagnostic, Connective, ErrorNode, ExprData, ExprErrorKind, InferredNode, InternResult, - InternTable, LiteralValue, MatchPattern, NewlineIndex, Node, OperationModifier, SourceSpan, - StringPart, Token, TokenShape, UnaryOpKind, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; -use std::collections::HashMap; -use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct ParseContext { @@ -317,7 +284,9 @@ pub struct BindingPower { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum ExpectedToken { - ExpectKeyword { text: String }, + ExpectKeyword { + text: String, + }, ExpectLBrace, ExpectRBrace, ExpectLParen, @@ -675,8 +644,12 @@ pub enum ParserHelperIdentity { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum ParserCallIdentity { - ParserCallHelper { helper: ParserHelperIdentity }, - ParserCallFunction { name: String }, + ParserCallHelper { + helper: ParserHelperIdentity, + }, + ParserCallFunction { + name: String, + }, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -685,7 +658,9 @@ pub enum ParserResultWitness { ParserWitnessAdvance, ParserWitnessExpect, ParserWitnessEat, - ParserWitnessCall { callee: Rc }, + ParserWitnessCall { + callee: Rc, + }, ParserWitnessOpaque, } impl ParserResultWitness { @@ -708,482 +683,424 @@ pub struct DescResult { pub fn token_span(tok: Option>) -> Rc { match tok { - Some(t) => t.span.clone(), - None => make_span(0, 0), - } + Some(t) => t.span.clone(), + None => make_span(0, 0), +} } pub fn advance(tokens: &Rc>>) -> Rc { match tokens.clone().first().cloned() { - Some(t) => Rc::new(AdvanceResult::AdvanceOk { - token: t.clone(), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - }), - None => Rc::new(AdvanceResult::AdvanceEof), - } + Some(t) => Rc::new(AdvanceResult::AdvanceOk { + token: t.clone(), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), +}), + None => Rc::new(AdvanceResult::AdvanceEof), +} } pub fn parse_error(msg: String, span: Rc) -> Rc { - make_error_node( - Rc::new(CompilerDiagnostic::ParseError { - message: msg, - span: span, - }), - "".to_string(), - ) + make_error_node(Rc::new(CompilerDiagnostic::ParseError { + message: msg, + span: span, +}), "".to_string()) } pub fn has_err(err: Option>) -> bool { match err { - Some(_) => true, - None => false, - } + Some(_) => true, + None => false, +} } pub fn parse_string_literal_value(tokens: &Rc>>) -> Rc { { let tok = tokens.clone().first().cloned(); - match tok.clone() { - Some(t) => match t.shape.clone() { - TokenShape::ShLitStr => Rc::new(StringLitResult { - value: t.text.clone(), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - err: None, - }), - _ => Rc::new(StringLitResult { - value: "".to_string(), - tokens: tokens.clone(), - err: Some(parse_error( - "expected string literal".to_string(), - token_span(tok.clone()), - )), - }), - }, - None => Rc::new(StringLitResult { - value: "".to_string(), - tokens: tokens.clone(), - err: Some(parse_error( - "expected string literal".to_string(), - make_span(0, 0), - )), - }), - } - } +match tok.clone() { + Some(t) => match t.shape.clone() { + TokenShape::ShLitStr => Rc::new(StringLitResult { + value: t.text.clone(), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + err: None, +}), + _ => Rc::new(StringLitResult { + value: "".to_string(), + tokens: tokens.clone(), + err: Some(parse_error("expected string literal".to_string(), token_span(tok.clone()))), +}), +}, + None => Rc::new(StringLitResult { + value: "".to_string(), + tokens: tokens.clone(), + err: Some(parse_error("expected string literal".to_string(), make_span(0, 0))), +}), +} +} } pub fn parse_int_literal_value(tokens: &Rc>>) -> Rc { { let tok = tokens.clone().first().cloned(); - match tok.clone() { - Some(t) => match t.shape.clone() { - TokenShape::ShLitInt => { - let n_opt = v2_rt::parse_int(t.text.clone()); - match n_opt { - Some(n) => Rc::new(IntLitResult { - value: n.clone(), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - err: None, - }), - None => Rc::new(IntLitResult { - value: 0, - tokens: tokens.clone(), - err: Some(parse_error( - v2_rt::concat( - v2_rt::concat( - "internal: ShLitInt token text not parseable as int: '" - .to_string(), - t.text.clone(), - ), - "'".to_string(), - ), - token_span(tok.clone()), - )), - }), - } - } - _ => Rc::new(IntLitResult { - value: 0, - tokens: tokens.clone(), - err: Some(parse_error( - "expected integer literal".to_string(), - token_span(tok.clone()), - )), - }), - }, - None => Rc::new(IntLitResult { - value: 0, - tokens: tokens.clone(), - err: Some(parse_error( - "expected integer literal".to_string(), - make_span(0, 0), - )), - }), - } - } +match tok.clone() { + Some(t) => match t.shape.clone() { + TokenShape::ShLitInt => { + let n_opt = v2_rt::parse_int(t.text.clone()); +match n_opt { + Some(n) => Rc::new(IntLitResult { + value: n.clone(), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + err: None, +}), + None => Rc::new(IntLitResult { + value: 0, + tokens: tokens.clone(), + err: Some(parse_error(v2_rt::concat(v2_rt::concat("internal: ShLitInt token text not parseable as int: '".to_string(), t.text.clone()), "'".to_string()), token_span(tok.clone()))), +}), +} +}, + _ => Rc::new(IntLitResult { + value: 0, + tokens: tokens.clone(), + err: Some(parse_error("expected integer literal".to_string(), token_span(tok.clone()))), +}), +}, + None => Rc::new(IntLitResult { + value: 0, + tokens: tokens.clone(), + err: Some(parse_error("expected integer literal".to_string(), make_span(0, 0))), +}), +} +} } pub fn is_ident_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShIdent => true, - _ => false, - } + TokenShape::ShIdent => true, + _ => false, +} } pub fn is_lit_str_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShLitStr => true, - _ => false, - } + TokenShape::ShLitStr => true, + _ => false, +} } pub fn is_lit_int_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShLitInt => true, - _ => false, - } + TokenShape::ShLitInt => true, + _ => false, +} } pub fn is_lit_float_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShLitFloat => true, - _ => false, - } + TokenShape::ShLitFloat => true, + _ => false, +} } pub fn is_str_begin_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShStrBegin => true, - _ => false, - } + TokenShape::ShStrBegin => true, + _ => false, +} } pub fn is_str_mid_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShStrMid => true, - _ => false, - } + TokenShape::ShStrMid => true, + _ => false, +} } pub fn is_str_end_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShStrEnd => true, - _ => false, - } + TokenShape::ShStrEnd => true, + _ => false, +} } pub fn is_unknown_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShUnknown => true, - _ => false, - } + TokenShape::ShUnknown => true, + _ => false, +} } pub fn is_newline_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShNewline => true, - _ => false, - } + TokenShape::ShNewline => true, + _ => false, +} } pub fn is_eof_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShEof => true, - _ => false, - } + TokenShape::ShEof => true, + _ => false, +} } pub fn is_keyword_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShKeyword => true, - _ => false, - } + TokenShape::ShKeyword => true, + _ => false, +} } pub fn is_lbrace_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShLBrace => true, - _ => false, - } + TokenShape::ShLBrace => true, + _ => false, +} } pub fn is_rbrace_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShRBrace => true, - _ => false, - } + TokenShape::ShRBrace => true, + _ => false, +} } pub fn is_lparen_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShLParen => true, - _ => false, - } + TokenShape::ShLParen => true, + _ => false, +} } pub fn is_rparen_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShRParen => true, - _ => false, - } + TokenShape::ShRParen => true, + _ => false, +} } pub fn is_lbracket_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShLBracket => true, - _ => false, - } + TokenShape::ShLBracket => true, + _ => false, +} } pub fn is_rbracket_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShRBracket => true, - _ => false, - } + TokenShape::ShRBracket => true, + _ => false, +} } pub fn is_lt_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShLt => true, - _ => false, - } + TokenShape::ShLt => true, + _ => false, +} } pub fn is_gt_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShGt => true, - _ => false, - } + TokenShape::ShGt => true, + _ => false, +} } pub fn is_le_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShLe => true, - _ => false, - } + TokenShape::ShLe => true, + _ => false, +} } pub fn is_ge_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShGe => true, - _ => false, - } + TokenShape::ShGe => true, + _ => false, +} } pub fn is_fat_arrow_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShFatArrow => true, - _ => false, - } + TokenShape::ShFatArrow => true, + _ => false, +} } pub fn is_arrow_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShArrow => true, - _ => false, - } + TokenShape::ShArrow => true, + _ => false, +} } pub fn is_colon_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShColon => true, - _ => false, - } + TokenShape::ShColon => true, + _ => false, +} } pub fn is_comma_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShComma => true, - _ => false, - } + TokenShape::ShComma => true, + _ => false, +} } pub fn is_dot_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShDot => true, - _ => false, - } + TokenShape::ShDot => true, + _ => false, +} } pub fn is_dot_dot_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShDotDot => true, - _ => false, - } + TokenShape::ShDotDot => true, + _ => false, +} } pub fn is_eq_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShEq => true, - _ => false, - } + TokenShape::ShEq => true, + _ => false, +} } pub fn is_eq_eq_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShEqEq => true, - _ => false, - } + TokenShape::ShEqEq => true, + _ => false, +} } pub fn is_ne_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShNe => true, - _ => false, - } + TokenShape::ShNe => true, + _ => false, +} } pub fn is_plus_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShPlus => true, - _ => false, - } + TokenShape::ShPlus => true, + _ => false, +} } pub fn is_minus_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShMinus => true, - _ => false, - } + TokenShape::ShMinus => true, + _ => false, +} } pub fn is_star_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShStar => true, - _ => false, - } + TokenShape::ShStar => true, + _ => false, +} } pub fn is_slash_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShSlash => true, - _ => false, - } + TokenShape::ShSlash => true, + _ => false, +} } pub fn is_percent_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShPercent => true, - _ => false, - } + TokenShape::ShPercent => true, + _ => false, +} } pub fn is_bang_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShBang => true, - _ => false, - } + TokenShape::ShBang => true, + _ => false, +} } pub fn is_and_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShAnd => true, - _ => false, - } + TokenShape::ShAnd => true, + _ => false, +} } pub fn is_or_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShOr => true, - _ => false, - } + TokenShape::ShOr => true, + _ => false, +} } pub fn is_question_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShQuestion => true, - _ => false, - } + TokenShape::ShQuestion => true, + _ => false, +} } pub fn is_null_coalesce_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShNullCoalesce => true, - _ => false, - } + TokenShape::ShNullCoalesce => true, + _ => false, +} } pub fn is_pipe_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShPipe => true, - _ => false, - } + TokenShape::ShPipe => true, + _ => false, +} } pub fn is_pipe_arrow_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShPipeArrow => true, - _ => false, - } + TokenShape::ShPipeArrow => true, + _ => false, +} } pub fn tok_is_keyword(tok: Option>, kw: String) -> bool { match tok { - Some(t) => (is_keyword_shape(t.shape.clone()) && (t.text.clone().as_str() == kw.as_str())), - None => false, - } + Some(t) => (is_keyword_shape(t.shape.clone()) && (t.text.clone().as_str() == kw.as_str())), + None => false, +} } pub fn tok_keyword_text(tok: Option>) -> String { match tok { - Some(t) => { - if is_keyword_shape(t.shape.clone()) { - t.text.clone() - } else { - "".to_string() - } - } - None => "".to_string(), - } + Some(t) => if is_keyword_shape(t.shape.clone()) { + t.text.clone() + } else { + "".to_string() + }, + None => "".to_string(), +} } pub fn tok_is_ident(tok: Option>) -> bool { match tok { - Some(t) => is_ident_shape(t.shape.clone()), - None => false, - } + Some(t) => is_ident_shape(t.shape.clone()), + None => false, +} } pub fn tok_is_ident_text(tok: Option>, text: String) -> bool { match tok { - Some(t) => (is_ident_shape(t.shape.clone()) && (t.text.clone().as_str() == text.as_str())), - None => false, - } + Some(t) => (is_ident_shape(t.shape.clone()) && (t.text.clone().as_str() == text.as_str())), + None => false, +} } -pub fn drop_leading_type_modifier( - tokens: &Rc>>, - modifier: String, -) -> Rc>> { +pub fn drop_leading_type_modifier(tokens: &Rc>>, modifier: String) -> Rc>> { if tok_is_ident_text(tokens.clone().first().cloned(), modifier) { - skip_newlines(Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - )) + skip_newlines(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>())) } else { tokens.clone() } @@ -1195,231 +1112,226 @@ pub fn type_body_tokens_after_modifiers(tokens: Rc>>) -> Rc>) -> bool { match tok { - Some(t) => is_newline_shape(t.shape.clone()), - None => false, - } + Some(t) => is_newline_shape(t.shape.clone()), + None => false, +} } pub fn tok_is_eof(tok: Option>) -> bool { match tok { - Some(t) => is_eof_shape(t.shape.clone()), - None => true, - } + Some(t) => is_eof_shape(t.shape.clone()), + None => true, +} } pub fn tok_is_lit_str(tok: Option>) -> bool { match tok { - Some(t) => is_lit_str_shape(t.shape.clone()), - None => false, - } + Some(t) => is_lit_str_shape(t.shape.clone()), + None => false, +} } pub fn tok_is_lbrace(tok: Option>) -> bool { match tok { - Some(t) => is_lbrace_shape(t.shape.clone()), - None => false, - } + Some(t) => is_lbrace_shape(t.shape.clone()), + None => false, +} } pub fn tok_is_rbrace(tok: Option>) -> bool { match tok { - Some(t) => is_rbrace_shape(t.shape.clone()), - None => false, - } + Some(t) => is_rbrace_shape(t.shape.clone()), + None => false, +} } pub fn tok_is_lparen(tok: Option>) -> bool { match tok { - Some(t) => is_lparen_shape(t.shape.clone()), - None => false, - } + Some(t) => is_lparen_shape(t.shape.clone()), + None => false, +} } pub fn tok_is_rparen(tok: Option>) -> bool { match tok { - Some(t) => is_rparen_shape(t.shape.clone()), - None => false, - } + Some(t) => is_rparen_shape(t.shape.clone()), + None => false, +} } pub fn tok_is_lbracket(tok: Option>) -> bool { match tok { - Some(t) => is_lbracket_shape(t.shape.clone()), - None => false, - } + Some(t) => is_lbracket_shape(t.shape.clone()), + None => false, +} } pub fn tok_is_rbracket(tok: Option>) -> bool { match tok { - Some(t) => is_rbracket_shape(t.shape.clone()), - None => false, - } + Some(t) => is_rbracket_shape(t.shape.clone()), + None => false, +} } pub fn tok_is_colon(tok: Option>) -> bool { match tok { - Some(t) => is_colon_shape(t.shape.clone()), - None => false, - } + Some(t) => is_colon_shape(t.shape.clone()), + None => false, +} } pub fn tok_is_comma(tok: Option>) -> bool { match tok { - Some(t) => is_comma_shape(t.shape.clone()), - None => false, - } + Some(t) => is_comma_shape(t.shape.clone()), + None => false, +} } pub fn tok_is_dot(tok: Option>) -> bool { match tok { - Some(t) => is_dot_shape(t.shape.clone()), - None => false, - } + Some(t) => is_dot_shape(t.shape.clone()), + None => false, +} } pub fn tok_is_dot_dot(tok: Option>) -> bool { match tok { - Some(t) => is_dot_dot_shape(t.shape.clone()), - None => false, - } + Some(t) => is_dot_dot_shape(t.shape.clone()), + None => false, +} } pub fn tok_is_eq(tok: Option>) -> bool { match tok { - Some(t) => is_eq_shape(t.shape.clone()), - None => false, - } + Some(t) => is_eq_shape(t.shape.clone()), + None => false, +} } pub fn tok_is_fat_arrow(tok: Option>) -> bool { match tok { - Some(t) => is_fat_arrow_shape(t.shape.clone()), - None => false, - } + Some(t) => is_fat_arrow_shape(t.shape.clone()), + None => false, +} } pub fn tok_is_arrow(tok: Option>) -> bool { match tok { - Some(t) => is_arrow_shape(t.shape.clone()), - None => false, - } + Some(t) => is_arrow_shape(t.shape.clone()), + None => false, +} } pub fn tok_is_lt(tok: Option>) -> bool { match tok { - Some(t) => is_lt_shape(t.shape.clone()), - None => false, - } + Some(t) => is_lt_shape(t.shape.clone()), + None => false, +} } pub fn tok_is_gt(tok: Option>) -> bool { match tok { - Some(t) => is_gt_shape(t.shape.clone()), - None => false, - } + Some(t) => is_gt_shape(t.shape.clone()), + None => false, +} } pub fn tok_is_pipe(tok: Option>) -> bool { match tok { - Some(t) => is_pipe_shape(t.shape.clone()), - None => false, - } + Some(t) => is_pipe_shape(t.shape.clone()), + None => false, +} } pub fn tok_is_pipe_arrow(tok: Option>) -> bool { match tok { - Some(t) => is_pipe_arrow_shape(t.shape.clone()), - None => false, - } + Some(t) => is_pipe_arrow_shape(t.shape.clone()), + None => false, +} } pub fn tok_is_question(tok: Option>) -> bool { match tok { - Some(t) => is_question_shape(t.shape.clone()), - None => false, - } + Some(t) => is_question_shape(t.shape.clone()), + None => false, +} } pub fn tok_span(tok: Option>) -> Rc { match tok { - Some(t) => t.span.clone(), - None => make_span(0, 0), - } + Some(t) => t.span.clone(), + None => make_span(0, 0), +} } pub fn tok_keyword_to_name(tok: Option>) -> Option { match tok { - Some(t) => { - if is_name_keyword(&t) { - Some(t.text.clone()) - } else { - None - } - } - None => None, - } + Some(t) => if is_name_keyword(&t) { + Some(t.text.clone()) + } else { + None + }, + None => None, +} } pub fn tok_is_keyword_name(tok: Option>) -> bool { match tok_keyword_to_name(tok) { - Some(_) => true, - None => false, - } + Some(_) => true, + None => false, +} } pub fn shape_display_name(shape: TokenShape) -> String { match shape { - TokenShape::ShKeyword => "keyword".to_string(), - TokenShape::ShLBrace => "LBrace".to_string(), - TokenShape::ShRBrace => "RBrace".to_string(), - TokenShape::ShLParen => "LParen".to_string(), - TokenShape::ShRParen => "RParen".to_string(), - TokenShape::ShLBracket => "LBracket".to_string(), - TokenShape::ShRBracket => "RBracket".to_string(), - TokenShape::ShLt => "Lt".to_string(), - TokenShape::ShGt => "Gt".to_string(), - TokenShape::ShLe => "Le".to_string(), - TokenShape::ShGe => "Ge".to_string(), - TokenShape::ShFatArrow => "FatArrow".to_string(), - TokenShape::ShArrow => "Arrow".to_string(), - TokenShape::ShColon => "Colon".to_string(), - TokenShape::ShComma => "Comma".to_string(), - TokenShape::ShDot => "Dot".to_string(), - TokenShape::ShDotDot => "DotDot".to_string(), - TokenShape::ShEq => "Eq".to_string(), - TokenShape::ShEqEq => "EqEq".to_string(), - TokenShape::ShNe => "Ne".to_string(), - TokenShape::ShPlus => "Plus".to_string(), - TokenShape::ShMinus => "Minus".to_string(), - TokenShape::ShStar => "Star".to_string(), - TokenShape::ShSlash => "Slash".to_string(), - TokenShape::ShPercent => "Percent".to_string(), - TokenShape::ShBang => "Bang".to_string(), - TokenShape::ShAnd => "And".to_string(), - TokenShape::ShOr => "Or".to_string(), - TokenShape::ShQuestion => "Question".to_string(), - TokenShape::ShNullCoalesce => "NullCoalesce".to_string(), - TokenShape::ShPipe => "Pipe".to_string(), - TokenShape::ShPipeArrow => "PipeArrow".to_string(), - TokenShape::ShLitStr => "LitStr".to_string(), - TokenShape::ShLitInt => "LitInt".to_string(), - TokenShape::ShLitFloat => "LitFloat".to_string(), - TokenShape::ShIdent => "Ident".to_string(), - TokenShape::ShStrBegin => "StrBegin".to_string(), - TokenShape::ShStrMid => "StrMid".to_string(), - TokenShape::ShStrEnd => "StrEnd".to_string(), - TokenShape::ShNewline => "Newline".to_string(), - TokenShape::ShEof => "Eof".to_string(), - TokenShape::ShUnknown => "Unknown".to_string(), - } + TokenShape::ShKeyword => "keyword".to_string(), + TokenShape::ShLBrace => "LBrace".to_string(), + TokenShape::ShRBrace => "RBrace".to_string(), + TokenShape::ShLParen => "LParen".to_string(), + TokenShape::ShRParen => "RParen".to_string(), + TokenShape::ShLBracket => "LBracket".to_string(), + TokenShape::ShRBracket => "RBracket".to_string(), + TokenShape::ShLt => "Lt".to_string(), + TokenShape::ShGt => "Gt".to_string(), + TokenShape::ShLe => "Le".to_string(), + TokenShape::ShGe => "Ge".to_string(), + TokenShape::ShFatArrow => "FatArrow".to_string(), + TokenShape::ShArrow => "Arrow".to_string(), + TokenShape::ShColon => "Colon".to_string(), + TokenShape::ShComma => "Comma".to_string(), + TokenShape::ShDot => "Dot".to_string(), + TokenShape::ShDotDot => "DotDot".to_string(), + TokenShape::ShEq => "Eq".to_string(), + TokenShape::ShEqEq => "EqEq".to_string(), + TokenShape::ShNe => "Ne".to_string(), + TokenShape::ShPlus => "Plus".to_string(), + TokenShape::ShMinus => "Minus".to_string(), + TokenShape::ShStar => "Star".to_string(), + TokenShape::ShSlash => "Slash".to_string(), + TokenShape::ShPercent => "Percent".to_string(), + TokenShape::ShBang => "Bang".to_string(), + TokenShape::ShAnd => "And".to_string(), + TokenShape::ShOr => "Or".to_string(), + TokenShape::ShQuestion => "Question".to_string(), + TokenShape::ShNullCoalesce => "NullCoalesce".to_string(), + TokenShape::ShPipe => "Pipe".to_string(), + TokenShape::ShPipeArrow => "PipeArrow".to_string(), + TokenShape::ShLitStr => "LitStr".to_string(), + TokenShape::ShLitInt => "LitInt".to_string(), + TokenShape::ShLitFloat => "LitFloat".to_string(), + TokenShape::ShIdent => "Ident".to_string(), + TokenShape::ShStrBegin => "StrBegin".to_string(), + TokenShape::ShStrMid => "StrMid".to_string(), + TokenShape::ShStrEnd => "StrEnd".to_string(), + TokenShape::ShNewline => "Newline".to_string(), + TokenShape::ShEof => "Eof".to_string(), + TokenShape::ShUnknown => "Unknown".to_string(), +} } pub fn token_display_name(token: &Rc) -> String { if is_keyword_shape(token.shape.clone()) { - v2_rt::concat( - "keyword '".to_string(), - v2_rt::concat(token.text.clone(), "'".to_string()), - ) + v2_rt::concat("keyword '".to_string(), v2_rt::concat(token.text.clone(), "'".to_string())) } else { shape_display_name(token.shape.clone()) } @@ -1427,213 +1339,170 @@ pub fn token_display_name(token: &Rc) -> String { pub fn expected_token_name(expected: Rc) -> String { match (*expected).clone() { - ExpectedToken::ExpectKeyword { text: kw, .. } => v2_rt::concat( - "keyword '".to_string(), - v2_rt::concat(kw.clone(), "'".to_string()), - ), - ExpectedToken::ExpectLBrace => "LBrace".to_string(), - ExpectedToken::ExpectRBrace => "RBrace".to_string(), - ExpectedToken::ExpectLParen => "LParen".to_string(), - ExpectedToken::ExpectRParen => "RParen".to_string(), - ExpectedToken::ExpectLBracket => "LBracket".to_string(), - ExpectedToken::ExpectRBracket => "RBracket".to_string(), - ExpectedToken::ExpectLt => "Lt".to_string(), - ExpectedToken::ExpectGt => "Gt".to_string(), - ExpectedToken::ExpectFatArrow => "FatArrow".to_string(), - ExpectedToken::ExpectArrow => "Arrow".to_string(), - ExpectedToken::ExpectColon => "Colon".to_string(), - ExpectedToken::ExpectComma => "Comma".to_string(), - ExpectedToken::ExpectDot => "Dot".to_string(), - ExpectedToken::ExpectEq => "Eq".to_string(), - ExpectedToken::ExpectQuestion => "Question".to_string(), - ExpectedToken::ExpectPipe => "Pipe".to_string(), - } + ExpectedToken::ExpectKeyword { text: kw, .. } => v2_rt::concat("keyword '".to_string(), v2_rt::concat(kw.clone(), "'".to_string())), + ExpectedToken::ExpectLBrace => "LBrace".to_string(), + ExpectedToken::ExpectRBrace => "RBrace".to_string(), + ExpectedToken::ExpectLParen => "LParen".to_string(), + ExpectedToken::ExpectRParen => "RParen".to_string(), + ExpectedToken::ExpectLBracket => "LBracket".to_string(), + ExpectedToken::ExpectRBracket => "RBracket".to_string(), + ExpectedToken::ExpectLt => "Lt".to_string(), + ExpectedToken::ExpectGt => "Gt".to_string(), + ExpectedToken::ExpectFatArrow => "FatArrow".to_string(), + ExpectedToken::ExpectArrow => "Arrow".to_string(), + ExpectedToken::ExpectColon => "Colon".to_string(), + ExpectedToken::ExpectComma => "Comma".to_string(), + ExpectedToken::ExpectDot => "Dot".to_string(), + ExpectedToken::ExpectEq => "Eq".to_string(), + ExpectedToken::ExpectQuestion => "Question".to_string(), + ExpectedToken::ExpectPipe => "Pipe".to_string(), +} } pub fn token_matches_expected(token: &Rc, expected: Rc) -> bool { match (*expected).clone() { - ExpectedToken::ExpectKeyword { text: kw, .. } => { - (is_keyword_shape(token.shape.clone()) - && (token.text.clone().as_str() == kw.clone().as_str())) - } - ExpectedToken::ExpectLBrace => is_lbrace_shape(token.shape.clone()), - ExpectedToken::ExpectRBrace => is_rbrace_shape(token.shape.clone()), - ExpectedToken::ExpectLParen => is_lparen_shape(token.shape.clone()), - ExpectedToken::ExpectRParen => is_rparen_shape(token.shape.clone()), - ExpectedToken::ExpectLBracket => is_lbracket_shape(token.shape.clone()), - ExpectedToken::ExpectRBracket => is_rbracket_shape(token.shape.clone()), - ExpectedToken::ExpectLt => is_lt_shape(token.shape.clone()), - ExpectedToken::ExpectGt => is_gt_shape(token.shape.clone()), - ExpectedToken::ExpectFatArrow => is_fat_arrow_shape(token.shape.clone()), - ExpectedToken::ExpectArrow => is_arrow_shape(token.shape.clone()), - ExpectedToken::ExpectColon => is_colon_shape(token.shape.clone()), - ExpectedToken::ExpectComma => is_comma_shape(token.shape.clone()), - ExpectedToken::ExpectDot => is_dot_shape(token.shape.clone()), - ExpectedToken::ExpectEq => is_eq_shape(token.shape.clone()), - ExpectedToken::ExpectQuestion => is_question_shape(token.shape.clone()), - ExpectedToken::ExpectPipe => is_pipe_shape(token.shape.clone()), - } + ExpectedToken::ExpectKeyword { text: kw, .. } => (is_keyword_shape(token.shape.clone()) && (token.text.clone().as_str() == kw.clone().as_str())), + ExpectedToken::ExpectLBrace => is_lbrace_shape(token.shape.clone()), + ExpectedToken::ExpectRBrace => is_rbrace_shape(token.shape.clone()), + ExpectedToken::ExpectLParen => is_lparen_shape(token.shape.clone()), + ExpectedToken::ExpectRParen => is_rparen_shape(token.shape.clone()), + ExpectedToken::ExpectLBracket => is_lbracket_shape(token.shape.clone()), + ExpectedToken::ExpectRBracket => is_rbracket_shape(token.shape.clone()), + ExpectedToken::ExpectLt => is_lt_shape(token.shape.clone()), + ExpectedToken::ExpectGt => is_gt_shape(token.shape.clone()), + ExpectedToken::ExpectFatArrow => is_fat_arrow_shape(token.shape.clone()), + ExpectedToken::ExpectArrow => is_arrow_shape(token.shape.clone()), + ExpectedToken::ExpectColon => is_colon_shape(token.shape.clone()), + ExpectedToken::ExpectComma => is_comma_shape(token.shape.clone()), + ExpectedToken::ExpectDot => is_dot_shape(token.shape.clone()), + ExpectedToken::ExpectEq => is_eq_shape(token.shape.clone()), + ExpectedToken::ExpectQuestion => is_question_shape(token.shape.clone()), + ExpectedToken::ExpectPipe => is_pipe_shape(token.shape.clone()), +} } pub fn expect(tokens: &Rc>>, expected: &Rc) -> Rc { { let tok = tokens.clone().first().cloned(); - let matches = match tok.clone() { - Some(t) => token_matches_expected(&t, expected.clone()), - None => false, - }; - if matches { +let matches = match tok.clone() { + Some(t) => token_matches_expected(&t, expected.clone()), + None => false, +}; +if matches { Rc::new(TokenResult { - token: tok.clone().unwrap(), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - err: None, - }) + token: tok.clone().unwrap(), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + err: None, +}) } else { { let found = match tok.clone() { - Some(t) => token_display_name(&t), - None => "EOF".to_string(), - }; - let wanted = expected_token_name(expected.clone()); - Rc::new(TokenResult { - token: Rc::new(Token { - text: "".to_string(), - span: make_span(0, 0), - shape: TokenShape::ShEof, - }), - tokens: tokens.clone(), - err: Some(parse_error( - format!("expected {}, found {}", wanted, found), - token_span(tok.clone()), - )), - }) - } + Some(t) => token_display_name(&t), + None => "EOF".to_string(), +}; +let wanted = expected_token_name(expected.clone()); +Rc::new(TokenResult { + token: Rc::new(Token { + text: "".to_string(), + span: make_span(0, 0), + shape: TokenShape::ShEof, +}), + tokens: tokens.clone(), + err: Some(parse_error(format!("expected {}, found {}", wanted, found), token_span(tok.clone()))), +}) +} } - } +} } pub fn expect_ident(tokens: &Rc>>) -> Rc { { let tok = tokens.clone().first().cloned(); - let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, - }; - match sh.clone() { - Some(TokenShape::ShIdent) => { - let n = tok.clone().unwrap().text.clone(); - let span = tok.clone().unwrap().span.clone(); - Rc::new(NameResult { - name: n, - span: span, - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - err: None, - }) - } - _ => { - let found = match sh.clone() { - Some(shape) => shape_display_name(shape.clone()), - None => "EOF".to_string(), - }; - Rc::new(NameResult { - name: "".to_string(), - span: token_span(tok.clone()), - tokens: tokens.clone(), - err: Some(parse_error( - v2_rt::concat("expected identifier, found ".to_string(), found), - token_span(tok.clone()), - )), - }) - } - } - } +let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, +}; +match sh.clone() { + Some(TokenShape::ShIdent) => { + let n = tok.clone().unwrap().text.clone(); +let span = tok.clone().unwrap().span.clone(); +Rc::new(NameResult { + name: n, + span: span, + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + err: None, +}) +}, + _ => { + let found = match sh.clone() { + Some(shape) => shape_display_name(shape.clone()), + None => "EOF".to_string(), +}; +Rc::new(NameResult { + name: "".to_string(), + span: token_span(tok.clone()), + tokens: tokens.clone(), + err: Some(parse_error(v2_rt::concat("expected identifier, found ".to_string(), found), token_span(tok.clone()))), +}) +}, +} +} } pub fn expect_name(tokens: &Rc>>) -> Rc { { let tok = tokens.clone().first().cloned(); - let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, - }; - match sh { - Some(TokenShape::ShIdent) => { - let n = tok.clone().unwrap().text.clone(); +let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, +}; +match sh { + Some(TokenShape::ShIdent) => { + let n = tok.clone().unwrap().text.clone(); +let span = tok.clone().unwrap().span.clone(); +Rc::new(NameResult { + name: n, + span: span, + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + err: None, +}) +}, + _ => { + let kw_name = tok_keyword_to_name(tok.clone()); +match kw_name { + Some(n) => { let span = tok.clone().unwrap().span.clone(); - Rc::new(NameResult { - name: n, - span: span, - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - err: None, - }) - } - _ => { - let kw_name = tok_keyword_to_name(tok.clone()); - match kw_name { - Some(n) => { - let span = tok.clone().unwrap().span.clone(); - Rc::new(NameResult { - name: n, - span: span, - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - err: None, - }) - } - None => { - let found = match tok.clone() { - Some(t) => token_display_name(&t), - None => "EOF".to_string(), - }; - Rc::new(NameResult { - name: "".to_string(), - span: token_span(tok.clone()), - tokens: tokens.clone(), - err: Some(parse_error( - v2_rt::concat("expected name, found ".to_string(), found), - token_span(tok.clone()), - )), - }) - } - } - } - } - } +Rc::new(NameResult { + name: n, + span: span, + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + err: None, +}) +}, + None => { + let found = match tok.clone() { + Some(t) => token_display_name(&t), + None => "EOF".to_string(), +}; +Rc::new(NameResult { + name: "".to_string(), + span: token_span(tok.clone()), + tokens: tokens.clone(), + err: Some(parse_error(v2_rt::concat("expected name, found ".to_string(), found), token_span(tok.clone()))), +}) +}, +} +}, +} +} } pub fn is_name_keyword(token: &Rc) -> bool { if is_keyword_shape(token.shape.clone()) { match v2_rt::lookup(&dag_non_name_keywords(), token.text.clone()) { - Some(_) => false, - None => true, - } + Some(_) => false, + None => true, +} } else { false } @@ -1642,153 +1511,109 @@ pub fn is_name_keyword(token: &Rc) -> bool { pub fn skip_newlines(mut tokens: Rc>>) -> Rc>> { loop { match tokens.clone().first().cloned() { - Some(t) => { - if is_newline_shape(t.shape.clone()) { - { - let __tco_0 = - Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); - tokens = __tco_0; - continue; - } - } else { - break tokens.clone(); - } - } - None => { - break tokens.clone(); - } - } - } + Some(t) => { if is_newline_shape(t.shape.clone()) { + { + let __tco_0 = Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); +tokens = __tco_0; +continue; +} +} else { + break tokens.clone(); +} }, + None => { break tokens.clone(); }, +} +} } pub fn is_continuation_shape(shape: &TokenShape) -> bool { - (((is_pipe_arrow_shape(shape.clone()) || is_dot_shape(shape.clone())) - || is_or_shape(shape.clone())) - || is_and_shape(shape.clone())) + (((is_pipe_arrow_shape(shape.clone()) || is_dot_shape(shape.clone())) || is_or_shape(shape.clone())) || is_and_shape(shape.clone())) } pub fn skip_continuation_newlines(tokens: &Rc>>) -> Rc>> { { let tok = tokens.clone().first().cloned(); - let is_continuation = if tok_is_newline(tok) { +let is_continuation = if tok_is_newline(tok) { { let after = skip_newlines(tokens.clone()); - match after.first().cloned() { - Some(next) => is_continuation_shape(&next.shape.clone()), - None => false, - } - } +match after.first().cloned() { + Some(next) => is_continuation_shape(&next.shape.clone()), + None => false, +} +} } else { false }; - if is_continuation { +if is_continuation { skip_newlines(tokens.clone()) } else { tokens.clone() } - } +} } pub fn eat(tokens: &Rc>>, expected: Rc) -> Rc { match tokens.clone().first().cloned() { - Some(t) => { - if token_matches_expected(&t, expected) { - Rc::new(EatResult::EatConsumed { - token: t.clone(), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - }) - } else { - Rc::new(EatResult::EatUnchanged { - tokens: tokens.clone(), - }) - } - } - None => Rc::new(EatResult::EatUnchanged { - tokens: tokens.clone(), - }), - } + Some(t) => if token_matches_expected(&t, expected) { + Rc::new(EatResult::EatConsumed { + token: t.clone(), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), +}) + } else { + Rc::new(EatResult::EatUnchanged { + tokens: tokens.clone(), +}) + }, + None => Rc::new(EatResult::EatUnchanged { + tokens: tokens.clone(), +}), +} } -pub fn parser_result_base_var( - expr: &Rc, - source_indices: Rc>>, -) -> Option { +pub fn parser_result_base_var(expr: &Rc, source_indices: Rc>>) -> Option { match (*expr.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => match expr.children.clone().first().cloned() { - Some(base) => match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => Some(expr_var_name_at(base.clone(), source_indices)), - _ => None, - }, - None => None, - }, - _ => None, - } + ExprData::ExprFieldAccess { .. } => match expr.children.clone().first().cloned() { + Some(base) => match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => Some(expr_var_name_at(base.clone(), source_indices)), + _ => None, +}, + None => None, +}, + _ => None, +} } -pub fn parser_helper_state_arg_expr( - call_node: Rc, - source_indices: Rc>>, -) -> Option> { - Rc::new( - call_node - .children - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - .fold(None, |acc: _, pair: (i64, Rc)| { - if (acc.clone() != None) { - acc.clone() - } else { - { - let idx = pair.0.clone(); - let arg_node = pair.1.clone(); - let matches_state = match arg_name_at(arg_node.clone(), source_indices.clone()) { - Some(name) => { - ((name.clone().as_str() == "state".to_string().as_str()) - || (name.clone().as_str() == "tokens".to_string().as_str())) - } - None => (idx.clone() == 0), - }; - if matches_state.clone() { - Some(arg_value(&arg_node)) - } else { - None - } +pub fn parser_helper_state_arg_expr(call_node: Rc, source_indices: Rc>>) -> Option> { + Rc::new(call_node.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(None, |acc: _, pair: (i64, Rc)| if (acc.clone() != None) { + acc.clone() + } else { + { + let idx = pair.0.clone(); +let arg_node = pair.1.clone(); +let matches_state = match arg_name_at(arg_node.clone(), source_indices.clone()) { + Some(name) => ((name.clone().as_str() == "state".to_string().as_str()) || (name.clone().as_str() == "tokens".to_string().as_str())), + None => (idx.clone() == 0), +}; +if matches_state.clone() { + Some(arg_value(&arg_node)) + } else { + None } - } +} }) } -pub fn parser_progress_flag_var( - expr: &Rc, - source_indices: &Rc>>, -) -> Option { +pub fn parser_progress_flag_var(expr: &Rc, source_indices: &Rc>>) -> Option { match (*expr.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let field = field_access_field_at(expr.clone(), source_indices.clone()); - if ((field.clone().as_str() == "consumed".to_string().as_str()) - || (field.clone().as_str() == "changed".to_string().as_str())) - { - parser_result_base_var(&expr, source_indices.clone()) - } else { - None - } + ExprData::ExprFieldAccess { .. } => { + let field = field_access_field_at(expr.clone(), source_indices.clone()); +if ((field.clone().as_str() == "consumed".to_string().as_str()) || (field.clone().as_str() == "changed".to_string().as_str())) { + parser_result_base_var(&expr, source_indices.clone()) + } else { + None } - _ => None, - } +}, + _ => None, +} } pub fn parser_helper_identity(callee: &String) -> Option { @@ -1807,83 +1632,69 @@ pub fn parser_helper_identity(callee: &String) -> Option { } } -pub fn parser_passthrough_state_expr( - expr: &Rc, - source_indices: &Rc>>, -) -> Option> { +pub fn parser_passthrough_state_expr(expr: &Rc, source_indices: &Rc>>) -> Option> { match (*expr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - match parser_helper_identity(&expr_call_func_at(expr.clone(), source_indices.clone())) { - Some(ParserHelperIdentity::ParserHelperSkipNewlines) => { - parser_helper_state_arg_expr(expr.clone(), source_indices.clone()) - } - Some(ParserHelperIdentity::ParserHelperSkipContinuationNewlines) => { - parser_helper_state_arg_expr(expr.clone(), source_indices.clone()) - } - Some(ParserHelperIdentity::ParserHelperWith) => { - match expr.children.clone().first().cloned() { - Some(base_arg) => Some(arg_value(&base_arg)), - None => None, - } - } - None => None, - } - } - _ => None, - } + ExprData::ExprCall { .. } => match parser_helper_identity(&expr_call_func_at(expr.clone(), source_indices.clone())) { + Some(ParserHelperIdentity::ParserHelperSkipNewlines) => parser_helper_state_arg_expr(expr.clone(), source_indices.clone()), + Some(ParserHelperIdentity::ParserHelperSkipContinuationNewlines) => parser_helper_state_arg_expr(expr.clone(), source_indices.clone()), + Some(ParserHelperIdentity::ParserHelperWith) => match expr.children.clone().first().cloned() { + Some(base_arg) => Some(arg_value(&base_arg)), + None => None, +}, + None => None, +}, + _ => None, +} } -pub fn parser_result_witness( - expr: &Rc, - source_indices: Rc>>, -) -> Rc { +pub fn parser_result_witness(expr: &Rc, source_indices: Rc>>) -> Rc { match (*expr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => match expr_call_func_at(expr.clone(), source_indices) { - ref __s if __s == "advance" => Rc::new(ParserResultWitness::ParserWitnessAdvance), - ref __s if __s == "expect" => Rc::new(ParserResultWitness::ParserWitnessExpect), - ref __s if __s == "eat" => Rc::new(ParserResultWitness::ParserWitnessEat), - callee => match parser_helper_identity(&callee) { - Some(helper) => Rc::new(ParserResultWitness::ParserWitnessCall { - callee: Rc::new(ParserCallIdentity::ParserCallHelper { - helper: helper.clone(), - }), - }), - None => Rc::new(ParserResultWitness::ParserWitnessCall { - callee: Rc::new(ParserCallIdentity::ParserCallFunction { - name: callee.clone(), - }), - }), - }, - }, - _ => Rc::new(ParserResultWitness::ParserWitnessOpaque), - } + ExprData::ExprCall { .. } => match expr_call_func_at(expr.clone(), source_indices) { + ref __s if __s == "advance" => Rc::new(ParserResultWitness::ParserWitnessAdvance), + ref __s if __s == "expect" => Rc::new(ParserResultWitness::ParserWitnessExpect), + ref __s if __s == "eat" => Rc::new(ParserResultWitness::ParserWitnessEat), + callee => match parser_helper_identity(&callee) { + Some(helper) => Rc::new(ParserResultWitness::ParserWitnessCall { + callee: Rc::new(ParserCallIdentity::ParserCallHelper { + helper: helper.clone(), +}), +}), + None => Rc::new(ParserResultWitness::ParserWitnessCall { + callee: Rc::new(ParserCallIdentity::ParserCallFunction { + name: callee.clone(), +}), +}), +}, +}, + _ => Rc::new(ParserResultWitness::ParserWitnessOpaque), +} } pub fn leaf_type_node(name: &String, span: &Rc) -> Rc { Rc::new(Node { - name: name.clone(), - span: span.clone(), - ident_span: if (name.clone().as_str() == "".to_string().as_str()) { - None - } else { - Some(span.clone()) - }, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) + name: name.clone(), + span: span.clone(), + ident_span: if (name.clone().as_str() == "".to_string().as_str()) { + None + } else { + Some(span.clone()) + }, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) } pub fn is_conj_with_children(n: &Rc) -> bool { @@ -1892,455 +1703,338 @@ pub fn is_conj_with_children(n: &Rc) -> bool { pub fn child_inferred_or_empty(ch: Rc) -> Rc { match ch.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => rt.clone(), - _ => error_type(), - } + Some(InferredNode::Resolved { node: rt, .. }) => rt.clone(), + _ => error_type(), +} } -pub fn node_inferred_to_outputs( - rt: &Rc, - source_indices: Rc>>, -) -> Rc>> { +pub fn node_inferred_to_outputs(rt: &Rc, source_indices: Rc>>) -> Rc>> { if is_conj_with_children(&rt) { { - let all_children_typed = { - let mut __all = true; - for ch in rt.children.clone().iter().cloned() { - if !(match ch.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { .. }) => true, - _ => false, - }) { - __all = false; - break; - } - } - __all - }; - if all_children_typed { - Rc::new({ - let mut __result = Vec::new(); - for ch in rt.children.clone().iter().cloned() { - __result.push(make_field_node( - &authored_name_at(source_indices.clone(), &ch), - child_inferred_or_empty(ch.clone()), - Cardinality::Required, - ch.body.clone(), - None, - ch.span.clone(), - node_name_span(&ch), - )); - } - __result - }) + let all_children_typed = { let mut __all = true; for ch in rt.children.clone().iter().cloned() { if !(match ch.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { .. }) => true, + _ => false, +}) { __all = false; break; } } __all }; +if all_children_typed { + Rc::new({ let mut __result = Vec::new(); for ch in rt.children.clone().iter().cloned() { __result.push(make_field_node(&authored_name_at(source_indices.clone(), &ch), child_inferred_or_empty(ch.clone()), Cardinality::Required, ch.body.clone(), None, ch.span.clone(), node_name_span(&ch))); } __result }) } else { Rc::new(vec![]) } - } +} } else { - Rc::new(vec![make_field_node( - &"value".to_string(), - rt.clone(), - Cardinality::Required, - None, - None, - rt.span.clone(), - no_span(), - )]) + Rc::new(vec![make_field_node(&"value".to_string(), rt.clone(), Cardinality::Required, None, None, rt.span.clone(), no_span())]) } } pub fn parse_dotted_ident(tokens: Rc>>) -> Rc { { let r = expect_name(&tokens); - if has_err(r.err.clone()) { - return r.clone(); +if has_err(r.err.clone()) { + return r.clone() } - parse_dotted_ident_rest(r.tokens.clone(), r.name.clone(), r.span.clone()) - } +parse_dotted_ident_rest(r.tokens.clone(), r.name.clone(), r.span.clone()) +} } -pub fn parse_dotted_ident_rest( - mut tokens: Rc>>, - mut acc: String, - mut span: Rc, -) -> Rc { +pub fn parse_dotted_ident_rest(mut tokens: Rc>>, mut acc: String, mut span: Rc) -> Rc { loop { match (*eat(&tokens, Rc::new(ExpectedToken::ExpectDot))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r = expect_name(&__ec); - if has_err(r.err.clone()) { - return r.clone(); - } - let extended = Rc::new(SourceSpan { - file: span.file.clone(), - start: span.start.clone(), - end: r.span.clone().end.clone(), - }); - { - let __tco_0 = r.tokens.clone(); - let __tco_1 = - v2_rt::concat(v2_rt::concat(acc, ".".to_string()), r.name.clone()); - let __tco_2 = extended; - tokens = __tco_0; - acc = __tco_1; - span = __tco_2; - continue; - } - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - break Rc::new(NameResult { - name: acc, - span: span.clone(), - tokens: __eu.clone(), - err: None, - }); - } - } - } + EatResult::EatConsumed { tokens: __ec, .. } => { let r = expect_name(&__ec); +if has_err(r.err.clone()) { + return r.clone() + } +let extended = Rc::new(SourceSpan { + file: span.file.clone(), + start: span.start.clone(), + end: r.span.clone().end.clone(), +}); +{ + let __tco_0 = r.tokens.clone(); +let __tco_1 = v2_rt::concat(v2_rt::concat(acc, ".".to_string()), r.name.clone()); +let __tco_2 = extended; +tokens = __tco_0; +acc = __tco_1; +span = __tco_2; +continue; +} }, + EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(NameResult { + name: acc, + span: span.clone(), + tokens: __eu.clone(), + err: None, +}); }, +} +} } -pub fn parse_with_table( - tokens: &Rc>>, - source_indices: Rc>>, - intern_table: Rc, -) -> Rc { +pub fn parse_with_table(tokens: &Rc>>, source_indices: Rc>>, intern_table: Rc) -> Rc { { let pre_interned = pre_intern_tokens(tokens.clone(), intern_table); - let ctx = Rc::new(ParseContext { - source_indices: source_indices, - intern_table: pre_interned, - }); - let r = parse_module(&tokens, &ctx); - if has_err(r.err.clone()) { +let ctx = Rc::new(ParseContext { + source_indices: source_indices, + intern_table: pre_interned, +}); +let r = parse_module(&tokens, &ctx); +if has_err(r.err.clone()) { Rc::new(ParseWithTableResult { - result: Rc::new(ParseResult { - module: None, - error: r.err.clone(), - }), - intern_table: r.ctx.clone().intern_table.clone(), - }) + result: Rc::new(ParseResult { + module: None, + error: r.err.clone(), +}), + intern_table: r.ctx.clone().intern_table.clone(), +}) } else { Rc::new(ParseWithTableResult { - result: Rc::new(ParseResult { - module: Some(r.module.clone()), - error: None, - }), - intern_table: r.ctx.clone().intern_table.clone(), - }) + result: Rc::new(ParseResult { + module: Some(r.module.clone()), + error: None, +}), + intern_table: r.ctx.clone().intern_table.clone(), +}) } - } +} } -pub fn parse( - tokens: Rc>>, - source_indices: Rc>>, -) -> Rc { - parse_with_table(&tokens, source_indices, empty_intern_table()) - .result - .clone() +pub fn parse(tokens: Rc>>, source_indices: Rc>>) -> Rc { + parse_with_table(&tokens, source_indices, empty_intern_table()).result.clone() } pub fn parse_module(tokens: &Rc>>, ctx: &Rc) -> Rc { { let tokens = skip_newlines(tokens.clone()); - let start_span = token_span(tokens.clone().first().cloned()); - let r = expect( - &tokens, - &Rc::new(ExpectedToken::ExpectKeyword { - text: "module".to_string(), - }), - ); - if has_err(r.err.clone()) { +let start_span = token_span(tokens.clone().first().cloned()); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { + text: "module".to_string(), +})); +if has_err(r.err.clone()) { return Rc::new(ModuleResult { - module: module_node( - &"".to_string(), - Rc::new(vec![]), - Rc::new(vec![]), - &start_span, - ), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let tokens = r.tokens.clone(); - let r = parse_dotted_ident(tokens.clone()); - if has_err(r.err.clone()) { + module: module_node(&"".to_string(), Rc::new(vec![]), Rc::new(vec![]), &start_span), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let tokens = r.tokens.clone(); +let r = parse_dotted_ident(tokens.clone()); +if has_err(r.err.clone()) { return Rc::new(ModuleResult { - module: module_node( - &"".to_string(), - Rc::new(vec![]), - Rc::new(vec![]), - &start_span, - ), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let mod_name = r.name.clone(); - let mod_name_span = r.span.clone(); - let tokens = skip_newlines(r.tokens.clone()); - let r = parse_imports(tokens.clone(), ctx.clone()); - if has_err(r.err.clone()) { + module: module_node(&"".to_string(), Rc::new(vec![]), Rc::new(vec![]), &start_span), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let mod_name = r.name.clone(); +let mod_name_span = r.span.clone(); +let tokens = skip_newlines(r.tokens.clone()); +let r = parse_imports(tokens.clone(), ctx.clone()); +if has_err(r.err.clone()) { return Rc::new(ModuleResult { - module: module_node( - &"".to_string(), - Rc::new(vec![]), - Rc::new(vec![]), - &start_span, - ), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let imports = r.imports.clone(); - let tokens = r.tokens.clone(); - let ctx = r.ctx.clone(); - let r = parse_items(tokens.clone(), ctx.clone()); - if has_err(r.err.clone()) { + module: module_node(&"".to_string(), Rc::new(vec![]), Rc::new(vec![]), &start_span), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let imports = r.imports.clone(); +let tokens = r.tokens.clone(); +let ctx = r.ctx.clone(); +let r = parse_items(tokens.clone(), ctx.clone()); +if has_err(r.err.clone()) { return Rc::new(ModuleResult { - module: module_node( - &"".to_string(), - Rc::new(vec![]), - Rc::new(vec![]), - &start_span, - ), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let items = r.items.clone(); - let tokens = r.tokens.clone(); - let ctx = r.ctx.clone(); - let mod_ir = intern(&ctx.intern_table.clone(), &mod_name); - let ctx = Rc::new(ParseContext { - intern_table: mod_ir.table.clone(), - ..(*ctx.clone()).clone() - }); - let base_mod = Rc::new(Node { - name: mod_name.clone(), - span: start_span.clone(), - ident_span: Some(mod_name_span), - children: items, - connective: Connective::NoConnective, - params: imports, - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let r#mod = Rc::new(Node { - ident: Some(mod_ir.id.clone()), - ..(*base_mod).clone() - }); - Rc::new(ModuleResult { - module: r#mod, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } + module: module_node(&"".to_string(), Rc::new(vec![]), Rc::new(vec![]), &start_span), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let items = r.items.clone(); +let tokens = r.tokens.clone(); +let ctx = r.ctx.clone(); +let mod_ir = intern(&ctx.intern_table.clone(), &mod_name); +let ctx = Rc::new(ParseContext { intern_table: mod_ir.table.clone(), ..(*ctx.clone()).clone() }); +let base_mod = Rc::new(Node { + name: mod_name.clone(), + span: start_span.clone(), + ident_span: Some(mod_name_span), + children: items, + connective: Connective::NoConnective, + params: imports, + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let r#mod = Rc::new(Node { ident: Some(mod_ir.id.clone()), ..(*base_mod).clone() }); +Rc::new(ModuleResult { + module: r#mod, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) +} } pub fn parse_imports(tokens: Rc>>, ctx: Rc) -> Rc { parse_imports_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_imports_acc( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_imports_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - if tok_is_keyword(tokens.clone().first().cloned(), "import".to_string()) { +if tok_is_keyword(tokens.clone().first().cloned(), "import".to_string()) { let r = parse_import(&tokens, &ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ImportsResult { - imports: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + imports: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - { +{ let __tco_0 = r.tokens.clone(); - let __tco_1 = r.ctx.clone(); - let __tco_2 = v2_rt::rc_list_push(acc, r.import.clone()); - tokens = __tco_0; - ctx = __tco_1; - acc = __tco_2; - continue; - } - } else { +let __tco_1 = r.ctx.clone(); +let __tco_2 = v2_rt::rc_list_push(acc, r.import.clone()); +tokens = __tco_0; +ctx = __tco_1; +acc = __tco_2; +continue; +} +} else { break Rc::new(ImportsResult { - imports: acc, - tokens: tokens.clone(), - ctx: ctx, - err: None, - }); - } - } + imports: acc, + tokens: tokens.clone(), + ctx: ctx, + err: None, +}); +} +} } pub fn parse_items(tokens: Rc>>, ctx: Rc) -> Rc { parse_items_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_items_acc( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_items_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - if tok_is_eof(tokens.clone().first().cloned()) { +if tok_is_eof(tokens.clone().first().cloned()) { break Rc::new(ItemsResult { - items: acc.clone(), - tokens: tokens.clone(), - ctx: ctx, - err: None, - }); - } else { + items: acc.clone(), + tokens: tokens.clone(), + ctx: ctx, + err: None, +}); +} else { let r = parse_item(&tokens, ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ItemsResult { - items: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + items: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - { +{ let __tco_0 = r.tokens.clone(); - let __tco_1 = r.ctx.clone(); - let __tco_2 = v2_rt::rc_list_push(acc, r.item.clone()); - tokens = __tco_0; - ctx = __tco_1; - acc = __tco_2; - continue; - } - } - } +let __tco_1 = r.ctx.clone(); +let __tco_2 = v2_rt::rc_list_push(acc, r.item.clone()); +tokens = __tco_0; +ctx = __tco_1; +acc = __tco_2; +continue; +} +} +} } pub fn parse_import(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); - let err_import = import_node( - "".to_string(), - false, - Rc::new(vec![]), - &start_span, - start_span.clone(), - ); - let r = expect( - &tokens, - &Rc::new(ExpectedToken::ExpectKeyword { - text: "import".to_string(), - }), - ); - if has_err(r.err.clone()) { +let err_import = import_node("".to_string(), false, Rc::new(vec![]), &start_span, start_span.clone()); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { + text: "import".to_string(), +})); +if has_err(r.err.clone()) { return Rc::new(ImportResult { - import: err_import.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let tokens = r.tokens.clone(); - let r = parse_dotted_ident(tokens.clone()); - if has_err(r.err.clone()) { - return Rc::new(ImportResult { - import: err_import.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let mod_path = r.name.clone(); - let mod_path_span = r.span.clone(); - let tokens = r.tokens.clone(); - match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLBrace))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r = parse_import_names(__ec.clone(), ctx.clone()); - if has_err(r.err.clone()) { - return Rc::new(ImportResult { - import: err_import.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let names = r.names.clone(); - let tokens = r.tokens.clone(); - let ctx = r.ctx.clone(); - let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); - if has_err(r.err.clone()) { - return Rc::new(ImportResult { - import: err_import.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let tokens = skip_newlines(r.tokens.clone()); - let base_imp = - import_node(mod_path.clone(), false, names, &start_span, mod_path_span); - let imp_ir = intern(&ctx.intern_table.clone(), &mod_path); - let ctx = Rc::new(ParseContext { - intern_table: imp_ir.table.clone(), - ..(*ctx.clone()).clone() - }); - let imp = Rc::new(Node { - ident: Some(imp_ir.id.clone()), - ..(*base_imp).clone() - }); - Rc::new(ImportResult { - import: imp, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - let tokens = skip_newlines(tokens.clone()); - let base_imp = import_node( - mod_path.clone(), - true, - Rc::new(vec![]), - &start_span, - mod_path_span, - ); - let imp_ir = intern(&ctx.intern_table.clone(), &mod_path); - let ctx = Rc::new(ParseContext { - intern_table: imp_ir.table.clone(), - ..(*ctx.clone()).clone() - }); - let imp = Rc::new(Node { - ident: Some(imp_ir.id.clone()), - ..(*base_imp).clone() - }); - Rc::new(ImportResult { - import: imp, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } + import: err_import.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - } +let tokens = r.tokens.clone(); +let r = parse_dotted_ident(tokens.clone()); +if has_err(r.err.clone()) { + return Rc::new(ImportResult { + import: err_import.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let mod_path = r.name.clone(); +let mod_path_span = r.span.clone(); +let tokens = r.tokens.clone(); +match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLBrace))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let r = parse_import_names(__ec.clone(), ctx.clone()); +if has_err(r.err.clone()) { + return Rc::new(ImportResult { + import: err_import.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let names = r.names.clone(); +let tokens = r.tokens.clone(); +let ctx = r.ctx.clone(); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r.err.clone()) { + return Rc::new(ImportResult { + import: err_import.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let tokens = skip_newlines(r.tokens.clone()); +let base_imp = import_node(mod_path.clone(), false, names, &start_span, mod_path_span); +let imp_ir = intern(&ctx.intern_table.clone(), &mod_path); +let ctx = Rc::new(ParseContext { intern_table: imp_ir.table.clone(), ..(*ctx.clone()).clone() }); +let imp = Rc::new(Node { ident: Some(imp_ir.id.clone()), ..(*base_imp).clone() }); +Rc::new(ImportResult { + import: imp, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) +}, + EatResult::EatUnchanged { tokens: __eu, .. } => { + let tokens = skip_newlines(tokens.clone()); +let base_imp = import_node(mod_path.clone(), true, Rc::new(vec![]), &start_span, mod_path_span); +let imp_ir = intern(&ctx.intern_table.clone(), &mod_path); +let ctx = Rc::new(ParseContext { intern_table: imp_ir.table.clone(), ..(*ctx.clone()).clone() }); +let imp = Rc::new(Node { ident: Some(imp_ir.id.clone()), ..(*base_imp).clone() }); +Rc::new(ImportResult { + import: imp, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) +}, +} +} } pub fn parse_import_names(tokens: Rc>>, ctx: Rc) -> Rc { @@ -2351,72 +2045,60 @@ pub fn parsed_name_leaf(name: String, span: Rc) -> Rc { leaf_node_with_span(&name, &span) } -pub fn parse_import_names_acc( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_import_names_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - if tok_is_rbrace(tokens.clone().first().cloned()) { +if tok_is_rbrace(tokens.clone().first().cloned()) { break Rc::new(NamesResult { - names: acc, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } else { + names: acc, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); +} else { let r = parse_dotted_ident(tokens.clone()); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(NamesResult { - names: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let name_node = parsed_name_leaf(r.name.clone(), r.span.clone()); - tokens = skip_newlines(r.tokens.clone()); - let e = eat(&tokens, Rc::new(ExpectedToken::ExpectComma)); - tokens = skip_newlines(match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => tokens.clone(), - }); - { + names: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let name_node = parsed_name_leaf(r.name.clone(), r.span.clone()); +tokens = skip_newlines(r.tokens.clone()); +let e = eat(&tokens, Rc::new(ExpectedToken::ExpectComma)); +tokens = skip_newlines(match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => tokens.clone(), +}); +{ let __tco_0 = v2_rt::rc_list_push(acc, name_node); - acc = __tco_0; - continue; - } - } - } +acc = __tco_0; +continue; +} +} +} } pub fn find_item_form(forms: Rc>>, keyword: String) -> Option> { { - let matches = Rc::new({ - let mut __result = Vec::new(); - for f in forms.iter().cloned() { - if (f.keyword.clone().as_str() == keyword.clone().as_str()) { - __result.push(f); - } - } - __result - }); - match (matches.clone().len() as i64) { - 0 => None, - _ => Some(matches.clone().first().cloned().clone().unwrap()), - } - } + let matches = Rc::new({ let mut __result = Vec::new(); for f in forms.iter().cloned() { if (f.keyword.clone().as_str() == keyword.clone().as_str()) { __result.push(f); } } __result }); +match (matches.clone().len() as i64) { + 0 => None, + _ => Some(matches.clone().first().cloned().clone().unwrap()), +} +} } pub fn parse_item(tokens: &Rc>>, ctx: Rc) -> Rc { { let tokens = skip_newlines(tokens.clone()); - let tok = tokens.clone().first().cloned(); - let kw = tok_keyword_text(tok.clone()); - let span = token_span(tok.clone()); - let form = find_item_form(dag_syntax_spec().item_forms.clone(), kw); - match form { +let tok = tokens.clone().first().cloned(); +let kw = tok_keyword_text(tok.clone()); +let span = token_span(tok.clone()); +let form = find_item_form(dag_syntax_spec().item_forms.clone(), kw); +match form { Some(f) => parse_item_by_form(&tokens, &ctx, &f), None => Rc::new(ItemResult { item: Rc::new(Node { @@ -2444,1127 +2126,947 @@ pub fn parse_item(tokens: &Rc>>, ctx: Rc) -> Rc>>, - ctx: &Rc, - form: &Rc, -) -> Rc { +pub fn parse_item_prefix(tokens: &Rc>>, ctx: &Rc, form: &Rc) -> Rc { { let r = expect_ident(&tokens); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ItemPrefixResult { - name: "".to_string(), - name_span: r.span.clone(), - type_params: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - uses: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let name = r.name.clone(); - let name_span = r.span.clone(); - let tokens = r.tokens.clone(); - let tp_result = if form.has_type_params.clone() { + name: "".to_string(), + name_span: r.span.clone(), + type_params: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + uses: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let name = r.name.clone(); +let name_span = r.span.clone(); +let tokens = r.tokens.clone(); +let tp_result = if form.has_type_params.clone() { parse_optional_type_params(&tokens, ctx.clone()) } else { Rc::new(TypeParamsResult { - params: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), - }) + params: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), +}) }; - let tokens = tp_result.tokens.clone(); - let ctx = tp_result.ctx.clone(); - let params_result = if form.has_params.clone() { +let tokens = tp_result.tokens.clone(); +let ctx = tp_result.ctx.clone(); +let params_result = if form.has_params.clone() { parse_params(&tokens, &ctx) } else { Rc::new(ParamsResult { - params: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) + params: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) }; - if has_err(params_result.err.clone()) { +if has_err(params_result.err.clone()) { return Rc::new(ItemPrefixResult { - name: name.clone(), - name_span: name_span.clone(), - type_params: tp_result.params.clone(), - params: Rc::new(vec![]), - inferred: None, - uses: Rc::new(vec![]), - tokens: params_result.tokens.clone(), - ctx: params_result.ctx.clone(), - err: params_result.err.clone(), - }); - } - let tokens = params_result.tokens.clone(); - let ctx = params_result.ctx.clone(); - let ret_result = if form.has_return_type.clone() { + name: name.clone(), + name_span: name_span.clone(), + type_params: tp_result.params.clone(), + params: Rc::new(vec![]), + inferred: None, + uses: Rc::new(vec![]), + tokens: params_result.tokens.clone(), + ctx: params_result.ctx.clone(), + err: params_result.err.clone(), +}) + } +let tokens = params_result.tokens.clone(); +let ctx = params_result.ctx.clone(); +let ret_result = if form.has_return_type.clone() { parse_optional_inferred(&tokens, ctx.clone()) } else { Rc::new(OptRetResult { - inferred: None, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) + inferred: None, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) }; - if has_err(ret_result.err.clone()) { +if has_err(ret_result.err.clone()) { return Rc::new(ItemPrefixResult { - name: name.clone(), - name_span: name_span.clone(), - type_params: tp_result.params.clone(), - params: params_result.params.clone(), - inferred: None, - uses: Rc::new(vec![]), - tokens: ret_result.tokens.clone(), - ctx: ret_result.ctx.clone(), - err: ret_result.err.clone(), - }); - } - let tokens = ret_result.tokens.clone(); - let ctx = ret_result.ctx.clone(); - let missing_required_ret = (form.return_required.clone() - && match ret_result.inferred.clone() { - Some(_) => false, - None => true, - }); - if missing_required_ret { + name: name.clone(), + name_span: name_span.clone(), + type_params: tp_result.params.clone(), + params: params_result.params.clone(), + inferred: None, + uses: Rc::new(vec![]), + tokens: ret_result.tokens.clone(), + ctx: ret_result.ctx.clone(), + err: ret_result.err.clone(), +}) + } +let tokens = ret_result.tokens.clone(); +let ctx = ret_result.ctx.clone(); +let missing_required_ret = (form.return_required.clone() && match ret_result.inferred.clone() { + Some(_) => false, + None => true, +}); +if missing_required_ret { return Rc::new(ItemPrefixResult { - name: name.clone(), - name_span: name_span.clone(), - type_params: tp_result.params.clone(), - params: params_result.params.clone(), - inferred: None, - uses: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error( - v2_rt::concat( - "expected return type annotation (-> Type) for '".to_string(), - v2_rt::concat( - form.keyword.clone(), - v2_rt::concat(" ".to_string(), name.clone()), - ), - ), - token_span(tokens.clone().first().cloned()), - )), - }); - } - let uses_result = if form.has_uses.clone() { + name: name.clone(), + name_span: name_span.clone(), + type_params: tp_result.params.clone(), + params: params_result.params.clone(), + inferred: None, + uses: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error(v2_rt::concat("expected return type annotation (-> Type) for '".to_string(), v2_rt::concat(form.keyword.clone(), v2_rt::concat(" ".to_string(), name.clone()))), token_span(tokens.clone().first().cloned()))), +}) + } +let uses_result = if form.has_uses.clone() { parse_uses_clause(&skip_newlines(tokens.clone()), ctx.clone()) } else { Rc::new(UsesResult { - uses: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) + uses: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) }; - if has_err(uses_result.err.clone()) { +if has_err(uses_result.err.clone()) { return Rc::new(ItemPrefixResult { - name: name.clone(), - name_span: name_span.clone(), - type_params: tp_result.params.clone(), - params: params_result.params.clone(), - inferred: ret_result.inferred.clone(), - uses: Rc::new(vec![]), - tokens: uses_result.tokens.clone(), - ctx: uses_result.ctx.clone(), - err: uses_result.err.clone(), - }); - } - Rc::new(ItemPrefixResult { - name: name.clone(), - name_span: name_span.clone(), - type_params: tp_result.params.clone(), - params: params_result.params.clone(), - inferred: ret_result.inferred.clone(), - uses: uses_result.uses.clone(), - tokens: uses_result.tokens.clone(), - ctx: uses_result.ctx.clone(), - err: None, - }) - } -} - -pub fn parse_item_by_form( - tokens: &Rc>>, - ctx: &Rc, - form: &Rc, -) -> Rc { + name: name.clone(), + name_span: name_span.clone(), + type_params: tp_result.params.clone(), + params: params_result.params.clone(), + inferred: ret_result.inferred.clone(), + uses: Rc::new(vec![]), + tokens: uses_result.tokens.clone(), + ctx: uses_result.ctx.clone(), + err: uses_result.err.clone(), +}) + } +Rc::new(ItemPrefixResult { + name: name.clone(), + name_span: name_span.clone(), + type_params: tp_result.params.clone(), + params: params_result.params.clone(), + inferred: ret_result.inferred.clone(), + uses: uses_result.uses.clone(), + tokens: uses_result.tokens.clone(), + ctx: uses_result.ctx.clone(), + err: None, +}) +} +} + +pub fn parse_item_by_form(tokens: &Rc>>, ctx: &Rc, form: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); - let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let r = expect( - &tokens, - &Rc::new(ExpectedToken::ExpectKeyword { - text: form.keyword.clone(), - }), - ); - if has_err(r.err.clone()) { +let dummy = Rc::new(Node { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { + text: form.keyword.clone(), +})); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let tokens = r.tokens.clone(); - match form.body_kind.clone() { - BodyKind::TypeBody => { - let prefix = parse_item_prefix(&tokens, &ctx, &form); - if has_err(prefix.err.clone()) { - return Rc::new(ItemResult { - item: dummy.clone(), - tokens: prefix.tokens.clone(), - ctx: prefix.ctx.clone(), - err: prefix.err.clone(), - }); - } - parse_type_body_from_prefix(&prefix, &start_span) - } - BodyKind::ExprBody => { - let prefix = parse_item_prefix(&tokens, &ctx, &form); - if has_err(prefix.err.clone()) { - return Rc::new(ItemResult { - item: dummy.clone(), - tokens: prefix.tokens.clone(), - ctx: prefix.ctx.clone(), - err: prefix.err.clone(), - }); - } - parse_fn_body_from_prefix(&prefix, &start_span) - } - BodyKind::BlockBody => { - let prefix = parse_item_prefix(&tokens, &ctx, &form); - if has_err(prefix.err.clone()) { - return Rc::new(ItemResult { - item: dummy.clone(), - tokens: prefix.tokens.clone(), - ctx: prefix.ctx.clone(), - err: prefix.err.clone(), - }); - } - parse_block_body_from_prefix(&prefix, &start_span) - } - BodyKind::ServiceBody => parse_service_after_kw(&tokens, &ctx, &start_span), - BodyKind::ResourceBody => parse_resource_after_kw(tokens.clone(), &ctx, &start_span), - BodyKind::ValueBody => parse_data_after_kw(tokens.clone(), &ctx, &start_span), - BodyKind::NoBody => { - let prefix = parse_item_prefix(&tokens, &ctx, &form); - if has_err(prefix.err.clone()) { - return Rc::new(ItemResult { - item: dummy.clone(), - tokens: prefix.tokens.clone(), - ctx: prefix.ctx.clone(), - err: prefix.err.clone(), - }); - } - parse_no_body_from_prefix(&prefix, start_span.clone()) - } - } - } -} - -pub fn field_to_child_node( - field: &Rc, - source_indices: &Rc>>, -) -> Rc { + item: dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let tokens = r.tokens.clone(); +match form.body_kind.clone() { + BodyKind::TypeBody => { + let prefix = parse_item_prefix(&tokens, &ctx, &form); +if has_err(prefix.err.clone()) { + return Rc::new(ItemResult { + item: dummy.clone(), + tokens: prefix.tokens.clone(), + ctx: prefix.ctx.clone(), + err: prefix.err.clone(), +}) + } +parse_type_body_from_prefix(&prefix, &start_span) +}, + BodyKind::ExprBody => { + let prefix = parse_item_prefix(&tokens, &ctx, &form); +if has_err(prefix.err.clone()) { + return Rc::new(ItemResult { + item: dummy.clone(), + tokens: prefix.tokens.clone(), + ctx: prefix.ctx.clone(), + err: prefix.err.clone(), +}) + } +parse_fn_body_from_prefix(&prefix, &start_span) +}, + BodyKind::BlockBody => { + let prefix = parse_item_prefix(&tokens, &ctx, &form); +if has_err(prefix.err.clone()) { + return Rc::new(ItemResult { + item: dummy.clone(), + tokens: prefix.tokens.clone(), + ctx: prefix.ctx.clone(), + err: prefix.err.clone(), +}) + } +parse_block_body_from_prefix(&prefix, &start_span) +}, + BodyKind::ServiceBody => parse_service_after_kw(&tokens, &ctx, &start_span), + BodyKind::ResourceBody => parse_resource_after_kw(tokens.clone(), &ctx, &start_span), + BodyKind::ValueBody => parse_data_after_kw(tokens.clone(), &ctx, &start_span), + BodyKind::NoBody => { + let prefix = parse_item_prefix(&tokens, &ctx, &form); +if has_err(prefix.err.clone()) { + return Rc::new(ItemResult { + item: dummy.clone(), + tokens: prefix.tokens.clone(), + ctx: prefix.ctx.clone(), + err: prefix.err.clone(), +}) + } +parse_no_body_from_prefix(&prefix, start_span.clone()) +}, +} +} +} + +pub fn field_to_child_node(field: &Rc, source_indices: &Rc>>) -> Rc { { let ret_type = field_node_type_expr(&field); - let props = match field_node_from_key(field.clone(), source_indices.clone()) { - Some(key) => Rc::new(vec![make_field_init_node( - &"from_key".to_string(), - make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { value: key.clone() }), - }), - Rc::new(vec![]), - None, - field.span.clone(), - ), - field.span.clone(), - no_span(), - )]), - None => Rc::new(vec![]), - }; - Rc::new(Node { - name: field_node_name_at(field.clone(), source_indices.clone()), - span: field.span.clone(), - ident_span: field.ident_span.clone(), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { node: ret_type })), - return_cardinality: field_node_cardinality(field.clone()), - uses: Rc::new(vec![]), - body: field_node_default_value(&field), - transport: None, - properties: props, - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) - } +let props = match field_node_from_key(field.clone(), source_indices.clone()) { + Some(key) => Rc::new(vec![make_field_init_node(&"from_key".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: key.clone(), +}), +}), Rc::new(vec![]), None, field.span.clone()), field.span.clone(), no_span())]), + None => Rc::new(vec![]), +}; +Rc::new(Node { + name: field_node_name_at(field.clone(), source_indices.clone()), + span: field.span.clone(), + ident_span: field.ident_span.clone(), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: ret_type, +})), + return_cardinality: field_node_cardinality(field.clone()), + uses: Rc::new(vec![]), + body: field_node_default_value(&field), + transport: None, + properties: props, + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) +} } -pub fn variant_to_child_node( - variant: &Rc, - source_indices: &Rc>>, -) -> Rc { +pub fn variant_to_child_node(variant: &Rc, source_indices: &Rc>>) -> Rc { { let fields = variant_node_fields(variant.clone()); - let children = Rc::new({ - let mut __result = Vec::new(); - for f in fields.clone().iter().cloned() { - __result.push(field_to_child_node(&f, &source_indices)); - } - __result - }); - Rc::new(Node { - name: variant_node_name_at(variant.clone(), source_indices.clone()), - span: variant.span.clone(), - ident_span: variant.ident_span.clone(), - children: children, - connective: if ((fields.clone().len() as i64) > 0) { - Connective::Conj - } else { - Connective::NoConnective - }, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) - } +let children = Rc::new({ let mut __result = Vec::new(); for f in fields.clone().iter().cloned() { __result.push(field_to_child_node(&f, &source_indices)); } __result }); +Rc::new(Node { + name: variant_node_name_at(variant.clone(), source_indices.clone()), + span: variant.span.clone(), + ident_span: variant.ident_span.clone(), + children: children, + connective: if ((fields.clone().len() as i64) > 0) { + Connective::Conj + } else { + Connective::NoConnective + }, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) +} } -pub fn outputs_to_inferred( - outputs: &Rc>>, - span: Rc, - source_indices: Rc>>, -) -> Option> { +pub fn outputs_to_inferred(outputs: &Rc>>, span: Rc, source_indices: Rc>>) -> Option> { if ((outputs.clone().len() as i64) > 0) { Some(Rc::new(InferredNode::Resolved { - node: Rc::new(Node { - name: "".to_string(), - span: span, - ident_span: None, - children: Rc::new({ - let mut __result = Vec::new(); - for f in outputs.clone().iter().cloned() { - __result.push(field_to_child_node(&f, &source_indices)); - } - __result - }), - connective: Connective::Conj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }), - })) + node: Rc::new(Node { + name: "".to_string(), + span: span, + ident_span: None, + children: Rc::new({ let mut __result = Vec::new(); for f in outputs.clone().iter().cloned() { __result.push(field_to_child_node(&f, &source_indices)); } __result }), + connective: Connective::Conj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}), +})) } else { None } } -pub fn make_operation_node( - name: String, - ident_span: Option>, - inputs: Rc>>, - outputs: Rc>>, - response_props: Rc>>, - mock_props: Rc>>, - exit_props: Rc>>, - modifier_props: Rc>>, - transport: Option>, - span: &Rc, - source_indices: &Rc>>, -) -> Rc { +pub fn make_operation_node(name: String, ident_span: Option>, inputs: Rc>>, outputs: Rc>>, response_props: Rc>>, mock_props: Rc>>, exit_props: Rc>>, modifier_props: Rc>>, transport: Option>, span: &Rc, source_indices: &Rc>>) -> Rc { { - let all_props = v2_rt::concat( - v2_rt::concat(v2_rt::concat(modifier_props, response_props), exit_props), - mock_props, - ); - Rc::new(Node { - name: name, - span: span.clone(), - ident_span: ident_span, - children: Rc::new(vec![]), - params: Rc::new({ - let mut __result = Vec::new(); - for f in inputs.iter().cloned() { - __result.push(make_param_node( - &field_node_name_at(f.clone(), source_indices.clone()), - field_node_type_expr(&f), - field_node_default_value(&f), - f.span.clone(), - node_name_span(&f), - )); - } - __result - }), - inferred: outputs_to_inferred(&outputs, span.clone(), source_indices.clone()), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: transport, - properties: all_props, - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) - } + let all_props = v2_rt::concat(v2_rt::concat(v2_rt::concat(modifier_props, response_props), exit_props), mock_props); +Rc::new(Node { + name: name, + span: span.clone(), + ident_span: ident_span, + children: Rc::new(vec![]), + params: Rc::new({ let mut __result = Vec::new(); for f in inputs.iter().cloned() { __result.push(make_param_node(&field_node_name_at(f.clone(), source_indices.clone()), field_node_type_expr(&f), field_node_default_value(&f), f.span.clone(), node_name_span(&f))); } __result }), + inferred: outputs_to_inferred(&outputs, span.clone(), source_indices.clone()), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: transport, + properties: all_props, + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) +} } -pub fn make_capability_node( - name: String, - ident_span: Option>, - inputs: Rc>>, - outputs: Rc>>, - span: &Rc, - source_indices: &Rc>>, -) -> Rc { +pub fn make_capability_node(name: String, ident_span: Option>, inputs: Rc>>, outputs: Rc>>, span: &Rc, source_indices: &Rc>>) -> Rc { Rc::new(Node { - name: name, - span: span.clone(), - ident_span: ident_span, - children: Rc::new(vec![]), - params: Rc::new({ - let mut __result = Vec::new(); - for f in inputs.iter().cloned() { - __result.push(make_param_node( - &field_node_name_at(f.clone(), source_indices.clone()), - field_node_type_expr(&f), - field_node_default_value(&f), - f.span.clone(), - node_name_span(&f), - )); - } - __result - }), - inferred: outputs_to_inferred(&outputs, span.clone(), source_indices.clone()), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) + name: name, + span: span.clone(), + ident_span: ident_span, + children: Rc::new(vec![]), + params: Rc::new({ let mut __result = Vec::new(); for f in inputs.iter().cloned() { __result.push(make_param_node(&field_node_name_at(f.clone(), source_indices.clone()), field_node_type_expr(&f), field_node_default_value(&f), f.span.clone(), node_name_span(&f))); } __result }), + inferred: outputs_to_inferred(&outputs, span.clone(), source_indices.clone()), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) } pub fn parse_type_def(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); - let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let r = expect( - &tokens, - &Rc::new(ExpectedToken::ExpectKeyword { - text: "type".to_string(), - }), - ); - if has_err(r.err.clone()) { +let dummy = Rc::new(Node { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { + text: "type".to_string(), +})); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); + item: dummy, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - parse_type_after_kw(&r.tokens.clone(), &ctx, &start_span) - } +parse_type_after_kw(&r.tokens.clone(), &ctx, &start_span) +} } -pub fn parse_type_after_kw( - tokens: &Rc>>, - ctx: &Rc, - start_span: &Rc, -) -> Rc { +pub fn parse_type_after_kw(tokens: &Rc>>, ctx: &Rc, start_span: &Rc) -> Rc { { let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let r = expect_ident(&tokens); - if has_err(r.err.clone()) { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let r = expect_ident(&tokens); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let name = r.name.clone(); - let name_span = r.span.clone(); - let tokens = r.tokens.clone(); - let type_params_result = parse_optional_type_params(&tokens, ctx.clone()); - let type_params = type_params_result.params.clone(); - let tokens = skip_newlines(type_params_result.tokens.clone()); - let ctx = type_params_result.ctx.clone(); - let tokens = type_body_tokens_after_modifiers(tokens.clone()); - match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLBrace))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r = parse_field_list(skip_newlines(__ec.clone()), ctx.clone()); - let named_dummy = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: type_params.clone(), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - if has_err(r.err.clone()) { - return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let tokens = skip_newlines(r.tokens.clone()); - let ctx = r.ctx.clone(); - let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); - if has_err(r2.err.clone()) { - return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); - } - let type_children = Rc::new({ - let mut __result = Vec::new(); - for f in r.fields.clone().iter().cloned() { - __result.push(field_to_child_node(&f, &ctx.source_indices.clone())); - } - __result - }); - let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: type_children, - connective: Connective::Conj, - params: type_params.clone(), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - Rc::new(ItemResult { - item: item, - tokens: skip_newlines(r2.tokens.clone()), - ctx: ctx.clone(), - err: None, - }) - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - match (*eat(&tokens, Rc::new(ExpectedToken::ExpectEq))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let tokens = skip_newlines(__ec.clone()); - parse_type_body_after_eq( - &tokens, - &ctx, - &name, - &name_span, - &start_span, - &type_params, - ) - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: type_params.clone(), - inferred: Some(Rc::new(InferredNode::Resolved { - node: leaf_type_node(&name, &name_span), - })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - Rc::new(ItemResult { - item: item, - tokens: __eu.clone(), - ctx: ctx.clone(), - err: None, - }) - } - } - } - } - } + item: dummy, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let name = r.name.clone(); +let name_span = r.span.clone(); +let tokens = r.tokens.clone(); +let type_params_result = parse_optional_type_params(&tokens, ctx.clone()); +let type_params = type_params_result.params.clone(); +let tokens = skip_newlines(type_params_result.tokens.clone()); +let ctx = type_params_result.ctx.clone(); +let tokens = type_body_tokens_after_modifiers(tokens.clone()); +match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLBrace))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let r = parse_field_list(skip_newlines(__ec.clone()), ctx.clone()); +let named_dummy = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: type_params.clone(), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +if has_err(r.err.clone()) { + return Rc::new(ItemResult { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let tokens = skip_newlines(r.tokens.clone()); +let ctx = r.ctx.clone(); +let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r2.err.clone()) { + return Rc::new(ItemResult { + item: named_dummy.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) + } +let type_children = Rc::new({ let mut __result = Vec::new(); for f in r.fields.clone().iter().cloned() { __result.push(field_to_child_node(&f, &ctx.source_indices.clone())); } __result }); +let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: type_children, + connective: Connective::Conj, + params: type_params.clone(), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +Rc::new(ItemResult { + item: item, + tokens: skip_newlines(r2.tokens.clone()), + ctx: ctx.clone(), + err: None, +}) +}, + EatResult::EatUnchanged { tokens: __eu, .. } => match (*eat(&tokens, Rc::new(ExpectedToken::ExpectEq))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let tokens = skip_newlines(__ec.clone()); +parse_type_body_after_eq(&tokens, &ctx, &name, &name_span, &start_span, &type_params) +}, + EatResult::EatUnchanged { tokens: __eu, .. } => { + let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: type_params.clone(), + inferred: Some(Rc::new(InferredNode::Resolved { + node: leaf_type_node(&name, &name_span), +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +Rc::new(ItemResult { + item: item, + tokens: __eu.clone(), + ctx: ctx.clone(), + err: None, +}) +}, +}, +} +} } -pub fn parse_type_body_from_prefix( - prefix: &Rc, - start_span: &Rc, -) -> Rc { +pub fn parse_type_body_from_prefix(prefix: &Rc, start_span: &Rc) -> Rc { { let name = prefix.name.clone(); - let name_span = prefix.name_span.clone(); - let type_params = prefix.type_params.clone(); - let ctx = prefix.ctx.clone(); - let named_dummy = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: type_params.clone(), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let tokens = type_body_tokens_after_modifiers(skip_newlines(prefix.tokens.clone())); - match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLBrace))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r = parse_field_list(skip_newlines(__ec.clone()), ctx.clone()); - if has_err(r.err.clone()) { - return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let tokens = skip_newlines(r.tokens.clone()); - let ctx = r.ctx.clone(); - let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); - if has_err(r2.err.clone()) { - return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); - } - let type_children = Rc::new({ - let mut __result = Vec::new(); - for f in r.fields.clone().iter().cloned() { - __result.push(field_to_child_node(&f, &ctx.source_indices.clone())); - } - __result - }); - let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: type_children, - connective: Connective::Conj, - params: type_params.clone(), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - Rc::new(ItemResult { - item: item, - tokens: skip_newlines(r2.tokens.clone()), - ctx: ctx.clone(), - err: None, - }) - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - match (*eat(&tokens, Rc::new(ExpectedToken::ExpectEq))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let tokens = skip_newlines(__ec.clone()); - parse_type_body_after_eq( - &tokens, - &ctx, - &name, - &name_span, - &start_span, - &type_params, - ) - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: type_params.clone(), - inferred: Some(Rc::new(InferredNode::Resolved { - node: leaf_type_node(&name, &name_span), - })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - Rc::new(ItemResult { - item: item, - tokens: __eu.clone(), - ctx: ctx.clone(), - err: None, - }) - } - } - } - } - } +let name_span = prefix.name_span.clone(); +let type_params = prefix.type_params.clone(); +let ctx = prefix.ctx.clone(); +let named_dummy = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: type_params.clone(), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let tokens = type_body_tokens_after_modifiers(skip_newlines(prefix.tokens.clone())); +match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLBrace))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let r = parse_field_list(skip_newlines(__ec.clone()), ctx.clone()); +if has_err(r.err.clone()) { + return Rc::new(ItemResult { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let tokens = skip_newlines(r.tokens.clone()); +let ctx = r.ctx.clone(); +let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r2.err.clone()) { + return Rc::new(ItemResult { + item: named_dummy.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) + } +let type_children = Rc::new({ let mut __result = Vec::new(); for f in r.fields.clone().iter().cloned() { __result.push(field_to_child_node(&f, &ctx.source_indices.clone())); } __result }); +let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: type_children, + connective: Connective::Conj, + params: type_params.clone(), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +Rc::new(ItemResult { + item: item, + tokens: skip_newlines(r2.tokens.clone()), + ctx: ctx.clone(), + err: None, +}) +}, + EatResult::EatUnchanged { tokens: __eu, .. } => match (*eat(&tokens, Rc::new(ExpectedToken::ExpectEq))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let tokens = skip_newlines(__ec.clone()); +parse_type_body_after_eq(&tokens, &ctx, &name, &name_span, &start_span, &type_params) +}, + EatResult::EatUnchanged { tokens: __eu, .. } => { + let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: type_params.clone(), + inferred: Some(Rc::new(InferredNode::Resolved { + node: leaf_type_node(&name, &name_span), +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +Rc::new(ItemResult { + item: item, + tokens: __eu.clone(), + ctx: ctx.clone(), + err: None, +}) +}, +}, +} +} } -pub fn parse_type_body_after_eq( - tokens: &Rc>>, - ctx: &Rc, - name: &String, - name_span: &Rc, - start_span: &Rc, - type_params: &Rc>>, -) -> Rc { +pub fn parse_type_body_after_eq(tokens: &Rc>>, ctx: &Rc, name: &String, name_span: &Rc, start_span: &Rc, type_params: &Rc>>) -> Rc { { let dummy = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: type_params.clone(), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - if tok_is_ident(tokens.clone().first().cloned()) { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: type_params.clone(), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +if tok_is_ident(tokens.clone().first().cloned()) { { let r = expect_ident(&tokens); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); + item: dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - let first_name = r.name.clone(); - let first_name_span = r.span.clone(); - let tokens = skip_newlines(r.tokens.clone()); - if (tok_is_lbrace(tokens.clone().first().cloned()) - || tok_is_pipe(tokens.clone().first().cloned())) - { +let first_name = r.name.clone(); +let first_name_span = r.span.clone(); +let tokens = skip_newlines(r.tokens.clone()); +if (tok_is_lbrace(tokens.clone().first().cloned()) || tok_is_pipe(tokens.clone().first().cloned())) { { - let r = parse_variant_fields( - &tokens, - ctx.clone(), - &first_name, - &first_name_span, - ); - if has_err(r.err.clone()) { + let r = parse_variant_fields(&tokens, ctx.clone(), &first_name, &first_name_span); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + item: dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - let first_variant = r.variant.clone(); - let rest = parse_more_variants_acc( - r.tokens.clone(), - r.ctx.clone(), - Rc::new(vec![first_variant]), - ); - if has_err(rest.err.clone()) { +let first_variant = r.variant.clone(); +let rest = parse_more_variants_acc(r.tokens.clone(), r.ctx.clone(), Rc::new(vec![first_variant])); +if has_err(rest.err.clone()) { return Rc::new(ItemResult { - item: dummy.clone(), - tokens: rest.tokens.clone(), - ctx: rest.ctx.clone(), - err: rest.err.clone(), - }); + item: dummy.clone(), + tokens: rest.tokens.clone(), + ctx: rest.ctx.clone(), + err: rest.err.clone(), +}) } - let variants = rest.variants.clone(); - let type_children = Rc::new({ - let mut __result = Vec::new(); - for v in variants.iter().cloned() { - __result - .push(variant_to_child_node(&v, &ctx.source_indices.clone())); - } - __result - }); - let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: type_children, - connective: Connective::Disj, - params: type_params.clone(), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - Rc::new(ItemResult { - item: item, - tokens: skip_newlines(rest.tokens.clone()), - ctx: rest.ctx.clone(), - err: None, - }) - } +let variants = rest.variants.clone(); +let type_children = Rc::new({ let mut __result = Vec::new(); for v in variants.iter().cloned() { __result.push(variant_to_child_node(&v, &ctx.source_indices.clone())); } __result }); +let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: type_children, + connective: Connective::Disj, + params: type_params.clone(), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +Rc::new(ItemResult { + item: item, + tokens: skip_newlines(rest.tokens.clone()), + ctx: rest.ctx.clone(), + err: None, +}) +} } else { { - let r = finish_type_expr_from_name( - &tokens, - ctx.clone(), - &first_name, - &first_name_span, - ); - if has_err(r.err.clone()) { + let r = finish_type_expr_from_name(&tokens, ctx.clone(), &first_name, &first_name_span); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + item: dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - let wr = try_where_clause( - &r.tokens.clone(), - r.ctx.clone(), - &r.type_expr.clone(), - &start_span, - ); - if has_err(wr.err.clone()) { +let wr = try_where_clause(&r.tokens.clone(), r.ctx.clone(), &r.type_expr.clone(), &start_span); +if has_err(wr.err.clone()) { return Rc::new(ItemResult { - item: dummy.clone(), - tokens: wr.tokens.clone(), - ctx: wr.ctx.clone(), - err: wr.err.clone(), - }); + item: dummy.clone(), + tokens: wr.tokens.clone(), + ctx: wr.ctx.clone(), + err: wr.err.clone(), +}) } - let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: type_params.clone(), - inferred: Some(Rc::new(InferredNode::Resolved { - node: wr.type_expr.clone(), - })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - Rc::new(ItemResult { - item: item, - tokens: skip_newlines(wr.tokens.clone()), - ctx: wr.ctx.clone(), - err: None, - }) - } +let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: type_params.clone(), + inferred: Some(Rc::new(InferredNode::Resolved { + node: wr.type_expr.clone(), +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +Rc::new(ItemResult { + item: item, + tokens: skip_newlines(wr.tokens.clone()), + ctx: wr.ctx.clone(), + err: None, +}) +} } - } +} } else { { let r = parse_type_expr(&tokens, &ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let wr = try_where_clause( - &r.tokens.clone(), - r.ctx.clone(), - &r.type_expr.clone(), - &start_span, - ); - if has_err(wr.err.clone()) { + item: dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let wr = try_where_clause(&r.tokens.clone(), r.ctx.clone(), &r.type_expr.clone(), &start_span); +if has_err(wr.err.clone()) { return Rc::new(ItemResult { - item: dummy.clone(), - tokens: wr.tokens.clone(), - ctx: wr.ctx.clone(), - err: wr.err.clone(), - }); - } - let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: type_params.clone(), - inferred: Some(Rc::new(InferredNode::Resolved { - node: wr.type_expr.clone(), - })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - Rc::new(ItemResult { - item: item, - tokens: skip_newlines(wr.tokens.clone()), - ctx: wr.ctx.clone(), - err: None, - }) - } + item: dummy.clone(), + tokens: wr.tokens.clone(), + ctx: wr.ctx.clone(), + err: wr.err.clone(), +}) + } +let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: type_params.clone(), + inferred: Some(Rc::new(InferredNode::Resolved { + node: wr.type_expr.clone(), +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +Rc::new(ItemResult { + item: item, + tokens: skip_newlines(wr.tokens.clone()), + ctx: wr.ctx.clone(), + err: None, +}) +} } - } +} } -pub fn try_where_clause( - tokens: &Rc>>, - ctx: Rc, - base_te: &Rc, - start_span: &Rc, -) -> Rc { +pub fn try_where_clause(tokens: &Rc>>, ctx: Rc, base_te: &Rc, start_span: &Rc) -> Rc { if tok_is_keyword(tokens.clone().first().cloned(), "where".to_string()) { match (*advance(&tokens)).clone() { - AdvanceResult::AdvanceOk { tokens: rest, .. } => { - let r = parse_predicates(rest.clone(), ctx); - if has_err(r.err.clone()) { - return Rc::new(TypeResult { - type_expr: base_te.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let predicate_node = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: r.predicates.clone(), - connective: Connective::Conj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let refined = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![base_te.clone()]), - connective: Connective::Conj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: Some(predicate_node), - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - Rc::new(TypeResult { - type_expr: refined, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } - AdvanceResult::AdvanceEof => Rc::new(TypeResult { - type_expr: base_te.clone(), - tokens: tokens.clone(), - ctx: ctx, - err: None, - }), - } + AdvanceResult::AdvanceOk { tokens: rest, .. } => { + let r = parse_predicates(rest.clone(), ctx); +if has_err(r.err.clone()) { + return Rc::new(TypeResult { + type_expr: base_te.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let predicate_node = Rc::new(Node { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: r.predicates.clone(), + connective: Connective::Conj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let refined = Rc::new(Node { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![base_te.clone()]), + connective: Connective::Conj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: Some(predicate_node), + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +Rc::new(TypeResult { + type_expr: refined, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +}, + AdvanceResult::AdvanceEof => Rc::new(TypeResult { + type_expr: base_te.clone(), + tokens: tokens.clone(), + ctx: ctx, + err: None, +}), +} } else { Rc::new(TypeResult { - type_expr: base_te.clone(), - tokens: tokens.clone(), - ctx: ctx, - err: None, - }) + type_expr: base_te.clone(), + tokens: tokens.clone(), + ctx: ctx, + err: None, +}) } } @@ -3572,1005 +3074,757 @@ pub fn parse_predicates(tokens: Rc>>, ctx: Rc) -> Rc parse_predicates_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_predicates_acc( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_predicates_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { let r = parse_single_predicate(&tokens, &ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(PredsResult { - predicates: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - acc = v2_rt::rc_list_push(acc.clone(), r.predicate.clone()); - match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let __tco_0 = skip_newlines(__ec.clone()); - let __tco_1 = r.ctx.clone(); - tokens = __tco_0; - ctx = __tco_1; - continue; - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - break Rc::new(PredsResult { - predicates: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }); - } - } - } -} - -pub fn parse_single_predicate( - tokens: &Rc>>, - ctx: &Rc, -) -> Rc { + predicates: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +acc = v2_rt::rc_list_push(acc.clone(), r.predicate.clone()); +match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { { + let __tco_0 = skip_newlines(__ec.clone()); +let __tco_1 = r.ctx.clone(); +tokens = __tco_0; +ctx = __tco_1; +continue; +} }, + EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(PredsResult { + predicates: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}); }, +} +} +} + +pub fn parse_single_predicate(tokens: &Rc>>, ctx: &Rc) -> Rc { { let zero_span = make_span(0, 0); - let dummy_pred = make_field_init_node( - &"".to_string(), - make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitBool { value: false }), - }), - Rc::new(vec![]), - None, - zero_span.clone(), - ), - zero_span.clone(), - zero_span.clone(), - ); - let r = expect_name(&tokens); - if has_err(r.err.clone()) { +let dummy_pred = make_field_init_node(&"".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitBool { + value: false, +}), +}), Rc::new(vec![]), None, zero_span.clone()), zero_span.clone(), zero_span.clone()); +let r = expect_name(&tokens); +if has_err(r.err.clone()) { return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let pred_name = r.name.clone(); - let tokens = r.tokens.clone(); - match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLParen))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let tokens = __ec.clone(); - match pred_name.clone().as_str() { - "pattern" => { - let r2 = parse_string_literal_value(&tokens); - if has_err(r2.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); - if has_err(r3.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: r3.err.clone(), - }); - } - Rc::new(PredResult { - predicate: make_field_init_node( - &"Pattern".to_string(), - make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: r2.value.clone(), - }), - }), - Rc::new(vec![]), - None, - zero_span.clone(), - ), - zero_span.clone(), - zero_span.clone(), - ), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } - "format" => { - let r2 = expect_ident(&tokens); - if has_err(r2.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); - if has_err(r3.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: r3.err.clone(), - }); - } - Rc::new(PredResult { - predicate: make_field_init_node( - &"Format".to_string(), - make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: r2.name.clone(), - }), - }), - Rc::new(vec![]), - None, - zero_span.clone(), - ), - zero_span.clone(), - zero_span.clone(), - ), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } - "brand" => { - let r2 = parse_string_literal_value(&tokens); - if has_err(r2.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); - if has_err(r3.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: r3.err.clone(), - }); - } - Rc::new(PredResult { - predicate: make_field_init_node( - &"Brand".to_string(), - make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: r2.value.clone(), - }), - }), - Rc::new(vec![]), - None, - zero_span.clone(), - ), - zero_span.clone(), - zero_span.clone(), - ), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } - "content" => { - let r2 = expect_ident(&tokens); - if has_err(r2.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); - if has_err(r3.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: r3.err.clone(), - }); - } - Rc::new(PredResult { - predicate: make_field_init_node( - &"ContentEncoding".to_string(), - make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: r2.name.clone(), - }), - }), - Rc::new(vec![]), - None, - zero_span.clone(), - ), - zero_span.clone(), - zero_span.clone(), - ), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } - "domain" => { - let r2 = expect_ident(&tokens); - if has_err(r2.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); - if has_err(r3.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: r3.err.clone(), - }); - } - Rc::new(PredResult { - predicate: make_field_init_node( - &"Domain".to_string(), - make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: r2.name.clone(), - }), - }), - Rc::new(vec![]), - None, - zero_span.clone(), - ), - zero_span.clone(), - zero_span.clone(), - ), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } - "range" => { - let r2 = parse_named_int_args(tokens.clone(), ctx.clone()); - if has_err(r2.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); - if has_err(r3.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), - }); - } - let min_fields = if (r2.min_val.clone() != None) { - Rc::new(vec![make_field_init_node( - &"min".to_string(), - make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitInt { - value: r2.min_val.clone().clone().unwrap(), - }), - }), - Rc::new(vec![]), - None, - zero_span.clone(), - ), - zero_span.clone(), - zero_span.clone(), - )]) - } else { - Rc::new(vec![]) - }; - let max_fields = if (r2.max_val.clone() != None) { - Rc::new(vec![make_field_init_node( - &"max".to_string(), - make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitInt { - value: r2.max_val.clone().clone().unwrap(), - }), - }), - Rc::new(vec![]), - None, - zero_span.clone(), - ), - zero_span.clone(), - zero_span.clone(), - )]) - } else { - Rc::new(vec![]) - }; - Rc::new(PredResult { - predicate: make_field_init_node( - &"Range".to_string(), - make_expr_node( - Rc::new(ExprData::ExprRecordLit { parent_enum: None }), - v2_rt::concat(min_fields, max_fields), - None, - zero_span.clone(), - ), - zero_span.clone(), - zero_span.clone(), - ), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: None, - }) - } - _ => Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error( - v2_rt::concat( - v2_rt::concat( - "unknown where predicate `".to_string(), - pred_name.clone(), - ), - "`".to_string(), - ), - token_span(tokens.clone().first().cloned()), - )), - }), + predicate: dummy_pred.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let pred_name = r.name.clone(); +let tokens = r.tokens.clone(); +match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLParen))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let tokens = __ec.clone(); +match pred_name.clone().as_str() { + "pattern" => { + let r2 = parse_string_literal_value(&tokens); +if has_err(r2.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); +if has_err(r3.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: r3.err.clone(), +}) } - } - EatResult::EatUnchanged { tokens: __eu, .. } => match pred_name.clone().as_str() { - "non_empty" => Rc::new(PredResult { - predicate: make_field_init_node( - &"NonEmpty".to_string(), - make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitBool { value: true }), - }), - Rc::new(vec![]), - None, - zero_span.clone(), - ), - zero_span.clone(), - zero_span.clone(), - ), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }), - _ => Rc::new(PredResult { - predicate: make_field_init_node( - &pred_name, - make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitBool { value: true }), - }), - Rc::new(vec![]), - None, - zero_span.clone(), - ), - zero_span.clone(), - zero_span.clone(), - ), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }), - }, - } - } -} - -pub fn parse_named_int_args( - tokens: Rc>>, - ctx: Rc, -) -> Rc { - { - let r = parse_single_named_int(tokens, &ctx); - if has_err(r.err.clone()) { - return Rc::new(RangeArgsResult { - min_val: None, - max_val: None, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r2 = parse_single_named_int(skip_newlines(__ec.clone()), &r.ctx.clone()); - if has_err(r2.err.clone()) { - return Rc::new(RangeArgsResult { - min_val: None, - max_val: None, - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), - }); +Rc::new(PredResult { + predicate: make_field_init_node(&"Pattern".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: r2.value.clone(), +}), +}), Rc::new(vec![]), None, zero_span.clone()), zero_span.clone(), zero_span.clone()), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: None, +}) +}, + "format" => { + let r2 = expect_ident(&tokens); +if has_err(r2.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); +if has_err(r3.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: r3.err.clone(), +}) + } +Rc::new(PredResult { + predicate: make_field_init_node(&"Format".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: r2.name.clone(), +}), +}), Rc::new(vec![]), None, zero_span.clone()), zero_span.clone(), zero_span.clone()), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: None, +}) +}, + "brand" => { + let r2 = parse_string_literal_value(&tokens); +if has_err(r2.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); +if has_err(r3.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: r3.err.clone(), +}) + } +Rc::new(PredResult { + predicate: make_field_init_node(&"Brand".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: r2.value.clone(), +}), +}), Rc::new(vec![]), None, zero_span.clone()), zero_span.clone(), zero_span.clone()), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: None, +}) +}, + "content" => { + let r2 = expect_ident(&tokens); +if has_err(r2.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); +if has_err(r3.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: r3.err.clone(), +}) + } +Rc::new(PredResult { + predicate: make_field_init_node(&"ContentEncoding".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: r2.name.clone(), +}), +}), Rc::new(vec![]), None, zero_span.clone()), zero_span.clone(), zero_span.clone()), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: None, +}) +}, + "domain" => { + let r2 = expect_ident(&tokens); +if has_err(r2.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); +if has_err(r3.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: r3.err.clone(), +}) } - let min_val = if (r.arg_name.clone().as_str() == "min".to_string().as_str()) { - Some(r.arg_value.clone()) +Rc::new(PredResult { + predicate: make_field_init_node(&"Domain".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: r2.name.clone(), +}), +}), Rc::new(vec![]), None, zero_span.clone()), zero_span.clone(), zero_span.clone()), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: None, +}) +}, + "range" => { + let r2 = parse_named_int_args(tokens.clone(), ctx.clone()); +if has_err(r2.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); +if has_err(r3.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), +}) + } +let min_fields = if (r2.min_val.clone() != None) { + Rc::new(vec![make_field_init_node(&"min".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitInt { + value: r2.min_val.clone().clone().unwrap(), +}), +}), Rc::new(vec![]), None, zero_span.clone()), zero_span.clone(), zero_span.clone())]) } else { - if (r2.arg_name.clone().as_str() == "min".to_string().as_str()) { - Some(r2.arg_value.clone()) - } else { - None - } + Rc::new(vec![]) }; - let max_val = if (r.arg_name.clone().as_str() == "max".to_string().as_str()) { - Some(r.arg_value.clone()) +let max_fields = if (r2.max_val.clone() != None) { + Rc::new(vec![make_field_init_node(&"max".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitInt { + value: r2.max_val.clone().clone().unwrap(), +}), +}), Rc::new(vec![]), None, zero_span.clone()), zero_span.clone(), zero_span.clone())]) } else { - if (r2.arg_name.clone().as_str() == "max".to_string().as_str()) { - Some(r2.arg_value.clone()) - } else { - None - } + Rc::new(vec![]) }; - Rc::new(RangeArgsResult { - min_val: min_val, - max_val: max_val, - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: None, - }) - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - let min_val = if (r.arg_name.clone().as_str() == "min".to_string().as_str()) { - Some(r.arg_value.clone()) +Rc::new(PredResult { + predicate: make_field_init_node(&"Range".to_string(), make_expr_node(Rc::new(ExprData::ExprRecordLit { + parent_enum: None, +}), v2_rt::concat(min_fields, max_fields), None, zero_span.clone()), zero_span.clone(), zero_span.clone()), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: None, +}) +}, + _ => Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error(v2_rt::concat(v2_rt::concat("unknown where predicate `".to_string(), pred_name.clone()), "`".to_string()), token_span(tokens.clone().first().cloned()))), +}), +} +}, + EatResult::EatUnchanged { tokens: __eu, .. } => match pred_name.clone().as_str() { + "non_empty" => Rc::new(PredResult { + predicate: make_field_init_node(&"NonEmpty".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitBool { + value: true, +}), +}), Rc::new(vec![]), None, zero_span.clone()), zero_span.clone(), zero_span.clone()), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}), + _ => Rc::new(PredResult { + predicate: make_field_init_node(&pred_name, make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitBool { + value: true, +}), +}), Rc::new(vec![]), None, zero_span.clone()), zero_span.clone(), zero_span.clone()), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}), +}, +} +} +} + +pub fn parse_named_int_args(tokens: Rc>>, ctx: Rc) -> Rc { + { + let r = parse_single_named_int(tokens, &ctx); +if has_err(r.err.clone()) { + return Rc::new(RangeArgsResult { + min_val: None, + max_val: None, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let r2 = parse_single_named_int(skip_newlines(__ec.clone()), &r.ctx.clone()); +if has_err(r2.err.clone()) { + return Rc::new(RangeArgsResult { + min_val: None, + max_val: None, + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), +}) + } +let min_val = if (r.arg_name.clone().as_str() == "min".to_string().as_str()) { + Some(r.arg_value.clone()) + } else { + if (r2.arg_name.clone().as_str() == "min".to_string().as_str()) { + Some(r2.arg_value.clone()) } else { None - }; - let max_val = if (r.arg_name.clone().as_str() == "max".to_string().as_str()) { - Some(r.arg_value.clone()) + } + }; +let max_val = if (r.arg_name.clone().as_str() == "max".to_string().as_str()) { + Some(r.arg_value.clone()) + } else { + if (r2.arg_name.clone().as_str() == "max".to_string().as_str()) { + Some(r2.arg_value.clone()) } else { None - }; - Rc::new(RangeArgsResult { - min_val: min_val, - max_val: max_val, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } - } - } + } + }; +Rc::new(RangeArgsResult { + min_val: min_val, + max_val: max_val, + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: None, +}) +}, + EatResult::EatUnchanged { tokens: __eu, .. } => { + let min_val = if (r.arg_name.clone().as_str() == "min".to_string().as_str()) { + Some(r.arg_value.clone()) + } else { + None + }; +let max_val = if (r.arg_name.clone().as_str() == "max".to_string().as_str()) { + Some(r.arg_value.clone()) + } else { + None + }; +Rc::new(RangeArgsResult { + min_val: min_val, + max_val: max_val, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +}, +} +} } -pub fn parse_single_named_int( - tokens: Rc>>, - ctx: &Rc, -) -> Rc { +pub fn parse_single_named_int(tokens: Rc>>, ctx: &Rc) -> Rc { { let r = expect_ident(&tokens); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(NamedIntResult { - arg_name: "".to_string(), - arg_value: 0, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let name = r.name.clone(); - let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); - if has_err(r2.err.clone()) { + arg_name: "".to_string(), + arg_value: 0, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let name = r.name.clone(); +let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); +if has_err(r2.err.clone()) { return Rc::new(NamedIntResult { - arg_name: name.clone(), - arg_value: 0, - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = parse_int_literal_value(&r2.tokens.clone()); - if has_err(r3.err.clone()) { + arg_name: name.clone(), + arg_value: 0, + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = parse_int_literal_value(&r2.tokens.clone()); +if has_err(r3.err.clone()) { return Rc::new(NamedIntResult { - arg_name: name.clone(), - arg_value: 0, - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: r3.err.clone(), - }); - } - Rc::new(NamedIntResult { - arg_name: name.clone(), - arg_value: r3.value.clone(), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } + arg_name: name.clone(), + arg_value: 0, + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: r3.err.clone(), +}) + } +Rc::new(NamedIntResult { + arg_name: name.clone(), + arg_value: r3.value.clone(), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: None, +}) +} } -pub fn parse_variant_fields( - tokens: &Rc>>, - ctx: Rc, - vname: &String, - vname_span: &Rc, -) -> Rc { +pub fn parse_variant_fields(tokens: &Rc>>, ctx: Rc, vname: &String, vname_span: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); - match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLBrace))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r = parse_field_list(skip_newlines(__ec.clone()), ctx); - if has_err(r.err.clone()) { - return Rc::new(VariantResult { - variant: make_variant_node( - &vname, - Rc::new(vec![]), - start_span.clone(), - vname_span.clone(), - ), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let tokens = skip_newlines(r.tokens.clone()); - let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); - if has_err(r2.err.clone()) { - return Rc::new(VariantResult { - variant: make_variant_node( - &vname, - Rc::new(vec![]), - start_span.clone(), - vname_span.clone(), - ), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), - }); - } - let v = make_variant_node( - &vname, - r.fields.clone(), - start_span.clone(), - vname_span.clone(), - ); - Rc::new(VariantResult { - variant: v, - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - let v = make_variant_node( - &vname, - Rc::new(vec![]), - vname_span.clone(), - vname_span.clone(), - ); - Rc::new(VariantResult { - variant: v, - tokens: tokens.clone(), - ctx: ctx, - err: None, - }) - } - } - } +match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLBrace))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let r = parse_field_list(skip_newlines(__ec.clone()), ctx); +if has_err(r.err.clone()) { + return Rc::new(VariantResult { + variant: make_variant_node(&vname, Rc::new(vec![]), start_span.clone(), vname_span.clone()), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let tokens = skip_newlines(r.tokens.clone()); +let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r2.err.clone()) { + return Rc::new(VariantResult { + variant: make_variant_node(&vname, Rc::new(vec![]), start_span.clone(), vname_span.clone()), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), +}) + } +let v = make_variant_node(&vname, r.fields.clone(), start_span.clone(), vname_span.clone()); +Rc::new(VariantResult { + variant: v, + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +}, + EatResult::EatUnchanged { tokens: __eu, .. } => { + let v = make_variant_node(&vname, Rc::new(vec![]), vname_span.clone(), vname_span.clone()); +Rc::new(VariantResult { + variant: v, + tokens: tokens.clone(), + ctx: ctx, + err: None, +}) +}, +} +} } -pub fn parse_more_variants( - tokens: Rc>>, - ctx: Rc, -) -> Rc { +pub fn parse_more_variants(tokens: Rc>>, ctx: Rc) -> Rc { parse_more_variants_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_more_variants_acc( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_more_variants_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - match (*eat(&tokens, Rc::new(ExpectedToken::ExpectPipe))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - tokens = skip_newlines(__ec.clone()); - let r = expect_ident(&tokens); - if has_err(r.err.clone()) { - return Rc::new(VariantsResult { - variants: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r2 = parse_variant_fields( - &r.tokens.clone(), - ctx.clone(), - &r.name.clone(), - &r.span.clone(), - ); - if has_err(r2.err.clone()) { - return Rc::new(VariantsResult { - variants: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), - }); - } - { - let __tco_0 = r2.tokens.clone(); - let __tco_1 = r2.ctx.clone(); - let __tco_2 = v2_rt::rc_list_push(acc, r2.variant.clone()); - tokens = __tco_0; - ctx = __tco_1; - acc = __tco_2; - continue; - } - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - break Rc::new(VariantsResult { - variants: acc, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } - } - } +match (*eat(&tokens, Rc::new(ExpectedToken::ExpectPipe))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { tokens = skip_newlines(__ec.clone()); +let r = expect_ident(&tokens); +if has_err(r.err.clone()) { + return Rc::new(VariantsResult { + variants: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let r2 = parse_variant_fields(&r.tokens.clone(), ctx.clone(), &r.name.clone(), &r.span.clone()); +if has_err(r2.err.clone()) { + return Rc::new(VariantsResult { + variants: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), +}) + } +{ + let __tco_0 = r2.tokens.clone(); +let __tco_1 = r2.ctx.clone(); +let __tco_2 = v2_rt::rc_list_push(acc, r2.variant.clone()); +tokens = __tco_0; +ctx = __tco_1; +acc = __tco_2; +continue; +} }, + EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(VariantsResult { + variants: acc, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); }, +} +} +} + +pub fn parse_type_expr(tokens: &Rc>>, ctx: &Rc) -> Rc { + { + let tokens = skip_newlines(tokens.clone()); +let tok = tokens.clone().first().cloned(); +let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, +}; +let span = token_span(tok.clone()); +match sh { + Some(TokenShape::ShLBrace) => { + let r = parse_field_list(skip_newlines(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>())), ctx.clone()); +if has_err(r.err.clone()) { + return Rc::new(TypeResult { + type_expr: leaf_type_node(&"".to_string(), &span), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let tokens = skip_newlines(r.tokens.clone()); +let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r2.err.clone()) { + return Rc::new(TypeResult { + type_expr: leaf_type_node(&"".to_string(), &span), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), +}) + } +let te = Rc::new(Node { + name: "".to_string(), + span: span.clone(), + ident_span: None, + children: Rc::new({ let mut __result = Vec::new(); for f in r.fields.clone().iter().cloned() { __result.push(field_to_child_node(&f, &ctx.source_indices.clone())); } __result }), + connective: Connective::Conj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +Rc::new(TypeResult { + type_expr: te, + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +}, + Some(TokenShape::ShKeyword) => if (tok.clone().unwrap().text.clone().as_str() == "fn".to_string().as_str()) { + parse_callable_type_expr(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &ctx, &span) + } else { + Rc::new(TypeResult { + type_expr: leaf_type_node(&"".to_string(), &span), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error("expected type expression".to_string(), span.clone())), +}) + }, + Some(TokenShape::ShIdent) => { + let n = tok.clone().unwrap().text.clone(); +finish_type_expr_from_name(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx.clone(), &n, &span) +}, + _ => Rc::new(TypeResult { + type_expr: leaf_type_node(&"".to_string(), &span), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error("expected type expression".to_string(), span.clone())), +}), +} } - -pub fn parse_type_expr(tokens: &Rc>>, ctx: &Rc) -> Rc { - { - let tokens = skip_newlines(tokens.clone()); - let tok = tokens.clone().first().cloned(); - let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, - }; - let span = token_span(tok.clone()); - match sh { - Some(TokenShape::ShLBrace) => { - let r = parse_field_list( - skip_newlines(Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - )), - ctx.clone(), - ); - if has_err(r.err.clone()) { - return Rc::new(TypeResult { - type_expr: leaf_type_node(&"".to_string(), &span), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let tokens = skip_newlines(r.tokens.clone()); - let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); - if has_err(r2.err.clone()) { - return Rc::new(TypeResult { - type_expr: leaf_type_node(&"".to_string(), &span), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), - }); - } - let te = Rc::new(Node { - name: "".to_string(), - span: span.clone(), - ident_span: None, - children: Rc::new({ - let mut __result = Vec::new(); - for f in r.fields.clone().iter().cloned() { - __result.push(field_to_child_node(&f, &ctx.source_indices.clone())); - } - __result - }), - connective: Connective::Conj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - Rc::new(TypeResult { - type_expr: te, - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } - Some(TokenShape::ShKeyword) => { - if (tok.clone().unwrap().text.clone().as_str() == "fn".to_string().as_str()) { - parse_callable_type_expr( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - &ctx, - &span, - ) - } else { - Rc::new(TypeResult { - type_expr: leaf_type_node(&"".to_string(), &span), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error( - "expected type expression".to_string(), - span.clone(), - )), - }) - } - } - Some(TokenShape::ShIdent) => { - let n = tok.clone().unwrap().text.clone(); - finish_type_expr_from_name( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx.clone(), - &n, - &span, - ) - } - _ => Rc::new(TypeResult { - type_expr: leaf_type_node(&"".to_string(), &span), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error( - "expected type expression".to_string(), - span.clone(), - )), - }), - } - } } -pub fn parse_callable_type_expr( - tokens: &Rc>>, - ctx: &Rc, - start_span: &Rc, -) -> Rc { +pub fn parse_callable_type_expr(tokens: &Rc>>, ctx: &Rc, start_span: &Rc) -> Rc { { let dummy_te = leaf_type_node(&"".to_string(), &start_span); - let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLParen)); - if has_err(r.err.clone()) { +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLParen)); +if has_err(r.err.clone()) { return Rc::new(TypeResult { - type_expr: dummy_te.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let tokens = skip_newlines(r.tokens.clone()); - let params_result = if tok_is_rparen(tokens.clone().first().cloned()) { + type_expr: dummy_te.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let tokens = skip_newlines(r.tokens.clone()); +let params_result = if tok_is_rparen(tokens.clone().first().cloned()) { Rc::new(ParamsResult { - params: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) + params: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) } else { parse_callable_param_types(tokens.clone(), ctx.clone(), Rc::new(vec![])) }; - if has_err(params_result.err.clone()) { +if has_err(params_result.err.clone()) { return Rc::new(TypeResult { - type_expr: dummy_te.clone(), - tokens: params_result.tokens.clone(), - ctx: params_result.ctx.clone(), - err: params_result.err.clone(), - }); - } - let tokens = skip_newlines(params_result.tokens.clone()); - let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRParen)); - if has_err(r2.err.clone()) { + type_expr: dummy_te.clone(), + tokens: params_result.tokens.clone(), + ctx: params_result.ctx.clone(), + err: params_result.err.clone(), +}) + } +let tokens = skip_newlines(params_result.tokens.clone()); +let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRParen)); +if has_err(r2.err.clone()) { return Rc::new(TypeResult { - type_expr: dummy_te.clone(), - tokens: r2.tokens.clone(), - ctx: params_result.ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectArrow)); - if has_err(r3.err.clone()) { + type_expr: dummy_te.clone(), + tokens: r2.tokens.clone(), + ctx: params_result.ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectArrow)); +if has_err(r3.err.clone()) { return Rc::new(TypeResult { - type_expr: dummy_te.clone(), - tokens: r3.tokens.clone(), - ctx: params_result.ctx.clone(), - err: r3.err.clone(), - }); - } - let ret = parse_type_expr(&r3.tokens.clone(), ¶ms_result.ctx.clone()); - if has_err(ret.err.clone()) { + type_expr: dummy_te.clone(), + tokens: r3.tokens.clone(), + ctx: params_result.ctx.clone(), + err: r3.err.clone(), +}) + } +let ret = parse_type_expr(&r3.tokens.clone(), ¶ms_result.ctx.clone()); +if has_err(ret.err.clone()) { return Rc::new(TypeResult { - type_expr: dummy_te.clone(), - tokens: ret.tokens.clone(), - ctx: ret.ctx.clone(), - err: ret.err.clone(), - }); - } - let te = Rc::new(Node { - name: "Callable".to_string(), - span: start_span.clone(), - ident_span: Some(start_span.clone()), - children: Rc::new(vec![]), - connective: Connective::Arrow, - params: params_result.params.clone(), - inferred: Some(Rc::new(InferredNode::Resolved { - node: ret.type_expr.clone(), - })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - maybe_optional( - &ret.tokens.clone(), - ret.ctx.clone(), - &te, - start_span.clone(), - ) - } + type_expr: dummy_te.clone(), + tokens: ret.tokens.clone(), + ctx: ret.ctx.clone(), + err: ret.err.clone(), +}) + } +let te = Rc::new(Node { + name: "Callable".to_string(), + span: start_span.clone(), + ident_span: Some(start_span.clone()), + children: Rc::new(vec![]), + connective: Connective::Arrow, + params: params_result.params.clone(), + inferred: Some(Rc::new(InferredNode::Resolved { + node: ret.type_expr.clone(), +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +maybe_optional(&ret.tokens.clone(), ret.ctx.clone(), &te, start_span.clone()) +} } -pub fn parse_callable_param_types( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_callable_param_types(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { let r = parse_type_expr(&tokens, &ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ParamsResult { - params: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let param = make_param_node( - &"".to_string(), - r.type_expr.clone(), - None, - r.type_expr.clone().span.clone(), - r.type_expr.clone().span.clone(), - ); - acc = v2_rt::rc_list_push(acc.clone(), param); - match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - tokens = skip_newlines(__ec.clone()); - if tok_is_rparen(tokens.clone().first().cloned()) { - break Rc::new(ParamsResult { - params: acc.clone(), - tokens: tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }); - } else { - { - let __tco_0 = r.ctx.clone(); - ctx = __tco_0; - continue; - } - } - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - break Rc::new(ParamsResult { - params: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }); - } - } - } + params: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let param = make_param_node(&"".to_string(), r.type_expr.clone(), None, r.type_expr.clone().span.clone(), r.type_expr.clone().span.clone()); +acc = v2_rt::rc_list_push(acc.clone(), param); +match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { tokens = skip_newlines(__ec.clone()); +if tok_is_rparen(tokens.clone().first().cloned()) { + break Rc::new(ParamsResult { + params: acc.clone(), + tokens: tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}); +} else { + { + let __tco_0 = r.ctx.clone(); +ctx = __tco_0; +continue; +} +} }, + EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(ParamsResult { + params: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}); }, +} +} } -pub fn finish_type_expr_from_name( - tokens: &Rc>>, - ctx: Rc, - type_name: &String, - start_span: &Rc, -) -> Rc { +pub fn finish_type_expr_from_name(tokens: &Rc>>, ctx: Rc, type_name: &String, start_span: &Rc) -> Rc { { let dummy_te = leaf_type_node(&type_name, &start_span); - match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLt))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r = parse_type_expr(&__ec, &ctx); - if has_err(r.err.clone()) { - return r.clone(); - } - let first_arg = r.type_expr.clone(); - let type_args = - collect_type_args(r.tokens.clone(), r.ctx.clone(), Rc::new(vec![first_arg])); - if has_err(type_args.err.clone()) { - return Rc::new(TypeResult { - type_expr: dummy_te.clone(), - tokens: type_args.tokens.clone(), - ctx: type_args.ctx.clone(), - err: type_args.err.clone(), - }); - } - let r3 = expect(&type_args.tokens.clone(), &Rc::new(ExpectedToken::ExpectGt)); - if has_err(r3.err.clone()) { - return Rc::new(TypeResult { - type_expr: dummy_te.clone(), - tokens: r3.tokens.clone(), - ctx: type_args.ctx.clone(), - err: r3.err.clone(), - }); - } - let te = Rc::new(Node { - name: type_name.clone(), - span: start_span.clone(), - ident_span: Some(start_span.clone()), - children: type_args.args.clone(), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - maybe_optional( - &r3.tokens.clone(), - type_args.ctx.clone(), - &te, - start_span.clone(), - ) - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - let te = leaf_type_node(&type_name, &start_span); - maybe_optional(&tokens, ctx, &te, start_span.clone()) - } - } - } +match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLt))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let r = parse_type_expr(&__ec, &ctx); +if has_err(r.err.clone()) { + return r.clone() + } +let first_arg = r.type_expr.clone(); +let type_args = collect_type_args(r.tokens.clone(), r.ctx.clone(), Rc::new(vec![first_arg])); +if has_err(type_args.err.clone()) { + return Rc::new(TypeResult { + type_expr: dummy_te.clone(), + tokens: type_args.tokens.clone(), + ctx: type_args.ctx.clone(), + err: type_args.err.clone(), +}) + } +let r3 = expect(&type_args.tokens.clone(), &Rc::new(ExpectedToken::ExpectGt)); +if has_err(r3.err.clone()) { + return Rc::new(TypeResult { + type_expr: dummy_te.clone(), + tokens: r3.tokens.clone(), + ctx: type_args.ctx.clone(), + err: r3.err.clone(), +}) + } +let te = Rc::new(Node { + name: type_name.clone(), + span: start_span.clone(), + ident_span: Some(start_span.clone()), + children: type_args.args.clone(), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +maybe_optional(&r3.tokens.clone(), type_args.ctx.clone(), &te, start_span.clone()) +}, + EatResult::EatUnchanged { tokens: __eu, .. } => { + let te = leaf_type_node(&type_name, &start_span); +maybe_optional(&tokens, ctx, &te, start_span.clone()) +}, +} +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -4580,72 +3834,54 @@ pub struct TypeParamsResult { pub ctx: Rc, } -pub fn parse_optional_type_params( - tokens: &Rc>>, - ctx: Rc, -) -> Rc { +pub fn parse_optional_type_params(tokens: &Rc>>, ctx: Rc) -> Rc { match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLt))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let params_result = collect_type_param_names(__ec.clone(), ctx, Rc::new(vec![])); - let r = expect( - ¶ms_result.tokens.clone(), - &Rc::new(ExpectedToken::ExpectGt), - ); - Rc::new(TypeParamsResult { - params: params_result.params.clone(), - tokens: r.tokens.clone(), - ctx: params_result.ctx.clone(), - }) - } - EatResult::EatUnchanged { tokens: __eu, .. } => Rc::new(TypeParamsResult { - params: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx, - }), - } + EatResult::EatConsumed { tokens: __ec, .. } => { + let params_result = collect_type_param_names(__ec.clone(), ctx, Rc::new(vec![])); +let r = expect(¶ms_result.tokens.clone(), &Rc::new(ExpectedToken::ExpectGt)); +Rc::new(TypeParamsResult { + params: params_result.params.clone(), + tokens: r.tokens.clone(), + ctx: params_result.ctx.clone(), +}) +}, + EatResult::EatUnchanged { tokens: __eu, .. } => Rc::new(TypeParamsResult { + params: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx, +}), +} } -pub fn collect_type_param_names( - mut tokens: Rc>>, - mut ctx: Rc, - mut params: Rc>>, -) -> Rc { +pub fn collect_type_param_names(mut tokens: Rc>>, mut ctx: Rc, mut params: Rc>>) -> Rc { loop { if tok_is_ident(tokens.clone().first().cloned()) { let r = expect_ident(&tokens); - let span = r.span.clone(); - let param = make_param_node( - &r.name.clone(), - leaf_type_node(&r.name.clone(), &span), - None, - span.clone(), - span.clone(), - ); - let next_params = v2_rt::rc_list_push(params, param); - match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let __tco_0 = __ec.clone(); - let __tco_1 = next_params; - tokens = __tco_0; - params = __tco_1; - continue; - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - break Rc::new(TypeParamsResult { - params: next_params, - tokens: r.tokens.clone(), - ctx: ctx, - }); - } - } - } else { +let span = r.span.clone(); +let param = make_param_node(&r.name.clone(), leaf_type_node(&r.name.clone(), &span), None, span.clone(), span.clone()); +let next_params = v2_rt::rc_list_push(params, param); +match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { { + let __tco_0 = __ec.clone(); +let __tco_1 = next_params; +tokens = __tco_0; +params = __tco_1; +continue; +} }, + EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(TypeParamsResult { + params: next_params, + tokens: r.tokens.clone(), + ctx: ctx, +}); }, +} +} else { break Rc::new(TypeParamsResult { - params: params, - tokens: tokens.clone(), - ctx: ctx, - }); - } - } + params: params, + tokens: tokens.clone(), + ctx: ctx, +}); +} +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -4656,1075 +3892,954 @@ pub struct TypeArgsResult { pub err: Option>, } -pub fn collect_type_args( - mut tokens: Rc>>, - mut ctx: Rc, - mut args: Rc>>, -) -> Rc { +pub fn collect_type_args(mut tokens: Rc>>, mut ctx: Rc, mut args: Rc>>) -> Rc { loop { match (*eat(&tokens, Rc::new(ExpectedToken::ExpectComma))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r = parse_type_expr(&__ec, &ctx); - if has_err(r.err.clone()) { - return Rc::new(TypeArgsResult { - args: args.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - { - let __tco_0 = r.tokens.clone(); - let __tco_1 = r.ctx.clone(); - let __tco_2 = v2_rt::rc_list_push(args, r.type_expr.clone()); - tokens = __tco_0; - ctx = __tco_1; - args = __tco_2; - continue; - } - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - break Rc::new(TypeArgsResult { - args: args.clone(), - tokens: tokens.clone(), - ctx: ctx, - err: None, - }); - } - } - } + EatResult::EatConsumed { tokens: __ec, .. } => { let r = parse_type_expr(&__ec, &ctx); +if has_err(r.err.clone()) { + return Rc::new(TypeArgsResult { + args: args.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +{ + let __tco_0 = r.tokens.clone(); +let __tco_1 = r.ctx.clone(); +let __tco_2 = v2_rt::rc_list_push(args, r.type_expr.clone()); +tokens = __tco_0; +ctx = __tco_1; +args = __tco_2; +continue; +} }, + EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(TypeArgsResult { + args: args.clone(), + tokens: tokens.clone(), + ctx: ctx, + err: None, +}); }, +} +} } -pub fn maybe_optional( - tokens: &Rc>>, - ctx: Rc, - te: &Rc, - start_span: Rc, -) -> Rc { +pub fn maybe_optional(tokens: &Rc>>, ctx: Rc, te: &Rc, start_span: Rc) -> Rc { match (*eat(&tokens, Rc::new(ExpectedToken::ExpectQuestion))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let ote = Rc::new(Node { - name: te.name.clone(), - span: te.span.clone(), - ident_span: te.ident_span.clone(), - children: te.children.clone(), - connective: te.connective.clone(), - params: te.params.clone(), - inferred: te.inferred.clone(), - return_cardinality: Cardinality::CardOptional, - uses: te.uses.clone(), - body: te.body.clone(), - transport: te.transport.clone(), - properties: te.properties.clone(), - type_annotation: te.type_annotation.clone(), - is_self_recursive: te.is_self_recursive.clone(), - has_non_tail_self_call: te.has_non_tail_self_call.clone(), - match_pattern: te.match_pattern.clone(), - expr_data: te.expr_data.clone(), - ident: None, - }); - Rc::new(TypeResult { - type_expr: ote, - tokens: __ec.clone(), - ctx: ctx, - err: None, - }) - } - EatResult::EatUnchanged { tokens: __eu, .. } => Rc::new(TypeResult { - type_expr: te.clone(), - tokens: tokens.clone(), - ctx: ctx, - err: None, - }), - } + EatResult::EatConsumed { tokens: __ec, .. } => { + let ote = Rc::new(Node { + name: te.name.clone(), + span: te.span.clone(), + ident_span: te.ident_span.clone(), + children: te.children.clone(), + connective: te.connective.clone(), + params: te.params.clone(), + inferred: te.inferred.clone(), + return_cardinality: Cardinality::CardOptional, + uses: te.uses.clone(), + body: te.body.clone(), + transport: te.transport.clone(), + properties: te.properties.clone(), + type_annotation: te.type_annotation.clone(), + is_self_recursive: te.is_self_recursive.clone(), + has_non_tail_self_call: te.has_non_tail_self_call.clone(), + match_pattern: te.match_pattern.clone(), + expr_data: te.expr_data.clone(), + ident: None, +}); +Rc::new(TypeResult { + type_expr: ote, + tokens: __ec.clone(), + ctx: ctx, + err: None, +}) +}, + EatResult::EatUnchanged { tokens: __eu, .. } => Rc::new(TypeResult { + type_expr: te.clone(), + tokens: tokens.clone(), + ctx: ctx, + err: None, +}), +} } pub fn parse_field_list(tokens: Rc>>, ctx: Rc) -> Rc { parse_field_list_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_field_list_acc( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_field_list_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - let tok = tokens.clone().first().cloned(); - if ((tok_is_rbrace(tok.clone()) || tok_is_rparen(tok.clone())) || tok_is_eof(tok.clone())) { +let tok = tokens.clone().first().cloned(); +if ((tok_is_rbrace(tok.clone()) || tok_is_rparen(tok.clone())) || tok_is_eof(tok.clone())) { break Rc::new(FieldsResult { - fields: acc, - tokens: tokens.clone(), - ctx: ctx, - err: None, - }); - } else { + fields: acc, + tokens: tokens.clone(), + ctx: ctx, + err: None, +}); +} else { if (tok_is_ident(tok.clone()) || tok_is_keyword_name(tok.clone())) { let r = parse_field(&tokens, &ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(FieldsResult { - fields: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - tokens = r.tokens.clone(); - let e = eat(&tokens, Rc::new(ExpectedToken::ExpectComma)); - tokens = skip_newlines(match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => tokens.clone(), - }); - { + fields: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +tokens = r.tokens.clone(); +let e = eat(&tokens, Rc::new(ExpectedToken::ExpectComma)); +tokens = skip_newlines(match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => tokens.clone(), +}); +{ let __tco_0 = r.ctx.clone(); - let __tco_1 = v2_rt::rc_list_push(acc, r.field.clone()); - ctx = __tco_0; - acc = __tco_1; - continue; - } - } else { +let __tco_1 = v2_rt::rc_list_push(acc, r.field.clone()); +ctx = __tco_0; +acc = __tco_1; +continue; +} +} else { break Rc::new(FieldsResult { - fields: acc, - tokens: tokens.clone(), - ctx: ctx, - err: None, - }); - } - } - } + fields: acc, + tokens: tokens.clone(), + ctx: ctx, + err: None, +}); +} +} +} } pub fn parse_field(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); - let dummy_field = make_field_node( - &"".to_string(), - leaf_type_node(&"".to_string(), &start_span), - Cardinality::Required, - None, - None, - start_span.clone(), - start_span.clone(), - ); - let r = expect_name(&tokens); - if has_err(r.err.clone()) { +let dummy_field = make_field_node(&"".to_string(), leaf_type_node(&"".to_string(), &start_span), Cardinality::Required, None, None, start_span.clone(), start_span.clone()); +let r = expect_name(&tokens); +if has_err(r.err.clone()) { return Rc::new(FieldResult { - field: dummy_field.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let name = r.name.clone(); - let name_span = r.span.clone(); - let tokens = r.tokens.clone(); - let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectColon)); - if has_err(r2.err.clone()) { + field: dummy_field.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let name = r.name.clone(); +let name_span = r.span.clone(); +let tokens = r.tokens.clone(); +let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectColon)); +if has_err(r2.err.clone()) { return Rc::new(FieldResult { - field: dummy_field.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = parse_type_expr(&r2.tokens.clone(), &ctx); - if has_err(r3.err.clone()) { + field: dummy_field.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = parse_type_expr(&r2.tokens.clone(), &ctx); +if has_err(r3.err.clone()) { return Rc::new(FieldResult { - field: dummy_field.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), - }); - } - let wr = try_where_clause( - &r3.tokens.clone(), - r3.ctx.clone(), - &r3.type_expr.clone(), - &start_span, - ); - if has_err(wr.err.clone()) { + field: dummy_field.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), +}) + } +let wr = try_where_clause(&r3.tokens.clone(), r3.ctx.clone(), &r3.type_expr.clone(), &start_span); +if has_err(wr.err.clone()) { return Rc::new(FieldResult { - field: dummy_field.clone(), - tokens: wr.tokens.clone(), - ctx: wr.ctx.clone(), - err: wr.err.clone(), - }); - } - let te = wr.type_expr.clone(); - let tokens = wr.tokens.clone(); - let ctx = wr.ctx.clone(); - let from_r = parse_optional_from_key(&tokens, ctx.clone()); - let from_key = from_r.from_key.clone(); - let tokens = from_r.tokens.clone(); - let ctx = from_r.ctx.clone(); - match (*eat(&tokens, Rc::new(ExpectedToken::ExpectEq))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r4 = parse_expr(__ec.clone(), ctx.clone()); - if has_err(r4.err.clone()) { - return Rc::new(FieldResult { - field: dummy_field.clone(), - tokens: r4.tokens.clone(), - ctx: r4.ctx.clone(), - err: r4.err.clone(), - }); - } - let f = make_field_node( - &name, - te.clone(), - te.return_cardinality.clone(), - Some(r4.expr.clone()), - from_key, - start_span.clone(), - name_span, - ); - Rc::new(FieldResult { - field: f, - tokens: r4.tokens.clone(), - ctx: r4.ctx.clone(), - err: None, - }) - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - let f = make_field_node( - &name, - te.clone(), - te.return_cardinality.clone(), - None, - from_key, - start_span.clone(), - name_span, - ); - Rc::new(FieldResult { - field: f, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } - } - } + field: dummy_field.clone(), + tokens: wr.tokens.clone(), + ctx: wr.ctx.clone(), + err: wr.err.clone(), +}) + } +let te = wr.type_expr.clone(); +let tokens = wr.tokens.clone(); +let ctx = wr.ctx.clone(); +let from_r = parse_optional_from_key(&tokens, ctx.clone()); +let from_key = from_r.from_key.clone(); +let tokens = from_r.tokens.clone(); +let ctx = from_r.ctx.clone(); +match (*eat(&tokens, Rc::new(ExpectedToken::ExpectEq))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let r4 = parse_expr(__ec.clone(), ctx.clone()); +if has_err(r4.err.clone()) { + return Rc::new(FieldResult { + field: dummy_field.clone(), + tokens: r4.tokens.clone(), + ctx: r4.ctx.clone(), + err: r4.err.clone(), +}) + } +let f = make_field_node(&name, te.clone(), te.return_cardinality.clone(), Some(r4.expr.clone()), from_key, start_span.clone(), name_span); +Rc::new(FieldResult { + field: f, + tokens: r4.tokens.clone(), + ctx: r4.ctx.clone(), + err: None, +}) +}, + EatResult::EatUnchanged { tokens: __eu, .. } => { + let f = make_field_node(&name, te.clone(), te.return_cardinality.clone(), None, from_key, start_span.clone(), name_span); +Rc::new(FieldResult { + field: f, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) +}, +} +} } -pub fn parse_optional_from_key( - tokens: &Rc>>, - ctx: Rc, -) -> Rc { +pub fn parse_optional_from_key(tokens: &Rc>>, ctx: Rc) -> Rc { { let tok = tokens.clone().first().cloned(); - let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, - }; - match sh { - Some(TokenShape::ShIdent) => { - if (tok.clone().unwrap().text.clone().as_str() == "from".to_string().as_str()) { - { - let tok2 = tokens.clone().get(1 as usize).cloned(); - let sh2 = match tok2.clone() { - Some(t) => Some(t.shape.clone()), - None => None, - }; - match sh2 { - Some(TokenShape::ShLitStr) => { - let key = tok2.clone().unwrap().text.clone(); - Rc::new(FromKeyResult { - from_key: Some(key), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(2 as usize) - .collect::>(), - ), - ctx: ctx, - err: None, - }) - } - _ => Rc::new(FromKeyResult { - from_key: None, - tokens: tokens.clone(), - ctx: ctx, - err: None, - }), - } - } - } else { - Rc::new(FromKeyResult { - from_key: None, - tokens: tokens.clone(), - ctx: ctx, - err: None, - }) - } - } - _ => Rc::new(FromKeyResult { - from_key: None, - tokens: tokens.clone(), - ctx: ctx, - err: None, - }), - } - } +let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, +}; +match sh { + Some(TokenShape::ShIdent) => if (tok.clone().unwrap().text.clone().as_str() == "from".to_string().as_str()) { + { + let tok2 = tokens.clone().get(1 as usize).cloned(); +let sh2 = match tok2.clone() { + Some(t) => Some(t.shape.clone()), + None => None, +}; +match sh2 { + Some(TokenShape::ShLitStr) => { + let key = tok2.clone().unwrap().text.clone(); +Rc::new(FromKeyResult { + from_key: Some(key), + tokens: Rc::new(tokens.clone().iter().cloned().skip(2 as usize).collect::>()), + ctx: ctx, + err: None, +}) +}, + _ => Rc::new(FromKeyResult { + from_key: None, + tokens: tokens.clone(), + ctx: ctx, + err: None, +}), +} +} + } else { + Rc::new(FromKeyResult { + from_key: None, + tokens: tokens.clone(), + ctx: ctx, + err: None, +}) + }, + _ => Rc::new(FromKeyResult { + from_key: None, + tokens: tokens.clone(), + ctx: ctx, + err: None, +}), +} +} } pub fn parse_fn_def(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); - let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let r = expect( - &tokens, - &Rc::new(ExpectedToken::ExpectKeyword { - text: "fn".to_string(), - }), - ); - if has_err(r.err.clone()) { +let dummy = Rc::new(Node { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { + text: "fn".to_string(), +})); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); + item: dummy, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - parse_fn_after_kw(&r.tokens.clone(), &ctx, &start_span) - } +parse_fn_after_kw(&r.tokens.clone(), &ctx, &start_span) +} } -pub fn parse_fn_after_kw( - tokens: &Rc>>, - ctx: &Rc, - start_span: &Rc, -) -> Rc { +pub fn parse_fn_after_kw(tokens: &Rc>>, ctx: &Rc, start_span: &Rc) -> Rc { { let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let r = expect_ident(&tokens); - if has_err(r.err.clone()) { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let r = expect_ident(&tokens); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let name = r.name.clone(); - let name_span = r.span.clone(); - let tokens = r.tokens.clone(); - let named_dummy = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let r = parse_params(&tokens, &ctx); - if has_err(r.err.clone()) { + item: dummy, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let name = r.name.clone(); +let name_span = r.span.clone(); +let tokens = r.tokens.clone(); +let named_dummy = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let r = parse_params(&tokens, &ctx); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let params = r.params.clone(); - let tokens = r.tokens.clone(); - let ctx = r.ctx.clone(); - let ret = parse_optional_inferred(&tokens, ctx.clone()); - if has_err(ret.err.clone()) { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let params = r.params.clone(); +let tokens = r.tokens.clone(); +let ctx = r.ctx.clone(); +let ret = parse_optional_inferred(&tokens, ctx.clone()); +if has_err(ret.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: ret.tokens.clone(), - ctx: ret.ctx.clone(), - err: ret.err.clone(), - }); - } - let inferred = ret.inferred.clone(); - let tokens = ret.tokens.clone(); - let ctx = ret.ctx.clone(); - let r = parse_block(&skip_newlines(tokens.clone()), &ctx); - if has_err(r.err.clone()) { + item: named_dummy.clone(), + tokens: ret.tokens.clone(), + ctx: ret.ctx.clone(), + err: ret.err.clone(), +}) + } +let inferred = ret.inferred.clone(); +let tokens = ret.tokens.clone(); +let ctx = ret.ctx.clone(); +let r = parse_block(&skip_newlines(tokens.clone()), &ctx); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let body = r.expr.clone(); - let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: params, - inferred: inferred, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: Some(body), - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - Rc::new(ItemResult { - item: item, - tokens: skip_newlines(r.tokens.clone()), - ctx: r.ctx.clone(), - err: None, - }) - } + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let body = r.expr.clone(); +let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: params, + inferred: inferred, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: Some(body), + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +Rc::new(ItemResult { + item: item, + tokens: skip_newlines(r.tokens.clone()), + ctx: r.ctx.clone(), + err: None, +}) +} } -pub fn parse_fn_body_from_prefix( - prefix: &Rc, - start_span: &Rc, -) -> Rc { +pub fn parse_fn_body_from_prefix(prefix: &Rc, start_span: &Rc) -> Rc { { let name = prefix.name.clone(); - let name_span = prefix.name_span.clone(); - let type_params = prefix.type_params.clone(); - let params = prefix.params.clone(); - let inferred = prefix.inferred.clone(); - let ctx = prefix.ctx.clone(); - let all_params = v2_rt::concat(type_params, params); - let named_dummy = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: all_params.clone(), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let r = parse_block(&skip_newlines(prefix.tokens.clone()), &ctx); - if has_err(r.err.clone()) { +let name_span = prefix.name_span.clone(); +let type_params = prefix.type_params.clone(); +let params = prefix.params.clone(); +let inferred = prefix.inferred.clone(); +let ctx = prefix.ctx.clone(); +let all_params = v2_rt::concat(type_params, params); +let named_dummy = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: all_params.clone(), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let r = parse_block(&skip_newlines(prefix.tokens.clone()), &ctx); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let body = r.expr.clone(); - let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: all_params.clone(), - inferred: inferred, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: Some(body), - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - Rc::new(ItemResult { - item: item, - tokens: skip_newlines(r.tokens.clone()), - ctx: r.ctx.clone(), - err: None, - }) - } + item: named_dummy, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let body = r.expr.clone(); +let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: all_params.clone(), + inferred: inferred, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: Some(body), + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +Rc::new(ItemResult { + item: item, + tokens: skip_newlines(r.tokens.clone()), + ctx: r.ctx.clone(), + err: None, +}) +} } pub fn parse_func_def(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); - let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let kw = tok_keyword_text(tokens.clone().first().cloned()); - let r = if (kw.clone().as_str() == "func".to_string().as_str()) { - expect( - &tokens, - &Rc::new(ExpectedToken::ExpectKeyword { - text: "func".to_string(), - }), - ) +let dummy = Rc::new(Node { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let kw = tok_keyword_text(tokens.clone().first().cloned()); +let r = if (kw.clone().as_str() == "func".to_string().as_str()) { + expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { + text: "func".to_string(), +})) } else { if (kw.clone().as_str() == "pattern".to_string().as_str()) { - expect( - &tokens, - &Rc::new(ExpectedToken::ExpectKeyword { - text: "pattern".to_string(), - }), - ) + expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { + text: "pattern".to_string(), +})) } else { if (kw.clone().as_str() == "interface".to_string().as_str()) { - expect( - &tokens, - &Rc::new(ExpectedToken::ExpectKeyword { - text: "interface".to_string(), - }), - ) + expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { + text: "interface".to_string(), +})) } else { - expect( - &tokens, - &Rc::new(ExpectedToken::ExpectKeyword { - text: "func".to_string(), - }), - ) + expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { + text: "func".to_string(), +})) } } }; - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let has_uses = (kw.clone().as_str() == "func".to_string().as_str()); - let form = Rc::new(ItemForm { - kind: ItemFormKind::OtherForm, - keyword: kw.clone(), - has_type_params: false, - has_params: true, - has_return_type: true, - return_required: false, - has_uses: has_uses, - body_kind: BodyKind::BlockBody, - }); - let prefix = parse_item_prefix(&r.tokens.clone(), &ctx, &form); - if has_err(prefix.err.clone()) { + item: dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let has_uses = (kw.clone().as_str() == "func".to_string().as_str()); +let form = Rc::new(ItemForm { + kind: ItemFormKind::OtherForm, + keyword: kw.clone(), + has_type_params: false, + has_params: true, + has_return_type: true, + return_required: false, + has_uses: has_uses, + body_kind: BodyKind::BlockBody, +}); +let prefix = parse_item_prefix(&r.tokens.clone(), &ctx, &form); +if has_err(prefix.err.clone()) { return Rc::new(ItemResult { - item: dummy.clone(), - tokens: prefix.tokens.clone(), - ctx: prefix.ctx.clone(), - err: prefix.err.clone(), - }); + item: dummy.clone(), + tokens: prefix.tokens.clone(), + ctx: prefix.ctx.clone(), + err: prefix.err.clone(), +}) } - parse_block_body_from_prefix(&prefix, &start_span) - } +parse_block_body_from_prefix(&prefix, &start_span) +} } -pub fn parse_block_item_after_kw( - tokens: &Rc>>, - ctx: &Rc, - start_span: &Rc, - form: Rc, -) -> Rc { +pub fn parse_block_item_after_kw(tokens: &Rc>>, ctx: &Rc, start_span: &Rc, form: Rc) -> Rc { { let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let r = expect_ident(&tokens); - if has_err(r.err.clone()) { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let r = expect_ident(&tokens); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let name = r.name.clone(); - let name_span = r.span.clone(); - let tokens = r.tokens.clone(); - let named_dummy = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let r = parse_params(&tokens, &ctx); - if has_err(r.err.clone()) { + item: dummy, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let name = r.name.clone(); +let name_span = r.span.clone(); +let tokens = r.tokens.clone(); +let named_dummy = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let r = parse_params(&tokens, &ctx); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let params = r.params.clone(); - let tokens = r.tokens.clone(); - let ctx = r.ctx.clone(); - let ret = parse_optional_inferred(&tokens, ctx.clone()); - if has_err(ret.err.clone()) { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let params = r.params.clone(); +let tokens = r.tokens.clone(); +let ctx = r.ctx.clone(); +let ret = parse_optional_inferred(&tokens, ctx.clone()); +if has_err(ret.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: ret.tokens.clone(), - ctx: ret.ctx.clone(), - err: ret.err.clone(), - }); - } - let inferred = ret.inferred.clone(); - let tokens = ret.tokens.clone(); - let ctx = ret.ctx.clone(); - let uses_r = if form.has_uses.clone() { + item: named_dummy.clone(), + tokens: ret.tokens.clone(), + ctx: ret.ctx.clone(), + err: ret.err.clone(), +}) + } +let inferred = ret.inferred.clone(); +let tokens = ret.tokens.clone(); +let ctx = ret.ctx.clone(); +let uses_r = if form.has_uses.clone() { parse_uses_clause(&skip_newlines(tokens.clone()), ctx.clone()) } else { Rc::new(UsesResult { - uses: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) + uses: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) }; - if has_err(uses_r.err.clone()) { +if has_err(uses_r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: uses_r.tokens.clone(), - ctx: uses_r.ctx.clone(), - err: uses_r.err.clone(), - }); - } - let uses = uses_r.uses.clone(); - let tokens = uses_r.tokens.clone(); - let ctx = uses_r.ctx.clone(); - let r = parse_block(&skip_newlines(tokens.clone()), &ctx); - if has_err(r.err.clone()) { + item: named_dummy.clone(), + tokens: uses_r.tokens.clone(), + ctx: uses_r.ctx.clone(), + err: uses_r.err.clone(), +}) + } +let uses = uses_r.uses.clone(); +let tokens = uses_r.tokens.clone(); +let ctx = uses_r.ctx.clone(); +let r = parse_block(&skip_newlines(tokens.clone()), &ctx); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let body = r.expr.clone(); - let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: params, - inferred: inferred, - return_cardinality: Cardinality::Required, - uses: uses, - body: Some(body), - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - Rc::new(ItemResult { - item: item, - tokens: skip_newlines(r.tokens.clone()), - ctx: r.ctx.clone(), - err: None, - }) - } + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let body = r.expr.clone(); +let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: params, + inferred: inferred, + return_cardinality: Cardinality::Required, + uses: uses, + body: Some(body), + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +Rc::new(ItemResult { + item: item, + tokens: skip_newlines(r.tokens.clone()), + ctx: r.ctx.clone(), + err: None, +}) +} } -pub fn parse_block_body_from_prefix( - prefix: &Rc, - start_span: &Rc, -) -> Rc { +pub fn parse_block_body_from_prefix(prefix: &Rc, start_span: &Rc) -> Rc { { let name = prefix.name.clone(); - let name_span = prefix.name_span.clone(); - let params = prefix.params.clone(); - let inferred = prefix.inferred.clone(); - let uses = prefix.uses.clone(); - let ctx = prefix.ctx.clone(); - let named_dummy = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let r = parse_block(&skip_newlines(prefix.tokens.clone()), &ctx); - if has_err(r.err.clone()) { +let name_span = prefix.name_span.clone(); +let params = prefix.params.clone(); +let inferred = prefix.inferred.clone(); +let uses = prefix.uses.clone(); +let ctx = prefix.ctx.clone(); +let named_dummy = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let r = parse_block(&skip_newlines(prefix.tokens.clone()), &ctx); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let body = r.expr.clone(); - let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: params, - inferred: inferred, - return_cardinality: Cardinality::Required, - uses: uses, - body: Some(body), - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - Rc::new(ItemResult { - item: item, - tokens: skip_newlines(r.tokens.clone()), - ctx: r.ctx.clone(), - err: None, - }) - } + item: named_dummy, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let body = r.expr.clone(); +let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: params, + inferred: inferred, + return_cardinality: Cardinality::Required, + uses: uses, + body: Some(body), + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +Rc::new(ItemResult { + item: item, + tokens: skip_newlines(r.tokens.clone()), + ctx: r.ctx.clone(), + err: None, +}) +} } -pub fn parse_no_body_from_prefix( - prefix: &Rc, - start_span: Rc, -) -> Rc { +pub fn parse_no_body_from_prefix(prefix: &Rc, start_span: Rc) -> Rc { { let item = Rc::new(Node { - name: prefix.name.clone(), - span: start_span, - ident_span: Some(prefix.name_span.clone()), - children: Rc::new(vec![]), - params: prefix.params.clone(), - inferred: prefix.inferred.clone(), - return_cardinality: Cardinality::Required, - uses: prefix.uses.clone(), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - Rc::new(ItemResult { - item: item, - tokens: prefix.tokens.clone(), - ctx: prefix.ctx.clone(), - err: None, - }) - } + name: prefix.name.clone(), + span: start_span, + ident_span: Some(prefix.name_span.clone()), + children: Rc::new(vec![]), + params: prefix.params.clone(), + inferred: prefix.inferred.clone(), + return_cardinality: Cardinality::Required, + uses: prefix.uses.clone(), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +Rc::new(ItemResult { + item: item, + tokens: prefix.tokens.clone(), + ctx: prefix.ctx.clone(), + err: None, +}) +} } pub fn parse_uses_clause(tokens: &Rc>>, ctx: Rc) -> Rc { { let tokens = skip_newlines(tokens.clone()); - let tok = tokens.clone().first().cloned(); - let is_uses = match tok { - Some(t) => { - (is_ident_shape(t.shape.clone()) - && (t.text.clone().as_str() == "uses".to_string().as_str())) - } - None => false, - }; - if is_uses { +let tok = tokens.clone().first().cloned(); +let is_uses = match tok { + Some(t) => (is_ident_shape(t.shape.clone()) && (t.text.clone().as_str() == "uses".to_string().as_str())), + None => false, +}; +if is_uses { { - let r = parse_uses_list( - Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx, - ); - if has_err(r.err.clone()) { - return r.clone(); + let r = parse_uses_list(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx); +if has_err(r.err.clone()) { + return r.clone() } - Rc::new(UsesResult { - uses: r.uses.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } +Rc::new(UsesResult { + uses: r.uses.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } else { Rc::new(UsesResult { - uses: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx, - err: None, - }) + uses: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx, + err: None, +}) } - } +} } pub fn parse_uses_list(tokens: Rc>>, ctx: Rc) -> Rc { parse_uses_list_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_uses_list_acc( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_uses_list_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { let r = parse_uses_entry(&tokens, &ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(UsesResult { - uses: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - acc = v2_rt::rc_list_push(acc.clone(), r.resource_use.clone()); - match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let __tco_0 = __ec.clone(); - let __tco_1 = r.ctx.clone(); - tokens = __tco_0; - ctx = __tco_1; - continue; - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - break Rc::new(UsesResult { - uses: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }); - } - } - } + uses: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +acc = v2_rt::rc_list_push(acc.clone(), r.resource_use.clone()); +match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { { + let __tco_0 = __ec.clone(); +let __tco_1 = r.ctx.clone(); +tokens = __tco_0; +ctx = __tco_1; +continue; +} }, + EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(UsesResult { + uses: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}); }, +} +} } pub fn parse_uses_entry(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); - let dummy = make_resource_use_node( - &"".to_string(), - leaf_type_node(&"".to_string(), &start_span), - start_span.clone(), - start_span.clone(), - ); - let r = expect_ident(&tokens); - if has_err(r.err.clone()) { +let dummy = make_resource_use_node(&"".to_string(), leaf_type_node(&"".to_string(), &start_span), start_span.clone(), start_span.clone()); +let r = expect_ident(&tokens); +if has_err(r.err.clone()) { return Rc::new(ResUseResult { - resource_use: dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let name = r.name.clone(); - let tokens = r.tokens.clone(); - let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectColon)); - if has_err(r2.err.clone()) { - return Rc::new(ResUseResult { - resource_use: dummy.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = parse_type_expr(&r2.tokens.clone(), &ctx); - if has_err(r3.err.clone()) { + resource_use: dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let name = r.name.clone(); +let tokens = r.tokens.clone(); +let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectColon)); +if has_err(r2.err.clone()) { return Rc::new(ResUseResult { - resource_use: dummy.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), - }); - } - match (*eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectLParen))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let ar = parse_resource_config_args(__ec.clone(), r3.ctx.clone()); - if has_err(ar.err.clone()) { - return Rc::new(ResUseResult { - resource_use: dummy.clone(), - tokens: ar.tokens.clone(), - ctx: ar.ctx.clone(), - err: ar.err.clone(), - }); - } - let r4 = expect(&ar.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); - if has_err(r4.err.clone()) { - return Rc::new(ResUseResult { - resource_use: dummy.clone(), - tokens: r4.tokens.clone(), - ctx: ar.ctx.clone(), - err: r4.err.clone(), - }); - } - let res_node = Rc::new(Node { - name: r3.type_expr.clone().name.clone(), - span: r3.type_expr.clone().span.clone(), - ident_span: r3.type_expr.clone().ident_span.clone(), - children: r3.type_expr.clone().children.clone(), - params: r3.type_expr.clone().params.clone(), - inferred: r3.type_expr.clone().inferred.clone(), - return_cardinality: r3.type_expr.clone().return_cardinality.clone(), - uses: r3.type_expr.clone().uses.clone(), - body: r3.type_expr.clone().body.clone(), - connective: r3.type_expr.clone().connective.clone(), - transport: r3.type_expr.clone().transport.clone(), - properties: ar.fields.clone(), - type_annotation: r3.type_expr.clone().type_annotation.clone(), - is_self_recursive: r3.type_expr.clone().is_self_recursive.clone(), - has_non_tail_self_call: r3.type_expr.clone().has_non_tail_self_call.clone(), - match_pattern: r3.type_expr.clone().match_pattern.clone(), - expr_data: r3.type_expr.clone().expr_data.clone(), - ident: None, - }); - let ru = - make_resource_use_node(&name, res_node, start_span.clone(), r.span.clone()); - Rc::new(ResUseResult { - resource_use: ru, - tokens: r4.tokens.clone(), - ctx: ar.ctx.clone(), - err: None, - }) - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - let ru = make_resource_use_node( - &name, - r3.type_expr.clone(), - start_span.clone(), - r.span.clone(), - ); - Rc::new(ResUseResult { - resource_use: ru, - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: None, - }) - } + resource_use: dummy.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) } - } +let r3 = parse_type_expr(&r2.tokens.clone(), &ctx); +if has_err(r3.err.clone()) { + return Rc::new(ResUseResult { + resource_use: dummy.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), +}) + } +match (*eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectLParen))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let ar = parse_resource_config_args(__ec.clone(), r3.ctx.clone()); +if has_err(ar.err.clone()) { + return Rc::new(ResUseResult { + resource_use: dummy.clone(), + tokens: ar.tokens.clone(), + ctx: ar.ctx.clone(), + err: ar.err.clone(), +}) + } +let r4 = expect(&ar.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); +if has_err(r4.err.clone()) { + return Rc::new(ResUseResult { + resource_use: dummy.clone(), + tokens: r4.tokens.clone(), + ctx: ar.ctx.clone(), + err: r4.err.clone(), +}) + } +let res_node = Rc::new(Node { + name: r3.type_expr.clone().name.clone(), + span: r3.type_expr.clone().span.clone(), + ident_span: r3.type_expr.clone().ident_span.clone(), + children: r3.type_expr.clone().children.clone(), + params: r3.type_expr.clone().params.clone(), + inferred: r3.type_expr.clone().inferred.clone(), + return_cardinality: r3.type_expr.clone().return_cardinality.clone(), + uses: r3.type_expr.clone().uses.clone(), + body: r3.type_expr.clone().body.clone(), + connective: r3.type_expr.clone().connective.clone(), + transport: r3.type_expr.clone().transport.clone(), + properties: ar.fields.clone(), + type_annotation: r3.type_expr.clone().type_annotation.clone(), + is_self_recursive: r3.type_expr.clone().is_self_recursive.clone(), + has_non_tail_self_call: r3.type_expr.clone().has_non_tail_self_call.clone(), + match_pattern: r3.type_expr.clone().match_pattern.clone(), + expr_data: r3.type_expr.clone().expr_data.clone(), + ident: None, +}); +let ru = make_resource_use_node(&name, res_node, start_span.clone(), r.span.clone()); +Rc::new(ResUseResult { + resource_use: ru, + tokens: r4.tokens.clone(), + ctx: ar.ctx.clone(), + err: None, +}) +}, + EatResult::EatUnchanged { tokens: __eu, .. } => { + let ru = make_resource_use_node(&name, r3.type_expr.clone(), start_span.clone(), r.span.clone()); +Rc::new(ResUseResult { + resource_use: ru, + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: None, +}) +}, +} +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -5735,981 +4850,768 @@ pub struct ResConfigResult { pub err: Option>, } -pub fn parse_resource_config_args( - tokens: Rc>>, - ctx: Rc, -) -> Rc { +pub fn parse_resource_config_args(tokens: Rc>>, ctx: Rc) -> Rc { parse_resource_config_acc(skip_newlines(tokens), ctx, Rc::new(vec![])) } -pub fn parse_resource_config_acc( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_resource_config_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { if tok_is_rparen(tokens.clone().first().cloned()) { return Rc::new(ResConfigResult { - fields: acc.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); + fields: acc.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) } - let zero_span = make_span(0, 0); - let r = expect_name(&tokens); - if has_err(r.err.clone()) { - return Rc::new(ResConfigResult { - fields: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let field_name = r.name.clone(); - let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); - if has_err(r2.err.clone()) { +let zero_span = make_span(0, 0); +let r = expect_name(&tokens); +if has_err(r.err.clone()) { return Rc::new(ResConfigResult { - fields: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); - if has_err(r3.err.clone()) { + fields: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let field_name = r.name.clone(); +let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); +if has_err(r2.err.clone()) { return Rc::new(ResConfigResult { - fields: Rc::new(vec![]), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), - }); - } - let fi = make_field_init_node(&field_name, r3.expr.clone(), zero_span, r.span.clone()); - acc = v2_rt::rc_list_push(acc.clone(), fi); - match (*eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let __tco_0 = skip_newlines(__ec.clone()); - let __tco_1 = r3.ctx.clone(); - tokens = __tco_0; - ctx = __tco_1; - continue; - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - break Rc::new(ResConfigResult { - fields: acc.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: None, - }); - } + fields: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) } - } -} - -pub fn parse_optional_inferred( - tokens: &Rc>>, - ctx: Rc, -) -> Rc { +let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); +if has_err(r3.err.clone()) { + return Rc::new(ResConfigResult { + fields: Rc::new(vec![]), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), +}) + } +let fi = make_field_init_node(&field_name, r3.expr.clone(), zero_span, r.span.clone()); +acc = v2_rt::rc_list_push(acc.clone(), fi); +match (*eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { { + let __tco_0 = skip_newlines(__ec.clone()); +let __tco_1 = r3.ctx.clone(); +tokens = __tco_0; +ctx = __tco_1; +continue; +} }, + EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(ResConfigResult { + fields: acc.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: None, +}); }, +} +} +} + +pub fn parse_optional_inferred(tokens: &Rc>>, ctx: Rc) -> Rc { match (*eat(&tokens, Rc::new(ExpectedToken::ExpectArrow))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r = parse_type_expr(&__ec, &ctx); - if has_err(r.err.clone()) { - return Rc::new(OptRetResult { - inferred: None, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - Rc::new(OptRetResult { - inferred: Some(Rc::new(InferredNode::Resolved { - node: r.type_expr.clone(), - })), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } - EatResult::EatUnchanged { tokens: __eu, .. } => Rc::new(OptRetResult { - inferred: None, - tokens: tokens.clone(), - ctx: ctx, - err: None, - }), - } + EatResult::EatConsumed { tokens: __ec, .. } => { + let r = parse_type_expr(&__ec, &ctx); +if has_err(r.err.clone()) { + return Rc::new(OptRetResult { + inferred: None, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +Rc::new(OptRetResult { + inferred: Some(Rc::new(InferredNode::Resolved { + node: r.type_expr.clone(), +})), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +}, + EatResult::EatUnchanged { tokens: __eu, .. } => Rc::new(OptRetResult { + inferred: None, + tokens: tokens.clone(), + ctx: ctx, + err: None, +}), +} } pub fn parse_service_def(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); - let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let r = expect( - &tokens, - &Rc::new(ExpectedToken::ExpectKeyword { - text: "service".to_string(), - }), - ); - if has_err(r.err.clone()) { +let dummy = Rc::new(Node { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { + text: "service".to_string(), +})); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); + item: dummy, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - parse_service_after_kw(&r.tokens.clone(), &ctx, &start_span) - } +parse_service_after_kw(&r.tokens.clone(), &ctx, &start_span) +} } -pub fn parse_service_after_kw( - tokens: &Rc>>, - ctx: &Rc, - start_span: &Rc, -) -> Rc { +pub fn parse_service_after_kw(tokens: &Rc>>, ctx: &Rc, start_span: &Rc) -> Rc { { let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let r_ns = expect_name(&tokens); - if has_err(r_ns.err.clone()) { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let r_ns = expect_name(&tokens); +if has_err(r_ns.err.clone()) { return Rc::new(ItemResult { - item: dummy, - tokens: r_ns.tokens.clone(), - ctx: ctx.clone(), - err: r_ns.err.clone(), - }); - } - let namespace_root = r_ns.name.clone(); - let r = parse_dotted_ident_rest( - r_ns.tokens.clone(), - namespace_root.clone(), - r_ns.span.clone(), - ); - let name = r.name.clone(); - let svc_name_span = r.span.clone(); - let named_dummy = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(svc_name_span.clone()), - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectLBrace)); - if has_err(r.err.clone()) { + item: dummy, + tokens: r_ns.tokens.clone(), + ctx: ctx.clone(), + err: r_ns.err.clone(), +}) + } +let namespace_root = r_ns.name.clone(); +let r = parse_dotted_ident_rest(r_ns.tokens.clone(), namespace_root.clone(), r_ns.span.clone()); +let name = r.name.clone(); +let svc_name_span = r.span.clone(); +let named_dummy = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(svc_name_span.clone()), + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectLBrace)); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let tokens = skip_newlines(r.tokens.clone()); - let r = parse_service_body(&tokens, ctx.clone()); - if has_err(r.err.clone()) { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let tokens = skip_newlines(r.tokens.clone()); +let r = parse_service_body(&tokens, ctx.clone()); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let tokens = skip_newlines(r.tokens.clone()); - let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); - if has_err(r2.err.clone()) { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let tokens = skip_newlines(r.tokens.clone()); +let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r2.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), - }); - } - let ns_prop = make_field_init_node( - &"namespace_root".to_string(), - make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: namespace_root.clone(), - }), - }), - Rc::new(vec![]), - None, - start_span.clone(), - ), - start_span.clone(), - no_span(), - ); - let svc_props = match r.config.clone() { - Some(cfg) => service_config_properties( - cfg.endpoint.clone(), - cfg.auth.clone(), - cfg.auth_input.clone(), - cfg.auth_source.clone(), - cfg.rate_limit.clone(), - cfg.retry.clone(), - ), - None => Rc::new(vec![]), - }; - let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(svc_name_span.clone()), - children: r.operations.clone(), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: Some(r.transport.clone()), - properties: v2_rt::concat(Rc::new(vec![ns_prop]), svc_props), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - Rc::new(ItemResult { - item: item, - tokens: skip_newlines(r2.tokens.clone()), - ctx: r.ctx.clone(), - err: None, - }) - } + item: named_dummy.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), +}) + } +let ns_prop = make_field_init_node(&"namespace_root".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: namespace_root.clone(), +}), +}), Rc::new(vec![]), None, start_span.clone()), start_span.clone(), no_span()); +let svc_props = match r.config.clone() { + Some(cfg) => service_config_properties(cfg.endpoint.clone(), cfg.auth.clone(), cfg.auth_input.clone(), cfg.auth_source.clone(), cfg.rate_limit.clone(), cfg.retry.clone()), + None => Rc::new(vec![]), +}; +let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(svc_name_span.clone()), + children: r.operations.clone(), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: Some(r.transport.clone()), + properties: v2_rt::concat(Rc::new(vec![ns_prop]), svc_props), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +Rc::new(ItemResult { + item: item, + tokens: skip_newlines(r2.tokens.clone()), + ctx: r.ctx.clone(), + err: None, +}) +} } -pub fn parse_service_body( - tokens: &Rc>>, - ctx: Rc, -) -> Rc { - parse_service_entries( - tokens.clone(), - ctx, - None, - local_transport_node(token_span(tokens.clone().first().cloned())), - Rc::new(vec![]), - ) -} - -pub fn parse_service_entries( - mut tokens: Rc>>, - mut ctx: Rc, - mut config: Option>, - mut transport: Rc, - mut operations: Rc>>, -) -> Rc { +pub fn parse_service_body(tokens: &Rc>>, ctx: Rc) -> Rc { + parse_service_entries(tokens.clone(), ctx, None, local_transport_node(token_span(tokens.clone().first().cloned())), Rc::new(vec![])) +} + +pub fn parse_service_entries(mut tokens: Rc>>, mut ctx: Rc, mut config: Option>, mut transport: Rc, mut operations: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - let tok = tokens.clone().first().cloned(); - if (tok_is_rbrace(tok.clone()) || tok_is_eof(tok.clone())) { +let tok = tokens.clone().first().cloned(); +if (tok_is_rbrace(tok.clone()) || tok_is_eof(tok.clone())) { break Rc::new(ServiceBodyResult { - config: config.clone(), - transport: transport.clone(), - operations: operations.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } else { + config: config.clone(), + transport: transport.clone(), + operations: operations.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); +} else { let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, - }; - let span = token_span(tok.clone()); - match sh { - Some(TokenShape::ShIdent) => { - let id = tok.clone().unwrap().text.clone(); - if (id.clone().as_str() == "config".to_string().as_str()) { - let r = expect( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - &Rc::new(ExpectedToken::ExpectLBrace), - ); - if has_err(r.err.clone()) { - return Rc::new(ServiceBodyResult { - config: config.clone(), - transport: transport.clone(), - operations: operations.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r2 = parse_service_config_block( - skip_newlines(r.tokens.clone()), - ctx.clone(), - ); - if has_err(r2.err.clone()) { - return Rc::new(ServiceBodyResult { - config: config.clone(), - transport: transport.clone(), - operations: operations.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), - }); - } - tokens = skip_newlines(r2.tokens.clone()); - let r3 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); - if has_err(r3.err.clone()) { - return Rc::new(ServiceBodyResult { - config: config.clone(), - transport: transport.clone(), - operations: operations.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), - }); - } - { - let __tco_0 = r3.tokens.clone(); - let __tco_1 = r2.ctx.clone(); - let __tco_2 = Some(r2.config.clone()); - tokens = __tco_0; - ctx = __tco_1; - config = __tco_2; - continue; - } - } else { - if (id.clone().as_str() == "transport".to_string().as_str()) { - let r = parse_transport_binding( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - &ctx, - ); - if has_err(r.err.clone()) { - return Rc::new(ServiceBodyResult { - config: config.clone(), - transport: transport.clone(), - operations: operations.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - { - let __tco_0 = r.tokens.clone(); - let __tco_1 = r.ctx.clone(); - let __tco_2 = r.transport.clone(); - tokens = __tco_0; - ctx = __tco_1; - transport = __tco_2; - continue; - } - } else { - break Rc::new(ServiceBodyResult { - config: config.clone(), - transport: transport.clone(), - operations: operations.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error( - "expected config, transport, or operation in service block" - .to_string(), - span, - )), - }); - } - } - } - Some(TokenShape::ShKeyword) => { - let kw_text = tok.clone().unwrap().text.clone(); - if (kw_text.as_str() == "operation".to_string().as_str()) { - let r = parse_operation_def(&tokens, &ctx); - if has_err(r.err.clone()) { - return Rc::new(ServiceBodyResult { - config: config.clone(), - transport: transport.clone(), - operations: operations.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - { - let __tco_0 = r.tokens.clone(); - let __tco_1 = r.ctx.clone(); - let __tco_2 = v2_rt::rc_list_push(operations, r.operation.clone()); - tokens = __tco_0; - ctx = __tco_1; - operations = __tco_2; - continue; - } - } else { - break Rc::new(ServiceBodyResult { - config: config.clone(), - transport: transport.clone(), - operations: operations.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error( - "expected config, transport, or operation in service block" - .to_string(), - span, - )), - }); + Some(t) => Some(t.shape.clone()), + None => None, +}; +let span = token_span(tok.clone()); +match sh { + Some(TokenShape::ShIdent) => { let id = tok.clone().unwrap().text.clone(); +if (id.clone().as_str() == "config".to_string().as_str()) { + let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); +if has_err(r.err.clone()) { + return Rc::new(ServiceBodyResult { + config: config.clone(), + transport: transport.clone(), + operations: operations.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let r2 = parse_service_config_block(skip_newlines(r.tokens.clone()), ctx.clone()); +if has_err(r2.err.clone()) { + return Rc::new(ServiceBodyResult { + config: config.clone(), + transport: transport.clone(), + operations: operations.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), +}) + } +tokens = skip_newlines(r2.tokens.clone()); +let r3 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r3.err.clone()) { + return Rc::new(ServiceBodyResult { + config: config.clone(), + transport: transport.clone(), + operations: operations.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), +}) + } +{ + let __tco_0 = r3.tokens.clone(); +let __tco_1 = r2.ctx.clone(); +let __tco_2 = Some(r2.config.clone()); +tokens = __tco_0; +ctx = __tco_1; +config = __tco_2; +continue; +} +} else { + if (id.clone().as_str() == "transport".to_string().as_str()) { + let r = parse_transport_binding(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &ctx); +if has_err(r.err.clone()) { + return Rc::new(ServiceBodyResult { + config: config.clone(), + transport: transport.clone(), + operations: operations.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - } - _ => { +{ + let __tco_0 = r.tokens.clone(); +let __tco_1 = r.ctx.clone(); +let __tco_2 = r.transport.clone(); +tokens = __tco_0; +ctx = __tco_1; +transport = __tco_2; +continue; +} +} else { break Rc::new(ServiceBodyResult { - config: config.clone(), - transport: transport.clone(), - operations: operations.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error( - "expected config, transport, or operation in service block".to_string(), - span, - )), - }); - } - } - } - } + config: config.clone(), + transport: transport.clone(), + operations: operations.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error("expected config, transport, or operation in service block".to_string(), span)), +}); +} +} }, + Some(TokenShape::ShKeyword) => { let kw_text = tok.clone().unwrap().text.clone(); +if (kw_text.as_str() == "operation".to_string().as_str()) { + let r = parse_operation_def(&tokens, &ctx); +if has_err(r.err.clone()) { + return Rc::new(ServiceBodyResult { + config: config.clone(), + transport: transport.clone(), + operations: operations.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +{ + let __tco_0 = r.tokens.clone(); +let __tco_1 = r.ctx.clone(); +let __tco_2 = v2_rt::rc_list_push(operations, r.operation.clone()); +tokens = __tco_0; +ctx = __tco_1; +operations = __tco_2; +continue; +} +} else { + break Rc::new(ServiceBodyResult { + config: config.clone(), + transport: transport.clone(), + operations: operations.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error("expected config, transport, or operation in service block".to_string(), span)), +}); +} }, + _ => { break Rc::new(ServiceBodyResult { + config: config.clone(), + transport: transport.clone(), + operations: operations.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error("expected config, transport, or operation in service block".to_string(), span)), +}); }, +} +} +} } -pub fn parse_service_config_block( - tokens: Rc>>, - ctx: Rc, -) -> Rc { +pub fn parse_service_config_block(tokens: Rc>>, ctx: Rc) -> Rc { parse_config_fields(tokens, ctx, None, None, None, None, None, None) } -pub fn parse_config_fields( - mut tokens: Rc>>, - mut ctx: Rc, - mut endpoint: Option>, - mut auth: Option>, - mut auth_input: Option>, - mut auth_source: Option>, - mut rate_limit: Option>, - mut retry: Option>, -) -> Rc { +pub fn parse_config_fields(mut tokens: Rc>>, mut ctx: Rc, mut endpoint: Option>, mut auth: Option>, mut auth_input: Option>, mut auth_source: Option>, mut rate_limit: Option>, mut retry: Option>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - if (tok_is_rbrace(tokens.clone().first().cloned()) - || tok_is_eof(tokens.clone().first().cloned())) - { +if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { let cfg = Rc::new(ServiceConfig { - endpoint: match endpoint { - Some(e) => e.clone(), - None => make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: "".to_string(), - }), - }), - Rc::new(vec![]), - None, - make_span(0, 0), - ), - }, - auth: auth, - auth_input: auth_input, - auth_source: auth_source, - rate_limit: rate_limit, - retry: retry, - }); - break Rc::new(ConfigResult { - config: cfg, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } else { + endpoint: match endpoint { + Some(e) => e.clone(), + None => make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: "".to_string(), +}), +}), Rc::new(vec![]), None, make_span(0, 0)), +}, + auth: auth, + auth_input: auth_input, + auth_source: auth_source, + rate_limit: rate_limit, + retry: retry, +}); +break Rc::new(ConfigResult { + config: cfg, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); +} else { let dummy_cfg = Rc::new(ServiceConfig { - endpoint: make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: "".to_string(), - }), - }), - Rc::new(vec![]), - None, - make_span(0, 0), - ), - auth: None, - auth_input: None, - auth_source: None, - rate_limit: None, - retry: None, - }); - let r = expect_ident(&tokens); - if has_err(r.err.clone()) { + endpoint: make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: "".to_string(), +}), +}), Rc::new(vec![]), None, make_span(0, 0)), + auth: None, + auth_input: None, + auth_source: None, + rate_limit: None, + retry: None, +}); +let r = expect_ident(&tokens); +if has_err(r.err.clone()) { return Rc::new(ConfigResult { - config: dummy_cfg.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); + config: dummy_cfg.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - let fname = r.name.clone(); - let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); - if has_err(r2.err.clone()) { +let fname = r.name.clone(); +let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); +if has_err(r2.err.clone()) { return Rc::new(ConfigResult { - config: dummy_cfg.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); + config: dummy_cfg.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) } - let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); - if has_err(r3.err.clone()) { +let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); +if has_err(r3.err.clone()) { return Rc::new(ConfigResult { - config: dummy_cfg.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), - }); - } - tokens = r3.tokens.clone(); - ctx = r3.ctx.clone(); - let e = eat(&tokens, Rc::new(ExpectedToken::ExpectComma)); - tokens = match (*e.clone()).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => tokens.clone(), - }; - match fname.as_str() { - "endpoint" => { - let __tco_0 = Some(r3.expr.clone()); - endpoint = __tco_0; - continue; - } - "auth" => { - let __tco_0 = Some(r3.expr.clone()); - auth = __tco_0; - continue; - } - "auth_input" => { - let __tco_0 = Some(r3.expr.clone()); - auth_input = __tco_0; - continue; - } - "auth_source" => { - let __tco_0 = Some(r3.expr.clone()); - auth_source = __tco_0; - continue; - } - "rate_limit" => { - let __tco_0 = Some(r3.expr.clone()); - rate_limit = __tco_0; - continue; - } - "retry" => { - let __tco_0 = Some(r3.expr.clone()); - retry = __tco_0; - continue; - } - _ => { - continue; - } - } - } - } + config: dummy_cfg.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), +}) + } +tokens = r3.tokens.clone(); +ctx = r3.ctx.clone(); +let e = eat(&tokens, Rc::new(ExpectedToken::ExpectComma)); +tokens = match (*e.clone()).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => tokens.clone(), +}; +match fname.as_str() { + "endpoint" => { { + let __tco_0 = Some(r3.expr.clone()); +endpoint = __tco_0; +continue; +} }, + "auth" => { { + let __tco_0 = Some(r3.expr.clone()); +auth = __tco_0; +continue; +} }, + "auth_input" => { { + let __tco_0 = Some(r3.expr.clone()); +auth_input = __tco_0; +continue; +} }, + "auth_source" => { { + let __tco_0 = Some(r3.expr.clone()); +auth_source = __tco_0; +continue; +} }, + "rate_limit" => { { + let __tco_0 = Some(r3.expr.clone()); +rate_limit = __tco_0; +continue; +} }, + "retry" => { { + let __tco_0 = Some(r3.expr.clone()); +retry = __tco_0; +continue; +} }, + _ => { { + continue; +} }, +} +} +} } -pub fn parse_transport_binding( - tokens: &Rc>>, - ctx: &Rc, -) -> Rc { +pub fn parse_transport_binding(tokens: &Rc>>, ctx: &Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); - let dummy = local_transport_node(span); - let tok = tokens.clone().first().cloned(); - let tok_text = match tok.clone() { - Some(t) => t.text.clone(), - None => "".to_string(), - }; - let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, - }; - match sh { - Some(TokenShape::ShIdent) => { - if (tok_text.clone().as_str() == "rest".to_string().as_str()) { +let dummy = local_transport_node(span); +let tok = tokens.clone().first().cloned(); +let tok_text = match tok.clone() { + Some(t) => t.text.clone(), + None => "".to_string(), +}; +let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, +}; +match sh { + Some(TokenShape::ShIdent) => if (tok_text.clone().as_str() == "rest".to_string().as_str()) { + { + let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); +if has_err(r.err.clone()) { + return Rc::new(TransportResult { + transport: dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let r2 = parse_rest_binding_body(skip_newlines(r.tokens.clone()), ctx.clone()); +if has_err(r2.err.clone()) { + return Rc::new(TransportResult { + transport: r2.transport.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r3.err.clone()) { + return Rc::new(TransportResult { + transport: dummy.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), +}) + } +Rc::new(TransportResult { + transport: r2.transport.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: None, +}) +} + } else { + if (tok_text.clone().as_str() == "shell".to_string().as_str()) { + { + let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); +if has_err(r.err.clone()) { + return Rc::new(TransportResult { + transport: dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let r2 = parse_shell_binding_body(skip_newlines(r.tokens.clone()), ctx.clone()); +if has_err(r2.err.clone()) { + return Rc::new(TransportResult { + transport: r2.transport.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r3.err.clone()) { + return Rc::new(TransportResult { + transport: dummy.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), +}) + } +Rc::new(TransportResult { + transport: r2.transport.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: None, +}) +} + } else { + if (tok_text.clone().as_str() == "file".to_string().as_str()) { { - let r = expect( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - &Rc::new(ExpectedToken::ExpectLBrace), - ); - if has_err(r.err.clone()) { + let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); +if has_err(r.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); + transport: dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - let r2 = - parse_rest_binding_body(skip_newlines(r.tokens.clone()), ctx.clone()); - if has_err(r2.err.clone()) { +let r2 = parse_file_binding_body(skip_newlines(r.tokens.clone()), ctx.clone()); +if has_err(r2.err.clone()) { return Rc::new(TransportResult { - transport: r2.transport.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), - }); + transport: r2.transport.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), +}) } - let r3 = expect( - &skip_newlines(r2.tokens.clone()), - &Rc::new(ExpectedToken::ExpectRBrace), - ); - if has_err(r3.err.clone()) { +let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r3.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), - }); + transport: dummy.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), +}) } - Rc::new(TransportResult { - transport: r2.transport.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: None, - }) - } +Rc::new(TransportResult { + transport: r2.transport.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: None, +}) +} } else { - if (tok_text.clone().as_str() == "shell".to_string().as_str()) { - { - let r = expect( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - &Rc::new(ExpectedToken::ExpectLBrace), - ); - if has_err(r.err.clone()) { - return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r2 = parse_shell_binding_body( - skip_newlines(r.tokens.clone()), - ctx.clone(), - ); - if has_err(r2.err.clone()) { - return Rc::new(TransportResult { - transport: r2.transport.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = expect( - &skip_newlines(r2.tokens.clone()), - &Rc::new(ExpectedToken::ExpectRBrace), - ); - if has_err(r3.err.clone()) { - return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), - }); - } - Rc::new(TransportResult { - transport: r2.transport.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: None, - }) - } - } else { - if (tok_text.clone().as_str() == "file".to_string().as_str()) { - { - let r = expect( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - &Rc::new(ExpectedToken::ExpectLBrace), - ); - if has_err(r.err.clone()) { - return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r2 = parse_file_binding_body( - skip_newlines(r.tokens.clone()), - ctx.clone(), - ); - if has_err(r2.err.clone()) { - return Rc::new(TransportResult { - transport: r2.transport.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = expect( - &skip_newlines(r2.tokens.clone()), - &Rc::new(ExpectedToken::ExpectRBrace), - ); - if has_err(r3.err.clone()) { - return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), - }); - } - Rc::new(TransportResult { - transport: r2.transport.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: None, - }) - } - } else { - Rc::new(TransportResult { - transport: dummy.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } - } + Rc::new(TransportResult { + transport: dummy.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) } } - _ => Rc::new(TransportResult { - transport: dummy.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }), - } - } + }, + _ => Rc::new(TransportResult { + transport: dummy.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}), +} +} +} + +pub fn parse_rest_binding_body(tokens: Rc>>, ctx: Rc) -> Rc { + parse_rest_fields(tokens, ctx, None, None, None, None, None, None, Rc::new(vec![])) } -pub fn parse_rest_binding_body( - tokens: Rc>>, - ctx: Rc, -) -> Rc { - parse_rest_fields( - tokens, - ctx, - None, - None, - None, - None, - None, - None, - Rc::new(vec![]), - ) -} - -pub fn parse_rest_fields( - mut tokens: Rc>>, - mut ctx: Rc, - mut base_url: Option>, - mut method: Option>, - mut path_template: Option>, - mut query: Option>, - mut request_body: Option>, - mut response_format: Option>, - mut headers: Rc>>, -) -> Rc { +pub fn parse_rest_fields(mut tokens: Rc>>, mut ctx: Rc, mut base_url: Option>, mut method: Option>, mut path_template: Option>, mut query: Option>, mut request_body: Option>, mut response_format: Option>, mut headers: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - let span = token_span(tokens.clone().first().cloned()); - let dummy = local_transport_node(span.clone()); - if (tok_is_rbrace(tokens.clone().first().cloned()) - || tok_is_eof(tokens.clone().first().cloned())) - { +let span = token_span(tokens.clone().first().cloned()); +let dummy = local_transport_node(span.clone()); +if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { let bu = match base_url { - Some(e) => e.clone(), - None => make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: "".to_string(), - }), - }), - Rc::new(vec![]), - None, - make_span(0, 0), - ), - }; - break Rc::new(TransportResult { - transport: rest_transport_node( - bu, - Rc::new(vec![]), - headers, - method, - path_template, - query, - request_body, - response_format, - span.clone(), - ), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } else { + Some(e) => e.clone(), + None => make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: "".to_string(), +}), +}), Rc::new(vec![]), None, make_span(0, 0)), +}; +break Rc::new(TransportResult { + transport: rest_transport_node(bu, Rc::new(vec![]), headers, method, path_template, query, request_body, response_format, span.clone()), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); +} else { let r = expect_ident(&tokens); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); + transport: dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - let fname = r.name.clone(); - let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); - if has_err(r2.err.clone()) { +let fname = r.name.clone(); +let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); +if has_err(r2.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); + transport: dummy.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) } - let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); - if has_err(r3.err.clone()) { +let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); +if has_err(r3.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), - }); - } - let e = eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); - tokens = match (*e.clone()).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => r3.tokens.clone(), - }; - ctx = r3.ctx.clone(); - if (fname.clone().as_str() == transport_url_key().as_str()) { + transport: dummy.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), +}) + } +let e = eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); +tokens = match (*e.clone()).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => r3.tokens.clone(), +}; +ctx = r3.ctx.clone(); +if (fname.clone().as_str() == transport_url_key().as_str()) { { let __tco_0 = Some(r3.expr.clone()); - base_url = __tco_0; - continue; - } - } else { +base_url = __tco_0; +continue; +} +} else { if (fname.clone().as_str() == transport_method_key().as_str()) { { let __tco_0 = Some(r3.expr.clone()); - method = __tco_0; - continue; - } - } else { +method = __tco_0; +continue; +} +} else { if (fname.clone().as_str() == transport_path_template_key().as_str()) { { let __tco_0 = Some(r3.expr.clone()); - path_template = __tco_0; - continue; - } - } else { +path_template = __tco_0; +continue; +} +} else { if (fname.clone().as_str() == transport_query_key().as_str()) { { let __tco_0 = Some(r3.expr.clone()); - query = __tco_0; - continue; - } - } else { +query = __tco_0; +continue; +} +} else { if (fname.clone().as_str() == transport_body_key().as_str()) { { let __tco_0 = Some(r3.expr.clone()); - request_body = __tco_0; - continue; - } - } else { - if (fname.clone().as_str() - == transport_response_format_key().as_str()) - { +request_body = __tco_0; +continue; +} +} else { + if (fname.clone().as_str() == transport_response_format_key().as_str()) { { let __tco_0 = Some(r3.expr.clone()); - response_format = __tco_0; - continue; - } - } else { - if (fname.clone().as_str() == transport_headers_key().as_str()) - { +response_format = __tco_0; +continue; +} +} else { + if (fname.clone().as_str() == transport_headers_key().as_str()) { let h = match (*r3.expr.clone().expr_data.clone()).clone() { ExprData::ExprRecordLit { .. } => r3.expr.clone().children.clone(), _ => return Rc::new(TransportResult { @@ -6722,1048 +5624,812 @@ pub fn parse_rest_fields( }), "".to_string())), }), }; - { +{ let __tco_0 = h; - headers = __tco_0; - continue; - } - } else { +headers = __tco_0; +continue; +} +} else { { continue; - } - } - } - } - } - } - } - } - } - } +} +} +} +} +} +} +} +} +} +} } -pub fn parse_shell_binding_body( - tokens: Rc>>, - ctx: Rc, -) -> Rc { +pub fn parse_shell_binding_body(tokens: Rc>>, ctx: Rc) -> Rc { parse_shell_fields(tokens, ctx, Rc::new(vec![]), None) } -pub fn parse_shell_fields( - mut tokens: Rc>>, - mut ctx: Rc, - mut argv: Rc>>, - mut stdin: Option>, -) -> Rc { +pub fn parse_shell_fields(mut tokens: Rc>>, mut ctx: Rc, mut argv: Rc>>, mut stdin: Option>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - let span = token_span(tokens.clone().first().cloned()); - let dummy = local_transport_node(span.clone()); - if (tok_is_rbrace(tokens.clone().first().cloned()) - || tok_is_eof(tokens.clone().first().cloned())) - { +let span = token_span(tokens.clone().first().cloned()); +let dummy = local_transport_node(span.clone()); +if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { break Rc::new(TransportResult { - transport: shell_transport_node(argv, Rc::new(vec![]), stdin, &span), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } else { + transport: shell_transport_node(argv, Rc::new(vec![]), stdin, &span), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); +} else { let r = expect_ident(&tokens); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); + transport: dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - let fname = r.name.clone(); - let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); - if has_err(r2.err.clone()) { +let fname = r.name.clone(); +let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); +if has_err(r2.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); + transport: dummy.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) } - if (fname.clone().as_str() == "argv".to_string().as_str()) { +if (fname.clone().as_str() == "argv".to_string().as_str()) { let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectLBracket)); - if has_err(r3.err.clone()) { +if has_err(r3.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: r3.err.clone(), - }); + transport: dummy.clone(), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: r3.err.clone(), +}) } - let r4 = parse_expr_list_until( - r3.tokens.clone(), - ctx.clone(), - Rc::new(ExpectedToken::ExpectRBracket), - ); - if has_err(r4.err.clone()) { +let r4 = parse_expr_list_until(r3.tokens.clone(), ctx.clone(), Rc::new(ExpectedToken::ExpectRBracket)); +if has_err(r4.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r4.tokens.clone(), - ctx: r4.ctx.clone(), - err: r4.err.clone(), - }); + transport: dummy.clone(), + tokens: r4.tokens.clone(), + ctx: r4.ctx.clone(), + err: r4.err.clone(), +}) } - let r5 = expect(&r4.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBracket)); - if has_err(r5.err.clone()) { +let r5 = expect(&r4.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBracket)); +if has_err(r5.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r5.tokens.clone(), - ctx: r4.ctx.clone(), - err: r5.err.clone(), - }); - } - let e = eat(&r5.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); - tokens = match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => r5.tokens.clone(), - }; - { + transport: dummy.clone(), + tokens: r5.tokens.clone(), + ctx: r4.ctx.clone(), + err: r5.err.clone(), +}) + } +let e = eat(&r5.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); +tokens = match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => r5.tokens.clone(), +}; +{ let __tco_0 = r4.ctx.clone(); - let __tco_1 = r4.exprs.clone(); - ctx = __tco_0; - argv = __tco_1; - continue; - } - } else { +let __tco_1 = r4.exprs.clone(); +ctx = __tco_0; +argv = __tco_1; +continue; +} +} else { if (fname.clone().as_str() == transport_stdin_key().as_str()) { let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); - if has_err(r3.err.clone()) { +if has_err(r3.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), - }); + transport: dummy.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), +}) } - let e = eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); - tokens = match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => r3.tokens.clone(), - }; - { +let e = eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); +tokens = match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => r3.tokens.clone(), +}; +{ let __tco_0 = r3.ctx.clone(); - let __tco_1 = Some(r3.expr.clone()); - ctx = __tco_0; - stdin = __tco_1; - continue; - } - } else { +let __tco_1 = Some(r3.expr.clone()); +ctx = __tco_0; +stdin = __tco_1; +continue; +} +} else { let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); - if has_err(r3.err.clone()) { +if has_err(r3.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), - }); + transport: dummy.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), +}) } - let e = eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); - tokens = match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => r3.tokens.clone(), - }; - { +let e = eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); +tokens = match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => r3.tokens.clone(), +}; +{ let __tco_0 = r3.ctx.clone(); - ctx = __tco_0; - continue; - } - } - } - } - } +ctx = __tco_0; +continue; +} +} +} +} +} } -pub fn parse_file_binding_body( - tokens: Rc>>, - ctx: Rc, -) -> Rc { +pub fn parse_file_binding_body(tokens: Rc>>, ctx: Rc) -> Rc { parse_file_fields(tokens, ctx, None) } -pub fn parse_file_fields( - mut tokens: Rc>>, - mut ctx: Rc, - mut base_path: Option>, -) -> Rc { +pub fn parse_file_fields(mut tokens: Rc>>, mut ctx: Rc, mut base_path: Option>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - let span = token_span(tokens.clone().first().cloned()); - let dummy = local_transport_node(span.clone()); - if (tok_is_rbrace(tokens.clone().first().cloned()) - || tok_is_eof(tokens.clone().first().cloned())) - { +let span = token_span(tokens.clone().first().cloned()); +let dummy = local_transport_node(span.clone()); +if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { let bp = match base_path { - Some(e) => e.clone(), - None => make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: "".to_string(), - }), - }), - Rc::new(vec![]), - None, - make_span(0, 0), - ), - }; - break Rc::new(TransportResult { - transport: file_transport_node(bp, span.clone()), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } else { + Some(e) => e.clone(), + None => make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: "".to_string(), +}), +}), Rc::new(vec![]), None, make_span(0, 0)), +}; +break Rc::new(TransportResult { + transport: file_transport_node(bp, span.clone()), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); +} else { let r = expect_ident(&tokens); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); + transport: dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - let fname = r.name.clone(); - let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); - if has_err(r2.err.clone()) { +let fname = r.name.clone(); +let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); +if has_err(r2.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); + transport: dummy.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) } - let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); - if has_err(r3.err.clone()) { +let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); +if has_err(r3.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), - }); - } - let e = eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); - tokens = match (*e.clone()).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => r3.tokens.clone(), - }; - if ((fname.clone().as_str() == "path".to_string().as_str()) - || (fname.clone().as_str() == transport_path_key().as_str())) - { + transport: dummy.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), +}) + } +let e = eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); +tokens = match (*e.clone()).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => r3.tokens.clone(), +}; +if ((fname.clone().as_str() == "path".to_string().as_str()) || (fname.clone().as_str() == transport_path_key().as_str())) { { let __tco_0 = r3.ctx.clone(); - let __tco_1 = Some(r3.expr.clone()); - ctx = __tco_0; - base_path = __tco_1; - continue; - } - } else { +let __tco_1 = Some(r3.expr.clone()); +ctx = __tco_0; +base_path = __tco_1; +continue; +} +} else { { let __tco_0 = r3.ctx.clone(); - ctx = __tco_0; - continue; - } - } - } - } +ctx = __tco_0; +continue; +} +} +} +} } pub fn parse_operation_def(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); - let dummy_op = make_operation_node( - "".to_string(), - None, - Rc::new(vec![]), - Rc::new(vec![]), - Rc::new(vec![]), - Rc::new(vec![]), - Rc::new(vec![]), - Rc::new(vec![]), - None, - &start_span, - &ctx.source_indices.clone(), - ); - let r = expect( - &tokens, - &Rc::new(ExpectedToken::ExpectKeyword { - text: "operation".to_string(), - }), - ); - if has_err(r.err.clone()) { +let dummy_op = make_operation_node("".to_string(), None, Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), None, &start_span, &ctx.source_indices.clone()); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { + text: "operation".to_string(), +})); +if has_err(r.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r = expect_ident(&r.tokens.clone()); - if has_err(r.err.clone()) { + operation: dummy_op.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let r = expect_ident(&r.tokens.clone()); +if has_err(r.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let name = r.name.clone(); - let name_span = r.span.clone(); - let tokens = skip_newlines(r.tokens.clone()); - if tok_is_lbrace(tokens.clone().first().cloned()) { + operation: dummy_op.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let name = r.name.clone(); +let name_span = r.span.clone(); +let tokens = skip_newlines(r.tokens.clone()); +if tok_is_lbrace(tokens.clone().first().cloned()) { parse_operation_v1_body(&tokens, &ctx, name, name_span, &start_span) } else { parse_operation_v2_inline(&tokens, &ctx, name, name_span, &start_span) } - } +} } -pub fn parse_operation_v2_inline( - tokens: &Rc>>, - ctx: &Rc, - name: String, - name_span: Rc, - start_span: &Rc, -) -> Rc { +pub fn parse_operation_v2_inline(tokens: &Rc>>, ctx: &Rc, name: String, name_span: Rc, start_span: &Rc) -> Rc { { - let dummy_op = make_operation_node( - "".to_string(), - None, - Rc::new(vec![]), - Rc::new(vec![]), - Rc::new(vec![]), - Rc::new(vec![]), - Rc::new(vec![]), - Rc::new(vec![]), - None, - &start_span, - &ctx.source_indices.clone(), - ); - let mods_r = parse_operation_modifiers(tokens.clone(), ctx.clone()); - let modifiers = mods_r.modifiers.clone(); - let mod_props = modifiers_to_props(modifiers, start_span.clone()); - let tokens = mods_r.tokens.clone(); - let ctx = mods_r.ctx.clone(); - let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLParen)); - if has_err(r.err.clone()) { + let dummy_op = make_operation_node("".to_string(), None, Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), None, &start_span, &ctx.source_indices.clone()); +let mods_r = parse_operation_modifiers(tokens.clone(), ctx.clone()); +let modifiers = mods_r.modifiers.clone(); +let mod_props = modifiers_to_props(modifiers, start_span.clone()); +let tokens = mods_r.tokens.clone(); +let ctx = mods_r.ctx.clone(); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLParen)); +if has_err(r.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r = parse_field_list(skip_newlines(r.tokens.clone()), ctx.clone()); - if has_err(r.err.clone()) { + operation: dummy_op.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let r = parse_field_list(skip_newlines(r.tokens.clone()), ctx.clone()); +if has_err(r.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let inputs = r.fields.clone(); - let r = expect( - &skip_newlines(r.tokens.clone()), - &Rc::new(ExpectedToken::ExpectRParen), - ); - if has_err(r.err.clone()) { + operation: dummy_op.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let inputs = r.fields.clone(); +let r = expect(&skip_newlines(r.tokens.clone()), &Rc::new(ExpectedToken::ExpectRParen)); +if has_err(r.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let tokens = r.tokens.clone(); - let ret = parse_optional_inferred(&tokens, ctx.clone()); - if has_err(ret.err.clone()) { + operation: dummy_op.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let tokens = r.tokens.clone(); +let ret = parse_optional_inferred(&tokens, ctx.clone()); +if has_err(ret.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: ret.tokens.clone(), - ctx: ret.ctx.clone(), - err: ret.err.clone(), - }); - } - let tokens = ret.tokens.clone(); - let ctx = ret.ctx.clone(); - let outputs = match ret.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - node_inferred_to_outputs(&rt, ctx.source_indices.clone()) - } - _ => Rc::new(vec![]), - }; - let tokens = skip_newlines(tokens.clone()); - let resp_r = parse_optional_response_block(&tokens, &ctx); - if has_err(resp_r.err.clone()) { + operation: dummy_op.clone(), + tokens: ret.tokens.clone(), + ctx: ret.ctx.clone(), + err: ret.err.clone(), +}) + } +let tokens = ret.tokens.clone(); +let ctx = ret.ctx.clone(); +let outputs = match ret.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => node_inferred_to_outputs(&rt, ctx.source_indices.clone()), + _ => Rc::new(vec![]), +}; +let tokens = skip_newlines(tokens.clone()); +let resp_r = parse_optional_response_block(&tokens, &ctx); +if has_err(resp_r.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: resp_r.tokens.clone(), - ctx: resp_r.ctx.clone(), - err: resp_r.err.clone(), - }); - } - let tokens = skip_newlines(resp_r.tokens.clone()); - let ctx = resp_r.ctx.clone(); - let mock_r = parse_optional_mock_response_block(&tokens, &ctx); - if has_err(mock_r.err.clone()) { + operation: dummy_op.clone(), + tokens: resp_r.tokens.clone(), + ctx: resp_r.ctx.clone(), + err: resp_r.err.clone(), +}) + } +let tokens = skip_newlines(resp_r.tokens.clone()); +let ctx = resp_r.ctx.clone(); +let mock_r = parse_optional_mock_response_block(&tokens, &ctx); +if has_err(mock_r.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: mock_r.tokens.clone(), - ctx: mock_r.ctx.clone(), - err: mock_r.err.clone(), - }); - } - let tokens = skip_newlines(mock_r.tokens.clone()); - let ctx = mock_r.ctx.clone(); - let op = make_operation_node( - name, - Some(name_span), - inputs, - outputs, - resp_r.responses.clone(), - mock_r.mocks.clone(), - Rc::new(vec![]), - mod_props, - None, - &start_span, - &ctx.source_indices.clone(), - ); - Rc::new(OpResult { - operation: op, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } + operation: dummy_op.clone(), + tokens: mock_r.tokens.clone(), + ctx: mock_r.ctx.clone(), + err: mock_r.err.clone(), +}) + } +let tokens = skip_newlines(mock_r.tokens.clone()); +let ctx = mock_r.ctx.clone(); +let op = make_operation_node(name, Some(name_span), inputs, outputs, resp_r.responses.clone(), mock_r.mocks.clone(), Rc::new(vec![]), mod_props, None, &start_span, &ctx.source_indices.clone()); +Rc::new(OpResult { + operation: op, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) +} } -pub fn parse_operation_v1_body( - tokens: &Rc>>, - ctx: &Rc, - name: String, - name_span: Rc, - start_span: &Rc, -) -> Rc { +pub fn parse_operation_v1_body(tokens: &Rc>>, ctx: &Rc, name: String, name_span: Rc, start_span: &Rc) -> Rc { { - let dummy_op = make_operation_node( - "".to_string(), - None, - Rc::new(vec![]), - Rc::new(vec![]), - Rc::new(vec![]), - Rc::new(vec![]), - Rc::new(vec![]), - Rc::new(vec![]), - None, - &start_span, - &ctx.source_indices.clone(), - ); - let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBrace)); - if has_err(r.err.clone()) { + let dummy_op = make_operation_node("".to_string(), None, Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), None, &start_span, &ctx.source_indices.clone()); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBrace)); +if has_err(r.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let tokens = skip_newlines(r.tokens.clone()); - let r2 = parse_op_body_entries( - tokens.clone(), - ctx.clone(), - Rc::new(vec![]), - Rc::new(vec![]), - Rc::new(vec![]), - None, - Rc::new(vec![]), - Rc::new(vec![]), - Rc::new(vec![]), - ); - if has_err(r2.err.clone()) { + operation: dummy_op.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let tokens = skip_newlines(r.tokens.clone()); +let r2 = parse_op_body_entries(tokens.clone(), ctx.clone(), Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), None, Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![])); +if has_err(r2.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = expect( - &skip_newlines(r2.tokens.clone()), - &Rc::new(ExpectedToken::ExpectRBrace), - ); - if has_err(r3.err.clone()) { + operation: dummy_op.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r3.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), - }); - } - let op = make_operation_node( - name, - Some(name_span), - r2.inputs.clone(), - r2.outputs.clone(), - r2.response_props.clone(), - r2.mock_props.clone(), - r2.exit_props.clone(), - r2.modifier_props.clone(), - r2.transport.clone(), - &start_span, - &ctx.source_indices.clone(), - ); - Rc::new(OpResult { - operation: op, - tokens: skip_newlines(r3.tokens.clone()), - ctx: r2.ctx.clone(), - err: None, - }) - } + operation: dummy_op.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), +}) + } +let op = make_operation_node(name, Some(name_span), r2.inputs.clone(), r2.outputs.clone(), r2.response_props.clone(), r2.mock_props.clone(), r2.exit_props.clone(), r2.modifier_props.clone(), r2.transport.clone(), &start_span, &ctx.source_indices.clone()); +Rc::new(OpResult { + operation: op, + tokens: skip_newlines(r3.tokens.clone()), + ctx: r2.ctx.clone(), + err: None, +}) +} } -pub fn parse_op_body_entries( - mut tokens: Rc>>, - mut ctx: Rc, - mut inputs: Rc>>, - mut outputs: Rc>>, - mut modifier_props: Rc>>, - mut transport: Option>, - mut exit_props: Rc>>, - mut response_props: Rc>>, - mut mock_props: Rc>>, -) -> Rc { +pub fn parse_op_body_entries(mut tokens: Rc>>, mut ctx: Rc, mut inputs: Rc>>, mut outputs: Rc>>, mut modifier_props: Rc>>, mut transport: Option>, mut exit_props: Rc>>, mut response_props: Rc>>, mut mock_props: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - let tok = tokens.clone().first().cloned(); - let span = token_span(tok.clone()); - let mk_result = Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - if (tok_is_rbrace(tok.clone()) || tok_is_eof(tok.clone())) { +let tok = tokens.clone().first().cloned(); +let span = token_span(tok.clone()); +let mk_result = Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); +if (tok_is_rbrace(tok.clone()) || tok_is_eof(tok.clone())) { break mk_result; - } else { +} else { let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, - }; - match sh { - Some(TokenShape::ShKeyword) => { - let kw_text = tok.clone().unwrap().text.clone(); - if (kw_text.clone().as_str() == "input".to_string().as_str()) { - let r = expect( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - &Rc::new(ExpectedToken::ExpectLBrace), - ); - if has_err(r.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r2 = parse_field_list(skip_newlines(r.tokens.clone()), ctx.clone()); - if has_err(r2.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = expect( - &skip_newlines(r2.tokens.clone()), - &Rc::new(ExpectedToken::ExpectRBrace), - ); - if has_err(r3.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), - }); - } - { - let __tco_0 = r3.tokens.clone(); - let __tco_1 = r2.ctx.clone(); - let __tco_2 = r2.fields.clone(); - tokens = __tco_0; - ctx = __tco_1; - inputs = __tco_2; - continue; - } - } else { - if (kw_text.clone().as_str() == "output".to_string().as_str()) { - let r = expect( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - &Rc::new(ExpectedToken::ExpectLBrace), - ); - if has_err(r.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r2 = parse_field_list(skip_newlines(r.tokens.clone()), ctx.clone()); - if has_err(r2.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = expect( - &skip_newlines(r2.tokens.clone()), - &Rc::new(ExpectedToken::ExpectRBrace), - ); - if has_err(r3.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), - }); - } - { - let __tco_0 = r3.tokens.clone(); - let __tco_1 = r2.ctx.clone(); - let __tco_2 = r2.fields.clone(); - tokens = __tco_0; - ctx = __tco_1; - outputs = __tco_2; - continue; - } - } else { - if (kw_text.clone().as_str() == "idempotent".to_string().as_str()) { - let prop = modifier_to_prop("idempotent".to_string(), &span); - { - let __tco_0 = Rc::new( - tokens.iter().cloned().skip(1 as usize).collect::>(), - ); - let __tco_1 = v2_rt::rc_list_push(modifier_props, prop); - tokens = __tco_0; - modifier_props = __tco_1; - continue; - } - } else { - if (kw_text.clone().as_str() == "readonly".to_string().as_str()) { - let prop = modifier_to_prop("readonly".to_string(), &span); - { - let __tco_0 = Rc::new( - tokens - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - let __tco_1 = v2_rt::rc_list_push(modifier_props, prop); - tokens = __tco_0; - modifier_props = __tco_1; - continue; - } - } else { - if (kw_text.clone().as_str() == "hermetic".to_string().as_str()) - { - let prop = modifier_to_prop("hermetic".to_string(), &span); - { - let __tco_0 = Rc::new( - tokens - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - let __tco_1 = v2_rt::rc_list_push(modifier_props, prop); - tokens = __tco_0; - modifier_props = __tco_1; - continue; - } - } else { - break mk_result; - } - } - } - } + Some(t) => Some(t.shape.clone()), + None => None, +}; +match sh { + Some(TokenShape::ShKeyword) => { let kw_text = tok.clone().unwrap().text.clone(); +if (kw_text.clone().as_str() == "input".to_string().as_str()) { + let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); +if has_err(r.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let r2 = parse_field_list(skip_newlines(r.tokens.clone()), ctx.clone()); +if has_err(r2.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r3.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), +}) + } +{ + let __tco_0 = r3.tokens.clone(); +let __tco_1 = r2.ctx.clone(); +let __tco_2 = r2.fields.clone(); +tokens = __tco_0; +ctx = __tco_1; +inputs = __tco_2; +continue; +} +} else { + if (kw_text.clone().as_str() == "output".to_string().as_str()) { + let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); +if has_err(r.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - } - Some(TokenShape::ShIdent) => { - let id = tok.clone().unwrap().text.clone(); - if (id.clone().as_str() == "transport".to_string().as_str()) { - let r = parse_transport_binding( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - &ctx, - ); - if has_err(r.err.clone()) { +let r2 = parse_field_list(skip_newlines(r.tokens.clone()), ctx.clone()); +if has_err(r2.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r3.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), +}) + } +{ + let __tco_0 = r3.tokens.clone(); +let __tco_1 = r2.ctx.clone(); +let __tco_2 = r2.fields.clone(); +tokens = __tco_0; +ctx = __tco_1; +outputs = __tco_2; +continue; +} +} else { + if (kw_text.clone().as_str() == "idempotent".to_string().as_str()) { + let prop = modifier_to_prop("idempotent".to_string(), &span); +{ + let __tco_0 = Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); +let __tco_1 = v2_rt::rc_list_push(modifier_props, prop); +tokens = __tco_0; +modifier_props = __tco_1; +continue; +} +} else { + if (kw_text.clone().as_str() == "readonly".to_string().as_str()) { + let prop = modifier_to_prop("readonly".to_string(), &span); +{ + let __tco_0 = Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); +let __tco_1 = v2_rt::rc_list_push(modifier_props, prop); +tokens = __tco_0; +modifier_props = __tco_1; +continue; +} +} else { + if (kw_text.clone().as_str() == "hermetic".to_string().as_str()) { + let prop = modifier_to_prop("hermetic".to_string(), &span); +{ + let __tco_0 = Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); +let __tco_1 = v2_rt::rc_list_push(modifier_props, prop); +tokens = __tco_0; +modifier_props = __tco_1; +continue; +} +} else { + break mk_result; +} +} +} +} +} }, + Some(TokenShape::ShIdent) => { let id = tok.clone().unwrap().text.clone(); +if (id.clone().as_str() == "transport".to_string().as_str()) { + let r = parse_transport_binding(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &ctx); +if has_err(r.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +{ + let __tco_0 = r.tokens.clone(); +let __tco_1 = r.ctx.clone(); +let __tco_2 = Some(r.transport.clone()); +tokens = __tco_0; +ctx = __tco_1; +transport = __tco_2; +continue; +} +} else { + if (id.clone().as_str() == "exit".to_string().as_str()) { + let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); +if has_err(r.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let r2 = parse_exit_entries(skip_newlines(r.tokens.clone()), ctx.clone()); +if has_err(r2.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r3.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), +}) + } +{ + let __tco_0 = r3.tokens.clone(); +let __tco_1 = r2.ctx.clone(); +let __tco_2 = r2.entries.clone(); +tokens = __tco_0; +ctx = __tco_1; +exit_props = __tco_2; +continue; +} +} else { + if (id.clone().as_str() == "response".to_string().as_str()) { + let r = parse_optional_response_block(&tokens, &ctx); +if has_err(r.err.clone()) { return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - { +{ let __tco_0 = r.tokens.clone(); - let __tco_1 = r.ctx.clone(); - let __tco_2 = Some(r.transport.clone()); - tokens = __tco_0; - ctx = __tco_1; - transport = __tco_2; - continue; - } - } else { - if (id.clone().as_str() == "exit".to_string().as_str()) { - let r = expect( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - &Rc::new(ExpectedToken::ExpectLBrace), - ); - if has_err(r.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r2 = - parse_exit_entries(skip_newlines(r.tokens.clone()), ctx.clone()); - if has_err(r2.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = expect( - &skip_newlines(r2.tokens.clone()), - &Rc::new(ExpectedToken::ExpectRBrace), - ); - if has_err(r3.err.clone()) { +let __tco_1 = r.ctx.clone(); +let __tco_2 = r.responses.clone(); +tokens = __tco_0; +ctx = __tco_1; +response_props = __tco_2; +continue; +} +} else { + if (id.clone().as_str() == "mock_response".to_string().as_str()) { + let r = parse_optional_mock_response_block(&tokens, &ctx); +if has_err(r.err.clone()) { return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), - }); - } - { - let __tco_0 = r3.tokens.clone(); - let __tco_1 = r2.ctx.clone(); - let __tco_2 = r2.entries.clone(); - tokens = __tco_0; - ctx = __tco_1; - exit_props = __tco_2; - continue; + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - } else { - if (id.clone().as_str() == "response".to_string().as_str()) { - let r = parse_optional_response_block(&tokens, &ctx); - if has_err(r.err.clone()) { +{ + let __tco_0 = r.tokens.clone(); +let __tco_1 = r.ctx.clone(); +let __tco_2 = r.mocks.clone(); +tokens = __tco_0; +ctx = __tco_1; +mock_props = __tco_2; +continue; +} +} else { + if peek_is_colon_after_ident(tokens.clone()) { + let r = expect_ident(&tokens); +if has_err(r.err.clone()) { return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - { - let __tco_0 = r.tokens.clone(); - let __tco_1 = r.ctx.clone(); - let __tco_2 = r.responses.clone(); - tokens = __tco_0; - ctx = __tco_1; - response_props = __tco_2; - continue; +let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); +if has_err(r2.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) } - } else { - if (id.clone().as_str() == "mock_response".to_string().as_str()) { - let r = parse_optional_mock_response_block(&tokens, &ctx); - if has_err(r.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - { - let __tco_0 = r.tokens.clone(); - let __tco_1 = r.ctx.clone(); - let __tco_2 = r.mocks.clone(); - tokens = __tco_0; - ctx = __tco_1; - mock_props = __tco_2; - continue; - } - } else { - if peek_is_colon_after_ident(tokens.clone()) { - let r = expect_ident(&tokens); - if has_err(r.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r2 = expect( - &r.tokens.clone(), - &Rc::new(ExpectedToken::ExpectColon), - ); - if has_err(r2.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); - if has_err(r3.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), - }); - } - { - let __tco_0 = skip_newlines(r3.tokens.clone()); - let __tco_1 = r3.ctx.clone(); - tokens = __tco_0; - ctx = __tco_1; - continue; - } - } else { - break Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error( - format!( - "unexpected '{}' in operation body", - id.clone() - ), - span, - )), - }); - } +let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); +if has_err(r3.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), +}) } - } - } - } - } - _ => { - break Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error( - "unexpected token in operation body".to_string(), - span, - )), - }); - } - } - } - } +{ + let __tco_0 = skip_newlines(r3.tokens.clone()); +let __tco_1 = r3.ctx.clone(); +tokens = __tco_0; +ctx = __tco_1; +continue; +} +} else { + break Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error(format!("unexpected '{}' in operation body", id.clone()), span)), +}); +} +} +} +} +} }, + _ => { break Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error("unexpected token in operation body".to_string(), span)), +}); }, +} +} +} } pub fn modifier_to_prop(name: String, span: &Rc) -> Rc { - make_field_init_node( - &name, - make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitBool { value: true }), - }), - Rc::new(vec![]), - None, - span.clone(), - ), - span.clone(), - span.clone(), - ) -} - -pub fn modifiers_to_props( - modifiers: Rc>, - span: Rc, -) -> Rc>> { - Rc::new({ - let mut __result = Vec::new(); - for m in modifiers.iter().cloned() { - __result.push(match m.clone() { - OperationModifier::Idempotent => modifier_to_prop("idempotent".to_string(), &span), - OperationModifier::Readonly => modifier_to_prop("readonly".to_string(), &span), - OperationModifier::Hermetic => modifier_to_prop("hermetic".to_string(), &span), - }); - } - __result - }) + make_field_init_node(&name, make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitBool { + value: true, +}), +}), Rc::new(vec![]), None, span.clone()), span.clone(), span.clone()) } -pub fn status_expr_to_str( - expr: &Rc, - source_indices: Rc>>, -) -> String { +pub fn modifiers_to_props(modifiers: Rc>, span: Rc) -> Rc>> { + Rc::new({ let mut __result = Vec::new(); for m in modifiers.iter().cloned() { __result.push(match m.clone() { + OperationModifier::Idempotent => modifier_to_prop("idempotent".to_string(), &span), + OperationModifier::Readonly => modifier_to_prop("readonly".to_string(), &span), + OperationModifier::Hermetic => modifier_to_prop("hermetic".to_string(), &span), +}); } __result }) +} + +pub fn status_expr_to_str(expr: &Rc, source_indices: Rc>>) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitInt { value: n, .. } => int_to_string(n.clone()), - LiteralValue::LitStr { value: s, .. } => s.clone(), - _ => "_".to_string(), - }, - ExprData::ExprVar { .. } => expr_var_name_at(expr.clone(), source_indices), - _ => "_".to_string(), - } + ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitInt { value: n, .. } => int_to_string(n.clone()), + LiteralValue::LitStr { value: s, .. } => s.clone(), + _ => "_".to_string(), +}, + ExprData::ExprVar { .. } => expr_var_name_at(expr.clone(), source_indices), + _ => "_".to_string(), +} } pub fn int_to_string(value: i64) -> String { @@ -7772,8 +6438,8 @@ pub fn int_to_string(value: i64) -> String { } else { { let digits = int_to_string_acc(value.clone(), Rc::new(vec![])); - digits.join(&"".to_string()) - } +digits.join(&"".to_string()) +} } } @@ -7781,2828 +6447,2195 @@ pub fn int_to_string_acc(mut value: i64, mut acc: Rc>) -> Rc>(), - ) - .iter() - .cloned() - { - if (p.0.clone() == digit.clone()) { - __result.push(p); - } - } - __result - }) - .first() - .cloned() - { - Some(p) => p.1.clone(), - None => "?".to_string(), - }; - { +let digit = (value.clone() - (rest.clone() * 10)); +let digit_chars = Rc::new(vec!["0".to_string(), "1".to_string(), "2".to_string(), "3".to_string(), "4".to_string(), "5".to_string(), "6".to_string(), "7".to_string(), "8".to_string(), "9".to_string()]); +let ch = match Rc::new({ let mut __result = Vec::new(); for p in Rc::new(digit_chars.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (p.0.clone() == digit.clone()) { __result.push(p); } } __result }).first().cloned() { + Some(p) => p.1.clone(), + None => "?".to_string(), +}; +{ let __tco_0 = rest.clone(); - let __tco_1 = v2_rt::concat(Rc::new(vec![ch]), acc); - value = __tco_0; - acc = __tco_1; - continue; - } - } - } +let __tco_1 = v2_rt::concat(Rc::new(vec![ch]), acc); +value = __tco_0; +acc = __tco_1; +continue; +} +} +} } pub fn first_child_or_self(n: Rc) -> Rc { match n.children.clone().first().cloned() { - Some(ch) => ch.clone(), - None => n.clone(), - } + Some(ch) => ch.clone(), + None => n.clone(), +} } pub fn last_child_or_self(n: Rc) -> Rc { match n.children.clone().last().cloned() { - Some(ch) => ch.clone(), - None => n.clone(), - } + Some(ch) => ch.clone(), + None => n.clone(), +} } -pub fn node_to_name_str( - n: &Rc, - source_indices: &Rc>>, -) -> String { +pub fn node_to_name_str(n: &Rc, source_indices: &Rc>>) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); - let effective_n = if is_optional.clone() { - with_required_cardinality(&n) - } else { - n.clone() - }; - let opt_prefix = if is_optional.clone() { - "Optional_".to_string() - } else { - "".to_string() - }; - let effective_name = authored_name_at(source_indices.clone(), &effective_n); - let is_keyed_container = (is_container_type(effective_name.clone()) - && ((effective_n.children.clone().len() as i64) == 2)); - if is_keyed_container { - match effective_n.children.clone().last().cloned() { - Some(ch) => v2_rt::concat( - v2_rt::concat( - v2_rt::concat(opt_prefix, effective_name.clone()), - "_".to_string(), - ), - node_to_name_str(&ch, &source_indices), - ), - None => v2_rt::concat(opt_prefix, effective_name.clone()), - } - } else { - if (effective_n.type_annotation.clone() != None) { - match effective_n.children.clone().first().cloned() { - Some(ch) => v2_rt::concat(opt_prefix, node_to_name_str(&ch, &source_indices)), - None => v2_rt::concat(opt_prefix, effective_name.clone()), - } + { + let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); +let effective_n = if is_optional.clone() { + with_required_cardinality(&n) + } else { + n.clone() + }; +let opt_prefix = if is_optional.clone() { + "Optional_".to_string() + } else { + "".to_string() + }; +let effective_name = authored_name_at(source_indices.clone(), &effective_n); +let is_keyed_container = (is_container_type(effective_name.clone()) && ((effective_n.children.clone().len() as i64) == 2)); +if is_keyed_container { + match effective_n.children.clone().last().cloned() { + Some(ch) => v2_rt::concat(v2_rt::concat(v2_rt::concat(opt_prefix, effective_name.clone()), "_".to_string()), node_to_name_str(&ch, &source_indices)), + None => v2_rt::concat(opt_prefix, effective_name.clone()), +} } else { - if is_container_type(effective_name.clone()) { + if (effective_n.type_annotation.clone() != None) { match effective_n.children.clone().first().cloned() { - Some(ch) => v2_rt::concat( - v2_rt::concat(opt_prefix, "List_".to_string()), - node_to_name_str(&ch, &source_indices), - ), - None => v2_rt::concat(opt_prefix, effective_name.clone()), - } + Some(ch) => v2_rt::concat(opt_prefix, node_to_name_str(&ch, &source_indices)), + None => v2_rt::concat(opt_prefix, effective_name.clone()), +} } else { - if (effective_n.ident_span.clone() == None) { - { - let is_conj = (effective_n.connective.clone() == Connective::Conj); - let is_disj = (effective_n.connective.clone() == Connective::Disj); - if is_conj { - v2_rt::concat(opt_prefix, "Record".to_string()) - } else { - if is_disj { - v2_rt::concat(opt_prefix, "Union".to_string()) + if is_container_type(effective_name.clone()) { + match effective_n.children.clone().first().cloned() { + Some(ch) => v2_rt::concat(v2_rt::concat(opt_prefix, "List_".to_string()), node_to_name_str(&ch, &source_indices)), + None => v2_rt::concat(opt_prefix, effective_name.clone()), +} + } else { + if (effective_n.ident_span.clone() == None) { + { + let is_conj = (effective_n.connective.clone() == Connective::Conj); +let is_disj = (effective_n.connective.clone() == Connective::Disj); +if is_conj { + v2_rt::concat(opt_prefix, "Record".to_string()) } else { - v2_rt::concat(opt_prefix, effective_name.clone()) + if is_disj { + v2_rt::concat(opt_prefix, "Union".to_string()) + } else { + v2_rt::concat(opt_prefix, effective_name.clone()) + } } - } +} + } else { + v2_rt::concat(opt_prefix, effective_name.clone()) } - } else { - v2_rt::concat(opt_prefix, effective_name.clone()) } } } - } +} }) } -pub fn parse_exit_entries( - tokens: Rc>>, - ctx: Rc, -) -> Rc { +pub fn parse_exit_entries(tokens: Rc>>, ctx: Rc) -> Rc { parse_exit_entries_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_exit_entries_acc( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_exit_entries_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - if (tok_is_rbrace(tokens.clone().first().cloned()) - || tok_is_eof(tokens.clone().first().cloned())) - { +if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { break Rc::new(ExitEntriesResult { - entries: acc, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } else { + entries: acc, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); +} else { let r = parse_status_pattern(&tokens, &ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ExitEntriesResult { - entries: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let code = r.expr.clone(); - let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectFatArrow)); - if has_err(r2.err.clone()) { + entries: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let code = r.expr.clone(); +let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectFatArrow)); +if has_err(r2.err.clone()) { return Rc::new(ExitEntriesResult { - entries: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = parse_type_expr(&r2.tokens.clone(), &r.ctx.clone()); - if has_err(r3.err.clone()) { + entries: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = parse_type_expr(&r2.tokens.clone(), &r.ctx.clone()); +if has_err(r3.err.clone()) { return Rc::new(ExitEntriesResult { - entries: Rc::new(vec![]), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), - }); - } - let desc_tok = r3.tokens.clone().first().cloned(); - let desc_sh = match desc_tok { - Some(t) => Some(t.shape.clone()), - None => None, - }; - let desc_tokens = match desc_sh { - Some(TokenShape::ShLitStr) => Rc::new( - r3.tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - _ => r3.tokens.clone(), - }; - let code_str = status_expr_to_str(&code, ctx.source_indices.clone()); - let type_name = node_to_name_str(&r3.type_expr.clone(), &ctx.source_indices.clone()); - let prop_name = v2_rt::concat("exit_".to_string(), code_str); - let entry = make_field_init_node( - &prop_name, - make_named_expr_node( - &type_name, - Rc::new(ExprData::ExprVar { binding_kind: None }), - Rc::new(vec![]), - None, - r3.type_expr.clone().span.clone(), - r3.type_expr.clone().span.clone(), - ), - r3.type_expr.clone().span.clone(), - no_span(), - ); - let e = eat(&desc_tokens, Rc::new(ExpectedToken::ExpectComma)); - tokens = skip_newlines(match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => desc_tokens.clone(), - }); - { + entries: Rc::new(vec![]), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), +}) + } +let desc_tok = r3.tokens.clone().first().cloned(); +let desc_sh = match desc_tok { + Some(t) => Some(t.shape.clone()), + None => None, +}; +let desc_tokens = match desc_sh { + Some(TokenShape::ShLitStr) => Rc::new(r3.tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + _ => r3.tokens.clone(), +}; +let code_str = status_expr_to_str(&code, ctx.source_indices.clone()); +let type_name = node_to_name_str(&r3.type_expr.clone(), &ctx.source_indices.clone()); +let prop_name = v2_rt::concat("exit_".to_string(), code_str); +let entry = make_field_init_node(&prop_name, make_named_expr_node(&type_name, Rc::new(ExprData::ExprVar { + binding_kind: None, +}), Rc::new(vec![]), None, r3.type_expr.clone().span.clone(), r3.type_expr.clone().span.clone()), r3.type_expr.clone().span.clone(), no_span()); +let e = eat(&desc_tokens, Rc::new(ExpectedToken::ExpectComma)); +tokens = skip_newlines(match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => desc_tokens.clone(), +}); +{ let __tco_0 = r3.ctx.clone(); - let __tco_1 = v2_rt::rc_list_push(acc, entry); - ctx = __tco_0; - acc = __tco_1; - continue; - } - } - } +let __tco_1 = v2_rt::rc_list_push(acc, entry); +ctx = __tco_0; +acc = __tco_1; +continue; +} +} +} } -pub fn parse_operation_modifiers( - tokens: Rc>>, - ctx: Rc, -) -> Rc { +pub fn parse_operation_modifiers(tokens: Rc>>, ctx: Rc) -> Rc { parse_operation_modifiers_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_operation_modifiers_acc( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>, -) -> Rc { +pub fn parse_operation_modifiers_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>) -> Rc { loop { let kw = tok_keyword_text(tokens.clone().first().cloned()); - if (kw.clone().as_str() == "idempotent".to_string().as_str()) { +if (kw.clone().as_str() == "idempotent".to_string().as_str()) { { let __tco_0 = Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); - let __tco_1 = v2_rt::rc_list_push(acc, OperationModifier::Idempotent); - tokens = __tco_0; - acc = __tco_1; - continue; - } - } else { +let __tco_1 = v2_rt::rc_list_push(acc, OperationModifier::Idempotent); +tokens = __tco_0; +acc = __tco_1; +continue; +} +} else { if (kw.clone().as_str() == "readonly".to_string().as_str()) { { - let __tco_0 = - Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); - let __tco_1 = v2_rt::rc_list_push(acc, OperationModifier::Readonly); - tokens = __tco_0; - acc = __tco_1; - continue; - } - } else { + let __tco_0 = Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); +let __tco_1 = v2_rt::rc_list_push(acc, OperationModifier::Readonly); +tokens = __tco_0; +acc = __tco_1; +continue; +} +} else { if (kw.clone().as_str() == "hermetic".to_string().as_str()) { { - let __tco_0 = - Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); - let __tco_1 = v2_rt::rc_list_push(acc, OperationModifier::Hermetic); - tokens = __tco_0; - acc = __tco_1; - continue; - } - } else { + let __tco_0 = Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); +let __tco_1 = v2_rt::rc_list_push(acc, OperationModifier::Hermetic); +tokens = __tco_0; +acc = __tco_1; +continue; +} +} else { break Rc::new(ModsResult { - modifiers: acc, - tokens: tokens.clone(), - ctx: ctx, - err: None, - }); - } - } - } - } + modifiers: acc, + tokens: tokens.clone(), + ctx: ctx, + err: None, +}); +} +} +} +} } pub fn parse_status_pattern(tokens: &Rc>>, ctx: &Rc) -> Rc { { let tok = tokens.clone().first().cloned(); - let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, - }; - let span = token_span(tok.clone()); - match sh { - Some(TokenShape::ShLitInt) => { - let n_opt = v2_rt::parse_int(tok.clone().unwrap().text.clone()); - let n = match n_opt { - Some(v) => v.clone(), - None => { - return Rc::new(ExprResult { - expr: make_expr_error_node( - ExprErrorKind::InternalExprError, - &v2_rt::concat( - v2_rt::concat( - "internal: ShLitInt token text not parseable as int: '" - .to_string(), - tok.clone().unwrap().text.clone(), - ), - "'".to_string(), - ), - &span, - ), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } - }; - let next_tok = tokens.clone().get(1 as usize).cloned(); - match next_tok { - Some(t) => { - if (is_ident_shape(t.shape.clone()) - && (t.text.clone().as_str() == "xx".to_string().as_str())) - { - Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: format!("{}xx", n), - }), - }), - Rc::new(vec![]), - None, - span.clone(), - ), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(2 as usize) - .collect::>(), - ), - ctx: ctx.clone(), - err: None, - }) - } else { - Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitInt { value: n }), - }), - Rc::new(vec![]), - None, - span.clone(), - ), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx: ctx.clone(), - err: None, - }) - } - } - None => Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitInt { value: n }), - }), - Rc::new(vec![]), - None, - span.clone(), - ), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx: ctx.clone(), - err: None, - }), - } - } - Some(TokenShape::ShIdent) => { - let id = tok.clone().unwrap().text.clone(); +let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, +}; +let span = token_span(tok.clone()); +match sh { + Some(TokenShape::ShLitInt) => { + let n_opt = v2_rt::parse_int(tok.clone().unwrap().text.clone()); +let n = match n_opt { + Some(v) => v.clone(), + None => return Rc::new(ExprResult { + expr: make_expr_error_node(ExprErrorKind::InternalExprError, &v2_rt::concat(v2_rt::concat("internal: ShLitInt token text not parseable as int: '".to_string(), tok.clone().unwrap().text.clone()), "'".to_string()), &span), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}), +}; +let next_tok = tokens.clone().get(1 as usize).cloned(); +match next_tok { + Some(t) => if (is_ident_shape(t.shape.clone()) && (t.text.clone().as_str() == "xx".to_string().as_str())) { Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { value: id }), - }), - Rc::new(vec![]), - None, - span.clone(), - ), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx: ctx.clone(), - err: None, - }) - } - _ => Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: "_".to_string(), - }), - }), - Rc::new(vec![]), - None, - span.clone(), - ), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx: ctx.clone(), - err: None, - }), - } - } + expr: make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: format!("{}xx", n), +}), +}), Rc::new(vec![]), None, span.clone()), + tokens: Rc::new(tokens.clone().iter().cloned().skip(2 as usize).collect::>()), + ctx: ctx.clone(), + err: None, +}) + } else { + Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitInt { + value: n, +}), +}), Rc::new(vec![]), None, span.clone()), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + ctx: ctx.clone(), + err: None, +}) + }, + None => Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitInt { + value: n, +}), +}), Rc::new(vec![]), None, span.clone()), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + ctx: ctx.clone(), + err: None, +}), +} +}, + Some(TokenShape::ShIdent) => { + let id = tok.clone().unwrap().text.clone(); +Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: id, +}), +}), Rc::new(vec![]), None, span.clone()), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + ctx: ctx.clone(), + err: None, +}) +}, + _ => Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: "_".to_string(), +}), +}), Rc::new(vec![]), None, span.clone()), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + ctx: ctx.clone(), + err: None, +}), +} +} } -pub fn parse_optional_response_block( - tokens: &Rc>>, - ctx: &Rc, -) -> Rc { +pub fn parse_optional_response_block(tokens: &Rc>>, ctx: &Rc) -> Rc { { let tok = tokens.clone().first().cloned(); - let is_response = match tok { - Some(t) => { - (is_ident_shape(t.shape.clone()) - && (t.text.clone().as_str() == "response".to_string().as_str())) - } - None => false, - }; - if is_response { +let is_response = match tok { + Some(t) => (is_ident_shape(t.shape.clone()) && (t.text.clone().as_str() == "response".to_string().as_str())), + None => false, +}; +if is_response { { - let r = expect( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - &Rc::new(ExpectedToken::ExpectLBrace), - ); - if has_err(r.err.clone()) { + let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); +if has_err(r.err.clone()) { return Rc::new(ResponsesResult { - responses: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); + responses: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - let r2 = parse_response_entries(skip_newlines(r.tokens.clone()), ctx.clone()); - if has_err(r2.err.clone()) { +let r2 = parse_response_entries(skip_newlines(r.tokens.clone()), ctx.clone()); +if has_err(r2.err.clone()) { return Rc::new(ResponsesResult { - responses: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = expect( - &skip_newlines(r2.tokens.clone()), - &Rc::new(ExpectedToken::ExpectRBrace), - ); - if has_err(r3.err.clone()) { + responses: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r3.err.clone()) { return Rc::new(ResponsesResult { - responses: Rc::new(vec![]), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), - }); - } - Rc::new(ResponsesResult { - responses: r2.entries.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: None, - }) - } + responses: Rc::new(vec![]), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), +}) + } +Rc::new(ResponsesResult { + responses: r2.entries.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: None, +}) +} } else { Rc::new(ResponsesResult { - responses: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) + responses: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) } - } +} } -pub fn parse_response_entries( - tokens: Rc>>, - ctx: Rc, -) -> Rc { +pub fn parse_response_entries(tokens: Rc>>, ctx: Rc) -> Rc { parse_response_entries_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_response_entries_acc( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_response_entries_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - if (tok_is_rbrace(tokens.clone().first().cloned()) - || tok_is_eof(tokens.clone().first().cloned())) - { +if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { break Rc::new(RespEntriesResult { - entries: acc, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } else { + entries: acc, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); +} else { let r = parse_status_pattern(&tokens, &ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(RespEntriesResult { - entries: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let status = r.expr.clone(); - let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectFatArrow)); - if has_err(r2.err.clone()) { + entries: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let status = r.expr.clone(); +let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectFatArrow)); +if has_err(r2.err.clone()) { return Rc::new(RespEntriesResult { - entries: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = parse_type_expr(&r2.tokens.clone(), &r.ctx.clone()); - if has_err(r3.err.clone()) { + entries: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = parse_type_expr(&r2.tokens.clone(), &r.ctx.clone()); +if has_err(r3.err.clone()) { return Rc::new(RespEntriesResult { - entries: Rc::new(vec![]), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), - }); - } - let status_str = status_expr_to_str(&status, ctx.source_indices.clone()); - let type_name = node_to_name_str(&r3.type_expr.clone(), &ctx.source_indices.clone()); - let prop_name = v2_rt::concat("response_".to_string(), status_str); - let entry = make_field_init_node( - &prop_name, - make_named_expr_node( - &type_name, - Rc::new(ExprData::ExprVar { binding_kind: None }), - Rc::new(vec![]), - None, - r3.type_expr.clone().span.clone(), - r3.type_expr.clone().span.clone(), - ), - r3.type_expr.clone().span.clone(), - no_span(), - ); - let e = eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); - tokens = skip_newlines(match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => r3.tokens.clone(), - }); - { + entries: Rc::new(vec![]), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), +}) + } +let status_str = status_expr_to_str(&status, ctx.source_indices.clone()); +let type_name = node_to_name_str(&r3.type_expr.clone(), &ctx.source_indices.clone()); +let prop_name = v2_rt::concat("response_".to_string(), status_str); +let entry = make_field_init_node(&prop_name, make_named_expr_node(&type_name, Rc::new(ExprData::ExprVar { + binding_kind: None, +}), Rc::new(vec![]), None, r3.type_expr.clone().span.clone(), r3.type_expr.clone().span.clone()), r3.type_expr.clone().span.clone(), no_span()); +let e = eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); +tokens = skip_newlines(match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => r3.tokens.clone(), +}); +{ let __tco_0 = r3.ctx.clone(); - let __tco_1 = v2_rt::rc_list_push(acc, entry); - ctx = __tco_0; - acc = __tco_1; - continue; - } - } - } +let __tco_1 = v2_rt::rc_list_push(acc, entry); +ctx = __tco_0; +acc = __tco_1; +continue; +} +} +} } -pub fn parse_optional_mock_response_block( - tokens: &Rc>>, - ctx: &Rc, -) -> Rc { +pub fn parse_optional_mock_response_block(tokens: &Rc>>, ctx: &Rc) -> Rc { { let tok = tokens.clone().first().cloned(); - let is_mock = match tok { - Some(t) => { - (is_ident_shape(t.shape.clone()) - && (t.text.clone().as_str() == "mock_response".to_string().as_str())) - } - None => false, - }; - if is_mock { +let is_mock = match tok { + Some(t) => (is_ident_shape(t.shape.clone()) && (t.text.clone().as_str() == "mock_response".to_string().as_str())), + None => false, +}; +if is_mock { { - let r = expect( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - &Rc::new(ExpectedToken::ExpectLBrace), - ); - if has_err(r.err.clone()) { + let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); +if has_err(r.err.clone()) { return Rc::new(MocksResult { - mocks: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); + mocks: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - let r2 = parse_mock_response_entries(skip_newlines(r.tokens.clone()), ctx.clone()); - if has_err(r2.err.clone()) { +let r2 = parse_mock_response_entries(skip_newlines(r.tokens.clone()), ctx.clone()); +if has_err(r2.err.clone()) { return Rc::new(MocksResult { - mocks: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = expect( - &skip_newlines(r2.tokens.clone()), - &Rc::new(ExpectedToken::ExpectRBrace), - ); - if has_err(r3.err.clone()) { + mocks: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r3.err.clone()) { return Rc::new(MocksResult { - mocks: Rc::new(vec![]), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), - }); - } - Rc::new(MocksResult { - mocks: r2.entries.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: None, - }) - } + mocks: Rc::new(vec![]), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), +}) + } +Rc::new(MocksResult { + mocks: r2.entries.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: None, +}) +} } else { Rc::new(MocksResult { - mocks: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) + mocks: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) } - } +} } -pub fn parse_mock_response_entries( - tokens: Rc>>, - ctx: Rc, -) -> Rc { +pub fn parse_mock_response_entries(tokens: Rc>>, ctx: Rc) -> Rc { parse_mock_response_entries_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_mock_response_entries_acc( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_mock_response_entries_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - if (tok_is_rbrace(tokens.clone().first().cloned()) - || tok_is_eof(tokens.clone().first().cloned())) - { +if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { break Rc::new(MockEntriesResult { - entries: acc, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } else { + entries: acc, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); +} else { let r = parse_status_pattern(&tokens, &ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(MockEntriesResult { - entries: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let status = r.expr.clone(); - let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectFatArrow)); - if has_err(r2.err.clone()) { + entries: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let status = r.expr.clone(); +let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectFatArrow)); +if has_err(r2.err.clone()) { return Rc::new(MockEntriesResult { - entries: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = parse_expr(r2.tokens.clone(), r.ctx.clone()); - if has_err(r3.err.clone()) { + entries: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = parse_expr(r2.tokens.clone(), r.ctx.clone()); +if has_err(r3.err.clone()) { return Rc::new(MockEntriesResult { - entries: Rc::new(vec![]), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), - }); - } - let body = r3.expr.clone(); - let desc_tok = r3.tokens.clone().first().cloned(); - let desc_sh = match desc_tok { - Some(t) => Some(t.shape.clone()), - None => None, - }; - let desc_tokens = match desc_sh { - Some(TokenShape::ShLitStr) => Rc::new( - r3.tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - _ => r3.tokens.clone(), - }; - let status_str = status_expr_to_str(&status, ctx.source_indices.clone()); - let prop_name = v2_rt::concat("mock_".to_string(), status_str); - let entry = make_field_init_node(&prop_name, body, make_span(0, 0), make_span(0, 0)); - let e = eat(&desc_tokens, Rc::new(ExpectedToken::ExpectComma)); - tokens = skip_newlines(match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => desc_tokens.clone(), - }); - { + entries: Rc::new(vec![]), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), +}) + } +let body = r3.expr.clone(); +let desc_tok = r3.tokens.clone().first().cloned(); +let desc_sh = match desc_tok { + Some(t) => Some(t.shape.clone()), + None => None, +}; +let desc_tokens = match desc_sh { + Some(TokenShape::ShLitStr) => Rc::new(r3.tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + _ => r3.tokens.clone(), +}; +let status_str = status_expr_to_str(&status, ctx.source_indices.clone()); +let prop_name = v2_rt::concat("mock_".to_string(), status_str); +let entry = make_field_init_node(&prop_name, body, make_span(0, 0), make_span(0, 0)); +let e = eat(&desc_tokens, Rc::new(ExpectedToken::ExpectComma)); +tokens = skip_newlines(match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => desc_tokens.clone(), +}); +{ let __tco_0 = r3.ctx.clone(); - let __tco_1 = v2_rt::rc_list_push(acc, entry); - ctx = __tco_0; - acc = __tco_1; - continue; - } - } - } +let __tco_1 = v2_rt::rc_list_push(acc, entry); +ctx = __tco_0; +acc = __tco_1; +continue; +} +} +} } pub fn parse_resource_def(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); - let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let r = expect( - &tokens, - &Rc::new(ExpectedToken::ExpectKeyword { - text: "resource".to_string(), - }), - ); - if has_err(r.err.clone()) { +let dummy = Rc::new(Node { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { + text: "resource".to_string(), +})); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); + item: dummy, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - parse_resource_after_kw(r.tokens.clone(), &ctx, &start_span) - } +parse_resource_after_kw(r.tokens.clone(), &ctx, &start_span) +} } -pub fn parse_resource_after_kw( - tokens: Rc>>, - ctx: &Rc, - start_span: &Rc, -) -> Rc { +pub fn parse_resource_after_kw(tokens: Rc>>, ctx: &Rc, start_span: &Rc) -> Rc { { let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let r = expect_ident(&tokens); - if has_err(r.err.clone()) { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let r = expect_ident(&tokens); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let name = r.name.clone(); - let name_span = r.span.clone(); - let named_dummy = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectLBrace)); - if has_err(r.err.clone()) { + item: dummy, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let name = r.name.clone(); +let name_span = r.span.clone(); +let named_dummy = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectLBrace)); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r = parse_resource_entries( - skip_newlines(r.tokens.clone()), - ctx.clone(), - Rc::new(vec![]), - Rc::new(vec![]), - ); - if has_err(r.err.clone()) { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let r = parse_resource_entries(skip_newlines(r.tokens.clone()), ctx.clone(), Rc::new(vec![]), Rc::new(vec![])); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let r2 = expect( - &skip_newlines(r.tokens.clone()), - &Rc::new(ExpectedToken::ExpectRBrace), - ); - if has_err(r2.err.clone()) { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let r2 = expect(&skip_newlines(r.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r2.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), - }); - } - let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: r.capabilities.clone(), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: r.properties.clone(), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - Rc::new(ItemResult { - item: item, - tokens: skip_newlines(r2.tokens.clone()), - ctx: r.ctx.clone(), - err: None, - }) - } + item: named_dummy.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), +}) + } +let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: r.capabilities.clone(), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: r.properties.clone(), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +Rc::new(ItemResult { + item: item, + tokens: skip_newlines(r2.tokens.clone()), + ctx: r.ctx.clone(), + err: None, +}) +} } -pub fn parse_resource_entries( - mut tokens: Rc>>, - mut ctx: Rc, - mut properties: Rc>>, - mut capabilities: Rc>>, -) -> Rc { +pub fn parse_resource_entries(mut tokens: Rc>>, mut ctx: Rc, mut properties: Rc>>, mut capabilities: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - let tok = tokens.clone().first().cloned(); - let span = token_span(tok.clone()); - if (tok_is_rbrace(tok.clone()) || tok_is_eof(tok.clone())) { +let tok = tokens.clone().first().cloned(); +let span = token_span(tok.clone()); +if (tok_is_rbrace(tok.clone()) || tok_is_eof(tok.clone())) { break Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } else { + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); +} else { let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, - }; - match sh { - Some(TokenShape::ShKeyword) => { - let kw_text = tok_keyword_text(tok.clone()); - if (kw_text.clone().as_str() == "capability".to_string().as_str()) { - let r = parse_capability(&tokens, &ctx); - if has_err(r.err.clone()) { - return Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - { - let __tco_0 = r.tokens.clone(); - let __tco_1 = r.ctx.clone(); - let __tco_2 = v2_rt::rc_list_push(capabilities, r.capability.clone()); - tokens = __tco_0; - ctx = __tco_1; - capabilities = __tco_2; - continue; - } - } else { - if (kw_text.clone().as_str() == "acquire".to_string().as_str()) { - let r = expect( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - &Rc::new(ExpectedToken::ExpectLBrace), - ); - if has_err(r.err.clone()) { - return Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r2 = skip_until_rbrace(&skip_newlines(r.tokens.clone())); - let r3 = - expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBrace)); - if has_err(r3.err.clone()) { - return Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: r3.err.clone(), - }); - } - { - let __tco_0 = skip_newlines(r3.tokens.clone()); - tokens = __tco_0; - continue; - } - } else { - if (kw_text.clone().as_str() == "release".to_string().as_str()) { - let r = expect( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - &Rc::new(ExpectedToken::ExpectLBrace), - ); - if has_err(r.err.clone()) { - return Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r2 = skip_until_rbrace(&skip_newlines(r.tokens.clone())); - let r3 = expect( - &r2.tokens.clone(), - &Rc::new(ExpectedToken::ExpectRBrace), - ); - if has_err(r3.err.clone()) { - return Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: r3.err.clone(), - }); - } - { - let __tco_0 = skip_newlines(r3.tokens.clone()); - tokens = __tco_0; - continue; - } - } else { - break Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error( - "unexpected keyword in resource block".to_string(), - span, - )), - }); - } - } + Some(t) => Some(t.shape.clone()), + None => None, +}; +match sh { + Some(TokenShape::ShKeyword) => { let kw_text = tok_keyword_text(tok.clone()); +if (kw_text.clone().as_str() == "capability".to_string().as_str()) { + let r = parse_capability(&tokens, &ctx); +if has_err(r.err.clone()) { + return Rc::new(ResPropResult { + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +{ + let __tco_0 = r.tokens.clone(); +let __tco_1 = r.ctx.clone(); +let __tco_2 = v2_rt::rc_list_push(capabilities, r.capability.clone()); +tokens = __tco_0; +ctx = __tco_1; +capabilities = __tco_2; +continue; +} +} else { + if (kw_text.clone().as_str() == "acquire".to_string().as_str()) { + let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); +if has_err(r.err.clone()) { + return Rc::new(ResPropResult { + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - } - Some(TokenShape::ShIdent) => { - if peek_is_colon_after_ident(tokens.clone()) { - let r = expect_ident(&tokens); - if has_err(r.err.clone()) { - return Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let fname = r.name.clone(); - let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); - if has_err(r2.err.clone()) { +let r2 = skip_until_rbrace(&skip_newlines(r.tokens.clone())); +let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r3.err.clone()) { + return Rc::new(ResPropResult { + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: r3.err.clone(), +}) + } +{ + let __tco_0 = skip_newlines(r3.tokens.clone()); +tokens = __tco_0; +continue; +} +} else { + if (kw_text.clone().as_str() == "release".to_string().as_str()) { + let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); +if has_err(r.err.clone()) { return Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); - if has_err(r3.err.clone()) { +let r2 = skip_until_rbrace(&skip_newlines(r.tokens.clone())); +let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r3.err.clone()) { return Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), - }); + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: r3.err.clone(), +}) } - let fi = make_field_init_node( - &fname, - r3.expr.clone(), - make_span(0, 0), - r.span.clone(), - ); - { +{ let __tco_0 = skip_newlines(r3.tokens.clone()); - let __tco_1 = r3.ctx.clone(); - let __tco_2 = v2_rt::rc_list_push(properties, fi); - tokens = __tco_0; - ctx = __tco_1; - properties = __tco_2; - continue; - } - } else { +tokens = __tco_0; +continue; +} +} else { break Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error( - "unexpected token in resource block".to_string(), - span, - )), - }); - } - } - _ => { - break Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error( - "expected capability, acquire, release, or property in resource block" - .to_string(), - span, - )), - }); - } - } - } - } + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error("unexpected keyword in resource block".to_string(), span)), +}); +} +} +} }, + Some(TokenShape::ShIdent) => { if peek_is_colon_after_ident(tokens.clone()) { + let r = expect_ident(&tokens); +if has_err(r.err.clone()) { + return Rc::new(ResPropResult { + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let fname = r.name.clone(); +let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); +if has_err(r2.err.clone()) { + return Rc::new(ResPropResult { + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); +if has_err(r3.err.clone()) { + return Rc::new(ResPropResult { + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), +}) + } +let fi = make_field_init_node(&fname, r3.expr.clone(), make_span(0, 0), r.span.clone()); +{ + let __tco_0 = skip_newlines(r3.tokens.clone()); +let __tco_1 = r3.ctx.clone(); +let __tco_2 = v2_rt::rc_list_push(properties, fi); +tokens = __tco_0; +ctx = __tco_1; +properties = __tco_2; +continue; +} +} else { + break Rc::new(ResPropResult { + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error("unexpected token in resource block".to_string(), span)), +}); +} }, + _ => { break Rc::new(ResPropResult { + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error("expected capability, acquire, release, or property in resource block".to_string(), span)), +}); }, +} +} +} } pub fn skip_until_rbrace(tokens: &Rc>>) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let tokens = skip_newlines(tokens.clone()); - let tok = tokens.clone().first().cloned(); - if (tok_is_rbrace(tok.clone()) || tok_is_eof(tok.clone())) { - Rc::new(UnitResult { - tokens: tokens.clone(), - err: None, - }) - } else { - { - let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, - }; - match sh { - Some(TokenShape::ShLBrace) => { - let inner = skip_until_rbrace(&Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - )); - let r = - expect(&inner.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBrace)); - if has_err(r.err.clone()) { + { + let tokens = skip_newlines(tokens.clone()); +let tok = tokens.clone().first().cloned(); +if (tok_is_rbrace(tok.clone()) || tok_is_eof(tok.clone())) { + Rc::new(UnitResult { + tokens: tokens.clone(), + err: None, +}) + } else { + { + let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, +}; +match sh { + Some(TokenShape::ShLBrace) => { + let inner = skip_until_rbrace(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>())); +let r = expect(&inner.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r.err.clone()) { return Rc::new(UnitResult { - tokens: r.tokens.clone(), - err: r.err.clone(), - }); + tokens: r.tokens.clone(), + err: r.err.clone(), +}) } - skip_until_rbrace(&r.tokens.clone()) - } - _ => skip_until_rbrace(&Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - )), - } +skip_until_rbrace(&r.tokens.clone()) +}, + _ => skip_until_rbrace(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>())), +} +} } - } +} }) } pub fn parse_capability(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); - let dummy_cap = make_capability_node( - "".to_string(), - None, - Rc::new(vec![]), - Rc::new(vec![]), - &start_span, - &ctx.source_indices.clone(), - ); - let r = expect( - &tokens, - &Rc::new(ExpectedToken::ExpectKeyword { - text: "capability".to_string(), - }), - ); - if has_err(r.err.clone()) { +let dummy_cap = make_capability_node("".to_string(), None, Rc::new(vec![]), Rc::new(vec![]), &start_span, &ctx.source_indices.clone()); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { + text: "capability".to_string(), +})); +if has_err(r.err.clone()) { return Rc::new(CapResult { - capability: dummy_cap.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r = expect_ident(&r.tokens.clone()); - if has_err(r.err.clone()) { + capability: dummy_cap.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let r = expect_ident(&r.tokens.clone()); +if has_err(r.err.clone()) { return Rc::new(CapResult { - capability: dummy_cap.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let name = r.name.clone(); - let name_span = r.span.clone(); - let tokens = r.tokens.clone(); - if tok_is_lbrace(tokens.clone().first().cloned()) { + capability: dummy_cap.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let name = r.name.clone(); +let name_span = r.span.clone(); +let tokens = r.tokens.clone(); +if tok_is_lbrace(tokens.clone().first().cloned()) { { let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBrace)); - if has_err(r2.err.clone()) { +if has_err(r2.err.clone()) { return Rc::new(CapResult { - capability: dummy_cap.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); + capability: dummy_cap.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) } - let io = parse_input_output_blocks(skip_newlines(r2.tokens.clone()), ctx.clone()); - if has_err(io.err.clone()) { +let io = parse_input_output_blocks(skip_newlines(r2.tokens.clone()), ctx.clone()); +if has_err(io.err.clone()) { return Rc::new(CapResult { - capability: dummy_cap.clone(), - tokens: io.tokens.clone(), - ctx: io.ctx.clone(), - err: io.err.clone(), - }); - } - let r3 = expect( - &skip_newlines(io.tokens.clone()), - &Rc::new(ExpectedToken::ExpectRBrace), - ); - if has_err(r3.err.clone()) { + capability: dummy_cap.clone(), + tokens: io.tokens.clone(), + ctx: io.ctx.clone(), + err: io.err.clone(), +}) + } +let r3 = expect(&skip_newlines(io.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r3.err.clone()) { return Rc::new(CapResult { - capability: dummy_cap.clone(), - tokens: r3.tokens.clone(), - ctx: io.ctx.clone(), - err: r3.err.clone(), - }); - } - let cap = make_capability_node( - name, - Some(name_span), - io.inputs.clone(), - io.outputs.clone(), - &start_span, - &ctx.source_indices.clone(), - ); - Rc::new(CapResult { - capability: cap, - tokens: skip_newlines(r3.tokens.clone()), - ctx: io.ctx.clone(), - err: None, - }) - } + capability: dummy_cap.clone(), + tokens: r3.tokens.clone(), + ctx: io.ctx.clone(), + err: r3.err.clone(), +}) + } +let cap = make_capability_node(name, Some(name_span), io.inputs.clone(), io.outputs.clone(), &start_span, &ctx.source_indices.clone()); +Rc::new(CapResult { + capability: cap, + tokens: skip_newlines(r3.tokens.clone()), + ctx: io.ctx.clone(), + err: None, +}) +} } else { if tok_is_lparen(tokens.clone().first().cloned()) { { let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectLParen)); - if has_err(r2.err.clone()) { +if has_err(r2.err.clone()) { return Rc::new(CapResult { - capability: dummy_cap.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); + capability: dummy_cap.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) } - let r3 = parse_field_list(skip_newlines(r2.tokens.clone()), ctx.clone()); - if has_err(r3.err.clone()) { +let r3 = parse_field_list(skip_newlines(r2.tokens.clone()), ctx.clone()); +if has_err(r3.err.clone()) { return Rc::new(CapResult { - capability: dummy_cap.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), - }); + capability: dummy_cap.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), +}) } - let inputs = r3.fields.clone(); - let r4 = expect( - &skip_newlines(r3.tokens.clone()), - &Rc::new(ExpectedToken::ExpectRParen), - ); - if has_err(r4.err.clone()) { +let inputs = r3.fields.clone(); +let r4 = expect(&skip_newlines(r3.tokens.clone()), &Rc::new(ExpectedToken::ExpectRParen)); +if has_err(r4.err.clone()) { return Rc::new(CapResult { - capability: dummy_cap.clone(), - tokens: r4.tokens.clone(), - ctx: r3.ctx.clone(), - err: r4.err.clone(), - }); + capability: dummy_cap.clone(), + tokens: r4.tokens.clone(), + ctx: r3.ctx.clone(), + err: r4.err.clone(), +}) } - let ret = parse_optional_inferred(&r4.tokens.clone(), r3.ctx.clone()); - if has_err(ret.err.clone()) { +let ret = parse_optional_inferred(&r4.tokens.clone(), r3.ctx.clone()); +if has_err(ret.err.clone()) { return Rc::new(CapResult { - capability: dummy_cap.clone(), - tokens: ret.tokens.clone(), - ctx: ret.ctx.clone(), - err: ret.err.clone(), - }); + capability: dummy_cap.clone(), + tokens: ret.tokens.clone(), + ctx: ret.ctx.clone(), + err: ret.err.clone(), +}) } - let outputs = match ret.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - node_inferred_to_outputs(&rt, ret.ctx.clone().source_indices.clone()) - } - _ => Rc::new(vec![]), - }; - let cap = make_capability_node( - name, - Some(name_span), - inputs, - outputs, - &start_span, - &ctx.source_indices.clone(), - ); - Rc::new(CapResult { - capability: cap, - tokens: skip_newlines(ret.tokens.clone()), - ctx: ret.ctx.clone(), - err: None, - }) - } +let outputs = match ret.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => node_inferred_to_outputs(&rt, ret.ctx.clone().source_indices.clone()), + _ => Rc::new(vec![]), +}; +let cap = make_capability_node(name, Some(name_span), inputs, outputs, &start_span, &ctx.source_indices.clone()); +Rc::new(CapResult { + capability: cap, + tokens: skip_newlines(ret.tokens.clone()), + ctx: ret.ctx.clone(), + err: None, +}) +} } else { { - let cap = make_capability_node( - name, - Some(name_span), - Rc::new(vec![]), - Rc::new(vec![]), - &start_span, - &ctx.source_indices.clone(), - ); - Rc::new(CapResult { - capability: cap, - tokens: skip_newlines(tokens.clone()), - ctx: ctx.clone(), - err: None, - }) - } + let cap = make_capability_node(name, Some(name_span), Rc::new(vec![]), Rc::new(vec![]), &start_span, &ctx.source_indices.clone()); +Rc::new(CapResult { + capability: cap, + tokens: skip_newlines(tokens.clone()), + ctx: ctx.clone(), + err: None, +}) +} } } - } +} } -pub fn parse_input_output_blocks( - tokens: Rc>>, - ctx: Rc, -) -> Rc { +pub fn parse_input_output_blocks(tokens: Rc>>, ctx: Rc) -> Rc { parse_io_blocks_acc(tokens, ctx, Rc::new(vec![]), Rc::new(vec![])) } -pub fn parse_io_blocks_acc( - mut tokens: Rc>>, - mut ctx: Rc, - mut inputs: Rc>>, - mut outputs: Rc>>, -) -> Rc { +pub fn parse_io_blocks_acc(mut tokens: Rc>>, mut ctx: Rc, mut inputs: Rc>>, mut outputs: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - if (tok_is_rbrace(tokens.clone().first().cloned()) - || tok_is_eof(tokens.clone().first().cloned())) - { +if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { break Rc::new(IOResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } else { + inputs: inputs.clone(), + outputs: outputs.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); +} else { let kw = tok_keyword_text(tokens.clone().first().cloned()); - if (kw.clone().as_str() == "input".to_string().as_str()) { - let r = expect( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - &Rc::new(ExpectedToken::ExpectLBrace), - ); - if has_err(r.err.clone()) { +if (kw.clone().as_str() == "input".to_string().as_str()) { + let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); +if has_err(r.err.clone()) { return Rc::new(IOResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); + inputs: inputs.clone(), + outputs: outputs.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - let r2 = parse_field_list(skip_newlines(r.tokens.clone()), ctx.clone()); - if has_err(r2.err.clone()) { +let r2 = parse_field_list(skip_newlines(r.tokens.clone()), ctx.clone()); +if has_err(r2.err.clone()) { return Rc::new(IOResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = expect( - &skip_newlines(r2.tokens.clone()), - &Rc::new(ExpectedToken::ExpectRBrace), - ); - if has_err(r3.err.clone()) { + inputs: inputs.clone(), + outputs: outputs.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r3.err.clone()) { return Rc::new(IOResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), - }); - } - { + inputs: inputs.clone(), + outputs: outputs.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), +}) + } +{ let __tco_0 = r3.tokens.clone(); - let __tco_1 = r2.ctx.clone(); - let __tco_2 = r2.fields.clone(); - tokens = __tco_0; - ctx = __tco_1; - inputs = __tco_2; - continue; - } - } else { +let __tco_1 = r2.ctx.clone(); +let __tco_2 = r2.fields.clone(); +tokens = __tco_0; +ctx = __tco_1; +inputs = __tco_2; +continue; +} +} else { if (kw.clone().as_str() == "output".to_string().as_str()) { - let r = expect( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - &Rc::new(ExpectedToken::ExpectLBrace), - ); - if has_err(r.err.clone()) { + let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); +if has_err(r.err.clone()) { return Rc::new(IOResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); + inputs: inputs.clone(), + outputs: outputs.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - let r2 = parse_field_list(skip_newlines(r.tokens.clone()), ctx.clone()); - if has_err(r2.err.clone()) { +let r2 = parse_field_list(skip_newlines(r.tokens.clone()), ctx.clone()); +if has_err(r2.err.clone()) { return Rc::new(IOResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), - }); + inputs: inputs.clone(), + outputs: outputs.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), +}) } - let r3 = expect( - &skip_newlines(r2.tokens.clone()), - &Rc::new(ExpectedToken::ExpectRBrace), - ); - if has_err(r3.err.clone()) { +let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r3.err.clone()) { return Rc::new(IOResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), - }); + inputs: inputs.clone(), + outputs: outputs.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), +}) } - { +{ let __tco_0 = r3.tokens.clone(); - let __tco_1 = r2.ctx.clone(); - let __tco_2 = r2.fields.clone(); - tokens = __tco_0; - ctx = __tco_1; - outputs = __tco_2; - continue; - } - } else { +let __tco_1 = r2.ctx.clone(); +let __tco_2 = r2.fields.clone(); +tokens = __tco_0; +ctx = __tco_1; +outputs = __tco_2; +continue; +} +} else { break Rc::new(IOResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } - } - } - } + inputs: inputs.clone(), + outputs: outputs.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); +} +} +} +} } pub fn parse_data_def(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); - let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let r = expect( - &tokens, - &Rc::new(ExpectedToken::ExpectKeyword { - text: "data".to_string(), - }), - ); - if has_err(r.err.clone()) { +let dummy = Rc::new(Node { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { + text: "data".to_string(), +})); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); + item: dummy, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - parse_data_after_kw(r.tokens.clone(), &ctx, &start_span) - } +parse_data_after_kw(r.tokens.clone(), &ctx, &start_span) +} } -pub fn parse_data_after_kw( - tokens: Rc>>, - ctx: &Rc, - start_span: &Rc, -) -> Rc { +pub fn parse_data_after_kw(tokens: Rc>>, ctx: &Rc, start_span: &Rc) -> Rc { { let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let r = expect_ident(&tokens); - if has_err(r.err.clone()) { - return Rc::new(ItemResult { - item: dummy, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let name = r.name.clone(); - let name_span = r.span.clone(); - let named_dummy = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); - if has_err(r.err.clone()) { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let r = expect_ident(&tokens); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r = parse_type_expr(&r.tokens.clone(), &ctx); - if has_err(r.err.clone()) { + item: dummy, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let name = r.name.clone(); +let name_span = r.span.clone(); +let named_dummy = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let te = r.type_expr.clone(); - let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectEq)); - if has_err(r.err.clone()) { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let r = parse_type_expr(&r.tokens.clone(), &ctx); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r = parse_expr(r.tokens.clone(), ctx.clone()); - if has_err(r.err.clone()) { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let te = r.type_expr.clone(); +let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectEq)); +if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: Some(r.expr.clone()), - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: Some(te), - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - Rc::new(ItemResult { - item: item, - tokens: skip_newlines(r.tokens.clone()), - ctx: r.ctx.clone(), - err: None, - }) - } +let r = parse_expr(r.tokens.clone(), ctx.clone()); +if has_err(r.err.clone()) { + return Rc::new(ItemResult { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: Some(r.expr.clone()), + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: Some(te), + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +Rc::new(ItemResult { + item: item, + tokens: skip_newlines(r.tokens.clone()), + ctx: r.ctx.clone(), + err: None, +}) +} } pub fn parse_params(tokens: &Rc>>, ctx: &Rc) -> Rc { { let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLParen)); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ParamsResult { - params: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); + params: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - let tokens = skip_newlines(r.tokens.clone()); - if tok_is_rparen(tokens.clone().first().cloned()) { +let tokens = skip_newlines(r.tokens.clone()); +if tok_is_rparen(tokens.clone().first().cloned()) { Rc::new(ParamsResult { - params: Rc::new(vec![]), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx: ctx.clone(), - err: None, - }) + params: Rc::new(vec![]), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + ctx: ctx.clone(), + err: None, +}) } else { { let r = parse_param_list(tokens.clone(), ctx.clone()); - if has_err(r.err.clone()) { - return r.clone(); +if has_err(r.err.clone()) { + return r.clone() } - let tokens = skip_newlines(r.tokens.clone()); - let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRParen)); - if has_err(r2.err.clone()) { +let tokens = skip_newlines(r.tokens.clone()); +let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRParen)); +if has_err(r2.err.clone()) { return Rc::new(ParamsResult { - params: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), - }); + params: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), +}) } - Rc::new(ParamsResult { - params: r.params.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } +Rc::new(ParamsResult { + params: r.params.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } - } +} } pub fn parse_param_list(tokens: Rc>>, ctx: Rc) -> Rc { parse_param_list_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_param_list_acc( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_param_list_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { let r = parse_param(&tokens, &ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ParamsResult { - params: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - acc = v2_rt::rc_list_push(acc.clone(), r.param.clone()); - match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - tokens = skip_newlines(__ec.clone()); - if tok_is_rparen(tokens.clone().first().cloned()) { - break Rc::new(ParamsResult { - params: acc.clone(), - tokens: tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }); - } else { - { - let __tco_0 = r.ctx.clone(); - ctx = __tco_0; - continue; - } - } - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - break Rc::new(ParamsResult { - params: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }); - } - } - } + params: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +acc = v2_rt::rc_list_push(acc.clone(), r.param.clone()); +match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { tokens = skip_newlines(__ec.clone()); +if tok_is_rparen(tokens.clone().first().cloned()) { + break Rc::new(ParamsResult { + params: acc.clone(), + tokens: tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}); +} else { + { + let __tco_0 = r.ctx.clone(); +ctx = __tco_0; +continue; +} +} }, + EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(ParamsResult { + params: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}); }, +} +} } pub fn parse_param(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); - let dummy_param = make_param_node( - &"".to_string(), - leaf_type_node(&"".to_string(), &start_span), - None, - start_span.clone(), - start_span.clone(), - ); - let r = expect_name(&tokens); - if has_err(r.err.clone()) { +let dummy_param = make_param_node(&"".to_string(), leaf_type_node(&"".to_string(), &start_span), None, start_span.clone(), start_span.clone()); +let r = expect_name(&tokens); +if has_err(r.err.clone()) { return Rc::new(ParamResult { - param: dummy_param.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let name = r.name.clone(); - let name_span = r.span.clone(); - let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); - if has_err(r2.err.clone()) { + param: dummy_param.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let name = r.name.clone(); +let name_span = r.span.clone(); +let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); +if has_err(r2.err.clone()) { return Rc::new(ParamResult { - param: dummy_param.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = parse_type_expr(&r2.tokens.clone(), &ctx); - if has_err(r3.err.clone()) { + param: dummy_param.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = parse_type_expr(&r2.tokens.clone(), &ctx); +if has_err(r3.err.clone()) { return Rc::new(ParamResult { - param: dummy_param.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), - }); - } - let wr = try_where_clause( - &r3.tokens.clone(), - r3.ctx.clone(), - &r3.type_expr.clone(), - &start_span, - ); - if has_err(wr.err.clone()) { + param: dummy_param.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), +}) + } +let wr = try_where_clause(&r3.tokens.clone(), r3.ctx.clone(), &r3.type_expr.clone(), &start_span); +if has_err(wr.err.clone()) { return Rc::new(ParamResult { - param: dummy_param.clone(), - tokens: wr.tokens.clone(), - ctx: wr.ctx.clone(), - err: wr.err.clone(), - }); - } - let type_expr = wr.type_expr.clone(); - let tokens = wr.tokens.clone(); - let ctx = wr.ctx.clone(); - match (*eat(&tokens, Rc::new(ExpectedToken::ExpectEq))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r4 = parse_expr(__ec.clone(), ctx.clone()); - if has_err(r4.err.clone()) { - return Rc::new(ParamResult { - param: dummy_param.clone(), - tokens: r4.tokens.clone(), - ctx: r4.ctx.clone(), - err: r4.err.clone(), - }); - } - let p = make_param_node( - &name, - type_expr, - Some(r4.expr.clone()), - start_span.clone(), - name_span, - ); - Rc::new(ParamResult { - param: p, - tokens: r4.tokens.clone(), - ctx: r4.ctx.clone(), - err: None, - }) - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - let p = make_param_node(&name, type_expr, None, start_span.clone(), name_span); - Rc::new(ParamResult { - param: p, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } - } - } + param: dummy_param.clone(), + tokens: wr.tokens.clone(), + ctx: wr.ctx.clone(), + err: wr.err.clone(), +}) + } +let type_expr = wr.type_expr.clone(); +let tokens = wr.tokens.clone(); +let ctx = wr.ctx.clone(); +match (*eat(&tokens, Rc::new(ExpectedToken::ExpectEq))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let r4 = parse_expr(__ec.clone(), ctx.clone()); +if has_err(r4.err.clone()) { + return Rc::new(ParamResult { + param: dummy_param.clone(), + tokens: r4.tokens.clone(), + ctx: r4.ctx.clone(), + err: r4.err.clone(), +}) + } +let p = make_param_node(&name, type_expr, Some(r4.expr.clone()), start_span.clone(), name_span); +Rc::new(ParamResult { + param: p, + tokens: r4.tokens.clone(), + ctx: r4.ctx.clone(), + err: None, +}) +}, + EatResult::EatUnchanged { tokens: __eu, .. } => { + let p = make_param_node(&name, type_expr, None, start_span.clone(), name_span); +Rc::new(ParamResult { + param: p, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) +}, +} +} } pub fn parse_block(tokens: &Rc>>, ctx: &Rc) -> Rc { { let dummy_expr = parse_recovery_placeholder(); - let block_span = token_span(tokens.clone().first().cloned()); - let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBrace)); - if has_err(r.err.clone()) { +let block_span = token_span(tokens.clone().first().cloned()); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBrace)); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let tokens = skip_newlines(r.tokens.clone()); - let r = parse_stmts(tokens.clone(), ctx.clone()); - if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let tokens = skip_newlines(r.tokens.clone()); +let r = parse_stmts(tokens.clone(), ctx.clone()); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let stmts = r.stmts.clone(); - let tokens = skip_newlines(r.tokens.clone()); - let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); - if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let stmts = r.stmts.clone(); +let tokens = skip_newlines(r.tokens.clone()); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - if ((stmts.clone().len() as i64) == 1) { +if ((stmts.clone().len() as i64) == 1) { Rc::new(ExprResult { - expr: stmts.clone().first().cloned().clone().unwrap(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: None, - }) + expr: stmts.clone().first().cloned().clone().unwrap(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: None, +}) } else { Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprBlock), - stmts.clone(), - None, - block_span, - ), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: None, - }) + expr: make_expr_node(Rc::new(ExprData::ExprBlock), stmts.clone(), None, block_span), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: None, +}) } - } +} } pub fn parse_stmts(tokens: Rc>>, ctx: Rc) -> Rc { parse_stmts_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_stmts_acc( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_stmts_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - if (tok_is_rbrace(tokens.clone().first().cloned()) - || tok_is_eof(tokens.clone().first().cloned())) - { +if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { break Rc::new(StmtsResult { - stmts: acc.clone(), - tokens: tokens.clone(), - ctx: ctx, - err: None, - }); - } else { + stmts: acc.clone(), + tokens: tokens.clone(), + ctx: ctx, + err: None, +}); +} else { let r = parse_stmt(&tokens, ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(StmtsResult { - stmts: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + stmts: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - { +{ let __tco_0 = r.tokens.clone(); - let __tco_1 = r.ctx.clone(); - let __tco_2 = v2_rt::rc_list_push(acc, r.expr.clone()); - tokens = __tco_0; - ctx = __tco_1; - acc = __tco_2; - continue; - } - } - } +let __tco_1 = r.ctx.clone(); +let __tco_2 = v2_rt::rc_list_push(acc, r.expr.clone()); +tokens = __tco_0; +ctx = __tco_1; +acc = __tco_2; +continue; +} +} +} } pub fn parse_stmt(tokens: &Rc>>, ctx: Rc) -> Rc { { let tok = tokens.clone().first().cloned(); - let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, - }; - match sh { - Some(TokenShape::ShKeyword) => { - let kw_text = tok_keyword_text(tok.clone()); - if (kw_text.clone().as_str() == "let".to_string().as_str()) { - parse_let(&tokens, &ctx) +let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, +}; +match sh { + Some(TokenShape::ShKeyword) => { + let kw_text = tok_keyword_text(tok.clone()); +if (kw_text.clone().as_str() == "let".to_string().as_str()) { + parse_let(&tokens, &ctx) + } else { + if (kw_text.clone().as_str() == "return".to_string().as_str()) { + parse_return(&tokens, &ctx) } else { - if (kw_text.clone().as_str() == "return".to_string().as_str()) { - parse_return(&tokens, &ctx) + if peek_is_eq_after_ident(tokens.clone()) { + parse_bare_assignment(&tokens, &ctx) } else { - if peek_is_eq_after_ident(tokens.clone()) { - parse_bare_assignment(&tokens, &ctx) - } else { - parse_expr(tokens.clone(), ctx) - } + parse_expr(tokens.clone(), ctx) } } } - Some(TokenShape::ShIdent) => { - if (peek_text_is(tokens.clone(), "node".to_string()) && peek_is_node_decl(&tokens)) - { - parse_node_decl(&tokens, &ctx) +}, + Some(TokenShape::ShIdent) => if (peek_text_is(tokens.clone(), "node".to_string()) && peek_is_node_decl(&tokens)) { + parse_node_decl(&tokens, &ctx) + } else { + if peek_is_eq_after_ident(tokens.clone()) { + parse_bare_assignment(&tokens, &ctx) + } else { + if is_constraint_bracket_after_ident(&tokens) { + parse_constrained_assignment(&tokens, &ctx) } else { - if peek_is_eq_after_ident(tokens.clone()) { - parse_bare_assignment(&tokens, &ctx) - } else { - if is_constraint_bracket_after_ident(&tokens) { - parse_constrained_assignment(&tokens, &ctx) - } else { - parse_expr(tokens.clone(), ctx) - } - } + parse_expr(tokens.clone(), ctx) } } - _ => parse_expr(tokens.clone(), ctx), - } - } + }, + _ => parse_expr(tokens.clone(), ctx), +} +} } pub fn peek_is_eq_after_ident(tokens: Rc>>) -> bool { match tokens.get(1 as usize).cloned() { - Some(t) => is_eq_shape(t.shape.clone()), - None => false, - } + Some(t) => is_eq_shape(t.shape.clone()), + None => false, +} } pub fn peek_is_node_decl(tokens: &Rc>>) -> bool { { let t1 = tokens.clone().get(1 as usize).cloned(); - let t2 = tokens.clone().get(2 as usize).cloned(); - let name_ok = match t1 { - Some(t) => (is_ident_shape(t.shape.clone()) || is_name_keyword(&t)), - None => false, - }; - let decl_ok = match t2 { - Some(t) => { - ((is_colon_shape(t.shape.clone()) || is_lbracket_shape(t.shape.clone())) - || is_eq_shape(t.shape.clone())) - } - None => false, - }; - (name_ok && decl_ok) - } +let t2 = tokens.clone().get(2 as usize).cloned(); +let name_ok = match t1 { + Some(t) => (is_ident_shape(t.shape.clone()) || is_name_keyword(&t)), + None => false, +}; +let decl_ok = match t2 { + Some(t) => ((is_colon_shape(t.shape.clone()) || is_lbracket_shape(t.shape.clone())) || is_eq_shape(t.shape.clone())), + None => false, +}; +(name_ok && decl_ok) +} } pub fn is_constraint_bracket_after_ident(tokens: &Rc>>) -> bool { match tokens.clone().get(1 as usize).cloned() { - Some(t) => { - (is_lbracket_shape(t.shape.clone()) - && is_constraint_bracket(Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ))) - } - None => false, - } + Some(t) => (is_lbracket_shape(t.shape.clone()) && is_constraint_bracket(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()))), + None => false, +} } -pub fn parse_constrained_assignment( - tokens: &Rc>>, - ctx: &Rc, -) -> Rc { +pub fn parse_constrained_assignment(tokens: &Rc>>, ctx: &Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); - let dummy_expr = parse_recovery_placeholder(); - let r = expect_name(&tokens); - if has_err(r.err.clone()) { +let dummy_expr = parse_recovery_placeholder(); +let r = expect_name(&tokens); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let name = r.name.clone(); - let name_span = r.span.clone(); - let cr = try_constraint_annotations(&r.tokens.clone(), ctx.clone()); - if has_err(cr.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let name = r.name.clone(); +let name_span = r.span.clone(); +let cr = try_constraint_annotations(&r.tokens.clone(), ctx.clone()); +if has_err(cr.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: cr.tokens.clone(), - ctx: cr.ctx.clone(), - err: cr.err.clone(), - }); - } - let r2 = expect(&cr.tokens.clone(), &Rc::new(ExpectedToken::ExpectEq)); - if has_err(r2.err.clone()) { + expr: dummy_expr.clone(), + tokens: cr.tokens.clone(), + ctx: cr.ctx.clone(), + err: cr.err.clone(), +}) + } +let r2 = expect(&cr.tokens.clone(), &Rc::new(ExpectedToken::ExpectEq)); +if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: cr.ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = parse_expr(r2.tokens.clone(), cr.ctx.clone()); - if has_err(r3.err.clone()) { - return r3.clone(); - } - let node = make_named_expr_node( - &name, - Rc::new(ExprData::ExprLet), - Rc::new(vec![r3.expr.clone()]), - None, - span, - name_span, - ); - let node = Rc::new(Node { - name: node.name.clone(), - span: node.span.clone(), - ident_span: node.ident_span.clone(), - children: node.children.clone(), - params: node.params.clone(), - inferred: node.inferred.clone(), - return_cardinality: node.return_cardinality.clone(), - uses: node.uses.clone(), - body: node.body.clone(), - connective: node.connective.clone(), - transport: node.transport.clone(), - properties: cr.constraints.clone(), - type_annotation: node.type_annotation.clone(), - is_self_recursive: node.is_self_recursive.clone(), - has_non_tail_self_call: node.has_non_tail_self_call.clone(), - match_pattern: node.match_pattern.clone(), - expr_data: node.expr_data.clone(), - ident: None, - }); - Rc::new(ExprResult { - expr: node.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: None, - }) - } + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: cr.ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = parse_expr(r2.tokens.clone(), cr.ctx.clone()); +if has_err(r3.err.clone()) { + return r3.clone() + } +let node = make_named_expr_node(&name, Rc::new(ExprData::ExprLet), Rc::new(vec![r3.expr.clone()]), None, span, name_span); +let node = Rc::new(Node { + name: node.name.clone(), + span: node.span.clone(), + ident_span: node.ident_span.clone(), + children: node.children.clone(), + params: node.params.clone(), + inferred: node.inferred.clone(), + return_cardinality: node.return_cardinality.clone(), + uses: node.uses.clone(), + body: node.body.clone(), + connective: node.connective.clone(), + transport: node.transport.clone(), + properties: cr.constraints.clone(), + type_annotation: node.type_annotation.clone(), + is_self_recursive: node.is_self_recursive.clone(), + has_non_tail_self_call: node.has_non_tail_self_call.clone(), + match_pattern: node.match_pattern.clone(), + expr_data: node.expr_data.clone(), + ident: None, +}); +Rc::new(ExprResult { + expr: node.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: None, +}) +} } pub fn peek_text_is(tokens: Rc>>, expected: String) -> bool { match tokens.first().cloned() { - Some(t) => { - (is_ident_shape(t.shape.clone()) && (t.text.clone().as_str() == expected.as_str())) - } - None => false, - } + Some(t) => (is_ident_shape(t.shape.clone()) && (t.text.clone().as_str() == expected.as_str())), + None => false, +} } pub fn parse_node_decl(tokens: &Rc>>, ctx: &Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); - let dummy_expr = parse_recovery_placeholder(); - let tokens = Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - let r = expect_name(&tokens); - if has_err(r.err.clone()) { +let dummy_expr = parse_recovery_placeholder(); +let tokens = Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()); +let r = expect_name(&tokens); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let name = r.name.clone(); - let name_span = r.span.clone(); - let cr = try_constraint_annotations(&r.tokens.clone(), ctx.clone()); - if has_err(cr.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let name = r.name.clone(); +let name_span = r.span.clone(); +let cr = try_constraint_annotations(&r.tokens.clone(), ctx.clone()); +if has_err(cr.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: cr.tokens.clone(), - ctx: cr.ctx.clone(), - err: cr.err.clone(), - }); - } - let e_colon = eat(&cr.tokens.clone(), Rc::new(ExpectedToken::ExpectColon)); - let tokens = match (*e_colon.clone()).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => { - let r2 = expect(&cr.tokens.clone(), &Rc::new(ExpectedToken::ExpectEq)); - if has_err(r2.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: cr.ctx.clone(), - err: r2.err.clone(), - }); - } - r2.tokens.clone() - } - }; - let r3 = parse_expr(tokens.clone(), cr.ctx.clone()); - if has_err(r3.err.clone()) { - return r3.clone(); + expr: dummy_expr.clone(), + tokens: cr.tokens.clone(), + ctx: cr.ctx.clone(), + err: cr.err.clone(), +}) + } +let e_colon = eat(&cr.tokens.clone(), Rc::new(ExpectedToken::ExpectColon)); +let tokens = match (*e_colon.clone()).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => { + let r2 = expect(&cr.tokens.clone(), &Rc::new(ExpectedToken::ExpectEq)); +if has_err(r2.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: cr.ctx.clone(), + err: r2.err.clone(), +}) + } +r2.tokens.clone() +}, +}; +let r3 = parse_expr(tokens.clone(), cr.ctx.clone()); +if has_err(r3.err.clone()) { + return r3.clone() } - let ret = parse_optional_inferred(&r3.tokens.clone(), r3.ctx.clone()); - if has_err(ret.err.clone()) { +let ret = parse_optional_inferred(&r3.tokens.clone(), r3.ctx.clone()); +if has_err(ret.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: ret.tokens.clone(), - ctx: ret.ctx.clone(), - err: ret.err.clone(), - }); - } - let type_ann = match (*e_colon.clone()).clone() { - EatResult::EatConsumed { .. } => Some(r3.expr.clone()), - EatResult::EatUnchanged { .. } => None, - }; - let node = Rc::new(Node { - name: name, - span: span, - ident_span: Some(name_span), - children: Rc::new(vec![r3.expr.clone()]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: ret.inferred.clone(), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: cr.constraints.clone(), - type_annotation: type_ann, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::ExprLet), - ident: None, - }); - Rc::new(ExprResult { - expr: node, - tokens: ret.tokens.clone(), - ctx: ret.ctx.clone(), - err: None, - }) - } + expr: dummy_expr.clone(), + tokens: ret.tokens.clone(), + ctx: ret.ctx.clone(), + err: ret.err.clone(), +}) + } +let type_ann = match (*e_colon.clone()).clone() { + EatResult::EatConsumed { .. } => Some(r3.expr.clone()), + EatResult::EatUnchanged { .. } => None, +}; +let node = Rc::new(Node { + name: name, + span: span, + ident_span: Some(name_span), + children: Rc::new(vec![r3.expr.clone()]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: ret.inferred.clone(), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: cr.constraints.clone(), + type_annotation: type_ann, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::ExprLet), + ident: None, +}); +Rc::new(ExprResult { + expr: node, + tokens: ret.tokens.clone(), + ctx: ret.ctx.clone(), + err: None, +}) +} } -pub fn parse_bare_assignment( - tokens: &Rc>>, - ctx: &Rc, -) -> Rc { +pub fn parse_bare_assignment(tokens: &Rc>>, ctx: &Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); - let dummy_expr = parse_recovery_placeholder(); - let r = expect_name(&tokens); - if has_err(r.err.clone()) { +let dummy_expr = parse_recovery_placeholder(); +let r = expect_name(&tokens); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let name = r.name.clone(); - let name_span = r.span.clone(); - let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectEq)); - if has_err(r2.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let name = r.name.clone(); +let name_span = r.span.clone(); +let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectEq)); +if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); - } - let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); - if has_err(r3.err.clone()) { - return r3.clone(); - } - let cr = try_constraint_annotations(&r3.tokens.clone(), r3.ctx.clone()); - if has_err(cr.err.clone()) { + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) + } +let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); +if has_err(r3.err.clone()) { + return r3.clone() + } +let cr = try_constraint_annotations(&r3.tokens.clone(), r3.ctx.clone()); +if has_err(cr.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: cr.tokens.clone(), - ctx: cr.ctx.clone(), - err: cr.err.clone(), - }); - } - let node = make_named_expr_node( - &name, - Rc::new(ExprData::ExprLet), - Rc::new(vec![r3.expr.clone()]), - None, - span, - name_span, - ); - if ((cr.constraints.clone().len() as i64) > 0) { + expr: dummy_expr.clone(), + tokens: cr.tokens.clone(), + ctx: cr.ctx.clone(), + err: cr.err.clone(), +}) + } +let node = make_named_expr_node(&name, Rc::new(ExprData::ExprLet), Rc::new(vec![r3.expr.clone()]), None, span, name_span); +if ((cr.constraints.clone().len() as i64) > 0) { { let node = Rc::new(Node { - name: node.name.clone(), - span: node.span.clone(), - ident_span: node.ident_span.clone(), - children: node.children.clone(), - params: node.params.clone(), - inferred: node.inferred.clone(), - return_cardinality: node.return_cardinality.clone(), - uses: node.uses.clone(), - body: node.body.clone(), - connective: node.connective.clone(), - transport: node.transport.clone(), - properties: cr.constraints.clone(), - type_annotation: node.type_annotation.clone(), - is_self_recursive: node.is_self_recursive.clone(), - has_non_tail_self_call: node.has_non_tail_self_call.clone(), - match_pattern: node.match_pattern.clone(), - expr_data: node.expr_data.clone(), - ident: None, - }); - Rc::new(ExprResult { - expr: node.clone(), - tokens: cr.tokens.clone(), - ctx: cr.ctx.clone(), - err: None, - }) - } + name: node.name.clone(), + span: node.span.clone(), + ident_span: node.ident_span.clone(), + children: node.children.clone(), + params: node.params.clone(), + inferred: node.inferred.clone(), + return_cardinality: node.return_cardinality.clone(), + uses: node.uses.clone(), + body: node.body.clone(), + connective: node.connective.clone(), + transport: node.transport.clone(), + properties: cr.constraints.clone(), + type_annotation: node.type_annotation.clone(), + is_self_recursive: node.is_self_recursive.clone(), + has_non_tail_self_call: node.has_non_tail_self_call.clone(), + match_pattern: node.match_pattern.clone(), + expr_data: node.expr_data.clone(), + ident: None, +}); +Rc::new(ExprResult { + expr: node.clone(), + tokens: cr.tokens.clone(), + ctx: cr.ctx.clone(), + err: None, +}) +} } else { Rc::new(ExprResult { - expr: node.clone(), - tokens: cr.tokens.clone(), - ctx: cr.ctx.clone(), - err: None, - }) + expr: node.clone(), + tokens: cr.tokens.clone(), + ctx: cr.ctx.clone(), + err: None, +}) } - } +} } pub fn parse_expr(tokens: Rc>>, ctx: Rc) -> Rc { parse_expr_bp(tokens, ctx, 0) } -pub fn parse_expr_bp( - tokens: Rc>>, - ctx: Rc, - min_bp: i64, -) -> Rc { +pub fn parse_expr_bp(tokens: Rc>>, ctx: Rc, min_bp: i64) -> Rc { { let r = parse_prefix(&tokens, ctx); - if has_err(r.err.clone()) { - return r.clone(); +if has_err(r.err.clone()) { + return r.clone() } - let lhs = r.expr.clone(); - parse_expr_loop(r.tokens.clone(), r.ctx.clone(), lhs, min_bp) - } +let lhs = r.expr.clone(); +parse_expr_loop(r.tokens.clone(), r.ctx.clone(), lhs, min_bp) +} } -pub fn parse_expr_loop( - mut tokens: Rc>>, - mut ctx: Rc, - mut lhs: Rc, - mut min_bp: i64, -) -> Rc { +pub fn parse_expr_loop(mut tokens: Rc>>, mut ctx: Rc, mut lhs: Rc, mut min_bp: i64) -> Rc { loop { if tok_is_eof(tokens.clone().first().cloned()) { break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } else { + expr: lhs.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); +} else { let loop_span = token_span(tokens.clone().first().cloned()); - tokens = skip_continuation_newlines(&tokens); - let post = try_postfix(&tokens, &ctx, &lhs, min_bp.clone()); - if has_err(post.err.clone()) { +tokens = skip_continuation_newlines(&tokens); +let post = try_postfix(&tokens, &ctx, &lhs, min_bp.clone()); +if has_err(post.err.clone()) { break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: post.tokens.clone(), - ctx: post.ctx.clone(), - err: post.err.clone(), - }); - } else { + expr: lhs.clone(), + tokens: post.tokens.clone(), + ctx: post.ctx.clone(), + err: post.err.clone(), +}); +} else { if post.changed.clone() { { let __tco_0 = post.tokens.clone(); - let __tco_1 = post.ctx.clone(); - let __tco_2 = post.expr.clone(); - tokens = __tco_0; - ctx = __tco_1; - lhs = __tco_2; - continue; - } - } else { +let __tco_1 = post.ctx.clone(); +let __tco_2 = post.expr.clone(); +tokens = __tco_0; +ctx = __tco_1; +lhs = __tco_2; +continue; +} +} else { let bp = infix_bp(tokens.clone()); - match bp { - Some(bps) => { - if (bps.left.clone() < min_bp.clone()) { - break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } else { - match (*advance(&tokens)).clone() { - AdvanceResult::AdvanceOk { - token: op_tok, - tokens: rest, - .. - } => { - let op_shape = op_tok.shape.clone(); - if is_dot_shape(op_shape.clone()) { - let r = expect_name(&rest); - if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: lhs.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let new_lhs = make_named_expr_node( - &r.name.clone(), - Rc::new(ExprData::ExprFieldAccess { - summary: None, - }), - Rc::new(vec![lhs.clone()]), - None, - loop_span, - r.span.clone(), - ); - { - let __tco_0 = r.tokens.clone(); - let __tco_1 = new_lhs; - tokens = __tco_0; - lhs = __tco_1; - continue; - } - } else { - if is_pipe_arrow_shape(op_shape.clone()) { - let r = parse_pipe_rhs( - &rest, - &ctx, - lhs.clone(), - loop_span, - ); - if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - { - let __tco_0 = r.tokens.clone(); - let __tco_1 = r.ctx.clone(); - let __tco_2 = r.expr.clone(); - tokens = __tco_0; - ctx = __tco_1; - lhs = __tco_2; - continue; - } - } else { - tokens = skip_newlines(rest.clone()); - let r = parse_expr_bp( - tokens.clone(), - ctx.clone(), - bps.right.clone(), - ); - if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let binop_opt = find_operator_binop( - dag_syntax_spec().operators.clone(), - op_tok.text.clone(), - ); - match binop_opt { - Some(binop) => { - let new_lhs = make_expr_node( - Rc::new(ExprData::ExprBinOp { - op: binop.clone(), - algebra_field: None, - }), - Rc::new(vec![ - lhs.clone(), - r.expr.clone(), - ]), - None, - loop_span, - ); - { - let __tco_0 = r.tokens.clone(); - let __tco_1 = r.ctx.clone(); - let __tco_2 = new_lhs; - tokens = __tco_0; - ctx = __tco_1; - lhs = __tco_2; - continue; - } - } - None => { - break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: Some(parse_error( - v2_rt::concat( - "unknown binary operator: " - .to_string(), - op_tok.text.clone(), - ), - loop_span, - )), - }); - } - } - } - } - } - AdvanceResult::AdvanceEof => { - break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } - } +match bp { + Some(bps) => { if (bps.left.clone() < min_bp.clone()) { + break Rc::new(ExprResult { + expr: lhs.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); +} else { + match (*advance(&tokens)).clone() { + AdvanceResult::AdvanceOk { token: op_tok, tokens: rest, .. } => { let op_shape = op_tok.shape.clone(); +if is_dot_shape(op_shape.clone()) { + let r = expect_name(&rest); +if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: lhs.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - } - None => { - break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } - } - } - } - } - } +let new_lhs = make_named_expr_node(&r.name.clone(), Rc::new(ExprData::ExprFieldAccess { + summary: None, +}), Rc::new(vec![lhs.clone()]), None, loop_span, r.span.clone()); +{ + let __tco_0 = r.tokens.clone(); +let __tco_1 = new_lhs; +tokens = __tco_0; +lhs = __tco_1; +continue; +} +} else { + if is_pipe_arrow_shape(op_shape.clone()) { + let r = parse_pipe_rhs(&rest, &ctx, lhs.clone(), loop_span); +if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +{ + let __tco_0 = r.tokens.clone(); +let __tco_1 = r.ctx.clone(); +let __tco_2 = r.expr.clone(); +tokens = __tco_0; +ctx = __tco_1; +lhs = __tco_2; +continue; +} +} else { + tokens = skip_newlines(rest.clone()); +let r = parse_expr_bp(tokens.clone(), ctx.clone(), bps.right.clone()); +if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let binop_opt = find_operator_binop(dag_syntax_spec().operators.clone(), op_tok.text.clone()); +match binop_opt { + Some(binop) => { let new_lhs = make_expr_node(Rc::new(ExprData::ExprBinOp { + op: binop.clone(), + algebra_field: None, +}), Rc::new(vec![lhs.clone(), r.expr.clone()]), None, loop_span); +{ + let __tco_0 = r.tokens.clone(); +let __tco_1 = r.ctx.clone(); +let __tco_2 = new_lhs; +tokens = __tco_0; +ctx = __tco_1; +lhs = __tco_2; +continue; +} }, + None => { break Rc::new(ExprResult { + expr: lhs.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: Some(parse_error(v2_rt::concat("unknown binary operator: ".to_string(), op_tok.text.clone()), loop_span)), +}); }, +} +} +} }, + AdvanceResult::AdvanceEof => { break Rc::new(ExprResult { + expr: lhs.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); }, +} +} }, + None => { break Rc::new(ExprResult { + expr: lhs.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); }, +} +} +} +} +} } pub fn find_operator_bp(ops: Rc>>, symbol: String) -> Option { { - let matching = Rc::new({ - let mut __result = Vec::new(); - for op in ops.iter().cloned() { - if (op.symbol.clone().as_str() == symbol.clone().as_str()) { - __result.push(op); - } - } - __result - }); - if ((matching.clone().len() as i64) > 0) { + let matching = Rc::new({ let mut __result = Vec::new(); for op in ops.iter().cloned() { if (op.symbol.clone().as_str() == symbol.clone().as_str()) { __result.push(op); } } __result }); +if ((matching.clone().len() as i64) > 0) { { let op = matching.clone().first().cloned().clone().unwrap(); - Some(BindingPower { - left: op.left_bp.clone(), - right: op.right_bp.clone(), - }) - } +Some(BindingPower { + left: op.left_bp.clone(), + right: op.right_bp.clone(), +}) +} } else { None } - } +} } pub fn infix_bp(tokens: Rc>>) -> Option { match tokens.first().cloned() { - Some(t) => find_operator_bp(dag_syntax_spec().operators.clone(), t.text.clone()), - None => None, - } + Some(t) => find_operator_bp(dag_syntax_spec().operators.clone(), t.text.clone()), + None => None, +} } pub fn find_operator_binop(ops: Rc>>, symbol: String) -> Option { { - let matching = Rc::new({ - let mut __result = Vec::new(); - for op in ops.iter().cloned() { - if (op.symbol.clone().as_str() == symbol.clone().as_str()) { - __result.push(op); - } - } - __result - }); - if ((matching.clone().len() as i64) > 0) { - matching - .clone() - .first() - .cloned() - .clone() - .unwrap() - .binop - .clone() + let matching = Rc::new({ let mut __result = Vec::new(); for op in ops.iter().cloned() { if (op.symbol.clone().as_str() == symbol.clone().as_str()) { __result.push(op); } } __result }); +if ((matching.clone().len() as i64) > 0) { + matching.clone().first().cloned().clone().unwrap().binop.clone() } else { None } - } +} } -pub fn parse_pipe_rhs( - tokens: &Rc>>, - ctx: &Rc, - receiver: Rc, - span: Rc, -) -> Rc { +pub fn parse_pipe_rhs(tokens: &Rc>>, ctx: &Rc, receiver: Rc, span: Rc) -> Rc { { let dummy_expr = parse_recovery_placeholder(); - let r = expect_name(&tokens); - if has_err(r.err.clone()) { +let r = expect_name(&tokens); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let method = r.name.clone(); - let tokens = skip_newlines(r.tokens.clone()); - if tok_is_lparen(tokens.clone().first().cloned()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let method = r.name.clone(); +let tokens = skip_newlines(r.tokens.clone()); +if tok_is_lparen(tokens.clone().first().cloned()) { { let r2 = parse_call_args(&tokens, &ctx); - if has_err(r2.err.clone()) { +if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), - }); - } - Rc::new(ExprResult { - expr: make_named_expr_node( - &method, - Rc::new(ExprData::ExprMethodCall { - method_semantics: None, - }), - v2_rt::concat( - Rc::new(vec![receiver]), - Rc::new({ - let mut __result = Vec::new(); - for na in r2.args.clone().iter().cloned() { - __result.push(make_arg_node( - arg_name_at(na.clone(), ctx.source_indices.clone()), - arg_value(&na), - na.span.clone(), - node_name_span(&na), - )); - } - __result - }), - ), - None, - span, - r.span.clone(), - ), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: None, - }) - } + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), +}) + } +Rc::new(ExprResult { + expr: make_named_expr_node(&method, Rc::new(ExprData::ExprMethodCall { + method_semantics: None, +}), v2_rt::concat(Rc::new(vec![receiver]), Rc::new({ let mut __result = Vec::new(); for na in r2.args.clone().iter().cloned() { __result.push(make_arg_node(arg_name_at(na.clone(), ctx.source_indices.clone()), arg_value(&na), na.span.clone(), node_name_span(&na))); } __result })), None, span, r.span.clone()), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: None, +}) +} } else { Rc::new(ExprResult { - expr: make_named_expr_node( - &method, - Rc::new(ExprData::ExprMethodCall { - method_semantics: None, - }), - Rc::new(vec![receiver]), - None, - span, - r.span.clone(), - ), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) + expr: make_named_expr_node(&method, Rc::new(ExprData::ExprMethodCall { + method_semantics: None, +}), Rc::new(vec![receiver]), None, span, r.span.clone()), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) } - } +} } pub fn parse_prefix(tokens: &Rc>>, ctx: Rc) -> Rc { { let tok = tokens.clone().first().cloned(); - let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, - }; - let span = token_span(tok.clone()); - match sh { - Some(TokenShape::ShBang) => { - let r = parse_expr_bp( - Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx, - 12, - ); - if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprUnaryOp { - op: UnaryOpKind::Not, - }), - Rc::new(vec![r.expr.clone()]), - None, - span, - ), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } - Some(TokenShape::ShMinus) => { - let r = parse_expr_bp( - Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx, - 12, - ); - if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprUnaryOp { - op: UnaryOpKind::Neg, - }), - Rc::new(vec![r.expr.clone()]), - None, - span, - ), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } - _ => parse_primary(&tokens, &ctx), - } - } +let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, +}; +let span = token_span(tok.clone()); +match sh { + Some(TokenShape::ShBang) => { + let r = parse_expr_bp(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx, 12); +if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprUnaryOp { + op: UnaryOpKind::Not, +}), Rc::new(vec![r.expr.clone()]), None, span), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +}, + Some(TokenShape::ShMinus) => { + let r = parse_expr_bp(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx, 12); +if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprUnaryOp { + op: UnaryOpKind::Neg, +}), Rc::new(vec![r.expr.clone()]), None, span), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +}, + _ => parse_primary(&tokens, &ctx), +} +} } pub fn parse_primary(tokens: &Rc>>, ctx: &Rc) -> Rc { { let tok = tokens.clone().first().cloned(); - let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, - }; - let span = token_span(tok.clone()); - match sh.clone() { - Some(TokenShape::ShKeyword) => { - let kw_text = tok.clone().unwrap().text.clone(); - let lit_val = - v2_rt::lookup(&dag_syntax_spec().keyword_literals.clone(), kw_text.clone()); - match lit_val { - Some(lv) => Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprLiteral { value: lv.clone() }), - Rc::new(vec![]), - None, - span.clone(), - ), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx: ctx.clone(), - err: None, - }), - None => { - if (kw_text.clone().as_str() == "match".to_string().as_str()) { - parse_match(&tokens, &ctx) +let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, +}; +let span = token_span(tok.clone()); +match sh.clone() { + Some(TokenShape::ShKeyword) => { + let kw_text = tok.clone().unwrap().text.clone(); +let lit_val = v2_rt::lookup(&dag_syntax_spec().keyword_literals.clone(), kw_text.clone()); +match lit_val { + Some(lv) => Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprLiteral { + value: lv.clone(), +}), Rc::new(vec![]), None, span.clone()), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + ctx: ctx.clone(), + err: None, +}), + None => if (kw_text.clone().as_str() == "match".to_string().as_str()) { + parse_match(&tokens, &ctx) + } else { + if (kw_text.clone().as_str() == "if".to_string().as_str()) { + parse_if(&tokens, &ctx) + } else { + if (kw_text.clone().as_str() == "for".to_string().as_str()) { + parse_for(&tokens, &ctx) + } else { + if (kw_text.clone().as_str() == "let".to_string().as_str()) { + parse_let(&tokens, &ctx) } else { - if (kw_text.clone().as_str() == "if".to_string().as_str()) { - parse_if(&tokens, &ctx) + if (kw_text.clone().as_str() == "return".to_string().as_str()) { + parse_return(&tokens, &ctx) } else { - if (kw_text.clone().as_str() == "for".to_string().as_str()) { - parse_for(&tokens, &ctx) + if (kw_text.clone().as_str() == "fn".to_string().as_str()) { + parse_fn_lambda(&tokens, &ctx) } else { - if (kw_text.clone().as_str() == "let".to_string().as_str()) { - parse_let(&tokens, &ctx) - } else { - if (kw_text.clone().as_str() - == "return".to_string().as_str()) - { - parse_return(&tokens, &ctx) - } else { - if (kw_text.clone().as_str() - == "fn".to_string().as_str()) - { - parse_fn_lambda(&tokens, &ctx) - } else { - { - let kw_name = tok_keyword_to_name(tok.clone()); - match kw_name { + { + let kw_name = tok_keyword_to_name(tok.clone()); +match kw_name { Some(n) => parse_ident_expr(&tokens, ctx.clone(), &n), None => Rc::new(ExprResult { expr: parse_recovery_expr(span.clone(), format!("expected expression, found keyword '{}'", kw_text.clone())), @@ -10611,519 +8644,389 @@ pub fn parse_primary(tokens: &Rc>>, ctx: &Rc) -> Rc< err: Some(parse_error(format!("expected expression, found keyword '{}'", kw_text.clone()), span.clone())), }), } - } - } - } - } +} } } } } } - } - Some(TokenShape::ShLitInt) => { - let n_opt = v2_rt::parse_int(tok.clone().unwrap().text.clone()); - let n = match n_opt { - Some(v) => v.clone(), - None => { - return Rc::new(ExprResult { - expr: make_expr_error_node( - ExprErrorKind::InternalExprError, - &v2_rt::concat( - v2_rt::concat( - "internal: ShLitInt token text not parseable as int: '" - .to_string(), - tok.clone().unwrap().text.clone(), - ), - "'".to_string(), - ), - &span, - ), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } - }; - Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitInt { value: n.clone() }), - }), - Rc::new(vec![]), - None, - span.clone(), - ), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx: ctx.clone(), - err: None, - }) - } - Some(TokenShape::ShLitFloat) => { - let f = tok.clone().unwrap().text.clone(); - Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitFloat { value: f }), - }), - Rc::new(vec![]), - None, - span.clone(), - ), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx: ctx.clone(), - err: None, - }) - } - Some(TokenShape::ShLitStr) => { - let s = tok.clone().unwrap().text.clone(); - Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { value: s }), - }), - Rc::new(vec![]), - None, - span.clone(), - ), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx: ctx.clone(), - err: None, - }) - } - Some(TokenShape::ShStrBegin) => parse_string_interp(&tokens, ctx.clone()), - Some(TokenShape::ShIdent) => { - let n = tok.clone().unwrap().text.clone(); - parse_ident_expr(&tokens, ctx.clone(), &n) - } - Some(TokenShape::ShLParen) => parse_paren_expr(&tokens, &ctx), - Some(TokenShape::ShLBracket) => parse_list_literal(&tokens, &ctx), - Some(TokenShape::ShLBrace) => parse_brace_expr(&tokens, ctx.clone()), - _ => { - let tag = match sh.clone() { - Some(shape) => shape_display_name(shape.clone()), - None => "EOF".to_string(), - }; - Rc::new(ExprResult { - expr: parse_recovery_expr( - span.clone(), - format!("expected expression, found {}", tag.clone()), - ), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error( - format!("expected expression, found {}", tag.clone()), - span.clone(), - )), - }) - } - } - } + }, +} +}, + Some(TokenShape::ShLitInt) => { + let n_opt = v2_rt::parse_int(tok.clone().unwrap().text.clone()); +let n = match n_opt { + Some(v) => v.clone(), + None => return Rc::new(ExprResult { + expr: make_expr_error_node(ExprErrorKind::InternalExprError, &v2_rt::concat(v2_rt::concat("internal: ShLitInt token text not parseable as int: '".to_string(), tok.clone().unwrap().text.clone()), "'".to_string()), &span), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}), +}; +Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitInt { + value: n.clone(), +}), +}), Rc::new(vec![]), None, span.clone()), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + ctx: ctx.clone(), + err: None, +}) +}, + Some(TokenShape::ShLitFloat) => { + let f = tok.clone().unwrap().text.clone(); +Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitFloat { + value: f, +}), +}), Rc::new(vec![]), None, span.clone()), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + ctx: ctx.clone(), + err: None, +}) +}, + Some(TokenShape::ShLitStr) => { + let s = tok.clone().unwrap().text.clone(); +Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: s, +}), +}), Rc::new(vec![]), None, span.clone()), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + ctx: ctx.clone(), + err: None, +}) +}, + Some(TokenShape::ShStrBegin) => parse_string_interp(&tokens, ctx.clone()), + Some(TokenShape::ShIdent) => { + let n = tok.clone().unwrap().text.clone(); +parse_ident_expr(&tokens, ctx.clone(), &n) +}, + Some(TokenShape::ShLParen) => parse_paren_expr(&tokens, &ctx), + Some(TokenShape::ShLBracket) => parse_list_literal(&tokens, &ctx), + Some(TokenShape::ShLBrace) => parse_brace_expr(&tokens, ctx.clone()), + _ => { + let tag = match sh.clone() { + Some(shape) => shape_display_name(shape.clone()), + None => "EOF".to_string(), +}; +Rc::new(ExprResult { + expr: parse_recovery_expr(span.clone(), format!("expected expression, found {}", tag.clone())), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error(format!("expected expression, found {}", tag.clone()), span.clone())), +}) +}, +} +} } pub fn parse_lambda_body(tokens: &Rc>>, ctx: Rc) -> Rc { { let tokens = skip_newlines(tokens.clone()); - let tok = tokens.clone().first().cloned(); - let is_block = (tok_is_keyword(tok.clone(), "let".to_string()) - || tok_is_keyword(tok.clone(), "return".to_string())); - if is_block { +let tok = tokens.clone().first().cloned(); +let is_block = (tok_is_keyword(tok.clone(), "let".to_string()) || tok_is_keyword(tok.clone(), "return".to_string())); +if is_block { { let r = parse_lambda_stmts(tokens.clone(), ctx, Rc::new(vec![])); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: parse_recovery_placeholder(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let span = token_span(tokens.clone().first().cloned()); - if ((r.stmts.clone().len() as i64) == 1) { + expr: parse_recovery_placeholder(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let span = token_span(tokens.clone().first().cloned()); +if ((r.stmts.clone().len() as i64) == 1) { Rc::new(ExprResult { - expr: r.stmts.clone().first().cloned().clone().unwrap(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) + expr: r.stmts.clone().first().cloned().clone().unwrap(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) } else { Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprBlock), - r.stmts.clone(), - None, - span, - ), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) + expr: make_expr_node(Rc::new(ExprData::ExprBlock), r.stmts.clone(), None, span), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) } - } +} } else { parse_expr(tokens.clone(), ctx) } - } +} } -pub fn parse_lambda_stmts( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_lambda_stmts(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - let tok = tokens.clone().first().cloned(); - if ((tok_is_rparen(tok.clone()) || tok_is_rbrace(tok.clone())) || tok_is_eof(tok.clone())) { +let tok = tokens.clone().first().cloned(); +if ((tok_is_rparen(tok.clone()) || tok_is_rbrace(tok.clone())) || tok_is_eof(tok.clone())) { break Rc::new(StmtsResult { - stmts: acc.clone(), - tokens: tokens.clone(), - ctx: ctx, - err: None, - }); - } else { + stmts: acc.clone(), + tokens: tokens.clone(), + ctx: ctx, + err: None, +}); +} else { let r = parse_stmt(&tokens, ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(StmtsResult { - stmts: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + stmts: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - { +{ let __tco_0 = r.tokens.clone(); - let __tco_1 = r.ctx.clone(); - let __tco_2 = v2_rt::rc_list_push(acc, r.expr.clone()); - tokens = __tco_0; - ctx = __tco_1; - acc = __tco_2; - continue; - } - } - } +let __tco_1 = r.ctx.clone(); +let __tco_2 = v2_rt::rc_list_push(acc, r.expr.clone()); +tokens = __tco_0; +ctx = __tco_1; +acc = __tco_2; +continue; +} +} +} } -pub fn parse_ident_expr( - tokens: &Rc>>, - ctx: Rc, - name: &String, -) -> Rc { +pub fn parse_ident_expr(tokens: &Rc>>, ctx: Rc, name: &String) -> Rc { { let span = token_span(tokens.clone().first().cloned()); - let tokens = Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - if tok_is_fat_arrow(tokens.clone().first().cloned()) { +let tokens = Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()); +if tok_is_fat_arrow(tokens.clone().first().cloned()) { { - let r = parse_lambda_body( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx, - ); - if has_err(r.err.clone()) { - return r.clone(); + let r = parse_lambda_body(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx); +if has_err(r.err.clone()) { + return r.clone() } - Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprLambda), - v2_rt::concat( - Rc::new(vec![r.expr.clone()]), - Rc::new(vec![parsed_name_leaf(name.clone(), span.clone())]), - ), - None, - span.clone(), - ), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } +Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprLambda), v2_rt::concat(Rc::new(vec![r.expr.clone()]), Rc::new(vec![parsed_name_leaf(name.clone(), span.clone())])), None, span.clone()), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } else { - if (is_uppercase_start(name.clone()) && tok_is_lbrace(tokens.clone().first().cloned())) - { + if (is_uppercase_start(name.clone()) && tok_is_lbrace(tokens.clone().first().cloned())) { parse_record_literal(&tokens, &ctx, name.clone(), &span) } else { Rc::new(ExprResult { - expr: make_named_expr_node( - &name, - Rc::new(ExprData::ExprVar { binding_kind: None }), - Rc::new(vec![]), - None, - span.clone(), - span.clone(), - ), - tokens: tokens.clone(), - ctx: ctx, - err: None, - }) + expr: make_named_expr_node(&name, Rc::new(ExprData::ExprVar { + binding_kind: None, +}), Rc::new(vec![]), None, span.clone(), span.clone()), + tokens: tokens.clone(), + ctx: ctx, + err: None, +}) } } - } +} } pub fn is_uppercase_start(name: String) -> bool { { let ch = v2_rt::char_at(&name, 0); - ((ch.clone() >= "A".to_string()) && (ch.clone() <= "Z".to_string())) - } +((ch.clone() >= "A".to_string()) && (ch.clone() <= "Z".to_string())) +} } -pub fn try_postfix( - tokens: &Rc>>, - ctx: &Rc, - lhs: &Rc, - min_bp: i64, -) -> Rc { +pub fn try_postfix(tokens: &Rc>>, ctx: &Rc, lhs: &Rc, min_bp: i64) -> Rc { { let tok = tokens.clone().first().cloned(); - let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, - }; - let span = token_span(tok.clone()); - match sh { - Some(TokenShape::ShLParen) => { - if (14 < min_bp) { - Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } else { - { - let r = parse_call_args(&tokens, &ctx); - if has_err(r.err.clone()) { - return Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let call_expr = - make_call_expr(&lhs, r.args.clone(), span, ctx.source_indices.clone()); - Rc::new(PostfixResult { - expr: call_expr, - changed: true, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) +let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, +}; +let span = token_span(tok.clone()); +match sh { + Some(TokenShape::ShLParen) => if (14 < min_bp) { + Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) + } else { + { + let r = parse_call_args(&tokens, &ctx); +if has_err(r.err.clone()) { + return Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let call_expr = make_call_expr(&lhs, r.args.clone(), span, ctx.source_indices.clone()); +Rc::new(PostfixResult { + expr: call_expr, + changed: true, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} + }, + Some(TokenShape::ShIdent) => if (tok.clone().unwrap().text.clone().as_str() == "as".to_string().as_str()) { + if (13 < min_bp) { + Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) + } else { + { + let r = parse_type_expr(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &ctx); +if has_err(r.err.clone()) { + return Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - } +Rc::new(PostfixResult { + expr: make_expr_node(Rc::new(ExprData::ExprCast), Rc::new(vec![lhs.clone(), r.type_expr.clone()]), None, span), + changed: true, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } - Some(TokenShape::ShIdent) => { - if (tok.clone().unwrap().text.clone().as_str() == "as".to_string().as_str()) { - if (13 < min_bp) { - Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } else { - { - let r = parse_type_expr( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - &ctx, - ); - if has_err(r.err.clone()) { - return Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - Rc::new(PostfixResult { - expr: make_expr_node( - Rc::new(ExprData::ExprCast), - Rc::new(vec![lhs.clone(), r.type_expr.clone()]), - None, - span, - ), - changed: true, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } + } else { + Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) + }, + Some(TokenShape::ShLBracket) => if (14 < min_bp) { + Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) + } else { + if is_constraint_bracket(tokens.clone()) { + Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) + } else { + { + let r = parse_index_or_slice(&tokens, &ctx, lhs.clone(), span); +if has_err(r.err.clone()) { + return Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - } else { - Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } +Rc::new(PostfixResult { + expr: r.expr.clone(), + changed: true, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } - Some(TokenShape::ShLBracket) => { - if (14 < min_bp) { - Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } else { - if is_constraint_bracket(tokens.clone()) { - Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } else { - { - let r = parse_index_or_slice(&tokens, &ctx, lhs.clone(), span); - if has_err(r.err.clone()) { - return Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - Rc::new(PostfixResult { - expr: r.expr.clone(), - changed: true, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) + }, + Some(TokenShape::ShLBrace) => match (*lhs.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let n = expr_var_name_at(lhs.clone(), ctx.source_indices.clone()); +if (is_uppercase_start(n.clone()) && (14 <= min_bp)) { + Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) + } else { + if is_uppercase_start(n.clone()) { + { + let r = parse_record_literal(&tokens, &ctx, n.clone(), &lhs.span.clone()); +if has_err(r.err.clone()) { + return Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - } +Rc::new(PostfixResult { + expr: r.expr.clone(), + changed: true, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} + } else { + Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) } } - Some(TokenShape::ShLBrace) => match (*lhs.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let n = expr_var_name_at(lhs.clone(), ctx.source_indices.clone()); - if (is_uppercase_start(n.clone()) && (14 <= min_bp)) { - Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } else { - if is_uppercase_start(n.clone()) { - { - let r = parse_record_literal( - &tokens, - &ctx, - n.clone(), - &lhs.span.clone(), - ); - if has_err(r.err.clone()) { - return Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - Rc::new(PostfixResult { - expr: r.expr.clone(), - changed: true, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } - } else { - Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } - } - } - _ => Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }), - }, - _ => Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }), - } - } +}, + _ => Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}), +}, + _ => Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}), +} +} } pub fn is_constraint_bracket(tokens: Rc>>) -> bool { match tokens.get(1 as usize).cloned() { - Some(t) => { - if is_ident_shape(t.shape.clone()) { - ((t.text.clone().as_str() == "after".to_string().as_str()) - || (t.text.clone().as_str() == "when".to_string().as_str())) - } else { - false - } - } - None => false, - } + Some(t) => if is_ident_shape(t.shape.clone()) { + ((t.text.clone().as_str() == "after".to_string().as_str()) || (t.text.clone().as_str() == "when".to_string().as_str())) + } else { + false + }, + None => false, +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -11134,2964 +9037,2240 @@ pub struct ConstraintsResult { pub err: Option>, } -pub fn parse_constraint_annotations( - tokens: &Rc>>, - ctx: Rc, -) -> Rc { +pub fn parse_constraint_annotations(tokens: &Rc>>, ctx: Rc) -> Rc { match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLBracket))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r = parse_constraint_list(__ec.clone(), ctx, Rc::new(vec![])); - if has_err(r.err.clone()) { - return r.clone(); - } - let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBracket)); - if has_err(r2.err.clone()) { - return Rc::new(ConstraintsResult { - constraints: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), - }); - } - Rc::new(ConstraintsResult { - constraints: r.constraints.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } - EatResult::EatUnchanged { tokens: __eu, .. } => Rc::new(ConstraintsResult { - constraints: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx, - err: None, - }), - } + EatResult::EatConsumed { tokens: __ec, .. } => { + let r = parse_constraint_list(__ec.clone(), ctx, Rc::new(vec![])); +if has_err(r.err.clone()) { + return r.clone() + } +let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBracket)); +if has_err(r2.err.clone()) { + return Rc::new(ConstraintsResult { + constraints: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), +}) + } +Rc::new(ConstraintsResult { + constraints: r.constraints.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +}, + EatResult::EatUnchanged { tokens: __eu, .. } => Rc::new(ConstraintsResult { + constraints: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx, + err: None, +}), +} } -pub fn parse_constraint_list( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_constraint_list(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - let tok = tokens.clone().first().cloned(); - let is_constraint_kw = match tok.clone() { - Some(t) => { - (is_ident_shape(t.shape.clone()) - && ((t.text.clone().as_str() == "after".to_string().as_str()) - || (t.text.clone().as_str() == "when".to_string().as_str()))) - } - None => false, - }; - if !is_constraint_kw { - return Rc::new(ConstraintsResult { - constraints: acc.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } - let kw_name = tok.clone().unwrap().text.clone(); - let r = parse_expr( - Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx.clone(), - ); - if has_err(r.err.clone()) { +let tok = tokens.clone().first().cloned(); +let is_constraint_kw = match tok.clone() { + Some(t) => (is_ident_shape(t.shape.clone()) && ((t.text.clone().as_str() == "after".to_string().as_str()) || (t.text.clone().as_str() == "when".to_string().as_str()))), + None => false, +}; +if !is_constraint_kw { return Rc::new(ConstraintsResult { - constraints: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let fi = make_field_init_node(&kw_name, r.expr.clone(), make_span(0, 0), make_span(0, 0)); - acc = v2_rt::rc_list_push(acc.clone(), fi); - match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let __tco_0 = __ec.clone(); - let __tco_1 = r.ctx.clone(); - tokens = __tco_0; - ctx = __tco_1; - continue; - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - break Rc::new(ConstraintsResult { - constraints: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }); - } + constraints: acc.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) } - } -} - -pub fn try_constraint_annotations( - tokens: &Rc>>, - ctx: Rc, -) -> Rc { +let kw_name = tok.clone().unwrap().text.clone(); +let r = parse_expr(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx.clone()); +if has_err(r.err.clone()) { + return Rc::new(ConstraintsResult { + constraints: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let fi = make_field_init_node(&kw_name, r.expr.clone(), make_span(0, 0), make_span(0, 0)); +acc = v2_rt::rc_list_push(acc.clone(), fi); +match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { { + let __tco_0 = __ec.clone(); +let __tco_1 = r.ctx.clone(); +tokens = __tco_0; +ctx = __tco_1; +continue; +} }, + EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(ConstraintsResult { + constraints: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}); }, +} +} +} + +pub fn try_constraint_annotations(tokens: &Rc>>, ctx: Rc) -> Rc { if is_constraint_bracket(tokens.clone()) { parse_constraint_annotations(&tokens, ctx) } else { Rc::new(ConstraintsResult { - constraints: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx, - err: None, - }) + constraints: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx, + err: None, +}) } } -pub fn make_call_expr( - lhs: &Rc, - args: Rc>>, - span: Rc, - source_indices: Rc>>, -) -> Rc { +pub fn make_call_expr(lhs: &Rc, args: Rc>>, span: Rc, source_indices: Rc>>) -> Rc { match (*lhs.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => make_named_expr_node( - &expr_var_name_at(lhs.clone(), source_indices), - Rc::new(ExprData::ExprCall { - call_semantics: None, - descent_evidence: None, - }), - args, - None, - lhs.span.clone(), - node_name_span(&lhs), - ), - ExprData::ExprFieldAccess { .. } => make_named_expr_node( - &field_access_field_at(lhs.clone(), source_indices), - Rc::new(ExprData::ExprMethodCall { - method_semantics: None, - }), - v2_rt::concat( - Rc::new(vec![lhs.children.clone().first().cloned().clone().unwrap()]), - args, - ), - None, - lhs.span.clone(), - node_name_span(&lhs), - ), - _ => make_named_expr_node( - &"".to_string(), - Rc::new(ExprData::ExprCall { - call_semantics: None, - descent_evidence: None, - }), - args, - None, - lhs.span.clone(), - no_span(), - ), - } + ExprData::ExprVar { .. } => make_named_expr_node(&expr_var_name_at(lhs.clone(), source_indices), Rc::new(ExprData::ExprCall { + call_semantics: None, + descent_evidence: None, +}), args, None, lhs.span.clone(), node_name_span(&lhs)), + ExprData::ExprFieldAccess { .. } => make_named_expr_node(&field_access_field_at(lhs.clone(), source_indices), Rc::new(ExprData::ExprMethodCall { + method_semantics: None, +}), v2_rt::concat(Rc::new(vec![lhs.children.clone().first().cloned().clone().unwrap()]), args), None, lhs.span.clone(), node_name_span(&lhs)), + _ => make_named_expr_node(&"".to_string(), Rc::new(ExprData::ExprCall { + call_semantics: None, + descent_evidence: None, +}), args, None, lhs.span.clone(), no_span()), +} } -pub fn parse_index_or_slice( - tokens: &Rc>>, - ctx: &Rc, - base: Rc, - span: Rc, -) -> Rc { +pub fn parse_index_or_slice(tokens: &Rc>>, ctx: &Rc, base: Rc, span: Rc) -> Rc { { let dummy_expr = parse_recovery_placeholder(); - let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBracket)); - if has_err(r.err.clone()) { +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBracket)); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r = parse_expr(r.tokens.clone(), ctx.clone()); - if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let r = parse_expr(r.tokens.clone(), ctx.clone()); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let first_expr = r.expr.clone(); - let tokens = r.tokens.clone(); - let ctx = r.ctx.clone(); - if tok_is_dot_dot(tokens.clone().first().cloned()) { + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let first_expr = r.expr.clone(); +let tokens = r.tokens.clone(); +let ctx = r.ctx.clone(); +if tok_is_dot_dot(tokens.clone().first().cloned()) { { - let r = parse_expr( - Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx.clone(), - ); - if has_err(r.err.clone()) { + let r = parse_expr(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx.clone()); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let end_expr = r.expr.clone(); - let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBracket)); - if has_err(r.err.clone()) { + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let end_expr = r.expr.clone(); +let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBracket)); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprSlice), - Rc::new(vec![base, first_expr, end_expr]), - None, - span, - ), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } +Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprSlice), Rc::new(vec![base, first_expr, end_expr]), None, span), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: None, +}) +} } else { { let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBracket)); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprIndex), - Rc::new(vec![base, first_expr]), - None, - span, - ), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } +Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprIndex), Rc::new(vec![base, first_expr]), None, span), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: None, +}) +} } - } +} } pub fn parse_call_args(tokens: &Rc>>, ctx: &Rc) -> Rc { { let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLParen)); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ArgsResult { - args: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); + args: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - let tokens = skip_newlines(r.tokens.clone()); - if tok_is_rparen(tokens.clone().first().cloned()) { +let tokens = skip_newlines(r.tokens.clone()); +if tok_is_rparen(tokens.clone().first().cloned()) { Rc::new(ArgsResult { - args: Rc::new(vec![]), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx: ctx.clone(), - err: None, - }) + args: Rc::new(vec![]), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + ctx: ctx.clone(), + err: None, +}) } else { { let r = parse_arg_list(tokens.clone(), ctx.clone()); - if has_err(r.err.clone()) { - return r.clone(); +if has_err(r.err.clone()) { + return r.clone() } - let tokens = skip_newlines(r.tokens.clone()); - let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRParen)); - if has_err(r2.err.clone()) { +let tokens = skip_newlines(r.tokens.clone()); +let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRParen)); +if has_err(r2.err.clone()) { return Rc::new(ArgsResult { - args: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), - }); + args: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), +}) } - Rc::new(ArgsResult { - args: r.args.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } +Rc::new(ArgsResult { + args: r.args.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } - } +} } pub fn parse_arg_list(tokens: Rc>>, ctx: Rc) -> Rc { parse_arg_list_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_arg_list_acc( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_arg_list_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - let r = parse_single_arg(&tokens, ctx); - if has_err(r.err.clone()) { +let r = parse_single_arg(&tokens, ctx); +if has_err(r.err.clone()) { return Rc::new(ArgsResult { - args: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - acc = v2_rt::rc_list_push(acc.clone(), r.arg.clone()); - match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - tokens = skip_newlines(__ec.clone()); - if tok_is_rparen(tokens.clone().first().cloned()) { - break Rc::new(ArgsResult { - args: acc.clone(), - tokens: tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }); - } else { - { - let __tco_0 = r.ctx.clone(); - ctx = __tco_0; - continue; - } - } - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - break Rc::new(ArgsResult { - args: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }); - } - } - } + args: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +acc = v2_rt::rc_list_push(acc.clone(), r.arg.clone()); +match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { tokens = skip_newlines(__ec.clone()); +if tok_is_rparen(tokens.clone().first().cloned()) { + break Rc::new(ArgsResult { + args: acc.clone(), + tokens: tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}); +} else { + { + let __tco_0 = r.ctx.clone(); +ctx = __tco_0; +continue; +} +} }, + EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(ArgsResult { + args: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}); }, +} +} } pub fn parse_single_arg(tokens: &Rc>>, ctx: Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); - let dummy_arg = make_arg_node( - None, - parse_recovery_placeholder(), - span.clone(), - span.clone(), - ); - let tok = tokens.clone().first().cloned(); - let is_name_token = (tok_is_ident(tok.clone()) || tok_is_keyword_name(tok.clone())); - if is_name_token { +let dummy_arg = make_arg_node(None, parse_recovery_placeholder(), span.clone(), span.clone()); +let tok = tokens.clone().first().cloned(); +let is_name_token = (tok_is_ident(tok.clone()) || tok_is_keyword_name(tok.clone())); +if is_name_token { { let name_r = expect_name(&tokens); - if has_err(name_r.err.clone()) { +if has_err(name_r.err.clone()) { { let r = parse_expr(tokens.clone(), ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ArgResult { - arg: dummy_arg, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + arg: dummy_arg, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - let arg = make_arg_node(None, r.expr.clone(), span.clone(), span.clone()); - Rc::new(ArgResult { - arg: arg, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } +let arg = make_arg_node(None, r.expr.clone(), span.clone(), span.clone()); +Rc::new(ArgResult { + arg: arg, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } else { if tok_is_colon(name_r.tokens.clone().first().cloned()) { { - let r = parse_expr( - Rc::new( - name_r - .tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx, - ); - if has_err(r.err.clone()) { + let r = parse_expr(Rc::new(name_r.tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx); +if has_err(r.err.clone()) { return Rc::new(ArgResult { - arg: dummy_arg, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + arg: dummy_arg, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - let arg = make_arg_node( - Some(name_r.name.clone()), - r.expr.clone(), - span.clone(), - name_r.span.clone(), - ); - Rc::new(ArgResult { - arg: arg, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } +let arg = make_arg_node(Some(name_r.name.clone()), r.expr.clone(), span.clone(), name_r.span.clone()); +Rc::new(ArgResult { + arg: arg, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } else { { let r = parse_expr(tokens.clone(), ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ArgResult { - arg: dummy_arg, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + arg: dummy_arg, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - let arg = - make_arg_node(None, r.expr.clone(), span.clone(), span.clone()); - Rc::new(ArgResult { - arg: arg, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } +let arg = make_arg_node(None, r.expr.clone(), span.clone(), span.clone()); +Rc::new(ArgResult { + arg: arg, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } } - } +} } else { { let r = parse_expr(tokens.clone(), ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ArgResult { - arg: dummy_arg, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + arg: dummy_arg, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - let arg = make_arg_node(None, r.expr.clone(), span.clone(), span.clone()); - Rc::new(ArgResult { - arg: arg, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } +let arg = make_arg_node(None, r.expr.clone(), span.clone(), span.clone()); +Rc::new(ArgResult { + arg: arg, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } - } +} } pub fn parse_match(tokens: &Rc>>, ctx: &Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); - let dummy_expr = parse_recovery_placeholder(); - let r = expect( - &tokens, - &Rc::new(ExpectedToken::ExpectKeyword { - text: "match".to_string(), - }), - ); - if has_err(r.err.clone()) { +let dummy_expr = parse_recovery_placeholder(); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { + text: "match".to_string(), +})); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r = parse_expr_no_brace(r.tokens.clone(), ctx.clone()); - if has_err(r.err.clone()) { - return r.clone(); - } - let scrutinee = r.expr.clone(); - let r = expect( - &skip_newlines(r.tokens.clone()), - &Rc::new(ExpectedToken::ExpectLBrace), - ); - if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let r = parse_expr_no_brace(r.tokens.clone(), ctx.clone()); +if has_err(r.err.clone()) { + return r.clone() + } +let scrutinee = r.expr.clone(); +let r = expect(&skip_newlines(r.tokens.clone()), &Rc::new(ExpectedToken::ExpectLBrace)); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r = parse_match_arms(skip_newlines(r.tokens.clone()), ctx.clone()); - if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let r = parse_match_arms(skip_newlines(r.tokens.clone()), ctx.clone()); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let arms = r.arms.clone(); - let r = expect( - &skip_newlines(r.tokens.clone()), - &Rc::new(ExpectedToken::ExpectRBrace), - ); - if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let arms = r.arms.clone(); +let r = expect(&skip_newlines(r.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprMatch), - v2_rt::concat(Rc::new(vec![scrutinee]), arms), - None, - span, - ), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprMatch), v2_rt::concat(Rc::new(vec![scrutinee]), arms), None, span), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: None, +}) +} } pub fn parse_expr_no_brace(tokens: Rc>>, ctx: Rc) -> Rc { parse_expr_bp_no_brace(tokens, ctx, 0) } -pub fn parse_expr_bp_no_brace( - tokens: Rc>>, - ctx: Rc, - min_bp: i64, -) -> Rc { +pub fn parse_expr_bp_no_brace(tokens: Rc>>, ctx: Rc, min_bp: i64) -> Rc { { let r = parse_prefix(&tokens, ctx); - if has_err(r.err.clone()) { - return r.clone(); +if has_err(r.err.clone()) { + return r.clone() } - let lhs = r.expr.clone(); - parse_expr_loop_no_brace(r.tokens.clone(), r.ctx.clone(), lhs, min_bp) - } +let lhs = r.expr.clone(); +parse_expr_loop_no_brace(r.tokens.clone(), r.ctx.clone(), lhs, min_bp) +} } -pub fn parse_expr_loop_no_brace( - mut tokens: Rc>>, - mut ctx: Rc, - mut lhs: Rc, - mut min_bp: i64, -) -> Rc { +pub fn parse_expr_loop_no_brace(mut tokens: Rc>>, mut ctx: Rc, mut lhs: Rc, mut min_bp: i64) -> Rc { loop { let tok = tokens.clone().first().cloned(); - if (tok_is_eof(tok.clone()) || tok_is_lbrace(tok.clone())) { +if (tok_is_eof(tok.clone()) || tok_is_lbrace(tok.clone())) { break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } else { + expr: lhs.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); +} else { let loop_span = token_span(tok.clone()); - tokens = skip_continuation_newlines(&tokens); - if (tok_is_lparen(tokens.clone().first().cloned()) && (14 >= min_bp.clone())) { +tokens = skip_continuation_newlines(&tokens); +if (tok_is_lparen(tokens.clone().first().cloned()) && (14 >= min_bp.clone())) { let r = parse_call_args(&tokens, &ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: lhs.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let span = token_span(tokens.clone().first().cloned()); - let new_lhs = - make_call_expr(&lhs, r.args.clone(), span, ctx.source_indices.clone()); - { + expr: lhs.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let span = token_span(tokens.clone().first().cloned()); +let new_lhs = make_call_expr(&lhs, r.args.clone(), span, ctx.source_indices.clone()); +{ let __tco_0 = r.tokens.clone(); - let __tco_1 = r.ctx.clone(); - let __tco_2 = new_lhs; - tokens = __tco_0; - ctx = __tco_1; - lhs = __tco_2; - continue; - } - } else { +let __tco_1 = r.ctx.clone(); +let __tco_2 = new_lhs; +tokens = __tco_0; +ctx = __tco_1; +lhs = __tco_2; +continue; +} +} else { if (tok_is_lbracket(tokens.clone().first().cloned()) && (14 >= min_bp.clone())) { let span = token_span(tokens.clone().first().cloned()); - let r = parse_index_or_slice(&tokens, &ctx, lhs.clone(), span); - if has_err(r.err.clone()) { +let r = parse_index_or_slice(&tokens, &ctx, lhs.clone(), span); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - { +{ let __tco_0 = r.tokens.clone(); - let __tco_1 = r.ctx.clone(); - let __tco_2 = r.expr.clone(); - tokens = __tco_0; - ctx = __tco_1; - lhs = __tco_2; - continue; - } - } else { +let __tco_1 = r.ctx.clone(); +let __tco_2 = r.expr.clone(); +tokens = __tco_0; +ctx = __tco_1; +lhs = __tco_2; +continue; +} +} else { let bp = infix_bp(tokens.clone()); - match bp { - Some(bps) => { - if (bps.left.clone() < min_bp.clone()) { - break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } else { - match (*advance(&tokens)).clone() { - AdvanceResult::AdvanceOk { - token: op_tok, - tokens: rest, - .. - } => { - let op_shape = op_tok.shape.clone(); - if is_dot_shape(op_shape.clone()) { - let r = expect_name(&rest); - if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: lhs.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let new_lhs = make_named_expr_node( - &r.name.clone(), - Rc::new(ExprData::ExprFieldAccess { - summary: None, - }), - Rc::new(vec![lhs.clone()]), - None, - loop_span, - r.span.clone(), - ); - { - let __tco_0 = r.tokens.clone(); - let __tco_1 = new_lhs; - tokens = __tco_0; - lhs = __tco_1; - continue; - } - } else { - if is_pipe_arrow_shape(op_shape.clone()) { - let r = parse_pipe_rhs( - &rest, - &ctx, - lhs.clone(), - loop_span, - ); - if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - { - let __tco_0 = r.tokens.clone(); - let __tco_1 = r.ctx.clone(); - let __tco_2 = r.expr.clone(); - tokens = __tco_0; - ctx = __tco_1; - lhs = __tco_2; - continue; - } - } else { - tokens = skip_newlines(rest.clone()); - let r = parse_expr_bp_no_brace( - tokens.clone(), - ctx.clone(), - bps.right.clone(), - ); - if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let binop_opt = find_operator_binop( - dag_syntax_spec().operators.clone(), - op_tok.text.clone(), - ); - match binop_opt { - Some(binop) => { - let new_lhs = make_expr_node( - Rc::new(ExprData::ExprBinOp { - op: binop.clone(), - algebra_field: None, - }), - Rc::new(vec![ - lhs.clone(), - r.expr.clone(), - ]), - None, - loop_span, - ); - { - let __tco_0 = r.tokens.clone(); - let __tco_1 = r.ctx.clone(); - let __tco_2 = new_lhs; - tokens = __tco_0; - ctx = __tco_1; - lhs = __tco_2; - continue; - } - } - None => { - break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: Some(parse_error( - v2_rt::concat( - "unknown binary operator: " - .to_string(), - op_tok.text.clone(), - ), - loop_span, - )), - }); - } - } - } - } - } - AdvanceResult::AdvanceEof => { - break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } - } +match bp { + Some(bps) => { if (bps.left.clone() < min_bp.clone()) { + break Rc::new(ExprResult { + expr: lhs.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); +} else { + match (*advance(&tokens)).clone() { + AdvanceResult::AdvanceOk { token: op_tok, tokens: rest, .. } => { let op_shape = op_tok.shape.clone(); +if is_dot_shape(op_shape.clone()) { + let r = expect_name(&rest); +if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: lhs.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - } - None => { - break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } - } - } - } - } - } +let new_lhs = make_named_expr_node(&r.name.clone(), Rc::new(ExprData::ExprFieldAccess { + summary: None, +}), Rc::new(vec![lhs.clone()]), None, loop_span, r.span.clone()); +{ + let __tco_0 = r.tokens.clone(); +let __tco_1 = new_lhs; +tokens = __tco_0; +lhs = __tco_1; +continue; +} +} else { + if is_pipe_arrow_shape(op_shape.clone()) { + let r = parse_pipe_rhs(&rest, &ctx, lhs.clone(), loop_span); +if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +{ + let __tco_0 = r.tokens.clone(); +let __tco_1 = r.ctx.clone(); +let __tco_2 = r.expr.clone(); +tokens = __tco_0; +ctx = __tco_1; +lhs = __tco_2; +continue; +} +} else { + tokens = skip_newlines(rest.clone()); +let r = parse_expr_bp_no_brace(tokens.clone(), ctx.clone(), bps.right.clone()); +if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let binop_opt = find_operator_binop(dag_syntax_spec().operators.clone(), op_tok.text.clone()); +match binop_opt { + Some(binop) => { let new_lhs = make_expr_node(Rc::new(ExprData::ExprBinOp { + op: binop.clone(), + algebra_field: None, +}), Rc::new(vec![lhs.clone(), r.expr.clone()]), None, loop_span); +{ + let __tco_0 = r.tokens.clone(); +let __tco_1 = r.ctx.clone(); +let __tco_2 = new_lhs; +tokens = __tco_0; +ctx = __tco_1; +lhs = __tco_2; +continue; +} }, + None => { break Rc::new(ExprResult { + expr: lhs.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: Some(parse_error(v2_rt::concat("unknown binary operator: ".to_string(), op_tok.text.clone()), loop_span)), +}); }, +} +} +} }, + AdvanceResult::AdvanceEof => { break Rc::new(ExprResult { + expr: lhs.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); }, +} +} }, + None => { break Rc::new(ExprResult { + expr: lhs.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); }, +} +} +} +} +} } pub fn parse_match_arms(tokens: Rc>>, ctx: Rc) -> Rc { parse_match_arms_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_match_arms_acc( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_match_arms_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - if (tok_is_rbrace(tokens.clone().first().cloned()) - || tok_is_eof(tokens.clone().first().cloned())) - { +if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { break Rc::new(ArmsResult { - arms: acc.clone(), - tokens: tokens.clone(), - ctx: ctx, - err: None, - }); - } else { + arms: acc.clone(), + tokens: tokens.clone(), + ctx: ctx, + err: None, +}); +} else { let r = parse_match_arm(&tokens, &ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ArmsResult { - arms: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let e = eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); - tokens = skip_newlines(match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => r.tokens.clone(), - }); - { + arms: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let e = eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); +tokens = skip_newlines(match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => r.tokens.clone(), +}); +{ let __tco_0 = r.ctx.clone(); - let __tco_1 = v2_rt::rc_list_push(acc, r.arm.clone()); - ctx = __tco_0; - acc = __tco_1; - continue; - } - } - } +let __tco_1 = v2_rt::rc_list_push(acc, r.arm.clone()); +ctx = __tco_0; +acc = __tco_1; +continue; +} +} +} } pub fn parse_match_arm(tokens: &Rc>>, ctx: &Rc) -> Rc { { let arm_span = token_span(tokens.clone().first().cloned()); - let dummy_arm = make_arm_node( - Rc::new(MatchPattern::Wildcard), - None, - parse_recovery_placeholder(), - make_span(0, 0), - ); - let r = parse_pattern(&tokens, &ctx); - if has_err(r.err.clone()) { +let dummy_arm = make_arm_node(Rc::new(MatchPattern::Wildcard), None, parse_recovery_placeholder(), make_span(0, 0)); +let r = parse_pattern(&tokens, &ctx); +if has_err(r.err.clone()) { return Rc::new(ArmResult { - arm: dummy_arm.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let pat = r.pattern.clone(); - let tokens = r.tokens.clone(); - let ctx = r.ctx.clone(); - let guard_r = parse_optional_guard(&tokens, ctx.clone()); - if has_err(guard_r.err.clone()) { + arm: dummy_arm.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let pat = r.pattern.clone(); +let tokens = r.tokens.clone(); +let ctx = r.ctx.clone(); +let guard_r = parse_optional_guard(&tokens, ctx.clone()); +if has_err(guard_r.err.clone()) { return Rc::new(ArmResult { - arm: dummy_arm.clone(), - tokens: guard_r.tokens.clone(), - ctx: guard_r.ctx.clone(), - err: guard_r.err.clone(), - }); - } - let guard = guard_r.guard.clone(); - let tokens = guard_r.tokens.clone(); - let ctx = guard_r.ctx.clone(); - let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectFatArrow)); - if has_err(r.err.clone()) { + arm: dummy_arm.clone(), + tokens: guard_r.tokens.clone(), + ctx: guard_r.ctx.clone(), + err: guard_r.err.clone(), +}) + } +let guard = guard_r.guard.clone(); +let tokens = guard_r.tokens.clone(); +let ctx = guard_r.ctx.clone(); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectFatArrow)); +if has_err(r.err.clone()) { return Rc::new(ArmResult { - arm: dummy_arm.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let tokens = skip_newlines(r.tokens.clone()); - let r = if tok_is_lbrace(tokens.clone().first().cloned()) { + arm: dummy_arm.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let tokens = skip_newlines(r.tokens.clone()); +let r = if tok_is_lbrace(tokens.clone().first().cloned()) { parse_block(&tokens, &ctx) } else { parse_match_arm_body(&tokens, ctx.clone()) }; - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ArmResult { - arm: dummy_arm.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let arm = make_arm_node(pat, guard, r.expr.clone(), arm_span); - Rc::new(ArmResult { - arm: arm, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } + arm: dummy_arm.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let arm = make_arm_node(pat, guard, r.expr.clone(), arm_span); +Rc::new(ArmResult { + arm: arm, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } pub fn parse_match_arm_body(tokens: &Rc>>, ctx: Rc) -> Rc { { let tok = tokens.clone().first().cloned(); - let is_block = (tok_is_keyword(tok.clone(), "let".to_string()) - || tok_is_keyword(tok.clone(), "return".to_string())); - if is_block { +let is_block = (tok_is_keyword(tok.clone(), "let".to_string()) || tok_is_keyword(tok.clone(), "return".to_string())); +if is_block { { let r = parse_match_arm_stmts(tokens.clone(), ctx, Rc::new(vec![])); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: parse_recovery_placeholder(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let span = token_span(tokens.clone().first().cloned()); - if ((r.stmts.clone().len() as i64) == 1) { + expr: parse_recovery_placeholder(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let span = token_span(tokens.clone().first().cloned()); +if ((r.stmts.clone().len() as i64) == 1) { Rc::new(ExprResult { - expr: r.stmts.clone().first().cloned().clone().unwrap(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) + expr: r.stmts.clone().first().cloned().clone().unwrap(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) } else { Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprBlock), - r.stmts.clone(), - None, - span, - ), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) + expr: make_expr_node(Rc::new(ExprData::ExprBlock), r.stmts.clone(), None, span), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) } - } +} } else { parse_expr(tokens.clone(), ctx) } - } +} } -pub fn parse_match_arm_stmts( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_match_arm_stmts(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - if (tok_is_rbrace(tokens.clone().first().cloned()) - || tok_is_eof(tokens.clone().first().cloned())) - { +if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { break Rc::new(StmtsResult { - stmts: acc.clone(), - tokens: tokens.clone(), - ctx: ctx, - err: None, - }); - } else { + stmts: acc.clone(), + tokens: tokens.clone(), + ctx: ctx, + err: None, +}); +} else { if looks_like_arm_start(&tokens) { break Rc::new(StmtsResult { - stmts: acc.clone(), - tokens: tokens.clone(), - ctx: ctx, - err: None, - }); - } else { + stmts: acc.clone(), + tokens: tokens.clone(), + ctx: ctx, + err: None, +}); +} else { let r = parse_stmt(&tokens, ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(StmtsResult { - stmts: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + stmts: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - { +{ let __tco_0 = r.tokens.clone(); - let __tco_1 = r.ctx.clone(); - let __tco_2 = v2_rt::rc_list_push(acc, r.expr.clone()); - tokens = __tco_0; - ctx = __tco_1; - acc = __tco_2; - continue; - } - } - } - } +let __tco_1 = r.ctx.clone(); +let __tco_2 = v2_rt::rc_list_push(acc, r.expr.clone()); +tokens = __tco_0; +ctx = __tco_1; +acc = __tco_2; +continue; +} +} +} +} } pub fn looks_like_arm_start(tokens: &Rc>>) -> bool { { let tok = tokens.clone().first().cloned(); - let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, - }; - match sh { - Some(TokenShape::ShIdent) => { - let n = tok.clone().unwrap().text.clone(); - if (n.clone().as_str() == "_".to_string().as_str()) { - peek_is_fat_arrow_at(tokens.clone(), 1) - } else { - if is_uppercase_start(n.clone()) { - if peek_is_fat_arrow_at(tokens.clone(), 1) { - true +let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, +}; +match sh { + Some(TokenShape::ShIdent) => { + let n = tok.clone().unwrap().text.clone(); +if (n.clone().as_str() == "_".to_string().as_str()) { + peek_is_fat_arrow_at(tokens.clone(), 1) + } else { + if is_uppercase_start(n.clone()) { + if peek_is_fat_arrow_at(tokens.clone(), 1) { + true + } else { + if peek_is_expected_at(tokens.clone(), 1, Rc::new(ExpectedToken::ExpectLBrace)) { + scan_for_fat_arrow_after_braces(Rc::new(tokens.clone().iter().cloned().skip(2 as usize).collect::>()), 1) } else { - if peek_is_expected_at( - tokens.clone(), - 1, - Rc::new(ExpectedToken::ExpectLBrace), - ) { - scan_for_fat_arrow_after_braces( - Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(2 as usize) - .collect::>(), - ), - 1, - ) - } else { - false - } + false } - } else { - false } + } else { + false } } - _ => false, - } - } +}, + _ => false, +} +} } pub fn peek_is_fat_arrow_at(tokens: Rc>>, offset: i64) -> bool { match tokens.get(offset as usize).cloned() { - Some(t) => is_fat_arrow_shape(t.shape.clone()), - None => false, - } + Some(t) => is_fat_arrow_shape(t.shape.clone()), + None => false, +} } -pub fn peek_is_expected_at( - tokens: Rc>>, - offset: i64, - expected: Rc, -) -> bool { +pub fn peek_is_expected_at(tokens: Rc>>, offset: i64, expected: Rc) -> bool { match tokens.get(offset as usize).cloned() { - Some(t) => token_matches_expected(&t, expected), - None => false, - } + Some(t) => token_matches_expected(&t, expected), + None => false, +} } pub fn scan_for_fat_arrow_after_braces(mut remaining: Rc>>, mut depth: i64) -> bool { loop { if (depth.clone() <= 0) { match remaining.clone().first().cloned() { - Some(t) => { - break is_fat_arrow_shape(t.shape.clone()); - } - None => { - break false; - } - } - } else { + Some(t) => { break is_fat_arrow_shape(t.shape.clone()); }, + None => { break false; }, +} +} else { match remaining.clone().first().cloned() { - Some(t) => { - if is_lbrace_shape(t.shape.clone()) { - { - let __tco_0 = Rc::new( - remaining - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - let __tco_1 = (depth + 1); - remaining = __tco_0; - depth = __tco_1; - continue; - } - } else { - if is_rbrace_shape(t.shape.clone()) { - { - let __tco_0 = Rc::new( - remaining - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - let __tco_1 = (depth - 1); - remaining = __tco_0; - depth = __tco_1; - continue; - } - } else { - { - let __tco_0 = Rc::new( - remaining - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - remaining = __tco_0; - continue; - } - } - } - } - None => { - break false; - } - } - } - } + Some(t) => { if is_lbrace_shape(t.shape.clone()) { + { + let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); +let __tco_1 = (depth + 1); +remaining = __tco_0; +depth = __tco_1; +continue; +} +} else { + if is_rbrace_shape(t.shape.clone()) { + { + let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); +let __tco_1 = (depth - 1); +remaining = __tco_0; +depth = __tco_1; +continue; +} +} else { + { + let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); +remaining = __tco_0; +continue; +} +} +} }, + None => { break false; }, +} +} +} } pub fn parse_optional_guard(tokens: &Rc>>, ctx: Rc) -> Rc { if tok_is_keyword(tokens.clone().first().cloned(), "if".to_string()) { { - let r = parse_expr( - Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx, - ); - if has_err(r.err.clone()) { + let r = parse_expr(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx); +if has_err(r.err.clone()) { return Rc::new(GuardResult { - guard: None, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - Rc::new(GuardResult { - guard: Some(r.expr.clone()), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } + guard: None, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +Rc::new(GuardResult { + guard: Some(r.expr.clone()), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } else { Rc::new(GuardResult { - guard: None, - tokens: tokens.clone(), - ctx: ctx, - err: None, - }) + guard: None, + tokens: tokens.clone(), + ctx: ctx, + err: None, +}) } } pub fn parse_pattern(tokens: &Rc>>, ctx: &Rc) -> Rc { { let tok = tokens.clone().first().cloned(); - let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, - }; - let span = token_span(tok.clone()); - match sh { - Some(TokenShape::ShIdent) => { - let n = tok.clone().unwrap().text.clone(); - if (n.clone().as_str() == "_".to_string().as_str()) { - Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::Wildcard), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx: ctx.clone(), - err: None, - }) - } else { - if is_uppercase_start(n.clone()) { - parse_variant_pattern( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx.clone(), - n.clone(), - ) - } else { - Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::Bind { name: n.clone() }), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx: ctx.clone(), - err: None, - }) - } - } - } - Some(TokenShape::ShKeyword) => { - let kw_text = tok.clone().unwrap().text.clone(); - let lit_val = v2_rt::lookup(&dag_syntax_spec().keyword_literals.clone(), kw_text); - match lit_val { - Some(lv) => Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::LitPattern { value: lv.clone() }), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx: ctx.clone(), - err: None, - }), - None => Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::Wildcard), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }), - } - } - Some(TokenShape::ShLitInt) => { - let n_opt = v2_rt::parse_int(tok.clone().unwrap().text.clone()); - let n = match n_opt { - Some(v) => v.clone(), - None => { - return Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::Wildcard), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error( - v2_rt::concat( - v2_rt::concat( - "internal: ShLitInt token text not parseable as int: '" - .to_string(), - tok.clone().unwrap().text.clone(), - ), - "'".to_string(), - ), - span, - )), - }) - } - }; - Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::LitPattern { - value: Rc::new(LiteralValue::LitInt { value: n.clone() }), - }), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx: ctx.clone(), - err: None, - }) - } - Some(TokenShape::ShLitStr) => { - let s = tok.clone().unwrap().text.clone(); +let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, +}; +let span = token_span(tok.clone()); +match sh { + Some(TokenShape::ShIdent) => { + let n = tok.clone().unwrap().text.clone(); +if (n.clone().as_str() == "_".to_string().as_str()) { Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::LitPattern { - value: Rc::new(LiteralValue::LitStr { value: s }), - }), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx: ctx.clone(), - err: None, - }) - } - _ => Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::Wildcard), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }), - } - } + pattern: Rc::new(MatchPattern::Wildcard), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + ctx: ctx.clone(), + err: None, +}) + } else { + if is_uppercase_start(n.clone()) { + parse_variant_pattern(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx.clone(), n.clone()) + } else { + Rc::new(PatternResult { + pattern: Rc::new(MatchPattern::Bind { + name: n.clone(), +}), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + ctx: ctx.clone(), + err: None, +}) + } + } +}, + Some(TokenShape::ShKeyword) => { + let kw_text = tok.clone().unwrap().text.clone(); +let lit_val = v2_rt::lookup(&dag_syntax_spec().keyword_literals.clone(), kw_text); +match lit_val { + Some(lv) => Rc::new(PatternResult { + pattern: Rc::new(MatchPattern::LitPattern { + value: lv.clone(), +}), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + ctx: ctx.clone(), + err: None, +}), + None => Rc::new(PatternResult { + pattern: Rc::new(MatchPattern::Wildcard), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}), +} +}, + Some(TokenShape::ShLitInt) => { + let n_opt = v2_rt::parse_int(tok.clone().unwrap().text.clone()); +let n = match n_opt { + Some(v) => v.clone(), + None => return Rc::new(PatternResult { + pattern: Rc::new(MatchPattern::Wildcard), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error(v2_rt::concat(v2_rt::concat("internal: ShLitInt token text not parseable as int: '".to_string(), tok.clone().unwrap().text.clone()), "'".to_string()), span)), +}), +}; +Rc::new(PatternResult { + pattern: Rc::new(MatchPattern::LitPattern { + value: Rc::new(LiteralValue::LitInt { + value: n.clone(), +}), +}), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + ctx: ctx.clone(), + err: None, +}) +}, + Some(TokenShape::ShLitStr) => { + let s = tok.clone().unwrap().text.clone(); +Rc::new(PatternResult { + pattern: Rc::new(MatchPattern::LitPattern { + value: Rc::new(LiteralValue::LitStr { + value: s, +}), +}), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + ctx: ctx.clone(), + err: None, +}) +}, + _ => Rc::new(PatternResult { + pattern: Rc::new(MatchPattern::Wildcard), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}), +} +} } -pub fn parse_variant_pattern( - tokens: &Rc>>, - ctx: Rc, - name: String, -) -> Rc { +pub fn parse_variant_pattern(tokens: &Rc>>, ctx: Rc, name: String) -> Rc { { let span = token_span(tokens.clone().first().cloned()); - if tok_is_lbrace(tokens.clone().first().cloned()) { +if tok_is_lbrace(tokens.clone().first().cloned()) { { - let r = parse_variant_bindings_brace( - skip_newlines(Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - )), - ctx, - ); - if has_err(r.err.clone()) { + let r = parse_variant_bindings_brace(skip_newlines(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>())), ctx); +if has_err(r.err.clone()) { return Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::Wildcard), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let r2 = expect( - &skip_newlines(r.tokens.clone()), - &Rc::new(ExpectedToken::ExpectRBrace), - ); - if has_err(r2.err.clone()) { + pattern: Rc::new(MatchPattern::Wildcard), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let r2 = expect(&skip_newlines(r.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r2.err.clone()) { return Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::Wildcard), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), - }); - } - Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::VariantPattern { - name: name, - parent_enum: None, - field_bindings: r.field_bindings.clone(), - }), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } + pattern: Rc::new(MatchPattern::Wildcard), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), +}) + } +Rc::new(PatternResult { + pattern: Rc::new(MatchPattern::VariantPattern { + name: name, + parent_enum: None, + field_bindings: r.field_bindings.clone(), +}), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } else { if tok_is_lparen(tokens.clone().first().cloned()) { { - let r = parse_pattern( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - &ctx, - ); - if has_err(r.err.clone()) { + let r = parse_pattern(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &ctx); +if has_err(r.err.clone()) { return Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::Wildcard), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + pattern: Rc::new(MatchPattern::Wildcard), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); - if has_err(r2.err.clone()) { +let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); +if has_err(r2.err.clone()) { return Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::Wildcard), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), - }); + pattern: Rc::new(MatchPattern::Wildcard), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), +}) } - let fb = make_field_binding_node( - &"0".to_string(), - r.pattern.clone(), - span.clone(), - span.clone(), - ); - Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::VariantPattern { - name: name, - parent_enum: None, - field_bindings: Rc::new(vec![fb]), - }), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } +let fb = make_field_binding_node(&"0".to_string(), r.pattern.clone(), span.clone(), span.clone()); +Rc::new(PatternResult { + pattern: Rc::new(MatchPattern::VariantPattern { + name: name, + parent_enum: None, + field_bindings: Rc::new(vec![fb]), +}), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } else { Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::VariantPattern { - name: name, - parent_enum: None, - field_bindings: Rc::new(vec![]), - }), - tokens: tokens.clone(), - ctx: ctx, - err: None, - }) + pattern: Rc::new(MatchPattern::VariantPattern { + name: name, + parent_enum: None, + field_bindings: Rc::new(vec![]), +}), + tokens: tokens.clone(), + ctx: ctx, + err: None, +}) } } - } +} } -pub fn parse_variant_bindings_brace( - tokens: Rc>>, - ctx: Rc, -) -> Rc { +pub fn parse_variant_bindings_brace(tokens: Rc>>, ctx: Rc) -> Rc { parse_variant_bindings_brace_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_variant_bindings_brace_acc( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_variant_bindings_brace_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - if (tok_is_rbrace(tokens.clone().first().cloned()) - || tok_is_eof(tokens.clone().first().cloned())) - { +if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { break Rc::new(BindingsResult { - field_bindings: acc, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } else { + field_bindings: acc, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); +} else { let bind_span = token_span(tokens.clone().first().cloned()); - let r = expect_name(&tokens); - if has_err(r.err.clone()) { +let r = expect_name(&tokens); +if has_err(r.err.clone()) { return Rc::new(BindingsResult { - field_bindings: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let field_name = r.name.clone(); - let field_name_span = r.span.clone(); - tokens = r.tokens.clone(); - match (*eat(&tokens, Rc::new(ExpectedToken::ExpectColon))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r2 = parse_pattern(&__ec, &ctx); - if has_err(r2.err.clone()) { - return Rc::new(BindingsResult { - field_bindings: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), - }); - } - let e2 = eat(&r2.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); - tokens = skip_newlines(match (*e2).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => r2.tokens.clone(), - }); - let fb = make_field_binding_node( - &field_name, - r2.pattern.clone(), - bind_span, - field_name_span, - ); - { - let __tco_0 = r2.ctx.clone(); - let __tco_1 = v2_rt::rc_list_push(acc, fb); - ctx = __tco_0; - acc = __tco_1; - continue; - } - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - let e2 = eat(&tokens, Rc::new(ExpectedToken::ExpectComma)); - tokens = skip_newlines(match (*e2).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => tokens.clone(), - }); - let fb = make_field_binding_node( - &field_name, - Rc::new(MatchPattern::Bind { - name: field_name.clone(), - }), - bind_span, - field_name_span, - ); - { - let __tco_0 = v2_rt::rc_list_push(acc, fb); - acc = __tco_0; - continue; - } - } - } - } - } + field_bindings: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let field_name = r.name.clone(); +let field_name_span = r.span.clone(); +tokens = r.tokens.clone(); +match (*eat(&tokens, Rc::new(ExpectedToken::ExpectColon))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { let r2 = parse_pattern(&__ec, &ctx); +if has_err(r2.err.clone()) { + return Rc::new(BindingsResult { + field_bindings: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), +}) + } +let e2 = eat(&r2.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); +tokens = skip_newlines(match (*e2).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => r2.tokens.clone(), +}); +let fb = make_field_binding_node(&field_name, r2.pattern.clone(), bind_span, field_name_span); +{ + let __tco_0 = r2.ctx.clone(); +let __tco_1 = v2_rt::rc_list_push(acc, fb); +ctx = __tco_0; +acc = __tco_1; +continue; +} }, + EatResult::EatUnchanged { tokens: __eu, .. } => { let e2 = eat(&tokens, Rc::new(ExpectedToken::ExpectComma)); +tokens = skip_newlines(match (*e2).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => tokens.clone(), +}); +let fb = make_field_binding_node(&field_name, Rc::new(MatchPattern::Bind { + name: field_name.clone(), +}), bind_span, field_name_span); +{ + let __tco_0 = v2_rt::rc_list_push(acc, fb); +acc = __tco_0; +continue; +} }, +} +} +} } pub fn parse_if(tokens: &Rc>>, ctx: &Rc) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - let span = token_span(tokens.clone().first().cloned()); - let dummy_expr = parse_recovery_placeholder(); - let r = expect( - &tokens, - &Rc::new(ExpectedToken::ExpectKeyword { - text: "if".to_string(), - }), - ); - if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r = parse_expr_no_brace(r.tokens.clone(), ctx.clone()); - if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let condition = r.expr.clone(); - let r = parse_block(&skip_newlines(r.tokens.clone()), &r.ctx.clone()); - if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let then_branch = r.expr.clone(); - let tokens = skip_newlines(r.tokens.clone()); - let ctx = r.ctx.clone(); - match (*eat( - &tokens, - Rc::new(ExpectedToken::ExpectKeyword { - text: "else".to_string(), - }), - )) - .clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { + let span = token_span(tokens.clone().first().cloned()); +let dummy_expr = parse_recovery_placeholder(); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { + text: "if".to_string(), +})); +if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let r = parse_expr_no_brace(r.tokens.clone(), ctx.clone()); +if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let condition = r.expr.clone(); +let r = parse_block(&skip_newlines(r.tokens.clone()), &r.ctx.clone()); +if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let then_branch = r.expr.clone(); +let tokens = skip_newlines(r.tokens.clone()); +let ctx = r.ctx.clone(); +match (*eat(&tokens, Rc::new(ExpectedToken::ExpectKeyword { + text: "else".to_string(), +}))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { let tokens = skip_newlines(__ec.clone()); - if tok_is_keyword(tokens.clone().first().cloned(), "if".to_string()) { +if tok_is_keyword(tokens.clone().first().cloned(), "if".to_string()) { { let r2 = parse_if(&tokens, &ctx); - if has_err(r2.err.clone()) { +if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: r2.expr.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), - }); + expr: r2.expr.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), +}) } - Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprIf), - Rc::new(vec![condition, then_branch, r2.expr.clone()]), - None, - span, - ), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: None, - }) - } +Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprIf), Rc::new(vec![condition, then_branch, r2.expr.clone()]), None, span), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: None, +}) +} } else { { let r2 = parse_block(&tokens, &ctx); - if has_err(r2.err.clone()) { +if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: r2.expr.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), - }); + expr: r2.expr.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), +}) } - Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprIf), - Rc::new(vec![condition, then_branch, r2.expr.clone()]), - None, - span, - ), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: None, - }) - } +Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprIf), Rc::new(vec![condition, then_branch, r2.expr.clone()]), None, span), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: None, +}) +} } - } - EatResult::EatUnchanged { tokens: __eu, .. } => Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprIf), - Rc::new(vec![condition, then_branch]), - None, - span, - ), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }), - } +}, + EatResult::EatUnchanged { tokens: __eu, .. } => Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprIf), Rc::new(vec![condition, then_branch]), None, span), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}), +} +} }) } pub fn parse_let(tokens: &Rc>>, ctx: &Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); - let dummy_expr = parse_recovery_placeholder(); - let r = expect( - &tokens, - &Rc::new(ExpectedToken::ExpectKeyword { - text: "let".to_string(), - }), - ); - if has_err(r.err.clone()) { +let dummy_expr = parse_recovery_placeholder(); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { + text: "let".to_string(), +})); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r = expect_name(&r.tokens.clone()); - if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let r = expect_name(&r.tokens.clone()); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let name = r.name.clone(); - let name_span = r.span.clone(); - let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectEq)); - if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let name = r.name.clone(); +let name_span = r.span.clone(); +let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectEq)); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r = parse_expr(r.tokens.clone(), ctx.clone()); - if has_err(r.err.clone()) { - return r.clone(); - } - Rc::new(ExprResult { - expr: make_named_expr_node( - &name, - Rc::new(ExprData::ExprLet), - Rc::new(vec![r.expr.clone()]), - None, - span, - name_span, - ), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let r = parse_expr(r.tokens.clone(), ctx.clone()); +if has_err(r.err.clone()) { + return r.clone() + } +Rc::new(ExprResult { + expr: make_named_expr_node(&name, Rc::new(ExprData::ExprLet), Rc::new(vec![r.expr.clone()]), None, span, name_span), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } pub fn parse_return(tokens: &Rc>>, ctx: &Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); - let dummy_expr = parse_recovery_placeholder(); - let r = expect( - &tokens, - &Rc::new(ExpectedToken::ExpectKeyword { - text: "return".to_string(), - }), - ); - if has_err(r.err.clone()) { +let dummy_expr = parse_recovery_placeholder(); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { + text: "return".to_string(), +})); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r = parse_expr(r.tokens.clone(), ctx.clone()); - if has_err(r.err.clone()) { - return r.clone(); - } - Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprReturn), - Rc::new(vec![r.expr.clone()]), - None, - span, - ), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } + expr: dummy_expr, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let r = parse_expr(r.tokens.clone(), ctx.clone()); +if has_err(r.err.clone()) { + return r.clone() + } +Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprReturn), Rc::new(vec![r.expr.clone()]), None, span), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } pub fn parse_for(tokens: &Rc>>, ctx: &Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); - let dummy_expr = parse_recovery_placeholder(); - let r = expect( - &tokens, - &Rc::new(ExpectedToken::ExpectKeyword { - text: "for".to_string(), - }), - ); - if has_err(r.err.clone()) { +let dummy_expr = parse_recovery_placeholder(); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { + text: "for".to_string(), +})); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r = expect_name(&r.tokens.clone()); - if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let r = expect_name(&r.tokens.clone()); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let var_name = r.name.clone(); - let var_name_span = r.span.clone(); - let r = expect( - &r.tokens.clone(), - &Rc::new(ExpectedToken::ExpectKeyword { - text: "in".to_string(), - }), - ); - if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let var_name = r.name.clone(); +let var_name_span = r.span.clone(); +let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectKeyword { + text: "in".to_string(), +})); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r = parse_expr_no_brace(r.tokens.clone(), ctx.clone()); - if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let r = parse_expr_no_brace(r.tokens.clone(), ctx.clone()); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let collection = r.expr.clone(); - let r = parse_block(&skip_newlines(r.tokens.clone()), &r.ctx.clone()); - if has_err(r.err.clone()) { + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let collection = r.expr.clone(); +let r = parse_block(&skip_newlines(r.tokens.clone()), &r.ctx.clone()); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let body = r.expr.clone(); - let for_expr = make_named_expr_node( - &var_name, - Rc::new(ExprData::ExprForEach), - Rc::new(vec![collection, body]), - None, - span, - var_name_span, - ); - Rc::new(ExprResult { - expr: for_expr, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let body = r.expr.clone(); +let for_expr = make_named_expr_node(&var_name, Rc::new(ExprData::ExprForEach), Rc::new(vec![collection, body]), None, span, var_name_span); +Rc::new(ExprResult { + expr: for_expr, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } -pub fn parse_record_literal( - tokens: &Rc>>, - ctx: &Rc, - name: String, - span: &Rc, -) -> Rc { +pub fn parse_record_literal(tokens: &Rc>>, ctx: &Rc, name: String, span: &Rc) -> Rc { { let dummy_expr = parse_recovery_placeholder(); - let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBrace)); - if has_err(r.err.clone()) { +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBrace)); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let tokens = skip_newlines(r.tokens.clone()); - let r = parse_field_init_list(tokens.clone(), ctx.clone()); - if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let tokens = skip_newlines(r.tokens.clone()); +let r = parse_field_init_list(tokens.clone(), ctx.clone()); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let tokens = skip_newlines(r.tokens.clone()); - let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); - if has_err(r2.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let tokens = skip_newlines(r.tokens.clone()); +let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), - }); - } - Rc::new(ExprResult { - expr: make_named_expr_node( - &name, - Rc::new(ExprData::ExprRecordLit { parent_enum: None }), - r.fields.clone(), - None, - span.clone(), - span.clone(), - ), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), +}) + } +Rc::new(ExprResult { + expr: make_named_expr_node(&name, Rc::new(ExprData::ExprRecordLit { + parent_enum: None, +}), r.fields.clone(), None, span.clone(), span.clone()), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } -pub fn parse_field_init_list( - tokens: Rc>>, - ctx: Rc, -) -> Rc { +pub fn parse_field_init_list(tokens: Rc>>, ctx: Rc) -> Rc { parse_field_init_list_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_field_init_list_acc( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_field_init_list_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - if (tok_is_rbrace(tokens.clone().first().cloned()) - || tok_is_eof(tokens.clone().first().cloned())) - { +if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { break Rc::new(FieldInitsResult { - fields: acc, - tokens: tokens.clone(), - ctx: ctx, - err: None, - }); - } else { + fields: acc, + tokens: tokens.clone(), + ctx: ctx, + err: None, +}); +} else { let r = parse_field_init(&tokens, &ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(FieldInitsResult { - fields: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let e = eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); - tokens = skip_newlines(match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => r.tokens.clone(), - }); - { + fields: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let e = eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); +tokens = skip_newlines(match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => r.tokens.clone(), +}); +{ let __tco_0 = r.ctx.clone(); - let __tco_1 = v2_rt::rc_list_push(acc, r.field.clone()); - ctx = __tco_0; - acc = __tco_1; - continue; - } - } - } +let __tco_1 = v2_rt::rc_list_push(acc, r.field.clone()); +ctx = __tco_0; +acc = __tco_1; +continue; +} +} +} } -pub fn parse_field_init( - tokens: &Rc>>, - ctx: &Rc, -) -> Rc { +pub fn parse_field_init(tokens: &Rc>>, ctx: &Rc) -> Rc { { let zero_span = make_span(0, 0); - let span = token_span(tokens.clone().first().cloned()); - let dummy_fi = make_field_init_node( - &"".to_string(), - parse_recovery_placeholder(), - zero_span.clone(), - zero_span.clone(), - ); - let tok = tokens.clone().first().cloned(); - if (tok_is_ident(tok.clone()) || tok_is_keyword_name(tok.clone())) { +let span = token_span(tokens.clone().first().cloned()); +let dummy_fi = make_field_init_node(&"".to_string(), parse_recovery_placeholder(), zero_span.clone(), zero_span.clone()); +let tok = tokens.clone().first().cloned(); +if (tok_is_ident(tok.clone()) || tok_is_keyword_name(tok.clone())) { { let name_r = expect_name(&tokens); - if has_err(name_r.err.clone()) { +if has_err(name_r.err.clone()) { return Rc::new(FieldInitResult { - field: dummy_fi.clone(), - tokens: name_r.tokens.clone(), - ctx: ctx.clone(), - err: name_r.err.clone(), - }); + field: dummy_fi.clone(), + tokens: name_r.tokens.clone(), + ctx: ctx.clone(), + err: name_r.err.clone(), +}) } - let n = name_r.name.clone(); - if tok_is_colon(name_r.tokens.clone().first().cloned()) { +let n = name_r.name.clone(); +if tok_is_colon(name_r.tokens.clone().first().cloned()) { { - let r = parse_expr( - Rc::new( - name_r - .tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx.clone(), - ); - if has_err(r.err.clone()) { + let r = parse_expr(Rc::new(name_r.tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx.clone()); +if has_err(r.err.clone()) { return Rc::new(FieldInitResult { - field: dummy_fi.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + field: dummy_fi.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - let fi = make_field_init_node( - &n, - r.expr.clone(), - span.clone(), - name_r.span.clone(), - ); - Rc::new(FieldInitResult { - field: fi, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } +let fi = make_field_init_node(&n, r.expr.clone(), span.clone(), name_r.span.clone()); +Rc::new(FieldInitResult { + field: fi, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } else { { - let fi = make_field_init_node( - &n, - make_named_expr_node( - &n, - Rc::new(ExprData::ExprVar { binding_kind: None }), - Rc::new(vec![]), - None, - span.clone(), - name_r.span.clone(), - ), - span.clone(), - name_r.span.clone(), - ); - Rc::new(FieldInitResult { - field: fi, - tokens: name_r.tokens.clone(), - ctx: ctx.clone(), - err: None, - }) - } + let fi = make_field_init_node(&n, make_named_expr_node(&n, Rc::new(ExprData::ExprVar { + binding_kind: None, +}), Rc::new(vec![]), None, span.clone(), name_r.span.clone()), span.clone(), name_r.span.clone()); +Rc::new(FieldInitResult { + field: fi, + tokens: name_r.tokens.clone(), + ctx: ctx.clone(), + err: None, +}) +} } - } +} } else { if (tok_is_lit_str(tok.clone()) && peek_is_colon_after_ident(tokens.clone())) { { let str_name = match tok.clone() { - Some(t) => t.text.clone(), - None => "_".to_string(), - }; - let r = parse_expr( - Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(2 as usize) - .collect::>(), - ), - ctx.clone(), - ); - if has_err(r.err.clone()) { + Some(t) => t.text.clone(), + None => "_".to_string(), +}; +let r = parse_expr(Rc::new(tokens.clone().iter().cloned().skip(2 as usize).collect::>()), ctx.clone()); +if has_err(r.err.clone()) { return Rc::new(FieldInitResult { - field: dummy_fi.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + field: dummy_fi.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - let fi = - make_field_init_node(&str_name, r.expr.clone(), span.clone(), no_span()); - Rc::new(FieldInitResult { - field: fi, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } +let fi = make_field_init_node(&str_name, r.expr.clone(), span.clone(), no_span()); +Rc::new(FieldInitResult { + field: fi, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } else { { let r = parse_expr(tokens.clone(), ctx.clone()); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(FieldInitResult { - field: dummy_fi.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + field: dummy_fi.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - let fi = make_field_init_node( - &"_".to_string(), - r.expr.clone(), - span.clone(), - no_span(), - ); - Rc::new(FieldInitResult { - field: fi, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } +let fi = make_field_init_node(&"_".to_string(), r.expr.clone(), span.clone(), no_span()); +Rc::new(FieldInitResult { + field: fi, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } } - } +} } pub fn parse_list_literal(tokens: &Rc>>, ctx: &Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); - let dummy_expr = parse_recovery_placeholder(); - let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBracket)); - if has_err(r.err.clone()) { +let dummy_expr = parse_recovery_placeholder(); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBracket)); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); - } - let r = parse_expr_list_until( - skip_newlines(r.tokens.clone()), - ctx.clone(), - Rc::new(ExpectedToken::ExpectRBracket), - ); - if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) + } +let r = parse_expr_list_until(skip_newlines(r.tokens.clone()), ctx.clone(), Rc::new(ExpectedToken::ExpectRBracket)); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let r2 = expect( - &skip_newlines(r.tokens.clone()), - &Rc::new(ExpectedToken::ExpectRBracket), - ); - if has_err(r2.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let r2 = expect(&skip_newlines(r.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBracket)); +if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), - }); - } - Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprListLit), r.exprs.clone(), None, span), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), +}) + } +Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprListLit), r.exprs.clone(), None, span), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } -pub fn parse_expr_list_until( - tokens: Rc>>, - ctx: Rc, - end_expected: Rc, -) -> Rc { +pub fn parse_expr_list_until(tokens: Rc>>, ctx: Rc, end_expected: Rc) -> Rc { parse_expr_list_until_acc(tokens, ctx, end_expected, Rc::new(vec![])) } -pub fn parse_expr_list_until_acc( - mut tokens: Rc>>, - mut ctx: Rc, - mut end_expected: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn parse_expr_list_until_acc(mut tokens: Rc>>, mut ctx: Rc, mut end_expected: Rc, mut acc: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - let at_end_tag = match tokens.clone().first().cloned() { - Some(t) => token_matches_expected(&t, end_expected.clone()), - None => false, - }; - if (at_end_tag || tok_is_eof(tokens.clone().first().cloned())) { +let at_end_tag = match tokens.clone().first().cloned() { + Some(t) => token_matches_expected(&t, end_expected.clone()), + None => false, +}; +if (at_end_tag || tok_is_eof(tokens.clone().first().cloned())) { break Rc::new(ExprsResult { - exprs: acc, - tokens: tokens.clone(), - ctx: ctx, - err: None, - }); - } else { + exprs: acc, + tokens: tokens.clone(), + ctx: ctx, + err: None, +}); +} else { let r = parse_expr(tokens.clone(), ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ExprsResult { - exprs: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let e = eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); - tokens = skip_newlines(match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => r.tokens.clone(), - }); - { + exprs: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let e = eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); +tokens = skip_newlines(match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => r.tokens.clone(), +}); +{ let __tco_0 = r.ctx.clone(); - let __tco_1 = v2_rt::rc_list_push(acc, r.expr.clone()); - ctx = __tco_0; - acc = __tco_1; - continue; - } - } - } +let __tco_1 = v2_rt::rc_list_push(acc, r.expr.clone()); +ctx = __tco_0; +acc = __tco_1; +continue; +} +} +} } pub fn parse_paren_expr(tokens: &Rc>>, ctx: &Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); - let dummy_expr = parse_recovery_placeholder(); - let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLParen)); - if has_err(r.err.clone()) { +let dummy_expr = parse_recovery_placeholder(); +let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLParen)); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), - }); + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), +}) } - let tokens = skip_newlines(r.tokens.clone()); - if tok_is_rparen(tokens.clone().first().cloned()) { +let tokens = skip_newlines(r.tokens.clone()); +if tok_is_rparen(tokens.clone().first().cloned()) { Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprRecordLit { parent_enum: None }), - Rc::new(vec![]), - None, - span, - ), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx: ctx.clone(), - err: None, - }) + expr: make_expr_node(Rc::new(ExprData::ExprRecordLit { + parent_enum: None, +}), Rc::new(vec![]), None, span), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + ctx: ctx.clone(), + err: None, +}) } else { { let lambda_r = try_lambda_params(&tokens, &ctx); - if lambda_r.is_lambda.clone() { +if lambda_r.is_lambda.clone() { { let r = parse_lambda_body(&lambda_r.tokens.clone(), lambda_r.ctx.clone()); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprLambda), - v2_rt::concat( - Rc::new(vec![r.expr.clone()]), - Rc::new({ - let mut __result = Vec::new(); - for p in lambda_r.params.clone().iter().cloned() { - __result.push(parsed_name_leaf( - p.name.clone(), - p.span.clone(), - )); - } - __result - }), - ), - None, - span, - ), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } +Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprLambda), v2_rt::concat(Rc::new(vec![r.expr.clone()]), Rc::new({ let mut __result = Vec::new(); for p in lambda_r.params.clone().iter().cloned() { __result.push(parsed_name_leaf(p.name.clone(), p.span.clone())); } __result })), None, span), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } else { { let r = parse_expr(lambda_r.tokens.clone(), lambda_r.ctx.clone()); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - let tokens = skip_newlines(r.tokens.clone()); - let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRParen)); - if has_err(r2.err.clone()) { +let tokens = skip_newlines(r.tokens.clone()); +let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRParen)); +if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), - }); + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), +}) } - Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } +Rc::new(ExprResult { + expr: r.expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } - } +} } - } +} } pub fn parse_fn_lambda(tokens: &Rc>>, ctx: &Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); - let dummy = parse_recovery_placeholder(); - let r1 = expect( - &tokens, - &Rc::new(ExpectedToken::ExpectKeyword { - text: "fn".to_string(), - }), - ); - if has_err(r1.err.clone()) { +let dummy = parse_recovery_placeholder(); +let r1 = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { + text: "fn".to_string(), +})); +if has_err(r1.err.clone()) { return Rc::new(ExprResult { - expr: dummy.clone(), - tokens: r1.tokens.clone(), - ctx: ctx.clone(), - err: r1.err.clone(), - }); - } - let r2 = expect(&r1.tokens.clone(), &Rc::new(ExpectedToken::ExpectLParen)); - if has_err(r2.err.clone()) { + expr: dummy.clone(), + tokens: r1.tokens.clone(), + ctx: ctx.clone(), + err: r1.err.clone(), +}) + } +let r2 = expect(&r1.tokens.clone(), &Rc::new(ExpectedToken::ExpectLParen)); +if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: dummy.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), - }); - } - let params_r = collect_fn_lambda_params(r2.tokens.clone(), ctx.clone(), Rc::new(vec![])); - let r3 = expect( - ¶ms_r.tokens.clone(), - &Rc::new(ExpectedToken::ExpectRParen), - ); - if has_err(r3.err.clone()) { + expr: dummy.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), +}) + } +let params_r = collect_fn_lambda_params(r2.tokens.clone(), ctx.clone(), Rc::new(vec![])); +let r3 = expect(¶ms_r.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); +if has_err(r3.err.clone()) { return Rc::new(ExprResult { - expr: dummy.clone(), - tokens: r3.tokens.clone(), - ctx: params_r.ctx.clone(), - err: r3.err.clone(), - }); - } - let tokens = skip_newlines(r3.tokens.clone()); - let body_r = parse_brace_expr(&tokens, params_r.ctx.clone()); - if has_err(body_r.err.clone()) { - return body_r.clone(); - } - Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprLambda), - v2_rt::concat( - Rc::new(vec![body_r.expr.clone()]), - Rc::new({ - let mut __result = Vec::new(); - for p in params_r.params.clone().iter().cloned() { - __result.push(parsed_name_leaf(p.name.clone(), p.span.clone())); - } - __result - }), - ), - None, - span, - ), - tokens: body_r.tokens.clone(), - ctx: body_r.ctx.clone(), - err: None, - }) - } + expr: dummy.clone(), + tokens: r3.tokens.clone(), + ctx: params_r.ctx.clone(), + err: r3.err.clone(), +}) + } +let tokens = skip_newlines(r3.tokens.clone()); +let body_r = parse_brace_expr(&tokens, params_r.ctx.clone()); +if has_err(body_r.err.clone()) { + return body_r.clone() + } +Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprLambda), v2_rt::concat(Rc::new(vec![body_r.expr.clone()]), Rc::new({ let mut __result = Vec::new(); for p in params_r.params.clone().iter().cloned() { __result.push(parsed_name_leaf(p.name.clone(), p.span.clone())); } __result })), None, span), + tokens: body_r.tokens.clone(), + ctx: body_r.ctx.clone(), + err: None, +}) +} } -pub fn collect_fn_lambda_params( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn collect_fn_lambda_params(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { tokens = skip_newlines(tokens.clone()); - if tok_is_rparen(tokens.clone().first().cloned()) { +if tok_is_rparen(tokens.clone().first().cloned()) { break Rc::new(IdentCollectResult { - success: true, - params: acc, - tokens: tokens.clone(), - ctx: ctx, - err: None, - }); - } else { + success: true, + params: acc, + tokens: tokens.clone(), + ctx: ctx, + err: None, +}); +} else { let name_r = expect_ident(&tokens); - if has_err(name_r.err.clone()) { +if has_err(name_r.err.clone()) { break Rc::new(IdentCollectResult { - success: false, - params: acc, - tokens: name_r.tokens.clone(), - ctx: ctx, - err: name_r.err.clone(), - }); - } else { + success: false, + params: acc, + tokens: name_r.tokens.clone(), + ctx: ctx, + err: name_r.err.clone(), +}); +} else { tokens = skip_newlines(name_r.tokens.clone()); - if tok_is_comma(tokens.clone().first().cloned()) { +if tok_is_comma(tokens.clone().first().cloned()) { { - let __tco_0 = - Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); - let __tco_1 = v2_rt::rc_list_push( - acc, - Rc::new(ParserParam { - name: name_r.name.clone(), - span: name_r.span.clone(), - }), - ); - tokens = __tco_0; - acc = __tco_1; - continue; - } - } else { + let __tco_0 = Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); +let __tco_1 = v2_rt::rc_list_push(acc, Rc::new(ParserParam { + name: name_r.name.clone(), + span: name_r.span.clone(), +})); +tokens = __tco_0; +acc = __tco_1; +continue; +} +} else { break Rc::new(IdentCollectResult { - success: true, - params: v2_rt::rc_list_push( - acc, - Rc::new(ParserParam { - name: name_r.name.clone(), - span: name_r.span.clone(), - }), - ), - tokens: tokens.clone(), - ctx: ctx, - err: None, - }); - } - } - } - } + success: true, + params: v2_rt::rc_list_push(acc, Rc::new(ParserParam { + name: name_r.name.clone(), + span: name_r.span.clone(), +})), + tokens: tokens.clone(), + ctx: ctx, + err: None, +}); +} +} +} +} } -pub fn try_lambda_params( - tokens: &Rc>>, - ctx: &Rc, -) -> Rc { +pub fn try_lambda_params(tokens: &Rc>>, ctx: &Rc) -> Rc { { let r = collect_lambda_idents(tokens.clone(), ctx.clone(), Rc::new(vec![])); - if (r.success.clone() && ((r.params.clone().len() as i64) >= 2)) { +if (r.success.clone() && ((r.params.clone().len() as i64) >= 2)) { if tok_is_rparen(r.tokens.clone().first().cloned()) { { - let after_rparen = Rc::new( - r.tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ); - if tok_is_fat_arrow(after_rparen.clone().first().cloned()) { + let after_rparen = Rc::new(r.tokens.clone().iter().cloned().skip(1 as usize).collect::>()); +if tok_is_fat_arrow(after_rparen.clone().first().cloned()) { Rc::new(LambdaCheckResult { - is_lambda: true, - params: r.params.clone(), - tokens: Rc::new( - after_rparen - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx: r.ctx.clone(), - err: None, - }) + is_lambda: true, + params: r.params.clone(), + tokens: Rc::new(after_rparen.clone().iter().cloned().skip(1 as usize).collect::>()), + ctx: r.ctx.clone(), + err: None, +}) } else { Rc::new(LambdaCheckResult { - is_lambda: false, - params: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) + is_lambda: false, + params: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) } - } +} } else { Rc::new(LambdaCheckResult { - is_lambda: false, - params: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) + is_lambda: false, + params: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) } } else { Rc::new(LambdaCheckResult { - is_lambda: false, - params: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }) + is_lambda: false, + params: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}) } - } +} } -pub fn collect_lambda_idents( - mut tokens: Rc>>, - mut ctx: Rc, - mut acc: Rc>>, -) -> Rc { +pub fn collect_lambda_idents(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { loop { if tok_is_ident(tokens.clone().first().cloned()) { let tok = tokens.clone().first().cloned(); - let param = Rc::new(ParserParam { - name: tok.clone().unwrap().text.clone(), - span: tok.clone().unwrap().span.clone(), - }); - let new_acc = v2_rt::rc_list_push(acc, param); - match (*eat( - &Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - Rc::new(ExpectedToken::ExpectComma), - )) - .clone() - { - EatResult::EatConsumed { tokens: __ec, .. } => { - let __tco_0 = __ec.clone(); - let __tco_1 = new_acc; - tokens = __tco_0; - acc = __tco_1; - continue; - } - EatResult::EatUnchanged { tokens: __eu, .. } => { - break Rc::new(IdentCollectResult { - success: true, - params: new_acc, - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx: ctx, - err: None, - }); - } - } - } else { +let param = Rc::new(ParserParam { + name: tok.clone().unwrap().text.clone(), + span: tok.clone().unwrap().span.clone(), +}); +let new_acc = v2_rt::rc_list_push(acc, param); +match (*eat(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), Rc::new(ExpectedToken::ExpectComma))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { { + let __tco_0 = __ec.clone(); +let __tco_1 = new_acc; +tokens = __tco_0; +acc = __tco_1; +continue; +} }, + EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(IdentCollectResult { + success: true, + params: new_acc, + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + ctx: ctx, + err: None, +}); }, +} +} else { break Rc::new(IdentCollectResult { - success: false, - params: acc, - tokens: tokens.clone(), - ctx: ctx, - err: None, - }); - } - } + success: false, + params: acc, + tokens: tokens.clone(), + ctx: ctx, + err: None, +}); +} +} } pub fn parse_string_interp(tokens: &Rc>>, ctx: Rc) -> Rc { { let tok = tokens.clone().first().cloned(); - let span = token_span(tok.clone()); - let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, - }; - match sh { - Some(TokenShape::ShStrBegin) => { - let prefix = tok.clone().unwrap().text.clone(); - let parts_init = if (v2_rt::string_length(&prefix) > 0) { - Rc::new(vec![Rc::new(StringPart::Text { - value: prefix.clone(), - })]) - } else { - Rc::new(vec![]) - }; - parse_interp_parts( - Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx, - parts_init, - span.clone(), - ) - } - _ => Rc::new(ExprResult { - expr: parse_recovery_expr( - span.clone(), - "expected string interpolation".to_string(), - ), - tokens: tokens.clone(), - ctx: ctx, - err: Some(parse_error( - "expected string interpolation".to_string(), - span.clone(), - )), - }), - } - } +let span = token_span(tok.clone()); +let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, +}; +match sh { + Some(TokenShape::ShStrBegin) => { + let prefix = tok.clone().unwrap().text.clone(); +let parts_init = if (v2_rt::string_length(&prefix) > 0) { + Rc::new(vec![Rc::new(StringPart::Text { + value: prefix.clone(), +})]) + } else { + Rc::new(vec![]) + }; +parse_interp_parts(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx, parts_init, span.clone()) +}, + _ => Rc::new(ExprResult { + expr: parse_recovery_expr(span.clone(), "expected string interpolation".to_string()), + tokens: tokens.clone(), + ctx: ctx, + err: Some(parse_error("expected string interpolation".to_string(), span.clone())), +}), +} +} } -pub fn parse_interp_parts( - mut tokens: Rc>>, - mut ctx: Rc, - mut parts: Rc>>, - mut span: Rc, -) -> Rc { +pub fn parse_interp_parts(mut tokens: Rc>>, mut ctx: Rc, mut parts: Rc>>, mut span: Rc) -> Rc { loop { let r = parse_expr(tokens.clone(), ctx.clone()); - if has_err(r.err.clone()) { - return r.clone(); - } - let new_parts = v2_rt::rc_list_push( - parts, - Rc::new(StringPart::Interpolation { - expr: r.expr.clone(), - }), - ); - tokens = r.tokens.clone(); - ctx = r.ctx.clone(); - let interp_tok = tokens.clone().first().cloned(); - let interp_sh = match interp_tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, +if has_err(r.err.clone()) { + return r.clone() + } +let new_parts = v2_rt::rc_list_push(parts, Rc::new(StringPart::Interpolation { + expr: r.expr.clone(), +})); +tokens = r.tokens.clone(); +ctx = r.ctx.clone(); +let interp_tok = tokens.clone().first().cloned(); +let interp_sh = match interp_tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, +}; +match interp_sh { + Some(TokenShape::ShStrMid) => { let mid = interp_tok.clone().unwrap().text.clone(); +let mid_parts = if (v2_rt::string_length(&mid) > 0) { + v2_rt::rc_list_push(new_parts, Rc::new(StringPart::Text { + value: mid.clone(), +})) + } else { + new_parts }; - match interp_sh { - Some(TokenShape::ShStrMid) => { - let mid = interp_tok.clone().unwrap().text.clone(); - let mid_parts = if (v2_rt::string_length(&mid) > 0) { - v2_rt::rc_list_push(new_parts, Rc::new(StringPart::Text { value: mid.clone() })) - } else { - new_parts - }; - { - let __tco_0 = - Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); - let __tco_1 = mid_parts; - tokens = __tco_0; - parts = __tco_1; - continue; - } - } - Some(TokenShape::ShStrEnd) => { - let suffix = interp_tok.clone().unwrap().text.clone(); - let final_parts = if (v2_rt::string_length(&suffix) > 0) { - v2_rt::rc_list_push( - new_parts, - Rc::new(StringPart::Text { - value: suffix.clone(), - }), - ) - } else { - new_parts - }; - break Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprStringInterp), - Rc::new({ - let mut __result = Vec::new(); - for p in final_parts.iter().cloned() { - __result.push(match (*p.clone()).clone() { - StringPart::Text { value: v, .. } => { - make_text_part_node(v.clone(), span.clone()) - } - StringPart::Interpolation { expr: e, .. } => { - make_interp_part_node(e.clone(), span.clone()) - } - }); - } - __result - }), - None, - span.clone(), - ), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx: ctx.clone(), - err: None, - }); - } - _ => { - break Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprStringInterp), - Rc::new({ - let mut __result = Vec::new(); - for p in new_parts.iter().cloned() { - __result.push(match (*p.clone()).clone() { - StringPart::Text { value: v, .. } => { - make_text_part_node(v.clone(), span.clone()) - } - StringPart::Interpolation { expr: e, .. } => { - make_interp_part_node(e.clone(), span.clone()) - } - }); - } - __result - }), - None, - span.clone(), - ), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, - }); - } - } - } +{ + let __tco_0 = Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); +let __tco_1 = mid_parts; +tokens = __tco_0; +parts = __tco_1; +continue; +} }, + Some(TokenShape::ShStrEnd) => { let suffix = interp_tok.clone().unwrap().text.clone(); +let final_parts = if (v2_rt::string_length(&suffix) > 0) { + v2_rt::rc_list_push(new_parts, Rc::new(StringPart::Text { + value: suffix.clone(), +})) + } else { + new_parts + }; +break Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprStringInterp), Rc::new({ let mut __result = Vec::new(); for p in final_parts.iter().cloned() { __result.push(match (*p.clone()).clone() { + StringPart::Text { value: v, .. } => make_text_part_node(v.clone(), span.clone()), + StringPart::Interpolation { expr: e, .. } => make_interp_part_node(e.clone(), span.clone()), +}); } __result }), None, span.clone()), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + ctx: ctx.clone(), + err: None, +}); }, + _ => { break Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprStringInterp), Rc::new({ let mut __result = Vec::new(); for p in new_parts.iter().cloned() { __result.push(match (*p.clone()).clone() { + StringPart::Text { value: v, .. } => make_text_part_node(v.clone(), span.clone()), + StringPart::Interpolation { expr: e, .. } => make_interp_part_node(e.clone(), span.clone()), +}); } __result }), None, span.clone()), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, +}); }, +} +} } pub fn parse_brace_expr(tokens: &Rc>>, ctx: Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); - let dummy_expr = parse_recovery_placeholder(); - let tokens = skip_newlines(Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - )); - let tok = tokens.clone().first().cloned(); - if tok_is_rbrace(tok.clone()) { +let dummy_expr = parse_recovery_placeholder(); +let tokens = skip_newlines(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>())); +let tok = tokens.clone().first().cloned(); +if tok_is_rbrace(tok.clone()) { Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprRecordLit { parent_enum: None }), - Rc::new(vec![]), - None, - span, - ), - tokens: Rc::new( - tokens - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ), - ctx: ctx, - err: None, - }) + expr: make_expr_node(Rc::new(ExprData::ExprRecordLit { + parent_enum: None, +}), Rc::new(vec![]), None, span), + tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), + ctx: ctx, + err: None, +}) } else { { let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, - }; - match sh { - Some(TokenShape::ShKeyword) => { - let brace_kw = tok_keyword_text(tok.clone()); - if ((brace_kw.clone().as_str() == "let".to_string().as_str()) - || (brace_kw.clone().as_str() == "return".to_string().as_str())) + Some(t) => Some(t.shape.clone()), + None => None, +}; +match sh { + Some(TokenShape::ShKeyword) => { + let brace_kw = tok_keyword_text(tok.clone()); +if ((brace_kw.clone().as_str() == "let".to_string().as_str()) || (brace_kw.clone().as_str() == "return".to_string().as_str())) { { + let r = parse_stmts(tokens.clone(), ctx); +if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let tokens = skip_newlines(r.tokens.clone()); +let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r2.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), +}) + } +if ((r.stmts.clone().len() as i64) == 1) { + Rc::new(ExprResult { + expr: r.stmts.clone().first().cloned().clone().unwrap(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) + } else { + Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprBlock), r.stmts.clone(), None, span), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) + } +} + } else { + if (tok_is_keyword_name(tok.clone()) && peek_is_colon_after_ident(tokens.clone())) { { - let r = parse_stmts(tokens.clone(), ctx); - if has_err(r.err.clone()) { + let r = parse_field_init_list(tokens.clone(), ctx); +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - let tokens = skip_newlines(r.tokens.clone()); - let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); - if has_err(r2.err.clone()) { +let tokens = skip_newlines(r.tokens.clone()); +let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), - }); - } - if ((r.stmts.clone().len() as i64) == 1) { - Rc::new(ExprResult { - expr: r.stmts.clone().first().cloned().clone().unwrap(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } else { - Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprBlock), - r.stmts.clone(), - None, - span, - ), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), +}) } - } +Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprRecordLit { + parent_enum: None, +}), r.fields.clone(), None, span), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } else { - if (tok_is_keyword_name(tok.clone()) - && peek_is_colon_after_ident(tokens.clone())) { - { - let r = parse_field_init_list(tokens.clone(), ctx); - if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let tokens = skip_newlines(r.tokens.clone()); - let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); - if has_err(r2.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), - }); - } - Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprRecordLit { parent_enum: None }), - r.fields.clone(), - None, - span, - ), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) + let r = parse_expr(tokens.clone(), ctx); +if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - } else { - { - let r = parse_expr(tokens.clone(), ctx); - if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let tokens = skip_newlines(r.tokens.clone()); - let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); - if has_err(r2.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), - }); - } - Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) +let tokens = skip_newlines(r.tokens.clone()); +let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r2.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), +}) } - } +Rc::new(ExprResult { + expr: r.expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } } - _ => { - let ident_or_keyword = - (tok_is_ident(tok.clone()) || tok_is_keyword_name(tok.clone())); - if (ident_or_keyword && peek_is_colon_after_ident(tokens.clone())) { +}, + _ => { + let ident_or_keyword = (tok_is_ident(tok.clone()) || tok_is_keyword_name(tok.clone())); +if (ident_or_keyword && peek_is_colon_after_ident(tokens.clone())) { + { + let r = parse_field_init_list(tokens.clone(), ctx); +if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) + } +let tokens = skip_newlines(r.tokens.clone()); +let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r2.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), +}) + } +Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprRecordLit { + parent_enum: None, +}), r.fields.clone(), None, span), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} + } else { + if (tok_is_lit_str(tok.clone()) && peek_is_colon_after_ident(tokens.clone())) { { let r = parse_field_init_list(tokens.clone(), ctx); - if has_err(r.err.clone()) { +if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - let tokens = skip_newlines(r.tokens.clone()); - let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); - if has_err(r2.err.clone()) { +let tokens = skip_newlines(r.tokens.clone()); +let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), - }); + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), +}) } - Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprRecordLit { parent_enum: None }), - r.fields.clone(), - None, - span, - ), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } +Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprRecordLit { + parent_enum: None, +}), r.fields.clone(), None, span), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) +} } else { - if (tok_is_lit_str(tok.clone()) - && peek_is_colon_after_ident(tokens.clone())) { - { - let r = parse_field_init_list(tokens.clone(), ctx); - if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let tokens = skip_newlines(r.tokens.clone()); - let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); - if has_err(r2.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), - }); - } - Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprRecordLit { parent_enum: None }), - r.fields.clone(), - None, - span, - ), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) + let r = parse_stmts(tokens.clone(), ctx); +if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), +}) } - } else { - { - let r = parse_stmts(tokens.clone(), ctx); - if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), - }); - } - let tokens = skip_newlines(r.tokens.clone()); - let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); - if has_err(r2.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), - }); - } - if ((r.stmts.clone().len() as i64) == 1) { - Rc::new(ExprResult { - expr: r.stmts.clone().first().cloned().clone().unwrap(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } else { - Rc::new(ExprResult { - expr: make_expr_node( - Rc::new(ExprData::ExprBlock), - r.stmts.clone(), - None, - span, - ), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, - }) - } +let tokens = skip_newlines(r.tokens.clone()); +let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); +if has_err(r2.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), +}) } - } +if ((r.stmts.clone().len() as i64) == 1) { + Rc::new(ExprResult { + expr: r.stmts.clone().first().cloned().clone().unwrap(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) + } else { + Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprBlock), r.stmts.clone(), None, span), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, +}) + } +} } } - } - } +}, +} +} } - } +} } pub fn peek_is_colon_after_ident(tokens: Rc>>) -> bool { match tokens.get(1 as usize).cloned() { - Some(t) => is_colon_shape(t.shape.clone()), - None => false, - } + Some(t) => is_colon_shape(t.shape.clone()), + None => false, +} } diff --git a/src/v2/stage0/src/v2_compiler_resolve.rs b/src/v2/stage0/src/v2_compiler_resolve.rs index be03f94ffd6..6544945bd40 100644 --- a/src/v2/stage0/src/v2_compiler_resolve.rs +++ b/src/v2/stage0/src/v2_compiler_resolve.rs @@ -1,21 +1,15 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.resolve -pub use crate::std_types::kernel_type_set; -use crate::v2_rt; -use crate::v2_std_core::CompilerDiagnostic::{ - CircularDependency, DuplicateModule, MissingExport, UnresolvedImport, -}; -use crate::v2_std_core::Connective::{Conj, Disj, NoConnective}; -pub use crate::v2_std_core::{ - authored_name_at, import_is_all, import_node, import_specific_names_at, make_error_node, - module_imports, module_items, module_node, no_span, CompilerDiagnostic, Connective, ErrorNode, - NewlineIndex, Node, -}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_types::{kernel_type_set}; +pub use crate::v2_std_core::{Node, Connective, ErrorNode, make_error_node, no_span, module_node, import_node, import_is_all, import_specific_names_at, module_imports, module_items, NewlineIndex, authored_name_at, CompilerDiagnostic}; +use crate::v2_std_core::Connective::{Conj, Disj, NoConnective}; +use crate::v2_std_core::CompilerDiagnostic::{UnresolvedImport, MissingExport, DuplicateModule, CircularDependency}; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct ModuleGraph { @@ -52,130 +46,56 @@ pub struct ResolveAccum { pub fn map_has(m: Rc>, key: String) -> bool { match v2_rt::map_get(&m, key) { - Some(_) => true, - None => false, - } + Some(_) => true, + None => false, +} } -pub fn resolve_modules( - modules: &Rc>>, - source_indices: &Rc>>, -) -> Rc { +pub fn resolve_modules(modules: &Rc>>, source_indices: &Rc>>) -> Rc { { let dup_diags = check_duplicate_modules(modules.clone(), source_indices.clone()); - let module_index = modules.clone().iter().cloned().fold( - v2_rt::rc_empty_map::>(), - |acc: Rc>>, m: Rc| { - v2_rt::rc_map_insert(acc, authored_name_at(source_indices.clone(), &m), m.clone()) - }, - ); - let export_sets = modules.clone().iter().cloned().fold( - v2_rt::rc_empty_map::>>(), - |acc: Rc>>>, m: Rc| { - let exported = get_exported_names(&m, source_indices.clone()); - let exported_set = exported.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |inner_acc: Rc>, name: String| { - v2_rt::rc_map_insert(inner_acc, name.clone(), true) - }, - ); - v2_rt::rc_map_insert( - acc, - authored_name_at(source_indices.clone(), &m), - exported_set.clone(), - ) - }, - ); - let resolve_accum = modules.clone().iter().cloned().fold( - Rc::new(ResolveAccum { - imports_by_name: v2_rt::rc_empty_map::>>>(), - diagnostics: Rc::new(vec![]), - }), - |acc: Rc, m: Rc| { - let acc = Rc::try_unwrap(acc).unwrap_or_else(|rc| (*rc).clone()); - { - let result = resolve_module_imports( - &m, - module_index.clone(), - export_sets.clone(), - source_indices.clone(), - ); - Rc::new(ResolveAccum { - imports_by_name: v2_rt::rc_map_insert( - acc.imports_by_name, - authored_name_at(source_indices.clone(), &m), - result.resolved_imports.clone(), - ), - diagnostics: v2_rt::concat(acc.diagnostics, result.diagnostics.clone()), - }) - } - }, - ); - let imports_by_name = resolve_accum.imports_by_name.clone(); - let import_diags = resolve_accum.diagnostics.clone(); - let topo_result = topological_sort(&modules, source_indices.clone()); - let topo_diags = match topo_result.cycle_error.clone() { - Some(diag) => Rc::new(vec![diag.clone()]), - None => Rc::new(vec![]), - }; - let sorted_names = topo_result.sorted.clone(); - let sorted_order_map = Rc::new( - sorted_names - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, pair: (i64, String)| { - v2_rt::rc_map_insert(acc, pair.1.clone(), pair.0.clone()) - }, - ); - let acyclic_resolved = Rc::new({ - let mut __result = Vec::new(); - for m in modules.clone().iter().cloned() { - __result.extend( - (*match v2_rt::map_get( - &sorted_order_map, - authored_name_at(source_indices.clone(), &m), - ) { - Some(order) => match v2_rt::map_get( - &imports_by_name, - authored_name_at(source_indices.clone(), &m), - ) { - Some(imps) => Rc::new(vec![Rc::new(ResolvedModule { - module: m.clone(), - resolved_imports: imps.clone(), - dep_order: order.clone(), - })]), - None => Rc::new(vec![]), - }, - None => Rc::new(vec![]), - }) - .iter() - .cloned(), - ); - } - __result - }); - let sorted_resolved = Rc::new({ - let mut __sorted: Vec<_> = acyclic_resolved.iter().cloned().collect(); - __sorted.sort_by(|a: &Rc, b: &Rc| { - let __ka = (|m: Rc| m.dep_order.clone())(a.clone()); - let __kb = (|m: Rc| m.dep_order.clone())(b.clone()); - __ka.partial_cmp(&__kb).unwrap_or(std::cmp::Ordering::Equal) - }); - __sorted - }); - Rc::new(ModuleGraph { - modules: sorted_resolved, - diagnostics: v2_rt::concat(v2_rt::concat(dup_diags, import_diags), topo_diags), - }) - } +let module_index = modules.clone().iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, m: Rc| v2_rt::rc_map_insert(acc, authored_name_at(source_indices.clone(), &m), m.clone())); +let export_sets = modules.clone().iter().cloned().fold(v2_rt::rc_empty_map::>>(), |acc: Rc>>>, m: Rc| { + let exported = get_exported_names(&m, source_indices.clone()); +let exported_set = exported.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |inner_acc: Rc>, name: String| v2_rt::rc_map_insert(inner_acc, name.clone(), true)); +v2_rt::rc_map_insert(acc, authored_name_at(source_indices.clone(), &m), exported_set.clone()) +}); +let resolve_accum = modules.clone().iter().cloned().fold(Rc::new(ResolveAccum { + imports_by_name: v2_rt::rc_empty_map::>>>(), + diagnostics: Rc::new(vec![]), +}), |acc: Rc, m: Rc| { let acc = Rc::try_unwrap(acc).unwrap_or_else(|rc| (*rc).clone()); { + let result = resolve_module_imports(&m, module_index.clone(), export_sets.clone(), source_indices.clone()); +Rc::new(ResolveAccum { + imports_by_name: v2_rt::rc_map_insert(acc.imports_by_name, authored_name_at(source_indices.clone(), &m), result.resolved_imports.clone()), + diagnostics: v2_rt::concat(acc.diagnostics, result.diagnostics.clone()), +}) +} }); +let imports_by_name = resolve_accum.imports_by_name.clone(); +let import_diags = resolve_accum.diagnostics.clone(); +let topo_result = topological_sort(&modules, source_indices.clone()); +let topo_diags = match topo_result.cycle_error.clone() { + Some(diag) => Rc::new(vec![diag.clone()]), + None => Rc::new(vec![]), +}; +let sorted_names = topo_result.sorted.clone(); +let sorted_order_map = Rc::new(sorted_names.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, pair: (i64, String)| v2_rt::rc_map_insert(acc, pair.1.clone(), pair.0.clone())); +let acyclic_resolved = Rc::new({ let mut __result = Vec::new(); for m in modules.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&sorted_order_map, authored_name_at(source_indices.clone(), &m)) { + Some(order) => match v2_rt::map_get(&imports_by_name, authored_name_at(source_indices.clone(), &m)) { + Some(imps) => Rc::new(vec![Rc::new(ResolvedModule { + module: m.clone(), + resolved_imports: imps.clone(), + dep_order: order.clone(), +})]), + None => Rc::new(vec![]), +}, + None => Rc::new(vec![]), +}).iter().cloned()); } __result }); +let sorted_resolved = Rc::new({ let mut __sorted: Vec<_> = acyclic_resolved.iter().cloned().collect(); __sorted.sort_by(|a: &Rc, b: &Rc| { let __ka = (|m: Rc| m.dep_order.clone())(a.clone()); let __kb = (|m: Rc| m.dep_order.clone())(b.clone()); __ka.partial_cmp(&__kb).unwrap_or(std::cmp::Ordering::Equal) }); __sorted }); +Rc::new(ModuleGraph { + modules: sorted_resolved, + diagnostics: v2_rt::concat(v2_rt::concat(dup_diags, import_diags), topo_diags), +}) +} } pub fn find_module(module_index: Rc>>, path: String) -> Option> { @@ -188,58 +108,16 @@ pub struct ModuleResolveResult { pub diagnostics: Rc>>, } -pub fn resolve_module_imports( - module: &Rc, - module_index: Rc>>, - export_sets: Rc>>>, - source_indices: Rc>>, -) -> Rc { +pub fn resolve_module_imports(module: &Rc, module_index: Rc>>, export_sets: Rc>>>, source_indices: Rc>>) -> Rc { { - let results = Rc::new({ - let mut __result = Vec::new(); - for imp in module_imports(module.clone()).iter().cloned() { - __result.push(resolve_import( - &imp, - module_index.clone(), - &authored_name_at(source_indices.clone(), &module), - export_sets.clone(), - &source_indices, - )); - } - __result - }); - let resolved = Rc::new({ - let mut __result = Vec::new(); - for r in Rc::new({ - let mut __result = Vec::new(); - for r in results.clone().iter().cloned() { - if ((r.resolved.clone().target_module.clone() != None) - && ((r.diagnostics.clone().len() as i64) == 0)) - { - __result.push(r); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(r.resolved.clone()); - } - __result - }); - let diags = Rc::new({ - let mut __result = Vec::new(); - for r in results.clone().iter().cloned() { - __result.extend((*r.diagnostics.clone()).iter().cloned()); - } - __result - }); - Rc::new(ModuleResolveResult { - resolved_imports: resolved, - diagnostics: diags, - }) - } + let results = Rc::new({ let mut __result = Vec::new(); for imp in module_imports(module.clone()).iter().cloned() { __result.push(resolve_import(&imp, module_index.clone(), &authored_name_at(source_indices.clone(), &module), export_sets.clone(), &source_indices)); } __result }); +let resolved = Rc::new({ let mut __result = Vec::new(); for r in Rc::new({ let mut __result = Vec::new(); for r in results.clone().iter().cloned() { if ((r.resolved.clone().target_module.clone() != None) && ((r.diagnostics.clone().len() as i64) == 0)) { __result.push(r); } } __result }).iter().cloned() { __result.push(r.resolved.clone()); } __result }); +let diags = Rc::new({ let mut __result = Vec::new(); for r in results.clone().iter().cloned() { __result.extend((*r.diagnostics.clone()).iter().cloned()); } __result }); +Rc::new(ModuleResolveResult { + resolved_imports: resolved, + diagnostics: diags, +}) +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -248,165 +126,82 @@ pub struct ImportResolveResult { pub diagnostics: Rc>>, } -pub fn resolve_import( - import: &Rc, - module_index: Rc>>, - importing_module: &String, - export_sets: Rc>>>, - source_indices: &Rc>>, -) -> Rc { +pub fn resolve_import(import: &Rc, module_index: Rc>>, importing_module: &String, export_sets: Rc>>>, source_indices: &Rc>>) -> Rc { { let import_path = authored_name_at(source_indices.clone(), &import); - let target = find_module(module_index, import_path.clone()); - match target { - None => { - let diag = make_error_node( - Rc::new(CompilerDiagnostic::UnresolvedImport { - module_path: import_path.clone(), - importing_module: importing_module.clone(), - span: import.span.clone(), - }), - importing_module.clone(), - ); - Rc::new(ImportResolveResult { - resolved: Rc::new(ResolvedImport { - module_path: import_path.clone(), - is_all: import_is_all(import.clone()), - specific_names: import_specific_names_at( - import.clone(), - source_indices.clone(), - ), - target_module: None, - }), - diagnostics: Rc::new(vec![diag]), - }) - } - Some(target_mod) => { - let exported_set = match v2_rt::map_get(&export_sets, import_path.clone()) { - Some(set) => set.clone(), - None => v2_rt::rc_empty_map::(), - }; - let name_diags = if import_is_all(import.clone()) { - Rc::new(vec![]) - } else { - Rc::new({ - let mut __result = Vec::new(); - for child in Rc::new({ - let mut __result = Vec::new(); - for child in import.children.clone().iter().cloned() { - if (v2_rt::map_has( - &exported_set, - authored_name_at(source_indices.clone(), &child), - ) == false) - { - __result.push(child); - } - } - __result - }) - .iter() - .cloned() - { - __result.push(make_error_node( - Rc::new(CompilerDiagnostic::MissingExport { - name: authored_name_at(source_indices.clone(), &child), - module_path: import_path.clone(), - importing_module: importing_module.clone(), - span: child.span.clone(), - }), - importing_module.clone(), - )); - } - __result - }) - }; - Rc::new(ImportResolveResult { - resolved: Rc::new(ResolvedImport { - module_path: import_path.clone(), - is_all: import_is_all(import.clone()), - specific_names: import_specific_names_at( - import.clone(), - source_indices.clone(), - ), - target_module: Some(target_mod.clone()), - }), - diagnostics: name_diags, - }) - } - } - } +let target = find_module(module_index, import_path.clone()); +match target { + None => { + let diag = make_error_node(Rc::new(CompilerDiagnostic::UnresolvedImport { + module_path: import_path.clone(), + importing_module: importing_module.clone(), + span: import.span.clone(), +}), importing_module.clone()); +Rc::new(ImportResolveResult { + resolved: Rc::new(ResolvedImport { + module_path: import_path.clone(), + is_all: import_is_all(import.clone()), + specific_names: import_specific_names_at(import.clone(), source_indices.clone()), + target_module: None, +}), + diagnostics: Rc::new(vec![diag]), +}) +}, + Some(target_mod) => { + let exported_set = match v2_rt::map_get(&export_sets, import_path.clone()) { + Some(set) => set.clone(), + None => v2_rt::rc_empty_map::(), +}; +let name_diags = if import_is_all(import.clone()) { + Rc::new(vec![]) + } else { + Rc::new({ let mut __result = Vec::new(); for child in Rc::new({ let mut __result = Vec::new(); for child in import.children.clone().iter().cloned() { if (v2_rt::map_has(&exported_set, authored_name_at(source_indices.clone(), &child)) == false) { __result.push(child); } } __result }).iter().cloned() { __result.push(make_error_node(Rc::new(CompilerDiagnostic::MissingExport { + name: authored_name_at(source_indices.clone(), &child), + module_path: import_path.clone(), + importing_module: importing_module.clone(), + span: child.span.clone(), +}), importing_module.clone())); } __result }) + }; +Rc::new(ImportResolveResult { + resolved: Rc::new(ResolvedImport { + module_path: import_path.clone(), + is_all: import_is_all(import.clone()), + specific_names: import_specific_names_at(import.clone(), source_indices.clone()), + target_module: Some(target_mod.clone()), +}), + diagnostics: name_diags, +}) +}, +} +} } -pub fn get_exported_names( - module: &Rc, - source_indices: Rc>>, -) -> Rc> { +pub fn get_exported_names(module: &Rc, source_indices: Rc>>) -> Rc> { { - let item_names = Rc::new({ - let mut __result = Vec::new(); - for item in module_items(module.clone()).iter().cloned() { - __result.push(get_item_name(item.clone(), source_indices.clone())); - } - __result - }); - let variant_names = Rc::new({ - let mut __result = Vec::new(); - for item in module_items(module.clone()).iter().cloned() { - __result.extend( - (*get_variant_names(&item, source_indices.clone())) - .iter() - .cloned(), - ); - } - __result - }); - let imported_names = Rc::new({ - let mut __result = Vec::new(); - for imp in module_imports(module.clone()).iter().cloned() { - __result.extend( - (*if import_is_all(imp.clone()) { - Rc::new(vec![]) - } else { - import_specific_names_at(imp.clone(), source_indices.clone()) - }) - .iter() - .cloned(), - ); - } - __result - }); - v2_rt::concat( - v2_rt::concat(v2_rt::concat(item_names, variant_names), imported_names), - Rc::new(v2_rt::map_keys(&kernel_type_set())), - ) - } + let item_names = Rc::new({ let mut __result = Vec::new(); for item in module_items(module.clone()).iter().cloned() { __result.push(get_item_name(item.clone(), source_indices.clone())); } __result }); +let variant_names = Rc::new({ let mut __result = Vec::new(); for item in module_items(module.clone()).iter().cloned() { __result.extend((*get_variant_names(&item, source_indices.clone())).iter().cloned()); } __result }); +let imported_names = Rc::new({ let mut __result = Vec::new(); for imp in module_imports(module.clone()).iter().cloned() { __result.extend((*if import_is_all(imp.clone()) { + Rc::new(vec![]) + } else { + import_specific_names_at(imp.clone(), source_indices.clone()) + }).iter().cloned()); } __result }); +v2_rt::concat(v2_rt::concat(v2_rt::concat(item_names, variant_names), imported_names), Rc::new(v2_rt::map_keys(&kernel_type_set()))) +} } -pub fn get_item_name( - item: Rc, - source_indices: Rc>>, -) -> String { +pub fn get_item_name(item: Rc, source_indices: Rc>>) -> String { authored_name_at(source_indices, &item) } -pub fn get_variant_names( - item: &Rc, - source_indices: Rc>>, -) -> Rc> { +pub fn get_variant_names(item: &Rc, source_indices: Rc>>) -> Rc> { { let is_coproduct = (item.connective.clone() == Connective::Disj); - if is_coproduct { - Rc::new({ - let mut __result = Vec::new(); - for c in item.children.clone().iter().cloned() { - __result.push(authored_name_at(source_indices.clone(), &c)); - } - __result - }) +if is_coproduct { + Rc::new({ let mut __result = Vec::new(); for c in item.children.clone().iter().cloned() { __result.push(authored_name_at(source_indices.clone(), &c)); } __result }) } else { Rc::new(vec![]) } - } +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -415,47 +210,31 @@ pub struct DuplicateCheckState { pub diagnostics: Rc>>, } -pub fn check_duplicate_modules( - modules: Rc>>, - source_indices: Rc>>, -) -> Rc>> { +pub fn check_duplicate_modules(modules: Rc>>, source_indices: Rc>>) -> Rc>> { { - let result = modules.iter().cloned().fold( - Rc::new(DuplicateCheckState { - seen_names: v2_rt::rc_empty_map::(), - diagnostics: Rc::new(vec![]), - }), - |state: Rc, m: Rc| { - let m_name = authored_name_at(source_indices.clone(), &m); - let is_dup = v2_rt::map_has(&state.seen_names.clone(), m_name.clone()); - if is_dup.clone() { - Rc::new(DuplicateCheckState { - seen_names: state.seen_names.clone(), - diagnostics: v2_rt::concat( - state.diagnostics.clone(), - Rc::new(vec![make_error_node( - Rc::new(CompilerDiagnostic::DuplicateModule { - name: m_name.clone(), - span: m.span.clone(), - }), - m_name.clone(), - )]), - ), - }) - } else { - Rc::new(DuplicateCheckState { - seen_names: v2_rt::rc_map_insert( - state.seen_names.clone(), - m_name.clone(), - true, - ), - diagnostics: state.diagnostics.clone(), - }) - } - }, - ); - result.diagnostics.clone() - } + let result = modules.iter().cloned().fold(Rc::new(DuplicateCheckState { + seen_names: v2_rt::rc_empty_map::(), + diagnostics: Rc::new(vec![]), +}), |state: Rc, m: Rc| { + let m_name = authored_name_at(source_indices.clone(), &m); +let is_dup = v2_rt::map_has(&state.seen_names.clone(), m_name.clone()); +if is_dup.clone() { + Rc::new(DuplicateCheckState { + seen_names: state.seen_names.clone(), + diagnostics: v2_rt::concat(state.diagnostics.clone(), Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::DuplicateModule { + name: m_name.clone(), + span: m.span.clone(), +}), m_name.clone())])), +}) + } else { + Rc::new(DuplicateCheckState { + seen_names: v2_rt::rc_map_insert(state.seen_names.clone(), m_name.clone(), true), + diagnostics: state.diagnostics.clone(), +}) + } +}); +result.diagnostics.clone() +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -464,22 +243,14 @@ pub struct TopoResult { pub cycle_error: Option>, } -pub fn adjacency_add_edge( - adjacency: &Rc>>>, - from_module: &String, - to_module: String, -) -> Rc>>> { +pub fn adjacency_add_edge(adjacency: &Rc>>>, from_module: &String, to_module: String) -> Rc>>> { { let existing = match v2_rt::map_get(&adjacency, from_module.clone()) { - Some(lst) => lst.clone(), - None => Rc::new(vec![]), - }; - v2_rt::rc_map_insert( - adjacency.clone(), - from_module.clone(), - v2_rt::rc_list_push(existing, to_module), - ) - } + Some(lst) => lst.clone(), + None => Rc::new(vec![]), +}; +v2_rt::rc_map_insert(adjacency.clone(), from_module.clone(), v2_rt::rc_list_push(existing, to_module)) +} } pub fn topo_sort_key(name: String) -> String { @@ -490,201 +261,67 @@ pub fn topo_sort_key(name: String) -> String { } } -pub fn topological_sort( - modules: &Rc>>, - source_indices: Rc>>, -) -> Rc { +pub fn topological_sort(modules: &Rc>>, source_indices: Rc>>) -> Rc { { - let module_names = Rc::new({ - let mut __result = Vec::new(); - for m in modules.clone().iter().cloned() { - __result.push(authored_name_at(source_indices.clone(), &m)); - } - __result - }); - let has_std_types = { - let mut __found = false; - for name in module_names.clone().iter().cloned() { - if (name.clone().as_str() == "std.types".to_string().as_str()) { - __found = true; - break; - } - } - __found - }; - let explicit_edges = Rc::new({ - let mut __result = Vec::new(); - for m in modules.clone().iter().cloned() { - __result.extend( - (*Rc::new({ - let mut __result = Vec::new(); - for imp in module_imports(m.clone()).iter().cloned() { - __result.push(Rc::new(DepEdge { - from_module: authored_name_at(source_indices.clone(), &imp), - to_module: authored_name_at(source_indices.clone(), &m), - })); - } - __result - })) - .iter() - .cloned(), - ); - } - __result - }); - let implicit_std_types_edges = if has_std_types.clone() { - Rc::new({ - let mut __result = Vec::new(); - for m in modules.clone().iter().cloned() { - __result.extend( - (*{ - let m_name = authored_name_at(source_indices.clone(), &m); - let imports_std_types = { - let mut __found = false; - for imp in module_imports(m.clone()).iter().cloned() { - if (authored_name_at(source_indices.clone(), &imp).as_str() - == "std.types".to_string().as_str()) - { - __found = true; - break; - } - } - __found - }; - if ((((m_name.clone().as_str() != "std.types".to_string().as_str()) - && (m_name.clone().as_str() - != "std.algebra".to_string().as_str())) - && (m_name.clone().as_str() - != "std.error_primitives".to_string().as_str())) - && (imports_std_types.clone() == false)) - { - Rc::new(vec![Rc::new(DepEdge { - from_module: "std.types".to_string(), - to_module: m_name.clone(), - })]) - } else { - Rc::new(vec![]) - } - }) - .iter() - .cloned(), - ); + let module_names = Rc::new({ let mut __result = Vec::new(); for m in modules.clone().iter().cloned() { __result.push(authored_name_at(source_indices.clone(), &m)); } __result }); +let has_std_types = { let mut __found = false; for name in module_names.clone().iter().cloned() { if (name.clone().as_str() == "std.types".to_string().as_str()) { __found = true; break; } } __found }; +let explicit_edges = Rc::new({ let mut __result = Vec::new(); for m in modules.clone().iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for imp in module_imports(m.clone()).iter().cloned() { __result.push(Rc::new(DepEdge { + from_module: authored_name_at(source_indices.clone(), &imp), + to_module: authored_name_at(source_indices.clone(), &m), +})); } __result })).iter().cloned()); } __result }); +let implicit_std_types_edges = if has_std_types.clone() { + Rc::new({ let mut __result = Vec::new(); for m in modules.clone().iter().cloned() { __result.extend((*{ + let m_name = authored_name_at(source_indices.clone(), &m); +let imports_std_types = { let mut __found = false; for imp in module_imports(m.clone()).iter().cloned() { if (authored_name_at(source_indices.clone(), &imp).as_str() == "std.types".to_string().as_str()) { __found = true; break; } } __found }; +if ((((m_name.clone().as_str() != "std.types".to_string().as_str()) && (m_name.clone().as_str() != "std.algebra".to_string().as_str())) && (m_name.clone().as_str() != "std.error_primitives".to_string().as_str())) && (imports_std_types.clone() == false)) { + Rc::new(vec![Rc::new(DepEdge { + from_module: "std.types".to_string(), + to_module: m_name.clone(), +})]) + } else { + Rc::new(vec![]) } - __result - }) +}).iter().cloned()); } __result }) } else { Rc::new(vec![]) }; - let adjacency = v2_rt::concat(explicit_edges, implicit_std_types_edges) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::>>(), - |acc: Rc>>>, edge: Rc| { - adjacency_add_edge(&acc, &edge.from_module.clone(), edge.to_module.clone()) - }, - ); - let in_degree_map = modules.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, m: Rc| { - let m_name = authored_name_at(source_indices.clone(), &m); - let imports_std_types = { - let mut __found = false; - for imp in module_imports(m.clone()).iter().cloned() { - if (authored_name_at(source_indices.clone(), &imp).as_str() - == "std.types".to_string().as_str()) - { - __found = true; - break; - } - } - __found - }; - let implicit_std_types_in_degree = if ((((has_std_types.clone() - && (m_name.clone().as_str() != "std.types".to_string().as_str())) - && (m_name.clone().as_str() != "std.algebra".to_string().as_str())) - && (m_name.clone().as_str() != "std.error_primitives".to_string().as_str())) - && (imports_std_types.clone() == false)) - { - 1 - } else { - 0 - }; - v2_rt::rc_map_insert( - acc, - m_name.clone(), - ((module_imports(m.clone()).len() as i64) - + implicit_std_types_in_degree.clone()), - ) - }, - ); - let initial_queue = Rc::new({ - let mut __sorted: Vec<_> = Rc::new({ - let mut __result = Vec::new(); - for name in module_names.clone().iter().cloned() { - if match v2_rt::map_get(&in_degree_map, name.clone()) { - Some(0) => true, - _ => false, - } { - __result.push(name); - } - } - __result - }) - .iter() - .cloned() - .collect(); - __sorted.sort_by(|a: &String, b: &String| { - let __ka = (|name: String| topo_sort_key(name.clone()))(a.clone()); - let __kb = (|name: String| topo_sort_key(name.clone()))(b.clone()); - __ka.partial_cmp(&__kb).unwrap_or(std::cmp::Ordering::Equal) - }); - __sorted - }); - let module_count = (modules.clone().len() as i64); - let result = kahn_drain( - initial_queue, - Rc::new(vec![]), - in_degree_map.clone(), - adjacency, - module_count.clone(), - ); - if ((result.sorted.clone().len() as i64) == module_count.clone()) { +let adjacency = v2_rt::concat(explicit_edges, implicit_std_types_edges).iter().cloned().fold(v2_rt::rc_empty_map::>>(), |acc: Rc>>>, edge: Rc| adjacency_add_edge(&acc, &edge.from_module.clone(), edge.to_module.clone())); +let in_degree_map = modules.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, m: Rc| { + let m_name = authored_name_at(source_indices.clone(), &m); +let imports_std_types = { let mut __found = false; for imp in module_imports(m.clone()).iter().cloned() { if (authored_name_at(source_indices.clone(), &imp).as_str() == "std.types".to_string().as_str()) { __found = true; break; } } __found }; +let implicit_std_types_in_degree = if ((((has_std_types.clone() && (m_name.clone().as_str() != "std.types".to_string().as_str())) && (m_name.clone().as_str() != "std.algebra".to_string().as_str())) && (m_name.clone().as_str() != "std.error_primitives".to_string().as_str())) && (imports_std_types.clone() == false)) { + 1 + } else { + 0 + }; +v2_rt::rc_map_insert(acc, m_name.clone(), ((module_imports(m.clone()).len() as i64) + implicit_std_types_in_degree.clone())) +}); +let initial_queue = Rc::new({ let mut __sorted: Vec<_> = Rc::new({ let mut __result = Vec::new(); for name in module_names.clone().iter().cloned() { if match v2_rt::map_get(&in_degree_map, name.clone()) { + Some(0) => true, + _ => false, +} { __result.push(name); } } __result }).iter().cloned().collect(); __sorted.sort_by(|a: &String, b: &String| { let __ka = (|name: String| topo_sort_key(name.clone()))(a.clone()); let __kb = (|name: String| topo_sort_key(name.clone()))(b.clone()); __ka.partial_cmp(&__kb).unwrap_or(std::cmp::Ordering::Equal) }); __sorted }); +let module_count = (modules.clone().len() as i64); +let result = kahn_drain(initial_queue, Rc::new(vec![]), in_degree_map.clone(), adjacency, module_count.clone()); +if ((result.sorted.clone().len() as i64) == module_count.clone()) { Rc::new(TopoResult { - sorted: result.sorted.clone(), - cycle_error: None, - }) + sorted: result.sorted.clone(), + cycle_error: None, +}) } else { { - let sorted_set = result.sorted.clone().iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, name: String| { - v2_rt::rc_map_insert(acc, name.clone(), true) - }, - ); - let cycle_members = Rc::new({ - let mut __result = Vec::new(); - for name in module_names.clone().iter().cloned() { - if (v2_rt::map_has(&sorted_set, name.clone()) == false) { - __result.push(name); - } - } - __result - }); - let cycle_desc = cycle_members.clone().join(&" -> ".to_string()); - Rc::new(TopoResult { - sorted: result.sorted.clone(), - cycle_error: Some(make_error_node( - Rc::new(CompilerDiagnostic::CircularDependency { - modules: cycle_members.clone(), - span: no_span(), - }), - "".to_string(), - )), - }) - } + let sorted_set = result.sorted.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, name.clone(), true)); +let cycle_members = Rc::new({ let mut __result = Vec::new(); for name in module_names.clone().iter().cloned() { if (v2_rt::map_has(&sorted_set, name.clone()) == false) { __result.push(name); } } __result }); +let cycle_desc = cycle_members.clone().join(&" -> ".to_string()); +Rc::new(TopoResult { + sorted: result.sorted.clone(), + cycle_error: Some(make_error_node(Rc::new(CompilerDiagnostic::CircularDependency { + modules: cycle_members.clone(), + span: no_span(), +}), "".to_string())), +}) +} } - } +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -693,112 +330,53 @@ pub struct KahnDrainState { pub in_degree_map: Rc>, } -pub fn kahn_drain( - mut queue: Rc>, - mut sorted: Rc>, - mut in_degree_map: Rc>, - mut adjacency: Rc>>>, - mut fuel: i64, -) -> Rc { +pub fn kahn_drain(mut queue: Rc>, mut sorted: Rc>, mut in_degree_map: Rc>, mut adjacency: Rc>>>, mut fuel: i64) -> Rc { loop { if ((queue.clone().len() as i64) == 0) { return Rc::new(KahnDrainState { - sorted: sorted.clone(), - in_degree_map: in_degree_map.clone(), - }); + sorted: sorted.clone(), + in_degree_map: in_degree_map.clone(), +}) } - let batch_result = queue.clone().iter().cloned().fold( - Rc::new(KahnDrainState { - sorted: sorted.clone(), - in_degree_map: in_degree_map.clone(), - }), - |state: Rc, node: String| { - let state = Rc::try_unwrap(state).unwrap_or_else(|rc| (*rc).clone()); - { - let new_sorted = v2_rt::rc_list_push(state.sorted, node.clone()); - let neighbors = match v2_rt::map_get(&adjacency, node.clone()) { - Some(ns) => ns.clone(), - None => Rc::new(vec![]), - }; - let new_degrees = neighbors.clone().iter().cloned().fold( - state.in_degree_map, - |deg_map: Rc>, neighbor: String| { - let current = match v2_rt::map_get(°_map, neighbor.clone()) { - Some(d) => d.clone(), - None => 0, - }; - v2_rt::rc_map_insert( - deg_map.clone(), - neighbor.clone(), - (current.clone() - 1), - ) - }, - ); - Rc::new(KahnDrainState { - sorted: new_sorted.clone(), - in_degree_map: new_degrees.clone(), - }) - } - }, - ); - let new_zero_set = Rc::new({ - let mut __result = Vec::new(); - for neighbor in Rc::new({ - let mut __result = Vec::new(); - for node in queue.clone().iter().cloned() { - __result.extend( - (*match v2_rt::map_get(&adjacency, node.clone()) { - Some(ns) => ns.clone(), - None => Rc::new(vec![]), - }) - .iter() - .cloned(), - ); - } - __result - }) - .iter() - .cloned() - { - if match v2_rt::map_get(&batch_result.in_degree_map.clone(), neighbor.clone()) { - Some(0) => true, - _ => false, - } { - __result.push(neighbor); - } - } - __result - }) - .iter() - .cloned() - .fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, name: String| { - v2_rt::rc_map_insert(acc, name.clone(), true) - }, - ); - let new_zero = Rc::new({ - let mut __sorted: Vec<_> = Rc::new(v2_rt::map_keys(&new_zero_set)) - .iter() - .cloned() - .collect(); - __sorted.sort_by(|a: &String, b: &String| { - let __ka = (|name: String| name.clone())(a.clone()); - let __kb = (|name: String| name.clone())(b.clone()); - __ka.partial_cmp(&__kb).unwrap_or(std::cmp::Ordering::Equal) - }); - __sorted - }); - { +let batch_result = queue.clone().iter().cloned().fold(Rc::new(KahnDrainState { + sorted: sorted.clone(), + in_degree_map: in_degree_map.clone(), +}), |state: Rc, node: String| { let state = Rc::try_unwrap(state).unwrap_or_else(|rc| (*rc).clone()); { + let new_sorted = v2_rt::rc_list_push(state.sorted, node.clone()); +let neighbors = match v2_rt::map_get(&adjacency, node.clone()) { + Some(ns) => ns.clone(), + None => Rc::new(vec![]), +}; +let new_degrees = neighbors.clone().iter().cloned().fold(state.in_degree_map, |deg_map: Rc>, neighbor: String| { + let current = match v2_rt::map_get(°_map, neighbor.clone()) { + Some(d) => d.clone(), + None => 0, +}; +v2_rt::rc_map_insert(deg_map.clone(), neighbor.clone(), (current.clone() - 1)) +}); +Rc::new(KahnDrainState { + sorted: new_sorted.clone(), + in_degree_map: new_degrees.clone(), +}) +} }); +let new_zero_set = Rc::new({ let mut __result = Vec::new(); for neighbor in Rc::new({ let mut __result = Vec::new(); for node in queue.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&adjacency, node.clone()) { + Some(ns) => ns.clone(), + None => Rc::new(vec![]), +}).iter().cloned()); } __result }).iter().cloned() { if match v2_rt::map_get(&batch_result.in_degree_map.clone(), neighbor.clone()) { + Some(0) => true, + _ => false, +} { __result.push(neighbor); } } __result }).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, name.clone(), true)); +let new_zero = Rc::new({ let mut __sorted: Vec<_> = Rc::new(v2_rt::map_keys(&new_zero_set)).iter().cloned().collect(); __sorted.sort_by(|a: &String, b: &String| { let __ka = (|name: String| name.clone())(a.clone()); let __kb = (|name: String| name.clone())(b.clone()); __ka.partial_cmp(&__kb).unwrap_or(std::cmp::Ordering::Equal) }); __sorted }); +{ let __tco_0 = new_zero; - let __tco_1 = batch_result.sorted.clone(); - let __tco_2 = batch_result.in_degree_map.clone(); - let __tco_3 = (fuel - 1); - queue = __tco_0; - sorted = __tco_1; - in_degree_map = __tco_2; - fuel = __tco_3; - continue; - } - } +let __tco_1 = batch_result.sorted.clone(); +let __tco_2 = batch_result.in_degree_map.clone(); +let __tco_3 = (fuel - 1); +queue = __tco_0; +sorted = __tco_1; +in_degree_map = __tco_2; +fuel = __tco_3; +continue; +} +} } diff --git a/src/v2/stage0/src/v2_compiler_runtime_rust.rs b/src/v2/stage0/src/v2_compiler_runtime_rust.rs index 5c7fbc9d8fd..a22f3550bd3 100644 --- a/src/v2/stage0/src/v2_compiler_runtime_rust.rs +++ b/src/v2/stage0/src/v2_compiler_runtime_rust.rs @@ -1,26 +1,14 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.runtime_rust -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; pub fn rt_header() -> String { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "//! Runtime shims for v2 compiler intrinsic operations.\n".to_string(), - "//! Generated by the v2 compiler -- do not edit.\n\n".to_string(), - ), - "#![allow(unused_variables, dead_code)]\n\n".to_string(), - ), - "use std::collections::HashMap;\n".to_string(), - ), - "use std::rc::Rc;\n\n".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("//! Runtime shims for v2 compiler intrinsic operations.\n".to_string(), "//! Generated by the v2 compiler -- do not edit.\n\n".to_string()), "#![allow(unused_variables, dead_code)]\n\n".to_string()), "use std::collections::BTreeSet;\n".to_string()), "use std::collections::HashMap;\n".to_string()), "use std::rc::Rc;\n\n".to_string()) } pub fn rt_concat_trait() -> String { @@ -32,7 +20,7 @@ pub fn rt_string_ops() -> String { } pub fn rt_collection_ops() -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("pub fn lookup(table: &HashMap, key: String) -> Option {\n".to_string(), " table.get(&key).cloned()\n".to_string()), "}\n\n".to_string()), "pub fn index_by String>(list: Vec, key_fn: F) -> HashMap {\n".to_string()), " let mut map = HashMap::new();\n".to_string()), " for item in list { let key = key_fn(&item); map.insert(key, item); }\n".to_string()), " map\n".to_string()), "}\n\n".to_string()), "pub fn empty_map() -> HashMap { HashMap::new() }\n\n".to_string()), "pub fn map_insert(mut map: HashMap, key: K, value: V) -> HashMap {\n".to_string()), " map.insert(key, value); map\n".to_string()), "}\n\n".to_string()), "pub fn map_merge(mut base: HashMap, overlay: HashMap) -> HashMap {\n".to_string()), " base.extend(overlay); base\n".to_string()), "}\n\n".to_string()), "pub fn map_get(m: &HashMap, key: K) -> Option {\n".to_string()), " m.get(&key).cloned()\n".to_string()), "}\n\n".to_string()), "pub fn map_keys(m: &HashMap) -> Vec { m.keys().cloned().collect() }\n\n".to_string()), "pub fn map_values(m: &HashMap) -> Vec { m.values().cloned().collect() }\n\n".to_string()), "pub fn list_concat(mut a: Vec, b: Vec) -> Vec { a.extend(b); a }\n\n".to_string()), "pub fn list_push(mut list: Vec, item: T) -> Vec { list.push(item); list }\n\n".to_string()), "pub fn append(list: Rc>, item: T) -> Vec {\n".to_string()), " let mut v = (*list).clone();\n".to_string()), " v.push(item);\n".to_string()), " v\n".to_string()), "}\n\n".to_string()), "pub fn chars_to_string(chars: &Rc>, start: i64, end: i64) -> String {\n".to_string()), " let len = chars.len();\n".to_string()), " let start = (start.max(0) as usize).min(len);\n".to_string()), " let end = (end.max(0) as usize).min(len).max(start);\n".to_string()), " chars[start..end]\n".to_string()), " .iter()\n".to_string()), " .filter_map(|&cp| char::from_u32(cp as u32))\n".to_string()), " .collect()\n".to_string()), "}\n\n".to_string()), "pub fn parse_int(s: String) -> Option { s.parse::().ok() }\n\n".to_string()), "pub fn map_contains_key(m: &HashMap, key: K) -> bool {\n".to_string()), " m.contains_key(&key)\n".to_string()), "}\n\n".to_string()), "pub fn map_has(m: &HashMap, key: K) -> bool {\n".to_string()), " m.contains_key(&key)\n".to_string()), "}\n\n".to_string()), "pub fn reverse(list: Rc>) -> Rc> {\n".to_string()), " let mut v = (*list).clone(); v.reverse(); Rc::new(v)\n".to_string()), "}\n\n".to_string()), "pub fn replace(s: String, from: String, to: String) -> String {\n".to_string()), " s.replace(&from, &to)\n".to_string()), "}\n\n".to_string()) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("pub fn lookup(table: &HashMap, key: String) -> Option {\n".to_string(), " table.get(&key).cloned()\n".to_string()), "}\n\n".to_string()), "pub fn index_by String>(list: Vec, key_fn: F) -> HashMap {\n".to_string()), " let mut map = HashMap::new();\n".to_string()), " for item in list { let key = key_fn(&item); map.insert(key, item); }\n".to_string()), " map\n".to_string()), "}\n\n".to_string()), "pub fn empty_map() -> HashMap { HashMap::new() }\n\n".to_string()), "pub fn map_insert(mut map: HashMap, key: K, value: V) -> HashMap {\n".to_string()), " map.insert(key, value); map\n".to_string()), "}\n\n".to_string()), "pub fn map_merge(mut base: HashMap, overlay: HashMap) -> HashMap {\n".to_string()), " base.extend(overlay); base\n".to_string()), "}\n\n".to_string()), "pub fn map_get(m: &HashMap, key: K) -> Option {\n".to_string()), " m.get(&key).cloned()\n".to_string()), "}\n\n".to_string()), "pub fn map_keys(m: &HashMap) -> Vec { m.keys().cloned().collect() }\n\n".to_string()), "pub fn map_values(m: &HashMap) -> Vec { m.values().cloned().collect() }\n\n".to_string()), "pub fn list_concat(mut a: Vec, b: Vec) -> Vec { a.extend(b); a }\n\n".to_string()), "pub fn list_push(mut list: Vec, item: T) -> Vec { list.push(item); list }\n\n".to_string()), "pub fn append(list: Rc>, item: T) -> Vec {\n".to_string()), " let mut v = (*list).clone();\n".to_string()), " v.push(item);\n".to_string()), " v\n".to_string()), "}\n\n".to_string()), "pub fn chars_to_string(chars: &Rc>, start: i64, end: i64) -> String {\n".to_string()), " let len = chars.len();\n".to_string()), " let start = (start.max(0) as usize).min(len);\n".to_string()), " let end = (end.max(0) as usize).min(len).max(start);\n".to_string()), " chars[start..end]\n".to_string()), " .iter()\n".to_string()), " .filter_map(|&cp| char::from_u32(cp as u32))\n".to_string()), " .collect()\n".to_string()), "}\n\n".to_string()), "pub fn parse_int(s: String) -> Option { s.parse::().ok() }\n\n".to_string()), "pub fn map_contains_key(m: &HashMap, key: K) -> bool {\n".to_string()), " m.contains_key(&key)\n".to_string()), "}\n\n".to_string()), "pub fn map_has(m: &HashMap, key: K) -> bool {\n".to_string()), " m.contains_key(&key)\n".to_string()), "}\n\n".to_string()), "pub fn rc_empty_set() -> Rc> {\n".to_string()), " Rc::new(BTreeSet::new())\n".to_string()), "}\n\n".to_string()), "pub fn rc_set_insert(mut s: Rc>, x: T) -> Rc> {\n".to_string()), " Rc::make_mut(&mut s).insert(x);\n".to_string()), " s\n".to_string()), "}\n\n".to_string()), "pub fn rc_set_union(a: Rc>, b: Rc>) -> Rc> {\n".to_string()), " let mut out = a;\n".to_string()), " for x in b.iter().cloned() {\n".to_string()), " Rc::make_mut(&mut out).insert(x);\n".to_string()), " }\n".to_string()), " out\n".to_string()), "}\n\n".to_string()), "pub fn set_contains(s: &BTreeSet, x: T) -> bool {\n".to_string()), " s.contains(&x)\n".to_string()), "}\n\n".to_string()), "pub fn reverse(list: Rc>) -> Rc> {\n".to_string()), " let mut v = (*list).clone(); v.reverse(); Rc::new(v)\n".to_string()), "}\n\n".to_string()), "pub fn replace(s: String, from: String, to: String) -> String {\n".to_string()), " s.replace(&from, &to)\n".to_string()), "}\n\n".to_string()) } pub fn rt_scanner_ops() -> String { @@ -40,23 +28,7 @@ pub fn rt_scanner_ops() -> String { } pub fn rt_unicode_ops() -> String { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "pub fn code_point(c: String) -> i64 {\n".to_string(), - " c.chars().next().map(|ch| ch as i64).unwrap_or(0)\n".to_string(), - ), - "}\n\n".to_string(), - ), - "pub fn from_code_point(cp: i64) -> String {\n".to_string(), - ), - " char::from_u32(cp as u32).map(|c| c.to_string()).unwrap_or_default()\n" - .to_string(), - ), - "}\n\n".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("pub fn code_point(c: String) -> i64 {\n".to_string(), " c.chars().next().map(|ch| ch as i64).unwrap_or(0)\n".to_string()), "}\n\n".to_string()), "pub fn from_code_point(cp: i64) -> String {\n".to_string()), " char::from_u32(cp as u32).map(|c| c.to_string()).unwrap_or_default()\n".to_string()), "}\n\n".to_string()) } pub fn rt_rc_container_ops() -> String { @@ -64,53 +36,9 @@ pub fn rt_rc_container_ops() -> String { } pub fn rt_filesystem() -> String { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - "#[derive(Debug, Clone)]\n".to_string(), - "pub struct FilesystemReadResult {\n".to_string(), - ), - " pub content: String,\n".to_string(), - ), - "}\n\n".to_string(), - ), - "pub fn filesystem_read(path: String) -> FilesystemReadResult {\n" - .to_string(), - ), - " let content = std::fs::read_to_string(&path)\n".to_string(), - ), - " .unwrap_or_else(|e| panic!(\"failed to read {}: {}\", path, e));\n" - .to_string(), - ), - " FilesystemReadResult { content }\n".to_string(), - ), - "}\n".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("#[derive(Debug, Clone)]\n".to_string(), "pub struct FilesystemReadResult {\n".to_string()), " pub content: String,\n".to_string()), "}\n\n".to_string()), "pub fn filesystem_read(path: String) -> FilesystemReadResult {\n".to_string()), " let content = std::fs::read_to_string(&path)\n".to_string()), " .unwrap_or_else(|e| panic!(\"failed to read {}: {}\", path, e));\n".to_string()), " FilesystemReadResult { content }\n".to_string()), "}\n".to_string()) } pub fn rust_runtime_source() -> String { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(rt_header(), rt_concat_trait()), - rt_string_ops(), - ), - rt_collection_ops(), - ), - rt_rc_container_ops(), - ), - rt_scanner_ops(), - ), - rt_unicode_ops(), - ), - rt_filesystem(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rt_header(), rt_concat_trait()), rt_string_ops()), rt_collection_ops()), rt_rc_container_ops()), rt_scanner_ops()), rt_unicode_ops()), rt_filesystem()) } diff --git a/src/v2/stage0/src/v2_compiler_tokenize.rs b/src/v2/stage0/src/v2_compiler_tokenize.rs index 843451120d1..74bb7d656f5 100644 --- a/src/v2/stage0/src/v2_compiler_tokenize.rs +++ b/src/v2/stage0/src/v2_compiler_tokenize.rs @@ -1,28 +1,22 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.tokenize -use self::StringScanResult::*; -pub use crate::extdeps_languages_dag_syntax::dag_keyword_set; -pub use crate::std_types::SourceSpan; -use crate::v2_rt; -use crate::v2_std_core::TokenShape::{ - ShAnd, ShArrow, ShBang, ShColon, ShComma, ShDot, ShDotDot, ShEof, ShEq, ShEqEq, ShFatArrow, - ShGe, ShGt, ShIdent, ShKeyword, ShLBrace, ShLBracket, ShLParen, ShLe, ShLitFloat, ShLitInt, - ShLitStr, ShLt, ShMinus, ShNe, ShNewline, ShNullCoalesce, ShOr, ShPercent, ShPipe, ShPipeArrow, - ShPlus, ShQuestion, ShRBrace, ShRBracket, ShRParen, ShSlash, ShStar, ShStrBegin, ShStrEnd, - ShStrMid, ShUnknown, -}; -pub use crate::v2_std_core::{make_file_span, Token, TokenShape}; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_types::{SourceSpan}; +pub use crate::v2_std_core::{make_file_span, Token, TokenShape}; +use crate::v2_std_core::TokenShape::{ShKeyword, ShLBrace, ShRBrace, ShLParen, ShRParen, ShLBracket, ShRBracket, ShLt, ShGt, ShLe, ShGe, ShFatArrow, ShArrow, ShColon, ShComma, ShDot, ShDotDot, ShEq, ShEqEq, ShNe, ShPlus, ShMinus, ShStar, ShSlash, ShPercent, ShBang, ShAnd, ShOr, ShQuestion, ShNullCoalesce, ShPipe, ShPipeArrow, ShLitStr, ShLitInt, ShLitFloat, ShIdent, ShStrBegin, ShStrMid, ShStrEnd, ShNewline, ShEof, ShUnknown}; +pub use crate::extdeps_languages_dag_syntax::{dag_keyword_set}; +use self::StringScanResult::*; pub fn is_keyword_text(text: String) -> bool { match v2_rt::lookup(&dag_keyword_set(), text) { - Some(_) => true, - None => false, - } + Some(_) => true, + None => false, +} } pub fn single_punct() -> Rc> { @@ -75,10 +69,10 @@ pub struct SourceRef { pub fn make_token(text: String, span: Rc, shape: TokenShape) -> Rc { Rc::new(Token { - text: text, - span: span, - shape: shape, - }) + text: text, + span: span, + shape: shape, +}) } pub fn source_char(source: Rc, pos: i64) -> String { @@ -93,520 +87,316 @@ pub fn source_substring(source: Rc, start: i64, end: i64) -> String { v2_rt::chars_to_string(&source.source_chars.clone(), start, end) } -pub fn source_scan_while( - mut source: Rc, - mut start: i64, - mut pred: impl Fn(String) -> bool + Clone, -) -> i64 { +pub fn source_scan_while(mut source: Rc, mut start: i64, mut pred: impl Fn(String) -> bool + Clone) -> i64 { loop { if (start.clone() >= source_len(source.clone())) { break source_len(source.clone()); - } else { - if pred(v2_rt::from_code_point( - source.source_chars.clone()[(start.clone()) as usize].clone(), - )) { +} else { + if pred(v2_rt::from_code_point(source.source_chars.clone()[(start.clone()) as usize].clone())) { { let __tco_0 = (start + 1); - start = __tco_0; - continue; - } - } else { +start = __tco_0; +continue; +} +} else { break start.clone(); - } - } - } +} +} +} } pub fn source_skip_ws(mut source: Rc, mut start: i64) -> i64 { loop { if (start.clone() >= source_len(source.clone())) { break start.clone(); - } else { +} else { let ch = source.source_chars.clone()[(start.clone()) as usize].clone(); - if ((ch.clone() == v2_rt::code_point(" ".to_string())) - || (ch.clone() == v2_rt::code_point("\t".to_string()))) - { +if ((ch.clone() == v2_rt::code_point(" ".to_string())) || (ch.clone() == v2_rt::code_point("\t".to_string()))) { { let __tco_0 = (start + 1); - start = __tco_0; - continue; - } - } else { +start = __tco_0; +continue; +} +} else { break start.clone(); - } - } - } +} +} +} } pub fn source_scan_to_eol(mut source: Rc, mut start: i64) -> i64 { loop { if (start.clone() >= source_len(source.clone())) { break source_len(source.clone()); - } else { - if (source.source_chars.clone()[(start.clone()) as usize].clone() - == v2_rt::code_point("\n".to_string())) - { +} else { + if (source.source_chars.clone()[(start.clone()) as usize].clone() == v2_rt::code_point("\n".to_string())) { break start.clone(); - } else { +} else { { let __tco_0 = (start + 1); - start = __tco_0; - continue; - } - } - } - } +start = __tco_0; +continue; +} +} +} +} } pub fn tokenize(source: &String, file: String) -> Rc>> { { let c = Rc::new(source.clone().chars().map(|c| c as i64).collect::>()); - let src = Rc::new(SourceRef { - file: file, - text: source.clone(), - source_chars: c, - }); - let initial = Rc::new(TokPos { - pos: 0, - interp_depth: Rc::new(vec![]), - }); - let final_state = tokenize_loop( - src.clone(), - Rc::new(vec![]), - initial, - (source_len(src.clone()) + 1), - ); - let eof_span = make_file_span( - src.file.clone(), - final_state.pos.clone(), - final_state.pos.clone(), - ); - v2_rt::rc_list_push( - final_state.tokens.clone(), - make_token("".to_string(), eof_span, TokenShape::ShEof), - ) - } +let src = Rc::new(SourceRef { + file: file, + text: source.clone(), + source_chars: c, +}); +let initial = Rc::new(TokPos { + pos: 0, + interp_depth: Rc::new(vec![]), +}); +let final_state = tokenize_loop(src.clone(), Rc::new(vec![]), initial, (source_len(src.clone()) + 1)); +let eof_span = make_file_span(src.file.clone(), final_state.pos.clone(), final_state.pos.clone()); +v2_rt::rc_list_push(final_state.tokens.clone(), make_token("".to_string(), eof_span, TokenShape::ShEof)) +} } pub fn scan_next_token(source: &Rc, pos: &Rc) -> Rc { { let ch = source_char(source.clone(), pos.pos.clone()); - if (ch.clone().as_str() == "\n".to_string().as_str()) { +if (ch.clone().as_str() == "\n".to_string().as_str()) { return Rc::new(ScanResult { - pos: (pos.pos.clone() + 1), - token: make_token( - "\n".to_string(), - make_file_span(source.file.clone(), pos.pos.clone(), (pos.pos.clone() + 1)), - TokenShape::ShNewline, - ), - interp_depth: pos.interp_depth.clone(), - }); + pos: (pos.pos.clone() + 1), + token: make_token("\n".to_string(), make_file_span(source.file.clone(), pos.pos.clone(), (pos.pos.clone() + 1)), TokenShape::ShNewline), + interp_depth: pos.interp_depth.clone(), +}) } - if ((ch.clone().as_str() == "}".to_string().as_str()) - && ((pos.interp_depth.clone().len() as i64) > 0)) - { +if ((ch.clone().as_str() == "}".to_string().as_str()) && ((pos.interp_depth.clone().len() as i64) > 0)) { { let top = pos.interp_depth.clone().last().cloned().clone().unwrap(); - if (top.clone() == 0) { +if (top.clone() == 0) { { let popped = drop_last(&pos.interp_depth.clone()); - let cont_pos = Rc::new(TokPos { - pos: (pos.pos.clone() + 1), - interp_depth: popped, - }); - return scan_str_cont(&source, &cont_pos, pos.pos.clone()); - } +let cont_pos = Rc::new(TokPos { + pos: (pos.pos.clone() + 1), + interp_depth: popped, +}); +return scan_str_cont(&source, &cont_pos, pos.pos.clone()) +} } else { return Rc::new(ScanResult { - pos: (pos.pos.clone() + 1), - token: make_token( - "}".to_string(), - make_file_span( - source.file.clone(), - pos.pos.clone(), - (pos.pos.clone() + 1), - ), - TokenShape::ShRBrace, - ), - interp_depth: replace_last(pos.interp_depth.clone(), (top.clone() - 1)), - }); + pos: (pos.pos.clone() + 1), + token: make_token("}".to_string(), make_file_span(source.file.clone(), pos.pos.clone(), (pos.pos.clone() + 1)), TokenShape::ShRBrace), + interp_depth: replace_last(pos.interp_depth.clone(), (top.clone() - 1)), +}) } - } +} } - scan_token(&source, &pos, &ch) - } +scan_token(&source, &pos, &ch) +} } -pub fn tokenize_loop( - mut source: Rc, - mut tokens: Rc>>, - mut pos: Rc, - mut fuel: i64, -) -> Rc { +pub fn tokenize_loop(mut source: Rc, mut tokens: Rc>>, mut pos: Rc, mut fuel: i64) -> Rc { loop { let s = skip_spaces_and_comments(source.clone(), pos, fuel.clone()); - if (s.pos.clone() >= source_len(source.clone())) { +if (s.pos.clone() >= source_len(source.clone())) { return Rc::new(TokenizerState { - pos: s.pos.clone(), - tokens: tokens.clone(), - interp_depth: s.interp_depth.clone(), - }); + pos: s.pos.clone(), + tokens: tokens.clone(), + interp_depth: s.interp_depth.clone(), +}) } - let result = scan_next_token(&source, &s); - { +let result = scan_next_token(&source, &s); +{ let __tco_0 = v2_rt::rc_list_push(tokens, result.token.clone()); - let __tco_1 = Rc::new(TokPos { - pos: result.pos.clone(), - interp_depth: result.interp_depth.clone(), - }); - let __tco_2 = (fuel - 1); - tokens = __tco_0; - pos = __tco_1; - fuel = __tco_2; - continue; - } - } +let __tco_1 = Rc::new(TokPos { + pos: result.pos.clone(), + interp_depth: result.interp_depth.clone(), +}); +let __tco_2 = (fuel - 1); +tokens = __tco_0; +pos = __tco_1; +fuel = __tco_2; +continue; +} +} } pub fn scan_token(source: &Rc, pos: &Rc, ch: &String) -> Rc { { if (ch.clone().as_str() == "\"".to_string().as_str()) { - return scan_string(&source, &pos); + return scan_string(&source, &pos) } - if is_digit(ch.clone()) { - return scan_number(&source, &pos); +if is_digit(ch.clone()) { + return scan_number(&source, &pos) } - if is_ident_start(&ch) { - return scan_ident(&source, &pos); +if is_ident_start(&ch) { + return scan_ident(&source, &pos) } - let next_ch = if ((pos.pos.clone() + 1) < source_len(source.clone())) { +let next_ch = if ((pos.pos.clone() + 1) < source_len(source.clone())) { source_char(source.clone(), (pos.pos.clone() + 1)) } else { "".to_string() }; - if ((ch.clone().as_str() == "=".to_string().as_str()) - && (next_ch.clone().as_str() == ">".to_string().as_str())) - { - return emit( - &pos, - TokenShape::ShFatArrow, - "=>".to_string(), - 2, - source.file.clone(), - ); +if ((ch.clone().as_str() == "=".to_string().as_str()) && (next_ch.clone().as_str() == ">".to_string().as_str())) { + return emit(&pos, TokenShape::ShFatArrow, "=>".to_string(), 2, source.file.clone()) } - if ((ch.clone().as_str() == "-".to_string().as_str()) - && (next_ch.clone().as_str() == ">".to_string().as_str())) - { - return emit( - &pos, - TokenShape::ShArrow, - "->".to_string(), - 2, - source.file.clone(), - ); +if ((ch.clone().as_str() == "-".to_string().as_str()) && (next_ch.clone().as_str() == ">".to_string().as_str())) { + return emit(&pos, TokenShape::ShArrow, "->".to_string(), 2, source.file.clone()) } - if ((ch.clone().as_str() == "=".to_string().as_str()) - && (next_ch.clone().as_str() == "=".to_string().as_str())) - { - return emit( - &pos, - TokenShape::ShEqEq, - "==".to_string(), - 2, - source.file.clone(), - ); +if ((ch.clone().as_str() == "=".to_string().as_str()) && (next_ch.clone().as_str() == "=".to_string().as_str())) { + return emit(&pos, TokenShape::ShEqEq, "==".to_string(), 2, source.file.clone()) } - if ((ch.clone().as_str() == "!".to_string().as_str()) - && (next_ch.clone().as_str() == "=".to_string().as_str())) - { - return emit( - &pos, - TokenShape::ShNe, - "!=".to_string(), - 2, - source.file.clone(), - ); +if ((ch.clone().as_str() == "!".to_string().as_str()) && (next_ch.clone().as_str() == "=".to_string().as_str())) { + return emit(&pos, TokenShape::ShNe, "!=".to_string(), 2, source.file.clone()) } - if ((ch.clone().as_str() == "<".to_string().as_str()) - && (next_ch.clone().as_str() == "=".to_string().as_str())) - { - return emit( - &pos, - TokenShape::ShLe, - "<=".to_string(), - 2, - source.file.clone(), - ); +if ((ch.clone().as_str() == "<".to_string().as_str()) && (next_ch.clone().as_str() == "=".to_string().as_str())) { + return emit(&pos, TokenShape::ShLe, "<=".to_string(), 2, source.file.clone()) } - if ((ch.clone().as_str() == ">".to_string().as_str()) - && (next_ch.clone().as_str() == "=".to_string().as_str())) - { - return emit( - &pos, - TokenShape::ShGe, - ">=".to_string(), - 2, - source.file.clone(), - ); +if ((ch.clone().as_str() == ">".to_string().as_str()) && (next_ch.clone().as_str() == "=".to_string().as_str())) { + return emit(&pos, TokenShape::ShGe, ">=".to_string(), 2, source.file.clone()) } - if ((ch.clone().as_str() == "&".to_string().as_str()) - && (next_ch.clone().as_str() == "&".to_string().as_str())) - { - return emit( - &pos, - TokenShape::ShAnd, - "&&".to_string(), - 2, - source.file.clone(), - ); +if ((ch.clone().as_str() == "&".to_string().as_str()) && (next_ch.clone().as_str() == "&".to_string().as_str())) { + return emit(&pos, TokenShape::ShAnd, "&&".to_string(), 2, source.file.clone()) } - if ((ch.clone().as_str() == "|".to_string().as_str()) - && (next_ch.clone().as_str() == "|".to_string().as_str())) - { - return emit( - &pos, - TokenShape::ShOr, - "||".to_string(), - 2, - source.file.clone(), - ); +if ((ch.clone().as_str() == "|".to_string().as_str()) && (next_ch.clone().as_str() == "|".to_string().as_str())) { + return emit(&pos, TokenShape::ShOr, "||".to_string(), 2, source.file.clone()) } - if ((ch.clone().as_str() == "|".to_string().as_str()) - && (next_ch.clone().as_str() == ">".to_string().as_str())) - { - return emit( - &pos, - TokenShape::ShPipeArrow, - "|>".to_string(), - 2, - source.file.clone(), - ); +if ((ch.clone().as_str() == "|".to_string().as_str()) && (next_ch.clone().as_str() == ">".to_string().as_str())) { + return emit(&pos, TokenShape::ShPipeArrow, "|>".to_string(), 2, source.file.clone()) } - if (ch.clone().as_str() == "|".to_string().as_str()) { - return emit( - &pos, - TokenShape::ShPipe, - "|".to_string(), - 1, - source.file.clone(), - ); +if (ch.clone().as_str() == "|".to_string().as_str()) { + return emit(&pos, TokenShape::ShPipe, "|".to_string(), 1, source.file.clone()) } - if ((ch.clone().as_str() == "?".to_string().as_str()) - && (next_ch.clone().as_str() == "?".to_string().as_str())) - { - return emit( - &pos, - TokenShape::ShNullCoalesce, - "??".to_string(), - 2, - source.file.clone(), - ); +if ((ch.clone().as_str() == "?".to_string().as_str()) && (next_ch.clone().as_str() == "?".to_string().as_str())) { + return emit(&pos, TokenShape::ShNullCoalesce, "??".to_string(), 2, source.file.clone()) } - if ((ch.clone().as_str() == ".".to_string().as_str()) - && (next_ch.clone().as_str() == ".".to_string().as_str())) - { - return emit( - &pos, - TokenShape::ShDotDot, - "..".to_string(), - 2, - source.file.clone(), - ); +if ((ch.clone().as_str() == ".".to_string().as_str()) && (next_ch.clone().as_str() == ".".to_string().as_str())) { + return emit(&pos, TokenShape::ShDotDot, "..".to_string(), 2, source.file.clone()) } - if (ch.clone().as_str() == "=".to_string().as_str()) { - return emit( - &pos, - TokenShape::ShEq, - "=".to_string(), - 1, - source.file.clone(), - ); +if (ch.clone().as_str() == "=".to_string().as_str()) { + return emit(&pos, TokenShape::ShEq, "=".to_string(), 1, source.file.clone()) } - if (ch.clone().as_str() == "<".to_string().as_str()) { - return emit( - &pos, - TokenShape::ShLt, - "<".to_string(), - 1, - source.file.clone(), - ); +if (ch.clone().as_str() == "<".to_string().as_str()) { + return emit(&pos, TokenShape::ShLt, "<".to_string(), 1, source.file.clone()) } - if (ch.clone().as_str() == ">".to_string().as_str()) { - return emit( - &pos, - TokenShape::ShGt, - ">".to_string(), - 1, - source.file.clone(), - ); +if (ch.clone().as_str() == ">".to_string().as_str()) { + return emit(&pos, TokenShape::ShGt, ">".to_string(), 1, source.file.clone()) } - if (ch.clone().as_str() == "-".to_string().as_str()) { - return emit( - &pos, - TokenShape::ShMinus, - "-".to_string(), - 1, - source.file.clone(), - ); +if (ch.clone().as_str() == "-".to_string().as_str()) { + return emit(&pos, TokenShape::ShMinus, "-".to_string(), 1, source.file.clone()) } - if (ch.clone().as_str() == "!".to_string().as_str()) { - return emit( - &pos, - TokenShape::ShBang, - "!".to_string(), - 1, - source.file.clone(), - ); +if (ch.clone().as_str() == "!".to_string().as_str()) { + return emit(&pos, TokenShape::ShBang, "!".to_string(), 1, source.file.clone()) } - if (ch.clone().as_str() == "?".to_string().as_str()) { - return emit( - &pos, - TokenShape::ShQuestion, - "?".to_string(), - 1, - source.file.clone(), - ); +if (ch.clone().as_str() == "?".to_string().as_str()) { + return emit(&pos, TokenShape::ShQuestion, "?".to_string(), 1, source.file.clone()) } - if (ch.clone().as_str() == "{".to_string().as_str()) { +if (ch.clone().as_str() == "{".to_string().as_str()) { { let new_depth = if ((pos.interp_depth.clone().len() as i64) > 0) { - replace_last( - pos.interp_depth.clone(), - (pos.interp_depth.clone().last().cloned().clone().unwrap() + 1), - ) + replace_last(pos.interp_depth.clone(), (pos.interp_depth.clone().last().cloned().clone().unwrap() + 1)) } else { pos.interp_depth.clone() }; - let tok = make_token( - "{".to_string(), - make_file_span(source.file.clone(), pos.pos.clone(), (pos.pos.clone() + 1)), - TokenShape::ShLBrace, - ); - return Rc::new(ScanResult { - pos: (pos.pos.clone() + 1), - token: tok.clone(), - interp_depth: new_depth, - }); - } +let tok = make_token("{".to_string(), make_file_span(source.file.clone(), pos.pos.clone(), (pos.pos.clone() + 1)), TokenShape::ShLBrace); +return Rc::new(ScanResult { + pos: (pos.pos.clone() + 1), + token: tok.clone(), + interp_depth: new_depth, +}) +} } - if (ch.clone().as_str() == "}".to_string().as_str()) { +if (ch.clone().as_str() == "}".to_string().as_str()) { { - let tok = make_token( - "}".to_string(), - make_file_span(source.file.clone(), pos.pos.clone(), (pos.pos.clone() + 1)), - TokenShape::ShRBrace, - ); - return Rc::new(ScanResult { - pos: (pos.pos.clone() + 1), - token: tok.clone(), - interp_depth: pos.interp_depth.clone(), - }); - } - } - match v2_rt::lookup(&single_punct(), ch.clone()) { - Some(sh) => emit(&pos, sh.clone(), ch.clone(), 1, source.file.clone()), - None => emit( - &pos, - TokenShape::ShUnknown, - ch.clone(), - 1, - source.file.clone(), - ), + let tok = make_token("}".to_string(), make_file_span(source.file.clone(), pos.pos.clone(), (pos.pos.clone() + 1)), TokenShape::ShRBrace); +return Rc::new(ScanResult { + pos: (pos.pos.clone() + 1), + token: tok.clone(), + interp_depth: pos.interp_depth.clone(), +}) +} } - } +match v2_rt::lookup(&single_punct(), ch.clone()) { + Some(sh) => emit(&pos, sh.clone(), ch.clone(), 1, source.file.clone()), + None => emit(&pos, TokenShape::ShUnknown, ch.clone(), 1, source.file.clone()), +} +} } -pub fn emit( - pos: &Rc, - shape: TokenShape, - text: String, - len: i64, - file: String, -) -> Rc { +pub fn emit(pos: &Rc, shape: TokenShape, text: String, len: i64, file: String) -> Rc { { - let token = make_token( - text, - make_file_span(file, pos.pos.clone(), (pos.pos.clone() + len.clone())), - shape, - ); - Rc::new(ScanResult { - pos: (pos.pos.clone() + len.clone()), - token: token, - interp_depth: pos.interp_depth.clone(), - }) - } + let token = make_token(text, make_file_span(file, pos.pos.clone(), (pos.pos.clone() + len.clone())), shape); +Rc::new(ScanResult { + pos: (pos.pos.clone() + len.clone()), + token: token, + interp_depth: pos.interp_depth.clone(), +}) +} } pub fn scan_ident(source: &Rc, pos: &Rc) -> Rc { { let end = source_scan_while(source.clone(), pos.pos.clone(), is_ident_char); - let text = source_substring(source.clone(), pos.pos.clone(), end.clone()); - let shape = if is_keyword_text(text.clone()) { +let text = source_substring(source.clone(), pos.pos.clone(), end.clone()); +let shape = if is_keyword_text(text.clone()) { TokenShape::ShKeyword } else { TokenShape::ShIdent }; - let token = make_token( - text.clone(), - make_file_span(source.file.clone(), pos.pos.clone(), end.clone()), - shape, - ); - Rc::new(ScanResult { - pos: end.clone(), - token: token, - interp_depth: pos.interp_depth.clone(), - }) - } +let token = make_token(text.clone(), make_file_span(source.file.clone(), pos.pos.clone(), end.clone()), shape); +Rc::new(ScanResult { + pos: end.clone(), + token: token, + interp_depth: pos.interp_depth.clone(), +}) +} } pub fn scan_number(source: &Rc, pos: &Rc) -> Rc { { let int_end = source_scan_while(source.clone(), pos.pos.clone(), is_digit); - if ((((int_end.clone() + 1) < source_len(source.clone())) - && (source_char(source.clone(), int_end.clone()).as_str() == ".".to_string().as_str())) - && is_digit(source_char(source.clone(), (int_end.clone() + 1)))) - { +if ((((int_end.clone() + 1) < source_len(source.clone())) && (source_char(source.clone(), int_end.clone()).as_str() == ".".to_string().as_str())) && is_digit(source_char(source.clone(), (int_end.clone() + 1)))) { { let frac_end = source_scan_while(source.clone(), (int_end.clone() + 1), is_digit); - let text = source_substring(source.clone(), pos.pos.clone(), frac_end.clone()); - let token = make_token( - text.clone(), - make_file_span(source.file.clone(), pos.pos.clone(), frac_end.clone()), - TokenShape::ShLitFloat, - ); - return Rc::new(ScanResult { - pos: frac_end.clone(), - token: token.clone(), - interp_depth: pos.interp_depth.clone(), - }); - } - } - let text = source_substring(source.clone(), pos.pos.clone(), int_end.clone()); - let parsed = v2_rt::parse_int(text.clone()); - let shape = match parsed { - Some(_) => TokenShape::ShLitInt, - None => TokenShape::ShUnknown, - }; - let token = make_token( - text.clone(), - make_file_span(source.file.clone(), pos.pos.clone(), int_end.clone()), - shape, - ); - Rc::new(ScanResult { - pos: int_end.clone(), - token: token.clone(), - interp_depth: pos.interp_depth.clone(), - }) - } +let text = source_substring(source.clone(), pos.pos.clone(), frac_end.clone()); +let token = make_token(text.clone(), make_file_span(source.file.clone(), pos.pos.clone(), frac_end.clone()), TokenShape::ShLitFloat); +return Rc::new(ScanResult { + pos: frac_end.clone(), + token: token.clone(), + interp_depth: pos.interp_depth.clone(), +}) +} + } +let text = source_substring(source.clone(), pos.pos.clone(), int_end.clone()); +let parsed = v2_rt::parse_int(text.clone()); +let shape = match parsed { + Some(_) => TokenShape::ShLitInt, + None => TokenShape::ShUnknown, +}; +let token = make_token(text.clone(), make_file_span(source.file.clone(), pos.pos.clone(), int_end.clone()), shape); +Rc::new(ScanResult { + pos: int_end.clone(), + token: token.clone(), + interp_depth: pos.interp_depth.clone(), +}) +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum StringScanResult { - ClosedString { content: String, end_pos: i64 }, - InterpolationStart { content: String, end_pos: i64 }, - UnterminatedString { content: String, end_pos: i64 }, + ClosedString { + content: String, + end_pos: i64, + }, + InterpolationStart { + content: String, + end_pos: i64, + }, + UnterminatedString { + content: String, + end_pos: i64, + }, } impl StringScanResult { pub fn content(&self) -> String { @@ -628,179 +418,135 @@ impl StringScanResult { pub fn scan_string(source: &Rc, pos: &Rc) -> Rc { { let span_start = pos.pos.clone(); - let body_start = (pos.pos.clone() + 1); - let result = scan_string_body(source.clone(), body_start, Rc::new(vec![])); - match (*result).clone() { - StringScanResult::ClosedString { - content, end_pos, .. - } => { - let processed = process_escapes(content.clone()); - let token = make_token( - processed, - make_file_span(source.file.clone(), span_start, (end_pos.clone() + 1)), - TokenShape::ShLitStr, - ); - Rc::new(ScanResult { - pos: (end_pos.clone() + 1), - token: token, - interp_depth: pos.interp_depth.clone(), - }) - } - StringScanResult::InterpolationStart { - content, end_pos, .. - } => { - let processed = process_escapes(content.clone()); - let token = make_token( - processed, - make_file_span(source.file.clone(), span_start, (end_pos.clone() + 1)), - TokenShape::ShStrBegin, - ); - Rc::new(ScanResult { - pos: (end_pos.clone() + 1), - token: token, - interp_depth: Rc::new(v2_rt::append(pos.interp_depth.clone(), 0)), - }) - } - StringScanResult::UnterminatedString { - content, end_pos, .. - } => { - let processed = process_escapes(content.clone()); - let token = make_token( - processed, - make_file_span(source.file.clone(), span_start, end_pos.clone()), - TokenShape::ShUnknown, - ); - Rc::new(ScanResult { - pos: end_pos.clone(), - token: token, - interp_depth: pos.interp_depth.clone(), - }) - } - } - } +let body_start = (pos.pos.clone() + 1); +let result = scan_string_body(source.clone(), body_start, Rc::new(vec![])); +match (*result).clone() { + StringScanResult::ClosedString { content, end_pos, .. } => { + let processed = process_escapes(content.clone()); +let token = make_token(processed, make_file_span(source.file.clone(), span_start, (end_pos.clone() + 1)), TokenShape::ShLitStr); +Rc::new(ScanResult { + pos: (end_pos.clone() + 1), + token: token, + interp_depth: pos.interp_depth.clone(), +}) +}, + StringScanResult::InterpolationStart { content, end_pos, .. } => { + let processed = process_escapes(content.clone()); +let token = make_token(processed, make_file_span(source.file.clone(), span_start, (end_pos.clone() + 1)), TokenShape::ShStrBegin); +Rc::new(ScanResult { + pos: (end_pos.clone() + 1), + token: token, + interp_depth: Rc::new(v2_rt::append(pos.interp_depth.clone(), 0)), +}) +}, + StringScanResult::UnterminatedString { content, end_pos, .. } => { + let processed = process_escapes(content.clone()); +let token = make_token(processed, make_file_span(source.file.clone(), span_start, end_pos.clone()), TokenShape::ShUnknown); +Rc::new(ScanResult { + pos: end_pos.clone(), + token: token, + interp_depth: pos.interp_depth.clone(), +}) +}, +} +} } pub fn scan_str_cont(source: &Rc, pos: &Rc, span_start: i64) -> Rc { { let result = scan_string_body(source.clone(), pos.pos.clone(), Rc::new(vec![])); - match (*result).clone() { - StringScanResult::ClosedString { - content, end_pos, .. - } => { - let processed = process_escapes(content.clone()); - let token = make_token( - processed, - make_file_span(source.file.clone(), span_start, (end_pos.clone() + 1)), - TokenShape::ShStrEnd, - ); - Rc::new(ScanResult { - pos: (end_pos.clone() + 1), - token: token, - interp_depth: pos.interp_depth.clone(), - }) - } - StringScanResult::InterpolationStart { - content, end_pos, .. - } => { - let processed = process_escapes(content.clone()); - let token = make_token( - processed, - make_file_span(source.file.clone(), span_start, (end_pos.clone() + 1)), - TokenShape::ShStrMid, - ); - Rc::new(ScanResult { - pos: (end_pos.clone() + 1), - token: token, - interp_depth: Rc::new(v2_rt::append(pos.interp_depth.clone(), 0)), - }) - } - StringScanResult::UnterminatedString { - content, end_pos, .. - } => { - let processed = process_escapes(content.clone()); - let token = make_token( - processed, - make_file_span(source.file.clone(), span_start, end_pos.clone()), - TokenShape::ShUnknown, - ); - Rc::new(ScanResult { - pos: end_pos.clone(), - token: token, - interp_depth: pos.interp_depth.clone(), - }) - } - } - } -} - -pub fn scan_string_body( - mut source: Rc, - mut pos: i64, - mut acc: Rc>, -) -> Rc { +match (*result).clone() { + StringScanResult::ClosedString { content, end_pos, .. } => { + let processed = process_escapes(content.clone()); +let token = make_token(processed, make_file_span(source.file.clone(), span_start, (end_pos.clone() + 1)), TokenShape::ShStrEnd); +Rc::new(ScanResult { + pos: (end_pos.clone() + 1), + token: token, + interp_depth: pos.interp_depth.clone(), +}) +}, + StringScanResult::InterpolationStart { content, end_pos, .. } => { + let processed = process_escapes(content.clone()); +let token = make_token(processed, make_file_span(source.file.clone(), span_start, (end_pos.clone() + 1)), TokenShape::ShStrMid); +Rc::new(ScanResult { + pos: (end_pos.clone() + 1), + token: token, + interp_depth: Rc::new(v2_rt::append(pos.interp_depth.clone(), 0)), +}) +}, + StringScanResult::UnterminatedString { content, end_pos, .. } => { + let processed = process_escapes(content.clone()); +let token = make_token(processed, make_file_span(source.file.clone(), span_start, end_pos.clone()), TokenShape::ShUnknown); +Rc::new(ScanResult { + pos: end_pos.clone(), + token: token, + interp_depth: pos.interp_depth.clone(), +}) +}, +} +} +} + +pub fn scan_string_body(mut source: Rc, mut pos: i64, mut acc: Rc>) -> Rc { loop { if (pos.clone() >= source_len(source.clone())) { break Rc::new(StringScanResult::UnterminatedString { - content: acc.join(&"".to_string()), - end_pos: pos.clone(), - }); - } else { + content: acc.join(&"".to_string()), + end_pos: pos.clone(), +}); +} else { let ch = source_char(source.clone(), pos.clone()); - if (ch.clone().as_str() == "\"".to_string().as_str()) { +if (ch.clone().as_str() == "\"".to_string().as_str()) { break Rc::new(StringScanResult::ClosedString { - content: acc.join(&"".to_string()), - end_pos: pos.clone(), - }); - } else { + content: acc.join(&"".to_string()), + end_pos: pos.clone(), +}); +} else { if (ch.clone().as_str() == "\\".to_string().as_str()) { if ((pos.clone() + 1) < source_len(source.clone())) { let escaped = source_char(source.clone(), (pos.clone() + 1)); - { +{ let __tco_0 = (pos + 2); - let __tco_1 = v2_rt::rc_list_push( - v2_rt::rc_list_push(acc, "\\".to_string()), - escaped, - ); - pos = __tco_0; - acc = __tco_1; - continue; - } - } else { +let __tco_1 = v2_rt::rc_list_push(v2_rt::rc_list_push(acc, "\\".to_string()), escaped); +pos = __tco_0; +acc = __tco_1; +continue; +} +} else { break Rc::new(StringScanResult::UnterminatedString { - content: v2_rt::rc_list_push(acc, "\\".to_string()) - .join(&"".to_string()), - end_pos: (pos.clone() + 1), - }); - } - } else { + content: v2_rt::rc_list_push(acc, "\\".to_string()).join(&"".to_string()), + end_pos: (pos.clone() + 1), +}); +} +} else { if (ch.clone().as_str() == "{".to_string().as_str()) { if should_start_interpolation(&source, pos.clone()) { break Rc::new(StringScanResult::InterpolationStart { - content: acc.join(&"".to_string()), - end_pos: pos.clone(), - }); - } else { + content: acc.join(&"".to_string()), + end_pos: pos.clone(), +}); +} else { { let __tco_0 = (pos + 1); - let __tco_1 = v2_rt::rc_list_push(acc, "{".to_string()); - pos = __tco_0; - acc = __tco_1; - continue; - } - } - } else { +let __tco_1 = v2_rt::rc_list_push(acc, "{".to_string()); +pos = __tco_0; +acc = __tco_1; +continue; +} +} +} else { { let __tco_0 = (pos + 1); - let __tco_1 = v2_rt::rc_list_push(acc, ch.clone()); - pos = __tco_0; - acc = __tco_1; - continue; - } - } - } - } - } - } +let __tco_1 = v2_rt::rc_list_push(acc, ch.clone()); +pos = __tco_0; +acc = __tco_1; +continue; +} +} +} +} +} +} } pub fn should_start_interpolation(source: &Rc, pos: i64) -> bool { @@ -809,10 +555,8 @@ pub fn should_start_interpolation(source: &Rc, pos: i64) -> bool { } else { { let next = source_char(source.clone(), (pos.clone() + 1)); - (((is_ident_start(&next) || (next.clone().as_str() == "(".to_string().as_str())) - || (next.clone().as_str() == "!".to_string().as_str())) - || (next.clone().as_str() == "-".to_string().as_str())) - } +(((is_ident_start(&next) || (next.clone().as_str() == "(".to_string().as_str())) || (next.clone().as_str() == "!".to_string().as_str())) || (next.clone().as_str() == "-".to_string().as_str())) +} } } @@ -824,13 +568,11 @@ pub fn process_escapes_loop(mut source: String, mut pos: i64, mut acc: Rc= v2_rt::string_length(&source)) { break acc.join(&"".to_string()); - } else { +} else { let ch = v2_rt::char_at(&source, pos.clone()); - if ((ch.clone().as_str() == "\\".to_string().as_str()) - && ((pos.clone() + 1) < v2_rt::string_length(&source))) - { +if ((ch.clone().as_str() == "\\".to_string().as_str()) && ((pos.clone() + 1) < v2_rt::string_length(&source))) { let next = v2_rt::char_at(&source, (pos.clone() + 1)); - let resolved = if (next.clone().as_str() == "\"".to_string().as_str()) { +let resolved = if (next.clone().as_str() == "\"".to_string().as_str()) { "\"".to_string() } else { if (next.clone().as_str() == "\\".to_string().as_str()) { @@ -855,85 +597,61 @@ pub fn process_escapes_loop(mut source: String, mut pos: i64, mut acc: Rc>) -> Rc> { { let len = (stack.clone().len() as i64); - Rc::new( - stack - .clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - .fold(Rc::new(vec![]), |result: Rc>, pair: (i64, i64)| { - if (pair.0.clone() < (len.clone() - 1)) { - Rc::new(v2_rt::append(result.clone(), pair.1.clone())) - } else { - result.clone() - } +Rc::new(stack.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(Rc::new(vec![]), |result: Rc>, pair: (i64, i64)| if (pair.0.clone() < (len.clone() - 1)) { + Rc::new(v2_rt::append(result.clone(), pair.1.clone())) + } else { + result.clone() }) - } +} } pub fn replace_last(stack: Rc>, value: i64) -> Rc> { { let prefix = drop_last(&stack); - Rc::new(v2_rt::append(prefix, value)) - } +Rc::new(v2_rt::append(prefix, value)) +} } -pub fn skip_spaces_and_comments( - mut source: Rc, - mut pos: Rc, - mut fuel: i64, -) -> Rc { +pub fn skip_spaces_and_comments(mut source: Rc, mut pos: Rc, mut fuel: i64) -> Rc { loop { let p = source_skip_ws(source.clone(), pos.pos.clone()); - if ((((p.clone() + 1) < source_len(source.clone())) - && (source_char(source.clone(), p.clone()).as_str() == "/".to_string().as_str())) - && (source_char(source.clone(), (p.clone() + 1)).as_str() == "/".to_string().as_str())) - { +if ((((p.clone() + 1) < source_len(source.clone())) && (source_char(source.clone(), p.clone()).as_str() == "/".to_string().as_str())) && (source_char(source.clone(), (p.clone() + 1)).as_str() == "/".to_string().as_str())) { { let eol = source_scan_to_eol(source.clone(), p.clone()); - return skip_spaces_and_comments( - source.clone(), - Rc::new(TokPos { - pos: eol, - interp_depth: pos.interp_depth.clone(), - }), - (fuel - 1), - ); - } +return skip_spaces_and_comments(source.clone(), Rc::new(TokPos { + pos: eol, + interp_depth: pos.interp_depth.clone(), +}), (fuel - 1)) +} } - break Rc::new(TokPos { - pos: p.clone(), - interp_depth: pos.interp_depth.clone(), - }); - } +break Rc::new(TokPos { + pos: p.clone(), + interp_depth: pos.interp_depth.clone(), +}); +} } pub fn is_digit(ch: String) -> bool { @@ -941,9 +659,7 @@ pub fn is_digit(ch: String) -> bool { } pub fn is_ident_start(ch: &String) -> bool { - ((((ch.clone() >= "a".to_string()) && (ch.clone() <= "z".to_string())) - || ((ch.clone() >= "A".to_string()) && (ch.clone() <= "Z".to_string()))) - || (ch.clone().as_str() == "_".to_string().as_str())) + ((((ch.clone() >= "a".to_string()) && (ch.clone() <= "z".to_string())) || ((ch.clone() >= "A".to_string()) && (ch.clone() <= "Z".to_string()))) || (ch.clone().as_str() == "_".to_string().as_str())) } pub fn is_ident_char(ch: String) -> bool { diff --git a/src/v2/stage0/src/v2_compiler_trace.rs b/src/v2/stage0/src/v2_compiler_trace.rs index 33e848a24bd..5fe94ef6c4b 100644 --- a/src/v2/stage0/src/v2_compiler_trace.rs +++ b/src/v2/stage0/src/v2_compiler_trace.rs @@ -1,14 +1,14 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.trace -use self::TraceEvent::*; -use self::TraceFilter::*; -use crate::v2_rt; -pub use crate::v2_std_core::SourceSpan; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; use std::collections::HashMap; use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::v2_std_core::{SourceSpan}; +use self::TraceEvent::*; +use self::TraceFilter::*; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct SpanMapping { @@ -67,193 +67,103 @@ pub struct Trace { pub fn empty_trace() -> Rc { Rc::new(Trace { - events: Rc::new(vec![]), - stack: Rc::new(vec![]), - }) + events: Rc::new(vec![]), + stack: Rc::new(vec![]), +}) } pub fn trace_push_event(trace: &Rc, event: Rc) -> Rc { Rc::new(Trace { - events: v2_rt::rc_list_push(trace.events.clone(), event), - stack: trace.stack.clone(), - }) + events: v2_rt::rc_list_push(trace.events.clone(), event), + stack: trace.stack.clone(), +}) } pub fn trace_push_frame(trace: &Rc, frame: Rc) -> Rc { Rc::new(Trace { - events: trace.events.clone(), - stack: v2_rt::rc_list_push(trace.stack.clone(), frame), - }) + events: trace.events.clone(), + stack: v2_rt::rc_list_push(trace.stack.clone(), frame), +}) } pub fn trace_pop_frame(trace: &Rc) -> Rc { { let n = (trace.stack.clone().len() as i64); - if (n.clone() <= 1) { +if (n.clone() <= 1) { Rc::new(Trace { - events: trace.events.clone(), - stack: Rc::new(vec![]), - }) + events: trace.events.clone(), + stack: Rc::new(vec![]), +}) } else { Rc::new(Trace { - events: trace.events.clone(), - stack: Rc::new( - trace - .stack - .clone() - .iter() - .cloned() - .take((n.clone() - 1) as usize) - .collect::>(), - ), - }) + events: trace.events.clone(), + stack: Rc::new(trace.stack.clone().iter().cloned().take((n.clone() - 1) as usize).collect::>()), +}) } - } +} } pub fn event_span(event: Rc) -> Rc { match (*event).clone() { - TraceEvent::TraceEnter { span: s, .. } => s.clone(), - TraceEvent::TraceExit { span: s, .. } => s.clone(), - TraceEvent::TraceError { span: s, .. } => s.clone(), - } + TraceEvent::TraceEnter { span: s, .. } => s.clone(), + TraceEvent::TraceExit { span: s, .. } => s.clone(), + TraceEvent::TraceError { span: s, .. } => s.clone(), +} } pub fn event_node_id(event: Rc) -> String { match (*event).clone() { - TraceEvent::TraceEnter { node_id: id, .. } => id.clone(), - TraceEvent::TraceExit { node_id: id, .. } => id.clone(), - TraceEvent::TraceError { node_id: id, .. } => id.clone(), - } + TraceEvent::TraceEnter { node_id: id, .. } => id.clone(), + TraceEvent::TraceExit { node_id: id, .. } => id.clone(), + TraceEvent::TraceError { node_id: id, .. } => id.clone(), +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum TraceFilter { - FilterByFunc { func_name: String }, - FilterBySpan { start: i64, end: i64 }, + FilterByFunc { + func_name: String, + }, + FilterBySpan { + start: i64, + end: i64, + }, FilterErrors, } pub fn event_matches_span(event: Rc, filter_start: i64, filter_end: i64) -> bool { { let sp = event_span(event); - ((sp.start.clone() >= filter_start) && (sp.start.clone() < filter_end)) - } +((sp.start.clone() >= filter_start) && (sp.start.clone() < filter_end)) +} } pub fn replay_trace(trace: Rc, filter: Rc) -> Rc>> { match (*filter).clone() { - TraceFilter::FilterByFunc { - func_name: name, .. - } => Rc::new({ - let mut __result = Vec::new(); - for e in trace.events.clone().iter().cloned() { - if (event_node_id(e.clone()).as_str() == name.clone().as_str()) { - __result.push(e); - } - } - __result - }), - TraceFilter::FilterBySpan { - start: s, end: e, .. - } => Rc::new({ - let mut __result = Vec::new(); - for ev in trace.events.clone().iter().cloned() { - if event_matches_span(ev.clone(), s.clone(), e.clone()) { - __result.push(ev); - } - } - __result - }), - TraceFilter::FilterErrors => Rc::new({ - let mut __result = Vec::new(); - for e in trace.events.clone().iter().cloned() { - if match (*e.clone()).clone() { - TraceEvent::TraceError { .. } => true, - _ => false, - } { - __result.push(e); - } - } - __result - }), - } + TraceFilter::FilterByFunc { func_name: name, .. } => Rc::new({ let mut __result = Vec::new(); for e in trace.events.clone().iter().cloned() { if (event_node_id(e.clone()).as_str() == name.clone().as_str()) { __result.push(e); } } __result }), + TraceFilter::FilterBySpan { start: s, end: e, .. } => Rc::new({ let mut __result = Vec::new(); for ev in trace.events.clone().iter().cloned() { if event_matches_span(ev.clone(), s.clone(), e.clone()) { __result.push(ev); } } __result }), + TraceFilter::FilterErrors => Rc::new({ let mut __result = Vec::new(); for e in trace.events.clone().iter().cloned() { if match (*e.clone()).clone() { + TraceEvent::TraceError { .. } => true, + _ => false, +} { __result.push(e); } } __result }), +} } pub fn format_span(sp: &Rc) -> String { - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("[".to_string(), (sp.start.clone()).to_string()), - "..".to_string(), - ), - (sp.end.clone()).to_string(), - ), - ")".to_string(), - ) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("[".to_string(), (sp.start.clone()).to_string()), "..".to_string()), (sp.end.clone()).to_string()), ")".to_string()) } pub fn format_trace_event(event: Rc) -> String { match (*event).clone() { - TraceEvent::TraceEnter { - node_id: id, - span: sp, - .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat("> ".to_string(), id.clone()), - " at ".to_string(), - ), - format_span(&sp), - ), - TraceEvent::TraceExit { - node_id: id, - span: sp, - output: out, - .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("< ".to_string(), id.clone()), - " at ".to_string(), - ), - format_span(&sp), - ), - ": ".to_string(), - ), - out.clone(), - ), - TraceEvent::TraceError { - node_id: id, - span: sp, - message: msg, - .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("! ".to_string(), id.clone()), - " at ".to_string(), - ), - format_span(&sp), - ), - ": ".to_string(), - ), - msg.clone(), - ), - } + TraceEvent::TraceEnter { node_id: id, span: sp, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat("> ".to_string(), id.clone()), " at ".to_string()), format_span(&sp)), + TraceEvent::TraceExit { node_id: id, span: sp, output: out, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("< ".to_string(), id.clone()), " at ".to_string()), format_span(&sp)), ": ".to_string()), out.clone()), + TraceEvent::TraceError { node_id: id, span: sp, message: msg, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("! ".to_string(), id.clone()), " at ".to_string()), format_span(&sp)), ": ".to_string()), msg.clone()), +} } pub fn format_trace(trace: Rc) -> Rc> { - Rc::new({ - let mut __result = Vec::new(); - for e in trace.events.clone().iter().cloned() { - __result.push(format_trace_event(e.clone())); - } - __result - }) + Rc::new({ let mut __result = Vec::new(); for e in trace.events.clone().iter().cloned() { __result.push(format_trace_event(e.clone())); } __result }) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -264,17 +174,13 @@ pub struct ReproCase { pub trace: Option>, } -pub fn capture_repro( - func_name: String, - inputs: Rc>, - trace: Rc, -) -> Rc { +pub fn capture_repro(func_name: String, inputs: Rc>, trace: Rc) -> Rc { Rc::new(ReproCase { - func_name: func_name, - inputs: inputs, - expected_output: None, - trace: Some(trace), - }) + func_name: func_name, + inputs: inputs, + expected_output: None, + trace: Some(trace), +}) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -284,16 +190,5 @@ pub struct SourceMap { } pub fn remap_location(source_map: Rc, generated_line: i64) -> Option> { - Rc::new({ - let mut __result = Vec::new(); - for m in source_map.mappings.clone().iter().cloned() { - if (m.generated_line.clone() <= generated_line.clone()) { - __result.push(m); - } - } - __result - }) - .last() - .cloned() - .map(|m| m.source_span.clone()) + Rc::new({ let mut __result = Vec::new(); for m in source_map.mappings.clone().iter().cloned() { if (m.generated_line.clone() <= generated_line.clone()) { __result.push(m); } } __result }).last().cloned().map(|m| m.source_span.clone()) } diff --git a/src/v2/stage0/src/v2_rt.rs b/src/v2/stage0/src/v2_rt.rs index ffaae8d00d3..8e6da305b01 100644 --- a/src/v2/stage0/src/v2_rt.rs +++ b/src/v2/stage0/src/v2_rt.rs @@ -11,84 +11,52 @@ pub trait V2Concat { } impl V2Concat for String { - fn v2_concat(mut self, other: String) -> String { - self.push_str(&other); - self - } + fn v2_concat(mut self, other: String) -> String { self.push_str(&other); self } } impl V2Concat for Vec { - fn v2_concat(mut self, other: Vec) -> Vec { - self.extend(other); - self - } + fn v2_concat(mut self, other: Vec) -> Vec { self.extend(other); self } } -pub fn concat(a: T, b: T) -> T { - a.v2_concat(b) -} +pub fn concat(a: T, b: T) -> T { a.v2_concat(b) } pub fn char_at(s: &str, pos: i64) -> String { let pos = pos.max(0) as usize; if s.is_ascii() { let bytes = s.as_bytes(); - if pos >= bytes.len() { - return String::new(); - } + if pos >= bytes.len() { return String::new(); } return String::from(bytes[pos] as char); } - s.chars() - .nth(pos) - .map(|ch| ch.to_string()) - .unwrap_or_default() + s.chars().nth(pos).map(|ch| ch.to_string()).unwrap_or_default() } pub fn string_length(s: &str) -> i64 { - if s.is_ascii() { - s.len() as i64 - } else { - s.chars().count() as i64 - } + if s.is_ascii() { s.len() as i64 } else { s.chars().count() as i64 } } pub fn substring(s: &str, start: i64, end: i64) -> String { let start = start.max(0) as usize; let end = end.max(0) as usize; - if end <= start { - return String::new(); - } + if end <= start { return String::new(); } if s.is_ascii() { let len = s.len(); - if start >= len { - return String::new(); - } + if start >= len { return String::new(); } return s[start..end.min(len)].to_string(); } - s.chars() - .skip(start) - .take(end.saturating_sub(start)) - .collect() + s.chars().skip(start).take(end.saturating_sub(start)).collect() } pub fn string_contains(s: &str, sub: String) -> bool { s.contains(&*sub) } -pub fn contains(s: String, sub: String) -> bool { - string_contains(&s, sub) -} +pub fn contains(s: String, sub: String) -> bool { string_contains(&s, sub) } -pub fn count(items: Rc>) -> i64 { - items.len() as i64 -} +pub fn count(items: Rc>) -> i64 { items.len() as i64 } -pub fn str_eq(a: String, b: String) -> bool { - a == b -} +pub fn str_eq(a: String, b: String) -> bool { a == b } -pub fn to_string(value: i64) -> String { - value.to_string() -} +pub fn to_string(value: i64) -> String { value.to_string() } pub fn clamp(val: i64, min_val: i64, max_val: i64) -> i64 { val.clamp(min_val, max_val) @@ -100,58 +68,31 @@ pub fn lookup(table: &HashMap, key: String) -> Option { pub fn index_by String>(list: Vec, key_fn: F) -> HashMap { let mut map = HashMap::new(); - for item in list { - let key = key_fn(&item); - map.insert(key, item); - } + for item in list { let key = key_fn(&item); map.insert(key, item); } map } -pub fn empty_map() -> HashMap { - HashMap::new() -} +pub fn empty_map() -> HashMap { HashMap::new() } -pub fn map_insert( - mut map: HashMap, - key: K, - value: V, -) -> HashMap { - map.insert(key, value); - map +pub fn map_insert(mut map: HashMap, key: K, value: V) -> HashMap { + map.insert(key, value); map } -pub fn map_merge( - mut base: HashMap, - overlay: HashMap, -) -> HashMap { - base.extend(overlay); - base +pub fn map_merge(mut base: HashMap, overlay: HashMap) -> HashMap { + base.extend(overlay); base } -pub fn map_get( - m: &HashMap, - key: K, -) -> Option { +pub fn map_get(m: &HashMap, key: K) -> Option { m.get(&key).cloned() } -pub fn map_keys(m: &HashMap) -> Vec { - m.keys().cloned().collect() -} +pub fn map_keys(m: &HashMap) -> Vec { m.keys().cloned().collect() } -pub fn map_values(m: &HashMap) -> Vec { - m.values().cloned().collect() -} +pub fn map_values(m: &HashMap) -> Vec { m.values().cloned().collect() } -pub fn list_concat(mut a: Vec, b: Vec) -> Vec { - a.extend(b); - a -} +pub fn list_concat(mut a: Vec, b: Vec) -> Vec { a.extend(b); a } -pub fn list_push(mut list: Vec, item: T) -> Vec { - list.push(item); - list -} +pub fn list_push(mut list: Vec, item: T) -> Vec { list.push(item); list } pub fn append(list: Rc>, item: T) -> Vec { let mut v = (*list).clone(); @@ -169,9 +110,7 @@ pub fn chars_to_string(chars: &Rc>, start: i64, end: i64) -> String { .collect() } -pub fn parse_int(s: String) -> Option { - s.parse::().ok() -} +pub fn parse_int(s: String) -> Option { s.parse::().ok() } pub fn map_contains_key(m: &HashMap, key: K) -> bool { m.contains_key(&key) @@ -182,9 +121,7 @@ pub fn map_has(m: &HashMap, key: K) } pub fn reverse(list: Rc>) -> Rc> { - let mut v = (*list).clone(); - v.reverse(); - Rc::new(v) + let mut v = (*list).clone(); v.reverse(); Rc::new(v) } pub fn replace(s: String, from: String, to: String) -> String { @@ -209,20 +146,13 @@ pub fn rc_list_concat(a: Rc>, b: Rc>) -> Rc> { result } -pub fn rc_map_insert( - map: Rc>, - key: K, - value: V, -) -> Rc> { +pub fn rc_map_insert(map: Rc>, key: K, value: V) -> Rc> { let mut m = map; Rc::make_mut(&mut m).insert(key, value); m } -pub fn rc_map_merge( - base: Rc>, - overlay: Rc>, -) -> Rc> { +pub fn rc_map_merge(base: Rc>, overlay: Rc>) -> Rc> { let mut result = base; let inner = Rc::make_mut(&mut result); for (k, v) in overlay.iter() { @@ -231,21 +161,14 @@ pub fn rc_map_merge( result } -pub fn rc_index_by String>( - list: Rc>, - key_fn: F, -) -> Rc> { +pub fn rc_index_by String>(list: Rc>, key_fn: F) -> Rc> { Rc::new(list.iter().map(|v| (key_fn(v), v.clone())).collect()) } -pub fn rc_empty_map() -> Rc> { - Rc::new(HashMap::new()) -} +pub fn rc_empty_map() -> Rc> { Rc::new(HashMap::new()) } impl V2Concat for Rc> { - fn v2_concat(self, other: Rc>) -> Rc> { - rc_list_concat(self, other) - } + fn v2_concat(self, other: Rc>) -> Rc> { rc_list_concat(self, other) } } pub fn scan_while(s: &str, start: i64, pred: impl Fn(String) -> bool) -> i64 { @@ -253,20 +176,14 @@ pub fn scan_while(s: &str, start: i64, pred: impl Fn(String) -> bool) -> i64 { if s.is_ascii() { let bytes = s.as_bytes(); let mut pos = start.min(bytes.len()); - while pos < bytes.len() && pred(String::from(bytes[pos] as char)) { - pos += 1; - } + while pos < bytes.len() && pred(String::from(bytes[pos] as char)) { pos += 1; } return pos as i64; } let char_len = s.chars().count(); let start = start.min(char_len); let mut pos = start; for ch in s.chars().skip(start) { - if pred(ch.to_string()) { - pos += 1; - } else { - break; - } + if pred(ch.to_string()) { pos += 1; } else { break; } } pos as i64 } @@ -276,20 +193,14 @@ pub fn skip_horizontal_ws(s: &str, start: i64) -> i64 { if s.is_ascii() { let bytes = s.as_bytes(); let mut pos = start.min(bytes.len()); - while pos < bytes.len() && (bytes[pos] == b' ' || bytes[pos] == b'\t') { - pos += 1; - } + while pos < bytes.len() && (bytes[pos] == b' ' || bytes[pos] == b'\t') { pos += 1; } return pos as i64; } let char_len = s.chars().count(); let start = start.min(char_len); let mut pos = start; for ch in s.chars().skip(start) { - if ch == ' ' || ch == '\t' { - pos += 1; - } else { - break; - } + if ch == ' ' || ch == '\t' { pos += 1; } else { break; } } pos as i64 } @@ -299,20 +210,14 @@ pub fn scan_to_eol(s: &str, start: i64) -> i64 { if s.is_ascii() { let bytes = s.as_bytes(); let start = start.min(bytes.len()); - for i in start..bytes.len() { - if bytes[i] == b'\n' { - return i as i64; - } - } + for i in start..bytes.len() { if bytes[i] == b'\n' { return i as i64; } } return bytes.len() as i64; } let char_len = s.chars().count(); let start = start.min(char_len); let mut pos = start; for ch in s.chars().skip(start) { - if ch == '\n' { - return pos as i64; - } + if ch == '\n' { return pos as i64; } pos += 1; } pos as i64 @@ -324,13 +229,9 @@ pub fn scan_string_end(s: &str, start: i64) -> i64 { let bytes = s.as_bytes(); let mut pos = start.min(bytes.len()); while pos < bytes.len() { - if bytes[pos] == b'\\' { - pos += 2; - } else if bytes[pos] == b'\"' { - return (pos + 1) as i64; - } else { - pos += 1; - } + if bytes[pos] == b'\\' { pos += 2; } + else if bytes[pos] == b'\"' { return (pos + 1) as i64; } + else { pos += 1; } } return bytes.len() as i64; } @@ -359,9 +260,7 @@ pub fn code_point(c: String) -> i64 { } pub fn from_code_point(cp: i64) -> String { - char::from_u32(cp as u32) - .map(|c| c.to_string()) - .unwrap_or_default() + char::from_u32(cp as u32).map(|c| c.to_string()).unwrap_or_default() } #[derive(Debug, Clone)] @@ -370,7 +269,7 @@ pub struct FilesystemReadResult { } pub fn filesystem_read(path: String) -> FilesystemReadResult { - let content = - std::fs::read_to_string(&path).unwrap_or_else(|e| panic!("failed to read {}: {}", path, e)); + let content = std::fs::read_to_string(&path) + .unwrap_or_else(|e| panic!("failed to read {}: {}", path, e)); FilesystemReadResult { content } } diff --git a/src/v2/stage0/src/v2_std_core.rs b/src/v2/stage0/src/v2_std_core.rs index 800cac37ccc..edbf24b96d4 100644 --- a/src/v2/stage0/src/v2_std_core.rs +++ b/src/v2/stage0/src/v2_std_core.rs @@ -1,46 +1,39 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.std.core -use self::CallSemantics::*; -use self::Cardinality::*; -use self::CompilerDiagnostic::*; +use std::collections::HashMap; +use std::rc::Rc; +use crate::v2_rt; +use crate::NonEmptyVec; +use crate::NonEmptyBTreeSet; +pub use crate::std_types::{FilePath, NonEmptyStr, SourceSpan, kernel_type_set, is_kernel_type, container_type_arity, is_container_type, container_expected_arity}; +pub use crate::std_syntax::{BinOp, LiteralValue, AlgebraFieldKind}; +use crate::std_syntax::BinOp::{Add, Sub, Mul, Div, Mod, Eq, Ne, Lt, Gt, Le, Ge, And, Or, NullCoalesce}; +use crate::std_syntax::LiteralValue::{LitStr, LitInt, LitFloat, LitBool, LitNull}; +use crate::std_syntax::AlgebraFieldKind::{AlgAdd, AlgMul, AlgReciprocal, AlgQuotient, AlgRemainder, AlgCompare, AlgMeet, AlgJoin}; +pub use crate::std_algebra::{CollectionSizeEffect, CostShape, AlgebraFieldTemplate}; +use crate::std_algebra::CollectionSizeEffect::*; +use crate::std_algebra::CostShape::*; +pub use crate::std_induction::{SubValueRelation}; +use crate::std_induction::SubValueRelation::*; +use self::TokenShape::*; use self::Connective::*; -use self::ExprData::*; -use self::ExprErrorKind::*; +use self::Cardinality::*; use self::FieldAccessStyle::*; use self::FieldValueShape::*; -use self::FunctionSizeEffect::*; use self::InferredNode::*; -use self::MatchPattern::*; +use self::VarBindingKind::*; +use self::CallSemantics::*; use self::MethodSemantics::*; -use self::NodeFieldRole::*; -use self::OperationModifier::*; -use self::StringPart::*; -use self::TokenShape::*; +use self::ExprErrorKind::*; +use self::ExprData::*; +use self::MatchPattern::*; use self::UnaryOpKind::*; -use self::VarBindingKind::*; -use crate::std_algebra::CollectionSizeEffect::*; -use crate::std_algebra::CostShape::*; -pub use crate::std_algebra::{AlgebraFieldTemplate, CollectionSizeEffect, CostShape}; -pub use crate::std_induction::SubValueRelation; -use crate::std_induction::SubValueRelation::*; -use crate::std_syntax::AlgebraFieldKind::{ - AlgAdd, AlgCompare, AlgJoin, AlgMeet, AlgMul, AlgQuotient, AlgReciprocal, AlgRemainder, -}; -use crate::std_syntax::BinOp::{ - Add, And, Div, Eq, Ge, Gt, Le, Lt, Mod, Mul, Ne, NullCoalesce, Or, Sub, -}; -use crate::std_syntax::LiteralValue::{LitBool, LitFloat, LitInt, LitNull, LitStr}; -pub use crate::std_syntax::{AlgebraFieldKind, BinOp, LiteralValue}; -pub use crate::std_types::{ - container_expected_arity, container_type_arity, is_container_type, is_kernel_type, - kernel_type_set, FilePath, NonEmptyStr, SourceSpan, -}; -use crate::v2_rt; -use crate::NonEmptyBTreeSet; -use crate::NonEmptyVec; -use std::collections::HashMap; -use std::rc::Rc; +use self::StringPart::*; +use self::OperationModifier::*; +use self::CompilerDiagnostic::*; +use self::NodeFieldRole::*; +use self::FunctionSizeEffect::*; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct Token { @@ -152,18 +145,18 @@ pub enum InferredNode { pub fn inferred_to_node(inferred: Rc) -> Option> { match (*inferred).clone() { - InferredNode::Resolved { node: n, .. } => Some(n.clone()), - InferredNode::CompilerError { .. } => None, - InferredNode::TypeVariable { .. } => None, - } + InferredNode::Resolved { node: n, .. } => Some(n.clone()), + InferredNode::CompilerError { .. } => None, + InferredNode::TypeVariable { .. } => None, +} } pub fn is_compiler_error(inferred: Rc) -> bool { match (*inferred).clone() { - InferredNode::Resolved { .. } => false, - InferredNode::CompilerError { .. } => true, - InferredNode::TypeVariable { .. } => false, - } + InferredNode::Resolved { .. } => false, + InferredNode::CompilerError { .. } => true, + InferredNode::TypeVariable { .. } => false, +} } pub fn has_inferred(n: Rc) -> bool { @@ -175,7 +168,9 @@ pub fn has_inferred(n: Rc) -> bool { pub enum VarBindingKind { LocalValueBinding, FunctionValueBinding, - VariantValueBinding { parent_enum: String }, + VariantValueBinding { + parent_enum: String, + }, MatchBoundBinding, } impl VarBindingKind { @@ -183,9 +178,7 @@ impl VarBindingKind { match self { VarBindingKind::LocalValueBinding => panic!("no parent_enum on unit variant"), VarBindingKind::FunctionValueBinding => panic!("no parent_enum on unit variant"), - VarBindingKind::VariantValueBinding { - parent_enum: __val, .. - } => __val.clone(), + VarBindingKind::VariantValueBinding { parent_enum: __val, .. } => __val.clone(), VarBindingKind::MatchBoundBinding => panic!("no parent_enum on unit variant"), } } @@ -298,8 +291,12 @@ pub enum UnaryOpKind { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum StringPart { - Text { value: String }, - Interpolation { expr: Rc }, + Text { + value: String, + }, + Interpolation { + expr: Rc, + }, } #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] @@ -440,208 +437,44 @@ pub struct ErrorDAG { pub fn diagnostic_to_span(d: Rc) -> Rc { match (*d).clone() { - CompilerDiagnostic::UnresolvedImport { span: s, .. } => s.clone(), - CompilerDiagnostic::MissingExport { span: s, .. } => s.clone(), - CompilerDiagnostic::UnresolvedType { span: s, .. } => s.clone(), - CompilerDiagnostic::TypeMismatch { span: s, .. } => s.clone(), - CompilerDiagnostic::ArityMismatch { span: s, .. } => s.clone(), - CompilerDiagnostic::VariantNotFound { span: s, .. } => s.clone(), - CompilerDiagnostic::FieldNotFound { span: s, .. } => s.clone(), - CompilerDiagnostic::NonExhaustiveMatch { span: s, .. } => s.clone(), - CompilerDiagnostic::CircularDependency { span: s, .. } => s.clone(), - CompilerDiagnostic::DuplicateModule { span: s, .. } => s.clone(), - CompilerDiagnostic::MissingAnnotation { span: s, .. } => s.clone(), - CompilerDiagnostic::ParseError { span: s, .. } => s.clone(), - CompilerDiagnostic::InternalError { span: s, .. } => s.clone(), - CompilerDiagnostic::ComplexityUnknown { span: s, .. } => s.clone(), - CompilerDiagnostic::OwnershipViolation { span: s, .. } => s.clone(), - CompilerDiagnostic::VariantCollision { span: s, .. } => s.clone(), - } + CompilerDiagnostic::UnresolvedImport { span: s, .. } => s.clone(), + CompilerDiagnostic::MissingExport { span: s, .. } => s.clone(), + CompilerDiagnostic::UnresolvedType { span: s, .. } => s.clone(), + CompilerDiagnostic::TypeMismatch { span: s, .. } => s.clone(), + CompilerDiagnostic::ArityMismatch { span: s, .. } => s.clone(), + CompilerDiagnostic::VariantNotFound { span: s, .. } => s.clone(), + CompilerDiagnostic::FieldNotFound { span: s, .. } => s.clone(), + CompilerDiagnostic::NonExhaustiveMatch { span: s, .. } => s.clone(), + CompilerDiagnostic::CircularDependency { span: s, .. } => s.clone(), + CompilerDiagnostic::DuplicateModule { span: s, .. } => s.clone(), + CompilerDiagnostic::MissingAnnotation { span: s, .. } => s.clone(), + CompilerDiagnostic::ParseError { span: s, .. } => s.clone(), + CompilerDiagnostic::InternalError { span: s, .. } => s.clone(), + CompilerDiagnostic::ComplexityUnknown { span: s, .. } => s.clone(), + CompilerDiagnostic::OwnershipViolation { span: s, .. } => s.clone(), + CompilerDiagnostic::VariantCollision { span: s, .. } => s.clone(), +} } pub fn diagnostic_to_message(d: Rc) -> String { match (*d).clone() { - CompilerDiagnostic::UnresolvedImport { - module_path: m, - importing_module: i, - .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("unresolved import: module '".to_string(), m.clone()), - "' not found (imported by '".to_string(), - ), - i.clone(), - ), - "')".to_string(), - ), - CompilerDiagnostic::MissingExport { - name: n, - module_path: m, - importing_module: i, - .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("name '".to_string(), n.clone()), - "' not found in module '".to_string(), - ), - m.clone(), - ), - "' (imported by '".to_string(), - ), - i.clone(), - ), - "')".to_string(), - ), - CompilerDiagnostic::UnresolvedType { name: n, .. } => v2_rt::concat( - v2_rt::concat("unresolved type '".to_string(), n.clone()), - "'".to_string(), - ), - CompilerDiagnostic::TypeMismatch { - expected: e, - got: g, - .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("type mismatch: expected '".to_string(), e.clone()), - "', got '".to_string(), - ), - g.clone(), - ), - "'".to_string(), - ), - CompilerDiagnostic::ArityMismatch { - name: n, - expected: e, - got: g, - .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("type ".to_string(), n.clone()), - " expects ".to_string(), - ), - (e.clone()).to_string(), - ), - " type arguments, got ".to_string(), - ), - (g.clone()).to_string(), - ), - CompilerDiagnostic::VariantNotFound { - variant: v, - type_name: t, - .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("variant '".to_string(), v.clone()), - "' not found in type '".to_string(), - ), - t.clone(), - ), - "'".to_string(), - ), - CompilerDiagnostic::FieldNotFound { - field: f, - type_name: t, - .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("field '".to_string(), f.clone()), - "' not found in type '".to_string(), - ), - t.clone(), - ), - "'".to_string(), - ), - CompilerDiagnostic::NonExhaustiveMatch { missing: ms, .. } => v2_rt::concat( - "non-exhaustive match: missing variant(s) ".to_string(), - ms.clone().join(&", ".to_string()), - ), - CompilerDiagnostic::CircularDependency { modules: ms, .. } => v2_rt::concat( - "circular dependency detected: ".to_string(), - ms.clone().join(&" -> ".to_string()), - ), - CompilerDiagnostic::DuplicateModule { name: n, .. } => v2_rt::concat( - v2_rt::concat("duplicate module declaration: '".to_string(), n.clone()), - "'".to_string(), - ), - CompilerDiagnostic::MissingAnnotation { - fn_name: f, - what: w, - .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("function '".to_string(), f.clone()), - "' requires ".to_string(), - ), - w.clone(), - ), - " annotation".to_string(), - ), - CompilerDiagnostic::ParseError { message: m, .. } => m.clone(), - CompilerDiagnostic::InternalError { message: m, .. } => m.clone(), - CompilerDiagnostic::ComplexityUnknown { - func_name: f, - reason: r, - .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat("complexity: ".to_string(), f.clone()), - ": ".to_string(), - ), - r.clone(), - ), - CompilerDiagnostic::OwnershipViolation { - binding: b, - fn_name: f, - consumers: c, - .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("ownership: binding '".to_string(), b.clone()), - "' in '".to_string(), - ), - f.clone(), - ), - "' has ".to_string(), - ), - (c.clone()).to_string(), - ), - " consumers".to_string(), - ), - CompilerDiagnostic::VariantCollision { - variant: v, - enum1: e1, - enum2: e2, - .. - } => v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat("variant '".to_string(), v.clone()), - "' appears in both '".to_string(), - ), - e1.clone(), - ), - "' and '".to_string(), - ), - e2.clone(), - ), - "'".to_string(), - ), - } + CompilerDiagnostic::UnresolvedImport { module_path: m, importing_module: i, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("unresolved import: module '".to_string(), m.clone()), "' not found (imported by '".to_string()), i.clone()), "')".to_string()), + CompilerDiagnostic::MissingExport { name: n, module_path: m, importing_module: i, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("name '".to_string(), n.clone()), "' not found in module '".to_string()), m.clone()), "' (imported by '".to_string()), i.clone()), "')".to_string()), + CompilerDiagnostic::UnresolvedType { name: n, .. } => v2_rt::concat(v2_rt::concat("unresolved type '".to_string(), n.clone()), "'".to_string()), + CompilerDiagnostic::TypeMismatch { expected: e, got: g, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("type mismatch: expected '".to_string(), e.clone()), "', got '".to_string()), g.clone()), "'".to_string()), + CompilerDiagnostic::ArityMismatch { name: n, expected: e, got: g, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("type ".to_string(), n.clone()), " expects ".to_string()), (e.clone()).to_string()), " type arguments, got ".to_string()), (g.clone()).to_string()), + CompilerDiagnostic::VariantNotFound { variant: v, type_name: t, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("variant '".to_string(), v.clone()), "' not found in type '".to_string()), t.clone()), "'".to_string()), + CompilerDiagnostic::FieldNotFound { field: f, type_name: t, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("field '".to_string(), f.clone()), "' not found in type '".to_string()), t.clone()), "'".to_string()), + CompilerDiagnostic::NonExhaustiveMatch { missing: ms, .. } => v2_rt::concat("non-exhaustive match: missing variant(s) ".to_string(), ms.clone().join(&", ".to_string())), + CompilerDiagnostic::CircularDependency { modules: ms, .. } => v2_rt::concat("circular dependency detected: ".to_string(), ms.clone().join(&" -> ".to_string())), + CompilerDiagnostic::DuplicateModule { name: n, .. } => v2_rt::concat(v2_rt::concat("duplicate module declaration: '".to_string(), n.clone()), "'".to_string()), + CompilerDiagnostic::MissingAnnotation { fn_name: f, what: w, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("function '".to_string(), f.clone()), "' requires ".to_string()), w.clone()), " annotation".to_string()), + CompilerDiagnostic::ParseError { message: m, .. } => m.clone(), + CompilerDiagnostic::InternalError { message: m, .. } => m.clone(), + CompilerDiagnostic::ComplexityUnknown { func_name: f, reason: r, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat("complexity: ".to_string(), f.clone()), ": ".to_string()), r.clone()), + CompilerDiagnostic::OwnershipViolation { binding: b, fn_name: f, consumers: c, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("ownership: binding '".to_string(), b.clone()), "' in '".to_string()), f.clone()), "' has ".to_string()), (c.clone()).to_string()), " consumers".to_string()), + CompilerDiagnostic::VariantCollision { variant: v, enum1: e1, enum2: e2, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("variant '".to_string(), v.clone()), "' appears in both '".to_string()), e1.clone()), "' and '".to_string()), e2.clone()), "'".to_string()), +} } pub fn is_error_diagnostic(d: Rc) -> bool { @@ -650,16 +483,16 @@ pub fn is_error_diagnostic(d: Rc) -> bool { pub fn is_interpreter_blocking_diagnostic(d: Rc) -> bool { match (*d).clone() { - CompilerDiagnostic::ComplexityUnknown { .. } => false, - _ => true, - } + CompilerDiagnostic::ComplexityUnknown { .. } => false, + _ => true, +} } pub fn make_error_node(diagnostic: Rc, module_name: String) -> Rc { Rc::new(ErrorNode { - diagnostic: diagnostic, - module_name: module_name, - }) + diagnostic: diagnostic, + module_name: module_name, +}) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -669,8 +502,7 @@ pub struct DeclaredFuncSig { pub inferred: Option>, pub is_async: bool, pub output_provenance: Rc>>>>, - pub variant_provenance: - Rc>>>>>>, + pub variant_provenance: Rc>>>>>>, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -710,464 +542,359 @@ pub fn default_ident_span(name: String, span: Rc) -> Option) -> Rc { match n.ident_span.clone() { - Some(s) => s.clone(), - None => n.span.clone(), - } + Some(s) => s.clone(), + None => n.span.clone(), } - -pub fn make_expr_node( - expr_data: Rc, - children: Rc>>, - inferred: Option>, - span: Rc, -) -> Rc { - Rc::new(Node { - name: "".to_string(), - span: span, - ident_span: None, - children: children, - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: inferred, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: expr_data, - ident: None, - }) } -pub fn make_named_expr_node( - name: &String, - expr_data: Rc, - children: Rc>>, - inferred: Option>, - span: Rc, - name_span: Rc, -) -> Rc { +pub fn make_expr_node(expr_data: Rc, children: Rc>>, inferred: Option>, span: Rc) -> Rc { Rc::new(Node { - name: name.clone(), - span: span, - ident_span: default_ident_span(name.clone(), name_span), - children: children, - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: inferred, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: expr_data, - ident: None, - }) -} - -pub fn make_expr_error_node( - kind: ExprErrorKind, - message: &String, - span: &Rc, -) -> Rc { + name: "".to_string(), + span: span, + ident_span: None, + children: children, + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: inferred, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: expr_data, + ident: None, +}) +} + +pub fn make_named_expr_node(name: &String, expr_data: Rc, children: Rc>>, inferred: Option>, span: Rc, name_span: Rc) -> Rc { Rc::new(Node { - name: "".to_string(), - span: span.clone(), - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::CompilerError { - message: message.clone(), - span: span.clone(), - })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::ExprError { - kind: kind, - message: message.clone(), - }), - ident: None, - }) -} - -pub fn make_arg_node( - name: Option, - value: Rc, - span: Rc, - name_span: Rc, -) -> Rc { + name: name.clone(), + span: span, + ident_span: default_ident_span(name.clone(), name_span), + children: children, + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: inferred, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: expr_data, + ident: None, +}) +} + +pub fn make_expr_error_node(kind: ExprErrorKind, message: &String, span: &Rc) -> Rc { + Rc::new(Node { + name: "".to_string(), + span: span.clone(), + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::CompilerError { + message: message.clone(), + span: span.clone(), +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::ExprError { + kind: kind, + message: message.clone(), +}), + ident: None, +}) +} + +pub fn make_arg_node(name: Option, value: Rc, span: Rc, name_span: Rc) -> Rc { { let arg_name = match name { - Some(n) => n.clone(), - None => "".to_string(), - }; - Rc::new(Node { - name: arg_name.clone(), - span: span, - ident_span: default_ident_span(arg_name.clone(), name_span), - children: Rc::new(vec![value]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) - } -} - -pub fn make_arm_node( - pattern: Rc, - guard: Option>, - body: Rc, - span: Rc, -) -> Rc { + Some(n) => n.clone(), + None => "".to_string(), +}; +Rc::new(Node { + name: arg_name.clone(), + span: span, + ident_span: default_ident_span(arg_name.clone(), name_span), + children: Rc::new(vec![value]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) +} +} + +pub fn make_arm_node(pattern: Rc, guard: Option>, body: Rc, span: Rc) -> Rc { { let children = match guard { - Some(g) => Rc::new(vec![g.clone(), body]), - None => Rc::new(vec![body]), - }; - Rc::new(Node { - name: "".to_string(), - span: span, - ident_span: None, - children: children, - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: Some(pattern), - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) - } -} - -pub fn make_resource_use_node( - name: &String, - resource: Rc, - span: Rc, - name_span: Rc, -) -> Rc { + Some(g) => Rc::new(vec![g.clone(), body]), + None => Rc::new(vec![body]), +}; +Rc::new(Node { + name: "".to_string(), + span: span, + ident_span: None, + children: children, + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: Some(pattern), + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) +} +} + +pub fn make_resource_use_node(name: &String, resource: Rc, span: Rc, name_span: Rc) -> Rc { Rc::new(Node { - name: name.clone(), - span: span, - ident_span: default_ident_span(name.clone(), name_span), - children: Rc::new(vec![resource]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) -} - -pub fn resource_use_name_at( - n: Rc, - source_indices: Rc>>, -) -> String { + name: name.clone(), + span: span, + ident_span: default_ident_span(name.clone(), name_span), + children: Rc::new(vec![resource]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) +} + +pub fn resource_use_name_at(n: Rc, source_indices: Rc>>) -> String { authored_name_at(source_indices, &n) } pub fn resource_use_resource(n: &Rc) -> Rc { match n.children.clone().first().cloned() { - Some(v) => v.clone(), - None => make_expr_error_node( - ExprErrorKind::InternalExprError, - &"malformed resource-use: missing resource".to_string(), - &n.span.clone(), - ), - } + Some(v) => v.clone(), + None => make_expr_error_node(ExprErrorKind::InternalExprError, &"malformed resource-use: missing resource".to_string(), &n.span.clone()), } - -pub fn make_field_init_node( - name: &String, - value: Rc, - span: Rc, - name_span: Rc, -) -> Rc { - Rc::new(Node { - name: name.clone(), - span: span, - ident_span: default_ident_span(name.clone(), name_span), - children: Rc::new(vec![value]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) } -pub fn make_field_binding_node( - field_name: &String, - binding: Rc, - span: Rc, - name_span: Rc, -) -> Rc { +pub fn make_field_init_node(name: &String, value: Rc, span: Rc, name_span: Rc) -> Rc { Rc::new(Node { - name: field_name.clone(), - span: span, - ident_span: default_ident_span(field_name.clone(), name_span), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: Some(binding), - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) -} - -pub fn field_binding_name_at( - n: Rc, - source_indices: Rc>>, -) -> String { + name: name.clone(), + span: span, + ident_span: default_ident_span(name.clone(), name_span), + children: Rc::new(vec![value]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) +} + +pub fn make_field_binding_node(field_name: &String, binding: Rc, span: Rc, name_span: Rc) -> Rc { + Rc::new(Node { + name: field_name.clone(), + span: span, + ident_span: default_ident_span(field_name.clone(), name_span), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: Some(binding), + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) +} + +pub fn field_binding_name_at(n: Rc, source_indices: Rc>>) -> String { authored_name_at(source_indices, &n) } pub fn field_binding_pattern(n: Rc) -> Rc { match n.match_pattern.clone() { - Some(p) => p.clone(), - None => Rc::new(MatchPattern::Wildcard), - } + Some(p) => p.clone(), + None => Rc::new(MatchPattern::Wildcard), +} } pub fn make_text_part_node(text: String, span: Rc) -> Rc { Rc::new(Node { - name: "".to_string(), - span: span, - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { value: text }), - }), - ident: None, - }) + name: "".to_string(), + span: span, + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: text, +}), +}), + ident: None, +}) } pub fn make_interp_part_node(expr: Rc, span: Rc) -> Rc { Rc::new(Node { - name: "".to_string(), - span: span, - ident_span: None, - children: Rc::new(vec![expr]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) -} - -pub fn make_param_node( - name: &String, - type_expr: Rc, - default_value: Option>, - span: Rc, - name_span: Rc, -) -> Rc { + name: "".to_string(), + span: span, + ident_span: None, + children: Rc::new(vec![expr]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) +} + +pub fn make_param_node(name: &String, type_expr: Rc, default_value: Option>, span: Rc, name_span: Rc) -> Rc { { let children = match default_value { - Some(dv) => Rc::new(vec![type_expr, dv.clone()]), - None => Rc::new(vec![type_expr]), - }; - Rc::new(Node { - name: name.clone(), - span: span, - ident_span: default_ident_span(name.clone(), name_span), - children: children, - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) - } -} - -pub fn param_node_name_at( - n: Rc, - source_indices: Rc>>, -) -> String { + Some(dv) => Rc::new(vec![type_expr, dv.clone()]), + None => Rc::new(vec![type_expr]), +}; +Rc::new(Node { + name: name.clone(), + span: span, + ident_span: default_ident_span(name.clone(), name_span), + children: children, + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) +} +} + +pub fn param_node_name_at(n: Rc, source_indices: Rc>>) -> String { authored_name_at(source_indices, &n) } -pub fn generic_param_name_at( - n: Rc, - source_indices: Rc>>, -) -> String { +pub fn generic_param_name_at(n: Rc, source_indices: Rc>>) -> String { authored_name_at(source_indices, &n) } -pub fn authored_name_at( - source_indices: Rc>>, - node: &Rc, -) -> String { +pub fn authored_name_at(source_indices: Rc>>, node: &Rc) -> String { match node.ident_span.clone() { - Some(span) => match v2_rt::map_get(&source_indices, span.file.clone()) { - Some(index) => { - let text = source_text_at(index.clone(), &span); - if (text.clone().as_str() == "".to_string().as_str()) { - "".to_string() - } else { - text.clone() - } - } - None => { - if ((v2_rt::string_length(&span.file.clone()) > 8) - && (v2_rt::substring(&span.file.clone(), 0, 8).as_str() - == " "".to_string(), - } + Some(span) => match v2_rt::map_get(&source_indices, span.file.clone()) { + Some(index) => { + let text = source_text_at(index.clone(), &span); +if (text.clone().as_str() == "".to_string().as_str()) { + "".to_string() + } else { + text.clone() + } +}, + None => if ((v2_rt::string_length(&span.file.clone()) > 8) && (v2_rt::substring(&span.file.clone(), 0, 8).as_str() == " "".to_string(), +} } -pub fn find_child_named( - n: Rc, - name: String, - source_indices: Rc>>, -) -> Option> { - match Rc::new({ - let mut __result = Vec::new(); - for c in n.children.clone().iter().cloned() { - if (authored_name_at(source_indices.clone(), &c).as_str() == name.clone().as_str()) { - __result.push(c); - } - } - __result - }) - .first() - .cloned() - { - Some(ch) => Some(ch.clone()), - None => None, - } +pub fn find_child_named(n: Rc, name: String, source_indices: Rc>>) -> Option> { + match Rc::new({ let mut __result = Vec::new(); for c in n.children.clone().iter().cloned() { if (authored_name_at(source_indices.clone(), &c).as_str() == name.clone().as_str()) { __result.push(c); } } __result }).first().cloned() { + Some(ch) => Some(ch.clone()), + None => None, +} } -pub fn has_child_named( - n: Rc, - name: String, - source_indices: Rc>>, -) -> bool { - { - let mut __found = false; - for c in n.children.clone().iter().cloned() { - if (authored_name_at(source_indices.clone(), &c).as_str() == name.clone().as_str()) { - __found = true; - break; - } - } - __found - } +pub fn has_child_named(n: Rc, name: String, source_indices: Rc>>) -> bool { + { let mut __found = false; for c in n.children.clone().iter().cloned() { if (authored_name_at(source_indices.clone(), &c).as_str() == name.clone().as_str()) { __found = true; break; } } __found } } pub fn param_node_type_expr(n: &Rc) -> Rc { match n.children.clone().first().cloned() { - Some(v) => v.clone(), - None => make_expr_error_node( - ExprErrorKind::InternalExprError, - &"malformed param: missing type_expr".to_string(), - &n.span.clone(), - ), - } + Some(v) => v.clone(), + None => make_expr_error_node(ExprErrorKind::InternalExprError, &"malformed param: missing type_expr".to_string(), &n.span.clone()), +} } pub fn param_node_default_value(n: &Rc) -> Option> { @@ -1182,82 +909,67 @@ pub fn param_node_span(n: Rc) -> Rc { n.span.clone() } -pub fn make_field_node( - name: &String, - type_expr: Rc, - cardinality: Cardinality, - default_value: Option>, - from_key: Option, - span: Rc, - name_span: Rc, -) -> Rc { +pub fn make_field_node(name: &String, type_expr: Rc, cardinality: Cardinality, default_value: Option>, from_key: Option, span: Rc, name_span: Rc) -> Rc { { let children = match default_value { - Some(dv) => Rc::new(vec![type_expr, dv.clone()]), - None => Rc::new(vec![type_expr]), - }; - let props = match from_key { - Some(fk) => Rc::new(vec![Rc::new(Node { - name: fk.clone(), - span: make_span(0, 0), - ident_span: default_ident_span(fk.clone(), make_span(0, 0)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - })]), - None => Rc::new(vec![]), - }; - Rc::new(Node { - name: name.clone(), - span: span, - ident_span: default_ident_span(name.clone(), name_span), - children: children, - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: cardinality, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: props, - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) - } -} - -pub fn field_node_name_at( - n: Rc, - source_indices: Rc>>, -) -> String { + Some(dv) => Rc::new(vec![type_expr, dv.clone()]), + None => Rc::new(vec![type_expr]), +}; +let props = match from_key { + Some(fk) => Rc::new(vec![Rc::new(Node { + name: fk.clone(), + span: make_span(0, 0), + ident_span: default_ident_span(fk.clone(), make_span(0, 0)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +})]), + None => Rc::new(vec![]), +}; +Rc::new(Node { + name: name.clone(), + span: span, + ident_span: default_ident_span(name.clone(), name_span), + children: children, + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: cardinality, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: props, + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) +} +} + +pub fn field_node_name_at(n: Rc, source_indices: Rc>>) -> String { authored_name_at(source_indices, &n) } pub fn field_node_type_expr(n: &Rc) -> Rc { match n.children.clone().first().cloned() { - Some(v) => v.clone(), - None => make_expr_error_node( - ExprErrorKind::InternalExprError, - &"malformed field: missing type_expr".to_string(), - &n.span.clone(), - ), - } + Some(v) => v.clone(), + None => make_expr_error_node(ExprErrorKind::InternalExprError, &"malformed field: missing type_expr".to_string(), &n.span.clone()), +} } pub fn field_node_cardinality(n: Rc) -> Cardinality { @@ -1272,52 +984,41 @@ pub fn field_node_default_value(n: &Rc) -> Option> { } } -pub fn field_node_from_key( - n: Rc, - source_indices: Rc>>, -) -> Option { +pub fn field_node_from_key(n: Rc, source_indices: Rc>>) -> Option { match n.properties.clone().first().cloned() { - Some(p) => Some(authored_name_at(source_indices, &p)), - None => None, - } + Some(p) => Some(authored_name_at(source_indices, &p)), + None => None, +} } pub fn field_node_span(n: Rc) -> Rc { n.span.clone() } -pub fn make_variant_node( - name: &String, - fields: Rc>>, - span: Rc, - name_span: Rc, -) -> Rc { +pub fn make_variant_node(name: &String, fields: Rc>>, span: Rc, name_span: Rc) -> Rc { Rc::new(Node { - name: name.clone(), - span: span, - ident_span: default_ident_span(name.clone(), name_span), - children: fields, - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) -} - -pub fn variant_node_name_at( - n: Rc, - source_indices: Rc>>, -) -> String { + name: name.clone(), + span: span, + ident_span: default_ident_span(name.clone(), name_span), + children: fields, + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) +} + +pub fn variant_node_name_at(n: Rc, source_indices: Rc>>) -> String { authored_name_at(source_indices, &n) } @@ -1358,49 +1059,7 @@ pub fn wrapper_child_roles() -> Rc>>>> { } pub fn is_child_accessor_in_model(name: String) -> bool { - ({ - let mut __found = false; - for roles in Rc::new(v2_rt::map_values(&expr_child_roles())) - .iter() - .cloned() - { - if { - let mut __found = false; - for r in roles.clone().iter().cloned() { - if (r.accessor.clone().as_str() == name.clone().as_str()) { - __found = true; - break; - } - } - __found - } { - __found = true; - break; - } - } - __found - } || { - let mut __found = false; - for roles in Rc::new(v2_rt::map_values(&wrapper_child_roles())) - .iter() - .cloned() - { - if { - let mut __found = false; - for r in roles.clone().iter().cloned() { - if (r.accessor.clone().as_str() == name.clone().as_str()) { - __found = true; - break; - } - } - __found - } { - __found = true; - break; - } - } - __found - }) + ({ let mut __found = false; for roles in Rc::new(v2_rt::map_values(&expr_child_roles())).iter().cloned() { if { let mut __found = false; for r in roles.clone().iter().cloned() { if (r.accessor.clone().as_str() == name.clone().as_str()) { __found = true; break; } } __found } { __found = true; break; } } __found } || { let mut __found = false; for roles in Rc::new(v2_rt::map_values(&wrapper_child_roles())).iter().cloned() { if { let mut __found = false; for r in roles.clone().iter().cloned() { if (r.accessor.clone().as_str() == name.clone().as_str()) { __found = true; break; } } __found } { __found = true; break; } } __found }) } pub fn child_roles_for_variant(variant_name: String) -> Option>>> { @@ -1432,17 +1091,17 @@ pub fn node_field_roles() -> Rc> { pub fn is_children_list_field(field_name: String) -> bool { match v2_rt::lookup(&node_field_roles(), field_name) { - Some(NodeFieldRole::ChildrenListField) => true, - _ => false, - } + Some(NodeFieldRole::ChildrenListField) => true, + _ => false, +} } pub fn is_sub_value_field(field_name: String) -> bool { match v2_rt::lookup(&node_field_roles(), field_name) { - Some(NodeFieldRole::SubValueField) => true, - Some(NodeFieldRole::ChildrenListField) => true, - _ => false, - } + Some(NodeFieldRole::SubValueField) => true, + Some(NodeFieldRole::ChildrenListField) => true, + _ => false, +} } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -1450,111 +1109,91 @@ pub fn is_sub_value_field(field_name: String) -> bool { pub enum FunctionSizeEffect { TreeSizePreserving, TreeSizeReducing, - PropertyContraction { domain_size: i64 }, + PropertyContraction { + domain_size: i64, + }, } impl FunctionSizeEffect { pub fn domain_size(&self) -> i64 { match self { FunctionSizeEffect::TreeSizePreserving => panic!("no domain_size on unit variant"), FunctionSizeEffect::TreeSizeReducing => panic!("no domain_size on unit variant"), - FunctionSizeEffect::PropertyContraction { - domain_size: __val, .. - } => __val.clone(), + FunctionSizeEffect::PropertyContraction { domain_size: __val, .. } => __val.clone(), } } } pub fn function_size_effects() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - let mut __m = HashMap::new(); - __m.insert("with_required_cardinality".to_string(), Rc::new(FunctionSizeEffect::PropertyContraction { - domain_size: 2, - })); - __m.insert("resolved_type".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); - __m.insert("param_node_type_expr".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); - __m.insert("field_binding_pattern".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); - __m.insert("wrapper_inner_arg".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); - __m.insert("extractor_inner_arg".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); - __m.insert("child_type_node".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); - Rc::new(__m) - }; - } + static CACHED: Rc>> = { + let mut __m = HashMap::new(); + __m.insert("with_required_cardinality".to_string(), Rc::new(FunctionSizeEffect::PropertyContraction { + domain_size: 2, +})); + __m.insert("resolved_type".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); + __m.insert("param_node_type_expr".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); + __m.insert("field_binding_pattern".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); + __m.insert("wrapper_inner_arg".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); + __m.insert("extractor_inner_arg".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); + __m.insert("child_type_node".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); + Rc::new(__m) + }; + } CACHED.with(|c| c.clone()) } pub fn is_tree_size_preserving(func_name: String) -> bool { - match v2_rt::lookup(&function_size_effects(), func_name) - .as_deref() - .cloned() - { - Some(FunctionSizeEffect::TreeSizePreserving) => true, - Some(FunctionSizeEffect::PropertyContraction { .. }) => true, - _ => false, - } + match v2_rt::lookup(&function_size_effects(), func_name).as_deref().cloned() { + Some(FunctionSizeEffect::TreeSizePreserving) => true, + Some(FunctionSizeEffect::PropertyContraction { .. }) => true, + _ => false, +} } pub fn is_tree_size_reducing(func_name: String) -> bool { - match v2_rt::lookup(&function_size_effects(), func_name) - .as_deref() - .cloned() - { - Some(FunctionSizeEffect::TreeSizeReducing) => true, - _ => false, - } + match v2_rt::lookup(&function_size_effects(), func_name).as_deref().cloned() { + Some(FunctionSizeEffect::TreeSizeReducing) => true, + _ => false, +} } pub fn is_property_contraction(func_name: String) -> bool { - match v2_rt::lookup(&function_size_effects(), func_name) - .as_deref() - .cloned() - { - Some(FunctionSizeEffect::PropertyContraction { .. }) => true, - _ => false, - } + match v2_rt::lookup(&function_size_effects(), func_name).as_deref().cloned() { + Some(FunctionSizeEffect::PropertyContraction { .. }) => true, + _ => false, +} } pub fn expr_child_at(texpr: &Rc, index: i64, role: String) -> Rc { match texpr.children.clone().get(index as usize).cloned() { - Some(v) => v.clone(), - None => make_expr_error_node( - ExprErrorKind::InternalExprError, - &v2_rt::concat("malformed node: missing ".to_string(), role), - &texpr.span.clone(), - ), - } + Some(v) => v.clone(), + None => make_expr_error_node(ExprErrorKind::InternalExprError, &v2_rt::concat("malformed node: missing ".to_string(), role), &texpr.span.clone()), +} } -pub fn arg_name_at( - n: Rc, - source_indices: Rc>>, -) -> Option { +pub fn arg_name_at(n: Rc, source_indices: Rc>>) -> Option { { let name = authored_name_at(source_indices, &n); - if (name.clone().as_str() == "".to_string().as_str()) { +if (name.clone().as_str() == "".to_string().as_str()) { None } else { Some(name.clone()) } - } +} } pub fn arg_value(n: &Rc) -> Rc { match n.children.clone().first().cloned() { - Some(v) => v.clone(), - None => make_expr_error_node( - ExprErrorKind::InternalExprError, - &"malformed arg: missing value".to_string(), - &n.span.clone(), - ), - } + Some(v) => v.clone(), + None => make_expr_error_node(ExprErrorKind::InternalExprError, &"malformed arg: missing value".to_string(), &n.span.clone()), +} } pub fn arm_pattern(n: Rc) -> Rc { match n.match_pattern.clone() { - Some(p) => p.clone(), - None => Rc::new(MatchPattern::Wildcard), - } + Some(p) => p.clone(), + None => Rc::new(MatchPattern::Wildcard), +} } pub fn arm_guard(n: &Rc) -> Option> { @@ -1567,31 +1206,20 @@ pub fn arm_guard(n: &Rc) -> Option> { pub fn arm_body(n: &Rc) -> Rc { match n.children.clone().last().cloned() { - Some(v) => v.clone(), - None => make_expr_error_node( - ExprErrorKind::InternalExprError, - &"malformed arm: missing body".to_string(), - &n.span.clone(), - ), - } + Some(v) => v.clone(), + None => make_expr_error_node(ExprErrorKind::InternalExprError, &"malformed arm: missing body".to_string(), &n.span.clone()), +} } -pub fn field_init_node_name_at( - n: Rc, - source_indices: Rc>>, -) -> String { +pub fn field_init_node_name_at(n: Rc, source_indices: Rc>>) -> String { authored_name_at(source_indices, &n) } pub fn field_init_node_value(n: &Rc) -> Rc { match n.children.clone().first().cloned() { - Some(v) => v.clone(), - None => make_expr_error_node( - ExprErrorKind::InternalExprError, - &"malformed field-init: missing value".to_string(), - &n.span.clone(), - ), - } + Some(v) => v.clone(), + None => make_expr_error_node(ExprErrorKind::InternalExprError, &"malformed field-init: missing value".to_string(), &n.span.clone()), +} } pub fn if_condition(texpr: Rc) -> Rc { @@ -1611,15 +1239,7 @@ pub fn match_scrutinee(texpr: Rc) -> Rc { } pub fn match_arm_nodes(texpr: Rc) -> Rc>> { - Rc::new( - texpr - .children - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ) + Rc::new(texpr.children.clone().iter().cloned().skip(1 as usize).collect::>()) } pub fn binop_left(texpr: Rc) -> Rc { @@ -1634,10 +1254,7 @@ pub fn unaryop_operand(texpr: Rc) -> Rc { expr_child_at(&texpr, 0, "unaryop operand".to_string()) } -pub fn expr_var_name_at( - texpr: Rc, - source_indices: Rc>>, -) -> String { +pub fn expr_var_name_at(texpr: Rc, source_indices: Rc>>) -> String { authored_name_at(source_indices, &texpr) } @@ -1645,35 +1262,26 @@ pub fn field_access_base(texpr: Rc) -> Rc { expr_child_at(&texpr, 0, "field access base".to_string()) } -pub fn field_access_field_at( - texpr: Rc, - source_indices: Rc>>, -) -> String { +pub fn field_access_field_at(texpr: Rc, source_indices: Rc>>) -> String { authored_name_at(source_indices, &texpr) } pub fn expr_field_access_summary(texpr: Rc) -> Option> { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { summary: s, .. } => s.clone(), - _ => None, - } + ExprData::ExprFieldAccess { summary: s, .. } => s.clone(), + _ => None, +} } -pub fn expr_call_func_at( - texpr: Rc, - source_indices: Rc>>, -) -> String { +pub fn expr_call_func_at(texpr: Rc, source_indices: Rc>>) -> String { authored_name_at(source_indices, &texpr) } pub fn expr_call_descent_evidence(texpr: Rc) -> Option>>> { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprCall { - descent_evidence: de, - .. - } => de.clone(), - _ => None, - } + ExprData::ExprCall { descent_evidence: de, .. } => de.clone(), + _ => None, +} } pub fn method_receiver(texpr: Rc) -> Rc { @@ -1681,60 +1289,26 @@ pub fn method_receiver(texpr: Rc) -> Rc { } pub fn method_arg_nodes(texpr: Rc) -> Rc>> { - Rc::new( - texpr - .children - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ) -} - -pub fn expr_method_name_at( - texpr: Rc, - source_indices: Rc>>, -) -> String { + Rc::new(texpr.children.clone().iter().cloned().skip(1 as usize).collect::>()) +} + +pub fn expr_method_name_at(texpr: Rc, source_indices: Rc>>) -> String { authored_name_at(source_indices, &texpr) } pub fn expr_method_call_semantics(texpr: Rc) -> Option> { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprMethodCall { - method_semantics: ms, - .. - } => ms.clone(), - _ => None, - } + ExprData::ExprMethodCall { method_semantics: ms, .. } => ms.clone(), + _ => None, +} } pub fn lambda_body(texpr: Rc) -> Rc { expr_child_at(&texpr, 0, "lambda body".to_string()) } -pub fn lambda_param_names_at( - texpr: Rc, - source_indices: Rc>>, -) -> Rc> { - Rc::new({ - let mut __result = Vec::new(); - for n in Rc::new( - texpr - .children - .clone() - .iter() - .cloned() - .skip(1 as usize) - .collect::>(), - ) - .iter() - .cloned() - { - __result.push(authored_name_at(source_indices.clone(), &n)); - } - __result - }) +pub fn lambda_param_names_at(texpr: Rc, source_indices: Rc>>) -> Rc> { + Rc::new({ let mut __result = Vec::new(); for n in Rc::new(texpr.children.clone().iter().cloned().skip(1 as usize).collect::>()).iter().cloned() { __result.push(authored_name_at(source_indices.clone(), &n)); } __result }) } pub fn let_value(texpr: Rc) -> Rc { @@ -1745,10 +1319,7 @@ pub fn let_body(texpr: Rc) -> Option> { texpr.children.clone().get(1 as usize).cloned() } -pub fn let_binding_name_at( - texpr: Rc, - source_indices: Rc>>, -) -> String { +pub fn let_binding_name_at(texpr: Rc, source_indices: Rc>>) -> String { authored_name_at(source_indices, &texpr) } @@ -1768,10 +1339,7 @@ pub fn foreach_body(texpr: Rc) -> Rc { expr_child_at(&texpr, 1, "foreach body".to_string()) } -pub fn foreach_variable_at( - texpr: Rc, - source_indices: Rc>>, -) -> String { +pub fn foreach_variable_at(texpr: Rc, source_indices: Rc>>) -> String { authored_name_at(source_indices, &texpr) } @@ -1803,18 +1371,15 @@ pub fn block_stmts(texpr: Rc) -> Rc>> { texpr.children.clone() } -pub fn record_lit_type_name_at( - texpr: Rc, - source_indices: Rc>>, -) -> Option { +pub fn record_lit_type_name_at(texpr: Rc, source_indices: Rc>>) -> Option { { let name = authored_name_at(source_indices, &texpr); - if (name.clone().as_str() == "".to_string().as_str()) { +if (name.clone().as_str() == "".to_string().as_str()) { None } else { Some(name.clone()) } - } +} } pub fn transport_url_key() -> String { @@ -1925,245 +1490,138 @@ pub fn transport_headers_key() -> String { CACHED.with(|c| c.clone()) } -pub fn make_transport_node( - properties: Rc>>, - children: Rc>>, - body: Option>, - span: Rc, -) -> Rc { +pub fn make_transport_node(properties: Rc>>, children: Rc>>, body: Option>, span: Rc) -> Rc { Rc::new(Node { - name: "".to_string(), - span: span, - ident_span: None, - children: children, - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: body, - transport: None, - properties: properties, - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) + name: "".to_string(), + span: span, + ident_span: None, + children: children, + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: body, + transport: None, + properties: properties, + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) } pub fn local_transport_node(span: Rc) -> Rc { make_transport_node(Rc::new(vec![]), Rc::new(vec![]), None, span) } -pub fn rest_transport_node( - base_url: Rc, - auth_props: Rc>>, - headers: Rc>>, - method: Option>, - path: Option>, - query: Option>, - request_body: Option>, - response_format: Option>, - span: Rc, -) -> Rc { +pub fn rest_transport_node(base_url: Rc, auth_props: Rc>>, headers: Rc>>, method: Option>, path: Option>, query: Option>, request_body: Option>, response_format: Option>, span: Rc) -> Rc { { let zero_span = make_span(0, 0); - let url_field = make_field_init_node( - &transport_url_key(), - base_url, - zero_span.clone(), - zero_span.clone(), - ); - let method_props = match method { - Some(m) => Rc::new(vec![make_field_init_node( - &transport_method_key(), - m.clone(), - zero_span.clone(), - zero_span.clone(), - )]), - None => Rc::new(vec![]), - }; - let path_props = match path { - Some(p) => Rc::new(vec![make_field_init_node( - &transport_path_template_key(), - p.clone(), - zero_span.clone(), - zero_span.clone(), - )]), - None => Rc::new(vec![]), - }; - let query_props = match query { - Some(q) => Rc::new(vec![make_field_init_node( - &transport_query_key(), - q.clone(), - zero_span.clone(), - zero_span.clone(), - )]), - None => Rc::new(vec![]), - }; - let body_props = match request_body { - Some(b) => Rc::new(vec![make_field_init_node( - &transport_body_key(), - b.clone(), - zero_span.clone(), - zero_span.clone(), - )]), - None => Rc::new(vec![]), - }; - let rf_props = match response_format { - Some(rf) => Rc::new(vec![make_field_init_node( - &transport_response_format_key(), - rf.clone(), - zero_span.clone(), - zero_span.clone(), - )]), - None => Rc::new(vec![]), - }; - let props = v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(Rc::new(vec![url_field]), method_props), - path_props, - ), - query_props, - ), - body_props, - ), - rf_props, - ), - auth_props, - ), - headers, - ); - make_transport_node(props, Rc::new(vec![]), None, span) - } +let url_field = make_field_init_node(&transport_url_key(), base_url, zero_span.clone(), zero_span.clone()); +let method_props = match method { + Some(m) => Rc::new(vec![make_field_init_node(&transport_method_key(), m.clone(), zero_span.clone(), zero_span.clone())]), + None => Rc::new(vec![]), +}; +let path_props = match path { + Some(p) => Rc::new(vec![make_field_init_node(&transport_path_template_key(), p.clone(), zero_span.clone(), zero_span.clone())]), + None => Rc::new(vec![]), +}; +let query_props = match query { + Some(q) => Rc::new(vec![make_field_init_node(&transport_query_key(), q.clone(), zero_span.clone(), zero_span.clone())]), + None => Rc::new(vec![]), +}; +let body_props = match request_body { + Some(b) => Rc::new(vec![make_field_init_node(&transport_body_key(), b.clone(), zero_span.clone(), zero_span.clone())]), + None => Rc::new(vec![]), +}; +let rf_props = match response_format { + Some(rf) => Rc::new(vec![make_field_init_node(&transport_response_format_key(), rf.clone(), zero_span.clone(), zero_span.clone())]), + None => Rc::new(vec![]), +}; +let props = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(Rc::new(vec![url_field]), method_props), path_props), query_props), body_props), rf_props), auth_props), headers); +make_transport_node(props, Rc::new(vec![]), None, span) +} } -pub fn shell_transport_node( - argv: Rc>>, - env: Rc>>, - stdin: Option>, - span: &Rc, -) -> Rc { +pub fn shell_transport_node(argv: Rc>>, env: Rc>>, stdin: Option>, span: &Rc) -> Rc { { let shell_marker = Rc::new(Node { - name: "".to_string(), - span: span.clone(), - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }); - let zero_span = make_span(0, 0); - let stdin_props = match stdin { - Some(s) => Rc::new(vec![make_field_init_node( - &transport_stdin_key(), - s.clone(), - zero_span.clone(), - zero_span.clone(), - )]), - None => Rc::new(vec![]), - }; - let all_props = v2_rt::concat(env, stdin_props); - Rc::new(Node { - name: "".to_string(), - span: span.clone(), - ident_span: None, - children: argv, - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: Some(shell_marker), - transport: None, - properties: all_props, - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) - } + name: "".to_string(), + span: span.clone(), + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}); +let zero_span = make_span(0, 0); +let stdin_props = match stdin { + Some(s) => Rc::new(vec![make_field_init_node(&transport_stdin_key(), s.clone(), zero_span.clone(), zero_span.clone())]), + None => Rc::new(vec![]), +}; +let all_props = v2_rt::concat(env, stdin_props); +Rc::new(Node { + name: "".to_string(), + span: span.clone(), + ident_span: None, + children: argv, + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: Some(shell_marker), + transport: None, + properties: all_props, + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) +} } pub fn file_transport_node(base_path: Rc, span: Rc) -> Rc { { - let path_field = make_field_init_node( - &transport_path_key(), - base_path, - make_span(0, 0), - make_span(0, 0), - ); - make_transport_node(Rc::new(vec![path_field]), Rc::new(vec![]), None, span) - } + let path_field = make_field_init_node(&transport_path_key(), base_path, make_span(0, 0), make_span(0, 0)); +make_transport_node(Rc::new(vec![path_field]), Rc::new(vec![]), None, span) +} } -pub fn find_property( - props: Rc>>, - prop_name: String, - source_indices: Rc>>, -) -> Option> { - match Rc::new({ - let mut __result = Vec::new(); - for p in props.iter().cloned() { - if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() - == prop_name.clone().as_str()) - { - __result.push(p); - } - } - __result - }) - .first() - .cloned() - { - Some(fi) => Some(field_init_node_value(&fi)), - None => None, - } +pub fn find_property(props: Rc>>, prop_name: String, source_indices: Rc>>) -> Option> { + match Rc::new({ let mut __result = Vec::new(); for p in props.iter().cloned() { if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() == prop_name.clone().as_str()) { __result.push(p); } } __result }).first().cloned() { + Some(fi) => Some(field_init_node_value(&fi)), + None => None, +} } -pub fn find_property_string( - props: Rc>>, - prop_name: String, - source_indices: Rc>>, -) -> Option { +pub fn find_property_string(props: Rc>>, prop_name: String, source_indices: Rc>>) -> Option { match find_property(props, prop_name, source_indices) { - Some(n) => match (*n.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { - let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { - unreachable!() - }; - Some(s.clone()) - } - _ => None, - }, - None => None, - } + Some(n) => match (*n.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { unreachable!() }; Some(s.clone()) }, + _ => None, +}, + None => None, +} } -pub fn transport_base_path( - t: Rc, - source_indices: Rc>>, -) -> Option> { +pub fn transport_base_path(t: Rc, source_indices: Rc>>) -> Option> { find_property(t.properties.clone(), transport_path_key(), source_indices) } @@ -2171,10 +1629,7 @@ pub fn transport_has_argv(t: Rc) -> bool { ((t.children.clone().len() as i64) > 0) } -pub fn is_rest_transport( - t: Rc, - source_indices: Rc>>, -) -> bool { +pub fn is_rest_transport(t: Rc, source_indices: Rc>>) -> bool { (transport_base_url(t, source_indices) != None) } @@ -2182,28 +1637,18 @@ pub fn is_shell_transport(t: Rc) -> bool { (t.body.clone() != None) } -pub fn is_file_transport( - t: Rc, - source_indices: Rc>>, -) -> bool { +pub fn is_file_transport(t: Rc, source_indices: Rc>>) -> bool { (transport_base_path(t, source_indices) != None) } -pub fn is_local_transport( - t: &Rc, - source_indices: &Rc>>, -) -> bool { - ((!is_rest_transport(t.clone(), source_indices.clone()) && !is_shell_transport(t.clone())) - && !is_file_transport(t.clone(), source_indices.clone())) +pub fn is_local_transport(t: &Rc, source_indices: &Rc>>) -> bool { + ((!is_rest_transport(t.clone(), source_indices.clone()) && !is_shell_transport(t.clone())) && !is_file_transport(t.clone(), source_indices.clone())) } -pub fn field_init_operation_modifier( - field_init: Rc, - source_indices: Rc>>, -) -> Option { +pub fn field_init_operation_modifier(field_init: Rc, source_indices: Rc>>) -> Option { { let fi_name = field_init_node_name_at(field_init, source_indices); - if (fi_name.clone().as_str() == "idempotent".to_string().as_str()) { +if (fi_name.clone().as_str() == "idempotent".to_string().as_str()) { Some(OperationModifier::Idempotent) } else { if (fi_name.clone().as_str() == "readonly".to_string().as_str()) { @@ -2216,700 +1661,304 @@ pub fn field_init_operation_modifier( } } } - } +} } pub fn operation_modifier_name(modifier: OperationModifier) -> String { match modifier { - OperationModifier::Idempotent => "idempotent".to_string(), - OperationModifier::Readonly => "readonly".to_string(), - OperationModifier::Hermetic => "hermetic".to_string(), - } + OperationModifier::Idempotent => "idempotent".to_string(), + OperationModifier::Readonly => "readonly".to_string(), + OperationModifier::Hermetic => "hermetic".to_string(), +} } -pub fn transport_base_url( - t: Rc, - source_indices: Rc>>, -) -> Option> { +pub fn transport_base_url(t: Rc, source_indices: Rc>>) -> Option> { find_property(t.properties.clone(), transport_url_key(), source_indices) } -pub fn transport_auth_token( - t: Rc, - source_indices: Rc>>, -) -> Option> { - find_property( - t.properties.clone(), - transport_auth_token_key(), - source_indices, - ) -} - -pub fn transport_auth_header_name( - t: Rc, - source_indices: Rc>>, -) -> Option { - find_property_string( - t.properties.clone(), - transport_auth_header_key(), - source_indices, - ) -} - -pub fn transport_has_auth( - t: Rc, - source_indices: Rc>>, -) -> bool { - match find_property( - t.properties.clone(), - transport_auth_token_key(), - source_indices, - ) { - Some(_) => true, - None => false, - } +pub fn transport_auth_token(t: Rc, source_indices: Rc>>) -> Option> { + find_property(t.properties.clone(), transport_auth_token_key(), source_indices) +} + +pub fn transport_auth_header_name(t: Rc, source_indices: Rc>>) -> Option { + find_property_string(t.properties.clone(), transport_auth_header_key(), source_indices) +} + +pub fn transport_has_auth(t: Rc, source_indices: Rc>>) -> bool { + match find_property(t.properties.clone(), transport_auth_token_key(), source_indices) { + Some(_) => true, + None => false, +} } -pub fn transport_method( - t: Rc, - source_indices: Rc>>, -) -> Option> { +pub fn transport_method(t: Rc, source_indices: Rc>>) -> Option> { find_property(t.properties.clone(), transport_method_key(), source_indices) } -pub fn transport_path_template( - t: Rc, - source_indices: Rc>>, -) -> Option> { - find_property( - t.properties.clone(), - transport_path_template_key(), - source_indices, - ) +pub fn transport_path_template(t: Rc, source_indices: Rc>>) -> Option> { + find_property(t.properties.clone(), transport_path_template_key(), source_indices) } -pub fn transport_query( - t: Rc, - source_indices: Rc>>, -) -> Option> { +pub fn transport_query(t: Rc, source_indices: Rc>>) -> Option> { find_property(t.properties.clone(), transport_query_key(), source_indices) } -pub fn transport_request_body( - t: Rc, - source_indices: Rc>>, -) -> Option> { +pub fn transport_request_body(t: Rc, source_indices: Rc>>) -> Option> { find_property(t.properties.clone(), transport_body_key(), source_indices) } -pub fn transport_stdin( - t: Rc, - source_indices: Rc>>, -) -> Option> { +pub fn transport_stdin(t: Rc, source_indices: Rc>>) -> Option> { find_property(t.properties.clone(), transport_stdin_key(), source_indices) } -pub fn transport_response_format( - t: Rc, - source_indices: Rc>>, -) -> Option> { - find_property( - t.properties.clone(), - transport_response_format_key(), - source_indices, - ) +pub fn transport_response_format(t: Rc, source_indices: Rc>>) -> Option> { + find_property(t.properties.clone(), transport_response_format_key(), source_indices) } pub fn is_config_reserved_key(name: &String) -> bool { - ((((((((((((name.clone().as_str() == transport_url_key().as_str()) - || (name.clone().as_str() == transport_path_key().as_str())) - || (name.clone().as_str() == transport_auth_scheme_key().as_str())) - || (name.clone().as_str() == transport_auth_header_key().as_str())) - || (name.clone().as_str() == transport_auth_token_key().as_str())) - || (name.clone().as_str() == transport_method_key().as_str())) - || (name.clone().as_str() == transport_path_template_key().as_str())) - || (name.clone().as_str() == transport_query_key().as_str())) - || (name.clone().as_str() == transport_body_key().as_str())) - || (name.clone().as_str() == transport_stdin_key().as_str())) - || (name.clone().as_str() == transport_response_format_key().as_str())) - || (name.clone().as_str() == transport_headers_key().as_str())) -} - -pub fn transport_headers( - t: Rc, - source_indices: Rc>>, -) -> Rc>> { - Rc::new({ - let mut __result = Vec::new(); - for p in t.properties.clone().iter().cloned() { - if !is_config_reserved_key(&field_init_node_name_at(p.clone(), source_indices.clone())) - { - __result.push(p); - } - } - __result - }) + ((((((((((((name.clone().as_str() == transport_url_key().as_str()) || (name.clone().as_str() == transport_path_key().as_str())) || (name.clone().as_str() == transport_auth_scheme_key().as_str())) || (name.clone().as_str() == transport_auth_header_key().as_str())) || (name.clone().as_str() == transport_auth_token_key().as_str())) || (name.clone().as_str() == transport_method_key().as_str())) || (name.clone().as_str() == transport_path_template_key().as_str())) || (name.clone().as_str() == transport_query_key().as_str())) || (name.clone().as_str() == transport_body_key().as_str())) || (name.clone().as_str() == transport_stdin_key().as_str())) || (name.clone().as_str() == transport_response_format_key().as_str())) || (name.clone().as_str() == transport_headers_key().as_str())) } -pub fn transport_env( - t: Rc, - source_indices: Rc>>, -) -> Rc>> { - Rc::new({ - let mut __result = Vec::new(); - for p in t.properties.clone().iter().cloned() { - if !is_config_reserved_key(&field_init_node_name_at(p.clone(), source_indices.clone())) - { - __result.push(p); - } - } - __result - }) +pub fn transport_headers(t: Rc, source_indices: Rc>>) -> Rc>> { + Rc::new({ let mut __result = Vec::new(); for p in t.properties.clone().iter().cloned() { if !is_config_reserved_key(&field_init_node_name_at(p.clone(), source_indices.clone())) { __result.push(p); } } __result }) } -pub fn map_children(node: &Rc, transform: impl Fn(Rc) -> Rc + Clone) -> Rc { - Rc::new(Node { - name: node.name.clone(), - ident: node.ident.clone(), - span: node.span.clone(), - ident_span: node.ident_span.clone(), - children: Rc::new({ - let mut __result = Vec::new(); - for child in node.children.clone().iter().cloned() { - __result.push(transform(child.clone())); - } - __result - }), - connective: node.connective.clone(), - params: node.params.clone(), - inferred: node.inferred.clone(), - return_cardinality: node.return_cardinality.clone(), - uses: node.uses.clone(), - body: node.body.clone(), - transport: node.transport.clone(), - properties: node.properties.clone(), - type_annotation: node.type_annotation.clone(), - is_self_recursive: node.is_self_recursive.clone(), - has_non_tail_self_call: node.has_non_tail_self_call.clone(), - match_pattern: node.match_pattern.clone(), - expr_data: node.expr_data.clone(), - }) +pub fn transport_env(t: Rc, source_indices: Rc>>) -> Rc>> { + Rc::new({ let mut __result = Vec::new(); for p in t.properties.clone().iter().cloned() { if !is_config_reserved_key(&field_init_node_name_at(p.clone(), source_indices.clone())) { __result.push(p); } } __result }) } -pub fn expr_has_self_call( - texpr: &Rc, - fn_name: &String, - source_indices: &Rc>>, -) -> bool { +pub fn map_children(node: &Rc, transform: impl Fn(Rc) -> Rc + Clone) -> Rc { + Rc::new(Node { + name: node.name.clone(), + ident: node.ident.clone(), + span: node.span.clone(), + ident_span: node.ident_span.clone(), + children: Rc::new({ let mut __result = Vec::new(); for child in node.children.clone().iter().cloned() { __result.push(transform(child.clone())); } __result }), + connective: node.connective.clone(), + params: node.params.clone(), + inferred: node.inferred.clone(), + return_cardinality: node.return_cardinality.clone(), + uses: node.uses.clone(), + body: node.body.clone(), + transport: node.transport.clone(), + properties: node.properties.clone(), + type_annotation: node.type_annotation.clone(), + is_self_recursive: node.is_self_recursive.clone(), + has_non_tail_self_call: node.has_non_tail_self_call.clone(), + match_pattern: node.match_pattern.clone(), + expr_data: node.expr_data.clone(), +}) +} + +pub fn expr_has_self_call(texpr: &Rc, fn_name: &String, source_indices: &Rc>>) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - if (expr_call_func_at(texpr.clone(), source_indices.clone()).as_str() - == fn_name.clone().as_str()) - { - true - } else { - { - let mut __found = false; - for child in texpr.children.clone().iter().cloned() { - if expr_has_self_call(&child, &fn_name, &source_indices) { - __found = true; - break; - } - } - __found - } - } - } - _ => { - let mut __found = false; - for child in texpr.children.clone().iter().cloned() { - if expr_has_self_call(&child, &fn_name, &source_indices) { - __found = true; - break; - } - } - __found - } - } + ExprData::ExprCall { .. } => if (expr_call_func_at(texpr.clone(), source_indices.clone()).as_str() == fn_name.clone().as_str()) { + true + } else { + { let mut __found = false; for child in texpr.children.clone().iter().cloned() { if expr_has_self_call(&child, &fn_name, &source_indices) { __found = true; break; } } __found } + }, + _ => { let mut __found = false; for child in texpr.children.clone().iter().cloned() { if expr_has_self_call(&child, &fn_name, &source_indices) { __found = true; break; } } __found }, +} }) } -pub fn expr_has_non_tail_self_call( - texpr: &Rc, - fn_name: &String, - in_tail: bool, - source_indices: &Rc>>, -) -> bool { +pub fn expr_has_non_tail_self_call(texpr: &Rc, fn_name: &String, in_tail: bool, source_indices: &Rc>>) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - if (expr_call_func_at(texpr.clone(), source_indices.clone()).as_str() - == fn_name.clone().as_str()) - { - if (in_tail.clone() == false) { - true - } else { - { - let mut __found = false; - for child in texpr.children.clone().iter().cloned() { - if expr_has_non_tail_self_call( - &child, - &fn_name, - false, - &source_indices, - ) { - __found = true; - break; - } - } - __found - } - } - } else { - { - let mut __found = false; - for child in texpr.children.clone().iter().cloned() { - if expr_has_non_tail_self_call(&child, &fn_name, false, &source_indices) - { - __found = true; - break; - } - } - __found - } - } - } - ExprData::ExprError { .. } => false, - ExprData::ExprVar { .. } => false, - ExprData::ExprLiteral { .. } => false, - ExprData::ExprFieldAccess { .. } => { - let mut __found = false; - for child in texpr.children.clone().iter().cloned() { - if expr_has_non_tail_self_call(&child, &fn_name, false, &source_indices) { - __found = true; - break; - } - } - __found - } - ExprData::ExprMethodCall { .. } => { - let mut __found = false; - for child in texpr.children.clone().iter().cloned() { - if expr_has_non_tail_self_call(&child, &fn_name, false, &source_indices) { - __found = true; - break; - } - } - __found - } - ExprData::ExprIf => { - let cond_bad = expr_has_non_tail_self_call( - &if_condition(texpr.clone()), - &fn_name, - false, - &source_indices, - ); - let then_bad = expr_has_non_tail_self_call( - &if_then_branch(texpr.clone()), - &fn_name, - in_tail.clone(), - &source_indices, - ); - let else_bad = match if_else_branch(texpr.clone()) { - Some(e) => { - expr_has_non_tail_self_call(&e, &fn_name, in_tail.clone(), &source_indices) - } - None => false, - }; - ((cond_bad || then_bad) || else_bad) - } - ExprData::ExprMatch => { - let scrut_bad = expr_has_non_tail_self_call( - &match_scrutinee(texpr.clone()), - &fn_name, - false, - &source_indices, - ); - let arms_bad = { - let mut __found = false; - for arm_node in match_arm_nodes(texpr.clone()).iter().cloned() { - if expr_has_non_tail_self_call( - &arm_body(&arm_node), - &fn_name, - in_tail.clone(), - &source_indices, - ) { - __found = true; - break; - } - } - __found - }; - (scrut_bad || arms_bad) - } - ExprData::ExprLet => { - let val_bad = expr_has_non_tail_self_call( - &let_value(texpr.clone()), - &fn_name, - false, - &source_indices, - ); - let body_bad = match let_body(texpr.clone()) { - Some(b) => { - expr_has_non_tail_self_call(&b, &fn_name, in_tail.clone(), &source_indices) - } - None => false, - }; - (val_bad || body_bad) - } - ExprData::ExprBlock => { - let ss = texpr.children.clone(); - let ss_count = (ss.clone().len() as i64); - if (ss_count.clone() == 0) { - false - } else { - { - let init_bad = { - let mut __found = false; - for p in Rc::new({ - let mut __result = Vec::new(); - for p in Rc::new( - ss.clone() - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - { - if (p.0.clone() < (ss_count.clone() - 1)) { - __result.push(p); - } - } - __result - }) - .iter() - .cloned() - { - if expr_has_non_tail_self_call( - &p.1.clone(), - &fn_name, - false, - &source_indices, - ) { - __found = true; - break; - } - } - __found - }; - let last_bad = match ss.clone().last().cloned() { - Some(last_expr) => expr_has_non_tail_self_call( - &last_expr, - &fn_name, - in_tail.clone(), - &source_indices, - ), - None => false, - }; - (init_bad || last_bad) - } - } - } - ExprData::ExprReturn => { - let mut __found = false; - for child in texpr.children.clone().iter().cloned() { - if expr_has_non_tail_self_call(&child, &fn_name, true, &source_indices) { - __found = true; - break; - } - } - __found - } - ExprData::NoExprData => { - let mut __found = false; - for child in texpr.children.clone().iter().cloned() { - if expr_has_non_tail_self_call( - &child, - &fn_name, - in_tail.clone(), - &source_indices, - ) { - __found = true; - break; - } - } - __found + ExprData::ExprCall { .. } => if (expr_call_func_at(texpr.clone(), source_indices.clone()).as_str() == fn_name.clone().as_str()) { + if (in_tail.clone() == false) { + true + } else { + { let mut __found = false; for child in texpr.children.clone().iter().cloned() { if expr_has_non_tail_self_call(&child, &fn_name, false, &source_indices) { __found = true; break; } } __found } } - _ => { - let mut __found = false; - for child in texpr.children.clone().iter().cloned() { - if expr_has_non_tail_self_call(&child, &fn_name, false, &source_indices) { - __found = true; - break; - } - } - __found + } else { + { let mut __found = false; for child in texpr.children.clone().iter().cloned() { if expr_has_non_tail_self_call(&child, &fn_name, false, &source_indices) { __found = true; break; } } __found } + }, + ExprData::ExprError { .. } => false, + ExprData::ExprVar { .. } => false, + ExprData::ExprLiteral { .. } => false, + ExprData::ExprFieldAccess { .. } => { let mut __found = false; for child in texpr.children.clone().iter().cloned() { if expr_has_non_tail_self_call(&child, &fn_name, false, &source_indices) { __found = true; break; } } __found }, + ExprData::ExprMethodCall { .. } => { let mut __found = false; for child in texpr.children.clone().iter().cloned() { if expr_has_non_tail_self_call(&child, &fn_name, false, &source_indices) { __found = true; break; } } __found }, + ExprData::ExprIf => { + let cond_bad = expr_has_non_tail_self_call(&if_condition(texpr.clone()), &fn_name, false, &source_indices); +let then_bad = expr_has_non_tail_self_call(&if_then_branch(texpr.clone()), &fn_name, in_tail.clone(), &source_indices); +let else_bad = match if_else_branch(texpr.clone()) { + Some(e) => expr_has_non_tail_self_call(&e, &fn_name, in_tail.clone(), &source_indices), + None => false, +}; +((cond_bad || then_bad) || else_bad) +}, + ExprData::ExprMatch => { + let scrut_bad = expr_has_non_tail_self_call(&match_scrutinee(texpr.clone()), &fn_name, false, &source_indices); +let arms_bad = { let mut __found = false; for arm_node in match_arm_nodes(texpr.clone()).iter().cloned() { if expr_has_non_tail_self_call(&arm_body(&arm_node), &fn_name, in_tail.clone(), &source_indices) { __found = true; break; } } __found }; +(scrut_bad || arms_bad) +}, + ExprData::ExprLet => { + let val_bad = expr_has_non_tail_self_call(&let_value(texpr.clone()), &fn_name, false, &source_indices); +let body_bad = match let_body(texpr.clone()) { + Some(b) => expr_has_non_tail_self_call(&b, &fn_name, in_tail.clone(), &source_indices), + None => false, +}; +(val_bad || body_bad) +}, + ExprData::ExprBlock => { + let ss = texpr.children.clone(); +let ss_count = (ss.clone().len() as i64); +if (ss_count.clone() == 0) { + false + } else { + { + let init_bad = { let mut __found = false; for p in Rc::new({ let mut __result = Vec::new(); for p in Rc::new(ss.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (p.0.clone() < (ss_count.clone() - 1)) { __result.push(p); } } __result }).iter().cloned() { if expr_has_non_tail_self_call(&p.1.clone(), &fn_name, false, &source_indices) { __found = true; break; } } __found }; +let last_bad = match ss.clone().last().cloned() { + Some(last_expr) => expr_has_non_tail_self_call(&last_expr, &fn_name, in_tail.clone(), &source_indices), + None => false, +}; +(init_bad || last_bad) +} } - } +}, + ExprData::ExprReturn => { let mut __found = false; for child in texpr.children.clone().iter().cloned() { if expr_has_non_tail_self_call(&child, &fn_name, true, &source_indices) { __found = true; break; } } __found }, + ExprData::NoExprData => { let mut __found = false; for child in texpr.children.clone().iter().cloned() { if expr_has_non_tail_self_call(&child, &fn_name, in_tail.clone(), &source_indices) { __found = true; break; } } __found }, + _ => { let mut __found = false; for child in texpr.children.clone().iter().cloned() { if expr_has_non_tail_self_call(&child, &fn_name, false, &source_indices) { __found = true; break; } } __found }, +} }) } -pub fn service_config_properties( - endpoint: Rc, - auth: Option>, - auth_input: Option>, - auth_source: Option>, - rate_limit: Option>, - retry: Option>, -) -> Rc>> { +pub fn service_config_properties(endpoint: Rc, auth: Option>, auth_input: Option>, auth_source: Option>, rate_limit: Option>, retry: Option>) -> Rc>> { { let zero_span = make_span(0, 0); - let ep_prop = Rc::new(vec![make_field_init_node( - &"svc_endpoint".to_string(), - endpoint, - zero_span.clone(), - zero_span.clone(), - )]); - let auth_prop = match auth { - Some(a) => Rc::new(vec![make_field_init_node( - &"svc_auth".to_string(), - a.clone(), - zero_span.clone(), - zero_span.clone(), - )]), - None => Rc::new(vec![]), - }; - let auth_input_prop = match auth_input { - Some(ai) => Rc::new(vec![make_field_init_node( - &"svc_auth_input".to_string(), - ai.clone(), - zero_span.clone(), - zero_span.clone(), - )]), - None => Rc::new(vec![]), - }; - let auth_source_prop = match auth_source { - Some(src) => Rc::new(vec![make_field_init_node( - &"svc_auth_source".to_string(), - src.clone(), - zero_span.clone(), - zero_span.clone(), - )]), - None => Rc::new(vec![]), - }; - let rate_prop = match rate_limit { - Some(r) => Rc::new(vec![make_field_init_node( - &"svc_rate_limit".to_string(), - r.clone(), - zero_span.clone(), - zero_span.clone(), - )]), - None => Rc::new(vec![]), - }; - let retry_prop = match retry { - Some(r) => Rc::new(vec![make_field_init_node( - &"svc_retry".to_string(), - r.clone(), - zero_span.clone(), - zero_span.clone(), - )]), - None => Rc::new(vec![]), - }; - v2_rt::concat( - v2_rt::concat( - v2_rt::concat( - v2_rt::concat(v2_rt::concat(ep_prop, auth_prop), auth_input_prop), - auth_source_prop, - ), - rate_prop, - ), - retry_prop, - ) - } +let ep_prop = Rc::new(vec![make_field_init_node(&"svc_endpoint".to_string(), endpoint, zero_span.clone(), zero_span.clone())]); +let auth_prop = match auth { + Some(a) => Rc::new(vec![make_field_init_node(&"svc_auth".to_string(), a.clone(), zero_span.clone(), zero_span.clone())]), + None => Rc::new(vec![]), +}; +let auth_input_prop = match auth_input { + Some(ai) => Rc::new(vec![make_field_init_node(&"svc_auth_input".to_string(), ai.clone(), zero_span.clone(), zero_span.clone())]), + None => Rc::new(vec![]), +}; +let auth_source_prop = match auth_source { + Some(src) => Rc::new(vec![make_field_init_node(&"svc_auth_source".to_string(), src.clone(), zero_span.clone(), zero_span.clone())]), + None => Rc::new(vec![]), +}; +let rate_prop = match rate_limit { + Some(r) => Rc::new(vec![make_field_init_node(&"svc_rate_limit".to_string(), r.clone(), zero_span.clone(), zero_span.clone())]), + None => Rc::new(vec![]), +}; +let retry_prop = match retry { + Some(r) => Rc::new(vec![make_field_init_node(&"svc_retry".to_string(), r.clone(), zero_span.clone(), zero_span.clone())]), + None => Rc::new(vec![]), +}; +v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(ep_prop, auth_prop), auth_input_prop), auth_source_prop), rate_prop), retry_prop) +} } -pub fn has_service_config( - n: Rc, - source_indices: Rc>>, -) -> bool { - { - let mut __found = false; - for p in n.properties.clone().iter().cloned() { - if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() - == "svc_endpoint".to_string().as_str()) - { - __found = true; - break; - } - } - __found - } +pub fn has_service_config(n: Rc, source_indices: Rc>>) -> bool { + { let mut __found = false; for p in n.properties.clone().iter().cloned() { if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() == "svc_endpoint".to_string().as_str()) { __found = true; break; } } __found } } -pub fn service_config_endpoint( - n: Rc, - source_indices: Rc>>, -) -> Option> { - find_property( - n.properties.clone(), - "svc_endpoint".to_string(), - source_indices, - ) +pub fn service_config_endpoint(n: Rc, source_indices: Rc>>) -> Option> { + find_property(n.properties.clone(), "svc_endpoint".to_string(), source_indices) } -pub fn service_config_auth( - n: Rc, - source_indices: Rc>>, -) -> Option> { +pub fn service_config_auth(n: Rc, source_indices: Rc>>) -> Option> { find_property(n.properties.clone(), "svc_auth".to_string(), source_indices) } -pub fn service_config_rate_limit( - n: Rc, - source_indices: Rc>>, -) -> Option> { - find_property( - n.properties.clone(), - "svc_rate_limit".to_string(), - source_indices, - ) -} - -pub fn service_config_retry( - n: Rc, - source_indices: Rc>>, -) -> Option> { - find_property( - n.properties.clone(), - "svc_retry".to_string(), - source_indices, - ) -} - -pub fn service_config_auth_input( - n: Rc, - source_indices: Rc>>, -) -> Option> { - find_property( - n.properties.clone(), - "svc_auth_input".to_string(), - source_indices, - ) -} - -pub fn service_config_auth_source( - n: Rc, - source_indices: Rc>>, -) -> Option> { - find_property( - n.properties.clone(), - "svc_auth_source".to_string(), - source_indices, - ) -} - -pub fn module_node( - name: &String, - imports: Rc>>, - items: Rc>>, - span: &Rc, -) -> Rc { - Rc::new(Node { - name: name.clone(), - span: span.clone(), - ident_span: default_ident_span(name.clone(), span.clone()), - children: items, - connective: Connective::NoConnective, - params: imports, - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) +pub fn service_config_rate_limit(n: Rc, source_indices: Rc>>) -> Option> { + find_property(n.properties.clone(), "svc_rate_limit".to_string(), source_indices) +} + +pub fn service_config_retry(n: Rc, source_indices: Rc>>) -> Option> { + find_property(n.properties.clone(), "svc_retry".to_string(), source_indices) +} + +pub fn service_config_auth_input(n: Rc, source_indices: Rc>>) -> Option> { + find_property(n.properties.clone(), "svc_auth_input".to_string(), source_indices) +} + +pub fn service_config_auth_source(n: Rc, source_indices: Rc>>) -> Option> { + find_property(n.properties.clone(), "svc_auth_source".to_string(), source_indices) } -pub fn import_node( - module_path: String, - is_all: bool, - specific_names: Rc>>, - span: &Rc, - name_span: Rc, -) -> Rc { +pub fn module_node(name: &String, imports: Rc>>, items: Rc>>, span: &Rc) -> Rc { + Rc::new(Node { + name: name.clone(), + span: span.clone(), + ident_span: default_ident_span(name.clone(), span.clone()), + children: items, + connective: Connective::NoConnective, + params: imports, + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) +} + +pub fn import_node(module_path: String, is_all: bool, specific_names: Rc>>, span: &Rc, name_span: Rc) -> Rc { { let wildcard_marker = if is_all { Some(Rc::new(Node { - name: "".to_string(), - span: span.clone(), - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - })) + name: "".to_string(), + span: span.clone(), + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +})) } else { None }; - Rc::new(Node { - name: module_path, - span: span.clone(), - ident_span: Some(name_span), - children: specific_names, - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: wildcard_marker, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) - } +Rc::new(Node { + name: module_path, + span: span.clone(), + ident_span: Some(name_span), + children: specific_names, + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: wildcard_marker, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) +} } pub fn import_is_all(n: Rc) -> bool { (n.body.clone() != None) } -pub fn import_specific_names_at( - n: Rc, - source_indices: Rc>>, -) -> Rc> { - Rc::new({ - let mut __result = Vec::new(); - for c in n.children.clone().iter().cloned() { - __result.push(authored_name_at(source_indices.clone(), &c)); - } - __result - }) +pub fn import_specific_names_at(n: Rc, source_indices: Rc>>) -> Rc> { + Rc::new({ let mut __result = Vec::new(); for c in n.children.clone().iter().cloned() { __result.push(authored_name_at(source_indices.clone(), &c)); } __result }) } pub fn module_imports(n: Rc) -> Rc>> { @@ -2922,203 +1971,200 @@ pub fn module_items(n: Rc) -> Rc>> { pub fn leaf_node_with_span(name: &String, span: &Rc) -> Rc { Rc::new(Node { - name: name.clone(), - span: span.clone(), - ident_span: default_ident_span(name.clone(), span.clone()), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) + name: name.clone(), + span: span.clone(), + ident_span: default_ident_span(name.clone(), span.clone()), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) } pub fn kernel_span(name: &String) -> Rc { Rc::new(SourceSpan { - file: v2_rt::concat( - v2_rt::concat("".to_string(), - ), - start: 0, - end: v2_rt::string_length(&name), - }) + file: v2_rt::concat(v2_rt::concat("".to_string()), + start: 0, + end: v2_rt::string_length(&name), +}) } pub fn unit_type() -> Rc { thread_local! { - static CACHED: Rc = { - Rc::new(Node { - name: "Unit".to_string(), - span: kernel_span(&"Unit".to_string()), - ident_span: Some(kernel_span(&"Unit".to_string())), - children: Rc::new(vec![]), - connective: Connective::Conj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) - }; - } + static CACHED: Rc = { + Rc::new(Node { + name: "Unit".to_string(), + span: kernel_span(&"Unit".to_string()), + ident_span: Some(kernel_span(&"Unit".to_string())), + children: Rc::new(vec![]), + connective: Connective::Conj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) + }; + } CACHED.with(|c| c.clone()) } pub fn bool_type() -> Rc { thread_local! { - static CACHED: Rc = { - Rc::new(Node { - name: "Bool".to_string(), - span: kernel_span(&"Bool".to_string()), - ident_span: Some(kernel_span(&"Bool".to_string())), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) - }; - } + static CACHED: Rc = { + Rc::new(Node { + name: "Bool".to_string(), + span: kernel_span(&"Bool".to_string()), + ident_span: Some(kernel_span(&"Bool".to_string())), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) + }; + } CACHED.with(|c| c.clone()) } pub fn string_type() -> Rc { thread_local! { - static CACHED: Rc = { - Rc::new(Node { - name: "String".to_string(), - span: kernel_span(&"String".to_string()), - ident_span: Some(kernel_span(&"String".to_string())), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) - }; - } + static CACHED: Rc = { + Rc::new(Node { + name: "String".to_string(), + span: kernel_span(&"String".to_string()), + ident_span: Some(kernel_span(&"String".to_string())), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) + }; + } CACHED.with(|c| c.clone()) } pub fn int_type() -> Rc { thread_local! { - static CACHED: Rc = { - Rc::new(Node { - name: "Int".to_string(), - span: kernel_span(&"Int".to_string()), - ident_span: Some(kernel_span(&"Int".to_string())), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) - }; - } + static CACHED: Rc = { + Rc::new(Node { + name: "Int".to_string(), + span: kernel_span(&"Int".to_string()), + ident_span: Some(kernel_span(&"Int".to_string())), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) + }; + } CACHED.with(|c| c.clone()) } pub fn float_type() -> Rc { thread_local! { - static CACHED: Rc = { - Rc::new(Node { - name: "Float".to_string(), - span: kernel_span(&"Float".to_string()), - ident_span: Some(kernel_span(&"Float".to_string())), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) - }; - } + static CACHED: Rc = { + Rc::new(Node { + name: "Float".to_string(), + span: kernel_span(&"Float".to_string()), + ident_span: Some(kernel_span(&"Float".to_string())), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) + }; + } CACHED.with(|c| c.clone()) } pub fn none_type() -> Rc { thread_local! { - static CACHED: Rc = { - Rc::new(Node { - name: "None".to_string(), - span: kernel_span(&"None".to_string()), - ident_span: Some(kernel_span(&"None".to_string())), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, - }) - }; - } + static CACHED: Rc = { + Rc::new(Node { + name: "None".to_string(), + span: kernel_span(&"None".to_string()), + ident_span: Some(kernel_span(&"None".to_string())), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, +}) + }; + } CACHED.with(|c| c.clone()) } @@ -3133,52 +2179,52 @@ pub fn tuple_type_name() -> String { pub fn error_type() -> Rc { thread_local! { - static CACHED: Rc = { - Rc::new(Node { - name: "".to_string(), - span: make_span(0, 0), - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::CompilerError { - message: "unresolved type".to_string(), - span: make_span(0, 0), - })), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::ExprError { - kind: ExprErrorKind::SemanticExprError, - message: "unresolved type".to_string(), - }), - ident: None, - }) - }; - } + static CACHED: Rc = { + Rc::new(Node { + name: "".to_string(), + span: make_span(0, 0), + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::CompilerError { + message: "unresolved type".to_string(), + span: make_span(0, 0), +})), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::ExprError { + kind: ExprErrorKind::SemanticExprError, + message: "unresolved type".to_string(), +}), + ident: None, +}) + }; + } CACHED.with(|c| c.clone()) } pub fn make_span(start: i64, end: i64) -> Rc { Rc::new(SourceSpan { - file: "".to_string(), - start: start, - end: end, - }) + file: "".to_string(), + start: start, + end: end, +}) } pub fn make_file_span(file: String, start: i64, end: i64) -> Rc { Rc::new(SourceSpan { - file: file, - start: start, - end: end, - }) + file: file, + start: start, + end: end, +}) } pub fn no_span() -> Rc { @@ -3201,29 +2247,17 @@ pub struct NewlineIndex { pub fn build_newline_index(file: String, source: &String) -> Rc { { let char_codes = Rc::new(source.clone().chars().map(|c| c as i64).collect::>()); - let offsets = Rc::new( - char_codes - .iter() - .cloned() - .enumerate() - .map(|(i, v)| (i as i64, v)) - .collect::>(), - ) - .iter() - .cloned() - .fold(Rc::new(vec![]), |acc: _, pair: (i64, i64)| { - if (pair.1.clone() == 10) { - v2_rt::rc_list_push(acc.clone(), pair.0.clone()) - } else { - acc.clone() - } +let offsets = Rc::new(char_codes.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(Rc::new(vec![]), |acc: _, pair: (i64, i64)| if (pair.1.clone() == 10) { + v2_rt::rc_list_push(acc.clone(), pair.0.clone()) + } else { + acc.clone() }); - Rc::new(NewlineIndex { - file: file, - offsets: offsets, - source: source.clone(), - }) - } +Rc::new(NewlineIndex { + file: file, + offsets: offsets, + source: source.clone(), +}) +} } pub fn byte_to_line_col(index: &Rc, offset: i64) -> LineCol { @@ -3233,65 +2267,40 @@ pub fn byte_to_line_col(index: &Rc, offset: i64) -> LineCol { } else { offset.clone() }; - let line = ((Rc::new({ - let mut __result = Vec::new(); - for o in index.offsets.clone().iter().cloned() { - if (o.clone() < clamped.clone()) { - __result.push(o); - } - } - __result - }) - .len() as i64) - + 1); - let line_start = if (line.clone() <= 1) { +let line = ((Rc::new({ let mut __result = Vec::new(); for o in index.offsets.clone().iter().cloned() { if (o.clone() < clamped.clone()) { __result.push(o); } } __result }).len() as i64) + 1); +let line_start = if (line.clone() <= 1) { 0 } else { - match index - .offsets - .clone() - .get((line.clone() - 2) as usize) - .cloned() - { - Some(o) => (o.clone() + 1), - None => 0, - } + match index.offsets.clone().get((line.clone() - 2) as usize).cloned() { + Some(o) => (o.clone() + 1), + None => 0, +} }; - let col = ((clamped.clone() - line_start) + 1); - LineCol { - line: line.clone(), - col: col, - } - } +let col = ((clamped.clone() - line_start) + 1); +LineCol { + line: line.clone(), + col: col, +} +} } pub fn source_line_at(index: &Rc, line: i64) -> String { { let src_len = v2_rt::string_length(&index.source.clone()); - let line_start = if (line.clone() <= 1) { +let line_start = if (line.clone() <= 1) { 0 } else { - match index - .offsets - .clone() - .get((line.clone() - 2) as usize) - .cloned() - { - Some(o) => (o.clone() + 1), - None => src_len.clone(), - } - }; - let line_end = match index - .offsets - .clone() - .get((line.clone() - 1) as usize) - .cloned() - { - Some(o) => o.clone(), - None => src_len.clone(), + match index.offsets.clone().get((line.clone() - 2) as usize).cloned() { + Some(o) => (o.clone() + 1), + None => src_len.clone(), +} }; - v2_rt::substring(&index.source.clone(), line_start, line_end) - } +let line_end = match index.offsets.clone().get((line.clone() - 1) as usize).cloned() { + Some(o) => o.clone(), + None => src_len.clone(), +}; +v2_rt::substring(&index.source.clone(), line_start, line_end) +} } pub fn source_text_at(index: Rc, span: &Rc) -> String { @@ -3313,135 +2322,119 @@ pub struct InternResult { pub fn empty_intern_table() -> Rc { Rc::new(InternTable { - strings: Rc::new(vec!["".to_string()]), - index: v2_rt::rc_map_insert(v2_rt::rc_empty_map::(), "".to_string(), 0), - next_id: 1, - }) + strings: Rc::new(vec!["".to_string()]), + index: v2_rt::rc_map_insert(v2_rt::rc_empty_map::(), "".to_string(), 0), + next_id: 1, +}) } pub fn intern(table: &Rc, s: &String) -> Rc { match v2_rt::map_get(&table.index.clone(), s.clone()) { - Some(id) => Rc::new(InternResult { - table: table.clone(), - id: id.clone(), - }), - None => { - let id = table.next_id.clone(); - Rc::new(InternResult { - table: Rc::new(InternTable { - strings: v2_rt::rc_list_push(table.strings.clone(), s.clone()), - index: v2_rt::rc_map_insert(table.index.clone(), s.clone(), id.clone()), - next_id: (id.clone() + 1), - }), - id: id.clone(), - }) - } - } + Some(id) => Rc::new(InternResult { + table: table.clone(), + id: id.clone(), +}), + None => { + let id = table.next_id.clone(); +Rc::new(InternResult { + table: Rc::new(InternTable { + strings: v2_rt::rc_list_push(table.strings.clone(), s.clone()), + index: v2_rt::rc_map_insert(table.index.clone(), s.clone(), id.clone()), + next_id: (id.clone() + 1), +}), + id: id.clone(), +}) +}, +} } pub fn intern_str(table: Rc, id: i64) -> String { match table.strings.clone().get(id as usize).cloned() { - Some(s) => s.clone(), - None => "".to_string(), - } + Some(s) => s.clone(), + None => "".to_string(), +} } pub fn intern_find(table: Rc, s: String) -> Option { match v2_rt::map_get(&table.index.clone(), s) { - Some(id) => Some(id.clone()), - None => None, - } + Some(id) => Some(id.clone()), + None => None, +} } pub fn intern_find_or_empty(table: Rc, s: String) -> i64 { match v2_rt::map_get(&table.index.clone(), s) { - Some(id) => id.clone(), - None => 0, - } + Some(id) => id.clone(), + None => 0, +} } pub fn merge_intern_tables(tables: Rc>>) -> Rc { - tables.iter().cloned().fold( - empty_intern_table(), - |merged: Rc, t: Rc| { - t.strings - .clone() - .iter() - .cloned() - .fold(merged, |m: Rc, s: String| { - if (s.clone().as_str() == "".to_string().as_str()) { - m.clone() - } else { - intern(&m, &s).table.clone() - } - }) - }, - ) + tables.iter().cloned().fold(empty_intern_table(), |merged: Rc, t: Rc| t.strings.clone().iter().cloned().fold(merged, |m: Rc, s: String| if (s.clone().as_str() == "".to_string().as_str()) { + m.clone() + } else { + intern(&m, &s).table.clone() + })) } pub fn is_internable_token(shape: TokenShape) -> bool { match shape { - TokenShape::ShIdent => true, - TokenShape::ShKeyword => true, - _ => false, - } + TokenShape::ShIdent => true, + TokenShape::ShKeyword => true, + _ => false, +} } pub fn pre_intern_tokens(tokens: Rc>>, table: Rc) -> Rc { - tokens - .iter() - .cloned() - .fold(table, |t: Rc, tok: Rc| { - if is_internable_token(tok.shape.clone()) { - intern(&t, &tok.text.clone()).table.clone() - } else { - t.clone() - } - }) + tokens.iter().cloned().fold(table, |t: Rc, tok: Rc| if is_internable_token(tok.shape.clone()) { + intern(&t, &tok.text.clone()).table.clone() + } else { + t.clone() + }) } pub fn with_optional_cardinality(n: &Rc) -> Rc { Rc::new(Node { - name: n.name.clone(), - ident: n.ident.clone(), - span: n.span.clone(), - ident_span: n.ident_span.clone(), - children: n.children.clone(), - connective: n.connective.clone(), - params: n.params.clone(), - inferred: n.inferred.clone(), - return_cardinality: Cardinality::CardOptional, - uses: n.uses.clone(), - body: n.body.clone(), - transport: n.transport.clone(), - properties: n.properties.clone(), - type_annotation: n.type_annotation.clone(), - is_self_recursive: n.is_self_recursive.clone(), - has_non_tail_self_call: n.has_non_tail_self_call.clone(), - match_pattern: n.match_pattern.clone(), - expr_data: n.expr_data.clone(), - }) + name: n.name.clone(), + ident: n.ident.clone(), + span: n.span.clone(), + ident_span: n.ident_span.clone(), + children: n.children.clone(), + connective: n.connective.clone(), + params: n.params.clone(), + inferred: n.inferred.clone(), + return_cardinality: Cardinality::CardOptional, + uses: n.uses.clone(), + body: n.body.clone(), + transport: n.transport.clone(), + properties: n.properties.clone(), + type_annotation: n.type_annotation.clone(), + is_self_recursive: n.is_self_recursive.clone(), + has_non_tail_self_call: n.has_non_tail_self_call.clone(), + match_pattern: n.match_pattern.clone(), + expr_data: n.expr_data.clone(), +}) } pub fn with_required_cardinality(n: &Rc) -> Rc { Rc::new(Node { - name: n.name.clone(), - ident: n.ident.clone(), - span: n.span.clone(), - ident_span: n.ident_span.clone(), - children: n.children.clone(), - connective: n.connective.clone(), - params: n.params.clone(), - inferred: n.inferred.clone(), - return_cardinality: Cardinality::Required, - uses: n.uses.clone(), - body: n.body.clone(), - transport: n.transport.clone(), - properties: n.properties.clone(), - type_annotation: n.type_annotation.clone(), - is_self_recursive: n.is_self_recursive.clone(), - has_non_tail_self_call: n.has_non_tail_self_call.clone(), - match_pattern: n.match_pattern.clone(), - expr_data: n.expr_data.clone(), - }) + name: n.name.clone(), + ident: n.ident.clone(), + span: n.span.clone(), + ident_span: n.ident_span.clone(), + children: n.children.clone(), + connective: n.connective.clone(), + params: n.params.clone(), + inferred: n.inferred.clone(), + return_cardinality: Cardinality::Required, + uses: n.uses.clone(), + body: n.body.clone(), + transport: n.transport.clone(), + properties: n.properties.clone(), + type_annotation: n.type_annotation.clone(), + is_self_recursive: n.is_self_recursive.clone(), + has_non_tail_self_call: n.has_non_tail_self_call.clone(), + match_pattern: n.match_pattern.clone(), + expr_data: n.expr_data.clone(), +}) } From fffdcfe84c9f3bcca64bc100e7c07955953d468d Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sun, 10 May 2026 13:52:04 -0400 Subject: [PATCH 06/18] =?UTF-8?q?WIP:=20T-Anthropic-Wire=20coproduct=20sli?= =?UTF-8?q?ce=202=20=E2=80=94=20Anthropic=20tool=5Fresult=5Fcontent=20wire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/v2/stage0/src/compiler_tests.rs | 598 +- .../stage0/src/extdeps_languages_dag_emit.rs | 6 +- .../src/extdeps_languages_dag_syntax.rs | 420 +- .../stage0/src/extdeps_languages_dag_types.rs | 8 +- .../stage0/src/extdeps_languages_go_emit.rs | 6 +- .../stage0/src/extdeps_languages_go_syntax.rs | 280 +- .../stage0/src/extdeps_languages_go_types.rs | 12 +- .../src/extdeps_languages_python_emit.rs | 6 +- .../src/extdeps_languages_python_syntax.rs | 296 +- .../src/extdeps_languages_python_types.rs | 10 +- .../stage0/src/extdeps_languages_rust_emit.rs | 100 +- .../src/extdeps_languages_rust_syntax.rs | 406 +- .../src/extdeps_languages_rust_types.rs | 20 +- .../generated_method_template_projection.rs | 6 +- src/v2/stage0/src/lib.rs | 82 +- src/v2/stage0/src/main.rs | 86 +- src/v2/stage0/src/std_algebra.rs | 1965 +- src/v2/stage0/src/std_coercion.rs | 32 +- src/v2/stage0/src/std_computation.rs | 270 +- src/v2/stage0/src/std_effects.rs | 267 +- src/v2/stage0/src/std_error_primitives.rs | 18 +- src/v2/stage0/src/std_graph.rs | 347 +- src/v2/stage0/src/std_http_path.rs | 335 +- src/v2/stage0/src/std_induction.rs | 1127 +- src/v2/stage0/src/std_iteration.rs | 8 +- src/v2/stage0/src/std_node.rs | 182 +- src/v2/stage0/src/std_syntax.rs | 86 +- src/v2/stage0/src/std_termination.rs | 201 +- src/v2/stage0/src/std_types.rs | 121 +- src/v2/stage0/src/v2_compiler_artifact.rs | 55 +- src/v2/stage0/src/v2_compiler_coercion.rs | 440 +- src/v2/stage0/src/v2_compiler_compile.rs | 2537 +- .../src/v2_compiler_compiler_tests_rust.rs | 231 +- src/v2/stage0/src/v2_compiler_complexity.rs | 12292 +++++++--- .../src/v2_compiler_effect_derivation.rs | 56 +- src/v2/stage0/src/v2_compiler_emit.rs | 6874 ++++-- src/v2/stage0/src/v2_compiler_emit_go.rs | 1829 +- src/v2/stage0/src/v2_compiler_emit_python.rs | 1581 +- src/v2/stage0/src/v2_compiler_emit_rust.rs | 18388 ++++++++++---- src/v2/stage0/src/v2_compiler_infer.rs | 16101 ++++++++----- src/v2/stage0/src/v2_compiler_infer_access.rs | 266 +- src/v2/stage0/src/v2_compiler_infer_cycle.rs | 366 +- .../stage0/src/v2_compiler_infer_emit_info.rs | 714 +- src/v2/stage0/src/v2_compiler_infer_env.rs | 279 +- src/v2/stage0/src/v2_compiler_infer_items.rs | 180 +- src/v2/stage0/src/v2_compiler_infer_lookup.rs | 751 +- src/v2/stage0/src/v2_compiler_infer_method.rs | 208 +- .../stage0/src/v2_compiler_infer_patterns.rs | 484 +- .../stage0/src/v2_compiler_infer_resolve.rs | 3834 +-- .../stage0/src/v2_compiler_infer_service.rs | 472 +- src/v2/stage0/src/v2_compiler_infer_sigs.rs | 572 +- src/v2/stage0/src/v2_compiler_infer_types.rs | 3226 ++- src/v2/stage0/src/v2_compiler_languages.rs | 1750 +- src/v2/stage0/src/v2_compiler_normalize.rs | 249 +- src/v2/stage0/src/v2_compiler_ownership.rs | 1492 +- src/v2/stage0/src/v2_compiler_parse.rs | 20089 +++++++++------- src/v2/stage0/src/v2_compiler_resolve.rs | 920 +- src/v2/stage0/src/v2_compiler_runtime_rust.rs | 88 +- src/v2/stage0/src/v2_compiler_tokenize.rs | 1000 +- src/v2/stage0/src/v2_compiler_trace.rs | 225 +- src/v2/stage0/src/v2_rt.rs | 187 +- src/v2/stage0/src/v2_std_core.rs | 3419 ++- 62 files changed, 72101 insertions(+), 36355 deletions(-) diff --git a/src/v2/stage0/src/compiler_tests.rs b/src/v2/stage0/src/compiler_tests.rs index 5b1482a6d38..090fdc8a468 100644 --- a/src/v2/stage0/src/compiler_tests.rs +++ b/src/v2/stage0/src/compiler_tests.rs @@ -1,7 +1,7 @@ #[cfg(test)] mod compiler_tests { - use std::collections::HashMap; use crate::v2_compiler_tokenize::tokenize; + use std::collections::HashMap; /// Find workspace root by walking up from the current directory looking for Cargo.toml + dsl/ fn workspace_root() -> std::path::PathBuf { @@ -92,9 +92,11 @@ mod compiler_tests { crate::v2_std_core::diagnostic_to_message(err.diagnostic.clone()) ); } - parsed.result.module.clone().unwrap_or_else(|| { - panic!("{} produced no module while building source closure", path) - }) + parsed + .result + .module + .clone() + .unwrap_or_else(|| panic!("{} produced no module while building source closure", path)) } fn module_path_from_source(path: &str, content: &str) -> String { @@ -109,9 +111,7 @@ mod compiler_tests { .collect() } - fn build_source_index( - roots: &[&str], - ) -> HashMap { + fn build_source_index(roots: &[&str]) -> HashMap { let mut index = HashMap::new(); for root in roots { for (path, content) in discover_dag_files(root) { @@ -119,9 +119,7 @@ mod compiler_tests { if let Some((existing, _)) = index.get(&module_path) { panic!( "duplicate module path '{}': declared in both {} and {}", - module_path, - existing, - path + module_path, existing, path ); } index.insert(module_path, (path, content)); @@ -135,7 +133,8 @@ mod compiler_tests { roots: &[&str], ) -> Vec> { let index = build_source_index(roots); - let mut seen = HashMap::>::new(); + let mut seen = + HashMap::>::new(); let mut queue = Vec::new(); for (path, content) in entry_pairs { @@ -215,7 +214,10 @@ mod compiler_tests { #[test] fn tokenize_produces_tokens() { - let tokens = tokenize(&"fn foo() -> Int { 42 }".to_string(), "test.dag".to_string()); + let tokens = tokenize( + &"fn foo() -> Int { 42 }".to_string(), + "test.dag".to_string(), + ); assert!( !tokens.is_empty(), "tokenize should produce at least one token" @@ -267,7 +269,10 @@ mod compiler_tests { &"module test\ntype Foo { x: Int }\n".to_string(), "test.dag".to_string(), ); - let result = crate::v2_compiler_parse::parse(tokens, std::rc::Rc::new(std::collections::HashMap::new())); + let result = crate::v2_compiler_parse::parse( + tokens, + std::rc::Rc::new(std::collections::HashMap::new()), + ); assert!( result.module.is_some(), "valid module should parse successfully" @@ -294,7 +299,10 @@ mod compiler_tests { last.shape ); - let result = crate::v2_compiler_parse::parse(tokens, std::rc::Rc::new(std::collections::HashMap::new())); + let result = crate::v2_compiler_parse::parse( + tokens, + std::rc::Rc::new(std::collections::HashMap::new()), + ); assert!( result.module.is_some(), @@ -371,7 +379,10 @@ mod compiler_tests { "{} should end with Eof", file ); - let result = crate::v2_compiler_parse::parse(tokens, std::rc::Rc::new(std::collections::HashMap::new())); + let result = crate::v2_compiler_parse::parse( + tokens, + std::rc::Rc::new(std::collections::HashMap::new()), + ); assert!( result.module.is_some(), "{} should parse successfully, error: {:?}", @@ -642,81 +653,201 @@ mod compiler_tests { #[test] fn coercion_rust_checkpoint_resolves_primitives() { use crate::v2_compiler_coercion::*; - assert_eq!(coerce_primitive_type(RenderTarget::Rust, "Int".into()), "i64"); - assert_eq!(coerce_primitive_type(RenderTarget::Rust, "Float".into()), "f64"); - assert_eq!(coerce_primitive_type(RenderTarget::Rust, "Bool".into()), "bool"); - assert_eq!(coerce_primitive_type(RenderTarget::Rust, "Unit".into()), "()"); - assert_eq!(coerce_primitive_type(RenderTarget::Rust, "String".into()), "String"); - assert_eq!(coerce_primitive_type(RenderTarget::Rust, "Bytes".into()), "Vec"); - assert_eq!(coerce_primitive_type(RenderTarget::Rust, "Secret".into()), "String"); - assert_eq!(coerce_primitive_type(RenderTarget::Rust, "Json".into()), "serde_json::Value"); + assert_eq!( + coerce_primitive_type(RenderTarget::Rust, "Int".into()), + "i64" + ); + assert_eq!( + coerce_primitive_type(RenderTarget::Rust, "Float".into()), + "f64" + ); + assert_eq!( + coerce_primitive_type(RenderTarget::Rust, "Bool".into()), + "bool" + ); + assert_eq!( + coerce_primitive_type(RenderTarget::Rust, "Unit".into()), + "()" + ); + assert_eq!( + coerce_primitive_type(RenderTarget::Rust, "String".into()), + "String" + ); + assert_eq!( + coerce_primitive_type(RenderTarget::Rust, "Bytes".into()), + "Vec" + ); + assert_eq!( + coerce_primitive_type(RenderTarget::Rust, "Secret".into()), + "String" + ); + assert_eq!( + coerce_primitive_type(RenderTarget::Rust, "Json".into()), + "serde_json::Value" + ); } - #[test] fn coercion_python_checkpoint_resolves_primitives() { use crate::v2_compiler_coercion::*; - assert_eq!(coerce_primitive_type(RenderTarget::Python, "Int".into()), "int"); - assert_eq!(coerce_primitive_type(RenderTarget::Python, "Float".into()), "float"); - assert_eq!(coerce_primitive_type(RenderTarget::Python, "Bool".into()), "bool"); - assert_eq!(coerce_primitive_type(RenderTarget::Python, "Unit".into()), "None"); - assert_eq!(coerce_primitive_type(RenderTarget::Python, "String".into()), "str"); - assert_eq!(coerce_primitive_type(RenderTarget::Python, "Bytes".into()), "bytes"); - assert_eq!(coerce_primitive_type(RenderTarget::Python, "Secret".into()), "str"); - assert_eq!(coerce_primitive_type(RenderTarget::Python, "Json".into()), "dict"); + assert_eq!( + coerce_primitive_type(RenderTarget::Python, "Int".into()), + "int" + ); + assert_eq!( + coerce_primitive_type(RenderTarget::Python, "Float".into()), + "float" + ); + assert_eq!( + coerce_primitive_type(RenderTarget::Python, "Bool".into()), + "bool" + ); + assert_eq!( + coerce_primitive_type(RenderTarget::Python, "Unit".into()), + "None" + ); + assert_eq!( + coerce_primitive_type(RenderTarget::Python, "String".into()), + "str" + ); + assert_eq!( + coerce_primitive_type(RenderTarget::Python, "Bytes".into()), + "bytes" + ); + assert_eq!( + coerce_primitive_type(RenderTarget::Python, "Secret".into()), + "str" + ); + assert_eq!( + coerce_primitive_type(RenderTarget::Python, "Json".into()), + "dict" + ); } - #[test] fn coercion_go_checkpoint_resolves_primitives() { use crate::v2_compiler_coercion::*; - assert_eq!(coerce_primitive_type(RenderTarget::Go, "Int".into()), "int64"); - assert_eq!(coerce_primitive_type(RenderTarget::Go, "Float".into()), "float64"); - assert_eq!(coerce_primitive_type(RenderTarget::Go, "Bool".into()), "bool"); - assert_eq!(coerce_primitive_type(RenderTarget::Go, "Unit".into()), "struct{}"); - assert_eq!(coerce_primitive_type(RenderTarget::Go, "String".into()), "string"); - assert_eq!(coerce_primitive_type(RenderTarget::Go, "Bytes".into()), "[]byte"); - assert_eq!(coerce_primitive_type(RenderTarget::Go, "Secret".into()), "string"); - assert_eq!(coerce_primitive_type(RenderTarget::Go, "Json".into()), "interface{}"); + assert_eq!( + coerce_primitive_type(RenderTarget::Go, "Int".into()), + "int64" + ); + assert_eq!( + coerce_primitive_type(RenderTarget::Go, "Float".into()), + "float64" + ); + assert_eq!( + coerce_primitive_type(RenderTarget::Go, "Bool".into()), + "bool" + ); + assert_eq!( + coerce_primitive_type(RenderTarget::Go, "Unit".into()), + "struct{}" + ); + assert_eq!( + coerce_primitive_type(RenderTarget::Go, "String".into()), + "string" + ); + assert_eq!( + coerce_primitive_type(RenderTarget::Go, "Bytes".into()), + "[]byte" + ); + assert_eq!( + coerce_primitive_type(RenderTarget::Go, "Secret".into()), + "string" + ); + assert_eq!( + coerce_primitive_type(RenderTarget::Go, "Json".into()), + "interface{}" + ); } - #[test] fn coercion_rust_inhabitant_resolves_containers() { use crate::v2_compiler_coercion::*; - assert_eq!(coerce_container_template(RenderTarget::Rust, "BooleanAlgebra".into()), Some("std::collections::BTreeSet<{0}>".to_string())); - assert_eq!(coerce_container_template(RenderTarget::Rust, "FreeMonoid".into()), Some("Vec<{0}>".to_string())); - assert_eq!(coerce_container_template(RenderTarget::Rust, "List".into()), Some("Vec<{0}>".to_string())); - assert_eq!(coerce_container_template(RenderTarget::Rust, "Map".into()), Some("HashMap<{0}, {1}>".to_string())); - assert_eq!(coerce_container_template(RenderTarget::Rust, "PartialFunction".into()), Some("HashMap<{0}, {1}>".to_string())); - assert_eq!(coerce_container_template(RenderTarget::Rust, "Set".into()), Some("std::collections::BTreeSet<{0}>".to_string())); + assert_eq!( + coerce_container_template(RenderTarget::Rust, "BooleanAlgebra".into()), + Some("std::collections::BTreeSet<{0}>".to_string()) + ); + assert_eq!( + coerce_container_template(RenderTarget::Rust, "FreeMonoid".into()), + Some("Vec<{0}>".to_string()) + ); + assert_eq!( + coerce_container_template(RenderTarget::Rust, "List".into()), + Some("Vec<{0}>".to_string()) + ); + assert_eq!( + coerce_container_template(RenderTarget::Rust, "Map".into()), + Some("HashMap<{0}, {1}>".to_string()) + ); + assert_eq!( + coerce_container_template(RenderTarget::Rust, "PartialFunction".into()), + Some("HashMap<{0}, {1}>".to_string()) + ); + assert_eq!( + coerce_container_template(RenderTarget::Rust, "Set".into()), + Some("std::collections::BTreeSet<{0}>".to_string()) + ); } - #[test] fn coercion_python_inhabitant_resolves_containers() { use crate::v2_compiler_coercion::*; - assert_eq!(coerce_container_template(RenderTarget::Python, "BooleanAlgebra".into()), Some("set[{0}]".to_string())); - assert_eq!(coerce_container_template(RenderTarget::Python, "FreeMonoid".into()), Some("list[{0}]".to_string())); - assert_eq!(coerce_container_template(RenderTarget::Python, "List".into()), Some("list[{0}]".to_string())); - assert_eq!(coerce_container_template(RenderTarget::Python, "Map".into()), Some("dict[{0}, {1}]".to_string())); - assert_eq!(coerce_container_template(RenderTarget::Python, "PartialFunction".into()), Some("dict[{0}, {1}]".to_string())); - assert_eq!(coerce_container_template(RenderTarget::Python, "Set".into()), Some("set[{0}]".to_string())); + assert_eq!( + coerce_container_template(RenderTarget::Python, "BooleanAlgebra".into()), + Some("set[{0}]".to_string()) + ); + assert_eq!( + coerce_container_template(RenderTarget::Python, "FreeMonoid".into()), + Some("list[{0}]".to_string()) + ); + assert_eq!( + coerce_container_template(RenderTarget::Python, "List".into()), + Some("list[{0}]".to_string()) + ); + assert_eq!( + coerce_container_template(RenderTarget::Python, "Map".into()), + Some("dict[{0}, {1}]".to_string()) + ); + assert_eq!( + coerce_container_template(RenderTarget::Python, "PartialFunction".into()), + Some("dict[{0}, {1}]".to_string()) + ); + assert_eq!( + coerce_container_template(RenderTarget::Python, "Set".into()), + Some("set[{0}]".to_string()) + ); } - #[test] fn coercion_go_inhabitant_resolves_containers() { use crate::v2_compiler_coercion::*; - assert_eq!(coerce_container_template(RenderTarget::Go, "BooleanAlgebra".into()), Some("map[{0}]struct{}".to_string())); - assert_eq!(coerce_container_template(RenderTarget::Go, "FreeMonoid".into()), Some("[]{0}".to_string())); - assert_eq!(coerce_container_template(RenderTarget::Go, "List".into()), Some("[]{0}".to_string())); - assert_eq!(coerce_container_template(RenderTarget::Go, "Map".into()), Some("map[{0}]{1}".to_string())); - assert_eq!(coerce_container_template(RenderTarget::Go, "PartialFunction".into()), Some("map[{0}]{1}".to_string())); - assert_eq!(coerce_container_template(RenderTarget::Go, "Set".into()), Some("map[{0}]struct{}".to_string())); + assert_eq!( + coerce_container_template(RenderTarget::Go, "BooleanAlgebra".into()), + Some("map[{0}]struct{}".to_string()) + ); + assert_eq!( + coerce_container_template(RenderTarget::Go, "FreeMonoid".into()), + Some("[]{0}".to_string()) + ); + assert_eq!( + coerce_container_template(RenderTarget::Go, "List".into()), + Some("[]{0}".to_string()) + ); + assert_eq!( + coerce_container_template(RenderTarget::Go, "Map".into()), + Some("map[{0}]{1}".to_string()) + ); + assert_eq!( + coerce_container_template(RenderTarget::Go, "PartialFunction".into()), + Some("map[{0}]{1}".to_string()) + ); + assert_eq!( + coerce_container_template(RenderTarget::Go, "Set".into()), + Some("map[{0}]struct{}".to_string()) + ); } - #[test] fn coercion_is_copy_from_checkpoint() { use crate::v2_compiler_coercion::*; @@ -730,19 +861,45 @@ mod compiler_tests { assert_eq!(is_copy(RenderTarget::Rust, "Json".into()), Some(false)); } - #[test] fn coercion_template_application() { use crate::v2_compiler_coercion::*; - assert_eq!(apply_inhabitant_template1("Vec<{0}>".into(), "i64".into()), "Vec"); - assert_eq!(apply_inhabitant_template1("std::collections::BTreeSet<{0}>".into(), "i64".into()), "std::collections::BTreeSet"); - assert_eq!(apply_inhabitant_template2("HashMap<{0}, {1}>".into(), "String".into(), "i64".into()), "HashMap"); - assert_eq!(apply_inhabitant_template1("list[{0}]".into(), "int".into()), "list[int]"); - assert_eq!(apply_inhabitant_template1("set[{0}]".into(), "int".into()), "set[int]"); - assert_eq!(apply_inhabitant_template2("dict[{0}, {1}]".into(), "str".into(), "int".into()), "dict[str, int]"); - assert_eq!(apply_inhabitant_template1("[]{0}".into(), "int64".into()), "[]int64"); - assert_eq!(apply_inhabitant_template1("map[{0}]struct{}".into(), "int64".into()), "map[int64]struct{}"); - assert_eq!(apply_inhabitant_template2("map[{0}]{1}".into(), "string".into(), "int64".into()), "map[string]int64"); + assert_eq!( + apply_inhabitant_template1("Vec<{0}>".into(), "i64".into()), + "Vec" + ); + assert_eq!( + apply_inhabitant_template1("std::collections::BTreeSet<{0}>".into(), "i64".into()), + "std::collections::BTreeSet" + ); + assert_eq!( + apply_inhabitant_template2("HashMap<{0}, {1}>".into(), "String".into(), "i64".into()), + "HashMap" + ); + assert_eq!( + apply_inhabitant_template1("list[{0}]".into(), "int".into()), + "list[int]" + ); + assert_eq!( + apply_inhabitant_template1("set[{0}]".into(), "int".into()), + "set[int]" + ); + assert_eq!( + apply_inhabitant_template2("dict[{0}, {1}]".into(), "str".into(), "int".into()), + "dict[str, int]" + ); + assert_eq!( + apply_inhabitant_template1("[]{0}".into(), "int64".into()), + "[]int64" + ); + assert_eq!( + apply_inhabitant_template1("map[{0}]struct{}".into(), "int64".into()), + "map[int64]struct{}" + ); + assert_eq!( + apply_inhabitant_template2("map[{0}]{1}".into(), "string".into(), "int64".into()), + "map[string]int64" + ); } /// Return current process RSS in bytes (macOS via mach_task_basic_info). @@ -855,7 +1012,10 @@ mod compiler_tests { let parsed = crate::v2_compiler_parse::parse_with_table( tokens, crate::v2_rt::rc_map_insert( - crate::v2_rt::rc_empty_map::>(), + crate::v2_rt::rc_empty_map::< + String, + std::rc::Rc, + >(), si.file.clone(), si.clone(), ), @@ -869,7 +1029,9 @@ mod compiler_tests { " parse {:>40}: {:>8.2?} (ok={})", sources[i].path, elapsed, ok ); - let m = result.module.clone() + let m = result + .module + .clone() .unwrap_or_else(|| panic!("parse failed for source {}", sources[i].path)); modules.push(m); } @@ -878,10 +1040,25 @@ mod compiler_tests { let t_stage = Instant::now(); let resolve_si = sources.iter().fold( - crate::v2_rt::rc_empty_map::>(), - |acc, s| crate::v2_rt::rc_map_insert(acc, s.path.clone(), crate::v2_std_core::build_newline_index(s.path.clone(), &s.content.clone())), + crate::v2_rt::rc_empty_map::< + String, + std::rc::Rc, + >(), + |acc, s| { + crate::v2_rt::rc_map_insert( + acc, + s.path.clone(), + crate::v2_std_core::build_newline_index( + s.path.clone(), + &s.content.clone(), + ), + ) + }, + ); + let graph = crate::v2_compiler_resolve::resolve_modules( + &std::rc::Rc::new(modules), + &resolve_si, ); - let graph = crate::v2_compiler_resolve::resolve_modules(&std::rc::Rc::new(modules), &resolve_si); let resolve_total = t_stage.elapsed(); let errors: Vec<_> = graph .diagnostics @@ -968,7 +1145,10 @@ mod compiler_tests { let parsed = crate::v2_compiler_parse::parse_with_table( tokens, crate::v2_rt::rc_map_insert( - crate::v2_rt::rc_empty_map::>(), + crate::v2_rt::rc_empty_map::< + String, + std::rc::Rc, + >(), si.file.clone(), si.clone(), ), @@ -985,7 +1165,9 @@ mod compiler_tests { " parse {:>40}: {:>8.2?} (ok={})", sources[i].path, elapsed, ok ); - let m = result.module.clone() + let m = result + .module + .clone() .unwrap_or_else(|| panic!("parse failed for source {}", sources[i].path)); modules.push(m); } @@ -1000,10 +1182,25 @@ mod compiler_tests { let t_stage = Instant::now(); let resolve_si = sources.iter().fold( - crate::v2_rt::rc_empty_map::>(), - |acc, s| crate::v2_rt::rc_map_insert(acc, s.path.clone(), crate::v2_std_core::build_newline_index(s.path.clone(), &s.content.clone())), + crate::v2_rt::rc_empty_map::< + String, + std::rc::Rc, + >(), + |acc, s| { + crate::v2_rt::rc_map_insert( + acc, + s.path.clone(), + crate::v2_std_core::build_newline_index( + s.path.clone(), + &s.content.clone(), + ), + ) + }, + ); + let graph = crate::v2_compiler_resolve::resolve_modules( + &std::rc::Rc::new(modules), + &resolve_si, ); - let graph = crate::v2_compiler_resolve::resolve_modules(&std::rc::Rc::new(modules), &resolve_si); let resolve_total = t_stage.elapsed(); let phase3_diags: usize = graph .diagnostics @@ -1032,7 +1229,11 @@ mod compiler_tests { acc }, ); - let typed = crate::v2_compiler_infer::reconcile(graph, std::rc::Rc::new(source_indices), intern_table_p.clone()); + let typed = crate::v2_compiler_infer::reconcile( + graph, + std::rc::Rc::new(source_indices), + intern_table_p.clone(), + ); let reconcile_total = t_stage.elapsed(); let phase4_diags: usize = typed .diagnostics @@ -1108,14 +1309,18 @@ mod compiler_tests { let source_count = sources.len(); let total_chars: usize = sources.iter().map(|s| s.content.len()).sum(); - eprintln!("\n=== FULL PIPELINE PROFILE ({} sources, {} chars) ===\n", source_count, total_chars); + eprintln!( + "\n=== FULL PIPELINE PROFILE ({} sources, {} chars) ===\n", + source_count, total_chars + ); // 1a. Tokenize + parse let t = Instant::now(); let mut token_lists = Vec::new(); for source in &sources { let tokens = crate::v2_compiler_tokenize::tokenize( - &source.content.clone(), source.path.clone(), + &source.content.clone(), + source.path.clone(), ); token_lists.push(tokens); } @@ -1132,7 +1337,10 @@ mod compiler_tests { let parsed = crate::v2_compiler_parse::parse_with_table( tokens, crate::v2_rt::rc_map_insert( - crate::v2_rt::rc_empty_map::>(), + crate::v2_rt::rc_empty_map::< + String, + std::rc::Rc, + >(), si.file.clone(), si.clone(), ), @@ -1140,7 +1348,9 @@ mod compiler_tests { ); let result = parsed.result.clone(); intern_table_fp = parsed.intern_table.clone(); - let m = result.module.clone() + let m = result + .module + .clone() .unwrap_or_else(|| panic!("parse failed for source {}", sources[i].path)); modules.push(m); } @@ -1148,91 +1358,200 @@ mod compiler_tests { // 1b. Resolve let t = Instant::now(); let resolve_si = sources.iter().fold( - crate::v2_rt::rc_empty_map::>(), - |acc, s| crate::v2_rt::rc_map_insert(acc, s.path.clone(), crate::v2_std_core::build_newline_index(s.path.clone(), &s.content.clone())), + crate::v2_rt::rc_empty_map::< + String, + std::rc::Rc, + >(), + |acc, s| { + crate::v2_rt::rc_map_insert( + acc, + s.path.clone(), + crate::v2_std_core::build_newline_index( + s.path.clone(), + &s.content.clone(), + ), + ) + }, + ); + let graph = crate::v2_compiler_resolve::resolve_modules( + &std::rc::Rc::new(modules), + &resolve_si, ); - let graph = crate::v2_compiler_resolve::resolve_modules(&std::rc::Rc::new(modules), &resolve_si); let resolve_elapsed = t.elapsed(); - let resolve_errors: usize = graph.diagnostics.iter() + let resolve_errors: usize = graph + .diagnostics + .iter() .filter(|d| crate::v2_std_core::is_error_diagnostic(d.diagnostic.clone())) .count(); // 1c. Newline indices let t = Instant::now(); - let newline_indices: Vec<_> = sources.iter().map(|s| { - crate::v2_std_core::build_newline_index(s.path.clone(), &s.content.clone()) - }).collect(); + let newline_indices: Vec<_> = sources + .iter() + .map(|s| { + crate::v2_std_core::build_newline_index(s.path.clone(), &s.content.clone()) + }) + .collect(); let newline_elapsed = t.elapsed(); - let frontend_elapsed = tokenize_elapsed + parse_elapsed + resolve_elapsed + newline_elapsed; + let frontend_elapsed = + tokenize_elapsed + parse_elapsed + resolve_elapsed + newline_elapsed; eprintln!(" Tokenize: {:>8.2?}", tokenize_elapsed); eprintln!(" Parse: {:>8.2?}", parse_elapsed); - eprintln!(" Resolve: {:>8.2?} ({} resolve errors)", resolve_elapsed, resolve_errors); + eprintln!( + " Resolve: {:>8.2?} ({} resolve errors)", + resolve_elapsed, resolve_errors + ); eprintln!(" Newline indices: {:>8.2?}", newline_elapsed); eprintln!(" Frontend total: {:>8.2?}", frontend_elapsed); // 2. Normalize let t = Instant::now(); let source_indices = newline_indices.iter().cloned().fold( - crate::v2_rt::rc_empty_map::>(), - |acc, index| crate::v2_rt::rc_map_insert(acc, index.file.clone(), index.clone()), + crate::v2_rt::rc_empty_map::< + String, + std::rc::Rc, + >(), + |acc, index| { + crate::v2_rt::rc_map_insert(acc, index.file.clone(), index.clone()) + }, ); - let norm = crate::v2_compiler_normalize::normalize_graph(&graph, source_indices.clone()); + let norm = + crate::v2_compiler_normalize::normalize_graph(&graph, source_indices.clone()); let normalize_elapsed = t.elapsed(); - eprintln!(" Normalize: {:>8.2?}", normalize_elapsed); + eprintln!( + " Normalize: {:>8.2?}", + normalize_elapsed + ); // 3. Reconcile let t = Instant::now(); - let typed = crate::v2_compiler_infer::reconcile(norm.graph.clone(), source_indices.clone(), intern_table_fp.clone()); + let typed = crate::v2_compiler_infer::reconcile( + norm.graph.clone(), + source_indices.clone(), + intern_table_fp.clone(), + ); let reconcile_elapsed = t.elapsed(); - let type_errors: usize = typed.diagnostics.iter() + let type_errors: usize = typed + .diagnostics + .iter() .filter(|d| crate::v2_std_core::is_error_diagnostic(d.diagnostic.clone())) .count(); - eprintln!(" Reconcile: {:>8.2?} ({} type errors)", reconcile_elapsed, type_errors); + eprintln!( + " Reconcile: {:>8.2?} ({} type errors)", + reconcile_elapsed, type_errors + ); // 4. Complexity let t = Instant::now(); let func_entries = crate::v2_compiler_compile::extract_func_entries(typed.clone()); let func_count = func_entries.len(); - let recursion_ctx = crate::v2_compiler_compile::build_recursion_context(typed.clone()); + let recursion_ctx = + crate::v2_compiler_compile::build_recursion_context(typed.clone()); let complexity = crate::v2_compiler_complexity::build_complexity_report( - &func_entries, recursion_ctx, source_indices.clone(), + &func_entries, + recursion_ctx, + source_indices.clone(), ); let complexity_elapsed = t.elapsed(); - let cx_diags = crate::v2_compiler_compile::complexity_diagnostics(complexity.clone()); - eprintln!(" Complexity: {:>8.2?} ({} funcs, {} diagnostics)", complexity_elapsed, func_count, cx_diags.len()); + let cx_diags = + crate::v2_compiler_compile::complexity_diagnostics(complexity.clone()); + eprintln!( + " Complexity: {:>8.2?} ({} funcs, {} diagnostics)", + complexity_elapsed, + func_count, + cx_diags.len() + ); // 5. Ownership let t = Instant::now(); let ownership = crate::v2_compiler_compile::extract_ownership_proofs(typed.clone()); let ownership_elapsed = t.elapsed(); - let own_diags = crate::v2_compiler_compile::ownership_diagnostics(ownership.clone()); - eprintln!(" Ownership: {:>8.2?} ({} proofs, {} diagnostics)", ownership_elapsed, ownership.len(), own_diags.len()); + let own_diags = + crate::v2_compiler_compile::ownership_diagnostics(ownership.clone()); + eprintln!( + " Ownership: {:>8.2?} ({} proofs, {} diagnostics)", + ownership_elapsed, + ownership.len(), + own_diags.len() + ); // 6. Emit let artifact_plan = crate::v2_compiler_compile::default_artifact_plan( - std::rc::Rc::new(typed.modules.iter().map(|m| m.module.clone().name.clone()).collect()), + std::rc::Rc::new( + typed + .modules + .iter() + .map(|m| m.module.clone().name.clone()) + .collect(), + ), crate::v2_compiler_artifact::RenderTarget::Rust, ); let t = Instant::now(); - let emit_result = crate::v2_compiler_compile::emit_from_artifact_plan(typed.clone(), &artifact_plan); + let emit_result = crate::v2_compiler_compile::emit_from_artifact_plan( + typed.clone(), + &artifact_plan, + ); let emit_elapsed = t.elapsed(); let emitted_files = emit_result.files.len(); let emitted_bytes: usize = emit_result.files.iter().map(|f| f.content.len()).sum(); - eprintln!(" Emit: {:>8.2?} ({} files, {} bytes)", emit_elapsed, emitted_files, emitted_bytes); + eprintln!( + " Emit: {:>8.2?} ({} files, {} bytes)", + emit_elapsed, emitted_files, emitted_bytes + ); - let total = frontend_elapsed + normalize_elapsed + reconcile_elapsed - + complexity_elapsed + ownership_elapsed + emit_elapsed; + let total = frontend_elapsed + + normalize_elapsed + + reconcile_elapsed + + complexity_elapsed + + ownership_elapsed + + emit_elapsed; eprintln!("\n=== SUMMARY ==="); - eprintln!(" Tokenize: {:>8.2?} ({:.0}%)", tokenize_elapsed, tokenize_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0); - eprintln!(" Parse: {:>8.2?} ({:.0}%)", parse_elapsed, parse_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0); - eprintln!(" Resolve: {:>8.2?} ({:.0}%)", resolve_elapsed, resolve_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0); - eprintln!(" Newline: {:>8.2?} ({:.0}%)", newline_elapsed, newline_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0); - eprintln!(" Normalize: {:>8.2?} ({:.0}%)", normalize_elapsed, normalize_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0); - eprintln!(" Reconcile: {:>8.2?} ({:.0}%)", reconcile_elapsed, reconcile_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0); - eprintln!(" Complexity: {:>8.2?} ({:.0}%)", complexity_elapsed, complexity_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0); - eprintln!(" Ownership: {:>8.2?} ({:.0}%)", ownership_elapsed, ownership_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0); - eprintln!(" Emit: {:>8.2?} ({:.0}%)", emit_elapsed, emit_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0); + eprintln!( + " Tokenize: {:>8.2?} ({:.0}%)", + tokenize_elapsed, + tokenize_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0 + ); + eprintln!( + " Parse: {:>8.2?} ({:.0}%)", + parse_elapsed, + parse_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0 + ); + eprintln!( + " Resolve: {:>8.2?} ({:.0}%)", + resolve_elapsed, + resolve_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0 + ); + eprintln!( + " Newline: {:>8.2?} ({:.0}%)", + newline_elapsed, + newline_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0 + ); + eprintln!( + " Normalize: {:>8.2?} ({:.0}%)", + normalize_elapsed, + normalize_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0 + ); + eprintln!( + " Reconcile: {:>8.2?} ({:.0}%)", + reconcile_elapsed, + reconcile_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0 + ); + eprintln!( + " Complexity: {:>8.2?} ({:.0}%)", + complexity_elapsed, + complexity_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0 + ); + eprintln!( + " Ownership: {:>8.2?} ({:.0}%)", + ownership_elapsed, + ownership_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0 + ); + eprintln!( + " Emit: {:>8.2?} ({:.0}%)", + emit_elapsed, + emit_elapsed.as_secs_f64() / total.as_secs_f64() * 100.0 + ); eprintln!(" TOTAL: {:>8.2?}", total); }) .expect("failed to spawn thread") @@ -1271,7 +1590,10 @@ mod compiler_tests { let parsed = crate::v2_compiler_parse::parse_with_table( &tokens, crate::v2_rt::rc_map_insert( - crate::v2_rt::rc_empty_map::>(), + crate::v2_rt::rc_empty_map::< + String, + std::rc::Rc, + >(), si.file.clone(), si.clone(), ), @@ -1279,15 +1601,32 @@ mod compiler_tests { ); let result = parsed.result.clone(); intern_table = parsed.intern_table.clone(); - let m = result.module.clone() + let m = result + .module + .clone() .unwrap_or_else(|| panic!("parse failed for source {}", source.path)); modules.push(m); } let resolve_si = sources.iter().fold( - crate::v2_rt::rc_empty_map::>(), - |acc, s| crate::v2_rt::rc_map_insert(acc, s.path.clone(), crate::v2_std_core::build_newline_index(s.path.clone(), &s.content.clone())), + crate::v2_rt::rc_empty_map::< + String, + std::rc::Rc, + >(), + |acc, s| { + crate::v2_rt::rc_map_insert( + acc, + s.path.clone(), + crate::v2_std_core::build_newline_index( + s.path.clone(), + &s.content.clone(), + ), + ) + }, + ); + let graph = crate::v2_compiler_resolve::resolve_modules( + &std::rc::Rc::new(modules), + &resolve_si, ); - let graph = crate::v2_compiler_resolve::resolve_modules(&std::rc::Rc::new(modules), &resolve_si); let setup_time = t0.elapsed(); let rss_baseline = get_rss_bytes(); eprintln!( @@ -1438,5 +1777,4 @@ mod compiler_tests { .join(); result.expect("profile_reconcile_per_module panicked"); } - } diff --git a/src/v2/stage0/src/extdeps_languages_dag_emit.rs b/src/v2/stage0/src/extdeps_languages_dag_emit.rs index 1e1559de24c..557109d0c3b 100644 --- a/src/v2/stage0/src/extdeps_languages_dag_emit.rs +++ b/src/v2/stage0/src/extdeps_languages_dag_emit.rs @@ -1,11 +1,11 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.dag.emit -use std::collections::HashMap; -use std::rc::Rc; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn dag_keywords() -> Rc> { thread_local! { diff --git a/src/v2/stage0/src/extdeps_languages_dag_syntax.rs b/src/v2/stage0/src/extdeps_languages_dag_syntax.rs index 75f3f1b3c54..e467f1c693d 100644 --- a/src/v2/stage0/src/extdeps_languages_dag_syntax.rs +++ b/src/v2/stage0/src/extdeps_languages_dag_syntax.rs @@ -1,113 +1,121 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.dag.syntax -use std::collections::HashMap; -use std::rc::Rc; +use crate::std_syntax::BinOp::{ + Add, And, Div, Eq, Ge, Gt, Le, Lt, Mod, Mul, Ne, NullCoalesce, Or, Sub, +}; +use crate::std_syntax::BodyKind::{ + BlockBody, ExprBody, NoBody, ResourceBody, ServiceBody, TypeBody, ValueBody, +}; +use crate::std_syntax::ItemFormKind::{ + EnumForm, FuncForm, ModuleForm, OtherForm, StructForm, TypeAliasForm, +}; +use crate::std_syntax::LiteralValue::{LitBool, LitNull}; +pub use crate::std_syntax::{ + BinOp, BodyKind, ItemForm, ItemFormKind, LiteralValue, OperatorSpec, SyntaxSpec, +}; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; -pub use crate::std_syntax::{ItemForm, ItemFormKind, BodyKind, OperatorSpec, SyntaxSpec, BinOp, LiteralValue}; -use crate::std_syntax::ItemFormKind::{FuncForm, StructForm, EnumForm, TypeAliasForm, ModuleForm, OtherForm}; -use crate::std_syntax::BodyKind::{ExprBody, BlockBody, TypeBody, ValueBody, NoBody, ResourceBody, ServiceBody}; -use crate::std_syntax::BinOp::{Add, Sub, Mul, Div, Mod, Eq, Ne, Lt, Gt, Le, Ge, And, Or, NullCoalesce}; -use crate::std_syntax::LiteralValue::{LitBool, LitNull}; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn dag_item_forms() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - Rc::new(vec![Rc::new(ItemForm { - kind: ItemFormKind::TypeAliasForm, - keyword: "type".to_string(), - has_type_params: true, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::TypeBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::FuncForm, - keyword: "fn".to_string(), - has_type_params: true, - has_params: true, - has_return_type: true, - return_required: true, - has_uses: false, - body_kind: BodyKind::ExprBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::FuncForm, - keyword: "func".to_string(), - has_type_params: false, - has_params: true, - has_return_type: true, - return_required: false, - has_uses: true, - body_kind: BodyKind::BlockBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::OtherForm, - keyword: "resource".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::ResourceBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::OtherForm, - keyword: "service".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::ServiceBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::OtherForm, - keyword: "data".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::ValueBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::OtherForm, - keyword: "pattern".to_string(), - has_type_params: false, - has_params: true, - has_return_type: true, - return_required: false, - has_uses: true, - body_kind: BodyKind::BlockBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::OtherForm, - keyword: "interface".to_string(), - has_type_params: false, - has_params: true, - has_return_type: true, - return_required: false, - has_uses: false, - body_kind: BodyKind::BlockBody, -})]) - }; - } + static CACHED: Rc>> = { + Rc::new(vec![Rc::new(ItemForm { + kind: ItemFormKind::TypeAliasForm, + keyword: "type".to_string(), + has_type_params: true, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::TypeBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::FuncForm, + keyword: "fn".to_string(), + has_type_params: true, + has_params: true, + has_return_type: true, + return_required: true, + has_uses: false, + body_kind: BodyKind::ExprBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::FuncForm, + keyword: "func".to_string(), + has_type_params: false, + has_params: true, + has_return_type: true, + return_required: false, + has_uses: true, + body_kind: BodyKind::BlockBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::OtherForm, + keyword: "resource".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::ResourceBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::OtherForm, + keyword: "service".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::ServiceBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::OtherForm, + keyword: "data".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::ValueBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::OtherForm, + keyword: "pattern".to_string(), + has_type_params: false, + has_params: true, + has_return_type: true, + return_required: false, + has_uses: true, + body_kind: BodyKind::BlockBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::OtherForm, + keyword: "interface".to_string(), + has_type_params: false, + has_params: true, + has_return_type: true, + return_required: false, + has_uses: false, + body_kind: BodyKind::BlockBody, + })]) + }; + } CACHED.with(|c| c.clone()) } pub fn dag_keyword_literals() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - let mut __m = HashMap::new(); - __m.insert("true".to_string(), Rc::new(LiteralValue::LitBool { - value: true, -})); - __m.insert("false".to_string(), Rc::new(LiteralValue::LitBool { - value: false, -})); - __m.insert("none".to_string(), Rc::new(LiteralValue::LitNull)); - __m.insert("null".to_string(), Rc::new(LiteralValue::LitNull)); - Rc::new(__m) - }; - } + static CACHED: Rc>> = { + let mut __m = HashMap::new(); + __m.insert("true".to_string(), Rc::new(LiteralValue::LitBool { + value: true, + })); + __m.insert("false".to_string(), Rc::new(LiteralValue::LitBool { + value: false, + })); + __m.insert("none".to_string(), Rc::new(LiteralValue::LitNull)); + __m.insert("null".to_string(), Rc::new(LiteralValue::LitNull)); + Rc::new(__m) + }; + } CACHED.with(|c| c.clone()) } @@ -174,106 +182,106 @@ pub fn dag_non_name_keywords() -> Rc> { pub fn dag_operators() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - Rc::new(vec![Rc::new(OperatorSpec { - symbol: "||".to_string(), - left_bp: 5, - right_bp: 6, - binop: Some(BinOp::Or), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "&&".to_string(), - left_bp: 7, - right_bp: 8, - binop: Some(BinOp::And), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "??".to_string(), - left_bp: 8, - right_bp: 9, - binop: Some(BinOp::NullCoalesce), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "==".to_string(), - left_bp: 9, - right_bp: 10, - binop: Some(BinOp::Eq), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "!=".to_string(), - left_bp: 9, - right_bp: 10, - binop: Some(BinOp::Ne), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "<".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Lt), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: ">".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Gt), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "<=".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Le), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: ">=".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Ge), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "+".to_string(), - left_bp: 13, - right_bp: 14, - binop: Some(BinOp::Add), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "-".to_string(), - left_bp: 13, - right_bp: 14, - binop: Some(BinOp::Sub), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "*".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Mul), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "/".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Div), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "%".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Mod), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "|>".to_string(), - left_bp: 17, - right_bp: 18, - binop: None, - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: ".".to_string(), - left_bp: 19, - right_bp: 20, - binop: None, - algebra_field: None, -})]) - }; - } + static CACHED: Rc>> = { + Rc::new(vec![Rc::new(OperatorSpec { + symbol: "||".to_string(), + left_bp: 5, + right_bp: 6, + binop: Some(BinOp::Or), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "&&".to_string(), + left_bp: 7, + right_bp: 8, + binop: Some(BinOp::And), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "??".to_string(), + left_bp: 8, + right_bp: 9, + binop: Some(BinOp::NullCoalesce), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "==".to_string(), + left_bp: 9, + right_bp: 10, + binop: Some(BinOp::Eq), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "!=".to_string(), + left_bp: 9, + right_bp: 10, + binop: Some(BinOp::Ne), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "<".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Lt), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: ">".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Gt), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "<=".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Le), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: ">=".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Ge), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "+".to_string(), + left_bp: 13, + right_bp: 14, + binop: Some(BinOp::Add), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "-".to_string(), + left_bp: 13, + right_bp: 14, + binop: Some(BinOp::Sub), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "*".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Mul), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "/".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Div), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "%".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Mod), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "|>".to_string(), + left_bp: 17, + right_bp: 18, + binop: None, + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: ".".to_string(), + left_bp: 19, + right_bp: 20, + binop: None, + algebra_field: None, + })]) + }; + } CACHED.with(|c| c.clone()) } @@ -303,14 +311,14 @@ pub fn v3_supported_dag_operators() -> Rc> { pub fn dag_syntax_spec() -> Rc { thread_local! { - static CACHED: Rc = { - Rc::new(SyntaxSpec { - item_forms: dag_item_forms(), - operators: dag_operators(), - keyword_literals: dag_keyword_literals(), - keyword_set: dag_keyword_set(), -}) - }; - } + static CACHED: Rc = { + Rc::new(SyntaxSpec { + item_forms: dag_item_forms(), + operators: dag_operators(), + keyword_literals: dag_keyword_literals(), + keyword_set: dag_keyword_set(), + }) + }; + } CACHED.with(|c| c.clone()) } diff --git a/src/v2/stage0/src/extdeps_languages_dag_types.rs b/src/v2/stage0/src/extdeps_languages_dag_types.rs index c95c45171d0..747e7726ac8 100644 --- a/src/v2/stage0/src/extdeps_languages_dag_types.rs +++ b/src/v2/stage0/src/extdeps_languages_dag_types.rs @@ -1,12 +1,12 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.dag.types -use std::collections::HashMap; -use std::rc::Rc; +pub use crate::std_coercion::TypeCheckpoint; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; -pub use crate::std_coercion::{TypeCheckpoint}; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn dag_type_checkpoints() -> Rc>> { thread_local! { diff --git a/src/v2/stage0/src/extdeps_languages_go_emit.rs b/src/v2/stage0/src/extdeps_languages_go_emit.rs index a6ddd844b04..c6ad3e3c756 100644 --- a/src/v2/stage0/src/extdeps_languages_go_emit.rs +++ b/src/v2/stage0/src/extdeps_languages_go_emit.rs @@ -1,11 +1,11 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.go.emit -use std::collections::HashMap; -use std::rc::Rc; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn go_keywords() -> Rc> { thread_local! { diff --git a/src/v2/stage0/src/extdeps_languages_go_syntax.rs b/src/v2/stage0/src/extdeps_languages_go_syntax.rs index ea0c113871a..a488a4b3987 100644 --- a/src/v2/stage0/src/extdeps_languages_go_syntax.rs +++ b/src/v2/stage0/src/extdeps_languages_go_syntax.rs @@ -1,153 +1,157 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.go.syntax -use std::collections::HashMap; -use std::rc::Rc; +use crate::std_syntax::BinOp::{ + Add, And, Div, Eq, Ge, Gt, Le, Lt, Mod, Mul, Ne, NullCoalesce, Or, Sub, +}; +use crate::std_syntax::BodyKind::{BlockBody, NoBody, TypeBody}; +use crate::std_syntax::ItemFormKind::{ + EnumForm, FuncForm, ModuleForm, OtherForm, StructForm, TypeAliasForm, +}; +pub use crate::std_syntax::{BinOp, BodyKind, ItemForm, ItemFormKind, OperatorSpec}; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; -pub use crate::std_syntax::{ItemForm, ItemFormKind, BodyKind, OperatorSpec, BinOp}; -use crate::std_syntax::ItemFormKind::{FuncForm, StructForm, EnumForm, TypeAliasForm, ModuleForm, OtherForm}; -use crate::std_syntax::BodyKind::{BlockBody, TypeBody, NoBody}; -use crate::std_syntax::BinOp::{Add, Sub, Mul, Div, Mod, Eq, Ne, Lt, Gt, Le, Ge, And, Or, NullCoalesce}; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn go_item_forms() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - Rc::new(vec![Rc::new(ItemForm { - kind: ItemFormKind::FuncForm, - keyword: "func".to_string(), - has_type_params: false, - has_params: true, - has_return_type: true, - return_required: false, - has_uses: false, - body_kind: BodyKind::BlockBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::StructForm, - keyword: "struct".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::TypeBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::EnumForm, - keyword: "type".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::NoBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::TypeAliasForm, - keyword: "type".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::NoBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::ModuleForm, - keyword: "package".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::NoBody, -})]) - }; - } + static CACHED: Rc>> = { + Rc::new(vec![Rc::new(ItemForm { + kind: ItemFormKind::FuncForm, + keyword: "func".to_string(), + has_type_params: false, + has_params: true, + has_return_type: true, + return_required: false, + has_uses: false, + body_kind: BodyKind::BlockBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::StructForm, + keyword: "struct".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::TypeBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::EnumForm, + keyword: "type".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::NoBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::TypeAliasForm, + keyword: "type".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::NoBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::ModuleForm, + keyword: "package".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::NoBody, + })]) + }; + } CACHED.with(|c| c.clone()) } pub fn go_operators() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - Rc::new(vec![Rc::new(OperatorSpec { - symbol: "||".to_string(), - left_bp: 5, - right_bp: 6, - binop: Some(BinOp::Or), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "&&".to_string(), - left_bp: 7, - right_bp: 8, - binop: Some(BinOp::And), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "==".to_string(), - left_bp: 9, - right_bp: 10, - binop: Some(BinOp::Eq), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "!=".to_string(), - left_bp: 9, - right_bp: 10, - binop: Some(BinOp::Ne), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "<".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Lt), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: ">".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Gt), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "<=".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Le), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: ">=".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Ge), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "+".to_string(), - left_bp: 13, - right_bp: 14, - binop: Some(BinOp::Add), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "-".to_string(), - left_bp: 13, - right_bp: 14, - binop: Some(BinOp::Sub), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "*".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Mul), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "/".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Div), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "%".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Mod), - algebra_field: None, -})]) - }; - } + static CACHED: Rc>> = { + Rc::new(vec![Rc::new(OperatorSpec { + symbol: "||".to_string(), + left_bp: 5, + right_bp: 6, + binop: Some(BinOp::Or), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "&&".to_string(), + left_bp: 7, + right_bp: 8, + binop: Some(BinOp::And), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "==".to_string(), + left_bp: 9, + right_bp: 10, + binop: Some(BinOp::Eq), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "!=".to_string(), + left_bp: 9, + right_bp: 10, + binop: Some(BinOp::Ne), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "<".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Lt), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: ">".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Gt), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "<=".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Le), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: ">=".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Ge), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "+".to_string(), + left_bp: 13, + right_bp: 14, + binop: Some(BinOp::Add), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "-".to_string(), + left_bp: 13, + right_bp: 14, + binop: Some(BinOp::Sub), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "*".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Mul), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "/".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Div), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "%".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Mod), + algebra_field: None, + })]) + }; + } CACHED.with(|c| c.clone()) } diff --git a/src/v2/stage0/src/extdeps_languages_go_types.rs b/src/v2/stage0/src/extdeps_languages_go_types.rs index 71c584f3f82..f76a6e48558 100644 --- a/src/v2/stage0/src/extdeps_languages_go_types.rs +++ b/src/v2/stage0/src/extdeps_languages_go_types.rs @@ -1,12 +1,12 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.go.types -use std::collections::HashMap; -use std::rc::Rc; +pub use crate::std_coercion::{CallableRepr, CastSyntax, InhabitantDecl, TypeCheckpoint}; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; -pub use crate::std_coercion::{TypeCheckpoint, InhabitantDecl, CallableRepr, CastSyntax}; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn go_type_checkpoints() -> Rc>> { thread_local! { @@ -74,7 +74,9 @@ pub fn nil_literal() -> String { CACHED.with(|c| c.clone()) } -pub fn visibility_by_case() -> bool { true } +pub fn visibility_by_case() -> bool { + true +} pub fn embedded_field_syntax() -> String { thread_local! { diff --git a/src/v2/stage0/src/extdeps_languages_python_emit.rs b/src/v2/stage0/src/extdeps_languages_python_emit.rs index be02c40f3e0..67bdcccec21 100644 --- a/src/v2/stage0/src/extdeps_languages_python_emit.rs +++ b/src/v2/stage0/src/extdeps_languages_python_emit.rs @@ -1,11 +1,11 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.python.emit -use std::collections::HashMap; -use std::rc::Rc; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn python_keywords() -> Rc> { thread_local! { diff --git a/src/v2/stage0/src/extdeps_languages_python_syntax.rs b/src/v2/stage0/src/extdeps_languages_python_syntax.rs index f70c8c577e9..6fdeb0197c0 100644 --- a/src/v2/stage0/src/extdeps_languages_python_syntax.rs +++ b/src/v2/stage0/src/extdeps_languages_python_syntax.rs @@ -1,160 +1,166 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.python.syntax -use std::collections::HashMap; -use std::rc::Rc; +use crate::std_syntax::AlgebraFieldKind::{AlgQuotient, AlgReciprocal}; +use crate::std_syntax::BinOp::{ + Add, And, Div, Eq, Ge, Gt, Le, Lt, Mod, Mul, Ne, NullCoalesce, Or, Sub, +}; +use crate::std_syntax::BodyKind::{BlockBody, NoBody, TypeBody}; +use crate::std_syntax::ItemFormKind::{ + EnumForm, FuncForm, ModuleForm, OtherForm, StructForm, TypeAliasForm, +}; +pub use crate::std_syntax::{ + AlgebraFieldKind, BinOp, BodyKind, ItemForm, ItemFormKind, OperatorSpec, +}; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; -pub use crate::std_syntax::{ItemForm, ItemFormKind, BodyKind, OperatorSpec, BinOp, AlgebraFieldKind}; -use crate::std_syntax::ItemFormKind::{FuncForm, StructForm, EnumForm, TypeAliasForm, ModuleForm, OtherForm}; -use crate::std_syntax::BodyKind::{BlockBody, TypeBody, NoBody}; -use crate::std_syntax::BinOp::{Add, Sub, Mul, Div, Mod, Eq, Ne, Lt, Gt, Le, Ge, And, Or, NullCoalesce}; -use crate::std_syntax::AlgebraFieldKind::{AlgReciprocal, AlgQuotient}; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn python_item_forms() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - Rc::new(vec![Rc::new(ItemForm { - kind: ItemFormKind::FuncForm, - keyword: "def".to_string(), - has_type_params: false, - has_params: true, - has_return_type: true, - return_required: false, - has_uses: false, - body_kind: BodyKind::BlockBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::StructForm, - keyword: "class".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::BlockBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::EnumForm, - keyword: "class".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::BlockBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::TypeAliasForm, - keyword: "".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::NoBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::ModuleForm, - keyword: "".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::NoBody, -})]) - }; - } + static CACHED: Rc>> = { + Rc::new(vec![Rc::new(ItemForm { + kind: ItemFormKind::FuncForm, + keyword: "def".to_string(), + has_type_params: false, + has_params: true, + has_return_type: true, + return_required: false, + has_uses: false, + body_kind: BodyKind::BlockBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::StructForm, + keyword: "class".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::BlockBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::EnumForm, + keyword: "class".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::BlockBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::TypeAliasForm, + keyword: "".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::NoBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::ModuleForm, + keyword: "".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::NoBody, + })]) + }; + } CACHED.with(|c| c.clone()) } pub fn python_operators() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - Rc::new(vec![Rc::new(OperatorSpec { - symbol: "or".to_string(), - left_bp: 5, - right_bp: 6, - binop: Some(BinOp::Or), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "and".to_string(), - left_bp: 7, - right_bp: 8, - binop: Some(BinOp::And), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "==".to_string(), - left_bp: 9, - right_bp: 10, - binop: Some(BinOp::Eq), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "!=".to_string(), - left_bp: 9, - right_bp: 10, - binop: Some(BinOp::Ne), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "<".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Lt), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: ">".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Gt), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "<=".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Le), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: ">=".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Ge), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "+".to_string(), - left_bp: 13, - right_bp: 14, - binop: Some(BinOp::Add), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "-".to_string(), - left_bp: 13, - right_bp: 14, - binop: Some(BinOp::Sub), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "*".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Mul), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "/".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Div), - algebra_field: Some(AlgebraFieldKind::AlgReciprocal), -}), Rc::new(OperatorSpec { - symbol: "//".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Div), - algebra_field: Some(AlgebraFieldKind::AlgQuotient), -}), Rc::new(OperatorSpec { - symbol: "%".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Mod), - algebra_field: None, -})]) - }; - } + static CACHED: Rc>> = { + Rc::new(vec![Rc::new(OperatorSpec { + symbol: "or".to_string(), + left_bp: 5, + right_bp: 6, + binop: Some(BinOp::Or), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "and".to_string(), + left_bp: 7, + right_bp: 8, + binop: Some(BinOp::And), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "==".to_string(), + left_bp: 9, + right_bp: 10, + binop: Some(BinOp::Eq), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "!=".to_string(), + left_bp: 9, + right_bp: 10, + binop: Some(BinOp::Ne), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "<".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Lt), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: ">".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Gt), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "<=".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Le), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: ">=".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Ge), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "+".to_string(), + left_bp: 13, + right_bp: 14, + binop: Some(BinOp::Add), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "-".to_string(), + left_bp: 13, + right_bp: 14, + binop: Some(BinOp::Sub), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "*".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Mul), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "/".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Div), + algebra_field: Some(AlgebraFieldKind::AlgReciprocal), + }), Rc::new(OperatorSpec { + symbol: "//".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Div), + algebra_field: Some(AlgebraFieldKind::AlgQuotient), + }), Rc::new(OperatorSpec { + symbol: "%".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Mod), + algebra_field: None, + })]) + }; + } CACHED.with(|c| c.clone()) } diff --git a/src/v2/stage0/src/extdeps_languages_python_types.rs b/src/v2/stage0/src/extdeps_languages_python_types.rs index 3d5b6ca151f..c770af67413 100644 --- a/src/v2/stage0/src/extdeps_languages_python_types.rs +++ b/src/v2/stage0/src/extdeps_languages_python_types.rs @@ -1,13 +1,13 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.python.types -use std::collections::HashMap; -use std::rc::Rc; +use self::PythonTypeKind::*; +pub use crate::std_coercion::{CallableRepr, CastSyntax, InhabitantDecl, TypeCheckpoint}; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; -pub use crate::std_coercion::{TypeCheckpoint, InhabitantDecl, CallableRepr, CastSyntax}; -use self::PythonTypeKind::*; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn python_type_checkpoints() -> Rc>> { thread_local! { diff --git a/src/v2/stage0/src/extdeps_languages_rust_emit.rs b/src/v2/stage0/src/extdeps_languages_rust_emit.rs index 60cf5679de4..5e4c2f0bd8a 100644 --- a/src/v2/stage0/src/extdeps_languages_rust_emit.rs +++ b/src/v2/stage0/src/extdeps_languages_rust_emit.rs @@ -1,11 +1,11 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.rust.emit -use std::collections::HashMap; -use std::rc::Rc; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn rust_keywords() -> Rc> { thread_local! { @@ -59,11 +59,32 @@ pub fn rust_simple_method_specs() -> Rc>> { } pub fn rust_method_templates() -> Rc> { - rust_simple_method_specs().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, spec: Rc| v2_rt::rc_map_insert(acc, spec.method_name.clone(), spec.template.clone())) + rust_simple_method_specs().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, spec: Rc| { + v2_rt::rc_map_insert(acc, spec.method_name.clone(), spec.template.clone()) + }, + ) } pub fn rust_method_wraps_result() -> Rc> { - Rc::new({ let mut __result = Vec::new(); for s in rust_simple_method_specs().iter().cloned() { if s.wraps_result.clone() { __result.push(s); } } __result }).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, spec: Rc| v2_rt::rc_map_insert(acc, spec.method_name.clone(), true)) + Rc::new({ + let mut __result = Vec::new(); + for s in rust_simple_method_specs().iter().cloned() { + if s.wraps_result.clone() { + __result.push(s); + } + } + __result + }) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, spec: Rc| { + v2_rt::rc_map_insert(acc, spec.method_name.clone(), true) + }, + ) } pub fn rust_reserved() -> Rc> { @@ -401,7 +422,7 @@ pub struct RuntimeFunction { pub fn rt_function_registry() -> Rc>> { thread_local! { static CACHED: Rc>> = { - serde_json::from_value(serde_json::json!([{"name": "concat", "bridge_name": "concat", "passes_by_ref": false, "wraps_result": false}, {"name": "char_at", "bridge_name": "char_at", "passes_by_ref": true, "wraps_result": false}, {"name": "string_length", "bridge_name": "string_length", "passes_by_ref": true, "wraps_result": false}, {"name": "substring", "bridge_name": "substring", "passes_by_ref": true, "wraps_result": false}, {"name": "string_contains", "bridge_name": "string_contains", "passes_by_ref": true, "wraps_result": false}, {"name": "scan_while", "bridge_name": "scan_while", "passes_by_ref": true, "wraps_result": false}, {"name": "skip_horizontal_ws", "bridge_name": "skip_horizontal_ws", "passes_by_ref": true, "wraps_result": false}, {"name": "scan_to_eol", "bridge_name": "scan_to_eol", "passes_by_ref": true, "wraps_result": false}, {"name": "scan_string_end", "bridge_name": "scan_string_end", "passes_by_ref": true, "wraps_result": false}, {"name": "code_point", "bridge_name": "code_point", "passes_by_ref": false, "wraps_result": false}, {"name": "from_code_point", "bridge_name": "from_code_point", "passes_by_ref": false, "wraps_result": false}, {"name": "lookup", "bridge_name": "lookup", "passes_by_ref": true, "wraps_result": false}, {"name": "index_by", "bridge_name": "rc_index_by", "passes_by_ref": false, "wraps_result": false}, {"name": "empty_map", "bridge_name": "rc_empty_map", "passes_by_ref": false, "wraps_result": false}, {"name": "empty_set", "bridge_name": "rc_empty_set", "passes_by_ref": false, "wraps_result": false}, {"name": "set_insert", "bridge_name": "rc_set_insert", "passes_by_ref": false, "wraps_result": false}, {"name": "set_union", "bridge_name": "rc_set_union", "passes_by_ref": false, "wraps_result": false}, {"name": "set_contains", "bridge_name": "set_contains", "passes_by_ref": true, "wraps_result": false}, {"name": "map_insert", "bridge_name": "rc_map_insert", "passes_by_ref": false, "wraps_result": false}, {"name": "map_merge", "bridge_name": "rc_map_merge", "passes_by_ref": false, "wraps_result": false}, {"name": "list_concat", "bridge_name": "rc_list_concat", "passes_by_ref": false, "wraps_result": false}, {"name": "str_eq", "bridge_name": "str_eq", "passes_by_ref": false, "wraps_result": false}, {"name": "filesystem_read", "bridge_name": "filesystem_read", "passes_by_ref": false, "wraps_result": false}, {"name": "list_push", "bridge_name": "rc_list_push", "passes_by_ref": false, "wraps_result": false}, {"name": "map_get", "bridge_name": "map_get", "passes_by_ref": true, "wraps_result": false}, {"name": "map_keys", "bridge_name": "map_keys", "passes_by_ref": true, "wraps_result": true}, {"name": "map_values", "bridge_name": "map_values", "passes_by_ref": true, "wraps_result": true}, {"name": "parse_int", "bridge_name": "parse_int", "passes_by_ref": false, "wraps_result": false}, {"name": "map_contains_key", "bridge_name": "map_contains_key", "passes_by_ref": true, "wraps_result": false}, {"name": "map_has", "bridge_name": "map_has", "passes_by_ref": true, "wraps_result": false}, {"name": "reverse", "bridge_name": "reverse", "passes_by_ref": false, "wraps_result": false}, {"name": "replace", "bridge_name": "replace", "passes_by_ref": false, "wraps_result": false}, {"name": "chars_to_string", "bridge_name": "chars_to_string", "passes_by_ref": true, "wraps_result": false}, {"name": "append", "bridge_name": "append", "passes_by_ref": false, "wraps_result": true}, {"name": "contains", "bridge_name": "contains", "passes_by_ref": false, "wraps_result": false}, {"name": "count", "bridge_name": "count", "passes_by_ref": false, "wraps_result": false}, {"name": "clamp", "bridge_name": "clamp", "passes_by_ref": false, "wraps_result": false}])) + serde_json::from_value(serde_json::json!([{"name": "concat", "bridge_name": "concat", "passes_by_ref": false, "wraps_result": false}, {"name": "char_at", "bridge_name": "char_at", "passes_by_ref": true, "wraps_result": false}, {"name": "string_length", "bridge_name": "string_length", "passes_by_ref": true, "wraps_result": false}, {"name": "substring", "bridge_name": "substring", "passes_by_ref": true, "wraps_result": false}, {"name": "string_contains", "bridge_name": "string_contains", "passes_by_ref": true, "wraps_result": false}, {"name": "scan_while", "bridge_name": "scan_while", "passes_by_ref": true, "wraps_result": false}, {"name": "skip_horizontal_ws", "bridge_name": "skip_horizontal_ws", "passes_by_ref": true, "wraps_result": false}, {"name": "scan_to_eol", "bridge_name": "scan_to_eol", "passes_by_ref": true, "wraps_result": false}, {"name": "scan_string_end", "bridge_name": "scan_string_end", "passes_by_ref": true, "wraps_result": false}, {"name": "code_point", "bridge_name": "code_point", "passes_by_ref": false, "wraps_result": false}, {"name": "from_code_point", "bridge_name": "from_code_point", "passes_by_ref": false, "wraps_result": false}, {"name": "lookup", "bridge_name": "lookup", "passes_by_ref": true, "wraps_result": false}, {"name": "index_by", "bridge_name": "rc_index_by", "passes_by_ref": false, "wraps_result": false}, {"name": "empty_map", "bridge_name": "rc_empty_map", "passes_by_ref": false, "wraps_result": false}, {"name": "map_insert", "bridge_name": "rc_map_insert", "passes_by_ref": false, "wraps_result": false}, {"name": "map_merge", "bridge_name": "rc_map_merge", "passes_by_ref": false, "wraps_result": false}, {"name": "list_concat", "bridge_name": "rc_list_concat", "passes_by_ref": false, "wraps_result": false}, {"name": "str_eq", "bridge_name": "str_eq", "passes_by_ref": false, "wraps_result": false}, {"name": "filesystem_read", "bridge_name": "filesystem_read", "passes_by_ref": false, "wraps_result": false}, {"name": "list_push", "bridge_name": "rc_list_push", "passes_by_ref": false, "wraps_result": false}, {"name": "map_get", "bridge_name": "map_get", "passes_by_ref": true, "wraps_result": false}, {"name": "map_keys", "bridge_name": "map_keys", "passes_by_ref": true, "wraps_result": true}, {"name": "map_values", "bridge_name": "map_values", "passes_by_ref": true, "wraps_result": true}, {"name": "parse_int", "bridge_name": "parse_int", "passes_by_ref": false, "wraps_result": false}, {"name": "map_contains_key", "bridge_name": "map_contains_key", "passes_by_ref": true, "wraps_result": false}, {"name": "map_has", "bridge_name": "map_has", "passes_by_ref": true, "wraps_result": false}, {"name": "reverse", "bridge_name": "reverse", "passes_by_ref": false, "wraps_result": false}, {"name": "replace", "bridge_name": "replace", "passes_by_ref": false, "wraps_result": false}, {"name": "chars_to_string", "bridge_name": "chars_to_string", "passes_by_ref": true, "wraps_result": false}, {"name": "append", "bridge_name": "append", "passes_by_ref": false, "wraps_result": true}, {"name": "contains", "bridge_name": "contains", "passes_by_ref": false, "wraps_result": false}, {"name": "count", "bridge_name": "count", "passes_by_ref": false, "wraps_result": false}, {"name": "clamp", "bridge_name": "clamp", "passes_by_ref": false, "wraps_result": false}])) .expect("valid data definition") }; } @@ -409,19 +430,72 @@ pub fn rt_function_registry() -> Rc>> { } pub fn rt_functions() -> Rc> { - rt_function_registry().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, entry: Rc| v2_rt::rc_map_insert(acc, entry.name.clone(), true)) + rt_function_registry().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, entry: Rc| { + v2_rt::rc_map_insert(acc, entry.name.clone(), true) + }, + ) } pub fn rt_ref_map_functions() -> Rc> { - Rc::new({ let mut __result = Vec::new(); for f in rt_function_registry().iter().cloned() { if f.passes_by_ref.clone() { __result.push(f); } } __result }).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, entry: Rc| v2_rt::rc_map_insert(acc, entry.name.clone(), true)) + Rc::new({ + let mut __result = Vec::new(); + for f in rt_function_registry().iter().cloned() { + if f.passes_by_ref.clone() { + __result.push(f); + } + } + __result + }) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, entry: Rc| { + v2_rt::rc_map_insert(acc, entry.name.clone(), true) + }, + ) } pub fn rt_wraps_result() -> Rc> { - Rc::new({ let mut __result = Vec::new(); for f in rt_function_registry().iter().cloned() { if f.wraps_result.clone() { __result.push(f); } } __result }).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, entry: Rc| v2_rt::rc_map_insert(acc, entry.name.clone(), true)) + Rc::new({ + let mut __result = Vec::new(); + for f in rt_function_registry().iter().cloned() { + if f.wraps_result.clone() { + __result.push(f); + } + } + __result + }) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, entry: Rc| { + v2_rt::rc_map_insert(acc, entry.name.clone(), true) + }, + ) } pub fn rt_bridge_function_names() -> Rc> { - Rc::new({ let mut __result = Vec::new(); for f in rt_function_registry().iter().cloned() { if (f.name.clone().as_str() != f.bridge_name.clone().as_str()) { __result.push(f); } } __result }).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, entry: Rc| v2_rt::rc_map_insert(acc, entry.name.clone(), entry.bridge_name.clone())) + Rc::new({ + let mut __result = Vec::new(); + for f in rt_function_registry().iter().cloned() { + if (f.name.clone().as_str() != f.bridge_name.clone().as_str()) { + __result.push(f); + } + } + __result + }) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, entry: Rc| { + v2_rt::rc_map_insert(acc, entry.name.clone(), entry.bridge_name.clone()) + }, + ) } pub fn is_rt_function(name: String) -> bool { @@ -430,9 +504,9 @@ pub fn is_rt_function(name: String) -> bool { pub fn rt_bridge_name(name: String) -> String { match v2_rt::map_get(&rt_bridge_function_names(), name.clone()) { - Some(bridge) => bridge.clone(), - None => name.clone(), -} + Some(bridge) => bridge.clone(), + None => name.clone(), + } } pub fn rt_passes_by_ref(name: String) -> bool { diff --git a/src/v2/stage0/src/extdeps_languages_rust_syntax.rs b/src/v2/stage0/src/extdeps_languages_rust_syntax.rs index 7ee94af98c8..41e62fe19b4 100644 --- a/src/v2/stage0/src/extdeps_languages_rust_syntax.rs +++ b/src/v2/stage0/src/extdeps_languages_rust_syntax.rs @@ -1,120 +1,124 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.rust.syntax -use std::collections::HashMap; -use std::rc::Rc; +use crate::std_syntax::BinOp::{Add, And, Div, Eq, Ge, Gt, Le, Lt, Mod, Mul, Ne, Or, Sub}; +use crate::std_syntax::BodyKind::{BlockBody, ExprBody, NoBody, TypeBody}; +use crate::std_syntax::ItemFormKind::{ + EnumForm, FuncForm, ModuleForm, OtherForm, StructForm, TypeAliasForm, +}; +use crate::std_syntax::LiteralValue::LitBool; +pub use crate::std_syntax::{ + BinOp, BodyKind, ItemForm, ItemFormKind, LiteralValue, OperatorSpec, SyntaxSpec, +}; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; -pub use crate::std_syntax::{ItemForm, ItemFormKind, BodyKind, OperatorSpec, SyntaxSpec, BinOp, LiteralValue}; -use crate::std_syntax::ItemFormKind::{FuncForm, StructForm, EnumForm, TypeAliasForm, ModuleForm, OtherForm}; -use crate::std_syntax::BodyKind::{ExprBody, BlockBody, TypeBody, NoBody}; -use crate::std_syntax::BinOp::{Add, Sub, Mul, Div, Mod, Eq, Ne, Lt, Gt, Le, Ge, And, Or}; -use crate::std_syntax::LiteralValue::{LitBool}; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn rust_item_forms() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - Rc::new(vec![Rc::new(ItemForm { - kind: ItemFormKind::FuncForm, - keyword: "fn".to_string(), - has_type_params: true, - has_params: true, - has_return_type: true, - return_required: false, - has_uses: false, - body_kind: BodyKind::BlockBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::StructForm, - keyword: "struct".to_string(), - has_type_params: true, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::TypeBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::EnumForm, - keyword: "enum".to_string(), - has_type_params: true, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::TypeBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::TypeAliasForm, - keyword: "type".to_string(), - has_type_params: true, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::NoBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::OtherForm, - keyword: "trait".to_string(), - has_type_params: true, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::BlockBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::OtherForm, - keyword: "impl".to_string(), - has_type_params: true, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::BlockBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::OtherForm, - keyword: "const".to_string(), - has_type_params: false, - has_params: false, - has_return_type: true, - return_required: true, - has_uses: false, - body_kind: BodyKind::ExprBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::OtherForm, - keyword: "static".to_string(), - has_type_params: false, - has_params: false, - has_return_type: true, - return_required: true, - has_uses: false, - body_kind: BodyKind::ExprBody, -}), Rc::new(ItemForm { - kind: ItemFormKind::ModuleForm, - keyword: "mod".to_string(), - has_type_params: false, - has_params: false, - has_return_type: false, - return_required: false, - has_uses: false, - body_kind: BodyKind::BlockBody, -})]) - }; - } + static CACHED: Rc>> = { + Rc::new(vec![Rc::new(ItemForm { + kind: ItemFormKind::FuncForm, + keyword: "fn".to_string(), + has_type_params: true, + has_params: true, + has_return_type: true, + return_required: false, + has_uses: false, + body_kind: BodyKind::BlockBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::StructForm, + keyword: "struct".to_string(), + has_type_params: true, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::TypeBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::EnumForm, + keyword: "enum".to_string(), + has_type_params: true, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::TypeBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::TypeAliasForm, + keyword: "type".to_string(), + has_type_params: true, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::NoBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::OtherForm, + keyword: "trait".to_string(), + has_type_params: true, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::BlockBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::OtherForm, + keyword: "impl".to_string(), + has_type_params: true, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::BlockBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::OtherForm, + keyword: "const".to_string(), + has_type_params: false, + has_params: false, + has_return_type: true, + return_required: true, + has_uses: false, + body_kind: BodyKind::ExprBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::OtherForm, + keyword: "static".to_string(), + has_type_params: false, + has_params: false, + has_return_type: true, + return_required: true, + has_uses: false, + body_kind: BodyKind::ExprBody, + }), Rc::new(ItemForm { + kind: ItemFormKind::ModuleForm, + keyword: "mod".to_string(), + has_type_params: false, + has_params: false, + has_return_type: false, + return_required: false, + has_uses: false, + body_kind: BodyKind::BlockBody, + })]) + }; + } CACHED.with(|c| c.clone()) } pub fn rust_keyword_literals() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - let mut __m = HashMap::new(); - __m.insert("true".to_string(), Rc::new(LiteralValue::LitBool { - value: true, -})); - __m.insert("false".to_string(), Rc::new(LiteralValue::LitBool { - value: false, -})); - Rc::new(__m) - }; - } + static CACHED: Rc>> = { + let mut __m = HashMap::new(); + __m.insert("true".to_string(), Rc::new(LiteralValue::LitBool { + value: true, + })); + __m.insert("false".to_string(), Rc::new(LiteralValue::LitBool { + value: false, + })); + Rc::new(__m) + }; + } CACHED.with(|c| c.clone()) } @@ -167,107 +171,107 @@ pub fn rust_keyword_set() -> Rc> { pub fn rust_operators() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - Rc::new(vec![Rc::new(OperatorSpec { - symbol: "||".to_string(), - left_bp: 5, - right_bp: 6, - binop: Some(BinOp::Or), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "&&".to_string(), - left_bp: 7, - right_bp: 8, - binop: Some(BinOp::And), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "==".to_string(), - left_bp: 9, - right_bp: 10, - binop: Some(BinOp::Eq), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "!=".to_string(), - left_bp: 9, - right_bp: 10, - binop: Some(BinOp::Ne), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "<".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Lt), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: ">".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Gt), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "<=".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Le), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: ">=".to_string(), - left_bp: 11, - right_bp: 12, - binop: Some(BinOp::Ge), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "+".to_string(), - left_bp: 13, - right_bp: 14, - binop: Some(BinOp::Add), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "-".to_string(), - left_bp: 13, - right_bp: 14, - binop: Some(BinOp::Sub), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "*".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Mul), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "/".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Div), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: "%".to_string(), - left_bp: 15, - right_bp: 16, - binop: Some(BinOp::Mod), - algebra_field: None, -}), Rc::new(OperatorSpec { - symbol: ".".to_string(), - left_bp: 19, - right_bp: 20, - binop: None, - algebra_field: None, -})]) - }; - } + static CACHED: Rc>> = { + Rc::new(vec![Rc::new(OperatorSpec { + symbol: "||".to_string(), + left_bp: 5, + right_bp: 6, + binop: Some(BinOp::Or), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "&&".to_string(), + left_bp: 7, + right_bp: 8, + binop: Some(BinOp::And), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "==".to_string(), + left_bp: 9, + right_bp: 10, + binop: Some(BinOp::Eq), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "!=".to_string(), + left_bp: 9, + right_bp: 10, + binop: Some(BinOp::Ne), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "<".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Lt), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: ">".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Gt), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "<=".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Le), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: ">=".to_string(), + left_bp: 11, + right_bp: 12, + binop: Some(BinOp::Ge), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "+".to_string(), + left_bp: 13, + right_bp: 14, + binop: Some(BinOp::Add), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "-".to_string(), + left_bp: 13, + right_bp: 14, + binop: Some(BinOp::Sub), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "*".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Mul), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "/".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Div), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: "%".to_string(), + left_bp: 15, + right_bp: 16, + binop: Some(BinOp::Mod), + algebra_field: None, + }), Rc::new(OperatorSpec { + symbol: ".".to_string(), + left_bp: 19, + right_bp: 20, + binop: None, + algebra_field: None, + })]) + }; + } CACHED.with(|c| c.clone()) } pub fn rust_syntax_spec() -> Rc { thread_local! { - static CACHED: Rc = { - Rc::new(SyntaxSpec { - item_forms: rust_item_forms(), - operators: rust_operators(), - keyword_literals: rust_keyword_literals(), - keyword_set: rust_keyword_set(), -}) - }; - } + static CACHED: Rc = { + Rc::new(SyntaxSpec { + item_forms: rust_item_forms(), + operators: rust_operators(), + keyword_literals: rust_keyword_literals(), + keyword_set: rust_keyword_set(), + }) + }; + } CACHED.with(|c| c.clone()) } diff --git a/src/v2/stage0/src/extdeps_languages_rust_types.rs b/src/v2/stage0/src/extdeps_languages_rust_types.rs index ff74f611836..dfc86341d78 100644 --- a/src/v2/stage0/src/extdeps_languages_rust_types.rs +++ b/src/v2/stage0/src/extdeps_languages_rust_types.rs @@ -1,14 +1,14 @@ // Generated by v2 compiler -- do not edit. // Source module: extdeps.languages.rust.types -use std::collections::HashMap; -use std::rc::Rc; -use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::std_coercion::{TypeCheckpoint, InhabitantDecl, CallableRepr, CastSyntax, CastRule}; use self::OwnershipKind::*; use self::SmartPointerKind::*; +pub use crate::std_coercion::{CallableRepr, CastRule, CastSyntax, InhabitantDecl, TypeCheckpoint}; +use crate::v2_rt; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn rust_type_checkpoints() -> Rc>> { thread_local! { @@ -76,9 +76,13 @@ pub enum OwnershipKind { RawPtr, } -pub fn pass_copy_by_value() -> bool { true } +pub fn pass_copy_by_value() -> bool { + true +} -pub fn pass_non_copy_by_ref() -> bool { true } +pub fn pass_non_copy_by_ref() -> bool { + true +} pub fn ref_prefix() -> String { thread_local! { diff --git a/src/v2/stage0/src/generated_method_template_projection.rs b/src/v2/stage0/src/generated_method_template_projection.rs index b6f8367137c..0ec3341ea20 100644 --- a/src/v2/stage0/src/generated_method_template_projection.rs +++ b/src/v2/stage0/src/generated_method_template_projection.rs @@ -1,11 +1,11 @@ // Generated by v2 compiler -- do not edit. // Source module: generated.method_template_projection -use std::collections::HashMap; -use std::rc::Rc; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn rust_method_template_emit() -> Rc> { thread_local! { diff --git a/src/v2/stage0/src/lib.rs b/src/v2/stage0/src/lib.rs index 8b07dea78cf..8ba13372286 100644 --- a/src/v2/stage0/src/lib.rs +++ b/src/v2/stage0/src/lib.rs @@ -1,69 +1,79 @@ // Generated by v2 compiler -- do not edit. -#![allow(unused_imports, unused_variables, unused_mut, unused_parens, dead_code, unreachable_patterns, non_shorthand_field_patterns, suspicious_double_ref_op, clippy::all)] +#![allow( + unused_imports, + unused_variables, + unused_mut, + unused_parens, + dead_code, + unreachable_patterns, + non_shorthand_field_patterns, + suspicious_double_ref_op, + clippy::all +)] -pub mod std_error_primitives; -pub mod std_algebra; -pub mod std_types; +pub mod cli_run; pub mod extdeps_languages_dag_emit; -pub mod extdeps_languages_go_emit; -pub mod extdeps_languages_python_emit; -pub mod extdeps_languages_rust_emit; -pub mod generated_method_template_projection; -pub mod std_coercion; -pub mod std_http_path; -pub mod std_iteration; -pub mod std_syntax; -pub mod std_termination; -pub mod v2_compiler_runtime_rust; pub mod extdeps_languages_dag_syntax; pub mod extdeps_languages_dag_types; +pub mod extdeps_languages_go_emit; pub mod extdeps_languages_go_syntax; pub mod extdeps_languages_go_types; +pub mod extdeps_languages_python_emit; pub mod extdeps_languages_python_syntax; pub mod extdeps_languages_python_types; +pub mod extdeps_languages_rust_emit; pub mod extdeps_languages_rust_syntax; pub mod extdeps_languages_rust_types; +pub mod generated_method_template_projection; +pub mod rest_transport_facts; +pub mod std_algebra; +pub mod std_coercion; pub mod std_computation; pub mod std_effects; +pub mod std_error_primitives; pub mod std_graph; +pub mod std_http_path; pub mod std_induction; -pub mod v2_compiler_effect_derivation; +pub mod std_iteration; pub mod std_node; -pub mod v2_std_core; +pub mod std_syntax; +pub mod std_termination; +pub mod std_types; pub mod v2_compiler_artifact; -pub mod v2_compiler_infer_env; -pub mod v2_compiler_infer_types; -pub mod v2_compiler_resolve; -pub mod v2_compiler_tokenize; -pub mod v2_compiler_trace; pub mod v2_compiler_coercion; +pub mod v2_compiler_compile; +pub mod v2_compiler_compiler_tests_rust; +pub mod v2_compiler_complexity; +pub mod v2_compiler_effect_derivation; +pub mod v2_compiler_emit; +pub mod v2_compiler_emit_go; +pub mod v2_compiler_emit_python; +pub mod v2_compiler_emit_rust; +pub mod v2_compiler_infer; pub mod v2_compiler_infer_access; pub mod v2_compiler_infer_cycle; pub mod v2_compiler_infer_emit_info; +pub mod v2_compiler_infer_env; +pub mod v2_compiler_infer_items; +pub mod v2_compiler_infer_lookup; pub mod v2_compiler_infer_method; pub mod v2_compiler_infer_patterns; pub mod v2_compiler_infer_resolve; +pub mod v2_compiler_infer_service; pub mod v2_compiler_infer_sigs; +pub mod v2_compiler_infer_types; pub mod v2_compiler_languages; pub mod v2_compiler_normalize; -pub mod v2_compiler_compiler_tests_rust; -pub mod v2_compiler_infer_items; -pub mod v2_compiler_parse; -pub mod v2_compiler_infer_service; -pub mod v2_compiler_infer_lookup; -pub mod v2_compiler_infer; -pub mod v2_compiler_emit; -pub mod v2_compiler_complexity; -pub mod v2_compiler_emit_go; -pub mod v2_compiler_emit_python; pub mod v2_compiler_ownership; -pub mod v2_compiler_emit_rust; -pub mod v2_compiler_compile; -pub mod v2_rt; +pub mod v2_compiler_parse; +pub mod v2_compiler_resolve; +pub mod v2_compiler_runtime_rust; +pub mod v2_compiler_tokenize; +pub mod v2_compiler_trace; pub mod v2_interpreter; -pub mod cli_run; -pub mod rest_transport_facts; +pub mod v2_rt; +pub mod v2_std_core; #[derive(Debug, Clone, PartialEq)] pub struct NonEmptyVec(Vec); diff --git a/src/v2/stage0/src/main.rs b/src/v2/stage0/src/main.rs index ec899eedd43..229429e5f0d 100644 --- a/src/v2/stage0/src/main.rs +++ b/src/v2/stage0/src/main.rs @@ -6,15 +6,14 @@ use clap::{Parser, Subcommand}; use std::collections::HashMap; use std::rc::Rc; +use v2_compiler::cli_run; +use v2_compiler::v2_compiler_artifact; use v2_compiler::v2_compiler_compile; use v2_compiler::v2_compiler_compile::PipelineResult; -use v2_compiler::v2_compiler_artifact; use v2_compiler::v2_std_core::{ - diagnostic_to_message, diagnostic_to_span, - byte_to_line_col, source_line_at, NewlineIndex, - CompilerDiagnostic, + byte_to_line_col, diagnostic_to_message, diagnostic_to_span, source_line_at, + CompilerDiagnostic, NewlineIndex, }; -use v2_compiler::cli_run; #[derive(Parser)] #[command(name = "v2-compiled", about = "Generated CLI from DAG compiler")] @@ -43,7 +42,7 @@ enum Commands { #[arg(long, default_value = "rust")] target: String, }, -/// Execute a .dag program directly (interpreter) + /// Execute a .dag program directly (interpreter) Run { /// Source root directories (searched recursively for .dag files) #[arg(long = "source-root")] @@ -118,8 +117,10 @@ fn build_module_index(source_roots: &[String]) -> HashMap { + let _result = match cli.command { + Commands::Compile { + source_roots, + source_dir, + output_dir, + target, + } => { let render_target = match target.as_str() { "rust" => v2_compiler_artifact::RenderTarget::Rust, "python" => v2_compiler_artifact::RenderTarget::Python, "go" => v2_compiler_artifact::RenderTarget::Go, "dag" => v2_compiler_artifact::RenderTarget::Dag, other => { - eprintln!("unknown target: {}. supported: rust, python, go, dag", other); + eprintln!( + "unknown target: {}. supported: rust, python, go, dag", + other + ); std::process::exit(1); } }; @@ -183,7 +195,11 @@ let _result = match cli.command { let sources = if !source_roots.is_empty() { // FF-9: Import-driven resolution from source roots let index = build_module_index(&source_roots); - eprintln!("indexed {} modules from {} source roots", index.len(), source_roots.len()); + eprintln!( + "indexed {} modules from {} source roots", + index.len(), + source_roots.len() + ); // Entry modules: all .dag files in the FIRST source root. // Additional roots are dependency pools resolved via imports. @@ -221,9 +237,11 @@ let _result = match cli.command { resolved.push(Rc::new(v2_compiler_compile::SourceFile { path, content })); } } - eprintln!("resolved {} sources (transitive import closure)", resolved.len()); + eprintln!( + "resolved {} sources (transitive import closure)", + resolved.len() + ); resolved - } else if let Some(dir) = source_dir { // Legacy: flat directory scan (backward compatibility) let mut dag_paths = Vec::new(); @@ -238,9 +256,13 @@ let _result = match cli.command { content, })); } - eprintln!("compiling {} .dag files from {} (target: {})", sources.len(), dir, target); + eprintln!( + "compiling {} .dag files from {} (target: {})", + sources.len(), + dir, + target + ); sources - } else { eprintln!("error: provide --source-root or --source-dir"); std::process::exit(1); @@ -258,12 +280,18 @@ let _result = match cli.command { std::fs::write(&out_path, &*file.content) .unwrap_or_else(|e| panic!("failed to write {}: {}", file.path, e)); } - eprintln!("compiled: {} files emitted, {} diagnostics", - result.files.len(), result.diagnostics.len()); + eprintln!( + "compiled: {} files emitted, {} diagnostics", + result.files.len(), + result.diagnostics.len() + ); render_diagnostics(&result); // Complexity violations are non-blocking (analyzer limitations). let hard_errors = result.diagnostics.iter().any(|d| { - !matches!(*d.diagnostic.clone(), CompilerDiagnostic::ComplexityUnknown { .. }) + !matches!( + *d.diagnostic.clone(), + CompilerDiagnostic::ComplexityUnknown { .. } + ) }); if hard_errors { std::process::exit(1); @@ -272,11 +300,14 @@ let _result = match cli.command { eprintln!("error: no files emitted"); std::process::exit(1); } - }, + } - Commands::Run { source_roots, function } => { + Commands::Run { + source_roots, + function, + } => { cli_run::handle_run(source_roots, function); - }, + } }; } @@ -342,7 +373,10 @@ fn render_one_diagnostic( indent, " ".repeat(gutter_width), " ".repeat(col_offset), - "^".repeat(std::cmp::min(span_len, line_text.len().saturating_sub(col_offset))) + "^".repeat(std::cmp::min( + span_len, + line_text.len().saturating_sub(col_offset) + )) ); } } diff --git a/src/v2/stage0/src/std_algebra.rs b/src/v2/stage0/src/std_algebra.rs index 56137791ad0..81e3f747a1b 100644 --- a/src/v2/stage0/src/std_algebra.rs +++ b/src/v2/stage0/src/std_algebra.rs @@ -1,20 +1,20 @@ // Generated by v2 compiler -- do not edit. // Source module: std.algebra -use std::collections::HashMap; -use std::rc::Rc; -use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::std_error_primitives::{DivError, Result}; -use crate::std_error_primitives::DivError::*; -use crate::std_error_primitives::Result::*; -use self::Ordering::*; use self::AlgebraProfile::*; -use self::ContainerSource::*; use self::AlgebraTypeTemplate::*; use self::CollectionSizeEffect::*; +use self::ContainerSource::*; use self::CostShape::*; +use self::Ordering::*; +use crate::std_error_primitives::DivError::*; +use crate::std_error_primitives::Result::*; +pub use crate::std_error_primitives::{DivError, Result}; +use crate::v2_rt; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Clone)] pub struct Magma { @@ -52,10 +52,6 @@ pub struct AbelianGroup { pub inverse: Rc T>, } - - - - #[derive(Clone)] pub struct Semiring { pub add: Rc T>, @@ -196,9 +192,7 @@ pub enum AlgebraProfile { #[serde(tag = "_variant")] pub enum ContainerSource { SameAsReceiver, - Named { - name: String, - }, + Named { name: String }, } impl ContainerSource { pub fn name(&self) -> String { @@ -284,870 +278,1127 @@ pub fn kernel_algebra_profile() -> Rc> { } pub fn ordered_ring_templates() -> Rc>> { - Rc::new(vec![Rc::new(AlgebraFieldTemplate { - name: "add".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "zero".to_string(), - param_types: Rc::new(vec![]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "negate".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "mul".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "one".to_string(), - param_types: Rc::new(vec![]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "compare".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Ordering".to_string(), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "clamp".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: Some(CostShape::ShapeConstant), - callback_element_position: None, -})]) + Rc::new(vec![ + Rc::new(AlgebraFieldTemplate { + name: "add".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "zero".to_string(), + param_types: Rc::new(vec![]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "negate".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "mul".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "one".to_string(), + param_types: Rc::new(vec![]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "compare".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + ]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Ordering".to_string(), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "clamp".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: Some(CostShape::ShapeConstant), + callback_element_position: None, + }), + ]) } pub fn approximate_field_templates() -> Rc>> { - Rc::new(vec![Rc::new(AlgebraFieldTemplate { - name: "add".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "zero".to_string(), - param_types: Rc::new(vec![]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "negate".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "mul".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "one".to_string(), - param_types: Rc::new(vec![]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "reciprocal".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "compare".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Ordering".to_string(), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -})]) + Rc::new(vec![ + Rc::new(AlgebraFieldTemplate { + name: "add".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "zero".to_string(), + param_types: Rc::new(vec![]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "negate".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "mul".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "one".to_string(), + param_types: Rc::new(vec![]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "reciprocal".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "compare".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + ]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Ordering".to_string(), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + ]) } pub fn boolean_algebra_templates() -> Rc>> { - Rc::new(vec![Rc::new(AlgebraFieldTemplate { - name: "meet".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "join".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "complement".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "top".to_string(), - param_types: Rc::new(vec![]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "bottom".to_string(), - param_types: Rc::new(vec![]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -})]) + Rc::new(vec![ + Rc::new(AlgebraFieldTemplate { + name: "meet".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "join".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "complement".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "top".to_string(), + param_types: Rc::new(vec![]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "bottom".to_string(), + param_types: Rc::new(vec![]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + ]) } pub fn boolean_algebra_collection_templates() -> Rc>> { - Rc::new(vec![Rc::new(AlgebraFieldTemplate { - name: "union".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "intersect".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "diff".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "member".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "contains".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "filter".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), -})]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: Some(CollectionSizeEffect::IdentityEffect), - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(0), -}), Rc::new(AlgebraFieldTemplate { - name: "map".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "MappedElement".to_string(), -}), -})]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::SameAsReceiver), - element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "MappedElement".to_string(), -}), -}), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(0), -}), Rc::new(AlgebraFieldTemplate { - name: "flat_map".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::SameAsReceiver), - element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "MappedElement".to_string(), -}), -}), -})]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::SameAsReceiver), - element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "MappedElement".to_string(), -}), -}), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(0), -}), Rc::new(AlgebraFieldTemplate { - name: "fold".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "FoldAccumulator".to_string(), -}), Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "FoldAccumulator".to_string(), -}), Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "FoldAccumulator".to_string(), -}), -})]), - return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "FoldAccumulator".to_string(), -}), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(1), -}), Rc::new(AlgebraFieldTemplate { - name: "any".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), -})]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(0), -}), Rc::new(AlgebraFieldTemplate { - name: "all".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), -})]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(0), -}), Rc::new(AlgebraFieldTemplate { - name: "count".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), -}), - size_effect: None, - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "length".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), -}), - size_effect: None, - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, -})]) + Rc::new(vec![ + Rc::new(AlgebraFieldTemplate { + name: "union".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "intersect".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "diff".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "member".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverElement), + ]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "contains".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverElement), + ]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "filter".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + }), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: Some(CollectionSizeEffect::IdentityEffect), + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(0), + }), + Rc::new(AlgebraFieldTemplate { + name: "map".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "MappedElement".to_string(), + }), + }), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::SameAsReceiver), + element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "MappedElement".to_string(), + }), + }), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(0), + }), + Rc::new(AlgebraFieldTemplate { + name: "flat_map".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::SameAsReceiver), + element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "MappedElement".to_string(), + }), + }), + }), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::SameAsReceiver), + element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "MappedElement".to_string(), + }), + }), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(0), + }), + Rc::new(AlgebraFieldTemplate { + name: "fold".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "FoldAccumulator".to_string(), + }), + Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "FoldAccumulator".to_string(), + }), + Rc::new(AlgebraTypeTemplate::ReceiverElement), + ]), + return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "FoldAccumulator".to_string(), + }), + }), + ]), + return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "FoldAccumulator".to_string(), + }), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(1), + }), + Rc::new(AlgebraFieldTemplate { + name: "any".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + }), + ]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(0), + }), + Rc::new(AlgebraFieldTemplate { + name: "all".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + }), + ]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(0), + }), + Rc::new(AlgebraFieldTemplate { + name: "count".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), + }), + size_effect: None, + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "length".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), + }), + size_effect: None, + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, + }), + ]) } pub fn free_monoid_scalar_templates() -> Rc>> { - Rc::new(vec![Rc::new(AlgebraFieldTemplate { - name: "concat".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "empty".to_string(), - param_types: Rc::new(vec![]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "length".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "is_empty".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "chars".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::Named { - name: "List".to_string(), -}), - element: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), -}), -}), - size_effect: None, - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "split".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::Named { - name: "List".to_string(), -}), - element: Rc::new(AlgebraTypeTemplate::ReceiverSelf), -}), - size_effect: None, - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "join".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::Named { - name: "List".to_string(), -}), - element: Rc::new(AlgebraTypeTemplate::ReceiverSelf), -}), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "contains".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "starts_with".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "ends_with".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "trim".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "to_lower".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "to_upper".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "replace".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "substring".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), -}), Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), -})]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "to_int".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "to_string".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "reverse".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -})]) + Rc::new(vec![ + Rc::new(AlgebraFieldTemplate { + name: "concat".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "empty".to_string(), + param_types: Rc::new(vec![]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "length".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "is_empty".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "chars".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::Named { + name: "List".to_string(), + }), + element: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), + }), + }), + size_effect: None, + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "split".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::Named { + name: "List".to_string(), + }), + element: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + }), + size_effect: None, + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "join".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::Named { + name: "List".to_string(), + }), + element: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + }), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "contains".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + ]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "starts_with".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + ]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "ends_with".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + ]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "trim".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "to_lower".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "to_upper".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "replace".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "substring".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), + }), + Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), + }), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "to_int".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "to_string".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "reverse".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + ]) } pub fn free_monoid_collection_templates() -> Rc>> { - Rc::new(vec![Rc::new(AlgebraFieldTemplate { - name: "map".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "MappedElement".to_string(), -}), -})]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::SameAsReceiver), - element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "MappedElement".to_string(), -}), -}), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(0), -}), Rc::new(AlgebraFieldTemplate { - name: "filter".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), -})]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: Some(CollectionSizeEffect::IdentityEffect), - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(0), -}), Rc::new(AlgebraFieldTemplate { - name: "flat_map".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::SameAsReceiver), - element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "MappedElement".to_string(), -}), -}), -})]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::SameAsReceiver), - element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "MappedElement".to_string(), -}), -}), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(0), -}), Rc::new(AlgebraFieldTemplate { - name: "fold".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "FoldAccumulator".to_string(), -}), Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "FoldAccumulator".to_string(), -}), Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "FoldAccumulator".to_string(), -}), -})]), - return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { - id: "FoldAccumulator".to_string(), -}), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(1), -}), Rc::new(AlgebraFieldTemplate { - name: "any".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), -})]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(0), -}), Rc::new(AlgebraFieldTemplate { - name: "all".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::CallableOf { - params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), -})]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: Some(0), -}), Rc::new(AlgebraFieldTemplate { - name: "count".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), -}), - size_effect: None, - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "first".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::OptionalOf { - inner: Rc::new(AlgebraTypeTemplate::ReceiverElement), -}), - size_effect: Some(CollectionSizeEffect::ProjectionEffect), - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "last".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::OptionalOf { - inner: Rc::new(AlgebraTypeTemplate::ReceiverElement), -}), - size_effect: Some(CollectionSizeEffect::ProjectionEffect), - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "skip".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), -})]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: Some(CollectionSizeEffect::ShrinkEffect), - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "take".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), -})]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "sort_by".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: Some(CollectionSizeEffect::IdentityEffect), - cost_shape: Some(CostShape::ShapeSortBody), - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "append".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: Some(CostShape::ShapeConstant), - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "contains".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "enumerate".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::SameAsReceiver), - element: Rc::new(AlgebraTypeTemplate::TupleOf { - first: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), -}), - second: Rc::new(AlgebraTypeTemplate::ReceiverElement), -}), -}), - size_effect: Some(CollectionSizeEffect::IdentityEffect), - cost_shape: Some(CostShape::ShapeIterateBody), - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "reverse".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: Some(CollectionSizeEffect::IdentityEffect), - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "join".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "String".to_string(), -})]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "String".to_string(), -}), - size_effect: None, - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "concat".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "list_push".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverElement)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "length".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), -}), - size_effect: None, - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "is_empty".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), - size_effect: None, - cost_shape: Some(CostShape::ShapeLinearScan), - callback_element_position: None, -})]) + Rc::new(vec![ + Rc::new(AlgebraFieldTemplate { + name: "map".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "MappedElement".to_string(), + }), + }), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::SameAsReceiver), + element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "MappedElement".to_string(), + }), + }), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(0), + }), + Rc::new(AlgebraFieldTemplate { + name: "filter".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + }), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: Some(CollectionSizeEffect::IdentityEffect), + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(0), + }), + Rc::new(AlgebraFieldTemplate { + name: "flat_map".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::SameAsReceiver), + element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "MappedElement".to_string(), + }), + }), + }), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::SameAsReceiver), + element: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "MappedElement".to_string(), + }), + }), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(0), + }), + Rc::new(AlgebraFieldTemplate { + name: "fold".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "FoldAccumulator".to_string(), + }), + Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "FoldAccumulator".to_string(), + }), + Rc::new(AlgebraTypeTemplate::ReceiverElement), + ]), + return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "FoldAccumulator".to_string(), + }), + }), + ]), + return_type: Rc::new(AlgebraTypeTemplate::AlgebraTypeVariable { + id: "FoldAccumulator".to_string(), + }), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(1), + }), + Rc::new(AlgebraFieldTemplate { + name: "any".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + }), + ]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(0), + }), + Rc::new(AlgebraFieldTemplate { + name: "all".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::CallableOf { + params: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverElement)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + }), + ]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: Some(0), + }), + Rc::new(AlgebraFieldTemplate { + name: "count".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), + }), + size_effect: None, + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "first".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::OptionalOf { + inner: Rc::new(AlgebraTypeTemplate::ReceiverElement), + }), + size_effect: Some(CollectionSizeEffect::ProjectionEffect), + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "last".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::OptionalOf { + inner: Rc::new(AlgebraTypeTemplate::ReceiverElement), + }), + size_effect: Some(CollectionSizeEffect::ProjectionEffect), + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "skip".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), + }), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: Some(CollectionSizeEffect::ShrinkEffect), + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "take".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), + }), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "sort_by".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: Some(CollectionSizeEffect::IdentityEffect), + cost_shape: Some(CostShape::ShapeSortBody), + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "append".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverElement), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: Some(CostShape::ShapeConstant), + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "contains".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverElement), + ]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "enumerate".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::SameAsReceiver), + element: Rc::new(AlgebraTypeTemplate::TupleOf { + first: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), + }), + second: Rc::new(AlgebraTypeTemplate::ReceiverElement), + }), + }), + size_effect: Some(CollectionSizeEffect::IdentityEffect), + cost_shape: Some(CostShape::ShapeIterateBody), + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "reverse".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: Some(CollectionSizeEffect::IdentityEffect), + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "join".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "String".to_string(), + }), + ]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "String".to_string(), + }), + size_effect: None, + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "concat".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "list_push".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverElement), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "length".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), + }), + size_effect: None, + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "is_empty".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + size_effect: None, + cost_shape: Some(CostShape::ShapeLinearScan), + callback_element_position: None, + }), + ]) } pub fn partial_function_templates() -> Rc>> { - Rc::new(vec![Rc::new(AlgebraFieldTemplate { - name: "get".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverKey)]), - return_type: Rc::new(AlgebraTypeTemplate::OptionalOf { - inner: Rc::new(AlgebraTypeTemplate::ReceiverValue), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "map_get".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverKey)]), - return_type: Rc::new(AlgebraTypeTemplate::OptionalOf { - inner: Rc::new(AlgebraTypeTemplate::ReceiverValue), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "lookup".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverKey)]), - return_type: Rc::new(AlgebraTypeTemplate::OptionalOf { - inner: Rc::new(AlgebraTypeTemplate::ReceiverValue), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "map_insert".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverKey), Rc::new(AlgebraTypeTemplate::ReceiverValue)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "map_merge".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "has".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverKey)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "map_has".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverKey)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "map_contains_key".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverKey)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "keys".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::Named { - name: "List".to_string(), -}), - element: Rc::new(AlgebraTypeTemplate::ReceiverKey), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "map_keys".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::Named { - name: "List".to_string(), -}), - element: Rc::new(AlgebraTypeTemplate::ReceiverKey), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "values".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::Named { - name: "List".to_string(), -}), - element: Rc::new(AlgebraTypeTemplate::ReceiverValue), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "map_values".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { - source: Rc::new(ContainerSource::Named { - name: "List".to_string(), -}), - element: Rc::new(AlgebraTypeTemplate::ReceiverValue), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "with".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverKey), Rc::new(AlgebraTypeTemplate::ReceiverValue)]), - return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "contains".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf), Rc::new(AlgebraTypeTemplate::ReceiverKey)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Bool".to_string(), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -}), Rc::new(AlgebraFieldTemplate { - name: "length".to_string(), - param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), - return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { - name: "Int".to_string(), -}), - size_effect: None, - cost_shape: None, - callback_element_position: None, -})]) + Rc::new(vec![ + Rc::new(AlgebraFieldTemplate { + name: "get".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverKey), + ]), + return_type: Rc::new(AlgebraTypeTemplate::OptionalOf { + inner: Rc::new(AlgebraTypeTemplate::ReceiverValue), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "map_get".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverKey), + ]), + return_type: Rc::new(AlgebraTypeTemplate::OptionalOf { + inner: Rc::new(AlgebraTypeTemplate::ReceiverValue), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "lookup".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverKey), + ]), + return_type: Rc::new(AlgebraTypeTemplate::OptionalOf { + inner: Rc::new(AlgebraTypeTemplate::ReceiverValue), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "map_insert".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverKey), + Rc::new(AlgebraTypeTemplate::ReceiverValue), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "map_merge".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "has".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverKey), + ]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "map_has".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverKey), + ]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "map_contains_key".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverKey), + ]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "keys".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::Named { + name: "List".to_string(), + }), + element: Rc::new(AlgebraTypeTemplate::ReceiverKey), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "map_keys".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::Named { + name: "List".to_string(), + }), + element: Rc::new(AlgebraTypeTemplate::ReceiverKey), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "values".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::Named { + name: "List".to_string(), + }), + element: Rc::new(AlgebraTypeTemplate::ReceiverValue), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "map_values".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::ContainerOf { + source: Rc::new(ContainerSource::Named { + name: "List".to_string(), + }), + element: Rc::new(AlgebraTypeTemplate::ReceiverValue), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "with".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverKey), + Rc::new(AlgebraTypeTemplate::ReceiverValue), + ]), + return_type: Rc::new(AlgebraTypeTemplate::ReceiverSelf), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "contains".to_string(), + param_types: Rc::new(vec![ + Rc::new(AlgebraTypeTemplate::ReceiverSelf), + Rc::new(AlgebraTypeTemplate::ReceiverKey), + ]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Bool".to_string(), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + Rc::new(AlgebraFieldTemplate { + name: "length".to_string(), + param_types: Rc::new(vec![Rc::new(AlgebraTypeTemplate::ReceiverSelf)]), + return_type: Rc::new(AlgebraTypeTemplate::NamedTemplate { + name: "Int".to_string(), + }), + size_effect: None, + cost_shape: None, + callback_element_position: None, + }), + ]) } pub fn algebra_templates_for_profile(profile: AlgebraProfile) -> Rc>> { match profile { - AlgebraProfile::OrderedRingProfile => ordered_ring_templates(), - AlgebraProfile::ApproximateFieldProfile => approximate_field_templates(), - AlgebraProfile::BooleanAlgebraProfile => boolean_algebra_templates(), - AlgebraProfile::BooleanAlgebraCollectionProfile => boolean_algebra_collection_templates(), - AlgebraProfile::FreeMonoidScalarProfile => free_monoid_scalar_templates(), - AlgebraProfile::FreeMonoidCollectionProfile => free_monoid_collection_templates(), - AlgebraProfile::PartialFunctionProfile => partial_function_templates(), -} + AlgebraProfile::OrderedRingProfile => ordered_ring_templates(), + AlgebraProfile::ApproximateFieldProfile => approximate_field_templates(), + AlgebraProfile::BooleanAlgebraProfile => boolean_algebra_templates(), + AlgebraProfile::BooleanAlgebraCollectionProfile => boolean_algebra_collection_templates(), + AlgebraProfile::FreeMonoidScalarProfile => free_monoid_scalar_templates(), + AlgebraProfile::FreeMonoidCollectionProfile => free_monoid_collection_templates(), + AlgebraProfile::PartialFunctionProfile => partial_function_templates(), + } } pub fn algebra_type_param_names(profile: AlgebraProfile) -> Rc> { match profile { - AlgebraProfile::OrderedRingProfile => Rc::new(vec![]), - AlgebraProfile::ApproximateFieldProfile => Rc::new(vec![]), - AlgebraProfile::BooleanAlgebraProfile => Rc::new(vec![]), - AlgebraProfile::BooleanAlgebraCollectionProfile => Rc::new(vec!["T".to_string()]), - AlgebraProfile::FreeMonoidScalarProfile => Rc::new(vec![]), - AlgebraProfile::FreeMonoidCollectionProfile => Rc::new(vec!["T".to_string()]), - AlgebraProfile::PartialFunctionProfile => Rc::new(vec!["K".to_string(), "V".to_string()]), -} + AlgebraProfile::OrderedRingProfile => Rc::new(vec![]), + AlgebraProfile::ApproximateFieldProfile => Rc::new(vec![]), + AlgebraProfile::BooleanAlgebraProfile => Rc::new(vec![]), + AlgebraProfile::BooleanAlgebraCollectionProfile => Rc::new(vec!["T".to_string()]), + AlgebraProfile::FreeMonoidScalarProfile => Rc::new(vec![]), + AlgebraProfile::FreeMonoidCollectionProfile => Rc::new(vec!["T".to_string()]), + AlgebraProfile::PartialFunctionProfile => Rc::new(vec!["K".to_string(), "V".to_string()]), + } } diff --git a/src/v2/stage0/src/std_coercion.rs b/src/v2/stage0/src/std_coercion.rs index 37e8e60fe56..84ed2736a2a 100644 --- a/src/v2/stage0/src/std_coercion.rs +++ b/src/v2/stage0/src/std_coercion.rs @@ -1,11 +1,11 @@ // Generated by v2 compiler -- do not edit. // Source module: std.coercion -use std::collections::HashMap; -use std::rc::Rc; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct TypeCheckpoint { @@ -57,9 +57,31 @@ pub fn dag_cast_rules() -> Rc>> { } pub fn dag_can_cast(source_type: String, target_type: String) -> bool { - { let mut __found = false; for r in dag_cast_rules().iter().cloned() { if ((r.from_type.clone().as_str() == source_type.clone().as_str()) && (r.to_type.clone().as_str() == target_type.clone().as_str())) { __found = true; break; } } __found } + { + let mut __found = false; + for r in dag_cast_rules().iter().cloned() { + if ((r.from_type.clone().as_str() == source_type.clone().as_str()) + && (r.to_type.clone().as_str() == target_type.clone().as_str())) + { + __found = true; + break; + } + } + __found + } } pub fn is_dag_cast_domain_type(name: String) -> bool { - { let mut __found = false; for r in dag_cast_rules().iter().cloned() { if ((r.from_type.clone().as_str() == name.clone().as_str()) || (r.to_type.clone().as_str() == name.clone().as_str())) { __found = true; break; } } __found } + { + let mut __found = false; + for r in dag_cast_rules().iter().cloned() { + if ((r.from_type.clone().as_str() == name.clone().as_str()) + || (r.to_type.clone().as_str() == name.clone().as_str())) + { + __found = true; + break; + } + } + __found + } } diff --git a/src/v2/stage0/src/std_computation.rs b/src/v2/stage0/src/std_computation.rs index bf35aa694af..73550cefcca 100644 --- a/src/v2/stage0/src/std_computation.rs +++ b/src/v2/stage0/src/std_computation.rs @@ -1,53 +1,46 @@ // Generated by v2 compiler -- do not edit. // Source module: std.computation -use std::collections::HashMap; -use std::rc::Rc; -use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::std_termination::{DescentEvidence, RankingDimension, PositiveDescentAmount, ProportionalDivisor, positive_descent_count}; -use crate::std_termination::DescentEvidence::{DescentUnknown}; -use crate::std_termination::PositiveDescentAmount::{OneStep, AdditionalStep}; -use crate::std_termination::ProportionalDivisor::{DivideByTwo, StrictlyLarger}; -use crate::std_termination::RankingDimension::*; -pub use crate::std_algebra::{AlgebraProfile, kernel_algebra_profile}; -use crate::std_algebra::AlgebraProfile::{OrderedRingProfile, ApproximateFieldProfile, BooleanAlgebraProfile, BooleanAlgebraCollectionProfile, FreeMonoidScalarProfile, FreeMonoidCollectionProfile, PartialFunctionProfile}; -use self::SizeBound::*; use self::CallPattern::*; -use self::ShrinkFactor::*; -use self::IterationPrimitive::*; use self::IterationDimension::*; +use self::IterationPrimitive::*; +use self::ShrinkFactor::*; +use self::SizeBound::*; +use crate::std_algebra::AlgebraProfile::{ + ApproximateFieldProfile, BooleanAlgebraCollectionProfile, BooleanAlgebraProfile, + FreeMonoidCollectionProfile, FreeMonoidScalarProfile, OrderedRingProfile, + PartialFunctionProfile, +}; +pub use crate::std_algebra::{kernel_algebra_profile, AlgebraProfile}; +use crate::std_termination::DescentEvidence::DescentUnknown; +use crate::std_termination::PositiveDescentAmount::{AdditionalStep, OneStep}; +use crate::std_termination::ProportionalDivisor::{DivideByTwo, StrictlyLarger}; +use crate::std_termination::RankingDimension::*; +pub use crate::std_termination::{ + positive_descent_count, DescentEvidence, PositiveDescentAmount, ProportionalDivisor, + RankingDimension, +}; +use crate::v2_rt; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum SizeBound { - CollectionSize { - param: String, - }, - ParserStreamSize { - witness: String, - }, - WorklistDrainSize { - element: String, - }, - TreeSize { - param: String, - }, - ArithmeticParam { - param: String, - }, + CollectionSize { param: String }, + ParserStreamSize { witness: String }, + WorklistDrainSize { element: String }, + TreeSize { param: String }, + ArithmeticParam { param: String }, ExplicitCountZero, - ExplicitCountPositive { - steps: Rc, - }, + ExplicitCountPositive { steps: Rc }, Forever, } pub fn tree_size_bound(param: String) -> Rc { - Rc::new(SizeBound::TreeSize { - param: param, -}) + Rc::new(SizeBound::TreeSize { param: param }) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -84,12 +77,8 @@ pub enum CallPattern { #[serde(tag = "_variant")] pub enum ShrinkFactor { UnitShrink, - ConstantShrink { - steps: Rc, - }, - ProportionalShrink { - divisor: Rc, - }, + ConstantShrink { steps: Rc }, + ProportionalShrink { divisor: Rc }, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -110,97 +99,94 @@ pub enum IterationPrimitive { pub fn lower_call_pattern(pattern: Rc) -> Rc { match (*pattern).clone() { - CallPattern::ChildAccessorCall { accessor: a, .. } => Rc::new(LoweringTarget { - primitive: IterationPrimitive::Descend, - bound: Rc::new(SizeBound::TreeSize { - param: a.clone(), -}), - evidence: DescentEvidence::Strict, - factor: None, -}), - CallPattern::CollectionShrinkCall { amount: p, collection: c, .. } => Rc::new(LoweringTarget { - primitive: IterationPrimitive::Fold, - bound: Rc::new(SizeBound::CollectionSize { - param: c.clone(), -}), - evidence: DescentEvidence::Strict, - factor: Some(Rc::new(ShrinkFactor::ConstantShrink { - steps: p.clone(), -})), -}), - CallPattern::ArithmeticSubtractCall { steps: p, ring_param: r, .. } => Rc::new(LoweringTarget { - primitive: IterationPrimitive::Repeat, - bound: Rc::new(SizeBound::ArithmeticParam { - param: r.clone(), -}), - evidence: DescentEvidence::Strict, - factor: Some(Rc::new(ShrinkFactor::ConstantShrink { - steps: p.clone(), -})), -}), - CallPattern::ArithmeticDivideCall { divisor: d, ring_param: r, .. } => Rc::new(LoweringTarget { - primitive: IterationPrimitive::Repeat, - bound: Rc::new(SizeBound::ArithmeticParam { - param: r.clone(), -}), - evidence: DescentEvidence::Strict, - factor: Some(Rc::new(ShrinkFactor::ProportionalShrink { - divisor: d.clone(), -})), -}), - CallPattern::ParserAdvanceCall { witness: w, .. } => Rc::new(LoweringTarget { - primitive: IterationPrimitive::Fold, - bound: Rc::new(SizeBound::ParserStreamSize { - witness: w.clone(), -}), - evidence: DescentEvidence::Strict, - factor: None, -}), - CallPattern::WorklistDrainCall { element: e, .. } => Rc::new(LoweringTarget { - primitive: IterationPrimitive::Fold, - bound: Rc::new(SizeBound::WorklistDrainSize { - element: e.clone(), -}), - evidence: DescentEvidence::Strict, - factor: None, -}), - CallPattern::FoldBodyCall { outer_collection: oc, .. } => Rc::new(LoweringTarget { - primitive: IterationPrimitive::Fold, - bound: Rc::new(SizeBound::CollectionSize { - param: oc.clone(), -}), - evidence: DescentEvidence::NonIncreasing, - factor: None, -}), - CallPattern::SameArgumentCall => Rc::new(LoweringTarget { - primitive: IterationPrimitive::Repeat, - bound: Rc::new(SizeBound::Forever), - evidence: DescentEvidence::NonIncreasing, - factor: None, -}), -} + CallPattern::ChildAccessorCall { accessor: a, .. } => Rc::new(LoweringTarget { + primitive: IterationPrimitive::Descend, + bound: Rc::new(SizeBound::TreeSize { param: a.clone() }), + evidence: DescentEvidence::Strict, + factor: None, + }), + CallPattern::CollectionShrinkCall { + amount: p, + collection: c, + .. + } => Rc::new(LoweringTarget { + primitive: IterationPrimitive::Fold, + bound: Rc::new(SizeBound::CollectionSize { param: c.clone() }), + evidence: DescentEvidence::Strict, + factor: Some(Rc::new(ShrinkFactor::ConstantShrink { steps: p.clone() })), + }), + CallPattern::ArithmeticSubtractCall { + steps: p, + ring_param: r, + .. + } => Rc::new(LoweringTarget { + primitive: IterationPrimitive::Repeat, + bound: Rc::new(SizeBound::ArithmeticParam { param: r.clone() }), + evidence: DescentEvidence::Strict, + factor: Some(Rc::new(ShrinkFactor::ConstantShrink { steps: p.clone() })), + }), + CallPattern::ArithmeticDivideCall { + divisor: d, + ring_param: r, + .. + } => Rc::new(LoweringTarget { + primitive: IterationPrimitive::Repeat, + bound: Rc::new(SizeBound::ArithmeticParam { param: r.clone() }), + evidence: DescentEvidence::Strict, + factor: Some(Rc::new(ShrinkFactor::ProportionalShrink { + divisor: d.clone(), + })), + }), + CallPattern::ParserAdvanceCall { witness: w, .. } => Rc::new(LoweringTarget { + primitive: IterationPrimitive::Fold, + bound: Rc::new(SizeBound::ParserStreamSize { witness: w.clone() }), + evidence: DescentEvidence::Strict, + factor: None, + }), + CallPattern::WorklistDrainCall { element: e, .. } => Rc::new(LoweringTarget { + primitive: IterationPrimitive::Fold, + bound: Rc::new(SizeBound::WorklistDrainSize { element: e.clone() }), + evidence: DescentEvidence::Strict, + factor: None, + }), + CallPattern::FoldBodyCall { + outer_collection: oc, + .. + } => Rc::new(LoweringTarget { + primitive: IterationPrimitive::Fold, + bound: Rc::new(SizeBound::CollectionSize { param: oc.clone() }), + evidence: DescentEvidence::NonIncreasing, + factor: None, + }), + CallPattern::SameArgumentCall => Rc::new(LoweringTarget { + primitive: IterationPrimitive::Repeat, + bound: Rc::new(SizeBound::Forever), + evidence: DescentEvidence::NonIncreasing, + factor: None, + }), + } } pub fn size_bound_param(bound: Rc) -> Option { match (*bound).clone() { - SizeBound::TreeSize { param: p, .. } => Some(p.clone()), - SizeBound::CollectionSize { param: p, .. } => Some(p.clone()), - SizeBound::ParserStreamSize { witness: w, .. } => Some(w.clone()), - SizeBound::WorklistDrainSize { element: e, .. } => Some(e.clone()), - SizeBound::ArithmeticParam { param: p, .. } => Some(p.clone()), - SizeBound::ExplicitCountZero => None, - SizeBound::ExplicitCountPositive { .. } => None, - SizeBound::Forever => None, -} + SizeBound::TreeSize { param: p, .. } => Some(p.clone()), + SizeBound::CollectionSize { param: p, .. } => Some(p.clone()), + SizeBound::ParserStreamSize { witness: w, .. } => Some(w.clone()), + SizeBound::WorklistDrainSize { element: e, .. } => Some(e.clone()), + SizeBound::ArithmeticParam { param: p, .. } => Some(p.clone()), + SizeBound::ExplicitCountZero => None, + SizeBound::ExplicitCountPositive { .. } => None, + SizeBound::Forever => None, + } } pub fn is_constant_bound(bound: Rc) -> bool { match (*bound).clone() { - SizeBound::ExplicitCountZero => true, - SizeBound::ExplicitCountPositive { .. } => true, - SizeBound::Forever => true, - _ => false, -} + SizeBound::ExplicitCountZero => true, + SizeBound::ExplicitCountPositive { .. } => true, + SizeBound::Forever => true, + _ => false, + } } pub fn forever_iteration_bound() -> i64 { @@ -209,11 +195,13 @@ pub fn forever_iteration_bound() -> i64 { pub fn constant_bound_value(bound: Rc) -> Option { match (*bound).clone() { - SizeBound::ExplicitCountZero => Some(0), - SizeBound::ExplicitCountPositive { steps: s, .. } => Some(positive_descent_count(s.clone())), - SizeBound::Forever => Some(forever_iteration_bound()), - _ => None, -} + SizeBound::ExplicitCountZero => Some(0), + SizeBound::ExplicitCountPositive { steps: s, .. } => { + Some(positive_descent_count(s.clone())) + } + SizeBound::Forever => Some(forever_iteration_bound()), + _ => None, + } } #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] @@ -226,14 +214,14 @@ pub enum IterationDimension { pub fn algebra_profile_to_dimension(profile: AlgebraProfile) -> Option { match profile { - AlgebraProfile::FreeMonoidCollectionProfile => Some(IterationDimension::CollectionFold), - AlgebraProfile::FreeMonoidScalarProfile => Some(IterationDimension::CollectionFold), - AlgebraProfile::BooleanAlgebraCollectionProfile => Some(IterationDimension::CollectionFold), - AlgebraProfile::PartialFunctionProfile => Some(IterationDimension::CollectionFold), - AlgebraProfile::OrderedRingProfile => Some(IterationDimension::ArithmeticRepeat), - AlgebraProfile::ApproximateFieldProfile => Some(IterationDimension::ArithmeticRepeat), - AlgebraProfile::BooleanAlgebraProfile => None, -} + AlgebraProfile::FreeMonoidCollectionProfile => Some(IterationDimension::CollectionFold), + AlgebraProfile::FreeMonoidScalarProfile => Some(IterationDimension::CollectionFold), + AlgebraProfile::BooleanAlgebraCollectionProfile => Some(IterationDimension::CollectionFold), + AlgebraProfile::PartialFunctionProfile => Some(IterationDimension::CollectionFold), + AlgebraProfile::OrderedRingProfile => Some(IterationDimension::ArithmeticRepeat), + AlgebraProfile::ApproximateFieldProfile => Some(IterationDimension::ArithmeticRepeat), + AlgebraProfile::BooleanAlgebraProfile => None, + } } pub fn type_iteration_dimension(type_name: &String) -> Option { @@ -241,8 +229,8 @@ pub fn type_iteration_dimension(type_name: &String) -> Option algebra_profile_to_dimension(p.clone()), - None => None, -} + Some(p) => algebra_profile_to_dimension(p.clone()), + None => None, + } } } diff --git a/src/v2/stage0/src/std_effects.rs b/src/v2/stage0/src/std_effects.rs index baae2114f91..d194f9b2508 100644 --- a/src/v2/stage0/src/std_effects.rs +++ b/src/v2/stage0/src/std_effects.rs @@ -1,32 +1,30 @@ // Generated by v2 compiler -- do not edit. // Source module: std.effects -use std::collections::HashMap; -use std::rc::Rc; -use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::std_types::{HttpMethod}; -use crate::std_types::HttpMethod::{GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS}; -pub use crate::std_http_path::{PathTemplate, PathTemplateParseResult, parse_path_template, has_path_params, last_path_param}; -use crate::std_http_path::PathTemplateParseResult::{ParsedPathTemplate, MalformedPathTemplate}; -use self::EffectShape::*; -use self::KeySource::*; -use self::IdempotencyEvidence::*; use self::CompositionVerdict::*; use self::DeriveOpEffectResult::*; +use self::EffectShape::*; +use self::IdempotencyEvidence::*; +use self::KeySource::*; use self::ModifierAgreement::*; +use crate::std_http_path::PathTemplateParseResult::{MalformedPathTemplate, ParsedPathTemplate}; +pub use crate::std_http_path::{ + has_path_params, last_path_param, parse_path_template, PathTemplate, PathTemplateParseResult, +}; +pub use crate::std_types::HttpMethod; +use crate::std_types::HttpMethod::{DELETE, GET, HEAD, OPTIONS, PATCH, POST, PUT}; +use crate::v2_rt; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum EffectShape { ReadEffect, - UpsertEffect { - key_source: Rc, - }, - DeleteEffect { - key_source: Rc, - }, + UpsertEffect { key_source: Rc }, + DeleteEffect { key_source: Rc }, CreateEffect, AppendEffect, } @@ -34,8 +32,12 @@ impl EffectShape { pub fn key_source(&self) -> Rc { match self { EffectShape::ReadEffect => panic!("no key_source on unit variant"), - EffectShape::UpsertEffect { key_source: __val, .. } => __val.clone(), - EffectShape::DeleteEffect { key_source: __val, .. } => __val.clone(), + EffectShape::UpsertEffect { + key_source: __val, .. + } => __val.clone(), + EffectShape::DeleteEffect { + key_source: __val, .. + } => __val.clone(), EffectShape::CreateEffect => panic!("no key_source on unit variant"), EffectShape::AppendEffect => panic!("no key_source on unit variant"), } @@ -45,15 +47,9 @@ impl EffectShape { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum KeySource { - PathParam { - param: String, - }, - InputField { - field: String, - }, - CompositeKey { - fields: Rc>, - }, + PathParam { param: String }, + InputField { field: String }, + CompositeKey { fields: Rc> }, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -80,12 +76,12 @@ impl IdempotencyEvidence { pub fn is_idempotent_effect(shape: Rc) -> bool { match (*shape).clone() { - EffectShape::ReadEffect => true, - EffectShape::UpsertEffect { .. } => true, - EffectShape::DeleteEffect { .. } => true, - EffectShape::CreateEffect => false, - EffectShape::AppendEffect => false, -} + EffectShape::ReadEffect => true, + EffectShape::UpsertEffect { .. } => true, + EffectShape::DeleteEffect { .. } => true, + EffectShape::CreateEffect => false, + EffectShape::AppendEffect => false, + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -99,32 +95,43 @@ pub struct OperationEffect { #[serde(tag = "_variant")] pub enum CompositionVerdict { IdempotentComposition, - BrokenBy { - first_breaker: Rc, - }, + BrokenBy { first_breaker: Rc }, } impl CompositionVerdict { pub fn first_breaker(&self) -> Rc { match self { - CompositionVerdict::IdempotentComposition => panic!("no first_breaker on unit variant"), - CompositionVerdict::BrokenBy { first_breaker: __val, .. } => __val.clone(), + CompositionVerdict::IdempotentComposition => { + panic!("no first_breaker on unit variant") + } + CompositionVerdict::BrokenBy { + first_breaker: __val, + .. + } => __val.clone(), } } } pub fn compose_effects(effects: Rc>>) -> Rc { { - let non_idempotent = Rc::new({ let mut __result = Vec::new(); for e in effects.iter().cloned() { if match (*e.evidence.clone()).clone() { - IdempotencyEvidence::NonIdempotent { .. } => true, - _ => false, -} { __result.push(e); } } __result }); -match non_idempotent.first().cloned() { - Some(op) => Rc::new(CompositionVerdict::BrokenBy { - first_breaker: op.clone(), -}), - None => Rc::new(CompositionVerdict::IdempotentComposition), -} -} + let non_idempotent = Rc::new({ + let mut __result = Vec::new(); + for e in effects.iter().cloned() { + if match (*e.evidence.clone()).clone() { + IdempotencyEvidence::NonIdempotent { .. } => true, + _ => false, + } { + __result.push(e); + } + } + __result + }); + match non_idempotent.first().cloned() { + Some(op) => Rc::new(CompositionVerdict::BrokenBy { + first_breaker: op.clone(), + }), + None => Rc::new(CompositionVerdict::IdempotentComposition), + } + } } pub fn parse_http_method(raw: &String) -> Option { @@ -188,61 +195,53 @@ pub enum DeriveOpEffectResult { pub fn derive_effect_shape(method: HttpMethod, path: Rc) -> Rc { match method { - HttpMethod::GET => Rc::new(EffectShape::ReadEffect), - HttpMethod::HEAD => Rc::new(EffectShape::ReadEffect), - HttpMethod::OPTIONS => Rc::new(EffectShape::ReadEffect), - HttpMethod::POST => Rc::new(EffectShape::CreateEffect), - HttpMethod::DELETE => match last_path_param(path) { - Some(p) => Rc::new(EffectShape::DeleteEffect { - key_source: Rc::new(KeySource::PathParam { - param: p.clone(), -}), -}), - None => Rc::new(EffectShape::CreateEffect), -}, - HttpMethod::PUT => match last_path_param(path) { - Some(p) => Rc::new(EffectShape::UpsertEffect { - key_source: Rc::new(KeySource::PathParam { - param: p.clone(), -}), -}), - None => Rc::new(EffectShape::CreateEffect), -}, - HttpMethod::PATCH => match last_path_param(path) { - Some(p) => Rc::new(EffectShape::UpsertEffect { - key_source: Rc::new(KeySource::PathParam { - param: p.clone(), -}), -}), - None => Rc::new(EffectShape::CreateEffect), -}, -} + HttpMethod::GET => Rc::new(EffectShape::ReadEffect), + HttpMethod::HEAD => Rc::new(EffectShape::ReadEffect), + HttpMethod::OPTIONS => Rc::new(EffectShape::ReadEffect), + HttpMethod::POST => Rc::new(EffectShape::CreateEffect), + HttpMethod::DELETE => match last_path_param(path) { + Some(p) => Rc::new(EffectShape::DeleteEffect { + key_source: Rc::new(KeySource::PathParam { param: p.clone() }), + }), + None => Rc::new(EffectShape::CreateEffect), + }, + HttpMethod::PUT => match last_path_param(path) { + Some(p) => Rc::new(EffectShape::UpsertEffect { + key_source: Rc::new(KeySource::PathParam { param: p.clone() }), + }), + None => Rc::new(EffectShape::CreateEffect), + }, + HttpMethod::PATCH => match last_path_param(path) { + Some(p) => Rc::new(EffectShape::UpsertEffect { + key_source: Rc::new(KeySource::PathParam { param: p.clone() }), + }), + None => Rc::new(EffectShape::CreateEffect), + }, + } } -pub fn derive_op_effect(operation_name: String, method: &HttpMethod, path: &Rc) -> Rc { - { - let shape = derive_effect_shape(method.clone(), path.clone()); -Rc::new(DeriveOpEffectResult::DerivedEffect { - effect: Rc::new(DerivedOpEffect { - operation_name: operation_name, - method: method.clone(), - path_template: path.clone(), - shape: shape, -}), -}) -} +pub fn derive_op_effect( + operation_name: String, + method: HttpMethod, + path: Rc, +) -> Rc { + let shape = derive_effect_shape(method.clone(), path.clone()); + Rc::new(DeriveOpEffectResult::DerivedEffect { + effect: Rc::new(DerivedOpEffect { + operation_name: operation_name, + method: method.clone(), + path_template: path.clone(), + shape: shape, + }), + }) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum ModifierAgreement { Agrees, - Disagrees { - reason: String, - }, - DerivationUnknown { - reason: String, - }, + Disagrees { reason: String }, + DerivationUnknown { reason: String }, } impl ModifierAgreement { pub fn reason(&self) -> String { @@ -263,10 +262,14 @@ pub struct ModifierCheck { pub agreement: Rc, } -pub fn check_modifier_vs_derivation(op: &Rc, declared_idempotent: &bool, declared_readonly: &bool) -> Rc { +pub fn check_modifier_vs_derivation( + op: &Rc, + declared_idempotent: &bool, + declared_readonly: &bool, +) -> Rc { { let derived_idempotent = is_idempotent_effect(op.shape.clone()); -let agreement = if (declared_idempotent.clone() && derived_idempotent.clone()) { + let agreement = if (declared_idempotent.clone() && derived_idempotent.clone()) { Rc::new(ModifierAgreement::Agrees) } else { if (declared_idempotent.clone() && !derived_idempotent.clone()) { @@ -281,26 +284,27 @@ let agreement = if (declared_idempotent.clone() && derived_idempotent.clone()) { } else { if (!declared_idempotent.clone() && declared_readonly.clone()) { match op.method.clone() { - HttpMethod::GET => Rc::new(ModifierAgreement::Agrees), - HttpMethod::HEAD => Rc::new(ModifierAgreement::Agrees), - HttpMethod::OPTIONS => Rc::new(ModifierAgreement::Agrees), - _ => Rc::new(ModifierAgreement::Disagrees { - reason: "readonly declared but method is not GET/HEAD/OPTIONS".to_string(), -}), -} + HttpMethod::GET => Rc::new(ModifierAgreement::Agrees), + HttpMethod::HEAD => Rc::new(ModifierAgreement::Agrees), + HttpMethod::OPTIONS => Rc::new(ModifierAgreement::Agrees), + _ => Rc::new(ModifierAgreement::Disagrees { + reason: "readonly declared but method is not GET/HEAD/OPTIONS" + .to_string(), + }), + } } else { Rc::new(ModifierAgreement::Agrees) } } }; -Rc::new(ModifierCheck { - operation_name: op.operation_name.clone(), - declared_idempotent: declared_idempotent.clone(), - declared_readonly: declared_readonly.clone(), - derived_shape: op.shape.clone(), - agreement: agreement, -}) -} + Rc::new(ModifierCheck { + operation_name: op.operation_name.clone(), + declared_idempotent: declared_idempotent.clone(), + declared_readonly: declared_readonly.clone(), + derived_shape: op.shape.clone(), + agreement: agreement, + }) + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -311,13 +315,32 @@ pub struct IdempotencyTestObligation { pub witness_required: bool, } -pub fn generate_idempotency_obligations(ops: Rc>>) -> Rc>> { - Rc::new({ let mut __result = Vec::new(); for o in Rc::new({ let mut __result = Vec::new(); for o in ops.iter().cloned() { if is_idempotent_effect(o.shape.clone()) { __result.push(o); } } __result }).iter().cloned() { __result.push(Rc::new(IdempotencyTestObligation { - operation_name: o.operation_name.clone(), - effect_shape: o.shape.clone(), - claim: "f(f(x)) == f(x)".to_string(), - witness_required: true, -})); } __result }) +pub fn generate_idempotency_obligations( + ops: Rc>>, +) -> Rc>> { + Rc::new({ + let mut __result = Vec::new(); + for o in Rc::new({ + let mut __result = Vec::new(); + for o in ops.iter().cloned() { + if is_idempotent_effect(o.shape.clone()) { + __result.push(o); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(Rc::new(IdempotencyTestObligation { + operation_name: o.operation_name.clone(), + effect_shape: o.shape.clone(), + claim: "f(f(x)) == f(x)".to_string(), + witness_required: true, + })); + } + __result + }) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] diff --git a/src/v2/stage0/src/std_error_primitives.rs b/src/v2/stage0/src/std_error_primitives.rs index 52d156a47f2..a3fc3d2d54b 100644 --- a/src/v2/stage0/src/std_error_primitives.rs +++ b/src/v2/stage0/src/std_error_primitives.rs @@ -3,23 +3,19 @@ #![allow(non_camel_case_types)] -use std::collections::HashMap; -use std::rc::Rc; +use self::DivError::*; +use self::Result::*; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; -use self::Result::*; -use self::DivError::*; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum Result { - Ok { - value: Box, - }, - Err { - value: Box, - }, + Ok { value: Box }, + Err { value: Box }, } #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] diff --git a/src/v2/stage0/src/std_graph.rs b/src/v2/stage0/src/std_graph.rs index 55158d87d5b..4f8f637f057 100644 --- a/src/v2/stage0/src/std_graph.rs +++ b/src/v2/stage0/src/std_graph.rs @@ -1,13 +1,13 @@ // Generated by v2 compiler -- do not edit. // Source module: std.graph -use std::collections::HashMap; -use std::rc::Rc; +use crate::std_termination::DescentEvidence::{DescentUnknown, NonIncreasing, Strict}; +pub use crate::std_termination::{DescentEvidence, ProofEdge, TerminationProof}; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; -pub use crate::std_termination::{ProofEdge, DescentEvidence, TerminationProof}; -use crate::std_termination::DescentEvidence::{Strict, NonIncreasing, DescentUnknown}; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct GraphEdge { @@ -28,108 +28,177 @@ pub struct CallGraphAdjacencyViews { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct DfsFinishAcc { - pub visited: Rc>, + pub visited: Rc>, pub order: Rc>, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct SccComponentAcc { - pub visited: Rc>, + pub visited: Rc>, pub members: Rc>, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct SccCycleAcc { - pub visited: Rc>, + pub visited: Rc>, pub has_cycle: bool, } +pub fn set_has(m: Rc>, key: String) -> bool { + (v2_rt::map_get(&m, key) != None) +} + pub fn seed_adjacency_map(names: Rc>) -> Rc>>> { - names.iter().cloned().fold(v2_rt::rc_empty_map::>>(), |acc: Rc>>>, name: String| v2_rt::rc_map_insert(acc, name.clone(), Rc::new(vec![]))) + names.iter().cloned().fold( + v2_rt::rc_empty_map::>>(), + |acc: Rc>>>, name: String| { + v2_rt::rc_map_insert(acc, name.clone(), Rc::new(vec![])) + }, + ) } -pub fn build_call_graph_from_proof_edges(names: Rc>, edges: Rc>>) -> Rc { +pub fn build_call_graph_from_proof_edges( + names: Rc>, + edges: Rc>>, +) -> Rc { Rc::new(CallGraph { - edges: Rc::new({ let mut __result = Vec::new(); for e in Rc::new({ let mut __result = Vec::new(); for e in edges.iter().cloned() { if (e.caller.clone().as_str() != e.callee.clone().as_str()) { __result.push(e); } } __result }).iter().cloned() { __result.push(Rc::new(GraphEdge { - caller: e.caller.clone(), - callee: e.callee.clone(), -})); } __result }), -}) + edges: Rc::new({ + let mut __result = Vec::new(); + for e in Rc::new({ + let mut __result = Vec::new(); + for e in edges.iter().cloned() { + if (e.caller.clone().as_str() != e.callee.clone().as_str()) { + __result.push(e); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(Rc::new(GraphEdge { + caller: e.caller.clone(), + callee: e.callee.clone(), + })); + } + __result + }), + }) } -pub fn build_adjacency_views(names: &Rc>, graph: Rc) -> Rc { +pub fn build_adjacency_views( + names: &Rc>, + graph: Rc, +) -> Rc { { let initial_forward = seed_adjacency_map(names.clone()); -let initial_reverse = seed_adjacency_map(names.clone()); -graph.edges.clone().iter().cloned().fold(Rc::new(CallGraphAdjacencyViews { - forward: initial_forward, - reverse: initial_reverse, -}), |acc: Rc, edge: Rc| { - let forward_neighbors = match v2_rt::map_get(&acc.forward.clone(), edge.caller.clone()) { - Some(ns) => v2_rt::concat(ns.clone(), Rc::new(vec![edge.callee.clone()])), - None => Rc::new(vec![edge.callee.clone()]), -}; -let reverse_neighbors = match v2_rt::map_get(&acc.reverse.clone(), edge.callee.clone()) { - Some(ns) => v2_rt::concat(ns.clone(), Rc::new(vec![edge.caller.clone()])), - None => Rc::new(vec![edge.caller.clone()]), -}; -Rc::new(CallGraphAdjacencyViews { - forward: v2_rt::rc_map_insert(acc.forward.clone(), edge.caller.clone(), forward_neighbors.clone()), - reverse: v2_rt::rc_map_insert(acc.reverse.clone(), edge.callee.clone(), reverse_neighbors.clone()), -}) -}) -} -} - -pub fn forward_adjacency(names: Rc>, graph: Rc) -> Rc>>> { + let initial_reverse = seed_adjacency_map(names.clone()); + graph.edges.clone().iter().cloned().fold( + Rc::new(CallGraphAdjacencyViews { + forward: initial_forward, + reverse: initial_reverse, + }), + |acc: Rc, edge: Rc| { + let forward_neighbors = + match v2_rt::map_get(&acc.forward.clone(), edge.caller.clone()) { + Some(ns) => v2_rt::concat(ns.clone(), Rc::new(vec![edge.callee.clone()])), + None => Rc::new(vec![edge.callee.clone()]), + }; + let reverse_neighbors = + match v2_rt::map_get(&acc.reverse.clone(), edge.callee.clone()) { + Some(ns) => v2_rt::concat(ns.clone(), Rc::new(vec![edge.caller.clone()])), + None => Rc::new(vec![edge.caller.clone()]), + }; + Rc::new(CallGraphAdjacencyViews { + forward: v2_rt::rc_map_insert( + acc.forward.clone(), + edge.caller.clone(), + forward_neighbors.clone(), + ), + reverse: v2_rt::rc_map_insert( + acc.reverse.clone(), + edge.callee.clone(), + reverse_neighbors.clone(), + ), + }) + }, + ) + } +} + +pub fn forward_adjacency( + names: Rc>, + graph: Rc, +) -> Rc>>> { build_adjacency_views(&names, graph).forward.clone() } -pub fn reverse_adjacency(names: Rc>, graph: Rc) -> Rc>>> { +pub fn reverse_adjacency( + names: Rc>, + graph: Rc, +) -> Rc>>> { build_adjacency_views(&names, graph).reverse.clone() } -pub fn dfs_finish_order(node: &String, adjacency: &Rc>>>, acc: &Rc) -> Rc { +pub fn dfs_finish_order( + node: &String, + adjacency: &Rc>>>, + acc: &Rc, +) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - if set_contains(acc.visited.clone(), node.clone()) { + if set_has(acc.visited.clone(), node.clone()) { acc.clone() } else { { - let next_visited = set_insert(acc.visited.clone(), node.clone()); -let neighbors = match v2_rt::map_get(&adjacency, node.clone()) { - Some(ns) => ns.clone(), - None => Rc::new(vec![]), -}; -let explored = neighbors.iter().cloned().fold(Rc::new(DfsFinishAcc { - visited: next_visited, - order: acc.order.clone(), -}), |inner: Rc, neighbor: String| dfs_finish_order(&neighbor, &adjacency, &inner)); -Rc::new(DfsFinishAcc { - visited: explored.visited.clone(), - order: v2_rt::rc_list_push(explored.order.clone(), node.clone()), -}) -} + let next_visited = v2_rt::rc_map_insert(acc.visited.clone(), node.clone(), true); + let neighbors = match v2_rt::map_get(&adjacency, node.clone()) { + Some(ns) => ns.clone(), + None => Rc::new(vec![]), + }; + let explored = neighbors.iter().cloned().fold( + Rc::new(DfsFinishAcc { + visited: next_visited, + order: acc.order.clone(), + }), + |inner: Rc, neighbor: String| { + dfs_finish_order(&neighbor, &adjacency, &inner) + }, + ); + Rc::new(DfsFinishAcc { + visited: explored.visited.clone(), + order: v2_rt::rc_list_push(explored.order.clone(), node.clone()), + }) + } } }) } -pub fn dfs_collect_component(node: &String, adjacency: &Rc>>>, acc: &Rc) -> Rc { +pub fn dfs_collect_component( + node: &String, + adjacency: &Rc>>>, + acc: &Rc, +) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - if set_contains(acc.visited.clone(), node.clone()) { + if set_has(acc.visited.clone(), node.clone()) { acc.clone() } else { { - let next_visited = set_insert(acc.visited.clone(), node.clone()); -let next_members = v2_rt::rc_list_push(acc.members.clone(), node.clone()); -let neighbors = match v2_rt::map_get(&adjacency, node.clone()) { - Some(ns) => ns.clone(), - None => Rc::new(vec![]), -}; -neighbors.iter().cloned().fold(Rc::new(SccComponentAcc { - visited: next_visited, - members: next_members, -}), |inner: Rc, neighbor: String| dfs_collect_component(&neighbor, &adjacency, &inner)) -} + let next_visited = v2_rt::rc_map_insert(acc.visited.clone(), node.clone(), true); + let next_members = v2_rt::rc_list_push(acc.members.clone(), node.clone()); + let neighbors = match v2_rt::map_get(&adjacency, node.clone()) { + Some(ns) => ns.clone(), + None => Rc::new(vec![]), + }; + neighbors.iter().cloned().fold( + Rc::new(SccComponentAcc { + visited: next_visited, + members: next_members, + }), + |inner: Rc, neighbor: String| { + dfs_collect_component(&neighbor, &adjacency, &inner) + }, + ) + } } }) } @@ -137,61 +206,117 @@ neighbors.iter().cloned().fold(Rc::new(SccComponentAcc { pub fn graph_has_multi_node_scc(names: &Rc>, graph: Rc) -> bool { { let adjacency = build_adjacency_views(&names, graph); -let finish = names.clone().iter().cloned().fold(Rc::new(DfsFinishAcc { - visited: empty_set(), - order: Rc::new(vec![]), -}), |acc: Rc, name: String| dfs_finish_order(&name, &adjacency.forward.clone(), &acc)); -let result = v2_rt::reverse(finish.order.clone()).iter().cloned().fold(Rc::new(SccCycleAcc { - visited: empty_set(), - has_cycle: false, -}), |acc: Rc, name: String| if (acc.has_cycle.clone() || set_contains(acc.visited.clone(), name.clone())) { - acc.clone() - } else { - { - let component = dfs_collect_component(&name, &adjacency.reverse.clone(), &Rc::new(SccComponentAcc { - visited: acc.visited.clone(), - members: Rc::new(vec![]), -})); -Rc::new(SccCycleAcc { - visited: component.visited.clone(), - has_cycle: ((component.members.clone().len() as i64) > 1), -}) -} - }); -result.has_cycle.clone() -} + let finish = names.clone().iter().cloned().fold( + Rc::new(DfsFinishAcc { + visited: v2_rt::rc_empty_map::(), + order: Rc::new(vec![]), + }), + |acc: Rc, name: String| { + dfs_finish_order(&name, &adjacency.forward.clone(), &acc) + }, + ); + let result = v2_rt::reverse(finish.order.clone()).iter().cloned().fold( + Rc::new(SccCycleAcc { + visited: v2_rt::rc_empty_map::(), + has_cycle: false, + }), + |acc: Rc, name: String| { + if (acc.has_cycle.clone() || set_has(acc.visited.clone(), name.clone())) { + acc.clone() + } else { + { + let component = dfs_collect_component( + &name, + &adjacency.reverse.clone(), + &Rc::new(SccComponentAcc { + visited: acc.visited.clone(), + members: Rc::new(vec![]), + }), + ); + Rc::new(SccCycleAcc { + visited: component.visited.clone(), + has_cycle: ((component.members.clone().len() as i64) > 1), + }) + } + } + }, + ); + result.has_cycle.clone() + } } pub fn is_lexicographic_descent(mut evidence: Rc>) -> bool { loop { match evidence.clone().first().cloned() { - None => { break false; }, - Some(e) => { match e.clone() { - DescentEvidence::Strict => { break true; }, - DescentEvidence::NonIncreasing => { { - let __tco_0 = Rc::new(evidence.iter().cloned().skip(1 as usize).collect::>()); -evidence = __tco_0; -continue; -} }, - DescentEvidence::DescentUnknown => { break false; }, -} }, -} -} + None => { + break false; + } + Some(e) => match e.clone() { + DescentEvidence::Strict => { + break true; + } + DescentEvidence::NonIncreasing => { + let __tco_0 = Rc::new( + evidence + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + evidence = __tco_0; + continue; + } + DescentEvidence::DescentUnknown => { + break false; + } + }, + } + } } pub fn is_valid_proof(proof: Rc, edges: &Rc>>) -> bool { { let expected_dims = (proof.dimensions.clone().len() as i64); -let non_descending = Rc::new({ let mut __result = Vec::new(); for e in edges.clone().iter().cloned() { if (((e.evidence.clone().len() as i64) != expected_dims.clone()) || (is_lexicographic_descent(e.evidence.clone()) == false)) { __result.push(e); } } __result }); -let has_self_cycle = { let mut __found = false; for e in non_descending.clone().iter().cloned() { if (e.caller.clone().as_str() == e.callee.clone().as_str()) { __found = true; break; } } __found }; -if has_self_cycle { + let non_descending = Rc::new({ + let mut __result = Vec::new(); + for e in edges.clone().iter().cloned() { + if (((e.evidence.clone().len() as i64) != expected_dims.clone()) + || (is_lexicographic_descent(e.evidence.clone()) == false)) + { + __result.push(e); + } + } + __result + }); + let has_self_cycle = { + let mut __found = false; + for e in non_descending.clone().iter().cloned() { + if (e.caller.clone().as_str() == e.callee.clone().as_str()) { + __found = true; + break; + } + } + __found + }; + if has_self_cycle { false } else { { - let members = Rc::new({ let mut __result = Vec::new(); for e in edges.clone().iter().cloned() { __result.extend((*Rc::new(vec![e.caller.clone(), e.callee.clone()])).iter().cloned()); } __result }); -let nd_graph = build_call_graph_from_proof_edges(members.clone(), non_descending.clone()); -(graph_has_multi_node_scc(&members, nd_graph) == false) -} + let members = Rc::new({ + let mut __result = Vec::new(); + for e in edges.clone().iter().cloned() { + __result.extend( + (*Rc::new(vec![e.caller.clone(), e.callee.clone()])) + .iter() + .cloned(), + ); + } + __result + }); + let nd_graph = + build_call_graph_from_proof_edges(members.clone(), non_descending.clone()); + (graph_has_multi_node_scc(&members, nd_graph) == false) + } } -} + } } diff --git a/src/v2/stage0/src/std_http_path.rs b/src/v2/stage0/src/std_http_path.rs index 273e30ca225..c67a8d74b5f 100644 --- a/src/v2/stage0/src/std_http_path.rs +++ b/src/v2/stage0/src/std_http_path.rs @@ -1,24 +1,20 @@ // Generated by v2 compiler -- do not edit. // Source module: std.http_path -use std::collections::HashMap; -use std::rc::Rc; -use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -use self::UrlPathToken::*; use self::PathSegmentTokensResult::*; use self::PathTemplateParseResult::*; +use self::UrlPathToken::*; +use crate::v2_rt; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum UrlPathToken { - LiteralToken { - text: String, - }, - ParamToken { - name: String, - }, + LiteralToken { text: String }, + ParamToken { name: String }, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -29,13 +25,8 @@ pub struct PathTemplate { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum PathSegmentTokensResult { - ParsedSegmentTokens { - tokens: Rc>>, - }, - MalformedPathSegment { - segment: String, - reason: String, - }, + ParsedSegmentTokens { tokens: Rc>> }, + MalformedPathSegment { segment: String, reason: String }, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -53,150 +44,242 @@ pub enum PathTemplateParseResult { pub fn parse_path_template(raw: &String) -> Rc { { - let path_only = match Rc::new(raw.clone().split(&"?".to_string()).map(|s| s.to_string()).collect::>()).first().cloned() { - Some(p) => p.clone(), - None => raw.clone(), -}; -let segments = Rc::new({ let mut __result = Vec::new(); for s in Rc::new(path_only.split(&"/".to_string()).map(|s| s.to_string()).collect::>()).iter().cloned() { if (s.clone().as_str() != "".to_string().as_str()) { __result.push(s); } } __result }); -match segments.clone().first().cloned() { - None => Rc::new(PathTemplateParseResult::ParsedPathTemplate { - template: Rc::new(PathTemplate { - tokens: Rc::new(vec![]), -}), -}), - Some(first_seg) => match (*parse_segment_tokens(&first_seg)).clone() { - PathSegmentTokensResult::MalformedPathSegment { segment: s, reason: r, .. } => Rc::new(PathTemplateParseResult::MalformedPathTemplate { - raw: raw.clone(), - segment: s.clone(), - reason: r.clone(), -}), - PathSegmentTokensResult::ParsedSegmentTokens { tokens: first_tokens, .. } => { - let parsed = Rc::new(segments.clone().iter().cloned().skip(1 as usize).collect::>()).iter().cloned().fold(Rc::new(PathTemplateParseResult::ParsedPathTemplate { - template: Rc::new(PathTemplate { - tokens: first_tokens.clone(), -}), -}), |acc: Rc, seg: String| match (*acc.clone()).clone() { - PathTemplateParseResult::MalformedPathTemplate { .. } => acc.clone(), - PathTemplateParseResult::ParsedPathTemplate { template: path, .. } => match (*parse_segment_tokens(&seg)).clone() { - PathSegmentTokensResult::MalformedPathSegment { segment: s, reason: r, .. } => Rc::new(PathTemplateParseResult::MalformedPathTemplate { - raw: raw.clone(), - segment: s.clone(), - reason: r.clone(), -}), - PathSegmentTokensResult::ParsedSegmentTokens { tokens: seg_tokens, .. } => Rc::new(PathTemplateParseResult::ParsedPathTemplate { - template: Rc::new(PathTemplate { - tokens: v2_rt::concat(path.tokens.clone(), seg_tokens.clone()), -}), -}), -}, -}); -parsed -}, -}, -} -} + let path_only = match Rc::new( + raw.clone() + .split(&"?".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .first() + .cloned() + { + Some(p) => p.clone(), + None => raw.clone(), + }; + let segments = Rc::new({ + let mut __result = Vec::new(); + for s in Rc::new( + path_only + .split(&"/".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .iter() + .cloned() + { + if (s.clone().as_str() != "".to_string().as_str()) { + __result.push(s); + } + } + __result + }); + match segments.clone().first().cloned() { + None => Rc::new(PathTemplateParseResult::ParsedPathTemplate { + template: Rc::new(PathTemplate { + tokens: Rc::new(vec![]), + }), + }), + Some(first_seg) => match (*parse_segment_tokens(&first_seg)).clone() { + PathSegmentTokensResult::MalformedPathSegment { + segment: s, + reason: r, + .. + } => Rc::new(PathTemplateParseResult::MalformedPathTemplate { + raw: raw.clone(), + segment: s.clone(), + reason: r.clone(), + }), + PathSegmentTokensResult::ParsedSegmentTokens { + tokens: first_tokens, + .. + } => { + let parsed = Rc::new( + segments + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ) + .iter() + .cloned() + .fold( + Rc::new(PathTemplateParseResult::ParsedPathTemplate { + template: Rc::new(PathTemplate { + tokens: first_tokens.clone(), + }), + }), + |acc: Rc, seg: String| match (*acc.clone()).clone() + { + PathTemplateParseResult::MalformedPathTemplate { .. } => acc.clone(), + PathTemplateParseResult::ParsedPathTemplate { + template: path, .. + } => match (*parse_segment_tokens(&seg)).clone() { + PathSegmentTokensResult::MalformedPathSegment { + segment: s, + reason: r, + .. + } => Rc::new(PathTemplateParseResult::MalformedPathTemplate { + raw: raw.clone(), + segment: s.clone(), + reason: r.clone(), + }), + PathSegmentTokensResult::ParsedSegmentTokens { + tokens: seg_tokens, + .. + } => Rc::new(PathTemplateParseResult::ParsedPathTemplate { + template: Rc::new(PathTemplate { + tokens: v2_rt::concat( + path.tokens.clone(), + seg_tokens.clone(), + ), + }), + }), + }, + }, + ); + parsed + } + }, + } + } } pub fn parse_segment_tokens(seg: &String) -> Rc { if !v2_rt::contains(seg.clone(), "{".to_string()) { if v2_rt::contains(seg.clone(), "}".to_string()) { Rc::new(PathSegmentTokensResult::MalformedPathSegment { - segment: seg.clone(), - reason: "stray closing brace".to_string(), -}) + segment: seg.clone(), + reason: "stray closing brace".to_string(), + }) } else { Rc::new(PathSegmentTokensResult::ParsedSegmentTokens { - tokens: Rc::new(vec![Rc::new(UrlPathToken::LiteralToken { - text: seg.clone(), -})]), -}) + tokens: Rc::new(vec![Rc::new(UrlPathToken::LiteralToken { + text: seg.clone(), + })]), + }) } } else { { - let before_and_rest = Rc::new(seg.clone().split(&"{".to_string()).map(|s| s.to_string()).collect::>()); -if ((before_and_rest.clone().len() as i64) != 2) { + let before_and_rest = Rc::new( + seg.clone() + .split(&"{".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ); + if ((before_and_rest.clone().len() as i64) != 2) { return Rc::new(PathSegmentTokensResult::MalformedPathSegment { - segment: seg.clone(), - reason: "multiple opening braces in one segment".to_string(), -}) + segment: seg.clone(), + reason: "multiple opening braces in one segment".to_string(), + }); } -let prefix = match before_and_rest.clone().first().cloned() { - Some(p) => p.clone(), - None => "".to_string(), -}; -let after_open = match before_and_rest.clone().get(1 as usize).cloned() { - Some(r) => r.clone(), - None => "".to_string(), -}; -let name_and_suffix = Rc::new(after_open.split(&"}".to_string()).map(|s| s.to_string()).collect::>()); -if (v2_rt::contains(prefix.clone(), "}".to_string()) || ((name_and_suffix.clone().len() as i64) != 2)) { + let prefix = match before_and_rest.clone().first().cloned() { + Some(p) => p.clone(), + None => "".to_string(), + }; + let after_open = match before_and_rest.clone().get(1 as usize).cloned() { + Some(r) => r.clone(), + None => "".to_string(), + }; + let name_and_suffix = Rc::new( + after_open + .split(&"}".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ); + if (v2_rt::contains(prefix.clone(), "}".to_string()) + || ((name_and_suffix.clone().len() as i64) != 2)) + { return Rc::new(PathSegmentTokensResult::MalformedPathSegment { - segment: seg.clone(), - reason: "missing closing brace or extra closing brace".to_string(), -}) + segment: seg.clone(), + reason: "missing closing brace or extra closing brace".to_string(), + }); } -let param_name = match name_and_suffix.clone().first().cloned() { - Some(p) => p.clone(), - None => "".to_string(), -}; -let suffix = match name_and_suffix.clone().get(1 as usize).cloned() { - Some(s) => s.clone(), - None => "".to_string(), -}; -let prefix_tokens = if (prefix.clone().as_str() != "".to_string().as_str()) { + let param_name = match name_and_suffix.clone().first().cloned() { + Some(p) => p.clone(), + None => "".to_string(), + }; + let suffix = match name_and_suffix.clone().get(1 as usize).cloned() { + Some(s) => s.clone(), + None => "".to_string(), + }; + let prefix_tokens = if (prefix.clone().as_str() != "".to_string().as_str()) { Rc::new(vec![Rc::new(UrlPathToken::LiteralToken { - text: prefix.clone(), -})]) + text: prefix.clone(), + })]) } else { Rc::new(vec![]) }; -let param_tokens = if (param_name.clone().as_str() != "".to_string().as_str()) { + let param_tokens = if (param_name.clone().as_str() != "".to_string().as_str()) { Rc::new(vec![Rc::new(UrlPathToken::ParamToken { - name: param_name.clone(), -})]) + name: param_name.clone(), + })]) } else { Rc::new(vec![]) }; -let suffix_tokens = if (suffix.clone().as_str() != "".to_string().as_str()) { + let suffix_tokens = if (suffix.clone().as_str() != "".to_string().as_str()) { Rc::new(vec![Rc::new(UrlPathToken::LiteralToken { - text: suffix.clone(), -})]) + text: suffix.clone(), + })]) } else { Rc::new(vec![]) }; -if (((param_name.clone().as_str() == "".to_string().as_str()) || v2_rt::contains(suffix.clone(), "{".to_string())) || v2_rt::contains(suffix.clone(), "}".to_string())) { + if (((param_name.clone().as_str() == "".to_string().as_str()) + || v2_rt::contains(suffix.clone(), "{".to_string())) + || v2_rt::contains(suffix.clone(), "}".to_string())) + { Rc::new(PathSegmentTokensResult::MalformedPathSegment { - segment: seg.clone(), - reason: "invalid parameter segment structure".to_string(), -}) + segment: seg.clone(), + reason: "invalid parameter segment structure".to_string(), + }) } else { Rc::new(PathSegmentTokensResult::ParsedSegmentTokens { - tokens: v2_rt::concat(v2_rt::concat(prefix_tokens, param_tokens), suffix_tokens), -}) + tokens: v2_rt::concat( + v2_rt::concat(prefix_tokens, param_tokens), + suffix_tokens, + ), + }) } -} + } } } pub fn has_path_params(template: Rc) -> bool { - { let mut __found = false; for t in template.tokens.clone().iter().cloned() { if match (*t.clone()).clone() { - UrlPathToken::ParamToken { .. } => true, - UrlPathToken::LiteralToken { .. } => false, -} { __found = true; break; } } __found } + { + let mut __found = false; + for t in template.tokens.clone().iter().cloned() { + if match (*t.clone()).clone() { + UrlPathToken::ParamToken { .. } => true, + UrlPathToken::LiteralToken { .. } => false, + } { + __found = true; + break; + } + } + __found + } } pub fn last_path_param(template: Rc) -> Option { { - let params = Rc::new({ let mut __result = Vec::new(); for t in template.tokens.clone().iter().cloned() { if match (*t.clone()).clone() { - UrlPathToken::ParamToken { .. } => true, - UrlPathToken::LiteralToken { .. } => false, -} { __result.push(t); } } __result }); -match params.last().cloned() { - Some(tok) => match (*tok.clone()).clone() { - UrlPathToken::ParamToken { name: n, .. } => Some(n.clone()), - UrlPathToken::LiteralToken { .. } => None, -}, - None => None, -} -} + let params = Rc::new({ + let mut __result = Vec::new(); + for t in template.tokens.clone().iter().cloned() { + if match (*t.clone()).clone() { + UrlPathToken::ParamToken { .. } => true, + UrlPathToken::LiteralToken { .. } => false, + } { + __result.push(t); + } + } + __result + }); + match params.last().cloned() { + Some(tok) => match (*tok.clone()).clone() { + UrlPathToken::ParamToken { name: n, .. } => Some(n.clone()), + UrlPathToken::LiteralToken { .. } => None, + }, + None => None, + } + } } diff --git a/src/v2/stage0/src/std_induction.rs b/src/v2/stage0/src/std_induction.rs index 9dccaee9577..ab652cf1049 100644 --- a/src/v2/stage0/src/std_induction.rs +++ b/src/v2/stage0/src/std_induction.rs @@ -1,26 +1,35 @@ // Generated by v2 compiler -- do not edit. // Source module: std.induction -use std::collections::HashMap; -use std::rc::Rc; -use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::std_termination::{DescentEvidence, RankingDimension, PositiveDescentAmount, ProportionalDivisor, proportional_divisor_to_int, positive_descent_amount_from_positive_int, proportional_divisor_from_int_at_least_two, peano_literal_materialization_cap, positive_descent_count}; -use crate::std_termination::DescentEvidence::{Strict, NonIncreasing, DescentUnknown}; -use crate::std_termination::RankingDimension::{TreeSize}; -use crate::std_termination::PositiveDescentAmount::{OneStep, AdditionalStep}; -use crate::std_termination::ProportionalDivisor::{DivideByTwo, StrictlyLarger}; -pub use crate::std_computation::{CallPattern, LoweringTarget, IterationPrimitive, ShrinkFactor, tree_size_bound, SizeBound}; -use crate::std_computation::CallPattern::{ChildAccessorCall, FoldBodyCall, SameArgumentCall, ArithmeticSubtractCall, ArithmeticDivideCall}; -use crate::std_computation::IterationPrimitive::{Descend, Fold, Repeat}; -use crate::std_computation::ShrinkFactor::{UnitShrink, ConstantShrink, ProportionalShrink}; -use crate::std_computation::SizeBound::{CollectionSize, ArithmeticParam, Forever}; -use self::RecursionShape::*; -use self::SubValueRelation::*; -use self::PolynomialExponent::*; use self::AtomicCost::*; use self::CostBound::*; +use self::PolynomialExponent::*; +use self::RecursionShape::*; +use self::SubValueRelation::*; +use crate::std_computation::CallPattern::{ + ArithmeticDivideCall, ArithmeticSubtractCall, ChildAccessorCall, FoldBodyCall, SameArgumentCall, +}; +use crate::std_computation::IterationPrimitive::{Descend, Fold, Repeat}; +use crate::std_computation::ShrinkFactor::{ConstantShrink, ProportionalShrink, UnitShrink}; +use crate::std_computation::SizeBound::{ArithmeticParam, CollectionSize, Forever}; +pub use crate::std_computation::{ + tree_size_bound, CallPattern, IterationPrimitive, LoweringTarget, ShrinkFactor, SizeBound, +}; +use crate::std_termination::DescentEvidence::{DescentUnknown, NonIncreasing, Strict}; +use crate::std_termination::PositiveDescentAmount::{AdditionalStep, OneStep}; +use crate::std_termination::ProportionalDivisor::{DivideByTwo, StrictlyLarger}; +use crate::std_termination::RankingDimension::TreeSize; +pub use crate::std_termination::{ + peano_literal_materialization_cap, positive_descent_amount_from_positive_int, + positive_descent_count, proportional_divisor_from_int_at_least_two, + proportional_divisor_to_int, DescentEvidence, PositiveDescentAmount, ProportionalDivisor, + RankingDimension, +}; +use crate::v2_rt; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] @@ -43,37 +52,42 @@ pub struct InductiveField { pub fn recursion_shape_eq(a: RecursionShape, b: RecursionShape) -> bool { match a { - RecursionShape::DirectRecursion => match b { - RecursionShape::DirectRecursion => true, - _ => false, -}, - RecursionShape::ListRecursion => match b { - RecursionShape::ListRecursion => true, - _ => false, -}, - RecursionShape::OptionalRecursion => match b { - RecursionShape::OptionalRecursion => true, - _ => false, -}, - RecursionShape::SetRecursion => match b { - RecursionShape::SetRecursion => true, - _ => false, -}, - RecursionShape::MapValueRecursion => match b { - RecursionShape::MapValueRecursion => true, - _ => false, -}, -} + RecursionShape::DirectRecursion => match b { + RecursionShape::DirectRecursion => true, + _ => false, + }, + RecursionShape::ListRecursion => match b { + RecursionShape::ListRecursion => true, + _ => false, + }, + RecursionShape::OptionalRecursion => match b { + RecursionShape::OptionalRecursion => true, + _ => false, + }, + RecursionShape::SetRecursion => match b { + RecursionShape::SetRecursion => true, + _ => false, + }, + RecursionShape::MapValueRecursion => match b { + RecursionShape::MapValueRecursion => true, + _ => false, + }, + } } pub fn inductive_field_eq(a: &Rc, b: &Rc) -> bool { - (((((a.type_name.clone().as_str() == b.type_name.clone().as_str()) && (a.variant_name.clone().as_str() == b.variant_name.clone().as_str())) && (a.field_name.clone().as_str() == b.field_name.clone().as_str())) && recursion_shape_eq(a.shape.clone(), b.shape.clone())) && (a.element_type.clone().as_str() == b.element_type.clone().as_str())) + (((((a.type_name.clone().as_str() == b.type_name.clone().as_str()) + && (a.variant_name.clone().as_str() == b.variant_name.clone().as_str())) + && (a.field_name.clone().as_str() == b.field_name.clone().as_str())) + && recursion_shape_eq(a.shape.clone(), b.shape.clone())) + && (a.element_type.clone().as_str() == b.element_type.clone().as_str())) } -pub fn inductive_field_to_dimension(field: Rc, param: String) -> Rc { - Rc::new(RankingDimension::TreeSize { - param: param, -}) +pub fn inductive_field_to_dimension( + field: Rc, + param: String, +) -> Rc { + Rc::new(RankingDimension::TreeSize { param: param }) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -96,256 +110,344 @@ pub enum SubValueRelation { pub fn sub_value_to_evidence(relation: Rc) -> DescentEvidence { match (*relation).clone() { - SubValueRelation::StrictSubValue { factor: f, .. } => match (*f.clone()).clone() { - ShrinkFactor::UnitShrink => DescentEvidence::Strict, - ShrinkFactor::ConstantShrink { .. } => DescentEvidence::Strict, - ShrinkFactor::ProportionalShrink { .. } => DescentEvidence::Strict, -}, - SubValueRelation::IteratedSubValue { .. } => DescentEvidence::Strict, - SubValueRelation::ArithmeticDescent { factor: f, .. } => match (*f.clone()).clone() { - ShrinkFactor::UnitShrink => DescentEvidence::Strict, - ShrinkFactor::ConstantShrink { .. } => DescentEvidence::Strict, - ShrinkFactor::ProportionalShrink { .. } => DescentEvidence::Strict, -}, - SubValueRelation::PreservedValue => DescentEvidence::NonIncreasing, - SubValueRelation::SubValueUnknown => DescentEvidence::DescentUnknown, -} + SubValueRelation::StrictSubValue { factor: f, .. } => match (*f.clone()).clone() { + ShrinkFactor::UnitShrink => DescentEvidence::Strict, + ShrinkFactor::ConstantShrink { .. } => DescentEvidence::Strict, + ShrinkFactor::ProportionalShrink { .. } => DescentEvidence::Strict, + }, + SubValueRelation::IteratedSubValue { .. } => DescentEvidence::Strict, + SubValueRelation::ArithmeticDescent { factor: f, .. } => match (*f.clone()).clone() { + ShrinkFactor::UnitShrink => DescentEvidence::Strict, + ShrinkFactor::ConstantShrink { .. } => DescentEvidence::Strict, + ShrinkFactor::ProportionalShrink { .. } => DescentEvidence::Strict, + }, + SubValueRelation::PreservedValue => DescentEvidence::NonIncreasing, + SubValueRelation::SubValueUnknown => DescentEvidence::DescentUnknown, + } } pub fn shrink_factor_eq(a: Rc, b: Rc) -> bool { match (*a).clone() { - ShrinkFactor::UnitShrink => match (*b).clone() { - ShrinkFactor::UnitShrink => true, - _ => false, -}, - ShrinkFactor::ConstantShrink { steps: sa, .. } => match (*b).clone() { - ShrinkFactor::ConstantShrink { steps: sb, .. } => (positive_descent_count(sa.clone()) == positive_descent_count(sb.clone())), - _ => false, -}, - ShrinkFactor::ProportionalShrink { divisor: da, .. } => match (*b).clone() { - ShrinkFactor::ProportionalShrink { divisor: db, .. } => (proportional_divisor_to_int(da.clone()) == proportional_divisor_to_int(db.clone())), - _ => false, -}, -} + ShrinkFactor::UnitShrink => match (*b).clone() { + ShrinkFactor::UnitShrink => true, + _ => false, + }, + ShrinkFactor::ConstantShrink { steps: sa, .. } => match (*b).clone() { + ShrinkFactor::ConstantShrink { steps: sb, .. } => { + (positive_descent_count(sa.clone()) == positive_descent_count(sb.clone())) + } + _ => false, + }, + ShrinkFactor::ProportionalShrink { divisor: da, .. } => match (*b).clone() { + ShrinkFactor::ProportionalShrink { divisor: db, .. } => { + (proportional_divisor_to_int(da.clone()) == proportional_divisor_to_int(db.clone())) + } + _ => false, + }, + } } pub fn meet_sub_value(a: Rc, b: Rc) -> Rc { match (*a.clone()).clone() { - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - SubValueRelation::PreservedValue => match (*b).clone() { - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - _ => Rc::new(SubValueRelation::PreservedValue), -}, - SubValueRelation::StrictSubValue { field: fa, factor: fac_a, .. } => match (*b).clone() { - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - SubValueRelation::PreservedValue => Rc::new(SubValueRelation::PreservedValue), - SubValueRelation::StrictSubValue { field: fb, factor: fac_b, .. } => if inductive_field_eq(&fa, &fb) { - if shrink_factor_eq(fac_a.clone(), fac_b.clone()) { - Rc::new(SubValueRelation::StrictSubValue { - field: fa.clone(), - factor: fac_a.clone(), -}) - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } - } else { - Rc::new(SubValueRelation::SubValueUnknown) - }, - _ => Rc::new(SubValueRelation::SubValueUnknown), -}, - SubValueRelation::IteratedSubValue { field: fa, .. } => match (*b).clone() { - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - SubValueRelation::PreservedValue => Rc::new(SubValueRelation::PreservedValue), - SubValueRelation::IteratedSubValue { field: fb, .. } => if inductive_field_eq(&fa, &fb) { - a.clone() - } else { - Rc::new(SubValueRelation::SubValueUnknown) - }, - _ => Rc::new(SubValueRelation::SubValueUnknown), -}, - SubValueRelation::ArithmeticDescent { param: pa, factor: fac_a, .. } => match (*b).clone() { - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - SubValueRelation::PreservedValue => Rc::new(SubValueRelation::PreservedValue), - SubValueRelation::ArithmeticDescent { param: pb, factor: fac_b, .. } => if (pa.clone().as_str() == pb.clone().as_str()) { - if shrink_factor_eq(fac_a.clone(), fac_b.clone()) { - Rc::new(SubValueRelation::ArithmeticDescent { - param: pa.clone(), - factor: fac_a.clone(), -}) - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } - } else { - Rc::new(SubValueRelation::SubValueUnknown) - }, - _ => Rc::new(SubValueRelation::SubValueUnknown), -}, -} + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + SubValueRelation::PreservedValue => match (*b).clone() { + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + _ => Rc::new(SubValueRelation::PreservedValue), + }, + SubValueRelation::StrictSubValue { + field: fa, + factor: fac_a, + .. + } => match (*b).clone() { + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + SubValueRelation::PreservedValue => Rc::new(SubValueRelation::PreservedValue), + SubValueRelation::StrictSubValue { + field: fb, + factor: fac_b, + .. + } => { + if inductive_field_eq(&fa, &fb) { + if shrink_factor_eq(fac_a.clone(), fac_b.clone()) { + Rc::new(SubValueRelation::StrictSubValue { + field: fa.clone(), + factor: fac_a.clone(), + }) + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } + } + _ => Rc::new(SubValueRelation::SubValueUnknown), + }, + SubValueRelation::IteratedSubValue { field: fa, .. } => match (*b).clone() { + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + SubValueRelation::PreservedValue => Rc::new(SubValueRelation::PreservedValue), + SubValueRelation::IteratedSubValue { field: fb, .. } => { + if inductive_field_eq(&fa, &fb) { + a.clone() + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } + } + _ => Rc::new(SubValueRelation::SubValueUnknown), + }, + SubValueRelation::ArithmeticDescent { + param: pa, + factor: fac_a, + .. + } => match (*b).clone() { + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + SubValueRelation::PreservedValue => Rc::new(SubValueRelation::PreservedValue), + SubValueRelation::ArithmeticDescent { + param: pb, + factor: fac_b, + .. + } => { + if (pa.clone().as_str() == pb.clone().as_str()) { + if shrink_factor_eq(fac_a.clone(), fac_b.clone()) { + Rc::new(SubValueRelation::ArithmeticDescent { + param: pa.clone(), + factor: fac_a.clone(), + }) + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } + } + _ => Rc::new(SubValueRelation::SubValueUnknown), + }, + } } pub fn join_sub_value(a: Rc, b: Rc) -> Rc { match (*a.clone()).clone() { - SubValueRelation::SubValueUnknown => b.clone(), - SubValueRelation::PreservedValue => match (*b.clone()).clone() { - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::PreservedValue), - _ => b.clone(), -}, - SubValueRelation::StrictSubValue { field: fa, factor: fac_a, .. } => match (*b.clone()).clone() { - SubValueRelation::SubValueUnknown => a.clone(), - SubValueRelation::PreservedValue => a.clone(), - SubValueRelation::StrictSubValue { field: fb, factor: fac_b, .. } => if inductive_field_eq(&fa, &fb) { - if shrink_factor_eq(fac_a.clone(), fac_b.clone()) { - Rc::new(SubValueRelation::StrictSubValue { - field: fa.clone(), - factor: fac_a.clone(), -}) - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } - } else { - Rc::new(SubValueRelation::SubValueUnknown) - }, - _ => Rc::new(SubValueRelation::SubValueUnknown), -}, - SubValueRelation::IteratedSubValue { field: fa, .. } => match (*b.clone()).clone() { - SubValueRelation::SubValueUnknown => a.clone(), - SubValueRelation::PreservedValue => a.clone(), - SubValueRelation::IteratedSubValue { field: fb, .. } => if inductive_field_eq(&fa, &fb) { - a.clone() - } else { - Rc::new(SubValueRelation::SubValueUnknown) - }, - _ => Rc::new(SubValueRelation::SubValueUnknown), -}, - SubValueRelation::ArithmeticDescent { param: pa, factor: fac_a, .. } => match (*b.clone()).clone() { - SubValueRelation::SubValueUnknown => a.clone(), - SubValueRelation::PreservedValue => a.clone(), - SubValueRelation::ArithmeticDescent { param: pb, factor: fac_b, .. } => if (pa.clone().as_str() == pb.clone().as_str()) { - if shrink_factor_eq(fac_a.clone(), fac_b.clone()) { - Rc::new(SubValueRelation::ArithmeticDescent { - param: pa.clone(), - factor: fac_a.clone(), -}) - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } - } else { - Rc::new(SubValueRelation::SubValueUnknown) - }, - _ => Rc::new(SubValueRelation::SubValueUnknown), -}, -} + SubValueRelation::SubValueUnknown => b.clone(), + SubValueRelation::PreservedValue => match (*b.clone()).clone() { + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::PreservedValue), + _ => b.clone(), + }, + SubValueRelation::StrictSubValue { + field: fa, + factor: fac_a, + .. + } => match (*b.clone()).clone() { + SubValueRelation::SubValueUnknown => a.clone(), + SubValueRelation::PreservedValue => a.clone(), + SubValueRelation::StrictSubValue { + field: fb, + factor: fac_b, + .. + } => { + if inductive_field_eq(&fa, &fb) { + if shrink_factor_eq(fac_a.clone(), fac_b.clone()) { + Rc::new(SubValueRelation::StrictSubValue { + field: fa.clone(), + factor: fac_a.clone(), + }) + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } + } + _ => Rc::new(SubValueRelation::SubValueUnknown), + }, + SubValueRelation::IteratedSubValue { field: fa, .. } => match (*b.clone()).clone() { + SubValueRelation::SubValueUnknown => a.clone(), + SubValueRelation::PreservedValue => a.clone(), + SubValueRelation::IteratedSubValue { field: fb, .. } => { + if inductive_field_eq(&fa, &fb) { + a.clone() + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } + } + _ => Rc::new(SubValueRelation::SubValueUnknown), + }, + SubValueRelation::ArithmeticDescent { + param: pa, + factor: fac_a, + .. + } => match (*b.clone()).clone() { + SubValueRelation::SubValueUnknown => a.clone(), + SubValueRelation::PreservedValue => a.clone(), + SubValueRelation::ArithmeticDescent { + param: pb, + factor: fac_b, + .. + } => { + if (pa.clone().as_str() == pb.clone().as_str()) { + if shrink_factor_eq(fac_a.clone(), fac_b.clone()) { + Rc::new(SubValueRelation::ArithmeticDescent { + param: pa.clone(), + factor: fac_a.clone(), + }) + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } + } + _ => Rc::new(SubValueRelation::SubValueUnknown), + }, + } } -pub fn compose_sub_value(base: Rc, field: Rc) -> Rc { +pub fn compose_sub_value( + base: Rc, + field: Rc, +) -> Rc { match (*base).clone() { - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - _ => Rc::new(SubValueRelation::StrictSubValue { - field: field, - factor: Rc::new(ShrinkFactor::UnitShrink), -}), -} + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + _ => Rc::new(SubValueRelation::StrictSubValue { + field: field, + factor: Rc::new(ShrinkFactor::UnitShrink), + }), + } } -pub fn compose_sub_value_relations(arg_rel: Rc, callee_rel: Rc) -> Rc { +pub fn compose_sub_value_relations( + arg_rel: Rc, + callee_rel: Rc, +) -> Rc { match (*callee_rel.clone()).clone() { - SubValueRelation::PreservedValue => arg_rel, - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - SubValueRelation::StrictSubValue { .. } => match (*arg_rel).clone() { - SubValueRelation::PreservedValue => callee_rel.clone(), - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - SubValueRelation::StrictSubValue { field: f, .. } => Rc::new(SubValueRelation::StrictSubValue { - field: f.clone(), - factor: Rc::new(ShrinkFactor::UnitShrink), -}), - SubValueRelation::IteratedSubValue { field: f, .. } => Rc::new(SubValueRelation::StrictSubValue { - field: f.clone(), - factor: Rc::new(ShrinkFactor::UnitShrink), -}), - SubValueRelation::ArithmeticDescent { .. } => Rc::new(SubValueRelation::SubValueUnknown), -}, - SubValueRelation::IteratedSubValue { .. } => match (*arg_rel).clone() { - SubValueRelation::PreservedValue => callee_rel.clone(), - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - SubValueRelation::StrictSubValue { field: f, .. } => Rc::new(SubValueRelation::StrictSubValue { - field: f.clone(), - factor: Rc::new(ShrinkFactor::UnitShrink), -}), - SubValueRelation::IteratedSubValue { field: f, .. } => Rc::new(SubValueRelation::StrictSubValue { - field: f.clone(), - factor: Rc::new(ShrinkFactor::UnitShrink), -}), - SubValueRelation::ArithmeticDescent { .. } => Rc::new(SubValueRelation::SubValueUnknown), -}, - SubValueRelation::ArithmeticDescent { param: p, factor: f, .. } => match (*arg_rel).clone() { - SubValueRelation::PreservedValue => Rc::new(SubValueRelation::ArithmeticDescent { - param: p.clone(), - factor: f.clone(), -}), - _ => Rc::new(SubValueRelation::SubValueUnknown), -}, -} + SubValueRelation::PreservedValue => arg_rel, + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + SubValueRelation::StrictSubValue { .. } => match (*arg_rel).clone() { + SubValueRelation::PreservedValue => callee_rel.clone(), + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + SubValueRelation::StrictSubValue { field: f, .. } => { + Rc::new(SubValueRelation::StrictSubValue { + field: f.clone(), + factor: Rc::new(ShrinkFactor::UnitShrink), + }) + } + SubValueRelation::IteratedSubValue { field: f, .. } => { + Rc::new(SubValueRelation::StrictSubValue { + field: f.clone(), + factor: Rc::new(ShrinkFactor::UnitShrink), + }) + } + SubValueRelation::ArithmeticDescent { .. } => { + Rc::new(SubValueRelation::SubValueUnknown) + } + }, + SubValueRelation::IteratedSubValue { .. } => match (*arg_rel).clone() { + SubValueRelation::PreservedValue => callee_rel.clone(), + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + SubValueRelation::StrictSubValue { field: f, .. } => { + Rc::new(SubValueRelation::StrictSubValue { + field: f.clone(), + factor: Rc::new(ShrinkFactor::UnitShrink), + }) + } + SubValueRelation::IteratedSubValue { field: f, .. } => { + Rc::new(SubValueRelation::StrictSubValue { + field: f.clone(), + factor: Rc::new(ShrinkFactor::UnitShrink), + }) + } + SubValueRelation::ArithmeticDescent { .. } => { + Rc::new(SubValueRelation::SubValueUnknown) + } + }, + SubValueRelation::ArithmeticDescent { + param: p, + factor: f, + .. + } => match (*arg_rel).clone() { + SubValueRelation::PreservedValue => Rc::new(SubValueRelation::ArithmeticDescent { + param: p.clone(), + factor: f.clone(), + }), + _ => Rc::new(SubValueRelation::SubValueUnknown), + }, + } } pub fn sub_value_to_call_pattern(relation: Rc) -> Option> { match (*relation).clone() { - SubValueRelation::StrictSubValue { field: f, .. } => Some(Rc::new(CallPattern::ChildAccessorCall { - accessor: f.field_name.clone(), -})), - SubValueRelation::IteratedSubValue { field: f, .. } => Some(Rc::new(CallPattern::ChildAccessorCall { - accessor: f.field_name.clone(), -})), - SubValueRelation::ArithmeticDescent { param: p, factor: f, .. } => match (*f.clone()).clone() { - ShrinkFactor::ConstantShrink { steps, .. } => Some(Rc::new(CallPattern::ArithmeticSubtractCall { - steps: steps.clone(), - ring_param: p.clone(), -})), - ShrinkFactor::ProportionalShrink { divisor: d, .. } => Some(Rc::new(CallPattern::ArithmeticDivideCall { - divisor: d.clone(), - ring_param: p.clone(), -})), - ShrinkFactor::UnitShrink => Some(Rc::new(CallPattern::ArithmeticSubtractCall { - steps: Rc::new(PositiveDescentAmount::OneStep), - ring_param: p.clone(), -})), -}, - SubValueRelation::PreservedValue => Some(Rc::new(CallPattern::SameArgumentCall)), - SubValueRelation::SubValueUnknown => None, -} + SubValueRelation::StrictSubValue { field: f, .. } => { + Some(Rc::new(CallPattern::ChildAccessorCall { + accessor: f.field_name.clone(), + })) + } + SubValueRelation::IteratedSubValue { field: f, .. } => { + Some(Rc::new(CallPattern::ChildAccessorCall { + accessor: f.field_name.clone(), + })) + } + SubValueRelation::ArithmeticDescent { + param: p, + factor: f, + .. + } => match (*f.clone()).clone() { + ShrinkFactor::ConstantShrink { steps, .. } => { + Some(Rc::new(CallPattern::ArithmeticSubtractCall { + steps: steps.clone(), + ring_param: p.clone(), + })) + } + ShrinkFactor::ProportionalShrink { divisor: d, .. } => { + Some(Rc::new(CallPattern::ArithmeticDivideCall { + divisor: d.clone(), + ring_param: p.clone(), + })) + } + ShrinkFactor::UnitShrink => Some(Rc::new(CallPattern::ArithmeticSubtractCall { + steps: Rc::new(PositiveDescentAmount::OneStep), + ring_param: p.clone(), + })), + }, + SubValueRelation::PreservedValue => Some(Rc::new(CallPattern::SameArgumentCall)), + SubValueRelation::SubValueUnknown => None, + } } pub fn sub_value_to_lowering_target(relation: Rc) -> Option> { match (*relation).clone() { - SubValueRelation::StrictSubValue { field: f, factor: fac, .. } => Some(Rc::new(LoweringTarget { - primitive: IterationPrimitive::Descend, - bound: tree_size_bound(f.field_name.clone()), - evidence: DescentEvidence::Strict, - factor: Some(fac.clone()), -})), - SubValueRelation::IteratedSubValue { field: f, .. } => Some(Rc::new(LoweringTarget { - primitive: IterationPrimitive::Fold, - bound: Rc::new(SizeBound::CollectionSize { - param: f.field_name.clone(), -}), - evidence: DescentEvidence::Strict, - factor: None, -})), - SubValueRelation::ArithmeticDescent { param: p, factor: fac, .. } => Some(Rc::new(LoweringTarget { - primitive: IterationPrimitive::Repeat, - bound: Rc::new(SizeBound::ArithmeticParam { - param: p.clone(), -}), - evidence: DescentEvidence::Strict, - factor: Some(fac.clone()), -})), - SubValueRelation::PreservedValue => Some(Rc::new(LoweringTarget { - primitive: IterationPrimitive::Repeat, - bound: Rc::new(SizeBound::Forever), - evidence: DescentEvidence::NonIncreasing, - factor: None, -})), - SubValueRelation::SubValueUnknown => None, -} + SubValueRelation::StrictSubValue { + field: f, + factor: fac, + .. + } => Some(Rc::new(LoweringTarget { + primitive: IterationPrimitive::Descend, + bound: tree_size_bound(f.field_name.clone()), + evidence: DescentEvidence::Strict, + factor: Some(fac.clone()), + })), + SubValueRelation::IteratedSubValue { field: f, .. } => Some(Rc::new(LoweringTarget { + primitive: IterationPrimitive::Fold, + bound: Rc::new(SizeBound::CollectionSize { + param: f.field_name.clone(), + }), + evidence: DescentEvidence::Strict, + factor: None, + })), + SubValueRelation::ArithmeticDescent { + param: p, + factor: fac, + .. + } => Some(Rc::new(LoweringTarget { + primitive: IterationPrimitive::Repeat, + bound: Rc::new(SizeBound::ArithmeticParam { param: p.clone() }), + evidence: DescentEvidence::Strict, + factor: Some(fac.clone()), + })), + SubValueRelation::PreservedValue => Some(Rc::new(LoweringTarget { + primitive: IterationPrimitive::Repeat, + bound: Rc::new(SizeBound::Forever), + evidence: DescentEvidence::NonIncreasing, + factor: None, + })), + SubValueRelation::SubValueUnknown => None, + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -367,8 +469,8 @@ pub enum PolynomialExponent { pub fn poly_exp_degree_one() -> Rc { Rc::new(PolynomialExponent::IntegerExpPos { - degree: Rc::new(PositiveDescentAmount::OneStep), -}) + degree: Rc::new(PositiveDescentAmount::OneStep), + }) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -413,23 +515,23 @@ pub enum CostBound { pub fn sum_bound(terms: &Rc>>) -> Rc { match terms.clone().first().cloned() { - None => Rc::new(CostBound::ErrorBound), - Some(_) => Rc::new(CostBound::SumBound { - terms: terms.clone(), -}), -} + None => Rc::new(CostBound::ErrorBound), + Some(_) => Rc::new(CostBound::SumBound { + terms: terms.clone(), + }), + } } pub fn cost_bound_is_sum_bound(b: Rc) -> bool { match (*b).clone() { - CostBound::SumBound { .. } => true, - CostBound::ConstantBound => false, - CostBound::AtomicBound { .. } => false, - CostBound::ProductBound { .. } => false, - CostBound::SumOfProductsBound { .. } => false, - CostBound::ForeverBound => false, - CostBound::ErrorBound => false, -} + CostBound::SumBound { .. } => true, + CostBound::ConstantBound => false, + CostBound::AtomicBound { .. } => false, + CostBound::ProductBound { .. } => false, + CostBound::SumOfProductsBound { .. } => false, + CostBound::ForeverBound => false, + CostBound::ErrorBound => false, + } } pub fn cost_constant() -> Rc { @@ -438,11 +540,11 @@ pub fn cost_constant() -> Rc { pub fn cost_linear(param: String) -> Rc { Rc::new(CostBound::AtomicBound { - cost: Rc::new(AtomicCost::PolyCost { - param: param, - exponent: poly_exp_degree_one(), -}), -}) + cost: Rc::new(AtomicCost::PolyCost { + param: param, + exponent: poly_exp_degree_one(), + }), + }) } pub fn cost_poly(param: String, degree: i64) -> Rc { @@ -451,23 +553,23 @@ pub fn cost_poly(param: String, degree: i64) -> Rc { } else { if (degree.clone() == 0) { Rc::new(CostBound::AtomicBound { - cost: Rc::new(AtomicCost::PolyCost { - param: param, - exponent: Rc::new(PolynomialExponent::IntegerExpZero), -}), -}) + cost: Rc::new(AtomicCost::PolyCost { + param: param, + exponent: Rc::new(PolynomialExponent::IntegerExpZero), + }), + }) } else { match positive_descent_amount_from_positive_int(degree.clone()) { - Some(deg) => Rc::new(CostBound::AtomicBound { - cost: Rc::new(AtomicCost::PolyCost { - param: param, - exponent: Rc::new(PolynomialExponent::IntegerExpPos { - degree: deg.clone(), -}), -}), -}), - None => Rc::new(CostBound::ErrorBound), -} + Some(deg) => Rc::new(CostBound::AtomicBound { + cost: Rc::new(AtomicCost::PolyCost { + param: param, + exponent: Rc::new(PolynomialExponent::IntegerExpPos { + degree: deg.clone(), + }), + }), + }), + None => Rc::new(CostBound::ErrorBound), + } } } } @@ -477,17 +579,17 @@ pub fn cost_root(param: String, k: i64) -> Rc { Rc::new(CostBound::ErrorBound) } else { match positive_descent_amount_from_positive_int(k.clone()) { - Some(rw) => Rc::new(CostBound::AtomicBound { - cost: Rc::new(AtomicCost::PolyCost { - param: param, - exponent: Rc::new(PolynomialExponent::FractionExp { - numerator: Rc::new(PositiveDescentAmount::OneStep), - root: rw.clone(), -}), -}), -}), - None => Rc::new(CostBound::ErrorBound), -} + Some(rw) => Rc::new(CostBound::AtomicBound { + cost: Rc::new(AtomicCost::PolyCost { + param: param, + exponent: Rc::new(PolynomialExponent::FractionExp { + numerator: Rc::new(PositiveDescentAmount::OneStep), + root: rw.clone(), + }), + }), + }), + None => Rc::new(CostBound::ErrorBound), + } } } @@ -501,33 +603,37 @@ pub fn cost_cbrt(param: String) -> Rc { pub fn cost_log(param: String) -> Rc { Rc::new(CostBound::AtomicBound { - cost: Rc::new(AtomicCost::LogCost { - param: param, -}), -}) + cost: Rc::new(AtomicCost::LogCost { param: param }), + }) } pub fn cost_nlogn(param: &String) -> Rc { Rc::new(CostBound::ProductBound { - factors: Rc::new(vec![Rc::new(AtomicCost::PolyCost { - param: param.clone(), - exponent: poly_exp_degree_one(), -}), Rc::new(AtomicCost::LogCost { - param: param.clone(), -})]), -}) + factors: Rc::new(vec![ + Rc::new(AtomicCost::PolyCost { + param: param.clone(), + exponent: poly_exp_degree_one(), + }), + Rc::new(AtomicCost::LogCost { + param: param.clone(), + }), + ]), + }) } pub fn cost_graph_linear(v_param: String, e_param: String) -> Rc { Rc::new(CostBound::SumOfProductsBound { - terms: Rc::new(vec![Rc::new(vec![Rc::new(AtomicCost::PolyCost { - param: v_param, - exponent: poly_exp_degree_one(), -})]), Rc::new(vec![Rc::new(AtomicCost::PolyCost { - param: e_param, - exponent: poly_exp_degree_one(), -})])]), -}) + terms: Rc::new(vec![ + Rc::new(vec![Rc::new(AtomicCost::PolyCost { + param: v_param, + exponent: poly_exp_degree_one(), + })]), + Rc::new(vec![Rc::new(AtomicCost::PolyCost { + param: e_param, + exponent: poly_exp_degree_one(), + })]), + ]), + }) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -619,41 +725,46 @@ pub fn bounded_int_pow_exponent(k: i64) -> Option { } pub fn int_pow_bounded(base: i64, exp: i64) -> Option { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - match bounded_int_pow_exponent(exp.clone()) { - None => None, - Some(e) => if (e.clone() == 0) { - Some(1) - } else { - if (base.clone() == 0) { - Some(0) - } else { - if (base.clone() == 1) { + stacker::maybe_grow( + 512 * 1024, + 2 * 1024 * 1024, + || match bounded_int_pow_exponent(exp.clone()) { + None => None, + Some(e) => { + if (e.clone() == 0) { Some(1) } else { - if (base.clone() == (0 - 1)) { - { - let half = (e.clone() / 2); -if ((half.clone() + half.clone()) == e.clone()) { - Some(1) + if (base.clone() == 0) { + Some(0) + } else { + if (base.clone() == 1) { + Some(1) + } else { + if (base.clone() == (0 - 1)) { + { + let half = (e.clone() / 2); + if ((half.clone() + half.clone()) == e.clone()) { + Some(1) + } else { + Some((0 - 1)) + } + } } else { - Some((0 - 1)) + match int_pow_bounded(base.clone(), (exp.clone() - 1)) { + Some(prev) => match int_mul_checked(base.clone(), prev.clone()) + { + Some(prod) => Some(prod.clone()), + None => None, + }, + None => None, + } } -} - } else { - match int_pow_bounded(base.clone(), (exp.clone() - 1)) { - Some(prev) => match int_mul_checked(base.clone(), prev.clone()) { - Some(prod) => Some(prod.clone()), - None => None, -}, - None => None, -} + } } } } }, -} - }) + ) } pub fn ceil_log(base: i64, argument: i64) -> Option { @@ -668,82 +779,97 @@ pub fn ceil_log_iter(mut base: i64, mut argument: i64, mut k: i64, mut power: i6 loop { if (power.clone() >= argument.clone()) { break Some(k); -} else { + } else { match int_mul_checked(power.clone(), base.clone()) { - None => { break None; }, - Some(next_power) => { match int_add_checked(k, 1) { - None => { break None; }, - Some(k1) => { { - let __tco_0 = k1.clone(); -let __tco_1 = next_power.clone(); -k = __tco_0; -power = __tco_1; -continue; -} }, -} }, -} -} -} + None => { + break None; + } + Some(next_power) => match int_add_checked(k, 1) { + None => { + break None; + } + Some(k1) => { + let __tco_0 = k1.clone(); + let __tco_1 = next_power.clone(); + k = __tco_0; + power = __tco_1; + continue; + } + }, + } + } + } } pub fn master_theorem(form: &Rc) -> Rc { { let a = form.branches.clone(); -let b = form.divisor.clone(); -let d = form.work_exponent.clone(); -let n = form.param.clone(); -if ((a.clone() < 1) || (b.clone() < 2)) { + let b = form.divisor.clone(); + let d = form.work_exponent.clone(); + let n = form.param.clone(); + if ((a.clone() < 1) || (b.clone() < 2)) { Rc::new(CostBound::ErrorBound) } else { match bounded_int_pow_exponent(d) { - None => Rc::new(CostBound::ErrorBound), - Some(d_ok) => match int_pow_bounded(b.clone(), d_ok.clone()) { - None => Rc::new(CostBound::ErrorBound), - Some(b_to_d) => if (a.clone() < b_to_d.clone()) { - match d_ok.clone() { - 0 => Rc::new(CostBound::ConstantBound), - _ => cost_poly(n.clone(), d_ok.clone()), -} - } else { - if (a.clone() == b_to_d.clone()) { - match d_ok.clone() { - 0 => cost_log(n.clone()), - _ => match positive_descent_amount_from_positive_int(d_ok.clone()) { - Some(deg) => Rc::new(CostBound::ProductBound { - factors: Rc::new(vec![Rc::new(AtomicCost::PolyCost { - param: n.clone(), - exponent: Rc::new(PolynomialExponent::IntegerExpPos { - degree: deg.clone(), -}), -}), Rc::new(AtomicCost::LogCost { - param: n.clone(), -})]), -}), - None => Rc::new(CostBound::ErrorBound), -}, -} - } else { - match proportional_divisor_from_int_at_least_two(b.clone()) { - Some(base_w) => match positive_descent_amount_from_positive_int(a.clone()) { - Some(arg_w) => Rc::new(CostBound::AtomicBound { - cost: Rc::new(AtomicCost::PolyCost { - param: n.clone(), - exponent: Rc::new(PolynomialExponent::LogBasedExp { - base: base_w.clone(), - argument: arg_w.clone(), -}), -}), -}), - None => Rc::new(CostBound::ErrorBound), -}, - None => Rc::new(CostBound::ErrorBound), -} - } - }, -}, -} + None => Rc::new(CostBound::ErrorBound), + Some(d_ok) => match int_pow_bounded(b.clone(), d_ok.clone()) { + None => Rc::new(CostBound::ErrorBound), + Some(b_to_d) => { + if (a.clone() < b_to_d.clone()) { + match d_ok.clone() { + 0 => Rc::new(CostBound::ConstantBound), + _ => cost_poly(n.clone(), d_ok.clone()), + } + } else { + if (a.clone() == b_to_d.clone()) { + match d_ok.clone() { + 0 => cost_log(n.clone()), + _ => match positive_descent_amount_from_positive_int( + d_ok.clone(), + ) { + Some(deg) => Rc::new(CostBound::ProductBound { + factors: Rc::new(vec![ + Rc::new(AtomicCost::PolyCost { + param: n.clone(), + exponent: Rc::new( + PolynomialExponent::IntegerExpPos { + degree: deg.clone(), + }, + ), + }), + Rc::new(AtomicCost::LogCost { param: n.clone() }), + ]), + }), + None => Rc::new(CostBound::ErrorBound), + }, + } + } else { + match proportional_divisor_from_int_at_least_two(b.clone()) { + Some(base_w) => { + match positive_descent_amount_from_positive_int(a.clone()) { + Some(arg_w) => Rc::new(CostBound::AtomicBound { + cost: Rc::new(AtomicCost::PolyCost { + param: n.clone(), + exponent: Rc::new( + PolynomialExponent::LogBasedExp { + base: base_w.clone(), + argument: arg_w.clone(), + }, + ), + }), + }), + None => Rc::new(CostBound::ErrorBound), + } + } + None => Rc::new(CostBound::ErrorBound), + } + } + } + } + }, + } } -} + } } pub fn catamorphism_bound(param: String, nesting_depth: i64) -> Rc { @@ -758,31 +884,42 @@ pub fn catamorphism_bound(param: String, nesting_depth: i64) -> Rc { } } -pub fn derive_bound(param: String, branches: i64, factor: Rc, work_exponent: i64) -> Rc { +pub fn derive_bound( + param: String, + branches: i64, + factor: Rc, + work_exponent: i64, +) -> Rc { if (branches.clone() < 1) { Rc::new(CostBound::ErrorBound) } else { match bounded_int_pow_exponent(work_exponent.clone()) { - None => Rc::new(CostBound::ErrorBound), - Some(_) => match (*factor).clone() { - ShrinkFactor::UnitShrink => if (branches.clone() <= 1) { - cost_linear(param) - } else { - Rc::new(CostBound::ForeverBound) - }, - ShrinkFactor::ConstantShrink { .. } => if (branches.clone() <= 1) { - cost_linear(param) - } else { - Rc::new(CostBound::ForeverBound) - }, - ShrinkFactor::ProportionalShrink { divisor: d, .. } => master_theorem(&Rc::new(RecurrenceForm { - param: param, - branches: branches.clone(), - divisor: proportional_divisor_to_int(d.clone()), - work_exponent: work_exponent.clone(), -})), -}, -} + None => Rc::new(CostBound::ErrorBound), + Some(_) => match (*factor).clone() { + ShrinkFactor::UnitShrink => { + if (branches.clone() <= 1) { + cost_linear(param) + } else { + Rc::new(CostBound::ForeverBound) + } + } + ShrinkFactor::ConstantShrink { .. } => { + if (branches.clone() <= 1) { + cost_linear(param) + } else { + Rc::new(CostBound::ForeverBound) + } + } + ShrinkFactor::ProportionalShrink { divisor: d, .. } => { + master_theorem(&Rc::new(RecurrenceForm { + param: param, + branches: branches.clone(), + divisor: proportional_divisor_to_int(d.clone()), + work_exponent: work_exponent.clone(), + })) + } + }, + } } } @@ -799,27 +936,47 @@ pub fn linear_scan_bound() -> Rc { } pub fn binary_search_bound() -> Rc { - derive_bound("xs".to_string(), 1, Rc::new(ShrinkFactor::ProportionalShrink { - divisor: Rc::new(ProportionalDivisor::DivideByTwo), -}), 0) + derive_bound( + "xs".to_string(), + 1, + Rc::new(ShrinkFactor::ProportionalShrink { + divisor: Rc::new(ProportionalDivisor::DivideByTwo), + }), + 0, + ) } pub fn mergesort_bound() -> Rc { - derive_bound("xs".to_string(), 2, Rc::new(ShrinkFactor::ProportionalShrink { - divisor: Rc::new(ProportionalDivisor::DivideByTwo), -}), 1) + derive_bound( + "xs".to_string(), + 2, + Rc::new(ShrinkFactor::ProportionalShrink { + divisor: Rc::new(ProportionalDivisor::DivideByTwo), + }), + 1, + ) } pub fn karatsuba_bound() -> Rc { - derive_bound("digits".to_string(), 3, Rc::new(ShrinkFactor::ProportionalShrink { - divisor: Rc::new(ProportionalDivisor::DivideByTwo), -}), 1) + derive_bound( + "digits".to_string(), + 3, + Rc::new(ShrinkFactor::ProportionalShrink { + divisor: Rc::new(ProportionalDivisor::DivideByTwo), + }), + 1, + ) } pub fn strassen_bound() -> Rc { - derive_bound("n".to_string(), 7, Rc::new(ShrinkFactor::ProportionalShrink { - divisor: Rc::new(ProportionalDivisor::DivideByTwo), -}), 2) + derive_bound( + "n".to_string(), + 7, + Rc::new(ShrinkFactor::ProportionalShrink { + divisor: Rc::new(ProportionalDivisor::DivideByTwo), + }), + 2, + ) } pub fn trial_division_bound() -> Rc { @@ -840,30 +997,42 @@ pub fn bfs_dfs_bound() -> Rc { pub fn dijkstra_bound() -> Rc { Rc::new(CostBound::SumOfProductsBound { - terms: Rc::new(vec![Rc::new(vec![Rc::new(AtomicCost::PolyCost { - param: "V".to_string(), - exponent: poly_exp_degree_one(), -}), Rc::new(AtomicCost::LogCost { - param: "V".to_string(), -})]), Rc::new(vec![Rc::new(AtomicCost::PolyCost { - param: "E".to_string(), - exponent: poly_exp_degree_one(), -}), Rc::new(AtomicCost::LogCost { - param: "V".to_string(), -})])]), -}) + terms: Rc::new(vec![ + Rc::new(vec![ + Rc::new(AtomicCost::PolyCost { + param: "V".to_string(), + exponent: poly_exp_degree_one(), + }), + Rc::new(AtomicCost::LogCost { + param: "V".to_string(), + }), + ]), + Rc::new(vec![ + Rc::new(AtomicCost::PolyCost { + param: "E".to_string(), + exponent: poly_exp_degree_one(), + }), + Rc::new(AtomicCost::LogCost { + param: "V".to_string(), + }), + ]), + ]), + }) } pub fn bellman_ford_bound() -> Rc { Rc::new(CostBound::ProductBound { - factors: Rc::new(vec![Rc::new(AtomicCost::PolyCost { - param: "V".to_string(), - exponent: poly_exp_degree_one(), -}), Rc::new(AtomicCost::PolyCost { - param: "E".to_string(), - exponent: poly_exp_degree_one(), -})]), -}) + factors: Rc::new(vec![ + Rc::new(AtomicCost::PolyCost { + param: "V".to_string(), + exponent: poly_exp_degree_one(), + }), + Rc::new(AtomicCost::PolyCost { + param: "E".to_string(), + exponent: poly_exp_degree_one(), + }), + ]), + }) } pub fn floyd_warshall_bound() -> Rc { diff --git a/src/v2/stage0/src/std_iteration.rs b/src/v2/stage0/src/std_iteration.rs index 044b21e8651..306aae0c49b 100644 --- a/src/v2/stage0/src/std_iteration.rs +++ b/src/v2/stage0/src/std_iteration.rs @@ -1,10 +1,8 @@ // Generated by v2 compiler -- do not edit. // Source module: std.iteration -use std::collections::HashMap; -use std::rc::Rc; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; - - +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; diff --git a/src/v2/stage0/src/std_node.rs b/src/v2/stage0/src/std_node.rs index b388294735d..7837270511c 100644 --- a/src/v2/stage0/src/std_node.rs +++ b/src/v2/stage0/src/std_node.rs @@ -1,98 +1,100 @@ // Generated by v2 compiler -- do not edit. // Source module: std.node -use std::collections::HashMap; -use std::rc::Rc; +use crate::std_induction::RecursionShape::{ + DirectRecursion, ListRecursion, MapValueRecursion, OptionalRecursion, SetRecursion, +}; +pub use crate::std_induction::{InductiveField, RecursionShape}; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; -pub use crate::std_induction::{InductiveField, RecursionShape}; -use crate::std_induction::RecursionShape::{DirectRecursion, ListRecursion, OptionalRecursion, SetRecursion, MapValueRecursion}; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn compiler_inductive_fields() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - Rc::new(vec![Rc::new(InductiveField { - type_name: "Node".to_string(), - variant_name: "".to_string(), - field_name: "children".to_string(), - shape: RecursionShape::ListRecursion, - element_type: "Node".to_string(), -}), Rc::new(InductiveField { - type_name: "Node".to_string(), - variant_name: "".to_string(), - field_name: "params".to_string(), - shape: RecursionShape::ListRecursion, - element_type: "Node".to_string(), -}), Rc::new(InductiveField { - type_name: "Node".to_string(), - variant_name: "".to_string(), - field_name: "uses".to_string(), - shape: RecursionShape::ListRecursion, - element_type: "Node".to_string(), -}), Rc::new(InductiveField { - type_name: "Node".to_string(), - variant_name: "".to_string(), - field_name: "properties".to_string(), - shape: RecursionShape::ListRecursion, - element_type: "Node".to_string(), -}), Rc::new(InductiveField { - type_name: "Node".to_string(), - variant_name: "".to_string(), - field_name: "body".to_string(), - shape: RecursionShape::OptionalRecursion, - element_type: "Node".to_string(), -}), Rc::new(InductiveField { - type_name: "Node".to_string(), - variant_name: "".to_string(), - field_name: "transport".to_string(), - shape: RecursionShape::OptionalRecursion, - element_type: "Node".to_string(), -}), Rc::new(InductiveField { - type_name: "Node".to_string(), - variant_name: "".to_string(), - field_name: "type_annotation".to_string(), - shape: RecursionShape::OptionalRecursion, - element_type: "Node".to_string(), -}), Rc::new(InductiveField { - type_name: "Node".to_string(), - variant_name: "".to_string(), - field_name: "inferred".to_string(), - shape: RecursionShape::OptionalRecursion, - element_type: "InferredNode".to_string(), -}), Rc::new(InductiveField { - type_name: "InferredNode".to_string(), - variant_name: "Resolved".to_string(), - field_name: "node".to_string(), - shape: RecursionShape::DirectRecursion, - element_type: "Node".to_string(), -}), Rc::new(InductiveField { - type_name: "MatchPattern".to_string(), - variant_name: "VariantPattern".to_string(), - field_name: "field_bindings".to_string(), - shape: RecursionShape::ListRecursion, - element_type: "Node".to_string(), -}), Rc::new(InductiveField { - type_name: "MethodSemantics".to_string(), - variant_name: "AlgebraMethodSemantics".to_string(), - field_name: "method_def".to_string(), - shape: RecursionShape::DirectRecursion, - element_type: "Node".to_string(), -}), Rc::new(InductiveField { - type_name: "MethodSemantics".to_string(), - variant_name: "AlgebraMethodSemantics".to_string(), - field_name: "fold_accumulator_type".to_string(), - shape: RecursionShape::OptionalRecursion, - element_type: "Node".to_string(), -}), Rc::new(InductiveField { - type_name: "MethodSemantics".to_string(), - variant_name: "ServiceMethodSemantics".to_string(), - field_name: "op_params".to_string(), - shape: RecursionShape::ListRecursion, - element_type: "Node".to_string(), -})]) - }; - } + static CACHED: Rc>> = { + Rc::new(vec![Rc::new(InductiveField { + type_name: "Node".to_string(), + variant_name: "".to_string(), + field_name: "children".to_string(), + shape: RecursionShape::ListRecursion, + element_type: "Node".to_string(), + }), Rc::new(InductiveField { + type_name: "Node".to_string(), + variant_name: "".to_string(), + field_name: "params".to_string(), + shape: RecursionShape::ListRecursion, + element_type: "Node".to_string(), + }), Rc::new(InductiveField { + type_name: "Node".to_string(), + variant_name: "".to_string(), + field_name: "uses".to_string(), + shape: RecursionShape::ListRecursion, + element_type: "Node".to_string(), + }), Rc::new(InductiveField { + type_name: "Node".to_string(), + variant_name: "".to_string(), + field_name: "properties".to_string(), + shape: RecursionShape::ListRecursion, + element_type: "Node".to_string(), + }), Rc::new(InductiveField { + type_name: "Node".to_string(), + variant_name: "".to_string(), + field_name: "body".to_string(), + shape: RecursionShape::OptionalRecursion, + element_type: "Node".to_string(), + }), Rc::new(InductiveField { + type_name: "Node".to_string(), + variant_name: "".to_string(), + field_name: "transport".to_string(), + shape: RecursionShape::OptionalRecursion, + element_type: "Node".to_string(), + }), Rc::new(InductiveField { + type_name: "Node".to_string(), + variant_name: "".to_string(), + field_name: "type_annotation".to_string(), + shape: RecursionShape::OptionalRecursion, + element_type: "Node".to_string(), + }), Rc::new(InductiveField { + type_name: "Node".to_string(), + variant_name: "".to_string(), + field_name: "inferred".to_string(), + shape: RecursionShape::OptionalRecursion, + element_type: "InferredNode".to_string(), + }), Rc::new(InductiveField { + type_name: "InferredNode".to_string(), + variant_name: "Resolved".to_string(), + field_name: "node".to_string(), + shape: RecursionShape::DirectRecursion, + element_type: "Node".to_string(), + }), Rc::new(InductiveField { + type_name: "MatchPattern".to_string(), + variant_name: "VariantPattern".to_string(), + field_name: "field_bindings".to_string(), + shape: RecursionShape::ListRecursion, + element_type: "Node".to_string(), + }), Rc::new(InductiveField { + type_name: "MethodSemantics".to_string(), + variant_name: "AlgebraMethodSemantics".to_string(), + field_name: "method_def".to_string(), + shape: RecursionShape::DirectRecursion, + element_type: "Node".to_string(), + }), Rc::new(InductiveField { + type_name: "MethodSemantics".to_string(), + variant_name: "AlgebraMethodSemantics".to_string(), + field_name: "fold_accumulator_type".to_string(), + shape: RecursionShape::OptionalRecursion, + element_type: "Node".to_string(), + }), Rc::new(InductiveField { + type_name: "MethodSemantics".to_string(), + variant_name: "ServiceMethodSemantics".to_string(), + field_name: "op_params".to_string(), + shape: RecursionShape::ListRecursion, + element_type: "Node".to_string(), + })]) + }; + } CACHED.with(|c| c.clone()) } @@ -112,7 +114,7 @@ pub fn compiler_recursive_types() -> Rc> { pub fn is_compiler_recursive_type(name: String) -> bool { match v2_rt::map_get(&compiler_recursive_types(), name) { - Some(_) => true, - None => false, -} + Some(_) => true, + None => false, + } } diff --git a/src/v2/stage0/src/std_syntax.rs b/src/v2/stage0/src/std_syntax.rs index 80c4dd8193d..3f1dc19b430 100644 --- a/src/v2/stage0/src/std_syntax.rs +++ b/src/v2/stage0/src/std_syntax.rs @@ -1,16 +1,16 @@ // Generated by v2 compiler -- do not edit. // Source module: std.syntax -use std::collections::HashMap; -use std::rc::Rc; -use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; +use self::AlgebraFieldKind::*; use self::BinOp::*; -use self::LiteralValue::*; use self::BodyKind::*; use self::ItemFormKind::*; -use self::AlgebraFieldKind::*; +use self::LiteralValue::*; +use crate::v2_rt; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] @@ -34,18 +34,10 @@ pub enum BinOp { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum LiteralValue { - LitStr { - value: String, - }, - LitInt { - value: i64, - }, - LitFloat { - value: String, - }, - LitBool { - value: bool, - }, + LitStr { value: String }, + LitInt { value: i64 }, + LitFloat { value: String }, + LitBool { value: bool }, LitNull, } @@ -105,34 +97,34 @@ pub struct AlgebraFieldEntry { pub fn algebra_field_entries() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - Rc::new(vec![Rc::new(AlgebraFieldEntry { - kind: AlgebraFieldKind::AlgAdd, - field_name: "add".to_string(), -}), Rc::new(AlgebraFieldEntry { - kind: AlgebraFieldKind::AlgMul, - field_name: "mul".to_string(), -}), Rc::new(AlgebraFieldEntry { - kind: AlgebraFieldKind::AlgReciprocal, - field_name: "reciprocal".to_string(), -}), Rc::new(AlgebraFieldEntry { - kind: AlgebraFieldKind::AlgQuotient, - field_name: "quotient".to_string(), -}), Rc::new(AlgebraFieldEntry { - kind: AlgebraFieldKind::AlgRemainder, - field_name: "remainder".to_string(), -}), Rc::new(AlgebraFieldEntry { - kind: AlgebraFieldKind::AlgCompare, - field_name: "compare".to_string(), -}), Rc::new(AlgebraFieldEntry { - kind: AlgebraFieldKind::AlgMeet, - field_name: "meet".to_string(), -}), Rc::new(AlgebraFieldEntry { - kind: AlgebraFieldKind::AlgJoin, - field_name: "join".to_string(), -})]) - }; - } + static CACHED: Rc>> = { + Rc::new(vec![Rc::new(AlgebraFieldEntry { + kind: AlgebraFieldKind::AlgAdd, + field_name: "add".to_string(), + }), Rc::new(AlgebraFieldEntry { + kind: AlgebraFieldKind::AlgMul, + field_name: "mul".to_string(), + }), Rc::new(AlgebraFieldEntry { + kind: AlgebraFieldKind::AlgReciprocal, + field_name: "reciprocal".to_string(), + }), Rc::new(AlgebraFieldEntry { + kind: AlgebraFieldKind::AlgQuotient, + field_name: "quotient".to_string(), + }), Rc::new(AlgebraFieldEntry { + kind: AlgebraFieldKind::AlgRemainder, + field_name: "remainder".to_string(), + }), Rc::new(AlgebraFieldEntry { + kind: AlgebraFieldKind::AlgCompare, + field_name: "compare".to_string(), + }), Rc::new(AlgebraFieldEntry { + kind: AlgebraFieldKind::AlgMeet, + field_name: "meet".to_string(), + }), Rc::new(AlgebraFieldEntry { + kind: AlgebraFieldKind::AlgJoin, + field_name: "join".to_string(), + })]) + }; + } CACHED.with(|c| c.clone()) } diff --git a/src/v2/stage0/src/std_termination.rs b/src/v2/stage0/src/std_termination.rs index fa1aa3dd700..0e132b78d33 100644 --- a/src/v2/stage0/src/std_termination.rs +++ b/src/v2/stage0/src/std_termination.rs @@ -1,18 +1,18 @@ // Generated by v2 compiler -- do not edit. // Source module: std.termination -use std::collections::HashMap; -use std::rc::Rc; -use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::std_algebra::{Ordering}; -use crate::std_algebra::Ordering::*; use self::DescentEvidence::*; -use self::RankingDimension::*; +use self::DescentSource::*; use self::PositiveDescentAmount::*; use self::ProportionalDivisor::*; -use self::DescentSource::*; +use self::RankingDimension::*; +pub use crate::std_algebra::Ordering; +use crate::std_algebra::Ordering::*; +use crate::v2_rt; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] @@ -24,82 +24,83 @@ pub enum DescentEvidence { pub fn evidence_rank(e: DescentEvidence) -> i64 { match e { - DescentEvidence::Strict => 2, - DescentEvidence::NonIncreasing => 1, - DescentEvidence::DescentUnknown => 0, -} + DescentEvidence::Strict => 2, + DescentEvidence::NonIncreasing => 1, + DescentEvidence::DescentUnknown => 0, + } } pub fn merge_evidence(a: DescentEvidence, b: DescentEvidence) -> DescentEvidence { match a { - DescentEvidence::Strict => match b { - DescentEvidence::Strict => DescentEvidence::Strict, - DescentEvidence::NonIncreasing => DescentEvidence::NonIncreasing, - _ => DescentEvidence::DescentUnknown, -}, - DescentEvidence::NonIncreasing => match b { - DescentEvidence::Strict => DescentEvidence::NonIncreasing, - DescentEvidence::NonIncreasing => DescentEvidence::NonIncreasing, - _ => DescentEvidence::DescentUnknown, -}, - _ => DescentEvidence::DescentUnknown, -} + DescentEvidence::Strict => match b { + DescentEvidence::Strict => DescentEvidence::Strict, + DescentEvidence::NonIncreasing => DescentEvidence::NonIncreasing, + _ => DescentEvidence::DescentUnknown, + }, + DescentEvidence::NonIncreasing => match b { + DescentEvidence::Strict => DescentEvidence::NonIncreasing, + DescentEvidence::NonIncreasing => DescentEvidence::NonIncreasing, + _ => DescentEvidence::DescentUnknown, + }, + _ => DescentEvidence::DescentUnknown, + } } pub fn join_evidence(a: DescentEvidence, b: DescentEvidence) -> DescentEvidence { match a { - DescentEvidence::DescentUnknown => b, - DescentEvidence::NonIncreasing => match b { - DescentEvidence::Strict => DescentEvidence::Strict, - _ => DescentEvidence::NonIncreasing, -}, - DescentEvidence::Strict => DescentEvidence::Strict, -} + DescentEvidence::DescentUnknown => b, + DescentEvidence::NonIncreasing => match b { + DescentEvidence::Strict => DescentEvidence::Strict, + _ => DescentEvidence::NonIncreasing, + }, + DescentEvidence::Strict => DescentEvidence::Strict, + } } pub fn promote_to_strict(evidence: DescentEvidence) -> DescentEvidence { match evidence { - DescentEvidence::NonIncreasing => DescentEvidence::NonIncreasing, - DescentEvidence::Strict => DescentEvidence::Strict, - _ => DescentEvidence::DescentUnknown, -} + DescentEvidence::NonIncreasing => DescentEvidence::NonIncreasing, + DescentEvidence::Strict => DescentEvidence::Strict, + _ => DescentEvidence::DescentUnknown, + } } -pub fn optional_evidence_meet(a: Option, b: Option) -> Option { +pub fn optional_evidence_meet( + a: Option, + b: Option, +) -> Option { match a.clone() { - None => b, - Some(va) => match b { - None => a.clone(), - Some(vb) => Some(merge_evidence(va.clone(), vb.clone())), -}, -} + None => b, + Some(va) => match b { + None => a.clone(), + Some(vb) => Some(merge_evidence(va.clone(), vb.clone())), + }, + } } -pub fn map_evidence_merge_at(base: &Rc>, key: &String, new_val: DescentEvidence) -> Rc> { +pub fn map_evidence_merge_at( + base: &Rc>, + key: &String, + new_val: DescentEvidence, +) -> Rc> { match v2_rt::map_get(&base, key.clone()) { - Some(existing) => v2_rt::rc_map_insert(base.clone(), key.clone(), merge_evidence(existing.clone(), new_val)), - None => v2_rt::rc_map_insert(base.clone(), key.clone(), new_val), -} + Some(existing) => v2_rt::rc_map_insert( + base.clone(), + key.clone(), + merge_evidence(existing.clone(), new_val), + ), + None => v2_rt::rc_map_insert(base.clone(), key.clone(), new_val), + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum RankingDimension { - TreeSize { - param: String, - }, - ListLength { - param: String, - }, - ArithmeticValue { - param: String, - }, - TokenPosition { - param: String, - }, - SetCardinality { - param: String, - }, + TreeSize { param: String }, + ListLength { param: String }, + ArithmeticValue { param: String }, + TokenPosition { param: String }, + SetCardinality { param: String }, } impl RankingDimension { pub fn param(&self) -> String { @@ -117,25 +118,25 @@ impl RankingDimension { #[serde(tag = "_variant")] pub enum PositiveDescentAmount { OneStep, - AdditionalStep { - previous: Rc, - }, + AdditionalStep { previous: Rc }, } impl PositiveDescentAmount { pub fn previous(&self) -> Rc { match self { PositiveDescentAmount::OneStep => panic!("no previous on unit variant"), - PositiveDescentAmount::AdditionalStep { previous: __val, .. } => __val.clone(), + PositiveDescentAmount::AdditionalStep { + previous: __val, .. + } => __val.clone(), } } } pub fn positive_descent_count(steps: Rc) -> i64 { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - match (*steps).clone() { - PositiveDescentAmount::OneStep => 1, - PositiveDescentAmount::AdditionalStep { previous: p, .. } => (1 + positive_descent_count(p.clone())), -} + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*steps).clone() { + PositiveDescentAmount::OneStep => 1, + PositiveDescentAmount::AdditionalStep { previous: p, .. } => { + (1 + positive_descent_count(p.clone())) + } }) } @@ -143,9 +144,7 @@ pub fn positive_descent_count(steps: Rc) -> i64 { #[serde(tag = "_variant")] pub enum ProportionalDivisor { DivideByTwo, - StrictlyLarger { - inner: Rc, - }, + StrictlyLarger { inner: Rc }, } impl ProportionalDivisor { pub fn inner(&self) -> Rc { @@ -157,11 +156,11 @@ impl ProportionalDivisor { } pub fn proportional_divisor_to_int(d: Rc) -> i64 { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - match (*d).clone() { - ProportionalDivisor::DivideByTwo => 2, - ProportionalDivisor::StrictlyLarger { inner: p, .. } => (1 + proportional_divisor_to_int(p.clone())), -} + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*d).clone() { + ProportionalDivisor::DivideByTwo => 2, + ProportionalDivisor::StrictlyLarger { inner: p, .. } => { + (1 + proportional_divisor_to_int(p.clone())) + } }) } @@ -181,11 +180,11 @@ pub fn positive_descent_amount_from_positive_int(k: i64) -> Option Some(Rc::new(PositiveDescentAmount::AdditionalStep { - previous: prev.clone(), -})), - None => None, -} + Some(prev) => Some(Rc::new(PositiveDescentAmount::AdditionalStep { + previous: prev.clone(), + })), + None => None, + } } } } @@ -204,11 +203,11 @@ pub fn proportional_divisor_from_int_at_least_two(k: i64) -> Option Some(Rc::new(ProportionalDivisor::StrictlyLarger { - inner: prev.clone(), -})), - None => None, -} + Some(prev) => Some(Rc::new(ProportionalDivisor::StrictlyLarger { + inner: prev.clone(), + })), + None => None, + } } } } @@ -218,24 +217,12 @@ pub fn proportional_divisor_from_int_at_least_two(k: i64) -> Option, - }, - ArithmeticSubtractDescent { - steps: Rc, - }, - ArithmeticDivideDescent { - divisor: Rc, - }, - ParserAdvance { - witness: String, - }, - SetRemoval { - element: String, - }, + ChildAccessor { accessor: String }, + ListShrink { amount: Rc }, + ArithmeticSubtractDescent { steps: Rc }, + ArithmeticDivideDescent { divisor: Rc }, + ParserAdvance { witness: String }, + SetRemoval { element: String }, FoldIteration, } diff --git a/src/v2/stage0/src/std_types.rs b/src/v2/stage0/src/std_types.rs index 95c1c47bf53..f04b8a90acf 100644 --- a/src/v2/stage0/src/std_types.rs +++ b/src/v2/stage0/src/std_types.rs @@ -1,28 +1,30 @@ // Generated by v2 compiler -- do not edit. // Source module: std.types -use std::collections::HashMap; -use std::rc::Rc; -use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::std_algebra::{BooleanAlgebra, FreeMonoid, PartialFunction, kernel_algebra_profile, algebra_type_param_names}; +use self::AbiEnv::*; +use self::Arch::*; +use self::AuthScheme::*; use self::Bool::*; -use self::Platform::*; -use self::TopologyNodeKind::*; +use self::CodegenBackend::*; +use self::CredentialFlow::*; use self::DocSourceKind::*; +use self::EntryKind::*; +use self::ExecutionEnv::*; use self::FermiDepth::*; -use self::CredentialFlow::*; -use self::Arch::*; -use self::Vendor::*; +use self::HttpMethod::*; use self::Os::*; -use self::AbiEnv::*; -use self::ExecutionEnv::*; -use self::EntryKind::*; +use self::Platform::*; use self::SymlinkTarget::*; -use self::HttpMethod::*; -use self::AuthScheme::*; -use self::CodegenBackend::*; +use self::TopologyNodeKind::*; +use self::Vendor::*; +pub use crate::std_algebra::{ + algebra_type_param_names, kernel_algebra_profile, BooleanAlgebra, FreeMonoid, PartialFunction, +}; +use crate::v2_rt; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn kernel_type_set() -> Rc> { thread_local! { @@ -44,9 +46,9 @@ pub fn kernel_type_set() -> Rc> { pub fn is_kernel_type(name: String) -> bool { match v2_rt::map_get(&kernel_type_set(), name) { - Some(_) => true, - None => false, -} + Some(_) => true, + None => false, + } } pub fn container_type_arity() -> Rc> { @@ -64,9 +66,9 @@ pub fn container_type_arity() -> Rc> { pub fn is_container_type(name: String) -> bool { match container_expected_arity(name) { - Some(_) => true, - None => false, -} + Some(_) => true, + None => false, + } } pub fn container_expected_arity(name: String) -> Option { @@ -75,19 +77,49 @@ pub fn container_expected_arity(name: String) -> Option { pub fn container_param_names_for(kind_name: String) -> Rc> { match v2_rt::map_get(&kernel_algebra_profile(), kind_name) { - Some(p) => algebra_type_param_names(p.clone()), - None => Rc::new(vec![]), -} + Some(p) => algebra_type_param_names(p.clone()), + None => Rc::new(vec![]), + } } pub fn container_param_name(kind_name: String, index: i64) -> Option { { let names = container_param_names_for(kind_name); -match Rc::new({ let mut __result = Vec::new(); for pair in Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(names.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (pair.0.clone() == index.clone()) { __result.push(pair); } } __result }).iter().cloned() { __result.push(pair.1.clone()); } __result }).first().cloned() { - Some(name) => Some(name.clone()), - None => None, -} -} + match Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + names + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + if (pair.0.clone() == index.clone()) { + __result.push(pair); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(pair.1.clone()); + } + __result + }) + .first() + .cloned() + { + Some(name) => Some(name.clone()), + None => None, + } + } } pub fn ordered_element_collections() -> Rc> { @@ -132,7 +164,14 @@ pub fn container_template_algebra(name: String) -> Option { } pub fn canonical_container_names() -> Rc> { - Rc::new(vec!["BooleanAlgebra".to_string(), "FreeMonoid".to_string(), "List".to_string(), "Map".to_string(), "PartialFunction".to_string(), "Set".to_string()]) + Rc::new(vec![ + "BooleanAlgebra".to_string(), + "FreeMonoid".to_string(), + "List".to_string(), + "Map".to_string(), + "PartialFunction".to_string(), + "Set".to_string(), + ]) } #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] @@ -142,20 +181,12 @@ pub enum Bool { False, } - - pub type Json = serde_json::Value; pub type Bytes = Vec; pub type Char = i64; - - - - - - pub type CommitSha = String; pub type Sha256 = String; @@ -421,12 +452,8 @@ pub enum HttpMethod { #[serde(tag = "_variant")] pub enum AuthScheme { Bearer, - Header { - name: String, - }, - Basic { - username: String, - }, + Header { name: String }, + Basic { username: String }, ApiKey, } @@ -620,5 +647,3 @@ pub struct DocSource { pub path: String, pub kind: DocSourceKind, } - - diff --git a/src/v2/stage0/src/v2_compiler_artifact.rs b/src/v2/stage0/src/v2_compiler_artifact.rs index 75e6b639642..d2e80ac7366 100644 --- a/src/v2/stage0/src/v2_compiler_artifact.rs +++ b/src/v2/stage0/src/v2_compiler_artifact.rs @@ -1,16 +1,16 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.artifact -use std::collections::HashMap; -use std::rc::Rc; -use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::v2_std_core::{TextFile}; -use self::RenderTarget::*; use self::ArtifactKind::*; use self::BoundaryKind::*; use self::PartitionRule::*; +use self::RenderTarget::*; +use crate::v2_rt; +pub use crate::v2_std_core::TextFile; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] @@ -66,25 +66,27 @@ pub struct ArtifactPlan { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum PartitionRule { - Explicit { - artifacts: Rc>>, - }, + Explicit { artifacts: Rc>> }, } impl PartitionRule { pub fn artifacts(&self) -> Rc>> { match self { - PartitionRule::Explicit { artifacts: __val, .. } => __val.clone(), + PartitionRule::Explicit { + artifacts: __val, .. + } => __val.clone(), } } } pub fn plan_artifacts(rule: Rc) -> Rc { match (*rule).clone() { - PartitionRule::Explicit { artifacts: arts, .. } => Rc::new(ArtifactPlan { - artifacts: arts.clone(), - boundaries: Rc::new(vec![]), -}), -} + PartitionRule::Explicit { + artifacts: arts, .. + } => Rc::new(ArtifactPlan { + artifacts: arts.clone(), + boundaries: Rc::new(vec![]), + }), + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -93,14 +95,17 @@ pub struct ArtifactOutput { pub files: Rc>>, } -pub fn default_artifact_plan(root_modules: Rc>, target: RenderTarget) -> Rc { +pub fn default_artifact_plan( + root_modules: Rc>, + target: RenderTarget, +) -> Rc { plan_artifacts(Rc::new(PartitionRule::Explicit { - artifacts: Rc::new(vec![Rc::new(Artifact { - name: "default".to_string(), - kind: ArtifactKind::ServiceBinary, - target: target, - entry_modules: root_modules, - dependencies: Rc::new(vec![]), -})]), -})) + artifacts: Rc::new(vec![Rc::new(Artifact { + name: "default".to_string(), + kind: ArtifactKind::ServiceBinary, + target: target, + entry_modules: root_modules, + dependencies: Rc::new(vec![]), + })]), + })) } diff --git a/src/v2/stage0/src/v2_compiler_coercion.rs b/src/v2/stage0/src/v2_compiler_coercion.rs index e145655eaf9..c803d00b647 100644 --- a/src/v2/stage0/src/v2_compiler_coercion.rs +++ b/src/v2/stage0/src/v2_compiler_coercion.rs @@ -1,131 +1,174 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.coercion -use std::collections::HashMap; -use std::rc::Rc; +use self::CoercionAssertion::*; +pub use crate::extdeps_languages_dag_types::dag_type_checkpoints; +pub use crate::extdeps_languages_go_types::{ + go_algebra_inhabitants, go_callable, go_cast_syntax, go_optional_template, go_type_checkpoints, +}; +pub use crate::extdeps_languages_python_types::{ + python_algebra_inhabitants, python_callable, python_cast_syntax, python_optional_template, + python_type_checkpoints, +}; +pub use crate::extdeps_languages_rust_types::{ + rust_algebra_inhabitants, rust_callable, rust_cast_syntax, rust_optional_template, + rust_type_checkpoints, +}; +pub use crate::std_coercion::{CallableRepr, CastSyntax, InhabitantDecl, TypeCheckpoint}; +pub use crate::std_types::{canonical_container_names, container_template_algebra}; +pub use crate::v2_compiler_artifact::RenderTarget; +use crate::v2_compiler_artifact::RenderTarget::{Dag, Go, Python, Rust}; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; -pub use crate::v2_compiler_artifact::{RenderTarget}; -use crate::v2_compiler_artifact::RenderTarget::{Rust, Python, Go, Dag}; -pub use crate::std_coercion::{TypeCheckpoint, InhabitantDecl, CallableRepr, CastSyntax}; -pub use crate::std_types::{container_template_algebra, canonical_container_names}; -pub use crate::extdeps_languages_rust_types::{rust_type_checkpoints, rust_algebra_inhabitants, rust_callable, rust_optional_template, rust_cast_syntax}; -pub use crate::extdeps_languages_python_types::{python_type_checkpoints, python_algebra_inhabitants, python_callable, python_optional_template, python_cast_syntax}; -pub use crate::extdeps_languages_go_types::{go_type_checkpoints, go_algebra_inhabitants, go_callable, go_optional_template, go_cast_syntax}; -pub use crate::extdeps_languages_dag_types::{dag_type_checkpoints}; -use self::CoercionAssertion::*; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn target_checkpoints(target: RenderTarget) -> Rc>> { match target { - RenderTarget::Rust => rust_type_checkpoints(), - RenderTarget::Python => python_type_checkpoints(), - RenderTarget::Go => go_type_checkpoints(), - RenderTarget::Dag => dag_type_checkpoints(), -} + RenderTarget::Rust => rust_type_checkpoints(), + RenderTarget::Python => python_type_checkpoints(), + RenderTarget::Go => go_type_checkpoints(), + RenderTarget::Dag => dag_type_checkpoints(), + } } pub fn target_inhabitants(target: RenderTarget) -> Rc>> { match target { - RenderTarget::Rust => rust_algebra_inhabitants(), - RenderTarget::Python => python_algebra_inhabitants(), - RenderTarget::Go => go_algebra_inhabitants(), - RenderTarget::Dag => Rc::new(vec![]), -} + RenderTarget::Rust => rust_algebra_inhabitants(), + RenderTarget::Python => python_algebra_inhabitants(), + RenderTarget::Go => go_algebra_inhabitants(), + RenderTarget::Dag => Rc::new(vec![]), + } } pub fn target_callable(target: RenderTarget) -> Rc { match target { - RenderTarget::Rust => rust_callable(), - RenderTarget::Python => python_callable(), - RenderTarget::Go => go_callable(), - RenderTarget::Dag => Rc::new(CallableRepr { - template: "fn({params}) -> {return}".to_string(), - param_separator: ", ".to_string(), - return_separator: " -> ".to_string(), - import_path: None, -}), -} + RenderTarget::Rust => rust_callable(), + RenderTarget::Python => python_callable(), + RenderTarget::Go => go_callable(), + RenderTarget::Dag => Rc::new(CallableRepr { + template: "fn({params}) -> {return}".to_string(), + param_separator: ", ".to_string(), + return_separator: " -> ".to_string(), + import_path: None, + }), + } } pub fn target_optional_template(target: RenderTarget) -> String { match target { - RenderTarget::Rust => rust_optional_template(), - RenderTarget::Python => python_optional_template(), - RenderTarget::Go => go_optional_template(), - RenderTarget::Dag => "{0}?".to_string(), -} + RenderTarget::Rust => rust_optional_template(), + RenderTarget::Python => python_optional_template(), + RenderTarget::Go => go_optional_template(), + RenderTarget::Dag => "{0}?".to_string(), + } } pub fn target_cast_syntax(target: RenderTarget) -> Option> { match target { - RenderTarget::Rust => Some(rust_cast_syntax()), - RenderTarget::Python => Some(python_cast_syntax()), - RenderTarget::Go => Some(go_cast_syntax()), - RenderTarget::Dag => None, -} + RenderTarget::Rust => Some(rust_cast_syntax()), + RenderTarget::Python => Some(python_cast_syntax()), + RenderTarget::Go => Some(go_cast_syntax()), + RenderTarget::Dag => None, + } } pub fn can_cast(target: RenderTarget, source_type: String, target_type: String) -> bool { match target_cast_syntax(target) { - Some(syntax) => { let mut __found = false; for r in syntax.cast_rules.clone().iter().cloned() { if ((r.from_type.clone().as_str() == source_type.clone().as_str()) && (r.to_type.clone().as_str() == target_type.clone().as_str())) { __found = true; break; } } __found }, - None => false, -} + Some(syntax) => { + let mut __found = false; + for r in syntax.cast_rules.clone().iter().cloned() { + if ((r.from_type.clone().as_str() == source_type.clone().as_str()) + && (r.to_type.clone().as_str() == target_type.clone().as_str())) + { + __found = true; + break; + } + } + __found + } + None => false, + } } pub fn render_cast(expr_str: String, type_str: String, target: RenderTarget) -> String { { let syntax = match target_cast_syntax(target) { - Some(s) => s.clone(), - None => Rc::new(CastSyntax { - template: "{expr}".to_string(), - cast_rules: Rc::new(vec![]), -}), -}; -v2_rt::replace(v2_rt::replace(syntax.template.clone(), "{expr}".to_string(), expr_str), "{type}".to_string(), type_str) -} + Some(s) => s.clone(), + None => Rc::new(CastSyntax { + template: "{expr}".to_string(), + cast_rules: Rc::new(vec![]), + }), + }; + v2_rt::replace( + v2_rt::replace(syntax.template.clone(), "{expr}".to_string(), expr_str), + "{type}".to_string(), + type_str, + ) + } } pub fn lookup_checkpoint(target: RenderTarget, dag_name: String) -> Option> { - Rc::new({ let mut __result = Vec::new(); for cp in target_checkpoints(target).iter().cloned() { if (cp.dag_name.clone().as_str() == dag_name.clone().as_str()) { __result.push(cp); } } __result }).first().cloned() + Rc::new({ + let mut __result = Vec::new(); + for cp in target_checkpoints(target).iter().cloned() { + if (cp.dag_name.clone().as_str() == dag_name.clone().as_str()) { + __result.push(cp); + } + } + __result + }) + .first() + .cloned() } pub fn coerce_primitive_type(target: RenderTarget, dag_name: String) -> String { match lookup_checkpoint(target, dag_name.clone()) { - Some(cp) => cp.target_type.clone(), - None => dag_name.clone(), -} + Some(cp) => cp.target_type.clone(), + None => dag_name.clone(), + } } pub fn is_copy(target: RenderTarget, dag_name: String) -> Option { match lookup_checkpoint(target, dag_name) { - Some(cp) => cp.is_copy.clone(), - None => None, -} + Some(cp) => cp.is_copy.clone(), + None => None, + } } pub fn literal_suffix(target: RenderTarget, dag_name: String) -> Option { match lookup_checkpoint(target, dag_name) { - Some(cp) => match cp.literal_suffix.clone() { - Some(s) => Some(s.clone()), - None => Some("".to_string()), -}, - None => None, -} + Some(cp) => match cp.literal_suffix.clone() { + Some(s) => Some(s.clone()), + None => Some("".to_string()), + }, + None => None, + } } pub fn lookup_inhabitant(target: RenderTarget, algebra: String) -> Option> { - Rc::new({ let mut __result = Vec::new(); for inh in target_inhabitants(target).iter().cloned() { if (inh.algebra.clone().as_str() == algebra.clone().as_str()) { __result.push(inh); } } __result }).first().cloned() + Rc::new({ + let mut __result = Vec::new(); + for inh in target_inhabitants(target).iter().cloned() { + if (inh.algebra.clone().as_str() == algebra.clone().as_str()) { + __result.push(inh); + } + } + __result + }) + .first() + .cloned() } pub fn coerce_container_template(target: RenderTarget, container_name: String) -> Option { match container_template_algebra(container_name) { - Some(algebra) => match lookup_inhabitant(target, algebra.clone()) { - Some(inh) => Some(inh.template.clone()), - None => None, -}, - None => None, -} + Some(algebra) => match lookup_inhabitant(target, algebra.clone()) { + Some(inh) => Some(inh.template.clone()), + None => None, + }, + None => None, + } } pub fn apply_inhabitant_template1(template: String, inner: String) -> String { @@ -133,7 +176,11 @@ pub fn apply_inhabitant_template1(template: String, inner: String) -> String { } pub fn apply_inhabitant_template2(template: String, first: String, second: String) -> String { - v2_rt::replace(v2_rt::replace(template, "{0}".to_string(), first), "{1}".to_string(), second) + v2_rt::replace( + v2_rt::replace(template, "{0}".to_string(), first), + "{1}".to_string(), + second, + ) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -169,30 +216,39 @@ pub struct CoercionTestEntry { pub fn target_label(target: RenderTarget) -> String { match target { - RenderTarget::Rust => "rust".to_string(), - RenderTarget::Python => "python".to_string(), - RenderTarget::Go => "go".to_string(), - RenderTarget::Dag => "dag".to_string(), -} + RenderTarget::Rust => "rust".to_string(), + RenderTarget::Python => "python".to_string(), + RenderTarget::Go => "go".to_string(), + RenderTarget::Dag => "dag".to_string(), + } } pub fn checkpoint_tests(target: &RenderTarget) -> Rc>> { { let label = target_label(target.clone()); -let cps = target_checkpoints(target.clone()); -if ((cps.clone().len() as i64) == 0) { + let cps = target_checkpoints(target.clone()); + if ((cps.clone().len() as i64) == 0) { Rc::new(vec![]) } else { Rc::new(vec![Rc::new(CoercionTestEntry { - test_name: v2_rt::concat(v2_rt::concat("coercion_".to_string(), label), "_checkpoint_resolves_primitives".to_string()), - assertions: Rc::new({ let mut __result = Vec::new(); for cp in cps.clone().iter().cloned() { __result.push(Rc::new(CoercionAssertion::CheckpointAssertion { - target: target.clone(), - dag_name: cp.dag_name.clone(), - expected_type: cp.target_type.clone(), -})); } __result }), -})]) + test_name: v2_rt::concat( + v2_rt::concat("coercion_".to_string(), label), + "_checkpoint_resolves_primitives".to_string(), + ), + assertions: Rc::new({ + let mut __result = Vec::new(); + for cp in cps.clone().iter().cloned() { + __result.push(Rc::new(CoercionAssertion::CheckpointAssertion { + target: target.clone(), + dag_name: cp.dag_name.clone(), + expected_type: cp.target_type.clone(), + })); + } + __result + }), + })]) } -} + } } pub fn inhabitant_test_names() -> Rc> { @@ -202,89 +258,173 @@ pub fn inhabitant_test_names() -> Rc> { pub fn inhabitant_tests(target: &RenderTarget) -> Rc>> { { let label = target_label(target.clone()); -let assertions = Rc::new({ let mut __result = Vec::new(); for name in inhabitant_test_names().iter().cloned() { __result.extend((*match coerce_container_template(target.clone(), name.clone()) { - Some(tmpl) => Rc::new(vec![Rc::new(CoercionAssertion::ContainerAssertion { - target: target.clone(), - container_name: name.clone(), - expected_template: tmpl.clone(), -})]), - None => Rc::new(vec![]), -}).iter().cloned()); } __result }); -if ((assertions.clone().len() as i64) == 0) { + let assertions = Rc::new({ + let mut __result = Vec::new(); + for name in inhabitant_test_names().iter().cloned() { + __result.extend( + (*match coerce_container_template(target.clone(), name.clone()) { + Some(tmpl) => { + Rc::new(vec![Rc::new(CoercionAssertion::ContainerAssertion { + target: target.clone(), + container_name: name.clone(), + expected_template: tmpl.clone(), + })]) + } + None => Rc::new(vec![]), + }) + .iter() + .cloned(), + ); + } + __result + }); + if ((assertions.clone().len() as i64) == 0) { Rc::new(vec![]) } else { Rc::new(vec![Rc::new(CoercionTestEntry { - test_name: v2_rt::concat(v2_rt::concat("coercion_".to_string(), label), "_inhabitant_resolves_containers".to_string()), - assertions: assertions.clone(), -})]) + test_name: v2_rt::concat( + v2_rt::concat("coercion_".to_string(), label), + "_inhabitant_resolves_containers".to_string(), + ), + assertions: assertions.clone(), + })]) } -} + } } pub fn copy_tests() -> Rc>> { { let cps = target_checkpoints(RenderTarget::Rust); -let copy_assertions = Rc::new({ let mut __result = Vec::new(); for cp in cps.iter().cloned() { __result.extend((*match cp.is_copy.clone() { - Some(v) => Rc::new(vec![Rc::new(CoercionAssertion::CopyAssertion { - target: RenderTarget::Rust, - dag_name: cp.dag_name.clone(), - expected_copy: v.clone(), -})]), - None => Rc::new(vec![]), -}).iter().cloned()); } __result }); -if ((copy_assertions.clone().len() as i64) == 0) { + let copy_assertions = Rc::new({ + let mut __result = Vec::new(); + for cp in cps.iter().cloned() { + __result.extend( + (*match cp.is_copy.clone() { + Some(v) => Rc::new(vec![Rc::new(CoercionAssertion::CopyAssertion { + target: RenderTarget::Rust, + dag_name: cp.dag_name.clone(), + expected_copy: v.clone(), + })]), + None => Rc::new(vec![]), + }) + .iter() + .cloned(), + ); + } + __result + }); + if ((copy_assertions.clone().len() as i64) == 0) { Rc::new(vec![]) } else { Rc::new(vec![Rc::new(CoercionTestEntry { - test_name: "coercion_is_copy_from_checkpoint".to_string(), - assertions: copy_assertions.clone(), -})]) + test_name: "coercion_is_copy_from_checkpoint".to_string(), + assertions: copy_assertions.clone(), + })]) } -} + } } pub fn template_application_tests() -> Rc>> { { - let targets = Rc::new(vec![RenderTarget::Rust, RenderTarget::Python, RenderTarget::Go]); -let assertions = Rc::new({ let mut __result = Vec::new(); for t in targets.iter().cloned() { __result.extend((*{ - let inhs = target_inhabitants(t.clone()); -let int_target = coerce_primitive_type(t.clone(), "Int".to_string()); -let str_target = coerce_primitive_type(t.clone(), "String".to_string()); -Rc::new({ let mut __result = Vec::new(); for inh in inhs.clone().iter().cloned() { __result.extend((*if (inh.arity.clone() == 1) { - { - let expected = apply_inhabitant_template1(inh.template.clone(), int_target.clone()); -Rc::new(vec![Rc::new(CoercionAssertion::TemplateAssertion { - template: inh.template.clone(), - args: Rc::new(vec![int_target.clone()]), - expected: expected.clone(), -})]) -} - } else { - if (inh.arity.clone() == 2) { - { - let expected = apply_inhabitant_template2(inh.template.clone(), str_target.clone(), int_target.clone()); -Rc::new(vec![Rc::new(CoercionAssertion::TemplateAssertion { - template: inh.template.clone(), - args: Rc::new(vec![str_target.clone(), int_target.clone()]), - expected: expected.clone(), -})]) -} - } else { - Rc::new(vec![]) - } - }).iter().cloned()); } __result }) -}).iter().cloned()); } __result }); -if ((assertions.clone().len() as i64) == 0) { + let targets = Rc::new(vec![ + RenderTarget::Rust, + RenderTarget::Python, + RenderTarget::Go, + ]); + let assertions = Rc::new({ + let mut __result = Vec::new(); + for t in targets.iter().cloned() { + __result.extend( + (*{ + let inhs = target_inhabitants(t.clone()); + let int_target = coerce_primitive_type(t.clone(), "Int".to_string()); + let str_target = coerce_primitive_type(t.clone(), "String".to_string()); + Rc::new({ + let mut __result = Vec::new(); + for inh in inhs.clone().iter().cloned() { + __result.extend( + (*if (inh.arity.clone() == 1) { + { + let expected = apply_inhabitant_template1( + inh.template.clone(), + int_target.clone(), + ); + Rc::new(vec![Rc::new( + CoercionAssertion::TemplateAssertion { + template: inh.template.clone(), + args: Rc::new(vec![int_target.clone()]), + expected: expected.clone(), + }, + )]) + } + } else { + if (inh.arity.clone() == 2) { + { + let expected = apply_inhabitant_template2( + inh.template.clone(), + str_target.clone(), + int_target.clone(), + ); + Rc::new(vec![Rc::new( + CoercionAssertion::TemplateAssertion { + template: inh.template.clone(), + args: Rc::new(vec![ + str_target.clone(), + int_target.clone(), + ]), + expected: expected.clone(), + }, + )]) + } + } else { + Rc::new(vec![]) + } + }) + .iter() + .cloned(), + ); + } + __result + }) + }) + .iter() + .cloned(), + ); + } + __result + }); + if ((assertions.clone().len() as i64) == 0) { Rc::new(vec![]) } else { Rc::new(vec![Rc::new(CoercionTestEntry { - test_name: "coercion_template_application".to_string(), - assertions: assertions.clone(), -})]) + test_name: "coercion_template_application".to_string(), + assertions: assertions.clone(), + })]) } -} + } } pub fn extract_coercion_tests() -> Rc>> { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(checkpoint_tests(&RenderTarget::Rust), checkpoint_tests(&RenderTarget::Python)), checkpoint_tests(&RenderTarget::Go)), inhabitant_tests(&RenderTarget::Rust)), inhabitant_tests(&RenderTarget::Python)), inhabitant_tests(&RenderTarget::Go)), copy_tests()), template_application_tests()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + checkpoint_tests(&RenderTarget::Rust), + checkpoint_tests(&RenderTarget::Python), + ), + checkpoint_tests(&RenderTarget::Go), + ), + inhabitant_tests(&RenderTarget::Rust), + ), + inhabitant_tests(&RenderTarget::Python), + ), + inhabitant_tests(&RenderTarget::Go), + ), + copy_tests(), + ), + template_application_tests(), + ) } diff --git a/src/v2/stage0/src/v2_compiler_compile.rs b/src/v2/stage0/src/v2_compiler_compile.rs index d563415770e..667fde627bc 100644 --- a/src/v2/stage0/src/v2_compiler_compile.rs +++ b/src/v2/stage0/src/v2_compiler_compile.rs @@ -1,51 +1,76 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.compile -use std::collections::HashMap; -use std::rc::Rc; +use crate::std_induction::RecursionShape::{ + DirectRecursion, ListRecursion, MapValueRecursion, OptionalRecursion, SetRecursion, +}; +use crate::std_induction::ShrinkFactor::{ConstantShrink, ProportionalShrink, UnitShrink}; +use crate::std_induction::SubValueRelation::{ + IteratedSubValue, PreservedValue, StrictSubValue, SubValueUnknown, +}; +pub use crate::std_induction::{InductiveField, RecursionShape, ShrinkFactor, SubValueRelation}; +use crate::std_termination::PositiveDescentAmount::{AdditionalStep, OneStep}; +use crate::std_termination::ProportionalDivisor::{DivideByTwo, StrictlyLarger}; +pub use crate::std_termination::{PositiveDescentAmount, ProportionalDivisor}; +use crate::v2_compiler_artifact::RenderTarget::Dag; +pub use crate::v2_compiler_artifact::{ + default_artifact_plan, Artifact, ArtifactPlan, RenderTarget, +}; +pub use crate::v2_compiler_complexity::{ + build_complexity_report, empty_complexity_report, ComplexityReport, ComplexityViolation, + FuncEntry, RecursionContext, +}; +pub use crate::v2_compiler_emit::{escape_json_string, EmitResult}; +pub use crate::v2_compiler_emit_go::emit_go; +pub use crate::v2_compiler_emit_python::emit_python; +pub use crate::v2_compiler_emit_rust::emit_rust; +pub use crate::v2_compiler_infer::reconcile; +pub use crate::v2_compiler_infer_items::{ResolvedGraph, TypedModule}; +pub use crate::v2_compiler_infer_types::algebra_field_kind_name; +pub use crate::v2_compiler_normalize::{normalize_graph, NormalizeResult}; +use crate::v2_compiler_ownership::OwnershipDecision::SharedError; +pub use crate::v2_compiler_ownership::{analyze_ownership, OwnershipDecision, OwnershipProof}; +pub use crate::v2_compiler_parse::{parse_with_table, ParseResult}; +pub use crate::v2_compiler_resolve::{resolve_modules, ModuleGraph}; +pub use crate::v2_compiler_tokenize::tokenize; use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::v2_std_core::{CompileResult, TextFile, SourceSpan, authored_name_at, ErrorNode, CompilerDiagnostic, is_error_diagnostic, diagnostic_to_message, diagnostic_to_span, make_error_node, no_span, Connective, Cardinality, resource_use_name_at, resource_use_resource, param_node_name_at, param_node_type_expr, param_node_default_value, param_node_span, field_node_name_at, field_node_type_expr, field_node_cardinality, field_node_default_value, field_node_from_key, field_node_span, module_imports, module_items, import_is_all, import_specific_names_at, FieldAccessStyle, FieldValueShape, FieldSummary, InferredNode, VarBindingKind, CallSemantics, MethodSemantics, ExprErrorKind, ExprData, MatchPattern, field_binding_name_at, field_binding_pattern, arg_name_at, arg_value, arm_pattern, arm_guard, arm_body, field_init_node_name_at, field_init_node_value, LiteralValue, BinOp, UnaryOpKind, StringPart, Node, Token, NewlineIndex, build_newline_index, field_access_field_at, expr_call_func_at, lambda_param_names_at, record_lit_type_name_at, foreach_variable_at, expr_method_name_at, InternTable, InternResult, empty_intern_table, intern}; -use crate::v2_std_core::CompilerDiagnostic::{InternalError, OwnershipViolation}; -use crate::v2_std_core::Connective::{NoConnective, Arrow}; -use crate::v2_std_core::InferredNode::{Resolved, CompilerError, TypeVariable}; -use crate::v2_std_core::MethodSemantics::{PlainMethodSemantics, AlgebraMethodSemantics, ServiceMethodSemantics}; +use crate::v2_std_core::BinOp::*; +use crate::v2_std_core::CallSemantics::*; use crate::v2_std_core::Cardinality::*; +use crate::v2_std_core::CompilerDiagnostic::{InternalError, OwnershipViolation}; +use crate::v2_std_core::Connective::{Arrow, NoConnective}; +use crate::v2_std_core::ExprData::*; +use crate::v2_std_core::ExprErrorKind::*; use crate::v2_std_core::FieldAccessStyle::*; use crate::v2_std_core::FieldValueShape::*; -use crate::v2_std_core::VarBindingKind::*; -use crate::v2_std_core::CallSemantics::*; -use crate::v2_std_core::ExprErrorKind::*; -use crate::v2_std_core::ExprData::*; -use crate::v2_std_core::MatchPattern::*; +use crate::v2_std_core::InferredNode::{CompilerError, Resolved, TypeVariable}; use crate::v2_std_core::LiteralValue::*; -use crate::v2_std_core::BinOp::*; -use crate::v2_std_core::UnaryOpKind::*; +use crate::v2_std_core::MatchPattern::*; +use crate::v2_std_core::MethodSemantics::{ + AlgebraMethodSemantics, PlainMethodSemantics, ServiceMethodSemantics, +}; use crate::v2_std_core::StringPart::*; -pub use crate::v2_compiler_tokenize::{tokenize}; -pub use crate::v2_compiler_parse::{parse_with_table, ParseResult}; -pub use crate::v2_compiler_resolve::{resolve_modules, ModuleGraph}; -pub use crate::v2_compiler_normalize::{normalize_graph, NormalizeResult}; -pub use crate::v2_compiler_infer_items::{ResolvedGraph, TypedModule}; -pub use crate::v2_compiler_infer::{reconcile}; -pub use crate::v2_compiler_infer_types::{algebra_field_kind_name}; -pub use crate::v2_compiler_emit::{EmitResult, escape_json_string}; -pub use crate::v2_compiler_emit_rust::{emit_rust}; -pub use crate::v2_compiler_emit_python::{emit_python}; -pub use crate::v2_compiler_emit_go::{emit_go}; -pub use crate::v2_compiler_complexity::{ComplexityReport, ComplexityViolation, FuncEntry, RecursionContext, build_complexity_report, empty_complexity_report}; -pub use crate::std_induction::{SubValueRelation, InductiveField, ShrinkFactor, RecursionShape}; -use crate::std_induction::SubValueRelation::{StrictSubValue, IteratedSubValue, PreservedValue, SubValueUnknown}; -use crate::std_induction::ShrinkFactor::{UnitShrink, ConstantShrink, ProportionalShrink}; -use crate::std_induction::RecursionShape::{DirectRecursion, ListRecursion, OptionalRecursion, SetRecursion, MapValueRecursion}; -pub use crate::std_termination::{PositiveDescentAmount, ProportionalDivisor}; -use crate::std_termination::PositiveDescentAmount::{OneStep, AdditionalStep}; -use crate::std_termination::ProportionalDivisor::{DivideByTwo, StrictlyLarger}; -pub use crate::v2_compiler_ownership::{OwnershipProof, OwnershipDecision, analyze_ownership}; -use crate::v2_compiler_ownership::OwnershipDecision::{SharedError}; -pub use crate::v2_compiler_artifact::{ArtifactPlan, Artifact, RenderTarget, default_artifact_plan}; -use crate::v2_compiler_artifact::RenderTarget::{Dag}; +use crate::v2_std_core::UnaryOpKind::*; +use crate::v2_std_core::VarBindingKind::*; +pub use crate::v2_std_core::{ + arg_name_at, arg_value, arm_body, arm_guard, arm_pattern, authored_name_at, + build_newline_index, diagnostic_to_message, diagnostic_to_span, empty_intern_table, + expr_call_func_at, expr_method_name_at, field_access_field_at, field_binding_name_at, + field_binding_pattern, field_init_node_name_at, field_init_node_value, field_node_cardinality, + field_node_default_value, field_node_from_key, field_node_name_at, field_node_span, + field_node_type_expr, foreach_variable_at, import_is_all, import_specific_names_at, intern, + is_error_diagnostic, lambda_param_names_at, make_error_node, module_imports, module_items, + no_span, param_node_default_value, param_node_name_at, param_node_span, param_node_type_expr, + record_lit_type_name_at, resource_use_name_at, resource_use_resource, BinOp, CallSemantics, + Cardinality, CompileResult, CompilerDiagnostic, Connective, ErrorNode, ExprData, ExprErrorKind, + FieldAccessStyle, FieldSummary, FieldValueShape, InferredNode, InternResult, InternTable, + LiteralValue, MatchPattern, MethodSemantics, NewlineIndex, Node, SourceSpan, StringPart, + TextFile, Token, UnaryOpKind, VarBindingKind, +}; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct SourceFile { @@ -79,13 +104,64 @@ pub struct FrontendAccum { } pub fn extract_func_entries(typed: Rc) -> Rc>> { - Rc::new({ let mut __result = Vec::new(); for m in Rc::new({ let mut __result = Vec::new(); for m in typed.modules.clone().iter().cloned() { if { let mut __found = false; for item in m.items.clone().iter().cloned() { if (item.body.clone() != None) { __found = true; break; } } __found } { __result.push(m); } } __result }).iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for item in Rc::new({ let mut __result = Vec::new(); for item in m.items.clone().iter().cloned() { if (item.body.clone() != None) { __result.push(item); } } __result }).iter().cloned() { __result.push(Rc::new(FuncEntry { - name: authored_name_at(m.type_env.clone().source_indices.clone(), &item), - body: item.body.clone().clone().unwrap(), - params: item.params.clone(), - span: item.span.clone(), - is_tail_recursive: (item.is_self_recursive.clone() && (item.has_non_tail_self_call.clone() == false)), -})); } __result })).iter().cloned()); } __result }) + Rc::new({ + let mut __result = Vec::new(); + for m in Rc::new({ + let mut __result = Vec::new(); + for m in typed.modules.clone().iter().cloned() { + if { + let mut __found = false; + for item in m.items.clone().iter().cloned() { + if (item.body.clone() != None) { + __found = true; + break; + } + } + __found + } { + __result.push(m); + } + } + __result + }) + .iter() + .cloned() + { + __result.extend( + (*Rc::new({ + let mut __result = Vec::new(); + for item in Rc::new({ + let mut __result = Vec::new(); + for item in m.items.clone().iter().cloned() { + if (item.body.clone() != None) { + __result.push(item); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(Rc::new(FuncEntry { + name: authored_name_at( + m.type_env.clone().source_indices.clone(), + &item, + ), + body: item.body.clone().clone().unwrap(), + params: item.params.clone(), + span: item.span.clone(), + is_tail_recursive: (item.is_self_recursive.clone() + && (item.has_non_tail_self_call.clone() == false)), + })); + } + __result + })) + .iter() + .cloned(), + ); + } + __result + }) } pub fn build_recursion_context(typed: Rc) -> RecursionContext { @@ -93,86 +169,190 @@ pub fn build_recursion_context(typed: Rc) -> RecursionContext { } pub fn extract_ownership_proofs(typed: Rc) -> Rc>> { - Rc::new({ let mut __result = Vec::new(); for m in Rc::new({ let mut __result = Vec::new(); for m in typed.modules.clone().iter().cloned() { if { let mut __found = false; for item in m.items.clone().iter().cloned() { if (item.body.clone() != None) { __found = true; break; } } __found } { __result.push(m); } } __result }).iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for item in Rc::new({ let mut __result = Vec::new(); for item in m.items.clone().iter().cloned() { if (item.body.clone() != None) { __result.push(item); } } __result }).iter().cloned() { __result.push(analyze_ownership(authored_name_at(m.type_env.clone().source_indices.clone(), &item), item.params.clone(), item.body.clone().clone().unwrap(), &m.type_env.clone().source_indices.clone())); } __result })).iter().cloned()); } __result }) + Rc::new({ + let mut __result = Vec::new(); + for m in Rc::new({ + let mut __result = Vec::new(); + for m in typed.modules.clone().iter().cloned() { + if { + let mut __found = false; + for item in m.items.clone().iter().cloned() { + if (item.body.clone() != None) { + __found = true; + break; + } + } + __found + } { + __result.push(m); + } + } + __result + }) + .iter() + .cloned() + { + __result.extend( + (*Rc::new({ + let mut __result = Vec::new(); + for item in Rc::new({ + let mut __result = Vec::new(); + for item in m.items.clone().iter().cloned() { + if (item.body.clone() != None) { + __result.push(item); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(analyze_ownership( + authored_name_at(m.type_env.clone().source_indices.clone(), &item), + item.params.clone(), + item.body.clone().clone().unwrap(), + &m.type_env.clone().source_indices.clone(), + )); + } + __result + })) + .iter() + .cloned(), + ); + } + __result + }) } pub fn ownership_diagnostics(proofs: Rc>>) -> Rc>> { - Rc::new({ let mut __result = Vec::new(); for proof in proofs.iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for decision in proof.decisions.clone().iter().cloned() { __result.extend((*match (*decision.clone()).clone() { - OwnershipDecision::SharedError { binding, consumer_count: count, sites, .. } => Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::OwnershipViolation { - binding: binding.clone(), - fn_name: proof.func_name.clone(), - consumers: count.clone(), - span: no_span(), -}), proof.func_name.clone())]), - _ => Rc::new(vec![]), -}).iter().cloned()); } __result })).iter().cloned()); } __result }) + Rc::new({ + let mut __result = Vec::new(); + for proof in proofs.iter().cloned() { + __result.extend( + (*Rc::new({ + let mut __result = Vec::new(); + for decision in proof.decisions.clone().iter().cloned() { + __result.extend( + (*match (*decision.clone()).clone() { + OwnershipDecision::SharedError { + binding, + consumer_count: count, + sites, + .. + } => Rc::new(vec![make_error_node( + Rc::new(CompilerDiagnostic::OwnershipViolation { + binding: binding.clone(), + fn_name: proof.func_name.clone(), + consumers: count.clone(), + span: no_span(), + }), + proof.func_name.clone(), + )]), + _ => Rc::new(vec![]), + }) + .iter() + .cloned(), + ); + } + __result + })) + .iter() + .cloned(), + ); + } + __result + }) } pub fn complexity_diagnostics(complexity: Rc) -> Rc>> { - Rc::new({ let mut __result = Vec::new(); for v in complexity.violations.clone().iter().cloned() { __result.push(make_error_node(Rc::new(CompilerDiagnostic::ComplexityUnknown { - func_name: v.func_name.clone(), - reason: v.reason.clone(), - span: v.span.clone(), -}), v.func_name.clone())); } __result }) + Rc::new({ + let mut __result = Vec::new(); + for v in complexity.violations.clone().iter().cloned() { + __result.push(make_error_node( + Rc::new(CompilerDiagnostic::ComplexityUnknown { + func_name: v.func_name.clone(), + reason: v.reason.clone(), + span: v.span.clone(), + }), + v.func_name.clone(), + )); + } + __result + }) } pub fn empty_artifact_plan() -> Rc { Rc::new(ArtifactPlan { - artifacts: Rc::new(vec![]), - boundaries: Rc::new(vec![]), -}) + artifacts: Rc::new(vec![]), + boundaries: Rc::new(vec![]), + }) } pub fn compile_bundle_error(message: String) -> Rc { - make_error_node(Rc::new(CompilerDiagnostic::InternalError { - message: message, - span: no_span(), -}), "".to_string()) + make_error_node( + Rc::new(CompilerDiagnostic::InternalError { + message: message, + span: no_span(), + }), + "".to_string(), + ) } pub fn emit_artifact(typed: Rc, artifact: Rc) -> Rc { match artifact.target.clone() { - RenderTarget::Rust => emit_rust(&typed), - RenderTarget::Python => emit_python(&typed), - RenderTarget::Go => emit_go(&typed), - RenderTarget::Dag => emit_dag_artifact(&typed), -} + RenderTarget::Rust => emit_rust(&typed), + RenderTarget::Python => emit_python(&typed), + RenderTarget::Go => emit_go(&typed), + RenderTarget::Dag => emit_dag_artifact(&typed), + } } pub fn json_quote(s: String) -> String { - v2_rt::concat(v2_rt::concat("\"".to_string(), escape_json_string(s)), "\"".to_string()) + v2_rt::concat( + v2_rt::concat("\"".to_string(), escape_json_string(s)), + "\"".to_string(), + ) } pub fn json_list(items: Rc>) -> String { - v2_rt::concat(v2_rt::concat("[".to_string(), items.join(&", ".to_string())), "]".to_string()) + v2_rt::concat( + v2_rt::concat("[".to_string(), items.join(&", ".to_string())), + "]".to_string(), + ) } pub fn json_optional_string(value: Option) -> String { match value { - Some(inner) => json_quote(inner.clone()), - None => "null".to_string(), -} + Some(inner) => json_quote(inner.clone()), + None => "null".to_string(), + } } -pub fn json_optional_node(value: Option>, source_indices: Rc>>) -> String { +pub fn json_optional_node( + value: Option>, + source_indices: Rc>>, +) -> String { match value { - Some(inner) => serialize_node(&inner, &source_indices), - None => "null".to_string(), -} + Some(inner) => serialize_node(&inner, &source_indices), + None => "null".to_string(), + } } -pub fn json_optional_inferred_node(value: Option>, source_indices: Rc>>) -> String { +pub fn json_optional_inferred_node( + value: Option>, + source_indices: Rc>>, +) -> String { match value { - Some(inner) => serialize_inferred_node(inner.clone(), source_indices), - None => "null".to_string(), -} + Some(inner) => serialize_inferred_node(inner.clone(), source_indices), + None => "null".to_string(), + } } pub fn json_optional_span(value: Option>) -> String { match value { - Some(inner) => serialize_span(&inner), - None => "null".to_string(), -} + Some(inner) => serialize_span(&inner), + None => "null".to_string(), + } } pub fn json_bool(value: bool) -> String { @@ -185,306 +365,1197 @@ pub fn json_bool(value: bool) -> String { pub fn connective_name(value: Connective) -> String { match value { - Connective::Conj => "Conj".to_string(), - Connective::Disj => "Disj".to_string(), - Connective::NoConnective => "NoConnective".to_string(), - Connective::Arrow => "Arrow".to_string(), -} + Connective::Conj => "Conj".to_string(), + Connective::Disj => "Disj".to_string(), + Connective::NoConnective => "NoConnective".to_string(), + Connective::Arrow => "Arrow".to_string(), + } } pub fn cardinality_name(value: Cardinality) -> String { match value { - Cardinality::Required => "Required".to_string(), - Cardinality::CardOptional => "CardOptional".to_string(), -} + Cardinality::Required => "Required".to_string(), + Cardinality::CardOptional => "CardOptional".to_string(), + } } pub fn field_access_style_name(value: FieldAccessStyle) -> String { match value { - FieldAccessStyle::StoredField => "StoredField".to_string(), - FieldAccessStyle::EnumAccessor => "EnumAccessor".to_string(), - FieldAccessStyle::OptionalUnwrap => "OptionalUnwrap".to_string(), - FieldAccessStyle::TupleFirst => "TupleFirst".to_string(), - FieldAccessStyle::TupleSecond => "TupleSecond".to_string(), -} + FieldAccessStyle::StoredField => "StoredField".to_string(), + FieldAccessStyle::EnumAccessor => "EnumAccessor".to_string(), + FieldAccessStyle::OptionalUnwrap => "OptionalUnwrap".to_string(), + FieldAccessStyle::TupleFirst => "TupleFirst".to_string(), + FieldAccessStyle::TupleSecond => "TupleSecond".to_string(), + } } pub fn field_value_shape_name(value: FieldValueShape) -> String { match value { - FieldValueShape::PlainValue => "PlainValue".to_string(), - FieldValueShape::OptionalValue => "OptionalValue".to_string(), -} + FieldValueShape::PlainValue => "PlainValue".to_string(), + FieldValueShape::OptionalValue => "OptionalValue".to_string(), + } } pub fn var_binding_kind_name(value: Rc) -> String { match (*value).clone() { - VarBindingKind::LocalValueBinding => "LocalValueBinding".to_string(), - VarBindingKind::FunctionValueBinding => "FunctionValueBinding".to_string(), - VarBindingKind::VariantValueBinding { .. } => "VariantValueBinding".to_string(), - VarBindingKind::MatchBoundBinding => "MatchBoundBinding".to_string(), -} + VarBindingKind::LocalValueBinding => "LocalValueBinding".to_string(), + VarBindingKind::FunctionValueBinding => "FunctionValueBinding".to_string(), + VarBindingKind::VariantValueBinding { .. } => "VariantValueBinding".to_string(), + VarBindingKind::MatchBoundBinding => "MatchBoundBinding".to_string(), + } } pub fn call_semantics_name(value: CallSemantics) -> String { match value { - CallSemantics::PlainCallSemantics => "PlainCallSemantics".to_string(), - CallSemantics::LookupCallSemantics => "LookupCallSemantics".to_string(), -} + CallSemantics::PlainCallSemantics => "PlainCallSemantics".to_string(), + CallSemantics::LookupCallSemantics => "LookupCallSemantics".to_string(), + } } pub fn expr_error_kind_name(value: ExprErrorKind) -> String { match value { - ExprErrorKind::ParseRecoveryError => "ParseRecoveryError".to_string(), - ExprErrorKind::SemanticExprError => "SemanticExprError".to_string(), - ExprErrorKind::InternalExprError => "InternalExprError".to_string(), -} + ExprErrorKind::ParseRecoveryError => "ParseRecoveryError".to_string(), + ExprErrorKind::SemanticExprError => "SemanticExprError".to_string(), + ExprErrorKind::InternalExprError => "InternalExprError".to_string(), + } } pub fn bin_op_name(value: BinOp) -> String { match value { - BinOp::Add => "Add".to_string(), - BinOp::Sub => "Sub".to_string(), - BinOp::Mul => "Mul".to_string(), - BinOp::Div => "Div".to_string(), - BinOp::Mod => "Mod".to_string(), - BinOp::Eq => "Eq".to_string(), - BinOp::Ne => "Ne".to_string(), - BinOp::Lt => "Lt".to_string(), - BinOp::Gt => "Gt".to_string(), - BinOp::Le => "Le".to_string(), - BinOp::Ge => "Ge".to_string(), - BinOp::And => "And".to_string(), - BinOp::Or => "Or".to_string(), - BinOp::NullCoalesce => "NullCoalesce".to_string(), -} + BinOp::Add => "Add".to_string(), + BinOp::Sub => "Sub".to_string(), + BinOp::Mul => "Mul".to_string(), + BinOp::Div => "Div".to_string(), + BinOp::Mod => "Mod".to_string(), + BinOp::Eq => "Eq".to_string(), + BinOp::Ne => "Ne".to_string(), + BinOp::Lt => "Lt".to_string(), + BinOp::Gt => "Gt".to_string(), + BinOp::Le => "Le".to_string(), + BinOp::Ge => "Ge".to_string(), + BinOp::And => "And".to_string(), + BinOp::Or => "Or".to_string(), + BinOp::NullCoalesce => "NullCoalesce".to_string(), + } } pub fn unary_op_name(value: UnaryOpKind) -> String { match value { - UnaryOpKind::Not => "Not".to_string(), - UnaryOpKind::Neg => "Neg".to_string(), -} + UnaryOpKind::Not => "Not".to_string(), + UnaryOpKind::Neg => "Neg".to_string(), + } } pub fn serialize_span(span: &Rc) -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"start\": ".to_string(), (span.start.clone()).to_string()), ", \"end\": ".to_string()), (span.end.clone()).to_string()), "}".to_string()) -} - -pub fn serialize_import_node(imp: &Rc, source_indices: &Rc>>) -> String { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("{\"start\": ".to_string(), (span.start.clone()).to_string()), + ", \"end\": ".to_string(), + ), + (span.end.clone()).to_string(), + ), + "}".to_string(), + ) +} + +pub fn serialize_import_node( + imp: &Rc, + source_indices: &Rc>>, +) -> String { { let names_json = if import_is_all(imp.clone()) { "{\"kind\": \"ImportAll\"}".to_string() } else { - v2_rt::concat(v2_rt::concat("{\"kind\": \"ImportSpecific\", \"names\": ".to_string(), json_list(Rc::new({ let mut __result = Vec::new(); for v in import_specific_names_at(imp.clone(), source_indices.clone()).iter().cloned() { __result.push(json_quote(v.clone())); } __result }))), "}".to_string()) + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ImportSpecific\", \"names\": ".to_string(), + json_list(Rc::new({ + let mut __result = Vec::new(); + for v in import_specific_names_at(imp.clone(), source_indices.clone()) + .iter() + .cloned() + { + __result.push(json_quote(v.clone())); + } + __result + })), + ), + "}".to_string(), + ) }; -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"module_path\": ".to_string(), json_quote(authored_name_at(source_indices.clone(), &imp))), ", \"names\": ".to_string()), names_json), ", \"span\": ".to_string()), serialize_span(&imp.span.clone())), "}".to_string()) -} + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"module_path\": ".to_string(), + json_quote(authored_name_at(source_indices.clone(), &imp)), + ), + ", \"names\": ".to_string(), + ), + names_json, + ), + ", \"span\": ".to_string(), + ), + serialize_span(&imp.span.clone()), + ), + "}".to_string(), + ) + } } pub fn serialize_field_summary(summary: &Rc) -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"access_style\": ".to_string(), json_quote(field_access_style_name(summary.access_style.clone()))), ", \"value_shape\": ".to_string()), json_quote(field_value_shape_name(summary.value_shape.clone()))), "}".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"access_style\": ".to_string(), + json_quote(field_access_style_name(summary.access_style.clone())), + ), + ", \"value_shape\": ".to_string(), + ), + json_quote(field_value_shape_name(summary.value_shape.clone())), + ), + "}".to_string(), + ) } pub fn serialize_literal(value: Rc) -> String { match (*value).clone() { - LiteralValue::LitStr { value: inner, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"LitStr\", \"value\": ".to_string(), json_quote(inner.clone())), "}".to_string()), - LiteralValue::LitInt { value: inner, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"LitInt\", \"value\": ".to_string(), (inner.clone()).to_string()), "}".to_string()), - LiteralValue::LitFloat { value: inner, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"LitFloat\", \"value\": ".to_string(), json_quote(inner.clone())), "}".to_string()), - LiteralValue::LitBool { value: inner, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"LitBool\", \"value\": ".to_string(), json_bool(inner.clone())), "}".to_string()), - LiteralValue::LitNull => "{\"kind\": \"LitNull\"}".to_string(), -} -} - -pub fn serialize_field_binding(binding: &Rc, source_indices: &Rc>>) -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"field_name\": ".to_string(), json_quote(field_binding_name_at(binding.clone(), source_indices.clone()))), ", \"binding\": ".to_string()), serialize_match_pattern(field_binding_pattern(binding.clone()), source_indices.clone())), "}".to_string()) + LiteralValue::LitStr { value: inner, .. } => v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"LitStr\", \"value\": ".to_string(), + json_quote(inner.clone()), + ), + "}".to_string(), + ), + LiteralValue::LitInt { value: inner, .. } => v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"LitInt\", \"value\": ".to_string(), + (inner.clone()).to_string(), + ), + "}".to_string(), + ), + LiteralValue::LitFloat { value: inner, .. } => v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"LitFloat\", \"value\": ".to_string(), + json_quote(inner.clone()), + ), + "}".to_string(), + ), + LiteralValue::LitBool { value: inner, .. } => v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"LitBool\", \"value\": ".to_string(), + json_bool(inner.clone()), + ), + "}".to_string(), + ), + LiteralValue::LitNull => "{\"kind\": \"LitNull\"}".to_string(), + } } -pub fn serialize_match_pattern(pattern: Rc, source_indices: Rc>>) -> String { +pub fn serialize_field_binding( + binding: &Rc, + source_indices: &Rc>>, +) -> String { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"field_name\": ".to_string(), + json_quote(field_binding_name_at( + binding.clone(), + source_indices.clone(), + )), + ), + ", \"binding\": ".to_string(), + ), + serialize_match_pattern( + field_binding_pattern(binding.clone()), + source_indices.clone(), + ), + ), + "}".to_string(), + ) +} + +pub fn serialize_match_pattern( + pattern: Rc, + source_indices: Rc>>, +) -> String { match (*pattern).clone() { - MatchPattern::Bind { name: inner, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"Bind\", \"name\": ".to_string(), json_quote(inner.clone())), "}".to_string()), - MatchPattern::LitPattern { value: inner, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"LitPattern\", \"value\": ".to_string(), serialize_literal(inner.clone())), "}".to_string()), - MatchPattern::VariantPattern { name: inner, parent_enum, field_bindings, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"VariantPattern\", \"name\": ".to_string(), json_quote(inner.clone())), ", \"parent_enum\": ".to_string()), json_optional_string(parent_enum.clone())), ", \"field_bindings\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for fb in field_bindings.clone().iter().cloned() { __result.push(serialize_field_binding(&fb, &source_indices)); } __result }))), "}".to_string()), - MatchPattern::Wildcard => "{\"kind\": \"Wildcard\"}".to_string(), -} -} - -pub fn serialize_named_arg(arg: &Rc, source_indices: &Rc>>) -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"name\": ".to_string(), json_optional_string(arg_name_at(arg.clone(), source_indices.clone()))), ", \"value\": ".to_string()), serialize_node(&arg_value(&arg), &source_indices)), "}".to_string()) -} - -pub fn serialize_match_arm(arm: &Rc, source_indices: &Rc>>) -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"pattern\": ".to_string(), serialize_match_pattern(arm_pattern(arm.clone()), source_indices.clone())), ", \"guard\": ".to_string()), json_optional_node(arm_guard(&arm), source_indices.clone())), ", \"body\": ".to_string()), serialize_node(&arm_body(&arm), &source_indices)), "}".to_string()) -} - -pub fn serialize_field_init(field_init: &Rc, source_indices: &Rc>>) -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"name\": ".to_string(), json_quote(field_init_node_name_at(field_init.clone(), source_indices.clone()))), ", \"value\": ".to_string()), serialize_node(&field_init_node_value(&field_init), &source_indices)), "}".to_string()) + MatchPattern::Bind { name: inner, .. } => v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"Bind\", \"name\": ".to_string(), + json_quote(inner.clone()), + ), + "}".to_string(), + ), + MatchPattern::LitPattern { value: inner, .. } => v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"LitPattern\", \"value\": ".to_string(), + serialize_literal(inner.clone()), + ), + "}".to_string(), + ), + MatchPattern::VariantPattern { + name: inner, + parent_enum, + field_bindings, + .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"VariantPattern\", \"name\": ".to_string(), + json_quote(inner.clone()), + ), + ", \"parent_enum\": ".to_string(), + ), + json_optional_string(parent_enum.clone()), + ), + ", \"field_bindings\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for fb in field_bindings.clone().iter().cloned() { + __result.push(serialize_field_binding(&fb, &source_indices)); + } + __result + })), + ), + "}".to_string(), + ), + MatchPattern::Wildcard => "{\"kind\": \"Wildcard\"}".to_string(), + } } -pub fn serialize_string_part(part: Rc, source_indices: Rc>>) -> String { +pub fn serialize_named_arg( + arg: &Rc, + source_indices: &Rc>>, +) -> String { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"name\": ".to_string(), + json_optional_string(arg_name_at(arg.clone(), source_indices.clone())), + ), + ", \"value\": ".to_string(), + ), + serialize_node(&arg_value(&arg), &source_indices), + ), + "}".to_string(), + ) +} + +pub fn serialize_match_arm( + arm: &Rc, + source_indices: &Rc>>, +) -> String { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"pattern\": ".to_string(), + serialize_match_pattern( + arm_pattern(arm.clone()), + source_indices.clone(), + ), + ), + ", \"guard\": ".to_string(), + ), + json_optional_node(arm_guard(&arm), source_indices.clone()), + ), + ", \"body\": ".to_string(), + ), + serialize_node(&arm_body(&arm), &source_indices), + ), + "}".to_string(), + ) +} + +pub fn serialize_field_init( + field_init: &Rc, + source_indices: &Rc>>, +) -> String { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"name\": ".to_string(), + json_quote(field_init_node_name_at( + field_init.clone(), + source_indices.clone(), + )), + ), + ", \"value\": ".to_string(), + ), + serialize_node(&field_init_node_value(&field_init), &source_indices), + ), + "}".to_string(), + ) +} + +pub fn serialize_string_part( + part: Rc, + source_indices: Rc>>, +) -> String { match (*part).clone() { - StringPart::Text { value: inner, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"Text\", \"value\": ".to_string(), json_quote(inner.clone())), "}".to_string()), - StringPart::Interpolation { expr: inner, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"Interpolation\", \"expr\": ".to_string(), serialize_node(&inner, &source_indices)), "}".to_string()), -} + StringPart::Text { value: inner, .. } => v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"Text\", \"value\": ".to_string(), + json_quote(inner.clone()), + ), + "}".to_string(), + ), + StringPart::Interpolation { expr: inner, .. } => v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"Interpolation\", \"expr\": ".to_string(), + serialize_node(&inner, &source_indices), + ), + "}".to_string(), + ), + } } pub fn serialize_call_semantics(value: Option) -> String { match value { - Some(inner) => v2_rt::concat(v2_rt::concat("{\"kind\": ".to_string(), json_quote(call_semantics_name(inner.clone()))), "}".to_string()), - None => "null".to_string(), -} + Some(inner) => v2_rt::concat( + v2_rt::concat( + "{\"kind\": ".to_string(), + json_quote(call_semantics_name(inner.clone())), + ), + "}".to_string(), + ), + None => "null".to_string(), + } } -pub fn serialize_method_semantics(value: Option>, source_indices: &Rc>>) -> String { +pub fn serialize_method_semantics( + value: Option>, + source_indices: &Rc>>, +) -> String { match value.as_deref().cloned() { - Some(MethodSemantics::PlainMethodSemantics) => "{\"kind\": \"PlainMethodSemantics\"}".to_string(), - Some(MethodSemantics::AlgebraMethodSemantics { method_def, fold_accumulator_type, .. }) => { - let mn = authored_name_at(source_indices.clone(), &method_def); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"AlgebraMethodSemantics\", \"method_name\": ".to_string(), json_quote(mn)), ", \"fold_accumulator_type\": ".to_string()), json_optional_node(fold_accumulator_type.clone(), source_indices.clone())), "}".to_string()) -}, - Some(MethodSemantics::ServiceMethodSemantics { service_name, op_params, .. }) => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ServiceMethodSemantics\", \"service_name\": ".to_string(), json_quote(service_name.clone())), ", \"op_params\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for p in op_params.clone().iter().cloned() { __result.push(serialize_param(&p, &source_indices)); } __result }))), "}".to_string()), - None => "null".to_string(), -} + Some(MethodSemantics::PlainMethodSemantics) => { + "{\"kind\": \"PlainMethodSemantics\"}".to_string() + } + Some(MethodSemantics::AlgebraMethodSemantics { + method_def, + fold_accumulator_type, + .. + }) => { + let mn = authored_name_at(source_indices.clone(), &method_def); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"AlgebraMethodSemantics\", \"method_name\": ".to_string(), + json_quote(mn), + ), + ", \"fold_accumulator_type\": ".to_string(), + ), + json_optional_node(fold_accumulator_type.clone(), source_indices.clone()), + ), + "}".to_string(), + ) + } + Some(MethodSemantics::ServiceMethodSemantics { + service_name, + op_params, + .. + }) => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ServiceMethodSemantics\", \"service_name\": ".to_string(), + json_quote(service_name.clone()), + ), + ", \"op_params\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for p in op_params.clone().iter().cloned() { + __result.push(serialize_param(&p, &source_indices)); + } + __result + })), + ), + "}".to_string(), + ), + None => "null".to_string(), + } } pub fn serialize_recursion_shape(shape: RecursionShape) -> String { match shape { - RecursionShape::DirectRecursion => "{\"_variant\": \"DirectRecursion\"}".to_string(), - RecursionShape::ListRecursion => "{\"_variant\": \"ListRecursion\"}".to_string(), - RecursionShape::OptionalRecursion => "{\"_variant\": \"OptionalRecursion\"}".to_string(), - RecursionShape::SetRecursion => "{\"_variant\": \"SetRecursion\"}".to_string(), - RecursionShape::MapValueRecursion => "{\"_variant\": \"MapValueRecursion\"}".to_string(), -} + RecursionShape::DirectRecursion => "{\"_variant\": \"DirectRecursion\"}".to_string(), + RecursionShape::ListRecursion => "{\"_variant\": \"ListRecursion\"}".to_string(), + RecursionShape::OptionalRecursion => "{\"_variant\": \"OptionalRecursion\"}".to_string(), + RecursionShape::SetRecursion => "{\"_variant\": \"SetRecursion\"}".to_string(), + RecursionShape::MapValueRecursion => "{\"_variant\": \"MapValueRecursion\"}".to_string(), + } } pub fn serialize_inductive_field(field: &Rc) -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"type_name\": ".to_string(), json_quote(field.type_name.clone())), ", \"variant_name\": ".to_string()), json_quote(field.variant_name.clone())), ", \"field_name\": ".to_string()), json_quote(field.field_name.clone())), ", \"shape\": ".to_string()), serialize_recursion_shape(field.shape.clone())), "}".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"type_name\": ".to_string(), + json_quote(field.type_name.clone()), + ), + ", \"variant_name\": ".to_string(), + ), + json_quote(field.variant_name.clone()), + ), + ", \"field_name\": ".to_string(), + ), + json_quote(field.field_name.clone()), + ), + ", \"shape\": ".to_string(), + ), + serialize_recursion_shape(field.shape.clone()), + ), + "}".to_string(), + ) } pub fn serialize_positive_descent_amount(steps: Rc) -> String { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - match (*steps).clone() { - PositiveDescentAmount::OneStep => "{\"_variant\": \"OneStep\"}".to_string(), - PositiveDescentAmount::AdditionalStep { previous: p, .. } => v2_rt::concat(v2_rt::concat("{\"_variant\": \"AdditionalStep\", \"previous\": ".to_string(), serialize_positive_descent_amount(p.clone())), "}".to_string()), -} + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*steps).clone() { + PositiveDescentAmount::OneStep => "{\"_variant\": \"OneStep\"}".to_string(), + PositiveDescentAmount::AdditionalStep { previous: p, .. } => v2_rt::concat( + v2_rt::concat( + "{\"_variant\": \"AdditionalStep\", \"previous\": ".to_string(), + serialize_positive_descent_amount(p.clone()), + ), + "}".to_string(), + ), }) } pub fn serialize_proportional_divisor(d: Rc) -> String { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - match (*d).clone() { - ProportionalDivisor::DivideByTwo => "{\"_variant\": \"DivideByTwo\"}".to_string(), - ProportionalDivisor::StrictlyLarger { inner: i, .. } => v2_rt::concat(v2_rt::concat("{\"_variant\": \"StrictlyLarger\", \"inner\": ".to_string(), serialize_proportional_divisor(i.clone())), "}".to_string()), -} + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*d).clone() { + ProportionalDivisor::DivideByTwo => "{\"_variant\": \"DivideByTwo\"}".to_string(), + ProportionalDivisor::StrictlyLarger { inner: i, .. } => v2_rt::concat( + v2_rt::concat( + "{\"_variant\": \"StrictlyLarger\", \"inner\": ".to_string(), + serialize_proportional_divisor(i.clone()), + ), + "}".to_string(), + ), }) } pub fn serialize_shrink_factor(factor: Rc) -> String { match (*factor).clone() { - ShrinkFactor::UnitShrink => "{\"_variant\": \"UnitShrink\"}".to_string(), - ShrinkFactor::ConstantShrink { steps: s, .. } => v2_rt::concat(v2_rt::concat("{\"_variant\": \"ConstantShrink\", \"steps\": ".to_string(), serialize_positive_descent_amount(s.clone())), "}".to_string()), - ShrinkFactor::ProportionalShrink { divisor: d, .. } => v2_rt::concat(v2_rt::concat("{\"_variant\": \"ProportionalShrink\", \"divisor\": ".to_string(), serialize_proportional_divisor(d.clone())), "}".to_string()), -} + ShrinkFactor::UnitShrink => "{\"_variant\": \"UnitShrink\"}".to_string(), + ShrinkFactor::ConstantShrink { steps: s, .. } => v2_rt::concat( + v2_rt::concat( + "{\"_variant\": \"ConstantShrink\", \"steps\": ".to_string(), + serialize_positive_descent_amount(s.clone()), + ), + "}".to_string(), + ), + ShrinkFactor::ProportionalShrink { divisor: d, .. } => v2_rt::concat( + v2_rt::concat( + "{\"_variant\": \"ProportionalShrink\", \"divisor\": ".to_string(), + serialize_proportional_divisor(d.clone()), + ), + "}".to_string(), + ), + } } pub fn serialize_sub_value_relation(rel: Rc) -> String { match (*rel).clone() { - SubValueRelation::StrictSubValue { field: f, factor: fac, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"_variant\": \"StrictSubValue\", \"field\": ".to_string(), serialize_inductive_field(&f)), ", \"factor\": ".to_string()), serialize_shrink_factor(fac.clone())), "}".to_string()), - SubValueRelation::IteratedSubValue { field: f, .. } => v2_rt::concat(v2_rt::concat("{\"_variant\": \"IteratedSubValue\", \"field\": ".to_string(), serialize_inductive_field(&f)), "}".to_string()), - SubValueRelation::ArithmeticDescent { param: p, factor: fac, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"_variant\": \"ArithmeticDescent\", \"param\": ".to_string(), json_quote(p.clone())), ", \"factor\": ".to_string()), serialize_shrink_factor(fac.clone())), "}".to_string()), - SubValueRelation::PreservedValue => "{\"_variant\": \"PreservedValue\"}".to_string(), - SubValueRelation::SubValueUnknown => "{\"_variant\": \"SubValueUnknown\"}".to_string(), -} + SubValueRelation::StrictSubValue { + field: f, + factor: fac, + .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"_variant\": \"StrictSubValue\", \"field\": ".to_string(), + serialize_inductive_field(&f), + ), + ", \"factor\": ".to_string(), + ), + serialize_shrink_factor(fac.clone()), + ), + "}".to_string(), + ), + SubValueRelation::IteratedSubValue { field: f, .. } => v2_rt::concat( + v2_rt::concat( + "{\"_variant\": \"IteratedSubValue\", \"field\": ".to_string(), + serialize_inductive_field(&f), + ), + "}".to_string(), + ), + SubValueRelation::ArithmeticDescent { + param: p, + factor: fac, + .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"_variant\": \"ArithmeticDescent\", \"param\": ".to_string(), + json_quote(p.clone()), + ), + ", \"factor\": ".to_string(), + ), + serialize_shrink_factor(fac.clone()), + ), + "}".to_string(), + ), + SubValueRelation::PreservedValue => "{\"_variant\": \"PreservedValue\"}".to_string(), + SubValueRelation::SubValueUnknown => "{\"_variant\": \"SubValueUnknown\"}".to_string(), + } } pub fn serialize_descent_evidence(de: Option>>>) -> String { match de { - Some(evidence) => json_list(Rc::new({ let mut __result = Vec::new(); for rel in evidence.clone().iter().cloned() { __result.push(serialize_sub_value_relation(rel.clone())); } __result })), - None => "null".to_string(), -} + Some(evidence) => json_list(Rc::new({ + let mut __result = Vec::new(); + for rel in evidence.clone().iter().cloned() { + __result.push(serialize_sub_value_relation(rel.clone())); + } + __result + })), + None => "null".to_string(), + } } -pub fn serialize_expr_data(expr_node: &Rc, source_indices: &Rc>>) -> String { +pub fn serialize_expr_data( + expr_node: &Rc, + source_indices: &Rc>>, +) -> String { { let ch = expr_node.children.clone(); -let name = authored_name_at(source_indices.clone(), &expr_node); -match (*expr_node.expr_data.clone()).clone() { - ExprData::NoExprData => "{\"kind\": \"NoExprData\"}".to_string(), - ExprData::ExprLiteral { value, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprLiteral\", \"value\": ".to_string(), serialize_literal(value.clone())), "}".to_string()), - ExprData::ExprError { kind, message, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprError\", \"error_kind\": ".to_string(), json_quote(expr_error_kind_name(kind.clone()))), ", \"message\": ".to_string()), json_quote(message.clone())), "}".to_string()), - ExprData::ExprVar { binding_kind, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprVar\", \"name\": ".to_string(), json_quote(name)), ", \"binding_kind\": ".to_string()), match binding_kind.clone() { - Some(inner) => v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": ".to_string(), json_quote(var_binding_kind_name(inner.clone()))), match (*inner.clone()).clone() { - VarBindingKind::VariantValueBinding { parent_enum, .. } => v2_rt::concat(", \"parent_enum\": ".to_string(), json_quote(parent_enum.clone())), - _ => "".to_string(), -}), "}".to_string()), - None => "null".to_string(), -}), "}".to_string()), - ExprData::ExprFieldAccess { summary, .. } => { - let field = field_access_field_at(expr_node.clone(), source_indices.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprFieldAccess\", \"field\": ".to_string(), json_quote(field)), ", \"summary\": ".to_string()), match summary.clone() { - Some(inner) => serialize_field_summary(&inner), - None => "null".to_string(), -}), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()) -}, - ExprData::ExprCall { call_semantics, descent_evidence: de, .. } => { - let func = expr_call_func_at(expr_node.clone(), source_indices.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprCall\", \"func\": ".to_string(), json_quote(func)), ", \"call_semantics\": ".to_string()), serialize_call_semantics(call_semantics.clone())), ", \"descent_evidence\": ".to_string()), serialize_descent_evidence(de.clone())), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()) -}, - ExprData::ExprMethodCall { method_semantics, .. } => { - let method = expr_method_name_at(expr_node.clone(), source_indices.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprMethodCall\", \"method\": ".to_string(), json_quote(method)), ", \"method_semantics\": ".to_string()), serialize_method_semantics(method_semantics.clone(), &source_indices)), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()) -}, - ExprData::ExprBinOp { op, algebra_field: af, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprBinOp\", \"op\": ".to_string(), json_quote(bin_op_name(op.clone()))), ", \"algebra_field\": ".to_string()), match af.clone() { - Some(f) => json_quote(algebra_field_kind_name(f.clone())), - None => "null".to_string(), -}), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), - ExprData::ExprUnaryOp { op, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprUnaryOp\", \"op\": ".to_string(), json_quote(unary_op_name(op.clone()))), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), - ExprData::ExprLambda => { - let params = lambda_param_names_at(expr_node.clone(), source_indices.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprLambda\", \"params\": ".to_string(), json_list(Rc::new({ let mut __result = Vec::new(); for p in params.iter().cloned() { __result.push(json_quote(p.clone())); } __result }))), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()) -}, - ExprData::ExprLet => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprLet\", \"name\": ".to_string(), json_quote(name)), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), - ExprData::ExprRecordLit { parent_enum, .. } => { - let type_name = record_lit_type_name_at(expr_node.clone(), source_indices.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprRecordLit\", \"type_name\": ".to_string(), json_optional_string(type_name)), ", \"parent_enum\": ".to_string()), json_optional_string(parent_enum.clone())), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()) -}, - ExprData::ExprForEach => { - let variable = foreach_variable_at(expr_node.clone(), source_indices.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprForEach\", \"variable\": ".to_string(), json_quote(variable)), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()) -}, - ExprData::ExprMatch => v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprMatch\"".to_string(), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), - ExprData::ExprIf => v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprIf\"".to_string(), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), - ExprData::ExprListLit => v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprListLit\"".to_string(), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), - ExprData::ExprStringInterp => v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprStringInterp\"".to_string(), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), - ExprData::ExprBlock => v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprBlock\"".to_string(), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), - ExprData::ExprCast => v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprCast\"".to_string(), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), - ExprData::ExprIndex => v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprIndex\"".to_string(), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), - ExprData::ExprSlice => v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprSlice\"".to_string(), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), - ExprData::ExprReturn => v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"ExprReturn\"".to_string(), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for c in ch.iter().cloned() { __result.push(serialize_node(&c, &source_indices)); } __result }))), "}".to_string()), -} -} -} - -pub fn serialize_inferred_node(inferred: Rc, source_indices: Rc>>) -> String { - match (*inferred).clone() { - InferredNode::Resolved { node, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"Resolved\", \"node\": ".to_string(), serialize_node(&node, &source_indices)), "}".to_string()), - InferredNode::CompilerError { message, span, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"kind\": \"CompilerError\", \"message\": ".to_string(), json_quote(message.clone())), ", \"span\": ".to_string()), serialize_span(&span)), "}".to_string()), - InferredNode::TypeVariable { id, .. } => v2_rt::concat(v2_rt::concat("{\"kind\": \"TypeVariable\", \"id\": ".to_string(), json_quote(id.clone())), "}".to_string()), -} -} - -pub fn serialize_resource_use(resource_use: &Rc, source_indices: &Rc>>) -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"name\": ".to_string(), json_quote(resource_use_name_at(resource_use.clone(), source_indices.clone()))), ", \"resource\": ".to_string()), serialize_node(&resource_use_resource(&resource_use), &source_indices)), ", \"span\": ".to_string()), serialize_span(&resource_use.span.clone())), "}".to_string()) -} - -pub fn serialize_field(field: &Rc, source_indices: &Rc>>) -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"name\": ".to_string(), json_quote(field_node_name_at(field.clone(), source_indices.clone()))), ", \"type_expr\": ".to_string()), serialize_node(&field_node_type_expr(&field), &source_indices)), ", \"cardinality\": ".to_string()), json_quote(cardinality_name(field_node_cardinality(field.clone())))), ", \"default_value\": ".to_string()), json_optional_node(field_node_default_value(&field), source_indices.clone())), ", \"from_key\": ".to_string()), json_optional_string(field_node_from_key(field.clone(), source_indices.clone()))), ", \"span\": ".to_string()), serialize_span(&field_node_span(field.clone()))), "}".to_string()) + let name = authored_name_at(source_indices.clone(), &expr_node); + match (*expr_node.expr_data.clone()).clone() { + ExprData::NoExprData => "{\"kind\": \"NoExprData\"}".to_string(), + ExprData::ExprLiteral { value, .. } => v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ExprLiteral\", \"value\": ".to_string(), + serialize_literal(value.clone()), + ), + "}".to_string(), + ), + ExprData::ExprError { kind, message, .. } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ExprError\", \"error_kind\": ".to_string(), + json_quote(expr_error_kind_name(kind.clone())), + ), + ", \"message\": ".to_string(), + ), + json_quote(message.clone()), + ), + "}".to_string(), + ), + ExprData::ExprVar { binding_kind, .. } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ExprVar\", \"name\": ".to_string(), + json_quote(name), + ), + ", \"binding_kind\": ".to_string(), + ), + match binding_kind.clone() { + Some(inner) => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": ".to_string(), + json_quote(var_binding_kind_name(inner.clone())), + ), + match (*inner.clone()).clone() { + VarBindingKind::VariantValueBinding { parent_enum, .. } => { + v2_rt::concat( + ", \"parent_enum\": ".to_string(), + json_quote(parent_enum.clone()), + ) + } + _ => "".to_string(), + }, + ), + "}".to_string(), + ), + None => "null".to_string(), + }, + ), + "}".to_string(), + ), + ExprData::ExprFieldAccess { summary, .. } => { + let field = field_access_field_at(expr_node.clone(), source_indices.clone()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ExprFieldAccess\", \"field\": ".to_string(), + json_quote(field), + ), + ", \"summary\": ".to_string(), + ), + match summary.clone() { + Some(inner) => serialize_field_summary(&inner), + None => "null".to_string(), + }, + ), + ", \"children\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for c in ch.iter().cloned() { + __result.push(serialize_node(&c, &source_indices)); + } + __result + })), + ), + "}".to_string(), + ) + } + ExprData::ExprCall { + call_semantics, + descent_evidence: de, + .. + } => { + let func = expr_call_func_at(expr_node.clone(), source_indices.clone()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ExprCall\", \"func\": ".to_string(), + json_quote(func), + ), + ", \"call_semantics\": ".to_string(), + ), + serialize_call_semantics(call_semantics.clone()), + ), + ", \"descent_evidence\": ".to_string(), + ), + serialize_descent_evidence(de.clone()), + ), + ", \"children\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for c in ch.iter().cloned() { + __result.push(serialize_node(&c, &source_indices)); + } + __result + })), + ), + "}".to_string(), + ) + } + ExprData::ExprMethodCall { + method_semantics, .. + } => { + let method = expr_method_name_at(expr_node.clone(), source_indices.clone()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ExprMethodCall\", \"method\": ".to_string(), + json_quote(method), + ), + ", \"method_semantics\": ".to_string(), + ), + serialize_method_semantics( + method_semantics.clone(), + &source_indices, + ), + ), + ", \"children\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for c in ch.iter().cloned() { + __result.push(serialize_node(&c, &source_indices)); + } + __result + })), + ), + "}".to_string(), + ) + } + ExprData::ExprBinOp { + op, + algebra_field: af, + .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ExprBinOp\", \"op\": ".to_string(), + json_quote(bin_op_name(op.clone())), + ), + ", \"algebra_field\": ".to_string(), + ), + match af.clone() { + Some(f) => json_quote(algebra_field_kind_name(f.clone())), + None => "null".to_string(), + }, + ), + ", \"children\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for c in ch.iter().cloned() { + __result.push(serialize_node(&c, &source_indices)); + } + __result + })), + ), + "}".to_string(), + ), + ExprData::ExprUnaryOp { op, .. } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ExprUnaryOp\", \"op\": ".to_string(), + json_quote(unary_op_name(op.clone())), + ), + ", \"children\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for c in ch.iter().cloned() { + __result.push(serialize_node(&c, &source_indices)); + } + __result + })), + ), + "}".to_string(), + ), + ExprData::ExprLambda => { + let params = lambda_param_names_at(expr_node.clone(), source_indices.clone()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ExprLambda\", \"params\": ".to_string(), + json_list(Rc::new({ + let mut __result = Vec::new(); + for p in params.iter().cloned() { + __result.push(json_quote(p.clone())); + } + __result + })), + ), + ", \"children\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for c in ch.iter().cloned() { + __result.push(serialize_node(&c, &source_indices)); + } + __result + })), + ), + "}".to_string(), + ) + } + ExprData::ExprLet => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ExprLet\", \"name\": ".to_string(), + json_quote(name), + ), + ", \"children\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for c in ch.iter().cloned() { + __result.push(serialize_node(&c, &source_indices)); + } + __result + })), + ), + "}".to_string(), + ), + ExprData::ExprRecordLit { parent_enum, .. } => { + let type_name = record_lit_type_name_at(expr_node.clone(), source_indices.clone()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ExprRecordLit\", \"type_name\": ".to_string(), + json_optional_string(type_name), + ), + ", \"parent_enum\": ".to_string(), + ), + json_optional_string(parent_enum.clone()), + ), + ", \"children\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for c in ch.iter().cloned() { + __result.push(serialize_node(&c, &source_indices)); + } + __result + })), + ), + "}".to_string(), + ) + } + ExprData::ExprForEach => { + let variable = foreach_variable_at(expr_node.clone(), source_indices.clone()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ExprForEach\", \"variable\": ".to_string(), + json_quote(variable), + ), + ", \"children\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for c in ch.iter().cloned() { + __result.push(serialize_node(&c, &source_indices)); + } + __result + })), + ), + "}".to_string(), + ) + } + ExprData::ExprMatch => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ExprMatch\"".to_string(), + ", \"children\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for c in ch.iter().cloned() { + __result.push(serialize_node(&c, &source_indices)); + } + __result + })), + ), + "}".to_string(), + ), + ExprData::ExprIf => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ExprIf\"".to_string(), + ", \"children\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for c in ch.iter().cloned() { + __result.push(serialize_node(&c, &source_indices)); + } + __result + })), + ), + "}".to_string(), + ), + ExprData::ExprListLit => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ExprListLit\"".to_string(), + ", \"children\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for c in ch.iter().cloned() { + __result.push(serialize_node(&c, &source_indices)); + } + __result + })), + ), + "}".to_string(), + ), + ExprData::ExprStringInterp => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ExprStringInterp\"".to_string(), + ", \"children\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for c in ch.iter().cloned() { + __result.push(serialize_node(&c, &source_indices)); + } + __result + })), + ), + "}".to_string(), + ), + ExprData::ExprBlock => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ExprBlock\"".to_string(), + ", \"children\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for c in ch.iter().cloned() { + __result.push(serialize_node(&c, &source_indices)); + } + __result + })), + ), + "}".to_string(), + ), + ExprData::ExprCast => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ExprCast\"".to_string(), + ", \"children\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for c in ch.iter().cloned() { + __result.push(serialize_node(&c, &source_indices)); + } + __result + })), + ), + "}".to_string(), + ), + ExprData::ExprIndex => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ExprIndex\"".to_string(), + ", \"children\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for c in ch.iter().cloned() { + __result.push(serialize_node(&c, &source_indices)); + } + __result + })), + ), + "}".to_string(), + ), + ExprData::ExprSlice => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ExprSlice\"".to_string(), + ", \"children\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for c in ch.iter().cloned() { + __result.push(serialize_node(&c, &source_indices)); + } + __result + })), + ), + "}".to_string(), + ), + ExprData::ExprReturn => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"ExprReturn\"".to_string(), + ", \"children\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for c in ch.iter().cloned() { + __result.push(serialize_node(&c, &source_indices)); + } + __result + })), + ), + "}".to_string(), + ), + } + } } -pub fn serialize_param(param: &Rc, source_indices: &Rc>>) -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"name\": ".to_string(), json_quote(param_node_name_at(param.clone(), source_indices.clone()))), ", \"type_expr\": ".to_string()), serialize_node(¶m_node_type_expr(¶m), &source_indices)), ", \"default_value\": ".to_string()), json_optional_node(param_node_default_value(¶m), source_indices.clone())), ", \"span\": ".to_string()), serialize_span(¶m_node_span(param.clone()))), "}".to_string()) +pub fn serialize_inferred_node( + inferred: Rc, + source_indices: Rc>>, +) -> String { + match (*inferred).clone() { + InferredNode::Resolved { node, .. } => v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"Resolved\", \"node\": ".to_string(), + serialize_node(&node, &source_indices), + ), + "}".to_string(), + ), + InferredNode::CompilerError { message, span, .. } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"CompilerError\", \"message\": ".to_string(), + json_quote(message.clone()), + ), + ", \"span\": ".to_string(), + ), + serialize_span(&span), + ), + "}".to_string(), + ), + InferredNode::TypeVariable { id, .. } => v2_rt::concat( + v2_rt::concat( + "{\"kind\": \"TypeVariable\", \"id\": ".to_string(), + json_quote(id.clone()), + ), + "}".to_string(), + ), + } } -pub fn serialize_node(node: &Rc, source_indices: &Rc>>) -> String { +pub fn serialize_resource_use( + resource_use: &Rc, + source_indices: &Rc>>, +) -> String { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"name\": ".to_string(), + json_quote(resource_use_name_at( + resource_use.clone(), + source_indices.clone(), + )), + ), + ", \"resource\": ".to_string(), + ), + serialize_node(&resource_use_resource(&resource_use), &source_indices), + ), + ", \"span\": ".to_string(), + ), + serialize_span(&resource_use.span.clone()), + ), + "}".to_string(), + ) +} + +pub fn serialize_field( + field: &Rc, + source_indices: &Rc>>, +) -> String { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"name\": ".to_string(), + json_quote(field_node_name_at( + field.clone(), + source_indices.clone(), + )), + ), + ", \"type_expr\": ".to_string(), + ), + serialize_node( + &field_node_type_expr(&field), + &source_indices, + ), + ), + ", \"cardinality\": ".to_string(), + ), + json_quote(cardinality_name(field_node_cardinality( + field.clone(), + ))), + ), + ", \"default_value\": ".to_string(), + ), + json_optional_node( + field_node_default_value(&field), + source_indices.clone(), + ), + ), + ", \"from_key\": ".to_string(), + ), + json_optional_string(field_node_from_key( + field.clone(), + source_indices.clone(), + )), + ), + ", \"span\": ".to_string(), + ), + serialize_span(&field_node_span(field.clone())), + ), + "}".to_string(), + ) +} + +pub fn serialize_param( + param: &Rc, + source_indices: &Rc>>, +) -> String { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"name\": ".to_string(), + json_quote(param_node_name_at( + param.clone(), + source_indices.clone(), + )), + ), + ", \"type_expr\": ".to_string(), + ), + serialize_node(¶m_node_type_expr(¶m), &source_indices), + ), + ", \"default_value\": ".to_string(), + ), + json_optional_node(param_node_default_value(¶m), source_indices.clone()), + ), + ", \"span\": ".to_string(), + ), + serialize_span(¶m_node_span(param.clone())), + ), + "}".to_string(), + ) +} + +pub fn serialize_node( + node: &Rc, + source_indices: &Rc>>, +) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"name\": ".to_string(), json_quote(authored_name_at(source_indices.clone(), &node))), ", \"span\": ".to_string()), serialize_span(&node.span.clone())), ", \"ident_span\": ".to_string()), json_optional_span(node.ident_span.clone())), ", \"children\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for child in node.children.clone().iter().cloned() { __result.push(serialize_node(&child, &source_indices)); } __result }))), ", \"connective\": ".to_string()), match node.connective.clone() { Connective::Conj => json_quote(connective_name(Connective::Conj)), @@ -495,234 +1566,546 @@ pub fn serialize_node(node: &Rc, source_indices: &Rc, source_indices: &Rc>>) -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"name\": ".to_string(), json_quote(authored_name_at(source_indices.clone(), &module))), ", \"imports\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for imp in module_imports(module.clone()).iter().cloned() { __result.push(serialize_import_node(&imp, &source_indices)); } __result }))), ", \"span\": ".to_string()), serialize_span(&module.span.clone())), "}".to_string()) +pub fn serialize_module( + module: &Rc, + source_indices: &Rc>>, +) -> String { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"name\": ".to_string(), + json_quote(authored_name_at(source_indices.clone(), &module)), + ), + ", \"imports\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for imp in module_imports(module.clone()).iter().cloned() { + __result.push(serialize_import_node(&imp, &source_indices)); + } + __result + })), + ), + ", \"span\": ".to_string(), + ), + serialize_span(&module.span.clone()), + ), + "}".to_string(), + ) } pub fn serialize_typed_module(module: &Rc) -> String { { let si = module.type_env.clone().source_indices.clone(); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"module\": ".to_string(), serialize_module(&module.module.clone(), &si)), ", \"items\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for item in module.items.clone().iter().cloned() { __result.push(serialize_node(&item, &si)); } __result }))), ", \"item_registry_keys\": ".to_string()), json_list(Rc::new({ let mut __result = Vec::new(); for k in Rc::new(v2_rt::map_keys(&module.item_registry.clone())).iter().cloned() { __result.push(json_quote(k.clone())); } __result }))), "}".to_string()) -} + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"module\": ".to_string(), + serialize_module(&module.module.clone(), &si), + ), + ", \"items\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for item in module.items.clone().iter().cloned() { + __result.push(serialize_node(&item, &si)); + } + __result + })), + ), + ", \"item_registry_keys\": ".to_string(), + ), + json_list(Rc::new({ + let mut __result = Vec::new(); + for k in Rc::new(v2_rt::map_keys(&module.item_registry.clone())) + .iter() + .cloned() + { + __result.push(json_quote(k.clone())); + } + __result + })), + ), + "}".to_string(), + ) + } } pub fn serialize_diagnostic(diagnostic: &Rc) -> String { { let severity = "error".to_string(); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\"severity\": ".to_string(), json_quote(severity)), ", \"message\": ".to_string()), json_quote(diagnostic_to_message(diagnostic.diagnostic.clone()))), ", \"span\": ".to_string()), serialize_span(&diagnostic_to_span(diagnostic.diagnostic.clone()))), ", \"module_name\": ".to_string()), json_optional_string(Some(diagnostic.module_name.clone()))), ", \"category\": ".to_string()), "null".to_string()), "}".to_string()) -} + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\"severity\": ".to_string(), + json_quote(severity), + ), + ", \"message\": ".to_string(), + ), + json_quote(diagnostic_to_message( + diagnostic.diagnostic.clone(), + )), + ), + ", \"span\": ".to_string(), + ), + serialize_span(&diagnostic_to_span(diagnostic.diagnostic.clone())), + ), + ", \"module_name\": ".to_string(), + ), + json_optional_string(Some(diagnostic.module_name.clone())), + ), + ", \"category\": ".to_string(), + ), + "null".to_string(), + ), + "}".to_string(), + ) + } } pub fn emit_dag_artifact(typed: &Rc) -> Rc { { - let modules_json = Rc::new({ let mut __result = Vec::new(); for m in typed.modules.clone().iter().cloned() { __result.push(serialize_typed_module(&m)); } __result }).join(&", ".to_string()); -let diagnostics_json = Rc::new({ let mut __result = Vec::new(); for d in typed.diagnostics.clone().iter().cloned() { __result.push(serialize_diagnostic(&d)); } __result }).join(&", ".to_string()); -let item_registry_json = Rc::new({ let mut __result = Vec::new(); for k in Rc::new(v2_rt::map_keys(&typed.item_registry.clone())).iter().cloned() { __result.push(json_quote(k.clone())); } __result }).join(&", ".to_string()); -let json = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\n \"version\": \"0.1.0\",\n \"modules\": [".to_string(), modules_json), "],\n \"item_registry_keys\": [".to_string()), item_registry_json), "],\n \"diagnostics\": [".to_string()), diagnostics_json), "],\n \"files\": []\n}".to_string()); -Rc::new(EmitResult { - files: Rc::new(vec![Rc::new(TextFile { - path: "dag-artifact.json".to_string(), - content: json, -})]), - diagnostics: Rc::new(vec![]), -}) -} + let modules_json = Rc::new({ + let mut __result = Vec::new(); + for m in typed.modules.clone().iter().cloned() { + __result.push(serialize_typed_module(&m)); + } + __result + }) + .join(&", ".to_string()); + let diagnostics_json = Rc::new({ + let mut __result = Vec::new(); + for d in typed.diagnostics.clone().iter().cloned() { + __result.push(serialize_diagnostic(&d)); + } + __result + }) + .join(&", ".to_string()); + let item_registry_json = Rc::new({ + let mut __result = Vec::new(); + for k in Rc::new(v2_rt::map_keys(&typed.item_registry.clone())) + .iter() + .cloned() + { + __result.push(json_quote(k.clone())); + } + __result + }) + .join(&", ".to_string()); + let json = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "{\n \"version\": \"0.1.0\",\n \"modules\": [".to_string(), + modules_json, + ), + "],\n \"item_registry_keys\": [".to_string(), + ), + item_registry_json, + ), + "],\n \"diagnostics\": [".to_string(), + ), + diagnostics_json, + ), + "],\n \"files\": []\n}".to_string(), + ); + Rc::new(EmitResult { + files: Rc::new(vec![Rc::new(TextFile { + path: "dag-artifact.json".to_string(), + content: json, + })]), + diagnostics: Rc::new(vec![]), + }) + } } pub fn boundary_ref_error(names: Rc>, ref_name: &String) -> Rc>> { - if { let mut __found = false; for n in names.iter().cloned() { if (n.clone().as_str() == ref_name.clone().as_str()) { __found = true; break; } } __found } { + if { + let mut __found = false; + for n in names.iter().cloned() { + if (n.clone().as_str() == ref_name.clone().as_str()) { + __found = true; + break; + } + } + __found + } { Rc::new(vec![]) } else { - Rc::new(vec![compile_bundle_error(v2_rt::concat(v2_rt::concat("boundary references unknown artifact '".to_string(), ref_name.clone()), "'".to_string()))]) + Rc::new(vec![compile_bundle_error(v2_rt::concat( + v2_rt::concat( + "boundary references unknown artifact '".to_string(), + ref_name.clone(), + ), + "'".to_string(), + ))]) } } pub fn validate_boundaries(plan: &Rc) -> Rc>> { { - let names = Rc::new({ let mut __result = Vec::new(); for a in plan.artifacts.clone().iter().cloned() { __result.push(a.name.clone()); } __result }); -Rc::new({ let mut __result = Vec::new(); for b in plan.boundaries.clone().iter().cloned() { __result.extend((*v2_rt::concat(boundary_ref_error(names.clone(), &b.from_artifact.clone()), boundary_ref_error(names.clone(), &b.to_artifact.clone()))).iter().cloned()); } __result }) -} + let names = Rc::new({ + let mut __result = Vec::new(); + for a in plan.artifacts.clone().iter().cloned() { + __result.push(a.name.clone()); + } + __result + }); + Rc::new({ + let mut __result = Vec::new(); + for b in plan.boundaries.clone().iter().cloned() { + __result.extend( + (*v2_rt::concat( + boundary_ref_error(names.clone(), &b.from_artifact.clone()), + boundary_ref_error(names.clone(), &b.to_artifact.clone()), + )) + .iter() + .cloned(), + ); + } + __result + }) + } } -pub fn emit_from_artifact_plan(typed: Rc, artifact_plan: &Rc) -> Rc { +pub fn emit_from_artifact_plan( + typed: Rc, + artifact_plan: &Rc, +) -> Rc { { if ((artifact_plan.artifacts.clone().len() as i64) == 0) { return Rc::new(EmitResult { - files: Rc::new(vec![]), - diagnostics: Rc::new(vec![compile_bundle_error("compile_sources planned no artifacts".to_string())]), -}) + files: Rc::new(vec![]), + diagnostics: Rc::new(vec![compile_bundle_error( + "compile_sources planned no artifacts".to_string(), + )]), + }); } -let boundary_diags = validate_boundaries(&artifact_plan); -if ((boundary_diags.clone().len() as i64) > 0) { + let boundary_diags = validate_boundaries(&artifact_plan); + if ((boundary_diags.clone().len() as i64) > 0) { return Rc::new(EmitResult { - files: Rc::new(vec![]), - diagnostics: boundary_diags.clone(), -}) + files: Rc::new(vec![]), + diagnostics: boundary_diags.clone(), + }); } -let results = Rc::new({ let mut __result = Vec::new(); for artifact in artifact_plan.artifacts.clone().iter().cloned() { __result.push(emit_artifact(typed.clone(), artifact.clone())); } __result }); -let all_files = Rc::new({ let mut __result = Vec::new(); for r in results.clone().iter().cloned() { __result.extend((*r.files.clone()).iter().cloned()); } __result }); -let all_diags = Rc::new({ let mut __result = Vec::new(); for r in results.clone().iter().cloned() { __result.extend((*r.diagnostics.clone()).iter().cloned()); } __result }); -Rc::new(EmitResult { - files: all_files, - diagnostics: all_diags, -}) -} + let results = Rc::new({ + let mut __result = Vec::new(); + for artifact in artifact_plan.artifacts.clone().iter().cloned() { + __result.push(emit_artifact(typed.clone(), artifact.clone())); + } + __result + }); + let all_files = Rc::new({ + let mut __result = Vec::new(); + for r in results.clone().iter().cloned() { + __result.extend((*r.files.clone()).iter().cloned()); + } + __result + }); + let all_diags = Rc::new({ + let mut __result = Vec::new(); + for r in results.clone().iter().cloned() { + __result.extend((*r.diagnostics.clone()).iter().cloned()); + } + __result + }); + Rc::new(EmitResult { + files: all_files, + diagnostics: all_diags, + }) + } } pub fn collect_diagnostics(parse_results: Rc>>) -> Rc>> { - parse_results.iter().cloned().fold(Rc::new(vec![]), |acc: Rc>>, pr: Rc| match pr.error.clone() { - Some(diag) => v2_rt::rc_list_push(acc.clone(), diag.clone()), - None => acc.clone(), -}) + parse_results.iter().cloned().fold( + Rc::new(vec![]), + |acc: Rc>>, pr: Rc| match pr.error.clone() { + Some(diag) => v2_rt::rc_list_push(acc.clone(), diag.clone()), + None => acc.clone(), + }, + ) } pub fn front_end_sources(sources: Rc>>) -> Rc { { - let acc = sources.iter().cloned().fold(Rc::new(FrontendAccum { - parse_results: Rc::new(vec![]), - newline_indices: Rc::new(vec![]), - intern_table: empty_intern_table(), -}), |acc: Rc, s: Rc| { let acc = Rc::try_unwrap(acc).unwrap_or_else(|rc| (*rc).clone()); { - let tokens = tokenize(&s.content.clone(), s.path.clone()); -let si = build_newline_index(s.path.clone(), &s.content.clone()); -let parsed = parse_with_table(&tokens, v2_rt::rc_map_insert(v2_rt::rc_empty_map::>(), si.file.clone(), si.clone()), acc.intern_table); -let pr = parsed.result.clone(); -Rc::new(FrontendAccum { - parse_results: v2_rt::rc_list_push(acc.parse_results, pr.clone()), - newline_indices: v2_rt::rc_list_push(acc.newline_indices, si.clone()), - intern_table: parsed.intern_table.clone(), -}) -} }); -let parse_results = acc.parse_results.clone(); -let newline_indices = acc.newline_indices.clone(); -let intern_table = acc.intern_table.clone(); -let parse_diagnostics = collect_diagnostics(parse_results.clone()); -let has_parse_errors = { let mut __found = false; for p in parse_results.clone().iter().cloned() { if (p.error.clone() != None) { __found = true; break; } } __found }; -if has_parse_errors { + let acc = sources.iter().cloned().fold( + Rc::new(FrontendAccum { + parse_results: Rc::new(vec![]), + newline_indices: Rc::new(vec![]), + intern_table: empty_intern_table(), + }), + |acc: Rc, s: Rc| { + let acc = Rc::try_unwrap(acc).unwrap_or_else(|rc| (*rc).clone()); + { + let tokens = tokenize(&s.content.clone(), s.path.clone()); + let si = build_newline_index(s.path.clone(), &s.content.clone()); + let parsed = parse_with_table( + &tokens, + v2_rt::rc_map_insert( + v2_rt::rc_empty_map::>(), + si.file.clone(), + si.clone(), + ), + acc.intern_table, + ); + let pr = parsed.result.clone(); + Rc::new(FrontendAccum { + parse_results: v2_rt::rc_list_push(acc.parse_results, pr.clone()), + newline_indices: v2_rt::rc_list_push(acc.newline_indices, si.clone()), + intern_table: parsed.intern_table.clone(), + }) + } + }, + ); + let parse_results = acc.parse_results.clone(); + let newline_indices = acc.newline_indices.clone(); + let intern_table = acc.intern_table.clone(); + let parse_diagnostics = collect_diagnostics(parse_results.clone()); + let has_parse_errors = { + let mut __found = false; + for p in parse_results.clone().iter().cloned() { + if (p.error.clone() != None) { + __found = true; + break; + } + } + __found + }; + if has_parse_errors { Rc::new(FrontendResult { - graph: None, - diagnostics: parse_diagnostics, - newline_indices: newline_indices.clone(), - intern_table: intern_table, -}) + graph: None, + diagnostics: parse_diagnostics, + newline_indices: newline_indices.clone(), + intern_table: intern_table, + }) } else { { - let modules = Rc::new({ let mut __result = Vec::new(); for p in parse_results.clone().iter().cloned() { __result.push(p.module.clone().clone().unwrap()); } __result }); -let source_indices = newline_indices.clone().iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, si: Rc| v2_rt::rc_map_insert(acc, si.file.clone(), si.clone())); -let graph = resolve_modules(&modules, &source_indices); -Rc::new(FrontendResult { - graph: Some(graph.clone()), - diagnostics: v2_rt::concat(parse_diagnostics, graph.diagnostics.clone()), - newline_indices: newline_indices.clone(), - intern_table: intern_table, -}) -} + let modules = Rc::new({ + let mut __result = Vec::new(); + for p in parse_results.clone().iter().cloned() { + __result.push(p.module.clone().clone().unwrap()); + } + __result + }); + let source_indices = newline_indices.clone().iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, si: Rc| { + v2_rt::rc_map_insert(acc, si.file.clone(), si.clone()) + }, + ); + let graph = resolve_modules(&modules, &source_indices); + Rc::new(FrontendResult { + graph: Some(graph.clone()), + diagnostics: v2_rt::concat(parse_diagnostics, graph.diagnostics.clone()), + newline_indices: newline_indices.clone(), + intern_table: intern_table, + }) + } } -} + } } pub fn resolve_sources(sources: Rc>>) -> Rc { { let frontend = front_end_sources(sources); -Rc::new(CompileResult { - files: Rc::new(vec![]), - diagnostics: frontend.diagnostics.clone(), -}) -} + Rc::new(CompileResult { + files: Rc::new(vec![]), + diagnostics: frontend.diagnostics.clone(), + }) + } } -pub fn compile_sources(sources: Rc>>, target: RenderTarget) -> Rc { +pub fn compile_sources( + sources: Rc>>, + target: RenderTarget, +) -> Rc { { let frontend = front_end_sources(sources); -let newline_indices = frontend.newline_indices.clone(); -match frontend.graph.clone() { - None => Rc::new(PipelineResult { - files: Rc::new(vec![]), - diagnostics: frontend.diagnostics.clone(), - complexity: empty_complexity_report(), - ownership: Rc::new(vec![]), - artifact_plan: empty_artifact_plan(), - newline_indices: newline_indices.clone(), -}), - Some(graph) => { - let graph_diags = graph.diagnostics.clone(); -let resolve_errors = Rc::new({ let mut __result = Vec::new(); for d in graph_diags.iter().cloned() { if is_error_diagnostic(d.diagnostic.clone()) { __result.push(d); } } __result }); -if ((resolve_errors.len() as i64) > 0) { - return Rc::new(PipelineResult { - files: Rc::new(vec![]), - diagnostics: frontend.diagnostics.clone(), - complexity: empty_complexity_report(), - ownership: Rc::new(vec![]), - artifact_plan: empty_artifact_plan(), - newline_indices: newline_indices.clone(), -}) - } -let source_indices = newline_indices.clone().iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, index: Rc| v2_rt::rc_map_insert(acc, index.file.clone(), index.clone())); -let norm = normalize_graph(&graph, source_indices.clone()); -let norm_diags = norm.diagnostics.clone(); -let norm_errors = Rc::new({ let mut __result = Vec::new(); for d in norm_diags.clone().iter().cloned() { if is_error_diagnostic(d.diagnostic.clone()) { __result.push(d); } } __result }); -if ((norm_errors.len() as i64) > 0) { - return Rc::new(PipelineResult { - files: Rc::new(vec![]), - diagnostics: v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), - complexity: empty_complexity_report(), - ownership: Rc::new(vec![]), - artifact_plan: empty_artifact_plan(), - newline_indices: newline_indices.clone(), -}) - } -let typed = reconcile(norm.graph.clone(), source_indices.clone(), frontend.intern_table.clone()); -let typed_diags = typed.diagnostics.clone(); -let func_entries = extract_func_entries(typed.clone()); -let recursion_ctx = build_recursion_context(typed.clone()); -let complexity = build_complexity_report(&func_entries, recursion_ctx, source_indices.clone()); -let complexity_diags = complexity_diagnostics(complexity.clone()); -let all_diags = v2_rt::concat(typed_diags.clone(), complexity_diags); -let type_errors = Rc::new({ let mut __result = Vec::new(); for d in typed_diags.clone().iter().cloned() { if is_error_diagnostic(d.diagnostic.clone()) { __result.push(d); } } __result }); -if ((type_errors.len() as i64) > 0) { - return Rc::new(PipelineResult { - files: Rc::new(vec![]), - diagnostics: v2_rt::concat(v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), all_diags.clone()), - complexity: complexity.clone(), - ownership: Rc::new(vec![]), - artifact_plan: empty_artifact_plan(), - newline_indices: newline_indices.clone(), -}) + let newline_indices = frontend.newline_indices.clone(); + match frontend.graph.clone() { + None => Rc::new(PipelineResult { + files: Rc::new(vec![]), + diagnostics: frontend.diagnostics.clone(), + complexity: empty_complexity_report(), + ownership: Rc::new(vec![]), + artifact_plan: empty_artifact_plan(), + newline_indices: newline_indices.clone(), + }), + Some(graph) => { + let graph_diags = graph.diagnostics.clone(); + let resolve_errors = Rc::new({ + let mut __result = Vec::new(); + for d in graph_diags.iter().cloned() { + if is_error_diagnostic(d.diagnostic.clone()) { + __result.push(d); + } + } + __result + }); + if ((resolve_errors.len() as i64) > 0) { + return Rc::new(PipelineResult { + files: Rc::new(vec![]), + diagnostics: frontend.diagnostics.clone(), + complexity: empty_complexity_report(), + ownership: Rc::new(vec![]), + artifact_plan: empty_artifact_plan(), + newline_indices: newline_indices.clone(), + }); + } + let source_indices = newline_indices.clone().iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, index: Rc| { + v2_rt::rc_map_insert(acc, index.file.clone(), index.clone()) + }, + ); + let norm = normalize_graph(&graph, source_indices.clone()); + let norm_diags = norm.diagnostics.clone(); + let norm_errors = Rc::new({ + let mut __result = Vec::new(); + for d in norm_diags.clone().iter().cloned() { + if is_error_diagnostic(d.diagnostic.clone()) { + __result.push(d); + } + } + __result + }); + if ((norm_errors.len() as i64) > 0) { + return Rc::new(PipelineResult { + files: Rc::new(vec![]), + diagnostics: v2_rt::concat( + frontend.diagnostics.clone(), + norm_diags.clone(), + ), + complexity: empty_complexity_report(), + ownership: Rc::new(vec![]), + artifact_plan: empty_artifact_plan(), + newline_indices: newline_indices.clone(), + }); + } + let typed = reconcile( + norm.graph.clone(), + source_indices.clone(), + frontend.intern_table.clone(), + ); + let typed_diags = typed.diagnostics.clone(); + let func_entries = extract_func_entries(typed.clone()); + let recursion_ctx = build_recursion_context(typed.clone()); + let complexity = + build_complexity_report(&func_entries, recursion_ctx, source_indices.clone()); + let complexity_diags = complexity_diagnostics(complexity.clone()); + let all_diags = v2_rt::concat(typed_diags.clone(), complexity_diags); + let type_errors = Rc::new({ + let mut __result = Vec::new(); + for d in typed_diags.clone().iter().cloned() { + if is_error_diagnostic(d.diagnostic.clone()) { + __result.push(d); + } + } + __result + }); + if ((type_errors.len() as i64) > 0) { + return Rc::new(PipelineResult { + files: Rc::new(vec![]), + diagnostics: v2_rt::concat( + v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), + all_diags.clone(), + ), + complexity: complexity.clone(), + ownership: Rc::new(vec![]), + artifact_plan: empty_artifact_plan(), + newline_indices: newline_indices.clone(), + }); + } + let ownership = extract_ownership_proofs(typed.clone()); + let ownership_diags = ownership_diagnostics(ownership.clone()); + let ownership_errors = Rc::new({ + let mut __result = Vec::new(); + for d in ownership_diags.clone().iter().cloned() { + if is_error_diagnostic(d.diagnostic.clone()) { + __result.push(d); + } + } + __result + }); + if ((ownership_errors.len() as i64) > 0) { + return Rc::new(PipelineResult { + files: Rc::new(vec![]), + diagnostics: v2_rt::concat( + v2_rt::concat( + v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), + all_diags.clone(), + ), + ownership_diags.clone(), + ), + complexity: complexity.clone(), + ownership: ownership.clone(), + artifact_plan: empty_artifact_plan(), + newline_indices: newline_indices.clone(), + }); + } + let artifact_plan = default_artifact_plan( + Rc::new({ + let mut __result = Vec::new(); + for m in typed.modules.clone().iter().cloned() { + __result + .push(authored_name_at(source_indices.clone(), &m.module.clone())); + } + __result + }), + target, + ); + let emit_result = emit_from_artifact_plan(typed.clone(), &artifact_plan); + let emit_files = emit_result.files.clone(); + let emit_diags = emit_result.diagnostics.clone(); + let emit_errors = Rc::new({ + let mut __result = Vec::new(); + for d in emit_diags.clone().iter().cloned() { + if is_error_diagnostic(d.diagnostic.clone()) { + __result.push(d); + } + } + __result + }); + let final_files = if ((emit_errors.len() as i64) > 0) { + Rc::new(vec![]) + } else { + emit_files + }; + Rc::new(PipelineResult { + files: final_files, + diagnostics: v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), + all_diags.clone(), + ), + ownership_diags.clone(), + ), + emit_diags.clone(), + ), + complexity: complexity.clone(), + ownership: ownership.clone(), + artifact_plan: artifact_plan.clone(), + newline_indices: newline_indices.clone(), + }) } -let ownership = extract_ownership_proofs(typed.clone()); -let ownership_diags = ownership_diagnostics(ownership.clone()); -let ownership_errors = Rc::new({ let mut __result = Vec::new(); for d in ownership_diags.clone().iter().cloned() { if is_error_diagnostic(d.diagnostic.clone()) { __result.push(d); } } __result }); -if ((ownership_errors.len() as i64) > 0) { - return Rc::new(PipelineResult { - files: Rc::new(vec![]), - diagnostics: v2_rt::concat(v2_rt::concat(v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), all_diags.clone()), ownership_diags.clone()), - complexity: complexity.clone(), - ownership: ownership.clone(), - artifact_plan: empty_artifact_plan(), - newline_indices: newline_indices.clone(), -}) - } -let artifact_plan = default_artifact_plan(Rc::new({ let mut __result = Vec::new(); for m in typed.modules.clone().iter().cloned() { __result.push(authored_name_at(source_indices.clone(), &m.module.clone())); } __result }), target); -let emit_result = emit_from_artifact_plan(typed.clone(), &artifact_plan); -let emit_files = emit_result.files.clone(); -let emit_diags = emit_result.diagnostics.clone(); -let emit_errors = Rc::new({ let mut __result = Vec::new(); for d in emit_diags.clone().iter().cloned() { if is_error_diagnostic(d.diagnostic.clone()) { __result.push(d); } } __result }); -let final_files = if ((emit_errors.len() as i64) > 0) { - Rc::new(vec![]) - } else { - emit_files - }; -Rc::new(PipelineResult { - files: final_files, - diagnostics: v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), all_diags.clone()), ownership_diags.clone()), emit_diags.clone()), - complexity: complexity.clone(), - ownership: ownership.clone(), - artifact_plan: artifact_plan.clone(), - newline_indices: newline_indices.clone(), -}) -}, -} -} + } + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -738,83 +2121,143 @@ pub struct ResolvedPipelineResult { pub fn compile_to_resolved(sources: Rc>>) -> Rc { { let frontend = front_end_sources(sources); -let newline_indices = frontend.newline_indices.clone(); -match frontend.graph.clone() { - None => Rc::new(ResolvedPipelineResult { - graph: None, - diagnostics: frontend.diagnostics.clone(), - source_indices: v2_rt::rc_empty_map::>(), - complexity: empty_complexity_report(), - ownership: Rc::new(vec![]), - newline_indices: newline_indices.clone(), -}), - Some(graph) => { - let graph_diags = graph.diagnostics.clone(); -let resolve_errors = Rc::new({ let mut __result = Vec::new(); for d in graph_diags.iter().cloned() { if is_error_diagnostic(d.diagnostic.clone()) { __result.push(d); } } __result }); -if ((resolve_errors.len() as i64) > 0) { - return Rc::new(ResolvedPipelineResult { - graph: None, - diagnostics: frontend.diagnostics.clone(), - source_indices: v2_rt::rc_empty_map::>(), - complexity: empty_complexity_report(), - ownership: Rc::new(vec![]), - newline_indices: newline_indices.clone(), -}) - } -let source_indices = newline_indices.clone().iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, index: Rc| v2_rt::rc_map_insert(acc, index.file.clone(), index.clone())); -let norm = normalize_graph(&graph, source_indices.clone()); -let norm_diags = norm.diagnostics.clone(); -let norm_errors = Rc::new({ let mut __result = Vec::new(); for d in norm_diags.clone().iter().cloned() { if is_error_diagnostic(d.diagnostic.clone()) { __result.push(d); } } __result }); -if ((norm_errors.len() as i64) > 0) { - return Rc::new(ResolvedPipelineResult { - graph: None, - diagnostics: v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), - source_indices: source_indices.clone(), - complexity: empty_complexity_report(), - ownership: Rc::new(vec![]), - newline_indices: newline_indices.clone(), -}) - } -let typed = reconcile(norm.graph.clone(), source_indices.clone(), frontend.intern_table.clone()); -let typed_diags = typed.diagnostics.clone(); -let func_entries = extract_func_entries(typed.clone()); -let recursion_ctx = build_recursion_context(typed.clone()); -let complexity = build_complexity_report(&func_entries, recursion_ctx, source_indices.clone()); -let complexity_diags = complexity_diagnostics(complexity.clone()); -let all_diags = v2_rt::concat(typed_diags.clone(), complexity_diags); -let type_errors = Rc::new({ let mut __result = Vec::new(); for d in typed_diags.clone().iter().cloned() { if is_error_diagnostic(d.diagnostic.clone()) { __result.push(d); } } __result }); -if ((type_errors.len() as i64) > 0) { - return Rc::new(ResolvedPipelineResult { - graph: None, - diagnostics: v2_rt::concat(v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), all_diags.clone()), - source_indices: source_indices.clone(), - complexity: complexity.clone(), - ownership: Rc::new(vec![]), - newline_indices: newline_indices.clone(), -}) + let newline_indices = frontend.newline_indices.clone(); + match frontend.graph.clone() { + None => Rc::new(ResolvedPipelineResult { + graph: None, + diagnostics: frontend.diagnostics.clone(), + source_indices: v2_rt::rc_empty_map::>(), + complexity: empty_complexity_report(), + ownership: Rc::new(vec![]), + newline_indices: newline_indices.clone(), + }), + Some(graph) => { + let graph_diags = graph.diagnostics.clone(); + let resolve_errors = Rc::new({ + let mut __result = Vec::new(); + for d in graph_diags.iter().cloned() { + if is_error_diagnostic(d.diagnostic.clone()) { + __result.push(d); + } + } + __result + }); + if ((resolve_errors.len() as i64) > 0) { + return Rc::new(ResolvedPipelineResult { + graph: None, + diagnostics: frontend.diagnostics.clone(), + source_indices: v2_rt::rc_empty_map::>(), + complexity: empty_complexity_report(), + ownership: Rc::new(vec![]), + newline_indices: newline_indices.clone(), + }); + } + let source_indices = newline_indices.clone().iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, index: Rc| { + v2_rt::rc_map_insert(acc, index.file.clone(), index.clone()) + }, + ); + let norm = normalize_graph(&graph, source_indices.clone()); + let norm_diags = norm.diagnostics.clone(); + let norm_errors = Rc::new({ + let mut __result = Vec::new(); + for d in norm_diags.clone().iter().cloned() { + if is_error_diagnostic(d.diagnostic.clone()) { + __result.push(d); + } + } + __result + }); + if ((norm_errors.len() as i64) > 0) { + return Rc::new(ResolvedPipelineResult { + graph: None, + diagnostics: v2_rt::concat( + frontend.diagnostics.clone(), + norm_diags.clone(), + ), + source_indices: source_indices.clone(), + complexity: empty_complexity_report(), + ownership: Rc::new(vec![]), + newline_indices: newline_indices.clone(), + }); + } + let typed = reconcile( + norm.graph.clone(), + source_indices.clone(), + frontend.intern_table.clone(), + ); + let typed_diags = typed.diagnostics.clone(); + let func_entries = extract_func_entries(typed.clone()); + let recursion_ctx = build_recursion_context(typed.clone()); + let complexity = + build_complexity_report(&func_entries, recursion_ctx, source_indices.clone()); + let complexity_diags = complexity_diagnostics(complexity.clone()); + let all_diags = v2_rt::concat(typed_diags.clone(), complexity_diags); + let type_errors = Rc::new({ + let mut __result = Vec::new(); + for d in typed_diags.clone().iter().cloned() { + if is_error_diagnostic(d.diagnostic.clone()) { + __result.push(d); + } + } + __result + }); + if ((type_errors.len() as i64) > 0) { + return Rc::new(ResolvedPipelineResult { + graph: None, + diagnostics: v2_rt::concat( + v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), + all_diags.clone(), + ), + source_indices: source_indices.clone(), + complexity: complexity.clone(), + ownership: Rc::new(vec![]), + newline_indices: newline_indices.clone(), + }); + } + let ownership = extract_ownership_proofs(typed.clone()); + let ownership_diags = ownership_diagnostics(ownership.clone()); + let ownership_errors = Rc::new({ + let mut __result = Vec::new(); + for d in ownership_diags.clone().iter().cloned() { + if is_error_diagnostic(d.diagnostic.clone()) { + __result.push(d); + } + } + __result + }); + if ((ownership_errors.len() as i64) > 0) { + return Rc::new(ResolvedPipelineResult { + graph: None, + diagnostics: v2_rt::concat( + v2_rt::concat( + v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), + all_diags.clone(), + ), + ownership_diags.clone(), + ), + source_indices: source_indices.clone(), + complexity: complexity.clone(), + ownership: ownership.clone(), + newline_indices: newline_indices.clone(), + }); + } + Rc::new(ResolvedPipelineResult { + graph: Some(typed.clone()), + diagnostics: v2_rt::concat( + v2_rt::concat( + v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), + all_diags.clone(), + ), + ownership_diags.clone(), + ), + source_indices: source_indices.clone(), + complexity: complexity.clone(), + ownership: ownership.clone(), + newline_indices: newline_indices.clone(), + }) } -let ownership = extract_ownership_proofs(typed.clone()); -let ownership_diags = ownership_diagnostics(ownership.clone()); -let ownership_errors = Rc::new({ let mut __result = Vec::new(); for d in ownership_diags.clone().iter().cloned() { if is_error_diagnostic(d.diagnostic.clone()) { __result.push(d); } } __result }); -if ((ownership_errors.len() as i64) > 0) { - return Rc::new(ResolvedPipelineResult { - graph: None, - diagnostics: v2_rt::concat(v2_rt::concat(v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), all_diags.clone()), ownership_diags.clone()), - source_indices: source_indices.clone(), - complexity: complexity.clone(), - ownership: ownership.clone(), - newline_indices: newline_indices.clone(), -}) - } -Rc::new(ResolvedPipelineResult { - graph: Some(typed.clone()), - diagnostics: v2_rt::concat(v2_rt::concat(v2_rt::concat(frontend.diagnostics.clone(), norm_diags.clone()), all_diags.clone()), ownership_diags.clone()), - source_indices: source_indices.clone(), - complexity: complexity.clone(), - ownership: ownership.clone(), - newline_indices: newline_indices.clone(), -}) -}, -} -} + } + } } diff --git a/src/v2/stage0/src/v2_compiler_compiler_tests_rust.rs b/src/v2/stage0/src/v2_compiler_compiler_tests_rust.rs index 664d4b467fa..1f2d41a19e1 100644 --- a/src/v2/stage0/src/v2_compiler_compiler_tests_rust.rs +++ b/src/v2/stage0/src/v2_compiler_compiler_tests_rust.rs @@ -1,18 +1,31 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.compiler_tests_rust -use std::collections::HashMap; -use std::rc::Rc; +pub use crate::v2_compiler_artifact::RenderTarget; +use crate::v2_compiler_artifact::RenderTarget::{Go, Python, Rust}; +use crate::v2_compiler_coercion::CoercionAssertion::{ + CheckpointAssertion, ContainerAssertion, CopyAssertion, TemplateAssertion, +}; +pub use crate::v2_compiler_coercion::{ + extract_coercion_tests, CoercionAssertion, CoercionTestEntry, +}; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; -pub use crate::v2_compiler_artifact::{RenderTarget}; -use crate::v2_compiler_artifact::RenderTarget::{Rust, Python, Go}; -pub use crate::v2_compiler_coercion::{extract_coercion_tests, CoercionTestEntry, CoercionAssertion}; -use crate::v2_compiler_coercion::CoercionAssertion::{CheckpointAssertion, ContainerAssertion, CopyAssertion, TemplateAssertion}; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn ct_module_header() -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat("#[cfg(test)]\n".to_string(), "mod compiler_tests {\n".to_string()), " use std::collections::HashMap;\n".to_string()), " use crate::v2_compiler_tokenize::tokenize;\n\n".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "#[cfg(test)]\n".to_string(), + "mod compiler_tests {\n".to_string(), + ), + " use std::collections::HashMap;\n".to_string(), + ), + " use crate::v2_compiler_tokenize::tokenize;\n\n".to_string(), + ) } pub fn ct_workspace_helpers() -> String { @@ -74,67 +87,189 @@ pub fn ct_type_size_test() -> String { pub fn ct_coercion_tests() -> String { { let entries = extract_coercion_tests(); -let test_fns = Rc::new({ let mut __result = Vec::new(); for e in entries.iter().cloned() { __result.push(render_coercion_test_rust(&e)); } __result }); -v2_rt::concat(v2_rt::concat(v2_rt::concat(" // =========================================================================\n".to_string(), " // Coercion registry tests (auto-generated from data declarations)\n".to_string()), " // =========================================================================\n\n".to_string()), test_fns.join(&"\n".to_string())) -} + let test_fns = Rc::new({ + let mut __result = Vec::new(); + for e in entries.iter().cloned() { + __result.push(render_coercion_test_rust(&e)); + } + __result + }); + v2_rt::concat(v2_rt::concat(v2_rt::concat(" // =========================================================================\n".to_string(), " // Coercion registry tests (auto-generated from data declarations)\n".to_string()), " // =========================================================================\n\n".to_string()), test_fns.join(&"\n".to_string())) + } } pub fn render_target_rust_enum(target: RenderTarget) -> String { match target { - RenderTarget::Rust => "RenderTarget::Rust".to_string(), - RenderTarget::Python => "RenderTarget::Python".to_string(), - RenderTarget::Go => "RenderTarget::Go".to_string(), - RenderTarget::Dag => "RenderTarget::Dag".to_string(), -} + RenderTarget::Rust => "RenderTarget::Rust".to_string(), + RenderTarget::Python => "RenderTarget::Python".to_string(), + RenderTarget::Go => "RenderTarget::Go".to_string(), + RenderTarget::Dag => "RenderTarget::Dag".to_string(), + } } pub fn render_coercion_test_rust(entry: &Rc) -> String { { - let assertions = Rc::new({ let mut __result = Vec::new(); for a in entry.assertions.clone().iter().cloned() { __result.push(render_coercion_assertion_rust(a.clone())); } __result }); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" #[test]\n".to_string(), " fn ".to_string()), entry.test_name.clone()), "() {\n".to_string()), " use crate::v2_compiler_coercion::*;\n".to_string()), assertions.join(&"".to_string())), " }\n\n".to_string()) -} + let assertions = Rc::new({ + let mut __result = Vec::new(); + for a in entry.assertions.clone().iter().cloned() { + __result.push(render_coercion_assertion_rust(a.clone())); + } + __result + }); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(" #[test]\n".to_string(), " fn ".to_string()), + entry.test_name.clone(), + ), + "() {\n".to_string(), + ), + " use crate::v2_compiler_coercion::*;\n".to_string(), + ), + assertions.join(&"".to_string()), + ), + " }\n\n".to_string(), + ) + } } pub fn first_or_empty(items: Rc>) -> String { match items.first().cloned() { - Some(v) => v.clone(), - None => "".to_string(), -} + Some(v) => v.clone(), + None => "".to_string(), + } } pub fn second_or_empty(items: Rc>) -> String { match items.get(1 as usize).cloned() { - Some(v) => v.clone(), - None => "".to_string(), -} + Some(v) => v.clone(), + None => "".to_string(), + } } pub fn render_coercion_assertion_rust(a: Rc) -> String { match (*a).clone() { - CoercionAssertion::CheckpointAssertion { target: t, dag_name: name, expected_type: expected, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" assert_eq!(coerce_primitive_type(".to_string(), render_target_rust_enum(t.clone())), ", \"".to_string()), name.clone()), "\".into()), \"".to_string()), expected.clone()), "\");\n".to_string()), - CoercionAssertion::ContainerAssertion { target: t, container_name: name, expected_template: expected, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" assert_eq!(coerce_container_template(".to_string(), render_target_rust_enum(t.clone())), ", \"".to_string()), name.clone()), "\".into()), Some(\"".to_string()), expected.clone()), "\".to_string()));\n".to_string()), - CoercionAssertion::CopyAssertion { target: t, dag_name: name, expected_copy: expected, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" assert_eq!(is_copy(".to_string(), render_target_rust_enum(t.clone())), ", \"".to_string()), name.clone()), "\".into()), Some(".to_string()), if expected.clone() { - "true".to_string() - } else { - "false".to_string() - }), "));\n".to_string()), - CoercionAssertion::TemplateAssertion { template: tmpl, args: arg_list, expected, .. } => if ((arg_list.clone().len() as i64) == 1) { - { - let arg0 = first_or_empty(arg_list.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" assert_eq!(apply_inhabitant_template1(\"".to_string(), tmpl.clone()), "\".into(), \"".to_string()), arg0), "\".into()), \"".to_string()), expected.clone()), "\");\n".to_string()) -} - } else { - if ((arg_list.clone().len() as i64) == 2) { - { - let arg0 = first_or_empty(arg_list.clone()); -let arg1 = second_or_empty(arg_list.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" assert_eq!(apply_inhabitant_template2(\"".to_string(), tmpl.clone()), "\".into(), \"".to_string()), arg0), "\".into(), \"".to_string()), arg1), "\".into()), \"".to_string()), expected.clone()), "\");\n".to_string()) -} - } else { - "".to_string() + CoercionAssertion::CheckpointAssertion { + target: t, + dag_name: name, + expected_type: expected, + .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + " assert_eq!(coerce_primitive_type(".to_string(), + render_target_rust_enum(t.clone()), + ), + ", \"".to_string(), + ), + name.clone(), + ), + "\".into()), \"".to_string(), + ), + expected.clone(), + ), + "\");\n".to_string(), + ), + CoercionAssertion::ContainerAssertion { + target: t, + container_name: name, + expected_template: expected, + .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + " assert_eq!(coerce_container_template(".to_string(), + render_target_rust_enum(t.clone()), + ), + ", \"".to_string(), + ), + name.clone(), + ), + "\".into()), Some(\"".to_string(), + ), + expected.clone(), + ), + "\".to_string()));\n".to_string(), + ), + CoercionAssertion::CopyAssertion { + target: t, + dag_name: name, + expected_copy: expected, + .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + " assert_eq!(is_copy(".to_string(), + render_target_rust_enum(t.clone()), + ), + ", \"".to_string(), + ), + name.clone(), + ), + "\".into()), Some(".to_string(), + ), + if expected.clone() { + "true".to_string() + } else { + "false".to_string() + }, + ), + "));\n".to_string(), + ), + CoercionAssertion::TemplateAssertion { + template: tmpl, + args: arg_list, + expected, + .. + } => { + if ((arg_list.clone().len() as i64) == 1) { + { + let arg0 = first_or_empty(arg_list.clone()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + " assert_eq!(apply_inhabitant_template1(\"" + .to_string(), + tmpl.clone(), + ), + "\".into(), \"".to_string(), + ), + arg0, + ), + "\".into()), \"".to_string(), + ), + expected.clone(), + ), + "\");\n".to_string(), + ) + } + } else { + if ((arg_list.clone().len() as i64) == 2) { + { + let arg0 = first_or_empty(arg_list.clone()); + let arg1 = second_or_empty(arg_list.clone()); + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" assert_eq!(apply_inhabitant_template2(\"".to_string(), tmpl.clone()), "\".into(), \"".to_string()), arg0), "\".into(), \"".to_string()), arg1), "\".into()), \"".to_string()), expected.clone()), "\");\n".to_string()) + } + } else { + "".to_string() + } + } } - }, -} + } } pub fn ct_profile_helpers() -> String { diff --git a/src/v2/stage0/src/v2_compiler_complexity.rs b/src/v2/stage0/src/v2_compiler_complexity.rs index 5f2db179e95..75bb4c413b2 100644 --- a/src/v2/stage0/src/v2_compiler_complexity.rs +++ b/src/v2/stage0/src/v2_compiler_complexity.rs @@ -1,45 +1,93 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.complexity -use std::collections::HashMap; -use std::rc::Rc; -use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::std_types::{SourceSpan}; -pub use crate::v2_compiler_emit::{to_string}; -pub use crate::v2_compiler_parse::{ParserResultWitness, parser_progress_flag_var, parser_passthrough_state_expr, parser_result_witness, ParserCallIdentity}; -use crate::v2_compiler_parse::ParserResultWitness::{ParserWitnessAdvance, ParserWitnessExpect, ParserWitnessEat, ParserWitnessCall, ParserWitnessOpaque}; -use crate::v2_compiler_parse::ParserCallIdentity::{ParserCallHelper, ParserCallFunction}; -pub use crate::std_termination::{DescentEvidence, RankingDimension, DescentSource, TerminationProof, ProofEdge, merge_evidence, join_evidence, evidence_rank, optional_evidence_meet, map_evidence_merge_at, PositiveDescentAmount}; -use crate::std_termination::DescentEvidence::{Strict, NonIncreasing, DescentUnknown}; -use crate::std_termination::RankingDimension::{TreeSize, ListLength, ArithmeticValue, TokenPosition, SetCardinality}; -use crate::std_termination::DescentSource::{ChildAccessor, ListShrink, ArithmeticSubtractDescent, ArithmeticDivideDescent, ParserAdvance, SetRemoval, FoldIteration}; -use crate::std_termination::PositiveDescentAmount::{OneStep}; -pub use crate::std_computation::{CallPattern, LoweringTarget, lower_call_pattern, size_bound_param, IterationDimension, type_iteration_dimension}; -use crate::std_computation::CallPattern::{ChildAccessorCall, CollectionShrinkCall, ArithmeticSubtractCall, ParserAdvanceCall, WorklistDrainCall, FoldBodyCall, SameArgumentCall}; -use crate::std_computation::IterationDimension::{TreeDescent, CollectionFold, ArithmeticRepeat}; -pub use crate::std_induction::{SubValueRelation, ShrinkFactor, CostBound, AtomicCost, PolynomialExponent, sub_value_to_evidence, sub_value_to_call_pattern, sub_value_to_lowering_target, catamorphism_bound, derive_bound}; -use crate::std_induction::SubValueRelation::{StrictSubValue, IteratedSubValue, ArithmeticDescent, PreservedValue, SubValueUnknown}; -use crate::std_induction::ShrinkFactor::{UnitShrink, ConstantShrink, ProportionalShrink}; -use crate::std_induction::CostBound::{ConstantBound, AtomicBound, ForeverBound, ErrorBound}; -use crate::std_induction::AtomicCost::{PolyCost}; -use crate::std_induction::PolynomialExponent::*; -pub use crate::v2_std_core::{Node, NewlineIndex, ExprData, BinOp, MatchPattern, field_init_node_name_at, field_init_node_value, arg_name_at, arg_value, arm_body, arm_guard, arm_pattern, MethodSemantics, binop_left, binop_right, field_binding_pattern, foreach_collection, foreach_body, if_condition, if_then_branch, if_else_branch, let_value, let_body, let_binding_name_at, match_scrutinee, match_arm_nodes, method_receiver, method_arg_nodes, param_node_name_at, param_node_type_expr, return_value, expr_call_func_at, expr_var_name_at, field_access_base, field_access_field_at, LiteralValue, is_child_accessor_in_model, lambda_param_names_at, lambda_body, is_children_list_field, is_sub_value_field, is_tree_size_preserving, is_tree_size_reducing, authored_name_at}; -use crate::v2_std_core::ExprData::{ExprLiteral, ExprError, ExprVar, ExprFieldAccess, ExprCall, ExprMethodCall, ExprBinOp, ExprUnaryOp, ExprMatch, ExprIf, ExprLet, ExprRecordLit, ExprBlock, ExprForEach, ExprReturn, ExprLambda}; -use crate::v2_std_core::BinOp::{Sub, Div}; -use crate::v2_std_core::MatchPattern::{Bind, VariantPattern}; -use crate::v2_std_core::MethodSemantics::{AlgebraMethodSemantics, PlainMethodSemantics, ServiceMethodSemantics}; -use crate::v2_std_core::LiteralValue::{LitNull, LitInt}; -pub use crate::v2_compiler_infer_types::{resolved_type, node_is_collection}; -pub use crate::std_algebra::{CollectionSizeEffect, CostShape}; -use crate::std_algebra::CollectionSizeEffect::{ShrinkEffect, ProjectionEffect, IdentityEffect}; -use crate::std_algebra::CostShape::{ShapeConstant, ShapeLinearScan, ShapeIterateBody, ShapeSortBody}; -pub use crate::std_graph::{CallGraph, GraphEdge, DfsFinishAcc, SccComponentAcc, SccCycleAcc, seed_adjacency_map, build_call_graph_from_proof_edges, forward_adjacency, reverse_adjacency, dfs_finish_order, dfs_collect_component, graph_has_multi_node_scc, is_lexicographic_descent, is_valid_proof}; -use self::SizeExpr::*; -use self::CostExpr::*; use self::Certainty::*; +use self::CostExpr::*; use self::ParserResultSource::*; +use self::SizeExpr::*; +use crate::std_algebra::CollectionSizeEffect::{IdentityEffect, ProjectionEffect, ShrinkEffect}; +use crate::std_algebra::CostShape::{ + ShapeConstant, ShapeIterateBody, ShapeLinearScan, ShapeSortBody, +}; +pub use crate::std_algebra::{CollectionSizeEffect, CostShape}; +use crate::std_computation::CallPattern::{ + ArithmeticSubtractCall, ChildAccessorCall, CollectionShrinkCall, FoldBodyCall, + ParserAdvanceCall, SameArgumentCall, WorklistDrainCall, +}; +use crate::std_computation::IterationDimension::{ArithmeticRepeat, CollectionFold, TreeDescent}; +pub use crate::std_computation::{ + lower_call_pattern, size_bound_param, type_iteration_dimension, CallPattern, + IterationDimension, LoweringTarget, +}; +pub use crate::std_graph::{ + build_call_graph_from_proof_edges, dfs_collect_component, dfs_finish_order, forward_adjacency, + graph_has_multi_node_scc, is_lexicographic_descent, is_valid_proof, reverse_adjacency, + seed_adjacency_map, CallGraph, DfsFinishAcc, GraphEdge, SccComponentAcc, SccCycleAcc, +}; +use crate::std_induction::AtomicCost::PolyCost; +use crate::std_induction::CostBound::{AtomicBound, ConstantBound, ErrorBound, ForeverBound}; +use crate::std_induction::PolynomialExponent::*; +use crate::std_induction::ShrinkFactor::{ConstantShrink, ProportionalShrink, UnitShrink}; +use crate::std_induction::SubValueRelation::{ + ArithmeticDescent, IteratedSubValue, PreservedValue, StrictSubValue, SubValueUnknown, +}; +pub use crate::std_induction::{ + catamorphism_bound, derive_bound, sub_value_to_call_pattern, sub_value_to_evidence, + sub_value_to_lowering_target, AtomicCost, CostBound, PolynomialExponent, ShrinkFactor, + SubValueRelation, +}; +use crate::std_termination::DescentEvidence::{DescentUnknown, NonIncreasing, Strict}; +use crate::std_termination::DescentSource::{ + ArithmeticDivideDescent, ArithmeticSubtractDescent, ChildAccessor, FoldIteration, ListShrink, + ParserAdvance, SetRemoval, +}; +use crate::std_termination::PositiveDescentAmount::OneStep; +use crate::std_termination::RankingDimension::{ + ArithmeticValue, ListLength, SetCardinality, TokenPosition, TreeSize, +}; +pub use crate::std_termination::{ + evidence_rank, join_evidence, map_evidence_merge_at, merge_evidence, optional_evidence_meet, + DescentEvidence, DescentSource, PositiveDescentAmount, ProofEdge, RankingDimension, + TerminationProof, +}; +pub use crate::std_types::SourceSpan; +pub use crate::v2_compiler_emit::to_string; +pub use crate::v2_compiler_infer_types::{node_is_collection, resolved_type}; +use crate::v2_compiler_parse::ParserCallIdentity::{ParserCallFunction, ParserCallHelper}; +use crate::v2_compiler_parse::ParserResultWitness::{ + ParserWitnessAdvance, ParserWitnessCall, ParserWitnessEat, ParserWitnessExpect, + ParserWitnessOpaque, +}; +pub use crate::v2_compiler_parse::{ + parser_passthrough_state_expr, parser_progress_flag_var, parser_result_witness, + ParserCallIdentity, ParserResultWitness, +}; +use crate::v2_rt; +use crate::v2_std_core::BinOp::{Div, Sub}; +use crate::v2_std_core::ExprData::{ + ExprBinOp, ExprBlock, ExprCall, ExprError, ExprFieldAccess, ExprForEach, ExprIf, ExprLambda, + ExprLet, ExprLiteral, ExprMatch, ExprMethodCall, ExprRecordLit, ExprReturn, ExprUnaryOp, + ExprVar, +}; +use crate::v2_std_core::LiteralValue::{LitInt, LitNull}; +use crate::v2_std_core::MatchPattern::{Bind, VariantPattern}; +use crate::v2_std_core::MethodSemantics::{ + AlgebraMethodSemantics, PlainMethodSemantics, ServiceMethodSemantics, +}; +pub use crate::v2_std_core::{ + arg_name_at, arg_value, arm_body, arm_guard, arm_pattern, authored_name_at, binop_left, + binop_right, expr_call_func_at, expr_var_name_at, field_access_base, field_access_field_at, + field_binding_pattern, field_init_node_name_at, field_init_node_value, foreach_body, + foreach_collection, if_condition, if_else_branch, if_then_branch, is_child_accessor_in_model, + is_children_list_field, is_sub_value_field, is_tree_size_preserving, is_tree_size_reducing, + lambda_body, lambda_param_names_at, let_binding_name_at, let_body, let_value, match_arm_nodes, + match_scrutinee, method_arg_nodes, method_receiver, param_node_name_at, param_node_type_expr, + return_value, BinOp, ExprData, LiteralValue, MatchPattern, MethodSemantics, NewlineIndex, Node, +}; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] @@ -120,31 +168,38 @@ pub struct CostInternTable { pub fn empty_intern_table() -> Rc { Rc::new(CostInternTable { - summaries: v2_rt::rc_empty_map::>(), -}) + summaries: v2_rt::rc_empty_map::>(), + }) } -pub fn cache_summary(table: Rc, func_name: String, summary: Rc) -> Rc { +pub fn cache_summary( + table: Rc, + func_name: String, + summary: Rc, +) -> Rc { Rc::new(CostInternTable { - summaries: v2_rt::rc_map_insert(table.summaries.clone(), func_name, summary), -}) + summaries: v2_rt::rc_map_insert(table.summaries.clone(), func_name, summary), + }) } -pub fn lookup_summary(table: Rc, func_name: String) -> Option> { +pub fn lookup_summary( + table: Rc, + func_name: String, +) -> Option> { v2_rt::map_get(&table.summaries.clone(), func_name) } pub fn evict_summary(table: Rc, func_name: String) -> Rc { - cache_summary(table, func_name, Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { - value: 0, -}), - span: Rc::new(CostExpr::CostConst { - value: 0, -}), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, -})) + cache_summary( + table, + func_name, + Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { value: 0 }), + span: Rc::new(CostExpr::CostConst { value: 0 }), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, + }), + ) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -156,13 +211,13 @@ pub struct CallEdge { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct SccInfo { pub members: Rc>, - pub member_set: Rc>, + pub member_set: Rc>, pub pattern: Rc, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct SccBuildAcc { - pub assigned: Rc>, + pub assigned: Rc>, pub index: Rc>>, } @@ -253,39 +308,56 @@ pub struct SccEdgeBlockAcc { pub fn is_algebra_iteration_method(method_semantics: Option>) -> bool { match method_semantics.as_deref().cloned() { - Some(MethodSemantics::AlgebraMethodSemantics { .. }) => true, - _ => false, -} + Some(MethodSemantics::AlgebraMethodSemantics { .. }) => true, + _ => false, + } } -pub fn method_size_effect(method_semantics: Option>) -> Option { +pub fn method_size_effect( + method_semantics: Option>, +) -> Option { match method_semantics.as_deref().cloned() { - Some(MethodSemantics::AlgebraMethodSemantics { size_effect: se, .. }) => se.clone(), - _ => None, -} + Some(MethodSemantics::AlgebraMethodSemantics { + size_effect: se, .. + }) => se.clone(), + _ => None, + } } -pub fn method_callback_element_position(method_semantics: Option>) -> Option { +pub fn method_callback_element_position( + method_semantics: Option>, +) -> Option { match method_semantics.as_deref().cloned() { - Some(MethodSemantics::AlgebraMethodSemantics { algebra_template: at, .. }) => match at.clone() { - Some(template) => template.callback_element_position.clone(), - None => None, -}, - _ => None, -} + Some(MethodSemantics::AlgebraMethodSemantics { + algebra_template: at, + .. + }) => match at.clone() { + Some(template) => template.callback_element_position.clone(), + None => None, + }, + _ => None, + } } -pub fn iteration_element_name(method_semantics: Option>, lambda: Rc, si: Rc>>) -> Option { +pub fn iteration_element_name( + method_semantics: Option>, + lambda: Rc, + si: Rc>>, +) -> Option { { let params = lambda_param_names_at(lambda, si); -match method_callback_element_position(method_semantics) { - Some(pos) => params.get(pos.clone() as usize).cloned(), - None => None, -} -} + match method_callback_element_position(method_semantics) { + Some(pos) => params.get(pos.clone() as usize).cloned(), + None => None, + } + } } -pub fn proof_has_non_descending_cycle(proof: Rc, members: Rc>, edges: Rc>>) -> bool { +pub fn proof_has_non_descending_cycle( + proof: Rc, + members: Rc>, + edges: Rc>>, +) -> bool { (is_valid_proof(proof, &edges) == false) } @@ -295,483 +367,1162 @@ pub fn set_has(m: Rc>, key: String) -> bool { pub fn strict_after_parser_witness(input: DescentEvidence) -> DescentEvidence { match input { - DescentEvidence::DescentUnknown => DescentEvidence::DescentUnknown, - _ => DescentEvidence::Strict, -} + DescentEvidence::DescentUnknown => DescentEvidence::DescentUnknown, + _ => DescentEvidence::Strict, + } } pub fn empty_parser_progress_env() -> Rc { Rc::new(ParserProgressEnv { - state_aliases: v2_rt::rc_empty_map::(), - result_sources: v2_rt::rc_empty_map::>(), -}) + state_aliases: v2_rt::rc_empty_map::(), + result_sources: v2_rt::rc_empty_map::>(), + }) } -pub fn parser_state_param(params: Rc>>, si: Rc>>) -> Option> { - Rc::new(params.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(None, |acc: _, pair: (i64, Rc)| if (acc.clone() != None) { - acc.clone() - } else { - { - let idx = pair.0.clone(); -let param = pair.1.clone(); -if (authored_name_at(si.clone(), ¶m_node_type_expr(¶m)).as_str() == "ParserState".to_string().as_str()) { - Some(Rc::new(ParserStateParam { - name: param_node_name_at(param.clone(), si.clone()), - index: idx.clone(), -})) - } else { - None +pub fn parser_state_param( + params: Rc>>, + si: Rc>>, +) -> Option> { + Rc::new( + params + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + .fold(None, |acc: _, pair: (i64, Rc)| { + if (acc.clone() != None) { + acc.clone() + } else { + { + let idx = pair.0.clone(); + let param = pair.1.clone(); + if (authored_name_at(si.clone(), ¶m_node_type_expr(¶m)).as_str() + == "ParserState".to_string().as_str()) + { + Some(Rc::new(ParserStateParam { + name: param_node_name_at(param.clone(), si.clone()), + index: idx.clone(), + })) + } else { + None + } } -} + } }) } -pub fn parser_state_base_var(expr: &Rc, si: Rc>>) -> Option { +pub fn parser_state_base_var( + expr: &Rc, + si: Rc>>, +) -> Option { match (*expr.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => match expr.children.clone().first().cloned() { - Some(base) => match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => Some(expr_var_name_at(base.clone(), si)), - _ => None, -}, - None => None, -}, - _ => None, -} + ExprData::ExprFieldAccess { .. } => match expr.children.clone().first().cloned() { + Some(base) => match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => Some(expr_var_name_at(base.clone(), si)), + _ => None, + }, + None => None, + }, + _ => None, + } } -pub fn parser_result_state_progress(source: Rc, parser_always_advancing: Rc>, consumed_true_set: Rc>, result_name: String) -> DescentEvidence { +pub fn parser_result_state_progress( + source: Rc, + parser_always_advancing: Rc>, + consumed_true_set: Rc>, + result_name: String, +) -> DescentEvidence { match (*source).clone() { - ParserResultSource::ParserResultAdvance { input, .. } => strict_after_parser_witness(input.clone()), - ParserResultSource::ParserResultExpect { input, .. } => strict_after_parser_witness(input.clone()), - ParserResultSource::ParserResultEat { input, .. } => if set_has(consumed_true_set, result_name) { - strict_after_parser_witness(input.clone()) - } else { - input.clone() - }, - ParserResultSource::ParserResultCall { input, callee, .. } => if (set_has(consumed_true_set, result_name) || set_has(parser_always_advancing, callee.clone())) { - strict_after_parser_witness(input.clone()) - } else { - input.clone() - }, - ParserResultSource::ParserResultDirectState { input: p, .. } => p.clone(), - ParserResultSource::ParserResultOpaque => DescentEvidence::DescentUnknown, -} -} - -pub fn parser_state_arg_expr(call_node: Rc, state_param: Rc, si: Rc>>) -> Option> { - Rc::new(call_node.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(None, |acc: _, pair: (i64, Rc)| if (acc.clone() != None) { - acc.clone() - } else { - { - let idx = pair.0.clone(); -let arg_node = pair.1.clone(); -let matches_state = if (arg_name_at(arg_node.clone(), si.clone()).as_deref() != Some("".to_string().as_str())) { - (arg_name_at(arg_node.clone(), si.clone()).as_deref() == Some(state_param.name.clone().as_str())) + ParserResultSource::ParserResultAdvance { input, .. } => { + strict_after_parser_witness(input.clone()) + } + ParserResultSource::ParserResultExpect { input, .. } => { + strict_after_parser_witness(input.clone()) + } + ParserResultSource::ParserResultEat { input, .. } => { + if set_has(consumed_true_set, result_name) { + strict_after_parser_witness(input.clone()) } else { - (idx.clone() == state_param.index.clone()) - }; -if matches_state.clone() { - Some(arg_value(&arg_node)) + input.clone() + } + } + ParserResultSource::ParserResultCall { input, callee, .. } => { + if (set_has(consumed_true_set, result_name) + || set_has(parser_always_advancing, callee.clone())) + { + strict_after_parser_witness(input.clone()) } else { - None + input.clone() } + } + ParserResultSource::ParserResultDirectState { input: p, .. } => p.clone(), + ParserResultSource::ParserResultOpaque => DescentEvidence::DescentUnknown, + } } + +pub fn parser_state_arg_expr( + call_node: Rc, + state_param: Rc, + si: Rc>>, +) -> Option> { + Rc::new( + call_node + .children + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + .fold(None, |acc: _, pair: (i64, Rc)| { + if (acc.clone() != None) { + acc.clone() + } else { + { + let idx = pair.0.clone(); + let arg_node = pair.1.clone(); + let matches_state = if (arg_name_at(arg_node.clone(), si.clone()).as_deref() + != Some("".to_string().as_str())) + { + (arg_name_at(arg_node.clone(), si.clone()).as_deref() + == Some(state_param.name.clone().as_str())) + } else { + (idx.clone() == state_param.index.clone()) + }; + if matches_state.clone() { + Some(arg_value(&arg_node)) + } else { + None + } + } + } }) } -pub fn parser_state_expr_progress(expr: &Rc, state_param: &Rc, env: &Rc, parser_always_advancing: &Rc>, consumed_true_set: &Rc>, si: &Rc>>) -> DescentEvidence { +pub fn parser_state_expr_progress( + expr: &Rc, + state_param: &Rc, + env: &Rc, + parser_always_advancing: &Rc>, + consumed_true_set: &Rc>, + si: &Rc>>, +) -> DescentEvidence { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let name = expr_var_name_at(expr.clone(), si.clone()); -if (name.clone().as_str() == state_param.name.clone().as_str()) { - DescentEvidence::NonIncreasing - } else { - match v2_rt::map_get(&env.state_aliases.clone(), name.clone()) { - Some(progress) => progress.clone(), - None => DescentEvidence::DescentUnknown, -} + ExprData::ExprVar { .. } => { + let name = expr_var_name_at(expr.clone(), si.clone()); + if (name.clone().as_str() == state_param.name.clone().as_str()) { + DescentEvidence::NonIncreasing + } else { + match v2_rt::map_get(&env.state_aliases.clone(), name.clone()) { + Some(progress) => progress.clone(), + None => DescentEvidence::DescentUnknown, + } + } } -}, - ExprData::ExprFieldAccess { .. } => if (field_access_field_at(expr.clone(), si.clone()).as_str() == "state".to_string().as_str()) { - match parser_state_base_var(&expr, si.clone()) { - Some(result_name) => match v2_rt::map_get(&env.result_sources.clone(), result_name.clone()) { - Some(source) => parser_result_state_progress(source.clone(), parser_always_advancing.clone(), consumed_true_set.clone(), result_name.clone()), - None => DescentEvidence::DescentUnknown, -}, - None => DescentEvidence::DescentUnknown, -} - } else { - DescentEvidence::DescentUnknown - }, - ExprData::ExprCall { .. } => match parser_passthrough_state_expr(&expr, &si) { - Some(state_expr) => parser_state_expr_progress(&state_expr, &state_param, &env, &parser_always_advancing, &consumed_true_set, &si), - None => DescentEvidence::DescentUnknown, -}, - ExprData::ExprIf => { - let cond = if_condition(expr.clone()); -let then_consumed = match parser_progress_flag_var(&cond, &si) { - Some(name) => v2_rt::rc_map_insert(consumed_true_set.clone(), name.clone(), true), - None => consumed_true_set.clone(), -}; -let then_progress = parser_state_expr_progress(&if_then_branch(expr.clone()), &state_param, &env, &parser_always_advancing, &then_consumed, &si); -let else_progress = match if_else_branch(expr.clone()) { - Some(eb) => parser_state_expr_progress(&eb, &state_param, &env, &parser_always_advancing, &consumed_true_set, &si), - None => DescentEvidence::DescentUnknown, -}; -merge_evidence(then_progress, else_progress) -}, - ExprData::ExprLet => { - let next_env = parser_env_with_binding(&let_binding_name_at(expr.clone(), si.clone()), &let_value(expr.clone()), &env, &state_param, &parser_always_advancing, &consumed_true_set, &si); -match let_body(expr.clone()) { - Some(body) => parser_state_expr_progress(&body, &state_param, &next_env, &parser_always_advancing, &consumed_true_set, &si), - None => DescentEvidence::DescentUnknown, -} -}, - ExprData::ExprMatch => { - let arm_progresses = Rc::new({ let mut __result = Vec::new(); for arm_node in match_arm_nodes(expr.clone()).iter().cloned() { __result.push(parser_state_expr_progress(&arm_body(&arm_node), &state_param, &env, &parser_always_advancing, &consumed_true_set, &si)); } __result }); -match arm_progresses.clone().first().cloned() { - Some(initial) => arm_progresses.clone().iter().cloned().fold(initial.clone(), |acc: DescentEvidence, p: DescentEvidence| merge_evidence(acc, p.clone())), - None => DescentEvidence::DescentUnknown, -} -}, - ExprData::ExprBlock => parser_block_state_progress(&expr.children.clone(), &state_param, env.clone(), &parser_always_advancing, &consumed_true_set, &si), - _ => DescentEvidence::DescentUnknown, -} + ExprData::ExprFieldAccess { .. } => { + if (field_access_field_at(expr.clone(), si.clone()).as_str() + == "state".to_string().as_str()) + { + match parser_state_base_var(&expr, si.clone()) { + Some(result_name) => { + match v2_rt::map_get(&env.result_sources.clone(), result_name.clone()) { + Some(source) => parser_result_state_progress( + source.clone(), + parser_always_advancing.clone(), + consumed_true_set.clone(), + result_name.clone(), + ), + None => DescentEvidence::DescentUnknown, + } + } + None => DescentEvidence::DescentUnknown, + } + } else { + DescentEvidence::DescentUnknown + } + } + ExprData::ExprCall { .. } => match parser_passthrough_state_expr(&expr, &si) { + Some(state_expr) => parser_state_expr_progress( + &state_expr, + &state_param, + &env, + &parser_always_advancing, + &consumed_true_set, + &si, + ), + None => DescentEvidence::DescentUnknown, + }, + ExprData::ExprIf => { + let cond = if_condition(expr.clone()); + let then_consumed = match parser_progress_flag_var(&cond, &si) { + Some(name) => { + v2_rt::rc_map_insert(consumed_true_set.clone(), name.clone(), true) + } + None => consumed_true_set.clone(), + }; + let then_progress = parser_state_expr_progress( + &if_then_branch(expr.clone()), + &state_param, + &env, + &parser_always_advancing, + &then_consumed, + &si, + ); + let else_progress = match if_else_branch(expr.clone()) { + Some(eb) => parser_state_expr_progress( + &eb, + &state_param, + &env, + &parser_always_advancing, + &consumed_true_set, + &si, + ), + None => DescentEvidence::DescentUnknown, + }; + merge_evidence(then_progress, else_progress) + } + ExprData::ExprLet => { + let next_env = parser_env_with_binding( + &let_binding_name_at(expr.clone(), si.clone()), + &let_value(expr.clone()), + &env, + &state_param, + &parser_always_advancing, + &consumed_true_set, + &si, + ); + match let_body(expr.clone()) { + Some(body) => parser_state_expr_progress( + &body, + &state_param, + &next_env, + &parser_always_advancing, + &consumed_true_set, + &si, + ), + None => DescentEvidence::DescentUnknown, + } + } + ExprData::ExprMatch => { + let arm_progresses = Rc::new({ + let mut __result = Vec::new(); + for arm_node in match_arm_nodes(expr.clone()).iter().cloned() { + __result.push(parser_state_expr_progress( + &arm_body(&arm_node), + &state_param, + &env, + &parser_always_advancing, + &consumed_true_set, + &si, + )); + } + __result + }); + match arm_progresses.clone().first().cloned() { + Some(initial) => arm_progresses.clone().iter().cloned().fold( + initial.clone(), + |acc: DescentEvidence, p: DescentEvidence| merge_evidence(acc, p.clone()), + ), + None => DescentEvidence::DescentUnknown, + } + } + ExprData::ExprBlock => parser_block_state_progress( + &expr.children.clone(), + &state_param, + env.clone(), + &parser_always_advancing, + &consumed_true_set, + &si, + ), + _ => DescentEvidence::DescentUnknown, + } }) } -pub fn parser_block_state_progress(stmts: &Rc>>, state_param: &Rc, env: Rc, parser_always_advancing: &Rc>, consumed_true_set: &Rc>, si: &Rc>>) -> DescentEvidence { +pub fn parser_block_state_progress( + stmts: &Rc>>, + state_param: &Rc, + env: Rc, + parser_always_advancing: &Rc>, + consumed_true_set: &Rc>, + si: &Rc>>, +) -> DescentEvidence { match stmts.clone().last().cloned() { - None => DescentEvidence::DescentUnknown, - Some(last_stmt) => { - let leading = Rc::new(stmts.clone().iter().cloned().take(((stmts.clone().len() as i64) - 1) as usize).collect::>()); -let final_env = leading.iter().cloned().fold(env.clone(), |acc_env: Rc, stmt: Rc| match (*stmt.expr_data.clone()).clone() { - ExprData::ExprLet => match let_body(stmt.clone()) { - None => parser_env_with_binding(&let_binding_name_at(stmt.clone(), si.clone()), &let_value(stmt.clone()), &acc_env, &state_param, &parser_always_advancing, &consumed_true_set, &si), - Some(_) => acc_env.clone(), -}, - _ => acc_env.clone(), -}); -parser_state_expr_progress(&last_stmt, &state_param, &final_env, &parser_always_advancing, &consumed_true_set, &si) -}, -} + None => DescentEvidence::DescentUnknown, + Some(last_stmt) => { + let leading = Rc::new( + stmts + .clone() + .iter() + .cloned() + .take(((stmts.clone().len() as i64) - 1) as usize) + .collect::>(), + ); + let final_env = leading.iter().cloned().fold( + env.clone(), + |acc_env: Rc, stmt: Rc| match (*stmt.expr_data.clone()) + .clone() + { + ExprData::ExprLet => match let_body(stmt.clone()) { + None => parser_env_with_binding( + &let_binding_name_at(stmt.clone(), si.clone()), + &let_value(stmt.clone()), + &acc_env, + &state_param, + &parser_always_advancing, + &consumed_true_set, + &si, + ), + Some(_) => acc_env.clone(), + }, + _ => acc_env.clone(), + }, + ); + parser_state_expr_progress( + &last_stmt, + &state_param, + &final_env, + &parser_always_advancing, + &consumed_true_set, + &si, + ) + } + } } -pub fn parser_result_source_for_expr(expr: &Rc, state_param: &Rc, env: Rc, parser_always_advancing: Rc>, consumed_true_set: Rc>, si: &Rc>>) -> Rc { +pub fn parser_result_source_for_expr( + expr: &Rc, + state_param: &Rc, + env: Rc, + parser_always_advancing: Rc>, + consumed_true_set: Rc>, + si: &Rc>>, +) -> Rc { match (*expr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let input_progress = match parser_state_arg_expr(expr.clone(), state_param.clone(), si.clone()) { - Some(state_expr) => parser_state_expr_progress(&state_expr, &state_param, &env, &parser_always_advancing, &consumed_true_set, &si), - None => DescentEvidence::DescentUnknown, -}; -match (*parser_result_witness(&expr, si.clone())).clone() { - ParserResultWitness::ParserWitnessAdvance => Rc::new(ParserResultSource::ParserResultAdvance { - input: input_progress.clone(), -}), - ParserResultWitness::ParserWitnessExpect => Rc::new(ParserResultSource::ParserResultExpect { - input: input_progress.clone(), -}), - ParserResultWitness::ParserWitnessEat => Rc::new(ParserResultSource::ParserResultEat { - input: input_progress.clone(), -}), - ParserResultWitness::ParserWitnessCall { callee, .. } => match (*callee.clone()).clone() { - ParserCallIdentity::ParserCallHelper { .. } => Rc::new(ParserResultSource::ParserResultOpaque), - ParserCallIdentity::ParserCallFunction { name, .. } => match input_progress.clone() { - DescentEvidence::DescentUnknown => Rc::new(ParserResultSource::ParserResultOpaque), - _ => Rc::new(ParserResultSource::ParserResultCall { - input: input_progress.clone(), - callee: name.clone(), -}), -}, -}, - ParserResultWitness::ParserWitnessOpaque => Rc::new(ParserResultSource::ParserResultOpaque), -} -}, - _ => { - let progress = parser_success_progress(&expr, &state_param, &env, &parser_always_advancing, &consumed_true_set, &si); -match progress.clone() { - DescentEvidence::DescentUnknown => Rc::new(ParserResultSource::ParserResultOpaque), - _ => Rc::new(ParserResultSource::ParserResultDirectState { - input: progress.clone(), -}), -} -}, -} + ExprData::ExprCall { .. } => { + let input_progress = + match parser_state_arg_expr(expr.clone(), state_param.clone(), si.clone()) { + Some(state_expr) => parser_state_expr_progress( + &state_expr, + &state_param, + &env, + &parser_always_advancing, + &consumed_true_set, + &si, + ), + None => DescentEvidence::DescentUnknown, + }; + match (*parser_result_witness(&expr, si.clone())).clone() { + ParserResultWitness::ParserWitnessAdvance => { + Rc::new(ParserResultSource::ParserResultAdvance { + input: input_progress.clone(), + }) + } + ParserResultWitness::ParserWitnessExpect => { + Rc::new(ParserResultSource::ParserResultExpect { + input: input_progress.clone(), + }) + } + ParserResultWitness::ParserWitnessEat => { + Rc::new(ParserResultSource::ParserResultEat { + input: input_progress.clone(), + }) + } + ParserResultWitness::ParserWitnessCall { callee, .. } => { + match (*callee.clone()).clone() { + ParserCallIdentity::ParserCallHelper { .. } => { + Rc::new(ParserResultSource::ParserResultOpaque) + } + ParserCallIdentity::ParserCallFunction { name, .. } => { + match input_progress.clone() { + DescentEvidence::DescentUnknown => { + Rc::new(ParserResultSource::ParserResultOpaque) + } + _ => Rc::new(ParserResultSource::ParserResultCall { + input: input_progress.clone(), + callee: name.clone(), + }), + } + } + } + } + ParserResultWitness::ParserWitnessOpaque => { + Rc::new(ParserResultSource::ParserResultOpaque) + } + } + } + _ => { + let progress = parser_success_progress( + &expr, + &state_param, + &env, + &parser_always_advancing, + &consumed_true_set, + &si, + ); + match progress.clone() { + DescentEvidence::DescentUnknown => Rc::new(ParserResultSource::ParserResultOpaque), + _ => Rc::new(ParserResultSource::ParserResultDirectState { + input: progress.clone(), + }), + } + } + } } -pub fn parser_env_with_binding(name: &String, value_expr: &Rc, env: &Rc, state_param: &Rc, parser_always_advancing: &Rc>, consumed_true_set: &Rc>, si: &Rc>>) -> Rc { +pub fn parser_env_with_binding( + name: &String, + value_expr: &Rc, + env: &Rc, + state_param: &Rc, + parser_always_advancing: &Rc>, + consumed_true_set: &Rc>, + si: &Rc>>, +) -> Rc { { - let state_progress = parser_state_expr_progress(&value_expr, &state_param, &env, &parser_always_advancing, &consumed_true_set, &si); -let result_source = parser_result_source_for_expr(&value_expr, &state_param, env.clone(), parser_always_advancing.clone(), consumed_true_set.clone(), &si); -Rc::new(ParserProgressEnv { - state_aliases: v2_rt::rc_map_insert(env.state_aliases.clone(), name.clone(), state_progress), - result_sources: v2_rt::rc_map_insert(env.result_sources.clone(), name.clone(), result_source), -}) -} + let state_progress = parser_state_expr_progress( + &value_expr, + &state_param, + &env, + &parser_always_advancing, + &consumed_true_set, + &si, + ); + let result_source = parser_result_source_for_expr( + &value_expr, + &state_param, + env.clone(), + parser_always_advancing.clone(), + consumed_true_set.clone(), + &si, + ); + Rc::new(ParserProgressEnv { + state_aliases: v2_rt::rc_map_insert( + env.state_aliases.clone(), + name.clone(), + state_progress, + ), + result_sources: v2_rt::rc_map_insert( + env.result_sources.clone(), + name.clone(), + result_source, + ), + }) + } } -pub fn parser_call_edge_progress(call_node: &Rc, state_param: &Rc, env: Rc, parser_always_advancing: &Rc>, consumed_true_set: Rc>, si: &Rc>>) -> DescentEvidence { +pub fn parser_call_edge_progress( + call_node: &Rc, + state_param: &Rc, + env: Rc, + parser_always_advancing: &Rc>, + consumed_true_set: Rc>, + si: &Rc>>, +) -> DescentEvidence { match parser_state_arg_expr(call_node.clone(), state_param.clone(), si.clone()) { - Some(state_expr) => { - let input_progress = parser_state_expr_progress(&state_expr, &state_param, &env, &parser_always_advancing, &consumed_true_set, &si); -if set_has(parser_always_advancing.clone(), expr_call_func_at(call_node.clone(), si.clone())) { - strict_after_parser_witness(input_progress) - } else { - input_progress + Some(state_expr) => { + let input_progress = parser_state_expr_progress( + &state_expr, + &state_param, + &env, + &parser_always_advancing, + &consumed_true_set, + &si, + ); + if set_has( + parser_always_advancing.clone(), + expr_call_func_at(call_node.clone(), si.clone()), + ) { + strict_after_parser_witness(input_progress) + } else { + input_progress + } } -}, - None => DescentEvidence::DescentUnknown, -} + None => DescentEvidence::DescentUnknown, + } } -pub fn collect_parser_progress_block_edges(caller: String, stmts: Rc>>, state_param: Rc, scc_name_set: Rc>, env: Rc, parser_always_advancing: Rc>, consumed_true_set: Rc>, si: Rc>>) -> Rc>> { +pub fn collect_parser_progress_block_edges( + caller: String, + stmts: Rc>>, + state_param: Rc, + scc_name_set: Rc>, + env: Rc, + parser_always_advancing: Rc>, + consumed_true_set: Rc>, + si: Rc>>, +) -> Rc>> { { - let acc = stmts.iter().cloned().fold(Rc::new(ParserProgressAcc { - edges: Rc::new(vec![]), - env: env, -}), |acc: Rc, stmt: Rc| match (*stmt.expr_data.clone()).clone() { - ExprData::ExprLet => match let_body(stmt.clone()) { - None => { - let value_expr = let_value(stmt.clone()); -let value_edges = collect_parser_progress_edges(&caller, &value_expr, &state_param, &scc_name_set, &acc.env.clone(), &parser_always_advancing, &consumed_true_set, &si); -let next_env = parser_env_with_binding(&let_binding_name_at(stmt.clone(), si.clone()), &value_expr, &acc.env.clone(), &state_param, &parser_always_advancing, &consumed_true_set, &si); -Rc::new(ParserProgressAcc { - edges: v2_rt::concat(acc.edges.clone(), value_edges.clone()), - env: next_env.clone(), -}) -}, - Some(_) => { - let stmt_edges = collect_parser_progress_edges(&caller, &stmt, &state_param, &scc_name_set, &acc.env.clone(), &parser_always_advancing, &consumed_true_set, &si); -Rc::new(ParserProgressAcc { - edges: v2_rt::concat(acc.edges.clone(), stmt_edges.clone()), - env: acc.env.clone(), -}) -}, -}, - _ => { - let stmt_edges = collect_parser_progress_edges(&caller, &stmt, &state_param, &scc_name_set, &acc.env.clone(), &parser_always_advancing, &consumed_true_set, &si); -Rc::new(ParserProgressAcc { - edges: v2_rt::concat(acc.edges.clone(), stmt_edges.clone()), - env: acc.env.clone(), -}) -}, -}); -acc.edges.clone() -} + let acc = stmts.iter().cloned().fold( + Rc::new(ParserProgressAcc { + edges: Rc::new(vec![]), + env: env, + }), + |acc: Rc, stmt: Rc| match (*stmt.expr_data.clone()).clone() { + ExprData::ExprLet => match let_body(stmt.clone()) { + None => { + let value_expr = let_value(stmt.clone()); + let value_edges = collect_parser_progress_edges( + &caller, + &value_expr, + &state_param, + &scc_name_set, + &acc.env.clone(), + &parser_always_advancing, + &consumed_true_set, + &si, + ); + let next_env = parser_env_with_binding( + &let_binding_name_at(stmt.clone(), si.clone()), + &value_expr, + &acc.env.clone(), + &state_param, + &parser_always_advancing, + &consumed_true_set, + &si, + ); + Rc::new(ParserProgressAcc { + edges: v2_rt::concat(acc.edges.clone(), value_edges.clone()), + env: next_env.clone(), + }) + } + Some(_) => { + let stmt_edges = collect_parser_progress_edges( + &caller, + &stmt, + &state_param, + &scc_name_set, + &acc.env.clone(), + &parser_always_advancing, + &consumed_true_set, + &si, + ); + Rc::new(ParserProgressAcc { + edges: v2_rt::concat(acc.edges.clone(), stmt_edges.clone()), + env: acc.env.clone(), + }) + } + }, + _ => { + let stmt_edges = collect_parser_progress_edges( + &caller, + &stmt, + &state_param, + &scc_name_set, + &acc.env.clone(), + &parser_always_advancing, + &consumed_true_set, + &si, + ); + Rc::new(ParserProgressAcc { + edges: v2_rt::concat(acc.edges.clone(), stmt_edges.clone()), + env: acc.env.clone(), + }) + } + }, + ); + acc.edges.clone() + } } -pub fn collect_parser_progress_edges(caller: &String, body: &Rc, state_param: &Rc, scc_name_set: &Rc>, env: &Rc, parser_always_advancing: &Rc>, consumed_true_set: &Rc>, si: &Rc>>) -> Rc>> { +pub fn collect_parser_progress_edges( + caller: &String, + body: &Rc, + state_param: &Rc, + scc_name_set: &Rc>, + env: &Rc, + parser_always_advancing: &Rc>, + consumed_true_set: &Rc>, + si: &Rc>>, +) -> Rc>> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let own_edges = if set_has(scc_name_set.clone(), expr_call_func_at(body.clone(), si.clone())) { - Rc::new(vec![Rc::new(ParserProgressEdge { - caller: caller.clone(), - callee: expr_call_func_at(body.clone(), si.clone()), - progress: parser_call_edge_progress(&body, &state_param, env.clone(), &parser_always_advancing, consumed_true_set.clone(), &si), -})]) - } else { - Rc::new(vec![]) - }; -let child_edges = Rc::new({ let mut __result = Vec::new(); for child in body.children.clone().iter().cloned() { __result.extend((*collect_parser_progress_edges(&caller, &child, &state_param, &scc_name_set, &env, &parser_always_advancing, &consumed_true_set, &si)).iter().cloned()); } __result }); -v2_rt::concat(own_edges, child_edges) -}, - ExprData::ExprIf => { - let cond = if_condition(body.clone()); -let cond_edges = collect_parser_progress_edges(&caller, &cond, &state_param, &scc_name_set, &env, &parser_always_advancing, &consumed_true_set, &si); -let then_consumed = match parser_progress_flag_var(&cond, &si) { - Some(name) => v2_rt::rc_map_insert(consumed_true_set.clone(), name.clone(), true), - None => consumed_true_set.clone(), -}; -let then_edges = collect_parser_progress_edges(&caller, &if_then_branch(body.clone()), &state_param, &scc_name_set, &env, &parser_always_advancing, &then_consumed, &si); -let else_edges = match if_else_branch(body.clone()) { - Some(eb) => collect_parser_progress_edges(&caller, &eb, &state_param, &scc_name_set, &env, &parser_always_advancing, &consumed_true_set, &si), - None => Rc::new(vec![]), -}; -v2_rt::concat(v2_rt::concat(cond_edges, then_edges), else_edges) -}, - ExprData::ExprLet => { - let value_expr = let_value(body.clone()); -let value_edges = collect_parser_progress_edges(&caller, &value_expr, &state_param, &scc_name_set, &env, &parser_always_advancing, &consumed_true_set, &si); -let next_env = parser_env_with_binding(&let_binding_name_at(body.clone(), si.clone()), &value_expr, &env, &state_param, &parser_always_advancing, &consumed_true_set, &si); -let body_edges = match let_body(body.clone()) { - Some(b) => collect_parser_progress_edges(&caller, &b, &state_param, &scc_name_set, &next_env, &parser_always_advancing, &consumed_true_set, &si), - None => Rc::new(vec![]), -}; -v2_rt::concat(value_edges, body_edges) -}, - ExprData::ExprBlock => collect_parser_progress_block_edges(caller.clone(), body.children.clone(), state_param.clone(), scc_name_set.clone(), env.clone(), parser_always_advancing.clone(), consumed_true_set.clone(), si.clone()), - ExprData::ExprMatch => { - let scrut_edges = collect_parser_progress_edges(&caller, &match_scrutinee(body.clone()), &state_param, &scc_name_set, &env, &parser_always_advancing, &consumed_true_set, &si); -let arm_edges = Rc::new({ let mut __result = Vec::new(); for arm_node in match_arm_nodes(body.clone()).iter().cloned() { __result.extend((*collect_parser_progress_edges(&caller, &arm_body(&arm_node), &state_param, &scc_name_set, &env, &parser_always_advancing, &consumed_true_set, &si)).iter().cloned()); } __result }); -v2_rt::concat(scrut_edges, arm_edges) -}, - _ => Rc::new({ let mut __result = Vec::new(); for child in body.children.clone().iter().cloned() { __result.extend((*collect_parser_progress_edges(&caller, &child, &state_param, &scc_name_set, &env, &parser_always_advancing, &consumed_true_set, &si)).iter().cloned()); } __result }), -} + ExprData::ExprCall { .. } => { + let own_edges = if set_has( + scc_name_set.clone(), + expr_call_func_at(body.clone(), si.clone()), + ) { + Rc::new(vec![Rc::new(ParserProgressEdge { + caller: caller.clone(), + callee: expr_call_func_at(body.clone(), si.clone()), + progress: parser_call_edge_progress( + &body, + &state_param, + env.clone(), + &parser_always_advancing, + consumed_true_set.clone(), + &si, + ), + })]) + } else { + Rc::new(vec![]) + }; + let child_edges = Rc::new({ + let mut __result = Vec::new(); + for child in body.children.clone().iter().cloned() { + __result.extend( + (*collect_parser_progress_edges( + &caller, + &child, + &state_param, + &scc_name_set, + &env, + &parser_always_advancing, + &consumed_true_set, + &si, + )) + .iter() + .cloned(), + ); + } + __result + }); + v2_rt::concat(own_edges, child_edges) + } + ExprData::ExprIf => { + let cond = if_condition(body.clone()); + let cond_edges = collect_parser_progress_edges( + &caller, + &cond, + &state_param, + &scc_name_set, + &env, + &parser_always_advancing, + &consumed_true_set, + &si, + ); + let then_consumed = match parser_progress_flag_var(&cond, &si) { + Some(name) => { + v2_rt::rc_map_insert(consumed_true_set.clone(), name.clone(), true) + } + None => consumed_true_set.clone(), + }; + let then_edges = collect_parser_progress_edges( + &caller, + &if_then_branch(body.clone()), + &state_param, + &scc_name_set, + &env, + &parser_always_advancing, + &then_consumed, + &si, + ); + let else_edges = match if_else_branch(body.clone()) { + Some(eb) => collect_parser_progress_edges( + &caller, + &eb, + &state_param, + &scc_name_set, + &env, + &parser_always_advancing, + &consumed_true_set, + &si, + ), + None => Rc::new(vec![]), + }; + v2_rt::concat(v2_rt::concat(cond_edges, then_edges), else_edges) + } + ExprData::ExprLet => { + let value_expr = let_value(body.clone()); + let value_edges = collect_parser_progress_edges( + &caller, + &value_expr, + &state_param, + &scc_name_set, + &env, + &parser_always_advancing, + &consumed_true_set, + &si, + ); + let next_env = parser_env_with_binding( + &let_binding_name_at(body.clone(), si.clone()), + &value_expr, + &env, + &state_param, + &parser_always_advancing, + &consumed_true_set, + &si, + ); + let body_edges = match let_body(body.clone()) { + Some(b) => collect_parser_progress_edges( + &caller, + &b, + &state_param, + &scc_name_set, + &next_env, + &parser_always_advancing, + &consumed_true_set, + &si, + ), + None => Rc::new(vec![]), + }; + v2_rt::concat(value_edges, body_edges) + } + ExprData::ExprBlock => collect_parser_progress_block_edges( + caller.clone(), + body.children.clone(), + state_param.clone(), + scc_name_set.clone(), + env.clone(), + parser_always_advancing.clone(), + consumed_true_set.clone(), + si.clone(), + ), + ExprData::ExprMatch => { + let scrut_edges = collect_parser_progress_edges( + &caller, + &match_scrutinee(body.clone()), + &state_param, + &scc_name_set, + &env, + &parser_always_advancing, + &consumed_true_set, + &si, + ); + let arm_edges = Rc::new({ + let mut __result = Vec::new(); + for arm_node in match_arm_nodes(body.clone()).iter().cloned() { + __result.extend( + (*collect_parser_progress_edges( + &caller, + &arm_body(&arm_node), + &state_param, + &scc_name_set, + &env, + &parser_always_advancing, + &consumed_true_set, + &si, + )) + .iter() + .cloned(), + ); + } + __result + }); + v2_rt::concat(scrut_edges, arm_edges) + } + _ => Rc::new({ + let mut __result = Vec::new(); + for child in body.children.clone().iter().cloned() { + __result.extend( + (*collect_parser_progress_edges( + &caller, + &child, + &state_param, + &scc_name_set, + &env, + &parser_always_advancing, + &consumed_true_set, + &si, + )) + .iter() + .cloned(), + ); + } + __result + }), + } }) } -pub fn parser_record_field_value(expr: Rc, field_name: String, si: Rc>>) -> Option> { - Rc::new({ let mut __result = Vec::new(); for child in Rc::new({ let mut __result = Vec::new(); for child in expr.children.clone().iter().cloned() { if (field_init_node_name_at(child.clone(), si.clone()).as_str() == field_name.clone().as_str()) { __result.push(child); } } __result }).iter().cloned() { __result.push(field_init_node_value(&child)); } __result }).first().cloned() +pub fn parser_record_field_value( + expr: Rc, + field_name: String, + si: Rc>>, +) -> Option> { + Rc::new({ + let mut __result = Vec::new(); + for child in Rc::new({ + let mut __result = Vec::new(); + for child in expr.children.clone().iter().cloned() { + if (field_init_node_name_at(child.clone(), si.clone()).as_str() + == field_name.clone().as_str()) + { + __result.push(child); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(field_init_node_value(&child)); + } + __result + }) + .first() + .cloned() } pub fn parser_expr_is_none(expr: Rc) -> bool { match (*expr.expr_data.clone()).clone() { - ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitNull => true, - _ => false, -}, - _ => false, -} + ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitNull => true, + _ => false, + }, + _ => false, + } } -pub fn parser_success_progress(expr: &Rc, state_param: &Rc, env: &Rc, parser_always_advancing: &Rc>, consumed_true_set: &Rc>, si: &Rc>>) -> DescentEvidence { +pub fn parser_success_progress( + expr: &Rc, + state_param: &Rc, + env: &Rc, + parser_always_advancing: &Rc>, + consumed_true_set: &Rc>, + si: &Rc>>, +) -> DescentEvidence { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*expr.expr_data.clone()).clone() { - ExprData::ExprReturn => parser_success_progress(&return_value(expr.clone()), &state_param, &env, &parser_always_advancing, &consumed_true_set, &si), - ExprData::ExprVar { .. } => match v2_rt::map_get(&env.result_sources.clone(), expr_var_name_at(expr.clone(), si.clone())) { - Some(source) => parser_result_state_progress(source.clone(), parser_always_advancing.clone(), consumed_true_set.clone(), expr_var_name_at(expr.clone(), si.clone())), - None => DescentEvidence::DescentUnknown, -}, - ExprData::ExprCall { .. } => parser_result_state_progress(parser_result_source_for_expr(&expr, &state_param, env.clone(), parser_always_advancing.clone(), consumed_true_set.clone(), &si), parser_always_advancing.clone(), consumed_true_set.clone(), "".to_string()), - ExprData::ExprRecordLit { .. } => match parser_record_field_value(expr.clone(), "err".to_string(), si.clone()) { - Some(err_expr) => if parser_expr_is_none(err_expr.clone()) { - match parser_record_field_value(expr.clone(), "state".to_string(), si.clone()) { - Some(state_expr) => parser_state_expr_progress(&state_expr, &state_param, &env, &parser_always_advancing, &consumed_true_set, &si), - None => DescentEvidence::DescentUnknown, -} - } else { - DescentEvidence::DescentUnknown - }, - None => DescentEvidence::DescentUnknown, -}, - ExprData::ExprIf => { - let cond = if_condition(expr.clone()); -let then_consumed = match parser_progress_flag_var(&cond, &si) { - Some(name) => v2_rt::rc_map_insert(consumed_true_set.clone(), name.clone(), true), - None => consumed_true_set.clone(), -}; -let then_progress = parser_success_progress(&if_then_branch(expr.clone()), &state_param, &env, &parser_always_advancing, &then_consumed, &si); -let else_progress = match if_else_branch(expr.clone()) { - Some(eb) => parser_success_progress(&eb, &state_param, &env, &parser_always_advancing, &consumed_true_set, &si), - None => DescentEvidence::DescentUnknown, -}; -merge_evidence(then_progress, else_progress) -}, - ExprData::ExprLet => { - let next_env = parser_env_with_binding(&let_binding_name_at(expr.clone(), si.clone()), &let_value(expr.clone()), &env, &state_param, &parser_always_advancing, &consumed_true_set, &si); -match let_body(expr.clone()) { - Some(body) => parser_success_progress(&body, &state_param, &next_env, &parser_always_advancing, &consumed_true_set, &si), - None => DescentEvidence::DescentUnknown, -} -}, - ExprData::ExprBlock => { - let prefix = v2_rt::reverse(Rc::new(v2_rt::reverse(expr.children.clone()).iter().cloned().skip(1 as usize).collect::>())); -let acc = prefix.iter().cloned().fold(Rc::new(ParserProgressAcc { - edges: Rc::new(vec![]), - env: env.clone(), -}), |acc: Rc, stmt: Rc| match (*stmt.expr_data.clone()).clone() { - ExprData::ExprLet => match let_body(stmt.clone()) { - None => { - let next_env = parser_env_with_binding(&let_binding_name_at(stmt.clone(), si.clone()), &let_value(stmt.clone()), &acc.env.clone(), &state_param, &parser_always_advancing, &consumed_true_set, &si); -Rc::new(ParserProgressAcc { - edges: acc.edges.clone(), - env: next_env.clone(), -}) -}, - Some(_) => acc.clone(), -}, - _ => acc.clone(), -}); -match expr.children.clone().last().cloned() { - Some(last_stmt) => parser_success_progress(&last_stmt, &state_param, &acc.env.clone(), &parser_always_advancing, &consumed_true_set, &si), - None => DescentEvidence::DescentUnknown, -} -}, - _ => DescentEvidence::DescentUnknown, -} + ExprData::ExprReturn => parser_success_progress( + &return_value(expr.clone()), + &state_param, + &env, + &parser_always_advancing, + &consumed_true_set, + &si, + ), + ExprData::ExprVar { .. } => match v2_rt::map_get( + &env.result_sources.clone(), + expr_var_name_at(expr.clone(), si.clone()), + ) { + Some(source) => parser_result_state_progress( + source.clone(), + parser_always_advancing.clone(), + consumed_true_set.clone(), + expr_var_name_at(expr.clone(), si.clone()), + ), + None => DescentEvidence::DescentUnknown, + }, + ExprData::ExprCall { .. } => parser_result_state_progress( + parser_result_source_for_expr( + &expr, + &state_param, + env.clone(), + parser_always_advancing.clone(), + consumed_true_set.clone(), + &si, + ), + parser_always_advancing.clone(), + consumed_true_set.clone(), + "".to_string(), + ), + ExprData::ExprRecordLit { .. } => { + match parser_record_field_value(expr.clone(), "err".to_string(), si.clone()) { + Some(err_expr) => { + if parser_expr_is_none(err_expr.clone()) { + match parser_record_field_value( + expr.clone(), + "state".to_string(), + si.clone(), + ) { + Some(state_expr) => parser_state_expr_progress( + &state_expr, + &state_param, + &env, + &parser_always_advancing, + &consumed_true_set, + &si, + ), + None => DescentEvidence::DescentUnknown, + } + } else { + DescentEvidence::DescentUnknown + } + } + None => DescentEvidence::DescentUnknown, + } + } + ExprData::ExprIf => { + let cond = if_condition(expr.clone()); + let then_consumed = match parser_progress_flag_var(&cond, &si) { + Some(name) => { + v2_rt::rc_map_insert(consumed_true_set.clone(), name.clone(), true) + } + None => consumed_true_set.clone(), + }; + let then_progress = parser_success_progress( + &if_then_branch(expr.clone()), + &state_param, + &env, + &parser_always_advancing, + &then_consumed, + &si, + ); + let else_progress = match if_else_branch(expr.clone()) { + Some(eb) => parser_success_progress( + &eb, + &state_param, + &env, + &parser_always_advancing, + &consumed_true_set, + &si, + ), + None => DescentEvidence::DescentUnknown, + }; + merge_evidence(then_progress, else_progress) + } + ExprData::ExprLet => { + let next_env = parser_env_with_binding( + &let_binding_name_at(expr.clone(), si.clone()), + &let_value(expr.clone()), + &env, + &state_param, + &parser_always_advancing, + &consumed_true_set, + &si, + ); + match let_body(expr.clone()) { + Some(body) => parser_success_progress( + &body, + &state_param, + &next_env, + &parser_always_advancing, + &consumed_true_set, + &si, + ), + None => DescentEvidence::DescentUnknown, + } + } + ExprData::ExprBlock => { + let prefix = v2_rt::reverse(Rc::new( + v2_rt::reverse(expr.children.clone()) + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + )); + let acc = prefix.iter().cloned().fold( + Rc::new(ParserProgressAcc { + edges: Rc::new(vec![]), + env: env.clone(), + }), + |acc: Rc, stmt: Rc| match (*stmt.expr_data.clone()) + .clone() + { + ExprData::ExprLet => match let_body(stmt.clone()) { + None => { + let next_env = parser_env_with_binding( + &let_binding_name_at(stmt.clone(), si.clone()), + &let_value(stmt.clone()), + &acc.env.clone(), + &state_param, + &parser_always_advancing, + &consumed_true_set, + &si, + ); + Rc::new(ParserProgressAcc { + edges: acc.edges.clone(), + env: next_env.clone(), + }) + } + Some(_) => acc.clone(), + }, + _ => acc.clone(), + }, + ); + match expr.children.clone().last().cloned() { + Some(last_stmt) => parser_success_progress( + &last_stmt, + &state_param, + &acc.env.clone(), + &parser_always_advancing, + &consumed_true_set, + &si, + ), + None => DescentEvidence::DescentUnknown, + } + } + _ => DescentEvidence::DescentUnknown, + } }) } -pub fn parser_member_is_always_advancing(entry: &Rc, parser_name_set: Rc>, proven: &Rc>, si: &Rc>>) -> bool { +pub fn parser_member_is_always_advancing( + entry: &Rc, + parser_name_set: Rc>, + proven: &Rc>, + si: &Rc>>, +) -> bool { match parser_state_param(entry.params.clone(), si.clone()) { - Some(state_param) => { - let edges = collect_parser_progress_edges(&entry.name.clone(), &entry.body.clone(), &state_param, &parser_name_set, &empty_parser_progress_env(), &proven, &v2_rt::rc_empty_map::(), &si); -({ let mut __all = true; for edge in edges.iter().cloned() { if !(((edge.progress.clone() == DescentEvidence::Strict) || ((edge.progress.clone() == DescentEvidence::NonIncreasing) && set_has(proven.clone(), edge.callee.clone())))) { __all = false; break; } } __all } && (parser_success_progress(&entry.body.clone(), &state_param, &empty_parser_progress_env(), &proven, &v2_rt::rc_empty_map::(), &si) == DescentEvidence::Strict)) -}, - None => false, -} + Some(state_param) => { + let edges = collect_parser_progress_edges( + &entry.name.clone(), + &entry.body.clone(), + &state_param, + &parser_name_set, + &empty_parser_progress_env(), + &proven, + &v2_rt::rc_empty_map::(), + &si, + ); + ({ + let mut __all = true; + for edge in edges.iter().cloned() { + if !((edge.progress.clone() == DescentEvidence::Strict) + || ((edge.progress.clone() == DescentEvidence::NonIncreasing) + && set_has(proven.clone(), edge.callee.clone()))) + { + __all = false; + break; + } + } + __all + } && (parser_success_progress( + &entry.body.clone(), + &state_param, + &empty_parser_progress_env(), + &proven, + &v2_rt::rc_empty_map::(), + &si, + ) == DescentEvidence::Strict)) + } + None => false, + } } -pub fn infer_parser_always_advancing_members_worklist(mut queue: Rc>, mut func_index: Rc>>, mut parser_name_set: Rc>, mut reverse_graph: Rc>>>, mut proven: Rc>, mut si: Rc>>) -> Rc> { +pub fn infer_parser_always_advancing_members_worklist( + mut queue: Rc>, + mut func_index: Rc>>, + mut parser_name_set: Rc>, + mut reverse_graph: Rc>>>, + mut proven: Rc>, + mut si: Rc>>, +) -> Rc> { loop { match queue.clone().first().cloned() { - Some(name) => { let rest = Rc::new(queue.clone().iter().cloned().skip(1 as usize).collect::>()); -if set_has(proven.clone(), name.clone()) { - { - let __tco_0 = rest; -queue = __tco_0; -continue; -} -} else { - match v2_rt::map_get(&func_index, name.clone()) { - Some(entry) => { if parser_member_is_always_advancing(&entry, parser_name_set.clone(), &proven, &si) { - let callers = match v2_rt::map_get(&reverse_graph, name.clone()) { - Some(members) => members.clone(), - None => Rc::new(vec![]), -}; -{ - let __tco_0 = deduplicate(v2_rt::concat(rest, callers)); -let __tco_1 = v2_rt::rc_map_insert(proven, name.clone(), true); -queue = __tco_0; -proven = __tco_1; -continue; -} -} else { - { - let __tco_0 = rest; -queue = __tco_0; -continue; -} -} }, - None => { { - let __tco_0 = rest; -queue = __tco_0; -continue; -} }, -} -} }, - None => { break proven.clone(); }, -} -} + Some(name) => { + let rest = Rc::new( + queue + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + if set_has(proven.clone(), name.clone()) { + { + let __tco_0 = rest; + queue = __tco_0; + continue; + } + } else { + match v2_rt::map_get(&func_index, name.clone()) { + Some(entry) => { + if parser_member_is_always_advancing( + &entry, + parser_name_set.clone(), + &proven, + &si, + ) { + let callers = match v2_rt::map_get(&reverse_graph, name.clone()) { + Some(members) => members.clone(), + None => Rc::new(vec![]), + }; + { + let __tco_0 = deduplicate(v2_rt::concat(rest, callers)); + let __tco_1 = v2_rt::rc_map_insert(proven, name.clone(), true); + queue = __tco_0; + proven = __tco_1; + continue; + } + } else { + { + let __tco_0 = rest; + queue = __tco_0; + continue; + } + } + } + None => { + let __tco_0 = rest; + queue = __tco_0; + continue; + } + } + } + } + None => { + break proven.clone(); + } + } + } } -pub fn infer_parser_always_advancing_members(members: &Rc>, func_index: &Rc>>, si: &Rc>>) -> Rc> { +pub fn infer_parser_always_advancing_members( + members: &Rc>, + func_index: &Rc>>, + si: &Rc>>, +) -> Rc> { { - let parser_name_set = members.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, name.clone(), true)); -let parser_entries = Rc::new({ let mut __result = Vec::new(); for name in members.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { - Some(entry) => Rc::new(vec![entry.clone()]), - None => Rc::new(vec![]), -}).iter().cloned()); } __result }); -let call_graph = build_call_graph(&parser_entries, si.clone()); -let reverse_graph = reverse_adjacency(members.clone(), call_graph); -infer_parser_always_advancing_members_worklist(members.clone(), func_index.clone(), parser_name_set, reverse_graph, v2_rt::rc_empty_map::(), si.clone()) -} + let parser_name_set = members.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, name: String| { + v2_rt::rc_map_insert(acc, name.clone(), true) + }, + ); + let parser_entries = Rc::new({ + let mut __result = Vec::new(); + for name in members.clone().iter().cloned() { + __result.extend( + (*match v2_rt::map_get(&func_index, name.clone()) { + Some(entry) => Rc::new(vec![entry.clone()]), + None => Rc::new(vec![]), + }) + .iter() + .cloned(), + ); + } + __result + }); + let call_graph = build_call_graph(&parser_entries, si.clone()); + let reverse_graph = reverse_adjacency(members.clone(), call_graph); + infer_parser_always_advancing_members_worklist( + members.clone(), + func_index.clone(), + parser_name_set, + reverse_graph, + v2_rt::rc_empty_map::(), + si.clone(), + ) + } } -pub fn parser_function_names(func_index: &Rc>>, si: Rc>>) -> Rc> { - Rc::new({ let mut __result = Vec::new(); for name in Rc::new(v2_rt::map_keys(&func_index)).iter().cloned() { if match v2_rt::map_get(&func_index, name.clone()) { - Some(entry) => (parser_state_param(entry.params.clone(), si.clone()) != None), - None => false, -} { __result.push(name); } } __result }) +pub fn parser_function_names( + func_index: &Rc>>, + si: Rc>>, +) -> Rc> { + Rc::new({ + let mut __result = Vec::new(); + for name in Rc::new(v2_rt::map_keys(&func_index)).iter().cloned() { + if match v2_rt::map_get(&func_index, name.clone()) { + Some(entry) => (parser_state_param(entry.params.clone(), si.clone()) != None), + None => false, + } { + __result.push(name); + } + } + __result + }) } -pub fn infer_all_parser_always_advancing(func_index: &Rc>>, si: &Rc>>) -> Rc> { +pub fn infer_all_parser_always_advancing( + func_index: &Rc>>, + si: &Rc>>, +) -> Rc> { { let members = parser_function_names(&func_index, si.clone()); -infer_parser_always_advancing_members(&members, &func_index, &si) -} + infer_parser_always_advancing_members(&members, &func_index, &si) + } } pub fn seed_string_map(key: String, value: String) -> Rc> { @@ -786,583 +1537,1245 @@ pub fn seed_cost_map(key: String, value: Rc) -> Rc>(), key, value) } -pub fn seed_func_entry_map(key: String, value: Rc) -> Rc>> { +pub fn seed_func_entry_map( + key: String, + value: Rc, +) -> Rc>> { v2_rt::rc_map_insert(v2_rt::rc_empty_map::>(), key, value) } -pub fn build_call_graph_from_parser_edges(names: Rc>, edges: Rc>>) -> Rc { +pub fn build_call_graph_from_parser_edges( + names: Rc>, + edges: Rc>>, +) -> Rc { Rc::new(CallGraph { - edges: Rc::new({ let mut __result = Vec::new(); for edge in Rc::new({ let mut __result = Vec::new(); for edge in edges.iter().cloned() { if (edge.caller.clone().as_str() != edge.callee.clone().as_str()) { __result.push(edge); } } __result }).iter().cloned() { __result.push(Rc::new(GraphEdge { - caller: edge.caller.clone(), - callee: edge.callee.clone(), -})); } __result }), -}) + edges: Rc::new({ + let mut __result = Vec::new(); + for edge in Rc::new({ + let mut __result = Vec::new(); + for edge in edges.iter().cloned() { + if (edge.caller.clone().as_str() != edge.callee.clone().as_str()) { + __result.push(edge); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(Rc::new(GraphEdge { + caller: edge.caller.clone(), + callee: edge.callee.clone(), + })); + } + __result + }), + }) } -pub fn same_progress_subgraph_has_cycle(members: &Rc>, edges: Rc>>) -> bool { +pub fn same_progress_subgraph_has_cycle( + members: &Rc>, + edges: Rc>>, +) -> bool { { - let same_edges = Rc::new({ let mut __result = Vec::new(); for edge in edges.iter().cloned() { if (edge.progress.clone() == DescentEvidence::NonIncreasing) { __result.push(edge); } } __result }); -let has_self_cycle = { let mut __found = false; for edge in same_edges.clone().iter().cloned() { if (edge.caller.clone().as_str() == edge.callee.clone().as_str()) { __found = true; break; } } __found }; -if has_self_cycle { + let same_edges = Rc::new({ + let mut __result = Vec::new(); + for edge in edges.iter().cloned() { + if (edge.progress.clone() == DescentEvidence::NonIncreasing) { + __result.push(edge); + } + } + __result + }); + let has_self_cycle = { + let mut __found = false; + for edge in same_edges.clone().iter().cloned() { + if (edge.caller.clone().as_str() == edge.callee.clone().as_str()) { + __found = true; + break; + } + } + __found + }; + if has_self_cycle { true } else { { - let same_cross_edges = Rc::new({ let mut __result = Vec::new(); for edge in same_edges.clone().iter().cloned() { if (edge.caller.clone().as_str() != edge.callee.clone().as_str()) { __result.push(edge); } } __result }); -let graph = build_call_graph_from_parser_edges(members.clone(), same_cross_edges); -graph_has_multi_node_scc(&members, graph) -} + let same_cross_edges = Rc::new({ + let mut __result = Vec::new(); + for edge in same_edges.clone().iter().cloned() { + if (edge.caller.clone().as_str() != edge.callee.clone().as_str()) { + __result.push(edge); + } + } + __result + }); + let graph = build_call_graph_from_parser_edges(members.clone(), same_cross_edges); + graph_has_multi_node_scc(&members, graph) + } } -} + } } -pub fn collect_parser_edges_for_scc(members: &Rc>, func_index: &Rc>>, scc_name_set: Rc>, si: &Rc>>) -> Rc>> { +pub fn collect_parser_edges_for_scc( + members: &Rc>, + func_index: &Rc>>, + scc_name_set: Rc>, + si: &Rc>>, +) -> Rc>> { { - let all_have_state = { let mut __all = true; for name in members.clone().iter().cloned() { if !(match v2_rt::map_get(&func_index, name.clone()) { - Some(entry) => (parser_state_param(entry.params.clone(), si.clone()) != None), - None => false, -}) { __all = false; break; } } __all }; -if (all_have_state == false) { + let all_have_state = { + let mut __all = true; + for name in members.clone().iter().cloned() { + if !(match v2_rt::map_get(&func_index, name.clone()) { + Some(entry) => (parser_state_param(entry.params.clone(), si.clone()) != None), + None => false, + }) { + __all = false; + break; + } + } + __all + }; + if (all_have_state == false) { Rc::new(vec![]) } else { { - let proven = infer_parser_always_advancing_members(&parser_function_names(&func_index, si.clone()), &func_index, &si); -let parser_always_advancing = proven; -Rc::new({ let mut __result = Vec::new(); for name in members.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { - Some(entry) => match parser_state_param(entry.params.clone(), si.clone()) { - Some(state_param) => collect_parser_progress_edges(&name, &entry.body.clone(), &state_param, &scc_name_set, &empty_parser_progress_env(), &parser_always_advancing, &v2_rt::rc_empty_map::(), &si), - None => Rc::new(vec![]), -}, - None => Rc::new(vec![]), -}).iter().cloned()); } __result }) -} + let proven = infer_parser_always_advancing_members( + &parser_function_names(&func_index, si.clone()), + &func_index, + &si, + ); + let parser_always_advancing = proven; + Rc::new({ + let mut __result = Vec::new(); + for name in members.clone().iter().cloned() { + __result.extend( + (*match v2_rt::map_get(&func_index, name.clone()) { + Some(entry) => { + match parser_state_param(entry.params.clone(), si.clone()) { + Some(state_param) => collect_parser_progress_edges( + &name, + &entry.body.clone(), + &state_param, + &scc_name_set, + &empty_parser_progress_env(), + &parser_always_advancing, + &v2_rt::rc_empty_map::(), + &si, + ), + None => Rc::new(vec![]), + } + } + None => Rc::new(vec![]), + }) + .iter() + .cloned(), + ); + } + __result + }) + } } -} + } } -pub fn classify_parser_scc_recursion_pattern(members: &Rc>, func_index: Rc>>, si: Rc>>) -> Option> { +pub fn classify_parser_scc_recursion_pattern( + members: &Rc>, + func_index: Rc>>, + si: Rc>>, +) -> Option> { { - let scc_name_set = members.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, name.clone(), true)); -let edges = collect_parser_edges_for_scc(&members, &func_index, scc_name_set, &si); -if ((edges.clone().len() as i64) == 0) { + let scc_name_set = members.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, name: String| { + v2_rt::rc_map_insert(acc, name.clone(), true) + }, + ); + let edges = collect_parser_edges_for_scc(&members, &func_index, scc_name_set, &si); + if ((edges.clone().len() as i64) == 0) { None } else { { - let all_known = { let mut __all = true; for edge in edges.clone().iter().cloned() { if !((edge.progress.clone() != DescentEvidence::DescentUnknown)) { __all = false; break; } } __all }; -if (all_known && (same_progress_subgraph_has_cycle(&members, edges.clone()) == false)) { - Some(lower_call_pattern(Rc::new(CallPattern::ParserAdvanceCall { - witness: "parser_state".to_string(), -}))) + let all_known = { + let mut __all = true; + for edge in edges.clone().iter().cloned() { + if !(edge.progress.clone() != DescentEvidence::DescentUnknown) { + __all = false; + break; + } + } + __all + }; + if (all_known + && (same_progress_subgraph_has_cycle(&members, edges.clone()) == false)) + { + Some(lower_call_pattern(Rc::new( + CallPattern::ParserAdvanceCall { + witness: "parser_state".to_string(), + }, + ))) } else { None } -} + } } -} + } } -pub fn count_self_calls(body: &Rc, func_name: &String, si: &Rc>>) -> i64 { +pub fn count_self_calls( + body: &Rc, + func_name: &String, + si: &Rc>>, +) -> i64 { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let own = match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { + let own = match (*body.expr_data.clone()).clone() { + ExprData::ExprCall { .. } => { let f = expr_call_func_at(body.clone(), si.clone()); -if (f.as_str() == func_name.clone().as_str()) { + if (f.as_str() == func_name.clone().as_str()) { 1 } else { 0 } -}, - _ => 0, -}; -let from_children = body.children.clone().iter().cloned().fold(0, |acc: i64, child: Rc| (acc + count_self_calls(&child, &func_name, &si))); -(own + from_children) -} + } + _ => 0, + }; + let from_children = body + .children + .clone() + .iter() + .cloned() + .fold(0, |acc: i64, child: Rc| { + (acc + count_self_calls(&child, &func_name, &si)) + }); + (own + from_children) }) } -pub fn max_path_self_calls(body: Rc, func_name: String, si: Rc>>) -> i64 { +pub fn max_path_self_calls( + body: Rc, + func_name: String, + si: Rc>>, +) -> i64 { max_path_self_calls_with_cont(&body, &func_name, 0, &si) } -pub fn max_path_self_calls_with_cont(body: &Rc, func_name: &String, continue_calls: i64, si: &Rc>>) -> i64 { +pub fn max_path_self_calls_with_cont( + body: &Rc, + func_name: &String, + continue_calls: i64, + si: &Rc>>, +) -> i64 { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let f = expr_call_func_at(body.clone(), si.clone()); -let own = if (f.as_str() == func_name.clone().as_str()) { - 1 - } else { - 0 - }; -let arg_calls = body.children.clone().iter().cloned().fold(0, |acc: i64, child: Rc| { - let val = arg_value(&child); -match (*val.expr_data.clone()).clone() { - ExprData::ExprLambda => (acc.clone() + max_path_self_calls_with_cont(&lambda_body(val.clone()), &func_name, 0, &si)), - _ => (acc.clone() + max_path_self_calls_with_cont(&val, &func_name, 0, &si)), -} -}); -((own + arg_calls) + continue_calls.clone()) -}, - ExprData::ExprMatch => { - let scrut_calls = max_path_self_calls_with_cont(&match_scrutinee(body.clone()), &func_name, 0, &si); -let max_arm = match_arm_nodes(body.clone()).iter().cloned().fold(continue_calls.clone(), |acc: i64, arm_node: Rc| { - let arm_calls = max_path_self_calls_with_cont(&arm_body(&arm_node), &func_name, continue_calls.clone(), &si); -if (arm_calls.clone() > acc.clone()) { - arm_calls.clone() + ExprData::ExprCall { .. } => { + let f = expr_call_func_at(body.clone(), si.clone()); + let own = if (f.as_str() == func_name.clone().as_str()) { + 1 } else { - acc.clone() - } -}); -(scrut_calls + max_arm) -}, - ExprData::ExprIf => { - let cond_calls = max_path_self_calls_with_cont(&if_condition(body.clone()), &func_name, 0, &si); -let then_calls = max_path_self_calls_with_cont(&if_then_branch(body.clone()), &func_name, continue_calls.clone(), &si); -let else_calls = match if_else_branch(body.clone()) { - Some(eb) => max_path_self_calls_with_cont(&eb, &func_name, continue_calls.clone(), &si), - None => continue_calls.clone(), -}; -let branch_max = if (then_calls.clone() > else_calls.clone()) { - then_calls.clone() - } else { - else_calls.clone() - }; -(cond_calls + branch_max) -}, - ExprData::ExprForEach => (max_path_self_calls_with_cont(&foreach_collection(body.clone()), &func_name, 0, &si) + continue_calls.clone()), - ExprData::ExprLet => { - let val_calls = max_path_self_calls_with_cont(&let_value(body.clone()), &func_name, 0, &si); -let body_calls = match let_body(body.clone()) { - Some(b) => max_path_self_calls_with_cont(&b, &func_name, continue_calls.clone(), &si), - None => continue_calls.clone(), -}; -(val_calls + body_calls) -}, - ExprData::ExprBlock => v2_rt::reverse(body.children.clone()).iter().cloned().fold(continue_calls.clone(), |acc: i64, stmt: Rc| max_path_self_calls_with_cont(&stmt, &func_name, acc, &si)), - ExprData::ExprMethodCall { .. } => { - let recv_calls = max_path_self_calls_with_cont(&method_receiver(body.clone()), &func_name, 0, &si); -let arg_calls = method_arg_nodes(body.clone()).iter().cloned().fold(0, |acc: i64, arg_node: Rc| { - let val = arg_value(&arg_node); -match (*val.expr_data.clone()).clone() { - ExprData::ExprLambda => (acc.clone() + max_path_self_calls_with_cont(&lambda_body(val.clone()), &func_name, 0, &si)), - _ => (acc.clone() + max_path_self_calls_with_cont(&val, &func_name, 0, &si)), -} -}); -((recv_calls + arg_calls) + continue_calls.clone()) -}, - ExprData::ExprReturn => max_path_self_calls_with_cont(&return_value(body.clone()), &func_name, 0, &si), - _ => (body.children.clone().iter().cloned().fold(0, |acc: i64, child: Rc| (acc + max_path_self_calls_with_cont(&child, &func_name, 0, &si))) + continue_calls.clone()), -} + 0 + }; + let arg_calls = + body.children + .clone() + .iter() + .cloned() + .fold(0, |acc: i64, child: Rc| { + let val = arg_value(&child); + match (*val.expr_data.clone()).clone() { + ExprData::ExprLambda => { + (acc.clone() + + max_path_self_calls_with_cont( + &lambda_body(val.clone()), + &func_name, + 0, + &si, + )) + } + _ => { + (acc.clone() + + max_path_self_calls_with_cont(&val, &func_name, 0, &si)) + } + } + }); + ((own + arg_calls) + continue_calls.clone()) + } + ExprData::ExprMatch => { + let scrut_calls = max_path_self_calls_with_cont( + &match_scrutinee(body.clone()), + &func_name, + 0, + &si, + ); + let max_arm = match_arm_nodes(body.clone()).iter().cloned().fold( + continue_calls.clone(), + |acc: i64, arm_node: Rc| { + let arm_calls = max_path_self_calls_with_cont( + &arm_body(&arm_node), + &func_name, + continue_calls.clone(), + &si, + ); + if (arm_calls.clone() > acc.clone()) { + arm_calls.clone() + } else { + acc.clone() + } + }, + ); + (scrut_calls + max_arm) + } + ExprData::ExprIf => { + let cond_calls = + max_path_self_calls_with_cont(&if_condition(body.clone()), &func_name, 0, &si); + let then_calls = max_path_self_calls_with_cont( + &if_then_branch(body.clone()), + &func_name, + continue_calls.clone(), + &si, + ); + let else_calls = match if_else_branch(body.clone()) { + Some(eb) => { + max_path_self_calls_with_cont(&eb, &func_name, continue_calls.clone(), &si) + } + None => continue_calls.clone(), + }; + let branch_max = if (then_calls.clone() > else_calls.clone()) { + then_calls.clone() + } else { + else_calls.clone() + }; + (cond_calls + branch_max) + } + ExprData::ExprForEach => { + (max_path_self_calls_with_cont( + &foreach_collection(body.clone()), + &func_name, + 0, + &si, + ) + continue_calls.clone()) + } + ExprData::ExprLet => { + let val_calls = + max_path_self_calls_with_cont(&let_value(body.clone()), &func_name, 0, &si); + let body_calls = match let_body(body.clone()) { + Some(b) => { + max_path_self_calls_with_cont(&b, &func_name, continue_calls.clone(), &si) + } + None => continue_calls.clone(), + }; + (val_calls + body_calls) + } + ExprData::ExprBlock => v2_rt::reverse(body.children.clone()).iter().cloned().fold( + continue_calls.clone(), + |acc: i64, stmt: Rc| { + max_path_self_calls_with_cont(&stmt, &func_name, acc, &si) + }, + ), + ExprData::ExprMethodCall { .. } => { + let recv_calls = max_path_self_calls_with_cont( + &method_receiver(body.clone()), + &func_name, + 0, + &si, + ); + let arg_calls = method_arg_nodes(body.clone()).iter().cloned().fold( + 0, + |acc: i64, arg_node: Rc| { + let val = arg_value(&arg_node); + match (*val.expr_data.clone()).clone() { + ExprData::ExprLambda => { + (acc.clone() + + max_path_self_calls_with_cont( + &lambda_body(val.clone()), + &func_name, + 0, + &si, + )) + } + _ => { + (acc.clone() + + max_path_self_calls_with_cont(&val, &func_name, 0, &si)) + } + } + }, + ); + ((recv_calls + arg_calls) + continue_calls.clone()) + } + ExprData::ExprReturn => { + max_path_self_calls_with_cont(&return_value(body.clone()), &func_name, 0, &si) + } + _ => { + (body + .children + .clone() + .iter() + .cloned() + .fold(0, |acc: i64, child: Rc| { + (acc + max_path_self_calls_with_cont(&child, &func_name, 0, &si)) + }) + + continue_calls.clone()) + } + } }) } -pub fn max_path_self_calls_block(stmts: Rc>>, func_name: String, continue_calls: i64, si: Rc>>) -> i64 { - v2_rt::reverse(stmts).iter().cloned().fold(continue_calls.clone(), |acc: i64, stmt: Rc| max_path_self_calls_with_cont(&stmt, &func_name, acc, &si)) -} - -pub fn count_target_calls(body: &Rc, target_set: &Rc>, si: &Rc>>) -> i64 { +pub fn max_path_self_calls_block( + stmts: Rc>>, + func_name: String, + continue_calls: i64, + si: Rc>>, +) -> i64 { + v2_rt::reverse(stmts) + .iter() + .cloned() + .fold(continue_calls.clone(), |acc: i64, stmt: Rc| { + max_path_self_calls_with_cont(&stmt, &func_name, acc, &si) + }) +} + +pub fn count_target_calls( + body: &Rc, + target_set: &Rc>, + si: &Rc>>, +) -> i64 { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let own = match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { + let own = match (*body.expr_data.clone()).clone() { + ExprData::ExprCall { .. } => { let f = expr_call_func_at(body.clone(), si.clone()); -if set_has(target_set.clone(), f) { + if set_has(target_set.clone(), f) { 1 } else { 0 } -}, - _ => 0, -}; -let from_children = body.children.clone().iter().cloned().fold(0, |acc: i64, child: Rc| (acc + count_target_calls(&child, &target_set, &si))); -(own + from_children) -} + } + _ => 0, + }; + let from_children = body + .children + .clone() + .iter() + .cloned() + .fold(0, |acc: i64, child: Rc| { + (acc + count_target_calls(&child, &target_set, &si)) + }); + (own + from_children) }) } -pub fn max_path_target_calls(body: Rc, target_set: Rc>, si: Rc>>) -> i64 { +pub fn max_path_target_calls( + body: Rc, + target_set: Rc>, + si: Rc>>, +) -> i64 { max_path_target_calls_with_cont(&body, &target_set, 0, &si) } -pub fn max_path_target_calls_with_cont(body: &Rc, target_set: &Rc>, continue_calls: i64, si: &Rc>>) -> i64 { +pub fn max_path_target_calls_with_cont( + body: &Rc, + target_set: &Rc>, + continue_calls: i64, + si: &Rc>>, +) -> i64 { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let f = expr_call_func_at(body.clone(), si.clone()); -let own = if set_has(target_set.clone(), f) { - 1 - } else { - 0 - }; -let arg_calls = body.children.clone().iter().cloned().fold(0, |acc: i64, child: Rc| (acc + max_path_target_calls_with_cont(&arg_value(&child), &target_set, 0, &si))); -((own + arg_calls) + continue_calls.clone()) -}, - ExprData::ExprMatch => { - let scrut_calls = max_path_target_calls_with_cont(&match_scrutinee(body.clone()), &target_set, 0, &si); -let max_arm = match_arm_nodes(body.clone()).iter().cloned().fold(continue_calls.clone(), |acc: i64, arm_node: Rc| { - let arm_calls = max_path_target_calls_with_cont(&arm_body(&arm_node), &target_set, continue_calls.clone(), &si); -if (arm_calls.clone() > acc.clone()) { - arm_calls.clone() + ExprData::ExprCall { .. } => { + let f = expr_call_func_at(body.clone(), si.clone()); + let own = if set_has(target_set.clone(), f) { 1 } else { 0 }; + let arg_calls = + body.children + .clone() + .iter() + .cloned() + .fold(0, |acc: i64, child: Rc| { + (acc + max_path_target_calls_with_cont( + &arg_value(&child), + &target_set, + 0, + &si, + )) + }); + ((own + arg_calls) + continue_calls.clone()) + } + ExprData::ExprMatch => { + let scrut_calls = max_path_target_calls_with_cont( + &match_scrutinee(body.clone()), + &target_set, + 0, + &si, + ); + let max_arm = match_arm_nodes(body.clone()).iter().cloned().fold( + continue_calls.clone(), + |acc: i64, arm_node: Rc| { + let arm_calls = max_path_target_calls_with_cont( + &arm_body(&arm_node), + &target_set, + continue_calls.clone(), + &si, + ); + if (arm_calls.clone() > acc.clone()) { + arm_calls.clone() + } else { + acc.clone() + } + }, + ); + (scrut_calls + max_arm) + } + ExprData::ExprIf => { + let cond_calls = max_path_target_calls_with_cont( + &if_condition(body.clone()), + &target_set, + 0, + &si, + ); + let then_calls = max_path_target_calls_with_cont( + &if_then_branch(body.clone()), + &target_set, + continue_calls.clone(), + &si, + ); + let else_calls = match if_else_branch(body.clone()) { + Some(eb) => max_path_target_calls_with_cont( + &eb, + &target_set, + continue_calls.clone(), + &si, + ), + None => continue_calls.clone(), + }; + let branch_max = if (then_calls.clone() > else_calls.clone()) { + then_calls.clone() } else { - acc.clone() - } -}); -(scrut_calls + max_arm) -}, - ExprData::ExprIf => { - let cond_calls = max_path_target_calls_with_cont(&if_condition(body.clone()), &target_set, 0, &si); -let then_calls = max_path_target_calls_with_cont(&if_then_branch(body.clone()), &target_set, continue_calls.clone(), &si); -let else_calls = match if_else_branch(body.clone()) { - Some(eb) => max_path_target_calls_with_cont(&eb, &target_set, continue_calls.clone(), &si), - None => continue_calls.clone(), -}; -let branch_max = if (then_calls.clone() > else_calls.clone()) { - then_calls.clone() - } else { - else_calls.clone() - }; -(cond_calls + branch_max) -}, - ExprData::ExprForEach => (max_path_target_calls_with_cont(&foreach_collection(body.clone()), &target_set, 0, &si) + continue_calls.clone()), - ExprData::ExprLet => { - let val_calls = max_path_target_calls_with_cont(&let_value(body.clone()), &target_set, 0, &si); -let body_calls = match let_body(body.clone()) { - Some(b) => max_path_target_calls_with_cont(&b, &target_set, continue_calls.clone(), &si), - None => continue_calls.clone(), -}; -(val_calls + body_calls) -}, - ExprData::ExprBlock => v2_rt::reverse(body.children.clone()).iter().cloned().fold(continue_calls.clone(), |acc: i64, stmt: Rc| max_path_target_calls_with_cont(&stmt, &target_set, acc, &si)), - ExprData::ExprMethodCall { .. } => { - let recv_calls = max_path_target_calls_with_cont(&method_receiver(body.clone()), &target_set, 0, &si); -let arg_calls = method_arg_nodes(body.clone()).iter().cloned().fold(0, |acc: i64, arg_node: Rc| { - let val = arg_value(&arg_node); -match (*val.expr_data.clone()).clone() { - ExprData::ExprLambda => (acc.clone() + max_path_target_calls_with_cont(&lambda_body(val.clone()), &target_set, 0, &si)), - _ => (acc.clone() + max_path_target_calls_with_cont(&val, &target_set, 0, &si)), -} -}); -((recv_calls + arg_calls) + continue_calls.clone()) -}, - ExprData::ExprReturn => max_path_target_calls_with_cont(&return_value(body.clone()), &target_set, 0, &si), - _ => body.children.clone().iter().cloned().fold(continue_calls.clone(), |acc: i64, child: Rc| (acc + max_path_target_calls_with_cont(&child, &target_set, 0, &si))), -} + else_calls.clone() + }; + (cond_calls + branch_max) + } + ExprData::ExprForEach => { + (max_path_target_calls_with_cont( + &foreach_collection(body.clone()), + &target_set, + 0, + &si, + ) + continue_calls.clone()) + } + ExprData::ExprLet => { + let val_calls = + max_path_target_calls_with_cont(&let_value(body.clone()), &target_set, 0, &si); + let body_calls = match let_body(body.clone()) { + Some(b) => max_path_target_calls_with_cont( + &b, + &target_set, + continue_calls.clone(), + &si, + ), + None => continue_calls.clone(), + }; + (val_calls + body_calls) + } + ExprData::ExprBlock => v2_rt::reverse(body.children.clone()).iter().cloned().fold( + continue_calls.clone(), + |acc: i64, stmt: Rc| { + max_path_target_calls_with_cont(&stmt, &target_set, acc, &si) + }, + ), + ExprData::ExprMethodCall { .. } => { + let recv_calls = max_path_target_calls_with_cont( + &method_receiver(body.clone()), + &target_set, + 0, + &si, + ); + let arg_calls = method_arg_nodes(body.clone()).iter().cloned().fold( + 0, + |acc: i64, arg_node: Rc| { + let val = arg_value(&arg_node); + match (*val.expr_data.clone()).clone() { + ExprData::ExprLambda => { + (acc.clone() + + max_path_target_calls_with_cont( + &lambda_body(val.clone()), + &target_set, + 0, + &si, + )) + } + _ => { + (acc.clone() + + max_path_target_calls_with_cont(&val, &target_set, 0, &si)) + } + } + }, + ); + ((recv_calls + arg_calls) + continue_calls.clone()) + } + ExprData::ExprReturn => { + max_path_target_calls_with_cont(&return_value(body.clone()), &target_set, 0, &si) + } + _ => body.children.clone().iter().cloned().fold( + continue_calls.clone(), + |acc: i64, child: Rc| { + (acc + max_path_target_calls_with_cont(&child, &target_set, 0, &si)) + }, + ), + } }) } -pub fn build_scc_measure_params(members: Rc>, func_index: Rc>>, si: Rc>>) -> Rc>>> { - members.iter().cloned().fold(v2_rt::rc_empty_map::>>(), |acc: Rc>>>, name: String| match v2_rt::map_get(&func_index, name.clone()) { - Some(entry) => v2_rt::rc_map_insert(acc.clone(), name.clone(), recursive_measure_param_names(&entry.body.clone(), &entry.params.clone(), &si)), - None => acc.clone(), -}) +pub fn build_scc_measure_params( + members: Rc>, + func_index: Rc>>, + si: Rc>>, +) -> Rc>>> { + members.iter().cloned().fold( + v2_rt::rc_empty_map::>>(), + |acc: Rc>>>, name: String| match v2_rt::map_get( + &func_index, + name.clone(), + ) { + Some(entry) => v2_rt::rc_map_insert( + acc.clone(), + name.clone(), + recursive_measure_param_names(&entry.body.clone(), &entry.params.clone(), &si), + ), + None => acc.clone(), + }, + ) } -pub fn target_call_has_arithmetic_descent(call_node: &Rc, target_set: &Rc>, func_index: Rc>>, scc_measure_params: Rc>>>, si: &Rc>>) -> bool { +pub fn target_call_has_arithmetic_descent( + call_node: &Rc, + target_set: &Rc>, + func_index: Rc>>, + scc_measure_params: Rc>>>, + si: &Rc>>, +) -> bool { { let callee = expr_call_func_at(call_node.clone(), si.clone()); -if (set_has(target_set.clone(), callee.clone()) == false) { + if (set_has(target_set.clone(), callee.clone()) == false) { true } else { match v2_rt::map_get(&func_index, callee.clone()) { - Some(callee_entry) => { - let callee_measure_params = match v2_rt::map_get(&scc_measure_params, callee.clone()) { - Some(params) => params.clone(), - None => v2_rt::rc_empty_map::(), -}; -{ let mut __found = false; for pair in Rc::new(call_node.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if { - let arg_expr = arg_value(&pair.1.clone()); -(((max_path_target_calls(arg_expr.clone(), target_set.clone(), si.clone()) == 0) && is_descending_expr(&arg_expr)) && match recursive_param_name_for_arg(pair.0.clone(), pair.1.clone(), callee_entry.params.clone(), &si) { - Some(param_name) => (v2_rt::map_get(&callee_measure_params, param_name.clone()) != None), - None => false, -}) -} { __found = true; break; } } __found } -}, - None => false, -} + Some(callee_entry) => { + let callee_measure_params = + match v2_rt::map_get(&scc_measure_params, callee.clone()) { + Some(params) => params.clone(), + None => v2_rt::rc_empty_map::(), + }; + { + let mut __found = false; + for pair in Rc::new( + call_node + .children + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + if { + let arg_expr = arg_value(&pair.1.clone()); + (((max_path_target_calls( + arg_expr.clone(), + target_set.clone(), + si.clone(), + ) == 0) + && is_descending_expr(&arg_expr)) + && match recursive_param_name_for_arg( + pair.0.clone(), + pair.1.clone(), + callee_entry.params.clone(), + &si, + ) { + Some(param_name) => { + (v2_rt::map_get( + &callee_measure_params, + param_name.clone(), + ) != None) + } + None => false, + }) + } { + __found = true; + break; + } + } + __found + } + } + None => false, + } } -} + } } -pub fn scc_calls_have_arithmetic_descent(body: &Rc, target_set: &Rc>, func_index: &Rc>>, scc_measure_params: &Rc>>>, si: &Rc>>) -> bool { +pub fn scc_calls_have_arithmetic_descent( + body: &Rc, + target_set: &Rc>, + func_index: &Rc>>, + scc_measure_params: &Rc>>>, + si: &Rc>>, +) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => (target_call_has_arithmetic_descent(&body, &target_set, func_index.clone(), scc_measure_params.clone(), &si) && { let mut __all = true; for child in body.children.clone().iter().cloned() { if !(scc_calls_have_arithmetic_descent(&child, &target_set, &func_index, &scc_measure_params, &si)) { __all = false; break; } } __all }), - _ => { let mut __all = true; for child in body.children.clone().iter().cloned() { if !(scc_calls_have_arithmetic_descent(&child, &target_set, &func_index, &scc_measure_params, &si)) { __all = false; break; } } __all }, -} + ExprData::ExprCall { .. } => { + (target_call_has_arithmetic_descent( + &body, + &target_set, + func_index.clone(), + scc_measure_params.clone(), + &si, + ) && { + let mut __all = true; + for child in body.children.clone().iter().cloned() { + if !(scc_calls_have_arithmetic_descent( + &child, + &target_set, + &func_index, + &scc_measure_params, + &si, + )) { + __all = false; + break; + } + } + __all + }) + } + _ => { + let mut __all = true; + for child in body.children.clone().iter().cloned() { + if !(scc_calls_have_arithmetic_descent( + &child, + &target_set, + &func_index, + &scc_measure_params, + &si, + )) { + __all = false; + break; + } + } + __all + } + } }) } -pub fn descending_name_set_without_key(names: &Rc>, key: String) -> Rc> { - Rc::new(v2_rt::map_keys(&names)).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| if (name.clone().as_str() == key.clone().as_str()) { - acc.clone() - } else { - match v2_rt::map_get(&names, name.clone()) { - Some(source) => v2_rt::rc_map_insert(acc.clone(), name.clone(), source.clone()), - None => acc.clone(), -} - }) +pub fn descending_name_set_without_key( + names: &Rc>, + key: String, +) -> Rc> { + Rc::new(v2_rt::map_keys(&names)).iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, name: String| { + if (name.clone().as_str() == key.clone().as_str()) { + acc.clone() + } else { + match v2_rt::map_get(&names, name.clone()) { + Some(source) => v2_rt::rc_map_insert(acc.clone(), name.clone(), source.clone()), + None => acc.clone(), + } + } + }, + ) } -pub fn expr_descending_witness_source(mut expr: Rc, mut descending_witness_names: Rc>, mut si: Rc>>) -> Option { +pub fn expr_descending_witness_source( + mut expr: Rc, + mut descending_witness_names: Rc>, + mut si: Rc>>, +) -> Option { loop { match (*expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { break v2_rt::map_get(&descending_witness_names, expr_var_name_at(expr.clone(), si)); }, - ExprData::ExprBinOp { op, .. } => { match op.clone() { - BinOp::Sub => { { - let __tco_0 = binop_left(expr); -expr = __tco_0; -continue; -} }, - BinOp::Div => { { - let __tco_0 = binop_left(expr); -expr = __tco_0; -continue; -} }, - _ => { break None; }, -} }, - _ => { break None; }, -} -} -} - -pub fn condition_param_names(expr: &Rc, param_set: Rc>, si: Rc>>) -> Rc> { + ExprData::ExprVar { .. } => { + break v2_rt::map_get( + &descending_witness_names, + expr_var_name_at(expr.clone(), si), + ); + } + ExprData::ExprBinOp { op, .. } => match op.clone() { + BinOp::Sub => { + let __tco_0 = binop_left(expr); + expr = __tco_0; + continue; + } + BinOp::Div => { + let __tco_0 = binop_left(expr); + expr = __tco_0; + continue; + } + _ => { + break None; + } + }, + _ => { + break None; + } + } + } +} + +pub fn condition_param_names( + expr: &Rc, + param_set: Rc>, + si: Rc>>, +) -> Rc> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let name = expr_var_name_at(expr.clone(), si.clone()); -match v2_rt::map_get(¶m_set, name.clone()) { - Some(_) => seed_string_map(name.clone(), name.clone()), - None => v2_rt::rc_empty_map::(), -} -}, - _ => expr.children.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, child: Rc| v2_rt::rc_map_merge(acc, condition_param_names(&child, param_set.clone(), si.clone()))), -} + ExprData::ExprVar { .. } => { + let name = expr_var_name_at(expr.clone(), si.clone()); + match v2_rt::map_get(¶m_set, name.clone()) { + Some(_) => seed_string_map(name.clone(), name.clone()), + None => v2_rt::rc_empty_map::(), + } + } + _ => expr.children.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, child: Rc| { + v2_rt::rc_map_merge( + acc, + condition_param_names(&child, param_set.clone(), si.clone()), + ) + }, + ), + } }) } -pub fn recursive_measure_param_names(body: &Rc, params: &Rc>>, si: &Rc>>) -> Rc> { +pub fn recursive_measure_param_names( + body: &Rc, + params: &Rc>>, + si: &Rc>>, +) -> Rc> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let param_set = params.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, param: Rc| v2_rt::rc_map_insert(acc, param_node_name_at(param.clone(), si.clone()), param_node_name_at(param.clone(), si.clone()))); -match (*body.expr_data.clone()).clone() { - ExprData::ExprIf => { - let then_names = recursive_measure_param_names(&if_then_branch(body.clone()), ¶ms, &si); -let else_names = match if_else_branch(body.clone()) { - Some(eb) => recursive_measure_param_names(&eb, ¶ms, &si), - None => v2_rt::rc_empty_map::(), -}; -v2_rt::rc_map_merge(v2_rt::rc_map_merge(condition_param_names(&if_condition(body.clone()), param_set, si.clone()), then_names), else_names) -}, - ExprData::ExprMatch => { - let scrut_names = condition_param_names(&match_scrutinee(body.clone()), param_set, si.clone()); -let arm_names = match_arm_nodes(body.clone()).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, arm_node: Rc| v2_rt::rc_map_merge(acc, recursive_measure_param_names(&arm_body(&arm_node), ¶ms, &si))); -v2_rt::rc_map_merge(scrut_names, arm_names) -}, - ExprData::ExprLet => match let_body(body.clone()) { - Some(b) => recursive_measure_param_names(&b, ¶ms, &si), - None => v2_rt::rc_empty_map::(), -}, - ExprData::ExprBlock => body.children.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, stmt: Rc| v2_rt::rc_map_merge(acc, recursive_measure_param_names(&stmt, ¶ms, &si))), - _ => body.children.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, child: Rc| v2_rt::rc_map_merge(acc, recursive_measure_param_names(&child, ¶ms, &si))), -} -} + let param_set = params.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, param: Rc| { + v2_rt::rc_map_insert( + acc, + param_node_name_at(param.clone(), si.clone()), + param_node_name_at(param.clone(), si.clone()), + ) + }, + ); + match (*body.expr_data.clone()).clone() { + ExprData::ExprIf => { + let then_names = + recursive_measure_param_names(&if_then_branch(body.clone()), ¶ms, &si); + let else_names = match if_else_branch(body.clone()) { + Some(eb) => recursive_measure_param_names(&eb, ¶ms, &si), + None => v2_rt::rc_empty_map::(), + }; + v2_rt::rc_map_merge( + v2_rt::rc_map_merge( + condition_param_names(&if_condition(body.clone()), param_set, si.clone()), + then_names, + ), + else_names, + ) + } + ExprData::ExprMatch => { + let scrut_names = + condition_param_names(&match_scrutinee(body.clone()), param_set, si.clone()); + let arm_names = match_arm_nodes(body.clone()).iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, arm_node: Rc| { + v2_rt::rc_map_merge( + acc, + recursive_measure_param_names(&arm_body(&arm_node), ¶ms, &si), + ) + }, + ); + v2_rt::rc_map_merge(scrut_names, arm_names) + } + ExprData::ExprLet => match let_body(body.clone()) { + Some(b) => recursive_measure_param_names(&b, ¶ms, &si), + None => v2_rt::rc_empty_map::(), + }, + ExprData::ExprBlock => body.children.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, stmt: Rc| { + v2_rt::rc_map_merge(acc, recursive_measure_param_names(&stmt, ¶ms, &si)) + }, + ), + _ => body.children.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, child: Rc| { + v2_rt::rc_map_merge(acc, recursive_measure_param_names(&child, ¶ms, &si)) + }, + ), + } }) } -pub fn recursive_param_name_for_arg(idx: i64, arg_node: Rc, params: Rc>>, si: &Rc>>) -> Option { +pub fn recursive_param_name_for_arg( + idx: i64, + arg_node: Rc, + params: Rc>>, + si: &Rc>>, +) -> Option { match arg_name_at(arg_node, si.clone()) { - Some(name) => Some(name.clone()), - None => Rc::new({ let mut __result = Vec::new(); for pair in Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(params.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (pair.0.clone() == idx.clone()) { __result.push(pair); } } __result }).iter().cloned() { __result.push(param_node_name_at(pair.1.clone(), si.clone())); } __result }).first().cloned(), -} + Some(name) => Some(name.clone()), + None => Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + params + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + if (pair.0.clone() == idx.clone()) { + __result.push(pair); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(param_node_name_at(pair.1.clone(), si.clone())); + } + __result + }) + .first() + .cloned(), + } } pub fn is_descending_expr(expr: &Rc) -> bool { match (*expr.expr_data.clone()).clone() { - ExprData::ExprBinOp { op, .. } => match op.clone() { - BinOp::Sub => match (*binop_left(expr.clone()).expr_data.clone()).clone() { - ExprData::ExprVar { .. } => true, - _ => false, -}, - BinOp::Div => match (*binop_left(expr.clone()).expr_data.clone()).clone() { - ExprData::ExprVar { .. } => true, - _ => false, -}, - _ => false, -}, - _ => false, -} + ExprData::ExprBinOp { op, .. } => match op.clone() { + BinOp::Sub => match (*binop_left(expr.clone()).expr_data.clone()).clone() { + ExprData::ExprVar { .. } => true, + _ => false, + }, + BinOp::Div => match (*binop_left(expr.clone()).expr_data.clone()).clone() { + ExprData::ExprVar { .. } => true, + _ => false, + }, + _ => false, + }, + _ => false, + } } -pub fn has_arithmetic_descent(body: &Rc, func_name: &String, si: &Rc>>) -> bool { +pub fn has_arithmetic_descent( + body: &Rc, + func_name: &String, + si: &Rc>>, +) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let own_ok = if (expr_call_func_at(body.clone(), si.clone()).as_str() == func_name.clone().as_str()) { - { let mut __found = false; for arg_node in body.children.clone().iter().cloned() { if is_descending_expr(&arg_value(&arg_node)) { __found = true; break; } } __found } - } else { - false - }; -if own_ok { - true - } else { - { let mut __found = false; for c in body.children.clone().iter().cloned() { if has_arithmetic_descent(&c, &func_name, &si) { __found = true; break; } } __found } + ExprData::ExprCall { .. } => { + let own_ok = if (expr_call_func_at(body.clone(), si.clone()).as_str() + == func_name.clone().as_str()) + { + { + let mut __found = false; + for arg_node in body.children.clone().iter().cloned() { + if is_descending_expr(&arg_value(&arg_node)) { + __found = true; + break; + } + } + __found + } + } else { + false + }; + if own_ok { + true + } else { + { + let mut __found = false; + for c in body.children.clone().iter().cloned() { + if has_arithmetic_descent(&c, &func_name, &si) { + __found = true; + break; + } + } + __found + } + } } -}, - _ => { let mut __found = false; for c in body.children.clone().iter().cloned() { if has_arithmetic_descent(&c, &func_name, &si) { __found = true; break; } } __found }, -} + _ => { + let mut __found = false; + for c in body.children.clone().iter().cloned() { + if has_arithmetic_descent(&c, &func_name, &si) { + __found = true; + break; + } + } + __found + } + } }) } -pub fn is_accessor_of_param(expr: &Rc, param_name: String, vars: Rc>, si: &Rc>>) -> bool { +pub fn is_accessor_of_param( + expr: &Rc, + param_name: String, + vars: Rc>, + si: &Rc>>, +) -> bool { match (*expr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let callee = expr_call_func_at(expr.clone(), si.clone()); -(is_child_accessor_in_model(callee) && { let mut __found = false; for arg_node in expr.children.clone().iter().cloned() { if match (*arg_value(&arg_node).expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let vname = expr_var_name_at(arg_value(&arg_node), si.clone()); -((vname.clone().as_str() == param_name.clone().as_str()) || set_has(vars.clone(), vname.clone())) -}, - _ => false, -} { __found = true; break; } } __found }) -}, - _ => false, -} + ExprData::ExprCall { .. } => { + let callee = expr_call_func_at(expr.clone(), si.clone()); + (is_child_accessor_in_model(callee) && { + let mut __found = false; + for arg_node in expr.children.clone().iter().cloned() { + if match (*arg_value(&arg_node).expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let vname = expr_var_name_at(arg_value(&arg_node), si.clone()); + ((vname.clone().as_str() == param_name.clone().as_str()) + || set_has(vars.clone(), vname.clone())) + } + _ => false, + } { + __found = true; + break; + } + } + __found + }) + } + _ => false, + } } -pub fn is_children_of_param(mut expr: Rc, mut param_name: String, mut vars: Rc>, mut si: Rc>>) -> bool { +pub fn is_children_of_param( + mut expr: Rc, + mut param_name: String, + mut vars: Rc>, + mut si: Rc>>, +) -> bool { loop { match (*expr.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { let base = field_access_base(expr.clone()); -let field = field_access_field_at(expr.clone(), si.clone()); -break (is_children_list_field(field) && match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => (expr_var_name_at(base.clone(), si.clone()).as_str() == param_name.as_str()), - _ => false, -}); }, - ExprData::ExprVar { .. } => { break set_has(vars, expr_var_name_at(expr.clone(), si.clone())); }, - ExprData::ExprMethodCall { method_semantics: ms, .. } => { match method_size_effect(ms.clone()) { - Some(CollectionSizeEffect::ShrinkEffect) => { { - let __tco_0 = method_receiver(expr); -expr = __tco_0; -continue; -} }, - _ => { break false; }, -} }, - _ => { break false; }, -} -} + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(expr.clone()); + let field = field_access_field_at(expr.clone(), si.clone()); + break (is_children_list_field(field) + && match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + (expr_var_name_at(base.clone(), si.clone()).as_str() + == param_name.as_str()) + } + _ => false, + }); + } + ExprData::ExprVar { .. } => { + break set_has(vars, expr_var_name_at(expr.clone(), si.clone())); + } + ExprData::ExprMethodCall { + method_semantics: ms, + .. + } => match method_size_effect(ms.clone()) { + Some(CollectionSizeEffect::ShrinkEffect) => { + let __tco_0 = method_receiver(expr); + expr = __tco_0; + continue; + } + _ => { + break false; + } + }, + _ => { + break false; + } + } + } } -pub fn is_structural_children(expr: &Rc, param_name: &String, vars: &Rc>, si: &Rc>>) -> bool { +pub fn is_structural_children( + expr: &Rc, + param_name: &String, + vars: &Rc>, + si: &Rc>>, +) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - (is_children_of_param(expr.clone(), param_name.clone(), vars.clone(), si.clone()) || match (*expr.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(expr.clone()); -let field = field_access_field_at(expr.clone(), si.clone()); -(is_children_list_field(field) && match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(base.clone(), si.clone())), - _ => false, -}) -}, - ExprData::ExprMethodCall { method_semantics: ms, .. } => match method_size_effect(ms.clone()) { - Some(CollectionSizeEffect::ShrinkEffect) => is_structural_children(&method_receiver(expr.clone()), ¶m_name, &vars, &si), - Some(CollectionSizeEffect::IdentityEffect) => is_structural_children(&method_receiver(expr.clone()), ¶m_name, &vars, &si), - _ => false, -}, - _ => false, -}) + (is_children_of_param(expr.clone(), param_name.clone(), vars.clone(), si.clone()) + || match (*expr.expr_data.clone()).clone() { + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(expr.clone()); + let field = field_access_field_at(expr.clone(), si.clone()); + (is_children_list_field(field) + && match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + set_has(vars.clone(), expr_var_name_at(base.clone(), si.clone())) + } + _ => false, + }) + } + ExprData::ExprMethodCall { + method_semantics: ms, + .. + } => match method_size_effect(ms.clone()) { + Some(CollectionSizeEffect::ShrinkEffect) => is_structural_children( + &method_receiver(expr.clone()), + ¶m_name, + &vars, + &si, + ), + Some(CollectionSizeEffect::IdentityEffect) => is_structural_children( + &method_receiver(expr.clone()), + ¶m_name, + &vars, + &si, + ), + _ => false, + }, + _ => false, + }) }) } -pub fn is_child_descent_expr(expr: &Rc, param_name: &String, vars: &Rc>, si: &Rc>>) -> bool { +pub fn is_child_descent_expr( + expr: &Rc, + param_name: &String, + vars: &Rc>, + si: &Rc>>, +) -> bool { if is_accessor_of_param(&expr, param_name.clone(), vars.clone(), &si) { true } else { match (*expr.expr_data.clone()).clone() { - ExprData::ExprMethodCall { method_semantics: ms, .. } => match method_size_effect(ms.clone()) { - Some(CollectionSizeEffect::ProjectionEffect) => is_children_of_param(method_receiver(expr.clone()), param_name.clone(), vars.clone(), si.clone()), - _ => false, -}, - _ => false, -} + ExprData::ExprMethodCall { + method_semantics: ms, + .. + } => match method_size_effect(ms.clone()) { + Some(CollectionSizeEffect::ProjectionEffect) => is_children_of_param( + method_receiver(expr.clone()), + param_name.clone(), + vars.clone(), + si.clone(), + ), + _ => false, + }, + _ => false, + } } } -pub fn is_tree_size_preserving_wrapper(expr: &Rc, si: Rc>>) -> bool { +pub fn is_tree_size_preserving_wrapper( + expr: &Rc, + si: Rc>>, +) -> bool { match (*expr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let callee = expr_call_func_at(expr.clone(), si); -is_tree_size_preserving(callee) -}, - _ => false, -} + ExprData::ExprCall { .. } => { + let callee = expr_call_func_at(expr.clone(), si); + is_tree_size_preserving(callee) + } + _ => false, + } } pub fn wrapper_inner_arg(expr: Rc) -> Rc { match expr.children.clone().first().cloned() { - Some(arg_node) => arg_value(&arg_node), - None => expr.clone(), -} + Some(arg_node) => arg_value(&arg_node), + None => expr.clone(), + } } pub fn is_sub_value_extractor(expr: &Rc, si: Rc>>) -> bool { match (*expr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let callee = expr_call_func_at(expr.clone(), si); -is_tree_size_reducing(callee) -}, - _ => false, -} + ExprData::ExprCall { .. } => { + let callee = expr_call_func_at(expr.clone(), si); + is_tree_size_reducing(callee) + } + _ => false, + } } pub fn extractor_inner_arg(expr: Rc) -> Rc { match expr.children.clone().first().cloned() { - Some(arg_node) => arg_value(&arg_node), - None => expr.clone(), -} + Some(arg_node) => arg_value(&arg_node), + None => expr.clone(), + } } -pub fn is_list_shrink_expr(expr: &Rc, param_name: String, si: Rc>>) -> bool { +pub fn is_list_shrink_expr( + expr: &Rc, + param_name: String, + si: Rc>>, +) -> bool { match (*expr.expr_data.clone()).clone() { - ExprData::ExprMethodCall { method_semantics: ms, .. } => { - let is_shrink = match method_size_effect(ms.clone()) { - Some(CollectionSizeEffect::ShrinkEffect) => true, - _ => false, -}; -((is_shrink && match (*method_receiver(expr.clone()).expr_data.clone()).clone() { - ExprData::ExprVar { .. } => (expr_var_name_at(method_receiver(expr.clone()), si).as_str() == param_name.as_str()), - _ => false, -}) && match method_arg_nodes(expr.clone()).first().cloned() { - Some(arg_node) => match (*arg_value(&arg_node).expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: n, .. } = value.as_ref() else { unreachable!() }; (n.clone() > 0) }, - _ => false, -}, - None => false, -}) -}, - _ => false, -} + ExprData::ExprMethodCall { + method_semantics: ms, + .. + } => { + let is_shrink = match method_size_effect(ms.clone()) { + Some(CollectionSizeEffect::ShrinkEffect) => true, + _ => false, + }; + ((is_shrink + && match (*method_receiver(expr.clone()).expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + (expr_var_name_at(method_receiver(expr.clone()), si).as_str() + == param_name.as_str()) + } + _ => false, + }) + && match method_arg_nodes(expr.clone()).first().cloned() { + Some(arg_node) => match (*arg_value(&arg_node).expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitInt { value: n, .. } = value.as_ref() else { + unreachable!() + }; + (n.clone() > 0) + } + _ => false, + }, + None => false, + }) + } + _ => false, + } } pub fn is_generalized_shrink(expr: &Rc, si: Rc>>) -> bool { match (*expr.expr_data.clone()).clone() { - ExprData::ExprMethodCall { method_semantics: ms, .. } => { - let is_shrink = match method_size_effect(ms.clone()) { - Some(CollectionSizeEffect::ShrinkEffect) => true, - _ => false, -}; -(is_shrink && match method_arg_nodes(expr.clone()).first().cloned() { - Some(arg_node) => match (*arg_value(&arg_node).expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: n, .. } = value.as_ref() else { unreachable!() }; (n.clone() > 0) }, - _ => false, -}, - None => false, -}) -}, - _ => false, -} + ExprData::ExprMethodCall { + method_semantics: ms, + .. + } => { + let is_shrink = match method_size_effect(ms.clone()) { + Some(CollectionSizeEffect::ShrinkEffect) => true, + _ => false, + }; + (is_shrink + && match method_arg_nodes(expr.clone()).first().cloned() { + Some(arg_node) => match (*arg_value(&arg_node).expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitInt { value: n, .. } = value.as_ref() else { + unreachable!() + }; + (n.clone() > 0) + } + _ => false, + }, + None => false, + }) + } + _ => false, + } } -pub fn list_passthrough_inner(expr: Rc, si: Rc>>) -> Option> { +pub fn list_passthrough_inner( + expr: Rc, + si: Rc>>, +) -> Option> { parser_passthrough_state_expr(&expr, &si) } @@ -1370,1357 +2783,2780 @@ pub fn is_list_passthrough_call(expr: Rc, si: Rc, si: Rc>>) -> Option> { +pub fn list_passthrough_inner_arg( + expr: Rc, + si: Rc>>, +) -> Option> { list_passthrough_inner(expr, si) } -pub fn is_tokens_consuming_call(expr: &Rc, param_name: String, vars: Rc>, si: &Rc>>) -> bool { +pub fn is_tokens_consuming_call( + expr: &Rc, + param_name: String, + vars: Rc>, + si: &Rc>>, +) -> bool { match (*expr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => match consuming_tokens_arg(expr.clone(), si.clone()) { - Some(tokens_arg) => is_tokens_input_expr(tokens_arg.clone(), param_name, vars, si.clone()), - None => false, -}, - _ => false, -} + ExprData::ExprCall { .. } => match consuming_tokens_arg(expr.clone(), si.clone()) { + Some(tokens_arg) => { + is_tokens_input_expr(tokens_arg.clone(), param_name, vars, si.clone()) + } + None => false, + }, + _ => false, + } } -pub fn consuming_tokens_arg(expr: Rc, si: Rc>>) -> Option> { - expr.children.clone().iter().cloned().fold(None, |acc: _, child: Rc| match acc.clone() { - Some(_) => acc.clone(), - None => match arg_name_at(child.clone(), si.clone()) { - Some(name) => if (name.clone().as_str() == "tokens".to_string().as_str()) { - Some(arg_value(&child)) - } else { - None - }, - None => None, -}, -}) +pub fn consuming_tokens_arg( + expr: Rc, + si: Rc>>, +) -> Option> { + expr.children + .clone() + .iter() + .cloned() + .fold(None, |acc: _, child: Rc| match acc.clone() { + Some(_) => acc.clone(), + None => match arg_name_at(child.clone(), si.clone()) { + Some(name) => { + if (name.clone().as_str() == "tokens".to_string().as_str()) { + Some(arg_value(&child)) + } else { + None + } + } + None => None, + }, + }) } -pub fn is_tokens_input_expr(mut expr: Rc, mut param_name: String, mut vars: Rc>, mut si: Rc>>) -> bool { +pub fn is_tokens_input_expr( + mut expr: Rc, + mut param_name: String, + mut vars: Rc>, + mut si: Rc>>, +) -> bool { loop { match (*expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { let vname = expr_var_name_at(expr.clone(), si.clone()); -break ((vname.clone().as_str() == param_name.clone().as_str()) || set_has(vars, vname.clone())); }, - ExprData::ExprFieldAccess { .. } => { let field = field_access_field_at(expr.clone(), si.clone()); -if (field.as_str() == param_name.clone().as_str()) { - break true; -} else { - let base = field_access_base(expr.clone()); -match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { let bname = expr_var_name_at(base.clone(), si.clone()); -break ((bname.clone().as_str() == param_name.clone().as_str()) || set_has(vars, bname.clone())); }, - _ => { break false; }, -} -} }, - ExprData::ExprMethodCall { method_semantics: ms, .. } => { match method_size_effect(ms.clone()) { - Some(CollectionSizeEffect::ShrinkEffect) => { { - let __tco_0 = method_receiver(expr); -expr = __tco_0; -continue; -} }, - _ => { break false; }, -} }, - ExprData::ExprCall { .. } => { if is_list_passthrough_call(expr.clone(), si.clone()) { - match list_passthrough_inner_arg(expr.clone(), si.clone()) { - Some(inner) => { { - let __tco_0 = inner.clone(); -expr = __tco_0; -continue; -} }, - None => { break false; }, -} -} else { - match consuming_tokens_arg(expr.clone(), si.clone()) { - Some(tokens_arg) => { { - let __tco_0 = tokens_arg.clone(); -expr = __tco_0; -continue; -} }, - None => { break false; }, -} -} }, - _ => { break false; }, -} -} -} - -pub fn is_descent_arg(expr: &Rc, param_name: &String, descent_vars: Rc>, check_child: bool, check_list: bool, si: &Rc>>) -> bool { - match (*expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let vname = expr_var_name_at(expr.clone(), si.clone()); -set_has(descent_vars, vname) -}, - _ => ((check_child && is_child_descent_expr(&expr, ¶m_name, &descent_vars, &si)) || (check_list && is_list_shrink_expr(&expr, param_name.clone(), si.clone()))), + ExprData::ExprVar { .. } => { + let vname = expr_var_name_at(expr.clone(), si.clone()); + break ((vname.clone().as_str() == param_name.clone().as_str()) + || set_has(vars, vname.clone())); + } + ExprData::ExprFieldAccess { .. } => { + let field = field_access_field_at(expr.clone(), si.clone()); + if (field.as_str() == param_name.clone().as_str()) { + break true; + } else { + let base = field_access_base(expr.clone()); + match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at(base.clone(), si.clone()); + break ((bname.clone().as_str() == param_name.clone().as_str()) + || set_has(vars, bname.clone())); + } + _ => { + break false; + } + } + } + } + ExprData::ExprMethodCall { + method_semantics: ms, + .. + } => match method_size_effect(ms.clone()) { + Some(CollectionSizeEffect::ShrinkEffect) => { + let __tco_0 = method_receiver(expr); + expr = __tco_0; + continue; + } + _ => { + break false; + } + }, + ExprData::ExprCall { .. } => { + if is_list_passthrough_call(expr.clone(), si.clone()) { + match list_passthrough_inner_arg(expr.clone(), si.clone()) { + Some(inner) => { + let __tco_0 = inner.clone(); + expr = __tco_0; + continue; + } + None => { + break false; + } + } + } else { + match consuming_tokens_arg(expr.clone(), si.clone()) { + Some(tokens_arg) => { + let __tco_0 = tokens_arg.clone(); + expr = __tco_0; + continue; + } + None => { + break false; + } + } + } + } + _ => { + break false; + } + } + } } + +pub fn is_descent_arg( + expr: &Rc, + param_name: &String, + descent_vars: Rc>, + check_child: bool, + check_list: bool, + si: &Rc>>, +) -> bool { + match (*expr.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let vname = expr_var_name_at(expr.clone(), si.clone()); + set_has(descent_vars, vname) + } + _ => { + ((check_child && is_child_descent_expr(&expr, ¶m_name, &descent_vars, &si)) + || (check_list && is_list_shrink_expr(&expr, param_name.clone(), si.clone()))) + } + } } -pub fn expr_contains_descent(expr: &Rc, param_name: &String, vars: &Rc>, check_child: bool, check_list: bool, si: &Rc>>) -> bool { +pub fn expr_contains_descent( + expr: &Rc, + param_name: &String, + vars: &Rc>, + check_child: bool, + check_list: bool, + si: &Rc>>, +) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - if ((check_child.clone() && is_child_descent_expr(&expr, ¶m_name, &vars, &si)) || (check_list.clone() && is_list_shrink_expr(&expr, param_name.clone(), si.clone()))) { + if ((check_child.clone() && is_child_descent_expr(&expr, ¶m_name, &vars, &si)) + || (check_list.clone() && is_list_shrink_expr(&expr, param_name.clone(), si.clone()))) + { true } else { match (*expr.expr_data.clone()).clone() { - ExprData::ExprIf => (expr_contains_descent(&if_then_branch(expr.clone()), ¶m_name, &vars, check_child.clone(), check_list.clone(), &si) && match if_else_branch(expr.clone()) { - Some(eb) => expr_contains_descent(&eb, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si), - None => false, -}), - ExprData::ExprBlock => match expr.children.clone().last().cloned() { - Some(last_stmt) => expr_contains_descent(&last_stmt, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si), - None => false, -}, - ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(expr.clone(), si.clone())), - ExprData::ExprFieldAccess { .. } => { - let field = field_access_field_at(expr.clone(), si.clone()); -let base = field_access_base(expr.clone()); -(is_sub_value_field(field) && match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at(base.clone(), si.clone()); -((bname.clone().as_str() == param_name.clone().as_str()) || set_has(vars.clone(), bname.clone())) -}, - _ => false, -}) -}, - ExprData::ExprMethodCall { method_semantics: ms, .. } => { - let receiver = method_receiver(expr.clone()); -match method_size_effect(ms.clone()) { - Some(CollectionSizeEffect::ShrinkEffect) => expr_contains_descent(&receiver, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si), - Some(CollectionSizeEffect::ProjectionEffect) => expr_contains_descent(&receiver, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si), - Some(CollectionSizeEffect::IdentityEffect) => expr_contains_descent(&receiver, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si), - None => false, -} -}, - _ => false, -} + ExprData::ExprIf => { + (expr_contains_descent( + &if_then_branch(expr.clone()), + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + ) && match if_else_branch(expr.clone()) { + Some(eb) => expr_contains_descent( + &eb, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + ), + None => false, + }) + } + ExprData::ExprBlock => match expr.children.clone().last().cloned() { + Some(last_stmt) => expr_contains_descent( + &last_stmt, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + ), + None => false, + }, + ExprData::ExprVar { .. } => { + set_has(vars.clone(), expr_var_name_at(expr.clone(), si.clone())) + } + ExprData::ExprFieldAccess { .. } => { + let field = field_access_field_at(expr.clone(), si.clone()); + let base = field_access_base(expr.clone()); + (is_sub_value_field(field) + && match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at(base.clone(), si.clone()); + ((bname.clone().as_str() == param_name.clone().as_str()) + || set_has(vars.clone(), bname.clone())) + } + _ => false, + }) + } + ExprData::ExprMethodCall { + method_semantics: ms, + .. + } => { + let receiver = method_receiver(expr.clone()); + match method_size_effect(ms.clone()) { + Some(CollectionSizeEffect::ShrinkEffect) => expr_contains_descent( + &receiver, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + ), + Some(CollectionSizeEffect::ProjectionEffect) => expr_contains_descent( + &receiver, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + ), + Some(CollectionSizeEffect::IdentityEffect) => expr_contains_descent( + &receiver, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + ), + None => false, + } + } + _ => false, + } } }) } -pub fn collect_field_binding_names(fb: Rc, vars: Rc>) -> Rc> { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - match (*field_binding_pattern(fb)).clone() { - MatchPattern::Bind { name: binding_name, .. } => v2_rt::rc_map_insert(vars, binding_name.clone(), true), - MatchPattern::VariantPattern { field_bindings: nested, .. } => nested.clone().iter().cloned().fold(vars, |inner: Rc>, nested_fb: Rc| collect_field_binding_names(nested_fb.clone(), inner)), - _ => vars, -} - }) +pub fn collect_field_binding_names( + fb: Rc, + vars: Rc>, +) -> Rc> { + stacker::maybe_grow( + 512 * 1024, + 2 * 1024 * 1024, + || match (*field_binding_pattern(fb)).clone() { + MatchPattern::Bind { + name: binding_name, .. + } => v2_rt::rc_map_insert(vars, binding_name.clone(), true), + MatchPattern::VariantPattern { + field_bindings: nested, + .. + } => nested.clone().iter().cloned().fold( + vars, + |inner: Rc>, nested_fb: Rc| { + collect_field_binding_names(nested_fb.clone(), inner) + }, + ), + _ => vars, + }, + ) } -pub fn is_if_option_descent(val: &Rc, param_name: String, vars: Rc>, check_child: bool, check_list: bool, si: &Rc>>) -> bool { +pub fn is_if_option_descent( + val: &Rc, + param_name: String, + vars: Rc>, + check_child: bool, + check_list: bool, + si: &Rc>>, +) -> bool { match (*val.expr_data.clone()).clone() { - ExprData::ExprIf => { - let then_branch = if_then_branch(val.clone()); -let then_has_descent = expr_contains_descent(&then_branch, ¶m_name, &vars, check_child, check_list, &si); -let else_is_none = match if_else_branch(val.clone()) { - Some(eb) => match (*eb.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => (expr_var_name_at(eb.clone(), si.clone()).as_str() == "none".to_string().as_str()), - ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitNull => true, - _ => false, -}, - _ => false, -}, - None => true, -}; -(then_has_descent && else_is_none) -}, - _ => false, -} + ExprData::ExprIf => { + let then_branch = if_then_branch(val.clone()); + let then_has_descent = expr_contains_descent( + &then_branch, + ¶m_name, + &vars, + check_child, + check_list, + &si, + ); + let else_is_none = match if_else_branch(val.clone()) { + Some(eb) => match (*eb.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + (expr_var_name_at(eb.clone(), si.clone()).as_str() + == "none".to_string().as_str()) + } + ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitNull => true, + _ => false, + }, + _ => false, + }, + None => true, + }; + (then_has_descent && else_is_none) + } + _ => false, + } } -pub fn is_match_option_descent(val: &Rc, param_name: &String, vars: Rc>, check_child: bool, check_list: bool, si: &Rc>>) -> bool { +pub fn is_match_option_descent( + val: &Rc, + param_name: &String, + vars: Rc>, + check_child: bool, + check_list: bool, + si: &Rc>>, +) -> bool { match (*val.expr_data.clone()).clone() { - ExprData::ExprMatch => { - let scrut = match_scrutinee(val.clone()); -let scrut_has_descent = expr_contains_descent(&scrut, ¶m_name, &vars, check_child, check_list, &si); -if scrut_has_descent { - { - let has_extraction = { let mut __found = false; for arm_node in match_arm_nodes(val.clone()).iter().cloned() { if match (*arm_pattern(arm_node.clone())).clone() { - MatchPattern::VariantPattern { field_bindings: bindings, .. } => { - let binding_names = bindings.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, fb: Rc| collect_field_binding_names(fb.clone(), acc)); -let arm_b = arm_body(&arm_node); -match (*arm_b.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has(binding_names.clone(), expr_var_name_at(arm_b.clone(), si.clone())), - _ => false, -} -}, - _ => false, -} { __found = true; break; } } __found }; -let all_safe = { let mut __all = true; for arm_node in match_arm_nodes(val.clone()).iter().cloned() { if !({ - let arm_b = arm_body(&arm_node); -match (*arm_b.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => (expr_var_name_at(arm_b.clone(), si.clone()).as_str() != param_name.clone().as_str()), - _ => true, -} -}) { __all = false; break; } } __all }; -(has_extraction && all_safe) -} - } else { - false + ExprData::ExprMatch => { + let scrut = match_scrutinee(val.clone()); + let scrut_has_descent = + expr_contains_descent(&scrut, ¶m_name, &vars, check_child, check_list, &si); + if scrut_has_descent { + { + let has_extraction = { + let mut __found = false; + for arm_node in match_arm_nodes(val.clone()).iter().cloned() { + if match (*arm_pattern(arm_node.clone())).clone() { + MatchPattern::VariantPattern { + field_bindings: bindings, + .. + } => { + let binding_names = bindings.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, fb: Rc| { + collect_field_binding_names(fb.clone(), acc) + }, + ); + let arm_b = arm_body(&arm_node); + match (*arm_b.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has( + binding_names.clone(), + expr_var_name_at(arm_b.clone(), si.clone()), + ), + _ => false, + } + } + _ => false, + } { + __found = true; + break; + } + } + __found + }; + let all_safe = { + let mut __all = true; + for arm_node in match_arm_nodes(val.clone()).iter().cloned() { + if !({ + let arm_b = arm_body(&arm_node); + match (*arm_b.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + (expr_var_name_at(arm_b.clone(), si.clone()).as_str() + != param_name.clone().as_str()) + } + _ => true, + } + }) { + __all = false; + break; + } + } + __all + }; + (has_extraction && all_safe) + } + } else { + false + } } -}, - _ => false, -} + _ => false, + } } -pub fn collect_descent_vars(body: &Rc, param_name: &String, vars: &Rc>, check_child: bool, check_list: bool, si: &Rc>>) -> Rc> { +pub fn collect_descent_vars( + body: &Rc, + param_name: &String, + vars: &Rc>, + check_child: bool, + check_list: bool, + si: &Rc>>, +) -> Rc> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprLet => { - let val = let_value(body.clone()); -let is_direct_descent = ((check_child.clone() && is_child_descent_expr(&val, ¶m_name, &vars, &si)) || (check_list.clone() && is_list_shrink_expr(&val, param_name.clone(), si.clone()))); -let is_descent_var = match (*val.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(val.clone(), si.clone())), - _ => false, -}; -let is_option_descent = is_if_option_descent(&val, param_name.clone(), vars.clone(), check_child.clone(), check_list.clone(), &si); -let is_match_descent = is_match_option_descent(&val, ¶m_name, vars.clone(), check_child.clone(), check_list.clone(), &si); -let is_wrapped_descent = if is_tree_size_preserving_wrapper(&val, si.clone()) { - { - let inner = wrapper_inner_arg(val.clone()); -let inner_is_descent = ((check_child.clone() && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) || (check_list.clone() && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); -let inner_is_var = match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(inner.clone(), si.clone())), - _ => false, -}; -(inner_is_descent.clone() || inner_is_var.clone()) -} - } else { - false - }; -let is_extraction_descent = if is_sub_value_extractor(&val, si.clone()) { - { - let inner = extractor_inner_arg(val.clone()); -let inner_is_descent = ((check_child.clone() && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) || (check_list.clone() && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); -let inner_is_var = match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(inner.clone(), si.clone())), - _ => false, -}; -let inner_is_param = match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => (expr_var_name_at(inner.clone(), si.clone()).as_str() == param_name.clone().as_str()), - _ => false, -}; -((inner_is_descent.clone() || inner_is_var.clone()) || inner_is_param) -} - } else { - false - }; -let is_children_list = match (*val.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(val.clone()); -let field = field_access_field_at(val.clone(), si.clone()); -(is_children_list_field(field) && match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at(base.clone(), si.clone()); -((bname.clone().as_str() == param_name.clone().as_str()) || set_has(vars.clone(), bname.clone())) -}, - _ => false, -}) -}, - _ => false, -}; -let is_passthrough_descent = if is_list_passthrough_call(val.clone(), si.clone()) { - match list_passthrough_inner_arg(val.clone(), si.clone()) { - Some(inner) => (((check_child.clone() && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) || (check_list.clone() && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))) || match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(inner.clone(), si.clone())), - _ => false, -}), - None => false, -} - } else { - false - }; -let is_consuming_helper = (check_list.clone() && is_tokens_consuming_call(&val, param_name.clone(), vars.clone(), &si)); -let val_is_descent = ((((((((is_direct_descent || is_descent_var) || is_option_descent) || is_match_descent) || is_wrapped_descent) || is_extraction_descent) || is_children_list) || is_passthrough_descent) || is_consuming_helper); -let next_vars = if val_is_descent { - v2_rt::rc_map_insert(vars.clone(), let_binding_name_at(body.clone(), si.clone()), true) - } else { - vars.clone() - }; -match let_body(body.clone()) { - Some(b) => collect_descent_vars(&b, ¶m_name, &next_vars, check_child.clone(), check_list.clone(), &si), - None => next_vars, -} -}, - ExprData::ExprMatch => { - let scrut = match_scrutinee(body.clone()); -let scrut_is_descent = expr_contains_descent(&scrut, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si); -let scrut_is_param = match (*scrut.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let sname = expr_var_name_at(scrut.clone(), si.clone()); -((sname.clone().as_str() == param_name.clone().as_str()) || set_has(vars.clone(), sname.clone())) -}, - _ => false, -}; -let with_patterns = if (scrut_is_descent.clone() || scrut_is_param) { - match_arm_nodes(body.clone()).iter().cloned().fold(vars.clone(), |acc: Rc>, arm_node: Rc| match (*arm_pattern(arm_node.clone())).clone() { - MatchPattern::VariantPattern { field_bindings: bindings, .. } => bindings.clone().iter().cloned().fold(acc.clone(), |inner: Rc>, fb: Rc| collect_field_binding_names(fb.clone(), inner)), - MatchPattern::Bind { name: binding_name, .. } => if scrut_is_descent.clone() { - v2_rt::rc_map_insert(acc.clone(), binding_name.clone(), true) + ExprData::ExprLet => { + let val = let_value(body.clone()); + let is_direct_descent = ((check_child.clone() + && is_child_descent_expr(&val, ¶m_name, &vars, &si)) + || (check_list.clone() + && is_list_shrink_expr(&val, param_name.clone(), si.clone()))); + let is_descent_var = match (*val.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + set_has(vars.clone(), expr_var_name_at(val.clone(), si.clone())) + } + _ => false, + }; + let is_option_descent = is_if_option_descent( + &val, + param_name.clone(), + vars.clone(), + check_child.clone(), + check_list.clone(), + &si, + ); + let is_match_descent = is_match_option_descent( + &val, + ¶m_name, + vars.clone(), + check_child.clone(), + check_list.clone(), + &si, + ); + let is_wrapped_descent = if is_tree_size_preserving_wrapper(&val, si.clone()) { + { + let inner = wrapper_inner_arg(val.clone()); + let inner_is_descent = ((check_child.clone() + && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) + || (check_list.clone() + && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); + let inner_is_var = match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + set_has(vars.clone(), expr_var_name_at(inner.clone(), si.clone())) + } + _ => false, + }; + (inner_is_descent.clone() || inner_is_var.clone()) + } } else { - acc.clone() + false + }; + let is_extraction_descent = if is_sub_value_extractor(&val, si.clone()) { + { + let inner = extractor_inner_arg(val.clone()); + let inner_is_descent = ((check_child.clone() + && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) + || (check_list.clone() + && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); + let inner_is_var = match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + set_has(vars.clone(), expr_var_name_at(inner.clone(), si.clone())) + } + _ => false, + }; + let inner_is_param = match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + (expr_var_name_at(inner.clone(), si.clone()).as_str() + == param_name.clone().as_str()) + } + _ => false, + }; + ((inner_is_descent.clone() || inner_is_var.clone()) || inner_is_param) + } + } else { + false + }; + let is_children_list = match (*val.expr_data.clone()).clone() { + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(val.clone()); + let field = field_access_field_at(val.clone(), si.clone()); + (is_children_list_field(field) + && match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at(base.clone(), si.clone()); + ((bname.clone().as_str() == param_name.clone().as_str()) + || set_has(vars.clone(), bname.clone())) + } + _ => false, + }) + } + _ => false, + }; + let is_passthrough_descent = if is_list_passthrough_call(val.clone(), si.clone()) { + match list_passthrough_inner_arg(val.clone(), si.clone()) { + Some(inner) => { + (((check_child.clone() + && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) + || (check_list.clone() + && is_list_shrink_expr( + &inner, + param_name.clone(), + si.clone(), + ))) + || match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has( + vars.clone(), + expr_var_name_at(inner.clone(), si.clone()), + ), + _ => false, + }) + } + None => false, + } + } else { + false + }; + let is_consuming_helper = (check_list.clone() + && is_tokens_consuming_call(&val, param_name.clone(), vars.clone(), &si)); + let val_is_descent = ((((((((is_direct_descent || is_descent_var) + || is_option_descent) + || is_match_descent) + || is_wrapped_descent) + || is_extraction_descent) + || is_children_list) + || is_passthrough_descent) + || is_consuming_helper); + let next_vars = if val_is_descent { + v2_rt::rc_map_insert( + vars.clone(), + let_binding_name_at(body.clone(), si.clone()), + true, + ) + } else { + vars.clone() + }; + match let_body(body.clone()) { + Some(b) => collect_descent_vars( + &b, + ¶m_name, + &next_vars, + check_child.clone(), + check_list.clone(), + &si, + ), + None => next_vars, + } + } + ExprData::ExprMatch => { + let scrut = match_scrutinee(body.clone()); + let scrut_is_descent = expr_contains_descent( + &scrut, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + ); + let scrut_is_param = match (*scrut.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let sname = expr_var_name_at(scrut.clone(), si.clone()); + ((sname.clone().as_str() == param_name.clone().as_str()) + || set_has(vars.clone(), sname.clone())) + } + _ => false, + }; + let with_patterns = if (scrut_is_descent.clone() || scrut_is_param) { + match_arm_nodes(body.clone()).iter().cloned().fold( + vars.clone(), + |acc: Rc>, arm_node: Rc| match (*arm_pattern( + arm_node.clone(), + )) + .clone() + { + MatchPattern::VariantPattern { + field_bindings: bindings, + .. + } => bindings.clone().iter().cloned().fold( + acc.clone(), + |inner: Rc>, fb: Rc| { + collect_field_binding_names(fb.clone(), inner) + }, + ), + MatchPattern::Bind { + name: binding_name, .. + } => { + if scrut_is_descent.clone() { + v2_rt::rc_map_insert(acc.clone(), binding_name.clone(), true) + } else { + acc.clone() + } + } + _ => acc.clone(), + }, + ) + } else { + vars.clone() + }; + match_arm_nodes(body.clone()).iter().cloned().fold( + with_patterns.clone(), + |acc: Rc>, arm_node: Rc| { + let arm_result = collect_descent_vars( + &arm_body(&arm_node), + ¶m_name, + &with_patterns, + check_child.clone(), + check_list.clone(), + &si, + ); + v2_rt::rc_map_merge(acc, arm_result.clone()) + }, + ) + } + ExprData::ExprIf => { + let then_vars = collect_descent_vars( + &if_then_branch(body.clone()), + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + ); + let else_vars = match if_else_branch(body.clone()) { + Some(eb) => collect_descent_vars( + &eb, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + ), + None => vars.clone(), + }; + v2_rt::rc_map_merge(then_vars, else_vars) + } + ExprData::ExprBlock => body.children.clone().iter().cloned().fold( + vars.clone(), + |acc: Rc>, stmt: Rc| { + collect_descent_vars( + &stmt, + ¶m_name, + &acc, + check_child.clone(), + check_list.clone(), + &si, + ) }, - _ => acc.clone(), -}) - } else { - vars.clone() - }; -match_arm_nodes(body.clone()).iter().cloned().fold(with_patterns.clone(), |acc: Rc>, arm_node: Rc| { - let arm_result = collect_descent_vars(&arm_body(&arm_node), ¶m_name, &with_patterns, check_child.clone(), check_list.clone(), &si); -v2_rt::rc_map_merge(acc, arm_result.clone()) -}) -}, - ExprData::ExprIf => { - let then_vars = collect_descent_vars(&if_then_branch(body.clone()), ¶m_name, &vars, check_child.clone(), check_list.clone(), &si); -let else_vars = match if_else_branch(body.clone()) { - Some(eb) => collect_descent_vars(&eb, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si), - None => vars.clone(), -}; -v2_rt::rc_map_merge(then_vars, else_vars) -}, - ExprData::ExprBlock => body.children.clone().iter().cloned().fold(vars.clone(), |acc: Rc>, stmt: Rc| collect_descent_vars(&stmt, ¶m_name, &acc, check_child.clone(), check_list.clone(), &si)), - ExprData::ExprReturn => match body.children.clone().first().cloned() { - Some(inner) => collect_descent_vars(&inner, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si), - None => vars.clone(), -}, - _ => vars.clone(), -} + ), + ExprData::ExprReturn => match body.children.clone().first().cloned() { + Some(inner) => collect_descent_vars( + &inner, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + ), + None => vars.clone(), + }, + _ => vars.clone(), + } }) } -pub fn all_self_calls_descend(body: Rc, func_name: String, param_name: String, check_child: bool, check_list: bool, si: Rc>>) -> bool { - all_self_calls_descend_inc(&body, &func_name, ¶m_name, &v2_rt::rc_empty_map::(), check_child, check_list, &si) -} - -pub fn all_self_calls_descend_inc(body: &Rc, func_name: &String, param_name: &String, vars: &Rc>, check_child: bool, check_list: bool, si: &Rc>>) -> bool { +pub fn all_self_calls_descend( + body: Rc, + func_name: String, + param_name: String, + check_child: bool, + check_list: bool, + si: Rc>>, +) -> bool { + all_self_calls_descend_inc( + &body, + &func_name, + ¶m_name, + &v2_rt::rc_empty_map::(), + check_child, + check_list, + &si, + ) +} + +pub fn all_self_calls_descend_inc( + body: &Rc, + func_name: &String, + param_name: &String, + vars: &Rc>, + check_child: bool, + check_list: bool, + si: &Rc>>, +) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprLambda => true, - ExprData::ExprLet => { - let val = let_value(body.clone()); -let val_ok = all_self_calls_descend_inc(&val, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si); -let is_direct = ((check_child.clone() && is_child_descent_expr(&val, ¶m_name, &vars, &si)) || (check_list.clone() && is_list_shrink_expr(&val, param_name.clone(), si.clone()))); -let is_var = match (*val.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(val.clone(), si.clone())), - _ => false, -}; -let is_option = is_if_option_descent(&val, param_name.clone(), vars.clone(), check_child.clone(), check_list.clone(), &si); -let is_children_list = match (*val.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(val.clone()); -let field = field_access_field_at(val.clone(), si.clone()); -(is_children_list_field(field) && match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at(base.clone(), si.clone()); -((bname.clone().as_str() == param_name.clone().as_str()) || set_has(vars.clone(), bname.clone())) -}, - _ => false, -}) -}, - _ => false, -}; -let next_vars = if (((is_direct || is_var) || is_option) || is_children_list) { - v2_rt::rc_map_insert(vars.clone(), let_binding_name_at(body.clone(), si.clone()), true) - } else { - vars.clone() - }; -let body_ok = match let_body(body.clone()) { - Some(b) => all_self_calls_descend_inc(&b, &func_name, ¶m_name, &next_vars, check_child.clone(), check_list.clone(), &si), - None => true, -}; -(val_ok && body_ok) -}, - ExprData::ExprMatch => { - let scrut = match_scrutinee(body.clone()); -let scrut_ok = all_self_calls_descend_inc(&scrut, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si); -let scrut_is_descent = expr_contains_descent(&scrut, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si); -let scrut_is_param = match (*scrut.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let sname = expr_var_name_at(scrut.clone(), si.clone()); -((sname.clone().as_str() == param_name.clone().as_str()) || set_has(vars.clone(), sname.clone())) -}, - _ => false, -}; -let arms_ok = { let mut __all = true; for arm_node in match_arm_nodes(body.clone()).iter().cloned() { if !({ - let arm_vars = if (scrut_is_descent.clone() || scrut_is_param.clone()) { - match (*arm_pattern(arm_node.clone())).clone() { - MatchPattern::VariantPattern { field_bindings: bindings, .. } => bindings.clone().iter().cloned().fold(vars.clone(), |inner: Rc>, fb: Rc| collect_field_binding_names(fb.clone(), inner)), - MatchPattern::Bind { name: binding_name, .. } => if scrut_is_descent.clone() { - v2_rt::rc_map_insert(vars.clone(), binding_name.clone(), true) - } else { - vars.clone() - }, - _ => vars.clone(), -} + ExprData::ExprLambda => true, + ExprData::ExprLet => { + let val = let_value(body.clone()); + let val_ok = all_self_calls_descend_inc( + &val, + &func_name, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + ); + let is_direct = ((check_child.clone() + && is_child_descent_expr(&val, ¶m_name, &vars, &si)) + || (check_list.clone() + && is_list_shrink_expr(&val, param_name.clone(), si.clone()))); + let is_var = match (*val.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + set_has(vars.clone(), expr_var_name_at(val.clone(), si.clone())) + } + _ => false, + }; + let is_option = is_if_option_descent( + &val, + param_name.clone(), + vars.clone(), + check_child.clone(), + check_list.clone(), + &si, + ); + let is_children_list = match (*val.expr_data.clone()).clone() { + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(val.clone()); + let field = field_access_field_at(val.clone(), si.clone()); + (is_children_list_field(field) + && match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at(base.clone(), si.clone()); + ((bname.clone().as_str() == param_name.clone().as_str()) + || set_has(vars.clone(), bname.clone())) + } + _ => false, + }) + } + _ => false, + }; + let next_vars = if (((is_direct || is_var) || is_option) || is_children_list) { + v2_rt::rc_map_insert( + vars.clone(), + let_binding_name_at(body.clone(), si.clone()), + true, + ) } else { vars.clone() }; -all_self_calls_descend_inc(&arm_body(&arm_node), &func_name, ¶m_name, &arm_vars, check_child.clone(), check_list.clone(), &si) -}) { __all = false; break; } } __all }; -(scrut_ok && arms_ok) -}, - ExprData::ExprIf => { - let cond_ok = all_self_calls_descend_inc(&if_condition(body.clone()), &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si); -let then_ok = all_self_calls_descend_inc(&if_then_branch(body.clone()), &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si); -let else_ok = match if_else_branch(body.clone()) { - Some(eb) => all_self_calls_descend_inc(&eb, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si), - None => true, -}; -((cond_ok && then_ok) && else_ok) -}, - ExprData::ExprBlock => { - let result = body.children.clone().iter().cloned().fold(Rc::new(DescentCheckAcc { - ok: true, - vars: vars.clone(), -}), |acc: Rc, stmt: Rc| if (acc.ok.clone() == false) { - acc.clone() - } else { - { - let stmt_ok = all_self_calls_descend_inc(&stmt, &func_name, ¶m_name, &acc.vars.clone(), check_child.clone(), check_list.clone(), &si); -let next_vars = collect_descent_vars(&stmt, ¶m_name, &acc.vars.clone(), check_child.clone(), check_list.clone(), &si); -Rc::new(DescentCheckAcc { - ok: stmt_ok.clone(), - vars: next_vars.clone(), -}) -} - }); -result.ok.clone() -}, - ExprData::ExprCall { .. } => { - let callee = expr_call_func_at(body.clone(), si.clone()); -let own_ok = if (callee.as_str() == func_name.clone().as_str()) { - { let mut __found = false; for arg_node in body.children.clone().iter().cloned() { if { - let targets_param = (arg_name_at(arg_node.clone(), si.clone()).as_deref() == Some(param_name.clone()).as_deref()); -if (targets_param.clone() == false) { - false - } else { - is_descent_arg(&arg_value(&arg_node), ¶m_name, vars.clone(), check_child.clone(), check_list.clone(), &si) + let body_ok = match let_body(body.clone()) { + Some(b) => all_self_calls_descend_inc( + &b, + &func_name, + ¶m_name, + &next_vars, + check_child.clone(), + check_list.clone(), + &si, + ), + None => true, + }; + (val_ok && body_ok) + } + ExprData::ExprMatch => { + let scrut = match_scrutinee(body.clone()); + let scrut_ok = all_self_calls_descend_inc( + &scrut, + &func_name, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + ); + let scrut_is_descent = expr_contains_descent( + &scrut, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + ); + let scrut_is_param = match (*scrut.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let sname = expr_var_name_at(scrut.clone(), si.clone()); + ((sname.clone().as_str() == param_name.clone().as_str()) + || set_has(vars.clone(), sname.clone())) } -} { __found = true; break; } } __found } - } else { - true - }; -(own_ok && { let mut __all = true; for child in body.children.clone().iter().cloned() { if !(all_self_calls_descend_inc(&child, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si)) { __all = false; break; } } __all }) -}, - ExprData::ExprMethodCall { method_semantics: ms, .. } => { - let receiver = method_receiver(body.clone()); -let is_iter = is_algebra_iteration_method(ms.clone()); -let is_struct = is_structural_children(&receiver, ¶m_name, &vars, &si); -if (is_iter && is_struct) { - { - let recv_ok = all_self_calls_descend_inc(&receiver, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si); -let args_ok = { let mut __all = true; for arg_node in method_arg_nodes(body.clone()).iter().cloned() { if !({ - let arg_val = arg_value(&arg_node); -match (*arg_val.expr_data.clone()).clone() { - ExprData::ExprLambda => match iteration_element_name(ms.clone(), arg_val.clone(), si.clone()) { - Some(iter_name) => { - let ext_vars = v2_rt::rc_map_insert(vars.clone(), iter_name.clone(), true); -all_self_calls_descend_inc(&lambda_body(arg_val.clone()), &func_name, ¶m_name, &ext_vars, check_child.clone(), check_list.clone(), &si) -}, - None => true, -}, - _ => all_self_calls_descend_inc(&arg_val, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si), -} -}) { __all = false; break; } } __all }; -(recv_ok && args_ok) -} - } else { - { let mut __all = true; for child in body.children.clone().iter().cloned() { if !(all_self_calls_descend_inc(&child, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si)) { __all = false; break; } } __all } + _ => false, + }; + let arms_ok = { + let mut __all = true; + for arm_node in match_arm_nodes(body.clone()).iter().cloned() { + if !({ + let arm_vars = if (scrut_is_descent.clone() || scrut_is_param.clone()) { + match (*arm_pattern(arm_node.clone())).clone() { + MatchPattern::VariantPattern { + field_bindings: bindings, + .. + } => bindings.clone().iter().cloned().fold( + vars.clone(), + |inner: Rc>, fb: Rc| { + collect_field_binding_names(fb.clone(), inner) + }, + ), + MatchPattern::Bind { + name: binding_name, .. + } => { + if scrut_is_descent.clone() { + v2_rt::rc_map_insert( + vars.clone(), + binding_name.clone(), + true, + ) + } else { + vars.clone() + } + } + _ => vars.clone(), + } + } else { + vars.clone() + }; + all_self_calls_descend_inc( + &arm_body(&arm_node), + &func_name, + ¶m_name, + &arm_vars, + check_child.clone(), + check_list.clone(), + &si, + ) + }) { + __all = false; + break; + } + } + __all + }; + (scrut_ok && arms_ok) } -}, - _ => { let mut __all = true; for child in body.children.clone().iter().cloned() { if !(all_self_calls_descend_inc(&child, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si)) { __all = false; break; } } __all }, -} + ExprData::ExprIf => { + let cond_ok = all_self_calls_descend_inc( + &if_condition(body.clone()), + &func_name, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + ); + let then_ok = all_self_calls_descend_inc( + &if_then_branch(body.clone()), + &func_name, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + ); + let else_ok = match if_else_branch(body.clone()) { + Some(eb) => all_self_calls_descend_inc( + &eb, + &func_name, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + ), + None => true, + }; + ((cond_ok && then_ok) && else_ok) + } + ExprData::ExprBlock => { + let result = body.children.clone().iter().cloned().fold( + Rc::new(DescentCheckAcc { + ok: true, + vars: vars.clone(), + }), + |acc: Rc, stmt: Rc| { + if (acc.ok.clone() == false) { + acc.clone() + } else { + { + let stmt_ok = all_self_calls_descend_inc( + &stmt, + &func_name, + ¶m_name, + &acc.vars.clone(), + check_child.clone(), + check_list.clone(), + &si, + ); + let next_vars = collect_descent_vars( + &stmt, + ¶m_name, + &acc.vars.clone(), + check_child.clone(), + check_list.clone(), + &si, + ); + Rc::new(DescentCheckAcc { + ok: stmt_ok.clone(), + vars: next_vars.clone(), + }) + } + } + }, + ); + result.ok.clone() + } + ExprData::ExprCall { .. } => { + let callee = expr_call_func_at(body.clone(), si.clone()); + let own_ok = if (callee.as_str() == func_name.clone().as_str()) { + { + let mut __found = false; + for arg_node in body.children.clone().iter().cloned() { + if { + let targets_param = (arg_name_at(arg_node.clone(), si.clone()) + .as_deref() + == Some(param_name.clone()).as_deref()); + if (targets_param.clone() == false) { + false + } else { + is_descent_arg( + &arg_value(&arg_node), + ¶m_name, + vars.clone(), + check_child.clone(), + check_list.clone(), + &si, + ) + } + } { + __found = true; + break; + } + } + __found + } + } else { + true + }; + (own_ok && { + let mut __all = true; + for child in body.children.clone().iter().cloned() { + if !(all_self_calls_descend_inc( + &child, + &func_name, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + )) { + __all = false; + break; + } + } + __all + }) + } + ExprData::ExprMethodCall { + method_semantics: ms, + .. + } => { + let receiver = method_receiver(body.clone()); + let is_iter = is_algebra_iteration_method(ms.clone()); + let is_struct = is_structural_children(&receiver, ¶m_name, &vars, &si); + if (is_iter && is_struct) { + { + let recv_ok = all_self_calls_descend_inc( + &receiver, + &func_name, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + ); + let args_ok = { + let mut __all = true; + for arg_node in method_arg_nodes(body.clone()).iter().cloned() { + if !({ + let arg_val = arg_value(&arg_node); + match (*arg_val.expr_data.clone()).clone() { + ExprData::ExprLambda => match iteration_element_name( + ms.clone(), + arg_val.clone(), + si.clone(), + ) { + Some(iter_name) => { + let ext_vars = v2_rt::rc_map_insert( + vars.clone(), + iter_name.clone(), + true, + ); + all_self_calls_descend_inc( + &lambda_body(arg_val.clone()), + &func_name, + ¶m_name, + &ext_vars, + check_child.clone(), + check_list.clone(), + &si, + ) + } + None => true, + }, + _ => all_self_calls_descend_inc( + &arg_val, + &func_name, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + ), + } + }) { + __all = false; + break; + } + } + __all + }; + (recv_ok && args_ok) + } + } else { + { + let mut __all = true; + for child in body.children.clone().iter().cloned() { + if !(all_self_calls_descend_inc( + &child, + &func_name, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + )) { + __all = false; + break; + } + } + __all + } + } + } + _ => { + let mut __all = true; + for child in body.children.clone().iter().cloned() { + if !(all_self_calls_descend_inc( + &child, + &func_name, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + )) { + __all = false; + break; + } + } + __all + } + } }) } pub fn unwrap_to_match(mut body: Rc) -> Option> { loop { match (*body.expr_data.clone()).clone() { - ExprData::ExprMatch => { break Some(body.clone()); }, - ExprData::ExprLet => { match let_body(body.clone()) { - Some(b) => { { - let __tco_0 = b.clone(); -body = __tco_0; -continue; -} }, - None => { break None; }, -} }, - ExprData::ExprBlock => { match body.children.clone().last().cloned() { - Some(last_stmt) => { { - let __tco_0 = last_stmt.clone(); -body = __tco_0; -continue; -} }, - None => { break None; }, -} }, - _ => { break None; }, -} -} -} - -pub fn matches_on_sub_value_field(body: Rc, param_name: String, si: &Rc>>) -> bool { - match unwrap_to_match(body) { - Some(m) => { - let scrut = match_scrutinee(m.clone()); -match (*scrut.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(scrut.clone()); -let field = field_access_field_at(scrut.clone(), si.clone()); -(is_sub_value_field(field) && match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => (expr_var_name_at(base.clone(), si.clone()).as_str() == param_name.as_str()), - _ => false, -}) -}, - _ => false, -} -}, - None => false, + ExprData::ExprMatch => { + break Some(body.clone()); + } + ExprData::ExprLet => match let_body(body.clone()) { + Some(b) => { + let __tco_0 = b.clone(); + body = __tco_0; + continue; + } + None => { + break None; + } + }, + ExprData::ExprBlock => match body.children.clone().last().cloned() { + Some(last_stmt) => { + let __tco_0 = last_stmt.clone(); + body = __tco_0; + continue; + } + None => { + break None; + } + }, + _ => { + break None; + } + } + } } + +pub fn matches_on_sub_value_field( + body: Rc, + param_name: String, + si: &Rc>>, +) -> bool { + match unwrap_to_match(body) { + Some(m) => { + let scrut = match_scrutinee(m.clone()); + match (*scrut.expr_data.clone()).clone() { + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(scrut.clone()); + let field = field_access_field_at(scrut.clone(), si.clone()); + (is_sub_value_field(field) + && match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + (expr_var_name_at(base.clone(), si.clone()).as_str() + == param_name.as_str()) + } + _ => false, + }) + } + _ => false, + } + } + None => false, + } } -pub fn is_container_child_descent(body: Rc, func_name: String, params: Rc>>, si: Rc>>) -> bool { - { let mut __found = false; for p in params.iter().cloned() { if { - let pname = param_node_name_at(p.clone(), si.clone()); -(matches_on_sub_value_field(body.clone(), pname.clone(), &si) && all_self_calls_descend(body.clone(), func_name.clone(), pname.clone(), true, false, si.clone())) -} { __found = true; break; } } __found } +pub fn is_container_child_descent( + body: Rc, + func_name: String, + params: Rc>>, + si: Rc>>, +) -> bool { + { + let mut __found = false; + for p in params.iter().cloned() { + if { + let pname = param_node_name_at(p.clone(), si.clone()); + (matches_on_sub_value_field(body.clone(), pname.clone(), &si) + && all_self_calls_descend( + body.clone(), + func_name.clone(), + pname.clone(), + true, + false, + si.clone(), + )) + } { + __found = true; + break; + } + } + __found + } } -pub fn is_list_shrinkage_descent(body: Rc, func_name: String, params: Rc>>, si: Rc>>) -> bool { - { let mut __found = false; for p in params.iter().cloned() { if { - let pname = param_node_name_at(p.clone(), si.clone()); -all_self_calls_descend(body.clone(), func_name.clone(), pname.clone(), false, true, si.clone()) -} { __found = true; break; } } __found } +pub fn is_list_shrinkage_descent( + body: Rc, + func_name: String, + params: Rc>>, + si: Rc>>, +) -> bool { + { + let mut __found = false; + for p in params.iter().cloned() { + if { + let pname = param_node_name_at(p.clone(), si.clone()); + all_self_calls_descend( + body.clone(), + func_name.clone(), + pname.clone(), + false, + true, + si.clone(), + ) + } { + __found = true; + break; + } + } + __found + } } -pub fn is_arithmetic_descent_expr(expr: &Rc, param_name: String, si: Rc>>) -> bool { +pub fn is_arithmetic_descent_expr( + expr: &Rc, + param_name: String, + si: Rc>>, +) -> bool { match (*expr.expr_data.clone()).clone() { - ExprData::ExprBinOp { op: BinOp::Sub, .. } => { - let left = binop_left(expr.clone()); -let right = binop_right(expr.clone()); -match (*left.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => ((expr_var_name_at(left.clone(), si).as_str() == param_name.as_str()) && match (*right.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: n, .. } = value.as_ref() else { unreachable!() }; (n.clone() > 0) }, - _ => false, -}), - _ => false, -} -}, - _ => false, -} + ExprData::ExprBinOp { op: BinOp::Sub, .. } => { + let left = binop_left(expr.clone()); + let right = binop_right(expr.clone()); + match (*left.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + ((expr_var_name_at(left.clone(), si).as_str() == param_name.as_str()) + && match (*right.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitInt { value: n, .. } = value.as_ref() else { + unreachable!() + }; + (n.clone() > 0) + } + _ => false, + }) + } + _ => false, + } + } + _ => false, + } } -pub fn classify_self_call_evidence(arg_expr: &Rc, param_name: &String, descent_vars: &Rc>, check_child: bool, check_list: bool, si: &Rc>>) -> DescentEvidence { +pub fn classify_self_call_evidence( + arg_expr: &Rc, + param_name: &String, + descent_vars: &Rc>, + check_child: bool, + check_list: bool, + si: &Rc>>, +) -> DescentEvidence { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - if (check_child.clone() && is_child_descent_expr(&arg_expr, ¶m_name, &descent_vars, &si)) { + if (check_child.clone() + && is_child_descent_expr(&arg_expr, ¶m_name, &descent_vars, &si)) + { DescentEvidence::Strict } else { - if (check_list.clone() && is_list_shrink_expr(&arg_expr, param_name.clone(), si.clone())) { + if (check_list.clone() + && is_list_shrink_expr(&arg_expr, param_name.clone(), si.clone())) + { DescentEvidence::Strict } else { - if (((check_child.clone() == false) && (check_list.clone() == false)) && is_arithmetic_descent_expr(&arg_expr, param_name.clone(), si.clone())) { + if (((check_child.clone() == false) && (check_list.clone() == false)) + && is_arithmetic_descent_expr(&arg_expr, param_name.clone(), si.clone())) + { DescentEvidence::Strict } else { match (*arg_expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let vname = expr_var_name_at(arg_expr.clone(), si.clone()); -if set_has(descent_vars.clone(), vname.clone()) { - DescentEvidence::Strict - } else { - if (vname.clone().as_str() == param_name.clone().as_str()) { - DescentEvidence::NonIncreasing + ExprData::ExprVar { .. } => { + let vname = expr_var_name_at(arg_expr.clone(), si.clone()); + if set_has(descent_vars.clone(), vname.clone()) { + DescentEvidence::Strict } else { - DescentEvidence::DescentUnknown + if (vname.clone().as_str() == param_name.clone().as_str()) { + DescentEvidence::NonIncreasing + } else { + DescentEvidence::DescentUnknown + } } } -}, - ExprData::ExprCall { .. } => if is_tree_size_preserving_wrapper(&arg_expr, si.clone()) { - classify_self_call_evidence(&wrapper_inner_arg(arg_expr.clone()), ¶m_name, &descent_vars, check_child.clone(), check_list.clone(), &si) - } else { - if is_sub_value_extractor(&arg_expr, si.clone()) { - { - let inner_ev = classify_self_call_evidence(&extractor_inner_arg(arg_expr.clone()), ¶m_name, &descent_vars, check_child.clone(), check_list.clone(), &si); -match inner_ev.clone() { - DescentEvidence::NonIncreasing => DescentEvidence::Strict, - _ => inner_ev.clone(), -} -} - } else { - if is_list_passthrough_call(arg_expr.clone(), si.clone()) { - match list_passthrough_inner_arg(arg_expr.clone(), si.clone()) { - Some(inner) => classify_self_call_evidence(&inner, ¶m_name, &descent_vars, check_child.clone(), check_list.clone(), &si), - None => DescentEvidence::DescentUnknown, -} + ExprData::ExprCall { .. } => { + if is_tree_size_preserving_wrapper(&arg_expr, si.clone()) { + classify_self_call_evidence( + &wrapper_inner_arg(arg_expr.clone()), + ¶m_name, + &descent_vars, + check_child.clone(), + check_list.clone(), + &si, + ) } else { - DescentEvidence::DescentUnknown + if is_sub_value_extractor(&arg_expr, si.clone()) { + { + let inner_ev = classify_self_call_evidence( + &extractor_inner_arg(arg_expr.clone()), + ¶m_name, + &descent_vars, + check_child.clone(), + check_list.clone(), + &si, + ); + match inner_ev.clone() { + DescentEvidence::NonIncreasing => { + DescentEvidence::Strict + } + _ => inner_ev.clone(), + } + } + } else { + if is_list_passthrough_call(arg_expr.clone(), si.clone()) { + match list_passthrough_inner_arg( + arg_expr.clone(), + si.clone(), + ) { + Some(inner) => classify_self_call_evidence( + &inner, + ¶m_name, + &descent_vars, + check_child.clone(), + check_list.clone(), + &si, + ), + None => DescentEvidence::DescentUnknown, + } + } else { + DescentEvidence::DescentUnknown + } + } } } - }, - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(arg_expr.clone()); -match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at(base.clone(), si.clone()); -if (set_has(descent_vars.clone(), bname.clone()) || (bname.clone().as_str() == param_name.clone().as_str())) { - DescentEvidence::Strict - } else { - { - let field = field_access_field_at(arg_expr.clone(), si.clone()); -if (field.as_str() == param_name.clone().as_str()) { - DescentEvidence::NonIncreasing + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(arg_expr.clone()); + match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at(base.clone(), si.clone()); + if (set_has(descent_vars.clone(), bname.clone()) + || (bname.clone().as_str() == param_name.clone().as_str())) + { + DescentEvidence::Strict } else { - DescentEvidence::DescentUnknown + { + let field = + field_access_field_at(arg_expr.clone(), si.clone()); + if (field.as_str() == param_name.clone().as_str()) { + DescentEvidence::NonIncreasing + } else { + DescentEvidence::DescentUnknown + } + } } -} + } + _ => DescentEvidence::DescentUnknown, } -}, - _ => DescentEvidence::DescentUnknown, -} -}, - ExprData::ExprMethodCall { method_semantics: ms, .. } => if is_generalized_shrink(&arg_expr, si.clone()) { - { - let recv = method_receiver(arg_expr.clone()); -let recv_ev = classify_self_call_evidence(&recv, ¶m_name, &descent_vars, check_child.clone(), check_list.clone(), &si); -match recv_ev { - DescentEvidence::Strict => DescentEvidence::Strict, - DescentEvidence::NonIncreasing => DescentEvidence::Strict, - DescentEvidence::DescentUnknown => DescentEvidence::DescentUnknown, -} -} - } else { - DescentEvidence::DescentUnknown - }, - _ => DescentEvidence::DescentUnknown, -} + } + ExprData::ExprMethodCall { + method_semantics: ms, + .. + } => { + if is_generalized_shrink(&arg_expr, si.clone()) { + { + let recv = method_receiver(arg_expr.clone()); + let recv_ev = classify_self_call_evidence( + &recv, + ¶m_name, + &descent_vars, + check_child.clone(), + check_list.clone(), + &si, + ); + match recv_ev { + DescentEvidence::Strict => DescentEvidence::Strict, + DescentEvidence::NonIncreasing => DescentEvidence::Strict, + DescentEvidence::DescentUnknown => { + DescentEvidence::DescentUnknown + } + } + } + } else { + DescentEvidence::DescentUnknown + } + } + _ => DescentEvidence::DescentUnknown, + } } } } }) } -pub fn try_dimension_for_param(body: Rc, func_name: String, param_name: String, check_child: bool, check_list: bool, si: Rc>>) -> Option { - collect_evidence_incremental(&body, &func_name, ¶m_name, &v2_rt::rc_empty_map::(), check_child, check_list, false, &si) -} - -pub fn try_branching_dimension_for_param(body: Rc, func_name: String, param_name: String, check_child: bool, check_list: bool, si: Rc>>) -> Option { - collect_evidence_incremental(&body, &func_name, ¶m_name, &v2_rt::rc_empty_map::(), check_child, check_list, true, &si) -} - -pub fn merge_optional_evidence(a: Option, b: Option) -> Option { +pub fn try_dimension_for_param( + body: Rc, + func_name: String, + param_name: String, + check_child: bool, + check_list: bool, + si: Rc>>, +) -> Option { + collect_evidence_incremental( + &body, + &func_name, + ¶m_name, + &v2_rt::rc_empty_map::(), + check_child, + check_list, + false, + &si, + ) +} + +pub fn try_branching_dimension_for_param( + body: Rc, + func_name: String, + param_name: String, + check_child: bool, + check_list: bool, + si: Rc>>, +) -> Option { + collect_evidence_incremental( + &body, + &func_name, + ¶m_name, + &v2_rt::rc_empty_map::(), + check_child, + check_list, + true, + &si, + ) +} + +pub fn merge_optional_evidence( + a: Option, + b: Option, +) -> Option { optional_evidence_meet(a, b) } - -pub fn collect_evidence_incremental(body: &Rc, func_name: &String, param_name: &String, vars: &Rc>, check_child: bool, check_list: bool, branching_only: bool, si: &Rc>>) -> Option { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - match (*body.expr_data.clone()).clone() { - ExprData::ExprLambda => None, - ExprData::ExprLet => { - let val = let_value(body.clone()); -let val_ev = collect_evidence_incremental(&val, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si); -let is_direct = ((check_child.clone() && is_child_descent_expr(&val, ¶m_name, &vars, &si)) || (check_list.clone() && is_list_shrink_expr(&val, param_name.clone(), si.clone()))); -let is_var = match (*val.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(val.clone(), si.clone())), - _ => false, -}; -let is_option = is_if_option_descent(&val, param_name.clone(), vars.clone(), check_child.clone(), check_list.clone(), &si); -let is_match_descent = is_match_option_descent(&val, ¶m_name, vars.clone(), check_child.clone(), check_list.clone(), &si); -let is_wrapped = if is_tree_size_preserving_wrapper(&val, si.clone()) { - { - let inner = wrapper_inner_arg(val.clone()); -let inner_d = ((check_child.clone() && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) || (check_list.clone() && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); -let inner_v = match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(inner.clone(), si.clone())), - _ => false, -}; -(inner_d.clone() || inner_v.clone()) -} - } else { - false - }; -let is_extraction = if is_sub_value_extractor(&val, si.clone()) { - { - let inner = extractor_inner_arg(val.clone()); -let inner_d = ((check_child.clone() && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) || (check_list.clone() && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); -let inner_v = match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(inner.clone(), si.clone())), - _ => false, -}; -let inner_p = match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => (expr_var_name_at(inner.clone(), si.clone()).as_str() == param_name.clone().as_str()), - _ => false, -}; -((inner_d.clone() || inner_v.clone()) || inner_p) -} - } else { - false - }; -let is_children_list = match (*val.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(val.clone()); -let field = field_access_field_at(val.clone(), si.clone()); -(is_children_list_field(field) && match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at(base.clone(), si.clone()); -((bname.clone().as_str() == param_name.clone().as_str()) || set_has(vars.clone(), bname.clone())) -}, - _ => false, -}) -}, - _ => false, -}; -let is_passthrough = if is_list_passthrough_call(val.clone(), si.clone()) { - match list_passthrough_inner_arg(val.clone(), si.clone()) { - Some(inner) => (((check_child.clone() && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) || (check_list.clone() && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))) || match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has(vars.clone(), expr_var_name_at(inner.clone(), si.clone())), - _ => false, -}), - None => false, -} - } else { - false - }; -let is_consuming_helper = (check_list.clone() && is_tokens_consuming_call(&val, param_name.clone(), vars.clone(), &si)); -let next_vars = if ((((((((is_direct || is_var) || is_option) || is_match_descent) || is_wrapped) || is_extraction) || is_children_list) || is_passthrough) || is_consuming_helper) { - v2_rt::rc_map_insert(vars.clone(), let_binding_name_at(body.clone(), si.clone()), true) - } else { - vars.clone() - }; -let body_ev = match let_body(body.clone()) { - Some(b) => collect_evidence_incremental(&b, &func_name, ¶m_name, &next_vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si), - None => None, -}; -merge_optional_evidence(val_ev, body_ev) -}, - ExprData::ExprMatch => { - let scrut = match_scrutinee(body.clone()); -let scrut_ev = collect_evidence_incremental(&scrut, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si); -let scrut_is_descent = expr_contains_descent(&scrut, ¶m_name, &vars, check_child.clone(), check_list.clone(), &si); -let scrut_is_param = match (*scrut.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let sname = expr_var_name_at(scrut.clone(), si.clone()); -((sname.clone().as_str() == param_name.clone().as_str()) || set_has(vars.clone(), sname.clone())) -}, - _ => false, -}; -let arms_ev = match_arm_nodes(body.clone()).iter().cloned().fold(None, |acc: _, arm_node: Rc| { - let is_base_case = if branching_only.clone() { - (max_path_self_calls(arm_body(&arm_node), func_name.clone(), si.clone()) == 0) + +pub fn collect_evidence_incremental( + body: &Rc, + func_name: &String, + param_name: &String, + vars: &Rc>, + check_child: bool, + check_list: bool, + branching_only: bool, + si: &Rc>>, +) -> Option { + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { + match (*body.expr_data.clone()).clone() { + ExprData::ExprLambda => None, + ExprData::ExprLet => { + let val = let_value(body.clone()); + let val_ev = collect_evidence_incremental( + &val, + &func_name, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + branching_only.clone(), + &si, + ); + let is_direct = ((check_child.clone() + && is_child_descent_expr(&val, ¶m_name, &vars, &si)) + || (check_list.clone() + && is_list_shrink_expr(&val, param_name.clone(), si.clone()))); + let is_var = match (*val.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + set_has(vars.clone(), expr_var_name_at(val.clone(), si.clone())) + } + _ => false, + }; + let is_option = is_if_option_descent( + &val, + param_name.clone(), + vars.clone(), + check_child.clone(), + check_list.clone(), + &si, + ); + let is_match_descent = is_match_option_descent( + &val, + ¶m_name, + vars.clone(), + check_child.clone(), + check_list.clone(), + &si, + ); + let is_wrapped = if is_tree_size_preserving_wrapper(&val, si.clone()) { + { + let inner = wrapper_inner_arg(val.clone()); + let inner_d = ((check_child.clone() + && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) + || (check_list.clone() + && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); + let inner_v = match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + set_has(vars.clone(), expr_var_name_at(inner.clone(), si.clone())) + } + _ => false, + }; + (inner_d.clone() || inner_v.clone()) + } } else { false }; -if is_base_case.clone() { - acc.clone() - } else { + let is_extraction = if is_sub_value_extractor(&val, si.clone()) { { - let arm_vars = if (scrut_is_descent.clone() || scrut_is_param.clone()) { - match (*arm_pattern(arm_node.clone())).clone() { - MatchPattern::VariantPattern { field_bindings: bindings, .. } => bindings.clone().iter().cloned().fold(vars.clone(), |inner: Rc>, fb: Rc| collect_field_binding_names(fb.clone(), inner)), - MatchPattern::Bind { name: binding_name, .. } => if scrut_is_descent.clone() { - v2_rt::rc_map_insert(vars.clone(), binding_name.clone(), true) - } else { - vars.clone() - }, - _ => vars.clone(), -} - } else { - vars.clone() + let inner = extractor_inner_arg(val.clone()); + let inner_d = ((check_child.clone() + && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) + || (check_list.clone() + && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); + let inner_v = match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + set_has(vars.clone(), expr_var_name_at(inner.clone(), si.clone())) + } + _ => false, }; -let arm_ev = collect_evidence_incremental(&arm_body(&arm_node), &func_name, ¶m_name, &arm_vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si); -merge_optional_evidence(acc.clone(), arm_ev.clone()) -} - } -}); -merge_optional_evidence(scrut_ev, arms_ev) -}, - ExprData::ExprIf => { - let cond_ev = collect_evidence_incremental(&if_condition(body.clone()), &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si); -let then_branch = if_then_branch(body.clone()); -let else_opt = if_else_branch(body.clone()); -let then_path = if branching_only.clone() { - max_path_self_calls(then_branch.clone(), func_name.clone(), si.clone()) - } else { - 0 - }; -let else_path = if branching_only.clone() { - match else_opt.clone() { - Some(eb) => max_path_self_calls(eb.clone(), func_name.clone(), si.clone()), - None => 0, -} - } else { - 0 - }; -let then_ev = if (branching_only.clone() && (then_path == 0)) { - None - } else { - collect_evidence_incremental(&then_branch, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si) - }; -let else_ev = if (branching_only.clone() && (else_path == 0)) { - None - } else { - match else_opt.clone() { - Some(eb) => collect_evidence_incremental(&eb, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si), - None => None, -} - }; -merge_optional_evidence(cond_ev, merge_optional_evidence(then_ev, else_ev)) -}, - ExprData::ExprCall { .. } => { - let callee = expr_call_func_at(body.clone(), si.clone()); -let own_evidence = if (callee.as_str() == func_name.clone().as_str()) { + let inner_p = match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + (expr_var_name_at(inner.clone(), si.clone()).as_str() + == param_name.clone().as_str()) + } + _ => false, + }; + ((inner_d.clone() || inner_v.clone()) || inner_p) + } + } else { + false + }; + let is_children_list = match (*val.expr_data.clone()).clone() { + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(val.clone()); + let field = field_access_field_at(val.clone(), si.clone()); + (is_children_list_field(field) + && match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at(base.clone(), si.clone()); + ((bname.clone().as_str() == param_name.clone().as_str()) + || set_has(vars.clone(), bname.clone())) + } + _ => false, + }) + } + _ => false, + }; + let is_passthrough = if is_list_passthrough_call(val.clone(), si.clone()) { + match list_passthrough_inner_arg(val.clone(), si.clone()) { + Some(inner) => { + (((check_child.clone() + && is_child_descent_expr(&inner, ¶m_name, &vars, &si)) + || (check_list.clone() + && is_list_shrink_expr( + &inner, + param_name.clone(), + si.clone(), + ))) + || match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has( + vars.clone(), + expr_var_name_at(inner.clone(), si.clone()), + ), + _ => false, + }) + } + None => false, + } + } else { + false + }; + let is_consuming_helper = (check_list.clone() + && is_tokens_consuming_call(&val, param_name.clone(), vars.clone(), &si)); + let next_vars = if ((((((((is_direct || is_var) || is_option) + || is_match_descent) + || is_wrapped) + || is_extraction) + || is_children_list) + || is_passthrough) + || is_consuming_helper) { - let arg_evidence = body.children.clone().iter().cloned().fold(DescentEvidence::DescentUnknown, |acc: DescentEvidence, arg_node: Rc| { - let aname = arg_name_at(arg_node.clone(), si.clone()); -if (aname.clone().as_deref() == Some(param_name.clone()).as_deref()) { - classify_self_call_evidence(&arg_value(&arg_node), ¶m_name, &vars, check_child.clone(), check_list.clone(), &si) + v2_rt::rc_map_insert( + vars.clone(), + let_binding_name_at(body.clone(), si.clone()), + true, + ) + } else { + vars.clone() + }; + let body_ev = match let_body(body.clone()) { + Some(b) => collect_evidence_incremental( + &b, + &func_name, + ¶m_name, + &next_vars, + check_child.clone(), + check_list.clone(), + branching_only.clone(), + &si, + ), + None => None, + }; + merge_optional_evidence(val_ev, body_ev) + } + ExprData::ExprMatch => { + let scrut = match_scrutinee(body.clone()); + let scrut_ev = collect_evidence_incremental( + &scrut, + &func_name, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + branching_only.clone(), + &si, + ); + let scrut_is_descent = expr_contains_descent( + &scrut, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + ); + let scrut_is_param = match (*scrut.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let sname = expr_var_name_at(scrut.clone(), si.clone()); + ((sname.clone().as_str() == param_name.clone().as_str()) + || set_has(vars.clone(), sname.clone())) + } + _ => false, + }; + let arms_ev = match_arm_nodes(body.clone()).iter().cloned().fold( + None, + |acc: _, arm_node: Rc| { + let is_base_case = if branching_only.clone() { + (max_path_self_calls( + arm_body(&arm_node), + func_name.clone(), + si.clone(), + ) == 0) + } else { + false + }; + if is_base_case.clone() { + acc.clone() } else { - acc + { + let arm_vars = + if (scrut_is_descent.clone() || scrut_is_param.clone()) { + match (*arm_pattern(arm_node.clone())).clone() { + MatchPattern::VariantPattern { + field_bindings: bindings, + .. + } => bindings.clone().iter().cloned().fold( + vars.clone(), + |inner: Rc>, fb: Rc| { + collect_field_binding_names(fb.clone(), inner) + }, + ), + MatchPattern::Bind { + name: binding_name, .. + } => { + if scrut_is_descent.clone() { + v2_rt::rc_map_insert( + vars.clone(), + binding_name.clone(), + true, + ) + } else { + vars.clone() + } + } + _ => vars.clone(), + } + } else { + vars.clone() + }; + let arm_ev = collect_evidence_incremental( + &arm_body(&arm_node), + &func_name, + ¶m_name, + &arm_vars, + check_child.clone(), + check_list.clone(), + branching_only.clone(), + &si, + ); + merge_optional_evidence(acc.clone(), arm_ev.clone()) + } } -}); -Some(arg_evidence) -} - } else { - None - }; -let child_evidence = body.children.clone().iter().cloned().fold(None, |acc: _, child: Rc| { - let ce = collect_evidence_incremental(&child, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si); -merge_optional_evidence(acc.clone(), ce.clone()) -}); -merge_optional_evidence(own_evidence, child_evidence) -}, - ExprData::ExprBlock => { - let result = body.children.clone().iter().cloned().fold(Rc::new(EvidenceBlockAcc { - evidence: None, - vars: vars.clone(), -}), |acc: Rc, stmt: Rc| { - let stmt_ev = collect_evidence_incremental(&stmt, &func_name, ¶m_name, &acc.vars.clone(), check_child.clone(), check_list.clone(), branching_only.clone(), &si); -let next_vars = collect_descent_vars(&stmt, ¶m_name, &acc.vars.clone(), check_child.clone(), check_list.clone(), &si); -Rc::new(EvidenceBlockAcc { - evidence: merge_optional_evidence(acc.evidence.clone(), stmt_ev.clone()), - vars: next_vars.clone(), -}) -}); -result.evidence.clone() -}, - ExprData::ExprMethodCall { method_semantics: ms, .. } => { - let receiver = method_receiver(body.clone()); -let is_iter = is_algebra_iteration_method(ms.clone()); -let is_struct = is_structural_children(&receiver, ¶m_name, &vars, &si); -if (is_iter && is_struct) { - { - let recv_ev = collect_evidence_incremental(&receiver, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si); -let args_ev = method_arg_nodes(body.clone()).iter().cloned().fold(None, |acc: _, arg_node: Rc| { - let arg_val = arg_value(&arg_node); -let ev = match (*arg_val.expr_data.clone()).clone() { - ExprData::ExprLambda => match iteration_element_name(ms.clone(), arg_val.clone(), si.clone()) { - Some(iter_name) => { - let ext_vars = v2_rt::rc_map_insert(vars.clone(), iter_name.clone(), true); -collect_evidence_incremental(&lambda_body(arg_val.clone()), &func_name, ¶m_name, &ext_vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si) -}, - None => None, -}, - _ => collect_evidence_incremental(&arg_val, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si), -}; -merge_optional_evidence(acc.clone(), ev.clone()) -}); -merge_optional_evidence(recv_ev, args_ev) -} - } else { - body.children.clone().iter().cloned().fold(None, |acc: _, child: Rc| { - let ce = collect_evidence_incremental(&child, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si); -merge_optional_evidence(acc.clone(), ce.clone()) -}) + }, + ); + merge_optional_evidence(scrut_ev, arms_ev) } -}, - _ => body.children.clone().iter().cloned().fold(None, |acc: _, child: Rc| { - let ce = collect_evidence_incremental(&child, &func_name, ¶m_name, &vars, check_child.clone(), check_list.clone(), branching_only.clone(), &si); -merge_optional_evidence(acc.clone(), ce.clone()) -}), -} + ExprData::ExprIf => { + let cond_ev = collect_evidence_incremental( + &if_condition(body.clone()), + &func_name, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + branching_only.clone(), + &si, + ); + let then_branch = if_then_branch(body.clone()); + let else_opt = if_else_branch(body.clone()); + let then_path = if branching_only.clone() { + max_path_self_calls(then_branch.clone(), func_name.clone(), si.clone()) + } else { + 0 + }; + let else_path = if branching_only.clone() { + match else_opt.clone() { + Some(eb) => max_path_self_calls(eb.clone(), func_name.clone(), si.clone()), + None => 0, + } + } else { + 0 + }; + let then_ev = if (branching_only.clone() && (then_path == 0)) { + None + } else { + collect_evidence_incremental( + &then_branch, + &func_name, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + branching_only.clone(), + &si, + ) + }; + let else_ev = if (branching_only.clone() && (else_path == 0)) { + None + } else { + match else_opt.clone() { + Some(eb) => collect_evidence_incremental( + &eb, + &func_name, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + branching_only.clone(), + &si, + ), + None => None, + } + }; + merge_optional_evidence(cond_ev, merge_optional_evidence(then_ev, else_ev)) + } + ExprData::ExprCall { .. } => { + let callee = expr_call_func_at(body.clone(), si.clone()); + let own_evidence = if (callee.as_str() == func_name.clone().as_str()) { + { + let arg_evidence = body.children.clone().iter().cloned().fold( + DescentEvidence::DescentUnknown, + |acc: DescentEvidence, arg_node: Rc| { + let aname = arg_name_at(arg_node.clone(), si.clone()); + if (aname.clone().as_deref() == Some(param_name.clone()).as_deref()) + { + classify_self_call_evidence( + &arg_value(&arg_node), + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + &si, + ) + } else { + acc + } + }, + ); + Some(arg_evidence) + } + } else { + None + }; + let child_evidence = + body.children + .clone() + .iter() + .cloned() + .fold(None, |acc: _, child: Rc| { + let ce = collect_evidence_incremental( + &child, + &func_name, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + branching_only.clone(), + &si, + ); + merge_optional_evidence(acc.clone(), ce.clone()) + }); + merge_optional_evidence(own_evidence, child_evidence) + } + ExprData::ExprBlock => { + let result = body.children.clone().iter().cloned().fold( + Rc::new(EvidenceBlockAcc { + evidence: None, + vars: vars.clone(), + }), + |acc: Rc, stmt: Rc| { + let stmt_ev = collect_evidence_incremental( + &stmt, + &func_name, + ¶m_name, + &acc.vars.clone(), + check_child.clone(), + check_list.clone(), + branching_only.clone(), + &si, + ); + let next_vars = collect_descent_vars( + &stmt, + ¶m_name, + &acc.vars.clone(), + check_child.clone(), + check_list.clone(), + &si, + ); + Rc::new(EvidenceBlockAcc { + evidence: merge_optional_evidence( + acc.evidence.clone(), + stmt_ev.clone(), + ), + vars: next_vars.clone(), + }) + }, + ); + result.evidence.clone() + } + ExprData::ExprMethodCall { + method_semantics: ms, + .. + } => { + let receiver = method_receiver(body.clone()); + let is_iter = is_algebra_iteration_method(ms.clone()); + let is_struct = is_structural_children(&receiver, ¶m_name, &vars, &si); + if (is_iter && is_struct) { + { + let recv_ev = collect_evidence_incremental( + &receiver, + &func_name, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + branching_only.clone(), + &si, + ); + let args_ev = method_arg_nodes(body.clone()).iter().cloned().fold( + None, + |acc: _, arg_node: Rc| { + let arg_val = arg_value(&arg_node); + let ev = match (*arg_val.expr_data.clone()).clone() { + ExprData::ExprLambda => match iteration_element_name( + ms.clone(), + arg_val.clone(), + si.clone(), + ) { + Some(iter_name) => { + let ext_vars = v2_rt::rc_map_insert( + vars.clone(), + iter_name.clone(), + true, + ); + collect_evidence_incremental( + &lambda_body(arg_val.clone()), + &func_name, + ¶m_name, + &ext_vars, + check_child.clone(), + check_list.clone(), + branching_only.clone(), + &si, + ) + } + None => None, + }, + _ => collect_evidence_incremental( + &arg_val, + &func_name, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + branching_only.clone(), + &si, + ), + }; + merge_optional_evidence(acc.clone(), ev.clone()) + }, + ); + merge_optional_evidence(recv_ev, args_ev) + } + } else { + body.children + .clone() + .iter() + .cloned() + .fold(None, |acc: _, child: Rc| { + let ce = collect_evidence_incremental( + &child, + &func_name, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + branching_only.clone(), + &si, + ); + merge_optional_evidence(acc.clone(), ce.clone()) + }) + } + } + _ => body + .children + .clone() + .iter() + .cloned() + .fold(None, |acc: _, child: Rc| { + let ce = collect_evidence_incremental( + &child, + &func_name, + ¶m_name, + &vars, + check_child.clone(), + check_list.clone(), + branching_only.clone(), + &si, + ); + merge_optional_evidence(acc.clone(), ce.clone()) + }), + } }) } -pub fn try_type_directed_dimension(body: Rc, func_name: String, param_name: &String, dim: IterationDimension, si: Rc>>) -> Option> { +pub fn try_type_directed_dimension( + body: Rc, + func_name: String, + param_name: &String, + dim: IterationDimension, + si: Rc>>, +) -> Option> { match dim { - IterationDimension::TreeDescent => match try_dimension_for_param(body, func_name, param_name.clone(), true, false, si) { - Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { - param: param_name.clone(), -})]), -})), - _ => None, -}, - IterationDimension::CollectionFold => match try_dimension_for_param(body, func_name, param_name.clone(), false, true, si) { - Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::ListLength { - param: param_name.clone(), -})]), -})), - _ => None, -}, - IterationDimension::ArithmeticRepeat => match try_dimension_for_param(body, func_name, param_name.clone(), false, false, si) { - Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::ArithmeticValue { - param: param_name.clone(), -})]), -})), - _ => None, -}, -} + IterationDimension::TreeDescent => { + match try_dimension_for_param(body, func_name, param_name.clone(), true, false, si) { + Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { + param: param_name.clone(), + })]), + })), + _ => None, + } + } + IterationDimension::CollectionFold => { + match try_dimension_for_param(body, func_name, param_name.clone(), false, true, si) { + Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::ListLength { + param: param_name.clone(), + })]), + })), + _ => None, + } + } + IterationDimension::ArithmeticRepeat => { + match try_dimension_for_param(body, func_name, param_name.clone(), false, false, si) { + Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::ArithmeticValue { + param: param_name.clone(), + })]), + })), + _ => None, + } + } + } } -pub fn construct_termination_proof(func_name: &String, body: &Rc, params: &Rc>>, parser_always_advancing: Rc>, si: &Rc>>) -> Option> { +pub fn construct_termination_proof( + func_name: &String, + body: &Rc, + params: &Rc>>, + parser_always_advancing: Rc>, + si: &Rc>>, +) -> Option> { { - let structural_proof = params.clone().iter().cloned().fold(None, |best: _, p: Rc| match best.clone() { - Some(_) => best.clone(), - None => { - let pname = param_node_name_at(p.clone(), si.clone()); -let type_name = authored_name_at(si.clone(), ¶m_node_type_expr(&p)); -match type_iteration_dimension(&type_name) { - Some(dim) => try_type_directed_dimension(body.clone(), func_name.clone(), &pname, dim.clone(), si.clone()), - None => { - let tree_evidence = try_dimension_for_param(body.clone(), func_name.clone(), pname.clone(), true, false, si.clone()); -match tree_evidence.clone() { - Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { - param: pname.clone(), -})]), -})), - _ => { - let list_evidence = try_dimension_for_param(body.clone(), func_name.clone(), pname.clone(), false, true, si.clone()); -match list_evidence.clone() { - Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::ListLength { - param: pname.clone(), -})]), -})), - _ => { - let arith_evidence = try_dimension_for_param(body.clone(), func_name.clone(), pname.clone(), false, false, si.clone()); -match arith_evidence.clone() { - Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::ArithmeticValue { - param: pname.clone(), -})]), -})), - _ => None, -} -}, -} -}, -} -}, -} -}, -}); -let single_dim_proof = match structural_proof.clone() { - Some(_) => structural_proof.clone(), - None => match parser_state_param(params.clone(), si.clone()) { - Some(state_param) => { - let self_set = seed_bool_map(func_name.clone()); -let edges = collect_parser_progress_edges(&func_name, &body, &state_param, &self_set, &empty_parser_progress_env(), &parser_always_advancing, &v2_rt::rc_empty_map::(), &si); -if (((edges.clone().len() as i64) > 0) && { let mut __all = true; for edge in edges.clone().iter().cloned() { if !((edge.progress.clone() == DescentEvidence::Strict)) { __all = false; break; } } __all }) { - Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::TokenPosition { - param: state_param.name.clone(), -})]), -})) - } else { - None + let structural_proof = params + .clone() + .iter() + .cloned() + .fold(None, |best: _, p: Rc| match best.clone() { + Some(_) => best.clone(), + None => { + let pname = param_node_name_at(p.clone(), si.clone()); + let type_name = authored_name_at(si.clone(), ¶m_node_type_expr(&p)); + match type_iteration_dimension(&type_name) { + Some(dim) => try_type_directed_dimension( + body.clone(), + func_name.clone(), + &pname, + dim.clone(), + si.clone(), + ), + None => { + let tree_evidence = try_dimension_for_param( + body.clone(), + func_name.clone(), + pname.clone(), + true, + false, + si.clone(), + ); + match tree_evidence.clone() { + Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new( + RankingDimension::TreeSize { + param: pname.clone(), + }, + )]), + })), + _ => { + let list_evidence = try_dimension_for_param( + body.clone(), + func_name.clone(), + pname.clone(), + false, + true, + si.clone(), + ); + match list_evidence.clone() { + Some(DescentEvidence::Strict) => { + Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new( + RankingDimension::ListLength { + param: pname.clone(), + }, + )]), + })) + } + _ => { + let arith_evidence = try_dimension_for_param( + body.clone(), + func_name.clone(), + pname.clone(), + false, + false, + si.clone(), + ); + match arith_evidence.clone() { + Some(DescentEvidence::Strict) => { + Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new( + RankingDimension::ArithmeticValue { + param: pname.clone(), + }, + )]), + })) + } + _ => None, + } + } + } + } + } + } + } + } + }); + let single_dim_proof = match structural_proof.clone() { + Some(_) => structural_proof.clone(), + None => match parser_state_param(params.clone(), si.clone()) { + Some(state_param) => { + let self_set = seed_bool_map(func_name.clone()); + let edges = collect_parser_progress_edges( + &func_name, + &body, + &state_param, + &self_set, + &empty_parser_progress_env(), + &parser_always_advancing, + &v2_rt::rc_empty_map::(), + &si, + ); + if (((edges.clone().len() as i64) > 0) && { + let mut __all = true; + for edge in edges.clone().iter().cloned() { + if !(edge.progress.clone() == DescentEvidence::Strict) { + __all = false; + break; + } + } + __all + }) { + Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::TokenPosition { + param: state_param.name.clone(), + })]), + })) + } else { + None + } + } + None => None, + }, + }; + match single_dim_proof.clone() { + Some(_) => single_dim_proof.clone(), + None => { + let self_set = seed_bool_map(func_name.clone()); + let func_entry = Rc::new(FuncEntry { + name: func_name.clone(), + body: body.clone(), + params: params.clone(), + span: body.span.clone(), + is_tail_recursive: false, + }); + let func_index = seed_func_entry_map(func_name.clone(), func_entry); + construct_scc_termination_proof( + &Rc::new(vec![func_name.clone()]), + &func_index, + &self_set, + &si, + ) } -}, - None => None, -}, -}; -match single_dim_proof.clone() { - Some(_) => single_dim_proof.clone(), - None => { - let self_set = seed_bool_map(func_name.clone()); -let func_entry = Rc::new(FuncEntry { - name: func_name.clone(), - body: body.clone(), - params: params.clone(), - span: body.span.clone(), - is_tail_recursive: false, -}); -let func_index = seed_func_entry_map(func_name.clone(), func_entry); -construct_scc_termination_proof(&Rc::new(vec![func_name.clone()]), &func_index, &self_set, &si) -}, -} -} + } + } } -pub fn construct_branching_termination_proof(func_name: String, body: Rc, params: Rc>>, si: Rc>>) -> Option> { - params.iter().cloned().fold(None, |best: _, p: Rc| match best.clone() { - Some(_) => best.clone(), - None => { - let pname = param_node_name_at(p.clone(), si.clone()); -let type_name = authored_name_at(si.clone(), ¶m_node_type_expr(&p)); -match type_iteration_dimension(&type_name) { - Some(IterationDimension::TreeDescent) => match try_branching_dimension_for_param(body.clone(), func_name.clone(), pname.clone(), true, false, si.clone()) { - Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { - param: pname.clone(), -})]), -})), - _ => None, -}, - Some(IterationDimension::CollectionFold) => match try_branching_dimension_for_param(body.clone(), func_name.clone(), pname.clone(), false, true, si.clone()) { - Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::ListLength { - param: pname.clone(), -})]), -})), - _ => None, -}, - Some(IterationDimension::ArithmeticRepeat) => None, - None => { - let tree_ev = try_branching_dimension_for_param(body.clone(), func_name.clone(), pname.clone(), true, false, si.clone()); -match tree_ev.clone() { - Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { - param: pname.clone(), -})]), -})), - _ => { - let list_ev = try_branching_dimension_for_param(body.clone(), func_name.clone(), pname.clone(), false, true, si.clone()); -match list_ev.clone() { - Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::ListLength { - param: pname.clone(), -})]), -})), - _ => None, -} -}, -} -}, -} -}, -}) +pub fn construct_branching_termination_proof( + func_name: String, + body: Rc, + params: Rc>>, + si: Rc>>, +) -> Option> { + params + .iter() + .cloned() + .fold(None, |best: _, p: Rc| match best.clone() { + Some(_) => best.clone(), + None => { + let pname = param_node_name_at(p.clone(), si.clone()); + let type_name = authored_name_at(si.clone(), ¶m_node_type_expr(&p)); + match type_iteration_dimension(&type_name) { + Some(IterationDimension::TreeDescent) => { + match try_branching_dimension_for_param( + body.clone(), + func_name.clone(), + pname.clone(), + true, + false, + si.clone(), + ) { + Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { + param: pname.clone(), + })]), + })), + _ => None, + } + } + Some(IterationDimension::CollectionFold) => { + match try_branching_dimension_for_param( + body.clone(), + func_name.clone(), + pname.clone(), + false, + true, + si.clone(), + ) { + Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::ListLength { + param: pname.clone(), + })]), + })), + _ => None, + } + } + Some(IterationDimension::ArithmeticRepeat) => None, + None => { + let tree_ev = try_branching_dimension_for_param( + body.clone(), + func_name.clone(), + pname.clone(), + true, + false, + si.clone(), + ); + match tree_ev.clone() { + Some(DescentEvidence::Strict) => Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { + param: pname.clone(), + })]), + })), + _ => { + let list_ev = try_branching_dimension_for_param( + body.clone(), + func_name.clone(), + pname.clone(), + false, + true, + si.clone(), + ); + match list_ev.clone() { + Some(DescentEvidence::Strict) => { + Some(Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new( + RankingDimension::ListLength { + param: pname.clone(), + }, + )]), + })) + } + _ => None, + } + } + } + } + } + } + }) } pub fn proof_to_call_pattern(proof: Rc) -> Rc { match proof.dimensions.clone().first().cloned() { - Some(dim) => match (*dim.clone()).clone() { - RankingDimension::TreeSize { param: p, .. } => Rc::new(CallPattern::ChildAccessorCall { - accessor: p.clone(), -}), - RankingDimension::ListLength { param: p, .. } => Rc::new(CallPattern::CollectionShrinkCall { - amount: Rc::new(PositiveDescentAmount::OneStep), - collection: p.clone(), -}), - RankingDimension::ArithmeticValue { param: p, .. } => Rc::new(CallPattern::ArithmeticSubtractCall { - steps: Rc::new(PositiveDescentAmount::OneStep), - ring_param: p.clone(), -}), - RankingDimension::TokenPosition { param: p, .. } => Rc::new(CallPattern::ParserAdvanceCall { - witness: p.clone(), -}), - RankingDimension::SetCardinality { param: p, .. } => Rc::new(CallPattern::WorklistDrainCall { - element: p.clone(), -}), -}, - None => Rc::new(CallPattern::SameArgumentCall), -} + Some(dim) => match (*dim.clone()).clone() { + RankingDimension::TreeSize { param: p, .. } => { + Rc::new(CallPattern::ChildAccessorCall { + accessor: p.clone(), + }) + } + RankingDimension::ListLength { param: p, .. } => { + Rc::new(CallPattern::CollectionShrinkCall { + amount: Rc::new(PositiveDescentAmount::OneStep), + collection: p.clone(), + }) + } + RankingDimension::ArithmeticValue { param: p, .. } => { + Rc::new(CallPattern::ArithmeticSubtractCall { + steps: Rc::new(PositiveDescentAmount::OneStep), + ring_param: p.clone(), + }) + } + RankingDimension::TokenPosition { param: p, .. } => { + Rc::new(CallPattern::ParserAdvanceCall { witness: p.clone() }) + } + RankingDimension::SetCardinality { param: p, .. } => { + Rc::new(CallPattern::WorklistDrainCall { element: p.clone() }) + } + }, + None => Rc::new(CallPattern::SameArgumentCall), + } } -pub fn classify_recursion_pattern(func_name: &String, body: &Rc, params: &Rc>>, parser_always_advancing: Rc>, si: &Rc>>) -> Rc { +pub fn classify_recursion_pattern( + func_name: &String, + body: &Rc, + params: &Rc>>, + parser_always_advancing: Rc>, + si: &Rc>>, +) -> Rc { { let path_calls = max_path_self_calls(body.clone(), func_name.clone(), si.clone()); -if (path_calls.clone() == 0) { + if (path_calls.clone() == 0) { { let outer = match params.clone().first().cloned() { - Some(p0) => param_node_name_at(p0.clone(), si.clone()), - None => "_fold_body".to_string(), -}; -lower_call_pattern(Rc::new(CallPattern::FoldBodyCall { - outer_collection: outer, -})) -} + Some(p0) => param_node_name_at(p0.clone(), si.clone()), + None => "_fold_body".to_string(), + }; + lower_call_pattern(Rc::new(CallPattern::FoldBodyCall { + outer_collection: outer, + })) + } } else { { - let all_evidence = collect_self_call_evidence(body.clone(), func_name.clone(), si.clone()); -let has_evidence = ((all_evidence.clone().len() as i64) > 0); -let all_structural = (has_evidence && { let mut __all = true; for call_ev in all_evidence.clone().iter().cloned() { if !({ let mut __found = false; for rel in call_ev.clone().iter().cloned() { if match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { .. } => true, - SubValueRelation::IteratedSubValue { .. } => true, - SubValueRelation::ArithmeticDescent { .. } => true, - _ => false, -} { __found = true; break; } } __found }) { __all = false; break; } } __all }); -if all_structural { + let all_evidence = + collect_self_call_evidence(body.clone(), func_name.clone(), si.clone()); + let has_evidence = ((all_evidence.clone().len() as i64) > 0); + let all_structural = (has_evidence && { + let mut __all = true; + for call_ev in all_evidence.clone().iter().cloned() { + if !({ + let mut __found = false; + for rel in call_ev.clone().iter().cloned() { + if match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { .. } => true, + SubValueRelation::IteratedSubValue { .. } => true, + SubValueRelation::ArithmeticDescent { .. } => true, + _ => false, + } { + __found = true; + break; + } + } + __found + }) { + __all = false; + break; + } + } + __all + }); + if all_structural { { - let all_calls_arithmetic_only = { let mut __all = true; for call_ev in all_evidence.clone().iter().cloned() { if !({ - let has_tree = { let mut __found = false; for rel in call_ev.clone().iter().cloned() { if match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { .. } => true, - SubValueRelation::IteratedSubValue { .. } => true, - _ => false, -} { __found = true; break; } } __found }; -let has_arith = { let mut __found = false; for rel in call_ev.clone().iter().cloned() { if match (*rel.clone()).clone() { - SubValueRelation::ArithmeticDescent { .. } => true, - _ => false, -} { __found = true; break; } } __found }; -(has_arith.clone() && !has_tree.clone()) -}) { __all = false; break; } } __all }; -let first_call = if all_calls_arithmetic_only { - Rc::new({ let mut __result = Vec::new(); for call_ev in all_evidence.clone().iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for rel in call_ev.clone().iter().cloned() { if match (*rel.clone()).clone() { - SubValueRelation::ArithmeticDescent { .. } => true, - _ => false, -} { __result.push(rel); } } __result })).iter().cloned()); } __result }).first().cloned() + let all_calls_arithmetic_only = { + let mut __all = true; + for call_ev in all_evidence.clone().iter().cloned() { + if !({ + let has_tree = { + let mut __found = false; + for rel in call_ev.clone().iter().cloned() { + if match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { .. } => true, + SubValueRelation::IteratedSubValue { .. } => true, + _ => false, + } { + __found = true; + break; + } + } + __found + }; + let has_arith = { + let mut __found = false; + for rel in call_ev.clone().iter().cloned() { + if match (*rel.clone()).clone() { + SubValueRelation::ArithmeticDescent { .. } => true, + _ => false, + } { + __found = true; + break; + } + } + __found + }; + (has_arith.clone() && !has_tree.clone()) + }) { + __all = false; + break; + } + } + __all + }; + let first_call = if all_calls_arithmetic_only { + Rc::new({ + let mut __result = Vec::new(); + for call_ev in all_evidence.clone().iter().cloned() { + __result.extend( + (*Rc::new({ + let mut __result = Vec::new(); + for rel in call_ev.clone().iter().cloned() { + if match (*rel.clone()).clone() { + SubValueRelation::ArithmeticDescent { + .. + } => true, + _ => false, + } { + __result.push(rel); + } + } + __result + })) + .iter() + .cloned(), + ); + } + __result + }) + .first() + .cloned() } else { { - let tree_rels = Rc::new({ let mut __result = Vec::new(); for call_ev in all_evidence.clone().iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for rel in call_ev.clone().iter().cloned() { if match (*rel.clone()).clone() { + let tree_rels = + Rc::new({ + let mut __result = Vec::new(); + for call_ev in all_evidence.clone().iter().cloned() { + __result.extend( + (*Rc::new({ + let mut __result = Vec::new(); + for rel in call_ev.clone().iter().cloned() { + if match (*rel.clone()).clone() { SubValueRelation::StrictSubValue { .. } => true, SubValueRelation::IteratedSubValue { .. } => true, _ => false, -} { __result.push(rel); } } __result })).iter().cloned()); } __result }); -match tree_rels.clone().first().cloned() { - Some(_) => tree_rels.clone().first().cloned(), - None => Rc::new({ let mut __result = Vec::new(); for call_ev in all_evidence.clone().iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for rel in call_ev.clone().iter().cloned() { if match (*rel.clone()).clone() { +} { __result.push(rel); } + } + __result + })) + .iter() + .cloned(), + ); + } + __result + }); + match tree_rels.clone().first().cloned() { + Some(_) => tree_rels.clone().first().cloned(), + None => Rc::new({ + let mut __result = Vec::new(); + for call_ev in all_evidence.clone().iter().cloned() { + __result.extend( + (*Rc::new({ + let mut __result = Vec::new(); + for rel in call_ev.clone().iter().cloned() { + if match (*rel.clone()).clone() { SubValueRelation::ArithmeticDescent { .. } => true, _ => false, -} { __result.push(rel); } } __result })).iter().cloned()); } __result }).first().cloned(), -} -} +} { __result.push(rel); } + } + __result + })) + .iter() + .cloned(), + ); + } + __result + }) + .first() + .cloned(), + } + } }; -let is_arithmetic_branching = match first_call.clone() { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::ArithmeticDescent { .. } => (path_calls.clone() > 1), - _ => false, -}, - None => false, -}; -if is_arithmetic_branching { + let is_arithmetic_branching = match first_call.clone() { + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::ArithmeticDescent { .. } => { + (path_calls.clone() > 1) + } + _ => false, + }, + None => false, + }; + if is_arithmetic_branching { lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)) } else { match first_call.clone() { - Some(rel) => match sub_value_to_lowering_target(rel.clone()) { - Some(target) => target.clone(), - None => lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)), -}, - None => lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)), -} + Some(rel) => match sub_value_to_lowering_target(rel.clone()) { + Some(target) => target.clone(), + None => { + lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)) + } + }, + None => lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)), + } } -} + } } else { { - let proof = construct_termination_proof(&func_name, &body, ¶ms, parser_always_advancing, &si); -let proof_safe_for_branching = match proof.clone() { - Some(p) => if ((p.dimensions.clone().len() as i64) == 0) { - false - } else { - { let mut __all = true; for dim in p.dimensions.clone().iter().cloned() { if !(match (*dim.clone()).clone() { - RankingDimension::TreeSize { .. } => true, - RankingDimension::ListLength { .. } => true, - _ => false, -}) { __all = false; break; } } __all } - }, - None => false, -}; -let branching_proof = if ((path_calls.clone() > 1) && !proof_safe_for_branching.clone()) { - construct_branching_termination_proof(func_name.clone(), body.clone(), params.clone(), si.clone()) - } else { - None - }; -let branching_proof_safe = match branching_proof.clone() { - Some(bp) => if ((bp.dimensions.clone().len() as i64) == 0) { - false - } else { - { let mut __all = true; for dim in bp.dimensions.clone().iter().cloned() { if !(match (*dim.clone()).clone() { - RankingDimension::TreeSize { .. } => true, - RankingDimension::ListLength { .. } => true, - _ => false, -}) { __all = false; break; } } __all } - }, - None => false, -}; -match proof.clone() { - Some(p) => if ((path_calls.clone() == 1) || proof_safe_for_branching.clone()) { - lower_call_pattern(proof_to_call_pattern(p.clone())) - } else { - if branching_proof_safe { - match branching_proof.clone() { - Some(bp) => lower_call_pattern(proof_to_call_pattern(bp.clone())), - None => lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)), -} - } else { - lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)) + let proof = construct_termination_proof( + &func_name, + &body, + ¶ms, + parser_always_advancing, + &si, + ); + let proof_safe_for_branching = match proof.clone() { + Some(p) => { + if ((p.dimensions.clone().len() as i64) == 0) { + false + } else { + { + let mut __all = true; + for dim in p.dimensions.clone().iter().cloned() { + if !(match (*dim.clone()).clone() { + RankingDimension::TreeSize { .. } => true, + RankingDimension::ListLength { .. } => true, + _ => false, + }) { + __all = false; + break; + } + } + __all + } + } } - }, - None => if (path_calls.clone() > 1) { - match branching_proof.clone() { - Some(bp) => if branching_proof_safe { - lower_call_pattern(proof_to_call_pattern(bp.clone())) + None => false, + }; + let branching_proof = + if ((path_calls.clone() > 1) && !proof_safe_for_branching.clone()) { + construct_branching_termination_proof( + func_name.clone(), + body.clone(), + params.clone(), + si.clone(), + ) } else { - lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)) - }, - None => lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)), -} - } else { - lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)) - }, -} -} + None + }; + let branching_proof_safe = match branching_proof.clone() { + Some(bp) => { + if ((bp.dimensions.clone().len() as i64) == 0) { + false + } else { + { + let mut __all = true; + for dim in bp.dimensions.clone().iter().cloned() { + if !(match (*dim.clone()).clone() { + RankingDimension::TreeSize { .. } => true, + RankingDimension::ListLength { .. } => true, + _ => false, + }) { + __all = false; + break; + } + } + __all + } + } + } + None => false, + }; + match proof.clone() { + Some(p) => { + if ((path_calls.clone() == 1) || proof_safe_for_branching.clone()) { + lower_call_pattern(proof_to_call_pattern(p.clone())) + } else { + if branching_proof_safe { + match branching_proof.clone() { + Some(bp) => lower_call_pattern(proof_to_call_pattern( + bp.clone(), + )), + None => lower_call_pattern(Rc::new( + CallPattern::SameArgumentCall, + )), + } + } else { + lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)) + } + } + } + None => { + if (path_calls.clone() > 1) { + match branching_proof.clone() { + Some(bp) => { + if branching_proof_safe { + lower_call_pattern(proof_to_call_pattern( + bp.clone(), + )) + } else { + lower_call_pattern(Rc::new( + CallPattern::SameArgumentCall, + )) + } + } + None => lower_call_pattern(Rc::new( + CallPattern::SameArgumentCall, + )), + } + } else { + lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)) + } + } + } + } } -} + } } -} + } } -pub fn bounded_recursive_cost(target: Rc, per_iter: Rc, func_name: String) -> Rc { +pub fn bounded_recursive_cost( + target: Rc, + per_iter: Rc, + func_name: String, +) -> Rc { { let p = size_bound_param(target.bound.clone()); -match p { - Some(v) => { - let var = v2_rt::concat("n_".to_string(), v.clone()); -Rc::new(CostExpr::CostSum { - binder: var.clone(), - upper: Rc::new(SizeExpr::SizeVar { - name: var.clone(), -}), - body: simplify_cost(per_iter), -}) -}, - None => Rc::new(CostExpr::CostUnknown { - reason: v2_rt::concat("same-argument recursion in ".to_string(), func_name), -}), -} -} + match p { + Some(v) => { + let var = v2_rt::concat("n_".to_string(), v.clone()); + Rc::new(CostExpr::CostSum { + binder: var.clone(), + upper: Rc::new(SizeExpr::SizeVar { name: var.clone() }), + body: simplify_cost(per_iter), + }) + } + None => Rc::new(CostExpr::CostUnknown { + reason: v2_rt::concat("same-argument recursion in ".to_string(), func_name), + }), + } + } } -pub fn bounded_scc_cost(target: Rc, per_iter: Rc, members: Rc>) -> Rc { +pub fn bounded_scc_cost( + target: Rc, + per_iter: Rc, + members: Rc>, +) -> Rc { { let p = size_bound_param(target.bound.clone()); -match p { - Some(v) => { - let var = v2_rt::concat("n_".to_string(), v.clone()); -Rc::new(CostExpr::CostSum { - binder: var.clone(), - upper: Rc::new(SizeExpr::SizeVar { - name: var.clone(), -}), - body: simplify_cost(per_iter), -}) -}, - None => Rc::new(CostExpr::CostUnknown { - reason: v2_rt::concat("same-argument mutual recursion in ".to_string(), match members.first().cloned() { - Some(n) => n.clone(), - None => "scc".to_string(), -}), -}), -} -} + match p { + Some(v) => { + let var = v2_rt::concat("n_".to_string(), v.clone()); + Rc::new(CostExpr::CostSum { + binder: var.clone(), + upper: Rc::new(SizeExpr::SizeVar { name: var.clone() }), + body: simplify_cost(per_iter), + }) + } + None => Rc::new(CostExpr::CostUnknown { + reason: v2_rt::concat( + "same-argument mutual recursion in ".to_string(), + match members.first().cloned() { + Some(n) => n.clone(), + None => "scc".to_string(), + }, + ), + }), + } + } } pub fn is_unknown_cost(expr: Rc) -> bool { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - match (*expr).clone() { - CostExpr::CostUnknown { .. } => true, - CostExpr::CostAdd { left: l, right: r, .. } => (is_unknown_cost(l.clone()) || is_unknown_cost(r.clone())), - CostExpr::CostMul { left: l, right: r, .. } => (is_unknown_cost(l.clone()) || is_unknown_cost(r.clone())), - CostExpr::CostMax { left: l, right: r, .. } => (is_unknown_cost(l.clone()) || is_unknown_cost(r.clone())), - CostExpr::CostSum { body: bd, .. } => is_unknown_cost(bd.clone()), - _ => false, -} + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*expr).clone() { + CostExpr::CostUnknown { .. } => true, + CostExpr::CostAdd { + left: l, right: r, .. + } => (is_unknown_cost(l.clone()) || is_unknown_cost(r.clone())), + CostExpr::CostMul { + left: l, right: r, .. + } => (is_unknown_cost(l.clone()) || is_unknown_cost(r.clone())), + CostExpr::CostMax { + left: l, right: r, .. + } => (is_unknown_cost(l.clone()) || is_unknown_cost(r.clone())), + CostExpr::CostSum { body: bd, .. } => is_unknown_cost(bd.clone()), + _ => false, }) } pub fn extract_unknown_reason(mut expr: Rc) -> String { loop { match (*expr).clone() { - CostExpr::CostUnknown { reason: r, .. } => { break r.clone(); }, - CostExpr::CostAdd { left: l, right: r, .. } => { if is_unknown_cost(l.clone()) { - { - let __tco_0 = l.clone(); -expr = __tco_0; -continue; -} -} else { - { - let __tco_0 = r.clone(); -expr = __tco_0; -continue; -} -} }, - CostExpr::CostMul { left: l, right: r, .. } => { if is_unknown_cost(l.clone()) { - { - let __tco_0 = l.clone(); -expr = __tco_0; -continue; -} -} else { - { - let __tco_0 = r.clone(); -expr = __tco_0; -continue; -} -} }, - CostExpr::CostMax { left: l, right: r, .. } => { if is_unknown_cost(l.clone()) { - { - let __tco_0 = l.clone(); -expr = __tco_0; -continue; -} -} else { - { - let __tco_0 = r.clone(); -expr = __tco_0; -continue; -} -} }, - CostExpr::CostSum { body: bd, .. } => { { - let __tco_0 = bd.clone(); -expr = __tco_0; -continue; -} }, - _ => { break "unknown".to_string(); }, -} -} + CostExpr::CostUnknown { reason: r, .. } => { + break r.clone(); + } + CostExpr::CostAdd { + left: l, right: r, .. + } => { + if is_unknown_cost(l.clone()) { + { + let __tco_0 = l.clone(); + expr = __tco_0; + continue; + } + } else { + { + let __tco_0 = r.clone(); + expr = __tco_0; + continue; + } + } + } + CostExpr::CostMul { + left: l, right: r, .. + } => { + if is_unknown_cost(l.clone()) { + { + let __tco_0 = l.clone(); + expr = __tco_0; + continue; + } + } else { + { + let __tco_0 = r.clone(); + expr = __tco_0; + continue; + } + } + } + CostExpr::CostMax { + left: l, right: r, .. + } => { + if is_unknown_cost(l.clone()) { + { + let __tco_0 = l.clone(); + expr = __tco_0; + continue; + } + } else { + { + let __tco_0 = r.clone(); + expr = __tco_0; + continue; + } + } + } + CostExpr::CostSum { body: bd, .. } => { + let __tco_0 = bd.clone(); + expr = __tco_0; + continue; + } + _ => { + break "unknown".to_string(); + } + } + } } -pub fn collect_local_call_edges_in_expr(caller: &String, body: &Rc, local_func_set: &Rc>, si: &Rc>>) -> Rc>> { +pub fn collect_local_call_edges_in_expr( + caller: &String, + body: &Rc, + local_func_set: &Rc>, + si: &Rc>>, +) -> Rc>> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let this_edges = match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { + let this_edges = match (*body.expr_data.clone()).clone() { + ExprData::ExprCall { .. } => { let callee = expr_call_func_at(body.clone(), si.clone()); -if set_has(local_func_set.clone(), callee.clone()) { + if set_has(local_func_set.clone(), callee.clone()) { Rc::new(vec![Rc::new(CallEdge { - caller: caller.clone(), - callee: callee.clone(), -})]) + caller: caller.clone(), + callee: callee.clone(), + })]) } else { Rc::new(vec![]) } -}, - _ => Rc::new(vec![]), -}; -let child_edges = Rc::new({ let mut __result = Vec::new(); for child in body.children.clone().iter().cloned() { __result.extend((*collect_local_call_edges_in_expr(&caller, &child, &local_func_set, &si)).iter().cloned()); } __result }); -v2_rt::concat(this_edges, child_edges) -} + } + _ => Rc::new(vec![]), + }; + let child_edges = Rc::new({ + let mut __result = Vec::new(); + for child in body.children.clone().iter().cloned() { + __result.extend( + (*collect_local_call_edges_in_expr(&caller, &child, &local_func_set, &si)) + .iter() + .cloned(), + ); + } + __result + }); + v2_rt::concat(this_edges, child_edges) }) } -pub fn build_call_graph(func_entries: &Rc>>, si: Rc>>) -> Rc { +pub fn build_call_graph( + func_entries: &Rc>>, + si: Rc>>, +) -> Rc { { - let names = Rc::new({ let mut __result = Vec::new(); for entry in func_entries.clone().iter().cloned() { __result.push(entry.name.clone()); } __result }); -let local_func_set = names.iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, name.clone(), true)); -let edges = Rc::new({ let mut __result = Vec::new(); for entry in func_entries.clone().iter().cloned() { __result.extend((*collect_local_call_edges_in_expr(&entry.name.clone(), &entry.body.clone(), &local_func_set, &si)).iter().cloned()); } __result }); -Rc::new(CallGraph { - edges: Rc::new({ let mut __result = Vec::new(); for edge in Rc::new({ let mut __result = Vec::new(); for edge in edges.iter().cloned() { if (edge.caller.clone().as_str() != edge.callee.clone().as_str()) { __result.push(edge); } } __result }).iter().cloned() { __result.push(Rc::new(GraphEdge { - caller: edge.caller.clone(), - callee: edge.callee.clone(), -})); } __result }), -}) -} + let names = Rc::new({ + let mut __result = Vec::new(); + for entry in func_entries.clone().iter().cloned() { + __result.push(entry.name.clone()); + } + __result + }); + let local_func_set = names.iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, name: String| { + v2_rt::rc_map_insert(acc, name.clone(), true) + }, + ); + let edges = Rc::new({ + let mut __result = Vec::new(); + for entry in func_entries.clone().iter().cloned() { + __result.extend( + (*collect_local_call_edges_in_expr( + &entry.name.clone(), + &entry.body.clone(), + &local_func_set, + &si, + )) + .iter() + .cloned(), + ); + } + __result + }); + Rc::new(CallGraph { + edges: Rc::new({ + let mut __result = Vec::new(); + for edge in Rc::new({ + let mut __result = Vec::new(); + for edge in edges.iter().cloned() { + if (edge.caller.clone().as_str() != edge.callee.clone().as_str()) { + __result.push(edge); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(Rc::new(GraphEdge { + caller: edge.caller.clone(), + callee: edge.callee.clone(), + })); + } + __result + }), + }) + } } pub fn scc_label(members: Rc>) -> String { match members.first().cloned() { - Some(name) => name.clone(), - None => "scc".to_string(), -} + Some(name) => name.clone(), + None => "scc".to_string(), + } } -pub fn classify_scc_call_progress(arg_expr: &Rc, param_name: &String, descent_vars: &Rc>, si: &Rc>>) -> DescentEvidence { +pub fn classify_scc_call_progress( + arg_expr: &Rc, + param_name: &String, + descent_vars: &Rc>, + si: &Rc>>, +) -> DescentEvidence { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { if is_child_descent_expr(&arg_expr, ¶m_name, &descent_vars, &si) { DescentEvidence::Strict @@ -2729,314 +5565,715 @@ pub fn classify_scc_call_progress(arg_expr: &Rc, param_name: &String, desc DescentEvidence::Strict } else { match (*arg_expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let vname = expr_var_name_at(arg_expr.clone(), si.clone()); -if set_has(descent_vars.clone(), vname.clone()) { - DescentEvidence::Strict - } else { - if (vname.clone().as_str() == param_name.clone().as_str()) { - DescentEvidence::NonIncreasing + ExprData::ExprVar { .. } => { + let vname = expr_var_name_at(arg_expr.clone(), si.clone()); + if set_has(descent_vars.clone(), vname.clone()) { + DescentEvidence::Strict } else { - DescentEvidence::DescentUnknown + if (vname.clone().as_str() == param_name.clone().as_str()) { + DescentEvidence::NonIncreasing + } else { + DescentEvidence::DescentUnknown + } } } -}, - ExprData::ExprCall { .. } => if is_tree_size_preserving_wrapper(&arg_expr, si.clone()) { - classify_scc_call_progress(&wrapper_inner_arg(arg_expr.clone()), ¶m_name, &descent_vars, &si) - } else { - if is_sub_value_extractor(&arg_expr, si.clone()) { - { - let inner_progress = classify_scc_call_progress(&extractor_inner_arg(arg_expr.clone()), ¶m_name, &descent_vars, &si); -match inner_progress.clone() { - DescentEvidence::NonIncreasing => DescentEvidence::Strict, - _ => inner_progress.clone(), -} -} - } else { - if is_list_passthrough_call(arg_expr.clone(), si.clone()) { - match list_passthrough_inner_arg(arg_expr.clone(), si.clone()) { - Some(inner) => classify_scc_call_progress(&inner, ¶m_name, &descent_vars, &si), - None => DescentEvidence::DescentUnknown, -} + ExprData::ExprCall { .. } => { + if is_tree_size_preserving_wrapper(&arg_expr, si.clone()) { + classify_scc_call_progress( + &wrapper_inner_arg(arg_expr.clone()), + ¶m_name, + &descent_vars, + &si, + ) } else { - DescentEvidence::DescentUnknown + if is_sub_value_extractor(&arg_expr, si.clone()) { + { + let inner_progress = classify_scc_call_progress( + &extractor_inner_arg(arg_expr.clone()), + ¶m_name, + &descent_vars, + &si, + ); + match inner_progress.clone() { + DescentEvidence::NonIncreasing => DescentEvidence::Strict, + _ => inner_progress.clone(), + } + } + } else { + if is_list_passthrough_call(arg_expr.clone(), si.clone()) { + match list_passthrough_inner_arg(arg_expr.clone(), si.clone()) { + Some(inner) => classify_scc_call_progress( + &inner, + ¶m_name, + &descent_vars, + &si, + ), + None => DescentEvidence::DescentUnknown, + } + } else { + DescentEvidence::DescentUnknown + } + } } } - }, - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(arg_expr.clone()); -match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at(base.clone(), si.clone()); -if (set_has(descent_vars.clone(), bname.clone()) || (bname.clone().as_str() == param_name.clone().as_str())) { - DescentEvidence::Strict - } else { - { - let field = field_access_field_at(arg_expr.clone(), si.clone()); -if (field.as_str() == param_name.clone().as_str()) { - DescentEvidence::NonIncreasing + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(arg_expr.clone()); + match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at(base.clone(), si.clone()); + if (set_has(descent_vars.clone(), bname.clone()) + || (bname.clone().as_str() == param_name.clone().as_str())) + { + DescentEvidence::Strict } else { - DescentEvidence::DescentUnknown + { + let field = + field_access_field_at(arg_expr.clone(), si.clone()); + if (field.as_str() == param_name.clone().as_str()) { + DescentEvidence::NonIncreasing + } else { + DescentEvidence::DescentUnknown + } + } } -} + } + _ => DescentEvidence::DescentUnknown, } -}, - _ => DescentEvidence::DescentUnknown, -} -}, - ExprData::ExprMethodCall { method_semantics: ms, .. } => if is_generalized_shrink(&arg_expr, si.clone()) { - { - let recv = method_receiver(arg_expr.clone()); -let recv_progress = classify_scc_call_progress(&recv, ¶m_name, &descent_vars, &si); -match recv_progress { - DescentEvidence::Strict => DescentEvidence::Strict, - DescentEvidence::NonIncreasing => DescentEvidence::Strict, - DescentEvidence::DescentUnknown => DescentEvidence::DescentUnknown, -} -} - } else { - DescentEvidence::DescentUnknown - }, - _ => DescentEvidence::DescentUnknown, -} + } + ExprData::ExprMethodCall { + method_semantics: ms, + .. + } => { + if is_generalized_shrink(&arg_expr, si.clone()) { + { + let recv = method_receiver(arg_expr.clone()); + let recv_progress = classify_scc_call_progress( + &recv, + ¶m_name, + &descent_vars, + &si, + ); + match recv_progress { + DescentEvidence::Strict => DescentEvidence::Strict, + DescentEvidence::NonIncreasing => DescentEvidence::Strict, + DescentEvidence::DescentUnknown => { + DescentEvidence::DescentUnknown + } + } + } + } else { + DescentEvidence::DescentUnknown + } + } + _ => DescentEvidence::DescentUnknown, + } } } }) } -pub fn collect_scc_child_edges(body: &Rc, caller: &String, param_name: &String, descent_vars: &Rc>, target_set: &Rc>, check_child: bool, check_list: bool, scc_measure_params: &Rc>>>, si: &Rc>>) -> Rc>> { +pub fn collect_scc_child_edges( + body: &Rc, + caller: &String, + param_name: &String, + descent_vars: &Rc>, + target_set: &Rc>, + check_child: bool, + check_list: bool, + scc_measure_params: &Rc>>>, + si: &Rc>>, +) -> Rc>> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprLambda => Rc::new(vec![]), - ExprData::ExprCall { .. } => { - let callee = expr_call_func_at(body.clone(), si.clone()); -let own_edges = if set_has(target_set.clone(), callee.clone()) { - { - let callee_params = match v2_rt::map_get(&scc_measure_params, callee.clone()) { - Some(p) => p.clone(), - None => v2_rt::rc_empty_map::(), -}; -let progress = body.children.clone().iter().cloned().fold(DescentEvidence::DescentUnknown, |acc: DescentEvidence, arg_node: Rc| { - let targets_measure = match arg_name_at(arg_node.clone(), si.clone()) { - Some(aname) => (v2_rt::map_get(&callee_params, aname.clone()) != None), - None => false, -}; -if targets_measure.clone() { - { - let arg_progress = classify_scc_call_progress(&arg_value(&arg_node), ¶m_name, &descent_vars, &si); -match arg_progress.clone() { - DescentEvidence::Strict => DescentEvidence::Strict, - DescentEvidence::NonIncreasing => match acc.clone() { - DescentEvidence::Strict => acc.clone(), - _ => DescentEvidence::NonIncreasing, -}, - DescentEvidence::DescentUnknown => acc.clone(), -} -} - } else { - acc.clone() + ExprData::ExprLambda => Rc::new(vec![]), + ExprData::ExprCall { .. } => { + let callee = expr_call_func_at(body.clone(), si.clone()); + let own_edges = if set_has(target_set.clone(), callee.clone()) { + { + let callee_params = + match v2_rt::map_get(&scc_measure_params, callee.clone()) { + Some(p) => p.clone(), + None => v2_rt::rc_empty_map::(), + }; + let progress = body.children.clone().iter().cloned().fold( + DescentEvidence::DescentUnknown, + |acc: DescentEvidence, arg_node: Rc| { + let targets_measure = + match arg_name_at(arg_node.clone(), si.clone()) { + Some(aname) => { + (v2_rt::map_get(&callee_params, aname.clone()) != None) + } + None => false, + }; + if targets_measure.clone() { + { + let arg_progress = classify_scc_call_progress( + &arg_value(&arg_node), + ¶m_name, + &descent_vars, + &si, + ); + match arg_progress.clone() { + DescentEvidence::Strict => DescentEvidence::Strict, + DescentEvidence::NonIncreasing => match acc.clone() { + DescentEvidence::Strict => acc.clone(), + _ => DescentEvidence::NonIncreasing, + }, + DescentEvidence::DescentUnknown => acc.clone(), + } + } + } else { + acc.clone() + } + }, + ); + Rc::new(vec![Rc::new(ParserProgressEdge { + caller: caller.clone(), + callee: callee.clone(), + progress: progress, + })]) + } + } else { + Rc::new(vec![]) + }; + let child_edges = Rc::new({ + let mut __result = Vec::new(); + for child in body.children.clone().iter().cloned() { + __result.extend( + (*collect_scc_child_edges( + &child, + &caller, + ¶m_name, + &descent_vars, + &target_set, + check_child.clone(), + check_list.clone(), + &scc_measure_params, + &si, + )) + .iter() + .cloned(), + ); + } + __result + }); + v2_rt::concat(own_edges, child_edges) + } + ExprData::ExprMethodCall { + method_semantics: ms, + .. + } => { + let receiver = method_receiver(body.clone()); + let is_iter = is_algebra_iteration_method(ms.clone()); + let is_struct = is_structural_children(&receiver, ¶m_name, &descent_vars, &si); + if (is_iter && is_struct) { + { + let recv_edges = collect_scc_child_edges( + &receiver, + &caller, + ¶m_name, + &descent_vars, + &target_set, + check_child.clone(), + check_list.clone(), + &scc_measure_params, + &si, + ); + let args_edges = Rc::new({ + let mut __result = Vec::new(); + for arg_node in method_arg_nodes(body.clone()).iter().cloned() { + __result.extend( + (*{ + let arg_val = arg_value(&arg_node); + match (*arg_val.expr_data.clone()).clone() { + ExprData::ExprLambda => match iteration_element_name( + ms.clone(), + arg_val.clone(), + si.clone(), + ) { + Some(iter_name) => { + let ext_vars = v2_rt::rc_map_insert( + descent_vars.clone(), + iter_name.clone(), + true, + ); + collect_scc_child_edges( + &lambda_body(arg_val.clone()), + &caller, + ¶m_name, + &ext_vars, + &target_set, + check_child.clone(), + check_list.clone(), + &scc_measure_params, + &si, + ) + } + None => Rc::new(vec![]), + }, + _ => collect_scc_child_edges( + &arg_val, + &caller, + ¶m_name, + &descent_vars, + &target_set, + check_child.clone(), + check_list.clone(), + &scc_measure_params, + &si, + ), + } + }) + .iter() + .cloned(), + ); + } + __result + }); + v2_rt::concat(recv_edges, args_edges) + } + } else { + Rc::new({ + let mut __result = Vec::new(); + for child in body.children.clone().iter().cloned() { + __result.extend( + (*collect_scc_child_edges( + &child, + &caller, + ¶m_name, + &descent_vars, + &target_set, + check_child.clone(), + check_list.clone(), + &scc_measure_params, + &si, + )) + .iter() + .cloned(), + ); } -}); -Rc::new(vec![Rc::new(ParserProgressEdge { - caller: caller.clone(), - callee: callee.clone(), - progress: progress, -})]) -} - } else { - Rc::new(vec![]) - }; -let child_edges = Rc::new({ let mut __result = Vec::new(); for child in body.children.clone().iter().cloned() { __result.extend((*collect_scc_child_edges(&child, &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si)).iter().cloned()); } __result }); -v2_rt::concat(own_edges, child_edges) -}, - ExprData::ExprMethodCall { method_semantics: ms, .. } => { - let receiver = method_receiver(body.clone()); -let is_iter = is_algebra_iteration_method(ms.clone()); -let is_struct = is_structural_children(&receiver, ¶m_name, &descent_vars, &si); -if (is_iter && is_struct) { - { - let recv_edges = collect_scc_child_edges(&receiver, &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si); -let args_edges = Rc::new({ let mut __result = Vec::new(); for arg_node in method_arg_nodes(body.clone()).iter().cloned() { __result.extend((*{ - let arg_val = arg_value(&arg_node); -match (*arg_val.expr_data.clone()).clone() { - ExprData::ExprLambda => match iteration_element_name(ms.clone(), arg_val.clone(), si.clone()) { - Some(iter_name) => { - let ext_vars = v2_rt::rc_map_insert(descent_vars.clone(), iter_name.clone(), true); -collect_scc_child_edges(&lambda_body(arg_val.clone()), &caller, ¶m_name, &ext_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si) -}, - None => Rc::new(vec![]), -}, - _ => collect_scc_child_edges(&arg_val, &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si), -} -}).iter().cloned()); } __result }); -v2_rt::concat(recv_edges, args_edges) -} - } else { - Rc::new({ let mut __result = Vec::new(); for child in body.children.clone().iter().cloned() { __result.extend((*collect_scc_child_edges(&child, &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si)).iter().cloned()); } __result }) + __result + }) + } } -}, - ExprData::ExprLet => { - let val = let_value(body.clone()); -let val_edges = collect_scc_child_edges(&val, &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si); -let is_direct = ((check_child.clone() && is_child_descent_expr(&val, ¶m_name, &descent_vars, &si)) || (check_list.clone() && is_list_shrink_expr(&val, param_name.clone(), si.clone()))); -let is_var = match (*val.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has(descent_vars.clone(), expr_var_name_at(val.clone(), si.clone())), - _ => false, -}; -let is_option = is_if_option_descent(&val, param_name.clone(), descent_vars.clone(), check_child.clone(), check_list.clone(), &si); -let is_match_descent = is_match_option_descent(&val, ¶m_name, descent_vars.clone(), check_child.clone(), check_list.clone(), &si); -let is_wrapped = if is_tree_size_preserving_wrapper(&val, si.clone()) { - { - let inner = wrapper_inner_arg(val.clone()); -let inner_d = ((check_child.clone() && is_child_descent_expr(&inner, ¶m_name, &descent_vars, &si)) || (check_list.clone() && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); -let inner_v = match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has(descent_vars.clone(), expr_var_name_at(inner.clone(), si.clone())), - _ => false, -}; -(inner_d.clone() || inner_v.clone()) -} - } else { - false - }; -let is_extraction = if is_sub_value_extractor(&val, si.clone()) { + ExprData::ExprLet => { + let val = let_value(body.clone()); + let val_edges = collect_scc_child_edges( + &val, + &caller, + ¶m_name, + &descent_vars, + &target_set, + check_child.clone(), + check_list.clone(), + &scc_measure_params, + &si, + ); + let is_direct = ((check_child.clone() + && is_child_descent_expr(&val, ¶m_name, &descent_vars, &si)) + || (check_list.clone() + && is_list_shrink_expr(&val, param_name.clone(), si.clone()))); + let is_var = match (*val.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has( + descent_vars.clone(), + expr_var_name_at(val.clone(), si.clone()), + ), + _ => false, + }; + let is_option = is_if_option_descent( + &val, + param_name.clone(), + descent_vars.clone(), + check_child.clone(), + check_list.clone(), + &si, + ); + let is_match_descent = is_match_option_descent( + &val, + ¶m_name, + descent_vars.clone(), + check_child.clone(), + check_list.clone(), + &si, + ); + let is_wrapped = if is_tree_size_preserving_wrapper(&val, si.clone()) { + { + let inner = wrapper_inner_arg(val.clone()); + let inner_d = ((check_child.clone() + && is_child_descent_expr(&inner, ¶m_name, &descent_vars, &si)) + || (check_list.clone() + && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); + let inner_v = match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has( + descent_vars.clone(), + expr_var_name_at(inner.clone(), si.clone()), + ), + _ => false, + }; + (inner_d.clone() || inner_v.clone()) + } + } else { + false + }; + let is_extraction = if is_sub_value_extractor(&val, si.clone()) { + { + let inner = extractor_inner_arg(val.clone()); + let inner_d = ((check_child.clone() + && is_child_descent_expr(&inner, ¶m_name, &descent_vars, &si)) + || (check_list.clone() + && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); + let inner_v = match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has( + descent_vars.clone(), + expr_var_name_at(inner.clone(), si.clone()), + ), + _ => false, + }; + let inner_p = match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + (expr_var_name_at(inner.clone(), si.clone()).as_str() + == param_name.clone().as_str()) + } + _ => false, + }; + ((inner_d.clone() || inner_v.clone()) || inner_p) + } + } else { + false + }; + let is_children_list = match (*val.expr_data.clone()).clone() { + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(val.clone()); + let field = field_access_field_at(val.clone(), si.clone()); + (is_children_list_field(field) + && match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at(base.clone(), si.clone()); + ((bname.clone().as_str() == param_name.clone().as_str()) + || set_has(descent_vars.clone(), bname.clone())) + } + _ => false, + }) + } + _ => false, + }; + let is_passthrough = if is_list_passthrough_call(val.clone(), si.clone()) { + match list_passthrough_inner_arg(val.clone(), si.clone()) { + Some(inner) => { + (((check_child.clone() + && is_child_descent_expr(&inner, ¶m_name, &descent_vars, &si)) + || (check_list.clone() + && is_list_shrink_expr( + &inner, + param_name.clone(), + si.clone(), + ))) + || match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => set_has( + descent_vars.clone(), + expr_var_name_at(inner.clone(), si.clone()), + ), + _ => false, + }) + } + None => false, + } + } else { + false + }; + let is_consuming_helper = (check_list.clone() + && is_tokens_consuming_call( + &val, + param_name.clone(), + descent_vars.clone(), + &si, + )); + let next_vars = if ((((((((is_direct || is_var) || is_option) + || is_match_descent) + || is_wrapped) + || is_extraction) + || is_children_list) + || is_passthrough) + || is_consuming_helper) { - let inner = extractor_inner_arg(val.clone()); -let inner_d = ((check_child.clone() && is_child_descent_expr(&inner, ¶m_name, &descent_vars, &si)) || (check_list.clone() && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))); -let inner_v = match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has(descent_vars.clone(), expr_var_name_at(inner.clone(), si.clone())), - _ => false, -}; -let inner_p = match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => (expr_var_name_at(inner.clone(), si.clone()).as_str() == param_name.clone().as_str()), - _ => false, -}; -((inner_d.clone() || inner_v.clone()) || inner_p) -} - } else { - false - }; -let is_children_list = match (*val.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(val.clone()); -let field = field_access_field_at(val.clone(), si.clone()); -(is_children_list_field(field) && match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at(base.clone(), si.clone()); -((bname.clone().as_str() == param_name.clone().as_str()) || set_has(descent_vars.clone(), bname.clone())) -}, - _ => false, -}) -}, - _ => false, -}; -let is_passthrough = if is_list_passthrough_call(val.clone(), si.clone()) { - match list_passthrough_inner_arg(val.clone(), si.clone()) { - Some(inner) => (((check_child.clone() && is_child_descent_expr(&inner, ¶m_name, &descent_vars, &si)) || (check_list.clone() && is_list_shrink_expr(&inner, param_name.clone(), si.clone()))) || match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => set_has(descent_vars.clone(), expr_var_name_at(inner.clone(), si.clone())), - _ => false, -}), - None => false, -} - } else { - false - }; -let is_consuming_helper = (check_list.clone() && is_tokens_consuming_call(&val, param_name.clone(), descent_vars.clone(), &si)); -let next_vars = if ((((((((is_direct || is_var) || is_option) || is_match_descent) || is_wrapped) || is_extraction) || is_children_list) || is_passthrough) || is_consuming_helper) { - v2_rt::rc_map_insert(descent_vars.clone(), let_binding_name_at(body.clone(), si.clone()), true) - } else { - descent_vars.clone() - }; -let body_edges = match let_body(body.clone()) { - Some(b) => collect_scc_child_edges(&b, &caller, ¶m_name, &next_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si), - None => Rc::new(vec![]), -}; -v2_rt::concat(val_edges, body_edges) -}, - ExprData::ExprMatch => { - let scrut = match_scrutinee(body.clone()); -let scrut_edges = collect_scc_child_edges(&scrut, &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si); -let arms_edges = Rc::new({ let mut __result = Vec::new(); for arm_node in match_arm_nodes(body.clone()).iter().cloned() { __result.extend((*collect_scc_child_edges(&arm_body(&arm_node), &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si)).iter().cloned()); } __result }); -v2_rt::concat(scrut_edges, arms_edges) -}, - ExprData::ExprBlock => { - let result = body.children.clone().iter().cloned().fold(Rc::new(SccEdgeBlockAcc { - edges: Rc::new(vec![]), - vars: descent_vars.clone(), -}), |acc: Rc, stmt: Rc| { - let stmt_edges = collect_scc_child_edges(&stmt, &caller, ¶m_name, &acc.vars.clone(), &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si); -let next_vars = collect_descent_vars(&stmt, ¶m_name, &acc.vars.clone(), check_child.clone(), check_list.clone(), &si); -Rc::new(SccEdgeBlockAcc { - edges: v2_rt::concat(acc.edges.clone(), stmt_edges.clone()), - vars: next_vars.clone(), -}) -}); -result.edges.clone() -}, - ExprData::ExprIf => { - let cond_edges = collect_scc_child_edges(&if_condition(body.clone()), &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si); -let then_branch = if_then_branch(body.clone()); -let else_opt = if_else_branch(body.clone()); -let then_edges = collect_scc_child_edges(&then_branch, &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si); -let else_edges = match else_opt { - Some(eb) => collect_scc_child_edges(&eb, &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si), - None => Rc::new(vec![]), -}; -v2_rt::concat(cond_edges, v2_rt::concat(then_edges, else_edges)) -}, - _ => Rc::new({ let mut __result = Vec::new(); for child in body.children.clone().iter().cloned() { __result.extend((*collect_scc_child_edges(&child, &caller, ¶m_name, &descent_vars, &target_set, check_child.clone(), check_list.clone(), &scc_measure_params, &si)).iter().cloned()); } __result }), -} + v2_rt::rc_map_insert( + descent_vars.clone(), + let_binding_name_at(body.clone(), si.clone()), + true, + ) + } else { + descent_vars.clone() + }; + let body_edges = match let_body(body.clone()) { + Some(b) => collect_scc_child_edges( + &b, + &caller, + ¶m_name, + &next_vars, + &target_set, + check_child.clone(), + check_list.clone(), + &scc_measure_params, + &si, + ), + None => Rc::new(vec![]), + }; + v2_rt::concat(val_edges, body_edges) + } + ExprData::ExprMatch => { + let scrut = match_scrutinee(body.clone()); + let scrut_edges = collect_scc_child_edges( + &scrut, + &caller, + ¶m_name, + &descent_vars, + &target_set, + check_child.clone(), + check_list.clone(), + &scc_measure_params, + &si, + ); + let arms_edges = Rc::new({ + let mut __result = Vec::new(); + for arm_node in match_arm_nodes(body.clone()).iter().cloned() { + __result.extend( + (*collect_scc_child_edges( + &arm_body(&arm_node), + &caller, + ¶m_name, + &descent_vars, + &target_set, + check_child.clone(), + check_list.clone(), + &scc_measure_params, + &si, + )) + .iter() + .cloned(), + ); + } + __result + }); + v2_rt::concat(scrut_edges, arms_edges) + } + ExprData::ExprBlock => { + let result = body.children.clone().iter().cloned().fold( + Rc::new(SccEdgeBlockAcc { + edges: Rc::new(vec![]), + vars: descent_vars.clone(), + }), + |acc: Rc, stmt: Rc| { + let stmt_edges = collect_scc_child_edges( + &stmt, + &caller, + ¶m_name, + &acc.vars.clone(), + &target_set, + check_child.clone(), + check_list.clone(), + &scc_measure_params, + &si, + ); + let next_vars = collect_descent_vars( + &stmt, + ¶m_name, + &acc.vars.clone(), + check_child.clone(), + check_list.clone(), + &si, + ); + Rc::new(SccEdgeBlockAcc { + edges: v2_rt::concat(acc.edges.clone(), stmt_edges.clone()), + vars: next_vars.clone(), + }) + }, + ); + result.edges.clone() + } + ExprData::ExprIf => { + let cond_edges = collect_scc_child_edges( + &if_condition(body.clone()), + &caller, + ¶m_name, + &descent_vars, + &target_set, + check_child.clone(), + check_list.clone(), + &scc_measure_params, + &si, + ); + let then_branch = if_then_branch(body.clone()); + let else_opt = if_else_branch(body.clone()); + let then_edges = collect_scc_child_edges( + &then_branch, + &caller, + ¶m_name, + &descent_vars, + &target_set, + check_child.clone(), + check_list.clone(), + &scc_measure_params, + &si, + ); + let else_edges = match else_opt { + Some(eb) => collect_scc_child_edges( + &eb, + &caller, + ¶m_name, + &descent_vars, + &target_set, + check_child.clone(), + check_list.clone(), + &scc_measure_params, + &si, + ), + None => Rc::new(vec![]), + }; + v2_rt::concat(cond_edges, v2_rt::concat(then_edges, else_edges)) + } + _ => Rc::new({ + let mut __result = Vec::new(); + for child in body.children.clone().iter().cloned() { + __result.extend( + (*collect_scc_child_edges( + &child, + &caller, + ¶m_name, + &descent_vars, + &target_set, + check_child.clone(), + check_list.clone(), + &scc_measure_params, + &si, + )) + .iter() + .cloned(), + ); + } + __result + }), + } }) } -pub fn is_scc_container_child_descent(members: &Rc>, func_index: &Rc>>, scc_name_set: Rc>, si: &Rc>>) -> bool { +pub fn is_scc_container_child_descent( + members: &Rc>, + func_index: &Rc>>, + scc_name_set: Rc>, + si: &Rc>>, +) -> bool { { - let measure_params = build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); -let edges = Rc::new({ let mut __result = Vec::new(); for name in members.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { - Some(entry) => { - let best_edges = entry.params.clone().iter().cloned().fold(Rc::new(vec![]), |best: _, p: Rc| { - let pname = param_node_name_at(p.clone(), si.clone()); -let descent_vars = collect_descent_vars(&entry.body.clone(), &pname, &v2_rt::rc_empty_map::(), true, true, &si); -let param_edges = collect_scc_child_edges(&entry.body.clone(), &name, &pname, &descent_vars, &scc_name_set, true, true, &measure_params, &si); -let unknown_count = count_unknown_progress_edges(param_edges.clone()); -let best_unknown = count_unknown_progress_edges(best.clone()); -if (((best.clone().len() as i64) == 0) || (unknown_count.clone() < best_unknown.clone())) { - param_edges.clone() - } else { - best.clone() - } -}); -best_edges.clone() -}, - None => Rc::new(vec![]), -}).iter().cloned()); } __result }); -let unknown_edge_count = count_unknown_progress_edges(edges.clone()); -(((unknown_edge_count == 0) && ((edges.clone().len() as i64) > 0)) && (same_progress_subgraph_has_cycle(&members, edges.clone()) == false)) -} + let measure_params = + build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); + let edges = Rc::new({ + let mut __result = Vec::new(); + for name in members.clone().iter().cloned() { + __result.extend( + (*match v2_rt::map_get(&func_index, name.clone()) { + Some(entry) => { + let best_edges = entry.params.clone().iter().cloned().fold( + Rc::new(vec![]), + |best: _, p: Rc| { + let pname = param_node_name_at(p.clone(), si.clone()); + let descent_vars = collect_descent_vars( + &entry.body.clone(), + &pname, + &v2_rt::rc_empty_map::(), + true, + true, + &si, + ); + let param_edges = collect_scc_child_edges( + &entry.body.clone(), + &name, + &pname, + &descent_vars, + &scc_name_set, + true, + true, + &measure_params, + &si, + ); + let unknown_count = + count_unknown_progress_edges(param_edges.clone()); + let best_unknown = count_unknown_progress_edges(best.clone()); + if (((best.clone().len() as i64) == 0) + || (unknown_count.clone() < best_unknown.clone())) + { + param_edges.clone() + } else { + best.clone() + } + }, + ); + best_edges.clone() + } + None => Rc::new(vec![]), + }) + .iter() + .cloned(), + ); + } + __result + }); + let unknown_edge_count = count_unknown_progress_edges(edges.clone()); + (((unknown_edge_count == 0) && ((edges.clone().len() as i64) > 0)) + && (same_progress_subgraph_has_cycle(&members, edges.clone()) == false)) + } } pub fn progress_edge_to_proof_edge(pe: &Rc) -> Rc { Rc::new(ProofEdge { - caller: pe.caller.clone(), - callee: pe.callee.clone(), - evidence: Rc::new(vec![pe.progress.clone()]), -}) + caller: pe.caller.clone(), + callee: pe.callee.clone(), + evidence: Rc::new(vec![pe.progress.clone()]), + }) } pub fn count_unknown_progress_edges(edges: Rc>>) -> i64 { - (Rc::new({ let mut __result = Vec::new(); for e in edges.iter().cloned() { if (e.progress.clone() == DescentEvidence::DescentUnknown) { __result.push(e); } } __result }).len() as i64) + (Rc::new({ + let mut __result = Vec::new(); + for e in edges.iter().cloned() { + if (e.progress.clone() == DescentEvidence::DescentUnknown) { + __result.push(e); + } + } + __result + }) + .len() as i64) } pub fn count_unknown_proof_edges(edges: Rc>>) -> i64 { - (Rc::new({ let mut __result = Vec::new(); for e in edges.iter().cloned() { if match e.evidence.clone().first().cloned() { - Some(DescentEvidence::DescentUnknown) => true, - _ => false, -} { __result.push(e); } } __result }).len() as i64) + (Rc::new({ + let mut __result = Vec::new(); + for e in edges.iter().cloned() { + if match e.evidence.clone().first().cloned() { + Some(DescentEvidence::DescentUnknown) => true, + _ => false, + } { + __result.push(e); + } + } + __result + }) + .len() as i64) } -pub fn collect_scc_proof_edges_for_dim(members: &Rc>, func_index: &Rc>>, scc_name_set: Rc>, check_child: bool, check_list: bool, si: &Rc>>) -> Rc>> { +pub fn collect_scc_proof_edges_for_dim( + members: &Rc>, + func_index: &Rc>>, + scc_name_set: Rc>, + check_child: bool, + check_list: bool, + si: &Rc>>, +) -> Rc>> { { - let measure_params = build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); -Rc::new({ let mut __result = Vec::new(); for name in members.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { + let measure_params = + build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); + Rc::new({ + let mut __result = Vec::new(); + for name in members.clone().iter().cloned() { + __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { Some(entry) => { let best_map = entry.params.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |best: Rc>, p: Rc| { let pname = param_node_name_at(p.clone(), si.clone()); @@ -3058,22 +6295,40 @@ Rc::new(ProofEdge { }); } __result }) }, None => Rc::new(vec![]), -}).iter().cloned()); } __result }) -} +}).iter().cloned()); + } + __result + }) + } } -pub fn merge_edge_evidence(acc_map: Rc>, pe: &Rc) -> Rc> { +pub fn merge_edge_evidence( + acc_map: Rc>, + pe: &Rc, +) -> Rc> { map_evidence_merge_at(&acc_map, &pe.callee.clone(), pe.progress.clone()) } pub fn count_known_in_edge_map(m: &Rc>) -> i64 { - (Rc::new({ let mut __result = Vec::new(); for k in Rc::new(v2_rt::map_keys(&m)).iter().cloned() { if match v2_rt::map_get(&m, k.clone()) { - Some(DescentEvidence::DescentUnknown) => false, - _ => true, -} { __result.push(k); } } __result }).len() as i64) + (Rc::new({ + let mut __result = Vec::new(); + for k in Rc::new(v2_rt::map_keys(&m)).iter().cloned() { + if match v2_rt::map_get(&m, k.clone()) { + Some(DescentEvidence::DescentUnknown) => false, + _ => true, + } { + __result.push(k); + } + } + __result + }) + .len() as i64) } -pub fn pick_best_param_edges(current: Rc>, candidate: Rc>) -> Rc> { +pub fn pick_best_param_edges( + current: Rc>, + candidate: Rc>, +) -> Rc> { if (count_known_in_edge_map(&candidate) > count_known_in_edge_map(¤t)) { candidate.clone() } else { @@ -3081,10 +6336,19 @@ pub fn pick_best_param_edges(current: Rc>, cand } } -pub fn collect_scc_independent_dim_edges(members: &Rc>, func_index: &Rc>>, scc_name_set: Rc>, si: &Rc>>) -> Rc>> { +pub fn collect_scc_independent_dim_edges( + members: &Rc>, + func_index: &Rc>>, + scc_name_set: Rc>, + si: &Rc>>, +) -> Rc>> { { - let measure_params = build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); -Rc::new({ let mut __result = Vec::new(); for name in members.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { + let measure_params = + build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); + Rc::new({ + let mut __result = Vec::new(); + for name in members.clone().iter().cloned() { + __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { Some(entry) => { let tree_edge_map = entry.params.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |best_map: Rc>, p: Rc| { let pname = param_node_name_at(p.clone(), si.clone()); @@ -3119,26 +6383,50 @@ Rc::new(ProofEdge { }); } __result }) }, None => Rc::new(vec![]), -}).iter().cloned()); } __result }) -} +}).iter().cloned()); + } + __result + }) + } } -pub fn collect_scc_parser_proof_edges(members: Rc>, func_index: Rc>>, scc_name_set: Rc>, si: Rc>>) -> Rc>> { +pub fn collect_scc_parser_proof_edges( + members: Rc>, + func_index: Rc>>, + scc_name_set: Rc>, + si: Rc>>, +) -> Rc>> { { let edges = collect_parser_edges_for_scc(&members, &func_index, scc_name_set, &si); -Rc::new({ let mut __result = Vec::new(); for pe in edges.iter().cloned() { __result.push(progress_edge_to_proof_edge(&pe)); } __result }) -} + Rc::new({ + let mut __result = Vec::new(); + for pe in edges.iter().cloned() { + __result.push(progress_edge_to_proof_edge(&pe)); + } + __result + }) + } } -pub fn collect_scc_tree_parser_dim_edges(members: &Rc>, func_index: &Rc>>, scc_name_set: &Rc>, si: &Rc>>) -> Rc>> { +pub fn collect_scc_tree_parser_dim_edges( + members: &Rc>, + func_index: &Rc>>, + scc_name_set: &Rc>, + si: &Rc>>, +) -> Rc>> { { - let all_parser_edges = collect_parser_edges_for_scc(&members, &func_index, scc_name_set.clone(), &si); -if ((all_parser_edges.clone().len() as i64) == 0) { + let all_parser_edges = + collect_parser_edges_for_scc(&members, &func_index, scc_name_set.clone(), &si); + if ((all_parser_edges.clone().len() as i64) == 0) { Rc::new(vec![]) } else { { - let measure_params = build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); -Rc::new({ let mut __result = Vec::new(); for name in members.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { + let measure_params = + build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); + Rc::new({ + let mut __result = Vec::new(); + for name in members.clone().iter().cloned() { + __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { Some(entry) => { let tree_edge_map = entry.params.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |best_map: Rc>, p: Rc| { let pname = param_node_name_at(p.clone(), si.clone()); @@ -3168,16 +6456,28 @@ Rc::new(ProofEdge { }); } __result }) }, None => Rc::new(vec![]), -}).iter().cloned()); } __result }) -} +}).iter().cloned()); + } + __result + }) + } } -} + } } -pub fn collect_scc_cx_l2_tree_edges(members: &Rc>, func_index: &Rc>>, scc_name_set: Rc>, si: &Rc>>) -> Rc>> { +pub fn collect_scc_cx_l2_tree_edges( + members: &Rc>, + func_index: &Rc>>, + scc_name_set: Rc>, + si: &Rc>>, +) -> Rc>> { { - let measure_params = build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); -Rc::new({ let mut __result = Vec::new(); for name in members.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { + let measure_params = + build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); + Rc::new({ + let mut __result = Vec::new(); + for name in members.clone().iter().cloned() { + __result.extend((*match v2_rt::map_get(&func_index, name.clone()) { Some(entry) => { let self_evidence = collect_self_call_evidence(entry.body.clone(), name.clone(), si.clone()); let self_has_calls = ((self_evidence.clone().len() as i64) > 0); @@ -3251,303 +6551,562 @@ Rc::new(vec![Rc::new(ProofEdge { v2_rt::concat(self_edge.clone(), cross_edges.clone()) }, None => Rc::new(vec![]), -}).iter().cloned()); } __result }) -} +}).iter().cloned()); + } + __result + }) + } } -pub fn scc_descending_param(members: Rc>, func_index: Rc>>, si: Rc>>) -> String { - members.iter().cloned().fold("".to_string(), |found: String, name: String| if (found.clone().as_str() != "".to_string().as_str()) { - found.clone() - } else { - match v2_rt::map_get(&func_index, name.clone()) { - Some(entry) => { - let evidence = collect_self_call_evidence(entry.body.clone(), name.clone(), si.clone()); -match evidence.clone().first().cloned() { - Some(call_ev) => call_ev.clone().iter().cloned().fold("".to_string(), |p: String, rel: Rc| if (p.clone().as_str() != "".to_string().as_str()) { - p.clone() +pub fn scc_descending_param( + members: Rc>, + func_index: Rc>>, + si: Rc>>, +) -> String { + members + .iter() + .cloned() + .fold("".to_string(), |found: String, name: String| { + if (found.clone().as_str() != "".to_string().as_str()) { + found.clone() } else { - match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), - SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), - SubValueRelation::ArithmeticDescent { param: ap, .. } => ap.clone(), - _ => "".to_string(), -} - }), - None => "".to_string(), -} -}, - None => "".to_string(), -} - }) + match v2_rt::map_get(&func_index, name.clone()) { + Some(entry) => { + let evidence = collect_self_call_evidence( + entry.body.clone(), + name.clone(), + si.clone(), + ); + match evidence.clone().first().cloned() { + Some(call_ev) => call_ev.clone().iter().cloned().fold( + "".to_string(), + |p: String, rel: Rc| { + if (p.clone().as_str() != "".to_string().as_str()) { + p.clone() + } else { + match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { + field: f, .. + } => f.element_type.clone(), + SubValueRelation::IteratedSubValue { + field: f, .. + } => f.element_type.clone(), + SubValueRelation::ArithmeticDescent { + param: ap, + .. + } => ap.clone(), + _ => "".to_string(), + } + } + }, + ), + None => "".to_string(), + } + } + None => "".to_string(), + } + } + }) } -pub fn construct_scc_termination_proof(members: &Rc>, func_index: &Rc>>, scc_name_set: &Rc>, si: &Rc>>) -> Option> { +pub fn construct_scc_termination_proof( + members: &Rc>, + func_index: &Rc>>, + scc_name_set: &Rc>, + si: &Rc>>, +) -> Option> { { - let cx_l2_edges = collect_scc_cx_l2_tree_edges(&members, &func_index, scc_name_set.clone(), &si); -let cx_l2_all_known = { let mut __all = true; for e in cx_l2_edges.clone().iter().cloned() { if !(match e.evidence.clone().first().cloned() { - Some(DescentEvidence::DescentUnknown) => false, - _ => true, -}) { __all = false; break; } } __all }; -let cx_l2_param = scc_descending_param(members.clone(), func_index.clone(), si.clone()); -let cx_l2_proof = Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { - param: if (cx_l2_param.clone().as_str() != "".to_string().as_str()) { - cx_l2_param.clone() - } else { - "scc".to_string() - }, -})]), -}); -if ((cx_l2_all_known && ((cx_l2_edges.clone().len() as i64) > 0)) && (proof_has_non_descending_cycle(cx_l2_proof.clone(), members.clone(), cx_l2_edges.clone()) == false)) { + let cx_l2_edges = + collect_scc_cx_l2_tree_edges(&members, &func_index, scc_name_set.clone(), &si); + let cx_l2_all_known = { + let mut __all = true; + for e in cx_l2_edges.clone().iter().cloned() { + if !(match e.evidence.clone().first().cloned() { + Some(DescentEvidence::DescentUnknown) => false, + _ => true, + }) { + __all = false; + break; + } + } + __all + }; + let cx_l2_param = scc_descending_param(members.clone(), func_index.clone(), si.clone()); + let cx_l2_proof = Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { + param: if (cx_l2_param.clone().as_str() != "".to_string().as_str()) { + cx_l2_param.clone() + } else { + "scc".to_string() + }, + })]), + }); + if ((cx_l2_all_known && ((cx_l2_edges.clone().len() as i64) > 0)) + && (proof_has_non_descending_cycle( + cx_l2_proof.clone(), + members.clone(), + cx_l2_edges.clone(), + ) == false)) + { Some(cx_l2_proof.clone()) } else { { - let tree_edges = collect_scc_proof_edges_for_dim(&members, &func_index, scc_name_set.clone(), true, false, &si); -let tree_all_known = { let mut __all = true; for e in tree_edges.clone().iter().cloned() { if !(match e.evidence.clone().first().cloned() { - Some(DescentEvidence::DescentUnknown) => false, - _ => true, -}) { __all = false; break; } } __all }; -let tree_proof = Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { - param: "scc".to_string(), -})]), -}); -if ((tree_all_known && ((tree_edges.clone().len() as i64) > 0)) && (proof_has_non_descending_cycle(tree_proof.clone(), members.clone(), tree_edges.clone()) == false)) { + let tree_edges = collect_scc_proof_edges_for_dim( + &members, + &func_index, + scc_name_set.clone(), + true, + false, + &si, + ); + let tree_all_known = { + let mut __all = true; + for e in tree_edges.clone().iter().cloned() { + if !(match e.evidence.clone().first().cloned() { + Some(DescentEvidence::DescentUnknown) => false, + _ => true, + }) { + __all = false; + break; + } + } + __all + }; + let tree_proof = Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { + param: "scc".to_string(), + })]), + }); + if ((tree_all_known && ((tree_edges.clone().len() as i64) > 0)) + && (proof_has_non_descending_cycle( + tree_proof.clone(), + members.clone(), + tree_edges.clone(), + ) == false)) + { Some(tree_proof.clone()) } else { { - let list_edges = collect_scc_proof_edges_for_dim(&members, &func_index, scc_name_set.clone(), false, true, &si); -let list_all_known = { let mut __all = true; for e in list_edges.clone().iter().cloned() { if !(match e.evidence.clone().first().cloned() { - Some(DescentEvidence::DescentUnknown) => false, - _ => true, -}) { __all = false; break; } } __all }; -let list_proof = Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::ListLength { - param: "scc".to_string(), -})]), -}); -if ((list_all_known && ((list_edges.clone().len() as i64) > 0)) && (proof_has_non_descending_cycle(list_proof.clone(), members.clone(), list_edges.clone()) == false)) { + let list_edges = collect_scc_proof_edges_for_dim( + &members, + &func_index, + scc_name_set.clone(), + false, + true, + &si, + ); + let list_all_known = { + let mut __all = true; + for e in list_edges.clone().iter().cloned() { + if !(match e.evidence.clone().first().cloned() { + Some(DescentEvidence::DescentUnknown) => false, + _ => true, + }) { + __all = false; + break; + } + } + __all + }; + let list_proof = Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new(RankingDimension::ListLength { + param: "scc".to_string(), + })]), + }); + if ((list_all_known && ((list_edges.clone().len() as i64) > 0)) + && (proof_has_non_descending_cycle( + list_proof.clone(), + members.clone(), + list_edges.clone(), + ) == false)) + { Some(list_proof.clone()) } else { { - let parser_edges = collect_scc_parser_proof_edges(members.clone(), func_index.clone(), scc_name_set.clone(), si.clone()); -let parser_all_known = { let mut __all = true; for e in parser_edges.clone().iter().cloned() { if !(match e.evidence.clone().first().cloned() { - Some(DescentEvidence::DescentUnknown) => false, - _ => true, -}) { __all = false; break; } } __all }; -let parser_proof = Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::TokenPosition { - param: "scc".to_string(), -})]), -}); -if ((parser_all_known && ((parser_edges.clone().len() as i64) > 0)) && (proof_has_non_descending_cycle(parser_proof.clone(), members.clone(), parser_edges.clone()) == false)) { + let parser_edges = collect_scc_parser_proof_edges( + members.clone(), + func_index.clone(), + scc_name_set.clone(), + si.clone(), + ); + let parser_all_known = { + let mut __all = true; + for e in parser_edges.clone().iter().cloned() { + if !(match e.evidence.clone().first().cloned() { + Some(DescentEvidence::DescentUnknown) => false, + _ => true, + }) { + __all = false; + break; + } + } + __all + }; + let parser_proof = Rc::new(TerminationProof { + dimensions: Rc::new(vec![Rc::new( + RankingDimension::TokenPosition { + param: "scc".to_string(), + }, + )]), + }); + if ((parser_all_known && ((parser_edges.clone().len() as i64) > 0)) + && (proof_has_non_descending_cycle( + parser_proof.clone(), + members.clone(), + parser_edges.clone(), + ) == false)) + { Some(parser_proof.clone()) } else { { - let lex_edges = collect_scc_independent_dim_edges(&members, &func_index, scc_name_set.clone(), &si); -let lex_all_known = { let mut __all = true; for e in lex_edges.clone().iter().cloned() { if !(match e.evidence.clone().first().cloned() { - Some(ev) => match ev.clone() { - DescentEvidence::DescentUnknown => false, - _ => true, -}, - None => false, -}) { __all = false; break; } } __all }; -let lex_proof = Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { - param: "scc".to_string(), -}), Rc::new(RankingDimension::ListLength { - param: "scc".to_string(), -})]), -}); -if ((lex_all_known && ((lex_edges.clone().len() as i64) > 0)) && (proof_has_non_descending_cycle(lex_proof.clone(), members.clone(), lex_edges.clone()) == false)) { + let lex_edges = collect_scc_independent_dim_edges( + &members, + &func_index, + scc_name_set.clone(), + &si, + ); + let lex_all_known = { + let mut __all = true; + for e in lex_edges.clone().iter().cloned() { + if !(match e.evidence.clone().first().cloned() { + Some(ev) => match ev.clone() { + DescentEvidence::DescentUnknown => false, + _ => true, + }, + None => false, + }) { + __all = false; + break; + } + } + __all + }; + let lex_proof = Rc::new(TerminationProof { + dimensions: Rc::new(vec![ + Rc::new(RankingDimension::TreeSize { + param: "scc".to_string(), + }), + Rc::new(RankingDimension::ListLength { + param: "scc".to_string(), + }), + ]), + }); + if ((lex_all_known + && ((lex_edges.clone().len() as i64) > 0)) + && (proof_has_non_descending_cycle( + lex_proof.clone(), + members.clone(), + lex_edges.clone(), + ) == false)) + { Some(lex_proof.clone()) } else { { - let tree_parser_edges = collect_scc_tree_parser_dim_edges(&members, &func_index, &scc_name_set, &si); -let tp_all_known = { let mut __all = true; for e in tree_parser_edges.clone().iter().cloned() { if !(match e.evidence.clone().first().cloned() { - Some(ev) => match ev.clone() { - DescentEvidence::DescentUnknown => false, - _ => true, -}, - None => false, -}) { __all = false; break; } } __all }; -let tp_proof = Rc::new(TerminationProof { - dimensions: Rc::new(vec![Rc::new(RankingDimension::TreeSize { - param: "scc".to_string(), -}), Rc::new(RankingDimension::TokenPosition { - param: "scc".to_string(), -})]), -}); -if ((tp_all_known && ((tree_parser_edges.clone().len() as i64) > 0)) && (proof_has_non_descending_cycle(tp_proof.clone(), members.clone(), tree_parser_edges.clone()) == false)) { + let tree_parser_edges = + collect_scc_tree_parser_dim_edges( + &members, + &func_index, + &scc_name_set, + &si, + ); + let tp_all_known = { + let mut __all = true; + for e in + tree_parser_edges.clone().iter().cloned() + { + if !(match e + .evidence + .clone() + .first() + .cloned() + { + Some(ev) => match ev.clone() { + DescentEvidence::DescentUnknown => { + false + } + _ => true, + }, + None => false, + }) { + __all = false; + break; + } + } + __all + }; + let tp_proof = Rc::new(TerminationProof { + dimensions: Rc::new(vec![ + Rc::new(RankingDimension::TreeSize { + param: "scc".to_string(), + }), + Rc::new(RankingDimension::TokenPosition { + param: "scc".to_string(), + }), + ]), + }); + if ((tp_all_known + && ((tree_parser_edges.clone().len() as i64) + > 0)) + && (proof_has_non_descending_cycle( + tp_proof.clone(), + members.clone(), + tree_parser_edges.clone(), + ) == false)) + { Some(tp_proof.clone()) } else { None } -} + } } -} + } } -} + } } -} + } } -} + } } -} + } } -pub fn classify_scc_recursion_pattern(members: &Rc>, func_index: &Rc>>, si: &Rc>>) -> Rc { +pub fn classify_scc_recursion_pattern( + members: &Rc>, + func_index: &Rc>>, + si: &Rc>>, +) -> Rc { { - let scc_name_set = members.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, name.clone(), true)); -let proof = construct_scc_termination_proof(&members, &func_index, &scc_name_set, &si); -match proof { - Some(p) => lower_call_pattern(proof_to_call_pattern(p.clone())), - None => { - let scc_measure_params = build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); -match classify_parser_scc_recursion_pattern(&members, func_index.clone(), si.clone()) { - Some(parser_target) => parser_target.clone(), - None => { - let all_arithmetic = { let mut __all = true; for name in members.clone().iter().cloned() { if !(match v2_rt::map_get(&func_index, name.clone()) { - Some(entry) => ((max_path_target_calls(entry.body.clone(), scc_name_set.clone(), si.clone()) <= 1) && scc_calls_have_arithmetic_descent(&entry.body.clone(), &scc_name_set, &func_index, &scc_measure_params, &si)), - None => false, -}) { __all = false; break; } } __all }; -if all_arithmetic { - { - let ring_param = match members.clone().first().cloned() { - Some(m0) => match v2_rt::map_get(&scc_measure_params, m0.clone()) { - Some(pmap) => match Rc::new(v2_rt::map_keys(&pmap)).first().cloned() { - Some(k) => k.clone(), - None => "_scc_arithmetic".to_string(), -}, - None => "_scc_arithmetic".to_string(), -}, - None => "_scc_arithmetic".to_string(), -}; -lower_call_pattern(Rc::new(CallPattern::ArithmeticSubtractCall { - steps: Rc::new(PositiveDescentAmount::OneStep), - ring_param: ring_param, -})) -} - } else { - lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)) + let scc_name_set = members.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, name: String| { + v2_rt::rc_map_insert(acc, name.clone(), true) + }, + ); + let proof = construct_scc_termination_proof(&members, &func_index, &scc_name_set, &si); + match proof { + Some(p) => lower_call_pattern(proof_to_call_pattern(p.clone())), + None => { + let scc_measure_params = + build_scc_measure_params(members.clone(), func_index.clone(), si.clone()); + match classify_parser_scc_recursion_pattern( + &members, + func_index.clone(), + si.clone(), + ) { + Some(parser_target) => parser_target.clone(), + None => { + let all_arithmetic = { + let mut __all = true; + for name in members.clone().iter().cloned() { + if !(match v2_rt::map_get(&func_index, name.clone()) { + Some(entry) => { + ((max_path_target_calls( + entry.body.clone(), + scc_name_set.clone(), + si.clone(), + ) <= 1) + && scc_calls_have_arithmetic_descent( + &entry.body.clone(), + &scc_name_set, + &func_index, + &scc_measure_params, + &si, + )) + } + None => false, + }) { + __all = false; + break; + } + } + __all + }; + if all_arithmetic { + { + let ring_param = match members.clone().first().cloned() { + Some(m0) => { + match v2_rt::map_get(&scc_measure_params, m0.clone()) { + Some(pmap) => match Rc::new(v2_rt::map_keys(&pmap)) + .first() + .cloned() + { + Some(k) => k.clone(), + None => "_scc_arithmetic".to_string(), + }, + None => "_scc_arithmetic".to_string(), + } + } + None => "_scc_arithmetic".to_string(), + }; + lower_call_pattern(Rc::new(CallPattern::ArithmeticSubtractCall { + steps: Rc::new(PositiveDescentAmount::OneStep), + ring_param: ring_param, + })) + } + } else { + lower_call_pattern(Rc::new(CallPattern::SameArgumentCall)) + } + } } -}, -} -}, -} -} + } + } + } } -pub fn build_scc_index(func_entries: &Rc>>, func_index: Rc>>, si: &Rc>>) -> Rc { +pub fn build_scc_index( + func_entries: &Rc>>, + func_index: Rc>>, + si: &Rc>>, +) -> Rc { { - let names = Rc::new({ let mut __result = Vec::new(); for entry in func_entries.clone().iter().cloned() { __result.push(entry.name.clone()); } __result }); -let graph = build_call_graph(&func_entries, si.clone()); -let adjacency = forward_adjacency(names.clone(), graph.clone()); -let reverse_graph = reverse_adjacency(names.clone(), graph.clone()); -let finish = names.clone().iter().cloned().fold(Rc::new(DfsFinishAcc { - visited: empty_set(), - order: Rc::new(vec![]), -}), |acc: Rc, name: String| dfs_finish_order(&name, &adjacency, &acc)); -let topo_order = v2_rt::reverse(finish.order.clone()); -let result = topo_order.clone().iter().cloned().fold(Rc::new(SccBuildAcc { - assigned: empty_set(), - index: v2_rt::rc_empty_map::>(), -}), |acc: Rc, name: String| if set_contains(acc.assigned.clone(), name.clone()) { - acc.clone() - } else { - { - let component = dfs_collect_component(&name, &reverse_graph, &Rc::new(SccComponentAcc { - visited: acc.assigned.clone(), - members: Rc::new(vec![]), -})); -let member_set = component.members.clone().iter().cloned().fold(empty_set(), |inner: Rc>, member: String| set_insert(inner, member.clone())); -let members = Rc::new({ let mut __result = Vec::new(); for member in names.clone().iter().cloned() { if set_contains(member_set.clone(), member.clone()) { __result.push(member); } } __result }); -let next_assigned = component.visited.clone(); -if ((members.clone().len() as i64) > 1) { - { - let info = Rc::new(SccInfo { - members: members.clone(), - member_set: member_set.clone(), - pattern: classify_scc_recursion_pattern(&members, &func_index, &si), -}); -let next_index = members.clone().iter().cloned().fold(acc.index.clone(), |inner: Rc>>, member: String| v2_rt::rc_map_insert(inner, member.clone(), info.clone())); -Rc::new(SccBuildAcc { - assigned: next_assigned.clone(), - index: next_index.clone(), -}) -} + let names = Rc::new({ + let mut __result = Vec::new(); + for entry in func_entries.clone().iter().cloned() { + __result.push(entry.name.clone()); + } + __result + }); + let graph = build_call_graph(&func_entries, si.clone()); + let adjacency = forward_adjacency(names.clone(), graph.clone()); + let reverse_graph = reverse_adjacency(names.clone(), graph.clone()); + let finish = names.clone().iter().cloned().fold( + Rc::new(DfsFinishAcc { + visited: v2_rt::rc_empty_map::(), + order: Rc::new(vec![]), + }), + |acc: Rc, name: String| dfs_finish_order(&name, &adjacency, &acc), + ); + let topo_order = v2_rt::reverse(finish.order.clone()); + let result = topo_order.clone().iter().cloned().fold( + Rc::new(SccBuildAcc { + assigned: v2_rt::rc_empty_map::(), + index: v2_rt::rc_empty_map::>(), + }), + |acc: Rc, name: String| { + if set_has(acc.assigned.clone(), name.clone()) { + acc.clone() } else { - Rc::new(SccBuildAcc { - assigned: next_assigned.clone(), - index: acc.index.clone(), -}) + { + let component = dfs_collect_component( + &name, + &reverse_graph, + &Rc::new(SccComponentAcc { + visited: acc.assigned.clone(), + members: Rc::new(vec![]), + }), + ); + let member_set = component.members.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |inner: Rc>, member: String| { + v2_rt::rc_map_insert(inner, member.clone(), true) + }, + ); + let members = Rc::new({ + let mut __result = Vec::new(); + for member in names.clone().iter().cloned() { + if set_has(member_set.clone(), member.clone()) { + __result.push(member); + } + } + __result + }); + let next_assigned = component.visited.clone(); + if ((members.clone().len() as i64) > 1) { + { + let info = Rc::new(SccInfo { + members: members.clone(), + member_set: member_set.clone(), + pattern: classify_scc_recursion_pattern( + &members, + &func_index, + &si, + ), + }); + let next_index = members.clone().iter().cloned().fold( + acc.index.clone(), + |inner: Rc>>, member: String| { + v2_rt::rc_map_insert(inner, member.clone(), info.clone()) + }, + ); + Rc::new(SccBuildAcc { + assigned: next_assigned.clone(), + index: next_index.clone(), + }) + } + } else { + Rc::new(SccBuildAcc { + assigned: next_assigned.clone(), + index: acc.index.clone(), + }) + } + } } -} - }); -Rc::new(SccResult { - index: result.index.clone(), - topo_order: topo_order.clone(), - processing_order: finish.order.clone(), - call_graph: graph.clone(), -}) -} + }, + ); + Rc::new(SccResult { + index: result.index.clone(), + topo_order: topo_order.clone(), + processing_order: finish.order.clone(), + call_graph: graph.clone(), + }) + } } pub fn cost_seq(a: Rc, b: &Rc) -> Rc { match (*a.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => b.clone(), - _ => match (*b.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => a.clone(), - _ => Rc::new(CostExpr::CostAdd { - left: a.clone(), - right: b.clone(), -}), -}, -} + CostExpr::CostConst { value: 0, .. } => b.clone(), + _ => match (*b.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => a.clone(), + _ => Rc::new(CostExpr::CostAdd { + left: a.clone(), + right: b.clone(), + }), + }, + } } pub fn cost_par(a: Rc, b: &Rc) -> Rc { match (*a.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => b.clone(), - _ => match (*b.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => a.clone(), - _ => Rc::new(CostExpr::CostMax { - left: a.clone(), - right: b.clone(), -}), -}, -} + CostExpr::CostConst { value: 0, .. } => b.clone(), + _ => match (*b.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => a.clone(), + _ => Rc::new(CostExpr::CostMax { + left: a.clone(), + right: b.clone(), + }), + }, + } } pub fn cost_loop(binder: String, iterations: Rc, body: &Rc) -> Rc { match (*body.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => Rc::new(CostExpr::CostConst { - value: 0, -}), - _ => Rc::new(CostExpr::CostSum { - binder: binder, - upper: iterations, - body: body.clone(), -}), -} + CostExpr::CostConst { value: 0, .. } => Rc::new(CostExpr::CostConst { value: 0 }), + _ => Rc::new(CostExpr::CostSum { + binder: binder, + upper: iterations, + body: body.clone(), + }), + } } pub fn cost_conditional(condition: Rc, branches: Rc>>) -> Rc { { - let max_branch = branches.iter().cloned().fold(Rc::new(CostExpr::CostConst { - value: 0, -}), |acc: Rc, b: Rc| cost_par(acc, &b)); -cost_seq(condition, &max_branch) -} + let max_branch = branches.iter().cloned().fold( + Rc::new(CostExpr::CostConst { value: 0 }), + |acc: Rc, b: Rc| cost_par(acc, &b), + ); + cost_seq(condition, &max_branch) + } } pub fn collection_output(binder: String, size: Rc) -> Rc>> { { - let result = seed_cost_map("result".to_string(), cost_loop(binder, size, &Rc::new(CostExpr::CostConst { - value: 1, -}))); -result -} + let result = seed_cost_map( + "result".to_string(), + cost_loop(binder, size, &Rc::new(CostExpr::CostConst { value: 1 })), + ); + result + } } pub fn scalar_output() -> Rc>> { @@ -3559,194 +7118,305 @@ pub fn method_preserves_collection_size(method_semantics: &Option match se.clone() { - Some(CollectionSizeEffect::ShrinkEffect) => true, - Some(CollectionSizeEffect::IdentityEffect) => true, - _ => false, -}, - _ => false, -} + MethodSemantics::AlgebraMethodSemantics { + size_effect: se, .. + } => match se.clone() { + Some(CollectionSizeEffect::ShrinkEffect) => true, + Some(CollectionSizeEffect::IdentityEffect) => true, + _ => false, + }, + _ => false, + } } } -pub fn receiver_size_var(mut recv: Rc, mut si: Rc>>) -> Rc { +pub fn receiver_size_var( + mut recv: Rc, + mut si: Rc>>, +) -> Rc { loop { match (*recv.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { break Rc::new(SizeExpr::SizeLen { - collection: expr_var_name_at(recv.clone(), si), -}); }, - ExprData::ExprFieldAccess { .. } => { break Rc::new(SizeExpr::SizeLen { - collection: field_access_field_at(recv.clone(), si), -}); }, - ExprData::ExprMethodCall { method_semantics, .. } => { let inner_recv = match recv.children.clone().first().cloned() { - Some(r) => r.clone(), - None => recv.clone(), -}; -if method_preserves_collection_size(&method_semantics) { - { - let __tco_0 = inner_recv; -recv = __tco_0; -continue; -} -} else { - break Rc::new(SizeExpr::SizeLen { - collection: "__expr".to_string(), -}); -} }, - _ => { break Rc::new(SizeExpr::SizeLen { - collection: "__expr".to_string(), -}); }, -} -} + ExprData::ExprVar { .. } => { + break Rc::new(SizeExpr::SizeLen { + collection: expr_var_name_at(recv.clone(), si), + }); + } + ExprData::ExprFieldAccess { .. } => { + break Rc::new(SizeExpr::SizeLen { + collection: field_access_field_at(recv.clone(), si), + }); + } + ExprData::ExprMethodCall { + method_semantics, .. + } => { + let inner_recv = match recv.children.clone().first().cloned() { + Some(r) => r.clone(), + None => recv.clone(), + }; + if method_preserves_collection_size(&method_semantics) { + { + let __tco_0 = inner_recv; + recv = __tco_0; + continue; + } + } else { + break Rc::new(SizeExpr::SizeLen { + collection: "__expr".to_string(), + }); + } + } + _ => { + break Rc::new(SizeExpr::SizeLen { + collection: "__expr".to_string(), + }); + } + } + } } pub fn size_binder_name(size: Rc) -> String { match (*size).clone() { - SizeExpr::SizeLen { collection: c, .. } => v2_rt::concat("_".to_string(), c.clone()), - SizeExpr::SizeVar { name: n, .. } => n.clone(), - _ => "_i".to_string(), -} + SizeExpr::SizeLen { collection: c, .. } => v2_rt::concat("_".to_string(), c.clone()), + SizeExpr::SizeVar { name: n, .. } => n.clone(), + _ => "_i".to_string(), + } } -pub fn resolve_lambda_arg(mc_arg_nodes: &Rc>>, si: Rc>>) -> Option> { +pub fn resolve_lambda_arg( + mc_arg_nodes: &Rc>>, + si: Rc>>, +) -> Option> { { - let f_arg = Rc::new({ let mut __result = Vec::new(); for a in mc_arg_nodes.clone().iter().cloned() { if (authored_name_at(si.clone(), &a).as_str() == "f".to_string().as_str()) { __result.push(a); } } __result }).first().cloned(); -match f_arg { - Some(fa) => Some(arg_value(&fa)), - None => Rc::new({ let mut __result = Vec::new(); for a in mc_arg_nodes.clone().iter().cloned() { __result.push(arg_value(&a)); } __result }).first().cloned(), -} -} + let f_arg = Rc::new({ + let mut __result = Vec::new(); + for a in mc_arg_nodes.clone().iter().cloned() { + if (authored_name_at(si.clone(), &a).as_str() == "f".to_string().as_str()) { + __result.push(a); + } + } + __result + }) + .first() + .cloned(); + match f_arg { + Some(fa) => Some(arg_value(&fa)), + None => Rc::new({ + let mut __result = Vec::new(); + for a in mc_arg_nodes.clone().iter().cloned() { + __result.push(arg_value(&a)); + } + __result + }) + .first() + .cloned(), + } + } } -pub fn resolve_callback_cost(lambda_arg: Option>, recv_r: Rc, func_index: &Rc>>, scc_index: Rc>>, parser_always_advancing: Rc>, recursion_ctx: RecursionContext, si: &Rc>>) -> Rc { +pub fn resolve_callback_cost( + lambda_arg: Option>, + recv_r: Rc, + func_index: &Rc>>, + scc_index: Rc>>, + parser_always_advancing: Rc>, + recursion_ctx: RecursionContext, + si: &Rc>>, +) -> Rc { match lambda_arg { - Some(la) => match (*la.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let fn_ref = expr_var_name_at(la.clone(), si.clone()); -match v2_rt::map_get(&func_index, fn_ref.clone()) { - Some(_) => get_or_compute_summary(&fn_ref, &func_index, &scc_index, &recv_r.table.clone(), parser_always_advancing, recursion_ctx, si.clone()), - None => cost_of_expr(&la, &func_index, &scc_index, recv_r.table.clone(), &parser_always_advancing, &recursion_ctx, &si), + Some(la) => match (*la.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let fn_ref = expr_var_name_at(la.clone(), si.clone()); + match v2_rt::map_get(&func_index, fn_ref.clone()) { + Some(_) => get_or_compute_summary( + &fn_ref, + &func_index, + &scc_index, + &recv_r.table.clone(), + parser_always_advancing, + recursion_ctx, + si.clone(), + ), + None => cost_of_expr( + &la, + &func_index, + &scc_index, + recv_r.table.clone(), + &parser_always_advancing, + &recursion_ctx, + &si, + ), + } + } + _ => cost_of_expr( + &la, + &func_index, + &scc_index, + recv_r.table.clone(), + &parser_always_advancing, + &recursion_ctx, + &si, + ), + }, + None => Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { value: 1 }), + span: Rc::new(CostExpr::CostConst { value: 1 }), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Conservative, + }), + table: recv_r.table.clone(), + }), + } } -}, - _ => cost_of_expr(&la, &func_index, &scc_index, recv_r.table.clone(), &parser_always_advancing, &recursion_ctx, &si), -}, - None => Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { - value: 1, -}), - span: Rc::new(CostExpr::CostConst { - value: 1, -}), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Conservative, -}), - table: recv_r.table.clone(), -}), -} -} - -pub fn cost_of_method_by_shape(shape: CostShape, produces_collection: bool, recv_r: &Rc, mc_args: Rc>>, size: &Rc, binder: &String, func_index: Rc>>, scc_index: Rc>>, parser_always_advancing: Rc>, recursion_ctx: RecursionContext, si: &Rc>>) -> Rc { + +pub fn cost_of_method_by_shape( + shape: CostShape, + produces_collection: bool, + recv_r: &Rc, + mc_args: Rc>>, + size: &Rc, + binder: &String, + func_index: Rc>>, + scc_index: Rc>>, + parser_always_advancing: Rc>, + recursion_ctx: RecursionContext, + si: &Rc>>, +) -> Rc { match shape { - CostShape::ShapeIterateBody => { - let lambda_arg = resolve_lambda_arg(&mc_args, si.clone()); -let body_result = resolve_callback_cost(lambda_arg, recv_r.clone(), &func_index, scc_index, parser_always_advancing, recursion_ctx, &si); -let loop_work = cost_loop(binder.clone(), size.clone(), &body_result.summary.clone().work.clone()); -let os = if (produces_collection == false) { - body_result.summary.clone().output_size.clone() - } else { - { - let r = seed_cost_map("result".to_string(), cost_loop(binder.clone(), size.clone(), &Rc::new(CostExpr::CostConst { - value: 1, -}))); -r -} - }; -Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq(recv_r.summary.clone().work.clone(), &loop_work), - span: cost_seq(recv_r.summary.clone().span.clone(), &loop_work), - output_size: os, - certainty: body_result.summary.clone().certainty.clone(), -}), - table: body_result.table.clone(), -}) -}, - CostShape::ShapeSortBody => { - let lambda_arg = resolve_lambda_arg(&mc_args, si.clone()); -let key_result = match lambda_arg { - Some(la) => cost_of_expr(&la, &func_index, &scc_index, recv_r.table.clone(), &parser_always_advancing, &recursion_ctx, &si), - None => Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { - value: 1, -}), - span: Rc::new(CostExpr::CostConst { - value: 1, -}), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, -}), - table: recv_r.table.clone(), -}), -}; -let log_factor = Rc::new(CostExpr::CostLog { - base: 2, - argument: size.clone(), -}); -let per_comparison = key_result.summary.clone().work.clone(); -let sort_work = Rc::new(CostExpr::CostMul { - left: cost_loop(binder.clone(), size.clone(), &per_comparison), - right: log_factor, -}); -let sort_os = seed_cost_map("result".to_string(), cost_loop(binder.clone(), size.clone(), &Rc::new(CostExpr::CostConst { - value: 1, -}))); -Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq(recv_r.summary.clone().work.clone(), &sort_work), - span: cost_seq(recv_r.summary.clone().span.clone(), &sort_work), - output_size: sort_os, - certainty: key_result.summary.clone().certainty.clone(), -}), - table: key_result.table.clone(), -}) -}, - CostShape::ShapeLinearScan => { - let loop_work = cost_loop(binder.clone(), size.clone(), &Rc::new(CostExpr::CostConst { - value: 1, -})); -let scan_os = if produces_collection { - seed_cost_map("result".to_string(), cost_loop(binder.clone(), size.clone(), &Rc::new(CostExpr::CostConst { - value: 1, -}))) - } else { - v2_rt::rc_empty_map::>() - }; -Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq(recv_r.summary.clone().work.clone(), &loop_work), - span: cost_seq(recv_r.summary.clone().span.clone(), &loop_work), - output_size: scan_os, - certainty: recv_r.summary.clone().certainty.clone(), -}), - table: recv_r.table.clone(), -}) -}, - CostShape::ShapeConstant => Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq(recv_r.summary.clone().work.clone(), &Rc::new(CostExpr::CostConst { - value: 1, -})), - span: cost_seq(recv_r.summary.clone().span.clone(), &Rc::new(CostExpr::CostConst { - value: 1, -})), - output_size: v2_rt::rc_empty_map::>(), - certainty: recv_r.summary.clone().certainty.clone(), -}), - table: recv_r.table.clone(), -}), -} + CostShape::ShapeIterateBody => { + let lambda_arg = resolve_lambda_arg(&mc_args, si.clone()); + let body_result = resolve_callback_cost( + lambda_arg, + recv_r.clone(), + &func_index, + scc_index, + parser_always_advancing, + recursion_ctx, + &si, + ); + let loop_work = cost_loop( + binder.clone(), + size.clone(), + &body_result.summary.clone().work.clone(), + ); + let os = if (produces_collection == false) { + body_result.summary.clone().output_size.clone() + } else { + { + let r = seed_cost_map( + "result".to_string(), + cost_loop( + binder.clone(), + size.clone(), + &Rc::new(CostExpr::CostConst { value: 1 }), + ), + ); + r + } + }; + Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq(recv_r.summary.clone().work.clone(), &loop_work), + span: cost_seq(recv_r.summary.clone().span.clone(), &loop_work), + output_size: os, + certainty: body_result.summary.clone().certainty.clone(), + }), + table: body_result.table.clone(), + }) + } + CostShape::ShapeSortBody => { + let lambda_arg = resolve_lambda_arg(&mc_args, si.clone()); + let key_result = match lambda_arg { + Some(la) => cost_of_expr( + &la, + &func_index, + &scc_index, + recv_r.table.clone(), + &parser_always_advancing, + &recursion_ctx, + &si, + ), + None => Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { value: 1 }), + span: Rc::new(CostExpr::CostConst { value: 1 }), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, + }), + table: recv_r.table.clone(), + }), + }; + let log_factor = Rc::new(CostExpr::CostLog { + base: 2, + argument: size.clone(), + }); + let per_comparison = key_result.summary.clone().work.clone(); + let sort_work = Rc::new(CostExpr::CostMul { + left: cost_loop(binder.clone(), size.clone(), &per_comparison), + right: log_factor, + }); + let sort_os = seed_cost_map( + "result".to_string(), + cost_loop( + binder.clone(), + size.clone(), + &Rc::new(CostExpr::CostConst { value: 1 }), + ), + ); + Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq(recv_r.summary.clone().work.clone(), &sort_work), + span: cost_seq(recv_r.summary.clone().span.clone(), &sort_work), + output_size: sort_os, + certainty: key_result.summary.clone().certainty.clone(), + }), + table: key_result.table.clone(), + }) + } + CostShape::ShapeLinearScan => { + let loop_work = cost_loop( + binder.clone(), + size.clone(), + &Rc::new(CostExpr::CostConst { value: 1 }), + ); + let scan_os = if produces_collection { + seed_cost_map( + "result".to_string(), + cost_loop( + binder.clone(), + size.clone(), + &Rc::new(CostExpr::CostConst { value: 1 }), + ), + ) + } else { + v2_rt::rc_empty_map::>() + }; + Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq(recv_r.summary.clone().work.clone(), &loop_work), + span: cost_seq(recv_r.summary.clone().span.clone(), &loop_work), + output_size: scan_os, + certainty: recv_r.summary.clone().certainty.clone(), + }), + table: recv_r.table.clone(), + }) + } + CostShape::ShapeConstant => Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq( + recv_r.summary.clone().work.clone(), + &Rc::new(CostExpr::CostConst { value: 1 }), + ), + span: cost_seq( + recv_r.summary.clone().span.clone(), + &Rc::new(CostExpr::CostConst { value: 1 }), + ), + output_size: v2_rt::rc_empty_map::>(), + certainty: recv_r.summary.clone().certainty.clone(), + }), + table: recv_r.table.clone(), + }), + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -3774,283 +7444,413 @@ pub struct ComplexityReport { pub fn empty_complexity_report() -> Rc { Rc::new(ComplexityReport { - function_classes: v2_rt::rc_empty_map::(), - violations: Rc::new(vec![]), - structural_bounds: Rc::new(vec![]), -}) + function_classes: v2_rt::rc_empty_map::(), + violations: Rc::new(vec![]), + structural_bounds: Rc::new(vec![]), + }) } pub fn simplify_cost(expr: Rc) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*expr.clone()).clone() { - CostExpr::CostConst { .. } => expr.clone(), - CostExpr::CostAdd { left: l, right: r, .. } => { - let sl = simplify_cost(l.clone()); -let sr = simplify_cost(r.clone()); -let simplified = match (*sl.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => sr.clone(), - CostExpr::CostConst { value: a, .. } => match (*sr.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => sl.clone(), - CostExpr::CostConst { value: b, .. } => Rc::new(CostExpr::CostConst { - value: (a.clone() + b.clone()), -}), - _ => Rc::new(CostExpr::CostAdd { - left: sl.clone(), - right: sr.clone(), -}), -}, - _ => match (*sr.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => sl.clone(), - _ => Rc::new(CostExpr::CostAdd { - left: sl.clone(), - right: sr.clone(), -}), -}, -}; -simplified -}, - CostExpr::CostMul { left: l, right: r, .. } => { - let sl = simplify_cost(l.clone()); -let sr = simplify_cost(r.clone()); -let simplified = match (*sl.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => Rc::new(CostExpr::CostConst { - value: 0, -}), - CostExpr::CostConst { value: 1, .. } => sr.clone(), - _ => match (*sr.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => Rc::new(CostExpr::CostConst { - value: 0, -}), - CostExpr::CostConst { value: 1, .. } => sl.clone(), - _ => Rc::new(CostExpr::CostMul { - left: sl.clone(), - right: sr.clone(), -}), -}, -}; -simplified -}, - CostExpr::CostMax { left: l, right: r, .. } => { - let sl = simplify_cost(l.clone()); -let sr = simplify_cost(r.clone()); -let simplified = match (*sl.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => sr.clone(), - CostExpr::CostConst { value: a, .. } => match (*sr.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => sl.clone(), - CostExpr::CostConst { value: b, .. } => if (a.clone() > b.clone()) { - sl.clone() - } else { - sr.clone() - }, - _ => Rc::new(CostExpr::CostMax { - left: sl.clone(), - right: sr.clone(), -}), -}, - _ => match (*sr.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => sl.clone(), - _ => Rc::new(CostExpr::CostMax { - left: sl.clone(), - right: sr.clone(), -}), -}, -}; -simplified -}, - CostExpr::CostSum { binder: b, upper: u, body: bd, .. } => { - let sbd = simplify_cost(bd.clone()); -match (*sbd.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => Rc::new(CostExpr::CostConst { - value: 0, -}), - _ => Rc::new(CostExpr::CostSum { - binder: b.clone(), - upper: u.clone(), - body: sbd.clone(), -}), -} -}, - CostExpr::CostLog { base: b, argument: a, .. } => Rc::new(CostExpr::CostLog { - base: b.clone(), - argument: a.clone(), -}), - CostExpr::CostExtern { .. } => expr.clone(), - CostExpr::CostUnknown { .. } => expr.clone(), -} + CostExpr::CostConst { .. } => expr.clone(), + CostExpr::CostAdd { + left: l, right: r, .. + } => { + let sl = simplify_cost(l.clone()); + let sr = simplify_cost(r.clone()); + let simplified = match (*sl.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => sr.clone(), + CostExpr::CostConst { value: a, .. } => match (*sr.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => sl.clone(), + CostExpr::CostConst { value: b, .. } => Rc::new(CostExpr::CostConst { + value: (a.clone() + b.clone()), + }), + _ => Rc::new(CostExpr::CostAdd { + left: sl.clone(), + right: sr.clone(), + }), + }, + _ => match (*sr.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => sl.clone(), + _ => Rc::new(CostExpr::CostAdd { + left: sl.clone(), + right: sr.clone(), + }), + }, + }; + simplified + } + CostExpr::CostMul { + left: l, right: r, .. + } => { + let sl = simplify_cost(l.clone()); + let sr = simplify_cost(r.clone()); + let simplified = match (*sl.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => { + Rc::new(CostExpr::CostConst { value: 0 }) + } + CostExpr::CostConst { value: 1, .. } => sr.clone(), + _ => match (*sr.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => { + Rc::new(CostExpr::CostConst { value: 0 }) + } + CostExpr::CostConst { value: 1, .. } => sl.clone(), + _ => Rc::new(CostExpr::CostMul { + left: sl.clone(), + right: sr.clone(), + }), + }, + }; + simplified + } + CostExpr::CostMax { + left: l, right: r, .. + } => { + let sl = simplify_cost(l.clone()); + let sr = simplify_cost(r.clone()); + let simplified = match (*sl.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => sr.clone(), + CostExpr::CostConst { value: a, .. } => match (*sr.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => sl.clone(), + CostExpr::CostConst { value: b, .. } => { + if (a.clone() > b.clone()) { + sl.clone() + } else { + sr.clone() + } + } + _ => Rc::new(CostExpr::CostMax { + left: sl.clone(), + right: sr.clone(), + }), + }, + _ => match (*sr.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => sl.clone(), + _ => Rc::new(CostExpr::CostMax { + left: sl.clone(), + right: sr.clone(), + }), + }, + }; + simplified + } + CostExpr::CostSum { + binder: b, + upper: u, + body: bd, + .. + } => { + let sbd = simplify_cost(bd.clone()); + match (*sbd.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => { + Rc::new(CostExpr::CostConst { value: 0 }) + } + _ => Rc::new(CostExpr::CostSum { + binder: b.clone(), + upper: u.clone(), + body: sbd.clone(), + }), + } + } + CostExpr::CostLog { + base: b, + argument: a, + .. + } => Rc::new(CostExpr::CostLog { + base: b.clone(), + argument: a.clone(), + }), + CostExpr::CostExtern { .. } => expr.clone(), + CostExpr::CostUnknown { .. } => expr.clone(), + } }) } pub fn format_size(size: Rc) -> String { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - match (*size).clone() { - SizeExpr::SizeLen { collection: c, .. } => v2_rt::concat(v2_rt::concat("|".to_string(), c.clone()), "|".to_string()), - SizeExpr::SizeVar { name: n, .. } => n.clone(), - SizeExpr::SizeConst { value: v, .. } => (v.clone()).to_string(), - SizeExpr::SizeAdd { left: l, right: r, .. } => v2_rt::concat(v2_rt::concat(format_size(l.clone()), " + ".to_string()), format_size(r.clone())), - SizeExpr::SizeMax { left: l, right: r, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("max(".to_string(), format_size(l.clone())), ", ".to_string()), format_size(r.clone())), ")".to_string()), -} + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*size).clone() { + SizeExpr::SizeLen { collection: c, .. } => { + v2_rt::concat(v2_rt::concat("|".to_string(), c.clone()), "|".to_string()) + } + SizeExpr::SizeVar { name: n, .. } => n.clone(), + SizeExpr::SizeConst { value: v, .. } => (v.clone()).to_string(), + SizeExpr::SizeAdd { + left: l, right: r, .. + } => v2_rt::concat( + v2_rt::concat(format_size(l.clone()), " + ".to_string()), + format_size(r.clone()), + ), + SizeExpr::SizeMax { + left: l, right: r, .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("max(".to_string(), format_size(l.clone())), + ", ".to_string(), + ), + format_size(r.clone()), + ), + ")".to_string(), + ), }) } pub fn normalize_asymptotic(expr: Rc) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*expr.clone()).clone() { - CostExpr::CostConst { value: v, .. } => if (v.clone() <= 0) { - Rc::new(CostExpr::CostConst { - value: 0, -}) - } else { - Rc::new(CostExpr::CostConst { - value: 1, -}) - }, - CostExpr::CostAdd { left: l, right: r, .. } => { - let nl = normalize_asymptotic(l.clone()); -let nr = normalize_asymptotic(r.clone()); -if (nl.clone() == nr.clone()) { - nl.clone() - } else { - match (*nl.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => nr.clone(), - CostExpr::CostConst { .. } => match (*nr.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => nl.clone(), - CostExpr::CostConst { .. } => Rc::new(CostExpr::CostConst { - value: 1, -}), - _ => nr.clone(), -}, - _ => match (*nr.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => nl.clone(), - CostExpr::CostConst { .. } => nl.clone(), - _ => Rc::new(CostExpr::CostAdd { - left: nl.clone(), - right: nr.clone(), -}), -}, -} + CostExpr::CostConst { value: v, .. } => { + if (v.clone() <= 0) { + Rc::new(CostExpr::CostConst { value: 0 }) + } else { + Rc::new(CostExpr::CostConst { value: 1 }) + } } -}, - CostExpr::CostMax { left: l, right: r, .. } => { - let nl = normalize_asymptotic(l.clone()); -let nr = normalize_asymptotic(r.clone()); -if (nl.clone() == nr.clone()) { - nl.clone() - } else { + CostExpr::CostAdd { + left: l, right: r, .. + } => { + let nl = normalize_asymptotic(l.clone()); + let nr = normalize_asymptotic(r.clone()); + if (nl.clone() == nr.clone()) { + nl.clone() + } else { + match (*nl.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => nr.clone(), + CostExpr::CostConst { .. } => match (*nr.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => nl.clone(), + CostExpr::CostConst { .. } => Rc::new(CostExpr::CostConst { value: 1 }), + _ => nr.clone(), + }, + _ => match (*nr.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => nl.clone(), + CostExpr::CostConst { .. } => nl.clone(), + _ => Rc::new(CostExpr::CostAdd { + left: nl.clone(), + right: nr.clone(), + }), + }, + } + } + } + CostExpr::CostMax { + left: l, right: r, .. + } => { + let nl = normalize_asymptotic(l.clone()); + let nr = normalize_asymptotic(r.clone()); + if (nl.clone() == nr.clone()) { + nl.clone() + } else { + match (*nl.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => nr.clone(), + CostExpr::CostConst { .. } => match (*nr.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => nl.clone(), + CostExpr::CostConst { .. } => Rc::new(CostExpr::CostConst { value: 1 }), + _ => nr.clone(), + }, + _ => match (*nr.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => nl.clone(), + CostExpr::CostConst { .. } => nl.clone(), + _ => Rc::new(CostExpr::CostMax { + left: nl.clone(), + right: nr.clone(), + }), + }, + } + } + } + CostExpr::CostMul { + left: l, right: r, .. + } => { + let nl = normalize_asymptotic(l.clone()); + let nr = normalize_asymptotic(r.clone()); match (*nl.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => nr.clone(), - CostExpr::CostConst { .. } => match (*nr.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => nl.clone(), - CostExpr::CostConst { .. } => Rc::new(CostExpr::CostConst { - value: 1, -}), - _ => nr.clone(), -}, - _ => match (*nr.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => nl.clone(), - CostExpr::CostConst { .. } => nl.clone(), - _ => Rc::new(CostExpr::CostMax { - left: nl.clone(), - right: nr.clone(), -}), -}, -} + CostExpr::CostConst { value: 0, .. } => { + Rc::new(CostExpr::CostConst { value: 0 }) + } + CostExpr::CostConst { .. } => nr.clone(), + _ => match (*nr.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => { + Rc::new(CostExpr::CostConst { value: 0 }) + } + CostExpr::CostConst { .. } => nl.clone(), + _ => Rc::new(CostExpr::CostMul { + left: nl.clone(), + right: nr.clone(), + }), + }, + } } -}, - CostExpr::CostMul { left: l, right: r, .. } => { - let nl = normalize_asymptotic(l.clone()); -let nr = normalize_asymptotic(r.clone()); -match (*nl.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => Rc::new(CostExpr::CostConst { - value: 0, -}), - CostExpr::CostConst { .. } => nr.clone(), - _ => match (*nr.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => Rc::new(CostExpr::CostConst { - value: 0, -}), - CostExpr::CostConst { .. } => nl.clone(), - _ => Rc::new(CostExpr::CostMul { - left: nl.clone(), - right: nr.clone(), -}), -}, -} -}, - CostExpr::CostSum { binder: b, upper: u, body: bd, .. } => { - let nbd = normalize_asymptotic(bd.clone()); -match (*nbd.clone()).clone() { - CostExpr::CostConst { value: 0, .. } => Rc::new(CostExpr::CostConst { - value: 0, -}), - _ => match (*u.clone()).clone() { - SizeExpr::SizeConst { .. } => nbd.clone(), - _ => Rc::new(CostExpr::CostSum { - binder: b.clone(), - upper: u.clone(), - body: nbd.clone(), -}), -}, -} -}, - CostExpr::CostLog { base: b, argument: a, .. } => Rc::new(CostExpr::CostLog { - base: b.clone(), - argument: a.clone(), -}), - CostExpr::CostExtern { .. } => expr.clone(), - CostExpr::CostUnknown { .. } => expr.clone(), -} + CostExpr::CostSum { + binder: b, + upper: u, + body: bd, + .. + } => { + let nbd = normalize_asymptotic(bd.clone()); + match (*nbd.clone()).clone() { + CostExpr::CostConst { value: 0, .. } => { + Rc::new(CostExpr::CostConst { value: 0 }) + } + _ => match (*u.clone()).clone() { + SizeExpr::SizeConst { .. } => nbd.clone(), + _ => Rc::new(CostExpr::CostSum { + binder: b.clone(), + upper: u.clone(), + body: nbd.clone(), + }), + }, + } + } + CostExpr::CostLog { + base: b, + argument: a, + .. + } => Rc::new(CostExpr::CostLog { + base: b.clone(), + argument: a.clone(), + }), + CostExpr::CostExtern { .. } => expr.clone(), + CostExpr::CostUnknown { .. } => expr.clone(), + } }) } pub fn format_cost_class(expr: Rc) -> String { match (*expr).clone() { - CostExpr::CostConst { .. } => "O(1)".to_string(), - CostExpr::CostExtern { name: n, .. } => v2_rt::concat(v2_rt::concat("O(extern(".to_string(), n.clone()), "))".to_string()), - CostExpr::CostUnknown { .. } => "O(?)".to_string(), - CostExpr::CostSum { upper: u, body: bd, .. } => match (*bd.clone()).clone() { - CostExpr::CostConst { .. } => v2_rt::concat(v2_rt::concat("O(".to_string(), format_size(u.clone())), ")".to_string()), - _ => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("O(".to_string(), format_size(u.clone())), " * ".to_string()), format_cost_inner(bd.clone())), ")".to_string()), -}, - CostExpr::CostAdd { left: l, right: r, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("O(".to_string(), format_cost_inner(l.clone())), " + ".to_string()), format_cost_inner(r.clone())), ")".to_string()), - CostExpr::CostMul { left: l, right: r, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("O(".to_string(), parenthesize_additive_cost(&l)), " * ".to_string()), parenthesize_additive_cost(&r)), ")".to_string()), - CostExpr::CostMax { left: l, right: r, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("O(max(".to_string(), format_cost_inner(l.clone())), ", ".to_string()), format_cost_inner(r.clone())), "))".to_string()), - CostExpr::CostLog { argument: a, .. } => v2_rt::concat(v2_rt::concat("O(log ".to_string(), format_size(a.clone())), ")".to_string()), -} + CostExpr::CostConst { .. } => "O(1)".to_string(), + CostExpr::CostExtern { name: n, .. } => v2_rt::concat( + v2_rt::concat("O(extern(".to_string(), n.clone()), + "))".to_string(), + ), + CostExpr::CostUnknown { .. } => "O(?)".to_string(), + CostExpr::CostSum { + upper: u, body: bd, .. + } => match (*bd.clone()).clone() { + CostExpr::CostConst { .. } => v2_rt::concat( + v2_rt::concat("O(".to_string(), format_size(u.clone())), + ")".to_string(), + ), + _ => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("O(".to_string(), format_size(u.clone())), + " * ".to_string(), + ), + format_cost_inner(bd.clone()), + ), + ")".to_string(), + ), + }, + CostExpr::CostAdd { + left: l, right: r, .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("O(".to_string(), format_cost_inner(l.clone())), + " + ".to_string(), + ), + format_cost_inner(r.clone()), + ), + ")".to_string(), + ), + CostExpr::CostMul { + left: l, right: r, .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("O(".to_string(), parenthesize_additive_cost(&l)), + " * ".to_string(), + ), + parenthesize_additive_cost(&r), + ), + ")".to_string(), + ), + CostExpr::CostMax { + left: l, right: r, .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("O(max(".to_string(), format_cost_inner(l.clone())), + ", ".to_string(), + ), + format_cost_inner(r.clone()), + ), + "))".to_string(), + ), + CostExpr::CostLog { argument: a, .. } => v2_rt::concat( + v2_rt::concat("O(log ".to_string(), format_size(a.clone())), + ")".to_string(), + ), + } } pub fn format_cost_inner(expr: Rc) -> String { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - match (*expr).clone() { - CostExpr::CostConst { .. } => "1".to_string(), - CostExpr::CostSum { upper: u, body: bd, .. } => match (*bd.clone()).clone() { - CostExpr::CostConst { .. } => format_size(u.clone()), - _ => v2_rt::concat(v2_rt::concat(format_size(u.clone()), " * ".to_string()), format_cost_inner(bd.clone())), -}, - CostExpr::CostAdd { left: l, right: r, .. } => v2_rt::concat(v2_rt::concat(format_cost_inner(l.clone()), " + ".to_string()), format_cost_inner(r.clone())), - CostExpr::CostMul { left: l, right: r, .. } => { + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*expr).clone() { + CostExpr::CostConst { .. } => "1".to_string(), + CostExpr::CostSum { + upper: u, body: bd, .. + } => match (*bd.clone()).clone() { + CostExpr::CostConst { .. } => format_size(u.clone()), + _ => v2_rt::concat( + v2_rt::concat(format_size(u.clone()), " * ".to_string()), + format_cost_inner(bd.clone()), + ), + }, + CostExpr::CostAdd { + left: l, right: r, .. + } => v2_rt::concat( + v2_rt::concat(format_cost_inner(l.clone()), " + ".to_string()), + format_cost_inner(r.clone()), + ), + CostExpr::CostMul { + left: l, right: r, .. + } => { let left_str = match (*l.clone()).clone() { - CostExpr::CostAdd { .. } => v2_rt::concat(v2_rt::concat("(".to_string(), format_cost_inner(l.clone())), ")".to_string()), - _ => format_cost_inner(l.clone()), -}; -let right_str = match (*r.clone()).clone() { - CostExpr::CostAdd { .. } => v2_rt::concat(v2_rt::concat("(".to_string(), format_cost_inner(r.clone())), ")".to_string()), - _ => format_cost_inner(r.clone()), -}; -v2_rt::concat(v2_rt::concat(left_str, " * ".to_string()), right_str) -}, - CostExpr::CostMax { left: l, right: r, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("max(".to_string(), format_cost_inner(l.clone())), ", ".to_string()), format_cost_inner(r.clone())), ")".to_string()), - CostExpr::CostLog { argument: a, .. } => v2_rt::concat("log ".to_string(), format_size(a.clone())), - CostExpr::CostExtern { name: n, .. } => v2_rt::concat(v2_rt::concat("extern(".to_string(), n.clone()), ")".to_string()), - CostExpr::CostUnknown { .. } => "?".to_string(), -} + CostExpr::CostAdd { .. } => v2_rt::concat( + v2_rt::concat("(".to_string(), format_cost_inner(l.clone())), + ")".to_string(), + ), + _ => format_cost_inner(l.clone()), + }; + let right_str = match (*r.clone()).clone() { + CostExpr::CostAdd { .. } => v2_rt::concat( + v2_rt::concat("(".to_string(), format_cost_inner(r.clone())), + ")".to_string(), + ), + _ => format_cost_inner(r.clone()), + }; + v2_rt::concat(v2_rt::concat(left_str, " * ".to_string()), right_str) + } + CostExpr::CostMax { + left: l, right: r, .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("max(".to_string(), format_cost_inner(l.clone())), + ", ".to_string(), + ), + format_cost_inner(r.clone()), + ), + ")".to_string(), + ), + CostExpr::CostLog { argument: a, .. } => { + v2_rt::concat("log ".to_string(), format_size(a.clone())) + } + CostExpr::CostExtern { name: n, .. } => v2_rt::concat( + v2_rt::concat("extern(".to_string(), n.clone()), + ")".to_string(), + ), + CostExpr::CostUnknown { .. } => "?".to_string(), }) } pub fn parenthesize_additive_cost(expr: &Rc) -> String { match (*expr.clone()).clone() { - CostExpr::CostAdd { .. } => v2_rt::concat(v2_rt::concat("(".to_string(), format_cost_inner(expr.clone())), ")".to_string()), - _ => format_cost_inner(expr.clone()), -} + CostExpr::CostAdd { .. } => v2_rt::concat( + v2_rt::concat("(".to_string(), format_cost_inner(expr.clone())), + ")".to_string(), + ), + _ => format_cost_inner(expr.clone()), + } } pub fn short_var_name(index: i64) -> String { @@ -4084,7 +7884,10 @@ pub fn short_var_name(index: i64) -> String { if (index.clone() == 9) { "w".to_string() } else { - v2_rt::concat("x".to_string(), (index.clone()).to_string()) + v2_rt::concat( + "x".to_string(), + (index.clone()).to_string(), + ) } } } @@ -4106,146 +7909,214 @@ pub struct Legend { pub fn build_legend(size_names: Rc>) -> Rc { { let unique = deduplicate(size_names); -if ((unique.clone().len() as i64) == 0) { + if ((unique.clone().len() as i64) == 0) { Rc::new(Legend { - substitution: v2_rt::rc_empty_map::(), - suffix: "".to_string(), -}) + substitution: v2_rt::rc_empty_map::(), + suffix: "".to_string(), + }) } else { if ((unique.clone().len() as i64) == 1) { match unique.clone().first().cloned() { - Some(name) => Rc::new(Legend { - substitution: v2_rt::rc_map_insert(v2_rt::rc_empty_map::(), name.clone(), "n".to_string()), - suffix: "".to_string(), -}), - None => Rc::new(Legend { - substitution: v2_rt::rc_empty_map::(), - suffix: "".to_string(), -}), -} + Some(name) => Rc::new(Legend { + substitution: v2_rt::rc_map_insert( + v2_rt::rc_empty_map::(), + name.clone(), + "n".to_string(), + ), + suffix: "".to_string(), + }), + None => Rc::new(Legend { + substitution: v2_rt::rc_empty_map::(), + suffix: "".to_string(), + }), + } } else { { - let indexed = unique.clone().iter().cloned().fold(Rc::new(Legend { - substitution: v2_rt::rc_empty_map::(), - suffix: "".to_string(), -}), |acc: Rc, name: String| { - let idx = (Rc::new(v2_rt::map_keys(&acc.substitution.clone())).len() as i64); -let short = short_var_name(idx.clone()); -Rc::new(Legend { - substitution: v2_rt::rc_map_insert(acc.substitution.clone(), name.clone(), short.clone()), - suffix: if (acc.suffix.clone().as_str() == "".to_string().as_str()) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(" where ".to_string(), short.clone()), " = ".to_string()), name.clone()) - } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(acc.suffix.clone(), ", ".to_string()), short.clone()), " = ".to_string()), name.clone()) + let indexed = unique.clone().iter().cloned().fold( + Rc::new(Legend { + substitution: v2_rt::rc_empty_map::(), + suffix: "".to_string(), + }), + |acc: Rc, name: String| { + let idx = + (Rc::new(v2_rt::map_keys(&acc.substitution.clone())).len() as i64); + let short = short_var_name(idx.clone()); + Rc::new(Legend { + substitution: v2_rt::rc_map_insert( + acc.substitution.clone(), + name.clone(), + short.clone(), + ), + suffix: if (acc.suffix.clone().as_str() == "".to_string().as_str()) + { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(" where ".to_string(), short.clone()), + " = ".to_string(), + ), + name.clone(), + ) + } else { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(acc.suffix.clone(), ", ".to_string()), + short.clone(), + ), + " = ".to_string(), + ), + name.clone(), + ) + }, + }) }, -}) -}); -indexed -} + ); + indexed + } } } -} + } } pub fn substitute_size(size: Rc, legend: &Rc>) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*size.clone()).clone() { - SizeExpr::SizeLen { collection: c, .. } => match v2_rt::map_get(&legend, c.clone()) { - Some(short) => Rc::new(SizeExpr::SizeVar { - name: short.clone(), -}), - None => size.clone(), -}, - SizeExpr::SizeVar { name: n, .. } => match v2_rt::map_get(&legend, n.clone()) { - Some(short) => Rc::new(SizeExpr::SizeVar { - name: short.clone(), -}), - None => size.clone(), -}, - SizeExpr::SizeAdd { left: l, right: r, .. } => Rc::new(SizeExpr::SizeAdd { - left: substitute_size(l.clone(), &legend), - right: substitute_size(r.clone(), &legend), -}), - SizeExpr::SizeMax { left: l, right: r, .. } => Rc::new(SizeExpr::SizeMax { - left: substitute_size(l.clone(), &legend), - right: substitute_size(r.clone(), &legend), -}), - SizeExpr::SizeConst { .. } => size.clone(), -} + SizeExpr::SizeLen { collection: c, .. } => match v2_rt::map_get(&legend, c.clone()) { + Some(short) => Rc::new(SizeExpr::SizeVar { + name: short.clone(), + }), + None => size.clone(), + }, + SizeExpr::SizeVar { name: n, .. } => match v2_rt::map_get(&legend, n.clone()) { + Some(short) => Rc::new(SizeExpr::SizeVar { + name: short.clone(), + }), + None => size.clone(), + }, + SizeExpr::SizeAdd { + left: l, right: r, .. + } => Rc::new(SizeExpr::SizeAdd { + left: substitute_size(l.clone(), &legend), + right: substitute_size(r.clone(), &legend), + }), + SizeExpr::SizeMax { + left: l, right: r, .. + } => Rc::new(SizeExpr::SizeMax { + left: substitute_size(l.clone(), &legend), + right: substitute_size(r.clone(), &legend), + }), + SizeExpr::SizeConst { .. } => size.clone(), + } }) } pub fn substitute_cost(expr: Rc, legend: &Rc>) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*expr.clone()).clone() { - CostExpr::CostConst { .. } => expr.clone(), - CostExpr::CostAdd { left: l, right: r, .. } => Rc::new(CostExpr::CostAdd { - left: substitute_cost(l.clone(), &legend), - right: substitute_cost(r.clone(), &legend), -}), - CostExpr::CostMul { left: l, right: r, .. } => Rc::new(CostExpr::CostMul { - left: substitute_cost(l.clone(), &legend), - right: substitute_cost(r.clone(), &legend), -}), - CostExpr::CostMax { left: l, right: r, .. } => Rc::new(CostExpr::CostMax { - left: substitute_cost(l.clone(), &legend), - right: substitute_cost(r.clone(), &legend), -}), - CostExpr::CostSum { binder: b, upper: u, body: bd, .. } => Rc::new(CostExpr::CostSum { - binder: b.clone(), - upper: substitute_size(u.clone(), &legend), - body: substitute_cost(bd.clone(), &legend), -}), - CostExpr::CostLog { base: b, argument: a, .. } => Rc::new(CostExpr::CostLog { - base: b.clone(), - argument: substitute_size(a.clone(), &legend), -}), - CostExpr::CostExtern { .. } => expr.clone(), - CostExpr::CostUnknown { .. } => expr.clone(), -} + CostExpr::CostConst { .. } => expr.clone(), + CostExpr::CostAdd { + left: l, right: r, .. + } => Rc::new(CostExpr::CostAdd { + left: substitute_cost(l.clone(), &legend), + right: substitute_cost(r.clone(), &legend), + }), + CostExpr::CostMul { + left: l, right: r, .. + } => Rc::new(CostExpr::CostMul { + left: substitute_cost(l.clone(), &legend), + right: substitute_cost(r.clone(), &legend), + }), + CostExpr::CostMax { + left: l, right: r, .. + } => Rc::new(CostExpr::CostMax { + left: substitute_cost(l.clone(), &legend), + right: substitute_cost(r.clone(), &legend), + }), + CostExpr::CostSum { + binder: b, + upper: u, + body: bd, + .. + } => Rc::new(CostExpr::CostSum { + binder: b.clone(), + upper: substitute_size(u.clone(), &legend), + body: substitute_cost(bd.clone(), &legend), + }), + CostExpr::CostLog { + base: b, + argument: a, + .. + } => Rc::new(CostExpr::CostLog { + base: b.clone(), + argument: substitute_size(a.clone(), &legend), + }), + CostExpr::CostExtern { .. } => expr.clone(), + CostExpr::CostUnknown { .. } => expr.clone(), + } }) } pub fn classify_complexity(expr: Rc) -> String { { let normalized = normalize_asymptotic(simplify_cost(expr)); -let size_names = collect_size_vars(normalized.clone()); -let legend = build_legend(size_names); -let substituted = substitute_cost(normalized.clone(), &legend.substitution.clone()); -v2_rt::concat(format_cost_class(substituted), legend.suffix.clone()) -} + let size_names = collect_size_vars(normalized.clone()); + let legend = build_legend(size_names); + let substituted = substitute_cost(normalized.clone(), &legend.substitution.clone()); + v2_rt::concat(format_cost_class(substituted), legend.suffix.clone()) + } } pub fn collect_size_vars_from_size(size: Rc) -> Rc> { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - match (*size).clone() { - SizeExpr::SizeLen { collection: c, .. } => if (c.clone().as_str() == "__expr".to_string().as_str()) { - Rc::new(vec![]) - } else { - Rc::new(vec![c.clone()]) - }, - SizeExpr::SizeVar { name: n, .. } => if (n.clone().as_str() == "__k".to_string().as_str()) { - Rc::new(vec![]) - } else { - Rc::new(vec![n.clone()]) - }, - SizeExpr::SizeAdd { left: l, right: r, .. } => v2_rt::concat(collect_size_vars_from_size(l.clone()), collect_size_vars_from_size(r.clone())), - SizeExpr::SizeMax { left: l, right: r, .. } => v2_rt::concat(collect_size_vars_from_size(l.clone()), collect_size_vars_from_size(r.clone())), - _ => Rc::new(vec![]), -} + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*size).clone() { + SizeExpr::SizeLen { collection: c, .. } => { + if (c.clone().as_str() == "__expr".to_string().as_str()) { + Rc::new(vec![]) + } else { + Rc::new(vec![c.clone()]) + } + } + SizeExpr::SizeVar { name: n, .. } => { + if (n.clone().as_str() == "__k".to_string().as_str()) { + Rc::new(vec![]) + } else { + Rc::new(vec![n.clone()]) + } + } + SizeExpr::SizeAdd { + left: l, right: r, .. + } => v2_rt::concat( + collect_size_vars_from_size(l.clone()), + collect_size_vars_from_size(r.clone()), + ), + SizeExpr::SizeMax { + left: l, right: r, .. + } => v2_rt::concat( + collect_size_vars_from_size(l.clone()), + collect_size_vars_from_size(r.clone()), + ), + _ => Rc::new(vec![]), }) } pub fn collect_size_vars(expr: Rc) -> Rc> { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - match (*expr).clone() { - CostExpr::CostSum { upper: u, body: bd, .. } => v2_rt::concat(collect_size_vars_from_size(u.clone()), collect_size_vars(bd.clone())), - CostExpr::CostAdd { left: l, right: r, .. } => v2_rt::concat(collect_size_vars(l.clone()), collect_size_vars(r.clone())), - CostExpr::CostMul { left: l, right: r, .. } => v2_rt::concat(collect_size_vars(l.clone()), collect_size_vars(r.clone())), - CostExpr::CostMax { left: l, right: r, .. } => v2_rt::concat(collect_size_vars(l.clone()), collect_size_vars(r.clone())), - CostExpr::CostLog { argument: a, .. } => collect_size_vars_from_size(a.clone()), - _ => Rc::new(vec![]), -} + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*expr).clone() { + CostExpr::CostSum { + upper: u, body: bd, .. + } => v2_rt::concat( + collect_size_vars_from_size(u.clone()), + collect_size_vars(bd.clone()), + ), + CostExpr::CostAdd { + left: l, right: r, .. + } => v2_rt::concat(collect_size_vars(l.clone()), collect_size_vars(r.clone())), + CostExpr::CostMul { + left: l, right: r, .. + } => v2_rt::concat(collect_size_vars(l.clone()), collect_size_vars(r.clone())), + CostExpr::CostMax { + left: l, right: r, .. + } => v2_rt::concat(collect_size_vars(l.clone()), collect_size_vars(r.clone())), + CostExpr::CostLog { argument: a, .. } => collect_size_vars_from_size(a.clone()), + _ => Rc::new(vec![]), }) } @@ -4257,18 +8128,24 @@ pub struct DeduplicateAcc { pub fn deduplicate(items: Rc>) -> Rc> { { - let result = items.iter().cloned().fold(Rc::new(DeduplicateAcc { - seen: v2_rt::rc_empty_map::(), - out: Rc::new(vec![]), -}), |acc: Rc, item: String| match v2_rt::map_get(&acc.seen.clone(), item.clone()) { - Some(_) => acc.clone(), - None => Rc::new(DeduplicateAcc { - seen: v2_rt::rc_map_insert(acc.seen.clone(), item.clone(), true), - out: v2_rt::rc_list_push(acc.out.clone(), item.clone()), -}), -}); -result.out.clone() -} + let result = items.iter().cloned().fold( + Rc::new(DeduplicateAcc { + seen: v2_rt::rc_empty_map::(), + out: Rc::new(vec![]), + }), + |acc: Rc, item: String| match v2_rt::map_get( + &acc.seen.clone(), + item.clone(), + ) { + Some(_) => acc.clone(), + None => Rc::new(DeduplicateAcc { + seen: v2_rt::rc_map_insert(acc.seen.clone(), item.clone(), true), + out: v2_rt::rc_list_push(acc.out.clone(), item.clone()), + }), + }, + ); + result.out.clone() + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -4304,385 +8181,623 @@ pub struct MatchCostAccum { pub branch_costs: Rc>>, } -pub fn cost_of_expr(texpr: &Rc, func_index: &Rc>>, scc_index: &Rc>>, table: Rc, parser_always_advancing: &Rc>, recursion_ctx: &RecursionContext, si: &Rc>>) -> Rc { +pub fn cost_of_expr( + texpr: &Rc, + func_index: &Rc>>, + scc_index: &Rc>>, + table: Rc, + parser_always_advancing: &Rc>, + recursion_ctx: &RecursionContext, + si: &Rc>>, +) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprLiteral { .. } => Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { - value: 1, -}), - span: Rc::new(CostExpr::CostConst { - value: 1, -}), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, -}), - table: table, -}), - ExprData::ExprError { .. } => Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { - value: 0, -}), - span: Rc::new(CostExpr::CostConst { - value: 0, -}), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, -}), - table: table, -}), - ExprData::ExprVar { .. } => Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { - value: 1, -}), - span: Rc::new(CostExpr::CostConst { - value: 1, -}), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, -}), - table: table, -}), - ExprData::ExprBinOp { .. } => { - let l = binop_left(texpr.clone()); -let r = binop_right(texpr.clone()); -let lr = cost_of_expr(&l, &func_index, &scc_index, table, &parser_always_advancing, &recursion_ctx, &si); -let rr = cost_of_expr(&r, &func_index, &scc_index, lr.table.clone(), &parser_always_advancing, &recursion_ctx, &si); -Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq(lr.summary.clone().work.clone(), &cost_seq(Rc::new(CostExpr::CostConst { - value: 1, -}), &rr.summary.clone().work.clone())), - span: cost_seq(lr.summary.clone().span.clone(), &cost_seq(Rc::new(CostExpr::CostConst { - value: 1, -}), &rr.summary.clone().span.clone())), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, -}), - table: rr.table.clone(), -}) -}, - ExprData::ExprCall { .. } => { - let fname = expr_call_func_at(texpr.clone(), si.clone()); -let callee_result = match v2_rt::map_get(&func_index, fname.clone()) { - Some(entry) => get_or_compute_summary(&fname, &func_index, &scc_index, &table, parser_always_advancing.clone(), recursion_ctx.clone(), si.clone()), - None => Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { - value: 1, -}), - span: Rc::new(CostExpr::CostConst { - value: 1, -}), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, -}), - table: table, -}), -}; -let args_result = texpr.children.clone().iter().cloned().fold(Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { - value: 0, -}), - span: Rc::new(CostExpr::CostConst { - value: 0, -}), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, -}), - table: callee_result.table.clone(), -}), |acc: Rc, a: Rc| { - let ar = cost_of_expr(&arg_value(&a), &func_index, &scc_index, acc.table.clone(), &parser_always_advancing, &recursion_ctx, &si); -Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq(acc.summary.clone().work.clone(), &ar.summary.clone().work.clone()), - span: cost_seq(acc.summary.clone().span.clone(), &ar.summary.clone().span.clone()), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, -}), - table: ar.table.clone(), -}) -}); -Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq(args_result.summary.clone().work.clone(), &callee_result.summary.clone().work.clone()), - span: cost_seq(args_result.summary.clone().span.clone(), &callee_result.summary.clone().span.clone()), - output_size: callee_result.summary.clone().output_size.clone(), - certainty: callee_result.summary.clone().certainty.clone(), -}), - table: args_result.table.clone(), -}) -}, - ExprData::ExprMethodCall { method_semantics: ms, .. } => { - let recv = method_receiver(texpr.clone()); -let mc_args = method_arg_nodes(texpr.clone()); -let recv_r = cost_of_expr(&recv, &func_index, &scc_index, table, &parser_always_advancing, &recursion_ctx, &si); -let size = receiver_size_var(recv.clone(), si.clone()); -let binder = size_binder_name(size.clone()); -let method_cost_result = if (ms.clone() == None) { - None - } else { - match (*ms.clone().unwrap()).clone() { - MethodSemantics::AlgebraMethodSemantics { method_def: md, cost_shape: cs, .. } => { - let pc = node_is_collection(&resolved_type(texpr.clone()), si.clone()); -match cs.clone() { - Some(shape) => Some(cost_of_method_by_shape(shape.clone(), pc, &recv_r, mc_args.clone(), &size, &binder, func_index.clone(), scc_index.clone(), parser_always_advancing.clone(), recursion_ctx.clone(), &si)), - None => Some(Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq(recv_r.summary.clone().work.clone(), &Rc::new(CostExpr::CostConst { - value: 1, -})), - span: cost_seq(recv_r.summary.clone().span.clone(), &Rc::new(CostExpr::CostConst { - value: 1, -})), - output_size: v2_rt::rc_empty_map::>(), - certainty: recv_r.summary.clone().certainty.clone(), -}), - table: recv_r.table.clone(), -})), -} -}, - _ => None, -} - }; -match method_cost_result { - Some(result) => result.clone(), - _ => { - let args_result = mc_args.clone().iter().cloned().fold(Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { - value: 0, -}), - span: Rc::new(CostExpr::CostConst { - value: 0, -}), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, -}), - table: recv_r.table.clone(), -}), |acc: Rc, a: Rc| { - let ar = cost_of_expr(&arg_value(&a), &func_index, &scc_index, acc.table.clone(), &parser_always_advancing, &recursion_ctx, &si); -Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq(acc.summary.clone().work.clone(), &ar.summary.clone().work.clone()), - span: cost_seq(acc.summary.clone().span.clone(), &ar.summary.clone().span.clone()), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, -}), - table: ar.table.clone(), -}) -}); -Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq(recv_r.summary.clone().work.clone(), &cost_seq(Rc::new(CostExpr::CostConst { - value: 1, -}), &args_result.summary.clone().work.clone())), - span: cost_seq(recv_r.summary.clone().span.clone(), &cost_seq(Rc::new(CostExpr::CostConst { - value: 1, -}), &args_result.summary.clone().span.clone())), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, -}), - table: args_result.table.clone(), -}) -}, -} -}, - ExprData::ExprMatch => { - let scrut = match_scrutinee(texpr.clone()); -let arm_nodes = match_arm_nodes(texpr.clone()); -let s_r = cost_of_expr(&scrut, &func_index, &scc_index, table, &parser_always_advancing, &recursion_ctx, &si); -let arms_accum = arm_nodes.iter().cloned().fold(Rc::new(MatchCostAccum { - result: Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { - value: 0, -}), - span: Rc::new(CostExpr::CostConst { - value: 0, -}), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, -}), - table: s_r.table.clone(), -}), - branch_costs: Rc::new(vec![]), -}), |acc: Rc, arm_node: Rc| { - let ar = cost_of_expr(&arm_body(&arm_node), &func_index, &scc_index, acc.result.clone().table.clone(), &parser_always_advancing, &recursion_ctx, &si); -Rc::new(MatchCostAccum { - result: Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_par(acc.result.clone().summary.clone().work.clone(), &ar.summary.clone().work.clone()), - span: cost_par(acc.result.clone().summary.clone().span.clone(), &ar.summary.clone().span.clone()), - output_size: ar.summary.clone().output_size.clone(), - certainty: ar.summary.clone().certainty.clone(), -}), - table: ar.table.clone(), -}), - branch_costs: v2_rt::concat(acc.branch_costs.clone(), Rc::new(vec![ar.summary.clone().work.clone()])), -}) -}); -Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_conditional(s_r.summary.clone().work.clone(), arms_accum.branch_costs.clone()), - span: cost_conditional(s_r.summary.clone().span.clone(), Rc::new(vec![arms_accum.result.clone().summary.clone().span.clone()])), - output_size: arms_accum.result.clone().summary.clone().output_size.clone(), - certainty: arms_accum.result.clone().summary.clone().certainty.clone(), -}), - table: arms_accum.result.clone().table.clone(), -}) -}, - ExprData::ExprIf => { - let c = if_condition(texpr.clone()); -let t = if_then_branch(texpr.clone()); -let c_r = cost_of_expr(&c, &func_index, &scc_index, table, &parser_always_advancing, &recursion_ctx, &si); -let t_r = cost_of_expr(&t, &func_index, &scc_index, c_r.table.clone(), &parser_always_advancing, &recursion_ctx, &si); -let e_result = match if_else_branch(texpr.clone()) { - Some(eb) => { - let er = cost_of_expr(&eb, &func_index, &scc_index, t_r.table.clone(), &parser_always_advancing, &recursion_ctx, &si); -Rc::new(SummaryResult { - summary: er.summary.clone(), - table: er.table.clone(), -}) -}, - None => Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { - value: 0, -}), - span: Rc::new(CostExpr::CostConst { - value: 0, -}), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, -}), - table: t_r.table.clone(), -}), -}; -Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_conditional(c_r.summary.clone().work.clone(), Rc::new(vec![t_r.summary.clone().work.clone(), e_result.summary.clone().work.clone()])), - span: cost_conditional(c_r.summary.clone().span.clone(), Rc::new(vec![t_r.summary.clone().span.clone(), e_result.summary.clone().span.clone()])), - output_size: t_r.summary.clone().output_size.clone(), - certainty: Certainty::Proven, -}), - table: e_result.table.clone(), -}) -}, - ExprData::ExprLet => { - let v = let_value(texpr.clone()); -let v_r = cost_of_expr(&v, &func_index, &scc_index, table, &parser_always_advancing, &recursion_ctx, &si); -match let_body(texpr.clone()) { - Some(b) => { - let b_r = cost_of_expr(&b, &func_index, &scc_index, v_r.table.clone(), &parser_always_advancing, &recursion_ctx, &si); -Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq(v_r.summary.clone().work.clone(), &b_r.summary.clone().work.clone()), - span: cost_seq(v_r.summary.clone().span.clone(), &b_r.summary.clone().span.clone()), - output_size: b_r.summary.clone().output_size.clone(), - certainty: b_r.summary.clone().certainty.clone(), -}), - table: b_r.table.clone(), -}) -}, - None => v_r.clone(), -} -}, - ExprData::ExprBlock => texpr.children.clone().iter().cloned().fold(Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { - value: 0, -}), - span: Rc::new(CostExpr::CostConst { - value: 0, -}), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, -}), - table: table, -}), |acc: Rc, s: Rc| { - let sr = cost_of_expr(&s, &func_index, &scc_index, acc.table.clone(), &parser_always_advancing, &recursion_ctx, &si); -Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq(acc.summary.clone().work.clone(), &sr.summary.clone().work.clone()), - span: cost_seq(acc.summary.clone().span.clone(), &sr.summary.clone().span.clone()), - output_size: sr.summary.clone().output_size.clone(), - certainty: sr.summary.clone().certainty.clone(), -}), - table: sr.table.clone(), -}) -}), - ExprData::ExprForEach => { - let c = foreach_collection(texpr.clone()); -let bd = foreach_body(texpr.clone()); -let c_r = cost_of_expr(&c, &func_index, &scc_index, table, &parser_always_advancing, &recursion_ctx, &si); -let bd_r = cost_of_expr(&bd, &func_index, &scc_index, c_r.table.clone(), &parser_always_advancing, &recursion_ctx, &si); -let size = receiver_size_var(c.clone(), si.clone()); -let binder = size_binder_name(size.clone()); -let loop_work = cost_loop(binder, size.clone(), &bd_r.summary.clone().work.clone()); -Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq(c_r.summary.clone().work.clone(), &loop_work), - span: cost_seq(c_r.summary.clone().span.clone(), &loop_work), - output_size: v2_rt::rc_empty_map::>(), - certainty: bd_r.summary.clone().certainty.clone(), -}), - table: bd_r.table.clone(), -}) -}, - ExprData::NoExprData => texpr.children.clone().iter().cloned().fold(Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { - value: 0, -}), - span: Rc::new(CostExpr::CostConst { - value: 0, -}), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, -}), - table: table, -}), |acc: Rc, child: Rc| { - let cr = cost_of_expr(&child, &func_index, &scc_index, acc.table.clone(), &parser_always_advancing, &recursion_ctx, &si); -Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq(acc.summary.clone().work.clone(), &cr.summary.clone().work.clone()), - span: cost_seq(acc.summary.clone().span.clone(), &cr.summary.clone().span.clone()), - output_size: cr.summary.clone().output_size.clone(), - certainty: cr.summary.clone().certainty.clone(), -}), - table: cr.table.clone(), -}) -}), - _ => texpr.children.clone().iter().cloned().fold(Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { - value: 1, -}), - span: Rc::new(CostExpr::CostConst { - value: 1, -}), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Proven, -}), - table: table, -}), |acc: Rc, child: Rc| { - let cr = cost_of_expr(&child, &func_index, &scc_index, acc.table.clone(), &parser_always_advancing, &recursion_ctx, &si); -Rc::new(SummaryResult { - summary: Rc::new(ComplexitySummary { - work: cost_seq(acc.summary.clone().work.clone(), &cr.summary.clone().work.clone()), - span: cost_seq(acc.summary.clone().span.clone(), &cr.summary.clone().span.clone()), - output_size: cr.summary.clone().output_size.clone(), - certainty: cr.summary.clone().certainty.clone(), -}), - table: cr.table.clone(), -}) -}), -} + ExprData::ExprLiteral { .. } => Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { value: 1 }), + span: Rc::new(CostExpr::CostConst { value: 1 }), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, + }), + table: table, + }), + ExprData::ExprError { .. } => Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { value: 0 }), + span: Rc::new(CostExpr::CostConst { value: 0 }), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, + }), + table: table, + }), + ExprData::ExprVar { .. } => Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { value: 1 }), + span: Rc::new(CostExpr::CostConst { value: 1 }), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, + }), + table: table, + }), + ExprData::ExprBinOp { .. } => { + let l = binop_left(texpr.clone()); + let r = binop_right(texpr.clone()); + let lr = cost_of_expr( + &l, + &func_index, + &scc_index, + table, + &parser_always_advancing, + &recursion_ctx, + &si, + ); + let rr = cost_of_expr( + &r, + &func_index, + &scc_index, + lr.table.clone(), + &parser_always_advancing, + &recursion_ctx, + &si, + ); + Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq( + lr.summary.clone().work.clone(), + &cost_seq( + Rc::new(CostExpr::CostConst { value: 1 }), + &rr.summary.clone().work.clone(), + ), + ), + span: cost_seq( + lr.summary.clone().span.clone(), + &cost_seq( + Rc::new(CostExpr::CostConst { value: 1 }), + &rr.summary.clone().span.clone(), + ), + ), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, + }), + table: rr.table.clone(), + }) + } + ExprData::ExprCall { .. } => { + let fname = expr_call_func_at(texpr.clone(), si.clone()); + let callee_result = match v2_rt::map_get(&func_index, fname.clone()) { + Some(entry) => get_or_compute_summary( + &fname, + &func_index, + &scc_index, + &table, + parser_always_advancing.clone(), + recursion_ctx.clone(), + si.clone(), + ), + None => Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { value: 1 }), + span: Rc::new(CostExpr::CostConst { value: 1 }), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, + }), + table: table, + }), + }; + let args_result = texpr.children.clone().iter().cloned().fold( + Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { value: 0 }), + span: Rc::new(CostExpr::CostConst { value: 0 }), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, + }), + table: callee_result.table.clone(), + }), + |acc: Rc, a: Rc| { + let ar = cost_of_expr( + &arg_value(&a), + &func_index, + &scc_index, + acc.table.clone(), + &parser_always_advancing, + &recursion_ctx, + &si, + ); + Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq( + acc.summary.clone().work.clone(), + &ar.summary.clone().work.clone(), + ), + span: cost_seq( + acc.summary.clone().span.clone(), + &ar.summary.clone().span.clone(), + ), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, + }), + table: ar.table.clone(), + }) + }, + ); + Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq( + args_result.summary.clone().work.clone(), + &callee_result.summary.clone().work.clone(), + ), + span: cost_seq( + args_result.summary.clone().span.clone(), + &callee_result.summary.clone().span.clone(), + ), + output_size: callee_result.summary.clone().output_size.clone(), + certainty: callee_result.summary.clone().certainty.clone(), + }), + table: args_result.table.clone(), + }) + } + ExprData::ExprMethodCall { + method_semantics: ms, + .. + } => { + let recv = method_receiver(texpr.clone()); + let mc_args = method_arg_nodes(texpr.clone()); + let recv_r = cost_of_expr( + &recv, + &func_index, + &scc_index, + table, + &parser_always_advancing, + &recursion_ctx, + &si, + ); + let size = receiver_size_var(recv.clone(), si.clone()); + let binder = size_binder_name(size.clone()); + let method_cost_result = if (ms.clone() == None) { + None + } else { + match (*ms.clone().unwrap()).clone() { + MethodSemantics::AlgebraMethodSemantics { + method_def: md, + cost_shape: cs, + .. + } => { + let pc = node_is_collection(&resolved_type(texpr.clone()), si.clone()); + match cs.clone() { + Some(shape) => Some(cost_of_method_by_shape( + shape.clone(), + pc, + &recv_r, + mc_args.clone(), + &size, + &binder, + func_index.clone(), + scc_index.clone(), + parser_always_advancing.clone(), + recursion_ctx.clone(), + &si, + )), + None => Some(Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq( + recv_r.summary.clone().work.clone(), + &Rc::new(CostExpr::CostConst { value: 1 }), + ), + span: cost_seq( + recv_r.summary.clone().span.clone(), + &Rc::new(CostExpr::CostConst { value: 1 }), + ), + output_size: v2_rt::rc_empty_map::>(), + certainty: recv_r.summary.clone().certainty.clone(), + }), + table: recv_r.table.clone(), + })), + } + } + _ => None, + } + }; + match method_cost_result { + Some(result) => result.clone(), + _ => { + let args_result = mc_args.clone().iter().cloned().fold( + Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { value: 0 }), + span: Rc::new(CostExpr::CostConst { value: 0 }), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, + }), + table: recv_r.table.clone(), + }), + |acc: Rc, a: Rc| { + let ar = cost_of_expr( + &arg_value(&a), + &func_index, + &scc_index, + acc.table.clone(), + &parser_always_advancing, + &recursion_ctx, + &si, + ); + Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq( + acc.summary.clone().work.clone(), + &ar.summary.clone().work.clone(), + ), + span: cost_seq( + acc.summary.clone().span.clone(), + &ar.summary.clone().span.clone(), + ), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, + }), + table: ar.table.clone(), + }) + }, + ); + Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq( + recv_r.summary.clone().work.clone(), + &cost_seq( + Rc::new(CostExpr::CostConst { value: 1 }), + &args_result.summary.clone().work.clone(), + ), + ), + span: cost_seq( + recv_r.summary.clone().span.clone(), + &cost_seq( + Rc::new(CostExpr::CostConst { value: 1 }), + &args_result.summary.clone().span.clone(), + ), + ), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, + }), + table: args_result.table.clone(), + }) + } + } + } + ExprData::ExprMatch => { + let scrut = match_scrutinee(texpr.clone()); + let arm_nodes = match_arm_nodes(texpr.clone()); + let s_r = cost_of_expr( + &scrut, + &func_index, + &scc_index, + table, + &parser_always_advancing, + &recursion_ctx, + &si, + ); + let arms_accum = arm_nodes.iter().cloned().fold( + Rc::new(MatchCostAccum { + result: Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { value: 0 }), + span: Rc::new(CostExpr::CostConst { value: 0 }), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, + }), + table: s_r.table.clone(), + }), + branch_costs: Rc::new(vec![]), + }), + |acc: Rc, arm_node: Rc| { + let ar = cost_of_expr( + &arm_body(&arm_node), + &func_index, + &scc_index, + acc.result.clone().table.clone(), + &parser_always_advancing, + &recursion_ctx, + &si, + ); + Rc::new(MatchCostAccum { + result: Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_par( + acc.result.clone().summary.clone().work.clone(), + &ar.summary.clone().work.clone(), + ), + span: cost_par( + acc.result.clone().summary.clone().span.clone(), + &ar.summary.clone().span.clone(), + ), + output_size: ar.summary.clone().output_size.clone(), + certainty: ar.summary.clone().certainty.clone(), + }), + table: ar.table.clone(), + }), + branch_costs: v2_rt::concat( + acc.branch_costs.clone(), + Rc::new(vec![ar.summary.clone().work.clone()]), + ), + }) + }, + ); + Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_conditional( + s_r.summary.clone().work.clone(), + arms_accum.branch_costs.clone(), + ), + span: cost_conditional( + s_r.summary.clone().span.clone(), + Rc::new(vec![arms_accum.result.clone().summary.clone().span.clone()]), + ), + output_size: arms_accum + .result + .clone() + .summary + .clone() + .output_size + .clone(), + certainty: arms_accum.result.clone().summary.clone().certainty.clone(), + }), + table: arms_accum.result.clone().table.clone(), + }) + } + ExprData::ExprIf => { + let c = if_condition(texpr.clone()); + let t = if_then_branch(texpr.clone()); + let c_r = cost_of_expr( + &c, + &func_index, + &scc_index, + table, + &parser_always_advancing, + &recursion_ctx, + &si, + ); + let t_r = cost_of_expr( + &t, + &func_index, + &scc_index, + c_r.table.clone(), + &parser_always_advancing, + &recursion_ctx, + &si, + ); + let e_result = match if_else_branch(texpr.clone()) { + Some(eb) => { + let er = cost_of_expr( + &eb, + &func_index, + &scc_index, + t_r.table.clone(), + &parser_always_advancing, + &recursion_ctx, + &si, + ); + Rc::new(SummaryResult { + summary: er.summary.clone(), + table: er.table.clone(), + }) + } + None => Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { value: 0 }), + span: Rc::new(CostExpr::CostConst { value: 0 }), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, + }), + table: t_r.table.clone(), + }), + }; + Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_conditional( + c_r.summary.clone().work.clone(), + Rc::new(vec![ + t_r.summary.clone().work.clone(), + e_result.summary.clone().work.clone(), + ]), + ), + span: cost_conditional( + c_r.summary.clone().span.clone(), + Rc::new(vec![ + t_r.summary.clone().span.clone(), + e_result.summary.clone().span.clone(), + ]), + ), + output_size: t_r.summary.clone().output_size.clone(), + certainty: Certainty::Proven, + }), + table: e_result.table.clone(), + }) + } + ExprData::ExprLet => { + let v = let_value(texpr.clone()); + let v_r = cost_of_expr( + &v, + &func_index, + &scc_index, + table, + &parser_always_advancing, + &recursion_ctx, + &si, + ); + match let_body(texpr.clone()) { + Some(b) => { + let b_r = cost_of_expr( + &b, + &func_index, + &scc_index, + v_r.table.clone(), + &parser_always_advancing, + &recursion_ctx, + &si, + ); + Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq( + v_r.summary.clone().work.clone(), + &b_r.summary.clone().work.clone(), + ), + span: cost_seq( + v_r.summary.clone().span.clone(), + &b_r.summary.clone().span.clone(), + ), + output_size: b_r.summary.clone().output_size.clone(), + certainty: b_r.summary.clone().certainty.clone(), + }), + table: b_r.table.clone(), + }) + } + None => v_r.clone(), + } + } + ExprData::ExprBlock => texpr.children.clone().iter().cloned().fold( + Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { value: 0 }), + span: Rc::new(CostExpr::CostConst { value: 0 }), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, + }), + table: table, + }), + |acc: Rc, s: Rc| { + let sr = cost_of_expr( + &s, + &func_index, + &scc_index, + acc.table.clone(), + &parser_always_advancing, + &recursion_ctx, + &si, + ); + Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq( + acc.summary.clone().work.clone(), + &sr.summary.clone().work.clone(), + ), + span: cost_seq( + acc.summary.clone().span.clone(), + &sr.summary.clone().span.clone(), + ), + output_size: sr.summary.clone().output_size.clone(), + certainty: sr.summary.clone().certainty.clone(), + }), + table: sr.table.clone(), + }) + }, + ), + ExprData::ExprForEach => { + let c = foreach_collection(texpr.clone()); + let bd = foreach_body(texpr.clone()); + let c_r = cost_of_expr( + &c, + &func_index, + &scc_index, + table, + &parser_always_advancing, + &recursion_ctx, + &si, + ); + let bd_r = cost_of_expr( + &bd, + &func_index, + &scc_index, + c_r.table.clone(), + &parser_always_advancing, + &recursion_ctx, + &si, + ); + let size = receiver_size_var(c.clone(), si.clone()); + let binder = size_binder_name(size.clone()); + let loop_work = cost_loop(binder, size.clone(), &bd_r.summary.clone().work.clone()); + Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq(c_r.summary.clone().work.clone(), &loop_work), + span: cost_seq(c_r.summary.clone().span.clone(), &loop_work), + output_size: v2_rt::rc_empty_map::>(), + certainty: bd_r.summary.clone().certainty.clone(), + }), + table: bd_r.table.clone(), + }) + } + ExprData::NoExprData => texpr.children.clone().iter().cloned().fold( + Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { value: 0 }), + span: Rc::new(CostExpr::CostConst { value: 0 }), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, + }), + table: table, + }), + |acc: Rc, child: Rc| { + let cr = cost_of_expr( + &child, + &func_index, + &scc_index, + acc.table.clone(), + &parser_always_advancing, + &recursion_ctx, + &si, + ); + Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq( + acc.summary.clone().work.clone(), + &cr.summary.clone().work.clone(), + ), + span: cost_seq( + acc.summary.clone().span.clone(), + &cr.summary.clone().span.clone(), + ), + output_size: cr.summary.clone().output_size.clone(), + certainty: cr.summary.clone().certainty.clone(), + }), + table: cr.table.clone(), + }) + }, + ), + _ => texpr.children.clone().iter().cloned().fold( + Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { value: 1 }), + span: Rc::new(CostExpr::CostConst { value: 1 }), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Proven, + }), + table: table, + }), + |acc: Rc, child: Rc| { + let cr = cost_of_expr( + &child, + &func_index, + &scc_index, + acc.table.clone(), + &parser_always_advancing, + &recursion_ctx, + &si, + ); + Rc::new(SummaryResult { + summary: Rc::new(ComplexitySummary { + work: cost_seq( + acc.summary.clone().work.clone(), + &cr.summary.clone().work.clone(), + ), + span: cost_seq( + acc.summary.clone().span.clone(), + &cr.summary.clone().span.clone(), + ), + output_size: cr.summary.clone().output_size.clone(), + certainty: cr.summary.clone().certainty.clone(), + }), + table: cr.table.clone(), + }) + }, + ), + } }) } @@ -4691,437 +8806,740 @@ pub fn estimate_expr_size(texpr: Rc, budget: i64) -> i64 { if (budget.clone() <= 0) { 0 } else { - texpr.children.clone().iter().cloned().fold((budget.clone() - 1), |acc: i64, child: Rc| estimate_expr_size(child.clone(), acc)) + texpr + .children + .clone() + .iter() + .cloned() + .fold((budget.clone() - 1), |acc: i64, child: Rc| { + estimate_expr_size(child.clone(), acc) + }) } }) } -pub fn get_or_compute_summary(func_name: &String, func_index: &Rc>>, scc_index: &Rc>>, table: &Rc, parser_always_advancing: Rc>, recursion_ctx: RecursionContext, si: Rc>>) -> Rc { +pub fn get_or_compute_summary( + func_name: &String, + func_index: &Rc>>, + scc_index: &Rc>>, + table: &Rc, + parser_always_advancing: Rc>, + recursion_ctx: RecursionContext, + si: Rc>>, +) -> Rc { match lookup_summary(table.clone(), func_name.clone()) { - Some(cached) => Rc::new(SummaryResult { - summary: cached.clone(), - table: table.clone(), -}), - None => match v2_rt::map_get(&func_index, func_name.clone()) { - Some(entry) => { - let target = match v2_rt::map_get(&scc_index, func_name.clone()) { - Some(info) => Some(info.pattern.clone()), - None => None, -}; -let is_recursive = (target.clone() != None); -let zero_placeholder = Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostConst { - value: 0, -}), - span: Rc::new(CostExpr::CostConst { - value: 0, -}), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Conservative, -}); -let table_prepped = if is_recursive { - cache_summary(table.clone(), func_name.clone(), zero_placeholder) - } else { - table.clone() - }; -let result = cost_of_expr(&entry.body.clone(), &func_index, &scc_index, table_prepped, &parser_always_advancing, &recursion_ctx, &si); -let scc_members = match v2_rt::map_get(&scc_index, func_name.clone()) { - Some(info) => info.members.clone(), - None => Rc::new(vec![]), -}; -let is_scc = ((scc_members.clone().len() as i64) > 1); -let bounded = match target.clone() { - Some(t) => if is_scc { - Rc::new(ComplexitySummary { - work: bounded_scc_cost(t.clone(), result.summary.clone().work.clone(), scc_members.clone()), - span: bounded_scc_cost(t.clone(), result.summary.clone().span.clone(), scc_members.clone()), - output_size: result.summary.clone().output_size.clone(), - certainty: Certainty::Conservative, -}) - } else { - Rc::new(ComplexitySummary { - work: bounded_recursive_cost(t.clone(), result.summary.clone().work.clone(), func_name.clone()), - span: bounded_recursive_cost(t.clone(), result.summary.clone().span.clone(), func_name.clone()), - output_size: result.summary.clone().output_size.clone(), - certainty: Certainty::Conservative, -}) + Some(cached) => Rc::new(SummaryResult { + summary: cached.clone(), + table: table.clone(), + }), + None => match v2_rt::map_get(&func_index, func_name.clone()) { + Some(entry) => { + let target = match v2_rt::map_get(&scc_index, func_name.clone()) { + Some(info) => Some(info.pattern.clone()), + None => None, + }; + let is_recursive = (target.clone() != None); + let zero_placeholder = Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostConst { value: 0 }), + span: Rc::new(CostExpr::CostConst { value: 0 }), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Conservative, + }); + let table_prepped = if is_recursive { + cache_summary(table.clone(), func_name.clone(), zero_placeholder) + } else { + table.clone() + }; + let result = cost_of_expr( + &entry.body.clone(), + &func_index, + &scc_index, + table_prepped, + &parser_always_advancing, + &recursion_ctx, + &si, + ); + let scc_members = match v2_rt::map_get(&scc_index, func_name.clone()) { + Some(info) => info.members.clone(), + None => Rc::new(vec![]), + }; + let is_scc = ((scc_members.clone().len() as i64) > 1); + let bounded = match target.clone() { + Some(t) => { + if is_scc { + Rc::new(ComplexitySummary { + work: bounded_scc_cost( + t.clone(), + result.summary.clone().work.clone(), + scc_members.clone(), + ), + span: bounded_scc_cost( + t.clone(), + result.summary.clone().span.clone(), + scc_members.clone(), + ), + output_size: result.summary.clone().output_size.clone(), + certainty: Certainty::Conservative, + }) + } else { + Rc::new(ComplexitySummary { + work: bounded_recursive_cost( + t.clone(), + result.summary.clone().work.clone(), + func_name.clone(), + ), + span: bounded_recursive_cost( + t.clone(), + result.summary.clone().span.clone(), + func_name.clone(), + ), + output_size: result.summary.clone().output_size.clone(), + certainty: Certainty::Conservative, + }) + } + } + None => result.summary.clone(), + }; + let simplified = Rc::new(ComplexitySummary { + work: simplify_cost(bounded.work.clone()), + span: simplify_cost(bounded.span.clone()), + output_size: bounded.output_size.clone(), + certainty: bounded.certainty.clone(), + }); + let final_table = + cache_summary(result.table.clone(), func_name.clone(), simplified.clone()); + Rc::new(SummaryResult { + summary: simplified.clone(), + table: final_table, + }) + } + None => { + let is_unexpected_miss = (v2_rt::map_get(&scc_index, func_name.clone()) != None); + if is_unexpected_miss { + { + let miss_summary = Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostUnknown { + reason: v2_rt::concat( + "internal function missing from index: ".to_string(), + func_name.clone(), + ), + }), + span: Rc::new(CostExpr::CostUnknown { + reason: v2_rt::concat( + "internal function missing from index: ".to_string(), + func_name.clone(), + ), + }), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Conservative, + }); + Rc::new(SummaryResult { + summary: miss_summary, + table: table.clone(), + }) + } + } else { + { + let external_summary = Rc::new(ComplexitySummary { + work: Rc::new(CostExpr::CostExtern { + name: func_name.clone(), + }), + span: Rc::new(CostExpr::CostExtern { + name: func_name.clone(), + }), + output_size: v2_rt::rc_empty_map::>(), + certainty: Certainty::Conservative, + }); + Rc::new(SummaryResult { + summary: external_summary, + table: table.clone(), + }) + } + } + } }, - None => result.summary.clone(), -}; -let simplified = Rc::new(ComplexitySummary { - work: simplify_cost(bounded.work.clone()), - span: simplify_cost(bounded.span.clone()), - output_size: bounded.output_size.clone(), - certainty: bounded.certainty.clone(), -}); -let final_table = cache_summary(result.table.clone(), func_name.clone(), simplified.clone()); -Rc::new(SummaryResult { - summary: simplified.clone(), - table: final_table, -}) -}, - None => { - let is_unexpected_miss = (v2_rt::map_get(&scc_index, func_name.clone()) != None); -if is_unexpected_miss { - { - let miss_summary = Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostUnknown { - reason: v2_rt::concat("internal function missing from index: ".to_string(), func_name.clone()), -}), - span: Rc::new(CostExpr::CostUnknown { - reason: v2_rt::concat("internal function missing from index: ".to_string(), func_name.clone()), -}), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Conservative, -}); -Rc::new(SummaryResult { - summary: miss_summary, - table: table.clone(), -}) -} - } else { - { - let external_summary = Rc::new(ComplexitySummary { - work: Rc::new(CostExpr::CostExtern { - name: func_name.clone(), -}), - span: Rc::new(CostExpr::CostExtern { - name: func_name.clone(), -}), - output_size: v2_rt::rc_empty_map::>(), - certainty: Certainty::Conservative, -}); -Rc::new(SummaryResult { - summary: external_summary, - table: table.clone(), -}) -} - } -}, -}, -} + } } -pub fn collect_call_evidence(body: &Rc, target_set: &Rc>, si: &Rc>>) -> Rc>>>> { +pub fn collect_call_evidence( + body: &Rc, + target_set: &Rc>, + si: &Rc>>, +) -> Rc>>>> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { descent_evidence: de, .. } => { - let callee = expr_call_func_at(body.clone(), si.clone()); -let own = if (v2_rt::map_get(&target_set, callee) != None) { - match de.clone() { - Some(evidence) => Rc::new(vec![evidence.clone()]), - None => Rc::new(vec![]), -} - } else { - Rc::new(vec![]) - }; -let from_children = body.children.clone().iter().cloned().fold(Rc::new(vec![]), |acc: _, child: Rc| v2_rt::concat(acc, collect_call_evidence(&child, &target_set, &si))); -v2_rt::concat(own, from_children) -}, - _ => body.children.clone().iter().cloned().fold(Rc::new(vec![]), |acc: Rc>>>>, child: Rc| v2_rt::concat(acc, collect_call_evidence(&child, &target_set, &si))), -} + ExprData::ExprCall { + descent_evidence: de, + .. + } => { + let callee = expr_call_func_at(body.clone(), si.clone()); + let own = if (v2_rt::map_get(&target_set, callee) != None) { + match de.clone() { + Some(evidence) => Rc::new(vec![evidence.clone()]), + None => Rc::new(vec![]), + } + } else { + Rc::new(vec![]) + }; + let from_children = body.children.clone().iter().cloned().fold( + Rc::new(vec![]), + |acc: _, child: Rc| { + v2_rt::concat(acc, collect_call_evidence(&child, &target_set, &si)) + }, + ); + v2_rt::concat(own, from_children) + } + _ => body.children.clone().iter().cloned().fold( + Rc::new(vec![]), + |acc: Rc>>>>, child: Rc| { + v2_rt::concat(acc, collect_call_evidence(&child, &target_set, &si)) + }, + ), + } }) } -pub fn collect_self_call_evidence(body: Rc, fn_name: String, si: Rc>>) -> Rc>>>> { - collect_call_evidence(&body, &v2_rt::rc_map_insert(v2_rt::rc_empty_map::(), fn_name, true), &si) +pub fn collect_self_call_evidence( + body: Rc, + fn_name: String, + si: Rc>>, +) -> Rc>>>> { + collect_call_evidence( + &body, + &v2_rt::rc_map_insert(v2_rt::rc_empty_map::(), fn_name, true), + &si, + ) } -pub fn collect_callee_evidence(body: Rc, callee_name: String, si: Rc>>) -> Rc>>>> { - collect_call_evidence(&body, &v2_rt::rc_map_insert(v2_rt::rc_empty_map::(), callee_name, true), &si) +pub fn collect_callee_evidence( + body: Rc, + callee_name: String, + si: Rc>>, +) -> Rc>>>> { + collect_call_evidence( + &body, + &v2_rt::rc_map_insert(v2_rt::rc_empty_map::(), callee_name, true), + &si, + ) } pub fn derive_edge_evidence(all_calls: Rc>>>>) -> DescentEvidence { - all_calls.iter().cloned().fold(DescentEvidence::Strict, |worst: DescentEvidence, call_ev: Rc>>| { - let call_best = call_ev.clone().iter().cloned().fold(DescentEvidence::DescentUnknown, |best: DescentEvidence, rel: Rc| { - let ev = sub_value_to_evidence(rel.clone()); -match ev.clone() { - DescentEvidence::Strict => DescentEvidence::Strict, - _ => match best { - DescentEvidence::Strict => DescentEvidence::Strict, - DescentEvidence::NonIncreasing => DescentEvidence::NonIncreasing, - _ => ev.clone(), -}, -} -}); -merge_evidence(worst, call_best.clone()) -}) -} - -pub fn merge_param_evidence(all_calls: Rc>>>>, param_index: i64) -> DescentEvidence { - all_calls.iter().cloned().fold(DescentEvidence::Strict, |acc: DescentEvidence, call_evidence: Rc>>| match call_evidence.clone().get(param_index.clone() as usize).cloned() { - Some(rel) => merge_evidence(acc.clone(), sub_value_to_evidence(rel.clone())), - None => acc.clone(), -}) + all_calls.iter().cloned().fold( + DescentEvidence::Strict, + |worst: DescentEvidence, call_ev: Rc>>| { + let call_best = call_ev.clone().iter().cloned().fold( + DescentEvidence::DescentUnknown, + |best: DescentEvidence, rel: Rc| { + let ev = sub_value_to_evidence(rel.clone()); + match ev.clone() { + DescentEvidence::Strict => DescentEvidence::Strict, + _ => match best { + DescentEvidence::Strict => DescentEvidence::Strict, + DescentEvidence::NonIncreasing => DescentEvidence::NonIncreasing, + _ => ev.clone(), + }, + } + }, + ); + merge_evidence(worst, call_best.clone()) + }, + ) +} + +pub fn merge_param_evidence( + all_calls: Rc>>>>, + param_index: i64, +) -> DescentEvidence { + all_calls.iter().cloned().fold( + DescentEvidence::Strict, + |acc: DescentEvidence, call_evidence: Rc>>| match call_evidence + .clone() + .get(param_index.clone() as usize) + .cloned() + { + Some(rel) => merge_evidence(acc.clone(), sub_value_to_evidence(rel.clone())), + None => acc.clone(), + }, + ) } -pub fn extract_shrink_factor(all_calls: Rc>>>>, param_index: i64) -> Option> { - all_calls.iter().cloned().fold(Some(Rc::new(ShrinkFactor::UnitShrink)), |acc: Option>, call_evidence: Rc>>| match acc.clone() { - None => None, - Some(prev) => match call_evidence.clone().get(param_index.clone() as usize).cloned() { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { factor: f, .. } => match (*prev.clone()).clone() { - ShrinkFactor::UnitShrink => Some(f.clone()), - _ => if (prev.clone() == f.clone()) { - acc.clone() - } else { - None - }, -}, - SubValueRelation::ArithmeticDescent { factor: f, .. } => match (*prev.clone()).clone() { - ShrinkFactor::UnitShrink => Some(f.clone()), - _ => if (prev.clone() == f.clone()) { - acc.clone() - } else { - None - }, -}, - _ => acc.clone(), -}, - None => acc.clone(), -}, -}) +pub fn extract_shrink_factor( + all_calls: Rc>>>>, + param_index: i64, +) -> Option> { + all_calls.iter().cloned().fold( + Some(Rc::new(ShrinkFactor::UnitShrink)), + |acc: Option>, call_evidence: Rc>>| match acc + .clone() + { + None => None, + Some(prev) => match call_evidence + .clone() + .get(param_index.clone() as usize) + .cloned() + { + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { factor: f, .. } => { + match (*prev.clone()).clone() { + ShrinkFactor::UnitShrink => Some(f.clone()), + _ => { + if (prev.clone() == f.clone()) { + acc.clone() + } else { + None + } + } + } + } + SubValueRelation::ArithmeticDescent { factor: f, .. } => { + match (*prev.clone()).clone() { + ShrinkFactor::UnitShrink => Some(f.clone()), + _ => { + if (prev.clone() == f.clone()) { + acc.clone() + } else { + None + } + } + } + } + _ => acc.clone(), + }, + None => acc.clone(), + }, + }, + ) } -pub fn max_path_descending(body: &Rc, fn_name: &String, param_index: i64, si: &Rc>>) -> i64 { +pub fn max_path_descending( + body: &Rc, + fn_name: &String, + param_index: i64, + si: &Rc>>, +) -> i64 { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { descent_evidence: de, .. } => { - let callee = expr_call_func_at(body.clone(), si.clone()); -let own = if (callee.as_str() == fn_name.clone().as_str()) { - match de.clone() { - Some(evidence) => match evidence.clone().get(param_index.clone() as usize).cloned() { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { .. } => 1, - SubValueRelation::IteratedSubValue { .. } => 1, - SubValueRelation::ArithmeticDescent { .. } => 1, - _ => 0, -}, - None => 0, -}, - None => 0, -} - } else { - 0 - }; -let from_children = body.children.clone().iter().cloned().fold(0, |acc: i64, child: Rc| (acc + max_path_descending(&child, &fn_name, param_index.clone(), &si))); -(own + from_children) -}, - ExprData::ExprIf => { - let cond_count = max_path_descending(&if_condition(body.clone()), &fn_name, param_index.clone(), &si); -let then_count = max_path_descending(&if_then_branch(body.clone()), &fn_name, param_index.clone(), &si); -let else_branch = if_else_branch(body.clone()); -let else_count = match else_branch { - Some(eb) => max_path_descending(&eb, &fn_name, param_index.clone(), &si), - None => 0, -}; -let branch_max = if (then_count.clone() > else_count.clone()) { - then_count.clone() - } else { - else_count.clone() - }; -(cond_count + branch_max) -}, - ExprData::ExprMatch => { - let scrut_count = max_path_descending(&match_scrutinee(body.clone()), &fn_name, param_index.clone(), &si); -let arms = match_arm_nodes(body.clone()); -let arm_max = arms.iter().cloned().fold(0, |acc: i64, arm: Rc| { - let arm_count = max_path_descending(&arm_body(&arm), &fn_name, param_index.clone(), &si); -if (arm_count.clone() > acc.clone()) { - arm_count.clone() + ExprData::ExprCall { + descent_evidence: de, + .. + } => { + let callee = expr_call_func_at(body.clone(), si.clone()); + let own = if (callee.as_str() == fn_name.clone().as_str()) { + match de.clone() { + Some(evidence) => { + match evidence.clone().get(param_index.clone() as usize).cloned() { + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { .. } => 1, + SubValueRelation::IteratedSubValue { .. } => 1, + SubValueRelation::ArithmeticDescent { .. } => 1, + _ => 0, + }, + None => 0, + } + } + None => 0, + } } else { - acc.clone() - } -}); -(scrut_count + arm_max) -}, - _ => body.children.clone().iter().cloned().fold(0, |acc: i64, child: Rc| (acc + max_path_descending(&child, &fn_name, param_index.clone(), &si))), -} + 0 + }; + let from_children = + body.children + .clone() + .iter() + .cloned() + .fold(0, |acc: i64, child: Rc| { + (acc + max_path_descending(&child, &fn_name, param_index.clone(), &si)) + }); + (own + from_children) + } + ExprData::ExprIf => { + let cond_count = max_path_descending( + &if_condition(body.clone()), + &fn_name, + param_index.clone(), + &si, + ); + let then_count = max_path_descending( + &if_then_branch(body.clone()), + &fn_name, + param_index.clone(), + &si, + ); + let else_branch = if_else_branch(body.clone()); + let else_count = match else_branch { + Some(eb) => max_path_descending(&eb, &fn_name, param_index.clone(), &si), + None => 0, + }; + let branch_max = if (then_count.clone() > else_count.clone()) { + then_count.clone() + } else { + else_count.clone() + }; + (cond_count + branch_max) + } + ExprData::ExprMatch => { + let scrut_count = max_path_descending( + &match_scrutinee(body.clone()), + &fn_name, + param_index.clone(), + &si, + ); + let arms = match_arm_nodes(body.clone()); + let arm_max = arms.iter().cloned().fold(0, |acc: i64, arm: Rc| { + let arm_count = + max_path_descending(&arm_body(&arm), &fn_name, param_index.clone(), &si); + if (arm_count.clone() > acc.clone()) { + arm_count.clone() + } else { + acc.clone() + } + }); + (scrut_count + arm_max) + } + _ => body + .children + .clone() + .iter() + .cloned() + .fold(0, |acc: i64, child: Rc| { + (acc + max_path_descending(&child, &fn_name, param_index.clone(), &si)) + }), + } }) } -pub fn distinct_descended_fields(all_calls: Rc>>>>, param_index: i64) -> i64 { +pub fn distinct_descended_fields( + all_calls: Rc>>>>, + param_index: i64, +) -> i64 { { - let field_set = all_calls.iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, call_evidence: Rc>>| match call_evidence.clone().get(param_index.clone() as usize).cloned() { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { field: f, .. } => v2_rt::rc_map_insert(acc.clone(), f.field_name.clone(), true), - SubValueRelation::IteratedSubValue { field: f, .. } => v2_rt::rc_map_insert(acc.clone(), f.field_name.clone(), true), - _ => acc.clone(), -}, - None => acc.clone(), -}); -(Rc::new(v2_rt::map_keys(&field_set)).len() as i64) -} + let field_set = all_calls.iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, call_evidence: Rc>>| { + match call_evidence + .clone() + .get(param_index.clone() as usize) + .cloned() + { + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { field: f, .. } => { + v2_rt::rc_map_insert(acc.clone(), f.field_name.clone(), true) + } + SubValueRelation::IteratedSubValue { field: f, .. } => { + v2_rt::rc_map_insert(acc.clone(), f.field_name.clone(), true) + } + _ => acc.clone(), + }, + None => acc.clone(), + } + }, + ); + (Rc::new(v2_rt::map_keys(&field_set)).len() as i64) + } } -pub fn analyze_structural_bounds(func_entries: Rc>>, si: Rc>>) -> Rc>> { - func_entries.iter().cloned().fold(Rc::new(vec![]), |acc: Rc>>, entry: Rc| { - let all_calls = collect_self_call_evidence(entry.body.clone(), entry.name.clone(), si.clone()); -if ((all_calls.clone().len() as i64) == 0) { - acc.clone() - } else { - { - let param_results = Rc::new(entry.params.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(Rc::new(vec![]), |pacc: _, pair: (i64, Rc)| { - let param_index = pair.0.clone(); -let param_node = pair.1.clone(); -let evidence = merge_param_evidence(all_calls.clone(), param_index.clone()); -match evidence.clone() { - DescentEvidence::Strict => { - let param_name = param_node_name_at(param_node.clone(), si.clone()); -let factor_opt = extract_shrink_factor(all_calls.clone(), param_index.clone()); -match factor_opt.clone() { - Some(factor) => { - let branches = max_path_descending(&entry.body.clone(), &entry.name.clone(), param_index.clone(), &si); -let recurrence = match (*factor.clone()).clone() { - ShrinkFactor::UnitShrink => { - let distinct_fields = distinct_descended_fields(all_calls.clone(), param_index.clone()); -if (branches.clone() <= distinct_fields.clone()) { - catamorphism_bound(param_name.clone(), 1) - } else { - derive_bound(param_name.clone(), branches.clone(), factor.clone(), 0) - } -}, - ShrinkFactor::ConstantShrink { .. } => { - let distinct_fields = distinct_descended_fields(all_calls.clone(), param_index.clone()); -if (branches.clone() <= distinct_fields.clone()) { - catamorphism_bound(param_name.clone(), 1) - } else { - derive_bound(param_name.clone(), branches.clone(), factor.clone(), 0) +pub fn analyze_structural_bounds( + func_entries: Rc>>, + si: Rc>>, +) -> Rc>> { + func_entries.iter().cloned().fold( + Rc::new(vec![]), + |acc: Rc>>, entry: Rc| { + let all_calls = + collect_self_call_evidence(entry.body.clone(), entry.name.clone(), si.clone()); + if ((all_calls.clone().len() as i64) == 0) { + acc.clone() + } else { + { + let param_results = Rc::new( + entry + .params + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + .fold(Rc::new(vec![]), |pacc: _, pair: (i64, Rc)| { + let param_index = pair.0.clone(); + let param_node = pair.1.clone(); + let evidence = merge_param_evidence(all_calls.clone(), param_index.clone()); + match evidence.clone() { + DescentEvidence::Strict => { + let param_name = param_node_name_at(param_node.clone(), si.clone()); + let factor_opt = + extract_shrink_factor(all_calls.clone(), param_index.clone()); + match factor_opt.clone() { + Some(factor) => { + let branches = max_path_descending( + &entry.body.clone(), + &entry.name.clone(), + param_index.clone(), + &si, + ); + let recurrence = match (*factor.clone()).clone() { + ShrinkFactor::UnitShrink => { + let distinct_fields = distinct_descended_fields( + all_calls.clone(), + param_index.clone(), + ); + if (branches.clone() <= distinct_fields.clone()) { + catamorphism_bound(param_name.clone(), 1) + } else { + derive_bound( + param_name.clone(), + branches.clone(), + factor.clone(), + 0, + ) + } + } + ShrinkFactor::ConstantShrink { .. } => { + let distinct_fields = distinct_descended_fields( + all_calls.clone(), + param_index.clone(), + ); + if (branches.clone() <= distinct_fields.clone()) { + catamorphism_bound(param_name.clone(), 1) + } else { + derive_bound( + param_name.clone(), + branches.clone(), + factor.clone(), + 0, + ) + } + } + ShrinkFactor::ProportionalShrink { .. } => { + derive_bound( + param_name.clone(), + branches.clone(), + factor.clone(), + 0, + ) + } + }; + let stack_bound = if entry.is_tail_recursive.clone() { + Rc::new(CostBound::ConstantBound) + } else { + derive_bound(param_name.clone(), 1, factor.clone(), 0) + }; + v2_rt::concat( + pacc.clone(), + Rc::new(vec![Rc::new(StructuralBoundResult { + func_name: entry.name.clone(), + param: param_name.clone(), + recurrence_bound: recurrence.clone(), + stack_bound: stack_bound.clone(), + span: entry.span.clone(), + })]), + ) + } + None => pacc.clone(), } -}, - ShrinkFactor::ProportionalShrink { .. } => derive_bound(param_name.clone(), branches.clone(), factor.clone(), 0), -}; -let stack_bound = if entry.is_tail_recursive.clone() { - Rc::new(CostBound::ConstantBound) - } else { - derive_bound(param_name.clone(), 1, factor.clone(), 0) - }; -v2_rt::concat(pacc.clone(), Rc::new(vec![Rc::new(StructuralBoundResult { - func_name: entry.name.clone(), - param: param_name.clone(), - recurrence_bound: recurrence.clone(), - stack_bound: stack_bound.clone(), - span: entry.span.clone(), -})])) -}, - None => pacc.clone(), -} -}, - _ => pacc.clone(), -} -}); -v2_rt::concat(acc.clone(), param_results.clone()) -} - } -}) + } + _ => pacc.clone(), + } + }); + v2_rt::concat(acc.clone(), param_results.clone()) + } + } + }, + ) } -pub fn build_complexity_report(func_entries: &Rc>>, recursion_ctx: RecursionContext, source_indices: Rc>>) -> Rc { +pub fn build_complexity_report( + func_entries: &Rc>>, + recursion_ctx: RecursionContext, + source_indices: Rc>>, +) -> Rc { { let si = source_indices; -let func_index = func_entries.clone().iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, entry: Rc| v2_rt::rc_map_insert(acc, entry.name.clone(), entry.clone())); -let scc_result = build_scc_index(&func_entries, func_index.clone(), &si); -let parser_always_advancing = infer_all_parser_always_advancing(&func_index, &si); -let full_scc_index = func_entries.clone().iter().cloned().fold(scc_result.index.clone(), |acc: Rc>>, entry: Rc| match v2_rt::map_get(&acc, entry.name.clone()) { - Some(_) => acc.clone(), - None => if (max_path_self_calls(entry.body.clone(), entry.name.clone(), si.clone()) > 0) { - { - let pattern = classify_recursion_pattern(&entry.name.clone(), &entry.body.clone(), &entry.params.clone(), parser_always_advancing.clone(), &si); -let info = Rc::new(SccInfo { - members: Rc::new(vec![entry.name.clone()]), - member_set: set_insert(empty_set(), entry.name.clone()), - pattern: pattern.clone(), -}); -v2_rt::rc_map_insert(acc.clone(), entry.name.clone(), info.clone()) -} - } else { - acc.clone() - }, -}); -let call_forward = forward_adjacency(Rc::new({ let mut __result = Vec::new(); for entry in func_entries.clone().iter().cloned() { __result.push(entry.name.clone()); } __result }), scc_result.call_graph.clone()); -let fan_in = func_entries.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, entry: Rc| { - let callees = match v2_rt::map_get(&call_forward, entry.name.clone()) { - Some(cs) => cs.clone(), - None => Rc::new(vec![]), -}; -let unique_set = callees.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |s: Rc>, c: String| v2_rt::rc_map_insert(s, c.clone(), true)); -Rc::new(v2_rt::map_keys(&unique_set)).iter().cloned().fold(acc, |inner: Rc>, callee: String| { - let current = match v2_rt::map_get(&inner, callee.clone()) { - Some(v) => v.clone(), - None => 0, -}; -v2_rt::rc_map_insert(inner.clone(), callee.clone(), (current.clone() + 1)) -}) -}); -let result = scc_result.processing_order.clone().iter().cloned().fold(Rc::new(TopoBuildAcc { - table: empty_intern_table(), - classes: v2_rt::rc_empty_map::(), - violations: Rc::new(vec![]), - fan_in: fan_in, - processed: v2_rt::rc_empty_map::(), -}), |acc: Rc, func_name: String| match v2_rt::map_get(&func_index, func_name.clone()) { - Some(entry) => { - let sr = get_or_compute_summary(&func_name, &func_index, &full_scc_index, &acc.table.clone(), parser_always_advancing.clone(), recursion_ctx.clone(), si.clone()); -let class_str = classify_complexity(sr.summary.clone().work.clone()); -let new_classes = v2_rt::rc_map_insert(acc.classes.clone(), func_name.clone(), class_str.clone()); -let new_processed = v2_rt::rc_map_insert(acc.processed.clone(), func_name.clone(), true); -let new_violations = if is_unknown_cost(sr.summary.clone().work.clone()) { - v2_rt::concat(acc.violations.clone(), Rc::new(vec![Rc::new(ComplexityViolation { - func_name: func_name.clone(), - reason: extract_unknown_reason(sr.summary.clone().work.clone()), - span: entry.span.clone(), -})])) - } else { - acc.violations.clone() - }; -let callees = match v2_rt::map_get(&call_forward, func_name.clone()) { - Some(cs) => cs.clone(), - None => Rc::new(vec![]), -}; -let unique_set = callees.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |s: Rc>, c: String| v2_rt::rc_map_insert(s, c.clone(), true)); -let unique_callees = Rc::new(v2_rt::map_keys(&unique_set)); -let new_fan_in = unique_callees.clone().iter().cloned().fold(acc.fan_in.clone(), |fi: Rc>, callee: String| { - let current = match v2_rt::map_get(&fi, callee.clone()) { - Some(v) => v.clone(), - None => 0, -}; -v2_rt::rc_map_insert(fi.clone(), callee.clone(), (current.clone() - 1)) -}); -let evicted_table = unique_callees.clone().iter().cloned().fold(sr.table.clone(), |t: Rc, callee: String| { - let remaining = match v2_rt::map_get(&new_fan_in, callee.clone()) { - Some(v) => v.clone(), - None => 0, -}; -if ((remaining.clone() <= 0) && set_has(new_processed.clone(), callee.clone())) { - evict_summary(t.clone(), callee.clone()) - } else { - t.clone() + let func_index = func_entries.clone().iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, entry: Rc| { + v2_rt::rc_map_insert(acc, entry.name.clone(), entry.clone()) + }, + ); + let scc_result = build_scc_index(&func_entries, func_index.clone(), &si); + let parser_always_advancing = infer_all_parser_always_advancing(&func_index, &si); + let full_scc_index = func_entries.clone().iter().cloned().fold( + scc_result.index.clone(), + |acc: Rc>>, entry: Rc| match v2_rt::map_get( + &acc, + entry.name.clone(), + ) { + Some(_) => acc.clone(), + None => { + if (max_path_self_calls(entry.body.clone(), entry.name.clone(), si.clone()) > 0) + { + { + let pattern = classify_recursion_pattern( + &entry.name.clone(), + &entry.body.clone(), + &entry.params.clone(), + parser_always_advancing.clone(), + &si, + ); + let info = Rc::new(SccInfo { + members: Rc::new(vec![entry.name.clone()]), + member_set: v2_rt::rc_map_insert( + v2_rt::rc_empty_map::(), + entry.name.clone(), + true, + ), + pattern: pattern.clone(), + }); + v2_rt::rc_map_insert(acc.clone(), entry.name.clone(), info.clone()) + } + } else { + acc.clone() + } } -}); -let self_fan_in = match v2_rt::map_get(&new_fan_in, func_name.clone()) { - Some(v) => v.clone(), - None => 0, -}; -let final_table = if (self_fan_in.clone() <= 0) { - evict_summary(evicted_table.clone(), func_name.clone()) - } else { - evicted_table.clone() - }; -Rc::new(TopoBuildAcc { - table: final_table.clone(), - classes: new_classes.clone(), - violations: new_violations.clone(), - fan_in: new_fan_in.clone(), - processed: new_processed.clone(), -}) -}, - None => acc.clone(), -}); -let structural_bounds = analyze_structural_bounds(func_entries.clone(), si.clone()); -Rc::new(ComplexityReport { - function_classes: result.classes.clone(), - violations: result.violations.clone(), - structural_bounds: structural_bounds, -}) -} + }, + ); + let call_forward = forward_adjacency( + Rc::new({ + let mut __result = Vec::new(); + for entry in func_entries.clone().iter().cloned() { + __result.push(entry.name.clone()); + } + __result + }), + scc_result.call_graph.clone(), + ); + let fan_in = func_entries.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, entry: Rc| { + let callees = match v2_rt::map_get(&call_forward, entry.name.clone()) { + Some(cs) => cs.clone(), + None => Rc::new(vec![]), + }; + let unique_set = callees.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |s: Rc>, c: String| { + v2_rt::rc_map_insert(s, c.clone(), true) + }, + ); + Rc::new(v2_rt::map_keys(&unique_set)).iter().cloned().fold( + acc, + |inner: Rc>, callee: String| { + let current = match v2_rt::map_get(&inner, callee.clone()) { + Some(v) => v.clone(), + None => 0, + }; + v2_rt::rc_map_insert(inner.clone(), callee.clone(), (current.clone() + 1)) + }, + ) + }, + ); + let result = scc_result.processing_order.clone().iter().cloned().fold( + Rc::new(TopoBuildAcc { + table: empty_intern_table(), + classes: v2_rt::rc_empty_map::(), + violations: Rc::new(vec![]), + fan_in: fan_in, + processed: v2_rt::rc_empty_map::(), + }), + |acc: Rc, func_name: String| match v2_rt::map_get( + &func_index, + func_name.clone(), + ) { + Some(entry) => { + let sr = get_or_compute_summary( + &func_name, + &func_index, + &full_scc_index, + &acc.table.clone(), + parser_always_advancing.clone(), + recursion_ctx.clone(), + si.clone(), + ); + let class_str = classify_complexity(sr.summary.clone().work.clone()); + let new_classes = v2_rt::rc_map_insert( + acc.classes.clone(), + func_name.clone(), + class_str.clone(), + ); + let new_processed = + v2_rt::rc_map_insert(acc.processed.clone(), func_name.clone(), true); + let new_violations = if is_unknown_cost(sr.summary.clone().work.clone()) { + v2_rt::concat( + acc.violations.clone(), + Rc::new(vec![Rc::new(ComplexityViolation { + func_name: func_name.clone(), + reason: extract_unknown_reason(sr.summary.clone().work.clone()), + span: entry.span.clone(), + })]), + ) + } else { + acc.violations.clone() + }; + let callees = match v2_rt::map_get(&call_forward, func_name.clone()) { + Some(cs) => cs.clone(), + None => Rc::new(vec![]), + }; + let unique_set = callees.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |s: Rc>, c: String| { + v2_rt::rc_map_insert(s, c.clone(), true) + }, + ); + let unique_callees = Rc::new(v2_rt::map_keys(&unique_set)); + let new_fan_in = unique_callees.clone().iter().cloned().fold( + acc.fan_in.clone(), + |fi: Rc>, callee: String| { + let current = match v2_rt::map_get(&fi, callee.clone()) { + Some(v) => v.clone(), + None => 0, + }; + v2_rt::rc_map_insert(fi.clone(), callee.clone(), (current.clone() - 1)) + }, + ); + let evicted_table = unique_callees.clone().iter().cloned().fold( + sr.table.clone(), + |t: Rc, callee: String| { + let remaining = match v2_rt::map_get(&new_fan_in, callee.clone()) { + Some(v) => v.clone(), + None => 0, + }; + if ((remaining.clone() <= 0) + && set_has(new_processed.clone(), callee.clone())) + { + evict_summary(t.clone(), callee.clone()) + } else { + t.clone() + } + }, + ); + let self_fan_in = match v2_rt::map_get(&new_fan_in, func_name.clone()) { + Some(v) => v.clone(), + None => 0, + }; + let final_table = if (self_fan_in.clone() <= 0) { + evict_summary(evicted_table.clone(), func_name.clone()) + } else { + evicted_table.clone() + }; + Rc::new(TopoBuildAcc { + table: final_table.clone(), + classes: new_classes.clone(), + violations: new_violations.clone(), + fan_in: new_fan_in.clone(), + processed: new_processed.clone(), + }) + } + None => acc.clone(), + }, + ); + let structural_bounds = analyze_structural_bounds(func_entries.clone(), si.clone()); + Rc::new(ComplexityReport { + function_classes: result.classes.clone(), + violations: result.violations.clone(), + structural_bounds: structural_bounds, + }) + } } diff --git a/src/v2/stage0/src/v2_compiler_effect_derivation.rs b/src/v2/stage0/src/v2_compiler_effect_derivation.rs index 67af11fccbf..b41f181c2e5 100644 --- a/src/v2/stage0/src/v2_compiler_effect_derivation.rs +++ b/src/v2/stage0/src/v2_compiler_effect_derivation.rs @@ -1,29 +1,49 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.effect_derivation -use std::collections::HashMap; -use std::rc::Rc; +use crate::std_effects::DeriveOpEffectResult::{ + DerivedEffect, MalformedPathInput, UnknownHttpMethodInput, +}; +use crate::std_effects::EffectShape::{ + AppendEffect, CreateEffect, DeleteEffect, ReadEffect, UpsertEffect, +}; +use crate::std_effects::IdempotencyEvidence::{IdentityEffect, LatticeEffect, NonIdempotent}; +use crate::std_effects::KeySource::{CompositeKey, InputField, PathParam}; +use crate::std_effects::ModifierAgreement::{Agrees, DerivationUnknown, Disagrees}; +pub use crate::std_effects::{ + check_modifier_vs_derivation, compose_effects, derive_effect_shape, derive_op_effect, + generate_idempotency_obligations, is_idempotent_effect, parse_http_method, CompositionVerdict, + DeriveOpEffectResult, DerivedOpEffect, EffectShape, IdempotencyEvidence, + IdempotencyTestObligation, KeySource, ModifierAgreement, ModifierCheck, OperationEffect, + WorkflowEffectConcern, +}; +use crate::std_http_path::PathTemplateParseResult::{MalformedPathTemplate, ParsedPathTemplate}; +use crate::std_http_path::UrlPathToken::{LiteralToken, ParamToken}; +pub use crate::std_http_path::{ + has_path_params, last_path_param, parse_path_template, PathTemplate, PathTemplateParseResult, + UrlPathToken, +}; +pub use crate::std_types::HttpMethod; +use crate::std_types::HttpMethod::{DELETE, GET, HEAD, OPTIONS, PATCH, POST, PUT}; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; -pub use crate::std_types::{HttpMethod}; -use crate::std_types::HttpMethod::{GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS}; -pub use crate::std_effects::{EffectShape, KeySource, DerivedOpEffect, DeriveOpEffectResult, ModifierAgreement, ModifierCheck, IdempotencyTestObligation, WorkflowEffectConcern, parse_http_method, derive_effect_shape, derive_op_effect, check_modifier_vs_derivation, generate_idempotency_obligations, is_idempotent_effect, compose_effects, OperationEffect, CompositionVerdict, IdempotencyEvidence}; -use crate::std_effects::EffectShape::{ReadEffect, UpsertEffect, DeleteEffect, CreateEffect, AppendEffect}; -use crate::std_effects::KeySource::{PathParam, InputField, CompositeKey}; -use crate::std_effects::DeriveOpEffectResult::{DerivedEffect, UnknownHttpMethodInput, MalformedPathInput}; -use crate::std_effects::ModifierAgreement::{Agrees, Disagrees, DerivationUnknown}; -use crate::std_effects::CompositionVerdict::{IdempotentComposition, BrokenBy}; -use crate::std_effects::IdempotencyEvidence::{LatticeEffect, IdentityEffect, NonIdempotent}; -pub use crate::std_http_path::{UrlPathToken, PathTemplate, PathTemplateParseResult, parse_path_template, has_path_params, last_path_param}; -use crate::std_http_path::UrlPathToken::{LiteralToken, ParamToken}; -use crate::std_http_path::PathTemplateParseResult::{ParsedPathTemplate, MalformedPathTemplate}; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; -pub fn re_export_derive_op_effect(operation_name: String, method: HttpMethod, path: Rc) -> Rc { - derive_op_effect(operation_name, &method, &path) +pub fn re_export_derive_op_effect( + operation_name: String, + method: HttpMethod, + path: Rc, +) -> Rc { + derive_op_effect(operation_name, method, path) } -pub fn re_export_check_modifier(op: Rc, declared_idempotent: bool, declared_readonly: bool) -> Rc { +pub fn re_export_check_modifier( + op: Rc, + declared_idempotent: bool, + declared_readonly: bool, +) -> Rc { check_modifier_vs_derivation(&op, &declared_idempotent, &declared_readonly) } diff --git a/src/v2/stage0/src/v2_compiler_emit.rs b/src/v2/stage0/src/v2_compiler_emit.rs index a8f5f99cc40..df72c0995f7 100644 --- a/src/v2/stage0/src/v2_compiler_emit.rs +++ b/src/v2/stage0/src/v2_compiler_emit.rs @@ -1,57 +1,102 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.emit -use std::collections::HashMap; -use std::rc::Rc; -use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::v2_std_core::{Node, ErrorNode, InferredNode, is_compiler_error, module_imports, module_items, param_node_name_at, param_node_type_expr, param_node_default_value, NewlineIndex, authored_name_at, empty_intern_table, expr_var_name_at, expr_call_func_at, let_binding_name_at, field_access_field_at, ExprData, VarBindingKind, StringPart, LiteralValue, TextFile, SourceSpan, BinOp, UnaryOpKind, AlgebraFieldKind, DeclaredFuncSig, MethodSemantics, MatchPattern, field_binding_name_at, field_binding_pattern, FieldSummary, expr_method_name_at, method_arg_nodes, expr_method_call_semantics, expr_field_access_summary, lambda_param_names_at, record_lit_type_name_at, arm_body, arm_pattern, arm_guard, arg_name_at, arg_value, field_init_node_name_at, field_init_node_value, if_condition, if_then_branch, if_else_branch, match_scrutinee, match_arm_nodes, let_value, let_body, field_access_base, method_receiver, lambda_body, cast_expr, cast_target, return_value, binop_left, binop_right, foreach_variable_at, foreach_collection, foreach_body, index_base, index_expr, slice_base, slice_start, slice_end, unaryop_operand, expr_has_self_call, expr_has_non_tail_self_call, local_transport_node, is_rest_transport, is_shell_transport, is_file_transport, is_local_transport, transport_has_auth, field_init_operation_modifier, operation_modifier_name, with_required_cardinality, tuple_type_name, find_child_named, Connective, FieldAccessStyle, Cardinality}; -use crate::v2_std_core::InferredNode::{Resolved, CompilerError, TypeVariable}; -use crate::v2_std_core::ExprData::{NoExprData, ExprLiteral, ExprVar, ExprFieldAccess, ExprCall, ExprMethodCall, ExprMatch, ExprIf, ExprLet, ExprRecordLit, ExprListLit, ExprBinOp, ExprUnaryOp, ExprLambda, ExprStringInterp, ExprBlock, ExprCast, ExprForEach, ExprIndex, ExprSlice, ExprError, ExprReturn}; -use crate::v2_std_core::StringPart::{Text, Interpolation}; -use crate::v2_std_core::BinOp::{NullCoalesce}; -use crate::v2_std_core::MethodSemantics::{PlainMethodSemantics, AlgebraMethodSemantics, ServiceMethodSemantics}; -use crate::v2_std_core::MatchPattern::{Wildcard, Bind, LitPattern, VariantPattern}; -use crate::v2_std_core::FieldAccessStyle::{TupleFirst, TupleSecond}; -use crate::v2_std_core::Connective::{Conj, Disj, NoConnective, Arrow}; -use crate::v2_std_core::Cardinality::{CardOptional}; -use crate::v2_std_core::VarBindingKind::*; -use crate::v2_std_core::LiteralValue::*; -use crate::v2_std_core::UnaryOpKind::*; -use crate::v2_std_core::AlgebraFieldKind::*; -pub use crate::v2_compiler_infer_env::{TypeEnv, TypeBinding, authored_name}; -pub use crate::std_induction::{InductiveField, SubValueRelation}; -use crate::std_induction::SubValueRelation::{SubValueUnknown}; -pub use crate::v2_compiler_infer_types::{resolved_type, child_type_node, emit_map_has, node_is_collection, node_is_keyed_collection, node_is_element_collection, normalize_access_type_node, for_each_element_type_node, is_unit_like}; -pub use crate::std_types::{is_container_type, container_template_algebra}; -pub use crate::v2_compiler_coercion::{coerce_primitive_type, coerce_container_template, target_optional_template, target_callable, can_cast, render_cast, literal_suffix}; -pub use crate::v2_compiler_infer_sigs::{ResolvedFuncSig, ResolvedFuncEnv}; -pub use crate::v2_compiler_infer_items::{TypedModule, ResolvedGraph, ItemInfo}; -pub use crate::v2_compiler_infer_service::{UniqueAccum, OpEntry, is_typed_service_call_receiver, extract_typed_service_name}; -pub use crate::v2_compiler_infer::{InferScope, build_params_scope, extend_scope}; -pub use crate::v2_compiler_infer_emit_info::{TypeSummary, EmitGraphInfo}; -pub use crate::v2_compiler_artifact::{RenderTarget}; -use crate::v2_compiler_artifact::RenderTarget::{Rust, Python, Go, Dag}; -pub use crate::generated_method_template_projection::{rust_method_template_emit, python_method_template_emit, go_method_template_emit}; -pub use crate::v2_compiler_languages::{LanguageSpec, TestConventions, ServiceFieldTemplates, BlockSyntax, TcoSyntax, ExpressionSemantics, VariantPatternSyntax, IfValueForm, VisibilitySpec, NamingCase, ReservedWordStrategy, StringInterpSyntax, InterpStyle, EscapePair, RecordLitSyntax, ImportRule, language_spec_for_target, is_string_like, test_conventions_for_target, target_keyword, binop_symbol, wrap_shared_type, service_self_param, service_receiver_str, service_method_depth, service_methods_inside_class, service_return_str, TestNameStyle, ImportTrigger}; -use crate::v2_compiler_languages::TestNameStyle::{SnakeCaseTestNames, PascalCaseTestNames}; -use crate::v2_compiler_languages::IfValueForm::{IfExpression, ConditionalTernary, IfStatement}; -use crate::v2_compiler_languages::VisibilitySpec::{KeywordVisibility, CaseVisibility}; -use crate::v2_compiler_languages::NamingCase::{PascalCase, SnakeCase, CamelCase, AsAuthored}; -use crate::v2_compiler_languages::ReservedWordStrategy::{PrefixEscape, SuffixEscape, NoEscape}; -use crate::v2_compiler_languages::InterpStyle::{FormatArgs, InlineExpr}; -use crate::v2_compiler_languages::ImportTrigger::{TypeUsageTrigger, TraitImplTrigger, DeriveMacroTrigger, ContainerUsageTrigger, AsyncUsageTrigger}; use self::BackendCapability::*; use self::ExprCategory::*; use self::FuncBodyShape::*; use self::TcoExprShape::*; +pub use crate::generated_method_template_projection::{ + go_method_template_emit, python_method_template_emit, rust_method_template_emit, +}; +use crate::std_induction::SubValueRelation::SubValueUnknown; +pub use crate::std_induction::{InductiveField, SubValueRelation}; +pub use crate::std_types::{container_template_algebra, is_container_type}; +pub use crate::v2_compiler_artifact::RenderTarget; +use crate::v2_compiler_artifact::RenderTarget::{Dag, Go, Python, Rust}; +pub use crate::v2_compiler_coercion::{ + can_cast, coerce_container_template, coerce_primitive_type, literal_suffix, render_cast, + target_callable, target_optional_template, +}; +pub use crate::v2_compiler_infer::{build_params_scope, extend_scope, InferScope}; +pub use crate::v2_compiler_infer_emit_info::{EmitGraphInfo, TypeSummary}; +pub use crate::v2_compiler_infer_env::{authored_name, TypeBinding, TypeEnv}; +pub use crate::v2_compiler_infer_items::{ItemInfo, ResolvedGraph, TypedModule}; +pub use crate::v2_compiler_infer_service::{ + extract_typed_service_name, is_typed_service_call_receiver, OpEntry, UniqueAccum, +}; +pub use crate::v2_compiler_infer_sigs::{ResolvedFuncEnv, ResolvedFuncSig}; +pub use crate::v2_compiler_infer_types::{ + child_type_node, emit_map_has, for_each_element_type_node, is_unit_like, node_is_collection, + node_is_element_collection, node_is_keyed_collection, normalize_access_type_node, + resolved_type, +}; +use crate::v2_compiler_languages::IfValueForm::{ConditionalTernary, IfExpression, IfStatement}; +use crate::v2_compiler_languages::ImportTrigger::{ + AsyncUsageTrigger, ContainerUsageTrigger, DeriveMacroTrigger, TraitImplTrigger, + TypeUsageTrigger, +}; +use crate::v2_compiler_languages::InterpStyle::{FormatArgs, InlineExpr}; +use crate::v2_compiler_languages::NamingCase::{AsAuthored, CamelCase, PascalCase, SnakeCase}; +use crate::v2_compiler_languages::ReservedWordStrategy::{NoEscape, PrefixEscape, SuffixEscape}; +use crate::v2_compiler_languages::TestNameStyle::{PascalCaseTestNames, SnakeCaseTestNames}; +use crate::v2_compiler_languages::VisibilitySpec::{CaseVisibility, KeywordVisibility}; +pub use crate::v2_compiler_languages::{ + binop_symbol, is_string_like, language_spec_for_target, service_method_depth, + service_methods_inside_class, service_receiver_str, service_return_str, service_self_param, + target_keyword, test_conventions_for_target, wrap_shared_type, BlockSyntax, EscapePair, + ExpressionSemantics, IfValueForm, ImportRule, ImportTrigger, InterpStyle, LanguageSpec, + NamingCase, RecordLitSyntax, ReservedWordStrategy, ServiceFieldTemplates, StringInterpSyntax, + TcoSyntax, TestConventions, TestNameStyle, VariantPatternSyntax, VisibilitySpec, +}; +use crate::v2_rt; +use crate::v2_std_core::AlgebraFieldKind::*; +use crate::v2_std_core::BinOp::NullCoalesce; +use crate::v2_std_core::Cardinality::CardOptional; +use crate::v2_std_core::Connective::{Arrow, Conj, Disj, NoConnective}; +use crate::v2_std_core::ExprData::{ + ExprBinOp, ExprBlock, ExprCall, ExprCast, ExprError, ExprFieldAccess, ExprForEach, ExprIf, + ExprIndex, ExprLambda, ExprLet, ExprListLit, ExprLiteral, ExprMatch, ExprMethodCall, + ExprRecordLit, ExprReturn, ExprSlice, ExprStringInterp, ExprUnaryOp, ExprVar, NoExprData, +}; +use crate::v2_std_core::FieldAccessStyle::{TupleFirst, TupleSecond}; +use crate::v2_std_core::InferredNode::{CompilerError, Resolved, TypeVariable}; +use crate::v2_std_core::LiteralValue::*; +use crate::v2_std_core::MatchPattern::{Bind, LitPattern, VariantPattern, Wildcard}; +use crate::v2_std_core::MethodSemantics::{ + AlgebraMethodSemantics, PlainMethodSemantics, ServiceMethodSemantics, +}; +use crate::v2_std_core::StringPart::{Interpolation, Text}; +use crate::v2_std_core::UnaryOpKind::*; +use crate::v2_std_core::VarBindingKind::*; +pub use crate::v2_std_core::{ + arg_name_at, arg_value, arm_body, arm_guard, arm_pattern, authored_name_at, binop_left, + binop_right, cast_expr, cast_target, empty_intern_table, expr_call_func_at, + expr_field_access_summary, expr_has_non_tail_self_call, expr_has_self_call, + expr_method_call_semantics, expr_method_name_at, expr_var_name_at, field_access_base, + field_access_field_at, field_binding_name_at, field_binding_pattern, field_init_node_name_at, + field_init_node_value, field_init_operation_modifier, find_child_named, foreach_body, + foreach_collection, foreach_variable_at, if_condition, if_else_branch, if_then_branch, + index_base, index_expr, is_compiler_error, is_file_transport, is_local_transport, + is_rest_transport, is_shell_transport, lambda_body, lambda_param_names_at, let_binding_name_at, + let_body, let_value, local_transport_node, match_arm_nodes, match_scrutinee, method_arg_nodes, + method_receiver, module_imports, module_items, operation_modifier_name, + param_node_default_value, param_node_name_at, param_node_type_expr, record_lit_type_name_at, + return_value, slice_base, slice_end, slice_start, transport_has_auth, tuple_type_name, + unaryop_operand, with_required_cardinality, AlgebraFieldKind, BinOp, Cardinality, Connective, + DeclaredFuncSig, ErrorNode, ExprData, FieldAccessStyle, FieldSummary, InferredNode, + LiteralValue, MatchPattern, MethodSemantics, NewlineIndex, Node, SourceSpan, StringPart, + TextFile, UnaryOpKind, VarBindingKind, +}; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn is_type_variable(inferred: Rc) -> bool { match (*inferred).clone() { - InferredNode::TypeVariable { .. } => true, - _ => false, -} + InferredNode::TypeVariable { .. } => true, + _ => false, + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -116,46 +161,210 @@ pub fn has_mock_prefix(name: &String) -> bool { } pub fn extract_test_projections(typed: Rc) -> Rc>> { - Rc::new({ let mut __result = Vec::new(); for tm in typed.modules.clone().iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for item in Rc::new({ let mut __result = Vec::new(); for item in tm.items.clone().iter().cloned() { if is_service_item(&item) { __result.push(item); } } __result }).iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for c in Rc::new({ let mut __result = Vec::new(); for c in item.children.clone().iter().cloned() { if { let mut __found = false; for p in c.properties.clone().iter().cloned() { if has_mock_prefix(&field_init_node_name_at(p.clone(), tm.type_env.clone().source_indices.clone())) { __found = true; break; } } __found } { __result.push(c); } } __result }).iter().cloned() { __result.push(Rc::new(TestProjection { - module_name: authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone()), - service_name: authored_name_at(tm.type_env.clone().source_indices.clone(), &item), - operation_name: authored_name_at(tm.type_env.clone().source_indices.clone(), &c), - inferred: resolved_type(c.clone()), - params: c.params.clone(), - mock_field_inits: Rc::new({ let mut __result = Vec::new(); for p in c.properties.clone().iter().cloned() { if has_mock_prefix(&field_init_node_name_at(p.clone(), tm.type_env.clone().source_indices.clone())) { __result.push(p); } } __result }), - source_indices: tm.type_env.clone().source_indices.clone(), -})); } __result })).iter().cloned()); } __result })).iter().cloned()); } __result }) + Rc::new({ + let mut __result = Vec::new(); + for tm in typed.modules.clone().iter().cloned() { + __result.extend( + (*Rc::new({ + let mut __result = Vec::new(); + for item in Rc::new({ + let mut __result = Vec::new(); + for item in tm.items.clone().iter().cloned() { + if is_service_item(&item) { + __result.push(item); + } + } + __result + }) + .iter() + .cloned() + { + __result.extend( + (*Rc::new({ + let mut __result = Vec::new(); + for c in Rc::new({ + let mut __result = Vec::new(); + for c in item.children.clone().iter().cloned() { + if { + let mut __found = false; + for p in c.properties.clone().iter().cloned() { + if has_mock_prefix(&field_init_node_name_at( + p.clone(), + tm.type_env.clone().source_indices.clone(), + )) { + __found = true; + break; + } + } + __found + } { + __result.push(c); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(Rc::new(TestProjection { + module_name: authored_name_at( + tm.type_env.clone().source_indices.clone(), + &tm.module.clone(), + ), + service_name: authored_name_at( + tm.type_env.clone().source_indices.clone(), + &item, + ), + operation_name: authored_name_at( + tm.type_env.clone().source_indices.clone(), + &c, + ), + inferred: resolved_type(c.clone()), + params: c.params.clone(), + mock_field_inits: Rc::new({ + let mut __result = Vec::new(); + for p in c.properties.clone().iter().cloned() { + if has_mock_prefix(&field_init_node_name_at( + p.clone(), + tm.type_env.clone().source_indices.clone(), + )) { + __result.push(p); + } + } + __result + }), + source_indices: tm.type_env.clone().source_indices.clone(), + })); + } + __result + })) + .iter() + .cloned(), + ); + } + __result + })) + .iter() + .cloned(), + ); + } + __result + }) } -pub fn derive_module_imports(items: &Rc>>, import_rules: Rc>>, target: RenderTarget, source_indices: Rc>>) -> Rc> { +pub fn derive_module_imports( + items: &Rc>>, + import_rules: Rc>>, + target: RenderTarget, + source_indices: Rc>>, +) -> Rc> { { - let has_async = { let mut __found = false; for item in items.clone().iter().cloned() { if ((item.uses.clone().len() as i64) > 0) { __found = true; break; } } __found }; -let type_names = collect_type_names_from_items(items.clone(), source_indices); -Rc::new({ let mut __result = Vec::new(); for path in Rc::new({ let mut __result = Vec::new(); for rule in Rc::new({ let mut __result = Vec::new(); for rule in import_rules.iter().cloned() { if match (*rule.trigger.clone()).clone() { - ImportTrigger::TypeUsageTrigger { type_name: t, .. } => { let mut __found = false; for n in type_names.clone().iter().cloned() { if (n.clone().as_str() == t.clone().as_str()) { __found = true; break; } } __found }, - ImportTrigger::TraitImplTrigger { .. } => false, - ImportTrigger::DeriveMacroTrigger { .. } => false, - ImportTrigger::ContainerUsageTrigger { container: c, .. } => { let mut __found = false; for n in type_names.clone().iter().cloned() { if (n.clone().as_str() == c.clone().as_str()) { __found = true; break; } } __found }, - ImportTrigger::AsyncUsageTrigger => has_async.clone(), -} { __result.push(rule); } } __result }).iter().cloned() { __result.push(rule.import_path.clone()); } __result }).iter().cloned() { if (path.clone().as_str() != "".to_string().as_str()) { __result.push(path); } } __result }) -} + let has_async = { + let mut __found = false; + for item in items.clone().iter().cloned() { + if ((item.uses.clone().len() as i64) > 0) { + __found = true; + break; + } + } + __found + }; + let type_names = collect_type_names_from_items(items.clone(), source_indices); + Rc::new({ + let mut __result = Vec::new(); + for path in Rc::new({ + let mut __result = Vec::new(); + for rule in Rc::new({ + let mut __result = Vec::new(); + for rule in import_rules.iter().cloned() { + if match (*rule.trigger.clone()).clone() { + ImportTrigger::TypeUsageTrigger { type_name: t, .. } => { + let mut __found = false; + for n in type_names.clone().iter().cloned() { + if (n.clone().as_str() == t.clone().as_str()) { + __found = true; + break; + } + } + __found + } + ImportTrigger::TraitImplTrigger { .. } => false, + ImportTrigger::DeriveMacroTrigger { .. } => false, + ImportTrigger::ContainerUsageTrigger { container: c, .. } => { + let mut __found = false; + for n in type_names.clone().iter().cloned() { + if (n.clone().as_str() == c.clone().as_str()) { + __found = true; + break; + } + } + __found + } + ImportTrigger::AsyncUsageTrigger => has_async.clone(), + } { + __result.push(rule); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(rule.import_path.clone()); + } + __result + }) + .iter() + .cloned() + { + if (path.clone().as_str() != "".to_string().as_str()) { + __result.push(path); + } + } + __result + }) + } } -pub fn collect_type_names_from_items(items: Rc>>, source_indices: Rc>>) -> Rc> { - Rc::new({ let mut __result = Vec::new(); for item in items.iter().cloned() { __result.extend((*collect_type_names_from_node(&item, &source_indices)).iter().cloned()); } __result }) +pub fn collect_type_names_from_items( + items: Rc>>, + source_indices: Rc>>, +) -> Rc> { + Rc::new({ + let mut __result = Vec::new(); + for item in items.iter().cloned() { + __result.extend( + (*collect_type_names_from_node(&item, &source_indices)) + .iter() + .cloned(), + ); + } + __result + }) } -pub fn collect_type_names_from_node(n: &Rc, source_indices: &Rc>>) -> Rc> { +pub fn collect_type_names_from_node( + n: &Rc, + source_indices: &Rc>>, +) -> Rc> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let self_name = if (n.ident_span.clone() != None) { - Rc::new(vec![authored_name_at(source_indices.clone(), &n)]) - } else { - Rc::new(vec![]) - }; -let child_names = Rc::new({ let mut __result = Vec::new(); for child in n.children.clone().iter().cloned() { __result.extend((*collect_type_names_from_node(&child, &source_indices)).iter().cloned()); } __result }); -v2_rt::concat(self_name, child_names) -} + let self_name = if (n.ident_span.clone() != None) { + Rc::new(vec![authored_name_at(source_indices.clone(), &n)]) + } else { + Rc::new(vec![]) + }; + let child_names = Rc::new({ + let mut __result = Vec::new(); + for child in n.children.clone().iter().cloned() { + __result.extend( + (*collect_type_names_from_node(&child, &source_indices)) + .iter() + .cloned(), + ); + } + __result + }); + v2_rt::concat(self_name, child_names) }) } @@ -165,345 +374,650 @@ pub struct InterpPart { pub arg_expr: String, } -pub fn emit_simple_expr(expr: &Rc, target: &RenderTarget, source_indices: &Rc>>) -> String { +pub fn emit_simple_expr( + expr: &Rc, + target: &RenderTarget, + source_indices: &Rc>>, +) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*expr.expr_data.clone()).clone() { - ExprData::ExprLiteral { value: v, .. } => emit_literal(v.clone(), &target), - ExprData::ExprError { message, .. } => emit_error_expr(message.clone(), target.clone()), - ExprData::ExprVar { .. } => emit_ident(expr_var_name_at(expr.clone(), source_indices.clone()), target.clone()), - ExprData::ExprFieldAccess { .. } => { - let f = field_access_field_at(expr.clone(), source_indices.clone()); -let b = field_access_base(expr.clone()); -if is_typed_service_call_receiver(&expr, source_indices.clone()) { - match extract_typed_service_name(&expr, &source_indices) { - Some(svc_name) => service_var_name(svc_name.clone()), - None => v2_rt::concat(v2_rt::concat(emit_simple_expr(&b, &target, &source_indices), ".".to_string()), emit_ident(f.clone(), target.clone())), -} - } else { - { - let base_is_fn = match (*b.expr_data.clone()).clone() { - ExprData::ExprVar { binding_kind: bk, .. } => match bk.clone().as_deref().cloned() { - Some(VarBindingKind::MatchBoundBinding) => false, - Some(VarBindingKind::VariantValueBinding { .. }) => false, - _ => true, -}, - _ => false, -}; -let base_str = emit_simple_expr(&b, &target, &source_indices); -let base_call = if base_is_fn.clone() { - v2_rt::concat(base_str, "()".to_string()) - } else { - base_str - }; -let field_str = v2_rt::concat(v2_rt::concat(base_call, ".".to_string()), emit_ident(f.clone(), target.clone())); -let needs_clone = (base_is_fn.clone() && match target.clone() { - RenderTarget::Rust => true, - _ => false, -}); -if needs_clone { - v2_rt::concat(field_str, ".clone()".to_string()) - } else { - field_str + ExprData::ExprLiteral { value: v, .. } => emit_literal(v.clone(), &target), + ExprData::ExprError { message, .. } => emit_error_expr(message.clone(), target.clone()), + ExprData::ExprVar { .. } => emit_ident( + expr_var_name_at(expr.clone(), source_indices.clone()), + target.clone(), + ), + ExprData::ExprFieldAccess { .. } => { + let f = field_access_field_at(expr.clone(), source_indices.clone()); + let b = field_access_base(expr.clone()); + if is_typed_service_call_receiver(&expr, source_indices.clone()) { + match extract_typed_service_name(&expr, &source_indices) { + Some(svc_name) => service_var_name(svc_name.clone()), + None => v2_rt::concat( + v2_rt::concat( + emit_simple_expr(&b, &target, &source_indices), + ".".to_string(), + ), + emit_ident(f.clone(), target.clone()), + ), } -} + } else { + { + let base_is_fn = match (*b.expr_data.clone()).clone() { + ExprData::ExprVar { + binding_kind: bk, .. + } => match bk.clone().as_deref().cloned() { + Some(VarBindingKind::MatchBoundBinding) => false, + Some(VarBindingKind::VariantValueBinding { .. }) => false, + _ => true, + }, + _ => false, + }; + let base_str = emit_simple_expr(&b, &target, &source_indices); + let base_call = if base_is_fn.clone() { + v2_rt::concat(base_str, "()".to_string()) + } else { + base_str + }; + let field_str = v2_rt::concat( + v2_rt::concat(base_call, ".".to_string()), + emit_ident(f.clone(), target.clone()), + ); + let needs_clone = (base_is_fn.clone() + && match target.clone() { + RenderTarget::Rust => true, + _ => false, + }); + if needs_clone { + v2_rt::concat(field_str, ".clone()".to_string()) + } else { + field_str + } + } + } } -}, - ExprData::ExprStringInterp => { - let ps = Rc::new({ let mut __result = Vec::new(); for child in expr.children.clone().iter().cloned() { __result.push(match (*child.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: text, .. } = value.as_ref() else { unreachable!() }; Rc::new(StringPart::Text { - value: text.clone(), -}) }, - _ => Rc::new(StringPart::Interpolation { - expr: arg_value(&child), -}), -}); } __result }); -emit_simple_string_interp(&ps, &target, source_indices.clone()) -}, - ExprData::ExprListLit => match target.clone() { - RenderTarget::Go => emit_error_expr("list literal in simple expr not yet supported for Go".to_string(), target.clone()), - _ => { - let el_strs = Rc::new({ let mut __result = Vec::new(); for e in expr.children.clone().iter().cloned() { __result.push(emit_simple_expr(&e, &target, &source_indices)); } __result }); -v2_rt::concat(v2_rt::concat("[".to_string(), el_strs.join(&", ".to_string())), "]".to_string()) -}, -}, - ExprData::ExprRecordLit { .. } => match target.clone() { - RenderTarget::Go => emit_error_expr("record literal in simple expr not yet supported for Go".to_string(), target.clone()), - _ => { - let field_strs = Rc::new({ let mut __result = Vec::new(); for f in expr.children.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat("\"".to_string(), field_init_node_name_at(f.clone(), source_indices.clone())), "\": ".to_string()), emit_simple_expr(&field_init_node_value(&f), &target, &source_indices))); } __result }); -v2_rt::concat(v2_rt::concat("{".to_string(), field_strs.join(&", ".to_string())), "}".to_string()) -}, -}, - _ => emit_error_expr("unsupported simple expr in test/mock binding".to_string(), target.clone()), -} + ExprData::ExprStringInterp => { + let ps = Rc::new({ + let mut __result = Vec::new(); + for child in expr.children.clone().iter().cloned() { + __result.push(match (*child.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitStr { value: text, .. } = value.as_ref() + else { + unreachable!() + }; + Rc::new(StringPart::Text { + value: text.clone(), + }) + } + _ => Rc::new(StringPart::Interpolation { + expr: arg_value(&child), + }), + }); + } + __result + }); + emit_simple_string_interp(&ps, &target, source_indices.clone()) + } + ExprData::ExprListLit => match target.clone() { + RenderTarget::Go => emit_error_expr( + "list literal in simple expr not yet supported for Go".to_string(), + target.clone(), + ), + _ => { + let el_strs = Rc::new({ + let mut __result = Vec::new(); + for e in expr.children.clone().iter().cloned() { + __result.push(emit_simple_expr(&e, &target, &source_indices)); + } + __result + }); + v2_rt::concat( + v2_rt::concat("[".to_string(), el_strs.join(&", ".to_string())), + "]".to_string(), + ) + } + }, + ExprData::ExprRecordLit { .. } => match target.clone() { + RenderTarget::Go => emit_error_expr( + "record literal in simple expr not yet supported for Go".to_string(), + target.clone(), + ), + _ => { + let field_strs = Rc::new({ + let mut __result = Vec::new(); + for f in expr.children.clone().iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "\"".to_string(), + field_init_node_name_at(f.clone(), source_indices.clone()), + ), + "\": ".to_string(), + ), + emit_simple_expr( + &field_init_node_value(&f), + &target, + &source_indices, + ), + )); + } + __result + }); + v2_rt::concat( + v2_rt::concat("{".to_string(), field_strs.join(&", ".to_string())), + "}".to_string(), + ) + } + }, + _ => emit_error_expr( + "unsupported simple expr in test/mock binding".to_string(), + target.clone(), + ), + } }) } -pub fn emit_simple_string_interp(parts: &Rc>>, target: &RenderTarget, source_indices: Rc>>) -> String { +pub fn emit_simple_string_interp( + parts: &Rc>>, + target: &RenderTarget, + source_indices: Rc>>, +) -> String { { let spec = language_spec(target.clone()); -let interp = spec.string_interp.clone(); -let has_interpolations = { let mut __found = false; for p in parts.clone().iter().cloned() { if match (*p.clone()).clone() { - StringPart::Interpolation { .. } => true, - _ => false, -} { __found = true; break; } } __found }; -match (*interp.style.clone()).clone() { - InterpStyle::FormatArgs { placeholder: ph, .. } => { - let fmt_parts = Rc::new({ let mut __result = Vec::new(); for p in parts.clone().iter().cloned() { __result.push(match (*p.clone()).clone() { - StringPart::Text { value: v, .. } => { - let base = escape_string_literal_body(v.clone()); -let escaped = if has_interpolations.clone() { - apply_escape_pairs(base.clone(), interp.escape_pairs.clone()) - } else { - base.clone() - }; -Rc::new(InterpPart { - format_segment: escaped.clone(), - arg_expr: "".to_string(), -}) -}, - StringPart::Interpolation { expr: e, .. } => Rc::new(InterpPart { - format_segment: ph.clone(), - arg_expr: emit_simple_expr(&e, &target, &source_indices), -}), -}); } __result }); -let fmt_str = Rc::new({ let mut __result = Vec::new(); for p in fmt_parts.clone().iter().cloned() { __result.push(p.format_segment.clone()); } __result }).join(&"".to_string()); -let args = Rc::new({ let mut __result = Vec::new(); for a in Rc::new({ let mut __result = Vec::new(); for p in fmt_parts.clone().iter().cloned() { __result.push(p.arg_expr.clone()); } __result }).iter().cloned() { if (a.clone().as_str() != "".to_string().as_str()) { __result.push(a); } } __result }); -if ((args.clone().len() as i64) == 0) { - apply_type_template1(interp.plain_template.clone(), fmt_str) - } else { - { - let args_str = args.clone().join(&", ".to_string()); -apply_type_template2(interp.format_template.clone(), fmt_str, args_str) -} + let interp = spec.string_interp.clone(); + let has_interpolations = { + let mut __found = false; + for p in parts.clone().iter().cloned() { + if match (*p.clone()).clone() { + StringPart::Interpolation { .. } => true, + _ => false, + } { + __found = true; + break; + } } -}, - InterpStyle::InlineExpr => { - let segments = Rc::new({ let mut __result = Vec::new(); for p in parts.clone().iter().cloned() { __result.push(match (*p.clone()).clone() { - StringPart::Text { value: v, .. } => { - let base = escape_string_literal_body(v.clone()); -if has_interpolations.clone() { - apply_escape_pairs(base.clone(), interp.escape_pairs.clone()) + __found + }; + match (*interp.style.clone()).clone() { + InterpStyle::FormatArgs { + placeholder: ph, .. + } => { + let fmt_parts = Rc::new({ + let mut __result = Vec::new(); + for p in parts.clone().iter().cloned() { + __result.push(match (*p.clone()).clone() { + StringPart::Text { value: v, .. } => { + let base = escape_string_literal_body(v.clone()); + let escaped = if has_interpolations.clone() { + apply_escape_pairs(base.clone(), interp.escape_pairs.clone()) + } else { + base.clone() + }; + Rc::new(InterpPart { + format_segment: escaped.clone(), + arg_expr: "".to_string(), + }) + } + StringPart::Interpolation { expr: e, .. } => Rc::new(InterpPart { + format_segment: ph.clone(), + arg_expr: emit_simple_expr(&e, &target, &source_indices), + }), + }); + } + __result + }); + let fmt_str = Rc::new({ + let mut __result = Vec::new(); + for p in fmt_parts.clone().iter().cloned() { + __result.push(p.format_segment.clone()); + } + __result + }) + .join(&"".to_string()); + let args = Rc::new({ + let mut __result = Vec::new(); + for a in Rc::new({ + let mut __result = Vec::new(); + for p in fmt_parts.clone().iter().cloned() { + __result.push(p.arg_expr.clone()); + } + __result + }) + .iter() + .cloned() + { + if (a.clone().as_str() != "".to_string().as_str()) { + __result.push(a); + } + } + __result + }); + if ((args.clone().len() as i64) == 0) { + apply_type_template1(interp.plain_template.clone(), fmt_str) } else { - base.clone() + { + let args_str = args.clone().join(&", ".to_string()); + apply_type_template2(interp.format_template.clone(), fmt_str, args_str) + } } -}, - StringPart::Interpolation { expr: e, .. } => v2_rt::concat(v2_rt::concat("{".to_string(), emit_simple_expr(&e, &target, &source_indices)), "}".to_string()), -}); } __result }); -apply_type_template1(interp.format_template.clone(), segments.join(&"".to_string())) -}, -} -} + } + InterpStyle::InlineExpr => { + let segments = Rc::new({ + let mut __result = Vec::new(); + for p in parts.clone().iter().cloned() { + __result.push(match (*p.clone()).clone() { + StringPart::Text { value: v, .. } => { + let base = escape_string_literal_body(v.clone()); + if has_interpolations.clone() { + apply_escape_pairs(base.clone(), interp.escape_pairs.clone()) + } else { + base.clone() + } + } + StringPart::Interpolation { expr: e, .. } => v2_rt::concat( + v2_rt::concat( + "{".to_string(), + emit_simple_expr(&e, &target, &source_indices), + ), + "}".to_string(), + ), + }); + } + __result + }); + apply_type_template1( + interp.format_template.clone(), + segments.join(&"".to_string()), + ) + } + } + } } pub fn empty_emit_scope() -> Rc { Rc::new(InferScope { - type_env: Rc::new(TypeEnv { - bindings: v2_rt::rc_empty_map::>(), - recursive_types: Rc::new(vec![]), - recursive_type_set: v2_rt::rc_empty_map::(), - inductive_fields: v2_rt::rc_empty_map::>>>(), - source_indices: v2_rt::rc_empty_map::>(), - intern_table: empty_intern_table(), -}), - func_env: Rc::new(ResolvedFuncEnv { - signatures: v2_rt::rc_empty_map::>(), -}), - locals: v2_rt::rc_empty_map::>(), - match_bound_names: v2_rt::rc_empty_map::(), - module_name: "".to_string(), - service_registry: v2_rt::rc_empty_map::>>>(), - item_registry: v2_rt::rc_empty_map::>(), - lambda_param_provenance: v2_rt::rc_empty_map::>(), -}) + type_env: Rc::new(TypeEnv { + bindings: v2_rt::rc_empty_map::>(), + recursive_types: Rc::new(vec![]), + recursive_type_set: v2_rt::rc_empty_map::(), + inductive_fields: v2_rt::rc_empty_map::>>>(), + source_indices: v2_rt::rc_empty_map::>(), + intern_table: empty_intern_table(), + }), + func_env: Rc::new(ResolvedFuncEnv { + signatures: v2_rt::rc_empty_map::>(), + }), + locals: v2_rt::rc_empty_map::>(), + match_bound_names: v2_rt::rc_empty_map::(), + module_name: "".to_string(), + service_registry: v2_rt::rc_empty_map::>>>(), + item_registry: v2_rt::rc_empty_map::>(), + lambda_param_provenance: v2_rt::rc_empty_map::>(), + }) } pub fn module_emit_scope(typed_module: &Rc) -> Rc { Rc::new(InferScope { - type_env: typed_module.type_env.clone(), - func_env: typed_module.func_env.clone(), - locals: v2_rt::rc_empty_map::>(), - match_bound_names: v2_rt::rc_empty_map::(), - module_name: authored_name_at(typed_module.type_env.clone().source_indices.clone(), &typed_module.module.clone()), - service_registry: v2_rt::rc_empty_map::>>>(), - item_registry: typed_module.item_registry.clone(), - lambda_param_provenance: v2_rt::rc_empty_map::>(), -}) + type_env: typed_module.type_env.clone(), + func_env: typed_module.func_env.clone(), + locals: v2_rt::rc_empty_map::>(), + match_bound_names: v2_rt::rc_empty_map::(), + module_name: authored_name_at( + typed_module.type_env.clone().source_indices.clone(), + &typed_module.module.clone(), + ), + service_registry: v2_rt::rc_empty_map::>>>(), + item_registry: typed_module.item_registry.clone(), + lambda_param_provenance: v2_rt::rc_empty_map::>(), + }) } pub fn scope_after_expr(texpr: &Rc, scope: &Rc) -> Rc { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprLet => { - let ch = texpr.children.clone(); -let has_body = ((ch.len() as i64) > 1); -if (has_body == false) { - { - let value = let_value(texpr.clone()); -extend_scope(&scope, &let_binding_name_at(texpr.clone(), scope.type_env.clone().source_indices.clone()), resolved_type(value), Rc::new(SubValueRelation::SubValueUnknown)) -} - } else { - scope.clone() + ExprData::ExprLet => { + let ch = texpr.children.clone(); + let has_body = ((ch.len() as i64) > 1); + if (has_body == false) { + { + let value = let_value(texpr.clone()); + extend_scope( + &scope, + &let_binding_name_at( + texpr.clone(), + scope.type_env.clone().source_indices.clone(), + ), + resolved_type(value), + Rc::new(SubValueRelation::SubValueUnknown), + ) + } + } else { + scope.clone() + } } -}, - _ => scope.clone(), -} + _ => scope.clone(), + } } -pub fn lookup_item(registry: Rc>>, name: String) -> Option> { +pub fn lookup_item( + registry: Rc>>, + name: String, +) -> Option> { v2_rt::map_get(®istry, name) } -pub fn lookup_func_sig_in_scope(scope: Rc, name: String) -> Option> { +pub fn lookup_func_sig_in_scope( + scope: Rc, + name: String, +) -> Option> { v2_rt::map_get(&scope.func_env.clone().signatures.clone(), name) } -pub fn typed_named_arg_matches(arg: Rc, name: String, source_indices: Rc>>) -> bool { +pub fn typed_named_arg_matches( + arg: Rc, + name: String, + source_indices: Rc>>, +) -> bool { { let n = arg_name_at(arg, source_indices); -if (n.clone() == None) { + if (n.clone() == None) { false } else { (n.clone().unwrap().as_str() == name.as_str()) } -} + } } -pub fn order_typed_call_args(args: &Rc>>, func: String, scope: &Rc) -> Rc>> { +pub fn order_typed_call_args( + args: &Rc>>, + func: String, + scope: &Rc, +) -> Rc>> { { - let has_unnamed = { let mut __found = false; for arg in args.clone().iter().cloned() { if (arg_name_at(arg.clone(), scope.type_env.clone().source_indices.clone()) == None) { __found = true; break; } } __found }; -if has_unnamed { + let has_unnamed = { + let mut __found = false; + for arg in args.clone().iter().cloned() { + if (arg_name_at(arg.clone(), scope.type_env.clone().source_indices.clone()) == None) + { + __found = true; + break; + } + } + __found + }; + if has_unnamed { args.clone() } else { match lookup_func_sig_in_scope(scope.clone(), func) { - None => args.clone(), - Some(sig) => { - let arg_map = args.clone().iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, arg: Rc| { - let n = arg_name_at(arg.clone(), scope.type_env.clone().source_indices.clone()); -if (n.clone() != None) { - v2_rt::rc_map_insert(acc.clone(), n.clone().unwrap(), arg.clone()) - } else { - acc.clone() - } -}); -let param_name_set = sig.params.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, param: Rc| v2_rt::rc_map_insert(acc, param_node_name_at(param.clone(), scope.type_env.clone().source_indices.clone()), true)); -let ordered = Rc::new({ let mut __result = Vec::new(); for param in sig.params.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&arg_map, param_node_name_at(param.clone(), scope.type_env.clone().source_indices.clone())) { - Some(arg) => Rc::new(vec![arg.clone()]), - None => Rc::new(vec![]), -}).iter().cloned()); } __result }); -let leftovers = Rc::new({ let mut __result = Vec::new(); for arg in args.clone().iter().cloned() { if { - let n = arg_name_at(arg.clone(), scope.type_env.clone().source_indices.clone()); -if (n.clone() == None) { - true - } else { - (emit_map_has(param_name_set.clone(), n.clone().unwrap()) == false) - } -} { __result.push(arg); } } __result }); -v2_rt::concat(ordered, leftovers) -}, -} + None => args.clone(), + Some(sig) => { + let arg_map = args.clone().iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, arg: Rc| { + let n = arg_name_at( + arg.clone(), + scope.type_env.clone().source_indices.clone(), + ); + if (n.clone() != None) { + v2_rt::rc_map_insert(acc.clone(), n.clone().unwrap(), arg.clone()) + } else { + acc.clone() + } + }, + ); + let param_name_set = sig.params.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, param: Rc| { + v2_rt::rc_map_insert( + acc, + param_node_name_at( + param.clone(), + scope.type_env.clone().source_indices.clone(), + ), + true, + ) + }, + ); + let ordered = Rc::new({ + let mut __result = Vec::new(); + for param in sig.params.clone().iter().cloned() { + __result.extend( + (*match v2_rt::map_get( + &arg_map, + param_node_name_at( + param.clone(), + scope.type_env.clone().source_indices.clone(), + ), + ) { + Some(arg) => Rc::new(vec![arg.clone()]), + None => Rc::new(vec![]), + }) + .iter() + .cloned(), + ); + } + __result + }); + let leftovers = Rc::new({ + let mut __result = Vec::new(); + for arg in args.clone().iter().cloned() { + if { + let n = arg_name_at( + arg.clone(), + scope.type_env.clone().source_indices.clone(), + ); + if (n.clone() == None) { + true + } else { + (emit_map_has(param_name_set.clone(), n.clone().unwrap()) + == false) + } + } { + __result.push(arg); + } + } + __result + }); + v2_rt::concat(ordered, leftovers) + } + } } -} + } } pub fn unique_strings(items: Rc>) -> Rc> { { - let result = items.iter().cloned().fold(Rc::new(UniqueAccum { - seen: v2_rt::rc_empty_map::(), - result: Rc::new(vec![]), -}), |acc: Rc, item: String| if emit_map_has(acc.seen.clone(), item.clone()) { - acc.clone() - } else { + let result = items.iter().cloned().fold( Rc::new(UniqueAccum { - seen: v2_rt::rc_map_insert(acc.seen.clone(), item.clone(), true), - result: v2_rt::rc_list_push(acc.result.clone(), item.clone()), -}) - }); -result.result.clone() -} + seen: v2_rt::rc_empty_map::(), + result: Rc::new(vec![]), + }), + |acc: Rc, item: String| { + if emit_map_has(acc.seen.clone(), item.clone()) { + acc.clone() + } else { + Rc::new(UniqueAccum { + seen: v2_rt::rc_map_insert(acc.seen.clone(), item.clone(), true), + result: v2_rt::rc_list_push(acc.result.clone(), item.clone()), + }) + } + }, + ); + result.result.clone() + } } -pub fn has_nested_records_node(mut n: Rc, mut source_indices: Rc>>) -> bool { +pub fn has_nested_records_node( + mut n: Rc, + mut source_indices: Rc>>, +) -> bool { loop { let is_product = (n.connective.clone() == Connective::Conj); -let is_coproduct = (n.connective.clone() == Connective::Disj); -if is_product { + let is_coproduct = (n.connective.clone() == Connective::Disj); + if is_product { break true; -} else { + } else { if is_coproduct { let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); -if is_optional { + if is_optional { { let __tco_0 = with_required_cardinality(&n); -n = __tco_0; -continue; -} -} else { + n = __tco_0; + continue; + } + } else { break false; -} -} else { + } + } else { let is_map = node_is_keyed_collection(&n, source_indices.clone()); -if is_map { + if is_map { match n.children.clone().get(1 as usize).cloned() { - Some(val_child) => { { - let __tco_0 = child_type_node(&val_child); -n = __tco_0; -continue; -} }, - None => { break false; }, -} -} else { + Some(val_child) => { + let __tco_0 = child_type_node(&val_child); + n = __tco_0; + continue; + } + None => { + break false; + } + } + } else { if ((n.children.clone().len() as i64) == 1) { match n.children.clone().first().cloned() { - Some(el) => { { - let __tco_0 = child_type_node(&el); -n = __tco_0; -continue; -} }, - None => { break false; }, -} -} else { + Some(el) => { + let __tco_0 = child_type_node(&el); + n = __tco_0; + continue; + } + None => { + break false; + } + } + } else { break false; -} -} -} -} -} + } + } + } + } + } } -pub fn emit_data_value_json(value: &Rc, source_indices: Rc>>) -> String { +pub fn emit_data_value_json( + value: &Rc, + source_indices: Rc>>, +) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*value.expr_data.clone()).clone() { - ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitStr { value: s, .. } => v2_rt::concat(v2_rt::concat("\"".to_string(), escape_json_string(s.clone())), "\"".to_string()), - LiteralValue::LitInt { value: i, .. } => (i.clone()).to_string(), - LiteralValue::LitFloat { value: f, .. } => f.clone(), - LiteralValue::LitBool { value: b, .. } => if b.clone() { - "true".to_string() - } else { - "false".to_string() - }, - LiteralValue::LitNull => "null".to_string(), -}, - ExprData::ExprListLit => { - let el_strs = Rc::new({ let mut __result = Vec::new(); for e in value.children.clone().iter().cloned() { __result.push(emit_data_value_json(&e, source_indices.clone())); } __result }); -v2_rt::concat(v2_rt::concat("[".to_string(), el_strs.join(&", ".to_string())), "]".to_string()) -}, - ExprData::ExprRecordLit { .. } => { - let field_strs = Rc::new({ let mut __result = Vec::new(); for f in value.children.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat("\"".to_string(), escape_json_string(field_init_node_name_at(f.clone(), source_indices.clone()))), "\": ".to_string()), emit_data_value_json(&field_init_node_value(&f), source_indices.clone()))); } __result }); -v2_rt::concat(v2_rt::concat("{".to_string(), field_strs.join(&", ".to_string())), "}".to_string()) -}, - ExprData::ExprVar { .. } => v2_rt::concat(v2_rt::concat("\"".to_string(), escape_json_string(expr_var_name_at(value.clone(), source_indices.clone()))), "\"".to_string()), - ExprData::ExprUnaryOp { op: UnaryOpKind::Neg, .. } => v2_rt::concat("-".to_string(), emit_data_value_json(&unaryop_operand(value.clone()), source_indices.clone())), - _ => "\"compile_error!(unsupported mock expression)\"".to_string(), -} + ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitStr { value: s, .. } => v2_rt::concat( + v2_rt::concat("\"".to_string(), escape_json_string(s.clone())), + "\"".to_string(), + ), + LiteralValue::LitInt { value: i, .. } => (i.clone()).to_string(), + LiteralValue::LitFloat { value: f, .. } => f.clone(), + LiteralValue::LitBool { value: b, .. } => { + if b.clone() { + "true".to_string() + } else { + "false".to_string() + } + } + LiteralValue::LitNull => "null".to_string(), + }, + ExprData::ExprListLit => { + let el_strs = Rc::new({ + let mut __result = Vec::new(); + for e in value.children.clone().iter().cloned() { + __result.push(emit_data_value_json(&e, source_indices.clone())); + } + __result + }); + v2_rt::concat( + v2_rt::concat("[".to_string(), el_strs.join(&", ".to_string())), + "]".to_string(), + ) + } + ExprData::ExprRecordLit { .. } => { + let field_strs = Rc::new({ + let mut __result = Vec::new(); + for f in value.children.clone().iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "\"".to_string(), + escape_json_string(field_init_node_name_at( + f.clone(), + source_indices.clone(), + )), + ), + "\": ".to_string(), + ), + emit_data_value_json( + &field_init_node_value(&f), + source_indices.clone(), + ), + )); + } + __result + }); + v2_rt::concat( + v2_rt::concat("{".to_string(), field_strs.join(&", ".to_string())), + "}".to_string(), + ) + } + ExprData::ExprVar { .. } => v2_rt::concat( + v2_rt::concat( + "\"".to_string(), + escape_json_string(expr_var_name_at(value.clone(), source_indices.clone())), + ), + "\"".to_string(), + ), + ExprData::ExprUnaryOp { + op: UnaryOpKind::Neg, + .. + } => v2_rt::concat( + "-".to_string(), + emit_data_value_json(&unaryop_operand(value.clone()), source_indices.clone()), + ), + _ => "\"compile_error!(unsupported mock expression)\"".to_string(), + } }) } pub fn escape_json_string(s: String) -> String { - Rc::new(Rc::new(Rc::new(Rc::new(s.split(&"\\".to_string()).map(|s| s.to_string()).collect::>()).join(&"\\\\".to_string()).split(&"\"".to_string()).map(|s| s.to_string()).collect::>()).join(&"\\\"".to_string()).split(&"\n".to_string()).map(|s| s.to_string()).collect::>()).join(&"\\n".to_string()).split(&"\t".to_string()).map(|s| s.to_string()).collect::>()).join(&"\\t".to_string()) + Rc::new( + Rc::new( + Rc::new( + Rc::new( + s.split(&"\\".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .join(&"\\\\".to_string()) + .split(&"\"".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .join(&"\\\"".to_string()) + .split(&"\n".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .join(&"\\n".to_string()) + .split(&"\t".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .join(&"\\t".to_string()) } pub fn module_to_filename(name: String) -> String { - Rc::new(name.split(&".".to_string()).map(|s| s.to_string()).collect::>()).join(&"_".to_string()) + Rc::new( + name.split(&".".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .join(&"_".to_string()) } pub fn make_indent(level: i64) -> String { @@ -519,15 +1033,26 @@ pub fn make_indent(level: i64) -> String { pub fn to_string(value: i64) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { if (value.clone() < 0) { - v2_rt::concat("-".to_string(), ((0 - value.clone())).to_string()) + v2_rt::concat("-".to_string(), (0 - value.clone()).to_string()) } else { if (value.clone() == 0) { "0".to_string() } else { { - let digit_chars = Rc::new(vec!["0".to_string(), "1".to_string(), "2".to_string(), "3".to_string(), "4".to_string(), "5".to_string(), "6".to_string(), "7".to_string(), "8".to_string(), "9".to_string()]); -to_string_helper(value.clone(), Rc::new(vec![])).join(&"".to_string()) -} + let digit_chars = Rc::new(vec![ + "0".to_string(), + "1".to_string(), + "2".to_string(), + "3".to_string(), + "4".to_string(), + "5".to_string(), + "6".to_string(), + "7".to_string(), + "8".to_string(), + "9".to_string(), + ]); + to_string_helper(value.clone(), Rc::new(vec![])).join(&"".to_string()) + } } } }) @@ -537,68 +1062,169 @@ pub fn to_string_helper(mut value: i64, mut acc: Rc>) -> Rc>()).iter().cloned() { if (p.0.clone() == digit.clone()) { __result.push(p); } } __result }).first().cloned() { - Some(p) => p.1.clone(), - None => "?".to_string(), -}; -{ + let digit = (value.clone() - (rest.clone() * 10)); + let digit_chars = Rc::new(vec![ + "0".to_string(), + "1".to_string(), + "2".to_string(), + "3".to_string(), + "4".to_string(), + "5".to_string(), + "6".to_string(), + "7".to_string(), + "8".to_string(), + "9".to_string(), + ]); + let ch = match Rc::new({ + let mut __result = Vec::new(); + for p in Rc::new( + digit_chars + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + if (p.0.clone() == digit.clone()) { + __result.push(p); + } + } + __result + }) + .first() + .cloned() + { + Some(p) => p.1.clone(), + None => "?".to_string(), + }; + { let __tco_0 = rest.clone(); -let __tco_1 = v2_rt::concat(Rc::new(vec![ch]), acc); -value = __tco_0; -acc = __tco_1; -continue; -} -} -} + let __tco_1 = v2_rt::concat(Rc::new(vec![ch]), acc); + value = __tco_0; + acc = __tco_1; + continue; + } + } + } } pub fn to_snake(name: String) -> String { { let chars_list = Rc::new(name.chars().map(|c| c as i64).collect::>()); -let result = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(chars_list.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ - let idx = pair.0.clone(); -let ch = pair.1.clone(); -if is_upper(ch.clone()) { - if (idx.clone() == 0) { - to_lower_char(ch.clone()) - } else { - v2_rt::concat("_".to_string(), to_lower_char(ch.clone())) - } - } else { - v2_rt::from_code_point(ch.clone()) + let result = Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + chars_list + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + __result.push({ + let idx = pair.0.clone(); + let ch = pair.1.clone(); + if is_upper(ch.clone()) { + if (idx.clone() == 0) { + to_lower_char(ch.clone()) + } else { + v2_rt::concat("_".to_string(), to_lower_char(ch.clone())) + } + } else { + v2_rt::from_code_point(ch.clone()) + } + }); } -}); } __result }); -result.join(&"".to_string()) -} + __result + }); + result.join(&"".to_string()) + } } pub fn to_screaming_snake(name: String) -> String { { let snake = to_snake(name); -Rc::new({ let mut __result = Vec::new(); for ch in Rc::new(snake.chars().map(|c| c as i64).collect::>()).iter().cloned() { __result.push(to_upper_char(ch.clone())); } __result }).join(&"".to_string()) -} + Rc::new({ + let mut __result = Vec::new(); + for ch in Rc::new(snake.chars().map(|c| c as i64).collect::>()) + .iter() + .cloned() + { + __result.push(to_upper_char(ch.clone())); + } + __result + }) + .join(&"".to_string()) + } } pub fn to_camel(name: String) -> String { { - let parts = Rc::new(name.clone().split(&"_".to_string()).map(|s| s.to_string()).collect::>()); -if ((parts.clone().len() as i64) == 0) { + let parts = Rc::new( + name.clone() + .split(&"_".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ); + if ((parts.clone().len() as i64) == 0) { name.clone() } else { { let first_part = match parts.clone().first().cloned() { - Some(p) => Rc::new({ let mut __result = Vec::new(); for c in Rc::new(p.clone().chars().map(|c| c as i64).collect::>()).iter().cloned() { __result.push(to_lower_char(c.clone())); } __result }).join(&"".to_string()), - None => "".to_string(), -}; -let rest_parts = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(parts.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (pair.0.clone() > 0) { __result.push(pair); } } __result }).iter().cloned() { __result.push(capitalize_first(pair.1.clone())); } __result }); -v2_rt::concat(first_part, rest_parts.join(&"".to_string())) -} + Some(p) => Rc::new({ + let mut __result = Vec::new(); + for c in Rc::new(p.clone().chars().map(|c| c as i64).collect::>()) + .iter() + .cloned() + { + __result.push(to_lower_char(c.clone())); + } + __result + }) + .join(&"".to_string()), + None => "".to_string(), + }; + let rest_parts = Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + parts + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + if (pair.0.clone() > 0) { + __result.push(pair); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(capitalize_first(pair.1.clone())); + } + __result + }); + v2_rt::concat(first_part, rest_parts.join(&"".to_string())) + } } -} + } } pub fn is_upper(ch: i64) -> bool { @@ -608,74 +1234,123 @@ pub fn is_upper(ch: i64) -> bool { pub fn to_lower_char(ch: i64) -> String { { let cp = ch.clone(); -if ((cp.clone() >= 65) && (cp.clone() <= 90)) { + if ((cp.clone() >= 65) && (cp.clone() <= 90)) { { let lower_cp = (cp.clone() + 32); -v2_rt::from_code_point(lower_cp) -} + v2_rt::from_code_point(lower_cp) + } } else { v2_rt::from_code_point(ch.clone()) } -} + } } pub fn to_upper_char(ch: i64) -> String { { let cp = ch.clone(); -if ((cp.clone() >= 97) && (cp.clone() <= 122)) { + if ((cp.clone() >= 97) && (cp.clone() <= 122)) { { let upper_cp = (cp.clone() - 32); -v2_rt::from_code_point(upper_cp) -} + v2_rt::from_code_point(upper_cp) + } } else { v2_rt::from_code_point(ch.clone()) } -} + } } pub fn sanitize_service_name(name: String) -> String { { - let parts = Rc::new(name.split(&".".to_string()).map(|s| s.to_string()).collect::>()); -let pascal_parts = Rc::new({ let mut __result = Vec::new(); for p in parts.iter().cloned() { __result.push(capitalize_first(p.clone())); } __result }); -pascal_parts.join(&"".to_string()) -} + let parts = Rc::new( + name.split(&".".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ); + let pascal_parts = Rc::new({ + let mut __result = Vec::new(); + for p in parts.iter().cloned() { + __result.push(capitalize_first(p.clone())); + } + __result + }); + pascal_parts.join(&"".to_string()) + } } pub fn capitalize_first(s: String) -> String { { let chars_list = Rc::new(s.chars().map(|c| c as i64).collect::>()); -if ((chars_list.clone().len() as i64) == 0) { + if ((chars_list.clone().len() as i64) == 0) { "".to_string() } else { - Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(chars_list.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push(if (pair.0.clone() == 0) { - to_upper_char(pair.1.clone()) - } else { - v2_rt::from_code_point(pair.1.clone()) - }); } __result }).join(&"".to_string()) + Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + chars_list + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + __result.push(if (pair.0.clone() == 0) { + to_upper_char(pair.1.clone()) + } else { + v2_rt::from_code_point(pair.1.clone()) + }); + } + __result + }) + .join(&"".to_string()) } -} + } } pub fn to_pascal(name: String) -> String { { let snake = to_snake(name); -let parts = Rc::new(snake.split(&"_".to_string()).map(|s| s.to_string()).collect::>()); -let pascal_parts = Rc::new({ let mut __result = Vec::new(); for p in parts.iter().cloned() { __result.push(capitalize_first(p.clone())); } __result }); -pascal_parts.join(&"".to_string()) -} + let parts = Rc::new( + snake + .split(&"_".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ); + let pascal_parts = Rc::new({ + let mut __result = Vec::new(); + for p in parts.iter().cloned() { + __result.push(capitalize_first(p.clone())); + } + __result + }); + pascal_parts.join(&"".to_string()) + } } pub fn apply_naming_case(name: String, case_style: NamingCase) -> String { match case_style { - NamingCase::PascalCase => { - let parts = Rc::new(name.split(&"_".to_string()).map(|s| s.to_string()).collect::>()); -let pascal_parts = Rc::new({ let mut __result = Vec::new(); for p in parts.iter().cloned() { __result.push(capitalize_first(p.clone())); } __result }); -pascal_parts.join(&"".to_string()) -}, - NamingCase::SnakeCase => to_snake(name), - NamingCase::CamelCase => to_camel(name), - NamingCase::AsAuthored => name, -} + NamingCase::PascalCase => { + let parts = Rc::new( + name.split(&"_".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ); + let pascal_parts = Rc::new({ + let mut __result = Vec::new(); + for p in parts.iter().cloned() { + __result.push(capitalize_first(p.clone())); + } + __result + }); + pascal_parts.join(&"".to_string()) + } + NamingCase::SnakeCase => to_snake(name), + NamingCase::CamelCase => to_camel(name), + NamingCase::AsAuthored => name, + } } pub fn service_var_name(service_name: String) -> String { @@ -685,71 +1360,176 @@ pub fn service_var_name(service_name: String) -> String { pub fn test_file_path(module_name: String, target: &RenderTarget) -> String { { let conventions = test_conventions_for_target(target.clone()); -let file_dir = match conventions.file_dir.clone() { - Some(dir) => dir.clone(), - None => "".to_string(), -}; -let filename = module_to_filename(module_name); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(file_dir, conventions.file_prefix.clone()), filename), conventions.file_suffix.clone()), language_spec(target.clone()).scaffold.clone().source_file_extension.clone()) -} + let file_dir = match conventions.file_dir.clone() { + Some(dir) => dir.clone(), + None => "".to_string(), + }; + let filename = module_to_filename(module_name); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(file_dir, conventions.file_prefix.clone()), + filename, + ), + conventions.file_suffix.clone(), + ), + language_spec(target.clone()) + .scaffold + .clone() + .source_file_extension + .clone(), + ) + } } pub fn test_function_name(projection: &Rc, target: RenderTarget) -> String { { let conventions = test_conventions_for_target(target); -let formatted = match conventions.name_style.clone() { - TestNameStyle::SnakeCaseTestNames => v2_rt::concat(v2_rt::concat(to_snake(sanitize_service_name(projection.service_name.clone())), "_".to_string()), to_snake(projection.operation_name.clone())), - TestNameStyle::PascalCaseTestNames => v2_rt::concat(to_pascal(sanitize_service_name(projection.service_name.clone())), to_pascal(projection.operation_name.clone())), -}; -v2_rt::concat(conventions.function_prefix.clone(), formatted) -} + let formatted = match conventions.name_style.clone() { + TestNameStyle::SnakeCaseTestNames => v2_rt::concat( + v2_rt::concat( + to_snake(sanitize_service_name(projection.service_name.clone())), + "_".to_string(), + ), + to_snake(projection.operation_name.clone()), + ), + TestNameStyle::PascalCaseTestNames => v2_rt::concat( + to_pascal(sanitize_service_name(projection.service_name.clone())), + to_pascal(projection.operation_name.clone()), + ), + }; + v2_rt::concat(conventions.function_prefix.clone(), formatted) + } } pub fn apply_type_template1(template: String, arg0: String) -> String { - Rc::new(template.split(&"{0}".to_string()).map(|s| s.to_string()).collect::>()).join(&arg0) + Rc::new( + template + .split(&"{0}".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .join(&arg0) } pub fn apply_type_template2(template: String, arg0: String, arg1: String) -> String { { - let parts = Rc::new(template.split(&"{0}".to_string()).map(|s| s.to_string()).collect::>()); -let replaced = Rc::new({ let mut __result = Vec::new(); for p in parts.iter().cloned() { __result.push(Rc::new(p.clone().split(&"{1}".to_string()).map(|s| s.to_string()).collect::>()).join(&arg1.clone())); } __result }); -replaced.join(&arg0) -} + let parts = Rc::new( + template + .split(&"{0}".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ); + let replaced = Rc::new({ + let mut __result = Vec::new(); + for p in parts.iter().cloned() { + __result.push( + Rc::new( + p.clone() + .split(&"{1}".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .join(&arg1.clone()), + ); + } + __result + }); + replaced.join(&arg0) + } } pub fn apply_type_template3(template: String, arg0: String, arg1: String, arg2: String) -> String { { - let parts0 = Rc::new(template.split(&"{0}".to_string()).map(|s| s.to_string()).collect::>()); -let replaced = Rc::new({ let mut __result = Vec::new(); for p0 in parts0.iter().cloned() { __result.push({ - let parts1 = Rc::new(p0.clone().split(&"{1}".to_string()).map(|s| s.to_string()).collect::>()); -let inner = Rc::new({ let mut __result = Vec::new(); for p1 in parts1.clone().iter().cloned() { __result.push(Rc::new(p1.clone().split(&"{2}".to_string()).map(|s| s.to_string()).collect::>()).join(&arg2.clone())); } __result }); -inner.clone().join(&arg1.clone()) -}); } __result }); -replaced.join(&arg0) -} + let parts0 = Rc::new( + template + .split(&"{0}".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ); + let replaced = Rc::new({ + let mut __result = Vec::new(); + for p0 in parts0.iter().cloned() { + __result.push({ + let parts1 = Rc::new( + p0.clone() + .split(&"{1}".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ); + let inner = Rc::new({ + let mut __result = Vec::new(); + for p1 in parts1.clone().iter().cloned() { + __result.push( + Rc::new( + p1.clone() + .split(&"{2}".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .join(&arg2.clone()), + ); + } + __result + }); + inner.clone().join(&arg1.clone()) + }); + } + __result + }); + replaced.join(&arg0) + } } pub fn apply_named_template(template: String, bindings: &Rc>) -> String { apply_named_template_nested(template, &bindings, &Rc::new(v2_rt::map_keys(&bindings))) } -pub fn apply_named_template_nested(template: String, bindings: &Rc>, keys: &Rc>) -> String { +pub fn apply_named_template_nested( + template: String, + bindings: &Rc>, + keys: &Rc>, +) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match keys.clone().first().cloned() { - None => template, - Some(key) => { - let rest = Rc::new(keys.clone().iter().cloned().skip(1 as usize).collect::>()); -let placeholder = v2_rt::concat(v2_rt::concat("{".to_string(), key.clone()), "}".to_string()); -match v2_rt::map_get(&bindings, key.clone()) { - Some(val) => { - let parts = Rc::new(template.split(&placeholder).map(|s| s.to_string()).collect::>()); -let processed = Rc::new({ let mut __result = Vec::new(); for part in parts.iter().cloned() { __result.push(apply_named_template_nested(part.clone(), &bindings, &rest)); } __result }); -processed.join(&val.clone()) -}, - None => v2_rt::concat("TEMPLATE_ERROR_MISSING_BINDING_".to_string(), key.clone()), -} -}, -} + None => template, + Some(key) => { + let rest = Rc::new( + keys.clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + let placeholder = + v2_rt::concat(v2_rt::concat("{".to_string(), key.clone()), "}".to_string()); + match v2_rt::map_get(&bindings, key.clone()) { + Some(val) => { + let parts = Rc::new( + template + .split(&placeholder) + .map(|s| s.to_string()) + .collect::>(), + ); + let processed = Rc::new({ + let mut __result = Vec::new(); + for part in parts.iter().cloned() { + __result.push(apply_named_template_nested( + part.clone(), + &bindings, + &rest, + )); + } + __result + }); + processed.join(&val.clone()) + } + None => { + v2_rt::concat("TEMPLATE_ERROR_MISSING_BINDING_".to_string(), key.clone()) + } + } + } + } }) } @@ -758,74 +1538,163 @@ pub fn language_spec(target: RenderTarget) -> Rc { } pub fn reserved_prefix(target: RenderTarget) -> String { - match (*language_spec(target).reserved_words.clone().strategy.clone()).clone() { - ReservedWordStrategy::PrefixEscape { prefix, .. } => prefix.clone(), - _ => "".to_string(), -} + match (*language_spec(target) + .reserved_words + .clone() + .strategy + .clone()) + .clone() + { + ReservedWordStrategy::PrefixEscape { prefix, .. } => prefix.clone(), + _ => "".to_string(), + } } pub fn reserved_suffix(target: RenderTarget) -> String { - match (*language_spec(target).reserved_words.clone().strategy.clone()).clone() { - ReservedWordStrategy::SuffixEscape { suffix, .. } => suffix.clone(), - _ => "".to_string(), -} + match (*language_spec(target) + .reserved_words + .clone() + .strategy + .clone()) + .clone() + { + ReservedWordStrategy::SuffixEscape { suffix, .. } => suffix.clone(), + _ => "".to_string(), + } } pub fn escape_string_literal_body(s: String) -> String { { - let escaped_backslash = Rc::new(s.split(&"\\".to_string()).map(|s| s.to_string()).collect::>()).join(&"\\\\".to_string()); -let escaped_quote = Rc::new(escaped_backslash.split(&"\"".to_string()).map(|s| s.to_string()).collect::>()).join(&"\\\"".to_string()); -let escaped_newline = Rc::new(escaped_quote.split(&"\n".to_string()).map(|s| s.to_string()).collect::>()).join(&"\\n".to_string()); -let escaped_return = Rc::new(escaped_newline.split(&"\\r".to_string()).map(|s| s.to_string()).collect::>()).join(&"\\r".to_string()); -Rc::new(escaped_return.split(&"\t".to_string()).map(|s| s.to_string()).collect::>()).join(&"\\t".to_string()) -} + let escaped_backslash = Rc::new( + s.split(&"\\".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .join(&"\\\\".to_string()); + let escaped_quote = Rc::new( + escaped_backslash + .split(&"\"".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .join(&"\\\"".to_string()); + let escaped_newline = Rc::new( + escaped_quote + .split(&"\n".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .join(&"\\n".to_string()); + let escaped_return = Rc::new( + escaped_newline + .split(&"\\r".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .join(&"\\r".to_string()); + Rc::new( + escaped_return + .split(&"\t".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .join(&"\\t".to_string()) + } } pub fn escape_rust_interp_text(s: String) -> String { { - let escaped = Rc::new(escape_string_literal_body(s).split(&"{".to_string()).map(|s| s.to_string()).collect::>()).join(&"{{".to_string()); -Rc::new(escaped.split(&"}".to_string()).map(|s| s.to_string()).collect::>()).join(&"}}".to_string()) -} + let escaped = Rc::new( + escape_string_literal_body(s) + .split(&"{".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .join(&"{{".to_string()); + Rc::new( + escaped + .split(&"}".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .join(&"}}".to_string()) + } } pub fn escape_go_interp_text(s: String) -> String { - Rc::new(escape_string_literal_body(s).split(&"%".to_string()).map(|s| s.to_string()).collect::>()).join(&"%%".to_string()) + Rc::new( + escape_string_literal_body(s) + .split(&"%".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .join(&"%%".to_string()) } pub fn escape_python_interp_text(s: String) -> String { { - let escaped = Rc::new(escape_string_literal_body(s).split(&"{".to_string()).map(|s| s.to_string()).collect::>()).join(&"{{".to_string()); -Rc::new(escaped.split(&"}".to_string()).map(|s| s.to_string()).collect::>()).join(&"}}".to_string()) -} + let escaped = Rc::new( + escape_string_literal_body(s) + .split(&"{".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .join(&"{{".to_string()); + Rc::new( + escaped + .split(&"}".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .join(&"}}".to_string()) + } } pub fn apply_escape_pairs(s: String, pairs: Rc>>) -> String { - pairs.iter().cloned().fold(s.clone(), |acc: String, pair: Rc| Rc::new(acc.split(&pair.from.clone()).map(|s| s.to_string()).collect::>()).join(&pair.to.clone())) + pairs + .iter() + .cloned() + .fold(s.clone(), |acc: String, pair: Rc| { + Rc::new( + acc.split(&pair.from.clone()) + .map(|s| s.to_string()) + .collect::>(), + ) + .join(&pair.to.clone()) + }) } pub fn emit_string_literal(s: String, suffix: String) -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat("\"".to_string(), escape_string_literal_body(s)), "\"".to_string()), suffix) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("\"".to_string(), escape_string_literal_body(s)), + "\"".to_string(), + ), + suffix, + ) } pub fn is_null_coalesce(op: BinOp) -> bool { match op { - BinOp::NullCoalesce => true, - _ => false, -} + BinOp::NullCoalesce => true, + _ => false, + } } pub fn rust_literal_for_pattern(value: Rc) -> String { match (*value).clone() { - LiteralValue::LitStr { value: s, .. } => emit_string_literal(s.clone(), "".to_string()), - LiteralValue::LitInt { value: i, .. } => (i.clone()).to_string(), - LiteralValue::LitFloat { value: f, .. } => f.clone(), - LiteralValue::LitBool { value: b, .. } => if b.clone() { - emit_keyword("true".to_string(), RenderTarget::Rust) - } else { - emit_keyword("false".to_string(), RenderTarget::Rust) - }, - LiteralValue::LitNull => emit_keyword("null".to_string(), RenderTarget::Rust), -} + LiteralValue::LitStr { value: s, .. } => emit_string_literal(s.clone(), "".to_string()), + LiteralValue::LitInt { value: i, .. } => (i.clone()).to_string(), + LiteralValue::LitFloat { value: f, .. } => f.clone(), + LiteralValue::LitBool { value: b, .. } => { + if b.clone() { + emit_keyword("true".to_string(), RenderTarget::Rust) + } else { + emit_keyword("false".to_string(), RenderTarget::Rust) + } + } + LiteralValue::LitNull => emit_keyword("null".to_string(), RenderTarget::Rust), + } } pub fn emit_keyword(key: String, target: RenderTarget) -> String { @@ -834,29 +1703,41 @@ pub fn emit_keyword(key: String, target: RenderTarget) -> String { pub fn emit_literal(value: Rc, target: &RenderTarget) -> String { match (*value).clone() { - LiteralValue::LitStr { value: s, .. } => { - let suffix = match literal_suffix(target.clone(), "String".to_string()) { - Some(sfx) => sfx.clone(), - None => emit_error_expr("missing TypeCheckpoint for String literal suffix".to_string(), target.clone()), -}; -emit_string_literal(s.clone(), suffix) -}, - LiteralValue::LitInt { value: i, .. } => (i.clone()).to_string(), - LiteralValue::LitFloat { value: f, .. } => f.clone(), - LiteralValue::LitBool { value: b, .. } => if b.clone() { - emit_keyword("true".to_string(), target.clone()) - } else { - emit_keyword("false".to_string(), target.clone()) - }, - LiteralValue::LitNull => emit_keyword("null".to_string(), target.clone()), -} + LiteralValue::LitStr { value: s, .. } => { + let suffix = match literal_suffix(target.clone(), "String".to_string()) { + Some(sfx) => sfx.clone(), + None => emit_error_expr( + "missing TypeCheckpoint for String literal suffix".to_string(), + target.clone(), + ), + }; + emit_string_literal(s.clone(), suffix) + } + LiteralValue::LitInt { value: i, .. } => (i.clone()).to_string(), + LiteralValue::LitFloat { value: f, .. } => f.clone(), + LiteralValue::LitBool { value: b, .. } => { + if b.clone() { + emit_keyword("true".to_string(), target.clone()) + } else { + emit_keyword("false".to_string(), target.clone()) + } + } + LiteralValue::LitNull => emit_keyword("null".to_string(), target.clone()), + } } -pub fn emit_bin_op_symbol(op: BinOp, target: &RenderTarget, algebra_field: Option) -> String { +pub fn emit_bin_op_symbol( + op: BinOp, + target: &RenderTarget, + algebra_field: Option, +) -> String { match binop_symbol(target.clone(), op, algebra_field) { - Some(sym) => sym.clone(), - None => emit_error_expr("missing OperatorSpec for BinOp in target language".to_string(), target.clone()), -} + Some(sym) => sym.clone(), + None => emit_error_expr( + "missing OperatorSpec for BinOp in target language".to_string(), + target.clone(), + ), + } } pub fn emit_container(kind: &String, inner: String, target: &RenderTarget) -> String { @@ -864,303 +1745,467 @@ pub fn emit_container(kind: &String, inner: String, target: &RenderTarget) -> St apply_type_template1(target_optional_template(target.clone()), inner) } else { match coerce_container_template(target.clone(), kind.clone()) { - Some(template) => apply_type_template1(template.clone(), inner), - None => { - let spec = language_spec(target.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(kind.clone(), spec.type_arg_open.clone()), inner), spec.type_arg_close.clone()) -}, -} + Some(template) => apply_type_template1(template.clone(), inner), + None => { + let spec = language_spec(target.clone()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(kind.clone(), spec.type_arg_open.clone()), + inner, + ), + spec.type_arg_close.clone(), + ) + } + } } } pub fn emit_map_type(key_type: String, val_type: String, target: RenderTarget) -> String { match coerce_container_template(target, "map".to_string()) { - Some(template) => apply_type_template2(template.clone(), key_type, val_type), - None => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("Map<".to_string(), key_type), ", ".to_string()), val_type), ">".to_string()), -} -} - -pub fn emit_node_type(n: Rc, target: RenderTarget, source_indices: Rc>>) -> String { - render_node_type(&n, &target, &empty_set(), &source_indices) + Some(template) => apply_type_template2(template.clone(), key_type, val_type), + None => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("Map<".to_string(), key_type), + ", ".to_string(), + ), + val_type, + ), + ">".to_string(), + ), + } } -pub fn render_node_type(n: &Rc, target: &RenderTarget, shared_types: &Rc>, source_indices: &Rc>>) -> String { +pub fn emit_node_type( + n: Rc, + target: RenderTarget, + source_indices: Rc>>, +) -> String { + render_node_type( + &n, + &target, + &v2_rt::rc_empty_map::(), + &source_indices, + ) +} + +pub fn render_node_type( + n: &Rc, + target: &RenderTarget, + shared_types: &Rc>, + source_indices: &Rc>>, +) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let tn = authored_name_at(source_indices.clone(), &n); -let n_is_error = if (n.inferred.clone() != None) { - is_compiler_error(n.inferred.clone().clone().unwrap()) - } else { - false - }; -let n_is_type_var = if (n.inferred.clone() != None) { - is_type_variable(n.inferred.clone().clone().unwrap()) - } else { - false - }; -if ((n_is_type_var || n_is_error.clone()) && ((n.children.clone().len() as i64) == 0)) { - { - let label = if n_is_error.clone() { - "CompilerError".to_string() - } else { - "TypeVariable".to_string() - }; -let spec = language_spec(target.clone()); -let err_str = apply_type_template1(spec.error_type_template.clone(), v2_rt::concat("UNRESOLVED_".to_string(), label)); -return err_str -} + let tn = authored_name_at(source_indices.clone(), &n); + let n_is_error = if (n.inferred.clone() != None) { + is_compiler_error(n.inferred.clone().clone().unwrap()) + } else { + false + }; + let n_is_type_var = if (n.inferred.clone() != None) { + is_type_variable(n.inferred.clone().clone().unwrap()) + } else { + false + }; + if ((n_is_type_var || n_is_error.clone()) && ((n.children.clone().len() as i64) == 0)) { + { + let label = if n_is_error.clone() { + "CompilerError".to_string() + } else { + "TypeVariable".to_string() + }; + let spec = language_spec(target.clone()); + let err_str = apply_type_template1( + spec.error_type_template.clone(), + v2_rt::concat("UNRESOLVED_".to_string(), label), + ); + return err_str; } -let is_arrow = (n.connective.clone() == Connective::Arrow); -if is_arrow { - { - let repr = target_callable(target.clone()); -let param_strs = Rc::new({ let mut __result = Vec::new(); for p in n.params.clone().iter().cloned() { __result.push(render_node_type(¶m_node_type_expr(&p), &target, &shared_types, &source_indices)); } __result }); -let param_str = param_strs.join(&repr.param_separator.clone()); -let ret_str = match n.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => render_node_type(&rt, &target, &shared_types, &source_indices), - _ => language_spec(target.clone()).void_type.clone(), -}; -let spec = language_spec(target.clone()); -let result = match spec.callable_type_template.clone() { - Some(t) => v2_rt::replace(v2_rt::replace(t.clone(), "{params}".to_string(), param_str), "{return}".to_string(), ret_str.clone()), - None => if (ret_str.clone().as_str() == "".to_string().as_str()) { - { - let void_template = v2_rt::replace(repr.template.clone(), v2_rt::concat(repr.return_separator.clone(), "{return}".to_string()), "".to_string()); -v2_rt::replace(void_template, "{params}".to_string(), param_str) -} - } else { - v2_rt::replace(v2_rt::replace(repr.template.clone(), "{params}".to_string(), param_str), "{return}".to_string(), ret_str.clone()) - }, -}; -return result -} + } + let is_arrow = (n.connective.clone() == Connective::Arrow); + if is_arrow { + { + let repr = target_callable(target.clone()); + let param_strs = Rc::new({ + let mut __result = Vec::new(); + for p in n.params.clone().iter().cloned() { + __result.push(render_node_type( + ¶m_node_type_expr(&p), + &target, + &shared_types, + &source_indices, + )); + } + __result + }); + let param_str = param_strs.join(&repr.param_separator.clone()); + let ret_str = match n.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + render_node_type(&rt, &target, &shared_types, &source_indices) + } + _ => language_spec(target.clone()).void_type.clone(), + }; + let spec = language_spec(target.clone()); + let result = match spec.callable_type_template.clone() { + Some(t) => v2_rt::replace( + v2_rt::replace(t.clone(), "{params}".to_string(), param_str), + "{return}".to_string(), + ret_str.clone(), + ), + None => { + if (ret_str.clone().as_str() == "".to_string().as_str()) { + { + let void_template = v2_rt::replace( + repr.template.clone(), + v2_rt::concat( + repr.return_separator.clone(), + "{return}".to_string(), + ), + "".to_string(), + ); + v2_rt::replace(void_template, "{params}".to_string(), param_str) + } + } else { + v2_rt::replace( + v2_rt::replace( + repr.template.clone(), + "{params}".to_string(), + param_str, + ), + "{return}".to_string(), + ret_str.clone(), + ) + } + } + }; + return result; } -let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); -if is_optional { - { - let inner_str = render_node_type(&with_required_cardinality(&n), &target, &shared_types, &source_indices); -let opt_str = emit_container(&"optional".to_string(), inner_str, &target); -return opt_str -} + } + let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); + if is_optional { + { + let inner_str = render_node_type( + &with_required_cardinality(&n), + &target, + &shared_types, + &source_indices, + ); + let opt_str = emit_container(&"optional".to_string(), inner_str, &target); + return opt_str; } -let is_conj = (n.connective.clone() == Connective::Conj); -let is_disj = (n.connective.clone() == Connective::Disj); -let shared = set_contains(shared_types.clone(), tn.clone()); -if is_disj { - { - let base = if (n.ident_span.clone() != None) { - coerce_primitive_type(target.clone(), tn.clone()) - } else { - { - let spec = language_spec(target.clone()); -apply_type_template1(spec.error_type_template.clone(), "ANONYMOUS_COPRODUCT".to_string()) -} - }; -let disj_str = if shared.clone() { - wrap_shared_type(target.clone(), base.clone()) - } else { - base.clone() - }; -return disj_str -} + } + let is_conj = (n.connective.clone() == Connective::Conj); + let is_disj = (n.connective.clone() == Connective::Disj); + let shared = emit_map_has(shared_types.clone(), tn.clone()); + if is_disj { + { + let base = if (n.ident_span.clone() != None) { + coerce_primitive_type(target.clone(), tn.clone()) + } else { + { + let spec = language_spec(target.clone()); + apply_type_template1( + spec.error_type_template.clone(), + "ANONYMOUS_COPRODUCT".to_string(), + ) + } + }; + let disj_str = if shared.clone() { + wrap_shared_type(target.clone(), base.clone()) + } else { + base.clone() + }; + return disj_str; } -if is_conj { - { - if (n.type_annotation.clone() != None) { - { - let refined_str = match n.children.clone().first().cloned() { - Some(base) => render_node_type(&base, &target, &shared_types, &source_indices), - None => coerce_primitive_type(target.clone(), "Refined".to_string()), -}; -return refined_str -} + } + if is_conj { + { + if (n.type_annotation.clone() != None) { + { + let refined_str = match n.children.clone().first().cloned() { + Some(base) => { + render_node_type(&base, &target, &shared_types, &source_indices) + } + None => coerce_primitive_type(target.clone(), "Refined".to_string()), + }; + return refined_str; } -let is_pair = (((n.connective.clone() == Connective::Conj) && (n.ident_span.clone() == None)) && ((n.children.clone().len() as i64) == 2)); -if is_pair { - { - let first_child = match n.children.clone().first().cloned() { - Some(c) => if (c.inferred.clone() != None) { - render_node_type(&resolved_type(c.clone()), &target, &shared_types, &source_indices) - } else { - render_node_type(&c, &target, &shared_types, &source_indices) - }, - None => "_".to_string(), -}; -let second_child = match n.children.clone().get(1 as usize).cloned() { - Some(c) => if (c.inferred.clone() != None) { - render_node_type(&resolved_type(c.clone()), &target, &shared_types, &source_indices) - } else { - render_node_type(&c, &target, &shared_types, &source_indices) - }, - None => "_".to_string(), -}; -let tuple_str = render_tuple_parts(&Rc::new(vec![first_child, second_child]), target.clone()); -return tuple_str -} + } + let is_pair = (((n.connective.clone() == Connective::Conj) + && (n.ident_span.clone() == None)) + && ((n.children.clone().len() as i64) == 2)); + if is_pair { + { + let first_child = match n.children.clone().first().cloned() { + Some(c) => { + if (c.inferred.clone() != None) { + render_node_type( + &resolved_type(c.clone()), + &target, + &shared_types, + &source_indices, + ) + } else { + render_node_type(&c, &target, &shared_types, &source_indices) + } + } + None => "_".to_string(), + }; + let second_child = match n.children.clone().get(1 as usize).cloned() { + Some(c) => { + if (c.inferred.clone() != None) { + render_node_type( + &resolved_type(c.clone()), + &target, + &shared_types, + &source_indices, + ) + } else { + render_node_type(&c, &target, &shared_types, &source_indices) + } + } + None => "_".to_string(), + }; + let tuple_str = render_tuple_parts( + &Rc::new(vec![first_child, second_child]), + target.clone(), + ); + return tuple_str; } -if (n.ident_span.clone() != None) { - { - let snake = to_snake(tn.clone()); -let has_template = match container_template_algebra(snake.clone()) { - Some(_) => true, - None => false, -}; -if has_template { + } + if (n.ident_span.clone() != None) { + { + let snake = to_snake(tn.clone()); + let has_template = match container_template_algebra(snake.clone()) { + Some(_) => true, + None => false, + }; + if has_template { + { + let base = if (snake.clone().as_str() == "map".to_string().as_str()) { - let base = if (snake.clone().as_str() == "map".to_string().as_str()) { - emit_map_type("_".to_string(), "_".to_string(), target.clone()) - } else { - emit_container(&snake, "_".to_string(), &target) - }; -let conj_container_str = if shared.clone() { - wrap_shared_type(target.clone(), base.clone()) - } else { - base.clone() - }; -return conj_container_str -} + emit_map_type("_".to_string(), "_".to_string(), target.clone()) + } else { + emit_container(&snake, "_".to_string(), &target) + }; + let conj_container_str = if shared.clone() { + wrap_shared_type(target.clone(), base.clone()) + } else { + base.clone() + }; + return conj_container_str; } -let base = coerce_primitive_type(target.clone(), tn.clone()); -let conj_named_str = if shared.clone() { - wrap_shared_type(target.clone(), base.clone()) - } else { - base.clone() - }; -return conj_named_str -} + } + let base = coerce_primitive_type(target.clone(), tn.clone()); + let conj_named_str = if shared.clone() { + wrap_shared_type(target.clone(), base.clone()) + } else { + base.clone() + }; + return conj_named_str; } -let parts = Rc::new({ let mut __result = Vec::new(); for child in n.children.clone().iter().cloned() { __result.push(render_node_type(&resolved_type(child.clone()), &target, &shared_types, &source_indices)); } __result }); -let anon_str = render_tuple_parts(&parts, target.clone()); -return anon_str -} + } + let parts = Rc::new({ + let mut __result = Vec::new(); + for child in n.children.clone().iter().cloned() { + __result.push(render_node_type( + &resolved_type(child.clone()), + &target, + &shared_types, + &source_indices, + )); + } + __result + }); + let anon_str = render_tuple_parts(&parts, target.clone()); + return anon_str; } -if ((n.children.clone().len() as i64) == 0) { + } + if ((n.children.clone().len() as i64) == 0) { + { + let bare_is_map = (is_container_type(tn.clone()) + && (to_snake(tn.clone()).as_str() == "map".to_string().as_str())); + let bare_is_collection = (is_container_type(tn.clone()) && !bare_is_map.clone()); + let has_container_template = match container_template_algebra(to_snake(tn.clone())) { - let bare_is_map = (is_container_type(tn.clone()) && (to_snake(tn.clone()).as_str() == "map".to_string().as_str())); -let bare_is_collection = (is_container_type(tn.clone()) && !bare_is_map.clone()); -let has_container_template = match container_template_algebra(to_snake(tn.clone())) { - Some(_) => true, - None => false, -}; -let param_count = (n.params.clone().len() as i64); -let base = if bare_is_map.clone() { - emit_map_type("_".to_string(), "_".to_string(), target.clone()) + Some(_) => true, + None => false, + }; + let param_count = (n.params.clone().len() as i64); + let base = if bare_is_map.clone() { + emit_map_type("_".to_string(), "_".to_string(), target.clone()) + } else { + if bare_is_collection { + emit_container(&to_snake(tn.clone()), "_".to_string(), &target) } else { - if bare_is_collection { - emit_container(&to_snake(tn.clone()), "_".to_string(), &target) + if (has_container_template && (param_count == 1)) { + { + let inner = match n.params.clone().first().cloned() { + Some(p) => render_node_type( + ¶m_node_type_expr(&p), + &target, + &shared_types, + &source_indices, + ), + None => "_".to_string(), + }; + emit_container(&to_snake(tn.clone()), inner, &target) + } } else { - if (has_container_template && (param_count == 1)) { - { - let inner = match n.params.clone().first().cloned() { - Some(p) => render_node_type(¶m_node_type_expr(&p), &target, &shared_types, &source_indices), - None => "_".to_string(), -}; -emit_container(&to_snake(tn.clone()), inner, &target) -} + if (tn.clone().as_str() == tuple_type_name().as_str()) { + render_tuple_parts(&Rc::new(vec![]), target.clone()) } else { - if (tn.clone().as_str() == tuple_type_name().as_str()) { - render_tuple_parts(&Rc::new(vec![]), target.clone()) - } else { - coerce_primitive_type(target.clone(), tn.clone()) - } + coerce_primitive_type(target.clone(), tn.clone()) } } - }; -let bare_str = if shared.clone() { - wrap_shared_type(target.clone(), base.clone()) - } else { - base.clone() - }; -return bare_str -} + } + }; + let bare_str = if shared.clone() { + wrap_shared_type(target.clone(), base.clone()) + } else { + base.clone() + }; + return bare_str; } -let is_map = node_is_keyed_collection(&n, source_indices.clone()); -if is_map { - { - let k = match n.children.clone().first().cloned() { - Some(kn) => render_node_type(&child_type_node(&kn), &target, &shared_types, &source_indices), - None => "_".to_string(), -}; -let v = match n.children.clone().get(1 as usize).cloned() { - Some(vn) => render_node_type(&child_type_node(&vn), &target, &shared_types, &source_indices), - None => "_".to_string(), -}; -let base = emit_map_type(k, v, target.clone()); -let map_str = if shared.clone() { - wrap_shared_type(target.clone(), base.clone()) - } else { - base.clone() - }; -return map_str -} + } + let is_map = node_is_keyed_collection(&n, source_indices.clone()); + if is_map { + { + let k = match n.children.clone().first().cloned() { + Some(kn) => render_node_type( + &child_type_node(&kn), + &target, + &shared_types, + &source_indices, + ), + None => "_".to_string(), + }; + let v = match n.children.clone().get(1 as usize).cloned() { + Some(vn) => render_node_type( + &child_type_node(&vn), + &target, + &shared_types, + &source_indices, + ), + None => "_".to_string(), + }; + let base = emit_map_type(k, v, target.clone()); + let map_str = if shared.clone() { + wrap_shared_type(target.clone(), base.clone()) + } else { + base.clone() + }; + return map_str; } -if ((n.children.clone().len() as i64) == 1) { - { - let child_str = match n.children.clone().first().cloned() { - Some(child) => render_node_type(&child_type_node(&child), &target, &shared_types, &source_indices), - None => "_".to_string(), -}; -let is_container = node_is_collection(&n, source_indices.clone()); -let base = if is_container { - emit_container(&to_snake(tn.clone()), child_str, &target) - } else { - { - let type_base = coerce_primitive_type(target.clone(), tn.clone()); -let spec = language_spec(target.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(type_base.clone(), spec.type_arg_open.clone()), child_str), spec.type_arg_close.clone()) -} - }; -let single_str = if shared.clone() { - wrap_shared_type(target.clone(), base.clone()) - } else { - base.clone() - }; -return single_str -} + } + if ((n.children.clone().len() as i64) == 1) { + { + let child_str = match n.children.clone().first().cloned() { + Some(child) => render_node_type( + &child_type_node(&child), + &target, + &shared_types, + &source_indices, + ), + None => "_".to_string(), + }; + let is_container = node_is_collection(&n, source_indices.clone()); + let base = if is_container { + emit_container(&to_snake(tn.clone()), child_str, &target) + } else { + { + let type_base = coerce_primitive_type(target.clone(), tn.clone()); + let spec = language_spec(target.clone()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(type_base.clone(), spec.type_arg_open.clone()), + child_str, + ), + spec.type_arg_close.clone(), + ) + } + }; + let single_str = if shared.clone() { + wrap_shared_type(target.clone(), base.clone()) + } else { + base.clone() + }; + return single_str; } -let child_strs = Rc::new({ let mut __result = Vec::new(); for c in n.children.clone().iter().cloned() { __result.push(render_node_type(&child_type_node(&c), &target, &shared_types, &source_indices)); } __result }); -if (tn.clone().as_str() == tuple_type_name().as_str()) { - { - let multi_tuple_str = render_tuple_parts(&child_strs, target.clone()); -return multi_tuple_str -} + } + let child_strs = Rc::new({ + let mut __result = Vec::new(); + for c in n.children.clone().iter().cloned() { + __result.push(render_node_type( + &child_type_node(&c), + &target, + &shared_types, + &source_indices, + )); } -let type_base = coerce_primitive_type(target.clone(), tn.clone()); -let args_joined = child_strs.clone().join(&", ".to_string()); -let spec = language_spec(target.clone()); -let base = v2_rt::concat(v2_rt::concat(v2_rt::concat(type_base.clone(), spec.type_arg_open.clone()), args_joined), spec.type_arg_close.clone()); -if shared.clone() { - wrap_shared_type(target.clone(), base.clone()) - } else { - base.clone() + __result + }); + if (tn.clone().as_str() == tuple_type_name().as_str()) { + { + let multi_tuple_str = render_tuple_parts(&child_strs, target.clone()); + return multi_tuple_str; } -} + } + let type_base = coerce_primitive_type(target.clone(), tn.clone()); + let args_joined = child_strs.clone().join(&", ".to_string()); + let spec = language_spec(target.clone()); + let base = v2_rt::concat( + v2_rt::concat( + v2_rt::concat(type_base.clone(), spec.type_arg_open.clone()), + args_joined, + ), + spec.type_arg_close.clone(), + ); + if shared.clone() { + wrap_shared_type(target.clone(), base.clone()) + } else { + base.clone() + } }) } pub fn render_tuple_parts(parts: &Rc>, target: RenderTarget) -> String { { let spec = language_spec(target); -let ts = spec.tuple_syntax.clone(); -if ((parts.clone().len() as i64) > 0) { + let ts = spec.tuple_syntax.clone(); + if ((parts.clone().len() as i64) > 0) { if ((parts.clone().len() as i64) == 2) { match parts.clone().first().cloned() { - Some(p0) => match parts.clone().get(1 as usize).cloned() { - Some(p1) => apply_type_template2(ts.pair_template.clone(), p0.clone(), p1.clone()), - None => apply_type_template1(ts.multi_template.clone(), parts.clone().join(&ts.separator.clone())), -}, - None => apply_type_template1(ts.multi_template.clone(), parts.clone().join(&ts.separator.clone())), -} + Some(p0) => match parts.clone().get(1 as usize).cloned() { + Some(p1) => { + apply_type_template2(ts.pair_template.clone(), p0.clone(), p1.clone()) + } + None => apply_type_template1( + ts.multi_template.clone(), + parts.clone().join(&ts.separator.clone()), + ), + }, + None => apply_type_template1( + ts.multi_template.clone(), + parts.clone().join(&ts.separator.clone()), + ), + } } else { - apply_type_template1(ts.multi_template.clone(), parts.clone().join(&ts.separator.clone())) + apply_type_template1( + ts.multi_template.clone(), + parts.clone().join(&ts.separator.clone()), + ) } } else { ts.empty.clone() } -} + } } -pub fn is_type_alias_return_node(n: Rc, source_indices: Rc>>) -> bool { +pub fn is_type_alias_return_node( + n: Rc, + source_indices: Rc>>, +) -> bool { (authored_name_at(source_indices, &n).as_str() != "Unit".to_string().as_str()) } @@ -1169,7 +2214,25 @@ pub fn is_service_item(item: &Rc) -> bool { } pub fn has_service_items(typed: Rc) -> bool { - { let mut __found = false; for tm in typed.modules.clone().iter().cloned() { if { let mut __found = false; for item in tm.items.clone().iter().cloned() { if is_service_item(&item) { __found = true; break; } } __found } { __found = true; break; } } __found } + { + let mut __found = false; + for tm in typed.modules.clone().iter().cloned() { + if { + let mut __found = false; + for item in tm.items.clone().iter().cloned() { + if is_service_item(&item) { + __found = true; + break; + } + } + __found + } { + __found = true; + break; + } + } + __found + } } pub fn service_fallback_transport(item: &Rc) -> Rc { @@ -1182,76 +2245,144 @@ pub fn service_fallback_transport(item: &Rc) -> Rc { pub fn effective_operation_transport(op_node: Rc, fallback: Rc) -> Rc { match op_node.transport.clone() { - Some(op_transport) => op_transport.clone(), - None => fallback, -} + Some(op_transport) => op_transport.clone(), + None => fallback, + } } -pub fn service_has_rest(fallback_transport: Rc, op_children: Rc>>, source_indices: &Rc>>) -> bool { +pub fn service_has_rest( + fallback_transport: Rc, + op_children: Rc>>, + source_indices: &Rc>>, +) -> bool { { let from_fallback = is_rest_transport(fallback_transport, source_indices.clone()); -let from_ops = { let mut __found = false; for op in op_children.iter().cloned() { if if (op.transport.clone() != None) { - is_rest_transport(op.transport.clone().clone().unwrap(), source_indices.clone()) - } else { - false - } { __found = true; break; } } __found }; -(from_fallback || from_ops) -} + let from_ops = { + let mut __found = false; + for op in op_children.iter().cloned() { + if if (op.transport.clone() != None) { + is_rest_transport( + op.transport.clone().clone().unwrap(), + source_indices.clone(), + ) + } else { + false + } { + __found = true; + break; + } + } + __found + }; + (from_fallback || from_ops) + } } pub fn service_has_shell(fallback_transport: Rc, op_children: Rc>>) -> bool { { let from_fallback = is_shell_transport(fallback_transport); -let from_ops = { let mut __found = false; for op in op_children.iter().cloned() { if if (op.transport.clone() != None) { - is_shell_transport(op.transport.clone().clone().unwrap()) - } else { - false - } { __found = true; break; } } __found }; -(from_fallback || from_ops) -} + let from_ops = { + let mut __found = false; + for op in op_children.iter().cloned() { + if if (op.transport.clone() != None) { + is_shell_transport(op.transport.clone().clone().unwrap()) + } else { + false + } { + __found = true; + break; + } + } + __found + }; + (from_fallback || from_ops) + } } -pub fn service_has_file(fallback_transport: Rc, op_children: Rc>>, source_indices: &Rc>>) -> bool { +pub fn service_has_file( + fallback_transport: Rc, + op_children: Rc>>, + source_indices: &Rc>>, +) -> bool { { let from_fallback = is_file_transport(fallback_transport, source_indices.clone()); -let from_ops = { let mut __found = false; for op in op_children.iter().cloned() { if if (op.transport.clone() != None) { - is_file_transport(op.transport.clone().clone().unwrap(), source_indices.clone()) - } else { - false - } { __found = true; break; } } __found }; -(from_fallback || from_ops) -} + let from_ops = { + let mut __found = false; + for op in op_children.iter().cloned() { + if if (op.transport.clone() != None) { + is_file_transport( + op.transport.clone().clone().unwrap(), + source_indices.clone(), + ) + } else { + false + } { + __found = true; + break; + } + } + __found + }; + (from_fallback || from_ops) + } } -pub fn service_has_rest_auth(fallback_transport: &Rc, op_children: Rc>>, source_indices: &Rc>>) -> bool { +pub fn service_has_rest_auth( + fallback_transport: &Rc, + op_children: Rc>>, + source_indices: &Rc>>, +) -> bool { { - let fallback_is_rest = is_rest_transport(fallback_transport.clone(), source_indices.clone()); -let from_fallback = if fallback_is_rest { + let fallback_is_rest = + is_rest_transport(fallback_transport.clone(), source_indices.clone()); + let from_fallback = if fallback_is_rest { transport_has_auth(fallback_transport.clone(), source_indices.clone()) } else { false }; -let from_ops = { let mut __found = false; for op in op_children.iter().cloned() { if if (op.transport.clone() != None) { - { - let t = op.transport.clone().clone().unwrap(); -if is_rest_transport(t.clone(), source_indices.clone()) { - transport_has_auth(t.clone(), source_indices.clone()) + let from_ops = { + let mut __found = false; + for op in op_children.iter().cloned() { + if if (op.transport.clone() != None) { + { + let t = op.transport.clone().clone().unwrap(); + if is_rest_transport(t.clone(), source_indices.clone()) { + transport_has_auth(t.clone(), source_indices.clone()) + } else { + false + } + } } else { false + } { + __found = true; + break; } -} - } else { - false - } { __found = true; break; } } __found }; -(from_fallback || from_ops) -} + } + __found + }; + (from_fallback || from_ops) + } } -pub fn extract_modifier_names(properties: Rc>>, source_indices: Rc>>) -> Rc> { - Rc::new({ let mut __result = Vec::new(); for p in properties.iter().cloned() { __result.extend((*match field_init_operation_modifier(p.clone(), source_indices.clone()) { - Some(modifier) => Rc::new(vec![operation_modifier_name(modifier.clone())]), - None => Rc::new(vec![]), -}).iter().cloned()); } __result }) +pub fn extract_modifier_names( + properties: Rc>>, + source_indices: Rc>>, +) -> Rc> { + Rc::new({ + let mut __result = Vec::new(); + for p in properties.iter().cloned() { + __result.extend( + (*match field_init_operation_modifier(p.clone(), source_indices.clone()) { + Some(modifier) => Rc::new(vec![operation_modifier_name(modifier.clone())]), + None => Rc::new(vec![]), + }) + .iter() + .cloned(), + ); + } + __result + }) } #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] @@ -1262,70 +2393,93 @@ pub struct ServiceFieldSet { pub has_auth: bool, } -pub fn compute_service_fields(fallback_transport: &Rc, op_children: &Rc>>, source_indices: &Rc>>) -> ServiceFieldSet { +pub fn compute_service_fields( + fallback_transport: &Rc, + op_children: &Rc>>, + source_indices: &Rc>>, +) -> ServiceFieldSet { ServiceFieldSet { - has_rest: service_has_rest(fallback_transport.clone(), op_children.clone(), &source_indices), - has_shell: service_has_shell(fallback_transport.clone(), op_children.clone()), - has_file: service_has_file(fallback_transport.clone(), op_children.clone(), &source_indices), - has_auth: service_has_rest_auth(&fallback_transport, op_children.clone(), &source_indices), -} + has_rest: service_has_rest( + fallback_transport.clone(), + op_children.clone(), + &source_indices, + ), + has_shell: service_has_shell(fallback_transport.clone(), op_children.clone()), + has_file: service_has_file( + fallback_transport.clone(), + op_children.clone(), + &source_indices, + ), + has_auth: service_has_rest_auth(&fallback_transport, op_children.clone(), &source_indices), + } } pub fn service_field_decls(fs: &ServiceFieldSet, t: &Rc) -> Rc> { { let result = Rc::new(vec![]); -let result = if fs.has_rest.clone() { + let result = if fs.has_rest.clone() { v2_rt::concat(result.clone(), Rc::new(vec![t.rest_decl.clone()])) } else { result.clone() }; -let result = if fs.has_auth.clone() { + let result = if fs.has_auth.clone() { v2_rt::concat(result.clone(), Rc::new(vec![t.auth_decl.clone()])) } else { result.clone() }; -let result = if fs.has_shell.clone() { + let result = if fs.has_shell.clone() { v2_rt::concat(result.clone(), Rc::new(vec![t.shell_decl.clone()])) } else { result.clone() }; -let result = if fs.has_file.clone() { + let result = if fs.has_file.clone() { v2_rt::concat(result.clone(), Rc::new(vec![t.file_decl.clone()])) } else { result.clone() }; -result.clone() -} + result.clone() + } } pub fn service_field_ctors(fs: &ServiceFieldSet, t: &Rc) -> Rc> { { let result = Rc::new(vec![]); -let result = if fs.has_rest.clone() { + let result = if fs.has_rest.clone() { v2_rt::concat(result.clone(), Rc::new(vec![t.rest_ctor.clone()])) } else { result.clone() }; -let result = if fs.has_auth.clone() { + let result = if fs.has_auth.clone() { v2_rt::concat(result.clone(), Rc::new(vec![t.auth_ctor.clone()])) } else { result.clone() }; -let result = if fs.has_shell.clone() { + let result = if fs.has_shell.clone() { v2_rt::concat(result.clone(), Rc::new(vec![t.shell_ctor.clone()])) } else { result.clone() }; -let result = if fs.has_file.clone() { + let result = if fs.has_file.clone() { v2_rt::concat(result.clone(), Rc::new(vec![t.file_ctor.clone()])) } else { result.clone() }; -result.clone() -} + result.clone() + } } -pub fn emit_unified_transport_dispatch(transport: &Rc, op_name: String, source_indices: &Rc>>, depth: i64, target: RenderTarget, render_rest: impl Fn(String, Rc, i64, Rc>>) -> String + Clone, render_shell: impl Fn(String, Rc, i64, Rc>>) -> String + Clone, render_file: impl Fn(String, i64) -> String + Clone, render_local: impl Fn(String, i64) -> String + Clone) -> String { +pub fn emit_unified_transport_dispatch( + transport: &Rc, + op_name: String, + source_indices: &Rc>>, + depth: i64, + target: RenderTarget, + render_rest: impl Fn(String, Rc, i64, Rc>>) -> String + Clone, + render_shell: impl Fn(String, Rc, i64, Rc>>) -> String + + Clone, + render_file: impl Fn(String, i64) -> String + Clone, + render_local: impl Fn(String, i64) -> String + Clone, +) -> String { if is_rest_transport(transport.clone(), source_indices.clone()) { render_rest(op_name, transport.clone(), depth, source_indices.clone()) } else { @@ -1345,56 +2499,167 @@ pub fn emit_unified_transport_dispatch(transport: &Rc, op_name: String, so } } -pub fn emit_unified_operation_method(service_name: String, fallback_transport: Rc, op_node: &Rc, target: &RenderTarget, registry: Rc>>, env: &Rc, render_transport_body: impl Fn(Rc, String, Rc>>, i64) -> String + Clone) -> String { +pub fn emit_unified_operation_method( + service_name: String, + fallback_transport: Rc, + op_node: &Rc, + target: &RenderTarget, + registry: Rc>>, + env: &Rc, + render_transport_body: impl Fn(Rc, String, Rc>>, i64) -> String + + Clone, +) -> String { { let spec = language_spec(target.clone()); -let si = env.source_indices.clone(); -let op_text = authored_name(env.clone(), op_node.clone()); -let params_str = emit_params_shared(op_node.params.clone(), &target, si.clone()); -let sp = service_self_param(spec.clone()); -let all_params = if (sp.clone().as_str() == "".to_string().as_str()) { + let si = env.source_indices.clone(); + let op_text = authored_name(env.clone(), op_node.clone()); + let params_str = emit_params_shared(op_node.params.clone(), &target, si.clone()); + let sp = service_self_param(spec.clone()); + let all_params = if (sp.clone().as_str() == "".to_string().as_str()) { params_str.clone() } else { if (params_str.clone().as_str() == "".to_string().as_str()) { sp.clone() } else { - v2_rt::concat(v2_rt::concat(sp.clone(), ", ".to_string()), params_str.clone()) + v2_rt::concat( + v2_rt::concat(sp.clone(), ", ".to_string()), + params_str.clone(), + ) } }; -let receiver_str = service_receiver_str(spec.clone(), service_name); -let method_depth = service_method_depth(spec.clone()); -let ret_type = emit_node_type(resolved_type(op_node.clone()), target.clone(), si.clone()); -let ret_str = service_return_str(&spec, ret_type); -let method_name = match (*spec.visibility.clone()).clone() { - VisibilitySpec::CaseVisibility { .. } => emit_export_ident(op_text.clone(), &target), - _ => emit_ident(op_text.clone(), target.clone()), -}; -let eff_transport = effective_operation_transport(op_node.clone(), fallback_transport); -let body = render_transport_body(eff_transport, op_text.clone(), si.clone(), (method_depth.clone() + 1)); -let sig = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(spec.items.clone().async_prefix.clone(), spec.items.clone().func_keyword.clone()), " ".to_string()), receiver_str), method_name), "(".to_string()), all_params), ")".to_string()), ret_str); -if spec.block_syntax.clone().significant_whitespace.clone() { - v2_rt::concat(v2_rt::concat(v2_rt::concat(sig, spec.block_syntax.clone().block_open.clone()), make_indent((method_depth.clone() + 1))), body) + let receiver_str = service_receiver_str(spec.clone(), service_name); + let method_depth = service_method_depth(spec.clone()); + let ret_type = emit_node_type(resolved_type(op_node.clone()), target.clone(), si.clone()); + let ret_str = service_return_str(&spec, ret_type); + let method_name = match (*spec.visibility.clone()).clone() { + VisibilitySpec::CaseVisibility { .. } => emit_export_ident(op_text.clone(), &target), + _ => emit_ident(op_text.clone(), target.clone()), + }; + let eff_transport = effective_operation_transport(op_node.clone(), fallback_transport); + let body = render_transport_body( + eff_transport, + op_text.clone(), + si.clone(), + (method_depth.clone() + 1), + ); + let sig = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + spec.items.clone().async_prefix.clone(), + spec.items.clone().func_keyword.clone(), + ), + " ".to_string(), + ), + receiver_str, + ), + method_name, + ), + "(".to_string(), + ), + all_params, + ), + ")".to_string(), + ), + ret_str, + ); + if spec.block_syntax.clone().significant_whitespace.clone() { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(sig, spec.block_syntax.clone().block_open.clone()), + make_indent((method_depth.clone() + 1)), + ), + body, + ) } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(sig, spec.block_syntax.clone().block_open.clone()), body), "\n".to_string()), make_indent(method_depth.clone())), spec.block_syntax.clone().block_close.clone()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(sig, spec.block_syntax.clone().block_open.clone()), + body, + ), + "\n".to_string(), + ), + make_indent(method_depth.clone()), + ), + spec.block_syntax.clone().block_close.clone(), + ) } -} + } } -pub fn emit_unified_service_def(item: &Rc, target: &RenderTarget, registry: Rc>>, env: &Rc, render_service_fields: impl Fn(String, Rc, Rc>>, Rc>>) -> String + Clone, render_transport_body: impl Fn(Rc, String, Rc>>, i64) -> String + Clone) -> String { +pub fn emit_unified_service_def( + item: &Rc, + target: &RenderTarget, + registry: Rc>>, + env: &Rc, + render_service_fields: impl Fn(String, Rc, Rc>>, Rc>>) -> String + + Clone, + render_transport_body: impl Fn(Rc, String, Rc>>, i64) -> String + + Clone, +) -> String { { let spec = language_spec(target.clone()); -let safe_name = sanitize_service_name(authored_name(env.clone(), item.clone())); -let transport = service_fallback_transport(&item); -let op_children = item.children.clone(); -let fields_str = render_service_fields(safe_name.clone(), transport.clone(), op_children.clone(), env.source_indices.clone()); -let methods = Rc::new({ let mut __result = Vec::new(); for op_node in op_children.clone().iter().cloned() { __result.push(emit_unified_operation_method(safe_name.clone(), transport.clone(), &op_node, &target, registry.clone(), &env, render_transport_body.clone())); } __result }); -let methods_str = methods.join(&"\n\n".to_string()); -if service_methods_inside_class(spec.clone()) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(spec.items.clone().struct_keyword.clone(), " ".to_string()), safe_name.clone()), ":\n".to_string()), make_indent(1)), fields_str), "\n\n".to_string()), make_indent(1)), methods_str) + let safe_name = sanitize_service_name(authored_name(env.clone(), item.clone())); + let transport = service_fallback_transport(&item); + let op_children = item.children.clone(); + let fields_str = render_service_fields( + safe_name.clone(), + transport.clone(), + op_children.clone(), + env.source_indices.clone(), + ); + let methods = Rc::new({ + let mut __result = Vec::new(); + for op_node in op_children.clone().iter().cloned() { + __result.push(emit_unified_operation_method( + safe_name.clone(), + transport.clone(), + &op_node, + &target, + registry.clone(), + &env, + render_transport_body.clone(), + )); + } + __result + }); + let methods_str = methods.join(&"\n\n".to_string()); + if service_methods_inside_class(spec.clone()) { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + spec.items.clone().struct_keyword.clone(), + " ".to_string(), + ), + safe_name.clone(), + ), + ":\n".to_string(), + ), + make_indent(1), + ), + fields_str, + ), + "\n\n".to_string(), + ), + make_indent(1), + ), + methods_str, + ) } else { v2_rt::concat(v2_rt::concat(fields_str, "\n\n".to_string()), methods_str) } -} + } } pub fn is_type_def_item(item: &Rc) -> bool { @@ -1402,15 +2667,29 @@ pub fn is_type_def_item(item: &Rc) -> bool { } pub fn is_bare_leaf_item(item: &Rc) -> bool { - (((((item.connective.clone() == Connective::NoConnective) && (item.body.clone() == None)) && ((item.params.clone().len() as i64) == 0)) && (item.transport.clone() == None)) && ((item.children.clone().len() as i64) == 0)) + (((((item.connective.clone() == Connective::NoConnective) && (item.body.clone() == None)) + && ((item.params.clone().len() as i64) == 0)) + && (item.transport.clone() == None)) + && ((item.children.clone().len() as i64) == 0)) } -pub fn is_type_alias_item(item: &Rc, source_indices: Rc>>) -> bool { - (is_bare_leaf_item(&item) && is_type_alias_return_node(resolved_type(item.clone()), source_indices)) +pub fn is_type_alias_item( + item: &Rc, + source_indices: Rc>>, +) -> bool { + (is_bare_leaf_item(&item) + && is_type_alias_return_node(resolved_type(item.clone()), source_indices)) } -pub fn is_type_decl_item(item: &Rc, source_indices: Rc>>) -> bool { - ((is_bare_leaf_item(&item) && !is_type_alias_return_node(resolved_type(item.clone()), source_indices)) || (((((item.params.clone().len() as i64) > 0) && (item.body.clone() == None)) && (item.transport.clone() == None)) && ((item.children.clone().len() as i64) == 0))) +pub fn is_type_decl_item( + item: &Rc, + source_indices: Rc>>, +) -> bool { + ((is_bare_leaf_item(&item) + && !is_type_alias_return_node(resolved_type(item.clone()), source_indices)) + || (((((item.params.clone().len() as i64) > 0) && (item.body.clone() == None)) + && (item.transport.clone() == None)) + && ((item.children.clone().len() as i64) == 0))) } pub fn is_function_item(item: &Rc) -> bool { @@ -1426,7 +2705,10 @@ pub fn is_service_def_item(item: &Rc) -> bool { } pub fn is_resource_def_item(item: &Rc) -> bool { - (((item.transport.clone() == None) && ((item.children.clone().len() as i64) > 0)) || ((((item.transport.clone() == None) && ((item.children.clone().len() as i64) == 0)) && ((item.properties.clone().len() as i64) > 0)) && (item.body.clone() == None))) + (((item.transport.clone() == None) && ((item.children.clone().len() as i64) > 0)) + || ((((item.transport.clone() == None) && ((item.children.clone().len() as i64) == 0)) + && ((item.properties.clone().len() as i64) > 0)) + && (item.body.clone() == None))) } #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] @@ -1442,30 +2724,30 @@ pub enum ExprCategory { pub fn classify_expr(texpr: Rc) -> ExprCategory { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprLiteral { .. } => ExprCategory::ExprCatLeaf, - ExprData::ExprError { .. } => ExprCategory::ExprCatLeaf, - ExprData::ExprVar { .. } => ExprCategory::ExprCatLeaf, - ExprData::ExprFieldAccess { .. } => ExprCategory::ExprCatCompound, - ExprData::ExprCall { .. } => ExprCategory::ExprCatCompound, - ExprData::ExprMethodCall { .. } => ExprCategory::ExprCatCompound, - ExprData::ExprRecordLit { .. } => ExprCategory::ExprCatCompound, - ExprData::ExprListLit => ExprCategory::ExprCatCompound, - ExprData::ExprBinOp { .. } => ExprCategory::ExprCatCompound, - ExprData::ExprUnaryOp { .. } => ExprCategory::ExprCatCompound, - ExprData::ExprLambda => ExprCategory::ExprCatCompound, - ExprData::ExprStringInterp => ExprCategory::ExprCatCompound, - ExprData::ExprCast => ExprCategory::ExprCatCompound, - ExprData::ExprIndex => ExprCategory::ExprCatCompound, - ExprData::ExprSlice => ExprCategory::ExprCatCompound, - ExprData::ExprMatch => ExprCategory::ExprCatControlFlow, - ExprData::ExprIf => ExprCategory::ExprCatControlFlow, - ExprData::ExprForEach => ExprCategory::ExprCatControlFlow, - ExprData::ExprBlock => ExprCategory::ExprCatControlFlow, - ExprData::ExprLet => ExprCategory::ExprCatBinding, - ExprData::ExprReturn => ExprCategory::ExprCatControlFlow, - ExprData::NoExprData => ExprCategory::ExprCatNone, - _ => ExprCategory::ExprCatNone, -} + ExprData::ExprLiteral { .. } => ExprCategory::ExprCatLeaf, + ExprData::ExprError { .. } => ExprCategory::ExprCatLeaf, + ExprData::ExprVar { .. } => ExprCategory::ExprCatLeaf, + ExprData::ExprFieldAccess { .. } => ExprCategory::ExprCatCompound, + ExprData::ExprCall { .. } => ExprCategory::ExprCatCompound, + ExprData::ExprMethodCall { .. } => ExprCategory::ExprCatCompound, + ExprData::ExprRecordLit { .. } => ExprCategory::ExprCatCompound, + ExprData::ExprListLit => ExprCategory::ExprCatCompound, + ExprData::ExprBinOp { .. } => ExprCategory::ExprCatCompound, + ExprData::ExprUnaryOp { .. } => ExprCategory::ExprCatCompound, + ExprData::ExprLambda => ExprCategory::ExprCatCompound, + ExprData::ExprStringInterp => ExprCategory::ExprCatCompound, + ExprData::ExprCast => ExprCategory::ExprCatCompound, + ExprData::ExprIndex => ExprCategory::ExprCatCompound, + ExprData::ExprSlice => ExprCategory::ExprCatCompound, + ExprData::ExprMatch => ExprCategory::ExprCatControlFlow, + ExprData::ExprIf => ExprCategory::ExprCatControlFlow, + ExprData::ExprForEach => ExprCategory::ExprCatControlFlow, + ExprData::ExprBlock => ExprCategory::ExprCatControlFlow, + ExprData::ExprLet => ExprCategory::ExprCatBinding, + ExprData::ExprReturn => ExprCategory::ExprCatControlFlow, + ExprData::NoExprData => ExprCategory::ExprCatNone, + _ => ExprCategory::ExprCatNone, + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -1484,25 +2766,26 @@ pub enum FuncBodyShape { }, } -pub fn classify_func_body(body: &Rc, source_indices: Rc>>) -> Rc { +pub fn classify_func_body( + body: &Rc, + source_indices: Rc>>, +) -> Rc { match (*body.expr_data.clone()).clone() { - ExprData::ExprLet => { - let n = let_binding_name_at(body.clone(), source_indices); -let v = let_value(body.clone()); -let rest = let_body(body.clone()); -Rc::new(FuncBodyShape::FuncBodyLet { - name: n, - value: v, - rest: rest, -}) -}, - ExprData::ExprBlock => Rc::new(FuncBodyShape::FuncBodyBlock { - stmts: body.children.clone(), -}), - _ => Rc::new(FuncBodyShape::FuncBodyExpr { - expr: body.clone(), -}), -} + ExprData::ExprLet => { + let n = let_binding_name_at(body.clone(), source_indices); + let v = let_value(body.clone()); + let rest = let_body(body.clone()); + Rc::new(FuncBodyShape::FuncBodyLet { + name: n, + value: v, + rest: rest, + }) + } + ExprData::ExprBlock => Rc::new(FuncBodyShape::FuncBodyBlock { + stmts: body.children.clone(), + }), + _ => Rc::new(FuncBodyShape::FuncBodyExpr { expr: body.clone() }), + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -1534,446 +2817,1258 @@ pub enum TcoExprShape { }, } -pub fn classify_tco_expr(texpr: &Rc, source_indices: Rc>>) -> Rc { +pub fn classify_tco_expr( + texpr: &Rc, + source_indices: Rc>>, +) -> Rc { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => Rc::new(TcoExprShape::TcoCall { - func: expr_call_func_at(texpr.clone(), source_indices), - args: texpr.children.clone(), -}), - ExprData::ExprIf => { - let c = if_condition(texpr.clone()); -let t = if_then_branch(texpr.clone()); -let e = if_else_branch(texpr.clone()); -Rc::new(TcoExprShape::TcoIf { - condition: c, - then_branch: t, - else_branch: e, -}) -}, - ExprData::ExprMatch => { - let scrut = match_scrutinee(texpr.clone()); -let arm_list = match_arm_nodes(texpr.clone()); -Rc::new(TcoExprShape::TcoMatch { - scrutinee: scrut, - arms: arm_list, -}) -}, - ExprData::ExprLet => { - let n = let_binding_name_at(texpr.clone(), source_indices); -let v = let_value(texpr.clone()); -let bd = let_body(texpr.clone()); -Rc::new(TcoExprShape::TcoLet { - name: n, - value: v, - body: bd, -}) -}, - ExprData::ExprBlock => Rc::new(TcoExprShape::TcoBlock { - stmts: texpr.children.clone(), -}), - _ => Rc::new(TcoExprShape::TcoOther { - expr: texpr.clone(), -}), -} + ExprData::ExprCall { .. } => Rc::new(TcoExprShape::TcoCall { + func: expr_call_func_at(texpr.clone(), source_indices), + args: texpr.children.clone(), + }), + ExprData::ExprIf => { + let c = if_condition(texpr.clone()); + let t = if_then_branch(texpr.clone()); + let e = if_else_branch(texpr.clone()); + Rc::new(TcoExprShape::TcoIf { + condition: c, + then_branch: t, + else_branch: e, + }) + } + ExprData::ExprMatch => { + let scrut = match_scrutinee(texpr.clone()); + let arm_list = match_arm_nodes(texpr.clone()); + Rc::new(TcoExprShape::TcoMatch { + scrutinee: scrut, + arms: arm_list, + }) + } + ExprData::ExprLet => { + let n = let_binding_name_at(texpr.clone(), source_indices); + let v = let_value(texpr.clone()); + let bd = let_body(texpr.clone()); + Rc::new(TcoExprShape::TcoLet { + name: n, + value: v, + body: bd, + }) + } + ExprData::ExprBlock => Rc::new(TcoExprShape::TcoBlock { + stmts: texpr.children.clone(), + }), + _ => Rc::new(TcoExprShape::TcoOther { + expr: texpr.clone(), + }), + } } pub fn block_stmts_init(stmts: &Rc>>) -> Rc>> { if ((stmts.clone().len() as i64) <= 1) { Rc::new(vec![]) } else { - Rc::new(stmts.clone().iter().cloned().take(((stmts.clone().len() as i64) - 1) as usize).collect::>()) + Rc::new( + stmts + .clone() + .iter() + .cloned() + .take(((stmts.clone().len() as i64) - 1) as usize) + .collect::>(), + ) } } -pub fn is_tco_eligible(name: &String, body: &Rc, registry: Rc>>, source_indices: &Rc>>) -> bool { +pub fn is_tco_eligible( + name: &String, + body: &Rc, + registry: Rc>>, + source_indices: &Rc>>, +) -> bool { match lookup_item(registry, name.clone()) { - Some(info) => (info.is_self_recursive.clone() && (info.has_non_tail_self_call.clone() == false)), - None => (expr_has_self_call(&body, &name, &source_indices) && (expr_has_non_tail_self_call(&body, &name, true, &source_indices) == false)), -} + Some(info) => { + (info.is_self_recursive.clone() && (info.has_non_tail_self_call.clone() == false)) + } + None => { + (expr_has_self_call(&body, &name, &source_indices) + && (expr_has_non_tail_self_call(&body, &name, true, &source_indices) == false)) + } + } } -pub fn is_self_recursive(name: &String, body: Rc, registry: Rc>>, source_indices: Rc>>) -> bool { +pub fn is_self_recursive( + name: &String, + body: Rc, + registry: Rc>>, + source_indices: Rc>>, +) -> bool { match lookup_item(registry, name.clone()) { - Some(info) => info.is_self_recursive.clone(), - None => expr_has_self_call(&body, &name, &source_indices), -} + Some(info) => info.is_self_recursive.clone(), + None => expr_has_self_call(&body, &name, &source_indices), + } } -pub fn tco_reassign_core(ordered_args: Rc>, param_names: Rc>, temp_var_prefix: String, temp_decl_prefix: String, temp_assign_op: String, stmt_terminator: String, continue_str: String, line_prefix: &String) -> Rc> { +pub fn tco_reassign_core( + ordered_args: Rc>, + param_names: Rc>, + temp_var_prefix: String, + temp_decl_prefix: String, + temp_assign_op: String, + stmt_terminator: String, + continue_str: String, + line_prefix: &String, +) -> Rc> { { - let temp_lets = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(ordered_args.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(line_prefix.clone(), temp_decl_prefix.clone()), temp_var_prefix.clone()), (pair.0.clone()).to_string()), temp_assign_op.clone()), pair.1.clone()), stmt_terminator.clone())); } __result }); -let assigns = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(param_names.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(line_prefix.clone(), pair.1.clone()), " = ".to_string()), temp_var_prefix.clone()), (pair.0.clone()).to_string()), stmt_terminator.clone())); } __result }); -v2_rt::concat(v2_rt::concat(temp_lets, assigns), Rc::new(vec![v2_rt::concat(line_prefix.clone(), continue_str)])) -} + let temp_lets = Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + ordered_args + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + __result.push(v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(line_prefix.clone(), temp_decl_prefix.clone()), + temp_var_prefix.clone(), + ), + (pair.0.clone()).to_string(), + ), + temp_assign_op.clone(), + ), + pair.1.clone(), + ), + stmt_terminator.clone(), + )); + } + __result + }); + let assigns = Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + param_names + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + __result.push(v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(line_prefix.clone(), pair.1.clone()), + " = ".to_string(), + ), + temp_var_prefix.clone(), + ), + (pair.0.clone()).to_string(), + ), + stmt_terminator.clone(), + )); + } + __result + }); + v2_rt::concat( + v2_rt::concat(temp_lets, assigns), + Rc::new(vec![v2_rt::concat(line_prefix.clone(), continue_str)]), + ) + } } -pub fn emit_shared_tco_expr(mut frame: Rc, mut fn_name: String, mut emit_self_call_reassign: impl Fn(Rc) -> String + Clone, mut emit_non_self_call: impl Fn(Rc) -> String + Clone, mut emit_if: impl Fn(Rc) -> String + Clone, mut emit_match: impl Fn(Rc) -> String + Clone, mut emit_let: impl Fn(Rc) -> String + Clone, mut emit_block: impl Fn(Rc) -> String + Clone, mut emit_default_return: impl Fn(Rc) -> String + Clone) -> String { +pub fn emit_shared_tco_expr( + mut frame: Rc, + mut fn_name: String, + mut emit_self_call_reassign: impl Fn(Rc) -> String + Clone, + mut emit_non_self_call: impl Fn(Rc) -> String + Clone, + mut emit_if: impl Fn(Rc) -> String + Clone, + mut emit_match: impl Fn(Rc) -> String + Clone, + mut emit_let: impl Fn(Rc) -> String + Clone, + mut emit_block: impl Fn(Rc) -> String + Clone, + mut emit_default_return: impl Fn(Rc) -> String + Clone, +) -> String { loop { let si = frame.scope.clone().type_env.clone().source_indices.clone(); -match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { if (expr_call_func_at(frame.expr.clone(), si).as_str() == fn_name.as_str()) { - break emit_self_call_reassign(Rc::new(TcoReassignInput { - args: frame.expr.clone().children.clone(), - scope: frame.scope.clone(), - depth: frame.depth.clone(), -})); -} else { - break emit_non_self_call(frame.clone()); -} }, - ExprData::ExprReturn => { let inner = return_value(frame.expr.clone()); -{ - let __tco_0 = Rc::new(TcoFrame { - expr: inner, - scope: frame.scope.clone(), - depth: frame.depth.clone(), -}); -frame = __tco_0; -continue; -} }, - ExprData::ExprIf => { break emit_if(frame.clone()); }, - ExprData::ExprMatch => { break emit_match(frame.clone()); }, - ExprData::ExprLet => { break emit_let(frame.clone()); }, - ExprData::ExprBlock => { break emit_block(frame.clone()); }, - _ => { break emit_default_return(frame.clone()); }, -} -} + match (*frame.expr.clone().expr_data.clone()).clone() { + ExprData::ExprCall { .. } => { + if (expr_call_func_at(frame.expr.clone(), si).as_str() == fn_name.as_str()) { + break emit_self_call_reassign(Rc::new(TcoReassignInput { + args: frame.expr.clone().children.clone(), + scope: frame.scope.clone(), + depth: frame.depth.clone(), + })); + } else { + break emit_non_self_call(frame.clone()); + } + } + ExprData::ExprReturn => { + let inner = return_value(frame.expr.clone()); + { + let __tco_0 = Rc::new(TcoFrame { + expr: inner, + scope: frame.scope.clone(), + depth: frame.depth.clone(), + }); + frame = __tco_0; + continue; + } + } + ExprData::ExprIf => { + break emit_if(frame.clone()); + } + ExprData::ExprMatch => { + break emit_match(frame.clone()); + } + ExprData::ExprLet => { + break emit_let(frame.clone()); + } + ExprData::ExprBlock => { + break emit_block(frame.clone()); + } + _ => { + break emit_default_return(frame.clone()); + } + } + } } pub fn shared_tco_body(inner: String, depth: i64, spec: &Rc) -> String { { let syntax = spec.block_syntax.clone(); -let tco = spec.tco.clone(); -if syntax.significant_whitespace.clone() { - v2_rt::concat(v2_rt::concat(v2_rt::concat(tco.loop_keyword.clone(), syntax.block_open.clone()), make_indent((depth + 1))), inner) + let tco = spec.tco.clone(); + if syntax.significant_whitespace.clone() { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(tco.loop_keyword.clone(), syntax.block_open.clone()), + make_indent((depth + 1)), + ), + inner, + ) } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(tco.loop_keyword.clone(), syntax.block_open.clone()), make_indent((depth + 1))), inner), "\n".to_string()), syntax.block_close.clone()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(tco.loop_keyword.clone(), syntax.block_open.clone()), + make_indent((depth + 1)), + ), + inner, + ), + "\n".to_string(), + ), + syntax.block_close.clone(), + ) } -} + } } -pub fn shared_tco_default_return(frame: &Rc, spec: Rc, recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone) -> String { +pub fn shared_tco_default_return( + frame: &Rc, + spec: Rc, + recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, +) -> String { { let val_str = recurse_expr(frame.expr.clone(), frame.scope.clone(), frame.depth.clone()); -v2_rt::concat(v2_rt::concat(spec.tco.clone().break_return.clone(), " ".to_string()), val_str) -} + v2_rt::concat( + v2_rt::concat(spec.tco.clone().break_return.clone(), " ".to_string()), + val_str, + ) + } } -pub fn shared_tco_non_self_call(frame: &Rc, target: RenderTarget, spec: Rc, recurse_call: impl Fn(String, Rc>>, Rc, i64) -> String + Clone) -> String { +pub fn shared_tco_non_self_call( + frame: &Rc, + target: RenderTarget, + spec: Rc, + recurse_call: impl Fn(String, Rc>>, Rc, i64) -> String + Clone, +) -> String { match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let f = expr_call_func_at(frame.expr.clone(), frame.scope.clone().type_env.clone().source_indices.clone()); -let call_str = recurse_call(f, frame.expr.clone().children.clone(), frame.scope.clone(), frame.depth.clone()); -v2_rt::concat(v2_rt::concat(spec.tco.clone().break_return.clone(), " ".to_string()), call_str) -}, - _ => emit_error_expr("shared_tco_non_self_call expected ExprCall".to_string(), target), -} + ExprData::ExprCall { .. } => { + let f = expr_call_func_at( + frame.expr.clone(), + frame.scope.clone().type_env.clone().source_indices.clone(), + ); + let call_str = recurse_call( + f, + frame.expr.clone().children.clone(), + frame.scope.clone(), + frame.depth.clone(), + ); + v2_rt::concat( + v2_rt::concat(spec.tco.clone().break_return.clone(), " ".to_string()), + call_str, + ) + } + _ => emit_error_expr( + "shared_tco_non_self_call expected ExprCall".to_string(), + target, + ), + } } -pub fn shared_tco_if(frame: &Rc, fn_name: String, params: Rc>>, target: RenderTarget, spec: Rc, recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, recurse_tco: impl Fn(Rc, Rc, i64) -> String + Clone) -> String { +pub fn shared_tco_if( + frame: &Rc, + fn_name: String, + params: Rc>>, + target: RenderTarget, + spec: Rc, + recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, + recurse_tco: impl Fn(Rc, Rc, i64) -> String + Clone, +) -> String { { let syntax = spec.block_syntax.clone(); -match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprIf => { - let c = if_condition(frame.expr.clone()); -let t = if_then_branch(frame.expr.clone()); -let e = if_else_branch(frame.expr.clone()); -let cond_str = recurse_expr(c, frame.scope.clone(), frame.depth.clone()); -let then_str = recurse_tco(t, frame.scope.clone(), (frame.depth.clone() + 1)); -let else_prefix = if syntax.significant_whitespace.clone() { - make_indent(frame.depth.clone()) - } else { - "".to_string() - }; -match e { - Some(eb) => { - let else_str = recurse_tco(eb.clone(), frame.scope.clone(), (frame.depth.clone() + 1)); -if syntax.significant_whitespace.clone() { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("if ".to_string(), cond_str), syntax.block_open.clone()), make_indent((frame.depth.clone() + 1))), then_str), "\n".to_string()), else_prefix), syntax.else_clause.clone()), make_indent((frame.depth.clone() + 1))), else_str) + match (*frame.expr.clone().expr_data.clone()).clone() { + ExprData::ExprIf => { + let c = if_condition(frame.expr.clone()); + let t = if_then_branch(frame.expr.clone()); + let e = if_else_branch(frame.expr.clone()); + let cond_str = recurse_expr(c, frame.scope.clone(), frame.depth.clone()); + let then_str = recurse_tco(t, frame.scope.clone(), (frame.depth.clone() + 1)); + let else_prefix = if syntax.significant_whitespace.clone() { + make_indent(frame.depth.clone()) } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("if ".to_string(), cond_str), syntax.block_open.clone()), make_indent((frame.depth.clone() + 1))), then_str), "\n".to_string()), syntax.else_clause.clone()), make_indent((frame.depth.clone() + 1))), else_str), "\n".to_string()), syntax.block_close.clone()) + "".to_string() + }; + match e { + Some(eb) => { + let else_str = + recurse_tco(eb.clone(), frame.scope.clone(), (frame.depth.clone() + 1)); + if syntax.significant_whitespace.clone() { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "if ".to_string(), + cond_str, + ), + syntax.block_open.clone(), + ), + make_indent((frame.depth.clone() + 1)), + ), + then_str, + ), + "\n".to_string(), + ), + else_prefix, + ), + syntax.else_clause.clone(), + ), + make_indent((frame.depth.clone() + 1)), + ), + else_str, + ) + } else { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "if ".to_string(), + cond_str, + ), + syntax.block_open.clone(), + ), + make_indent((frame.depth.clone() + 1)), + ), + then_str, + ), + "\n".to_string(), + ), + syntax.else_clause.clone(), + ), + make_indent((frame.depth.clone() + 1)), + ), + else_str, + ), + "\n".to_string(), + ), + syntax.block_close.clone(), + ) + } + } + None => { + if syntax.significant_whitespace.clone() { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("if ".to_string(), cond_str), + syntax.block_open.clone(), + ), + make_indent((frame.depth.clone() + 1)), + ), + then_str, + ) + } else { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("if ".to_string(), cond_str), + syntax.block_open.clone(), + ), + make_indent((frame.depth.clone() + 1)), + ), + then_str, + ), + "\n".to_string(), + ), + syntax.block_close.clone(), + ) + } + } } -}, - None => if syntax.significant_whitespace.clone() { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("if ".to_string(), cond_str), syntax.block_open.clone()), make_indent((frame.depth.clone() + 1))), then_str) - } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("if ".to_string(), cond_str), syntax.block_open.clone()), make_indent((frame.depth.clone() + 1))), then_str), "\n".to_string()), syntax.block_close.clone()) - }, -} -}, - _ => emit_error_expr("shared_tco_if expected ExprIf".to_string(), target), -} -} + } + _ => emit_error_expr("shared_tco_if expected ExprIf".to_string(), target), + } + } } -pub fn shared_tco_let(frame: &Rc, fn_name: String, params: Rc>>, target: RenderTarget, recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, recurse_tco: impl Fn(Rc, Rc, i64) -> String + Clone) -> String { +pub fn shared_tco_let( + frame: &Rc, + fn_name: String, + params: Rc>>, + target: RenderTarget, + recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, + recurse_tco: impl Fn(Rc, Rc, i64) -> String + Clone, +) -> String { match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprLet => { - let n = let_binding_name_at(frame.expr.clone(), frame.scope.clone().type_env.clone().source_indices.clone()); -let v = let_value(frame.expr.clone()); -let bd = let_body(frame.expr.clone()); -let val_str = recurse_expr(v.clone(), frame.scope.clone(), frame.depth.clone()); -let let_line = emit_let_binding(n.clone(), val_str, &target); -let next_scope = extend_scope(&frame.scope.clone(), &n, resolved_type(v.clone()), Rc::new(SubValueRelation::SubValueUnknown)); -match bd { - Some(b) => v2_rt::concat(v2_rt::concat(let_line, "\n".to_string()), recurse_tco(b.clone(), next_scope, frame.depth.clone())), - None => let_line, -} -}, - _ => emit_error_expr("shared_tco_let expected ExprLet".to_string(), target), -} + ExprData::ExprLet => { + let n = let_binding_name_at( + frame.expr.clone(), + frame.scope.clone().type_env.clone().source_indices.clone(), + ); + let v = let_value(frame.expr.clone()); + let bd = let_body(frame.expr.clone()); + let val_str = recurse_expr(v.clone(), frame.scope.clone(), frame.depth.clone()); + let let_line = emit_let_binding(n.clone(), val_str, &target); + let next_scope = extend_scope( + &frame.scope.clone(), + &n, + resolved_type(v.clone()), + Rc::new(SubValueRelation::SubValueUnknown), + ); + match bd { + Some(b) => v2_rt::concat( + v2_rt::concat(let_line, "\n".to_string()), + recurse_tco(b.clone(), next_scope, frame.depth.clone()), + ), + None => let_line, + } + } + _ => emit_error_expr("shared_tco_let expected ExprLet".to_string(), target), + } } -pub fn shared_tco_block(frame: &Rc, fn_name: String, params: Rc>>, target: RenderTarget, spec: Rc, emit_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone, recurse_tco: impl Fn(Rc, Rc, i64) -> String + Clone) -> String { +pub fn shared_tco_block( + frame: &Rc, + fn_name: String, + params: Rc>>, + target: RenderTarget, + spec: Rc, + emit_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone, + recurse_tco: impl Fn(Rc, Rc, i64) -> String + Clone, +) -> String { match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprBlock => { - let ss = frame.expr.clone().children.clone(); -if ((ss.clone().len() as i64) == 0) { - spec.tco.clone().break_return.clone() - } else { - { - let init_state = emit_init_stmts(ss.clone(), frame.scope.clone(), frame.depth.clone()); -let last_str = match ss.clone().last().cloned() { - Some(last_expr) => recurse_tco(last_expr.clone(), init_state.scope.clone(), frame.depth.clone()), - None => spec.tco.clone().break_return.clone(), -}; -if ((init_state.text.clone().len() as i64) == 0) { - last_str - } else { - v2_rt::concat(v2_rt::concat(init_state.text.clone().join(&"\n".to_string()), "\n".to_string()), last_str) + ExprData::ExprBlock => { + let ss = frame.expr.clone().children.clone(); + if ((ss.clone().len() as i64) == 0) { + spec.tco.clone().break_return.clone() + } else { + { + let init_state = + emit_init_stmts(ss.clone(), frame.scope.clone(), frame.depth.clone()); + let last_str = match ss.clone().last().cloned() { + Some(last_expr) => recurse_tco( + last_expr.clone(), + init_state.scope.clone(), + frame.depth.clone(), + ), + None => spec.tco.clone().break_return.clone(), + }; + if ((init_state.text.clone().len() as i64) == 0) { + last_str + } else { + v2_rt::concat( + v2_rt::concat( + init_state.text.clone().join(&"\n".to_string()), + "\n".to_string(), + ), + last_str, + ) + } } -} + } } -}, - _ => emit_error_expr("shared_tco_block expected ExprBlock".to_string(), target), -} + _ => emit_error_expr("shared_tco_block expected ExprBlock".to_string(), target), + } } -pub fn shared_tco_reassign(ordered_args: Rc>, param_names: Rc>, spec: &Rc) -> String { +pub fn shared_tco_reassign( + ordered_args: Rc>, + param_names: Rc>, + spec: &Rc, +) -> String { { - let all_lines = tco_reassign_core(ordered_args, param_names, spec.tco.clone().temp_var_prefix.clone(), spec.tco.clone().temp_decl_prefix.clone(), spec.tco.clone().temp_assign_op.clone(), spec.block_syntax.clone().stmt_terminator.clone(), spec.tco.clone().continue_str.clone(), &"".to_string()); -all_lines.join(&"\n".to_string()) -} -} - -pub fn unified_tco_recurse(expr: Rc, scope: Rc, depth: i64, fn_name: String, params: Rc>>, target: RenderTarget, registry: Rc>>, recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, render_match: impl Fn(Rc) -> String + Clone, render_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone) -> String { - emit_unified_tco_expr(&Rc::new(TcoFrame { - expr: expr, - scope: scope, - depth: depth, -}), &fn_name, params, &target, registry, recurse_expr, render_match, render_init_stmts) + let all_lines = tco_reassign_core( + ordered_args, + param_names, + spec.tco.clone().temp_var_prefix.clone(), + spec.tco.clone().temp_decl_prefix.clone(), + spec.tco.clone().temp_assign_op.clone(), + spec.block_syntax.clone().stmt_terminator.clone(), + spec.tco.clone().continue_str.clone(), + &"".to_string(), + ); + all_lines.join(&"\n".to_string()) + } } -pub fn emit_unified_tco_expr(frame: &Rc, fn_name: &String, params: Rc>>, target: &RenderTarget, registry: Rc>>, recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, render_match: impl Fn(Rc) -> String + Clone, render_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone) -> String { +pub fn unified_tco_recurse( + expr: Rc, + scope: Rc, + depth: i64, + fn_name: String, + params: Rc>>, + target: RenderTarget, + registry: Rc>>, + recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, + render_match: impl Fn(Rc) -> String + Clone, + render_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone, +) -> String { + emit_unified_tco_expr( + &Rc::new(TcoFrame { + expr: expr, + scope: scope, + depth: depth, + }), + &fn_name, + params, + &target, + registry, + recurse_expr, + render_match, + render_init_stmts, + ) +} + +pub fn emit_unified_tco_expr( + frame: &Rc, + fn_name: &String, + params: Rc>>, + target: &RenderTarget, + registry: Rc>>, + recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, + render_match: impl Fn(Rc) -> String + Clone, + render_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone, +) -> String { { let spec = language_spec(target.clone()); -emit_shared_tco_expr(frame.clone(), fn_name.clone(), |input| emit_typed_tco_reassign_shared(input.args.clone(), params.clone(), &target, |child| recurse_expr(child.clone(), input.scope.clone(), input.depth.clone()), input.scope.clone().type_env.clone().source_indices.clone()), |frame| shared_tco_non_self_call(&frame, target.clone(), spec.clone(), |f, args, scope, depth| emit_typed_call_unified(&f, args.clone(), &target, registry.clone(), scope.clone(), |n| recurse_expr(n.clone(), scope.clone(), depth.clone()))), |frame| shared_tco_if(&frame, fn_name.clone(), params.clone(), target.clone(), spec.clone(), recurse_expr.clone(), |expr, scope, depth| unified_tco_recurse(expr.clone(), scope.clone(), depth.clone(), fn_name.clone(), params.clone(), target.clone(), registry.clone(), recurse_expr.clone(), render_match.clone(), render_init_stmts.clone())), render_match.clone(), |frame| shared_tco_let(&frame, fn_name.clone(), params.clone(), target.clone(), recurse_expr.clone(), |expr, scope, depth| unified_tco_recurse(expr.clone(), scope.clone(), depth.clone(), fn_name.clone(), params.clone(), target.clone(), registry.clone(), recurse_expr.clone(), render_match.clone(), render_init_stmts.clone())), |frame| shared_tco_block(&frame, fn_name.clone(), params.clone(), target.clone(), spec.clone(), render_init_stmts.clone(), |expr, scope, depth| unified_tco_recurse(expr.clone(), scope.clone(), depth.clone(), fn_name.clone(), params.clone(), target.clone(), registry.clone(), recurse_expr.clone(), render_match.clone(), render_init_stmts.clone())), |frame| shared_tco_default_return(&frame, spec.clone(), recurse_expr.clone())) -} + emit_shared_tco_expr( + frame.clone(), + fn_name.clone(), + |input| { + emit_typed_tco_reassign_shared( + input.args.clone(), + params.clone(), + &target, + |child| recurse_expr(child.clone(), input.scope.clone(), input.depth.clone()), + input.scope.clone().type_env.clone().source_indices.clone(), + ) + }, + |frame| { + shared_tco_non_self_call( + &frame, + target.clone(), + spec.clone(), + |f, args, scope, depth| { + emit_typed_call_unified( + &f, + args.clone(), + &target, + registry.clone(), + scope.clone(), + |n| recurse_expr(n.clone(), scope.clone(), depth.clone()), + ) + }, + ) + }, + |frame| { + shared_tco_if( + &frame, + fn_name.clone(), + params.clone(), + target.clone(), + spec.clone(), + recurse_expr.clone(), + |expr, scope, depth| { + unified_tco_recurse( + expr.clone(), + scope.clone(), + depth.clone(), + fn_name.clone(), + params.clone(), + target.clone(), + registry.clone(), + recurse_expr.clone(), + render_match.clone(), + render_init_stmts.clone(), + ) + }, + ) + }, + render_match.clone(), + |frame| { + shared_tco_let( + &frame, + fn_name.clone(), + params.clone(), + target.clone(), + recurse_expr.clone(), + |expr, scope, depth| { + unified_tco_recurse( + expr.clone(), + scope.clone(), + depth.clone(), + fn_name.clone(), + params.clone(), + target.clone(), + registry.clone(), + recurse_expr.clone(), + render_match.clone(), + render_init_stmts.clone(), + ) + }, + ) + }, + |frame| { + shared_tco_block( + &frame, + fn_name.clone(), + params.clone(), + target.clone(), + spec.clone(), + render_init_stmts.clone(), + |expr, scope, depth| { + unified_tco_recurse( + expr.clone(), + scope.clone(), + depth.clone(), + fn_name.clone(), + params.clone(), + target.clone(), + registry.clone(), + recurse_expr.clone(), + render_match.clone(), + render_init_stmts.clone(), + ) + }, + ) + }, + |frame| shared_tco_default_return(&frame, spec.clone(), recurse_expr.clone()), + ) + } } -pub fn emit_unified_tco_body(texpr: Rc, fn_name: String, params: Rc>>, target: &RenderTarget, registry: Rc>>, scope: Rc, depth: i64, recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, render_match: impl Fn(Rc) -> String + Clone, render_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone) -> String { +pub fn emit_unified_tco_body( + texpr: Rc, + fn_name: String, + params: Rc>>, + target: &RenderTarget, + registry: Rc>>, + scope: Rc, + depth: i64, + recurse_expr: impl Fn(Rc, Rc, i64) -> String + Clone, + render_match: impl Fn(Rc) -> String + Clone, + render_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone, +) -> String { { let spec = language_spec(target.clone()); -let inner = emit_unified_tco_expr(&Rc::new(TcoFrame { - expr: texpr, - scope: scope, - depth: (depth.clone() + 1), -}), &fn_name, params, &target, registry, recurse_expr, render_match, render_init_stmts); -shared_tco_body(inner, depth.clone(), &spec) -} + let inner = emit_unified_tco_expr( + &Rc::new(TcoFrame { + expr: texpr, + scope: scope, + depth: (depth.clone() + 1), + }), + &fn_name, + params, + &target, + registry, + recurse_expr, + render_match, + render_init_stmts, + ); + shared_tco_body(inner, depth.clone(), &spec) + } } -pub fn emit_unified_init_block_stmts(remaining: Rc>>, text: Rc>, scope: Rc, depth: i64, target: &RenderTarget, registry: Rc>>, render_pattern: impl Fn(Rc) -> String + Clone) -> Rc { +pub fn emit_unified_init_block_stmts( + remaining: Rc>>, + text: Rc>, + scope: Rc, + depth: i64, + target: &RenderTarget, + registry: Rc>>, + render_pattern: impl Fn(Rc) -> String + Clone, +) -> Rc { { - let prepend = if language_spec(target.clone()).block_syntax.clone().significant_whitespace.clone() { + let prepend = if language_spec(target.clone()) + .block_syntax + .clone() + .significant_whitespace + .clone() + { false } else { true }; -emit_init_block_stmts_shared(remaining, text, scope, depth, prepend, |stmt, sc, d| emit_unified_typed_expr(stmt.clone(), &target, registry.clone(), &sc, d.clone(), 1024, render_pattern.clone())) -} + emit_init_block_stmts_shared(remaining, text, scope, depth, prepend, |stmt, sc, d| { + emit_unified_typed_expr( + stmt.clone(), + &target, + registry.clone(), + &sc, + d.clone(), + 1024, + render_pattern.clone(), + ) + }) + } } -pub fn emit_unified_tco_match(frame: &Rc, fn_name: String, params: Rc>>, target: &RenderTarget, registry: &Rc>>, render_pattern: impl Fn(Rc) -> String + Clone, render_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone) -> String { +pub fn emit_unified_tco_match( + frame: &Rc, + fn_name: String, + params: Rc>>, + target: &RenderTarget, + registry: &Rc>>, + render_pattern: impl Fn(Rc) -> String + Clone, + render_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone, +) -> String { match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprMatch => { - let s = match_scrutinee(frame.expr.clone()); -let arm_list = match_arm_nodes(frame.expr.clone()); -let scrut_str = emit_unified_typed_expr(s, &target, registry.clone(), &frame.scope.clone(), frame.depth.clone(), 1024, render_pattern.clone()); -let arm_strs = Rc::new({ let mut __result = Vec::new(); for arm in arm_list.iter().cloned() { __result.push(emit_unified_tco_match_arm(&arm, &fn_name, ¶ms, &target, ®istry, &frame.scope.clone(), frame.depth.clone(), render_pattern.clone(), render_init_stmts.clone())); } __result }); -let arms_str = arm_strs.join(&"\n".to_string()); -let bs = language_spec(target.clone()).block_syntax.clone(); -if (bs.block_close.clone().as_str() == "".to_string().as_str()) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(bs.match_keyword.clone(), scrut_str), bs.block_open.clone()), arms_str) - } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(bs.match_keyword.clone(), scrut_str), bs.block_open.clone()), arms_str), "\n".to_string()), bs.block_close.clone()) + ExprData::ExprMatch => { + let s = match_scrutinee(frame.expr.clone()); + let arm_list = match_arm_nodes(frame.expr.clone()); + let scrut_str = emit_unified_typed_expr( + s, + &target, + registry.clone(), + &frame.scope.clone(), + frame.depth.clone(), + 1024, + render_pattern.clone(), + ); + let arm_strs = Rc::new({ + let mut __result = Vec::new(); + for arm in arm_list.iter().cloned() { + __result.push(emit_unified_tco_match_arm( + &arm, + &fn_name, + ¶ms, + &target, + ®istry, + &frame.scope.clone(), + frame.depth.clone(), + render_pattern.clone(), + render_init_stmts.clone(), + )); + } + __result + }); + let arms_str = arm_strs.join(&"\n".to_string()); + let bs = language_spec(target.clone()).block_syntax.clone(); + if (bs.block_close.clone().as_str() == "".to_string().as_str()) { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(bs.match_keyword.clone(), scrut_str), + bs.block_open.clone(), + ), + arms_str, + ) + } else { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(bs.match_keyword.clone(), scrut_str), + bs.block_open.clone(), + ), + arms_str, + ), + "\n".to_string(), + ), + bs.block_close.clone(), + ) + } } -}, - _ => emit_error_expr("emit_unified_tco_match expected ExprMatch".to_string(), target.clone()), -} + _ => emit_error_expr( + "emit_unified_tco_match expected ExprMatch".to_string(), + target.clone(), + ), + } } -pub fn emit_unified_tco_match_arm(arm: &Rc, fn_name: &String, params: &Rc>>, target: &RenderTarget, registry: &Rc>>, scope: &Rc, depth: i64, render_pattern: impl Fn(Rc) -> String + Clone, render_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone) -> String { +pub fn emit_unified_tco_match_arm( + arm: &Rc, + fn_name: &String, + params: &Rc>>, + target: &RenderTarget, + registry: &Rc>>, + scope: &Rc, + depth: i64, + render_pattern: impl Fn(Rc) -> String + Clone, + render_init_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone, +) -> String { { let bs = language_spec(target.clone()).block_syntax.clone(); -let case_depth = if bs.significant_whitespace.clone() { + let case_depth = if bs.significant_whitespace.clone() { (depth.clone() + 1) } else { depth.clone() }; -let body_depth = (case_depth.clone() + 1); -let guard_str = emit_arm_guard(arm.clone(), &target, |g| emit_unified_typed_expr(g.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone())); -let body_str = emit_unified_tco_expr(&Rc::new(TcoFrame { - expr: arm_body(&arm), - scope: scope.clone(), - depth: body_depth.clone(), -}), &fn_name, params.clone(), &target, registry.clone(), |expr, scope, depth| emit_unified_typed_expr(expr.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone()), |frame| emit_unified_tco_match(&frame, fn_name.clone(), params.clone(), &target, ®istry, render_pattern.clone(), render_init_stmts.clone()), render_init_stmts.clone()); -emit_match_arm_line(arm.clone(), target.clone(), case_depth.clone(), body_depth.clone(), body_str, guard_str, render_pattern.clone()) -} + let body_depth = (case_depth.clone() + 1); + let guard_str = emit_arm_guard(arm.clone(), &target, |g| { + emit_unified_typed_expr( + g.clone(), + &target, + registry.clone(), + &scope, + depth.clone(), + 1024, + render_pattern.clone(), + ) + }); + let body_str = emit_unified_tco_expr( + &Rc::new(TcoFrame { + expr: arm_body(&arm), + scope: scope.clone(), + depth: body_depth.clone(), + }), + &fn_name, + params.clone(), + &target, + registry.clone(), + |expr, scope, depth| { + emit_unified_typed_expr( + expr.clone(), + &target, + registry.clone(), + &scope, + depth.clone(), + 1024, + render_pattern.clone(), + ) + }, + |frame| { + emit_unified_tco_match( + &frame, + fn_name.clone(), + params.clone(), + &target, + ®istry, + render_pattern.clone(), + render_init_stmts.clone(), + ) + }, + render_init_stmts.clone(), + ); + emit_match_arm_line( + arm.clone(), + target.clone(), + case_depth.clone(), + body_depth.clone(), + body_str, + guard_str, + render_pattern.clone(), + ) + } } -pub fn emit_tco_unified(texpr: Rc, fn_name: &String, params: &Rc>>, target: &RenderTarget, registry: &Rc>>, scope: &Rc, depth: i64, render_pattern: impl Fn(Rc) -> String + Clone) -> String { - emit_unified_tco_body(texpr, fn_name.clone(), params.clone(), &target, registry.clone(), scope.clone(), depth.clone(), |expr, scope, depth| emit_unified_typed_expr(expr.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone()), |frame| emit_unified_tco_match(&frame, fn_name.clone(), params.clone(), &target, ®istry, render_pattern.clone(), |stmts, scope, depth| emit_unified_init_block_stmts(stmts.clone(), Rc::new(vec![]), scope.clone(), depth.clone(), &target, registry.clone(), render_pattern.clone())), |stmts, scope, depth| emit_unified_init_block_stmts(stmts.clone(), Rc::new(vec![]), scope.clone(), depth.clone(), &target, registry.clone(), render_pattern.clone())) +pub fn emit_tco_unified( + texpr: Rc, + fn_name: &String, + params: &Rc>>, + target: &RenderTarget, + registry: &Rc>>, + scope: &Rc, + depth: i64, + render_pattern: impl Fn(Rc) -> String + Clone, +) -> String { + emit_unified_tco_body( + texpr, + fn_name.clone(), + params.clone(), + &target, + registry.clone(), + scope.clone(), + depth.clone(), + |expr, scope, depth| { + emit_unified_typed_expr( + expr.clone(), + &target, + registry.clone(), + &scope, + depth.clone(), + 1024, + render_pattern.clone(), + ) + }, + |frame| { + emit_unified_tco_match( + &frame, + fn_name.clone(), + params.clone(), + &target, + ®istry, + render_pattern.clone(), + |stmts, scope, depth| { + emit_unified_init_block_stmts( + stmts.clone(), + Rc::new(vec![]), + scope.clone(), + depth.clone(), + &target, + registry.clone(), + render_pattern.clone(), + ) + }, + ) + }, + |stmts, scope, depth| { + emit_unified_init_block_stmts( + stmts.clone(), + Rc::new(vec![]), + scope.clone(), + depth.clone(), + &target, + registry.clone(), + render_pattern.clone(), + ) + }, + ) } -pub fn emit_unified_typed_func_body(body: &Rc, target: &RenderTarget, registry: &Rc>>, scope: &Rc, depth: i64) -> String { +pub fn emit_unified_typed_func_body( + body: &Rc, + target: &RenderTarget, + registry: &Rc>>, + scope: &Rc, + depth: i64, +) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let es = language_spec(target.clone()).expression_semantics.clone(); -let bs = language_spec(target.clone()).block_syntax.clone(); -let si = scope.type_env.clone().source_indices.clone(); -let prefix = if bs.significant_whitespace.clone() { - "".to_string() - } else { - make_indent(depth.clone()) - }; -match (*body.expr_data.clone()).clone() { - ExprData::ExprLet => { + let es = language_spec(target.clone()).expression_semantics.clone(); + let bs = language_spec(target.clone()).block_syntax.clone(); + let si = scope.type_env.clone().source_indices.clone(); + let prefix = if bs.significant_whitespace.clone() { + "".to_string() + } else { + make_indent(depth.clone()) + }; + match (*body.expr_data.clone()).clone() { + ExprData::ExprLet => { let n = let_binding_name_at(body.clone(), si.clone()); -let ch = body.children.clone(); -let v = let_value(body.clone()); -let inner = let_body(body.clone()); -let val_str = emit_unified_typed_expr(v.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, |pat| emit_unified_pattern(pat.clone(), target.clone(), si.clone())); -let let_line = v2_rt::concat(prefix, emit_let_binding(n.clone(), val_str, &target)); -let next_scope = extend_scope(&scope, &n, resolved_type(v.clone()), Rc::new(SubValueRelation::SubValueUnknown)); -match inner { - Some(bd) => v2_rt::concat(v2_rt::concat(let_line, "\n".to_string()), emit_unified_typed_func_body(&bd, &target, ®istry, &next_scope, depth.clone())), - None => let_line, -} -}, - ExprData::ExprBlock => { + let ch = body.children.clone(); + let v = let_value(body.clone()); + let inner = let_body(body.clone()); + let val_str = emit_unified_typed_expr( + v.clone(), + &target, + registry.clone(), + &scope, + depth.clone(), + 1024, + |pat| emit_unified_pattern(pat.clone(), target.clone(), si.clone()), + ); + let let_line = v2_rt::concat(prefix, emit_let_binding(n.clone(), val_str, &target)); + let next_scope = extend_scope( + &scope, + &n, + resolved_type(v.clone()), + Rc::new(SubValueRelation::SubValueUnknown), + ); + match inner { + Some(bd) => v2_rt::concat( + v2_rt::concat(let_line, "\n".to_string()), + emit_unified_typed_func_body( + &bd, + &target, + ®istry, + &next_scope, + depth.clone(), + ), + ), + None => let_line, + } + } + ExprData::ExprBlock => { let ss = body.children.clone(); -if ((ss.clone().len() as i64) == 0) { - v2_rt::concat(v2_rt::concat(prefix, "return ".to_string()), es.empty_return_value.clone()) + if ((ss.clone().len() as i64) == 0) { + v2_rt::concat( + v2_rt::concat(prefix, "return ".to_string()), + es.empty_return_value.clone(), + ) } else { { - let init_state = emit_unified_init_block_stmts(ss.clone(), Rc::new(vec![]), scope.clone(), depth.clone(), &target, registry.clone(), |pat| emit_unified_pattern(pat.clone(), target.clone(), si.clone())); -let last_stmt = ss.clone().last().cloned(); -let last_str = match last_stmt { - Some(s) => v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix, "return ".to_string()), emit_unified_typed_expr(s.clone(), &target, registry.clone(), &init_state.scope.clone(), depth.clone(), 1024, |pat| emit_unified_pattern(pat.clone(), target.clone(), si.clone()))), es.return_suffix.clone()), - None => v2_rt::concat(v2_rt::concat(prefix, "return ".to_string()), es.empty_return_value.clone()), -}; -if ((init_state.text.clone().len() as i64) == 0) { + let init_state = emit_unified_init_block_stmts( + ss.clone(), + Rc::new(vec![]), + scope.clone(), + depth.clone(), + &target, + registry.clone(), + |pat| emit_unified_pattern(pat.clone(), target.clone(), si.clone()), + ); + let last_stmt = ss.clone().last().cloned(); + let last_str = match last_stmt { + Some(s) => v2_rt::concat( + v2_rt::concat( + v2_rt::concat(prefix, "return ".to_string()), + emit_unified_typed_expr( + s.clone(), + &target, + registry.clone(), + &init_state.scope.clone(), + depth.clone(), + 1024, + |pat| { + emit_unified_pattern( + pat.clone(), + target.clone(), + si.clone(), + ) + }, + ), + ), + es.return_suffix.clone(), + ), + None => v2_rt::concat( + v2_rt::concat(prefix, "return ".to_string()), + es.empty_return_value.clone(), + ), + }; + if ((init_state.text.clone().len() as i64) == 0) { last_str } else { - v2_rt::concat(v2_rt::concat(init_state.text.clone().join(&"\n".to_string()), "\n".to_string()), last_str) + v2_rt::concat( + v2_rt::concat( + init_state.text.clone().join(&"\n".to_string()), + "\n".to_string(), + ), + last_str, + ) } -} + } } -}, - _ => v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix, "return ".to_string()), emit_unified_typed_expr(body.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, |pat| emit_unified_pattern(pat.clone(), target.clone(), si.clone()))), es.return_suffix.clone()), -} -} + } + _ => v2_rt::concat( + v2_rt::concat( + v2_rt::concat(prefix, "return ".to_string()), + emit_unified_typed_expr( + body.clone(), + &target, + registry.clone(), + &scope, + depth.clone(), + 1024, + |pat| emit_unified_pattern(pat.clone(), target.clone(), si.clone()), + ), + ), + es.return_suffix.clone(), + ), + } }) } -pub fn is_tco_candidate(texpr: &Rc, func_name: &String, source_indices: &Rc>>) -> bool { +pub fn is_tco_candidate( + texpr: &Rc, + func_name: &String, + source_indices: &Rc>>, +) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => (expr_call_func_at(texpr.clone(), source_indices.clone()).as_str() == func_name.clone().as_str()), - ExprData::ExprReturn => is_tco_candidate(&return_value(texpr.clone()), &func_name, &source_indices), - ExprData::ExprIf => { - let then_cand = is_tco_candidate(&if_then_branch(texpr.clone()), &func_name, &source_indices); -let else_cand = match if_else_branch(texpr.clone()) { - Some(e) => is_tco_candidate(&e, &func_name, &source_indices), - None => false, -}; -(then_cand || else_cand) -}, - ExprData::ExprMatch => { let mut __found = false; for arm_node in match_arm_nodes(texpr.clone()).iter().cloned() { if is_tco_candidate(&arm_body(&arm_node), &func_name, &source_indices) { __found = true; break; } } __found }, - ExprData::ExprLet => match let_body(texpr.clone()) { - Some(b) => is_tco_candidate(&b, &func_name, &source_indices), - None => false, -}, - ExprData::ExprBlock => { let mut __found = false; for s in texpr.children.clone().iter().cloned() { if is_tco_candidate(&s, &func_name, &source_indices) { __found = true; break; } } __found }, - ExprData::NoExprData => { let mut __found = false; for child in texpr.children.clone().iter().cloned() { if is_tco_candidate(&child, &func_name, &source_indices) { __found = true; break; } } __found }, - _ => false, -} + ExprData::ExprCall { .. } => { + (expr_call_func_at(texpr.clone(), source_indices.clone()).as_str() + == func_name.clone().as_str()) + } + ExprData::ExprReturn => { + is_tco_candidate(&return_value(texpr.clone()), &func_name, &source_indices) + } + ExprData::ExprIf => { + let then_cand = + is_tco_candidate(&if_then_branch(texpr.clone()), &func_name, &source_indices); + let else_cand = match if_else_branch(texpr.clone()) { + Some(e) => is_tco_candidate(&e, &func_name, &source_indices), + None => false, + }; + (then_cand || else_cand) + } + ExprData::ExprMatch => { + let mut __found = false; + for arm_node in match_arm_nodes(texpr.clone()).iter().cloned() { + if is_tco_candidate(&arm_body(&arm_node), &func_name, &source_indices) { + __found = true; + break; + } + } + __found + } + ExprData::ExprLet => match let_body(texpr.clone()) { + Some(b) => is_tco_candidate(&b, &func_name, &source_indices), + None => false, + }, + ExprData::ExprBlock => { + let mut __found = false; + for s in texpr.children.clone().iter().cloned() { + if is_tco_candidate(&s, &func_name, &source_indices) { + __found = true; + break; + } + } + __found + } + ExprData::NoExprData => { + let mut __found = false; + for child in texpr.children.clone().iter().cloned() { + if is_tco_candidate(&child, &func_name, &source_indices) { + __found = true; + break; + } + } + __found + } + _ => false, + } }) } pub fn emit_ident(name: String, target: RenderTarget) -> String { { let spec = language_spec(target); -let converted = match spec.naming_case.clone() { - NamingCase::SnakeCase => to_snake(name), - NamingCase::CamelCase => to_camel(name), - NamingCase::PascalCase => capitalize_first(to_camel(name)), - NamingCase::AsAuthored => name, -}; -let is_reserved = { let mut __found = false; for r in spec.reserved_words.clone().keywords.clone().iter().cloned() { if (r.clone().as_str() == converted.clone().as_str()) { __found = true; break; } } __found }; -if is_reserved { + let converted = match spec.naming_case.clone() { + NamingCase::SnakeCase => to_snake(name), + NamingCase::CamelCase => to_camel(name), + NamingCase::PascalCase => capitalize_first(to_camel(name)), + NamingCase::AsAuthored => name, + }; + let is_reserved = { + let mut __found = false; + for r in spec.reserved_words.clone().keywords.clone().iter().cloned() { + if (r.clone().as_str() == converted.clone().as_str()) { + __found = true; + break; + } + } + __found + }; + if is_reserved { match (*spec.reserved_words.clone().strategy.clone()).clone() { - ReservedWordStrategy::PrefixEscape { prefix: p, .. } => v2_rt::concat(p.clone(), converted.clone()), - ReservedWordStrategy::SuffixEscape { suffix: s, .. } => v2_rt::concat(converted.clone(), s.clone()), - ReservedWordStrategy::NoEscape => converted.clone(), -} + ReservedWordStrategy::PrefixEscape { prefix: p, .. } => { + v2_rt::concat(p.clone(), converted.clone()) + } + ReservedWordStrategy::SuffixEscape { suffix: s, .. } => { + v2_rt::concat(converted.clone(), s.clone()) + } + ReservedWordStrategy::NoEscape => converted.clone(), + } } else { converted.clone() } -} + } } pub fn emit_export_ident(name: String, target: &RenderTarget) -> String { { let spec = language_spec(target.clone()); -match (*spec.visibility.clone()).clone() { - VisibilitySpec::CaseVisibility { export_case: ec, .. } => { - let result = apply_naming_case(name, ec.clone()); -let is_reserved = { let mut __found = false; for r in spec.reserved_words.clone().keywords.clone().iter().cloned() { if (r.clone().as_str() == result.clone().as_str()) { __found = true; break; } } __found }; -if is_reserved { - match (*spec.reserved_words.clone().strategy.clone()).clone() { - ReservedWordStrategy::SuffixEscape { suffix: s, .. } => v2_rt::concat(result.clone(), s.clone()), - ReservedWordStrategy::PrefixEscape { prefix: p, .. } => v2_rt::concat(p.clone(), result.clone()), - ReservedWordStrategy::NoEscape => result.clone(), -} - } else { - result.clone() + match (*spec.visibility.clone()).clone() { + VisibilitySpec::CaseVisibility { + export_case: ec, .. + } => { + let result = apply_naming_case(name, ec.clone()); + let is_reserved = { + let mut __found = false; + for r in spec.reserved_words.clone().keywords.clone().iter().cloned() { + if (r.clone().as_str() == result.clone().as_str()) { + __found = true; + break; + } + } + __found + }; + if is_reserved { + match (*spec.reserved_words.clone().strategy.clone()).clone() { + ReservedWordStrategy::SuffixEscape { suffix: s, .. } => { + v2_rt::concat(result.clone(), s.clone()) + } + ReservedWordStrategy::PrefixEscape { prefix: p, .. } => { + v2_rt::concat(p.clone(), result.clone()) + } + ReservedWordStrategy::NoEscape => result.clone(), + } + } else { + result.clone() + } } -}, - VisibilitySpec::KeywordVisibility { .. } => emit_ident(name, target.clone()), -} -} + VisibilitySpec::KeywordVisibility { .. } => emit_ident(name, target.clone()), + } + } } -pub fn apply_bridge_method_overrides(name: String, overrides: Rc>) -> String { +pub fn apply_bridge_method_overrides( + name: String, + overrides: Rc>, +) -> String { match v2_rt::lookup(&overrides, name.clone()) { - Some(replacement) => replacement.clone(), - None => name.clone(), -} + Some(replacement) => replacement.clone(), + None => name.clone(), + } } pub fn emit_let_binding(name: String, value: String, target: &RenderTarget) -> String { { let spec = language_spec(target.clone()); -apply_type_template2(spec.annotations.clone().let_binding_inferred.clone(), emit_ident(name, target.clone()), value) -} + apply_type_template2( + spec.annotations.clone().let_binding_inferred.clone(), + emit_ident(name, target.clone()), + value, + ) + } } -pub fn emit_let_binding_annotated(name: String, type_str: String, value: String, target: &RenderTarget) -> String { +pub fn emit_let_binding_annotated( + name: String, + type_str: String, + value: String, + target: &RenderTarget, +) -> String { { let spec = language_spec(target.clone()); -apply_type_template3(spec.annotations.clone().let_binding_annotated.clone(), emit_ident(name, target.clone()), type_str, value) -} + apply_type_template3( + spec.annotations.clone().let_binding_annotated.clone(), + emit_ident(name, target.clone()), + type_str, + value, + ) + } } pub fn emit_return(value: String, target: RenderTarget) -> String { @@ -1982,771 +4077,2010 @@ pub fn emit_return(value: String, target: RenderTarget) -> String { pub fn emit_unary_op(op: UnaryOpKind, operand_str: String, target: RenderTarget) -> String { match op { - UnaryOpKind::Not => v2_rt::concat(emit_keyword("not".to_string(), target), operand_str), - UnaryOpKind::Neg => v2_rt::concat("-".to_string(), operand_str), -} + UnaryOpKind::Not => v2_rt::concat(emit_keyword("not".to_string(), target), operand_str), + UnaryOpKind::Neg => v2_rt::concat("-".to_string(), operand_str), + } } pub fn emit_lambda(params_str: String, body_str: String, target: RenderTarget) -> String { { let spec = language_spec(target); -apply_type_template2(spec.lambda_template.clone(), params_str, body_str) -} + apply_type_template2(spec.lambda_template.clone(), params_str, body_str) + } } pub fn emit_error_expr(message: String, target: RenderTarget) -> String { { let msg = emit_string_literal(message, "".to_string()); -let spec = language_spec(target); -apply_type_template1(spec.error_expr_template.clone(), msg) -} + let spec = language_spec(target); + apply_type_template1(spec.error_expr_template.clone(), msg) + } } pub fn emit_lambda_params(param_names: Rc>, target: &RenderTarget) -> String { { let spec = language_spec(target.clone()); -let param_strs = Rc::new({ let mut __result = Vec::new(); for p in param_names.iter().cloned() { __result.push(apply_type_template1(spec.annotations.clone().lambda_param_untyped.clone(), emit_ident(p.clone(), target.clone()))); } __result }); -param_strs.join(&", ".to_string()) -} + let param_strs = Rc::new({ + let mut __result = Vec::new(); + for p in param_names.iter().cloned() { + __result.push(apply_type_template1( + spec.annotations.clone().lambda_param_untyped.clone(), + emit_ident(p.clone(), target.clone()), + )); + } + __result + }); + param_strs.join(&", ".to_string()) + } } pub fn emit_list_lit_expr(element_strs: &Rc>, target: RenderTarget) -> String { { let spec = language_spec(target); -if ((element_strs.clone().len() as i64) == 0) { + if ((element_strs.clone().len() as i64) == 0) { spec.list_literal_empty.clone() } else { { let els_str = element_strs.clone().join(&", ".to_string()); -apply_type_template1(spec.list_literal_template.clone(), els_str) -} + apply_type_template1(spec.list_literal_template.clone(), els_str) + } } -} + } } pub fn emit_null_coalesce(l_str: String, r_str: String, target: RenderTarget) -> String { { let spec = language_spec(target); -apply_type_template2(spec.null_coalesce_template.clone(), l_str, r_str) -} + apply_type_template2(spec.null_coalesce_template.clone(), l_str, r_str) + } } -pub fn emit_expr_var_shared(expr: Rc, target: RenderTarget, source_indices: Rc>>) -> String { +pub fn emit_expr_var_shared( + expr: Rc, + target: RenderTarget, + source_indices: Rc>>, +) -> String { { let n = expr_var_name_at(expr, source_indices); -if (n.clone().as_str() == "none".to_string().as_str()) { + if (n.clone().as_str() == "none".to_string().as_str()) { emit_keyword("null".to_string(), target) } else { - if ((n.clone().as_str() == "true".to_string().as_str()) || (n.clone().as_str() == "false".to_string().as_str())) { + if ((n.clone().as_str() == "true".to_string().as_str()) + || (n.clone().as_str() == "false".to_string().as_str())) + { emit_keyword(n.clone(), target) } else { emit_ident(n.clone(), target) } } -} + } } -pub fn emit_expr_field_access_shared(expr: &Rc, target: RenderTarget, emit_field: impl Fn(Rc) -> String + Clone, source_indices: &Rc>>) -> String { +pub fn emit_expr_field_access_shared( + expr: &Rc, + target: RenderTarget, + emit_field: impl Fn(Rc) -> String + Clone, + source_indices: &Rc>>, +) -> String { if is_typed_service_call_receiver(&expr, source_indices.clone()) { match extract_typed_service_name(&expr, &source_indices) { - Some(svc_name) => service_var_name(svc_name.clone()), - None => emit_field(expr.clone()), -} + Some(svc_name) => service_var_name(svc_name.clone()), + None => emit_field(expr.clone()), + } } else { emit_field(expr.clone()) } } pub fn extract_string_interp_parts(expr: Rc) -> Rc>> { - Rc::new({ let mut __result = Vec::new(); for child in expr.children.clone().iter().cloned() { __result.push(match (*child.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: text, .. } = value.as_ref() else { unreachable!() }; Rc::new(StringPart::Text { - value: text.clone(), -}) }, - _ => Rc::new(StringPart::Interpolation { - expr: arg_value(&child), -}), -}); } __result }) -} - -pub fn emit_typed_cast_shared(expr: &Rc, cast_target_node: Rc, target: &RenderTarget, recurse: impl Fn(Rc) -> String + Clone, source_indices: &Rc>>) -> String { + Rc::new({ + let mut __result = Vec::new(); + for child in expr.children.clone().iter().cloned() { + __result.push(match (*child.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitStr { value: text, .. } = value.as_ref() else { + unreachable!() + }; + Rc::new(StringPart::Text { + value: text.clone(), + }) + } + _ => Rc::new(StringPart::Interpolation { + expr: arg_value(&child), + }), + }); + } + __result + }) +} + +pub fn emit_typed_cast_shared( + expr: &Rc, + cast_target_node: Rc, + target: &RenderTarget, + recurse: impl Fn(Rc) -> String + Clone, + source_indices: &Rc>>, +) -> String { { let expr_str = recurse(expr.clone()); -let ty_str = emit_node_type(cast_target_node, target.clone(), source_indices.clone()); -let src_ty = match expr.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: n, .. }) => emit_node_type(n.clone(), target.clone(), source_indices.clone()), - _ => "".to_string(), -}; -if ((src_ty.clone().as_str() != "".to_string().as_str()) && (src_ty.clone().as_str() == ty_str.clone().as_str())) { + let ty_str = emit_node_type(cast_target_node, target.clone(), source_indices.clone()); + let src_ty = match expr.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: n, .. }) => { + emit_node_type(n.clone(), target.clone(), source_indices.clone()) + } + _ => "".to_string(), + }; + if ((src_ty.clone().as_str() != "".to_string().as_str()) + && (src_ty.clone().as_str() == ty_str.clone().as_str())) + { expr_str } else { if can_cast(target.clone(), src_ty.clone(), ty_str.clone()) { render_cast(expr_str, ty_str.clone(), target.clone()) } else { - emit_error_expr(v2_rt::concat(v2_rt::concat(v2_rt::concat("unsupported cast from ".to_string(), src_ty.clone()), " to ".to_string()), ty_str.clone()), target.clone()) + emit_error_expr( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("unsupported cast from ".to_string(), src_ty.clone()), + " to ".to_string(), + ), + ty_str.clone(), + ), + target.clone(), + ) } } -} + } } -pub fn emit_typed_for_each_shared(variable: &String, collection: &Rc, body: Rc, target: &RenderTarget, depth: i64, source_indices: Rc>>, recurse: impl Fn(Rc, Rc, i64) -> String + Clone, scope: &Rc) -> String { +pub fn emit_typed_for_each_shared( + variable: &String, + collection: &Rc, + body: Rc, + target: &RenderTarget, + depth: i64, + source_indices: Rc>>, + recurse: impl Fn(Rc, Rc, i64) -> String + Clone, + scope: &Rc, +) -> String { { let coll_str = recurse(collection.clone(), scope.clone(), depth.clone()); -let elem_type = for_each_element_type_node(resolved_type(collection.clone()), source_indices); -let body_scope = extend_scope(&scope, &variable, elem_type, Rc::new(SubValueRelation::SubValueUnknown)); -let body_str = recurse(body, body_scope, (depth.clone() + 1)); -let var_str = emit_ident(variable.clone(), target.clone()); -let spec = language_spec(target.clone()); -let fes = spec.for_each_syntax.clone(); -let bs = spec.block_syntax.clone(); -let body_indent = make_indent((depth.clone() + 1)); -if bs.significant_whitespace.clone() { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(fes.prefix.clone(), var_str), fes.separator.clone()), coll_str), bs.block_open.clone()), body_indent), body_str) + let elem_type = + for_each_element_type_node(resolved_type(collection.clone()), source_indices); + let body_scope = extend_scope( + &scope, + &variable, + elem_type, + Rc::new(SubValueRelation::SubValueUnknown), + ); + let body_str = recurse(body, body_scope, (depth.clone() + 1)); + let var_str = emit_ident(variable.clone(), target.clone()); + let spec = language_spec(target.clone()); + let fes = spec.for_each_syntax.clone(); + let bs = spec.block_syntax.clone(); + let body_indent = make_indent((depth.clone() + 1)); + if bs.significant_whitespace.clone() { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(fes.prefix.clone(), var_str), + fes.separator.clone(), + ), + coll_str, + ), + bs.block_open.clone(), + ), + body_indent, + ), + body_str, + ) } else { { let close_indent = make_indent(depth.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(fes.prefix.clone(), var_str), fes.separator.clone()), coll_str), bs.block_open.clone()), body_indent), body_str), "\n".to_string()), close_indent), bs.block_close.clone()) -} + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(fes.prefix.clone(), var_str), + fes.separator.clone(), + ), + coll_str, + ), + bs.block_open.clone(), + ), + body_indent, + ), + body_str, + ), + "\n".to_string(), + ), + close_indent, + ), + bs.block_close.clone(), + ) + } } -} + } } -pub fn emit_typed_index_shared(base: &Rc, index: Rc, target: &RenderTarget, recurse: impl Fn(Rc) -> String + Clone, source_indices: &Rc>>) -> String { +pub fn emit_typed_index_shared( + base: &Rc, + index: Rc, + target: &RenderTarget, + recurse: impl Fn(Rc) -> String + Clone, + source_indices: &Rc>>, +) -> String { { let spec = language_spec(target.clone()); -let base_str = recurse(base.clone()); -let index_str = recurse(index); -let base_node = normalize_access_type_node(resolved_type(base.clone())); -let is_map = node_is_keyed_collection(&base_node, source_indices.clone()); -if is_string_like(target.clone(), authored_name_at(source_indices.clone(), &base_node)) { - apply_type_template2(spec.indexing.clone().string_index.clone(), base_str, index_str) + let base_str = recurse(base.clone()); + let index_str = recurse(index); + let base_node = normalize_access_type_node(resolved_type(base.clone())); + let is_map = node_is_keyed_collection(&base_node, source_indices.clone()); + if is_string_like( + target.clone(), + authored_name_at(source_indices.clone(), &base_node), + ) { + apply_type_template2( + spec.indexing.clone().string_index.clone(), + base_str, + index_str, + ) } else { if is_map { apply_type_template2(spec.indexing.clone().map_index.clone(), base_str, index_str) } else { - apply_type_template2(spec.indexing.clone().list_index.clone(), base_str, index_str) + apply_type_template2( + spec.indexing.clone().list_index.clone(), + base_str, + index_str, + ) } } -} + } } -pub fn emit_typed_slice_shared(base: &Rc, start: Rc, end: Rc, target: &RenderTarget, recurse: impl Fn(Rc) -> String + Clone, source_indices: Rc>>) -> String { +pub fn emit_typed_slice_shared( + base: &Rc, + start: Rc, + end: Rc, + target: &RenderTarget, + recurse: impl Fn(Rc) -> String + Clone, + source_indices: Rc>>, +) -> String { { let spec = language_spec(target.clone()); -let base_str = recurse(base.clone()); -let start_str = recurse(start); -let end_str = recurse(end); -let base_node = normalize_access_type_node(resolved_type(base.clone())); -if is_string_like(target.clone(), authored_name_at(source_indices, &base_node)) { + let base_str = recurse(base.clone()); + let start_str = recurse(start); + let end_str = recurse(end); + let base_node = normalize_access_type_node(resolved_type(base.clone())); + if is_string_like(target.clone(), authored_name_at(source_indices, &base_node)) { match spec.indexing.clone().string_slice.clone() { - Some(tmpl) => apply_type_template3(tmpl.clone(), base_str, start_str, end_str), - None => emit_error_expr("unsupported string slice for target".to_string(), target.clone()), -} + Some(tmpl) => apply_type_template3(tmpl.clone(), base_str, start_str, end_str), + None => emit_error_expr( + "unsupported string slice for target".to_string(), + target.clone(), + ), + } } else { match spec.indexing.clone().list_slice.clone() { - Some(tmpl) => apply_type_template3(tmpl.clone(), base_str, start_str, end_str), - None => emit_error_expr("unsupported slice for target".to_string(), target.clone()), -} + Some(tmpl) => apply_type_template3(tmpl.clone(), base_str, start_str, end_str), + None => emit_error_expr("unsupported slice for target".to_string(), target.clone()), + } } -} + } } -pub fn emit_shared_expr(texpr: &Rc, target: &RenderTarget, source_indices: Rc>>, wrap_result: impl Fn(String) -> String + Clone, recurse: impl Fn(Rc) -> String + Clone, emit_var: impl Fn(Rc) -> String + Clone, emit_field_access: impl Fn(Rc) -> String + Clone, emit_call: impl Fn(Rc) -> String + Clone, emit_method_call: impl Fn(Rc) -> String + Clone, emit_match: impl Fn(Rc) -> String + Clone, emit_if: impl Fn(Rc) -> String + Clone, emit_let: impl Fn(Rc) -> String + Clone, emit_record_lit: impl Fn(Rc) -> String + Clone, emit_string_interp: impl Fn(Rc) -> String + Clone, emit_block: impl Fn(Rc) -> String + Clone, emit_cast: impl Fn(Rc) -> String + Clone, emit_for_each: impl Fn(Rc) -> String + Clone, emit_index: impl Fn(Rc) -> String + Clone, emit_slice: impl Fn(Rc) -> String + Clone, emit_bin_op: impl Fn(Rc) -> String + Clone) -> String { +pub fn emit_shared_expr( + texpr: &Rc, + target: &RenderTarget, + source_indices: Rc>>, + wrap_result: impl Fn(String) -> String + Clone, + recurse: impl Fn(Rc) -> String + Clone, + emit_var: impl Fn(Rc) -> String + Clone, + emit_field_access: impl Fn(Rc) -> String + Clone, + emit_call: impl Fn(Rc) -> String + Clone, + emit_method_call: impl Fn(Rc) -> String + Clone, + emit_match: impl Fn(Rc) -> String + Clone, + emit_if: impl Fn(Rc) -> String + Clone, + emit_let: impl Fn(Rc) -> String + Clone, + emit_record_lit: impl Fn(Rc) -> String + Clone, + emit_string_interp: impl Fn(Rc) -> String + Clone, + emit_block: impl Fn(Rc) -> String + Clone, + emit_cast: impl Fn(Rc) -> String + Clone, + emit_for_each: impl Fn(Rc) -> String + Clone, + emit_index: impl Fn(Rc) -> String + Clone, + emit_slice: impl Fn(Rc) -> String + Clone, + emit_bin_op: impl Fn(Rc) -> String + Clone, +) -> String { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprLiteral { value: v, .. } => wrap_result(emit_literal(v.clone(), &target)), - ExprData::ExprError { message, .. } => wrap_result(emit_error_expr(message.clone(), target.clone())), - ExprData::ExprVar { .. } => emit_var(texpr.clone()), - ExprData::ExprFieldAccess { .. } => emit_field_access(texpr.clone()), - ExprData::ExprCall { .. } => emit_call(texpr.clone()), - ExprData::ExprMethodCall { .. } => emit_method_call(texpr.clone()), - ExprData::ExprMatch => emit_match(texpr.clone()), - ExprData::ExprIf => emit_if(texpr.clone()), - ExprData::ExprLet => emit_let(texpr.clone()), - ExprData::ExprRecordLit { .. } => emit_record_lit(texpr.clone()), - ExprData::ExprBinOp { .. } => emit_bin_op(texpr.clone()), - ExprData::ExprUnaryOp { op, .. } => { - let operand = unaryop_operand(texpr.clone()); -wrap_result(emit_unary_op(op.clone(), recurse(operand), target.clone())) -}, - ExprData::ExprLambda => { - let body = lambda_body(texpr.clone()); -wrap_result(emit_lambda(emit_lambda_params(lambda_param_names_at(texpr.clone(), source_indices), &target), recurse(body), target.clone())) -}, - ExprData::ExprStringInterp => emit_string_interp(texpr.clone()), - ExprData::ExprBlock => emit_block(texpr.clone()), - ExprData::ExprCast => emit_cast(texpr.clone()), - ExprData::ExprForEach => emit_for_each(texpr.clone()), - ExprData::ExprIndex => emit_index(texpr.clone()), - ExprData::ExprSlice => emit_slice(texpr.clone()), - ExprData::ExprListLit => wrap_result(emit_list_lit_expr(&Rc::new({ let mut __result = Vec::new(); for el in texpr.children.clone().iter().cloned() { __result.push(recurse(el.clone())); } __result }), target.clone())), - ExprData::ExprReturn => { - let ret_val = return_value(texpr.clone()); -wrap_result(emit_return(recurse(ret_val), target.clone())) -}, - ExprData::NoExprData => wrap_result("".to_string()), -} -} - -pub fn emit_default_bin_op(texpr: &Rc, target: RenderTarget, source_indices: Rc>>, recurse: impl Fn(Rc) -> String + Clone, wrap_result: impl Fn(String) -> String + Clone) -> String { - match (*texpr.expr_data.clone()).clone() { - ExprData::ExprBinOp { op, algebra_field: algebra, .. } => { - let left = binop_left(texpr.clone()); -let right = binop_right(texpr.clone()); -let left_str = recurse(left); -let right_str = recurse(right); -if is_null_coalesce(op.clone()) { - wrap_result(emit_null_coalesce(left_str, right_str, target)) - } else { - { - let op_str = emit_bin_op_symbol(op.clone(), &target, algebra.clone()); -wrap_result(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("(".to_string(), left_str), " ".to_string()), op_str), " ".to_string()), right_str), ")".to_string())) -} + ExprData::ExprLiteral { value: v, .. } => wrap_result(emit_literal(v.clone(), &target)), + ExprData::ExprError { message, .. } => { + wrap_result(emit_error_expr(message.clone(), target.clone())) + } + ExprData::ExprVar { .. } => emit_var(texpr.clone()), + ExprData::ExprFieldAccess { .. } => emit_field_access(texpr.clone()), + ExprData::ExprCall { .. } => emit_call(texpr.clone()), + ExprData::ExprMethodCall { .. } => emit_method_call(texpr.clone()), + ExprData::ExprMatch => emit_match(texpr.clone()), + ExprData::ExprIf => emit_if(texpr.clone()), + ExprData::ExprLet => emit_let(texpr.clone()), + ExprData::ExprRecordLit { .. } => emit_record_lit(texpr.clone()), + ExprData::ExprBinOp { .. } => emit_bin_op(texpr.clone()), + ExprData::ExprUnaryOp { op, .. } => { + let operand = unaryop_operand(texpr.clone()); + wrap_result(emit_unary_op(op.clone(), recurse(operand), target.clone())) } -}, - _ => wrap_result(emit_error_expr("emit_default_bin_op expected ExprBinOp".to_string(), target)), + ExprData::ExprLambda => { + let body = lambda_body(texpr.clone()); + wrap_result(emit_lambda( + emit_lambda_params( + lambda_param_names_at(texpr.clone(), source_indices), + &target, + ), + recurse(body), + target.clone(), + )) + } + ExprData::ExprStringInterp => emit_string_interp(texpr.clone()), + ExprData::ExprBlock => emit_block(texpr.clone()), + ExprData::ExprCast => emit_cast(texpr.clone()), + ExprData::ExprForEach => emit_for_each(texpr.clone()), + ExprData::ExprIndex => emit_index(texpr.clone()), + ExprData::ExprSlice => emit_slice(texpr.clone()), + ExprData::ExprListLit => wrap_result(emit_list_lit_expr( + &Rc::new({ + let mut __result = Vec::new(); + for el in texpr.children.clone().iter().cloned() { + __result.push(recurse(el.clone())); + } + __result + }), + target.clone(), + )), + ExprData::ExprReturn => { + let ret_val = return_value(texpr.clone()); + wrap_result(emit_return(recurse(ret_val), target.clone())) + } + ExprData::NoExprData => wrap_result("".to_string()), + } } + +pub fn emit_default_bin_op( + texpr: &Rc, + target: RenderTarget, + source_indices: Rc>>, + recurse: impl Fn(Rc) -> String + Clone, + wrap_result: impl Fn(String) -> String + Clone, +) -> String { + match (*texpr.expr_data.clone()).clone() { + ExprData::ExprBinOp { + op, + algebra_field: algebra, + .. + } => { + let left = binop_left(texpr.clone()); + let right = binop_right(texpr.clone()); + let left_str = recurse(left); + let right_str = recurse(right); + if is_null_coalesce(op.clone()) { + wrap_result(emit_null_coalesce(left_str, right_str, target)) + } else { + { + let op_str = emit_bin_op_symbol(op.clone(), &target, algebra.clone()); + wrap_result(v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("(".to_string(), left_str), + " ".to_string(), + ), + op_str, + ), + " ".to_string(), + ), + right_str, + ), + ")".to_string(), + )) + } + } + } + _ => wrap_result(emit_error_expr( + "emit_default_bin_op expected ExprBinOp".to_string(), + target, + )), + } } -pub fn emit_block_stmts_shared(mut remaining: Rc>>, mut text: Rc>, mut scope: Rc, mut depth: i64, mut prepend_indent: bool, mut emit_expr: impl Fn(Rc, Rc, i64) -> String + Clone) -> Rc { +pub fn emit_block_stmts_shared( + mut remaining: Rc>>, + mut text: Rc>, + mut scope: Rc, + mut depth: i64, + mut prepend_indent: bool, + mut emit_expr: impl Fn(Rc, Rc, i64) -> String + Clone, +) -> Rc { loop { match remaining.clone().first().cloned() { - None => { break Rc::new(BlockEmitState { - text: text, - scope: scope.clone(), -}); }, - Some(stmt) => { let raw = emit_expr(stmt.clone(), scope.clone(), depth.clone()); -let line = if prepend_indent.clone() { - v2_rt::concat(make_indent(depth.clone()), raw) - } else { - raw - }; -let next_scope = scope_after_expr(&stmt, &scope); -{ - let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); -let __tco_1 = v2_rt::rc_list_push(text, line); -let __tco_2 = next_scope; -remaining = __tco_0; -text = __tco_1; -scope = __tco_2; -continue; -} }, -} -} + None => { + break Rc::new(BlockEmitState { + text: text, + scope: scope.clone(), + }); + } + Some(stmt) => { + let raw = emit_expr(stmt.clone(), scope.clone(), depth.clone()); + let line = if prepend_indent.clone() { + v2_rt::concat(make_indent(depth.clone()), raw) + } else { + raw + }; + let next_scope = scope_after_expr(&stmt, &scope); + { + let __tco_0 = Rc::new( + remaining + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + let __tco_1 = v2_rt::rc_list_push(text, line); + let __tco_2 = next_scope; + remaining = __tco_0; + text = __tco_1; + scope = __tco_2; + continue; + } + } + } + } } -pub fn emit_init_block_stmts_shared(mut remaining: Rc>>, mut text: Rc>, mut scope: Rc, mut depth: i64, mut prepend_indent: bool, mut emit_expr: impl Fn(Rc, Rc, i64) -> String + Clone) -> Rc { +pub fn emit_init_block_stmts_shared( + mut remaining: Rc>>, + mut text: Rc>, + mut scope: Rc, + mut depth: i64, + mut prepend_indent: bool, + mut emit_expr: impl Fn(Rc, Rc, i64) -> String + Clone, +) -> Rc { loop { match remaining.clone().first().cloned() { - None => { break Rc::new(BlockEmitState { - text: text, - scope: scope.clone(), -}); }, - Some(stmt) => { let rest = Rc::new(remaining.clone().iter().cloned().skip(1 as usize).collect::>()); -match rest.clone().first().cloned() { - None => { break Rc::new(BlockEmitState { - text: text, - scope: scope.clone(), -}); }, - Some(_) => { let raw = emit_expr(stmt.clone(), scope.clone(), depth.clone()); -let line = if prepend_indent.clone() { - v2_rt::concat(make_indent(depth.clone()), raw) - } else { - raw - }; -let next_scope = scope_after_expr(&stmt, &scope); -{ - let __tco_0 = rest.clone(); -let __tco_1 = v2_rt::rc_list_push(text, line); -let __tco_2 = next_scope; -remaining = __tco_0; -text = __tco_1; -scope = __tco_2; -continue; -} }, -} }, -} -} + None => { + break Rc::new(BlockEmitState { + text: text, + scope: scope.clone(), + }); + } + Some(stmt) => { + let rest = Rc::new( + remaining + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + match rest.clone().first().cloned() { + None => { + break Rc::new(BlockEmitState { + text: text, + scope: scope.clone(), + }); + } + Some(_) => { + let raw = emit_expr(stmt.clone(), scope.clone(), depth.clone()); + let line = if prepend_indent.clone() { + v2_rt::concat(make_indent(depth.clone()), raw) + } else { + raw + }; + let next_scope = scope_after_expr(&stmt, &scope); + { + let __tco_0 = rest.clone(); + let __tco_1 = v2_rt::rc_list_push(text, line); + let __tco_2 = next_scope; + remaining = __tco_0; + text = __tco_1; + scope = __tco_2; + continue; + } + } + } + } + } + } } -pub fn emit_typed_let_shared(name: &String, value_str: String, body: Option>, target: RenderTarget, recurse: impl Fn(Rc, Rc) -> String + Clone, scope: Rc, value_node: Rc) -> String { +pub fn emit_typed_let_shared( + name: &String, + value_str: String, + body: Option>, + target: RenderTarget, + recurse: impl Fn(Rc, Rc) -> String + Clone, + scope: Rc, + value_node: Rc, +) -> String { { let let_line = emit_let_binding(name.clone(), value_str, &target); -match body { - Some(bd) => { - let next_scope = extend_scope(&scope, &name, resolved_type(value_node), Rc::new(SubValueRelation::SubValueUnknown)); -v2_rt::concat(v2_rt::concat(let_line, "\n".to_string()), recurse(bd.clone(), next_scope)) -}, - None => let_line, -} -} + match body { + Some(bd) => { + let next_scope = extend_scope( + &scope, + &name, + resolved_type(value_node), + Rc::new(SubValueRelation::SubValueUnknown), + ); + v2_rt::concat( + v2_rt::concat(let_line, "\n".to_string()), + recurse(bd.clone(), next_scope), + ) + } + None => let_line, + } + } } -pub fn emit_typed_if_shared(cond_str: String, then_branch: &Rc, else_branch: Option>, if_result_type: Option>, depth: i64, target: &RenderTarget, source_indices: Rc>>, recurse: impl Fn(Rc, i64) -> String + Clone) -> String { +pub fn emit_typed_if_shared( + cond_str: String, + then_branch: &Rc, + else_branch: Option>, + if_result_type: Option>, + depth: i64, + target: &RenderTarget, + source_indices: Rc>>, + recurse: impl Fn(Rc, i64) -> String + Clone, +) -> String { { let spec = language_spec(target.clone()); -let es = spec.expression_semantics.clone(); -let bs = spec.block_syntax.clone(); -match else_branch { - Some(eb) => match es.if_value_form.clone() { - IfValueForm::IfExpression => { - let then_str = recurse(then_branch.clone(), (depth.clone() + 1)); -let else_str = recurse(eb.clone(), (depth.clone() + 1)); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("if ".to_string(), cond_str), bs.block_open.clone()), make_indent((depth.clone() + 1))), then_str), "\n".to_string()), make_indent(depth.clone())), bs.else_clause.clone()), make_indent((depth.clone() + 1))), else_str), "\n".to_string()), make_indent(depth.clone())), bs.block_close.clone()) -}, - IfValueForm::ConditionalTernary => { - let then_str = recurse(then_branch.clone(), depth.clone()); -let else_str = recurse(eb.clone(), depth.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("(".to_string(), then_str), ") if (".to_string()), cond_str), ") else (".to_string()), else_str), ")".to_string()) -}, - IfValueForm::IfStatement => { - let result_type = match if_result_type { - Some(rt) => emit_node_type(rt.clone(), target.clone(), source_indices), - None => emit_node_type(resolved_type(then_branch.clone()), target.clone(), source_indices), -}; -let then_str = recurse(then_branch.clone(), depth.clone()); -let else_str = recurse(eb.clone(), depth.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("func() ".to_string(), result_type), " { if ".to_string()), cond_str), bs.block_open.clone()), make_indent((depth.clone() + 1))), "return ".to_string()), then_str), "\n".to_string()), make_indent(depth.clone())), bs.else_clause.clone()), make_indent((depth.clone() + 1))), "return ".to_string()), else_str), "\n".to_string()), make_indent(depth.clone())), bs.block_close.clone()), " }()".to_string()) -}, -}, - None => if bs.significant_whitespace.clone() { - { - let then_str = recurse(then_branch.clone(), depth.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("if ".to_string(), cond_str), bs.block_open.clone()), make_indent((depth.clone() + 1))), then_str) -} - } else { - { - let then_str = recurse(then_branch.clone(), (depth.clone() + 1)); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("if ".to_string(), cond_str), bs.block_open.clone()), make_indent((depth.clone() + 1))), then_str), "\n".to_string()), make_indent(depth.clone())), bs.block_close.clone()) -} - }, -} -} + let es = spec.expression_semantics.clone(); + let bs = spec.block_syntax.clone(); + match else_branch { + Some(eb) => match es.if_value_form.clone() { + IfValueForm::IfExpression => { + let then_str = recurse(then_branch.clone(), (depth.clone() + 1)); + let else_str = recurse(eb.clone(), (depth.clone() + 1)); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "if ".to_string(), + cond_str, + ), + bs.block_open.clone(), + ), + make_indent((depth.clone() + 1)), + ), + then_str, + ), + "\n".to_string(), + ), + make_indent(depth.clone()), + ), + bs.else_clause.clone(), + ), + make_indent((depth.clone() + 1)), + ), + else_str, + ), + "\n".to_string(), + ), + make_indent(depth.clone()), + ), + bs.block_close.clone(), + ) + } + IfValueForm::ConditionalTernary => { + let then_str = recurse(then_branch.clone(), depth.clone()); + let else_str = recurse(eb.clone(), depth.clone()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("(".to_string(), then_str), + ") if (".to_string(), + ), + cond_str, + ), + ") else (".to_string(), + ), + else_str, + ), + ")".to_string(), + ) + } + IfValueForm::IfStatement => { + let result_type = match if_result_type { + Some(rt) => emit_node_type(rt.clone(), target.clone(), source_indices), + None => emit_node_type( + resolved_type(then_branch.clone()), + target.clone(), + source_indices, + ), + }; + let then_str = recurse(then_branch.clone(), depth.clone()); + let else_str = recurse(eb.clone(), depth.clone()); + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("func() ".to_string(), result_type), " { if ".to_string()), cond_str), bs.block_open.clone()), make_indent((depth.clone() + 1))), "return ".to_string()), then_str), "\n".to_string()), make_indent(depth.clone())), bs.else_clause.clone()), make_indent((depth.clone() + 1))), "return ".to_string()), else_str), "\n".to_string()), make_indent(depth.clone())), bs.block_close.clone()), " }()".to_string()) + } + }, + None => { + if bs.significant_whitespace.clone() { + { + let then_str = recurse(then_branch.clone(), depth.clone()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("if ".to_string(), cond_str), + bs.block_open.clone(), + ), + make_indent((depth.clone() + 1)), + ), + then_str, + ) + } + } else { + { + let then_str = recurse(then_branch.clone(), (depth.clone() + 1)); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("if ".to_string(), cond_str), + bs.block_open.clone(), + ), + make_indent((depth.clone() + 1)), + ), + then_str, + ), + "\n".to_string(), + ), + make_indent(depth.clone()), + ), + bs.block_close.clone(), + ) + } + } + } + } + } } -pub fn emit_param_shared(param: &Rc, target: &RenderTarget, source_indices: &Rc>>) -> String { +pub fn emit_param_shared( + param: &Rc, + target: &RenderTarget, + source_indices: &Rc>>, +) -> String { { - let ty = emit_node_type(param_node_type_expr(¶m), target.clone(), source_indices.clone()); -v2_rt::concat(v2_rt::concat(emit_ident(param_node_name_at(param.clone(), source_indices.clone()), target.clone()), language_spec(target.clone()).items.clone().param_type_sep.clone()), ty) -} + let ty = emit_node_type( + param_node_type_expr(¶m), + target.clone(), + source_indices.clone(), + ); + v2_rt::concat( + v2_rt::concat( + emit_ident( + param_node_name_at(param.clone(), source_indices.clone()), + target.clone(), + ), + language_spec(target.clone()) + .items + .clone() + .param_type_sep + .clone(), + ), + ty, + ) + } } -pub fn emit_params_shared(params: Rc>>, target: &RenderTarget, source_indices: Rc>>) -> String { +pub fn emit_params_shared( + params: Rc>>, + target: &RenderTarget, + source_indices: Rc>>, +) -> String { { - let strs = Rc::new({ let mut __result = Vec::new(); for p in params.iter().cloned() { __result.push(emit_param_shared(&p, &target, &source_indices)); } __result }); -strs.join(&language_spec(target.clone()).items.clone().param_separator.clone()) -} + let strs = Rc::new({ + let mut __result = Vec::new(); + for p in params.iter().cloned() { + __result.push(emit_param_shared(&p, &target, &source_indices)); + } + __result + }); + strs.join( + &language_spec(target.clone()) + .items + .clone() + .param_separator + .clone(), + ) + } } -pub fn emit_inferred_shared(inferred: &Rc, target: &RenderTarget, source_indices: Rc>>) -> String { - if language_spec(target.clone()).expression_semantics.clone().suppress_unit_return.clone() { +pub fn emit_inferred_shared( + inferred: &Rc, + target: &RenderTarget, + source_indices: Rc>>, +) -> String { + if language_spec(target.clone()) + .expression_semantics + .clone() + .suppress_unit_return + .clone() + { if is_unit_like(&inferred) { "".to_string() } else { - v2_rt::concat(language_spec(target.clone()).items.clone().return_arrow.clone(), emit_node_type(inferred.clone(), target.clone(), source_indices)) + v2_rt::concat( + language_spec(target.clone()) + .items + .clone() + .return_arrow + .clone(), + emit_node_type(inferred.clone(), target.clone(), source_indices), + ) } } else { - v2_rt::concat(language_spec(target.clone()).items.clone().return_arrow.clone(), emit_node_type(inferred.clone(), target.clone(), source_indices)) + v2_rt::concat( + language_spec(target.clone()) + .items + .clone() + .return_arrow + .clone(), + emit_node_type(inferred.clone(), target.clone(), source_indices), + ) } } -pub fn emit_typed_block_join(stmts: Rc>>, scope: Rc, depth: i64, emit_block_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone) -> String { +pub fn emit_typed_block_join( + stmts: Rc>>, + scope: Rc, + depth: i64, + emit_block_stmts: impl Fn(Rc>>, Rc, i64) -> Rc + Clone, +) -> String { { let state = emit_block_stmts(stmts, scope, depth); -state.text.clone().join(&"\n".to_string()) -} + state.text.clone().join(&"\n".to_string()) + } } -pub fn method_template_emit_for_target(target: RenderTarget) -> Option>> { +pub fn method_template_emit_for_target( + target: RenderTarget, +) -> Option>> { match target { - RenderTarget::Rust => Some(rust_method_template_emit()), - RenderTarget::Python => Some(python_method_template_emit()), - RenderTarget::Go => Some(go_method_template_emit()), - RenderTarget::Dag => None, -} + RenderTarget::Rust => Some(rust_method_template_emit()), + RenderTarget::Python => Some(python_method_template_emit()), + RenderTarget::Go => Some(go_method_template_emit()), + RenderTarget::Dag => None, + } } -pub fn emit_algebra_method_template(method_name: String, recv_str: String, first_arg_str: String, target: RenderTarget) -> Option { +pub fn emit_algebra_method_template( + method_name: String, + recv_str: String, + first_arg_str: String, + target: RenderTarget, +) -> Option { match method_template_emit_for_target(target) { - Some(templates) => match v2_rt::map_get(&templates, method_name) { - Some(tmpl) => { - let bindings = v2_rt::rc_map_insert(seed_bindings("recv".to_string(), recv_str), "arg".to_string(), first_arg_str); -Some(apply_named_template(tmpl.clone(), &bindings)) -}, - None => None, -}, - None => None, -} + Some(templates) => match v2_rt::map_get(&templates, method_name) { + Some(tmpl) => { + let bindings = v2_rt::rc_map_insert( + seed_bindings("recv".to_string(), recv_str), + "arg".to_string(), + first_arg_str, + ); + Some(apply_named_template(tmpl.clone(), &bindings)) + } + None => None, + }, + None => None, + } } -pub fn emit_typed_first_arg_shared(args: Rc>>, target: RenderTarget, recurse: impl Fn(Rc) -> String + Clone) -> String { +pub fn emit_typed_first_arg_shared( + args: Rc>>, + target: RenderTarget, + recurse: impl Fn(Rc) -> String + Clone, +) -> String { match args.first().cloned() { - Some(a) => recurse(arg_value(&a)), - None => emit_error_expr("missing method argument".to_string(), target), -} + Some(a) => recurse(arg_value(&a)), + None => emit_error_expr("missing method argument".to_string(), target), + } } -pub fn emit_typed_string_interp_unified(parts: &Rc>>, target: RenderTarget, recurse: impl Fn(Rc) -> String + Clone) -> String { +pub fn emit_typed_string_interp_unified( + parts: &Rc>>, + target: RenderTarget, + recurse: impl Fn(Rc) -> String + Clone, +) -> String { { let spec = language_spec(target); -let interp = spec.string_interp.clone(); -let has_interpolations = { let mut __found = false; for p in parts.clone().iter().cloned() { if match (*p.clone()).clone() { - StringPart::Interpolation { .. } => true, - _ => false, -} { __found = true; break; } } __found }; -match (*interp.style.clone()).clone() { - InterpStyle::FormatArgs { placeholder: ph, .. } => { - let fmt_parts = Rc::new({ let mut __result = Vec::new(); for p in parts.clone().iter().cloned() { __result.push(match (*p.clone()).clone() { - StringPart::Text { value: v, .. } => { - let base = escape_string_literal_body(v.clone()); -let escaped = if has_interpolations.clone() { - apply_escape_pairs(base.clone(), interp.escape_pairs.clone()) - } else { - base.clone() - }; -Rc::new(InterpPart { - format_segment: escaped.clone(), - arg_expr: "".to_string(), -}) -}, - StringPart::Interpolation { expr: e, .. } => Rc::new(InterpPart { - format_segment: ph.clone(), - arg_expr: recurse(e.clone()), -}), -}); } __result }); -let fmt_str = Rc::new({ let mut __result = Vec::new(); for p in fmt_parts.clone().iter().cloned() { __result.push(p.format_segment.clone()); } __result }).join(&"".to_string()); -let args = Rc::new({ let mut __result = Vec::new(); for a in Rc::new({ let mut __result = Vec::new(); for p in fmt_parts.clone().iter().cloned() { __result.push(p.arg_expr.clone()); } __result }).iter().cloned() { if (a.clone().as_str() != "".to_string().as_str()) { __result.push(a); } } __result }); -if ((args.clone().len() as i64) == 0) { - apply_type_template1(interp.plain_template.clone(), fmt_str) - } else { - { - let args_str = args.clone().join(&", ".to_string()); -apply_type_template2(interp.format_template.clone(), fmt_str, args_str) -} + let interp = spec.string_interp.clone(); + let has_interpolations = { + let mut __found = false; + for p in parts.clone().iter().cloned() { + if match (*p.clone()).clone() { + StringPart::Interpolation { .. } => true, + _ => false, + } { + __found = true; + break; + } } -}, - InterpStyle::InlineExpr => { - let segments = Rc::new({ let mut __result = Vec::new(); for p in parts.clone().iter().cloned() { __result.push(match (*p.clone()).clone() { - StringPart::Text { value: v, .. } => { - let base = escape_string_literal_body(v.clone()); -if has_interpolations.clone() { - apply_escape_pairs(base.clone(), interp.escape_pairs.clone()) + __found + }; + match (*interp.style.clone()).clone() { + InterpStyle::FormatArgs { + placeholder: ph, .. + } => { + let fmt_parts = Rc::new({ + let mut __result = Vec::new(); + for p in parts.clone().iter().cloned() { + __result.push(match (*p.clone()).clone() { + StringPart::Text { value: v, .. } => { + let base = escape_string_literal_body(v.clone()); + let escaped = if has_interpolations.clone() { + apply_escape_pairs(base.clone(), interp.escape_pairs.clone()) + } else { + base.clone() + }; + Rc::new(InterpPart { + format_segment: escaped.clone(), + arg_expr: "".to_string(), + }) + } + StringPart::Interpolation { expr: e, .. } => Rc::new(InterpPart { + format_segment: ph.clone(), + arg_expr: recurse(e.clone()), + }), + }); + } + __result + }); + let fmt_str = Rc::new({ + let mut __result = Vec::new(); + for p in fmt_parts.clone().iter().cloned() { + __result.push(p.format_segment.clone()); + } + __result + }) + .join(&"".to_string()); + let args = Rc::new({ + let mut __result = Vec::new(); + for a in Rc::new({ + let mut __result = Vec::new(); + for p in fmt_parts.clone().iter().cloned() { + __result.push(p.arg_expr.clone()); + } + __result + }) + .iter() + .cloned() + { + if (a.clone().as_str() != "".to_string().as_str()) { + __result.push(a); + } + } + __result + }); + if ((args.clone().len() as i64) == 0) { + apply_type_template1(interp.plain_template.clone(), fmt_str) } else { - base.clone() + { + let args_str = args.clone().join(&", ".to_string()); + apply_type_template2(interp.format_template.clone(), fmt_str, args_str) + } } -}, - StringPart::Interpolation { expr: e, .. } => v2_rt::concat(v2_rt::concat("{".to_string(), recurse(e.clone())), "}".to_string()), -}); } __result }); -apply_type_template1(interp.format_template.clone(), segments.join(&"".to_string())) -}, -} -} + } + InterpStyle::InlineExpr => { + let segments = Rc::new({ + let mut __result = Vec::new(); + for p in parts.clone().iter().cloned() { + __result.push(match (*p.clone()).clone() { + StringPart::Text { value: v, .. } => { + let base = escape_string_literal_body(v.clone()); + if has_interpolations.clone() { + apply_escape_pairs(base.clone(), interp.escape_pairs.clone()) + } else { + base.clone() + } + } + StringPart::Interpolation { expr: e, .. } => v2_rt::concat( + v2_rt::concat("{".to_string(), recurse(e.clone())), + "}".to_string(), + ), + }); + } + __result + }); + apply_type_template1( + interp.format_template.clone(), + segments.join(&"".to_string()), + ) + } + } + } } -pub fn emit_typed_record_lit_unified(type_name: Option, fields: &Rc>>, target: &RenderTarget, source_indices: Rc>>, recurse: impl Fn(Rc) -> String + Clone) -> String { +pub fn emit_typed_record_lit_unified( + type_name: Option, + fields: &Rc>>, + target: &RenderTarget, + source_indices: Rc>>, + recurse: impl Fn(Rc) -> String + Clone, +) -> String { { let rls = language_spec(target.clone()).record_lit.clone(); -match type_name { - None => if ((fields.clone().len() as i64) == 0) { - rls.anon_empty.clone() - } else { - { - let field_strs = Rc::new({ let mut __result = Vec::new(); for f in fields.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rls.anon_field_indent.clone(), "\"".to_string()), field_init_node_name_at(f.clone(), source_indices.clone())), "\": ".to_string()), recurse(field_init_node_value(&f))), ",".to_string())); } __result }); -let fields_str = field_strs.join(&"\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(rls.anon_prefix.clone(), fields_str), "\n".to_string()), rls.anon_suffix.clone()) -} - }, - Some(tn) => if ((fields.clone().len() as i64) == 0) { - v2_rt::concat(tn.clone(), rls.named_empty.clone()) - } else { - { - let field_strs = Rc::new({ let mut __result = Vec::new(); for f in fields.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(emit_export_ident(field_init_node_name_at(f.clone(), source_indices.clone()), &target), rls.named_field_sep.clone()), recurse(field_init_node_value(&f)))); } __result }); -let fields_str = field_strs.join(&rls.named_field_join.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(tn.clone(), rls.named_open.clone()), fields_str), rls.named_close.clone()) -} - }, -} -} + match type_name { + None => { + if ((fields.clone().len() as i64) == 0) { + rls.anon_empty.clone() + } else { + { + let field_strs = Rc::new({ + let mut __result = Vec::new(); + for f in fields.clone().iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + rls.anon_field_indent.clone(), + "\"".to_string(), + ), + field_init_node_name_at( + f.clone(), + source_indices.clone(), + ), + ), + "\": ".to_string(), + ), + recurse(field_init_node_value(&f)), + ), + ",".to_string(), + )); + } + __result + }); + let fields_str = field_strs.join(&"\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(rls.anon_prefix.clone(), fields_str), + "\n".to_string(), + ), + rls.anon_suffix.clone(), + ) + } + } + } + Some(tn) => { + if ((fields.clone().len() as i64) == 0) { + v2_rt::concat(tn.clone(), rls.named_empty.clone()) + } else { + { + let field_strs = Rc::new({ + let mut __result = Vec::new(); + for f in fields.clone().iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + emit_export_ident( + field_init_node_name_at( + f.clone(), + source_indices.clone(), + ), + &target, + ), + rls.named_field_sep.clone(), + ), + recurse(field_init_node_value(&f)), + )); + } + __result + }); + let fields_str = field_strs.join(&rls.named_field_join.clone()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(tn.clone(), rls.named_open.clone()), + fields_str, + ), + rls.named_close.clone(), + ) + } + } + } + } + } } -pub fn emit_typed_call_unified(func: &String, args: Rc>>, target: &RenderTarget, registry: Rc>>, scope: Rc, recurse: impl Fn(Rc) -> String + Clone) -> String { +pub fn emit_typed_call_unified( + func: &String, + args: Rc>>, + target: &RenderTarget, + registry: Rc>>, + scope: Rc, + recurse: impl Fn(Rc) -> String + Clone, +) -> String { { let spec = language_spec(target.clone()); -let ordered_args = order_typed_call_args(&args, func.clone(), &scope); -let arg_strs = Rc::new({ let mut __result = Vec::new(); for a in ordered_args.iter().cloned() { __result.push(recurse(arg_value(&a))); } __result }); -let callee = lookup_item(registry, func.clone()); -let extra_args = match callee.clone() { - Some(info) => { - let has_effects = (((info.service_names.clone().len() as i64) > 0) || ((info.resource_names.clone().len() as i64) > 0)); -if has_effects.clone() { - { - let resource_args = Rc::new({ let mut __result = Vec::new(); for rn in info.resource_names.clone().iter().cloned() { __result.push(emit_ident(rn.clone(), target.clone())); } __result }); -let service_args = Rc::new({ let mut __result = Vec::new(); for sn in info.service_names.clone().iter().cloned() { __result.push(service_var_name(sn.clone())); } __result }); -v2_rt::concat(resource_args, service_args) -} - } else { - Rc::new(vec![]) + let ordered_args = order_typed_call_args(&args, func.clone(), &scope); + let arg_strs = Rc::new({ + let mut __result = Vec::new(); + for a in ordered_args.iter().cloned() { + __result.push(recurse(arg_value(&a))); } -}, - None => Rc::new(vec![]), -}; -let all_args = v2_rt::concat(arg_strs, extra_args); -let args_str = all_args.join(&", ".to_string()); -let call_str = v2_rt::concat(v2_rt::concat(v2_rt::concat(emit_export_ident(func.clone(), &target), "(".to_string()), args_str), ")".to_string()); -match callee.clone() { - Some(info) => { - let has_effects = (((info.service_names.clone().len() as i64) > 0) || ((info.resource_names.clone().len() as i64) > 0)); -if has_effects.clone() { - v2_rt::concat(spec.async_call_prefix.clone(), call_str) - } else { - call_str + __result + }); + let callee = lookup_item(registry, func.clone()); + let extra_args = match callee.clone() { + Some(info) => { + let has_effects = (((info.service_names.clone().len() as i64) > 0) + || ((info.resource_names.clone().len() as i64) > 0)); + if has_effects.clone() { + { + let resource_args = Rc::new({ + let mut __result = Vec::new(); + for rn in info.resource_names.clone().iter().cloned() { + __result.push(emit_ident(rn.clone(), target.clone())); + } + __result + }); + let service_args = Rc::new({ + let mut __result = Vec::new(); + for sn in info.service_names.clone().iter().cloned() { + __result.push(service_var_name(sn.clone())); + } + __result + }); + v2_rt::concat(resource_args, service_args) + } + } else { + Rc::new(vec![]) + } } -}, - None => call_str, -} -} + None => Rc::new(vec![]), + }; + let all_args = v2_rt::concat(arg_strs, extra_args); + let args_str = all_args.join(&", ".to_string()); + let call_str = v2_rt::concat( + v2_rt::concat( + v2_rt::concat(emit_export_ident(func.clone(), &target), "(".to_string()), + args_str, + ), + ")".to_string(), + ); + match callee.clone() { + Some(info) => { + let has_effects = (((info.service_names.clone().len() as i64) > 0) + || ((info.resource_names.clone().len() as i64) > 0)); + if has_effects.clone() { + v2_rt::concat(spec.async_call_prefix.clone(), call_str) + } else { + call_str + } + } + None => call_str, + } + } } pub fn bridge_method_name_unified(method_name: String, target: RenderTarget) -> String { { let spec = language_spec(target); -let overridden = apply_bridge_method_overrides(method_name, spec.bridge_method_overrides.clone()); -apply_naming_case(overridden, spec.bridge_method_case.clone()) -} + let overridden = + apply_bridge_method_overrides(method_name, spec.bridge_method_overrides.clone()); + apply_naming_case(overridden, spec.bridge_method_case.clone()) + } } -pub fn emit_algebra_method_call_unified(method_name: &String, receiver: Rc, args: Rc>>, target: &RenderTarget, first_arg_str: String, recurse: impl Fn(Rc) -> String + Clone) -> String { +pub fn emit_algebra_method_call_unified( + method_name: &String, + receiver: Rc, + args: Rc>>, + target: &RenderTarget, + first_arg_str: String, + recurse: impl Fn(Rc) -> String + Clone, +) -> String { { let spec = language_spec(target.clone()); -let recv_str = recurse(receiver); -match emit_algebra_method_template(method_name.clone(), recv_str.clone(), first_arg_str, target.clone()) { - Some(result) => result.clone(), - None => { - let function_name = bridge_method_name_unified(method_name.clone(), target.clone()); -let arg_strs = Rc::new({ let mut __result = Vec::new(); for a in args.iter().cloned() { __result.push(recurse(arg_value(&a))); } __result }); -let all_args = v2_rt::concat(Rc::new(vec![recv_str.clone()]), arg_strs); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(spec.bridge_method_prefix.clone(), emit_export_ident(function_name, &target)), "(".to_string()), all_args.join(&", ".to_string())), ")".to_string()) -}, -} -} + let recv_str = recurse(receiver); + match emit_algebra_method_template( + method_name.clone(), + recv_str.clone(), + first_arg_str, + target.clone(), + ) { + Some(result) => result.clone(), + None => { + let function_name = bridge_method_name_unified(method_name.clone(), target.clone()); + let arg_strs = Rc::new({ + let mut __result = Vec::new(); + for a in args.iter().cloned() { + __result.push(recurse(arg_value(&a))); + } + __result + }); + let all_args = v2_rt::concat(Rc::new(vec![recv_str.clone()]), arg_strs); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + spec.bridge_method_prefix.clone(), + emit_export_ident(function_name, &target), + ), + "(".to_string(), + ), + all_args.join(&", ".to_string()), + ), + ")".to_string(), + ) + } + } + } } -pub fn emit_plain_method_call_unified(receiver: Rc, method: String, args: Rc>>, target: RenderTarget, recurse: impl Fn(Rc) -> String + Clone) -> String { +pub fn emit_plain_method_call_unified( + receiver: Rc, + method: String, + args: Rc>>, + target: RenderTarget, + recurse: impl Fn(Rc) -> String + Clone, +) -> String { { let recv_str = recurse(receiver); -let arg_strs = Rc::new({ let mut __result = Vec::new(); for a in args.iter().cloned() { __result.push(recurse(arg_value(&a))); } __result }); -let args_str = arg_strs.join(&", ".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(recv_str, ".".to_string()), emit_export_ident(method, &target)), "(".to_string()), args_str), ")".to_string()) -} + let arg_strs = Rc::new({ + let mut __result = Vec::new(); + for a in args.iter().cloned() { + __result.push(recurse(arg_value(&a))); + } + __result + }); + let args_str = arg_strs.join(&", ".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(recv_str, ".".to_string()), + emit_export_ident(method, &target), + ), + "(".to_string(), + ), + args_str, + ), + ")".to_string(), + ) + } } -pub fn emit_typed_method_call_unified(receiver: &Rc, method: String, args: &Rc>>, method_semantics: &Option>, target: &RenderTarget, registry: Rc>>, scope: Rc, depth: i64, recurse: impl Fn(Rc) -> String + Clone) -> String { +pub fn emit_typed_method_call_unified( + receiver: &Rc, + method: String, + args: &Rc>>, + method_semantics: &Option>, + target: &RenderTarget, + registry: Rc>>, + scope: Rc, + depth: i64, + recurse: impl Fn(Rc) -> String + Clone, +) -> String { { let spec = language_spec(target.clone()); -let source_indices = scope.type_env.clone().source_indices.clone(); -if (method_semantics.clone() != None) { + let source_indices = scope.type_env.clone().source_indices.clone(); + if (method_semantics.clone() != None) { match (*method_semantics.clone().unwrap()).clone() { - MethodSemantics::ServiceMethodSemantics { service_name: svc_name, .. } => { - let var_name = service_var_name(svc_name.clone()); -let arg_strs = Rc::new({ let mut __result = Vec::new(); for a in args.clone().iter().cloned() { __result.push(recurse(arg_value(&a))); } __result }); -let args_str = arg_strs.join(&", ".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(spec.async_call_prefix.clone(), var_name), ".".to_string()), emit_export_ident(method, &target)), "(".to_string()), args_str), ")".to_string()) -}, - MethodSemantics::AlgebraMethodSemantics { method_def, .. } => { - let mn = authored_name_at(source_indices.clone(), &method_def); -let first_arg_str = emit_typed_first_arg_shared(args.clone(), target.clone(), recurse.clone()); -emit_algebra_method_call_unified(&mn, receiver.clone(), args.clone(), &target, first_arg_str, recurse.clone()) -}, - MethodSemantics::PlainMethodSemantics => emit_plain_method_call_unified(receiver.clone(), method, args.clone(), target.clone(), recurse.clone()), -} + MethodSemantics::ServiceMethodSemantics { + service_name: svc_name, + .. + } => { + let var_name = service_var_name(svc_name.clone()); + let arg_strs = Rc::new({ + let mut __result = Vec::new(); + for a in args.clone().iter().cloned() { + __result.push(recurse(arg_value(&a))); + } + __result + }); + let args_str = arg_strs.join(&", ".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(spec.async_call_prefix.clone(), var_name), + ".".to_string(), + ), + emit_export_ident(method, &target), + ), + "(".to_string(), + ), + args_str, + ), + ")".to_string(), + ) + } + MethodSemantics::AlgebraMethodSemantics { method_def, .. } => { + let mn = authored_name_at(source_indices.clone(), &method_def); + let first_arg_str = + emit_typed_first_arg_shared(args.clone(), target.clone(), recurse.clone()); + emit_algebra_method_call_unified( + &mn, + receiver.clone(), + args.clone(), + &target, + first_arg_str, + recurse.clone(), + ) + } + MethodSemantics::PlainMethodSemantics => emit_plain_method_call_unified( + receiver.clone(), + method, + args.clone(), + target.clone(), + recurse.clone(), + ), + } } else { if is_typed_service_call_receiver(&receiver, source_indices.clone()) { match extract_typed_service_name(&receiver, &source_indices) { - Some(svc_name) => { - let var_name = service_var_name(svc_name.clone()); -let arg_strs = Rc::new({ let mut __result = Vec::new(); for a in args.clone().iter().cloned() { __result.push(recurse(arg_value(&a))); } __result }); -let args_str = arg_strs.join(&", ".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(spec.async_call_prefix.clone(), var_name), ".".to_string()), emit_export_ident(method, &target)), "(".to_string()), args_str), ")".to_string()) -}, - None => emit_error_expr("unsupported service receiver".to_string(), target.clone()), -} + Some(svc_name) => { + let var_name = service_var_name(svc_name.clone()); + let arg_strs = Rc::new({ + let mut __result = Vec::new(); + for a in args.clone().iter().cloned() { + __result.push(recurse(arg_value(&a))); + } + __result + }); + let args_str = arg_strs.join(&", ".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(spec.async_call_prefix.clone(), var_name), + ".".to_string(), + ), + emit_export_ident(method, &target), + ), + "(".to_string(), + ), + args_str, + ), + ")".to_string(), + ) + } + None => { + emit_error_expr("unsupported service receiver".to_string(), target.clone()) + } + } } else { - emit_plain_method_call_unified(receiver.clone(), method, args.clone(), target.clone(), recurse.clone()) + emit_plain_method_call_unified( + receiver.clone(), + method, + args.clone(), + target.clone(), + recurse.clone(), + ) } } -} + } } -pub fn emit_unified_pattern(pattern: Rc, target: RenderTarget, source_indices: Rc>>) -> String { +pub fn emit_unified_pattern( + pattern: Rc, + target: RenderTarget, + source_indices: Rc>>, +) -> String { match (*pattern).clone() { - MatchPattern::Bind { name: n, .. } => emit_ident(n.clone(), target), - MatchPattern::LitPattern { value: v, .. } => emit_literal(v.clone(), &target), - MatchPattern::VariantPattern { name: n, field_bindings: fbs, .. } => emit_unified_variant_pattern(n.clone(), &fbs, &target, source_indices), - MatchPattern::Wildcard => "_".to_string(), -} + MatchPattern::Bind { name: n, .. } => emit_ident(n.clone(), target), + MatchPattern::LitPattern { value: v, .. } => emit_literal(v.clone(), &target), + MatchPattern::VariantPattern { + name: n, + field_bindings: fbs, + .. + } => emit_unified_variant_pattern(n.clone(), &fbs, &target, source_indices), + MatchPattern::Wildcard => "_".to_string(), + } } -pub fn emit_unified_variant_pattern(name: String, field_bindings: &Rc>>, target: &RenderTarget, source_indices: Rc>>) -> String { +pub fn emit_unified_variant_pattern( + name: String, + field_bindings: &Rc>>, + target: &RenderTarget, + source_indices: Rc>>, +) -> String { { let es = language_spec(target.clone()).expression_semantics.clone(); -match es.variant_pattern.clone() { - Some(vps) => if ((field_bindings.clone().len() as i64) == 0) { - v2_rt::concat(name, vps.empty_suffix.clone()) - } else { - { - let binding_strs = Rc::new({ let mut __result = Vec::new(); for fb in field_bindings.clone().iter().cloned() { __result.push({ - let pat_str = emit_unified_pattern(field_binding_pattern(fb.clone()), target.clone(), source_indices.clone()); -v2_rt::concat(v2_rt::concat(emit_ident(field_binding_name_at(fb.clone(), source_indices.clone()), target.clone()), vps.binding_sep.clone()), pat_str.clone()) -}); } __result }); -v2_rt::concat(v2_rt::concat(v2_rt::concat(name, vps.open.clone()), binding_strs.join(&", ".to_string())), vps.close.clone()) -} - }, - None => if ((field_bindings.clone().len() as i64) > 0) { - emit_error_expr(v2_rt::concat("variant pattern has bindings but target has no destructuring syntax: ".to_string(), name), target.clone()) - } else { - name - }, -} -} + match es.variant_pattern.clone() { + Some(vps) => { + if ((field_bindings.clone().len() as i64) == 0) { + v2_rt::concat(name, vps.empty_suffix.clone()) + } else { + { + let binding_strs = Rc::new({ + let mut __result = Vec::new(); + for fb in field_bindings.clone().iter().cloned() { + __result.push({ + let pat_str = emit_unified_pattern( + field_binding_pattern(fb.clone()), + target.clone(), + source_indices.clone(), + ); + v2_rt::concat( + v2_rt::concat( + emit_ident( + field_binding_name_at( + fb.clone(), + source_indices.clone(), + ), + target.clone(), + ), + vps.binding_sep.clone(), + ), + pat_str.clone(), + ) + }); + } + __result + }); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(name, vps.open.clone()), + binding_strs.join(&", ".to_string()), + ), + vps.close.clone(), + ) + } + } + } + None => { + if ((field_bindings.clone().len() as i64) > 0) { + emit_error_expr( + v2_rt::concat( + "variant pattern has bindings but target has no destructuring syntax: " + .to_string(), + name, + ), + target.clone(), + ) + } else { + name + } + } + } + } } -pub fn emit_match_arm_line(arm: Rc, target: RenderTarget, case_depth: i64, body_depth: i64, body_str: String, guard_str: String, render_pattern: impl Fn(Rc) -> String + Clone) -> String { +pub fn emit_match_arm_line( + arm: Rc, + target: RenderTarget, + case_depth: i64, + body_depth: i64, + body_str: String, + guard_str: String, + render_pattern: impl Fn(Rc) -> String + Clone, +) -> String { { let spec = language_spec(target); -let bs = spec.block_syntax.clone(); -let es = spec.expression_semantics.clone(); -let pat = arm_pattern(arm); -let case_kw = match (*pat.clone()).clone() { - MatchPattern::Wildcard => match es.wildcard_case.clone() { - Some(wc) => wc.clone(), - None => v2_rt::concat(bs.case_keyword.clone(), render_pattern(pat.clone())), -}, - _ => v2_rt::concat(bs.case_keyword.clone(), render_pattern(pat.clone())), -}; -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(make_indent(case_depth), case_kw), guard_str), ":\n".to_string()), make_indent(body_depth)), body_str) -} + let bs = spec.block_syntax.clone(); + let es = spec.expression_semantics.clone(); + let pat = arm_pattern(arm); + let case_kw = match (*pat.clone()).clone() { + MatchPattern::Wildcard => match es.wildcard_case.clone() { + Some(wc) => wc.clone(), + None => v2_rt::concat(bs.case_keyword.clone(), render_pattern(pat.clone())), + }, + _ => v2_rt::concat(bs.case_keyword.clone(), render_pattern(pat.clone())), + }; + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(v2_rt::concat(make_indent(case_depth), case_kw), guard_str), + ":\n".to_string(), + ), + make_indent(body_depth), + ), + body_str, + ) + } } -pub fn emit_arm_guard(arm: Rc, target: &RenderTarget, render_guard_expr: impl Fn(Rc) -> String + Clone) -> String { +pub fn emit_arm_guard( + arm: Rc, + target: &RenderTarget, + render_guard_expr: impl Fn(Rc) -> String + Clone, +) -> String { { let es = language_spec(target.clone()).expression_semantics.clone(); -match arm_guard(&arm) { - Some(g) => match es.guard_prefix.clone() { - Some(prefix) => v2_rt::concat(prefix.clone(), render_guard_expr(g.clone())), - None => emit_error_expr("target does not support pattern guards".to_string(), target.clone()), -}, - None => "".to_string(), -} -} + match arm_guard(&arm) { + Some(g) => match es.guard_prefix.clone() { + Some(prefix) => v2_rt::concat(prefix.clone(), render_guard_expr(g.clone())), + None => emit_error_expr( + "target does not support pattern guards".to_string(), + target.clone(), + ), + }, + None => "".to_string(), + } + } } -pub fn emit_typed_match_unified(scrutinee_str: String, arms: Rc>>, target: &RenderTarget, depth: i64, recurse: impl Fn(Rc, i64) -> String + Clone, render_pattern: impl Fn(Rc) -> String + Clone, source_indices: Rc>>) -> String { +pub fn emit_typed_match_unified( + scrutinee_str: String, + arms: Rc>>, + target: &RenderTarget, + depth: i64, + recurse: impl Fn(Rc, i64) -> String + Clone, + render_pattern: impl Fn(Rc) -> String + Clone, + source_indices: Rc>>, +) -> String { { let bs = language_spec(target.clone()).block_syntax.clone(); -let case_depth = if bs.significant_whitespace.clone() { + let case_depth = if bs.significant_whitespace.clone() { (depth.clone() + 1) } else { depth.clone() }; -let body_depth = (case_depth.clone() + 1); -let arm_strs = Rc::new({ let mut __result = Vec::new(); for arm in arms.iter().cloned() { __result.push({ - let body_str = recurse(arm_body(&arm), body_depth.clone()); -let guard_str = emit_arm_guard(arm.clone(), &target, |g| recurse(g.clone(), depth.clone())); -emit_match_arm_line(arm.clone(), target.clone(), case_depth.clone(), body_depth.clone(), body_str.clone(), guard_str.clone(), render_pattern.clone()) -}); } __result }); -let arms_str = arm_strs.join(&"\n".to_string()); -if (bs.block_close.clone().as_str() == "".to_string().as_str()) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(bs.match_keyword.clone(), scrutinee_str), bs.block_open.clone()), arms_str) + let body_depth = (case_depth.clone() + 1); + let arm_strs = Rc::new({ + let mut __result = Vec::new(); + for arm in arms.iter().cloned() { + __result.push({ + let body_str = recurse(arm_body(&arm), body_depth.clone()); + let guard_str = + emit_arm_guard(arm.clone(), &target, |g| recurse(g.clone(), depth.clone())); + emit_match_arm_line( + arm.clone(), + target.clone(), + case_depth.clone(), + body_depth.clone(), + body_str.clone(), + guard_str.clone(), + render_pattern.clone(), + ) + }); + } + __result + }); + let arms_str = arm_strs.join(&"\n".to_string()); + if (bs.block_close.clone().as_str() == "".to_string().as_str()) { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(bs.match_keyword.clone(), scrutinee_str), + bs.block_open.clone(), + ), + arms_str, + ) } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(bs.match_keyword.clone(), scrutinee_str), bs.block_open.clone()), arms_str), "\n".to_string()), make_indent(depth.clone())), bs.block_close.clone()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(bs.match_keyword.clone(), scrutinee_str), + bs.block_open.clone(), + ), + arms_str, + ), + "\n".to_string(), + ), + make_indent(depth.clone()), + ), + bs.block_close.clone(), + ) } -} + } } -pub fn emit_field_access_unified(base_str: String, field: String, summary: Option>, target: &RenderTarget) -> String { +pub fn emit_field_access_unified( + base_str: String, + field: String, + summary: Option>, + target: &RenderTarget, +) -> String { { let ts = language_spec(target.clone()).tuple_syntax.clone(); -match summary { - Some(fs) => match fs.access_style.clone() { - FieldAccessStyle::TupleFirst => v2_rt::concat(base_str, ts.first_accessor.clone()), - FieldAccessStyle::TupleSecond => v2_rt::concat(base_str, ts.second_accessor.clone()), - _ => v2_rt::concat(v2_rt::concat(base_str, ".".to_string()), emit_export_ident(field, &target)), -}, - None => v2_rt::concat(v2_rt::concat(base_str, ".".to_string()), emit_export_ident(field, &target)), -} -} + match summary { + Some(fs) => match fs.access_style.clone() { + FieldAccessStyle::TupleFirst => v2_rt::concat(base_str, ts.first_accessor.clone()), + FieldAccessStyle::TupleSecond => { + v2_rt::concat(base_str, ts.second_accessor.clone()) + } + _ => v2_rt::concat( + v2_rt::concat(base_str, ".".to_string()), + emit_export_ident(field, &target), + ), + }, + None => v2_rt::concat( + v2_rt::concat(base_str, ".".to_string()), + emit_export_ident(field, &target), + ), + } + } } -pub fn emit_unified_typed_expr(texpr: Rc, target: &RenderTarget, registry: Rc>>, scope: &Rc, depth: i64, fuel: i64, render_pattern: impl Fn(Rc) -> String + Clone) -> String { +pub fn emit_unified_typed_expr( + texpr: Rc, + target: &RenderTarget, + registry: Rc>>, + scope: &Rc, + depth: i64, + fuel: i64, + render_pattern: impl Fn(Rc) -> String + Clone, +) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let si = scope.type_env.clone().source_indices.clone(); -let spec = language_spec(target.clone()); -emit_shared_expr(&texpr, &target, si.clone(), |result| result.clone(), |child| emit_unified_typed_expr(child.clone(), &target, registry.clone(), &scope, depth.clone(), (fuel.clone() - 1), render_pattern.clone()), |expr| emit_expr_var_shared(expr.clone(), target.clone(), si.clone()), |expr| { + let si = scope.type_env.clone().source_indices.clone(); + let spec = language_spec(target.clone()); + emit_shared_expr( + &texpr, + &target, + si.clone(), + |result| result.clone(), + |child| { + emit_unified_typed_expr( + child.clone(), + &target, + registry.clone(), + &scope, + depth.clone(), + (fuel.clone() - 1), + render_pattern.clone(), + ) + }, + |expr| emit_expr_var_shared(expr.clone(), target.clone(), si.clone()), + |expr| { let fa_si = scope.type_env.clone().source_indices.clone(); -if is_typed_service_call_receiver(&expr, fa_si.clone()) { + if is_typed_service_call_receiver(&expr, fa_si.clone()) { match extract_typed_service_name(&expr, &fa_si) { - Some(svc_name) => service_var_name(svc_name.clone()), - None => { - let base_str = emit_unified_typed_expr(field_access_base(expr.clone()), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone()); -emit_field_access_unified(base_str.clone(), field_access_field_at(expr.clone(), fa_si.clone()), expr_field_access_summary(expr.clone()), &target) -}, -} + Some(svc_name) => service_var_name(svc_name.clone()), + None => { + let base_str = emit_unified_typed_expr( + field_access_base(expr.clone()), + &target, + registry.clone(), + &scope, + depth.clone(), + 1024, + render_pattern.clone(), + ); + emit_field_access_unified( + base_str.clone(), + field_access_field_at(expr.clone(), fa_si.clone()), + expr_field_access_summary(expr.clone()), + &target, + ) + } + } } else { { - let base_str = emit_unified_typed_expr(field_access_base(expr.clone()), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone()); -emit_field_access_unified(base_str.clone(), field_access_field_at(expr.clone(), fa_si.clone()), expr_field_access_summary(expr.clone()), &target) -} - } -}, |expr| emit_typed_call_unified(&expr_call_func_at(expr.clone(), si.clone()), expr.children.clone(), &target, registry.clone(), scope.clone(), |n| emit_unified_typed_expr(n.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone())), |expr| emit_typed_method_call_unified(&method_receiver(expr.clone()), expr_method_name_at(expr.clone(), si.clone()), &method_arg_nodes(expr.clone()), &expr_method_call_semantics(expr.clone()), &target, registry.clone(), scope.clone(), depth.clone(), |n| emit_unified_typed_expr(n.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone())), |expr| { - let scrut_str = emit_unified_typed_expr(match_scrutinee(expr.clone()), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone()); -emit_typed_match_unified(scrut_str.clone(), match_arm_nodes(expr.clone()), &target, depth.clone(), |node, d| emit_unified_typed_expr(node.clone(), &target, registry.clone(), &scope, d.clone(), 1024, render_pattern.clone()), render_pattern.clone(), si.clone()) -}, |expr| { - let cond_str = emit_unified_typed_expr(if_condition(expr.clone()), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone()); -let if_result_type = match spec.expression_semantics.clone().if_value_form.clone() { - IfValueForm::IfStatement => Some(resolved_type(expr.clone())), - _ => None, -}; -emit_typed_if_shared(cond_str.clone(), &if_then_branch(expr.clone()), if_else_branch(expr.clone()), if_result_type.clone(), depth.clone(), &target, si.clone(), |node, d| emit_unified_typed_expr(node.clone(), &target, registry.clone(), &scope, d.clone(), 1024, render_pattern.clone())) -}, |expr| { - let val_str = emit_unified_typed_expr(let_value(expr.clone()), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone()); -emit_typed_let_shared(&let_binding_name_at(expr.clone(), si.clone()), val_str.clone(), let_body(expr.clone()), target.clone(), |bd, sc| emit_unified_typed_expr(bd.clone(), &target, registry.clone(), &sc, depth.clone(), 1024, render_pattern.clone()), scope.clone(), let_value(expr.clone())) -}, |expr| emit_typed_record_lit_unified(record_lit_type_name_at(expr.clone(), si.clone()), &expr.children.clone(), &target, si.clone(), |n| emit_unified_typed_expr(n.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone())), |expr| emit_typed_string_interp_unified(&extract_string_interp_parts(expr.clone()), target.clone(), |e| emit_unified_typed_expr(e.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone())), |expr| emit_typed_block_join(expr.children.clone(), scope.clone(), depth.clone(), |remaining, sc, d| { - let prepend = if spec.block_syntax.clone().significant_whitespace.clone() { - false - } else { - true + let base_str = emit_unified_typed_expr( + field_access_base(expr.clone()), + &target, + registry.clone(), + &scope, + depth.clone(), + 1024, + render_pattern.clone(), + ); + emit_field_access_unified( + base_str.clone(), + field_access_field_at(expr.clone(), fa_si.clone()), + expr_field_access_summary(expr.clone()), + &target, + ) + } + } + }, + |expr| { + emit_typed_call_unified( + &expr_call_func_at(expr.clone(), si.clone()), + expr.children.clone(), + &target, + registry.clone(), + scope.clone(), + |n| { + emit_unified_typed_expr( + n.clone(), + &target, + registry.clone(), + &scope, + depth.clone(), + 1024, + render_pattern.clone(), + ) + }, + ) + }, + |expr| { + emit_typed_method_call_unified( + &method_receiver(expr.clone()), + expr_method_name_at(expr.clone(), si.clone()), + &method_arg_nodes(expr.clone()), + &expr_method_call_semantics(expr.clone()), + &target, + registry.clone(), + scope.clone(), + depth.clone(), + |n| { + emit_unified_typed_expr( + n.clone(), + &target, + registry.clone(), + &scope, + depth.clone(), + 1024, + render_pattern.clone(), + ) + }, + ) + }, + |expr| { + let scrut_str = emit_unified_typed_expr( + match_scrutinee(expr.clone()), + &target, + registry.clone(), + &scope, + depth.clone(), + 1024, + render_pattern.clone(), + ); + emit_typed_match_unified( + scrut_str.clone(), + match_arm_nodes(expr.clone()), + &target, + depth.clone(), + |node, d| { + emit_unified_typed_expr( + node.clone(), + &target, + registry.clone(), + &scope, + d.clone(), + 1024, + render_pattern.clone(), + ) + }, + render_pattern.clone(), + si.clone(), + ) + }, + |expr| { + let cond_str = emit_unified_typed_expr( + if_condition(expr.clone()), + &target, + registry.clone(), + &scope, + depth.clone(), + 1024, + render_pattern.clone(), + ); + let if_result_type = match spec.expression_semantics.clone().if_value_form.clone() { + IfValueForm::IfStatement => Some(resolved_type(expr.clone())), + _ => None, }; -emit_block_stmts_shared(remaining.clone(), Rc::new(vec![]), sc.clone(), d.clone(), prepend.clone(), |stmt, s, dd| emit_unified_typed_expr(stmt.clone(), &target, registry.clone(), &s, dd.clone(), 1024, render_pattern.clone())) -}), |expr| emit_typed_cast_shared(&cast_expr(expr.clone()), cast_target(expr.clone()), &target, |child| emit_unified_typed_expr(child.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone()), &si), |expr| emit_typed_for_each_shared(&foreach_variable_at(expr.clone(), si.clone()), &foreach_collection(expr.clone()), foreach_body(expr.clone()), &target, depth.clone(), si.clone(), |child, s, d| emit_unified_typed_expr(child.clone(), &target, registry.clone(), &s, d.clone(), 1024, render_pattern.clone()), &scope), |expr| emit_typed_index_shared(&index_base(expr.clone()), index_expr(expr.clone()), &target, |child| emit_unified_typed_expr(child.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone()), &si), |expr| emit_typed_slice_shared(&slice_base(expr.clone()), slice_start(expr.clone()), slice_end(expr.clone()), &target, |child| emit_unified_typed_expr(child.clone(), &target, registry.clone(), &scope, depth.clone(), 1024, render_pattern.clone()), si.clone()), |expr| emit_default_bin_op(&expr, target.clone(), si.clone(), |child| emit_unified_typed_expr(child.clone(), &target, registry.clone(), &scope, depth.clone(), (fuel.clone() - 1), render_pattern.clone()), |result| result.clone())) -} + emit_typed_if_shared( + cond_str.clone(), + &if_then_branch(expr.clone()), + if_else_branch(expr.clone()), + if_result_type.clone(), + depth.clone(), + &target, + si.clone(), + |node, d| { + emit_unified_typed_expr( + node.clone(), + &target, + registry.clone(), + &scope, + d.clone(), + 1024, + render_pattern.clone(), + ) + }, + ) + }, + |expr| { + let val_str = emit_unified_typed_expr( + let_value(expr.clone()), + &target, + registry.clone(), + &scope, + depth.clone(), + 1024, + render_pattern.clone(), + ); + emit_typed_let_shared( + &let_binding_name_at(expr.clone(), si.clone()), + val_str.clone(), + let_body(expr.clone()), + target.clone(), + |bd, sc| { + emit_unified_typed_expr( + bd.clone(), + &target, + registry.clone(), + &sc, + depth.clone(), + 1024, + render_pattern.clone(), + ) + }, + scope.clone(), + let_value(expr.clone()), + ) + }, + |expr| { + emit_typed_record_lit_unified( + record_lit_type_name_at(expr.clone(), si.clone()), + &expr.children.clone(), + &target, + si.clone(), + |n| { + emit_unified_typed_expr( + n.clone(), + &target, + registry.clone(), + &scope, + depth.clone(), + 1024, + render_pattern.clone(), + ) + }, + ) + }, + |expr| { + emit_typed_string_interp_unified( + &extract_string_interp_parts(expr.clone()), + target.clone(), + |e| { + emit_unified_typed_expr( + e.clone(), + &target, + registry.clone(), + &scope, + depth.clone(), + 1024, + render_pattern.clone(), + ) + }, + ) + }, + |expr| { + emit_typed_block_join( + expr.children.clone(), + scope.clone(), + depth.clone(), + |remaining, sc, d| { + let prepend = if spec.block_syntax.clone().significant_whitespace.clone() { + false + } else { + true + }; + emit_block_stmts_shared( + remaining.clone(), + Rc::new(vec![]), + sc.clone(), + d.clone(), + prepend.clone(), + |stmt, s, dd| { + emit_unified_typed_expr( + stmt.clone(), + &target, + registry.clone(), + &s, + dd.clone(), + 1024, + render_pattern.clone(), + ) + }, + ) + }, + ) + }, + |expr| { + emit_typed_cast_shared( + &cast_expr(expr.clone()), + cast_target(expr.clone()), + &target, + |child| { + emit_unified_typed_expr( + child.clone(), + &target, + registry.clone(), + &scope, + depth.clone(), + 1024, + render_pattern.clone(), + ) + }, + &si, + ) + }, + |expr| { + emit_typed_for_each_shared( + &foreach_variable_at(expr.clone(), si.clone()), + &foreach_collection(expr.clone()), + foreach_body(expr.clone()), + &target, + depth.clone(), + si.clone(), + |child, s, d| { + emit_unified_typed_expr( + child.clone(), + &target, + registry.clone(), + &s, + d.clone(), + 1024, + render_pattern.clone(), + ) + }, + &scope, + ) + }, + |expr| { + emit_typed_index_shared( + &index_base(expr.clone()), + index_expr(expr.clone()), + &target, + |child| { + emit_unified_typed_expr( + child.clone(), + &target, + registry.clone(), + &scope, + depth.clone(), + 1024, + render_pattern.clone(), + ) + }, + &si, + ) + }, + |expr| { + emit_typed_slice_shared( + &slice_base(expr.clone()), + slice_start(expr.clone()), + slice_end(expr.clone()), + &target, + |child| { + emit_unified_typed_expr( + child.clone(), + &target, + registry.clone(), + &scope, + depth.clone(), + 1024, + render_pattern.clone(), + ) + }, + si.clone(), + ) + }, + |expr| { + emit_default_bin_op( + &expr, + target.clone(), + si.clone(), + |child| { + emit_unified_typed_expr( + child.clone(), + &target, + registry.clone(), + &scope, + depth.clone(), + (fuel.clone() - 1), + render_pattern.clone(), + ) + }, + |result| result.clone(), + ) + }, + ) }) } -pub fn is_tco_identity_passthrough(arg_val: &Rc, param_name: String, si: Rc>>) -> bool { +pub fn is_tco_identity_passthrough( + arg_val: &Rc, + param_name: String, + si: Rc>>, +) -> bool { match (*arg_val.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => (expr_var_name_at(arg_val.clone(), si).as_str() == param_name.as_str()), - _ => false, -} + ExprData::ExprVar { .. } => { + (expr_var_name_at(arg_val.clone(), si).as_str() == param_name.as_str()) + } + _ => false, + } } -pub fn emit_typed_tco_reassign_shared(args: Rc>>, params: Rc>>, target: &RenderTarget, recurse: impl Fn(Rc) -> String + Clone, source_indices: Rc>>) -> String { +pub fn emit_typed_tco_reassign_shared( + args: Rc>>, + params: Rc>>, + target: &RenderTarget, + recurse: impl Fn(Rc) -> String + Clone, + source_indices: Rc>>, +) -> String { { - let arg_values = Rc::new({ let mut __result = Vec::new(); for a in args.iter().cloned() { __result.push(arg_value(&a)); } __result }); -let pairs = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(params.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if { - let pname = param_node_name_at(pair.1.clone(), source_indices.clone()); -let av = match arg_values.clone().get(pair.0.clone() as usize).cloned() { - Some(v) => v.clone(), - None => pair.1.clone(), -}; -!is_tco_identity_passthrough(&av, pname.clone(), source_indices.clone()) -} { __result.push(pair); } } __result }); -let filtered_arg_values = Rc::new({ let mut __result = Vec::new(); for pair in pairs.clone().iter().cloned() { __result.push(match arg_values.clone().get(pair.0.clone() as usize).cloned() { - Some(v) => v.clone(), - None => pair.1.clone(), -}); } __result }); -let ordered_args = Rc::new({ let mut __result = Vec::new(); for av in filtered_arg_values.iter().cloned() { __result.push(recurse(av.clone())); } __result }); -let param_names = Rc::new({ let mut __result = Vec::new(); for pair in pairs.clone().iter().cloned() { __result.push(emit_ident(param_node_name_at(pair.1.clone(), source_indices.clone()), target.clone())); } __result }); -shared_tco_reassign(ordered_args, param_names, &language_spec(target.clone())) -} + let arg_values = Rc::new({ + let mut __result = Vec::new(); + for a in args.iter().cloned() { + __result.push(arg_value(&a)); + } + __result + }); + let pairs = Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + params + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + if { + let pname = param_node_name_at(pair.1.clone(), source_indices.clone()); + let av = match arg_values.clone().get(pair.0.clone() as usize).cloned() { + Some(v) => v.clone(), + None => pair.1.clone(), + }; + !is_tco_identity_passthrough(&av, pname.clone(), source_indices.clone()) + } { + __result.push(pair); + } + } + __result + }); + let filtered_arg_values = Rc::new({ + let mut __result = Vec::new(); + for pair in pairs.clone().iter().cloned() { + __result.push( + match arg_values.clone().get(pair.0.clone() as usize).cloned() { + Some(v) => v.clone(), + None => pair.1.clone(), + }, + ); + } + __result + }); + let ordered_args = Rc::new({ + let mut __result = Vec::new(); + for av in filtered_arg_values.iter().cloned() { + __result.push(recurse(av.clone())); + } + __result + }); + let param_names = Rc::new({ + let mut __result = Vec::new(); + for pair in pairs.clone().iter().cloned() { + __result.push(emit_ident( + param_node_name_at(pair.1.clone(), source_indices.clone()), + target.clone(), + )); + } + __result + }); + shared_tco_reassign(ordered_args, param_names, &language_spec(target.clone())) + } } pub fn seed_bindings(key: String, value: String) -> Rc> { diff --git a/src/v2/stage0/src/v2_compiler_emit_go.rs b/src/v2/stage0/src/v2_compiler_emit_go.rs index 5dfc39fc302..c84b2b03217 100644 --- a/src/v2/stage0/src/v2_compiler_emit_go.rs +++ b/src/v2/stage0/src/v2_compiler_emit_go.rs @@ -1,220 +1,683 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.emit_go -use std::collections::HashMap; -use std::rc::Rc; +pub use crate::extdeps_languages_go_emit::{go_reserved, go_reserved_escape_suffix}; +pub use crate::std_induction::SubValueRelation; +use crate::std_induction::SubValueRelation::SubValueUnknown; +pub use crate::v2_compiler_artifact::RenderTarget; +use crate::v2_compiler_artifact::RenderTarget::Go; +pub use crate::v2_compiler_emit::{ + apply_named_template, apply_naming_case, apply_type_template1, apply_type_template2, + apply_type_template3, capitalize_first, compute_service_fields, effective_operation_transport, + emit_algebra_method_template, emit_bin_op_symbol, emit_container, emit_default_bin_op, + emit_error_expr, emit_expr_field_access_shared, emit_expr_var_shared, emit_ident, + emit_inferred_shared, emit_keyword, emit_lambda, emit_lambda_params, emit_let_binding, + emit_list_lit_expr, emit_literal, emit_map_type, emit_node_type, emit_null_coalesce, + emit_param_shared, emit_params_shared, emit_return, emit_shared_expr, emit_simple_expr, + emit_string_literal, emit_tco_unified, emit_typed_block_join, emit_typed_call_unified, + emit_typed_cast_shared, emit_typed_first_arg_shared, emit_typed_for_each_shared, + emit_typed_if_shared, emit_typed_index_shared, emit_typed_let_shared, emit_typed_match_unified, + emit_typed_method_call_unified, emit_typed_record_lit_unified, emit_typed_slice_shared, + emit_typed_string_interp_unified, emit_unary_op, emit_unified_init_block_stmts, + emit_unified_operation_method, emit_unified_pattern, emit_unified_service_def, + emit_unified_transport_dispatch, emit_unified_typed_expr, emit_unified_typed_func_body, + empty_emit_scope, escape_go_interp_text, escape_json_string, escape_string_literal_body, + extract_string_interp_parts, extract_test_projections, has_nested_records_node, + is_data_def_item, is_function_item, is_null_coalesce, is_resource_def_item, + is_service_def_item, is_service_item, is_tco_eligible, is_type_alias_item, + is_type_alias_return_node, is_type_decl_item, is_type_def_item, is_upper, language_spec, + lookup_item, make_indent, module_emit_scope, module_to_filename, order_typed_call_args, + sanitize_service_name, scope_after_expr, seed_bindings, service_fallback_transport, + service_field_decls, service_var_name, test_file_path, test_function_name, to_lower_char, + to_screaming_snake, to_snake, to_string, to_string_helper, to_upper_char, + typed_named_arg_matches, unique_strings, BlockEmitState, EmitResult, InterpPart, + ServiceFieldSet, TestProjection, +}; +pub use crate::v2_compiler_infer::{build_params_scope, expr_span, extend_scope, InferScope}; +pub use crate::v2_compiler_infer_env::{authored_name, TypeBinding, TypeEnv}; +pub use crate::v2_compiler_infer_items::{ItemInfo, ResolvedGraph, TypedModule}; +pub use crate::v2_compiler_infer_service::{ + extract_typed_service_name, is_typed_service_call_receiver, +}; +pub use crate::v2_compiler_infer_sigs::{ResolvedFuncEnv, ResolvedFuncSig}; +pub use crate::v2_compiler_infer_types::{ + node_is_keyed_collection, normalize_access_type_node, resolved_type, +}; +use crate::v2_compiler_languages::VisibilitySpec::CaseVisibility; +pub use crate::v2_compiler_languages::{ + is_string_like, scaffold_for_target, test_conventions_for_target, ItemKeywords, + TestConventions, VisibilitySpec, +}; use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::v2_std_core::{Node, InferredNode, VarBindingKind, import_is_all, module_imports, module_items, param_node_type_expr, authored_name_at, NewlineIndex, expr_var_name_at, expr_call_func_at, expr_method_name_at, let_binding_name_at, param_node_name_at, resource_use_name_at, MatchPattern, LiteralValue, TextFile, SourceSpan, resource_use_resource, BinOp, UnaryOpKind, StringPart, DeclaredFuncSig, transport_has_auth, transport_auth_header_name, transport_headers, transport_env, ExprData, make_expr_node, MethodSemantics, FieldSummary, FieldAccessStyle, arg_value, arm_body, arm_pattern, arm_guard, field_init_node_name_at, field_init_node_value, if_condition, if_then_branch, if_else_branch, match_scrutinee, match_arm_nodes, let_value, let_body, field_access_base, field_access_field_at, method_receiver, expr_field_access_summary, expr_method_call_semantics, record_lit_type_name_at, lambda_body, cast_expr, cast_target, return_value, foreach_variable_at, foreach_collection, foreach_body, method_arg_nodes, index_base, index_expr, slice_base, slice_start, slice_end, with_required_cardinality, Connective, is_rest_transport, is_shell_transport, is_file_transport, Cardinality}; -use crate::v2_std_core::InferredNode::{Resolved, CompilerError}; -use crate::v2_std_core::VarBindingKind::{FunctionValueBinding}; -use crate::v2_std_core::BinOp::{NullCoalesce}; -use crate::v2_std_core::ExprData::{NoExprData, ExprLiteral, ExprError, ExprVar, ExprFieldAccess, ExprCall, ExprMethodCall, ExprMatch, ExprIf, ExprLet, ExprRecordLit, ExprListLit, ExprBinOp, ExprUnaryOp, ExprLambda, ExprStringInterp, ExprBlock, ExprCast, ExprForEach, ExprIndex, ExprSlice, ExprReturn}; -use crate::v2_std_core::MethodSemantics::{PlainMethodSemantics, AlgebraMethodSemantics, ServiceMethodSemantics}; -use crate::v2_std_core::StringPart::{Text, Interpolation}; -use crate::v2_std_core::FieldAccessStyle::{StoredField, EnumAccessor, OptionalUnwrap, TupleFirst, TupleSecond}; +use crate::v2_std_core::BinOp::NullCoalesce; +use crate::v2_std_core::Cardinality::CardOptional; use crate::v2_std_core::Connective::{Conj, Disj}; -use crate::v2_std_core::Cardinality::{CardOptional}; -use crate::v2_std_core::MatchPattern::*; +use crate::v2_std_core::ExprData::{ + ExprBinOp, ExprBlock, ExprCall, ExprCast, ExprError, ExprFieldAccess, ExprForEach, ExprIf, + ExprIndex, ExprLambda, ExprLet, ExprListLit, ExprLiteral, ExprMatch, ExprMethodCall, + ExprRecordLit, ExprReturn, ExprSlice, ExprStringInterp, ExprUnaryOp, ExprVar, NoExprData, +}; +use crate::v2_std_core::FieldAccessStyle::{ + EnumAccessor, OptionalUnwrap, StoredField, TupleFirst, TupleSecond, +}; +use crate::v2_std_core::InferredNode::{CompilerError, Resolved}; use crate::v2_std_core::LiteralValue::*; +use crate::v2_std_core::MatchPattern::*; +use crate::v2_std_core::MethodSemantics::{ + AlgebraMethodSemantics, PlainMethodSemantics, ServiceMethodSemantics, +}; +use crate::v2_std_core::StringPart::{Interpolation, Text}; use crate::v2_std_core::UnaryOpKind::*; -pub use crate::v2_compiler_artifact::{RenderTarget}; -use crate::v2_compiler_artifact::RenderTarget::{Go}; -pub use crate::extdeps_languages_go_emit::{go_reserved, go_reserved_escape_suffix}; -pub use crate::v2_compiler_languages::{scaffold_for_target, TestConventions, ItemKeywords, test_conventions_for_target, is_string_like, VisibilitySpec}; -use crate::v2_compiler_languages::VisibilitySpec::{CaseVisibility}; -pub use crate::v2_compiler_infer_env::{TypeEnv, TypeBinding, authored_name}; -pub use crate::v2_compiler_infer_types::{resolved_type, normalize_access_type_node, node_is_keyed_collection}; -pub use crate::v2_compiler_infer_sigs::{ResolvedFuncSig, ResolvedFuncEnv}; -pub use crate::v2_compiler_infer_items::{ResolvedGraph, TypedModule, ItemInfo}; -pub use crate::v2_compiler_infer_service::{is_typed_service_call_receiver, extract_typed_service_name}; -pub use crate::v2_compiler_infer::{InferScope, build_params_scope, extend_scope, expr_span}; -pub use crate::std_induction::{SubValueRelation}; -use crate::std_induction::SubValueRelation::{SubValueUnknown}; -pub use crate::v2_compiler_emit::{EmitResult, BlockEmitState, InterpPart, TestProjection, emit_literal, emit_bin_op_symbol, emit_keyword, emit_container, emit_map_type, emit_node_type, emit_ident, emit_let_binding, emit_simple_expr, emit_unary_op, emit_lambda, emit_error_expr, emit_return, emit_lambda_params, emit_list_lit_expr, emit_shared_expr, emit_default_bin_op, emit_string_literal, escape_go_interp_text, escape_string_literal_body, empty_emit_scope, module_emit_scope, scope_after_expr, lookup_item, unique_strings, escape_json_string, module_to_filename, make_indent, to_string, to_string_helper, to_snake, to_screaming_snake, is_upper, to_lower_char, to_upper_char, capitalize_first, sanitize_service_name, service_var_name, test_function_name, apply_type_template1, apply_type_template2, apply_type_template3, apply_named_template, language_spec, is_null_coalesce, emit_null_coalesce, is_type_alias_return_node, has_nested_records_node, is_service_item, typed_named_arg_matches, order_typed_call_args, is_type_def_item, is_type_alias_item, is_type_decl_item, is_function_item, is_data_def_item, is_service_def_item, is_resource_def_item, extract_test_projections, is_tco_eligible, service_fallback_transport, effective_operation_transport, ServiceFieldSet, compute_service_fields, service_field_decls, seed_bindings, emit_expr_var_shared, emit_expr_field_access_shared, extract_string_interp_parts, emit_typed_cast_shared, emit_typed_for_each_shared, emit_typed_index_shared, emit_typed_slice_shared, emit_unified_init_block_stmts, emit_typed_if_shared, emit_typed_let_shared, emit_param_shared, emit_params_shared, apply_naming_case, emit_inferred_shared, emit_typed_block_join, emit_typed_first_arg_shared, emit_algebra_method_template, emit_typed_string_interp_unified, emit_typed_record_lit_unified, emit_typed_call_unified, emit_typed_method_call_unified, emit_typed_match_unified, emit_unified_typed_expr, emit_tco_unified, emit_unified_pattern, test_file_path, emit_unified_typed_func_body, emit_unified_service_def, emit_unified_operation_method, emit_unified_transport_dispatch}; +use crate::v2_std_core::VarBindingKind::FunctionValueBinding; +pub use crate::v2_std_core::{ + arg_value, arm_body, arm_guard, arm_pattern, authored_name_at, cast_expr, cast_target, + expr_call_func_at, expr_field_access_summary, expr_method_call_semantics, expr_method_name_at, + expr_var_name_at, field_access_base, field_access_field_at, field_init_node_name_at, + field_init_node_value, foreach_body, foreach_collection, foreach_variable_at, if_condition, + if_else_branch, if_then_branch, import_is_all, index_base, index_expr, is_file_transport, + is_rest_transport, is_shell_transport, lambda_body, let_binding_name_at, let_body, let_value, + make_expr_node, match_arm_nodes, match_scrutinee, method_arg_nodes, method_receiver, + module_imports, module_items, param_node_name_at, param_node_type_expr, + record_lit_type_name_at, resource_use_name_at, resource_use_resource, return_value, slice_base, + slice_end, slice_start, transport_auth_header_name, transport_env, transport_has_auth, + transport_headers, with_required_cardinality, BinOp, Cardinality, Connective, DeclaredFuncSig, + ExprData, FieldAccessStyle, FieldSummary, InferredNode, LiteralValue, MatchPattern, + MethodSemantics, NewlineIndex, Node, SourceSpan, StringPart, TextFile, UnaryOpKind, + VarBindingKind, +}; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn emit_go(typed: &Rc) -> Rc { { let registry = typed.item_registry.clone(); -let test_projections = extract_test_projections(typed.clone()); -let module_files = Rc::new({ let mut __result = Vec::new(); for tm in typed.modules.clone().iter().cloned() { __result.push(emit_go_module(&tm, registry.clone())); } __result }); -let test_files = Rc::new({ let mut __result = Vec::new(); for f in Rc::new({ let mut __result = Vec::new(); for tm in typed.modules.clone().iter().cloned() { __result.push(emit_go_test_file(&authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone()), &Rc::new({ let mut __result = Vec::new(); for p in test_projections.clone().iter().cloned() { if (p.module_name.clone().as_str() == authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone()).as_str()) { __result.push(p); } } __result }))); } __result }).iter().cloned() { if (f.path.clone().as_str() != "".to_string().as_str()) { __result.push(f); } } __result }); -let go_mod = emit_go_mod("generated".to_string()); -let files = v2_rt::concat(v2_rt::concat(Rc::new(vec![go_mod]), module_files), test_files); -Rc::new(EmitResult { - files: files, - diagnostics: Rc::new(vec![]), -}) -} + let test_projections = extract_test_projections(typed.clone()); + let module_files = Rc::new({ + let mut __result = Vec::new(); + for tm in typed.modules.clone().iter().cloned() { + __result.push(emit_go_module(&tm, registry.clone())); + } + __result + }); + let test_files = Rc::new({ + let mut __result = Vec::new(); + for f in Rc::new({ + let mut __result = Vec::new(); + for tm in typed.modules.clone().iter().cloned() { + __result.push(emit_go_test_file( + &authored_name_at( + tm.type_env.clone().source_indices.clone(), + &tm.module.clone(), + ), + &Rc::new({ + let mut __result = Vec::new(); + for p in test_projections.clone().iter().cloned() { + if (p.module_name.clone().as_str() + == authored_name_at( + tm.type_env.clone().source_indices.clone(), + &tm.module.clone(), + ) + .as_str()) + { + __result.push(p); + } + } + __result + }), + )); + } + __result + }) + .iter() + .cloned() + { + if (f.path.clone().as_str() != "".to_string().as_str()) { + __result.push(f); + } + } + __result + }); + let go_mod = emit_go_mod("generated".to_string()); + let files = v2_rt::concat( + v2_rt::concat(Rc::new(vec![go_mod]), module_files), + test_files, + ); + Rc::new(EmitResult { + files: files, + diagnostics: Rc::new(vec![]), + }) + } } pub fn emit_go_mod(module_name: String) -> Rc { { let manifest_path = match scaffold_for_target(RenderTarget::Go).manifest_file.clone() { - Some(path) => path.clone(), - None => "go.mod".to_string(), -}; -let content = v2_rt::concat(v2_rt::concat("module ".to_string(), module_name), "\n\ngo 1.21\n".to_string()); -Rc::new(TextFile { - path: manifest_path, - content: content, -}) -} + Some(path) => path.clone(), + None => "go.mod".to_string(), + }; + let content = v2_rt::concat( + v2_rt::concat("module ".to_string(), module_name), + "\n\ngo 1.21\n".to_string(), + ); + Rc::new(TextFile { + path: manifest_path, + content: content, + }) + } } -pub fn go_mock_expr_uses_fmt(expr: Rc, source_indices: Rc>>) -> bool { +pub fn go_mock_expr_uses_fmt( + expr: Rc, + source_indices: Rc>>, +) -> bool { { let rendered = emit_simple_expr(&expr, &RenderTarget::Go, &source_indices); -((Rc::new(rendered.split(&"fmt.Sprintf(".to_string()).map(|s| s.to_string()).collect::>()).len() as i64) > 1) -} + ((Rc::new( + rendered + .split(&"fmt.Sprintf(".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .len() as i64) + > 1) + } } pub fn go_test_import_block(projections: Rc>>) -> String { { - let needs_fmt = { let mut __found = false; for p in projections.iter().cloned() { if { let mut __found = false; for mp in p.mock_field_inits.clone().iter().cloned() { if go_mock_expr_uses_fmt(field_init_node_value(&mp), p.source_indices.clone()) { __found = true; break; } } __found } { __found = true; break; } } __found }; -if needs_fmt { + let needs_fmt = { + let mut __found = false; + for p in projections.iter().cloned() { + if { + let mut __found = false; + for mp in p.mock_field_inits.clone().iter().cloned() { + if go_mock_expr_uses_fmt( + field_init_node_value(&mp), + p.source_indices.clone(), + ) { + __found = true; + break; + } + } + __found + } { + __found = true; + break; + } + } + __found + }; + if needs_fmt { "import (\n\t\"fmt\"\n\t\"testing\"\n)\n\n".to_string() } else { "import \"testing\"\n\n".to_string() } -} + } } pub fn go_test_signature_comment(projection: &Rc) -> String { { - let params_str = Rc::new({ let mut __result = Vec::new(); for p in projection.params.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(param_node_name_at(p.clone(), projection.source_indices.clone()), " ".to_string()), emit_node_type(param_node_type_expr(&p), RenderTarget::Go, projection.source_indices.clone()))); } __result }).join(&", ".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("// Signature: ".to_string(), sanitize_service_name(projection.service_name.clone())), ".".to_string()), projection.operation_name.clone()), "(".to_string()), params_str), ") ".to_string()), emit_node_type(projection.inferred.clone(), RenderTarget::Go, projection.source_indices.clone())) -} + let params_str = Rc::new({ + let mut __result = Vec::new(); + for p in projection.params.clone().iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + param_node_name_at(p.clone(), projection.source_indices.clone()), + " ".to_string(), + ), + emit_node_type( + param_node_type_expr(&p), + RenderTarget::Go, + projection.source_indices.clone(), + ), + )); + } + __result + }) + .join(&", ".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "// Signature: ".to_string(), + sanitize_service_name(projection.service_name.clone()), + ), + ".".to_string(), + ), + projection.operation_name.clone(), + ), + "(".to_string(), + ), + params_str, + ), + ") ".to_string(), + ), + emit_node_type( + projection.inferred.clone(), + RenderTarget::Go, + projection.source_indices.clone(), + ), + ) + } } -pub fn emit_go_test_file(module_name: &String, projections: &Rc>>) -> Rc { +pub fn emit_go_test_file( + module_name: &String, + projections: &Rc>>, +) -> Rc { if ((projections.clone().len() as i64) == 0) { Rc::new(TextFile { - path: "".to_string(), - content: "".to_string(), -}) + path: "".to_string(), + content: "".to_string(), + }) } else { { let package_name = go_package_name(module_name.clone()); -let tests_str = Rc::new({ let mut __result = Vec::new(); for p in projections.clone().iter().cloned() { __result.push(emit_go_operation_test(&p, 0)); } __result }).join(&"\n\n".to_string()); -let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("// Generated tests -- do not edit.\n".to_string(), "// Source module: ".to_string()), module_name.clone()), "\n\n".to_string()), language_spec(RenderTarget::Go).items.clone().module_keyword.clone()), " ".to_string()), package_name), "\n\n".to_string()), go_test_import_block(projections.clone())), tests_str), "\n".to_string()); -Rc::new(TextFile { - path: test_file_path(module_name.clone(), &RenderTarget::Go), - content: content, -}) -} + let tests_str = Rc::new({ + let mut __result = Vec::new(); + for p in projections.clone().iter().cloned() { + __result.push(emit_go_operation_test(&p, 0)); + } + __result + }) + .join(&"\n\n".to_string()); + let content = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "// Generated tests -- do not edit.\n" + .to_string(), + "// Source module: ".to_string(), + ), + module_name.clone(), + ), + "\n\n".to_string(), + ), + language_spec(RenderTarget::Go) + .items + .clone() + .module_keyword + .clone(), + ), + " ".to_string(), + ), + package_name, + ), + "\n\n".to_string(), + ), + go_test_import_block(projections.clone()), + ), + tests_str, + ), + "\n".to_string(), + ); + Rc::new(TextFile { + path: test_file_path(module_name.clone(), &RenderTarget::Go), + content: content, + }) + } } } pub fn emit_go_operation_test(projection: &Rc, depth: i64) -> String { { let test_name = test_function_name(&projection, RenderTarget::Go); -let struct_name = sanitize_service_name(projection.service_name.clone()); -let indent = make_indent((depth.clone() + 1)); -let mock_setup = Rc::new({ let mut __result = Vec::new(); for mp in projection.mock_field_inits.clone().iter().cloned() { __result.push(emit_go_mock_prop_setup(&mp, (depth.clone() + 1), &projection.source_indices.clone())); } __result }).join(&"\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().func_keyword.clone(), " ".to_string()), test_name), "(t *testing.T) {\n".to_string()), indent.clone()), go_test_signature_comment(&projection)), "\n".to_string()), indent.clone()), "_ = ".to_string()), struct_name), "{}\n".to_string()), indent.clone()), mock_setup), "\n".to_string()), indent.clone()), "// TODO: add dry-run support to Go service emission for full invocation tests\n".to_string()), "}".to_string()) -} + let struct_name = sanitize_service_name(projection.service_name.clone()); + let indent = make_indent((depth.clone() + 1)); + let mock_setup = Rc::new({ + let mut __result = Vec::new(); + for mp in projection.mock_field_inits.clone().iter().cloned() { + __result.push(emit_go_mock_prop_setup( + &mp, + (depth.clone() + 1), + &projection.source_indices.clone(), + )); + } + __result + }) + .join(&"\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + language_spec( + RenderTarget::Go, + ) + .items + .clone() + .func_keyword + .clone(), + " ".to_string(), + ), + test_name, + ), + "(t *testing.T) {\n".to_string(), + ), + indent.clone(), + ), + go_test_signature_comment(&projection), + ), + "\n".to_string(), + ), + indent.clone(), + ), + "_ = ".to_string(), + ), + struct_name, + ), + "{}\n".to_string(), + ), + indent.clone(), + ), + mock_setup, + ), + "\n".to_string(), + ), + indent.clone(), + ), + "// TODO: add dry-run support to Go service emission for full invocation tests\n" + .to_string(), + ), + "}".to_string(), + ) + } } -pub fn emit_go_mock_prop_setup(mock_prop: &Rc, depth: i64, source_indices: &Rc>>) -> String { - v2_rt::concat(v2_rt::concat(emit_ident(field_init_node_name_at(mock_prop.clone(), source_indices.clone()), RenderTarget::Go), " := ".to_string()), emit_simple_expr(&field_init_node_value(&mock_prop), &RenderTarget::Go, &source_indices)) +pub fn emit_go_mock_prop_setup( + mock_prop: &Rc, + depth: i64, + source_indices: &Rc>>, +) -> String { + v2_rt::concat( + v2_rt::concat( + emit_ident( + field_init_node_name_at(mock_prop.clone(), source_indices.clone()), + RenderTarget::Go, + ), + " := ".to_string(), + ), + emit_simple_expr( + &field_init_node_value(&mock_prop), + &RenderTarget::Go, + &source_indices, + ), + ) } -pub fn emit_go_module(typed_module: &Rc, registry: Rc>>) -> Rc { +pub fn emit_go_module( + typed_module: &Rc, + registry: Rc>>, +) -> Rc { { let m = typed_module.module.clone(); -let scope = module_emit_scope(&typed_module); -let si = typed_module.type_env.clone().source_indices.clone(); -let mod_name_str = authored_name_at(si.clone(), &m); -let pkg_name = go_package_name(mod_name_str.clone()); -let pkg_decl = v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().module_keyword.clone(), " ".to_string()), pkg_name); -let imports_str = emit_go_imports(&typed_module.items.clone(), module_imports(m.clone()), si.clone()); -let imports_section = if (imports_str.clone().as_str() == "".to_string().as_str()) { + let scope = module_emit_scope(&typed_module); + let si = typed_module.type_env.clone().source_indices.clone(); + let mod_name_str = authored_name_at(si.clone(), &m); + let pkg_name = go_package_name(mod_name_str.clone()); + let pkg_decl = v2_rt::concat( + v2_rt::concat( + language_spec(RenderTarget::Go) + .items + .clone() + .module_keyword + .clone(), + " ".to_string(), + ), + pkg_name, + ); + let imports_str = emit_go_imports( + &typed_module.items.clone(), + module_imports(m.clone()), + si.clone(), + ); + let imports_section = if (imports_str.clone().as_str() == "".to_string().as_str()) { "".to_string() } else { v2_rt::concat("\n\n".to_string(), imports_str.clone()) }; -let items_str = Rc::new({ let mut __result = Vec::new(); for item in typed_module.items.clone().iter().cloned() { __result.push(emit_go_typed_item(&item, registry.clone(), &scope)); } __result }).join(&"\n\n".to_string()); -let filename = module_to_filename(mod_name_str.clone()); -let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("// Generated by v2 compiler -- do not edit.\n".to_string(), "// Source module: ".to_string()), mod_name_str.clone()), "\n\n".to_string()), pkg_decl), imports_section), "\n\n".to_string()), items_str), "\n".to_string()); -Rc::new(TextFile { - path: v2_rt::concat(filename, scaffold_for_target(RenderTarget::Go).source_file_extension.clone()), - content: content, -}) -} + let items_str = Rc::new({ + let mut __result = Vec::new(); + for item in typed_module.items.clone().iter().cloned() { + __result.push(emit_go_typed_item(&item, registry.clone(), &scope)); + } + __result + }) + .join(&"\n\n".to_string()); + let filename = module_to_filename(mod_name_str.clone()); + let content = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "// Generated by v2 compiler -- do not edit.\n".to_string(), + "// Source module: ".to_string(), + ), + mod_name_str.clone(), + ), + "\n\n".to_string(), + ), + pkg_decl, + ), + imports_section, + ), + "\n\n".to_string(), + ), + items_str, + ), + "\n".to_string(), + ); + Rc::new(TextFile { + path: v2_rt::concat( + filename, + scaffold_for_target(RenderTarget::Go) + .source_file_extension + .clone(), + ), + content: content, + }) + } } pub fn go_package_name(module_name: String) -> String { { - let parts = Rc::new(module_name.split(&".".to_string()).map(|s| s.to_string()).collect::>()); -match parts.last().cloned() { - Some(last_part) => Rc::new({ let mut __result = Vec::new(); for c in Rc::new(last_part.clone().chars().map(|c| c as i64).collect::>()).iter().cloned() { __result.push(to_lower_char(c.clone())); } __result }).join(&"".to_string()), - None => "main".to_string(), -} -} + let parts = Rc::new( + module_name + .split(&".".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ); + match parts.last().cloned() { + Some(last_part) => Rc::new({ + let mut __result = Vec::new(); + for c in Rc::new( + last_part + .clone() + .chars() + .map(|c| c as i64) + .collect::>(), + ) + .iter() + .cloned() + { + __result.push(to_lower_char(c.clone())); + } + __result + }) + .join(&"".to_string()), + None => "main".to_string(), + } + } } -pub fn emit_go_imports(items: &Rc>>, imports: Rc>>, source_indices: Rc>>) -> String { +pub fn emit_go_imports( + items: &Rc>>, + imports: Rc>>, + source_indices: Rc>>, +) -> String { { - let has_services = { let mut __found = false; for item in items.clone().iter().cloned() { if is_service_item(&item) { __found = true; break; } } __found }; -let has_types = { let mut __found = false; for item in items.clone().iter().cloned() { if is_type_def_item(&item) { __found = true; break; } } __found }; -let has_functions = { let mut __found = false; for item in items.clone().iter().cloned() { if is_function_item(&item) { __found = true; break; } } __found }; -let std_imports = collect_go_std_imports(&has_services, has_types, has_functions); -let pkg_imports = Rc::new({ let mut __result = Vec::new(); for imp in imports.iter().cloned() { __result.push({ - let mod_name = module_to_filename(authored_name_at(source_indices.clone(), &imp)); -v2_rt::concat(v2_rt::concat("\t\"generated/".to_string(), mod_name.clone()), "\"".to_string()) -}); } __result }); -let all_imports = v2_rt::concat(std_imports, pkg_imports); -if ((all_imports.clone().len() as i64) == 0) { + let has_services = { + let mut __found = false; + for item in items.clone().iter().cloned() { + if is_service_item(&item) { + __found = true; + break; + } + } + __found + }; + let has_types = { + let mut __found = false; + for item in items.clone().iter().cloned() { + if is_type_def_item(&item) { + __found = true; + break; + } + } + __found + }; + let has_functions = { + let mut __found = false; + for item in items.clone().iter().cloned() { + if is_function_item(&item) { + __found = true; + break; + } + } + __found + }; + let std_imports = collect_go_std_imports(&has_services, has_types, has_functions); + let pkg_imports = Rc::new({ + let mut __result = Vec::new(); + for imp in imports.iter().cloned() { + __result.push({ + let mod_name = + module_to_filename(authored_name_at(source_indices.clone(), &imp)); + v2_rt::concat( + v2_rt::concat("\t\"generated/".to_string(), mod_name.clone()), + "\"".to_string(), + ) + }); + } + __result + }); + let all_imports = v2_rt::concat(std_imports, pkg_imports); + if ((all_imports.clone().len() as i64) == 0) { "".to_string() } else { { let imports_str = all_imports.clone().join(&"\n".to_string()); -v2_rt::concat(v2_rt::concat("import (\n".to_string(), imports_str), "\n)".to_string()) -} + v2_rt::concat( + v2_rt::concat("import (\n".to_string(), imports_str), + "\n)".to_string(), + ) + } } -} + } } -pub fn collect_go_std_imports(has_services: &bool, has_types: bool, has_functions: bool) -> Rc> { +pub fn collect_go_std_imports( + has_services: &bool, + has_types: bool, + has_functions: bool, +) -> Rc> { { let fmt_import = if ((has_types || has_functions) || has_services.clone()) { Rc::new(vec!["\t\"fmt\"".to_string()]) } else { Rc::new(vec![]) }; -let net_imports = if has_services.clone() { - Rc::new(vec!["\t\"net/http\"".to_string(), "\t\"encoding/json\"".to_string(), "\t\"bytes\"".to_string(), "\t\"io\"".to_string()]) + let net_imports = if has_services.clone() { + Rc::new(vec![ + "\t\"net/http\"".to_string(), + "\t\"encoding/json\"".to_string(), + "\t\"bytes\"".to_string(), + "\t\"io\"".to_string(), + ]) } else { Rc::new(vec![]) }; -v2_rt::concat(fmt_import, net_imports) -} + v2_rt::concat(fmt_import, net_imports) + } } -pub fn emit_go_typed_item(item: &Rc, registry: Rc>>, scope: &Rc) -> String { +pub fn emit_go_typed_item( + item: &Rc, + registry: Rc>>, + scope: &Rc, +) -> String { { let env = scope.type_env.clone(); -let item_text = authored_name(env.clone(), item.clone()); -if is_type_def_item(&item) { + let item_text = authored_name(env.clone(), item.clone()); + if is_type_def_item(&item) { emit_go_type_def_from_connective(&item, &env) } else { if is_type_alias_item(&item, env.source_indices.clone()) { - emit_go_type_alias(item_text, resolved_type(item.clone()), env.source_indices.clone()) + emit_go_type_alias( + item_text, + resolved_type(item.clone()), + env.source_indices.clone(), + ) } else { if is_type_decl_item(&item, env.source_indices.clone()) { "".to_string() } else { if is_function_item(&item) { if ((item.uses.clone().len() as i64) > 0) { - emit_go_func_def(&item_text, &item.params.clone(), resolved_type(item.clone()), &item.uses.clone(), item.body.clone().clone().unwrap(), ®istry, &scope) + emit_go_func_def( + &item_text, + &item.params.clone(), + resolved_type(item.clone()), + &item.uses.clone(), + item.body.clone().clone().unwrap(), + ®istry, + &scope, + ) } else { - emit_go_fn_def(&item_text, &item.params.clone(), resolved_type(item.clone()), &item.body.clone().clone().unwrap(), ®istry, &scope) + emit_go_fn_def( + &item_text, + &item.params.clone(), + resolved_type(item.clone()), + &item.body.clone().clone().unwrap(), + ®istry, + &scope, + ) } } else { if is_data_def_item(&item) { - emit_go_data_def(item_text, item.type_annotation.clone().clone().unwrap(), item.body.clone().clone().unwrap(), registry, &scope, 0) + emit_go_data_def( + item_text, + item.type_annotation.clone().clone().unwrap(), + item.body.clone().clone().unwrap(), + registry, + &scope, + 0, + ) } else { if is_service_def_item(&item) { emit_go_service_def(item.clone(), registry, env.clone()) @@ -222,7 +685,21 @@ if is_type_def_item(&item) { if is_resource_def_item(&item) { emit_go_resource_def(&item, &env) } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().func_keyword.clone(), " init() { panic(\"EMIT BUG: unhandled item: ".to_string()), item_text), "\") }".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + language_spec(RenderTarget::Go) + .items + .clone() + .func_keyword + .clone(), + " init() { panic(\"EMIT BUG: unhandled item: " + .to_string(), + ), + item_text, + ), + "\") }".to_string(), + ) } } } @@ -230,255 +707,1065 @@ if is_type_def_item(&item) { } } } -} + } } pub fn emit_go_type_def_from_connective(item: &Rc, env: &Rc) -> String { { let item_text = authored_name(env.clone(), item.clone()); -let is_product = (item.connective.clone() == Connective::Conj); -if is_product { + let is_product = (item.connective.clone() == Connective::Conj); + if is_product { emit_go_struct_from_children(item_text, &item.children.clone(), env.clone()) } else { emit_go_sum_from_children(&item_text, &item.children.clone(), env.clone()) } -} + } } -pub fn emit_go_struct_from_children(name: String, children: &Rc>>, env: Rc) -> String { +pub fn emit_go_struct_from_children( + name: String, + children: &Rc>>, + env: Rc, +) -> String { if ((children.clone().len() as i64) == 0) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().type_alias_keyword.clone(), " ".to_string()), name), " ".to_string()), language_spec(RenderTarget::Go).items.clone().struct_keyword.clone()), "{}".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + language_spec(RenderTarget::Go) + .items + .clone() + .type_alias_keyword + .clone(), + " ".to_string(), + ), + name, + ), + " ".to_string(), + ), + language_spec(RenderTarget::Go) + .items + .clone() + .struct_keyword + .clone(), + ), + "{}".to_string(), + ) } else { { - let field_lines = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { __result.push(emit_go_struct_field_from_child(&child, &env)); } __result }); -let fields_str = field_lines.join(&"\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().type_alias_keyword.clone(), " ".to_string()), name), " ".to_string()), language_spec(RenderTarget::Go).items.clone().struct_keyword.clone()), " {\n".to_string()), fields_str), "\n}".to_string()) -} + let field_lines = Rc::new({ + let mut __result = Vec::new(); + for child in children.clone().iter().cloned() { + __result.push(emit_go_struct_field_from_child(&child, &env)); + } + __result + }); + let fields_str = field_lines.join(&"\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + language_spec(RenderTarget::Go) + .items + .clone() + .type_alias_keyword + .clone(), + " ".to_string(), + ), + name, + ), + " ".to_string(), + ), + language_spec(RenderTarget::Go) + .items + .clone() + .struct_keyword + .clone(), + ), + " {\n".to_string(), + ), + fields_str, + ), + "\n}".to_string(), + ) + } } } pub fn emit_go_struct_field_from_child(child: &Rc, env: &Rc) -> String { { let child_text = authored_name(env.clone(), child.clone()); -let ty = emit_node_type(resolved_type(child.clone()), RenderTarget::Go, env.source_indices.clone()); -let json_tag = v2_rt::concat(v2_rt::concat(" `json:\"".to_string(), to_snake(child_text.clone())), "\"`".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("\t".to_string(), go_export_ident(child_text.clone())), " ".to_string()), ty), json_tag) -} + let ty = emit_node_type( + resolved_type(child.clone()), + RenderTarget::Go, + env.source_indices.clone(), + ); + let json_tag = v2_rt::concat( + v2_rt::concat(" `json:\"".to_string(), to_snake(child_text.clone())), + "\"`".to_string(), + ); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("\t".to_string(), go_export_ident(child_text.clone())), + " ".to_string(), + ), + ty, + ), + json_tag, + ) + } } -pub fn emit_go_sum_from_children(name: &String, children: &Rc>>, env: Rc) -> String { +pub fn emit_go_sum_from_children( + name: &String, + children: &Rc>>, + env: Rc, +) -> String { { - let has_data = { let mut __found = false; for child in children.clone().iter().cloned() { if ((child.children.clone().len() as i64) > 0) { __found = true; break; } } __found }; -if has_data { + let has_data = { + let mut __found = false; + for child in children.clone().iter().cloned() { + if ((child.children.clone().len() as i64) > 0) { + __found = true; + break; + } + } + __found + }; + if has_data { { - let iface = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().type_alias_keyword.clone(), " ".to_string()), name.clone()), " interface {\n\tis".to_string()), name.clone()), "()\n}".to_string()); -let variant_structs = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { __result.push(emit_go_variant_struct(&name, &child, &env)); } __result }); -let structs_str = variant_structs.join(&"\n\n".to_string()); -v2_rt::concat(v2_rt::concat(iface, "\n\n".to_string()), structs_str) -} + let iface = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + language_spec(RenderTarget::Go) + .items + .clone() + .type_alias_keyword + .clone(), + " ".to_string(), + ), + name.clone(), + ), + " interface {\n\tis".to_string(), + ), + name.clone(), + ), + "()\n}".to_string(), + ); + let variant_structs = Rc::new({ + let mut __result = Vec::new(); + for child in children.clone().iter().cloned() { + __result.push(emit_go_variant_struct(&name, &child, &env)); + } + __result + }); + let structs_str = variant_structs.join(&"\n\n".to_string()); + v2_rt::concat(v2_rt::concat(iface, "\n\n".to_string()), structs_str) + } } else { { - let type_decl = v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().enum_keyword.clone(), " ".to_string()), name.clone()), " int".to_string()); -let variant_consts = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ - let child = pair.1.clone(); -let child_text = authored_name(env.clone(), child.clone()); -if (pair.0.clone() == 0) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("\t".to_string(), name.clone()), child_text.clone()), " ".to_string()), name.clone()), " = iota".to_string()) - } else { - v2_rt::concat(v2_rt::concat("\t".to_string(), name.clone()), child_text.clone()) + let type_decl = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + language_spec(RenderTarget::Go) + .items + .clone() + .enum_keyword + .clone(), + " ".to_string(), + ), + name.clone(), + ), + " int".to_string(), + ); + let variant_consts = Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + children + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + __result.push({ + let child = pair.1.clone(); + let child_text = authored_name(env.clone(), child.clone()); + if (pair.0.clone() == 0) { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("\t".to_string(), name.clone()), + child_text.clone(), + ), + " ".to_string(), + ), + name.clone(), + ), + " = iota".to_string(), + ) + } else { + v2_rt::concat( + v2_rt::concat("\t".to_string(), name.clone()), + child_text.clone(), + ) + } + }); } -}); } __result }); -let consts_str = variant_consts.join(&"\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(type_decl, "\n\nconst (\n".to_string()), consts_str), "\n)".to_string()) -} + __result + }); + let consts_str = variant_consts.join(&"\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(type_decl, "\n\nconst (\n".to_string()), + consts_str, + ), + "\n)".to_string(), + ) + } } -} + } } pub fn emit_go_variant_struct(parent_name: &String, child: &Rc, env: &Rc) -> String { { - let struct_name = v2_rt::concat(parent_name.clone(), authored_name(env.clone(), child.clone())); -let marker_method = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().func_keyword.clone(), " (".to_string()), struct_name.clone()), ") is".to_string()), parent_name.clone()), "() {}".to_string()); -if ((child.children.clone().len() as i64) == 0) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().type_alias_keyword.clone(), " ".to_string()), struct_name.clone()), " ".to_string()), language_spec(RenderTarget::Go).items.clone().struct_keyword.clone()), "{}\n\n".to_string()), marker_method) + let struct_name = v2_rt::concat( + parent_name.clone(), + authored_name(env.clone(), child.clone()), + ); + let marker_method = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + language_spec(RenderTarget::Go) + .items + .clone() + .func_keyword + .clone(), + " (".to_string(), + ), + struct_name.clone(), + ), + ") is".to_string(), + ), + parent_name.clone(), + ), + "() {}".to_string(), + ); + if ((child.children.clone().len() as i64) == 0) { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + language_spec(RenderTarget::Go) + .items + .clone() + .type_alias_keyword + .clone(), + " ".to_string(), + ), + struct_name.clone(), + ), + " ".to_string(), + ), + language_spec(RenderTarget::Go) + .items + .clone() + .struct_keyword + .clone(), + ), + "{}\n\n".to_string(), + ), + marker_method, + ) } else { { - let field_lines = Rc::new({ let mut __result = Vec::new(); for f in child.children.clone().iter().cloned() { __result.push(emit_go_struct_field_from_child(&f, &env)); } __result }); -let fields_str = field_lines.join(&"\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().type_alias_keyword.clone(), " ".to_string()), struct_name.clone()), " ".to_string()), language_spec(RenderTarget::Go).items.clone().struct_keyword.clone()), " {\n".to_string()), fields_str), "\n}\n\n".to_string()), marker_method) -} + let field_lines = Rc::new({ + let mut __result = Vec::new(); + for f in child.children.clone().iter().cloned() { + __result.push(emit_go_struct_field_from_child(&f, &env)); + } + __result + }); + let fields_str = field_lines.join(&"\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + language_spec(RenderTarget::Go) + .items + .clone() + .type_alias_keyword + .clone(), + " ".to_string(), + ), + struct_name.clone(), + ), + " ".to_string(), + ), + language_spec(RenderTarget::Go) + .items + .clone() + .struct_keyword + .clone(), + ), + " {\n".to_string(), + ), + fields_str, + ), + "\n}\n\n".to_string(), + ), + marker_method, + ) + } } -} + } } -pub fn emit_go_type_alias(name: String, base: Rc, source_indices: Rc>>) -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().type_alias_keyword.clone(), " ".to_string()), name), " = ".to_string()), emit_node_type(base, RenderTarget::Go, source_indices)) +pub fn emit_go_type_alias( + name: String, + base: Rc, + source_indices: Rc>>, +) -> String { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + language_spec(RenderTarget::Go) + .items + .clone() + .type_alias_keyword + .clone(), + " ".to_string(), + ), + name, + ), + " = ".to_string(), + ), + emit_node_type(base, RenderTarget::Go, source_indices), + ) } -pub fn emit_go_fn_def(name: &String, params: &Rc>>, inferred: Rc, body: &Rc, registry: &Rc>>, scope: &Rc) -> String { +pub fn emit_go_fn_def( + name: &String, + params: &Rc>>, + inferred: Rc, + body: &Rc, + registry: &Rc>>, + scope: &Rc, +) -> String { { let si = scope.type_env.clone().source_indices.clone(); -let params_str = emit_params_shared(params.clone(), &RenderTarget::Go, si.clone()); -let ret_str = emit_inferred_shared(&inferred, &RenderTarget::Go, si.clone()); -let body_scope = build_params_scope(&scope, params.clone()); -let use_tco = is_tco_eligible(&name, &body, registry.clone(), &si); -if use_tco { + let params_str = emit_params_shared(params.clone(), &RenderTarget::Go, si.clone()); + let ret_str = emit_inferred_shared(&inferred, &RenderTarget::Go, si.clone()); + let body_scope = build_params_scope(&scope, params.clone()); + let use_tco = is_tco_eligible(&name, &body, registry.clone(), &si); + if use_tco { { - let body_str = emit_tco_unified(body.clone(), &name, ¶ms, &RenderTarget::Go, ®istry, &body_scope, 1, |pat| emit_unified_pattern(pat.clone(), RenderTarget::Go, si.clone())); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().func_keyword.clone(), " ".to_string()), go_export_ident(name.clone())), "(".to_string()), params_str), ")".to_string()), ret_str), " {\n".to_string()), body_str), "\n}".to_string()) -} + let body_str = emit_tco_unified( + body.clone(), + &name, + ¶ms, + &RenderTarget::Go, + ®istry, + &body_scope, + 1, + |pat| emit_unified_pattern(pat.clone(), RenderTarget::Go, si.clone()), + ); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + language_spec(RenderTarget::Go) + .items + .clone() + .func_keyword + .clone(), + " ".to_string(), + ), + go_export_ident(name.clone()), + ), + "(".to_string(), + ), + params_str, + ), + ")".to_string(), + ), + ret_str, + ), + " {\n".to_string(), + ), + body_str, + ), + "\n}".to_string(), + ) + } } else { { - let body_str = emit_go_typed_expr(body.clone(), registry.clone(), &body_scope, 1, 1024); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().func_keyword.clone(), " ".to_string()), go_export_ident(name.clone())), "(".to_string()), params_str), ")".to_string()), ret_str), " {\n".to_string()), make_indent(1)), "return ".to_string()), body_str), "\n}".to_string()) -} + let body_str = + emit_go_typed_expr(body.clone(), registry.clone(), &body_scope, 1, 1024); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + language_spec(RenderTarget::Go) + .items + .clone() + .func_keyword + .clone(), + " ".to_string(), + ), + go_export_ident(name.clone()), + ), + "(".to_string(), + ), + params_str, + ), + ")".to_string(), + ), + ret_str, + ), + " {\n".to_string(), + ), + make_indent(1), + ), + "return ".to_string(), + ), + body_str, + ), + "\n}".to_string(), + ) + } } -} + } } -pub fn emit_go_func_def(name: &String, params: &Rc>>, inferred: Rc, uses: &Rc>>, body: Rc, registry: &Rc>>, scope: &Rc) -> String { +pub fn emit_go_func_def( + name: &String, + params: &Rc>>, + inferred: Rc, + uses: &Rc>>, + body: Rc, + registry: &Rc>>, + scope: &Rc, +) -> String { { let service_names = match lookup_item(registry.clone(), name.clone()) { - Some(info) => info.service_names.clone(), - None => Rc::new(vec![]), -}; -let params_str = emit_go_func_params(params.clone(), uses.clone(), service_names, scope.type_env.clone().source_indices.clone()); -let ret_type = emit_node_type(inferred, RenderTarget::Go, scope.type_env.clone().source_indices.clone()); -let body_scope = build_params_scope(&scope, params.clone()); -let si = scope.type_env.clone().source_indices.clone(); -let body_scope = uses.clone().iter().cloned().fold(body_scope.clone(), |s: Rc, u: Rc| extend_scope(&s, &resource_use_name_at(u.clone(), si.clone()), resource_use_resource(&u), Rc::new(SubValueRelation::SubValueUnknown))); -let body_str = emit_unified_typed_func_body(&body, &RenderTarget::Go, ®istry, &body_scope, 1); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().func_keyword.clone(), " ".to_string()), go_export_ident(name.clone())), "(".to_string()), params_str), ") (".to_string()), ret_type), ", error) {\n".to_string()), body_str), "\n}".to_string()) -} + Some(info) => info.service_names.clone(), + None => Rc::new(vec![]), + }; + let params_str = emit_go_func_params( + params.clone(), + uses.clone(), + service_names, + scope.type_env.clone().source_indices.clone(), + ); + let ret_type = emit_node_type( + inferred, + RenderTarget::Go, + scope.type_env.clone().source_indices.clone(), + ); + let body_scope = build_params_scope(&scope, params.clone()); + let si = scope.type_env.clone().source_indices.clone(); + let body_scope = uses.clone().iter().cloned().fold( + body_scope.clone(), + |s: Rc, u: Rc| { + extend_scope( + &s, + &resource_use_name_at(u.clone(), si.clone()), + resource_use_resource(&u), + Rc::new(SubValueRelation::SubValueUnknown), + ) + }, + ); + let body_str = + emit_unified_typed_func_body(&body, &RenderTarget::Go, ®istry, &body_scope, 1); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + language_spec(RenderTarget::Go) + .items + .clone() + .func_keyword + .clone(), + " ".to_string(), + ), + go_export_ident(name.clone()), + ), + "(".to_string(), + ), + params_str, + ), + ") (".to_string(), + ), + ret_type, + ), + ", error) {\n".to_string(), + ), + body_str, + ), + "\n}".to_string(), + ) + } } -pub fn emit_go_func_params(params: Rc>>, uses: Rc>>, service_names: Rc>, source_indices: Rc>>) -> String { +pub fn emit_go_func_params( + params: Rc>>, + uses: Rc>>, + service_names: Rc>, + source_indices: Rc>>, +) -> String { { - let param_strs = Rc::new({ let mut __result = Vec::new(); for p in params.iter().cloned() { __result.push(emit_param_shared(&p, &RenderTarget::Go, &source_indices)); } __result }); -let resource_strs = Rc::new({ let mut __result = Vec::new(); for u in uses.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(emit_ident(resource_use_name_at(u.clone(), source_indices.clone()), RenderTarget::Go), " ".to_string()), emit_node_type(resource_use_resource(&u), RenderTarget::Go, source_indices.clone()))); } __result }); -let service_strs = Rc::new({ let mut __result = Vec::new(); for sn in service_names.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(service_var_name(sn.clone()), " *".to_string()), sanitize_service_name(sn.clone()))); } __result }); -let all_params = v2_rt::concat(v2_rt::concat(param_strs, resource_strs), service_strs); -all_params.join(&", ".to_string()) -} + let param_strs = Rc::new({ + let mut __result = Vec::new(); + for p in params.iter().cloned() { + __result.push(emit_param_shared(&p, &RenderTarget::Go, &source_indices)); + } + __result + }); + let resource_strs = Rc::new({ + let mut __result = Vec::new(); + for u in uses.iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + emit_ident( + resource_use_name_at(u.clone(), source_indices.clone()), + RenderTarget::Go, + ), + " ".to_string(), + ), + emit_node_type( + resource_use_resource(&u), + RenderTarget::Go, + source_indices.clone(), + ), + )); + } + __result + }); + let service_strs = Rc::new({ + let mut __result = Vec::new(); + for sn in service_names.iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat(service_var_name(sn.clone()), " *".to_string()), + sanitize_service_name(sn.clone()), + )); + } + __result + }); + let all_params = v2_rt::concat(v2_rt::concat(param_strs, resource_strs), service_strs); + all_params.join(&", ".to_string()) + } } -pub fn emit_go_typed_expr(texpr: Rc, registry: Rc>>, scope: &Rc, depth: i64, fuel: i64) -> String { - emit_unified_typed_expr(texpr, &RenderTarget::Go, registry, &scope, depth, fuel, |pat| emit_unified_pattern(pat.clone(), RenderTarget::Go, scope.type_env.clone().source_indices.clone())) +pub fn emit_go_typed_expr( + texpr: Rc, + registry: Rc>>, + scope: &Rc, + depth: i64, + fuel: i64, +) -> String { + emit_unified_typed_expr( + texpr, + &RenderTarget::Go, + registry, + &scope, + depth, + fuel, + |pat| { + emit_unified_pattern( + pat.clone(), + RenderTarget::Go, + scope.type_env.clone().source_indices.clone(), + ) + }, + ) } -pub fn emit_go_transport_body(transport: Rc, op_name: String, source_indices: Rc>>, depth: i64) -> String { - emit_unified_transport_dispatch(&transport, op_name, &source_indices, depth, RenderTarget::Go, |n, t, d, si| emit_go_rest_call(n.clone(), &t, d.clone(), &si), |n, t, d, si| emit_go_shell_call(n.clone(), t.clone(), d.clone(), &si), |n, d| emit_go_file_call(n.clone(), d.clone()), |n, d| emit_go_local_call(n.clone(), d.clone())) +pub fn emit_go_transport_body( + transport: Rc, + op_name: String, + source_indices: Rc>>, + depth: i64, +) -> String { + emit_unified_transport_dispatch( + &transport, + op_name, + &source_indices, + depth, + RenderTarget::Go, + |n, t, d, si| emit_go_rest_call(n.clone(), &t, d.clone(), &si), + |n, t, d, si| emit_go_shell_call(n.clone(), t.clone(), d.clone(), &si), + |n, d| emit_go_file_call(n.clone(), d.clone()), + |n, d| emit_go_local_call(n.clone(), d.clone()), + ) } -pub fn emit_go_service_def(item: Rc, registry: Rc>>, env: Rc) -> String { - emit_unified_service_def(&item, &RenderTarget::Go, registry, &env, |name, transport, ops, si| emit_go_service_struct(name.clone(), transport.clone(), ops.clone(), si.clone()), |transport, op_name, si, depth| emit_go_transport_body(transport.clone(), op_name.clone(), si.clone(), depth.clone())) +pub fn emit_go_service_def( + item: Rc, + registry: Rc>>, + env: Rc, +) -> String { + emit_unified_service_def( + &item, + &RenderTarget::Go, + registry, + &env, + |name, transport, ops, si| { + emit_go_service_struct(name.clone(), transport.clone(), ops.clone(), si.clone()) + }, + |transport, op_name, si, depth| { + emit_go_transport_body( + transport.clone(), + op_name.clone(), + si.clone(), + depth.clone(), + ) + }, + ) } -pub fn emit_go_service_struct(name: String, fallback_transport: Rc, op_children: Rc>>, source_indices: Rc>>) -> String { +pub fn emit_go_service_struct( + name: String, + fallback_transport: Rc, + op_children: Rc>>, + source_indices: Rc>>, +) -> String { { let fs = compute_service_fields(&fallback_transport, &op_children, &source_indices); -let decls = service_field_decls(&fs, &language_spec(RenderTarget::Go).service_fields.clone()); -if ((decls.clone().len() as i64) == 0) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().type_alias_keyword.clone(), " ".to_string()), name), " ".to_string()), language_spec(RenderTarget::Go).items.clone().struct_keyword.clone()), "{}".to_string()) + let decls = + service_field_decls(&fs, &language_spec(RenderTarget::Go).service_fields.clone()); + if ((decls.clone().len() as i64) == 0) { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + language_spec(RenderTarget::Go) + .items + .clone() + .type_alias_keyword + .clone(), + " ".to_string(), + ), + name, + ), + " ".to_string(), + ), + language_spec(RenderTarget::Go) + .items + .clone() + .struct_keyword + .clone(), + ), + "{}".to_string(), + ) } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().type_alias_keyword.clone(), " ".to_string()), name), " ".to_string()), language_spec(RenderTarget::Go).items.clone().struct_keyword.clone()), " {\n".to_string()), decls.clone().join(&"\n".to_string())), "\n}".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + language_spec(RenderTarget::Go) + .items + .clone() + .type_alias_keyword + .clone(), + " ".to_string(), + ), + name, + ), + " ".to_string(), + ), + language_spec(RenderTarget::Go) + .items + .clone() + .struct_keyword + .clone(), + ), + " {\n".to_string(), + ), + decls.clone().join(&"\n".to_string()), + ), + "\n}".to_string(), + ) } -} + } } -pub fn emit_go_rest_call(op_name: String, transport: &Rc, depth: i64, source_indices: &Rc>>) -> String { +pub fn emit_go_rest_call( + op_name: String, + transport: &Rc, + depth: i64, + source_indices: &Rc>>, +) -> String { { let prefix = make_indent(depth); -let url_line = v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix.clone(), "url := fmt.Sprintf(\"%s/".to_string()), to_snake(op_name)), "\", c.BaseURL)".to_string()); -let body_line = v2_rt::concat(prefix.clone(), "reqBody := bytes.NewBuffer(nil)".to_string()); -let req_line = v2_rt::concat(v2_rt::concat(prefix.clone(), "req, err := http.NewRequest(\"POST\", url, reqBody)\n".to_string()), "if err != nil {\n\treturn nil, fmt.Errorf(\"creating request: %w\", err)\n}".to_string()); -let auth_line = if transport_has_auth(transport.clone(), source_indices.clone()) { + let url_line = v2_rt::concat( + v2_rt::concat( + v2_rt::concat(prefix.clone(), "url := fmt.Sprintf(\"%s/".to_string()), + to_snake(op_name), + ), + "\", c.BaseURL)".to_string(), + ); + let body_line = v2_rt::concat( + prefix.clone(), + "reqBody := bytes.NewBuffer(nil)".to_string(), + ); + let req_line = v2_rt::concat( + v2_rt::concat( + prefix.clone(), + "req, err := http.NewRequest(\"POST\", url, reqBody)\n".to_string(), + ), + "if err != nil {\n\treturn nil, fmt.Errorf(\"creating request: %w\", err)\n}" + .to_string(), + ); + let auth_line = if transport_has_auth(transport.clone(), source_indices.clone()) { { - let header_name = match transport_auth_header_name(transport.clone(), source_indices.clone()) { - Some(h) => h.clone(), - None => "Authorization".to_string(), -}; -v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix.clone(), "req.Header.Set(\"".to_string()), header_name), "\", c.AuthToken)".to_string()) -} + let header_name = + match transport_auth_header_name(transport.clone(), source_indices.clone()) { + Some(h) => h.clone(), + None => "Authorization".to_string(), + }; + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(prefix.clone(), "req.Header.Set(\"".to_string()), + header_name, + ), + "\", c.AuthToken)".to_string(), + ) + } } else { "".to_string() }; -let hdrs = transport_headers(transport.clone(), source_indices.clone()); -let header_lines = Rc::new({ let mut __result = Vec::new(); for h in hdrs.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix.clone(), "req.Header.Set(\"".to_string()), field_init_node_name_at(h.clone(), source_indices.clone())), "\", ".to_string()), emit_simple_expr(&field_init_node_value(&h), &RenderTarget::Go, &source_indices)), ")".to_string())); } __result }); -let send_lines = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix.clone(), "resp, err := http.DefaultClient.Do(req)\n".to_string()), "if err != nil {\n\treturn nil, fmt.Errorf(\"sending request: %w\", err)\n}\n".to_string()), "defer resp.Body.Close()\n".to_string()), "body, err := io.ReadAll(resp.Body)\n".to_string()), "if err != nil {\n\treturn nil, fmt.Errorf(\"reading response: %w\", err)\n}\n".to_string()), "var result interface{}\n".to_string()), "if err := json.Unmarshal(body, &result); err != nil {\n".to_string()), "\treturn nil, fmt.Errorf(\"decoding response: %w\", err)\n}\n".to_string()), "return result, nil".to_string()); -let all_lines = v2_rt::concat(v2_rt::concat(v2_rt::concat(Rc::new(vec![url_line, body_line, req_line]), if (auth_line.clone().as_str() == "".to_string().as_str()) { - Rc::new(vec![]) - } else { - Rc::new(vec![auth_line.clone()]) - }), header_lines), Rc::new(vec![send_lines])); -all_lines.join(&"\n".to_string()) -} + let hdrs = transport_headers(transport.clone(), source_indices.clone()); + let header_lines = Rc::new({ + let mut __result = Vec::new(); + for h in hdrs.iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(prefix.clone(), "req.Header.Set(\"".to_string()), + field_init_node_name_at(h.clone(), source_indices.clone()), + ), + "\", ".to_string(), + ), + emit_simple_expr( + &field_init_node_value(&h), + &RenderTarget::Go, + &source_indices, + ), + ), + ")".to_string(), + )); + } + __result + }); + let send_lines = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix.clone(), "resp, err := http.DefaultClient.Do(req)\n".to_string()), "if err != nil {\n\treturn nil, fmt.Errorf(\"sending request: %w\", err)\n}\n".to_string()), "defer resp.Body.Close()\n".to_string()), "body, err := io.ReadAll(resp.Body)\n".to_string()), "if err != nil {\n\treturn nil, fmt.Errorf(\"reading response: %w\", err)\n}\n".to_string()), "var result interface{}\n".to_string()), "if err := json.Unmarshal(body, &result); err != nil {\n".to_string()), "\treturn nil, fmt.Errorf(\"decoding response: %w\", err)\n}\n".to_string()), "return result, nil".to_string()); + let all_lines = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + Rc::new(vec![url_line, body_line, req_line]), + if (auth_line.clone().as_str() == "".to_string().as_str()) { + Rc::new(vec![]) + } else { + Rc::new(vec![auth_line.clone()]) + }, + ), + header_lines, + ), + Rc::new(vec![send_lines]), + ); + all_lines.join(&"\n".to_string()) + } } -pub fn emit_go_shell_call(op_name: String, transport: Rc, depth: i64, source_indices: &Rc>>) -> String { +pub fn emit_go_shell_call( + op_name: String, + transport: Rc, + depth: i64, + source_indices: &Rc>>, +) -> String { { let prefix = make_indent(depth); -let cmd_line = v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix.clone(), "cmd := exec.Command(\"".to_string()), to_snake(op_name)), "\")".to_string()); -let dir_line = v2_rt::concat(prefix.clone(), "cmd.Dir = c.WorkingDir".to_string()); -let envs = transport_env(transport, source_indices.clone()); -let env_lines = Rc::new({ let mut __result = Vec::new(); for e in envs.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix.clone(), "cmd.Env = append(cmd.Env, \"".to_string()), field_init_node_name_at(e.clone(), source_indices.clone())), "=\" + ".to_string()), emit_simple_expr(&field_init_node_value(&e), &RenderTarget::Go, &source_indices)), ")".to_string())); } __result }); -let run_lines = v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix.clone(), "output, err := cmd.Output()\n".to_string()), "if err != nil {\n\treturn \"\", fmt.Errorf(\"running command: %w\", err)\n}\n".to_string()), "return string(output), nil".to_string()); -let all_lines = v2_rt::concat(v2_rt::concat(Rc::new(vec![cmd_line, dir_line]), env_lines), Rc::new(vec![run_lines])); -all_lines.join(&"\n".to_string()) -} + let cmd_line = v2_rt::concat( + v2_rt::concat( + v2_rt::concat(prefix.clone(), "cmd := exec.Command(\"".to_string()), + to_snake(op_name), + ), + "\")".to_string(), + ); + let dir_line = v2_rt::concat(prefix.clone(), "cmd.Dir = c.WorkingDir".to_string()); + let envs = transport_env(transport, source_indices.clone()); + let env_lines = Rc::new({ + let mut __result = Vec::new(); + for e in envs.iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + prefix.clone(), + "cmd.Env = append(cmd.Env, \"".to_string(), + ), + field_init_node_name_at(e.clone(), source_indices.clone()), + ), + "=\" + ".to_string(), + ), + emit_simple_expr( + &field_init_node_value(&e), + &RenderTarget::Go, + &source_indices, + ), + ), + ")".to_string(), + )); + } + __result + }); + let run_lines = v2_rt::concat( + v2_rt::concat( + v2_rt::concat(prefix.clone(), "output, err := cmd.Output()\n".to_string()), + "if err != nil {\n\treturn \"\", fmt.Errorf(\"running command: %w\", err)\n}\n" + .to_string(), + ), + "return string(output), nil".to_string(), + ); + let all_lines = v2_rt::concat( + v2_rt::concat(Rc::new(vec![cmd_line, dir_line]), env_lines), + Rc::new(vec![run_lines]), + ); + all_lines.join(&"\n".to_string()) + } } pub fn emit_go_file_call(op_name: String, depth: i64) -> String { { let prefix = make_indent(depth); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix, "path := fmt.Sprintf(\"%s/".to_string()), to_snake(op_name)), "\", c.BasePath)\n".to_string()), "data, err := os.ReadFile(path)\n".to_string()), "if err != nil {\n\treturn \"\", fmt.Errorf(\"reading file: %w\", err)\n}\n".to_string()), "return string(data), nil".to_string()) -} + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(prefix, "path := fmt.Sprintf(\"%s/".to_string()), + to_snake(op_name), + ), + "\", c.BasePath)\n".to_string(), + ), + "data, err := os.ReadFile(path)\n".to_string(), + ), + "if err != nil {\n\treturn \"\", fmt.Errorf(\"reading file: %w\", err)\n}\n" + .to_string(), + ), + "return string(data), nil".to_string(), + ) + } } pub fn emit_go_local_call(op_name: String, depth: i64) -> String { { let prefix = make_indent(depth); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix, "// Local binding -- direct function call\n".to_string()), "return ".to_string()), go_export_ident(op_name)), "(), nil".to_string()) -} + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + prefix, + "// Local binding -- direct function call\n".to_string(), + ), + "return ".to_string(), + ), + go_export_ident(op_name), + ), + "(), nil".to_string(), + ) + } } pub fn emit_go_resource_def(item: &Rc, env: &Rc) -> String { { let item_text = authored_name(env.clone(), item.clone()); -let cap_children = Rc::new({ let mut __result = Vec::new(); for c in item.children.clone().iter().cloned() { if ((c.params.clone().len() as i64) > 0) { __result.push(c); } } __result }); -let methods = Rc::new({ let mut __result = Vec::new(); for c in cap_children.iter().cloned() { __result.push(emit_go_capability_method(&c, 1, &env)); } __result }); -let methods_str = methods.join(&"\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Go).items.clone().type_alias_keyword.clone(), " ".to_string()), item_text), " interface {\n".to_string()), methods_str), "\n}".to_string()) -} + let cap_children = Rc::new({ + let mut __result = Vec::new(); + for c in item.children.clone().iter().cloned() { + if ((c.params.clone().len() as i64) > 0) { + __result.push(c); + } + } + __result + }); + let methods = Rc::new({ + let mut __result = Vec::new(); + for c in cap_children.iter().cloned() { + __result.push(emit_go_capability_method(&c, 1, &env)); + } + __result + }); + let methods_str = methods.join(&"\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + language_spec(RenderTarget::Go) + .items + .clone() + .type_alias_keyword + .clone(), + " ".to_string(), + ), + item_text, + ), + " interface {\n".to_string(), + ), + methods_str, + ), + "\n}".to_string(), + ) + } } pub fn emit_go_capability_method(cap_node: &Rc, depth: i64, env: &Rc) -> String { { - let input_params = Rc::new({ let mut __result = Vec::new(); for p in cap_node.params.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(emit_ident(param_node_name_at(p.clone(), env.source_indices.clone()), RenderTarget::Go), " ".to_string()), emit_node_type(param_node_type_expr(&p), RenderTarget::Go, env.source_indices.clone()))); } __result }); -let params_str = input_params.join(&", ".to_string()); -let ret = emit_node_type(resolved_type(cap_node.clone()), RenderTarget::Go, env.source_indices.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(make_indent(depth), go_export_ident(authored_name(env.clone(), cap_node.clone()))), "(".to_string()), params_str), ") (".to_string()), ret), ", error)".to_string()) -} + let input_params = Rc::new({ + let mut __result = Vec::new(); + for p in cap_node.params.clone().iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + emit_ident( + param_node_name_at(p.clone(), env.source_indices.clone()), + RenderTarget::Go, + ), + " ".to_string(), + ), + emit_node_type( + param_node_type_expr(&p), + RenderTarget::Go, + env.source_indices.clone(), + ), + )); + } + __result + }); + let params_str = input_params.join(&", ".to_string()); + let ret = emit_node_type( + resolved_type(cap_node.clone()), + RenderTarget::Go, + env.source_indices.clone(), + ); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + make_indent(depth), + go_export_ident(authored_name(env.clone(), cap_node.clone())), + ), + "(".to_string(), + ), + params_str, + ), + ") (".to_string(), + ), + ret, + ), + ", error)".to_string(), + ) + } } -pub fn emit_go_data_def(name: String, type_node: Rc, value: Rc, registry: Rc>>, scope: &Rc, depth: i64) -> String { +pub fn emit_go_data_def( + name: String, + type_node: Rc, + value: Rc, + registry: Rc>>, + scope: &Rc, + depth: i64, +) -> String { { - let ty_str = emit_node_type(type_node, RenderTarget::Go, scope.type_env.clone().source_indices.clone()); -let val_str = emit_go_typed_expr(value, registry, &scope, depth, 1024); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("var ".to_string(), go_export_ident(name)), " ".to_string()), ty_str), " = ".to_string()), val_str) -} + let ty_str = emit_node_type( + type_node, + RenderTarget::Go, + scope.type_env.clone().source_indices.clone(), + ); + let val_str = emit_go_typed_expr(value, registry, &scope, depth, 1024); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("var ".to_string(), go_export_ident(name)), + " ".to_string(), + ), + ty_str, + ), + " = ".to_string(), + ), + val_str, + ) + } } pub fn go_export_ident(name: String) -> String { match (*language_spec(RenderTarget::Go).visibility.clone()).clone() { - VisibilitySpec::CaseVisibility { export_case: ec, .. } => { - let result = apply_naming_case(name, ec.clone()); -if { let mut __found = false; for r in go_reserved().iter().cloned() { if (r.clone().as_str() == result.clone().as_str()) { __found = true; break; } } __found } { - v2_rt::concat(result.clone(), go_reserved_escape_suffix()) - } else { - result.clone() + VisibilitySpec::CaseVisibility { + export_case: ec, .. + } => { + let result = apply_naming_case(name, ec.clone()); + if { + let mut __found = false; + for r in go_reserved().iter().cloned() { + if (r.clone().as_str() == result.clone().as_str()) { + __found = true; + break; + } + } + __found + } { + v2_rt::concat(result.clone(), go_reserved_escape_suffix()) + } else { + result.clone() + } } -}, - _ => "__GO_VISIBILITY_SPEC_MISMATCH__".to_string(), -} + _ => "__GO_VISIBILITY_SPEC_MISMATCH__".to_string(), + } } diff --git a/src/v2/stage0/src/v2_compiler_emit_python.rs b/src/v2/stage0/src/v2_compiler_emit_python.rs index 280d452ed08..3ca12b846ae 100644 --- a/src/v2/stage0/src/v2_compiler_emit_python.rs +++ b/src/v2/stage0/src/v2_compiler_emit_python.rs @@ -1,229 +1,615 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.emit_python -use std::collections::HashMap; -use std::rc::Rc; +pub use crate::std_induction::SubValueRelation; +use crate::std_induction::SubValueRelation::SubValueUnknown; +pub use crate::v2_compiler_artifact::RenderTarget; +use crate::v2_compiler_artifact::RenderTarget::Python; +pub use crate::v2_compiler_emit::{ + apply_named_template, apply_type_template1, apply_type_template2, apply_type_template3, + capitalize_first, compute_service_fields, effective_operation_transport, + emit_algebra_method_template, emit_bin_op_symbol, emit_container, emit_default_bin_op, + emit_error_expr, emit_expr_field_access_shared, emit_expr_var_shared, emit_ident, + emit_inferred_shared, emit_keyword, emit_lambda, emit_lambda_params, emit_let_binding, + emit_list_lit_expr, emit_literal, emit_map_type, emit_node_type, emit_null_coalesce, + emit_param_shared, emit_params_shared, emit_return, emit_shared_expr, emit_simple_expr, + emit_string_literal, emit_tco_unified, emit_typed_block_join, emit_typed_call_unified, + emit_typed_cast_shared, emit_typed_first_arg_shared, emit_typed_for_each_shared, + emit_typed_if_shared, emit_typed_index_shared, emit_typed_let_shared, emit_typed_match_unified, + emit_typed_method_call_unified, emit_typed_record_lit_unified, emit_typed_slice_shared, + emit_typed_string_interp_unified, emit_unary_op, emit_unified_init_block_stmts, + emit_unified_operation_method, emit_unified_pattern, emit_unified_service_def, + emit_unified_transport_dispatch, emit_unified_typed_expr, emit_unified_typed_func_body, + empty_emit_scope, escape_json_string, escape_python_interp_text, escape_string_literal_body, + extract_string_interp_parts, extract_test_projections, has_nested_records_node, + has_service_items, is_data_def_item, is_function_item, is_null_coalesce, is_resource_def_item, + is_service_def_item, is_service_item, is_tco_eligible, is_type_alias_item, + is_type_alias_return_node, is_type_decl_item, is_type_def_item, is_upper, language_spec, + lookup_item, make_indent, module_emit_scope, module_to_filename, order_typed_call_args, + sanitize_service_name, scope_after_expr, seed_bindings, service_fallback_transport, + service_field_ctors, service_field_decls, service_var_name, test_file_path, test_function_name, + to_lower_char, to_screaming_snake, to_snake, to_string, to_string_helper, to_upper_char, + typed_named_arg_matches, unique_strings, BlockEmitState, EmitResult, InterpPart, + ServiceFieldSet, TestProjection, +}; +pub use crate::v2_compiler_infer::{build_params_scope, expr_span, extend_scope, InferScope}; +pub use crate::v2_compiler_infer_env::{authored_name, TypeBinding, TypeEnv}; +pub use crate::v2_compiler_infer_items::{ItemInfo, ResolvedGraph, TypedModule}; +pub use crate::v2_compiler_infer_service::{ + extract_typed_service_name, is_typed_service_call_receiver, +}; +pub use crate::v2_compiler_infer_sigs::{ResolvedFuncEnv, ResolvedFuncSig}; +pub use crate::v2_compiler_infer_types::{ + node_is_keyed_collection, normalize_access_type_node, resolved_type, +}; +pub use crate::v2_compiler_languages::{ + is_string_like, scaffold_for_target, serialization_for_target, test_conventions_for_target, + ItemKeywords, TestConventions, +}; use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::v2_std_core::{Node, InferredNode, VarBindingKind, import_is_all, import_specific_names_at, module_imports, module_items, param_node_type_expr, authored_name_at, NewlineIndex, expr_var_name_at, expr_call_func_at, expr_method_name_at, let_binding_name_at, param_node_name_at, resource_use_name_at, MatchPattern, LiteralValue, TextFile, SourceSpan, resource_use_resource, BinOp, UnaryOpKind, StringPart, DeclaredFuncSig, transport_has_auth, transport_auth_header_name, transport_headers, transport_env, ExprData, make_expr_node, MethodSemantics, FieldSummary, arg_value, arm_body, arm_pattern, arm_guard, field_init_node_name_at, field_init_node_value, if_condition, if_then_branch, if_else_branch, match_scrutinee, match_arm_nodes, let_value, let_body, field_access_base, field_access_field_at, method_receiver, expr_field_access_summary, expr_method_call_semantics, record_lit_type_name_at, lambda_body, cast_expr, cast_target, return_value, foreach_variable_at, foreach_collection, foreach_body, method_arg_nodes, index_base, index_expr, slice_base, slice_start, slice_end, with_required_cardinality, Connective, is_rest_transport, is_shell_transport, is_file_transport, FieldAccessStyle, Cardinality}; -use crate::v2_std_core::InferredNode::{Resolved, CompilerError}; -use crate::v2_std_core::VarBindingKind::{FunctionValueBinding}; -use crate::v2_std_core::BinOp::{NullCoalesce}; -use crate::v2_std_core::ExprData::{NoExprData, ExprLiteral, ExprError, ExprVar, ExprFieldAccess, ExprCall, ExprMethodCall, ExprMatch, ExprIf, ExprLet, ExprRecordLit, ExprListLit, ExprBinOp, ExprUnaryOp, ExprLambda, ExprStringInterp, ExprBlock, ExprCast, ExprForEach, ExprIndex, ExprSlice, ExprReturn}; -use crate::v2_std_core::MethodSemantics::{PlainMethodSemantics, AlgebraMethodSemantics, ServiceMethodSemantics}; -use crate::v2_std_core::FieldAccessStyle::{TupleFirst, TupleSecond}; -use crate::v2_std_core::StringPart::{Text, Interpolation}; +use crate::v2_std_core::BinOp::NullCoalesce; +use crate::v2_std_core::Cardinality::CardOptional; use crate::v2_std_core::Connective::{Conj, Disj}; -use crate::v2_std_core::Cardinality::{CardOptional}; -use crate::v2_std_core::MatchPattern::*; +use crate::v2_std_core::ExprData::{ + ExprBinOp, ExprBlock, ExprCall, ExprCast, ExprError, ExprFieldAccess, ExprForEach, ExprIf, + ExprIndex, ExprLambda, ExprLet, ExprListLit, ExprLiteral, ExprMatch, ExprMethodCall, + ExprRecordLit, ExprReturn, ExprSlice, ExprStringInterp, ExprUnaryOp, ExprVar, NoExprData, +}; +use crate::v2_std_core::FieldAccessStyle::{TupleFirst, TupleSecond}; +use crate::v2_std_core::InferredNode::{CompilerError, Resolved}; use crate::v2_std_core::LiteralValue::*; +use crate::v2_std_core::MatchPattern::*; +use crate::v2_std_core::MethodSemantics::{ + AlgebraMethodSemantics, PlainMethodSemantics, ServiceMethodSemantics, +}; +use crate::v2_std_core::StringPart::{Interpolation, Text}; use crate::v2_std_core::UnaryOpKind::*; -pub use crate::v2_compiler_artifact::{RenderTarget}; -use crate::v2_compiler_artifact::RenderTarget::{Python}; -pub use crate::v2_compiler_languages::{scaffold_for_target, serialization_for_target, TestConventions, ItemKeywords, test_conventions_for_target, is_string_like}; -pub use crate::v2_compiler_infer_env::{TypeEnv, TypeBinding, authored_name}; -pub use crate::v2_compiler_infer_types::{resolved_type, normalize_access_type_node, node_is_keyed_collection}; -pub use crate::v2_compiler_infer_sigs::{ResolvedFuncSig, ResolvedFuncEnv}; -pub use crate::v2_compiler_infer_items::{ResolvedGraph, TypedModule, ItemInfo}; -pub use crate::v2_compiler_infer_service::{is_typed_service_call_receiver, extract_typed_service_name}; -pub use crate::v2_compiler_infer::{InferScope, build_params_scope, extend_scope, expr_span}; -pub use crate::std_induction::{SubValueRelation}; -use crate::std_induction::SubValueRelation::{SubValueUnknown}; -pub use crate::v2_compiler_emit::{EmitResult, BlockEmitState, InterpPart, TestProjection, emit_literal, emit_bin_op_symbol, emit_keyword, emit_container, emit_map_type, emit_node_type, emit_ident, emit_let_binding, emit_simple_expr, emit_unary_op, emit_lambda, emit_error_expr, emit_return, emit_lambda_params, emit_list_lit_expr, emit_shared_expr, emit_default_bin_op, emit_string_literal, escape_python_interp_text, escape_string_literal_body, empty_emit_scope, module_emit_scope, scope_after_expr, lookup_item, typed_named_arg_matches, order_typed_call_args, unique_strings, has_nested_records_node, escape_json_string, module_to_filename, make_indent, to_string, to_string_helper, to_snake, to_screaming_snake, is_upper, to_lower_char, to_upper_char, capitalize_first, sanitize_service_name, service_var_name, test_function_name, apply_type_template1, apply_type_template2, apply_type_template3, apply_named_template, language_spec, is_null_coalesce, emit_null_coalesce, is_type_alias_return_node, is_service_item, has_service_items, is_type_def_item, is_type_alias_item, is_type_decl_item, is_function_item, is_data_def_item, is_service_def_item, is_resource_def_item, extract_test_projections, is_tco_eligible, service_fallback_transport, effective_operation_transport, ServiceFieldSet, compute_service_fields, service_field_decls, service_field_ctors, seed_bindings, emit_expr_var_shared, emit_expr_field_access_shared, extract_string_interp_parts, emit_typed_cast_shared, emit_typed_for_each_shared, emit_typed_index_shared, emit_typed_slice_shared, emit_unified_init_block_stmts, emit_typed_if_shared, emit_typed_let_shared, emit_param_shared, emit_params_shared, emit_inferred_shared, emit_typed_block_join, emit_typed_first_arg_shared, emit_algebra_method_template, emit_typed_string_interp_unified, emit_typed_record_lit_unified, emit_typed_call_unified, emit_typed_method_call_unified, emit_typed_match_unified, emit_unified_typed_expr, emit_tco_unified, emit_unified_pattern, test_file_path, emit_unified_typed_func_body, emit_unified_service_def, emit_unified_operation_method, emit_unified_transport_dispatch}; +use crate::v2_std_core::VarBindingKind::FunctionValueBinding; +pub use crate::v2_std_core::{ + arg_value, arm_body, arm_guard, arm_pattern, authored_name_at, cast_expr, cast_target, + expr_call_func_at, expr_field_access_summary, expr_method_call_semantics, expr_method_name_at, + expr_var_name_at, field_access_base, field_access_field_at, field_init_node_name_at, + field_init_node_value, foreach_body, foreach_collection, foreach_variable_at, if_condition, + if_else_branch, if_then_branch, import_is_all, import_specific_names_at, index_base, + index_expr, is_file_transport, is_rest_transport, is_shell_transport, lambda_body, + let_binding_name_at, let_body, let_value, make_expr_node, match_arm_nodes, match_scrutinee, + method_arg_nodes, method_receiver, module_imports, module_items, param_node_name_at, + param_node_type_expr, record_lit_type_name_at, resource_use_name_at, resource_use_resource, + return_value, slice_base, slice_end, slice_start, transport_auth_header_name, transport_env, + transport_has_auth, transport_headers, with_required_cardinality, BinOp, Cardinality, + Connective, DeclaredFuncSig, ExprData, FieldAccessStyle, FieldSummary, InferredNode, + LiteralValue, MatchPattern, MethodSemantics, NewlineIndex, Node, SourceSpan, StringPart, + TextFile, UnaryOpKind, VarBindingKind, +}; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn emit_python(typed: &Rc) -> Rc { { let registry = typed.item_registry.clone(); -let test_projections = extract_test_projections(typed.clone()); -let module_files = Rc::new({ let mut __result = Vec::new(); for tm in typed.modules.clone().iter().cloned() { __result.push(emit_py_module(&tm, registry.clone())); } __result }); -let test_files = Rc::new({ let mut __result = Vec::new(); for f in Rc::new({ let mut __result = Vec::new(); for tm in typed.modules.clone().iter().cloned() { __result.push(emit_py_test_file(&authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone()), &Rc::new({ let mut __result = Vec::new(); for p in test_projections.clone().iter().cloned() { if (p.module_name.clone().as_str() == authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone()).as_str()) { __result.push(p); } } __result }))); } __result }).iter().cloned() { if (f.path.clone().as_str() != "".to_string().as_str()) { __result.push(f); } } __result }); -let init_file = emit_init_py(typed.modules.clone()); -let requirements = emit_requirements_txt(has_service_items(typed.clone())); -let files = v2_rt::concat(v2_rt::concat(Rc::new(vec![requirements, init_file]), module_files), test_files); -Rc::new(EmitResult { - files: files, - diagnostics: Rc::new(vec![]), -}) -} + let test_projections = extract_test_projections(typed.clone()); + let module_files = Rc::new({ + let mut __result = Vec::new(); + for tm in typed.modules.clone().iter().cloned() { + __result.push(emit_py_module(&tm, registry.clone())); + } + __result + }); + let test_files = Rc::new({ + let mut __result = Vec::new(); + for f in Rc::new({ + let mut __result = Vec::new(); + for tm in typed.modules.clone().iter().cloned() { + __result.push(emit_py_test_file( + &authored_name_at( + tm.type_env.clone().source_indices.clone(), + &tm.module.clone(), + ), + &Rc::new({ + let mut __result = Vec::new(); + for p in test_projections.clone().iter().cloned() { + if (p.module_name.clone().as_str() + == authored_name_at( + tm.type_env.clone().source_indices.clone(), + &tm.module.clone(), + ) + .as_str()) + { + __result.push(p); + } + } + __result + }), + )); + } + __result + }) + .iter() + .cloned() + { + if (f.path.clone().as_str() != "".to_string().as_str()) { + __result.push(f); + } + } + __result + }); + let init_file = emit_init_py(typed.modules.clone()); + let requirements = emit_requirements_txt(has_service_items(typed.clone())); + let files = v2_rt::concat( + v2_rt::concat(Rc::new(vec![requirements, init_file]), module_files), + test_files, + ); + Rc::new(EmitResult { + files: files, + diagnostics: Rc::new(vec![]), + }) + } } pub fn py_derive_attribute() -> String { - match serialization_for_target(RenderTarget::Python).derive_attribute.clone() { - Some(attr) => attr.clone(), - None => "@dataclass".to_string(), -} + match serialization_for_target(RenderTarget::Python) + .derive_attribute + .clone() + { + Some(attr) => attr.clone(), + None => "@dataclass".to_string(), + } } pub fn py_default_value() -> String { - match serialization_for_target(RenderTarget::Python).default_value.clone() { - Some(value) => value.clone(), - None => "None".to_string(), -} + match serialization_for_target(RenderTarget::Python) + .default_value + .clone() + { + Some(value) => value.clone(), + None => "None".to_string(), + } } pub fn emit_init_py(modules: Rc>>) -> Rc { { - let import_lines = Rc::new({ let mut __result = Vec::new(); for tm in modules.iter().cloned() { __result.push({ - let mod_name = module_to_filename(authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone())); -let items = language_spec(RenderTarget::Python).items.clone(); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(items.import_from_keyword.clone(), " . ".to_string()), items.import_keyword.clone()), " ".to_string()), mod_name.clone()) -}); } __result }); -let content = v2_rt::concat(v2_rt::concat("# Generated by v2 compiler -- do not edit.\n\n".to_string(), import_lines.join(&"\n".to_string())), "\n".to_string()); -let init_path = match scaffold_for_target(RenderTarget::Python).module_init_file.clone() { - Some(path) => path.clone(), - None => "__init__.py".to_string(), -}; -Rc::new(TextFile { - path: init_path, - content: content, -}) -} + let import_lines = Rc::new({ + let mut __result = Vec::new(); + for tm in modules.iter().cloned() { + __result.push({ + let mod_name = module_to_filename(authored_name_at( + tm.type_env.clone().source_indices.clone(), + &tm.module.clone(), + )); + let items = language_spec(RenderTarget::Python).items.clone(); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(items.import_from_keyword.clone(), " . ".to_string()), + items.import_keyword.clone(), + ), + " ".to_string(), + ), + mod_name.clone(), + ) + }); + } + __result + }); + let content = v2_rt::concat( + v2_rt::concat( + "# Generated by v2 compiler -- do not edit.\n\n".to_string(), + import_lines.join(&"\n".to_string()), + ), + "\n".to_string(), + ); + let init_path = match scaffold_for_target(RenderTarget::Python) + .module_init_file + .clone() + { + Some(path) => path.clone(), + None => "__init__.py".to_string(), + }; + Rc::new(TextFile { + path: init_path, + content: content, + }) + } } pub fn python_test_signature_comment(projection: &Rc) -> String { { - let params_str = Rc::new({ let mut __result = Vec::new(); for p in projection.params.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(param_node_name_at(p.clone(), projection.source_indices.clone()), ": ".to_string()), emit_node_type(param_node_type_expr(&p), RenderTarget::Python, projection.source_indices.clone()))); } __result }).join(&", ".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("# Signature: ".to_string(), sanitize_service_name(projection.service_name.clone())), ".".to_string()), projection.operation_name.clone()), "(".to_string()), params_str), ") -> ".to_string()), emit_node_type(projection.inferred.clone(), RenderTarget::Python, projection.source_indices.clone())) -} + let params_str = Rc::new({ + let mut __result = Vec::new(); + for p in projection.params.clone().iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + param_node_name_at(p.clone(), projection.source_indices.clone()), + ": ".to_string(), + ), + emit_node_type( + param_node_type_expr(&p), + RenderTarget::Python, + projection.source_indices.clone(), + ), + )); + } + __result + }) + .join(&", ".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "# Signature: ".to_string(), + sanitize_service_name(projection.service_name.clone()), + ), + ".".to_string(), + ), + projection.operation_name.clone(), + ), + "(".to_string(), + ), + params_str, + ), + ") -> ".to_string(), + ), + emit_node_type( + projection.inferred.clone(), + RenderTarget::Python, + projection.source_indices.clone(), + ), + ) + } } -pub fn emit_py_test_file(module_name: &String, projections: &Rc>>) -> Rc { +pub fn emit_py_test_file( + module_name: &String, + projections: &Rc>>, +) -> Rc { if ((projections.clone().len() as i64) == 0) { Rc::new(TextFile { - path: "".to_string(), - content: "".to_string(), -}) + path: "".to_string(), + content: "".to_string(), + }) } else { { - let tests_str = Rc::new({ let mut __result = Vec::new(); for p in projections.clone().iter().cloned() { __result.push(emit_py_operation_test(&p, 0)); } __result }).join(&"\n\n".to_string()); -let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("# Generated tests -- do not edit.\n".to_string(), "# Source module: ".to_string()), module_name.clone()), "\n\n".to_string()), tests_str), "\n".to_string()); -Rc::new(TextFile { - path: test_file_path(module_name.clone(), &RenderTarget::Python), - content: content, -}) -} + let tests_str = Rc::new({ + let mut __result = Vec::new(); + for p in projections.clone().iter().cloned() { + __result.push(emit_py_operation_test(&p, 0)); + } + __result + }) + .join(&"\n\n".to_string()); + let content = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "# Generated tests -- do not edit.\n".to_string(), + "# Source module: ".to_string(), + ), + module_name.clone(), + ), + "\n\n".to_string(), + ), + tests_str, + ), + "\n".to_string(), + ); + Rc::new(TextFile { + path: test_file_path(module_name.clone(), &RenderTarget::Python), + content: content, + }) + } } } pub fn emit_py_operation_test(projection: &Rc, depth: i64) -> String { { let test_name = test_function_name(&projection, RenderTarget::Python); -let indent = make_indent((depth.clone() + 1)); -let mock_setup = Rc::new({ let mut __result = Vec::new(); for mp in projection.mock_field_inits.clone().iter().cloned() { __result.push(emit_py_mock_prop_setup(&mp, (depth.clone() + 1), &projection.source_indices.clone())); } __result }).join(&"\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Python).items.clone().func_keyword.clone(), " ".to_string()), test_name), "() -> None:\n".to_string()), indent.clone()), python_test_signature_comment(&projection)), "\n".to_string()), indent.clone()), mock_setup), "\n".to_string()), indent.clone()), "# TODO: add dry-run support to Python service emission for full invocation tests\n".to_string()), indent.clone()), "assert True # mock data setup verified\n".to_string()) -} + let indent = make_indent((depth.clone() + 1)); + let mock_setup = Rc::new({ + let mut __result = Vec::new(); + for mp in projection.mock_field_inits.clone().iter().cloned() { + __result.push(emit_py_mock_prop_setup( + &mp, + (depth.clone() + 1), + &projection.source_indices.clone(), + )); + } + __result + }) + .join(&"\n".to_string()); + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Python).items.clone().func_keyword.clone(), " ".to_string()), test_name), "() -> None:\n".to_string()), indent.clone()), python_test_signature_comment(&projection)), "\n".to_string()), indent.clone()), mock_setup), "\n".to_string()), indent.clone()), "# TODO: add dry-run support to Python service emission for full invocation tests\n".to_string()), indent.clone()), "assert True # mock data setup verified\n".to_string()) + } } -pub fn emit_py_mock_prop_setup(mock_prop: &Rc, depth: i64, source_indices: &Rc>>) -> String { - v2_rt::concat(v2_rt::concat(emit_ident(field_init_node_name_at(mock_prop.clone(), source_indices.clone()), RenderTarget::Python), " = ".to_string()), emit_simple_expr(&field_init_node_value(&mock_prop), &RenderTarget::Python, &source_indices)) +pub fn emit_py_mock_prop_setup( + mock_prop: &Rc, + depth: i64, + source_indices: &Rc>>, +) -> String { + v2_rt::concat( + v2_rt::concat( + emit_ident( + field_init_node_name_at(mock_prop.clone(), source_indices.clone()), + RenderTarget::Python, + ), + " = ".to_string(), + ), + emit_simple_expr( + &field_init_node_value(&mock_prop), + &RenderTarget::Python, + &source_indices, + ), + ) } -pub fn emit_py_module(typed_module: &Rc, registry: Rc>>) -> Rc { +pub fn emit_py_module( + typed_module: &Rc, + registry: Rc>>, +) -> Rc { { let m = typed_module.module.clone(); -let scope = module_emit_scope(&typed_module); -let si = scope.type_env.clone().source_indices.clone(); -let mod_name_str = authored_name_at(si.clone(), &m); -let prelude = emit_py_prelude(typed_module.clone()); -let imports_str = emit_py_imports(&module_imports(m.clone()), si.clone()); -let imports_section = if (imports_str.clone().as_str() == "".to_string().as_str()) { + let scope = module_emit_scope(&typed_module); + let si = scope.type_env.clone().source_indices.clone(); + let mod_name_str = authored_name_at(si.clone(), &m); + let prelude = emit_py_prelude(typed_module.clone()); + let imports_str = emit_py_imports(&module_imports(m.clone()), si.clone()); + let imports_section = if (imports_str.clone().as_str() == "".to_string().as_str()) { "".to_string() } else { v2_rt::concat("\n".to_string(), imports_str.clone()) }; -let items_str = Rc::new({ let mut __result = Vec::new(); for item in typed_module.items.clone().iter().cloned() { __result.push(emit_py_typed_item(&item, registry.clone(), &scope)); } __result }).join(&"\n\n\n".to_string()); -let filename = module_to_filename(mod_name_str.clone()); -let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("# Generated by v2 compiler -- do not edit.\n".to_string(), "# Source module: ".to_string()), mod_name_str.clone()), "\n\n".to_string()), prelude), imports_section), "\n\n\n".to_string()), items_str), "\n".to_string()); -Rc::new(TextFile { - path: v2_rt::concat(filename, scaffold_for_target(RenderTarget::Python).source_file_extension.clone()), - content: content, -}) -} + let items_str = Rc::new({ + let mut __result = Vec::new(); + for item in typed_module.items.clone().iter().cloned() { + __result.push(emit_py_typed_item(&item, registry.clone(), &scope)); + } + __result + }) + .join(&"\n\n\n".to_string()); + let filename = module_to_filename(mod_name_str.clone()); + let content = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "# Generated by v2 compiler -- do not edit.\n".to_string(), + "# Source module: ".to_string(), + ), + mod_name_str.clone(), + ), + "\n\n".to_string(), + ), + prelude, + ), + imports_section, + ), + "\n\n\n".to_string(), + ), + items_str, + ), + "\n".to_string(), + ); + Rc::new(TextFile { + path: v2_rt::concat( + filename, + scaffold_for_target(RenderTarget::Python) + .source_file_extension + .clone(), + ), + content: content, + }) + } } -pub fn emit_py_imports(imports: &Rc>>, source_indices: Rc>>) -> String { +pub fn emit_py_imports( + imports: &Rc>>, + source_indices: Rc>>, +) -> String { if ((imports.clone().len() as i64) == 0) { "".to_string() } else { { - let import_lines = Rc::new({ let mut __result = Vec::new(); for imp in imports.clone().iter().cloned() { __result.push({ - let mod_name = module_to_filename(authored_name_at(source_indices.clone(), &imp)); -let items = language_spec(RenderTarget::Python).items.clone(); -if import_is_all(imp.clone()) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(items.import_from_keyword.clone(), " ".to_string()), mod_name.clone()), " ".to_string()), items.import_keyword.clone()), " *".to_string()) - } else { - { - let specific_names = import_specific_names_at(imp.clone(), source_indices.clone()); -if ((specific_names.clone().len() as i64) == 0) { - "".to_string() + let import_lines = Rc::new({ + let mut __result = Vec::new(); + for imp in imports.clone().iter().cloned() { + __result.push({ + let mod_name = + module_to_filename(authored_name_at(source_indices.clone(), &imp)); + let items = language_spec(RenderTarget::Python).items.clone(); + if import_is_all(imp.clone()) { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + items.import_from_keyword.clone(), + " ".to_string(), + ), + mod_name.clone(), + ), + " ".to_string(), + ), + items.import_keyword.clone(), + ), + " *".to_string(), + ) } else { { - let names_str = specific_names.clone().join(&", ".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(items.import_from_keyword.clone(), " ".to_string()), mod_name.clone()), " ".to_string()), items.import_keyword.clone()), " ".to_string()), names_str.clone()) -} + let specific_names = + import_specific_names_at(imp.clone(), source_indices.clone()); + if ((specific_names.clone().len() as i64) == 0) { + "".to_string() + } else { + { + let names_str = + specific_names.clone().join(&", ".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + items.import_from_keyword.clone(), + " ".to_string(), + ), + mod_name.clone(), + ), + " ".to_string(), + ), + items.import_keyword.clone(), + ), + " ".to_string(), + ), + names_str.clone(), + ) + } + } + } } -} + }); } -}); } __result }); -Rc::new({ let mut __result = Vec::new(); for line in import_lines.iter().cloned() { if (line.clone().as_str() != "".to_string().as_str()) { __result.push(line); } } __result }).join(&"\n".to_string()) -} + __result + }); + Rc::new({ + let mut __result = Vec::new(); + for line in import_lines.iter().cloned() { + if (line.clone().as_str() != "".to_string().as_str()) { + __result.push(line); + } + } + __result + }) + .join(&"\n".to_string()) + } } } pub fn emit_py_prelude(typed_module: Rc) -> String { { let items = typed_module.items.clone(); -let has_structs = { let mut __found = false; for item in items.clone().iter().cloned() { if (is_type_def_item(&item) && (item.connective.clone() == Connective::Conj)) { __found = true; break; } } __found }; -let has_enums = { let mut __found = false; for item in items.clone().iter().cloned() { if (is_type_def_item(&item) && (item.connective.clone() == Connective::Disj)) { __found = true; break; } } __found }; -let has_services = { let mut __found = false; for item in items.clone().iter().cloned() { if is_service_item(&item) { __found = true; break; } } __found }; -let future_import = "from __future__ import annotations\n".to_string(); -let dc_import = if has_structs.clone() { + let has_structs = { + let mut __found = false; + for item in items.clone().iter().cloned() { + if (is_type_def_item(&item) && (item.connective.clone() == Connective::Conj)) { + __found = true; + break; + } + } + __found + }; + let has_enums = { + let mut __found = false; + for item in items.clone().iter().cloned() { + if (is_type_def_item(&item) && (item.connective.clone() == Connective::Disj)) { + __found = true; + break; + } + } + __found + }; + let has_services = { + let mut __found = false; + for item in items.clone().iter().cloned() { + if is_service_item(&item) { + __found = true; + break; + } + } + __found + }; + let future_import = "from __future__ import annotations\n".to_string(); + let dc_import = if has_structs.clone() { "from dataclasses import dataclass, field\n".to_string() } else { "".to_string() }; -let enum_import = if has_enums.clone() { + let enum_import = if has_enums.clone() { "from enum import Enum, auto\n".to_string() } else { "".to_string() }; -let typing_import = if (has_structs.clone() || has_enums.clone()) { + let typing_import = if (has_structs.clone() || has_enums.clone()) { "from typing import Optional, Union\n".to_string() } else { "".to_string() }; -let async_import = if has_services { + let async_import = if has_services { "import aiohttp\n".to_string() } else { "".to_string() }; -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(future_import, dc_import), enum_import), typing_import), async_import) -} + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(v2_rt::concat(future_import, dc_import), enum_import), + typing_import, + ), + async_import, + ) + } } -pub fn emit_py_typed_item(item: &Rc, registry: Rc>>, scope: &Rc) -> String { +pub fn emit_py_typed_item( + item: &Rc, + registry: Rc>>, + scope: &Rc, +) -> String { { let env = scope.type_env.clone(); -let item_text = authored_name(env.clone(), item.clone()); -if is_type_def_item(&item) { + let item_text = authored_name(env.clone(), item.clone()); + if is_type_def_item(&item) { emit_py_type_def_from_connective(&item, &env) } else { if is_type_alias_item(&item, env.source_indices.clone()) { - v2_rt::concat(v2_rt::concat(item_text, " = ".to_string()), emit_node_type(resolved_type(item.clone()), RenderTarget::Python, env.source_indices.clone())) + v2_rt::concat( + v2_rt::concat(item_text, " = ".to_string()), + emit_node_type( + resolved_type(item.clone()), + RenderTarget::Python, + env.source_indices.clone(), + ), + ) } else { if is_type_decl_item(&item, env.source_indices.clone()) { "".to_string() } else { if is_function_item(&item) { if ((item.uses.clone().len() as i64) > 0) { - emit_py_func_def(&item_text, &item.params.clone(), resolved_type(item.clone()), &item.uses.clone(), item.body.clone().clone().unwrap(), ®istry, &scope) + emit_py_func_def( + &item_text, + &item.params.clone(), + resolved_type(item.clone()), + &item.uses.clone(), + item.body.clone().clone().unwrap(), + ®istry, + &scope, + ) } else { - emit_py_fn_def(&item_text, &item.params.clone(), resolved_type(item.clone()), &item.body.clone().clone().unwrap(), ®istry, &scope) + emit_py_fn_def( + &item_text, + &item.params.clone(), + resolved_type(item.clone()), + &item.body.clone().clone().unwrap(), + ®istry, + &scope, + ) } } else { if is_data_def_item(&item) { - emit_py_data_def(item_text, item.type_annotation.clone().clone().unwrap(), item.body.clone().clone().unwrap(), registry, &scope) + emit_py_data_def( + item_text, + item.type_annotation.clone().clone().unwrap(), + item.body.clone().clone().unwrap(), + registry, + &scope, + ) } else { if is_service_def_item(&item) { emit_py_service_def(item.clone(), registry, env.clone()) @@ -239,262 +625,915 @@ if is_type_def_item(&item) { } } } -} + } } pub fn emit_py_type_def_from_connective(item: &Rc, env: &Rc) -> String { { let item_text = authored_name(env.clone(), item.clone()); -let is_product = (item.connective.clone() == Connective::Conj); -if is_product { + let is_product = (item.connective.clone() == Connective::Conj); + if is_product { emit_py_dataclass_from_children(item_text, &item.children.clone(), env.clone()) } else { emit_py_enum_from_children(&item_text, &item.children.clone(), env.clone()) } -} + } } -pub fn emit_py_dataclass_from_children(name: String, children: &Rc>>, env: Rc) -> String { +pub fn emit_py_dataclass_from_children( + name: String, + children: &Rc>>, + env: Rc, +) -> String { if ((children.clone().len() as i64) == 0) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(py_derive_attribute(), "\nclass ".to_string()), name), ":\n pass".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(py_derive_attribute(), "\nclass ".to_string()), + name, + ), + ":\n pass".to_string(), + ) } else { { - let field_lines = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { __result.push(emit_py_dataclass_field_from_child(&child, &env)); } __result }); -let fields_str = field_lines.join(&"\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(py_derive_attribute(), "\nclass ".to_string()), name), ":\n".to_string()), fields_str) -} + let field_lines = Rc::new({ + let mut __result = Vec::new(); + for child in children.clone().iter().cloned() { + __result.push(emit_py_dataclass_field_from_child(&child, &env)); + } + __result + }); + let fields_str = field_lines.join(&"\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(py_derive_attribute(), "\nclass ".to_string()), + name, + ), + ":\n".to_string(), + ), + fields_str, + ) + } } } pub fn emit_py_dataclass_field_from_child(child: &Rc, env: &Rc) -> String { { - let ty = emit_node_type(resolved_type(child.clone()), RenderTarget::Python, env.source_indices.clone()); -let is_optional = (resolved_type(child.clone()).return_cardinality.clone() == Cardinality::CardOptional); -let default_str = if is_optional { + let ty = emit_node_type( + resolved_type(child.clone()), + RenderTarget::Python, + env.source_indices.clone(), + ); + let is_optional = + (resolved_type(child.clone()).return_cardinality.clone() == Cardinality::CardOptional); + let default_str = if is_optional { v2_rt::concat(" = ".to_string(), py_default_value()) } else { "".to_string() }; -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), emit_ident(authored_name(env.clone(), child.clone()), RenderTarget::Python)), ": ".to_string()), ty), default_str) -} + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + " ".to_string(), + emit_ident( + authored_name(env.clone(), child.clone()), + RenderTarget::Python, + ), + ), + ": ".to_string(), + ), + ty, + ), + default_str, + ) + } } -pub fn emit_py_enum_from_children(name: &String, children: &Rc>>, env: Rc) -> String { +pub fn emit_py_enum_from_children( + name: &String, + children: &Rc>>, + env: Rc, +) -> String { { - let has_data = { let mut __found = false; for child in children.clone().iter().cloned() { if ((child.children.clone().len() as i64) > 0) { __found = true; break; } } __found }; -if has_data { + let has_data = { + let mut __found = false; + for child in children.clone().iter().cloned() { + if ((child.children.clone().len() as i64) > 0) { + __found = true; + break; + } + } + __found + }; + if has_data { { - let variant_classes = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { __result.push(emit_py_variant_class_from_child(name.clone(), &child, &env)); } __result }); -let variant_names = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { __result.push(v2_rt::concat(name.clone(), authored_name(env.clone(), child.clone()))); } __result }); -let union_str = variant_names.join(&", ".to_string()); -let classes_str = variant_classes.join(&"\n\n\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(classes_str, "\n\n\n".to_string()), name.clone()), " = Union[".to_string()), union_str), "]".to_string()) -} + let variant_classes = Rc::new({ + let mut __result = Vec::new(); + for child in children.clone().iter().cloned() { + __result.push(emit_py_variant_class_from_child(name.clone(), &child, &env)); + } + __result + }); + let variant_names = Rc::new({ + let mut __result = Vec::new(); + for child in children.clone().iter().cloned() { + __result.push(v2_rt::concat( + name.clone(), + authored_name(env.clone(), child.clone()), + )); + } + __result + }); + let union_str = variant_names.join(&", ".to_string()); + let classes_str = variant_classes.join(&"\n\n\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(classes_str, "\n\n\n".to_string()), + name.clone(), + ), + " = Union[".to_string(), + ), + union_str, + ), + "]".to_string(), + ) + } } else { { - let variant_lines = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(" ".to_string(), authored_name(env.clone(), child.clone())), " = auto()".to_string())); } __result }); -let variants_str = variant_lines.join(&"\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(language_spec(RenderTarget::Python).items.clone().enum_keyword.clone(), " ".to_string()), name.clone()), "(Enum):\n".to_string()), variants_str) -} + let variant_lines = Rc::new({ + let mut __result = Vec::new(); + for child in children.clone().iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + " ".to_string(), + authored_name(env.clone(), child.clone()), + ), + " = auto()".to_string(), + )); + } + __result + }); + let variants_str = variant_lines.join(&"\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + language_spec(RenderTarget::Python) + .items + .clone() + .enum_keyword + .clone(), + " ".to_string(), + ), + name.clone(), + ), + "(Enum):\n".to_string(), + ), + variants_str, + ) + } } -} + } } -pub fn emit_py_variant_class_from_child(parent_name: String, child: &Rc, env: &Rc) -> String { +pub fn emit_py_variant_class_from_child( + parent_name: String, + child: &Rc, + env: &Rc, +) -> String { { let class_name = v2_rt::concat(parent_name, authored_name(env.clone(), child.clone())); -if ((child.children.clone().len() as i64) == 0) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(py_derive_attribute(), "\nclass ".to_string()), class_name), ":\n pass".to_string()) + if ((child.children.clone().len() as i64) == 0) { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(py_derive_attribute(), "\nclass ".to_string()), + class_name, + ), + ":\n pass".to_string(), + ) } else { { - let field_lines = Rc::new({ let mut __result = Vec::new(); for f in child.children.clone().iter().cloned() { __result.push(emit_py_dataclass_field_from_child(&f, &env)); } __result }); -let fields_str = field_lines.join(&"\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(py_derive_attribute(), "\nclass ".to_string()), class_name), ":\n".to_string()), fields_str) -} + let field_lines = Rc::new({ + let mut __result = Vec::new(); + for f in child.children.clone().iter().cloned() { + __result.push(emit_py_dataclass_field_from_child(&f, &env)); + } + __result + }); + let fields_str = field_lines.join(&"\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(py_derive_attribute(), "\nclass ".to_string()), + class_name, + ), + ":\n".to_string(), + ), + fields_str, + ) + } } -} + } } -pub fn emit_py_fn_def(name: &String, params: &Rc>>, inferred: Rc, body: &Rc, registry: &Rc>>, scope: &Rc) -> String { +pub fn emit_py_fn_def( + name: &String, + params: &Rc>>, + inferred: Rc, + body: &Rc, + registry: &Rc>>, + scope: &Rc, +) -> String { { let depth = 0; -let si = scope.type_env.clone().source_indices.clone(); -let params_str = emit_params_shared(params.clone(), &RenderTarget::Python, si.clone()); -let ret_str = emit_inferred_shared(&inferred, &RenderTarget::Python, si.clone()); -let body_scope = build_params_scope(&scope, params.clone()); -let use_tco = is_tco_eligible(&name, &body, registry.clone(), &si); -if use_tco { + let si = scope.type_env.clone().source_indices.clone(); + let params_str = emit_params_shared(params.clone(), &RenderTarget::Python, si.clone()); + let ret_str = emit_inferred_shared(&inferred, &RenderTarget::Python, si.clone()); + let body_scope = build_params_scope(&scope, params.clone()); + let use_tco = is_tco_eligible(&name, &body, registry.clone(), &si); + if use_tco { { - let body_str = emit_tco_unified(body.clone(), &name, ¶ms, &RenderTarget::Python, ®istry, &body_scope, (depth.clone() + 1), |pat| emit_unified_pattern(pat.clone(), RenderTarget::Python, si.clone())); -let kw = language_spec(RenderTarget::Python).items.clone().func_keyword.clone(); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(kw, " ".to_string()), emit_ident(name.clone(), RenderTarget::Python)), "(".to_string()), params_str), ")".to_string()), ret_str), ":\n".to_string()), make_indent((depth.clone() + 1))), body_str) -} + let body_str = emit_tco_unified( + body.clone(), + &name, + ¶ms, + &RenderTarget::Python, + ®istry, + &body_scope, + (depth.clone() + 1), + |pat| emit_unified_pattern(pat.clone(), RenderTarget::Python, si.clone()), + ); + let kw = language_spec(RenderTarget::Python) + .items + .clone() + .func_keyword + .clone(); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(kw, " ".to_string()), + emit_ident(name.clone(), RenderTarget::Python), + ), + "(".to_string(), + ), + params_str, + ), + ")".to_string(), + ), + ret_str, + ), + ":\n".to_string(), + ), + make_indent((depth.clone() + 1)), + ), + body_str, + ) + } } else { { - let body_str = emit_py_typed_expr(body.clone(), registry.clone(), &body_scope, (depth.clone() + 1), 1024); -let kw = language_spec(RenderTarget::Python).items.clone().func_keyword.clone(); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(kw, " ".to_string()), emit_ident(name.clone(), RenderTarget::Python)), "(".to_string()), params_str), ")".to_string()), ret_str), ":\n".to_string()), make_indent((depth.clone() + 1))), "return ".to_string()), body_str) -} + let body_str = emit_py_typed_expr( + body.clone(), + registry.clone(), + &body_scope, + (depth.clone() + 1), + 1024, + ); + let kw = language_spec(RenderTarget::Python) + .items + .clone() + .func_keyword + .clone(); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(kw, " ".to_string()), + emit_ident(name.clone(), RenderTarget::Python), + ), + "(".to_string(), + ), + params_str, + ), + ")".to_string(), + ), + ret_str, + ), + ":\n".to_string(), + ), + make_indent((depth.clone() + 1)), + ), + "return ".to_string(), + ), + body_str, + ) + } } -} + } } -pub fn emit_py_func_def(name: &String, params: &Rc>>, inferred: Rc, uses: &Rc>>, body: Rc, registry: &Rc>>, scope: &Rc) -> String { +pub fn emit_py_func_def( + name: &String, + params: &Rc>>, + inferred: Rc, + uses: &Rc>>, + body: Rc, + registry: &Rc>>, + scope: &Rc, +) -> String { { let depth = 0; -let service_names = match lookup_item(registry.clone(), name.clone()) { - Some(info) => info.service_names.clone(), - None => Rc::new(vec![]), -}; -let params_str = emit_py_func_params(params.clone(), uses.clone(), service_names, scope.type_env.clone().source_indices.clone()); -let ret_str = emit_inferred_shared(&inferred, &RenderTarget::Python, scope.type_env.clone().source_indices.clone()); -let body_scope = build_params_scope(&scope, params.clone()); -let si = scope.type_env.clone().source_indices.clone(); -let body_scope = uses.clone().iter().cloned().fold(body_scope.clone(), |s: Rc, u: Rc| extend_scope(&s, &resource_use_name_at(u.clone(), si.clone()), resource_use_resource(&u), Rc::new(SubValueRelation::SubValueUnknown))); -let body_str = emit_unified_typed_func_body(&body, &RenderTarget::Python, ®istry, &body_scope, (depth.clone() + 1)); -let items = language_spec(RenderTarget::Python).items.clone(); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(items.async_prefix.clone(), items.func_keyword.clone()), " ".to_string()), emit_ident(name.clone(), RenderTarget::Python)), "(".to_string()), params_str), ")".to_string()), ret_str), ":\n".to_string()), make_indent((depth.clone() + 1))), body_str) -} + let service_names = match lookup_item(registry.clone(), name.clone()) { + Some(info) => info.service_names.clone(), + None => Rc::new(vec![]), + }; + let params_str = emit_py_func_params( + params.clone(), + uses.clone(), + service_names, + scope.type_env.clone().source_indices.clone(), + ); + let ret_str = emit_inferred_shared( + &inferred, + &RenderTarget::Python, + scope.type_env.clone().source_indices.clone(), + ); + let body_scope = build_params_scope(&scope, params.clone()); + let si = scope.type_env.clone().source_indices.clone(); + let body_scope = uses.clone().iter().cloned().fold( + body_scope.clone(), + |s: Rc, u: Rc| { + extend_scope( + &s, + &resource_use_name_at(u.clone(), si.clone()), + resource_use_resource(&u), + Rc::new(SubValueRelation::SubValueUnknown), + ) + }, + ); + let body_str = emit_unified_typed_func_body( + &body, + &RenderTarget::Python, + ®istry, + &body_scope, + (depth.clone() + 1), + ); + let items = language_spec(RenderTarget::Python).items.clone(); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + items.async_prefix.clone(), + items.func_keyword.clone(), + ), + " ".to_string(), + ), + emit_ident(name.clone(), RenderTarget::Python), + ), + "(".to_string(), + ), + params_str, + ), + ")".to_string(), + ), + ret_str, + ), + ":\n".to_string(), + ), + make_indent((depth.clone() + 1)), + ), + body_str, + ) + } } -pub fn emit_py_func_params(params: Rc>>, uses: Rc>>, service_names: Rc>, source_indices: Rc>>) -> String { +pub fn emit_py_func_params( + params: Rc>>, + uses: Rc>>, + service_names: Rc>, + source_indices: Rc>>, +) -> String { { - let param_strs = Rc::new({ let mut __result = Vec::new(); for p in params.iter().cloned() { __result.push(emit_param_shared(&p, &RenderTarget::Python, &source_indices)); } __result }); -let resource_strs = Rc::new({ let mut __result = Vec::new(); for u in uses.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(emit_ident(resource_use_name_at(u.clone(), source_indices.clone()), RenderTarget::Python), ": ".to_string()), emit_node_type(resource_use_resource(&u), RenderTarget::Python, source_indices.clone()))); } __result }); -let service_strs = Rc::new({ let mut __result = Vec::new(); for sn in service_names.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(service_var_name(sn.clone()), ": ".to_string()), sanitize_service_name(sn.clone()))); } __result }); -let all_params = v2_rt::concat(v2_rt::concat(param_strs, resource_strs), service_strs); -all_params.join(&", ".to_string()) -} + let param_strs = Rc::new({ + let mut __result = Vec::new(); + for p in params.iter().cloned() { + __result.push(emit_param_shared( + &p, + &RenderTarget::Python, + &source_indices, + )); + } + __result + }); + let resource_strs = Rc::new({ + let mut __result = Vec::new(); + for u in uses.iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + emit_ident( + resource_use_name_at(u.clone(), source_indices.clone()), + RenderTarget::Python, + ), + ": ".to_string(), + ), + emit_node_type( + resource_use_resource(&u), + RenderTarget::Python, + source_indices.clone(), + ), + )); + } + __result + }); + let service_strs = Rc::new({ + let mut __result = Vec::new(); + for sn in service_names.iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat(service_var_name(sn.clone()), ": ".to_string()), + sanitize_service_name(sn.clone()), + )); + } + __result + }); + let all_params = v2_rt::concat(v2_rt::concat(param_strs, resource_strs), service_strs); + all_params.join(&", ".to_string()) + } } -pub fn emit_py_typed_expr(texpr: Rc, registry: Rc>>, scope: &Rc, depth: i64, fuel: i64) -> String { - emit_unified_typed_expr(texpr, &RenderTarget::Python, registry, &scope, depth, fuel, |pat| emit_unified_pattern(pat.clone(), RenderTarget::Python, scope.type_env.clone().source_indices.clone())) +pub fn emit_py_typed_expr( + texpr: Rc, + registry: Rc>>, + scope: &Rc, + depth: i64, + fuel: i64, +) -> String { + emit_unified_typed_expr( + texpr, + &RenderTarget::Python, + registry, + &scope, + depth, + fuel, + |pat| { + emit_unified_pattern( + pat.clone(), + RenderTarget::Python, + scope.type_env.clone().source_indices.clone(), + ) + }, + ) } -pub fn emit_py_transport_body(transport: Rc, op_name: String, source_indices: Rc>>, depth: i64) -> String { - emit_unified_transport_dispatch(&transport, op_name, &source_indices, depth, RenderTarget::Python, |n, t, d, si| emit_py_rest_call(n.clone(), t.clone(), si.clone()), |n, t, d, si| emit_py_shell_call(n.clone(), t.clone(), &si), |n, d| emit_py_file_call(n.clone()), |n, d| emit_py_local_call(n.clone())) +pub fn emit_py_transport_body( + transport: Rc, + op_name: String, + source_indices: Rc>>, + depth: i64, +) -> String { + emit_unified_transport_dispatch( + &transport, + op_name, + &source_indices, + depth, + RenderTarget::Python, + |n, t, d, si| emit_py_rest_call(n.clone(), t.clone(), si.clone()), + |n, t, d, si| emit_py_shell_call(n.clone(), t.clone(), &si), + |n, d| emit_py_file_call(n.clone()), + |n, d| emit_py_local_call(n.clone()), + ) } -pub fn emit_py_service_def(item: Rc, registry: Rc>>, env: Rc) -> String { - emit_unified_service_def(&item, &RenderTarget::Python, registry, &env, |name, transport, ops, si| emit_py_service_init(transport.clone(), ops.clone(), si.clone()), |transport, op_name, si, depth| emit_py_transport_body(transport.clone(), op_name.clone(), si.clone(), depth.clone())) +pub fn emit_py_service_def( + item: Rc, + registry: Rc>>, + env: Rc, +) -> String { + emit_unified_service_def( + &item, + &RenderTarget::Python, + registry, + &env, + |name, transport, ops, si| emit_py_service_init(transport.clone(), ops.clone(), si.clone()), + |transport, op_name, si, depth| { + emit_py_transport_body( + transport.clone(), + op_name.clone(), + si.clone(), + depth.clone(), + ) + }, + ) } -pub fn emit_py_service_init(fallback_transport: Rc, op_children: Rc>>, source_indices: Rc>>) -> String { +pub fn emit_py_service_init( + fallback_transport: Rc, + op_children: Rc>>, + source_indices: Rc>>, +) -> String { { let fs = compute_service_fields(&fallback_transport, &op_children, &source_indices); -let params = service_field_decls(&fs, &language_spec(RenderTarget::Python).service_fields.clone()); -let assigns = service_field_ctors(&fs, &language_spec(RenderTarget::Python).service_fields.clone()); -if ((params.clone().len() as i64) == 0) { + let params = service_field_decls( + &fs, + &language_spec(RenderTarget::Python).service_fields.clone(), + ); + let assigns = service_field_ctors( + &fs, + &language_spec(RenderTarget::Python).service_fields.clone(), + ); + if ((params.clone().len() as i64) == 0) { "def __init__(self):\n pass".to_string() } else { { - let params_str = v2_rt::concat("self, ".to_string(), params.clone().join(&", ".to_string())); -let assigns_str = Rc::new({ let mut __result = Vec::new(); for a in assigns.iter().cloned() { __result.push(v2_rt::concat(" ".to_string(), a.clone())); } __result }).join(&"\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat("def __init__(".to_string(), params_str), "):\n".to_string()), assigns_str) -} + let params_str = + v2_rt::concat("self, ".to_string(), params.clone().join(&", ".to_string())); + let assigns_str = Rc::new({ + let mut __result = Vec::new(); + for a in assigns.iter().cloned() { + __result.push(v2_rt::concat(" ".to_string(), a.clone())); + } + __result + }) + .join(&"\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("def __init__(".to_string(), params_str), + "):\n".to_string(), + ), + assigns_str, + ) + } } -} + } } -pub fn emit_py_rest_call(op_name: String, transport: Rc, source_indices: Rc>>) -> String { +pub fn emit_py_rest_call( + op_name: String, + transport: Rc, + source_indices: Rc>>, +) -> String { { - let self_base_url = v2_rt::concat(v2_rt::concat("{".to_string(), "self.base_url".to_string()), "}".to_string()); -let url_line = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("url = f\"".to_string(), self_base_url), "/".to_string()), emit_ident(op_name, RenderTarget::Python)), "\"".to_string()); -let headers_dict = emit_py_headers_dict(&transport, &source_indices); -let session_lines = v2_rt::concat(v2_rt::concat("async with aiohttp.ClientSession() as session:\n".to_string(), " async with session.post(url, headers=headers) as response:\n".to_string()), " return await response.json()".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(url_line, "\n".to_string()), headers_dict), "\n".to_string()), session_lines) -} + let self_base_url = v2_rt::concat( + v2_rt::concat("{".to_string(), "self.base_url".to_string()), + "}".to_string(), + ); + let url_line = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("url = f\"".to_string(), self_base_url), + "/".to_string(), + ), + emit_ident(op_name, RenderTarget::Python), + ), + "\"".to_string(), + ); + let headers_dict = emit_py_headers_dict(&transport, &source_indices); + let session_lines = v2_rt::concat( + v2_rt::concat( + "async with aiohttp.ClientSession() as session:\n".to_string(), + " async with session.post(url, headers=headers) as response:\n".to_string(), + ), + " return await response.json()".to_string(), + ); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(v2_rt::concat(url_line, "\n".to_string()), headers_dict), + "\n".to_string(), + ), + session_lines, + ) + } } -pub fn emit_py_headers_dict(transport: &Rc, source_indices: &Rc>>) -> String { +pub fn emit_py_headers_dict( + transport: &Rc, + source_indices: &Rc>>, +) -> String { { let auth_entry = if transport_has_auth(transport.clone(), source_indices.clone()) { { - let header_name = match transport_auth_header_name(transport.clone(), source_indices.clone()) { - Some(h) => h.clone(), - None => "Authorization".to_string(), -}; -v2_rt::concat(v2_rt::concat("\"".to_string(), header_name), "\": self.auth_token, ".to_string()) -} + let header_name = + match transport_auth_header_name(transport.clone(), source_indices.clone()) { + Some(h) => h.clone(), + None => "Authorization".to_string(), + }; + v2_rt::concat( + v2_rt::concat("\"".to_string(), header_name), + "\": self.auth_token, ".to_string(), + ) + } } else { "".to_string() }; -let hdrs = transport_headers(transport.clone(), source_indices.clone()); -let header_entries = Rc::new({ let mut __result = Vec::new(); for h in hdrs.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat("\"".to_string(), field_init_node_name_at(h.clone(), source_indices.clone())), "\": ".to_string()), emit_simple_expr(&field_init_node_value(&h), &RenderTarget::Python, &source_indices))); } __result }); -let all_entries = if (auth_entry.clone().as_str() == "".to_string().as_str()) { + let hdrs = transport_headers(transport.clone(), source_indices.clone()); + let header_entries = Rc::new({ + let mut __result = Vec::new(); + for h in hdrs.iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "\"".to_string(), + field_init_node_name_at(h.clone(), source_indices.clone()), + ), + "\": ".to_string(), + ), + emit_simple_expr( + &field_init_node_value(&h), + &RenderTarget::Python, + &source_indices, + ), + )); + } + __result + }); + let all_entries = if (auth_entry.clone().as_str() == "".to_string().as_str()) { header_entries.join(&", ".to_string()) } else { v2_rt::concat(auth_entry.clone(), header_entries.join(&", ".to_string())) }; -v2_rt::concat(v2_rt::concat("headers = {".to_string(), all_entries), "}".to_string()) -} + v2_rt::concat( + v2_rt::concat("headers = {".to_string(), all_entries), + "}".to_string(), + ) + } } -pub fn emit_py_shell_call(op_name: String, transport: Rc, source_indices: &Rc>>) -> String { +pub fn emit_py_shell_call( + op_name: String, + transport: Rc, + source_indices: &Rc>>, +) -> String { { let envs = transport_env(transport, source_indices.clone()); -let env_dict_entries = Rc::new({ let mut __result = Vec::new(); for e in envs.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat("\"".to_string(), field_init_node_name_at(e.clone(), source_indices.clone())), "\": ".to_string()), emit_simple_expr(&field_init_node_value(&e), &RenderTarget::Python, &source_indices))); } __result }); -let env_str = v2_rt::concat(v2_rt::concat("{".to_string(), env_dict_entries.join(&", ".to_string())), "}".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("import subprocess\n".to_string(), "result = subprocess.run(\n".to_string()), " [\"".to_string()), emit_ident(op_name, RenderTarget::Python)), "\"],\n".to_string()), " cwd=self.working_dir or \".\",\n".to_string()), " env=".to_string()), env_str), ",\n".to_string()), " capture_output=True, text=True,\n".to_string()), ")\n".to_string()), "return result.stdout".to_string()) -} + let env_dict_entries = Rc::new({ + let mut __result = Vec::new(); + for e in envs.iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "\"".to_string(), + field_init_node_name_at(e.clone(), source_indices.clone()), + ), + "\": ".to_string(), + ), + emit_simple_expr( + &field_init_node_value(&e), + &RenderTarget::Python, + &source_indices, + ), + )); + } + __result + }); + let env_str = v2_rt::concat( + v2_rt::concat("{".to_string(), env_dict_entries.join(&", ".to_string())), + "}".to_string(), + ); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "import subprocess\n".to_string(), + "result = subprocess.run(\n".to_string(), + ), + " [\"".to_string(), + ), + emit_ident(op_name, RenderTarget::Python), + ), + "\"],\n".to_string(), + ), + " cwd=self.working_dir or \".\",\n".to_string(), + ), + " env=".to_string(), + ), + env_str, + ), + ",\n".to_string(), + ), + " capture_output=True, text=True,\n".to_string(), + ), + ")\n".to_string(), + ), + "return result.stdout".to_string(), + ) + } } pub fn emit_py_file_call(op_name: String) -> String { { - let self_base_path = v2_rt::concat(v2_rt::concat("{".to_string(), "self.base_path".to_string()), "}".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("path = f\"".to_string(), self_base_path), "/".to_string()), emit_ident(op_name, RenderTarget::Python)), "\"\n".to_string()), "with open(path) as f:\n".to_string()), " return f.read()".to_string()) -} + let self_base_path = v2_rt::concat( + v2_rt::concat("{".to_string(), "self.base_path".to_string()), + "}".to_string(), + ); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("path = f\"".to_string(), self_base_path), + "/".to_string(), + ), + emit_ident(op_name, RenderTarget::Python), + ), + "\"\n".to_string(), + ), + "with open(path) as f:\n".to_string(), + ), + " return f.read()".to_string(), + ) + } } pub fn emit_py_local_call(op_name: String) -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat("# Local binding -- direct function call\n".to_string(), "return ".to_string()), emit_ident(op_name, RenderTarget::Python)), "()".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "# Local binding -- direct function call\n".to_string(), + "return ".to_string(), + ), + emit_ident(op_name, RenderTarget::Python), + ), + "()".to_string(), + ) } pub fn emit_py_resource_def(item: &Rc, env: &Rc) -> String { { let item_text = authored_name(env.clone(), item.clone()); -let depth = 0; -let cap_children = item.children.clone(); -let methods = Rc::new({ let mut __result = Vec::new(); for c in cap_children.iter().cloned() { __result.push(emit_py_capability_method(&c, &env)); } __result }); -let methods_str = methods.join(&"\n\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("from abc import ABC, abstractmethod\n\n".to_string(), language_spec(RenderTarget::Python).items.clone().struct_keyword.clone()), " ".to_string()), item_text), "(ABC):\n".to_string()), make_indent((depth + 1))), methods_str) -} + let depth = 0; + let cap_children = item.children.clone(); + let methods = Rc::new({ + let mut __result = Vec::new(); + for c in cap_children.iter().cloned() { + __result.push(emit_py_capability_method(&c, &env)); + } + __result + }); + let methods_str = methods.join(&"\n\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "from abc import ABC, abstractmethod\n\n".to_string(), + language_spec(RenderTarget::Python) + .items + .clone() + .struct_keyword + .clone(), + ), + " ".to_string(), + ), + item_text, + ), + "(ABC):\n".to_string(), + ), + make_indent((depth + 1)), + ), + methods_str, + ) + } } pub fn emit_py_capability_method(cap_node: &Rc, env: &Rc) -> String { { - let input_params = Rc::new({ let mut __result = Vec::new(); for p in cap_node.params.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(emit_ident(param_node_name_at(p.clone(), env.source_indices.clone()), RenderTarget::Python), ": ".to_string()), emit_node_type(param_node_type_expr(&p), RenderTarget::Python, env.source_indices.clone()))); } __result }); -let params_str = input_params.join(&", ".to_string()); -let all_params = if (params_str.clone().as_str() == "".to_string().as_str()) { + let input_params = Rc::new({ + let mut __result = Vec::new(); + for p in cap_node.params.clone().iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + emit_ident( + param_node_name_at(p.clone(), env.source_indices.clone()), + RenderTarget::Python, + ), + ": ".to_string(), + ), + emit_node_type( + param_node_type_expr(&p), + RenderTarget::Python, + env.source_indices.clone(), + ), + )); + } + __result + }); + let params_str = input_params.join(&", ".to_string()); + let all_params = if (params_str.clone().as_str() == "".to_string().as_str()) { "self".to_string() } else { v2_rt::concat("self, ".to_string(), params_str.clone()) }; -let ret = emit_node_type(resolved_type(cap_node.clone()), RenderTarget::Python, env.source_indices.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("@abstractmethod\n".to_string(), language_spec(RenderTarget::Python).items.clone().async_prefix.clone()), language_spec(RenderTarget::Python).items.clone().func_keyword.clone()), " ".to_string()), emit_ident(authored_name(env.clone(), cap_node.clone()), RenderTarget::Python)), "(".to_string()), all_params), ") -> ".to_string()), ret), ":\n".to_string()), " ...".to_string()) -} + let ret = emit_node_type( + resolved_type(cap_node.clone()), + RenderTarget::Python, + env.source_indices.clone(), + ); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "@abstractmethod\n".to_string(), + language_spec(RenderTarget::Python) + .items + .clone() + .async_prefix + .clone(), + ), + language_spec(RenderTarget::Python) + .items + .clone() + .func_keyword + .clone(), + ), + " ".to_string(), + ), + emit_ident( + authored_name(env.clone(), cap_node.clone()), + RenderTarget::Python, + ), + ), + "(".to_string(), + ), + all_params, + ), + ") -> ".to_string(), + ), + ret, + ), + ":\n".to_string(), + ), + " ...".to_string(), + ) + } } -pub fn emit_py_data_def(name: String, type_node: Rc, value: Rc, registry: Rc>>, scope: &Rc) -> String { +pub fn emit_py_data_def( + name: String, + type_node: Rc, + value: Rc, + registry: Rc>>, + scope: &Rc, +) -> String { { - let ty_str = emit_node_type(type_node, RenderTarget::Python, scope.type_env.clone().source_indices.clone()); -let upper_name = to_screaming_snake(name); -let val_str = emit_py_typed_expr(value, registry, &scope, 0, 1024); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(upper_name, ": ".to_string()), ty_str), " = ".to_string()), val_str) -} + let ty_str = emit_node_type( + type_node, + RenderTarget::Python, + scope.type_env.clone().source_indices.clone(), + ); + let upper_name = to_screaming_snake(name); + let val_str = emit_py_typed_expr(value, registry, &scope, 0, 1024); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(v2_rt::concat(upper_name, ": ".to_string()), ty_str), + " = ".to_string(), + ), + val_str, + ) + } } pub fn emit_requirements_txt(has_services: bool) -> Rc { { let base_deps = "".to_string(); -let async_deps = if has_services { + let async_deps = if has_services { "aiohttp>=3.9\n".to_string() } else { "".to_string() }; -Rc::new(TextFile { - path: "requirements.txt".to_string(), - content: v2_rt::concat(base_deps, async_deps), -}) -} + Rc::new(TextFile { + path: "requirements.txt".to_string(), + content: v2_rt::concat(base_deps, async_deps), + }) + } } diff --git a/src/v2/stage0/src/v2_compiler_emit_rust.rs b/src/v2/stage0/src/v2_compiler_emit_rust.rs index fc2064df653..f8beb7fa92b 100644 --- a/src/v2/stage0/src/v2_compiler_emit_rust.rs +++ b/src/v2/stage0/src/v2_compiler_emit_rust.rs @@ -1,121 +1,211 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.emit_rust -use std::collections::HashMap; -use std::rc::Rc; +pub use crate::extdeps_languages_rust_emit::{ + rt_bridge_function_names, rt_functions, rt_ref_map_functions, rt_wraps_result, + rust_container_templates, rust_enum_derives, rust_enum_derives_copy, rust_higher_order_methods, + rust_method_wraps_result, rust_struct_derives, rust_struct_derives_copy, HigherOrderMethodSpec, +}; +pub use crate::generated_method_template_projection::rust_method_template_emit; +pub use crate::std_induction::SubValueRelation; +use crate::std_induction::SubValueRelation::SubValueUnknown; +pub use crate::std_types::is_container_type; +pub use crate::v2_compiler_artifact::RenderTarget; +use crate::v2_compiler_artifact::RenderTarget::Rust; +pub use crate::v2_compiler_coercion::{coerce_primitive_type, is_copy, lookup_checkpoint}; +pub use crate::v2_compiler_compiler_tests_rust::compiler_tests_source; +pub use crate::v2_compiler_emit::{ + apply_named_template, apply_type_template1, apply_type_template2, apply_type_template3, + capitalize_first, compute_service_fields, effective_operation_transport, emit_bin_op_symbol, + emit_data_value_json, emit_error_expr, emit_ident, emit_keyword, emit_lambda, + emit_lambda_params, emit_let_binding, emit_let_binding_annotated, emit_list_lit_expr, + emit_literal, emit_node_type, emit_null_coalesce, emit_return, emit_shared_expr, + emit_shared_tco_expr, emit_simple_expr, emit_string_literal, emit_typed_cast_shared, + emit_typed_if_shared, emit_typed_let_shared, emit_unary_op, escape_json_string, + escape_rust_interp_text, escape_string_literal_body, extract_modifier_names, + extract_test_projections, has_mock_prefix, has_nested_records_node, has_service_items, + is_data_def_item, is_function_item, is_null_coalesce, is_resource_def_item, is_self_recursive, + is_service_def_item, is_service_item, is_tco_eligible, is_tco_identity_passthrough, + is_type_alias_item, is_type_alias_return_node, is_type_decl_item, is_type_def_item, is_upper, + language_spec, lookup_item, make_indent, module_emit_scope, module_to_filename, + order_typed_call_args, render_node_type, rust_literal_for_pattern, sanitize_service_name, + scope_after_expr, seed_bindings, service_fallback_transport, service_field_ctors, + service_field_decls, service_var_name, tco_reassign_core, test_function_name, to_lower_char, + to_pascal, to_screaming_snake, to_snake, to_string, to_string_helper, to_upper_char, + typed_named_arg_matches, unique_strings, BlockEmitState, EmitResult, InterpPart, + ServiceFieldSet, TcoFrame, TcoReassignInput, TestProjection, +}; +pub use crate::v2_compiler_infer::{ + build_emit_graph_info, build_params_scope, expr_span, extend_scope, InferScope, +}; +use crate::v2_compiler_infer_emit_info::TypeRepr::{EnumRepr, StructRepr}; +pub use crate::v2_compiler_infer_emit_info::{ + find_variant_parent, is_enum_in_summaries, is_known_variant, lookup_emit_type_summary, + variant_belongs_to_enum, EmitGraphInfo, TypeRepr, TypeSummary, +}; +pub use crate::v2_compiler_infer_env::{authored_name, lookup_type_by_name, TypeBinding, TypeEnv}; +use crate::v2_compiler_infer_items::ItemKind::DataItem; +pub use crate::v2_compiler_infer_items::{ItemInfo, ItemKind, ResolvedGraph, TypedModule}; +pub use crate::v2_compiler_infer_service::{ + extract_typed_service_name, is_typed_service_call_receiver, +}; +pub use crate::v2_compiler_infer_sigs::ResolvedFuncEnv; +pub use crate::v2_compiler_infer_types::{ + child_type_node, emit_map_has, for_each_element_type_node, is_coproduct_type, is_product_type, + is_unit_like, node_is_collection, node_is_element_collection, node_is_keyed_collection, + normalize_access_type_node, resolved_type, +}; +use crate::v2_compiler_languages::VisibilitySpec::KeywordVisibility; +pub use crate::v2_compiler_languages::{ + is_string_like, scaffold_for_target, serialization_for_target, sharing_for_target, + test_conventions_for_target, visibility_for_target, ItemKeywords, TestConventions, + VisibilitySpec, +}; +pub use crate::v2_compiler_ownership::{ + analyze_ownership, analyze_single_fold, build_movable_set, build_read_only_params, + collect_callable_refs, OwnershipProof, +}; +pub use crate::v2_compiler_runtime_rust::rust_runtime_source; use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::v2_std_core::{Node, InferredNode, is_compiler_error, import_is_all, import_specific_names_at, module_imports, module_items, param_node_type_expr, param_node_default_value, authored_name_at, NewlineIndex, find_child_named, expr_var_name_at, expr_call_func_at, field_access_field_at, param_node_name_at, resource_use_name_at, field_binding_name_at, generic_param_name_at, LiteralValue, ExprData, make_expr_node, FieldSummary, VarBindingKind, CallSemantics, MethodSemantics, MatchPattern, field_binding_pattern, TextFile, ErrorNode, make_error_node, SourceSpan, resource_use_resource, BinOp, AlgebraFieldKind, UnaryOpKind, StringPart, transport_base_url, transport_has_auth, transport_auth_token, transport_auth_header_name, transport_headers, transport_env, transport_method, transport_path_template, transport_query, transport_request_body, transport_stdin, transport_response_format, service_config_auth, service_config_auth_input, service_config_auth_source, service_config_endpoint, expr_has_self_call, expr_has_non_tail_self_call, field_access_base, foreach_variable_at, expr_method_name_at, let_binding_name_at, record_lit_type_name_at, arg_name_at, arg_value, arm_body, arm_pattern, arm_guard, field_init_node_name_at, field_init_node_value, make_arg_node, make_named_expr_node, let_value, let_body, lambda_body, lambda_param_names_at, foreach_collection, foreach_body, method_receiver, method_arg_nodes, match_scrutinee, match_arm_nodes, if_condition, if_then_branch, if_else_branch, index_base, index_expr, slice_base, slice_start, slice_end, cast_target, cast_expr, return_value, binop_left, binop_right, make_span, with_required_cardinality, Connective, Cardinality, is_rest_transport, is_shell_transport, is_file_transport, FieldAccessStyle, FieldValueShape, CompilerDiagnostic}; -use crate::v2_std_core::InferredNode::{Resolved, CompilerError, TypeVariable}; -use crate::v2_std_core::ExprData::{NoExprData, ExprLiteral, ExprError, ExprVar, ExprFieldAccess, ExprCall, ExprMethodCall, ExprMatch, ExprIf, ExprLet, ExprRecordLit, ExprListLit, ExprBinOp, ExprUnaryOp, ExprLambda, ExprStringInterp, ExprBlock, ExprCast, ExprForEach, ExprIndex, ExprSlice, ExprReturn}; -use crate::v2_std_core::FieldAccessStyle::{StoredField, EnumAccessor, OptionalUnwrap, TupleFirst, TupleSecond}; -use crate::v2_std_core::FieldValueShape::{OptionalValue}; -use crate::v2_std_core::VarBindingKind::{LocalValueBinding, FunctionValueBinding, VariantValueBinding, MatchBoundBinding}; -use crate::v2_std_core::CallSemantics::{PlainCallSemantics, LookupCallSemantics}; -use crate::v2_std_core::MethodSemantics::{PlainMethodSemantics, AlgebraMethodSemantics, ServiceMethodSemantics}; -use crate::v2_std_core::CompilerDiagnostic::{InternalError}; -use crate::v2_std_core::StringPart::{Text, Interpolation}; +use crate::v2_std_core::AlgebraFieldKind::*; +use crate::v2_std_core::BinOp::*; +use crate::v2_std_core::CallSemantics::{LookupCallSemantics, PlainCallSemantics}; +use crate::v2_std_core::Cardinality::{CardOptional, Required}; +use crate::v2_std_core::CompilerDiagnostic::InternalError; use crate::v2_std_core::Connective::{Conj, Disj, NoConnective}; -use crate::v2_std_core::Cardinality::{Required, CardOptional}; +use crate::v2_std_core::ExprData::{ + ExprBinOp, ExprBlock, ExprCall, ExprCast, ExprError, ExprFieldAccess, ExprForEach, ExprIf, + ExprIndex, ExprLambda, ExprLet, ExprListLit, ExprLiteral, ExprMatch, ExprMethodCall, + ExprRecordLit, ExprReturn, ExprSlice, ExprStringInterp, ExprUnaryOp, ExprVar, NoExprData, +}; +use crate::v2_std_core::FieldAccessStyle::{ + EnumAccessor, OptionalUnwrap, StoredField, TupleFirst, TupleSecond, +}; +use crate::v2_std_core::FieldValueShape::OptionalValue; +use crate::v2_std_core::InferredNode::{CompilerError, Resolved, TypeVariable}; use crate::v2_std_core::LiteralValue::*; use crate::v2_std_core::MatchPattern::*; -use crate::v2_std_core::BinOp::*; -use crate::v2_std_core::AlgebraFieldKind::*; +use crate::v2_std_core::MethodSemantics::{ + AlgebraMethodSemantics, PlainMethodSemantics, ServiceMethodSemantics, +}; +use crate::v2_std_core::StringPart::{Interpolation, Text}; use crate::v2_std_core::UnaryOpKind::*; -pub use crate::v2_compiler_artifact::{RenderTarget}; -use crate::v2_compiler_artifact::RenderTarget::{Rust}; -pub use crate::generated_method_template_projection::{rust_method_template_emit}; -pub use crate::extdeps_languages_rust_emit::{rt_functions, rt_ref_map_functions, rt_wraps_result, rt_bridge_function_names, rust_container_templates, rust_method_wraps_result, rust_struct_derives, rust_struct_derives_copy, rust_enum_derives, rust_enum_derives_copy, HigherOrderMethodSpec, rust_higher_order_methods}; -pub use crate::v2_compiler_languages::{scaffold_for_target, serialization_for_target, TestConventions, ItemKeywords, test_conventions_for_target, visibility_for_target, sharing_for_target, is_string_like, VisibilitySpec}; -use crate::v2_compiler_languages::VisibilitySpec::{KeywordVisibility}; -pub use crate::v2_compiler_runtime_rust::{rust_runtime_source}; -pub use crate::v2_compiler_compiler_tests_rust::{compiler_tests_source}; -pub use crate::v2_compiler_coercion::{coerce_primitive_type, is_copy, lookup_checkpoint}; -pub use crate::std_types::{is_container_type}; -pub use crate::v2_compiler_infer_env::{TypeEnv, TypeBinding, authored_name, lookup_type_by_name}; -pub use crate::v2_compiler_infer_types::{resolved_type, normalize_access_type_node, for_each_element_type_node, child_type_node, emit_map_has, node_is_keyed_collection, node_is_element_collection, node_is_collection, is_product_type, is_coproduct_type, is_unit_like}; -pub use crate::v2_compiler_infer_sigs::{ResolvedFuncEnv}; -pub use crate::v2_compiler_infer_items::{ResolvedGraph, TypedModule, ItemInfo, ItemKind}; -use crate::v2_compiler_infer_items::ItemKind::{DataItem}; -pub use crate::v2_compiler_infer_service::{is_typed_service_call_receiver, extract_typed_service_name}; -pub use crate::v2_compiler_infer::{InferScope, build_params_scope, extend_scope, build_emit_graph_info, expr_span}; -pub use crate::v2_compiler_infer_emit_info::{EmitGraphInfo, TypeSummary, lookup_emit_type_summary, is_enum_in_summaries, find_variant_parent, is_known_variant, variant_belongs_to_enum, TypeRepr}; -use crate::v2_compiler_infer_emit_info::TypeRepr::{StructRepr, EnumRepr}; -pub use crate::v2_compiler_ownership::{OwnershipProof, analyze_ownership, analyze_single_fold, build_movable_set, build_read_only_params, collect_callable_refs}; -pub use crate::std_induction::{SubValueRelation}; -use crate::std_induction::SubValueRelation::{SubValueUnknown}; -pub use crate::v2_compiler_emit::{EmitResult, BlockEmitState, TestProjection, TcoFrame, TcoReassignInput, InterpPart, rust_literal_for_pattern, emit_literal, emit_bin_op_symbol, emit_keyword, emit_node_type, render_node_type, emit_ident, emit_let_binding, emit_let_binding_annotated, emit_return, emit_unary_op, emit_lambda, emit_error_expr, emit_lambda_params, emit_null_coalesce, emit_list_lit_expr, emit_shared_expr, emit_typed_cast_shared, emit_string_literal, emit_simple_expr, escape_rust_interp_text, escape_string_literal_body, module_emit_scope, scope_after_expr, lookup_item, unique_strings, has_nested_records_node, emit_data_value_json, escape_json_string, module_to_filename, make_indent, to_string, to_string_helper, to_snake, to_screaming_snake, to_pascal, is_upper, to_lower_char, to_upper_char, capitalize_first, sanitize_service_name, service_var_name, test_function_name, apply_type_template1, apply_type_template2, apply_type_template3, apply_named_template, language_spec, is_null_coalesce, is_type_alias_return_node, is_service_item, has_service_items, typed_named_arg_matches, order_typed_call_args, is_type_def_item, is_type_alias_item, is_type_decl_item, is_function_item, is_data_def_item, is_service_def_item, is_resource_def_item, has_mock_prefix, extract_test_projections, is_tco_eligible, is_self_recursive, emit_shared_tco_expr, tco_reassign_core, is_tco_identity_passthrough, service_fallback_transport, effective_operation_transport, ServiceFieldSet, compute_service_fields, service_field_decls, service_field_ctors, extract_modifier_names, seed_bindings, emit_typed_if_shared, emit_typed_let_shared}; - -pub fn render_rust_type(n: Rc, shared_types: Rc>, source_indices: Rc>>) -> String { +use crate::v2_std_core::VarBindingKind::{ + FunctionValueBinding, LocalValueBinding, MatchBoundBinding, VariantValueBinding, +}; +pub use crate::v2_std_core::{ + arg_name_at, arg_value, arm_body, arm_guard, arm_pattern, authored_name_at, binop_left, + binop_right, cast_expr, cast_target, expr_call_func_at, expr_has_non_tail_self_call, + expr_has_self_call, expr_method_name_at, expr_var_name_at, field_access_base, + field_access_field_at, field_binding_name_at, field_binding_pattern, field_init_node_name_at, + field_init_node_value, find_child_named, foreach_body, foreach_collection, foreach_variable_at, + generic_param_name_at, if_condition, if_else_branch, if_then_branch, import_is_all, + import_specific_names_at, index_base, index_expr, is_compiler_error, is_file_transport, + is_rest_transport, is_shell_transport, lambda_body, lambda_param_names_at, let_binding_name_at, + let_body, let_value, make_arg_node, make_error_node, make_expr_node, make_named_expr_node, + make_span, match_arm_nodes, match_scrutinee, method_arg_nodes, method_receiver, module_imports, + module_items, param_node_default_value, param_node_name_at, param_node_type_expr, + record_lit_type_name_at, resource_use_name_at, resource_use_resource, return_value, + service_config_auth, service_config_auth_input, service_config_auth_source, + service_config_endpoint, slice_base, slice_end, slice_start, transport_auth_header_name, + transport_auth_token, transport_base_url, transport_env, transport_has_auth, transport_headers, + transport_method, transport_path_template, transport_query, transport_request_body, + transport_response_format, transport_stdin, with_required_cardinality, AlgebraFieldKind, BinOp, + CallSemantics, Cardinality, CompilerDiagnostic, Connective, ErrorNode, ExprData, + FieldAccessStyle, FieldSummary, FieldValueShape, InferredNode, LiteralValue, MatchPattern, + MethodSemantics, NewlineIndex, Node, SourceSpan, StringPart, TextFile, UnaryOpKind, + VarBindingKind, +}; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; + +pub fn render_rust_type( + n: Rc, + shared_types: Rc>, + source_indices: Rc>>, +) -> String { render_node_type(&n, &RenderTarget::Rust, &shared_types, &source_indices) } pub fn type_variable_node(id: String) -> Rc { Rc::new(Node { - name: "".to_string(), - span: make_span(0, 0), - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::TypeVariable { - id: id, -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) + name: "".to_string(), + span: make_span(0, 0), + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::TypeVariable { id: id })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) } pub fn is_type_variable(inferred: Rc) -> bool { match (*inferred).clone() { - InferredNode::TypeVariable { .. } => true, - _ => false, -} + InferredNode::TypeVariable { .. } => true, + _ => false, + } } -pub fn is_rust_value_type(n: Rc, source_indices: Rc>>) -> bool { +pub fn is_rust_value_type( + n: Rc, + source_indices: Rc>>, +) -> bool { { let normed = normalize_access_type_node(n); -match is_copy(RenderTarget::Rust, authored_name_at(source_indices, &normed)) { - Some(v) => v.clone(), - None => false, -} -} + match is_copy( + RenderTarget::Rust, + authored_name_at(source_indices, &normed), + ) { + Some(v) => v.clone(), + None => false, + } + } } -pub fn is_rust_string_like(n: Rc, source_indices: Rc>>) -> bool { +pub fn is_rust_string_like( + n: Rc, + source_indices: Rc>>, +) -> bool { { let normed = normalize_access_type_node(n); -is_string_like(RenderTarget::Rust, authored_name_at(source_indices, &normed)) -} + is_string_like( + RenderTarget::Rust, + authored_name_at(source_indices, &normed), + ) + } } pub fn rust_source_root() -> String { match scaffold_for_target(RenderTarget::Rust).source_dir.clone() { - Some(dir) => dir.clone(), - None => "".to_string(), -} + Some(dir) => dir.clone(), + None => "".to_string(), + } } pub fn rust_source_ext() -> String { - scaffold_for_target(RenderTarget::Rust).source_file_extension.clone() + scaffold_for_target(RenderTarget::Rust) + .source_file_extension + .clone() } pub fn rust_visibility_prefix() -> String { match (*visibility_for_target(RenderTarget::Rust)).clone() { - VisibilitySpec::KeywordVisibility { prefix: p, .. } => p.clone(), - _ => "__VISIBILITY_SPEC_MISMATCH__".to_string(), -} + VisibilitySpec::KeywordVisibility { prefix: p, .. } => p.clone(), + _ => "__VISIBILITY_SPEC_MISMATCH__".to_string(), + } } pub fn rust_items() -> Rc { @@ -139,10 +229,16 @@ pub fn rust_enum_derives_copy_text() -> String { } pub fn rust_serde_tag_attr() -> String { - match serialization_for_target(RenderTarget::Rust).tag_attribute.clone() { - Some(attr) => attr.clone(), - None => emit_error_expr("missing serde tag_attribute for Rust".to_string(), RenderTarget::Rust), -} + match serialization_for_target(RenderTarget::Rust) + .tag_attribute + .clone() + { + Some(attr) => attr.clone(), + None => emit_error_expr( + "missing serde tag_attribute for Rust".to_string(), + RenderTarget::Rust, + ), + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -152,38 +248,31 @@ pub struct RustEnumWireSerde { pub rename_suffix: Option, pub rename_style: Option, pub error_message: Option, - pub untagged_string_variant: Option, - pub untagged_string_field: Option, - pub untagged_array_variant: Option, - pub untagged_array_field: Option, } -pub fn rust_serde_policy(enum_attr: String, rename_prefix: Option, rename_suffix: Option, rename_style: Option) -> Rc { +pub fn rust_serde_policy( + enum_attr: String, + rename_prefix: Option, + rename_suffix: Option, + rename_style: Option, +) -> Rc { Rc::new(RustEnumWireSerde { - enum_attr: enum_attr, - rename_prefix: rename_prefix, - rename_suffix: rename_suffix, - rename_style: rename_style, - error_message: None, - untagged_string_variant: None, - untagged_string_field: None, - untagged_array_variant: None, - untagged_array_field: None, -}) + enum_attr: enum_attr, + rename_prefix: rename_prefix, + rename_suffix: rename_suffix, + rename_style: rename_style, + error_message: None, + }) } pub fn rust_serde_policy_error(message: String) -> Rc { Rc::new(RustEnumWireSerde { - enum_attr: "".to_string(), - rename_prefix: None, - rename_suffix: None, - rename_style: None, - error_message: Some(message), - untagged_string_variant: None, - untagged_string_field: None, - untagged_array_variant: None, - untagged_array_field: None, -}) + enum_attr: "".to_string(), + rename_prefix: None, + rename_suffix: None, + rename_style: None, + error_message: Some(message), + }) } pub fn rust_tagged_object_policy() -> Rc { @@ -199,333 +288,654 @@ pub fn rust_string_as_authored_policy() -> Rc { } pub fn rust_snake_string_policy() -> Rc { - rust_serde_policy("#[serde(rename_all = \"snake_case\")]".to_string(), None, None, None) -} - -pub fn field_value_by_name(record: Rc, field_name: String, source_indices: Rc>>) -> Option> { - match Rc::new({ let mut __result = Vec::new(); for fi in record.children.clone().iter().cloned() { if (field_init_node_name_at(fi.clone(), source_indices.clone()).as_str() == field_name.clone().as_str()) { __result.push(fi); } } __result }).first().cloned() { - Some(fi) => Some(field_init_node_value(&fi)), - None => None, -} + rust_serde_policy( + "#[serde(rename_all = \"snake_case\")]".to_string(), + None, + None, + None, + ) +} + +pub fn field_value_by_name( + record: Rc, + field_name: String, + source_indices: Rc>>, +) -> Option> { + match Rc::new({ + let mut __result = Vec::new(); + for fi in record.children.clone().iter().cloned() { + if (field_init_node_name_at(fi.clone(), source_indices.clone()).as_str() + == field_name.clone().as_str()) + { + __result.push(fi); + } + } + __result + }) + .first() + .cloned() + { + Some(fi) => Some(field_init_node_value(&fi)), + None => None, + } } pub fn literal_string_value(n: Rc) -> Option { match (*n.expr_data.clone()).clone() { - ExprData::ExprLiteral { value: lv, .. } => match (*lv.clone()).clone() { - LiteralValue::LitStr { value: s, .. } => Some(s.clone()), - _ => None, -}, - _ => None, -} + ExprData::ExprLiteral { value: lv, .. } => match (*lv.clone()).clone() { + LiteralValue::LitStr { value: s, .. } => Some(s.clone()), + _ => None, + }, + _ => None, + } } -pub fn record_string_field(record: Rc, field_name: String, source_indices: Rc>>) -> Option { +pub fn record_string_field( + record: Rc, + field_name: String, + source_indices: Rc>>, +) -> Option { match field_value_by_name(record, field_name, source_indices) { - Some(value_node) => literal_string_value(value_node.clone()), - None => None, -} + Some(value_node) => literal_string_value(value_node.clone()), + None => None, + } } -pub fn naming_policy_node(encoding: Rc, source_indices: Rc>>) -> Option> { +pub fn naming_policy_node( + encoding: Rc, + source_indices: Rc>>, +) -> Option> { field_value_by_name(encoding, "naming".to_string(), source_indices) } -pub fn optional_string_record_field(record: Rc, field_name: String, source_indices: Rc>>) -> Option { +pub fn optional_string_record_field( + record: Rc, + field_name: String, + source_indices: Rc>>, +) -> Option { match field_value_by_name(record, field_name, source_indices) { - Some(n) => literal_string_value(n.clone()), - None => None, -} + Some(n) => literal_string_value(n.clone()), + None => None, + } } -pub fn required_literal_string_policy_field(record: Rc, field_name: String, source_indices: Rc>>) -> Option { +pub fn required_literal_string_policy_field( + record: Rc, + field_name: String, + source_indices: Rc>>, +) -> Option { match field_value_by_name(record, field_name, source_indices) { - Some(n) => literal_string_value(n.clone()), - None => None, -} + Some(n) => literal_string_value(n.clone()), + None => None, + } } -pub fn rust_string_policy_for_naming(naming: &Rc, source_indices: &Rc>>) -> Rc { +pub fn rust_string_policy_for_naming( + naming: &Rc, + source_indices: &Rc>>, +) -> Rc { { let naming_name = authored_name_at(source_indices.clone(), &naming); -if (naming_name.clone().as_str() == "AsAuthored".to_string().as_str()) { + if (naming_name.clone().as_str() == "AsAuthored".to_string().as_str()) { rust_string_as_authored_policy() } else { if (naming_name.clone().as_str() == "SnakeCase".to_string().as_str()) { rust_snake_string_policy() } else { - if (naming_name.clone().as_str() == "StripPrefixAndSnakeCase".to_string().as_str()) { - match required_literal_string_policy_field(naming.clone(), "prefix".to_string(), source_indices.clone()) { - Some(prefix) => rust_serde_policy("".to_string(), Some(prefix.clone()), None, Some("StripAffixAndSnakeCase".to_string())), - None => rust_serde_error_policy("StripPrefixAndSnakeCase requires a literal prefix".to_string()), -} + if (naming_name.clone().as_str() == "StripPrefixAndSnakeCase".to_string().as_str()) + { + match required_literal_string_policy_field( + naming.clone(), + "prefix".to_string(), + source_indices.clone(), + ) { + Some(prefix) => rust_serde_policy( + "".to_string(), + Some(prefix.clone()), + None, + Some("StripAffixAndSnakeCase".to_string()), + ), + None => rust_serde_error_policy( + "StripPrefixAndSnakeCase requires a literal prefix".to_string(), + ), + } } else { - if (naming_name.clone().as_str() == "StripSuffixAndSnakeCase".to_string().as_str()) { - match required_literal_string_policy_field(naming.clone(), "suffix".to_string(), source_indices.clone()) { - Some(suffix) => rust_serde_policy("".to_string(), None, Some(suffix.clone()), Some("StripAffixAndSnakeCase".to_string())), - None => rust_serde_error_policy("StripSuffixAndSnakeCase requires a literal suffix".to_string()), -} + if (naming_name.clone().as_str() + == "StripSuffixAndSnakeCase".to_string().as_str()) + { + match required_literal_string_policy_field( + naming.clone(), + "suffix".to_string(), + source_indices.clone(), + ) { + Some(suffix) => rust_serde_policy( + "".to_string(), + None, + Some(suffix.clone()), + Some("StripAffixAndSnakeCase".to_string()), + ), + None => rust_serde_error_policy( + "StripSuffixAndSnakeCase requires a literal suffix".to_string(), + ), + } } else { - if (naming_name.clone().as_str() == "StripPrefixSuffixAndSnakeCase".to_string().as_str()) { - match required_literal_string_policy_field(naming.clone(), "prefix".to_string(), source_indices.clone()) { - Some(prefix) => match required_literal_string_policy_field(naming.clone(), "suffix".to_string(), source_indices.clone()) { - Some(suffix) => rust_serde_policy("".to_string(), Some(prefix.clone()), Some(suffix.clone()), Some("StripAffixAndSnakeCase".to_string())), - None => rust_serde_error_policy("StripPrefixSuffixAndSnakeCase requires a literal suffix".to_string()), -}, - None => rust_serde_error_policy("StripPrefixSuffixAndSnakeCase requires a literal prefix".to_string()), -} + if (naming_name.clone().as_str() + == "StripPrefixSuffixAndSnakeCase".to_string().as_str()) + { + match required_literal_string_policy_field( + naming.clone(), + "prefix".to_string(), + source_indices.clone(), + ) { + Some(prefix) => match required_literal_string_policy_field( + naming.clone(), + "suffix".to_string(), + source_indices.clone(), + ) { + Some(suffix) => rust_serde_policy( + "".to_string(), + Some(prefix.clone()), + Some(suffix.clone()), + Some("StripAffixAndSnakeCase".to_string()), + ), + None => rust_serde_error_policy( + "StripPrefixSuffixAndSnakeCase requires a literal suffix" + .to_string(), + ), + }, + None => rust_serde_error_policy( + "StripPrefixSuffixAndSnakeCase requires a literal prefix" + .to_string(), + ), + } } else { - rust_serde_error_policy(v2_rt::concat("unsupported VariantNaming: ".to_string(), naming_name.clone())) + rust_serde_error_policy(v2_rt::concat( + "unsupported VariantNaming: ".to_string(), + naming_name.clone(), + )) } } } } } -} + } } -pub fn rust_internal_policy_for_naming(tag_field: String, naming: &Rc, source_indices: &Rc>>) -> Rc { +pub fn rust_internal_policy_for_naming( + tag_field: String, + naming: &Rc, + source_indices: &Rc>>, +) -> Rc { { let naming_name = authored_name_at(source_indices.clone(), &naming); -if (naming_name.clone().as_str() == "AsAuthored".to_string().as_str()) { - rust_serde_policy(v2_rt::concat(v2_rt::concat("#[serde(tag = \"".to_string(), tag_field), "\")]".to_string()), None, None, None) + if (naming_name.clone().as_str() == "AsAuthored".to_string().as_str()) { + rust_serde_policy( + v2_rt::concat( + v2_rt::concat("#[serde(tag = \"".to_string(), tag_field), + "\")]".to_string(), + ), + None, + None, + None, + ) } else { if (naming_name.clone().as_str() == "SnakeCase".to_string().as_str()) { - rust_serde_policy(v2_rt::concat(v2_rt::concat("#[serde(tag = \"".to_string(), tag_field), "\", rename_all = \"snake_case\")]".to_string()), None, None, None) + rust_serde_policy( + v2_rt::concat( + v2_rt::concat("#[serde(tag = \"".to_string(), tag_field), + "\", rename_all = \"snake_case\")]".to_string(), + ), + None, + None, + None, + ) } else { - if (naming_name.clone().as_str() == "StripPrefixAndSnakeCase".to_string().as_str()) { - match required_literal_string_policy_field(naming.clone(), "prefix".to_string(), source_indices.clone()) { - Some(prefix) => rust_serde_policy(v2_rt::concat(v2_rt::concat("#[serde(tag = \"".to_string(), tag_field), "\")]".to_string()), Some(prefix.clone()), None, Some("StripAffixAndSnakeCase".to_string())), - None => rust_serde_error_policy("StripPrefixAndSnakeCase requires a literal prefix".to_string()), -} + if (naming_name.clone().as_str() == "StripPrefixAndSnakeCase".to_string().as_str()) + { + match required_literal_string_policy_field( + naming.clone(), + "prefix".to_string(), + source_indices.clone(), + ) { + Some(prefix) => rust_serde_policy( + v2_rt::concat( + v2_rt::concat("#[serde(tag = \"".to_string(), tag_field), + "\")]".to_string(), + ), + Some(prefix.clone()), + None, + Some("StripAffixAndSnakeCase".to_string()), + ), + None => rust_serde_error_policy( + "StripPrefixAndSnakeCase requires a literal prefix".to_string(), + ), + } } else { - if (naming_name.clone().as_str() == "StripSuffixAndSnakeCase".to_string().as_str()) { - match required_literal_string_policy_field(naming.clone(), "suffix".to_string(), source_indices.clone()) { - Some(suffix) => rust_serde_policy(v2_rt::concat(v2_rt::concat("#[serde(tag = \"".to_string(), tag_field), "\")]".to_string()), None, Some(suffix.clone()), Some("StripAffixAndSnakeCase".to_string())), - None => rust_serde_error_policy("StripSuffixAndSnakeCase requires a literal suffix".to_string()), -} + if (naming_name.clone().as_str() + == "StripSuffixAndSnakeCase".to_string().as_str()) + { + match required_literal_string_policy_field( + naming.clone(), + "suffix".to_string(), + source_indices.clone(), + ) { + Some(suffix) => rust_serde_policy( + v2_rt::concat( + v2_rt::concat("#[serde(tag = \"".to_string(), tag_field), + "\")]".to_string(), + ), + None, + Some(suffix.clone()), + Some("StripAffixAndSnakeCase".to_string()), + ), + None => rust_serde_error_policy( + "StripSuffixAndSnakeCase requires a literal suffix".to_string(), + ), + } } else { - if (naming_name.clone().as_str() == "StripPrefixSuffixAndSnakeCase".to_string().as_str()) { - match required_literal_string_policy_field(naming.clone(), "prefix".to_string(), source_indices.clone()) { - Some(prefix) => match required_literal_string_policy_field(naming.clone(), "suffix".to_string(), source_indices.clone()) { - Some(suffix) => rust_serde_policy(v2_rt::concat(v2_rt::concat("#[serde(tag = \"".to_string(), tag_field), "\")]".to_string()), Some(prefix.clone()), Some(suffix.clone()), Some("StripAffixAndSnakeCase".to_string())), - None => rust_serde_error_policy("StripPrefixSuffixAndSnakeCase requires a literal suffix".to_string()), -}, - None => rust_serde_error_policy("StripPrefixSuffixAndSnakeCase requires a literal prefix".to_string()), -} + if (naming_name.clone().as_str() + == "StripPrefixSuffixAndSnakeCase".to_string().as_str()) + { + match required_literal_string_policy_field( + naming.clone(), + "prefix".to_string(), + source_indices.clone(), + ) { + Some(prefix) => match required_literal_string_policy_field( + naming.clone(), + "suffix".to_string(), + source_indices.clone(), + ) { + Some(suffix) => rust_serde_policy( + v2_rt::concat( + v2_rt::concat( + "#[serde(tag = \"".to_string(), + tag_field, + ), + "\")]".to_string(), + ), + Some(prefix.clone()), + Some(suffix.clone()), + Some("StripAffixAndSnakeCase".to_string()), + ), + None => rust_serde_error_policy( + "StripPrefixSuffixAndSnakeCase requires a literal suffix" + .to_string(), + ), + }, + None => rust_serde_error_policy( + "StripPrefixSuffixAndSnakeCase requires a literal prefix" + .to_string(), + ), + } } else { - rust_serde_error_policy(v2_rt::concat("unsupported VariantNaming: ".to_string(), naming_name.clone())) + rust_serde_error_policy(v2_rt::concat( + "unsupported VariantNaming: ".to_string(), + naming_name.clone(), + )) } } } } } -} + } } -pub fn rust_internal_policy_for_encoding(encoding: &Rc, source_indices: &Rc>>) -> Rc { - match record_string_field(encoding.clone(), "tag_field".to_string(), source_indices.clone()) { - Some(tag_field) => match naming_policy_node(encoding.clone(), source_indices.clone()) { - Some(naming) => rust_internal_policy_for_naming(tag_field.clone(), &naming, &source_indices), - None => rust_serde_error_policy("InternallyTaggedObject requires a naming policy".to_string()), -}, - None => rust_serde_error_policy("InternallyTaggedObject requires a literal tag_field".to_string()), -} -} - -pub fn rust_untagged_json_string_or_array_policy(encoding: &Rc, source_indices: &Rc>>) -> Rc { - match record_string_field(encoding.clone(), "string_variant".to_string(), source_indices.clone()) { - Some(sv) => match record_string_field(encoding.clone(), "string_field".to_string(), source_indices.clone()) { - Some(sf) => match record_string_field(encoding.clone(), "array_variant".to_string(), source_indices.clone()) { - Some(av) => match record_string_field(encoding.clone(), "array_field".to_string(), source_indices.clone()) { - Some(af) => Rc::new(RustEnumWireSerde { - enum_attr: "#[serde(untagged)]".to_string(), - rename_prefix: None, - rename_suffix: None, - rename_style: None, - error_message: None, - untagged_string_variant: Some(sv.clone()), - untagged_string_field: Some(sf.clone()), - untagged_array_variant: Some(av.clone()), - untagged_array_field: Some(af.clone()), -}), - None => rust_serde_error_policy("UntaggedJsonStringOrArray requires literal array_field".to_string()), -}, - None => rust_serde_error_policy("UntaggedJsonStringOrArray requires literal array_variant".to_string()), -}, - None => rust_serde_error_policy("UntaggedJsonStringOrArray requires literal string_field".to_string()), -}, - None => rust_serde_error_policy("UntaggedJsonStringOrArray requires literal string_variant".to_string()), -} +pub fn rust_internal_policy_for_encoding( + encoding: &Rc, + source_indices: &Rc>>, +) -> Rc { + match record_string_field( + encoding.clone(), + "tag_field".to_string(), + source_indices.clone(), + ) { + Some(tag_field) => match naming_policy_node(encoding.clone(), source_indices.clone()) { + Some(naming) => { + rust_internal_policy_for_naming(tag_field.clone(), &naming, &source_indices) + } + None => rust_serde_error_policy( + "InternallyTaggedObject requires a naming policy".to_string(), + ), + }, + None => rust_serde_error_policy( + "InternallyTaggedObject requires a literal tag_field".to_string(), + ), + } } -pub fn resolve_wire_serde_policy_from_encoding_node(ve: &Rc, source_indices: &Rc>>) -> Rc { +pub fn resolve_wire_serde_policy_from_encoding_node( + ve: &Rc, + source_indices: &Rc>>, +) -> Rc { { let encoding_name = authored_name_at(source_indices.clone(), &ve); -if (encoding_name.clone().as_str() == "InternallyTaggedObject".to_string().as_str()) { + if (encoding_name.clone().as_str() == "InternallyTaggedObject".to_string().as_str()) { rust_internal_policy_for_encoding(&ve, &source_indices) } else { if (encoding_name.clone().as_str() == "StringVariant".to_string().as_str()) { match naming_policy_node(ve.clone(), source_indices.clone()) { - Some(nv) => rust_string_policy_for_naming(&nv, &source_indices), - None => rust_serde_error_policy("StringVariant requires a naming policy".to_string()), -} + Some(nv) => rust_string_policy_for_naming(&nv, &source_indices), + None => rust_serde_error_policy( + "StringVariant requires a naming policy".to_string(), + ), + } } else { if (encoding_name.clone().as_str() == "TaggedVariant".to_string().as_str()) { rust_tagged_object_policy() } else { - if (encoding_name.clone().as_str() == "UntaggedJsonStringOrArray".to_string().as_str()) { - rust_untagged_json_string_or_array_policy(&ve, &source_indices) - } else { - rust_serde_error_policy(v2_rt::concat("unsupported VariantEncoding: ".to_string(), encoding_name.clone())) - } + rust_serde_error_policy(v2_rt::concat( + "unsupported VariantEncoding: ".to_string(), + encoding_name.clone(), + )) } } } -} + } } -pub fn resolve_wire_serde_policy(wire_item: &Rc, source_indices: Rc>>) -> Rc { +pub fn resolve_wire_serde_policy( + wire_item: &Rc, + source_indices: Rc>>, +) -> Rc { match wire_item.body.clone() { - Some(ve) => resolve_wire_serde_policy_from_encoding_node(&ve, &source_indices), - None => match (*wire_item.expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => resolve_wire_serde_policy_from_encoding_node(&wire_item, &source_indices), - _ => rust_tagged_object_policy(), -}, -} + Some(ve) => resolve_wire_serde_policy_from_encoding_node(&ve, &source_indices), + None => match (*wire_item.expr_data.clone()).clone() { + ExprData::ExprRecordLit { .. } => { + resolve_wire_serde_policy_from_encoding_node(&wire_item, &source_indices) + } + _ => rust_tagged_object_policy(), + }, + } } pub fn item_binding_is_named(env: Rc, node: &Rc, name: &String) -> bool { - ((authored_name(env, node.clone()).as_str() == name.clone().as_str()) || (node.name.clone().as_str() == name.clone().as_str())) -} - -pub fn resolve_wire_serde_policy_for_coproduct(wire_contract_item: Option>, source_indices: Rc>>, data_items: Rc>>>>) -> Rc { - resolve_wire_serde_policy_for_coproduct_seen(wire_contract_item, source_indices, data_items, v2_rt::rc_empty_map::(), 32) -} - -pub fn resolve_wire_serde_policy_for_coproduct_seen(mut wire_contract_item: Option>, mut source_indices: Rc>>, mut data_items: Rc>>>>, mut seen_aliases: Rc>, mut fuel: i64) -> Rc { + ((authored_name(env, node.clone()).as_str() == name.clone().as_str()) + || (node.name.clone().as_str() == name.clone().as_str())) +} + +pub fn resolve_wire_serde_policy_for_coproduct( + wire_contract_item: Option>, + source_indices: Rc>>, + data_items: Rc>>>>, +) -> Rc { + resolve_wire_serde_policy_for_coproduct_seen( + wire_contract_item, + source_indices, + data_items, + v2_rt::rc_empty_map::(), + 32, + ) +} + +pub fn resolve_wire_serde_policy_for_coproduct_seen( + mut wire_contract_item: Option>, + mut source_indices: Rc>>, + mut data_items: Rc>>>>, + mut seen_aliases: Rc>, + mut fuel: i64, +) -> Rc { loop { if (fuel.clone() <= 0) { - break rust_serde_error_policy("wire_contract: VariantEncoding alias chain exceeded recursion limit".to_string()); -} else { + break rust_serde_error_policy( + "wire_contract: VariantEncoding alias chain exceeded recursion limit".to_string(), + ); + } else { match wire_contract_item { - None => { break rust_tagged_object_policy(); }, - Some(wc) => { if is_data_def_item(&wc) { - match wc.body.clone() { - None => { break rust_serde_error_policy("wire_contract: data item has no initializer body".to_string()); }, - Some(init) => { match (*init.expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => { break resolve_wire_serde_policy(&init, source_indices.clone()); }, - ExprData::ExprVar { .. } => { let alias_name = expr_var_name_at(init.clone(), source_indices.clone()); -if (v2_rt::map_get(&seen_aliases, alias_name.clone()) != None) { - break rust_serde_error_policy(v2_rt::concat("wire_contract: cyclic VariantEncoding alias: ".to_string(), alias_name.clone())); -} else { - match v2_rt::map_get(&data_items, alias_name.clone()) { - Some(candidates) => { if ((candidates.clone().len() as i64) == 1) { - match candidates.clone().first().cloned() { - Some(aliased_data) => { { - let __tco_0 = Some(aliased_data.clone()); -let __tco_1 = v2_rt::rc_map_insert(seen_aliases, alias_name.clone(), true); -let __tco_2 = (fuel - 1); -wire_contract_item = __tco_0; -seen_aliases = __tco_1; -fuel = __tco_2; -continue; -} }, - None => { break rust_serde_error_policy(v2_rt::concat("wire_contract: missing VariantEncoding data alias: ".to_string(), alias_name.clone())); }, -} -} else { - break rust_serde_error_policy(v2_rt::concat("wire_contract: ambiguous VariantEncoding data alias: ".to_string(), alias_name.clone())); -} }, - None => { match init.inferred.clone() { - None => { break rust_serde_error_policy("wire_contract: missing type inference on initializer (cannot resolve VariantEncoding alias)".to_string()); }, - Some(inf) => { match (*inf.clone()).clone() { - InferredNode::Resolved { node, .. } => { if is_data_def_item(&node) { - { - let __tco_0 = Some(node.clone()); -let __tco_1 = v2_rt::rc_map_insert(seen_aliases, alias_name.clone(), true); -let __tco_2 = (fuel - 1); -wire_contract_item = __tco_0; -seen_aliases = __tco_1; -fuel = __tco_2; -continue; -} -} else { - break resolve_wire_serde_policy(&node, source_indices.clone()); -} }, - InferredNode::CompilerError { message, .. } => { break rust_serde_error_policy(v2_rt::concat("wire_contract: ".to_string(), message.clone())); }, - InferredNode::TypeVariable { .. } => { break rust_serde_error_policy("wire_contract: unresolved type variable in wire_contract initializer".to_string()); }, -} }, -} }, -} -} }, - _ => { match init.inferred.clone() { - None => { break rust_serde_error_policy("wire_contract: missing type inference on initializer (cannot resolve VariantEncoding alias)".to_string()); }, - Some(inf) => { match (*inf.clone()).clone() { - InferredNode::Resolved { node, .. } => { if is_data_def_item(&node) { - { - let __tco_0 = Some(node.clone()); -let __tco_1 = (fuel - 1); -wire_contract_item = __tco_0; -fuel = __tco_1; -continue; -} -} else { - break resolve_wire_serde_policy(&node, source_indices.clone()); -} }, - InferredNode::CompilerError { message, .. } => { break rust_serde_error_policy(v2_rt::concat("wire_contract: ".to_string(), message.clone())); }, - InferredNode::TypeVariable { .. } => { break rust_serde_error_policy("wire_contract: unresolved type variable in wire_contract initializer".to_string()); }, -} }, -} }, -} }, -} -} else { - break resolve_wire_serde_policy(&wc, source_indices.clone()); -} }, -} -} -} + None => { + break rust_tagged_object_policy(); + } + Some(wc) => { + if is_data_def_item(&wc) { + match wc.body.clone() { + None => { + break rust_serde_error_policy( + "wire_contract: data item has no initializer body".to_string(), + ); + } + Some(init) => match (*init.expr_data.clone()).clone() { + ExprData::ExprRecordLit { .. } => { + break resolve_wire_serde_policy(&init, source_indices.clone()); + } + ExprData::ExprVar { .. } => { + let alias_name = + expr_var_name_at(init.clone(), source_indices.clone()); + if (v2_rt::map_get(&seen_aliases, alias_name.clone()) != None) { + break rust_serde_error_policy(v2_rt::concat( + "wire_contract: cyclic VariantEncoding alias: " + .to_string(), + alias_name.clone(), + )); + } else { + match v2_rt::map_get(&data_items, alias_name.clone()) { + Some(candidates) => { + if ((candidates.clone().len() as i64) == 1) { + match candidates.clone().first().cloned() { + Some(aliased_data) => { + let __tco_0 = + Some(aliased_data.clone()); + let __tco_1 = v2_rt::rc_map_insert( + seen_aliases, + alias_name.clone(), + true, + ); + let __tco_2 = (fuel - 1); + wire_contract_item = __tco_0; + seen_aliases = __tco_1; + fuel = __tco_2; + continue; + } + None => { + break rust_serde_error_policy(v2_rt::concat("wire_contract: missing VariantEncoding data alias: ".to_string(), alias_name.clone())); + } + } + } else { + break rust_serde_error_policy(v2_rt::concat("wire_contract: ambiguous VariantEncoding data alias: ".to_string(), alias_name.clone())); + } + } + None => match init.inferred.clone() { + None => { + break rust_serde_error_policy("wire_contract: missing type inference on initializer (cannot resolve VariantEncoding alias)".to_string()); + } + Some(inf) => match (*inf.clone()).clone() { + InferredNode::Resolved { node, .. } => { + if is_data_def_item(&node) { + { + let __tco_0 = Some(node.clone()); + let __tco_1 = v2_rt::rc_map_insert( + seen_aliases, + alias_name.clone(), + true, + ); + let __tco_2 = (fuel - 1); + wire_contract_item = __tco_0; + seen_aliases = __tco_1; + fuel = __tco_2; + continue; + } + } else { + break resolve_wire_serde_policy( + &node, + source_indices.clone(), + ); + } + } + InferredNode::CompilerError { + message, .. + } => { + break rust_serde_error_policy( + v2_rt::concat( + "wire_contract: ".to_string(), + message.clone(), + ), + ); + } + InferredNode::TypeVariable { .. } => { + break rust_serde_error_policy("wire_contract: unresolved type variable in wire_contract initializer".to_string()); + } + }, + }, + } + } + } + _ => match init.inferred.clone() { + None => { + break rust_serde_error_policy("wire_contract: missing type inference on initializer (cannot resolve VariantEncoding alias)".to_string()); + } + Some(inf) => match (*inf.clone()).clone() { + InferredNode::Resolved { node, .. } => { + if is_data_def_item(&node) { + { + let __tco_0 = Some(node.clone()); + let __tco_1 = (fuel - 1); + wire_contract_item = __tco_0; + fuel = __tco_1; + continue; + } + } else { + break resolve_wire_serde_policy( + &node, + source_indices.clone(), + ); + } + } + InferredNode::CompilerError { message, .. } => { + break rust_serde_error_policy(v2_rt::concat( + "wire_contract: ".to_string(), + message.clone(), + )); + } + InferredNode::TypeVariable { .. } => { + break rust_serde_error_policy("wire_contract: unresolved type variable in wire_contract initializer".to_string()); + } + }, + }, + }, + } + } else { + break resolve_wire_serde_policy(&wc, source_indices.clone()); + } + } + } + } + } } -pub fn coproduct_wire_contract_encoding(contract_item: Rc, source_indices: Rc>>) -> Option> { +pub fn coproduct_wire_contract_encoding( + contract_item: Rc, + source_indices: Rc>>, +) -> Option> { match contract_item.body.clone() { - Some(body) => field_value_by_name(body.clone(), "encoding".to_string(), source_indices), - None => None, -} + Some(body) => field_value_by_name(body.clone(), "encoding".to_string(), source_indices), + None => None, + } } -pub fn variant_encoding_is_string_variant(encoding: Rc, source_indices: Rc>>) -> bool { +pub fn variant_encoding_is_string_variant( + encoding: Rc, + source_indices: Rc>>, +) -> bool { (authored_name_at(source_indices, &encoding).as_str() == "StringVariant".to_string().as_str()) } -pub fn coproduct_wire_contract_targets(contract_item: Rc, coproduct_name: String, source_indices: Rc>>) -> bool { +pub fn coproduct_wire_contract_targets( + contract_item: Rc, + coproduct_name: String, + source_indices: Rc>>, +) -> bool { match contract_item.body.clone() { - Some(body) => match record_string_field(body.clone(), "coproduct".to_string(), source_indices) { - Some(target_name) => (target_name.clone().as_str() == coproduct_name.as_str()), - None => false, -}, - None => false, -} + Some(body) => { + match record_string_field(body.clone(), "coproduct".to_string(), source_indices) { + Some(target_name) => (target_name.clone().as_str() == coproduct_name.as_str()), + None => false, + } + } + None => false, + } } pub fn emit_rust_compile_error_item(message: String) -> String { - v2_rt::concat(v2_rt::concat("compile_error!(\"".to_string(), message), "\");".to_string()) -} - -pub fn module_imports_std_serialization_coproduct_wire_contract(imports: Rc>>, source_indices: Rc>>) -> bool { - { let mut __found = false; for imp in imports.iter().cloned() { if ((authored_name_at(source_indices.clone(), &imp).as_str() == "std.serialization".to_string().as_str()) && (import_is_all(imp.clone()) || { let mut __found = false; for name in import_specific_names_at(imp.clone(), source_indices.clone()).iter().cloned() { if (name.clone().as_str() == "CoproductWireContract".to_string().as_str()) { __found = true; break; } } __found })) { __found = true; break; } } __found } + v2_rt::concat( + v2_rt::concat("compile_error!(\"".to_string(), message), + "\");".to_string(), + ) +} + +pub fn module_imports_std_serialization_coproduct_wire_contract( + imports: Rc>>, + source_indices: Rc>>, +) -> bool { + { + let mut __found = false; + for imp in imports.iter().cloned() { + if ((authored_name_at(source_indices.clone(), &imp).as_str() + == "std.serialization".to_string().as_str()) + && (import_is_all(imp.clone()) || { + let mut __found = false; + for name in import_specific_names_at(imp.clone(), source_indices.clone()) + .iter() + .cloned() + { + if (name.clone().as_str() == "CoproductWireContract".to_string().as_str()) { + __found = true; + break; + } + } + __found + })) + { + __found = true; + break; + } + } + __found + } } -pub fn data_item_type_is_coproduct_wire_contract(item: Rc, imports: Rc>>, source_indices: &Rc>>) -> bool { +pub fn data_item_type_is_coproduct_wire_contract( + item: Rc, + imports: Rc>>, + source_indices: &Rc>>, +) -> bool { match item.type_annotation.clone() { - Some(type_node) => ((authored_name_at(source_indices.clone(), &type_node).as_str() == "CoproductWireContract".to_string().as_str()) && module_imports_std_serialization_coproduct_wire_contract(imports, source_indices.clone())), - None => false, -} + Some(type_node) => { + ((authored_name_at(source_indices.clone(), &type_node).as_str() + == "CoproductWireContract".to_string().as_str()) + && module_imports_std_serialization_coproduct_wire_contract( + imports, + source_indices.clone(), + )) + } + None => false, + } } -pub fn module_defines_local_coproduct_wire_contract_type(module_items: Rc>>, source_indices: Rc>>) -> bool { - { let mut __found = false; for item in module_items.iter().cloned() { if (((is_type_def_item(&item) || is_type_alias_item(&item, source_indices.clone())) || is_type_decl_item(&item, source_indices.clone())) && (authored_name_at(source_indices.clone(), &item).as_str() == "CoproductWireContract".to_string().as_str())) { __found = true; break; } } __found } +pub fn module_defines_local_coproduct_wire_contract_type( + module_items: Rc>>, + source_indices: Rc>>, +) -> bool { + { + let mut __found = false; + for item in module_items.iter().cloned() { + if (((is_type_def_item(&item) || is_type_alias_item(&item, source_indices.clone())) + || is_type_decl_item(&item, source_indices.clone())) + && (authored_name_at(source_indices.clone(), &item).as_str() + == "CoproductWireContract".to_string().as_str())) + { + __found = true; + break; + } + } + __found + } } -pub fn is_coproduct_wire_contract_row(item: &Rc, module_items: Rc>>, imports: Rc>>, source_indices: &Rc>>) -> bool { +pub fn is_coproduct_wire_contract_row( + item: &Rc, + module_items: Rc>>, + imports: Rc>>, + source_indices: &Rc>>, +) -> bool { if !is_data_def_item(&item) { false } else { @@ -536,116 +946,335 @@ pub fn is_coproduct_wire_contract_row(item: &Rc, module_items: Rc ((field_value_by_name(body.clone(), "coproduct".to_string(), source_indices.clone()) != None) && (field_value_by_name(body.clone(), "encoding".to_string(), source_indices.clone()) != None)), - None => false, -} + Some(body) => { + ((field_value_by_name( + body.clone(), + "coproduct".to_string(), + source_indices.clone(), + ) != None) + && (field_value_by_name( + body.clone(), + "encoding".to_string(), + source_indices.clone(), + ) != None)) + } + None => false, + } } } } } -pub fn emit_coproduct_wire_contract_target_validation(contract_item: Rc, local_coproduct_names: Rc>, source_indices: Rc>>) -> String { +pub fn emit_coproduct_wire_contract_target_validation( + contract_item: Rc, + local_coproduct_names: Rc>, + source_indices: Rc>>, +) -> String { match contract_item.body.clone() { - Some(body) => match record_string_field(body.clone(), "coproduct".to_string(), source_indices) { - Some(target_name) => if { let mut __found = false; for name in local_coproduct_names.iter().cloned() { if (name.clone().as_str() == target_name.clone().as_str()) { __found = true; break; } } __found } { - "".to_string() - } else { - emit_rust_compile_error_item(v2_rt::concat("CoproductWireContract target does not name a local coproduct: ".to_string(), target_name.clone())) - }, - None => emit_rust_compile_error_item("CoproductWireContract.coproduct must be a string declaration name".to_string()), -}, - None => emit_rust_compile_error_item("CoproductWireContract row missing initializer body".to_string()), -} -} - -pub fn emit_coproduct_wire_contract_validations(module_items: &Rc>>, imports: Rc>>, local_coproduct_names: Rc>, source_indices: Rc>>) -> String { - Rc::new({ let mut __result = Vec::new(); for text in Rc::new({ let mut __result = Vec::new(); for item in Rc::new({ let mut __result = Vec::new(); for item in module_items.clone().iter().cloned() { if is_coproduct_wire_contract_row(&item, module_items.clone(), imports.clone(), &source_indices) { __result.push(item); } } __result }).iter().cloned() { __result.push(emit_coproduct_wire_contract_target_validation(item.clone(), local_coproduct_names.clone(), source_indices.clone())); } __result }).iter().cloned() { if (text.clone().as_str() != "".to_string().as_str()) { __result.push(text); } } __result }).join(&"\n".to_string()) + Some(body) => { + match record_string_field(body.clone(), "coproduct".to_string(), source_indices) { + Some(target_name) => { + if { + let mut __found = false; + for name in local_coproduct_names.iter().cloned() { + if (name.clone().as_str() == target_name.clone().as_str()) { + __found = true; + break; + } + } + __found + } { + "".to_string() + } else { + emit_rust_compile_error_item(v2_rt::concat( + "CoproductWireContract target does not name a local coproduct: " + .to_string(), + target_name.clone(), + )) + } + } + None => emit_rust_compile_error_item( + "CoproductWireContract.coproduct must be a string declaration name".to_string(), + ), + } + } + None => emit_rust_compile_error_item( + "CoproductWireContract row missing initializer body".to_string(), + ), + } } -pub fn resolve_local_coproduct_wire_policy(coproduct_name: &String, all_unit_variants: bool, module_items: &Rc>>, imports: Rc>>, source_indices: &Rc>>) -> Option> { - { - let contracts = Rc::new({ let mut __result = Vec::new(); for item in module_items.clone().iter().cloned() { if (is_coproduct_wire_contract_row(&item, module_items.clone(), imports.clone(), &source_indices) && coproduct_wire_contract_targets(item.clone(), coproduct_name.clone(), source_indices.clone())) { __result.push(item); } } __result }); -if ((contracts.clone().len() as i64) == 0) { +pub fn emit_coproduct_wire_contract_validations( + module_items: &Rc>>, + imports: Rc>>, + local_coproduct_names: Rc>, + source_indices: Rc>>, +) -> String { + Rc::new({ + let mut __result = Vec::new(); + for text in Rc::new({ + let mut __result = Vec::new(); + for item in Rc::new({ + let mut __result = Vec::new(); + for item in module_items.clone().iter().cloned() { + if is_coproduct_wire_contract_row( + &item, + module_items.clone(), + imports.clone(), + &source_indices, + ) { + __result.push(item); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(emit_coproduct_wire_contract_target_validation( + item.clone(), + local_coproduct_names.clone(), + source_indices.clone(), + )); + } + __result + }) + .iter() + .cloned() + { + if (text.clone().as_str() != "".to_string().as_str()) { + __result.push(text); + } + } + __result + }) + .join(&"\n".to_string()) +} + +pub fn resolve_local_coproduct_wire_policy( + coproduct_name: &String, + all_unit_variants: bool, + module_items: &Rc>>, + imports: Rc>>, + source_indices: &Rc>>, +) -> Option> { + { + let contracts = Rc::new({ + let mut __result = Vec::new(); + for item in module_items.clone().iter().cloned() { + if (is_coproduct_wire_contract_row( + &item, + module_items.clone(), + imports.clone(), + &source_indices, + ) && coproduct_wire_contract_targets( + item.clone(), + coproduct_name.clone(), + source_indices.clone(), + )) { + __result.push(item); + } + } + __result + }); + if ((contracts.clone().len() as i64) == 0) { None } else { if ((contracts.clone().len() as i64) == 1) { match contracts.clone().first().cloned() { - Some(contract) => match coproduct_wire_contract_encoding(contract.clone(), source_indices.clone()) { - Some(encoding) => if (variant_encoding_is_string_variant(encoding.clone(), source_indices.clone()) && !all_unit_variants) { - Some(rust_serde_error_policy(v2_rt::concat("CoproductWireContract StringVariant requires a nullary-only coproduct: ".to_string(), coproduct_name.clone()))) - } else { - Some(resolve_wire_serde_policy_from_encoding_node(&encoding, &source_indices)) - }, - None => Some(rust_serde_error_policy(v2_rt::concat("CoproductWireContract missing encoding for ".to_string(), coproduct_name.clone()))), -}, - None => None, -} + Some(contract) => match coproduct_wire_contract_encoding( + contract.clone(), + source_indices.clone(), + ) { + Some(encoding) => { + if (variant_encoding_is_string_variant( + encoding.clone(), + source_indices.clone(), + ) && !all_unit_variants) + { + Some(rust_serde_error_policy(v2_rt::concat("CoproductWireContract StringVariant requires a nullary-only coproduct: ".to_string(), coproduct_name.clone()))) + } else { + Some(resolve_wire_serde_policy_from_encoding_node( + &encoding, + &source_indices, + )) + } + } + None => Some(rust_serde_error_policy(v2_rt::concat( + "CoproductWireContract missing encoding for ".to_string(), + coproduct_name.clone(), + ))), + }, + None => None, + } } else { - Some(rust_serde_error_policy(v2_rt::concat("ambiguous CoproductWireContract rows for ".to_string(), coproduct_name.clone()))) + Some(rust_serde_error_policy(v2_rt::concat( + "ambiguous CoproductWireContract rows for ".to_string(), + coproduct_name.clone(), + ))) } } -} + } } pub fn build_data_item_index(modules: Rc>>) -> Rc>> { - modules.iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, tm: Rc| { - let module_name = authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone()); -Rc::new({ let mut __result = Vec::new(); for item in tm.items.clone().iter().cloned() { if is_data_def_item(&item) { __result.push(item); } } __result }).iter().cloned().fold(acc, |item_acc: Rc>>, item: Rc| { - let item_name = authored_name_at(tm.type_env.clone().source_indices.clone(), &item); -let qualified_name = v2_rt::concat(v2_rt::concat(module_name.clone(), ".".to_string()), item_name.clone()); -v2_rt::rc_map_insert(item_acc, qualified_name.clone(), item.clone()) -}) -}) + modules.iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, tm: Rc| { + let module_name = authored_name_at( + tm.type_env.clone().source_indices.clone(), + &tm.module.clone(), + ); + Rc::new({ + let mut __result = Vec::new(); + for item in tm.items.clone().iter().cloned() { + if is_data_def_item(&item) { + __result.push(item); + } + } + __result + }) + .iter() + .cloned() + .fold( + acc, + |item_acc: Rc>>, item: Rc| { + let item_name = + authored_name_at(tm.type_env.clone().source_indices.clone(), &item); + let qualified_name = v2_rt::concat( + v2_rt::concat(module_name.clone(), ".".to_string()), + item_name.clone(), + ); + v2_rt::rc_map_insert(item_acc, qualified_name.clone(), item.clone()) + }, + ) + }, + ) } -pub fn insert_scoped_data_item(scoped: &Rc>>>>, name: &String, item: Rc) -> Rc>>>> { +pub fn insert_scoped_data_item( + scoped: &Rc>>>>, + name: &String, + item: Rc, +) -> Rc>>>> { { let existing = match v2_rt::map_get(&scoped, name.clone()) { - Some(entries) => entries.clone(), - None => Rc::new(vec![]), -}; -v2_rt::rc_map_insert(scoped.clone(), name.clone(), v2_rt::concat(existing, Rc::new(vec![item]))) -} + Some(entries) => entries.clone(), + None => Rc::new(vec![]), + }; + v2_rt::rc_map_insert( + scoped.clone(), + name.clone(), + v2_rt::concat(existing, Rc::new(vec![item])), + ) + } } -pub fn build_scoped_data_item_index(typed_module: &Rc, data_items: Rc>>) -> Rc>>>> { - { - let module_name = authored_name_at(typed_module.type_env.clone().source_indices.clone(), &typed_module.module.clone()); -let local = Rc::new({ let mut __result = Vec::new(); for item in typed_module.items.clone().iter().cloned() { if is_data_def_item(&item) { __result.push(item); } } __result }).iter().cloned().fold(v2_rt::rc_empty_map::>>>(), |acc: Rc>>>>, item: Rc| insert_scoped_data_item(&acc, &authored_name_at(typed_module.type_env.clone().source_indices.clone(), &item), item.clone())); -module_imports(typed_module.module.clone()).iter().cloned().fold(local.clone(), |acc: Rc>>>>, imp: Rc| { - let import_path = authored_name_at(typed_module.type_env.clone().source_indices.clone(), &imp); -if import_is_all(imp.clone()) { - acc.clone() - } else { - import_specific_names_at(imp.clone(), typed_module.type_env.clone().source_indices.clone()).iter().cloned().fold(acc.clone(), |inner: Rc>>>>, imported_name: String| { - let qualified = v2_rt::concat(v2_rt::concat(import_path.clone(), ".".to_string()), imported_name.clone()); -match v2_rt::map_get(&data_items, qualified.clone()) { - Some(imported_item) => insert_scoped_data_item(&inner, &imported_name, imported_item.clone()), - None => inner.clone(), -} -}) +pub fn build_scoped_data_item_index( + typed_module: &Rc, + data_items: Rc>>, +) -> Rc>>>> { + { + let module_name = authored_name_at( + typed_module.type_env.clone().source_indices.clone(), + &typed_module.module.clone(), + ); + let local = Rc::new({ + let mut __result = Vec::new(); + for item in typed_module.items.clone().iter().cloned() { + if is_data_def_item(&item) { + __result.push(item); + } } -}) -} + __result + }) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::>>>(), + |acc: Rc>>>>, item: Rc| { + insert_scoped_data_item( + &acc, + &authored_name_at(typed_module.type_env.clone().source_indices.clone(), &item), + item.clone(), + ) + }, + ); + module_imports(typed_module.module.clone()) + .iter() + .cloned() + .fold( + local.clone(), + |acc: Rc>>>>, imp: Rc| { + let import_path = authored_name_at( + typed_module.type_env.clone().source_indices.clone(), + &imp, + ); + if import_is_all(imp.clone()) { + acc.clone() + } else { + import_specific_names_at( + imp.clone(), + typed_module.type_env.clone().source_indices.clone(), + ) + .iter() + .cloned() + .fold( + acc.clone(), + |inner: Rc>>>>, + imported_name: String| { + let qualified = v2_rt::concat( + v2_rt::concat(import_path.clone(), ".".to_string()), + imported_name.clone(), + ); + match v2_rt::map_get(&data_items, qualified.clone()) { + Some(imported_item) => insert_scoped_data_item( + &inner, + &imported_name, + imported_item.clone(), + ), + None => inner.clone(), + } + }, + ) + } + }, + ) + } } pub fn rust_serde_rename_template_text() -> String { - match serialization_for_target(RenderTarget::Rust).rename_attribute_template.clone() { - Some(template) => template.clone(), - None => emit_error_expr("missing serde rename_attribute_template for Rust".to_string(), RenderTarget::Rust), -} + match serialization_for_target(RenderTarget::Rust) + .rename_attribute_template + .clone() + { + Some(template) => template.clone(), + None => emit_error_expr( + "missing serde rename_attribute_template for Rust".to_string(), + RenderTarget::Rust, + ), + } } pub fn rust_test_file_path(module_name: String) -> String { { let conventions = test_conventions_for_target(RenderTarget::Rust); -let file_dir = match conventions.file_dir.clone() { - Some(dir) => dir.clone(), - None => "".to_string(), -}; -let filename = module_to_filename(module_name); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(file_dir, conventions.file_prefix.clone()), filename), conventions.file_suffix.clone()), rust_source_ext()) -} + let file_dir = match conventions.file_dir.clone() { + Some(dir) => dir.clone(), + None => "".to_string(), + }; + let filename = module_to_filename(module_name); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(file_dir, conventions.file_prefix.clone()), + filename, + ), + conventions.file_suffix.clone(), + ), + rust_source_ext(), + ) + } } pub fn rust_test_name(projection: Rc) -> String { @@ -653,549 +1282,1474 @@ pub fn rust_test_name(projection: Rc) -> String { } pub fn rust_async_test_decorator() -> String { - match test_conventions_for_target(RenderTarget::Rust).async_decorator.clone() { - Some(decorator) => decorator.clone(), - None => emit_error_expr("missing async_decorator for Rust test conventions".to_string(), RenderTarget::Rust), -} + match test_conventions_for_target(RenderTarget::Rust) + .async_decorator + .clone() + { + Some(decorator) => decorator.clone(), + None => emit_error_expr( + "missing async_decorator for Rust test conventions".to_string(), + RenderTarget::Rust, + ), + } } -pub fn emit_rust_block_stmts(mut remaining: Rc>>, mut text: Rc>, mut scope: Rc, mut registry: Rc>>, mut depth: i64, mut shared_types: Rc>, mut emit_info: Rc) -> Rc { - loop { - match remaining.clone().first().cloned() { - None => { break Rc::new(BlockEmitState { - text: text, - scope: scope.clone(), -}); }, - Some(stmt) => { let line = emit_typed_expr(stmt.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let next_scope = scope_after_expr(&stmt, &scope); -{ - let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); -let __tco_1 = v2_rt::rc_list_push(text, line); -let __tco_2 = next_scope; -remaining = __tco_0; -text = __tco_1; -scope = __tco_2; -continue; -} }, -} -} -} - -pub fn emit_rust_init_block_stmts(mut remaining: Rc>>, mut text: Rc>, mut scope: Rc, mut registry: Rc>>, mut depth: i64, mut shared_types: Rc>, mut emit_info: Rc) -> Rc { +pub fn emit_rust_block_stmts( + mut remaining: Rc>>, + mut text: Rc>, + mut scope: Rc, + mut registry: Rc>>, + mut depth: i64, + mut shared_types: Rc>, + mut emit_info: Rc, +) -> Rc { loop { match remaining.clone().first().cloned() { - None => { break Rc::new(BlockEmitState { - text: text, - scope: scope.clone(), -}); }, - Some(stmt) => { let rest = Rc::new(remaining.clone().iter().cloned().skip(1 as usize).collect::>()); -match rest.clone().first().cloned() { - None => { break Rc::new(BlockEmitState { - text: text, - scope: scope.clone(), -}); }, - Some(_) => { let raw_line = emit_typed_expr(stmt.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let is_let = match (*stmt.expr_data.clone()).clone() { - ExprData::ExprLet => true, - _ => false, -}; -let line = if is_let { - raw_line - } else { - v2_rt::concat(raw_line, ";".to_string()) - }; -let next_scope = scope_after_expr(&stmt, &scope); -{ - let __tco_0 = rest.clone(); -let __tco_1 = v2_rt::rc_list_push(text, line); -let __tco_2 = next_scope; -remaining = __tco_0; -text = __tco_1; -scope = __tco_2; -continue; -} }, -} }, -} -} + None => { + break Rc::new(BlockEmitState { + text: text, + scope: scope.clone(), + }); + } + Some(stmt) => { + let line = emit_typed_expr( + stmt.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let next_scope = scope_after_expr(&stmt, &scope); + { + let __tco_0 = Rc::new( + remaining + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + let __tco_1 = v2_rt::rc_list_push(text, line); + let __tco_2 = next_scope; + remaining = __tco_0; + text = __tco_1; + scope = __tco_2; + continue; + } + } + } + } +} + +pub fn emit_rust_init_block_stmts( + mut remaining: Rc>>, + mut text: Rc>, + mut scope: Rc, + mut registry: Rc>>, + mut depth: i64, + mut shared_types: Rc>, + mut emit_info: Rc, +) -> Rc { + loop { + match remaining.clone().first().cloned() { + None => { + break Rc::new(BlockEmitState { + text: text, + scope: scope.clone(), + }); + } + Some(stmt) => { + let rest = Rc::new( + remaining + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + match rest.clone().first().cloned() { + None => { + break Rc::new(BlockEmitState { + text: text, + scope: scope.clone(), + }); + } + Some(_) => { + let raw_line = emit_typed_expr( + stmt.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let is_let = match (*stmt.expr_data.clone()).clone() { + ExprData::ExprLet => true, + _ => false, + }; + let line = if is_let { + raw_line + } else { + v2_rt::concat(raw_line, ";".to_string()) + }; + let next_scope = scope_after_expr(&stmt, &scope); + { + let __tco_0 = rest.clone(); + let __tco_1 = v2_rt::rc_list_push(text, line); + let __tco_2 = next_scope; + remaining = __tco_0; + text = __tco_1; + scope = __tco_2; + continue; + } + } + } + } + } + } } pub fn has_complex_variants(item: &Rc) -> bool { if ((item.children.clone().len() as i64) == 0) { false } else { - { let mut __found = false; for c in item.children.clone().iter().cloned() { if (c.connective.clone() != Connective::NoConnective) { __found = true; break; } } __found } + { + let mut __found = false; + for c in item.children.clone().iter().cloned() { + if (c.connective.clone() != Connective::NoConnective) { + __found = true; + break; + } + } + __found + } } } pub fn is_simple_disj(item: Rc) -> bool { { - let complex = Rc::new({ let mut __result = Vec::new(); for v in item.children.clone().iter().cloned() { if ((v.children.clone().len() as i64) > 0) { __result.push(v); } } __result }); -((complex.len() as i64) == 0) -} + let complex = Rc::new({ + let mut __result = Vec::new(); + for v in item.children.clone().iter().cloned() { + if ((v.children.clone().len() as i64) > 0) { + __result.push(v); + } + } + __result + }); + ((complex.len() as i64) == 0) + } } pub fn is_dag_value_type_name(name: String) -> bool { match is_copy(RenderTarget::Rust, name) { - Some(v) => v.clone(), - None => false, -} + Some(v) => v.clone(), + None => false, + } } -pub fn is_type_constant(summary: &Rc, recursive_type_set: Rc>) -> bool { +pub fn is_type_constant( + summary: &Rc, + recursive_type_set: Rc>, +) -> bool { { - let is_recursive = set_contains(recursive_type_set, summary.name.clone()); -let has_generics = ((summary.generic_param_names.clone().len() as i64) > 0); -match (*summary.repr.clone()).clone() { - TypeRepr::EnumRepr { unit_only, .. } => (((unit_only.clone() && !is_recursive) && !has_generics) && !summary.has_fn_fields.clone()), - TypeRepr::StructRepr => if ((is_recursive || has_generics) || summary.has_fn_fields.clone()) { - false - } else { - { - let field_count = (Rc::new(v2_rt::map_keys(&summary.field_summaries.clone())).len() as i64); -let ft_count = (Rc::new(v2_rt::map_keys(&summary.field_type_map.clone())).len() as i64); -if (ft_count < field_count) { + let is_recursive = v2_rt::map_contains_key(&recursive_type_set, summary.name.clone()); + let has_generics = ((summary.generic_param_names.clone().len() as i64) > 0); + match (*summary.repr.clone()).clone() { + TypeRepr::EnumRepr { unit_only, .. } => { + (((unit_only.clone() && !is_recursive) && !has_generics) + && !summary.has_fn_fields.clone()) + } + TypeRepr::StructRepr => { + if ((is_recursive || has_generics) || summary.has_fn_fields.clone()) { false } else { - { let mut __all = true; for tn in Rc::new(v2_rt::map_values(&summary.field_type_map.clone())).iter().cloned() { if !(is_dag_value_type_name(tn.clone())) { __all = false; break; } } __all } + { + let field_count = + (Rc::new(v2_rt::map_keys(&summary.field_summaries.clone())).len() + as i64); + let ft_count = (Rc::new(v2_rt::map_keys(&summary.field_type_map.clone())) + .len() as i64); + if (ft_count < field_count) { + false + } else { + { + let mut __all = true; + for tn in + Rc::new(v2_rt::map_values(&summary.field_type_map.clone())) + .iter() + .cloned() + { + if !(is_dag_value_type_name(tn.clone())) { + __all = false; + break; + } + } + __all + } + } + } } -} - }, -} -} + } + } + } } -pub fn maybe_mark_shared_type(acc: Rc>, summary: &Rc, recursive_type_set: Rc>, target_needs_sharing: bool) -> Rc> { +pub fn maybe_mark_shared_type( + acc: Rc>, + summary: &Rc, + recursive_type_set: Rc>, + target_needs_sharing: bool, +) -> Rc> { { - let needs_sharing = (target_needs_sharing && match (*summary.repr.clone()).clone() { - TypeRepr::StructRepr => true, - TypeRepr::EnumRepr { unit_only, .. } => (unit_only.clone() == false), -}); -if (needs_sharing && !is_type_constant(&summary, recursive_type_set)) { - set_insert(acc, summary.name.clone()) + let needs_sharing = (target_needs_sharing + && match (*summary.repr.clone()).clone() { + TypeRepr::StructRepr => true, + TypeRepr::EnumRepr { unit_only, .. } => (unit_only.clone() == false), + }); + if (needs_sharing && !is_type_constant(&summary, recursive_type_set)) { + v2_rt::rc_map_insert(acc, summary.name.clone(), true) } else { acc } -} + } } -pub fn build_shared_types(type_summaries: Rc>>, recursive_type_set: Rc>, target: RenderTarget) -> Rc> { +pub fn build_shared_types( + type_summaries: Rc>>, + recursive_type_set: Rc>, + target: RenderTarget, +) -> Rc> { { let sharing = sharing_for_target(target); -let user_shared = Rc::new(v2_rt::map_values(&type_summaries)).iter().cloned().fold(empty_set(), |acc: Rc>, summary: Rc| maybe_mark_shared_type(acc, &summary, recursive_type_set.clone(), sharing.needs_sharing.clone())); -let collection_keys = Rc::new({ let mut __result = Vec::new(); for k in Rc::new(v2_rt::map_keys(&rust_container_templates())).iter().cloned() { if ((sharing.needs_sharing.clone() && (k.clone().as_str() != "optional".to_string().as_str())) && (k.clone().as_str() != "boolean_algebra".to_string().as_str())) { __result.push(k); } } __result }); -collection_keys.iter().cloned().fold(user_shared.clone(), |acc: Rc>, key: String| { - let pascal = to_pascal(key.clone()); -set_insert(acc, pascal.clone()) -}) -} + let user_shared = Rc::new(v2_rt::map_values(&type_summaries)) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, summary: Rc| { + maybe_mark_shared_type( + acc, + &summary, + recursive_type_set.clone(), + sharing.needs_sharing.clone(), + ) + }, + ); + let collection_keys = Rc::new({ + let mut __result = Vec::new(); + for k in Rc::new(v2_rt::map_keys(&rust_container_templates())) + .iter() + .cloned() + { + if ((sharing.needs_sharing.clone() + && (k.clone().as_str() != "optional".to_string().as_str())) + && (k.clone().as_str() != "boolean_algebra".to_string().as_str())) + { + __result.push(k); + } + } + __result + }); + collection_keys.iter().cloned().fold( + user_shared.clone(), + |acc: Rc>, key: String| { + let pascal = to_pascal(key.clone()); + v2_rt::rc_map_insert(acc, pascal.clone(), true) + }, + ) + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct OwnershipProofEntry { pub name: String, pub proof: Rc, - pub param_names: Rc>, + pub param_names: Rc>, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct OwnershipBuildResult { - pub ownership_index: Rc>>>, - pub read_only_params_index: Rc>>>, + pub ownership_index: Rc>>>, + pub read_only_params_index: Rc>>>, } pub fn build_ownership_results(modules: &Rc>>) -> Rc { { - let callable_set = modules.clone().iter().cloned().fold(empty_set(), |acc: Rc>, m: Rc| Rc::new({ let mut __result = Vec::new(); for item in m.items.clone().iter().cloned() { if (item.body.clone() != None) { __result.push(item); } } __result }).iter().cloned().fold(acc, |inner: Rc>, item: Rc| set_union(inner, collect_callable_refs(&item.body.clone().clone().unwrap(), &m.type_env.clone().source_indices.clone())))); -let proofs = Rc::new({ let mut __result = Vec::new(); for m in modules.clone().iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for item in Rc::new({ let mut __result = Vec::new(); for item in m.items.clone().iter().cloned() { if (item.body.clone() != None) { __result.push(item); } } __result }).iter().cloned() { __result.push({ - let pnames = item.params.clone().iter().cloned().fold(empty_set(), |acc: Rc>, p: Rc| set_insert(acc, param_node_name_at(p.clone(), m.type_env.clone().source_indices.clone()))); -let si = m.type_env.clone().source_indices.clone(); -let qualified = v2_rt::concat(v2_rt::concat(authored_name_at(si.clone(), &m.module.clone()), ".".to_string()), authored_name_at(si.clone(), &item)); -Rc::new(OwnershipProofEntry { - name: qualified.clone(), - proof: analyze_ownership(authored_name_at(si.clone(), &item), item.params.clone(), item.body.clone().clone().unwrap(), &si), - param_names: pnames.clone(), -}) -}); } __result })).iter().cloned()); } __result }); -proofs.iter().cloned().fold(Rc::new(OwnershipBuildResult { - ownership_index: v2_rt::rc_empty_map::>>(), - read_only_params_index: v2_rt::rc_empty_map::>>(), -}), |acc: Rc, entry: Rc| { let acc = Rc::try_unwrap(acc).unwrap_or_else(|rc| (*rc).clone()); { - let read_only = if set_contains(callable_set.clone(), entry.proof.clone().func_name.clone()) { - empty_set() - } else { - build_read_only_params(entry.proof.clone(), entry.param_names.clone()) - }; -let movable = build_movable_set(entry.proof.clone()); -Rc::new(OwnershipBuildResult { - ownership_index: v2_rt::rc_map_insert(acc.ownership_index, entry.name.clone(), movable.clone()), - read_only_params_index: v2_rt::rc_map_insert(acc.read_only_params_index, entry.name.clone(), read_only.clone()), -}) -} }) -} + let callable_set = modules.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, m: Rc| { + Rc::new({ + let mut __result = Vec::new(); + for item in m.items.clone().iter().cloned() { + if (item.body.clone() != None) { + __result.push(item); + } + } + __result + }) + .iter() + .cloned() + .fold(acc, |inner: Rc>, item: Rc| { + v2_rt::rc_map_merge( + inner, + collect_callable_refs( + &item.body.clone().clone().unwrap(), + &m.type_env.clone().source_indices.clone(), + ), + ) + }) + }, + ); + let proofs = Rc::new({ + let mut __result = Vec::new(); + for m in modules.clone().iter().cloned() { + __result.extend( + (*Rc::new({ + let mut __result = Vec::new(); + for item in Rc::new({ + let mut __result = Vec::new(); + for item in m.items.clone().iter().cloned() { + if (item.body.clone() != None) { + __result.push(item); + } + } + __result + }) + .iter() + .cloned() + { + __result.push({ + let pnames = item.params.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, p: Rc| { + v2_rt::rc_map_insert( + acc, + param_node_name_at( + p.clone(), + m.type_env.clone().source_indices.clone(), + ), + true, + ) + }, + ); + let si = m.type_env.clone().source_indices.clone(); + let qualified = v2_rt::concat( + v2_rt::concat( + authored_name_at(si.clone(), &m.module.clone()), + ".".to_string(), + ), + authored_name_at(si.clone(), &item), + ); + Rc::new(OwnershipProofEntry { + name: qualified.clone(), + proof: analyze_ownership( + authored_name_at(si.clone(), &item), + item.params.clone(), + item.body.clone().clone().unwrap(), + &si, + ), + param_names: pnames.clone(), + }) + }); + } + __result + })) + .iter() + .cloned(), + ); + } + __result + }); + proofs.iter().cloned().fold( + Rc::new(OwnershipBuildResult { + ownership_index: v2_rt::rc_empty_map::>>(), + read_only_params_index: v2_rt::rc_empty_map::>>(), + }), + |acc: Rc, entry: Rc| { + let acc = Rc::try_unwrap(acc).unwrap_or_else(|rc| (*rc).clone()); + { + let read_only = if v2_rt::map_contains_key( + &callable_set, + entry.proof.clone().func_name.clone(), + ) { + v2_rt::rc_empty_map::() + } else { + build_read_only_params(entry.proof.clone(), entry.param_names.clone()) + }; + let movable = build_movable_set(entry.proof.clone()); + Rc::new(OwnershipBuildResult { + ownership_index: v2_rt::rc_map_insert( + acc.ownership_index, + entry.name.clone(), + movable.clone(), + ), + read_only_params_index: v2_rt::rc_map_insert( + acc.read_only_params_index, + entry.name.clone(), + read_only.clone(), + ), + }) + } + }, + ) + } } pub fn emit_rust(typed: &Rc) -> Rc { { let base_info = build_emit_graph_info(&typed.modules.clone()); -let ownership = build_ownership_results(&typed.modules.clone()); -let shared = build_shared_types(base_info.type_summaries.clone(), base_info.recursive_type_set.clone(), RenderTarget::Rust); -let emit_info = Rc::new(EmitGraphInfo { - type_summaries: base_info.type_summaries.clone(), - recursive_type_set: base_info.recursive_type_set.clone(), - fielded_variants: base_info.fielded_variants.clone(), - untagged_json_tuple_variants: base_info.untagged_json_tuple_variants.clone(), - shared_types: shared, - ownership_index: ownership.ownership_index.clone(), - movable: empty_set(), - variant_to_enum: base_info.variant_to_enum.clone(), - owned_bindings: empty_set(), - read_only_params_index: ownership.read_only_params_index.clone(), - read_only_params: empty_set(), -}); -let shared_types = emit_info.shared_types.clone(); -let registry = typed.item_registry.clone(); -let data_items = build_data_item_index(typed.modules.clone()); -let workflow_funcs = collect_workflow_funcs(typed.modules.clone(), registry.clone(), emit_info.read_only_params_index.clone()); -let workflow_default_diags = validate_workflow_param_defaults(workflow_funcs.clone()); -if ((workflow_default_diags.clone().len() as i64) > 0) { + let ownership = build_ownership_results(&typed.modules.clone()); + let shared = build_shared_types( + base_info.type_summaries.clone(), + base_info.recursive_type_set.clone(), + RenderTarget::Rust, + ); + let emit_info = Rc::new(EmitGraphInfo { + type_summaries: base_info.type_summaries.clone(), + recursive_type_set: base_info.recursive_type_set.clone(), + fielded_variants: base_info.fielded_variants.clone(), + shared_types: shared, + ownership_index: ownership.ownership_index.clone(), + movable: v2_rt::rc_empty_map::(), + variant_to_enum: base_info.variant_to_enum.clone(), + owned_bindings: v2_rt::rc_empty_map::(), + read_only_params_index: ownership.read_only_params_index.clone(), + read_only_params: v2_rt::rc_empty_map::(), + }); + let shared_types = emit_info.shared_types.clone(); + let registry = typed.item_registry.clone(); + let data_items = build_data_item_index(typed.modules.clone()); + let workflow_funcs = collect_workflow_funcs( + typed.modules.clone(), + registry.clone(), + emit_info.read_only_params_index.clone(), + ); + let workflow_default_diags = validate_workflow_param_defaults(workflow_funcs.clone()); + if ((workflow_default_diags.clone().len() as i64) > 0) { return Rc::new(EmitResult { - files: Rc::new(vec![]), - diagnostics: workflow_default_diags.clone(), -}) - } -let svc_module_map = typed.modules.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, tm: Rc| { - let svc_items = Rc::new({ let mut __result = Vec::new(); for item in tm.items.clone().iter().cloned() { if is_service_item(&item) { __result.push(item); } } __result }); -let mod_filename = module_to_filename(authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone())); -svc_items.clone().iter().cloned().fold(acc, |a: Rc>, svc: Rc| v2_rt::rc_map_insert(a, authored_name_at(tm.type_env.clone().source_indices.clone(), &svc), mod_filename.clone())) -}); -let test_projections = extract_test_projections(typed.clone()); -let module_files = Rc::new({ let mut __result = Vec::new(); for tm in typed.modules.clone().iter().cloned() { __result.push(emit_module_full(&tm, ®istry, &emit_info, shared_types.clone(), svc_module_map.clone(), data_items.clone())); } __result }); -let test_files = Rc::new({ let mut __result = Vec::new(); for f in Rc::new({ let mut __result = Vec::new(); for tm in typed.modules.clone().iter().cloned() { __result.push(emit_test_file(&authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone()), Rc::new({ let mut __result = Vec::new(); for p in test_projections.clone().iter().cloned() { if (p.module_name.clone().as_str() == authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone()).as_str()) { __result.push(p); } } __result }))); } __result }).iter().cloned() { if (f.path.clone().as_str() != "".to_string().as_str()) { __result.push(f); } } __result }); -let has_services = has_service_items(typed.clone()); -let has_pipeline = { let mut __found = false; for m in typed.modules.clone().iter().cloned() { if (authored_name_at(m.type_env.clone().source_indices.clone(), &m.module.clone()).as_str() == "v2.compiler.compile".to_string().as_str()) { __found = true; break; } } __found }; -let crate_name = if has_pipeline.clone() { + files: Rc::new(vec![]), + diagnostics: workflow_default_diags.clone(), + }); + } + let svc_module_map = typed.modules.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, tm: Rc| { + let svc_items = Rc::new({ + let mut __result = Vec::new(); + for item in tm.items.clone().iter().cloned() { + if is_service_item(&item) { + __result.push(item); + } + } + __result + }); + let mod_filename = module_to_filename(authored_name_at( + tm.type_env.clone().source_indices.clone(), + &tm.module.clone(), + )); + svc_items.clone().iter().cloned().fold( + acc, + |a: Rc>, svc: Rc| { + v2_rt::rc_map_insert( + a, + authored_name_at(tm.type_env.clone().source_indices.clone(), &svc), + mod_filename.clone(), + ) + }, + ) + }, + ); + let test_projections = extract_test_projections(typed.clone()); + let module_files = Rc::new({ + let mut __result = Vec::new(); + for tm in typed.modules.clone().iter().cloned() { + __result.push(emit_module_full( + &tm, + ®istry, + &emit_info, + shared_types.clone(), + svc_module_map.clone(), + data_items.clone(), + )); + } + __result + }); + let test_files = Rc::new({ + let mut __result = Vec::new(); + for f in Rc::new({ + let mut __result = Vec::new(); + for tm in typed.modules.clone().iter().cloned() { + __result.push(emit_test_file( + &authored_name_at( + tm.type_env.clone().source_indices.clone(), + &tm.module.clone(), + ), + Rc::new({ + let mut __result = Vec::new(); + for p in test_projections.clone().iter().cloned() { + if (p.module_name.clone().as_str() + == authored_name_at( + tm.type_env.clone().source_indices.clone(), + &tm.module.clone(), + ) + .as_str()) + { + __result.push(p); + } + } + __result + }), + )); + } + __result + }) + .iter() + .cloned() + { + if (f.path.clone().as_str() != "".to_string().as_str()) { + __result.push(f); + } + } + __result + }); + let has_services = has_service_items(typed.clone()); + let has_pipeline = { + let mut __found = false; + for m in typed.modules.clone().iter().cloned() { + if (authored_name_at(m.type_env.clone().source_indices.clone(), &m.module.clone()) + .as_str() + == "v2.compiler.compile".to_string().as_str()) + { + __found = true; + break; + } + } + __found + }; + let crate_name = if has_pipeline.clone() { "v2_compiler".to_string() } else { "v2_compiled".to_string() }; -let cargo = emit_cargo_toml(crate_name.clone(), has_services.clone()); -let main_file = emit_main_rs(&workflow_funcs, &typed.modules.clone(), &has_services, &crate_name, svc_module_map.clone()); -let rt_file = emit_v2_rt_module(); -let compiler_tests_file = if has_pipeline.clone() { + let cargo = emit_cargo_toml(crate_name.clone(), has_services.clone()); + let main_file = emit_main_rs( + &workflow_funcs, + &typed.modules.clone(), + &has_services, + &crate_name, + svc_module_map.clone(), + ); + let rt_file = emit_v2_rt_module(); + let compiler_tests_file = if has_pipeline.clone() { Rc::new(vec![emit_compiler_tests_module()]) } else { Rc::new(vec![]) }; -let dry_run_file = if has_services.clone() { + let dry_run_file = if has_services.clone() { Rc::new(vec![emit_dry_run_module()]) } else { Rc::new(vec![]) }; -let all_mod_files = v2_rt::concat(v2_rt::concat(module_files, Rc::new(vec![rt_file])), dry_run_file); -let lib_file = emit_lib_rs_from_files(all_mod_files.clone(), &has_pipeline); -let files = v2_rt::concat(v2_rt::concat(v2_rt::concat(Rc::new(vec![cargo, lib_file, main_file]), all_mod_files.clone()), compiler_tests_file), test_files); -Rc::new(EmitResult { - files: files, - diagnostics: Rc::new(vec![]), -}) -} + let all_mod_files = v2_rt::concat( + v2_rt::concat(module_files, Rc::new(vec![rt_file])), + dry_run_file, + ); + let lib_file = emit_lib_rs_from_files(all_mod_files.clone(), &has_pipeline); + let files = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + Rc::new(vec![cargo, lib_file, main_file]), + all_mod_files.clone(), + ), + compiler_tests_file, + ), + test_files, + ); + Rc::new(EmitResult { + files: files, + diagnostics: Rc::new(vec![]), + }) + } } pub fn emit_v2_rt_module() -> Rc { Rc::new(TextFile { - path: v2_rt::concat(v2_rt::concat(rust_source_root(), "v2_rt".to_string()), rust_source_ext()), - content: rust_runtime_source(), -}) + path: v2_rt::concat( + v2_rt::concat(rust_source_root(), "v2_rt".to_string()), + rust_source_ext(), + ), + content: rust_runtime_source(), + }) } pub fn emit_compiler_tests_module() -> Rc { Rc::new(TextFile { - path: v2_rt::concat(v2_rt::concat(rust_source_root(), "compiler_tests".to_string()), rust_source_ext()), - content: compiler_tests_source(), -}) + path: v2_rt::concat( + v2_rt::concat(rust_source_root(), "compiler_tests".to_string()), + rust_source_ext(), + ), + content: compiler_tests_source(), + }) } -pub fn emit_lib_rs_from_files(all_module_files: Rc>>, has_compiler_tests: &bool) -> Rc { +pub fn emit_lib_rs_from_files( + all_module_files: Rc>>, + has_compiler_tests: &bool, +) -> Rc { { let src_prefix_len = v2_rt::string_length(&rust_source_root()); -let ext_len = v2_rt::string_length(&rust_source_ext()); -let mod_decls = Rc::new({ let mut __result = Vec::new(); for f in all_module_files.iter().cloned() { __result.push({ - let path_len = v2_rt::string_length(&f.path.clone()); -let mod_name = v2_rt::substring(&f.path.clone(), src_prefix_len.clone(), (path_len.clone() - ext_len.clone())); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), rust_items().module_keyword.clone()), " ".to_string()), mod_name.clone()), ";".to_string()) -}); } __result }); -let hand_maintained_mods = if has_compiler_tests.clone() { + let ext_len = v2_rt::string_length(&rust_source_ext()); + let mod_decls = Rc::new({ + let mut __result = Vec::new(); + for f in all_module_files.iter().cloned() { + __result.push({ + let path_len = v2_rt::string_length(&f.path.clone()); + let mod_name = v2_rt::substring( + &f.path.clone(), + src_prefix_len.clone(), + (path_len.clone() - ext_len.clone()), + ); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + rust_visibility_prefix(), + rust_items().module_keyword.clone(), + ), + " ".to_string(), + ), + mod_name.clone(), + ), + ";".to_string(), + ) + }); + } + __result + }); + let hand_maintained_mods = if has_compiler_tests.clone() { "\npub mod v2_interpreter;\npub mod cli_run;\npub mod rest_transport_facts;".to_string() } else { "".to_string() }; -let test_mod = if has_compiler_tests.clone() { + let test_mod = if has_compiler_tests.clone() { "\n\n#[cfg(test)]\nmod compiler_tests;".to_string() } else { "".to_string() }; -let shared_types = emit_non_empty_wrappers(); -let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("// Generated by v2 compiler -- do not edit.\n\n".to_string(), "#![allow(unused_imports, unused_variables, unused_mut, unused_parens, dead_code, unreachable_patterns, non_shorthand_field_patterns, suspicious_double_ref_op, clippy::all)]\n\n".to_string()), mod_decls.join(&"\n".to_string())), hand_maintained_mods), "\n\n".to_string()), shared_types), test_mod); -Rc::new(TextFile { - path: v2_rt::concat(v2_rt::concat(rust_source_root(), "lib".to_string()), rust_source_ext()), - content: v2_rt::concat(content, "\n".to_string()), -}) -} + let shared_types = emit_non_empty_wrappers(); + let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("// Generated by v2 compiler -- do not edit.\n\n".to_string(), "#![allow(unused_imports, unused_variables, unused_mut, unused_parens, dead_code, unreachable_patterns, non_shorthand_field_patterns, suspicious_double_ref_op, clippy::all)]\n\n".to_string()), mod_decls.join(&"\n".to_string())), hand_maintained_mods), "\n\n".to_string()), shared_types), test_mod); + Rc::new(TextFile { + path: v2_rt::concat( + v2_rt::concat(rust_source_root(), "lib".to_string()), + rust_source_ext(), + ), + content: v2_rt::concat(content, "\n".to_string()), + }) + } } -pub fn emit_module(typed_module: &Rc, registry: Rc>>) -> Rc { +pub fn emit_module( + typed_module: &Rc, + registry: Rc>>, +) -> Rc { { let base_info = build_emit_graph_info(&Rc::new(vec![typed_module.clone()])); -let shared = build_shared_types(base_info.type_summaries.clone(), base_info.recursive_type_set.clone(), RenderTarget::Rust); -let emit_info = Rc::new(EmitGraphInfo { - type_summaries: base_info.type_summaries.clone(), - recursive_type_set: base_info.recursive_type_set.clone(), - fielded_variants: base_info.fielded_variants.clone(), - untagged_json_tuple_variants: base_info.untagged_json_tuple_variants.clone(), - shared_types: shared, - ownership_index: base_info.ownership_index.clone(), - movable: base_info.movable.clone(), - variant_to_enum: base_info.variant_to_enum.clone(), - owned_bindings: empty_set(), - read_only_params_index: base_info.read_only_params_index.clone(), - read_only_params: empty_set(), -}); -let shared_types = emit_info.shared_types.clone(); -emit_module_full(&typed_module, ®istry, &emit_info, shared_types, v2_rt::rc_empty_map::(), build_data_item_index(Rc::new(vec![typed_module.clone()]))) -} + let shared = build_shared_types( + base_info.type_summaries.clone(), + base_info.recursive_type_set.clone(), + RenderTarget::Rust, + ); + let emit_info = Rc::new(EmitGraphInfo { + type_summaries: base_info.type_summaries.clone(), + recursive_type_set: base_info.recursive_type_set.clone(), + fielded_variants: base_info.fielded_variants.clone(), + shared_types: shared, + ownership_index: base_info.ownership_index.clone(), + movable: base_info.movable.clone(), + variant_to_enum: base_info.variant_to_enum.clone(), + owned_bindings: v2_rt::rc_empty_map::(), + read_only_params_index: base_info.read_only_params_index.clone(), + read_only_params: v2_rt::rc_empty_map::(), + }); + let shared_types = emit_info.shared_types.clone(); + emit_module_full( + &typed_module, + ®istry, + &emit_info, + shared_types, + v2_rt::rc_empty_map::(), + build_data_item_index(Rc::new(vec![typed_module.clone()])), + ) + } } -pub fn emit_module_full(typed_module: &Rc, registry: &Rc>>, emit_info: &Rc, shared_types: Rc>, svc_module_map: Rc>, data_items: Rc>>) -> Rc { +pub fn emit_module_full( + typed_module: &Rc, + registry: &Rc>>, + emit_info: &Rc, + shared_types: Rc>, + svc_module_map: Rc>, + data_items: Rc>>, +) -> Rc { { let m = typed_module.module.clone(); -let scope = module_emit_scope(&typed_module); -let scoped_data_items = build_scoped_data_item_index(&typed_module, data_items); -let prelude = emit_prelude(); -let local_type_names = Rc::new({ let mut __result = Vec::new(); for item in Rc::new({ let mut __result = Vec::new(); for item in typed_module.items.clone().iter().cloned() { if ((is_type_def_item(&item) || is_type_alias_item(&item, scope.type_env.clone().source_indices.clone())) || is_type_decl_item(&item, scope.type_env.clone().source_indices.clone())) { __result.push(item); } } __result }).iter().cloned() { __result.push(authored_name(scope.type_env.clone(), item.clone())); } __result }); -let imports_str = emit_imports(&module_imports(m.clone()), emit_info.clone(), registry.clone(), local_type_names, scope.type_env.clone().source_indices.clone()); -let imports_section = if (imports_str.clone().as_str() == "".to_string().as_str()) { + let scope = module_emit_scope(&typed_module); + let scoped_data_items = build_scoped_data_item_index(&typed_module, data_items); + let prelude = emit_prelude(); + let local_type_names = Rc::new({ + let mut __result = Vec::new(); + for item in Rc::new({ + let mut __result = Vec::new(); + for item in typed_module.items.clone().iter().cloned() { + if ((is_type_def_item(&item) + || is_type_alias_item( + &item, + scope.type_env.clone().source_indices.clone(), + )) + || is_type_decl_item(&item, scope.type_env.clone().source_indices.clone())) + { + __result.push(item); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(authored_name(scope.type_env.clone(), item.clone())); + } + __result + }); + let imports_str = emit_imports( + &module_imports(m.clone()), + emit_info.clone(), + registry.clone(), + local_type_names, + scope.type_env.clone().source_indices.clone(), + ); + let imports_section = if (imports_str.clone().as_str() == "".to_string().as_str()) { "".to_string() } else { v2_rt::concat("\n".to_string(), imports_str.clone()) }; -let this_mod_filename = module_to_filename(authored_name(scope.type_env.clone(), m.clone())); -let all_svc_names = Rc::new({ let mut __result = Vec::new(); for item in typed_module.items.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(®istry, authored_name(scope.type_env.clone(), item.clone())) { - Some(info) => info.service_names.clone(), - None => Rc::new(vec![]), -}).iter().cloned()); } __result }); -let extern_svc_imports = Rc::new({ let mut __result = Vec::new(); for sn in unique_strings(all_svc_names).iter().cloned() { __result.extend((*match v2_rt::map_get(&svc_module_map, sn.clone()) { - Some(mod_file) => if (mod_file.clone().as_str() == this_mod_filename.clone().as_str()) { - Rc::new(vec![]) - } else { - Rc::new(vec![v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), "use crate::".to_string()), mod_file.clone()), "::".to_string()), sanitize_service_name(sn.clone())), ";".to_string())]) - }, - None => Rc::new(vec![]), -}).iter().cloned()); } __result }); -let svc_imports_str = if ((extern_svc_imports.clone().len() as i64) == 0) { - "".to_string() - } else { - v2_rt::concat("\n".to_string(), extern_svc_imports.clone().join(&"\n".to_string())) - }; -let local_enum_uses = Rc::new({ let mut __result = Vec::new(); for item in Rc::new({ let mut __result = Vec::new(); for item in typed_module.items.clone().iter().cloned() { if (is_type_def_item(&item) && is_coproduct_type(item.clone())) { __result.push(item); } } __result }).iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat("use self::".to_string(), authored_name(scope.type_env.clone(), item.clone())), "::*;".to_string())); } __result }); -let local_coproduct_names = Rc::new({ let mut __result = Vec::new(); for item in Rc::new({ let mut __result = Vec::new(); for item in typed_module.items.clone().iter().cloned() { if (is_type_def_item(&item) && is_coproduct_type(item.clone())) { __result.push(item); } } __result }).iter().cloned() { __result.push(authored_name(scope.type_env.clone(), item.clone())); } __result }); -let module_import_items = module_imports(m.clone()); -let coproduct_wire_contract_validations = emit_coproduct_wire_contract_validations(&typed_module.items.clone(), module_import_items.clone(), local_coproduct_names, scope.type_env.clone().source_indices.clone()); -let coproduct_wire_contract_validation_section = if (coproduct_wire_contract_validations.clone().as_str() == "".to_string().as_str()) { + let this_mod_filename = + module_to_filename(authored_name(scope.type_env.clone(), m.clone())); + let all_svc_names = Rc::new({ + let mut __result = Vec::new(); + for item in typed_module.items.clone().iter().cloned() { + __result.extend( + (*match v2_rt::map_get( + ®istry, + authored_name(scope.type_env.clone(), item.clone()), + ) { + Some(info) => info.service_names.clone(), + None => Rc::new(vec![]), + }) + .iter() + .cloned(), + ); + } + __result + }); + let extern_svc_imports = Rc::new({ + let mut __result = Vec::new(); + for sn in unique_strings(all_svc_names).iter().cloned() { + __result.extend( + (*match v2_rt::map_get(&svc_module_map, sn.clone()) { + Some(mod_file) => { + if (mod_file.clone().as_str() == this_mod_filename.clone().as_str()) { + Rc::new(vec![]) + } else { + Rc::new(vec![v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + rust_visibility_prefix(), + "use crate::".to_string(), + ), + mod_file.clone(), + ), + "::".to_string(), + ), + sanitize_service_name(sn.clone()), + ), + ";".to_string(), + )]) + } + } + None => Rc::new(vec![]), + }) + .iter() + .cloned(), + ); + } + __result + }); + let svc_imports_str = if ((extern_svc_imports.clone().len() as i64) == 0) { "".to_string() } else { - v2_rt::concat(coproduct_wire_contract_validations.clone(), "\n\n".to_string()) + v2_rt::concat( + "\n".to_string(), + extern_svc_imports.clone().join(&"\n".to_string()), + ) }; -let local_uses_str = if ((local_enum_uses.clone().len() as i64) == 0) { + let local_enum_uses = Rc::new({ + let mut __result = Vec::new(); + for item in Rc::new({ + let mut __result = Vec::new(); + for item in typed_module.items.clone().iter().cloned() { + if (is_type_def_item(&item) && is_coproduct_type(item.clone())) { + __result.push(item); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(v2_rt::concat( + v2_rt::concat( + "use self::".to_string(), + authored_name(scope.type_env.clone(), item.clone()), + ), + "::*;".to_string(), + )); + } + __result + }); + let local_coproduct_names = Rc::new({ + let mut __result = Vec::new(); + for item in Rc::new({ + let mut __result = Vec::new(); + for item in typed_module.items.clone().iter().cloned() { + if (is_type_def_item(&item) && is_coproduct_type(item.clone())) { + __result.push(item); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(authored_name(scope.type_env.clone(), item.clone())); + } + __result + }); + let module_import_items = module_imports(m.clone()); + let coproduct_wire_contract_validations = emit_coproduct_wire_contract_validations( + &typed_module.items.clone(), + module_import_items.clone(), + local_coproduct_names, + scope.type_env.clone().source_indices.clone(), + ); + let coproduct_wire_contract_validation_section = + if (coproduct_wire_contract_validations.clone().as_str() == "".to_string().as_str()) { + "".to_string() + } else { + v2_rt::concat( + coproduct_wire_contract_validations.clone(), + "\n\n".to_string(), + ) + }; + let local_uses_str = if ((local_enum_uses.clone().len() as i64) == 0) { "".to_string() } else { - v2_rt::concat("\n".to_string(), local_enum_uses.clone().join(&"\n".to_string())) + v2_rt::concat( + "\n".to_string(), + local_enum_uses.clone().join(&"\n".to_string()), + ) }; -let wire_contract_item = Rc::new({ let mut __result = Vec::new(); for i in typed_module.items.clone().iter().cloned() { if (item_binding_is_named(scope.type_env.clone(), &i, &"wire_contract".to_string()) && match v2_rt::map_get(&scope.item_registry.clone(), "wire_contract".to_string()) { - Some(info) => (info.kind.clone() == ItemKind::DataItem), - None => false, -}) { __result.push(i); } } __result }).first().cloned(); -let items_str = Rc::new({ let mut __result = Vec::new(); for item in typed_module.items.clone().iter().cloned() { __result.push(emit_typed_item(&item, authored_name(scope.type_env.clone(), m.clone()), ®istry, &scope, shared_types.clone(), &emit_info, wire_contract_item.clone(), scoped_data_items.clone(), typed_module.items.clone(), module_import_items.clone())); } __result }).join(&"\n\n".to_string()); -let raw_filename = module_to_filename(authored_name(scope.type_env.clone(), m.clone())); -let filename = if (raw_filename.clone().as_str() == "main".to_string().as_str()) { + let wire_contract_item = Rc::new({ + let mut __result = Vec::new(); + for i in typed_module.items.clone().iter().cloned() { + if (item_binding_is_named(scope.type_env.clone(), &i, &"wire_contract".to_string()) + && match v2_rt::map_get( + &scope.item_registry.clone(), + "wire_contract".to_string(), + ) { + Some(info) => (info.kind.clone() == ItemKind::DataItem), + None => false, + }) + { + __result.push(i); + } + } + __result + }) + .first() + .cloned(); + let items_str = Rc::new({ + let mut __result = Vec::new(); + for item in typed_module.items.clone().iter().cloned() { + __result.push(emit_typed_item( + &item, + authored_name(scope.type_env.clone(), m.clone()), + ®istry, + &scope, + shared_types.clone(), + &emit_info, + wire_contract_item.clone(), + scoped_data_items.clone(), + typed_module.items.clone(), + module_import_items.clone(), + )); + } + __result + }) + .join(&"\n\n".to_string()); + let raw_filename = module_to_filename(authored_name(scope.type_env.clone(), m.clone())); + let filename = if (raw_filename.clone().as_str() == "main".to_string().as_str()) { "main_mod".to_string() } else { raw_filename.clone() }; -let module_attrs = if (authored_name(scope.type_env.clone(), m.clone()).as_str() == "std.error_primitives".to_string().as_str()) { + let module_attrs = if (authored_name(scope.type_env.clone(), m.clone()).as_str() + == "std.error_primitives".to_string().as_str()) + { "#![allow(non_camel_case_types)]\n\n".to_string() } else { "".to_string() }; -let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("// Generated by v2 compiler -- do not edit.\n".to_string(), "// Source module: ".to_string()), authored_name(scope.type_env.clone(), m.clone())), "\n\n".to_string()), module_attrs), prelude), imports_section), svc_imports_str), local_uses_str), "\n\n".to_string()), coproduct_wire_contract_validation_section), items_str), "\n".to_string()); -Rc::new(TextFile { - path: v2_rt::concat(v2_rt::concat(rust_source_root(), filename), rust_source_ext()), - content: content, -}) -} + let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("// Generated by v2 compiler -- do not edit.\n".to_string(), "// Source module: ".to_string()), authored_name(scope.type_env.clone(), m.clone())), "\n\n".to_string()), module_attrs), prelude), imports_section), svc_imports_str), local_uses_str), "\n\n".to_string()), coproduct_wire_contract_validation_section), items_str), "\n".to_string()); + Rc::new(TextFile { + path: v2_rt::concat( + v2_rt::concat(rust_source_root(), filename), + rust_source_ext(), + ), + content: content, + }) + } } pub fn emit_import_name(n: &String, registry: Rc>>) -> String { { let is_data = match v2_rt::map_get(®istry, n.clone()) { - Some(info) => (info.kind.clone() == ItemKind::DataItem), - None => false, -}; -if is_data { + Some(info) => (info.kind.clone() == ItemKind::DataItem), + None => false, + }; + if is_data { to_snake(n.clone()) } else { n.clone() } -} + } } -pub fn emit_imports(imports: &Rc>>, emit_info: Rc, registry: Rc>>, local_names: Rc>, source_indices: Rc>>) -> String { +pub fn emit_imports( + imports: &Rc>>, + emit_info: Rc, + registry: Rc>>, + local_names: Rc>, + source_indices: Rc>>, +) -> String { if ((imports.clone().len() as i64) == 0) { "".to_string() } else { { let type_summaries = emit_info.type_summaries.clone(); -let import_lines = Rc::new({ let mut __result = Vec::new(); for imp in imports.clone().iter().cloned() { __result.push({ - let mod_name = module_to_filename(authored_name_at(source_indices.clone(), &imp)); -if import_is_all(imp.clone()) { - v2_rt::concat(v2_rt::concat("use crate::".to_string(), mod_name.clone()), "::*;".to_string()) - } else { - { - let specific_names = import_specific_names_at(imp.clone(), source_indices.clone()); -let filtered_names = Rc::new({ let mut __result = Vec::new(); for n in specific_names.clone().iter().cloned() { if { let mut __all = true; for ln in local_names.clone().iter().cloned() { if !((ln.clone().as_str() != n.clone().as_str())) { __all = false; break; } } __all } { __result.push(n); } } __result }); -if ((filtered_names.clone().len() as i64) == 0) { - "".to_string() + let import_lines = Rc::new({ + let mut __result = Vec::new(); + for imp in imports.clone().iter().cloned() { + __result.push({ + let mod_name = + module_to_filename(authored_name_at(source_indices.clone(), &imp)); + if import_is_all(imp.clone()) { + v2_rt::concat( + v2_rt::concat("use crate::".to_string(), mod_name.clone()), + "::*;".to_string(), + ) } else { { - let deduped_names = unique_strings(filtered_names.clone()); -let top_level = Rc::new({ let mut __result = Vec::new(); for n in deduped_names.clone().iter().cloned() { if if is_known_variant(type_summaries.clone(), n.clone()) { - is_enum_in_summaries(type_summaries.clone(), n.clone()) - } else { - true - } { __result.push(n); } } __result }); -let all_enum_names = Rc::new({ let mut __result = Vec::new(); for n in Rc::new(v2_rt::map_keys(&type_summaries)).iter().cloned() { if is_enum_in_summaries(type_summaries.clone(), n.clone()) { __result.push(n); } } __result }); -let imported_enums = Rc::new({ let mut __result = Vec::new(); for n in deduped_names.clone().iter().cloned() { if is_enum_in_summaries(type_summaries.clone(), n.clone()) { __result.push(n); } } __result }); -let all_parents = Rc::new({ let mut __result = Vec::new(); for p in Rc::new({ let mut __result = Vec::new(); for n in deduped_names.clone().iter().cloned() { __result.push(if is_enum_in_summaries(type_summaries.clone(), n.clone()) { + let specific_names = + import_specific_names_at(imp.clone(), source_indices.clone()); + let filtered_names = Rc::new({ + let mut __result = Vec::new(); + for n in specific_names.clone().iter().cloned() { + if { + let mut __all = true; + for ln in local_names.clone().iter().cloned() { + if !(ln.clone().as_str() != n.clone().as_str()) { + __all = false; + break; + } + } + __all + } { + __result.push(n); + } + } + __result + }); + if ((filtered_names.clone().len() as i64) == 0) { "".to_string() } else { - match find_variant_parent(type_summaries.clone(), n.clone(), imported_enums.clone()) { - Some(parent) => parent.clone(), - None => match find_variant_parent(type_summaries.clone(), n.clone(), all_enum_names.clone()) { - Some(parent) => parent.clone(), - None => "".to_string(), -}, -} - }); } __result }).iter().cloned() { if (p.clone().as_str() != "".to_string().as_str()) { __result.push(p); } } __result }); -let parent_list = unique_strings(all_parents.clone()); -let top_with_parents = unique_strings(v2_rt::concat(top_level.clone(), parent_list.clone())); -let main_line = if ((top_with_parents.clone().len() as i64) > 0) { { - let names_str = Rc::new({ let mut __result = Vec::new(); for n in top_with_parents.clone().iter().cloned() { __result.push(emit_import_name(&n, registry.clone())); } __result }).join(&", ".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), "use crate::".to_string()), mod_name.clone()), "::{".to_string()), names_str.clone()), "};".to_string()) -} - } else { - "".to_string() - }; -let variant_lines = Rc::new({ let mut __result = Vec::new(); for parent in parent_list.clone().iter().cloned() { __result.push({ - let variants = Rc::new({ let mut __result = Vec::new(); for n in deduped_names.clone().iter().cloned() { if if is_enum_in_summaries(type_summaries.clone(), n.clone()) { - false - } else { - match find_variant_parent(type_summaries.clone(), n.clone(), Rc::new(vec![parent.clone()])) { - Some(_) => true, - None => false, -} - } { __result.push(n); } } __result }); -let vars_str = variants.clone().join(&", ".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("use crate::".to_string(), mod_name.clone()), "::".to_string()), parent.clone()), "::{".to_string()), vars_str.clone()), "};".to_string()) -}); } __result }); -let imported_enums = Rc::new({ let mut __result = Vec::new(); for n in top_level.clone().iter().cloned() { if is_enum_in_summaries(type_summaries.clone(), n.clone()) { __result.push(n); } } __result }); -let wildcard_enum_lines = Rc::new({ let mut __result = Vec::new(); for en in Rc::new({ let mut __result = Vec::new(); for en in imported_enums.clone().iter().cloned() { if ({ let mut __found = false; for p in parent_list.clone().iter().cloned() { if (p.clone().as_str() == en.clone().as_str()) { __found = true; break; } } __found } == false) { __result.push(en); } } __result }).iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("use crate::".to_string(), mod_name.clone()), "::".to_string()), en.clone()), "::*;".to_string())); } __result }); -let all_lines = if (main_line.clone().as_str() != "".to_string().as_str()) { - v2_rt::concat(v2_rt::concat(Rc::new(vec![main_line.clone()]), Rc::new({ let mut __result = Vec::new(); for l in variant_lines.clone().iter().cloned() { if (l.clone().as_str() != "".to_string().as_str()) { __result.push(l); } } __result })), wildcard_enum_lines.clone()) - } else { - v2_rt::concat(Rc::new({ let mut __result = Vec::new(); for l in variant_lines.clone().iter().cloned() { if (l.clone().as_str() != "".to_string().as_str()) { __result.push(l); } } __result }), wildcard_enum_lines.clone()) - }; -all_lines.clone().join(&"\n".to_string()) -} + let deduped_names = unique_strings(filtered_names.clone()); + let top_level = Rc::new({ + let mut __result = Vec::new(); + for n in deduped_names.clone().iter().cloned() { + if if is_known_variant( + type_summaries.clone(), + n.clone(), + ) { + is_enum_in_summaries( + type_summaries.clone(), + n.clone(), + ) + } else { + true + } { + __result.push(n); + } + } + __result + }); + let all_enum_names = Rc::new({ + let mut __result = Vec::new(); + for n in Rc::new(v2_rt::map_keys(&type_summaries)) + .iter() + .cloned() + { + if is_enum_in_summaries( + type_summaries.clone(), + n.clone(), + ) { + __result.push(n); + } + } + __result + }); + let imported_enums = Rc::new({ + let mut __result = Vec::new(); + for n in deduped_names.clone().iter().cloned() { + if is_enum_in_summaries( + type_summaries.clone(), + n.clone(), + ) { + __result.push(n); + } + } + __result + }); + let all_parents = Rc::new({ + let mut __result = Vec::new(); + for p in Rc::new({ + let mut __result = Vec::new(); + for n in deduped_names.clone().iter().cloned() { + __result.push( + if is_enum_in_summaries( + type_summaries.clone(), + n.clone(), + ) { + "".to_string() + } else { + match find_variant_parent( + type_summaries.clone(), + n.clone(), + imported_enums.clone(), + ) { + Some(parent) => parent.clone(), + None => match find_variant_parent( + type_summaries.clone(), + n.clone(), + all_enum_names.clone(), + ) { + Some(parent) => parent.clone(), + None => "".to_string(), + }, + } + }, + ); + } + __result + }) + .iter() + .cloned() + { + if (p.clone().as_str() != "".to_string().as_str()) { + __result.push(p); + } + } + __result + }); + let parent_list = unique_strings(all_parents.clone()); + let top_with_parents = unique_strings(v2_rt::concat( + top_level.clone(), + parent_list.clone(), + )); + let main_line = + if ((top_with_parents.clone().len() as i64) > 0) { + { + let names_str = Rc::new({ + let mut __result = Vec::new(); + for n in + top_with_parents.clone().iter().cloned() + { + __result.push(emit_import_name( + &n, + registry.clone(), + )); + } + __result + }) + .join(&", ".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + rust_visibility_prefix(), + "use crate::".to_string(), + ), + mod_name.clone(), + ), + "::{".to_string(), + ), + names_str.clone(), + ), + "};".to_string(), + ) + } + } else { + "".to_string() + }; + let variant_lines = Rc::new({ + let mut __result = Vec::new(); + for parent in parent_list.clone().iter().cloned() { + __result.push({ + let variants = Rc::new({ + let mut __result = Vec::new(); + for n in + deduped_names.clone().iter().cloned() + { + if if is_enum_in_summaries( + type_summaries.clone(), + n.clone(), + ) { + false + } else { + match find_variant_parent( + type_summaries.clone(), + n.clone(), + Rc::new(vec![parent.clone()]), + ) { + Some(_) => true, + None => false, + } + } { + __result.push(n); + } + } + __result + }); + let vars_str = + variants.clone().join(&", ".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "use crate::" + .to_string(), + mod_name.clone(), + ), + "::".to_string(), + ), + parent.clone(), + ), + "::{".to_string(), + ), + vars_str.clone(), + ), + "};".to_string(), + ) + }); + } + __result + }); + let imported_enums = Rc::new({ + let mut __result = Vec::new(); + for n in top_level.clone().iter().cloned() { + if is_enum_in_summaries( + type_summaries.clone(), + n.clone(), + ) { + __result.push(n); + } + } + __result + }); + let wildcard_enum_lines = Rc::new({ + let mut __result = Vec::new(); + for en in Rc::new({ + let mut __result = Vec::new(); + for en in imported_enums.clone().iter().cloned() { + if ({ + let mut __found = false; + for p in parent_list.clone().iter().cloned() + { + if (p.clone().as_str() + == en.clone().as_str()) + { + __found = true; + break; + } + } + __found + } == false) + { + __result.push(en); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "use crate::".to_string(), + mod_name.clone(), + ), + "::".to_string(), + ), + en.clone(), + ), + "::*;".to_string(), + )); + } + __result + }); + let all_lines = if (main_line.clone().as_str() + != "".to_string().as_str()) + { + v2_rt::concat( + v2_rt::concat( + Rc::new(vec![main_line.clone()]), + Rc::new({ + let mut __result = Vec::new(); + for l in + variant_lines.clone().iter().cloned() + { + if (l.clone().as_str() + != "".to_string().as_str()) + { + __result.push(l); + } + } + __result + }), + ), + wildcard_enum_lines.clone(), + ) + } else { + v2_rt::concat( + Rc::new({ + let mut __result = Vec::new(); + for l in variant_lines.clone().iter().cloned() { + if (l.clone().as_str() + != "".to_string().as_str()) + { + __result.push(l); + } + } + __result + }), + wildcard_enum_lines.clone(), + ) + }; + all_lines.clone().join(&"\n".to_string()) + } + } + } } -} + }); } -}); } __result }); -Rc::new({ let mut __result = Vec::new(); for line in import_lines.iter().cloned() { if (line.clone().as_str() != "".to_string().as_str()) { __result.push(line); } } __result }).join(&"\n".to_string()) -} + __result + }); + Rc::new({ + let mut __result = Vec::new(); + for line in import_lines.iter().cloned() { + if (line.clone().as_str() != "".to_string().as_str()) { + __result.push(line); + } + } + __result + }) + .join(&"\n".to_string()) + } } } pub fn emit_prelude() -> String { { - let use_line = "use std::collections::HashMap;\nuse std::rc::Rc;\nuse crate::v2_rt;".to_string(); -let wrapper_use = "use crate::NonEmptyVec;\nuse crate::NonEmptyBTreeSet;".to_string(); -v2_rt::concat(v2_rt::concat(use_line, "\n".to_string()), wrapper_use) -} + let use_line = + "use std::collections::HashMap;\nuse std::rc::Rc;\nuse crate::v2_rt;".to_string(); + let wrapper_use = "use crate::NonEmptyVec;\nuse crate::NonEmptyBTreeSet;".to_string(); + v2_rt::concat(v2_rt::concat(use_line, "\n".to_string()), wrapper_use) + } } pub fn emit_non_empty_wrappers() -> String { { let vec_wrapper = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("#[derive(Debug, Clone, PartialEq)]\n".to_string(), "pub struct NonEmptyVec(Vec);\n\n".to_string()), "impl NonEmptyVec {\n".to_string()), " pub fn new(items: Vec) -> Result {\n".to_string()), " if items.is_empty() {\n".to_string()), " Err(\"NonEmptyVec requires at least one element\")\n".to_string()), " } else {\n".to_string()), " Ok(Self(items))\n".to_string()), " }\n".to_string()), " }\n\n".to_string()), " pub fn as_slice(&self) -> &[T] {\n".to_string()), " &self.0\n".to_string()), " }\n\n".to_string()), " pub fn into_vec(self) -> Vec {\n".to_string()), " self.0\n".to_string()), " }\n".to_string()), "}".to_string()); -let set_wrapper = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("#[derive(Debug, Clone, PartialEq)]\n".to_string(), "pub struct NonEmptyBTreeSet(std::collections::BTreeSet);\n\n".to_string()), "impl NonEmptyBTreeSet {\n".to_string()), " pub fn new(items: std::collections::BTreeSet) -> Result {\n".to_string()), " if items.is_empty() {\n".to_string()), " Err(\"NonEmptyBTreeSet requires at least one element\")\n".to_string()), " } else {\n".to_string()), " Ok(Self(items))\n".to_string()), " }\n".to_string()), " }\n\n".to_string()), " pub fn as_set(&self) -> &std::collections::BTreeSet {\n".to_string()), " &self.0\n".to_string()), " }\n\n".to_string()), " pub fn into_set(self) -> std::collections::BTreeSet {\n".to_string()), " self.0\n".to_string()), " }\n".to_string()), "}".to_string()); -v2_rt::concat(v2_rt::concat(vec_wrapper, "\n\n".to_string()), set_wrapper) -} + let set_wrapper = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("#[derive(Debug, Clone, PartialEq)]\n".to_string(), "pub struct NonEmptyBTreeSet(std::collections::BTreeSet);\n\n".to_string()), "impl NonEmptyBTreeSet {\n".to_string()), " pub fn new(items: std::collections::BTreeSet) -> Result {\n".to_string()), " if items.is_empty() {\n".to_string()), " Err(\"NonEmptyBTreeSet requires at least one element\")\n".to_string()), " } else {\n".to_string()), " Ok(Self(items))\n".to_string()), " }\n".to_string()), " }\n\n".to_string()), " pub fn as_set(&self) -> &std::collections::BTreeSet {\n".to_string()), " &self.0\n".to_string()), " }\n\n".to_string()), " pub fn into_set(self) -> std::collections::BTreeSet {\n".to_string()), " self.0\n".to_string()), " }\n".to_string()), "}".to_string()); + v2_rt::concat(v2_rt::concat(vec_wrapper, "\n\n".to_string()), set_wrapper) + } } -pub fn emit_typed_item(item: &Rc, module_name: String, registry: &Rc>>, scope: &Rc, shared_types: Rc>, emit_info: &Rc, wire_contract_item: Option>, data_items: Rc>>>>, module_items: Rc>>, imports: Rc>>) -> String { +pub fn emit_typed_item( + item: &Rc, + module_name: String, + registry: &Rc>>, + scope: &Rc, + shared_types: Rc>, + emit_info: &Rc, + wire_contract_item: Option>, + data_items: Rc>>>>, + module_items: Rc>>, + imports: Rc>>, +) -> String { { let env = scope.type_env.clone(); -let qualified_name = v2_rt::concat(v2_rt::concat(module_name, ".".to_string()), authored_name(env.clone(), item.clone())); -let item_text = authored_name(env.clone(), item.clone()); -if is_type_def_item(&item) { - emit_type_def_from_connective(&item, emit_info.recursive_type_set.clone(), shared_types, &env, emit_info.clone(), &wire_contract_item, data_items, module_items, imports) + let qualified_name = v2_rt::concat( + v2_rt::concat(module_name, ".".to_string()), + authored_name(env.clone(), item.clone()), + ); + let item_text = authored_name(env.clone(), item.clone()); + if is_type_def_item(&item) { + emit_type_def_from_connective( + &item, + emit_info.recursive_type_set.clone(), + shared_types, + &env, + emit_info.clone(), + &wire_contract_item, + data_items, + module_items, + imports, + ) } else { if is_type_alias_item(&item, env.source_indices.clone()) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), rust_items().type_alias_keyword.clone()), " ".to_string()), item_text), " = ".to_string()), render_rust_type(resolved_type(item.clone()), shared_types, env.source_indices.clone())), ";".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + rust_visibility_prefix(), + rust_items().type_alias_keyword.clone(), + ), + " ".to_string(), + ), + item_text, + ), + " = ".to_string(), + ), + render_rust_type( + resolved_type(item.clone()), + shared_types, + env.source_indices.clone(), + ), + ), + ";".to_string(), + ) } else { if is_type_decl_item(&item, env.source_indices.clone()) { "".to_string() } else { if is_function_item(&item) { { - let fn_movable = match v2_rt::map_get(&emit_info.ownership_index.clone(), qualified_name.clone()) { - Some(m) => m.clone(), - None => empty_set(), -}; -let item_is_tco = is_tco_eligible(&authored_name(env.clone(), item.clone()), &item.body.clone().clone().unwrap(), registry.clone(), &env.source_indices.clone()); -let fn_read_only = if item_is_tco { - empty_set() + let fn_movable = match v2_rt::map_get( + &emit_info.ownership_index.clone(), + qualified_name.clone(), + ) { + Some(m) => m.clone(), + None => v2_rt::rc_empty_map::(), + }; + let item_is_tco = is_tco_eligible( + &authored_name(env.clone(), item.clone()), + &item.body.clone().clone().unwrap(), + registry.clone(), + &env.source_indices.clone(), + ); + let fn_read_only = if item_is_tco { + v2_rt::rc_empty_map::() } else { - match v2_rt::map_get(&emit_info.read_only_params_index.clone(), qualified_name.clone()) { - Some(m) => m.clone(), - None => empty_set(), -} + match v2_rt::map_get( + &emit_info.read_only_params_index.clone(), + qualified_name.clone(), + ) { + Some(m) => m.clone(), + None => v2_rt::rc_empty_map::(), + } }; -let fn_emit_info = Rc::new(EmitGraphInfo { - type_summaries: emit_info.type_summaries.clone(), - recursive_type_set: emit_info.recursive_type_set.clone(), - fielded_variants: emit_info.fielded_variants.clone(), - untagged_json_tuple_variants: emit_info.untagged_json_tuple_variants.clone(), - shared_types: emit_info.shared_types.clone(), - ownership_index: emit_info.ownership_index.clone(), - movable: fn_movable, - variant_to_enum: emit_info.variant_to_enum.clone(), - owned_bindings: empty_set(), - read_only_params_index: emit_info.read_only_params_index.clone(), - read_only_params: fn_read_only, -}); -let is_effectful = match lookup_item(registry.clone(), authored_name(env.clone(), item.clone())) { - Some(info) => (((info.service_names.clone().len() as i64) > 0) || ((info.resource_names.clone().len() as i64) > 0)), - None => false, -}; -if is_effectful { - emit_func_def(&item_text, &item.params.clone(), resolved_type(item.clone()), &item.uses.clone(), item.body.clone().clone().unwrap(), ®istry, &scope, &shared_types, &fn_emit_info) + let fn_emit_info = Rc::new(EmitGraphInfo { + type_summaries: emit_info.type_summaries.clone(), + recursive_type_set: emit_info.recursive_type_set.clone(), + fielded_variants: emit_info.fielded_variants.clone(), + shared_types: emit_info.shared_types.clone(), + ownership_index: emit_info.ownership_index.clone(), + movable: fn_movable, + variant_to_enum: emit_info.variant_to_enum.clone(), + owned_bindings: v2_rt::rc_empty_map::(), + read_only_params_index: emit_info.read_only_params_index.clone(), + read_only_params: fn_read_only, + }); + let is_effectful = match lookup_item( + registry.clone(), + authored_name(env.clone(), item.clone()), + ) { + Some(info) => { + (((info.service_names.clone().len() as i64) > 0) + || ((info.resource_names.clone().len() as i64) > 0)) + } + None => false, + }; + if is_effectful { + emit_func_def( + &item_text, + &item.params.clone(), + resolved_type(item.clone()), + &item.uses.clone(), + item.body.clone().clone().unwrap(), + ®istry, + &scope, + &shared_types, + &fn_emit_info, + ) } else { - emit_fn_def(&item_text, &item.params.clone(), resolved_type(item.clone()), &item.body.clone().clone().unwrap(), ®istry, &scope, &shared_types, &fn_emit_info) + emit_fn_def( + &item_text, + &item.params.clone(), + resolved_type(item.clone()), + &item.body.clone().clone().unwrap(), + ®istry, + &scope, + &shared_types, + &fn_emit_info, + ) } -} + } } else { if is_data_def_item(&item) { - emit_data_def(item_text, &item.type_annotation.clone().clone().unwrap(), item.body.clone().clone().unwrap(), registry.clone(), &scope, 0, &shared_types, emit_info.clone()) + emit_data_def( + item_text, + &item.type_annotation.clone().clone().unwrap(), + item.body.clone().clone().unwrap(), + registry.clone(), + &scope, + 0, + &shared_types, + emit_info.clone(), + ) } else { if is_service_def_item(&item) { emit_service_def(&item, registry.clone(), shared_types, &env) @@ -1203,7 +2757,13 @@ if is_effectful { if is_resource_def_item(&item) { emit_resource_def(&item, shared_types, &env) } else { - v2_rt::concat(v2_rt::concat("compile_error!(\"unhandled item: ".to_string(), item_text), "\");".to_string()) + v2_rt::concat( + v2_rt::concat( + "compile_error!(\"unhandled item: ".to_string(), + item_text, + ), + "\");".to_string(), + ) } } } @@ -1211,306 +2771,845 @@ if is_effectful { } } } -} + } } -pub fn needs_box_wrapping(mut n: Rc, mut recursive_types: Rc>, mut shared_types: Rc>, mut source_indices: Rc>>) -> bool { +pub fn needs_box_wrapping( + mut n: Rc, + mut recursive_types: Rc>, + mut shared_types: Rc>, + mut source_indices: Rc>>, +) -> bool { loop { if ((n.children.clone().len() as i64) == 0) { let name = authored_name_at(source_indices, &n); -if set_contains(shared_types, name.clone()) { + if emit_map_has(shared_types, name.clone()) { break false; -} else { - break set_contains(recursive_types, name.clone()); -} -} else { + } else { + break emit_map_has(recursive_types, name.clone()); + } + } else { let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); -if is_optional { + if is_optional { { let __tco_0 = with_required_cardinality(&n); -n = __tco_0; -continue; -} -} else { + n = __tco_0; + continue; + } + } else { break false; -} -} -} + } + } + } } -pub fn emit_type_params(params: &Rc>>, source_indices: Rc>>) -> String { +pub fn emit_type_params( + params: &Rc>>, + source_indices: Rc>>, +) -> String { if ((params.clone().len() as i64) == 0) { "".to_string() } else { { - let names = Rc::new({ let mut __result = Vec::new(); for p in params.clone().iter().cloned() { __result.push(generic_param_name_at(p.clone(), source_indices.clone())); } __result }); -v2_rt::concat(v2_rt::concat("<".to_string(), names.join(&", ".to_string())), ">".to_string()) -} + let names = Rc::new({ + let mut __result = Vec::new(); + for p in params.clone().iter().cloned() { + __result.push(generic_param_name_at(p.clone(), source_indices.clone())); + } + __result + }); + v2_rt::concat( + v2_rt::concat("<".to_string(), names.join(&", ".to_string())), + ">".to_string(), + ) + } } } pub fn is_function_type_param(param: &Rc) -> bool { { let type_expr = param_node_type_expr(¶m); -let type_expr_is_var = match type_expr.inferred.clone() { - Some(inf) => is_type_variable(inf.clone()), - None => false, -}; -((type_expr_is_var && (param.name.clone().as_str() != "".to_string().as_str())) && (param.name.clone().as_str() == type_expr.name.clone().as_str())) -} + let type_expr_is_var = match type_expr.inferred.clone() { + Some(inf) => is_type_variable(inf.clone()), + None => false, + }; + ((type_expr_is_var && (param.name.clone().as_str() != "".to_string().as_str())) + && (param.name.clone().as_str() == type_expr.name.clone().as_str())) + } } pub fn function_type_params(params: Rc>>) -> Rc>> { - Rc::new({ let mut __result = Vec::new(); for p in params.iter().cloned() { if is_function_type_param(&p) { __result.push(p); } } __result }) -} - + Rc::new({ + let mut __result = Vec::new(); + for p in params.iter().cloned() { + if is_function_type_param(&p) { + __result.push(p); + } + } + __result + }) +} + pub fn function_value_params(params: Rc>>) -> Rc>> { - Rc::new({ let mut __result = Vec::new(); for p in params.iter().cloned() { if !is_function_type_param(&p) { __result.push(p); } } __result }) + Rc::new({ + let mut __result = Vec::new(); + for p in params.iter().cloned() { + if !is_function_type_param(&p) { + __result.push(p); + } + } + __result + }) } pub fn function_type_params_have_collision(type_params: Rc>>) -> bool { { - let names = Rc::new({ let mut __result = Vec::new(); for p in type_params.iter().cloned() { __result.push(p.name.clone()); } __result }); -((names.clone().len() as i64) > (unique_strings(names.clone()).len() as i64)) -} + let names = Rc::new({ + let mut __result = Vec::new(); + for p in type_params.iter().cloned() { + __result.push(p.name.clone()); + } + __result + }); + ((names.clone().len() as i64) > (unique_strings(names.clone()).len() as i64)) + } } -pub fn emit_type_def_from_connective(item: &Rc, recursive_types: Rc>, shared_types: Rc>, env: &Rc, emit_info: Rc, wire_contract_item: &Option>, data_items: Rc>>>>, module_items: Rc>>, imports: Rc>>) -> String { +pub fn emit_type_def_from_connective( + item: &Rc, + recursive_types: Rc>, + shared_types: Rc>, + env: &Rc, + emit_info: Rc, + wire_contract_item: &Option>, + data_items: Rc>>>>, + module_items: Rc>>, + imports: Rc>>, +) -> String { { let type_params = emit_type_params(&item.params.clone(), env.source_indices.clone()); -let item_text = authored_name(env.clone(), item.clone()); -let is_product = is_product_type(item.clone()); -if is_product { - emit_struct_from_children(&item_text, type_params, &item.children.clone(), recursive_types, &shared_types, env.clone(), emit_info) + let item_text = authored_name(env.clone(), item.clone()); + let is_product = is_product_type(item.clone()); + if is_product { + emit_struct_from_children( + &item_text, + type_params, + &item.children.clone(), + recursive_types, + &shared_types, + env.clone(), + emit_info, + ) } else { { - let all_unit_variants = { let mut __all = true; for child in item.children.clone().iter().cloned() { if !(((child.children.clone().len() as i64) == 0)) { __all = false; break; } } __all }; -let serde_policy = match resolve_local_coproduct_wire_policy(&item_text, all_unit_variants.clone(), &module_items, imports, &env.source_indices.clone()) { - Some(local_policy) => local_policy.clone(), - None => if all_unit_variants.clone() { - match wire_contract_item.clone() { - Some(_) => resolve_wire_serde_policy_for_coproduct(wire_contract_item.clone(), env.source_indices.clone(), data_items), - None => rust_tagged_object_policy(), -} - } else { - rust_tagged_object_policy() - }, -}; -let rename_validations = variant_rename_validations_for_policy(item.children.clone(), env.clone(), serde_policy.clone()); -let untagged_validations = untagged_json_tuple_variant_shape_validations(&item.children.clone(), env.clone(), &serde_policy); -let policy_validation = match serde_policy.error_message.clone() { - Some(message) => emit_rust_compile_error_item(message.clone()), - None => "".to_string(), -}; -let validations1 = if (policy_validation.clone().as_str() == "".to_string().as_str()) { + let all_unit_variants = { + let mut __all = true; + for child in item.children.clone().iter().cloned() { + if !((child.children.clone().len() as i64) == 0) { + __all = false; + break; + } + } + __all + }; + let serde_policy = match resolve_local_coproduct_wire_policy( + &item_text, + all_unit_variants.clone(), + &module_items, + imports, + &env.source_indices.clone(), + ) { + Some(local_policy) => local_policy.clone(), + None => { + if all_unit_variants.clone() { + match wire_contract_item.clone() { + Some(_) => resolve_wire_serde_policy_for_coproduct( + wire_contract_item.clone(), + env.source_indices.clone(), + data_items, + ), + None => rust_tagged_object_policy(), + } + } else { + rust_tagged_object_policy() + } + } + }; + let rename_validations = variant_rename_validations_for_policy( + item.children.clone(), + env.clone(), + serde_policy.clone(), + ); + let policy_validation = match serde_policy.error_message.clone() { + Some(message) => emit_rust_compile_error_item(message.clone()), + None => "".to_string(), + }; + let validations = if (policy_validation.clone().as_str() == "".to_string().as_str()) + { rename_validations.clone() } else { if (rename_validations.clone().as_str() == "".to_string().as_str()) { policy_validation.clone() } else { - v2_rt::concat(v2_rt::concat(policy_validation.clone(), "\n".to_string()), rename_validations.clone()) - } - }; -let validations2 = if (validations1.clone().as_str() == "".to_string().as_str()) { - untagged_validations.clone() - } else { - if (untagged_validations.clone().as_str() == "".to_string().as_str()) { - validations1.clone() - } else { - v2_rt::concat(v2_rt::concat(validations1.clone(), "\n".to_string()), untagged_validations.clone()) + v2_rt::concat( + v2_rt::concat(policy_validation.clone(), "\n".to_string()), + rename_validations.clone(), + ) } }; -let enum_text = emit_enum_from_children(&item_text, &type_params, &item.children.clone(), &recursive_types, &shared_types, &env, &serde_policy); -if (validations2.clone().as_str() == "".to_string().as_str()) { + let enum_text = emit_enum_from_children( + &item_text, + &type_params, + &item.children.clone(), + &recursive_types, + &shared_types, + &env, + &serde_policy, + ); + if (validations.clone().as_str() == "".to_string().as_str()) { enum_text } else { - v2_rt::concat(v2_rt::concat(validations2.clone(), "\n".to_string()), enum_text) + v2_rt::concat( + v2_rt::concat(validations.clone(), "\n".to_string()), + enum_text, + ) } -} + } } -} + } } -pub fn emit_struct_from_children(name: &String, type_params: String, children: &Rc>>, recursive_types: Rc>, shared_types: &Rc>, env: Rc, emit_info: Rc) -> String { +pub fn emit_struct_from_children( + name: &String, + type_params: String, + children: &Rc>>, + recursive_types: Rc>, + shared_types: &Rc>, + env: Rc, + emit_info: Rc, +) -> String { { let has_fn_fields = match v2_rt::map_get(&emit_info.type_summaries.clone(), name.clone()) { - Some(ts) => ts.has_fn_fields.clone(), - None => false, -}; -let derives = if has_fn_fields { + Some(ts) => ts.has_fn_fields.clone(), + None => false, + }; + let derives = if has_fn_fields { "#[derive(Clone)]".to_string() } else { - if set_contains(shared_types.clone(), name.clone()) { + if emit_map_has(shared_types.clone(), name.clone()) { rust_struct_derives_text() } else { rust_struct_derives_copy_text() } }; -if ((children.clone().len() as i64) == 0) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(derives, "\n".to_string()), rust_visibility_prefix()), rust_items().struct_keyword.clone()), " ".to_string()), name.clone()), type_params), ";".to_string()) + if ((children.clone().len() as i64) == 0) { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(derives, "\n".to_string()), + rust_visibility_prefix(), + ), + rust_items().struct_keyword.clone(), + ), + " ".to_string(), + ), + name.clone(), + ), + type_params, + ), + ";".to_string(), + ) } else { { - let field_lines = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { __result.push(emit_struct_field_from_child(&child, recursive_types.clone(), &shared_types, &env)); } __result }); -let fields_str = field_lines.join(&"\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(derives, "\n".to_string()), rust_visibility_prefix()), rust_items().struct_keyword.clone()), " ".to_string()), name.clone()), type_params), " {\n".to_string()), fields_str), "\n}".to_string()) -} + let field_lines = Rc::new({ + let mut __result = Vec::new(); + for child in children.clone().iter().cloned() { + __result.push(emit_struct_field_from_child( + &child, + recursive_types.clone(), + &shared_types, + &env, + )); + } + __result + }); + let fields_str = field_lines.join(&"\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(derives, "\n".to_string()), + rust_visibility_prefix(), + ), + rust_items().struct_keyword.clone(), + ), + " ".to_string(), + ), + name.clone(), + ), + type_params, + ), + " {\n".to_string(), + ), + fields_str, + ), + "\n}".to_string(), + ) + } } -} + } } -pub fn emit_struct_field_from_child(child: &Rc, recursive_types: Rc>, shared_types: &Rc>, env: &Rc) -> String { +pub fn emit_struct_field_from_child( + child: &Rc, + recursive_types: Rc>, + shared_types: &Rc>, + env: &Rc, +) -> String { { let rt_child = resolved_type(child.clone()); -let ty = if ((is_product_type(rt_child.clone()) && (rt_child.ident_span.clone() != None)) && ((rt_child.children.clone().len() as i64) > 2)) { + let ty = if ((is_product_type(rt_child.clone()) && (rt_child.ident_span.clone() != None)) + && ((rt_child.children.clone().len() as i64) > 2)) + { { let rt_child_name = authored_name_at(env.source_indices.clone(), &rt_child); -match lookup_type_by_name(&env, rt_child_name.clone()) { - Some(resolved) => if ((resolved.params.clone().len() as i64) > 0) { - { - let base = coerce_primitive_type(RenderTarget::Rust, rt_child_name.clone()); -let param_names = Rc::new({ let mut __result = Vec::new(); for p in resolved.params.clone().iter().cloned() { __result.push(generic_param_name_at(p.clone(), env.source_indices.clone())); } __result }); -let with_params = v2_rt::concat(v2_rt::concat(v2_rt::concat(base, "<".to_string()), param_names.join(&", ".to_string())), ">".to_string()); -if set_contains(shared_types.clone(), rt_child_name.clone()) { - v2_rt::concat(v2_rt::concat("Rc<".to_string(), with_params), ">".to_string()) + match lookup_type_by_name(&env, rt_child_name.clone()) { + Some(resolved) => { + if ((resolved.params.clone().len() as i64) > 0) { + { + let base = coerce_primitive_type( + RenderTarget::Rust, + rt_child_name.clone(), + ); + let param_names = Rc::new({ + let mut __result = Vec::new(); + for p in resolved.params.clone().iter().cloned() { + __result.push(generic_param_name_at( + p.clone(), + env.source_indices.clone(), + )); + } + __result + }); + let with_params = v2_rt::concat( + v2_rt::concat( + v2_rt::concat(base, "<".to_string()), + param_names.join(&", ".to_string()), + ), + ">".to_string(), + ); + if emit_map_has(shared_types.clone(), rt_child_name.clone()) { + v2_rt::concat( + v2_rt::concat("Rc<".to_string(), with_params), + ">".to_string(), + ) + } else { + with_params + } + } } else { - with_params + render_rust_type( + rt_child.clone(), + shared_types.clone(), + env.source_indices.clone(), + ) } -} - } else { - render_rust_type(rt_child.clone(), shared_types.clone(), env.source_indices.clone()) - }, - None => render_rust_type(rt_child.clone(), shared_types.clone(), env.source_indices.clone()), -} -} + } + None => render_rust_type( + rt_child.clone(), + shared_types.clone(), + env.source_indices.clone(), + ), + } + } } else { - render_rust_type(rt_child.clone(), shared_types.clone(), env.source_indices.clone()) + render_rust_type( + rt_child.clone(), + shared_types.clone(), + env.source_indices.clone(), + ) }; -let final_ty = if needs_box_wrapping(rt_child.clone(), recursive_types, shared_types.clone(), env.source_indices.clone()) { + let final_ty = if needs_box_wrapping( + rt_child.clone(), + recursive_types, + shared_types.clone(), + env.source_indices.clone(), + ) { v2_rt::concat(v2_rt::concat("Box<".to_string(), ty), ">".to_string()) } else { ty }; -let rename_attr = match Rc::new({ let mut __result = Vec::new(); for p in child.properties.clone().iter().cloned() { if (field_init_node_name_at(p.clone(), env.source_indices.clone()).as_str() == "from_key".to_string().as_str()) { __result.push(p); } } __result }).first().cloned() { - Some(prop) => match (*field_init_node_value(&prop).expr_data.clone()).clone() { - ExprData::ExprLiteral { value: lv, .. } => match (*lv.clone()).clone() { - LiteralValue::LitStr { value: key, .. } => v2_rt::concat(v2_rt::concat(" ".to_string(), apply_type_template1(rust_serde_rename_template_text(), key.clone())), "\n".to_string()), - _ => "".to_string(), -}, - _ => "".to_string(), -}, - None => "".to_string(), -}; -let authored = authored_name(env.clone(), child.clone()); -let snake = to_snake(authored.clone()); -let is_reserved = { let mut __found = false; for r in language_spec(RenderTarget::Rust).reserved_words.clone().keywords.clone().iter().cloned() { if (r.clone().as_str() == snake.clone().as_str()) { __found = true; break; } } __found }; -let keyword_rename = if (is_reserved && (rename_attr.clone().as_str() == "".to_string().as_str())) { - v2_rt::concat(v2_rt::concat(" #[serde(rename = \"".to_string(), snake.clone()), "\")]\n".to_string()) - } else { - "".to_string() + let rename_attr = match Rc::new({ + let mut __result = Vec::new(); + for p in child.properties.clone().iter().cloned() { + if (field_init_node_name_at(p.clone(), env.source_indices.clone()).as_str() + == "from_key".to_string().as_str()) + { + __result.push(p); + } + } + __result + }) + .first() + .cloned() + { + Some(prop) => match (*field_init_node_value(&prop).expr_data.clone()).clone() { + ExprData::ExprLiteral { value: lv, .. } => match (*lv.clone()).clone() { + LiteralValue::LitStr { value: key, .. } => v2_rt::concat( + v2_rt::concat( + " ".to_string(), + apply_type_template1(rust_serde_rename_template_text(), key.clone()), + ), + "\n".to_string(), + ), + _ => "".to_string(), + }, + _ => "".to_string(), + }, + None => "".to_string(), }; -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(keyword_rename, rename_attr.clone()), " ".to_string()), rust_visibility_prefix()), emit_ident(authored.clone(), RenderTarget::Rust)), ": ".to_string()), final_ty), ",".to_string()) -} + let authored = authored_name(env.clone(), child.clone()); + let snake = to_snake(authored.clone()); + let is_reserved = { + let mut __found = false; + for r in language_spec(RenderTarget::Rust) + .reserved_words + .clone() + .keywords + .clone() + .iter() + .cloned() + { + if (r.clone().as_str() == snake.clone().as_str()) { + __found = true; + break; + } + } + __found + }; + let keyword_rename = + if (is_reserved && (rename_attr.clone().as_str() == "".to_string().as_str())) { + v2_rt::concat( + v2_rt::concat(" #[serde(rename = \"".to_string(), snake.clone()), + "\")]\n".to_string(), + ) + } else { + "".to_string() + }; + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(keyword_rename, rename_attr.clone()), + " ".to_string(), + ), + rust_visibility_prefix(), + ), + emit_ident(authored.clone(), RenderTarget::Rust), + ), + ": ".to_string(), + ), + final_ty, + ), + ",".to_string(), + ) + } } pub fn enum_derives(children: Rc>>) -> String { { - let complex = Rc::new({ let mut __result = Vec::new(); for v in children.iter().cloned() { if ((v.children.clone().len() as i64) > 0) { __result.push(v); } } __result }); -match ((complex.len() as i64) == 0) { - true => rust_enum_derives_copy_text(), - false => rust_enum_derives_text(), -} -} + let complex = Rc::new({ + let mut __result = Vec::new(); + for v in children.iter().cloned() { + if ((v.children.clone().len() as i64) > 0) { + __result.push(v); + } + } + __result + }); + match ((complex.len() as i64) == 0) { + true => rust_enum_derives_copy_text(), + false => rust_enum_derives_text(), + } + } } -pub fn emit_enum_from_children(name: &String, type_params: &String, children: &Rc>>, recursive_types: &Rc>, shared_types: &Rc>, env: &Rc, serde_policy: &Rc) -> String { +pub fn emit_enum_from_children( + name: &String, + type_params: &String, + children: &Rc>>, + recursive_types: &Rc>, + shared_types: &Rc>, + env: &Rc, + serde_policy: &Rc, +) -> String { { let derives = enum_derives(children.clone()); -let variant_lines = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { __result.push(emit_variant_from_child(&child, recursive_types.clone(), &shared_types, &env, &serde_policy)); } __result }); -let variants_str = variant_lines.join(&"\n".to_string()); -let tag_line = if (serde_policy.enum_attr.clone().as_str() == "".to_string().as_str()) { + let variant_lines = Rc::new({ + let mut __result = Vec::new(); + for child in children.clone().iter().cloned() { + __result.push(emit_variant_from_child( + &child, + recursive_types.clone(), + shared_types.clone(), + &env, + serde_policy.clone(), + )); + } + __result + }); + let variants_str = variant_lines.join(&"\n".to_string()); + let tag_line = if (serde_policy.enum_attr.clone().as_str() == "".to_string().as_str()) { "".to_string() } else { v2_rt::concat(serde_policy.enum_attr.clone(), "\n".to_string()) }; -let enum_def = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(derives, "\n".to_string()), tag_line), rust_visibility_prefix()), rust_items().enum_keyword.clone()), " ".to_string()), name.clone()), type_params.clone()), " {\n".to_string()), variants_str), "\n}".to_string()); -let accessor_impl = emit_enum_shared_accessors(&name, &type_params, &children, recursive_types.clone(), shared_types.clone(), &env); -if (accessor_impl.clone().as_str() == "".to_string().as_str()) { + let enum_def = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(derives, "\n".to_string()), + tag_line, + ), + rust_visibility_prefix(), + ), + rust_items().enum_keyword.clone(), + ), + " ".to_string(), + ), + name.clone(), + ), + type_params.clone(), + ), + " {\n".to_string(), + ), + variants_str, + ), + "\n}".to_string(), + ); + let accessor_impl = emit_enum_shared_accessors( + &name, + &type_params, + &children, + recursive_types.clone(), + shared_types.clone(), + &env, + ); + if (accessor_impl.clone().as_str() == "".to_string().as_str()) { enum_def } else { - v2_rt::concat(v2_rt::concat(enum_def, "\n".to_string()), accessor_impl.clone()) + v2_rt::concat( + v2_rt::concat(enum_def, "\n".to_string()), + accessor_impl.clone(), + ) } -} + } } pub fn find_shared_enum_fields(children: Rc>>, env: Rc) -> Rc> { { - let fielded = Rc::new({ let mut __result = Vec::new(); for child in children.iter().cloned() { if ((child.children.clone().len() as i64) > 0) { __result.push(child); } } __result }); -if ((fielded.clone().len() as i64) == 0) { - return Rc::new(vec![]) + let fielded = Rc::new({ + let mut __result = Vec::new(); + for child in children.iter().cloned() { + if ((child.children.clone().len() as i64) > 0) { + __result.push(child); + } + } + __result + }); + if ((fielded.clone().len() as i64) == 0) { + return Rc::new(vec![]); } -let first_fields = match fielded.clone().first().cloned() { - Some(v) => Rc::new({ let mut __result = Vec::new(); for f in v.children.clone().iter().cloned() { __result.push(authored_name(env.clone(), f.clone())); } __result }), - None => Rc::new(vec![]), -}; -Rc::new({ let mut __result = Vec::new(); for fname in first_fields.iter().cloned() { if { let mut __all = true; for variant in fielded.clone().iter().cloned() { if !({ let mut __found = false; for f in variant.children.clone().iter().cloned() { if (authored_name(env.clone(), f.clone()).as_str() == fname.clone().as_str()) { __found = true; break; } } __found }) { __all = false; break; } } __all } { __result.push(fname); } } __result }) -} + let first_fields = match fielded.clone().first().cloned() { + Some(v) => Rc::new({ + let mut __result = Vec::new(); + for f in v.children.clone().iter().cloned() { + __result.push(authored_name(env.clone(), f.clone())); + } + __result + }), + None => Rc::new(vec![]), + }; + Rc::new({ + let mut __result = Vec::new(); + for fname in first_fields.iter().cloned() { + if { + let mut __all = true; + for variant in fielded.clone().iter().cloned() { + if !({ + let mut __found = false; + for f in variant.children.clone().iter().cloned() { + if (authored_name(env.clone(), f.clone()).as_str() + == fname.clone().as_str()) + { + __found = true; + break; + } + } + __found + }) { + __all = false; + break; + } + } + __all + } { + __result.push(fname); + } + } + __result + }) + } } -pub fn emit_enum_shared_accessors(name: &String, type_params: &String, children: &Rc>>, recursive_types: Rc>, shared_types: Rc>, env: &Rc) -> String { +pub fn emit_enum_shared_accessors( + name: &String, + type_params: &String, + children: &Rc>>, + recursive_types: Rc>, + shared_types: Rc>, + env: &Rc, +) -> String { { let all_shared = find_shared_enum_fields(children.clone(), env.clone()); -if ((all_shared.clone().len() as i64) == 0) { - return "".to_string() + if ((all_shared.clone().len() as i64) == 0) { + return "".to_string(); } -let fielded = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { if ((child.children.clone().len() as i64) > 0) { __result.push(child); } } __result }); -if ((fielded.clone().len() as i64) == 0) { - return "compile_error!(\"enum shared accessor missing fielded variant\")".to_string() + let fielded = Rc::new({ + let mut __result = Vec::new(); + for child in children.clone().iter().cloned() { + if ((child.children.clone().len() as i64) > 0) { + __result.push(child); + } + } + __result + }); + if ((fielded.clone().len() as i64) == 0) { + return "compile_error!(\"enum shared accessor missing fielded variant\")".to_string(); } -let first_fielded = fielded.clone().first().cloned().clone().unwrap(); -let shared = Rc::new({ let mut __result = Vec::new(); for fname in all_shared.clone().iter().cloned() { if { - let types = Rc::new({ let mut __result = Vec::new(); for variant in fielded.clone().iter().cloned() { __result.push(match Rc::new({ let mut __result = Vec::new(); for f in variant.children.clone().iter().cloned() { if (authored_name(env.clone(), f.clone()).as_str() == fname.clone().as_str()) { __result.push(f); } } __result }).first().cloned() { - Some(f) => render_rust_type(resolved_type(f.clone()), shared_types.clone(), env.source_indices.clone()), - None => "".to_string(), -}); } __result }); -let first_type = match types.clone().first().cloned() { - Some(t) => t.clone(), - None => "".to_string(), -}; -{ let mut __all = true; for t in types.clone().iter().cloned() { if !((t.clone().as_str() == first_type.clone().as_str())) { __all = false; break; } } __all } -} { __result.push(fname); } } __result }); -if ((shared.clone().len() as i64) == 0) { - return "".to_string() - } -let accessor_fns = Rc::new({ let mut __result = Vec::new(); for fname in shared.clone().iter().cloned() { __result.push({ - let ty = match Rc::new({ let mut __result = Vec::new(); for f in first_fielded.children.clone().iter().cloned() { if (authored_name(env.clone(), f.clone()).as_str() == fname.clone().as_str()) { __result.push(f); } } __result }).first().cloned() { - Some(f) => render_rust_type(resolved_type(f.clone()), shared_types.clone(), env.source_indices.clone()), - None => "compile_error!(\"enum shared accessor missing field metadata\")".to_string(), -}; -let arms = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { __result.push({ - let child_text = authored_name(env.clone(), child.clone()); -if ((child.children.clone().len() as i64) == 0) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), name.clone()), "::".to_string()), child_text.clone()), " => panic!(\"no ".to_string()), fname.clone()), " on unit variant\"),".to_string()) - } else { + let first_fielded = fielded.clone().first().cloned().clone().unwrap(); + let shared = Rc::new({ + let mut __result = Vec::new(); + for fname in all_shared.clone().iter().cloned() { + if { + let types = Rc::new({ + let mut __result = Vec::new(); + for variant in fielded.clone().iter().cloned() { + __result.push( + match Rc::new({ + let mut __result = Vec::new(); + for f in variant.children.clone().iter().cloned() { + if (authored_name(env.clone(), f.clone()).as_str() + == fname.clone().as_str()) + { + __result.push(f); + } + } + __result + }) + .first() + .cloned() + { + Some(f) => render_rust_type( + resolved_type(f.clone()), + shared_types.clone(), + env.source_indices.clone(), + ), + None => "".to_string(), + }, + ); + } + __result + }); + let first_type = match types.clone().first().cloned() { + Some(t) => t.clone(), + None => "".to_string(), + }; { - let sharing = language_spec(RenderTarget::Rust).sharing.clone(); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), name.clone()), "::".to_string()), child_text.clone()), " { ".to_string()), emit_ident(fname.clone(), RenderTarget::Rust)), ": __val, .. } => ".to_string()), apply_type_template1(sharing.clone_value.clone(), "__val".to_string())), ",".to_string()) -} + let mut __all = true; + for t in types.clone().iter().cloned() { + if !(t.clone().as_str() == first_type.clone().as_str()) { + __all = false; + break; + } + } + __all + } + } { + __result.push(fname); } -}); } __result }); -let arms_str = arms.clone().join(&"\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" pub fn ".to_string(), emit_ident(fname.clone(), RenderTarget::Rust)), "(&self) -> ".to_string()), ty.clone()), " {\n match self {\n".to_string()), arms_str.clone()), "\n }\n }".to_string()) -}); } __result }); -let fns_str = accessor_fns.join(&"\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("impl".to_string(), type_params.clone()), " ".to_string()), name.clone()), type_params.clone()), " {\n".to_string()), fns_str), "\n}".to_string()) -} + } + __result + }); + if ((shared.clone().len() as i64) == 0) { + return "".to_string(); + } + let accessor_fns = Rc::new({ + let mut __result = Vec::new(); + for fname in shared.clone().iter().cloned() { + __result.push({ + let ty = match Rc::new({ + let mut __result = Vec::new(); + for f in first_fielded.children.clone().iter().cloned() { + if (authored_name(env.clone(), f.clone()).as_str() + == fname.clone().as_str()) + { + __result.push(f); + } + } + __result + }) + .first() + .cloned() + { + Some(f) => render_rust_type( + resolved_type(f.clone()), + shared_types.clone(), + env.source_indices.clone(), + ), + None => "compile_error!(\"enum shared accessor missing field metadata\")" + .to_string(), + }; + let arms = Rc::new({ + let mut __result = Vec::new(); + for child in children.clone().iter().cloned() { + __result.push({ + let child_text = authored_name(env.clone(), child.clone()); + if ((child.children.clone().len() as i64) == 0) { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + " ".to_string(), + name.clone(), + ), + "::".to_string(), + ), + child_text.clone(), + ), + " => panic!(\"no ".to_string(), + ), + fname.clone(), + ), + " on unit variant\"),".to_string(), + ) + } else { + { + let sharing = + language_spec(RenderTarget::Rust).sharing.clone(); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + " ".to_string(), + name.clone(), + ), + "::".to_string(), + ), + child_text.clone(), + ), + " { ".to_string(), + ), + emit_ident( + fname.clone(), + RenderTarget::Rust, + ), + ), + ": __val, .. } => ".to_string(), + ), + apply_type_template1( + sharing.clone_value.clone(), + "__val".to_string(), + ), + ), + ",".to_string(), + ) + } + } + }); + } + __result + }); + let arms_str = arms.clone().join(&"\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + " pub fn ".to_string(), + emit_ident(fname.clone(), RenderTarget::Rust), + ), + "(&self) -> ".to_string(), + ), + ty.clone(), + ), + " {\n match self {\n".to_string(), + ), + arms_str.clone(), + ), + "\n }\n }".to_string(), + ) + }); + } + __result + }); + let fns_str = accessor_fns.join(&"\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("impl".to_string(), type_params.clone()), + " ".to_string(), + ), + name.clone(), + ), + type_params.clone(), + ), + " {\n".to_string(), + ), + fns_str, + ), + "\n}".to_string(), + ) + } } pub fn string_without_prefix(value: &String, prefix: &String) -> Option { if (v2_rt::string_length(&prefix) == 0) { None } else { - if ((v2_rt::string_length(&value) >= v2_rt::string_length(&prefix)) && (v2_rt::substring(&value, 0, v2_rt::string_length(&prefix)).as_str() == prefix.clone().as_str())) { - Some(v2_rt::substring(&value, v2_rt::string_length(&prefix), v2_rt::string_length(&value))) + if ((v2_rt::string_length(&value) >= v2_rt::string_length(&prefix)) + && (v2_rt::substring(&value, 0, v2_rt::string_length(&prefix)).as_str() + == prefix.clone().as_str())) + { + Some(v2_rt::substring( + &value, + v2_rt::string_length(&prefix), + v2_rt::string_length(&value), + )) } else { None } @@ -1521,511 +3620,1130 @@ pub fn string_without_suffix(value: &String, suffix: &String) -> Option if (v2_rt::string_length(&suffix) == 0) { None } else { - if ((v2_rt::string_length(&value) >= v2_rt::string_length(&suffix)) && (v2_rt::substring(&value, (v2_rt::string_length(&value) - v2_rt::string_length(&suffix)), v2_rt::string_length(&value)).as_str() == suffix.clone().as_str())) { - Some(v2_rt::substring(&value, 0, (v2_rt::string_length(&value) - v2_rt::string_length(&suffix)))) + if ((v2_rt::string_length(&value) >= v2_rt::string_length(&suffix)) + && (v2_rt::substring( + &value, + (v2_rt::string_length(&value) - v2_rt::string_length(&suffix)), + v2_rt::string_length(&value), + ) + .as_str() + == suffix.clone().as_str())) + { + Some(v2_rt::substring( + &value, + 0, + (v2_rt::string_length(&value) - v2_rt::string_length(&suffix)), + )) } else { None } } } -pub fn wire_variant_rename_attr_for_policy(authored: String, policy: &Rc) -> String { - match policy.untagged_string_variant.clone() { - Some(_) => "".to_string(), - None => match policy.rename_style.clone() { - Some(style) => if (style.clone().as_str() == "StripAffixAndSnakeCase".to_string().as_str()) { - { - let without_prefix = match policy.rename_prefix.clone() { - Some(prefix) => match string_without_prefix(&authored, &prefix) { - Some(stripped) => stripped.clone(), - None => return "".to_string(), -}, - None => authored, -}; -let without_suffix = match policy.rename_suffix.clone() { - Some(suffix) => match string_without_suffix(&without_prefix, &suffix) { - Some(stripped) => stripped.clone(), - None => return "".to_string(), -}, - None => without_prefix, -}; -v2_rt::concat(v2_rt::concat(" #[serde(rename = \"".to_string(), to_snake(without_suffix)), "\")]\n".to_string()) -} - } else { - "".to_string() - }, - None => "".to_string(), -}, -} -} - -pub fn variant_rename_validation_for_policy(authored: &String, policy: &Rc) -> String { - match policy.untagged_string_variant.clone() { - Some(_) => "".to_string(), - None => match policy.rename_style.clone() { - Some(style) => if (style.clone().as_str() == "StripAffixAndSnakeCase".to_string().as_str()) { - { - let without_prefix = match policy.rename_prefix.clone() { - Some(prefix) => match string_without_prefix(&authored, &prefix) { - Some(stripped) => stripped.clone(), - None => return emit_rust_compile_error_item(v2_rt::concat(v2_rt::concat(v2_rt::concat("variant ".to_string(), authored.clone()), " does not satisfy declared wire rename prefix: ".to_string()), prefix.clone())), -}, - None => authored.clone(), -}; -match policy.rename_suffix.clone() { - Some(suffix) => match string_without_suffix(&without_prefix, &suffix) { - Some(_) => "".to_string(), - None => emit_rust_compile_error_item(v2_rt::concat(v2_rt::concat(v2_rt::concat("variant ".to_string(), authored.clone()), " does not satisfy declared wire rename suffix: ".to_string()), suffix.clone())), -}, - None => "".to_string(), -} -} - } else { - "".to_string() - }, - None => "".to_string(), -}, -} -} - -pub fn variant_rename_validations_for_policy(children: Rc>>, env: Rc, serde_policy: Rc) -> String { - Rc::new({ let mut __result = Vec::new(); for text in Rc::new({ let mut __result = Vec::new(); for child in children.iter().cloned() { __result.push(variant_rename_validation_for_policy(&authored_name(env.clone(), child.clone()), &serde_policy)); } __result }).iter().cloned() { if (text.clone().as_str() != "".to_string().as_str()) { __result.push(text); } } __result }).join(&"\n".to_string()) +pub fn wire_variant_rename_attr_for_policy( + authored: String, + policy: &Rc, +) -> String { + match policy.rename_style.clone() { + Some(style) => { + if (style.clone().as_str() == "StripAffixAndSnakeCase".to_string().as_str()) { + { + let without_prefix = match policy.rename_prefix.clone() { + Some(prefix) => match string_without_prefix(&authored, &prefix) { + Some(stripped) => stripped.clone(), + None => return "".to_string(), + }, + None => authored, + }; + let without_suffix = match policy.rename_suffix.clone() { + Some(suffix) => match string_without_suffix(&without_prefix, &suffix) { + Some(stripped) => stripped.clone(), + None => return "".to_string(), + }, + None => without_prefix, + }; + v2_rt::concat( + v2_rt::concat( + " #[serde(rename = \"".to_string(), + to_snake(without_suffix), + ), + "\")]\n".to_string(), + ) + } + } else { + "".to_string() + } + } + None => "".to_string(), + } } -pub fn untagged_json_tuple_variant_shape_validations(children: &Rc>>, env: Rc, serde_policy: &Rc) -> String { - match serde_policy.untagged_string_variant.clone() { - Some(sv) => { - let sf = match serde_policy.untagged_string_field.clone() { - Some(x) => x.clone(), - None => "".to_string(), -}; -let av = match serde_policy.untagged_array_variant.clone() { - Some(x) => x.clone(), - None => "".to_string(), -}; -let af = match serde_policy.untagged_array_field.clone() { - Some(x) => x.clone(), - None => "".to_string(), -}; -if (((sf.clone().as_str() == "".to_string().as_str()) || (av.clone().as_str() == "".to_string().as_str())) || (af.clone().as_str() == "".to_string().as_str())) { - emit_rust_compile_error_item("UntaggedJsonStringOrArray requires string_field, array_variant, and array_field literals".to_string()) - } else { - if ((children.clone().len() as i64) != 2) { - emit_rust_compile_error_item("UntaggedJsonStringOrArray coproduct must have exactly two variants".to_string()) - } else { +pub fn variant_rename_validation_for_policy( + authored: &String, + policy: &Rc, +) -> String { + match policy.rename_style.clone() { + Some(style) => { + if (style.clone().as_str() == "StripAffixAndSnakeCase".to_string().as_str()) { { - let diags = Rc::new({ let mut __result = Vec::new(); for child in children.clone().iter().cloned() { __result.extend((*{ - let nm = authored_name(env.clone(), child.clone()); -if ((child.children.clone().len() as i64) == 0) { - Rc::new(vec![emit_rust_compile_error_item(v2_rt::concat("UntaggedJsonStringOrArray requires fielded variants; got unit ".to_string(), nm.clone()))]) - } else { - if (nm.clone().as_str() == sv.clone().as_str()) { - { - let field_names = Rc::new({ let mut __result = Vec::new(); for f in child.children.clone().iter().cloned() { __result.push(authored_name(env.clone(), f.clone())); } __result }); -if ((field_names.clone().len() as i64) != 1) { - Rc::new(vec![emit_rust_compile_error_item(v2_rt::concat(v2_rt::concat("UntaggedJsonStringOrArray string arm ".to_string(), sv.clone()), " must declare exactly one field".to_string()))]) - } else { - match field_names.clone().first().cloned() { - Some(only) => if (only.clone().as_str() != sf.clone().as_str()) { - Rc::new(vec![emit_rust_compile_error_item(v2_rt::concat("UntaggedJsonStringOrArray string arm field must be named ".to_string(), sf.clone()))]) - } else { - Rc::new(vec![]) - }, - None => Rc::new(vec![emit_rust_compile_error_item("UntaggedJsonStringOrArray string arm field name missing".to_string())]), -} - } -} - } else { - if (nm.clone().as_str() == av.clone().as_str()) { - { - let field_names = Rc::new({ let mut __result = Vec::new(); for f in child.children.clone().iter().cloned() { __result.push(authored_name(env.clone(), f.clone())); } __result }); -if ((field_names.clone().len() as i64) != 1) { - Rc::new(vec![emit_rust_compile_error_item(v2_rt::concat(v2_rt::concat("UntaggedJsonStringOrArray array arm ".to_string(), av.clone()), " must declare exactly one field".to_string()))]) - } else { - match field_names.clone().first().cloned() { - Some(only) => if (only.clone().as_str() != af.clone().as_str()) { - Rc::new(vec![emit_rust_compile_error_item(v2_rt::concat("UntaggedJsonStringOrArray array arm field must be named ".to_string(), af.clone()))]) - } else { - Rc::new(vec![]) - }, - None => Rc::new(vec![emit_rust_compile_error_item("UntaggedJsonStringOrArray array arm field name missing".to_string())]), -} - } -} - } else { - Rc::new(vec![emit_rust_compile_error_item(v2_rt::concat("UntaggedJsonStringOrArray unexpected variant ".to_string(), nm.clone()))]) - } + let without_prefix = match policy.rename_prefix.clone() { + Some(prefix) => match string_without_prefix(&authored, &prefix) { + Some(stripped) => stripped.clone(), + None => { + return emit_rust_compile_error_item(v2_rt::concat( + v2_rt::concat( + v2_rt::concat("variant ".to_string(), authored.clone()), + " does not satisfy declared wire rename prefix: " + .to_string(), + ), + prefix.clone(), + )) } - } -}).iter().cloned()); } __result }); -Rc::new({ let mut __result = Vec::new(); for t in diags.iter().cloned() { if (t.clone().as_str() != "".to_string().as_str()) { __result.push(t); } } __result }).join(&"\n".to_string()) -} + }, + None => authored.clone(), + }; + match policy.rename_suffix.clone() { + Some(suffix) => match string_without_suffix(&without_prefix, &suffix) { + Some(_) => "".to_string(), + None => emit_rust_compile_error_item(v2_rt::concat( + v2_rt::concat( + v2_rt::concat("variant ".to_string(), authored.clone()), + " does not satisfy declared wire rename suffix: ".to_string(), + ), + suffix.clone(), + )), + }, + None => "".to_string(), + } + } + } else { + "".to_string() } } -}, - None => "".to_string(), + None => "".to_string(), + } } + +pub fn variant_rename_validations_for_policy( + children: Rc>>, + env: Rc, + serde_policy: Rc, +) -> String { + Rc::new({ + let mut __result = Vec::new(); + for text in Rc::new({ + let mut __result = Vec::new(); + for child in children.iter().cloned() { + __result.push(variant_rename_validation_for_policy( + &authored_name(env.clone(), child.clone()), + &serde_policy, + )); + } + __result + }) + .iter() + .cloned() + { + if (text.clone().as_str() != "".to_string().as_str()) { + __result.push(text); + } + } + __result + }) + .join(&"\n".to_string()) } -pub fn emit_variant_from_child(child: &Rc, recursive_types: Rc>, shared_types: &Rc>, env: &Rc, serde_policy: &Rc) -> String { +pub fn emit_variant_from_child( + child: &Rc, + recursive_types: Rc>, + shared_types: Rc>, + env: &Rc, + serde_policy: Rc, +) -> String { { let child_text = authored_name(env.clone(), child.clone()); -let rename_attr = wire_variant_rename_attr_for_policy(child_text.clone(), &serde_policy); -if ((child.children.clone().len() as i64) == 0) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(rename_attr, " ".to_string()), child_text.clone()), ",".to_string()) - } else { - match serde_policy.untagged_string_variant.clone() { - Some(sv) => { - let sf = match serde_policy.untagged_string_field.clone() { - Some(x) => x.clone(), - None => "".to_string(), -}; -let av = match serde_policy.untagged_array_variant.clone() { - Some(x) => x.clone(), - None => "".to_string(), -}; -let af = match serde_policy.untagged_array_field.clone() { - Some(x) => x.clone(), - None => "".to_string(), -}; -if (child_text.clone().as_str() == sv.clone().as_str()) { - { - let matched = Rc::new({ let mut __result = Vec::new(); for f in child.children.clone().iter().cloned() { if (authored_name(env.clone(), f.clone()).as_str() == sf.clone().as_str()) { __result.push(f); } } __result }); -match matched.first().cloned() { - Some(f) => { + let rename_attr = wire_variant_rename_attr_for_policy(child_text.clone(), &serde_policy); + if ((child.children.clone().len() as i64) == 0) { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(rename_attr, " ".to_string()), + child_text.clone(), + ), + ",".to_string(), + ) + } else { + { + let field_lines = Rc::new({ + let mut __result = Vec::new(); + for f in child.children.clone().iter().cloned() { + __result.push({ let rt_f = resolved_type(f.clone()); -let ty = render_rust_type(rt_f.clone(), shared_types.clone(), env.source_indices.clone()); -let final_ty = if needs_box_wrapping(rt_f.clone(), recursive_types.clone(), shared_types.clone(), env.source_indices.clone()) { - v2_rt::concat(v2_rt::concat("Box<".to_string(), ty.clone()), ">".to_string()) + let ty = render_rust_type( + rt_f.clone(), + shared_types.clone(), + env.source_indices.clone(), + ); + let final_ty = if needs_box_wrapping( + rt_f.clone(), + recursive_types.clone(), + shared_types.clone(), + env.source_indices.clone(), + ) { + v2_rt::concat( + v2_rt::concat("Box<".to_string(), ty.clone()), + ">".to_string(), + ) } else { ty.clone() }; -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rename_attr, " ".to_string()), child_text.clone()), "(".to_string()), final_ty.clone()), "),".to_string()) -}, - None => v2_rt::concat(v2_rt::concat(v2_rt::concat(emit_rust_compile_error_item(v2_rt::concat("internal: UntaggedJsonStringOrArray missing field ".to_string(), sf.clone())), "\n ".to_string()), child_text.clone()), "{},".to_string()), -} -} - } else { - if (child_text.clone().as_str() == av.as_str()) { - { - let matched = Rc::new({ let mut __result = Vec::new(); for f in child.children.clone().iter().cloned() { if (authored_name(env.clone(), f.clone()).as_str() == af.clone().as_str()) { __result.push(f); } } __result }); -match matched.first().cloned() { - Some(f) => { - let rt_f = resolved_type(f.clone()); -let ty = render_rust_type(rt_f.clone(), shared_types.clone(), env.source_indices.clone()); -let final_ty = if needs_box_wrapping(rt_f.clone(), recursive_types.clone(), shared_types.clone(), env.source_indices.clone()) { - v2_rt::concat(v2_rt::concat("Box<".to_string(), ty.clone()), ">".to_string()) - } else { - ty.clone() - }; -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rename_attr, " ".to_string()), child_text.clone()), "(".to_string()), final_ty.clone()), "),".to_string()) -}, - None => v2_rt::concat(v2_rt::concat(v2_rt::concat(emit_rust_compile_error_item(v2_rt::concat("internal: UntaggedJsonStringOrArray missing field ".to_string(), af.clone())), "\n ".to_string()), child_text.clone()), "{},".to_string()), -} -} - } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(emit_rust_compile_error_item(v2_rt::concat("internal: UntaggedJsonStringOrArray unexpected variant ".to_string(), child_text.clone())), "\n ".to_string()), child_text.clone()), "{},".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + " ".to_string(), + emit_ident( + authored_name(env.clone(), f.clone()), + RenderTarget::Rust, + ), + ), + ": ".to_string(), + ), + final_ty.clone(), + ), + ",".to_string(), + ) + }); } - } -}, - None => { - let field_lines = Rc::new({ let mut __result = Vec::new(); for f in child.children.clone().iter().cloned() { __result.push({ - let rt_f = resolved_type(f.clone()); -let ty = render_rust_type(rt_f.clone(), shared_types.clone(), env.source_indices.clone()); -let final_ty = if needs_box_wrapping(rt_f.clone(), recursive_types.clone(), shared_types.clone(), env.source_indices.clone()) { - v2_rt::concat(v2_rt::concat("Box<".to_string(), ty.clone()), ">".to_string()) - } else { - ty.clone() - }; -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), emit_ident(authored_name(env.clone(), f.clone()), RenderTarget::Rust)), ": ".to_string()), final_ty.clone()), ",".to_string()) -}); } __result }); -let fields_str = field_lines.join(&"\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rename_attr, " ".to_string()), child_text.clone()), " {\n".to_string()), fields_str), "\n },".to_string()) -}, -} + __result + }); + let fields_str = field_lines.join(&"\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(rename_attr, " ".to_string()), + child_text.clone(), + ), + " {\n".to_string(), + ), + fields_str, + ), + "\n },".to_string(), + ) + } } -} + } } -pub fn emit_fn_def(name: &String, params: &Rc>>, inferred: Rc, body: &Rc, registry: &Rc>>, scope: &Rc, shared_types: &Rc>, emit_info: &Rc) -> String { +pub fn emit_fn_def( + name: &String, + params: &Rc>>, + inferred: Rc, + body: &Rc, + registry: &Rc>>, + scope: &Rc, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { { let si = scope.type_env.clone().source_indices.clone(); -let type_params = function_type_params(params.clone()); -let value_params = function_value_params(params.clone()); -if function_type_params_have_collision(type_params.clone()) { - return v2_rt::concat(v2_rt::concat("compile_error!(\"type param name collides with a value param in fn '".to_string(), name.clone()), "' — a value param shares its name with a declared type param; rename the value param or dissolve via ParamKind/params-slot partition\");\n".to_string()) - } -let type_params_str = emit_type_params(&type_params, si.clone()); -let params_str = emit_params(value_params.clone(), shared_types.clone(), si.clone(), emit_info.read_only_params.clone()); -let ret_str = emit_inferred(inferred, shared_types.clone(), si.clone()); -let body_scope = build_params_scope(&scope, value_params.clone()); -let depth = 0; -let use_tco = is_tco_eligible(&name, &body, registry.clone(), &si); -let needs_stacker = (is_self_recursive(&name, body.clone(), registry.clone(), si.clone()) && (use_tco.clone() == false)); -if use_tco.clone() { + let type_params = function_type_params(params.clone()); + let value_params = function_value_params(params.clone()); + if function_type_params_have_collision(type_params.clone()) { + return v2_rt::concat(v2_rt::concat("compile_error!(\"type param name collides with a value param in fn '".to_string(), name.clone()), "' — a value param shares its name with a declared type param; rename the value param or dissolve via ParamKind/params-slot partition\");\n".to_string()); + } + let type_params_str = emit_type_params(&type_params, si.clone()); + let params_str = emit_params( + value_params.clone(), + shared_types.clone(), + si.clone(), + emit_info.read_only_params.clone(), + ); + let ret_str = emit_inferred(inferred, shared_types.clone(), si.clone()); + let body_scope = build_params_scope(&scope, value_params.clone()); + let depth = 0; + let use_tco = is_tco_eligible(&name, &body, registry.clone(), &si); + let needs_stacker = (is_self_recursive(&name, body.clone(), registry.clone(), si.clone()) + && (use_tco.clone() == false)); + if use_tco.clone() { { - let tco_params_str = emit_tco_params(value_params.clone(), shared_types.clone(), si.clone()); -let body_str = emit_typed_tco_body(body.clone(), name.clone(), value_params.clone(), registry.clone(), body_scope, (depth.clone() + 1), shared_types.clone(), emit_info.clone()); -let kw = rust_items().func_keyword.clone(); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), kw), " ".to_string()), emit_ident(name.clone(), RenderTarget::Rust)), type_params_str), "(".to_string()), tco_params_str), ")".to_string()), ret_str), " {\n".to_string()), make_indent((depth.clone() + 1))), body_str), "\n}".to_string()) -} + let tco_params_str = + emit_tco_params(value_params.clone(), shared_types.clone(), si.clone()); + let body_str = emit_typed_tco_body( + body.clone(), + name.clone(), + value_params.clone(), + registry.clone(), + body_scope, + (depth.clone() + 1), + shared_types.clone(), + emit_info.clone(), + ); + let kw = rust_items().func_keyword.clone(); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + rust_visibility_prefix(), + kw, + ), + " ".to_string(), + ), + emit_ident( + name.clone(), + RenderTarget::Rust, + ), + ), + type_params_str, + ), + "(".to_string(), + ), + tco_params_str, + ), + ")".to_string(), + ), + ret_str, + ), + " {\n".to_string(), + ), + make_indent((depth.clone() + 1)), + ), + body_str, + ), + "\n}".to_string(), + ) + } } else { - emit_fn_def_non_tco(name.clone(), type_params_str, params_str, ret_str, body.clone(), registry.clone(), body_scope, depth.clone(), shared_types.clone(), emit_info.clone(), needs_stacker) + emit_fn_def_non_tco( + name.clone(), + type_params_str, + params_str, + ret_str, + body.clone(), + registry.clone(), + body_scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + needs_stacker, + ) } -} + } } -pub fn emit_fn_def_non_tco(name: String, type_params_str: String, params_str: String, ret_str: String, body: Rc, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc, needs_stacker: bool) -> String { +pub fn emit_fn_def_non_tco( + name: String, + type_params_str: String, + params_str: String, + ret_str: String, + body: Rc, + registry: Rc>>, + scope: Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, + needs_stacker: bool, +) -> String { if needs_stacker { { - let body_str = emit_typed_expr(body, registry, &scope, (depth.clone() + 2), shared_types, emit_info, 1024); -let kw = rust_items().func_keyword.clone(); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), kw), " ".to_string()), emit_ident(name, RenderTarget::Rust)), type_params_str), "(".to_string()), params_str), ")".to_string()), ret_str), " {\n".to_string()), make_indent((depth.clone() + 1))), "stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || {\n".to_string()), make_indent((depth.clone() + 2))), body_str), "\n".to_string()), make_indent((depth.clone() + 1))), "})\n}".to_string()) -} + let body_str = emit_typed_expr( + body, + registry, + &scope, + (depth.clone() + 2), + shared_types, + emit_info, + 1024, + ); + let kw = rust_items().func_keyword.clone(); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + rust_visibility_prefix( + ), + kw, + ), + " ".to_string(), + ), + emit_ident( + name, + RenderTarget::Rust, + ), + ), + type_params_str, + ), + "(".to_string(), + ), + params_str, + ), + ")".to_string(), + ), + ret_str, + ), + " {\n".to_string(), + ), + make_indent((depth.clone() + 1)), + ), + "stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || {\n" + .to_string(), + ), + make_indent((depth.clone() + 2)), + ), + body_str, + ), + "\n".to_string(), + ), + make_indent((depth.clone() + 1)), + ), + "})\n}".to_string(), + ) + } } else { { - let body_str = emit_typed_expr(body, registry, &scope, (depth.clone() + 1), shared_types, emit_info, 1024); -let kw = rust_items().func_keyword.clone(); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), kw), " ".to_string()), emit_ident(name, RenderTarget::Rust)), type_params_str), "(".to_string()), params_str), ")".to_string()), ret_str), " {\n".to_string()), make_indent((depth.clone() + 1))), body_str), "\n}".to_string()) -} + let body_str = emit_typed_expr( + body, + registry, + &scope, + (depth.clone() + 1), + shared_types, + emit_info, + 1024, + ); + let kw = rust_items().func_keyword.clone(); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(rust_visibility_prefix(), kw), + " ".to_string(), + ), + emit_ident(name, RenderTarget::Rust), + ), + type_params_str, + ), + "(".to_string(), + ), + params_str, + ), + ")".to_string(), + ), + ret_str, + ), + " {\n".to_string(), + ), + make_indent((depth.clone() + 1)), + ), + body_str, + ), + "\n}".to_string(), + ) + } } } -pub fn emit_func_def(name: &String, params: &Rc>>, inferred: Rc, uses: &Rc>>, body: Rc, registry: &Rc>>, scope: &Rc, shared_types: &Rc>, emit_info: &Rc) -> String { +pub fn emit_func_def( + name: &String, + params: &Rc>>, + inferred: Rc, + uses: &Rc>>, + body: Rc, + registry: &Rc>>, + scope: &Rc, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { { if ((function_type_params(params.clone()).len() as i64) > 0) { - return v2_rt::concat(v2_rt::concat("compile_error!(\"emit_func_def saw type params in `".to_string(), name.clone()), "` — func/pattern/interface don't route through the generic-fn split today; the parser invariant at parse_block_body_from_prefix has changed. Plumb type_params through this path or dissolve via ParamKind/params-slot partition.\");\n".to_string()) + return v2_rt::concat(v2_rt::concat("compile_error!(\"emit_func_def saw type params in `".to_string(), name.clone()), "` — func/pattern/interface don't route through the generic-fn split today; the parser invariant at parse_block_body_from_prefix has changed. Plumb type_params through this path or dissolve via ParamKind/params-slot partition.\");\n".to_string()); } -let depth = 0; -let service_names = match lookup_item(registry.clone(), name.clone()) { - Some(info) => info.service_names.clone(), - None => Rc::new(vec![]), -}; -let params_str = emit_func_params(params.clone(), uses.clone(), service_names, shared_types.clone(), scope.type_env.clone().source_indices.clone(), emit_info.read_only_params.clone()); -let ret_str = emit_func_inferred(inferred, shared_types.clone(), scope.type_env.clone().source_indices.clone()); -let body_scope = build_params_scope(&scope, params.clone()); -let si = scope.type_env.clone().source_indices.clone(); -let body_scope = uses.clone().iter().cloned().fold(body_scope.clone(), |s: Rc, u: Rc| extend_scope(&s, &resource_use_name_at(u.clone(), si.clone()), resource_use_resource(&u), Rc::new(SubValueRelation::SubValueUnknown))); -let body_str = emit_func_body(&body, ®istry, &body_scope, (depth.clone() + 1), &shared_types, &emit_info); -let items = rust_items(); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), items.async_prefix.clone()), items.func_keyword.clone()), " ".to_string()), emit_ident(name.clone(), RenderTarget::Rust)), "(".to_string()), params_str), ")".to_string()), ret_str), " {\n".to_string()), make_indent((depth.clone() + 1))), body_str), "\n}".to_string()) -} + let depth = 0; + let service_names = match lookup_item(registry.clone(), name.clone()) { + Some(info) => info.service_names.clone(), + None => Rc::new(vec![]), + }; + let params_str = emit_func_params( + params.clone(), + uses.clone(), + service_names, + shared_types.clone(), + scope.type_env.clone().source_indices.clone(), + emit_info.read_only_params.clone(), + ); + let ret_str = emit_func_inferred( + inferred, + shared_types.clone(), + scope.type_env.clone().source_indices.clone(), + ); + let body_scope = build_params_scope(&scope, params.clone()); + let si = scope.type_env.clone().source_indices.clone(); + let body_scope = uses.clone().iter().cloned().fold( + body_scope.clone(), + |s: Rc, u: Rc| { + extend_scope( + &s, + &resource_use_name_at(u.clone(), si.clone()), + resource_use_resource(&u), + Rc::new(SubValueRelation::SubValueUnknown), + ) + }, + ); + let body_str = emit_func_body( + &body, + ®istry, + &body_scope, + (depth.clone() + 1), + &shared_types, + &emit_info, + ); + let items = rust_items(); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + rust_visibility_prefix(), + items.async_prefix.clone(), + ), + items.func_keyword.clone(), + ), + " ".to_string(), + ), + emit_ident(name.clone(), RenderTarget::Rust), + ), + "(".to_string(), + ), + params_str, + ), + ")".to_string(), + ), + ret_str, + ), + " {\n".to_string(), + ), + make_indent((depth.clone() + 1)), + ), + body_str, + ), + "\n}".to_string(), + ) + } } -pub fn emit_func_body(body: &Rc, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { +pub fn emit_func_body( + body: &Rc, + registry: &Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let si = scope.type_env.clone().source_indices.clone(); -match (*body.expr_data.clone()).clone() { - ExprData::ExprLet => { + let si = scope.type_env.clone().source_indices.clone(); + match (*body.expr_data.clone()).clone() { + ExprData::ExprLet => { let n = let_binding_name_at(body.clone(), si); -let v = let_value(body.clone()); -let inner = let_body(body.clone()); -let val_str = emit_typed_expr(v.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let let_line = emit_let_binding(n.clone(), val_str, &RenderTarget::Rust); -let next_scope = extend_scope(&scope, &n, resolved_type(v.clone()), Rc::new(SubValueRelation::SubValueUnknown)); -match inner { - Some(bd) => v2_rt::concat(v2_rt::concat(let_line, "\n".to_string()), emit_func_body(&bd, ®istry, &next_scope, depth.clone(), &shared_types, &emit_info)), - None => let_line, -} -}, - ExprData::ExprBlock => { + let v = let_value(body.clone()); + let inner = let_body(body.clone()); + let val_str = emit_typed_expr( + v.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let let_line = emit_let_binding(n.clone(), val_str, &RenderTarget::Rust); + let next_scope = extend_scope( + &scope, + &n, + resolved_type(v.clone()), + Rc::new(SubValueRelation::SubValueUnknown), + ); + match inner { + Some(bd) => v2_rt::concat( + v2_rt::concat(let_line, "\n".to_string()), + emit_func_body( + &bd, + ®istry, + &next_scope, + depth.clone(), + &shared_types, + &emit_info, + ), + ), + None => let_line, + } + } + ExprData::ExprBlock => { let ss = body.children.clone(); -if ((ss.clone().len() as i64) == 0) { + if ((ss.clone().len() as i64) == 0) { "Ok(())".to_string() } else { { - let init_state = emit_rust_init_block_stmts(ss.clone(), Rc::new(vec![]), scope.clone(), registry.clone(), depth.clone(), shared_types.clone(), emit_info.clone()); -let last_stmt = ss.clone().last().cloned(); -let last_str = match last_stmt { - Some(s) => match (*s.expr_data.clone()).clone() { - ExprData::ExprReturn => v2_rt::concat(v2_rt::concat("return Ok(".to_string(), emit_typed_expr(return_value(s.clone()), registry.clone(), &init_state.scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone(), 1024)), ")".to_string()), - _ => v2_rt::concat(v2_rt::concat("Ok(".to_string(), emit_typed_expr(s.clone(), registry.clone(), &init_state.scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone(), 1024)), ")".to_string()), -}, - None => "Ok(())".to_string(), -}; -if ((init_state.text.clone().len() as i64) == 0) { + let init_state = emit_rust_init_block_stmts( + ss.clone(), + Rc::new(vec![]), + scope.clone(), + registry.clone(), + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ); + let last_stmt = ss.clone().last().cloned(); + let last_str = match last_stmt { + Some(s) => match (*s.expr_data.clone()).clone() { + ExprData::ExprReturn => v2_rt::concat( + v2_rt::concat( + "return Ok(".to_string(), + emit_typed_expr( + return_value(s.clone()), + registry.clone(), + &init_state.scope.clone(), + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ), + ), + ")".to_string(), + ), + _ => v2_rt::concat( + v2_rt::concat( + "Ok(".to_string(), + emit_typed_expr( + s.clone(), + registry.clone(), + &init_state.scope.clone(), + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ), + ), + ")".to_string(), + ), + }, + None => "Ok(())".to_string(), + }; + if ((init_state.text.clone().len() as i64) == 0) { last_str } else { - v2_rt::concat(v2_rt::concat(init_state.text.clone().join(&"\n".to_string()), "\n".to_string()), last_str) + v2_rt::concat( + v2_rt::concat( + init_state.text.clone().join(&"\n".to_string()), + "\n".to_string(), + ), + last_str, + ) } -} + } } -}, - ExprData::ExprReturn => v2_rt::concat(v2_rt::concat("return Ok(".to_string(), emit_typed_expr(return_value(body.clone()), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024)), ")".to_string()), - _ => v2_rt::concat(v2_rt::concat("Ok(".to_string(), emit_typed_expr(body.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024)), ")".to_string()), -} -} + } + ExprData::ExprReturn => v2_rt::concat( + v2_rt::concat( + "return Ok(".to_string(), + emit_typed_expr( + return_value(body.clone()), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ), + ), + ")".to_string(), + ), + _ => v2_rt::concat( + v2_rt::concat( + "Ok(".to_string(), + emit_typed_expr( + body.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ), + ), + ")".to_string(), + ), + } }) } -pub fn emit_tco_params(params: Rc>>, shared_types: Rc>, source_indices: Rc>>) -> String { +pub fn emit_tco_params( + params: Rc>>, + shared_types: Rc>, + source_indices: Rc>>, +) -> String { { - let strs = Rc::new({ let mut __result = Vec::new(); for p in params.iter().cloned() { __result.push(emit_tco_param(&p, shared_types.clone(), &source_indices)); } __result }); -strs.join(&", ".to_string()) -} + let strs = Rc::new({ + let mut __result = Vec::new(); + for p in params.iter().cloned() { + __result.push(emit_tco_param(&p, shared_types.clone(), &source_indices)); + } + __result + }); + strs.join(&", ".to_string()) + } } -pub fn emit_tco_param(param: &Rc, shared_types: Rc>, source_indices: &Rc>>) -> String { +pub fn emit_tco_param( + param: &Rc, + shared_types: Rc>, + source_indices: &Rc>>, +) -> String { { let n = param_node_type_expr(¶m); -let ty = emit_rust_param_type(&n, &shared_types, &source_indices); -v2_rt::concat(v2_rt::concat(v2_rt::concat("mut ".to_string(), emit_ident(param_node_name_at(param.clone(), source_indices.clone()), RenderTarget::Rust)), rust_items().param_type_sep.clone()), ty) -} -} - -pub fn emit_func_params(params: Rc>>, uses: Rc>>, service_names: Rc>, shared_types: Rc>, source_indices: Rc>>, read_only_params: Rc>) -> String { - { - let param_strs = Rc::new({ let mut __result = Vec::new(); for p in params.iter().cloned() { __result.push(emit_param(&p, shared_types.clone(), &source_indices, read_only_params.clone())); } __result }); -let resource_strs = Rc::new({ let mut __result = Vec::new(); for u in uses.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(emit_ident(resource_use_name_at(u.clone(), source_indices.clone()), RenderTarget::Rust), ": &".to_string()), render_rust_type(resource_use_resource(&u), shared_types.clone(), source_indices.clone()))); } __result }); -let service_strs = Rc::new({ let mut __result = Vec::new(); for sn in service_names.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(service_var_name(sn.clone()), ": &".to_string()), sanitize_service_name(sn.clone()))); } __result }); -let all_params = v2_rt::concat(v2_rt::concat(param_strs, resource_strs), service_strs); -all_params.join(&", ".to_string()) -} + let ty = emit_rust_param_type(&n, &shared_types, &source_indices); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "mut ".to_string(), + emit_ident( + param_node_name_at(param.clone(), source_indices.clone()), + RenderTarget::Rust, + ), + ), + rust_items().param_type_sep.clone(), + ), + ty, + ) + } } -pub fn emit_func_inferred(inferred: Rc, shared_types: Rc>, source_indices: Rc>>) -> String { - v2_rt::concat(v2_rt::concat(" -> Result<".to_string(), render_rust_type(inferred, shared_types, source_indices)), ", Box>".to_string()) +pub fn emit_func_params( + params: Rc>>, + uses: Rc>>, + service_names: Rc>, + shared_types: Rc>, + source_indices: Rc>>, + read_only_params: Rc>, +) -> String { + { + let param_strs = Rc::new({ + let mut __result = Vec::new(); + for p in params.iter().cloned() { + __result.push(emit_param( + &p, + shared_types.clone(), + &source_indices, + read_only_params.clone(), + )); + } + __result + }); + let resource_strs = Rc::new({ + let mut __result = Vec::new(); + for u in uses.iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + emit_ident( + resource_use_name_at(u.clone(), source_indices.clone()), + RenderTarget::Rust, + ), + ": &".to_string(), + ), + render_rust_type( + resource_use_resource(&u), + shared_types.clone(), + source_indices.clone(), + ), + )); + } + __result + }); + let service_strs = Rc::new({ + let mut __result = Vec::new(); + for sn in service_names.iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat(service_var_name(sn.clone()), ": &".to_string()), + sanitize_service_name(sn.clone()), + )); + } + __result + }); + let all_params = v2_rt::concat(v2_rt::concat(param_strs, resource_strs), service_strs); + all_params.join(&", ".to_string()) + } } -pub fn emit_params(params: Rc>>, shared_types: Rc>, source_indices: Rc>>, read_only_params: Rc>) -> String { - { - let strs = Rc::new({ let mut __result = Vec::new(); for p in params.iter().cloned() { __result.push(emit_param(&p, shared_types.clone(), &source_indices, read_only_params.clone())); } __result }); -strs.join(&", ".to_string()) -} +pub fn emit_func_inferred( + inferred: Rc, + shared_types: Rc>, + source_indices: Rc>>, +) -> String { + v2_rt::concat( + v2_rt::concat( + " -> Result<".to_string(), + render_rust_type(inferred, shared_types, source_indices), + ), + ", Box>".to_string(), + ) +} + +pub fn emit_params( + params: Rc>>, + shared_types: Rc>, + source_indices: Rc>>, + read_only_params: Rc>, +) -> String { + { + let strs = Rc::new({ + let mut __result = Vec::new(); + for p in params.iter().cloned() { + __result.push(emit_param( + &p, + shared_types.clone(), + &source_indices, + read_only_params.clone(), + )); + } + __result + }); + strs.join(&", ".to_string()) + } } -pub fn emit_rust_param_type(n: &Rc, shared_types: &Rc>, source_indices: &Rc>>) -> String { +pub fn emit_rust_param_type( + n: &Rc, + shared_types: &Rc>, + source_indices: &Rc>>, +) -> String { if ((n.params.clone().len() as i64) > 0) { { - let param_types = Rc::new({ let mut __result = Vec::new(); for p in n.params.clone().iter().cloned() { __result.push(render_rust_type(param_node_type_expr(&p), shared_types.clone(), source_indices.clone())); } __result }); -let param_str = param_types.join(&", ".to_string()); -let ret_str = match n.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => render_rust_type(rt.clone(), shared_types.clone(), source_indices.clone()), - _ => "()".to_string(), -}; -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("impl Fn(".to_string(), param_str), ") -> ".to_string()), ret_str), " + Clone".to_string()) -} + let param_types = Rc::new({ + let mut __result = Vec::new(); + for p in n.params.clone().iter().cloned() { + __result.push(render_rust_type( + param_node_type_expr(&p), + shared_types.clone(), + source_indices.clone(), + )); + } + __result + }); + let param_str = param_types.join(&", ".to_string()); + let ret_str = match n.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + render_rust_type(rt.clone(), shared_types.clone(), source_indices.clone()) + } + _ => "()".to_string(), + }; + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("impl Fn(".to_string(), param_str), + ") -> ".to_string(), + ), + ret_str, + ), + " + Clone".to_string(), + ) + } } else { render_rust_type(n.clone(), shared_types.clone(), source_indices.clone()) } } -pub fn emit_param(param: &Rc, shared_types: Rc>, source_indices: &Rc>>, read_only_params: Rc>) -> String { +pub fn emit_param( + param: &Rc, + shared_types: Rc>, + source_indices: &Rc>>, + read_only_params: Rc>, +) -> String { { let n = param_node_type_expr(¶m); -let ty = emit_rust_param_type(&n, &shared_types, &source_indices); -let pname = param_node_name_at(param.clone(), source_indices.clone()); -let is_callable_param = ((n.params.clone().len() as i64) > 0); -let is_borrowable = ((set_contains(read_only_params, pname.clone()) && (is_callable_param == false)) && needs_reference_node(&n, source_indices.clone())); -let final_ty = if is_borrowable { - apply_type_template1(sharing_for_target(RenderTarget::Rust).borrow_param_template.clone(), ty) + let ty = emit_rust_param_type(&n, &shared_types, &source_indices); + let pname = param_node_name_at(param.clone(), source_indices.clone()); + let is_callable_param = ((n.params.clone().len() as i64) > 0); + let is_borrowable = ((v2_rt::map_contains_key(&read_only_params, pname.clone()) + && (is_callable_param == false)) + && needs_reference_node(&n, source_indices.clone())); + let final_ty = if is_borrowable { + apply_type_template1( + sharing_for_target(RenderTarget::Rust) + .borrow_param_template + .clone(), + ty, + ) } else { ty }; -v2_rt::concat(v2_rt::concat(emit_ident(pname.clone(), RenderTarget::Rust), rust_items().param_type_sep.clone()), final_ty) -} + v2_rt::concat( + v2_rt::concat( + emit_ident(pname.clone(), RenderTarget::Rust), + rust_items().param_type_sep.clone(), + ), + final_ty, + ) + } } -pub fn emit_inferred(inferred: Rc, shared_types: Rc>, source_indices: Rc>>) -> String { - v2_rt::concat(rust_items().return_arrow.clone(), render_rust_type(inferred, shared_types, source_indices)) +pub fn emit_inferred( + inferred: Rc, + shared_types: Rc>, + source_indices: Rc>>, +) -> String { + v2_rt::concat( + rust_items().return_arrow.clone(), + render_rust_type(inferred, shared_types, source_indices), + ) } -pub fn needs_reference_node(n: &Rc, source_indices: Rc>>) -> bool { - if ((n.connective.clone() != Connective::NoConnective) || ((n.children.clone().len() as i64) > 0)) { +pub fn needs_reference_node( + n: &Rc, + source_indices: Rc>>, +) -> bool { + if ((n.connective.clone() != Connective::NoConnective) + || ((n.children.clone().len() as i64) > 0)) + { true } else { { - let is_copy = (is_rust_value_type(n.clone(), source_indices) || (is_product_type(n.clone()) && ((n.children.clone().len() as i64) == 0))); -(is_copy == false) -} + let is_copy = (is_rust_value_type(n.clone(), source_indices) + || (is_product_type(n.clone()) && ((n.children.clone().len() as i64) == 0))); + (is_copy == false) + } } } pub fn is_string_lit_pattern(p: Rc) -> bool { match (*p).clone() { - MatchPattern::LitPattern { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitStr { .. } => true, - _ => false, -}, - _ => false, -} + MatchPattern::LitPattern { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitStr { .. } => true, + _ => false, + }, + _ => false, + } } -pub fn collect_pattern_string_guards(mut pattern: Rc, mut source_indices: Rc>>) -> String { +pub fn collect_pattern_string_guards( + mut pattern: Rc, + mut source_indices: Rc>>, +) -> String { loop { match (*pattern).clone() { - MatchPattern::VariantPattern { name: n, field_bindings: fbs, .. } => { if ((n.clone().as_str() == "Some".to_string().as_str()) && ((fbs.clone().len() as i64) == 1)) { - match fbs.clone().first().cloned() { - Some(fb) => { let fb_pat = field_binding_pattern(fb.clone()); -if is_string_lit_pattern(fb_pat.clone()) { - match (*fb_pat.clone()).clone() { - MatchPattern::LitPattern { ref value, .. } => { let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { unreachable!() }; break v2_rt::concat("__some_val == ".to_string(), emit_string_literal(s.clone(), "".to_string())); }, - _ => { break "".to_string(); }, -} -} else { + MatchPattern::VariantPattern { + name: n, + field_bindings: fbs, + .. + } => { + if ((n.clone().as_str() == "Some".to_string().as_str()) + && ((fbs.clone().len() as i64) == 1)) { - let __tco_0 = fb_pat.clone(); -pattern = __tco_0; -continue; -} -} }, - None => { break "".to_string(); }, -} -} else { - let str_bindings = Rc::new({ let mut __result = Vec::new(); for fb in fbs.clone().iter().cloned() { if is_string_lit_pattern(field_binding_pattern(fb.clone())) { __result.push(fb); } } __result }); -let guards = Rc::new({ let mut __result = Vec::new(); for fb in str_bindings.iter().cloned() { __result.push(match (*field_binding_pattern(fb.clone())).clone() { - MatchPattern::LitPattern { ref value, .. } => { let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { unreachable!() }; v2_rt::concat(v2_rt::concat(emit_ident(field_binding_name_at(fb.clone(), source_indices.clone()), RenderTarget::Rust), " == ".to_string()), emit_string_literal(s.clone(), "".to_string())) }, - _ => "".to_string(), -}); } __result }); -break guards.join(&" && ".to_string()); -} }, - _ => { break "".to_string(); }, -} -} + match fbs.clone().first().cloned() { + Some(fb) => { + let fb_pat = field_binding_pattern(fb.clone()); + if is_string_lit_pattern(fb_pat.clone()) { + match (*fb_pat.clone()).clone() { + MatchPattern::LitPattern { ref value, .. } => { + let LiteralValue::LitStr { value: s, .. } = value.as_ref() + else { + unreachable!() + }; + break v2_rt::concat( + "__some_val == ".to_string(), + emit_string_literal(s.clone(), "".to_string()), + ); + } + _ => { + break "".to_string(); + } + } + } else { + { + let __tco_0 = fb_pat.clone(); + pattern = __tco_0; + continue; + } + } + } + None => { + break "".to_string(); + } + } + } else { + let str_bindings = Rc::new({ + let mut __result = Vec::new(); + for fb in fbs.clone().iter().cloned() { + if is_string_lit_pattern(field_binding_pattern(fb.clone())) { + __result.push(fb); + } + } + __result + }); + let guards = Rc::new({ + let mut __result = Vec::new(); + for fb in str_bindings.iter().cloned() { + __result.push(match (*field_binding_pattern(fb.clone())).clone() { + MatchPattern::LitPattern { ref value, .. } => { + let LiteralValue::LitStr { value: s, .. } = value.as_ref() + else { + unreachable!() + }; + v2_rt::concat( + v2_rt::concat( + emit_ident( + field_binding_name_at( + fb.clone(), + source_indices.clone(), + ), + RenderTarget::Rust, + ), + " == ".to_string(), + ), + emit_string_literal(s.clone(), "".to_string()), + ) + } + _ => "".to_string(), + }); + } + __result + }); + break guards.join(&" && ".to_string()); + } + } + _ => { + break "".to_string(); + } + } + } } pub fn all_arms_are_string_lit(arms: &Rc>>) -> bool { - ({ let mut __all = true; for arm in arms.clone().iter().cloned() { if !(match (*arm_pattern(arm.clone())).clone() { - MatchPattern::LitPattern { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitStr { .. } => true, - _ => false, -}, - MatchPattern::Wildcard => true, - _ => false, -}) { __all = false; break; } } __all } && ((arms.clone().len() as i64) > 0)) + ({ + let mut __all = true; + for arm in arms.clone().iter().cloned() { + if !(match (*arm_pattern(arm.clone())).clone() { + MatchPattern::LitPattern { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitStr { .. } => true, + _ => false, + }, + MatchPattern::Wildcard => true, + _ => false, + }) { + __all = false; + break; + } + } + __all + } && ((arms.clone().len() as i64) > 0)) } pub fn has_string_lit_with_bind(arms: &Rc>>) -> bool { { - let has_lit = { let mut __found = false; for arm in arms.clone().iter().cloned() { if match (*arm_pattern(arm.clone())).clone() { - MatchPattern::LitPattern { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitStr { .. } => true, - _ => false, -}, - _ => false, -} { __found = true; break; } } __found }; -let has_bind = { let mut __found = false; for arm in arms.clone().iter().cloned() { if match (*arm_pattern(arm.clone())).clone() { - MatchPattern::Bind { .. } => true, - _ => false, -} { __found = true; break; } } __found }; -(has_lit && has_bind) -} + let has_lit = { + let mut __found = false; + for arm in arms.clone().iter().cloned() { + if match (*arm_pattern(arm.clone())).clone() { + MatchPattern::LitPattern { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitStr { .. } => true, + _ => false, + }, + _ => false, + } { + __found = true; + break; + } + } + __found + }; + let has_bind = { + let mut __found = false; + for arm in arms.clone().iter().cloned() { + if match (*arm_pattern(arm.clone())).clone() { + MatchPattern::Bind { .. } => true, + _ => false, + } { + __found = true; + break; + } + } + __found + }; + (has_lit && has_bind) + } } -pub fn emit_pattern(pattern: Rc, shared_types: Rc>, scrut_type: String, source_indices: Rc>>, emit_info: Rc) -> String { +pub fn emit_pattern( + pattern: Rc, + shared_types: Rc>, + scrut_type: String, + source_indices: Rc>>, + emit_info: Rc, +) -> String { match (*pattern).clone() { - MatchPattern::Bind { name: n, .. } => emit_ident(n.clone(), RenderTarget::Rust), - MatchPattern::LitPattern { value: v, .. } => rust_literal_for_pattern(v.clone()), - MatchPattern::VariantPattern { name: n, parent_enum, field_bindings: fbs, .. } => emit_variant_pattern(&n, parent_enum.clone(), &fbs, shared_types, &scrut_type, &source_indices, &emit_info), - MatchPattern::Wildcard => "_".to_string(), -} + MatchPattern::Bind { name: n, .. } => emit_ident(n.clone(), RenderTarget::Rust), + MatchPattern::LitPattern { value: v, .. } => rust_literal_for_pattern(v.clone()), + MatchPattern::VariantPattern { + name: n, + parent_enum, + field_bindings: fbs, + .. + } => emit_variant_pattern( + &n, + parent_enum.clone(), + &fbs, + shared_types, + &scrut_type, + source_indices, + &emit_info, + ), + MatchPattern::Wildcard => "_".to_string(), + } } -pub fn pattern_parent_enum(name: &String, parent_enum: Option, scrut_type: &String, type_summaries: Rc>>) -> Option { +pub fn pattern_parent_enum( + name: &String, + parent_enum: Option, + scrut_type: &String, + type_summaries: Rc>>, +) -> Option { { - let scrut_is_known_enum = ((scrut_type.clone().as_str() != "".to_string().as_str()) && is_enum_type_name(scrut_type.clone(), type_summaries)); -if ((name.clone().as_str() == "Some".to_string().as_str()) || (name.clone().as_str() == "None".to_string().as_str())) { + let scrut_is_known_enum = ((scrut_type.clone().as_str() != "".to_string().as_str()) + && is_enum_type_name(scrut_type.clone(), type_summaries)); + if ((name.clone().as_str() == "Some".to_string().as_str()) + || (name.clone().as_str() == "None".to_string().as_str())) + { None } else { if scrut_is_known_enum { @@ -2034,161 +4752,201 @@ if ((name.clone().as_str() == "Some".to_string().as_str()) || (name.clone().as_s parent_enum } } -} + } } -pub fn emit_variant_pattern(name: &String, parent_enum: Option, field_bindings: &Rc>>, shared_types: Rc>, scrut_type: &String, source_indices: &Rc>>, emit_info: &Rc) -> String { +pub fn emit_variant_pattern( + name: &String, + parent_enum: Option, + field_bindings: &Rc>>, + shared_types: Rc>, + scrut_type: &String, + source_indices: Rc>>, + emit_info: &Rc, +) -> String { { - let resolved_parent = if ((name.clone().as_str() == "Some".to_string().as_str()) || (name.clone().as_str() == "None".to_string().as_str())) { + let resolved_parent = if ((name.clone().as_str() == "Some".to_string().as_str()) + || (name.clone().as_str() == "None".to_string().as_str())) + { None } else { - pattern_parent_enum(&name, parent_enum, &scrut_type, emit_info.type_summaries.clone()) + pattern_parent_enum( + &name, + parent_enum, + &scrut_type, + emit_info.type_summaries.clone(), + ) }; -let qualified = match resolved_parent.clone() { - Some(parent) => v2_rt::concat(v2_rt::concat(parent.clone(), "::".to_string()), name.clone()), - None => name.clone(), -}; -if ((name.clone().as_str() == "Some".to_string().as_str()) && ((field_bindings.clone().len() as i64) == 1)) { + let qualified = match resolved_parent.clone() { + Some(parent) => v2_rt::concat( + v2_rt::concat(parent.clone(), "::".to_string()), + name.clone(), + ), + None => name.clone(), + }; + if ((name.clone().as_str() == "Some".to_string().as_str()) + && ((field_bindings.clone().len() as i64) == 1)) + { match field_bindings.clone().first().cloned() { - Some(fb) => { - let fb_pat = field_binding_pattern(fb.clone()); -if is_string_lit_pattern(fb_pat.clone()) { - "Some(ref __some_val)".to_string() - } else { - { - let inner_pat = emit_pattern(fb_pat.clone(), shared_types.clone(), scrut_type.clone(), source_indices.clone(), emit_info.clone()); -v2_rt::concat(v2_rt::concat("Some(".to_string(), inner_pat), ")".to_string()) -} + Some(fb) => { + let fb_pat = field_binding_pattern(fb.clone()); + if is_string_lit_pattern(fb_pat.clone()) { + "Some(ref __some_val)".to_string() + } else { + { + let inner_pat = emit_pattern( + fb_pat.clone(), + shared_types.clone(), + scrut_type.clone(), + source_indices.clone(), + emit_info.clone(), + ); + v2_rt::concat( + v2_rt::concat("Some(".to_string(), inner_pat), + ")".to_string(), + ) + } + } } -}, - None => qualified.clone(), -} + None => qualified.clone(), + } } else { if ((field_bindings.clone().len() as i64) == 0) { { let fielded_key = match resolved_parent.clone() { - Some(parent) => v2_rt::concat(v2_rt::concat(parent.clone(), "::".to_string()), name.clone()), - None => name.clone(), -}; -let is_untagged_tuple = (set_contains(emit_info.untagged_json_tuple_variants.clone(), fielded_key.clone()) || set_contains(emit_info.untagged_json_tuple_variants.clone(), qualified.clone())); -if is_untagged_tuple { - v2_rt::concat(qualified.clone(), "(..)".to_string()) + Some(parent) => v2_rt::concat( + v2_rt::concat(parent.clone(), "::".to_string()), + name.clone(), + ), + None => name.clone(), + }; + let is_fielded = + match v2_rt::map_get(&emit_info.fielded_variants.clone(), fielded_key) { + Some(true) => true, + _ => match v2_rt::map_get( + &emit_info.fielded_variants.clone(), + qualified.clone(), + ) { + Some(true) => true, + _ => false, + }, + }; + if is_fielded { + v2_rt::concat(qualified.clone(), " { .. }".to_string()) } else { - { - let is_fielded = match v2_rt::map_get(&emit_info.fielded_variants.clone(), fielded_key.clone()) { - Some(true) => true, - _ => match v2_rt::map_get(&emit_info.fielded_variants.clone(), qualified.clone()) { - Some(true) => true, - _ => false, -}, -}; -if is_fielded { - v2_rt::concat(qualified.clone(), " { .. }".to_string()) - } else { - qualified.clone() - } -} + qualified.clone() } -} + } } else { { - let effective_bindings = Rc::new({ let mut __result = Vec::new(); for fb in field_bindings.clone().iter().cloned() { if match (*field_binding_pattern(fb.clone())).clone() { - MatchPattern::Wildcard => false, - _ => true, -} { __result.push(fb); } } __result }); -if ((effective_bindings.clone().len() as i64) == 0) { + let effective_bindings = Rc::new({ + let mut __result = Vec::new(); + for fb in field_bindings.clone().iter().cloned() { + if match (*field_binding_pattern(fb.clone())).clone() { + MatchPattern::Wildcard => false, + _ => true, + } { + __result.push(fb); + } + } + __result + }); + if ((effective_bindings.clone().len() as i64) == 0) { { let fielded_key2 = match resolved_parent.clone() { - Some(parent) => v2_rt::concat(v2_rt::concat(parent.clone(), "::".to_string()), name.clone()), - None => name.clone(), -}; -let is_untagged_tuple2 = (set_contains(emit_info.untagged_json_tuple_variants.clone(), fielded_key2.clone()) || set_contains(emit_info.untagged_json_tuple_variants.clone(), qualified.clone())); -if is_untagged_tuple2 { - v2_rt::concat(qualified.clone(), "(..)".to_string()) + Some(parent) => v2_rt::concat( + v2_rt::concat(parent.clone(), "::".to_string()), + name.clone(), + ), + None => name.clone(), + }; + let is_fielded2 = match v2_rt::map_get( + &emit_info.fielded_variants.clone(), + fielded_key2, + ) { + Some(true) => true, + _ => match v2_rt::map_get( + &emit_info.fielded_variants.clone(), + qualified.clone(), + ) { + Some(true) => true, + _ => false, + }, + }; + if is_fielded2 { + v2_rt::concat(qualified.clone(), " { .. }".to_string()) } else { - { - let is_fielded2 = match v2_rt::map_get(&emit_info.fielded_variants.clone(), fielded_key2.clone()) { - Some(true) => true, - _ => match v2_rt::map_get(&emit_info.fielded_variants.clone(), qualified.clone()) { - Some(true) => true, - _ => false, -}, -}; -if is_fielded2 { - v2_rt::concat(qualified.clone(), " { .. }".to_string()) - } else { - qualified.clone() - } -} + qualified.clone() } -} + } } else { { - let tuple_key = match resolved_parent.clone() { - Some(parent) => v2_rt::concat(v2_rt::concat(parent.clone(), "::".to_string()), name.clone()), - None => qualified.clone(), -}; -let is_untagged_tuple3 = (set_contains(emit_info.untagged_json_tuple_variants.clone(), tuple_key) || set_contains(emit_info.untagged_json_tuple_variants.clone(), qualified.clone())); -if (is_untagged_tuple3 && ((effective_bindings.clone().len() as i64) == 1)) { - match effective_bindings.clone().first().cloned() { - Some(fb) => { - let fb_name = field_binding_name_at(fb.clone(), source_indices.clone()); -let fb_pat = field_binding_pattern(fb.clone()); -if is_string_lit_pattern(fb_pat.clone()) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(qualified.clone(), "(ref ".to_string()), emit_ident(fb_name.clone(), RenderTarget::Rust)), ")".to_string()) - } else { - { - let is_shorthand = match (*fb_pat.clone()).clone() { - MatchPattern::Bind { name: n, .. } => (n.clone().as_str() == fb_name.clone().as_str()), - _ => false, -}; -if is_shorthand.clone() { - v2_rt::concat(v2_rt::concat(v2_rt::concat(qualified.clone(), "(".to_string()), emit_ident(fb_name.clone(), RenderTarget::Rust)), ")".to_string()) - } else { - { - let pat_str = emit_pattern(fb_pat.clone(), shared_types.clone(), "".to_string(), source_indices.clone(), emit_info.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(qualified.clone(), "(".to_string()), pat_str.clone()), ")".to_string()) -} - } -} - } -}, - None => v2_rt::concat(qualified.clone(), " { .. }".to_string()), -} - } else { - { - let binding_strs = Rc::new({ let mut __result = Vec::new(); for fb in effective_bindings.clone().iter().cloned() { __result.push({ - let fb_name = field_binding_name_at(fb.clone(), source_indices.clone()); -let fb_pat = field_binding_pattern(fb.clone()); -if is_string_lit_pattern(fb_pat.clone()) { - v2_rt::concat("ref ".to_string(), emit_ident(fb_name.clone(), RenderTarget::Rust)) + let binding_strs = Rc::new({ + let mut __result = Vec::new(); + for fb in effective_bindings.clone().iter().cloned() { + __result.push({ + let fb_name = field_binding_name_at( + fb.clone(), + source_indices.clone(), + ); + let fb_pat = field_binding_pattern(fb.clone()); + if is_string_lit_pattern(fb_pat.clone()) { + v2_rt::concat( + "ref ".to_string(), + emit_ident(fb_name.clone(), RenderTarget::Rust), + ) } else { { let is_shorthand = match (*fb_pat.clone()).clone() { - MatchPattern::Bind { name: n, .. } => (n.clone().as_str() == fb_name.clone().as_str()), - _ => false, -}; -if is_shorthand.clone() { + MatchPattern::Bind { name: n, .. } => { + (n.clone().as_str() + == fb_name.clone().as_str()) + } + _ => false, + }; + if is_shorthand.clone() { emit_ident(fb_name.clone(), RenderTarget::Rust) } else { { - let pat_str = emit_pattern(fb_pat.clone(), shared_types.clone(), "".to_string(), source_indices.clone(), emit_info.clone()); -v2_rt::concat(v2_rt::concat(emit_ident(fb_name.clone(), RenderTarget::Rust), ": ".to_string()), pat_str.clone()) -} + let pat_str = emit_pattern( + fb_pat.clone(), + shared_types.clone(), + "".to_string(), + source_indices.clone(), + emit_info.clone(), + ); + v2_rt::concat( + v2_rt::concat( + emit_ident( + fb_name.clone(), + RenderTarget::Rust, + ), + ": ".to_string(), + ), + pat_str.clone(), + ) + } } -} + } } -}); } __result }); -let bindings_str = binding_strs.join(&", ".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(qualified.clone(), " { ".to_string()), bindings_str), ", .. }".to_string()) -} - } -} + }); + } + __result + }); + let bindings_str = binding_strs.join(&", ".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(qualified.clone(), " { ".to_string()), + bindings_str, + ), + ", .. }".to_string(), + ) + } } -} + } } } -} + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -2207,323 +4965,574 @@ pub struct RcMatchAnalysis { pub fn empty_rc_pattern_analysis() -> Rc { Rc::new(RcPatternAnalysis { - matches_rc_variant: false, - matches_option_rc_variant: false, - needs_rc_pattern: false, - ref_bound_fields: Rc::new(vec![]), -}) + matches_rc_variant: false, + matches_option_rc_variant: false, + needs_rc_pattern: false, + ref_bound_fields: Rc::new(vec![]), + }) } pub fn field_needs_rc_ref(field_name: String, rc_analysis: Rc) -> bool { - { let mut __found = false; for name in rc_analysis.ref_bound_fields.clone().iter().cloned() { if (name.clone().as_str() == field_name.clone().as_str()) { __found = true; break; } } __found } + { + let mut __found = false; + for name in rc_analysis.ref_bound_fields.clone().iter().cloned() { + if (name.clone().as_str() == field_name.clone().as_str()) { + __found = true; + break; + } + } + __found + } } -pub fn analyze_rc_pattern(pattern: Rc, scrut_type: String, shared_types: &Rc>, emit_info: &Rc, source_indices: Rc>>) -> Rc { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - match (*pattern).clone() { - MatchPattern::VariantPattern { name: n, parent_enum, field_bindings: fbs, .. } => if ((n.clone().as_str() == "Some".to_string().as_str()) || (n.clone().as_str() == "None".to_string().as_str())) { - if ((fbs.clone().len() as i64) == 1) { - match fbs.clone().first().cloned() { - Some(fb) => { - let inner = analyze_rc_pattern(field_binding_pattern(fb.clone()), "".to_string(), &shared_types, &emit_info, source_indices.clone()); -Rc::new(RcPatternAnalysis { - matches_rc_variant: false, - matches_option_rc_variant: ((n.clone().as_str() == "Some".to_string().as_str()) && inner.matches_rc_variant.clone()), - needs_rc_pattern: inner.needs_rc_pattern.clone(), - ref_bound_fields: Rc::new(vec![]), -}) -}, - None => empty_rc_pattern_analysis(), -} - } else { - empty_rc_pattern_analysis() - } - } else { +pub fn analyze_rc_pattern( + pattern: Rc, + scrut_type: String, + shared_types: &Rc>, + emit_info: &Rc, + source_indices: Rc>>, +) -> Rc { + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*pattern).clone() { + MatchPattern::VariantPattern { + name: n, + parent_enum, + field_bindings: fbs, + .. + } => { + if ((n.clone().as_str() == "Some".to_string().as_str()) + || (n.clone().as_str() == "None".to_string().as_str())) { - let matches_rc_variant = match pattern_parent_enum(&n, parent_enum.clone(), &scrut_type, emit_info.type_summaries.clone()) { - Some(enum_name) => set_contains(shared_types.clone(), enum_name.clone()), - None => false, -}; -let ref_bound_fields = Rc::new({ let mut __result = Vec::new(); for fb in fbs.clone().iter().cloned() { __result.extend((*if analyze_rc_pattern(field_binding_pattern(fb.clone()), "".to_string(), &shared_types, &emit_info, source_indices.clone()).matches_rc_variant.clone() { - Rc::new(vec![field_binding_name_at(fb.clone(), source_indices.clone())]) + if ((fbs.clone().len() as i64) == 1) { + match fbs.clone().first().cloned() { + Some(fb) => { + let inner = analyze_rc_pattern( + field_binding_pattern(fb.clone()), + "".to_string(), + &shared_types, + &emit_info, + source_indices.clone(), + ); + Rc::new(RcPatternAnalysis { + matches_rc_variant: false, + matches_option_rc_variant: ((n.clone().as_str() + == "Some".to_string().as_str()) + && inner.matches_rc_variant.clone()), + needs_rc_pattern: inner.needs_rc_pattern.clone(), + ref_bound_fields: Rc::new(vec![]), + }) + } + None => empty_rc_pattern_analysis(), + } } else { - Rc::new(vec![]) - }).iter().cloned()); } __result }); -Rc::new(RcPatternAnalysis { - matches_rc_variant: matches_rc_variant, - matches_option_rc_variant: false, - needs_rc_pattern: ((ref_bound_fields.clone().len() as i64) > 0), - ref_bound_fields: ref_bound_fields.clone(), -}) -} - }, - _ => empty_rc_pattern_analysis(), -} + empty_rc_pattern_analysis() + } + } else { + { + let matches_rc_variant = match pattern_parent_enum( + &n, + parent_enum.clone(), + &scrut_type, + emit_info.type_summaries.clone(), + ) { + Some(enum_name) => emit_map_has(shared_types.clone(), enum_name.clone()), + None => false, + }; + let ref_bound_fields = Rc::new({ + let mut __result = Vec::new(); + for fb in fbs.clone().iter().cloned() { + __result.extend( + (*if analyze_rc_pattern( + field_binding_pattern(fb.clone()), + "".to_string(), + &shared_types, + &emit_info, + source_indices.clone(), + ) + .matches_rc_variant + .clone() + { + Rc::new(vec![field_binding_name_at( + fb.clone(), + source_indices.clone(), + )]) + } else { + Rc::new(vec![]) + }) + .iter() + .cloned(), + ); + } + __result + }); + Rc::new(RcPatternAnalysis { + matches_rc_variant: matches_rc_variant, + matches_option_rc_variant: false, + needs_rc_pattern: ((ref_bound_fields.clone().len() as i64) > 0), + ref_bound_fields: ref_bound_fields.clone(), + }) + } + } + } + _ => empty_rc_pattern_analysis(), }) } -pub fn analyze_rc_match(scrutinee: &Rc, arms: Rc>>, scrut_type: String, shared_types: &Rc>, emit_info: Rc, source_indices: &Rc>>) -> RcMatchAnalysis { - { - let arm_analyses = Rc::new({ let mut __result = Vec::new(); for arm in arms.iter().cloned() { __result.push(analyze_rc_pattern(arm_pattern(arm.clone()), scrut_type.clone(), &shared_types, &emit_info, source_indices.clone())); } __result }); -let scrutinee_is_optional = match scrutinee.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => (rt.return_cardinality.clone() == Cardinality::CardOptional), - _ => false, -}; -let scrutinee_is_rc_wrapped = match scrutinee.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => if (((rt.children.clone().len() as i64) == 0) && (rt.ident_span.clone() != None)) { - set_contains(shared_types.clone(), authored_name_at(source_indices.clone(), &rt)) - } else { - false - }, - _ => false, -}; -let arms_want_option = { let mut __found = false; for a in arm_analyses.clone().iter().cloned() { if a.matches_option_rc_variant.clone() { __found = true; break; } } __found }; -let arms_want_deref = { let mut __found = false; for a in arm_analyses.clone().iter().cloned() { if a.matches_rc_variant.clone() { __found = true; break; } } __found }; -RcMatchAnalysis { - needs_option_deref: arms_want_option, - needs_deref: if scrutinee_is_optional { - false - } else { - (scrutinee_is_rc_wrapped || arms_want_deref) - }, -} -} +pub fn analyze_rc_match( + scrutinee: &Rc, + arms: Rc>>, + scrut_type: String, + shared_types: &Rc>, + emit_info: Rc, + source_indices: &Rc>>, +) -> RcMatchAnalysis { + { + let arm_analyses = Rc::new({ + let mut __result = Vec::new(); + for arm in arms.iter().cloned() { + __result.push(analyze_rc_pattern( + arm_pattern(arm.clone()), + scrut_type.clone(), + &shared_types, + &emit_info, + source_indices.clone(), + )); + } + __result + }); + let scrutinee_is_optional = match scrutinee.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + (rt.return_cardinality.clone() == Cardinality::CardOptional) + } + _ => false, + }; + let scrutinee_is_rc_wrapped = match scrutinee.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + if (((rt.children.clone().len() as i64) == 0) && (rt.ident_span.clone() != None)) { + emit_map_has( + shared_types.clone(), + authored_name_at(source_indices.clone(), &rt), + ) + } else { + false + } + } + _ => false, + }; + let arms_want_option = { + let mut __found = false; + for a in arm_analyses.clone().iter().cloned() { + if a.matches_option_rc_variant.clone() { + __found = true; + break; + } + } + __found + }; + let arms_want_deref = { + let mut __found = false; + for a in arm_analyses.clone().iter().cloned() { + if a.matches_rc_variant.clone() { + __found = true; + break; + } + } + __found + }; + RcMatchAnalysis { + needs_option_deref: arms_want_option, + needs_deref: if scrutinee_is_optional { + false + } else { + (scrutinee_is_rc_wrapped || arms_want_deref) + }, + } + } } -pub fn emit_pattern_rc_aware(pattern: Rc, rc_analysis: Rc, shared_types: Rc>, scrut_type: String, source_indices: Rc>>, emit_info: Rc) -> String { +pub fn emit_pattern_rc_aware( + pattern: Rc, + rc_analysis: Rc, + shared_types: Rc>, + scrut_type: String, + source_indices: Rc>>, + emit_info: Rc, +) -> String { match (*pattern).clone() { - MatchPattern::Bind { name: n, .. } => emit_ident(n.clone(), RenderTarget::Rust), - MatchPattern::LitPattern { value: v, .. } => rust_literal_for_pattern(v.clone()), - MatchPattern::VariantPattern { name: n, parent_enum, field_bindings: fbs, .. } => emit_variant_pattern_rc_aware(&n, parent_enum.clone(), &fbs, rc_analysis, &shared_types, &scrut_type, &source_indices, &emit_info), - MatchPattern::Wildcard => "_".to_string(), -} + MatchPattern::Bind { name: n, .. } => emit_ident(n.clone(), RenderTarget::Rust), + MatchPattern::LitPattern { value: v, .. } => rust_literal_for_pattern(v.clone()), + MatchPattern::VariantPattern { + name: n, + parent_enum, + field_bindings: fbs, + .. + } => emit_variant_pattern_rc_aware( + &n, + parent_enum.clone(), + &fbs, + rc_analysis, + &shared_types, + &scrut_type, + &source_indices, + &emit_info, + ), + MatchPattern::Wildcard => "_".to_string(), + } } -pub fn emit_variant_pattern_rc_aware(name: &String, parent_enum: Option, field_bindings: &Rc>>, rc_analysis: Rc, shared_types: &Rc>, scrut_type: &String, source_indices: &Rc>>, emit_info: &Rc) -> String { +pub fn emit_variant_pattern_rc_aware( + name: &String, + parent_enum: Option, + field_bindings: &Rc>>, + rc_analysis: Rc, + shared_types: &Rc>, + scrut_type: &String, + source_indices: &Rc>>, + emit_info: &Rc, +) -> String { { - let resolved_parent = if ((name.clone().as_str() == "Some".to_string().as_str()) || (name.clone().as_str() == "None".to_string().as_str())) { + let resolved_parent = if ((name.clone().as_str() == "Some".to_string().as_str()) + || (name.clone().as_str() == "None".to_string().as_str())) + { None } else { - pattern_parent_enum(&name, parent_enum, &scrut_type, emit_info.type_summaries.clone()) + pattern_parent_enum( + &name, + parent_enum, + &scrut_type, + emit_info.type_summaries.clone(), + ) }; -let qualified = match resolved_parent.clone() { - Some(parent) => v2_rt::concat(v2_rt::concat(parent.clone(), "::".to_string()), name.clone()), - None => name.clone(), -}; -if ((name.clone().as_str() == "Some".to_string().as_str()) && ((field_bindings.clone().len() as i64) == 1)) { + let qualified = match resolved_parent.clone() { + Some(parent) => v2_rt::concat( + v2_rt::concat(parent.clone(), "::".to_string()), + name.clone(), + ), + None => name.clone(), + }; + if ((name.clone().as_str() == "Some".to_string().as_str()) + && ((field_bindings.clone().len() as i64) == 1)) + { match field_bindings.clone().first().cloned() { - Some(fb) => { - let fb_pat = field_binding_pattern(fb.clone()); -if is_string_lit_pattern(fb_pat.clone()) { - "Some(ref __some_val)".to_string() - } else { - { - let inner_analysis = analyze_rc_pattern(fb_pat.clone(), scrut_type.clone(), &shared_types, &emit_info, source_indices.clone()); -let inner_pat = emit_pattern_rc_aware(fb_pat.clone(), inner_analysis.clone(), shared_types.clone(), scrut_type.clone(), source_indices.clone(), emit_info.clone()); -v2_rt::concat(v2_rt::concat("Some(".to_string(), inner_pat), ")".to_string()) -} - } -}, - None => qualified.clone(), -} + Some(fb) => { + let fb_pat = field_binding_pattern(fb.clone()); + if is_string_lit_pattern(fb_pat.clone()) { + "Some(ref __some_val)".to_string() + } else { + { + let inner_analysis = analyze_rc_pattern( + fb_pat.clone(), + scrut_type.clone(), + &shared_types, + &emit_info, + source_indices.clone(), + ); + let inner_pat = emit_pattern_rc_aware( + fb_pat.clone(), + inner_analysis.clone(), + shared_types.clone(), + scrut_type.clone(), + source_indices.clone(), + emit_info.clone(), + ); + v2_rt::concat( + v2_rt::concat("Some(".to_string(), inner_pat), + ")".to_string(), + ) + } + } + } + None => qualified.clone(), + } } else { if ((field_bindings.clone().len() as i64) == 0) { { let fielded_key = match resolved_parent.clone() { - Some(parent) => v2_rt::concat(v2_rt::concat(parent.clone(), "::".to_string()), name.clone()), - None => name.clone(), -}; -let is_untagged_tuple = (set_contains(emit_info.untagged_json_tuple_variants.clone(), fielded_key.clone()) || set_contains(emit_info.untagged_json_tuple_variants.clone(), qualified.clone())); -if is_untagged_tuple { - v2_rt::concat(qualified.clone(), "(..)".to_string()) + Some(parent) => v2_rt::concat( + v2_rt::concat(parent.clone(), "::".to_string()), + name.clone(), + ), + None => name.clone(), + }; + let is_fielded = + match v2_rt::map_get(&emit_info.fielded_variants.clone(), fielded_key) { + Some(true) => true, + _ => match v2_rt::map_get( + &emit_info.fielded_variants.clone(), + qualified.clone(), + ) { + Some(true) => true, + _ => false, + }, + }; + if is_fielded { + v2_rt::concat(qualified.clone(), " { .. }".to_string()) } else { - { - let is_fielded = match v2_rt::map_get(&emit_info.fielded_variants.clone(), fielded_key.clone()) { - Some(true) => true, - _ => match v2_rt::map_get(&emit_info.fielded_variants.clone(), qualified.clone()) { - Some(true) => true, - _ => false, -}, -}; -if is_fielded { - v2_rt::concat(qualified.clone(), " { .. }".to_string()) - } else { - qualified.clone() - } -} + qualified.clone() } -} + } } else { { - let effective_bindings = Rc::new({ let mut __result = Vec::new(); for fb in field_bindings.clone().iter().cloned() { if match (*field_binding_pattern(fb.clone())).clone() { - MatchPattern::Wildcard => false, - _ => true, -} { __result.push(fb); } } __result }); -if ((effective_bindings.clone().len() as i64) == 0) { + let effective_bindings = Rc::new({ + let mut __result = Vec::new(); + for fb in field_bindings.clone().iter().cloned() { + if match (*field_binding_pattern(fb.clone())).clone() { + MatchPattern::Wildcard => false, + _ => true, + } { + __result.push(fb); + } + } + __result + }); + if ((effective_bindings.clone().len() as i64) == 0) { { let fielded_key2 = match resolved_parent.clone() { - Some(parent) => v2_rt::concat(v2_rt::concat(parent.clone(), "::".to_string()), name.clone()), - None => name.clone(), -}; -let is_untagged_tuple2 = (set_contains(emit_info.untagged_json_tuple_variants.clone(), fielded_key2.clone()) || set_contains(emit_info.untagged_json_tuple_variants.clone(), qualified.clone())); -if is_untagged_tuple2 { - v2_rt::concat(qualified.clone(), "(..)".to_string()) + Some(parent) => v2_rt::concat( + v2_rt::concat(parent.clone(), "::".to_string()), + name.clone(), + ), + None => name.clone(), + }; + let is_fielded2 = match v2_rt::map_get( + &emit_info.fielded_variants.clone(), + fielded_key2, + ) { + Some(true) => true, + _ => match v2_rt::map_get( + &emit_info.fielded_variants.clone(), + qualified.clone(), + ) { + Some(true) => true, + _ => false, + }, + }; + if is_fielded2 { + v2_rt::concat(qualified.clone(), " { .. }".to_string()) } else { - { - let is_fielded2 = match v2_rt::map_get(&emit_info.fielded_variants.clone(), fielded_key2.clone()) { - Some(true) => true, - _ => match v2_rt::map_get(&emit_info.fielded_variants.clone(), qualified.clone()) { - Some(true) => true, - _ => false, -}, -}; -if is_fielded2 { - v2_rt::concat(qualified.clone(), " { .. }".to_string()) - } else { - qualified.clone() - } -} + qualified.clone() } -} + } } else { { - let tuple_key = match resolved_parent.clone() { - Some(parent) => v2_rt::concat(v2_rt::concat(parent.clone(), "::".to_string()), name.clone()), - None => qualified.clone(), -}; -let is_untagged_tuple3 = (set_contains(emit_info.untagged_json_tuple_variants.clone(), tuple_key) || set_contains(emit_info.untagged_json_tuple_variants.clone(), qualified.clone())); -if (is_untagged_tuple3 && ((effective_bindings.clone().len() as i64) == 1)) { - match effective_bindings.clone().first().cloned() { - Some(fb) => { - let fb_name = field_binding_name_at(fb.clone(), source_indices.clone()); -let fb_pat = field_binding_pattern(fb.clone()); -if is_string_lit_pattern(fb_pat.clone()) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(qualified.clone(), "(ref ".to_string()), emit_ident(fb_name.clone(), RenderTarget::Rust)), ")".to_string()) - } else { - if field_needs_rc_ref(fb_name.clone(), rc_analysis.clone()) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(qualified.clone(), "(ref ".to_string()), emit_ident(fb_name.clone(), RenderTarget::Rust)), ")".to_string()) - } else { - { - let is_shorthand = match (*fb_pat.clone()).clone() { - MatchPattern::Bind { name: n, .. } => (n.clone().as_str() == fb_name.clone().as_str()), - _ => false, -}; -if is_shorthand.clone() { - v2_rt::concat(v2_rt::concat(v2_rt::concat(qualified.clone(), "(".to_string()), emit_ident(fb_name.clone(), RenderTarget::Rust)), ")".to_string()) - } else { - { - let inner_analysis = analyze_rc_pattern(fb_pat.clone(), "".to_string(), &shared_types, &emit_info, source_indices.clone()); -let pat_str = emit_pattern_rc_aware(fb_pat.clone(), inner_analysis.clone(), shared_types.clone(), "".to_string(), source_indices.clone(), emit_info.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(qualified.clone(), "(".to_string()), pat_str.clone()), ")".to_string()) -} - } -} - } - } -}, - None => v2_rt::concat(qualified.clone(), " { .. }".to_string()), -} - } else { - { - let binding_strs = Rc::new({ let mut __result = Vec::new(); for fb in effective_bindings.clone().iter().cloned() { __result.push({ - let fb_name = field_binding_name_at(fb.clone(), source_indices.clone()); -let fb_pat = field_binding_pattern(fb.clone()); -if is_string_lit_pattern(fb_pat.clone()) { - v2_rt::concat("ref ".to_string(), emit_ident(fb_name.clone(), RenderTarget::Rust)) + let binding_strs = Rc::new({ + let mut __result = Vec::new(); + for fb in effective_bindings.clone().iter().cloned() { + __result.push({ + let fb_name = field_binding_name_at( + fb.clone(), + source_indices.clone(), + ); + let fb_pat = field_binding_pattern(fb.clone()); + if is_string_lit_pattern(fb_pat.clone()) { + v2_rt::concat( + "ref ".to_string(), + emit_ident(fb_name.clone(), RenderTarget::Rust), + ) } else { - if field_needs_rc_ref(fb_name.clone(), rc_analysis.clone()) { - v2_rt::concat("ref ".to_string(), emit_ident(fb_name.clone(), RenderTarget::Rust)) + if field_needs_rc_ref( + fb_name.clone(), + rc_analysis.clone(), + ) { + v2_rt::concat( + "ref ".to_string(), + emit_ident(fb_name.clone(), RenderTarget::Rust), + ) } else { { - let is_shorthand = match (*fb_pat.clone()).clone() { - MatchPattern::Bind { name: n, .. } => (n.clone().as_str() == fb_name.clone().as_str()), - _ => false, -}; -if is_shorthand.clone() { - emit_ident(fb_name.clone(), RenderTarget::Rust) + let is_shorthand = match (*fb_pat.clone()) + .clone() + { + MatchPattern::Bind { name: n, .. } => { + (n.clone().as_str() + == fb_name.clone().as_str()) + } + _ => false, + }; + if is_shorthand.clone() { + emit_ident( + fb_name.clone(), + RenderTarget::Rust, + ) } else { { - let inner_analysis = analyze_rc_pattern(fb_pat.clone(), "".to_string(), &shared_types, &emit_info, source_indices.clone()); -let pat_str = emit_pattern_rc_aware(fb_pat.clone(), inner_analysis.clone(), shared_types.clone(), "".to_string(), source_indices.clone(), emit_info.clone()); -v2_rt::concat(v2_rt::concat(emit_ident(fb_name.clone(), RenderTarget::Rust), ": ".to_string()), pat_str.clone()) -} + let inner_analysis = analyze_rc_pattern( + fb_pat.clone(), + "".to_string(), + &shared_types, + &emit_info, + source_indices.clone(), + ); + let pat_str = emit_pattern_rc_aware( + fb_pat.clone(), + inner_analysis.clone(), + shared_types.clone(), + "".to_string(), + source_indices.clone(), + emit_info.clone(), + ); + v2_rt::concat( + v2_rt::concat( + emit_ident( + fb_name.clone(), + RenderTarget::Rust, + ), + ": ".to_string(), + ), + pat_str.clone(), + ) + } } -} + } } } -}); } __result }); -let bindings_str = binding_strs.join(&", ".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(qualified.clone(), " { ".to_string()), bindings_str), ", .. }".to_string()) -} - } -} + }); + } + __result + }); + let bindings_str = binding_strs.join(&", ".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(qualified.clone(), " { ".to_string()), + bindings_str, + ), + ", .. }".to_string(), + ) + } } -} + } } } -} + } } -pub fn rc_pattern_preludes(mut pattern: Rc, mut rc_analysis: Rc, mut shared_types: Rc>, mut source_indices: Rc>>, mut emit_info: Rc) -> String { +pub fn rc_pattern_preludes( + mut pattern: Rc, + mut rc_analysis: Rc, + mut shared_types: Rc>, + mut source_indices: Rc>>, + mut emit_info: Rc, +) -> String { loop { match (*pattern).clone() { - MatchPattern::VariantPattern { name: n, field_bindings: fbs, .. } => { if ((n.clone().as_str() == "Some".to_string().as_str()) || (n.clone().as_str() == "None".to_string().as_str())) { - if ((fbs.clone().len() as i64) == 1) { - match fbs.clone().first().cloned() { - Some(fb) => { let fb_pat = field_binding_pattern(fb.clone()); -let inner_analysis = analyze_rc_pattern(fb_pat.clone(), "".to_string(), &shared_types, &emit_info, source_indices.clone()); -{ - let __tco_0 = fb_pat.clone(); -let __tco_1 = inner_analysis; -pattern = __tco_0; -rc_analysis = __tco_1; -continue; -} }, - None => { break "".to_string(); }, -} -} else { + MatchPattern::VariantPattern { + name: n, + field_bindings: fbs, + .. + } => { + if ((n.clone().as_str() == "Some".to_string().as_str()) + || (n.clone().as_str() == "None".to_string().as_str())) + { + if ((fbs.clone().len() as i64) == 1) { + match fbs.clone().first().cloned() { + Some(fb) => { + let fb_pat = field_binding_pattern(fb.clone()); + let inner_analysis = analyze_rc_pattern( + fb_pat.clone(), + "".to_string(), + &shared_types, + &emit_info, + source_indices.clone(), + ); + { + let __tco_0 = fb_pat.clone(); + let __tco_1 = inner_analysis; + pattern = __tco_0; + rc_analysis = __tco_1; + continue; + } + } + None => { + break "".to_string(); + } + } + } else { + break "".to_string(); + } + } else { + let preludes = Rc::new({ + let mut __result = Vec::new(); + for fb in fbs.clone().iter().cloned() { + __result.extend( + (*if field_needs_rc_ref( + field_binding_name_at(fb.clone(), source_indices.clone()), + rc_analysis.clone(), + ) { + Rc::new(vec![v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "let ".to_string(), + emit_pattern( + field_binding_pattern(fb.clone()), + shared_types.clone(), + "".to_string(), + source_indices.clone(), + emit_info.clone(), + ), + ), + " = ".to_string(), + ), + emit_ident( + field_binding_name_at( + fb.clone(), + source_indices.clone(), + ), + RenderTarget::Rust, + ), + ), + ".as_ref() else { unreachable!() };".to_string(), + )]) + } else { + Rc::new(vec![]) + }) + .iter() + .cloned(), + ); + } + __result + }); + break preludes.join(&" ".to_string()); + } + } + _ => { break "".to_string(); -} -} else { - let preludes = Rc::new({ let mut __result = Vec::new(); for fb in fbs.clone().iter().cloned() { __result.extend((*if field_needs_rc_ref(field_binding_name_at(fb.clone(), source_indices.clone()), rc_analysis.clone()) { - Rc::new(vec![v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let ".to_string(), emit_pattern(field_binding_pattern(fb.clone()), shared_types.clone(), "".to_string(), source_indices.clone(), emit_info.clone())), " = ".to_string()), emit_ident(field_binding_name_at(fb.clone(), source_indices.clone()), RenderTarget::Rust)), ".as_ref() else { unreachable!() };".to_string())]) - } else { - Rc::new(vec![]) - }).iter().cloned()); } __result }); -break preludes.join(&" ".to_string()); -} }, - _ => { break "".to_string(); }, -} -} + } + } + } } -pub fn explicit_record_struct_name(type_name: Option, inferred_node: &Rc, shared_types: Rc>, source_indices: Rc>>) -> Option { +pub fn explicit_record_struct_name( + type_name: Option, + inferred_node: &Rc, + shared_types: Rc>, + source_indices: Rc>>, +) -> Option { { let is_optional = (inferred_node.return_cardinality.clone() == Cardinality::CardOptional); -if is_optional { + if is_optional { { let result = type_name.clone(); -return result -} + return result; + } } -let has_structure = (inferred_node.connective.clone() != Connective::NoConnective); -let n = if ((inferred_node.type_annotation.clone() != None) && has_structure) { + let has_structure = (inferred_node.connective.clone() != Connective::NoConnective); + let n = if ((inferred_node.type_annotation.clone() != None) && has_structure) { match inferred_node.children.clone().first().cloned() { - Some(base) => base.clone(), - None => inferred_node.clone(), -} + Some(base) => base.clone(), + None => inferred_node.clone(), + } } else { inferred_node.clone() }; -let is_product = is_product_type(n.clone()); -let is_coproduct = is_coproduct_type(n.clone()); -let n_is_error = if (n.inferred.clone() != None) { + let is_product = is_product_type(n.clone()); + let is_coproduct = is_coproduct_type(n.clone()); + let n_is_error = if (n.inferred.clone() != None) { is_compiler_error(n.inferred.clone().clone().unwrap()) } else { false }; -let nname = authored_name_at(source_indices, &n); -if (nname.clone().as_str() == "__EmitTypeCacheMiss".to_string().as_str()) { + let nname = authored_name_at(source_indices, &n); + if (nname.clone().as_str() == "__EmitTypeCacheMiss".to_string().as_str()) { type_name.clone() } else { if n_is_error { @@ -2539,7 +5548,9 @@ if (nname.clone().as_str() == "__EmitTypeCacheMiss".to_string().as_str()) { if is_coproduct { type_name.clone() } else { - if (((n.children.clone().len() as i64) == 0) && (n.ident_span.clone() != None)) { + if (((n.children.clone().len() as i64) == 0) + && (n.ident_span.clone() != None)) + { Some(nname.clone()) } else { type_name.clone() @@ -2548,293 +5559,502 @@ if (nname.clone().as_str() == "__EmitTypeCacheMiss".to_string().as_str()) { } } } -} + } } -pub fn is_simple_type_node(n: Rc, source_indices: Rc>>) -> bool { +pub fn is_simple_type_node( + n: Rc, + source_indices: Rc>>, +) -> bool { is_rust_value_type(n, source_indices) } -pub fn variant_parent_from_binding_kind(binding_kind: Option>) -> Option { +pub fn variant_parent_from_binding_kind( + binding_kind: Option>, +) -> Option { match binding_kind.as_deref().cloned() { - Some(VarBindingKind::VariantValueBinding { parent_enum, .. }) => Some(parent_enum.clone()), - _ => None, -} + Some(VarBindingKind::VariantValueBinding { parent_enum, .. }) => Some(parent_enum.clone()), + _ => None, + } } pub fn apply_clone(expr: String) -> String { - apply_type_template1(sharing_for_target(RenderTarget::Rust).clone_value.clone(), expr) + apply_type_template1( + sharing_for_target(RenderTarget::Rust).clone_value.clone(), + expr, + ) } pub fn apply_deref_clone(expr: String) -> String { - apply_type_template1(sharing_for_target(RenderTarget::Rust).deref_clone.clone(), expr) + apply_type_template1( + sharing_for_target(RenderTarget::Rust).deref_clone.clone(), + expr, + ) } pub fn apply_field_clone(expr: String, field: String) -> String { - apply_type_template2(sharing_for_target(RenderTarget::Rust).field_clone.clone(), expr, field) + apply_type_template2( + sharing_for_target(RenderTarget::Rust).field_clone.clone(), + expr, + field, + ) } pub fn clone_iterator_suffix() -> String { sharing_for_target(RenderTarget::Rust).clone_suffix.clone() } -pub fn effective_variant_parent(name: &String, binding_kind: Option>, resolved_type: Option>, emit_info: &Rc, source_indices: Rc>>) -> Option { +pub fn effective_variant_parent( + name: &String, + binding_kind: Option>, + resolved_type: Option>, + emit_info: &Rc, + source_indices: Rc>>, +) -> Option { { let cached = match v2_rt::map_get(&emit_info.variant_to_enum.clone(), name.clone()) { - Some(p) => if (p.clone().as_str() != "".to_string().as_str()) { - Some(p.clone()) - } else { - None - }, - None => None, -}; -match cached { - Some(parent) => Some(parent.clone()), - None => match resolved_type.as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - let rt_name = authored_name_at(source_indices, &rt); -if (((rt.ident_span.clone() != None) && (rt_name.clone().as_str() != name.clone().as_str())) && variant_belongs_to_enum(emit_info.type_summaries.clone(), name.clone(), rt_name.clone())) { - Some(rt_name.clone()) - } else { - variant_parent_from_binding_kind(binding_kind) + Some(p) => { + if (p.clone().as_str() != "".to_string().as_str()) { + Some(p.clone()) + } else { + None + } } -}, - _ => variant_parent_from_binding_kind(binding_kind), -}, -} -} + None => None, + }; + match cached { + Some(parent) => Some(parent.clone()), + None => match resolved_type.as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + let rt_name = authored_name_at(source_indices, &rt); + if (((rt.ident_span.clone() != None) + && (rt_name.clone().as_str() != name.clone().as_str())) + && variant_belongs_to_enum( + emit_info.type_summaries.clone(), + name.clone(), + rt_name.clone(), + )) + { + Some(rt_name.clone()) + } else { + variant_parent_from_binding_kind(binding_kind) + } + } + _ => variant_parent_from_binding_kind(binding_kind), + }, + } + } } -pub fn emit_var_ref(name: &String, binding_kind: &Option>, resolved_type: &Option>, shared_types: Rc>, registry: Rc>>, emit_info: &Rc, source_indices: Rc>>) -> String { - if ((name.clone().as_str() == "none".to_string().as_str()) || (name.clone().as_str() == "None".to_string().as_str())) { +pub fn emit_var_ref( + name: &String, + binding_kind: &Option>, + resolved_type: &Option>, + shared_types: Rc>, + registry: Rc>>, + emit_info: &Rc, + source_indices: Rc>>, +) -> String { + if ((name.clone().as_str() == "none".to_string().as_str()) + || (name.clone().as_str() == "None".to_string().as_str())) + { emit_keyword("null".to_string(), RenderTarget::Rust) } else { - if ((name.clone().as_str() == "true".to_string().as_str()) || (name.clone().as_str() == "false".to_string().as_str())) { + if ((name.clone().as_str() == "true".to_string().as_str()) + || (name.clone().as_str() == "false".to_string().as_str())) + { emit_keyword(name.clone(), RenderTarget::Rust) } else { { - let moves_by_value = set_contains(emit_info.movable.clone(), name.clone()); -let sharing = language_spec(RenderTarget::Rust).sharing.clone(); -let variant_parent = effective_variant_parent(&name, binding_kind.clone(), resolved_type.clone(), &emit_info, source_indices); -let ref_str = match variant_parent { - Some(enum_name) => { - let qualified = v2_rt::concat(v2_rt::concat(enum_name.clone(), "::".to_string()), name.clone()); -if set_contains(shared_types, enum_name.clone()) { - v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), qualified), ")".to_string()) - } else { - qualified + let moves_by_value = emit_map_has(emit_info.movable.clone(), name.clone()); + let sharing = language_spec(RenderTarget::Rust).sharing.clone(); + let variant_parent = effective_variant_parent( + &name, + binding_kind.clone(), + resolved_type.clone(), + &emit_info, + source_indices, + ); + let ref_str = match variant_parent { + Some(enum_name) => { + let qualified = v2_rt::concat( + v2_rt::concat(enum_name.clone(), "::".to_string()), + name.clone(), + ); + if emit_map_has(shared_types, enum_name.clone()) { + v2_rt::concat( + v2_rt::concat("Rc::new(".to_string(), qualified), + ")".to_string(), + ) + } else { + qualified + } } -}, - None => match v2_rt::map_get(®istry, name.clone()) { - Some(info) => { - let is_data = (info.kind.clone() == ItemKind::DataItem); -if is_data { - v2_rt::concat(to_snake(name.clone()), "()".to_string()) - } else { - { - let is_function_value = match binding_kind.clone().as_deref().cloned() { - Some(VarBindingKind::FunctionValueBinding) => true, - _ => false, -}; -let ident = emit_ident(name.clone(), RenderTarget::Rust); -let ident_str = if is_function_value { + None => match v2_rt::map_get(®istry, name.clone()) { + Some(info) => { + let is_data = (info.kind.clone() == ItemKind::DataItem); + if is_data { + v2_rt::concat(to_snake(name.clone()), "()".to_string()) + } else { + { + let is_function_value = + match binding_kind.clone().as_deref().cloned() { + Some(VarBindingKind::FunctionValueBinding) => true, + _ => false, + }; + let ident = emit_ident(name.clone(), RenderTarget::Rust); + let ident_str = if is_function_value { + ident + } else { + if moves_by_value { + ident + } else { + match resolved_type.clone() { + Some(_) => apply_type_template1( + sharing.clone_value.clone(), + ident, + ), + _ => ident, + } + } + }; + ident_str + } + } + } + None => { + let ident = emit_ident(name.clone(), RenderTarget::Rust); + let ident_str = if moves_by_value { ident } else { - if moves_by_value { - ident - } else { - match resolved_type.clone() { - Some(_) => apply_type_template1(sharing.clone_value.clone(), ident), - _ => ident, -} + match resolved_type.clone() { + Some(_) => { + apply_type_template1(sharing.clone_value.clone(), ident) + } + _ => ident, } }; -ident_str -} - } -}, - None => { - let ident = emit_ident(name.clone(), RenderTarget::Rust); -let ident_str = if moves_by_value { - ident - } else { - match resolved_type.clone() { - Some(_) => apply_type_template1(sharing.clone_value.clone(), ident), - _ => ident, -} - }; -ident_str -}, -}, -}; -ref_str -} + ident_str + } + }, + }; + ref_str + } } } } -pub fn emit_typed_expr_base(texpr: &Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { +pub fn emit_typed_expr_base( + texpr: &Rc, + registry: Rc>>, + scope: &Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { { let si = scope.type_env.clone().source_indices.clone(); -match (*texpr.expr_data.clone()).clone() { - ExprData::ExprVar { binding_kind, .. } => { - let n = expr_var_name_at(texpr.clone(), si.clone()); -if ((n.clone().as_str() == "none".to_string().as_str()) || (n.clone().as_str() == "None".to_string().as_str())) { - emit_keyword("null".to_string(), RenderTarget::Rust) - } else { - if ((n.clone().as_str() == "true".to_string().as_str()) || (n.clone().as_str() == "false".to_string().as_str())) { - emit_keyword(n.clone(), RenderTarget::Rust) + match (*texpr.expr_data.clone()).clone() { + ExprData::ExprVar { binding_kind, .. } => { + let n = expr_var_name_at(texpr.clone(), si.clone()); + if ((n.clone().as_str() == "none".to_string().as_str()) + || (n.clone().as_str() == "None".to_string().as_str())) + { + emit_keyword("null".to_string(), RenderTarget::Rust) } else { + if ((n.clone().as_str() == "true".to_string().as_str()) + || (n.clone().as_str() == "false".to_string().as_str())) { - let variant_parent = effective_variant_parent(&n, binding_kind.clone(), texpr.inferred.clone(), &emit_info, si.clone()); -match variant_parent { - Some(enum_name) => { - let qualified = v2_rt::concat(v2_rt::concat(enum_name.clone(), "::".to_string()), n.clone()); -if set_contains(shared_types, enum_name.clone()) { - v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), qualified), ")".to_string()) - } else { - qualified - } -}, - None => match v2_rt::map_get(®istry, n.clone()) { - Some(info) => { - let is_data = (info.kind.clone() == ItemKind::DataItem); -if is_data { - v2_rt::concat(to_snake(n.clone()), "()".to_string()) - } else { - emit_ident(n.clone(), RenderTarget::Rust) + emit_keyword(n.clone(), RenderTarget::Rust) + } else { + { + let variant_parent = effective_variant_parent( + &n, + binding_kind.clone(), + texpr.inferred.clone(), + &emit_info, + si.clone(), + ); + match variant_parent { + Some(enum_name) => { + let qualified = v2_rt::concat( + v2_rt::concat(enum_name.clone(), "::".to_string()), + n.clone(), + ); + if emit_map_has(shared_types, enum_name.clone()) { + v2_rt::concat( + v2_rt::concat("Rc::new(".to_string(), qualified), + ")".to_string(), + ) + } else { + qualified + } + } + None => match v2_rt::map_get(®istry, n.clone()) { + Some(info) => { + let is_data = (info.kind.clone() == ItemKind::DataItem); + if is_data { + v2_rt::concat(to_snake(n.clone()), "()".to_string()) + } else { + emit_ident(n.clone(), RenderTarget::Rust) + } + } + None => emit_ident(n.clone(), RenderTarget::Rust), + }, } -}, - None => emit_ident(n.clone(), RenderTarget::Rust), -}, -} -} + } + } } } -}, - _ => emit_typed_expr(texpr.clone(), registry, &scope, depth, shared_types, emit_info, 1024), -} -} + _ => emit_typed_expr( + texpr.clone(), + registry, + &scope, + depth, + shared_types, + emit_info, + 1024, + ), + } + } } -pub fn emit_typed_field_access(base: &Rc, field: &String, summary: Option>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { - { - let base_str = emit_typed_expr_base(&base, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone()); -let base_is_anon_record = match base.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: bt, .. }) => { - let is_product = is_product_type(bt.clone()); -if (is_product && (bt.ident_span.clone() == None)) { - true - } else { - false +pub fn emit_typed_field_access( + base: &Rc, + field: &String, + summary: Option>, + registry: &Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { + { + let base_str = emit_typed_expr_base( + &base, + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ); + let base_is_anon_record = match base.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: bt, .. }) => { + let is_product = is_product_type(bt.clone()); + if (is_product && (bt.ident_span.clone() == None)) { + true + } else { + false + } } -}, - _ => false, -}; -if base_is_anon_record { + _ => false, + }; + if base_is_anon_record { { let bt = resolved_type(base.clone()); -if ((bt.children.clone().len() as i64) == 1) { - emit_typed_expr(base.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024) + if ((bt.children.clone().len() as i64) == 1) { + emit_typed_expr( + base.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ) } else { { - let matches = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(bt.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (authored_name_at(scope.type_env.clone().source_indices.clone(), &pair.1.clone()).as_str() == field.clone().as_str()) { __result.push(pair); } } __result }); -match matches.first().cloned() { - Some(m) => { - let sharing = language_spec(RenderTarget::Rust).sharing.clone(); -apply_type_template1(sharing.clone_value.clone(), v2_rt::concat(v2_rt::concat(base_str, ".".to_string()), (m.0.clone()).to_string())) -}, - None => v2_rt::concat(v2_rt::concat("compile_error!(\"anonymous record field not found: ".to_string(), field.clone()), "\")".to_string()), -} -} + let matches = Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + bt.children + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + if (authored_name_at( + scope.type_env.clone().source_indices.clone(), + &pair.1.clone(), + ) + .as_str() + == field.clone().as_str()) + { + __result.push(pair); + } + } + __result + }); + match matches.first().cloned() { + Some(m) => { + let sharing = language_spec(RenderTarget::Rust).sharing.clone(); + apply_type_template1( + sharing.clone_value.clone(), + v2_rt::concat( + v2_rt::concat(base_str, ".".to_string()), + (m.0.clone()).to_string(), + ), + ) + } + None => v2_rt::concat( + v2_rt::concat( + "compile_error!(\"anonymous record field not found: " + .to_string(), + field.clone(), + ), + "\")".to_string(), + ), + } + } } -} + } } else { { let sharing = language_spec(RenderTarget::Rust).sharing.clone(); -match summary { - Some(field_summary) => match field_summary.access_style.clone() { - FieldAccessStyle::TupleFirst => apply_type_template1(sharing.clone_value.clone(), v2_rt::concat(base_str, ".0".to_string())), - FieldAccessStyle::TupleSecond => apply_type_template1(sharing.clone_value.clone(), v2_rt::concat(base_str, ".1".to_string())), - FieldAccessStyle::OptionalUnwrap => v2_rt::concat(apply_type_template1(sharing.clone_value.clone(), base_str), ".unwrap()".to_string()), - FieldAccessStyle::EnumAccessor => v2_rt::concat(v2_rt::concat(v2_rt::concat(base_str, ".".to_string()), emit_ident(field.clone(), RenderTarget::Rust)), "()".to_string()), - FieldAccessStyle::StoredField => { - let base_is_owned = match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let base_name = expr_var_name_at(base.clone(), scope.type_env.clone().source_indices.clone()); -set_contains(emit_info.owned_bindings.clone(), base_name) -}, - _ => false, -}; -if base_is_owned { - v2_rt::concat(v2_rt::concat(base_str, ".".to_string()), emit_ident(field.clone(), RenderTarget::Rust)) - } else { - apply_type_template1(sharing.clone_value.clone(), v2_rt::concat(v2_rt::concat(base_str, ".".to_string()), emit_ident(field.clone(), RenderTarget::Rust))) - } -}, -}, - None => v2_rt::concat(v2_rt::concat("compile_error!(\"field access missing reconcile summary for '".to_string(), field.clone()), "'\")".to_string()), -} -} + match summary { + Some(field_summary) => match field_summary.access_style.clone() { + FieldAccessStyle::TupleFirst => apply_type_template1( + sharing.clone_value.clone(), + v2_rt::concat(base_str, ".0".to_string()), + ), + FieldAccessStyle::TupleSecond => apply_type_template1( + sharing.clone_value.clone(), + v2_rt::concat(base_str, ".1".to_string()), + ), + FieldAccessStyle::OptionalUnwrap => v2_rt::concat( + apply_type_template1(sharing.clone_value.clone(), base_str), + ".unwrap()".to_string(), + ), + FieldAccessStyle::EnumAccessor => v2_rt::concat( + v2_rt::concat( + v2_rt::concat(base_str, ".".to_string()), + emit_ident(field.clone(), RenderTarget::Rust), + ), + "()".to_string(), + ), + FieldAccessStyle::StoredField => { + let base_is_owned = match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let base_name = expr_var_name_at( + base.clone(), + scope.type_env.clone().source_indices.clone(), + ); + emit_map_has(emit_info.owned_bindings.clone(), base_name) + } + _ => false, + }; + if base_is_owned { + v2_rt::concat( + v2_rt::concat(base_str, ".".to_string()), + emit_ident(field.clone(), RenderTarget::Rust), + ) + } else { + apply_type_template1( + sharing.clone_value.clone(), + v2_rt::concat( + v2_rt::concat(base_str, ".".to_string()), + emit_ident(field.clone(), RenderTarget::Rust), + ), + ) + } + } + }, + None => v2_rt::concat( + v2_rt::concat( + "compile_error!(\"field access missing reconcile summary for '" + .to_string(), + field.clone(), + ), + "'\")".to_string(), + ), + } + } } -} + } } -pub fn type_needs_rc(type_node: Rc, source_indices: Rc>>) -> bool { - type_needs_rc_seen(type_node, v2_rt::rc_empty_map::(), source_indices) +pub fn type_needs_rc( + type_node: Rc, + source_indices: Rc>>, +) -> bool { + type_needs_rc_seen( + type_node, + v2_rt::rc_empty_map::(), + source_indices, + ) } -pub fn type_needs_rc_seen(mut type_node: Rc, mut seen: Rc>, mut source_indices: Rc>>) -> bool { +pub fn type_needs_rc_seen( + mut type_node: Rc, + mut seen: Rc>, + mut source_indices: Rc>>, +) -> bool { loop { let normed = normalize_access_type_node(type_node); -let is_product = is_product_type(normed.clone()); -let is_coproduct = is_coproduct_type(normed.clone()); -if is_product { + let is_product = is_product_type(normed.clone()); + let is_coproduct = is_coproduct_type(normed.clone()); + if is_product { break true; -} else { + } else { if is_coproduct { - break { let mut __found = false; for child in normed.children.clone().iter().cloned() { if ((child.children.clone().len() as i64) > 0) { __found = true; break; } } __found }; -} else { + break { + let mut __found = false; + for child in normed.children.clone().iter().cloned() { + if ((child.children.clone().len() as i64) > 0) { + __found = true; + break; + } + } + __found + }; + } else { let canonical = authored_name_at(source_indices.clone(), &normed); -if (normed.inferred.clone() != None) { + if (normed.inferred.clone() != None) { let next_seen = if (canonical.clone().as_str() == "".to_string().as_str()) { seen.clone() } else { v2_rt::rc_map_insert(seen.clone(), canonical.clone(), true) }; -{ + { let __tco_0 = resolved_type(normed.clone()); -let __tco_1 = next_seen; -type_node = __tco_0; -seen = __tco_1; -continue; -} -} else { - if ((canonical.clone().as_str() != "".to_string().as_str()) && emit_map_has(seen.clone(), canonical.clone())) { + let __tco_1 = next_seen; + type_node = __tco_0; + seen = __tco_1; + continue; + } + } else { + if ((canonical.clone().as_str() != "".to_string().as_str()) + && emit_map_has(seen.clone(), canonical.clone())) + { break false; -} else { + } else { let next_seen = if (canonical.clone().as_str() == "".to_string().as_str()) { seen.clone() } else { v2_rt::rc_map_insert(seen.clone(), canonical.clone(), true) }; -let has_structure = (normed.connective.clone() != Connective::NoConnective); -if (!has_structure && ((normed.children.clone().len() as i64) == 0)) { + let has_structure = (normed.connective.clone() != Connective::NoConnective); + if (!has_structure && ((normed.children.clone().len() as i64) == 0)) { break false; -} else { + } else { { let __tco_0 = normed.clone(); -let __tco_1 = next_seen; -type_node = __tco_0; -seen = __tco_1; -continue; -} -} -} -} -} -} -} + let __tco_1 = next_seen; + type_node = __tco_0; + seen = __tco_1; + continue; + } + } + } + } + } + } + } } pub fn rust_runtime_bridge_passes_receiver_by_ref(function_name: String) -> bool { @@ -2843,1349 +6063,3701 @@ pub fn rust_runtime_bridge_passes_receiver_by_ref(function_name: String) -> bool pub fn rust_runtime_bridge_name(function_name: String) -> String { match v2_rt::map_get(&rt_bridge_function_names(), function_name.clone()) { - Some(runtime_name) => runtime_name.clone(), - None => function_name.clone(), -} + Some(runtime_name) => runtime_name.clone(), + None => function_name.clone(), + } } -pub fn rust_empty_map_value_type_str(map_type: Rc, shared_types: Rc>, source_indices: Rc>>) -> String { +pub fn rust_empty_map_value_type_str( + map_type: Rc, + shared_types: Rc>, + source_indices: Rc>>, +) -> String { match map_type.children.clone().get(1 as usize).cloned() { - Some(value_child) => { - let rendered = render_rust_type(child_type_node(&value_child), shared_types, source_indices); -if (rendered.clone().as_str() == "".to_string().as_str()) { - "".to_string() - } else { - rendered.clone() + Some(value_child) => { + let rendered = + render_rust_type(child_type_node(&value_child), shared_types, source_indices); + if (rendered.clone().as_str() == "".to_string().as_str()) { + "".to_string() + } else { + rendered.clone() + } } -}, - None => "".to_string(), -} + None => "".to_string(), + } } -pub fn rust_empty_map_kv_type_str(map_type: &Rc, shared_types: &Rc>, source_indices: &Rc>>) -> String { +pub fn rust_empty_map_kv_type_str( + map_type: &Rc, + shared_types: &Rc>, + source_indices: &Rc>>, +) -> String { { let key_str = match map_type.children.clone().first().cloned() { - Some(key_child) => render_rust_type(child_type_node(&key_child), shared_types.clone(), source_indices.clone()), - None => "".to_string(), -}; -let val_str = rust_empty_map_value_type_str(map_type.clone(), shared_types.clone(), source_indices.clone()); -if ((key_str.clone().as_str() != "".to_string().as_str()) && (val_str.clone().as_str() != "".to_string().as_str())) { - v2_rt::concat(v2_rt::concat(key_str.clone(), ", ".to_string()), val_str.clone()) + Some(key_child) => render_rust_type( + child_type_node(&key_child), + shared_types.clone(), + source_indices.clone(), + ), + None => "".to_string(), + }; + let val_str = rust_empty_map_value_type_str( + map_type.clone(), + shared_types.clone(), + source_indices.clone(), + ); + if ((key_str.clone().as_str() != "".to_string().as_str()) + && (val_str.clone().as_str() != "".to_string().as_str())) + { + v2_rt::concat( + v2_rt::concat(key_str.clone(), ", ".to_string()), + val_str.clone(), + ) } else { "".to_string() } -} + } } pub fn rust_runtime_bridge_wraps_collection_result_in_rc(function_name: &String) -> bool { - (v2_rt::map_contains_key(&rt_wraps_result(), function_name.clone()) || v2_rt::map_contains_key(&rust_method_wraps_result(), function_name.clone())) + (v2_rt::map_contains_key(&rt_wraps_result(), function_name.clone()) + || v2_rt::map_contains_key(&rust_method_wraps_result(), function_name.clone())) } -pub fn rust_runtime_bridge_collection_result_needs_rc_elements(function_name: String, result_type: Option>) -> bool { +pub fn rust_runtime_bridge_collection_result_needs_rc_elements( + function_name: String, + result_type: Option>, +) -> bool { false } -pub fn rust_wrap_runtime_collection_result(call_str: String, function_name: &String, result_type: Option>) -> String { +pub fn rust_wrap_runtime_collection_result( + call_str: String, + function_name: &String, + result_type: Option>, +) -> String { if rust_runtime_bridge_wraps_collection_result_in_rc(&function_name) { - if rust_runtime_bridge_collection_result_needs_rc_elements(function_name.clone(), result_type) { - v2_rt::concat(v2_rt::concat("Rc::new((".to_string(), call_str), ").into_iter().map(Rc::new).collect::>())".to_string()) - } else { - v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), call_str), ")".to_string()) + if rust_runtime_bridge_collection_result_needs_rc_elements( + function_name.clone(), + result_type, + ) { + v2_rt::concat( + v2_rt::concat("Rc::new((".to_string(), call_str), + ").into_iter().map(Rc::new).collect::>())".to_string(), + ) + } else { + v2_rt::concat( + v2_rt::concat("Rc::new(".to_string(), call_str), + ")".to_string(), + ) } } else { call_str } } -pub fn emit_rust_expr_var(expr: &Rc, registry: Rc>>, shared_types: Rc>, emit_info: Rc, source_indices: &Rc>>) -> String { +pub fn emit_rust_expr_var( + expr: &Rc, + registry: Rc>>, + shared_types: Rc>, + emit_info: Rc, + source_indices: &Rc>>, +) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprVar { binding_kind, .. } => { - let n = expr_var_name_at(expr.clone(), source_indices.clone()); -emit_var_ref(&n, &binding_kind, &expr.inferred.clone(), shared_types, registry, &emit_info, source_indices.clone()) -}, - _ => emit_error_expr("emit_rust_expr_var expected ExprVar".to_string(), RenderTarget::Rust), -} + ExprData::ExprVar { binding_kind, .. } => { + let n = expr_var_name_at(expr.clone(), source_indices.clone()); + emit_var_ref( + &n, + &binding_kind, + &expr.inferred.clone(), + shared_types, + registry, + &emit_info, + source_indices.clone(), + ) + } + _ => emit_error_expr( + "emit_rust_expr_var expected ExprVar".to_string(), + RenderTarget::Rust, + ), + } } -pub fn emit_rust_expr_field_access(expr: &Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { +pub fn emit_rust_expr_field_access( + expr: &Rc, + registry: Rc>>, + scope: &Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { { let si = scope.type_env.clone().source_indices.clone(); -match (*expr.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { summary, .. } => { - let f = field_access_field_at(expr.clone(), si); -let b = field_access_base(expr.clone()); -if is_typed_service_call_receiver(&expr, scope.type_env.clone().source_indices.clone()) { - match extract_typed_service_name(&expr, &scope.type_env.clone().source_indices.clone()) { - Some(svc_name) => service_var_name(svc_name.clone()), - None => emit_typed_field_access(&b, &f, summary.clone(), ®istry, &scope, depth, &shared_types, &emit_info), -} - } else { - emit_typed_field_access(&b, &f, summary.clone(), ®istry, &scope, depth, &shared_types, &emit_info) + match (*expr.expr_data.clone()).clone() { + ExprData::ExprFieldAccess { summary, .. } => { + let f = field_access_field_at(expr.clone(), si); + let b = field_access_base(expr.clone()); + if is_typed_service_call_receiver( + &expr, + scope.type_env.clone().source_indices.clone(), + ) { + match extract_typed_service_name( + &expr, + &scope.type_env.clone().source_indices.clone(), + ) { + Some(svc_name) => service_var_name(svc_name.clone()), + None => emit_typed_field_access( + &b, + &f, + summary.clone(), + ®istry, + &scope, + depth, + &shared_types, + &emit_info, + ), + } + } else { + emit_typed_field_access( + &b, + &f, + summary.clone(), + ®istry, + &scope, + depth, + &shared_types, + &emit_info, + ) + } } -}, - _ => emit_error_expr("emit_rust_expr_field_access expected ExprFieldAccess".to_string(), RenderTarget::Rust), -} -} + _ => emit_error_expr( + "emit_rust_expr_field_access expected ExprFieldAccess".to_string(), + RenderTarget::Rust, + ), + } + } } -pub fn emit_rust_expr_call(expr: &Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { +pub fn emit_rust_expr_call( + expr: &Rc, + registry: Rc>>, + scope: &Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let f = expr_call_func_at(expr.clone(), scope.type_env.clone().source_indices.clone()); -emit_typed_call_expr(&f, expr.children.clone(), expr.inferred.clone(), registry, scope.clone(), depth, shared_types, emit_info) -}, - _ => emit_error_expr("emit_rust_expr_call expected ExprCall".to_string(), RenderTarget::Rust), -} + ExprData::ExprCall { .. } => { + let f = expr_call_func_at(expr.clone(), scope.type_env.clone().source_indices.clone()); + emit_typed_call_expr( + &f, + expr.children.clone(), + expr.inferred.clone(), + registry, + scope.clone(), + depth, + shared_types, + emit_info, + ) + } + _ => emit_error_expr( + "emit_rust_expr_call expected ExprCall".to_string(), + RenderTarget::Rust, + ), + } } -pub fn emit_rust_expr_method_call(expr: &Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { +pub fn emit_rust_expr_method_call( + expr: &Rc, + registry: Rc>>, + scope: &Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprMethodCall { method_semantics, .. } => { - let r = method_receiver(expr.clone()); -let a = method_arg_nodes(expr.clone()); -let m = expr_method_name_at(expr.clone(), scope.type_env.clone().source_indices.clone()); -emit_typed_method_call(expr.clone(), &r, m, &a, expr.inferred.clone(), &method_semantics, ®istry, &scope, depth, &shared_types, &emit_info) -}, - _ => emit_error_expr("emit_rust_expr_method_call expected ExprMethodCall".to_string(), RenderTarget::Rust), -} + ExprData::ExprMethodCall { + method_semantics, .. + } => { + let r = method_receiver(expr.clone()); + let a = method_arg_nodes(expr.clone()); + let m = + expr_method_name_at(expr.clone(), scope.type_env.clone().source_indices.clone()); + emit_typed_method_call( + expr.clone(), + &r, + m, + &a, + expr.inferred.clone(), + &method_semantics, + ®istry, + &scope, + depth, + &shared_types, + &emit_info, + ) + } + _ => emit_error_expr( + "emit_rust_expr_method_call expected ExprMethodCall".to_string(), + RenderTarget::Rust, + ), + } } -pub fn emit_rust_expr_match(expr: &Rc, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { +pub fn emit_rust_expr_match( + expr: &Rc, + registry: Rc>>, + scope: Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprMatch => { - let s = match_scrutinee(expr.clone()); -let arm_list = match_arm_nodes(expr.clone()); -emit_typed_match(&s, &arm_list, ®istry, &scope, depth, &shared_types, &emit_info) -}, - _ => emit_error_expr("emit_rust_expr_match expected ExprMatch".to_string(), RenderTarget::Rust), -} + ExprData::ExprMatch => { + let s = match_scrutinee(expr.clone()); + let arm_list = match_arm_nodes(expr.clone()); + emit_typed_match( + &s, + &arm_list, + ®istry, + &scope, + depth, + &shared_types, + &emit_info, + ) + } + _ => emit_error_expr( + "emit_rust_expr_match expected ExprMatch".to_string(), + RenderTarget::Rust, + ), + } } -pub fn emit_rust_expr_if(expr: &Rc, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { +pub fn emit_rust_expr_if( + expr: &Rc, + registry: Rc>>, + scope: Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprIf => { - let c = if_condition(expr.clone()); -let t = if_then_branch(expr.clone()); -let e = if_else_branch(expr.clone()); -emit_typed_if(c, t, e, ®istry, &scope, depth, &shared_types, &emit_info) -}, - _ => emit_error_expr("emit_rust_expr_if expected ExprIf".to_string(), RenderTarget::Rust), -} + ExprData::ExprIf => { + let c = if_condition(expr.clone()); + let t = if_then_branch(expr.clone()); + let e = if_else_branch(expr.clone()); + emit_typed_if(c, t, e, ®istry, &scope, depth, &shared_types, &emit_info) + } + _ => emit_error_expr( + "emit_rust_expr_if expected ExprIf".to_string(), + RenderTarget::Rust, + ), + } } -pub fn emit_rust_expr_let(expr: &Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { +pub fn emit_rust_expr_let( + expr: &Rc, + registry: Rc>>, + scope: &Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprLet => { - let n = let_binding_name_at(expr.clone(), scope.type_env.clone().source_indices.clone()); -let v = let_value(expr.clone()); -let bd = let_body(expr.clone()); -emit_typed_let(n, &v, bd, ®istry, &scope, depth, &shared_types, &emit_info) -}, - _ => emit_error_expr("emit_rust_expr_let expected ExprLet".to_string(), RenderTarget::Rust), -} + ExprData::ExprLet => { + let n = + let_binding_name_at(expr.clone(), scope.type_env.clone().source_indices.clone()); + let v = let_value(expr.clone()); + let bd = let_body(expr.clone()); + emit_typed_let( + n, + &v, + bd, + ®istry, + &scope, + depth, + &shared_types, + &emit_info, + ) + } + _ => emit_error_expr( + "emit_rust_expr_let expected ExprLet".to_string(), + RenderTarget::Rust, + ), + } } -pub fn emit_rust_expr_record_lit(expr: &Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: Rc) -> String { +pub fn emit_rust_expr_record_lit( + expr: &Rc, + registry: Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: Rc, +) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprRecordLit { parent_enum, .. } => { - let tn = record_lit_type_name_at(expr.clone(), scope.type_env.clone().source_indices.clone()); -let fs = expr.children.clone(); -let raw = emit_typed_record_lit(&tn, &fs, &parent_enum, &resolved_type(expr.clone()), registry, &scope, depth, &shared_types, &emit_info); -let rc_name = match parent_enum.clone() { - Some(en) => en.clone(), - None => match tn.clone() { - Some(n) => n.clone(), - None => "".to_string(), -}, -}; -if ((rc_name.clone().as_str() != "".to_string().as_str()) && set_contains(shared_types.clone(), rc_name.clone())) { - v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) - } else { - raw + ExprData::ExprRecordLit { parent_enum, .. } => { + let tn = record_lit_type_name_at( + expr.clone(), + scope.type_env.clone().source_indices.clone(), + ); + let fs = expr.children.clone(); + let raw = emit_typed_record_lit( + &tn, + &fs, + &parent_enum, + &resolved_type(expr.clone()), + registry, + &scope, + depth, + &shared_types, + &emit_info, + ); + let rc_name = match parent_enum.clone() { + Some(en) => en.clone(), + None => match tn.clone() { + Some(n) => n.clone(), + None => "".to_string(), + }, + }; + if ((rc_name.clone().as_str() != "".to_string().as_str()) + && emit_map_has(shared_types.clone(), rc_name.clone())) + { + v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) + } else { + raw + } } -}, - _ => emit_error_expr("emit_rust_expr_record_lit expected ExprRecordLit".to_string(), RenderTarget::Rust), -} + _ => emit_error_expr( + "emit_rust_expr_record_lit expected ExprRecordLit".to_string(), + RenderTarget::Rust, + ), + } } -pub fn emit_rust_expr_string_interp(expr: &Rc, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { +pub fn emit_rust_expr_string_interp( + expr: &Rc, + registry: Rc>>, + scope: Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprStringInterp => { - let ps = Rc::new({ let mut __result = Vec::new(); for child in expr.children.clone().iter().cloned() { __result.push(match (*child.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: text, .. } = value.as_ref() else { unreachable!() }; Rc::new(StringPart::Text { - value: text.clone(), -}) }, - _ => Rc::new(StringPart::Interpolation { - expr: arg_value(&child), -}), -}); } __result }); -emit_typed_string_interp(&ps, registry, scope, depth, shared_types, emit_info) -}, - _ => emit_error_expr("emit_rust_expr_string_interp expected ExprStringInterp".to_string(), RenderTarget::Rust), -} + ExprData::ExprStringInterp => { + let ps = Rc::new({ + let mut __result = Vec::new(); + for child in expr.children.clone().iter().cloned() { + __result.push(match (*child.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitStr { value: text, .. } = value.as_ref() else { + unreachable!() + }; + Rc::new(StringPart::Text { + value: text.clone(), + }) + } + _ => Rc::new(StringPart::Interpolation { + expr: arg_value(&child), + }), + }); + } + __result + }); + emit_typed_string_interp(&ps, registry, scope, depth, shared_types, emit_info) + } + _ => emit_error_expr( + "emit_rust_expr_string_interp expected ExprStringInterp".to_string(), + RenderTarget::Rust, + ), + } } -pub fn emit_rust_expr_block(expr: &Rc, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { +pub fn emit_rust_expr_block( + expr: &Rc, + registry: Rc>>, + scope: Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprBlock => emit_typed_block(expr.children.clone(), registry, scope, depth, shared_types, emit_info), - _ => emit_error_expr("emit_rust_expr_block expected ExprBlock".to_string(), RenderTarget::Rust), -} + ExprData::ExprBlock => emit_typed_block( + expr.children.clone(), + registry, + scope, + depth, + shared_types, + emit_info, + ), + _ => emit_error_expr( + "emit_rust_expr_block expected ExprBlock".to_string(), + RenderTarget::Rust, + ), + } } -pub fn emit_rust_expr_cast(expr: &Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { +pub fn emit_rust_expr_cast( + expr: &Rc, + registry: Rc>>, + scope: &Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprCast => emit_typed_cast_shared(&cast_expr(expr.clone()), cast_target(expr.clone()), &RenderTarget::Rust, |child| emit_typed_expr(child.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024), &scope.type_env.clone().source_indices.clone()), - _ => emit_error_expr("emit_rust_expr_cast expected ExprCast".to_string(), RenderTarget::Rust), -} + ExprData::ExprCast => emit_typed_cast_shared( + &cast_expr(expr.clone()), + cast_target(expr.clone()), + &RenderTarget::Rust, + |child| { + emit_typed_expr( + child.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ) + }, + &scope.type_env.clone().source_indices.clone(), + ), + _ => emit_error_expr( + "emit_rust_expr_cast expected ExprCast".to_string(), + RenderTarget::Rust, + ), + } } -pub fn emit_rust_expr_for_each(expr: &Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { +pub fn emit_rust_expr_for_each( + expr: &Rc, + registry: Rc>>, + scope: &Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprForEach => { - let v = foreach_variable_at(expr.clone(), scope.type_env.clone().source_indices.clone()); -let c = foreach_collection(expr.clone()); -let bd = foreach_body(expr.clone()); -emit_typed_for_each(&v, &c, bd, ®istry, &scope, depth, &shared_types, &emit_info) -}, - _ => emit_error_expr("emit_rust_expr_for_each expected ExprForEach".to_string(), RenderTarget::Rust), -} + ExprData::ExprForEach => { + let v = + foreach_variable_at(expr.clone(), scope.type_env.clone().source_indices.clone()); + let c = foreach_collection(expr.clone()); + let bd = foreach_body(expr.clone()); + emit_typed_for_each( + &v, + &c, + bd, + ®istry, + &scope, + depth, + &shared_types, + &emit_info, + ) + } + _ => emit_error_expr( + "emit_rust_expr_for_each expected ExprForEach".to_string(), + RenderTarget::Rust, + ), + } } -pub fn emit_rust_expr_index(expr: &Rc, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { +pub fn emit_rust_expr_index( + expr: &Rc, + registry: Rc>>, + scope: Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprIndex => { - let b = index_base(expr.clone()); -let i = index_expr(expr.clone()); -emit_typed_index(&b, i, ®istry, &scope, depth, &shared_types, &emit_info) -}, - _ => emit_error_expr("emit_rust_expr_index expected ExprIndex".to_string(), RenderTarget::Rust), -} + ExprData::ExprIndex => { + let b = index_base(expr.clone()); + let i = index_expr(expr.clone()); + emit_typed_index(&b, i, ®istry, &scope, depth, &shared_types, &emit_info) + } + _ => emit_error_expr( + "emit_rust_expr_index expected ExprIndex".to_string(), + RenderTarget::Rust, + ), + } } -pub fn emit_rust_expr_slice(expr: &Rc, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { +pub fn emit_rust_expr_slice( + expr: &Rc, + registry: Rc>>, + scope: Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprSlice => { - let b = slice_base(expr.clone()); -let s = slice_start(expr.clone()); -let e = slice_end(expr.clone()); -emit_typed_slice(&b, s, e, ®istry, &scope, depth, &shared_types, &emit_info) -}, - _ => emit_error_expr("emit_rust_expr_slice expected ExprSlice".to_string(), RenderTarget::Rust), -} + ExprData::ExprSlice => { + let b = slice_base(expr.clone()); + let s = slice_start(expr.clone()); + let e = slice_end(expr.clone()); + emit_typed_slice( + &b, + s, + e, + ®istry, + &scope, + depth, + &shared_types, + &emit_info, + ) + } + _ => emit_error_expr( + "emit_rust_expr_slice expected ExprSlice".to_string(), + RenderTarget::Rust, + ), + } } -pub fn emit_rust_expr_bin_op(expr: &Rc, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { +pub fn emit_rust_expr_bin_op( + expr: &Rc, + registry: Rc>>, + scope: Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprBinOp { op, algebra_field: algebra, .. } => emit_typed_bin_op(&op, algebra.clone(), &binop_left(expr.clone()), &binop_right(expr.clone()), ®istry, &scope, depth, &shared_types, &emit_info), - _ => emit_error_expr("emit_rust_expr_bin_op expected ExprBinOp".to_string(), RenderTarget::Rust), -} + ExprData::ExprBinOp { + op, + algebra_field: algebra, + .. + } => emit_typed_bin_op( + &op, + algebra.clone(), + &binop_left(expr.clone()), + &binop_right(expr.clone()), + ®istry, + &scope, + depth, + &shared_types, + &emit_info, + ), + _ => emit_error_expr( + "emit_rust_expr_bin_op expected ExprBinOp".to_string(), + RenderTarget::Rust, + ), + } } -pub fn emit_typed_expr(texpr: Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: Rc, fuel: i64) -> String { +pub fn emit_typed_expr( + texpr: Rc, + registry: Rc>>, + scope: &Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, + fuel: i64, +) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - emit_shared_expr(&texpr, &RenderTarget::Rust, scope.type_env.clone().source_indices.clone(), |result| result.clone(), |child| emit_typed_expr(child.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), (fuel.clone() - 1)), |expr| emit_rust_expr_var(&expr, registry.clone(), shared_types.clone(), emit_info.clone(), &scope.type_env.clone().source_indices.clone()), |expr| emit_rust_expr_field_access(&expr, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_call(&expr, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_method_call(&expr, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_match(&expr, registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_if(&expr, registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_let(&expr, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_record_lit(&expr, registry.clone(), &scope, depth.clone(), &shared_types, emit_info.clone()), |expr| emit_rust_expr_string_interp(&expr, registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_block(&expr, registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_cast(&expr, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_for_each(&expr, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_index(&expr, registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_slice(&expr, registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()), |expr| emit_rust_expr_bin_op(&expr, registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone())) + emit_shared_expr( + &texpr, + &RenderTarget::Rust, + scope.type_env.clone().source_indices.clone(), + |result| result.clone(), + |child| { + emit_typed_expr( + child.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + (fuel.clone() - 1), + ) + }, + |expr| { + emit_rust_expr_var( + &expr, + registry.clone(), + shared_types.clone(), + emit_info.clone(), + &scope.type_env.clone().source_indices.clone(), + ) + }, + |expr| { + emit_rust_expr_field_access( + &expr, + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ) + }, + |expr| { + emit_rust_expr_call( + &expr, + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ) + }, + |expr| { + emit_rust_expr_method_call( + &expr, + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ) + }, + |expr| { + emit_rust_expr_match( + &expr, + registry.clone(), + scope.clone(), + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ) + }, + |expr| { + emit_rust_expr_if( + &expr, + registry.clone(), + scope.clone(), + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ) + }, + |expr| { + emit_rust_expr_let( + &expr, + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ) + }, + |expr| { + emit_rust_expr_record_lit( + &expr, + registry.clone(), + &scope, + depth.clone(), + &shared_types, + emit_info.clone(), + ) + }, + |expr| { + emit_rust_expr_string_interp( + &expr, + registry.clone(), + scope.clone(), + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ) + }, + |expr| { + emit_rust_expr_block( + &expr, + registry.clone(), + scope.clone(), + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ) + }, + |expr| { + emit_rust_expr_cast( + &expr, + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ) + }, + |expr| { + emit_rust_expr_for_each( + &expr, + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ) + }, + |expr| { + emit_rust_expr_index( + &expr, + registry.clone(), + scope.clone(), + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ) + }, + |expr| { + emit_rust_expr_slice( + &expr, + registry.clone(), + scope.clone(), + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ) + }, + |expr| { + emit_rust_expr_bin_op( + &expr, + registry.clone(), + scope.clone(), + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ) + }, + ) }) } -pub fn emit_cloned_arg(texpr: Rc, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { - emit_typed_expr(texpr, registry, &scope, depth, shared_types, emit_info, 1024) -} - -pub fn is_enum_type_name(type_name: String, type_summaries: Rc>>) -> bool { +pub fn emit_cloned_arg( + texpr: Rc, + registry: Rc>>, + scope: Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { + emit_typed_expr( + texpr, + registry, + &scope, + depth, + shared_types, + emit_info, + 1024, + ) +} + +pub fn is_enum_type_name( + type_name: String, + type_summaries: Rc>>, +) -> bool { is_enum_in_summaries(type_summaries, type_name) } -pub fn contextual_variant_parent(variant_name: &String, parent_enum: Option, resolved_type: &Rc, emit_info: Rc, source_indices: Rc>>) -> Option { +pub fn contextual_variant_parent( + variant_name: &String, + parent_enum: Option, + resolved_type: &Rc, + emit_info: Rc, + source_indices: Rc>>, +) -> Option { match parent_enum { - Some(explicit_parent) => if variant_belongs_to_enum(emit_info.type_summaries.clone(), variant_name.clone(), explicit_parent.clone()) { - Some(explicit_parent.clone()) - } else { - None - }, - None => { - let rt_name = authored_name_at(source_indices, &resolved_type); -if (((resolved_type.ident_span.clone() != None) && (rt_name.clone().as_str() != variant_name.clone().as_str())) && variant_belongs_to_enum(emit_info.type_summaries.clone(), variant_name.clone(), rt_name.clone())) { - Some(rt_name.clone()) - } else { - None + Some(explicit_parent) => { + if variant_belongs_to_enum( + emit_info.type_summaries.clone(), + variant_name.clone(), + explicit_parent.clone(), + ) { + Some(explicit_parent.clone()) + } else { + None + } } -}, -} + None => { + let rt_name = authored_name_at(source_indices, &resolved_type); + if (((resolved_type.ident_span.clone() != None) + && (rt_name.clone().as_str() != variant_name.clone().as_str())) + && variant_belongs_to_enum( + emit_info.type_summaries.clone(), + variant_name.clone(), + rt_name.clone(), + )) + { + Some(rt_name.clone()) + } else { + None + } + } + } } -pub fn is_map_typed_expr(texpr: Rc, source_indices: Rc>>) -> bool { +pub fn is_map_typed_expr( + texpr: Rc, + source_indices: Rc>>, +) -> bool { match texpr.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: n, .. }) => node_is_keyed_collection(&n, source_indices), - _ => false, -} + Some(InferredNode::Resolved { node: n, .. }) => { + node_is_keyed_collection(&n, source_indices) + } + _ => false, + } } -pub fn emit_typed_call_expr(func: &String, args: Rc>>, inferred: Option>, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { +pub fn emit_typed_call_expr( + func: &String, + args: Rc>>, + inferred: Option>, + registry: Rc>>, + scope: Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { { let call_str = if (func.clone().as_str() == "empty_map".to_string().as_str()) { match inferred.as_deref().cloned() { - Some(InferredNode::Resolved { node: ret_type, .. }) => { - let kv_type_str = rust_empty_map_kv_type_str(&ret_type, &shared_types, &scope.type_env.clone().source_indices.clone()); -if (kv_type_str.clone().as_str() != "".to_string().as_str()) { - v2_rt::concat(v2_rt::concat("v2_rt::rc_empty_map::<".to_string(), kv_type_str.clone()), ">()".to_string()) - } else { - "Rc::new(HashMap::new()) /* BRIDGE: empty_map value type unresolved */".to_string() + Some(InferredNode::Resolved { node: ret_type, .. }) => { + let kv_type_str = rust_empty_map_kv_type_str( + &ret_type, + &shared_types, + &scope.type_env.clone().source_indices.clone(), + ); + if (kv_type_str.clone().as_str() != "".to_string().as_str()) { + v2_rt::concat( + v2_rt::concat( + "v2_rt::rc_empty_map::<".to_string(), + kv_type_str.clone(), + ), + ">()".to_string(), + ) + } else { + "Rc::new(HashMap::new()) /* BRIDGE: empty_map value type unresolved */" + .to_string() + } } -}, - _ => "Rc::new(HashMap::new()) /* BRIDGE: empty_map return type unresolved */".to_string(), -} + _ => "Rc::new(HashMap::new()) /* BRIDGE: empty_map return type unresolved */" + .to_string(), + } } else { - emit_typed_call(&func, &args, ®istry, &scope, depth, &shared_types, &emit_info) + emit_typed_call( + &func, + &args, + ®istry, + &scope, + depth, + &shared_types, + &emit_info, + ) }; -if rust_runtime_bridge_wraps_collection_result_in_rc(&func) { - v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), call_str), ")".to_string()) + if rust_runtime_bridge_wraps_collection_result_in_rc(&func) { + v2_rt::concat( + v2_rt::concat("Rc::new(".to_string(), call_str), + ")".to_string(), + ) } else { call_str } -} + } } -pub fn emit_typed_call(func: &String, args: &Rc>>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { +pub fn emit_typed_call( + func: &String, + args: &Rc>>, + registry: &Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { { if (func.clone().as_str() == "get".to_string().as_str()) { { let get_args = order_typed_call_args(&args, func.clone(), &scope); -let get_list = get_args.clone().first().cloned(); -let get_idx = get_args.clone().get(1 as usize).cloned(); -let get_result = match get_list { - Some(list_arg) => match get_idx { - Some(idx_arg) => { - let list_str = emit_typed_expr(arg_value(&list_arg), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let index_str = emit_typed_expr(arg_value(&idx_arg), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(list_str, ".get((".to_string()), index_str), ") as usize)".to_string()), clone_iterator_suffix()) -}, - None => "compile_error!(\"get call missing index argument\")".to_string(), -}, - None => "compile_error!(\"get call missing list argument\")".to_string(), -}; -return get_result -} + let get_list = get_args.clone().first().cloned(); + let get_idx = get_args.clone().get(1 as usize).cloned(); + let get_result = match get_list { + Some(list_arg) => match get_idx { + Some(idx_arg) => { + let list_str = emit_typed_expr( + arg_value(&list_arg), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let index_str = emit_typed_expr( + arg_value(&idx_arg), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(list_str, ".get((".to_string()), + index_str, + ), + ") as usize)".to_string(), + ), + clone_iterator_suffix(), + ) + } + None => "compile_error!(\"get call missing index argument\")".to_string(), + }, + None => "compile_error!(\"get call missing list argument\")".to_string(), + }; + return get_result; + } } -if (func.clone().as_str() == "with".to_string().as_str()) { + if (func.clone().as_str() == "with".to_string().as_str()) { { let with_args = order_typed_call_args(&args, func.clone(), &scope); -if ((with_args.clone().len() as i64) == 0) { - return "compile_error!(\"with call missing base record\")".to_string() + if ((with_args.clone().len() as i64) == 0) { + return "compile_error!(\"with call missing base record\")".to_string(); } -let base_arg = arg_value(&with_args.clone().first().cloned().clone().unwrap()); -if ((with_args.clone().len() as i64) < 2) { - return "compile_error!(\"with call missing update record\")".to_string() + let base_arg = arg_value(&with_args.clone().first().cloned().clone().unwrap()); + if ((with_args.clone().len() as i64) < 2) { + return "compile_error!(\"with call missing update record\")".to_string(); } -let update_arg = arg_value(&with_args.clone().get(1 as usize).cloned().clone().unwrap()); -let base_str = emit_typed_expr(base_arg.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let type_name = if (base_arg.inferred.clone() != None) { - authored_name_at(scope.type_env.clone().source_indices.clone(), &resolved_type(base_arg.clone())) + let update_arg = + arg_value(&with_args.clone().get(1 as usize).cloned().clone().unwrap()); + let base_str = emit_typed_expr( + base_arg.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let type_name = if (base_arg.inferred.clone() != None) { + authored_name_at( + scope.type_env.clone().source_indices.clone(), + &resolved_type(base_arg.clone()), + ) } else { "compile_error!(\"with call missing resolved record type\")".to_string() }; -let field_strs = match (*update_arg.expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => Rc::new({ let mut __result = Vec::new(); for f in update_arg.children.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(emit_ident(field_init_node_name_at(f.clone(), scope.type_env.clone().source_indices.clone()), RenderTarget::Rust), ": ".to_string()), emit_typed_expr(field_init_node_value(&f), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024))); } __result }), - _ => Rc::new(vec![emit_typed_expr(update_arg.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024)]), -}; -let fields_str = field_strs.join(&", ".to_string()); -let needs_rc = set_contains(shared_types.clone(), type_name.clone()); -let sharing = language_spec(RenderTarget::Rust).sharing.clone(); -let spread = if needs_rc.clone() { + let field_strs = match (*update_arg.expr_data.clone()).clone() { + ExprData::ExprRecordLit { .. } => Rc::new({ + let mut __result = Vec::new(); + for f in update_arg.children.clone().iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + emit_ident( + field_init_node_name_at( + f.clone(), + scope.type_env.clone().source_indices.clone(), + ), + RenderTarget::Rust, + ), + ": ".to_string(), + ), + emit_typed_expr( + field_init_node_value(&f), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ), + )); + } + __result + }), + _ => Rc::new(vec![emit_typed_expr( + update_arg.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + )]), + }; + let fields_str = field_strs.join(&", ".to_string()); + let needs_rc = emit_map_has(shared_types.clone(), type_name.clone()); + let sharing = language_spec(RenderTarget::Rust).sharing.clone(); + let spread = if needs_rc.clone() { apply_type_template1(sharing.deref_clone.clone(), base_str) } else { apply_type_template1(sharing.clone_value.clone(), base_str) }; -let raw = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(type_name.clone(), " { ".to_string()), fields_str), ", ..".to_string()), spread), " }".to_string()); -if needs_rc.clone() { - return v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) + let raw = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(type_name.clone(), " { ".to_string()), + fields_str, + ), + ", ..".to_string(), + ), + spread, + ), + " }".to_string(), + ); + if needs_rc.clone() { + return v2_rt::concat( + v2_rt::concat("Rc::new(".to_string(), raw), + ")".to_string(), + ); } else { - return raw + return raw; } -} + } } -if (func.clone().as_str() == "to_string".to_string().as_str()) { + if (func.clone().as_str() == "to_string".to_string().as_str()) { { let to_string_args = order_typed_call_args(&args, func.clone(), &scope); -let ts_result = match to_string_args.first().cloned() { - Some(value_arg) => v2_rt::concat(v2_rt::concat("(".to_string(), emit_typed_expr(arg_value(&value_arg), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024)), ").to_string()".to_string()), - None => "compile_error!(\"to_string call missing value argument\")".to_string(), -}; -return ts_result -} + let ts_result = match to_string_args.first().cloned() { + Some(value_arg) => v2_rt::concat( + v2_rt::concat( + "(".to_string(), + emit_typed_expr( + arg_value(&value_arg), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ), + ), + ").to_string()".to_string(), + ), + None => "compile_error!(\"to_string call missing value argument\")".to_string(), + }; + return ts_result; + } } -let collection_scope = if ((((func.clone().as_str() == "map".to_string().as_str()) || (func.clone().as_str() == "filter".to_string().as_str())) || (func.clone().as_str() == "flat_map".to_string().as_str())) || (func.clone().as_str() == "fold".to_string().as_str())) { + let collection_scope = if ((((func.clone().as_str() == "map".to_string().as_str()) + || (func.clone().as_str() == "filter".to_string().as_str())) + || (func.clone().as_str() == "flat_map".to_string().as_str())) + || (func.clone().as_str() == "fold".to_string().as_str())) + { { let call_args = order_typed_call_args(&args, func.clone(), &scope); -match call_args.last().cloned() { - Some(a) => match (*arg_value(&a).expr_data.clone()).clone() { - ExprData::ExprLambda => { - let lps = lambda_param_names_at(arg_value(&a), scope.type_env.clone().source_indices.clone()); -lambda_scope_from_children(scope.clone(), lps, Rc::new(arg_value(&a).children.clone().iter().cloned().skip(1 as usize).collect::>())) -}, - _ => scope.clone(), -}, - None => scope.clone(), -} -} + match call_args.last().cloned() { + Some(a) => match (*arg_value(&a).expr_data.clone()).clone() { + ExprData::ExprLambda => { + let lps = lambda_param_names_at( + arg_value(&a), + scope.type_env.clone().source_indices.clone(), + ); + lambda_scope_from_children( + scope.clone(), + lps, + Rc::new( + arg_value(&a) + .children + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ) + } + _ => scope.clone(), + }, + None => scope.clone(), + } + } } else { scope.clone() }; -let ordered_args = order_typed_call_args(&args, func.clone(), &collection_scope); -let callee = lookup_item(registry.clone(), func.clone()); -let filled_args = fill_default_args(&ordered_args, callee.clone(), registry.clone(), collection_scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()); -let is_rt = v2_rt::map_contains_key(&rt_functions(), func.clone()); -let is_rt_ref_map = v2_rt::map_contains_key(&rt_ref_map_functions(), func.clone()); -let callee_qualified = match callee.clone() { - Some(info) => v2_rt::concat(v2_rt::concat(info.module_name.clone(), ".".to_string()), func.clone()), - None => func.clone(), -}; -let callee_read_only = match v2_rt::map_get(&emit_info.read_only_params_index.clone(), callee_qualified) { - Some(m) => m.clone(), - None => empty_set(), -}; -let callee_is_tco = match callee.clone() { - Some(info) => (info.is_self_recursive.clone() && (info.has_non_tail_self_call.clone() == false)), - None => false, -}; -let callee_borrow_positions = if callee_is_tco { + let ordered_args = order_typed_call_args(&args, func.clone(), &collection_scope); + let callee = lookup_item(registry.clone(), func.clone()); + let filled_args = fill_default_args( + &ordered_args, + callee.clone(), + registry.clone(), + collection_scope.clone(), + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ); + let is_rt = v2_rt::map_contains_key(&rt_functions(), func.clone()); + let is_rt_ref_map = v2_rt::map_contains_key(&rt_ref_map_functions(), func.clone()); + let callee_qualified = match callee.clone() { + Some(info) => v2_rt::concat( + v2_rt::concat(info.module_name.clone(), ".".to_string()), + func.clone(), + ), + None => func.clone(), + }; + let callee_read_only = + match v2_rt::map_get(&emit_info.read_only_params_index.clone(), callee_qualified) { + Some(m) => m.clone(), + None => v2_rt::rc_empty_map::(), + }; + let callee_is_tco = match callee.clone() { + Some(info) => { + (info.is_self_recursive.clone() && (info.has_non_tail_self_call.clone() == false)) + } + None => false, + }; + let callee_borrow_positions = if callee_is_tco { v2_rt::rc_empty_map::() } else { match callee.clone() { - Some(info) => Rc::new(info.params.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, pair: (i64, Rc)| { - let pname = param_node_name_at(pair.1.clone(), collection_scope.type_env.clone().source_indices.clone()); -let n = param_node_type_expr(&pair.1.clone()); -let is_callable = ((n.params.clone().len() as i64) > 0); -let is_borrowable = ((set_contains(callee_read_only.clone(), pname.clone()) && (is_callable.clone() == false)) && needs_reference_node(&n, collection_scope.type_env.clone().source_indices.clone())); -if is_borrowable.clone() { - v2_rt::rc_map_insert(acc.clone(), (pair.0.clone()).to_string(), true) - } else { - acc.clone() - } -}), - None => v2_rt::rc_empty_map::(), -} + Some(info) => Rc::new( + info.params + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, pair: (i64, Rc)| { + let pname = param_node_name_at( + pair.1.clone(), + collection_scope.type_env.clone().source_indices.clone(), + ); + let n = param_node_type_expr(&pair.1.clone()); + let is_callable = ((n.params.clone().len() as i64) > 0); + let is_borrowable = + ((v2_rt::map_contains_key(&callee_read_only, pname.clone()) + && (is_callable.clone() == false)) + && needs_reference_node( + &n, + collection_scope.type_env.clone().source_indices.clone(), + )); + if is_borrowable.clone() { + v2_rt::rc_map_insert(acc.clone(), (pair.0.clone()).to_string(), true) + } else { + acc.clone() + } + }, + ), + None => v2_rt::rc_empty_map::(), + } }; -let arg_strs = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(filled_args.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ - let idx = pair.0.clone(); -let a = pair.1.clone(); -if (is_rt_ref_map.clone() && (idx.clone() == 0)) { - { - let base = emit_typed_expr_base(&arg_value(&a), registry.clone(), &collection_scope, depth.clone(), shared_types.clone(), emit_info.clone()); -v2_rt::concat("&".to_string(), base.clone()) -} - } else { - if v2_rt::map_contains_key(&callee_borrow_positions, (idx.clone()).to_string()) { + let arg_strs = Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + filled_args + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + __result.push({ + let idx = pair.0.clone(); + let a = pair.1.clone(); + if (is_rt_ref_map.clone() && (idx.clone() == 0)) { + { + let base = emit_typed_expr_base( + &arg_value(&a), + registry.clone(), + &collection_scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ); + v2_rt::concat("&".to_string(), base.clone()) + } + } else { + if v2_rt::map_contains_key( + &callee_borrow_positions, + (idx.clone()).to_string(), + ) { + { + let base = emit_typed_expr_base( + &arg_value(&a), + registry.clone(), + &collection_scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ); + apply_type_template1( + sharing_for_target(RenderTarget::Rust) + .borrow_arg_template + .clone(), + base.clone(), + ) + } + } else { + emit_cloned_arg( + arg_value(&a), + registry.clone(), + collection_scope.clone(), + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ) + } + } + }); + } + __result + }); + let extra_args = match callee.clone() { + Some(info) => { + let has_effects = (((info.service_names.clone().len() as i64) > 0) + || ((info.resource_names.clone().len() as i64) > 0)); + if has_effects.clone() { { - let base = emit_typed_expr_base(&arg_value(&a), registry.clone(), &collection_scope, depth.clone(), shared_types.clone(), emit_info.clone()); -apply_type_template1(sharing_for_target(RenderTarget::Rust).borrow_arg_template.clone(), base.clone()) -} + let resource_args = Rc::new({ + let mut __result = Vec::new(); + for rn in info.resource_names.clone().iter().cloned() { + __result.push(v2_rt::concat( + "&".to_string(), + emit_ident(rn.clone(), RenderTarget::Rust), + )); + } + __result + }); + let service_args = Rc::new({ + let mut __result = Vec::new(); + for sn in info.service_names.clone().iter().cloned() { + __result.push(service_var_name(sn.clone())); + } + __result + }); + v2_rt::concat(resource_args, service_args) + } } else { - emit_cloned_arg(arg_value(&a), registry.clone(), collection_scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()) + Rc::new(vec![]) } } -}); } __result }); -let extra_args = match callee.clone() { - Some(info) => { - let has_effects = (((info.service_names.clone().len() as i64) > 0) || ((info.resource_names.clone().len() as i64) > 0)); -if has_effects.clone() { - { - let resource_args = Rc::new({ let mut __result = Vec::new(); for rn in info.resource_names.clone().iter().cloned() { __result.push(v2_rt::concat("&".to_string(), emit_ident(rn.clone(), RenderTarget::Rust))); } __result }); -let service_args = Rc::new({ let mut __result = Vec::new(); for sn in info.service_names.clone().iter().cloned() { __result.push(service_var_name(sn.clone())); } __result }); -v2_rt::concat(resource_args, service_args) -} - } else { - Rc::new(vec![]) - } -}, - None => Rc::new(vec![]), -}; -let all_args = v2_rt::concat(arg_strs, extra_args); -let args_str = all_args.clone().join(&", ".to_string()); -let runtime_name = rust_runtime_bridge_name(func.clone()); -let func_name = if is_rt.clone() { - v2_rt::concat("v2_rt::".to_string(), emit_ident(runtime_name, RenderTarget::Rust)) + None => Rc::new(vec![]), + }; + let all_args = v2_rt::concat(arg_strs, extra_args); + let args_str = all_args.clone().join(&", ".to_string()); + let runtime_name = rust_runtime_bridge_name(func.clone()); + let func_name = if is_rt.clone() { + v2_rt::concat( + "v2_rt::".to_string(), + emit_ident(runtime_name, RenderTarget::Rust), + ) } else { emit_ident(func.clone(), RenderTarget::Rust) }; -let call_str = if ((is_rt.clone() && (func.clone().as_str() == "concat".to_string().as_str())) && ((all_args.clone().len() as i64) > 2)) { + let call_str = if ((is_rt.clone() + && (func.clone().as_str() == "concat".to_string().as_str())) + && ((all_args.clone().len() as i64) > 2)) + { emit_nested_rt_concat(all_args.clone(), "".to_string(), shared_types.clone()) } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(func_name, "(".to_string()), args_str), ")".to_string()) + v2_rt::concat( + v2_rt::concat(v2_rt::concat(func_name, "(".to_string()), args_str), + ")".to_string(), + ) }; -match callee.clone() { - Some(info) => { - let has_effects = (((info.service_names.clone().len() as i64) > 0) || ((info.resource_names.clone().len() as i64) > 0)); -if has_effects.clone() { - v2_rt::concat(call_str, ".await?".to_string()) - } else { - call_str + match callee.clone() { + Some(info) => { + let has_effects = (((info.service_names.clone().len() as i64) > 0) + || ((info.resource_names.clone().len() as i64) > 0)); + if has_effects.clone() { + v2_rt::concat(call_str, ".await?".to_string()) + } else { + call_str + } } -}, - None => call_str, -} -} + None => call_str, + } + } } -pub fn fill_default_args(ordered: &Rc>>, callee: Option>, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> Rc>> { +pub fn fill_default_args( + ordered: &Rc>>, + callee: Option>, + registry: Rc>>, + scope: Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> Rc>> { match callee { - Some(info) => { - let provided_names = Rc::new({ let mut __result = Vec::new(); for a in ordered.clone().iter().cloned() { __result.push(match arg_name_at(a.clone(), scope.type_env.clone().source_indices.clone()) { - Some(n) => n.clone(), - None => "".to_string(), -}); } __result }); -let missing_with_defaults = Rc::new({ let mut __result = Vec::new(); for p in info.params.clone().iter().cloned() { if { - let is_provided = { let mut __found = false; for n in provided_names.clone().iter().cloned() { if (n.clone().as_str() == param_node_name_at(p.clone(), scope.type_env.clone().source_indices.clone()).as_str()) { __found = true; break; } } __found }; -if is_provided.clone() { - false - } else { - (param_node_default_value(&p) != None) - } -} { __result.push(p); } } __result }); -let default_args = Rc::new({ let mut __result = Vec::new(); for p in missing_with_defaults.iter().cloned() { __result.push(make_arg_node(Some(param_node_name_at(p.clone(), scope.type_env.clone().source_indices.clone())), param_node_default_value(&p).clone().unwrap(), p.span.clone(), p.span.clone())); } __result }); -v2_rt::concat(ordered.clone(), default_args) -}, - None => ordered.clone(), -} + Some(info) => { + let provided_names = Rc::new({ + let mut __result = Vec::new(); + for a in ordered.clone().iter().cloned() { + __result.push( + match arg_name_at(a.clone(), scope.type_env.clone().source_indices.clone()) + { + Some(n) => n.clone(), + None => "".to_string(), + }, + ); + } + __result + }); + let missing_with_defaults = Rc::new({ + let mut __result = Vec::new(); + for p in info.params.clone().iter().cloned() { + if { + let is_provided = { + let mut __found = false; + for n in provided_names.clone().iter().cloned() { + if (n.clone().as_str() + == param_node_name_at( + p.clone(), + scope.type_env.clone().source_indices.clone(), + ) + .as_str()) + { + __found = true; + break; + } + } + __found + }; + if is_provided.clone() { + false + } else { + (param_node_default_value(&p) != None) + } + } { + __result.push(p); + } + } + __result + }); + let default_args = Rc::new({ + let mut __result = Vec::new(); + for p in missing_with_defaults.iter().cloned() { + __result.push(make_arg_node( + Some(param_node_name_at( + p.clone(), + scope.type_env.clone().source_indices.clone(), + )), + param_node_default_value(&p).clone().unwrap(), + p.span.clone(), + p.span.clone(), + )); + } + __result + }); + v2_rt::concat(ordered.clone(), default_args) + } + None => ordered.clone(), + } } -pub fn fill_op_default_args(ordered: &Rc>>, op_params: Rc>>, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> Rc>> { +pub fn fill_op_default_args( + ordered: &Rc>>, + op_params: Rc>>, + registry: Rc>>, + scope: Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> Rc>> { { let si = scope.type_env.clone().source_indices.clone(); -let arg_map = ordered.clone().iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, a: Rc| match arg_name_at(a.clone(), si.clone()) { - Some(n) => v2_rt::rc_map_insert(acc.clone(), n.clone(), a.clone()), - None => acc.clone(), -}); -let unnamed_args = Rc::new({ let mut __result = Vec::new(); for a in ordered.clone().iter().cloned() { if (arg_name_at(a.clone(), si.clone()) == None) { __result.push(a); } } __result }); -let named_ordered = Rc::new({ let mut __result = Vec::new(); for p in op_params.iter().cloned() { __result.extend((*{ - let pname = param_node_name_at(p.clone(), si.clone()); -match v2_rt::map_get(&arg_map, pname.clone()) { - Some(arg) => Rc::new(vec![arg.clone()]), - None => if (param_node_default_value(&p) != None) { - Rc::new(vec![make_arg_node(Some(pname.clone()), param_node_default_value(&p).clone().unwrap(), p.span.clone(), p.span.clone())]) - } else { - Rc::new(vec![]) + let arg_map = ordered.clone().iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, a: Rc| match arg_name_at( + a.clone(), + si.clone(), + ) { + Some(n) => v2_rt::rc_map_insert(acc.clone(), n.clone(), a.clone()), + None => acc.clone(), }, -} -}).iter().cloned()); } __result }); -v2_rt::concat(named_ordered, unnamed_args) -} + ); + let unnamed_args = Rc::new({ + let mut __result = Vec::new(); + for a in ordered.clone().iter().cloned() { + if (arg_name_at(a.clone(), si.clone()) == None) { + __result.push(a); + } + } + __result + }); + let named_ordered = Rc::new({ + let mut __result = Vec::new(); + for p in op_params.iter().cloned() { + __result.extend( + (*{ + let pname = param_node_name_at(p.clone(), si.clone()); + match v2_rt::map_get(&arg_map, pname.clone()) { + Some(arg) => Rc::new(vec![arg.clone()]), + None => { + if (param_node_default_value(&p) != None) { + Rc::new(vec![make_arg_node( + Some(pname.clone()), + param_node_default_value(&p).clone().unwrap(), + p.span.clone(), + p.span.clone(), + )]) + } else { + Rc::new(vec![]) + } + } + } + }) + .iter() + .cloned(), + ); + } + __result + }); + v2_rt::concat(named_ordered, unnamed_args) + } } -pub fn emit_nested_rt_concat(mut remaining: Rc>, mut acc: String, mut shared_types: Rc>) -> String { +pub fn emit_nested_rt_concat( + mut remaining: Rc>, + mut acc: String, + mut shared_types: Rc>, +) -> String { loop { match remaining.clone().first().cloned() { - None => { break acc.clone(); }, - Some(arg) => { let next_acc = if (acc.clone().as_str() == "".to_string().as_str()) { - arg.clone() - } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("v2_rt::concat(".to_string(), acc.clone()), ", ".to_string()), arg.clone()), ")".to_string()) - }; -{ - let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); -let __tco_1 = next_acc; -remaining = __tco_0; -acc = __tco_1; -continue; -} }, -} -} -} - -pub fn emit_typed_for_each(variable: &String, collection: &Rc, body: Rc, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { - { - let sharing = language_spec(RenderTarget::Rust).sharing.clone(); -let coll_str = emit_typed_expr(collection.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let elem_type = for_each_element_type_node(resolved_type(collection.clone()), scope.type_env.clone().source_indices.clone()); -let body_scope = extend_scope(&scope, &variable, elem_type, Rc::new(SubValueRelation::SubValueUnknown)); -let body_str = emit_typed_expr(body, registry.clone(), &body_scope, (depth.clone() + 2), shared_types.clone(), emit_info.clone(), 1024); -let ind1 = make_indent((depth.clone() + 1)); -let ind2 = make_indent((depth.clone() + 2)); -let ind0 = make_indent(depth.clone()); -let iter_str = apply_type_template1(sharing.iter_owned.clone(), coll_str); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\n".to_string(), ind1.clone()), "let mut __collect = Vec::new();\n".to_string()), ind1.clone()), "for ".to_string()), emit_ident(variable.clone(), RenderTarget::Rust)), " in ".to_string()), iter_str), " {\n".to_string()), ind2), "__collect.push(".to_string()), body_str), ");\n".to_string()), ind1.clone()), "}\n".to_string()), ind1.clone()), "Rc::new(__collect)\n".to_string()), ind0), "}".to_string()) + None => { + break acc.clone(); + } + Some(arg) => { + let next_acc = if (acc.clone().as_str() == "".to_string().as_str()) { + arg.clone() + } else { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("v2_rt::concat(".to_string(), acc.clone()), + ", ".to_string(), + ), + arg.clone(), + ), + ")".to_string(), + ) + }; + { + let __tco_0 = Rc::new( + remaining + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + let __tco_1 = next_acc; + remaining = __tco_0; + acc = __tco_1; + continue; + } + } + } + } } + +pub fn emit_typed_for_each( + variable: &String, + collection: &Rc, + body: Rc, + registry: &Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { + { + let sharing = language_spec(RenderTarget::Rust).sharing.clone(); + let coll_str = emit_typed_expr( + collection.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let elem_type = for_each_element_type_node( + resolved_type(collection.clone()), + scope.type_env.clone().source_indices.clone(), + ); + let body_scope = extend_scope( + &scope, + &variable, + elem_type, + Rc::new(SubValueRelation::SubValueUnknown), + ); + let body_str = emit_typed_expr( + body, + registry.clone(), + &body_scope, + (depth.clone() + 2), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let ind1 = make_indent((depth.clone() + 1)); + let ind2 = make_indent((depth.clone() + 2)); + let ind0 = make_indent(depth.clone()); + let iter_str = apply_type_template1(sharing.iter_owned.clone(), coll_str); + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("{\n".to_string(), ind1.clone()), "let mut __collect = Vec::new();\n".to_string()), ind1.clone()), "for ".to_string()), emit_ident(variable.clone(), RenderTarget::Rust)), " in ".to_string()), iter_str), " {\n".to_string()), ind2), "__collect.push(".to_string()), body_str), ");\n".to_string()), ind1.clone()), "}\n".to_string()), ind1.clone()), "Rc::new(__collect)\n".to_string()), ind0), "}".to_string()) + } } -pub fn emit_typed_index(base: &Rc, index: Rc, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { +pub fn emit_typed_index( + base: &Rc, + index: Rc, + registry: &Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { { let spec = language_spec(RenderTarget::Rust); -let base_str = emit_typed_expr(base.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let index_str = emit_typed_expr(index, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let base_node = normalize_access_type_node(resolved_type(base.clone())); -let is_map = node_is_keyed_collection(&base_node, scope.type_env.clone().source_indices.clone()); -if is_rust_string_like(base_node.clone(), scope.type_env.clone().source_indices.clone()) { - apply_type_template2(spec.indexing.clone().string_index.clone(), base_str, index_str) + let base_str = emit_typed_expr( + base.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let index_str = emit_typed_expr( + index, + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let base_node = normalize_access_type_node(resolved_type(base.clone())); + let is_map = + node_is_keyed_collection(&base_node, scope.type_env.clone().source_indices.clone()); + if is_rust_string_like( + base_node.clone(), + scope.type_env.clone().source_indices.clone(), + ) { + apply_type_template2( + spec.indexing.clone().string_index.clone(), + base_str, + index_str, + ) } else { if is_map { apply_type_template2(spec.indexing.clone().map_index.clone(), base_str, index_str) } else { - apply_type_template2(spec.indexing.clone().list_index.clone(), base_str, index_str) + apply_type_template2( + spec.indexing.clone().list_index.clone(), + base_str, + index_str, + ) } } -} + } } -pub fn emit_typed_slice(base: &Rc, start: Rc, end: Rc, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { +pub fn emit_typed_slice( + base: &Rc, + start: Rc, + end: Rc, + registry: &Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { { let spec = language_spec(RenderTarget::Rust); -let base_str = emit_typed_expr(base.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let start_str = emit_typed_expr(start, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let end_str = emit_typed_expr(end, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let base_node = normalize_access_type_node(resolved_type(base.clone())); -if is_rust_string_like(base_node, scope.type_env.clone().source_indices.clone()) { + let base_str = emit_typed_expr( + base.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let start_str = emit_typed_expr( + start, + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let end_str = emit_typed_expr( + end, + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let base_node = normalize_access_type_node(resolved_type(base.clone())); + if is_rust_string_like(base_node, scope.type_env.clone().source_indices.clone()) { match spec.indexing.clone().string_slice.clone() { - Some(tmpl) => apply_type_template3(tmpl.clone(), base_str, start_str, end_str), - None => emit_error_expr("unsupported string slice for target".to_string(), RenderTarget::Rust), -} + Some(tmpl) => apply_type_template3(tmpl.clone(), base_str, start_str, end_str), + None => emit_error_expr( + "unsupported string slice for target".to_string(), + RenderTarget::Rust, + ), + } } else { match spec.indexing.clone().list_slice.clone() { - Some(tmpl) => apply_type_template3(tmpl.clone(), base_str, start_str, end_str), - None => emit_error_expr("unsupported list slice for target".to_string(), RenderTarget::Rust), -} + Some(tmpl) => apply_type_template3(tmpl.clone(), base_str, start_str, end_str), + None => emit_error_expr( + "unsupported list slice for target".to_string(), + RenderTarget::Rust, + ), + } } -} + } } -pub fn collection_element_type(receiver_type: Option>, shared_types: Rc>, source_indices: &Rc>>) -> String { +pub fn collection_element_type( + receiver_type: Option>, + shared_types: Rc>, + source_indices: &Rc>>, +) -> String { match receiver_type.as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - let __rt_is_container = node_is_element_collection(&rt, source_indices.clone()); -if __rt_is_container { - match rt.children.clone().first().cloned() { - Some(elem_child) => { - let elem_node = child_type_node(&elem_child); -let elem_is_error = if (elem_node.inferred.clone() != None) { - is_compiler_error(elem_node.inferred.clone().clone().unwrap()) - } else { - false - }; -let elem_is_type_var = if (elem_node.inferred.clone() != None) { - is_type_variable(elem_node.inferred.clone().clone().unwrap()) - } else { - false - }; -if (elem_is_error || elem_is_type_var) { - "_".to_string() - } else { - render_rust_type(elem_node.clone(), shared_types, source_indices.clone()) + Some(InferredNode::Resolved { node: rt, .. }) => { + let __rt_is_container = node_is_element_collection(&rt, source_indices.clone()); + if __rt_is_container { + match rt.children.clone().first().cloned() { + Some(elem_child) => { + let elem_node = child_type_node(&elem_child); + let elem_is_error = if (elem_node.inferred.clone() != None) { + is_compiler_error(elem_node.inferred.clone().clone().unwrap()) + } else { + false + }; + let elem_is_type_var = if (elem_node.inferred.clone() != None) { + is_type_variable(elem_node.inferred.clone().clone().unwrap()) + } else { + false + }; + if (elem_is_error || elem_is_type_var) { + "_".to_string() + } else { + render_rust_type( + elem_node.clone(), + shared_types, + source_indices.clone(), + ) + } + } + None => "_".to_string(), } -}, - None => "_".to_string(), -} - } else { - "_".to_string() + } else { + "_".to_string() + } } -}, - _ => "_".to_string(), -} + _ => "_".to_string(), + } } -pub fn lambda_scope_from_children(scope: Rc, params: Rc>, param_nodes: Rc>>) -> Rc { - Rc::new(params.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(scope.clone(), |acc: Rc, pair: (i64, String)| { +pub fn lambda_scope_from_children( + scope: Rc, + params: Rc>, + param_nodes: Rc>>, +) -> Rc { + Rc::new( + params + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + .fold(scope.clone(), |acc: Rc, pair: (i64, String)| { let idx = pair.0.clone(); -let param_name = pair.1.clone(); -let param_type = match param_nodes.clone().get(idx.clone() as usize).cloned() { - Some(pn) => match pn.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: resolved_type, .. }) => resolved_type.clone(), - _ => type_variable_node("lambda_param".to_string()), -}, - None => type_variable_node("lambda_param".to_string()), -}; -extend_scope(&acc, ¶m_name, param_type.clone(), Rc::new(SubValueRelation::SubValueUnknown)) -}) + let param_name = pair.1.clone(); + let param_type = match param_nodes.clone().get(idx.clone() as usize).cloned() { + Some(pn) => match pn.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { + node: resolved_type, + .. + }) => resolved_type.clone(), + _ => type_variable_node("lambda_param".to_string()), + }, + None => type_variable_node("lambda_param".to_string()), + }; + extend_scope( + &acc, + ¶m_name, + param_type.clone(), + Rc::new(SubValueRelation::SubValueUnknown), + ) + }) } -pub fn lambda_param_type_strs(params: Rc>, param_nodes: Rc>>, fallback_types: Rc>, shared_types: Rc>, source_indices: Rc>>) -> Rc> { - Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(params.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ - let idx = pair.0.clone(); -let param_name = pair.1.clone(); -let inferred_type = match param_nodes.clone().get(idx.clone() as usize).cloned() { - Some(pn) => match pn.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: param_type, .. }) => { - let param_is_error = if (param_type.inferred.clone() != None) { - is_compiler_error(param_type.inferred.clone().clone().unwrap()) - } else { - false - }; -let param_is_type_var = if (param_type.inferred.clone() != None) { - is_type_variable(param_type.inferred.clone().clone().unwrap()) - } else { - false - }; -if (param_is_type_var.clone() || param_is_error.clone()) { - None - } else { - Some(render_rust_type(param_type.clone(), shared_types.clone(), source_indices.clone())) - } -}, - _ => None, -}, - None => None, -}; -let fallback_type = match fallback_types.clone().get(idx.clone() as usize).cloned() { - Some(ty) => ty.clone(), - None => "_".to_string(), -}; -let spec = language_spec(RenderTarget::Rust); -let ident = emit_ident(param_name.clone(), RenderTarget::Rust); -match inferred_type.clone() { - Some(ty) => apply_type_template2(spec.annotations.clone().lambda_param_typed.clone(), ident.clone(), ty.clone()), - None => apply_type_template2(spec.annotations.clone().lambda_param_typed.clone(), ident.clone(), fallback_type.clone()), -} -}); } __result }) +pub fn lambda_param_type_strs( + params: Rc>, + param_nodes: Rc>>, + fallback_types: Rc>, + shared_types: Rc>, + source_indices: Rc>>, +) -> Rc> { + Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + params + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + __result.push({ + let idx = pair.0.clone(); + let param_name = pair.1.clone(); + let inferred_type = match param_nodes.clone().get(idx.clone() as usize).cloned() { + Some(pn) => match pn.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { + node: param_type, .. + }) => { + let param_is_error = if (param_type.inferred.clone() != None) { + is_compiler_error(param_type.inferred.clone().clone().unwrap()) + } else { + false + }; + let param_is_type_var = if (param_type.inferred.clone() != None) { + is_type_variable(param_type.inferred.clone().clone().unwrap()) + } else { + false + }; + if (param_is_type_var.clone() || param_is_error.clone()) { + None + } else { + Some(render_rust_type( + param_type.clone(), + shared_types.clone(), + source_indices.clone(), + )) + } + } + _ => None, + }, + None => None, + }; + let fallback_type = match fallback_types.clone().get(idx.clone() as usize).cloned() + { + Some(ty) => ty.clone(), + None => "_".to_string(), + }; + let spec = language_spec(RenderTarget::Rust); + let ident = emit_ident(param_name.clone(), RenderTarget::Rust); + match inferred_type.clone() { + Some(ty) => apply_type_template2( + spec.annotations.clone().lambda_param_typed.clone(), + ident.clone(), + ty.clone(), + ), + None => apply_type_template2( + spec.annotations.clone().lambda_param_typed.clone(), + ident.clone(), + fallback_type.clone(), + ), + } + }); + } + __result + }) } -pub fn emit_typed_collection_lambda(lambda_expr: &Rc, elem_type_str: String, registry: Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: Rc) -> String { +pub fn emit_typed_collection_lambda( + lambda_expr: &Rc, + elem_type_str: String, + registry: Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: Rc, +) -> String { match (*lambda_expr.expr_data.clone()).clone() { - ExprData::ExprLambda => { - let ps = lambda_param_names_at(lambda_expr.clone(), scope.type_env.clone().source_indices.clone()); -let bd = lambda_body(lambda_expr.clone()); -let pn = Rc::new(lambda_expr.children.clone().iter().cloned().skip(1 as usize).collect::>()); -let param_strs = lambda_param_type_strs(ps.clone(), pn.clone(), Rc::new(vec![elem_type_str]), shared_types.clone(), scope.type_env.clone().source_indices.clone()); -let params_str = param_strs.join(&", ".to_string()); -let lambda_scope = lambda_scope_from_children(scope.clone(), ps.clone(), pn.clone()); -let body_str = emit_typed_expr(bd, registry, &lambda_scope, depth, shared_types.clone(), emit_info, 1024); -v2_rt::concat(v2_rt::concat(v2_rt::concat("|".to_string(), params_str), "| ".to_string()), body_str) -}, - _ => emit_typed_expr(lambda_expr.clone(), registry, &scope, depth, shared_types.clone(), emit_info, 1024), -} + ExprData::ExprLambda => { + let ps = lambda_param_names_at( + lambda_expr.clone(), + scope.type_env.clone().source_indices.clone(), + ); + let bd = lambda_body(lambda_expr.clone()); + let pn = Rc::new( + lambda_expr + .children + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + let param_strs = lambda_param_type_strs( + ps.clone(), + pn.clone(), + Rc::new(vec![elem_type_str]), + shared_types.clone(), + scope.type_env.clone().source_indices.clone(), + ); + let params_str = param_strs.join(&", ".to_string()); + let lambda_scope = lambda_scope_from_children(scope.clone(), ps.clone(), pn.clone()); + let body_str = emit_typed_expr( + bd, + registry, + &lambda_scope, + depth, + shared_types.clone(), + emit_info, + 1024, + ); + v2_rt::concat( + v2_rt::concat(v2_rt::concat("|".to_string(), params_str), "| ".to_string()), + body_str, + ) + } + _ => emit_typed_expr( + lambda_expr.clone(), + registry, + &scope, + depth, + shared_types.clone(), + emit_info, + 1024, + ), + } } -pub fn emit_typed_fold_lambda(lambda_expr: &Rc, acc_type_str: &String, elem_type_str: String, registry: Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { +pub fn emit_typed_fold_lambda( + lambda_expr: &Rc, + acc_type_str: &String, + elem_type_str: String, + registry: Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { match (*lambda_expr.expr_data.clone()).clone() { - ExprData::ExprLambda => { - let ps = lambda_param_names_at(lambda_expr.clone(), scope.type_env.clone().source_indices.clone()); -let bd = lambda_body(lambda_expr.clone()); -let pn = Rc::new(lambda_expr.children.clone().iter().cloned().skip(1 as usize).collect::>()); -let safe_acc_type = if (((acc_type_str.clone().as_str() == "Rc>".to_string().as_str()) || (acc_type_str.clone().as_str() == "Vec<()>".to_string().as_str())) || (acc_type_str.clone().as_str() == "Option<()>".to_string().as_str())) { - "_".to_string() - } else { - acc_type_str.clone() - }; -let fallback_types = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(ps.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push(if (pair.0.clone() == 0) { - safe_acc_type.clone() - } else { - elem_type_str.clone() - }); } __result }); -let param_strs = lambda_param_type_strs(ps.clone(), Rc::new(vec![]), fallback_types, shared_types.clone(), scope.type_env.clone().source_indices.clone()); -let params_str = param_strs.join(&", ".to_string()); -let lambda_scope = lambda_scope_from_children(scope.clone(), ps.clone(), pn); -let body_str = emit_typed_expr(bd, registry, &lambda_scope, depth, shared_types.clone(), emit_info.clone(), 1024); -let acc_name = match ps.clone().first().cloned() { - Some(n) => n.clone(), - None => "".to_string(), -}; -let needs_unwrap = ((acc_name.clone().as_str() != "".to_string().as_str()) && set_contains(emit_info.owned_bindings.clone(), acc_name.clone())); -if needs_unwrap { + ExprData::ExprLambda => { + let ps = lambda_param_names_at( + lambda_expr.clone(), + scope.type_env.clone().source_indices.clone(), + ); + let bd = lambda_body(lambda_expr.clone()); + let pn = Rc::new( + lambda_expr + .children + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + let safe_acc_type = if (((acc_type_str.clone().as_str() + == "Rc>".to_string().as_str()) + || (acc_type_str.clone().as_str() == "Vec<()>".to_string().as_str())) + || (acc_type_str.clone().as_str() == "Option<()>".to_string().as_str())) { - let acc_ident = emit_ident(acc_name.clone(), RenderTarget::Rust); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("|".to_string(), params_str), "| { let ".to_string()), acc_ident.clone()), " = Rc::try_unwrap(".to_string()), acc_ident.clone()), ").unwrap_or_else(|rc| (*rc).clone()); ".to_string()), body_str), " }".to_string()) -} - } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat("|".to_string(), params_str), "| ".to_string()), body_str) + "_".to_string() + } else { + acc_type_str.clone() + }; + let fallback_types = Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + ps.clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + __result.push(if (pair.0.clone() == 0) { + safe_acc_type.clone() + } else { + elem_type_str.clone() + }); + } + __result + }); + let param_strs = lambda_param_type_strs( + ps.clone(), + Rc::new(vec![]), + fallback_types, + shared_types.clone(), + scope.type_env.clone().source_indices.clone(), + ); + let params_str = param_strs.join(&", ".to_string()); + let lambda_scope = lambda_scope_from_children(scope.clone(), ps.clone(), pn); + let body_str = emit_typed_expr( + bd, + registry, + &lambda_scope, + depth, + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let acc_name = match ps.clone().first().cloned() { + Some(n) => n.clone(), + None => "".to_string(), + }; + let needs_unwrap = ((acc_name.clone().as_str() != "".to_string().as_str()) + && emit_map_has(emit_info.owned_bindings.clone(), acc_name.clone())); + if needs_unwrap { + { + let acc_ident = emit_ident(acc_name.clone(), RenderTarget::Rust); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("|".to_string(), params_str), + "| { let ".to_string(), + ), + acc_ident.clone(), + ), + " = Rc::try_unwrap(".to_string(), + ), + acc_ident.clone(), + ), + ").unwrap_or_else(|rc| (*rc).clone()); ".to_string(), + ), + body_str, + ), + " }".to_string(), + ) + } + } else { + v2_rt::concat( + v2_rt::concat(v2_rt::concat("|".to_string(), params_str), "| ".to_string()), + body_str, + ) + } } -}, - _ => emit_typed_expr(lambda_expr.clone(), registry, &scope, depth, shared_types.clone(), emit_info.clone(), 1024), -} + _ => emit_typed_expr( + lambda_expr.clone(), + registry, + &scope, + depth, + shared_types.clone(), + emit_info.clone(), + 1024, + ), + } } -pub fn emit_rust_fold_method_call(method_call_node: Rc, fold_accumulator_type: Option>, result_type: Option>, receiver: &Rc, args: &Rc>>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { - { - let recv_str = emit_typed_expr(receiver.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let elem_type_str = collection_element_type(receiver.inferred.clone(), shared_types.clone(), &scope.type_env.clone().source_indices.clone()); -let contextual_acc_type = match result_type.as_deref().cloned() { - Some(InferredNode::Resolved { node: method_result_type, .. }) => Some(method_result_type.clone()), - _ => None, -}; -let acc_type_node = match fold_accumulator_type { - Some(acc_type) => { - let acc_children_have_unit = ({ let mut __found = false; for c in acc_type.children.clone().iter().cloned() { if (is_unit_like(&c) || (c.ident_span.clone() == None)) { __found = true; break; } } __found } || { let mut __found = false; for c in acc_type.children.clone().iter().cloned() { if { let mut __found = false; for gc in c.children.clone().iter().cloned() { if (is_unit_like(&gc) || (gc.ident_span.clone() == None)) { __found = true; break; } } __found } { __found = true; break; } } __found }); -let is_under_resolved_map = (node_is_keyed_collection(&acc_type, scope.type_env.clone().source_indices.clone()) && (((acc_type.children.clone().len() as i64) == 0) || acc_children_have_unit)); -let is_under_resolved_list = (node_is_element_collection(&acc_type, scope.type_env.clone().source_indices.clone()) && ((acc_type.children.clone().len() as i64) == 0)); -let is_under_resolved_non_collection = ((!node_is_keyed_collection(&acc_type, scope.type_env.clone().source_indices.clone()) && !node_is_element_collection(&acc_type, scope.type_env.clone().source_indices.clone())) && !node_is_collection(&acc_type, scope.type_env.clone().source_indices.clone())); -if ((is_under_resolved_map || is_under_resolved_list) || is_under_resolved_non_collection) { - match contextual_acc_type { - Some(concrete_type) => concrete_type.clone(), - None => acc_type.clone(), -} - } else { - acc_type.clone() +pub fn emit_rust_fold_method_call( + method_call_node: Rc, + fold_accumulator_type: Option>, + result_type: Option>, + receiver: &Rc, + args: &Rc>>, + registry: &Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { + { + let recv_str = emit_typed_expr( + receiver.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let elem_type_str = collection_element_type( + receiver.inferred.clone(), + shared_types.clone(), + &scope.type_env.clone().source_indices.clone(), + ); + let contextual_acc_type = match result_type.as_deref().cloned() { + Some(InferredNode::Resolved { + node: method_result_type, + .. + }) => Some(method_result_type.clone()), + _ => None, + }; + let acc_type_node = match fold_accumulator_type { + Some(acc_type) => { + let acc_children_have_unit = ({ + let mut __found = false; + for c in acc_type.children.clone().iter().cloned() { + if (is_unit_like(&c) || (c.ident_span.clone() == None)) { + __found = true; + break; + } + } + __found + } || { + let mut __found = false; + for c in acc_type.children.clone().iter().cloned() { + if { + let mut __found = false; + for gc in c.children.clone().iter().cloned() { + if (is_unit_like(&gc) || (gc.ident_span.clone() == None)) { + __found = true; + break; + } + } + __found + } { + __found = true; + break; + } + } + __found + }); + let is_under_resolved_map = (node_is_keyed_collection( + &acc_type, + scope.type_env.clone().source_indices.clone(), + ) && (((acc_type.children.clone().len() as i64) + == 0) + || acc_children_have_unit)); + let is_under_resolved_list = (node_is_element_collection( + &acc_type, + scope.type_env.clone().source_indices.clone(), + ) && ((acc_type.children.clone().len() as i64) == 0)); + let is_under_resolved_non_collection = ((!node_is_keyed_collection( + &acc_type, + scope.type_env.clone().source_indices.clone(), + ) && !node_is_element_collection( + &acc_type, + scope.type_env.clone().source_indices.clone(), + )) && !node_is_collection( + &acc_type, + scope.type_env.clone().source_indices.clone(), + )); + if ((is_under_resolved_map || is_under_resolved_list) + || is_under_resolved_non_collection) + { + match contextual_acc_type { + Some(concrete_type) => concrete_type.clone(), + None => acc_type.clone(), + } + } else { + acc_type.clone() + } } -}, - None => match contextual_acc_type { - Some(concrete_type) => concrete_type.clone(), - None => match args.clone().first().cloned() { - Some(init_arg) => if (arg_value(&init_arg).inferred.clone() != None) { - resolved_type(arg_value(&init_arg)) - } else { - type_variable_node("fold_accum".to_string()) - }, - None => type_variable_node("fold_accum".to_string()), -}, -}, -}; -let acc_type_name = authored_name_at(scope.type_env.clone().source_indices.clone(), &acc_type_node); -let fold_lambda_node = match args.clone().get(1 as usize).cloned() { - Some(a) => arg_value(&a), - None => type_variable_node("".to_string()), -}; -let acc_param_name = match (*fold_lambda_node.expr_data.clone()).clone() { - ExprData::ExprLambda => match lambda_param_names_at(fold_lambda_node.clone(), scope.type_env.clone().source_indices.clone()).first().cloned() { - Some(n) => n.clone(), - None => "".to_string(), -}, - _ => "".to_string(), -}; -let fold_proof = analyze_single_fold(&method_call_node, &scope.type_env.clone().source_indices.clone()); -let structural_unwrap = ((fold_proof.eligible.clone() && fold_proof.body_constructs_acc.clone()) && fold_proof.safe_field_moves.clone()); -let structural_move = (fold_proof.eligible.clone() && fold_proof.whole_acc_single_use.clone()); -let acc_unwrap = (structural_unwrap && set_contains(shared_types.clone(), acc_type_name.clone())); -let fold_emit_info = if acc_unwrap { + None => match contextual_acc_type { + Some(concrete_type) => concrete_type.clone(), + None => match args.clone().first().cloned() { + Some(init_arg) => { + if (arg_value(&init_arg).inferred.clone() != None) { + resolved_type(arg_value(&init_arg)) + } else { + type_variable_node("fold_accum".to_string()) + } + } + None => type_variable_node("fold_accum".to_string()), + }, + }, + }; + let acc_type_name = authored_name_at( + scope.type_env.clone().source_indices.clone(), + &acc_type_node, + ); + let fold_lambda_node = match args.clone().get(1 as usize).cloned() { + Some(a) => arg_value(&a), + None => type_variable_node("".to_string()), + }; + let acc_param_name = match (*fold_lambda_node.expr_data.clone()).clone() { + ExprData::ExprLambda => match lambda_param_names_at( + fold_lambda_node.clone(), + scope.type_env.clone().source_indices.clone(), + ) + .first() + .cloned() + { + Some(n) => n.clone(), + None => "".to_string(), + }, + _ => "".to_string(), + }; + let fold_proof = analyze_single_fold( + &method_call_node, + &scope.type_env.clone().source_indices.clone(), + ); + let structural_unwrap = ((fold_proof.eligible.clone() + && fold_proof.body_constructs_acc.clone()) + && fold_proof.safe_field_moves.clone()); + let structural_move = + (fold_proof.eligible.clone() && fold_proof.whole_acc_single_use.clone()); + let acc_unwrap = + (structural_unwrap && emit_map_has(shared_types.clone(), acc_type_name.clone())); + let fold_emit_info = if acc_unwrap { match (*fold_lambda_node.expr_data.clone()).clone() { - ExprData::ExprLambda => { - let ps = lambda_param_names_at(fold_lambda_node.clone(), scope.type_env.clone().source_indices.clone()); -match ps.first().cloned() { - Some(acc_name) => Rc::new(EmitGraphInfo { - type_summaries: emit_info.type_summaries.clone(), - recursive_type_set: emit_info.recursive_type_set.clone(), - fielded_variants: emit_info.fielded_variants.clone(), - untagged_json_tuple_variants: emit_info.untagged_json_tuple_variants.clone(), - shared_types: emit_info.shared_types.clone(), - ownership_index: emit_info.ownership_index.clone(), - movable: emit_info.movable.clone(), - variant_to_enum: emit_info.variant_to_enum.clone(), - owned_bindings: v2_rt::rc_map_insert(emit_info.owned_bindings.clone(), acc_name.clone(), true), - read_only_params_index: emit_info.read_only_params_index.clone(), - read_only_params: emit_info.read_only_params.clone(), -}), - None => emit_info.clone(), -} -}, - _ => emit_info.clone(), -} + ExprData::ExprLambda => { + let ps = lambda_param_names_at( + fold_lambda_node.clone(), + scope.type_env.clone().source_indices.clone(), + ); + match ps.first().cloned() { + Some(acc_name) => Rc::new(EmitGraphInfo { + type_summaries: emit_info.type_summaries.clone(), + recursive_type_set: emit_info.recursive_type_set.clone(), + fielded_variants: emit_info.fielded_variants.clone(), + shared_types: emit_info.shared_types.clone(), + ownership_index: emit_info.ownership_index.clone(), + movable: emit_info.movable.clone(), + variant_to_enum: emit_info.variant_to_enum.clone(), + owned_bindings: v2_rt::rc_map_insert( + emit_info.owned_bindings.clone(), + acc_name.clone(), + true, + ), + read_only_params_index: emit_info.read_only_params_index.clone(), + read_only_params: emit_info.read_only_params.clone(), + }), + None => emit_info.clone(), + } + } + _ => emit_info.clone(), + } } else { if structural_move { match (*fold_lambda_node.expr_data.clone()).clone() { - ExprData::ExprLambda => { - let ps = lambda_param_names_at(fold_lambda_node.clone(), scope.type_env.clone().source_indices.clone()); -match ps.first().cloned() { - Some(acc_name) => Rc::new(EmitGraphInfo { - type_summaries: emit_info.type_summaries.clone(), - recursive_type_set: emit_info.recursive_type_set.clone(), - fielded_variants: emit_info.fielded_variants.clone(), - untagged_json_tuple_variants: emit_info.untagged_json_tuple_variants.clone(), - shared_types: emit_info.shared_types.clone(), - ownership_index: emit_info.ownership_index.clone(), - movable: v2_rt::rc_map_insert(emit_info.movable.clone(), acc_name.clone(), true), - variant_to_enum: emit_info.variant_to_enum.clone(), - owned_bindings: emit_info.owned_bindings.clone(), - read_only_params_index: emit_info.read_only_params_index.clone(), - read_only_params: emit_info.read_only_params.clone(), -}), - None => emit_info.clone(), -} -}, - _ => emit_info.clone(), -} + ExprData::ExprLambda => { + let ps = lambda_param_names_at( + fold_lambda_node.clone(), + scope.type_env.clone().source_indices.clone(), + ); + match ps.first().cloned() { + Some(acc_name) => Rc::new(EmitGraphInfo { + type_summaries: emit_info.type_summaries.clone(), + recursive_type_set: emit_info.recursive_type_set.clone(), + fielded_variants: emit_info.fielded_variants.clone(), + shared_types: emit_info.shared_types.clone(), + ownership_index: emit_info.ownership_index.clone(), + movable: v2_rt::rc_map_insert( + emit_info.movable.clone(), + acc_name.clone(), + true, + ), + variant_to_enum: emit_info.variant_to_enum.clone(), + owned_bindings: emit_info.owned_bindings.clone(), + read_only_params_index: emit_info.read_only_params_index.clone(), + read_only_params: emit_info.read_only_params.clone(), + }), + None => emit_info.clone(), + } + } + _ => emit_info.clone(), + } } else { emit_info.clone() } }; -let acc_type_str = render_rust_type(acc_type_node.clone(), shared_types.clone(), scope.type_env.clone().source_indices.clone()); -let is_bare_container = (((acc_type_node.children.clone().len() as i64) == 0) && is_container_type(acc_type_name.clone())); -let lambda_acc_type_str = if is_bare_container { + let acc_type_str = render_rust_type( + acc_type_node.clone(), + shared_types.clone(), + scope.type_env.clone().source_indices.clone(), + ); + let is_bare_container = (((acc_type_node.children.clone().len() as i64) == 0) + && is_container_type(acc_type_name.clone())); + let lambda_acc_type_str = if is_bare_container { "_".to_string() } else { acc_type_str.clone() }; -let acc_has_unit_child = ({ let mut __found = false; for c in acc_type_node.children.clone().iter().cloned() { if (is_unit_like(&c) || (c.ident_span.clone() == None)) { __found = true; break; } } __found } || { let mut __found = false; for c in acc_type_node.children.clone().iter().cloned() { if { let mut __found = false; for gc in c.children.clone().iter().cloned() { if (is_unit_like(&gc) || (gc.ident_span.clone() == None)) { __found = true; break; } } __found } { __found = true; break; } } __found }); -let init_str = match args.clone().first().cloned() { - Some(init_arg) => match (*arg_value(&init_arg).expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let init_func = expr_call_func_at(arg_value(&init_arg), scope.type_env.clone().source_indices.clone()); -if ((((init_func.clone().as_str() == "empty_map".to_string().as_str()) && (acc_type_str.clone().as_str() != "_".to_string().as_str())) && (acc_type_str.clone().as_str() != "".to_string().as_str())) && !acc_has_unit_child) { - { - let kv_type_str = rust_empty_map_kv_type_str(&acc_type_node, &shared_types, &scope.type_env.clone().source_indices.clone()); -if (kv_type_str.clone().as_str() != "".to_string().as_str()) { - v2_rt::concat(v2_rt::concat("v2_rt::rc_empty_map::<".to_string(), kv_type_str.clone()), ">()".to_string()) - } else { - "Rc::new(HashMap::new()) /* BRIDGE: fold empty_map value type unresolved */".to_string() + let acc_has_unit_child = ({ + let mut __found = false; + for c in acc_type_node.children.clone().iter().cloned() { + if (is_unit_like(&c) || (c.ident_span.clone() == None)) { + __found = true; + break; + } + } + __found + } || { + let mut __found = false; + for c in acc_type_node.children.clone().iter().cloned() { + if { + let mut __found = false; + for gc in c.children.clone().iter().cloned() { + if (is_unit_like(&gc) || (gc.ident_span.clone() == None)) { + __found = true; + break; + } } -} - } else { - if (init_func.clone().as_str() == "empty_map".to_string().as_str()) { - "Rc::new(HashMap::new()) /* BRIDGE: fold empty_map accumulator type unresolved */".to_string() - } else { - emit_typed_expr(arg_value(&init_arg), registry.clone(), &scope, depth.clone(), shared_types.clone(), fold_emit_info.clone(), 1024) + __found + } { + __found = true; + break; } } -}, - _ => emit_typed_expr(arg_value(&init_arg), registry.clone(), &scope, depth.clone(), shared_types.clone(), fold_emit_info.clone(), 1024), -}, - None => "compile_error!(\"missing fold init argument\")".to_string(), -}; -let fold_fn = match args.clone().get(1 as usize).cloned() { - Some(a) => emit_typed_fold_lambda(&arg_value(&a), &lambda_acc_type_str, elem_type_str, registry.clone(), &scope, depth.clone(), &shared_types, &fold_emit_info), - None => "compile_error!(\"missing fold function argument\")".to_string(), -}; -let sharing = language_spec(RenderTarget::Rust).sharing.clone(); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(apply_type_template1(sharing.iter_owned.clone(), recv_str), ".fold(".to_string()), init_str), ", ".to_string()), fold_fn), ")".to_string()) -} + __found + }); + let init_str = match args.clone().first().cloned() { + Some(init_arg) => match (*arg_value(&init_arg).expr_data.clone()).clone() { + ExprData::ExprCall { .. } => { + let init_func = expr_call_func_at( + arg_value(&init_arg), + scope.type_env.clone().source_indices.clone(), + ); + if ((((init_func.clone().as_str() == "empty_map".to_string().as_str()) + && (acc_type_str.clone().as_str() != "_".to_string().as_str())) + && (acc_type_str.clone().as_str() != "".to_string().as_str())) + && !acc_has_unit_child) + { + { + let kv_type_str = rust_empty_map_kv_type_str( + &acc_type_node, + &shared_types, + &scope.type_env.clone().source_indices.clone(), + ); + if (kv_type_str.clone().as_str() != "".to_string().as_str()) { + v2_rt::concat( + v2_rt::concat( + "v2_rt::rc_empty_map::<".to_string(), + kv_type_str.clone(), + ), + ">()".to_string(), + ) + } else { + "Rc::new(HashMap::new()) /* BRIDGE: fold empty_map value type unresolved */".to_string() + } + } + } else { + if (init_func.clone().as_str() == "empty_map".to_string().as_str()) { + "Rc::new(HashMap::new()) /* BRIDGE: fold empty_map accumulator type unresolved */".to_string() + } else { + emit_typed_expr( + arg_value(&init_arg), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + fold_emit_info.clone(), + 1024, + ) + } + } + } + _ => emit_typed_expr( + arg_value(&init_arg), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + fold_emit_info.clone(), + 1024, + ), + }, + None => "compile_error!(\"missing fold init argument\")".to_string(), + }; + let fold_fn = match args.clone().get(1 as usize).cloned() { + Some(a) => emit_typed_fold_lambda( + &arg_value(&a), + &lambda_acc_type_str, + elem_type_str, + registry.clone(), + &scope, + depth.clone(), + &shared_types, + &fold_emit_info, + ), + None => "compile_error!(\"missing fold function argument\")".to_string(), + }; + let sharing = language_spec(RenderTarget::Rust).sharing.clone(); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + apply_type_template1(sharing.iter_owned.clone(), recv_str), + ".fold(".to_string(), + ), + init_str, + ), + ", ".to_string(), + ), + fold_fn, + ), + ")".to_string(), + ) + } } -pub fn emit_rust_sort_by_method_call(receiver: &Rc, args: Rc>>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { - { - let recv_str = emit_typed_expr(receiver.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let elem_type_str = match receiver.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - let resolved = rt.clone(); -let elem = for_each_element_type_node(resolved, scope.type_env.clone().source_indices.clone()); -let elem_is_type_var = if (elem.inferred.clone() != None) { - is_type_variable(elem.inferred.clone().clone().unwrap()) - } else { - false - }; -if ((elem.ident_span.clone() != None) && !elem_is_type_var) { - render_rust_type(elem.clone(), shared_types.clone(), scope.type_env.clone().source_indices.clone()) - } else { - "_".to_string() +pub fn emit_rust_sort_by_method_call( + receiver: &Rc, + args: Rc>>, + registry: &Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { + { + let recv_str = emit_typed_expr( + receiver.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let elem_type_str = match receiver.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + let resolved = rt.clone(); + let elem = for_each_element_type_node( + resolved, + scope.type_env.clone().source_indices.clone(), + ); + let elem_is_type_var = if (elem.inferred.clone() != None) { + is_type_variable(elem.inferred.clone().clone().unwrap()) + } else { + false + }; + if ((elem.ident_span.clone() != None) && !elem_is_type_var) { + render_rust_type( + elem.clone(), + shared_types.clone(), + scope.type_env.clone().source_indices.clone(), + ) + } else { + "_".to_string() + } } -}, - _ => "_".to_string(), -}; -let sort_key_fn = match args.first().cloned() { - Some(a) => emit_typed_collection_lambda(&arg_value(&a), elem_type_str.clone(), registry.clone(), &scope, depth.clone(), &shared_types, emit_info.clone()), - None => "compile_error!(\"missing sort_by key function argument\")".to_string(), -}; -let sharing = language_spec(RenderTarget::Rust).sharing.clone(); -let iter_str = apply_type_template1(sharing.iter_owned.clone(), recv_str); -let a_clone = apply_type_template1(sharing.clone_value.clone(), "a".to_string()); -let b_clone = apply_type_template1(sharing.clone_value.clone(), "b".to_string()); -if (elem_type_str.clone().as_str() == "_".to_string().as_str()) { + _ => "_".to_string(), + }; + let sort_key_fn = match args.first().cloned() { + Some(a) => emit_typed_collection_lambda( + &arg_value(&a), + elem_type_str.clone(), + registry.clone(), + &scope, + depth.clone(), + &shared_types, + emit_info.clone(), + ), + None => "compile_error!(\"missing sort_by key function argument\")".to_string(), + }; + let sharing = language_spec(RenderTarget::Rust).sharing.clone(); + let iter_str = apply_type_template1(sharing.iter_owned.clone(), recv_str); + let a_clone = apply_type_template1(sharing.clone_value.clone(), "a".to_string()); + let b_clone = apply_type_template1(sharing.clone_value.clone(), "b".to_string()); + if (elem_type_str.clone().as_str() == "_".to_string().as_str()) { v2_rt::concat(v2_rt::concat("Rc::new({ let mut __sorted: Vec<_> = ".to_string(), iter_str), ".collect(); __sorted.sort_by(|a, b| { a.partial_cmp(b).unwrap_or(std::cmp::Ordering::Equal) }); __sorted })".to_string()) } else { v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("Rc::new({ let mut __sorted: Vec<_> = ".to_string(), iter_str), ".collect(); __sorted.sort_by(|a: &".to_string()), elem_type_str.clone()), ", b: &".to_string()), elem_type_str.clone()), "| { let __ka = (".to_string()), sort_key_fn.clone()), ")(".to_string()), a_clone), "); let __kb = (".to_string()), sort_key_fn.clone()), ")(".to_string()), b_clone), "); __ka.partial_cmp(&__kb).unwrap_or(std::cmp::Ordering::Equal) }); __sorted })".to_string()) } -} + } } -pub fn emit_rust_map_method_call(receiver: &Rc, args: &Rc>>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { - { - let recv_str = emit_typed_expr(receiver.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let first_arg_str = emit_typed_first_arg(args.clone(), registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()); -let recv_is_optional = match receiver.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => (rt.return_cardinality.clone() == Cardinality::CardOptional), - _ => false, -}; -if recv_is_optional { +pub fn emit_rust_map_method_call( + receiver: &Rc, + args: &Rc>>, + registry: &Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { + { + let recv_str = emit_typed_expr( + receiver.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let first_arg_str = emit_typed_first_arg( + args.clone(), + registry.clone(), + scope.clone(), + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ); + let recv_is_optional = match receiver.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + (rt.return_cardinality.clone() == Cardinality::CardOptional) + } + _ => false, + }; + if recv_is_optional { match args.clone().first().cloned() { - Some(a) => match (*arg_value(&a).expr_data.clone()).clone() { - ExprData::ExprLambda => { - let bd = match arg_value(&a).children.clone().first().cloned() { - Some(v) => v.clone(), - None => arg_value(&a), -}; -let ps = lambda_param_names_at(arg_value(&a), scope.type_env.clone().source_indices.clone()); -let dag_name = match ps.clone().first().cloned() { - Some(n) => n.clone(), - None => "__x".to_string(), -}; -let p = emit_ident(dag_name, RenderTarget::Rust); -let lambda_scope = lambda_scope_from_children(scope.clone(), ps.clone(), Rc::new(arg_value(&a).children.clone().iter().cloned().skip(1 as usize).collect::>())); -let body_str = emit_typed_expr(bd, registry.clone(), &lambda_scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(recv_str, ".map(|".to_string()), p), "| ".to_string()), body_str), ")".to_string()) -}, - _ => v2_rt::concat(v2_rt::concat(v2_rt::concat(recv_str, ".map(".to_string()), first_arg_str), ")".to_string()), -}, - None => v2_rt::concat(v2_rt::concat(v2_rt::concat(recv_str, ".map(".to_string()), first_arg_str), ")".to_string()), -} + Some(a) => match (*arg_value(&a).expr_data.clone()).clone() { + ExprData::ExprLambda => { + let bd = match arg_value(&a).children.clone().first().cloned() { + Some(v) => v.clone(), + None => arg_value(&a), + }; + let ps = lambda_param_names_at( + arg_value(&a), + scope.type_env.clone().source_indices.clone(), + ); + let dag_name = match ps.clone().first().cloned() { + Some(n) => n.clone(), + None => "__x".to_string(), + }; + let p = emit_ident(dag_name, RenderTarget::Rust); + let lambda_scope = lambda_scope_from_children( + scope.clone(), + ps.clone(), + Rc::new( + arg_value(&a) + .children + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ); + let body_str = emit_typed_expr( + bd, + registry.clone(), + &lambda_scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(v2_rt::concat(recv_str, ".map(|".to_string()), p), + "| ".to_string(), + ), + body_str, + ), + ")".to_string(), + ) + } + _ => v2_rt::concat( + v2_rt::concat(v2_rt::concat(recv_str, ".map(".to_string()), first_arg_str), + ")".to_string(), + ), + }, + None => v2_rt::concat( + v2_rt::concat(v2_rt::concat(recv_str, ".map(".to_string()), first_arg_str), + ")".to_string(), + ), + } } else { { let sharing = language_spec(RenderTarget::Rust).sharing.clone(); -let iter_str = apply_type_template1(sharing.iter_owned.clone(), recv_str); -match args.clone().first().cloned() { - Some(a) => match (*arg_value(&a).expr_data.clone()).clone() { - ExprData::ExprLambda => { - let bd = match arg_value(&a).children.clone().first().cloned() { - Some(v) => v.clone(), - None => arg_value(&a), -}; -let ps = lambda_param_names_at(arg_value(&a), scope.type_env.clone().source_indices.clone()); -let dag_name = match ps.clone().first().cloned() { - Some(n) => n.clone(), - None => "__x".to_string(), -}; -let p = emit_ident(dag_name, RenderTarget::Rust); -let lambda_scope = lambda_scope_from_children(scope.clone(), ps.clone(), Rc::new(arg_value(&a).children.clone().iter().cloned().skip(1 as usize).collect::>())); -let body_str = emit_typed_expr(bd, registry.clone(), &lambda_scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("Rc::new({ let mut __result = Vec::new(); for ".to_string(), p), " in ".to_string()), iter_str), " { __result.push(".to_string()), body_str), "); } __result })".to_string()) -}, - _ => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), iter_str), ".map(".to_string()), first_arg_str), ").collect::>())".to_string()), -}, - None => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), iter_str), ".map(".to_string()), first_arg_str), ").collect::>())".to_string()), -} -} + let iter_str = apply_type_template1(sharing.iter_owned.clone(), recv_str); + match args.clone().first().cloned() { + Some(a) => { + match (*arg_value(&a).expr_data.clone()).clone() { + ExprData::ExprLambda => { + let bd = match arg_value(&a).children.clone().first().cloned() { + Some(v) => v.clone(), + None => arg_value(&a), + }; + let ps = lambda_param_names_at( + arg_value(&a), + scope.type_env.clone().source_indices.clone(), + ); + let dag_name = match ps.clone().first().cloned() { + Some(n) => n.clone(), + None => "__x".to_string(), + }; + let p = emit_ident(dag_name, RenderTarget::Rust); + let lambda_scope = lambda_scope_from_children( + scope.clone(), + ps.clone(), + Rc::new( + arg_value(&a) + .children + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ); + let body_str = emit_typed_expr( + bd, + registry.clone(), + &lambda_scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("Rc::new({ let mut __result = Vec::new(); for ".to_string(), p), " in ".to_string()), iter_str), " { __result.push(".to_string()), body_str), "); } __result })".to_string()) + } + _ => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("Rc::new(".to_string(), iter_str), + ".map(".to_string(), + ), + first_arg_str, + ), + ").collect::>())".to_string(), + ), + } + } + None => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("Rc::new(".to_string(), iter_str), + ".map(".to_string(), + ), + first_arg_str, + ), + ").collect::>())".to_string(), + ), + } + } } -} + } } -pub fn emit_rust_higher_order_method(ho_spec: &Rc, receiver: Rc, args: &Rc>>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { +pub fn emit_rust_higher_order_method( + ho_spec: &Rc, + receiver: Rc, + args: &Rc>>, + registry: &Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { { let sharing = language_spec(RenderTarget::Rust).sharing.clone(); -let recv_str = emit_typed_expr(receiver, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let first_arg_str = emit_typed_first_arg(args.clone(), registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()); -let iter_str = apply_type_template1(sharing.iter_owned.clone(), recv_str); -match args.clone().first().cloned() { - Some(a) => match (*arg_value(&a).expr_data.clone()).clone() { - ExprData::ExprLambda => { - let bd = match arg_value(&a).children.clone().first().cloned() { - Some(v) => v.clone(), - None => arg_value(&a), -}; -let ps = lambda_param_names_at(arg_value(&a), scope.type_env.clone().source_indices.clone()); -let dag_name = match ps.clone().first().cloned() { - Some(n) => n.clone(), - None => "__x".to_string(), -}; -let p = emit_ident(dag_name, RenderTarget::Rust); -let lambda_scope = lambda_scope_from_children(scope.clone(), ps.clone(), Rc::new(arg_value(&a).children.clone().iter().cloned().skip(1 as usize).collect::>())); -let body_str = emit_typed_expr(bd, registry.clone(), &lambda_scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let inner_iter = apply_type_template1(sharing.iter_owned.clone(), v2_rt::concat(v2_rt::concat("(*".to_string(), body_str.clone()), ")".to_string())); -let bindings = v2_rt::rc_map_insert(v2_rt::rc_map_insert(v2_rt::rc_map_insert(seed_bindings("param".to_string(), p), "body".to_string(), body_str.clone()), "iter".to_string(), iter_str), "inner_iter".to_string(), inner_iter); -let raw = apply_named_template(ho_spec.inline_template.clone(), &bindings); -if ho_spec.wraps_in_sharing.clone() { - v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) - } else { - raw - } -}, - _ => { - let bindings = v2_rt::rc_map_insert(seed_bindings("iter".to_string(), iter_str), "arg".to_string(), first_arg_str); -let raw = apply_named_template(ho_spec.fn_ref_template.clone(), &bindings); -if ho_spec.wraps_in_sharing.clone() { - v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) - } else { - raw - } -}, -}, - None => { - let bindings = v2_rt::rc_map_insert(seed_bindings("iter".to_string(), iter_str), "arg".to_string(), first_arg_str); -let raw = apply_named_template(ho_spec.fn_ref_template.clone(), &bindings); -if ho_spec.wraps_in_sharing.clone() { - v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) - } else { - raw + let recv_str = emit_typed_expr( + receiver, + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let first_arg_str = emit_typed_first_arg( + args.clone(), + registry.clone(), + scope.clone(), + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ); + let iter_str = apply_type_template1(sharing.iter_owned.clone(), recv_str); + match args.clone().first().cloned() { + Some(a) => match (*arg_value(&a).expr_data.clone()).clone() { + ExprData::ExprLambda => { + let bd = match arg_value(&a).children.clone().first().cloned() { + Some(v) => v.clone(), + None => arg_value(&a), + }; + let ps = lambda_param_names_at( + arg_value(&a), + scope.type_env.clone().source_indices.clone(), + ); + let dag_name = match ps.clone().first().cloned() { + Some(n) => n.clone(), + None => "__x".to_string(), + }; + let p = emit_ident(dag_name, RenderTarget::Rust); + let lambda_scope = lambda_scope_from_children( + scope.clone(), + ps.clone(), + Rc::new( + arg_value(&a) + .children + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ); + let body_str = emit_typed_expr( + bd, + registry.clone(), + &lambda_scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let inner_iter = apply_type_template1( + sharing.iter_owned.clone(), + v2_rt::concat( + v2_rt::concat("(*".to_string(), body_str.clone()), + ")".to_string(), + ), + ); + let bindings = v2_rt::rc_map_insert( + v2_rt::rc_map_insert( + v2_rt::rc_map_insert( + seed_bindings("param".to_string(), p), + "body".to_string(), + body_str.clone(), + ), + "iter".to_string(), + iter_str, + ), + "inner_iter".to_string(), + inner_iter, + ); + let raw = apply_named_template(ho_spec.inline_template.clone(), &bindings); + if ho_spec.wraps_in_sharing.clone() { + v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) + } else { + raw + } + } + _ => { + let bindings = v2_rt::rc_map_insert( + seed_bindings("iter".to_string(), iter_str), + "arg".to_string(), + first_arg_str, + ); + let raw = apply_named_template(ho_spec.fn_ref_template.clone(), &bindings); + if ho_spec.wraps_in_sharing.clone() { + v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) + } else { + raw + } + } + }, + None => { + let bindings = v2_rt::rc_map_insert( + seed_bindings("iter".to_string(), iter_str), + "arg".to_string(), + first_arg_str, + ); + let raw = apply_named_template(ho_spec.fn_ref_template.clone(), &bindings); + if ho_spec.wraps_in_sharing.clone() { + v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) + } else { + raw + } } -}, -} -} + } + } } -pub fn emit_rust_get_method_call(receiver: &Rc, args: Rc>>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { - { - let recv_str = emit_typed_expr(receiver.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let index_str = match args.first().cloned() { - Some(a) => emit_typed_expr(arg_value(&a), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024), - None => "compile_error!(\"get method missing index\")".to_string(), -}; -let receiver_resolved = match receiver.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { .. }) => true, - _ => false, -}; -if is_map_typed_expr(receiver.clone(), scope.type_env.clone().source_indices.clone()) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("v2_rt::map_get(&".to_string(), recv_str), ", ".to_string()), index_str), ")".to_string()) +pub fn emit_rust_get_method_call( + receiver: &Rc, + args: Rc>>, + registry: &Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { + { + let recv_str = emit_typed_expr( + receiver.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let index_str = match args.first().cloned() { + Some(a) => emit_typed_expr( + arg_value(&a), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ), + None => "compile_error!(\"get method missing index\")".to_string(), + }; + let receiver_resolved = match receiver.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { .. }) => true, + _ => false, + }; + if is_map_typed_expr( + receiver.clone(), + scope.type_env.clone().source_indices.clone(), + ) { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("v2_rt::map_get(&".to_string(), recv_str), + ", ".to_string(), + ), + index_str, + ), + ")".to_string(), + ) } else { if receiver_resolved { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(recv_str, ".get((".to_string()), index_str), ") as usize)".to_string()), clone_iterator_suffix()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(v2_rt::concat(recv_str, ".get((".to_string()), index_str), + ") as usize)".to_string(), + ), + clone_iterator_suffix(), + ) } else { "compile_error!(\"get: receiver type unresolved\")".to_string() } } -} + } } -pub fn emit_rust_with_method_call(receiver: &Rc, args: &Rc>>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { - { - let base_str = emit_typed_expr(receiver.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let type_name = match receiver.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - let rt_is_error = if (rt.inferred.clone() != None) { - is_compiler_error(rt.inferred.clone().clone().unwrap()) - } else { - false - }; -if (rt_is_error || (rt.ident_span.clone() == None)) { - "compile_error!(\"with method missing resolved record type\")".to_string() - } else { - authored_name_at(scope.type_env.clone().source_indices.clone(), &rt) +pub fn emit_rust_with_method_call( + receiver: &Rc, + args: &Rc>>, + registry: &Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { + { + let base_str = emit_typed_expr( + receiver.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let type_name = match receiver.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + let rt_is_error = if (rt.inferred.clone() != None) { + is_compiler_error(rt.inferred.clone().clone().unwrap()) + } else { + false + }; + if (rt_is_error || (rt.ident_span.clone() == None)) { + "compile_error!(\"with method missing resolved record type\")".to_string() + } else { + authored_name_at(scope.type_env.clone().source_indices.clone(), &rt) + } } -}, - _ => "compile_error!(\"with method missing resolved record type\")".to_string(), -}; -if ((args.clone().len() as i64) == 0) { - return "compile_error!(\"with method missing update record\")".to_string() + _ => "compile_error!(\"with method missing resolved record type\")".to_string(), + }; + if ((args.clone().len() as i64) == 0) { + return "compile_error!(\"with method missing update record\")".to_string(); } -let update_arg = arg_value(&args.clone().first().cloned().clone().unwrap()); -let field_strs = match (*update_arg.expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => Rc::new({ let mut __result = Vec::new(); for f in update_arg.children.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(emit_ident(field_init_node_name_at(f.clone(), scope.type_env.clone().source_indices.clone()), RenderTarget::Rust), ": ".to_string()), emit_typed_expr(field_init_node_value(&f), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024))); } __result }), - _ => Rc::new(vec![emit_typed_expr(update_arg.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024)]), -}; -let fields_str = field_strs.join(&", ".to_string()); -let needs_rc = set_contains(shared_types.clone(), type_name.clone()); -let sharing = language_spec(RenderTarget::Rust).sharing.clone(); -let spread = if needs_rc.clone() { + let update_arg = arg_value(&args.clone().first().cloned().clone().unwrap()); + let field_strs = match (*update_arg.expr_data.clone()).clone() { + ExprData::ExprRecordLit { .. } => Rc::new({ + let mut __result = Vec::new(); + for f in update_arg.children.clone().iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + emit_ident( + field_init_node_name_at( + f.clone(), + scope.type_env.clone().source_indices.clone(), + ), + RenderTarget::Rust, + ), + ": ".to_string(), + ), + emit_typed_expr( + field_init_node_value(&f), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ), + )); + } + __result + }), + _ => Rc::new(vec![emit_typed_expr( + update_arg.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + )]), + }; + let fields_str = field_strs.join(&", ".to_string()); + let needs_rc = emit_map_has(shared_types.clone(), type_name.clone()); + let sharing = language_spec(RenderTarget::Rust).sharing.clone(); + let spread = if needs_rc.clone() { apply_type_template1(sharing.deref_clone.clone(), base_str) } else { apply_type_template1(sharing.clone_value.clone(), base_str) }; -let raw = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(type_name.clone(), " { ".to_string()), fields_str), ", ..".to_string()), spread), " }".to_string()); -if needs_rc.clone() { + let raw = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(type_name.clone(), " { ".to_string()), + fields_str, + ), + ", ..".to_string(), + ), + spread, + ), + " }".to_string(), + ); + if needs_rc.clone() { v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) } else { raw } -} + } } -pub fn emit_rust_first_method_call(receiver: &Rc, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { +pub fn emit_rust_first_method_call( + receiver: &Rc, + registry: &Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { match (*receiver.expr_data.clone()).clone() { - ExprData::ExprMethodCall { .. } => if (expr_method_name_at(receiver.clone(), scope.type_env.clone().source_indices.clone()).as_str() == "skip".to_string().as_str()) { - { - let skip_recv = method_receiver(receiver.clone()); -let skip_args = method_arg_nodes(receiver.clone()); -let recv_str = emit_typed_expr(skip_recv, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let arg_str = emit_typed_first_arg(skip_args, registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(recv_str, ".get(".to_string()), arg_str), " as usize).cloned()".to_string()) -} - } else { - { - let recv_str = emit_typed_expr(receiver.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -v2_rt::concat(recv_str, ".first().cloned()".to_string()) -} - }, - _ => { - let recv_str = emit_typed_expr(receiver.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -v2_rt::concat(recv_str, ".first().cloned()".to_string()) -}, -} + ExprData::ExprMethodCall { .. } => { + if (expr_method_name_at( + receiver.clone(), + scope.type_env.clone().source_indices.clone(), + ) + .as_str() + == "skip".to_string().as_str()) + { + { + let skip_recv = method_receiver(receiver.clone()); + let skip_args = method_arg_nodes(receiver.clone()); + let recv_str = emit_typed_expr( + skip_recv, + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let arg_str = emit_typed_first_arg( + skip_args, + registry.clone(), + scope.clone(), + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ); + v2_rt::concat( + v2_rt::concat(v2_rt::concat(recv_str, ".get(".to_string()), arg_str), + " as usize).cloned()".to_string(), + ) + } + } else { + { + let recv_str = emit_typed_expr( + receiver.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + v2_rt::concat(recv_str, ".first().cloned()".to_string()) + } + } + } + _ => { + let recv_str = emit_typed_expr( + receiver.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + v2_rt::concat(recv_str, ".first().cloned()".to_string()) + } + } } -pub fn emit_rust_generic_method_call(method_name: String, receiver: Rc, args: Rc>>, result_type: Option>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { +pub fn emit_rust_generic_method_call( + method_name: String, + receiver: Rc, + args: Rc>>, + result_type: Option>, + registry: &Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { { let function_name = method_name; -let recv_str = if rust_runtime_bridge_passes_receiver_by_ref(function_name.clone()) { - v2_rt::concat("&".to_string(), emit_typed_expr_base(&receiver, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone())) - } else { - emit_cloned_arg(receiver, registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()) + let recv_str = if rust_runtime_bridge_passes_receiver_by_ref(function_name.clone()) { + v2_rt::concat( + "&".to_string(), + emit_typed_expr_base( + &receiver, + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ), + ) + } else { + emit_cloned_arg( + receiver, + registry.clone(), + scope.clone(), + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ) }; -let arg_strs = Rc::new({ let mut __result = Vec::new(); for a in args.iter().cloned() { __result.push(emit_cloned_arg(arg_value(&a), registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone())); } __result }); -let all_strs = v2_rt::concat(Rc::new(vec![recv_str]), arg_strs); -let bridge_name = rust_runtime_bridge_name(function_name.clone()); -let lowered = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("v2_rt::".to_string(), emit_ident(bridge_name, RenderTarget::Rust)), "(".to_string()), all_strs.join(&", ".to_string())), ")".to_string()); -if rust_runtime_bridge_wraps_collection_result_in_rc(&function_name) { - v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), lowered), ")".to_string()) + let arg_strs = Rc::new({ + let mut __result = Vec::new(); + for a in args.iter().cloned() { + __result.push(emit_cloned_arg( + arg_value(&a), + registry.clone(), + scope.clone(), + depth.clone(), + shared_types.clone(), + emit_info.clone(), + )); + } + __result + }); + let all_strs = v2_rt::concat(Rc::new(vec![recv_str]), arg_strs); + let bridge_name = rust_runtime_bridge_name(function_name.clone()); + let lowered = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "v2_rt::".to_string(), + emit_ident(bridge_name, RenderTarget::Rust), + ), + "(".to_string(), + ), + all_strs.join(&", ".to_string()), + ), + ")".to_string(), + ); + if rust_runtime_bridge_wraps_collection_result_in_rc(&function_name) { + v2_rt::concat( + v2_rt::concat("Rc::new(".to_string(), lowered), + ")".to_string(), + ) } else { lowered } -} + } } -pub fn emit_typed_method_call(method_call_node: Rc, receiver: &Rc, method: String, args: &Rc>>, result_type: Option>, method_semantics: &Option>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { +pub fn emit_typed_method_call( + method_call_node: Rc, + receiver: &Rc, + method: String, + args: &Rc>>, + result_type: Option>, + method_semantics: &Option>, + registry: &Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { if (method_semantics.clone() != None) { match (*method_semantics.clone().unwrap()).clone() { - MethodSemantics::ServiceMethodSemantics { service_name: svc_name, op_params, .. } => { - let var_name = service_var_name(svc_name.clone()); -let si = scope.type_env.clone().source_indices.clone(); -let filled_args = fill_op_default_args(&args, op_params.clone(), registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()); -let optional_param_set = Rc::new({ let mut __result = Vec::new(); for p in op_params.clone().iter().cloned() { if (param_node_type_expr(&p).return_cardinality.clone() == Cardinality::CardOptional) { __result.push(p); } } __result }).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, p: Rc| v2_rt::rc_map_insert(acc, param_node_name_at(p.clone(), si.clone()), true)); -let json_param_set = Rc::new({ let mut __result = Vec::new(); for p in op_params.clone().iter().cloned() { if (coerce_primitive_type(RenderTarget::Rust, authored_name_at(si.clone(), ¶m_node_type_expr(&p))).as_str() == "serde_json::Value".to_string().as_str()) { __result.push(p); } } __result }).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, p: Rc| v2_rt::rc_map_insert(acc, param_node_name_at(p.clone(), si.clone()), true)); -let arg_strs = Rc::new({ let mut __result = Vec::new(); for a in filled_args.iter().cloned() { __result.push({ - let arg_str = emit_typed_expr(arg_value(&a), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let aname = match arg_name_at(a.clone(), si.clone()) { - Some(n) => n.clone(), - None => "".to_string(), -}; -let param_is_json = match v2_rt::map_get(&json_param_set, aname.clone()) { - Some(_) => true, - None => false, -}; -let param_is_optional = match v2_rt::map_get(&optional_param_set, aname.clone()) { - Some(_) => true, - None => false, -}; -let needs_optional = (param_is_optional.clone() && (is_already_optional(&arg_value(&a), emit_info.clone(), &scope) == false)); -let coerced = if (param_is_json.clone() && is_string_typed_expr(arg_value(&a), si.clone())) { - v2_rt::concat(v2_rt::concat("serde_json::from_str(&".to_string(), arg_str.clone()), ").unwrap()".to_string()) - } else { - arg_str.clone() - }; -if needs_optional.clone() { - v2_rt::concat(v2_rt::concat("Some(".to_string(), coerced.clone()), ")".to_string()) - } else { - coerced.clone() - } -}); } __result }); -let args_str = arg_strs.join(&", ".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(var_name, ".".to_string()), emit_ident(method, RenderTarget::Rust)), "(".to_string()), args_str), ").await?".to_string()) -}, - MethodSemantics::AlgebraMethodSemantics { method_def, fold_accumulator_type, .. } => { - let method_name = authored_name_at(scope.type_env.clone().source_indices.clone(), &method_def); -if (method_name.clone().as_str() == "fold".to_string().as_str()) { - emit_rust_fold_method_call(method_call_node, fold_accumulator_type.clone(), result_type, &receiver, &args, ®istry, &scope, depth.clone(), &shared_types, &emit_info) - } else { - if (method_name.clone().as_str() == "sort_by".to_string().as_str()) { - emit_rust_sort_by_method_call(&receiver, args.clone(), ®istry, &scope, depth.clone(), &shared_types, &emit_info) + MethodSemantics::ServiceMethodSemantics { + service_name: svc_name, + op_params, + .. + } => { + let var_name = service_var_name(svc_name.clone()); + let si = scope.type_env.clone().source_indices.clone(); + let filled_args = fill_op_default_args( + &args, + op_params.clone(), + registry.clone(), + scope.clone(), + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ); + let optional_param_set = Rc::new({ + let mut __result = Vec::new(); + for p in op_params.clone().iter().cloned() { + if (param_node_type_expr(&p).return_cardinality.clone() + == Cardinality::CardOptional) + { + __result.push(p); + } + } + __result + }) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, p: Rc| { + v2_rt::rc_map_insert(acc, param_node_name_at(p.clone(), si.clone()), true) + }, + ); + let json_param_set = Rc::new({ + let mut __result = Vec::new(); + for p in op_params.clone().iter().cloned() { + if (coerce_primitive_type( + RenderTarget::Rust, + authored_name_at(si.clone(), ¶m_node_type_expr(&p)), + ) + .as_str() + == "serde_json::Value".to_string().as_str()) + { + __result.push(p); + } + } + __result + }) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, p: Rc| { + v2_rt::rc_map_insert(acc, param_node_name_at(p.clone(), si.clone()), true) + }, + ); + let arg_strs = Rc::new({ + let mut __result = Vec::new(); + for a in filled_args.iter().cloned() { + __result.push({ + let arg_str = emit_typed_expr( + arg_value(&a), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let aname = match arg_name_at(a.clone(), si.clone()) { + Some(n) => n.clone(), + None => "".to_string(), + }; + let param_is_json = match v2_rt::map_get(&json_param_set, aname.clone()) + { + Some(_) => true, + None => false, + }; + let param_is_optional = + match v2_rt::map_get(&optional_param_set, aname.clone()) { + Some(_) => true, + None => false, + }; + let needs_optional = (param_is_optional.clone() + && (is_already_optional( + &arg_value(&a), + emit_info.clone(), + &scope, + ) == false)); + let coerced = if (param_is_json.clone() + && is_string_typed_expr(arg_value(&a), si.clone())) + { + v2_rt::concat( + v2_rt::concat( + "serde_json::from_str(&".to_string(), + arg_str.clone(), + ), + ").unwrap()".to_string(), + ) + } else { + arg_str.clone() + }; + if needs_optional.clone() { + v2_rt::concat( + v2_rt::concat("Some(".to_string(), coerced.clone()), + ")".to_string(), + ) + } else { + coerced.clone() + } + }); + } + __result + }); + let args_str = arg_strs.join(&", ".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(var_name, ".".to_string()), + emit_ident(method, RenderTarget::Rust), + ), + "(".to_string(), + ), + args_str, + ), + ").await?".to_string(), + ) + } + MethodSemantics::AlgebraMethodSemantics { + method_def, + fold_accumulator_type, + .. + } => { + let method_name = + authored_name_at(scope.type_env.clone().source_indices.clone(), &method_def); + if (method_name.clone().as_str() == "fold".to_string().as_str()) { + emit_rust_fold_method_call( + method_call_node, + fold_accumulator_type.clone(), + result_type, + &receiver, + &args, + ®istry, + &scope, + depth.clone(), + &shared_types, + &emit_info, + ) } else { - if (method_name.clone().as_str() == "map".to_string().as_str()) { - emit_rust_map_method_call(&receiver, &args, ®istry, &scope, depth.clone(), &shared_types, &emit_info) + if (method_name.clone().as_str() == "sort_by".to_string().as_str()) { + emit_rust_sort_by_method_call( + &receiver, + args.clone(), + ®istry, + &scope, + depth.clone(), + &shared_types, + &emit_info, + ) } else { - match Rc::new({ let mut __result = Vec::new(); for s in rust_higher_order_methods().iter().cloned() { if (s.method_name.clone().as_str() == method_name.clone().as_str()) { __result.push(s); } } __result }).first().cloned() { - Some(ho_spec) => emit_rust_higher_order_method(&ho_spec, receiver.clone(), &args, ®istry, &scope, depth.clone(), &shared_types, &emit_info), - None => if (method_name.clone().as_str() == "get".to_string().as_str()) { - emit_rust_get_method_call(&receiver, args.clone(), ®istry, &scope, depth.clone(), &shared_types, &emit_info) + if (method_name.clone().as_str() == "map".to_string().as_str()) { + emit_rust_map_method_call( + &receiver, + &args, + ®istry, + &scope, + depth.clone(), + &shared_types, + &emit_info, + ) } else { - if (method_name.clone().as_str() == "with".to_string().as_str()) { - emit_rust_with_method_call(&receiver, &args, ®istry, &scope, depth.clone(), &shared_types, &emit_info) - } else { - if (method_name.clone().as_str() == "string_contains".to_string().as_str()) { - emit_rust_generic_method_call("string_contains".to_string(), receiver.clone(), args.clone(), result_type, ®istry, &scope, depth.clone(), &shared_types, &emit_info) - } else { - if (method_name.clone().as_str() == "concat".to_string().as_str()) { - { - let recv_str = emit_typed_expr(receiver.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let arg_strs = Rc::new({ let mut __result = Vec::new(); for a in args.clone().iter().cloned() { __result.push(emit_typed_expr(arg_value(&a), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024)); } __result }); -let all_arg_strs = v2_rt::concat(Rc::new(vec![recv_str]), arg_strs); -emit_nested_rt_concat(all_arg_strs, "".to_string(), shared_types.clone()) -} + match Rc::new({ + let mut __result = Vec::new(); + for s in rust_higher_order_methods().iter().cloned() { + if (s.method_name.clone().as_str() + == method_name.clone().as_str()) + { + __result.push(s); + } + } + __result + }) + .first() + .cloned() + { + Some(ho_spec) => emit_rust_higher_order_method( + &ho_spec, + receiver.clone(), + &args, + ®istry, + &scope, + depth.clone(), + &shared_types, + &emit_info, + ), + None => { + if (method_name.clone().as_str() == "get".to_string().as_str()) + { + emit_rust_get_method_call( + &receiver, + args.clone(), + ®istry, + &scope, + depth.clone(), + &shared_types, + &emit_info, + ) } else { - if (method_name.clone().as_str() == "first".to_string().as_str()) { - emit_rust_first_method_call(&receiver, ®istry, &scope, depth.clone(), &shared_types, &emit_info) + if (method_name.clone().as_str() + == "with".to_string().as_str()) + { + emit_rust_with_method_call( + &receiver, + &args, + ®istry, + &scope, + depth.clone(), + &shared_types, + &emit_info, + ) } else { + if (method_name.clone().as_str() + == "string_contains".to_string().as_str()) { - let recv_str = emit_typed_expr(receiver.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let first_arg_str = emit_typed_first_arg(args.clone(), registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()); -match v2_rt::map_get(&rust_method_template_emit(), method_name.clone()) { - Some(tmpl) => { - let bindings = v2_rt::rc_map_insert(seed_bindings("recv".to_string(), recv_str), "arg".to_string(), first_arg_str); -let raw = apply_named_template(tmpl.clone(), &bindings); -if rust_runtime_bridge_wraps_collection_result_in_rc(&method_name) { + emit_rust_generic_method_call( + "string_contains".to_string(), + receiver.clone(), + args.clone(), + result_type, + ®istry, + &scope, + depth.clone(), + &shared_types, + &emit_info, + ) + } else { + if (method_name.clone().as_str() + == "concat".to_string().as_str()) + { + { + let recv_str = emit_typed_expr( + receiver.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let arg_strs = Rc::new({ + let mut __result = Vec::new(); + for a in args.clone().iter().cloned() { + __result.push(emit_typed_expr( + arg_value(&a), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + )); + } + __result + }); + let all_arg_strs = v2_rt::concat( + Rc::new(vec![recv_str]), + arg_strs, + ); + emit_nested_rt_concat( + all_arg_strs, + "".to_string(), + shared_types.clone(), + ) + } + } else { + if (method_name.clone().as_str() + == "first".to_string().as_str()) + { + emit_rust_first_method_call( + &receiver, + ®istry, + &scope, + depth.clone(), + &shared_types, + &emit_info, + ) + } else { + { + let recv_str = emit_typed_expr( + receiver.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let first_arg_str = + emit_typed_first_arg( + args.clone(), + registry.clone(), + scope.clone(), + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ); + match v2_rt::map_get( + &rust_method_template_emit(), + method_name.clone(), + ) { + Some(tmpl) => { + let bindings = + v2_rt::rc_map_insert( + seed_bindings( + "recv".to_string(), + recv_str, + ), + "arg".to_string(), + first_arg_str, + ); + let raw = apply_named_template( + tmpl.clone(), + &bindings, + ); + if rust_runtime_bridge_wraps_collection_result_in_rc(&method_name) { v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) } else { raw } -}, - None => emit_rust_generic_method_call(method_name.clone(), receiver.clone(), args.clone(), result_type, ®istry, &scope, depth.clone(), &shared_types, &emit_info), -} -} + } + None => { + emit_rust_generic_method_call( + method_name.clone(), + receiver.clone(), + args.clone(), + result_type, + ®istry, + &scope, + depth.clone(), + &shared_types, + &emit_info, + ) + } + } + } + } + } + } } } } } - }, -} + } } } } -}, - MethodSemantics::PlainMethodSemantics => { - let recv_str = emit_typed_expr(receiver.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let arg_strs = Rc::new({ let mut __result = Vec::new(); for a in args.clone().iter().cloned() { __result.push(emit_typed_expr(arg_value(&a), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024)); } __result }); -let args_str = arg_strs.join(&", ".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(recv_str, ".".to_string()), emit_ident(method, RenderTarget::Rust)), "(".to_string()), args_str), ")".to_string()) -}, -} + MethodSemantics::PlainMethodSemantics => { + let recv_str = emit_typed_expr( + receiver.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let arg_strs = Rc::new({ + let mut __result = Vec::new(); + for a in args.clone().iter().cloned() { + __result.push(emit_typed_expr( + arg_value(&a), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + )); + } + __result + }); + let args_str = arg_strs.join(&", ".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(recv_str, ".".to_string()), + emit_ident(method, RenderTarget::Rust), + ), + "(".to_string(), + ), + args_str, + ), + ")".to_string(), + ) + } + } } else { "compile_error!(\"method call missing reconcile semantics\")".to_string() } } -pub fn emit_typed_first_arg(args: Rc>>, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { +pub fn emit_typed_first_arg( + args: Rc>>, + registry: Rc>>, + scope: Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { match args.first().cloned() { - Some(a) => emit_typed_expr(arg_value(&a), registry, &scope, depth, shared_types, emit_info, 1024), - None => "compile_error!(\"missing method argument\")".to_string(), -} + Some(a) => emit_typed_expr( + arg_value(&a), + registry, + &scope, + depth, + shared_types, + emit_info, + 1024, + ), + None => "compile_error!(\"missing method argument\")".to_string(), + } } -pub fn emit_typed_match(scrutinee: &Rc, arms: &Rc>>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { - { - let scrut_str = emit_typed_expr(scrutinee.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let scrut_type = match scrutinee.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - let is_optional = (rt.return_cardinality.clone() == Cardinality::CardOptional); -if is_optional { - authored_name_at(scope.type_env.clone().source_indices.clone(), &with_required_cardinality(&rt)) - } else { - authored_name_at(scope.type_env.clone().source_indices.clone(), &rt) +pub fn emit_typed_match( + scrutinee: &Rc, + arms: &Rc>>, + registry: &Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { + { + let scrut_str = emit_typed_expr( + scrutinee.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let scrut_type = match scrutinee.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + let is_optional = (rt.return_cardinality.clone() == Cardinality::CardOptional); + if is_optional { + authored_name_at( + scope.type_env.clone().source_indices.clone(), + &with_required_cardinality(&rt), + ) + } else { + authored_name_at(scope.type_env.clone().source_indices.clone(), &rt) + } } -}, - _ => "".to_string(), -}; -let rc_match = analyze_rc_match(&scrutinee, arms.clone(), scrut_type.clone(), &shared_types, emit_info.clone(), &scope.type_env.clone().source_indices.clone()); -let match_result_type = match arms.clone().first().cloned() { - Some(first_arm) => resolved_type(arm_body(&first_arm)), - None => type_variable_node("match_result".to_string()), -}; -let arm_strs = Rc::new({ let mut __result = Vec::new(); for arm in arms.clone().iter().cloned() { __result.push(emit_typed_match_arm(&arm, ®istry, &scope, depth.clone(), &shared_types, &emit_info, &scrut_type, match_result_type.clone(), false)); } __result }); -let arms_str = arm_strs.join(&"\n".to_string()); -let needs_as_str = (all_arms_are_string_lit(&arms) && ((arms.clone().len() as i64) > 0)); -let needs_string_from = has_string_lit_with_bind(&arms); -if rc_match.needs_option_deref.clone() { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("match ".to_string(), scrut_str), ".as_deref()".to_string()), clone_iterator_suffix()), " {\n".to_string()), arms_str), "\n}".to_string()) + _ => "".to_string(), + }; + let rc_match = analyze_rc_match( + &scrutinee, + arms.clone(), + scrut_type.clone(), + &shared_types, + emit_info.clone(), + &scope.type_env.clone().source_indices.clone(), + ); + let match_result_type = match arms.clone().first().cloned() { + Some(first_arm) => resolved_type(arm_body(&first_arm)), + None => type_variable_node("match_result".to_string()), + }; + let arm_strs = Rc::new({ + let mut __result = Vec::new(); + for arm in arms.clone().iter().cloned() { + __result.push(emit_typed_match_arm( + &arm, + ®istry, + &scope, + depth.clone(), + &shared_types, + &emit_info, + &scrut_type, + match_result_type.clone(), + false, + )); + } + __result + }); + let arms_str = arm_strs.join(&"\n".to_string()); + let needs_as_str = (all_arms_are_string_lit(&arms) && ((arms.clone().len() as i64) > 0)); + let needs_string_from = has_string_lit_with_bind(&arms); + if rc_match.needs_option_deref.clone() { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("match ".to_string(), scrut_str), + ".as_deref()".to_string(), + ), + clone_iterator_suffix(), + ), + " {\n".to_string(), + ), + arms_str, + ), + "\n}".to_string(), + ) } else { if rc_match.needs_deref.clone() { { let sharing = language_spec(RenderTarget::Rust).sharing.clone(); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("match ".to_string(), apply_type_template1(sharing.deref_clone.clone(), scrut_str)), " {\n".to_string()), arms_str), "\n}".to_string()) -} + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "match ".to_string(), + apply_type_template1(sharing.deref_clone.clone(), scrut_str), + ), + " {\n".to_string(), + ), + arms_str, + ), + "\n}".to_string(), + ) + } } else { if needs_as_str { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("match ".to_string(), scrut_str), ".as_str() {\n".to_string()), arms_str), "\n}".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("match ".to_string(), scrut_str), + ".as_str() {\n".to_string(), + ), + arms_str, + ), + "\n}".to_string(), + ) } else { if needs_string_from { { - let sf_arm_strs = Rc::new({ let mut __result = Vec::new(); for arm in arms.clone().iter().cloned() { __result.push(emit_typed_match_arm(&arm, ®istry, &scope, depth.clone(), &shared_types, &emit_info, &scrut_type, match_result_type.clone(), true)); } __result }); -let sf_arms_str = sf_arm_strs.join(&"\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("match ".to_string(), scrut_str), " {\n".to_string()), sf_arms_str), "\n}".to_string()) -} + let sf_arm_strs = Rc::new({ + let mut __result = Vec::new(); + for arm in arms.clone().iter().cloned() { + __result.push(emit_typed_match_arm( + &arm, + ®istry, + &scope, + depth.clone(), + &shared_types, + &emit_info, + &scrut_type, + match_result_type.clone(), + true, + )); + } + __result + }); + let sf_arms_str = sf_arm_strs.join(&"\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("match ".to_string(), scrut_str), + " {\n".to_string(), + ), + sf_arms_str, + ), + "\n}".to_string(), + ) + } } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("match ".to_string(), scrut_str), " {\n".to_string()), arms_str), "\n}".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("match ".to_string(), scrut_str), + " {\n".to_string(), + ), + arms_str, + ), + "\n}".to_string(), + ) } } } } -} + } } -pub fn emit_typed_match_arm(arm: &Rc, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc, scrut_type: &String, match_result_type: Rc, string_from_mode: bool) -> String { +pub fn emit_typed_match_arm( + arm: &Rc, + registry: &Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, + scrut_type: &String, + match_result_type: Rc, + string_from_mode: bool, +) -> String { { let arm_pat = arm_pattern(arm.clone()); -let arm_g = arm_guard(&arm); -let arm_b = arm_body(&arm); -let si = scope.type_env.clone().source_indices.clone(); -let rc_analysis = analyze_rc_pattern(arm_pat.clone(), scrut_type.clone(), &shared_types, &emit_info, si.clone()); -let pat_str = if string_from_mode { + let arm_g = arm_guard(&arm); + let arm_b = arm_body(&arm); + let si = scope.type_env.clone().source_indices.clone(); + let rc_analysis = analyze_rc_pattern( + arm_pat.clone(), + scrut_type.clone(), + &shared_types, + &emit_info, + si.clone(), + ); + let pat_str = if string_from_mode { match (*arm_pat.clone()).clone() { - MatchPattern::LitPattern { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitStr { value: s, .. } => v2_rt::concat(v2_rt::concat("ref __s if __s == \"".to_string(), escape_string_literal_body(s.clone())), "\"".to_string()), - _ => rust_literal_for_pattern(v.clone()), -}, - _ => emit_pattern(arm_pat.clone(), shared_types.clone(), scrut_type.clone(), si.clone(), emit_info.clone()), -} + MatchPattern::LitPattern { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitStr { value: s, .. } => v2_rt::concat( + v2_rt::concat( + "ref __s if __s == \"".to_string(), + escape_string_literal_body(s.clone()), + ), + "\"".to_string(), + ), + _ => rust_literal_for_pattern(v.clone()), + }, + _ => emit_pattern( + arm_pat.clone(), + shared_types.clone(), + scrut_type.clone(), + si.clone(), + emit_info.clone(), + ), + } } else { if rc_analysis.needs_rc_pattern.clone() { - emit_pattern_rc_aware(arm_pat.clone(), rc_analysis.clone(), shared_types.clone(), scrut_type.clone(), si.clone(), emit_info.clone()) + emit_pattern_rc_aware( + arm_pat.clone(), + rc_analysis.clone(), + shared_types.clone(), + scrut_type.clone(), + si.clone(), + emit_info.clone(), + ) } else { - emit_pattern(arm_pat.clone(), shared_types.clone(), scrut_type.clone(), si.clone(), emit_info.clone()) + emit_pattern( + arm_pat.clone(), + shared_types.clone(), + scrut_type.clone(), + si.clone(), + emit_info.clone(), + ) } }; -let field_guards = collect_pattern_string_guards(arm_pat.clone(), si.clone()); -let arm_guard_str = match arm_g { - Some(g) => emit_typed_expr(g.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024), - None => "".to_string(), -}; -let guard_str = if ((field_guards.clone().as_str() != "".to_string().as_str()) && (arm_guard_str.clone().as_str() != "".to_string().as_str())) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(" if ".to_string(), field_guards.clone()), " && ".to_string()), arm_guard_str.clone()) + let field_guards = collect_pattern_string_guards(arm_pat.clone(), si.clone()); + let arm_guard_str = match arm_g { + Some(g) => emit_typed_expr( + g.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ), + None => "".to_string(), + }; + let guard_str = if ((field_guards.clone().as_str() != "".to_string().as_str()) + && (arm_guard_str.clone().as_str() != "".to_string().as_str())) + { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(" if ".to_string(), field_guards.clone()), + " && ".to_string(), + ), + arm_guard_str.clone(), + ) } else { if (field_guards.clone().as_str() != "".to_string().as_str()) { v2_rt::concat(" if ".to_string(), field_guards.clone()) @@ -4197,420 +9769,913 @@ let guard_str = if ((field_guards.clone().as_str() != "".to_string().as_str()) & } } }; -let body_str = match (*arm_b.expr_data.clone()).clone() { - ExprData::ExprVar { binding_kind: body_binding_kind, .. } => { - let body_name = expr_var_name_at(arm_b.clone(), si.clone()); -if (variant_parent_from_binding_kind(body_binding_kind.clone()) != None) { - emit_var_ref(&body_name, &body_binding_kind, &Some(Rc::new(InferredNode::Resolved { - node: match_result_type, -})), shared_types.clone(), registry.clone(), &emit_info, si.clone()) - } else { - emit_typed_expr(arm_b.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024) + let body_str = match (*arm_b.expr_data.clone()).clone() { + ExprData::ExprVar { + binding_kind: body_binding_kind, + .. + } => { + let body_name = expr_var_name_at(arm_b.clone(), si.clone()); + if (variant_parent_from_binding_kind(body_binding_kind.clone()) != None) { + emit_var_ref( + &body_name, + &body_binding_kind, + &Some(Rc::new(InferredNode::Resolved { + node: match_result_type, + })), + shared_types.clone(), + registry.clone(), + &emit_info, + si.clone(), + ) + } else { + emit_typed_expr( + arm_b.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ) + } } -}, - _ => emit_typed_expr(arm_b.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024), -}; -if rc_analysis.needs_rc_pattern.clone() { + _ => emit_typed_expr( + arm_b.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ), + }; + if rc_analysis.needs_rc_pattern.clone() { { - let prelude = rc_pattern_preludes(arm_pat.clone(), rc_analysis.clone(), shared_types.clone(), si.clone(), emit_info.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), pat_str), guard_str), " => { ".to_string()), prelude), " ".to_string()), body_str), " },".to_string()) -} + let prelude = rc_pattern_preludes( + arm_pat.clone(), + rc_analysis.clone(), + shared_types.clone(), + si.clone(), + emit_info.clone(), + ); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(" ".to_string(), pat_str), + guard_str, + ), + " => { ".to_string(), + ), + prelude, + ), + " ".to_string(), + ), + body_str, + ), + " },".to_string(), + ) + } } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), pat_str), guard_str), " => ".to_string()), body_str), ",".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(v2_rt::concat(" ".to_string(), pat_str), guard_str), + " => ".to_string(), + ), + body_str, + ), + ",".to_string(), + ) } -} + } } -pub fn emit_typed_if(condition: Rc, then_branch: Rc, else_branch: Option>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { - { - let cond_str = emit_typed_expr(condition, registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -emit_typed_if_shared(cond_str, &then_branch, else_branch, None, depth.clone(), &RenderTarget::Rust, scope.type_env.clone().source_indices.clone(), |node, d| emit_typed_expr(node.clone(), registry.clone(), &scope, d.clone(), shared_types.clone(), emit_info.clone(), 1024)) -} +pub fn emit_typed_if( + condition: Rc, + then_branch: Rc, + else_branch: Option>, + registry: &Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { + { + let cond_str = emit_typed_expr( + condition, + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + emit_typed_if_shared( + cond_str, + &then_branch, + else_branch, + None, + depth.clone(), + &RenderTarget::Rust, + scope.type_env.clone().source_indices.clone(), + |node, d| { + emit_typed_expr( + node.clone(), + registry.clone(), + &scope, + d.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ) + }, + ) + } } -pub fn emit_typed_let(name: String, value: &Rc, body: Option>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { - { - let val_str = emit_typed_expr(value.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -emit_typed_let_shared(&name, val_str, body, RenderTarget::Rust, |bd, sc| emit_typed_expr(bd.clone(), registry.clone(), &sc, depth.clone(), shared_types.clone(), emit_info.clone(), 1024), scope.clone(), value.clone()) -} +pub fn emit_typed_let( + name: String, + value: &Rc, + body: Option>, + registry: &Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { + { + let val_str = emit_typed_expr( + value.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + emit_typed_let_shared( + &name, + val_str, + body, + RenderTarget::Rust, + |bd, sc| { + emit_typed_expr( + bd.clone(), + registry.clone(), + &sc, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ) + }, + scope.clone(), + value.clone(), + ) + } } -pub fn is_optional_struct_field(emit_info: Rc, struct_name: String, field_name: String) -> bool { +pub fn is_optional_struct_field( + emit_info: Rc, + struct_name: String, + field_name: String, +) -> bool { match lookup_emit_type_summary(emit_info, struct_name) { - Some(summary) => match v2_rt::map_get(&summary.field_summaries.clone(), field_name) { - Some(field_summary) => match field_summary.value_shape.clone() { - FieldValueShape::OptionalValue => true, - _ => false, -}, - None => false, -}, - None => false, -} + Some(summary) => match v2_rt::map_get(&summary.field_summaries.clone(), field_name) { + Some(field_summary) => match field_summary.value_shape.clone() { + FieldValueShape::OptionalValue => true, + _ => false, + }, + None => false, + }, + None => false, + } } -pub fn is_already_optional(texpr: &Rc, emit_info: Rc, scope: &Rc) -> bool { +pub fn is_already_optional( + texpr: &Rc, + emit_info: Rc, + scope: &Rc, +) -> bool { { let si = scope.type_env.clone().source_indices.clone(); -let n = expr_var_name_at(texpr.clone(), si.clone()); -let tn = record_lit_type_name_at(texpr.clone(), si.clone()); -let f = field_access_field_at(texpr.clone(), si.clone()); -match (*texpr.expr_data.clone()).clone() { - ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitNull => true, - _ => false, -}, - ExprData::ExprVar { .. } => if ((n.clone().as_str() == "none".to_string().as_str()) || (n.clone().as_str() == "None".to_string().as_str())) { - true - } else { - match texpr.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => (rt.return_cardinality.clone() == Cardinality::CardOptional), - _ => match v2_rt::map_get(&scope.locals.clone(), n.clone()) { - Some(binding) => (binding.resolved.clone().return_cardinality.clone() == Cardinality::CardOptional), - None => false, -}, -} - }, - ExprData::ExprRecordLit { .. } => match tn { - Some(name) => ((name.clone().as_str() == "Some".to_string().as_str()) || (name.clone().as_str() == "None".to_string().as_str())), - None => false, -}, - ExprData::ExprFieldAccess { summary: fa_summary, .. } => { - let b = field_access_base(texpr.clone()); -let summary_says_optional = match fa_summary.clone() { - Some(fs) => match fs.value_shape.clone() { - FieldValueShape::OptionalValue => true, - _ => false, -}, - None => false, -}; -if summary_says_optional { - true - } else { - match b.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: base_type, .. }) => { - let resolved_base = base_type.clone(); -if is_optional_struct_field(emit_info, authored_name_at(scope.type_env.clone().source_indices.clone(), &resolved_base), f) { - true - } else { - match texpr.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => (rt.return_cardinality.clone() == Cardinality::CardOptional), - _ => false, -} + let n = expr_var_name_at(texpr.clone(), si.clone()); + let tn = record_lit_type_name_at(texpr.clone(), si.clone()); + let f = field_access_field_at(texpr.clone(), si.clone()); + match (*texpr.expr_data.clone()).clone() { + ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitNull => true, + _ => false, + }, + ExprData::ExprVar { .. } => { + if ((n.clone().as_str() == "none".to_string().as_str()) + || (n.clone().as_str() == "None".to_string().as_str())) + { + true + } else { + match texpr.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + (rt.return_cardinality.clone() == Cardinality::CardOptional) + } + _ => match v2_rt::map_get(&scope.locals.clone(), n.clone()) { + Some(binding) => { + (binding.resolved.clone().return_cardinality.clone() + == Cardinality::CardOptional) + } + None => false, + }, } -}, - _ => match texpr.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => (rt.return_cardinality.clone() == Cardinality::CardOptional), - _ => false, -}, -} + } } -}, - _ => match texpr.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => (rt.return_cardinality.clone() == Cardinality::CardOptional), - _ => false, -}, -} -} + ExprData::ExprRecordLit { .. } => match tn { + Some(name) => { + ((name.clone().as_str() == "Some".to_string().as_str()) + || (name.clone().as_str() == "None".to_string().as_str())) + } + None => false, + }, + ExprData::ExprFieldAccess { + summary: fa_summary, + .. + } => { + let b = field_access_base(texpr.clone()); + let summary_says_optional = match fa_summary.clone() { + Some(fs) => match fs.value_shape.clone() { + FieldValueShape::OptionalValue => true, + _ => false, + }, + None => false, + }; + if summary_says_optional { + true + } else { + match b.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { + node: base_type, .. + }) => { + let resolved_base = base_type.clone(); + if is_optional_struct_field( + emit_info, + authored_name_at( + scope.type_env.clone().source_indices.clone(), + &resolved_base, + ), + f, + ) { + true + } else { + match texpr.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + (rt.return_cardinality.clone() == Cardinality::CardOptional) + } + _ => false, + } + } + } + _ => match texpr.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + (rt.return_cardinality.clone() == Cardinality::CardOptional) + } + _ => false, + }, + } + } + } + _ => match texpr.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + (rt.return_cardinality.clone() == Cardinality::CardOptional) + } + _ => false, + }, + } + } } -pub fn lookup_struct_field_type_name(struct_node: &Rc, field_name: &String, variant_name: Option, source_indices: &Rc>>) -> Option { - { - let direct = match find_child_named(struct_node.clone(), field_name.clone(), source_indices.clone()) { - Some(field_child) => if (field_child.inferred.clone() != None) { - { - let field_type = resolved_type(field_child.clone()); -let ft_is_type_var = if (field_type.inferred.clone() != None) { - is_type_variable(field_type.inferred.clone().clone().unwrap()) - } else { - false - }; -if ((field_type.ident_span.clone() != None) && !ft_is_type_var.clone()) { - Some(authored_name_at(source_indices.clone(), &field_type)) +pub fn lookup_struct_field_type_name( + struct_node: &Rc, + field_name: &String, + variant_name: Option, + source_indices: &Rc>>, +) -> Option { + { + let direct = match find_child_named( + struct_node.clone(), + field_name.clone(), + source_indices.clone(), + ) { + Some(field_child) => { + if (field_child.inferred.clone() != None) { + { + let field_type = resolved_type(field_child.clone()); + let ft_is_type_var = if (field_type.inferred.clone() != None) { + is_type_variable(field_type.inferred.clone().clone().unwrap()) + } else { + false + }; + if ((field_type.ident_span.clone() != None) && !ft_is_type_var.clone()) { + Some(authored_name_at(source_indices.clone(), &field_type)) + } else { + None + } + } } else { None } -} - } else { - None - }, - None => None, -}; -match direct.clone() { - Some(_) => direct.clone(), - None => match variant_name { - Some(vn) => match find_child_named(struct_node.clone(), vn.clone(), source_indices.clone()) { - Some(variant_child) => match find_child_named(variant_child.clone(), field_name.clone(), source_indices.clone()) { - Some(field_child) => if (field_child.inferred.clone() != None) { - { - let field_type = resolved_type(field_child.clone()); -let ft_is_type_var = if (field_type.inferred.clone() != None) { - is_type_variable(field_type.inferred.clone().clone().unwrap()) - } else { - false - }; -if ((field_type.ident_span.clone() != None) && !ft_is_type_var.clone()) { - Some(authored_name_at(source_indices.clone(), &field_type)) - } else { - None + } + None => None, + }; + match direct.clone() { + Some(_) => direct.clone(), + None => match variant_name { + Some(vn) => { + match find_child_named(struct_node.clone(), vn.clone(), source_indices.clone()) + { + Some(variant_child) => match find_child_named( + variant_child.clone(), + field_name.clone(), + source_indices.clone(), + ) { + Some(field_child) => { + if (field_child.inferred.clone() != None) { + { + let field_type = resolved_type(field_child.clone()); + let ft_is_type_var = + if (field_type.inferred.clone() != None) { + is_type_variable( + field_type.inferred.clone().clone().unwrap(), + ) + } else { + false + }; + if ((field_type.ident_span.clone() != None) + && !ft_is_type_var.clone()) + { + Some(authored_name_at( + source_indices.clone(), + &field_type, + )) + } else { + None + } + } + } else { + None + } + } + None => None, + }, + None => None, + } } -} - } else { - None - }, - None => None, -}, - None => None, -}, - None => None, -}, -} -} + None => None, + }, + } + } } -pub fn emit_field_value_with_context(field_value: &Rc, struct_node: &Rc, outer_type_name: Option, field_name: &String, registry: Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { +pub fn emit_field_value_with_context( + field_value: &Rc, + struct_node: &Rc, + outer_type_name: Option, + field_name: &String, + registry: Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { match (*field_value.expr_data.clone()).clone() { - ExprData::ExprRecordLit { parent_enum: pe, .. } => { - let inner_fields = field_value.children.clone(); -let tn = record_lit_type_name_at(field_value.clone(), scope.type_env.clone().source_indices.clone()); -match tn.clone() { - Some(variant_name) => { - let node_lookup = lookup_struct_field_type_name(&struct_node, &field_name, outer_type_name, &scope.type_env.clone().source_indices.clone()); -let expected_type = match node_lookup.clone() { - Some(_) => node_lookup.clone(), - None => if (struct_node.ident_span.clone() != None) { - match lookup_emit_type_summary(emit_info.clone(), authored_name_at(scope.type_env.clone().source_indices.clone(), &struct_node)) { - Some(summary) => v2_rt::map_get(&summary.field_type_map.clone(), field_name.clone()), - None => None, -} - } else { - None - }, -}; -let corrected_parent = match expected_type { - Some(et) => if variant_belongs_to_enum(emit_info.type_summaries.clone(), variant_name.clone(), et.clone()) { - Some(et.clone()) - } else { - pe.clone() - }, - None => pe.clone(), -}; -let raw = emit_typed_record_lit(&tn, &inner_fields, &corrected_parent, &resolved_type(field_value.clone()), registry, &scope, depth, &shared_types, &emit_info); -let rc_name = match corrected_parent.clone() { - Some(en) => en.clone(), - None => variant_name.clone(), -}; -if ((rc_name.clone().as_str() != "".to_string().as_str()) && set_contains(shared_types.clone(), rc_name.clone())) { - v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) - } else { - raw + ExprData::ExprRecordLit { + parent_enum: pe, .. + } => { + let inner_fields = field_value.children.clone(); + let tn = record_lit_type_name_at( + field_value.clone(), + scope.type_env.clone().source_indices.clone(), + ); + match tn.clone() { + Some(variant_name) => { + let node_lookup = lookup_struct_field_type_name( + &struct_node, + &field_name, + outer_type_name, + &scope.type_env.clone().source_indices.clone(), + ); + let expected_type = match node_lookup.clone() { + Some(_) => node_lookup.clone(), + None => { + if (struct_node.ident_span.clone() != None) { + match lookup_emit_type_summary( + emit_info.clone(), + authored_name_at( + scope.type_env.clone().source_indices.clone(), + &struct_node, + ), + ) { + Some(summary) => v2_rt::map_get( + &summary.field_type_map.clone(), + field_name.clone(), + ), + None => None, + } + } else { + None + } + } + }; + let corrected_parent = match expected_type { + Some(et) => { + if variant_belongs_to_enum( + emit_info.type_summaries.clone(), + variant_name.clone(), + et.clone(), + ) { + Some(et.clone()) + } else { + pe.clone() + } + } + None => pe.clone(), + }; + let raw = emit_typed_record_lit( + &tn, + &inner_fields, + &corrected_parent, + &resolved_type(field_value.clone()), + registry, + &scope, + depth, + &shared_types, + &emit_info, + ); + let rc_name = match corrected_parent.clone() { + Some(en) => en.clone(), + None => variant_name.clone(), + }; + if ((rc_name.clone().as_str() != "".to_string().as_str()) + && emit_map_has(shared_types.clone(), rc_name.clone())) + { + v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), raw), ")".to_string()) + } else { + raw + } + } + None => emit_typed_expr( + field_value.clone(), + registry, + &scope, + depth, + shared_types.clone(), + emit_info.clone(), + 1024, + ), } -}, - None => emit_typed_expr(field_value.clone(), registry, &scope, depth, shared_types.clone(), emit_info.clone(), 1024), -} -}, - _ => emit_typed_expr(field_value.clone(), registry, &scope, depth, shared_types.clone(), emit_info.clone(), 1024), -} + } + _ => emit_typed_expr( + field_value.clone(), + registry, + &scope, + depth, + shared_types.clone(), + emit_info.clone(), + 1024, + ), + } } -pub fn find_struct_name_by_fields(field_names: &Rc>, type_summaries: Rc>>) -> Option { +pub fn find_struct_name_by_fields( + field_names: &Rc>, + type_summaries: Rc>>, +) -> Option { { let n_fields = (field_names.clone().len() as i64); -if (n_fields.clone() == 0) { - return None - } -let candidates = Rc::new({ let mut __result = Vec::new(); for summary in Rc::new(v2_rt::map_values(&type_summaries)).iter().cloned() { if match (*summary.repr.clone()).clone() { - TypeRepr::StructRepr => { - let ftm_keys = Rc::new(v2_rt::map_keys(&summary.field_type_map.clone())); -if ((ftm_keys.clone().len() as i64) == n_fields.clone()) { - { let mut __all = true; for fn_name in field_names.clone().iter().cloned() { if !(v2_rt::map_contains_key(&summary.field_type_map.clone(), fn_name.clone())) { __all = false; break; } } __all } - } else { - false + if (n_fields.clone() == 0) { + return None; + } + let candidates = Rc::new({ + let mut __result = Vec::new(); + for summary in Rc::new(v2_rt::map_values(&type_summaries)).iter().cloned() { + if match (*summary.repr.clone()).clone() { + TypeRepr::StructRepr => { + let ftm_keys = Rc::new(v2_rt::map_keys(&summary.field_type_map.clone())); + if ((ftm_keys.clone().len() as i64) == n_fields.clone()) { + { + let mut __all = true; + for fn_name in field_names.clone().iter().cloned() { + if !(v2_rt::map_contains_key( + &summary.field_type_map.clone(), + fn_name.clone(), + )) { + __all = false; + break; + } + } + __all + } + } else { + false + } + } + _ => false, + } { + __result.push(summary); + } } -}, - _ => false, -} { __result.push(summary); } } __result }); -match candidates.first().cloned() { - Some(s) => Some(s.name.clone()), - None => None, -} -} + __result + }); + match candidates.first().cloned() { + Some(s) => Some(s.name.clone()), + None => None, + } + } } -pub fn emit_typed_record_lit(type_name: &Option, fields: &Rc>>, parent_enum: &Option, resolved_type: &Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { - { - let struct_name = explicit_record_struct_name(type_name.clone(), &resolved_type, shared_types.clone(), scope.type_env.clone().source_indices.clone()); -let qualified_name = match struct_name { - Some(sn) => Some(sn.clone()), - None => { - let rt_name = authored_name_at(scope.type_env.clone().source_indices.clone(), &resolved_type); -if ((resolved_type.ident_span.clone() != None) && v2_rt::map_contains_key(&emit_info.type_summaries.clone(), rt_name.clone())) { - Some(rt_name.clone()) - } else { - None - } -}, -}; -match qualified_name { - None => { - let is_product = is_product_type(resolved_type.clone()); -if (is_product && (resolved_type.ident_span.clone() == None)) { - if ((fields.clone().len() as i64) == 1) { - match fields.clone().first().cloned() { - Some(f) => emit_typed_expr(field_init_node_value(&f), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024), - None => "compile_error!(\"empty anonymous record literal\")".to_string(), -} +pub fn emit_typed_record_lit( + type_name: &Option, + fields: &Rc>>, + parent_enum: &Option, + resolved_type: &Rc, + registry: Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { + { + let struct_name = explicit_record_struct_name( + type_name.clone(), + &resolved_type, + shared_types.clone(), + scope.type_env.clone().source_indices.clone(), + ); + let qualified_name = match struct_name { + Some(sn) => Some(sn.clone()), + None => { + let rt_name = authored_name_at( + scope.type_env.clone().source_indices.clone(), + &resolved_type, + ); + if ((resolved_type.ident_span.clone() != None) + && v2_rt::map_contains_key(&emit_info.type_summaries.clone(), rt_name.clone())) + { + Some(rt_name.clone()) } else { - { - let lit_field_names = Rc::new({ let mut __result = Vec::new(); for f in fields.clone().iter().cloned() { __result.push(field_init_node_name_at(f.clone(), scope.type_env.clone().source_indices.clone())); } __result }); -match find_struct_name_by_fields(&lit_field_names, emit_info.type_summaries.clone()) { - Some(resolved_sn) => { - let field_strs = Rc::new({ let mut __result = Vec::new(); for f in fields.clone().iter().cloned() { __result.push({ - let fname = field_init_node_name_at(f.clone(), scope.type_env.clone().source_indices.clone()); -let fval = emit_typed_expr(field_init_node_value(&f), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), emit_ident(fname.clone(), RenderTarget::Rust)), ": ".to_string()), fval.clone()), ",".to_string()) -}); } __result }); -let body = field_strs.join(&"\n".to_string()); -let struct_lit = v2_rt::concat(v2_rt::concat(v2_rt::concat(resolved_sn.clone(), " {\n".to_string()), body), "\n}".to_string()); -if set_contains(shared_types.clone(), resolved_sn.clone()) { - v2_rt::concat(v2_rt::concat("Rc::new(".to_string(), struct_lit), ")".to_string()) - } else { - struct_lit - } -}, - None => { - let vals = Rc::new({ let mut __result = Vec::new(); for f in fields.clone().iter().cloned() { __result.push(emit_typed_expr(field_init_node_value(&f), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024)); } __result }); -v2_rt::concat(v2_rt::concat("(".to_string(), vals.join(&", ".to_string())), ")".to_string()) -}, -} -} + None } - } else { - "compile_error!(\"cannot resolve anonymous record type in emitter\")".to_string() } -}, - Some(tn) => { - let si = scope.type_env.clone().source_indices.clone(); -let context_lookup = contextual_variant_parent(&tn, parent_enum.clone(), &resolved_type, emit_info.clone(), si.clone()); -let effective_parent = match context_lookup { - Some(context_parent) => Some(context_parent.clone()), - None => { - let rt_is_type_var = if (resolved_type.inferred.clone() != None) { - is_type_variable(resolved_type.inferred.clone().clone().unwrap()) + }; + match qualified_name { + None => { + let is_product = is_product_type(resolved_type.clone()); + if (is_product && (resolved_type.ident_span.clone() == None)) { + if ((fields.clone().len() as i64) == 1) { + match fields.clone().first().cloned() { + Some(f) => emit_typed_expr( + field_init_node_value(&f), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ), + None => { + "compile_error!(\"empty anonymous record literal\")".to_string() + } + } + } else { + { + let lit_field_names = Rc::new({ + let mut __result = Vec::new(); + for f in fields.clone().iter().cloned() { + __result.push(field_init_node_name_at( + f.clone(), + scope.type_env.clone().source_indices.clone(), + )); + } + __result + }); + match find_struct_name_by_fields( + &lit_field_names, + emit_info.type_summaries.clone(), + ) { + Some(resolved_sn) => { + let field_strs = Rc::new({ + let mut __result = Vec::new(); + for f in fields.clone().iter().cloned() { + __result.push({ + let fname = field_init_node_name_at( + f.clone(), + scope.type_env.clone().source_indices.clone(), + ); + let fval = emit_typed_expr( + field_init_node_value(&f), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + " ".to_string(), + emit_ident( + fname.clone(), + RenderTarget::Rust, + ), + ), + ": ".to_string(), + ), + fval.clone(), + ), + ",".to_string(), + ) + }); + } + __result + }); + let body = field_strs.join(&"\n".to_string()); + let struct_lit = v2_rt::concat( + v2_rt::concat( + v2_rt::concat(resolved_sn.clone(), " {\n".to_string()), + body, + ), + "\n}".to_string(), + ); + if emit_map_has(shared_types.clone(), resolved_sn.clone()) { + v2_rt::concat( + v2_rt::concat("Rc::new(".to_string(), struct_lit), + ")".to_string(), + ) + } else { + struct_lit + } + } + None => { + let vals = Rc::new({ + let mut __result = Vec::new(); + for f in fields.clone().iter().cloned() { + __result.push(emit_typed_expr( + field_init_node_value(&f), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + )); + } + __result + }); + v2_rt::concat( + v2_rt::concat( + "(".to_string(), + vals.join(&", ".to_string()), + ), + ")".to_string(), + ) + } + } + } + } } else { - false + "compile_error!(\"cannot resolve anonymous record type in emitter\")" + .to_string() + } + } + Some(tn) => { + let si = scope.type_env.clone().source_indices.clone(); + let context_lookup = contextual_variant_parent( + &tn, + parent_enum.clone(), + &resolved_type, + emit_info.clone(), + si.clone(), + ); + let effective_parent = match context_lookup { + Some(context_parent) => Some(context_parent.clone()), + None => { + let rt_is_type_var = if (resolved_type.inferred.clone() != None) { + is_type_variable(resolved_type.inferred.clone().clone().unwrap()) + } else { + false + }; + let rt_name = authored_name_at(si.clone(), &resolved_type); + if ((((resolved_type.ident_span.clone() != None) + && (rt_name.clone().as_str() != tn.clone().as_str())) + && !rt_is_type_var) + && (rt_name.clone().as_str() != "Error".to_string().as_str())) + { + Some(rt_name.clone()) + } else { + parent_enum.clone() + } + } }; -let rt_name = authored_name_at(si.clone(), &resolved_type); -if ((((resolved_type.ident_span.clone() != None) && (rt_name.clone().as_str() != tn.clone().as_str())) && !rt_is_type_var) && (rt_name.clone().as_str() != "Error".to_string().as_str())) { - Some(rt_name.clone()) + let display_tn = if ((tn.clone().as_str() == "Some".to_string().as_str()) + || (tn.clone().as_str() == "None".to_string().as_str())) + { + tn.clone() } else { - parent_enum.clone() - } -}, -}; -let display_tn = if ((tn.clone().as_str() == "Some".to_string().as_str()) || (tn.clone().as_str() == "None".to_string().as_str())) { - tn.clone() - } else { - match effective_parent { - Some(resolved_parent_enum) => v2_rt::concat(v2_rt::concat(resolved_parent_enum.clone(), "::".to_string()), tn.clone()), - None => tn.clone(), -} - }; -if ((tn.clone().as_str() == "Some".to_string().as_str()) && ((fields.clone().len() as i64) == 1)) { - match fields.clone().first().cloned() { - Some(f) => { - let inner = emit_typed_expr(field_init_node_value(&f), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -v2_rt::concat(v2_rt::concat("Some(".to_string(), inner), ")".to_string()) -}, - None => v2_rt::concat(display_tn.clone(), " {}".to_string()), -} - } else { - if ((fields.clone().len() as i64) == 0) { - { - let empty_raw = v2_rt::concat(display_tn.clone(), " {}".to_string()); -let record_parent_enum = match parent_enum.clone() { - Some(en) => en.clone(), - None => "".to_string(), -}; -empty_raw -} + match effective_parent { + Some(resolved_parent_enum) => v2_rt::concat( + v2_rt::concat(resolved_parent_enum.clone(), "::".to_string()), + tn.clone(), + ), + None => tn.clone(), + } + }; + if ((tn.clone().as_str() == "Some".to_string().as_str()) + && ((fields.clone().len() as i64) == 1)) + { + match fields.clone().first().cloned() { + Some(f) => { + let inner = emit_typed_expr( + field_init_node_value(&f), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + v2_rt::concat( + v2_rt::concat("Some(".to_string(), inner), + ")".to_string(), + ) + } + None => v2_rt::concat(display_tn, " {}".to_string()), + } } else { - if (((fields.clone().len() as i64) == 1) && set_contains(emit_info.untagged_json_tuple_variants.clone(), display_tn.clone())) { - match fields.clone().first().cloned() { - Some(f) => { - let f_name = field_init_node_name_at(f.clone(), scope.type_env.clone().source_indices.clone()); -let f_value = field_init_node_value(&f); -let val_str = emit_field_value_with_context(&f_value, &resolved_type, type_name.clone(), &f_name, registry.clone(), &scope, depth.clone(), &shared_types, &emit_info); -let needs_wrap = (is_optional_struct_field(emit_info.clone(), tn.clone(), f_name.clone()) && (is_already_optional(&f_value, emit_info.clone(), &scope) == false)); -let field_val = if needs_wrap.clone() { - v2_rt::concat(v2_rt::concat("Some(".to_string(), val_str.clone()), ")".to_string()) - } else { - val_str.clone() + if ((fields.clone().len() as i64) == 0) { + { + let empty_raw = v2_rt::concat(display_tn, " {}".to_string()); + let record_parent_enum = match parent_enum.clone() { + Some(en) => en.clone(), + None => "".to_string(), }; -v2_rt::concat(v2_rt::concat(v2_rt::concat(display_tn.clone(), "(".to_string()), field_val.clone()), ")".to_string()) -}, - None => v2_rt::concat(display_tn.clone(), " {}".to_string()), -} + empty_raw + } } else { { - let field_strs = Rc::new({ let mut __result = Vec::new(); for f in fields.clone().iter().cloned() { __result.push({ - let f_name = field_init_node_name_at(f.clone(), scope.type_env.clone().source_indices.clone()); -let f_value = field_init_node_value(&f); -let val_str = emit_field_value_with_context(&f_value, &resolved_type, type_name.clone(), &f_name, registry.clone(), &scope, depth.clone(), &shared_types, &emit_info); -let needs_wrap = (is_optional_struct_field(emit_info.clone(), tn.clone(), f_name.clone()) && (is_already_optional(&f_value, emit_info.clone(), &scope) == false)); -let field_val = if needs_wrap.clone() { - v2_rt::concat(v2_rt::concat("Some(".to_string(), val_str.clone()), ")".to_string()) + let field_strs = Rc::new({ + let mut __result = Vec::new(); + for f in fields.clone().iter().cloned() { + __result.push({ + let f_name = field_init_node_name_at( + f.clone(), + scope.type_env.clone().source_indices.clone(), + ); + let f_value = field_init_node_value(&f); + let val_str = emit_field_value_with_context( + &f_value, + &resolved_type, + type_name.clone(), + &f_name, + registry.clone(), + &scope, + depth.clone(), + &shared_types, + &emit_info, + ); + let needs_wrap = (is_optional_struct_field( + emit_info.clone(), + tn.clone(), + f_name.clone(), + ) && (is_already_optional( + &f_value, + emit_info.clone(), + &scope, + ) == false)); + let field_val = if needs_wrap.clone() { + v2_rt::concat( + v2_rt::concat("Some(".to_string(), val_str.clone()), + ")".to_string(), + ) + } else { + val_str.clone() + }; + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + " ".to_string(), + emit_ident( + f_name.clone(), + RenderTarget::Rust, + ), + ), + ": ".to_string(), + ), + field_val.clone(), + ), + ",".to_string(), + ) + }); + } + __result + }); + let provided_names = Rc::new({ + let mut __result = Vec::new(); + for f in fields.clone().iter().cloned() { + __result.push(field_init_node_name_at( + f.clone(), + scope.type_env.clone().source_indices.clone(), + )); + } + __result + }); + let provided_set = provided_names.iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, n: String| { + v2_rt::rc_map_insert(acc, n.clone(), true) + }, + ); + let summary = lookup_emit_type_summary(emit_info.clone(), tn.clone()); + let default_strs = match summary { + Some(s) => { + let fs = s.field_summaries.clone(); + let ftm = s.field_type_map.clone(); + let missing = Rc::new({ + let mut __result = Vec::new(); + for k in Rc::new(v2_rt::map_keys(&fs)).iter().cloned() { + if !emit_map_has(provided_set.clone(), k.clone()) { + __result.push(k); + } + } + __result + }); + let all_defaultable = { + let mut __all = true; + for fname in missing.clone().iter().cloned() { + if !({ + let has_zv = + match v2_rt::map_get(&ftm, fname.clone()) { + Some(ft) => match rust_zero_value(&ft) { + Some(_) => true, + None => false, + }, + None => false, + }; + (has_zv.clone() + || is_optional_struct_field( + emit_info.clone(), + tn.clone(), + fname.clone(), + )) + }) { + __all = false; + break; + } + } + __all + }; + if all_defaultable { + Rc::new({ + let mut __result = Vec::new(); + for fname in missing.clone().iter().cloned() { + __result.extend((*if is_optional_struct_field(emit_info.clone(), tn.clone(), fname.clone()) { + Rc::new(vec![v2_rt::concat(v2_rt::concat(" ".to_string(), emit_ident(fname.clone(), RenderTarget::Rust)), ": None,".to_string())]) } else { - val_str.clone() - }; -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), emit_ident(f_name.clone(), RenderTarget::Rust)), ": ".to_string()), field_val.clone()), ",".to_string()) -}); } __result }); -let provided_names = Rc::new({ let mut __result = Vec::new(); for f in fields.clone().iter().cloned() { __result.push(field_init_node_name_at(f.clone(), scope.type_env.clone().source_indices.clone())); } __result }); -let provided_set = provided_names.iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, n: String| v2_rt::rc_map_insert(acc, n.clone(), true)); -let summary = lookup_emit_type_summary(emit_info.clone(), tn.clone()); -let default_strs = match summary { - Some(s) => { - let fs = s.field_summaries.clone(); -let ftm = s.field_type_map.clone(); -let missing = Rc::new({ let mut __result = Vec::new(); for k in Rc::new(v2_rt::map_keys(&fs)).iter().cloned() { if !emit_map_has(provided_set.clone(), k.clone()) { __result.push(k); } } __result }); -let all_defaultable = { let mut __all = true; for fname in missing.clone().iter().cloned() { if !({ - let has_zv = match v2_rt::map_get(&ftm, fname.clone()) { - Some(ft) => match rust_zero_value(&ft) { - Some(_) => true, - None => false, -}, - None => false, -}; -(has_zv.clone() || is_optional_struct_field(emit_info.clone(), tn.clone(), fname.clone())) -}) { __all = false; break; } } __all }; -if all_defaultable { - Rc::new({ let mut __result = Vec::new(); for fname in missing.clone().iter().cloned() { __result.extend((*if is_optional_struct_field(emit_info.clone(), tn.clone(), fname.clone()) { - Rc::new(vec![v2_rt::concat(v2_rt::concat(" ".to_string(), emit_ident(fname.clone(), RenderTarget::Rust)), ": None,".to_string())]) - } else { - match v2_rt::map_get(&ftm, fname.clone()) { + match v2_rt::map_get(&ftm, fname.clone()) { Some(ft) => match rust_zero_value(&ft) { Some(zv) => Rc::new(vec![v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), emit_ident(fname.clone(), RenderTarget::Rust)), ": ".to_string()), zv.clone()), ",".to_string())]), None => Rc::new(vec![]), }, None => Rc::new(vec![]), } - }).iter().cloned()); } __result }) - } else { - Rc::new(vec![]) + }).iter().cloned()); + } + __result + }) + } else { + Rc::new(vec![]) + } } -}, - None => Rc::new(vec![]), -}; -let all_field_strs = v2_rt::concat(field_strs, default_strs); -let fields_str = all_field_strs.join(&"\n".to_string()); -let raw = v2_rt::concat(v2_rt::concat(v2_rt::concat(display_tn.clone(), " {\n".to_string()), fields_str), "\n}".to_string()); -raw -} + None => Rc::new(vec![]), + }; + let all_field_strs = v2_rt::concat(field_strs, default_strs); + let fields_str = all_field_strs.join(&"\n".to_string()); + let raw = v2_rt::concat( + v2_rt::concat( + v2_rt::concat(display_tn, " {\n".to_string()), + fields_str, + ), + "\n}".to_string(), + ); + raw + } } } } -}, -} -} + } + } } pub fn rust_zero_value(type_name: &String) -> Option { @@ -4621,7 +10686,10 @@ pub fn rust_zero_value(type_name: &String) -> Option { Some("false".to_string()) } else { if (type_name.clone().as_str() == "String".to_string().as_str()) { - Some(v2_rt::concat("\"\"".to_string(), ".to_string()".to_string())) + Some(v2_rt::concat( + "\"\"".to_string(), + ".to_string()".to_string(), + )) } else { None } @@ -4629,330 +10697,1058 @@ pub fn rust_zero_value(type_name: &String) -> Option { } } -pub fn emit_typed_bin_op(op: &BinOp, algebra_field: Option, left: &Rc, right: &Rc, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc) -> String { - { - let l_str = emit_typed_expr(left.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let r_str = emit_typed_expr(right.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -if is_null_coalesce(op.clone()) { +pub fn emit_typed_bin_op( + op: &BinOp, + algebra_field: Option, + left: &Rc, + right: &Rc, + registry: &Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { + { + let l_str = emit_typed_expr( + left.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let r_str = emit_typed_expr( + right.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + if is_null_coalesce(op.clone()) { emit_null_coalesce(l_str, r_str, RenderTarget::Rust) } else { { let op_str = emit_bin_op_symbol(op.clone(), &RenderTarget::Rust, algebra_field); -if is_string_comparison(op.clone(), left.clone(), right.clone(), &scope.type_env.clone().source_indices.clone()) { + if is_string_comparison( + op.clone(), + left.clone(), + right.clone(), + &scope.type_env.clone().source_indices.clone(), + ) { { let l_optional = is_optional_typed_expr(left.clone()); -let r_optional = is_optional_typed_expr(right.clone()); -if (l_optional.clone() || r_optional.clone()) { + let r_optional = is_optional_typed_expr(right.clone()); + if (l_optional.clone() || r_optional.clone()) { { let l_cmp = if l_optional.clone() { v2_rt::concat(l_str, ".as_deref()".to_string()) } else { - v2_rt::concat(v2_rt::concat("Some(".to_string(), l_str), ".as_str())".to_string()) + v2_rt::concat( + v2_rt::concat("Some(".to_string(), l_str), + ".as_str())".to_string(), + ) }; -let r_cmp = if r_optional.clone() { + let r_cmp = if r_optional.clone() { v2_rt::concat(r_str, ".as_deref()".to_string()) } else { - v2_rt::concat(v2_rt::concat("Some(".to_string(), r_str), ".as_str())".to_string()) + v2_rt::concat( + v2_rt::concat("Some(".to_string(), r_str), + ".as_str())".to_string(), + ) }; -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("(".to_string(), l_cmp), " ".to_string()), op_str), " ".to_string()), r_cmp), ")".to_string()) -} + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("(".to_string(), l_cmp), + " ".to_string(), + ), + op_str, + ), + " ".to_string(), + ), + r_cmp, + ), + ")".to_string(), + ) + } } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("(".to_string(), l_str), ".as_str() ".to_string()), op_str), " ".to_string()), r_str), ".as_str())".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("(".to_string(), l_str), + ".as_str() ".to_string(), + ), + op_str, + ), + " ".to_string(), + ), + r_str, + ), + ".as_str())".to_string(), + ) } -} + } } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("(".to_string(), l_str), " ".to_string()), op_str), " ".to_string()), r_str), ")".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("(".to_string(), l_str), + " ".to_string(), + ), + op_str, + ), + " ".to_string(), + ), + r_str, + ), + ")".to_string(), + ) } -} + } } -} + } } pub fn is_optional_typed_expr(e: Rc) -> bool { match e.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => (rt.return_cardinality.clone() == Cardinality::CardOptional), - _ => false, -} + Some(InferredNode::Resolved { node: rt, .. }) => { + (rt.return_cardinality.clone() == Cardinality::CardOptional) + } + _ => false, + } } -pub fn is_string_comparison(op: BinOp, left: Rc, right: Rc, source_indices: &Rc>>) -> bool { +pub fn is_string_comparison( + op: BinOp, + left: Rc, + right: Rc, + source_indices: &Rc>>, +) -> bool { match op { - BinOp::Eq => (is_string_typed_expr(left, source_indices.clone()) && is_string_typed_expr(right, source_indices.clone())), - BinOp::Ne => (is_string_typed_expr(left, source_indices.clone()) && is_string_typed_expr(right, source_indices.clone())), - _ => false, -} + BinOp::Eq => { + (is_string_typed_expr(left, source_indices.clone()) + && is_string_typed_expr(right, source_indices.clone())) + } + BinOp::Ne => { + (is_string_typed_expr(left, source_indices.clone()) + && is_string_typed_expr(right, source_indices.clone())) + } + _ => false, + } } -pub fn is_string_typed_expr(e: Rc, source_indices: Rc>>) -> bool { +pub fn is_string_typed_expr( + e: Rc, + source_indices: Rc>>, +) -> bool { match e.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - let is_optional = (rt.return_cardinality.clone() == Cardinality::CardOptional); -let inner = if is_optional { - with_required_cardinality(&rt) - } else { - rt.clone() - }; -is_rust_string_like(inner, source_indices) -}, - _ => false, -} + Some(InferredNode::Resolved { node: rt, .. }) => { + let is_optional = (rt.return_cardinality.clone() == Cardinality::CardOptional); + let inner = if is_optional { + with_required_cardinality(&rt) + } else { + rt.clone() + }; + is_rust_string_like(inner, source_indices) + } + _ => false, + } } -pub fn emit_typed_string_interp(parts: &Rc>>, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { - { - let has_interpolations = { let mut __found = false; for p in parts.clone().iter().cloned() { if match (*p.clone()).clone() { - StringPart::Interpolation { .. } => true, - _ => false, -} { __found = true; break; } } __found }; -let fmt_parts = Rc::new({ let mut __result = Vec::new(); for p in parts.clone().iter().cloned() { __result.push(typed_interp_format_part(p.clone(), registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone(), has_interpolations.clone())); } __result }); -let fmt_str = Rc::new({ let mut __result = Vec::new(); for p in fmt_parts.clone().iter().cloned() { __result.push(p.format_segment.clone()); } __result }).join(&"".to_string()); -let args = Rc::new({ let mut __result = Vec::new(); for a in Rc::new({ let mut __result = Vec::new(); for p in fmt_parts.clone().iter().cloned() { __result.push(p.arg_expr.clone()); } __result }).iter().cloned() { if (a.clone().as_str() != "".to_string().as_str()) { __result.push(a); } } __result }); -if ((args.clone().len() as i64) == 0) { - v2_rt::concat(v2_rt::concat("\"".to_string(), fmt_str), "\".to_string()".to_string()) +pub fn emit_typed_string_interp( + parts: &Rc>>, + registry: Rc>>, + scope: Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { + { + let has_interpolations = { + let mut __found = false; + for p in parts.clone().iter().cloned() { + if match (*p.clone()).clone() { + StringPart::Interpolation { .. } => true, + _ => false, + } { + __found = true; + break; + } + } + __found + }; + let fmt_parts = Rc::new({ + let mut __result = Vec::new(); + for p in parts.clone().iter().cloned() { + __result.push(typed_interp_format_part( + p.clone(), + registry.clone(), + scope.clone(), + depth.clone(), + shared_types.clone(), + emit_info.clone(), + has_interpolations.clone(), + )); + } + __result + }); + let fmt_str = Rc::new({ + let mut __result = Vec::new(); + for p in fmt_parts.clone().iter().cloned() { + __result.push(p.format_segment.clone()); + } + __result + }) + .join(&"".to_string()); + let args = Rc::new({ + let mut __result = Vec::new(); + for a in Rc::new({ + let mut __result = Vec::new(); + for p in fmt_parts.clone().iter().cloned() { + __result.push(p.arg_expr.clone()); + } + __result + }) + .iter() + .cloned() + { + if (a.clone().as_str() != "".to_string().as_str()) { + __result.push(a); + } + } + __result + }); + if ((args.clone().len() as i64) == 0) { + v2_rt::concat( + v2_rt::concat("\"".to_string(), fmt_str), + "\".to_string()".to_string(), + ) } else { { let args_str = args.clone().join(&", ".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("format!(\"".to_string(), fmt_str), "\", ".to_string()), args_str), ")".to_string()) -} + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("format!(\"".to_string(), fmt_str), + "\", ".to_string(), + ), + args_str, + ), + ")".to_string(), + ) + } } -} + } } -pub fn typed_interp_format_part(part: Rc, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc, has_interpolations: bool) -> Rc { +pub fn typed_interp_format_part( + part: Rc, + registry: Rc>>, + scope: Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, + has_interpolations: bool, +) -> Rc { match (*part).clone() { - StringPart::Text { value: v, .. } => { - let escaped = if has_interpolations { - escape_rust_interp_text(v.clone()) - } else { - escape_string_literal_body(v.clone()) - }; -Rc::new(InterpPart { - format_segment: escaped, - arg_expr: "".to_string(), -}) -}, - StringPart::Interpolation { expr: e, .. } => Rc::new(InterpPart { - format_segment: "{}".to_string(), - arg_expr: emit_typed_expr(e.clone(), registry, &scope, depth, shared_types, emit_info, 1024), -}), -} + StringPart::Text { value: v, .. } => { + let escaped = if has_interpolations { + escape_rust_interp_text(v.clone()) + } else { + escape_string_literal_body(v.clone()) + }; + Rc::new(InterpPart { + format_segment: escaped, + arg_expr: "".to_string(), + }) + } + StringPart::Interpolation { expr: e, .. } => Rc::new(InterpPart { + format_segment: "{}".to_string(), + arg_expr: emit_typed_expr( + e.clone(), + registry, + &scope, + depth, + shared_types, + emit_info, + 1024, + ), + }), + } } -pub fn emit_typed_block(stmts: Rc>>, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { - { - let state = emit_rust_block_stmts(stmts, Rc::new(vec![]), scope, registry, (depth.clone() + 1), shared_types, emit_info); -v2_rt::concat(v2_rt::concat(v2_rt::concat("{\n".to_string(), make_indent((depth.clone() + 1))), state.text.clone().join(&"\n".to_string())), "\n}".to_string()) -} +pub fn emit_typed_block( + stmts: Rc>>, + registry: Rc>>, + scope: Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { + { + let state = emit_rust_block_stmts( + stmts, + Rc::new(vec![]), + scope, + registry, + (depth.clone() + 1), + shared_types, + emit_info, + ); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("{\n".to_string(), make_indent((depth.clone() + 1))), + state.text.clone().join(&"\n".to_string()), + ), + "\n}".to_string(), + ) + } } -pub fn emit_tco_init_block_stmts(mut remaining: Rc>>, mut text: Rc>, mut scope: Rc, mut registry: Rc>>, mut depth: i64, mut shared_types: Rc>, mut emit_info: Rc, mut params: Rc>>) -> Rc { +pub fn emit_tco_init_block_stmts( + mut remaining: Rc>>, + mut text: Rc>, + mut scope: Rc, + mut registry: Rc>>, + mut depth: i64, + mut shared_types: Rc>, + mut emit_info: Rc, + mut params: Rc>>, +) -> Rc { loop { match remaining.clone().first().cloned() { - None => { break Rc::new(BlockEmitState { - text: text, - scope: scope.clone(), -}); }, - Some(stmt) => { let rest = Rc::new(remaining.clone().iter().cloned().skip(1 as usize).collect::>()); -match rest.clone().first().cloned() { - None => { break Rc::new(BlockEmitState { - text: text, - scope: scope.clone(), -}); }, - Some(_) => { let line = emit_tco_init_stmt(&stmt, params.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone()); -let next_scope = scope_after_expr(&stmt, &scope); -{ - let __tco_0 = rest.clone(); -let __tco_1 = v2_rt::rc_list_push(text, line); -let __tco_2 = next_scope; -remaining = __tco_0; -text = __tco_1; -scope = __tco_2; -continue; -} }, -} }, -} -} -} - -pub fn emit_tco_init_stmt(stmt: &Rc, params: Rc>>, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { - match (*stmt.expr_data.clone()).clone() { - ExprData::ExprLet => { - let n = let_binding_name_at(stmt.clone(), scope.type_env.clone().source_indices.clone()); -let v = let_value(stmt.clone()); -let val_str = emit_typed_expr(v, registry, &scope, depth, shared_types, emit_info, 1024); -let is_param = { let mut __found = false; for p in params.iter().cloned() { if (param_node_name_at(p.clone(), scope.type_env.clone().source_indices.clone()).as_str() == n.clone().as_str()) { __found = true; break; } } __found }; -if is_param { - v2_rt::concat(v2_rt::concat(v2_rt::concat(emit_ident(n.clone(), RenderTarget::Rust), " = ".to_string()), val_str), ";".to_string()) - } else { - emit_let_binding(n.clone(), val_str, &RenderTarget::Rust) + None => { + break Rc::new(BlockEmitState { + text: text, + scope: scope.clone(), + }); + } + Some(stmt) => { + let rest = Rc::new( + remaining + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + match rest.clone().first().cloned() { + None => { + break Rc::new(BlockEmitState { + text: text, + scope: scope.clone(), + }); + } + Some(_) => { + let line = emit_tco_init_stmt( + &stmt, + params.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ); + let next_scope = scope_after_expr(&stmt, &scope); + { + let __tco_0 = rest.clone(); + let __tco_1 = v2_rt::rc_list_push(text, line); + let __tco_2 = next_scope; + remaining = __tco_0; + text = __tco_1; + scope = __tco_2; + continue; + } + } + } + } } -}, - _ => emit_typed_expr(stmt.clone(), registry, &scope, depth, shared_types, emit_info, 1024), -} + } } -pub fn emit_typed_tco_body(texpr: Rc, fn_name: String, params: Rc>>, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { - { - let inner = emit_typed_tco_expr(texpr, &fn_name, params, registry, scope, (depth.clone() + 1), shared_types, emit_info); -v2_rt::concat(v2_rt::concat(v2_rt::concat("loop {\n".to_string(), make_indent((depth.clone() + 1))), inner), "\n}".to_string()) -} +pub fn emit_tco_init_stmt( + stmt: &Rc, + params: Rc>>, + registry: Rc>>, + scope: &Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { + match (*stmt.expr_data.clone()).clone() { + ExprData::ExprLet => { + let n = + let_binding_name_at(stmt.clone(), scope.type_env.clone().source_indices.clone()); + let v = let_value(stmt.clone()); + let val_str = + emit_typed_expr(v, registry, &scope, depth, shared_types, emit_info, 1024); + let is_param = { + let mut __found = false; + for p in params.iter().cloned() { + if (param_node_name_at( + p.clone(), + scope.type_env.clone().source_indices.clone(), + ) + .as_str() + == n.clone().as_str()) + { + __found = true; + break; + } + } + __found + }; + if is_param { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(emit_ident(n.clone(), RenderTarget::Rust), " = ".to_string()), + val_str, + ), + ";".to_string(), + ) + } else { + emit_let_binding(n.clone(), val_str, &RenderTarget::Rust) + } + } + _ => emit_typed_expr( + stmt.clone(), + registry, + &scope, + depth, + shared_types, + emit_info, + 1024, + ), + } } -pub fn emit_rust_tco_non_self_call(frame: &Rc, registry: Rc>>, shared_types: Rc>, emit_info: Rc) -> String { - match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let f = expr_call_func_at(frame.expr.clone(), frame.scope.clone().type_env.clone().source_indices.clone()); -let call_str = emit_typed_call(&f, &frame.expr.clone().children.clone(), ®istry, &frame.scope.clone(), frame.depth.clone(), &shared_types, &emit_info); -v2_rt::concat(v2_rt::concat("break ".to_string(), call_str), ";".to_string()) -}, - _ => emit_error_expr("emit_rust_tco_non_self_call expected ExprCall".to_string(), RenderTarget::Rust), -} +pub fn emit_typed_tco_body( + texpr: Rc, + fn_name: String, + params: Rc>>, + registry: Rc>>, + scope: Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { + { + let inner = emit_typed_tco_expr( + texpr, + &fn_name, + params, + registry, + scope, + (depth.clone() + 1), + shared_types, + emit_info, + ); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("loop {\n".to_string(), make_indent((depth.clone() + 1))), + inner, + ), + "\n}".to_string(), + ) + } } -pub fn emit_rust_tco_if(frame: &Rc, fn_name: &String, params: &Rc>>, registry: &Rc>>, shared_types: &Rc>, emit_info: &Rc) -> String { +pub fn emit_rust_tco_non_self_call( + frame: &Rc, + registry: Rc>>, + shared_types: Rc>, + emit_info: Rc, +) -> String { match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprIf => { - let c = if_condition(frame.expr.clone()); -let t = if_then_branch(frame.expr.clone()); -let e = if_else_branch(frame.expr.clone()); -let cond_str = emit_typed_expr(c, registry.clone(), &frame.scope.clone(), frame.depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let then_str = emit_typed_tco_expr(t, &fn_name, params.clone(), registry.clone(), frame.scope.clone(), (frame.depth.clone() + 1), shared_types.clone(), emit_info.clone()); -match e { - Some(eb) => { - let else_str = emit_typed_tco_expr(eb.clone(), &fn_name, params.clone(), registry.clone(), frame.scope.clone(), (frame.depth.clone() + 1), shared_types.clone(), emit_info.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("if ".to_string(), cond_str), " {\n".to_string()), make_indent((frame.depth.clone() + 1))), then_str), "\n} else {\n".to_string()), make_indent((frame.depth.clone() + 1))), else_str), "\n}".to_string()) -}, - None => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("if ".to_string(), cond_str), " {\n".to_string()), make_indent((frame.depth.clone() + 1))), then_str), "\n}".to_string()), -} -}, - _ => emit_error_expr("emit_rust_tco_if expected ExprIf".to_string(), RenderTarget::Rust), -} + ExprData::ExprCall { .. } => { + let f = expr_call_func_at( + frame.expr.clone(), + frame.scope.clone().type_env.clone().source_indices.clone(), + ); + let call_str = emit_typed_call( + &f, + &frame.expr.clone().children.clone(), + ®istry, + &frame.scope.clone(), + frame.depth.clone(), + &shared_types, + &emit_info, + ); + v2_rt::concat( + v2_rt::concat("break ".to_string(), call_str), + ";".to_string(), + ) + } + _ => emit_error_expr( + "emit_rust_tco_non_self_call expected ExprCall".to_string(), + RenderTarget::Rust, + ), + } } -pub fn emit_rust_tco_match(frame: &Rc, fn_name: String, params: Rc>>, registry: &Rc>>, shared_types: &Rc>, emit_info: &Rc) -> String { +pub fn emit_rust_tco_if( + frame: &Rc, + fn_name: &String, + params: &Rc>>, + registry: &Rc>>, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprMatch => { - let s = match_scrutinee(frame.expr.clone()); -let arm_list = match_arm_nodes(frame.expr.clone()); -let scrut_str = emit_typed_expr(s.clone(), registry.clone(), &frame.scope.clone(), frame.depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let tco_scrut_type = match s.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => { - let is_optional = (rt.return_cardinality.clone() == Cardinality::CardOptional); -if is_optional { - authored_name_at(frame.scope.clone().type_env.clone().source_indices.clone(), &with_required_cardinality(&rt)) - } else { - authored_name_at(frame.scope.clone().type_env.clone().source_indices.clone(), &rt) + ExprData::ExprIf => { + let c = if_condition(frame.expr.clone()); + let t = if_then_branch(frame.expr.clone()); + let e = if_else_branch(frame.expr.clone()); + let cond_str = emit_typed_expr( + c, + registry.clone(), + &frame.scope.clone(), + frame.depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let then_str = emit_typed_tco_expr( + t, + &fn_name, + params.clone(), + registry.clone(), + frame.scope.clone(), + (frame.depth.clone() + 1), + shared_types.clone(), + emit_info.clone(), + ); + match e { + Some(eb) => { + let else_str = emit_typed_tco_expr( + eb.clone(), + &fn_name, + params.clone(), + registry.clone(), + frame.scope.clone(), + (frame.depth.clone() + 1), + shared_types.clone(), + emit_info.clone(), + ); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("if ".to_string(), cond_str), + " {\n".to_string(), + ), + make_indent((frame.depth.clone() + 1)), + ), + then_str, + ), + "\n} else {\n".to_string(), + ), + make_indent((frame.depth.clone() + 1)), + ), + else_str, + ), + "\n}".to_string(), + ) + } + None => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("if ".to_string(), cond_str), + " {\n".to_string(), + ), + make_indent((frame.depth.clone() + 1)), + ), + then_str, + ), + "\n}".to_string(), + ), } -}, - _ => "".to_string(), -}; -let rc_match = analyze_rc_match(&s, arm_list.clone(), tco_scrut_type.clone(), &shared_types, emit_info.clone(), &frame.scope.clone().type_env.clone().source_indices.clone()); -let arm_strs = Rc::new({ let mut __result = Vec::new(); for arm in arm_list.clone().iter().cloned() { __result.push(emit_typed_tco_match_arm(&arm, fn_name.clone(), params.clone(), ®istry, &frame.scope.clone(), frame.depth.clone(), &shared_types, &emit_info, &tco_scrut_type)); } __result }); -let arms_str = arm_strs.join(&"\n".to_string()); -let tco_needs_as_str = (all_arms_are_string_lit(&arm_list) && ((arm_list.clone().len() as i64) > 0)); -if rc_match.needs_option_deref.clone() { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("match ".to_string(), scrut_str), ".as_deref()".to_string()), clone_iterator_suffix()), " {\n".to_string()), arms_str), "\n}".to_string()) - } else { - if rc_match.needs_deref.clone() { - { - let sharing = language_spec(RenderTarget::Rust).sharing.clone(); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("match ".to_string(), apply_type_template1(sharing.deref_clone.clone(), scrut_str)), " {\n".to_string()), arms_str), "\n}".to_string()) + } + _ => emit_error_expr( + "emit_rust_tco_if expected ExprIf".to_string(), + RenderTarget::Rust, + ), + } } + +pub fn emit_rust_tco_match( + frame: &Rc, + fn_name: String, + params: Rc>>, + registry: &Rc>>, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { + match (*frame.expr.clone().expr_data.clone()).clone() { + ExprData::ExprMatch => { + let s = match_scrutinee(frame.expr.clone()); + let arm_list = match_arm_nodes(frame.expr.clone()); + let scrut_str = emit_typed_expr( + s.clone(), + registry.clone(), + &frame.scope.clone(), + frame.depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let tco_scrut_type = match s.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + let is_optional = (rt.return_cardinality.clone() == Cardinality::CardOptional); + if is_optional { + authored_name_at( + frame.scope.clone().type_env.clone().source_indices.clone(), + &with_required_cardinality(&rt), + ) + } else { + authored_name_at( + frame.scope.clone().type_env.clone().source_indices.clone(), + &rt, + ) + } + } + _ => "".to_string(), + }; + let rc_match = analyze_rc_match( + &s, + arm_list.clone(), + tco_scrut_type.clone(), + &shared_types, + emit_info.clone(), + &frame.scope.clone().type_env.clone().source_indices.clone(), + ); + let arm_strs = Rc::new({ + let mut __result = Vec::new(); + for arm in arm_list.clone().iter().cloned() { + __result.push(emit_typed_tco_match_arm( + &arm, + fn_name.clone(), + params.clone(), + ®istry, + &frame.scope.clone(), + frame.depth.clone(), + &shared_types, + &emit_info, + &tco_scrut_type, + )); + } + __result + }); + let arms_str = arm_strs.join(&"\n".to_string()); + let tco_needs_as_str = + (all_arms_are_string_lit(&arm_list) && ((arm_list.clone().len() as i64) > 0)); + if rc_match.needs_option_deref.clone() { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("match ".to_string(), scrut_str), + ".as_deref()".to_string(), + ), + clone_iterator_suffix(), + ), + " {\n".to_string(), + ), + arms_str, + ), + "\n}".to_string(), + ) } else { - if tco_needs_as_str { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("match ".to_string(), scrut_str), ".as_str() {\n".to_string()), arms_str), "\n}".to_string()) + if rc_match.needs_deref.clone() { + { + let sharing = language_spec(RenderTarget::Rust).sharing.clone(); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "match ".to_string(), + apply_type_template1( + sharing.deref_clone.clone(), + scrut_str, + ), + ), + " {\n".to_string(), + ), + arms_str, + ), + "\n}".to_string(), + ) + } } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("match ".to_string(), scrut_str), " {\n".to_string()), arms_str), "\n}".to_string()) + if tco_needs_as_str { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("match ".to_string(), scrut_str), + ".as_str() {\n".to_string(), + ), + arms_str, + ), + "\n}".to_string(), + ) + } else { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("match ".to_string(), scrut_str), + " {\n".to_string(), + ), + arms_str, + ), + "\n}".to_string(), + ) + } } } } -}, - _ => emit_error_expr("emit_rust_tco_match expected ExprMatch".to_string(), RenderTarget::Rust), -} + _ => emit_error_expr( + "emit_rust_tco_match expected ExprMatch".to_string(), + RenderTarget::Rust, + ), + } } -pub fn emit_rust_tco_let(frame: &Rc, fn_name: String, params: &Rc>>, registry: &Rc>>, shared_types: &Rc>, emit_info: &Rc) -> String { +pub fn emit_rust_tco_let( + frame: &Rc, + fn_name: String, + params: &Rc>>, + registry: &Rc>>, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprLet => { - let n = let_binding_name_at(frame.expr.clone(), frame.scope.clone().type_env.clone().source_indices.clone()); -let v = let_value(frame.expr.clone()); -let bd = let_body(frame.expr.clone()); -let val_str = emit_typed_expr(v.clone(), registry.clone(), &frame.scope.clone(), frame.depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let is_param = { let mut __found = false; for p in params.clone().iter().cloned() { if (param_node_name_at(p.clone(), frame.scope.clone().type_env.clone().source_indices.clone()).as_str() == n.clone().as_str()) { __found = true; break; } } __found }; -let let_line = if is_param { - v2_rt::concat(v2_rt::concat(v2_rt::concat(emit_ident(n.clone(), RenderTarget::Rust), " = ".to_string()), val_str), ";".to_string()) - } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let ".to_string(), emit_ident(n.clone(), RenderTarget::Rust)), " = ".to_string()), val_str), ";".to_string()) - }; -let next_scope = extend_scope(&frame.scope.clone(), &n, resolved_type(v.clone()), Rc::new(SubValueRelation::SubValueUnknown)); -match bd { - Some(b) => v2_rt::concat(v2_rt::concat(let_line, "\n".to_string()), emit_typed_tco_expr(b.clone(), &fn_name, params.clone(), registry.clone(), next_scope, frame.depth.clone(), shared_types.clone(), emit_info.clone())), - None => let_line, -} -}, - _ => emit_error_expr("emit_rust_tco_let expected ExprLet".to_string(), RenderTarget::Rust), -} + ExprData::ExprLet => { + let n = let_binding_name_at( + frame.expr.clone(), + frame.scope.clone().type_env.clone().source_indices.clone(), + ); + let v = let_value(frame.expr.clone()); + let bd = let_body(frame.expr.clone()); + let val_str = emit_typed_expr( + v.clone(), + registry.clone(), + &frame.scope.clone(), + frame.depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let is_param = { + let mut __found = false; + for p in params.clone().iter().cloned() { + if (param_node_name_at( + p.clone(), + frame.scope.clone().type_env.clone().source_indices.clone(), + ) + .as_str() + == n.clone().as_str()) + { + __found = true; + break; + } + } + __found + }; + let let_line = if is_param { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(emit_ident(n.clone(), RenderTarget::Rust), " = ".to_string()), + val_str, + ), + ";".to_string(), + ) + } else { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "let ".to_string(), + emit_ident(n.clone(), RenderTarget::Rust), + ), + " = ".to_string(), + ), + val_str, + ), + ";".to_string(), + ) + }; + let next_scope = extend_scope( + &frame.scope.clone(), + &n, + resolved_type(v.clone()), + Rc::new(SubValueRelation::SubValueUnknown), + ); + match bd { + Some(b) => v2_rt::concat( + v2_rt::concat(let_line, "\n".to_string()), + emit_typed_tco_expr( + b.clone(), + &fn_name, + params.clone(), + registry.clone(), + next_scope, + frame.depth.clone(), + shared_types.clone(), + emit_info.clone(), + ), + ), + None => let_line, + } + } + _ => emit_error_expr( + "emit_rust_tco_let expected ExprLet".to_string(), + RenderTarget::Rust, + ), + } } -pub fn emit_rust_tco_block(frame: &Rc, fn_name: String, params: &Rc>>, registry: &Rc>>, shared_types: &Rc>, emit_info: &Rc) -> String { +pub fn emit_rust_tco_block( + frame: &Rc, + fn_name: String, + params: &Rc>>, + registry: &Rc>>, + shared_types: &Rc>, + emit_info: &Rc, +) -> String { match (*frame.expr.clone().expr_data.clone()).clone() { - ExprData::ExprBlock => { - let ss = frame.expr.clone().children.clone(); -if ((ss.clone().len() as i64) == 0) { - "break;".to_string() - } else { - { - let init_state = emit_tco_init_block_stmts(ss.clone(), Rc::new(vec![]), frame.scope.clone(), registry.clone(), frame.depth.clone(), shared_types.clone(), emit_info.clone(), params.clone()); -let last_str = match ss.clone().last().cloned() { - Some(last_expr) => emit_typed_tco_expr(last_expr.clone(), &fn_name, params.clone(), registry.clone(), init_state.scope.clone(), frame.depth.clone(), shared_types.clone(), emit_info.clone()), - None => "break;".to_string(), -}; -if ((init_state.text.clone().len() as i64) == 0) { - last_str - } else { - v2_rt::concat(v2_rt::concat(init_state.text.clone().join(&"\n".to_string()), "\n".to_string()), last_str) + ExprData::ExprBlock => { + let ss = frame.expr.clone().children.clone(); + if ((ss.clone().len() as i64) == 0) { + "break;".to_string() + } else { + { + let init_state = emit_tco_init_block_stmts( + ss.clone(), + Rc::new(vec![]), + frame.scope.clone(), + registry.clone(), + frame.depth.clone(), + shared_types.clone(), + emit_info.clone(), + params.clone(), + ); + let last_str = match ss.clone().last().cloned() { + Some(last_expr) => emit_typed_tco_expr( + last_expr.clone(), + &fn_name, + params.clone(), + registry.clone(), + init_state.scope.clone(), + frame.depth.clone(), + shared_types.clone(), + emit_info.clone(), + ), + None => "break;".to_string(), + }; + if ((init_state.text.clone().len() as i64) == 0) { + last_str + } else { + v2_rt::concat( + v2_rt::concat( + init_state.text.clone().join(&"\n".to_string()), + "\n".to_string(), + ), + last_str, + ) + } } -} + } } -}, - _ => emit_error_expr("emit_rust_tco_block expected ExprBlock".to_string(), RenderTarget::Rust), -} + _ => emit_error_expr( + "emit_rust_tco_block expected ExprBlock".to_string(), + RenderTarget::Rust, + ), + } } -pub fn emit_rust_tco_default_return(frame: &Rc, registry: Rc>>, shared_types: Rc>, emit_info: Rc) -> String { - { - let val_str = emit_typed_expr(frame.expr.clone(), registry, &frame.scope.clone(), frame.depth.clone(), shared_types, emit_info, 1024); -v2_rt::concat(v2_rt::concat("break ".to_string(), val_str), ";".to_string()) -} +pub fn emit_rust_tco_default_return( + frame: &Rc, + registry: Rc>>, + shared_types: Rc>, + emit_info: Rc, +) -> String { + { + let val_str = emit_typed_expr( + frame.expr.clone(), + registry, + &frame.scope.clone(), + frame.depth.clone(), + shared_types, + emit_info, + 1024, + ); + v2_rt::concat( + v2_rt::concat("break ".to_string(), val_str), + ";".to_string(), + ) + } } -pub fn emit_typed_tco_expr(texpr: Rc, fn_name: &String, params: Rc>>, registry: Rc>>, scope: Rc, depth: i64, shared_types: Rc>, emit_info: Rc) -> String { - emit_shared_tco_expr(Rc::new(TcoFrame { - expr: texpr, - scope: scope, - depth: depth, -}), fn_name.clone(), |input| emit_typed_tco_reassign(input.args.clone(), ¶ms, registry.clone(), &input.scope.clone(), input.depth.clone(), shared_types.clone(), &emit_info), |frame| emit_rust_tco_non_self_call(&frame, registry.clone(), shared_types.clone(), emit_info.clone()), |frame| emit_rust_tco_if(&frame, &fn_name, ¶ms, ®istry, &shared_types, &emit_info), |frame| emit_rust_tco_match(&frame, fn_name.clone(), params.clone(), ®istry, &shared_types, &emit_info), |frame| emit_rust_tco_let(&frame, fn_name.clone(), ¶ms, ®istry, &shared_types, &emit_info), |frame| emit_rust_tco_block(&frame, fn_name.clone(), ¶ms, ®istry, &shared_types, &emit_info), |frame| emit_rust_tco_default_return(&frame, registry.clone(), shared_types.clone(), emit_info.clone())) +pub fn emit_typed_tco_expr( + texpr: Rc, + fn_name: &String, + params: Rc>>, + registry: Rc>>, + scope: Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, +) -> String { + emit_shared_tco_expr( + Rc::new(TcoFrame { + expr: texpr, + scope: scope, + depth: depth, + }), + fn_name.clone(), + |input| { + emit_typed_tco_reassign( + input.args.clone(), + ¶ms, + registry.clone(), + &input.scope.clone(), + input.depth.clone(), + shared_types.clone(), + &emit_info, + ) + }, + |frame| { + emit_rust_tco_non_self_call( + &frame, + registry.clone(), + shared_types.clone(), + emit_info.clone(), + ) + }, + |frame| { + emit_rust_tco_if( + &frame, + &fn_name, + ¶ms, + ®istry, + &shared_types, + &emit_info, + ) + }, + |frame| { + emit_rust_tco_match( + &frame, + fn_name.clone(), + params.clone(), + ®istry, + &shared_types, + &emit_info, + ) + }, + |frame| { + emit_rust_tco_let( + &frame, + fn_name.clone(), + ¶ms, + ®istry, + &shared_types, + &emit_info, + ) + }, + |frame| { + emit_rust_tco_block( + &frame, + fn_name.clone(), + ¶ms, + ®istry, + &shared_types, + &emit_info, + ) + }, + |frame| { + emit_rust_tco_default_return( + &frame, + registry.clone(), + shared_types.clone(), + emit_info.clone(), + ) + }, + ) } -pub fn emit_typed_tco_match_arm(arm: &Rc, fn_name: String, params: Rc>>, registry: &Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: &Rc, scrut_type: &String) -> String { +pub fn emit_typed_tco_match_arm( + arm: &Rc, + fn_name: String, + params: Rc>>, + registry: &Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: &Rc, + scrut_type: &String, +) -> String { { let arm_pat = arm_pattern(arm.clone()); -let arm_g = arm_guard(&arm); -let arm_b = arm_body(&arm); -let si = scope.type_env.clone().source_indices.clone(); -let rc_analysis = analyze_rc_pattern(arm_pat.clone(), scrut_type.clone(), &shared_types, &emit_info, si.clone()); -let pat_str = if rc_analysis.needs_rc_pattern.clone() { - emit_pattern_rc_aware(arm_pat.clone(), rc_analysis.clone(), shared_types.clone(), scrut_type.clone(), si.clone(), emit_info.clone()) - } else { - emit_pattern(arm_pat.clone(), shared_types.clone(), scrut_type.clone(), si.clone(), emit_info.clone()) + let arm_g = arm_guard(&arm); + let arm_b = arm_body(&arm); + let si = scope.type_env.clone().source_indices.clone(); + let rc_analysis = analyze_rc_pattern( + arm_pat.clone(), + scrut_type.clone(), + &shared_types, + &emit_info, + si.clone(), + ); + let pat_str = if rc_analysis.needs_rc_pattern.clone() { + emit_pattern_rc_aware( + arm_pat.clone(), + rc_analysis.clone(), + shared_types.clone(), + scrut_type.clone(), + si.clone(), + emit_info.clone(), + ) + } else { + emit_pattern( + arm_pat.clone(), + shared_types.clone(), + scrut_type.clone(), + si.clone(), + emit_info.clone(), + ) }; -let field_guards = collect_pattern_string_guards(arm_pat.clone(), si.clone()); -let arm_guard_str = match arm_g { - Some(g) => emit_typed_expr(g.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024), - None => "".to_string(), -}; -let guard_str = if ((field_guards.clone().as_str() != "".to_string().as_str()) && (arm_guard_str.clone().as_str() != "".to_string().as_str())) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(" if ".to_string(), field_guards.clone()), " && ".to_string()), arm_guard_str.clone()) + let field_guards = collect_pattern_string_guards(arm_pat.clone(), si.clone()); + let arm_guard_str = match arm_g { + Some(g) => emit_typed_expr( + g.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ), + None => "".to_string(), + }; + let guard_str = if ((field_guards.clone().as_str() != "".to_string().as_str()) + && (arm_guard_str.clone().as_str() != "".to_string().as_str())) + { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(" if ".to_string(), field_guards.clone()), + " && ".to_string(), + ), + arm_guard_str.clone(), + ) } else { if (field_guards.clone().as_str() != "".to_string().as_str()) { v2_rt::concat(" if ".to_string(), field_guards.clone()) @@ -4964,199 +11760,529 @@ let guard_str = if ((field_guards.clone().as_str() != "".to_string().as_str()) & } } }; -let body_str = emit_typed_tco_expr(arm_b, &fn_name, params, registry.clone(), scope.clone(), depth.clone(), shared_types.clone(), emit_info.clone()); -if rc_analysis.needs_rc_pattern.clone() { + let body_str = emit_typed_tco_expr( + arm_b, + &fn_name, + params, + registry.clone(), + scope.clone(), + depth.clone(), + shared_types.clone(), + emit_info.clone(), + ); + if rc_analysis.needs_rc_pattern.clone() { { - let prelude = rc_pattern_preludes(arm_pat.clone(), rc_analysis.clone(), shared_types.clone(), si.clone(), emit_info.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), pat_str), guard_str), " => { ".to_string()), prelude), " ".to_string()), body_str), " },".to_string()) -} + let prelude = rc_pattern_preludes( + arm_pat.clone(), + rc_analysis.clone(), + shared_types.clone(), + si.clone(), + emit_info.clone(), + ); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(" ".to_string(), pat_str), + guard_str, + ), + " => { ".to_string(), + ), + prelude, + ), + " ".to_string(), + ), + body_str, + ), + " },".to_string(), + ) + } } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), pat_str), guard_str), " => { ".to_string()), body_str), " },".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(v2_rt::concat(" ".to_string(), pat_str), guard_str), + " => { ".to_string(), + ), + body_str, + ), + " },".to_string(), + ) } -} + } } -pub fn expr_references_var(node: &Rc, var_name: String, source_indices: Rc>>) -> bool { +pub fn expr_references_var( + node: &Rc, + var_name: String, + source_indices: Rc>>, +) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*node.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => (expr_var_name_at(node.clone(), source_indices.clone()).as_str() == var_name.clone().as_str()), - _ => { let mut __found = false; for c in node.children.clone().iter().cloned() { if expr_references_var(&c, var_name.clone(), source_indices.clone()) { __found = true; break; } } __found }, -} + ExprData::ExprVar { .. } => { + (expr_var_name_at(node.clone(), source_indices.clone()).as_str() + == var_name.clone().as_str()) + } + _ => { + let mut __found = false; + for c in node.children.clone().iter().cloned() { + if expr_references_var(&c, var_name.clone(), source_indices.clone()) { + __found = true; + break; + } + } + __found + } + } }) } -pub fn emit_typed_tco_reassign(args: Rc>>, params: &Rc>>, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: &Rc) -> String { +pub fn emit_typed_tco_reassign( + args: Rc>>, + params: &Rc>>, + registry: Rc>>, + scope: &Rc, + depth: i64, + shared_types: Rc>, + emit_info: &Rc, +) -> String { { let si = scope.type_env.clone().source_indices.clone(); -let arg_values = Rc::new({ let mut __result = Vec::new(); for a in args.iter().cloned() { __result.push(arg_value(&a)); } __result }); -let identity_params = Rc::new(params.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(v2_rt::rc_empty_map::(), |m: Rc>, pair: (i64, Rc)| { - let pname = param_node_name_at(pair.1.clone(), si.clone()); -let av = match arg_values.clone().get(pair.0.clone() as usize).cloned() { - Some(v) => v.clone(), - None => pair.1.clone(), -}; -if is_tco_identity_passthrough(&av, pname.clone(), si.clone()) { - v2_rt::rc_map_insert(m.clone(), pname.clone(), true) - } else { - m.clone() + let arg_values = Rc::new({ + let mut __result = Vec::new(); + for a in args.iter().cloned() { + __result.push(arg_value(&a)); } -}); -let filtered_arg_values = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(params.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if match v2_rt::map_get(&identity_params, param_node_name_at(pair.1.clone(), si.clone())) { - Some(_) => false, - None => true, -} { __result.push(pair); } } __result }).iter().cloned() { __result.push(match arg_values.clone().get(pair.0.clone() as usize).cloned() { - Some(v) => v.clone(), - None => pair.1.clone(), -}); } __result }); -let filtered_params = Rc::new({ let mut __result = Vec::new(); for p in params.clone().iter().cloned() { if match v2_rt::map_get(&identity_params, param_node_name_at(p.clone(), si.clone())) { - Some(_) => false, - None => true, -} { __result.push(p); } } __result }); -let tco_movable = filtered_params.clone().iter().cloned().fold(emit_info.movable.clone(), |m: Rc>, p: Rc| { - let pname = param_node_name_at(p.clone(), si.clone()); -let ref_count = filtered_arg_values.clone().iter().cloned().fold(0, |n: i64, av: Rc| if expr_references_var(&av, pname.clone(), si.clone()) { - (n.clone() + 1) - } else { - n.clone() - }); -if (ref_count.clone() <= 1) { - set_insert(m.clone(), pname.clone()) - } else { - m.clone() + __result + }); + let identity_params = Rc::new( + params + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::(), + |m: Rc>, pair: (i64, Rc)| { + let pname = param_node_name_at(pair.1.clone(), si.clone()); + let av = match arg_values.clone().get(pair.0.clone() as usize).cloned() { + Some(v) => v.clone(), + None => pair.1.clone(), + }; + if is_tco_identity_passthrough(&av, pname.clone(), si.clone()) { + v2_rt::rc_map_insert(m.clone(), pname.clone(), true) + } else { + m.clone() + } + }, + ); + let filtered_arg_values = Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + params + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + if match v2_rt::map_get( + &identity_params, + param_node_name_at(pair.1.clone(), si.clone()), + ) { + Some(_) => false, + None => true, + } { + __result.push(pair); + } + } + __result + }) + .iter() + .cloned() + { + __result.push( + match arg_values.clone().get(pair.0.clone() as usize).cloned() { + Some(v) => v.clone(), + None => pair.1.clone(), + }, + ); } -}); -let tco_emit_info = Rc::new(EmitGraphInfo { movable: tco_movable, ..(*emit_info.clone()).clone() }); -let ordered_args = Rc::new({ let mut __result = Vec::new(); for av in filtered_arg_values.clone().iter().cloned() { __result.push(emit_typed_expr(av.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), tco_emit_info.clone(), 1024)); } __result }); -let param_names = Rc::new({ let mut __result = Vec::new(); for p in filtered_params.clone().iter().cloned() { __result.push(emit_ident(param_node_name_at(p.clone(), si.clone()), RenderTarget::Rust)); } __result }); -let all_lines = tco_reassign_core(ordered_args, param_names, "__tco_".to_string(), "let ".to_string(), " = ".to_string(), ";".to_string(), "continue;".to_string(), &"".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat("{\n".to_string(), make_indent((depth.clone() + 1))), all_lines.join(&"\n".to_string())), "\n}".to_string()) -} + __result + }); + let filtered_params = Rc::new({ + let mut __result = Vec::new(); + for p in params.clone().iter().cloned() { + if match v2_rt::map_get(&identity_params, param_node_name_at(p.clone(), si.clone())) + { + Some(_) => false, + None => true, + } { + __result.push(p); + } + } + __result + }); + let tco_movable = + filtered_params.clone().iter().cloned().fold( + emit_info.movable.clone(), + |m: Rc>, p: Rc| { + let pname = param_node_name_at(p.clone(), si.clone()); + let ref_count = filtered_arg_values.clone().iter().cloned().fold( + 0, + |n: i64, av: Rc| { + if expr_references_var(&av, pname.clone(), si.clone()) { + (n.clone() + 1) + } else { + n.clone() + } + }, + ); + if (ref_count.clone() <= 1) { + v2_rt::rc_map_insert(m.clone(), pname.clone(), true) + } else { + m.clone() + } + }, + ); + let tco_emit_info = Rc::new(EmitGraphInfo { + movable: tco_movable, + ..(*emit_info.clone()).clone() + }); + let ordered_args = Rc::new({ + let mut __result = Vec::new(); + for av in filtered_arg_values.clone().iter().cloned() { + __result.push(emit_typed_expr( + av.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + tco_emit_info.clone(), + 1024, + )); + } + __result + }); + let param_names = Rc::new({ + let mut __result = Vec::new(); + for p in filtered_params.clone().iter().cloned() { + __result.push(emit_ident( + param_node_name_at(p.clone(), si.clone()), + RenderTarget::Rust, + )); + } + __result + }); + let all_lines = tco_reassign_core( + ordered_args, + param_names, + "__tco_".to_string(), + "let ".to_string(), + " = ".to_string(), + ";".to_string(), + "continue;".to_string(), + &"".to_string(), + ); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("{\n".to_string(), make_indent((depth.clone() + 1))), + all_lines.join(&"\n".to_string()), + ), + "\n}".to_string(), + ) + } } -pub fn emit_service_def(item: &Rc, registry: Rc>>, shared_types: Rc>, env: &Rc) -> String { +pub fn emit_service_def( + item: &Rc, + registry: Rc>>, + shared_types: Rc>, + env: &Rc, +) -> String { { let safe_name = sanitize_service_name(authored_name(env.clone(), item.clone())); -let fallback_transport = service_fallback_transport(&item); -let op_children = item.children.clone(); -let struct_def = emit_service_struct(safe_name.clone(), fallback_transport.clone(), op_children.clone(), item.clone(), env.source_indices.clone()); -let impl_block = emit_service_impl(&safe_name, &fallback_transport, &op_children, registry, shared_types, &env, &item); -v2_rt::concat(v2_rt::concat(struct_def, "\n\n".to_string()), impl_block) -} + let fallback_transport = service_fallback_transport(&item); + let op_children = item.children.clone(); + let struct_def = emit_service_struct( + safe_name.clone(), + fallback_transport.clone(), + op_children.clone(), + item.clone(), + env.source_indices.clone(), + ); + let impl_block = emit_service_impl( + &safe_name, + &fallback_transport, + &op_children, + registry, + shared_types, + &env, + &item, + ); + v2_rt::concat(v2_rt::concat(struct_def, "\n\n".to_string()), impl_block) + } } -pub fn emit_service_struct(name: String, fallback_transport: Rc, op_children: Rc>>, service_item: Rc, source_indices: Rc>>) -> String { +pub fn emit_service_struct( + name: String, + fallback_transport: Rc, + op_children: Rc>>, + service_item: Rc, + source_indices: Rc>>, +) -> String { { let derives = "#[derive(Debug, Clone)]".to_string(); -let config_fields = emit_service_config_fields(fallback_transport, op_children, service_item, &source_indices); -let dry_run_field = "\n pub dry_run: crate::dry_run::DryRunMode,".to_string(); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(derives, "\npub struct ".to_string()), name), " {\n".to_string()), config_fields), dry_run_field), "\n}".to_string()) -} + let config_fields = emit_service_config_fields( + fallback_transport, + op_children, + service_item, + &source_indices, + ); + let dry_run_field = "\n pub dry_run: crate::dry_run::DryRunMode,".to_string(); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(v2_rt::concat(derives, "\npub struct ".to_string()), name), + " {\n".to_string(), + ), + config_fields, + ), + dry_run_field, + ), + "\n}".to_string(), + ) + } } -pub fn emit_service_config_fields(fallback_transport: Rc, op_children: Rc>>, service_item: Rc, source_indices: &Rc>>) -> String { +pub fn emit_service_config_fields( + fallback_transport: Rc, + op_children: Rc>>, + service_item: Rc, + source_indices: &Rc>>, +) -> String { { let fs = compute_service_fields(&fallback_transport, &op_children, &source_indices); -let has_svc_auth = match service_config_auth_source(service_item, source_indices.clone()) { - Some(_) => true, - None => false, -}; -let fs = if has_svc_auth { + let has_svc_auth = match service_config_auth_source(service_item, source_indices.clone()) { + Some(_) => true, + None => false, + }; + let fs = if has_svc_auth { ServiceFieldSet { - has_rest: fs.has_rest.clone(), - has_shell: fs.has_shell.clone(), - has_file: fs.has_file.clone(), - has_auth: true, -} + has_rest: fs.has_rest.clone(), + has_shell: fs.has_shell.clone(), + has_file: fs.has_file.clone(), + has_auth: true, + } } else { fs.clone() }; -let decls = service_field_decls(&fs, &language_spec(RenderTarget::Rust).service_fields.clone()); -if ((decls.clone().len() as i64) == 0) { + let decls = service_field_decls( + &fs, + &language_spec(RenderTarget::Rust).service_fields.clone(), + ); + if ((decls.clone().len() as i64) == 0) { " // No configuration needed for local binding.\n".to_string() } else { decls.clone().join(&"".to_string()) } -} + } } -pub fn emit_service_impl(name: &String, transport: &Rc, op_children: &Rc>>, registry: Rc>>, shared_types: Rc>, env: &Rc, service_item: &Rc) -> String { +pub fn emit_service_impl( + name: &String, + transport: &Rc, + op_children: &Rc>>, + registry: Rc>>, + shared_types: Rc>, + env: &Rc, + service_item: &Rc, +) -> String { { let depth = 0; -let new_method = emit_service_new_method(name.clone(), &transport, op_children.clone(), &service_item, &env.source_indices.clone()); -let method_strs = Rc::new({ let mut __result = Vec::new(); for op_node in op_children.clone().iter().cloned() { __result.push(emit_operation_method(name.clone(), transport.clone(), &op_node, ®istry, (depth.clone() + 1), &shared_types, &env, service_item.clone())); } __result }); -let all_methods = v2_rt::concat(Rc::new(vec![new_method]), method_strs); -let methods_str = all_methods.join(&"\n\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("impl ".to_string(), name.clone()), " {\n".to_string()), make_indent((depth.clone() + 1))), methods_str), "\n}".to_string()) -} + let new_method = emit_service_new_method( + name.clone(), + &transport, + op_children.clone(), + &service_item, + &env.source_indices.clone(), + ); + let method_strs = Rc::new({ + let mut __result = Vec::new(); + for op_node in op_children.clone().iter().cloned() { + __result.push(emit_operation_method( + name.clone(), + transport.clone(), + &op_node, + ®istry, + (depth.clone() + 1), + &shared_types, + &env, + service_item.clone(), + )); + } + __result + }); + let all_methods = v2_rt::concat(Rc::new(vec![new_method]), method_strs); + let methods_str = all_methods.join(&"\n\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("impl ".to_string(), name.clone()), + " {\n".to_string(), + ), + make_indent((depth.clone() + 1)), + ), + methods_str, + ), + "\n}".to_string(), + ) + } } -pub fn emit_service_new_method(name: String, fallback_transport: &Rc, op_children: Rc>>, service_item: &Rc, source_indices: &Rc>>) -> String { +pub fn emit_service_new_method( + name: String, + fallback_transport: &Rc, + op_children: Rc>>, + service_item: &Rc, + source_indices: &Rc>>, +) -> String { { let fs = compute_service_fields(&fallback_transport, &op_children, &source_indices); -let has_svc_auth = match service_config_auth_source(service_item.clone(), source_indices.clone()) { - Some(_) => true, - None => false, -}; -let fs = if has_svc_auth { + let has_svc_auth = + match service_config_auth_source(service_item.clone(), source_indices.clone()) { + Some(_) => true, + None => false, + }; + let fs = if has_svc_auth { ServiceFieldSet { - has_rest: fs.has_rest.clone(), - has_shell: fs.has_shell.clone(), - has_file: fs.has_file.clone(), - has_auth: true, -} + has_rest: fs.has_rest.clone(), + has_shell: fs.has_shell.clone(), + has_file: fs.has_file.clone(), + has_auth: true, + } } else { fs.clone() }; -let from_config = match service_config_endpoint(service_item.clone(), source_indices.clone()) { - Some(ep) => match (*ep.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { unreachable!() }; s.clone() }, - _ => "".to_string(), -}, - None => "".to_string(), -}; -let base_url_default = if (from_config.clone().as_str() != "".to_string().as_str()) { + let from_config = + match service_config_endpoint(service_item.clone(), source_indices.clone()) { + Some(ep) => match (*ep.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { + unreachable!() + }; + s.clone() + } + _ => "".to_string(), + }, + None => "".to_string(), + }; + let base_url_default = if (from_config.clone().as_str() != "".to_string().as_str()) { from_config.clone() } else { if fs.has_rest.clone() { { - let fallback_is_rest = is_rest_transport(fallback_transport.clone(), source_indices.clone()); -let from_fallback = if fallback_is_rest { - match transport_base_url(fallback_transport.clone(), source_indices.clone()) { - Some(bu) => match (*bu.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { unreachable!() }; s.clone() }, - _ => "".to_string(), -}, - None => "".to_string(), -} + let fallback_is_rest = + is_rest_transport(fallback_transport.clone(), source_indices.clone()); + let from_fallback = if fallback_is_rest { + match transport_base_url(fallback_transport.clone(), source_indices.clone()) + { + Some(bu) => match (*bu.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitStr { value: s, .. } = value.as_ref() + else { + unreachable!() + }; + s.clone() + } + _ => "".to_string(), + }, + None => "".to_string(), + } } else { "".to_string() }; -if (from_fallback.clone().as_str() != "".to_string().as_str()) { + if (from_fallback.clone().as_str() != "".to_string().as_str()) { from_fallback.clone() } else { "http://localhost".to_string() } -} + } } else { "".to_string() } }; -let ctors = service_field_ctors(&fs, &language_spec(RenderTarget::Rust).service_fields.clone()); -let ctors = Rc::new({ let mut __result = Vec::new(); for c in ctors.clone().iter().cloned() { __result.push(apply_type_template1(c.clone(), base_url_default.clone())); } __result }); -let ctors = match service_config_auth_source(service_item.clone(), source_indices.clone()) { - Some(src) => Rc::new({ let mut __result = Vec::new(); for c in ctors.clone().iter().cloned() { __result.push(if v2_rt::contains(c.clone(), "auth_token".to_string()) { - emit_auth_source_ctor(&src, source_indices.clone()) - } else { - c.clone() - }); } __result }), - None => ctors.clone(), -}; -let inits = ctors.clone().join(&"".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("pub fn new(dry_run: crate::dry_run::DryRunMode) -> Self {\n".to_string(), " ".to_string()), name), " {\n".to_string()), inits), " dry_run,\n".to_string()), " }\n".to_string()), "}".to_string()) -} + let ctors = service_field_ctors( + &fs, + &language_spec(RenderTarget::Rust).service_fields.clone(), + ); + let ctors = Rc::new({ + let mut __result = Vec::new(); + for c in ctors.clone().iter().cloned() { + __result.push(apply_type_template1(c.clone(), base_url_default.clone())); + } + __result + }); + let ctors = match service_config_auth_source(service_item.clone(), source_indices.clone()) { + Some(src) => Rc::new({ + let mut __result = Vec::new(); + for c in ctors.clone().iter().cloned() { + __result.push(if v2_rt::contains(c.clone(), "auth_token".to_string()) { + emit_auth_source_ctor(&src, source_indices.clone()) + } else { + c.clone() + }); + } + __result + }), + None => ctors.clone(), + }; + let inits = ctors.clone().join(&"".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "pub fn new(dry_run: crate::dry_run::DryRunMode) -> Self {\n" + .to_string(), + " ".to_string(), + ), + name, + ), + " {\n".to_string(), + ), + inits, + ), + " dry_run,\n".to_string(), + ), + " }\n".to_string(), + ), + "}".to_string(), + ) + } } -pub fn emit_auth_source_ctor(source_expr: &Rc, source_indices: Rc>>) -> String { +pub fn emit_auth_source_ctor( + source_expr: &Rc, + source_indices: Rc>>, +) -> String { match (*source_expr.expr_data.clone()).clone() { ExprData::ExprRecordLit { .. } => match record_lit_type_name_at(source_expr.clone(), source_indices) { Some(variant) => if (variant.clone().as_str() == "EnvVar".to_string().as_str()) { @@ -5176,47 +12302,195 @@ pub fn emit_auth_source_ctor(source_expr: &Rc, source_indices: Rc>>, source_indices: Rc>>) -> String { +pub fn emit_modifier_doc_from_props( + properties: Rc>>, + source_indices: Rc>>, +) -> String { { let names = extract_modifier_names(properties, source_indices); -if ((names.clone().len() as i64) == 0) { + if ((names.clone().len() as i64) == 0) { "".to_string() } else { - v2_rt::concat(v2_rt::concat("/// Modifiers: ".to_string(), names.clone().join(&", ".to_string())), "\n".to_string()) + v2_rt::concat( + v2_rt::concat( + "/// Modifiers: ".to_string(), + names.clone().join(&", ".to_string()), + ), + "\n".to_string(), + ) } -} + } } -pub fn emit_operation_method(service_name: String, transport: Rc, op_node: &Rc, registry: &Rc>>, depth: i64, shared_types: &Rc>, env: &Rc, service_item: Rc) -> String { +pub fn emit_operation_method( + service_name: String, + transport: Rc, + op_node: &Rc, + registry: &Rc>>, + depth: i64, + shared_types: &Rc>, + env: &Rc, + service_item: Rc, +) -> String { { let op_text = authored_name(env.clone(), op_node.clone()); -let input_params = Rc::new({ let mut __result = Vec::new(); for p in op_node.params.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(emit_ident(param_node_name_at(p.clone(), env.source_indices.clone()), RenderTarget::Rust), rust_items().param_type_sep.clone()), emit_rust_param_type(¶m_node_type_expr(&p), &shared_types, &env.source_indices.clone()))); } __result }); -let params_str = input_params.join(&", ".to_string()); -let all_params = if (params_str.clone().as_str() == "".to_string().as_str()) { + let input_params = Rc::new({ + let mut __result = Vec::new(); + for p in op_node.params.clone().iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + emit_ident( + param_node_name_at(p.clone(), env.source_indices.clone()), + RenderTarget::Rust, + ), + rust_items().param_type_sep.clone(), + ), + emit_rust_param_type( + ¶m_node_type_expr(&p), + &shared_types, + &env.source_indices.clone(), + ), + )); + } + __result + }); + let params_str = input_params.join(&", ".to_string()); + let all_params = if (params_str.clone().as_str() == "".to_string().as_str()) { "&self".to_string() } else { v2_rt::concat("&self, ".to_string(), params_str.clone()) }; -let ret_type = render_rust_type(resolved_type(op_node.clone()), shared_types.clone(), env.source_indices.clone()); -let eff_transport = effective_operation_transport(op_node.clone(), transport); -let op_inferred = resolved_type(op_node.clone()); -let real_body = emit_transport_call(&eff_transport, op_text.clone(), registry.clone(), (depth.clone() + 2), op_inferred, service_item, op_node.clone(), &env.source_indices.clone(), shared_types.clone(), env.clone()); -let mock_props = Rc::new({ let mut __result = Vec::new(); for p in op_node.properties.clone().iter().cloned() { if has_mock_prefix(&field_init_node_name_at(p.clone(), env.source_indices.clone())) { __result.push(p); } } __result }); -let dry_run_body = emit_dry_run_branch_from_props(&op_text, &resolved_type(op_node.clone()), &mock_props, registry.clone(), &env.source_indices.clone(), &op_node, env.clone(), shared_types.clone()); -let body = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("if self.dry_run.is_dry_run() {\n".to_string(), make_indent((depth.clone() + 2))), dry_run_body), "\n".to_string()), "} else {\n".to_string()), make_indent((depth.clone() + 2))), real_body), "\n".to_string()), "}".to_string()); -let modifier_doc = emit_modifier_doc_from_props(op_node.properties.clone(), env.source_indices.clone()); -let items = rust_items(); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(modifier_doc, rust_visibility_prefix()), items.async_prefix.clone()), items.func_keyword.clone()), " ".to_string()), emit_ident(op_text.clone(), RenderTarget::Rust)), "(".to_string()), all_params), ") -> Result<".to_string()), ret_type), ", Box> {\n".to_string()), make_indent((depth.clone() + 1))), body), "\n}".to_string()) -} + let ret_type = render_rust_type( + resolved_type(op_node.clone()), + shared_types.clone(), + env.source_indices.clone(), + ); + let eff_transport = effective_operation_transport(op_node.clone(), transport); + let op_inferred = resolved_type(op_node.clone()); + let real_body = emit_transport_call( + &eff_transport, + op_text.clone(), + registry.clone(), + (depth.clone() + 2), + op_inferred, + service_item, + op_node.clone(), + &env.source_indices.clone(), + shared_types.clone(), + env.clone(), + ); + let mock_props = Rc::new({ + let mut __result = Vec::new(); + for p in op_node.properties.clone().iter().cloned() { + if has_mock_prefix(&field_init_node_name_at( + p.clone(), + env.source_indices.clone(), + )) { + __result.push(p); + } + } + __result + }); + let dry_run_body = emit_dry_run_branch_from_props( + &op_text, + &resolved_type(op_node.clone()), + &mock_props, + registry.clone(), + &env.source_indices.clone(), + &op_node, + env.clone(), + shared_types.clone(), + ); + let body = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "if self.dry_run.is_dry_run() {\n".to_string(), + make_indent((depth.clone() + 2)), + ), + dry_run_body, + ), + "\n".to_string(), + ), + "} else {\n".to_string(), + ), + make_indent((depth.clone() + 2)), + ), + real_body, + ), + "\n".to_string(), + ), + "}".to_string(), + ); + let modifier_doc = + emit_modifier_doc_from_props(op_node.properties.clone(), env.source_indices.clone()); + let items = rust_items(); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + modifier_doc, + rust_visibility_prefix(), + ), + items.async_prefix.clone(), + ), + items.func_keyword.clone(), + ), + " ".to_string(), + ), + emit_ident(op_text.clone(), RenderTarget::Rust), + ), + "(".to_string(), + ), + all_params, + ), + ") -> Result<".to_string(), + ), + ret_type, + ), + ", Box> {\n".to_string(), + ), + make_indent((depth.clone() + 1)), + ), + body, + ), + "\n}".to_string(), + ) + } } -pub fn emit_dry_run_branch_from_props(op_name: &String, inferred: &Rc, mock_props: &Rc>>, registry: Rc>>, source_indices: &Rc>>, op_node: &Rc, env: Rc, shared_types: Rc>) -> String { - { - let log_line = v2_rt::concat(v2_rt::concat("eprintln!(\"[dry-run] ".to_string(), op_name.clone()), "\");".to_string()); -if ((mock_props.clone().len() as i64) > 0) { +pub fn emit_dry_run_branch_from_props( + op_name: &String, + inferred: &Rc, + mock_props: &Rc>>, + registry: Rc>>, + source_indices: &Rc>>, + op_node: &Rc, + env: Rc, + shared_types: Rc>, +) -> String { + { + let log_line = v2_rt::concat( + v2_rt::concat("eprintln!(\"[dry-run] ".to_string(), op_name.clone()), + "\");".to_string(), + ); + if ((mock_props.clone().len() as i64) > 0) { { let first_mock = mock_props.clone().first().cloned(); -match first_mock { + match first_mock { Some(mp) => { let mock_json = emit_data_value_json(&field_init_node_value(&mp), source_indices.clone()); let is_multi_field_conj = ((inferred.connective.clone() == Connective::Conj) && ((inferred.children.clone().len() as i64) > 1)); @@ -5284,19 +12558,58 @@ v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::con }, None => v2_rt::concat(log_line, "\ncompile_error!(\"mock property list was non-empty but first() returned None\")".to_string()), } -} + } } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(log_line, "\ncompile_error!(\"no mock data available for dry-run operation: ".to_string()), op_name.clone()), "\")".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + log_line, + "\ncompile_error!(\"no mock data available for dry-run operation: " + .to_string(), + ), + op_name.clone(), + ), + "\")".to_string(), + ) } -} + } } -pub fn emit_transport_call(transport: &Rc, op_name: String, registry: Rc>>, depth: i64, inferred: Rc, service_item: Rc, op_node: Rc, source_indices: &Rc>>, shared_types: Rc>, env: Rc) -> String { +pub fn emit_transport_call( + transport: &Rc, + op_name: String, + registry: Rc>>, + depth: i64, + inferred: Rc, + service_item: Rc, + op_node: Rc, + source_indices: &Rc>>, + shared_types: Rc>, + env: Rc, +) -> String { if is_rest_transport(transport.clone(), source_indices.clone()) { - emit_rest_call(op_name, &transport, registry, depth, service_item, op_node, &source_indices, shared_types, env) + emit_rest_call( + op_name, + &transport, + registry, + depth, + service_item, + op_node, + &source_indices, + shared_types, + env, + ) } else { if is_shell_transport(transport.clone()) { - emit_shell_call(op_name, &transport, registry, depth, inferred, &op_node, &source_indices) + emit_shell_call( + op_name, + &transport, + registry, + depth, + inferred, + &op_node, + &source_indices, + ) } else { if is_file_transport(transport.clone(), source_indices.clone()) { emit_file_call(op_name, inferred) @@ -5307,104 +12620,250 @@ pub fn emit_transport_call(transport: &Rc, op_name: String, registry: Rc, registry: Rc>>, depth: i64, service_item: Rc, op_node: Rc, source_indices: &Rc>>, shared_types: Rc>, env: Rc) -> String { - { - let client_init = "let client = reqwest::Client::builder().user_agent(\"gunbc/1.0\").build()?;".to_string(); -let url_line = emit_rest_url_line(transport.clone(), op_name, &source_indices); -let http_method = emit_rest_http_method(transport.clone(), &source_indices); -let auth_line = emit_rest_auth_line(&transport, &service_item, http_method, &source_indices); -let query_line = emit_rest_query_line(transport.clone(), &source_indices); -let body_line = emit_rest_body_line(transport.clone(), &source_indices); -let headers = transport_headers(transport.clone(), source_indices.clone()); -let header_lines = Rc::new({ let mut __result = Vec::new(); for h in headers.iter().cloned() { __result.push({ - let hval = field_init_node_value(&h); -let val_str = emit_simple_expr(&hval, &RenderTarget::Rust, &source_indices); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let request = request.header(\"".to_string(), field_init_node_name_at(h.clone(), source_indices.clone())), "\", ".to_string()), val_str.clone()), ");".to_string()) -}); } __result }); -let send_line = "let response = request.send().await?;".to_string(); -let response_handling = emit_response_code_handling(&op_node, transport.clone(), &source_indices, shared_types, env); -let all_lines = Rc::new({ let mut __result = Vec::new(); for l in v2_rt::concat(v2_rt::concat(Rc::new(vec![client_init, url_line, auth_line]), header_lines), Rc::new(vec![query_line, body_line, send_line, response_handling])).iter().cloned() { if (l.clone().as_str() != "".to_string().as_str()) { __result.push(l); } } __result }); -all_lines.join(&"\n".to_string()) -} +pub fn emit_rest_call( + op_name: String, + transport: &Rc, + registry: Rc>>, + depth: i64, + service_item: Rc, + op_node: Rc, + source_indices: &Rc>>, + shared_types: Rc>, + env: Rc, +) -> String { + { + let client_init = + "let client = reqwest::Client::builder().user_agent(\"gunbc/1.0\").build()?;" + .to_string(); + let url_line = emit_rest_url_line(transport.clone(), op_name, &source_indices); + let http_method = emit_rest_http_method(transport.clone(), &source_indices); + let auth_line = + emit_rest_auth_line(&transport, &service_item, http_method, &source_indices); + let query_line = emit_rest_query_line(transport.clone(), &source_indices); + let body_line = emit_rest_body_line(transport.clone(), &source_indices); + let headers = transport_headers(transport.clone(), source_indices.clone()); + let header_lines = Rc::new({ + let mut __result = Vec::new(); + for h in headers.iter().cloned() { + __result.push({ + let hval = field_init_node_value(&h); + let val_str = emit_simple_expr(&hval, &RenderTarget::Rust, &source_indices); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "let request = request.header(\"".to_string(), + field_init_node_name_at(h.clone(), source_indices.clone()), + ), + "\", ".to_string(), + ), + val_str.clone(), + ), + ");".to_string(), + ) + }); + } + __result + }); + let send_line = "let response = request.send().await?;".to_string(); + let response_handling = emit_response_code_handling( + &op_node, + transport.clone(), + &source_indices, + shared_types, + env, + ); + let all_lines = Rc::new({ + let mut __result = Vec::new(); + for l in v2_rt::concat( + v2_rt::concat( + Rc::new(vec![client_init, url_line, auth_line]), + header_lines, + ), + Rc::new(vec![query_line, body_line, send_line, response_handling]), + ) + .iter() + .cloned() + { + if (l.clone().as_str() != "".to_string().as_str()) { + __result.push(l); + } + } + __result + }); + all_lines.join(&"\n".to_string()) + } } -pub fn emit_rest_http_method(transport: Rc, source_indices: &Rc>>) -> String { +pub fn emit_rest_http_method( + transport: Rc, + source_indices: &Rc>>, +) -> String { match transport_method(transport, source_indices.clone()) { - Some(m) => match m.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { .. }) => { - let method_name = expr_var_name_at(m.clone(), source_indices.clone()); -Rc::new({ let mut __result = Vec::new(); for ch in Rc::new(method_name.chars().map(|c| c as i64).collect::>()).iter().cloned() { __result.push(to_lower_char(ch.clone())); } __result }).join(&"".to_string()) -}, - _ => "compile_error!(\"transport method type not resolved\")".to_string(), -}, - None => "compile_error!(\"transport method not specified\")".to_string(), -} + Some(m) => match m.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { .. }) => { + let method_name = expr_var_name_at(m.clone(), source_indices.clone()); + Rc::new({ + let mut __result = Vec::new(); + for ch in Rc::new(method_name.chars().map(|c| c as i64).collect::>()) + .iter() + .cloned() + { + __result.push(to_lower_char(ch.clone())); + } + __result + }) + .join(&"".to_string()) + } + _ => "compile_error!(\"transport method type not resolved\")".to_string(), + }, + None => "compile_error!(\"transport method not specified\")".to_string(), + } } -pub fn emit_rest_url_line(transport: Rc, op_name: String, source_indices: &Rc>>) -> String { +pub fn emit_rest_url_line( + transport: Rc, + op_name: String, + source_indices: &Rc>>, +) -> String { match transport_path_template(transport, source_indices.clone()) { - Some(path_node) => match (*path_node.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: path_str, .. } = value.as_ref() else { unreachable!() }; v2_rt::concat(v2_rt::concat("let url = format!(\"{}".to_string(), escape_string_literal_body(path_str.clone())), "\", self.base_url);".to_string()) }, - ExprData::ExprStringInterp => { - let parts = Rc::new({ let mut __result = Vec::new(); for child in path_node.children.clone().iter().cloned() { __result.push(match (*child.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: text, .. } = value.as_ref() else { unreachable!() }; Rc::new(StringPart::Text { - value: text.clone(), -}) }, - _ => Rc::new(StringPart::Interpolation { - expr: arg_value(&child), -}), -}); } __result }); -let fmt_segments = Rc::new({ let mut __result = Vec::new(); for p in parts.clone().iter().cloned() { __result.push(match (*p.clone()).clone() { - StringPart::Text { value: v, .. } => escape_rust_interp_text(v.clone()), - StringPart::Interpolation { .. } => "{}".to_string(), -}); } __result }); -let fmt_str = fmt_segments.join(&"".to_string()); -let args = Rc::new({ let mut __result = Vec::new(); for p in parts.clone().iter().cloned() { __result.extend((*match (*p.clone()).clone() { - StringPart::Text { .. } => Rc::new(vec![]), - StringPart::Interpolation { expr: e, .. } => { - let var_name = emit_ident(expr_var_name_at(e.clone(), source_indices.clone()), RenderTarget::Rust); -let is_opt = is_optional_typed_expr(e.clone()); -if is_opt.clone() { - Rc::new(vec![v2_rt::concat(var_name.clone(), ".as_deref().unwrap_or(\"\")".to_string())]) - } else { - Rc::new(vec![var_name.clone()]) + Some(path_node) => match (*path_node.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitStr { + value: path_str, .. + } = value.as_ref() + else { + unreachable!() + }; + v2_rt::concat( + v2_rt::concat( + "let url = format!(\"{}".to_string(), + escape_string_literal_body(path_str.clone()), + ), + "\", self.base_url);".to_string(), + ) } -}, -}).iter().cloned()); } __result }); -if ((args.clone().len() as i64) == 0) { - v2_rt::concat(v2_rt::concat("let url = format!(\"{}".to_string(), fmt_str), "\", self.base_url);".to_string()) - } else { - { - let args_str = args.clone().join(&", ".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let url = format!(\"{}".to_string(), fmt_str), "\", self.base_url, ".to_string()), args_str), ");".to_string()) -} - } -}, - _ => "compile_error!(\"transport path must be a string literal or interpolation\");".to_string(), -}, - None => v2_rt::concat(v2_rt::concat("let url = format!(\"{}/{}\", self.base_url, \"".to_string(), emit_ident(op_name, RenderTarget::Rust)), "\");".to_string()), -} + ExprData::ExprStringInterp => { + let parts = Rc::new({ + let mut __result = Vec::new(); + for child in path_node.children.clone().iter().cloned() { + __result.push(match (*child.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitStr { value: text, .. } = value.as_ref() + else { + unreachable!() + }; + Rc::new(StringPart::Text { + value: text.clone(), + }) + } + _ => Rc::new(StringPart::Interpolation { + expr: arg_value(&child), + }), + }); + } + __result + }); + let fmt_segments = Rc::new({ + let mut __result = Vec::new(); + for p in parts.clone().iter().cloned() { + __result.push(match (*p.clone()).clone() { + StringPart::Text { value: v, .. } => escape_rust_interp_text(v.clone()), + StringPart::Interpolation { .. } => "{}".to_string(), + }); + } + __result + }); + let fmt_str = fmt_segments.join(&"".to_string()); + let args = Rc::new({ + let mut __result = Vec::new(); + for p in parts.clone().iter().cloned() { + __result.extend( + (*match (*p.clone()).clone() { + StringPart::Text { .. } => Rc::new(vec![]), + StringPart::Interpolation { expr: e, .. } => { + let var_name = emit_ident( + expr_var_name_at(e.clone(), source_indices.clone()), + RenderTarget::Rust, + ); + let is_opt = is_optional_typed_expr(e.clone()); + if is_opt.clone() { + Rc::new(vec![v2_rt::concat( + var_name.clone(), + ".as_deref().unwrap_or(\"\")".to_string(), + )]) + } else { + Rc::new(vec![var_name.clone()]) + } + } + }) + .iter() + .cloned(), + ); + } + __result + }); + if ((args.clone().len() as i64) == 0) { + v2_rt::concat( + v2_rt::concat("let url = format!(\"{}".to_string(), fmt_str), + "\", self.base_url);".to_string(), + ) + } else { + { + let args_str = args.clone().join(&", ".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("let url = format!(\"{}".to_string(), fmt_str), + "\", self.base_url, ".to_string(), + ), + args_str, + ), + ");".to_string(), + ) + } + } + } + _ => "compile_error!(\"transport path must be a string literal or interpolation\");" + .to_string(), + }, + None => v2_rt::concat( + v2_rt::concat( + "let url = format!(\"{}/{}\", self.base_url, \"".to_string(), + emit_ident(op_name, RenderTarget::Rust), + ), + "\");".to_string(), + ), + } } -pub fn emit_rest_auth_line(transport: &Rc, service_item: &Rc, http_method: String, source_indices: &Rc>>) -> String { +pub fn emit_rest_auth_line( + transport: &Rc, + service_item: &Rc, + http_method: String, + source_indices: &Rc>>, +) -> String { { let auth_scheme = service_config_auth(service_item.clone(), source_indices.clone()); -let auth_input = service_config_auth_input(service_item.clone(), source_indices.clone()); -match auth_scheme { - Some(auth) => { - let has_auth_source = match service_config_auth_source(service_item.clone(), source_indices.clone()) { - Some(_) => true, - None => false, -}; -let token_param = if has_auth_source { - "self.auth_token.clone()".to_string() - } else { - match auth_input { + let auth_input = service_config_auth_input(service_item.clone(), source_indices.clone()); + match auth_scheme { + Some(auth) => { + let has_auth_source = match service_config_auth_source( + service_item.clone(), + source_indices.clone(), + ) { + Some(_) => true, + None => false, + }; + let token_param = if has_auth_source { + "self.auth_token.clone()".to_string() + } else { + match auth_input { Some(ai) => emit_simple_expr(&ai, &RenderTarget::Rust, &source_indices), None => "compile_error!(\"service config has auth but no auth_input or auth_source\")".to_string(), } - }; -match (*auth.expr_data.clone()).clone() { + }; + match (*auth.expr_data.clone()).clone() { ExprData::ExprVar { .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let request = client.".to_string(), http_method), "(&url)\n .header(\"Authorization\", format!(\"Bearer {}\", ".to_string()), token_param), "));".to_string()), ExprData::ExprCall { .. } => { let header_name = match auth.children.clone().first().cloned() { @@ -5418,41 +12877,104 @@ v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::con }, _ => v2_rt::concat(v2_rt::concat("compile_error!(\"unrecognized auth scheme expression shape\"); let request = client.".to_string(), http_method), "(&url);".to_string()), } -}, - None => if transport_has_auth(transport.clone(), source_indices.clone()) { - { - let header_name = match transport_auth_header_name(transport.clone(), source_indices.clone()) { - Some(h) => h.clone(), - None => "Authorization".to_string(), -}; -let token_node = match transport_auth_token(transport.clone(), source_indices.clone()) { - Some(tn) => emit_simple_expr(&tn, &RenderTarget::Rust, &source_indices), - None => "\"\"".to_string(), -}; -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let request = client.".to_string(), http_method), "(&url)\n .header(\"".to_string()), header_name), "\", ".to_string()), token_node), ");".to_string()) -} - } else { - v2_rt::concat(v2_rt::concat("let request = client.".to_string(), http_method), "(&url);".to_string()) - }, -} -} + } + None => { + if transport_has_auth(transport.clone(), source_indices.clone()) { + { + let header_name = match transport_auth_header_name( + transport.clone(), + source_indices.clone(), + ) { + Some(h) => h.clone(), + None => "Authorization".to_string(), + }; + let token_node = + match transport_auth_token(transport.clone(), source_indices.clone()) { + Some(tn) => { + emit_simple_expr(&tn, &RenderTarget::Rust, &source_indices) + } + None => "\"\"".to_string(), + }; + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "let request = client.".to_string(), + http_method, + ), + "(&url)\n .header(\"".to_string(), + ), + header_name, + ), + "\", ".to_string(), + ), + token_node, + ), + ");".to_string(), + ) + } + } else { + v2_rt::concat( + v2_rt::concat("let request = client.".to_string(), http_method), + "(&url);".to_string(), + ) + } + } + } + } } -pub fn emit_rest_query_line(transport: Rc, source_indices: &Rc>>) -> String { +pub fn emit_rest_query_line( + transport: Rc, + source_indices: &Rc>>, +) -> String { match transport_query(transport, source_indices.clone()) { - Some(q) => { - let pairs = Rc::new({ let mut __result = Vec::new(); for fi in q.children.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("(\"".to_string(), field_init_node_name_at(fi.clone(), source_indices.clone())), "\", &".to_string()), emit_simple_expr(&field_init_node_value(&fi), &RenderTarget::Rust, &source_indices)), ".to_string())".to_string())); } __result }); -if ((pairs.clone().len() as i64) > 0) { - v2_rt::concat(v2_rt::concat("let request = request.query(&[".to_string(), pairs.clone().join(&", ".to_string())), "]);".to_string()) - } else { - "".to_string() + Some(q) => { + let pairs = Rc::new({ + let mut __result = Vec::new(); + for fi in q.children.clone().iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "(\"".to_string(), + field_init_node_name_at(fi.clone(), source_indices.clone()), + ), + "\", &".to_string(), + ), + emit_simple_expr( + &field_init_node_value(&fi), + &RenderTarget::Rust, + &source_indices, + ), + ), + ".to_string())".to_string(), + )); + } + __result + }); + if ((pairs.clone().len() as i64) > 0) { + v2_rt::concat( + v2_rt::concat( + "let request = request.query(&[".to_string(), + pairs.clone().join(&", ".to_string()), + ), + "]);".to_string(), + ) + } else { + "".to_string() + } } -}, - None => "".to_string(), -} + None => "".to_string(), + } } -pub fn emit_rest_body_line(transport: Rc, source_indices: &Rc>>) -> String { +pub fn emit_rest_body_line( + transport: Rc, + source_indices: &Rc>>, +) -> String { match transport_request_body(transport, source_indices.clone()) { Some(b) => match (*b.expr_data.clone()).clone() { ExprData::ExprRecordLit { .. } => { @@ -5492,74 +13014,161 @@ pub fn has_response_prefix(name: &String) -> bool { } } -pub fn child_from_key(ch: Rc, source_indices: Rc>>) -> Option { - match Rc::new({ let mut __result = Vec::new(); for p in ch.properties.clone().iter().cloned() { if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() == "from_key".to_string().as_str()) { __result.push(p); } } __result }).first().cloned() { - Some(prop) => match (*field_init_node_value(&prop).expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { unreachable!() }; Some(s.clone()) }, - _ => None, -}, - None => None, -} +pub fn child_from_key( + ch: Rc, + source_indices: Rc>>, +) -> Option { + match Rc::new({ + let mut __result = Vec::new(); + for p in ch.properties.clone().iter().cloned() { + if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() + == "from_key".to_string().as_str()) + { + __result.push(p); + } + } + __result + }) + .first() + .cloned() + { + Some(prop) => match (*field_init_node_value(&prop).expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { + unreachable!() + }; + Some(s.clone()) + } + _ => None, + }, + None => None, + } } -pub fn has_from_key_fields(op_node: Rc, source_indices: Rc>>) -> bool { +pub fn has_from_key_fields( + op_node: Rc, + source_indices: Rc>>, +) -> bool { { let rt = resolved_type(op_node); -let is_conj = (rt.connective.clone() == Connective::Conj); -let from_key_count = (Rc::new({ let mut __result = Vec::new(); for ch in rt.children.clone().iter().cloned() { if match child_from_key(ch.clone(), source_indices.clone()) { - Some(_) => true, - None => false, -} { __result.push(ch); } } __result }).len() as i64); -(is_conj && (from_key_count > 0)) -} + let is_conj = (rt.connective.clone() == Connective::Conj); + let from_key_count = (Rc::new({ + let mut __result = Vec::new(); + for ch in rt.children.clone().iter().cloned() { + if match child_from_key(ch.clone(), source_indices.clone()) { + Some(_) => true, + None => false, + } { + __result.push(ch); + } + } + __result + }) + .len() as i64); + (is_conj && (from_key_count > 0)) + } } -pub fn has_response_200_property(op_node: Rc, source_indices: Rc>>) -> bool { - { let mut __found = false; for p in op_node.properties.clone().iter().cloned() { if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() == "response_200".to_string().as_str()) { __found = true; break; } } __found } +pub fn has_response_200_property( + op_node: Rc, + source_indices: Rc>>, +) -> bool { + { + let mut __found = false; + for p in op_node.properties.clone().iter().cloned() { + if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() + == "response_200".to_string().as_str()) + { + __found = true; + break; + } + } + __found + } } -pub fn operation_response_200_resolved_type(op_node: Rc, source_indices: &Rc>>, env: Rc) -> Option> { - match Rc::new({ let mut __result = Vec::new(); for p in op_node.properties.clone().iter().cloned() { if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() == "response_200".to_string().as_str()) { __result.push(p); } } __result }).first().cloned() { - Some(p) => { - let v = field_init_node_value(&p); -match v.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: tn, .. }) => Some(tn.clone()), - _ => { - let type_name = authored_name_at(source_indices.clone(), &normalize_access_type_node(v.clone())); -if (type_name.clone().as_str() == "".to_string().as_str()) { - None - } else { - lookup_type_by_name(&env, type_name.clone()) +pub fn operation_response_200_resolved_type( + op_node: Rc, + source_indices: &Rc>>, + env: Rc, +) -> Option> { + match Rc::new({ + let mut __result = Vec::new(); + for p in op_node.properties.clone().iter().cloned() { + if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() + == "response_200".to_string().as_str()) + { + __result.push(p); } -}, -} -}, - None => None, -} + } + __result + }) + .first() + .cloned() + { + Some(p) => { + let v = field_init_node_value(&p); + match v.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: tn, .. }) => Some(tn.clone()), + _ => { + let type_name = authored_name_at( + source_indices.clone(), + &normalize_access_type_node(v.clone()), + ); + if (type_name.clone().as_str() == "".to_string().as_str()) { + None + } else { + lookup_type_by_name(&env, type_name.clone()) + } + } + } + } + None => None, + } } -pub fn is_json_wire_declaration_type(t: Rc, source_indices: Rc>>) -> bool { +pub fn is_json_wire_declaration_type( + t: Rc, + source_indices: Rc>>, +) -> bool { { let n = authored_name_at(source_indices, &normalize_access_type_node(t)); -if (n.clone().as_str() == "Json".to_string().as_str()) { + if (n.clone().as_str() == "Json".to_string().as_str()) { true } else { { - let parts = Rc::new(n.clone().split(&".".to_string()).map(|s| s.to_string()).collect::>()); -match parts.last().cloned() { - Some(last) => (last.clone().as_str() == "Json".to_string().as_str()), - None => false, -} -} + let parts = Rc::new( + n.clone() + .split(&".".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ); + match parts.last().cloned() { + Some(last) => (last.clone().as_str() == "Json".to_string().as_str()), + None => false, + } + } } -} + } } pub fn path_segment_is_list_index(seg: &String) -> bool { if (v2_rt::string_length(&seg) == 0) { false } else { - { let mut __all = true; for c in Rc::new(seg.clone().chars().map(|c| c as i64).collect::>()).iter().cloned() { if !(((c.clone() >= 48) && (c.clone() <= 57))) { __all = false; break; } } __all } + { + let mut __all = true; + for c in Rc::new(seg.clone().chars().map(|c| c as i64).collect::>()) + .iter() + .cloned() + { + if !((c.clone() >= 48) && (c.clone() <= 57)) { + __all = false; + break; + } + } + __all + } } } @@ -5570,146 +13179,337 @@ pub struct WirePathProjection { pub ok: bool, } -pub fn wire_child_for_segment(wire_node: Rc, seg: String, source_indices: Rc>>) -> Option> { +pub fn wire_child_for_segment( + wire_node: Rc, + seg: String, + source_indices: Rc>>, +) -> Option> { { let normed = normalize_access_type_node(wire_node); -match Rc::new({ let mut __result = Vec::new(); for ch in normed.children.clone().iter().cloned() { if { - let authored = authored_name_at(source_indices.clone(), &ch); -let wire_key = match child_from_key(ch.clone(), source_indices.clone()) { - Some(k) => k.clone(), - None => authored.clone(), -}; -(wire_key.clone().as_str() == seg.clone().as_str()) -} { __result.push(ch); } } __result }).first().cloned() { - Some(ch) => Some(ch.clone()), - None => None, -} -} + match Rc::new({ + let mut __result = Vec::new(); + for ch in normed.children.clone().iter().cloned() { + if { + let authored = authored_name_at(source_indices.clone(), &ch); + let wire_key = match child_from_key(ch.clone(), source_indices.clone()) { + Some(k) => k.clone(), + None => authored.clone(), + }; + (wire_key.clone().as_str() == seg.clone().as_str()) + } { + __result.push(ch); + } + } + __result + }) + .first() + .cloned() + { + Some(ch) => Some(ch.clone()), + None => None, + } + } } -pub fn advance_wire_path_projection(state: &Rc, seg: &String, full_path: String, source_indices: &Rc>>) -> Rc { +pub fn advance_wire_path_projection( + state: &Rc, + seg: &String, + full_path: String, + source_indices: &Rc>>, +) -> Rc { if !state.ok.clone() { state.clone() } else { if path_segment_is_list_index(&seg) { { let next_node = match state.node.clone() { - Some(n) => Some(for_each_element_type_node(n.clone(), source_indices.clone())), - None => None, -}; -Rc::new(WirePathProjection { - expr: v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("(".to_string(), state.expr.clone()), ").get(".to_string()), seg.clone()), ").ok_or_else(|| format!(\"REST path missing index ".to_string()), seg.clone()), " at ".to_string()), full_path), "\"))?".to_string()), - node: next_node, - ok: true, -}) -} + Some(n) => Some(for_each_element_type_node( + n.clone(), + source_indices.clone(), + )), + None => None, + }; + Rc::new(WirePathProjection { + expr: v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("(".to_string(), state.expr.clone()), + ").get(".to_string(), + ), + seg.clone(), + ), + ").ok_or_else(|| format!(\"REST path missing index " + .to_string(), + ), + seg.clone(), + ), + " at ".to_string(), + ), + full_path, + ), + "\"))?".to_string(), + ), + node: next_node, + ok: true, + }) + } } else { match state.node.clone() { - Some(n) => match wire_child_for_segment(n.clone(), seg.clone(), source_indices.clone()) { - Some(ch) => Rc::new(WirePathProjection { - expr: v2_rt::concat(v2_rt::concat(v2_rt::concat("(".to_string(), state.expr.clone()), ").".to_string()), emit_ident(authored_name_at(source_indices.clone(), &ch), RenderTarget::Rust)), - node: Some(resolved_type(ch.clone())), - ok: true, -}), - None => Rc::new(WirePathProjection { - expr: state.expr.clone(), - node: None, - ok: false, -}), -}, - None => Rc::new(WirePathProjection { - expr: state.expr.clone(), - node: None, - ok: false, -}), -} + Some(n) => { + match wire_child_for_segment(n.clone(), seg.clone(), source_indices.clone()) { + Some(ch) => Rc::new(WirePathProjection { + expr: v2_rt::concat( + v2_rt::concat( + v2_rt::concat("(".to_string(), state.expr.clone()), + ").".to_string(), + ), + emit_ident( + authored_name_at(source_indices.clone(), &ch), + RenderTarget::Rust, + ), + ), + node: Some(resolved_type(ch.clone())), + ok: true, + }), + None => Rc::new(WirePathProjection { + expr: state.expr.clone(), + node: None, + ok: false, + }), + } + } + None => Rc::new(WirePathProjection { + expr: state.expr.clone(), + node: None, + ok: false, + }), + } } } } -pub fn emit_wire_struct_path_chain(base: String, wire_node: Rc, from_path: &String, source_indices: Rc>>) -> Rc { - { - let segs = Rc::new({ let mut __result = Vec::new(); for s in Rc::new(from_path.clone().split(&"/".to_string()).map(|s| s.to_string()).collect::>()).iter().cloned() { if (s.clone().as_str() != "".to_string().as_str()) { __result.push(s); } } __result }); -segs.iter().cloned().fold(Rc::new(WirePathProjection { - expr: base, - node: Some(wire_node), - ok: true, -}), |acc: Rc, seg: String| advance_wire_path_projection(&acc, &seg, from_path.clone(), &source_indices)) -} +pub fn emit_wire_struct_path_chain( + base: String, + wire_node: Rc, + from_path: &String, + source_indices: Rc>>, +) -> Rc { + { + let segs = Rc::new({ + let mut __result = Vec::new(); + for s in Rc::new( + from_path + .clone() + .split(&"/".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .iter() + .cloned() + { + if (s.clone().as_str() != "".to_string().as_str()) { + __result.push(s); + } + } + __result + }); + segs.iter().cloned().fold( + Rc::new(WirePathProjection { + expr: base, + node: Some(wire_node), + ok: true, + }), + |acc: Rc, seg: String| { + advance_wire_path_projection(&acc, &seg, from_path.clone(), &source_indices) + }, + ) + } } -pub fn emit_typed_wire_field_assign(field_name: String, from_path: &String, wire_node: Rc, source_indices: Rc>>) -> String { - { - let projection = emit_wire_struct_path_chain("__rest_wire".to_string(), wire_node, &from_path, source_indices); -if projection.ok.clone() { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let ".to_string(), field_name), " = ".to_string()), projection.expr.clone()), ".clone();\n".to_string()) +pub fn emit_typed_wire_field_assign( + field_name: String, + from_path: &String, + wire_node: Rc, + source_indices: Rc>>, +) -> String { + { + let projection = emit_wire_struct_path_chain( + "__rest_wire".to_string(), + wire_node, + &from_path, + source_indices, + ); + if projection.ok.clone() { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("let ".to_string(), field_name), + " = ".to_string(), + ), + projection.expr.clone(), + ), + ".clone();\n".to_string(), + ) } else { v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let ".to_string(), field_name), " = compile_error!(\"REST typed response path could not be resolved against declared 200 body: ".to_string()), from_path.clone()), "\");\n".to_string()) } -} + } } pub fn escape_json_pointer_segment(seg: String) -> String { - v2_rt::replace(v2_rt::replace(seg, "~".to_string(), "~0".to_string()), "/".to_string(), "~1".to_string()) -} - -pub fn emit_json_value_extract(var_name: String, from_path: &String, dag_type_name: String) -> String { - { - let escaped_path = Rc::new({ let mut __result = Vec::new(); for seg in Rc::new(from_path.clone().split(&"/".to_string()).map(|s| s.to_string()).collect::>()).iter().cloned() { __result.push(escape_json_pointer_segment(seg.clone())); } __result }).join(&"/".to_string()); -let pointer = v2_rt::concat("/".to_string(), escaped_path); -let rust_type = coerce_primitive_type(RenderTarget::Rust, dag_type_name); -let accessor = if (rust_type.clone().as_str() == "String".to_string().as_str()) { - v2_rt::concat(v2_rt::concat(".and_then(|v| v.as_str()).map(|s| s.to_string()).ok_or(\"missing field: ".to_string(), from_path.clone()), "\")?".to_string()) + v2_rt::replace( + v2_rt::replace(seg, "~".to_string(), "~0".to_string()), + "/".to_string(), + "~1".to_string(), + ) +} + +pub fn emit_json_value_extract( + var_name: String, + from_path: &String, + dag_type_name: String, +) -> String { + { + let escaped_path = Rc::new({ + let mut __result = Vec::new(); + for seg in Rc::new( + from_path + .clone() + .split(&"/".to_string()) + .map(|s| s.to_string()) + .collect::>(), + ) + .iter() + .cloned() + { + __result.push(escape_json_pointer_segment(seg.clone())); + } + __result + }) + .join(&"/".to_string()); + let pointer = v2_rt::concat("/".to_string(), escaped_path); + let rust_type = coerce_primitive_type(RenderTarget::Rust, dag_type_name); + let accessor = if (rust_type.clone().as_str() == "String".to_string().as_str()) { + v2_rt::concat( + v2_rt::concat( + ".and_then(|v| v.as_str()).map(|s| s.to_string()).ok_or(\"missing field: " + .to_string(), + from_path.clone(), + ), + "\")?".to_string(), + ) } else { if (rust_type.clone().as_str() == "i64".to_string().as_str()) { - v2_rt::concat(v2_rt::concat(".and_then(|v| v.as_i64()).ok_or(\"missing field: ".to_string(), from_path.clone()), "\")?".to_string()) + v2_rt::concat( + v2_rt::concat( + ".and_then(|v| v.as_i64()).ok_or(\"missing field: ".to_string(), + from_path.clone(), + ), + "\")?".to_string(), + ) } else { if (rust_type.clone().as_str() == "f64".to_string().as_str()) { - v2_rt::concat(v2_rt::concat(".and_then(|v| v.as_f64()).ok_or(\"missing field: ".to_string(), from_path.clone()), "\")?".to_string()) + v2_rt::concat( + v2_rt::concat( + ".and_then(|v| v.as_f64()).ok_or(\"missing field: ".to_string(), + from_path.clone(), + ), + "\")?".to_string(), + ) } else { if (rust_type.clone().as_str() == "bool".to_string().as_str()) { - v2_rt::concat(v2_rt::concat(".and_then(|v| v.as_bool()).ok_or(\"missing field: ".to_string(), from_path.clone()), "\")?".to_string()) + v2_rt::concat( + v2_rt::concat( + ".and_then(|v| v.as_bool()).ok_or(\"missing field: ".to_string(), + from_path.clone(), + ), + "\")?".to_string(), + ) } else { v2_rt::concat(v2_rt::concat(".cloned().map(|v| serde_json::from_value(v)).transpose()?.ok_or(\"missing field: ".to_string(), from_path.clone()), "\")?".to_string()) } } } }; -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let ".to_string(), var_name), " = json_body.pointer(\"".to_string()), pointer), "\")".to_string()), accessor), ";".to_string()) -} + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("let ".to_string(), var_name), + " = json_body.pointer(\"".to_string(), + ), + pointer, + ), + "\")".to_string(), + ), + accessor, + ), + ";".to_string(), + ) + } } -pub fn emit_from_key_extraction(op_node: &Rc, source_indices: &Rc>>, shared_types: Rc>, env: Rc) -> String { +pub fn emit_from_key_extraction( + op_node: &Rc, + source_indices: &Rc>>, + shared_types: Rc>, + env: Rc, +) -> String { { let rt = resolved_type(op_node.clone()); -let children = rt.children.clone(); -let wire_opt = operation_response_200_resolved_type(op_node.clone(), &source_indices, env); -if (has_response_200_property(op_node.clone(), source_indices.clone()) && match wire_opt.clone() { - None => true, - Some(_) => false, -}) { + let children = rt.children.clone(); + let wire_opt = operation_response_200_resolved_type(op_node.clone(), &source_indices, env); + if (has_response_200_property(op_node.clone(), source_indices.clone()) + && match wire_opt.clone() { + None => true, + Some(_) => false, + }) + { "compile_error!(\"REST response_200: declared HTTP 200 body type is present but could not be resolved (empty name, missing TypeEnv binding, or inference gap); illegal state\");\n".to_string() } else { { let use_typed_wire = match wire_opt.clone() { - Some(tn) => !is_json_wire_declaration_type(tn.clone(), source_indices.clone()), - None => false, -}; -let prelude = match wire_opt.clone() { - Some(tn) => if is_json_wire_declaration_type(tn.clone(), source_indices.clone()) { - "let json_body: serde_json::Value = response.json().await?;\n".to_string() - } else { - { - let wire_ty = match tn.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => rt.clone(), - _ => tn.clone(), -}; -v2_rt::concat(v2_rt::concat("let __rest_wire: ".to_string(), render_rust_type(wire_ty, shared_types, source_indices.clone())), " = response.json().await?;\n".to_string()) -} - }, - None => "let json_body: serde_json::Value = response.json().await?;\n".to_string(), -}; -let extract_lines = Rc::new({ let mut __result = Vec::new(); for ch in children.clone().iter().cloned() { __result.push({ + Some(tn) => !is_json_wire_declaration_type(tn.clone(), source_indices.clone()), + None => false, + }; + let prelude = match wire_opt.clone() { + Some(tn) => { + if is_json_wire_declaration_type(tn.clone(), source_indices.clone()) { + "let json_body: serde_json::Value = response.json().await?;\n" + .to_string() + } else { + { + let wire_ty = match tn.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => rt.clone(), + _ => tn.clone(), + }; + v2_rt::concat( + v2_rt::concat( + "let __rest_wire: ".to_string(), + render_rust_type( + wire_ty, + shared_types, + source_indices.clone(), + ), + ), + " = response.json().await?;\n".to_string(), + ) + } + } + } + None => { + "let json_body: serde_json::Value = response.json().await?;\n".to_string() + } + }; + let extract_lines = Rc::new({ + let mut __result = Vec::new(); + for ch in children.clone().iter().cloned() { + __result.push({ let ch_name = authored_name_at(source_indices.clone(), &ch); let field_name = emit_ident(ch_name.clone(), RenderTarget::Rust); let from_path = match child_from_key(ch.clone(), source_indices.clone()) { @@ -5727,83 +13527,201 @@ match ch.inferred.clone().as_deref().cloned() { }, _ => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let ".to_string(), field_name.clone()), " = compile_error!(\"unresolved type for output field: ".to_string()), ch_name.clone()), "\");".to_string()), } -}); } __result }); -let field_names = Rc::new({ let mut __result = Vec::new(); for ch in children.clone().iter().cloned() { __result.push(emit_ident(authored_name_at(source_indices.clone(), &ch), RenderTarget::Rust)); } __result }); -let tuple_body = if ((field_names.clone().len() as i64) == 1) { - v2_rt::concat(v2_rt::concat("(".to_string(), field_names.clone().first().cloned().clone().unwrap()), ",)".to_string()) +}); + } + __result + }); + let field_names = Rc::new({ + let mut __result = Vec::new(); + for ch in children.clone().iter().cloned() { + __result.push(emit_ident( + authored_name_at(source_indices.clone(), &ch), + RenderTarget::Rust, + )); + } + __result + }); + let tuple_body = if ((field_names.clone().len() as i64) == 1) { + v2_rt::concat( + v2_rt::concat( + "(".to_string(), + field_names.clone().first().cloned().clone().unwrap(), + ), + ",)".to_string(), + ) } else { - v2_rt::concat(v2_rt::concat("(".to_string(), field_names.clone().join(&", ".to_string())), ")".to_string()) + v2_rt::concat( + v2_rt::concat("(".to_string(), field_names.clone().join(&", ".to_string())), + ")".to_string(), + ) }; -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(prelude, extract_lines.join(&"\n".to_string())), "\nOk(".to_string()), tuple_body), ")".to_string()) -} + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(prelude, extract_lines.join(&"\n".to_string())), + "\nOk(".to_string(), + ), + tuple_body, + ), + ")".to_string(), + ) + } } -} + } } -pub fn emit_plain_response_body(op_node: Rc, transport: Rc, source_indices: &Rc>>) -> String { +pub fn emit_plain_response_body( + op_node: Rc, + transport: Rc, + source_indices: &Rc>>, +) -> String { { let is_text = match transport_response_format(transport, source_indices.clone()) { - Some(fmt) => (authored_name_at(source_indices.clone(), &fmt).as_str() == "Text".to_string().as_str()), - None => false, -}; -if is_text { + Some(fmt) => { + (authored_name_at(source_indices.clone(), &fmt).as_str() + == "Text".to_string().as_str()) + } + None => false, + }; + if is_text { "let result = response.text().await?;\nOk(result)".to_string() } else { "let result = response.json().await?;\nOk(result)".to_string() } -} + } } -pub fn emit_response_code_handling(op_node: &Rc, transport: Rc, source_indices: &Rc>>, shared_types: Rc>, env: Rc) -> String { +pub fn emit_response_code_handling( + op_node: &Rc, + transport: Rc, + source_indices: &Rc>>, + shared_types: Rc>, + env: Rc, +) -> String { { let use_from_key = has_from_key_fields(op_node.clone(), source_indices.clone()); -let response_props = Rc::new({ let mut __result = Vec::new(); for p in op_node.properties.clone().iter().cloned() { if has_response_prefix(&field_init_node_name_at(p.clone(), source_indices.clone())) { __result.push(p); } } __result }); -if ((response_props.clone().len() as i64) == 0) { + let response_props = Rc::new({ + let mut __result = Vec::new(); + for p in op_node.properties.clone().iter().cloned() { + if has_response_prefix(&field_init_node_name_at(p.clone(), source_indices.clone())) + { + __result.push(p); + } + } + __result + }); + if ((response_props.clone().len() as i64) == 0) { if use_from_key.clone() { - emit_from_key_extraction(&op_node, &source_indices, shared_types.clone(), env.clone()) + emit_from_key_extraction( + &op_node, + &source_indices, + shared_types.clone(), + env.clone(), + ) } else { emit_plain_response_body(op_node.clone(), transport.clone(), &source_indices) } } else { { - let arms = Rc::new({ let mut __result = Vec::new(); for p in response_props.clone().iter().cloned() { __result.push(emit_response_arm(p.clone(), op_node.clone(), use_from_key.clone(), transport.clone(), &source_indices, shared_types.clone(), env.clone())); } __result }); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let status = response.status().as_u16();\n".to_string(), "match status {\n".to_string()), arms.join(&"\n".to_string())), "\n _ => Err(format!(\"unexpected status code: {}\", status).into())\n".to_string()), "}".to_string()) -} + let arms = Rc::new({ + let mut __result = Vec::new(); + for p in response_props.clone().iter().cloned() { + __result.push(emit_response_arm( + p.clone(), + op_node.clone(), + use_from_key.clone(), + transport.clone(), + &source_indices, + shared_types.clone(), + env.clone(), + )); + } + __result + }); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "let status = response.status().as_u16();\n".to_string(), + "match status {\n".to_string(), + ), + arms.join(&"\n".to_string()), + ), + "\n _ => Err(format!(\"unexpected status code: {}\", status).into())\n" + .to_string(), + ), + "}".to_string(), + ) + } } -} + } } -pub fn emit_response_arm(prop: Rc, op_node: Rc, use_from_key: bool, transport: Rc, source_indices: &Rc>>, shared_types: Rc>, env: Rc) -> String { +pub fn emit_response_arm( + prop: Rc, + op_node: Rc, + use_from_key: bool, + transport: Rc, + source_indices: &Rc>>, + shared_types: Rc>, + env: Rc, +) -> String { { let name = field_init_node_name_at(prop, source_indices.clone()); -let code_str = v2_rt::substring(&name, 9, v2_rt::string_length(&name)); -let is_success = if (v2_rt::string_length(&code_str) >= 1) { + let code_str = v2_rt::substring(&name, 9, v2_rt::string_length(&name)); + let is_success = if (v2_rt::string_length(&code_str) >= 1) { (v2_rt::substring(&code_str, 0, 1).as_str() == "2".to_string().as_str()) } else { false }; -let pattern = if (code_str.clone().as_str() == "nonzero".to_string().as_str()) { + let pattern = if (code_str.clone().as_str() == "nonzero".to_string().as_str()) { "_".to_string() } else { - if ((v2_rt::string_length(&code_str) == 3) && (v2_rt::substring(&code_str, 1, 3).as_str() == "xx".to_string().as_str())) { + if ((v2_rt::string_length(&code_str) == 3) + && (v2_rt::substring(&code_str, 1, 3).as_str() == "xx".to_string().as_str())) + { { let prefix = v2_rt::substring(&code_str, 0, 1); -v2_rt::concat(v2_rt::concat(v2_rt::concat(prefix.clone(), "00..=".to_string()), prefix.clone()), "99".to_string()) -} + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(prefix.clone(), "00..=".to_string()), + prefix.clone(), + ), + "99".to_string(), + ) + } } else { code_str.clone() } }; -if is_success { + if is_success { if use_from_key { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), pattern), " => { ".to_string()), emit_from_key_extraction(&op_node, &source_indices, shared_types, env)), " },".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(" ".to_string(), pattern), + " => { ".to_string(), + ), + emit_from_key_extraction(&op_node, &source_indices, shared_types, env), + ), + " },".to_string(), + ) } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), pattern), " => { ".to_string()), emit_plain_response_body(op_node, transport, &source_indices)), " },".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(" ".to_string(), pattern), + " => { ".to_string(), + ), + emit_plain_response_body(op_node, transport, &source_indices), + ), + " },".to_string(), + ) } } else { v2_rt::concat(v2_rt::concat(" ".to_string(), pattern), " => { let err_body = response.text().await.unwrap_or_default(); Err(format!(\"HTTP {}: {}\", status, err_body).into()) },".to_string()) } -} + } } pub fn has_exit_prefix(name: &String) -> bool { @@ -5814,205 +13732,472 @@ pub fn has_exit_prefix(name: &String) -> bool { } } -pub fn emit_exit_code_handling(op_node: Rc, inferred: Rc, source_indices: Rc>>) -> String { +pub fn emit_exit_code_handling( + op_node: Rc, + inferred: Rc, + source_indices: Rc>>, +) -> String { { - let exit_props = Rc::new({ let mut __result = Vec::new(); for p in op_node.properties.clone().iter().cloned() { if has_exit_prefix(&field_init_node_name_at(p.clone(), source_indices.clone())) { __result.push(p); } } __result }); -if ((exit_props.clone().len() as i64) == 0) { + let exit_props = Rc::new({ + let mut __result = Vec::new(); + for p in op_node.properties.clone().iter().cloned() { + if has_exit_prefix(&field_init_node_name_at(p.clone(), source_indices.clone())) { + __result.push(p); + } + } + __result + }); + if ((exit_props.clone().len() as i64) == 0) { emit_shell_return(inferred.clone(), &source_indices) } else { { - let has_nonzero = { let mut __found = false; for p in exit_props.clone().iter().cloned() { if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() == "exit_nonzero".to_string().as_str()) { __found = true; break; } } __found }; -let exit_arms = Rc::new({ let mut __result = Vec::new(); for p in exit_props.clone().iter().cloned() { __result.push(emit_exit_arm(p.clone(), inferred.clone(), &source_indices)); } __result }); -let default_arm = if has_nonzero { + let has_nonzero = { + let mut __found = false; + for p in exit_props.clone().iter().cloned() { + if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() + == "exit_nonzero".to_string().as_str()) + { + __found = true; + break; + } + } + __found + }; + let exit_arms = Rc::new({ + let mut __result = Vec::new(); + for p in exit_props.clone().iter().cloned() { + __result.push(emit_exit_arm(p.clone(), inferred.clone(), &source_indices)); + } + __result + }); + let default_arm = if has_nonzero { "".to_string() } else { "\n _ => { let stderr = String::from_utf8_lossy(&output.stderr).to_string(); Err(stderr.into()) },".to_string() }; -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let exit_code = output.status.code().unwrap_or(-1);\n".to_string(), "match exit_code {\n".to_string()), exit_arms.join(&"\n".to_string())), default_arm), "\n}".to_string()) -} + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "let exit_code = output.status.code().unwrap_or(-1);\n".to_string(), + "match exit_code {\n".to_string(), + ), + exit_arms.join(&"\n".to_string()), + ), + default_arm, + ), + "\n}".to_string(), + ) + } } -} + } } -pub fn emit_exit_arm(prop: Rc, inferred: Rc, source_indices: &Rc>>) -> String { +pub fn emit_exit_arm( + prop: Rc, + inferred: Rc, + source_indices: &Rc>>, +) -> String { { let name = field_init_node_name_at(prop, source_indices.clone()); -let code_str = v2_rt::substring(&name, 5, v2_rt::string_length(&name)); -let pattern = if (code_str.clone().as_str() == "nonzero".to_string().as_str()) { + let code_str = v2_rt::substring(&name, 5, v2_rt::string_length(&name)); + let pattern = if (code_str.clone().as_str() == "nonzero".to_string().as_str()) { "_".to_string() } else { code_str.clone() }; -let is_success = (code_str.clone().as_str() == "0".to_string().as_str()); -if is_success { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), pattern), " => { ".to_string()), emit_shell_return(inferred, &source_indices)), " },".to_string()) + let is_success = (code_str.clone().as_str() == "0".to_string().as_str()); + if is_success { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(" ".to_string(), pattern), + " => { ".to_string(), + ), + emit_shell_return(inferred, &source_indices), + ), + " },".to_string(), + ) } else { v2_rt::concat(v2_rt::concat(" ".to_string(), pattern), " => { let stderr = String::from_utf8_lossy(&output.stderr).to_string(); Err(stderr.into()) },".to_string()) } -} + } } -pub fn emit_shell_call(op_name: String, transport: &Rc, registry: Rc>>, depth: i64, inferred: Rc, op_node: &Rc, source_indices: &Rc>>) -> String { +pub fn emit_shell_call( + op_name: String, + transport: &Rc, + registry: Rc>>, + depth: i64, + inferred: Rc, + op_node: &Rc, + source_indices: &Rc>>, +) -> String { { let argv = transport.children.clone(); -let optional_params = Rc::new({ let mut __result = Vec::new(); for p in op_node.params.clone().iter().cloned() { if (param_node_type_expr(&p).return_cardinality.clone() == Cardinality::CardOptional) { __result.push(p); } } __result }).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, p: Rc| v2_rt::rc_map_insert(acc, param_node_name_at(p.clone(), source_indices.clone()), true)); -let has_stdin = match transport_stdin(transport.clone(), source_indices.clone()) { - Some(_) => true, - None => false, -}; -let let_kw = if has_stdin.clone() { + let optional_params = Rc::new({ + let mut __result = Vec::new(); + for p in op_node.params.clone().iter().cloned() { + if (param_node_type_expr(&p).return_cardinality.clone() + == Cardinality::CardOptional) + { + __result.push(p); + } + } + __result + }) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, p: Rc| { + v2_rt::rc_map_insert( + acc, + param_node_name_at(p.clone(), source_indices.clone()), + true, + ) + }, + ); + let has_stdin = match transport_stdin(transport.clone(), source_indices.clone()) { + Some(_) => true, + None => false, + }; + let let_kw = if has_stdin.clone() { "let mut output".to_string() } else { "let output".to_string() }; -let cmd_line = if ((argv.clone().len() as i64) > 0) { + let cmd_line = if ((argv.clone().len() as i64) > 0) { match argv.clone().first().cloned() { - Some(first_arg) => v2_rt::concat(v2_rt::concat(v2_rt::concat(let_kw, " = std::process::Command::new(".to_string()), emit_shell_argv_element(&first_arg, optional_params.clone(), source_indices.clone())), ")".to_string()), - None => v2_rt::concat(v2_rt::concat(v2_rt::concat(let_kw, " = std::process::Command::new(\"".to_string()), emit_ident(op_name, RenderTarget::Rust)), "\")".to_string()), -} + Some(first_arg) => v2_rt::concat( + v2_rt::concat( + v2_rt::concat(let_kw, " = std::process::Command::new(".to_string()), + emit_shell_argv_element( + &first_arg, + optional_params.clone(), + source_indices.clone(), + ), + ), + ")".to_string(), + ), + None => v2_rt::concat( + v2_rt::concat( + v2_rt::concat(let_kw, " = std::process::Command::new(\"".to_string()), + emit_ident(op_name, RenderTarget::Rust), + ), + "\")".to_string(), + ), + } } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(let_kw, " = std::process::Command::new(\"".to_string()), emit_ident(op_name, RenderTarget::Rust)), "\")".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(let_kw, " = std::process::Command::new(\"".to_string()), + emit_ident(op_name, RenderTarget::Rust), + ), + "\")".to_string(), + ) }; -let arg_lines = if ((argv.clone().len() as i64) > 1) { - Rc::new({ let mut __result = Vec::new(); for arg in Rc::new(argv.clone().iter().cloned().skip(1 as usize).collect::>()).iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(" .arg(".to_string(), emit_shell_argv_element(&arg, optional_params.clone(), source_indices.clone())), ")".to_string())); } __result }) + let arg_lines = if ((argv.clone().len() as i64) > 1) { + Rc::new({ + let mut __result = Vec::new(); + for arg in Rc::new( + argv.clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ) + .iter() + .cloned() + { + __result.push(v2_rt::concat( + v2_rt::concat( + " .arg(".to_string(), + emit_shell_argv_element( + &arg, + optional_params.clone(), + source_indices.clone(), + ), + ), + ")".to_string(), + )); + } + __result + }) } else { Rc::new(vec![]) }; -let env_entries = transport_env(transport.clone(), source_indices.clone()); -let env_lines = Rc::new({ let mut __result = Vec::new(); for e in env_entries.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" .env(\"".to_string(), field_init_node_name_at(e.clone(), source_indices.clone())), "\", ".to_string()), emit_simple_expr(&field_init_node_value(&e), &RenderTarget::Rust, &source_indices)), ")".to_string())); } __result }); -let wd_line = " .current_dir(self.working_dir.as_deref().unwrap_or(\".\"))".to_string(); -if has_stdin.clone() { + let env_entries = transport_env(transport.clone(), source_indices.clone()); + let env_lines = Rc::new({ + let mut __result = Vec::new(); + for e in env_entries.iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + " .env(\"".to_string(), + field_init_node_name_at(e.clone(), source_indices.clone()), + ), + "\", ".to_string(), + ), + emit_simple_expr( + &field_init_node_value(&e), + &RenderTarget::Rust, + &source_indices, + ), + ), + ")".to_string(), + )); + } + __result + }); + let wd_line = " .current_dir(self.working_dir.as_deref().unwrap_or(\".\"))".to_string(); + if has_stdin.clone() { { - let stdin_expr = transport_stdin(transport.clone(), source_indices.clone()).clone().unwrap(); -let stdin_var = match (*stdin_expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => emit_ident(expr_var_name_at(stdin_expr.clone(), source_indices.clone()), RenderTarget::Rust), - _ => emit_simple_expr(&stdin_expr, &RenderTarget::Rust, &source_indices), -}; -let spawn_line = " .stdin(std::process::Stdio::piped())\n .stdout(std::process::Stdio::piped())\n .stderr(std::process::Stdio::piped())".to_string(); -let spawn_exec = " .spawn()?;".to_string(); -let write_block = v2_rt::concat(v2_rt::concat("{\n use std::io::Write;\n if let Some(mut stdin) = output.stdin.take() {\n stdin.write_all(".to_string(), stdin_var), ".as_bytes())?;\n }\n}".to_string()); -let wait_line = "let output = output.wait_with_output()?;".to_string(); -let check_line = "let stdout = String::from_utf8_lossy(&output.stdout).to_string();".to_string(); -let return_line = emit_exit_code_handling(op_node.clone(), inferred, source_indices.clone()); -let all_lines = v2_rt::concat(v2_rt::concat(v2_rt::concat(Rc::new(vec![cmd_line]), arg_lines), env_lines), Rc::new(vec![wd_line, spawn_line, spawn_exec, write_block, wait_line, check_line, return_line])); -all_lines.join(&"\n".to_string()) -} + let stdin_expr = transport_stdin(transport.clone(), source_indices.clone()) + .clone() + .unwrap(); + let stdin_var = match (*stdin_expr.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => emit_ident( + expr_var_name_at(stdin_expr.clone(), source_indices.clone()), + RenderTarget::Rust, + ), + _ => emit_simple_expr(&stdin_expr, &RenderTarget::Rust, &source_indices), + }; + let spawn_line = " .stdin(std::process::Stdio::piped())\n .stdout(std::process::Stdio::piped())\n .stderr(std::process::Stdio::piped())".to_string(); + let spawn_exec = " .spawn()?;".to_string(); + let write_block = v2_rt::concat(v2_rt::concat("{\n use std::io::Write;\n if let Some(mut stdin) = output.stdin.take() {\n stdin.write_all(".to_string(), stdin_var), ".as_bytes())?;\n }\n}".to_string()); + let wait_line = "let output = output.wait_with_output()?;".to_string(); + let check_line = + "let stdout = String::from_utf8_lossy(&output.stdout).to_string();".to_string(); + let return_line = + emit_exit_code_handling(op_node.clone(), inferred, source_indices.clone()); + let all_lines = v2_rt::concat( + v2_rt::concat(v2_rt::concat(Rc::new(vec![cmd_line]), arg_lines), env_lines), + Rc::new(vec![ + wd_line, + spawn_line, + spawn_exec, + write_block, + wait_line, + check_line, + return_line, + ]), + ); + all_lines.join(&"\n".to_string()) + } } else { { let output_line = " .output()?;".to_string(); -let check_line = "let stdout = String::from_utf8_lossy(&output.stdout).to_string();".to_string(); -let return_line = emit_exit_code_handling(op_node.clone(), inferred, source_indices.clone()); -let all_lines = v2_rt::concat(v2_rt::concat(v2_rt::concat(Rc::new(vec![cmd_line]), arg_lines), env_lines), Rc::new(vec![wd_line, output_line, check_line, return_line])); -all_lines.join(&"\n".to_string()) -} + let check_line = + "let stdout = String::from_utf8_lossy(&output.stdout).to_string();".to_string(); + let return_line = + emit_exit_code_handling(op_node.clone(), inferred, source_indices.clone()); + let all_lines = v2_rt::concat( + v2_rt::concat(v2_rt::concat(Rc::new(vec![cmd_line]), arg_lines), env_lines), + Rc::new(vec![wd_line, output_line, check_line, return_line]), + ); + all_lines.join(&"\n".to_string()) + } } -} + } } -pub fn emit_shell_argv_element(arg: &Rc, optional_params: Rc>, source_indices: Rc>>) -> String { +pub fn emit_shell_argv_element( + arg: &Rc, + optional_params: Rc>, + source_indices: Rc>>, +) -> String { match (*arg.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { unreachable!() }; v2_rt::concat(v2_rt::concat("\"".to_string(), escape_string_literal_body(s.clone())), "\"".to_string()) }, - ExprData::ExprStringInterp => { - let parts = Rc::new({ let mut __result = Vec::new(); for child in arg.children.clone().iter().cloned() { __result.push(match (*child.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: text, .. } = value.as_ref() else { unreachable!() }; Rc::new(StringPart::Text { - value: text.clone(), -}) }, - _ => Rc::new(StringPart::Interpolation { - expr: arg_value(&child), -}), -}); } __result }); -let fmt_segments = Rc::new({ let mut __result = Vec::new(); for p in parts.clone().iter().cloned() { __result.push(match (*p.clone()).clone() { - StringPart::Text { value: v, .. } => escape_rust_interp_text(v.clone()), - StringPart::Interpolation { .. } => "{}".to_string(), -}); } __result }); -let fmt_str = fmt_segments.join(&"".to_string()); -let args = Rc::new({ let mut __result = Vec::new(); for p in parts.clone().iter().cloned() { __result.extend((*match (*p.clone()).clone() { - StringPart::Text { .. } => Rc::new(vec![]), - StringPart::Interpolation { expr: e, .. } => { - let name = expr_var_name_at(e.clone(), source_indices.clone()); -let var_name = emit_ident(name.clone(), RenderTarget::Rust); -let is_opt = (is_optional_typed_expr(e.clone()) || match v2_rt::map_get(&optional_params, name.clone()) { - Some(_) => true, - None => false, -}); -if is_opt.clone() { - Rc::new(vec![v2_rt::concat(var_name.clone(), ".as_deref().unwrap_or(\"\")".to_string())]) + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { + unreachable!() + }; + v2_rt::concat( + v2_rt::concat("\"".to_string(), escape_string_literal_body(s.clone())), + "\"".to_string(), + ) + } + ExprData::ExprStringInterp => { + let parts = Rc::new({ + let mut __result = Vec::new(); + for child in arg.children.clone().iter().cloned() { + __result.push(match (*child.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitStr { value: text, .. } = value.as_ref() else { + unreachable!() + }; + Rc::new(StringPart::Text { + value: text.clone(), + }) + } + _ => Rc::new(StringPart::Interpolation { + expr: arg_value(&child), + }), + }); + } + __result + }); + let fmt_segments = Rc::new({ + let mut __result = Vec::new(); + for p in parts.clone().iter().cloned() { + __result.push(match (*p.clone()).clone() { + StringPart::Text { value: v, .. } => escape_rust_interp_text(v.clone()), + StringPart::Interpolation { .. } => "{}".to_string(), + }); + } + __result + }); + let fmt_str = fmt_segments.join(&"".to_string()); + let args = Rc::new({ + let mut __result = Vec::new(); + for p in parts.clone().iter().cloned() { + __result.extend( + (*match (*p.clone()).clone() { + StringPart::Text { .. } => Rc::new(vec![]), + StringPart::Interpolation { expr: e, .. } => { + let name = expr_var_name_at(e.clone(), source_indices.clone()); + let var_name = emit_ident(name.clone(), RenderTarget::Rust); + let is_opt = (is_optional_typed_expr(e.clone()) + || match v2_rt::map_get(&optional_params, name.clone()) { + Some(_) => true, + None => false, + }); + if is_opt.clone() { + Rc::new(vec![v2_rt::concat( + var_name.clone(), + ".as_deref().unwrap_or(\"\")".to_string(), + )]) + } else { + Rc::new(vec![var_name.clone()]) + } + } + }) + .iter() + .cloned(), + ); + } + __result + }); + let args_str = args.join(&", ".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("&format!(\"".to_string(), fmt_str), + "\", ".to_string(), + ), + args_str, + ), + ")".to_string(), + ) + } + ExprData::ExprVar { .. } => { + let name = expr_var_name_at(arg.clone(), source_indices.clone()); + let var_name = emit_ident(name.clone(), RenderTarget::Rust); + let is_opt = (is_optional_typed_expr(arg.clone()) + || match v2_rt::map_get(&optional_params, name.clone()) { + Some(_) => true, + None => false, + }); + if is_opt.clone() { + v2_rt::concat( + v2_rt::concat("&".to_string(), var_name.clone()), + ".as_deref().unwrap_or(\"\").to_string()".to_string(), + ) } else { - Rc::new(vec![var_name.clone()]) + v2_rt::concat( + v2_rt::concat("&".to_string(), var_name.clone()), + ".to_string()".to_string(), + ) } -}, -}).iter().cloned()); } __result }); -let args_str = args.join(&", ".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("&format!(\"".to_string(), fmt_str), "\", ".to_string()), args_str), ")".to_string()) -}, - ExprData::ExprVar { .. } => { - let name = expr_var_name_at(arg.clone(), source_indices.clone()); -let var_name = emit_ident(name.clone(), RenderTarget::Rust); -let is_opt = (is_optional_typed_expr(arg.clone()) || match v2_rt::map_get(&optional_params, name.clone()) { - Some(_) => true, - None => false, -}); -if is_opt.clone() { - v2_rt::concat(v2_rt::concat("&".to_string(), var_name.clone()), ".as_deref().unwrap_or(\"\").to_string()".to_string()) - } else { - v2_rt::concat(v2_rt::concat("&".to_string(), var_name.clone()), ".to_string()".to_string()) } -}, - _ => emit_simple_expr(&arg, &RenderTarget::Rust, &source_indices), -} + _ => emit_simple_expr(&arg, &RenderTarget::Rust, &source_indices), + } } -pub fn emit_shell_return(inferred: Rc, source_indices: &Rc>>) -> String { +pub fn emit_shell_return( + inferred: Rc, + source_indices: &Rc>>, +) -> String { { let effective = unwrap_single_field_product(inferred); -let is_product = is_product_type(effective.clone()); -let single_from = if (is_product.clone() && ((effective.children.clone().len() as i64) == 1)) { - match effective.children.clone().first().cloned() { - Some(ch) => child_from_key(ch.clone(), source_indices.clone()), - None => None, -} - } else { - None - }; -match single_from { - Some(channel) => { - let is_optional = (effective.return_cardinality.clone() == Cardinality::CardOptional); -emit_shell_channel_expr(&channel, is_optional.clone()) -}, - None => if (is_product.clone() && ((effective.children.clone().len() as i64) > 1)) { - { - let needs_stderr = { let mut __found = false; for ch in effective.children.clone().iter().cloned() { if match child_from_key(ch.clone(), source_indices.clone()) { - Some(ref __some_val) if __some_val == "stderr" => true, - _ => false, -} { __found = true; break; } } __found }; -let stderr_line = if needs_stderr { - "let stderr = String::from_utf8_lossy(&output.stderr).to_string();".to_string() - } else { - "".to_string() - }; -let field_exprs = Rc::new({ let mut __result = Vec::new(); for ch in effective.children.clone().iter().cloned() { __result.push({ - let is_optional = (ch.return_cardinality.clone() == Cardinality::CardOptional); -let channel = match child_from_key(ch.clone(), source_indices.clone()) { - Some(c) => c.clone(), - None => "stdout".to_string(), -}; -emit_shell_channel_expr(&channel, is_optional.clone()) -}); } __result }); -let lines = if (stderr_line.clone().as_str() != "".to_string().as_str()) { - v2_rt::concat(stderr_line.clone(), "\n".to_string()) + let is_product = is_product_type(effective.clone()); + let single_from = + if (is_product.clone() && ((effective.children.clone().len() as i64) == 1)) { + match effective.children.clone().first().cloned() { + Some(ch) => child_from_key(ch.clone(), source_indices.clone()), + None => None, + } + } else { + None + }; + match single_from { + Some(channel) => { + let is_optional = + (effective.return_cardinality.clone() == Cardinality::CardOptional); + emit_shell_channel_expr(&channel, is_optional.clone()) + } + None => { + if (is_product.clone() && ((effective.children.clone().len() as i64) > 1)) { + { + let needs_stderr = { + let mut __found = false; + for ch in effective.children.clone().iter().cloned() { + if match child_from_key(ch.clone(), source_indices.clone()) { + Some(ref __some_val) if __some_val == "stderr" => true, + _ => false, + } { + __found = true; + break; + } + } + __found + }; + let stderr_line = if needs_stderr { + "let stderr = String::from_utf8_lossy(&output.stderr).to_string();" + .to_string() + } else { + "".to_string() + }; + let field_exprs = Rc::new({ + let mut __result = Vec::new(); + for ch in effective.children.clone().iter().cloned() { + __result.push({ + let is_optional = (ch.return_cardinality.clone() + == Cardinality::CardOptional); + let channel = + match child_from_key(ch.clone(), source_indices.clone()) { + Some(c) => c.clone(), + None => "stdout".to_string(), + }; + emit_shell_channel_expr(&channel, is_optional.clone()) + }); + } + __result + }); + let lines = if (stderr_line.clone().as_str() != "".to_string().as_str()) { + v2_rt::concat(stderr_line.clone(), "\n".to_string()) + } else { + "".to_string() + }; + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(lines, "Ok((".to_string()), + field_exprs.join(&", ".to_string()), + ), + "))".to_string(), + ) + } } else { - "".to_string() - }; -v2_rt::concat(v2_rt::concat(v2_rt::concat(lines, "Ok((".to_string()), field_exprs.join(&", ".to_string())), "))".to_string()) -} - } else { - { - let is_optional = (effective.return_cardinality.clone() == Cardinality::CardOptional); -emit_shell_channel_expr(&"stdout".to_string(), is_optional.clone()) -} - }, -} -} + { + let is_optional = + (effective.return_cardinality.clone() == Cardinality::CardOptional); + emit_shell_channel_expr(&"stdout".to_string(), is_optional.clone()) + } + } + } + } + } } pub fn emit_shell_channel_expr(channel: &String, is_optional: bool) -> String { @@ -6030,252 +14215,709 @@ pub fn emit_shell_channel_expr(channel: &String, is_optional: bool) -> String { } } }; -if is_optional { + if is_optional { v2_rt::concat(v2_rt::concat("Some(".to_string(), base), ")".to_string()) } else { base } -} + } } pub fn unwrap_single_field_product(n: Rc) -> Rc { { let is_product = is_product_type(n.clone()); -if ((is_product && (n.ident_span.clone() == None)) && ((n.children.clone().len() as i64) == 1)) { + if ((is_product && (n.ident_span.clone() == None)) + && ((n.children.clone().len() as i64) == 1)) + { match n.children.clone().first().cloned() { - Some(field_node) => resolved_type(field_node.clone()), - None => n.clone(), -} + Some(field_node) => resolved_type(field_node.clone()), + None => n.clone(), + } } else { n.clone() } -} + } } pub fn emit_file_call(op_name: String, inferred: Rc) -> String { { let effective = unwrap_single_field_product(inferred); -let is_product = is_product_type(effective.clone()); -let parse_line = if (is_product && ((effective.children.clone().len() as i64) > 1)) { + let is_product = is_product_type(effective.clone()); + let parse_line = if (is_product && ((effective.children.clone().len() as i64) > 1)) { "let parsed: serde_json::Value = serde_json::from_str(&content)?;\nOk(serde_json::from_value(parsed)?)".to_string() } else { "Ok(content)".to_string() }; -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let path = format!(\"{}/{}\", self.base_path, \"".to_string(), emit_ident(op_name, RenderTarget::Rust)), "\");\n".to_string()), "let content = std::fs::read_to_string(&path)?;\n".to_string()), parse_line) -} + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "let path = format!(\"{}/{}\", self.base_path, \"".to_string(), + emit_ident(op_name, RenderTarget::Rust), + ), + "\");\n".to_string(), + ), + "let content = std::fs::read_to_string(&path)?;\n".to_string(), + ), + parse_line, + ) + } } pub fn emit_local_call(op_name: String) -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat("// Local binding -- direct function call\n".to_string(), "Ok(".to_string()), emit_ident(op_name, RenderTarget::Rust)), "())".to_string()) -} - -pub fn emit_resource_def(item: &Rc, shared_types: Rc>, env: &Rc) -> String { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "// Local binding -- direct function call\n".to_string(), + "Ok(".to_string(), + ), + emit_ident(op_name, RenderTarget::Rust), + ), + "())".to_string(), + ) +} + +pub fn emit_resource_def( + item: &Rc, + shared_types: Rc>, + env: &Rc, +) -> String { { let item_text = authored_name(env.clone(), item.clone()); -let cap_children = item.children.clone(); -if ((cap_children.clone().len() as i64) == 0) { - v2_rt::concat(v2_rt::concat("#[derive(Debug, Clone)]\npub struct ".to_string(), item_text), ";".to_string()) + let cap_children = item.children.clone(); + if ((cap_children.clone().len() as i64) == 0) { + v2_rt::concat( + v2_rt::concat( + "#[derive(Debug, Clone)]\npub struct ".to_string(), + item_text, + ), + ";".to_string(), + ) } else { { let depth = 0; -let cap_methods = Rc::new({ let mut __result = Vec::new(); for c in cap_children.clone().iter().cloned() { __result.push(emit_capability_method(&c, &shared_types, &env)); } __result }); -let methods_str = cap_methods.join(&"\n\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("#[async_trait::async_trait]\npub trait ".to_string(), item_text), " {\n".to_string()), make_indent((depth + 1))), methods_str), "\n}".to_string()) -} + let cap_methods = Rc::new({ + let mut __result = Vec::new(); + for c in cap_children.clone().iter().cloned() { + __result.push(emit_capability_method(&c, &shared_types, &env)); + } + __result + }); + let methods_str = cap_methods.join(&"\n\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "#[async_trait::async_trait]\npub trait ".to_string(), + item_text, + ), + " {\n".to_string(), + ), + make_indent((depth + 1)), + ), + methods_str, + ), + "\n}".to_string(), + ) + } } -} + } } -pub fn emit_capability_method(cap_node: &Rc, shared_types: &Rc>, env: &Rc) -> String { - { - let input_params = Rc::new({ let mut __result = Vec::new(); for p in cap_node.params.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(emit_ident(param_node_name_at(p.clone(), env.source_indices.clone()), RenderTarget::Rust), rust_items().param_type_sep.clone()), emit_rust_param_type(¶m_node_type_expr(&p), &shared_types, &env.source_indices.clone()))); } __result }); -let params_str = input_params.join(&", ".to_string()); -let all_params = if (params_str.clone().as_str() == "".to_string().as_str()) { +pub fn emit_capability_method( + cap_node: &Rc, + shared_types: &Rc>, + env: &Rc, +) -> String { + { + let input_params = Rc::new({ + let mut __result = Vec::new(); + for p in cap_node.params.clone().iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + emit_ident( + param_node_name_at(p.clone(), env.source_indices.clone()), + RenderTarget::Rust, + ), + rust_items().param_type_sep.clone(), + ), + emit_rust_param_type( + ¶m_node_type_expr(&p), + &shared_types, + &env.source_indices.clone(), + ), + )); + } + __result + }); + let params_str = input_params.join(&", ".to_string()); + let all_params = if (params_str.clone().as_str() == "".to_string().as_str()) { "&self".to_string() } else { v2_rt::concat("&self, ".to_string(), params_str.clone()) }; -let ret = render_rust_type(resolved_type(cap_node.clone()), shared_types.clone(), env.source_indices.clone()); -let items = rust_items(); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(items.async_prefix.clone(), items.func_keyword.clone()), " ".to_string()), emit_ident(authored_name(env.clone(), cap_node.clone()), RenderTarget::Rust)), "(".to_string()), all_params), ") -> Result<".to_string()), ret), ", Box>;".to_string()) -} + let ret = render_rust_type( + resolved_type(cap_node.clone()), + shared_types.clone(), + env.source_indices.clone(), + ); + let items = rust_items(); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + items.async_prefix.clone(), + items.func_keyword.clone(), + ), + " ".to_string(), + ), + emit_ident( + authored_name(env.clone(), cap_node.clone()), + RenderTarget::Rust, + ), + ), + "(".to_string(), + ), + all_params, + ), + ") -> Result<".to_string(), + ), + ret, + ), + ", Box>;".to_string(), + ) + } } pub fn data_value_has_cross_refs(value: &Rc) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*value.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => true, - ExprData::ExprListLit => { let mut __found = false; for c in value.children.clone().iter().cloned() { if data_value_has_cross_refs(&c) { __found = true; break; } } __found }, - ExprData::ExprRecordLit { .. } => { let mut __found = false; for f in value.children.clone().iter().cloned() { if data_value_has_cross_refs(&field_init_node_value(&f)) { __found = true; break; } } __found }, - _ => false, -} + ExprData::ExprVar { .. } => true, + ExprData::ExprListLit => { + let mut __found = false; + for c in value.children.clone().iter().cloned() { + if data_value_has_cross_refs(&c) { + __found = true; + break; + } + } + __found + } + ExprData::ExprRecordLit { .. } => { + let mut __found = false; + for f in value.children.clone().iter().cloned() { + if data_value_has_cross_refs(&field_init_node_value(&f)) { + __found = true; + break; + } + } + __found + } + _ => false, + } }) } -pub fn emit_data_def(name: String, type_node: &Rc, value: Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: &Rc>, emit_info: Rc) -> String { - { - let ty_str = render_rust_type(type_node.clone(), shared_types.clone(), scope.type_env.clone().source_indices.clone()); -let fn_name = to_snake(name); -let needs_rc = set_contains(shared_types.clone(), authored_name_at(scope.type_env.clone().source_indices.clone(), &type_node)); -if is_simple_type_node(type_node.clone(), scope.type_env.clone().source_indices.clone()) { +pub fn emit_data_def( + name: String, + type_node: &Rc, + value: Rc, + registry: Rc>>, + scope: &Rc, + depth: i64, + shared_types: &Rc>, + emit_info: Rc, +) -> String { + { + let ty_str = render_rust_type( + type_node.clone(), + shared_types.clone(), + scope.type_env.clone().source_indices.clone(), + ); + let fn_name = to_snake(name); + let needs_rc = v2_rt::map_contains_key( + &shared_types, + authored_name_at(scope.type_env.clone().source_indices.clone(), &type_node), + ); + if is_simple_type_node( + type_node.clone(), + scope.type_env.clone().source_indices.clone(), + ) { { - let val_str = emit_typed_expr(value, registry, &scope, depth, shared_types.clone(), emit_info, 1024); -let kw = rust_items().func_keyword.clone(); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), kw), " ".to_string()), fn_name), "() -> ".to_string()), ty_str.clone()), " { ".to_string()), val_str), " }".to_string()) -} + let val_str = emit_typed_expr( + value, + registry, + &scope, + depth, + shared_types.clone(), + emit_info, + 1024, + ); + let kw = rust_items().func_keyword.clone(); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(rust_visibility_prefix(), kw), + " ".to_string(), + ), + fn_name, + ), + "() -> ".to_string(), + ), + ty_str.clone(), + ), + " { ".to_string(), + ), + val_str, + ), + " }".to_string(), + ) + } } else { { - let body = emit_data_def_body(&type_node, &value, registry, &scope, depth, shared_types.clone(), emit_info, &needs_rc); -let kw = rust_items().func_keyword.clone(); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), kw), " ".to_string()), fn_name), "() -> ".to_string()), ty_str.clone()), " {\n".to_string()), " thread_local! {\n".to_string()), " static CACHED: ".to_string()), ty_str.clone()), " = {\n".to_string()), body), "\n".to_string()), " };\n".to_string()), " }\n".to_string()), " CACHED.with(|c| c.clone())\n".to_string()), "}".to_string()) -} + let body = emit_data_def_body( + &type_node, + &value, + registry, + &scope, + depth, + shared_types.clone(), + emit_info, + &needs_rc, + ); + let kw = rust_items().func_keyword.clone(); + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_visibility_prefix(), kw), " ".to_string()), fn_name), "() -> ".to_string()), ty_str.clone()), " {\n".to_string()), " thread_local! {\n".to_string()), " static CACHED: ".to_string()), ty_str.clone()), " = {\n".to_string()), body), "\n".to_string()), " };\n".to_string()), " }\n".to_string()), " CACHED.with(|c| c.clone())\n".to_string()), "}".to_string()) + } } -} + } } -pub fn emit_data_def_body(type_node: &Rc, value: &Rc, registry: Rc>>, scope: &Rc, depth: i64, shared_types: Rc>, emit_info: Rc, needs_rc: &bool) -> String { - if (has_nested_records_node(type_node.clone(), scope.type_env.clone().source_indices.clone()) && !data_value_has_cross_refs(&value)) { +pub fn emit_data_def_body( + type_node: &Rc, + value: &Rc, + registry: Rc>>, + scope: &Rc, + depth: i64, + shared_types: Rc>, + emit_info: Rc, + needs_rc: &bool, +) -> String { + if (has_nested_records_node( + type_node.clone(), + scope.type_env.clone().source_indices.clone(), + ) && !data_value_has_cross_refs(&value)) + { { - let json_str = emit_data_value_json(&value, scope.type_env.clone().source_indices.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(" serde_json::from_value(serde_json::json!(".to_string(), json_str), "))\n".to_string()), " .expect(\"valid data definition\")".to_string()) -} + let json_str = + emit_data_value_json(&value, scope.type_env.clone().source_indices.clone()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + " serde_json::from_value(serde_json::json!(".to_string(), + json_str, + ), + "))\n".to_string(), + ), + " .expect(\"valid data definition\")".to_string(), + ) + } } else { { - let is_map = node_is_keyed_collection(&type_node, scope.type_env.clone().source_indices.clone()); -if is_map { + let is_map = + node_is_keyed_collection(&type_node, scope.type_env.clone().source_indices.clone()); + if is_map { match (*value.expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => { - let inserts = Rc::new({ let mut __result = Vec::new(); for f in value.children.clone().iter().cloned() { __result.push({ - let val_str = emit_typed_expr(field_init_node_value(&f), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" __m.insert(\"".to_string(), field_init_node_name_at(f.clone(), scope.type_env.clone().source_indices.clone())), "\".to_string(), ".to_string()), val_str.clone()), ");".to_string()) -}); } __result }); -let inserts_str = inserts.join(&"\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(" let mut __m = HashMap::new();\n".to_string(), inserts_str), "\n".to_string()), " Rc::new(__m)".to_string()) -}, - _ => { - let val_str = emit_typed_expr(value.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -v2_rt::concat(" ".to_string(), val_str.clone()) -}, -} + ExprData::ExprRecordLit { .. } => { + let inserts = Rc::new({ + let mut __result = Vec::new(); + for f in value.children.clone().iter().cloned() { + __result.push({ + let val_str = emit_typed_expr( + field_init_node_value(&f), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + " __m.insert(\"".to_string(), + field_init_node_name_at( + f.clone(), + scope + .type_env + .clone() + .source_indices + .clone(), + ), + ), + "\".to_string(), ".to_string(), + ), + val_str.clone(), + ), + ");".to_string(), + ) + }); + } + __result + }); + let inserts_str = inserts.join(&"\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + " let mut __m = HashMap::new();\n".to_string(), + inserts_str, + ), + "\n".to_string(), + ), + " Rc::new(__m)".to_string(), + ) + } + _ => { + let val_str = emit_typed_expr( + value.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + v2_rt::concat(" ".to_string(), val_str.clone()) + } + } } else { { - let val_str = emit_typed_expr(value.clone(), registry.clone(), &scope, depth.clone(), shared_types.clone(), emit_info.clone(), 1024); -let is_already_wrapped = match (*value.expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => true, - ExprData::ExprListLit => true, - _ => false, -}; -let wrap_start = if (needs_rc.clone() && !is_already_wrapped.clone()) { + let val_str = emit_typed_expr( + value.clone(), + registry.clone(), + &scope, + depth.clone(), + shared_types.clone(), + emit_info.clone(), + 1024, + ); + let is_already_wrapped = match (*value.expr_data.clone()).clone() { + ExprData::ExprRecordLit { .. } => true, + ExprData::ExprListLit => true, + _ => false, + }; + let wrap_start = if (needs_rc.clone() && !is_already_wrapped.clone()) { "Rc::new(".to_string() } else { "".to_string() }; -let wrap_end = if (needs_rc.clone() && !is_already_wrapped.clone()) { + let wrap_end = if (needs_rc.clone() && !is_already_wrapped.clone()) { ")".to_string() } else { "".to_string() }; -v2_rt::concat(v2_rt::concat(v2_rt::concat(" ".to_string(), wrap_start), val_str.clone()), wrap_end) -} + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(" ".to_string(), wrap_start), + val_str.clone(), + ), + wrap_end, + ) + } } -} + } } } -pub fn emit_test_file(module_name: &String, projections: Rc>>) -> Rc { +pub fn emit_test_file( + module_name: &String, + projections: Rc>>, +) -> Rc { { let depth = 0; -let test_fns = Rc::new({ let mut __result = Vec::new(); for p in projections.iter().cloned() { __result.push(emit_operation_test(&p, (depth.clone() + 1))); } __result }); -if ((test_fns.clone().len() as i64) == 0) { + let test_fns = Rc::new({ + let mut __result = Vec::new(); + for p in projections.iter().cloned() { + __result.push(emit_operation_test(&p, (depth.clone() + 1))); + } + __result + }); + if ((test_fns.clone().len() as i64) == 0) { Rc::new(TextFile { - path: "".to_string(), - content: "".to_string(), -}) + path: "".to_string(), + content: "".to_string(), + }) } else { { let filename = module_to_filename(module_name.clone()); -let tests_str = test_fns.clone().join(&"\n\n".to_string()); -let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("// Generated tests -- do not edit.\n".to_string(), "// Source module: ".to_string()), module_name.clone()), "\n\n".to_string()), "#[cfg(test)]\nmod tests {\n".to_string()), " use super::*;\n\n".to_string()), make_indent((depth.clone() + 1))), tests_str), "\n".to_string()), "}\n".to_string()); -Rc::new(TextFile { - path: rust_test_file_path(module_name.clone()), - content: content, -}) -} + let tests_str = test_fns.clone().join(&"\n\n".to_string()); + let content = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "// Generated tests -- do not edit.\n" + .to_string(), + "// Source module: ".to_string(), + ), + module_name.clone(), + ), + "\n\n".to_string(), + ), + "#[cfg(test)]\nmod tests {\n".to_string(), + ), + " use super::*;\n\n".to_string(), + ), + make_indent((depth.clone() + 1)), + ), + tests_str, + ), + "\n".to_string(), + ), + "}\n".to_string(), + ); + Rc::new(TextFile { + path: rust_test_file_path(module_name.clone()), + content: content, + }) + } } -} + } } pub fn rust_test_signature_comment(projection: &Rc) -> String { { - let params_str = Rc::new({ let mut __result = Vec::new(); for p in projection.params.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(param_node_name_at(p.clone(), projection.source_indices.clone()), ": ".to_string()), emit_rust_param_type(¶m_node_type_expr(&p), &empty_set(), &projection.source_indices.clone()))); } __result }).join(&", ".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("// Signature: ".to_string(), sanitize_service_name(projection.service_name.clone())), ".".to_string()), projection.operation_name.clone()), "(".to_string()), params_str), ") -> ".to_string()), emit_node_type(projection.inferred.clone(), RenderTarget::Rust, projection.source_indices.clone())) -} + let params_str = Rc::new({ + let mut __result = Vec::new(); + for p in projection.params.clone().iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + param_node_name_at(p.clone(), projection.source_indices.clone()), + ": ".to_string(), + ), + emit_rust_param_type( + ¶m_node_type_expr(&p), + &v2_rt::rc_empty_map::(), + &projection.source_indices.clone(), + ), + )); + } + __result + }) + .join(&", ".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "// Signature: ".to_string(), + sanitize_service_name(projection.service_name.clone()), + ), + ".".to_string(), + ), + projection.operation_name.clone(), + ), + "(".to_string(), + ), + params_str, + ), + ") -> ".to_string(), + ), + emit_node_type( + projection.inferred.clone(), + RenderTarget::Rust, + projection.source_indices.clone(), + ), + ) + } } pub fn emit_operation_test(projection: &Rc, depth: i64) -> String { { let test_name = rust_test_name(projection.clone()); -let struct_name = sanitize_service_name(projection.service_name.clone()); -let op_method = to_snake(projection.operation_name.clone()); -let indent = make_indent((depth + 1)); -let param_args = Rc::new({ let mut __result = Vec::new(); for p in projection.params.clone().iter().cloned() { __result.push(emit_rust_default_value(p.clone(), projection.source_indices.clone())); } __result }); -let args_str = param_args.join(&", ".to_string()); -let call_args = if (args_str.clone().as_str() == "".to_string().as_str()) { + let struct_name = sanitize_service_name(projection.service_name.clone()); + let op_method = to_snake(projection.operation_name.clone()); + let indent = make_indent((depth + 1)); + let param_args = Rc::new({ + let mut __result = Vec::new(); + for p in projection.params.clone().iter().cloned() { + __result.push(emit_rust_default_value( + p.clone(), + projection.source_indices.clone(), + )); + } + __result + }); + let args_str = param_args.join(&", ".to_string()); + let call_args = if (args_str.clone().as_str() == "".to_string().as_str()) { "".to_string() } else { args_str.clone() }; -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_async_test_decorator(), "\nasync fn ".to_string()), test_name), "() {\n".to_string()), indent.clone()), rust_test_signature_comment(&projection)), "\n".to_string()), indent.clone()), "let service = ".to_string()), struct_name.clone()), "::new(crate::dry_run::DryRunMode(true));\n".to_string()), indent.clone()), "let result = service.".to_string()), emit_ident(op_method, RenderTarget::Rust)), "(".to_string()), call_args), ").await;\n".to_string()), indent.clone()), "assert!(result.is_ok(), \"".to_string()), struct_name.clone()), ".".to_string()), projection.operation_name.clone()), " should succeed in dry-run mode: {:?}\", result.err());\n".to_string()), "}".to_string()) -} + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rust_async_test_decorator(), "\nasync fn ".to_string()), test_name), "() {\n".to_string()), indent.clone()), rust_test_signature_comment(&projection)), "\n".to_string()), indent.clone()), "let service = ".to_string()), struct_name.clone()), "::new(crate::dry_run::DryRunMode(true));\n".to_string()), indent.clone()), "let result = service.".to_string()), emit_ident(op_method, RenderTarget::Rust)), "(".to_string()), call_args), ").await;\n".to_string()), indent.clone()), "assert!(result.is_ok(), \"".to_string()), struct_name.clone()), ".".to_string()), projection.operation_name.clone()), " should succeed in dry-run mode: {:?}\", result.err());\n".to_string()), "}".to_string()) + } } -pub fn emit_rust_default_value(param: Rc, source_indices: Rc>>) -> String { +pub fn emit_rust_default_value( + param: Rc, + source_indices: Rc>>, +) -> String { { let type_name = authored_name_at(source_indices, ¶m_node_type_expr(¶m)); -match lookup_checkpoint(RenderTarget::Rust, type_name.clone()) { - Some(cp) => match cp.default_expr.clone() { - Some(expr) => expr.clone(), - None => v2_rt::concat(v2_rt::concat("compile_error!(\"no test default for type: ".to_string(), type_name.clone()), "\")".to_string()), -}, - None => v2_rt::concat(v2_rt::concat("compile_error!(\"no test default for type: ".to_string(), type_name.clone()), "\")".to_string()), -} -} + match lookup_checkpoint(RenderTarget::Rust, type_name.clone()) { + Some(cp) => match cp.default_expr.clone() { + Some(expr) => expr.clone(), + None => v2_rt::concat( + v2_rt::concat( + "compile_error!(\"no test default for type: ".to_string(), + type_name.clone(), + ), + "\")".to_string(), + ), + }, + None => v2_rt::concat( + v2_rt::concat( + "compile_error!(\"no test default for type: ".to_string(), + type_name.clone(), + ), + "\")".to_string(), + ), + } + } } -pub fn emit_mock_prop_setup(mock_prop: &Rc, depth: i64, source_indices: &Rc>>) -> String { - { - let body_str = emit_simple_expr(&field_init_node_value(&mock_prop), &RenderTarget::Rust, &source_indices); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("let ".to_string(), field_init_node_name_at(mock_prop.clone(), source_indices.clone())), " = ".to_string()), body_str), ";".to_string()) -} +pub fn emit_mock_prop_setup( + mock_prop: &Rc, + depth: i64, + source_indices: &Rc>>, +) -> String { + { + let body_str = emit_simple_expr( + &field_init_node_value(&mock_prop), + &RenderTarget::Rust, + &source_indices, + ); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "let ".to_string(), + field_init_node_name_at(mock_prop.clone(), source_indices.clone()), + ), + " = ".to_string(), + ), + body_str, + ), + ";".to_string(), + ) + } } pub fn emit_cargo_dep(name: String, version: String, features: &Rc>) -> String { if ((features.clone().len() as i64) > 0) { { - let feat_strs = Rc::new({ let mut __result = Vec::new(); for f in features.clone().iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat("\"".to_string(), f.clone()), "\"".to_string())); } __result }); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(name, " = { version = \"".to_string()), version), "\", features = [".to_string()), feat_strs.join(&", ".to_string())), "] }\n".to_string()) -} + let feat_strs = Rc::new({ + let mut __result = Vec::new(); + for f in features.clone().iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat("\"".to_string(), f.clone()), + "\"".to_string(), + )); + } + __result + }); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(name, " = { version = \"".to_string()), + version, + ), + "\", features = [".to_string(), + ), + feat_strs.join(&", ".to_string()), + ), + "] }\n".to_string(), + ) + } } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(name, " = \"".to_string()), version), "\"\n".to_string()) + v2_rt::concat( + v2_rt::concat(v2_rt::concat(name, " = \"".to_string()), version), + "\"\n".to_string(), + ) } } pub fn emit_cargo_toml(crate_name: String, has_services: bool) -> Rc { { - let header = v2_rt::concat(v2_rt::concat("[package]\nname = \"".to_string(), crate_name), "\"\nversion = \"0.1.0\"\nedition = \"2021\"\n".to_string()); -let workspace = "\n[workspace]\n".to_string(); -let base_deps = Rc::new(vec![emit_cargo_dep("serde".to_string(), "1".to_string(), &Rc::new(vec!["derive".to_string(), "rc".to_string()])), emit_cargo_dep("serde_json".to_string(), "1".to_string(), &Rc::new(vec![])), emit_cargo_dep("stacker".to_string(), "0.1".to_string(), &Rc::new(vec![])), emit_cargo_dep("clap".to_string(), "4".to_string(), &Rc::new(vec!["derive".to_string()])), emit_cargo_dep("lazy_static".to_string(), "1".to_string(), &Rc::new(vec![]))]); -let async_deps = if has_services { - Rc::new(vec![emit_cargo_dep("tokio".to_string(), "1".to_string(), &Rc::new(vec!["full".to_string()])), emit_cargo_dep("reqwest".to_string(), "0.12".to_string(), &Rc::new(vec!["json".to_string()])), emit_cargo_dep("async-trait".to_string(), "0.1".to_string(), &Rc::new(vec![]))]) + let header = v2_rt::concat( + v2_rt::concat("[package]\nname = \"".to_string(), crate_name), + "\"\nversion = \"0.1.0\"\nedition = \"2021\"\n".to_string(), + ); + let workspace = "\n[workspace]\n".to_string(); + let base_deps = Rc::new(vec![ + emit_cargo_dep( + "serde".to_string(), + "1".to_string(), + &Rc::new(vec!["derive".to_string(), "rc".to_string()]), + ), + emit_cargo_dep("serde_json".to_string(), "1".to_string(), &Rc::new(vec![])), + emit_cargo_dep("stacker".to_string(), "0.1".to_string(), &Rc::new(vec![])), + emit_cargo_dep( + "clap".to_string(), + "4".to_string(), + &Rc::new(vec!["derive".to_string()]), + ), + emit_cargo_dep("lazy_static".to_string(), "1".to_string(), &Rc::new(vec![])), + ]); + let async_deps = if has_services { + Rc::new(vec![ + emit_cargo_dep( + "tokio".to_string(), + "1".to_string(), + &Rc::new(vec!["full".to_string()]), + ), + emit_cargo_dep( + "reqwest".to_string(), + "0.12".to_string(), + &Rc::new(vec!["json".to_string()]), + ), + emit_cargo_dep( + "async-trait".to_string(), + "0.1".to_string(), + &Rc::new(vec![]), + ), + ]) } else { Rc::new(vec![]) }; -let all_deps = v2_rt::concat(base_deps, async_deps); -Rc::new(TextFile { - path: "Cargo.toml".to_string(), - content: v2_rt::concat(v2_rt::concat(v2_rt::concat(header, workspace), "\n[dependencies]\n".to_string()), all_deps.join(&"".to_string())), -}) -} + let all_deps = v2_rt::concat(base_deps, async_deps); + Rc::new(TextFile { + path: "Cargo.toml".to_string(), + content: v2_rt::concat( + v2_rt::concat( + v2_rt::concat(header, workspace), + "\n[dependencies]\n".to_string(), + ), + all_deps.join(&"".to_string()), + ), + }) + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -6287,79 +14929,125 @@ pub struct WorkflowFunc { pub uses: Rc>>, pub service_names: Rc>, pub resolved_defaults: Rc>, - pub read_only_params: Rc>, + pub read_only_params: Rc>, pub source_indices: Rc>>, } pub fn extract_literal_string(expr: Rc) -> Option { match (*expr.expr_data.clone()).clone() { - ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitStr { value: s, .. } => Some(s.clone()), - LiteralValue::LitBool { value: b, .. } => Some(if b.clone() { - "true".to_string() - } else { - "false".to_string() - }), - _ => None, -}, - _ => None, -} + ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitStr { value: s, .. } => Some(s.clone()), + LiteralValue::LitBool { value: b, .. } => Some(if b.clone() { + "true".to_string() + } else { + "false".to_string() + }), + _ => None, + }, + _ => None, + } } -pub fn resolve_param_default(param: Rc, registry: Rc>>, module_items: Rc>>, source_indices: &Rc>>) -> Option { +pub fn resolve_param_default( + param: Rc, + registry: Rc>>, + module_items: Rc>>, + source_indices: &Rc>>, +) -> Option { match param_node_default_value(¶m) { - Some(dv) => match (*dv.expr_data.clone()).clone() { - ExprData::ExprLiteral { .. } => extract_literal_string(dv.clone()), - ExprData::ExprVar { .. } => match lookup_item(registry, authored_name_at(source_indices.clone(), &dv)) { - Some(info) => match info.kind.clone() { - ItemKind::DataItem => match Rc::new({ let mut __result = Vec::new(); for i in module_items.iter().cloned() { if (authored_name_at(source_indices.clone(), &i).as_str() == authored_name_at(source_indices.clone(), &dv).as_str()) { __result.push(i); } } __result }).first().cloned() { - Some(data_item) => match data_item.body.clone() { - Some(body) => extract_literal_string(body.clone()), - None => None, -}, - None => None, -}, - _ => None, -}, - None => None, -}, - _ => None, -}, - None => None, -} + Some(dv) => match (*dv.expr_data.clone()).clone() { + ExprData::ExprLiteral { .. } => extract_literal_string(dv.clone()), + ExprData::ExprVar { .. } => { + match lookup_item(registry, authored_name_at(source_indices.clone(), &dv)) { + Some(info) => match info.kind.clone() { + ItemKind::DataItem => match Rc::new({ + let mut __result = Vec::new(); + for i in module_items.iter().cloned() { + if (authored_name_at(source_indices.clone(), &i).as_str() + == authored_name_at(source_indices.clone(), &dv).as_str()) + { + __result.push(i); + } + } + __result + }) + .first() + .cloned() + { + Some(data_item) => match data_item.body.clone() { + Some(body) => extract_literal_string(body.clone()), + None => None, + }, + None => None, + }, + _ => None, + }, + None => None, + } + } + _ => None, + }, + None => None, + } } -pub fn to_workflow_func(item: &Rc, module_name: &String, registry: &Rc>>, module_items: Rc>>, source_indices: &Rc>>, read_only_params_index: Rc>>>) -> Rc { +pub fn to_workflow_func( + item: &Rc, + module_name: &String, + registry: &Rc>>, + module_items: Rc>>, + source_indices: &Rc>>, + read_only_params_index: Rc>>>, +) -> Rc { { let item_name = authored_name_at(source_indices.clone(), &item); -let svc_names = match lookup_item(registry.clone(), item_name.clone()) { - Some(info) => info.service_names.clone(), - None => Rc::new(vec![]), -}; -let defaults = item.params.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, p: Rc| match resolve_param_default(p.clone(), registry.clone(), module_items.clone(), &source_indices) { - Some(lit) => v2_rt::rc_map_insert(acc.clone(), param_node_name_at(p.clone(), source_indices.clone()), lit.clone()), - None => acc.clone(), -}); -let qualified = v2_rt::concat(v2_rt::concat(module_name.clone(), ".".to_string()), item_name.clone()); -let ro_params = match v2_rt::map_get(&read_only_params_index, qualified) { - Some(m) => m.clone(), - None => empty_set(), -}; -Rc::new(WorkflowFunc { - name: item_name.clone(), - module_name: module_name.clone(), - params: item.params.clone(), - inferred: resolved_type(item.clone()), - uses: item.uses.clone(), - service_names: svc_names, - resolved_defaults: defaults, - read_only_params: ro_params, - source_indices: source_indices.clone(), -}) -} + let svc_names = match lookup_item(registry.clone(), item_name.clone()) { + Some(info) => info.service_names.clone(), + None => Rc::new(vec![]), + }; + let defaults = item.params.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, p: Rc| match resolve_param_default( + p.clone(), + registry.clone(), + module_items.clone(), + &source_indices, + ) { + Some(lit) => v2_rt::rc_map_insert( + acc.clone(), + param_node_name_at(p.clone(), source_indices.clone()), + lit.clone(), + ), + None => acc.clone(), + }, + ); + let qualified = v2_rt::concat( + v2_rt::concat(module_name.clone(), ".".to_string()), + item_name.clone(), + ); + let ro_params = match v2_rt::map_get(&read_only_params_index, qualified) { + Some(m) => m.clone(), + None => v2_rt::rc_empty_map::(), + }; + Rc::new(WorkflowFunc { + name: item_name.clone(), + module_name: module_name.clone(), + params: item.params.clone(), + inferred: resolved_type(item.clone()), + uses: item.uses.clone(), + service_names: svc_names, + resolved_defaults: defaults, + read_only_params: ro_params, + source_indices: source_indices.clone(), + }) + } } -pub fn is_workflow_item(item: &Rc, registry: Rc>>, source_indices: Rc>>) -> bool { +pub fn is_workflow_item( + item: &Rc, + registry: Rc>>, + source_indices: Rc>>, +) -> bool { if (item.body.clone() == None) { false } else { @@ -6367,36 +15055,89 @@ pub fn is_workflow_item(item: &Rc, registry: Rc (((info.service_names.clone().len() as i64) > 0) || ((info.resource_names.clone().len() as i64) > 0)), - None => true, -} + Some(info) => { + (((info.service_names.clone().len() as i64) > 0) + || ((info.resource_names.clone().len() as i64) > 0)) + } + None => true, + } } } } -pub fn collect_workflow_funcs(modules: Rc>>, registry: Rc>>, read_only_params_index: Rc>>>) -> Rc>> { - Rc::new({ let mut __result = Vec::new(); for tm in modules.iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for item in Rc::new({ let mut __result = Vec::new(); for item in tm.items.clone().iter().cloned() { if is_workflow_item(&item, registry.clone(), tm.type_env.clone().source_indices.clone()) { __result.push(item); } } __result }).iter().cloned() { __result.push(to_workflow_func(&item, &authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone()), ®istry, tm.items.clone(), &tm.type_env.clone().source_indices.clone(), read_only_params_index.clone())); } __result })).iter().cloned()); } __result }) +pub fn collect_workflow_funcs( + modules: Rc>>, + registry: Rc>>, + read_only_params_index: Rc>>>, +) -> Rc>> { + Rc::new({ + let mut __result = Vec::new(); + for tm in modules.iter().cloned() { + __result.extend( + (*Rc::new({ + let mut __result = Vec::new(); + for item in Rc::new({ + let mut __result = Vec::new(); + for item in tm.items.clone().iter().cloned() { + if is_workflow_item( + &item, + registry.clone(), + tm.type_env.clone().source_indices.clone(), + ) { + __result.push(item); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(to_workflow_func( + &item, + &authored_name_at( + tm.type_env.clone().source_indices.clone(), + &tm.module.clone(), + ), + ®istry, + tm.items.clone(), + &tm.type_env.clone().source_indices.clone(), + read_only_params_index.clone(), + )); + } + __result + })) + .iter() + .cloned(), + ); + } + __result + }) } pub fn cli_default_literal_value(expr: Rc) -> Option { match (*expr.expr_data.clone()).clone() { - ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitStr { value: s, .. } => Some(s.clone()), - LiteralValue::LitInt { value: i, .. } => Some((i.clone()).to_string()), - LiteralValue::LitFloat { value: f, .. } => Some(f.clone()), - LiteralValue::LitBool { value: b, .. } => Some(if b.clone() { - emit_keyword("true".to_string(), RenderTarget::Rust) - } else { - emit_keyword("false".to_string(), RenderTarget::Rust) - }), - LiteralValue::LitNull => None, -}, - _ => None, -} + ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitStr { value: s, .. } => Some(s.clone()), + LiteralValue::LitInt { value: i, .. } => Some((i.clone()).to_string()), + LiteralValue::LitFloat { value: f, .. } => Some(f.clone()), + LiteralValue::LitBool { value: b, .. } => Some(if b.clone() { + emit_keyword("true".to_string(), RenderTarget::Rust) + } else { + emit_keyword("false".to_string(), RenderTarget::Rust) + }), + LiteralValue::LitNull => None, + }, + _ => None, + } } -pub fn validate_workflow_param_defaults(workflow_funcs: Rc>>) -> Rc>> { - Rc::new({ let mut __result = Vec::new(); for wf in workflow_funcs.iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for param in wf.params.clone().iter().cloned() { __result.extend((*match param_node_default_value(¶m) { +pub fn validate_workflow_param_defaults( + workflow_funcs: Rc>>, +) -> Rc>> { + Rc::new({ + let mut __result = Vec::new(); + for wf in workflow_funcs.iter().cloned() { + __result.extend((*Rc::new({ let mut __result = Vec::new(); for param in wf.params.clone().iter().cloned() { __result.extend((*match param_node_default_value(¶m) { Some(dv) => { let param_name = authored_name_at(wf.source_indices.clone(), ¶m); let resolved = match v2_rt::map_get(&wf.resolved_defaults.clone(), param_name.clone()) { @@ -6416,257 +15157,617 @@ if resolved.clone() { } }, None => Rc::new(vec![]), -}).iter().cloned()); } __result })).iter().cloned()); } __result }) +}).iter().cloned()); } __result })).iter().cloned()); + } + __result + }) } pub fn find_resource_module(resource_name: String, modules: Rc>>) -> String { { - let matching = Rc::new({ let mut __result = Vec::new(); for m in modules.iter().cloned() { if { let mut __found = false; for item in m.items.clone().iter().cloned() { if (authored_name_at(m.type_env.clone().source_indices.clone(), &item).as_str() == resource_name.clone().as_str()) { __found = true; break; } } __found } { __result.push(m); } } __result }); -let result = match matching.first().cloned() { - Some(tm) => module_to_filename(authored_name_at(tm.type_env.clone().source_indices.clone(), &tm.module.clone())), - None => "".to_string(), -}; -result -} + let matching = Rc::new({ + let mut __result = Vec::new(); + for m in modules.iter().cloned() { + if { + let mut __found = false; + for item in m.items.clone().iter().cloned() { + if (authored_name_at(m.type_env.clone().source_indices.clone(), &item) + .as_str() + == resource_name.clone().as_str()) + { + __found = true; + break; + } + } + __found + } { + __result.push(m); + } + } + __result + }); + let result = match matching.first().cloned() { + Some(tm) => module_to_filename(authored_name_at( + tm.type_env.clone().source_indices.clone(), + &tm.module.clone(), + )), + None => "".to_string(), + }; + result + } } -pub fn emit_main_rs(workflow_funcs: &Rc>>, modules: &Rc>>, has_services: &bool, crate_name: &String, svc_module_map: Rc>) -> Rc { - { - let has_pipeline = { let mut __found = false; for m in modules.clone().iter().cloned() { if (authored_name_at(m.type_env.clone().source_indices.clone(), &m.module.clone()).as_str() == "v2.compiler.compile".to_string().as_str()) { __found = true; break; } } __found }; -let resource_type_names = Rc::new({ let mut __result = Vec::new(); for wf in workflow_funcs.clone().iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for u in wf.uses.clone().iter().cloned() { __result.push(authored_name_at(wf.source_indices.clone(), &resource_use_resource(&u))); } __result })).iter().cloned()); } __result }); -let unique_resource_types = unique_strings(resource_type_names); -let resource_imports = Rc::new({ let mut __result = Vec::new(); for rname in unique_resource_types.iter().cloned() { __result.extend((*{ - let mod_name = find_resource_module(rname.clone(), modules.clone()); -if (mod_name.clone().as_str() != "".to_string().as_str()) { - Rc::new(vec![v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("use ".to_string(), crate_name.clone()), "::".to_string()), mod_name.clone()), "::".to_string()), rname.clone()), ";".to_string())]) - } else { - Rc::new(vec![]) - } -}).iter().cloned()); } __result }); -let resource_imports_str = resource_imports.join(&"\n".to_string()); -let all_svc_names = Rc::new({ let mut __result = Vec::new(); for wf in workflow_funcs.clone().iter().cloned() { __result.extend((*wf.service_names.clone()).iter().cloned()); } __result }); -let unique_svc_names = unique_strings(all_svc_names); -let svc_imports = Rc::new({ let mut __result = Vec::new(); for sn in unique_svc_names.iter().cloned() { __result.extend((*{ - let struct_name = sanitize_service_name(sn.clone()); -match v2_rt::map_get(&svc_module_map, sn.clone()) { - Some(mod_name) => Rc::new(vec![v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("use ".to_string(), crate_name.clone()), "::".to_string()), mod_name.clone()), "::".to_string()), struct_name.clone()), ";".to_string())]), - None => Rc::new(vec![]), -} -}).iter().cloned()); } __result }); -let svc_imports_str = svc_imports.join(&"\n".to_string()); -let header = v2_rt::concat(v2_rt::concat("// Generated by v2 compiler -- do not edit.\n\n".to_string(), "#![allow(unused_parens, clippy::all, clippy::disallowed_macros)]\n\n".to_string()), v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("use clap::".to_string(), "{".to_string()), "Parser, Subcommand".to_string()), "}".to_string()), ";\n".to_string())); -let crate_use = if has_services.clone() { - v2_rt::concat(v2_rt::concat("use ".to_string(), crate_name.clone()), "::dry_run::DryRunMode;\n".to_string()) +pub fn emit_main_rs( + workflow_funcs: &Rc>>, + modules: &Rc>>, + has_services: &bool, + crate_name: &String, + svc_module_map: Rc>, +) -> Rc { + { + let has_pipeline = { + let mut __found = false; + for m in modules.clone().iter().cloned() { + if (authored_name_at(m.type_env.clone().source_indices.clone(), &m.module.clone()) + .as_str() + == "v2.compiler.compile".to_string().as_str()) + { + __found = true; + break; + } + } + __found + }; + let resource_type_names = Rc::new({ + let mut __result = Vec::new(); + for wf in workflow_funcs.clone().iter().cloned() { + __result.extend( + (*Rc::new({ + let mut __result = Vec::new(); + for u in wf.uses.clone().iter().cloned() { + __result.push(authored_name_at( + wf.source_indices.clone(), + &resource_use_resource(&u), + )); + } + __result + })) + .iter() + .cloned(), + ); + } + __result + }); + let unique_resource_types = unique_strings(resource_type_names); + let resource_imports = Rc::new({ + let mut __result = Vec::new(); + for rname in unique_resource_types.iter().cloned() { + __result.extend( + (*{ + let mod_name = find_resource_module(rname.clone(), modules.clone()); + if (mod_name.clone().as_str() != "".to_string().as_str()) { + Rc::new(vec![v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "use ".to_string(), + crate_name.clone(), + ), + "::".to_string(), + ), + mod_name.clone(), + ), + "::".to_string(), + ), + rname.clone(), + ), + ";".to_string(), + )]) + } else { + Rc::new(vec![]) + } + }) + .iter() + .cloned(), + ); + } + __result + }); + let resource_imports_str = resource_imports.join(&"\n".to_string()); + let all_svc_names = Rc::new({ + let mut __result = Vec::new(); + for wf in workflow_funcs.clone().iter().cloned() { + __result.extend((*wf.service_names.clone()).iter().cloned()); + } + __result + }); + let unique_svc_names = unique_strings(all_svc_names); + let svc_imports = Rc::new({ + let mut __result = Vec::new(); + for sn in unique_svc_names.iter().cloned() { + __result.extend( + (*{ + let struct_name = sanitize_service_name(sn.clone()); + match v2_rt::map_get(&svc_module_map, sn.clone()) { + Some(mod_name) => Rc::new(vec![v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "use ".to_string(), + crate_name.clone(), + ), + "::".to_string(), + ), + mod_name.clone(), + ), + "::".to_string(), + ), + struct_name.clone(), + ), + ";".to_string(), + )]), + None => Rc::new(vec![]), + } + }) + .iter() + .cloned(), + ); + } + __result + }); + let svc_imports_str = svc_imports.join(&"\n".to_string()); + let header = v2_rt::concat( + v2_rt::concat( + "// Generated by v2 compiler -- do not edit.\n\n".to_string(), + "#![allow(unused_parens, clippy::all, clippy::disallowed_macros)]\n\n".to_string(), + ), + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("use clap::".to_string(), "{".to_string()), + "Parser, Subcommand".to_string(), + ), + "}".to_string(), + ), + ";\n".to_string(), + ), + ); + let crate_use = if has_services.clone() { + v2_rt::concat( + v2_rt::concat("use ".to_string(), crate_name.clone()), + "::dry_run::DryRunMode;\n".to_string(), + ) } else { "".to_string() }; -let resource_use = if (resource_imports_str.clone().as_str() != "".to_string().as_str()) { + let resource_use = if (resource_imports_str.clone().as_str() != "".to_string().as_str()) { v2_rt::concat(resource_imports_str.clone(), "\n".to_string()) } else { "".to_string() }; -let svc_use = if (svc_imports_str.clone().as_str() != "".to_string().as_str()) { + let svc_use = if (svc_imports_str.clone().as_str() != "".to_string().as_str()) { v2_rt::concat(svc_imports_str.clone(), "\n".to_string()) } else { "".to_string() }; -let mod_uses = emit_main_mod_uses(workflow_funcs.clone(), has_pipeline.clone(), &crate_name); -let cli_struct = emit_cli_struct(workflow_funcs.clone()); -let subcommand_enum = emit_subcommand_enum(workflow_funcs.clone(), &has_pipeline); -let pipeline_fns = if has_pipeline.clone() { + let mod_uses = + emit_main_mod_uses(workflow_funcs.clone(), has_pipeline.clone(), &crate_name); + let cli_struct = emit_cli_struct(workflow_funcs.clone()); + let subcommand_enum = emit_subcommand_enum(workflow_funcs.clone(), &has_pipeline); + let pipeline_fns = if has_pipeline.clone() { emit_main_pipeline_fns(crate_name.clone()) } else { "".to_string() }; -let main_fn = emit_main_fn(workflow_funcs.clone(), &has_services, &has_pipeline, &crate_name); -let diagnostic_fns = if has_pipeline.clone() { + let main_fn = emit_main_fn( + workflow_funcs.clone(), + &has_services, + &has_pipeline, + &crate_name, + ); + let diagnostic_fns = if has_pipeline.clone() { emit_main_diagnostic_fns(crate_name.clone()) } else { "".to_string() }; -let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(header, crate_use), resource_use), svc_use), mod_uses), "\n".to_string()), cli_struct), "\n\n".to_string()), subcommand_enum), "\n\n".to_string()), pipeline_fns), main_fn), "\n".to_string()), diagnostic_fns); -Rc::new(TextFile { - path: v2_rt::concat(v2_rt::concat(rust_source_root(), "main".to_string()), rust_source_ext()), - content: content, -}) -} + let content = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(header, crate_use), + resource_use, + ), + svc_use, + ), + mod_uses, + ), + "\n".to_string(), + ), + cli_struct, + ), + "\n\n".to_string(), + ), + subcommand_enum, + ), + "\n\n".to_string(), + ), + pipeline_fns, + ), + main_fn, + ), + "\n".to_string(), + ), + diagnostic_fns, + ); + Rc::new(TextFile { + path: v2_rt::concat( + v2_rt::concat(rust_source_root(), "main".to_string()), + rust_source_ext(), + ), + content: content, + }) + } } -pub fn emit_main_mod_uses(workflow_funcs: Rc>>, has_pipeline: bool, crate_name: &String) -> String { +pub fn emit_main_mod_uses( + workflow_funcs: Rc>>, + has_pipeline: bool, + crate_name: &String, +) -> String { { - let mod_names = Rc::new({ let mut __result = Vec::new(); for wf in workflow_funcs.iter().cloned() { __result.push(module_to_filename(wf.module_name.clone())); } __result }); -let unique_mods = unique_strings(mod_names); -let use_lines = Rc::new({ let mut __result = Vec::new(); for m in unique_mods.iter().cloned() { __result.push(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("use ".to_string(), crate_name.clone()), "::".to_string()), m.clone()), ";".to_string())); } __result }); -let base = use_lines.join(&"\n".to_string()); -if has_pipeline { + let mod_names = Rc::new({ + let mut __result = Vec::new(); + for wf in workflow_funcs.iter().cloned() { + __result.push(module_to_filename(wf.module_name.clone())); + } + __result + }); + let unique_mods = unique_strings(mod_names); + let use_lines = Rc::new({ + let mut __result = Vec::new(); + for m in unique_mods.iter().cloned() { + __result.push(v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("use ".to_string(), crate_name.clone()), + "::".to_string(), + ), + m.clone(), + ), + ";".to_string(), + )); + } + __result + }); + let base = use_lines.join(&"\n".to_string()); + if has_pipeline { { let pipeline_mod = module_to_filename("v2.compiler.compile".to_string()); -let artifact_mod = module_to_filename("v2.compiler.artifact".to_string()); -let core_mod = module_to_filename("v2.std.core".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(base, "\nuse std::collections::HashMap;\n".to_string()), "use std::rc::Rc;\n".to_string()), "use ".to_string()), crate_name.clone()), "::".to_string()), pipeline_mod.clone()), ";\n".to_string()), "use ".to_string()), crate_name.clone()), "::".to_string()), pipeline_mod.clone()), "::PipelineResult;\n".to_string()), "use ".to_string()), crate_name.clone()), "::".to_string()), artifact_mod), ";\n".to_string()), "use ".to_string()), crate_name.clone()), "::".to_string()), core_mod), "::".to_string()), "{".to_string()), "\n diagnostic_to_message, diagnostic_to_span,\n".to_string()), " byte_to_line_col, source_line_at, NewlineIndex,\n".to_string()), " CompilerDiagnostic,\n".to_string()), "}".to_string()), ";\n".to_string()), "use ".to_string()), crate_name.clone()), "::cli_run;\n".to_string()) -} + let artifact_mod = module_to_filename("v2.compiler.artifact".to_string()); + let core_mod = module_to_filename("v2.std.core".to_string()); + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(base, "\nuse std::collections::HashMap;\n".to_string()), "use std::rc::Rc;\n".to_string()), "use ".to_string()), crate_name.clone()), "::".to_string()), pipeline_mod.clone()), ";\n".to_string()), "use ".to_string()), crate_name.clone()), "::".to_string()), pipeline_mod.clone()), "::PipelineResult;\n".to_string()), "use ".to_string()), crate_name.clone()), "::".to_string()), artifact_mod), ";\n".to_string()), "use ".to_string()), crate_name.clone()), "::".to_string()), core_mod), "::".to_string()), "{".to_string()), "\n diagnostic_to_message, diagnostic_to_span,\n".to_string()), " byte_to_line_col, source_line_at, NewlineIndex,\n".to_string()), " CompilerDiagnostic,\n".to_string()), "}".to_string()), ";\n".to_string()), "use ".to_string()), crate_name.clone()), "::cli_run;\n".to_string()) + } } else { base } -} + } } pub fn emit_cli_struct(workflow_funcs: Rc>>) -> String { v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("#[derive(Parser)]\n".to_string(), "#[command(name = \"v2-compiled\", about = \"Generated CLI from DAG compiler\")]\n".to_string()), "struct Cli {\n".to_string()), " #[command(subcommand)]\n".to_string()), " command: Commands,\n".to_string()), " /// Run in dry-run mode (mock all service calls)\n".to_string()), " #[arg(long, global = true)]\n".to_string()), " dry_run: bool,\n".to_string()), "}".to_string()) } -pub fn emit_subcommand_enum(workflow_funcs: Rc>>, has_pipeline: &bool) -> String { +pub fn emit_subcommand_enum( + workflow_funcs: Rc>>, + has_pipeline: &bool, +) -> String { { let depth = 0; -let variants = Rc::new({ let mut __result = Vec::new(); for wf in workflow_funcs.iter().cloned() { __result.push(emit_subcommand_variant(&wf, (depth.clone() + 1))); } __result }); -let compile_variant = if has_pipeline.clone() { + let variants = Rc::new({ + let mut __result = Vec::new(); + for wf in workflow_funcs.iter().cloned() { + __result.push(emit_subcommand_variant(&wf, (depth.clone() + 1))); + } + __result + }); + let compile_variant = if has_pipeline.clone() { v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("/// Compile .dag source files to a target language\n".to_string(), make_indent((depth.clone() + 1))), "Compile {\n".to_string()), make_indent((depth.clone() + 2))), "/// Source root directories (searched recursively for .dag files).\n".to_string()), make_indent((depth.clone() + 2))), "/// Module imports are resolved transitively from these roots.\n".to_string()), make_indent((depth.clone() + 2))), "#[arg(long = \"source-root\")]\n".to_string()), make_indent((depth.clone() + 2))), "source_roots: Vec,\n".to_string()), make_indent((depth.clone() + 2))), "/// Legacy: single source directory (all .dag files loaded, no import resolution)\n".to_string()), make_indent((depth.clone() + 2))), "#[arg(long = \"source-dir\")]\n".to_string()), make_indent((depth.clone() + 2))), "source_dir: Option,\n".to_string()), make_indent((depth.clone() + 2))), "#[arg(long)]\n".to_string()), make_indent((depth.clone() + 2))), "output_dir: String,\n".to_string()), make_indent((depth.clone() + 2))), "/// Target language: rust, python, go, dag\n".to_string()), make_indent((depth.clone() + 2))), "#[arg(long, default_value = \"rust\")]\n".to_string()), make_indent((depth.clone() + 2))), "target: String,\n".to_string()), make_indent((depth.clone() + 1))), "},".to_string()) } else { "".to_string() }; -let run_variant = if has_pipeline.clone() { + let run_variant = if has_pipeline.clone() { v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("/// Execute a .dag program directly (interpreter)\n".to_string(), make_indent((depth.clone() + 1))), "Run {\n".to_string()), make_indent((depth.clone() + 2))), "/// Source root directories (searched recursively for .dag files)\n".to_string()), make_indent((depth.clone() + 2))), "#[arg(long = \"source-root\")]\n".to_string()), make_indent((depth.clone() + 2))), "source_roots: Vec,\n".to_string()), make_indent((depth.clone() + 2))), "/// Entry function to execute (default: \"main\")\n".to_string()), make_indent((depth.clone() + 2))), "#[arg(long, default_value = \"main\")]\n".to_string()), make_indent((depth.clone() + 2))), "function: String,\n".to_string()), make_indent((depth.clone() + 1))), "},".to_string()) } else { "".to_string() }; -let all_variants = if has_pipeline.clone() { + let all_variants = if has_pipeline.clone() { v2_rt::concat(variants, Rc::new(vec![compile_variant, run_variant])) } else { variants }; -let variants_str = all_variants.join(&"\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("#[derive(Subcommand)]\n".to_string(), "enum Commands {\n".to_string()), make_indent((depth.clone() + 1))), variants_str), "\n".to_string()), "}".to_string()) -} + let variants_str = all_variants.join(&"\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "#[derive(Subcommand)]\n".to_string(), + "enum Commands {\n".to_string(), + ), + make_indent((depth.clone() + 1)), + ), + variants_str, + ), + "\n".to_string(), + ), + "}".to_string(), + ) + } } pub fn emit_subcommand_variant(wf: &Rc, depth: i64) -> String { { let variant_name = to_pascal(wf.name.clone()); -let doc_line = v2_rt::concat(v2_rt::concat("/// Run the ".to_string(), wf.name.clone()), " workflow".to_string()); -if ((wf.params.clone().len() as i64) == 0) { - v2_rt::concat(v2_rt::concat(v2_rt::concat(doc_line, "\n".to_string()), variant_name), ",".to_string()) + let doc_line = v2_rt::concat( + v2_rt::concat("/// Run the ".to_string(), wf.name.clone()), + " workflow".to_string(), + ); + if ((wf.params.clone().len() as i64) == 0) { + v2_rt::concat( + v2_rt::concat(v2_rt::concat(doc_line, "\n".to_string()), variant_name), + ",".to_string(), + ) } else { { - let fields = Rc::new({ let mut __result = Vec::new(); for p in wf.params.clone().iter().cloned() { __result.push(emit_subcommand_field(&p, &wf.source_indices.clone(), wf.resolved_defaults.clone())); } __result }); -let fields_str = fields.join(&"\n".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(doc_line, "\n".to_string()), variant_name), " {\n".to_string()), make_indent((depth + 1))), fields_str), "\n".to_string()), "},".to_string()) -} + let fields = Rc::new({ + let mut __result = Vec::new(); + for p in wf.params.clone().iter().cloned() { + __result.push(emit_subcommand_field( + &p, + &wf.source_indices.clone(), + wf.resolved_defaults.clone(), + )); + } + __result + }); + let fields_str = fields.join(&"\n".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(doc_line, "\n".to_string()), + variant_name, + ), + " {\n".to_string(), + ), + make_indent((depth + 1)), + ), + fields_str, + ), + "\n".to_string(), + ), + "},".to_string(), + ) + } } -} + } } -pub fn emit_subcommand_field(param: &Rc, source_indices: &Rc>>, resolved_defaults: Rc>) -> String { - { - let field_name = emit_ident(param_node_name_at(param.clone(), source_indices.clone()), RenderTarget::Rust); -let param_name = param_node_name_at(param.clone(), source_indices.clone()); -let field_type = emit_cli_param_type_node(¶m_node_type_expr(¶m), source_indices.clone()); -let default_attr = match v2_rt::map_get(&resolved_defaults, param_name) { - Some(resolved) => v2_rt::concat(v2_rt::concat("#[arg(long, default_value = \"".to_string(), resolved.clone()), "\")]\n".to_string()), - None => match param_node_default_value(¶m) { - Some(dv) => match cli_default_literal_value(dv.clone()) { - Some(default_value) => v2_rt::concat(v2_rt::concat("#[arg(long, default_value = \"".to_string(), default_value.clone()), "\")]\n".to_string()), - None => "#[arg(long)]\n".to_string(), -}, - None => "#[arg(long)]\n".to_string(), -}, -}; -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(default_attr, field_name), ": ".to_string()), field_type), ",".to_string()) -} +pub fn emit_subcommand_field( + param: &Rc, + source_indices: &Rc>>, + resolved_defaults: Rc>, +) -> String { + { + let field_name = emit_ident( + param_node_name_at(param.clone(), source_indices.clone()), + RenderTarget::Rust, + ); + let param_name = param_node_name_at(param.clone(), source_indices.clone()); + let field_type = + emit_cli_param_type_node(¶m_node_type_expr(¶m), source_indices.clone()); + let default_attr = match v2_rt::map_get(&resolved_defaults, param_name) { + Some(resolved) => v2_rt::concat( + v2_rt::concat( + "#[arg(long, default_value = \"".to_string(), + resolved.clone(), + ), + "\")]\n".to_string(), + ), + None => match param_node_default_value(¶m) { + Some(dv) => match cli_default_literal_value(dv.clone()) { + Some(default_value) => v2_rt::concat( + v2_rt::concat( + "#[arg(long, default_value = \"".to_string(), + default_value.clone(), + ), + "\")]\n".to_string(), + ), + None => "#[arg(long)]\n".to_string(), + }, + None => "#[arg(long)]\n".to_string(), + }, + }; + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(v2_rt::concat(default_attr, field_name), ": ".to_string()), + field_type, + ), + ",".to_string(), + ) + } } -pub fn emit_cli_param_type_node(n: &Rc, source_indices: Rc>>) -> String { +pub fn emit_cli_param_type_node( + n: &Rc, + source_indices: Rc>>, +) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); -let has_structure = (n.connective.clone() != Connective::NoConnective); -if is_optional { - v2_rt::concat(v2_rt::concat("Option<".to_string(), emit_cli_param_type_node(&with_required_cardinality(&n), source_indices)), ">".to_string()) + let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); + let has_structure = (n.connective.clone() != Connective::NoConnective); + if is_optional { + v2_rt::concat( + v2_rt::concat( + "Option<".to_string(), + emit_cli_param_type_node(&with_required_cardinality(&n), source_indices), + ), + ">".to_string(), + ) + } else { + if has_structure { + "String".to_string() } else { - if has_structure { - "String".to_string() - } else { - if ((n.children.clone().len() as i64) == 0) { - { - let nname = authored_name_at(source_indices, &n); -let mapped = coerce_primitive_type(RenderTarget::Rust, nname.clone()); -if (mapped.clone().as_str() != nname.clone().as_str()) { - mapped.clone() - } else { - "String".to_string() - } -} - } else { - "String".to_string() + if ((n.children.clone().len() as i64) == 0) { + { + let nname = authored_name_at(source_indices, &n); + let mapped = coerce_primitive_type(RenderTarget::Rust, nname.clone()); + if (mapped.clone().as_str() != nname.clone().as_str()) { + mapped.clone() + } else { + "String".to_string() + } } + } else { + "String".to_string() } } -} + } }) } -pub fn emit_main_fn(workflow_funcs: Rc>>, has_services: &bool, has_pipeline: &bool, crate_name: &String) -> String { +pub fn emit_main_fn( + workflow_funcs: Rc>>, + has_services: &bool, + has_pipeline: &bool, + crate_name: &String, +) -> String { { let depth = 0; -let async_attr = if has_services.clone() { + let async_attr = if has_services.clone() { "#[tokio::main]\nasync fn main() ".to_string() } else { "fn main() ".to_string() }; -let parse_line = "let cli = Cli::parse();".to_string(); -let dry_run_line = if has_services.clone() { + let parse_line = "let cli = Cli::parse();".to_string(); + let dry_run_line = if has_services.clone() { "let dry_run = DryRunMode(cli.dry_run);".to_string() } else { "".to_string() }; -let match_arms = Rc::new({ let mut __result = Vec::new(); for wf in workflow_funcs.iter().cloned() { __result.push(emit_main_match_arm(&wf, &has_services)); } __result }); -let compile_arm = if has_pipeline.clone() { + let match_arms = Rc::new({ + let mut __result = Vec::new(); + for wf in workflow_funcs.iter().cloned() { + __result.push(emit_main_match_arm(&wf, &has_services)); + } + __result + }); + let compile_arm = if has_pipeline.clone() { emit_compile_match_arm(crate_name.clone()) } else { "".to_string() }; -let run_arm = if has_pipeline.clone() { + let run_arm = if has_pipeline.clone() { emit_run_match_arm(crate_name.clone()) } else { "".to_string() }; -let all_arms = if has_pipeline.clone() { + let all_arms = if has_pipeline.clone() { v2_rt::concat(match_arms, Rc::new(vec![compile_arm, run_arm])) } else { match_arms }; -let arms_str = all_arms.join(&"\n".to_string()); -let match_block = v2_rt::concat(v2_rt::concat(v2_rt::concat("match cli.command {\n".to_string(), make_indent((depth.clone() + 2))), arms_str), "\n }".to_string()); -let result_handling = if has_services.clone() { + let arms_str = all_arms.join(&"\n".to_string()); + let match_block = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "match cli.command {\n".to_string(), + make_indent((depth.clone() + 2)), + ), + arms_str, + ), + "\n }".to_string(), + ); + let result_handling = if has_services.clone() { match_block } else { - v2_rt::concat(v2_rt::concat("let _result = ".to_string(), match_block), ";".to_string()) + v2_rt::concat( + v2_rt::concat("let _result = ".to_string(), match_block), + ";".to_string(), + ) }; -let body_lines = if (dry_run_line.clone().as_str() == "".to_string().as_str()) { + let body_lines = if (dry_run_line.clone().as_str() == "".to_string().as_str()) { v2_rt::concat(v2_rt::concat(parse_line, "\n".to_string()), result_handling) } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(parse_line, "\n".to_string()), dry_run_line.clone()), "\n".to_string()), result_handling) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(parse_line, "\n".to_string()), + dry_run_line.clone(), + ), + "\n".to_string(), + ), + result_handling, + ) }; -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(async_attr, "{\n".to_string()), make_indent((depth.clone() + 1))), body_lines), "\n}".to_string()) -} + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(async_attr, "{\n".to_string()), + make_indent((depth.clone() + 1)), + ), + body_lines, + ), + "\n}".to_string(), + ) + } } pub fn emit_compile_match_arm(crate_name: String) -> String { { let pipeline_mod = module_to_filename("v2.compiler.compile".to_string()); -let artifact_mod = module_to_filename("v2.compiler.artifact".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("Commands::Compile { source_roots, source_dir, output_dir, target } => {\n".to_string(), " let render_target = match target.as_str() {\n".to_string()), " \"rust\" => ".to_string()), artifact_mod.clone()), "::RenderTarget::Rust,\n".to_string()), " \"python\" => ".to_string()), artifact_mod.clone()), "::RenderTarget::Python,\n".to_string()), " \"go\" => ".to_string()), artifact_mod.clone()), "::RenderTarget::Go,\n".to_string()), " \"dag\" => ".to_string()), artifact_mod.clone()), "::RenderTarget::Dag,\n".to_string()), " other => {\n".to_string()), " eprintln!(\"unknown target: {}. supported: rust, python, go, dag\", other);\n".to_string()), " std::process::exit(1);\n".to_string()), " }\n".to_string()), " };\n".to_string()), "\n".to_string()), " let sources = if !source_roots.is_empty() {\n".to_string()), " // FF-9: Import-driven resolution from source roots\n".to_string()), " let index = build_module_index(&source_roots);\n".to_string()), " eprintln!(\"indexed {} modules from {} source roots\", index.len(), source_roots.len());\n".to_string()), "\n".to_string()), " // Entry modules: all .dag files in the FIRST source root.\n".to_string()), " // Additional roots are dependency pools resolved via imports.\n".to_string()), " // This is intentional: --source-root src/v2 --source-root dsl\n".to_string()), " // means 'compile src/v2, using dsl as a dependency pool.'\n".to_string()), " let first_root = std::path::Path::new(&source_roots[0]);\n".to_string()), " let mut entry_files = Vec::new();\n".to_string()), " if first_root.is_dir() {\n".to_string()), " let mut dag_paths = Vec::new();\n".to_string()), " collect_dag_files(first_root, &mut dag_paths);\n".to_string()), " for path in dag_paths {\n".to_string()), " let content = std::fs::read_to_string(&path)\n".to_string()), " .unwrap_or_else(|e| panic!(\"failed to read {:?}: {}\", path, e));\n".to_string()), " entry_files.push((path.to_string_lossy().to_string(), content));\n".to_string()), " }\n".to_string()), " }\n".to_string()), "\n".to_string()), " let mut seen: HashMap> = HashMap::new();\n".to_string()), " let mut entry_for_queue = Vec::new();\n".to_string()), " for (path, content) in &entry_files {\n".to_string()), " if let Some(mod_path) = extract_module_path(content) {\n".to_string()), " let source = Rc::new(".to_string()), pipeline_mod.clone()), "::SourceFile {\n".to_string()), " path: path.clone(),\n".to_string()), " content: content.clone(),\n".to_string()), " });\n".to_string()), " seen.insert(mod_path, source);\n".to_string()), " }\n".to_string()), " entry_for_queue.push((path.clone(), content.clone()));\n".to_string()), " }\n".to_string()), "\n".to_string()), " let mut resolved = resolve_transitively_with_seen(entry_for_queue, &index, seen);\n".to_string()), " for (path, content) in entry_files {\n".to_string()), " let already_there = resolved.iter().any(|s| s.path == path);\n".to_string()), " if !already_there {\n".to_string()), " resolved.push(Rc::new(".to_string()), pipeline_mod.clone()), "::SourceFile { path, content }));\n".to_string()), " }\n".to_string()), " }\n".to_string()), " eprintln!(\"resolved {} sources (transitive import closure)\", resolved.len());\n".to_string()), " resolved\n".to_string()), "\n".to_string()), " } else if let Some(dir) = source_dir {\n".to_string()), " // Legacy: flat directory scan (backward compatibility)\n".to_string()), " let mut dag_paths = Vec::new();\n".to_string()), " collect_dag_files(std::path::Path::new(&dir), &mut dag_paths);\n".to_string()), " let mut sources = Vec::new();\n".to_string()), " for path in &dag_paths {\n".to_string()), " let content = std::fs::read_to_string(path)\n".to_string()), " .unwrap_or_else(|e| panic!(\"failed to read {:?}: {}\", path, e));\n".to_string()), " let filename = path.file_name().unwrap().to_string_lossy().to_string();\n".to_string()), " sources.push(Rc::new(".to_string()), pipeline_mod.clone()), "::SourceFile {\n".to_string()), " path: filename,\n".to_string()), " content,\n".to_string()), " }));\n".to_string()), " }\n".to_string()), " eprintln!(\"compiling {} .dag files from {} (target: {})\", sources.len(), dir, target);\n".to_string()), " sources\n".to_string()), "\n".to_string()), " } else {\n".to_string()), " eprintln!(\"error: provide --source-root or --source-dir\");\n".to_string()), " std::process::exit(1);\n".to_string()), " };\n".to_string()), "\n".to_string()), " let result = ".to_string()), pipeline_mod.clone()), "::compile_sources(Rc::new(sources), render_target);\n".to_string()), "\n".to_string()), " std::fs::create_dir_all(format!(\"{}/src\", output_dir))\n".to_string()), " .unwrap_or_else(|e| panic!(\"failed to create output dir: {}\", e));\n".to_string()), " for file in result.files.iter() {\n".to_string()), " let out_path = format!(\"{}/{}\", output_dir, file.path);\n".to_string()), " if let Some(parent) = std::path::Path::new(&out_path).parent() {\n".to_string()), " std::fs::create_dir_all(parent).ok();\n".to_string()), " }\n".to_string()), " std::fs::write(&out_path, &*file.content)\n".to_string()), " .unwrap_or_else(|e| panic!(\"failed to write {}: {}\", file.path, e));\n".to_string()), " }\n".to_string()), " eprintln!(\"compiled: {} files emitted, {} diagnostics\",\n".to_string()), " result.files.len(), result.diagnostics.len());\n".to_string()), " render_diagnostics(&result);\n".to_string()), " // Complexity violations are non-blocking (analyzer limitations).\n".to_string()), " let hard_errors = result.diagnostics.iter().any(|d| {\n".to_string()), " !matches!(*d.diagnostic.clone(), CompilerDiagnostic::ComplexityUnknown { .. })\n".to_string()), " });\n".to_string()), " if hard_errors {\n".to_string()), " std::process::exit(1);\n".to_string()), " }\n".to_string()), " if result.files.is_empty() {\n".to_string()), " eprintln!(\"error: no files emitted\");\n".to_string()), " std::process::exit(1);\n".to_string()), " }\n".to_string()), " },".to_string()) -} + let artifact_mod = module_to_filename("v2.compiler.artifact".to_string()); + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("Commands::Compile { source_roots, source_dir, output_dir, target } => {\n".to_string(), " let render_target = match target.as_str() {\n".to_string()), " \"rust\" => ".to_string()), artifact_mod.clone()), "::RenderTarget::Rust,\n".to_string()), " \"python\" => ".to_string()), artifact_mod.clone()), "::RenderTarget::Python,\n".to_string()), " \"go\" => ".to_string()), artifact_mod.clone()), "::RenderTarget::Go,\n".to_string()), " \"dag\" => ".to_string()), artifact_mod.clone()), "::RenderTarget::Dag,\n".to_string()), " other => {\n".to_string()), " eprintln!(\"unknown target: {}. supported: rust, python, go, dag\", other);\n".to_string()), " std::process::exit(1);\n".to_string()), " }\n".to_string()), " };\n".to_string()), "\n".to_string()), " let sources = if !source_roots.is_empty() {\n".to_string()), " // FF-9: Import-driven resolution from source roots\n".to_string()), " let index = build_module_index(&source_roots);\n".to_string()), " eprintln!(\"indexed {} modules from {} source roots\", index.len(), source_roots.len());\n".to_string()), "\n".to_string()), " // Entry modules: all .dag files in the FIRST source root.\n".to_string()), " // Additional roots are dependency pools resolved via imports.\n".to_string()), " // This is intentional: --source-root src/v2 --source-root dsl\n".to_string()), " // means 'compile src/v2, using dsl as a dependency pool.'\n".to_string()), " let first_root = std::path::Path::new(&source_roots[0]);\n".to_string()), " let mut entry_files = Vec::new();\n".to_string()), " if first_root.is_dir() {\n".to_string()), " let mut dag_paths = Vec::new();\n".to_string()), " collect_dag_files(first_root, &mut dag_paths);\n".to_string()), " for path in dag_paths {\n".to_string()), " let content = std::fs::read_to_string(&path)\n".to_string()), " .unwrap_or_else(|e| panic!(\"failed to read {:?}: {}\", path, e));\n".to_string()), " entry_files.push((path.to_string_lossy().to_string(), content));\n".to_string()), " }\n".to_string()), " }\n".to_string()), "\n".to_string()), " let mut seen: HashMap> = HashMap::new();\n".to_string()), " let mut entry_for_queue = Vec::new();\n".to_string()), " for (path, content) in &entry_files {\n".to_string()), " if let Some(mod_path) = extract_module_path(content) {\n".to_string()), " let source = Rc::new(".to_string()), pipeline_mod.clone()), "::SourceFile {\n".to_string()), " path: path.clone(),\n".to_string()), " content: content.clone(),\n".to_string()), " });\n".to_string()), " seen.insert(mod_path, source);\n".to_string()), " }\n".to_string()), " entry_for_queue.push((path.clone(), content.clone()));\n".to_string()), " }\n".to_string()), "\n".to_string()), " let mut resolved = resolve_transitively_with_seen(entry_for_queue, &index, seen);\n".to_string()), " for (path, content) in entry_files {\n".to_string()), " let already_there = resolved.iter().any(|s| s.path == path);\n".to_string()), " if !already_there {\n".to_string()), " resolved.push(Rc::new(".to_string()), pipeline_mod.clone()), "::SourceFile { path, content }));\n".to_string()), " }\n".to_string()), " }\n".to_string()), " eprintln!(\"resolved {} sources (transitive import closure)\", resolved.len());\n".to_string()), " resolved\n".to_string()), "\n".to_string()), " } else if let Some(dir) = source_dir {\n".to_string()), " // Legacy: flat directory scan (backward compatibility)\n".to_string()), " let mut dag_paths = Vec::new();\n".to_string()), " collect_dag_files(std::path::Path::new(&dir), &mut dag_paths);\n".to_string()), " let mut sources = Vec::new();\n".to_string()), " for path in &dag_paths {\n".to_string()), " let content = std::fs::read_to_string(path)\n".to_string()), " .unwrap_or_else(|e| panic!(\"failed to read {:?}: {}\", path, e));\n".to_string()), " let filename = path.file_name().unwrap().to_string_lossy().to_string();\n".to_string()), " sources.push(Rc::new(".to_string()), pipeline_mod.clone()), "::SourceFile {\n".to_string()), " path: filename,\n".to_string()), " content,\n".to_string()), " }));\n".to_string()), " }\n".to_string()), " eprintln!(\"compiling {} .dag files from {} (target: {})\", sources.len(), dir, target);\n".to_string()), " sources\n".to_string()), "\n".to_string()), " } else {\n".to_string()), " eprintln!(\"error: provide --source-root or --source-dir\");\n".to_string()), " std::process::exit(1);\n".to_string()), " };\n".to_string()), "\n".to_string()), " let result = ".to_string()), pipeline_mod.clone()), "::compile_sources(Rc::new(sources), render_target);\n".to_string()), "\n".to_string()), " std::fs::create_dir_all(format!(\"{}/src\", output_dir))\n".to_string()), " .unwrap_or_else(|e| panic!(\"failed to create output dir: {}\", e));\n".to_string()), " for file in result.files.iter() {\n".to_string()), " let out_path = format!(\"{}/{}\", output_dir, file.path);\n".to_string()), " if let Some(parent) = std::path::Path::new(&out_path).parent() {\n".to_string()), " std::fs::create_dir_all(parent).ok();\n".to_string()), " }\n".to_string()), " std::fs::write(&out_path, &*file.content)\n".to_string()), " .unwrap_or_else(|e| panic!(\"failed to write {}: {}\", file.path, e));\n".to_string()), " }\n".to_string()), " eprintln!(\"compiled: {} files emitted, {} diagnostics\",\n".to_string()), " result.files.len(), result.diagnostics.len());\n".to_string()), " render_diagnostics(&result);\n".to_string()), " // Complexity violations are non-blocking (analyzer limitations).\n".to_string()), " let hard_errors = result.diagnostics.iter().any(|d| {\n".to_string()), " !matches!(*d.diagnostic.clone(), CompilerDiagnostic::ComplexityUnknown { .. })\n".to_string()), " });\n".to_string()), " if hard_errors {\n".to_string()), " std::process::exit(1);\n".to_string()), " }\n".to_string()), " if result.files.is_empty() {\n".to_string()), " eprintln!(\"error: no files emitted\");\n".to_string()), " std::process::exit(1);\n".to_string()), " }\n".to_string()), " },".to_string()) + } } pub fn emit_run_match_arm(crate_name: String) -> String { - v2_rt::concat(v2_rt::concat("\n Commands::Run { source_roots, function } => {\n".to_string(), " cli_run::handle_run(source_roots, function);\n".to_string()), " },".to_string()) + v2_rt::concat( + v2_rt::concat( + "\n Commands::Run { source_roots, function } => {\n".to_string(), + " cli_run::handle_run(source_roots, function);\n".to_string(), + ), + " },".to_string(), + ) } pub fn emit_main_pipeline_fns(crate_name: String) -> String { { let pipeline_mod = module_to_filename("v2.compiler.compile".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(emit_collect_dag_files_fn(), emit_extract_module_path_fn()), emit_extract_import_paths_fn()), emit_build_module_index_fn()), emit_resolve_transitively_fn(&crate_name, &pipeline_mod)) -} + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(emit_collect_dag_files_fn(), emit_extract_module_path_fn()), + emit_extract_import_paths_fn(), + ), + emit_build_module_index_fn(), + ), + emit_resolve_transitively_fn(&crate_name, &pipeline_mod), + ) + } } pub fn emit_collect_dag_files_fn() -> String { @@ -6692,96 +15793,183 @@ pub fn emit_resolve_transitively_fn(crate_name: &String, pipeline_mod: &String) pub fn emit_main_diagnostic_fns(crate_name: String) -> String { { let core_mod = module_to_filename("v2.std.core".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("\nfn render_diagnostics(result: &PipelineResult) {\n".to_string(), " if result.diagnostics.is_empty() {\n".to_string()), " return;\n".to_string()), " }\n".to_string()), "\n".to_string()), " let index_map: HashMap> = result\n".to_string()), " .newline_indices\n".to_string()), " .iter()\n".to_string()), " .map(|idx| (idx.file.clone(), idx.clone()))\n".to_string()), " .collect();\n".to_string()), "\n".to_string()), " for d in result.diagnostics.iter() {\n".to_string()), " render_one_diagnostic(d, &index_map, \"\");\n".to_string()), " }\n".to_string()), "\n".to_string()), " eprintln!(\"\\n{} error(s)\", result.diagnostics.len());\n".to_string()), "}\n".to_string()), "\n".to_string()), "fn render_one_diagnostic(\n".to_string()), " d: &".to_string()), crate_name), "::".to_string()), core_mod), "::ErrorNode,\n".to_string()), " index_map: &HashMap>,\n".to_string()), " indent: &str,\n".to_string()), ") {\n".to_string()), " let severity = \"error\";\n".to_string()), " let message = diagnostic_to_message(d.diagnostic.clone());\n".to_string()), " let span = diagnostic_to_span(d.diagnostic.clone());\n".to_string()), "\n".to_string()), " let location = if !span.file.is_empty() {\n".to_string()), " if let Some(idx) = index_map.get(&span.file) {\n".to_string()), " let lc = byte_to_line_col(idx, span.start);\n".to_string()), " format!(\"{}:{}:{}\", span.file, lc.line, lc.col)\n".to_string()), " } else {\n".to_string()), " span.file.clone()\n".to_string()), " }\n".to_string()), " } else if !d.module_name.is_empty() {\n".to_string()), " d.module_name.clone()\n".to_string()), " } else {\n".to_string()), " String::new()\n".to_string()), " };\n".to_string()), "\n".to_string()), " if location.is_empty() {\n".to_string()), " eprintln!(\"{}{}: {}\", indent, severity, message);\n".to_string()), " } else {\n".to_string()), " eprintln!(\"{}{}[{}]: {}\", indent, severity, location, message);\n".to_string()), " }\n".to_string()), "\n".to_string()), " if !span.file.is_empty() {\n".to_string()), " if let Some(idx) = index_map.get(&span.file) {\n".to_string()), " let lc = byte_to_line_col(idx, span.start);\n".to_string()), " let line_text = source_line_at(idx, lc.line);\n".to_string()), " let line_num = format!(\"{}\", lc.line);\n".to_string()), " let gutter_width = line_num.len();\n".to_string()), " eprintln!(\"{} {} |\", indent, \" \".repeat(gutter_width));\n".to_string()), " eprintln!(\"{} {} | {}\", indent, line_num, line_text);\n".to_string()), "\n".to_string()), " let span_len = std::cmp::max(1, (span.end - span.start) as usize);\n".to_string()), " let col_offset = (lc.col - 1) as usize;\n".to_string()), " eprintln!(\n".to_string()), " \"{} {} | {}{}\",\n".to_string()), " indent,\n".to_string()), " \" \".repeat(gutter_width),\n".to_string()), " \" \".repeat(col_offset),\n".to_string()), " \"^\".repeat(std::cmp::min(span_len, line_text.len().saturating_sub(col_offset)))\n".to_string()), " );\n".to_string()), " }\n".to_string()), " }\n".to_string()), "}\n".to_string()) -} + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("\nfn render_diagnostics(result: &PipelineResult) {\n".to_string(), " if result.diagnostics.is_empty() {\n".to_string()), " return;\n".to_string()), " }\n".to_string()), "\n".to_string()), " let index_map: HashMap> = result\n".to_string()), " .newline_indices\n".to_string()), " .iter()\n".to_string()), " .map(|idx| (idx.file.clone(), idx.clone()))\n".to_string()), " .collect();\n".to_string()), "\n".to_string()), " for d in result.diagnostics.iter() {\n".to_string()), " render_one_diagnostic(d, &index_map, \"\");\n".to_string()), " }\n".to_string()), "\n".to_string()), " eprintln!(\"\\n{} error(s)\", result.diagnostics.len());\n".to_string()), "}\n".to_string()), "\n".to_string()), "fn render_one_diagnostic(\n".to_string()), " d: &".to_string()), crate_name), "::".to_string()), core_mod), "::ErrorNode,\n".to_string()), " index_map: &HashMap>,\n".to_string()), " indent: &str,\n".to_string()), ") {\n".to_string()), " let severity = \"error\";\n".to_string()), " let message = diagnostic_to_message(d.diagnostic.clone());\n".to_string()), " let span = diagnostic_to_span(d.diagnostic.clone());\n".to_string()), "\n".to_string()), " let location = if !span.file.is_empty() {\n".to_string()), " if let Some(idx) = index_map.get(&span.file) {\n".to_string()), " let lc = byte_to_line_col(idx, span.start);\n".to_string()), " format!(\"{}:{}:{}\", span.file, lc.line, lc.col)\n".to_string()), " } else {\n".to_string()), " span.file.clone()\n".to_string()), " }\n".to_string()), " } else if !d.module_name.is_empty() {\n".to_string()), " d.module_name.clone()\n".to_string()), " } else {\n".to_string()), " String::new()\n".to_string()), " };\n".to_string()), "\n".to_string()), " if location.is_empty() {\n".to_string()), " eprintln!(\"{}{}: {}\", indent, severity, message);\n".to_string()), " } else {\n".to_string()), " eprintln!(\"{}{}[{}]: {}\", indent, severity, location, message);\n".to_string()), " }\n".to_string()), "\n".to_string()), " if !span.file.is_empty() {\n".to_string()), " if let Some(idx) = index_map.get(&span.file) {\n".to_string()), " let lc = byte_to_line_col(idx, span.start);\n".to_string()), " let line_text = source_line_at(idx, lc.line);\n".to_string()), " let line_num = format!(\"{}\", lc.line);\n".to_string()), " let gutter_width = line_num.len();\n".to_string()), " eprintln!(\"{} {} |\", indent, \" \".repeat(gutter_width));\n".to_string()), " eprintln!(\"{} {} | {}\", indent, line_num, line_text);\n".to_string()), "\n".to_string()), " let span_len = std::cmp::max(1, (span.end - span.start) as usize);\n".to_string()), " let col_offset = (lc.col - 1) as usize;\n".to_string()), " eprintln!(\n".to_string()), " \"{} {} | {}{}\",\n".to_string()), " indent,\n".to_string()), " \" \".repeat(gutter_width),\n".to_string()), " \" \".repeat(col_offset),\n".to_string()), " \"^\".repeat(std::cmp::min(span_len, line_text.len().saturating_sub(col_offset)))\n".to_string()), " );\n".to_string()), " }\n".to_string()), " }\n".to_string()), "}\n".to_string()) + } } pub fn emit_main_match_arm(wf: &Rc, has_services: &bool) -> String { { let variant_name = to_pascal(wf.name.clone()); -let mod_name = module_to_filename(wf.module_name.clone()); -let fn_name = emit_ident(wf.name.clone(), RenderTarget::Rust); -let await_suffix = if has_services.clone() { + let mod_name = module_to_filename(wf.module_name.clone()); + let fn_name = emit_ident(wf.name.clone(), RenderTarget::Rust); + let await_suffix = if has_services.clone() { ".await".to_string() } else { "".to_string() }; -let call_expr = if ((wf.params.clone().len() as i64) == 0) { + let call_expr = if ((wf.params.clone().len() as i64) == 0) { { let service_args = emit_main_service_args(wf.clone(), has_services.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(mod_name, "::".to_string()), fn_name), "(".to_string()), service_args), ")".to_string()), await_suffix) -} + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(v2_rt::concat(mod_name, "::".to_string()), fn_name), + "(".to_string(), + ), + service_args, + ), + ")".to_string(), + ), + await_suffix, + ) + } } else { { let call_args = emit_main_call_args(&wf, has_services.clone()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(mod_name, "::".to_string()), fn_name), "(".to_string()), call_args), ")".to_string()), await_suffix) -} + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(v2_rt::concat(mod_name, "::".to_string()), fn_name), + "(".to_string(), + ), + call_args, + ), + ")".to_string(), + ), + await_suffix, + ) + } }; -let pattern = if ((wf.params.clone().len() as i64) == 0) { + let pattern = if ((wf.params.clone().len() as i64) == 0) { v2_rt::concat("Commands::".to_string(), variant_name) } else { { - let field_binds = Rc::new({ let mut __result = Vec::new(); for p in wf.params.clone().iter().cloned() { __result.push(emit_ident(param_node_name_at(p.clone(), wf.source_indices.clone()), RenderTarget::Rust)); } __result }); -let binds_str = field_binds.join(&", ".to_string()); -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("Commands::".to_string(), variant_name), " { ".to_string()), binds_str), " }".to_string()) -} + let field_binds = Rc::new({ + let mut __result = Vec::new(); + for p in wf.params.clone().iter().cloned() { + __result.push(emit_ident( + param_node_name_at(p.clone(), wf.source_indices.clone()), + RenderTarget::Rust, + )); + } + __result + }); + let binds_str = field_binds.join(&", ".to_string()); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("Commands::".to_string(), variant_name), + " { ".to_string(), + ), + binds_str, + ), + " }".to_string(), + ) + } }; -if has_services.clone() { + if has_services.clone() { v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(pattern, " => {\n".to_string()), " match ".to_string()), call_expr), " {\n".to_string()), " Ok(value) => {\n".to_string()), " let json = serde_json::to_string_pretty(&value).unwrap_or_else(|_| format!(\"{:?}\", value));\n".to_string()), " println!(\"{}\", json);\n".to_string()), " }\n".to_string()), " Err(e) => {\n".to_string()), " eprintln!(\"Error: {}\", e);\n".to_string()), " std::process::exit(1);\n".to_string()), " }\n".to_string()), " }\n".to_string()), " }".to_string()) } else { - v2_rt::concat(v2_rt::concat(v2_rt::concat(pattern, " => ".to_string()), call_expr), ",".to_string()) + v2_rt::concat( + v2_rt::concat(v2_rt::concat(pattern, " => ".to_string()), call_expr), + ",".to_string(), + ) } -} + } } pub fn emit_main_call_args(wf: &Rc, has_services: bool) -> String { { - let param_args = Rc::new({ let mut __result = Vec::new(); for p in wf.params.clone().iter().cloned() { __result.push({ - let pname = param_node_name_at(p.clone(), wf.source_indices.clone()); -let ident = emit_ident(pname.clone(), RenderTarget::Rust); -let n = param_node_type_expr(&p); -let is_borrowable = ((set_contains(wf.read_only_params.clone(), pname.clone()) && ((n.params.clone().len() as i64) == 0)) && needs_reference_node(&n, wf.source_indices.clone())); -if is_borrowable.clone() { - v2_rt::concat("&".to_string(), ident.clone()) - } else { - ident.clone() + let param_args = Rc::new({ + let mut __result = Vec::new(); + for p in wf.params.clone().iter().cloned() { + __result.push({ + let pname = param_node_name_at(p.clone(), wf.source_indices.clone()); + let ident = emit_ident(pname.clone(), RenderTarget::Rust); + let n = param_node_type_expr(&p); + let is_borrowable = + ((v2_rt::map_contains_key(&wf.read_only_params.clone(), pname.clone()) + && ((n.params.clone().len() as i64) == 0)) + && needs_reference_node(&n, wf.source_indices.clone())); + if is_borrowable.clone() { + v2_rt::concat("&".to_string(), ident.clone()) + } else { + ident.clone() + } + }); } -}); } __result }); -let service_args = emit_main_service_arg_list(&wf, has_services); -let all_args = v2_rt::concat(param_args, service_args); -all_args.join(&", ".to_string()) -} + __result + }); + let service_args = emit_main_service_arg_list(&wf, has_services); + let all_args = v2_rt::concat(param_args, service_args); + all_args.join(&", ".to_string()) + } } pub fn emit_main_service_args(wf: Rc, has_services: bool) -> String { { let service_args = emit_main_service_arg_list(&wf, has_services); -service_args.join(&", ".to_string()) -} + service_args.join(&", ".to_string()) + } } pub fn emit_main_service_arg_list(wf: &Rc, has_services: bool) -> Rc> { { let sharing = language_spec(RenderTarget::Rust).sharing.clone(); -let resource_args = Rc::new({ let mut __result = Vec::new(); for u in wf.uses.clone().iter().cloned() { __result.push(v2_rt::concat("&".to_string(), authored_name_at(wf.source_indices.clone(), &resource_use_resource(&u)))); } __result }); -let svc_args = Rc::new({ let mut __result = Vec::new(); for sn in wf.service_names.clone().iter().cloned() { __result.push({ - let struct_name = sanitize_service_name(sn.clone()); -if has_services.clone() { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("&".to_string(), struct_name.clone()), "::new(".to_string()), apply_type_template1(sharing.clone_value.clone(), "dry_run".to_string())), ")".to_string()) - } else { - v2_rt::concat(v2_rt::concat("&".to_string(), struct_name.clone()), "::new()".to_string()) + let resource_args = Rc::new({ + let mut __result = Vec::new(); + for u in wf.uses.clone().iter().cloned() { + __result.push(v2_rt::concat( + "&".to_string(), + authored_name_at(wf.source_indices.clone(), &resource_use_resource(&u)), + )); } -}); } __result }); -v2_rt::concat(resource_args, svc_args) -} + __result + }); + let svc_args = Rc::new({ + let mut __result = Vec::new(); + for sn in wf.service_names.clone().iter().cloned() { + __result.push({ + let struct_name = sanitize_service_name(sn.clone()); + if has_services.clone() { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("&".to_string(), struct_name.clone()), + "::new(".to_string(), + ), + apply_type_template1( + sharing.clone_value.clone(), + "dry_run".to_string(), + ), + ), + ")".to_string(), + ) + } else { + v2_rt::concat( + v2_rt::concat("&".to_string(), struct_name.clone()), + "::new()".to_string(), + ) + } + }); + } + __result + }); + v2_rt::concat(resource_args, svc_args) + } } pub fn emit_dry_run_module() -> Rc { { let content = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("// Generated by v2 compiler -- do not edit.\n".to_string(), "//\n".to_string()), "// Dry-run support: when DryRunMode(true), service methods return\n".to_string()), "// mock data instead of performing real I/O.\n\n".to_string()), "#[derive(Debug, Clone)]\n".to_string()), "pub struct DryRunMode(pub bool);\n\n".to_string()), "impl DryRunMode {\n".to_string()), " pub fn is_dry_run(&self) -> bool {\n".to_string()), " self.0\n".to_string()), " }\n".to_string()), "}\n\n".to_string()), "impl Default for DryRunMode {\n".to_string()), " fn default() -> Self {\n".to_string()), " DryRunMode(false)\n".to_string()), " }\n".to_string()), "}\n".to_string()); -Rc::new(TextFile { - path: v2_rt::concat(v2_rt::concat(rust_source_root(), "dry_run".to_string()), rust_source_ext()), - content: content, -}) -} + Rc::new(TextFile { + path: v2_rt::concat( + v2_rt::concat(rust_source_root(), "dry_run".to_string()), + rust_source_ext(), + ), + content: content, + }) + } } diff --git a/src/v2/stage0/src/v2_compiler_infer.rs b/src/v2/stage0/src/v2_compiler_infer.rs index 8219ebe662a..8a2797bae99 100644 --- a/src/v2/stage0/src/v2_compiler_infer.rs +++ b/src/v2/stage0/src/v2_compiler_infer.rs @@ -1,56 +1,143 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer -use std::collections::HashMap; -use std::rc::Rc; -use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::std_types::{SourceSpan, container_param_name}; +use self::SizeExpr::*; +pub use crate::std_algebra::CollectionSizeEffect; +use crate::std_algebra::CollectionSizeEffect::ShrinkEffect; pub use crate::std_coercion::{dag_can_cast, is_dag_cast_domain_type}; -pub use crate::v2_std_core::{Node, InternTable, intern, intern_str, authored_name_at, NewlineIndex, has_child_named, build_newline_index, module_node, module_imports, module_items, import_is_all, make_param_node, param_node_name_at, param_node_type_expr, field_node_type_expr, Connective, ExprData, make_expr_node, make_named_expr_node, make_expr_error_node, expr_var_name_at, field_access_base, field_access_field_at, expr_call_func_at, expr_method_name_at, let_binding_name_at, foreach_variable_at, lambda_param_names_at, record_lit_type_name_at, make_arg_node, make_arm_node, arm_pattern, arm_guard, arm_body, make_field_init_node, field_init_node_name_at, field_init_node_value, make_text_part_node, make_interp_part_node, map_children, arg_value, arg_name_at, has_inferred, is_compiler_error, InferredNode, Cardinality, ErrorNode, make_error_node, is_error_diagnostic, resource_use_name_at, resource_use_resource, kernel_type_set, is_kernel_type, is_child_accessor_in_model, is_tree_size_reducing, is_property_contraction, expr_has_self_call, expr_has_non_tail_self_call, DeclaredFuncSig, DeclaredFuncEnv, LiteralValue, FieldAccessStyle, FieldValueShape, FieldSummary, VarBindingKind, CallSemantics, MethodSemantics, ExprErrorKind, BinOp, UnaryOpKind, unaryop_operand, MatchPattern, StringPart, make_field_binding_node, field_binding_name_at, field_binding_pattern, let_value, let_body, lambda_body, foreach_collection, foreach_body, method_receiver, method_arg_nodes, match_scrutinee, match_arm_nodes, if_condition, if_then_branch, if_else_branch, index_base, index_expr, slice_base, slice_start, slice_end, cast_target, cast_expr, return_value, binop_left, binop_right, make_transport_node, local_transport_node, with_optional_cardinality, with_required_cardinality, no_span, make_span, unit_type, bool_type, string_type, int_type, float_type, none_type, error_type, is_container_type, container_expected_arity, default_ident_span, node_name_span, CompilerDiagnostic}; -use crate::v2_std_core::Connective::{Conj, Disj, NoConnective, Arrow}; -use crate::v2_std_core::ExprData::{NoExprData, ExprLiteral, ExprError, ExprVar, ExprFieldAccess, ExprCall, ExprMethodCall, ExprMatch, ExprIf, ExprLet, ExprRecordLit, ExprListLit, ExprBinOp, ExprUnaryOp, ExprLambda, ExprStringInterp, ExprBlock, ExprCast, ExprForEach, ExprIndex, ExprSlice, ExprReturn}; -use crate::v2_std_core::InferredNode::{Resolved, CompilerError, TypeVariable}; -use crate::v2_std_core::Cardinality::{Required, CardOptional}; -use crate::v2_std_core::CompilerDiagnostic::{InternalError, TypeMismatch, VariantCollision}; -use crate::v2_std_core::LiteralValue::{LitStr, LitInt, LitFloat, LitBool, LitNull}; -use crate::v2_std_core::FieldAccessStyle::{StoredField, EnumAccessor, OptionalUnwrap, TupleFirst, TupleSecond}; -use crate::v2_std_core::FieldValueShape::{PlainValue, OptionalValue}; -use crate::v2_std_core::VarBindingKind::{LocalValueBinding, FunctionValueBinding, VariantValueBinding, MatchBoundBinding}; -use crate::v2_std_core::CallSemantics::{PlainCallSemantics, LookupCallSemantics}; -use crate::v2_std_core::MethodSemantics::{PlainMethodSemantics, AlgebraMethodSemantics, ServiceMethodSemantics}; -use crate::v2_std_core::ExprErrorKind::{ParseRecoveryError, SemanticExprError, InternalExprError}; -use crate::v2_std_core::BinOp::{Add, Sub, Mul, Div, Mod, Eq, Ne, Lt, Gt, Le, Ge, And, Or, NullCoalesce}; -use crate::v2_std_core::UnaryOpKind::{Not, Neg}; -use crate::v2_std_core::MatchPattern::{Bind, VariantPattern, Wildcard}; -use crate::v2_std_core::StringPart::{Text, Interpolation}; -pub use crate::v2_compiler_resolve::{ModuleGraph, ResolvedModule, ResolvedImport}; -pub use crate::v2_compiler_infer_types::{nominal_type_ref, make_container_type, make_callable_type, KernelTypeBuild, node_is_keyed_collection, node_is_element_collection, node_is_collection, node_is_set_collection, is_fully_resolved, resolve_type_variables_from_template, template_return_has_variables, template_return_is_receiver_self, bare_map_node, bare_set_node, callable_inferred, normalize_access_type_node, node_type_shape, node_type_compatible, node_type_equals, prefer_specific_type, node_type_deps, method_receiver_element_node, infer_literal_node, infer_binop_type_node, extract_optional_inner_node, for_each_element_type_node, resolved_type, child_type_node, emit_map_has}; -pub use crate::v2_compiler_infer_method::{builtin_kernel_seed_diagnostics, infer_builtin_call_type, resolve_builtin_call_type}; -pub use crate::v2_compiler_infer_cycle::{detect_type_cycles_kahn}; -pub use crate::v2_compiler_infer_env::{TypeEnv, TypeBinding, is_recursive_type, is_recursive_type_by_name, lookup_type, lookup_type_by_name, lookup_type_for, merge_envs, put_inductive_field, put_inductive_field_cross, merge_inductive_fields, inductive_fields_for, inductive_fields_list_to_map}; +use crate::std_induction::RecursionShape::{ + DirectRecursion, ListRecursion, MapValueRecursion, OptionalRecursion, SetRecursion, +}; +use crate::std_induction::ShrinkFactor::{ConstantShrink, ProportionalShrink, UnitShrink}; +use crate::std_induction::SubValueRelation::{ + ArithmeticDescent, IteratedSubValue, PreservedValue, StrictSubValue, SubValueUnknown, +}; +pub use crate::std_induction::{ + compose_sub_value, compose_sub_value_relations, join_sub_value, meet_sub_value, + sub_value_to_evidence, InductiveField, RecursionShape, ShrinkFactor, SubValueRelation, +}; pub use crate::std_node::{compiler_inductive_fields, compiler_recursive_types}; -pub use crate::std_induction::{InductiveField, RecursionShape, SubValueRelation, ShrinkFactor, sub_value_to_evidence, meet_sub_value, join_sub_value, compose_sub_value, compose_sub_value_relations}; -use crate::std_induction::RecursionShape::{DirectRecursion, ListRecursion, OptionalRecursion, SetRecursion, MapValueRecursion}; -use crate::std_induction::SubValueRelation::{StrictSubValue, IteratedSubValue, ArithmeticDescent, PreservedValue, SubValueUnknown}; -use crate::std_induction::ShrinkFactor::{UnitShrink, ConstantShrink, ProportionalShrink}; -pub use crate::std_termination::{positive_descent_amount_from_positive_int, proportional_divisor_from_int_at_least_two, PositiveDescentAmount}; -use crate::std_termination::PositiveDescentAmount::{OneStep}; -pub use crate::std_algebra::{CollectionSizeEffect}; -use crate::std_algebra::CollectionSizeEffect::{ShrinkEffect}; -pub use crate::v2_compiler_infer_resolve::{resolve_node, resolve_item_types, NodeResolveResult, ItemResult}; -pub use crate::v2_compiler_infer_sigs::{ResolvedFuncSig, ResolvedFuncEnv, ResolveFuncSigsResult, resolve_func_sigs}; -pub use crate::v2_compiler_infer_emit_info::{TypeRepr, TypeSummary, EmitGraphInfo, EmitInfoBuildState, empty_emit_graph_info, lookup_emit_type_summary, build_struct_field_summaries, build_enum_field_summaries, add_emit_item_summary, derive_variant_to_enum}; -use crate::v2_compiler_infer_emit_info::TypeRepr::{StructRepr, EnumRepr}; -pub use crate::v2_compiler_infer_items::{ItemKind, ItemInfo, TypedModule, TypedGraph, ResolvedGraph, inferred_to_outputs, item_kind, variant_locals_from_items}; -use crate::v2_compiler_infer_items::ItemKind::{FnItem, FuncItem, TypeItem, DataItem, ServiceItem, OtherItem}; -pub use crate::v2_compiler_infer_service::{UniqueAccum, OpEntry, ServiceMethodResult, is_typed_service_call_receiver, extract_typed_service_name, collect_typed_service_calls, collect_called_func_names, expand_transitive_services, check_service_field_access_node, check_service_method_call_node, service_op_entry}; -pub use crate::v2_compiler_infer_patterns::{NodeLookupResult, PatternSubject, lookup_variant_in_type, lookup_field_in_variant, pattern_subject_from_inferred, pattern_subject_from_node, lookup_result_subject, pattern_binding_type, check_match_exhaustiveness}; +use crate::std_termination::PositiveDescentAmount::OneStep; +pub use crate::std_termination::{ + positive_descent_amount_from_positive_int, proportional_divisor_from_int_at_least_two, + PositiveDescentAmount, +}; +pub use crate::std_types::{container_param_name, SourceSpan}; +pub use crate::v2_compiler_infer_access::{ + check_index_access_node, check_slice_access_node, AccessCheckResultNode, +}; +pub use crate::v2_compiler_infer_cycle::detect_type_cycles_kahn; +use crate::v2_compiler_infer_emit_info::TypeRepr::{EnumRepr, StructRepr}; +pub use crate::v2_compiler_infer_emit_info::{ + add_emit_item_summary, build_enum_field_summaries, build_struct_field_summaries, + derive_variant_to_enum, empty_emit_graph_info, lookup_emit_type_summary, EmitGraphInfo, + EmitInfoBuildState, TypeRepr, TypeSummary, +}; +pub use crate::v2_compiler_infer_env::{ + inductive_fields_for, inductive_fields_list_to_map, is_recursive_type, + is_recursive_type_by_name, lookup_type, lookup_type_by_name, lookup_type_for, merge_envs, + merge_inductive_fields, put_inductive_field, put_inductive_field_cross, TypeBinding, TypeEnv, +}; +use crate::v2_compiler_infer_items::ItemKind::{ + DataItem, FnItem, FuncItem, OtherItem, ServiceItem, TypeItem, +}; +pub use crate::v2_compiler_infer_items::{ + inferred_to_outputs, item_kind, variant_locals_from_items, ItemInfo, ItemKind, ResolvedGraph, + TypedGraph, TypedModule, +}; +pub use crate::v2_compiler_infer_lookup::{ + field_summary_for_type, lookup_coproduct_common_field_node, lookup_field_type_node, + lookup_func_sig, lookup_in_scope, map_key_type_in_env, map_value_type_in_env, + resolve_known_method_node, resolve_scrutinee_type_node, KnownMethodResolution, +}; +pub use crate::v2_compiler_infer_method::{ + builtin_kernel_seed_diagnostics, infer_builtin_call_type, resolve_builtin_call_type, +}; use crate::v2_compiler_infer_patterns::PatternSubject::*; -pub use crate::v2_compiler_infer_lookup::{KnownMethodResolution, resolve_known_method_node, resolve_scrutinee_type_node, field_summary_for_type, lookup_field_type_node, lookup_coproduct_common_field_node, map_value_type_in_env, map_key_type_in_env, set_element_type_in_env, lookup_in_scope, lookup_func_sig}; -pub use crate::v2_compiler_infer_access::{AccessCheckResultNode, check_index_access_node, check_slice_access_node}; -use self::SizeExpr::*; +pub use crate::v2_compiler_infer_patterns::{ + check_match_exhaustiveness, lookup_field_in_variant, lookup_result_subject, + lookup_variant_in_type, pattern_binding_type, pattern_subject_from_inferred, + pattern_subject_from_node, NodeLookupResult, PatternSubject, +}; +pub use crate::v2_compiler_infer_resolve::{ + resolve_item_types, resolve_node, ItemResult, NodeResolveResult, +}; +pub use crate::v2_compiler_infer_service::{ + check_service_field_access_node, check_service_method_call_node, collect_called_func_names, + collect_typed_service_calls, expand_transitive_services, extract_typed_service_name, + is_typed_service_call_receiver, service_op_entry, OpEntry, ServiceMethodResult, UniqueAccum, +}; +pub use crate::v2_compiler_infer_sigs::{ + resolve_func_sigs, ResolveFuncSigsResult, ResolvedFuncEnv, ResolvedFuncSig, +}; +pub use crate::v2_compiler_infer_types::{ + bare_map_node, callable_inferred, child_type_node, emit_map_has, extract_optional_inner_node, + for_each_element_type_node, infer_binop_type_node, infer_literal_node, is_fully_resolved, + make_callable_type, make_container_type, method_receiver_element_node, node_is_collection, + node_is_element_collection, node_is_keyed_collection, node_type_compatible, node_type_deps, + node_type_equals, node_type_shape, nominal_type_ref, normalize_access_type_node, + prefer_specific_type, resolve_type_variables_from_template, resolved_type, + template_return_has_variables, template_return_is_receiver_self, KernelTypeBuild, +}; +pub use crate::v2_compiler_resolve::{ModuleGraph, ResolvedImport, ResolvedModule}; +use crate::v2_rt; +use crate::v2_std_core::BinOp::{ + Add, And, Div, Eq, Ge, Gt, Le, Lt, Mod, Mul, Ne, NullCoalesce, Or, Sub, +}; +use crate::v2_std_core::CallSemantics::{LookupCallSemantics, PlainCallSemantics}; +use crate::v2_std_core::Cardinality::{CardOptional, Required}; +use crate::v2_std_core::CompilerDiagnostic::{InternalError, TypeMismatch, VariantCollision}; +use crate::v2_std_core::Connective::{Arrow, Conj, Disj, NoConnective}; +use crate::v2_std_core::ExprData::{ + ExprBinOp, ExprBlock, ExprCall, ExprCast, ExprError, ExprFieldAccess, ExprForEach, ExprIf, + ExprIndex, ExprLambda, ExprLet, ExprListLit, ExprLiteral, ExprMatch, ExprMethodCall, + ExprRecordLit, ExprReturn, ExprSlice, ExprStringInterp, ExprUnaryOp, ExprVar, NoExprData, +}; +use crate::v2_std_core::ExprErrorKind::{InternalExprError, ParseRecoveryError, SemanticExprError}; +use crate::v2_std_core::FieldAccessStyle::{ + EnumAccessor, OptionalUnwrap, StoredField, TupleFirst, TupleSecond, +}; +use crate::v2_std_core::FieldValueShape::{OptionalValue, PlainValue}; +use crate::v2_std_core::InferredNode::{CompilerError, Resolved, TypeVariable}; +use crate::v2_std_core::LiteralValue::{LitBool, LitFloat, LitInt, LitNull, LitStr}; +use crate::v2_std_core::MatchPattern::{Bind, VariantPattern, Wildcard}; +use crate::v2_std_core::MethodSemantics::{ + AlgebraMethodSemantics, PlainMethodSemantics, ServiceMethodSemantics, +}; +use crate::v2_std_core::StringPart::{Interpolation, Text}; +use crate::v2_std_core::UnaryOpKind::{Neg, Not}; +use crate::v2_std_core::VarBindingKind::{ + FunctionValueBinding, LocalValueBinding, MatchBoundBinding, VariantValueBinding, +}; +pub use crate::v2_std_core::{ + arg_name_at, arg_value, arm_body, arm_guard, arm_pattern, authored_name_at, binop_left, + binop_right, bool_type, build_newline_index, cast_expr, cast_target, container_expected_arity, + default_ident_span, error_type, expr_call_func_at, expr_has_non_tail_self_call, + expr_has_self_call, expr_method_name_at, expr_var_name_at, field_access_base, + field_access_field_at, field_binding_name_at, field_binding_pattern, field_init_node_name_at, + field_init_node_value, field_node_type_expr, float_type, foreach_body, foreach_collection, + foreach_variable_at, has_child_named, has_inferred, if_condition, if_else_branch, + if_then_branch, import_is_all, index_base, index_expr, int_type, intern, intern_str, + is_child_accessor_in_model, is_compiler_error, is_container_type, is_error_diagnostic, + is_kernel_type, is_property_contraction, is_tree_size_reducing, kernel_type_set, lambda_body, + lambda_param_names_at, let_binding_name_at, let_body, let_value, local_transport_node, + make_arg_node, make_arm_node, make_error_node, make_expr_error_node, make_expr_node, + make_field_binding_node, make_field_init_node, make_interp_part_node, make_named_expr_node, + make_param_node, make_span, make_text_part_node, make_transport_node, map_children, + match_arm_nodes, match_scrutinee, method_arg_nodes, method_receiver, module_imports, + module_items, module_node, no_span, node_name_span, none_type, param_node_name_at, + param_node_type_expr, record_lit_type_name_at, resource_use_name_at, resource_use_resource, + return_value, slice_base, slice_end, slice_start, string_type, unaryop_operand, unit_type, + with_optional_cardinality, with_required_cardinality, BinOp, CallSemantics, Cardinality, + CompilerDiagnostic, Connective, DeclaredFuncEnv, DeclaredFuncSig, ErrorNode, ExprData, + ExprErrorKind, FieldAccessStyle, FieldSummary, FieldValueShape, InferredNode, InternTable, + LiteralValue, MatchPattern, MethodSemantics, NewlineIndex, Node, StringPart, UnaryOpKind, + VarBindingKind, +}; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct ItemContribution { @@ -104,43 +191,57 @@ pub struct BlockInferState { pub typed_stmts: Rc>>, } -pub fn infer_block_stmts(mut remaining: Rc>>, mut remaining_count: i64, mut scope: Rc, mut typed_stmts: Rc>>, mut diag_chunks: Rc>>>>, mut last_type: Rc, mut expected: Option>) -> Rc { +pub fn infer_block_stmts( + mut remaining: Rc>>, + mut remaining_count: i64, + mut scope: Rc, + mut typed_stmts: Rc>>, + mut diag_chunks: Rc>>>>, + mut last_type: Rc, + mut expected: Option>, +) -> Rc { loop { match remaining.clone().first().cloned() { - None => { break Rc::new(BlockInferState { - scope: scope.clone(), - diag_chunks: diag_chunks, - last_type: last_type, - typed_stmts: typed_stmts, -}); }, - Some(stmt) => { let is_last = (remaining_count.clone() == 1); -let stmt_expected = if is_last { - expected.clone() - } else { - None - }; -let stmt_result = infer_expr(&stmt, &scope, &stmt_expected); -let stmt_typed = stmt_result.typed.clone(); -let stmt_diags = stmt_result.diagnostics.clone(); -let stmt_rt = resolved_type(stmt_typed.clone()); -let next_scope = scope_after_stmt_node(&stmt, stmt_rt.clone(), &scope); -{ - let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); -let __tco_1 = (remaining_count - 1); -let __tco_2 = next_scope; -let __tco_3 = v2_rt::rc_list_push(typed_stmts, stmt_typed.clone()); -let __tco_4 = v2_rt::rc_list_push(diag_chunks, stmt_diags); -let __tco_5 = stmt_rt.clone(); -remaining = __tco_0; -remaining_count = __tco_1; -scope = __tco_2; -typed_stmts = __tco_3; -diag_chunks = __tco_4; -last_type = __tco_5; -continue; -} }, -} -} + None => { + break Rc::new(BlockInferState { + scope: scope.clone(), + diag_chunks: diag_chunks, + last_type: last_type, + typed_stmts: typed_stmts, + }); + } + Some(stmt) => { + let is_last = (remaining_count.clone() == 1); + let stmt_expected = if is_last { expected.clone() } else { None }; + let stmt_result = infer_expr(&stmt, &scope, &stmt_expected); + let stmt_typed = stmt_result.typed.clone(); + let stmt_diags = stmt_result.diagnostics.clone(); + let stmt_rt = resolved_type(stmt_typed.clone()); + let next_scope = scope_after_stmt_node(&stmt, stmt_rt.clone(), &scope); + { + let __tco_0 = Rc::new( + remaining + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + let __tco_1 = (remaining_count - 1); + let __tco_2 = next_scope; + let __tco_3 = v2_rt::rc_list_push(typed_stmts, stmt_typed.clone()); + let __tco_4 = v2_rt::rc_list_push(diag_chunks, stmt_diags); + let __tco_5 = stmt_rt.clone(); + remaining = __tco_0; + remaining_count = __tco_1; + scope = __tco_2; + typed_stmts = __tco_3; + diag_chunks = __tco_4; + last_type = __tco_5; + continue; + } + } + } + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -222,81 +323,163 @@ pub struct LocalContributionState { pub diag_chunks: Rc>>>>, } -pub fn merge_scope_from_imports(mut remaining: Rc>>, mut parent_index: Rc>>, mut env: Rc, mut func_sigs: Rc>>, mut svc_registry: Rc>>>>, mut svc_locals: Rc>>) -> Rc { +pub fn merge_scope_from_imports( + mut remaining: Rc>>, + mut parent_index: Rc>>, + mut env: Rc, + mut func_sigs: Rc>>, + mut svc_registry: Rc>>>>, + mut svc_locals: Rc>>, +) -> Rc { loop { match remaining.clone().first().cloned() { - None => { break Rc::new(InferScopeComponents { - func_sigs: func_sigs, - svc_registry: svc_registry, - svc_locals: svc_locals, -}); }, - Some(imp) => { match v2_rt::map_get(&parent_index, imp.module_path.clone()) { - Some(typed_parent) => { let next_func_sigs = Rc::new(v2_rt::map_values(&typed_parent.func_env.clone().signatures.clone())).iter().cloned().fold(func_sigs, |acc: Rc>>, rsig: Rc| { - let sig_key = rsig.name.clone(); -let sig_params = rsig.params.clone(); -let sig_rt = rsig.inferred.clone(); -let sig_async = rsig.is_async.clone(); -v2_rt::rc_map_insert(acc, sig_key.clone(), Rc::new(DeclaredFuncSig { - name: sig_key.clone(), - params: sig_params.clone(), - inferred: Some(sig_rt.clone()), - is_async: sig_async.clone(), - output_provenance: rsig.output_provenance.clone(), - variant_provenance: rsig.variant_provenance.clone(), -})) -}); -let parent_result = typed_parent.items.clone().iter().cloned().fold(Rc::new(InferScopeComponents { - func_sigs: next_func_sigs, - svc_registry: svc_registry, - svc_locals: svc_locals, -}), |acc: Rc, titem: Rc| if ((titem.transport.clone() != None) && ((titem.children.clone().len() as i64) > 0)) { - { - let entries = Rc::new({ let mut __result = Vec::new(); for c in titem.children.clone().iter().cloned() { __result.push(Rc::new(OpEntry { - name: authored_name_at(env.source_indices.clone(), &c), - outputs: inferred_to_outputs(&c.inferred.clone(), c.span.clone(), env.source_indices.clone()), - params: c.params.clone(), -})); } __result }); -let root = namespace_root_from_properties(titem.properties.clone(), authored_name_at(env.source_indices.clone(), &titem), env.source_indices.clone()); -Rc::new(InferScopeComponents { - func_sigs: acc.func_sigs.clone(), - svc_registry: v2_rt::rc_map_insert(acc.svc_registry.clone(), authored_name_at(env.source_indices.clone(), &titem), entries.clone()), - svc_locals: v2_rt::rc_map_insert(acc.svc_locals.clone(), root.clone(), nominal_type_binding(&root)), -}) -} - } else { - if (((((titem.body.clone() != None) && ((titem.params.clone().len() as i64) == 0)) && (titem.transport.clone() == None)) && (titem.connective.clone() == Connective::NoConnective)) && (titem.inferred.clone() != None)) { - Rc::new(InferScopeComponents { - func_sigs: acc.func_sigs.clone(), - svc_registry: acc.svc_registry.clone(), - svc_locals: v2_rt::rc_map_insert(acc.svc_locals.clone(), authored_name_at(env.source_indices.clone(), &titem), Rc::new(TypeBinding { - name: authored_name_at(env.source_indices.clone(), &titem), - resolved: resolved_type(titem.clone()), - provenance: Rc::new(SubValueRelation::SubValueUnknown), -})), -}) - } else { - acc.clone() + None => { + break Rc::new(InferScopeComponents { + func_sigs: func_sigs, + svc_registry: svc_registry, + svc_locals: svc_locals, + }); } - }); -{ - let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); -let __tco_1 = parent_result.func_sigs.clone(); -let __tco_2 = parent_result.svc_registry.clone(); -let __tco_3 = parent_result.svc_locals.clone(); -remaining = __tco_0; -func_sigs = __tco_1; -svc_registry = __tco_2; -svc_locals = __tco_3; -continue; -} }, - None => { { - let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); -remaining = __tco_0; -continue; -} }, -} }, -} -} + Some(imp) => match v2_rt::map_get(&parent_index, imp.module_path.clone()) { + Some(typed_parent) => { + let next_func_sigs = Rc::new(v2_rt::map_values( + &typed_parent.func_env.clone().signatures.clone(), + )) + .iter() + .cloned() + .fold( + func_sigs, + |acc: Rc>>, + rsig: Rc| { + let sig_key = rsig.name.clone(); + let sig_params = rsig.params.clone(); + let sig_rt = rsig.inferred.clone(); + let sig_async = rsig.is_async.clone(); + v2_rt::rc_map_insert( + acc, + sig_key.clone(), + Rc::new(DeclaredFuncSig { + name: sig_key.clone(), + params: sig_params.clone(), + inferred: Some(sig_rt.clone()), + is_async: sig_async.clone(), + output_provenance: rsig.output_provenance.clone(), + variant_provenance: rsig.variant_provenance.clone(), + }), + ) + }, + ); + let parent_result = typed_parent.items.clone().iter().cloned().fold( + Rc::new(InferScopeComponents { + func_sigs: next_func_sigs, + svc_registry: svc_registry, + svc_locals: svc_locals, + }), + |acc: Rc, titem: Rc| { + if ((titem.transport.clone() != None) + && ((titem.children.clone().len() as i64) > 0)) + { + { + let entries = Rc::new({ + let mut __result = Vec::new(); + for c in titem.children.clone().iter().cloned() { + __result.push(Rc::new(OpEntry { + name: authored_name_at( + env.source_indices.clone(), + &c, + ), + outputs: inferred_to_outputs( + &c.inferred.clone(), + c.span.clone(), + env.source_indices.clone(), + ), + params: c.params.clone(), + })); + } + __result + }); + let root = namespace_root_from_properties( + titem.properties.clone(), + authored_name_at(env.source_indices.clone(), &titem), + env.source_indices.clone(), + ); + Rc::new(InferScopeComponents { + func_sigs: acc.func_sigs.clone(), + svc_registry: v2_rt::rc_map_insert( + acc.svc_registry.clone(), + authored_name_at(env.source_indices.clone(), &titem), + entries.clone(), + ), + svc_locals: v2_rt::rc_map_insert( + acc.svc_locals.clone(), + root.clone(), + nominal_type_binding(&root), + ), + }) + } + } else { + if (((((titem.body.clone() != None) + && ((titem.params.clone().len() as i64) == 0)) + && (titem.transport.clone() == None)) + && (titem.connective.clone() == Connective::NoConnective)) + && (titem.inferred.clone() != None)) + { + Rc::new(InferScopeComponents { + func_sigs: acc.func_sigs.clone(), + svc_registry: acc.svc_registry.clone(), + svc_locals: v2_rt::rc_map_insert( + acc.svc_locals.clone(), + authored_name_at(env.source_indices.clone(), &titem), + Rc::new(TypeBinding { + name: authored_name_at( + env.source_indices.clone(), + &titem, + ), + resolved: resolved_type(titem.clone()), + provenance: Rc::new( + SubValueRelation::SubValueUnknown, + ), + }), + ), + }) + } else { + acc.clone() + } + } + }, + ); + { + let __tco_0 = Rc::new( + remaining + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + let __tco_1 = parent_result.func_sigs.clone(); + let __tco_2 = parent_result.svc_registry.clone(); + let __tco_3 = parent_result.svc_locals.clone(); + remaining = __tco_0; + func_sigs = __tco_1; + svc_registry = __tco_2; + svc_locals = __tco_3; + continue; + } + } + None => { + let __tco_0 = Rc::new( + remaining + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + remaining = __tco_0; + continue; + } + }, + } + } } pub fn nominal_leaf_type(name: String) -> Rc { @@ -305,10 +488,17 @@ pub fn nominal_leaf_type(name: String) -> Rc { pub fn nominal_type_binding(name: &String) -> Rc { Rc::new(TypeBinding { - name: name.clone(), - resolved: nominal_leaf_type(name.clone()), - provenance: Rc::new(SubValueRelation::SubValueUnknown), -}) + name: name.clone(), + resolved: nominal_leaf_type(name.clone()), + provenance: Rc::new(SubValueRelation::SubValueUnknown), + }) +} + +pub fn set_has(m: Rc>, key: String) -> bool { + match v2_rt::map_get(&m, key) { + Some(_) => true, + None => false, + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -317,147 +507,242 @@ pub struct FieldRecursionResult { pub element_type: String, } -pub fn classify_field_recursion(field_node: &Rc, parent_name: &String, recursive_type_set: Rc>, source_indices: &Rc>>) -> Option> { +pub fn classify_field_recursion( + field_node: &Rc, + parent_name: &String, + recursive_type_set: Rc>, + source_indices: &Rc>>, +) -> Option> { { let type_expr = match field_node.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => rt.clone(), - _ => field_node_type_expr(&field_node), -}; -let field_type_name = authored_name_at(source_indices.clone(), &type_expr); -if (field_type_name.clone().as_str() == parent_name.clone().as_str()) { + Some(InferredNode::Resolved { node: rt, .. }) => rt.clone(), + _ => field_node_type_expr(&field_node), + }; + let field_type_name = authored_name_at(source_indices.clone(), &type_expr); + if (field_type_name.clone().as_str() == parent_name.clone().as_str()) { match field_node.return_cardinality.clone() { - Cardinality::CardOptional => Some(Rc::new(FieldRecursionResult { - shape: RecursionShape::OptionalRecursion, - element_type: parent_name.clone(), -})), - _ => Some(Rc::new(FieldRecursionResult { - shape: RecursionShape::DirectRecursion, - element_type: parent_name.clone(), -})), -} + Cardinality::CardOptional => Some(Rc::new(FieldRecursionResult { + shape: RecursionShape::OptionalRecursion, + element_type: parent_name.clone(), + })), + _ => Some(Rc::new(FieldRecursionResult { + shape: RecursionShape::DirectRecursion, + element_type: parent_name.clone(), + })), + } } else { if is_container_type(field_type_name.clone()) { { let arity = match container_expected_arity(field_type_name.clone()) { - Some(a) => a.clone(), - None => 0, -}; -let value_index = if (arity == 2) { - 1 - } else { - 0 + Some(a) => a.clone(), + None => 0, }; -let value_type = match type_expr.children.clone().get(value_index as usize).cloned() { - Some(t) => authored_name_at(source_indices.clone(), &t), - None => "".to_string(), -}; -let is_recursive_element = ((value_type.clone().as_str() == parent_name.clone().as_str()) || set_contains(recursive_type_set, value_type.clone())); -if is_recursive_element { + let value_index = if (arity == 2) { 1 } else { 0 }; + let value_type = match type_expr + .children + .clone() + .get(value_index as usize) + .cloned() + { + Some(t) => authored_name_at(source_indices.clone(), &t), + None => "".to_string(), + }; + let is_recursive_element = ((value_type.clone().as_str() + == parent_name.clone().as_str()) + || set_has(recursive_type_set, value_type.clone())); + if is_recursive_element { { - let elem = if (value_type.clone().as_str() == parent_name.clone().as_str()) { - parent_name.clone() - } else { - value_type.clone() - }; -match field_type_name.clone().as_str() { - "List" => Some(Rc::new(FieldRecursionResult { - shape: RecursionShape::ListRecursion, - element_type: elem, -})), - "Set" => Some(Rc::new(FieldRecursionResult { - shape: RecursionShape::SetRecursion, - element_type: elem, -})), - "Map" => Some(Rc::new(FieldRecursionResult { - shape: RecursionShape::MapValueRecursion, - element_type: elem, -})), - _ => None, -} -} + let elem = + if (value_type.clone().as_str() == parent_name.clone().as_str()) { + parent_name.clone() + } else { + value_type.clone() + }; + match field_type_name.clone().as_str() { + "List" => Some(Rc::new(FieldRecursionResult { + shape: RecursionShape::ListRecursion, + element_type: elem, + })), + "Set" => Some(Rc::new(FieldRecursionResult { + shape: RecursionShape::SetRecursion, + element_type: elem, + })), + "Map" => Some(Rc::new(FieldRecursionResult { + shape: RecursionShape::MapValueRecursion, + element_type: elem, + })), + _ => None, + } + } } else { None } -} + } } else { - if set_contains(recursive_type_set, field_type_name.clone()) { + if set_has(recursive_type_set, field_type_name.clone()) { match field_node.return_cardinality.clone() { - Cardinality::CardOptional => Some(Rc::new(FieldRecursionResult { - shape: RecursionShape::OptionalRecursion, - element_type: field_type_name.clone(), -})), - _ => Some(Rc::new(FieldRecursionResult { - shape: RecursionShape::DirectRecursion, - element_type: field_type_name.clone(), -})), -} + Cardinality::CardOptional => Some(Rc::new(FieldRecursionResult { + shape: RecursionShape::OptionalRecursion, + element_type: field_type_name.clone(), + })), + _ => Some(Rc::new(FieldRecursionResult { + shape: RecursionShape::DirectRecursion, + element_type: field_type_name.clone(), + })), + } } else { None } } } -} + } } -pub fn collect_fields_inductive(fields: Rc>>, parent_name: String, variant_name: String, recursive_type_set: Rc>, acc: Rc>>>>, source_indices: Rc>>) -> Rc>>>> { - fields.iter().cloned().fold(acc.clone(), |field_acc: Rc>>>>, field_node: Rc| match classify_field_recursion(&field_node, &parent_name, recursive_type_set.clone(), &source_indices) { - Some(result) => put_inductive_field_cross(&field_acc, &parent_name, variant_name.clone(), authored_name_at(source_indices.clone(), &field_node), result.shape.clone(), result.element_type.clone()), - None => field_acc.clone(), -}) +pub fn collect_fields_inductive( + fields: Rc>>, + parent_name: String, + variant_name: String, + recursive_type_set: Rc>, + acc: Rc>>>>, + source_indices: Rc>>, +) -> Rc>>>> { + fields.iter().cloned().fold( + acc.clone(), + |field_acc: Rc>>>>, field_node: Rc| { + match classify_field_recursion( + &field_node, + &parent_name, + recursive_type_set.clone(), + &source_indices, + ) { + Some(result) => put_inductive_field_cross( + &field_acc, + &parent_name, + variant_name.clone(), + authored_name_at(source_indices.clone(), &field_node), + result.shape.clone(), + result.element_type.clone(), + ), + None => field_acc.clone(), + } + }, + ) } -pub fn collect_item_inductive_fields(item: &Rc, recursive_type_set: Rc>, source_indices: &Rc>>) -> Rc>>>> { +pub fn collect_item_inductive_fields( + item: &Rc, + recursive_type_set: Rc>, + source_indices: &Rc>>, +) -> Rc>>>> { { let item_name = authored_name_at(source_indices.clone(), &item); -match item.connective.clone() { - Connective::Disj => item.children.clone().iter().cloned().fold(v2_rt::rc_empty_map::>>>(), |variant_acc: Rc>>>>, variant_node: Rc| collect_fields_inductive(variant_node.children.clone(), item_name.clone(), authored_name_at(source_indices.clone(), &variant_node), recursive_type_set.clone(), variant_acc, source_indices.clone())), - Connective::Conj => collect_fields_inductive(item.children.clone(), item_name.clone(), "".to_string(), recursive_type_set.clone(), v2_rt::rc_empty_map::>>>(), source_indices.clone()), - _ => v2_rt::rc_empty_map::>>>(), -} -} + match item.connective.clone() { + Connective::Disj => item.children.clone().iter().cloned().fold( + v2_rt::rc_empty_map::>>>(), + |variant_acc: Rc>>>>, + variant_node: Rc| { + collect_fields_inductive( + variant_node.children.clone(), + item_name.clone(), + authored_name_at(source_indices.clone(), &variant_node), + recursive_type_set.clone(), + variant_acc, + source_indices.clone(), + ) + }, + ), + Connective::Conj => collect_fields_inductive( + item.children.clone(), + item_name.clone(), + "".to_string(), + recursive_type_set.clone(), + v2_rt::rc_empty_map::>>>(), + source_indices.clone(), + ), + _ => v2_rt::rc_empty_map::>>>(), + } + } } -pub fn build_item_inductive_fields(items: Rc>>, recursive_type_set: Rc>, source_indices: Rc>>) -> Rc>>>> { - items.iter().cloned().fold(v2_rt::rc_empty_map::>>>(), |acc: Rc>>>>, item: Rc| merge_inductive_fields(acc, &collect_item_inductive_fields(&item, recursive_type_set.clone(), &source_indices))) +pub fn build_item_inductive_fields( + items: Rc>>, + recursive_type_set: Rc>, + source_indices: Rc>>, +) -> Rc>>>> { + items.iter().cloned().fold( + v2_rt::rc_empty_map::>>>(), + |acc: Rc>>>>, item: Rc| { + merge_inductive_fields( + acc, + &collect_item_inductive_fields(&item, recursive_type_set.clone(), &source_indices), + ) + }, + ) } -pub fn nominal_ref_node(name: &String, span: Rc, ident_span: Option>) -> Rc { +pub fn nominal_ref_node( + name: &String, + span: Rc, + ident_span: Option>, +) -> Rc { Rc::new(Node { - name: name.clone(), - span: span, - ident_span: ident_span, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: nominal_leaf_type(name.clone()), -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) + name: name.clone(), + span: span, + ident_span: ident_span, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: nominal_leaf_type(name.clone()), + })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) } pub fn resolved_callable_type(func_params: Rc>>, ret: Rc) -> Rc { make_callable_type(func_params, ret) } -pub fn namespace_root_from_properties(properties: Rc>>, name: String, source_indices: Rc>>) -> String { - match Rc::new({ let mut __result = Vec::new(); for p in properties.iter().cloned() { if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() == "namespace_root".to_string().as_str()) { __result.push(p); } } __result }).first().cloned() { - Some(ns_prop) => match (*field_init_node_value(&ns_prop).expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: root, .. } = value.as_ref() else { unreachable!() }; root.clone() }, - _ => name, -}, - None => name, -} +pub fn namespace_root_from_properties( + properties: Rc>>, + name: String, + source_indices: Rc>>, +) -> String { + match Rc::new({ + let mut __result = Vec::new(); + for p in properties.iter().cloned() { + if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() + == "namespace_root".to_string().as_str()) + { + __result.push(p); + } + } + __result + }) + .first() + .cloned() + { + Some(ns_prop) => match (*field_init_node_value(&ns_prop).expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitStr { value: root, .. } = value.as_ref() else { + unreachable!() + }; + root.clone() + } + _ => name, + }, + None => name, + } } pub fn expr_span(texpr: Rc) -> Rc { @@ -466,9 +751,9 @@ pub fn expr_span(texpr: Rc) -> Rc { pub fn ok_infer(texpr: Rc) -> Rc { Rc::new(InferResult { - typed: texpr, - diagnostics: Rc::new(vec![]), -}) + typed: texpr, + diagnostics: Rc::new(vec![]), + }) } pub fn semantic_expr_error_node(message: String, span: Rc) -> Rc { @@ -481,82 +766,137 @@ pub fn internal_expr_error_node(message: String, span: Rc) -> Rc, name: &String) -> Option { match v2_rt::map_get(&scope.locals.clone(), name.clone()) { - Some(binding) => match lookup_type_for(&scope.type_env.clone(), &binding.resolved.clone()) { - Some(parent) => { - let is_coproduct = (parent.connective.clone() == Connective::Disj); -if is_coproduct { - if has_child_named(parent.clone(), name.clone(), scope.type_env.clone().source_indices.clone()) { - Some(authored_name_at(scope.type_env.clone().source_indices.clone(), &binding.resolved.clone())) - } else { - None + Some(binding) => { + match lookup_type_for(&scope.type_env.clone(), &binding.resolved.clone()) { + Some(parent) => { + let is_coproduct = (parent.connective.clone() == Connective::Disj); + if is_coproduct { + if has_child_named( + parent.clone(), + name.clone(), + scope.type_env.clone().source_indices.clone(), + ) { + Some(authored_name_at( + scope.type_env.clone().source_indices.clone(), + &binding.resolved.clone(), + )) + } else { + None + } + } else { + None + } + } + None => None, } - } else { - None } -}, - None => None, -}, - None => None, -} + None => None, + } } pub fn infer_var_binding_kind(scope: &Rc, name: &String) -> Rc { match lookup_variant_parent_enum(&scope, &name) { - Some(parent_enum) => Rc::new(VarBindingKind::VariantValueBinding { - parent_enum: parent_enum.clone(), -}), - None => match v2_rt::map_get(&scope.locals.clone(), name.clone()) { - Some(_) => if v2_rt::map_has(&scope.match_bound_names.clone(), name.clone()) { - Rc::new(VarBindingKind::MatchBoundBinding) - } else { - Rc::new(VarBindingKind::LocalValueBinding) - }, - None => Rc::new(VarBindingKind::FunctionValueBinding), -}, -} -} - -pub fn inference_error(message: String, span: Rc, module_name: String) -> Rc { - make_error_node(Rc::new(CompilerDiagnostic::InternalError { - message: message, - span: span, -}), module_name) -} - -pub fn type_mismatch_error(expected: String, got: String, span: Rc, module_name: String) -> Rc { - make_error_node(Rc::new(CompilerDiagnostic::TypeMismatch { - expected: expected, - got: got, - span: span, -}), module_name) + Some(parent_enum) => Rc::new(VarBindingKind::VariantValueBinding { + parent_enum: parent_enum.clone(), + }), + None => match v2_rt::map_get(&scope.locals.clone(), name.clone()) { + Some(_) => { + if v2_rt::map_has(&scope.match_bound_names.clone(), name.clone()) { + Rc::new(VarBindingKind::MatchBoundBinding) + } else { + Rc::new(VarBindingKind::LocalValueBinding) + } + } + None => Rc::new(VarBindingKind::FunctionValueBinding), + }, + } } -pub fn rejects_string_for_optional_coproduct_field(expected: &Rc, got: Rc, source_indices: Rc>>) -> bool { +pub fn inference_error( + message: String, + span: Rc, + module_name: String, +) -> Rc { + make_error_node( + Rc::new(CompilerDiagnostic::InternalError { + message: message, + span: span, + }), + module_name, + ) +} + +pub fn type_mismatch_error( + expected: String, + got: String, + span: Rc, + module_name: String, +) -> Rc { + make_error_node( + Rc::new(CompilerDiagnostic::TypeMismatch { + expected: expected, + got: got, + span: span, + }), + module_name, + ) +} + +pub fn rejects_string_for_optional_coproduct_field( + expected: &Rc, + got: Rc, + source_indices: Rc>>, +) -> bool { { let expected_inner = with_required_cardinality(&expected); -let expected_is_optional_coproduct = ((expected.return_cardinality.clone() == Cardinality::CardOptional) && (expected_inner.connective.clone() == Connective::Disj)); -let got_is_string = (authored_name_at(source_indices, &got).as_str() == "String".to_string().as_str()); -(expected_is_optional_coproduct && got_is_string) -} + let expected_is_optional_coproduct = ((expected.return_cardinality.clone() + == Cardinality::CardOptional) + && (expected_inner.connective.clone() == Connective::Disj)); + let got_is_string = + (authored_name_at(source_indices, &got).as_str() == "String".to_string().as_str()); + (expected_is_optional_coproduct && got_is_string) + } } -pub fn record_lit_expected_fields(type_name: Option, scope: &Rc) -> Rc>> { +pub fn record_lit_expected_fields( + type_name: Option, + scope: &Rc, +) -> Rc>> { match type_name { - Some(tn) => match lookup_type_by_name(&scope.type_env.clone(), tn.clone()) { - Some(direct) => direct.children.clone(), - None => match lookup_variant_parent_enum(&scope, &tn) { - Some(parent_name) => match lookup_type_by_name(&scope.type_env.clone(), parent_name.clone()) { - Some(parent) => match Rc::new({ let mut __result = Vec::new(); for v in parent.children.clone().iter().cloned() { if (authored_name_at(scope.type_env.clone().source_indices.clone(), &v).as_str() == tn.clone().as_str()) { __result.push(v); } } __result }).first().cloned() { - Some(variant) => variant.children.clone(), - None => Rc::new(vec![]), -}, - None => Rc::new(vec![]), -}, - None => Rc::new(vec![]), -}, -}, - None => Rc::new(vec![]), -} + Some(tn) => match lookup_type_by_name(&scope.type_env.clone(), tn.clone()) { + Some(direct) => direct.children.clone(), + None => match lookup_variant_parent_enum(&scope, &tn) { + Some(parent_name) => { + match lookup_type_by_name(&scope.type_env.clone(), parent_name.clone()) { + Some(parent) => match Rc::new({ + let mut __result = Vec::new(); + for v in parent.children.clone().iter().cloned() { + if (authored_name_at( + scope.type_env.clone().source_indices.clone(), + &v, + ) + .as_str() + == tn.clone().as_str()) + { + __result.push(v); + } + } + __result + }) + .first() + .cloned() + { + Some(variant) => variant.children.clone(), + None => Rc::new(vec![]), + }, + None => Rc::new(vec![]), + } + } + None => Rc::new(vec![]), + }, + }, + None => Rc::new(vec![]), + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -568,11 +908,11 @@ pub struct KernelListTyDiag { pub fn list_kernel_ty_from_element(element: Rc) -> Rc { { let b = make_container_type(&"List".to_string(), element); -Rc::new(KernelListTyDiag { - ty: b.ty.clone(), - miss_diags: b.diagnostics.clone(), -}) -} + Rc::new(KernelListTyDiag { + ty: b.ty.clone(), + miss_diags: b.diagnostics.clone(), + }) + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -581,93 +921,118 @@ pub struct Tier2bBt { pub kernel_diags: Rc>>, } -pub fn infer_tier2b_builtin_with_kernel_diags(func_name: &String, typed_args: Rc>>, scope: Rc, span: Rc) -> Rc { - if ((func_name.clone().as_str() == "lookup".to_string().as_str()) || (func_name.clone().as_str() == "map_get".to_string().as_str())) { +pub fn infer_tier2b_builtin_with_kernel_diags( + func_name: &String, + typed_args: Rc>>, + scope: Rc, + span: Rc, +) -> Rc { + if ((func_name.clone().as_str() == "lookup".to_string().as_str()) + || (func_name.clone().as_str() == "map_get".to_string().as_str())) + { Rc::new(Tier2bBt { - bt: match typed_args.first().cloned() { - Some(receiver_arg) => match arg_value(&receiver_arg).inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: receiver_type, .. }) => match map_value_type_in_env(receiver_type.clone(), &scope.type_env.clone()) { - Some(value_type) => with_optional_cardinality(&value_type), - None => resolve_builtin_call_type(func_name.clone()), -}, - _ => resolve_builtin_call_type(func_name.clone()), -}, - None => resolve_builtin_call_type(func_name.clone()), -}, - kernel_diags: Rc::new(vec![]), -}) + bt: match typed_args.first().cloned() { + Some(receiver_arg) => match arg_value(&receiver_arg) + .inferred + .clone() + .as_deref() + .cloned() + { + Some(InferredNode::Resolved { + node: receiver_type, + .. + }) => { + match map_value_type_in_env(receiver_type.clone(), &scope.type_env.clone()) + { + Some(value_type) => with_optional_cardinality(&value_type), + None => resolve_builtin_call_type(func_name.clone()), + } + } + _ => resolve_builtin_call_type(func_name.clone()), + }, + None => resolve_builtin_call_type(func_name.clone()), + }, + kernel_diags: Rc::new(vec![]), + }) } else { if (func_name.clone().as_str() == "map_keys".to_string().as_str()) { match typed_args.first().cloned() { - Some(receiver_arg) => match arg_value(&receiver_arg).inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: receiver_type, .. }) => match map_key_type_in_env(receiver_type.clone(), &scope.type_env.clone()) { - Some(key_type) => { - let lk = list_kernel_ty_from_element(key_type.clone()); -Rc::new(Tier2bBt { - bt: lk.ty.clone(), - kernel_diags: lk.miss_diags.clone(), -}) -}, - None => Rc::new(Tier2bBt { - bt: resolve_builtin_call_type(func_name.clone()), - kernel_diags: Rc::new(vec![]), -}), -}, - _ => Rc::new(Tier2bBt { - bt: resolve_builtin_call_type(func_name.clone()), - kernel_diags: Rc::new(vec![]), -}), -}, - None => Rc::new(Tier2bBt { - bt: resolve_builtin_call_type(func_name.clone()), - kernel_diags: Rc::new(vec![]), -}), -} + Some(receiver_arg) => match arg_value(&receiver_arg) + .inferred + .clone() + .as_deref() + .cloned() + { + Some(InferredNode::Resolved { + node: receiver_type, + .. + }) => match map_key_type_in_env(receiver_type.clone(), &scope.type_env.clone()) + { + Some(key_type) => { + let lk = list_kernel_ty_from_element(key_type.clone()); + Rc::new(Tier2bBt { + bt: lk.ty.clone(), + kernel_diags: lk.miss_diags.clone(), + }) + } + None => Rc::new(Tier2bBt { + bt: resolve_builtin_call_type(func_name.clone()), + kernel_diags: Rc::new(vec![]), + }), + }, + _ => Rc::new(Tier2bBt { + bt: resolve_builtin_call_type(func_name.clone()), + kernel_diags: Rc::new(vec![]), + }), + }, + None => Rc::new(Tier2bBt { + bt: resolve_builtin_call_type(func_name.clone()), + kernel_diags: Rc::new(vec![]), + }), + } } else { if (func_name.clone().as_str() == "map_values".to_string().as_str()) { match typed_args.first().cloned() { - Some(receiver_arg) => match arg_value(&receiver_arg).inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: receiver_type, .. }) => match map_value_type_in_env(receiver_type.clone(), &scope.type_env.clone()) { - Some(value_type) => { - let lv = list_kernel_ty_from_element(value_type.clone()); -Rc::new(Tier2bBt { - bt: lv.ty.clone(), - kernel_diags: lv.miss_diags.clone(), -}) -}, - None => Rc::new(Tier2bBt { - bt: resolve_builtin_call_type(func_name.clone()), - kernel_diags: Rc::new(vec![]), -}), -}, - _ => Rc::new(Tier2bBt { - bt: resolve_builtin_call_type(func_name.clone()), - kernel_diags: Rc::new(vec![]), -}), -}, - None => Rc::new(Tier2bBt { - bt: resolve_builtin_call_type(func_name.clone()), - kernel_diags: Rc::new(vec![]), -}), -} - } else { - if ((func_name.clone().as_str() == "set_insert".to_string().as_str()) || (func_name.clone().as_str() == "set_union".to_string().as_str())) { - Rc::new(Tier2bBt { - bt: match typed_args.first().cloned() { - Some(receiver_arg) => match arg_value(&receiver_arg).inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: receiver_type, .. }) => receiver_type.clone(), - _ => resolve_builtin_call_type(func_name.clone()), -}, - None => resolve_builtin_call_type(func_name.clone()), -}, - kernel_diags: Rc::new(vec![]), -}) - } else { - Rc::new(Tier2bBt { - bt: resolve_builtin_call_type(func_name.clone()), - kernel_diags: Rc::new(vec![]), -}) + Some(receiver_arg) => match arg_value(&receiver_arg) + .inferred + .clone() + .as_deref() + .cloned() + { + Some(InferredNode::Resolved { + node: receiver_type, + .. + }) => match map_value_type_in_env( + receiver_type.clone(), + &scope.type_env.clone(), + ) { + Some(value_type) => { + let lv = list_kernel_ty_from_element(value_type.clone()); + Rc::new(Tier2bBt { + bt: lv.ty.clone(), + kernel_diags: lv.miss_diags.clone(), + }) + } + None => Rc::new(Tier2bBt { + bt: resolve_builtin_call_type(func_name.clone()), + kernel_diags: Rc::new(vec![]), + }), + }, + _ => Rc::new(Tier2bBt { + bt: resolve_builtin_call_type(func_name.clone()), + kernel_diags: Rc::new(vec![]), + }), + }, + None => Rc::new(Tier2bBt { + bt: resolve_builtin_call_type(func_name.clone()), + kernel_diags: Rc::new(vec![]), + }), } + } else { + Rc::new(Tier2bBt { + bt: resolve_builtin_call_type(func_name.clone()), + kernel_diags: Rc::new(vec![]), + }) } } } @@ -679,344 +1044,571 @@ pub struct MethodPipeFallback { pub kernel_diags: Rc>>, } -pub fn method_pipe_map_keys_values_fallback(recv_rt: &Rc, method_name: &String, scope: Rc, span: Rc) -> Rc { +pub fn method_pipe_map_keys_values_fallback( + recv_rt: &Rc, + method_name: &String, + scope: Rc, + span: Rc, +) -> Rc { if (method_name.clone().as_str() == "map_keys".to_string().as_str()) { match map_key_type_in_env(recv_rt.clone(), &scope.type_env.clone()) { - Some(key_type) => { - let lk = list_kernel_ty_from_element(key_type.clone()); -Rc::new(MethodPipeFallback { - result_ty: lk.ty.clone(), - kernel_diags: lk.miss_diags.clone(), -}) -}, - None => Rc::new(MethodPipeFallback { - result_ty: recv_rt.clone(), - kernel_diags: Rc::new(vec![]), -}), -} + Some(key_type) => { + let lk = list_kernel_ty_from_element(key_type.clone()); + Rc::new(MethodPipeFallback { + result_ty: lk.ty.clone(), + kernel_diags: lk.miss_diags.clone(), + }) + } + None => Rc::new(MethodPipeFallback { + result_ty: recv_rt.clone(), + kernel_diags: Rc::new(vec![]), + }), + } } else { if (method_name.clone().as_str() == "map_values".to_string().as_str()) { match map_value_type_in_env(recv_rt.clone(), &scope.type_env.clone()) { - Some(value_type) => { - let lv = list_kernel_ty_from_element(value_type.clone()); -Rc::new(MethodPipeFallback { - result_ty: lv.ty.clone(), - kernel_diags: lv.miss_diags.clone(), -}) -}, - None => Rc::new(MethodPipeFallback { - result_ty: recv_rt.clone(), - kernel_diags: Rc::new(vec![]), -}), -} + Some(value_type) => { + let lv = list_kernel_ty_from_element(value_type.clone()); + Rc::new(MethodPipeFallback { + result_ty: lv.ty.clone(), + kernel_diags: lv.miss_diags.clone(), + }) + } + None => Rc::new(MethodPipeFallback { + result_ty: recv_rt.clone(), + kernel_diags: Rc::new(vec![]), + }), + } } else { Rc::new(MethodPipeFallback { - result_ty: recv_rt.clone(), - kernel_diags: Rc::new(vec![]), -}) + result_ty: recv_rt.clone(), + kernel_diags: Rc::new(vec![]), + }) } } } -pub fn categorized_error(message: String, span: Rc, module_name: String, category: String) -> Rc { - make_error_node(Rc::new(CompilerDiagnostic::InternalError { - message: message, - span: span, -}), module_name) -} - -pub fn validate_cast(source_inferred: Option>, target_name: &String, span: Rc, source_indices: Rc>>, module_name: String) -> Option> { +pub fn categorized_error( + message: String, + span: Rc, + module_name: String, + category: String, +) -> Rc { + make_error_node( + Rc::new(CompilerDiagnostic::InternalError { + message: message, + span: span, + }), + module_name, + ) +} + +pub fn validate_cast( + source_inferred: Option>, + target_name: &String, + span: Rc, + source_indices: Rc>>, + module_name: String, +) -> Option> { match source_inferred.as_deref().cloned() { - Some(InferredNode::Resolved { node: src_node, .. }) => { - let source_name = authored_name_at(source_indices, &src_node); -if (source_name.clone().as_str() == target_name.clone().as_str()) { - None - } else { - if !is_dag_cast_domain_type(source_name.clone()) { + Some(InferredNode::Resolved { node: src_node, .. }) => { + let source_name = authored_name_at(source_indices, &src_node); + if (source_name.clone().as_str() == target_name.clone().as_str()) { None } else { - if !is_dag_cast_domain_type(target_name.clone()) { + if !is_dag_cast_domain_type(source_name.clone()) { None } else { - if dag_can_cast(source_name.clone(), target_name.clone()) { + if !is_dag_cast_domain_type(target_name.clone()) { None } else { - { - let msg = v2_rt::concat(v2_rt::concat(v2_rt::concat("invalid cast: ".to_string(), source_name.clone()), " as ".to_string()), target_name.clone()); -let diag = Rc::new(CompilerDiagnostic::InternalError { - message: msg, - span: span, -}); -Some(make_error_node(diag, module_name)) -} + if dag_can_cast(source_name.clone(), target_name.clone()) { + None + } else { + { + let msg = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "invalid cast: ".to_string(), + source_name.clone(), + ), + " as ".to_string(), + ), + target_name.clone(), + ); + let diag = Rc::new(CompilerDiagnostic::InternalError { + message: msg, + span: span, + }); + Some(make_error_node(diag, module_name)) + } + } } } } } -}, - _ => None, -} + _ => None, + } } pub fn type_variable_node(id: String) -> Rc { Rc::new(Node { - name: "".to_string(), - span: make_span(0, 0), - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::TypeVariable { - id: id, -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) + name: "".to_string(), + span: make_span(0, 0), + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::TypeVariable { id: id })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) } pub fn is_type_variable(inferred: Rc) -> bool { match (*inferred).clone() { - InferredNode::TypeVariable { .. } => true, - _ => false, -} + InferredNode::TypeVariable { .. } => true, + _ => false, + } } -pub fn inferred_or_error(result: Option>, fallback_message: String, fallback_span: Rc) -> Rc { +pub fn inferred_or_error( + result: Option>, + fallback_message: String, + fallback_span: Rc, +) -> Rc { match result { - Some(inferred) => inferred.clone(), - None => Rc::new(InferredNode::CompilerError { - message: fallback_message, - span: fallback_span, -}), -} + Some(inferred) => inferred.clone(), + None => Rc::new(InferredNode::CompilerError { + message: fallback_message, + span: fallback_span, + }), + } } -pub fn resolve_pattern_subject(scope: Rc, scrutinee_subject: Rc) -> Rc { +pub fn resolve_pattern_subject( + scope: Rc, + scrutinee_subject: Rc, +) -> Rc { match (*scrutinee_subject).clone() { - PatternSubject::PatternResolved { node: scrutinee_type, .. } => pattern_subject_from_node(&resolve_scrutinee_type_node(scope.type_env.clone(), scrutinee_type.clone())), - PatternSubject::PatternDynamic { span: dynamic_span, .. } => Rc::new(PatternSubject::PatternDynamic { - span: dynamic_span.clone(), -}), - PatternSubject::PatternLookupBlocked => Rc::new(PatternSubject::PatternLookupBlocked), -} + PatternSubject::PatternResolved { + node: scrutinee_type, + .. + } => pattern_subject_from_node(&resolve_scrutinee_type_node( + scope.type_env.clone(), + scrutinee_type.clone(), + )), + PatternSubject::PatternDynamic { + span: dynamic_span, .. + } => Rc::new(PatternSubject::PatternDynamic { + span: dynamic_span.clone(), + }), + PatternSubject::PatternLookupBlocked => Rc::new(PatternSubject::PatternLookupBlocked), + } } -pub fn annotate_pattern_parent_enums(pattern: Rc, scrutinee_subject: Rc, scope: &Rc) -> Rc { +pub fn annotate_pattern_parent_enums( + pattern: Rc, + scrutinee_subject: Rc, + scope: &Rc, +) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*pattern.clone()).clone() { - MatchPattern::VariantPattern { name: variant_name, field_bindings: bindings, .. } => { - let resolved_scrut = resolve_pattern_subject(scope.clone(), scrutinee_subject); -let inferred_parent = match (*resolved_scrut.clone()).clone() { - PatternSubject::PatternResolved { node: resolved_scrut_node, .. } => if ((resolved_scrut_node.return_cardinality.clone() == Cardinality::CardOptional) && ((variant_name.clone().as_str() == "Some".to_string().as_str()) || (variant_name.clone().as_str() == "None".to_string().as_str()))) { - Some("Optional".to_string()) - } else { - { - let is_coproduct = (resolved_scrut_node.connective.clone() == Connective::Disj); -if is_coproduct { - Some(authored_name_at(scope.type_env.clone().source_indices.clone(), &resolved_scrut_node)) - } else { - None + MatchPattern::VariantPattern { + name: variant_name, + field_bindings: bindings, + .. + } => { + let resolved_scrut = resolve_pattern_subject(scope.clone(), scrutinee_subject); + let inferred_parent = match (*resolved_scrut.clone()).clone() { + PatternSubject::PatternResolved { + node: resolved_scrut_node, + .. + } => { + if ((resolved_scrut_node.return_cardinality.clone() + == Cardinality::CardOptional) + && ((variant_name.clone().as_str() == "Some".to_string().as_str()) + || (variant_name.clone().as_str() == "None".to_string().as_str()))) + { + Some("Optional".to_string()) + } else { + { + let is_coproduct = + (resolved_scrut_node.connective.clone() == Connective::Disj); + if is_coproduct { + Some(authored_name_at( + scope.type_env.clone().source_indices.clone(), + &resolved_scrut_node, + )) + } else { + None + } + } + } } -} - }, - PatternSubject::PatternDynamic { .. } => None, - PatternSubject::PatternLookupBlocked => None, -}; -let variant_lookup = lookup_variant_in_type(resolved_scrut.clone(), &variant_name, scope.module_name.clone(), &scope.type_env.clone().source_indices.clone()); -let variant_subject = lookup_result_subject(variant_lookup); -let annotated_bindings = Rc::new({ let mut __result = Vec::new(); for binding in bindings.clone().iter().cloned() { __result.push({ - let field_lookup = lookup_field_in_variant(variant_subject.clone(), &field_binding_name_at(binding.clone(), scope.type_env.clone().source_indices.clone()), scope.module_name.clone(), &scope.type_env.clone().source_indices.clone()); -let field_subject = lookup_result_subject(field_lookup.clone()); -make_field_binding_node(&field_binding_name_at(binding.clone(), scope.type_env.clone().source_indices.clone()), annotate_pattern_parent_enums(field_binding_pattern(binding.clone()), field_subject.clone(), &scope), binding.span.clone(), node_name_span(&binding)) -}); } __result }); -match inferred_parent { - Some(parent_name) => Rc::new(MatchPattern::VariantPattern { - name: variant_name.clone(), - parent_enum: Some(parent_name.clone()), - field_bindings: annotated_bindings, -}), - None => Rc::new(MatchPattern::VariantPattern { - name: variant_name.clone(), - parent_enum: None, - field_bindings: annotated_bindings, -}), -} -}, - _ => pattern.clone(), -} + PatternSubject::PatternDynamic { .. } => None, + PatternSubject::PatternLookupBlocked => None, + }; + let variant_lookup = lookup_variant_in_type( + resolved_scrut.clone(), + &variant_name, + scope.module_name.clone(), + &scope.type_env.clone().source_indices.clone(), + ); + let variant_subject = lookup_result_subject(variant_lookup); + let annotated_bindings = Rc::new({ + let mut __result = Vec::new(); + for binding in bindings.clone().iter().cloned() { + __result.push({ + let field_lookup = lookup_field_in_variant( + variant_subject.clone(), + &field_binding_name_at( + binding.clone(), + scope.type_env.clone().source_indices.clone(), + ), + scope.module_name.clone(), + &scope.type_env.clone().source_indices.clone(), + ); + let field_subject = lookup_result_subject(field_lookup.clone()); + make_field_binding_node( + &field_binding_name_at( + binding.clone(), + scope.type_env.clone().source_indices.clone(), + ), + annotate_pattern_parent_enums( + field_binding_pattern(binding.clone()), + field_subject.clone(), + &scope, + ), + binding.span.clone(), + node_name_span(&binding), + ) + }); + } + __result + }); + match inferred_parent { + Some(parent_name) => Rc::new(MatchPattern::VariantPattern { + name: variant_name.clone(), + parent_enum: Some(parent_name.clone()), + field_bindings: annotated_bindings, + }), + None => Rc::new(MatchPattern::VariantPattern { + name: variant_name.clone(), + parent_enum: None, + field_bindings: annotated_bindings, + }), + } + } + _ => pattern.clone(), + } }) } pub fn build_params_scope(scope: &Rc, params: Rc>>) -> Rc { { - let new_locals = params.iter().cloned().fold(scope.locals.clone(), |acc: Rc>>, p: Rc| v2_rt::rc_map_insert(acc, param_node_name_at(p.clone(), scope.type_env.clone().source_indices.clone()), Rc::new(TypeBinding { - name: param_node_name_at(p.clone(), scope.type_env.clone().source_indices.clone()), - resolved: param_node_type_expr(&p), - provenance: Rc::new(SubValueRelation::PreservedValue), -}))); -Rc::new(InferScope { - type_env: scope.type_env.clone(), - func_env: scope.func_env.clone(), - locals: new_locals, - match_bound_names: scope.match_bound_names.clone(), - module_name: scope.module_name.clone(), - service_registry: scope.service_registry.clone(), - item_registry: scope.item_registry.clone(), - lambda_param_provenance: v2_rt::rc_empty_map::>(), -}) -} + let new_locals = params.iter().cloned().fold( + scope.locals.clone(), + |acc: Rc>>, p: Rc| { + v2_rt::rc_map_insert( + acc, + param_node_name_at(p.clone(), scope.type_env.clone().source_indices.clone()), + Rc::new(TypeBinding { + name: param_node_name_at( + p.clone(), + scope.type_env.clone().source_indices.clone(), + ), + resolved: param_node_type_expr(&p), + provenance: Rc::new(SubValueRelation::PreservedValue), + }), + ) + }, + ); + Rc::new(InferScope { + type_env: scope.type_env.clone(), + func_env: scope.func_env.clone(), + locals: new_locals, + match_bound_names: scope.match_bound_names.clone(), + module_name: scope.module_name.clone(), + service_registry: scope.service_registry.clone(), + item_registry: scope.item_registry.clone(), + lambda_param_provenance: v2_rt::rc_empty_map::>(), + }) + } } -pub fn extend_scope(scope: &Rc, name: &String, resolved: Rc, provenance: Rc) -> Rc { +pub fn extend_scope( + scope: &Rc, + name: &String, + resolved: Rc, + provenance: Rc, +) -> Rc { Rc::new(InferScope { - type_env: scope.type_env.clone(), - func_env: scope.func_env.clone(), - locals: v2_rt::rc_map_insert(scope.locals.clone(), name.clone(), Rc::new(TypeBinding { - name: name.clone(), - resolved: resolved, - provenance: provenance, -})), - match_bound_names: scope.match_bound_names.clone(), - module_name: scope.module_name.clone(), - service_registry: scope.service_registry.clone(), - item_registry: scope.item_registry.clone(), - lambda_param_provenance: scope.lambda_param_provenance.clone(), -}) + type_env: scope.type_env.clone(), + func_env: scope.func_env.clone(), + locals: v2_rt::rc_map_insert( + scope.locals.clone(), + name.clone(), + Rc::new(TypeBinding { + name: name.clone(), + resolved: resolved, + provenance: provenance, + }), + ), + match_bound_names: scope.match_bound_names.clone(), + module_name: scope.module_name.clone(), + service_registry: scope.service_registry.clone(), + item_registry: scope.item_registry.clone(), + lambda_param_provenance: scope.lambda_param_provenance.clone(), + }) } -pub fn extend_scope_match_bound(scope: &Rc, name: &String, resolved: Rc, provenance: Rc) -> Rc { +pub fn extend_scope_match_bound( + scope: &Rc, + name: &String, + resolved: Rc, + provenance: Rc, +) -> Rc { Rc::new(InferScope { - type_env: scope.type_env.clone(), - func_env: scope.func_env.clone(), - locals: v2_rt::rc_map_insert(scope.locals.clone(), name.clone(), Rc::new(TypeBinding { - name: name.clone(), - resolved: resolved, - provenance: provenance, -})), - match_bound_names: v2_rt::rc_map_insert(scope.match_bound_names.clone(), name.clone(), true), - module_name: scope.module_name.clone(), - service_registry: scope.service_registry.clone(), - item_registry: scope.item_registry.clone(), - lambda_param_provenance: scope.lambda_param_provenance.clone(), -}) + type_env: scope.type_env.clone(), + func_env: scope.func_env.clone(), + locals: v2_rt::rc_map_insert( + scope.locals.clone(), + name.clone(), + Rc::new(TypeBinding { + name: name.clone(), + resolved: resolved, + provenance: provenance, + }), + ), + match_bound_names: v2_rt::rc_map_insert( + scope.match_bound_names.clone(), + name.clone(), + true, + ), + module_name: scope.module_name.clone(), + service_registry: scope.service_registry.clone(), + item_registry: scope.item_registry.clone(), + lambda_param_provenance: scope.lambda_param_provenance.clone(), + }) } pub fn extend_scope_with_params(scope: &Rc, params: Rc>) -> Rc { { - let new_locals = params.iter().cloned().fold(scope.locals.clone(), |acc: Rc>>, p: String| v2_rt::rc_map_insert(acc, p.clone(), Rc::new(TypeBinding { - name: p.clone(), - resolved: type_variable_node("lambda_param".to_string()), - provenance: Rc::new(SubValueRelation::SubValueUnknown), -}))); -Rc::new(InferScope { - type_env: scope.type_env.clone(), - func_env: scope.func_env.clone(), - locals: new_locals, - match_bound_names: scope.match_bound_names.clone(), - module_name: scope.module_name.clone(), - service_registry: scope.service_registry.clone(), - item_registry: scope.item_registry.clone(), - lambda_param_provenance: scope.lambda_param_provenance.clone(), -}) -} + let new_locals = params.iter().cloned().fold( + scope.locals.clone(), + |acc: Rc>>, p: String| { + v2_rt::rc_map_insert( + acc, + p.clone(), + Rc::new(TypeBinding { + name: p.clone(), + resolved: type_variable_node("lambda_param".to_string()), + provenance: Rc::new(SubValueRelation::SubValueUnknown), + }), + ) + }, + ); + Rc::new(InferScope { + type_env: scope.type_env.clone(), + func_env: scope.func_env.clone(), + locals: new_locals, + match_bound_names: scope.match_bound_names.clone(), + module_name: scope.module_name.clone(), + service_registry: scope.service_registry.clone(), + item_registry: scope.item_registry.clone(), + lambda_param_provenance: scope.lambda_param_provenance.clone(), + }) + } } -pub fn scope_after_stmt_node(stmt: &Rc, stmt_type: Rc, scope: &Rc) -> Rc { +pub fn scope_after_stmt_node( + stmt: &Rc, + stmt_type: Rc, + scope: &Rc, +) -> Rc { match (*stmt.expr_data.clone()).clone() { - ExprData::ExprLet => if ((stmt.children.clone().len() as i64) <= 1) { - { - let val = match stmt.children.clone().first().cloned() { - Some(v) => v.clone(), - None => stmt.clone(), -}; -extend_scope(&scope, &let_binding_name_at(stmt.clone(), scope.type_env.clone().source_indices.clone()), stmt_type, classify_binding_provenance(&val, &scope)) -} - } else { - scope.clone() - }, - _ => scope.clone(), -} + ExprData::ExprLet => { + if ((stmt.children.clone().len() as i64) <= 1) { + { + let val = match stmt.children.clone().first().cloned() { + Some(v) => v.clone(), + None => stmt.clone(), + }; + extend_scope( + &scope, + &let_binding_name_at( + stmt.clone(), + scope.type_env.clone().source_indices.clone(), + ), + stmt_type, + classify_binding_provenance(&val, &scope), + ) + } + } else { + scope.clone() + } + } + _ => scope.clone(), + } } -pub fn derive_field_provenance(scope: &Rc, scrutinee_provenance: &Rc, scrutinee_subject: Rc, variant_name: String, field_name: String) -> Rc { +pub fn derive_field_provenance( + scope: &Rc, + scrutinee_provenance: &Rc, + scrutinee_subject: Rc, + variant_name: String, + field_name: String, +) -> Rc { match (*scrutinee_provenance.clone()).clone() { - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - _ => { - let scrut_type_name = match (*scrutinee_subject).clone() { - PatternSubject::PatternResolved { node: n, .. } => authored_name_at(scope.type_env.clone().source_indices.clone(), &resolved_type(n.clone())), - _ => "".to_string(), -}; -if (scrut_type_name.clone().as_str() == "".to_string().as_str()) { - Rc::new(SubValueRelation::SubValueUnknown) - } else { - { - let ind_fields = inductive_fields_for(scope.type_env.clone(), scrut_type_name.clone()); -let matching = Rc::new({ let mut __result = Vec::new(); for f in ind_fields.iter().cloned() { if ((f.variant_name.clone().as_str() == variant_name.clone().as_str()) && (f.field_name.clone().as_str() == field_name.clone().as_str())) { __result.push(f); } } __result }).first().cloned(); -match matching { - Some(ind_field) => compose_sub_value(scrutinee_provenance.clone(), ind_field.clone()), - None => Rc::new(SubValueRelation::SubValueUnknown), -} -} + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + _ => { + let scrut_type_name = match (*scrutinee_subject).clone() { + PatternSubject::PatternResolved { node: n, .. } => authored_name_at( + scope.type_env.clone().source_indices.clone(), + &resolved_type(n.clone()), + ), + _ => "".to_string(), + }; + if (scrut_type_name.clone().as_str() == "".to_string().as_str()) { + Rc::new(SubValueRelation::SubValueUnknown) + } else { + { + let ind_fields = + inductive_fields_for(scope.type_env.clone(), scrut_type_name.clone()); + let matching = Rc::new({ + let mut __result = Vec::new(); + for f in ind_fields.iter().cloned() { + if ((f.variant_name.clone().as_str() == variant_name.clone().as_str()) + && (f.field_name.clone().as_str() == field_name.clone().as_str())) + { + __result.push(f); + } + } + __result + }) + .first() + .cloned(); + match matching { + Some(ind_field) => { + compose_sub_value(scrutinee_provenance.clone(), ind_field.clone()) + } + None => Rc::new(SubValueRelation::SubValueUnknown), + } + } + } } -}, -} + } } -pub fn extend_scope_with_pattern_node(scope: &Rc, pattern: Rc, scrutinee_subject: &Rc, scrutinee_provenance: Rc) -> Rc { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - match (*pattern).clone() { - MatchPattern::Bind { name: n, .. } => Rc::new(PatternScopeResult { - scope: extend_scope_match_bound(&scope, &n, pattern_binding_type(scrutinee_subject.clone()), scrutinee_provenance.clone()), - diagnostics: Rc::new(vec![]), -}), - MatchPattern::Wildcard => Rc::new(PatternScopeResult { - scope: scope.clone(), - diagnostics: Rc::new(vec![]), -}), - MatchPattern::LitPattern { .. } => Rc::new(PatternScopeResult { - scope: scope.clone(), - diagnostics: Rc::new(vec![]), -}), - MatchPattern::VariantPattern { name: vname, field_bindings: bindings, .. } => { +pub fn extend_scope_with_pattern_node( + scope: &Rc, + pattern: Rc, + scrutinee_subject: &Rc, + scrutinee_provenance: Rc, +) -> Rc { + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*pattern).clone() { + MatchPattern::Bind { name: n, .. } => Rc::new(PatternScopeResult { + scope: extend_scope_match_bound( + &scope, + &n, + pattern_binding_type(scrutinee_subject.clone()), + scrutinee_provenance.clone(), + ), + diagnostics: Rc::new(vec![]), + }), + MatchPattern::Wildcard => Rc::new(PatternScopeResult { + scope: scope.clone(), + diagnostics: Rc::new(vec![]), + }), + MatchPattern::LitPattern { .. } => Rc::new(PatternScopeResult { + scope: scope.clone(), + diagnostics: Rc::new(vec![]), + }), + MatchPattern::VariantPattern { + name: vname, + field_bindings: bindings, + .. + } => { let resolved_scrut = resolve_pattern_subject(scope.clone(), scrutinee_subject.clone()); -let variant_lookup = lookup_variant_in_type(resolved_scrut, &vname, scope.module_name.clone(), &scope.type_env.clone().source_indices.clone()); -let variant_subject = lookup_result_subject(variant_lookup.clone()); -let variant_diags = variant_lookup.diagnostics.clone(); -bindings.clone().iter().cloned().fold(Rc::new(PatternScopeResult { - scope: scope.clone(), - diagnostics: variant_diags, -}), |acc: Rc, fb: Rc| { - let field_name = field_binding_name_at(fb.clone(), scope.type_env.clone().source_indices.clone()); -let field_lookup = lookup_field_in_variant(variant_subject.clone(), &field_name, scope.module_name.clone(), &scope.type_env.clone().source_indices.clone()); -let field_subject = lookup_result_subject(field_lookup.clone()); -let field_type = pattern_binding_type(field_subject.clone()); -let field_provenance = derive_field_provenance(&scope, &scrutinee_provenance, scrutinee_subject.clone(), vname.clone(), field_name.clone()); -let fb_pattern = field_binding_pattern(fb.clone()); -match (*fb_pattern.clone()).clone() { - MatchPattern::Bind { name: n, .. } => Rc::new(PatternScopeResult { - scope: extend_scope_match_bound(&acc.scope.clone(), &n, field_type.clone(), field_provenance.clone()), - diagnostics: v2_rt::concat(acc.diagnostics.clone(), field_lookup.diagnostics.clone()), -}), - _ => { - let nested = extend_scope_with_pattern_node(&acc.scope.clone(), fb_pattern.clone(), &field_subject, field_provenance.clone()); -Rc::new(PatternScopeResult { - scope: nested.scope.clone(), - diagnostics: v2_rt::concat(acc.diagnostics.clone(), v2_rt::concat(field_lookup.diagnostics.clone(), nested.diagnostics.clone())), -}) -}, -} -}) -}, -} + let variant_lookup = lookup_variant_in_type( + resolved_scrut, + &vname, + scope.module_name.clone(), + &scope.type_env.clone().source_indices.clone(), + ); + let variant_subject = lookup_result_subject(variant_lookup.clone()); + let variant_diags = variant_lookup.diagnostics.clone(); + bindings.clone().iter().cloned().fold( + Rc::new(PatternScopeResult { + scope: scope.clone(), + diagnostics: variant_diags, + }), + |acc: Rc, fb: Rc| { + let field_name = field_binding_name_at( + fb.clone(), + scope.type_env.clone().source_indices.clone(), + ); + let field_lookup = lookup_field_in_variant( + variant_subject.clone(), + &field_name, + scope.module_name.clone(), + &scope.type_env.clone().source_indices.clone(), + ); + let field_subject = lookup_result_subject(field_lookup.clone()); + let field_type = pattern_binding_type(field_subject.clone()); + let field_provenance = derive_field_provenance( + &scope, + &scrutinee_provenance, + scrutinee_subject.clone(), + vname.clone(), + field_name.clone(), + ); + let fb_pattern = field_binding_pattern(fb.clone()); + match (*fb_pattern.clone()).clone() { + MatchPattern::Bind { name: n, .. } => Rc::new(PatternScopeResult { + scope: extend_scope_match_bound( + &acc.scope.clone(), + &n, + field_type.clone(), + field_provenance.clone(), + ), + diagnostics: v2_rt::concat( + acc.diagnostics.clone(), + field_lookup.diagnostics.clone(), + ), + }), + _ => { + let nested = extend_scope_with_pattern_node( + &acc.scope.clone(), + fb_pattern.clone(), + &field_subject, + field_provenance.clone(), + ); + Rc::new(PatternScopeResult { + scope: nested.scope.clone(), + diagnostics: v2_rt::concat( + acc.diagnostics.clone(), + v2_rt::concat( + field_lookup.diagnostics.clone(), + nested.diagnostics.clone(), + ), + ), + }) + } + } + }, + ) + } }) } @@ -1028,164 +1620,298 @@ pub fn method_name_is(opt: &Option, expected: String) -> bool { } } -pub fn arg_has_name(arg: Rc, name: String, source_indices: Rc>>) -> bool { +pub fn arg_has_name( + arg: Rc, + name: String, + source_indices: Rc>>, +) -> bool { { let n = arg_name_at(arg, source_indices); -if (n.clone() == None) { + if (n.clone() == None) { false } else { (n.clone().unwrap().as_str() == name.as_str()) } -} + } } -pub fn extract_fold_init_info(method_name: Option, method_args: &Rc>>, min_args: i64, scope: &Rc, expected: Option>) -> Option> { +pub fn extract_fold_init_info( + method_name: Option, + method_args: &Rc>>, + min_args: i64, + scope: &Rc, + expected: Option>, +) -> Option> { { let is_fold = method_name_is(&method_name, "fold".to_string()); -if (is_fold && ((method_args.clone().len() as i64) >= min_args)) { + if (is_fold && ((method_args.clone().len() as i64) >= min_args)) { { - let init_arg = match Rc::new({ let mut __result = Vec::new(); for a in method_args.clone().iter().cloned() { if arg_has_name(a.clone(), "init".to_string(), scope.type_env.clone().source_indices.clone()) { __result.push(a); } } __result }).first().cloned() { - Some(a) => Some(a.clone()), - None => method_args.clone().first().cloned(), -}; -match init_arg { - Some(ia) => { - let init_result = infer_expr(&arg_value(&ia), &scope, &expected); -Some(Rc::new(ArgInferResult { - typed_arg: make_arg_node(arg_name_at(ia.clone(), scope.type_env.clone().source_indices.clone()), init_result.typed.clone(), ia.span.clone(), ia.span.clone()), - diagnostics: init_result.diagnostics.clone(), -})) -}, - None => None, -} -} + let init_arg = match Rc::new({ + let mut __result = Vec::new(); + for a in method_args.clone().iter().cloned() { + if arg_has_name( + a.clone(), + "init".to_string(), + scope.type_env.clone().source_indices.clone(), + ) { + __result.push(a); + } + } + __result + }) + .first() + .cloned() + { + Some(a) => Some(a.clone()), + None => method_args.clone().first().cloned(), + }; + match init_arg { + Some(ia) => { + let init_result = infer_expr(&arg_value(&ia), &scope, &expected); + Some(Rc::new(ArgInferResult { + typed_arg: make_arg_node( + arg_name_at( + ia.clone(), + scope.type_env.clone().source_indices.clone(), + ), + init_result.typed.clone(), + ia.span.clone(), + ia.span.clone(), + ), + diagnostics: init_result.diagnostics.clone(), + })) + } + None => None, + } + } } else { None } -} + } } -pub fn derive_element_provenance(coll_expr: Rc, elem_type: &Rc, scope: &Rc) -> Rc { +pub fn derive_element_provenance( + coll_expr: Rc, + elem_type: &Rc, + scope: &Rc, +) -> Rc { { let coll_prov = classify_binding_provenance(&coll_expr, &scope); -match (*coll_prov).clone() { - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), - _ => if (authored_name_at(scope.type_env.clone().source_indices.clone(), &elem_type).as_str() == "".to_string().as_str()) { - Rc::new(SubValueRelation::SubValueUnknown) - } else { - { - let ind_fields = inductive_fields_for(scope.type_env.clone(), authored_name_at(scope.type_env.clone().source_indices.clone(), &elem_type)); -let list_field = Rc::new({ let mut __result = Vec::new(); for f in ind_fields.iter().cloned() { if match f.shape.clone() { - RecursionShape::ListRecursion => true, - _ => false, -} { __result.push(f); } } __result }).first().cloned(); -match list_field { - Some(f) => Rc::new(SubValueRelation::IteratedSubValue { - field: f.clone(), -}), - None => Rc::new(SubValueRelation::SubValueUnknown), -} -} - }, -} -} + match (*coll_prov).clone() { + SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), + _ => { + if (authored_name_at(scope.type_env.clone().source_indices.clone(), &elem_type) + .as_str() + == "".to_string().as_str()) + { + Rc::new(SubValueRelation::SubValueUnknown) + } else { + { + let ind_fields = inductive_fields_for( + scope.type_env.clone(), + authored_name_at( + scope.type_env.clone().source_indices.clone(), + &elem_type, + ), + ); + let list_field = Rc::new({ + let mut __result = Vec::new(); + for f in ind_fields.iter().cloned() { + if match f.shape.clone() { + RecursionShape::ListRecursion => true, + _ => false, + } { + __result.push(f); + } + } + __result + }) + .first() + .cloned(); + match list_field { + Some(f) => { + Rc::new(SubValueRelation::IteratedSubValue { field: f.clone() }) + } + None => Rc::new(SubValueRelation::SubValueUnknown), + } + } + } + } + } + } } -pub fn infer_method_args_with_fold(method_name: Option, method_args: Rc>>, fold_info: Option>, fold_acc_type: Rc, element_type: Rc, elem_provenance: Rc, scope: Rc) -> Rc>> { +pub fn infer_method_args_with_fold( + method_name: Option, + method_args: Rc>>, + fold_info: Option>, + fold_acc_type: Rc, + element_type: Rc, + elem_provenance: Rc, + scope: Rc, +) -> Rc>> { { let is_fold = method_name_is(&method_name, "fold".to_string()); -Rc::new({ let mut __result = Vec::new(); for idx_pair in Rc::new(method_args.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ - let a = idx_pair.1.clone(); -let idx = idx_pair.0.clone(); -let is_init_arg = (arg_has_name(a.clone(), "init".to_string(), scope.type_env.clone().source_indices.clone()) || ((arg_name_at(a.clone(), scope.type_env.clone().source_indices.clone()) == None) && (idx.clone() == 0))); -if ((is_fold.clone() && (fold_info.clone() != None)) && is_init_arg.clone()) { - match fold_info.clone() { - Some(fi) => fi.clone(), - None => infer_arg_with_element_type(&a, element_type.clone(), &scope), -} - } else { - if (is_fold.clone() && (fold_info.clone() != None)) { - { - let fold_params = Rc::new(vec![make_param_node(&"acc".to_string(), fold_acc_type.clone(), None, no_span(), no_span()), make_param_node(&"elem".to_string(), element_type.clone(), None, no_span(), no_span())]); -let fold_callable = Rc::new(Node { - name: "".to_string(), - span: no_span(), - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: fold_params.clone(), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let lam_value = arg_value(&a); -let prov_map = match (*elem_provenance.clone()).clone() { - SubValueRelation::SubValueUnknown => v2_rt::rc_empty_map::>(), - _ => v2_rt::rc_map_insert(v2_rt::rc_empty_map::>(), "elem".to_string(), elem_provenance.clone()), -}; -let fold_scope = Rc::new(InferScope { - type_env: scope.type_env.clone(), - func_env: scope.func_env.clone(), - locals: scope.locals.clone(), - match_bound_names: scope.match_bound_names.clone(), - module_name: scope.module_name.clone(), - service_registry: scope.service_registry.clone(), - item_registry: scope.item_registry.clone(), - lambda_param_provenance: prov_map.clone(), -}); -let ar = infer_expr(&lam_value, &fold_scope, &Some(fold_callable.clone())); -Rc::new(ArgInferResult { - typed_arg: make_arg_node(arg_name_at(a.clone(), scope.type_env.clone().source_indices.clone()), ar.typed.clone(), a.span.clone(), a.span.clone()), - diagnostics: ar.diagnostics.clone(), -}) -} - } else { - { - let nf_lam_value = arg_value(&a); -let nf_prov_map = match (*elem_provenance.clone()).clone() { - SubValueRelation::SubValueUnknown => v2_rt::rc_empty_map::>(), - _ => v2_rt::rc_map_insert(v2_rt::rc_empty_map::>(), "elem".to_string(), elem_provenance.clone()), -}; -let nf_scope = if is_lambda_expr(nf_lam_value.clone()) { - Rc::new(InferScope { - type_env: scope.type_env.clone(), - func_env: scope.func_env.clone(), - locals: scope.locals.clone(), - match_bound_names: scope.match_bound_names.clone(), - module_name: scope.module_name.clone(), - service_registry: scope.service_registry.clone(), - item_registry: scope.item_registry.clone(), - lambda_param_provenance: nf_prov_map.clone(), -}) + Rc::new({ + let mut __result = Vec::new(); + for idx_pair in Rc::new( + method_args + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + __result.push({ + let a = idx_pair.1.clone(); + let idx = idx_pair.0.clone(); + let is_init_arg = (arg_has_name( + a.clone(), + "init".to_string(), + scope.type_env.clone().source_indices.clone(), + ) || ((arg_name_at( + a.clone(), + scope.type_env.clone().source_indices.clone(), + ) == None) + && (idx.clone() == 0))); + if ((is_fold.clone() && (fold_info.clone() != None)) && is_init_arg.clone()) { + match fold_info.clone() { + Some(fi) => fi.clone(), + None => infer_arg_with_element_type(&a, element_type.clone(), &scope), + } + } else { + if (is_fold.clone() && (fold_info.clone() != None)) { + { + let fold_params = Rc::new(vec![ + make_param_node( + &"acc".to_string(), + fold_acc_type.clone(), + None, + no_span(), + no_span(), + ), + make_param_node( + &"elem".to_string(), + element_type.clone(), + None, + no_span(), + no_span(), + ), + ]); + let fold_callable = Rc::new(Node { + name: "".to_string(), + span: no_span(), + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: fold_params.clone(), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let lam_value = arg_value(&a); + let prov_map = match (*elem_provenance.clone()).clone() { + SubValueRelation::SubValueUnknown => { + v2_rt::rc_empty_map::>() + } + _ => v2_rt::rc_map_insert( + v2_rt::rc_empty_map::>(), + "elem".to_string(), + elem_provenance.clone(), + ), + }; + let fold_scope = Rc::new(InferScope { + type_env: scope.type_env.clone(), + func_env: scope.func_env.clone(), + locals: scope.locals.clone(), + match_bound_names: scope.match_bound_names.clone(), + module_name: scope.module_name.clone(), + service_registry: scope.service_registry.clone(), + item_registry: scope.item_registry.clone(), + lambda_param_provenance: prov_map.clone(), + }); + let ar = infer_expr( + &lam_value, + &fold_scope, + &Some(fold_callable.clone()), + ); + Rc::new(ArgInferResult { + typed_arg: make_arg_node( + arg_name_at( + a.clone(), + scope.type_env.clone().source_indices.clone(), + ), + ar.typed.clone(), + a.span.clone(), + a.span.clone(), + ), + diagnostics: ar.diagnostics.clone(), + }) + } } else { - scope.clone() - }; -infer_arg_with_element_type(&a, element_type.clone(), &nf_scope) -} - } + { + let nf_lam_value = arg_value(&a); + let nf_prov_map = match (*elem_provenance.clone()).clone() { + SubValueRelation::SubValueUnknown => { + v2_rt::rc_empty_map::>() + } + _ => v2_rt::rc_map_insert( + v2_rt::rc_empty_map::>(), + "elem".to_string(), + elem_provenance.clone(), + ), + }; + let nf_scope = if is_lambda_expr(nf_lam_value.clone()) { + Rc::new(InferScope { + type_env: scope.type_env.clone(), + func_env: scope.func_env.clone(), + locals: scope.locals.clone(), + match_bound_names: scope.match_bound_names.clone(), + module_name: scope.module_name.clone(), + service_registry: scope.service_registry.clone(), + item_registry: scope.item_registry.clone(), + lambda_param_provenance: nf_prov_map.clone(), + }) + } else { + scope.clone() + }; + infer_arg_with_element_type(&a, element_type.clone(), &nf_scope) + } + } + } + }); } -}); } __result }) -} + __result + }) + } } pub fn is_lambda_expr(e: Rc) -> bool { match (*e.expr_data.clone()).clone() { - ExprData::ExprLambda => true, - _ => false, -} + ExprData::ExprLambda => true, + _ => false, + } } pub fn seed_override_map() -> Rc>> { - Rc::new(vec!["".to_string()]).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, k: String| v2_rt::rc_map_insert(acc, k.clone(), unit_type())) + Rc::new(vec!["".to_string()]).iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, k: String| { + v2_rt::rc_map_insert(acc, k.clone(), unit_type()) + }, + ) } pub fn fold_override_map(key: String, value: Rc) -> Rc>> { @@ -1196,355 +1922,704 @@ pub fn empty_override_map() -> Rc>> { seed_override_map() } -pub fn infer_arg_with_element_type(arg: &Rc, element_type: Rc, scope: &Rc) -> Rc { +pub fn infer_arg_with_element_type( + arg: &Rc, + element_type: Rc, + scope: &Rc, +) -> Rc { { let ar = infer_expr(&arg_value(&arg), &scope, &Some(element_type)); -Rc::new(ArgInferResult { - typed_arg: make_arg_node(arg_name_at(arg.clone(), scope.type_env.clone().source_indices.clone()), ar.typed.clone(), arg.span.clone(), arg.span.clone()), - diagnostics: ar.diagnostics.clone(), -}) -} + Rc::new(ArgInferResult { + typed_arg: make_arg_node( + arg_name_at(arg.clone(), scope.type_env.clone().source_indices.clone()), + ar.typed.clone(), + arg.span.clone(), + arg.span.clone(), + ), + diagnostics: ar.diagnostics.clone(), + }) + } } -pub fn infer_expr(texpr: &Rc, scope: &Rc, expected: &Option>) -> Rc { +pub fn infer_expr( + texpr: &Rc, + scope: &Rc, + expected: &Option>, +) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprLiteral { value: lit, .. } => { - let span = texpr.span.clone(); -ok_infer(make_expr_node(Rc::new(ExprData::ExprLiteral { - value: lit.clone(), -}), Rc::new(vec![]), Some(Rc::new(InferredNode::Resolved { - node: infer_literal_node(lit.clone()), -})), span.clone())) -}, - ExprData::ExprError { kind, message, .. } => { - let span = texpr.span.clone(); -Rc::new(InferResult { - typed: make_expr_error_node(kind.clone(), &message, &span), - diagnostics: Rc::new(vec![]), -}) -}, - ExprData::ExprVar { .. } => { - let name = expr_var_name_at(texpr.clone(), scope.type_env.clone().source_indices.clone()); -let span = texpr.span.clone(); -match v2_rt::map_get(&scope.locals.clone(), name.clone()) { - Some(binding) => { - let binding_kind = infer_var_binding_kind(&scope, &name); -ok_infer(make_named_expr_node(&name, Rc::new(ExprData::ExprVar { - binding_kind: Some(binding_kind), -}), Rc::new(vec![]), Some(Rc::new(InferredNode::Resolved { - node: binding.resolved.clone(), -})), span.clone(), span.clone())) -}, - None => match lookup_func_sig(scope.func_env.clone(), name.clone()) { - Some(fsig) => if ((fsig.params.clone().len() as i64) == 0) { - ok_infer(make_named_expr_node(&name, Rc::new(ExprData::ExprCall { - call_semantics: Some(CallSemantics::PlainCallSemantics), - descent_evidence: None, -}), Rc::new(vec![]), Some(Rc::new(InferredNode::Resolved { - node: fsig.inferred.clone(), -})), span.clone(), span.clone())) - } else { - ok_infer(make_named_expr_node(&name, Rc::new(ExprData::ExprVar { - binding_kind: Some(Rc::new(VarBindingKind::FunctionValueBinding)), -}), Rc::new(vec![]), Some(Rc::new(InferredNode::Resolved { - node: resolved_callable_type(fsig.params.clone(), fsig.inferred.clone()), -})), span.clone(), span.clone())) - }, - None => { - let err_texpr = make_named_expr_node(&name, Rc::new(ExprData::ExprVar { - binding_kind: None, -}), Rc::new(vec![]), Some(Rc::new(InferredNode::Resolved { - node: error_type(), -})), span.clone(), span.clone()); -Rc::new(InferResult { - typed: err_texpr, - diagnostics: Rc::new(vec![inference_error(v2_rt::concat(v2_rt::concat("undefined variable '".to_string(), name.clone()), "'".to_string()), span.clone(), scope.module_name.clone())]), -}) -}, -}, -} -}, - ExprData::ExprFieldAccess { .. } => { - let field_name = field_access_field_at(texpr.clone(), scope.type_env.clone().source_indices.clone()); -let span = texpr.span.clone(); -let base_expr = field_access_base(texpr.clone()); -let base_result = infer_expr(&base_expr, &scope, &None); -let base_typed = base_result.typed.clone(); -let base_diags = base_result.diagnostics.clone(); -let base_rt = resolved_type(base_typed.clone()); -let resolved_base = resolve_scrutinee_type_node(scope.type_env.clone(), base_rt.clone()); -let resolved_base_is_error = if (resolved_base.inferred.clone() != None) { - is_compiler_error(resolved_base.inferred.clone().clone().unwrap()) - } else { - false - }; -if resolved_base_is_error { + ExprData::ExprLiteral { value: lit, .. } => { + let span = texpr.span.clone(); + ok_infer(make_expr_node( + Rc::new(ExprData::ExprLiteral { value: lit.clone() }), + Rc::new(vec![]), + Some(Rc::new(InferredNode::Resolved { + node: infer_literal_node(lit.clone()), + })), + span.clone(), + )) + } + ExprData::ExprError { kind, message, .. } => { + let span = texpr.span.clone(); Rc::new(InferResult { - typed: make_expr_error_node(ExprErrorKind::SemanticExprError, &"error type cascade".to_string(), &span), - diagnostics: base_diags, -}) - } else { - match lookup_field_type_node(&resolved_base, &field_name, scope.type_env.clone().source_indices.clone()) { - Some(field_type) => { - let field_summary = field_summary_for_type(base_rt.clone(), &scope.type_env.clone(), &field_name); -let fa_texpr = make_named_expr_node(&field_name, Rc::new(ExprData::ExprFieldAccess { - summary: field_summary, -}), Rc::new(vec![base_typed.clone()]), Some(Rc::new(InferredNode::Resolved { - node: field_type.clone(), -})), span.clone(), node_name_span(&texpr)); -Rc::new(InferResult { - typed: fa_texpr, - diagnostics: base_diags, -}) -}, - None => { - let base_is_type_var = if (resolved_base.inferred.clone() != None) { - is_type_variable(resolved_base.inferred.clone().clone().unwrap()) - } else { - false - }; -if base_is_type_var { - { - let fa_texpr = make_named_expr_node(&field_name, Rc::new(ExprData::ExprFieldAccess { - summary: Some(Rc::new(FieldSummary { - access_style: FieldAccessStyle::StoredField, - value_shape: FieldValueShape::PlainValue, -})), -}), Rc::new(vec![base_typed.clone()]), Some(Rc::new(InferredNode::TypeVariable { - id: "field_of_type_var".to_string(), -})), span.clone(), node_name_span(&texpr)); -Rc::new(InferResult { - typed: fa_texpr, - diagnostics: base_diags, -}) -} - } else { - match check_service_field_access_node(&base_rt, field_name.clone(), scope.service_registry.clone(), scope.type_env.clone().source_indices.clone()) { - Some(svc_type) => { - let fa_texpr = make_named_expr_node(&field_name, Rc::new(ExprData::ExprFieldAccess { - summary: Some(Rc::new(FieldSummary { - access_style: FieldAccessStyle::StoredField, - value_shape: FieldValueShape::PlainValue, -})), -}), Rc::new(vec![base_typed.clone()]), Some(Rc::new(InferredNode::Resolved { - node: svc_type.clone(), -})), span.clone(), node_name_span(&texpr)); -Rc::new(InferResult { - typed: fa_texpr, - diagnostics: base_diags, -}) -}, - None => { - let error_message = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("no field '".to_string(), field_name.clone()), "' on type '".to_string()), authored_name_at(scope.type_env.clone().source_indices.clone(), &resolved_base)), "'".to_string()); -let fa_texpr = make_expr_error_node(ExprErrorKind::SemanticExprError, &error_message, &span); -Rc::new(InferResult { - typed: fa_texpr, - diagnostics: v2_rt::concat(base_diags, Rc::new(vec![inference_error(error_message.clone(), span.clone(), scope.module_name.clone())])), -}) -}, -} + typed: make_expr_error_node(kind.clone(), &message, &span), + diagnostics: Rc::new(vec![]), + }) + } + ExprData::ExprVar { .. } => { + let name = + expr_var_name_at(texpr.clone(), scope.type_env.clone().source_indices.clone()); + let span = texpr.span.clone(); + match v2_rt::map_get(&scope.locals.clone(), name.clone()) { + Some(binding) => { + let binding_kind = infer_var_binding_kind(&scope, &name); + ok_infer(make_named_expr_node( + &name, + Rc::new(ExprData::ExprVar { + binding_kind: Some(binding_kind), + }), + Rc::new(vec![]), + Some(Rc::new(InferredNode::Resolved { + node: binding.resolved.clone(), + })), + span.clone(), + span.clone(), + )) } -}, -} + None => match lookup_func_sig(scope.func_env.clone(), name.clone()) { + Some(fsig) => { + if ((fsig.params.clone().len() as i64) == 0) { + ok_infer(make_named_expr_node( + &name, + Rc::new(ExprData::ExprCall { + call_semantics: Some(CallSemantics::PlainCallSemantics), + descent_evidence: None, + }), + Rc::new(vec![]), + Some(Rc::new(InferredNode::Resolved { + node: fsig.inferred.clone(), + })), + span.clone(), + span.clone(), + )) + } else { + ok_infer(make_named_expr_node( + &name, + Rc::new(ExprData::ExprVar { + binding_kind: Some(Rc::new( + VarBindingKind::FunctionValueBinding, + )), + }), + Rc::new(vec![]), + Some(Rc::new(InferredNode::Resolved { + node: resolved_callable_type( + fsig.params.clone(), + fsig.inferred.clone(), + ), + })), + span.clone(), + span.clone(), + )) + } + } + None => { + let err_texpr = make_named_expr_node( + &name, + Rc::new(ExprData::ExprVar { binding_kind: None }), + Rc::new(vec![]), + Some(Rc::new(InferredNode::Resolved { node: error_type() })), + span.clone(), + span.clone(), + ); + Rc::new(InferResult { + typed: err_texpr, + diagnostics: Rc::new(vec![inference_error( + v2_rt::concat( + v2_rt::concat( + "undefined variable '".to_string(), + name.clone(), + ), + "'".to_string(), + ), + span.clone(), + scope.module_name.clone(), + )]), + }) + } + }, + } } -}, - ExprData::ExprCall { .. } => { - let func_name = expr_call_func_at(texpr.clone(), scope.type_env.clone().source_indices.clone()); -let span = texpr.span.clone(); -let call_args = texpr.children.clone(); -let sig = lookup_func_sig(scope.func_env.clone(), func_name.clone()); -let sig_params = match sig.clone() { - Some(s) => s.params.clone(), - None => Rc::new(vec![]), -}; -let has_lambda = { let mut __found = false; for a in call_args.clone().iter().cloned() { if is_lambda_expr(arg_value(&a)) { __found = true; break; } } __found }; -let call_method_args = Rc::new(call_args.clone().iter().cloned().skip(1 as usize).collect::>()); -let call_method_name = Some(func_name.clone()); -let call_fold_info = extract_fold_init_info(call_method_name.clone(), &call_method_args, 2, &scope, expected.clone()); -let call_fold_acc_type = match call_fold_info.clone() { - Some(fi) => resolved_type(arg_value(&fi.typed_arg.clone())), - None => error_type(), -}; -let arg_infer_results = if ((has_lambda && ((call_args.clone().len() as i64) >= 2)) && (sig.clone() == None)) { - match call_args.clone().first().cloned() { - Some(first_arg) => { - let first_result = infer_expr(&arg_value(&first_arg), &scope, &None); -let first_type = resolved_type(first_result.typed.clone()); -let elem_type = for_each_element_type_node(first_type, scope.type_env.clone().source_indices.clone()); -let call_elem_provenance = derive_element_provenance(first_result.typed.clone(), &elem_type, &scope); -let remaining_results = infer_method_args_with_fold(call_method_name.clone(), call_method_args.clone(), call_fold_info.clone(), call_fold_acc_type.clone(), elem_type.clone(), call_elem_provenance, scope.clone()); -v2_rt::concat(Rc::new(vec![Rc::new(ArgInferResult { - typed_arg: make_arg_node(arg_name_at(first_arg.clone(), scope.type_env.clone().source_indices.clone()), first_result.typed.clone(), first_arg.span.clone(), first_arg.span.clone()), - diagnostics: first_result.diagnostics.clone(), -})]), remaining_results) -}, - None => Rc::new(vec![]), -} - } else { - Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(call_args.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ - let a = pair.1.clone(); -let formal_param_type = match sig_params.clone().get(pair.0.clone() as usize).cloned() { - Some(p) => param_node_type_expr(&p), - None => type_variable_node("callable_param".to_string()), -}; -let has_formal = match sig_params.clone().get(pair.0.clone() as usize).cloned() { - Some(_) => true, - None => false, -}; -let expected = if has_formal.clone() { - Some(formal_param_type.clone()) - } else { - None - }; -let ar = infer_expr(&arg_value(&a), &scope, &expected); -Rc::new(ArgInferResult { - typed_arg: make_arg_node(arg_name_at(a.clone(), scope.type_env.clone().source_indices.clone()), ar.typed.clone(), a.span.clone(), a.span.clone()), - diagnostics: ar.diagnostics.clone(), -}) -}); } __result }) - }; -let typed_args = Rc::new({ let mut __result = Vec::new(); for air in arg_infer_results.clone().iter().cloned() { __result.push(air.typed_arg.clone()); } __result }); -let arg_diags = Rc::new({ let mut __result = Vec::new(); for air in arg_infer_results.clone().iter().cloned() { __result.extend((*air.diagnostics.clone()).iter().cloned()); } __result }); -let typed_arg_nodes = typed_args.clone(); -if (sig.clone() != None) { - { - let resolved_type = match sig.clone() { - Some(s) => s.inferred.clone(), - None => error_type(), -}; -Rc::new(InferResult { - typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprCall { - call_semantics: Some(CallSemantics::PlainCallSemantics), - descent_evidence: None, -}), typed_arg_nodes, Some(Rc::new(InferredNode::Resolved { - node: resolved_type, -})), span.clone(), node_name_span(&texpr)), - diagnostics: arg_diags, -}) -} - } else { + ExprData::ExprFieldAccess { .. } => { + let field_name = field_access_field_at( + texpr.clone(), + scope.type_env.clone().source_indices.clone(), + ); + let span = texpr.span.clone(); + let base_expr = field_access_base(texpr.clone()); + let base_result = infer_expr(&base_expr, &scope, &None); + let base_typed = base_result.typed.clone(); + let base_diags = base_result.diagnostics.clone(); + let base_rt = resolved_type(base_typed.clone()); + let resolved_base = + resolve_scrutinee_type_node(scope.type_env.clone(), base_rt.clone()); + let resolved_base_is_error = if (resolved_base.inferred.clone() != None) { + is_compiler_error(resolved_base.inferred.clone().clone().unwrap()) + } else { + false + }; + if resolved_base_is_error { + Rc::new(InferResult { + typed: make_expr_error_node( + ExprErrorKind::SemanticExprError, + &"error type cascade".to_string(), + &span, + ), + diagnostics: base_diags, + }) + } else { + match lookup_field_type_node( + &resolved_base, + &field_name, + scope.type_env.clone().source_indices.clone(), + ) { + Some(field_type) => { + let field_summary = field_summary_for_type( + base_rt.clone(), + &scope.type_env.clone(), + &field_name, + ); + let fa_texpr = make_named_expr_node( + &field_name, + Rc::new(ExprData::ExprFieldAccess { + summary: field_summary, + }), + Rc::new(vec![base_typed.clone()]), + Some(Rc::new(InferredNode::Resolved { + node: field_type.clone(), + })), + span.clone(), + node_name_span(&texpr), + ); + Rc::new(InferResult { + typed: fa_texpr, + diagnostics: base_diags, + }) + } + None => { + let base_is_type_var = if (resolved_base.inferred.clone() != None) { + is_type_variable(resolved_base.inferred.clone().clone().unwrap()) + } else { + false + }; + if base_is_type_var { + { + let fa_texpr = make_named_expr_node( + &field_name, + Rc::new(ExprData::ExprFieldAccess { + summary: Some(Rc::new(FieldSummary { + access_style: FieldAccessStyle::StoredField, + value_shape: FieldValueShape::PlainValue, + })), + }), + Rc::new(vec![base_typed.clone()]), + Some(Rc::new(InferredNode::TypeVariable { + id: "field_of_type_var".to_string(), + })), + span.clone(), + node_name_span(&texpr), + ); + Rc::new(InferResult { + typed: fa_texpr, + diagnostics: base_diags, + }) + } + } else { + match check_service_field_access_node( + &base_rt, + field_name.clone(), + scope.service_registry.clone(), + scope.type_env.clone().source_indices.clone(), + ) { + Some(svc_type) => { + let fa_texpr = make_named_expr_node( + &field_name, + Rc::new(ExprData::ExprFieldAccess { + summary: Some(Rc::new(FieldSummary { + access_style: FieldAccessStyle::StoredField, + value_shape: FieldValueShape::PlainValue, + })), + }), + Rc::new(vec![base_typed.clone()]), + Some(Rc::new(InferredNode::Resolved { + node: svc_type.clone(), + })), + span.clone(), + node_name_span(&texpr), + ); + Rc::new(InferResult { + typed: fa_texpr, + diagnostics: base_diags, + }) + } + None => { + let error_message = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "no field '".to_string(), + field_name.clone(), + ), + "' on type '".to_string(), + ), + authored_name_at( + scope.type_env.clone().source_indices.clone(), + &resolved_base, + ), + ), + "'".to_string(), + ); + let fa_texpr = make_expr_error_node( + ExprErrorKind::SemanticExprError, + &error_message, + &span, + ); + Rc::new(InferResult { + typed: fa_texpr, + diagnostics: v2_rt::concat( + base_diags, + Rc::new(vec![inference_error( + error_message.clone(), + span.clone(), + scope.module_name.clone(), + )]), + ), + }) + } + } + } + } + } + } + } + ExprData::ExprCall { .. } => { + let func_name = + expr_call_func_at(texpr.clone(), scope.type_env.clone().source_indices.clone()); + let span = texpr.span.clone(); + let call_args = texpr.children.clone(); + let sig = lookup_func_sig(scope.func_env.clone(), func_name.clone()); + let sig_params = match sig.clone() { + Some(s) => s.params.clone(), + None => Rc::new(vec![]), + }; + let has_lambda = { + let mut __found = false; + for a in call_args.clone().iter().cloned() { + if is_lambda_expr(arg_value(&a)) { + __found = true; + break; + } + } + __found + }; + let call_method_args = Rc::new( + call_args + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + let call_method_name = Some(func_name.clone()); + let call_fold_info = extract_fold_init_info( + call_method_name.clone(), + &call_method_args, + 2, + &scope, + expected.clone(), + ); + let call_fold_acc_type = match call_fold_info.clone() { + Some(fi) => resolved_type(arg_value(&fi.typed_arg.clone())), + None => error_type(), + }; + let arg_infer_results = if ((has_lambda && ((call_args.clone().len() as i64) >= 2)) + && (sig.clone() == None)) { - let first_arg_type = match typed_args.clone().first().cloned() { - Some(ta) => resolved_type(arg_value(&ta)), - None => unit_type(), -}; -let method_receiver = match typed_args.clone().first().cloned() { - Some(ta) => arg_value(&ta), - None => internal_expr_error_node("method bridge missing receiver".to_string(), span.clone()), -}; -let call_acc_is_under_resolved = !is_fully_resolved(&call_fold_acc_type, &scope.type_env.clone().source_indices.clone()); -let refined_call_fold_acc_type = if ((call_fold_info.clone() != None) && call_acc_is_under_resolved) { - match Rc::new({ let mut __result = Vec::new(); for a in typed_args.clone().iter().cloned() { if is_lambda_expr(arg_value(&a)) { __result.push(a); } } __result }).first().cloned() { - Some(lambda_arg) => resolved_type(arg_value(&lambda_arg)), - None => call_fold_acc_type.clone(), -} - } else { - call_fold_acc_type.clone() - }; -let method_resolution = resolve_known_method_node(method_receiver.clone(), &first_arg_type, &func_name, if (call_fold_info.clone() != None) { - Some(refined_call_fold_acc_type.clone()) - } else { - None - }, scope.service_registry.clone(), &scope.type_env.clone().source_indices.clone()); -let is_known_method = (method_resolution.result_type.clone() != None); -if (is_known_method && ((typed_args.clone().len() as i64) > 0)) { + match call_args.clone().first().cloned() { + Some(first_arg) => { + let first_result = infer_expr(&arg_value(&first_arg), &scope, &None); + let first_type = resolved_type(first_result.typed.clone()); + let elem_type = for_each_element_type_node( + first_type, + scope.type_env.clone().source_indices.clone(), + ); + let call_elem_provenance = derive_element_provenance( + first_result.typed.clone(), + &elem_type, + &scope, + ); + let remaining_results = infer_method_args_with_fold( + call_method_name.clone(), + call_method_args.clone(), + call_fold_info.clone(), + call_fold_acc_type.clone(), + elem_type.clone(), + call_elem_provenance, + scope.clone(), + ); + v2_rt::concat( + Rc::new(vec![Rc::new(ArgInferResult { + typed_arg: make_arg_node( + arg_name_at( + first_arg.clone(), + scope.type_env.clone().source_indices.clone(), + ), + first_result.typed.clone(), + first_arg.span.clone(), + first_arg.span.clone(), + ), + diagnostics: first_result.diagnostics.clone(), + })]), + remaining_results, + ) + } + None => Rc::new(vec![]), + } + } else { + Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + call_args + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() { - let receiver = method_receiver.clone(); -let remaining = Rc::new(typed_args.clone().iter().cloned().skip(1 as usize).collect::>()); -let base_result_type = match method_resolution.result_type.clone() { - Some(mt) => mt.clone(), - None => error_type(), -}; -let method_tv = if (method_resolution.semantics.clone() == None) { - Rc::new(KernelTypeBuild { - ty: base_result_type.clone(), - diagnostics: Rc::new(vec![]), -}) - } else { - match (*method_resolution.semantics.clone().clone().unwrap()).clone() { - MethodSemantics::AlgebraMethodSemantics { algebra_template: at, .. } => match at.clone() { - Some(t) => if (template_return_has_variables(t.clone()) || !is_fully_resolved(&base_result_type, &scope.type_env.clone().source_indices.clone())) { - { - let call_arg_types = Rc::new({ let mut __result = Vec::new(); for a in remaining.clone().iter().cloned() { __result.push(resolved_type(arg_value(&a))); } __result }); -let fold_overrides = if (call_fold_info.clone() != None) { - fold_override_map("FoldAccumulator".to_string(), refined_call_fold_acc_type.clone()) - } else { - empty_override_map() - }; -resolve_type_variables_from_template(&t, call_arg_types, &first_arg_type, fold_overrides, &scope.type_env.clone().source_indices.clone()) -} + __result.push({ + let a = pair.1.clone(); + let formal_param_type = match sig_params + .clone() + .get(pair.0.clone() as usize) + .cloned() + { + Some(p) => param_node_type_expr(&p), + None => type_variable_node("callable_param".to_string()), + }; + let has_formal = match sig_params + .clone() + .get(pair.0.clone() as usize) + .cloned() + { + Some(_) => true, + None => false, + }; + let expected = if has_formal.clone() { + Some(formal_param_type.clone()) } else { - Rc::new(KernelTypeBuild { - ty: base_result_type.clone(), - diagnostics: Rc::new(vec![]), -}) - }, - None => Rc::new(KernelTypeBuild { - ty: base_result_type.clone(), - diagnostics: Rc::new(vec![]), -}), -}, - _ => Rc::new(KernelTypeBuild { - ty: base_result_type.clone(), - diagnostics: Rc::new(vec![]), -}), -} - }; -let bridge_result_type = method_tv.ty.clone(); -let template_subst_diags = method_tv.diagnostics.clone(); -let returns_receiver_self = if (method_resolution.semantics.clone() == None) { - false + None + }; + let ar = infer_expr(&arg_value(&a), &scope, &expected); + Rc::new(ArgInferResult { + typed_arg: make_arg_node( + arg_name_at( + a.clone(), + scope.type_env.clone().source_indices.clone(), + ), + ar.typed.clone(), + a.span.clone(), + a.span.clone(), + ), + diagnostics: ar.diagnostics.clone(), + }) + }); + } + __result + }) + }; + let typed_args = Rc::new({ + let mut __result = Vec::new(); + for air in arg_infer_results.clone().iter().cloned() { + __result.push(air.typed_arg.clone()); + } + __result + }); + let arg_diags = Rc::new({ + let mut __result = Vec::new(); + for air in arg_infer_results.clone().iter().cloned() { + __result.extend((*air.diagnostics.clone()).iter().cloned()); + } + __result + }); + let typed_arg_nodes = typed_args.clone(); + if (sig.clone() != None) { + { + let resolved_type = match sig.clone() { + Some(s) => s.inferred.clone(), + None => error_type(), + }; + Rc::new(InferResult { + typed: make_named_expr_node( + &func_name, + Rc::new(ExprData::ExprCall { + call_semantics: Some(CallSemantics::PlainCallSemantics), + descent_evidence: None, + }), + typed_arg_nodes, + Some(Rc::new(InferredNode::Resolved { + node: resolved_type, + })), + span.clone(), + node_name_span(&texpr), + ), + diagnostics: arg_diags, + }) + } + } else { + { + let first_arg_type = match typed_args.clone().first().cloned() { + Some(ta) => resolved_type(arg_value(&ta)), + None => unit_type(), + }; + let method_receiver = match typed_args.clone().first().cloned() { + Some(ta) => arg_value(&ta), + None => internal_expr_error_node( + "method bridge missing receiver".to_string(), + span.clone(), + ), + }; + let call_acc_is_under_resolved = !is_fully_resolved( + &call_fold_acc_type, + &scope.type_env.clone().source_indices.clone(), + ); + let refined_call_fold_acc_type = + if ((call_fold_info.clone() != None) && call_acc_is_under_resolved) { + match Rc::new({ + let mut __result = Vec::new(); + for a in typed_args.clone().iter().cloned() { + if is_lambda_expr(arg_value(&a)) { + __result.push(a); + } + } + __result + }) + .first() + .cloned() + { + Some(lambda_arg) => resolved_type(arg_value(&lambda_arg)), + None => call_fold_acc_type.clone(), + } } else { - match (*method_resolution.semantics.clone().clone().unwrap()).clone() { - MethodSemantics::AlgebraMethodSemantics { algebra_template: at, .. } => match at.clone() { - Some(t) => template_return_is_receiver_self(t.clone()), - None => false, -}, - _ => false, -} + call_fold_acc_type.clone() }; -let final_receiver = if ((returns_receiver_self && is_fully_resolved(&bridge_result_type, &scope.type_env.clone().source_indices.clone())) && !is_fully_resolved(&first_arg_type, &scope.type_env.clone().source_indices.clone())) { - Rc::new(Node { - name: receiver.name.clone(), - span: receiver.span.clone(), - ident_span: receiver.ident_span.clone(), - children: bridge_result_type.children.clone(), - connective: receiver.connective.clone(), - params: receiver.params.clone(), - inferred: Some(Rc::new(InferredNode::Resolved { - node: bridge_result_type.clone(), -})), - return_cardinality: receiver.return_cardinality.clone(), - uses: receiver.uses.clone(), - body: receiver.body.clone(), - transport: receiver.transport.clone(), - properties: receiver.properties.clone(), - type_annotation: receiver.type_annotation.clone(), - is_self_recursive: receiver.is_self_recursive.clone(), - has_non_tail_self_call: receiver.has_non_tail_self_call.clone(), - match_pattern: receiver.match_pattern.clone(), - expr_data: receiver.expr_data.clone(), - ident: None, -}) + let method_resolution = resolve_known_method_node( + method_receiver.clone(), + &first_arg_type, + &func_name, + if (call_fold_info.clone() != None) { + Some(refined_call_fold_acc_type.clone()) } else { - receiver.clone() - }; -let remaining_arg_nodes = Rc::new({ let mut __result = Vec::new(); for ta in remaining.clone().iter().cloned() { __result.push(make_arg_node(arg_name_at(ta.clone(), scope.type_env.clone().source_indices.clone()), arg_value(&ta), span.clone(), span.clone())); } __result }); -Rc::new(InferResult { - typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprMethodCall { - method_semantics: method_resolution.semantics.clone(), -}), v2_rt::concat(Rc::new(vec![final_receiver]), remaining_arg_nodes), Some(Rc::new(InferredNode::Resolved { - node: bridge_result_type.clone(), -})), span.clone(), node_name_span(&texpr)), - diagnostics: v2_rt::concat(v2_rt::concat(arg_diags, method_resolution.diagnostics.clone()), template_subst_diags), -}) -} - } else { - if (func_name.clone().as_str() == "empty_map".to_string().as_str()) { + None + }, + scope.service_registry.clone(), + &scope.type_env.clone().source_indices.clone(), + ); + let is_known_method = (method_resolution.result_type.clone() != None); + if (is_known_method && ((typed_args.clone().len() as i64) > 0)) { { - let bare_m = bare_map_node(); -match expected.clone() { + let receiver = method_receiver.clone(); + let remaining = Rc::new( + typed_args + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + let base_result_type = match method_resolution.result_type.clone() { + Some(mt) => mt.clone(), + None => error_type(), + }; + let method_tv = if (method_resolution.semantics.clone() == None) { + Rc::new(KernelTypeBuild { + ty: base_result_type.clone(), + diagnostics: Rc::new(vec![]), + }) + } else { + match (*method_resolution.semantics.clone().clone().unwrap()) + .clone() + { + MethodSemantics::AlgebraMethodSemantics { + algebra_template: at, + .. + } => match at.clone() { + Some(t) => { + if (template_return_has_variables(t.clone()) + || !is_fully_resolved( + &base_result_type, + &scope + .type_env + .clone() + .source_indices + .clone(), + )) + { + { + let call_arg_types = Rc::new({ + let mut __result = Vec::new(); + for a in + remaining.clone().iter().cloned() + { + __result.push(resolved_type( + arg_value(&a), + )); + } + __result + }); + let fold_overrides = + if (call_fold_info.clone() != None) { + fold_override_map( + "FoldAccumulator".to_string(), + refined_call_fold_acc_type + .clone(), + ) + } else { + empty_override_map() + }; + resolve_type_variables_from_template( + &t, + call_arg_types, + &first_arg_type, + fold_overrides, + &scope + .type_env + .clone() + .source_indices + .clone(), + ) + } + } else { + Rc::new(KernelTypeBuild { + ty: base_result_type.clone(), + diagnostics: Rc::new(vec![]), + }) + } + } + None => Rc::new(KernelTypeBuild { + ty: base_result_type.clone(), + diagnostics: Rc::new(vec![]), + }), + }, + _ => Rc::new(KernelTypeBuild { + ty: base_result_type.clone(), + diagnostics: Rc::new(vec![]), + }), + } + }; + let bridge_result_type = method_tv.ty.clone(); + let template_subst_diags = method_tv.diagnostics.clone(); + let returns_receiver_self = if (method_resolution.semantics.clone() + == None) + { + false + } else { + match (*method_resolution.semantics.clone().clone().unwrap()) + .clone() + { + MethodSemantics::AlgebraMethodSemantics { + algebra_template: at, + .. + } => match at.clone() { + Some(t) => template_return_is_receiver_self(t.clone()), + None => false, + }, + _ => false, + } + }; + let final_receiver = if ((returns_receiver_self + && is_fully_resolved( + &bridge_result_type, + &scope.type_env.clone().source_indices.clone(), + )) + && !is_fully_resolved( + &first_arg_type, + &scope.type_env.clone().source_indices.clone(), + )) { + Rc::new(Node { + name: receiver.name.clone(), + span: receiver.span.clone(), + ident_span: receiver.ident_span.clone(), + children: bridge_result_type.children.clone(), + connective: receiver.connective.clone(), + params: receiver.params.clone(), + inferred: Some(Rc::new(InferredNode::Resolved { + node: bridge_result_type.clone(), + })), + return_cardinality: receiver.return_cardinality.clone(), + uses: receiver.uses.clone(), + body: receiver.body.clone(), + transport: receiver.transport.clone(), + properties: receiver.properties.clone(), + type_annotation: receiver.type_annotation.clone(), + is_self_recursive: receiver.is_self_recursive.clone(), + has_non_tail_self_call: receiver + .has_non_tail_self_call + .clone(), + match_pattern: receiver.match_pattern.clone(), + expr_data: receiver.expr_data.clone(), + ident: None, + }) + } else { + receiver.clone() + }; + let remaining_arg_nodes = Rc::new({ + let mut __result = Vec::new(); + for ta in remaining.clone().iter().cloned() { + __result.push(make_arg_node( + arg_name_at( + ta.clone(), + scope.type_env.clone().source_indices.clone(), + ), + arg_value(&ta), + span.clone(), + span.clone(), + )); + } + __result + }); + Rc::new(InferResult { + typed: make_named_expr_node( + &func_name, + Rc::new(ExprData::ExprMethodCall { + method_semantics: method_resolution.semantics.clone(), + }), + v2_rt::concat( + Rc::new(vec![final_receiver]), + remaining_arg_nodes, + ), + Some(Rc::new(InferredNode::Resolved { + node: bridge_result_type.clone(), + })), + span.clone(), + node_name_span(&texpr), + ), + diagnostics: v2_rt::concat( + v2_rt::concat( + arg_diags, + method_resolution.diagnostics.clone(), + ), + template_subst_diags, + ), + }) + } + } else { + if (func_name.clone().as_str() == "empty_map".to_string().as_str()) { + { + let bare_m = bare_map_node(); + match expected.clone() { Some(exp) => if node_is_keyed_collection(&exp, scope.type_env.clone().source_indices.clone()) { Rc::new(InferResult { typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprCall { @@ -1603,1045 +2678,1777 @@ match bare_m { }), }, } -} - } else { - if (func_name.clone().as_str() == "empty_set".to_string().as_str()) { - { - let bare_s = bare_set_node(); -match expected.clone() { - Some(exp) => if node_is_set_collection(&exp, &scope.type_env.clone().source_indices.clone()) { - Rc::new(InferResult { - typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprCall { - call_semantics: Some(CallSemantics::PlainCallSemantics), - descent_evidence: None, -}), typed_arg_nodes, Some(Rc::new(InferredNode::Resolved { - node: exp.clone(), -})), span.clone(), node_name_span(&texpr)), - diagnostics: arg_diags, -}) - } else { - { - let empty_set_diags = v2_rt::concat(arg_diags, Rc::new(vec![inference_error("empty_set(): expected type is not Set<...>".to_string(), span.clone(), scope.module_name.clone())])); -match bare_s { - Some(set_t) => Rc::new(InferResult { - typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprCall { - call_semantics: Some(CallSemantics::PlainCallSemantics), - descent_evidence: None, -}), typed_arg_nodes, Some(Rc::new(InferredNode::Resolved { - node: set_t.clone(), -})), span.clone(), node_name_span(&texpr)), - diagnostics: empty_set_diags, -}), - None => Rc::new(InferResult { - typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprCall { - call_semantics: Some(CallSemantics::PlainCallSemantics), - descent_evidence: None, -}), typed_arg_nodes, Some(Rc::new(InferredNode::CompilerError { - message: "empty_set(): Set kernel container profile missing (compiler misconfigured)".to_string(), - span: span.clone(), -})), span.clone(), node_name_span(&texpr)), - diagnostics: v2_rt::concat(empty_set_diags, Rc::new(vec![inference_error("empty_set(): Set kernel container profile missing".to_string(), span.clone(), scope.module_name.clone())])), -}), -} -} - }, - None => match bare_s { - Some(set_t) => Rc::new(InferResult { - typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprCall { - call_semantics: Some(CallSemantics::PlainCallSemantics), - descent_evidence: None, -}), typed_arg_nodes, Some(Rc::new(InferredNode::Resolved { - node: set_t.clone(), -})), span.clone(), node_name_span(&texpr)), - diagnostics: arg_diags, -}), - None => Rc::new(InferResult { - typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprCall { - call_semantics: Some(CallSemantics::PlainCallSemantics), - descent_evidence: None, -}), typed_arg_nodes, Some(Rc::new(InferredNode::CompilerError { - message: "empty_set(): Set kernel container profile missing (compiler misconfigured)".to_string(), - span: span.clone(), -})), span.clone(), node_name_span(&texpr)), - diagnostics: v2_rt::concat(arg_diags, Rc::new(vec![inference_error("empty_set(): Set kernel container profile missing".to_string(), span.clone(), scope.module_name.clone())])), -}), -}, -} -} + } } else { if (infer_builtin_call_type(func_name.clone()) != None) { { - let tier2b = infer_tier2b_builtin_with_kernel_diags(&func_name, typed_args.clone(), scope.clone(), span.clone()); -let bt = tier2b.bt.clone(); -let call_semantics = if (func_name.clone().as_str() == "lookup".to_string().as_str()) { + let tier2b = infer_tier2b_builtin_with_kernel_diags( + &func_name, + typed_args.clone(), + scope.clone(), + span.clone(), + ); + let bt = tier2b.bt.clone(); + let call_semantics = if (func_name.clone().as_str() + == "lookup".to_string().as_str()) + { Some(CallSemantics::LookupCallSemantics) } else { Some(CallSemantics::PlainCallSemantics) }; -Rc::new(InferResult { - typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprCall { - call_semantics: call_semantics, - descent_evidence: None, -}), typed_arg_nodes, Some(Rc::new(InferredNode::Resolved { - node: bt, -})), span.clone(), node_name_span(&texpr)), - diagnostics: v2_rt::concat(arg_diags, tier2b.kernel_diags.clone()), -}) -} + Rc::new(InferResult { + typed: make_named_expr_node( + &func_name, + Rc::new(ExprData::ExprCall { + call_semantics: call_semantics, + descent_evidence: None, + }), + typed_arg_nodes, + Some(Rc::new(InferredNode::Resolved { node: bt })), + span.clone(), + node_name_span(&texpr), + ), + diagnostics: v2_rt::concat( + arg_diags, + tier2b.kernel_diags.clone(), + ), + }) + } } else { { - let callable_local = match v2_rt::map_get(&scope.locals.clone(), func_name.clone()) { - Some(binding) => if ((binding.resolved.clone().params.clone().len() as i64) > 0) { - Some(binding.resolved.clone()) - } else { - None - }, - None => None, -}; -if (callable_local.clone() != None) { + let callable_local = match v2_rt::map_get( + &scope.locals.clone(), + func_name.clone(), + ) { + Some(binding) => { + if ((binding.resolved.clone().params.clone().len() + as i64) + > 0) + { + Some(binding.resolved.clone()) + } else { + None + } + } + None => None, + }; + if (callable_local.clone() != None) { { let callable_type = match callable_local.clone() { - Some(ct) => ct.clone(), - None => error_type(), -}; -let resolved_type = callable_inferred(&callable_type); -Rc::new(InferResult { - typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprCall { - call_semantics: Some(CallSemantics::PlainCallSemantics), - descent_evidence: None, -}), typed_arg_nodes, Some(Rc::new(InferredNode::Resolved { - node: resolved_type, -})), span.clone(), node_name_span(&texpr)), - diagnostics: arg_diags, -}) -} + Some(ct) => ct.clone(), + None => error_type(), + }; + let resolved_type = + callable_inferred(&callable_type); + Rc::new(InferResult { + typed: make_named_expr_node( + &func_name, + Rc::new(ExprData::ExprCall { + call_semantics: Some( + CallSemantics::PlainCallSemantics, + ), + descent_evidence: None, + }), + typed_arg_nodes, + Some(Rc::new(InferredNode::Resolved { + node: resolved_type, + })), + span.clone(), + node_name_span(&texpr), + ), + diagnostics: arg_diags, + }) + } } else { { - let type_match = lookup_type_by_name(&scope.type_env.clone(), func_name.clone()); -let resolved_type = match type_match.clone() { - Some(tn) => tn.clone(), - None => error_type(), -}; -let call_diags = match type_match.clone() { - Some(_) => Rc::new(vec![]), - None => Rc::new(vec![inference_error(v2_rt::concat(v2_rt::concat("function '".to_string(), func_name.clone()), "' not found in scope".to_string()), span.clone(), scope.module_name.clone())]), -}; -Rc::new(InferResult { - typed: make_named_expr_node(&func_name, Rc::new(ExprData::ExprCall { - call_semantics: Some(CallSemantics::PlainCallSemantics), - descent_evidence: None, -}), typed_arg_nodes, Some(Rc::new(InferredNode::Resolved { - node: resolved_type, -})), span.clone(), node_name_span(&texpr)), - diagnostics: v2_rt::concat(arg_diags, call_diags), -}) -} + let type_match = lookup_type_by_name( + &scope.type_env.clone(), + func_name.clone(), + ); + let resolved_type = match type_match.clone() { + Some(tn) => tn.clone(), + None => error_type(), + }; + let call_diags = match type_match.clone() { + Some(_) => Rc::new(vec![]), + None => Rc::new(vec![inference_error( + v2_rt::concat( + v2_rt::concat( + "function '".to_string(), + func_name.clone(), + ), + "' not found in scope".to_string(), + ), + span.clone(), + scope.module_name.clone(), + )]), + }; + Rc::new(InferResult { + typed: make_named_expr_node( + &func_name, + Rc::new(ExprData::ExprCall { + call_semantics: Some( + CallSemantics::PlainCallSemantics, + ), + descent_evidence: None, + }), + typed_arg_nodes, + Some(Rc::new(InferredNode::Resolved { + node: resolved_type, + })), + span.clone(), + node_name_span(&texpr), + ), + diagnostics: v2_rt::concat( + arg_diags, call_diags, + ), + }) + } } -} + } } } } } -} + } } -}, - ExprData::ExprMethodCall { .. } => { - let method_name = expr_method_name_at(texpr.clone(), scope.type_env.clone().source_indices.clone()); -let span = texpr.span.clone(); -let recv = method_receiver(texpr.clone()); -let mc_args = method_arg_nodes(texpr.clone()); -let recv_result = infer_expr(&recv, &scope, &None); -let recv_typed = recv_result.typed.clone(); -let recv_diags = recv_result.diagnostics.clone(); -let recv_rt = resolved_type(recv_typed.clone()); -let recv_elem_type = for_each_element_type_node(recv_rt.clone(), scope.type_env.clone().source_indices.clone()); -let mc_method_name = Some(method_name.clone()); -let fold_info = extract_fold_init_info(mc_method_name.clone(), &mc_args, 2, &scope, expected.clone()); -let fold_acc_type = match fold_info.clone() { - Some(fi) => resolved_type(arg_value(&fi.typed_arg.clone())), - None => error_type(), -}; -let mc_elem_provenance = derive_element_provenance(recv_typed.clone(), &recv_elem_type, &scope); -let mc_arg_infer_results = infer_method_args_with_fold(mc_method_name.clone(), mc_args.clone(), fold_info.clone(), fold_acc_type.clone(), recv_elem_type.clone(), mc_elem_provenance, scope.clone()); -let typed_mc_args = Rc::new({ let mut __result = Vec::new(); for air in mc_arg_infer_results.clone().iter().cloned() { __result.push(air.typed_arg.clone()); } __result }); -let mc_arg_diags = Rc::new({ let mut __result = Vec::new(); for air in mc_arg_infer_results.clone().iter().cloned() { __result.extend((*air.diagnostics.clone()).iter().cloned()); } __result }); -let mc_acc_is_under_resolved = !is_fully_resolved(&fold_acc_type, &scope.type_env.clone().source_indices.clone()); -let refined_fold_acc_type = if ((fold_info.clone() != None) && mc_acc_is_under_resolved) { - match Rc::new({ let mut __result = Vec::new(); for a in typed_mc_args.clone().iter().cloned() { if is_lambda_expr(arg_value(&a)) { __result.push(a); } } __result }).first().cloned() { - Some(lambda_arg) => resolved_type(arg_value(&lambda_arg)), - None => fold_acc_type.clone(), -} - } else { - fold_acc_type.clone() - }; -let method_resolution = resolve_known_method_node(recv_typed.clone(), &recv_rt, &method_name, if (fold_info.clone() != None) { - Some(refined_fold_acc_type.clone()) - } else { - None - }, scope.service_registry.clone(), &scope.type_env.clone().source_indices.clone()); -let pipe_fb = match method_resolution.result_type.clone() { - Some(rt) => Rc::new(MethodPipeFallback { - result_ty: rt.clone(), - kernel_diags: Rc::new(vec![]), -}), - None => method_pipe_map_keys_values_fallback(&recv_rt, &method_name, scope.clone(), span.clone()), -}; -let base_result_type = pipe_fb.result_ty.clone(); -let method_tv_mc = if (method_resolution.semantics.clone() == None) { - Rc::new(KernelTypeBuild { - ty: base_result_type.clone(), - diagnostics: Rc::new(vec![]), -}) - } else { - match (*method_resolution.semantics.clone().clone().unwrap()).clone() { - MethodSemantics::AlgebraMethodSemantics { algebra_template: at, .. } => match at.clone() { - Some(t) => if (template_return_has_variables(t.clone()) || !is_fully_resolved(&base_result_type, &scope.type_env.clone().source_indices.clone())) { - { - let mc_arg_types = Rc::new({ let mut __result = Vec::new(); for a in typed_mc_args.clone().iter().cloned() { __result.push(resolved_type(arg_value(&a))); } __result }); -let mc_fold_overrides = if (fold_info.clone() != None) { - fold_override_map("FoldAccumulator".to_string(), refined_fold_acc_type.clone()) - } else { - empty_override_map() - }; -resolve_type_variables_from_template(&t, mc_arg_types, &recv_rt, mc_fold_overrides, &scope.type_env.clone().source_indices.clone()) -} - } else { - Rc::new(KernelTypeBuild { - ty: base_result_type.clone(), - diagnostics: Rc::new(vec![]), -}) - }, - None => Rc::new(KernelTypeBuild { - ty: base_result_type.clone(), - diagnostics: Rc::new(vec![]), -}), -}, - _ => Rc::new(KernelTypeBuild { - ty: base_result_type.clone(), - diagnostics: Rc::new(vec![]), -}), -} - }; -let result_type = method_tv_mc.ty.clone(); -let mc_template_diags = method_tv_mc.diagnostics.clone(); -let method_semantics = if (method_resolution.semantics.clone() != None) { - method_resolution.semantics.clone() - } else { - Some(Rc::new(MethodSemantics::PlainMethodSemantics)) - }; -let typed_mc_arg_nodes = typed_mc_args.clone(); -let mc_texpr = make_named_expr_node(&method_name, Rc::new(ExprData::ExprMethodCall { - method_semantics: method_semantics, -}), v2_rt::concat(Rc::new(vec![recv_typed.clone()]), typed_mc_arg_nodes), Some(Rc::new(InferredNode::Resolved { - node: result_type, -})), span.clone(), node_name_span(&texpr)); -Rc::new(InferResult { - typed: mc_texpr, - diagnostics: v2_rt::concat(v2_rt::concat(v2_rt::concat(recv_diags, mc_arg_diags), pipe_fb.kernel_diags.clone()), v2_rt::concat(method_resolution.diagnostics.clone(), mc_template_diags)), -}) -}, - ExprData::ExprMatch => { - let span = texpr.span.clone(); -let scrut = match_scrutinee(texpr.clone()); -let arm_nodes = match_arm_nodes(texpr.clone()); -let scrut_result = infer_expr(&scrut, &scope, &None); -let scrut_typed = scrut_result.typed.clone(); -let scrut_diags = scrut_result.diagnostics.clone(); -let scrut_rt = resolved_type(scrut_typed.clone()); -let scrut_subject = pattern_subject_from_inferred(scrut_typed.inferred.clone()); -let scrut_provenance = classify_binding_provenance(&scrut, &scope); -let arm_infer_results = Rc::new({ let mut __result = Vec::new(); for arm_node in arm_nodes.clone().iter().cloned() { __result.push({ - let arm_pat = arm_pattern(arm_node.clone()); -let arm_g = arm_guard(&arm_node); -let arm_b = arm_body(&arm_node); -let typed_pattern = annotate_pattern_parent_enums(arm_pat.clone(), scrut_subject.clone(), &scope); -let pattern_result = extend_scope_with_pattern_node(&scope, typed_pattern.clone(), &scrut_subject, scrut_provenance.clone()); -let arm_scope = pattern_result.scope.clone(); -let pattern_diags = pattern_result.diagnostics.clone(); -let guard_result = if (arm_g.clone() != None) { - Some(infer_expr(&arm_g.clone().unwrap(), &arm_scope, &None)) - } else { - None + ExprData::ExprMethodCall { .. } => { + let method_name = expr_method_name_at( + texpr.clone(), + scope.type_env.clone().source_indices.clone(), + ); + let span = texpr.span.clone(); + let recv = method_receiver(texpr.clone()); + let mc_args = method_arg_nodes(texpr.clone()); + let recv_result = infer_expr(&recv, &scope, &None); + let recv_typed = recv_result.typed.clone(); + let recv_diags = recv_result.diagnostics.clone(); + let recv_rt = resolved_type(recv_typed.clone()); + let recv_elem_type = for_each_element_type_node( + recv_rt.clone(), + scope.type_env.clone().source_indices.clone(), + ); + let mc_method_name = Some(method_name.clone()); + let fold_info = extract_fold_init_info( + mc_method_name.clone(), + &mc_args, + 2, + &scope, + expected.clone(), + ); + let fold_acc_type = match fold_info.clone() { + Some(fi) => resolved_type(arg_value(&fi.typed_arg.clone())), + None => error_type(), }; -let body_result = infer_expr(&arm_b, &arm_scope, &expected); -let body_typed = body_result.typed.clone(); -let body_diags = body_result.diagnostics.clone(); -let guard_unwrapped = match guard_result.clone() { - Some(gr) => gr.clone(), - None => Rc::new(InferResult { - typed: arm_b.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -let guard_diags = if (guard_result.clone() != None) { - guard_unwrapped.diagnostics.clone() - } else { - Rc::new(vec![]) - }; -Rc::new(ArmInferResult { - typed_arm: make_arm_node(typed_pattern.clone(), if (guard_result.clone() != None) { - Some(guard_unwrapped.typed.clone()) - } else { - None - }, body_typed.clone(), span.clone()), - diagnostics: v2_rt::concat(pattern_diags.clone(), v2_rt::concat(guard_diags.clone(), body_diags.clone())), - body_type: resolved_type(body_typed.clone()), -}) -}); } __result }); -let arm_body_types = Rc::new({ let mut __result = Vec::new(); for ar in arm_infer_results.clone().iter().cloned() { __result.push(ar.body_type.clone()); } __result }); -let unified_arm_type = match arm_body_types.clone().first().cloned() { - Some(first_type) => Rc::new(arm_body_types.clone().iter().cloned().skip(1 as usize).collect::>()).iter().cloned().fold(first_type, |acc: Rc, t: Rc| prefer_specific_type(acc, t.clone(), &scope.type_env.clone().source_indices.clone())), - None => scrut_rt.clone(), -}; -let arm_infer_results = if is_fully_resolved(&unified_arm_type, &scope.type_env.clone().source_indices.clone()) { - Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(arm_nodes.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ - let idx = pair.0.clone(); -let arm_node = pair.1.clone(); -let original_list = Rc::new({ let mut __result = Vec::new(); for ap in Rc::new({ let mut __result = Vec::new(); for ap in Rc::new(arm_infer_results.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (ap.0.clone() == idx.clone()) { __result.push(ap); } } __result }).iter().cloned() { __result.push(ap.1.clone()); } __result }); -let original = match original_list.clone().first().cloned() { - Some(ar) => ar.clone(), - None => Rc::new(ArmInferResult { - typed_arm: arm_node.clone(), - diagnostics: Rc::new(vec![]), - body_type: scrut_rt.clone(), -}), -}; -if !is_fully_resolved(&original.body_type.clone(), &scope.type_env.clone().source_indices.clone()) { + let mc_elem_provenance = + derive_element_provenance(recv_typed.clone(), &recv_elem_type, &scope); + let mc_arg_infer_results = infer_method_args_with_fold( + mc_method_name.clone(), + mc_args.clone(), + fold_info.clone(), + fold_acc_type.clone(), + recv_elem_type.clone(), + mc_elem_provenance, + scope.clone(), + ); + let typed_mc_args = Rc::new({ + let mut __result = Vec::new(); + for air in mc_arg_infer_results.clone().iter().cloned() { + __result.push(air.typed_arg.clone()); + } + __result + }); + let mc_arg_diags = Rc::new({ + let mut __result = Vec::new(); + for air in mc_arg_infer_results.clone().iter().cloned() { + __result.extend((*air.diagnostics.clone()).iter().cloned()); + } + __result + }); + let mc_acc_is_under_resolved = !is_fully_resolved( + &fold_acc_type, + &scope.type_env.clone().source_indices.clone(), + ); + let refined_fold_acc_type = + if ((fold_info.clone() != None) && mc_acc_is_under_resolved) { + match Rc::new({ + let mut __result = Vec::new(); + for a in typed_mc_args.clone().iter().cloned() { + if is_lambda_expr(arg_value(&a)) { + __result.push(a); + } + } + __result + }) + .first() + .cloned() { + Some(lambda_arg) => resolved_type(arg_value(&lambda_arg)), + None => fold_acc_type.clone(), + } + } else { + fold_acc_type.clone() + }; + let method_resolution = resolve_known_method_node( + recv_typed.clone(), + &recv_rt, + &method_name, + if (fold_info.clone() != None) { + Some(refined_fold_acc_type.clone()) + } else { + None + }, + scope.service_registry.clone(), + &scope.type_env.clone().source_indices.clone(), + ); + let pipe_fb = match method_resolution.result_type.clone() { + Some(rt) => Rc::new(MethodPipeFallback { + result_ty: rt.clone(), + kernel_diags: Rc::new(vec![]), + }), + None => method_pipe_map_keys_values_fallback( + &recv_rt, + &method_name, + scope.clone(), + span.clone(), + ), + }; + let base_result_type = pipe_fb.result_ty.clone(); + let method_tv_mc = if (method_resolution.semantics.clone() == None) { + Rc::new(KernelTypeBuild { + ty: base_result_type.clone(), + diagnostics: Rc::new(vec![]), + }) + } else { + match (*method_resolution.semantics.clone().clone().unwrap()).clone() { + MethodSemantics::AlgebraMethodSemantics { + algebra_template: at, + .. + } => match at.clone() { + Some(t) => { + if (template_return_has_variables(t.clone()) + || !is_fully_resolved( + &base_result_type, + &scope.type_env.clone().source_indices.clone(), + )) + { + { + let mc_arg_types = Rc::new({ + let mut __result = Vec::new(); + for a in typed_mc_args.clone().iter().cloned() { + __result.push(resolved_type(arg_value(&a))); + } + __result + }); + let mc_fold_overrides = if (fold_info.clone() != None) { + fold_override_map( + "FoldAccumulator".to_string(), + refined_fold_acc_type.clone(), + ) + } else { + empty_override_map() + }; + resolve_type_variables_from_template( + &t, + mc_arg_types, + &recv_rt, + mc_fold_overrides, + &scope.type_env.clone().source_indices.clone(), + ) + } + } else { + Rc::new(KernelTypeBuild { + ty: base_result_type.clone(), + diagnostics: Rc::new(vec![]), + }) + } + } + None => Rc::new(KernelTypeBuild { + ty: base_result_type.clone(), + diagnostics: Rc::new(vec![]), + }), + }, + _ => Rc::new(KernelTypeBuild { + ty: base_result_type.clone(), + diagnostics: Rc::new(vec![]), + }), + } + }; + let result_type = method_tv_mc.ty.clone(); + let mc_template_diags = method_tv_mc.diagnostics.clone(); + let method_semantics = if (method_resolution.semantics.clone() != None) { + method_resolution.semantics.clone() + } else { + Some(Rc::new(MethodSemantics::PlainMethodSemantics)) + }; + let typed_mc_arg_nodes = typed_mc_args.clone(); + let mc_texpr = make_named_expr_node( + &method_name, + Rc::new(ExprData::ExprMethodCall { + method_semantics: method_semantics, + }), + v2_rt::concat(Rc::new(vec![recv_typed.clone()]), typed_mc_arg_nodes), + Some(Rc::new(InferredNode::Resolved { node: result_type })), + span.clone(), + node_name_span(&texpr), + ); + Rc::new(InferResult { + typed: mc_texpr, + diagnostics: v2_rt::concat( + v2_rt::concat( + v2_rt::concat(recv_diags, mc_arg_diags), + pipe_fb.kernel_diags.clone(), + ), + v2_rt::concat(method_resolution.diagnostics.clone(), mc_template_diags), + ), + }) + } + ExprData::ExprMatch => { + let span = texpr.span.clone(); + let scrut = match_scrutinee(texpr.clone()); + let arm_nodes = match_arm_nodes(texpr.clone()); + let scrut_result = infer_expr(&scrut, &scope, &None); + let scrut_typed = scrut_result.typed.clone(); + let scrut_diags = scrut_result.diagnostics.clone(); + let scrut_rt = resolved_type(scrut_typed.clone()); + let scrut_subject = pattern_subject_from_inferred(scrut_typed.inferred.clone()); + let scrut_provenance = classify_binding_provenance(&scrut, &scope); + let arm_infer_results = Rc::new({ + let mut __result = Vec::new(); + for arm_node in arm_nodes.clone().iter().cloned() { + __result.push({ let arm_pat = arm_pattern(arm_node.clone()); -let arm_g = arm_guard(&arm_node); -let arm_b = arm_body(&arm_node); -let typed_pattern = annotate_pattern_parent_enums(arm_pat.clone(), scrut_subject.clone(), &scope); -let pattern_result = extend_scope_with_pattern_node(&scope, typed_pattern.clone(), &scrut_subject, scrut_provenance.clone()); -let arm_scope = pattern_result.scope.clone(); -let pattern_diags = pattern_result.diagnostics.clone(); -let guard_result = if (arm_g.clone() != None) { + let arm_g = arm_guard(&arm_node); + let arm_b = arm_body(&arm_node); + let typed_pattern = annotate_pattern_parent_enums( + arm_pat.clone(), + scrut_subject.clone(), + &scope, + ); + let pattern_result = extend_scope_with_pattern_node( + &scope, + typed_pattern.clone(), + &scrut_subject, + scrut_provenance.clone(), + ); + let arm_scope = pattern_result.scope.clone(); + let pattern_diags = pattern_result.diagnostics.clone(); + let guard_result = if (arm_g.clone() != None) { Some(infer_expr(&arm_g.clone().unwrap(), &arm_scope, &None)) } else { None }; -let body_result = infer_expr(&arm_b, &arm_scope, &Some(unified_arm_type.clone())); -let body_typed = body_result.typed.clone(); -let body_diags = body_result.diagnostics.clone(); -let guard_unwrapped = match guard_result.clone() { - Some(gr) => gr.clone(), - None => Rc::new(InferResult { - typed: arm_b.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -let guard_diags = if (guard_result.clone() != None) { + let body_result = infer_expr(&arm_b, &arm_scope, &expected); + let body_typed = body_result.typed.clone(); + let body_diags = body_result.diagnostics.clone(); + let guard_unwrapped = match guard_result.clone() { + Some(gr) => gr.clone(), + None => Rc::new(InferResult { + typed: arm_b.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + let guard_diags = if (guard_result.clone() != None) { guard_unwrapped.diagnostics.clone() } else { Rc::new(vec![]) }; -Rc::new(ArmInferResult { - typed_arm: make_arm_node(typed_pattern.clone(), if (guard_result.clone() != None) { - Some(guard_unwrapped.typed.clone()) - } else { - None - }, body_typed.clone(), span.clone()), - diagnostics: v2_rt::concat(pattern_diags.clone(), v2_rt::concat(guard_diags.clone(), body_diags.clone())), - body_type: resolved_type(body_typed.clone()), -}) -} - } else { - original.clone() + Rc::new(ArmInferResult { + typed_arm: make_arm_node( + typed_pattern.clone(), + if (guard_result.clone() != None) { + Some(guard_unwrapped.typed.clone()) + } else { + None + }, + body_typed.clone(), + span.clone(), + ), + diagnostics: v2_rt::concat( + pattern_diags.clone(), + v2_rt::concat(guard_diags.clone(), body_diags.clone()), + ), + body_type: resolved_type(body_typed.clone()), + }) + }); } -}); } __result }) - } else { - arm_infer_results.clone() - }; -let typed_arms = Rc::new({ let mut __result = Vec::new(); for ar in arm_infer_results.clone().iter().cloned() { __result.push(ar.typed_arm.clone()); } __result }); -let arm_diags = Rc::new({ let mut __result = Vec::new(); for ar in arm_infer_results.clone().iter().cloned() { __result.extend((*ar.diagnostics.clone()).iter().cloned()); } __result }); -let result_type = unified_arm_type.clone(); -let empty_arms_diags = if ((arm_infer_results.clone().len() as i64) == 0) { - Rc::new(vec![inference_error("match expression has no arms".to_string(), span.clone(), scope.module_name.clone())]) - } else { - Rc::new(vec![]) - }; -let exhaustiveness_diags = match (*resolve_pattern_subject(scope.clone(), scrut_subject.clone())).clone() { - PatternSubject::PatternResolved { node: resolved_scrutinee, .. } => check_match_exhaustiveness(&resolved_scrutinee, &typed_arms, &scope.type_env.clone(), span.clone(), scope.module_name.clone()), - PatternSubject::PatternDynamic { .. } => Rc::new(vec![]), - PatternSubject::PatternLookupBlocked => Rc::new(vec![]), -}; -let match_texpr = make_expr_node(Rc::new(ExprData::ExprMatch), v2_rt::concat(Rc::new(vec![scrut_typed.clone()]), typed_arms.clone()), Some(Rc::new(InferredNode::Resolved { - node: result_type, -})), span.clone()); -Rc::new(InferResult { - typed: match_texpr, - diagnostics: v2_rt::concat(v2_rt::concat(v2_rt::concat(scrut_diags, arm_diags), empty_arms_diags), exhaustiveness_diags), -}) -}, - ExprData::ExprIf => { - let span = texpr.span.clone(); -let cond = if_condition(texpr.clone()); -let then_expr = if_then_branch(texpr.clone()); -let else_expr = if_else_branch(texpr.clone()); -let cond_result = infer_expr(&cond, &scope, &None); -let cond_typed = cond_result.typed.clone(); -let cond_diags = cond_result.diagnostics.clone(); -let then_result = infer_expr(&then_expr, &scope, &expected); -let then_typed = then_result.typed.clone(); -let then_diags = then_result.diagnostics.clone(); -match else_expr { - Some(else_branch) => { - let else_result = infer_expr(&else_branch, &scope, &expected); -let then_rt = resolved_type(then_result.typed.clone()); -let else_rt = resolved_type(else_result.typed.clone()); -let then_result = if (!is_fully_resolved(&then_rt, &scope.type_env.clone().source_indices.clone()) && is_fully_resolved(&else_rt, &scope.type_env.clone().source_indices.clone())) { - infer_expr(&then_expr, &scope, &Some(else_rt.clone())) - } else { - then_result.clone() + __result + }); + let arm_body_types = Rc::new({ + let mut __result = Vec::new(); + for ar in arm_infer_results.clone().iter().cloned() { + __result.push(ar.body_type.clone()); + } + __result + }); + let unified_arm_type = match arm_body_types.clone().first().cloned() { + Some(first_type) => Rc::new( + arm_body_types + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ) + .iter() + .cloned() + .fold(first_type, |acc: Rc, t: Rc| { + prefer_specific_type( + acc, + t.clone(), + &scope.type_env.clone().source_indices.clone(), + ) + }), + None => scrut_rt.clone(), }; -let else_result = if (!is_fully_resolved(&else_rt, &scope.type_env.clone().source_indices.clone()) && is_fully_resolved(&then_rt, &scope.type_env.clone().source_indices.clone())) { - infer_expr(&else_branch, &scope, &Some(then_rt.clone())) + let arm_infer_results = if is_fully_resolved( + &unified_arm_type, + &scope.type_env.clone().source_indices.clone(), + ) { + Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + arm_nodes + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + __result.push({ + let idx = pair.0.clone(); + let arm_node = pair.1.clone(); + let original_list = Rc::new({ + let mut __result = Vec::new(); + for ap in Rc::new({ + let mut __result = Vec::new(); + for ap in Rc::new( + arm_infer_results + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + if (ap.0.clone() == idx.clone()) { + __result.push(ap); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(ap.1.clone()); + } + __result + }); + let original = match original_list.clone().first().cloned() { + Some(ar) => ar.clone(), + None => Rc::new(ArmInferResult { + typed_arm: arm_node.clone(), + diagnostics: Rc::new(vec![]), + body_type: scrut_rt.clone(), + }), + }; + if !is_fully_resolved( + &original.body_type.clone(), + &scope.type_env.clone().source_indices.clone(), + ) { + { + let arm_pat = arm_pattern(arm_node.clone()); + let arm_g = arm_guard(&arm_node); + let arm_b = arm_body(&arm_node); + let typed_pattern = annotate_pattern_parent_enums( + arm_pat.clone(), + scrut_subject.clone(), + &scope, + ); + let pattern_result = extend_scope_with_pattern_node( + &scope, + typed_pattern.clone(), + &scrut_subject, + scrut_provenance.clone(), + ); + let arm_scope = pattern_result.scope.clone(); + let pattern_diags = pattern_result.diagnostics.clone(); + let guard_result = if (arm_g.clone() != None) { + Some(infer_expr( + &arm_g.clone().unwrap(), + &arm_scope, + &None, + )) + } else { + None + }; + let body_result = infer_expr( + &arm_b, + &arm_scope, + &Some(unified_arm_type.clone()), + ); + let body_typed = body_result.typed.clone(); + let body_diags = body_result.diagnostics.clone(); + let guard_unwrapped = match guard_result.clone() { + Some(gr) => gr.clone(), + None => Rc::new(InferResult { + typed: arm_b.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + let guard_diags = if (guard_result.clone() != None) { + guard_unwrapped.diagnostics.clone() + } else { + Rc::new(vec![]) + }; + Rc::new(ArmInferResult { + typed_arm: make_arm_node( + typed_pattern.clone(), + if (guard_result.clone() != None) { + Some(guard_unwrapped.typed.clone()) + } else { + None + }, + body_typed.clone(), + span.clone(), + ), + diagnostics: v2_rt::concat( + pattern_diags.clone(), + v2_rt::concat( + guard_diags.clone(), + body_diags.clone(), + ), + ), + body_type: resolved_type(body_typed.clone()), + }) + } + } else { + original.clone() + } + }); + } + __result + }) } else { - else_result.clone() + arm_infer_results.clone() }; -let then_typed = then_result.typed.clone(); -let then_diags = then_result.diagnostics.clone(); -let else_typed = else_result.typed.clone(); -let else_diags = else_result.diagnostics.clone(); -let then_rt = resolved_type(then_typed.clone()); -let else_rt = resolved_type(else_typed.clone()); -let unified = prefer_specific_type(then_rt.clone(), else_rt.clone(), &scope.type_env.clone().source_indices.clone()); -let branch_diags = if node_type_compatible(then_rt.clone(), else_rt.clone(), scope.type_env.clone().source_indices.clone()) { - Rc::new(vec![]) + let typed_arms = Rc::new({ + let mut __result = Vec::new(); + for ar in arm_infer_results.clone().iter().cloned() { + __result.push(ar.typed_arm.clone()); + } + __result + }); + let arm_diags = Rc::new({ + let mut __result = Vec::new(); + for ar in arm_infer_results.clone().iter().cloned() { + __result.extend((*ar.diagnostics.clone()).iter().cloned()); + } + __result + }); + let result_type = unified_arm_type.clone(); + let empty_arms_diags = if ((arm_infer_results.clone().len() as i64) == 0) { + Rc::new(vec![inference_error( + "match expression has no arms".to_string(), + span.clone(), + scope.module_name.clone(), + )]) } else { - Rc::new(vec![inference_error(v2_rt::concat(v2_rt::concat(v2_rt::concat("if branches resolve to incompatible types: ".to_string(), node_type_shape(&then_rt, &scope.type_env.clone().source_indices.clone())), " vs ".to_string()), node_type_shape(&else_rt, &scope.type_env.clone().source_indices.clone())), span.clone(), scope.module_name.clone())]) + Rc::new(vec![]) }; -let if_texpr = make_expr_node(Rc::new(ExprData::ExprIf), Rc::new(vec![cond_typed, then_typed.clone(), else_typed.clone()]), Some(Rc::new(InferredNode::Resolved { - node: unified, -})), span.clone()); -Rc::new(InferResult { - typed: if_texpr, - diagnostics: v2_rt::concat(v2_rt::concat(v2_rt::concat(cond_diags, then_diags), else_diags), branch_diags), -}) -}, - None => { - let if_texpr2 = make_expr_node(Rc::new(ExprData::ExprIf), Rc::new(vec![cond_typed, then_typed.clone()]), Some(Rc::new(InferredNode::Resolved { - node: unit_type(), -})), span.clone()); -Rc::new(InferResult { - typed: if_texpr2, - diagnostics: v2_rt::concat(cond_diags, then_diags), -}) -}, -} -}, - ExprData::ExprLet => { - let let_name = let_binding_name_at(texpr.clone(), scope.type_env.clone().source_indices.clone()); -let span = texpr.span.clone(); -let val_expr = let_value(texpr.clone()); -let body_expr = let_body(texpr.clone()); -let is_tail_return = match body_expr.clone() { - Some(bd) => match (*bd.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => (authored_name_at(scope.type_env.clone().source_indices.clone(), &bd).as_str() == let_name.clone().as_str()), - _ => false, -}, - None => false, -}; -let val_expected = if is_tail_return { - expected.clone() - } else { - None - }; -let val_result = infer_expr(&val_expr, &scope, &val_expected); -let val_typed = val_result.typed.clone(); -let val_diags = val_result.diagnostics.clone(); -let val_type = resolved_type(val_typed.clone()); -if (body_expr.clone() == None) { - { - let let_texpr = make_named_expr_node(&let_name, Rc::new(ExprData::ExprLet), Rc::new(vec![val_typed.clone()]), Some(Rc::new(InferredNode::Resolved { - node: val_type, -})), span.clone(), node_name_span(&texpr)); -Rc::new(InferResult { - typed: let_texpr, - diagnostics: val_diags, -}) -} - } else { + let exhaustiveness_diags = match (*resolve_pattern_subject( + scope.clone(), + scrut_subject.clone(), + )) + .clone() { - let extended = extend_scope(&scope, &let_name, val_type, classify_binding_provenance(&val_typed, &scope)); -let body_result = infer_expr(&body_expr.clone().unwrap(), &extended, &expected); -let body_typed = body_result.typed.clone(); -let body_diags = body_result.diagnostics.clone(); -let let_texpr2 = make_named_expr_node(&let_name, Rc::new(ExprData::ExprLet), Rc::new(vec![val_typed.clone(), body_typed.clone()]), body_typed.inferred.clone(), span.clone(), node_name_span(&texpr)); -Rc::new(InferResult { - typed: let_texpr2, - diagnostics: v2_rt::concat(val_diags, body_diags.clone()), -}) -} + PatternSubject::PatternResolved { + node: resolved_scrutinee, + .. + } => check_match_exhaustiveness( + &resolved_scrutinee, + &typed_arms, + &scope.type_env.clone(), + span.clone(), + scope.module_name.clone(), + ), + PatternSubject::PatternDynamic { .. } => Rc::new(vec![]), + PatternSubject::PatternLookupBlocked => Rc::new(vec![]), + }; + let match_texpr = make_expr_node( + Rc::new(ExprData::ExprMatch), + v2_rt::concat(Rc::new(vec![scrut_typed.clone()]), typed_arms.clone()), + Some(Rc::new(InferredNode::Resolved { node: result_type })), + span.clone(), + ); + Rc::new(InferResult { + typed: match_texpr, + diagnostics: v2_rt::concat( + v2_rt::concat(v2_rt::concat(scrut_diags, arm_diags), empty_arms_diags), + exhaustiveness_diags, + ), + }) } -}, - ExprData::ExprRecordLit { .. } => { - let span = texpr.span.clone(); -let field_inits = texpr.children.clone(); -infer_record_lit(&record_lit_type_name_at(texpr.clone(), scope.type_env.clone().source_indices.clone()), field_inits, &span, node_name_span(&texpr), &scope) -}, - ExprData::ExprListLit => { - let span = texpr.span.clone(); -let elements = texpr.children.clone(); -let elem_expected = match expected.clone() { - Some(exp) => if node_is_element_collection(&exp, scope.type_env.clone().source_indices.clone()) { - match exp.children.clone().first().cloned() { - Some(elem) => Some(child_type_node(&elem)), - None => None, -} - } else { - None - }, - None => None, -}; -let elem_results = Rc::new({ let mut __result = Vec::new(); for e in elements.iter().cloned() { __result.push(infer_expr(&e, &scope, &elem_expected)); } __result }); -let typed_elements = Rc::new({ let mut __result = Vec::new(); for r in elem_results.clone().iter().cloned() { __result.push(r.typed.clone()); } __result }); -let elem_diags = Rc::new({ let mut __result = Vec::new(); for r in elem_results.clone().iter().cloned() { __result.extend((*r.diagnostics.clone()).iter().cloned()); } __result }); -let elem_type_node = if ((elem_results.clone().len() as i64) > 0) { - match elem_results.clone().first().cloned() { - Some(r) => resolved_type(r.typed.clone()), - None => unit_type(), -} - } else { - match expected.clone() { - Some(exp) => if node_is_element_collection(&exp, scope.type_env.clone().source_indices.clone()) { - match exp.children.clone().first().cloned() { - Some(elem) => child_type_node(&elem), - None => unit_type(), -} - } else { - unit_type() - }, - None => unit_type(), -} - }; -let empty_list_diags = if ((elem_results.clone().len() as i64) == 0) { - match expected.clone() { - Some(exp) => if node_is_element_collection(&exp, scope.type_env.clone().source_indices.clone()) { - match exp.children.clone().first().cloned() { - Some(_) => Rc::new(vec![]), - None => Rc::new(vec![inference_error("empty list literal: expected type has no element type".to_string(), span.clone(), scope.module_name.clone())]), -} - } else { - Rc::new(vec![inference_error("empty list literal: expected type is not a collection".to_string(), span.clone(), scope.module_name.clone())]) - }, - None => Rc::new(vec![]), -} - } else { - Rc::new(vec![]) - }; -let list_k = list_kernel_ty_from_element(elem_type_node.clone()); -let ll_texpr = make_expr_node(Rc::new(ExprData::ExprListLit), typed_elements, Some(Rc::new(InferredNode::Resolved { - node: list_k.ty.clone(), -})), span.clone()); -Rc::new(InferResult { - typed: ll_texpr, - diagnostics: v2_rt::concat(v2_rt::concat(elem_diags, empty_list_diags), list_k.miss_diags.clone()), -}) -}, - ExprData::ExprBinOp { op, .. } => { - let span = texpr.span.clone(); -let left_expr = binop_left(texpr.clone()); -let right_expr = binop_right(texpr.clone()); -let left_result = infer_expr(&left_expr, &scope, &None); -let left_typed = left_result.typed.clone(); -let left_diags = left_result.diagnostics.clone(); -let right_result = infer_expr(&right_expr, &scope, &None); -let right_typed = right_result.typed.clone(); -let right_diags = right_result.diagnostics.clone(); -let binop_info = infer_binop_type_node(&op, &resolved_type(left_typed.clone()), scope.type_env.clone().source_indices.clone()); -let bo_texpr = make_expr_node(Rc::new(ExprData::ExprBinOp { - op: op.clone(), - algebra_field: binop_info.algebra_field.clone(), -}), Rc::new(vec![left_typed.clone(), right_typed]), Some(Rc::new(InferredNode::Resolved { - node: binop_info.result_type.clone(), -})), span.clone()); -Rc::new(InferResult { - typed: bo_texpr, - diagnostics: v2_rt::concat(left_diags, right_diags), -}) -}, - ExprData::ExprUnaryOp { op, .. } => { - let span = texpr.span.clone(); -let operand_expr = unaryop_operand(texpr.clone()); -let operand_result = infer_expr(&operand_expr, &scope, &None); -let operand_typed = operand_result.typed.clone(); -let operand_diags = operand_result.diagnostics.clone(); -let result_type = match op.clone() { - UnaryOpKind::Not => bool_type(), - UnaryOpKind::Neg => resolved_type(operand_typed.clone()), -}; -let uo_texpr = make_expr_node(Rc::new(ExprData::ExprUnaryOp { - op: op.clone(), -}), Rc::new(vec![operand_typed.clone()]), Some(Rc::new(InferredNode::Resolved { - node: result_type, -})), span.clone()); -Rc::new(InferResult { - typed: uo_texpr, - diagnostics: operand_diags, -}) -}, - ExprData::ExprLambda => { - let span = texpr.span.clone(); -let lam_body = lambda_body(texpr.clone()); -let lam_params = lambda_param_names_at(texpr.clone(), scope.type_env.clone().source_indices.clone()); -let lam_param_nodes = Rc::new(texpr.children.clone().iter().cloned().skip(1 as usize).collect::>()); -let elem_prov = match v2_rt::map_get(&scope.lambda_param_provenance.clone(), "elem".to_string()) { - Some(p) => p.clone(), - None => Rc::new(SubValueRelation::SubValueUnknown), -}; -let lam_scope = if (expected.clone() != None) { - { - let exp = expected.clone().unwrap(); -if ((exp.params.clone().len() as i64) > 0) { - Rc::new(lam_params.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(scope.clone(), |acc: Rc, pair: (i64, String)| { - let param_prov = if (pair.0.clone() == ((lam_params.clone().len() as i64) - 1)) { - elem_prov.clone() - } else { - Rc::new(SubValueRelation::SubValueUnknown) - }; -match exp.params.clone().get(pair.0.clone() as usize).cloned() { - Some(cp) => extend_scope(&acc, &pair.1.clone(), param_node_type_expr(&cp), param_prov.clone()), - None => extend_scope(&acc, &pair.1.clone(), type_variable_node("callable_param".to_string()), param_prov.clone()), -} -}) - } else { - if ((lam_params.clone().len() as i64) == 1) { - match lam_params.clone().first().cloned() { - Some(p) => extend_scope(&scope, &p, exp.clone(), elem_prov.clone()), - None => scope.clone(), -} + ExprData::ExprIf => { + let span = texpr.span.clone(); + let cond = if_condition(texpr.clone()); + let then_expr = if_then_branch(texpr.clone()); + let else_expr = if_else_branch(texpr.clone()); + let cond_result = infer_expr(&cond, &scope, &None); + let cond_typed = cond_result.typed.clone(); + let cond_diags = cond_result.diagnostics.clone(); + let then_result = infer_expr(&then_expr, &scope, &expected); + let then_typed = then_result.typed.clone(); + let then_diags = then_result.diagnostics.clone(); + match else_expr { + Some(else_branch) => { + let else_result = infer_expr(&else_branch, &scope, &expected); + let then_rt = resolved_type(then_result.typed.clone()); + let else_rt = resolved_type(else_result.typed.clone()); + let then_result = if (!is_fully_resolved( + &then_rt, + &scope.type_env.clone().source_indices.clone(), + ) && is_fully_resolved( + &else_rt, + &scope.type_env.clone().source_indices.clone(), + )) { + infer_expr(&then_expr, &scope, &Some(else_rt.clone())) } else { - Rc::new(lam_params.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(scope.clone(), |acc: Rc, pair: (i64, String)| { - let param_prov = if (pair.0.clone() == ((lam_params.clone().len() as i64) - 1)) { - elem_prov.clone() - } else { - Rc::new(SubValueRelation::SubValueUnknown) - }; -if (pair.0.clone() == ((lam_params.clone().len() as i64) - 1)) { - extend_scope(&acc, &pair.1.clone(), exp.clone(), param_prov.clone()) - } else { - extend_scope(&acc, &pair.1.clone(), type_variable_node("lambda_param".to_string()), param_prov.clone()) - } -}) - } + then_result.clone() + }; + let else_result = if (!is_fully_resolved( + &else_rt, + &scope.type_env.clone().source_indices.clone(), + ) && is_fully_resolved( + &then_rt, + &scope.type_env.clone().source_indices.clone(), + )) { + infer_expr(&else_branch, &scope, &Some(then_rt.clone())) + } else { + else_result.clone() + }; + let then_typed = then_result.typed.clone(); + let then_diags = then_result.diagnostics.clone(); + let else_typed = else_result.typed.clone(); + let else_diags = else_result.diagnostics.clone(); + let then_rt = resolved_type(then_typed.clone()); + let else_rt = resolved_type(else_typed.clone()); + let unified = prefer_specific_type( + then_rt.clone(), + else_rt.clone(), + &scope.type_env.clone().source_indices.clone(), + ); + let branch_diags = if node_type_compatible( + then_rt.clone(), + else_rt.clone(), + scope.type_env.clone().source_indices.clone(), + ) { + Rc::new(vec![]) + } else { + Rc::new(vec![inference_error( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "if branches resolve to incompatible types: " + .to_string(), + node_type_shape( + &then_rt, + &scope.type_env.clone().source_indices.clone(), + ), + ), + " vs ".to_string(), + ), + node_type_shape( + &else_rt, + &scope.type_env.clone().source_indices.clone(), + ), + ), + span.clone(), + scope.module_name.clone(), + )]) + }; + let if_texpr = make_expr_node( + Rc::new(ExprData::ExprIf), + Rc::new(vec![cond_typed, then_typed.clone(), else_typed.clone()]), + Some(Rc::new(InferredNode::Resolved { node: unified })), + span.clone(), + ); + Rc::new(InferResult { + typed: if_texpr, + diagnostics: v2_rt::concat( + v2_rt::concat(v2_rt::concat(cond_diags, then_diags), else_diags), + branch_diags, + ), + }) } -} - } else { - extend_scope_with_params(&scope, lam_params.clone()) - }; -let body_expected = if (expected.clone() != None) { - { - let exp = expected.clone().unwrap(); -if ((exp.params.clone().len() as i64) > 0) { - Some(callable_inferred(&exp)) - } else { - None + None => { + let if_texpr2 = make_expr_node( + Rc::new(ExprData::ExprIf), + Rc::new(vec![cond_typed, then_typed.clone()]), + Some(Rc::new(InferredNode::Resolved { node: unit_type() })), + span.clone(), + ); + Rc::new(InferResult { + typed: if_texpr2, + diagnostics: v2_rt::concat(cond_diags, then_diags), + }) } -} - } else { - None - }; -let body_scope = Rc::new(InferScope { - type_env: lam_scope.type_env.clone(), - func_env: lam_scope.func_env.clone(), - locals: lam_scope.locals.clone(), - match_bound_names: lam_scope.match_bound_names.clone(), - module_name: lam_scope.module_name.clone(), - service_registry: lam_scope.service_registry.clone(), - item_registry: lam_scope.item_registry.clone(), - lambda_param_provenance: v2_rt::rc_empty_map::>(), -}); -let body_result = infer_expr(&lam_body, &body_scope, &body_expected); -let body_typed = body_result.typed.clone(); -let body_diags = body_result.diagnostics.clone(); -let typed_param_nodes = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(lam_param_nodes.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ - let pn = pair.1.clone(); -let param_name = match lam_params.clone().get(pair.0.clone() as usize).cloned() { - Some(n) => n.clone(), - None => "".to_string(), -}; -let param_type = match v2_rt::map_get(&lam_scope.locals.clone(), param_name.clone()) { - Some(binding) => Some(Rc::new(InferredNode::Resolved { - node: binding.resolved.clone(), -})), - None => None, -}; -Rc::new(Node { - name: pn.name.clone(), - ident: pn.ident.clone(), - span: pn.span.clone(), - ident_span: pn.ident_span.clone(), - children: pn.children.clone(), - connective: pn.connective.clone(), - params: pn.params.clone(), - inferred: param_type.clone(), - return_cardinality: pn.return_cardinality.clone(), - uses: pn.uses.clone(), - body: pn.body.clone(), - transport: pn.transport.clone(), - properties: pn.properties.clone(), - type_annotation: pn.type_annotation.clone(), - is_self_recursive: pn.is_self_recursive.clone(), - has_non_tail_self_call: pn.has_non_tail_self_call.clone(), - match_pattern: pn.match_pattern.clone(), - expr_data: pn.expr_data.clone(), -}) -}); } __result }); -let lam_texpr = make_expr_node(Rc::new(ExprData::ExprLambda), v2_rt::concat(Rc::new(vec![body_typed.clone()]), typed_param_nodes), body_typed.inferred.clone(), span.clone()); -Rc::new(InferResult { - typed: lam_texpr, - diagnostics: body_diags.clone(), -}) -}, - ExprData::ExprStringInterp => { - let span = texpr.span.clone(); -let typed_part_nodes = Rc::new({ let mut __result = Vec::new(); for part_node in texpr.children.clone().iter().cloned() { __result.push(match (*part_node.expr_data.clone()).clone() { - ExprData::ExprLiteral { .. } => part_node.clone(), - _ => match part_node.children.clone().first().cloned() { - Some(inner) => { - let r = infer_expr(&inner, &scope, &None); -make_interp_part_node(r.typed.clone(), part_node.span.clone()) -}, - None => part_node.clone(), -}, -}); } __result }); -let interp_diags = Rc::new({ let mut __result = Vec::new(); for part_node in texpr.children.clone().iter().cloned() { __result.extend((*match (*part_node.expr_data.clone()).clone() { - ExprData::ExprLiteral { .. } => Rc::new(vec![]), - _ => match part_node.children.clone().first().cloned() { - Some(inner) => { - let r = infer_expr(&inner, &scope, &None); -r.diagnostics.clone() -}, - None => Rc::new(vec![]), -}, -}).iter().cloned()); } __result }); -let si_texpr = make_expr_node(Rc::new(ExprData::ExprStringInterp), typed_part_nodes, Some(Rc::new(InferredNode::Resolved { - node: string_type(), -})), span.clone()); -Rc::new(InferResult { - typed: si_texpr, - diagnostics: interp_diags, -}) -}, - ExprData::ExprBlock => { - let span = texpr.span.clone(); -let stmts = texpr.children.clone(); -if ((stmts.clone().len() as i64) > 0) { - { - let state = infer_block_stmts(stmts.clone(), (stmts.clone().len() as i64), scope.clone(), Rc::new(vec![]), Rc::new(vec![]), unit_type(), expected.clone()); -let blk_texpr = make_expr_node(Rc::new(ExprData::ExprBlock), state.typed_stmts.clone(), Some(Rc::new(InferredNode::Resolved { - node: state.last_type.clone(), -})), span.clone()); -Rc::new(InferResult { - typed: blk_texpr, - diagnostics: Rc::new({ let mut __result = Vec::new(); for c in state.diag_chunks.clone().iter().cloned() { __result.extend((*c.clone()).iter().cloned()); } __result }), -}) -} - } else { - ok_infer(make_expr_node(Rc::new(ExprData::ExprBlock), Rc::new(vec![]), Some(Rc::new(InferredNode::Resolved { - node: unit_type(), -})), span.clone())) + } } -}, - ExprData::ExprCast => { - let span = texpr.span.clone(); -let cast_inner = cast_expr(texpr.clone()); -let target_type = cast_target(texpr.clone()); -let inner_result = infer_expr(&cast_inner, &scope, &None); -let inner_typed = inner_result.typed.clone(); -let inner_diags = inner_result.diagnostics.clone(); -let si = scope.type_env.clone().source_indices.clone(); -let target_name = authored_name_at(si.clone(), &target_type); -let cast_diag = validate_cast(inner_typed.inferred.clone(), &target_name, span.clone(), si.clone(), scope.module_name.clone()); -let cast_diags = match cast_diag { - Some(d) => Rc::new(vec![d.clone()]), - None => Rc::new(vec![]), -}; -let cast_texpr = make_expr_node(Rc::new(ExprData::ExprCast), Rc::new(vec![inner_typed.clone(), target_type.clone()]), Some(Rc::new(InferredNode::Resolved { - node: target_type.clone(), -})), span.clone()); -Rc::new(InferResult { - typed: cast_texpr, - diagnostics: v2_rt::concat(inner_diags, cast_diags), -}) -}, - ExprData::ExprForEach => { - let variable = foreach_variable_at(texpr.clone(), scope.type_env.clone().source_indices.clone()); -let span = texpr.span.clone(); -let coll = foreach_collection(texpr.clone()); -let body_expr = foreach_body(texpr.clone()); -let coll_result = infer_expr(&coll, &scope, &None); -let coll_typed = coll_result.typed.clone(); -let coll_diags = coll_result.diagnostics.clone(); -let elem_type_node = for_each_element_type_node(resolved_type(coll_typed.clone()), scope.type_env.clone().source_indices.clone()); -let elem_provenance = derive_element_provenance(coll_typed.clone(), &elem_type_node, &scope); -let body_scope = extend_scope(&scope, &variable, elem_type_node.clone(), elem_provenance); -let body_result = infer_expr(&body_expr, &body_scope, &None); -let body_typed = body_result.typed.clone(); -let body_diags = body_result.diagnostics.clone(); -let fe_texpr = make_named_expr_node(&variable, Rc::new(ExprData::ExprForEach), Rc::new(vec![coll_typed.clone(), body_typed.clone()]), body_typed.inferred.clone(), span.clone(), node_name_span(&texpr)); -Rc::new(InferResult { - typed: fe_texpr, - diagnostics: v2_rt::concat(coll_diags, body_diags.clone()), -}) -}, - ExprData::ExprIndex => { - let span = texpr.span.clone(); -let base_expr = index_base(texpr.clone()); -let idx_key = index_expr(texpr.clone()); -let base_result = infer_expr(&base_expr, &scope, &None); -let base_typed = base_result.typed.clone(); -let base_diags = base_result.diagnostics.clone(); -let index_result = infer_expr(&idx_key, &scope, &None); -let index_typed = index_result.typed.clone(); -let index_diags = index_result.diagnostics.clone(); -let index_check = match base_typed.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: base_type, .. }) => match index_typed.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: index_type, .. }) => Some(check_index_access_node(base_type.clone(), index_type.clone(), &span, scope.module_name.clone(), &scope.type_env.clone().source_indices.clone())), - _ => None, -}, - _ => None, -}; -let access_failure_inferred = match base_typed.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { .. }) => index_typed.inferred.clone(), - _ => base_typed.inferred.clone(), -}; -let idx_inferred = match index_check.clone() { - Some(checked) => checked.inferred.clone(), - None => Some(inferred_or_error(access_failure_inferred, "invalid index access".to_string(), span.clone())), -}; -let index_access_diags = match index_check.clone() { - Some(checked) => checked.diagnostics.clone(), - None => Rc::new(vec![]), -}; -let idx_texpr = make_expr_node(Rc::new(ExprData::ExprIndex), Rc::new(vec![base_typed.clone(), index_typed.clone()]), idx_inferred, span.clone()); -Rc::new(InferResult { - typed: idx_texpr, - diagnostics: v2_rt::concat(v2_rt::concat(base_diags, index_diags), index_access_diags), -}) -}, - ExprData::ExprSlice => { - let span = texpr.span.clone(); -let base_expr = slice_base(texpr.clone()); -let start_expr = slice_start(texpr.clone()); -let end_expr = slice_end(texpr.clone()); -let base_result = infer_expr(&base_expr, &scope, &None); -let base_typed = base_result.typed.clone(); -let base_diags = base_result.diagnostics.clone(); -let start_result = infer_expr(&start_expr, &scope, &None); -let start_typed = start_result.typed.clone(); -let start_diags = start_result.diagnostics.clone(); -let end_result = infer_expr(&end_expr, &scope, &None); -let end_typed = end_result.typed.clone(); -let end_diags = end_result.diagnostics.clone(); -let slice_check = match base_typed.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: base_type, .. }) => match start_typed.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: start_type, .. }) => match end_typed.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: end_type, .. }) => Some(check_slice_access_node(base_type.clone(), start_type.clone(), end_type.clone(), &span, &scope.module_name.clone(), &scope.type_env.clone().source_indices.clone())), - _ => None, -}, - _ => None, -}, - _ => None, -}; -let access_failure_inferred = match base_typed.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { .. }) => match start_typed.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { .. }) => end_typed.inferred.clone(), - _ => start_typed.inferred.clone(), -}, - _ => base_typed.inferred.clone(), -}; -let slc_inferred = match slice_check.clone() { - Some(checked) => checked.inferred.clone(), - None => Some(inferred_or_error(access_failure_inferred, "invalid slice access".to_string(), span.clone())), -}; -let slice_access_diags = match slice_check.clone() { - Some(checked) => checked.diagnostics.clone(), - None => Rc::new(vec![]), -}; -let slc_texpr = make_expr_node(Rc::new(ExprData::ExprSlice), Rc::new(vec![base_typed.clone(), start_typed.clone(), end_typed.clone()]), slc_inferred, span.clone()); -Rc::new(InferResult { - typed: slc_texpr, - diagnostics: v2_rt::concat(v2_rt::concat(v2_rt::concat(base_diags, start_diags), end_diags), slice_access_diags), -}) -}, - ExprData::ExprReturn => { - let span = texpr.span.clone(); -let inner_expr = return_value(texpr.clone()); -let inner_result = infer_expr(&inner_expr, &scope, &expected); -let ret_texpr = make_expr_node(Rc::new(ExprData::ExprReturn), Rc::new(vec![inner_result.typed.clone()]), inner_result.typed.clone().inferred.clone(), span.clone()); -Rc::new(InferResult { - typed: ret_texpr, - diagnostics: inner_result.diagnostics.clone(), -}) -}, - _ => { - let span = texpr.span.clone(); -Rc::new(InferResult { - typed: make_expr_error_node(ExprErrorKind::InternalExprError, &"unhandled expression variant in infer_expr".to_string(), &span), - diagnostics: Rc::new(vec![inference_error("unhandled expression variant in infer_expr".to_string(), span.clone(), scope.module_name.clone())]), -}) -}, -} - }) -} - -pub fn infer_record_lit(type_name: &Option, field_inits: Rc>>, span: &Rc, name_span: Rc, scope: &Rc) -> Rc { - { - let struct_fields = record_lit_expected_fields(type_name.clone(), &scope); -let fi_infer_results = Rc::new({ let mut __result = Vec::new(); for fi in field_inits.iter().cloned() { __result.push({ - let fi_name = field_init_node_name_at(fi.clone(), scope.type_env.clone().source_indices.clone()); -let field_expected = match Rc::new({ let mut __result = Vec::new(); for sf in struct_fields.clone().iter().cloned() { if (authored_name_at(scope.type_env.clone().source_indices.clone(), &sf).as_str() == fi_name.clone().as_str()) { __result.push(sf); } } __result }).first().cloned() { - Some(sf) => { - let ft = resolved_type(sf.clone()); -if (ft.ident_span.clone() != None) { - Some(ft.clone()) + ExprData::ExprLet => { + let let_name = let_binding_name_at( + texpr.clone(), + scope.type_env.clone().source_indices.clone(), + ); + let span = texpr.span.clone(); + let val_expr = let_value(texpr.clone()); + let body_expr = let_body(texpr.clone()); + let is_tail_return = match body_expr.clone() { + Some(bd) => match (*bd.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + (authored_name_at(scope.type_env.clone().source_indices.clone(), &bd) + .as_str() + == let_name.clone().as_str()) + } + _ => false, + }, + None => false, + }; + let val_expected = if is_tail_return { + expected.clone() } else { None - } -}, - None => None, -}; -let ar = infer_expr(&field_init_node_value(&fi), &scope, &field_expected); -let ar_typed = ar.typed.clone(); -let ar_diags = ar.diagnostics.clone(); -let field_type_diags = match field_expected.clone() { - Some(expected_node) => { - let got_node = resolved_type(ar_typed.clone()); -if rejects_string_for_optional_coproduct_field(&expected_node, got_node.clone(), scope.type_env.clone().source_indices.clone()) { - Rc::new(vec![type_mismatch_error(node_type_shape(&expected_node, &scope.type_env.clone().source_indices.clone()), node_type_shape(&got_node, &scope.type_env.clone().source_indices.clone()), ar_typed.span.clone(), scope.module_name.clone())]) + }; + let val_result = infer_expr(&val_expr, &scope, &val_expected); + let val_typed = val_result.typed.clone(); + let val_diags = val_result.diagnostics.clone(); + let val_type = resolved_type(val_typed.clone()); + if (body_expr.clone() == None) { + { + let let_texpr = make_named_expr_node( + &let_name, + Rc::new(ExprData::ExprLet), + Rc::new(vec![val_typed.clone()]), + Some(Rc::new(InferredNode::Resolved { node: val_type })), + span.clone(), + node_name_span(&texpr), + ); + Rc::new(InferResult { + typed: let_texpr, + diagnostics: val_diags, + }) + } } else { - Rc::new(vec![]) - } -}, - None => Rc::new(vec![]), -}; -Rc::new(FieldInferResult { - typed_field: make_field_init_node(&fi_name, ar_typed.clone(), fi.span.clone(), node_name_span(&fi)), - infer_result: ar.clone(), - diagnostics: v2_rt::concat(ar_diags.clone(), field_type_diags.clone()), -}) -}); } __result }); -let typed_fields = Rc::new({ let mut __result = Vec::new(); for fir in fi_infer_results.clone().iter().cloned() { __result.push(fir.typed_field.clone()); } __result }); -let fi_diags = Rc::new({ let mut __result = Vec::new(); for fir in fi_infer_results.clone().iter().cloned() { __result.extend((*fir.diagnostics.clone()).iter().cloned()); } __result }); -if (type_name.clone() == None) { - { - let child_nodes = Rc::new({ let mut __result = Vec::new(); for fir in fi_infer_results.clone().iter().cloned() { __result.push(Rc::new(Node { - name: field_init_node_name_at(fir.typed_field.clone(), scope.type_env.clone().source_indices.clone()), - span: fir.typed_field.clone().span.clone(), - ident_span: fir.typed_field.clone().ident_span.clone(), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: fir.infer_result.clone().typed.clone().inferred.clone(), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -})); } __result }); -let anon_node = Rc::new(Node { - name: "".to_string(), - span: no_span(), - ident_span: None, - children: child_nodes, - connective: Connective::Conj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let typed_field_nodes = typed_fields; -let texpr = make_expr_node(Rc::new(ExprData::ExprRecordLit { - parent_enum: None, -}), typed_field_nodes, Some(Rc::new(InferredNode::Resolved { - node: anon_node, -})), span.clone()); -Rc::new(InferResult { - typed: texpr, - diagnostics: fi_diags, -}) -} - } else { - { - let type_lookup = lookup_type_by_name(&scope.type_env.clone(), type_name.clone().unwrap()); -let local_variant_parent = lookup_variant_parent_enum(&scope, &type_name.clone().unwrap()); -let effective_lookup = match type_lookup.clone() { - Some(_) => type_lookup.clone(), - None => { - let local_lookup = lookup_in_scope(scope.locals.clone(), type_name.clone().unwrap()); -match local_lookup { - Some(local_node) => lookup_type_for(&scope.type_env.clone(), &local_node), - None => None, -} -}, -}; -let raw_resolved = match effective_lookup.clone() { - Some(tn) => tn.clone(), - None => error_type(), -}; -let expected_optional_parent = Some("Optional".to_string()); -let is_some_ctor = ((type_name.clone().unwrap().as_str() == "Some".to_string().as_str()) && (local_variant_parent.clone().as_deref() == expected_optional_parent.as_deref())); -let resolved_node = if is_some_ctor { { - let val_field = Rc::new({ let mut __result = Vec::new(); for fir in fi_infer_results.clone().iter().cloned() { if (field_init_node_name_at(fir.typed_field.clone(), scope.type_env.clone().source_indices.clone()).as_str() == "value".to_string().as_str()) { __result.push(fir); } } __result }).first().cloned(); -match val_field { - Some(val_fir) => with_optional_cardinality(&resolved_type(val_fir.infer_result.clone().typed.clone())), - None => raw_resolved, -} -} + let extended = extend_scope( + &scope, + &let_name, + val_type, + classify_binding_provenance(&val_typed, &scope), + ); + let body_result = + infer_expr(&body_expr.clone().unwrap(), &extended, &expected); + let body_typed = body_result.typed.clone(); + let body_diags = body_result.diagnostics.clone(); + let let_texpr2 = make_named_expr_node( + &let_name, + Rc::new(ExprData::ExprLet), + Rc::new(vec![val_typed.clone(), body_typed.clone()]), + body_typed.inferred.clone(), + span.clone(), + node_name_span(&texpr), + ); + Rc::new(InferResult { + typed: let_texpr2, + diagnostics: v2_rt::concat(val_diags, body_diags.clone()), + }) + } + } + } + ExprData::ExprRecordLit { .. } => { + let span = texpr.span.clone(); + let field_inits = texpr.children.clone(); + infer_record_lit( + &record_lit_type_name_at( + texpr.clone(), + scope.type_env.clone().source_indices.clone(), + ), + field_inits, + &span, + node_name_span(&texpr), + &scope, + ) + } + ExprData::ExprListLit => { + let span = texpr.span.clone(); + let elements = texpr.children.clone(); + let elem_expected = match expected.clone() { + Some(exp) => { + if node_is_element_collection( + &exp, + scope.type_env.clone().source_indices.clone(), + ) { + match exp.children.clone().first().cloned() { + Some(elem) => Some(child_type_node(&elem)), + None => None, + } + } else { + None + } + } + None => None, + }; + let elem_results = Rc::new({ + let mut __result = Vec::new(); + for e in elements.iter().cloned() { + __result.push(infer_expr(&e, &scope, &elem_expected)); + } + __result + }); + let typed_elements = Rc::new({ + let mut __result = Vec::new(); + for r in elem_results.clone().iter().cloned() { + __result.push(r.typed.clone()); + } + __result + }); + let elem_diags = Rc::new({ + let mut __result = Vec::new(); + for r in elem_results.clone().iter().cloned() { + __result.extend((*r.diagnostics.clone()).iter().cloned()); + } + __result + }); + let elem_type_node = if ((elem_results.clone().len() as i64) > 0) { + match elem_results.clone().first().cloned() { + Some(r) => resolved_type(r.typed.clone()), + None => unit_type(), + } } else { - raw_resolved + match expected.clone() { + Some(exp) => { + if node_is_element_collection( + &exp, + scope.type_env.clone().source_indices.clone(), + ) { + match exp.children.clone().first().cloned() { + Some(elem) => child_type_node(&elem), + None => unit_type(), + } + } else { + unit_type() + } + } + None => unit_type(), + } }; -let type_diags = match effective_lookup.clone() { - Some(_) => Rc::new(vec![]), - None => Rc::new(vec![inference_error(v2_rt::concat(v2_rt::concat("type '".to_string(), type_name.clone().unwrap()), "' not found in scope".to_string()), span.clone(), scope.module_name.clone())]), -}; -let typed_field_nodes2 = typed_fields; -let rl_name = match type_name.clone() { - Some(tn_val) => tn_val.clone(), - None => "".to_string(), -}; -let texpr = make_named_expr_node(&rl_name, Rc::new(ExprData::ExprRecordLit { - parent_enum: local_variant_parent.clone(), -}), typed_field_nodes2, Some(Rc::new(InferredNode::Resolved { - node: resolved_node, -})), span.clone(), name_span); -Rc::new(InferResult { - typed: texpr, - diagnostics: v2_rt::concat(fi_diags, type_diags), -}) -} + let empty_list_diags = if ((elem_results.clone().len() as i64) == 0) { + match expected.clone() { + Some(exp) => { + if node_is_element_collection( + &exp, + scope.type_env.clone().source_indices.clone(), + ) { + match exp.children.clone().first().cloned() { + Some(_) => Rc::new(vec![]), + None => Rc::new(vec![inference_error( + "empty list literal: expected type has no element type" + .to_string(), + span.clone(), + scope.module_name.clone(), + )]), + } + } else { + Rc::new(vec![inference_error( + "empty list literal: expected type is not a collection" + .to_string(), + span.clone(), + scope.module_name.clone(), + )]) + } + } + None => Rc::new(vec![]), + } + } else { + Rc::new(vec![]) + }; + let list_k = list_kernel_ty_from_element(elem_type_node.clone()); + let ll_texpr = make_expr_node( + Rc::new(ExprData::ExprListLit), + typed_elements, + Some(Rc::new(InferredNode::Resolved { + node: list_k.ty.clone(), + })), + span.clone(), + ); + Rc::new(InferResult { + typed: ll_texpr, + diagnostics: v2_rt::concat( + v2_rt::concat(elem_diags, empty_list_diags), + list_k.miss_diags.clone(), + ), + }) + } + ExprData::ExprBinOp { op, .. } => { + let span = texpr.span.clone(); + let left_expr = binop_left(texpr.clone()); + let right_expr = binop_right(texpr.clone()); + let left_result = infer_expr(&left_expr, &scope, &None); + let left_typed = left_result.typed.clone(); + let left_diags = left_result.diagnostics.clone(); + let right_result = infer_expr(&right_expr, &scope, &None); + let right_typed = right_result.typed.clone(); + let right_diags = right_result.diagnostics.clone(); + let binop_info = infer_binop_type_node( + &op, + &resolved_type(left_typed.clone()), + scope.type_env.clone().source_indices.clone(), + ); + let bo_texpr = make_expr_node( + Rc::new(ExprData::ExprBinOp { + op: op.clone(), + algebra_field: binop_info.algebra_field.clone(), + }), + Rc::new(vec![left_typed.clone(), right_typed]), + Some(Rc::new(InferredNode::Resolved { + node: binop_info.result_type.clone(), + })), + span.clone(), + ); + Rc::new(InferResult { + typed: bo_texpr, + diagnostics: v2_rt::concat(left_diags, right_diags), + }) + } + ExprData::ExprUnaryOp { op, .. } => { + let span = texpr.span.clone(); + let operand_expr = unaryop_operand(texpr.clone()); + let operand_result = infer_expr(&operand_expr, &scope, &None); + let operand_typed = operand_result.typed.clone(); + let operand_diags = operand_result.diagnostics.clone(); + let result_type = match op.clone() { + UnaryOpKind::Not => bool_type(), + UnaryOpKind::Neg => resolved_type(operand_typed.clone()), + }; + let uo_texpr = make_expr_node( + Rc::new(ExprData::ExprUnaryOp { op: op.clone() }), + Rc::new(vec![operand_typed.clone()]), + Some(Rc::new(InferredNode::Resolved { node: result_type })), + span.clone(), + ); + Rc::new(InferResult { + typed: uo_texpr, + diagnostics: operand_diags, + }) + } + ExprData::ExprLambda => { + let span = texpr.span.clone(); + let lam_body = lambda_body(texpr.clone()); + let lam_params = lambda_param_names_at( + texpr.clone(), + scope.type_env.clone().source_indices.clone(), + ); + let lam_param_nodes = Rc::new( + texpr + .children + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + let elem_prov = match v2_rt::map_get( + &scope.lambda_param_provenance.clone(), + "elem".to_string(), + ) { + Some(p) => p.clone(), + None => Rc::new(SubValueRelation::SubValueUnknown), + }; + let lam_scope = if (expected.clone() != None) { + { + let exp = expected.clone().unwrap(); + if ((exp.params.clone().len() as i64) > 0) { + Rc::new( + lam_params + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + .fold( + scope.clone(), + |acc: Rc, pair: (i64, String)| { + let param_prov = if (pair.0.clone() + == ((lam_params.clone().len() as i64) - 1)) + { + elem_prov.clone() + } else { + Rc::new(SubValueRelation::SubValueUnknown) + }; + match exp.params.clone().get(pair.0.clone() as usize).cloned() { + Some(cp) => extend_scope( + &acc, + &pair.1.clone(), + param_node_type_expr(&cp), + param_prov.clone(), + ), + None => extend_scope( + &acc, + &pair.1.clone(), + type_variable_node("callable_param".to_string()), + param_prov.clone(), + ), + } + }, + ) + } else { + if ((lam_params.clone().len() as i64) == 1) { + match lam_params.clone().first().cloned() { + Some(p) => { + extend_scope(&scope, &p, exp.clone(), elem_prov.clone()) + } + None => scope.clone(), + } + } else { + Rc::new( + lam_params + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + .fold( + scope.clone(), + |acc: Rc, pair: (i64, String)| { + let param_prov = if (pair.0.clone() + == ((lam_params.clone().len() as i64) - 1)) + { + elem_prov.clone() + } else { + Rc::new(SubValueRelation::SubValueUnknown) + }; + if (pair.0.clone() + == ((lam_params.clone().len() as i64) - 1)) + { + extend_scope( + &acc, + &pair.1.clone(), + exp.clone(), + param_prov.clone(), + ) + } else { + extend_scope( + &acc, + &pair.1.clone(), + type_variable_node("lambda_param".to_string()), + param_prov.clone(), + ) + } + }, + ) + } + } + } + } else { + extend_scope_with_params(&scope, lam_params.clone()) + }; + let body_expected = if (expected.clone() != None) { + { + let exp = expected.clone().unwrap(); + if ((exp.params.clone().len() as i64) > 0) { + Some(callable_inferred(&exp)) + } else { + None + } + } + } else { + None + }; + let body_scope = Rc::new(InferScope { + type_env: lam_scope.type_env.clone(), + func_env: lam_scope.func_env.clone(), + locals: lam_scope.locals.clone(), + match_bound_names: lam_scope.match_bound_names.clone(), + module_name: lam_scope.module_name.clone(), + service_registry: lam_scope.service_registry.clone(), + item_registry: lam_scope.item_registry.clone(), + lambda_param_provenance: v2_rt::rc_empty_map::>(), + }); + let body_result = infer_expr(&lam_body, &body_scope, &body_expected); + let body_typed = body_result.typed.clone(); + let body_diags = body_result.diagnostics.clone(); + let typed_param_nodes = Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + lam_param_nodes + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + __result.push({ + let pn = pair.1.clone(); + let param_name = + match lam_params.clone().get(pair.0.clone() as usize).cloned() { + Some(n) => n.clone(), + None => "".to_string(), + }; + let param_type = + match v2_rt::map_get(&lam_scope.locals.clone(), param_name.clone()) + { + Some(binding) => Some(Rc::new(InferredNode::Resolved { + node: binding.resolved.clone(), + })), + None => None, + }; + Rc::new(Node { + name: pn.name.clone(), + ident: pn.ident.clone(), + span: pn.span.clone(), + ident_span: pn.ident_span.clone(), + children: pn.children.clone(), + connective: pn.connective.clone(), + params: pn.params.clone(), + inferred: param_type.clone(), + return_cardinality: pn.return_cardinality.clone(), + uses: pn.uses.clone(), + body: pn.body.clone(), + transport: pn.transport.clone(), + properties: pn.properties.clone(), + type_annotation: pn.type_annotation.clone(), + is_self_recursive: pn.is_self_recursive.clone(), + has_non_tail_self_call: pn.has_non_tail_self_call.clone(), + match_pattern: pn.match_pattern.clone(), + expr_data: pn.expr_data.clone(), + }) + }); + } + __result + }); + let lam_texpr = make_expr_node( + Rc::new(ExprData::ExprLambda), + v2_rt::concat(Rc::new(vec![body_typed.clone()]), typed_param_nodes), + body_typed.inferred.clone(), + span.clone(), + ); + Rc::new(InferResult { + typed: lam_texpr, + diagnostics: body_diags.clone(), + }) + } + ExprData::ExprStringInterp => { + let span = texpr.span.clone(); + let typed_part_nodes = Rc::new({ + let mut __result = Vec::new(); + for part_node in texpr.children.clone().iter().cloned() { + __result.push(match (*part_node.expr_data.clone()).clone() { + ExprData::ExprLiteral { .. } => part_node.clone(), + _ => match part_node.children.clone().first().cloned() { + Some(inner) => { + let r = infer_expr(&inner, &scope, &None); + make_interp_part_node(r.typed.clone(), part_node.span.clone()) + } + None => part_node.clone(), + }, + }); + } + __result + }); + let interp_diags = Rc::new({ + let mut __result = Vec::new(); + for part_node in texpr.children.clone().iter().cloned() { + __result.extend( + (*match (*part_node.expr_data.clone()).clone() { + ExprData::ExprLiteral { .. } => Rc::new(vec![]), + _ => match part_node.children.clone().first().cloned() { + Some(inner) => { + let r = infer_expr(&inner, &scope, &None); + r.diagnostics.clone() + } + None => Rc::new(vec![]), + }, + }) + .iter() + .cloned(), + ); + } + __result + }); + let si_texpr = make_expr_node( + Rc::new(ExprData::ExprStringInterp), + typed_part_nodes, + Some(Rc::new(InferredNode::Resolved { + node: string_type(), + })), + span.clone(), + ); + Rc::new(InferResult { + typed: si_texpr, + diagnostics: interp_diags, + }) + } + ExprData::ExprBlock => { + let span = texpr.span.clone(); + let stmts = texpr.children.clone(); + if ((stmts.clone().len() as i64) > 0) { + { + let state = infer_block_stmts( + stmts.clone(), + (stmts.clone().len() as i64), + scope.clone(), + Rc::new(vec![]), + Rc::new(vec![]), + unit_type(), + expected.clone(), + ); + let blk_texpr = make_expr_node( + Rc::new(ExprData::ExprBlock), + state.typed_stmts.clone(), + Some(Rc::new(InferredNode::Resolved { + node: state.last_type.clone(), + })), + span.clone(), + ); + Rc::new(InferResult { + typed: blk_texpr, + diagnostics: Rc::new({ + let mut __result = Vec::new(); + for c in state.diag_chunks.clone().iter().cloned() { + __result.extend((*c.clone()).iter().cloned()); + } + __result + }), + }) + } + } else { + ok_infer(make_expr_node( + Rc::new(ExprData::ExprBlock), + Rc::new(vec![]), + Some(Rc::new(InferredNode::Resolved { node: unit_type() })), + span.clone(), + )) + } + } + ExprData::ExprCast => { + let span = texpr.span.clone(); + let cast_inner = cast_expr(texpr.clone()); + let target_type = cast_target(texpr.clone()); + let inner_result = infer_expr(&cast_inner, &scope, &None); + let inner_typed = inner_result.typed.clone(); + let inner_diags = inner_result.diagnostics.clone(); + let si = scope.type_env.clone().source_indices.clone(); + let target_name = authored_name_at(si.clone(), &target_type); + let cast_diag = validate_cast( + inner_typed.inferred.clone(), + &target_name, + span.clone(), + si.clone(), + scope.module_name.clone(), + ); + let cast_diags = match cast_diag { + Some(d) => Rc::new(vec![d.clone()]), + None => Rc::new(vec![]), + }; + let cast_texpr = make_expr_node( + Rc::new(ExprData::ExprCast), + Rc::new(vec![inner_typed.clone(), target_type.clone()]), + Some(Rc::new(InferredNode::Resolved { + node: target_type.clone(), + })), + span.clone(), + ); + Rc::new(InferResult { + typed: cast_texpr, + diagnostics: v2_rt::concat(inner_diags, cast_diags), + }) + } + ExprData::ExprForEach => { + let variable = foreach_variable_at( + texpr.clone(), + scope.type_env.clone().source_indices.clone(), + ); + let span = texpr.span.clone(); + let coll = foreach_collection(texpr.clone()); + let body_expr = foreach_body(texpr.clone()); + let coll_result = infer_expr(&coll, &scope, &None); + let coll_typed = coll_result.typed.clone(); + let coll_diags = coll_result.diagnostics.clone(); + let elem_type_node = for_each_element_type_node( + resolved_type(coll_typed.clone()), + scope.type_env.clone().source_indices.clone(), + ); + let elem_provenance = + derive_element_provenance(coll_typed.clone(), &elem_type_node, &scope); + let body_scope = + extend_scope(&scope, &variable, elem_type_node.clone(), elem_provenance); + let body_result = infer_expr(&body_expr, &body_scope, &None); + let body_typed = body_result.typed.clone(); + let body_diags = body_result.diagnostics.clone(); + let fe_texpr = make_named_expr_node( + &variable, + Rc::new(ExprData::ExprForEach), + Rc::new(vec![coll_typed.clone(), body_typed.clone()]), + body_typed.inferred.clone(), + span.clone(), + node_name_span(&texpr), + ); + Rc::new(InferResult { + typed: fe_texpr, + diagnostics: v2_rt::concat(coll_diags, body_diags.clone()), + }) + } + ExprData::ExprIndex => { + let span = texpr.span.clone(); + let base_expr = index_base(texpr.clone()); + let idx_key = index_expr(texpr.clone()); + let base_result = infer_expr(&base_expr, &scope, &None); + let base_typed = base_result.typed.clone(); + let base_diags = base_result.diagnostics.clone(); + let index_result = infer_expr(&idx_key, &scope, &None); + let index_typed = index_result.typed.clone(); + let index_diags = index_result.diagnostics.clone(); + let index_check = match base_typed.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { + node: base_type, .. + }) => match index_typed.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { + node: index_type, .. + }) => Some(check_index_access_node( + base_type.clone(), + index_type.clone(), + &span, + scope.module_name.clone(), + &scope.type_env.clone().source_indices.clone(), + )), + _ => None, + }, + _ => None, + }; + let access_failure_inferred = match base_typed.inferred.clone().as_deref().cloned() + { + Some(InferredNode::Resolved { .. }) => index_typed.inferred.clone(), + _ => base_typed.inferred.clone(), + }; + let idx_inferred = match index_check.clone() { + Some(checked) => checked.inferred.clone(), + None => Some(inferred_or_error( + access_failure_inferred, + "invalid index access".to_string(), + span.clone(), + )), + }; + let index_access_diags = match index_check.clone() { + Some(checked) => checked.diagnostics.clone(), + None => Rc::new(vec![]), + }; + let idx_texpr = make_expr_node( + Rc::new(ExprData::ExprIndex), + Rc::new(vec![base_typed.clone(), index_typed.clone()]), + idx_inferred, + span.clone(), + ); + Rc::new(InferResult { + typed: idx_texpr, + diagnostics: v2_rt::concat( + v2_rt::concat(base_diags, index_diags), + index_access_diags, + ), + }) + } + ExprData::ExprSlice => { + let span = texpr.span.clone(); + let base_expr = slice_base(texpr.clone()); + let start_expr = slice_start(texpr.clone()); + let end_expr = slice_end(texpr.clone()); + let base_result = infer_expr(&base_expr, &scope, &None); + let base_typed = base_result.typed.clone(); + let base_diags = base_result.diagnostics.clone(); + let start_result = infer_expr(&start_expr, &scope, &None); + let start_typed = start_result.typed.clone(); + let start_diags = start_result.diagnostics.clone(); + let end_result = infer_expr(&end_expr, &scope, &None); + let end_typed = end_result.typed.clone(); + let end_diags = end_result.diagnostics.clone(); + let slice_check = match base_typed.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { + node: base_type, .. + }) => match start_typed.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { + node: start_type, .. + }) => match end_typed.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: end_type, .. }) => { + Some(check_slice_access_node( + base_type.clone(), + start_type.clone(), + end_type.clone(), + &span, + &scope.module_name.clone(), + &scope.type_env.clone().source_indices.clone(), + )) + } + _ => None, + }, + _ => None, + }, + _ => None, + }; + let access_failure_inferred = match base_typed.inferred.clone().as_deref().cloned() + { + Some(InferredNode::Resolved { .. }) => { + match start_typed.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { .. }) => end_typed.inferred.clone(), + _ => start_typed.inferred.clone(), + } + } + _ => base_typed.inferred.clone(), + }; + let slc_inferred = match slice_check.clone() { + Some(checked) => checked.inferred.clone(), + None => Some(inferred_or_error( + access_failure_inferred, + "invalid slice access".to_string(), + span.clone(), + )), + }; + let slice_access_diags = match slice_check.clone() { + Some(checked) => checked.diagnostics.clone(), + None => Rc::new(vec![]), + }; + let slc_texpr = make_expr_node( + Rc::new(ExprData::ExprSlice), + Rc::new(vec![ + base_typed.clone(), + start_typed.clone(), + end_typed.clone(), + ]), + slc_inferred, + span.clone(), + ); + Rc::new(InferResult { + typed: slc_texpr, + diagnostics: v2_rt::concat( + v2_rt::concat(v2_rt::concat(base_diags, start_diags), end_diags), + slice_access_diags, + ), + }) + } + ExprData::ExprReturn => { + let span = texpr.span.clone(); + let inner_expr = return_value(texpr.clone()); + let inner_result = infer_expr(&inner_expr, &scope, &expected); + let ret_texpr = make_expr_node( + Rc::new(ExprData::ExprReturn), + Rc::new(vec![inner_result.typed.clone()]), + inner_result.typed.clone().inferred.clone(), + span.clone(), + ); + Rc::new(InferResult { + typed: ret_texpr, + diagnostics: inner_result.diagnostics.clone(), + }) + } + _ => { + let span = texpr.span.clone(); + Rc::new(InferResult { + typed: make_expr_error_node( + ExprErrorKind::InternalExprError, + &"unhandled expression variant in infer_expr".to_string(), + &span, + ), + diagnostics: Rc::new(vec![inference_error( + "unhandled expression variant in infer_expr".to_string(), + span.clone(), + scope.module_name.clone(), + )]), + }) + } } + }) } + +pub fn infer_record_lit( + type_name: &Option, + field_inits: Rc>>, + span: &Rc, + name_span: Rc, + scope: &Rc, +) -> Rc { + { + let struct_fields = record_lit_expected_fields(type_name.clone(), &scope); + let fi_infer_results = Rc::new({ + let mut __result = Vec::new(); + for fi in field_inits.iter().cloned() { + __result.push({ + let fi_name = field_init_node_name_at( + fi.clone(), + scope.type_env.clone().source_indices.clone(), + ); + let field_expected = match Rc::new({ + let mut __result = Vec::new(); + for sf in struct_fields.clone().iter().cloned() { + if (authored_name_at( + scope.type_env.clone().source_indices.clone(), + &sf, + ) + .as_str() + == fi_name.clone().as_str()) + { + __result.push(sf); + } + } + __result + }) + .first() + .cloned() + { + Some(sf) => { + let ft = resolved_type(sf.clone()); + if (ft.ident_span.clone() != None) { + Some(ft.clone()) + } else { + None + } + } + None => None, + }; + let ar = infer_expr(&field_init_node_value(&fi), &scope, &field_expected); + let ar_typed = ar.typed.clone(); + let ar_diags = ar.diagnostics.clone(); + let field_type_diags = match field_expected.clone() { + Some(expected_node) => { + let got_node = resolved_type(ar_typed.clone()); + if rejects_string_for_optional_coproduct_field( + &expected_node, + got_node.clone(), + scope.type_env.clone().source_indices.clone(), + ) { + Rc::new(vec![type_mismatch_error( + node_type_shape( + &expected_node, + &scope.type_env.clone().source_indices.clone(), + ), + node_type_shape( + &got_node, + &scope.type_env.clone().source_indices.clone(), + ), + ar_typed.span.clone(), + scope.module_name.clone(), + )]) + } else { + Rc::new(vec![]) + } + } + None => Rc::new(vec![]), + }; + Rc::new(FieldInferResult { + typed_field: make_field_init_node( + &fi_name, + ar_typed.clone(), + fi.span.clone(), + node_name_span(&fi), + ), + infer_result: ar.clone(), + diagnostics: v2_rt::concat(ar_diags.clone(), field_type_diags.clone()), + }) + }); + } + __result + }); + let typed_fields = Rc::new({ + let mut __result = Vec::new(); + for fir in fi_infer_results.clone().iter().cloned() { + __result.push(fir.typed_field.clone()); + } + __result + }); + let fi_diags = Rc::new({ + let mut __result = Vec::new(); + for fir in fi_infer_results.clone().iter().cloned() { + __result.extend((*fir.diagnostics.clone()).iter().cloned()); + } + __result + }); + if (type_name.clone() == None) { + { + let child_nodes = Rc::new({ + let mut __result = Vec::new(); + for fir in fi_infer_results.clone().iter().cloned() { + __result.push(Rc::new(Node { + name: field_init_node_name_at( + fir.typed_field.clone(), + scope.type_env.clone().source_indices.clone(), + ), + span: fir.typed_field.clone().span.clone(), + ident_span: fir.typed_field.clone().ident_span.clone(), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: fir.infer_result.clone().typed.clone().inferred.clone(), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + })); + } + __result + }); + let anon_node = Rc::new(Node { + name: "".to_string(), + span: no_span(), + ident_span: None, + children: child_nodes, + connective: Connective::Conj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let typed_field_nodes = typed_fields; + let texpr = make_expr_node( + Rc::new(ExprData::ExprRecordLit { parent_enum: None }), + typed_field_nodes, + Some(Rc::new(InferredNode::Resolved { node: anon_node })), + span.clone(), + ); + Rc::new(InferResult { + typed: texpr, + diagnostics: fi_diags, + }) + } + } else { + { + let type_lookup = + lookup_type_by_name(&scope.type_env.clone(), type_name.clone().unwrap()); + let local_variant_parent = + lookup_variant_parent_enum(&scope, &type_name.clone().unwrap()); + let effective_lookup = match type_lookup.clone() { + Some(_) => type_lookup.clone(), + None => { + let local_lookup = + lookup_in_scope(scope.locals.clone(), type_name.clone().unwrap()); + match local_lookup { + Some(local_node) => { + lookup_type_for(&scope.type_env.clone(), &local_node) + } + None => None, + } + } + }; + let raw_resolved = match effective_lookup.clone() { + Some(tn) => tn.clone(), + None => error_type(), + }; + let expected_optional_parent = Some("Optional".to_string()); + let is_some_ctor = ((type_name.clone().unwrap().as_str() + == "Some".to_string().as_str()) + && (local_variant_parent.clone().as_deref() + == expected_optional_parent.as_deref())); + let resolved_node = if is_some_ctor { + { + let val_field = Rc::new({ + let mut __result = Vec::new(); + for fir in fi_infer_results.clone().iter().cloned() { + if (field_init_node_name_at( + fir.typed_field.clone(), + scope.type_env.clone().source_indices.clone(), + ) + .as_str() + == "value".to_string().as_str()) + { + __result.push(fir); + } + } + __result + }) + .first() + .cloned(); + match val_field { + Some(val_fir) => with_optional_cardinality(&resolved_type( + val_fir.infer_result.clone().typed.clone(), + )), + None => raw_resolved, + } + } + } else { + raw_resolved + }; + let type_diags = match effective_lookup.clone() { + Some(_) => Rc::new(vec![]), + None => Rc::new(vec![inference_error( + v2_rt::concat( + v2_rt::concat("type '".to_string(), type_name.clone().unwrap()), + "' not found in scope".to_string(), + ), + span.clone(), + scope.module_name.clone(), + )]), + }; + let typed_field_nodes2 = typed_fields; + let rl_name = match type_name.clone() { + Some(tn_val) => tn_val.clone(), + None => "".to_string(), + }; + let texpr = make_named_expr_node( + &rl_name, + Rc::new(ExprData::ExprRecordLit { + parent_enum: local_variant_parent.clone(), + }), + typed_field_nodes2, + Some(Rc::new(InferredNode::Resolved { + node: resolved_node, + })), + span.clone(), + name_span, + ); + Rc::new(InferResult { + typed: texpr, + diagnostics: v2_rt::concat(fi_diags, type_diags), + }) + } + } + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum SizeExpr { - ParamSize { - param: String, - }, - DividedSize { - param: String, - divisor: i64, - }, + ParamSize { param: String }, + DividedSize { param: String, divisor: i64 }, } impl SizeExpr { pub fn param(&self) -> String { @@ -2667,119 +4474,182 @@ pub struct DescentContext { pub fn classify_size_expr(val: &Rc, ctx: &Rc) -> Option> { match (*val.expr_data.clone()).clone() { - ExprData::ExprMethodCall { .. } => { - let mname = expr_method_name_at(val.clone(), ctx.type_env.clone().source_indices.clone()); -if (mname.as_str() == "count".to_string().as_str()) { - { - let receiver = method_receiver(val.clone()); -match (*receiver.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let rname = expr_var_name_at(receiver.clone(), ctx.type_env.clone().source_indices.clone()); -match v2_rt::map_get(&ctx.param_names.clone(), rname.clone()) { - Some(_) => Some(Rc::new(SizeExpr::ParamSize { - param: rname.clone(), -})), - None => None, -} -}, - _ => None, -} -} - } else { - None - } -}, - ExprData::ExprBinOp { .. } => { - let left = binop_left(val.clone()); -let right = binop_right(val.clone()); -match (*val.expr_data.clone()).clone() { - ExprData::ExprBinOp { op: BinOp::Div, .. } => match (*left.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let lname = expr_var_name_at(left.clone(), ctx.type_env.clone().source_indices.clone()); -match v2_rt::map_get(&ctx.size_aliases.clone(), lname).as_deref().cloned() { - Some(SizeExpr::ParamSize { param: p, .. }) => match (*right.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: d, .. } = value.as_ref() else { unreachable!() }; if (d.clone() > 0) { - Some(Rc::new(SizeExpr::DividedSize { - param: p.clone(), - divisor: d.clone(), -})) + ExprData::ExprMethodCall { .. } => { + let mname = + expr_method_name_at(val.clone(), ctx.type_env.clone().source_indices.clone()); + if (mname.as_str() == "count".to_string().as_str()) { + { + let receiver = method_receiver(val.clone()); + match (*receiver.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let rname = expr_var_name_at( + receiver.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + match v2_rt::map_get(&ctx.param_names.clone(), rname.clone()) { + Some(_) => Some(Rc::new(SizeExpr::ParamSize { + param: rname.clone(), + })), + None => None, + } + } + _ => None, + } + } } else { None - } }, - _ => None, -}, - _ => None, -} -}, - _ => None, -}, - _ => None, -} -}, - _ => None, -} + } + } + ExprData::ExprBinOp { .. } => { + let left = binop_left(val.clone()); + let right = binop_right(val.clone()); + match (*val.expr_data.clone()).clone() { + ExprData::ExprBinOp { op: BinOp::Div, .. } => match (*left.expr_data.clone()) + .clone() + { + ExprData::ExprVar { .. } => { + let lname = expr_var_name_at( + left.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + match v2_rt::map_get(&ctx.size_aliases.clone(), lname) + .as_deref() + .cloned() + { + Some(SizeExpr::ParamSize { param: p, .. }) => { + match (*right.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitInt { value: d, .. } = value.as_ref() + else { + unreachable!() + }; + if (d.clone() > 0) { + Some(Rc::new(SizeExpr::DividedSize { + param: p.clone(), + divisor: d.clone(), + })) + } else { + None + } + } + _ => None, + } + } + _ => None, + } + } + _ => None, + }, + _ => None, + } + } + _ => None, + } } -pub fn proportional_skip_alias_plus_literal(alias_expr: &Rc, lit_expr: Rc, param_name: &String, ctx: &Rc) -> Option> { +pub fn proportional_skip_alias_plus_literal( + alias_expr: &Rc, + lit_expr: Rc, + param_name: &String, + ctx: &Rc, +) -> Option> { match (*alias_expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let aname = expr_var_name_at(alias_expr.clone(), ctx.type_env.clone().source_indices.clone()); -match v2_rt::map_get(&ctx.size_aliases.clone(), aname).as_deref().cloned() { - Some(SizeExpr::DividedSize { param: p, divisor: d, .. }) => if (p.clone().as_str() == param_name.clone().as_str()) { - match (*lit_expr.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: k, .. } = value.as_ref() else { unreachable!() }; if (k.clone() > 0) { - match proportional_divisor_from_int_at_least_two(d.clone()) { - Some(div_w) => { - let synth_field = Rc::new(InductiveField { - type_name: param_name.clone(), - variant_name: "".to_string(), - field_name: "skip".to_string(), - shape: RecursionShape::ListRecursion, - element_type: param_name.clone(), -}); -Some(Rc::new(SubValueRelation::StrictSubValue { - field: synth_field, - factor: Rc::new(ShrinkFactor::ProportionalShrink { - divisor: div_w.clone(), -}), -})) -}, - None => None, -} - } else { - None - } }, - _ => None, -} - } else { - None - }, - _ => None, -} -}, - _ => None, -} + ExprData::ExprVar { .. } => { + let aname = expr_var_name_at( + alias_expr.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + match v2_rt::map_get(&ctx.size_aliases.clone(), aname) + .as_deref() + .cloned() + { + Some(SizeExpr::DividedSize { + param: p, + divisor: d, + .. + }) => { + if (p.clone().as_str() == param_name.clone().as_str()) { + match (*lit_expr.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitInt { value: k, .. } = value.as_ref() else { + unreachable!() + }; + if (k.clone() > 0) { + match proportional_divisor_from_int_at_least_two(d.clone()) { + Some(div_w) => { + let synth_field = Rc::new(InductiveField { + type_name: param_name.clone(), + variant_name: "".to_string(), + field_name: "skip".to_string(), + shape: RecursionShape::ListRecursion, + element_type: param_name.clone(), + }); + Some(Rc::new(SubValueRelation::StrictSubValue { + field: synth_field, + factor: Rc::new(ShrinkFactor::ProportionalShrink { + divisor: div_w.clone(), + }), + })) + } + None => None, + } + } else { + None + } + } + _ => None, + } + } else { + None + } + } + _ => None, + } + } + _ => None, + } } -pub fn classify_collection_shrink(arg_expr: &Rc, param_name: &String, ctx: &Rc) -> Rc { +pub fn classify_collection_shrink( + arg_expr: &Rc, + param_name: &String, + ctx: &Rc, +) -> Rc { match (*arg_expr.expr_data.clone()).clone() { - ExprData::ExprMethodCall { .. } => { - let mname = expr_method_name_at(arg_expr.clone(), ctx.type_env.clone().source_indices.clone()); -if ((mname.clone().as_str() == "take".to_string().as_str()) || (mname.clone().as_str() == "skip".to_string().as_str())) { + ExprData::ExprMethodCall { .. } => { + let mname = expr_method_name_at( + arg_expr.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + if ((mname.clone().as_str() == "take".to_string().as_str()) + || (mname.clone().as_str() == "skip".to_string().as_str())) { - let receiver = method_receiver(arg_expr.clone()); -match (*receiver.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let rname = expr_var_name_at(receiver.clone(), ctx.type_env.clone().source_indices.clone()); -if (rname.as_str() == param_name.clone().as_str()) { - { - let args = method_arg_nodes(arg_expr.clone()); -match args.first().cloned() { - Some(arg_node) => { - let arg_val = arg_value(&arg_node); -match (*arg_val.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: k, .. } = value.as_ref() else { unreachable!() }; if ((k.clone() > 0) && (mname.clone().as_str() == "skip".to_string().as_str())) { - match positive_descent_amount_from_positive_int(k.clone()) { + { + let receiver = method_receiver(arg_expr.clone()); + match (*receiver.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let rname = expr_var_name_at( + receiver.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + if (rname.as_str() == param_name.clone().as_str()) { + { + let args = method_arg_nodes(arg_expr.clone()); + match args.first().cloned() { + Some(arg_node) => { + let arg_val = arg_value(&arg_node); + match (*arg_val.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitInt { value: k, .. } = + value.as_ref() + else { + unreachable!() + }; + if ((k.clone() > 0) + && (mname.clone().as_str() + == "skip".to_string().as_str())) + { + match positive_descent_amount_from_positive_int(k.clone()) { Some(steps) => { let synth_field = Rc::new(InductiveField { type_name: param_name.clone(), @@ -2797,14 +4667,31 @@ Rc::new(SubValueRelation::StrictSubValue { }, None => Rc::new(SubValueRelation::SubValueUnknown), } - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } }, - ExprData::ExprVar { .. } => { - let aname = expr_var_name_at(arg_val.clone(), ctx.type_env.clone().source_indices.clone()); -match v2_rt::map_get(&ctx.size_aliases.clone(), aname).as_deref().cloned() { - Some(SizeExpr::DividedSize { param: p, divisor: d, .. }) => if (p.clone().as_str() == param_name.clone().as_str()) { - match proportional_divisor_from_int_at_least_two(d.clone()) { + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } + } + ExprData::ExprVar { .. } => { + let aname = expr_var_name_at( + arg_val.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + match v2_rt::map_get( + &ctx.size_aliases.clone(), + aname, + ) + .as_deref() + .cloned() + { + Some(SizeExpr::DividedSize { + param: p, + divisor: d, + .. + }) => { + if (p.clone().as_str() + == param_name.clone().as_str()) + { + match proportional_divisor_from_int_at_least_two(d.clone()) { Some(div_w) => { let synth_field = Rc::new(InductiveField { type_name: param_name.clone(), @@ -2822,50 +4709,66 @@ Rc::new(SubValueRelation::StrictSubValue { }, None => Rc::new(SubValueRelation::SubValueUnknown), } - } else { - Rc::new(SubValueRelation::SubValueUnknown) - }, - _ => Rc::new(SubValueRelation::SubValueUnknown), -} -}, - ExprData::ExprBinOp { op, .. } => match op.clone() { - BinOp::Add => if (mname.clone().as_str() == "skip".to_string().as_str()) { - { - let left = binop_left(arg_val.clone()); -let right = binop_right(arg_val.clone()); -match proportional_skip_alias_plus_literal(&left, right.clone(), ¶m_name, &ctx) { + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } + } + _ => Rc::new( + SubValueRelation::SubValueUnknown, + ), + } + } + ExprData::ExprBinOp { op, .. } => { + match op.clone() { + BinOp::Add => { + if (mname.clone().as_str() + == "skip".to_string().as_str()) + { + { + let left = + binop_left(arg_val.clone()); + let right = binop_right( + arg_val.clone(), + ); + match proportional_skip_alias_plus_literal(&left, right.clone(), ¶m_name, &ctx) { Some(rel) => rel.clone(), None => match proportional_skip_alias_plus_literal(&right, left.clone(), ¶m_name, &ctx) { Some(rel) => rel.clone(), None => Rc::new(SubValueRelation::SubValueUnknown), }, } -} - } else { - Rc::new(SubValueRelation::SubValueUnknown) - }, - BinOp::Sub => Rc::new(SubValueRelation::SubValueUnknown), - _ => Rc::new(SubValueRelation::SubValueUnknown), -}, - _ => Rc::new(SubValueRelation::SubValueUnknown), -} -}, - None => Rc::new(SubValueRelation::SubValueUnknown), -} -} - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } -}, - _ => Rc::new(SubValueRelation::SubValueUnknown), -} -} - } else { - Rc::new(SubValueRelation::SubValueUnknown) - } -}, - _ => Rc::new(SubValueRelation::SubValueUnknown), -} + } + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } + } + BinOp::Sub => Rc::new( + SubValueRelation::SubValueUnknown, + ), + _ => Rc::new( + SubValueRelation::SubValueUnknown, + ), + } + } + _ => Rc::new(SubValueRelation::SubValueUnknown), + } + } + None => Rc::new(SubValueRelation::SubValueUnknown), + } + } + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } + } + _ => Rc::new(SubValueRelation::SubValueUnknown), + } + } + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } + } + _ => Rc::new(SubValueRelation::SubValueUnknown), + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -2876,464 +4779,870 @@ pub struct BlockAnnotateAcc { pub fn method_callback_element_position(semantics: Option>) -> Option { match semantics.as_deref().cloned() { - Some(MethodSemantics::AlgebraMethodSemantics { algebra_template: at, .. }) => match at.clone() { - Some(template) => template.callback_element_position.clone(), - None => None, -}, - _ => None, -} + Some(MethodSemantics::AlgebraMethodSemantics { + algebra_template: at, + .. + }) => match at.clone() { + Some(template) => template.callback_element_position.clone(), + None => None, + }, + _ => None, + } } -pub fn maybe_insert_composed_field_relation(acc: Rc>>, fname: String, composed: Option>) -> Rc>> { +pub fn maybe_insert_composed_field_relation( + acc: Rc>>, + fname: String, + composed: Option>, +) -> Rc>> { match composed { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::SubValueUnknown => acc, - _ => v2_rt::rc_map_insert(acc, fname, rel.clone()), -}, - None => acc, -} + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::SubValueUnknown => acc, + _ => v2_rt::rc_map_insert(acc, fname, rel.clone()), + }, + None => acc, + } } -pub fn maybe_insert_output_field_relation(acc: Rc>>, idx: i64, fname: String, sig: Rc, val: Rc, ctx: Rc) -> Rc>> { +pub fn maybe_insert_output_field_relation( + acc: Rc>>, + idx: i64, + fname: String, + sig: Rc, + val: Rc, + ctx: Rc, +) -> Rc>> { { let composed = match sig.output_provenance.clone().get(idx as usize).cloned() { - Some(param_map) => classify_call_via_provenance(val, ¶m_map, ctx), - None => None, -}; -maybe_insert_composed_field_relation(acc, fname, composed) -} + Some(param_map) => classify_call_via_provenance(val, ¶m_map, ctx), + None => None, + }; + maybe_insert_composed_field_relation(acc, fname, composed) + } } -pub fn maybe_insert_match_field_relation(fp_acc: Rc>>, pname: &String, field_label: String, vname: String, scrut_rel: Option>, param_types: Rc>, type_env: Rc) -> Rc>> { +pub fn maybe_insert_match_field_relation( + fp_acc: Rc>>, + pname: &String, + field_label: String, + vname: String, + scrut_rel: Option>, + param_types: Rc>, + type_env: Rc, +) -> Rc>> { match scrut_rel { - Some(rel) => { - let lookup_type = match (*rel.clone()).clone() { - SubValueRelation::PreservedValue => match v2_rt::map_get(¶m_types, pname.clone()) { - Some(t) => t.clone(), - None => "".to_string(), -}, - SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), - SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), - _ => "".to_string(), -}; -if (lookup_type.clone().as_str() != "".to_string().as_str()) { - { - let ind_fields = inductive_fields_for(type_env, lookup_type.clone()); -let matching = Rc::new({ let mut __result = Vec::new(); for f in ind_fields.iter().cloned() { if ((f.field_name.clone().as_str() == field_label.clone().as_str()) && ((f.variant_name.clone().as_str() == vname.clone().as_str()) || (f.variant_name.clone().as_str() == "".to_string().as_str()))) { __result.push(f); } } __result }).first().cloned(); -match matching { - Some(ind_field) => v2_rt::rc_map_insert(fp_acc, pname.clone(), compose_sub_value(rel.clone(), ind_field.clone())), - None => fp_acc, -} -} - } else { - fp_acc + Some(rel) => { + let lookup_type = match (*rel.clone()).clone() { + SubValueRelation::PreservedValue => { + match v2_rt::map_get(¶m_types, pname.clone()) { + Some(t) => t.clone(), + None => "".to_string(), + } + } + SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), + SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), + _ => "".to_string(), + }; + if (lookup_type.clone().as_str() != "".to_string().as_str()) { + { + let ind_fields = inductive_fields_for(type_env, lookup_type.clone()); + let matching = Rc::new({ + let mut __result = Vec::new(); + for f in ind_fields.iter().cloned() { + if ((f.field_name.clone().as_str() == field_label.clone().as_str()) + && ((f.variant_name.clone().as_str() == vname.clone().as_str()) + || (f.variant_name.clone().as_str() + == "".to_string().as_str()))) + { + __result.push(f); + } + } + __result + }) + .first() + .cloned(); + match matching { + Some(ind_field) => v2_rt::rc_map_insert( + fp_acc, + pname.clone(), + compose_sub_value(rel.clone(), ind_field.clone()), + ), + None => fp_acc, + } + } + } else { + fp_acc + } } -}, - None => fp_acc, -} + None => fp_acc, + } } -pub fn build_per_field_for_let(val: &Rc, binding_name: String, ctx: &Rc) -> Rc>>>> { +pub fn build_per_field_for_let( + val: &Rc, + binding_name: String, + ctx: &Rc, +) -> Rc>>>> { match (*val.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let callee = expr_call_func_at(val.clone(), ctx.type_env.clone().source_indices.clone()); -match v2_rt::map_get(&ctx.func_sigs.clone(), callee) { - Some(sig) => if ((sig.output_provenance.clone().len() as i64) > 1) { - { - let return_type = sig.inferred.clone(); -let field_map = Rc::new(return_type.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, pair: (i64, Rc)| { - let idx = pair.0.clone(); -let field_node = pair.1.clone(); -let fname = authored_name_at(ctx.type_env.clone().source_indices.clone(), &field_node); -maybe_insert_output_field_relation(acc, idx.clone(), fname.clone(), sig.clone(), val.clone(), ctx.clone()) -}); -if ((Rc::new(v2_rt::map_keys(&field_map)).len() as i64) > 0) { - v2_rt::rc_map_insert(ctx.per_field_vars.clone(), binding_name, field_map.clone()) - } else { - ctx.per_field_vars.clone() + ExprData::ExprCall { .. } => { + let callee = + expr_call_func_at(val.clone(), ctx.type_env.clone().source_indices.clone()); + match v2_rt::map_get(&ctx.func_sigs.clone(), callee) { + Some(sig) => { + if ((sig.output_provenance.clone().len() as i64) > 1) { + { + let return_type = sig.inferred.clone(); + let field_map = Rc::new( + return_type + .children + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, + pair: (i64, Rc)| { + let idx = pair.0.clone(); + let field_node = pair.1.clone(); + let fname = authored_name_at( + ctx.type_env.clone().source_indices.clone(), + &field_node, + ); + maybe_insert_output_field_relation( + acc, + idx.clone(), + fname.clone(), + sig.clone(), + val.clone(), + ctx.clone(), + ) + }, + ); + if ((Rc::new(v2_rt::map_keys(&field_map)).len() as i64) > 0) { + v2_rt::rc_map_insert( + ctx.per_field_vars.clone(), + binding_name, + field_map.clone(), + ) + } else { + ctx.per_field_vars.clone() + } + } + } else { + ctx.per_field_vars.clone() + } } -} - } else { - ctx.per_field_vars.clone() - }, - None => ctx.per_field_vars.clone(), -} -}, - ExprData::ExprMethodCall { .. } => { - let callee = expr_method_name_at(val.clone(), ctx.type_env.clone().source_indices.clone()); -match v2_rt::map_get(&ctx.func_sigs.clone(), callee) { - Some(sig) => if ((sig.output_provenance.clone().len() as i64) > 1) { - { - let return_type = sig.inferred.clone(); -let field_map = Rc::new(return_type.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, pair: (i64, Rc)| { - let idx = pair.0.clone(); -let field_node = pair.1.clone(); -let fname = authored_name_at(ctx.type_env.clone().source_indices.clone(), &field_node); -maybe_insert_output_field_relation(acc, idx.clone(), fname.clone(), sig.clone(), val.clone(), ctx.clone()) -}); -if ((Rc::new(v2_rt::map_keys(&field_map)).len() as i64) > 0) { - v2_rt::rc_map_insert(ctx.per_field_vars.clone(), binding_name, field_map.clone()) - } else { - ctx.per_field_vars.clone() + None => ctx.per_field_vars.clone(), + } + } + ExprData::ExprMethodCall { .. } => { + let callee = + expr_method_name_at(val.clone(), ctx.type_env.clone().source_indices.clone()); + match v2_rt::map_get(&ctx.func_sigs.clone(), callee) { + Some(sig) => { + if ((sig.output_provenance.clone().len() as i64) > 1) { + { + let return_type = sig.inferred.clone(); + let field_map = Rc::new( + return_type + .children + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, + pair: (i64, Rc)| { + let idx = pair.0.clone(); + let field_node = pair.1.clone(); + let fname = authored_name_at( + ctx.type_env.clone().source_indices.clone(), + &field_node, + ); + maybe_insert_output_field_relation( + acc, + idx.clone(), + fname.clone(), + sig.clone(), + val.clone(), + ctx.clone(), + ) + }, + ); + if ((Rc::new(v2_rt::map_keys(&field_map)).len() as i64) > 0) { + v2_rt::rc_map_insert( + ctx.per_field_vars.clone(), + binding_name, + field_map.clone(), + ) + } else { + ctx.per_field_vars.clone() + } + } + } else { + ctx.per_field_vars.clone() + } } -} - } else { - ctx.per_field_vars.clone() - }, - None => ctx.per_field_vars.clone(), -} -}, - _ => ctx.per_field_vars.clone(), -} + None => ctx.per_field_vars.clone(), + } + } + _ => ctx.per_field_vars.clone(), + } } -pub fn resolve_collection_field(mut expr: Rc, mut ctx: Rc) -> Option> { +pub fn resolve_collection_field( + mut expr: Rc, + mut ctx: Rc, +) -> Option> { loop { match (*expr.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { let base = field_access_base(expr.clone()); -let fname = field_access_field_at(expr.clone(), ctx.type_env.clone().source_indices.clone()); -match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { let bname = expr_var_name_at(base.clone(), ctx.type_env.clone().source_indices.clone()); -let base_type = match v2_rt::map_get(&ctx.param_names.clone(), bname.clone()) { - Some(t) => t.clone(), - None => match v2_rt::map_get(&ctx.sub_value_vars.clone(), bname.clone()) { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), - SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), - _ => "".to_string(), -}, - None => "".to_string(), -}, -}; -if (base_type.clone().as_str() != "".to_string().as_str()) { - break Rc::new({ let mut __result = Vec::new(); for f in Rc::new({ let mut __result = Vec::new(); for f in inductive_fields_for(ctx.type_env.clone(), base_type.clone()).iter().cloned() { if (f.field_name.clone().as_str() == fname.clone().as_str()) { __result.push(f); } } __result }).iter().cloned() { if match f.shape.clone() { - RecursionShape::ListRecursion => true, - _ => false, -} { __result.push(f); } } __result }).first().cloned(); -} else { - break None; -} }, - _ => { break None; }, -} }, - ExprData::ExprVar { .. } => { let rname = expr_var_name_at(expr.clone(), ctx.type_env.clone().source_indices.clone()); -match v2_rt::map_get(&ctx.sub_value_vars.clone(), rname) { - Some(rel) => { match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { field: f, .. } => { match f.shape.clone() { - RecursionShape::ListRecursion => { break Some(f.clone()); }, - _ => { break None; }, -} }, - SubValueRelation::IteratedSubValue { field: f, .. } => { match f.shape.clone() { - RecursionShape::ListRecursion => { break Some(f.clone()); }, - _ => { break None; }, -} }, - _ => { break None; }, -} }, - None => { break None; }, -} }, - ExprData::ExprMethodCall { .. } => { let inner_mname = expr_method_name_at(expr.clone(), ctx.type_env.clone().source_indices.clone()); -let is_collection_preserving = (((((inner_mname.clone().as_str() == "enumerate".to_string().as_str()) || (inner_mname.clone().as_str() == "skip".to_string().as_str())) || (inner_mname.clone().as_str() == "take".to_string().as_str())) || (inner_mname.clone().as_str() == "filter".to_string().as_str())) || (inner_mname.clone().as_str() == "reverse".to_string().as_str())); -if is_collection_preserving { - { - let __tco_0 = method_receiver(expr); -expr = __tco_0; -continue; -} -} else { - break None; -} }, - _ => { break None; }, -} -} + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(expr.clone()); + let fname = field_access_field_at( + expr.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at( + base.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + let base_type = + match v2_rt::map_get(&ctx.param_names.clone(), bname.clone()) { + Some(t) => t.clone(), + None => { + match v2_rt::map_get(&ctx.sub_value_vars.clone(), bname.clone()) + { + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { + field: f, .. + } => f.element_type.clone(), + SubValueRelation::IteratedSubValue { + field: f, .. + } => f.element_type.clone(), + _ => "".to_string(), + }, + None => "".to_string(), + } + } + }; + if (base_type.clone().as_str() != "".to_string().as_str()) { + break Rc::new({ + let mut __result = Vec::new(); + for f in Rc::new({ + let mut __result = Vec::new(); + for f in inductive_fields_for( + ctx.type_env.clone(), + base_type.clone(), + ) + .iter() + .cloned() + { + if (f.field_name.clone().as_str() == fname.clone().as_str()) + { + __result.push(f); + } + } + __result + }) + .iter() + .cloned() + { + if match f.shape.clone() { + RecursionShape::ListRecursion => true, + _ => false, + } { + __result.push(f); + } + } + __result + }) + .first() + .cloned(); + } else { + break None; + } + } + _ => { + break None; + } + } + } + ExprData::ExprVar { .. } => { + let rname = + expr_var_name_at(expr.clone(), ctx.type_env.clone().source_indices.clone()); + match v2_rt::map_get(&ctx.sub_value_vars.clone(), rname) { + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { field: f, .. } => { + match f.shape.clone() { + RecursionShape::ListRecursion => { + break Some(f.clone()); + } + _ => { + break None; + } + } + } + SubValueRelation::IteratedSubValue { field: f, .. } => { + match f.shape.clone() { + RecursionShape::ListRecursion => { + break Some(f.clone()); + } + _ => { + break None; + } + } + } + _ => { + break None; + } + }, + None => { + break None; + } + } + } + ExprData::ExprMethodCall { .. } => { + let inner_mname = + expr_method_name_at(expr.clone(), ctx.type_env.clone().source_indices.clone()); + let is_collection_preserving = (((((inner_mname.clone().as_str() + == "enumerate".to_string().as_str()) + || (inner_mname.clone().as_str() == "skip".to_string().as_str())) + || (inner_mname.clone().as_str() == "take".to_string().as_str())) + || (inner_mname.clone().as_str() == "filter".to_string().as_str())) + || (inner_mname.clone().as_str() == "reverse".to_string().as_str())); + if is_collection_preserving { + { + let __tco_0 = method_receiver(expr); + expr = __tco_0; + continue; + } + } else { + break None; + } + } + _ => { + break None; + } + } + } } pub fn classify_binding_provenance(val: &Rc, scope: &Rc) -> Rc { match (*val.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let vname = expr_var_name_at(val.clone(), scope.type_env.clone().source_indices.clone()); -match v2_rt::map_get(&scope.locals.clone(), vname) { - Some(binding) => binding.provenance.clone(), - None => Rc::new(SubValueRelation::SubValueUnknown), -} -}, - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(val.clone()); -let field = field_access_field_at(val.clone(), scope.type_env.clone().source_indices.clone()); -match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at(base.clone(), scope.type_env.clone().source_indices.clone()); -match v2_rt::map_get(&scope.locals.clone(), bname) { - Some(binding) => { - let fields = inductive_fields_for(scope.type_env.clone(), authored_name_at(scope.type_env.clone().source_indices.clone(), &binding.resolved.clone())); -let matching = Rc::new({ let mut __result = Vec::new(); for f in fields.iter().cloned() { if (f.field_name.clone().as_str() == field.clone().as_str()) { __result.push(f); } } __result }).first().cloned(); -match matching { - Some(ind_field) => compose_sub_value(binding.provenance.clone(), ind_field.clone()), - None => Rc::new(SubValueRelation::SubValueUnknown), -} -}, - None => Rc::new(SubValueRelation::SubValueUnknown), -} -}, - _ => Rc::new(SubValueRelation::SubValueUnknown), -} -}, - _ => Rc::new(SubValueRelation::SubValueUnknown), -} + ExprData::ExprVar { .. } => { + let vname = + expr_var_name_at(val.clone(), scope.type_env.clone().source_indices.clone()); + match v2_rt::map_get(&scope.locals.clone(), vname) { + Some(binding) => binding.provenance.clone(), + None => Rc::new(SubValueRelation::SubValueUnknown), + } + } + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(val.clone()); + let field = + field_access_field_at(val.clone(), scope.type_env.clone().source_indices.clone()); + match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at( + base.clone(), + scope.type_env.clone().source_indices.clone(), + ); + match v2_rt::map_get(&scope.locals.clone(), bname) { + Some(binding) => { + let fields = inductive_fields_for( + scope.type_env.clone(), + authored_name_at( + scope.type_env.clone().source_indices.clone(), + &binding.resolved.clone(), + ), + ); + let matching = Rc::new({ + let mut __result = Vec::new(); + for f in fields.iter().cloned() { + if (f.field_name.clone().as_str() == field.clone().as_str()) { + __result.push(f); + } + } + __result + }) + .first() + .cloned(); + match matching { + Some(ind_field) => { + compose_sub_value(binding.provenance.clone(), ind_field.clone()) + } + None => Rc::new(SubValueRelation::SubValueUnknown), + } + } + None => Rc::new(SubValueRelation::SubValueUnknown), + } + } + _ => Rc::new(SubValueRelation::SubValueUnknown), + } + } + _ => Rc::new(SubValueRelation::SubValueUnknown), + } } -pub fn classify_let_value(val: &Rc, ctx: &Rc) -> Option> { +pub fn classify_let_value( + val: &Rc, + ctx: &Rc, +) -> Option> { match (*val.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let vname = expr_var_name_at(val.clone(), ctx.type_env.clone().source_indices.clone()); -match v2_rt::map_get(&ctx.scope_locals.clone(), vname) { - Some(binding) => match (*binding.provenance.clone()).clone() { - SubValueRelation::SubValueUnknown => None, - _ => Some(binding.provenance.clone()), -}, - None => None, -} -}, - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(val.clone()); -let field = field_access_field_at(val.clone(), ctx.type_env.clone().source_indices.clone()); -match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at(base.clone(), ctx.type_env.clone().source_indices.clone()); -let from_per_field = match v2_rt::map_get(&ctx.per_field_vars.clone(), bname.clone()) { - Some(field_map) => v2_rt::map_get(&field_map, field.clone()), - None => None, -}; -match from_per_field { - Some(rel) => Some(rel.clone()), - None => { - let type_name = match v2_rt::map_get(&ctx.scope_locals.clone(), bname.clone()) { - Some(binding) => authored_name_at(ctx.type_env.clone().source_indices.clone(), &binding.resolved.clone()), - None => match v2_rt::map_get(&ctx.param_names.clone(), bname.clone()) { - Some(t) => t.clone(), - None => "".to_string(), -}, -}; -if (type_name.clone().as_str() != "".to_string().as_str()) { - { - let fields = inductive_fields_for(ctx.type_env.clone(), type_name.clone()); -let matching = Rc::new({ let mut __result = Vec::new(); for f in fields.iter().cloned() { if (f.field_name.clone().as_str() == field.clone().as_str()) { __result.push(f); } } __result }).first().cloned(); -match matching { - Some(ind_field) => Some(Rc::new(SubValueRelation::StrictSubValue { - field: ind_field.clone(), - factor: Rc::new(ShrinkFactor::UnitShrink), -})), - None => None, -} -} - } else { - None - } -}, -} -}, - _ => None, -} -}, - ExprData::ExprCall { .. } => { - let callee = expr_call_func_at(val.clone(), ctx.type_env.clone().source_indices.clone()); -let from_provenance = match v2_rt::map_get(&ctx.func_sigs.clone(), callee.clone()) { - Some(sig) => match sig.output_provenance.clone().first().cloned() { - Some(param_map) => classify_call_via_provenance(val.clone(), ¶m_map, ctx.clone()), - None => None, -}, - None => None, -}; -match from_provenance.clone() { - Some(_) => from_provenance.clone(), - None => if (is_child_accessor_in_model(callee.clone()) || is_tree_size_reducing(callee.clone())) { - { - let call_args = val.children.clone(); -match call_args.first().cloned() { - Some(first_arg) => { - let inner = arg_value(&first_arg); -match (*inner.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let iname = expr_var_name_at(inner.clone(), ctx.type_env.clone().source_indices.clone()); -let inner_type = match v2_rt::map_get(&ctx.param_names.clone(), iname.clone()) { - Some(t) => t.clone(), - None => match v2_rt::map_get(&ctx.sub_value_vars.clone(), iname.clone()) { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), - SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), - _ => "".to_string(), -}, - None => "".to_string(), -}, -}; -if (inner_type.clone().as_str() != "".to_string().as_str()) { - { - let fields = inductive_fields_for(ctx.type_env.clone(), inner_type.clone()); -let cf = Rc::new({ let mut __result = Vec::new(); for f in fields.iter().cloned() { if match f.shape.clone() { - RecursionShape::ListRecursion => true, - _ => false, -} { __result.push(f); } } __result }).first().cloned(); -match cf { - Some(ind_field) => Some(Rc::new(SubValueRelation::StrictSubValue { - field: ind_field.clone(), - factor: Rc::new(ShrinkFactor::UnitShrink), -})), - None => None, -} -} - } else { - None + ExprData::ExprVar { .. } => { + let vname = expr_var_name_at(val.clone(), ctx.type_env.clone().source_indices.clone()); + match v2_rt::map_get(&ctx.scope_locals.clone(), vname) { + Some(binding) => match (*binding.provenance.clone()).clone() { + SubValueRelation::SubValueUnknown => None, + _ => Some(binding.provenance.clone()), + }, + None => None, + } + } + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(val.clone()); + let field = + field_access_field_at(val.clone(), ctx.type_env.clone().source_indices.clone()); + match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = + expr_var_name_at(base.clone(), ctx.type_env.clone().source_indices.clone()); + let from_per_field = + match v2_rt::map_get(&ctx.per_field_vars.clone(), bname.clone()) { + Some(field_map) => v2_rt::map_get(&field_map, field.clone()), + None => None, + }; + match from_per_field { + Some(rel) => Some(rel.clone()), + None => { + let type_name = + match v2_rt::map_get(&ctx.scope_locals.clone(), bname.clone()) { + Some(binding) => authored_name_at( + ctx.type_env.clone().source_indices.clone(), + &binding.resolved.clone(), + ), + None => match v2_rt::map_get( + &ctx.param_names.clone(), + bname.clone(), + ) { + Some(t) => t.clone(), + None => "".to_string(), + }, + }; + if (type_name.clone().as_str() != "".to_string().as_str()) { + { + let fields = inductive_fields_for( + ctx.type_env.clone(), + type_name.clone(), + ); + let matching = Rc::new({ + let mut __result = Vec::new(); + for f in fields.iter().cloned() { + if (f.field_name.clone().as_str() + == field.clone().as_str()) + { + __result.push(f); + } + } + __result + }) + .first() + .cloned(); + match matching { + Some(ind_field) => { + Some(Rc::new(SubValueRelation::StrictSubValue { + field: ind_field.clone(), + factor: Rc::new(ShrinkFactor::UnitShrink), + })) + } + None => None, + } + } + } else { + None + } } -}, - _ => None, -} -}, - None => None, -} -} - } else { - None - }, -} -}, - _ => { - let type_based = match val.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => if is_container_type(authored_name_at(ctx.type_env.clone().source_indices.clone(), &rt)) { - { - let elem = match rt.children.clone().first().cloned() { - Some(c) => authored_name_at(ctx.type_env.clone().source_indices.clone(), &c), - None => "".to_string(), -}; -if ((elem.clone().as_str() != "".to_string().as_str()) && is_recursive_type_by_name(&ctx.type_env.clone(), elem.clone())) { + } + } + _ => None, + } + } + ExprData::ExprCall { .. } => { + let callee = + expr_call_func_at(val.clone(), ctx.type_env.clone().source_indices.clone()); + let from_provenance = match v2_rt::map_get(&ctx.func_sigs.clone(), callee.clone()) { + Some(sig) => match sig.output_provenance.clone().first().cloned() { + Some(param_map) => { + classify_call_via_provenance(val.clone(), ¶m_map, ctx.clone()) + } + None => None, + }, + None => None, + }; + match from_provenance.clone() { + Some(_) => from_provenance.clone(), + None => { + if (is_child_accessor_in_model(callee.clone()) + || is_tree_size_reducing(callee.clone())) { - let fields = inductive_fields_for(ctx.type_env.clone(), elem.clone()); -let cf = Rc::new({ let mut __result = Vec::new(); for f in fields.iter().cloned() { if match f.shape.clone() { + { + let call_args = val.children.clone(); + match call_args.first().cloned() { + Some(first_arg) => { + let inner = arg_value(&first_arg); + match (*inner.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let iname = expr_var_name_at( + inner.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + let inner_type = match v2_rt::map_get( + &ctx.param_names.clone(), + iname.clone(), + ) { + Some(t) => t.clone(), + None => match v2_rt::map_get( + &ctx.sub_value_vars.clone(), + iname.clone(), + ) { + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { + field: f, + .. + } => f.element_type.clone(), + SubValueRelation::IteratedSubValue { + field: f, + .. + } => f.element_type.clone(), + _ => "".to_string(), + }, + None => "".to_string(), + }, + }; + if (inner_type.clone().as_str() + != "".to_string().as_str()) + { + { + let fields = inductive_fields_for( + ctx.type_env.clone(), + inner_type.clone(), + ); + let cf = + Rc::new({ + let mut __result = Vec::new(); + for f in fields.iter().cloned() { + if match f.shape.clone() { RecursionShape::ListRecursion => true, _ => false, -} { __result.push(f); } } __result }).first().cloned(); -match cf { - Some(ind_field) => Some(Rc::new(SubValueRelation::StrictSubValue { - field: ind_field.clone(), - factor: Rc::new(ShrinkFactor::UnitShrink), -})), - None => None, -} -} - } else { - None - } -} - } else { - None - }, - _ => None, -}; -match type_based.clone() { - Some(_) => type_based.clone(), - None => match (*val.expr_data.clone()).clone() { - ExprData::ExprBinOp { op, .. } => { - let left = binop_left(val.clone()); -let right = binop_right(val.clone()); -match op.clone() { - BinOp::Sub => match (*left.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let lname = expr_var_name_at(left.clone(), ctx.type_env.clone().source_indices.clone()); -if ((v2_rt::map_get(&ctx.param_names.clone(), lname.clone()) != None) || (v2_rt::map_get(&ctx.sub_value_vars.clone(), lname.clone()) != None)) { - match (*right.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: k, .. } = value.as_ref() else { unreachable!() }; match positive_descent_amount_from_positive_int(k.clone()) { - Some(steps) => Some(Rc::new(SubValueRelation::ArithmeticDescent { - param: lname.clone(), - factor: Rc::new(ShrinkFactor::ConstantShrink { - steps: steps.clone(), -}), -})), - None => None, -} }, - _ => None, -} - } else { - None +} { __result.push(f); } + } + __result + }) + .first() + .cloned(); + match cf { + Some(ind_field) => Some(Rc::new( + SubValueRelation::StrictSubValue { + field: ind_field.clone(), + factor: Rc::new( + ShrinkFactor::UnitShrink, + ), + }, + )), + None => None, + } + } + } else { + None + } + } + _ => None, + } + } + None => None, + } + } + } else { + None + } } -}, - _ => None, -}, - BinOp::Div => { - let left_name = match (*left.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let lname = expr_var_name_at(left.clone(), ctx.type_env.clone().source_indices.clone()); -if ((v2_rt::map_get(&ctx.param_names.clone(), lname.clone()) != None) || (v2_rt::map_get(&ctx.sub_value_vars.clone(), lname.clone()) != None)) { - lname.clone() + } + } + _ => { + let type_based = match val.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + if is_container_type(authored_name_at( + ctx.type_env.clone().source_indices.clone(), + &rt, + )) { + { + let elem = match rt.children.clone().first().cloned() { + Some(c) => authored_name_at( + ctx.type_env.clone().source_indices.clone(), + &c, + ), + None => "".to_string(), + }; + if ((elem.clone().as_str() != "".to_string().as_str()) + && is_recursive_type_by_name(&ctx.type_env.clone(), elem.clone())) + { + { + let fields = + inductive_fields_for(ctx.type_env.clone(), elem.clone()); + let cf = Rc::new({ + let mut __result = Vec::new(); + for f in fields.iter().cloned() { + if match f.shape.clone() { + RecursionShape::ListRecursion => true, + _ => false, + } { + __result.push(f); + } + } + __result + }) + .first() + .cloned(); + match cf { + Some(ind_field) => { + Some(Rc::new(SubValueRelation::StrictSubValue { + field: ind_field.clone(), + factor: Rc::new(ShrinkFactor::UnitShrink), + })) + } + None => None, + } + } + } else { + None + } + } } else { - "".to_string() + None } -}, - ExprData::ExprBinOp { op: BinOp::Sub, .. } => { - let inner_left = binop_left(left.clone()); -match (*inner_left.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let lname = expr_var_name_at(inner_left.clone(), ctx.type_env.clone().source_indices.clone()); -if ((v2_rt::map_get(&ctx.param_names.clone(), lname.clone()) != None) || (v2_rt::map_get(&ctx.sub_value_vars.clone(), lname.clone()) != None)) { - lname.clone() - } else { - "".to_string() + } + _ => None, + }; + match type_based.clone() { + Some(_) => type_based.clone(), + None => match (*val.expr_data.clone()).clone() { + ExprData::ExprBinOp { op, .. } => { + let left = binop_left(val.clone()); + let right = binop_right(val.clone()); + match op.clone() { + BinOp::Sub => match (*left.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let lname = expr_var_name_at( + left.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + if ((v2_rt::map_get(&ctx.param_names.clone(), lname.clone()) + != None) + || (v2_rt::map_get( + &ctx.sub_value_vars.clone(), + lname.clone(), + ) != None)) + { + match (*right.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitInt { value: k, .. } = + value.as_ref() + else { + unreachable!() + }; + match positive_descent_amount_from_positive_int( + k.clone(), + ) { + Some(steps) => Some(Rc::new( + SubValueRelation::ArithmeticDescent { + param: lname.clone(), + factor: Rc::new( + ShrinkFactor::ConstantShrink { + steps: steps.clone(), + }, + ), + }, + )), + None => None, + } + } + _ => None, + } + } else { + None + } + } + _ => None, + }, + BinOp::Div => { + let left_name = match (*left.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let lname = expr_var_name_at( + left.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + if ((v2_rt::map_get( + &ctx.param_names.clone(), + lname.clone(), + ) != None) + || (v2_rt::map_get( + &ctx.sub_value_vars.clone(), + lname.clone(), + ) != None)) + { + lname.clone() + } else { + "".to_string() + } + } + ExprData::ExprBinOp { op: BinOp::Sub, .. } => { + let inner_left = binop_left(left.clone()); + match (*inner_left.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let lname = expr_var_name_at( + inner_left.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + if ((v2_rt::map_get( + &ctx.param_names.clone(), + lname.clone(), + ) != None) + || (v2_rt::map_get( + &ctx.sub_value_vars.clone(), + lname.clone(), + ) != None)) + { + lname.clone() + } else { + "".to_string() + } + } + _ => "".to_string(), + } + } + _ => "".to_string(), + }; + if (left_name.clone().as_str() != "".to_string().as_str()) { + match (*right.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitInt { value: k, .. } = + value.as_ref() + else { + unreachable!() + }; + match proportional_divisor_from_int_at_least_two( + k.clone(), + ) { + Some(div_w) => Some(Rc::new( + SubValueRelation::ArithmeticDescent { + param: left_name.clone(), + factor: Rc::new( + ShrinkFactor::ProportionalShrink { + divisor: div_w.clone(), + }, + ), + }, + )), + None => None, + } + } + _ => None, + } + } else { + None + } + } + BinOp::Add => None, + _ => None, } -}, - _ => "".to_string(), -} -}, - _ => "".to_string(), -}; -if (left_name.clone().as_str() != "".to_string().as_str()) { - match (*right.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: k, .. } = value.as_ref() else { unreachable!() }; match proportional_divisor_from_int_at_least_two(k.clone()) { - Some(div_w) => Some(Rc::new(SubValueRelation::ArithmeticDescent { - param: left_name.clone(), - factor: Rc::new(ShrinkFactor::ProportionalShrink { - divisor: div_w.clone(), -}), -})), - None => None, -} }, - _ => None, -} - } else { - None - } -}, - BinOp::Add => None, - _ => None, -} -}, - ExprData::ExprMethodCall { .. } => { - let mname = expr_method_name_at(val.clone(), ctx.type_env.clone().source_indices.clone()); -let is_collection_preserving = (((((mname.clone().as_str() == "skip".to_string().as_str()) || (mname.clone().as_str() == "filter".to_string().as_str())) || (mname.clone().as_str() == "take".to_string().as_str())) || (mname.clone().as_str() == "enumerate".to_string().as_str())) || (mname.clone().as_str() == "reverse".to_string().as_str())); -if is_collection_preserving { - { - let receiver = method_receiver(val.clone()); -let coll_field = resolve_collection_field(receiver.clone(), ctx.clone()); -match coll_field { - Some(ind_field) => Some(Rc::new(SubValueRelation::StrictSubValue { - field: ind_field.clone(), - factor: Rc::new(ShrinkFactor::UnitShrink), -})), - None => if (mname.clone().as_str() == "skip".to_string().as_str()) { - { - let skip_args = method_arg_nodes(val.clone()); -let skip_amount = match skip_args.first().cloned() { - Some(a) => match (*arg_value(&a).expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: k, .. } = value.as_ref() else { unreachable!() }; if (k.clone() > 0) { - k.clone() - } else { - 0 - } }, - _ => 0, -}, - None => 0, -}; -if (skip_amount.clone() > 0) { - match (*receiver.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let rname = expr_var_name_at(receiver.clone(), ctx.type_env.clone().source_indices.clone()); -if ((v2_rt::map_get(&ctx.param_names.clone(), rname.clone()) != None) || (v2_rt::map_get(&ctx.sub_value_vars.clone(), rname.clone()) != None)) { - match positive_descent_amount_from_positive_int(skip_amount.clone()) { + } + ExprData::ExprMethodCall { .. } => { + let mname = expr_method_name_at( + val.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + let is_collection_preserving = (((((mname.clone().as_str() + == "skip".to_string().as_str()) + || (mname.clone().as_str() == "filter".to_string().as_str())) + || (mname.clone().as_str() == "take".to_string().as_str())) + || (mname.clone().as_str() == "enumerate".to_string().as_str())) + || (mname.clone().as_str() == "reverse".to_string().as_str())); + if is_collection_preserving { + { + let receiver = method_receiver(val.clone()); + let coll_field = + resolve_collection_field(receiver.clone(), ctx.clone()); + match coll_field { + Some(ind_field) => { + Some(Rc::new(SubValueRelation::StrictSubValue { + field: ind_field.clone(), + factor: Rc::new(ShrinkFactor::UnitShrink), + })) + } + None => { + if (mname.clone().as_str() == "skip".to_string().as_str()) { + { + let skip_args = method_arg_nodes(val.clone()); + let skip_amount = match skip_args.first().cloned() { + Some(a) => match (*arg_value(&a) + .expr_data + .clone()) + .clone() + { + ExprData::ExprLiteral { + ref value, .. + } => { + let LiteralValue::LitInt { + value: k, + .. + } = value.as_ref() + else { + unreachable!() + }; + if (k.clone() > 0) { + k.clone() + } else { + 0 + } + } + _ => 0, + }, + None => 0, + }; + if (skip_amount.clone() > 0) { + match (*receiver.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let rname = expr_var_name_at( + receiver.clone(), + ctx.type_env + .clone() + .source_indices + .clone(), + ); + if ((v2_rt::map_get( + &ctx.param_names.clone(), + rname.clone(), + ) != None) + || (v2_rt::map_get( + &ctx.sub_value_vars.clone(), + rname.clone(), + ) != None)) + { + match positive_descent_amount_from_positive_int(skip_amount.clone()) { Some(steps) => { let synth_field = Rc::new(InductiveField { type_name: rname.clone(), @@ -3351,350 +5660,628 @@ Some(Rc::new(SubValueRelation::StrictSubValue { }, None => None, } - } else { - None + } else { + None + } + } + _ => None, + } + } else { + None + } + } + } else { + None + } } -}, - _ => None, -} - } else { - None + } } -} - } else { - None - }, -} -} - } else { - None + } else { + None + } + } + _ => None, + }, } -}, - _ => None, -}, -} -}, -} + } + } } -pub fn classify_call_via_provenance(call: Rc, param_map: &Rc>>, ctx: Rc) -> Option> { +pub fn classify_call_via_provenance( + call: Rc, + param_map: &Rc>>, + ctx: Rc, +) -> Option> { { let call_args = call.children.clone(); -let arg_by_name = call_args.iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, arg_node: Rc| match arg_name_at(arg_node.clone(), ctx.type_env.clone().source_indices.clone()) { - Some(aname) => v2_rt::rc_map_insert(acc.clone(), aname.clone(), arg_value(&arg_node)), - None => acc.clone(), -}); -Rc::new(v2_rt::map_keys(¶m_map)).iter().cloned().fold(None, |result: _, callee_pname: String| match v2_rt::map_get(¶m_map, callee_pname.clone()) { - Some(callee_rel) => match v2_rt::map_get(&arg_by_name, callee_pname.clone()) { - Some(arg_expr) => { - let arg_rel = classify_call_arg_provenance(&arg_expr, &ctx); -match arg_rel.clone() { - Some(arel) => { - let composed = compose_output_relations(arel.clone(), callee_rel.clone()); -match result.clone() { - Some(prev) => Some(meet_sub_value(prev.clone(), composed.clone())), - None => Some(composed.clone()), -} -}, - None => result.clone(), -} -}, - None => result.clone(), -}, - None => result.clone(), -}) -} + let arg_by_name = call_args.iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, arg_node: Rc| match arg_name_at( + arg_node.clone(), + ctx.type_env.clone().source_indices.clone(), + ) { + Some(aname) => { + v2_rt::rc_map_insert(acc.clone(), aname.clone(), arg_value(&arg_node)) + } + None => acc.clone(), + }, + ); + Rc::new(v2_rt::map_keys(¶m_map)).iter().cloned().fold( + None, + |result: _, callee_pname: String| match v2_rt::map_get(¶m_map, callee_pname.clone()) + { + Some(callee_rel) => match v2_rt::map_get(&arg_by_name, callee_pname.clone()) { + Some(arg_expr) => { + let arg_rel = classify_call_arg_provenance(&arg_expr, &ctx); + match arg_rel.clone() { + Some(arel) => { + let composed = + compose_output_relations(arel.clone(), callee_rel.clone()); + match result.clone() { + Some(prev) => { + Some(meet_sub_value(prev.clone(), composed.clone())) + } + None => Some(composed.clone()), + } + } + None => result.clone(), + } + } + None => result.clone(), + }, + None => result.clone(), + }, + ) + } } -pub fn classify_call_arg_provenance(arg_expr: &Rc, ctx: &Rc) -> Option> { +pub fn classify_call_arg_provenance( + arg_expr: &Rc, + ctx: &Rc, +) -> Option> { match (*arg_expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let name = expr_var_name_at(arg_expr.clone(), ctx.type_env.clone().source_indices.clone()); -if (v2_rt::map_get(&ctx.param_names.clone(), name.clone()) != None) { - Some(Rc::new(SubValueRelation::PreservedValue)) - } else { - v2_rt::map_get(&ctx.sub_value_vars.clone(), name.clone()) + ExprData::ExprVar { .. } => { + let name = expr_var_name_at( + arg_expr.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + if (v2_rt::map_get(&ctx.param_names.clone(), name.clone()) != None) { + Some(Rc::new(SubValueRelation::PreservedValue)) + } else { + v2_rt::map_get(&ctx.sub_value_vars.clone(), name.clone()) + } } -}, - _ => classify_let_value(&arg_expr, &ctx), -} + _ => classify_let_value(&arg_expr, &ctx), + } } pub fn merge_argument_relations(rels: &Rc>>) -> Rc { match rels.clone().first().cloned() { - None => Rc::new(SubValueRelation::SubValueUnknown), - Some(first_rel) => Rc::new(rels.clone().iter().cloned().skip(1 as usize).collect::>()).iter().cloned().fold(first_rel.clone(), |acc: Rc, rel: Rc| meet_sub_value(acc, rel.clone())), -} + None => Rc::new(SubValueRelation::SubValueUnknown), + Some(first_rel) => Rc::new( + rels.clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ) + .iter() + .cloned() + .fold( + first_rel.clone(), + |acc: Rc, rel: Rc| meet_sub_value(acc, rel.clone()), + ), + } } -pub fn classify_argument(arg_expr: &Rc, param_name: &String, ctx: &Rc) -> Rc { +pub fn classify_argument( + arg_expr: &Rc, + param_name: &String, + ctx: &Rc, +) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*arg_expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let vname = expr_var_name_at(arg_expr.clone(), ctx.type_env.clone().source_indices.clone()); -if (vname.clone().as_str() == param_name.clone().as_str()) { - Rc::new(SubValueRelation::PreservedValue) - } else { - match v2_rt::map_get(&ctx.sub_value_vars.clone(), vname.clone()) { - Some(rel) => rel.clone(), - None => Rc::new(SubValueRelation::SubValueUnknown), -} + ExprData::ExprVar { .. } => { + let vname = expr_var_name_at( + arg_expr.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + if (vname.clone().as_str() == param_name.clone().as_str()) { + Rc::new(SubValueRelation::PreservedValue) + } else { + match v2_rt::map_get(&ctx.sub_value_vars.clone(), vname.clone()) { + Some(rel) => rel.clone(), + None => Rc::new(SubValueRelation::SubValueUnknown), + } + } } -}, - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(arg_expr.clone()); -let field = field_access_field_at(arg_expr.clone(), ctx.type_env.clone().source_indices.clone()); -match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at(base.clone(), ctx.type_env.clone().source_indices.clone()); -let type_name = match v2_rt::map_get(&ctx.param_names.clone(), bname.clone()) { - Some(t) => t.clone(), - None => match v2_rt::map_get(&ctx.sub_value_vars.clone(), bname.clone()) { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), - SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), - _ => "".to_string(), -}, - None => "".to_string(), -}, -}; -let fields = inductive_fields_for(ctx.type_env.clone(), type_name); -let matching = Rc::new({ let mut __result = Vec::new(); for f in fields.iter().cloned() { if (f.field_name.clone().as_str() == field.clone().as_str()) { __result.push(f); } } __result }).first().cloned(); -match matching { - Some(ind_field) => Rc::new(SubValueRelation::StrictSubValue { - field: ind_field.clone(), - factor: Rc::new(ShrinkFactor::UnitShrink), -}), - None => Rc::new(SubValueRelation::SubValueUnknown), -} -}, - _ => Rc::new(SubValueRelation::SubValueUnknown), -} -}, - ExprData::ExprCall { .. } => { - let call_args = arg_expr.children.clone(); -match call_args.first().cloned() { - Some(first_arg) => { - let inner = arg_value(&first_arg); -let inner_rel = classify_argument(&inner, ¶m_name, &ctx); -match (*inner_rel.clone()).clone() { - SubValueRelation::StrictSubValue { .. } => inner_rel.clone(), - SubValueRelation::IteratedSubValue { .. } => inner_rel.clone(), - SubValueRelation::ArithmeticDescent { .. } => inner_rel.clone(), - SubValueRelation::PreservedValue => { - let callee = expr_call_func_at(arg_expr.clone(), ctx.type_env.clone().source_indices.clone()); -let from_provenance = match v2_rt::map_get(&ctx.func_sigs.clone(), callee.clone()) { - Some(sig) => match sig.output_provenance.clone().first().cloned() { - Some(param_map) => classify_call_via_provenance(arg_expr.clone(), ¶m_map, ctx.clone()), - None => None, -}, - None => None, -}; -match from_provenance { - Some(prov_rel) => prov_rel.clone(), - None => if (is_child_accessor_in_model(callee.clone()) || is_tree_size_reducing(callee.clone())) { - { - let type_name = match v2_rt::map_get(&ctx.param_names.clone(), param_name.clone()) { - Some(t) => t.clone(), - None => "".to_string(), -}; -let fields = inductive_fields_for(ctx.type_env.clone(), type_name); -let cf = Rc::new({ let mut __result = Vec::new(); for f in fields.iter().cloned() { if match f.shape.clone() { - RecursionShape::ListRecursion => true, - _ => false, -} { __result.push(f); } } __result }).first().cloned(); -match cf { - Some(ind_field) => Rc::new(SubValueRelation::StrictSubValue { - field: ind_field.clone(), - factor: Rc::new(ShrinkFactor::UnitShrink), -}), - None => Rc::new(SubValueRelation::PreservedValue), -} -} - } else { - if is_property_contraction(callee.clone()) { - Rc::new(SubValueRelation::ArithmeticDescent { - param: param_name.clone(), - factor: Rc::new(ShrinkFactor::ConstantShrink { - steps: Rc::new(PositiveDescentAmount::OneStep), -}), -}) - } else { - Rc::new(SubValueRelation::PreservedValue) + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(arg_expr.clone()); + let field = field_access_field_at( + arg_expr.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at( + base.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + let type_name = + match v2_rt::map_get(&ctx.param_names.clone(), bname.clone()) { + Some(t) => t.clone(), + None => { + match v2_rt::map_get(&ctx.sub_value_vars.clone(), bname.clone()) + { + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { + field: f, .. + } => f.element_type.clone(), + SubValueRelation::IteratedSubValue { + field: f, .. + } => f.element_type.clone(), + _ => "".to_string(), + }, + None => "".to_string(), + } + } + }; + let fields = inductive_fields_for(ctx.type_env.clone(), type_name); + let matching = Rc::new({ + let mut __result = Vec::new(); + for f in fields.iter().cloned() { + if (f.field_name.clone().as_str() == field.clone().as_str()) { + __result.push(f); + } + } + __result + }) + .first() + .cloned(); + match matching { + Some(ind_field) => Rc::new(SubValueRelation::StrictSubValue { + field: ind_field.clone(), + factor: Rc::new(ShrinkFactor::UnitShrink), + }), + None => Rc::new(SubValueRelation::SubValueUnknown), } - }, -} -}, - SubValueRelation::SubValueUnknown => Rc::new(SubValueRelation::SubValueUnknown), -} -}, - None => Rc::new(SubValueRelation::SubValueUnknown), -} -}, - ExprData::ExprMethodCall { .. } => classify_collection_shrink(&arg_expr, ¶m_name, &ctx), - ExprData::ExprBinOp { op, .. } => { - let left = binop_left(arg_expr.clone()); -let right = binop_right(arg_expr.clone()); -match op.clone() { - BinOp::Sub => { - let left_is_param = match (*left.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => ((expr_var_name_at(left.clone(), ctx.type_env.clone().source_indices.clone()).as_str() == param_name.clone().as_str()) || (v2_rt::map_get(&ctx.sub_value_vars.clone(), expr_var_name_at(left.clone(), ctx.type_env.clone().source_indices.clone())) != None)), - _ => false, -}; -if left_is_param { - match (*right.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: k, .. } = value.as_ref() else { unreachable!() }; match positive_descent_amount_from_positive_int(k.clone()) { - Some(steps) => Rc::new(SubValueRelation::ArithmeticDescent { - param: param_name.clone(), - factor: Rc::new(ShrinkFactor::ConstantShrink { - steps: steps.clone(), -}), -}), - None => Rc::new(SubValueRelation::SubValueUnknown), -} }, - _ => Rc::new(SubValueRelation::SubValueUnknown), -} - } else { - Rc::new(SubValueRelation::SubValueUnknown) + } + _ => Rc::new(SubValueRelation::SubValueUnknown), } -}, - BinOp::Div => { - let left_is_param = match (*left.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => ((expr_var_name_at(left.clone(), ctx.type_env.clone().source_indices.clone()).as_str() == param_name.clone().as_str()) || (v2_rt::map_get(&ctx.sub_value_vars.clone(), expr_var_name_at(left.clone(), ctx.type_env.clone().source_indices.clone())) != None)), - ExprData::ExprBinOp { op: BinOp::Sub, .. } => { - let inner_left = binop_left(left.clone()); -match (*inner_left.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => ((expr_var_name_at(inner_left.clone(), ctx.type_env.clone().source_indices.clone()).as_str() == param_name.clone().as_str()) || (v2_rt::map_get(&ctx.sub_value_vars.clone(), expr_var_name_at(inner_left.clone(), ctx.type_env.clone().source_indices.clone())) != None)), - _ => false, -} -}, - _ => false, -}; -if left_is_param { - match (*right.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: k, .. } = value.as_ref() else { unreachable!() }; match proportional_divisor_from_int_at_least_two(k.clone()) { - Some(div_w) => Rc::new(SubValueRelation::ArithmeticDescent { - param: param_name.clone(), - factor: Rc::new(ShrinkFactor::ProportionalShrink { - divisor: div_w.clone(), -}), -}), - None => Rc::new(SubValueRelation::SubValueUnknown), -} }, - _ => Rc::new(SubValueRelation::SubValueUnknown), -} - } else { - Rc::new(SubValueRelation::SubValueUnknown) + } + ExprData::ExprCall { .. } => { + let call_args = arg_expr.children.clone(); + match call_args.first().cloned() { + Some(first_arg) => { + let inner = arg_value(&first_arg); + let inner_rel = classify_argument(&inner, ¶m_name, &ctx); + match (*inner_rel.clone()).clone() { + SubValueRelation::StrictSubValue { .. } => inner_rel.clone(), + SubValueRelation::IteratedSubValue { .. } => inner_rel.clone(), + SubValueRelation::ArithmeticDescent { .. } => inner_rel.clone(), + SubValueRelation::PreservedValue => { + let callee = expr_call_func_at( + arg_expr.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + let from_provenance = + match v2_rt::map_get(&ctx.func_sigs.clone(), callee.clone()) { + Some(sig) => { + match sig.output_provenance.clone().first().cloned() { + Some(param_map) => classify_call_via_provenance( + arg_expr.clone(), + ¶m_map, + ctx.clone(), + ), + None => None, + } + } + None => None, + }; + match from_provenance { + Some(prov_rel) => prov_rel.clone(), + None => { + if (is_child_accessor_in_model(callee.clone()) + || is_tree_size_reducing(callee.clone())) + { + { + let type_name = match v2_rt::map_get( + &ctx.param_names.clone(), + param_name.clone(), + ) { + Some(t) => t.clone(), + None => "".to_string(), + }; + let fields = inductive_fields_for( + ctx.type_env.clone(), + type_name, + ); + let cf = Rc::new({ + let mut __result = Vec::new(); + for f in fields.iter().cloned() { + if match f.shape.clone() { + RecursionShape::ListRecursion => true, + _ => false, + } { + __result.push(f); + } + } + __result + }) + .first() + .cloned(); + match cf { + Some(ind_field) => { + Rc::new(SubValueRelation::StrictSubValue { + field: ind_field.clone(), + factor: Rc::new( + ShrinkFactor::UnitShrink, + ), + }) + } + None => { + Rc::new(SubValueRelation::PreservedValue) + } + } + } + } else { + if is_property_contraction(callee.clone()) { + Rc::new(SubValueRelation::ArithmeticDescent { + param: param_name.clone(), + factor: Rc::new(ShrinkFactor::ConstantShrink { + steps: Rc::new( + PositiveDescentAmount::OneStep, + ), + }), + }) + } else { + Rc::new(SubValueRelation::PreservedValue) + } + } + } + } + } + SubValueRelation::SubValueUnknown => { + Rc::new(SubValueRelation::SubValueUnknown) + } + } + } + None => Rc::new(SubValueRelation::SubValueUnknown), } -}, - BinOp::Add => Rc::new(SubValueRelation::SubValueUnknown), - _ => Rc::new(SubValueRelation::SubValueUnknown), -} -}, - ExprData::ExprMatch => { - let arm_rels = Rc::new({ let mut __result = Vec::new(); for arm in match_arm_nodes(arg_expr.clone()).iter().cloned() { __result.push(classify_argument(&arm_body(&arm), ¶m_name, &ctx)); } __result }); -merge_argument_relations(&arm_rels) -}, - ExprData::ExprIf => { - let then_rel = classify_argument(&if_then_branch(arg_expr.clone()), ¶m_name, &ctx); -let else_rel = match if_else_branch(arg_expr.clone()) { - Some(e) => classify_argument(&e, ¶m_name, &ctx), - None => Rc::new(SubValueRelation::SubValueUnknown), -}; -merge_argument_relations(&Rc::new(vec![then_rel, else_rel])) -}, - ExprData::ExprBlock => match arg_expr.children.clone().last().cloned() { - Some(last_expr) => classify_argument(&last_expr, ¶m_name, &ctx), - None => Rc::new(SubValueRelation::SubValueUnknown), -}, - ExprData::ExprLet => match let_body(arg_expr.clone()) { - Some(body) => classify_argument(&body, ¶m_name, &ctx), - None => Rc::new(SubValueRelation::SubValueUnknown), -}, - ExprData::ExprCast => classify_argument(&cast_expr(arg_expr.clone()), ¶m_name, &ctx), - ExprData::ExprReturn => match arg_expr.children.clone().first().cloned() { - Some(inner) => classify_argument(&inner, ¶m_name, &ctx), - None => Rc::new(SubValueRelation::SubValueUnknown), -}, - _ => Rc::new(SubValueRelation::SubValueUnknown), -} + } + ExprData::ExprMethodCall { .. } => { + classify_collection_shrink(&arg_expr, ¶m_name, &ctx) + } + ExprData::ExprBinOp { op, .. } => { + let left = binop_left(arg_expr.clone()); + let right = binop_right(arg_expr.clone()); + match op.clone() { + BinOp::Sub => { + let left_is_param = match (*left.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + ((expr_var_name_at( + left.clone(), + ctx.type_env.clone().source_indices.clone(), + ) + .as_str() + == param_name.clone().as_str()) + || (v2_rt::map_get( + &ctx.sub_value_vars.clone(), + expr_var_name_at( + left.clone(), + ctx.type_env.clone().source_indices.clone(), + ), + ) != None)) + } + _ => false, + }; + if left_is_param { + match (*right.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitInt { value: k, .. } = value.as_ref() + else { + unreachable!() + }; + match positive_descent_amount_from_positive_int(k.clone()) { + Some(steps) => { + Rc::new(SubValueRelation::ArithmeticDescent { + param: param_name.clone(), + factor: Rc::new(ShrinkFactor::ConstantShrink { + steps: steps.clone(), + }), + }) + } + None => Rc::new(SubValueRelation::SubValueUnknown), + } + } + _ => Rc::new(SubValueRelation::SubValueUnknown), + } + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } + } + BinOp::Div => { + let left_is_param = match (*left.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + ((expr_var_name_at( + left.clone(), + ctx.type_env.clone().source_indices.clone(), + ) + .as_str() + == param_name.clone().as_str()) + || (v2_rt::map_get( + &ctx.sub_value_vars.clone(), + expr_var_name_at( + left.clone(), + ctx.type_env.clone().source_indices.clone(), + ), + ) != None)) + } + ExprData::ExprBinOp { op: BinOp::Sub, .. } => { + let inner_left = binop_left(left.clone()); + match (*inner_left.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + ((expr_var_name_at( + inner_left.clone(), + ctx.type_env.clone().source_indices.clone(), + ) + .as_str() + == param_name.clone().as_str()) + || (v2_rt::map_get( + &ctx.sub_value_vars.clone(), + expr_var_name_at( + inner_left.clone(), + ctx.type_env.clone().source_indices.clone(), + ), + ) != None)) + } + _ => false, + } + } + _ => false, + }; + if left_is_param { + match (*right.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitInt { value: k, .. } = value.as_ref() + else { + unreachable!() + }; + match proportional_divisor_from_int_at_least_two(k.clone()) { + Some(div_w) => { + Rc::new(SubValueRelation::ArithmeticDescent { + param: param_name.clone(), + factor: Rc::new(ShrinkFactor::ProportionalShrink { + divisor: div_w.clone(), + }), + }) + } + None => Rc::new(SubValueRelation::SubValueUnknown), + } + } + _ => Rc::new(SubValueRelation::SubValueUnknown), + } + } else { + Rc::new(SubValueRelation::SubValueUnknown) + } + } + BinOp::Add => Rc::new(SubValueRelation::SubValueUnknown), + _ => Rc::new(SubValueRelation::SubValueUnknown), + } + } + ExprData::ExprMatch => { + let arm_rels = Rc::new({ + let mut __result = Vec::new(); + for arm in match_arm_nodes(arg_expr.clone()).iter().cloned() { + __result.push(classify_argument(&arm_body(&arm), ¶m_name, &ctx)); + } + __result + }); + merge_argument_relations(&arm_rels) + } + ExprData::ExprIf => { + let then_rel = + classify_argument(&if_then_branch(arg_expr.clone()), ¶m_name, &ctx); + let else_rel = match if_else_branch(arg_expr.clone()) { + Some(e) => classify_argument(&e, ¶m_name, &ctx), + None => Rc::new(SubValueRelation::SubValueUnknown), + }; + merge_argument_relations(&Rc::new(vec![then_rel, else_rel])) + } + ExprData::ExprBlock => match arg_expr.children.clone().last().cloned() { + Some(last_expr) => classify_argument(&last_expr, ¶m_name, &ctx), + None => Rc::new(SubValueRelation::SubValueUnknown), + }, + ExprData::ExprLet => match let_body(arg_expr.clone()) { + Some(body) => classify_argument(&body, ¶m_name, &ctx), + None => Rc::new(SubValueRelation::SubValueUnknown), + }, + ExprData::ExprCast => { + classify_argument(&cast_expr(arg_expr.clone()), ¶m_name, &ctx) + } + ExprData::ExprReturn => match arg_expr.children.clone().first().cloned() { + Some(inner) => classify_argument(&inner, ¶m_name, &ctx), + None => Rc::new(SubValueRelation::SubValueUnknown), + }, + _ => Rc::new(SubValueRelation::SubValueUnknown), + } }) } -pub fn read_arg_provenance(arg_expr: &Rc, param_name: String, ctx: &Rc) -> Rc { +pub fn read_arg_provenance( + arg_expr: &Rc, + param_name: String, + ctx: &Rc, +) -> Rc { match (*arg_expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let vname = expr_var_name_at(arg_expr.clone(), ctx.type_env.clone().source_indices.clone()); -match v2_rt::map_get(&ctx.scope_locals.clone(), vname) { - Some(binding) => match (*binding.provenance.clone()).clone() { - SubValueRelation::SubValueUnknown => classify_argument(&arg_expr, ¶m_name, &ctx), - _ => binding.provenance.clone(), -}, - None => classify_argument(&arg_expr, ¶m_name, &ctx), -} -}, - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(arg_expr.clone()); -let field = field_access_field_at(arg_expr.clone(), ctx.type_env.clone().source_indices.clone()); -match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at(base.clone(), ctx.type_env.clone().source_indices.clone()); -match v2_rt::map_get(&ctx.scope_locals.clone(), bname) { - Some(binding) => match (*binding.provenance.clone()).clone() { - SubValueRelation::SubValueUnknown => classify_argument(&arg_expr, ¶m_name, &ctx), - _ => { - let fields = inductive_fields_for(ctx.type_env.clone(), authored_name_at(ctx.type_env.clone().source_indices.clone(), &binding.resolved.clone())); -let matching = Rc::new({ let mut __result = Vec::new(); for f in fields.iter().cloned() { if (f.field_name.clone().as_str() == field.clone().as_str()) { __result.push(f); } } __result }).first().cloned(); -match matching { - Some(ind_field) => compose_sub_value(binding.provenance.clone(), ind_field.clone()), - None => Rc::new(SubValueRelation::SubValueUnknown), -} -}, -}, - None => classify_argument(&arg_expr, ¶m_name, &ctx), -} -}, - _ => Rc::new(SubValueRelation::SubValueUnknown), -} -}, - ExprData::ExprCall { .. } => classify_argument(&arg_expr, ¶m_name, &ctx), - ExprData::ExprMethodCall { .. } => classify_argument(&arg_expr, ¶m_name, &ctx), - ExprData::ExprBinOp { .. } => classify_argument(&arg_expr, ¶m_name, &ctx), - ExprData::ExprMatch => classify_argument(&arg_expr, ¶m_name, &ctx), - ExprData::ExprIf => classify_argument(&arg_expr, ¶m_name, &ctx), - ExprData::ExprBlock => classify_argument(&arg_expr, ¶m_name, &ctx), - ExprData::ExprLet => classify_argument(&arg_expr, ¶m_name, &ctx), - ExprData::ExprCast => classify_argument(&arg_expr, ¶m_name, &ctx), - ExprData::ExprReturn => classify_argument(&arg_expr, ¶m_name, &ctx), - _ => Rc::new(SubValueRelation::SubValueUnknown), -} + ExprData::ExprVar { .. } => { + let vname = expr_var_name_at( + arg_expr.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + match v2_rt::map_get(&ctx.scope_locals.clone(), vname) { + Some(binding) => match (*binding.provenance.clone()).clone() { + SubValueRelation::SubValueUnknown => { + classify_argument(&arg_expr, ¶m_name, &ctx) + } + _ => binding.provenance.clone(), + }, + None => classify_argument(&arg_expr, ¶m_name, &ctx), + } + } + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(arg_expr.clone()); + let field = field_access_field_at( + arg_expr.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = + expr_var_name_at(base.clone(), ctx.type_env.clone().source_indices.clone()); + match v2_rt::map_get(&ctx.scope_locals.clone(), bname) { + Some(binding) => match (*binding.provenance.clone()).clone() { + SubValueRelation::SubValueUnknown => { + classify_argument(&arg_expr, ¶m_name, &ctx) + } + _ => { + let fields = inductive_fields_for( + ctx.type_env.clone(), + authored_name_at( + ctx.type_env.clone().source_indices.clone(), + &binding.resolved.clone(), + ), + ); + let matching = Rc::new({ + let mut __result = Vec::new(); + for f in fields.iter().cloned() { + if (f.field_name.clone().as_str() == field.clone().as_str()) + { + __result.push(f); + } + } + __result + }) + .first() + .cloned(); + match matching { + Some(ind_field) => compose_sub_value( + binding.provenance.clone(), + ind_field.clone(), + ), + None => Rc::new(SubValueRelation::SubValueUnknown), + } + } + }, + None => classify_argument(&arg_expr, ¶m_name, &ctx), + } + } + _ => Rc::new(SubValueRelation::SubValueUnknown), + } + } + ExprData::ExprCall { .. } => classify_argument(&arg_expr, ¶m_name, &ctx), + ExprData::ExprMethodCall { .. } => classify_argument(&arg_expr, ¶m_name, &ctx), + ExprData::ExprBinOp { .. } => classify_argument(&arg_expr, ¶m_name, &ctx), + ExprData::ExprMatch => classify_argument(&arg_expr, ¶m_name, &ctx), + ExprData::ExprIf => classify_argument(&arg_expr, ¶m_name, &ctx), + ExprData::ExprBlock => classify_argument(&arg_expr, ¶m_name, &ctx), + ExprData::ExprLet => classify_argument(&arg_expr, ¶m_name, &ctx), + ExprData::ExprCast => classify_argument(&arg_expr, ¶m_name, &ctx), + ExprData::ExprReturn => classify_argument(&arg_expr, ¶m_name, &ctx), + _ => Rc::new(SubValueRelation::SubValueUnknown), + } } -pub fn build_call_evidence(call_node: &Rc, ctx: &Rc) -> Rc>> { +pub fn build_call_evidence( + call_node: &Rc, + ctx: &Rc, +) -> Rc>> { { - let arg_map = Rc::new(call_node.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, pair: (i64, Rc)| { - let idx = pair.0.clone(); -let arg_node = pair.1.clone(); -let aname = arg_name_at(arg_node.clone(), ctx.type_env.clone().source_indices.clone()); -match aname.clone() { - Some(pname) => v2_rt::rc_map_insert(acc.clone(), pname.clone(), arg_value(&arg_node)), - None => acc.clone(), -} -}); -let positional_args = Rc::new({ let mut __result = Vec::new(); for arg_node in Rc::new({ let mut __result = Vec::new(); for arg_node in call_node.children.clone().iter().cloned() { if (arg_name_at(arg_node.clone(), ctx.type_env.clone().source_indices.clone()) == None) { __result.push(arg_node); } } __result }).iter().cloned() { __result.push(arg_value(&arg_node)); } __result }); -let positional_idx = 0; -Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(ctx.param_order.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ - let def_idx = pair.0.clone(); -let pname = pair.1.clone(); -match v2_rt::map_get(&arg_map, pname.clone()) { - Some(arg_val) => read_arg_provenance(&arg_val, pname.clone(), &ctx), - None => match positional_args.clone().get(def_idx.clone() as usize).cloned() { - Some(arg_val) => read_arg_provenance(&arg_val, pname.clone(), &ctx), - None => Rc::new(SubValueRelation::SubValueUnknown), -}, -} -}); } __result }) -} + let arg_map = Rc::new( + call_node + .children + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, pair: (i64, Rc)| { + let idx = pair.0.clone(); + let arg_node = pair.1.clone(); + let aname = arg_name_at( + arg_node.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + match aname.clone() { + Some(pname) => { + v2_rt::rc_map_insert(acc.clone(), pname.clone(), arg_value(&arg_node)) + } + None => acc.clone(), + } + }, + ); + let positional_args = Rc::new({ + let mut __result = Vec::new(); + for arg_node in Rc::new({ + let mut __result = Vec::new(); + for arg_node in call_node.children.clone().iter().cloned() { + if (arg_name_at( + arg_node.clone(), + ctx.type_env.clone().source_indices.clone(), + ) == None) + { + __result.push(arg_node); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(arg_value(&arg_node)); + } + __result + }); + let positional_idx = 0; + Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + ctx.param_order + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + __result.push({ + let def_idx = pair.0.clone(); + let pname = pair.1.clone(); + match v2_rt::map_get(&arg_map, pname.clone()) { + Some(arg_val) => read_arg_provenance(&arg_val, pname.clone(), &ctx), + None => match positional_args + .clone() + .get(def_idx.clone() as usize) + .cloned() + { + Some(arg_val) => read_arg_provenance(&arg_val, pname.clone(), &ctx), + None => Rc::new(SubValueRelation::SubValueUnknown), + }, + } + }); + } + __result + }) + } } pub fn descent_source_type(found: String, arg_node: &Rc, ctx: &Rc) -> String { @@ -3702,188 +6289,334 @@ pub fn descent_source_type(found: String, arg_node: &Rc, ctx: &Rc found.clone(), - _ => { - let arg_val = arg_value(&arg_node); -match (*arg_val.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let vname = expr_var_name_at(arg_val.clone(), ctx.type_env.clone().source_indices.clone()); -match v2_rt::map_get(&ctx.param_names.clone(), vname) { - Some(t) => t.clone(), - None => "".to_string(), -} -}, - _ => "".to_string(), -} -}, -} + ExprData::ExprLambda => found.clone(), + _ => { + let arg_val = arg_value(&arg_node); + match (*arg_val.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let vname = expr_var_name_at( + arg_val.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + match v2_rt::map_get(&ctx.param_names.clone(), vname) { + Some(t) => t.clone(), + None => "".to_string(), + } + } + _ => "".to_string(), + } + } + } } } pub fn annotate_descent(body: &Rc, ctx: &Rc) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprCall { call_semantics: cs, .. } => { - let evidence = build_call_evidence(&body, &ctx); -let source_type = body.children.clone().iter().cloned().fold("".to_string(), |found: String, arg_node: Rc| descent_source_type(found, &arg_node, &ctx)); -let annotated_children = Rc::new({ let mut __result = Vec::new(); for child in body.children.clone().iter().cloned() { __result.push({ - let arg_val = arg_value(&child); -match (*arg_val.expr_data.clone()).clone() { - ExprData::ExprLambda => if (source_type.clone().as_str() != "".to_string().as_str()) { - { - let lparams = lambda_param_names_at(arg_val.clone(), ctx.type_env.clone().source_indices.clone()); -let p1 = match lparams.clone().first().cloned() { - Some(n) => n.clone(), - None => "".to_string(), -}; -let p2 = match lparams.clone().get(1 as usize).cloned() { - Some(n) => n.clone(), - None => "".to_string(), -}; -let lambda_ctx = Rc::new(DescentContext { - fn_name: ctx.fn_name.clone(), - param_names: if (p2.clone().as_str() != "".to_string().as_str()) { - v2_rt::rc_map_insert(v2_rt::rc_map_insert(ctx.param_names.clone(), p1.clone(), source_type.clone()), p2.clone(), source_type.clone()) - } else { - if (p1.clone().as_str() != "".to_string().as_str()) { - v2_rt::rc_map_insert(ctx.param_names.clone(), p1.clone(), source_type.clone()) - } else { - ctx.param_names.clone() - } + ExprData::ExprCall { + call_semantics: cs, .. + } => { + let evidence = build_call_evidence(&body, &ctx); + let source_type = + body.children.clone().iter().cloned().fold( + "".to_string(), + |found: String, arg_node: Rc| { + descent_source_type(found, &arg_node, &ctx) }, - param_order: ctx.param_order.clone(), - type_env: ctx.type_env.clone(), - sub_value_vars: if (p1.clone().as_str() != "".to_string().as_str()) { - { - let source_fields = inductive_fields_for(ctx.type_env.clone(), source_type.clone()); -let cf = Rc::new({ let mut __result = Vec::new(); for f in source_fields.clone().iter().cloned() { if match f.shape.clone() { + ); + let annotated_children = Rc::new({ + let mut __result = Vec::new(); + for child in body.children.clone().iter().cloned() { + __result.push({ + let arg_val = arg_value(&child); + match (*arg_val.expr_data.clone()).clone() { + ExprData::ExprLambda => { + if (source_type.clone().as_str() != "".to_string().as_str()) { + { + let lparams = lambda_param_names_at( + arg_val.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + let p1 = match lparams.clone().first().cloned() { + Some(n) => n.clone(), + None => "".to_string(), + }; + let p2 = match lparams.clone().get(1 as usize).cloned() + { + Some(n) => n.clone(), + None => "".to_string(), + }; + let lambda_ctx = Rc::new(DescentContext { + fn_name: ctx.fn_name.clone(), + param_names: if (p2.clone().as_str() + != "".to_string().as_str()) + { + v2_rt::rc_map_insert( + v2_rt::rc_map_insert( + ctx.param_names.clone(), + p1.clone(), + source_type.clone(), + ), + p2.clone(), + source_type.clone(), + ) + } else { + if (p1.clone().as_str() + != "".to_string().as_str()) + { + v2_rt::rc_map_insert( + ctx.param_names.clone(), + p1.clone(), + source_type.clone(), + ) + } else { + ctx.param_names.clone() + } + }, + param_order: ctx.param_order.clone(), + type_env: ctx.type_env.clone(), + sub_value_vars: if (p1.clone().as_str() + != "".to_string().as_str()) + { + { + let source_fields = inductive_fields_for( + ctx.type_env.clone(), + source_type.clone(), + ); + let cf = Rc::new({ + let mut __result = Vec::new(); + for f in source_fields + .clone() + .iter() + .cloned() + { + if match f.shape.clone() { RecursionShape::ListRecursion => true, _ => false, -} { __result.push(f); } } __result }).first().cloned(); -let rel = match cf.clone() { +} { __result.push(f); } + } + __result + }) + .first() + .cloned(); + let rel = match cf.clone() { Some(f) => Rc::new(SubValueRelation::IteratedSubValue { field: f.clone(), }), None => Rc::new(SubValueRelation::PreservedValue), }; -if (p2.clone().as_str() != "".to_string().as_str()) { - v2_rt::rc_map_insert(v2_rt::rc_map_insert(ctx.sub_value_vars.clone(), p1.clone(), rel.clone()), p2.clone(), rel.clone()) + if (p2.clone().as_str() + != "".to_string().as_str()) + { + v2_rt::rc_map_insert( + v2_rt::rc_map_insert( + ctx.sub_value_vars.clone(), + p1.clone(), + rel.clone(), + ), + p2.clone(), + rel.clone(), + ) + } else { + v2_rt::rc_map_insert( + ctx.sub_value_vars.clone(), + p1.clone(), + rel.clone(), + ) + } + } + } else { + ctx.sub_value_vars.clone() + }, + size_aliases: ctx.size_aliases.clone(), + scope_locals: ctx.scope_locals.clone(), + func_sigs: ctx.func_sigs.clone(), + per_field_vars: ctx.per_field_vars.clone(), + }); + make_arg_node( + arg_name_at( + child.clone(), + ctx.type_env.clone().source_indices.clone(), + ), + annotate_descent(&arg_val, &lambda_ctx), + child.span.clone(), + child.span.clone(), + ) + } + } else { + make_arg_node( + arg_name_at( + child.clone(), + ctx.type_env.clone().source_indices.clone(), + ), + annotate_descent(&arg_val, &ctx), + child.span.clone(), + child.span.clone(), + ) + } + } + _ => make_arg_node( + arg_name_at( + child.clone(), + ctx.type_env.clone().source_indices.clone(), + ), + annotate_descent(&arg_val, &ctx), + child.span.clone(), + child.span.clone(), + ), + } + }); + } + __result + }); + Rc::new(Node { + name: body.name.clone(), + span: body.span.clone(), + ident_span: body.ident_span.clone(), + children: annotated_children, + connective: body.connective.clone(), + params: body.params.clone(), + inferred: body.inferred.clone(), + return_cardinality: body.return_cardinality.clone(), + uses: body.uses.clone(), + body: body.body.clone(), + transport: body.transport.clone(), + properties: body.properties.clone(), + type_annotation: body.type_annotation.clone(), + is_self_recursive: body.is_self_recursive.clone(), + has_non_tail_self_call: body.has_non_tail_self_call.clone(), + match_pattern: body.match_pattern.clone(), + expr_data: Rc::new(ExprData::ExprCall { + call_semantics: cs.clone(), + descent_evidence: Some(evidence), + }), + ident: None, + }) + } + ExprData::ExprMatch => { + let scrut = match_scrutinee(body.clone()); + let scrut_type = match (*scrut.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let sname = expr_var_name_at( + scrut.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + match v2_rt::map_get(&ctx.param_names.clone(), sname.clone()) { + Some(t) => t.clone(), + None => { + match v2_rt::map_get(&ctx.sub_value_vars.clone(), sname.clone()) { + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { field: f, .. } => { + f.element_type.clone() + } + SubValueRelation::IteratedSubValue { field: f, .. } => { + f.element_type.clone() + } + _ => "".to_string(), + }, + None => "".to_string(), + } + } + } + } + _ => "".to_string(), + }; + let scrut_inducing_field = match (*scrut.expr_data.clone()).clone() { + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(scrut.clone()); + let fname = field_access_field_at( + scrut.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at( + base.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + let base_type = + match v2_rt::map_get(&ctx.param_names.clone(), bname.clone()) { + Some(t) => t.clone(), + None => "".to_string(), + }; + if (base_type.clone().as_str() != "".to_string().as_str()) { + { + let ind_fields = inductive_fields_for( + ctx.type_env.clone(), + base_type.clone(), + ); + Rc::new({ + let mut __result = Vec::new(); + for f in ind_fields.clone().iter().cloned() { + if (f.field_name.clone().as_str() + == fname.clone().as_str()) + { + __result.push(f); + } + } + __result + }) + .first() + .cloned() + } } else { - v2_rt::rc_map_insert(ctx.sub_value_vars.clone(), p1.clone(), rel.clone()) + None } -} - } else { - ctx.sub_value_vars.clone() - }, - size_aliases: ctx.size_aliases.clone(), - scope_locals: ctx.scope_locals.clone(), - func_sigs: ctx.func_sigs.clone(), - per_field_vars: ctx.per_field_vars.clone(), -}); -make_arg_node(arg_name_at(child.clone(), ctx.type_env.clone().source_indices.clone()), annotate_descent(&arg_val, &lambda_ctx), child.span.clone(), child.span.clone()) -} - } else { - make_arg_node(arg_name_at(child.clone(), ctx.type_env.clone().source_indices.clone()), annotate_descent(&arg_val, &ctx), child.span.clone(), child.span.clone()) - }, - _ => make_arg_node(arg_name_at(child.clone(), ctx.type_env.clone().source_indices.clone()), annotate_descent(&arg_val, &ctx), child.span.clone(), child.span.clone()), -} -}); } __result }); -Rc::new(Node { - name: body.name.clone(), - span: body.span.clone(), - ident_span: body.ident_span.clone(), - children: annotated_children, - connective: body.connective.clone(), - params: body.params.clone(), - inferred: body.inferred.clone(), - return_cardinality: body.return_cardinality.clone(), - uses: body.uses.clone(), - body: body.body.clone(), - transport: body.transport.clone(), - properties: body.properties.clone(), - type_annotation: body.type_annotation.clone(), - is_self_recursive: body.is_self_recursive.clone(), - has_non_tail_self_call: body.has_non_tail_self_call.clone(), - match_pattern: body.match_pattern.clone(), - expr_data: Rc::new(ExprData::ExprCall { - call_semantics: cs.clone(), - descent_evidence: Some(evidence), -}), - ident: None, -}) -}, - ExprData::ExprMatch => { - let scrut = match_scrutinee(body.clone()); -let scrut_type = match (*scrut.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let sname = expr_var_name_at(scrut.clone(), ctx.type_env.clone().source_indices.clone()); -match v2_rt::map_get(&ctx.param_names.clone(), sname.clone()) { - Some(t) => t.clone(), - None => match v2_rt::map_get(&ctx.sub_value_vars.clone(), sname.clone()) { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), - SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), - _ => "".to_string(), -}, - None => "".to_string(), -}, -} -}, - _ => "".to_string(), -}; -let scrut_inducing_field = match (*scrut.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(scrut.clone()); -let fname = field_access_field_at(scrut.clone(), ctx.type_env.clone().source_indices.clone()); -match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at(base.clone(), ctx.type_env.clone().source_indices.clone()); -let base_type = match v2_rt::map_get(&ctx.param_names.clone(), bname.clone()) { - Some(t) => t.clone(), - None => "".to_string(), -}; -if (base_type.clone().as_str() != "".to_string().as_str()) { + } + _ => None, + } + } + ExprData::ExprMethodCall { .. } => { + let mname = expr_method_name_at( + scrut.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + if ((mname.clone().as_str() == "first".to_string().as_str()) + || (mname.clone().as_str() == "last".to_string().as_str())) { - let ind_fields = inductive_fields_for(ctx.type_env.clone(), base_type.clone()); -Rc::new({ let mut __result = Vec::new(); for f in ind_fields.clone().iter().cloned() { if (f.field_name.clone().as_str() == fname.clone().as_str()) { __result.push(f); } } __result }).first().cloned() -} - } else { - None + { + let receiver = method_receiver(scrut.clone()); + resolve_collection_field(receiver.clone(), ctx.clone()) + } + } else { + None + } } -}, - _ => None, -} -}, - ExprData::ExprMethodCall { .. } => { - let mname = expr_method_name_at(scrut.clone(), ctx.type_env.clone().source_indices.clone()); -if ((mname.clone().as_str() == "first".to_string().as_str()) || (mname.clone().as_str() == "last".to_string().as_str())) { - { - let receiver = method_receiver(scrut.clone()); -resolve_collection_field(receiver.clone(), ctx.clone()) -} - } else { - None - } -}, - _ => None, -}; -let scrut_has_inductive = (((scrut_type.clone().as_str() != "".to_string().as_str()) && ((inductive_fields_for(ctx.type_env.clone(), scrut_type.clone()).len() as i64) > 0)) || (scrut_inducing_field.clone() != None)); -let scrut_variant_sig = match (*scrut.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { - let callee = expr_call_func_at(scrut.clone(), ctx.type_env.clone().source_indices.clone()); -match v2_rt::map_get(&ctx.func_sigs.clone(), callee) { - Some(sig) => if ((Rc::new(v2_rt::map_keys(&sig.variant_provenance.clone())).len() as i64) > 0) { - Some(sig.clone()) - } else { - None - }, - None => None, -} -}, - _ => None, -}; -let annotated_scrut = annotate_descent(&scrut, &ctx); -let annotated_arms = Rc::new({ let mut __result = Vec::new(); for arm_node in match_arm_nodes(body.clone()).iter().cloned() { __result.push({ + _ => None, + }; + let scrut_has_inductive = (((scrut_type.clone().as_str() + != "".to_string().as_str()) + && ((inductive_fields_for(ctx.type_env.clone(), scrut_type.clone()).len() + as i64) + > 0)) + || (scrut_inducing_field.clone() != None)); + let scrut_variant_sig = match (*scrut.expr_data.clone()).clone() { + ExprData::ExprCall { .. } => { + let callee = expr_call_func_at( + scrut.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + match v2_rt::map_get(&ctx.func_sigs.clone(), callee) { + Some(sig) => { + if ((Rc::new(v2_rt::map_keys(&sig.variant_provenance.clone())).len() + as i64) + > 0) + { + Some(sig.clone()) + } else { + None + } + } + None => None, + } + } + _ => None, + }; + let annotated_scrut = annotate_descent(&scrut, &ctx); + let annotated_arms = Rc::new({ + let mut __result = Vec::new(); + for arm_node in match_arm_nodes(body.clone()).iter().cloned() { + __result.push({ let variant_arm_ctx = match scrut_variant_sig.clone() { Some(sig) => arm_ctx_from_variant_provenance(arm_node.clone(), sig.clone(), scrut.clone(), &ctx), None => None, @@ -4018,550 +6751,905 @@ match matching.clone() { }; let annotated_body = annotate_descent(&arm_body(&arm_node), &arm_ctx); make_arm_node(arm_pattern(arm_node.clone()), arm_guard(&arm_node), annotated_body.clone(), arm_node.span.clone()) -}); } __result }); -Rc::new(Node { - name: body.name.clone(), - span: body.span.clone(), - ident_span: body.ident_span.clone(), - children: v2_rt::concat(Rc::new(vec![annotated_scrut]), annotated_arms), - connective: body.connective.clone(), - params: body.params.clone(), - inferred: body.inferred.clone(), - return_cardinality: body.return_cardinality.clone(), - uses: body.uses.clone(), - body: body.body.clone(), - transport: body.transport.clone(), - properties: body.properties.clone(), - type_annotation: body.type_annotation.clone(), - is_self_recursive: body.is_self_recursive.clone(), - has_non_tail_self_call: body.has_non_tail_self_call.clone(), - match_pattern: body.match_pattern.clone(), - expr_data: body.expr_data.clone(), - ident: None, -}) -}, - ExprData::ExprLet => { - let val = let_value(body.clone()); -let binding_name = let_binding_name_at(body.clone(), ctx.type_env.clone().source_indices.clone()); -let val_relation = classify_let_value(&val, &ctx); -let size_alias = classify_size_expr(&val, &ctx); -let inner_size_aliases = match size_alias { - Some(se) => v2_rt::rc_map_insert(ctx.size_aliases.clone(), binding_name.clone(), se.clone()), - None => ctx.size_aliases.clone(), -}; -let inner_per_field = build_per_field_for_let(&val, binding_name.clone(), &ctx); -let inner_ctx = match val_relation { - Some(rel) => { - let sub_type = match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), - SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), - _ => "".to_string(), -}; -Rc::new(DescentContext { - fn_name: ctx.fn_name.clone(), - param_names: if (sub_type.clone().as_str() != "".to_string().as_str()) { - v2_rt::rc_map_insert(ctx.param_names.clone(), binding_name.clone(), sub_type.clone()) - } else { - ctx.param_names.clone() - }, - param_order: ctx.param_order.clone(), - type_env: ctx.type_env.clone(), - sub_value_vars: v2_rt::rc_map_insert(ctx.sub_value_vars.clone(), binding_name.clone(), rel.clone()), - size_aliases: inner_size_aliases, - scope_locals: v2_rt::rc_map_insert(ctx.scope_locals.clone(), binding_name.clone(), Rc::new(TypeBinding { - name: binding_name.clone(), - resolved: resolved_type(val.clone()), - provenance: rel.clone(), -})), - func_sigs: ctx.func_sigs.clone(), - per_field_vars: inner_per_field, -}) -}, - None => Rc::new(DescentContext { - fn_name: ctx.fn_name.clone(), - param_names: ctx.param_names.clone(), - param_order: ctx.param_order.clone(), - type_env: ctx.type_env.clone(), - sub_value_vars: ctx.sub_value_vars.clone(), - size_aliases: inner_size_aliases, - scope_locals: v2_rt::rc_map_insert(ctx.scope_locals.clone(), binding_name.clone(), Rc::new(TypeBinding { - name: binding_name.clone(), - resolved: resolved_type(val.clone()), - provenance: Rc::new(SubValueRelation::SubValueUnknown), -})), - func_sigs: ctx.func_sigs.clone(), - per_field_vars: inner_per_field, -}), -}; -let annotated_value = annotate_descent(&val, &ctx); -let annotated_children = match let_body(body.clone()) { - Some(body_child) => Rc::new(vec![annotated_value, annotate_descent(&body_child, &inner_ctx)]), - None => Rc::new(vec![annotated_value]), -}; -Rc::new(Node { - name: body.name.clone(), - span: body.span.clone(), - ident_span: body.ident_span.clone(), - children: annotated_children, - connective: body.connective.clone(), - params: body.params.clone(), - inferred: body.inferred.clone(), - return_cardinality: body.return_cardinality.clone(), - uses: body.uses.clone(), - body: body.body.clone(), - transport: body.transport.clone(), - properties: body.properties.clone(), - type_annotation: body.type_annotation.clone(), - is_self_recursive: body.is_self_recursive.clone(), - has_non_tail_self_call: body.has_non_tail_self_call.clone(), - match_pattern: body.match_pattern.clone(), - expr_data: body.expr_data.clone(), - ident: None, -}) -}, - ExprData::ExprBlock => { - let threaded = body.children.clone().iter().cloned().fold(Rc::new(BlockAnnotateAcc { - ctx: ctx.clone(), - children: Rc::new(vec![]), -}), |acc: Rc, child: Rc| { - let annotated = annotate_descent(&child, &acc.ctx.clone()); -let next_ctx = match (*child.expr_data.clone()).clone() { - ExprData::ExprLet => { - let val = let_value(child.clone()); -let bname = let_binding_name_at(child.clone(), ctx.type_env.clone().source_indices.clone()); -let val_rel = classify_let_value(&val, &acc.ctx.clone()); -let sa = classify_size_expr(&val, &acc.ctx.clone()); -let new_sa = match sa.clone() { - Some(se) => v2_rt::rc_map_insert(acc.ctx.clone().size_aliases.clone(), bname.clone(), se.clone()), - None => acc.ctx.clone().size_aliases.clone(), -}; -match val_rel.clone() { - Some(rel) => { - let sub_type = match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), - SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), - _ => "".to_string(), -}; -Rc::new(DescentContext { - fn_name: acc.ctx.clone().fn_name.clone(), - param_names: if (sub_type.clone().as_str() != "".to_string().as_str()) { - v2_rt::rc_map_insert(acc.ctx.clone().param_names.clone(), bname.clone(), sub_type.clone()) - } else { - acc.ctx.clone().param_names.clone() - }, - param_order: acc.ctx.clone().param_order.clone(), - type_env: acc.ctx.clone().type_env.clone(), - sub_value_vars: v2_rt::rc_map_insert(acc.ctx.clone().sub_value_vars.clone(), bname.clone(), rel.clone()), - size_aliases: new_sa.clone(), - scope_locals: v2_rt::rc_map_insert(acc.ctx.clone().scope_locals.clone(), bname.clone(), Rc::new(TypeBinding { - name: bname.clone(), - resolved: resolved_type(val.clone()), - provenance: rel.clone(), -})), - func_sigs: acc.ctx.clone().func_sigs.clone(), - per_field_vars: acc.ctx.clone().per_field_vars.clone(), -}) -}, - None => Rc::new(DescentContext { - fn_name: acc.ctx.clone().fn_name.clone(), - param_names: acc.ctx.clone().param_names.clone(), - param_order: acc.ctx.clone().param_order.clone(), - type_env: acc.ctx.clone().type_env.clone(), - sub_value_vars: acc.ctx.clone().sub_value_vars.clone(), - size_aliases: new_sa.clone(), - scope_locals: v2_rt::rc_map_insert(acc.ctx.clone().scope_locals.clone(), bname.clone(), Rc::new(TypeBinding { - name: bname.clone(), - resolved: resolved_type(val.clone()), - provenance: Rc::new(SubValueRelation::SubValueUnknown), -})), - func_sigs: acc.ctx.clone().func_sigs.clone(), - per_field_vars: acc.ctx.clone().per_field_vars.clone(), -}), -} -}, - _ => acc.ctx.clone(), -}; -Rc::new(BlockAnnotateAcc { - ctx: next_ctx.clone(), - children: v2_rt::concat(acc.children.clone(), Rc::new(vec![annotated.clone()])), -}) }); -Rc::new(Node { - name: body.name.clone(), - span: body.span.clone(), - ident_span: body.ident_span.clone(), - children: threaded.children.clone(), - connective: body.connective.clone(), - params: body.params.clone(), - inferred: body.inferred.clone(), - return_cardinality: body.return_cardinality.clone(), - uses: body.uses.clone(), - body: body.body.clone(), - transport: body.transport.clone(), - properties: body.properties.clone(), - type_annotation: body.type_annotation.clone(), - is_self_recursive: body.is_self_recursive.clone(), - has_non_tail_self_call: body.has_non_tail_self_call.clone(), - match_pattern: body.match_pattern.clone(), - expr_data: body.expr_data.clone(), - ident: None, -}) -}, - ExprData::ExprMethodCall { method_semantics: ms, .. } => { - let mname = expr_method_name_at(body.clone(), ctx.type_env.clone().source_indices.clone()); -let elem_position = method_callback_element_position(ms.clone()); -if (elem_position.clone() != None) { - { - let raw_receiver = method_receiver(body.clone()); -let receiver = match (*raw_receiver.expr_data.clone()).clone() { - ExprData::ExprMethodCall { .. } => { - let inner_mname = expr_method_name_at(raw_receiver.clone(), ctx.type_env.clone().source_indices.clone()); -if (inner_mname.as_str() == "enumerate".to_string().as_str()) { - method_receiver(raw_receiver.clone()) - } else { - raw_receiver.clone() - } -}, - _ => raw_receiver.clone(), -}; -let receiver_field = match (*receiver.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(receiver.clone()); -let fname = field_access_field_at(receiver.clone(), ctx.type_env.clone().source_indices.clone()); -match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let bname = expr_var_name_at(base.clone(), ctx.type_env.clone().source_indices.clone()); -let base_type = match v2_rt::map_get(&ctx.param_names.clone(), bname.clone()) { - Some(t) => t.clone(), - None => match v2_rt::map_get(&ctx.sub_value_vars.clone(), bname.clone()) { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), - SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), - _ => "".to_string(), -}, - None => "".to_string(), -}, -}; -if (base_type.clone().as_str() != "".to_string().as_str()) { - Rc::new({ let mut __result = Vec::new(); for f in inductive_fields_for(ctx.type_env.clone(), base_type.clone()).iter().cloned() { if (f.field_name.clone().as_str() == fname.clone().as_str()) { __result.push(f); } } __result }).first().cloned() + } + __result + }); + Rc::new(Node { + name: body.name.clone(), + span: body.span.clone(), + ident_span: body.ident_span.clone(), + children: v2_rt::concat(Rc::new(vec![annotated_scrut]), annotated_arms), + connective: body.connective.clone(), + params: body.params.clone(), + inferred: body.inferred.clone(), + return_cardinality: body.return_cardinality.clone(), + uses: body.uses.clone(), + body: body.body.clone(), + transport: body.transport.clone(), + properties: body.properties.clone(), + type_annotation: body.type_annotation.clone(), + is_self_recursive: body.is_self_recursive.clone(), + has_non_tail_self_call: body.has_non_tail_self_call.clone(), + match_pattern: body.match_pattern.clone(), + expr_data: body.expr_data.clone(), + ident: None, + }) + } + ExprData::ExprLet => { + let val = let_value(body.clone()); + let binding_name = + let_binding_name_at(body.clone(), ctx.type_env.clone().source_indices.clone()); + let val_relation = classify_let_value(&val, &ctx); + let size_alias = classify_size_expr(&val, &ctx); + let inner_size_aliases = match size_alias { + Some(se) => v2_rt::rc_map_insert( + ctx.size_aliases.clone(), + binding_name.clone(), + se.clone(), + ), + None => ctx.size_aliases.clone(), + }; + let inner_per_field = build_per_field_for_let(&val, binding_name.clone(), &ctx); + let inner_ctx = match val_relation { + Some(rel) => { + let sub_type = match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { field: f, .. } => { + f.element_type.clone() + } + SubValueRelation::IteratedSubValue { field: f, .. } => { + f.element_type.clone() + } + _ => "".to_string(), + }; + Rc::new(DescentContext { + fn_name: ctx.fn_name.clone(), + param_names: if (sub_type.clone().as_str() != "".to_string().as_str()) { + v2_rt::rc_map_insert( + ctx.param_names.clone(), + binding_name.clone(), + sub_type.clone(), + ) } else { - None + ctx.param_names.clone() + }, + param_order: ctx.param_order.clone(), + type_env: ctx.type_env.clone(), + sub_value_vars: v2_rt::rc_map_insert( + ctx.sub_value_vars.clone(), + binding_name.clone(), + rel.clone(), + ), + size_aliases: inner_size_aliases, + scope_locals: v2_rt::rc_map_insert( + ctx.scope_locals.clone(), + binding_name.clone(), + Rc::new(TypeBinding { + name: binding_name.clone(), + resolved: resolved_type(val.clone()), + provenance: rel.clone(), + }), + ), + func_sigs: ctx.func_sigs.clone(), + per_field_vars: inner_per_field, + }) + } + None => Rc::new(DescentContext { + fn_name: ctx.fn_name.clone(), + param_names: ctx.param_names.clone(), + param_order: ctx.param_order.clone(), + type_env: ctx.type_env.clone(), + sub_value_vars: ctx.sub_value_vars.clone(), + size_aliases: inner_size_aliases, + scope_locals: v2_rt::rc_map_insert( + ctx.scope_locals.clone(), + binding_name.clone(), + Rc::new(TypeBinding { + name: binding_name.clone(), + resolved: resolved_type(val.clone()), + provenance: Rc::new(SubValueRelation::SubValueUnknown), + }), + ), + func_sigs: ctx.func_sigs.clone(), + per_field_vars: inner_per_field, + }), + }; + let annotated_value = annotate_descent(&val, &ctx); + let annotated_children = match let_body(body.clone()) { + Some(body_child) => Rc::new(vec![ + annotated_value, + annotate_descent(&body_child, &inner_ctx), + ]), + None => Rc::new(vec![annotated_value]), + }; + Rc::new(Node { + name: body.name.clone(), + span: body.span.clone(), + ident_span: body.ident_span.clone(), + children: annotated_children, + connective: body.connective.clone(), + params: body.params.clone(), + inferred: body.inferred.clone(), + return_cardinality: body.return_cardinality.clone(), + uses: body.uses.clone(), + body: body.body.clone(), + transport: body.transport.clone(), + properties: body.properties.clone(), + type_annotation: body.type_annotation.clone(), + is_self_recursive: body.is_self_recursive.clone(), + has_non_tail_self_call: body.has_non_tail_self_call.clone(), + match_pattern: body.match_pattern.clone(), + expr_data: body.expr_data.clone(), + ident: None, + }) + } + ExprData::ExprBlock => { + let threaded = body.children.clone().iter().cloned().fold( + Rc::new(BlockAnnotateAcc { + ctx: ctx.clone(), + children: Rc::new(vec![]), + }), + |acc: Rc, child: Rc| { + let annotated = annotate_descent(&child, &acc.ctx.clone()); + let next_ctx = match (*child.expr_data.clone()).clone() { + ExprData::ExprLet => { + let val = let_value(child.clone()); + let bname = let_binding_name_at( + child.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + let val_rel = classify_let_value(&val, &acc.ctx.clone()); + let sa = classify_size_expr(&val, &acc.ctx.clone()); + let new_sa = match sa.clone() { + Some(se) => v2_rt::rc_map_insert( + acc.ctx.clone().size_aliases.clone(), + bname.clone(), + se.clone(), + ), + None => acc.ctx.clone().size_aliases.clone(), + }; + match val_rel.clone() { + Some(rel) => { + let sub_type = match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { + field: f, .. + } => f.element_type.clone(), + SubValueRelation::IteratedSubValue { + field: f, .. + } => f.element_type.clone(), + _ => "".to_string(), + }; + Rc::new(DescentContext { + fn_name: acc.ctx.clone().fn_name.clone(), + param_names: if (sub_type.clone().as_str() + != "".to_string().as_str()) + { + v2_rt::rc_map_insert( + acc.ctx.clone().param_names.clone(), + bname.clone(), + sub_type.clone(), + ) + } else { + acc.ctx.clone().param_names.clone() + }, + param_order: acc.ctx.clone().param_order.clone(), + type_env: acc.ctx.clone().type_env.clone(), + sub_value_vars: v2_rt::rc_map_insert( + acc.ctx.clone().sub_value_vars.clone(), + bname.clone(), + rel.clone(), + ), + size_aliases: new_sa.clone(), + scope_locals: v2_rt::rc_map_insert( + acc.ctx.clone().scope_locals.clone(), + bname.clone(), + Rc::new(TypeBinding { + name: bname.clone(), + resolved: resolved_type(val.clone()), + provenance: rel.clone(), + }), + ), + func_sigs: acc.ctx.clone().func_sigs.clone(), + per_field_vars: acc.ctx.clone().per_field_vars.clone(), + }) + } + None => Rc::new(DescentContext { + fn_name: acc.ctx.clone().fn_name.clone(), + param_names: acc.ctx.clone().param_names.clone(), + param_order: acc.ctx.clone().param_order.clone(), + type_env: acc.ctx.clone().type_env.clone(), + sub_value_vars: acc.ctx.clone().sub_value_vars.clone(), + size_aliases: new_sa.clone(), + scope_locals: v2_rt::rc_map_insert( + acc.ctx.clone().scope_locals.clone(), + bname.clone(), + Rc::new(TypeBinding { + name: bname.clone(), + resolved: resolved_type(val.clone()), + provenance: Rc::new( + SubValueRelation::SubValueUnknown, + ), + }), + ), + func_sigs: acc.ctx.clone().func_sigs.clone(), + per_field_vars: acc.ctx.clone().per_field_vars.clone(), + }), + } } -}, - _ => None, -} -}, - ExprData::ExprVar { .. } => { - let rname = expr_var_name_at(receiver.clone(), ctx.type_env.clone().source_indices.clone()); -match v2_rt::map_get(&ctx.sub_value_vars.clone(), rname) { - Some(rel) => match (*rel.clone()).clone() { - SubValueRelation::StrictSubValue { field: f, .. } => match f.shape.clone() { - RecursionShape::ListRecursion => Some(f.clone()), - _ => None, -}, - SubValueRelation::IteratedSubValue { field: f, .. } => match f.shape.clone() { - RecursionShape::ListRecursion => Some(f.clone()), - _ => None, -}, - _ => None, -}, - None => None, -} -}, - _ => None, -}; -let method_args = method_arg_nodes(body.clone()); -let lambda_arg = Rc::new({ let mut __result = Vec::new(); for a in method_args.iter().cloned() { if match (*arg_value(&a).expr_data.clone()).clone() { - ExprData::ExprLambda => true, - _ => false, -} { __result.push(a); } } __result }).first().cloned(); -let lambda_elem_info = match lambda_arg { - Some(la) => { - let lambda_node = arg_value(&la); -let lparams = lambda_param_names_at(lambda_node, ctx.type_env.clone().source_indices.clone()); -lparams.clone().get(elem_position.clone().unwrap() as usize).cloned() -}, - None => None, -}; -let is_fold = (elem_position.clone().unwrap() > 0); -let inner_ctx = match lambda_elem_info { - Some(elem_name) => match receiver_field { - Some(ind_field) => Rc::new(DescentContext { - fn_name: ctx.fn_name.clone(), - param_names: v2_rt::rc_map_insert(ctx.param_names.clone(), elem_name.clone(), ind_field.element_type.clone()), - param_order: ctx.param_order.clone(), - type_env: ctx.type_env.clone(), - sub_value_vars: if is_fold { - v2_rt::rc_map_insert(v2_rt::rc_empty_map::>(), elem_name.clone(), Rc::new(SubValueRelation::IteratedSubValue { - field: ind_field.clone(), -})) - } else { - v2_rt::rc_map_insert(ctx.sub_value_vars.clone(), elem_name.clone(), Rc::new(SubValueRelation::IteratedSubValue { - field: ind_field.clone(), -})) - }, - size_aliases: ctx.size_aliases.clone(), - scope_locals: ctx.scope_locals.clone(), - func_sigs: ctx.func_sigs.clone(), - per_field_vars: ctx.per_field_vars.clone(), -}), - None => Rc::new(DescentContext { - fn_name: ctx.fn_name.clone(), - param_names: ctx.param_names.clone(), - param_order: ctx.param_order.clone(), - type_env: ctx.type_env.clone(), - sub_value_vars: if is_fold { - v2_rt::rc_empty_map::>() - } else { - ctx.sub_value_vars.clone() + _ => acc.ctx.clone(), + }; + Rc::new(BlockAnnotateAcc { + ctx: next_ctx.clone(), + children: v2_rt::concat( + acc.children.clone(), + Rc::new(vec![annotated.clone()]), + ), + }) }, - size_aliases: ctx.size_aliases.clone(), - scope_locals: ctx.scope_locals.clone(), - func_sigs: ctx.func_sigs.clone(), - per_field_vars: ctx.per_field_vars.clone(), -}), -}, - None => ctx.clone(), -}; -let annotated_receiver = annotate_descent(&method_receiver(body.clone()), &ctx); -let annotated_args = Rc::new({ let mut __result = Vec::new(); for arg_node in method_arg_nodes(body.clone()).iter().cloned() { __result.push({ - let arg_val = arg_value(&arg_node); -let is_lambda = match (*arg_val.expr_data.clone()).clone() { - ExprData::ExprLambda => true, - _ => false, -}; -if is_lambda.clone() { - make_arg_node(match arg_name_at(arg_node.clone(), ctx.type_env.clone().source_indices.clone()) { - Some(n) => Some(n.clone()), - None => None, -}, annotate_descent(&arg_val, &inner_ctx), arg_node.span.clone(), arg_node.span.clone()) - } else { - make_arg_node(match arg_name_at(arg_node.clone(), ctx.type_env.clone().source_indices.clone()) { - Some(n) => Some(n.clone()), - None => None, -}, annotate_descent(&arg_val, &ctx), arg_node.span.clone(), arg_node.span.clone()) - } -}); } __result }); -Rc::new(Node { - name: body.name.clone(), - span: body.span.clone(), - ident_span: body.ident_span.clone(), - children: v2_rt::concat(Rc::new(vec![annotated_receiver]), annotated_args), - connective: body.connective.clone(), - params: body.params.clone(), - inferred: body.inferred.clone(), - return_cardinality: body.return_cardinality.clone(), - uses: body.uses.clone(), - body: body.body.clone(), - transport: body.transport.clone(), - properties: body.properties.clone(), - type_annotation: body.type_annotation.clone(), - is_self_recursive: body.is_self_recursive.clone(), - has_non_tail_self_call: body.has_non_tail_self_call.clone(), - match_pattern: body.match_pattern.clone(), - expr_data: body.expr_data.clone(), - ident: None, -}) -} - } else { - map_children(&body, |child| annotate_descent(&child, &ctx)) + ); + Rc::new(Node { + name: body.name.clone(), + span: body.span.clone(), + ident_span: body.ident_span.clone(), + children: threaded.children.clone(), + connective: body.connective.clone(), + params: body.params.clone(), + inferred: body.inferred.clone(), + return_cardinality: body.return_cardinality.clone(), + uses: body.uses.clone(), + body: body.body.clone(), + transport: body.transport.clone(), + properties: body.properties.clone(), + type_annotation: body.type_annotation.clone(), + is_self_recursive: body.is_self_recursive.clone(), + has_non_tail_self_call: body.has_non_tail_self_call.clone(), + match_pattern: body.match_pattern.clone(), + expr_data: body.expr_data.clone(), + ident: None, + }) + } + ExprData::ExprMethodCall { + method_semantics: ms, + .. + } => { + let mname = + expr_method_name_at(body.clone(), ctx.type_env.clone().source_indices.clone()); + let elem_position = method_callback_element_position(ms.clone()); + if (elem_position.clone() != None) { + { + let raw_receiver = method_receiver(body.clone()); + let receiver = match (*raw_receiver.expr_data.clone()).clone() { + ExprData::ExprMethodCall { .. } => { + let inner_mname = expr_method_name_at( + raw_receiver.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + if (inner_mname.as_str() == "enumerate".to_string().as_str()) { + method_receiver(raw_receiver.clone()) + } else { + raw_receiver.clone() + } + } + _ => raw_receiver.clone(), + }; + let receiver_field = match (*receiver.expr_data.clone()).clone() { + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(receiver.clone()); + let fname = field_access_field_at( + receiver.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let bname = expr_var_name_at( + base.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + let base_type = match v2_rt::map_get( + &ctx.param_names.clone(), + bname.clone(), + ) { + Some(t) => t.clone(), + None => match v2_rt::map_get( + &ctx.sub_value_vars.clone(), + bname.clone(), + ) { + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { + field: f, + .. + } => f.element_type.clone(), + SubValueRelation::IteratedSubValue { + field: f, + .. + } => f.element_type.clone(), + _ => "".to_string(), + }, + None => "".to_string(), + }, + }; + if (base_type.clone().as_str() != "".to_string().as_str()) { + Rc::new({ + let mut __result = Vec::new(); + for f in inductive_fields_for( + ctx.type_env.clone(), + base_type.clone(), + ) + .iter() + .cloned() + { + if (f.field_name.clone().as_str() + == fname.clone().as_str()) + { + __result.push(f); + } + } + __result + }) + .first() + .cloned() + } else { + None + } + } + _ => None, + } + } + ExprData::ExprVar { .. } => { + let rname = expr_var_name_at( + receiver.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + match v2_rt::map_get(&ctx.sub_value_vars.clone(), rname) { + Some(rel) => match (*rel.clone()).clone() { + SubValueRelation::StrictSubValue { field: f, .. } => { + match f.shape.clone() { + RecursionShape::ListRecursion => Some(f.clone()), + _ => None, + } + } + SubValueRelation::IteratedSubValue { field: f, .. } => { + match f.shape.clone() { + RecursionShape::ListRecursion => Some(f.clone()), + _ => None, + } + } + _ => None, + }, + None => None, + } + } + _ => None, + }; + let method_args = method_arg_nodes(body.clone()); + let lambda_arg = Rc::new({ + let mut __result = Vec::new(); + for a in method_args.iter().cloned() { + if match (*arg_value(&a).expr_data.clone()).clone() { + ExprData::ExprLambda => true, + _ => false, + } { + __result.push(a); + } + } + __result + }) + .first() + .cloned(); + let lambda_elem_info = match lambda_arg { + Some(la) => { + let lambda_node = arg_value(&la); + let lparams = lambda_param_names_at( + lambda_node, + ctx.type_env.clone().source_indices.clone(), + ); + lparams + .clone() + .get(elem_position.clone().unwrap() as usize) + .cloned() + } + None => None, + }; + let is_fold = (elem_position.clone().unwrap() > 0); + let inner_ctx = match lambda_elem_info { + Some(elem_name) => match receiver_field { + Some(ind_field) => Rc::new(DescentContext { + fn_name: ctx.fn_name.clone(), + param_names: v2_rt::rc_map_insert( + ctx.param_names.clone(), + elem_name.clone(), + ind_field.element_type.clone(), + ), + param_order: ctx.param_order.clone(), + type_env: ctx.type_env.clone(), + sub_value_vars: if is_fold { + v2_rt::rc_map_insert( + v2_rt::rc_empty_map::>(), + elem_name.clone(), + Rc::new(SubValueRelation::IteratedSubValue { + field: ind_field.clone(), + }), + ) + } else { + v2_rt::rc_map_insert( + ctx.sub_value_vars.clone(), + elem_name.clone(), + Rc::new(SubValueRelation::IteratedSubValue { + field: ind_field.clone(), + }), + ) + }, + size_aliases: ctx.size_aliases.clone(), + scope_locals: ctx.scope_locals.clone(), + func_sigs: ctx.func_sigs.clone(), + per_field_vars: ctx.per_field_vars.clone(), + }), + None => Rc::new(DescentContext { + fn_name: ctx.fn_name.clone(), + param_names: ctx.param_names.clone(), + param_order: ctx.param_order.clone(), + type_env: ctx.type_env.clone(), + sub_value_vars: if is_fold { + v2_rt::rc_empty_map::>() + } else { + ctx.sub_value_vars.clone() + }, + size_aliases: ctx.size_aliases.clone(), + scope_locals: ctx.scope_locals.clone(), + func_sigs: ctx.func_sigs.clone(), + per_field_vars: ctx.per_field_vars.clone(), + }), + }, + None => ctx.clone(), + }; + let annotated_receiver = + annotate_descent(&method_receiver(body.clone()), &ctx); + let annotated_args = Rc::new({ + let mut __result = Vec::new(); + for arg_node in method_arg_nodes(body.clone()).iter().cloned() { + __result.push({ + let arg_val = arg_value(&arg_node); + let is_lambda = match (*arg_val.expr_data.clone()).clone() { + ExprData::ExprLambda => true, + _ => false, + }; + if is_lambda.clone() { + make_arg_node( + match arg_name_at( + arg_node.clone(), + ctx.type_env.clone().source_indices.clone(), + ) { + Some(n) => Some(n.clone()), + None => None, + }, + annotate_descent(&arg_val, &inner_ctx), + arg_node.span.clone(), + arg_node.span.clone(), + ) + } else { + make_arg_node( + match arg_name_at( + arg_node.clone(), + ctx.type_env.clone().source_indices.clone(), + ) { + Some(n) => Some(n.clone()), + None => None, + }, + annotate_descent(&arg_val, &ctx), + arg_node.span.clone(), + arg_node.span.clone(), + ) + } + }); + } + __result + }); + Rc::new(Node { + name: body.name.clone(), + span: body.span.clone(), + ident_span: body.ident_span.clone(), + children: v2_rt::concat( + Rc::new(vec![annotated_receiver]), + annotated_args, + ), + connective: body.connective.clone(), + params: body.params.clone(), + inferred: body.inferred.clone(), + return_cardinality: body.return_cardinality.clone(), + uses: body.uses.clone(), + body: body.body.clone(), + transport: body.transport.clone(), + properties: body.properties.clone(), + type_annotation: body.type_annotation.clone(), + is_self_recursive: body.is_self_recursive.clone(), + has_non_tail_self_call: body.has_non_tail_self_call.clone(), + match_pattern: body.match_pattern.clone(), + expr_data: body.expr_data.clone(), + ident: None, + }) + } + } else { + map_children(&body, |child| annotate_descent(&child, &ctx)) + } } -}, - ExprData::ExprForEach => { - let coll = foreach_collection(body.clone()); -let fe_body = foreach_body(body.clone()); -let fe_var = foreach_variable_at(body.clone(), ctx.type_env.clone().source_indices.clone()); -let coll_field = resolve_collection_field(coll.clone(), ctx.clone()); -let inner_ctx = match coll_field { - Some(ind_field) => Rc::new(DescentContext { - fn_name: ctx.fn_name.clone(), - param_names: v2_rt::rc_map_insert(ctx.param_names.clone(), fe_var.clone(), ind_field.element_type.clone()), - param_order: ctx.param_order.clone(), - type_env: ctx.type_env.clone(), - sub_value_vars: v2_rt::rc_map_insert(v2_rt::rc_empty_map::>(), fe_var.clone(), Rc::new(SubValueRelation::IteratedSubValue { - field: ind_field.clone(), -})), - size_aliases: ctx.size_aliases.clone(), - scope_locals: ctx.scope_locals.clone(), - func_sigs: ctx.func_sigs.clone(), - per_field_vars: ctx.per_field_vars.clone(), -}), - None => Rc::new(DescentContext { - fn_name: ctx.fn_name.clone(), - param_names: ctx.param_names.clone(), - param_order: ctx.param_order.clone(), - type_env: ctx.type_env.clone(), - sub_value_vars: v2_rt::rc_empty_map::>(), - size_aliases: ctx.size_aliases.clone(), - scope_locals: ctx.scope_locals.clone(), - func_sigs: ctx.func_sigs.clone(), - per_field_vars: ctx.per_field_vars.clone(), -}), -}; -let annotated_coll = annotate_descent(&coll, &ctx); -let annotated_body = annotate_descent(&fe_body, &inner_ctx); -Rc::new(Node { - name: body.name.clone(), - span: body.span.clone(), - ident_span: body.ident_span.clone(), - children: Rc::new(vec![annotated_coll, annotated_body.clone()]), - connective: body.connective.clone(), - params: body.params.clone(), - inferred: body.inferred.clone(), - return_cardinality: body.return_cardinality.clone(), - uses: body.uses.clone(), - body: body.body.clone(), - transport: body.transport.clone(), - properties: body.properties.clone(), - type_annotation: body.type_annotation.clone(), - is_self_recursive: body.is_self_recursive.clone(), - has_non_tail_self_call: body.has_non_tail_self_call.clone(), - match_pattern: body.match_pattern.clone(), - expr_data: body.expr_data.clone(), - ident: None, -}) -}, - _ => map_children(&body, |child| annotate_descent(&child, &ctx)), -} + ExprData::ExprForEach => { + let coll = foreach_collection(body.clone()); + let fe_body = foreach_body(body.clone()); + let fe_var = + foreach_variable_at(body.clone(), ctx.type_env.clone().source_indices.clone()); + let coll_field = resolve_collection_field(coll.clone(), ctx.clone()); + let inner_ctx = match coll_field { + Some(ind_field) => Rc::new(DescentContext { + fn_name: ctx.fn_name.clone(), + param_names: v2_rt::rc_map_insert( + ctx.param_names.clone(), + fe_var.clone(), + ind_field.element_type.clone(), + ), + param_order: ctx.param_order.clone(), + type_env: ctx.type_env.clone(), + sub_value_vars: v2_rt::rc_map_insert( + v2_rt::rc_empty_map::>(), + fe_var.clone(), + Rc::new(SubValueRelation::IteratedSubValue { + field: ind_field.clone(), + }), + ), + size_aliases: ctx.size_aliases.clone(), + scope_locals: ctx.scope_locals.clone(), + func_sigs: ctx.func_sigs.clone(), + per_field_vars: ctx.per_field_vars.clone(), + }), + None => Rc::new(DescentContext { + fn_name: ctx.fn_name.clone(), + param_names: ctx.param_names.clone(), + param_order: ctx.param_order.clone(), + type_env: ctx.type_env.clone(), + sub_value_vars: v2_rt::rc_empty_map::>(), + size_aliases: ctx.size_aliases.clone(), + scope_locals: ctx.scope_locals.clone(), + func_sigs: ctx.func_sigs.clone(), + per_field_vars: ctx.per_field_vars.clone(), + }), + }; + let annotated_coll = annotate_descent(&coll, &ctx); + let annotated_body = annotate_descent(&fe_body, &inner_ctx); + Rc::new(Node { + name: body.name.clone(), + span: body.span.clone(), + ident_span: body.ident_span.clone(), + children: Rc::new(vec![annotated_coll, annotated_body.clone()]), + connective: body.connective.clone(), + params: body.params.clone(), + inferred: body.inferred.clone(), + return_cardinality: body.return_cardinality.clone(), + uses: body.uses.clone(), + body: body.body.clone(), + transport: body.transport.clone(), + properties: body.properties.clone(), + type_annotation: body.type_annotation.clone(), + is_self_recursive: body.is_self_recursive.clone(), + has_non_tail_self_call: body.has_non_tail_self_call.clone(), + match_pattern: body.match_pattern.clone(), + expr_data: body.expr_data.clone(), + ident: None, + }) + } + _ => map_children(&body, |child| annotate_descent(&child, &ctx)), + } }) } -pub fn resolved_type_name(n: &Rc, source_indices: Rc>>) -> String { +pub fn resolved_type_name( + n: &Rc, + source_indices: Rc>>, +) -> String { match n.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => authored_name_at(source_indices, &rt), - _ => match n.children.clone().first().cloned() { - Some(c) => authored_name_at(source_indices, &c), - None => "".to_string(), -}, -} + Some(InferredNode::Resolved { node: rt, .. }) => authored_name_at(source_indices, &rt), + _ => match n.children.clone().first().cloned() { + Some(c) => authored_name_at(source_indices, &c), + None => "".to_string(), + }, + } } -pub fn infer_output_provenance(body: &Rc, params: &Rc>>, type_env: &Rc, scope_locals: Rc>>, func_sigs: &Rc>>) -> Rc>>>> { +pub fn infer_output_provenance( + body: &Rc, + params: &Rc>>, + type_env: &Rc, + scope_locals: Rc>>, + func_sigs: &Rc>>, +) -> Rc>>>> { { - let param_names = Rc::new({ let mut __result = Vec::new(); for p in params.clone().iter().cloned() { __result.push(param_node_name_at(p.clone(), type_env.source_indices.clone())); } __result }); -let param_types = params.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, p: Rc| { - let pname = param_node_name_at(p.clone(), type_env.source_indices.clone()); -let ptype = resolved_type_name(&p, type_env.source_indices.clone()); -if ((pname.clone().as_str() != "".to_string().as_str()) && (ptype.clone().as_str() != "".to_string().as_str())) { - v2_rt::rc_map_insert(acc.clone(), pname.clone(), ptype.clone()) - } else { - acc.clone() + let param_names = Rc::new({ + let mut __result = Vec::new(); + for p in params.clone().iter().cloned() { + __result.push(param_node_name_at( + p.clone(), + type_env.source_indices.clone(), + )); } -}); -let scalar = classify_body_provenance(&body, ¶m_names, ¶m_types, &type_env, &func_sigs, &v2_rt::rc_empty_map::>>>()); -if ((Rc::new(v2_rt::map_keys(&scalar)).len() as i64) > 0) { + __result + }); + let param_types = params.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, p: Rc| { + let pname = param_node_name_at(p.clone(), type_env.source_indices.clone()); + let ptype = resolved_type_name(&p, type_env.source_indices.clone()); + if ((pname.clone().as_str() != "".to_string().as_str()) + && (ptype.clone().as_str() != "".to_string().as_str())) + { + v2_rt::rc_map_insert(acc.clone(), pname.clone(), ptype.clone()) + } else { + acc.clone() + } + }, + ); + let scalar = classify_body_provenance( + &body, + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &v2_rt::rc_empty_map::>>>(), + ); + if ((Rc::new(v2_rt::map_keys(&scalar)).len() as i64) > 0) { Rc::new(vec![scalar.clone()]) } else { { - let per_field = classify_body_per_field(body.clone(), param_names.clone(), param_types.clone(), &type_env, func_sigs.clone(), v2_rt::rc_empty_map::>>>()); -if (((per_field.clone().len() as i64) > 0) && { let mut __found = false; for m in per_field.clone().iter().cloned() { if ((Rc::new(v2_rt::map_keys(&m)).len() as i64) > 0) { __found = true; break; } } __found }) { + let per_field = classify_body_per_field( + body.clone(), + param_names.clone(), + param_types.clone(), + &type_env, + func_sigs.clone(), + v2_rt::rc_empty_map::>>>(), + ); + if (((per_field.clone().len() as i64) > 0) && { + let mut __found = false; + for m in per_field.clone().iter().cloned() { + if ((Rc::new(v2_rt::map_keys(&m)).len() as i64) > 0) { + __found = true; + break; + } + } + __found + }) { per_field.clone() } else { Rc::new(vec![]) } -} + } } -} + } } -pub fn classify_body_provenance(expr: &Rc, param_names: &Rc>, param_types: &Rc>, type_env: &Rc, func_sigs: &Rc>>, let_prov: &Rc>>>>) -> Rc>> { +pub fn classify_body_provenance( + expr: &Rc, + param_names: &Rc>, + param_types: &Rc>, + type_env: &Rc, + func_sigs: &Rc>>, + let_prov: &Rc>>>>, +) -> Rc>> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*expr.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let vname = expr_var_name_at(expr.clone(), type_env.source_indices.clone()); -match v2_rt::map_get(&let_prov, vname.clone()) { - Some(prov) => prov.clone(), - None => if { let mut __found = false; for pn in param_names.clone().iter().cloned() { if (pn.clone().as_str() == vname.clone().as_str()) { __found = true; break; } } __found } { - v2_rt::rc_map_insert(v2_rt::rc_empty_map::>(), vname.clone(), Rc::new(SubValueRelation::PreservedValue)) - } else { - v2_rt::rc_empty_map::>() - }, -} -}, - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(expr.clone()); -let field = field_access_field_at(expr.clone(), type_env.source_indices.clone()); -let base_prov = classify_body_provenance(&base, ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov); -Rc::new(v2_rt::map_keys(&base_prov)).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, pname: String| match v2_rt::map_get(&base_prov, pname.clone()) { - Some(base_rel) => { - let type_for_lookup = match (*base_rel.clone()).clone() { - SubValueRelation::PreservedValue => match v2_rt::map_get(¶m_types, pname.clone()) { - Some(t) => t.clone(), - None => "".to_string(), -}, - SubValueRelation::StrictSubValue { field: f, .. } => f.element_type.clone(), - SubValueRelation::IteratedSubValue { field: f, .. } => f.element_type.clone(), - _ => "".to_string(), -}; -if (type_for_lookup.clone().as_str() != "".to_string().as_str()) { - { - let fields = inductive_fields_for(type_env.clone(), type_for_lookup.clone()); -let matching = Rc::new({ let mut __result = Vec::new(); for f in fields.clone().iter().cloned() { if (f.field_name.clone().as_str() == field.clone().as_str()) { __result.push(f); } } __result }).first().cloned(); -match matching.clone() { - Some(ind_field) => v2_rt::rc_map_insert(acc.clone(), pname.clone(), compose_sub_value(base_rel.clone(), ind_field.clone())), - None => acc.clone(), -} -} - } else { - acc.clone() + ExprData::ExprVar { .. } => { + let vname = expr_var_name_at(expr.clone(), type_env.source_indices.clone()); + match v2_rt::map_get(&let_prov, vname.clone()) { + Some(prov) => prov.clone(), + None => { + if { + let mut __found = false; + for pn in param_names.clone().iter().cloned() { + if (pn.clone().as_str() == vname.clone().as_str()) { + __found = true; + break; + } + } + __found + } { + v2_rt::rc_map_insert( + v2_rt::rc_empty_map::>(), + vname.clone(), + Rc::new(SubValueRelation::PreservedValue), + ) + } else { + v2_rt::rc_empty_map::>() + } + } } -}, - None => acc.clone(), -}) -}, - ExprData::ExprCall { .. } => { - let callee = expr_call_func_at(expr.clone(), type_env.source_indices.clone()); -compose_callee_provenance(callee, call_args_by_name(expr.clone(), type_env.source_indices.clone()), param_names.clone(), param_types.clone(), type_env.clone(), &func_sigs, let_prov.clone()) -}, - ExprData::ExprMethodCall { method_semantics: ms, .. } => { - let mname = expr_method_name_at(expr.clone(), type_env.source_indices.clone()); -let callee_result = compose_callee_provenance(mname.clone(), method_call_args_by_name(&expr, func_sigs.clone(), &type_env.source_indices.clone()), param_names.clone(), param_types.clone(), type_env.clone(), &func_sigs, let_prov.clone()); -if ((Rc::new(v2_rt::map_keys(&callee_result)).len() as i64) > 0) { - callee_result.clone() - } else { - { - let is_shrink = match ms.clone().as_deref().cloned() { - Some(MethodSemantics::AlgebraMethodSemantics { size_effect: se, .. }) => match se.clone() { - Some(CollectionSizeEffect::ShrinkEffect) => true, - _ => false, -}, - _ => false, -}; -if (is_shrink && match method_arg_nodes(expr.clone()).first().cloned() { - Some(arg_node) => match (*arg_value(&arg_node).expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitInt { value: n, .. } = value.as_ref() else { unreachable!() }; (n.clone() > 0) }, - _ => false, -}, - None => false, -}) { + } + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(expr.clone()); + let field = field_access_field_at(expr.clone(), type_env.source_indices.clone()); + let base_prov = classify_body_provenance( + &base, + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &let_prov, + ); + Rc::new(v2_rt::map_keys(&base_prov)).iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, pname: String| { + match v2_rt::map_get(&base_prov, pname.clone()) { + Some(base_rel) => { + let type_for_lookup = match (*base_rel.clone()).clone() { + SubValueRelation::PreservedValue => { + match v2_rt::map_get(¶m_types, pname.clone()) { + Some(t) => t.clone(), + None => "".to_string(), + } + } + SubValueRelation::StrictSubValue { field: f, .. } => { + f.element_type.clone() + } + SubValueRelation::IteratedSubValue { field: f, .. } => { + f.element_type.clone() + } + _ => "".to_string(), + }; + if (type_for_lookup.clone().as_str() != "".to_string().as_str()) { + { + let fields = inductive_fields_for( + type_env.clone(), + type_for_lookup.clone(), + ); + let matching = Rc::new({ + let mut __result = Vec::new(); + for f in fields.clone().iter().cloned() { + if (f.field_name.clone().as_str() + == field.clone().as_str()) + { + __result.push(f); + } + } + __result + }) + .first() + .cloned(); + match matching.clone() { + Some(ind_field) => v2_rt::rc_map_insert( + acc.clone(), + pname.clone(), + compose_sub_value( + base_rel.clone(), + ind_field.clone(), + ), + ), + None => acc.clone(), + } + } + } else { + acc.clone() + } + } + None => acc.clone(), + } + }, + ) + } + ExprData::ExprCall { .. } => { + let callee = expr_call_func_at(expr.clone(), type_env.source_indices.clone()); + compose_callee_provenance( + callee, + call_args_by_name(expr.clone(), type_env.source_indices.clone()), + param_names.clone(), + param_types.clone(), + type_env.clone(), + &func_sigs, + let_prov.clone(), + ) + } + ExprData::ExprMethodCall { + method_semantics: ms, + .. + } => { + let mname = expr_method_name_at(expr.clone(), type_env.source_indices.clone()); + let callee_result = compose_callee_provenance( + mname.clone(), + method_call_args_by_name( + &expr, + func_sigs.clone(), + &type_env.source_indices.clone(), + ), + param_names.clone(), + param_types.clone(), + type_env.clone(), + &func_sigs, + let_prov.clone(), + ); + if ((Rc::new(v2_rt::map_keys(&callee_result)).len() as i64) > 0) { + callee_result.clone() + } else { + { + let is_shrink = match ms.clone().as_deref().cloned() { + Some(MethodSemantics::AlgebraMethodSemantics { + size_effect: se, + .. + }) => match se.clone() { + Some(CollectionSizeEffect::ShrinkEffect) => true, + _ => false, + }, + _ => false, + }; + if (is_shrink + && match method_arg_nodes(expr.clone()).first().cloned() { + Some(arg_node) => match (*arg_value(&arg_node).expr_data.clone()) + .clone() + { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitInt { value: n, .. } = value.as_ref() + else { + unreachable!() + }; + (n.clone() > 0) + } + _ => false, + }, + None => false, + }) { - let recv = method_receiver(expr.clone()); -let recv_prov = classify_body_provenance(&recv, ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov); -Rc::new(v2_rt::map_keys(&recv_prov)).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, pname: String| match v2_rt::map_get(&recv_prov, pname.clone()) { - Some(recv_rel) => { - let synth_field = Rc::new(InductiveField { - type_name: pname.clone(), - variant_name: "".to_string(), - field_name: mname.clone(), - shape: RecursionShape::ListRecursion, - element_type: pname.clone(), -}); -v2_rt::rc_map_insert(acc.clone(), pname.clone(), compose_sub_value(recv_rel.clone(), synth_field.clone())) -}, - None => acc.clone(), -}) -} - } else { - v2_rt::rc_empty_map::>() + { + let recv = method_receiver(expr.clone()); + let recv_prov = classify_body_provenance( + &recv, + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &let_prov, + ); + Rc::new(v2_rt::map_keys(&recv_prov)).iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, + pname: String| { + match v2_rt::map_get(&recv_prov, pname.clone()) { + Some(recv_rel) => { + let synth_field = Rc::new(InductiveField { + type_name: pname.clone(), + variant_name: "".to_string(), + field_name: mname.clone(), + shape: RecursionShape::ListRecursion, + element_type: pname.clone(), + }); + v2_rt::rc_map_insert( + acc.clone(), + pname.clone(), + compose_sub_value( + recv_rel.clone(), + synth_field.clone(), + ), + ) + } + None => acc.clone(), + } + }, + ) + } + } else { + v2_rt::rc_empty_map::>() + } } -} + } } -}, - ExprData::ExprMatch => { - let scrut = match_scrutinee(expr.clone()); -let scrut_prov = classify_body_provenance(&scrut, ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov); -let arms = match_arm_nodes(expr.clone()); -let arm_provs = Rc::new({ let mut __result = Vec::new(); for arm in arms.iter().cloned() { __result.push({ + ExprData::ExprMatch => { + let scrut = match_scrutinee(expr.clone()); + let scrut_prov = classify_body_provenance( + &scrut, + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &let_prov, + ); + let arms = match_arm_nodes(expr.clone()); + let arm_provs = Rc::new({ + let mut __result = Vec::new(); + for arm in arms.iter().cloned() { + __result.push({ let arm_let_prov = match (*arm_pattern(arm.clone())).clone() { MatchPattern::VariantPattern { name: vname, field_bindings: bindings, .. } => bindings.clone().iter().cloned().fold(let_prov.clone(), |acc: Rc>>>>, binding: Rc| { let field_label = field_binding_name_at(binding.clone(), type_env.source_indices.clone()); @@ -4582,64 +7670,141 @@ v2_rt::rc_map_insert(acc.clone(), bind_name.clone(), field_prov.clone()) _ => let_prov.clone(), }; classify_body_provenance(&arm_body(&arm), ¶m_names, ¶m_types, &type_env, &func_sigs, &arm_let_prov) -}); } __result }); -meet_body_provenance_maps(&arm_provs) -}, - ExprData::ExprIf => { - let then_prov = classify_body_provenance(&if_then_branch(expr.clone()), ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov); -match if_else_branch(expr.clone()) { - Some(else_expr) => { - let else_prov = classify_body_provenance(&else_expr, ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov); -meet_body_provenance_maps(&Rc::new(vec![then_prov, else_prov])) -}, - None => then_prov, -} -}, - ExprData::ExprLet => { - let value = let_value(expr.clone()); -let bname = let_binding_name_at(expr.clone(), type_env.source_indices.clone()); -let value_prov = classify_body_provenance(&value, ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov); -let updated = v2_rt::rc_map_insert(let_prov.clone(), bname.clone(), value_prov.clone()); -match let_body(expr.clone()) { - Some(body) => classify_body_provenance(&body, ¶m_names, ¶m_types, &type_env, &func_sigs, &updated), - None => v2_rt::rc_empty_map::>(), -} -}, - ExprData::ExprBlock => { - let block_result = expr.children.clone().iter().cloned().fold(Rc::new(BlockProvFoldState { - prov: let_prov.clone(), - last: empty_prov_map(), -}), |state: Rc, stmt: Rc| match (*stmt.expr_data.clone()).clone() { - ExprData::ExprLet => { - let bname = let_binding_name_at(stmt.clone(), type_env.source_indices.clone()); -let value = let_value(stmt.clone()); -let value_prov = classify_body_provenance(&value, ¶m_names, ¶m_types, &type_env, &func_sigs, &state.prov.clone()); -let updated_prov = v2_rt::rc_map_insert(state.prov.clone(), bname.clone(), value_prov.clone()); -match let_body(stmt.clone()) { - Some(body) => Rc::new(BlockProvFoldState { - prov: state.prov.clone(), - last: classify_body_provenance(&body, ¶m_names, ¶m_types, &type_env, &func_sigs, &updated_prov), -}), - None => Rc::new(BlockProvFoldState { - prov: updated_prov.clone(), - last: value_prov.clone(), -}), -} -}, - _ => Rc::new(BlockProvFoldState { - prov: state.prov.clone(), - last: classify_body_provenance(&stmt, ¶m_names, ¶m_types, &type_env, &func_sigs, &state.prov.clone()), -}), }); -block_result.last.clone() -}, - ExprData::ExprCast => classify_body_provenance(&cast_expr(expr.clone()), ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov), - ExprData::ExprReturn => match expr.children.clone().first().cloned() { - Some(inner) => classify_body_provenance(&inner, ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov), - None => v2_rt::rc_empty_map::>(), -}, - _ => v2_rt::rc_empty_map::>(), -} + } + __result + }); + meet_body_provenance_maps(&arm_provs) + } + ExprData::ExprIf => { + let then_prov = classify_body_provenance( + &if_then_branch(expr.clone()), + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &let_prov, + ); + match if_else_branch(expr.clone()) { + Some(else_expr) => { + let else_prov = classify_body_provenance( + &else_expr, + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &let_prov, + ); + meet_body_provenance_maps(&Rc::new(vec![then_prov, else_prov])) + } + None => then_prov, + } + } + ExprData::ExprLet => { + let value = let_value(expr.clone()); + let bname = let_binding_name_at(expr.clone(), type_env.source_indices.clone()); + let value_prov = classify_body_provenance( + &value, + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &let_prov, + ); + let updated = + v2_rt::rc_map_insert(let_prov.clone(), bname.clone(), value_prov.clone()); + match let_body(expr.clone()) { + Some(body) => classify_body_provenance( + &body, + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &updated, + ), + None => v2_rt::rc_empty_map::>(), + } + } + ExprData::ExprBlock => { + let block_result = expr.children.clone().iter().cloned().fold( + Rc::new(BlockProvFoldState { + prov: let_prov.clone(), + last: empty_prov_map(), + }), + |state: Rc, stmt: Rc| match (*stmt.expr_data.clone()) + .clone() + { + ExprData::ExprLet => { + let bname = + let_binding_name_at(stmt.clone(), type_env.source_indices.clone()); + let value = let_value(stmt.clone()); + let value_prov = classify_body_provenance( + &value, + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &state.prov.clone(), + ); + let updated_prov = v2_rt::rc_map_insert( + state.prov.clone(), + bname.clone(), + value_prov.clone(), + ); + match let_body(stmt.clone()) { + Some(body) => Rc::new(BlockProvFoldState { + prov: state.prov.clone(), + last: classify_body_provenance( + &body, + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &updated_prov, + ), + }), + None => Rc::new(BlockProvFoldState { + prov: updated_prov.clone(), + last: value_prov.clone(), + }), + } + } + _ => Rc::new(BlockProvFoldState { + prov: state.prov.clone(), + last: classify_body_provenance( + &stmt, + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &state.prov.clone(), + ), + }), + }, + ); + block_result.last.clone() + } + ExprData::ExprCast => classify_body_provenance( + &cast_expr(expr.clone()), + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &let_prov, + ), + ExprData::ExprReturn => match expr.children.clone().first().cloned() { + Some(inner) => classify_body_provenance( + &inner, + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &let_prov, + ), + None => v2_rt::rc_empty_map::>(), + }, + _ => v2_rt::rc_empty_map::>(), + } }) } @@ -4649,112 +7814,275 @@ pub struct BlockProvFoldState { pub last: Rc>>, } -pub fn call_args_by_name(call: Rc, source_indices: Rc>>) -> Rc>> { - call.children.clone().iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, arg_node: Rc| match arg_name_at(arg_node.clone(), source_indices.clone()) { - Some(aname) => v2_rt::rc_map_insert(acc.clone(), aname.clone(), arg_value(&arg_node)), - None => acc.clone(), -}) +pub fn call_args_by_name( + call: Rc, + source_indices: Rc>>, +) -> Rc>> { + call.children.clone().iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, arg_node: Rc| match arg_name_at( + arg_node.clone(), + source_indices.clone(), + ) { + Some(aname) => v2_rt::rc_map_insert(acc.clone(), aname.clone(), arg_value(&arg_node)), + None => acc.clone(), + }, + ) } -pub fn method_call_args_by_name(call: &Rc, func_sigs: Rc>>, source_indices: &Rc>>) -> Rc>> { +pub fn method_call_args_by_name( + call: &Rc, + func_sigs: Rc>>, + source_indices: &Rc>>, +) -> Rc>> { { let mname = expr_method_name_at(call.clone(), source_indices.clone()); -let recv = method_receiver(call.clone()); -let mc_args = method_arg_nodes(call.clone()); -let base = match v2_rt::map_get(&func_sigs, mname) { - Some(sig) => match sig.params.clone().first().cloned() { - Some(first_p) => { - let first_pname = param_node_name_at(first_p.clone(), source_indices.clone()); -if (first_pname.clone().as_str() != "".to_string().as_str()) { - v2_rt::rc_map_insert(v2_rt::rc_empty_map::>(), first_pname.clone(), recv) - } else { - v2_rt::rc_empty_map::>() - } -}, - None => v2_rt::rc_empty_map::>(), -}, - None => v2_rt::rc_empty_map::>(), -}; -mc_args.iter().cloned().fold(base, |acc: Rc>>, arg_node: Rc| match arg_name_at(arg_node.clone(), source_indices.clone()) { - Some(aname) => v2_rt::rc_map_insert(acc.clone(), aname.clone(), arg_value(&arg_node)), - None => acc.clone(), -}) -} + let recv = method_receiver(call.clone()); + let mc_args = method_arg_nodes(call.clone()); + let base = match v2_rt::map_get(&func_sigs, mname) { + Some(sig) => match sig.params.clone().first().cloned() { + Some(first_p) => { + let first_pname = param_node_name_at(first_p.clone(), source_indices.clone()); + if (first_pname.clone().as_str() != "".to_string().as_str()) { + v2_rt::rc_map_insert( + v2_rt::rc_empty_map::>(), + first_pname.clone(), + recv, + ) + } else { + v2_rt::rc_empty_map::>() + } + } + None => v2_rt::rc_empty_map::>(), + }, + None => v2_rt::rc_empty_map::>(), + }; + mc_args.iter().cloned().fold( + base, + |acc: Rc>>, arg_node: Rc| match arg_name_at( + arg_node.clone(), + source_indices.clone(), + ) { + Some(aname) => { + v2_rt::rc_map_insert(acc.clone(), aname.clone(), arg_value(&arg_node)) + } + None => acc.clone(), + }, + ) + } } -pub fn compose_callee_provenance(callee: String, arg_by_name: Rc>>, param_names: Rc>, param_types: Rc>, type_env: Rc, func_sigs: &Rc>>, let_prov: Rc>>>>) -> Rc>> { +pub fn compose_callee_provenance( + callee: String, + arg_by_name: Rc>>, + param_names: Rc>, + param_types: Rc>, + type_env: Rc, + func_sigs: &Rc>>, + let_prov: Rc>>>>, +) -> Rc>> { match v2_rt::map_get(&func_sigs, callee) { - Some(sig) => match sig.output_provenance.clone().first().cloned() { - Some(callee_prov) => Rc::new(v2_rt::map_keys(&callee_prov)).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, callee_pname: String| match v2_rt::map_get(&callee_prov, callee_pname.clone()) { - Some(callee_rel) => match v2_rt::map_get(&arg_by_name, callee_pname.clone()) { - Some(arg) => { - let arg_prov = classify_body_provenance(&arg, ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov); -Rc::new(v2_rt::map_keys(&arg_prov)).iter().cloned().fold(acc.clone(), |inner: Rc>>, pname: String| match v2_rt::map_get(&arg_prov, pname.clone()) { - Some(arg_rel) => { - let composed = compose_sub_value_relations(arg_rel.clone(), callee_rel.clone()); -match (*composed.clone()).clone() { - SubValueRelation::SubValueUnknown => inner.clone(), - _ => match v2_rt::map_get(&inner, pname.clone()) { - Some(existing) => v2_rt::rc_map_insert(inner.clone(), pname.clone(), meet_sub_value(existing.clone(), composed.clone())), - None => v2_rt::rc_map_insert(inner.clone(), pname.clone(), composed.clone()), -}, -} -}, - None => inner.clone(), -}) -}, - None => acc.clone(), -}, - None => acc.clone(), -}), - None => v2_rt::rc_empty_map::>(), -}, - None => v2_rt::rc_empty_map::>(), -} + Some(sig) => match sig.output_provenance.clone().first().cloned() { + Some(callee_prov) => Rc::new(v2_rt::map_keys(&callee_prov)).iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, callee_pname: String| { + match v2_rt::map_get(&callee_prov, callee_pname.clone()) { + Some(callee_rel) => { + match v2_rt::map_get(&arg_by_name, callee_pname.clone()) { + Some(arg) => { + let arg_prov = classify_body_provenance( + &arg, + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &let_prov, + ); + Rc::new(v2_rt::map_keys(&arg_prov)).iter().cloned().fold( + acc.clone(), + |inner: Rc>>, + pname: String| { + match v2_rt::map_get(&arg_prov, pname.clone()) { + Some(arg_rel) => { + let composed = compose_sub_value_relations( + arg_rel.clone(), + callee_rel.clone(), + ); + match (*composed.clone()).clone() { + SubValueRelation::SubValueUnknown => { + inner.clone() + } + _ => match v2_rt::map_get( + &inner, + pname.clone(), + ) { + Some(existing) => v2_rt::rc_map_insert( + inner.clone(), + pname.clone(), + meet_sub_value( + existing.clone(), + composed.clone(), + ), + ), + None => v2_rt::rc_map_insert( + inner.clone(), + pname.clone(), + composed.clone(), + ), + }, + } + } + None => inner.clone(), + } + }, + ) + } + None => acc.clone(), + } + } + None => acc.clone(), + } + }, + ), + None => v2_rt::rc_empty_map::>(), + }, + None => v2_rt::rc_empty_map::>(), + } } -pub fn classify_body_per_field(expr: Rc, param_names: Rc>, param_types: Rc>, type_env: &Rc, func_sigs: Rc>>, let_prov: Rc>>>>) -> Rc>>>> { +pub fn classify_body_per_field( + expr: Rc, + param_names: Rc>, + param_types: Rc>, + type_env: &Rc, + func_sigs: Rc>>, + let_prov: Rc>>>>, +) -> Rc>>>> { { let unwrapped = unwrap_body_terminal(&expr, let_prov, type_env.clone()); -let terminal = unwrapped.expr.clone(); -let terminal_prov = unwrapped.let_prov.clone(); -classify_terminal_per_field(&terminal, param_names, param_types, &type_env, func_sigs, terminal_prov) -} + let terminal = unwrapped.expr.clone(); + let terminal_prov = unwrapped.let_prov.clone(); + classify_terminal_per_field( + &terminal, + param_names, + param_types, + &type_env, + func_sigs, + terminal_prov, + ) + } } -pub fn classify_terminal_per_field(expr: &Rc, param_names: Rc>, param_types: Rc>, type_env: &Rc, func_sigs: Rc>>, let_prov: Rc>>>>) -> Rc>>>> { +pub fn classify_terminal_per_field( + expr: &Rc, + param_names: Rc>, + param_types: Rc>, + type_env: &Rc, + func_sigs: Rc>>, + let_prov: Rc>>>>, +) -> Rc>>>> { match (*expr.expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => Rc::new({ let mut __result = Vec::new(); for fi in expr.children.clone().iter().cloned() { __result.push(classify_body_provenance(&field_init_node_value(&fi), ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov)); } __result }), - ExprData::ExprMatch => { - let arm_results = Rc::new({ let mut __result = Vec::new(); for arm in match_arm_nodes(expr.clone()).iter().cloned() { __result.push({ - let arm_unwrapped = unwrap_body_terminal(&arm_body(&arm), let_prov.clone(), type_env.clone()); -match (*arm_unwrapped.expr.clone().expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => Rc::new({ let mut __result = Vec::new(); for fi in arm_unwrapped.expr.clone().children.clone().iter().cloned() { __result.push(classify_body_provenance(&field_init_node_value(&fi), ¶m_names, ¶m_types, &type_env, &func_sigs, &arm_unwrapped.let_prov.clone())); } __result }), - _ => Rc::new(vec![]), -} -}); } __result }); -meet_per_field_results(&arm_results) -}, - ExprData::ExprIf => { - let then_unwrapped = unwrap_body_terminal(&if_then_branch(expr.clone()), let_prov.clone(), type_env.clone()); -let then_result = match (*then_unwrapped.expr.clone().expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => Rc::new({ let mut __result = Vec::new(); for fi in then_unwrapped.expr.clone().children.clone().iter().cloned() { __result.push(classify_body_provenance(&field_init_node_value(&fi), ¶m_names, ¶m_types, &type_env, &func_sigs, &then_unwrapped.let_prov.clone())); } __result }), - _ => Rc::new(vec![]), -}; -match if_else_branch(expr.clone()) { - Some(else_expr) => { - let else_unwrapped = unwrap_body_terminal(&else_expr, let_prov.clone(), type_env.clone()); -let else_result = match (*else_unwrapped.expr.clone().expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => Rc::new({ let mut __result = Vec::new(); for fi in else_unwrapped.expr.clone().children.clone().iter().cloned() { __result.push(classify_body_provenance(&field_init_node_value(&fi), ¶m_names, ¶m_types, &type_env, &func_sigs, &else_unwrapped.let_prov.clone())); } __result }), - _ => Rc::new(vec![]), -}; -meet_per_field_results(&Rc::new(vec![then_result, else_result])) -}, - None => then_result, -} -}, - _ => Rc::new(vec![]), -} + ExprData::ExprRecordLit { .. } => Rc::new({ + let mut __result = Vec::new(); + for fi in expr.children.clone().iter().cloned() { + __result.push(classify_body_provenance( + &field_init_node_value(&fi), + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &let_prov, + )); + } + __result + }), + ExprData::ExprMatch => { + let arm_results = Rc::new({ + let mut __result = Vec::new(); + for arm in match_arm_nodes(expr.clone()).iter().cloned() { + __result.push({ + let arm_unwrapped = unwrap_body_terminal( + &arm_body(&arm), + let_prov.clone(), + type_env.clone(), + ); + match (*arm_unwrapped.expr.clone().expr_data.clone()).clone() { + ExprData::ExprRecordLit { .. } => Rc::new({ + let mut __result = Vec::new(); + for fi in + arm_unwrapped.expr.clone().children.clone().iter().cloned() + { + __result.push(classify_body_provenance( + &field_init_node_value(&fi), + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &arm_unwrapped.let_prov.clone(), + )); + } + __result + }), + _ => Rc::new(vec![]), + } + }); + } + __result + }); + meet_per_field_results(&arm_results) + } + ExprData::ExprIf => { + let then_unwrapped = unwrap_body_terminal( + &if_then_branch(expr.clone()), + let_prov.clone(), + type_env.clone(), + ); + let then_result = match (*then_unwrapped.expr.clone().expr_data.clone()).clone() { + ExprData::ExprRecordLit { .. } => Rc::new({ + let mut __result = Vec::new(); + for fi in then_unwrapped.expr.clone().children.clone().iter().cloned() { + __result.push(classify_body_provenance( + &field_init_node_value(&fi), + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &then_unwrapped.let_prov.clone(), + )); + } + __result + }), + _ => Rc::new(vec![]), + }; + match if_else_branch(expr.clone()) { + Some(else_expr) => { + let else_unwrapped = + unwrap_body_terminal(&else_expr, let_prov.clone(), type_env.clone()); + let else_result = match (*else_unwrapped.expr.clone().expr_data.clone()).clone() + { + ExprData::ExprRecordLit { .. } => Rc::new({ + let mut __result = Vec::new(); + for fi in else_unwrapped.expr.clone().children.clone().iter().cloned() { + __result.push(classify_body_provenance( + &field_init_node_value(&fi), + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &else_unwrapped.let_prov.clone(), + )); + } + __result + }), + _ => Rc::new(vec![]), + }; + meet_per_field_results(&Rc::new(vec![then_result, else_result])) + } + None => then_result, + } + } + _ => Rc::new(vec![]), + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -4763,401 +8091,884 @@ pub struct BodyTerminal { pub let_prov: Rc>>>>, } -pub fn unwrap_body_terminal(expr: &Rc, let_prov: Rc>>>>, type_env: Rc) -> Rc { +pub fn unwrap_body_terminal( + expr: &Rc, + let_prov: Rc>>>>, + type_env: Rc, +) -> Rc { match (*expr.expr_data.clone()).clone() { - ExprData::ExprBlock => match expr.children.clone().last().cloned() { - Some(last_stmt) => Rc::new(BodyTerminal { - expr: last_stmt.clone(), - let_prov: let_prov, -}), - None => Rc::new(BodyTerminal { - expr: expr.clone(), - let_prov: let_prov, -}), -}, - _ => Rc::new(BodyTerminal { - expr: expr.clone(), - let_prov: let_prov, -}), -} + ExprData::ExprBlock => match expr.children.clone().last().cloned() { + Some(last_stmt) => Rc::new(BodyTerminal { + expr: last_stmt.clone(), + let_prov: let_prov, + }), + None => Rc::new(BodyTerminal { + expr: expr.clone(), + let_prov: let_prov, + }), + }, + _ => Rc::new(BodyTerminal { + expr: expr.clone(), + let_prov: let_prov, + }), + } } -pub fn meet_per_field_results(results: &Rc>>>>>>) -> Rc>>>> { +pub fn meet_per_field_results( + results: &Rc>>>>>>, +) -> Rc>>>> { match results.clone().first().cloned() { - None => Rc::new(vec![]), - Some(first_result) => if ((first_result.clone().len() as i64) == 0) { - Rc::new(vec![]) - } else { - { - let all_same_count = { let mut __all = true; for r in results.clone().iter().cloned() { if !(((r.clone().len() as i64) == (first_result.clone().len() as i64))) { __all = false; break; } } __all }; -if !all_same_count { + None => Rc::new(vec![]), + Some(first_result) => { + if ((first_result.clone().len() as i64) == 0) { Rc::new(vec![]) } else { - Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(first_result.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ - let idx = pair.0.clone(); -let field_provs = Rc::new({ let mut __result = Vec::new(); for r in results.clone().iter().cloned() { __result.push(match r.clone().get(idx.clone() as usize).cloned() { - Some(m) => m.clone(), - None => empty_prov_map(), -}); } __result }); -meet_body_provenance_maps(&field_provs) -}); } __result }) - } -} - }, -} + { + let all_same_count = { + let mut __all = true; + for r in results.clone().iter().cloned() { + if !((r.clone().len() as i64) == (first_result.clone().len() as i64)) { + __all = false; + break; + } + } + __all + }; + if !all_same_count { + Rc::new(vec![]) + } else { + Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + first_result + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + __result.push({ + let idx = pair.0.clone(); + let field_provs = Rc::new({ + let mut __result = Vec::new(); + for r in results.clone().iter().cloned() { + __result.push( + match r.clone().get(idx.clone() as usize).cloned() { + Some(m) => m.clone(), + None => empty_prov_map(), + }, + ); + } + __result + }); + meet_body_provenance_maps(&field_provs) + }); + } + __result + }) + } + } + } + } + } } pub fn empty_prov_map() -> Rc>> { v2_rt::rc_empty_map::>() } -pub fn meet_body_provenance_maps(provs: &Rc>>>>) -> Rc>> { +pub fn meet_body_provenance_maps( + provs: &Rc>>>>, +) -> Rc>> { match provs.clone().first().cloned() { - None => empty_prov_map(), - Some(first_prov) => Rc::new(provs.clone().iter().cloned().skip(1 as usize).collect::>()).iter().cloned().fold(first_prov.clone(), |acc: Rc>>, prov: Rc>>| intersect_prov_maps(&acc, prov.clone())), -} + None => empty_prov_map(), + Some(first_prov) => Rc::new( + provs + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ) + .iter() + .cloned() + .fold( + first_prov.clone(), + |acc: Rc>>, + prov: Rc>>| { + intersect_prov_maps(&acc, prov.clone()) + }, + ), + } } -pub fn intersect_prov_maps(a: &Rc>>, b: Rc>>) -> Rc>> { - Rc::new(v2_rt::map_keys(&a)).iter().cloned().fold(empty_prov_map(), |result: Rc>>, key: String| match v2_rt::map_get(&b, key.clone()) { - Some(b_rel) => match v2_rt::map_get(&a, key.clone()) { - Some(a_rel) => v2_rt::rc_map_insert(result.clone(), key.clone(), meet_sub_value(a_rel.clone(), b_rel.clone())), - None => result.clone(), -}, - None => result.clone(), -}) +pub fn intersect_prov_maps( + a: &Rc>>, + b: Rc>>, +) -> Rc>> { + Rc::new(v2_rt::map_keys(&a)).iter().cloned().fold( + empty_prov_map(), + |result: Rc>>, key: String| match v2_rt::map_get( + &b, + key.clone(), + ) { + Some(b_rel) => match v2_rt::map_get(&a, key.clone()) { + Some(a_rel) => v2_rt::rc_map_insert( + result.clone(), + key.clone(), + meet_sub_value(a_rel.clone(), b_rel.clone()), + ), + None => result.clone(), + }, + None => result.clone(), + }, + ) } -pub fn arm_ctx_from_variant_provenance(arm_node: Rc, sig: Rc, scrut: Rc, ctx: &Rc) -> Option> { +pub fn arm_ctx_from_variant_provenance( + arm_node: Rc, + sig: Rc, + scrut: Rc, + ctx: &Rc, +) -> Option> { match (*arm_pattern(arm_node)).clone() { - MatchPattern::VariantPattern { name: vname, field_bindings: bindings, .. } => match v2_rt::map_get(&sig.variant_provenance.clone(), vname.clone()) { - Some(variant_field_map) => { - let call_args = call_args_by_name(scrut, ctx.type_env.clone().source_indices.clone()); -let extended = bindings.clone().iter().cloned().fold(ctx.clone(), |c: Rc, fb: Rc| { - let field_label = field_binding_name_at(fb.clone(), ctx.type_env.clone().source_indices.clone()); -let bind_name = match (*field_binding_pattern(fb.clone())).clone() { - MatchPattern::Bind { name: bn, .. } => bn.clone(), - _ => "".to_string(), -}; -if ((bind_name.clone().as_str() == "".to_string().as_str()) || (field_label.clone().as_str() == "".to_string().as_str())) { - c.clone() - } else { - match v2_rt::map_get(&variant_field_map, field_label.clone()) { - Some(param_map) => { - let composed = compose_callee_param_map(¶m_map, call_args.clone(), c.param_order.clone(), c.param_names.clone(), c.type_env.clone(), c.func_sigs.clone(), v2_rt::rc_empty_map::>>>()); -let all_rels = Rc::new({ let mut __result = Vec::new(); for k in Rc::new(v2_rt::map_keys(&composed)).iter().cloned() { __result.push(match v2_rt::map_get(&composed, k.clone()) { - Some(r) => r.clone(), - None => Rc::new(SubValueRelation::SubValueUnknown), -}); } __result }); -let best = merge_argument_relations(&all_rels); -match (*best.clone()).clone() { - SubValueRelation::SubValueUnknown => c.clone(), - _ => Rc::new(DescentContext { - fn_name: c.fn_name.clone(), - param_names: c.param_names.clone(), - param_order: c.param_order.clone(), - type_env: c.type_env.clone(), - sub_value_vars: v2_rt::rc_map_insert(c.sub_value_vars.clone(), bind_name.clone(), best.clone()), - size_aliases: c.size_aliases.clone(), - scope_locals: c.scope_locals.clone(), - func_sigs: c.func_sigs.clone(), - per_field_vars: c.per_field_vars.clone(), -}), -} -}, - None => c.clone(), -} + MatchPattern::VariantPattern { + name: vname, + field_bindings: bindings, + .. + } => match v2_rt::map_get(&sig.variant_provenance.clone(), vname.clone()) { + Some(variant_field_map) => { + let call_args = + call_args_by_name(scrut, ctx.type_env.clone().source_indices.clone()); + let extended = bindings.clone().iter().cloned().fold( + ctx.clone(), + |c: Rc, fb: Rc| { + let field_label = field_binding_name_at( + fb.clone(), + ctx.type_env.clone().source_indices.clone(), + ); + let bind_name = match (*field_binding_pattern(fb.clone())).clone() { + MatchPattern::Bind { name: bn, .. } => bn.clone(), + _ => "".to_string(), + }; + if ((bind_name.clone().as_str() == "".to_string().as_str()) + || (field_label.clone().as_str() == "".to_string().as_str())) + { + c.clone() + } else { + match v2_rt::map_get(&variant_field_map, field_label.clone()) { + Some(param_map) => { + let composed = compose_callee_param_map( + ¶m_map, + call_args.clone(), + c.param_order.clone(), + c.param_names.clone(), + c.type_env.clone(), + c.func_sigs.clone(), + v2_rt::rc_empty_map::< + String, + Rc>>, + >(), + ); + let all_rels = Rc::new({ + let mut __result = Vec::new(); + for k in Rc::new(v2_rt::map_keys(&composed)).iter().cloned() + { + __result.push( + match v2_rt::map_get(&composed, k.clone()) { + Some(r) => r.clone(), + None => { + Rc::new(SubValueRelation::SubValueUnknown) + } + }, + ); + } + __result + }); + let best = merge_argument_relations(&all_rels); + match (*best.clone()).clone() { + SubValueRelation::SubValueUnknown => c.clone(), + _ => Rc::new(DescentContext { + fn_name: c.fn_name.clone(), + param_names: c.param_names.clone(), + param_order: c.param_order.clone(), + type_env: c.type_env.clone(), + sub_value_vars: v2_rt::rc_map_insert( + c.sub_value_vars.clone(), + bind_name.clone(), + best.clone(), + ), + size_aliases: c.size_aliases.clone(), + scope_locals: c.scope_locals.clone(), + func_sigs: c.func_sigs.clone(), + per_field_vars: c.per_field_vars.clone(), + }), + } + } + None => c.clone(), + } + } + }, + ); + Some(extended) } -}); -Some(extended) -}, - None => None, -}, - _ => None, -} + None => None, + }, + _ => None, + } } -pub fn compose_callee_param_map(callee_prov: &Rc>>, arg_by_name: Rc>>, param_names: Rc>, param_types: Rc>, type_env: Rc, func_sigs: Rc>>, let_prov: Rc>>>>) -> Rc>> { - Rc::new(v2_rt::map_keys(&callee_prov)).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, callee_pname: String| match v2_rt::map_get(&callee_prov, callee_pname.clone()) { - Some(callee_rel) => match v2_rt::map_get(&arg_by_name, callee_pname.clone()) { - Some(arg) => { - let arg_prov = classify_body_provenance(&arg, ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov); -Rc::new(v2_rt::map_keys(&arg_prov)).iter().cloned().fold(acc.clone(), |inner: Rc>>, pname: String| match v2_rt::map_get(&arg_prov, pname.clone()) { - Some(arg_rel) => { - let composed = compose_sub_value_relations(arg_rel.clone(), callee_rel.clone()); -match (*composed.clone()).clone() { - SubValueRelation::SubValueUnknown => inner.clone(), - _ => v2_rt::rc_map_insert(inner.clone(), pname.clone(), composed.clone()), -} -}, - None => inner.clone(), -}) -}, - None => acc.clone(), -}, - None => acc.clone(), -}) +pub fn compose_callee_param_map( + callee_prov: &Rc>>, + arg_by_name: Rc>>, + param_names: Rc>, + param_types: Rc>, + type_env: Rc, + func_sigs: Rc>>, + let_prov: Rc>>>>, +) -> Rc>> { + Rc::new(v2_rt::map_keys(&callee_prov)).iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, callee_pname: String| match v2_rt::map_get( + &callee_prov, + callee_pname.clone(), + ) { + Some(callee_rel) => match v2_rt::map_get(&arg_by_name, callee_pname.clone()) { + Some(arg) => { + let arg_prov = classify_body_provenance( + &arg, + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &let_prov, + ); + Rc::new(v2_rt::map_keys(&arg_prov)).iter().cloned().fold( + acc.clone(), + |inner: Rc>>, pname: String| { + match v2_rt::map_get(&arg_prov, pname.clone()) { + Some(arg_rel) => { + let composed = compose_sub_value_relations( + arg_rel.clone(), + callee_rel.clone(), + ); + match (*composed.clone()).clone() { + SubValueRelation::SubValueUnknown => inner.clone(), + _ => v2_rt::rc_map_insert( + inner.clone(), + pname.clone(), + composed.clone(), + ), + } + } + None => inner.clone(), + } + }, + ) + } + None => acc.clone(), + }, + None => acc.clone(), + }, + ) } -pub fn compose_output_relations(arg_rel: Rc, callee_rel: Rc) -> Rc { +pub fn compose_output_relations( + arg_rel: Rc, + callee_rel: Rc, +) -> Rc { compose_sub_value_relations(arg_rel, callee_rel) } -pub fn compute_variant_provenance(body: Rc, return_type: Rc, params: &Rc>>, type_env: &Rc, func_sigs: Rc>>) -> Rc>>>>>> { +pub fn compute_variant_provenance( + body: Rc, + return_type: Rc, + params: &Rc>>, + type_env: &Rc, + func_sigs: Rc>>, +) -> Rc>>>>>> { { let rt_name = authored_name_at(type_env.source_indices.clone(), &return_type); -let rt_def = lookup_type_by_name(&type_env, rt_name.clone()); -match rt_def { - Some(def_node) => match def_node.connective.clone() { - Connective::Disj => { - let param_names = Rc::new({ let mut __result = Vec::new(); for p in params.clone().iter().cloned() { __result.push(param_node_name_at(p.clone(), type_env.source_indices.clone())); } __result }); -let param_types = params.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, p: Rc| { - let pname = param_node_name_at(p.clone(), type_env.source_indices.clone()); -let ptype = resolved_type_name(&p, type_env.source_indices.clone()); -if ((pname.clone().as_str() != "".to_string().as_str()) && (ptype.clone().as_str() != "".to_string().as_str())) { - v2_rt::rc_map_insert(acc.clone(), pname.clone(), ptype.clone()) - } else { - acc.clone() + let rt_def = lookup_type_by_name(&type_env, rt_name.clone()); + match rt_def { + Some(def_node) => match def_node.connective.clone() { + Connective::Disj => { + let param_names = Rc::new({ + let mut __result = Vec::new(); + for p in params.clone().iter().cloned() { + __result.push(param_node_name_at( + p.clone(), + type_env.source_indices.clone(), + )); + } + __result + }); + let param_types = params.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, p: Rc| { + let pname = + param_node_name_at(p.clone(), type_env.source_indices.clone()); + let ptype = resolved_type_name(&p, type_env.source_indices.clone()); + if ((pname.clone().as_str() != "".to_string().as_str()) + && (ptype.clone().as_str() != "".to_string().as_str())) + { + v2_rt::rc_map_insert(acc.clone(), pname.clone(), ptype.clone()) + } else { + acc.clone() + } + }, + ); + collect_variant_constructors( + &body, + rt_name.clone(), + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + v2_rt::rc_empty_map::>>>(), + &v2_rt::rc_empty_map::< + String, + Rc>>>>, + >(), + ) } -}); -collect_variant_constructors(&body, rt_name.clone(), ¶m_names, ¶m_types, &type_env, &func_sigs, v2_rt::rc_empty_map::>>>(), &v2_rt::rc_empty_map::>>>>>()) -}, - _ => v2_rt::rc_empty_map::>>>>>(), -}, - None => v2_rt::rc_empty_map::>>>>>(), -} -} + _ => v2_rt::rc_empty_map::< + String, + Rc>>>>, + >(), + }, + None => v2_rt::rc_empty_map::< + String, + Rc>>>>, + >(), + } + } } -pub fn collect_variant_constructors(body: &Rc, parent_enum: String, param_names: &Rc>, param_types: &Rc>, type_env: &Rc, func_sigs: &Rc>>, let_prov: Rc>>>>, acc: &Rc>>>>>>) -> Rc>>>>>> { +pub fn collect_variant_constructors( + body: &Rc, + parent_enum: String, + param_names: &Rc>, + param_types: &Rc>, + type_env: &Rc, + func_sigs: &Rc>>, + let_prov: Rc>>>>, + acc: &Rc>>>>>>, +) -> Rc>>>>>> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*body.expr_data.clone()).clone() { - ExprData::ExprRecordLit { parent_enum: pe, .. } => match pe.clone() { - Some(enum_name) => if (enum_name.clone().as_str() == parent_enum.clone().as_str()) { - { - let variant_name = body.name.clone(); -let field_prov_map = body.children.clone().iter().cloned().fold(v2_rt::rc_empty_map::>>>(), |m: Rc>>>>, fi: Rc| { - let fname = field_init_node_name_at(fi.clone(), type_env.source_indices.clone()); -let fprov = classify_body_provenance(&field_init_node_value(&fi), ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov); -if (fname.clone().as_str() != "".to_string().as_str()) { - v2_rt::rc_map_insert(m.clone(), fname.clone(), fprov.clone()) + ExprData::ExprRecordLit { + parent_enum: pe, .. + } => match pe.clone() { + Some(enum_name) => { + if (enum_name.clone().as_str() == parent_enum.clone().as_str()) { + { + let variant_name = body.name.clone(); + let field_prov_map = body.children.clone().iter().cloned().fold( + v2_rt::rc_empty_map::< + String, + Rc>>, + >(), + |m: Rc< + HashMap>>>, + >, + fi: Rc| { + let fname = field_init_node_name_at( + fi.clone(), + type_env.source_indices.clone(), + ); + let fprov = classify_body_provenance( + &field_init_node_value(&fi), + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &let_prov, + ); + if (fname.clone().as_str() != "".to_string().as_str()) { + v2_rt::rc_map_insert( + m.clone(), + fname.clone(), + fprov.clone(), + ) + } else { + m.clone() + } + }, + ); + match v2_rt::map_get(&acc, variant_name.clone()) { + Some(existing) => { + let merged = merge_field_prov_maps(&existing, &field_prov_map); + v2_rt::rc_map_insert(acc.clone(), variant_name.clone(), merged) + } + None => v2_rt::rc_map_insert( + acc.clone(), + variant_name.clone(), + field_prov_map, + ), + } + } } else { - m.clone() + acc.clone() } -}); -match v2_rt::map_get(&acc, variant_name.clone()) { - Some(existing) => { - let merged = merge_field_prov_maps(&existing, &field_prov_map); -v2_rt::rc_map_insert(acc.clone(), variant_name.clone(), merged) -}, - None => v2_rt::rc_map_insert(acc.clone(), variant_name.clone(), field_prov_map), -} -} - } else { - acc.clone() - }, - None => acc.clone(), -}, - ExprData::ExprMatch => match_arm_nodes(body.clone()).iter().cloned().fold(acc.clone(), |a: Rc>>>>>>, arm: Rc| collect_variant_constructors(&arm_body(&arm), parent_enum.clone(), ¶m_names, ¶m_types, &type_env, &func_sigs, let_prov.clone(), &a)), - ExprData::ExprIf => { - let then_acc = collect_variant_constructors(&if_then_branch(body.clone()), parent_enum.clone(), ¶m_names, ¶m_types, &type_env, &func_sigs, let_prov.clone(), &acc); -match if_else_branch(body.clone()) { - Some(eb) => collect_variant_constructors(&eb, parent_enum.clone(), ¶m_names, ¶m_types, &type_env, &func_sigs, let_prov.clone(), &then_acc), - None => then_acc, -} -}, - ExprData::ExprLet => match let_body(body.clone()) { - Some(b) => { - let bname = let_binding_name_at(body.clone(), type_env.source_indices.clone()); -let value_prov = classify_body_provenance(&let_value(body.clone()), ¶m_names, ¶m_types, &type_env, &func_sigs, &let_prov); -let new_lp = v2_rt::rc_map_insert(let_prov.clone(), bname.clone(), value_prov); -collect_variant_constructors(&b, parent_enum.clone(), ¶m_names, ¶m_types, &type_env, &func_sigs, new_lp, &acc) -}, - None => acc.clone(), -}, - ExprData::ExprBlock => { - let stmts = body.children.clone(); -let stmt_count = (stmts.clone().len() as i64); -if (stmt_count.clone() == 0) { - acc.clone() - } else { - { - let final_lp = Rc::new(stmts.clone().iter().cloned().take((stmt_count.clone() - 1) as usize).collect::>()).iter().cloned().fold(let_prov.clone(), |lp: Rc>>>>, stmt: Rc| match (*stmt.expr_data.clone()).clone() { - ExprData::ExprLet => { - let bname = let_binding_name_at(stmt.clone(), type_env.source_indices.clone()); -let vprov = classify_body_provenance(&let_value(stmt.clone()), ¶m_names, ¶m_types, &type_env, &func_sigs, &lp); -v2_rt::rc_map_insert(lp.clone(), bname.clone(), vprov.clone()) -}, - _ => lp.clone(), -}); -match stmts.clone().get((stmt_count.clone() - 1) as usize).cloned() { - Some(last) => collect_variant_constructors(&last, parent_enum.clone(), ¶m_names, ¶m_types, &type_env, &func_sigs, final_lp, &acc), - None => acc.clone(), -} -} + } + None => acc.clone(), + }, + ExprData::ExprMatch => match_arm_nodes(body.clone()).iter().cloned().fold( + acc.clone(), + |a: Rc< + HashMap>>>>>, + >, + arm: Rc| { + collect_variant_constructors( + &arm_body(&arm), + parent_enum.clone(), + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + let_prov.clone(), + &a, + ) + }, + ), + ExprData::ExprIf => { + let then_acc = collect_variant_constructors( + &if_then_branch(body.clone()), + parent_enum.clone(), + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + let_prov.clone(), + &acc, + ); + match if_else_branch(body.clone()) { + Some(eb) => collect_variant_constructors( + &eb, + parent_enum.clone(), + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + let_prov.clone(), + &then_acc, + ), + None => then_acc, + } } -}, - _ => acc.clone(), -} + ExprData::ExprLet => match let_body(body.clone()) { + Some(b) => { + let bname = let_binding_name_at(body.clone(), type_env.source_indices.clone()); + let value_prov = classify_body_provenance( + &let_value(body.clone()), + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &let_prov, + ); + let new_lp = v2_rt::rc_map_insert(let_prov.clone(), bname.clone(), value_prov); + collect_variant_constructors( + &b, + parent_enum.clone(), + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + new_lp, + &acc, + ) + } + None => acc.clone(), + }, + ExprData::ExprBlock => { + let stmts = body.children.clone(); + let stmt_count = (stmts.clone().len() as i64); + if (stmt_count.clone() == 0) { + acc.clone() + } else { + { + let final_lp = Rc::new( + stmts + .clone() + .iter() + .cloned() + .take((stmt_count.clone() - 1) as usize) + .collect::>(), + ) + .iter() + .cloned() + .fold( + let_prov.clone(), + |lp: Rc>>>>, + stmt: Rc| match (*stmt + .expr_data + .clone()) + .clone() + { + ExprData::ExprLet => { + let bname = let_binding_name_at( + stmt.clone(), + type_env.source_indices.clone(), + ); + let vprov = classify_body_provenance( + &let_value(stmt.clone()), + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + &lp, + ); + v2_rt::rc_map_insert(lp.clone(), bname.clone(), vprov.clone()) + } + _ => lp.clone(), + }, + ); + match stmts + .clone() + .get((stmt_count.clone() - 1) as usize) + .cloned() + { + Some(last) => collect_variant_constructors( + &last, + parent_enum.clone(), + ¶m_names, + ¶m_types, + &type_env, + &func_sigs, + final_lp, + &acc, + ), + None => acc.clone(), + } + } + } + } + _ => acc.clone(), + } }) } -pub fn merge_field_prov_maps(a: &Rc>>>>, b: &Rc>>>>) -> Rc>>>> { +pub fn merge_field_prov_maps( + a: &Rc>>>>, + b: &Rc>>>>, +) -> Rc>>>> { { - let from_a = Rc::new(v2_rt::map_keys(&a)).iter().cloned().fold(v2_rt::rc_empty_map::>>>(), |result: Rc>>>>, fname: String| match v2_rt::map_get(&a, fname.clone()) { - Some(a_prov) => match v2_rt::map_get(&b, fname.clone()) { - Some(b_prov) => v2_rt::rc_map_insert(result.clone(), fname.clone(), union_prov_maps(&a_prov, &b_prov)), - None => v2_rt::rc_map_insert(result.clone(), fname.clone(), a_prov.clone()), -}, - None => result.clone(), -}); -Rc::new(v2_rt::map_keys(&b)).iter().cloned().fold(from_a, |result: Rc>>>>, fname: String| if (v2_rt::map_get(&result, fname.clone()) != None) { - result.clone() - } else { - match v2_rt::map_get(&b, fname.clone()) { - Some(b_prov) => v2_rt::rc_map_insert(result.clone(), fname.clone(), b_prov.clone()), - None => result.clone(), -} - }) -} + let from_a = Rc::new(v2_rt::map_keys(&a)).iter().cloned().fold( + v2_rt::rc_empty_map::>>>(), + |result: Rc>>>>, + fname: String| match v2_rt::map_get(&a, fname.clone()) { + Some(a_prov) => match v2_rt::map_get(&b, fname.clone()) { + Some(b_prov) => v2_rt::rc_map_insert( + result.clone(), + fname.clone(), + union_prov_maps(&a_prov, &b_prov), + ), + None => v2_rt::rc_map_insert(result.clone(), fname.clone(), a_prov.clone()), + }, + None => result.clone(), + }, + ); + Rc::new(v2_rt::map_keys(&b)).iter().cloned().fold( + from_a, + |result: Rc>>>>, + fname: String| { + if (v2_rt::map_get(&result, fname.clone()) != None) { + result.clone() + } else { + match v2_rt::map_get(&b, fname.clone()) { + Some(b_prov) => { + v2_rt::rc_map_insert(result.clone(), fname.clone(), b_prov.clone()) + } + None => result.clone(), + } + } + }, + ) + } } -pub fn union_prov_maps(a: &Rc>>, b: &Rc>>) -> Rc>> { +pub fn union_prov_maps( + a: &Rc>>, + b: &Rc>>, +) -> Rc>> { { - let from_a = Rc::new(v2_rt::map_keys(&a)).iter().cloned().fold(empty_prov_map(), |result: Rc>>, key: String| match v2_rt::map_get(&a, key.clone()) { - Some(a_rel) => match v2_rt::map_get(&b, key.clone()) { - Some(b_rel) => v2_rt::rc_map_insert(result.clone(), key.clone(), join_sub_value(a_rel.clone(), b_rel.clone())), - None => v2_rt::rc_map_insert(result.clone(), key.clone(), a_rel.clone()), -}, - None => result.clone(), -}); -Rc::new(v2_rt::map_keys(&b)).iter().cloned().fold(from_a, |result: Rc>>, key: String| if (v2_rt::map_get(&result, key.clone()) != None) { - result.clone() - } else { - match v2_rt::map_get(&b, key.clone()) { - Some(b_rel) => v2_rt::rc_map_insert(result.clone(), key.clone(), b_rel.clone()), - None => result.clone(), -} - }) -} + let from_a = Rc::new(v2_rt::map_keys(&a)).iter().cloned().fold( + empty_prov_map(), + |result: Rc>>, key: String| match v2_rt::map_get( + &a, + key.clone(), + ) { + Some(a_rel) => match v2_rt::map_get(&b, key.clone()) { + Some(b_rel) => v2_rt::rc_map_insert( + result.clone(), + key.clone(), + join_sub_value(a_rel.clone(), b_rel.clone()), + ), + None => v2_rt::rc_map_insert(result.clone(), key.clone(), a_rel.clone()), + }, + None => result.clone(), + }, + ); + Rc::new(v2_rt::map_keys(&b)).iter().cloned().fold( + from_a, + |result: Rc>>, key: String| { + if (v2_rt::map_get(&result, key.clone()) != None) { + result.clone() + } else { + match v2_rt::map_get(&b, key.clone()) { + Some(b_rel) => { + v2_rt::rc_map_insert(result.clone(), key.clone(), b_rel.clone()) + } + None => result.clone(), + } + } + }, + ) + } } -pub fn populate_output_provenance(typed_items: Rc>>, func_env: Rc, type_env: Rc, locals: Rc>>) -> Rc { +pub fn populate_output_provenance( + typed_items: Rc>>, + func_env: Rc, + type_env: Rc, + locals: Rc>>, +) -> Rc { { - let updated_sigs = typed_items.iter().cloned().fold(func_env.signatures.clone(), |acc: Rc>>, item: Rc| if ((item.params.clone().len() as i64) > 0) { - { - let fn_name = authored_name_at(type_env.source_indices.clone(), &item); -if (is_child_accessor_in_model(fn_name.clone()) || is_tree_size_reducing(fn_name.clone())) { - match item.params.clone().first().cloned() { - Some(first_param) => { - let pname = param_node_name_at(first_param.clone(), type_env.source_indices.clone()); -let ptype = resolved_type_name(&first_param, type_env.source_indices.clone()); -if ((ptype.clone().as_str() != "".to_string().as_str()) && (pname.clone().as_str() != "".to_string().as_str())) { - { - let fields = inductive_fields_for(type_env.clone(), ptype.clone()); -let list_field = Rc::new({ let mut __result = Vec::new(); for f in fields.clone().iter().cloned() { if match f.shape.clone() { - RecursionShape::ListRecursion => true, - _ => false, -} { __result.push(f); } } __result }).first().cloned(); -match list_field.clone() { - Some(ind_field) => { - let provenance = Rc::new(vec![v2_rt::rc_map_insert(v2_rt::rc_empty_map::>(), pname.clone(), Rc::new(SubValueRelation::StrictSubValue { - field: ind_field.clone(), - factor: Rc::new(ShrinkFactor::UnitShrink), -}))]); -match v2_rt::map_get(&acc, fn_name.clone()) { - Some(sig) => v2_rt::rc_map_insert(acc.clone(), fn_name.clone(), Rc::new(ResolvedFuncSig { - name: sig.name.clone(), - params: sig.params.clone(), - inferred: sig.inferred.clone(), - is_async: sig.is_async.clone(), - output_provenance: provenance.clone(), - variant_provenance: sig.variant_provenance.clone(), -})), - None => acc.clone(), -} -}, - None => acc.clone(), -} -} + let updated_sigs = typed_items.iter().cloned().fold( + func_env.signatures.clone(), + |acc: Rc>>, item: Rc| { + if ((item.params.clone().len() as i64) > 0) { + { + let fn_name = authored_name_at(type_env.source_indices.clone(), &item); + if (is_child_accessor_in_model(fn_name.clone()) + || is_tree_size_reducing(fn_name.clone())) + { + match item.params.clone().first().cloned() { + Some(first_param) => { + let pname = param_node_name_at( + first_param.clone(), + type_env.source_indices.clone(), + ); + let ptype = resolved_type_name( + &first_param, + type_env.source_indices.clone(), + ); + if ((ptype.clone().as_str() != "".to_string().as_str()) + && (pname.clone().as_str() != "".to_string().as_str())) + { + { + let fields = inductive_fields_for( + type_env.clone(), + ptype.clone(), + ); + let list_field = Rc::new({ + let mut __result = Vec::new(); + for f in fields.clone().iter().cloned() { + if match f.shape.clone() { + RecursionShape::ListRecursion => true, + _ => false, + } { + __result.push(f); + } + } + __result + }) + .first() + .cloned(); + match list_field.clone() { + Some(ind_field) => { + let provenance = + Rc::new(vec![v2_rt::rc_map_insert( + v2_rt::rc_empty_map::< + String, + Rc, + >( + ), + pname.clone(), + Rc::new( + SubValueRelation::StrictSubValue { + field: ind_field.clone(), + factor: Rc::new( + ShrinkFactor::UnitShrink, + ), + }, + ), + )]); + match v2_rt::map_get(&acc, fn_name.clone()) { + Some(sig) => v2_rt::rc_map_insert( + acc.clone(), + fn_name.clone(), + Rc::new(ResolvedFuncSig { + name: sig.name.clone(), + params: sig.params.clone(), + inferred: sig.inferred.clone(), + is_async: sig.is_async.clone(), + output_provenance: provenance + .clone(), + variant_provenance: sig + .variant_provenance + .clone(), + }), + ), + None => acc.clone(), + } + } + None => acc.clone(), + } + } + } else { + acc.clone() + } + } + None => acc.clone(), + } } else { - acc.clone() + match item.body.clone() { + Some(body) => { + if !expr_has_self_call( + &body, + &fn_name, + &type_env.source_indices.clone(), + ) { + { + let provenance = infer_output_provenance( + &body, + &item.params.clone(), + &type_env, + locals.clone(), + &acc, + ); + let variant_prov = + match item.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { + node: rt, + .. + }) => compute_variant_provenance( + body.clone(), + rt.clone(), + &item.params.clone(), + &type_env, + acc.clone(), + ), + _ => v2_rt::rc_empty_map::< + String, + Rc< + HashMap< + String, + Rc< + HashMap< + String, + Rc, + >, + >, + >, + >, + >( + ), + }; + let has_scalar = + ((provenance.clone().len() as i64) > 0); + let has_variant = + ((Rc::new(v2_rt::map_keys(&variant_prov)).len() + as i64) + > 0); + if (has_scalar.clone() || has_variant.clone()) { + match v2_rt::map_get(&acc, fn_name.clone()) { + Some(sig) => v2_rt::rc_map_insert( + acc.clone(), + fn_name.clone(), + Rc::new(ResolvedFuncSig { + name: sig.name.clone(), + params: sig.params.clone(), + inferred: sig.inferred.clone(), + is_async: sig.is_async.clone(), + output_provenance: if has_scalar.clone() + { + provenance.clone() + } else { + sig.output_provenance.clone() + }, + variant_provenance: if has_variant + .clone() + { + variant_prov.clone() + } else { + sig.variant_provenance.clone() + }, + }), + ), + None => acc.clone(), + } + } else { + acc.clone() + } + } + } else { + acc.clone() + } + } + None => acc.clone(), + } } -}, - None => acc.clone(), -} + } } else { - match item.body.clone() { - Some(body) => if !expr_has_self_call(&body, &fn_name, &type_env.source_indices.clone()) { - { - let provenance = infer_output_provenance(&body, &item.params.clone(), &type_env, locals.clone(), &acc); -let variant_prov = match item.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => compute_variant_provenance(body.clone(), rt.clone(), &item.params.clone(), &type_env, acc.clone()), - _ => v2_rt::rc_empty_map::>>>>>(), -}; -let has_scalar = ((provenance.clone().len() as i64) > 0); -let has_variant = ((Rc::new(v2_rt::map_keys(&variant_prov)).len() as i64) > 0); -if (has_scalar.clone() || has_variant.clone()) { - match v2_rt::map_get(&acc, fn_name.clone()) { - Some(sig) => v2_rt::rc_map_insert(acc.clone(), fn_name.clone(), Rc::new(ResolvedFuncSig { - name: sig.name.clone(), - params: sig.params.clone(), - inferred: sig.inferred.clone(), - is_async: sig.is_async.clone(), - output_provenance: if has_scalar.clone() { - provenance.clone() - } else { - sig.output_provenance.clone() - }, - variant_provenance: if has_variant.clone() { - variant_prov.clone() - } else { - sig.variant_provenance.clone() - }, -})), - None => acc.clone(), -} - } else { - acc.clone() - } -} - } else { - acc.clone() - }, - None => acc.clone(), -} + acc.clone() } -} - } else { - acc.clone() - }); -Rc::new(ResolvedFuncEnv { - signatures: updated_sigs, -}) -} + }, + ); + Rc::new(ResolvedFuncEnv { + signatures: updated_sigs, + }) + } } -pub fn annotate_descent_evidence(body: Rc, fn_name: String, params: &Rc>>, type_env: &Rc, scope_locals: Rc>>, func_sigs: Rc>>) -> Rc { +pub fn annotate_descent_evidence( + body: Rc, + fn_name: String, + params: &Rc>>, + type_env: &Rc, + scope_locals: Rc>>, + func_sigs: Rc>>, +) -> Rc { { - let param_name_map = params.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, p: Rc| { - let pname = param_node_name_at(p.clone(), type_env.source_indices.clone()); -let ptype = resolved_type_name(&p, type_env.source_indices.clone()); -v2_rt::rc_map_insert(acc, pname.clone(), ptype.clone()) -}); -let param_order_list = Rc::new({ let mut __result = Vec::new(); for p in params.clone().iter().cloned() { __result.push(param_node_name_at(p.clone(), type_env.source_indices.clone())); } __result }); -let ctx = Rc::new(DescentContext { - fn_name: fn_name, - param_names: param_name_map, - param_order: param_order_list, - type_env: type_env.clone(), - sub_value_vars: v2_rt::rc_empty_map::>(), - size_aliases: v2_rt::rc_empty_map::>(), - scope_locals: scope_locals, - func_sigs: func_sigs, - per_field_vars: v2_rt::rc_empty_map::>>>(), -}); -annotate_descent(&body, &ctx) -} + let param_name_map = params.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, p: Rc| { + let pname = param_node_name_at(p.clone(), type_env.source_indices.clone()); + let ptype = resolved_type_name(&p, type_env.source_indices.clone()); + v2_rt::rc_map_insert(acc, pname.clone(), ptype.clone()) + }, + ); + let param_order_list = Rc::new({ + let mut __result = Vec::new(); + for p in params.clone().iter().cloned() { + __result.push(param_node_name_at( + p.clone(), + type_env.source_indices.clone(), + )); + } + __result + }); + let ctx = Rc::new(DescentContext { + fn_name: fn_name, + param_names: param_name_map, + param_order: param_order_list, + type_env: type_env.clone(), + sub_value_vars: v2_rt::rc_empty_map::>(), + size_aliases: v2_rt::rc_empty_map::>(), + scope_locals: scope_locals, + func_sigs: func_sigs, + per_field_vars: v2_rt::rc_empty_map::>>>( + ), + }); + annotate_descent(&body, &ctx) + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -5172,1146 +8983,1938 @@ pub struct InferTransportResult { pub diagnostics: Rc>>, } -pub fn infer_property_values(props: Rc>>, scope: Rc) -> Rc { +pub fn infer_property_values( + props: Rc>>, + scope: Rc, +) -> Rc { { - let results = Rc::new({ let mut __result = Vec::new(); for p in props.iter().cloned() { __result.push({ - let val = field_init_node_value(&p); -let val_result = infer_expr(&val, &scope, &None); -(Rc::new(Node { - name: p.name.clone(), - span: p.span.clone(), - ident_span: p.ident_span.clone(), - children: Rc::new(vec![val_result.typed.clone()]), - connective: p.connective.clone(), - params: p.params.clone(), - inferred: p.inferred.clone(), - return_cardinality: p.return_cardinality.clone(), - uses: p.uses.clone(), - body: p.body.clone(), - transport: p.transport.clone(), - properties: p.properties.clone(), - type_annotation: p.type_annotation.clone(), - is_self_recursive: p.is_self_recursive.clone(), - has_non_tail_self_call: p.has_non_tail_self_call.clone(), - match_pattern: p.match_pattern.clone(), - expr_data: p.expr_data.clone(), - ident: None, -}), val_result.diagnostics.clone()) -}); } __result }); -Rc::new(InferPropertiesResult { - props: Rc::new({ let mut __result = Vec::new(); for r in results.clone().iter().cloned() { __result.push(r.0.clone()); } __result }), - diagnostics: Rc::new({ let mut __result = Vec::new(); for r in results.clone().iter().cloned() { __result.extend((*r.1.clone()).iter().cloned()); } __result }), -}) -} + let results = Rc::new({ + let mut __result = Vec::new(); + for p in props.iter().cloned() { + __result.push({ + let val = field_init_node_value(&p); + let val_result = infer_expr(&val, &scope, &None); + ( + Rc::new(Node { + name: p.name.clone(), + span: p.span.clone(), + ident_span: p.ident_span.clone(), + children: Rc::new(vec![val_result.typed.clone()]), + connective: p.connective.clone(), + params: p.params.clone(), + inferred: p.inferred.clone(), + return_cardinality: p.return_cardinality.clone(), + uses: p.uses.clone(), + body: p.body.clone(), + transport: p.transport.clone(), + properties: p.properties.clone(), + type_annotation: p.type_annotation.clone(), + is_self_recursive: p.is_self_recursive.clone(), + has_non_tail_self_call: p.has_non_tail_self_call.clone(), + match_pattern: p.match_pattern.clone(), + expr_data: p.expr_data.clone(), + ident: None, + }), + val_result.diagnostics.clone(), + ) + }); + } + __result + }); + Rc::new(InferPropertiesResult { + props: Rc::new({ + let mut __result = Vec::new(); + for r in results.clone().iter().cloned() { + __result.push(r.0.clone()); + } + __result + }), + diagnostics: Rc::new({ + let mut __result = Vec::new(); + for r in results.clone().iter().cloned() { + __result.extend((*r.1.clone()).iter().cloned()); + } + __result + }), + }) + } } -pub fn infer_auth_source_properties(props: Rc>>, scope: Rc) -> Rc { +pub fn infer_auth_source_properties( + props: Rc>>, + scope: Rc, +) -> Rc { { - let results = Rc::new({ let mut __result = Vec::new(); for p in props.iter().cloned() { __result.push(if (field_init_node_name_at(p.clone(), scope.type_env.clone().source_indices.clone()).as_str() == "svc_auth_source".to_string().as_str()) { - { - let val = field_init_node_value(&p); -let val_result = infer_expr(&val, &scope, &None); -(Rc::new(Node { - name: p.name.clone(), - span: p.span.clone(), - ident_span: p.ident_span.clone(), - children: Rc::new(vec![val_result.typed.clone()]), - connective: p.connective.clone(), - params: p.params.clone(), - inferred: p.inferred.clone(), - return_cardinality: p.return_cardinality.clone(), - uses: p.uses.clone(), - body: p.body.clone(), - transport: p.transport.clone(), - properties: p.properties.clone(), - type_annotation: p.type_annotation.clone(), - is_self_recursive: p.is_self_recursive.clone(), - has_non_tail_self_call: p.has_non_tail_self_call.clone(), - match_pattern: p.match_pattern.clone(), - expr_data: p.expr_data.clone(), - ident: None, -}), val_result.diagnostics.clone()) -} - } else { - (p.clone(), Rc::new(vec![])) - }); } __result }); -Rc::new(InferPropertiesResult { - props: Rc::new({ let mut __result = Vec::new(); for r in results.clone().iter().cloned() { __result.push(r.0.clone()); } __result }), - diagnostics: Rc::new({ let mut __result = Vec::new(); for r in results.clone().iter().cloned() { __result.extend((*r.1.clone()).iter().cloned()); } __result }), -}) -} + let results = Rc::new({ + let mut __result = Vec::new(); + for p in props.iter().cloned() { + __result.push( + if (field_init_node_name_at( + p.clone(), + scope.type_env.clone().source_indices.clone(), + ) + .as_str() + == "svc_auth_source".to_string().as_str()) + { + { + let val = field_init_node_value(&p); + let val_result = infer_expr(&val, &scope, &None); + ( + Rc::new(Node { + name: p.name.clone(), + span: p.span.clone(), + ident_span: p.ident_span.clone(), + children: Rc::new(vec![val_result.typed.clone()]), + connective: p.connective.clone(), + params: p.params.clone(), + inferred: p.inferred.clone(), + return_cardinality: p.return_cardinality.clone(), + uses: p.uses.clone(), + body: p.body.clone(), + transport: p.transport.clone(), + properties: p.properties.clone(), + type_annotation: p.type_annotation.clone(), + is_self_recursive: p.is_self_recursive.clone(), + has_non_tail_self_call: p.has_non_tail_self_call.clone(), + match_pattern: p.match_pattern.clone(), + expr_data: p.expr_data.clone(), + ident: None, + }), + val_result.diagnostics.clone(), + ) + } + } else { + (p.clone(), Rc::new(vec![])) + }, + ); + } + __result + }); + Rc::new(InferPropertiesResult { + props: Rc::new({ + let mut __result = Vec::new(); + for r in results.clone().iter().cloned() { + __result.push(r.0.clone()); + } + __result + }), + diagnostics: Rc::new({ + let mut __result = Vec::new(); + for r in results.clone().iter().cloned() { + __result.extend((*r.1.clone()).iter().cloned()); + } + __result + }), + }) + } } -pub fn infer_transport_node(transport: Option>, scope: Rc) -> Rc { +pub fn infer_transport_node( + transport: Option>, + scope: Rc, +) -> Rc { match transport { - None => Rc::new(InferTransportResult { - transport: None, - diagnostics: Rc::new(vec![]), -}), - Some(t) => { - let prop_result = infer_property_values(t.properties.clone(), scope); -Rc::new(InferTransportResult { - transport: Some(Rc::new(Node { - name: t.name.clone(), - span: t.span.clone(), - ident_span: t.ident_span.clone(), - children: t.children.clone(), - connective: t.connective.clone(), - params: t.params.clone(), - inferred: t.inferred.clone(), - return_cardinality: t.return_cardinality.clone(), - uses: t.uses.clone(), - body: t.body.clone(), - transport: t.transport.clone(), - properties: prop_result.props.clone(), - type_annotation: t.type_annotation.clone(), - is_self_recursive: t.is_self_recursive.clone(), - has_non_tail_self_call: t.has_non_tail_self_call.clone(), - match_pattern: t.match_pattern.clone(), - expr_data: t.expr_data.clone(), - ident: None, -})), - diagnostics: prop_result.diagnostics.clone(), -}) -}, -} + None => Rc::new(InferTransportResult { + transport: None, + diagnostics: Rc::new(vec![]), + }), + Some(t) => { + let prop_result = infer_property_values(t.properties.clone(), scope); + Rc::new(InferTransportResult { + transport: Some(Rc::new(Node { + name: t.name.clone(), + span: t.span.clone(), + ident_span: t.ident_span.clone(), + children: t.children.clone(), + connective: t.connective.clone(), + params: t.params.clone(), + inferred: t.inferred.clone(), + return_cardinality: t.return_cardinality.clone(), + uses: t.uses.clone(), + body: t.body.clone(), + transport: t.transport.clone(), + properties: prop_result.props.clone(), + type_annotation: t.type_annotation.clone(), + is_self_recursive: t.is_self_recursive.clone(), + has_non_tail_self_call: t.has_non_tail_self_call.clone(), + match_pattern: t.match_pattern.clone(), + expr_data: t.expr_data.clone(), + ident: None, + })), + diagnostics: prop_result.diagnostics.clone(), + }) + } + } } pub fn infer_item(item: &Rc, scope: &Rc) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let typed_anno = item.type_annotation.clone(); -let transport_scope = if ((item.params.clone().len() as i64) > 0) { - build_params_scope(&scope, item.params.clone()) - } else { - scope.clone() - }; -let transport_result = infer_transport_node(item.transport.clone(), transport_scope); -let typed_transport = transport_result.transport.clone(); -let transport_diags = transport_result.diagnostics.clone(); -let props_result = infer_auth_source_properties(item.properties.clone(), scope.clone()); -let typed_properties = props_result.props.clone(); -let props_diags = props_result.diagnostics.clone(); -if ((item.connective.clone() != Connective::NoConnective) && (item.transport.clone() == None)) { - Rc::new(TypedItemResult { - item: Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: Rc::new({ let mut __result = Vec::new(); for c in item.children.clone().iter().cloned() { __result.push(infer_item(&c, &scope).item.clone()); } __result }), - params: item.params.clone(), - inferred: Some(Rc::new(InferredNode::Resolved { - node: unit_type(), -})), - return_cardinality: item.return_cardinality.clone(), - uses: item.uses.clone(), - body: None, - connective: item.connective.clone(), - transport: typed_transport, - properties: typed_properties, - type_annotation: typed_anno, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), - diagnostics: v2_rt::concat(transport_diags, props_diags), -}) + let typed_anno = item.type_annotation.clone(); + let transport_scope = if ((item.params.clone().len() as i64) > 0) { + build_params_scope(&scope, item.params.clone()) + } else { + scope.clone() + }; + let transport_result = infer_transport_node(item.transport.clone(), transport_scope); + let typed_transport = transport_result.transport.clone(); + let transport_diags = transport_result.diagnostics.clone(); + let props_result = infer_auth_source_properties(item.properties.clone(), scope.clone()); + let typed_properties = props_result.props.clone(); + let props_diags = props_result.diagnostics.clone(); + if ((item.connective.clone() != Connective::NoConnective) + && (item.transport.clone() == None)) + { + Rc::new(TypedItemResult { + item: Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: Rc::new({ + let mut __result = Vec::new(); + for c in item.children.clone().iter().cloned() { + __result.push(infer_item(&c, &scope).item.clone()); + } + __result + }), + params: item.params.clone(), + inferred: Some(Rc::new(InferredNode::Resolved { node: unit_type() })), + return_cardinality: item.return_cardinality.clone(), + uses: item.uses.clone(), + body: None, + connective: item.connective.clone(), + transport: typed_transport, + properties: typed_properties, + type_annotation: typed_anno, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + diagnostics: v2_rt::concat(transport_diags, props_diags), + }) + } else { + if ((item.body.clone() != None) && ((item.params.clone().len() as i64) > 0)) { + { + let fn_scope = build_params_scope(&scope, item.params.clone()); + let fn_scope = item.uses.clone().iter().cloned().fold( + fn_scope.clone(), + |s: Rc, u: Rc| { + extend_scope( + &s, + &resource_use_name_at( + u.clone(), + scope.type_env.clone().source_indices.clone(), + ), + resource_use_resource(&u), + Rc::new(SubValueRelation::SubValueUnknown), + ) + }, + ); + let fn_return_expected = if (item.inferred.clone() != None) { + Some(resolved_type(item.clone())) + } else { + None + }; + let body_result = infer_expr( + &item.body.clone().clone().unwrap(), + &fn_scope, + &fn_return_expected, + ); + let body_typed = body_result.typed.clone(); + let body_diags = body_result.diagnostics.clone(); + let inferred_ret = if (item.inferred.clone() != None) { + item.inferred.clone() + } else { + body_typed.inferred.clone() + }; + let is_recursive = expr_has_self_call( + &body_typed, + &authored_name_at(scope.type_env.clone().source_indices.clone(), &item), + &scope.type_env.clone().source_indices.clone(), + ); + let annotated_body = if is_recursive.clone() { + annotate_descent_evidence( + body_typed.clone(), + authored_name_at(scope.type_env.clone().source_indices.clone(), &item), + &item.params.clone(), + &scope.type_env.clone(), + fn_scope.locals.clone(), + scope.func_env.clone().signatures.clone(), + ) + } else { + body_typed.clone() + }; + Rc::new(TypedItemResult { + item: Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: Rc::new({ + let mut __result = Vec::new(); + for c in item.children.clone().iter().cloned() { + __result.push(infer_item(&c, &scope).item.clone()); + } + __result + }), + params: item.params.clone(), + inferred: inferred_ret, + return_cardinality: item.return_cardinality.clone(), + uses: item.uses.clone(), + body: Some(annotated_body), + connective: Connective::NoConnective, + transport: typed_transport, + properties: typed_properties, + type_annotation: typed_anno, + is_self_recursive: is_recursive.clone(), + has_non_tail_self_call: expr_has_non_tail_self_call( + &body_typed, + &authored_name_at( + scope.type_env.clone().source_indices.clone(), + &item, + ), + true, + &scope.type_env.clone().source_indices.clone(), + ), + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + diagnostics: v2_rt::concat( + v2_rt::concat(transport_diags, props_diags), + body_diags, + ), + }) + } } else { - if ((item.body.clone() != None) && ((item.params.clone().len() as i64) > 0)) { + if (((item.body.clone() != None) && ((item.params.clone().len() as i64) == 0)) + && (item.inferred.clone() != None)) + { { - let fn_scope = build_params_scope(&scope, item.params.clone()); -let fn_scope = item.uses.clone().iter().cloned().fold(fn_scope.clone(), |s: Rc, u: Rc| extend_scope(&s, &resource_use_name_at(u.clone(), scope.type_env.clone().source_indices.clone()), resource_use_resource(&u), Rc::new(SubValueRelation::SubValueUnknown))); -let fn_return_expected = if (item.inferred.clone() != None) { - Some(resolved_type(item.clone())) - } else { - None - }; -let body_result = infer_expr(&item.body.clone().clone().unwrap(), &fn_scope, &fn_return_expected); -let body_typed = body_result.typed.clone(); -let body_diags = body_result.diagnostics.clone(); -let inferred_ret = if (item.inferred.clone() != None) { - item.inferred.clone() - } else { - body_typed.inferred.clone() - }; -let is_recursive = expr_has_self_call(&body_typed, &authored_name_at(scope.type_env.clone().source_indices.clone(), &item), &scope.type_env.clone().source_indices.clone()); -let annotated_body = if is_recursive.clone() { - annotate_descent_evidence(body_typed.clone(), authored_name_at(scope.type_env.clone().source_indices.clone(), &item), &item.params.clone(), &scope.type_env.clone(), fn_scope.locals.clone(), scope.func_env.clone().signatures.clone()) - } else { - body_typed.clone() - }; -Rc::new(TypedItemResult { - item: Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: Rc::new({ let mut __result = Vec::new(); for c in item.children.clone().iter().cloned() { __result.push(infer_item(&c, &scope).item.clone()); } __result }), - params: item.params.clone(), - inferred: inferred_ret, - return_cardinality: item.return_cardinality.clone(), - uses: item.uses.clone(), - body: Some(annotated_body), - connective: Connective::NoConnective, - transport: typed_transport, - properties: typed_properties, - type_annotation: typed_anno, - is_self_recursive: is_recursive.clone(), - has_non_tail_self_call: expr_has_non_tail_self_call(&body_typed, &authored_name_at(scope.type_env.clone().source_indices.clone(), &item), true, &scope.type_env.clone().source_indices.clone()), - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), - diagnostics: v2_rt::concat(v2_rt::concat(transport_diags, props_diags), body_diags), -}) -} + let fn_scope = scope.clone(); + let body_result = infer_expr( + &item.body.clone().clone().unwrap(), + &fn_scope, + &Some(resolved_type(item.clone())), + ); + let body_typed = body_result.typed.clone(); + let body_diags = body_result.diagnostics.clone(); + Rc::new(TypedItemResult { + item: Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: item.inferred.clone(), + return_cardinality: item.return_cardinality.clone(), + uses: Rc::new(vec![]), + body: Some(body_typed.clone()), + connective: Connective::NoConnective, + transport: typed_transport, + properties: typed_properties, + type_annotation: typed_anno, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + diagnostics: v2_rt::concat( + v2_rt::concat(transport_diags, props_diags), + body_diags, + ), + }) + } } else { - if (((item.body.clone() != None) && ((item.params.clone().len() as i64) == 0)) && (item.inferred.clone() != None)) { + if ((item.body.clone() != None) && ((item.params.clone().len() as i64) == 0)) { { - let fn_scope = scope.clone(); -let body_result = infer_expr(&item.body.clone().clone().unwrap(), &fn_scope, &Some(resolved_type(item.clone()))); -let body_typed = body_result.typed.clone(); -let body_diags = body_result.diagnostics.clone(); -Rc::new(TypedItemResult { - item: Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: item.inferred.clone(), - return_cardinality: item.return_cardinality.clone(), - uses: Rc::new(vec![]), - body: Some(body_typed.clone()), - connective: Connective::NoConnective, - transport: typed_transport, - properties: typed_properties, - type_annotation: typed_anno, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), - diagnostics: v2_rt::concat(v2_rt::concat(transport_diags, props_diags), body_diags), -}) -} + let data_expected = if (item.type_annotation.clone() != None) { + Some(item.type_annotation.clone().clone().unwrap()) + } else { + None + }; + let val_result = infer_expr( + &item.body.clone().clone().unwrap(), + &scope, + &data_expected, + ); + let val_typed = val_result.typed.clone(); + let val_diags = val_result.diagnostics.clone(); + let inferred_ret = if (item.type_annotation.clone() != None) { + Some(Rc::new(InferredNode::Resolved { + node: item.type_annotation.clone().clone().unwrap(), + })) + } else { + val_typed.inferred.clone() + }; + Rc::new(TypedItemResult { + item: Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: inferred_ret, + return_cardinality: item.return_cardinality.clone(), + uses: Rc::new(vec![]), + body: Some(val_typed.clone()), + connective: Connective::NoConnective, + transport: typed_transport, + properties: typed_properties, + type_annotation: typed_anno, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + diagnostics: v2_rt::concat( + v2_rt::concat(transport_diags, props_diags), + val_diags, + ), + }) + } } else { - if ((item.body.clone() != None) && ((item.params.clone().len() as i64) == 0)) { - { - let data_expected = if (item.type_annotation.clone() != None) { - Some(item.type_annotation.clone().clone().unwrap()) - } else { - None - }; -let val_result = infer_expr(&item.body.clone().clone().unwrap(), &scope, &data_expected); -let val_typed = val_result.typed.clone(); -let val_diags = val_result.diagnostics.clone(); -let inferred_ret = if (item.type_annotation.clone() != None) { - Some(Rc::new(InferredNode::Resolved { - node: item.type_annotation.clone().clone().unwrap(), -})) - } else { - val_typed.inferred.clone() - }; -Rc::new(TypedItemResult { - item: Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: inferred_ret, - return_cardinality: item.return_cardinality.clone(), - uses: Rc::new(vec![]), - body: Some(val_typed.clone()), - connective: Connective::NoConnective, - transport: typed_transport, - properties: typed_properties, - type_annotation: typed_anno, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), - diagnostics: v2_rt::concat(v2_rt::concat(transport_diags, props_diags), val_diags), -}) -} + if (((item.params.clone().len() as i64) > 0) && (item.body.clone() == None)) + { + Rc::new(TypedItemResult { + item: Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: Rc::new({ + let mut __result = Vec::new(); + for c in item.children.clone().iter().cloned() { + __result.push(infer_item(&c, &scope).item.clone()); + } + __result + }), + params: item.params.clone(), + inferred: if (item.inferred.clone() != None) { + item.inferred.clone() + } else { + Some(Rc::new(InferredNode::Resolved { node: unit_type() })) + }, + return_cardinality: item.return_cardinality.clone(), + uses: item.uses.clone(), + body: None, + connective: Connective::NoConnective, + transport: typed_transport, + properties: typed_properties, + type_annotation: typed_anno, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + diagnostics: v2_rt::concat(transport_diags, props_diags), + }) } else { - if (((item.params.clone().len() as i64) > 0) && (item.body.clone() == None)) { - Rc::new(TypedItemResult { - item: Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: Rc::new({ let mut __result = Vec::new(); for c in item.children.clone().iter().cloned() { __result.push(infer_item(&c, &scope).item.clone()); } __result }), - params: item.params.clone(), - inferred: if (item.inferred.clone() != None) { - item.inferred.clone() - } else { - Some(Rc::new(InferredNode::Resolved { - node: unit_type(), -})) - }, - return_cardinality: item.return_cardinality.clone(), - uses: item.uses.clone(), - body: None, - connective: Connective::NoConnective, - transport: typed_transport, - properties: typed_properties, - type_annotation: typed_anno, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), - diagnostics: v2_rt::concat(transport_diags, props_diags), -}) - } else { - Rc::new(TypedItemResult { - item: Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: Rc::new({ let mut __result = Vec::new(); for c in item.children.clone().iter().cloned() { __result.push(infer_item(&c, &scope).item.clone()); } __result }), - params: item.params.clone(), - inferred: if (item.inferred.clone() != None) { - item.inferred.clone() - } else { - Some(Rc::new(InferredNode::Resolved { - node: unit_type(), -})) - }, - return_cardinality: item.return_cardinality.clone(), - uses: item.uses.clone(), - body: None, - connective: item.connective.clone(), - transport: typed_transport, - properties: typed_properties, - type_annotation: typed_anno, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), - diagnostics: v2_rt::concat(transport_diags, props_diags), -}) - } + Rc::new(TypedItemResult { + item: Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: Rc::new({ + let mut __result = Vec::new(); + for c in item.children.clone().iter().cloned() { + __result.push(infer_item(&c, &scope).item.clone()); + } + __result + }), + params: item.params.clone(), + inferred: if (item.inferred.clone() != None) { + item.inferred.clone() + } else { + Some(Rc::new(InferredNode::Resolved { node: unit_type() })) + }, + return_cardinality: item.return_cardinality.clone(), + uses: item.uses.clone(), + body: None, + connective: item.connective.clone(), + transport: typed_transport, + properties: typed_properties, + type_annotation: typed_anno, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + diagnostics: v2_rt::concat(transport_diags, props_diags), + }) } } } } -} + } }) } -pub fn infer_items(items: Rc>>, scope: Rc) -> Rc>> { - Rc::new({ let mut __result = Vec::new(); for item in items.iter().cloned() { __result.push(infer_item(&item, &scope)); } __result }) +pub fn infer_items( + items: Rc>>, + scope: Rc, +) -> Rc>> { + Rc::new({ + let mut __result = Vec::new(); + for item in items.iter().cloned() { + __result.push(infer_item(&item, &scope)); + } + __result + }) } pub fn is_type_variable_name(name: &String) -> bool { - (((((name.clone().as_str() == "T".to_string().as_str()) || (name.clone().as_str() == "K".to_string().as_str())) || (name.clone().as_str() == "V".to_string().as_str())) || (name.clone().as_str() == "MappedElement".to_string().as_str())) || (name.clone().as_str() == "FoldAccumulator".to_string().as_str())) -} - -pub fn collect_parent_bindings_filtered(envs: Rc>>) -> Rc>> { - envs.iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, env: Rc| Rc::new(v2_rt::map_keys(&env.bindings.clone())).iter().cloned().fold(acc, |bacc: Rc>>, ident: i64| { - let name = intern_str(env.intern_table.clone(), ident.clone()); -if is_type_variable_name(&name) { - bacc.clone() - } else { - match v2_rt::map_get(&env.bindings.clone(), ident.clone()) { - Some(binding) => v2_rt::rc_map_insert(bacc.clone(), ident.clone(), binding.clone()), - None => bacc.clone(), -} - } -})) + (((((name.clone().as_str() == "T".to_string().as_str()) + || (name.clone().as_str() == "K".to_string().as_str())) + || (name.clone().as_str() == "V".to_string().as_str())) + || (name.clone().as_str() == "MappedElement".to_string().as_str())) + || (name.clone().as_str() == "FoldAccumulator".to_string().as_str())) +} + +pub fn collect_parent_bindings_filtered( + envs: Rc>>, +) -> Rc>> { + envs.iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, env: Rc| { + Rc::new(v2_rt::map_keys(&env.bindings.clone())) + .iter() + .cloned() + .fold( + acc, + |bacc: Rc>>, ident: i64| { + let name = intern_str(env.intern_table.clone(), ident.clone()); + if is_type_variable_name(&name) { + bacc.clone() + } else { + match v2_rt::map_get(&env.bindings.clone(), ident.clone()) { + Some(binding) => v2_rt::rc_map_insert( + bacc.clone(), + ident.clone(), + binding.clone(), + ), + None => bacc.clone(), + } + } + }, + ) + }, + ) } pub fn kernel_span(name: &String) -> Rc { Rc::new(SourceSpan { - file: v2_rt::concat(v2_rt::concat("".to_string()), - start: 0, - end: v2_rt::string_length(&name), -}) + file: v2_rt::concat( + v2_rt::concat("".to_string(), + ), + start: 0, + end: v2_rt::string_length(&name), + }) } -pub fn build_type_env(module: &Rc, parent_index: &Rc>>, source_indices: &Rc>>, intern_table: &Rc) -> Rc { +pub fn build_type_env( + module: &Rc, + parent_index: &Rc>>, + source_indices: &Rc>>, + intern_table: &Rc, +) -> Rc { { - let source_indices = Rc::new(v2_rt::map_keys(&kernel_type_set())).iter().cloned().fold(source_indices.clone(), |acc: Rc>>, name: String| v2_rt::rc_map_insert(acc, v2_rt::concat(v2_rt::concat("".to_string()), build_newline_index(v2_rt::concat(v2_rt::concat("".to_string()), &name))); -let source_indices = Rc::new(vec!["Optional".to_string(), "Some".to_string(), "None".to_string(), "value".to_string(), "none".to_string()]).iter().cloned().fold(source_indices.clone(), |acc: Rc>>, name: String| v2_rt::rc_map_insert(acc, v2_rt::concat(v2_rt::concat("".to_string()), build_newline_index(v2_rt::concat(v2_rt::concat("".to_string()), &name))); -let intern_table = Rc::new(v2_rt::map_keys(&kernel_type_set())).iter().cloned().fold(intern_table.clone(), |t: Rc, name: String| intern(&t, &name).table.clone()); -let intern_table = Rc::new(vec!["Optional".to_string(), "Some".to_string(), "None".to_string(), "value".to_string(), "none".to_string()]).iter().cloned().fold(intern_table.clone(), |t: Rc, name: String| intern(&t, &name).table.clone()); -let intern_table = Rc::new(v2_rt::map_keys(&compiler_recursive_types())).iter().cloned().fold(intern_table.clone(), |t: Rc, name: String| intern(&t, &name).table.clone()); -let kernel_bindings_base = Rc::new(v2_rt::map_keys(&kernel_type_set())).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, name: String| v2_rt::rc_map_insert(acc, intern(&intern_table, &name).id.clone(), Rc::new(TypeBinding { - name: name.clone(), - resolved: Rc::new(Node { - name: name.clone(), - span: kernel_span(&name), - ident_span: Some(kernel_span(&name)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), - provenance: Rc::new(SubValueRelation::SubValueUnknown), -}))); -let unit_span = kernel_span(&"Unit".to_string()); -let kernel_bindings = v2_rt::rc_map_insert(kernel_bindings_base, intern(&intern_table, &"Unit".to_string()).id.clone(), Rc::new(TypeBinding { - name: "Unit".to_string(), - resolved: Rc::new(Node { - name: "Unit".to_string(), - span: unit_span.clone(), - ident_span: Some(unit_span.clone()), - children: Rc::new(vec![]), - connective: Connective::Conj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), - provenance: Rc::new(SubValueRelation::SubValueUnknown), -})); -let some_value_field = Rc::new(Node { - name: "value".to_string(), - span: kernel_span(&"value".to_string()), - ident_span: Some(kernel_span(&"value".to_string())), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::TypeVariable { - id: "some_value".to_string(), -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let some_variant = Rc::new(Node { - name: "Some".to_string(), - span: kernel_span(&"Some".to_string()), - ident_span: Some(kernel_span(&"Some".to_string())), - children: Rc::new(vec![some_value_field]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let kernel_optional = Rc::new(Node { - name: "Optional".to_string(), - span: kernel_span(&"Optional".to_string()), - ident_span: Some(kernel_span(&"Optional".to_string())), - children: Rc::new(vec![some_variant, none_type()]), - connective: Connective::Disj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let kernel_bindings = v2_rt::rc_map_insert(kernel_bindings.clone(), intern(&intern_table, &"Optional".to_string()).id.clone(), Rc::new(TypeBinding { - name: "Optional".to_string(), - resolved: kernel_optional, - provenance: Rc::new(SubValueRelation::SubValueUnknown), -})); -let node_fields = inductive_fields_list_to_map(compiler_inductive_fields()); -let kernel_recursive_types = Rc::new({ let mut __result = Vec::new(); for name in Rc::new(v2_rt::map_keys(&compiler_recursive_types())).iter().cloned() { __result.push(intern(&intern_table, &name).id.clone()); } __result }); -let kernel_recursive_type_set = Rc::new(v2_rt::map_keys(&compiler_recursive_types())).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, intern(&intern_table, &name).id.clone(), true)); -let kernel = Rc::new(TypeEnv { - bindings: kernel_bindings.clone(), - recursive_types: kernel_recursive_types, - recursive_type_set: kernel_recursive_type_set, - inductive_fields: node_fields, - source_indices: source_indices.clone(), - intern_table: intern_table.clone(), -}); -let imports_std_types = { let mut __found = false; for imp in module.resolved_imports.clone().iter().cloned() { if (imp.module_path.clone().as_str() == "std.types".to_string().as_str()) { __found = true; break; } } __found }; -let module_name_str = authored_name_at(source_indices.clone(), &module.module.clone()); -let std_types_parent_env = if ((module_name_str.clone().as_str() != "std.types".to_string().as_str()) && (imports_std_types == false)) { + let source_indices = Rc::new(v2_rt::map_keys(&kernel_type_set())) + .iter() + .cloned() + .fold( + source_indices.clone(), + |acc: Rc>>, name: String| { + v2_rt::rc_map_insert( + acc, + v2_rt::concat( + v2_rt::concat("".to_string(), + ), + build_newline_index( + v2_rt::concat( + v2_rt::concat("".to_string(), + ), + &name, + ), + ) + }, + ); + let source_indices = Rc::new(vec![ + "Optional".to_string(), + "Some".to_string(), + "None".to_string(), + "value".to_string(), + "none".to_string(), + ]) + .iter() + .cloned() + .fold( + source_indices.clone(), + |acc: Rc>>, name: String| { + v2_rt::rc_map_insert( + acc, + v2_rt::concat( + v2_rt::concat("".to_string(), + ), + build_newline_index( + v2_rt::concat( + v2_rt::concat("".to_string(), + ), + &name, + ), + ) + }, + ); + let intern_table = Rc::new(v2_rt::map_keys(&kernel_type_set())) + .iter() + .cloned() + .fold(intern_table.clone(), |t: Rc, name: String| { + intern(&t, &name).table.clone() + }); + let intern_table = Rc::new(vec![ + "Optional".to_string(), + "Some".to_string(), + "None".to_string(), + "value".to_string(), + "none".to_string(), + ]) + .iter() + .cloned() + .fold(intern_table.clone(), |t: Rc, name: String| { + intern(&t, &name).table.clone() + }); + let intern_table = Rc::new(v2_rt::map_keys(&compiler_recursive_types())) + .iter() + .cloned() + .fold(intern_table.clone(), |t: Rc, name: String| { + intern(&t, &name).table.clone() + }); + let kernel_bindings_base = Rc::new(v2_rt::map_keys(&kernel_type_set())) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, name: String| { + v2_rt::rc_map_insert( + acc, + intern(&intern_table, &name).id.clone(), + Rc::new(TypeBinding { + name: name.clone(), + resolved: Rc::new(Node { + name: name.clone(), + span: kernel_span(&name), + ident_span: Some(kernel_span(&name)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + provenance: Rc::new(SubValueRelation::SubValueUnknown), + }), + ) + }, + ); + let unit_span = kernel_span(&"Unit".to_string()); + let kernel_bindings = v2_rt::rc_map_insert( + kernel_bindings_base, + intern(&intern_table, &"Unit".to_string()).id.clone(), + Rc::new(TypeBinding { + name: "Unit".to_string(), + resolved: Rc::new(Node { + name: "Unit".to_string(), + span: unit_span.clone(), + ident_span: Some(unit_span.clone()), + children: Rc::new(vec![]), + connective: Connective::Conj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + provenance: Rc::new(SubValueRelation::SubValueUnknown), + }), + ); + let some_value_field = Rc::new(Node { + name: "value".to_string(), + span: kernel_span(&"value".to_string()), + ident_span: Some(kernel_span(&"value".to_string())), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::TypeVariable { + id: "some_value".to_string(), + })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let some_variant = Rc::new(Node { + name: "Some".to_string(), + span: kernel_span(&"Some".to_string()), + ident_span: Some(kernel_span(&"Some".to_string())), + children: Rc::new(vec![some_value_field]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let kernel_optional = Rc::new(Node { + name: "Optional".to_string(), + span: kernel_span(&"Optional".to_string()), + ident_span: Some(kernel_span(&"Optional".to_string())), + children: Rc::new(vec![some_variant, none_type()]), + connective: Connective::Disj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let kernel_bindings = v2_rt::rc_map_insert( + kernel_bindings.clone(), + intern(&intern_table, &"Optional".to_string()).id.clone(), + Rc::new(TypeBinding { + name: "Optional".to_string(), + resolved: kernel_optional, + provenance: Rc::new(SubValueRelation::SubValueUnknown), + }), + ); + let node_fields = inductive_fields_list_to_map(compiler_inductive_fields()); + let kernel_recursive_types = Rc::new({ + let mut __result = Vec::new(); + for name in Rc::new(v2_rt::map_keys(&compiler_recursive_types())) + .iter() + .cloned() + { + __result.push(intern(&intern_table, &name).id.clone()); + } + __result + }); + let kernel_recursive_type_set = Rc::new(v2_rt::map_keys(&compiler_recursive_types())) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, name: String| { + v2_rt::rc_map_insert(acc, intern(&intern_table, &name).id.clone(), true) + }, + ); + let kernel = Rc::new(TypeEnv { + bindings: kernel_bindings.clone(), + recursive_types: kernel_recursive_types, + recursive_type_set: kernel_recursive_type_set, + inductive_fields: node_fields, + source_indices: source_indices.clone(), + intern_table: intern_table.clone(), + }); + let imports_std_types = { + let mut __found = false; + for imp in module.resolved_imports.clone().iter().cloned() { + if (imp.module_path.clone().as_str() == "std.types".to_string().as_str()) { + __found = true; + break; + } + } + __found + }; + let module_name_str = authored_name_at(source_indices.clone(), &module.module.clone()); + let std_types_parent_env = if ((module_name_str.clone().as_str() + != "std.types".to_string().as_str()) + && (imports_std_types == false)) + { match v2_rt::map_get(&parent_index, "std.types".to_string()) { - Some(typed_std) => Rc::new(vec![typed_std.type_env.clone()]), - None => Rc::new(vec![]), -} + Some(typed_std) => Rc::new(vec![typed_std.type_env.clone()]), + None => Rc::new(vec![]), + } } else { Rc::new(vec![]) }; -let imported_parent_envs = Rc::new({ let mut __result = Vec::new(); for imp in module.resolved_imports.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&parent_index, imp.module_path.clone()) { - Some(typed_parent) => Rc::new(vec![typed_parent.type_env.clone()]), - None => Rc::new(vec![]), -}).iter().cloned()); } __result }); -let parent_envs = v2_rt::concat(std_types_parent_env.clone(), imported_parent_envs); -let std_import_bindings = collect_parent_bindings_filtered(std_types_parent_env.clone()); -let import_bindings = module.resolved_imports.clone().iter().cloned().fold(std_import_bindings, |acc: Rc>>, imp: Rc| match v2_rt::map_get(&parent_index, imp.module_path.clone()) { - Some(typed_parent) => if (imp.module_path.clone().as_str() == "std.types".to_string().as_str()) { - Rc::new(v2_rt::map_keys(&typed_parent.type_env.clone().bindings.clone())).iter().cloned().fold(acc.clone(), |bacc: Rc>>, ident: i64| { - let name = intern_str(typed_parent.type_env.clone().intern_table.clone(), ident.clone()); -if is_type_variable_name(&name) { - bacc.clone() - } else { - match v2_rt::map_get(&typed_parent.type_env.clone().bindings.clone(), ident.clone()) { - Some(binding) => v2_rt::rc_map_insert(bacc.clone(), ident.clone(), binding.clone()), - None => bacc.clone(), -} + let imported_parent_envs = Rc::new({ + let mut __result = Vec::new(); + for imp in module.resolved_imports.clone().iter().cloned() { + __result.extend( + (*match v2_rt::map_get(&parent_index, imp.module_path.clone()) { + Some(typed_parent) => Rc::new(vec![typed_parent.type_env.clone()]), + None => Rc::new(vec![]), + }) + .iter() + .cloned(), + ); + } + __result + }); + let parent_envs = v2_rt::concat(std_types_parent_env.clone(), imported_parent_envs); + let std_import_bindings = collect_parent_bindings_filtered(std_types_parent_env.clone()); + let import_bindings = module.resolved_imports.clone().iter().cloned().fold( + std_import_bindings, + |acc: Rc>>, imp: Rc| match v2_rt::map_get( + &parent_index, + imp.module_path.clone(), + ) { + Some(typed_parent) => { + if (imp.module_path.clone().as_str() == "std.types".to_string().as_str()) { + Rc::new(v2_rt::map_keys( + &typed_parent.type_env.clone().bindings.clone(), + )) + .iter() + .cloned() + .fold( + acc.clone(), + |bacc: Rc>>, ident: i64| { + let name = intern_str( + typed_parent.type_env.clone().intern_table.clone(), + ident.clone(), + ); + if is_type_variable_name(&name) { + bacc.clone() + } else { + match v2_rt::map_get( + &typed_parent.type_env.clone().bindings.clone(), + ident.clone(), + ) { + Some(binding) => v2_rt::rc_map_insert( + bacc.clone(), + ident.clone(), + binding.clone(), + ), + None => bacc.clone(), + } + } + }, + ) + } else { + v2_rt::rc_map_merge( + acc.clone(), + typed_parent.type_env.clone().bindings.clone(), + ) + } } -}) - } else { - v2_rt::rc_map_merge(acc.clone(), typed_parent.type_env.clone().bindings.clone()) - }, - None => acc.clone(), -}); -let import_recursive = parent_envs.clone().iter().cloned().fold(Rc::new(vec![]), |acc: _, env: Rc| v2_rt::concat(acc, env.recursive_types.clone())); -let import_recursive_set = parent_envs.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, env: Rc| v2_rt::rc_map_merge(acc, env.recursive_type_set.clone())); -let import_inductive_fields = parent_envs.clone().iter().cloned().fold(v2_rt::rc_empty_map::>>>(), |acc: Rc>>>>, env: Rc| merge_inductive_fields(acc, &env.inductive_fields.clone())); -let import_env = Rc::new(TypeEnv { - bindings: import_bindings, - recursive_types: import_recursive, - recursive_type_set: import_recursive_set, - inductive_fields: import_inductive_fields, - source_indices: source_indices.clone(), - intern_table: intern_table.clone(), -}); -let import_diags = Rc::new({ let mut __result = Vec::new(); for imp in module.resolved_imports.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&parent_index, imp.module_path.clone()) { - Some(_) => Rc::new(vec![]), - None => Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::InternalError { - message: v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("missing parent environment for imported module '".to_string(), imp.module_path.clone()), "' while typechecking '".to_string()), module_name_str.clone()), "'".to_string()), - span: imp.target_module.clone().clone().unwrap().span.clone(), -}), module_name_str.clone())]), -}).iter().cloned()); } __result }); -let local_bindings = module_items(module.module.clone()).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, item: Rc| { - let item_ident = intern(&intern_table, &authored_name_at(source_indices.clone(), &item)).id.clone(); -let has_structure = (item.connective.clone() != Connective::NoConnective); -if has_structure.clone() { - { - let type_node = Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: item.children.clone(), - connective: item.connective.clone(), - params: item.params.clone(), - inferred: None, - return_cardinality: item.return_cardinality.clone(), - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -v2_rt::rc_map_insert(acc.clone(), item_ident.clone(), Rc::new(TypeBinding { - name: authored_name_at(source_indices.clone(), &item), - resolved: type_node.clone(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), -})) -} - } else { - if (((item.inferred.clone() != None) && ((item.params.clone().len() as i64) == 0)) && (item.body.clone() == None)) { + None => acc.clone(), + }, + ); + let import_recursive = parent_envs + .clone() + .iter() + .cloned() + .fold(Rc::new(vec![]), |acc: _, env: Rc| { + v2_rt::concat(acc, env.recursive_types.clone()) + }); + let import_recursive_set = parent_envs.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, env: Rc| { + v2_rt::rc_map_merge(acc, env.recursive_type_set.clone()) + }, + ); + let import_inductive_fields = parent_envs.clone().iter().cloned().fold( + v2_rt::rc_empty_map::>>>(), + |acc: Rc>>>>, env: Rc| { + merge_inductive_fields(acc, &env.inductive_fields.clone()) + }, + ); + let import_env = Rc::new(TypeEnv { + bindings: import_bindings, + recursive_types: import_recursive, + recursive_type_set: import_recursive_set, + inductive_fields: import_inductive_fields, + source_indices: source_indices.clone(), + intern_table: intern_table.clone(), + }); + let import_diags = Rc::new({ + let mut __result = Vec::new(); + for imp in module.resolved_imports.clone().iter().cloned() { + __result.extend( + (*match v2_rt::map_get(&parent_index, imp.module_path.clone()) { + Some(_) => Rc::new(vec![]), + None => Rc::new(vec![make_error_node( + Rc::new(CompilerDiagnostic::InternalError { + message: v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "missing parent environment for imported module '" + .to_string(), + imp.module_path.clone(), + ), + "' while typechecking '".to_string(), + ), + module_name_str.clone(), + ), + "'".to_string(), + ), + span: imp.target_module.clone().clone().unwrap().span.clone(), + }), + module_name_str.clone(), + )]), + }) + .iter() + .cloned(), + ); + } + __result + }); + let local_bindings = module_items(module.module.clone()).iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, item: Rc| { + let item_ident = intern( + &intern_table, + &authored_name_at(source_indices.clone(), &item), + ) + .id + .clone(); + let has_structure = (item.connective.clone() != Connective::NoConnective); + if has_structure.clone() { { - let alias_node = Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: item.inferred.clone(), - return_cardinality: item.return_cardinality.clone(), - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -v2_rt::rc_map_insert(acc.clone(), item_ident.clone(), Rc::new(TypeBinding { - name: authored_name_at(source_indices.clone(), &item), - resolved: alias_node.clone(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), -})) -} + let type_node = Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: item.children.clone(), + connective: item.connective.clone(), + params: item.params.clone(), + inferred: None, + return_cardinality: item.return_cardinality.clone(), + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + v2_rt::rc_map_insert( + acc.clone(), + item_ident.clone(), + Rc::new(TypeBinding { + name: authored_name_at(source_indices.clone(), &item), + resolved: type_node.clone(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), + }), + ) + } } else { - if ((item.transport.clone() == None) && ((item.children.clone().len() as i64) > 0)) { + if (((item.inferred.clone() != None) + && ((item.params.clone().len() as i64) == 0)) + && (item.body.clone() == None)) + { { - let ref_node = nominal_ref_node(&authored_name_at(source_indices.clone(), &item), item.span.clone(), item.ident_span.clone()); -v2_rt::rc_map_insert(acc.clone(), item_ident.clone(), Rc::new(TypeBinding { - name: authored_name_at(source_indices.clone(), &item), - resolved: ref_node.clone(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), -})) -} + let alias_node = Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: item.inferred.clone(), + return_cardinality: item.return_cardinality.clone(), + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + v2_rt::rc_map_insert( + acc.clone(), + item_ident.clone(), + Rc::new(TypeBinding { + name: authored_name_at(source_indices.clone(), &item), + resolved: alias_node.clone(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), + }), + ) + } } else { - if (((((item.params.clone().len() as i64) > 0) && (item.connective.clone() == Connective::NoConnective)) && (item.body.clone() == None)) && (item.transport.clone() == None)) { + if ((item.transport.clone() == None) + && ((item.children.clone().len() as i64) > 0)) + { { - let bare_node = Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: item.params.clone(), - inferred: item.inferred.clone(), - return_cardinality: item.return_cardinality.clone(), - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -v2_rt::rc_map_insert(acc.clone(), item_ident.clone(), Rc::new(TypeBinding { - name: authored_name_at(source_indices.clone(), &item), - resolved: bare_node.clone(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), -})) -} + let ref_node = nominal_ref_node( + &authored_name_at(source_indices.clone(), &item), + item.span.clone(), + item.ident_span.clone(), + ); + v2_rt::rc_map_insert( + acc.clone(), + item_ident.clone(), + Rc::new(TypeBinding { + name: authored_name_at(source_indices.clone(), &item), + resolved: ref_node.clone(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), + }), + ) + } } else { - if ((((((item.properties.clone().len() as i64) > 0) && (item.connective.clone() == Connective::NoConnective)) && (item.transport.clone() == None)) && (item.inferred.clone() == None)) && ((item.params.clone().len() as i64) == 0)) { - v2_rt::rc_map_insert(acc.clone(), item_ident.clone(), nominal_type_binding(&authored_name_at(source_indices.clone(), &item))) + if (((((item.params.clone().len() as i64) > 0) + && (item.connective.clone() == Connective::NoConnective)) + && (item.body.clone() == None)) + && (item.transport.clone() == None)) + { + { + let bare_node = Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: item.params.clone(), + inferred: item.inferred.clone(), + return_cardinality: item.return_cardinality.clone(), + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + v2_rt::rc_map_insert( + acc.clone(), + item_ident.clone(), + Rc::new(TypeBinding { + name: authored_name_at(source_indices.clone(), &item), + resolved: bare_node.clone(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), + }), + ) + } } else { - acc.clone() + if ((((((item.properties.clone().len() as i64) > 0) + && (item.connective.clone() == Connective::NoConnective)) + && (item.transport.clone() == None)) + && (item.inferred.clone() == None)) + && ((item.params.clone().len() as i64) == 0)) + { + v2_rt::rc_map_insert( + acc.clone(), + item_ident.clone(), + nominal_type_binding(&authored_name_at( + source_indices.clone(), + &item, + )), + ) + } else { + acc.clone() + } } } } } + }, + ); + let param_bindings = module_items(module.module.clone()).iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, item: Rc| { + let is_type_decl = match v2_rt::map_get( + &local_bindings, + intern( + &intern_table, + &authored_name_at(source_indices.clone(), &item), + ) + .id + .clone(), + ) { + Some(_) => true, + None => false, + }; + if (((item.params.clone().len() as i64) > 0) && is_type_decl.clone()) { + { + let result = item.params.clone().iter().cloned().fold( + acc.clone(), + |pacc: Rc>>, p: Rc| { + v2_rt::rc_map_insert( + pacc, + intern( + &intern_table, + &authored_name_at(source_indices.clone(), &p), + ) + .id + .clone(), + nominal_type_binding(&authored_name_at( + source_indices.clone(), + &p, + )), + ) + }, + ); + result.clone() + } + } else { + acc.clone() + } + }, + ); + let local_name_set = Rc::new(v2_rt::map_keys(&local_bindings)) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, ident: i64| { + v2_rt::rc_map_insert(acc, ident.clone(), true) + }, + ); + let all_local_bindings = v2_rt::rc_map_merge(local_bindings.clone(), param_bindings); + let pre_local_env = Rc::new(TypeEnv { + bindings: all_local_bindings, + recursive_types: Rc::new(vec![]), + recursive_type_set: v2_rt::rc_empty_map::(), + inductive_fields: v2_rt::rc_empty_map::>>>(), + source_indices: source_indices.clone(), + intern_table: intern_table.clone(), + }); + let merged = merge_envs(&Rc::new(vec![kernel, import_env, pre_local_env])); + let all_deps_map = Rc::new(v2_rt::map_values(&merged.bindings.clone())) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::>>(), + |acc: Rc>>>, b: Rc| { + v2_rt::rc_map_insert( + acc, + b.name.clone(), + node_type_deps(&b.resolved.clone(), &source_indices), + ) + }, + ); + let str_bindings = Rc::new(v2_rt::map_values(&merged.bindings.clone())) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, b: Rc| { + v2_rt::rc_map_insert(acc, b.name.clone(), b.clone()) + }, + ); + let cycle_set_str = detect_type_cycles_kahn(&all_deps_map, str_bindings); + let cycle_set = Rc::new({ + let mut __result = Vec::new(); + for name in cycle_set_str.clone().iter().cloned() { + __result.push(intern(&intern_table, &name).id.clone()); } -}); -let param_bindings = module_items(module.module.clone()).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, item: Rc| { - let is_type_decl = match v2_rt::map_get(&local_bindings, intern(&intern_table, &authored_name_at(source_indices.clone(), &item)).id.clone()) { - Some(_) => true, - None => false, -}; -if (((item.params.clone().len() as i64) > 0) && is_type_decl.clone()) { - { - let result = item.params.clone().iter().cloned().fold(acc.clone(), |pacc: Rc>>, p: Rc| v2_rt::rc_map_insert(pacc, intern(&intern_table, &authored_name_at(source_indices.clone(), &p)).id.clone(), nominal_type_binding(&authored_name_at(source_indices.clone(), &p)))); -result.clone() -} - } else { - acc.clone() - } -}); -let local_name_set = Rc::new(v2_rt::map_keys(&local_bindings)).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, ident: i64| v2_rt::rc_map_insert(acc, ident.clone(), true)); -let all_local_bindings = v2_rt::rc_map_merge(local_bindings.clone(), param_bindings); -let pre_local_env = Rc::new(TypeEnv { - bindings: all_local_bindings, - recursive_types: Rc::new(vec![]), - recursive_type_set: v2_rt::rc_empty_map::(), - inductive_fields: v2_rt::rc_empty_map::>>>(), - source_indices: source_indices.clone(), - intern_table: intern_table.clone(), -}); -let merged = merge_envs(&Rc::new(vec![kernel, import_env, pre_local_env])); -let all_deps_map = Rc::new(v2_rt::map_values(&merged.bindings.clone())).iter().cloned().fold(v2_rt::rc_empty_map::>>(), |acc: Rc>>>, b: Rc| v2_rt::rc_map_insert(acc, b.name.clone(), node_type_deps(&b.resolved.clone(), &source_indices))); -let str_bindings = Rc::new(v2_rt::map_values(&merged.bindings.clone())).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, b: Rc| v2_rt::rc_map_insert(acc, b.name.clone(), b.clone())); -let cycle_set_str = detect_type_cycles_kahn(&all_deps_map, str_bindings); -let cycle_set = Rc::new({ let mut __result = Vec::new(); for name in cycle_set_str.clone().iter().cloned() { __result.push(intern(&intern_table, &name).id.clone()); } __result }); -let cross_type_all_names = v2_rt::concat(cycle_set_str.clone(), Rc::new(v2_rt::map_keys(&compiler_recursive_types()))); -let cross_type_set_str = cross_type_all_names.clone().iter().cloned().fold(empty_set(), |acc: Rc>, name: String| set_insert(acc, name.clone())); -let cross_type_set = cross_type_all_names.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, intern(&intern_table, &name).id.clone(), true)); -let local_inductive_fields = build_item_inductive_fields(module_items(module.module.clone()), cross_type_set_str, source_indices.clone()); -let merged_inductive_fields = merge_inductive_fields(merged.inductive_fields.clone(), &local_inductive_fields); -let unresolved_env = Rc::new(TypeEnv { - bindings: merged.bindings.clone(), - recursive_types: cycle_set, - recursive_type_set: cross_type_set, - inductive_fields: merged_inductive_fields, - source_indices: source_indices.clone(), - intern_table: intern_table.clone(), -}); -let resolved = resolve_env_bindings(&unresolved_env, module_name_str.clone(), &local_name_set, all_deps_map.clone()); -let resolved_env_out = resolved.env.clone(); -let resolved_diags = resolved.diagnostics.clone(); -let final_env = Rc::new(TypeEnv { - bindings: resolved_env_out.bindings.clone(), - recursive_types: resolved_env_out.recursive_types.clone(), - recursive_type_set: resolved_env_out.recursive_type_set.clone(), - inductive_fields: resolved_env_out.inductive_fields.clone(), - source_indices: resolved_env_out.source_indices.clone(), - intern_table: intern_table.clone(), -}); -Rc::new(BuildTypeEnvResult { - env: final_env, - diagnostics: v2_rt::concat(import_diags, resolved_diags), -}) -} + __result + }); + let cycle_map = cycle_set_str.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, name: String| { + v2_rt::rc_map_insert(acc, name.clone(), true) + }, + ); + let cross_type_set_str = v2_rt::rc_map_merge(cycle_map, compiler_recursive_types()); + let cross_type_set = Rc::new(v2_rt::map_keys(&cross_type_set_str)) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, name: String| { + v2_rt::rc_map_insert(acc, intern(&intern_table, &name).id.clone(), true) + }, + ); + let local_inductive_fields = build_item_inductive_fields( + module_items(module.module.clone()), + cross_type_set_str.clone(), + source_indices.clone(), + ); + let merged_inductive_fields = + merge_inductive_fields(merged.inductive_fields.clone(), &local_inductive_fields); + let unresolved_env = Rc::new(TypeEnv { + bindings: merged.bindings.clone(), + recursive_types: cycle_set, + recursive_type_set: cross_type_set, + inductive_fields: merged_inductive_fields, + source_indices: source_indices.clone(), + intern_table: intern_table.clone(), + }); + let resolved = resolve_env_bindings( + &unresolved_env, + module_name_str.clone(), + &local_name_set, + all_deps_map.clone(), + ); + let resolved_env_out = resolved.env.clone(); + let resolved_diags = resolved.diagnostics.clone(); + let final_env = Rc::new(TypeEnv { + bindings: resolved_env_out.bindings.clone(), + recursive_types: resolved_env_out.recursive_types.clone(), + recursive_type_set: resolved_env_out.recursive_type_set.clone(), + inductive_fields: resolved_env_out.inductive_fields.clone(), + source_indices: resolved_env_out.source_indices.clone(), + intern_table: intern_table.clone(), + }); + Rc::new(BuildTypeEnvResult { + env: final_env, + diagnostics: v2_rt::concat(import_diags, resolved_diags), + }) + } } -pub fn build_type_env_unresolved(module: &Rc, parent_index: &Rc>>, source_indices: &Rc>>, intern_table: &Rc) -> Rc { +pub fn build_type_env_unresolved( + module: &Rc, + parent_index: &Rc>>, + source_indices: &Rc>>, + intern_table: &Rc, +) -> Rc { { - let intern_table = Rc::new(v2_rt::map_keys(&kernel_type_set())).iter().cloned().fold(intern_table.clone(), |t: Rc, name: String| intern(&t, &name).table.clone()); -let intern_table = Rc::new(vec!["Optional".to_string()]).iter().cloned().fold(intern_table.clone(), |t: Rc, name: String| intern(&t, &name).table.clone()); -let zero_span = make_span(0, 0); -let kernel_bindings = Rc::new(v2_rt::map_keys(&kernel_type_set())).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, name: String| v2_rt::rc_map_insert(acc, intern(&intern_table, &name).id.clone(), Rc::new(TypeBinding { - name: name.clone(), - resolved: Rc::new(Node { - name: name.clone(), - span: kernel_span(&name), - ident_span: Some(kernel_span(&name)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), - provenance: Rc::new(SubValueRelation::SubValueUnknown), -}))); -let some_value_field = Rc::new(Node { - name: "value".to_string(), - span: kernel_span(&"value".to_string()), - ident_span: Some(kernel_span(&"value".to_string())), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::TypeVariable { - id: "some_value".to_string(), -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let some_variant = Rc::new(Node { - name: "Some".to_string(), - span: kernel_span(&"Some".to_string()), - ident_span: Some(kernel_span(&"Some".to_string())), - children: Rc::new(vec![some_value_field]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let kernel_optional = Rc::new(Node { - name: "Optional".to_string(), - span: kernel_span(&"Optional".to_string()), - ident_span: Some(kernel_span(&"Optional".to_string())), - children: Rc::new(vec![some_variant, none_type()]), - connective: Connective::Disj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let kernel_bindings = v2_rt::rc_map_insert(kernel_bindings.clone(), intern(&intern_table, &"Optional".to_string()).id.clone(), Rc::new(TypeBinding { - name: "Optional".to_string(), - resolved: kernel_optional, - provenance: Rc::new(SubValueRelation::SubValueUnknown), -})); -let kernel = Rc::new(TypeEnv { - bindings: kernel_bindings.clone(), - recursive_types: Rc::new(vec![]), - recursive_type_set: v2_rt::rc_empty_map::(), - inductive_fields: v2_rt::rc_empty_map::>>>(), - source_indices: source_indices.clone(), - intern_table: intern_table.clone(), -}); -let imports_std_types = { let mut __found = false; for imp in module.resolved_imports.clone().iter().cloned() { if (imp.module_path.clone().as_str() == "std.types".to_string().as_str()) { __found = true; break; } } __found }; -let module_name_str = authored_name_at(source_indices.clone(), &module.module.clone()); -let std_types_parent_env = if ((module_name_str.as_str() != "std.types".to_string().as_str()) && (imports_std_types == false)) { + let intern_table = Rc::new(v2_rt::map_keys(&kernel_type_set())) + .iter() + .cloned() + .fold(intern_table.clone(), |t: Rc, name: String| { + intern(&t, &name).table.clone() + }); + let intern_table = Rc::new(vec!["Optional".to_string()]) + .iter() + .cloned() + .fold(intern_table.clone(), |t: Rc, name: String| { + intern(&t, &name).table.clone() + }); + let zero_span = make_span(0, 0); + let kernel_bindings = Rc::new(v2_rt::map_keys(&kernel_type_set())) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, name: String| { + v2_rt::rc_map_insert( + acc, + intern(&intern_table, &name).id.clone(), + Rc::new(TypeBinding { + name: name.clone(), + resolved: Rc::new(Node { + name: name.clone(), + span: kernel_span(&name), + ident_span: Some(kernel_span(&name)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + provenance: Rc::new(SubValueRelation::SubValueUnknown), + }), + ) + }, + ); + let some_value_field = Rc::new(Node { + name: "value".to_string(), + span: kernel_span(&"value".to_string()), + ident_span: Some(kernel_span(&"value".to_string())), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::TypeVariable { + id: "some_value".to_string(), + })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let some_variant = Rc::new(Node { + name: "Some".to_string(), + span: kernel_span(&"Some".to_string()), + ident_span: Some(kernel_span(&"Some".to_string())), + children: Rc::new(vec![some_value_field]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let kernel_optional = Rc::new(Node { + name: "Optional".to_string(), + span: kernel_span(&"Optional".to_string()), + ident_span: Some(kernel_span(&"Optional".to_string())), + children: Rc::new(vec![some_variant, none_type()]), + connective: Connective::Disj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let kernel_bindings = v2_rt::rc_map_insert( + kernel_bindings.clone(), + intern(&intern_table, &"Optional".to_string()).id.clone(), + Rc::new(TypeBinding { + name: "Optional".to_string(), + resolved: kernel_optional, + provenance: Rc::new(SubValueRelation::SubValueUnknown), + }), + ); + let kernel = Rc::new(TypeEnv { + bindings: kernel_bindings.clone(), + recursive_types: Rc::new(vec![]), + recursive_type_set: v2_rt::rc_empty_map::(), + inductive_fields: v2_rt::rc_empty_map::>>>(), + source_indices: source_indices.clone(), + intern_table: intern_table.clone(), + }); + let imports_std_types = { + let mut __found = false; + for imp in module.resolved_imports.clone().iter().cloned() { + if (imp.module_path.clone().as_str() == "std.types".to_string().as_str()) { + __found = true; + break; + } + } + __found + }; + let module_name_str = authored_name_at(source_indices.clone(), &module.module.clone()); + let std_types_parent_env = if ((module_name_str.as_str() + != "std.types".to_string().as_str()) + && (imports_std_types == false)) + { match v2_rt::map_get(&parent_index, "std.types".to_string()) { - Some(typed_std) => Rc::new(vec![typed_std.type_env.clone()]), - None => Rc::new(vec![]), -} + Some(typed_std) => Rc::new(vec![typed_std.type_env.clone()]), + None => Rc::new(vec![]), + } } else { Rc::new(vec![]) }; -let imported_parent_envs = Rc::new({ let mut __result = Vec::new(); for imp in module.resolved_imports.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&parent_index, imp.module_path.clone()) { - Some(typed_parent) => Rc::new(vec![typed_parent.type_env.clone()]), - None => Rc::new(vec![]), -}).iter().cloned()); } __result }); -let parent_envs = v2_rt::concat(std_types_parent_env.clone(), imported_parent_envs); -let std_import_bindings = collect_parent_bindings_filtered(std_types_parent_env.clone()); -let import_bindings = module.resolved_imports.clone().iter().cloned().fold(std_import_bindings, |acc: Rc>>, imp: Rc| match v2_rt::map_get(&parent_index, imp.module_path.clone()) { - Some(typed_parent) => if (imp.module_path.clone().as_str() == "std.types".to_string().as_str()) { - Rc::new(v2_rt::map_keys(&typed_parent.type_env.clone().bindings.clone())).iter().cloned().fold(acc.clone(), |bacc: Rc>>, ident: i64| { - let name = intern_str(typed_parent.type_env.clone().intern_table.clone(), ident.clone()); -if is_type_variable_name(&name) { - bacc.clone() - } else { - match v2_rt::map_get(&typed_parent.type_env.clone().bindings.clone(), ident.clone()) { - Some(binding) => v2_rt::rc_map_insert(bacc.clone(), ident.clone(), binding.clone()), - None => bacc.clone(), -} + let imported_parent_envs = Rc::new({ + let mut __result = Vec::new(); + for imp in module.resolved_imports.clone().iter().cloned() { + __result.extend( + (*match v2_rt::map_get(&parent_index, imp.module_path.clone()) { + Some(typed_parent) => Rc::new(vec![typed_parent.type_env.clone()]), + None => Rc::new(vec![]), + }) + .iter() + .cloned(), + ); + } + __result + }); + let parent_envs = v2_rt::concat(std_types_parent_env.clone(), imported_parent_envs); + let std_import_bindings = collect_parent_bindings_filtered(std_types_parent_env.clone()); + let import_bindings = module.resolved_imports.clone().iter().cloned().fold( + std_import_bindings, + |acc: Rc>>, imp: Rc| match v2_rt::map_get( + &parent_index, + imp.module_path.clone(), + ) { + Some(typed_parent) => { + if (imp.module_path.clone().as_str() == "std.types".to_string().as_str()) { + Rc::new(v2_rt::map_keys( + &typed_parent.type_env.clone().bindings.clone(), + )) + .iter() + .cloned() + .fold( + acc.clone(), + |bacc: Rc>>, ident: i64| { + let name = intern_str( + typed_parent.type_env.clone().intern_table.clone(), + ident.clone(), + ); + if is_type_variable_name(&name) { + bacc.clone() + } else { + match v2_rt::map_get( + &typed_parent.type_env.clone().bindings.clone(), + ident.clone(), + ) { + Some(binding) => v2_rt::rc_map_insert( + bacc.clone(), + ident.clone(), + binding.clone(), + ), + None => bacc.clone(), + } + } + }, + ) + } else { + v2_rt::rc_map_merge( + acc.clone(), + typed_parent.type_env.clone().bindings.clone(), + ) + } } -}) - } else { - v2_rt::rc_map_merge(acc.clone(), typed_parent.type_env.clone().bindings.clone()) - }, - None => acc.clone(), -}); -let import_recursive = parent_envs.clone().iter().cloned().fold(Rc::new(vec![]), |acc: _, env: Rc| v2_rt::concat(acc, env.recursive_types.clone())); -let import_recursive_set = parent_envs.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, env: Rc| v2_rt::rc_map_merge(acc, env.recursive_type_set.clone())); -let import_inductive_fields = parent_envs.clone().iter().cloned().fold(v2_rt::rc_empty_map::>>>(), |acc: Rc>>>>, env: Rc| merge_inductive_fields(acc, &env.inductive_fields.clone())); -let import_env = Rc::new(TypeEnv { - bindings: import_bindings, - recursive_types: import_recursive, - recursive_type_set: import_recursive_set, - inductive_fields: import_inductive_fields, - source_indices: source_indices.clone(), - intern_table: intern_table.clone(), -}); -let local_bindings = module_items(module.module.clone()).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, item: Rc| { - let item_ident = intern(&intern_table, &authored_name_at(source_indices.clone(), &item)).id.clone(); -let has_structure = (item.connective.clone() != Connective::NoConnective); -if has_structure.clone() { - { - let type_node = Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: item.children.clone(), - connective: item.connective.clone(), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: item.return_cardinality.clone(), - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -v2_rt::rc_map_insert(acc.clone(), item_ident.clone(), Rc::new(TypeBinding { - name: authored_name_at(source_indices.clone(), &item), - resolved: type_node.clone(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), -})) -} - } else { - if (((item.inferred.clone() != None) && ((item.params.clone().len() as i64) == 0)) && (item.body.clone() == None)) { + None => acc.clone(), + }, + ); + let import_recursive = parent_envs + .clone() + .iter() + .cloned() + .fold(Rc::new(vec![]), |acc: _, env: Rc| { + v2_rt::concat(acc, env.recursive_types.clone()) + }); + let import_recursive_set = parent_envs.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, env: Rc| { + v2_rt::rc_map_merge(acc, env.recursive_type_set.clone()) + }, + ); + let import_inductive_fields = parent_envs.clone().iter().cloned().fold( + v2_rt::rc_empty_map::>>>(), + |acc: Rc>>>>, env: Rc| { + merge_inductive_fields(acc, &env.inductive_fields.clone()) + }, + ); + let import_env = Rc::new(TypeEnv { + bindings: import_bindings, + recursive_types: import_recursive, + recursive_type_set: import_recursive_set, + inductive_fields: import_inductive_fields, + source_indices: source_indices.clone(), + intern_table: intern_table.clone(), + }); + let local_bindings = module_items(module.module.clone()).iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, item: Rc| { + let item_ident = intern( + &intern_table, + &authored_name_at(source_indices.clone(), &item), + ) + .id + .clone(); + let has_structure = (item.connective.clone() != Connective::NoConnective); + if has_structure.clone() { { - let alias_node = Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: item.inferred.clone(), - return_cardinality: item.return_cardinality.clone(), - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -v2_rt::rc_map_insert(acc.clone(), item_ident.clone(), Rc::new(TypeBinding { - name: authored_name_at(source_indices.clone(), &item), - resolved: alias_node.clone(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), -})) -} + let type_node = Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: item.children.clone(), + connective: item.connective.clone(), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: item.return_cardinality.clone(), + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + v2_rt::rc_map_insert( + acc.clone(), + item_ident.clone(), + Rc::new(TypeBinding { + name: authored_name_at(source_indices.clone(), &item), + resolved: type_node.clone(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), + }), + ) + } } else { - if ((item.transport.clone() == None) && ((item.children.clone().len() as i64) > 0)) { + if (((item.inferred.clone() != None) + && ((item.params.clone().len() as i64) == 0)) + && (item.body.clone() == None)) + { { - let ref_node = nominal_ref_node(&authored_name_at(source_indices.clone(), &item), item.span.clone(), item.ident_span.clone()); -v2_rt::rc_map_insert(acc.clone(), item_ident.clone(), Rc::new(TypeBinding { - name: authored_name_at(source_indices.clone(), &item), - resolved: ref_node.clone(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), -})) -} + let alias_node = Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: item.inferred.clone(), + return_cardinality: item.return_cardinality.clone(), + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + v2_rt::rc_map_insert( + acc.clone(), + item_ident.clone(), + Rc::new(TypeBinding { + name: authored_name_at(source_indices.clone(), &item), + resolved: alias_node.clone(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), + }), + ) + } } else { - if ((((((item.properties.clone().len() as i64) > 0) && (item.connective.clone() == Connective::NoConnective)) && (item.transport.clone() == None)) && (item.inferred.clone() == None)) && ((item.params.clone().len() as i64) == 0)) { - v2_rt::rc_map_insert(acc.clone(), item_ident.clone(), nominal_type_binding(&authored_name_at(source_indices.clone(), &item))) + if ((item.transport.clone() == None) + && ((item.children.clone().len() as i64) > 0)) + { + { + let ref_node = nominal_ref_node( + &authored_name_at(source_indices.clone(), &item), + item.span.clone(), + item.ident_span.clone(), + ); + v2_rt::rc_map_insert( + acc.clone(), + item_ident.clone(), + Rc::new(TypeBinding { + name: authored_name_at(source_indices.clone(), &item), + resolved: ref_node.clone(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), + }), + ) + } } else { - acc.clone() + if ((((((item.properties.clone().len() as i64) > 0) + && (item.connective.clone() == Connective::NoConnective)) + && (item.transport.clone() == None)) + && (item.inferred.clone() == None)) + && ((item.params.clone().len() as i64) == 0)) + { + v2_rt::rc_map_insert( + acc.clone(), + item_ident.clone(), + nominal_type_binding(&authored_name_at( + source_indices.clone(), + &item, + )), + ) + } else { + acc.clone() + } } } } + }, + ); + let pre_local_env = Rc::new(TypeEnv { + bindings: local_bindings, + recursive_types: Rc::new(vec![]), + recursive_type_set: v2_rt::rc_empty_map::(), + inductive_fields: v2_rt::rc_empty_map::>>>(), + source_indices: source_indices.clone(), + intern_table: intern_table.clone(), + }); + let merged = merge_envs(&Rc::new(vec![kernel, import_env, pre_local_env])); + let all_deps_map = Rc::new(v2_rt::map_values(&merged.bindings.clone())) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::>>(), + |acc: Rc>>>, b: Rc| { + v2_rt::rc_map_insert( + acc, + b.name.clone(), + node_type_deps(&b.resolved.clone(), &source_indices), + ) + }, + ); + let str_bindings = Rc::new(v2_rt::map_values(&merged.bindings.clone())) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, b: Rc| { + v2_rt::rc_map_insert(acc, b.name.clone(), b.clone()) + }, + ); + let cycle_set_str = detect_type_cycles_kahn(&all_deps_map, str_bindings); + let cycle_set = Rc::new({ + let mut __result = Vec::new(); + for name in cycle_set_str.clone().iter().cloned() { + __result.push(intern(&intern_table, &name).id.clone()); } -}); -let pre_local_env = Rc::new(TypeEnv { - bindings: local_bindings, - recursive_types: Rc::new(vec![]), - recursive_type_set: v2_rt::rc_empty_map::(), - inductive_fields: v2_rt::rc_empty_map::>>>(), - source_indices: source_indices.clone(), - intern_table: intern_table.clone(), -}); -let merged = merge_envs(&Rc::new(vec![kernel, import_env, pre_local_env])); -let all_deps_map = Rc::new(v2_rt::map_values(&merged.bindings.clone())).iter().cloned().fold(v2_rt::rc_empty_map::>>(), |acc: Rc>>>, b: Rc| v2_rt::rc_map_insert(acc, b.name.clone(), node_type_deps(&b.resolved.clone(), &source_indices))); -let str_bindings = Rc::new(v2_rt::map_values(&merged.bindings.clone())).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, b: Rc| v2_rt::rc_map_insert(acc, b.name.clone(), b.clone())); -let cycle_set_str = detect_type_cycles_kahn(&all_deps_map, str_bindings); -let cycle_set = Rc::new({ let mut __result = Vec::new(); for name in cycle_set_str.clone().iter().cloned() { __result.push(intern(&intern_table, &name).id.clone()); } __result }); -let cross_type_all_names = v2_rt::concat(cycle_set_str.clone(), Rc::new(v2_rt::map_keys(&compiler_recursive_types()))); -let cross_type_set_str = cross_type_all_names.clone().iter().cloned().fold(empty_set(), |acc: Rc>, name: String| set_insert(acc, name.clone())); -let cross_type_set = cross_type_all_names.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, intern(&intern_table, &name).id.clone(), true)); -let local_inductive_fields = build_item_inductive_fields(module_items(module.module.clone()), cross_type_set_str, source_indices.clone()); -let merged_inductive_fields = merge_inductive_fields(merged.inductive_fields.clone(), &local_inductive_fields); -let unresolved_env = Rc::new(TypeEnv { - bindings: merged.bindings.clone(), - recursive_types: cycle_set, - recursive_type_set: cross_type_set, - inductive_fields: merged_inductive_fields, - source_indices: source_indices.clone(), - intern_table: intern_table.clone(), -}); -Rc::new(BuildTypeEnvResult { - env: unresolved_env, - diagnostics: Rc::new(vec![]), -}) -} + __result + }); + let cycle_map = cycle_set_str.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, name: String| { + v2_rt::rc_map_insert(acc, name.clone(), true) + }, + ); + let cross_type_set_str = v2_rt::rc_map_merge(cycle_map, compiler_recursive_types()); + let cross_type_set = Rc::new(v2_rt::map_keys(&cross_type_set_str)) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, name: String| { + v2_rt::rc_map_insert(acc, intern(&intern_table, &name).id.clone(), true) + }, + ); + let local_inductive_fields = build_item_inductive_fields( + module_items(module.module.clone()), + cross_type_set_str.clone(), + source_indices.clone(), + ); + let merged_inductive_fields = + merge_inductive_fields(merged.inductive_fields.clone(), &local_inductive_fields); + let unresolved_env = Rc::new(TypeEnv { + bindings: merged.bindings.clone(), + recursive_types: cycle_set, + recursive_type_set: cross_type_set, + inductive_fields: merged_inductive_fields, + source_indices: source_indices.clone(), + intern_table: intern_table.clone(), + }); + Rc::new(BuildTypeEnvResult { + env: unresolved_env, + diagnostics: Rc::new(vec![]), + }) + } } -pub fn build_item_info(item: &Rc, source_indices: &Rc>>, module_name: String) -> Rc { +pub fn build_item_info( + item: &Rc, + source_indices: &Rc>>, + module_name: String, +) -> Rc { { let kind = item_kind(&item); -let res_names = Rc::new({ let mut __result = Vec::new(); for u in item.uses.clone().iter().cloned() { __result.push(resource_use_name_at(u.clone(), source_indices.clone())); } __result }); -let item_name_str = authored_name_at(source_indices.clone(), &item); -match kind.clone() { - ItemKind::FuncItem => Rc::new(ItemInfo { - name: item_name_str.clone(), - module_name: module_name, - kind: kind.clone(), - service_names: if (item.body.clone() == None) { - Rc::new(vec![]) - } else { - collect_typed_service_calls(item.body.clone().clone().unwrap(), source_indices.clone()) - }, - resource_names: res_names, - params: item.params.clone(), - is_self_recursive: false, - has_non_tail_self_call: false, -}), - ItemKind::FnItem => Rc::new(ItemInfo { - name: item_name_str.clone(), - module_name: module_name, - kind: kind.clone(), - service_names: if (item.body.clone() == None) { - Rc::new(vec![]) - } else { - collect_typed_service_calls(item.body.clone().clone().unwrap(), source_indices.clone()) - }, - resource_names: res_names, - params: item.params.clone(), - is_self_recursive: if (item.body.clone() == None) { - false - } else { - expr_has_self_call(&item.body.clone().clone().unwrap(), &item_name_str, &source_indices) - }, - has_non_tail_self_call: if (item.body.clone() == None) { - false - } else { - expr_has_non_tail_self_call(&item.body.clone().clone().unwrap(), &item_name_str, true, &source_indices) - }, -}), - _ => Rc::new(ItemInfo { - name: item_name_str.clone(), - module_name: module_name, - kind: kind.clone(), - service_names: Rc::new(vec![]), - resource_names: res_names, - params: item.params.clone(), - is_self_recursive: false, - has_non_tail_self_call: false, -}), -} -} + let res_names = Rc::new({ + let mut __result = Vec::new(); + for u in item.uses.clone().iter().cloned() { + __result.push(resource_use_name_at(u.clone(), source_indices.clone())); + } + __result + }); + let item_name_str = authored_name_at(source_indices.clone(), &item); + match kind.clone() { + ItemKind::FuncItem => Rc::new(ItemInfo { + name: item_name_str.clone(), + module_name: module_name, + kind: kind.clone(), + service_names: if (item.body.clone() == None) { + Rc::new(vec![]) + } else { + collect_typed_service_calls( + item.body.clone().clone().unwrap(), + source_indices.clone(), + ) + }, + resource_names: res_names, + params: item.params.clone(), + is_self_recursive: false, + has_non_tail_self_call: false, + }), + ItemKind::FnItem => Rc::new(ItemInfo { + name: item_name_str.clone(), + module_name: module_name, + kind: kind.clone(), + service_names: if (item.body.clone() == None) { + Rc::new(vec![]) + } else { + collect_typed_service_calls( + item.body.clone().clone().unwrap(), + source_indices.clone(), + ) + }, + resource_names: res_names, + params: item.params.clone(), + is_self_recursive: if (item.body.clone() == None) { + false + } else { + expr_has_self_call( + &item.body.clone().clone().unwrap(), + &item_name_str, + &source_indices, + ) + }, + has_non_tail_self_call: if (item.body.clone() == None) { + false + } else { + expr_has_non_tail_self_call( + &item.body.clone().clone().unwrap(), + &item_name_str, + true, + &source_indices, + ) + }, + }), + _ => Rc::new(ItemInfo { + name: item_name_str.clone(), + module_name: module_name, + kind: kind.clone(), + service_names: Rc::new(vec![]), + resource_names: res_names, + params: item.params.clone(), + is_self_recursive: false, + has_non_tail_self_call: false, + }), + } + } } -pub fn analyze_item(item: Rc, env: &Rc, module_name: &String) -> Rc { +pub fn analyze_item( + item: Rc, + env: &Rc, + module_name: &String, +) -> Rc { { let resolved = resolve_item_types(&item, &env, &module_name); -let ritem = resolved.item.clone(); -let is_func = ((ritem.params.clone().len() as i64) > 0); -let is_zero_arg_func = ((((ritem.params.clone().len() as i64) == 0) && (ritem.inferred.clone() != None)) && (ritem.body.clone() != None)); -let func_sig = if (is_func || is_zero_arg_func) { + let ritem = resolved.item.clone(); + let is_func = ((ritem.params.clone().len() as i64) > 0); + let is_zero_arg_func = ((((ritem.params.clone().len() as i64) == 0) + && (ritem.inferred.clone() != None)) + && (ritem.body.clone() != None)); + let func_sig = if (is_func || is_zero_arg_func) { { let declared_rt = if (ritem.inferred.clone() != None) { Some(resolved_type(ritem.clone())) } else { None }; -Some(Rc::new(DeclaredFuncSig { - name: authored_name_at(env.source_indices.clone(), &ritem), - params: ritem.params.clone(), - inferred: declared_rt, - is_async: ((ritem.uses.clone().len() as i64) > 0), - output_provenance: Rc::new(vec![]), - variant_provenance: v2_rt::rc_empty_map::>>>>>(), -})) -} - } else { - None - }; -let svc_entries = if ((ritem.transport.clone() != None) && ((ritem.children.clone().len() as i64) > 0)) { - Rc::new({ let mut __result = Vec::new(); for c in ritem.children.clone().iter().cloned() { __result.push(service_op_entry(&c, &env.source_indices.clone())); } __result }) - } else { - Rc::new(vec![]) - }; -let svc_local = if ((ritem.transport.clone() != None) && ((ritem.children.clone().len() as i64) > 0)) { - { - let root = namespace_root_from_properties(ritem.properties.clone(), authored_name_at(env.source_indices.clone(), &ritem), env.source_indices.clone()); -Some(nominal_type_binding(&root)) -} + Some(Rc::new(DeclaredFuncSig { + name: authored_name_at(env.source_indices.clone(), &ritem), + params: ritem.params.clone(), + inferred: declared_rt, + is_async: ((ritem.uses.clone().len() as i64) > 0), + output_provenance: Rc::new(vec![]), + variant_provenance: v2_rt::rc_empty_map::< + String, + Rc>>>>, + >(), + })) + } } else { None }; -Rc::new(ItemContribution { - resolved_item: ritem.clone(), - resolve_diagnostics: resolved.diagnostics.clone(), - func_sig: func_sig, - svc_entries: svc_entries, - svc_local: svc_local, - item_info: build_item_info(&ritem, &env.source_indices.clone(), module_name.clone()), -}) -} + let svc_entries = + if ((ritem.transport.clone() != None) && ((ritem.children.clone().len() as i64) > 0)) { + Rc::new({ + let mut __result = Vec::new(); + for c in ritem.children.clone().iter().cloned() { + __result.push(service_op_entry(&c, &env.source_indices.clone())); + } + __result + }) + } else { + Rc::new(vec![]) + }; + let svc_local = + if ((ritem.transport.clone() != None) && ((ritem.children.clone().len() as i64) > 0)) { + { + let root = namespace_root_from_properties( + ritem.properties.clone(), + authored_name_at(env.source_indices.clone(), &ritem), + env.source_indices.clone(), + ); + Some(nominal_type_binding(&root)) + } + } else { + None + }; + Rc::new(ItemContribution { + resolved_item: ritem.clone(), + resolve_diagnostics: resolved.diagnostics.clone(), + func_sig: func_sig, + svc_entries: svc_entries, + svc_local: svc_local, + item_info: build_item_info(&ritem, &env.source_indices.clone(), module_name.clone()), + }) + } } -pub fn fold_module_contributions(mut remaining: Rc>>, mut resolved_items: Rc>>, mut func_sigs: Rc>>, mut svc_registry: Rc>>>>, mut svc_locals: Rc>>, mut item_registry: Rc>>, mut diag_chunks: Rc>>>>, mut source_indices: Rc>>) -> Rc { +pub fn fold_module_contributions( + mut remaining: Rc>>, + mut resolved_items: Rc>>, + mut func_sigs: Rc>>, + mut svc_registry: Rc>>>>, + mut svc_locals: Rc>>, + mut item_registry: Rc>>, + mut diag_chunks: Rc>>>>, + mut source_indices: Rc>>, +) -> Rc { loop { match remaining.clone().first().cloned() { - None => { break Rc::new(LocalContributionState { - resolved_items: resolved_items, - func_sigs: func_sigs, - svc_registry: svc_registry, - svc_locals: svc_locals, - item_registry: item_registry, - diag_chunks: diag_chunks, -}); }, - Some(contribution) => { let next_func_sigs = match contribution.func_sig.clone() { - Some(sig) => v2_rt::rc_map_insert(func_sigs, sig.name.clone(), sig.clone()), - None => func_sigs, -}; -let next_svc_registry = if ((contribution.svc_entries.clone().len() as i64) > 0) { - v2_rt::rc_map_insert(svc_registry, authored_name_at(source_indices.clone(), &contribution.resolved_item.clone()), contribution.svc_entries.clone()) - } else { - svc_registry - }; -let next_svc_locals = match contribution.svc_local.clone() { - Some(binding) => v2_rt::rc_map_insert(svc_locals, binding.name.clone(), binding.clone()), - None => svc_locals, -}; -{ - let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); -let __tco_1 = v2_rt::rc_list_push(resolved_items, contribution.resolved_item.clone()); -let __tco_2 = next_func_sigs; -let __tco_3 = next_svc_registry; -let __tco_4 = next_svc_locals; -let __tco_5 = v2_rt::rc_map_insert(item_registry, contribution.item_info.clone().name.clone(), contribution.item_info.clone()); -let __tco_6 = v2_rt::rc_list_push(diag_chunks, contribution.resolve_diagnostics.clone()); -remaining = __tco_0; -resolved_items = __tco_1; -func_sigs = __tco_2; -svc_registry = __tco_3; -svc_locals = __tco_4; -item_registry = __tco_5; -diag_chunks = __tco_6; -continue; -} }, -} -} -} - -pub fn build_module_context(contributions: Rc>>, parent_index: Rc>>, resolved_imports: &Rc>>, env: &Rc, module_name: &String) -> Rc { + None => { + break Rc::new(LocalContributionState { + resolved_items: resolved_items, + func_sigs: func_sigs, + svc_registry: svc_registry, + svc_locals: svc_locals, + item_registry: item_registry, + diag_chunks: diag_chunks, + }); + } + Some(contribution) => { + let next_func_sigs = match contribution.func_sig.clone() { + Some(sig) => v2_rt::rc_map_insert(func_sigs, sig.name.clone(), sig.clone()), + None => func_sigs, + }; + let next_svc_registry = if ((contribution.svc_entries.clone().len() as i64) > 0) { + v2_rt::rc_map_insert( + svc_registry, + authored_name_at( + source_indices.clone(), + &contribution.resolved_item.clone(), + ), + contribution.svc_entries.clone(), + ) + } else { + svc_registry + }; + let next_svc_locals = match contribution.svc_local.clone() { + Some(binding) => { + v2_rt::rc_map_insert(svc_locals, binding.name.clone(), binding.clone()) + } + None => svc_locals, + }; + { + let __tco_0 = Rc::new( + remaining + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + let __tco_1 = + v2_rt::rc_list_push(resolved_items, contribution.resolved_item.clone()); + let __tco_2 = next_func_sigs; + let __tco_3 = next_svc_registry; + let __tco_4 = next_svc_locals; + let __tco_5 = v2_rt::rc_map_insert( + item_registry, + contribution.item_info.clone().name.clone(), + contribution.item_info.clone(), + ); + let __tco_6 = + v2_rt::rc_list_push(diag_chunks, contribution.resolve_diagnostics.clone()); + remaining = __tco_0; + resolved_items = __tco_1; + func_sigs = __tco_2; + svc_registry = __tco_3; + svc_locals = __tco_4; + item_registry = __tco_5; + diag_chunks = __tco_6; + continue; + } + } + } + } +} + +pub fn build_module_context( + contributions: Rc>>, + parent_index: Rc>>, + resolved_imports: &Rc>>, + env: &Rc, + module_name: &String, +) -> Rc { { - let local = fold_module_contributions(contributions, Rc::new(vec![]), v2_rt::rc_empty_map::>(), v2_rt::rc_empty_map::>>>(), v2_rt::rc_empty_map::>(), v2_rt::rc_empty_map::>(), Rc::new(vec![]), env.source_indices.clone()); -let imported_enum_names = resolved_imports.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, imp: Rc| imp.specific_names.clone().iter().cloned().fold(acc, |inner: Rc>, n: String| v2_rt::rc_map_insert(inner, n.clone(), true))); -let variant_fold = Rc::new(v2_rt::map_values(&env.bindings.clone())).iter().cloned().fold(Rc::new(VariantFoldState { + let local = fold_module_contributions( + contributions, + Rc::new(vec![]), + v2_rt::rc_empty_map::>(), + v2_rt::rc_empty_map::>>>(), + v2_rt::rc_empty_map::>(), + v2_rt::rc_empty_map::>(), + Rc::new(vec![]), + env.source_indices.clone(), + ); + let imported_enum_names = resolved_imports.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, imp: Rc| { + imp.specific_names.clone().iter().cloned().fold( + acc, + |inner: Rc>, n: String| { + v2_rt::rc_map_insert(inner, n.clone(), true) + }, + ) + }, + ); + let variant_fold = Rc::new(v2_rt::map_values(&env.bindings.clone())).iter().cloned().fold(Rc::new(VariantFoldState { locals: v2_rt::rc_empty_map::>(), collision_errors: Rc::new(vec![]), }), |acc: Rc, binding: Rc| { @@ -6361,22 +10964,59 @@ if (curr_is_imported.clone() && prev_is_imported.clone()) { acc.clone() } }); -let imported_variant_locals = variant_fold.locals.clone(); -let variant_collision_errors = variant_fold.collision_errors.clone(); -let env_variant_locals = variant_locals_from_items(local.resolved_items.clone(), imported_variant_locals, env.source_indices.clone()); -let merged_scope = merge_scope_from_imports(resolved_imports.clone(), parent_index, env.clone(), v2_rt::rc_empty_map::>(), local.svc_registry.clone(), local.svc_locals.clone()); -let all_declared_sigs = v2_rt::rc_map_merge(merged_scope.func_sigs.clone(), local.func_sigs.clone()); -let resolve_result = resolve_func_sigs(&all_declared_sigs, &local.resolved_items.clone(), module_name.clone(), &env.source_indices.clone()); -let all_locals = Rc::new(v2_rt::map_values(&merged_scope.svc_locals.clone())).iter().cloned().fold(env_variant_locals, |acc: Rc>>, binding: Rc| v2_rt::rc_map_insert(acc, binding.name.clone(), binding.clone())); -Rc::new(ModuleContext { - resolved_items: local.resolved_items.clone(), - func_env: resolve_result.func_env.clone(), - svc_registry: merged_scope.svc_registry.clone(), - locals: all_locals, - item_registry: local.item_registry.clone(), - diagnostics: v2_rt::concat(v2_rt::concat(Rc::new({ let mut __result = Vec::new(); for c in local.diag_chunks.clone().iter().cloned() { __result.extend((*c.clone()).iter().cloned()); } __result }), resolve_result.diagnostics.clone()), variant_collision_errors), -}) -} + let imported_variant_locals = variant_fold.locals.clone(); + let variant_collision_errors = variant_fold.collision_errors.clone(); + let env_variant_locals = variant_locals_from_items( + local.resolved_items.clone(), + imported_variant_locals, + env.source_indices.clone(), + ); + let merged_scope = merge_scope_from_imports( + resolved_imports.clone(), + parent_index, + env.clone(), + v2_rt::rc_empty_map::>(), + local.svc_registry.clone(), + local.svc_locals.clone(), + ); + let all_declared_sigs = + v2_rt::rc_map_merge(merged_scope.func_sigs.clone(), local.func_sigs.clone()); + let resolve_result = resolve_func_sigs( + &all_declared_sigs, + &local.resolved_items.clone(), + module_name.clone(), + &env.source_indices.clone(), + ); + let all_locals = Rc::new(v2_rt::map_values(&merged_scope.svc_locals.clone())) + .iter() + .cloned() + .fold( + env_variant_locals, + |acc: Rc>>, binding: Rc| { + v2_rt::rc_map_insert(acc, binding.name.clone(), binding.clone()) + }, + ); + Rc::new(ModuleContext { + resolved_items: local.resolved_items.clone(), + func_env: resolve_result.func_env.clone(), + svc_registry: merged_scope.svc_registry.clone(), + locals: all_locals, + item_registry: local.item_registry.clone(), + diagnostics: v2_rt::concat( + v2_rt::concat( + Rc::new({ + let mut __result = Vec::new(); + for c in local.diag_chunks.clone().iter().cloned() { + __result.extend((*c.clone()).iter().cloned()); + } + __result + }), + resolve_result.diagnostics.clone(), + ), + variant_collision_errors, + ), + }) + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -6385,90 +11025,174 @@ pub struct TypecheckModuleResult { pub diagnostics: Rc>>, } -pub fn typecheck_module(resolved: &Rc, parent_index: &Rc>>, source_indices: &Rc>>, intern_table: Rc) -> Rc { +pub fn typecheck_module( + resolved: &Rc, + parent_index: &Rc>>, + source_indices: &Rc>>, + intern_table: Rc, +) -> Rc { { let env_result = build_type_env(&resolved, &parent_index, &source_indices, &intern_table); -let env = env_result.env.clone(); -let env_diags = env_result.diagnostics.clone(); -let env_errors = Rc::new({ let mut __result = Vec::new(); for d in env_diags.clone().iter().cloned() { if is_error_diagnostic(d.diagnostic.clone()) { __result.push(d); } } __result }); -let seed_diags = builtin_kernel_seed_diagnostics(); -if ((env_errors.len() as i64) > 0) { + let env = env_result.env.clone(); + let env_diags = env_result.diagnostics.clone(); + let env_errors = Rc::new({ + let mut __result = Vec::new(); + for d in env_diags.clone().iter().cloned() { + if is_error_diagnostic(d.diagnostic.clone()) { + __result.push(d); + } + } + __result + }); + let seed_diags = builtin_kernel_seed_diagnostics(); + if ((env_errors.len() as i64) > 0) { return Rc::new(TypecheckModuleResult { - typed: Rc::new(TypedModule { - module: resolved.module.clone(), - items: Rc::new(vec![]), - type_env: env.clone(), - func_env: Rc::new(ResolvedFuncEnv { - signatures: v2_rt::rc_empty_map::>(), -}), - item_registry: v2_rt::rc_empty_map::>(), -}), - diagnostics: v2_rt::concat(env_diags.clone(), seed_diags.clone()), -}) + typed: Rc::new(TypedModule { + module: resolved.module.clone(), + items: Rc::new(vec![]), + type_env: env.clone(), + func_env: Rc::new(ResolvedFuncEnv { + signatures: v2_rt::rc_empty_map::>(), + }), + item_registry: v2_rt::rc_empty_map::>(), + }), + diagnostics: v2_rt::concat(env_diags.clone(), seed_diags.clone()), + }); } -let resolved_module_name = authored_name_at(source_indices.clone(), &resolved.module.clone()); -let contributions = Rc::new({ let mut __result = Vec::new(); for item in module_items(resolved.module.clone()).iter().cloned() { __result.push(analyze_item(item.clone(), &env, &resolved_module_name)); } __result }); -let ctx = build_module_context(contributions, parent_index.clone(), &resolved.resolved_imports.clone(), &env, &resolved_module_name); -let data_locals = ctx.resolved_items.clone().iter().cloned().fold(ctx.locals.clone(), |acc: Rc>>, item: Rc| if ((((item.body.clone() != None) && ((item.params.clone().len() as i64) == 0)) && (item.inferred.clone() == None)) && (item.type_annotation.clone() != None)) { - v2_rt::rc_map_insert(acc.clone(), authored_name_at(source_indices.clone(), &item), Rc::new(TypeBinding { - name: authored_name_at(source_indices.clone(), &item), - resolved: item.type_annotation.clone().clone().unwrap(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), -})) - } else { - acc.clone() + let resolved_module_name = + authored_name_at(source_indices.clone(), &resolved.module.clone()); + let contributions = Rc::new({ + let mut __result = Vec::new(); + for item in module_items(resolved.module.clone()).iter().cloned() { + __result.push(analyze_item(item.clone(), &env, &resolved_module_name)); + } + __result }); -let infer_scope = Rc::new(InferScope { - type_env: env.clone(), - func_env: ctx.func_env.clone(), - locals: data_locals.clone(), - match_bound_names: v2_rt::rc_empty_map::(), - module_name: resolved_module_name.clone(), - service_registry: ctx.svc_registry.clone(), - item_registry: ctx.item_registry.clone(), - lambda_param_provenance: v2_rt::rc_empty_map::>(), -}); -let typed_item_results = infer_items(ctx.resolved_items.clone(), infer_scope); -let typed_items = Rc::new({ let mut __result = Vec::new(); for tir in typed_item_results.clone().iter().cloned() { __result.push(tir.item.clone()); } __result }); -let infer_diags = Rc::new({ let mut __result = Vec::new(); for tir in typed_item_results.clone().iter().cloned() { __result.extend((*tir.diagnostics.clone()).iter().cloned()); } __result }); -let updated_func_env = populate_output_provenance(typed_items.clone(), ctx.func_env.clone(), env.clone(), data_locals.clone()); -let reannotated_items = Rc::new({ let mut __result = Vec::new(); for item in typed_items.clone().iter().cloned() { __result.push(if (item.is_self_recursive.clone() && (item.body.clone() != None)) { - Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: item.children.clone(), - params: item.params.clone(), - inferred: item.inferred.clone(), - return_cardinality: item.return_cardinality.clone(), - uses: item.uses.clone(), - body: Some(annotate_descent_evidence(item.body.clone().clone().unwrap(), authored_name_at(source_indices.clone(), &item), &item.params.clone(), &env, data_locals.clone(), updated_func_env.signatures.clone())), - connective: item.connective.clone(), - transport: item.transport.clone(), - properties: item.properties.clone(), - type_annotation: item.type_annotation.clone(), - is_self_recursive: item.is_self_recursive.clone(), - has_non_tail_self_call: item.has_non_tail_self_call.clone(), - match_pattern: item.match_pattern.clone(), - expr_data: item.expr_data.clone(), - ident: None, -}) - } else { - item.clone() - }); } __result }); -let typed_base = module_node(&resolved_module_name, module_imports(resolved.module.clone()), ctx.resolved_items.clone(), &resolved.module.clone().span.clone()); -let typed_module = Rc::new(Node { ident_span: resolved.module.clone().ident_span.clone(), ..(*typed_base).clone() }); -Rc::new(TypecheckModuleResult { - typed: Rc::new(TypedModule { - module: typed_module, - items: reannotated_items, - type_env: env.clone(), - func_env: updated_func_env.clone(), - item_registry: ctx.item_registry.clone(), -}), - diagnostics: v2_rt::concat(v2_rt::concat(v2_rt::concat(env_diags.clone(), ctx.diagnostics.clone()), infer_diags), seed_diags.clone()), -}) -} + let ctx = build_module_context( + contributions, + parent_index.clone(), + &resolved.resolved_imports.clone(), + &env, + &resolved_module_name, + ); + let data_locals = ctx.resolved_items.clone().iter().cloned().fold( + ctx.locals.clone(), + |acc: Rc>>, item: Rc| { + if ((((item.body.clone() != None) && ((item.params.clone().len() as i64) == 0)) + && (item.inferred.clone() == None)) + && (item.type_annotation.clone() != None)) + { + v2_rt::rc_map_insert( + acc.clone(), + authored_name_at(source_indices.clone(), &item), + Rc::new(TypeBinding { + name: authored_name_at(source_indices.clone(), &item), + resolved: item.type_annotation.clone().clone().unwrap(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), + }), + ) + } else { + acc.clone() + } + }, + ); + let infer_scope = Rc::new(InferScope { + type_env: env.clone(), + func_env: ctx.func_env.clone(), + locals: data_locals.clone(), + match_bound_names: v2_rt::rc_empty_map::(), + module_name: resolved_module_name.clone(), + service_registry: ctx.svc_registry.clone(), + item_registry: ctx.item_registry.clone(), + lambda_param_provenance: v2_rt::rc_empty_map::>(), + }); + let typed_item_results = infer_items(ctx.resolved_items.clone(), infer_scope); + let typed_items = Rc::new({ + let mut __result = Vec::new(); + for tir in typed_item_results.clone().iter().cloned() { + __result.push(tir.item.clone()); + } + __result + }); + let infer_diags = Rc::new({ + let mut __result = Vec::new(); + for tir in typed_item_results.clone().iter().cloned() { + __result.extend((*tir.diagnostics.clone()).iter().cloned()); + } + __result + }); + let updated_func_env = populate_output_provenance( + typed_items.clone(), + ctx.func_env.clone(), + env.clone(), + data_locals.clone(), + ); + let reannotated_items = Rc::new({ + let mut __result = Vec::new(); + for item in typed_items.clone().iter().cloned() { + __result.push( + if (item.is_self_recursive.clone() && (item.body.clone() != None)) { + Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: item.children.clone(), + params: item.params.clone(), + inferred: item.inferred.clone(), + return_cardinality: item.return_cardinality.clone(), + uses: item.uses.clone(), + body: Some(annotate_descent_evidence( + item.body.clone().clone().unwrap(), + authored_name_at(source_indices.clone(), &item), + &item.params.clone(), + &env, + data_locals.clone(), + updated_func_env.signatures.clone(), + )), + connective: item.connective.clone(), + transport: item.transport.clone(), + properties: item.properties.clone(), + type_annotation: item.type_annotation.clone(), + is_self_recursive: item.is_self_recursive.clone(), + has_non_tail_self_call: item.has_non_tail_self_call.clone(), + match_pattern: item.match_pattern.clone(), + expr_data: item.expr_data.clone(), + ident: None, + }) + } else { + item.clone() + }, + ); + } + __result + }); + let typed_base = module_node( + &resolved_module_name, + module_imports(resolved.module.clone()), + ctx.resolved_items.clone(), + &resolved.module.clone().span.clone(), + ); + let typed_module = Rc::new(Node { + ident_span: resolved.module.clone().ident_span.clone(), + ..(*typed_base).clone() + }); + Rc::new(TypecheckModuleResult { + typed: Rc::new(TypedModule { + module: typed_module, + items: reannotated_items, + type_env: env.clone(), + func_env: updated_func_env.clone(), + item_registry: ctx.item_registry.clone(), + }), + diagnostics: v2_rt::concat( + v2_rt::concat( + v2_rt::concat(env_diags.clone(), ctx.diagnostics.clone()), + infer_diags, + ), + seed_diags.clone(), + ), + }) + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -6489,287 +11213,494 @@ pub struct BindingsAccum { pub diagnostics: Rc>>, } -pub fn resolve_env_bindings(env: &Rc, module_name: String, local_names: &Rc>, deps_map: Rc>>>) -> Rc { +pub fn resolve_env_bindings( + env: &Rc, + module_name: String, + local_names: &Rc>, + deps_map: Rc>>>, +) -> Rc { { - let remaining = Rc::new({ let mut __result = Vec::new(); for b in Rc::new({ let mut __result = Vec::new(); for b in Rc::new(v2_rt::map_values(&env.bindings.clone())).iter().cloned() { if v2_rt::map_contains_key(&local_names, intern(&env.intern_table.clone(), &b.name.clone()).id.clone()) { __result.push(b); } } __result }).iter().cloned() { __result.push(b.name.clone()); } __result }); -topo_resolve_types(remaining.clone(), env.clone(), module_name, Rc::new(vec![]), local_names.clone(), deps_map, (remaining.clone().len() as i64)) -} + let remaining = Rc::new({ + let mut __result = Vec::new(); + for b in Rc::new({ + let mut __result = Vec::new(); + for b in Rc::new(v2_rt::map_values(&env.bindings.clone())) + .iter() + .cloned() + { + if v2_rt::map_contains_key( + &local_names, + intern(&env.intern_table.clone(), &b.name.clone()) + .id + .clone(), + ) { + __result.push(b); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(b.name.clone()); + } + __result + }); + topo_resolve_types( + remaining.clone(), + env.clone(), + module_name, + Rc::new(vec![]), + local_names.clone(), + deps_map, + (remaining.clone().len() as i64), + ) + } } -pub fn topo_resolve_types(mut remaining: Rc>, mut env: Rc, mut module_name: String, mut diagnostics: Rc>>, mut local_names: Rc>, mut deps_map: Rc>>>, mut fuel: i64) -> Rc { +pub fn topo_resolve_types( + mut remaining: Rc>, + mut env: Rc, + mut module_name: String, + mut diagnostics: Rc>>, + mut local_names: Rc>, + mut deps_map: Rc>>>, + mut fuel: i64, +) -> Rc { loop { if ((remaining.clone().len() as i64) == 0) { return Rc::new(EnvResolveResult { - env: env.clone(), - diagnostics: diagnostics.clone(), -}) + env: env.clone(), + diagnostics: diagnostics.clone(), + }); } -let remaining_set = remaining.clone().iter().cloned().fold(empty_set(), |acc: Rc>, name: String| set_insert(acc, name.clone())); -let ready = Rc::new({ let mut __result = Vec::new(); for name in remaining.clone().iter().cloned() { if match v2_rt::map_get(&deps_map, name.clone()) { - Some(deps) => { let mut __all = true; for dep in deps.clone().iter().cloned() { if !(((((is_kernel_type(dep.clone()) || (dep.clone().as_str() == "None".to_string().as_str())) || (dep.clone().as_str() == "".to_string().as_str())) || is_recursive_type_by_name(&env, dep.clone())) || (set_contains(remaining_set.clone(), dep.clone()) == false))) { __all = false; break; } } __all }, - None => true, -} { __result.push(name); } } __result }); -if ((ready.clone().len() as i64) == 0) { + let remaining_set = remaining.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, name: String| { + v2_rt::rc_map_insert(acc, name.clone(), true) + }, + ); + let ready = Rc::new({ + let mut __result = Vec::new(); + for name in remaining.clone().iter().cloned() { + if match v2_rt::map_get(&deps_map, name.clone()) { + Some(deps) => { + let mut __all = true; + for dep in deps.clone().iter().cloned() { + if !((((is_kernel_type(dep.clone()) + || (dep.clone().as_str() == "None".to_string().as_str())) + || (dep.clone().as_str() == "".to_string().as_str())) + || is_recursive_type_by_name(&env, dep.clone())) + || (emit_map_has(remaining_set.clone(), dep.clone()) == false)) + { + __all = false; + break; + } + } + __all + } + None => true, + } { + __result.push(name); + } + } + __result + }); + if ((ready.clone().len() as i64) == 0) { { - let stuck_accum = remaining.clone().iter().cloned().fold(Rc::new(BindingsAccum { - bindings: env.bindings.clone(), - diagnostics: Rc::new(vec![]), -}), |acc: Rc, name: String| { - let ident = intern(&env.intern_table.clone(), &name).id.clone(); -match v2_rt::map_get(&env.bindings.clone(), ident.clone()) { - Some(binding) => { - let result = resolve_node(binding.resolved.clone(), env.clone(), module_name.clone()); -Rc::new(BindingsAccum { - bindings: v2_rt::rc_map_insert(acc.bindings.clone(), ident.clone(), Rc::new(TypeBinding { - name: name.clone(), - resolved: result.resolved.clone(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), -})), - diagnostics: v2_rt::concat(acc.diagnostics.clone(), result.diagnostics.clone()), -}) -}, - None => acc.clone(), -} -}); -return Rc::new(EnvResolveResult { - env: Rc::new(TypeEnv { - bindings: stuck_accum.bindings.clone(), - recursive_types: env.recursive_types.clone(), - recursive_type_set: env.recursive_type_set.clone(), - inductive_fields: env.inductive_fields.clone(), - source_indices: env.source_indices.clone(), - intern_table: env.intern_table.clone(), -}), - diagnostics: v2_rt::concat(diagnostics.clone(), stuck_accum.diagnostics.clone()), -}) -} + let stuck_accum = remaining.clone().iter().cloned().fold( + Rc::new(BindingsAccum { + bindings: env.bindings.clone(), + diagnostics: Rc::new(vec![]), + }), + |acc: Rc, name: String| { + let ident = intern(&env.intern_table.clone(), &name).id.clone(); + match v2_rt::map_get(&env.bindings.clone(), ident.clone()) { + Some(binding) => { + let result = resolve_node( + binding.resolved.clone(), + env.clone(), + module_name.clone(), + ); + Rc::new(BindingsAccum { + bindings: v2_rt::rc_map_insert( + acc.bindings.clone(), + ident.clone(), + Rc::new(TypeBinding { + name: name.clone(), + resolved: result.resolved.clone(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), + }), + ), + diagnostics: v2_rt::concat( + acc.diagnostics.clone(), + result.diagnostics.clone(), + ), + }) + } + None => acc.clone(), + } + }, + ); + return Rc::new(EnvResolveResult { + env: Rc::new(TypeEnv { + bindings: stuck_accum.bindings.clone(), + recursive_types: env.recursive_types.clone(), + recursive_type_set: env.recursive_type_set.clone(), + inductive_fields: env.inductive_fields.clone(), + source_indices: env.source_indices.clone(), + intern_table: env.intern_table.clone(), + }), + diagnostics: v2_rt::concat( + diagnostics.clone(), + stuck_accum.diagnostics.clone(), + ), + }); + } } -let ready_accum = ready.clone().iter().cloned().fold(Rc::new(BindingsAccum { - bindings: env.bindings.clone(), - diagnostics: Rc::new(vec![]), -}), |acc: Rc, name: String| { - let ident = intern(&env.intern_table.clone(), &name).id.clone(); -match v2_rt::map_get(&env.bindings.clone(), ident.clone()) { - Some(binding) => { - let result = resolve_node(binding.resolved.clone(), env.clone(), module_name.clone()); -Rc::new(BindingsAccum { - bindings: v2_rt::rc_map_insert(acc.bindings.clone(), ident.clone(), Rc::new(TypeBinding { - name: name.clone(), - resolved: result.resolved.clone(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), -})), - diagnostics: v2_rt::concat(acc.diagnostics.clone(), result.diagnostics.clone()), -}) -}, - None => acc.clone(), -} -}); -let ready_set = ready.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, name.clone(), true)); -let next_remaining = Rc::new({ let mut __result = Vec::new(); for name in remaining.clone().iter().cloned() { if (emit_map_has(ready_set.clone(), name.clone()) == false) { __result.push(name); } } __result }); -{ + let ready_accum = ready.clone().iter().cloned().fold( + Rc::new(BindingsAccum { + bindings: env.bindings.clone(), + diagnostics: Rc::new(vec![]), + }), + |acc: Rc, name: String| { + let ident = intern(&env.intern_table.clone(), &name).id.clone(); + match v2_rt::map_get(&env.bindings.clone(), ident.clone()) { + Some(binding) => { + let result = resolve_node( + binding.resolved.clone(), + env.clone(), + module_name.clone(), + ); + Rc::new(BindingsAccum { + bindings: v2_rt::rc_map_insert( + acc.bindings.clone(), + ident.clone(), + Rc::new(TypeBinding { + name: name.clone(), + resolved: result.resolved.clone(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), + }), + ), + diagnostics: v2_rt::concat( + acc.diagnostics.clone(), + result.diagnostics.clone(), + ), + }) + } + None => acc.clone(), + } + }, + ); + let ready_set = ready.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, name: String| { + v2_rt::rc_map_insert(acc, name.clone(), true) + }, + ); + let next_remaining = Rc::new({ + let mut __result = Vec::new(); + for name in remaining.clone().iter().cloned() { + if (emit_map_has(ready_set.clone(), name.clone()) == false) { + __result.push(name); + } + } + __result + }); + { let __tco_0 = next_remaining; -let __tco_1 = Rc::new(TypeEnv { - bindings: ready_accum.bindings.clone(), - recursive_types: env.recursive_types.clone(), - recursive_type_set: env.recursive_type_set.clone(), - inductive_fields: env.inductive_fields.clone(), - source_indices: env.source_indices.clone(), - intern_table: env.intern_table.clone(), -}); -let __tco_2 = v2_rt::concat(diagnostics, ready_accum.diagnostics.clone()); -let __tco_3 = (fuel - 1); -remaining = __tco_0; -env = __tco_1; -diagnostics = __tco_2; -fuel = __tco_3; -continue; -} -} + let __tco_1 = Rc::new(TypeEnv { + bindings: ready_accum.bindings.clone(), + recursive_types: env.recursive_types.clone(), + recursive_type_set: env.recursive_type_set.clone(), + inductive_fields: env.inductive_fields.clone(), + source_indices: env.source_indices.clone(), + intern_table: env.intern_table.clone(), + }); + let __tco_2 = v2_rt::concat(diagnostics, ready_accum.diagnostics.clone()); + let __tco_3 = (fuel - 1); + remaining = __tco_0; + env = __tco_1; + diagnostics = __tco_2; + fuel = __tco_3; + continue; + } + } } -pub fn collect_parent_envs(resolved: &Rc, module_index: Rc>>, source_indices: Rc>>) -> Rc { +pub fn collect_parent_envs( + resolved: &Rc, + module_index: Rc>>, + source_indices: Rc>>, +) -> Rc { { - let modules = Rc::new({ let mut __result = Vec::new(); for imp in resolved.resolved_imports.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&module_index, imp.module_path.clone()) { - Some(typed) => Rc::new(vec![typed.clone()]), - None => Rc::new(vec![]), -}).iter().cloned()); } __result }); -let resolved_mod_name = authored_name_at(source_indices, &resolved.module.clone()); -let diagnostics = Rc::new({ let mut __result = Vec::new(); for imp in resolved.resolved_imports.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&module_index, imp.module_path.clone()) { - Some(_) => Rc::new(vec![]), - None => Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::InternalError { - message: v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("missing parent environment for imported module '".to_string(), imp.module_path.clone()), "' while ordering '".to_string()), resolved_mod_name.clone()), "'".to_string()), - span: imp.target_module.clone().clone().unwrap().span.clone(), -}), resolved_mod_name.clone())]), -}).iter().cloned()); } __result }); -Rc::new(ParentModulesResult { - modules: modules, - diagnostics: diagnostics, -}) -} -} - -pub fn infer_literal_string_value(n: Rc) -> Option { - match (*n.expr_data.clone()).clone() { - ExprData::ExprLiteral { value: lv, .. } => match (*lv.clone()).clone() { - LiteralValue::LitStr { value: s, .. } => Some(s.clone()), - _ => None, -}, - _ => None, -} -} - -pub fn infer_field_value_by_name(record: Rc, field_name: String, source_indices: Rc>>) -> Option> { - match Rc::new({ let mut __result = Vec::new(); for fi in record.children.clone().iter().cloned() { if (field_init_node_name_at(fi.clone(), source_indices.clone()).as_str() == field_name.clone().as_str()) { __result.push(fi); } } __result }).first().cloned() { - Some(fi) => Some(field_init_node_value(&fi)), - None => None, -} -} - -pub fn infer_record_string_field(record: Rc, field_name: String, source_indices: Rc>>) -> Option { - match infer_field_value_by_name(record, field_name, source_indices) { - Some(vn) => infer_literal_string_value(vn.clone()), - None => None, -} -} - -pub fn build_untagged_json_tuple_variants(modules: Rc>>) -> Rc> { - modules.iter().cloned().fold(empty_set(), |acc: Rc>, m: Rc| { - let si = m.type_env.clone().source_indices.clone(); -m.items.clone().iter().cloned().fold(acc, |inner: Rc>, item: Rc| if (item_kind(&item) == ItemKind::DataItem) { - match item.body.clone() { - Some(body) => match infer_record_string_field(body.clone(), "coproduct".to_string(), si.clone()) { - Some(coproduct_name) => match infer_field_value_by_name(body.clone(), "encoding".to_string(), si.clone()) { - Some(enc_node) => if (authored_name_at(si.clone(), &enc_node).as_str() == "UntaggedJsonStringOrArray".to_string().as_str()) { - match infer_record_string_field(enc_node.clone(), "string_variant".to_string(), si.clone()) { - Some(sv) => match infer_record_string_field(enc_node.clone(), "array_variant".to_string(), si.clone()) { - Some(av) => { - let k1 = v2_rt::concat(v2_rt::concat(coproduct_name.clone(), "::".to_string()), sv.clone()); -let k2 = v2_rt::concat(v2_rt::concat(coproduct_name.clone(), "::".to_string()), av.clone()); -set_insert(set_insert(inner.clone(), k1.clone()), k2.clone()) -}, - None => inner.clone(), -}, - None => inner.clone(), -} - } else { - inner.clone() - }, - None => inner.clone(), -}, - None => inner.clone(), -}, - None => inner.clone(), -} - } else { - inner.clone() + let modules = Rc::new({ + let mut __result = Vec::new(); + for imp in resolved.resolved_imports.clone().iter().cloned() { + __result.extend( + (*match v2_rt::map_get(&module_index, imp.module_path.clone()) { + Some(typed) => Rc::new(vec![typed.clone()]), + None => Rc::new(vec![]), + }) + .iter() + .cloned(), + ); + } + __result + }); + let resolved_mod_name = authored_name_at(source_indices, &resolved.module.clone()); + let diagnostics = Rc::new({ + let mut __result = Vec::new(); + for imp in resolved.resolved_imports.clone().iter().cloned() { + __result.extend( + (*match v2_rt::map_get(&module_index, imp.module_path.clone()) { + Some(_) => Rc::new(vec![]), + None => Rc::new(vec![make_error_node( + Rc::new(CompilerDiagnostic::InternalError { + message: v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "missing parent environment for imported module '" + .to_string(), + imp.module_path.clone(), + ), + "' while ordering '".to_string(), + ), + resolved_mod_name.clone(), + ), + "'".to_string(), + ), + span: imp.target_module.clone().clone().unwrap().span.clone(), + }), + resolved_mod_name.clone(), + )]), + }) + .iter() + .cloned(), + ); + } + __result + }); + Rc::new(ParentModulesResult { + modules: modules, + diagnostics: diagnostics, }) -}) + } } -pub fn build_fielded_variants(modules: Rc>>, type_summaries: Rc>>) -> Rc> { +pub fn build_fielded_variants( + modules: Rc>>, + type_summaries: Rc>>, +) -> Rc> { { - let result = modules.iter().cloned().fold(empty_set(), |acc: Rc>, m: Rc| { - let items = m.items.clone(); -let si = m.type_env.clone().source_indices.clone(); -items.clone().iter().cloned().fold(acc, |inner: Rc>, item: Rc| { - let is_enum = match v2_rt::map_get(&type_summaries, authored_name_at(si.clone(), &item)) { - Some(summary) => match (*summary.repr.clone()).clone() { - TypeRepr::EnumRepr { .. } => true, - _ => false, -}, - None => false, -}; -if is_enum.clone() { - { - let enum_name = authored_name_at(si.clone(), &item); -let variants = item.children.clone(); -variants.clone().iter().cloned().fold(inner.clone(), |vacc: Rc>, variant: Rc| { - let has_fields = ((variant.children.clone().len() as i64) > 0); -if has_fields.clone() { - set_insert(vacc.clone(), v2_rt::concat(v2_rt::concat(enum_name.clone(), "::".to_string()), authored_name_at(si.clone(), &variant))) - } else { - vacc.clone() + let result = modules.iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, m: Rc| { + let items = m.items.clone(); + let si = m.type_env.clone().source_indices.clone(); + items.clone().iter().cloned().fold( + acc, + |inner: Rc>, item: Rc| { + let is_enum = match v2_rt::map_get( + &type_summaries, + authored_name_at(si.clone(), &item), + ) { + Some(summary) => match (*summary.repr.clone()).clone() { + TypeRepr::EnumRepr { .. } => true, + _ => false, + }, + None => false, + }; + if is_enum.clone() { + { + let enum_name = authored_name_at(si.clone(), &item); + let variants = item.children.clone(); + variants.clone().iter().cloned().fold( + inner.clone(), + |vacc: Rc>, variant: Rc| { + let has_fields = + ((variant.children.clone().len() as i64) > 0); + if has_fields.clone() { + v2_rt::rc_map_insert( + vacc.clone(), + v2_rt::concat( + v2_rt::concat( + enum_name.clone(), + "::".to_string(), + ), + authored_name_at(si.clone(), &variant), + ), + true, + ) + } else { + vacc.clone() + } + }, + ) } -}) -} - } else { - inner.clone() - } -}) -}); -result -} + } else { + inner.clone() + } + }, + ) + }, + ); + result + } } pub fn build_emit_graph_info(modules: &Rc>>) -> Rc { { let init = Rc::new(EmitInfoBuildState { - type_summaries: v2_rt::rc_empty_map::>(), -}); -let built = modules.clone().iter().cloned().fold(init.clone(), |state: Rc, typed_module: Rc| typed_module.items.clone().iter().cloned().fold(state, |inner_state: Rc, item: Rc| add_emit_item_summary(inner_state, &item, &typed_module.type_env.clone().source_indices.clone()))); -let all_recursive = modules.clone().iter().cloned().fold(empty_set(), |acc: Rc>, m: Rc| Rc::new(v2_rt::map_keys(&m.type_env.clone().recursive_type_set.clone())).iter().cloned().fold(acc, |inner: Rc>, ident: i64| set_insert(inner, intern_str(m.type_env.clone().intern_table.clone(), ident.clone())))); -let fielded = build_fielded_variants(modules.clone(), built.type_summaries.clone()); -let untagged_tuples = build_untagged_json_tuple_variants(modules.clone()); -let vtoe = derive_variant_to_enum(built.type_summaries.clone()); -Rc::new(EmitGraphInfo { - type_summaries: built.type_summaries.clone(), - recursive_type_set: all_recursive, - fielded_variants: fielded, - untagged_json_tuple_variants: untagged_tuples, - shared_types: empty_set(), - ownership_index: v2_rt::rc_empty_map::>>(), - movable: empty_set(), - variant_to_enum: vtoe, - owned_bindings: empty_set(), - read_only_params_index: v2_rt::rc_empty_map::>>(), - read_only_params: empty_set(), -}) -} -} - -pub fn typecheck(graph: Rc, source_indices: Rc>>, intern_table: Rc) -> Rc { - typecheck_modules(graph.modules.clone(), Rc::new(vec![]), v2_rt::rc_empty_map::>(), v2_rt::rc_empty_map::>(), Rc::new(vec![]), source_indices, intern_table) + type_summaries: v2_rt::rc_empty_map::>(), + }); + let built = modules.clone().iter().cloned().fold( + init.clone(), + |state: Rc, typed_module: Rc| { + typed_module.items.clone().iter().cloned().fold( + state, + |inner_state: Rc, item: Rc| { + add_emit_item_summary( + inner_state, + &item, + &typed_module.type_env.clone().source_indices.clone(), + ) + }, + ) + }, + ); + let all_recursive = modules.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, m: Rc| { + Rc::new(v2_rt::map_keys( + &m.type_env.clone().recursive_type_set.clone(), + )) + .iter() + .cloned() + .fold(acc, |inner: Rc>, ident: i64| { + v2_rt::rc_map_insert( + inner, + intern_str(m.type_env.clone().intern_table.clone(), ident.clone()), + true, + ) + }) + }, + ); + let fielded = build_fielded_variants(modules.clone(), built.type_summaries.clone()); + let vtoe = derive_variant_to_enum(built.type_summaries.clone()); + Rc::new(EmitGraphInfo { + type_summaries: built.type_summaries.clone(), + recursive_type_set: all_recursive, + fielded_variants: fielded, + shared_types: v2_rt::rc_empty_map::(), + ownership_index: v2_rt::rc_empty_map::>>(), + movable: v2_rt::rc_empty_map::(), + variant_to_enum: vtoe, + owned_bindings: v2_rt::rc_empty_map::(), + read_only_params_index: v2_rt::rc_empty_map::>>(), + read_only_params: v2_rt::rc_empty_map::(), + }) + } } -pub fn typecheck_modules(mut remaining: Rc>>, mut modules: Rc>>, mut module_index: Rc>>, mut item_registry: Rc>>, mut diag_chunks: Rc>>>>, mut source_indices: Rc>>, mut intern_table: Rc) -> Rc { +pub fn typecheck( + graph: Rc, + source_indices: Rc>>, + intern_table: Rc, +) -> Rc { + typecheck_modules( + graph.modules.clone(), + Rc::new(vec![]), + v2_rt::rc_empty_map::>(), + v2_rt::rc_empty_map::>(), + Rc::new(vec![]), + source_indices, + intern_table, + ) +} + +pub fn typecheck_modules( + mut remaining: Rc>>, + mut modules: Rc>>, + mut module_index: Rc>>, + mut item_registry: Rc>>, + mut diag_chunks: Rc>>>>, + mut source_indices: Rc>>, + mut intern_table: Rc, +) -> Rc { loop { match remaining.clone().first().cloned() { - None => { let expanded_registry = expand_transitive_services(modules.clone(), item_registry, 5); -break Rc::new(TypedGraph { - modules: modules.clone(), - item_registry: expanded_registry, - diagnostics: Rc::new({ let mut __result = Vec::new(); for c in diag_chunks.iter().cloned() { __result.extend((*c.clone()).iter().cloned()); } __result }), -}); }, - Some(resolved) => { let parent_result = collect_parent_envs(&resolved, module_index.clone(), source_indices.clone()); -let tc_result = typecheck_module(&resolved, &module_index, &source_indices, intern_table.clone()); -let typed = tc_result.typed.clone(); -let tc_diags = tc_result.diagnostics.clone(); -{ - let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); -let __tco_1 = v2_rt::rc_list_push(modules, typed.clone()); -let __tco_2 = v2_rt::rc_map_insert(module_index, authored_name_at(source_indices.clone(), &typed.module.clone()), typed.clone()); -let __tco_3 = v2_rt::rc_map_merge(item_registry, typed.item_registry.clone()); -let __tco_4 = v2_rt::rc_list_push(v2_rt::rc_list_push(diag_chunks, parent_result.diagnostics.clone()), tc_diags); -remaining = __tco_0; -modules = __tco_1; -module_index = __tco_2; -item_registry = __tco_3; -diag_chunks = __tco_4; -continue; -} }, -} -} -} - -pub fn reconcile(graph: Rc, source_indices: Rc>>, intern_table: Rc) -> Rc { + None => { + let expanded_registry = + expand_transitive_services(modules.clone(), item_registry, 5); + break Rc::new(TypedGraph { + modules: modules.clone(), + item_registry: expanded_registry, + diagnostics: Rc::new({ + let mut __result = Vec::new(); + for c in diag_chunks.iter().cloned() { + __result.extend((*c.clone()).iter().cloned()); + } + __result + }), + }); + } + Some(resolved) => { + let parent_result = + collect_parent_envs(&resolved, module_index.clone(), source_indices.clone()); + let tc_result = typecheck_module( + &resolved, + &module_index, + &source_indices, + intern_table.clone(), + ); + let typed = tc_result.typed.clone(); + let tc_diags = tc_result.diagnostics.clone(); + { + let __tco_0 = Rc::new( + remaining + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + let __tco_1 = v2_rt::rc_list_push(modules, typed.clone()); + let __tco_2 = v2_rt::rc_map_insert( + module_index, + authored_name_at(source_indices.clone(), &typed.module.clone()), + typed.clone(), + ); + let __tco_3 = v2_rt::rc_map_merge(item_registry, typed.item_registry.clone()); + let __tco_4 = v2_rt::rc_list_push( + v2_rt::rc_list_push(diag_chunks, parent_result.diagnostics.clone()), + tc_diags, + ); + remaining = __tco_0; + modules = __tco_1; + module_index = __tco_2; + item_registry = __tco_3; + diag_chunks = __tco_4; + continue; + } + } + } + } +} + +pub fn reconcile( + graph: Rc, + source_indices: Rc>>, + intern_table: Rc, +) -> Rc { { let typed = typecheck(graph, source_indices, intern_table); -let emit_info = build_emit_graph_info(&typed.modules.clone()); -Rc::new(ResolvedGraph { - modules: typed.modules.clone(), - item_registry: typed.item_registry.clone(), - diagnostics: typed.diagnostics.clone(), - emit_graph_info: emit_info, -}) -} + let emit_info = build_emit_graph_info(&typed.modules.clone()); + Rc::new(ResolvedGraph { + modules: typed.modules.clone(), + item_registry: typed.item_registry.clone(), + diagnostics: typed.diagnostics.clone(), + emit_graph_info: emit_info, + }) + } } diff --git a/src/v2/stage0/src/v2_compiler_infer_access.rs b/src/v2/stage0/src/v2_compiler_infer_access.rs index 88ef0d55a1d..5351728cdb0 100644 --- a/src/v2/stage0/src/v2_compiler_infer_access.rs +++ b/src/v2/stage0/src/v2_compiler_infer_access.rs @@ -1,16 +1,22 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_access -use std::collections::HashMap; -use std::rc::Rc; +pub use crate::std_types::{is_ordered_element_collection, SourceSpan}; +pub use crate::v2_compiler_infer_types::{ + for_each_element_type_node, node_is_element_collection, node_is_keyed_collection, + node_type_equals, normalize_access_type_node, resolved_type, +}; use crate::v2_rt; -use crate::NonEmptyVec; +use crate::v2_std_core::CompilerDiagnostic::InternalError; +use crate::v2_std_core::InferredNode::{CompilerError, Resolved}; +pub use crate::v2_std_core::{ + authored_name_at, diagnostic_to_message, int_type, make_error_node, string_type, unit_type, + with_optional_cardinality, CompilerDiagnostic, ErrorNode, InferredNode, NewlineIndex, Node, +}; use crate::NonEmptyBTreeSet; -pub use crate::std_types::{SourceSpan, is_ordered_element_collection}; -pub use crate::v2_std_core::{Node, NewlineIndex, authored_name_at, InferredNode, ErrorNode, make_error_node, diagnostic_to_message, with_optional_cardinality, unit_type, string_type, int_type, CompilerDiagnostic}; -use crate::v2_std_core::InferredNode::{Resolved, CompilerError}; -use crate::v2_std_core::CompilerDiagnostic::{InternalError}; -pub use crate::v2_compiler_infer_types::{resolved_type, normalize_access_type_node, node_type_equals, node_is_keyed_collection, node_is_element_collection, for_each_element_type_node}; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct AccessCheckResultNode { @@ -25,124 +31,210 @@ pub struct KeyedCollectionParts { } pub fn access_error(message: String, span: Rc, module_name: String) -> Rc { - make_error_node(Rc::new(CompilerDiagnostic::InternalError { - message: message, - span: span, -}), module_name) + make_error_node( + Rc::new(CompilerDiagnostic::InternalError { + message: message, + span: span, + }), + module_name, + ) } -pub fn access_result(inferred: Rc, diagnostics: &Rc>>, span: Rc, fallback_message: String) -> Rc { +pub fn access_result( + inferred: Rc, + diagnostics: &Rc>>, + span: Rc, + fallback_message: String, +) -> Rc { if ((diagnostics.clone().len() as i64) == 0) { Rc::new(AccessCheckResultNode { - inferred: Some(Rc::new(InferredNode::Resolved { - node: inferred, -})), - diagnostics: diagnostics.clone(), -}) + inferred: Some(Rc::new(InferredNode::Resolved { node: inferred })), + diagnostics: diagnostics.clone(), + }) } else { { let message = match diagnostics.clone().first().cloned() { - Some(diag) => diagnostic_to_message(diag.diagnostic.clone()), - None => fallback_message, -}; -Rc::new(AccessCheckResultNode { - inferred: Some(Rc::new(InferredNode::CompilerError { - message: message, - span: span, -})), - diagnostics: diagnostics.clone(), -}) -} + Some(diag) => diagnostic_to_message(diag.diagnostic.clone()), + None => fallback_message, + }; + Rc::new(AccessCheckResultNode { + inferred: Some(Rc::new(InferredNode::CompilerError { + message: message, + span: span, + })), + diagnostics: diagnostics.clone(), + }) + } } } -pub fn keyed_collection_parts(n: &Rc, source_indices: Rc>>) -> Option> { +pub fn keyed_collection_parts( + n: &Rc, + source_indices: Rc>>, +) -> Option> { if (node_is_keyed_collection(&n, source_indices) && ((n.children.clone().len() as i64) >= 2)) { match n.children.clone().first().cloned() { - Some(key_child) => match n.children.clone().get(1 as usize).cloned() { - Some(value_child) => Some(Rc::new(KeyedCollectionParts { - key_type: resolved_type(key_child.clone()), - value_type: resolved_type(value_child.clone()), -})), - None => None, -}, - None => None, -} + Some(key_child) => match n.children.clone().get(1 as usize).cloned() { + Some(value_child) => Some(Rc::new(KeyedCollectionParts { + key_type: resolved_type(key_child.clone()), + value_type: resolved_type(value_child.clone()), + })), + None => None, + }, + None => None, + } } else { None } } -pub fn check_index_access_node(base_type: Rc, index_type: Rc, span: &Rc, module_name: String, source_indices: &Rc>>) -> Rc { +pub fn check_index_access_node( + base_type: Rc, + index_type: Rc, + span: &Rc, + module_name: String, + source_indices: &Rc>>, +) -> Rc { { let normed = normalize_access_type_node(base_type); -let normed_index = normalize_access_type_node(index_type); -let base_is_string = node_type_equals(&normed, &string_type(), source_indices.clone()); -let index_is_int = node_type_equals(&normed_index, &int_type(), source_indices.clone()); -if base_is_string { + let normed_index = normalize_access_type_node(index_type); + let base_is_string = node_type_equals(&normed, &string_type(), source_indices.clone()); + let index_is_int = node_type_equals(&normed_index, &int_type(), source_indices.clone()); + if base_is_string { { let diags = if index_is_int { Rc::new(vec![]) } else { - Rc::new(vec![access_error("string index requires an Int index".to_string(), span.clone(), module_name)]) + Rc::new(vec![access_error( + "string index requires an Int index".to_string(), + span.clone(), + module_name, + )]) }; -access_result(string_type(), &diags, span.clone(), "invalid string index access".to_string()) -} + access_result( + string_type(), + &diags, + span.clone(), + "invalid string index access".to_string(), + ) + } } else { match keyed_collection_parts(&normed, source_indices.clone()) { - Some(parts) => { - let key_diags = if node_type_equals(&parts.key_type.clone(), &normed_index, source_indices.clone()) { - Rc::new(vec![]) - } else { - Rc::new(vec![access_error("keyed collection index key type does not match the collection key type".to_string(), span.clone(), module_name)]) - }; -access_result(with_optional_cardinality(&parts.value_type.clone()), &key_diags, span.clone(), "invalid keyed collection index access".to_string()) -}, - None => if node_is_keyed_collection(&normed, source_indices.clone()) { - { - let malformed_diags = Rc::new(vec![access_error("malformed keyed collection type in index access".to_string(), span.clone(), module_name)]); -access_result(unit_type(), &malformed_diags, span.clone(), "malformed keyed collection type in index access".to_string()) -} - } else { - if ((is_ordered_element_collection(authored_name_at(source_indices.clone(), &normed)) && node_is_element_collection(&normed, source_indices.clone())) && index_is_int) { - { - let elem = for_each_element_type_node(normed.clone(), source_indices.clone()); -access_result(with_optional_cardinality(&elem), &Rc::new(vec![]), span.clone(), "list index access".to_string()) -} - } else { - { - let diags = Rc::new(vec![access_error("indexing is only supported for String, keyed collection, and list values".to_string(), span.clone(), module_name)]); -access_result(unit_type(), &diags, span.clone(), "invalid index access".to_string()) -} + Some(parts) => { + let key_diags = if node_type_equals( + &parts.key_type.clone(), + &normed_index, + source_indices.clone(), + ) { + Rc::new(vec![]) + } else { + Rc::new(vec![access_error("keyed collection index key type does not match the collection key type".to_string(), span.clone(), module_name)]) + }; + access_result( + with_optional_cardinality(&parts.value_type.clone()), + &key_diags, + span.clone(), + "invalid keyed collection index access".to_string(), + ) } - }, -} + None => { + if node_is_keyed_collection(&normed, source_indices.clone()) { + { + let malformed_diags = Rc::new(vec![access_error( + "malformed keyed collection type in index access".to_string(), + span.clone(), + module_name, + )]); + access_result( + unit_type(), + &malformed_diags, + span.clone(), + "malformed keyed collection type in index access".to_string(), + ) + } + } else { + if ((is_ordered_element_collection(authored_name_at( + source_indices.clone(), + &normed, + )) && node_is_element_collection(&normed, source_indices.clone())) + && index_is_int) + { + { + let elem = for_each_element_type_node( + normed.clone(), + source_indices.clone(), + ); + access_result( + with_optional_cardinality(&elem), + &Rc::new(vec![]), + span.clone(), + "list index access".to_string(), + ) + } + } else { + { + let diags = Rc::new(vec![access_error("indexing is only supported for String, keyed collection, and list values".to_string(), span.clone(), module_name)]); + access_result( + unit_type(), + &diags, + span.clone(), + "invalid index access".to_string(), + ) + } + } + } + } + } } -} + } } -pub fn check_slice_access_node(base_type: Rc, start_type: Rc, end_type: Rc, span: &Rc, module_name: &String, source_indices: &Rc>>) -> Rc { +pub fn check_slice_access_node( + base_type: Rc, + start_type: Rc, + end_type: Rc, + span: &Rc, + module_name: &String, + source_indices: &Rc>>, +) -> Rc { { let normed_base = normalize_access_type_node(base_type); -let base_is_string = node_type_equals(&normed_base, &string_type(), source_indices.clone()); -let base_diags = if base_is_string { + let base_is_string = node_type_equals(&normed_base, &string_type(), source_indices.clone()); + let base_diags = if base_is_string { Rc::new(vec![]) } else { - Rc::new(vec![access_error("slice is only supported for String values".to_string(), span.clone(), module_name.clone())]) + Rc::new(vec![access_error( + "slice is only supported for String values".to_string(), + span.clone(), + module_name.clone(), + )]) }; -let normed_start = normalize_access_type_node(start_type); -let start_diags = if node_type_equals(&normed_start, &int_type(), source_indices.clone()) { + let normed_start = normalize_access_type_node(start_type); + let start_diags = if node_type_equals(&normed_start, &int_type(), source_indices.clone()) { Rc::new(vec![]) } else { - Rc::new(vec![access_error("slice start requires an Int index".to_string(), span.clone(), module_name.clone())]) + Rc::new(vec![access_error( + "slice start requires an Int index".to_string(), + span.clone(), + module_name.clone(), + )]) }; -let normed_end = normalize_access_type_node(end_type); -let end_diags = if node_type_equals(&normed_end, &int_type(), source_indices.clone()) { + let normed_end = normalize_access_type_node(end_type); + let end_diags = if node_type_equals(&normed_end, &int_type(), source_indices.clone()) { Rc::new(vec![]) } else { - Rc::new(vec![access_error("slice end requires an Int index".to_string(), span.clone(), module_name.clone())]) + Rc::new(vec![access_error( + "slice end requires an Int index".to_string(), + span.clone(), + module_name.clone(), + )]) }; -let all_diags = v2_rt::concat(v2_rt::concat(base_diags, start_diags), end_diags); -access_result(string_type(), &all_diags, span.clone(), "invalid slice access".to_string()) -} + let all_diags = v2_rt::concat(v2_rt::concat(base_diags, start_diags), end_diags); + access_result( + string_type(), + &all_diags, + span.clone(), + "invalid slice access".to_string(), + ) + } } diff --git a/src/v2/stage0/src/v2_compiler_infer_cycle.rs b/src/v2/stage0/src/v2_compiler_infer_cycle.rs index 6b4a4441abf..f174744c84e 100644 --- a/src/v2/stage0/src/v2_compiler_infer_cycle.rs +++ b/src/v2/stage0/src/v2_compiler_infer_cycle.rs @@ -1,67 +1,144 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_cycle -use std::collections::HashMap; -use std::rc::Rc; +pub use crate::v2_compiler_infer_env::TypeBinding; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; -pub use crate::v2_compiler_infer_env::{TypeBinding}; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; -pub fn compute_in_graph_deps(all_names: Rc>, deps_map: Rc>>>, name_set: Rc>) -> Rc>>> { +pub fn set_has(m: Rc>, key: String) -> bool { { - let result = all_names.iter().cloned().fold(v2_rt::rc_empty_map::>>(), |acc: Rc>>>, name: String| match v2_rt::map_get(&deps_map, name.clone()) { - Some(deps) => { - let local = Rc::new({ let mut __result = Vec::new(); for d in deps.clone().iter().cloned() { if ((d.clone().as_str() != name.clone().as_str()) && set_contains(name_set.clone(), d.clone())) { __result.push(d); } } __result }); -v2_rt::rc_map_insert(acc.clone(), name.clone(), local.clone()) -}, - None => v2_rt::rc_map_insert(acc.clone(), name.clone(), Rc::new(vec![])), -}); -result + let result = match v2_rt::map_get(&m, key) { + Some(_) => true, + None => false, + }; + result + } } + +pub fn compute_in_graph_deps( + all_names: Rc>, + deps_map: Rc>>>, + name_set: Rc>, +) -> Rc>>> { + { + let result = all_names.iter().cloned().fold( + v2_rt::rc_empty_map::>>(), + |acc: Rc>>>, name: String| match v2_rt::map_get( + &deps_map, + name.clone(), + ) { + Some(deps) => { + let local = Rc::new({ + let mut __result = Vec::new(); + for d in deps.clone().iter().cloned() { + if ((d.clone().as_str() != name.clone().as_str()) + && set_has(name_set.clone(), d.clone())) + { + __result.push(d); + } + } + __result + }); + v2_rt::rc_map_insert(acc.clone(), name.clone(), local.clone()) + } + None => v2_rt::rc_map_insert(acc.clone(), name.clone(), Rc::new(vec![])), + }, + ); + result + } } -pub fn build_reverse_adj(all_names: Rc>, local_deps: Rc>>>) -> Rc>>> { - all_names.iter().cloned().fold(v2_rt::rc_empty_map::>>(), |acc: Rc>>>, name: String| match v2_rt::map_get(&local_deps, name.clone()) { - Some(deps) => deps.clone().iter().cloned().fold(acc.clone(), |inner_acc: Rc>>>, dep: String| { - let existing = match v2_rt::map_get(&inner_acc, dep.clone()) { - Some(v) => v.clone(), - None => Rc::new(vec![]), -}; -v2_rt::rc_map_insert(inner_acc.clone(), dep.clone(), v2_rt::rc_list_push(existing.clone(), name.clone())) -}), - None => acc.clone(), -}) +pub fn build_reverse_adj( + all_names: Rc>, + local_deps: Rc>>>, +) -> Rc>>> { + all_names.iter().cloned().fold( + v2_rt::rc_empty_map::>>(), + |acc: Rc>>>, name: String| match v2_rt::map_get( + &local_deps, + name.clone(), + ) { + Some(deps) => deps.clone().iter().cloned().fold( + acc.clone(), + |inner_acc: Rc>>>, dep: String| { + let existing = match v2_rt::map_get(&inner_acc, dep.clone()) { + Some(v) => v.clone(), + None => Rc::new(vec![]), + }; + v2_rt::rc_map_insert( + inner_acc.clone(), + dep.clone(), + v2_rt::rc_list_push(existing.clone(), name.clone()), + ) + }, + ), + None => acc.clone(), + }, + ) } -pub fn build_in_degree(all_names: Rc>, local_deps: Rc>>>) -> Rc> { - all_names.iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| { - let deg = match v2_rt::map_get(&local_deps, name.clone()) { - Some(deps) => (deps.clone().len() as i64), - None => 0, -}; -v2_rt::rc_map_insert(acc, name.clone(), deg.clone()) -}) +pub fn build_in_degree( + all_names: Rc>, + local_deps: Rc>>>, +) -> Rc> { + all_names.iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, name: String| { + let deg = match v2_rt::map_get(&local_deps, name.clone()) { + Some(deps) => (deps.clone().len() as i64), + None => 0, + }; + v2_rt::rc_map_insert(acc, name.clone(), deg.clone()) + }, + ) } -pub fn kahn_remove_loop(remaining: &Rc>, local_deps: &Rc>>>) -> Rc> { +pub fn kahn_remove_loop( + remaining: &Rc>, + local_deps: &Rc>>>, +) -> Rc> { { let reverse_adj = build_reverse_adj(remaining.clone(), local_deps.clone()); -let in_degree = build_in_degree(remaining.clone(), local_deps.clone()); -let initial_queue = Rc::new({ let mut __result = Vec::new(); for n in remaining.clone().iter().cloned() { if match v2_rt::map_get(&in_degree, n.clone()) { - Some(d) => (d.clone() == 0), - None => true, -} { __result.push(n); } } __result }); -let final_state = kahn_cycle_drain(initial_queue, in_degree.clone(), reverse_adj, 0, (remaining.clone().len() as i64)); -if (final_state.removed_count.clone() == (remaining.clone().len() as i64)) { + let in_degree = build_in_degree(remaining.clone(), local_deps.clone()); + let initial_queue = Rc::new({ + let mut __result = Vec::new(); + for n in remaining.clone().iter().cloned() { + if match v2_rt::map_get(&in_degree, n.clone()) { + Some(d) => (d.clone() == 0), + None => true, + } { + __result.push(n); + } + } + __result + }); + let final_state = kahn_cycle_drain( + initial_queue, + in_degree.clone(), + reverse_adj, + 0, + (remaining.clone().len() as i64), + ); + if (final_state.removed_count.clone() == (remaining.clone().len() as i64)) { Rc::new(vec![]) } else { - Rc::new({ let mut __result = Vec::new(); for n in remaining.clone().iter().cloned() { if match v2_rt::map_get(&final_state.in_degree.clone(), n.clone()) { - Some(d) => (d.clone() > 0), - None => false, -} { __result.push(n); } } __result }) + Rc::new({ + let mut __result = Vec::new(); + for n in remaining.clone().iter().cloned() { + if match v2_rt::map_get(&final_state.in_degree.clone(), n.clone()) { + Some(d) => (d.clone() > 0), + None => false, + } { + __result.push(n); + } + } + __result + }) } -} + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -70,78 +147,147 @@ pub struct KahnState { pub removed_count: i64, } -pub fn kahn_cycle_drain(mut queue: Rc>, mut in_degree: Rc>, mut reverse_adj: Rc>>>, mut removed_count: i64, mut fuel: i64) -> Rc { +pub fn kahn_cycle_drain( + mut queue: Rc>, + mut in_degree: Rc>, + mut reverse_adj: Rc>>>, + mut removed_count: i64, + mut fuel: i64, +) -> Rc { loop { if ((queue.clone().len() as i64) == 0) { return Rc::new(KahnState { - in_degree: in_degree.clone(), - removed_count: removed_count.clone(), -}) + in_degree: in_degree.clone(), + removed_count: removed_count.clone(), + }); } -let result = queue.clone().iter().cloned().fold(Rc::new(KahnState { - in_degree: in_degree.clone(), - removed_count: removed_count.clone(), -}), |state: Rc, node: String| { let state = Rc::try_unwrap(state).unwrap_or_else(|rc| (*rc).clone()); { - let dependents = match v2_rt::map_get(&reverse_adj, node.clone()) { - Some(v) => v.clone(), - None => Rc::new(vec![]), -}; -let new_deg = dependents.clone().iter().cloned().fold(state.in_degree, |deg_acc: Rc>, dep: String| { - let old = match v2_rt::map_get(°_acc, dep.clone()) { - Some(d) => d.clone(), - None => 0, -}; -v2_rt::rc_map_insert(deg_acc.clone(), dep.clone(), (old.clone() - 1)) -}); -Rc::new(KahnState { - in_degree: new_deg.clone(), - removed_count: (state.removed_count + 1), -}) -} }); -let next_queue = queue.clone().iter().cloned().fold(Rc::new(vec![]), |acc: _, node: String| { - let dependents = match v2_rt::map_get(&reverse_adj, node.clone()) { - Some(v) => v.clone(), - None => Rc::new(vec![]), -}; -dependents.clone().iter().cloned().fold(acc, |inner_acc: _, dep: String| { - let deg = match v2_rt::map_get(&result.in_degree.clone(), dep.clone()) { - Some(d) => d.clone(), - None => 0, -}; -if (deg.clone() == 0) { - v2_rt::rc_list_push(inner_acc.clone(), dep.clone()) - } else { - inner_acc.clone() + let result = queue.clone().iter().cloned().fold( + Rc::new(KahnState { + in_degree: in_degree.clone(), + removed_count: removed_count.clone(), + }), + |state: Rc, node: String| { + let state = Rc::try_unwrap(state).unwrap_or_else(|rc| (*rc).clone()); + { + let dependents = match v2_rt::map_get(&reverse_adj, node.clone()) { + Some(v) => v.clone(), + None => Rc::new(vec![]), + }; + let new_deg = dependents.clone().iter().cloned().fold( + state.in_degree, + |deg_acc: Rc>, dep: String| { + let old = match v2_rt::map_get(°_acc, dep.clone()) { + Some(d) => d.clone(), + None => 0, + }; + v2_rt::rc_map_insert(deg_acc.clone(), dep.clone(), (old.clone() - 1)) + }, + ); + Rc::new(KahnState { + in_degree: new_deg.clone(), + removed_count: (state.removed_count + 1), + }) } -}) -}); -{ + }, + ); + let next_queue = + queue + .clone() + .iter() + .cloned() + .fold(Rc::new(vec![]), |acc: _, node: String| { + let dependents = match v2_rt::map_get(&reverse_adj, node.clone()) { + Some(v) => v.clone(), + None => Rc::new(vec![]), + }; + dependents + .clone() + .iter() + .cloned() + .fold(acc, |inner_acc: _, dep: String| { + let deg = match v2_rt::map_get(&result.in_degree.clone(), dep.clone()) { + Some(d) => d.clone(), + None => 0, + }; + if (deg.clone() == 0) { + v2_rt::rc_list_push(inner_acc.clone(), dep.clone()) + } else { + inner_acc.clone() + } + }) + }); + { let __tco_0 = next_queue; -let __tco_1 = result.in_degree.clone(); -let __tco_2 = result.removed_count.clone(); -let __tco_3 = (fuel - 1); -queue = __tco_0; -in_degree = __tco_1; -removed_count = __tco_2; -fuel = __tco_3; -continue; -} -} + let __tco_1 = result.in_degree.clone(); + let __tco_2 = result.removed_count.clone(); + let __tco_3 = (fuel - 1); + queue = __tco_0; + in_degree = __tco_1; + removed_count = __tco_2; + fuel = __tco_3; + continue; + } + } } -pub fn detect_type_cycles_kahn(deps_map: &Rc>>>, bindings: Rc>>) -> Rc> { +pub fn detect_type_cycles_kahn( + deps_map: &Rc>>>, + bindings: Rc>>, +) -> Rc> { { - let all_names = Rc::new({ let mut __result = Vec::new(); for b in Rc::new(v2_rt::map_values(&bindings)).iter().cloned() { __result.push(b.name.clone()); } __result }); -let name_set = all_names.clone().iter().cloned().fold(empty_set(), |acc: Rc>, n: String| set_insert(acc, n.clone())); -let local_deps = compute_in_graph_deps(all_names.clone(), deps_map.clone(), name_set); -let self_refs = Rc::new({ let mut __result = Vec::new(); for name in all_names.clone().iter().cloned() { if match v2_rt::map_get(&deps_map, name.clone()) { - Some(deps) => { let mut __found = false; for d in deps.clone().iter().cloned() { if (d.clone().as_str() == name.clone().as_str()) { __found = true; break; } } __found }, - None => false, -} { __result.push(name); } } __result }); -let cycle_members = kahn_remove_loop(&all_names, &local_deps); -let sr_set = self_refs.iter().cloned().fold(empty_set(), |acc: Rc>, n: String| set_insert(acc, n.clone())); -let cm_set = cycle_members.iter().cloned().fold(sr_set, |acc: Rc>, n: String| set_insert(acc, n.clone())); -let result = Rc::new({ let mut __result = Vec::new(); for n in all_names.clone().iter().cloned() { if set_contains(cm_set.clone(), n.clone()) { __result.push(n); } } __result }); -result -} + let all_names = Rc::new({ + let mut __result = Vec::new(); + for b in Rc::new(v2_rt::map_values(&bindings)).iter().cloned() { + __result.push(b.name.clone()); + } + __result + }); + let name_set = all_names.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, n: String| v2_rt::rc_map_insert(acc, n.clone(), true), + ); + let local_deps = compute_in_graph_deps(all_names.clone(), deps_map.clone(), name_set); + let self_refs = Rc::new({ + let mut __result = Vec::new(); + for name in all_names.clone().iter().cloned() { + if match v2_rt::map_get(&deps_map, name.clone()) { + Some(deps) => { + let mut __found = false; + for d in deps.clone().iter().cloned() { + if (d.clone().as_str() == name.clone().as_str()) { + __found = true; + break; + } + } + __found + } + None => false, + } { + __result.push(name); + } + } + __result + }); + let cycle_members = kahn_remove_loop(&all_names, &local_deps); + let sr_set = self_refs.iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, n: String| v2_rt::rc_map_insert(acc, n.clone(), true), + ); + let cm_set = cycle_members + .iter() + .cloned() + .fold(sr_set, |acc: Rc>, n: String| { + v2_rt::rc_map_insert(acc, n.clone(), true) + }); + let result = Rc::new({ + let mut __result = Vec::new(); + for n in all_names.clone().iter().cloned() { + if set_has(cm_set.clone(), n.clone()) { + __result.push(n); + } + } + __result + }); + result + } } diff --git a/src/v2/stage0/src/v2_compiler_infer_emit_info.rs b/src/v2/stage0/src/v2_compiler_infer_emit_info.rs index d3b94c905b6..67d890b8ea6 100644 --- a/src/v2/stage0/src/v2_compiler_infer_emit_info.rs +++ b/src/v2/stage0/src/v2_compiler_infer_emit_info.rs @@ -1,40 +1,46 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_emit_info -use std::collections::HashMap; -use std::rc::Rc; +use self::TypeRepr::*; +pub use crate::v2_compiler_infer_types::{ + child_type_node, emit_map_has, node_type_equals, normalize_access_type_node, +}; use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::v2_std_core::{Node, authored_name_at, NewlineIndex, find_child_named, has_child_named, InferredNode, FieldAccessStyle, FieldValueShape, FieldSummary, with_required_cardinality, Connective, param_node_name_at, Cardinality}; +use crate::v2_std_core::Cardinality::CardOptional; +use crate::v2_std_core::Connective::{Arrow, Conj, NoConnective}; +use crate::v2_std_core::FieldAccessStyle::{EnumAccessor, StoredField, TupleFirst, TupleSecond}; +use crate::v2_std_core::FieldValueShape::{OptionalValue, PlainValue}; use crate::v2_std_core::InferredNode::{Resolved, TypeVariable}; -use crate::v2_std_core::FieldAccessStyle::{StoredField, EnumAccessor, TupleFirst, TupleSecond}; -use crate::v2_std_core::FieldValueShape::{PlainValue, OptionalValue}; -use crate::v2_std_core::Connective::{Conj, NoConnective, Arrow}; -use crate::v2_std_core::Cardinality::{CardOptional}; -pub use crate::v2_compiler_infer_types::{normalize_access_type_node, child_type_node, emit_map_has, node_type_equals}; -use self::TypeRepr::*; +pub use crate::v2_std_core::{ + authored_name_at, find_child_named, has_child_named, param_node_name_at, + with_required_cardinality, Cardinality, Connective, FieldAccessStyle, FieldSummary, + FieldValueShape, InferredNode, NewlineIndex, Node, +}; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn is_type_variable(inferred: Rc) -> bool { match (*inferred).clone() { - InferredNode::TypeVariable { .. } => true, - _ => false, -} + InferredNode::TypeVariable { .. } => true, + _ => false, + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum TypeRepr { StructRepr, - EnumRepr { - unit_only: bool, - }, + EnumRepr { unit_only: bool }, } impl TypeRepr { pub fn unit_only(&self) -> bool { match self { TypeRepr::StructRepr => panic!("no unit_only on unit variant"), - TypeRepr::EnumRepr { unit_only: __val, .. } => __val.clone(), + TypeRepr::EnumRepr { + unit_only: __val, .. + } => __val.clone(), } } } @@ -53,16 +59,15 @@ pub struct TypeSummary { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct EmitGraphInfo { pub type_summaries: Rc>>, - pub recursive_type_set: Rc>, - pub fielded_variants: Rc>, - pub untagged_json_tuple_variants: Rc>, - pub shared_types: Rc>, - pub ownership_index: Rc>>>, - pub movable: Rc>, + pub recursive_type_set: Rc>, + pub fielded_variants: Rc>, + pub shared_types: Rc>, + pub ownership_index: Rc>>>, + pub movable: Rc>, pub variant_to_enum: Rc>, - pub owned_bindings: Rc>, - pub read_only_params_index: Rc>>>, - pub read_only_params: Rc>, + pub owned_bindings: Rc>, + pub read_only_params_index: Rc>>>, + pub read_only_params: Rc>, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -72,251 +77,532 @@ pub struct EmitInfoBuildState { pub fn empty_emit_graph_info() -> Rc { Rc::new(EmitGraphInfo { - type_summaries: v2_rt::rc_empty_map::>(), - recursive_type_set: empty_set(), - fielded_variants: empty_set(), - untagged_json_tuple_variants: empty_set(), - shared_types: empty_set(), - ownership_index: v2_rt::rc_empty_map::>>(), - movable: empty_set(), - variant_to_enum: v2_rt::rc_empty_map::(), - owned_bindings: empty_set(), - read_only_params_index: v2_rt::rc_empty_map::>>(), - read_only_params: empty_set(), -}) + type_summaries: v2_rt::rc_empty_map::>(), + recursive_type_set: v2_rt::rc_empty_map::(), + fielded_variants: v2_rt::rc_empty_map::(), + shared_types: v2_rt::rc_empty_map::(), + ownership_index: v2_rt::rc_empty_map::>>(), + movable: v2_rt::rc_empty_map::(), + variant_to_enum: v2_rt::rc_empty_map::(), + owned_bindings: v2_rt::rc_empty_map::(), + read_only_params_index: v2_rt::rc_empty_map::>>(), + read_only_params: v2_rt::rc_empty_map::(), + }) } -pub fn variant_has_fields(emit_info: Rc, enum_name: String, variant_name: String) -> bool { +pub fn variant_has_fields( + emit_info: Rc, + enum_name: String, + variant_name: String, +) -> bool { { let key = v2_rt::concat(v2_rt::concat(enum_name, "::".to_string()), variant_name); -set_contains(emit_info.fielded_variants.clone(), key) -} + match v2_rt::map_get(&emit_info.fielded_variants.clone(), key) { + Some(v) => v.clone(), + None => false, + } + } } -pub fn lookup_emit_type_summary(emit_info: Rc, type_name: String) -> Option> { +pub fn lookup_emit_type_summary( + emit_info: Rc, + type_name: String, +) -> Option> { v2_rt::map_get(&emit_info.type_summaries.clone(), type_name) } -pub fn derive_variant_to_enum(type_summaries: Rc>>) -> Rc> { - Rc::new(v2_rt::map_values(&type_summaries)).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, summary: Rc| match (*summary.repr.clone()).clone() { - TypeRepr::EnumRepr { .. } => Rc::new(v2_rt::map_keys(&summary.variant_name_set.clone())).iter().cloned().fold(acc.clone(), |inner: Rc>, vn: String| match v2_rt::map_get(&inner, vn.clone()) { - Some(_) => v2_rt::rc_map_insert(inner.clone(), vn.clone(), "".to_string()), - None => v2_rt::rc_map_insert(inner.clone(), vn.clone(), summary.name.clone()), -}), - _ => acc.clone(), -}) +pub fn derive_variant_to_enum( + type_summaries: Rc>>, +) -> Rc> { + Rc::new(v2_rt::map_values(&type_summaries)) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, summary: Rc| match (*summary + .repr + .clone()) + .clone() + { + TypeRepr::EnumRepr { .. } => { + Rc::new(v2_rt::map_keys(&summary.variant_name_set.clone())) + .iter() + .cloned() + .fold( + acc.clone(), + |inner: Rc>, vn: String| match v2_rt::map_get( + &inner, + vn.clone(), + ) { + Some(_) => { + v2_rt::rc_map_insert(inner.clone(), vn.clone(), "".to_string()) + } + None => v2_rt::rc_map_insert( + inner.clone(), + vn.clone(), + summary.name.clone(), + ), + }, + ) + } + _ => acc.clone(), + }, + ) } -pub fn is_known_variant(type_summaries: Rc>>, name: String) -> bool { - { let mut __found = false; for summary in Rc::new(v2_rt::map_values(&type_summaries)).iter().cloned() { if match (*summary.repr.clone()).clone() { - TypeRepr::EnumRepr { .. } => emit_map_has(summary.variant_name_set.clone(), name.clone()), - _ => false, -} { __found = true; break; } } __found } +pub fn is_known_variant( + type_summaries: Rc>>, + name: String, +) -> bool { + { + let mut __found = false; + for summary in Rc::new(v2_rt::map_values(&type_summaries)).iter().cloned() { + if match (*summary.repr.clone()).clone() { + TypeRepr::EnumRepr { .. } => { + emit_map_has(summary.variant_name_set.clone(), name.clone()) + } + _ => false, + } { + __found = true; + break; + } + } + __found + } } -pub fn variant_belongs_to_enum(type_summaries: Rc>>, variant_name: String, enum_name: String) -> bool { +pub fn variant_belongs_to_enum( + type_summaries: Rc>>, + variant_name: String, + enum_name: String, +) -> bool { match v2_rt::map_get(&type_summaries, enum_name) { - Some(summary) => match (*summary.repr.clone()).clone() { - TypeRepr::EnumRepr { .. } => emit_map_has(summary.variant_name_set.clone(), variant_name), - _ => false, -}, - None => false, -} + Some(summary) => match (*summary.repr.clone()).clone() { + TypeRepr::EnumRepr { .. } => { + emit_map_has(summary.variant_name_set.clone(), variant_name) + } + _ => false, + }, + None => false, + } } -pub fn is_enum_in_summaries(type_summaries: Rc>>, type_name: String) -> bool { +pub fn is_enum_in_summaries( + type_summaries: Rc>>, + type_name: String, +) -> bool { match v2_rt::map_get(&type_summaries, type_name) { - Some(summary) => match (*summary.repr.clone()).clone() { - TypeRepr::EnumRepr { .. } => true, - _ => false, -}, - None => false, -} + Some(summary) => match (*summary.repr.clone()).clone() { + TypeRepr::EnumRepr { .. } => true, + _ => false, + }, + None => false, + } } -pub fn find_variant_parent(type_summaries: Rc>>, variant_name: String, scope_enums: Rc>) -> Option { - Rc::new({ let mut __result = Vec::new(); for en in scope_enums.iter().cloned() { if variant_belongs_to_enum(type_summaries.clone(), variant_name.clone(), en.clone()) { __result.push(en); } } __result }).first().cloned() +pub fn find_variant_parent( + type_summaries: Rc>>, + variant_name: String, + scope_enums: Rc>, +) -> Option { + Rc::new({ + let mut __result = Vec::new(); + for en in scope_enums.iter().cloned() { + if variant_belongs_to_enum(type_summaries.clone(), variant_name.clone(), en.clone()) { + __result.push(en); + } + } + __result + }) + .first() + .cloned() } pub fn field_value_shape_from_type_node(type_node: Rc) -> FieldValueShape { { let normed = normalize_access_type_node(type_node); -let is_optional = (normed.return_cardinality.clone() == Cardinality::CardOptional); -if is_optional { + let is_optional = (normed.return_cardinality.clone() == Cardinality::CardOptional); + if is_optional { FieldValueShape::OptionalValue } else { FieldValueShape::PlainValue } -} + } } pub fn is_tuple_type(n: &Rc) -> bool { - (((n.connective.clone() == Connective::Conj) && (n.ident_span.clone() == None)) && ((n.children.clone().len() as i64) == 2)) + (((n.connective.clone() == Connective::Conj) && (n.ident_span.clone() == None)) + && ((n.children.clone().len() as i64) == 2)) } -pub fn build_struct_field_summaries(parent: &Rc, source_indices: Rc>>) -> Rc>> { +pub fn build_struct_field_summaries( + parent: &Rc, + source_indices: Rc>>, +) -> Rc>> { { let is_pair = is_tuple_type(&parent); -Rc::new(parent.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, pair: (i64, Rc)| { - let idx = pair.0.clone(); -let child = pair.1.clone(); -if (child.inferred.clone() == None) { - acc.clone() - } else { - { - let style = if is_pair.clone() { - if (idx.clone() == 0) { - FieldAccessStyle::TupleFirst + Rc::new( + parent + .children + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, pair: (i64, Rc)| { + let idx = pair.0.clone(); + let child = pair.1.clone(); + if (child.inferred.clone() == None) { + acc.clone() + } else { + { + let style = if is_pair.clone() { + if (idx.clone() == 0) { + FieldAccessStyle::TupleFirst + } else { + FieldAccessStyle::TupleSecond + } } else { - FieldAccessStyle::TupleSecond - } - } else { - FieldAccessStyle::StoredField - }; -let key = authored_name_at(source_indices.clone(), &child); -v2_rt::rc_map_insert(acc.clone(), key.clone(), Rc::new(FieldSummary { - access_style: style.clone(), - value_shape: field_value_shape_from_type_node(child_type_node(&child)), -})) -} - } -}) -} + FieldAccessStyle::StoredField + }; + let key = authored_name_at(source_indices.clone(), &child); + v2_rt::rc_map_insert( + acc.clone(), + key.clone(), + Rc::new(FieldSummary { + access_style: style.clone(), + value_shape: field_value_shape_from_type_node(child_type_node( + &child, + )), + }), + ) + } + } + }, + ) + } } -pub fn find_first_enum_field_node(variants: Rc>>, field_name: String, source_indices: Rc>>) -> Option> { +pub fn find_first_enum_field_node( + variants: Rc>>, + field_name: String, + source_indices: Rc>>, +) -> Option> { match variants.first().cloned() { - Some(variant) => match find_child_named(variant.clone(), field_name, source_indices) { - Some(field_child) => Some(field_child.clone()), - None => None, -}, - None => None, -} + Some(variant) => match find_child_named(variant.clone(), field_name, source_indices) { + Some(field_child) => Some(field_child.clone()), + None => None, + }, + None => None, + } } -pub fn enum_field_present_in_all_variants(variants: Rc>>, field_name: String, source_indices: Rc>>) -> bool { - { let mut __all = true; for variant in variants.iter().cloned() { if !(has_child_named(variant.clone(), field_name.clone(), source_indices.clone())) { __all = false; break; } } __all } +pub fn enum_field_present_in_all_variants( + variants: Rc>>, + field_name: String, + source_indices: Rc>>, +) -> bool { + { + let mut __all = true; + for variant in variants.iter().cloned() { + if !(has_child_named(variant.clone(), field_name.clone(), source_indices.clone())) { + __all = false; + break; + } + } + __all + } } -pub fn enum_field_type_consistent(variants: Rc>>, field_name: String, expected: Rc, source_indices: Rc>>) -> bool { - { let mut __all = true; for variant in variants.iter().cloned() { if !(match find_child_named(variant.clone(), field_name.clone(), source_indices.clone()) { - Some(field_child) => node_type_equals(&child_type_node(&field_child), &expected, source_indices.clone()), - None => false, -}) { __all = false; break; } } __all } +pub fn enum_field_type_consistent( + variants: Rc>>, + field_name: String, + expected: Rc, + source_indices: Rc>>, +) -> bool { + { + let mut __all = true; + for variant in variants.iter().cloned() { + if !(match find_child_named(variant.clone(), field_name.clone(), source_indices.clone()) + { + Some(field_child) => node_type_equals( + &child_type_node(&field_child), + &expected, + source_indices.clone(), + ), + None => false, + }) { + __all = false; + break; + } + } + __all + } } -pub fn build_enum_field_summaries(variants: &Rc>>, source_indices: Rc>>) -> Rc>> { +pub fn build_enum_field_summaries( + variants: &Rc>>, + source_indices: Rc>>, +) -> Rc>> { { let first_field_names = match variants.clone().first().cloned() { - Some(first_variant) => Rc::new({ let mut __result = Vec::new(); for f in first_variant.children.clone().iter().cloned() { __result.push(authored_name_at(source_indices.clone(), &f)); } __result }), - None => Rc::new(vec![]), -}; -let shared = Rc::new({ let mut __result = Vec::new(); for field_name in first_field_names.iter().cloned() { if enum_field_present_in_all_variants(variants.clone(), field_name.clone(), source_indices.clone()) { __result.push(field_name); } } __result }); -let consistent = Rc::new({ let mut __result = Vec::new(); for field_name in shared.iter().cloned() { if match find_first_enum_field_node(variants.clone(), field_name.clone(), source_indices.clone()) { - Some(first_field) => enum_field_type_consistent(variants.clone(), field_name.clone(), child_type_node(&first_field), source_indices.clone()), - None => false, -} { __result.push(field_name); } } __result }); -consistent.iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, field_name: String| match find_first_enum_field_node(variants.clone(), field_name.clone(), source_indices.clone()) { - Some(first_field) => v2_rt::rc_map_insert(acc.clone(), field_name.clone(), Rc::new(FieldSummary { - access_style: FieldAccessStyle::EnumAccessor, - value_shape: field_value_shape_from_type_node(child_type_node(&first_field)), -})), - None => acc.clone(), -}) -} + Some(first_variant) => Rc::new({ + let mut __result = Vec::new(); + for f in first_variant.children.clone().iter().cloned() { + __result.push(authored_name_at(source_indices.clone(), &f)); + } + __result + }), + None => Rc::new(vec![]), + }; + let shared = Rc::new({ + let mut __result = Vec::new(); + for field_name in first_field_names.iter().cloned() { + if enum_field_present_in_all_variants( + variants.clone(), + field_name.clone(), + source_indices.clone(), + ) { + __result.push(field_name); + } + } + __result + }); + let consistent = Rc::new({ + let mut __result = Vec::new(); + for field_name in shared.iter().cloned() { + if match find_first_enum_field_node( + variants.clone(), + field_name.clone(), + source_indices.clone(), + ) { + Some(first_field) => enum_field_type_consistent( + variants.clone(), + field_name.clone(), + child_type_node(&first_field), + source_indices.clone(), + ), + None => false, + } { + __result.push(field_name); + } + } + __result + }); + consistent.iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, field_name: String| { + match find_first_enum_field_node( + variants.clone(), + field_name.clone(), + source_indices.clone(), + ) { + Some(first_field) => v2_rt::rc_map_insert( + acc.clone(), + field_name.clone(), + Rc::new(FieldSummary { + access_style: FieldAccessStyle::EnumAccessor, + value_shape: field_value_shape_from_type_node(child_type_node( + &first_field, + )), + }), + ), + None => acc.clone(), + } + }, + ) + } } -pub fn build_field_type_map(children: Rc>>, source_indices: Rc>>) -> Rc> { - children.iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, child: Rc| match child.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: ft, .. }) => { - let resolved_name = authored_name_at(source_indices.clone(), &normalize_access_type_node(ft.clone())); -let ft_is_type_var = if (ft.inferred.clone() != None) { - is_type_variable(ft.inferred.clone().clone().unwrap()) - } else { - false - }; -let key = authored_name_at(source_indices.clone(), &child); -if (((resolved_name.clone().as_str() != "".to_string().as_str()) && !ft_is_type_var.clone()) && (resolved_name.clone().as_str() != "Dynamic".to_string().as_str())) { - v2_rt::rc_map_insert(acc.clone(), key.clone(), resolved_name.clone()) - } else { - acc.clone() - } -}, - _ => acc.clone(), -}) +pub fn build_field_type_map( + children: Rc>>, + source_indices: Rc>>, +) -> Rc> { + children.iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, child: Rc| match child + .inferred + .clone() + .as_deref() + .cloned() + { + Some(InferredNode::Resolved { node: ft, .. }) => { + let resolved_name = authored_name_at( + source_indices.clone(), + &normalize_access_type_node(ft.clone()), + ); + let ft_is_type_var = if (ft.inferred.clone() != None) { + is_type_variable(ft.inferred.clone().clone().unwrap()) + } else { + false + }; + let key = authored_name_at(source_indices.clone(), &child); + if (((resolved_name.clone().as_str() != "".to_string().as_str()) + && !ft_is_type_var.clone()) + && (resolved_name.clone().as_str() != "Dynamic".to_string().as_str())) + { + v2_rt::rc_map_insert(acc.clone(), key.clone(), resolved_name.clone()) + } else { + acc.clone() + } + } + _ => acc.clone(), + }, + ) } -pub fn build_type_summary(item: &Rc, source_indices: &Rc>>) -> Option> { +pub fn build_type_summary( + item: &Rc, + source_indices: &Rc>>, +) -> Option> { { - if (((item.connective.clone() == Connective::NoConnective) || (item.connective.clone() == Connective::Arrow)) || (item.transport.clone() != None)) { - return None + if (((item.connective.clone() == Connective::NoConnective) + || (item.connective.clone() == Connective::Arrow)) + || (item.transport.clone() != None)) + { + return None; } -let gpn = Rc::new({ let mut __result = Vec::new(); for p in item.params.clone().iter().cloned() { __result.push(param_node_name_at(p.clone(), source_indices.clone())); } __result }); -let is_product = (item.connective.clone() == Connective::Conj); -let has_fn = { let mut __found = false; for child in item.children.clone().iter().cloned() { if match child.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => (rt.connective.clone() == Connective::Arrow), - _ => false, -} { __found = true; break; } } __found }; -if is_product { + let gpn = Rc::new({ + let mut __result = Vec::new(); + for p in item.params.clone().iter().cloned() { + __result.push(param_node_name_at(p.clone(), source_indices.clone())); + } + __result + }); + let is_product = (item.connective.clone() == Connective::Conj); + let has_fn = { + let mut __found = false; + for child in item.children.clone().iter().cloned() { + if match child.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + (rt.connective.clone() == Connective::Arrow) + } + _ => false, + } { + __found = true; + break; + } + } + __found + }; + if is_product { Some(Rc::new(TypeSummary { - name: authored_name_at(source_indices.clone(), &item), - repr: Rc::new(TypeRepr::StructRepr), - field_summaries: build_struct_field_summaries(&item, source_indices.clone()), - field_type_map: build_field_type_map(item.children.clone(), source_indices.clone()), - variant_name_set: v2_rt::rc_empty_map::(), - generic_param_names: gpn, - has_fn_fields: has_fn, -})) + name: authored_name_at(source_indices.clone(), &item), + repr: Rc::new(TypeRepr::StructRepr), + field_summaries: build_struct_field_summaries(&item, source_indices.clone()), + field_type_map: build_field_type_map(item.children.clone(), source_indices.clone()), + variant_name_set: v2_rt::rc_empty_map::(), + generic_param_names: gpn, + has_fn_fields: has_fn, + })) } else { { - let unit_only = { let mut __all = true; for child in item.children.clone().iter().cloned() { if !(((child.children.clone().len() as i64) == 0)) { __all = false; break; } } __all }; -Some(Rc::new(TypeSummary { - name: authored_name_at(source_indices.clone(), &item), - repr: Rc::new(TypeRepr::EnumRepr { - unit_only: unit_only, -}), - field_summaries: build_enum_field_summaries(&item.children.clone(), source_indices.clone()), - field_type_map: v2_rt::rc_empty_map::(), - variant_name_set: item.children.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, child: Rc| v2_rt::rc_map_insert(acc, authored_name_at(source_indices.clone(), &child), true)), - generic_param_names: gpn, - has_fn_fields: has_fn, -})) -} + let unit_only = { + let mut __all = true; + for child in item.children.clone().iter().cloned() { + if !((child.children.clone().len() as i64) == 0) { + __all = false; + break; + } + } + __all + }; + Some(Rc::new(TypeSummary { + name: authored_name_at(source_indices.clone(), &item), + repr: Rc::new(TypeRepr::EnumRepr { + unit_only: unit_only, + }), + field_summaries: build_enum_field_summaries( + &item.children.clone(), + source_indices.clone(), + ), + field_type_map: v2_rt::rc_empty_map::(), + variant_name_set: item.children.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, child: Rc| { + v2_rt::rc_map_insert( + acc, + authored_name_at(source_indices.clone(), &child), + true, + ) + }, + ), + generic_param_names: gpn, + has_fn_fields: has_fn, + })) + } } -} + } } -pub fn add_emit_item_summary(state: Rc, item: &Rc, source_indices: &Rc>>) -> Rc { +pub fn add_emit_item_summary( + state: Rc, + item: &Rc, + source_indices: &Rc>>, +) -> Rc { match build_type_summary(&item, &source_indices) { - Some(summary) => { - let with_variants = match (*summary.repr.clone()).clone() { - TypeRepr::EnumRepr { .. } => item.children.clone().iter().cloned().fold(state.type_summaries.clone(), |acc: Rc>>, variant: Rc| if ((variant.children.clone().len() as i64) > 0) { - { - let v_has_fn = { let mut __found = false; for vc in variant.children.clone().iter().cloned() { if match vc.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => (rt.connective.clone() == Connective::Arrow), - _ => false, -} { __found = true; break; } } __found }; -let vname = authored_name_at(source_indices.clone(), &variant); -v2_rt::rc_map_insert(acc.clone(), vname.clone(), Rc::new(TypeSummary { - name: vname.clone(), - repr: Rc::new(TypeRepr::StructRepr), - field_summaries: build_struct_field_summaries(&variant, source_indices.clone()), - field_type_map: build_field_type_map(variant.children.clone(), source_indices.clone()), - variant_name_set: v2_rt::rc_empty_map::(), - generic_param_names: Rc::new(vec![]), - has_fn_fields: v_has_fn.clone(), -})) -} - } else { - acc.clone() - }), - _ => state.type_summaries.clone(), -}; -let next_summaries = v2_rt::rc_map_insert(with_variants, summary.name.clone(), summary.clone()); -Rc::new(EmitInfoBuildState { - type_summaries: next_summaries, -}) -}, - None => state, -} + Some(summary) => { + let with_variants = match (*summary.repr.clone()).clone() { + TypeRepr::EnumRepr { .. } => item.children.clone().iter().cloned().fold( + state.type_summaries.clone(), + |acc: Rc>>, variant: Rc| { + if ((variant.children.clone().len() as i64) > 0) { + { + let v_has_fn = { + let mut __found = false; + for vc in variant.children.clone().iter().cloned() { + if match vc.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + (rt.connective.clone() == Connective::Arrow) + } + _ => false, + } { + __found = true; + break; + } + } + __found + }; + let vname = authored_name_at(source_indices.clone(), &variant); + v2_rt::rc_map_insert( + acc.clone(), + vname.clone(), + Rc::new(TypeSummary { + name: vname.clone(), + repr: Rc::new(TypeRepr::StructRepr), + field_summaries: build_struct_field_summaries( + &variant, + source_indices.clone(), + ), + field_type_map: build_field_type_map( + variant.children.clone(), + source_indices.clone(), + ), + variant_name_set: v2_rt::rc_empty_map::(), + generic_param_names: Rc::new(vec![]), + has_fn_fields: v_has_fn.clone(), + }), + ) + } + } else { + acc.clone() + } + }, + ), + _ => state.type_summaries.clone(), + }; + let next_summaries = + v2_rt::rc_map_insert(with_variants, summary.name.clone(), summary.clone()); + Rc::new(EmitInfoBuildState { + type_summaries: next_summaries, + }) + } + None => state, + } } diff --git a/src/v2/stage0/src/v2_compiler_infer_env.rs b/src/v2/stage0/src/v2_compiler_infer_env.rs index d3dc148b5eb..0fce851de90 100644 --- a/src/v2/stage0/src/v2_compiler_infer_env.rs +++ b/src/v2/stage0/src/v2_compiler_infer_env.rs @@ -1,15 +1,18 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_env -use std::collections::HashMap; -use std::rc::Rc; +use crate::std_induction::RecursionShape::{DirectRecursion, ListRecursion, OptionalRecursion}; +use crate::std_induction::SubValueRelation::{PreservedValue, SubValueUnknown}; +pub use crate::std_induction::{InductiveField, RecursionShape, SubValueRelation}; use crate::v2_rt; -use crate::NonEmptyVec; +pub use crate::v2_std_core::{ + authored_name_at, empty_intern_table, intern, intern_find, intern_str, merge_intern_tables, + source_text_at, InternTable, NewlineIndex, Node, +}; use crate::NonEmptyBTreeSet; -pub use crate::v2_std_core::{Node, NewlineIndex, InternTable, empty_intern_table, merge_intern_tables, intern, intern_find, intern_str, source_text_at, authored_name_at}; -pub use crate::std_induction::{InductiveField, RecursionShape, SubValueRelation}; -use crate::std_induction::RecursionShape::{DirectRecursion, ListRecursion, OptionalRecursion}; -use crate::std_induction::SubValueRelation::{SubValueUnknown, PreservedValue}; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct TypeEnv { @@ -30,30 +33,30 @@ pub struct TypeBinding { pub fn is_recursive_type(env: Rc, ident: i64) -> bool { match v2_rt::map_get(&env.recursive_type_set.clone(), ident) { - Some(_) => true, - _ => false, -} + Some(_) => true, + _ => false, + } } pub fn is_recursive_type_by_name(env: &Rc, name: String) -> bool { match intern_find(env.intern_table.clone(), name) { - Some(id) => is_recursive_type(env.clone(), id.clone()), - None => false, -} + Some(id) => is_recursive_type(env.clone(), id.clone()), + None => false, + } } pub fn lookup_type(env: Rc, ident: i64) -> Option> { match v2_rt::map_get(&env.bindings.clone(), ident) { - Some(binding) => Some(binding.resolved.clone()), - None => None, -} + Some(binding) => Some(binding.resolved.clone()), + None => None, + } } pub fn lookup_type_by_name(env: &Rc, name: String) -> Option> { match intern_find(env.intern_table.clone(), name) { - Some(id) => lookup_type(env.clone(), id.clone()), - None => None, -} + Some(id) => lookup_type(env.clone(), id.clone()), + None => None, + } } pub fn authored_name(env: Rc, node: Rc) -> String { @@ -62,102 +65,192 @@ pub fn authored_name(env: Rc, node: Rc) -> String { pub fn lookup_type_for(env: &Rc, node: &Rc) -> Option> { match node.ident.clone() { - Some(id) => lookup_type(env.clone(), id.clone()), - None => lookup_type_by_name(&env, authored_name(env.clone(), node.clone())), -} + Some(id) => lookup_type(env.clone(), id.clone()), + None => lookup_type_by_name(&env, authored_name(env.clone(), node.clone())), + } } pub fn is_recursive_type_for(env: &Rc, node: &Rc) -> bool { match node.ident.clone() { - Some(id) => is_recursive_type(env.clone(), id.clone()), - None => is_recursive_type_by_name(&env, authored_name(env.clone(), node.clone())), -} + Some(id) => is_recursive_type(env.clone(), id.clone()), + None => is_recursive_type_by_name(&env, authored_name(env.clone(), node.clone())), + } } pub fn inductive_fields_for(env: Rc, type_name: String) -> Rc>> { match v2_rt::map_get(&env.inductive_fields.clone(), type_name) { - Some(fields) => fields.clone(), - None => Rc::new(vec![]), -} + Some(fields) => fields.clone(), + None => Rc::new(vec![]), + } } -pub fn is_inductive_field(env: Rc, type_name: String, variant_name: String, field_name: String) -> bool { - { let mut __found = false; for f in inductive_fields_for(env, type_name).iter().cloned() { if ((f.variant_name.clone().as_str() == variant_name.clone().as_str()) && (f.field_name.clone().as_str() == field_name.clone().as_str())) { __found = true; break; } } __found } +pub fn is_inductive_field( + env: Rc, + type_name: String, + variant_name: String, + field_name: String, +) -> bool { + { + let mut __found = false; + for f in inductive_fields_for(env, type_name).iter().cloned() { + if ((f.variant_name.clone().as_str() == variant_name.clone().as_str()) + && (f.field_name.clone().as_str() == field_name.clone().as_str())) + { + __found = true; + break; + } + } + __found + } } -pub fn put_inductive_field(fields: &Rc>>>>, type_name: &String, variant_name: String, field_name: String, shape: RecursionShape) -> Rc>>>> { +pub fn put_inductive_field( + fields: &Rc>>>>, + type_name: &String, + variant_name: String, + field_name: String, + shape: RecursionShape, +) -> Rc>>>> { { let existing = match v2_rt::map_get(&fields, type_name.clone()) { - Some(fs) => fs.clone(), - None => Rc::new(vec![]), -}; -v2_rt::rc_map_insert(fields.clone(), type_name.clone(), v2_rt::concat(existing, Rc::new(vec![Rc::new(InductiveField { - type_name: type_name.clone(), - variant_name: variant_name, - field_name: field_name, - shape: shape, - element_type: type_name.clone(), -})]))) -} + Some(fs) => fs.clone(), + None => Rc::new(vec![]), + }; + v2_rt::rc_map_insert( + fields.clone(), + type_name.clone(), + v2_rt::concat( + existing, + Rc::new(vec![Rc::new(InductiveField { + type_name: type_name.clone(), + variant_name: variant_name, + field_name: field_name, + shape: shape, + element_type: type_name.clone(), + })]), + ), + ) + } } -pub fn put_inductive_field_cross(fields: &Rc>>>>, type_name: &String, variant_name: String, field_name: String, shape: RecursionShape, element_type: String) -> Rc>>>> { +pub fn put_inductive_field_cross( + fields: &Rc>>>>, + type_name: &String, + variant_name: String, + field_name: String, + shape: RecursionShape, + element_type: String, +) -> Rc>>>> { { let existing = match v2_rt::map_get(&fields, type_name.clone()) { - Some(fs) => fs.clone(), - None => Rc::new(vec![]), -}; -v2_rt::rc_map_insert(fields.clone(), type_name.clone(), v2_rt::concat(existing, Rc::new(vec![Rc::new(InductiveField { - type_name: type_name.clone(), - variant_name: variant_name, - field_name: field_name, - shape: shape, - element_type: element_type, -})]))) -} -} - -pub fn merge_inductive_fields(left: Rc>>>>, right: &Rc>>>>) -> Rc>>>> { - Rc::new(v2_rt::map_keys(&right)).iter().cloned().fold(left.clone(), |acc: Rc>>>>, type_name: String| match v2_rt::map_get(&right, type_name.clone()) { - Some(incoming) => { - let existing = match v2_rt::map_get(&acc, type_name.clone()) { - Some(fs) => fs.clone(), - None => Rc::new(vec![]), -}; -v2_rt::rc_map_insert(acc.clone(), type_name.clone(), v2_rt::concat(existing.clone(), incoming.clone())) -}, - None => acc.clone(), -}) + Some(fs) => fs.clone(), + None => Rc::new(vec![]), + }; + v2_rt::rc_map_insert( + fields.clone(), + type_name.clone(), + v2_rt::concat( + existing, + Rc::new(vec![Rc::new(InductiveField { + type_name: type_name.clone(), + variant_name: variant_name, + field_name: field_name, + shape: shape, + element_type: element_type, + })]), + ), + ) + } } -pub fn inductive_fields_list_to_map(fields: Rc>>) -> Rc>>>> { - fields.iter().cloned().fold(v2_rt::rc_empty_map::>>>(), |acc: Rc>>>>, field: Rc| { - let existing = match v2_rt::map_get(&acc, field.type_name.clone()) { - Some(fs) => fs.clone(), - None => Rc::new(vec![]), -}; -v2_rt::rc_map_insert(acc.clone(), field.type_name.clone(), v2_rt::concat(existing.clone(), Rc::new(vec![field.clone()]))) -}) +pub fn merge_inductive_fields( + left: Rc>>>>, + right: &Rc>>>>, +) -> Rc>>>> { + Rc::new(v2_rt::map_keys(&right)).iter().cloned().fold( + left.clone(), + |acc: Rc>>>>, type_name: String| { + match v2_rt::map_get(&right, type_name.clone()) { + Some(incoming) => { + let existing = match v2_rt::map_get(&acc, type_name.clone()) { + Some(fs) => fs.clone(), + None => Rc::new(vec![]), + }; + v2_rt::rc_map_insert( + acc.clone(), + type_name.clone(), + v2_rt::concat(existing.clone(), incoming.clone()), + ) + } + None => acc.clone(), + } + }, + ) +} + +pub fn inductive_fields_list_to_map( + fields: Rc>>, +) -> Rc>>>> { + fields.iter().cloned().fold( + v2_rt::rc_empty_map::>>>(), + |acc: Rc>>>>, field: Rc| { + let existing = match v2_rt::map_get(&acc, field.type_name.clone()) { + Some(fs) => fs.clone(), + None => Rc::new(vec![]), + }; + v2_rt::rc_map_insert( + acc.clone(), + field.type_name.clone(), + v2_rt::concat(existing.clone(), Rc::new(vec![field.clone()])), + ) + }, + ) } pub fn merge_envs(envs: &Rc>>) -> Rc { { - let merged_bindings = envs.clone().iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, env: Rc| v2_rt::rc_map_merge(acc, env.bindings.clone())); -let merged_recursive = envs.clone().iter().cloned().fold(Rc::new(vec![]), |acc: _, env: Rc| v2_rt::concat(acc, env.recursive_types.clone())); -let merged_recursive_set = envs.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, env: Rc| v2_rt::rc_map_merge(acc, env.recursive_type_set.clone())); -let merged_inductive_fields = envs.clone().iter().cloned().fold(v2_rt::rc_empty_map::>>>(), |acc: Rc>>>>, env: Rc| merge_inductive_fields(acc, &env.inductive_fields.clone())); -let merged_source_indices = envs.clone().iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, env: Rc| v2_rt::rc_map_merge(acc, env.source_indices.clone())); -let merged_intern_table = match envs.clone().first().cloned() { - Some(first_env) => first_env.intern_table.clone(), - None => empty_intern_table(), -}; -Rc::new(TypeEnv { - bindings: merged_bindings, - recursive_types: merged_recursive, - recursive_type_set: merged_recursive_set, - inductive_fields: merged_inductive_fields, - source_indices: merged_source_indices, - intern_table: merged_intern_table, -}) -} + let merged_bindings = envs.clone().iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, env: Rc| { + v2_rt::rc_map_merge(acc, env.bindings.clone()) + }, + ); + let merged_recursive = envs + .clone() + .iter() + .cloned() + .fold(Rc::new(vec![]), |acc: _, env: Rc| { + v2_rt::concat(acc, env.recursive_types.clone()) + }); + let merged_recursive_set = envs.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, env: Rc| { + v2_rt::rc_map_merge(acc, env.recursive_type_set.clone()) + }, + ); + let merged_inductive_fields = envs.clone().iter().cloned().fold( + v2_rt::rc_empty_map::>>>(), + |acc: Rc>>>>, env: Rc| { + merge_inductive_fields(acc, &env.inductive_fields.clone()) + }, + ); + let merged_source_indices = envs.clone().iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, env: Rc| { + v2_rt::rc_map_merge(acc, env.source_indices.clone()) + }, + ); + let merged_intern_table = match envs.clone().first().cloned() { + Some(first_env) => first_env.intern_table.clone(), + None => empty_intern_table(), + }; + Rc::new(TypeEnv { + bindings: merged_bindings, + recursive_types: merged_recursive, + recursive_type_set: merged_recursive_set, + inductive_fields: merged_inductive_fields, + source_indices: merged_source_indices, + intern_table: merged_intern_table, + }) + } } diff --git a/src/v2/stage0/src/v2_compiler_infer_items.rs b/src/v2/stage0/src/v2_compiler_infer_items.rs index 774ee8dfc9e..59c2ce01482 100644 --- a/src/v2/stage0/src/v2_compiler_infer_items.rs +++ b/src/v2/stage0/src/v2_compiler_infer_items.rs @@ -1,23 +1,27 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_items -use std::collections::HashMap; -use std::rc::Rc; +use self::ItemKind::*; +pub use crate::std_induction::SubValueRelation; +use crate::std_induction::SubValueRelation::SubValueUnknown; +pub use crate::std_types::SourceSpan; +pub use crate::v2_compiler_infer_emit_info::EmitGraphInfo; +pub use crate::v2_compiler_infer_env::{TypeBinding, TypeEnv}; +pub use crate::v2_compiler_infer_sigs::ResolvedFuncEnv; +pub use crate::v2_compiler_infer_types::child_type_node; use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::std_types::{SourceSpan}; -pub use crate::v2_std_core::{Node, ErrorNode, make_param_node, param_node_name_at, param_node_type_expr, make_field_node, InferredNode, Cardinality, expr_has_self_call, expr_has_non_tail_self_call, Connective, node_name_span, no_span, NewlineIndex, authored_name_at}; -use crate::v2_std_core::InferredNode::{Resolved, CompilerError, TypeVariable}; -use crate::v2_std_core::Cardinality::{Required}; +use crate::v2_std_core::Cardinality::Required; use crate::v2_std_core::Connective::{Conj, Disj, NoConnective}; -pub use crate::v2_compiler_infer_types::{child_type_node}; -pub use crate::std_induction::{SubValueRelation}; -use crate::std_induction::SubValueRelation::{SubValueUnknown}; -pub use crate::v2_compiler_infer_env::{TypeEnv, TypeBinding}; -pub use crate::v2_compiler_infer_sigs::{ResolvedFuncEnv}; -pub use crate::v2_compiler_infer_emit_info::{EmitGraphInfo}; -use self::ItemKind::*; +use crate::v2_std_core::InferredNode::{CompilerError, Resolved, TypeVariable}; +pub use crate::v2_std_core::{ + authored_name_at, expr_has_non_tail_self_call, expr_has_self_call, make_field_node, + make_param_node, no_span, node_name_span, param_node_name_at, param_node_type_expr, + Cardinality, Connective, ErrorNode, InferredNode, NewlineIndex, Node, +}; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] @@ -66,46 +70,92 @@ pub struct ResolvedGraph { pub emit_graph_info: Rc, } -pub fn inferred_to_outputs(inferred: &Option>, span: Rc, source_indices: Rc>>) -> Rc>> { +pub fn inferred_to_outputs( + inferred: &Option>, + span: Rc, + source_indices: Rc>>, +) -> Rc>> { if (inferred.clone() == None) { Rc::new(vec![]) } else { match (*inferred.clone().unwrap()).clone() { - InferredNode::CompilerError { .. } => Rc::new(vec![]), - InferredNode::TypeVariable { .. } => Rc::new(vec![]), - InferredNode::Resolved { node: rt, .. } => { - let has_structure = (rt.connective.clone() != Connective::NoConnective); -if has_structure { - { - let is_product = (rt.connective.clone() == Connective::Conj); -if is_product { - if (rt.ident_span.clone() == None) { - Rc::new({ let mut __result = Vec::new(); for child in rt.children.clone().iter().cloned() { __result.push({ - let child_type = child_type_node(&child); -make_field_node(&authored_name_at(source_indices.clone(), &child), child_type.clone(), Cardinality::Required, None, None, span.clone(), node_name_span(&child)) -}); } __result }) + InferredNode::CompilerError { .. } => Rc::new(vec![]), + InferredNode::TypeVariable { .. } => Rc::new(vec![]), + InferredNode::Resolved { node: rt, .. } => { + let has_structure = (rt.connective.clone() != Connective::NoConnective); + if has_structure { + { + let is_product = (rt.connective.clone() == Connective::Conj); + if is_product { + if (rt.ident_span.clone() == None) { + Rc::new({ + let mut __result = Vec::new(); + for child in rt.children.clone().iter().cloned() { + __result.push({ + let child_type = child_type_node(&child); + make_field_node( + &authored_name_at(source_indices.clone(), &child), + child_type.clone(), + Cardinality::Required, + None, + None, + span.clone(), + node_name_span(&child), + ) + }); + } + __result + }) + } else { + Rc::new(vec![make_field_node( + &"value".to_string(), + rt.clone(), + Cardinality::Required, + None, + None, + span.clone(), + no_span(), + )]) + } } else { - Rc::new(vec![make_field_node(&"value".to_string(), rt.clone(), Cardinality::Required, None, None, span.clone(), no_span())]) + Rc::new(vec![make_field_node( + &"value".to_string(), + rt.clone(), + Cardinality::Required, + None, + None, + span.clone(), + no_span(), + )]) } - } else { - Rc::new(vec![make_field_node(&"value".to_string(), rt.clone(), Cardinality::Required, None, None, span.clone(), no_span())]) } -} - } else { - if ((rt.connective.clone() == Connective::Conj) && ((rt.children.clone().len() as i64) == 0)) { - Rc::new(vec![]) } else { - Rc::new(vec![make_field_node(&"value".to_string(), rt.clone(), Cardinality::Required, None, None, span.clone(), no_span())]) + if ((rt.connective.clone() == Connective::Conj) + && ((rt.children.clone().len() as i64) == 0)) + { + Rc::new(vec![]) + } else { + Rc::new(vec![make_field_node( + &"value".to_string(), + rt.clone(), + Cardinality::Required, + None, + None, + span.clone(), + no_span(), + )]) + } } } -}, -} + } } } pub fn item_kind(item: &Rc) -> ItemKind { { - let kind = if ((item.connective.clone() != Connective::NoConnective) && (item.transport.clone() == None)) { + let kind = if ((item.connective.clone() != Connective::NoConnective) + && (item.transport.clone() == None)) + { ItemKind::TypeItem } else { if (item.transport.clone() != None) { @@ -130,24 +180,38 @@ pub fn item_kind(item: &Rc) -> ItemKind { } } }; -kind -} + kind + } } -pub fn variant_locals_from_items(items: Rc>>, init: Rc>>, source_indices: Rc>>) -> Rc>> { - items.iter().cloned().fold(init, |acc: Rc>>, item: Rc| { - let is_coproduct = (item.connective.clone() == Connective::Disj); -if is_coproduct.clone() { - item.children.clone().iter().cloned().fold(acc.clone(), |vacc: Rc>>, child: Rc| { - let child_name = authored_name_at(source_indices.clone(), &child); -v2_rt::rc_map_insert(vacc, child_name.clone(), Rc::new(TypeBinding { - name: child_name.clone(), - resolved: item.clone(), - provenance: Rc::new(SubValueRelation::SubValueUnknown), -})) -}) - } else { - acc.clone() - } -}) +pub fn variant_locals_from_items( + items: Rc>>, + init: Rc>>, + source_indices: Rc>>, +) -> Rc>> { + items.iter().cloned().fold( + init, + |acc: Rc>>, item: Rc| { + let is_coproduct = (item.connective.clone() == Connective::Disj); + if is_coproduct.clone() { + item.children.clone().iter().cloned().fold( + acc.clone(), + |vacc: Rc>>, child: Rc| { + let child_name = authored_name_at(source_indices.clone(), &child); + v2_rt::rc_map_insert( + vacc, + child_name.clone(), + Rc::new(TypeBinding { + name: child_name.clone(), + resolved: item.clone(), + provenance: Rc::new(SubValueRelation::SubValueUnknown), + }), + ) + }, + ) + } else { + acc.clone() + } + }, + ) } diff --git a/src/v2/stage0/src/v2_compiler_infer_lookup.rs b/src/v2/stage0/src/v2_compiler_infer_lookup.rs index 4791a5cb760..9b5cdb6a1fc 100644 --- a/src/v2/stage0/src/v2_compiler_infer_lookup.rs +++ b/src/v2/stage0/src/v2_compiler_infer_lookup.rs @@ -1,34 +1,53 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_lookup -use std::collections::HashMap; -use std::rc::Rc; -use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::v2_std_core::{Node, param_node_type_expr, authored_name_at, NewlineIndex, find_child_named, has_child_named, InferredNode, Cardinality, MethodSemantics, FieldAccessStyle, FieldValueShape, FieldSummary, with_optional_cardinality, with_required_cardinality, Connective, ErrorNode}; -use crate::v2_std_core::InferredNode::{Resolved, TypeVariable}; -use crate::v2_std_core::Cardinality::{Required, CardOptional}; -use crate::v2_std_core::MethodSemantics::{PlainMethodSemantics, AlgebraMethodSemantics, ServiceMethodSemantics}; -use crate::v2_std_core::FieldAccessStyle::{OptionalUnwrap}; -use crate::v2_std_core::FieldValueShape::{PlainValue, OptionalValue}; -use crate::v2_std_core::Connective::{Conj, Disj, NoConnective}; -pub use crate::std_algebra::{CollectionSizeEffect, CostShape, AlgebraFieldTemplate, AlgebraTypeTemplate, ContainerSource, kernel_algebra_profile, algebra_templates_for_profile}; -use crate::std_algebra::AlgebraTypeTemplate::{ReceiverSelf, ContainerOf}; -use crate::std_algebra::ContainerSource::{SameAsReceiver, Named}; +use crate::std_algebra::AlgebraTypeTemplate::{ContainerOf, ReceiverSelf}; use crate::std_algebra::CollectionSizeEffect::*; +use crate::std_algebra::ContainerSource::{Named, SameAsReceiver}; use crate::std_algebra::CostShape::*; -pub use crate::v2_compiler_infer_types::{child_type_node, nominal_type_ref, normalize_access_type_node, node_is_keyed_collection, node_is_set_collection, method_receiver_element_node, emit_map_has, enrich_kernel_type}; -pub use crate::v2_compiler_infer_env::{TypeEnv, TypeBinding, authored_name, is_recursive_type, lookup_type, lookup_type_for}; -pub use crate::v2_compiler_infer_emit_info::{build_struct_field_summaries, build_enum_field_summaries}; -pub use crate::v2_compiler_infer_sigs::{ResolvedFuncSig, ResolvedFuncEnv}; -pub use crate::v2_compiler_infer_service::{OpEntry, ServiceMethodResult, check_service_method_call_node}; +pub use crate::std_algebra::{ + algebra_templates_for_profile, kernel_algebra_profile, AlgebraFieldTemplate, + AlgebraTypeTemplate, CollectionSizeEffect, ContainerSource, CostShape, +}; +pub use crate::v2_compiler_infer_emit_info::{ + build_enum_field_summaries, build_struct_field_summaries, +}; +pub use crate::v2_compiler_infer_env::{ + authored_name, is_recursive_type, lookup_type, lookup_type_for, TypeBinding, TypeEnv, +}; +pub use crate::v2_compiler_infer_service::{ + check_service_method_call_node, OpEntry, ServiceMethodResult, +}; +pub use crate::v2_compiler_infer_sigs::{ResolvedFuncEnv, ResolvedFuncSig}; +pub use crate::v2_compiler_infer_types::{ + child_type_node, emit_map_has, enrich_kernel_type, method_receiver_element_node, + node_is_keyed_collection, nominal_type_ref, normalize_access_type_node, +}; +use crate::v2_rt; +use crate::v2_std_core::Cardinality::{CardOptional, Required}; +use crate::v2_std_core::Connective::{Conj, Disj, NoConnective}; +use crate::v2_std_core::FieldAccessStyle::OptionalUnwrap; +use crate::v2_std_core::FieldValueShape::{OptionalValue, PlainValue}; +use crate::v2_std_core::InferredNode::{Resolved, TypeVariable}; +use crate::v2_std_core::MethodSemantics::{ + AlgebraMethodSemantics, PlainMethodSemantics, ServiceMethodSemantics, +}; +pub use crate::v2_std_core::{ + authored_name_at, find_child_named, has_child_named, param_node_type_expr, + with_optional_cardinality, with_required_cardinality, Cardinality, Connective, ErrorNode, + FieldAccessStyle, FieldSummary, FieldValueShape, InferredNode, MethodSemantics, NewlineIndex, + Node, +}; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn is_type_variable(inferred: Rc) -> bool { match (*inferred).clone() { - InferredNode::TypeVariable { .. } => true, - _ => false, -} + InferredNode::TypeVariable { .. } => true, + _ => false, + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -38,237 +57,296 @@ pub struct KnownMethodResolution { pub diagnostics: Rc>>, } -pub fn lookup_in_scope(locals: Rc>>, name: String) -> Option> { +pub fn lookup_in_scope( + locals: Rc>>, + name: String, +) -> Option> { match v2_rt::map_get(&locals, name) { - Some(binding) => Some(binding.resolved.clone()), - None => None, -} + Some(binding) => Some(binding.resolved.clone()), + None => None, + } } pub fn lookup_func_sig(func_env: Rc, name: String) -> Option> { v2_rt::map_get(&func_env.signatures.clone(), name) } -pub fn lookup_field_type_node(n: &Rc, field_name: &String, source_indices: Rc>>) -> Option> { +pub fn lookup_field_type_node( + n: &Rc, + field_name: &String, + source_indices: Rc>>, +) -> Option> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); -if is_optional { - { - let inner = with_required_cardinality(&n); -if (field_name.clone().as_str() == "value".to_string().as_str()) { - Some(inner) - } else { - match lookup_field_type_node(&inner, &field_name, source_indices) { - Some(inner_result) => Some(with_optional_cardinality(&inner_result)), - None => None, -} + let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); + if is_optional { + { + let inner = with_required_cardinality(&n); + if (field_name.clone().as_str() == "value".to_string().as_str()) { + Some(inner) + } else { + match lookup_field_type_node(&inner, &field_name, source_indices) { + Some(inner_result) => Some(with_optional_cardinality(&inner_result)), + None => None, } -} - } else { - { - let has_structure = (n.connective.clone() != Connective::NoConnective); -if has_structure { - { - let is_product = (n.connective.clone() == Connective::Conj); -if is_product { - match find_child_named(n.clone(), field_name.clone(), source_indices) { - Some(field_child) => Some(child_type_node(&field_child)), - None => None, -} - } else { - lookup_coproduct_common_field_node(&n.children.clone(), &field_name, &source_indices) + } + } + } else { + { + let has_structure = (n.connective.clone() != Connective::NoConnective); + if has_structure { + { + let is_product = (n.connective.clone() == Connective::Conj); + if is_product { + match find_child_named(n.clone(), field_name.clone(), source_indices) { + Some(field_child) => Some(child_type_node(&field_child)), + None => None, } -} - } else { - None + } else { + lookup_coproduct_common_field_node( + &n.children.clone(), + &field_name, + &source_indices, + ) + } } -} + } else { + None + } } -} + } }) } -pub fn lookup_coproduct_common_field_node(variants: &Rc>>, field_name: &String, source_indices: &Rc>>) -> Option> { +pub fn lookup_coproduct_common_field_node( + variants: &Rc>>, + field_name: &String, + source_indices: &Rc>>, +) -> Option> { { - let found_in_all = { let mut __all = true; for v in variants.clone().iter().cloned() { if !(has_child_named(v.clone(), field_name.clone(), source_indices.clone())) { __all = false; break; } } __all }; -let first_field = if found_in_all { + let found_in_all = { + let mut __all = true; + for v in variants.clone().iter().cloned() { + if !(has_child_named(v.clone(), field_name.clone(), source_indices.clone())) { + __all = false; + break; + } + } + __all + }; + let first_field = if found_in_all { match variants.clone().first().cloned() { - Some(first_variant) => find_child_named(first_variant.clone(), field_name.clone(), source_indices.clone()), - None => None, -} + Some(first_variant) => find_child_named( + first_variant.clone(), + field_name.clone(), + source_indices.clone(), + ), + None => None, + } } else { None }; -match first_field { - Some(field_child) => Some(child_type_node(&field_child)), - None => None, -} -} + match first_field { + Some(field_child) => Some(child_type_node(&field_child)), + None => None, + } + } } pub fn resolve_scrutinee_type_node(env: Rc, n: Rc) -> Rc { resolve_scrutinee_type_node_seen(&env, n, &v2_rt::rc_empty_map::()) } -pub fn resolve_scrutinee_type_node_seen(env: &Rc, n: Rc, seen: &Rc>) -> Rc { +pub fn resolve_scrutinee_type_node_seen( + env: &Rc, + n: Rc, + seen: &Rc>, +) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { + let n_is_type_var = if (n.inferred.clone() != None) { + is_type_variable(n.inferred.clone().clone().unwrap()) + } else { + false + }; + if n_is_type_var { + return n.clone(); + } + let normed = normalize_access_type_node(n.clone()); + if ((normed.connective.clone() == Connective::NoConnective) + && ((normed.children.clone().len() as i64) == 0)) { - let n_is_type_var = if (n.inferred.clone() != None) { - is_type_variable(n.inferred.clone().clone().unwrap()) - } else { - false - }; -if n_is_type_var { - return n.clone() - } -let normed = normalize_access_type_node(n.clone()); -if ((normed.connective.clone() == Connective::NoConnective) && ((normed.children.clone().len() as i64) == 0)) { - { - let canonical = authored_name(env.clone(), normed.clone()); -if (normed.inferred.clone() != None) { - { - let next_seen = if (canonical.clone().as_str() == "".to_string().as_str()) { - seen.clone() - } else { - v2_rt::rc_map_insert(seen.clone(), canonical.clone(), true) - }; -match normed.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: target, .. }) => if ((((authored_name(env.clone(), target.clone()).as_str() == canonical.clone().as_str()) && (target.inferred.clone() == None)) && (target.connective.clone() == Connective::NoConnective)) && ((target.children.clone().len() as i64) == 0)) { - normed.clone() - } else { - resolve_scrutinee_type_node_seen(&env, target.clone(), &next_seen) - }, - _ => normed.clone(), -} -} - } else { - if ((canonical.clone().as_str() != "".to_string().as_str()) && emit_map_has(seen.clone(), canonical.clone())) { - nominal_type_ref(&canonical) + { + let canonical = authored_name(env.clone(), normed.clone()); + if (normed.inferred.clone() != None) { + { + let next_seen = if (canonical.clone().as_str() == "".to_string().as_str()) { + seen.clone() } else { - { - let next_seen = if (canonical.clone().as_str() == "".to_string().as_str()) { + v2_rt::rc_map_insert(seen.clone(), canonical.clone(), true) + }; + match normed.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: target, .. }) => { + if ((((authored_name(env.clone(), target.clone()).as_str() + == canonical.clone().as_str()) + && (target.inferred.clone() == None)) + && (target.connective.clone() == Connective::NoConnective)) + && ((target.children.clone().len() as i64) == 0)) + { + normed.clone() + } else { + resolve_scrutinee_type_node_seen( + &env, + target.clone(), + &next_seen, + ) + } + } + _ => normed.clone(), + } + } + } else { + if ((canonical.clone().as_str() != "".to_string().as_str()) + && emit_map_has(seen.clone(), canonical.clone())) + { + nominal_type_ref(&canonical) + } else { + { + let next_seen = + if (canonical.clone().as_str() == "".to_string().as_str()) { seen.clone() } else { v2_rt::rc_map_insert(seen.clone(), canonical.clone(), true) }; -match lookup_type_for(&env, &normed) { - Some(resolved) => if ((((authored_name(env.clone(), resolved.clone()).as_str() == canonical.clone().as_str()) && (resolved.inferred.clone() == None)) && (resolved.connective.clone() == Connective::NoConnective)) && ((resolved.children.clone().len() as i64) == 0)) { - normed.clone() - } else { + match lookup_type_for(&env, &normed) { + Some(resolved) => { + if ((((authored_name(env.clone(), resolved.clone()).as_str() + == canonical.clone().as_str()) + && (resolved.inferred.clone() == None)) + && (resolved.connective.clone() + == Connective::NoConnective)) + && ((resolved.children.clone().len() as i64) == 0)) { - let result = resolve_scrutinee_type_node_seen(&env, resolved.clone(), &next_seen); -let is_optional = (normed.return_cardinality.clone() == Cardinality::CardOptional); -if is_optional { - with_optional_cardinality(&result) - } else { - result + normed.clone() + } else { + { + let result = resolve_scrutinee_type_node_seen( + &env, + resolved.clone(), + &next_seen, + ); + let is_optional = (normed.return_cardinality.clone() + == Cardinality::CardOptional); + if is_optional { + with_optional_cardinality(&result) + } else { + result + } } -} - }, - None => normed.clone(), -} -} + } + } + None => normed.clone(), + } } } -} - } else { - normed.clone() + } } -} + } else { + normed.clone() + } }) } pub fn map_value_type_in_env(type_node: Rc, env: &Rc) -> Option> { { let normed = normalize_access_type_node(type_node); -let resolved = resolve_scrutinee_type_node(env.clone(), normed); -let map_type = normalize_access_type_node(resolved); -if (node_is_keyed_collection(&map_type, env.source_indices.clone()) && ((map_type.children.clone().len() as i64) >= 2)) { + let resolved = resolve_scrutinee_type_node(env.clone(), normed); + let map_type = normalize_access_type_node(resolved); + if (node_is_keyed_collection(&map_type, env.source_indices.clone()) + && ((map_type.children.clone().len() as i64) >= 2)) + { match map_type.children.clone().get(1 as usize).cloned() { - Some(value_type) => Some(value_type.clone()), - None => None, -} + Some(value_type) => Some(value_type.clone()), + None => None, + } } else { None } -} + } } pub fn map_key_type_in_env(type_node: Rc, env: &Rc) -> Option> { { let normed = normalize_access_type_node(type_node); -let resolved = resolve_scrutinee_type_node(env.clone(), normed); -let map_type = normalize_access_type_node(resolved); -if (node_is_keyed_collection(&map_type, env.source_indices.clone()) && ((map_type.children.clone().len() as i64) >= 1)) { + let resolved = resolve_scrutinee_type_node(env.clone(), normed); + let map_type = normalize_access_type_node(resolved); + if (node_is_keyed_collection(&map_type, env.source_indices.clone()) + && ((map_type.children.clone().len() as i64) >= 1)) + { match map_type.children.clone().first().cloned() { - Some(key_type) => Some(key_type.clone()), - None => None, -} - } else { - None - } -} -} - -pub fn set_element_type_in_env(type_node: Rc, env: &Rc) -> Option> { - { - let normed = normalize_access_type_node(type_node); -let resolved = resolve_scrutinee_type_node(env.clone(), normed); -let set_type = normalize_access_type_node(resolved); -if (node_is_set_collection(&set_type, &env.source_indices.clone()) && ((set_type.children.clone().len() as i64) >= 1)) { - match set_type.children.clone().first().cloned() { - Some(elem_type) => Some(elem_type.clone()), - None => None, -} + Some(key_type) => Some(key_type.clone()), + None => None, + } } else { None } -} + } } -pub fn field_summary_for_type(base_type: Rc, env: &Rc, field: &String) -> Option> { +pub fn field_summary_for_type( + base_type: Rc, + env: &Rc, + field: &String, +) -> Option> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let resolved = resolve_scrutinee_type_node(env.clone(), base_type); -let normed = normalize_access_type_node(resolved.clone()); -let normed_opt = (normed.return_cardinality.clone() == Cardinality::CardOptional); -if ((field.clone().as_str() == "value".to_string().as_str()) && normed_opt.clone()) { - Some(Rc::new(FieldSummary { - access_style: FieldAccessStyle::OptionalUnwrap, - value_shape: FieldValueShape::PlainValue, -})) + let resolved = resolve_scrutinee_type_node(env.clone(), base_type); + let normed = normalize_access_type_node(resolved.clone()); + let normed_opt = (normed.return_cardinality.clone() == Cardinality::CardOptional); + if ((field.clone().as_str() == "value".to_string().as_str()) && normed_opt.clone()) { + Some(Rc::new(FieldSummary { + access_style: FieldAccessStyle::OptionalUnwrap, + value_shape: FieldValueShape::PlainValue, + })) + } else { + if normed_opt.clone() { + { + let inner = with_required_cardinality(&normed); + match field_summary_for_type(inner, &env, &field) { + Some(inner_summary) => Some(Rc::new(FieldSummary { + access_style: inner_summary.access_style.clone(), + value_shape: FieldValueShape::OptionalValue, + })), + None => None, + } + } } else { - if normed_opt.clone() { - { - let inner = with_required_cardinality(&normed); -match field_summary_for_type(inner, &env, &field) { - Some(inner_summary) => Some(Rc::new(FieldSummary { - access_style: inner_summary.access_style.clone(), - value_shape: FieldValueShape::OptionalValue, -})), - None => None, -} -} - } else { - { - let no_structure = (resolved.connective.clone() == Connective::NoConnective); -if no_structure { - None - } else { - { - let is_product = (resolved.connective.clone() == Connective::Conj); -if is_product { - v2_rt::map_get(&build_struct_field_summaries(&resolved, env.source_indices.clone()), field.clone()) - } else { - v2_rt::map_get(&build_enum_field_summaries(&resolved.children.clone(), env.source_indices.clone()), field.clone()) - } -} + { + let no_structure = (resolved.connective.clone() == Connective::NoConnective); + if no_structure { + None + } else { + { + let is_product = (resolved.connective.clone() == Connective::Conj); + if is_product { + v2_rt::map_get( + &build_struct_field_summaries( + &resolved, + env.source_indices.clone(), + ), + field.clone(), + ) + } else { + v2_rt::map_get( + &build_enum_field_summaries( + &resolved.children.clone(), + env.source_indices.clone(), + ), + field.clone(), + ) + } } -} + } } } -} + } }) } @@ -287,136 +365,199 @@ pub struct StructuralMethodLookup { pub kernel_diagnostics: Rc>>, } -pub fn lookup_field_in_product(product: Rc, method_name: String, source_indices: Rc>>) -> Option> { +pub fn lookup_field_in_product( + product: Rc, + method_name: String, + source_indices: Rc>>, +) -> Option> { { - let matching = Rc::new({ let mut __result = Vec::new(); for c in product.children.clone().iter().cloned() { if (authored_name_at(source_indices.clone(), &c).as_str() == method_name.clone().as_str()) { __result.push(c); } } __result }); -match matching.first().cloned() { - Some(field) => match field.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => if ((rt.params.clone().len() as i64) > 0) { - match rt.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: return_type, .. }) => Some(Rc::new(MethodFieldResult { - field_node: field.clone(), - result_type: return_type.clone(), - size_effect: None, - cost_shape: None, - algebra_template: None, -})), - _ => Some(Rc::new(MethodFieldResult { - field_node: field.clone(), - result_type: rt.clone(), - size_effect: None, - cost_shape: None, - algebra_template: None, -})), -} - } else { - Some(Rc::new(MethodFieldResult { - field_node: field.clone(), - result_type: rt.clone(), - size_effect: None, - cost_shape: None, - algebra_template: None, -})) - }, - _ => None, -}, - None => None, -} -} + let matching = Rc::new({ + let mut __result = Vec::new(); + for c in product.children.clone().iter().cloned() { + if (authored_name_at(source_indices.clone(), &c).as_str() + == method_name.clone().as_str()) + { + __result.push(c); + } + } + __result + }); + match matching.first().cloned() { + Some(field) => match field.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + if ((rt.params.clone().len() as i64) > 0) { + match rt.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { + node: return_type, .. + }) => Some(Rc::new(MethodFieldResult { + field_node: field.clone(), + result_type: return_type.clone(), + size_effect: None, + cost_shape: None, + algebra_template: None, + })), + _ => Some(Rc::new(MethodFieldResult { + field_node: field.clone(), + result_type: rt.clone(), + size_effect: None, + cost_shape: None, + algebra_template: None, + })), + } + } else { + Some(Rc::new(MethodFieldResult { + field_node: field.clone(), + result_type: rt.clone(), + size_effect: None, + cost_shape: None, + algebra_template: None, + })) + } + } + _ => None, + }, + None => None, + } + } } -pub fn lookup_structural_method(receiver_type: &Rc, method_name: &String, source_indices: &Rc>>) -> Rc { +pub fn lookup_structural_method( + receiver_type: &Rc, + method_name: &String, + source_indices: &Rc>>, +) -> Rc { { let is_product = (receiver_type.connective.clone() == Connective::Conj); -if is_product { + if is_product { { - let direct = lookup_field_in_product(receiver_type.clone(), method_name.clone(), source_indices.clone()); -Rc::new(StructuralMethodLookup { - resolution: direct, - kernel_diagnostics: Rc::new(vec![]), -}) -} + let direct = lookup_field_in_product( + receiver_type.clone(), + method_name.clone(), + source_indices.clone(), + ); + Rc::new(StructuralMethodLookup { + resolution: direct, + kernel_diagnostics: Rc::new(vec![]), + }) + } } else { { - let enriched = enrich_kernel_type(&authored_name_at(source_indices.clone(), &receiver_type), &receiver_type, source_indices.clone()); -if ((enriched.ty.clone().connective.clone() == Connective::Conj) && ((enriched.ty.clone().children.clone().len() as i64) > 0)) { + let enriched = enrich_kernel_type( + &authored_name_at(source_indices.clone(), &receiver_type), + &receiver_type, + source_indices.clone(), + ); + if ((enriched.ty.clone().connective.clone() == Connective::Conj) + && ((enriched.ty.clone().children.clone().len() as i64) > 0)) + { { - let base_result = lookup_field_in_product(enriched.ty.clone(), method_name.clone(), source_indices.clone()); -match base_result.clone() { - Some(mfr) => { - let profile = v2_rt::map_get(&kernel_algebra_profile(), authored_name_at(source_indices.clone(), &receiver_type)); -let template_match = match profile { - Some(p) => { - let templates = algebra_templates_for_profile(p.clone()); -Rc::new({ let mut __result = Vec::new(); for t in templates.iter().cloned() { if (t.name.clone().as_str() == method_name.clone().as_str()) { __result.push(t); } } __result }).first().cloned() -}, - None => None, -}; -let resolution = match template_match { - Some(t) => Some(Rc::new(MethodFieldResult { - field_node: mfr.field_node.clone(), - result_type: mfr.result_type.clone(), - size_effect: t.size_effect.clone(), - cost_shape: t.cost_shape.clone(), - algebra_template: Some(t.clone()), -})), - None => base_result.clone(), -}; -Rc::new(StructuralMethodLookup { - resolution: resolution, - kernel_diagnostics: enriched.diagnostics.clone(), -}) -}, - None => Rc::new(StructuralMethodLookup { - resolution: None, - kernel_diagnostics: enriched.diagnostics.clone(), -}), -} -} + let base_result = lookup_field_in_product( + enriched.ty.clone(), + method_name.clone(), + source_indices.clone(), + ); + match base_result.clone() { + Some(mfr) => { + let profile = v2_rt::map_get( + &kernel_algebra_profile(), + authored_name_at(source_indices.clone(), &receiver_type), + ); + let template_match = match profile { + Some(p) => { + let templates = algebra_templates_for_profile(p.clone()); + Rc::new({ + let mut __result = Vec::new(); + for t in templates.iter().cloned() { + if (t.name.clone().as_str() + == method_name.clone().as_str()) + { + __result.push(t); + } + } + __result + }) + .first() + .cloned() + } + None => None, + }; + let resolution = match template_match { + Some(t) => Some(Rc::new(MethodFieldResult { + field_node: mfr.field_node.clone(), + result_type: mfr.result_type.clone(), + size_effect: t.size_effect.clone(), + cost_shape: t.cost_shape.clone(), + algebra_template: Some(t.clone()), + })), + None => base_result.clone(), + }; + Rc::new(StructuralMethodLookup { + resolution: resolution, + kernel_diagnostics: enriched.diagnostics.clone(), + }) + } + None => Rc::new(StructuralMethodLookup { + resolution: None, + kernel_diagnostics: enriched.diagnostics.clone(), + }), + } + } } else { Rc::new(StructuralMethodLookup { - resolution: None, - kernel_diagnostics: enriched.diagnostics.clone(), -}) + resolution: None, + kernel_diagnostics: enriched.diagnostics.clone(), + }) } -} + } } -} + } } -pub fn resolve_known_method_node(receiver: Rc, receiver_type: &Rc, method_name: &String, fold_accumulator_type: Option>, service_registry: Rc>>>>, source_indices: &Rc>>) -> Rc { +pub fn resolve_known_method_node( + receiver: Rc, + receiver_type: &Rc, + method_name: &String, + fold_accumulator_type: Option>, + service_registry: Rc>>>>, + source_indices: &Rc>>, +) -> Rc { { let tier0 = lookup_structural_method(&receiver_type, &method_name, &source_indices); -match tier0.resolution.clone() { - Some(mfr) => { - let semantics = Rc::new(MethodSemantics::AlgebraMethodSemantics { - method_def: mfr.field_node.clone(), - fold_accumulator_type: fold_accumulator_type, - size_effect: mfr.size_effect.clone(), - cost_shape: mfr.cost_shape.clone(), - algebra_template: mfr.algebra_template.clone(), -}); -Rc::new(KnownMethodResolution { - semantics: Some(semantics), - result_type: Some(mfr.result_type.clone()), - diagnostics: tier0.kernel_diagnostics.clone(), -}) -}, - None => match check_service_method_call_node(&receiver_type, method_name.clone(), service_registry, source_indices.clone()) { - Some(svc_result) => Rc::new(KnownMethodResolution { - semantics: Some(Rc::new(MethodSemantics::ServiceMethodSemantics { - service_name: authored_name_at(source_indices.clone(), &receiver_type), - op_params: svc_result.op_params.clone(), -})), - result_type: Some(svc_result.result_type.clone()), - diagnostics: tier0.kernel_diagnostics.clone(), -}), - None => Rc::new(KnownMethodResolution { - semantics: None, - result_type: None, - diagnostics: tier0.kernel_diagnostics.clone(), -}), -}, -} -} + match tier0.resolution.clone() { + Some(mfr) => { + let semantics = Rc::new(MethodSemantics::AlgebraMethodSemantics { + method_def: mfr.field_node.clone(), + fold_accumulator_type: fold_accumulator_type, + size_effect: mfr.size_effect.clone(), + cost_shape: mfr.cost_shape.clone(), + algebra_template: mfr.algebra_template.clone(), + }); + Rc::new(KnownMethodResolution { + semantics: Some(semantics), + result_type: Some(mfr.result_type.clone()), + diagnostics: tier0.kernel_diagnostics.clone(), + }) + } + None => match check_service_method_call_node( + &receiver_type, + method_name.clone(), + service_registry, + source_indices.clone(), + ) { + Some(svc_result) => Rc::new(KnownMethodResolution { + semantics: Some(Rc::new(MethodSemantics::ServiceMethodSemantics { + service_name: authored_name_at(source_indices.clone(), &receiver_type), + op_params: svc_result.op_params.clone(), + })), + result_type: Some(svc_result.result_type.clone()), + diagnostics: tier0.kernel_diagnostics.clone(), + }), + None => Rc::new(KnownMethodResolution { + semantics: None, + result_type: None, + diagnostics: tier0.kernel_diagnostics.clone(), + }), + }, + } + } } diff --git a/src/v2/stage0/src/v2_compiler_infer_method.rs b/src/v2/stage0/src/v2_compiler_infer_method.rs index 985628d0f74..a81cb662c63 100644 --- a/src/v2/stage0/src/v2_compiler_infer_method.rs +++ b/src/v2/stage0/src/v2_compiler_infer_method.rs @@ -1,50 +1,58 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_method -use std::collections::HashMap; -use std::rc::Rc; +pub use crate::std_types::SourceSpan; +pub use crate::v2_compiler_infer_types::{make_container_type, make_map_type}; use crate::v2_rt; -use crate::NonEmptyVec; +use crate::v2_std_core::Cardinality::Required; +use crate::v2_std_core::Connective::NoConnective; +use crate::v2_std_core::ExprData::NoExprData; +use crate::v2_std_core::InferredNode::{Resolved, TypeVariable}; +pub use crate::v2_std_core::{ + bool_type, int_type, make_span, string_type, unit_type, with_optional_cardinality, Cardinality, + Connective, ErrorNode, ExprData, InferredNode, Node, +}; use crate::NonEmptyBTreeSet; -pub use crate::std_types::{SourceSpan}; -pub use crate::v2_std_core::{Node, ErrorNode, make_span, with_optional_cardinality, unit_type, bool_type, string_type, int_type, InferredNode, Connective, Cardinality, ExprData}; -use crate::v2_std_core::InferredNode::{TypeVariable, Resolved}; -use crate::v2_std_core::Connective::{NoConnective}; -use crate::v2_std_core::Cardinality::{Required}; -use crate::v2_std_core::ExprData::{NoExprData}; -pub use crate::v2_compiler_infer_types::{make_container_type, make_map_type}; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn type_variable_node(id: String) -> Rc { Rc::new(Node { - name: "".to_string(), - span: make_span(0, 0), - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::TypeVariable { - id: id, -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) + name: "".to_string(), + span: make_span(0, 0), + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::TypeVariable { id: id })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) } pub fn map_of_type_variables() -> Rc { - make_map_type(type_variable_node("map_key".to_string()), type_variable_node("map_value".to_string())).ty.clone() + make_map_type( + type_variable_node("map_key".to_string()), + type_variable_node("map_value".to_string()), + ) + .ty + .clone() } pub fn list_of_type_variable(id: String) -> Rc { - make_container_type(&"List".to_string(), type_variable_node(id)).ty.clone() + make_container_type(&"List".to_string(), type_variable_node(id)) + .ty + .clone() } pub fn list_of_element(element: Rc) -> Rc { @@ -56,46 +64,104 @@ pub fn seed_node_map(key: String, value: Rc) -> Rc Rc>> { - v2_rt::concat(v2_rt::concat(make_map_type(type_variable_node("map_key".to_string()), type_variable_node("map_value".to_string())).diagnostics.clone(), make_container_type(&"List".to_string(), type_variable_node("collection_element".to_string())).diagnostics.clone()), make_container_type(&"Set".to_string(), type_variable_node("set_elem".to_string())).diagnostics.clone()) + v2_rt::concat( + v2_rt::concat( + make_map_type( + type_variable_node("map_key".to_string()), + type_variable_node("map_value".to_string()), + ) + .diagnostics + .clone(), + make_container_type( + &"List".to_string(), + type_variable_node("collection_element".to_string()), + ) + .diagnostics + .clone(), + ), + make_container_type( + &"Set".to_string(), + type_variable_node("set_elem".to_string()), + ) + .diagnostics + .clone(), + ) } pub fn builtin_function_registry() -> Rc>> { { let m = seed_node_map("count".to_string(), int_type()); -let m = v2_rt::rc_map_insert(m.clone(), "string_length".to_string(), int_type()); -let m = v2_rt::rc_map_insert(m.clone(), "code_point".to_string(), int_type()); -let m = v2_rt::rc_map_insert(m.clone(), "to_int".to_string(), int_type()); -let m = v2_rt::rc_map_insert(m.clone(), "scan_while".to_string(), int_type()); -let m = v2_rt::rc_map_insert(m.clone(), "scan_string_end".to_string(), int_type()); -let m = v2_rt::rc_map_insert(m.clone(), "scan_to_eol".to_string(), int_type()); -let m = v2_rt::rc_map_insert(m.clone(), "skip_horizontal_ws".to_string(), int_type()); -let m = v2_rt::rc_map_insert(m.clone(), "parse_int".to_string(), with_optional_cardinality(&int_type())); -let m = v2_rt::rc_map_insert(m.clone(), "char_at".to_string(), string_type()); -let m = v2_rt::rc_map_insert(m.clone(), "substring".to_string(), string_type()); -let m = v2_rt::rc_map_insert(m.clone(), "from_code_point".to_string(), string_type()); -let m = v2_rt::rc_map_insert(m.clone(), "chars_to_string".to_string(), string_type()); -let m = v2_rt::rc_map_insert(m.clone(), "to_string".to_string(), string_type()); -let m = v2_rt::rc_map_insert(m.clone(), "concat".to_string(), string_type()); -let m = v2_rt::rc_map_insert(m.clone(), "map_insert".to_string(), map_of_type_variables()); -let m = v2_rt::rc_map_insert(m.clone(), "map_merge".to_string(), map_of_type_variables()); -let m = v2_rt::rc_map_insert(m.clone(), "with".to_string(), map_of_type_variables()); -let set_ty = make_container_type(&"Set".to_string(), type_variable_node("set_elem".to_string())).ty.clone(); -let m = v2_rt::rc_map_insert(m.clone(), "empty_set".to_string(), set_ty.clone()); -let m = v2_rt::rc_map_insert(m.clone(), "set_insert".to_string(), set_ty.clone()); -let m = v2_rt::rc_map_insert(m.clone(), "set_union".to_string(), set_ty.clone()); -let m = v2_rt::rc_map_insert(m.clone(), "map_contains_key".to_string(), bool_type()); -let m = v2_rt::rc_map_insert(m.clone(), "map_has".to_string(), bool_type()); -let m = v2_rt::rc_map_insert(m.clone(), "emit_map_has".to_string(), bool_type()); -let m = v2_rt::rc_map_insert(m.clone(), "set_contains".to_string(), bool_type()); -let m = v2_rt::rc_map_insert(m.clone(), "lookup".to_string(), with_optional_cardinality(&type_variable_node("map_value".to_string()))); -let m = v2_rt::rc_map_insert(m.clone(), "map_get".to_string(), with_optional_cardinality(&type_variable_node("map_value".to_string()))); -let m = v2_rt::rc_map_insert(m.clone(), "Some".to_string(), with_optional_cardinality(&type_variable_node("some_inner".to_string()))); -let m = v2_rt::rc_map_insert(m.clone(), "map_keys".to_string(), list_of_type_variable("collection_element".to_string())); -let m = v2_rt::rc_map_insert(m.clone(), "map_values".to_string(), list_of_type_variable("collection_element".to_string())); -let m = v2_rt::rc_map_insert(m.clone(), "reverse".to_string(), list_of_type_variable("collection_element".to_string())); -let m = v2_rt::rc_map_insert(m.clone(), "list_push".to_string(), list_of_type_variable("collection_element".to_string())); -m.clone() -} + let m = v2_rt::rc_map_insert(m.clone(), "string_length".to_string(), int_type()); + let m = v2_rt::rc_map_insert(m.clone(), "code_point".to_string(), int_type()); + let m = v2_rt::rc_map_insert(m.clone(), "to_int".to_string(), int_type()); + let m = v2_rt::rc_map_insert(m.clone(), "scan_while".to_string(), int_type()); + let m = v2_rt::rc_map_insert(m.clone(), "scan_string_end".to_string(), int_type()); + let m = v2_rt::rc_map_insert(m.clone(), "scan_to_eol".to_string(), int_type()); + let m = v2_rt::rc_map_insert(m.clone(), "skip_horizontal_ws".to_string(), int_type()); + let m = v2_rt::rc_map_insert( + m.clone(), + "parse_int".to_string(), + with_optional_cardinality(&int_type()), + ); + let m = v2_rt::rc_map_insert(m.clone(), "char_at".to_string(), string_type()); + let m = v2_rt::rc_map_insert(m.clone(), "substring".to_string(), string_type()); + let m = v2_rt::rc_map_insert(m.clone(), "from_code_point".to_string(), string_type()); + let m = v2_rt::rc_map_insert(m.clone(), "chars_to_string".to_string(), string_type()); + let m = v2_rt::rc_map_insert(m.clone(), "to_string".to_string(), string_type()); + let m = v2_rt::rc_map_insert(m.clone(), "concat".to_string(), string_type()); + let m = v2_rt::rc_map_insert(m.clone(), "map_insert".to_string(), map_of_type_variables()); + let m = v2_rt::rc_map_insert(m.clone(), "map_merge".to_string(), map_of_type_variables()); + let m = v2_rt::rc_map_insert(m.clone(), "with".to_string(), map_of_type_variables()); + let set_ty = make_container_type( + &"Set".to_string(), + type_variable_node("set_elem".to_string()), + ) + .ty + .clone(); + let m = v2_rt::rc_map_insert(m.clone(), "empty_set".to_string(), set_ty.clone()); + let m = v2_rt::rc_map_insert(m.clone(), "set_insert".to_string(), set_ty.clone()); + let m = v2_rt::rc_map_insert(m.clone(), "set_union".to_string(), set_ty); + let m = v2_rt::rc_map_insert(m.clone(), "map_contains_key".to_string(), bool_type()); + let m = v2_rt::rc_map_insert(m.clone(), "map_has".to_string(), bool_type()); + let m = v2_rt::rc_map_insert(m.clone(), "emit_map_has".to_string(), bool_type()); + let m = v2_rt::rc_map_insert(m.clone(), "set_contains".to_string(), bool_type()); + let m = v2_rt::rc_map_insert( + m.clone(), + "lookup".to_string(), + with_optional_cardinality(&type_variable_node("map_value".to_string())), + ); + let m = v2_rt::rc_map_insert( + m.clone(), + "map_get".to_string(), + with_optional_cardinality(&type_variable_node("map_value".to_string())), + ); + let m = v2_rt::rc_map_insert( + m.clone(), + "Some".to_string(), + with_optional_cardinality(&type_variable_node("some_inner".to_string())), + ); + let m = v2_rt::rc_map_insert( + m.clone(), + "map_keys".to_string(), + list_of_type_variable("collection_element".to_string()), + ); + let m = v2_rt::rc_map_insert( + m.clone(), + "map_values".to_string(), + list_of_type_variable("collection_element".to_string()), + ); + let m = v2_rt::rc_map_insert( + m.clone(), + "reverse".to_string(), + list_of_type_variable("collection_element".to_string()), + ); + let m = v2_rt::rc_map_insert( + m.clone(), + "list_push".to_string(), + list_of_type_variable("collection_element".to_string()), + ); + m.clone() + } } pub fn infer_builtin_call_type(name: String) -> Option> { @@ -104,7 +170,7 @@ pub fn infer_builtin_call_type(name: String) -> Option> { pub fn resolve_builtin_call_type(name: String) -> Rc { match infer_builtin_call_type(name) { - Some(v) => v.clone(), - None => unit_type(), -} + Some(v) => v.clone(), + None => unit_type(), + } } diff --git a/src/v2/stage0/src/v2_compiler_infer_patterns.rs b/src/v2/stage0/src/v2_compiler_infer_patterns.rs index 54c48623cc0..4bcb95f3031 100644 --- a/src/v2/stage0/src/v2_compiler_infer_patterns.rs +++ b/src/v2/stage0/src/v2_compiler_infer_patterns.rs @@ -1,24 +1,31 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_patterns -use std::collections::HashMap; -use std::rc::Rc; -use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::std_types::{SourceSpan}; -pub use crate::v2_std_core::{Node, find_child_named, NewlineIndex, authored_name_at, ExprData, InferredNode, is_compiler_error, Cardinality, Connective, ErrorNode, make_error_node, MatchPattern, arm_pattern, LiteralValue, with_optional_cardinality, none_type, error_type, no_span, kernel_span, CompilerDiagnostic}; -use crate::v2_std_core::ExprData::{NoExprData}; -use crate::v2_std_core::InferredNode::{Resolved, CompilerError, TypeVariable}; -use crate::v2_std_core::Cardinality::{Required, CardOptional}; -use crate::v2_std_core::Connective::{Disj, NoConnective}; -use crate::v2_std_core::CompilerDiagnostic::{VariantNotFound, FieldNotFound, NonExhaustiveMatch}; -use crate::v2_std_core::MatchPattern::{LitPattern}; -use crate::v2_std_core::LiteralValue::{LitBool}; -pub use crate::v2_compiler_infer_types::{child_type_node, extract_optional_inner_node, emit_map_has}; -pub use crate::v2_compiler_infer_env::{TypeEnv, lookup_type, lookup_type_by_name}; use self::NodeLookupStatus::*; use self::PatternSubject::*; +pub use crate::std_types::SourceSpan; +pub use crate::v2_compiler_infer_env::{lookup_type, lookup_type_by_name, TypeEnv}; +pub use crate::v2_compiler_infer_types::{ + child_type_node, emit_map_has, extract_optional_inner_node, +}; +use crate::v2_rt; +use crate::v2_std_core::Cardinality::{CardOptional, Required}; +use crate::v2_std_core::CompilerDiagnostic::{FieldNotFound, NonExhaustiveMatch, VariantNotFound}; +use crate::v2_std_core::Connective::{Disj, NoConnective}; +use crate::v2_std_core::ExprData::NoExprData; +use crate::v2_std_core::InferredNode::{CompilerError, Resolved, TypeVariable}; +use crate::v2_std_core::LiteralValue::LitBool; +use crate::v2_std_core::MatchPattern::LitPattern; +pub use crate::v2_std_core::{ + arm_pattern, authored_name_at, error_type, find_child_named, is_compiler_error, kernel_span, + make_error_node, no_span, none_type, with_optional_cardinality, Cardinality, + CompilerDiagnostic, Connective, ErrorNode, ExprData, InferredNode, LiteralValue, MatchPattern, + NewlineIndex, Node, +}; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct NodeLookupResult { @@ -29,9 +36,7 @@ pub struct NodeLookupResult { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum NodeLookupStatus { - LookupResolved { - node: Rc, - }, + LookupResolved { node: Rc }, LookupFailed, } impl NodeLookupStatus { @@ -46,69 +51,63 @@ impl NodeLookupStatus { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum PatternSubject { - PatternResolved { - node: Rc, - }, - PatternDynamic { - span: Rc, - }, + PatternResolved { node: Rc }, + PatternDynamic { span: Rc }, PatternLookupBlocked, } pub fn is_type_variable(inferred: Rc) -> bool { match (*inferred).clone() { - InferredNode::TypeVariable { .. } => true, - _ => false, -} + InferredNode::TypeVariable { .. } => true, + _ => false, + } } pub fn synthesize_optional_some_variant(scrut: &Rc) -> Rc { { let inner = extract_optional_inner_node(&scrut); -let value_field = Rc::new(Node { - name: "value".to_string(), - span: scrut.span.clone(), - ident_span: Some(kernel_span(&"value".to_string())), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: inner, -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let some_node = Rc::new(Node { - name: "Some".to_string(), - span: scrut.span.clone(), - ident_span: Some(kernel_span(&"Some".to_string())), - children: Rc::new(vec![value_field]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -some_node -} + let value_field = Rc::new(Node { + name: "value".to_string(), + span: scrut.span.clone(), + ident_span: Some(kernel_span(&"value".to_string())), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { node: inner })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let some_node = Rc::new(Node { + name: "Some".to_string(), + span: scrut.span.clone(), + ident_span: Some(kernel_span(&"Some".to_string())), + children: Rc::new(vec![value_field]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + some_node + } } pub fn pattern_subject_from_node(n: &Rc) -> Rc { @@ -118,179 +117,290 @@ pub fn pattern_subject_from_node(n: &Rc) -> Rc { } else { false }; -if is_error { + if is_error { Rc::new(PatternSubject::PatternLookupBlocked) } else { - Rc::new(PatternSubject::PatternResolved { - node: n.clone(), -}) + Rc::new(PatternSubject::PatternResolved { node: n.clone() }) } -} + } } pub fn pattern_subject_from_inferred(n: Option>) -> Rc { match n.as_deref().cloned() { - Some(InferredNode::Resolved { node: resolved, .. }) => pattern_subject_from_node(&resolved), - _ => Rc::new(PatternSubject::PatternLookupBlocked), -} + Some(InferredNode::Resolved { node: resolved, .. }) => pattern_subject_from_node(&resolved), + _ => Rc::new(PatternSubject::PatternLookupBlocked), + } } pub fn node_lookup_resolved(node: Rc) -> Rc { Rc::new(NodeLookupResult { - status: Rc::new(NodeLookupStatus::LookupResolved { - node: node, -}), - diagnostics: Rc::new(vec![]), -}) + status: Rc::new(NodeLookupStatus::LookupResolved { node: node }), + diagnostics: Rc::new(vec![]), + }) } pub fn node_lookup_failed(diagnostics: Rc>>) -> Rc { Rc::new(NodeLookupResult { - status: Rc::new(NodeLookupStatus::LookupFailed), - diagnostics: diagnostics, -}) + status: Rc::new(NodeLookupStatus::LookupFailed), + diagnostics: diagnostics, + }) } pub fn lookup_result_subject(result: Rc) -> Rc { match (*result.status.clone()).clone() { - NodeLookupStatus::LookupResolved { node: resolved, .. } => pattern_subject_from_node(&resolved), - NodeLookupStatus::LookupFailed => Rc::new(PatternSubject::PatternLookupBlocked), -} + NodeLookupStatus::LookupResolved { node: resolved, .. } => { + pattern_subject_from_node(&resolved) + } + NodeLookupStatus::LookupFailed => Rc::new(PatternSubject::PatternLookupBlocked), + } } pub fn pattern_binding_type(subject: Rc) -> Rc { match (*subject).clone() { - PatternSubject::PatternResolved { node: resolved, .. } => resolved.clone(), - PatternSubject::PatternDynamic { .. } => error_type(), - PatternSubject::PatternLookupBlocked => error_type(), -} + PatternSubject::PatternResolved { node: resolved, .. } => resolved.clone(), + PatternSubject::PatternDynamic { .. } => error_type(), + PatternSubject::PatternLookupBlocked => error_type(), + } } -pub fn variant_not_found_result(scrut: &Rc, variant_name: String, module_name: String, source_indices: Rc>>) -> Rc { - node_lookup_failed(Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::VariantNotFound { - variant: variant_name, - type_name: authored_name_at(source_indices, &scrut), - span: scrut.span.clone(), -}), module_name)])) +pub fn variant_not_found_result( + scrut: &Rc, + variant_name: String, + module_name: String, + source_indices: Rc>>, +) -> Rc { + node_lookup_failed(Rc::new(vec![make_error_node( + Rc::new(CompilerDiagnostic::VariantNotFound { + variant: variant_name, + type_name: authored_name_at(source_indices, &scrut), + span: scrut.span.clone(), + }), + module_name, + )])) } -pub fn lookup_variant_in_type(scrut: Rc, variant_name: &String, module_name: String, source_indices: &Rc>>) -> Rc { +pub fn lookup_variant_in_type( + scrut: Rc, + variant_name: &String, + module_name: String, + source_indices: &Rc>>, +) -> Rc { match (*scrut).clone() { - PatternSubject::PatternLookupBlocked => node_lookup_failed(Rc::new(vec![])), - PatternSubject::PatternDynamic { span: dynamic_span, .. } => node_lookup_failed(Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::VariantNotFound { - variant: variant_name.clone(), - type_name: "unresolved".to_string(), - span: dynamic_span.clone(), -}), module_name)])), - PatternSubject::PatternResolved { node: scrut_node, .. } => { - let scrut_opt = (scrut_node.return_cardinality.clone() == Cardinality::CardOptional); -if (((scrut_node.connective.clone() == Connective::NoConnective) && ((scrut_node.children.clone().len() as i64) == 0)) && (scrut_opt.clone() == false)) { - node_lookup_failed(Rc::new(vec![])) - } else { + PatternSubject::PatternLookupBlocked => node_lookup_failed(Rc::new(vec![])), + PatternSubject::PatternDynamic { + span: dynamic_span, .. + } => node_lookup_failed(Rc::new(vec![make_error_node( + Rc::new(CompilerDiagnostic::VariantNotFound { + variant: variant_name.clone(), + type_name: "unresolved".to_string(), + span: dynamic_span.clone(), + }), + module_name, + )])), + PatternSubject::PatternResolved { + node: scrut_node, .. + } => { + let scrut_opt = (scrut_node.return_cardinality.clone() == Cardinality::CardOptional); + if (((scrut_node.connective.clone() == Connective::NoConnective) + && ((scrut_node.children.clone().len() as i64) == 0)) + && (scrut_opt.clone() == false)) { - let direct_match = find_child_named(scrut_node.clone(), variant_name.clone(), source_indices.clone()); -let fallback = if (scrut_opt.clone() && (variant_name.clone().as_str() == "Some".to_string().as_str())) { - node_lookup_resolved(synthesize_optional_some_variant(&scrut_node)) - } else { - if (scrut_opt.clone() && (variant_name.clone().as_str() == "None".to_string().as_str())) { - node_lookup_resolved(none_type()) + node_lookup_failed(Rc::new(vec![])) + } else { + { + let direct_match = find_child_named( + scrut_node.clone(), + variant_name.clone(), + source_indices.clone(), + ); + let fallback = if (scrut_opt.clone() + && (variant_name.clone().as_str() == "Some".to_string().as_str())) + { + node_lookup_resolved(synthesize_optional_some_variant(&scrut_node)) } else { - variant_not_found_result(&scrut_node, variant_name.clone(), module_name, source_indices.clone()) + if (scrut_opt.clone() + && (variant_name.clone().as_str() == "None".to_string().as_str())) + { + node_lookup_resolved(none_type()) + } else { + variant_not_found_result( + &scrut_node, + variant_name.clone(), + module_name, + source_indices.clone(), + ) + } + }; + match direct_match { + Some(v) => node_lookup_resolved(v.clone()), + None => fallback, } - }; -match direct_match { - Some(v) => node_lookup_resolved(v.clone()), - None => fallback, -} -} + } + } } -}, -} + } } -pub fn lookup_field_in_variant(variant: Rc, field_name: &String, module_name: String, source_indices: &Rc>>) -> Rc { +pub fn lookup_field_in_variant( + variant: Rc, + field_name: &String, + module_name: String, + source_indices: &Rc>>, +) -> Rc { match (*variant).clone() { - PatternSubject::PatternLookupBlocked => node_lookup_failed(Rc::new(vec![])), - PatternSubject::PatternDynamic { span: dynamic_span, .. } => node_lookup_failed(Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::FieldNotFound { - field: field_name.clone(), - type_name: "unresolved".to_string(), - span: dynamic_span.clone(), -}), module_name)])), - PatternSubject::PatternResolved { node: variant_node, .. } => match find_child_named(variant_node.clone(), field_name.clone(), source_indices.clone()) { - Some(field_child) => { - let resolved = child_type_node(&field_child); -node_lookup_resolved(resolved) -}, - None => node_lookup_failed(Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::FieldNotFound { - field: field_name.clone(), - type_name: authored_name_at(source_indices.clone(), &variant_node), - span: variant_node.span.clone(), -}), module_name)])), -}, -} + PatternSubject::PatternLookupBlocked => node_lookup_failed(Rc::new(vec![])), + PatternSubject::PatternDynamic { + span: dynamic_span, .. + } => node_lookup_failed(Rc::new(vec![make_error_node( + Rc::new(CompilerDiagnostic::FieldNotFound { + field: field_name.clone(), + type_name: "unresolved".to_string(), + span: dynamic_span.clone(), + }), + module_name, + )])), + PatternSubject::PatternResolved { + node: variant_node, .. + } => match find_child_named( + variant_node.clone(), + field_name.clone(), + source_indices.clone(), + ) { + Some(field_child) => { + let resolved = child_type_node(&field_child); + node_lookup_resolved(resolved) + } + None => node_lookup_failed(Rc::new(vec![make_error_node( + Rc::new(CompilerDiagnostic::FieldNotFound { + field: field_name.clone(), + type_name: authored_name_at(source_indices.clone(), &variant_node), + span: variant_node.span.clone(), + }), + module_name, + )])), + }, + } } -pub fn check_match_exhaustiveness(scrutinee_type: &Rc, arms: &Rc>>, env: &Rc, span: Rc, module_name: String) -> Rc>> { +pub fn check_match_exhaustiveness( + scrutinee_type: &Rc, + arms: &Rc>>, + env: &Rc, + span: Rc, + module_name: String, +) -> Rc>> { { - let scrut_is_optional = (scrutinee_type.return_cardinality.clone() == Cardinality::CardOptional); -let has_structure = (scrutinee_type.connective.clone() != Connective::NoConnective); -let resolved_raw = if has_structure { + let scrut_is_optional = + (scrutinee_type.return_cardinality.clone() == Cardinality::CardOptional); + let has_structure = (scrutinee_type.connective.clone() != Connective::NoConnective); + let resolved_raw = if has_structure { scrutinee_type.clone() } else { - match lookup_type_by_name(&env, authored_name_at(env.source_indices.clone(), &scrutinee_type)) { - Some(def) => def.clone(), - None => scrutinee_type.clone(), -} + match lookup_type_by_name( + &env, + authored_name_at(env.source_indices.clone(), &scrutinee_type), + ) { + Some(def) => def.clone(), + None => scrutinee_type.clone(), + } }; -let resolved = if scrut_is_optional { + let resolved = if scrut_is_optional { with_optional_cardinality(&resolved_raw) } else { resolved_raw }; -let is_coproduct = (resolved.connective.clone() == Connective::Disj); -let resolved_is_optional = (resolved.return_cardinality.clone() == Cardinality::CardOptional); -if (is_coproduct || resolved_is_optional.clone()) { + let is_coproduct = (resolved.connective.clone() == Connective::Disj); + let resolved_is_optional = + (resolved.return_cardinality.clone() == Cardinality::CardOptional); + if (is_coproduct || resolved_is_optional.clone()) { { let variant_names = if resolved_is_optional.clone() { Rc::new(vec!["Some".to_string(), "None".to_string()]) } else { - Rc::new({ let mut __result = Vec::new(); for c in resolved.children.clone().iter().cloned() { __result.push(authored_name_at(env.source_indices.clone(), &c)); } __result }) + Rc::new({ + let mut __result = Vec::new(); + for c in resolved.children.clone().iter().cloned() { + __result.push(authored_name_at(env.source_indices.clone(), &c)); + } + __result + }) + }; + let has_catch_all = { + let mut __found = false; + for arm in arms.clone().iter().cloned() { + if match (*arm_pattern(arm.clone())).clone() { + MatchPattern::Wildcard => true, + MatchPattern::Bind { .. } => true, + _ => false, + } { + __found = true; + break; + } + } + __found }; -let has_catch_all = { let mut __found = false; for arm in arms.clone().iter().cloned() { if match (*arm_pattern(arm.clone())).clone() { - MatchPattern::Wildcard => true, - MatchPattern::Bind { .. } => true, - _ => false, -} { __found = true; break; } } __found }; -if has_catch_all { + if has_catch_all { Rc::new(vec![]) } else { { - let covered_set = arms.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, arm: Rc| match (*arm_pattern(arm.clone())).clone() { - MatchPattern::VariantPattern { name: n, .. } => v2_rt::rc_map_insert(acc.clone(), n.clone(), true), - MatchPattern::LitPattern { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitBool { value: b, .. } => if b.clone() { - v2_rt::rc_map_insert(acc.clone(), "True".to_string(), true) - } else { - v2_rt::rc_map_insert(acc.clone(), "False".to_string(), true) - }, - _ => acc.clone(), -}, - _ => acc.clone(), -}); -let uncovered = Rc::new({ let mut __result = Vec::new(); for v in variant_names.iter().cloned() { if (emit_map_has(covered_set.clone(), v.clone()) == false) { __result.push(v); } } __result }); -if ((uncovered.clone().len() as i64) > 0) { - Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::NonExhaustiveMatch { - missing: uncovered.clone(), - span: span, -}), module_name)]) + let covered_set = arms.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, arm: Rc| match (*arm_pattern( + arm.clone(), + )) + .clone() + { + MatchPattern::VariantPattern { name: n, .. } => { + v2_rt::rc_map_insert(acc.clone(), n.clone(), true) + } + MatchPattern::LitPattern { value: v, .. } => { + match (*v.clone()).clone() { + LiteralValue::LitBool { value: b, .. } => { + if b.clone() { + v2_rt::rc_map_insert( + acc.clone(), + "True".to_string(), + true, + ) + } else { + v2_rt::rc_map_insert( + acc.clone(), + "False".to_string(), + true, + ) + } + } + _ => acc.clone(), + } + } + _ => acc.clone(), + }, + ); + let uncovered = Rc::new({ + let mut __result = Vec::new(); + for v in variant_names.iter().cloned() { + if (emit_map_has(covered_set.clone(), v.clone()) == false) { + __result.push(v); + } + } + __result + }); + if ((uncovered.clone().len() as i64) > 0) { + Rc::new(vec![make_error_node( + Rc::new(CompilerDiagnostic::NonExhaustiveMatch { + missing: uncovered.clone(), + span: span, + }), + module_name, + )]) } else { Rc::new(vec![]) } -} + } } -} + } } else { Rc::new(vec![]) } -} + } } diff --git a/src/v2/stage0/src/v2_compiler_infer_resolve.rs b/src/v2/stage0/src/v2_compiler_infer_resolve.rs index 7aa5398c202..53f5cbf2aaf 100644 --- a/src/v2/stage0/src/v2_compiler_infer_resolve.rs +++ b/src/v2/stage0/src/v2_compiler_infer_resolve.rs @@ -1,32 +1,55 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_resolve -use std::collections::HashMap; -use std::rc::Rc; +use self::AliasKind::*; +pub use crate::std_induction::SubValueRelation; +use crate::std_induction::SubValueRelation::SubValueUnknown; +pub use crate::std_types::{container_param_name, SourceSpan}; +pub use crate::v2_compiler_infer_env::{ + authored_name, is_recursive_type, is_recursive_type_by_name, is_recursive_type_for, + lookup_type, lookup_type_by_name, lookup_type_for, TypeBinding, TypeEnv, +}; +pub use crate::v2_compiler_infer_types::{ + child_type_node, node_is_keyed_collection, resolved_type, +}; use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::std_types::{SourceSpan, container_param_name}; -pub use crate::v2_std_core::{Node, authored_name_at, NewlineIndex, make_param_node, param_node_name_at, param_node_type_expr, param_node_default_value, make_field_node, field_node_name_at, field_node_type_expr, field_node_cardinality, field_node_default_value, field_node_from_key, InferredNode, is_compiler_error, ErrorNode, make_error_node, Cardinality, StringPart, MatchPattern, ExprData, ExprErrorKind, make_expr_node, make_named_expr_node, make_expr_error_node, map_children, expr_call_func_at, expr_method_name_at, let_binding_name_at, foreach_variable_at, make_arg_node, arg_name_at, arg_value, make_arm_node, arm_pattern, arm_guard, arm_body, make_field_init_node, field_init_node_name_at, field_init_node_value, make_resource_use_node, resource_use_name_at, resource_use_resource, make_text_part_node, make_interp_part_node, make_transport_node, local_transport_node, is_local_transport, transport_request_body, is_kernel_type, is_container_type, with_optional_cardinality, with_required_cardinality, Connective, no_span, unit_type, string_type, default_ident_span, kernel_span, node_name_span, intern, CompilerDiagnostic}; -use crate::v2_std_core::InferredNode::{Resolved, CompilerError, TypeVariable}; -use crate::v2_std_core::CompilerDiagnostic::{InternalError, ArityMismatch, UnresolvedType}; -use crate::v2_std_core::Cardinality::{Required, CardOptional}; -use crate::v2_std_core::StringPart::{Text, Interpolation}; -use crate::v2_std_core::MatchPattern::{Wildcard}; -use crate::v2_std_core::ExprData::{NoExprData, ExprLiteral, ExprError, ExprVar, ExprFieldAccess, ExprCall, ExprMethodCall, ExprMatch, ExprIf, ExprLet, ExprRecordLit, ExprListLit, ExprBinOp, ExprUnaryOp, ExprLambda, ExprStringInterp, ExprBlock, ExprCast, ExprForEach, ExprIndex, ExprSlice, ExprReturn}; -use crate::v2_std_core::ExprErrorKind::{SemanticExprError}; +use crate::v2_std_core::Cardinality::{CardOptional, Required}; +use crate::v2_std_core::CompilerDiagnostic::{ArityMismatch, InternalError, UnresolvedType}; use crate::v2_std_core::Connective::{Conj, Disj, NoConnective}; -pub use crate::v2_compiler_infer_types::{resolved_type, child_type_node, node_is_keyed_collection}; -pub use crate::std_induction::{SubValueRelation}; -use crate::std_induction::SubValueRelation::{SubValueUnknown}; -pub use crate::v2_compiler_infer_env::{TypeEnv, TypeBinding, lookup_type, lookup_type_by_name, lookup_type_for, is_recursive_type, is_recursive_type_by_name, is_recursive_type_for, authored_name}; -use self::AliasKind::*; +use crate::v2_std_core::ExprData::{ + ExprBinOp, ExprBlock, ExprCall, ExprCast, ExprError, ExprFieldAccess, ExprForEach, ExprIf, + ExprIndex, ExprLambda, ExprLet, ExprListLit, ExprLiteral, ExprMatch, ExprMethodCall, + ExprRecordLit, ExprReturn, ExprSlice, ExprStringInterp, ExprUnaryOp, ExprVar, NoExprData, +}; +use crate::v2_std_core::ExprErrorKind::SemanticExprError; +use crate::v2_std_core::InferredNode::{CompilerError, Resolved, TypeVariable}; +use crate::v2_std_core::MatchPattern::Wildcard; +use crate::v2_std_core::StringPart::{Interpolation, Text}; +pub use crate::v2_std_core::{ + arg_name_at, arg_value, arm_body, arm_guard, arm_pattern, authored_name_at, default_ident_span, + expr_call_func_at, expr_method_name_at, field_init_node_name_at, field_init_node_value, + field_node_cardinality, field_node_default_value, field_node_from_key, field_node_name_at, + field_node_type_expr, foreach_variable_at, intern, is_compiler_error, is_container_type, + is_kernel_type, is_local_transport, kernel_span, let_binding_name_at, local_transport_node, + make_arg_node, make_arm_node, make_error_node, make_expr_error_node, make_expr_node, + make_field_init_node, make_field_node, make_interp_part_node, make_named_expr_node, + make_param_node, make_resource_use_node, make_text_part_node, make_transport_node, + map_children, no_span, node_name_span, param_node_default_value, param_node_name_at, + param_node_type_expr, resource_use_name_at, resource_use_resource, string_type, + transport_request_body, unit_type, with_optional_cardinality, with_required_cardinality, + Cardinality, CompilerDiagnostic, Connective, ErrorNode, ExprData, ExprErrorKind, InferredNode, + MatchPattern, NewlineIndex, Node, StringPart, +}; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn is_type_variable(inferred: Rc) -> bool { match (*inferred).clone() { - InferredNode::TypeVariable { .. } => true, - _ => false, -} + InferredNode::TypeVariable { .. } => true, + _ => false, + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -102,96 +125,139 @@ pub fn resolve_node(n: Rc, env: Rc, module_name: String) -> Rc, env: &Rc) -> bool { { let has_structure = (n.connective.clone() != Connective::NoConnective); -if has_structure { + if has_structure { false } else { match lookup_type_for(&env, &n) { - Some(decl) => if ((decl.params.clone().len() as i64) > 0) { - if is_container_type(authored_name(env.clone(), n.clone())) { - false - } else { - if (decl.inferred.clone() != None) { - true + Some(decl) => { + if ((decl.params.clone().len() as i64) > 0) { + if is_container_type(authored_name(env.clone(), n.clone())) { + false + } else { + if (decl.inferred.clone() != None) { + true + } else { + true + } + } } else { - true + false } } - } else { - false - }, - None => false, -} + None => false, + } } -} + } } -pub fn substitute_type_slots(n: &Rc, slot_bindings: &Rc>>, decl_name: &String, source_indices: &Rc>>) -> Rc { +pub fn substitute_type_slots( + n: &Rc, + slot_bindings: &Rc>>, + decl_name: &String, + source_indices: &Rc>>, +) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let is_slot = (((((n.children.clone().len() as i64) == 0) && (n.connective.clone() == Connective::NoConnective)) && (n.body.clone() == None)) && (n.inferred.clone() == None)); -if is_slot { - match v2_rt::map_get(&slot_bindings, authored_name_at(source_indices.clone(), &n)) { - Some(concrete) => concrete.clone(), - None => n.clone(), -} - } else { - { - let new_children = Rc::new({ let mut __result = Vec::new(); for child in n.children.clone().iter().cloned() { __result.push(if (authored_name_at(source_indices.clone(), &child).as_str() == decl_name.clone().as_str()) { - { - let substituted_args = Rc::new({ let mut __result = Vec::new(); for arg in child.children.clone().iter().cloned() { __result.push(substitute_type_slots(&arg, &slot_bindings, &decl_name, &source_indices)); } __result }); -Rc::new(Node { - name: child.name.clone(), - span: child.span.clone(), - ident_span: child.ident_span.clone(), - children: substituted_args.clone(), - connective: child.connective.clone(), - params: child.params.clone(), - inferred: child.inferred.clone(), - return_cardinality: child.return_cardinality.clone(), - uses: child.uses.clone(), - body: child.body.clone(), - transport: child.transport.clone(), - properties: child.properties.clone(), - type_annotation: child.type_annotation.clone(), - is_self_recursive: child.is_self_recursive.clone(), - has_non_tail_self_call: child.has_non_tail_self_call.clone(), - match_pattern: child.match_pattern.clone(), - expr_data: child.expr_data.clone(), - ident: None, -}) -} - } else { - substitute_type_slots(&child, &slot_bindings, &decl_name, &source_indices) - }); } __result }); -let new_inferred = match n.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => Some(Rc::new(InferredNode::Resolved { - node: substitute_type_slots(&rt, &slot_bindings, &decl_name, &source_indices), -})), - _ => n.inferred.clone(), -}; -Rc::new(Node { - name: n.name.clone(), - span: n.span.clone(), - ident_span: n.ident_span.clone(), - children: new_children, - connective: n.connective.clone(), - params: n.params.clone(), - inferred: new_inferred, - return_cardinality: n.return_cardinality.clone(), - uses: n.uses.clone(), - body: n.body.clone(), - transport: n.transport.clone(), - properties: n.properties.clone(), - type_annotation: n.type_annotation.clone(), - is_self_recursive: n.is_self_recursive.clone(), - has_non_tail_self_call: n.has_non_tail_self_call.clone(), - match_pattern: n.match_pattern.clone(), - expr_data: n.expr_data.clone(), - ident: None, -}) -} + let is_slot = (((((n.children.clone().len() as i64) == 0) + && (n.connective.clone() == Connective::NoConnective)) + && (n.body.clone() == None)) + && (n.inferred.clone() == None)); + if is_slot { + match v2_rt::map_get(&slot_bindings, authored_name_at(source_indices.clone(), &n)) { + Some(concrete) => concrete.clone(), + None => n.clone(), } -} + } else { + { + let new_children = Rc::new({ + let mut __result = Vec::new(); + for child in n.children.clone().iter().cloned() { + __result.push( + if (authored_name_at(source_indices.clone(), &child).as_str() + == decl_name.clone().as_str()) + { + { + let substituted_args = Rc::new({ + let mut __result = Vec::new(); + for arg in child.children.clone().iter().cloned() { + __result.push(substitute_type_slots( + &arg, + &slot_bindings, + &decl_name, + &source_indices, + )); + } + __result + }); + Rc::new(Node { + name: child.name.clone(), + span: child.span.clone(), + ident_span: child.ident_span.clone(), + children: substituted_args.clone(), + connective: child.connective.clone(), + params: child.params.clone(), + inferred: child.inferred.clone(), + return_cardinality: child.return_cardinality.clone(), + uses: child.uses.clone(), + body: child.body.clone(), + transport: child.transport.clone(), + properties: child.properties.clone(), + type_annotation: child.type_annotation.clone(), + is_self_recursive: child.is_self_recursive.clone(), + has_non_tail_self_call: child + .has_non_tail_self_call + .clone(), + match_pattern: child.match_pattern.clone(), + expr_data: child.expr_data.clone(), + ident: None, + }) + } + } else { + substitute_type_slots( + &child, + &slot_bindings, + &decl_name, + &source_indices, + ) + }, + ); + } + __result + }); + let new_inferred = match n.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + Some(Rc::new(InferredNode::Resolved { + node: substitute_type_slots( + &rt, + &slot_bindings, + &decl_name, + &source_indices, + ), + })) + } + _ => n.inferred.clone(), + }; + Rc::new(Node { + name: n.name.clone(), + span: n.span.clone(), + ident_span: n.ident_span.clone(), + children: new_children, + connective: n.connective.clone(), + params: n.params.clone(), + inferred: new_inferred, + return_cardinality: n.return_cardinality.clone(), + uses: n.uses.clone(), + body: n.body.clone(), + transport: n.transport.clone(), + properties: n.properties.clone(), + type_annotation: n.type_annotation.clone(), + is_self_recursive: n.is_self_recursive.clone(), + has_non_tail_self_call: n.has_non_tail_self_call.clone(), + match_pattern: n.match_pattern.clone(), + expr_data: n.expr_data.clone(), + ident: None, + }) + } + } }) } @@ -206,185 +272,286 @@ pub enum AliasKind { pub fn classify_alias(target: &Rc) -> AliasKind { { let nc = (target.connective.clone() == Connective::NoConnective); -if (((target.children.clone().len() as i64) > 0) && nc.clone()) { + if (((target.children.clone().len() as i64) > 0) && nc.clone()) { AliasKind::AliasParameterized } else { - if ((((target.children.clone().len() as i64) == 0) && nc.clone()) && (target.ident_span.clone() != None)) { + if ((((target.children.clone().len() as i64) == 0) && nc.clone()) + && (target.ident_span.clone() != None)) + { AliasKind::AliasLeaf } else { AliasKind::AliasPassthrough } } -} + } } -pub fn resolve_alias_target(target: Rc, env: &Rc, module_name: String, depth: i64) -> Rc { +pub fn resolve_alias_target( + target: Rc, + env: &Rc, + module_name: String, + depth: i64, +) -> Rc { match classify_alias(&target) { - AliasKind::AliasParameterized => resolve_node_bounded(&target, &env, &module_name, (depth + 1)).resolved.clone(), - AliasKind::AliasLeaf => match lookup_type_by_name(&env, authored_name_at(env.source_indices.clone(), &target)) { - Some(env_target) => env_target.clone(), - None => target.clone(), -}, - AliasKind::AliasPassthrough => target.clone(), -} + AliasKind::AliasParameterized => { + resolve_node_bounded(&target, &env, &module_name, (depth + 1)) + .resolved + .clone() + } + AliasKind::AliasLeaf => { + match lookup_type_by_name(&env, authored_name_at(env.source_indices.clone(), &target)) { + Some(env_target) => env_target.clone(), + None => target.clone(), + } + } + AliasKind::AliasPassthrough => target.clone(), + } } -pub fn resolve_node_bounded(n: &Rc, env: &Rc, module_name: &String, depth: i64) -> Rc { +pub fn resolve_node_bounded( + n: &Rc, + env: &Rc, + module_name: &String, + depth: i64, +) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - if (depth.clone() > 100) { - return Rc::new(NodeResolveResult { - resolved: n.clone(), - diagnostics: Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::InternalError { - message: v2_rt::concat(v2_rt::concat("internal: type resolution exceeded depth 100 for '".to_string(), authored_name(env.clone(), n.clone())), "'".to_string()), - span: n.span.clone(), -}), module_name.clone())]), -}) - } -let has_structure = (n.connective.clone() != Connective::NoConnective); -if has_structure { - { - let is_product = (n.connective.clone() == Connective::Conj); -if is_product { - if (n.type_annotation.clone() != None) { - match n.children.clone().first().cloned() { - Some(base) => { - let base_result = resolve_node_bounded(&base, &env, &module_name, (depth.clone() + 1)); -let base_resolved = base_result.resolved.clone(); -let base_diags = base_result.diagnostics.clone(); -Rc::new(NodeResolveResult { - resolved: Rc::new(Node { - name: n.name.clone(), - span: n.span.clone(), - ident_span: n.ident_span.clone(), - children: Rc::new(vec![base_resolved]), - connective: n.connective.clone(), - params: n.params.clone(), - inferred: n.inferred.clone(), - return_cardinality: n.return_cardinality.clone(), - uses: n.uses.clone(), - body: n.body.clone(), - transport: n.transport.clone(), - properties: n.properties.clone(), - type_annotation: n.type_annotation.clone(), - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), - diagnostics: base_diags, -}) -}, - None => Rc::new(NodeResolveResult { - resolved: n.clone(), - diagnostics: Rc::new(vec![]), -}), -} - } else { - { - let child_results = Rc::new({ let mut __result = Vec::new(); for child in n.children.clone().iter().cloned() { __result.push(if (child.inferred.clone() == None) { - Rc::new(NodeResolveResult { - resolved: child.clone(), - diagnostics: Rc::new(vec![]), -}) - } else { - { - let child_rt = resolved_type(child.clone()); -let rt_result = resolve_node_bounded(&child_rt, &env, &module_name, (depth.clone() + 1)); -let rt_resolved = rt_result.resolved.clone(); -let rt_diags = rt_result.diagnostics.clone(); -Rc::new(NodeResolveResult { - resolved: Rc::new(Node { - name: child.name.clone(), - span: child.span.clone(), - ident_span: child.ident_span.clone(), - children: child.children.clone(), - connective: child.connective.clone(), - params: child.params.clone(), - inferred: Some(Rc::new(InferredNode::Resolved { - node: rt_resolved.clone(), -})), - return_cardinality: child.return_cardinality.clone(), - uses: child.uses.clone(), - body: child.body.clone(), - transport: child.transport.clone(), - properties: child.properties.clone(), - type_annotation: child.type_annotation.clone(), - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), - diagnostics: rt_diags.clone(), -}) -} - }); } __result }); -let resolved_children = Rc::new({ let mut __result = Vec::new(); for cr in child_results.clone().iter().cloned() { __result.push(cr.resolved.clone()); } __result }); -let all_diags = Rc::new({ let mut __result = Vec::new(); for cr in child_results.clone().iter().cloned() { __result.extend((*cr.diagnostics.clone()).iter().cloned()); } __result }); -Rc::new(NodeResolveResult { - resolved: Rc::new(Node { - name: n.name.clone(), - span: n.span.clone(), - ident_span: n.ident_span.clone(), - children: resolved_children, - connective: n.connective.clone(), - params: n.params.clone(), - inferred: n.inferred.clone(), - return_cardinality: n.return_cardinality.clone(), - uses: n.uses.clone(), - body: n.body.clone(), - transport: n.transport.clone(), - properties: n.properties.clone(), - type_annotation: n.type_annotation.clone(), - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), - diagnostics: all_diags, -}) -} + if (depth.clone() > 100) { + return Rc::new(NodeResolveResult { + resolved: n.clone(), + diagnostics: Rc::new(vec![make_error_node( + Rc::new(CompilerDiagnostic::InternalError { + message: v2_rt::concat( + v2_rt::concat( + "internal: type resolution exceeded depth 100 for '".to_string(), + authored_name(env.clone(), n.clone()), + ), + "'".to_string(), + ), + span: n.span.clone(), + }), + module_name.clone(), + )]), + }); + } + let has_structure = (n.connective.clone() != Connective::NoConnective); + if has_structure { + { + let is_product = (n.connective.clone() == Connective::Conj); + if is_product { + if (n.type_annotation.clone() != None) { + match n.children.clone().first().cloned() { + Some(base) => { + let base_result = resolve_node_bounded( + &base, + &env, + &module_name, + (depth.clone() + 1), + ); + let base_resolved = base_result.resolved.clone(); + let base_diags = base_result.diagnostics.clone(); + Rc::new(NodeResolveResult { + resolved: Rc::new(Node { + name: n.name.clone(), + span: n.span.clone(), + ident_span: n.ident_span.clone(), + children: Rc::new(vec![base_resolved]), + connective: n.connective.clone(), + params: n.params.clone(), + inferred: n.inferred.clone(), + return_cardinality: n.return_cardinality.clone(), + uses: n.uses.clone(), + body: n.body.clone(), + transport: n.transport.clone(), + properties: n.properties.clone(), + type_annotation: n.type_annotation.clone(), + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + diagnostics: base_diags, + }) + } + None => Rc::new(NodeResolveResult { + resolved: n.clone(), + diagnostics: Rc::new(vec![]), + }), } } else { { - let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); -if is_optional { - { - let inner = with_required_cardinality(&n); -let inner_result = resolve_node_bounded(&inner, &env, &module_name, (depth.clone() + 1)); -let inner_resolved = inner_result.resolved.clone(); -let inner_diags = inner_result.diagnostics.clone(); -Rc::new(NodeResolveResult { - resolved: with_optional_cardinality(&inner_resolved), - diagnostics: inner_diags, -}) -} - } else { - { - let variant_results = Rc::new({ let mut __result = Vec::new(); for variant_child in n.children.clone().iter().cloned() { __result.push({ - let field_results = Rc::new({ let mut __result = Vec::new(); for field_child in variant_child.children.clone().iter().cloned() { __result.push(if (field_child.inferred.clone() == None) { + let child_results = Rc::new({ + let mut __result = Vec::new(); + for child in n.children.clone().iter().cloned() { + __result.push(if (child.inferred.clone() == None) { + Rc::new(NodeResolveResult { + resolved: child.clone(), + diagnostics: Rc::new(vec![]), + }) + } else { + { + let child_rt = resolved_type(child.clone()); + let rt_result = resolve_node_bounded( + &child_rt, + &env, + &module_name, + (depth.clone() + 1), + ); + let rt_resolved = rt_result.resolved.clone(); + let rt_diags = rt_result.diagnostics.clone(); Rc::new(NodeResolveResult { - resolved: field_child.clone(), - diagnostics: Rc::new(vec![]), -}) - } else { - { - let field_rt = resolved_type(field_child.clone()); -let is_self_ref = ((authored_name(env.clone(), field_rt.clone()).as_str() == authored_name(env.clone(), n.clone()).as_str()) && ((field_rt.children.clone().len() as i64) > 0)); -let rt_result = if is_self_ref.clone() { - Rc::new(NodeResolveResult { - resolved: field_rt.clone(), - diagnostics: Rc::new(vec![]), -}) - } else { - resolve_node_bounded(&field_rt, &env, &module_name, (depth.clone() + 1)) - }; -let rt_resolved = rt_result.resolved.clone(); -let rt_diags = rt_result.diagnostics.clone(); -Rc::new(NodeResolveResult { + resolved: Rc::new(Node { + name: child.name.clone(), + span: child.span.clone(), + ident_span: child.ident_span.clone(), + children: child.children.clone(), + connective: child.connective.clone(), + params: child.params.clone(), + inferred: Some(Rc::new( + InferredNode::Resolved { + node: rt_resolved.clone(), + }, + )), + return_cardinality: child + .return_cardinality + .clone(), + uses: child.uses.clone(), + body: child.body.clone(), + transport: child.transport.clone(), + properties: child.properties.clone(), + type_annotation: child.type_annotation.clone(), + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + diagnostics: rt_diags.clone(), + }) + } + }); + } + __result + }); + let resolved_children = Rc::new({ + let mut __result = Vec::new(); + for cr in child_results.clone().iter().cloned() { + __result.push(cr.resolved.clone()); + } + __result + }); + let all_diags = Rc::new({ + let mut __result = Vec::new(); + for cr in child_results.clone().iter().cloned() { + __result.extend((*cr.diagnostics.clone()).iter().cloned()); + } + __result + }); + Rc::new(NodeResolveResult { + resolved: Rc::new(Node { + name: n.name.clone(), + span: n.span.clone(), + ident_span: n.ident_span.clone(), + children: resolved_children, + connective: n.connective.clone(), + params: n.params.clone(), + inferred: n.inferred.clone(), + return_cardinality: n.return_cardinality.clone(), + uses: n.uses.clone(), + body: n.body.clone(), + transport: n.transport.clone(), + properties: n.properties.clone(), + type_annotation: n.type_annotation.clone(), + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + diagnostics: all_diags, + }) + } + } + } else { + { + let is_optional = + (n.return_cardinality.clone() == Cardinality::CardOptional); + if is_optional { + { + let inner = with_required_cardinality(&n); + let inner_result = resolve_node_bounded( + &inner, + &env, + &module_name, + (depth.clone() + 1), + ); + let inner_resolved = inner_result.resolved.clone(); + let inner_diags = inner_result.diagnostics.clone(); + Rc::new(NodeResolveResult { + resolved: with_optional_cardinality(&inner_resolved), + diagnostics: inner_diags, + }) + } + } else { + { + let variant_results = Rc::new({ + let mut __result = Vec::new(); + for variant_child in n.children.clone().iter().cloned() { + __result.push({ + let field_results = Rc::new({ + let mut __result = Vec::new(); + for field_child in + variant_child.children.clone().iter().cloned() + { + __result.push( + if (field_child.inferred.clone() == None) { + Rc::new(NodeResolveResult { + resolved: field_child.clone(), + diagnostics: Rc::new(vec![]), + }) + } else { + { + let field_rt = resolved_type( + field_child.clone(), + ); + let is_self_ref = ((authored_name( + env.clone(), + field_rt.clone(), + ) + .as_str() + == authored_name( + env.clone(), + n.clone(), + ) + .as_str()) + && ((field_rt + .children + .clone() + .len() + as i64) + > 0)); + let rt_result = if is_self_ref + .clone() + { + Rc::new(NodeResolveResult { + resolved: field_rt.clone(), + diagnostics: Rc::new( + vec![], + ), + }) + } else { + resolve_node_bounded( + &field_rt, + &env, + &module_name, + (depth.clone() + 1), + ) + }; + let rt_resolved = + rt_result.resolved.clone(); + let rt_diags = + rt_result.diagnostics.clone(); + Rc::new(NodeResolveResult { resolved: Rc::new(Node { name: field_child.name.clone(), span: field_child.span.clone(), @@ -409,1249 +576,2106 @@ Rc::new(NodeResolveResult { }), diagnostics: rt_diags.clone(), }) -} - }); } __result }); -let resolved_fields = Rc::new({ let mut __result = Vec::new(); for fr in field_results.clone().iter().cloned() { __result.push(fr.resolved.clone()); } __result }); -let field_diags = Rc::new({ let mut __result = Vec::new(); for fr in field_results.clone().iter().cloned() { __result.extend((*fr.diagnostics.clone()).iter().cloned()); } __result }); -Rc::new(NodeResolveResult { - resolved: Rc::new(Node { - name: variant_child.name.clone(), - span: variant_child.span.clone(), - ident_span: variant_child.ident_span.clone(), - children: resolved_fields.clone(), - connective: variant_child.connective.clone(), - params: variant_child.params.clone(), - inferred: variant_child.inferred.clone(), - return_cardinality: variant_child.return_cardinality.clone(), - uses: variant_child.uses.clone(), - body: variant_child.body.clone(), - transport: variant_child.transport.clone(), - properties: variant_child.properties.clone(), - type_annotation: variant_child.type_annotation.clone(), - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), - diagnostics: field_diags.clone(), -}) -}); } __result }); -let resolved_variants = Rc::new({ let mut __result = Vec::new(); for vr in variant_results.clone().iter().cloned() { __result.push(vr.resolved.clone()); } __result }); -let all_diags = Rc::new({ let mut __result = Vec::new(); for vr in variant_results.clone().iter().cloned() { __result.extend((*vr.diagnostics.clone()).iter().cloned()); } __result }); -Rc::new(NodeResolveResult { - resolved: Rc::new(Node { - name: n.name.clone(), - span: n.span.clone(), - ident_span: n.ident_span.clone(), - children: resolved_variants, - connective: n.connective.clone(), - params: n.params.clone(), - inferred: n.inferred.clone(), - return_cardinality: n.return_cardinality.clone(), - uses: n.uses.clone(), - body: n.body.clone(), - transport: n.transport.clone(), - properties: n.properties.clone(), - type_annotation: n.type_annotation.clone(), - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), - diagnostics: all_diags, -}) -} + } + }, + ); + } + __result + }); + let resolved_fields = Rc::new({ + let mut __result = Vec::new(); + for fr in field_results.clone().iter().cloned() { + __result.push(fr.resolved.clone()); + } + __result + }); + let field_diags = Rc::new({ + let mut __result = Vec::new(); + for fr in field_results.clone().iter().cloned() { + __result.extend( + (*fr.diagnostics.clone()).iter().cloned(), + ); + } + __result + }); + Rc::new(NodeResolveResult { + resolved: Rc::new(Node { + name: variant_child.name.clone(), + span: variant_child.span.clone(), + ident_span: variant_child.ident_span.clone(), + children: resolved_fields.clone(), + connective: variant_child.connective.clone(), + params: variant_child.params.clone(), + inferred: variant_child.inferred.clone(), + return_cardinality: variant_child + .return_cardinality + .clone(), + uses: variant_child.uses.clone(), + body: variant_child.body.clone(), + transport: variant_child.transport.clone(), + properties: variant_child.properties.clone(), + type_annotation: variant_child + .type_annotation + .clone(), + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + diagnostics: field_diags.clone(), + }) + }); + } + __result + }); + let resolved_variants = Rc::new({ + let mut __result = Vec::new(); + for vr in variant_results.clone().iter().cloned() { + __result.push(vr.resolved.clone()); + } + __result + }); + let all_diags = Rc::new({ + let mut __result = Vec::new(); + for vr in variant_results.clone().iter().cloned() { + __result.extend((*vr.diagnostics.clone()).iter().cloned()); + } + __result + }); + Rc::new(NodeResolveResult { + resolved: Rc::new(Node { + name: n.name.clone(), + span: n.span.clone(), + ident_span: n.ident_span.clone(), + children: resolved_variants, + connective: n.connective.clone(), + params: n.params.clone(), + inferred: n.inferred.clone(), + return_cardinality: n.return_cardinality.clone(), + uses: n.uses.clone(), + body: n.body.clone(), + transport: n.transport.clone(), + properties: n.properties.clone(), + type_annotation: n.type_annotation.clone(), + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + diagnostics: all_diags, + }) } -} + } } -} - } else { - if (((n.children.clone().len() as i64) > 0) && is_user_generic_use_site(&n, &env)) { - { - let type_name = authored_name(env.clone(), n.clone()); -let decl = match lookup_type_for(&env, &n) { - Some(d) => d.clone(), - None => n.clone(), -}; -let expected_arity = (decl.params.clone().len() as i64); -let actual_arity = (n.children.clone().len() as i64); -let arity_diags = if (expected_arity.clone() != actual_arity.clone()) { - Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::ArityMismatch { - name: type_name.clone(), - expected: expected_arity.clone(), - got: actual_arity.clone(), - span: n.span.clone(), -}), module_name.clone())]) - } else { - Rc::new(vec![]) - }; -let arg_results = Rc::new({ let mut __result = Vec::new(); for child in n.children.clone().iter().cloned() { __result.push(resolve_node_bounded(&child, &env, &module_name, (depth.clone() + 1))); } __result }); -let resolved_args = Rc::new({ let mut __result = Vec::new(); for ar in arg_results.clone().iter().cloned() { __result.push(ar.resolved.clone()); } __result }); -let arg_diags = Rc::new({ let mut __result = Vec::new(); for ar in arg_results.clone().iter().cloned() { __result.extend((*ar.diagnostics.clone()).iter().cloned()); } __result }); -let slot_bindings = Rc::new(decl.params.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, pair: (i64, Rc)| { + } + } + } else { + if (((n.children.clone().len() as i64) > 0) && is_user_generic_use_site(&n, &env)) { + { + let type_name = authored_name(env.clone(), n.clone()); + let decl = match lookup_type_for(&env, &n) { + Some(d) => d.clone(), + None => n.clone(), + }; + let expected_arity = (decl.params.clone().len() as i64); + let actual_arity = (n.children.clone().len() as i64); + let arity_diags = if (expected_arity.clone() != actual_arity.clone()) { + Rc::new(vec![make_error_node( + Rc::new(CompilerDiagnostic::ArityMismatch { + name: type_name.clone(), + expected: expected_arity.clone(), + got: actual_arity.clone(), + span: n.span.clone(), + }), + module_name.clone(), + )]) + } else { + Rc::new(vec![]) + }; + let arg_results = Rc::new({ + let mut __result = Vec::new(); + for child in n.children.clone().iter().cloned() { + __result.push(resolve_node_bounded( + &child, + &env, + &module_name, + (depth.clone() + 1), + )); + } + __result + }); + let resolved_args = Rc::new({ + let mut __result = Vec::new(); + for ar in arg_results.clone().iter().cloned() { + __result.push(ar.resolved.clone()); + } + __result + }); + let arg_diags = Rc::new({ + let mut __result = Vec::new(); + for ar in arg_results.clone().iter().cloned() { + __result.extend((*ar.diagnostics.clone()).iter().cloned()); + } + __result + }); + let slot_bindings = Rc::new( + decl.params + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, pair: (i64, Rc)| { let idx = pair.0.clone(); -let slot_name = authored_name_at(env.source_indices.clone(), &pair.1.clone()); -match Rc::new({ let mut __result = Vec::new(); for p in Rc::new({ let mut __result = Vec::new(); for p in Rc::new(resolved_args.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (p.0.clone() == idx.clone()) { __result.push(p); } } __result }).iter().cloned() { __result.push(p.1.clone()); } __result }).first().cloned() { - Some(arg) => v2_rt::rc_map_insert(acc.clone(), slot_name.clone(), arg.clone()), - None => acc.clone(), -} -}); -let is_parameterized_alias = (((decl.inferred.clone() != None) && ((decl.children.clone().len() as i64) == 0)) && (decl.connective.clone() == Connective::NoConnective)); -if is_parameterized_alias { - { - let alias_target = match decl.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: target, .. }) => substitute_type_slots(&target, &slot_bindings, &type_name, &env.source_indices.clone()), - _ => n.clone(), -}; -let target_result = resolve_node_bounded(&alias_target, &env, &module_name, (depth.clone() + 1)); -let is_recursive = is_recursive_type_by_name(&env, type_name.clone()); -let resolved_node = Rc::new(Node { - name: type_name.clone(), - span: n.span.clone(), - ident_span: n.ident_span.clone(), - children: target_result.resolved.clone().children.clone(), - connective: target_result.resolved.clone().connective.clone(), - params: Rc::new(vec![]), - inferred: n.inferred.clone(), - return_cardinality: n.return_cardinality.clone(), - uses: n.uses.clone(), - body: n.body.clone(), - transport: n.transport.clone(), - properties: target_result.resolved.clone().properties.clone(), - type_annotation: n.type_annotation.clone(), - is_self_recursive: is_recursive, - has_non_tail_self_call: n.has_non_tail_self_call.clone(), - match_pattern: n.match_pattern.clone(), - expr_data: n.expr_data.clone(), - ident: None, -}); -Rc::new(NodeResolveResult { - resolved: resolved_node, - diagnostics: v2_rt::concat(v2_rt::concat(arity_diags, arg_diags), target_result.diagnostics.clone()), -}) -} - } else { + let slot_name = + authored_name_at(env.source_indices.clone(), &pair.1.clone()); + match Rc::new({ + let mut __result = Vec::new(); + for p in Rc::new({ + let mut __result = Vec::new(); + for p in Rc::new( + resolved_args + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + if (p.0.clone() == idx.clone()) { + __result.push(p); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(p.1.clone()); + } + __result + }) + .first() + .cloned() { - let substituted_children = Rc::new({ let mut __result = Vec::new(); for child in decl.children.clone().iter().cloned() { __result.push(substitute_type_slots(&child, &slot_bindings, &type_name, &env.source_indices.clone())); } __result }); -let is_recursive = is_recursive_type_by_name(&env, type_name.clone()); -let result = Rc::new(NodeResolveResult { - resolved: Rc::new(Node { - name: type_name.clone(), - span: n.span.clone(), - ident_span: n.ident_span.clone(), - children: substituted_children, - connective: decl.connective.clone(), - params: Rc::new(vec![]), - inferred: n.inferred.clone(), - return_cardinality: n.return_cardinality.clone(), - uses: n.uses.clone(), - body: n.body.clone(), - transport: n.transport.clone(), - properties: decl.properties.clone(), - type_annotation: n.type_annotation.clone(), - is_self_recursive: is_recursive, - has_non_tail_self_call: n.has_non_tail_self_call.clone(), - match_pattern: n.match_pattern.clone(), - expr_data: n.expr_data.clone(), - ident: None, -}), - diagnostics: v2_rt::concat(arity_diags, arg_diags), -}); -result -} + Some(arg) => v2_rt::rc_map_insert( + acc.clone(), + slot_name.clone(), + arg.clone(), + ), + None => acc.clone(), + } + }, + ); + let is_parameterized_alias = (((decl.inferred.clone() != None) + && ((decl.children.clone().len() as i64) == 0)) + && (decl.connective.clone() == Connective::NoConnective)); + if is_parameterized_alias { + { + let alias_target = match decl.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: target, .. }) => { + substitute_type_slots( + &target, + &slot_bindings, + &type_name, + &env.source_indices.clone(), + ) + } + _ => n.clone(), + }; + let target_result = resolve_node_bounded( + &alias_target, + &env, + &module_name, + (depth.clone() + 1), + ); + let is_recursive = is_recursive_type_by_name(&env, type_name.clone()); + let resolved_node = Rc::new(Node { + name: type_name.clone(), + span: n.span.clone(), + ident_span: n.ident_span.clone(), + children: target_result.resolved.clone().children.clone(), + connective: target_result.resolved.clone().connective.clone(), + params: Rc::new(vec![]), + inferred: n.inferred.clone(), + return_cardinality: n.return_cardinality.clone(), + uses: n.uses.clone(), + body: n.body.clone(), + transport: n.transport.clone(), + properties: target_result.resolved.clone().properties.clone(), + type_annotation: n.type_annotation.clone(), + is_self_recursive: is_recursive, + has_non_tail_self_call: n.has_non_tail_self_call.clone(), + match_pattern: n.match_pattern.clone(), + expr_data: n.expr_data.clone(), + ident: None, + }); + Rc::new(NodeResolveResult { + resolved: resolved_node, + diagnostics: v2_rt::concat( + v2_rt::concat(arity_diags, arg_diags), + target_result.diagnostics.clone(), + ), + }) } -} - } else { - { - let is_map = node_is_keyed_collection(&n, env.source_indices.clone()); -if is_map { + } else { + { + let substituted_children = Rc::new({ + let mut __result = Vec::new(); + for child in decl.children.clone().iter().cloned() { + __result.push(substitute_type_slots( + &child, + &slot_bindings, + &type_name, + &env.source_indices.clone(), + )); + } + __result + }); + let is_recursive = is_recursive_type_by_name(&env, type_name.clone()); + let result = Rc::new(NodeResolveResult { + resolved: Rc::new(Node { + name: type_name.clone(), + span: n.span.clone(), + ident_span: n.ident_span.clone(), + children: substituted_children, + connective: decl.connective.clone(), + params: Rc::new(vec![]), + inferred: n.inferred.clone(), + return_cardinality: n.return_cardinality.clone(), + uses: n.uses.clone(), + body: n.body.clone(), + transport: n.transport.clone(), + properties: decl.properties.clone(), + type_annotation: n.type_annotation.clone(), + is_self_recursive: is_recursive, + has_non_tail_self_call: n.has_non_tail_self_call.clone(), + match_pattern: n.match_pattern.clone(), + expr_data: n.expr_data.clone(), + ident: None, + }), + diagnostics: v2_rt::concat(arity_diags, arg_diags), + }); + result + } + } + } + } else { + { + let is_map = node_is_keyed_collection(&n, env.source_indices.clone()); + if is_map { + { + let type_name = authored_name(env.clone(), n.clone()); + let key_child_node = match n.children.clone().first().cloned() { + Some(k) => k.clone(), + None => unit_type(), + }; + let val_child_node = match n.children.clone().get(1 as usize).cloned() { + Some(v) => v.clone(), + None => unit_type(), + }; + let key_type = child_type_node(&key_child_node); + let val_type = child_type_node(&val_child_node); + let key_result = resolve_node_bounded( + &key_type, + &env, + &module_name, + (depth.clone() + 1), + ); + let key_resolved = key_result.resolved.clone(); + let key_diags = key_result.diagnostics.clone(); + let val_result = resolve_node_bounded( + &val_type, + &env, + &module_name, + (depth.clone() + 1), + ); + let val_resolved = val_result.resolved.clone(); + let val_diags = val_result.diagnostics.clone(); + let key_param_name = if (key_child_node.inferred.clone() != None) { + authored_name(env.clone(), key_child_node.clone()) + } else { + match container_param_name(type_name.clone(), 0) { + Some(pn) => pn.clone(), + None => authored_name(env.clone(), key_child_node.clone()), + } + }; + let val_param_name = if (val_child_node.inferred.clone() != None) { + authored_name(env.clone(), val_child_node.clone()) + } else { + match container_param_name(type_name.clone(), 1) { + Some(pn) => pn.clone(), + None => authored_name(env.clone(), val_child_node.clone()), + } + }; + let resolved_key_child = Rc::new(Node { + name: key_param_name, + span: key_child_node.span.clone(), + ident_span: key_child_node.ident_span.clone(), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: key_resolved, + })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let resolved_val_child = Rc::new(Node { + name: val_param_name, + span: val_child_node.span.clone(), + ident_span: val_child_node.ident_span.clone(), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: val_resolved, + })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + Rc::new(NodeResolveResult { + resolved: Rc::new(Node { + name: type_name.clone(), + span: n.span.clone(), + ident_span: n.ident_span.clone(), + children: Rc::new(vec![resolved_key_child, resolved_val_child]), + connective: n.connective.clone(), + params: n.params.clone(), + inferred: n.inferred.clone(), + return_cardinality: n.return_cardinality.clone(), + uses: n.uses.clone(), + body: n.body.clone(), + transport: n.transport.clone(), + properties: n.properties.clone(), + type_annotation: n.type_annotation.clone(), + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + diagnostics: v2_rt::concat(key_diags, val_diags), + }) + } + } else { + if ((n.children.clone().len() as i64) == 1) { { let type_name = authored_name(env.clone(), n.clone()); -let key_child_node = match n.children.clone().first().cloned() { - Some(k) => k.clone(), - None => unit_type(), -}; -let val_child_node = match n.children.clone().get(1 as usize).cloned() { - Some(v) => v.clone(), - None => unit_type(), -}; -let key_type = child_type_node(&key_child_node); -let val_type = child_type_node(&val_child_node); -let key_result = resolve_node_bounded(&key_type, &env, &module_name, (depth.clone() + 1)); -let key_resolved = key_result.resolved.clone(); -let key_diags = key_result.diagnostics.clone(); -let val_result = resolve_node_bounded(&val_type, &env, &module_name, (depth.clone() + 1)); -let val_resolved = val_result.resolved.clone(); -let val_diags = val_result.diagnostics.clone(); -let key_param_name = if (key_child_node.inferred.clone() != None) { - authored_name(env.clone(), key_child_node.clone()) - } else { - match container_param_name(type_name.clone(), 0) { - Some(pn) => pn.clone(), - None => authored_name(env.clone(), key_child_node.clone()), -} - }; -let val_param_name = if (val_child_node.inferred.clone() != None) { - authored_name(env.clone(), val_child_node.clone()) - } else { - match container_param_name(type_name.clone(), 1) { - Some(pn) => pn.clone(), - None => authored_name(env.clone(), val_child_node.clone()), -} - }; -let resolved_key_child = Rc::new(Node { - name: key_param_name, - span: key_child_node.span.clone(), - ident_span: key_child_node.ident_span.clone(), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: key_resolved, -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let resolved_val_child = Rc::new(Node { - name: val_param_name, - span: val_child_node.span.clone(), - ident_span: val_child_node.ident_span.clone(), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: val_resolved, -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -Rc::new(NodeResolveResult { - resolved: Rc::new(Node { - name: type_name.clone(), - span: n.span.clone(), - ident_span: n.ident_span.clone(), - children: Rc::new(vec![resolved_key_child, resolved_val_child]), - connective: n.connective.clone(), - params: n.params.clone(), - inferred: n.inferred.clone(), - return_cardinality: n.return_cardinality.clone(), - uses: n.uses.clone(), - body: n.body.clone(), - transport: n.transport.clone(), - properties: n.properties.clone(), - type_annotation: n.type_annotation.clone(), - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), - diagnostics: v2_rt::concat(key_diags, val_diags), -}) -} - } else { - if ((n.children.clone().len() as i64) == 1) { - { - let type_name = authored_name(env.clone(), n.clone()); -match n.children.clone().first().cloned() { - Some(child_node) => { + match n.children.clone().first().cloned() { + Some(child_node) => { let el_type = child_type_node(&child_node); -let el_result = resolve_node_bounded(&el_type, &env, &module_name, (depth.clone() + 1)); -let el_resolved = el_result.resolved.clone(); -let el_diags = el_result.diagnostics.clone(); -let el_param_name = if (child_node.inferred.clone() != None) { + let el_result = resolve_node_bounded( + &el_type, + &env, + &module_name, + (depth.clone() + 1), + ); + let el_resolved = el_result.resolved.clone(); + let el_diags = el_result.diagnostics.clone(); + let el_param_name = if (child_node.inferred.clone() != None) + { authored_name(env.clone(), child_node.clone()) } else { match container_param_name(type_name.clone(), 0) { - Some(pn) => pn.clone(), - None => authored_name(env.clone(), child_node.clone()), -} + Some(pn) => pn.clone(), + None => { + authored_name(env.clone(), child_node.clone()) + } + } }; -let resolved_child = Rc::new(Node { - name: el_param_name, - span: child_node.span.clone(), - ident_span: child_node.ident_span.clone(), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: el_resolved, -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -Rc::new(NodeResolveResult { - resolved: Rc::new(Node { - name: type_name.clone(), - span: n.span.clone(), - ident_span: n.ident_span.clone(), - children: Rc::new(vec![resolved_child]), - connective: n.connective.clone(), - params: n.params.clone(), - inferred: n.inferred.clone(), - return_cardinality: n.return_cardinality.clone(), - uses: n.uses.clone(), - body: n.body.clone(), - transport: n.transport.clone(), - properties: n.properties.clone(), - type_annotation: n.type_annotation.clone(), - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), - diagnostics: el_diags, -}) -}, - None => Rc::new(NodeResolveResult { - resolved: n.clone(), - diagnostics: Rc::new(vec![]), -}), -} -} - } else { - if ((n.children.clone().len() as i64) == 0) { - if is_recursive_type_for(&env, &n) { + let resolved_child = Rc::new(Node { + name: el_param_name, + span: child_node.span.clone(), + ident_span: child_node.ident_span.clone(), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: el_resolved, + })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); Rc::new(NodeResolveResult { - resolved: n.clone(), - diagnostics: Rc::new(vec![]), -}) - } else { - match lookup_type_for(&env, &n) { - Some(resolved) => { - let structurally_resolved = if (((resolved.connective.clone() == Connective::NoConnective) && ((resolved.children.clone().len() as i64) == 0)) && (resolved.inferred.clone() != None)) { - match resolved.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: target, .. }) => target.clone(), - _ => resolved.clone(), -} + resolved: Rc::new(Node { + name: type_name.clone(), + span: n.span.clone(), + ident_span: n.ident_span.clone(), + children: Rc::new(vec![resolved_child]), + connective: n.connective.clone(), + params: n.params.clone(), + inferred: n.inferred.clone(), + return_cardinality: n.return_cardinality.clone(), + uses: n.uses.clone(), + body: n.body.clone(), + transport: n.transport.clone(), + properties: n.properties.clone(), + type_annotation: n.type_annotation.clone(), + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + diagnostics: el_diags, + }) + } + None => Rc::new(NodeResolveResult { + resolved: n.clone(), + diagnostics: Rc::new(vec![]), + }), + } + } + } else { + if ((n.children.clone().len() as i64) == 0) { + if is_recursive_type_for(&env, &n) { + Rc::new(NodeResolveResult { + resolved: n.clone(), + diagnostics: Rc::new(vec![]), + }) + } else { + match lookup_type_for(&env, &n) { + Some(resolved) => { + let structurally_resolved = if (((resolved + .connective + .clone() + == Connective::NoConnective) + && ((resolved.children.clone().len() as i64) == 0)) + && (resolved.inferred.clone() != None)) + { + match resolved.inferred.clone().as_deref().cloned() + { + Some(InferredNode::Resolved { + node: target, + .. + }) => target.clone(), + _ => resolved.clone(), + } } else { resolved.clone() }; -let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); -let final_resolved = if is_optional { + let is_optional = (n.return_cardinality.clone() + == Cardinality::CardOptional); + let final_resolved = if is_optional { with_optional_cardinality(&structurally_resolved) } else { structurally_resolved }; -Rc::new(NodeResolveResult { - resolved: final_resolved, - diagnostics: Rc::new(vec![]), -}) -}, - None => { + Rc::new(NodeResolveResult { + resolved: final_resolved, + diagnostics: Rc::new(vec![]), + }) + } + None => { let n_is_error = if (n.inferred.clone() != None) { - is_compiler_error(n.inferred.clone().clone().unwrap()) + is_compiler_error( + n.inferred.clone().clone().unwrap(), + ) } else { false }; -let n_is_callable = ((n.params.clone().len() as i64) > 0); -let n_is_type_var = if (n.inferred.clone() != None) { - is_type_variable(n.inferred.clone().clone().unwrap()) + let n_is_callable = + ((n.params.clone().len() as i64) > 0); + let n_is_type_var = if (n.inferred.clone() != None) { + is_type_variable( + n.inferred.clone().clone().unwrap(), + ) } else { false }; -if (((is_kernel_type(authored_name(env.clone(), n.clone())) || n_is_type_var) || n_is_error) || n_is_callable) { + if (((is_kernel_type(authored_name( + env.clone(), + n.clone(), + )) || n_is_type_var) + || n_is_error) + || n_is_callable) + { Rc::new(NodeResolveResult { - resolved: n.clone(), - diagnostics: Rc::new(vec![]), -}) + resolved: n.clone(), + diagnostics: Rc::new(vec![]), + }) } else { Rc::new(NodeResolveResult { - resolved: n.clone(), - diagnostics: Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::UnresolvedType { - name: authored_name(env.clone(), n.clone()), - span: n.span.clone(), -}), module_name.clone())]), -}) + resolved: n.clone(), + diagnostics: Rc::new(vec![make_error_node( + Rc::new( + CompilerDiagnostic::UnresolvedType { + name: authored_name( + env.clone(), + n.clone(), + ), + span: n.span.clone(), + }, + ), + module_name.clone(), + )]), + }) } -}, -} + } } - } else { - Rc::new(NodeResolveResult { - resolved: n.clone(), - diagnostics: Rc::new(vec![]), -}) } + } else { + Rc::new(NodeResolveResult { + resolved: n.clone(), + diagnostics: Rc::new(vec![]), + }) } } -} + } } } -} + } }) } -pub fn resolve_optional_node(n: &Option>, env: Rc, module_name: String) -> Rc { +pub fn resolve_optional_node( + n: &Option>, + env: Rc, + module_name: String, +) -> Rc { if (n.clone() == None) { Rc::new(NodeResolveResult { - resolved: unit_type(), - diagnostics: Rc::new(vec![]), -}) + resolved: unit_type(), + diagnostics: Rc::new(vec![]), + }) } else { match (*n.clone().unwrap()).clone() { - InferredNode::Resolved { node: inner, .. } => resolve_node(inner.clone(), env, module_name), - InferredNode::CompilerError { message: msg, span: sp, .. } => Rc::new(NodeResolveResult { - resolved: make_expr_error_node(ExprErrorKind::SemanticExprError, &msg, &sp), - diagnostics: Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::InternalError { - message: msg.clone(), - span: sp.clone(), -}), module_name)]), -}), - InferredNode::TypeVariable { .. } => Rc::new(NodeResolveResult { - resolved: unit_type(), - diagnostics: Rc::new(vec![]), -}), -} + InferredNode::Resolved { node: inner, .. } => { + resolve_node(inner.clone(), env, module_name) + } + InferredNode::CompilerError { + message: msg, + span: sp, + .. + } => Rc::new(NodeResolveResult { + resolved: make_expr_error_node(ExprErrorKind::SemanticExprError, &msg, &sp), + diagnostics: Rc::new(vec![make_error_node( + Rc::new(CompilerDiagnostic::InternalError { + message: msg.clone(), + span: sp.clone(), + }), + module_name, + )]), + }), + InferredNode::TypeVariable { .. } => Rc::new(NodeResolveResult { + resolved: unit_type(), + diagnostics: Rc::new(vec![]), + }), + } } } pub fn resolve_field(field: &Rc, env: &Rc, module_name: &String) -> Rc { { - let type_result = resolve_node(field_node_type_expr(&field), env.clone(), module_name.clone()); -let type_resolved = type_result.resolved.clone(); -let type_diags = type_result.diagnostics.clone(); -let default_resolved = match field_node_default_value(&field) { - Some(default_value) => Some(resolve_expr_types(&default_value, &env, module_name.clone())), - None => None, -}; -let default_diags = match default_resolved.clone() { - Some(result) => result.diagnostics.clone(), - None => Rc::new(vec![]), -}; -Rc::new(FieldResult { - field: make_field_node(&field_node_name_at(field.clone(), env.source_indices.clone()), type_resolved, field_node_cardinality(field.clone()), match default_resolved.clone() { - Some(result) => Some(result.expr.clone()), - None => None, -}, field_node_from_key(field.clone(), env.source_indices.clone()), field.span.clone(), node_name_span(&field)), - diagnostics: v2_rt::concat(type_diags, default_diags), -}) -} + let type_result = resolve_node( + field_node_type_expr(&field), + env.clone(), + module_name.clone(), + ); + let type_resolved = type_result.resolved.clone(); + let type_diags = type_result.diagnostics.clone(); + let default_resolved = match field_node_default_value(&field) { + Some(default_value) => Some(resolve_expr_types( + &default_value, + &env, + module_name.clone(), + )), + None => None, + }; + let default_diags = match default_resolved.clone() { + Some(result) => result.diagnostics.clone(), + None => Rc::new(vec![]), + }; + Rc::new(FieldResult { + field: make_field_node( + &field_node_name_at(field.clone(), env.source_indices.clone()), + type_resolved, + field_node_cardinality(field.clone()), + match default_resolved.clone() { + Some(result) => Some(result.expr.clone()), + None => None, + }, + field_node_from_key(field.clone(), env.source_indices.clone()), + field.span.clone(), + node_name_span(&field), + ), + diagnostics: v2_rt::concat(type_diags, default_diags), + }) + } } pub fn resolve_param(param: &Rc, env: &Rc, module_name: &String) -> Rc { { - let type_result = resolve_node(param_node_type_expr(¶m), env.clone(), module_name.clone()); -let type_resolved = type_result.resolved.clone(); -let type_diags = type_result.diagnostics.clone(); -let default_resolved = match param_node_default_value(¶m) { - Some(default_value) => Some(resolve_expr_types(&default_value, &env, module_name.clone())), - None => None, -}; -let default_diags = match default_resolved.clone() { - Some(result) => result.diagnostics.clone(), - None => Rc::new(vec![]), -}; -Rc::new(ParamResult { - param: make_param_node(¶m_node_name_at(param.clone(), env.source_indices.clone()), type_resolved, match default_resolved.clone() { - Some(result) => Some(result.expr.clone()), - None => None, -}, param.span.clone(), node_name_span(¶m)), - diagnostics: v2_rt::concat(type_diags, default_diags), -}) -} + let type_result = resolve_node( + param_node_type_expr(¶m), + env.clone(), + module_name.clone(), + ); + let type_resolved = type_result.resolved.clone(); + let type_diags = type_result.diagnostics.clone(); + let default_resolved = match param_node_default_value(¶m) { + Some(default_value) => Some(resolve_expr_types( + &default_value, + &env, + module_name.clone(), + )), + None => None, + }; + let default_diags = match default_resolved.clone() { + Some(result) => result.diagnostics.clone(), + None => Rc::new(vec![]), + }; + Rc::new(ParamResult { + param: make_param_node( + ¶m_node_name_at(param.clone(), env.source_indices.clone()), + type_resolved, + match default_resolved.clone() { + Some(result) => Some(result.expr.clone()), + None => None, + }, + param.span.clone(), + node_name_span(¶m), + ), + diagnostics: v2_rt::concat(type_diags, default_diags), + }) + } } -pub fn resolve_resource_use(ru: &Rc, env: &Rc, module_name: String) -> Rc { +pub fn resolve_resource_use( + ru: &Rc, + env: &Rc, + module_name: String, +) -> Rc { { let type_result = resolve_node(resource_use_resource(&ru), env.clone(), module_name); -let type_resolved = type_result.resolved.clone(); -let type_diags = type_result.diagnostics.clone(); -Rc::new(ResourceUseResult { - resource_use: make_resource_use_node(&resource_use_name_at(ru.clone(), env.source_indices.clone()), type_resolved, ru.span.clone(), node_name_span(&ru)), - diagnostics: type_diags, -}) -} + let type_resolved = type_result.resolved.clone(); + let type_diags = type_result.diagnostics.clone(); + Rc::new(ResourceUseResult { + resource_use: make_resource_use_node( + &resource_use_name_at(ru.clone(), env.source_indices.clone()), + type_resolved, + ru.span.clone(), + node_name_span(&ru), + ), + diagnostics: type_diags, + }) + } } -pub fn resolve_named_arg(arg: &Rc, env: &Rc, module_name: String) -> Rc { +pub fn resolve_named_arg( + arg: &Rc, + env: &Rc, + module_name: String, +) -> Rc { { let value_result = resolve_expr_types(&arg_value(&arg), &env, module_name); -let value_expr = value_result.expr.clone(); -let value_diags = value_result.diagnostics.clone(); -Rc::new(NamedArgResolveResult { - arg: make_arg_node(arg_name_at(arg.clone(), env.source_indices.clone()), value_expr, arg.span.clone(), node_name_span(&arg)), - diagnostics: value_diags, -}) -} + let value_expr = value_result.expr.clone(); + let value_diags = value_result.diagnostics.clone(); + Rc::new(NamedArgResolveResult { + arg: make_arg_node( + arg_name_at(arg.clone(), env.source_indices.clone()), + value_expr, + arg.span.clone(), + node_name_span(&arg), + ), + diagnostics: value_diags, + }) + } } -pub fn resolve_field_init(field_init: &Rc, env: &Rc, module_name: String) -> Rc { +pub fn resolve_field_init( + field_init: &Rc, + env: &Rc, + module_name: String, +) -> Rc { { - let value_result = resolve_expr_types(&field_init_node_value(&field_init), &env, module_name); -let value_expr = value_result.expr.clone(); -let value_diags = value_result.diagnostics.clone(); -Rc::new(FieldInitResolveResult { - field_init: make_field_init_node(&field_init_node_name_at(field_init.clone(), env.source_indices.clone()), value_expr, field_init.span.clone(), node_name_span(&field_init)), - diagnostics: value_diags, -}) -} + let value_result = + resolve_expr_types(&field_init_node_value(&field_init), &env, module_name); + let value_expr = value_result.expr.clone(); + let value_diags = value_result.diagnostics.clone(); + Rc::new(FieldInitResolveResult { + field_init: make_field_init_node( + &field_init_node_name_at(field_init.clone(), env.source_indices.clone()), + value_expr, + field_init.span.clone(), + node_name_span(&field_init), + ), + diagnostics: value_diags, + }) + } } -pub fn resolve_match_arm(arm: &Rc, env: &Rc, module_name: &String) -> Rc { +pub fn resolve_match_arm( + arm: &Rc, + env: &Rc, + module_name: &String, +) -> Rc { { let arm_g = arm_guard(&arm); -let guard_result = match arm_g { - Some(guard) => Some(resolve_expr_types(&guard, &env, module_name.clone())), - None => None, -}; -let guard_diags = match guard_result.clone() { - Some(result) => result.diagnostics.clone(), - None => Rc::new(vec![]), -}; -let body_result = resolve_expr_types(&arm_body(&arm), &env, module_name.clone()); -let body_expr = body_result.expr.clone(); -let body_diags = body_result.diagnostics.clone(); -Rc::new(MatchArmResolveResult { - arm: make_arm_node(arm_pattern(arm.clone()), match guard_result.clone() { - Some(result) => Some(result.expr.clone()), - None => None, -}, body_expr, arm.span.clone()), - diagnostics: v2_rt::concat(guard_diags, body_diags), -}) -} + let guard_result = match arm_g { + Some(guard) => Some(resolve_expr_types(&guard, &env, module_name.clone())), + None => None, + }; + let guard_diags = match guard_result.clone() { + Some(result) => result.diagnostics.clone(), + None => Rc::new(vec![]), + }; + let body_result = resolve_expr_types(&arm_body(&arm), &env, module_name.clone()); + let body_expr = body_result.expr.clone(); + let body_diags = body_result.diagnostics.clone(); + Rc::new(MatchArmResolveResult { + arm: make_arm_node( + arm_pattern(arm.clone()), + match guard_result.clone() { + Some(result) => Some(result.expr.clone()), + None => None, + }, + body_expr, + arm.span.clone(), + ), + diagnostics: v2_rt::concat(guard_diags, body_diags), + }) + } } -pub fn resolve_string_part(part: Rc, env: Rc, module_name: String) -> Rc { +pub fn resolve_string_part( + part: Rc, + env: Rc, + module_name: String, +) -> Rc { match (*part).clone() { - StringPart::Text { value, .. } => Rc::new(StringPartResolveResult { - part: Rc::new(StringPart::Text { - value: value.clone(), -}), - diagnostics: Rc::new(vec![]), -}), - StringPart::Interpolation { expr, .. } => { - let expr_result = resolve_expr_types(&expr, &env, module_name); -let resolved_expr = expr_result.expr.clone(); -let expr_diags = expr_result.diagnostics.clone(); -Rc::new(StringPartResolveResult { - part: Rc::new(StringPart::Interpolation { - expr: resolved_expr, -}), - diagnostics: expr_diags, -}) -}, -} + StringPart::Text { value, .. } => Rc::new(StringPartResolveResult { + part: Rc::new(StringPart::Text { + value: value.clone(), + }), + diagnostics: Rc::new(vec![]), + }), + StringPart::Interpolation { expr, .. } => { + let expr_result = resolve_expr_types(&expr, &env, module_name); + let resolved_expr = expr_result.expr.clone(); + let expr_diags = expr_result.diagnostics.clone(); + Rc::new(StringPartResolveResult { + part: Rc::new(StringPart::Interpolation { + expr: resolved_expr, + }), + diagnostics: expr_diags, + }) + } + } } -pub fn resolve_transport_binding(transport: &Rc, env: &Rc, module_name: &String) -> Rc { +pub fn resolve_transport_binding( + transport: &Rc, + env: &Rc, + module_name: &String, +) -> Rc { if is_local_transport(&transport, &env.source_indices.clone()) { Rc::new(TransportResolveResult { - transport: transport.clone(), - diagnostics: Rc::new(vec![]), -}) + transport: transport.clone(), + diagnostics: Rc::new(vec![]), + }) } else { { - let prop_results = Rc::new({ let mut __result = Vec::new(); for p in transport.properties.clone().iter().cloned() { __result.push({ - let val_result = resolve_expr_types(&field_init_node_value(&p), &env, module_name.clone()); -Rc::new(FieldInitResolveResult { - field_init: make_field_init_node(&field_init_node_name_at(p.clone(), env.source_indices.clone()), val_result.expr.clone(), p.span.clone(), node_name_span(&p)), - diagnostics: val_result.diagnostics.clone(), -}) -}); } __result }); -let resolved_props = Rc::new({ let mut __result = Vec::new(); for pr in prop_results.clone().iter().cloned() { __result.push(pr.field_init.clone()); } __result }); -let prop_diags = Rc::new({ let mut __result = Vec::new(); for pr in prop_results.clone().iter().cloned() { __result.extend((*pr.diagnostics.clone()).iter().cloned()); } __result }); -let child_results = Rc::new({ let mut __result = Vec::new(); for c in transport.children.clone().iter().cloned() { __result.push(resolve_expr_types(&c, &env, module_name.clone())); } __result }); -let resolved_children = Rc::new({ let mut __result = Vec::new(); for cr in child_results.clone().iter().cloned() { __result.push(cr.expr.clone()); } __result }); -let child_diags = Rc::new({ let mut __result = Vec::new(); for cr in child_results.clone().iter().cloned() { __result.extend((*cr.diagnostics.clone()).iter().cloned()); } __result }); -let body_diags = match transport_request_body(transport.clone(), env.source_indices.clone()) { - Some(b) => match (*b.expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => Rc::new(vec![]), - _ => Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::InternalError { + let prop_results = Rc::new({ + let mut __result = Vec::new(); + for p in transport.properties.clone().iter().cloned() { + __result.push({ + let val_result = resolve_expr_types( + &field_init_node_value(&p), + &env, + module_name.clone(), + ); + Rc::new(FieldInitResolveResult { + field_init: make_field_init_node( + &field_init_node_name_at(p.clone(), env.source_indices.clone()), + val_result.expr.clone(), + p.span.clone(), + node_name_span(&p), + ), + diagnostics: val_result.diagnostics.clone(), + }) + }); + } + __result + }); + let resolved_props = Rc::new({ + let mut __result = Vec::new(); + for pr in prop_results.clone().iter().cloned() { + __result.push(pr.field_init.clone()); + } + __result + }); + let prop_diags = Rc::new({ + let mut __result = Vec::new(); + for pr in prop_results.clone().iter().cloned() { + __result.extend((*pr.diagnostics.clone()).iter().cloned()); + } + __result + }); + let child_results = Rc::new({ + let mut __result = Vec::new(); + for c in transport.children.clone().iter().cloned() { + __result.push(resolve_expr_types(&c, &env, module_name.clone())); + } + __result + }); + let resolved_children = Rc::new({ + let mut __result = Vec::new(); + for cr in child_results.clone().iter().cloned() { + __result.push(cr.expr.clone()); + } + __result + }); + let child_diags = Rc::new({ + let mut __result = Vec::new(); + for cr in child_results.clone().iter().cloned() { + __result.extend((*cr.diagnostics.clone()).iter().cloned()); + } + __result + }); + let body_diags = + match transport_request_body(transport.clone(), env.source_indices.clone()) { + Some(b) => match (*b.expr_data.clone()).clone() { + ExprData::ExprRecordLit { .. } => Rc::new(vec![]), + _ => Rc::new( + vec![make_error_node(Rc::new(CompilerDiagnostic::InternalError { message: "transport body must be a record expression { field: value, ... }".to_string(), span: b.span.clone(), -}), module_name.clone())]), -}, - None => Rc::new(vec![]), -}; -Rc::new(TransportResolveResult { - transport: make_transport_node(resolved_props, resolved_children, transport.body.clone(), transport.span.clone()), - diagnostics: v2_rt::concat(v2_rt::concat(prop_diags, child_diags), body_diags), -}) -} +}), module_name.clone())], + ), + }, + None => Rc::new(vec![]), + }; + Rc::new(TransportResolveResult { + transport: make_transport_node( + resolved_props, + resolved_children, + transport.body.clone(), + transport.span.clone(), + ), + diagnostics: v2_rt::concat(v2_rt::concat(prop_diags, child_diags), body_diags), + }) + } } } -pub fn resolve_expr_types(texpr: &Rc, env: &Rc, module_name: String) -> Rc { +pub fn resolve_expr_types( + texpr: &Rc, + env: &Rc, + module_name: String, +) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprLiteral { .. } => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), -}), - ExprData::ExprError { kind, message, .. } => Rc::new(ExprResolveResult { - expr: make_expr_error_node(kind.clone(), &message, &texpr.span.clone()), - diagnostics: Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::InternalError { - message: message.clone(), - span: texpr.span.clone(), -}), module_name.clone())]), -}), - ExprData::ExprVar { .. } => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), -}), - ExprData::ExprFieldAccess { .. } => { - let r = match texpr.children.clone().first().cloned() { - Some(base) => resolve_expr_types(&base, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -Rc::new(ExprResolveResult { - expr: map_children(&texpr, |child| r.expr.clone()), - diagnostics: r.diagnostics.clone(), -}) -}, - ExprData::ExprCall { call_semantics: cs, descent_evidence: de, .. } => { - let resolved_children = Rc::new({ let mut __result = Vec::new(); for arg_node in texpr.children.clone().iter().cloned() { __result.push({ - let val = match arg_node.children.clone().first().cloned() { - Some(v) => v.clone(), - None => arg_node.clone(), -}; -let vr = resolve_expr_types(&val, &env, module_name.clone()); -make_arg_node(if (arg_node.ident_span.clone() == None) { - None - } else { - Some(authored_name(env.clone(), arg_node.clone())) - }, vr.expr.clone(), arg_node.span.clone(), node_name_span(&arg_node)) -}); } __result }); -let all_diags = Rc::new({ let mut __result = Vec::new(); for arg_node in texpr.children.clone().iter().cloned() { __result.extend((*{ - let val = match arg_node.children.clone().first().cloned() { - Some(v) => v.clone(), - None => arg_node.clone(), -}; -let vr = resolve_expr_types(&val, &env, module_name.clone()); -vr.diagnostics.clone() -}).iter().cloned()); } __result }); -Rc::new(ExprResolveResult { - expr: make_named_expr_node(&expr_call_func_at(texpr.clone(), env.source_indices.clone()), Rc::new(ExprData::ExprCall { - call_semantics: cs.clone(), - descent_evidence: de.clone(), -}), resolved_children, texpr.inferred.clone(), texpr.span.clone(), node_name_span(&texpr)), - diagnostics: all_diags, -}) -}, - ExprData::ExprMethodCall { method_semantics: ms, .. } => { - let resolved_children = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(texpr.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ - let idx = pair.0.clone(); -let child = pair.1.clone(); -if (idx.clone() == 0) { + ExprData::ExprLiteral { .. } => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), + }), + ExprData::ExprError { kind, message, .. } => Rc::new(ExprResolveResult { + expr: make_expr_error_node(kind.clone(), &message, &texpr.span.clone()), + diagnostics: Rc::new(vec![make_error_node( + Rc::new(CompilerDiagnostic::InternalError { + message: message.clone(), + span: texpr.span.clone(), + }), + module_name.clone(), + )]), + }), + ExprData::ExprVar { .. } => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), + }), + ExprData::ExprFieldAccess { .. } => { + let r = match texpr.children.clone().first().cloned() { + Some(base) => resolve_expr_types(&base, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + Rc::new(ExprResolveResult { + expr: map_children(&texpr, |child| r.expr.clone()), + diagnostics: r.diagnostics.clone(), + }) + } + ExprData::ExprCall { + call_semantics: cs, + descent_evidence: de, + .. + } => { + let resolved_children = Rc::new({ + let mut __result = Vec::new(); + for arg_node in texpr.children.clone().iter().cloned() { + __result.push({ + let val = match arg_node.children.clone().first().cloned() { + Some(v) => v.clone(), + None => arg_node.clone(), + }; + let vr = resolve_expr_types(&val, &env, module_name.clone()); + make_arg_node( + if (arg_node.ident_span.clone() == None) { + None + } else { + Some(authored_name(env.clone(), arg_node.clone())) + }, + vr.expr.clone(), + arg_node.span.clone(), + node_name_span(&arg_node), + ) + }); + } + __result + }); + let all_diags = Rc::new({ + let mut __result = Vec::new(); + for arg_node in texpr.children.clone().iter().cloned() { + __result.extend( + (*{ + let val = match arg_node.children.clone().first().cloned() { + Some(v) => v.clone(), + None => arg_node.clone(), + }; + let vr = resolve_expr_types(&val, &env, module_name.clone()); + vr.diagnostics.clone() + }) + .iter() + .cloned(), + ); + } + __result + }); + Rc::new(ExprResolveResult { + expr: make_named_expr_node( + &expr_call_func_at(texpr.clone(), env.source_indices.clone()), + Rc::new(ExprData::ExprCall { + call_semantics: cs.clone(), + descent_evidence: de.clone(), + }), + resolved_children, + texpr.inferred.clone(), + texpr.span.clone(), + node_name_span(&texpr), + ), + diagnostics: all_diags, + }) + } + ExprData::ExprMethodCall { + method_semantics: ms, + .. + } => { + let resolved_children = Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + texpr + .children + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() { - let rr = resolve_expr_types(&child, &env, module_name.clone()); -rr.expr.clone() -} - } else { + __result.push({ + let idx = pair.0.clone(); + let child = pair.1.clone(); + if (idx.clone() == 0) { + { + let rr = resolve_expr_types(&child, &env, module_name.clone()); + rr.expr.clone() + } + } else { + { + let val = match child.children.clone().first().cloned() { + Some(v) => v.clone(), + None => child.clone(), + }; + let vr = resolve_expr_types(&val, &env, module_name.clone()); + make_arg_node( + if (child.ident_span.clone() == None) { + None + } else { + Some(authored_name_at( + env.source_indices.clone(), + &child, + )) + }, + vr.expr.clone(), + child.span.clone(), + node_name_span(&child), + ) + } + } + }); + } + __result + }); + let all_diags = Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + texpr + .children + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() { - let val = match child.children.clone().first().cloned() { - Some(v) => v.clone(), - None => child.clone(), -}; -let vr = resolve_expr_types(&val, &env, module_name.clone()); -make_arg_node(if (child.ident_span.clone() == None) { - None - } else { - Some(authored_name_at(env.source_indices.clone(), &child)) - }, vr.expr.clone(), child.span.clone(), node_name_span(&child)) -} - } -}); } __result }); -let all_diags = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(texpr.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.extend((*{ - let idx = pair.0.clone(); -let child = pair.1.clone(); -if (idx.clone() == 0) { + __result.extend( + (*{ + let idx = pair.0.clone(); + let child = pair.1.clone(); + if (idx.clone() == 0) { + { + let rr = + resolve_expr_types(&child, &env, module_name.clone()); + rr.diagnostics.clone() + } + } else { + { + let val = match child.children.clone().first().cloned() { + Some(v) => v.clone(), + None => child.clone(), + }; + let vr = + resolve_expr_types(&val, &env, module_name.clone()); + vr.diagnostics.clone() + } + } + }) + .iter() + .cloned(), + ); + } + __result + }); + Rc::new(ExprResolveResult { + expr: make_named_expr_node( + &expr_method_name_at(texpr.clone(), env.source_indices.clone()), + Rc::new(ExprData::ExprMethodCall { + method_semantics: ms.clone(), + }), + resolved_children, + texpr.inferred.clone(), + texpr.span.clone(), + node_name_span(&texpr), + ), + diagnostics: all_diags, + }) + } + ExprData::ExprMatch => { + let resolved_children = Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + texpr + .children + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() { - let rr = resolve_expr_types(&child, &env, module_name.clone()); -rr.diagnostics.clone() -} - } else { + __result.push({ + let idx = pair.0.clone(); + let child = pair.1.clone(); + if (idx.clone() == 0) { + { + let sr = resolve_expr_types(&child, &env, module_name.clone()); + sr.expr.clone() + } + } else { + { + let arm_ch = child.children.clone(); + let has_guard = ((arm_ch.clone().len() as i64) == 2); + if has_guard.clone() { + { + let guard_r = match arm_ch.clone().first().cloned() { + Some(g) => resolve_expr_types( + &g, + &env, + module_name.clone(), + ), + None => Rc::new(ExprResolveResult { + expr: child.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + let body_r = + match arm_ch.clone().get(1 as usize).cloned() { + Some(b) => resolve_expr_types( + &b, + &env, + module_name.clone(), + ), + None => Rc::new(ExprResolveResult { + expr: child.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + make_arm_node( + match child.match_pattern.clone() { + Some(p) => p.clone(), + None => Rc::new(MatchPattern::Wildcard), + }, + Some(guard_r.expr.clone()), + body_r.expr.clone(), + child.span.clone(), + ) + } + } else { + { + let body_r = match arm_ch.clone().first().cloned() { + Some(b) => resolve_expr_types( + &b, + &env, + module_name.clone(), + ), + None => Rc::new(ExprResolveResult { + expr: child.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + make_arm_node( + match child.match_pattern.clone() { + Some(p) => p.clone(), + None => Rc::new(MatchPattern::Wildcard), + }, + None, + body_r.expr.clone(), + child.span.clone(), + ) + } + } + } + } + }); + } + __result + }); + let all_diags = Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + texpr + .children + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() { - let val = match child.children.clone().first().cloned() { - Some(v) => v.clone(), - None => child.clone(), -}; -let vr = resolve_expr_types(&val, &env, module_name.clone()); -vr.diagnostics.clone() + __result.extend( + (*{ + let idx = pair.0.clone(); + let child = pair.1.clone(); + if (idx.clone() == 0) { + { + let sr = + resolve_expr_types(&child, &env, module_name.clone()); + sr.diagnostics.clone() + } + } else { + { + let arm_ch = child.children.clone(); + let has_guard = ((arm_ch.clone().len() as i64) == 2); + if has_guard.clone() { + { + let guard_r = match arm_ch.clone().first().cloned() + { + Some(g) => resolve_expr_types( + &g, + &env, + module_name.clone(), + ), + None => Rc::new(ExprResolveResult { + expr: child.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + let body_r = + match arm_ch.clone().get(1 as usize).cloned() { + Some(b) => resolve_expr_types( + &b, + &env, + module_name.clone(), + ), + None => Rc::new(ExprResolveResult { + expr: child.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + v2_rt::concat( + guard_r.diagnostics.clone(), + body_r.diagnostics.clone(), + ) + } + } else { + { + let body_r = match arm_ch.clone().first().cloned() { + Some(b) => resolve_expr_types( + &b, + &env, + module_name.clone(), + ), + None => Rc::new(ExprResolveResult { + expr: child.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + body_r.diagnostics.clone() + } + } + } + } + }) + .iter() + .cloned(), + ); + } + __result + }); + Rc::new(ExprResolveResult { + expr: make_expr_node( + Rc::new(ExprData::ExprMatch), + resolved_children, + texpr.inferred.clone(), + texpr.span.clone(), + ), + diagnostics: all_diags, + }) + } + ExprData::ExprIf => { + let ch = texpr.children.clone(); + let cr = match ch.clone().first().cloned() { + Some(c) => resolve_expr_types(&c, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + let tr = match ch.clone().get(1 as usize).cloned() { + Some(t) => resolve_expr_types(&t, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + let er = match ch.clone().get(2 as usize).cloned() { + Some(e) => Some(resolve_expr_types(&e, &env, module_name.clone())), + None => None, + }; + let resolved_children = match er.clone() { + Some(r) => Rc::new(vec![cr.expr.clone(), tr.expr.clone(), r.expr.clone()]), + None => Rc::new(vec![cr.expr.clone(), tr.expr.clone()]), + }; + Rc::new(ExprResolveResult { + expr: make_expr_node( + Rc::new(ExprData::ExprIf), + resolved_children, + texpr.inferred.clone(), + texpr.span.clone(), + ), + diagnostics: v2_rt::concat( + v2_rt::concat(cr.diagnostics.clone(), tr.diagnostics.clone()), + match er.clone() { + Some(r) => r.diagnostics.clone(), + None => Rc::new(vec![]), + }, + ), + }) + } + ExprData::ExprLet => { + let ch = texpr.children.clone(); + let vr = match ch.clone().first().cloned() { + Some(v) => resolve_expr_types(&v, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + let br = match ch.clone().get(1 as usize).cloned() { + Some(bd) => Some(resolve_expr_types(&bd, &env, module_name.clone())), + None => None, + }; + let resolved_children = match br.clone() { + Some(r) => Rc::new(vec![vr.expr.clone(), r.expr.clone()]), + None => Rc::new(vec![vr.expr.clone()]), + }; + Rc::new(ExprResolveResult { + expr: make_named_expr_node( + &let_binding_name_at(texpr.clone(), env.source_indices.clone()), + Rc::new(ExprData::ExprLet), + resolved_children, + texpr.inferred.clone(), + texpr.span.clone(), + node_name_span(&texpr), + ), + diagnostics: v2_rt::concat( + vr.diagnostics.clone(), + match br.clone() { + Some(r) => r.diagnostics.clone(), + None => Rc::new(vec![]), + }, + ), + }) + } + ExprData::ExprRecordLit { + parent_enum: pe, .. + } => { + let resolved_children = Rc::new({ + let mut __result = Vec::new(); + for fi_node in texpr.children.clone().iter().cloned() { + __result.push({ + let val = match fi_node.children.clone().first().cloned() { + Some(v) => v.clone(), + None => fi_node.clone(), + }; + let vr = resolve_expr_types(&val, &env, module_name.clone()); + make_field_init_node( + &authored_name(env.clone(), fi_node.clone()), + vr.expr.clone(), + fi_node.span.clone(), + node_name_span(&fi_node), + ) + }); + } + __result + }); + let all_diags = Rc::new({ + let mut __result = Vec::new(); + for fi_node in texpr.children.clone().iter().cloned() { + __result.extend( + (*{ + let val = match fi_node.children.clone().first().cloned() { + Some(v) => v.clone(), + None => fi_node.clone(), + }; + let vr = resolve_expr_types(&val, &env, module_name.clone()); + vr.diagnostics.clone() + }) + .iter() + .cloned(), + ); + } + __result + }); + Rc::new(ExprResolveResult { + expr: make_named_expr_node( + &authored_name_at(env.source_indices.clone(), &texpr), + Rc::new(ExprData::ExprRecordLit { + parent_enum: pe.clone(), + }), + resolved_children, + texpr.inferred.clone(), + texpr.span.clone(), + node_name_span(&texpr), + ), + diagnostics: all_diags, + }) + } + ExprData::ExprListLit => { + let el_results = Rc::new({ + let mut __result = Vec::new(); + for el in texpr.children.clone().iter().cloned() { + __result.push(resolve_expr_types(&el, &env, module_name.clone())); + } + __result + }); + let resolved_children = Rc::new({ + let mut __result = Vec::new(); + for r in el_results.clone().iter().cloned() { + __result.push(r.expr.clone()); + } + __result + }); + let all_diags = Rc::new({ + let mut __result = Vec::new(); + for r in el_results.clone().iter().cloned() { + __result.extend((*r.diagnostics.clone()).iter().cloned()); + } + __result + }); + Rc::new(ExprResolveResult { + expr: make_expr_node( + Rc::new(ExprData::ExprListLit), + resolved_children, + texpr.inferred.clone(), + texpr.span.clone(), + ), + diagnostics: all_diags, + }) + } + ExprData::ExprBinOp { + op, + algebra_field: af, + .. + } => { + let ch = texpr.children.clone(); + let lr = match ch.clone().first().cloned() { + Some(l) => resolve_expr_types(&l, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + let rr = match ch.clone().get(1 as usize).cloned() { + Some(r) => resolve_expr_types(&r, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + Rc::new(ExprResolveResult { + expr: make_expr_node( + Rc::new(ExprData::ExprBinOp { + op: op.clone(), + algebra_field: af.clone(), + }), + Rc::new(vec![lr.expr.clone(), rr.expr.clone()]), + texpr.inferred.clone(), + texpr.span.clone(), + ), + diagnostics: v2_rt::concat(lr.diagnostics.clone(), rr.diagnostics.clone()), + }) + } + ExprData::ExprUnaryOp { op, .. } => { + let r = match texpr.children.clone().first().cloned() { + Some(o) => resolve_expr_types(&o, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + Rc::new(ExprResolveResult { + expr: make_expr_node( + Rc::new(ExprData::ExprUnaryOp { op: op.clone() }), + Rc::new(vec![r.expr.clone()]), + texpr.inferred.clone(), + texpr.span.clone(), + ), + diagnostics: r.diagnostics.clone(), + }) + } + ExprData::ExprLambda => { + let lam_param_nodes = Rc::new( + texpr + .children + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + let r = match texpr.children.clone().first().cloned() { + Some(b) => resolve_expr_types(&b, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + Rc::new(ExprResolveResult { + expr: make_expr_node( + Rc::new(ExprData::ExprLambda), + v2_rt::concat(Rc::new(vec![r.expr.clone()]), lam_param_nodes), + texpr.inferred.clone(), + texpr.span.clone(), + ), + diagnostics: r.diagnostics.clone(), + }) + } + ExprData::ExprStringInterp => { + let resolved_children = Rc::new({ + let mut __result = Vec::new(); + for part_node in texpr.children.clone().iter().cloned() { + __result.push(match (*part_node.expr_data.clone()).clone() { + ExprData::ExprLiteral { .. } => part_node.clone(), + _ => match part_node.children.clone().first().cloned() { + Some(inner) => { + let r = resolve_expr_types(&inner, &env, module_name.clone()); + make_interp_part_node(r.expr.clone(), part_node.span.clone()) + } + None => part_node.clone(), + }, + }); + } + __result + }); + let all_diags = Rc::new({ + let mut __result = Vec::new(); + for part_node in texpr.children.clone().iter().cloned() { + __result.extend( + (*match (*part_node.expr_data.clone()).clone() { + ExprData::ExprLiteral { .. } => Rc::new(vec![]), + _ => match part_node.children.clone().first().cloned() { + Some(inner) => { + let r = + resolve_expr_types(&inner, &env, module_name.clone()); + r.diagnostics.clone() + } + None => Rc::new(vec![]), + }, + }) + .iter() + .cloned(), + ); + } + __result + }); + Rc::new(ExprResolveResult { + expr: make_expr_node( + Rc::new(ExprData::ExprStringInterp), + resolved_children, + texpr.inferred.clone(), + texpr.span.clone(), + ), + diagnostics: all_diags, + }) + } + ExprData::ExprBlock => { + let stmt_results = Rc::new({ + let mut __result = Vec::new(); + for s in texpr.children.clone().iter().cloned() { + __result.push(resolve_expr_types(&s, &env, module_name.clone())); + } + __result + }); + let resolved_children = Rc::new({ + let mut __result = Vec::new(); + for r in stmt_results.clone().iter().cloned() { + __result.push(r.expr.clone()); + } + __result + }); + let all_diags = Rc::new({ + let mut __result = Vec::new(); + for r in stmt_results.clone().iter().cloned() { + __result.extend((*r.diagnostics.clone()).iter().cloned()); + } + __result + }); + Rc::new(ExprResolveResult { + expr: make_expr_node( + Rc::new(ExprData::ExprBlock), + resolved_children, + texpr.inferred.clone(), + texpr.span.clone(), + ), + diagnostics: all_diags, + }) + } + ExprData::ExprCast => { + let ch = texpr.children.clone(); + let r = match ch.clone().first().cloned() { + Some(inner) => resolve_expr_types(&inner, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + let tr = match ch.clone().get(1 as usize).cloned() { + Some(target) => resolve_node(target.clone(), env.clone(), module_name.clone()), + None => Rc::new(NodeResolveResult { + resolved: unit_type(), + diagnostics: Rc::new(vec![]), + }), + }; + Rc::new(ExprResolveResult { + expr: make_expr_node( + Rc::new(ExprData::ExprCast), + Rc::new(vec![r.expr.clone(), tr.resolved.clone()]), + texpr.inferred.clone(), + texpr.span.clone(), + ), + diagnostics: v2_rt::concat(r.diagnostics.clone(), tr.diagnostics.clone()), + }) + } + ExprData::ExprForEach => { + let ch = texpr.children.clone(); + let cr = match ch.clone().first().cloned() { + Some(c) => resolve_expr_types(&c, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + let br = match ch.clone().get(1 as usize).cloned() { + Some(b) => resolve_expr_types(&b, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + Rc::new(ExprResolveResult { + expr: make_named_expr_node( + &foreach_variable_at(texpr.clone(), env.source_indices.clone()), + Rc::new(ExprData::ExprForEach), + Rc::new(vec![cr.expr.clone(), br.expr.clone()]), + texpr.inferred.clone(), + texpr.span.clone(), + node_name_span(&texpr), + ), + diagnostics: v2_rt::concat(cr.diagnostics.clone(), br.diagnostics.clone()), + }) + } + ExprData::ExprIndex => { + let ch = texpr.children.clone(); + let br = match ch.clone().first().cloned() { + Some(base) => resolve_expr_types(&base, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + let ir = match ch.clone().get(1 as usize).cloned() { + Some(index) => resolve_expr_types(&index, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + Rc::new(ExprResolveResult { + expr: make_expr_node( + Rc::new(ExprData::ExprIndex), + Rc::new(vec![br.expr.clone(), ir.expr.clone()]), + texpr.inferred.clone(), + texpr.span.clone(), + ), + diagnostics: v2_rt::concat(br.diagnostics.clone(), ir.diagnostics.clone()), + }) + } + ExprData::ExprSlice => { + let ch = texpr.children.clone(); + let br = match ch.clone().first().cloned() { + Some(base) => resolve_expr_types(&base, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + let sr = match ch.clone().get(1 as usize).cloned() { + Some(start) => resolve_expr_types(&start, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + let er = match ch.clone().get(2 as usize).cloned() { + Some(end_e) => resolve_expr_types(&end_e, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + Rc::new(ExprResolveResult { + expr: make_expr_node( + Rc::new(ExprData::ExprSlice), + Rc::new(vec![br.expr.clone(), sr.expr.clone(), er.expr.clone()]), + texpr.inferred.clone(), + texpr.span.clone(), + ), + diagnostics: v2_rt::concat( + v2_rt::concat(br.diagnostics.clone(), sr.diagnostics.clone()), + er.diagnostics.clone(), + ), + }) + } + ExprData::ExprReturn => { + let r = match texpr.children.clone().first().cloned() { + Some(inner) => resolve_expr_types(&inner, &env, module_name.clone()), + None => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), + }), + }; + Rc::new(ExprResolveResult { + expr: make_expr_node( + Rc::new(ExprData::ExprReturn), + Rc::new(vec![r.expr.clone()]), + texpr.inferred.clone(), + texpr.span.clone(), + ), + diagnostics: r.diagnostics.clone(), + }) + } + ExprData::NoExprData => Rc::new(ExprResolveResult { + expr: texpr.clone(), + diagnostics: Rc::new(vec![]), + }), + } + }) } + +pub fn fn_type_param_names( + item: Rc, + source_indices: Rc>>, +) -> Rc> { + Rc::new({ + let mut __result = Vec::new(); + for p in Rc::new({ + let mut __result = Vec::new(); + for p in item.params.clone().iter().cloned() { + if (param_node_name_at(p.clone(), source_indices.clone()).as_str() + == authored_name_at(source_indices.clone(), ¶m_node_type_expr(&p)).as_str()) + { + __result.push(p); } -}).iter().cloned()); } __result }); -Rc::new(ExprResolveResult { - expr: make_named_expr_node(&expr_method_name_at(texpr.clone(), env.source_indices.clone()), Rc::new(ExprData::ExprMethodCall { - method_semantics: ms.clone(), -}), resolved_children, texpr.inferred.clone(), texpr.span.clone(), node_name_span(&texpr)), - diagnostics: all_diags, -}) -}, - ExprData::ExprMatch => { - let resolved_children = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(texpr.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.push({ - let idx = pair.0.clone(); -let child = pair.1.clone(); -if (idx.clone() == 0) { - { - let sr = resolve_expr_types(&child, &env, module_name.clone()); -sr.expr.clone() -} - } else { - { - let arm_ch = child.children.clone(); -let has_guard = ((arm_ch.clone().len() as i64) == 2); -if has_guard.clone() { - { - let guard_r = match arm_ch.clone().first().cloned() { - Some(g) => resolve_expr_types(&g, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: child.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -let body_r = match arm_ch.clone().get(1 as usize).cloned() { - Some(b) => resolve_expr_types(&b, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: child.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -make_arm_node(match child.match_pattern.clone() { - Some(p) => p.clone(), - None => Rc::new(MatchPattern::Wildcard), -}, Some(guard_r.expr.clone()), body_r.expr.clone(), child.span.clone()) -} - } else { - { - let body_r = match arm_ch.clone().first().cloned() { - Some(b) => resolve_expr_types(&b, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: child.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -make_arm_node(match child.match_pattern.clone() { - Some(p) => p.clone(), - None => Rc::new(MatchPattern::Wildcard), -}, None, body_r.expr.clone(), child.span.clone()) -} - } + } + __result + }) + .iter() + .cloned() + { + __result.push(param_node_name_at(p.clone(), source_indices.clone())); + } + __result + }) } - } -}); } __result }); -let all_diags = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(texpr.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { __result.extend((*{ + +pub fn has_duplicate_type_param_name(names: &Rc>) -> bool { + { + let mut __found = false; + for pair in Rc::new( + names + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + if { let idx = pair.0.clone(); -let child = pair.1.clone(); -if (idx.clone() == 0) { - { - let sr = resolve_expr_types(&child, &env, module_name.clone()); -sr.diagnostics.clone() -} - } else { + let s = pair.1.clone(); + { + let mut __found = false; + for other in Rc::new( + names + .clone() + .iter() + .cloned() + .skip((idx.clone() + 1) as usize) + .collect::>(), + ) + .iter() + .cloned() { - let arm_ch = child.children.clone(); -let has_guard = ((arm_ch.clone().len() as i64) == 2); -if has_guard.clone() { - { - let guard_r = match arm_ch.clone().first().cloned() { - Some(g) => resolve_expr_types(&g, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: child.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -let body_r = match arm_ch.clone().get(1 as usize).cloned() { - Some(b) => resolve_expr_types(&b, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: child.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -v2_rt::concat(guard_r.diagnostics.clone(), body_r.diagnostics.clone()) -} - } else { - { - let body_r = match arm_ch.clone().first().cloned() { - Some(b) => resolve_expr_types(&b, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: child.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -body_r.diagnostics.clone() -} + if (other.clone().as_str() == s.clone().as_str()) { + __found = true; + break; } -} + } + __found } -}).iter().cloned()); } __result }); -Rc::new(ExprResolveResult { - expr: make_expr_node(Rc::new(ExprData::ExprMatch), resolved_children, texpr.inferred.clone(), texpr.span.clone()), - diagnostics: all_diags, -}) -}, - ExprData::ExprIf => { - let ch = texpr.children.clone(); -let cr = match ch.clone().first().cloned() { - Some(c) => resolve_expr_types(&c, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -let tr = match ch.clone().get(1 as usize).cloned() { - Some(t) => resolve_expr_types(&t, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -let er = match ch.clone().get(2 as usize).cloned() { - Some(e) => Some(resolve_expr_types(&e, &env, module_name.clone())), - None => None, -}; -let resolved_children = match er.clone() { - Some(r) => Rc::new(vec![cr.expr.clone(), tr.expr.clone(), r.expr.clone()]), - None => Rc::new(vec![cr.expr.clone(), tr.expr.clone()]), -}; -Rc::new(ExprResolveResult { - expr: make_expr_node(Rc::new(ExprData::ExprIf), resolved_children, texpr.inferred.clone(), texpr.span.clone()), - diagnostics: v2_rt::concat(v2_rt::concat(cr.diagnostics.clone(), tr.diagnostics.clone()), match er.clone() { - Some(r) => r.diagnostics.clone(), - None => Rc::new(vec![]), -}), -}) -}, - ExprData::ExprLet => { - let ch = texpr.children.clone(); -let vr = match ch.clone().first().cloned() { - Some(v) => resolve_expr_types(&v, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -let br = match ch.clone().get(1 as usize).cloned() { - Some(bd) => Some(resolve_expr_types(&bd, &env, module_name.clone())), - None => None, -}; -let resolved_children = match br.clone() { - Some(r) => Rc::new(vec![vr.expr.clone(), r.expr.clone()]), - None => Rc::new(vec![vr.expr.clone()]), -}; -Rc::new(ExprResolveResult { - expr: make_named_expr_node(&let_binding_name_at(texpr.clone(), env.source_indices.clone()), Rc::new(ExprData::ExprLet), resolved_children, texpr.inferred.clone(), texpr.span.clone(), node_name_span(&texpr)), - diagnostics: v2_rt::concat(vr.diagnostics.clone(), match br.clone() { - Some(r) => r.diagnostics.clone(), - None => Rc::new(vec![]), -}), -}) -}, - ExprData::ExprRecordLit { parent_enum: pe, .. } => { - let resolved_children = Rc::new({ let mut __result = Vec::new(); for fi_node in texpr.children.clone().iter().cloned() { __result.push({ - let val = match fi_node.children.clone().first().cloned() { - Some(v) => v.clone(), - None => fi_node.clone(), -}; -let vr = resolve_expr_types(&val, &env, module_name.clone()); -make_field_init_node(&authored_name(env.clone(), fi_node.clone()), vr.expr.clone(), fi_node.span.clone(), node_name_span(&fi_node)) -}); } __result }); -let all_diags = Rc::new({ let mut __result = Vec::new(); for fi_node in texpr.children.clone().iter().cloned() { __result.extend((*{ - let val = match fi_node.children.clone().first().cloned() { - Some(v) => v.clone(), - None => fi_node.clone(), -}; -let vr = resolve_expr_types(&val, &env, module_name.clone()); -vr.diagnostics.clone() -}).iter().cloned()); } __result }); -Rc::new(ExprResolveResult { - expr: make_named_expr_node(&authored_name_at(env.source_indices.clone(), &texpr), Rc::new(ExprData::ExprRecordLit { - parent_enum: pe.clone(), -}), resolved_children, texpr.inferred.clone(), texpr.span.clone(), node_name_span(&texpr)), - diagnostics: all_diags, -}) -}, - ExprData::ExprListLit => { - let el_results = Rc::new({ let mut __result = Vec::new(); for el in texpr.children.clone().iter().cloned() { __result.push(resolve_expr_types(&el, &env, module_name.clone())); } __result }); -let resolved_children = Rc::new({ let mut __result = Vec::new(); for r in el_results.clone().iter().cloned() { __result.push(r.expr.clone()); } __result }); -let all_diags = Rc::new({ let mut __result = Vec::new(); for r in el_results.clone().iter().cloned() { __result.extend((*r.diagnostics.clone()).iter().cloned()); } __result }); -Rc::new(ExprResolveResult { - expr: make_expr_node(Rc::new(ExprData::ExprListLit), resolved_children, texpr.inferred.clone(), texpr.span.clone()), - diagnostics: all_diags, -}) -}, - ExprData::ExprBinOp { op, algebra_field: af, .. } => { - let ch = texpr.children.clone(); -let lr = match ch.clone().first().cloned() { - Some(l) => resolve_expr_types(&l, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -let rr = match ch.clone().get(1 as usize).cloned() { - Some(r) => resolve_expr_types(&r, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -Rc::new(ExprResolveResult { - expr: make_expr_node(Rc::new(ExprData::ExprBinOp { - op: op.clone(), - algebra_field: af.clone(), -}), Rc::new(vec![lr.expr.clone(), rr.expr.clone()]), texpr.inferred.clone(), texpr.span.clone()), - diagnostics: v2_rt::concat(lr.diagnostics.clone(), rr.diagnostics.clone()), -}) -}, - ExprData::ExprUnaryOp { op, .. } => { - let r = match texpr.children.clone().first().cloned() { - Some(o) => resolve_expr_types(&o, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -Rc::new(ExprResolveResult { - expr: make_expr_node(Rc::new(ExprData::ExprUnaryOp { - op: op.clone(), -}), Rc::new(vec![r.expr.clone()]), texpr.inferred.clone(), texpr.span.clone()), - diagnostics: r.diagnostics.clone(), -}) -}, - ExprData::ExprLambda => { - let lam_param_nodes = Rc::new(texpr.children.clone().iter().cloned().skip(1 as usize).collect::>()); -let r = match texpr.children.clone().first().cloned() { - Some(b) => resolve_expr_types(&b, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -Rc::new(ExprResolveResult { - expr: make_expr_node(Rc::new(ExprData::ExprLambda), v2_rt::concat(Rc::new(vec![r.expr.clone()]), lam_param_nodes), texpr.inferred.clone(), texpr.span.clone()), - diagnostics: r.diagnostics.clone(), -}) -}, - ExprData::ExprStringInterp => { - let resolved_children = Rc::new({ let mut __result = Vec::new(); for part_node in texpr.children.clone().iter().cloned() { __result.push(match (*part_node.expr_data.clone()).clone() { - ExprData::ExprLiteral { .. } => part_node.clone(), - _ => match part_node.children.clone().first().cloned() { - Some(inner) => { - let r = resolve_expr_types(&inner, &env, module_name.clone()); -make_interp_part_node(r.expr.clone(), part_node.span.clone()) -}, - None => part_node.clone(), -}, -}); } __result }); -let all_diags = Rc::new({ let mut __result = Vec::new(); for part_node in texpr.children.clone().iter().cloned() { __result.extend((*match (*part_node.expr_data.clone()).clone() { - ExprData::ExprLiteral { .. } => Rc::new(vec![]), - _ => match part_node.children.clone().first().cloned() { - Some(inner) => { - let r = resolve_expr_types(&inner, &env, module_name.clone()); -r.diagnostics.clone() -}, - None => Rc::new(vec![]), -}, -}).iter().cloned()); } __result }); -Rc::new(ExprResolveResult { - expr: make_expr_node(Rc::new(ExprData::ExprStringInterp), resolved_children, texpr.inferred.clone(), texpr.span.clone()), - diagnostics: all_diags, -}) -}, - ExprData::ExprBlock => { - let stmt_results = Rc::new({ let mut __result = Vec::new(); for s in texpr.children.clone().iter().cloned() { __result.push(resolve_expr_types(&s, &env, module_name.clone())); } __result }); -let resolved_children = Rc::new({ let mut __result = Vec::new(); for r in stmt_results.clone().iter().cloned() { __result.push(r.expr.clone()); } __result }); -let all_diags = Rc::new({ let mut __result = Vec::new(); for r in stmt_results.clone().iter().cloned() { __result.extend((*r.diagnostics.clone()).iter().cloned()); } __result }); -Rc::new(ExprResolveResult { - expr: make_expr_node(Rc::new(ExprData::ExprBlock), resolved_children, texpr.inferred.clone(), texpr.span.clone()), - diagnostics: all_diags, -}) -}, - ExprData::ExprCast => { - let ch = texpr.children.clone(); -let r = match ch.clone().first().cloned() { - Some(inner) => resolve_expr_types(&inner, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -let tr = match ch.clone().get(1 as usize).cloned() { - Some(target) => resolve_node(target.clone(), env.clone(), module_name.clone()), - None => Rc::new(NodeResolveResult { - resolved: unit_type(), - diagnostics: Rc::new(vec![]), -}), -}; -Rc::new(ExprResolveResult { - expr: make_expr_node(Rc::new(ExprData::ExprCast), Rc::new(vec![r.expr.clone(), tr.resolved.clone()]), texpr.inferred.clone(), texpr.span.clone()), - diagnostics: v2_rt::concat(r.diagnostics.clone(), tr.diagnostics.clone()), -}) -}, - ExprData::ExprForEach => { - let ch = texpr.children.clone(); -let cr = match ch.clone().first().cloned() { - Some(c) => resolve_expr_types(&c, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -let br = match ch.clone().get(1 as usize).cloned() { - Some(b) => resolve_expr_types(&b, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -Rc::new(ExprResolveResult { - expr: make_named_expr_node(&foreach_variable_at(texpr.clone(), env.source_indices.clone()), Rc::new(ExprData::ExprForEach), Rc::new(vec![cr.expr.clone(), br.expr.clone()]), texpr.inferred.clone(), texpr.span.clone(), node_name_span(&texpr)), - diagnostics: v2_rt::concat(cr.diagnostics.clone(), br.diagnostics.clone()), -}) -}, - ExprData::ExprIndex => { - let ch = texpr.children.clone(); -let br = match ch.clone().first().cloned() { - Some(base) => resolve_expr_types(&base, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -let ir = match ch.clone().get(1 as usize).cloned() { - Some(index) => resolve_expr_types(&index, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -Rc::new(ExprResolveResult { - expr: make_expr_node(Rc::new(ExprData::ExprIndex), Rc::new(vec![br.expr.clone(), ir.expr.clone()]), texpr.inferred.clone(), texpr.span.clone()), - diagnostics: v2_rt::concat(br.diagnostics.clone(), ir.diagnostics.clone()), -}) -}, - ExprData::ExprSlice => { - let ch = texpr.children.clone(); -let br = match ch.clone().first().cloned() { - Some(base) => resolve_expr_types(&base, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -let sr = match ch.clone().get(1 as usize).cloned() { - Some(start) => resolve_expr_types(&start, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -let er = match ch.clone().get(2 as usize).cloned() { - Some(end_e) => resolve_expr_types(&end_e, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -Rc::new(ExprResolveResult { - expr: make_expr_node(Rc::new(ExprData::ExprSlice), Rc::new(vec![br.expr.clone(), sr.expr.clone(), er.expr.clone()]), texpr.inferred.clone(), texpr.span.clone()), - diagnostics: v2_rt::concat(v2_rt::concat(br.diagnostics.clone(), sr.diagnostics.clone()), er.diagnostics.clone()), -}) -}, - ExprData::ExprReturn => { - let r = match texpr.children.clone().first().cloned() { - Some(inner) => resolve_expr_types(&inner, &env, module_name.clone()), - None => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), -}), -}; -Rc::new(ExprResolveResult { - expr: make_expr_node(Rc::new(ExprData::ExprReturn), Rc::new(vec![r.expr.clone()]), texpr.inferred.clone(), texpr.span.clone()), - diagnostics: r.diagnostics.clone(), -}) -}, - ExprData::NoExprData => Rc::new(ExprResolveResult { - expr: texpr.clone(), - diagnostics: Rc::new(vec![]), -}), -} - }) -} - -pub fn fn_type_param_names(item: Rc, source_indices: Rc>>) -> Rc> { - Rc::new({ let mut __result = Vec::new(); for p in Rc::new({ let mut __result = Vec::new(); for p in item.params.clone().iter().cloned() { if (param_node_name_at(p.clone(), source_indices.clone()).as_str() == authored_name_at(source_indices.clone(), ¶m_node_type_expr(&p)).as_str()) { __result.push(p); } } __result }).iter().cloned() { __result.push(param_node_name_at(p.clone(), source_indices.clone())); } __result }) -} - -pub fn has_duplicate_type_param_name(names: &Rc>) -> bool { - { let mut __found = false; for pair in Rc::new(names.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if { - let idx = pair.0.clone(); -let s = pair.1.clone(); -{ let mut __found = false; for other in Rc::new(names.clone().iter().cloned().skip((idx.clone() + 1) as usize).collect::>()).iter().cloned() { if (other.clone().as_str() == s.clone().as_str()) { __found = true; break; } } __found } -} { __found = true; break; } } __found } + } { + __found = true; + break; + } + } + __found + } } -pub fn resolve_item_types(item: &Rc, env: &Rc, module_name: &String) -> Rc { +pub fn resolve_item_types( + item: &Rc, + env: &Rc, + module_name: &String, +) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let tp_names = fn_type_param_names(item.clone(), env.source_indices.clone()); -let collision_diags = if has_duplicate_type_param_name(&tp_names) { - Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::InternalError { + let tp_names = fn_type_param_names(item.clone(), env.source_indices.clone()); + let collision_diags = if has_duplicate_type_param_name(&tp_names) { + Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::InternalError { message: v2_rt::concat(v2_rt::concat("type param name collides with a value param in fn '".to_string(), authored_name_at(env.source_indices.clone(), &item)), "' — a value param shares its name with a declared type param (e.g., `fn f(T: T)`). Rename the value param, or dissolve via ParamKind / params-slot partition.".to_string()), span: item.span.clone(), }), module_name.clone())]) - } else { - Rc::new(vec![]) - }; -let env = tp_names.clone().iter().cloned().fold(env.clone(), |e: Rc, tp_name: String| Rc::new(TypeEnv { - bindings: v2_rt::rc_map_insert(e.bindings.clone(), intern(&e.intern_table.clone(), &tp_name).id.clone(), Rc::new(TypeBinding { - name: tp_name.clone(), - resolved: Rc::new(Node { - name: tp_name.clone(), - span: kernel_span(&tp_name), - ident_span: Some(kernel_span(&tp_name)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::TypeVariable { - id: tp_name.clone(), -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), - provenance: Rc::new(SubValueRelation::SubValueUnknown), -})), - recursive_types: e.recursive_types.clone(), - recursive_type_set: e.recursive_type_set.clone(), - inductive_fields: e.inductive_fields.clone(), - source_indices: e.source_indices.clone(), - intern_table: e.intern_table.clone(), -})); -let param_results = Rc::new({ let mut __result = Vec::new(); for p in item.params.clone().iter().cloned() { __result.push(resolve_param(&p, &env, &module_name)); } __result }); -let resolved_params = Rc::new({ let mut __result = Vec::new(); for pr in param_results.clone().iter().cloned() { __result.push(pr.param.clone()); } __result }); -let param_diags = Rc::new({ let mut __result = Vec::new(); for pr in param_results.clone().iter().cloned() { __result.extend((*pr.diagnostics.clone()).iter().cloned()); } __result }); -let ret_result = resolve_optional_node(&item.inferred.clone(), env.clone(), module_name.clone()); -let ret_resolved = ret_result.resolved.clone(); -let ret_diags = ret_result.diagnostics.clone(); -let resolved_ret = if (item.inferred.clone() == None) { - None - } else { - Some(Rc::new(InferredNode::Resolved { - node: ret_resolved, -})) - }; -let use_results = Rc::new({ let mut __result = Vec::new(); for u in item.uses.clone().iter().cloned() { __result.push(resolve_resource_use(&u, &env, module_name.clone())); } __result }); -let resolved_uses = Rc::new({ let mut __result = Vec::new(); for ur in use_results.clone().iter().cloned() { __result.push(ur.resource_use.clone()); } __result }); -let use_diags = Rc::new({ let mut __result = Vec::new(); for ur in use_results.clone().iter().cloned() { __result.extend((*ur.diagnostics.clone()).iter().cloned()); } __result }); -let body_resolved = if (item.body.clone() == None) { - Rc::new(ExprResolveResult { - expr: item.clone(), - diagnostics: Rc::new(vec![]), -}) - } else { - resolve_expr_types(&item.body.clone().clone().unwrap(), &env, module_name.clone()) - }; -let resolved_body = if (item.body.clone() == None) { - None - } else { - Some(body_resolved.expr.clone()) - }; -let body_diags = if (item.body.clone() == None) { - Rc::new(vec![]) - } else { - body_resolved.diagnostics.clone() - }; -let anno_resolved = if (item.type_annotation.clone() == None) { - Rc::new(NodeResolveResult { - resolved: unit_type(), - diagnostics: Rc::new(vec![]), -}) - } else { - resolve_node(item.type_annotation.clone().clone().unwrap(), env.clone(), module_name.clone()) - }; -let resolved_anno = if (item.type_annotation.clone() == None) { - None - } else { - Some(anno_resolved.resolved.clone()) - }; -let anno_diags = anno_resolved.diagnostics.clone(); -let transport_resolved = if (item.transport.clone() == None) { - Rc::new(TransportResolveResult { - transport: local_transport_node(no_span()), - diagnostics: Rc::new(vec![]), -}) - } else { - resolve_transport_binding(&item.transport.clone().clone().unwrap(), &env, &module_name) - }; -let resolved_transport = if (item.transport.clone() == None) { - None - } else { - Some(transport_resolved.transport.clone()) - }; -let transport_diags = transport_resolved.diagnostics.clone(); -let prop_results = Rc::new({ let mut __result = Vec::new(); for p in item.properties.clone().iter().cloned() { __result.push(resolve_field_init(&p, &env, module_name.clone())); } __result }); -let resolved_props = Rc::new({ let mut __result = Vec::new(); for pr in prop_results.clone().iter().cloned() { __result.push(pr.field_init.clone()); } __result }); -let prop_diags = Rc::new({ let mut __result = Vec::new(); for pr in prop_results.clone().iter().cloned() { __result.extend((*pr.diagnostics.clone()).iter().cloned()); } __result }); -let child_results = Rc::new({ let mut __result = Vec::new(); for child in item.children.clone().iter().cloned() { __result.push(resolve_item_types(&child, &env, &module_name)); } __result }); -let resolved_children = Rc::new({ let mut __result = Vec::new(); for cr in child_results.clone().iter().cloned() { __result.push(cr.item.clone()); } __result }); -let child_diags = Rc::new({ let mut __result = Vec::new(); for cr in child_results.clone().iter().cloned() { __result.extend((*cr.diagnostics.clone()).iter().cloned()); } __result }); -Rc::new(ItemResult { - item: Rc::new(Node { - name: item.name.clone(), - span: item.span.clone(), - ident_span: item.ident_span.clone(), - children: resolved_children, - params: resolved_params, - inferred: resolved_ret, - return_cardinality: item.return_cardinality.clone(), - uses: resolved_uses, - body: resolved_body, - connective: item.connective.clone(), - transport: resolved_transport, - properties: resolved_props, - type_annotation: resolved_anno, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), - diagnostics: v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(collision_diags, param_diags), ret_diags), use_diags), body_diags), anno_diags), transport_diags), prop_diags), child_diags), -}) -} + } else { + Rc::new(vec![]) + }; + let env = tp_names.clone().iter().cloned().fold( + env.clone(), + |e: Rc, tp_name: String| { + Rc::new(TypeEnv { + bindings: v2_rt::rc_map_insert( + e.bindings.clone(), + intern(&e.intern_table.clone(), &tp_name).id.clone(), + Rc::new(TypeBinding { + name: tp_name.clone(), + resolved: Rc::new(Node { + name: tp_name.clone(), + span: kernel_span(&tp_name), + ident_span: Some(kernel_span(&tp_name)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::TypeVariable { + id: tp_name.clone(), + })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + provenance: Rc::new(SubValueRelation::SubValueUnknown), + }), + ), + recursive_types: e.recursive_types.clone(), + recursive_type_set: e.recursive_type_set.clone(), + inductive_fields: e.inductive_fields.clone(), + source_indices: e.source_indices.clone(), + intern_table: e.intern_table.clone(), + }) + }, + ); + let param_results = Rc::new({ + let mut __result = Vec::new(); + for p in item.params.clone().iter().cloned() { + __result.push(resolve_param(&p, &env, &module_name)); + } + __result + }); + let resolved_params = Rc::new({ + let mut __result = Vec::new(); + for pr in param_results.clone().iter().cloned() { + __result.push(pr.param.clone()); + } + __result + }); + let param_diags = Rc::new({ + let mut __result = Vec::new(); + for pr in param_results.clone().iter().cloned() { + __result.extend((*pr.diagnostics.clone()).iter().cloned()); + } + __result + }); + let ret_result = + resolve_optional_node(&item.inferred.clone(), env.clone(), module_name.clone()); + let ret_resolved = ret_result.resolved.clone(); + let ret_diags = ret_result.diagnostics.clone(); + let resolved_ret = if (item.inferred.clone() == None) { + None + } else { + Some(Rc::new(InferredNode::Resolved { node: ret_resolved })) + }; + let use_results = Rc::new({ + let mut __result = Vec::new(); + for u in item.uses.clone().iter().cloned() { + __result.push(resolve_resource_use(&u, &env, module_name.clone())); + } + __result + }); + let resolved_uses = Rc::new({ + let mut __result = Vec::new(); + for ur in use_results.clone().iter().cloned() { + __result.push(ur.resource_use.clone()); + } + __result + }); + let use_diags = Rc::new({ + let mut __result = Vec::new(); + for ur in use_results.clone().iter().cloned() { + __result.extend((*ur.diagnostics.clone()).iter().cloned()); + } + __result + }); + let body_resolved = if (item.body.clone() == None) { + Rc::new(ExprResolveResult { + expr: item.clone(), + diagnostics: Rc::new(vec![]), + }) + } else { + resolve_expr_types( + &item.body.clone().clone().unwrap(), + &env, + module_name.clone(), + ) + }; + let resolved_body = if (item.body.clone() == None) { + None + } else { + Some(body_resolved.expr.clone()) + }; + let body_diags = if (item.body.clone() == None) { + Rc::new(vec![]) + } else { + body_resolved.diagnostics.clone() + }; + let anno_resolved = if (item.type_annotation.clone() == None) { + Rc::new(NodeResolveResult { + resolved: unit_type(), + diagnostics: Rc::new(vec![]), + }) + } else { + resolve_node( + item.type_annotation.clone().clone().unwrap(), + env.clone(), + module_name.clone(), + ) + }; + let resolved_anno = if (item.type_annotation.clone() == None) { + None + } else { + Some(anno_resolved.resolved.clone()) + }; + let anno_diags = anno_resolved.diagnostics.clone(); + let transport_resolved = if (item.transport.clone() == None) { + Rc::new(TransportResolveResult { + transport: local_transport_node(no_span()), + diagnostics: Rc::new(vec![]), + }) + } else { + resolve_transport_binding(&item.transport.clone().clone().unwrap(), &env, &module_name) + }; + let resolved_transport = if (item.transport.clone() == None) { + None + } else { + Some(transport_resolved.transport.clone()) + }; + let transport_diags = transport_resolved.diagnostics.clone(); + let prop_results = Rc::new({ + let mut __result = Vec::new(); + for p in item.properties.clone().iter().cloned() { + __result.push(resolve_field_init(&p, &env, module_name.clone())); + } + __result + }); + let resolved_props = Rc::new({ + let mut __result = Vec::new(); + for pr in prop_results.clone().iter().cloned() { + __result.push(pr.field_init.clone()); + } + __result + }); + let prop_diags = Rc::new({ + let mut __result = Vec::new(); + for pr in prop_results.clone().iter().cloned() { + __result.extend((*pr.diagnostics.clone()).iter().cloned()); + } + __result + }); + let child_results = Rc::new({ + let mut __result = Vec::new(); + for child in item.children.clone().iter().cloned() { + __result.push(resolve_item_types(&child, &env, &module_name)); + } + __result + }); + let resolved_children = Rc::new({ + let mut __result = Vec::new(); + for cr in child_results.clone().iter().cloned() { + __result.push(cr.item.clone()); + } + __result + }); + let child_diags = Rc::new({ + let mut __result = Vec::new(); + for cr in child_results.clone().iter().cloned() { + __result.extend((*cr.diagnostics.clone()).iter().cloned()); + } + __result + }); + Rc::new(ItemResult { + item: Rc::new(Node { + name: item.name.clone(), + span: item.span.clone(), + ident_span: item.ident_span.clone(), + children: resolved_children, + params: resolved_params, + inferred: resolved_ret, + return_cardinality: item.return_cardinality.clone(), + uses: resolved_uses, + body: resolved_body, + connective: item.connective.clone(), + transport: resolved_transport, + properties: resolved_props, + type_annotation: resolved_anno, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + diagnostics: v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(collision_diags, param_diags), + ret_diags, + ), + use_diags, + ), + body_diags, + ), + anno_diags, + ), + transport_diags, + ), + prop_diags, + ), + child_diags, + ), + }) }) } diff --git a/src/v2/stage0/src/v2_compiler_infer_service.rs b/src/v2/stage0/src/v2_compiler_infer_service.rs index 5049a189788..8dfabfec682 100644 --- a/src/v2/stage0/src/v2_compiler_infer_service.rs +++ b/src/v2/stage0/src/v2_compiler_infer_service.rs @@ -1,20 +1,26 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_service -use std::collections::HashMap; -use std::rc::Rc; +pub use crate::std_types::SourceSpan; +use crate::v2_compiler_infer_items::ItemKind::FuncItem; +pub use crate::v2_compiler_infer_items::{inferred_to_outputs, ItemInfo, ItemKind, TypedModule}; +pub use crate::v2_compiler_infer_types::{emit_map_has, nominal_type_ref}; use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::std_types::{SourceSpan}; -pub use crate::v2_std_core::{Node, Connective, ExprData, Cardinality, InferredNode, NewlineIndex, no_span, unit_type, expr_var_name_at, expr_call_func_at, field_access_field_at, field_access_base, method_receiver, param_node_type_expr, authored_name_at}; +use crate::v2_std_core::Cardinality::Required; use crate::v2_std_core::Connective::{Conj, NoConnective}; -use crate::v2_std_core::ExprData::{NoExprData, ExprFieldAccess, ExprMethodCall, ExprCall, ExprVar}; -use crate::v2_std_core::Cardinality::{Required}; -use crate::v2_std_core::InferredNode::{Resolved}; -pub use crate::v2_compiler_infer_types::{emit_map_has, nominal_type_ref}; -pub use crate::v2_compiler_infer_items::{ItemInfo, ItemKind, TypedModule, inferred_to_outputs}; -use crate::v2_compiler_infer_items::ItemKind::{FuncItem}; +use crate::v2_std_core::ExprData::{ + ExprCall, ExprFieldAccess, ExprMethodCall, ExprVar, NoExprData, +}; +use crate::v2_std_core::InferredNode::Resolved; +pub use crate::v2_std_core::{ + authored_name_at, expr_call_func_at, expr_var_name_at, field_access_base, + field_access_field_at, method_receiver, no_span, param_node_type_expr, unit_type, Cardinality, + Connective, ExprData, InferredNode, NewlineIndex, Node, +}; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct UniqueAccum { @@ -35,114 +41,165 @@ pub struct ServiceMethodResult { pub op_params: Rc>>, } -pub fn is_typed_service_call_receiver(receiver: &Rc, source_indices: Rc>>) -> bool { +pub fn is_typed_service_call_receiver( + receiver: &Rc, + source_indices: Rc>>, +) -> bool { match (*receiver.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let f = field_access_field_at(receiver.clone(), source_indices); -let b = field_access_base(receiver.clone()); -match (*b.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => match Rc::new(f.chars().map(|c| c as i64).collect::>()).first().cloned() { - Some(ch) => ((ch.clone() >= 65) && (ch.clone() <= 90)), - None => false, -}, - _ => false, -} -}, - _ => false, -} + ExprData::ExprFieldAccess { .. } => { + let f = field_access_field_at(receiver.clone(), source_indices); + let b = field_access_base(receiver.clone()); + match (*b.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + match Rc::new(f.chars().map(|c| c as i64).collect::>()) + .first() + .cloned() + { + Some(ch) => ((ch.clone() >= 65) && (ch.clone() <= 90)), + None => false, + } + } + _ => false, + } + } + _ => false, + } } -pub fn extract_typed_service_name(receiver: &Rc, source_indices: &Rc>>) -> Option { +pub fn extract_typed_service_name( + receiver: &Rc, + source_indices: &Rc>>, +) -> Option { match (*receiver.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let f = field_access_field_at(receiver.clone(), source_indices.clone()); -let b = field_access_base(receiver.clone()); -match (*b.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let ns = expr_var_name_at(b.clone(), source_indices.clone()); -Some(v2_rt::concat(v2_rt::concat(ns, ".".to_string()), f)) -}, - _ => None, -} -}, - _ => None, -} + ExprData::ExprFieldAccess { .. } => { + let f = field_access_field_at(receiver.clone(), source_indices.clone()); + let b = field_access_base(receiver.clone()); + match (*b.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let ns = expr_var_name_at(b.clone(), source_indices.clone()); + Some(v2_rt::concat(v2_rt::concat(ns, ".".to_string()), f)) + } + _ => None, + } + } + _ => None, + } } -pub fn collect_typed_service_calls(texpr: Rc, source_indices: Rc>>) -> Rc> { +pub fn collect_typed_service_calls( + texpr: Rc, + source_indices: Rc>>, +) -> Rc> { { - let result = collect_typed_service_calls_into(&texpr, &Rc::new(UniqueAccum { - seen: v2_rt::rc_empty_map::(), - result: Rc::new(vec![]), -}), &source_indices); -result.result.clone() -} + let result = collect_typed_service_calls_into( + &texpr, + &Rc::new(UniqueAccum { + seen: v2_rt::rc_empty_map::(), + result: Rc::new(vec![]), + }), + &source_indices, + ); + result.result.clone() + } } -pub fn collect_typed_service_calls_into(texpr: &Rc, acc: &Rc, source_indices: &Rc>>) -> Rc { +pub fn collect_typed_service_calls_into( + texpr: &Rc, + acc: &Rc, + source_indices: &Rc>>, +) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let this_acc = match (*texpr.expr_data.clone()).clone() { - ExprData::ExprMethodCall { .. } => { + let this_acc = match (*texpr.expr_data.clone()).clone() { + ExprData::ExprMethodCall { .. } => { let r = method_receiver(texpr.clone()); -if is_typed_service_call_receiver(&r, source_indices.clone()) { + if is_typed_service_call_receiver(&r, source_indices.clone()) { match extract_typed_service_name(&r, &source_indices) { - Some(service_name) => if emit_map_has(acc.seen.clone(), service_name.clone()) { - acc.clone() - } else { - Rc::new(UniqueAccum { - seen: v2_rt::rc_map_insert(acc.seen.clone(), service_name.clone(), true), - result: v2_rt::rc_list_push(acc.result.clone(), service_name.clone()), -}) - }, - None => acc.clone(), -} + Some(service_name) => { + if emit_map_has(acc.seen.clone(), service_name.clone()) { + acc.clone() + } else { + Rc::new(UniqueAccum { + seen: v2_rt::rc_map_insert( + acc.seen.clone(), + service_name.clone(), + true, + ), + result: v2_rt::rc_list_push( + acc.result.clone(), + service_name.clone(), + ), + }) + } + } + None => acc.clone(), + } } else { acc.clone() } -}, - _ => acc.clone(), -}; -let result = texpr.children.clone().iter().cloned().fold(this_acc.clone(), |a: Rc, child: Rc| collect_typed_service_calls_into(&child, &a, &source_indices)); -result -} + } + _ => acc.clone(), + }; + let result = texpr.children.clone().iter().cloned().fold( + this_acc.clone(), + |a: Rc, child: Rc| { + collect_typed_service_calls_into(&child, &a, &source_indices) + }, + ); + result }) } -pub fn collect_called_func_names_into(texpr: &Rc, acc: &Rc, source_indices: &Rc>>) -> Rc { +pub fn collect_called_func_names_into( + texpr: &Rc, + acc: &Rc, + source_indices: &Rc>>, +) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let this_acc = match (*texpr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { + let this_acc = match (*texpr.expr_data.clone()).clone() { + ExprData::ExprCall { .. } => { let f = expr_call_func_at(texpr.clone(), source_indices.clone()); -if emit_map_has(acc.seen.clone(), f.clone()) { + if emit_map_has(acc.seen.clone(), f.clone()) { acc.clone() } else { Rc::new(UniqueAccum { - seen: v2_rt::rc_map_insert(acc.seen.clone(), f.clone(), true), - result: v2_rt::rc_list_push(acc.result.clone(), f.clone()), -}) + seen: v2_rt::rc_map_insert(acc.seen.clone(), f.clone(), true), + result: v2_rt::rc_list_push(acc.result.clone(), f.clone()), + }) } -}, - _ => acc.clone(), -}; -let result = texpr.children.clone().iter().cloned().fold(this_acc.clone(), |a: Rc, child: Rc| collect_called_func_names_into(&child, &a, &source_indices)); -result -} + } + _ => acc.clone(), + }; + let result = texpr.children.clone().iter().cloned().fold( + this_acc.clone(), + |a: Rc, child: Rc| { + collect_called_func_names_into(&child, &a, &source_indices) + }, + ); + result }) } -pub fn collect_called_func_names(texpr: Rc, source_indices: Rc>>) -> Rc> { +pub fn collect_called_func_names( + texpr: Rc, + source_indices: Rc>>, +) -> Rc> { { - let result = collect_called_func_names_into(&texpr, &Rc::new(UniqueAccum { - seen: v2_rt::rc_empty_map::(), - result: Rc::new(vec![]), -}), &source_indices); -result.result.clone() -} + let result = collect_called_func_names_into( + &texpr, + &Rc::new(UniqueAccum { + seen: v2_rt::rc_empty_map::(), + result: Rc::new(vec![]), + }), + &source_indices, + ); + result.result.clone() + } } -pub fn expand_transitive_services_once(modules: Rc>>, registry: Rc>>) -> Rc>> { +pub fn expand_transitive_services_once( + modules: Rc>>, + registry: Rc>>, +) -> Rc>> { modules.iter().cloned().fold(registry.clone(), |reg: Rc>>, m: Rc| m.items.clone().iter().cloned().fold(reg, |reg2: Rc>>, item: Rc| { let item_name = authored_name_at(m.type_env.clone().source_indices.clone(), &item); match v2_rt::map_get(®2, item_name.clone()) { @@ -186,117 +243,172 @@ if same_count.clone() { } pub fn total_service_count(registry: Rc>>) -> i64 { - Rc::new(v2_rt::map_values(®istry)).iter().cloned().fold(0, |acc: i64, info: Rc| (acc + (info.service_names.clone().len() as i64))) + Rc::new(v2_rt::map_values(®istry)) + .iter() + .cloned() + .fold(0, |acc: i64, info: Rc| { + (acc + (info.service_names.clone().len() as i64)) + }) } -pub fn expand_transitive_services(mut modules: Rc>>, mut registry: Rc>>, mut remaining_passes: i64) -> Rc>> { +pub fn expand_transitive_services( + mut modules: Rc>>, + mut registry: Rc>>, + mut remaining_passes: i64, +) -> Rc>> { loop { if (remaining_passes.clone() <= 0) { break registry.clone(); -} else { + } else { let before = total_service_count(registry.clone()); -let next = expand_transitive_services_once(modules.clone(), registry.clone()); -let after = total_service_count(next.clone()); -if (before == after) { + let next = expand_transitive_services_once(modules.clone(), registry.clone()); + let after = total_service_count(next.clone()); + if (before == after) { break registry.clone(); -} else { + } else { { let __tco_0 = next.clone(); -let __tco_1 = (remaining_passes - 1); -registry = __tco_0; -remaining_passes = __tco_1; -continue; -} -} -} -} + let __tco_1 = (remaining_passes - 1); + registry = __tco_0; + remaining_passes = __tco_1; + continue; + } + } + } + } } -pub fn check_service_field_access_node(base_type: &Rc, field: String, service_registry: Rc>>>>, source_indices: Rc>>) -> Option> { - if ((base_type.connective.clone() == Connective::NoConnective) && ((base_type.children.clone().len() as i64) == 0)) { +pub fn check_service_field_access_node( + base_type: &Rc, + field: String, + service_registry: Rc>>>>, + source_indices: Rc>>, +) -> Option> { + if ((base_type.connective.clone() == Connective::NoConnective) + && ((base_type.children.clone().len() as i64) == 0)) + { { - let path = v2_rt::concat(v2_rt::concat(authored_name_at(source_indices, &base_type), ".".to_string()), field); -match v2_rt::map_get(&service_registry, path.clone()) { - Some(_) => Some(nominal_type_ref(&path)), - None => None, -} -} + let path = v2_rt::concat( + v2_rt::concat( + authored_name_at(source_indices, &base_type), + ".".to_string(), + ), + field, + ); + match v2_rt::map_get(&service_registry, path.clone()) { + Some(_) => Some(nominal_type_ref(&path)), + None => None, + } + } } else { None } } -pub fn check_service_method_call_node(receiver_type: &Rc, method: String, service_registry: Rc>>>>, source_indices: Rc>>) -> Option> { - if ((receiver_type.connective.clone() == Connective::NoConnective) && ((receiver_type.children.clone().len() as i64) == 0)) { - match v2_rt::map_get(&service_registry, authored_name_at(source_indices, &receiver_type)) { - Some(ops) => { - let matching = Rc::new({ let mut __result = Vec::new(); for op in ops.clone().iter().cloned() { if (op.name.clone().as_str() == method.clone().as_str()) { __result.push(op); } } __result }); -match matching.first().cloned() { - Some(op) => if ((op.outputs.clone().len() as i64) == 0) { - Some(Rc::new(ServiceMethodResult { - result_type: unit_type(), - op_params: op.params.clone(), -})) - } else { - Some(Rc::new(ServiceMethodResult { - result_type: Rc::new(Node { - name: "".to_string(), - span: no_span(), - ident_span: None, - children: Rc::new({ let mut __result = Vec::new(); for f in op.outputs.clone().iter().cloned() { __result.push(Rc::new(Node { - name: f.name.clone(), - span: f.span.clone(), - ident_span: f.ident_span.clone(), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: param_node_type_expr(&f), -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -})); } __result }), - connective: Connective::Conj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), - op_params: op.params.clone(), -})) - }, - None => None, -} -}, - None => None, -} +pub fn check_service_method_call_node( + receiver_type: &Rc, + method: String, + service_registry: Rc>>>>, + source_indices: Rc>>, +) -> Option> { + if ((receiver_type.connective.clone() == Connective::NoConnective) + && ((receiver_type.children.clone().len() as i64) == 0)) + { + match v2_rt::map_get( + &service_registry, + authored_name_at(source_indices, &receiver_type), + ) { + Some(ops) => { + let matching = Rc::new({ + let mut __result = Vec::new(); + for op in ops.clone().iter().cloned() { + if (op.name.clone().as_str() == method.clone().as_str()) { + __result.push(op); + } + } + __result + }); + match matching.first().cloned() { + Some(op) => { + if ((op.outputs.clone().len() as i64) == 0) { + Some(Rc::new(ServiceMethodResult { + result_type: unit_type(), + op_params: op.params.clone(), + })) + } else { + Some(Rc::new(ServiceMethodResult { + result_type: Rc::new(Node { + name: "".to_string(), + span: no_span(), + ident_span: None, + children: Rc::new({ + let mut __result = Vec::new(); + for f in op.outputs.clone().iter().cloned() { + __result.push(Rc::new(Node { + name: f.name.clone(), + span: f.span.clone(), + ident_span: f.ident_span.clone(), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: param_node_type_expr(&f), + })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + })); + } + __result + }), + connective: Connective::Conj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + op_params: op.params.clone(), + })) + } + } + None => None, + } + } + None => None, + } } else { None } } -pub fn service_op_entry(child: &Rc, source_indices: &Rc>>) -> Rc { +pub fn service_op_entry( + child: &Rc, + source_indices: &Rc>>, +) -> Rc { Rc::new(OpEntry { - name: authored_name_at(source_indices.clone(), &child), - outputs: inferred_to_outputs(&child.inferred.clone(), child.span.clone(), source_indices.clone()), - params: child.params.clone(), -}) + name: authored_name_at(source_indices.clone(), &child), + outputs: inferred_to_outputs( + &child.inferred.clone(), + child.span.clone(), + source_indices.clone(), + ), + params: child.params.clone(), + }) } diff --git a/src/v2/stage0/src/v2_compiler_infer_sigs.rs b/src/v2/stage0/src/v2_compiler_infer_sigs.rs index 5cdd9f3214c..31d6c47dcbe 100644 --- a/src/v2/stage0/src/v2_compiler_infer_sigs.rs +++ b/src/v2/stage0/src/v2_compiler_infer_sigs.rs @@ -1,17 +1,20 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_sigs -use std::collections::HashMap; -use std::rc::Rc; +pub use crate::std_induction::SubValueRelation; +use crate::std_induction::SubValueRelation::*; +pub use crate::v2_compiler_infer_types::emit_map_has; use crate::v2_rt; -use crate::NonEmptyVec; +use crate::v2_std_core::CompilerDiagnostic::MissingAnnotation; +use crate::v2_std_core::ExprData::ExprCall; +pub use crate::v2_std_core::{ + authored_name_at, expr_call_func_at, make_error_node, no_span, CompilerDiagnostic, + DeclaredFuncSig, ErrorNode, ExprData, NewlineIndex, Node, +}; use crate::NonEmptyBTreeSet; -pub use crate::v2_std_core::{Node, ExprData, expr_call_func_at, ErrorNode, make_error_node, no_span, DeclaredFuncSig, NewlineIndex, authored_name_at, CompilerDiagnostic}; -use crate::v2_std_core::ExprData::{ExprCall}; -use crate::v2_std_core::CompilerDiagnostic::{MissingAnnotation}; -pub use crate::v2_compiler_infer_types::{emit_map_has}; -pub use crate::std_induction::{SubValueRelation}; -use crate::std_induction::SubValueRelation::*; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct ResolvedFuncSig { @@ -20,7 +23,8 @@ pub struct ResolvedFuncSig { pub inferred: Rc, pub is_async: bool, pub output_provenance: Rc>>>>, - pub variant_provenance: Rc>>>>>>, + pub variant_provenance: + Rc>>>>>>, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -46,191 +50,457 @@ pub struct CallEdge { pub callee: String, } -pub fn collect_func_call_edges(items: Rc>>, local_func_set: Rc>, source_indices: Rc>>) -> Rc>> { - Rc::new({ let mut __result = Vec::new(); for item in items.iter().cloned() { __result.extend((*if (((item.params.clone().len() as i64) > 0) && (item.body.clone() != None)) { - collect_calls_in_expr(&authored_name_at(source_indices.clone(), &item), &item.body.clone().clone().unwrap(), &local_func_set, &source_indices) - } else { - Rc::new(vec![]) - }).iter().cloned()); } __result }) +pub fn collect_func_call_edges( + items: Rc>>, + local_func_set: Rc>, + source_indices: Rc>>, +) -> Rc>> { + Rc::new({ + let mut __result = Vec::new(); + for item in items.iter().cloned() { + __result.extend( + (*if (((item.params.clone().len() as i64) > 0) && (item.body.clone() != None)) { + collect_calls_in_expr( + &authored_name_at(source_indices.clone(), &item), + &item.body.clone().clone().unwrap(), + &local_func_set, + &source_indices, + ) + } else { + Rc::new(vec![]) + }) + .iter() + .cloned(), + ); + } + __result + }) } -pub fn collect_calls_in_expr(caller: &String, texpr: &Rc, local_func_set: &Rc>, source_indices: &Rc>>) -> Rc>> { +pub fn collect_calls_in_expr( + caller: &String, + texpr: &Rc, + local_func_set: &Rc>, + source_indices: &Rc>>, +) -> Rc>> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let this_edges = match (*texpr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => { + let this_edges = match (*texpr.expr_data.clone()).clone() { + ExprData::ExprCall { .. } => { let f = expr_call_func_at(texpr.clone(), source_indices.clone()); -if emit_map_has(local_func_set.clone(), f.clone()) { + if emit_map_has(local_func_set.clone(), f.clone()) { Rc::new(vec![Rc::new(CallEdge { - caller: caller.clone(), - callee: f.clone(), -})]) + caller: caller.clone(), + callee: f.clone(), + })]) } else { Rc::new(vec![]) } -}, - _ => Rc::new(vec![]), -}; -let child_edges = Rc::new({ let mut __result = Vec::new(); for child in texpr.children.clone().iter().cloned() { __result.extend((*collect_calls_in_expr(&caller, &child, &local_func_set, &source_indices)).iter().cloned()); } __result }); -let result = v2_rt::concat(this_edges, child_edges); -result -} + } + _ => Rc::new(vec![]), + }; + let child_edges = Rc::new({ + let mut __result = Vec::new(); + for child in texpr.children.clone().iter().cloned() { + __result.extend( + (*collect_calls_in_expr(&caller, &child, &local_func_set, &source_indices)) + .iter() + .cloned(), + ); + } + __result + }); + let result = v2_rt::concat(this_edges, child_edges); + result }) } -pub fn func_reaches_self(root: String, current: &String, call_edges: &Rc>>, visited: &Rc>) -> bool { +pub fn func_reaches_self( + root: String, + current: &String, + call_edges: &Rc>>, + visited: &Rc>, +) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { if emit_map_has(visited.clone(), current.clone()) { false } else { { let next_visited = v2_rt::rc_map_insert(visited.clone(), current.clone(), true); -let callees = Rc::new({ let mut __result = Vec::new(); for e in Rc::new({ let mut __result = Vec::new(); for e in call_edges.clone().iter().cloned() { if (e.caller.clone().as_str() == current.clone().as_str()) { __result.push(e); } } __result }).iter().cloned() { __result.push(e.callee.clone()); } __result }); -{ let mut __found = false; for c in callees.iter().cloned() { if if (c.clone().as_str() == root.clone().as_str()) { - true - } else { - func_reaches_self(root.clone(), &c, &call_edges, &next_visited) - } { __found = true; break; } } __found } -} + let callees = Rc::new({ + let mut __result = Vec::new(); + for e in Rc::new({ + let mut __result = Vec::new(); + for e in call_edges.clone().iter().cloned() { + if (e.caller.clone().as_str() == current.clone().as_str()) { + __result.push(e); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(e.callee.clone()); + } + __result + }); + { + let mut __found = false; + for c in callees.iter().cloned() { + if if (c.clone().as_str() == root.clone().as_str()) { + true + } else { + func_reaches_self(root.clone(), &c, &call_edges, &next_visited) + } { + __found = true; + break; + } + } + __found + } + } } }) } pub fn build_name_set(names: Rc>) -> Rc> { - names.iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, name.clone(), true)) + names.iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, name: String| { + v2_rt::rc_map_insert(acc, name.clone(), true) + }, + ) } -pub fn collect_parent_resolved_sigs(declared_sigs: Rc>>, local_func_set: Rc>) -> Rc>> { - Rc::new(v2_rt::map_values(&declared_sigs)).iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, dsig: Rc| if emit_map_has(local_func_set.clone(), dsig.name.clone()) { - acc.clone() - } else { - if (dsig.inferred.clone() != None) { - v2_rt::rc_map_insert(acc.clone(), dsig.name.clone(), declared_to_resolved(&dsig)) - } else { - acc.clone() - } - }) +pub fn collect_parent_resolved_sigs( + declared_sigs: Rc>>, + local_func_set: Rc>, +) -> Rc>> { + Rc::new(v2_rt::map_values(&declared_sigs)) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, dsig: Rc| { + if emit_map_has(local_func_set.clone(), dsig.name.clone()) { + acc.clone() + } else { + if (dsig.inferred.clone() != None) { + v2_rt::rc_map_insert( + acc.clone(), + dsig.name.clone(), + declared_to_resolved(&dsig), + ) + } else { + acc.clone() + } + } + }, + ) } pub fn declared_to_resolved(dsig: &Rc) -> Rc { Rc::new(ResolvedFuncSig { - name: dsig.name.clone(), - params: dsig.params.clone(), - inferred: dsig.inferred.clone().clone().unwrap(), - is_async: dsig.is_async.clone(), - output_provenance: dsig.output_provenance.clone(), - variant_provenance: dsig.variant_provenance.clone(), -}) + name: dsig.name.clone(), + params: dsig.params.clone(), + inferred: dsig.inferred.clone().clone().unwrap(), + is_async: dsig.is_async.clone(), + output_provenance: dsig.output_provenance.clone(), + variant_provenance: dsig.variant_provenance.clone(), + }) } -pub fn merge_remaining_declared(declared_sigs: Rc>>, resolved: Rc>>) -> Rc>> { - Rc::new(v2_rt::map_values(&declared_sigs)).iter().cloned().fold(resolved, |acc: Rc>>, dsig: Rc| if (dsig.inferred.clone() != None) { - v2_rt::rc_map_insert(acc.clone(), dsig.name.clone(), declared_to_resolved(&dsig)) - } else { - acc.clone() - }) +pub fn merge_remaining_declared( + declared_sigs: Rc>>, + resolved: Rc>>, +) -> Rc>> { + Rc::new(v2_rt::map_values(&declared_sigs)) + .iter() + .cloned() + .fold( + resolved, + |acc: Rc>>, dsig: Rc| { + if (dsig.inferred.clone() != None) { + v2_rt::rc_map_insert( + acc.clone(), + dsig.name.clone(), + declared_to_resolved(&dsig), + ) + } else { + acc.clone() + } + }, + ) } -pub fn topo_resolve_loop(mut remaining: Rc>, mut resolved: Rc>>, mut declared_sigs: Rc>>, mut call_edges: Rc>>, mut local_func_set: Rc>, mut module_name: String, mut diagnostics: Rc>>, mut fuel: i64) -> Rc { +pub fn topo_resolve_loop( + mut remaining: Rc>, + mut resolved: Rc>>, + mut declared_sigs: Rc>>, + mut call_edges: Rc>>, + mut local_func_set: Rc>, + mut module_name: String, + mut diagnostics: Rc>>, + mut fuel: i64, +) -> Rc { loop { if ((remaining.clone().len() as i64) == 0) { { - let all_resolved = Rc::new(v2_rt::map_values(&declared_sigs)).iter().cloned().fold(resolved.clone(), |acc: Rc>>, dsig: Rc| if (dsig.inferred.clone() != None) { - v2_rt::rc_map_insert(acc.clone(), dsig.name.clone(), declared_to_resolved(&dsig)) - } else { - acc.clone() + let all_resolved = Rc::new(v2_rt::map_values(&declared_sigs)) + .iter() + .cloned() + .fold( + resolved.clone(), + |acc: Rc>>, + dsig: Rc| { + if (dsig.inferred.clone() != None) { + v2_rt::rc_map_insert( + acc.clone(), + dsig.name.clone(), + declared_to_resolved(&dsig), + ) + } else { + acc.clone() + } + }, + ); + return Rc::new(ResolveFuncSigsResult { + func_env: Rc::new(ResolvedFuncEnv { + signatures: all_resolved.clone(), + }), + diagnostics: diagnostics.clone(), }); -return Rc::new(ResolveFuncSigsResult { - func_env: Rc::new(ResolvedFuncEnv { - signatures: all_resolved.clone(), -}), - diagnostics: diagnostics.clone(), -}) -} + } } -let ready = Rc::new({ let mut __result = Vec::new(); for fn_name in remaining.clone().iter().cloned() { if { - let local_callees = Rc::new({ let mut __result = Vec::new(); for c in Rc::new({ let mut __result = Vec::new(); for e in Rc::new({ let mut __result = Vec::new(); for e in call_edges.clone().iter().cloned() { if (e.caller.clone().as_str() == fn_name.clone().as_str()) { __result.push(e); } } __result }).iter().cloned() { __result.push(e.callee.clone()); } __result }).iter().cloned() { if emit_map_has(local_func_set.clone(), c.clone()) { __result.push(c); } } __result }); -{ let mut __all = true; for c in local_callees.clone().iter().cloned() { if !((v2_rt::map_get(&resolved, c.clone()) != None)) { __all = false; break; } } __all } -} { __result.push(fn_name); } } __result }); -if ((ready.clone().len() as i64) == 0) { + let ready = Rc::new({ + let mut __result = Vec::new(); + for fn_name in remaining.clone().iter().cloned() { + if { + let local_callees = Rc::new({ + let mut __result = Vec::new(); + for c in Rc::new({ + let mut __result = Vec::new(); + for e in Rc::new({ + let mut __result = Vec::new(); + for e in call_edges.clone().iter().cloned() { + if (e.caller.clone().as_str() == fn_name.clone().as_str()) { + __result.push(e); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(e.callee.clone()); + } + __result + }) + .iter() + .cloned() + { + if emit_map_has(local_func_set.clone(), c.clone()) { + __result.push(c); + } + } + __result + }); + { + let mut __all = true; + for c in local_callees.clone().iter().cloned() { + if !(v2_rt::map_get(&resolved, c.clone()) != None) { + __all = false; + break; + } + } + __all + } + } { + __result.push(fn_name); + } + } + __result + }); + if ((ready.clone().len() as i64) == 0) { { - let cycle_accum = remaining.clone().iter().cloned().fold(Rc::new(SigsAccum { - signatures: resolved.clone(), - diagnostics: Rc::new(vec![]), -}), |acc: Rc, fn_name: String| match v2_rt::map_get(&declared_sigs, fn_name.clone()) { - Some(dsig) => if (dsig.inferred.clone() != None) { - Rc::new(SigsAccum { - signatures: v2_rt::rc_map_insert(acc.signatures.clone(), fn_name.clone(), declared_to_resolved(&dsig)), - diagnostics: acc.diagnostics.clone(), -}) - } else { + let cycle_accum = remaining.clone().iter().cloned().fold( Rc::new(SigsAccum { - signatures: acc.signatures.clone(), - diagnostics: v2_rt::rc_list_push(acc.diagnostics.clone(), make_error_node(Rc::new(CompilerDiagnostic::MissingAnnotation { - fn_name: fn_name.clone(), - what: "return type (recursive)".to_string(), - span: no_span(), -}), module_name.clone())), -}) - }, - None => acc.clone(), -}); -let all_resolved = Rc::new(v2_rt::map_values(&declared_sigs)).iter().cloned().fold(cycle_accum.signatures.clone(), |acc: Rc>>, dsig: Rc| if (dsig.inferred.clone() != None) { - v2_rt::rc_map_insert(acc.clone(), dsig.name.clone(), declared_to_resolved(&dsig)) - } else { - acc.clone() + signatures: resolved.clone(), + diagnostics: Rc::new(vec![]), + }), + |acc: Rc, fn_name: String| match v2_rt::map_get( + &declared_sigs, + fn_name.clone(), + ) { + Some(dsig) => { + if (dsig.inferred.clone() != None) { + Rc::new(SigsAccum { + signatures: v2_rt::rc_map_insert( + acc.signatures.clone(), + fn_name.clone(), + declared_to_resolved(&dsig), + ), + diagnostics: acc.diagnostics.clone(), + }) + } else { + Rc::new(SigsAccum { + signatures: acc.signatures.clone(), + diagnostics: v2_rt::rc_list_push( + acc.diagnostics.clone(), + make_error_node( + Rc::new(CompilerDiagnostic::MissingAnnotation { + fn_name: fn_name.clone(), + what: "return type (recursive)".to_string(), + span: no_span(), + }), + module_name.clone(), + ), + ), + }) + } + } + None => acc.clone(), + }, + ); + let all_resolved = Rc::new(v2_rt::map_values(&declared_sigs)) + .iter() + .cloned() + .fold( + cycle_accum.signatures.clone(), + |acc: Rc>>, + dsig: Rc| { + if (dsig.inferred.clone() != None) { + v2_rt::rc_map_insert( + acc.clone(), + dsig.name.clone(), + declared_to_resolved(&dsig), + ) + } else { + acc.clone() + } + }, + ); + return Rc::new(ResolveFuncSigsResult { + func_env: Rc::new(ResolvedFuncEnv { + signatures: all_resolved.clone(), + }), + diagnostics: v2_rt::concat( + diagnostics.clone(), + cycle_accum.diagnostics.clone(), + ), }); -return Rc::new(ResolveFuncSigsResult { - func_env: Rc::new(ResolvedFuncEnv { - signatures: all_resolved.clone(), -}), - diagnostics: v2_rt::concat(diagnostics.clone(), cycle_accum.diagnostics.clone()), -}) -} + } } -let ready_accum = ready.clone().iter().cloned().fold(Rc::new(SigsAccum { - signatures: resolved.clone(), - diagnostics: diagnostics.clone(), -}), |acc: Rc, fn_name: String| match v2_rt::map_get(&declared_sigs, fn_name.clone()) { - Some(dsig) => if (dsig.inferred.clone() != None) { - Rc::new(SigsAccum { - signatures: v2_rt::rc_map_insert(acc.signatures.clone(), fn_name.clone(), declared_to_resolved(&dsig)), - diagnostics: acc.diagnostics.clone(), -}) - } else { + let ready_accum = ready.clone().iter().cloned().fold( Rc::new(SigsAccum { - signatures: acc.signatures.clone(), - diagnostics: v2_rt::rc_list_push(acc.diagnostics.clone(), make_error_node(Rc::new(CompilerDiagnostic::MissingAnnotation { - fn_name: fn_name.clone(), - what: "return type".to_string(), - span: no_span(), -}), module_name.clone())), -}) - }, - None => acc.clone(), -}); -let ready_set = ready.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, fn_name: String| v2_rt::rc_map_insert(acc, fn_name.clone(), true)); -let next_remaining = Rc::new({ let mut __result = Vec::new(); for fn_name in remaining.clone().iter().cloned() { if (emit_map_has(ready_set.clone(), fn_name.clone()) == false) { __result.push(fn_name); } } __result }); -{ + signatures: resolved.clone(), + diagnostics: diagnostics.clone(), + }), + |acc: Rc, fn_name: String| match v2_rt::map_get( + &declared_sigs, + fn_name.clone(), + ) { + Some(dsig) => { + if (dsig.inferred.clone() != None) { + Rc::new(SigsAccum { + signatures: v2_rt::rc_map_insert( + acc.signatures.clone(), + fn_name.clone(), + declared_to_resolved(&dsig), + ), + diagnostics: acc.diagnostics.clone(), + }) + } else { + Rc::new(SigsAccum { + signatures: acc.signatures.clone(), + diagnostics: v2_rt::rc_list_push( + acc.diagnostics.clone(), + make_error_node( + Rc::new(CompilerDiagnostic::MissingAnnotation { + fn_name: fn_name.clone(), + what: "return type".to_string(), + span: no_span(), + }), + module_name.clone(), + ), + ), + }) + } + } + None => acc.clone(), + }, + ); + let ready_set = ready.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, fn_name: String| { + v2_rt::rc_map_insert(acc, fn_name.clone(), true) + }, + ); + let next_remaining = Rc::new({ + let mut __result = Vec::new(); + for fn_name in remaining.clone().iter().cloned() { + if (emit_map_has(ready_set.clone(), fn_name.clone()) == false) { + __result.push(fn_name); + } + } + __result + }); + { let __tco_0 = next_remaining; -let __tco_1 = ready_accum.signatures.clone(); -let __tco_2 = ready_accum.diagnostics.clone(); -let __tco_3 = (fuel - 1); -remaining = __tco_0; -resolved = __tco_1; -diagnostics = __tco_2; -fuel = __tco_3; -continue; -} -} + let __tco_1 = ready_accum.signatures.clone(); + let __tco_2 = ready_accum.diagnostics.clone(); + let __tco_3 = (fuel - 1); + remaining = __tco_0; + resolved = __tco_1; + diagnostics = __tco_2; + fuel = __tco_3; + continue; + } + } } -pub fn resolve_func_sigs(declared_sigs: &Rc>>, items: &Rc>>, module_name: String, source_indices: &Rc>>) -> Rc { +pub fn resolve_func_sigs( + declared_sigs: &Rc>>, + items: &Rc>>, + module_name: String, + source_indices: &Rc>>, +) -> Rc { { - let local_func_names = Rc::new({ let mut __result = Vec::new(); for item in Rc::new({ let mut __result = Vec::new(); for item in items.clone().iter().cloned() { if (((item.params.clone().len() as i64) > 0) && (item.body.clone() != None)) { __result.push(item); } } __result }).iter().cloned() { __result.push(authored_name_at(source_indices.clone(), &item)); } __result }); -let local_func_set = build_name_set(local_func_names.clone()); -let call_edges = collect_func_call_edges(items.clone(), local_func_set.clone(), source_indices.clone()); -let parent_resolved = collect_parent_resolved_sigs(declared_sigs.clone(), local_func_set.clone()); -topo_resolve_loop(local_func_names.clone(), parent_resolved, declared_sigs.clone(), call_edges, local_func_set.clone(), module_name, Rc::new(vec![]), (local_func_names.clone().len() as i64)) -} + let local_func_names = Rc::new({ + let mut __result = Vec::new(); + for item in Rc::new({ + let mut __result = Vec::new(); + for item in items.clone().iter().cloned() { + if (((item.params.clone().len() as i64) > 0) && (item.body.clone() != None)) { + __result.push(item); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(authored_name_at(source_indices.clone(), &item)); + } + __result + }); + let local_func_set = build_name_set(local_func_names.clone()); + let call_edges = collect_func_call_edges( + items.clone(), + local_func_set.clone(), + source_indices.clone(), + ); + let parent_resolved = + collect_parent_resolved_sigs(declared_sigs.clone(), local_func_set.clone()); + topo_resolve_loop( + local_func_names.clone(), + parent_resolved, + declared_sigs.clone(), + call_edges, + local_func_set.clone(), + module_name, + Rc::new(vec![]), + (local_func_names.clone().len() as i64), + ) + } } diff --git a/src/v2/stage0/src/v2_compiler_infer_types.rs b/src/v2/stage0/src/v2_compiler_infer_types.rs index aa4ea191107..139b9825b17 100644 --- a/src/v2/stage0/src/v2_compiler_infer_types.rs +++ b/src/v2/stage0/src/v2_compiler_infer_types.rs @@ -1,64 +1,83 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.infer_types -use std::collections::HashMap; -use std::rc::Rc; +use crate::std_algebra::AlgebraProfile::{ + ApproximateFieldProfile, BooleanAlgebraCollectionProfile, BooleanAlgebraProfile, + FreeMonoidCollectionProfile, FreeMonoidScalarProfile, OrderedRingProfile, + PartialFunctionProfile, +}; +use crate::std_algebra::AlgebraTypeTemplate::{ + AlgebraTypeVariable, ContainerOf, NamedTemplate, OptionalOf, ReceiverElement, ReceiverKey, + ReceiverSelf, ReceiverValue, TupleOf, +}; +use crate::std_algebra::ContainerSource::{Named, SameAsReceiver}; +pub use crate::std_algebra::{ + algebra_templates_for_profile, kernel_algebra_profile, AlgebraFieldTemplate, AlgebraProfile, + AlgebraTypeTemplate, ContainerSource, +}; +pub use crate::std_types::{ + container_expected_arity, container_param_name, is_container_type, SourceSpan, +}; use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::std_types::{SourceSpan, is_container_type, container_expected_arity, container_param_name}; -pub use crate::std_algebra::{AlgebraProfile, AlgebraTypeTemplate, ContainerSource, AlgebraFieldTemplate, kernel_algebra_profile, algebra_templates_for_profile}; -use crate::std_algebra::AlgebraProfile::{OrderedRingProfile, ApproximateFieldProfile, BooleanAlgebraProfile, BooleanAlgebraCollectionProfile, FreeMonoidScalarProfile, FreeMonoidCollectionProfile, PartialFunctionProfile}; -use crate::std_algebra::AlgebraTypeTemplate::{ReceiverSelf, ReceiverElement, ReceiverKey, ReceiverValue, NamedTemplate, ContainerOf, OptionalOf, TupleOf, AlgebraTypeVariable}; -use crate::std_algebra::ContainerSource::{SameAsReceiver, Named}; -pub use crate::v2_std_core::{Node, make_param_node, param_node_type_expr, find_child_named, NewlineIndex, Connective, Cardinality, ExprErrorKind, make_expr_node, make_expr_error_node, LiteralValue, is_kernel_type, BinOp, AlgebraFieldKind, InferredNode, has_inferred, is_compiler_error, leaf_node_with_span, no_span, make_span, with_optional_cardinality, with_required_cardinality, unit_type, bool_type, string_type, int_type, float_type, none_type, error_type, default_ident_span, kernel_span, authored_name_at, ErrorNode, make_error_node, ExprData, CompilerDiagnostic}; +use crate::v2_std_core::AlgebraFieldKind::{ + AlgAdd, AlgCompare, AlgJoin, AlgMeet, AlgMul, AlgQuotient, AlgReciprocal, AlgRemainder, +}; +use crate::v2_std_core::BinOp::{And, Eq, Ge, Gt, Le, Lt, Ne, NullCoalesce, Or}; +use crate::v2_std_core::Cardinality::{CardOptional, Required}; +use crate::v2_std_core::CompilerDiagnostic::InternalError; use crate::v2_std_core::Connective::{Conj, Disj, NoConnective}; -use crate::v2_std_core::Cardinality::{Required, CardOptional}; -use crate::v2_std_core::ExprData::{NoExprData, ExprLiteral, ExprError}; -use crate::v2_std_core::ExprErrorKind::{SemanticExprError, InternalExprError}; -use crate::v2_std_core::LiteralValue::{LitStr, LitInt, LitFloat, LitBool, LitNull}; -use crate::v2_std_core::BinOp::{Eq, Ne, Lt, Gt, Le, Ge, And, Or, NullCoalesce}; -use crate::v2_std_core::AlgebraFieldKind::{AlgAdd, AlgMul, AlgReciprocal, AlgQuotient, AlgRemainder, AlgCompare, AlgMeet, AlgJoin}; -use crate::v2_std_core::InferredNode::{Resolved, CompilerError, TypeVariable}; -use crate::v2_std_core::CompilerDiagnostic::{InternalError}; +use crate::v2_std_core::ExprData::{ExprError, ExprLiteral, NoExprData}; +use crate::v2_std_core::ExprErrorKind::{InternalExprError, SemanticExprError}; +use crate::v2_std_core::InferredNode::{CompilerError, Resolved, TypeVariable}; +use crate::v2_std_core::LiteralValue::{LitBool, LitFloat, LitInt, LitNull, LitStr}; +pub use crate::v2_std_core::{ + authored_name_at, bool_type, default_ident_span, error_type, find_child_named, float_type, + has_inferred, int_type, is_compiler_error, is_kernel_type, kernel_span, leaf_node_with_span, + make_error_node, make_expr_error_node, make_expr_node, make_param_node, make_span, no_span, + none_type, param_node_type_expr, string_type, unit_type, with_optional_cardinality, + with_required_cardinality, AlgebraFieldKind, BinOp, Cardinality, CompilerDiagnostic, + Connective, ErrorNode, ExprData, ExprErrorKind, InferredNode, LiteralValue, NewlineIndex, Node, +}; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn is_type_variable(inferred: Rc) -> bool { match (*inferred).clone() { - InferredNode::TypeVariable { .. } => true, - _ => false, -} + InferredNode::TypeVariable { .. } => true, + _ => false, + } } pub fn type_variable_node(id: String) -> Rc { Rc::new(Node { - name: "".to_string(), - span: make_span(0, 0), - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::TypeVariable { - id: id, -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) + name: "".to_string(), + span: make_span(0, 0), + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::TypeVariable { id: id })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) } pub fn resolved_type(n: Rc) -> Rc { match n.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => rt.clone(), - _ => error_type(), -} + Some(InferredNode::Resolved { node: rt, .. }) => rt.clone(), + _ => error_type(), + } } pub fn child_type_node(ch: &Rc) -> Rc { @@ -71,27 +90,34 @@ pub fn child_type_node(ch: &Rc) -> Rc { pub fn child_type_at(n: Rc, index: i64) -> Option> { match n.children.clone().get(index as usize).cloned() { - Some(ch) => Some(child_type_node(&ch)), - None => None, -} + Some(ch) => Some(child_type_node(&ch)), + None => None, + } } -pub fn node_is_collection(n: &Rc, source_indices: Rc>>) -> bool { - ((((n.children.clone().len() as i64) > 0) && (n.connective.clone() == Connective::NoConnective)) && is_container_type(authored_name_at(source_indices, &n))) +pub fn node_is_collection( + n: &Rc, + source_indices: Rc>>, +) -> bool { + ((((n.children.clone().len() as i64) > 0) + && (n.connective.clone() == Connective::NoConnective)) + && is_container_type(authored_name_at(source_indices, &n))) } -pub fn node_is_keyed_collection(n: &Rc, source_indices: Rc>>) -> bool { +pub fn node_is_keyed_collection( + n: &Rc, + source_indices: Rc>>, +) -> bool { (node_is_collection(&n, source_indices) && ((n.children.clone().len() as i64) == 2)) } -pub fn node_is_element_collection(n: &Rc, source_indices: Rc>>) -> bool { +pub fn node_is_element_collection( + n: &Rc, + source_indices: Rc>>, +) -> bool { (node_is_collection(&n, source_indices) && ((n.children.clone().len() as i64) == 1)) } -pub fn node_is_set_collection(n: &Rc, source_indices: &Rc>>) -> bool { - (node_is_element_collection(&n, source_indices.clone()) && (authored_name_at(source_indices.clone(), &n).as_str() == "Set".to_string().as_str())) -} - pub fn is_product_type(n: Rc) -> bool { (n.connective.clone() == Connective::Conj) } @@ -108,190 +134,160 @@ pub fn is_unit_like(n: &Rc) -> bool { ((n.connective.clone() == Connective::Conj) && ((n.children.clone().len() as i64) == 0)) } -pub fn is_fully_resolved(n: &Rc, source_indices: &Rc>>) -> bool { +pub fn is_fully_resolved( + n: &Rc, + source_indices: &Rc>>, +) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let self_is_type_var = match n.inferred.clone() { - Some(inf) => is_type_variable(inf.clone()), - None => false, -}; -if self_is_type_var { - false - } else { - { - let under_param = match container_expected_arity(authored_name_at(source_indices.clone(), &n)) { - Some(expected) => ((n.children.clone().len() as i64) < expected.clone()), - None => false, -}; -if under_param { - false - } else { - { let mut __all = true; for ch in n.children.clone().iter().cloned() { if !(is_fully_resolved(&child_type_node(&ch), &source_indices)) { __all = false; break; } } __all } + let self_is_type_var = match n.inferred.clone() { + Some(inf) => is_type_variable(inf.clone()), + None => false, + }; + if self_is_type_var { + false + } else { + { + let under_param = + match container_expected_arity(authored_name_at(source_indices.clone(), &n)) { + Some(expected) => ((n.children.clone().len() as i64) < expected.clone()), + None => false, + }; + if under_param { + false + } else { + { + let mut __all = true; + for ch in n.children.clone().iter().cloned() { + if !(is_fully_resolved(&child_type_node(&ch), &source_indices)) { + __all = false; + break; + } + } + __all } -} + } } -} + } }) } pub fn bare_map_node() -> Option> { match container_param_name("Map".to_string(), 0) { - Some(key_id) => match container_param_name("Map".to_string(), 1) { - Some(val_id) => Some(Rc::new(Node { - name: "Map".to_string(), - span: make_span(0, 0), - ident_span: Some(make_span(0, 0)), - children: Rc::new(vec![Rc::new(Node { - name: key_id.clone(), - span: make_span(0, 0), - ident_span: Some(make_span(0, 0)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: type_variable_node(key_id.clone()), -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), Rc::new(Node { - name: val_id.clone(), - span: make_span(0, 0), - ident_span: Some(make_span(0, 0)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: type_variable_node(val_id.clone()), -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -})]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -})), - None => None, -}, - None => None, -} -} - -pub fn bare_set_node() -> Option> { - match container_param_name("Set".to_string(), 0) { - Some(elem_id) => Some(Rc::new(Node { - name: "Set".to_string(), - span: make_span(0, 0), - ident_span: Some(make_span(0, 0)), - children: Rc::new(vec![Rc::new(Node { - name: elem_id.clone(), - span: make_span(0, 0), - ident_span: Some(make_span(0, 0)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: type_variable_node(elem_id.clone()), -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -})]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -})), - None => None, -} + Some(key_id) => match container_param_name("Map".to_string(), 1) { + Some(val_id) => Some(Rc::new(Node { + name: "Map".to_string(), + span: make_span(0, 0), + ident_span: Some(make_span(0, 0)), + children: Rc::new(vec![ + Rc::new(Node { + name: key_id.clone(), + span: make_span(0, 0), + ident_span: Some(make_span(0, 0)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: type_variable_node(key_id.clone()), + })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + Rc::new(Node { + name: val_id.clone(), + span: make_span(0, 0), + ident_span: Some(make_span(0, 0)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { + node: type_variable_node(val_id.clone()), + })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + ]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + })), + None => None, + }, + None => None, + } } pub fn kernel_container_profile_miss_diagnostic(kind_name: String) -> Rc { { let msg = v2_rt::concat("missing kernel container profile: ".to_string(), kind_name); -make_error_node(Rc::new(CompilerDiagnostic::InternalError { - message: msg, - span: make_span(0, 0), -}), "v2.compiler.infer_types".to_string()) -} + make_error_node( + Rc::new(CompilerDiagnostic::InternalError { + message: msg, + span: make_span(0, 0), + }), + "v2.compiler.infer_types".to_string(), + ) + } } pub fn missing_kernel_container_profile_type(kind_name: String) -> Rc { { let msg = v2_rt::concat("missing kernel container profile: ".to_string(), kind_name); -Rc::new(Node { - name: "".to_string(), - span: make_span(0, 0), - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::CompilerError { - message: msg.clone(), - span: make_span(0, 0), -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::ExprError { - kind: ExprErrorKind::InternalExprError, - message: msg.clone(), -}), - ident: None, -}) -} + Rc::new(Node { + name: "".to_string(), + span: make_span(0, 0), + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::CompilerError { + message: msg.clone(), + span: make_span(0, 0), + })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::ExprError { + kind: ExprErrorKind::InternalExprError, + message: msg.clone(), + }), + ident: None, + }) + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -302,302 +298,318 @@ pub struct KernelTypeBuild { pub fn make_container_type(kind_name: &String, element: Rc) -> Rc { match container_param_name(kind_name.clone(), 0) { - Some(param_name) => Rc::new(KernelTypeBuild { - ty: Rc::new(Node { - name: kind_name.clone(), - span: kernel_span(&kind_name), - ident_span: Some(kernel_span(&kind_name)), - children: Rc::new(vec![Rc::new(Node { - name: param_name.clone(), - span: kernel_span(¶m_name), - ident_span: Some(kernel_span(¶m_name)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: element, -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -})]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), - diagnostics: Rc::new(vec![]), -}), - None => Rc::new(KernelTypeBuild { - ty: missing_kernel_container_profile_type(kind_name.clone()), - diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic(kind_name.clone())]), -}), -} + Some(param_name) => Rc::new(KernelTypeBuild { + ty: Rc::new(Node { + name: kind_name.clone(), + span: kernel_span(&kind_name), + ident_span: Some(kernel_span(&kind_name)), + children: Rc::new(vec![Rc::new(Node { + name: param_name.clone(), + span: kernel_span(¶m_name), + ident_span: Some(kernel_span(¶m_name)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { node: element })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + })]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + diagnostics: Rc::new(vec![]), + }), + None => Rc::new(KernelTypeBuild { + ty: missing_kernel_container_profile_type(kind_name.clone()), + diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic( + kind_name.clone(), + )]), + }), + } } pub fn make_map_type(key: Rc, value: Rc) -> Rc { match container_param_name("Map".to_string(), 0) { - Some(key_name) => match container_param_name("Map".to_string(), 1) { - Some(val_name) => Rc::new(KernelTypeBuild { - ty: Rc::new(Node { - name: "Map".to_string(), - span: kernel_span(&"Map".to_string()), - ident_span: Some(kernel_span(&"Map".to_string())), - children: Rc::new(vec![Rc::new(Node { - name: key_name.clone(), - span: kernel_span(&key_name), - ident_span: Some(kernel_span(&key_name)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: key, -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), Rc::new(Node { - name: val_name.clone(), - span: kernel_span(&val_name), - ident_span: Some(kernel_span(&val_name)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: value, -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -})]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), - diagnostics: Rc::new(vec![]), -}), - None => Rc::new(KernelTypeBuild { - ty: missing_kernel_container_profile_type("Map".to_string()), - diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic("Map".to_string())]), -}), -}, - None => Rc::new(KernelTypeBuild { - ty: missing_kernel_container_profile_type("Map".to_string()), - diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic("Map".to_string())]), -}), -} + Some(key_name) => match container_param_name("Map".to_string(), 1) { + Some(val_name) => Rc::new(KernelTypeBuild { + ty: Rc::new(Node { + name: "Map".to_string(), + span: kernel_span(&"Map".to_string()), + ident_span: Some(kernel_span(&"Map".to_string())), + children: Rc::new(vec![ + Rc::new(Node { + name: key_name.clone(), + span: kernel_span(&key_name), + ident_span: Some(kernel_span(&key_name)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { node: key })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + Rc::new(Node { + name: val_name.clone(), + span: kernel_span(&val_name), + ident_span: Some(kernel_span(&val_name)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { node: value })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + ]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + diagnostics: Rc::new(vec![]), + }), + None => Rc::new(KernelTypeBuild { + ty: missing_kernel_container_profile_type("Map".to_string()), + diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic( + "Map".to_string(), + )]), + }), + }, + None => Rc::new(KernelTypeBuild { + ty: missing_kernel_container_profile_type("Map".to_string()), + diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic( + "Map".to_string(), + )]), + }), + } } pub fn make_callable_type(func_params: Rc>>, ret: Rc) -> Rc { Rc::new(Node { - name: "Callable".to_string(), - span: kernel_span(&"Callable".to_string()), - ident_span: Some(kernel_span(&"Callable".to_string())), - children: Rc::new(vec![]), - connective: Connective::Arrow, - params: func_params, - inferred: Some(Rc::new(InferredNode::Resolved { - node: ret, -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) + name: "Callable".to_string(), + span: kernel_span(&"Callable".to_string()), + ident_span: Some(kernel_span(&"Callable".to_string())), + children: Rc::new(vec![]), + connective: Connective::Arrow, + params: func_params, + inferred: Some(Rc::new(InferredNode::Resolved { node: ret })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) } pub fn make_tuple_type(first: Rc, second: Rc) -> Rc { Rc::new(Node { - name: "".to_string(), - span: make_span(0, 0), - ident_span: None, - children: Rc::new(vec![Rc::new(Node { - name: "first".to_string(), - span: kernel_span(&"first".to_string()), - ident_span: Some(kernel_span(&"first".to_string())), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: first, -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), Rc::new(Node { - name: "second".to_string(), - span: kernel_span(&"second".to_string()), - ident_span: Some(kernel_span(&"second".to_string())), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: second, -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -})]), - connective: Connective::Conj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) + name: "".to_string(), + span: make_span(0, 0), + ident_span: None, + children: Rc::new(vec![ + Rc::new(Node { + name: "first".to_string(), + span: kernel_span(&"first".to_string()), + ident_span: Some(kernel_span(&"first".to_string())), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { node: first })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + Rc::new(Node { + name: "second".to_string(), + span: kernel_span(&"second".to_string()), + ident_span: Some(kernel_span(&"second".to_string())), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { node: second })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + ]), + connective: Connective::Conj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) } pub fn algebra_value_field(name: &String, type_node: Rc) -> Rc { Rc::new(Node { - name: name.clone(), - span: kernel_span(&name), - ident_span: Some(kernel_span(&name)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: type_node, -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) + name: name.clone(), + span: kernel_span(&name), + ident_span: Some(kernel_span(&name)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { node: type_node })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) } -pub fn algebra_method_field(name: &String, param_types: Rc>>, return_type: Rc) -> Rc { +pub fn algebra_method_field( + name: &String, + param_types: Rc>>, + return_type: Rc, +) -> Rc { { - let params = Rc::new({ let mut __result = Vec::new(); for t in param_types.iter().cloned() { __result.push(make_param_node(&"_".to_string(), t.clone(), None, no_span(), no_span())); } __result }); -let callable = make_callable_type(params, return_type); -Rc::new(Node { - name: name.clone(), - span: kernel_span(&name), - ident_span: Some(kernel_span(&name)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: callable, -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) -} + let params = Rc::new({ + let mut __result = Vec::new(); + for t in param_types.iter().cloned() { + __result.push(make_param_node( + &"_".to_string(), + t.clone(), + None, + no_span(), + no_span(), + )); + } + __result + }); + let callable = make_callable_type(params, return_type); + Rc::new(Node { + name: name.clone(), + span: kernel_span(&name), + ident_span: Some(kernel_span(&name)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { node: callable })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) + } } -pub fn enrich_base_with_fields(name: String, base: &Rc, fields: Rc>>) -> Rc { +pub fn enrich_base_with_fields( + name: String, + base: &Rc, + fields: Rc>>, +) -> Rc { Rc::new(Node { - name: name, - span: base.span.clone(), - ident_span: base.ident_span.clone(), - children: fields, - connective: Connective::Conj, - params: base.params.clone(), - inferred: base.inferred.clone(), - return_cardinality: base.return_cardinality.clone(), - uses: base.uses.clone(), - body: base.body.clone(), - transport: base.transport.clone(), - properties: base.properties.clone(), - type_annotation: base.type_annotation.clone(), - is_self_recursive: base.is_self_recursive.clone(), - has_non_tail_self_call: base.has_non_tail_self_call.clone(), - match_pattern: base.match_pattern.clone(), - expr_data: base.expr_data.clone(), - ident: None, -}) + name: name, + span: base.span.clone(), + ident_span: base.ident_span.clone(), + children: fields, + connective: Connective::Conj, + params: base.params.clone(), + inferred: base.inferred.clone(), + return_cardinality: base.return_cardinality.clone(), + uses: base.uses.clone(), + body: base.body.clone(), + transport: base.transport.clone(), + properties: base.properties.clone(), + type_annotation: base.type_annotation.clone(), + is_self_recursive: base.is_self_recursive.clone(), + has_non_tail_self_call: base.has_non_tail_self_call.clone(), + match_pattern: base.match_pattern.clone(), + expr_data: base.expr_data.clone(), + ident: None, + }) } pub fn placeholder_type_node(name: String) -> Rc { @@ -608,410 +620,748 @@ pub fn nominal_type_ref(name: &String) -> Rc { leaf_node_with_span(&name, &kernel_span(&name)) } -pub fn algebra_child_or_placeholder(base: Rc, child_index: i64, placeholder: String) -> Rc { - match Rc::new({ let mut __result = Vec::new(); for pair in Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(base.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (pair.0.clone() == child_index.clone()) { __result.push(pair); } } __result }).iter().cloned() { __result.push(pair.1.clone()); } __result }).first().cloned() { - Some(child) => child_type_node(&child), - None => type_variable_node(placeholder), -} +pub fn algebra_child_or_placeholder( + base: Rc, + child_index: i64, + placeholder: String, +) -> Rc { + match Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + base.children + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + if (pair.0.clone() == child_index.clone()) { + __result.push(pair); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(pair.1.clone()); + } + __result + }) + .first() + .cloned() + { + Some(child) => child_type_node(&child), + None => type_variable_node(placeholder), + } } -pub fn instantiate_algebra_type(template: Rc, base: &Rc, source_indices: &Rc>>) -> Rc { +pub fn instantiate_algebra_type( + template: Rc, + base: &Rc, + source_indices: &Rc>>, +) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let elem = algebra_child_or_placeholder(base.clone(), 0, "T".to_string()); -let key_node = algebra_child_or_placeholder(base.clone(), 0, "K".to_string()); -let val_node = algebra_child_or_placeholder(base.clone(), 1, "V".to_string()); -match (*template).clone() { - AlgebraTypeTemplate::ReceiverSelf => Rc::new(KernelTypeBuild { - ty: base.clone(), - diagnostics: Rc::new(vec![]), -}), - AlgebraTypeTemplate::ReceiverElement => Rc::new(KernelTypeBuild { - ty: elem, - diagnostics: Rc::new(vec![]), -}), - AlgebraTypeTemplate::ReceiverKey => Rc::new(KernelTypeBuild { - ty: key_node, - diagnostics: Rc::new(vec![]), -}), - AlgebraTypeTemplate::ReceiverValue => Rc::new(KernelTypeBuild { - ty: val_node, - diagnostics: Rc::new(vec![]), -}), - AlgebraTypeTemplate::NamedTemplate { name: n, .. } => Rc::new(KernelTypeBuild { - ty: nominal_type_ref(&n), - diagnostics: Rc::new(vec![]), -}), - AlgebraTypeTemplate::AlgebraTypeVariable { id: var_id, .. } => Rc::new(KernelTypeBuild { - ty: type_variable_node(var_id.clone()), - diagnostics: Rc::new(vec![]), -}), - AlgebraTypeTemplate::ContainerOf { source: src, element: inner, .. } => { + let elem = algebra_child_or_placeholder(base.clone(), 0, "T".to_string()); + let key_node = algebra_child_or_placeholder(base.clone(), 0, "K".to_string()); + let val_node = algebra_child_or_placeholder(base.clone(), 1, "V".to_string()); + match (*template).clone() { + AlgebraTypeTemplate::ReceiverSelf => Rc::new(KernelTypeBuild { + ty: base.clone(), + diagnostics: Rc::new(vec![]), + }), + AlgebraTypeTemplate::ReceiverElement => Rc::new(KernelTypeBuild { + ty: elem, + diagnostics: Rc::new(vec![]), + }), + AlgebraTypeTemplate::ReceiverKey => Rc::new(KernelTypeBuild { + ty: key_node, + diagnostics: Rc::new(vec![]), + }), + AlgebraTypeTemplate::ReceiverValue => Rc::new(KernelTypeBuild { + ty: val_node, + diagnostics: Rc::new(vec![]), + }), + AlgebraTypeTemplate::NamedTemplate { name: n, .. } => Rc::new(KernelTypeBuild { + ty: nominal_type_ref(&n), + diagnostics: Rc::new(vec![]), + }), + AlgebraTypeTemplate::AlgebraTypeVariable { id: var_id, .. } => { + Rc::new(KernelTypeBuild { + ty: type_variable_node(var_id.clone()), + diagnostics: Rc::new(vec![]), + }) + } + AlgebraTypeTemplate::ContainerOf { + source: src, + element: inner, + .. + } => { let kind_name = match (*src.clone()).clone() { - ContainerSource::SameAsReceiver => authored_name_at(source_indices.clone(), &base), - ContainerSource::Named { name: n, .. } => n.clone(), -}; -let inner_b = instantiate_algebra_type(inner.clone(), &base, &source_indices); -let built = make_container_type(&kind_name, inner_b.ty.clone()); -Rc::new(KernelTypeBuild { - ty: built.ty.clone(), - diagnostics: v2_rt::concat(inner_b.diagnostics.clone(), built.diagnostics.clone()), -}) -}, - AlgebraTypeTemplate::OptionalOf { inner, .. } => { + ContainerSource::SameAsReceiver => { + authored_name_at(source_indices.clone(), &base) + } + ContainerSource::Named { name: n, .. } => n.clone(), + }; + let inner_b = instantiate_algebra_type(inner.clone(), &base, &source_indices); + let built = make_container_type(&kind_name, inner_b.ty.clone()); + Rc::new(KernelTypeBuild { + ty: built.ty.clone(), + diagnostics: v2_rt::concat( + inner_b.diagnostics.clone(), + built.diagnostics.clone(), + ), + }) + } + AlgebraTypeTemplate::OptionalOf { inner, .. } => { let ib = instantiate_algebra_type(inner.clone(), &base, &source_indices); -Rc::new(KernelTypeBuild { - ty: with_optional_cardinality(&ib.ty.clone()), - diagnostics: ib.diagnostics.clone(), -}) -}, - AlgebraTypeTemplate::TupleOf { first, second, .. } => { + Rc::new(KernelTypeBuild { + ty: with_optional_cardinality(&ib.ty.clone()), + diagnostics: ib.diagnostics.clone(), + }) + } + AlgebraTypeTemplate::TupleOf { first, second, .. } => { let fb = instantiate_algebra_type(first.clone(), &base, &source_indices); -let sb = instantiate_algebra_type(second.clone(), &base, &source_indices); -Rc::new(KernelTypeBuild { - ty: make_tuple_type(fb.ty.clone(), sb.ty.clone()), - diagnostics: v2_rt::concat(fb.diagnostics.clone(), sb.diagnostics.clone()), -}) -}, - AlgebraTypeTemplate::CallableOf { params: p, return_type: r, .. } => { - let param_bs = Rc::new({ let mut __result = Vec::new(); for tp in p.clone().iter().cloned() { __result.push(instantiate_algebra_type(tp.clone(), &base, &source_indices)); } __result }); -let param_diags = Rc::new({ let mut __result = Vec::new(); for b in param_bs.clone().iter().cloned() { __result.extend((*b.diagnostics.clone()).iter().cloned()); } __result }); -let param_nodes = Rc::new({ let mut __result = Vec::new(); for b in param_bs.clone().iter().cloned() { __result.push(b.ty.clone()); } __result }); -let rb = instantiate_algebra_type(r.clone(), &base, &source_indices); -Rc::new(KernelTypeBuild { - ty: make_callable_type(param_nodes, rb.ty.clone()), - diagnostics: v2_rt::concat(param_diags, rb.diagnostics.clone()), -}) -}, -} -} + let sb = instantiate_algebra_type(second.clone(), &base, &source_indices); + Rc::new(KernelTypeBuild { + ty: make_tuple_type(fb.ty.clone(), sb.ty.clone()), + diagnostics: v2_rt::concat(fb.diagnostics.clone(), sb.diagnostics.clone()), + }) + } + AlgebraTypeTemplate::CallableOf { + params: p, + return_type: r, + .. + } => { + let param_bs = Rc::new({ + let mut __result = Vec::new(); + for tp in p.clone().iter().cloned() { + __result.push(instantiate_algebra_type(tp.clone(), &base, &source_indices)); + } + __result + }); + let param_diags = Rc::new({ + let mut __result = Vec::new(); + for b in param_bs.clone().iter().cloned() { + __result.extend((*b.diagnostics.clone()).iter().cloned()); + } + __result + }); + let param_nodes = Rc::new({ + let mut __result = Vec::new(); + for b in param_bs.clone().iter().cloned() { + __result.push(b.ty.clone()); + } + __result + }); + let rb = instantiate_algebra_type(r.clone(), &base, &source_indices); + Rc::new(KernelTypeBuild { + ty: make_callable_type(param_nodes, rb.ty.clone()), + diagnostics: v2_rt::concat(param_diags, rb.diagnostics.clone()), + }) + } + } }) } -pub fn instantiate_algebra_field(template: &Rc, base: &Rc, source_indices: &Rc>>) -> Rc { +pub fn instantiate_algebra_field( + template: &Rc, + base: &Rc, + source_indices: &Rc>>, +) -> Rc { { - let param_bs = Rc::new({ let mut __result = Vec::new(); for tp in template.param_types.clone().iter().cloned() { __result.push(instantiate_algebra_type(tp.clone(), &base, &source_indices)); } __result }); -let param_types = Rc::new({ let mut __result = Vec::new(); for b in param_bs.clone().iter().cloned() { __result.push(b.ty.clone()); } __result }); -let param_diags = Rc::new({ let mut __result = Vec::new(); for b in param_bs.clone().iter().cloned() { __result.extend((*b.diagnostics.clone()).iter().cloned()); } __result }); -let return_b = instantiate_algebra_type(template.return_type.clone(), &base, &source_indices); -let field_ty = if ((param_types.clone().len() as i64) > 0) { - algebra_method_field(&template.name.clone(), param_types.clone(), return_b.ty.clone()) + let param_bs = Rc::new({ + let mut __result = Vec::new(); + for tp in template.param_types.clone().iter().cloned() { + __result.push(instantiate_algebra_type(tp.clone(), &base, &source_indices)); + } + __result + }); + let param_types = Rc::new({ + let mut __result = Vec::new(); + for b in param_bs.clone().iter().cloned() { + __result.push(b.ty.clone()); + } + __result + }); + let param_diags = Rc::new({ + let mut __result = Vec::new(); + for b in param_bs.clone().iter().cloned() { + __result.extend((*b.diagnostics.clone()).iter().cloned()); + } + __result + }); + let return_b = + instantiate_algebra_type(template.return_type.clone(), &base, &source_indices); + let field_ty = if ((param_types.clone().len() as i64) > 0) { + algebra_method_field( + &template.name.clone(), + param_types.clone(), + return_b.ty.clone(), + ) } else { algebra_value_field(&template.name.clone(), return_b.ty.clone()) }; -Rc::new(KernelTypeBuild { - ty: field_ty, - diagnostics: v2_rt::concat(param_diags, return_b.diagnostics.clone()), -}) -} + Rc::new(KernelTypeBuild { + ty: field_ty, + diagnostics: v2_rt::concat(param_diags, return_b.diagnostics.clone()), + }) + } } -pub fn enrich_kernel_type(name: &String, base: &Rc, source_indices: Rc>>) -> Rc { +pub fn enrich_kernel_type( + name: &String, + base: &Rc, + source_indices: Rc>>, +) -> Rc { { let profile = v2_rt::map_get(&kernel_algebra_profile(), name.clone()); -match profile { - Some(p) => { - let field_bs = Rc::new({ let mut __result = Vec::new(); for template in algebra_templates_for_profile(p.clone()).iter().cloned() { __result.push(instantiate_algebra_field(&template, &base, &source_indices)); } __result }); -let fields = Rc::new({ let mut __result = Vec::new(); for b in field_bs.clone().iter().cloned() { __result.push(b.ty.clone()); } __result }); -let field_diags = Rc::new({ let mut __result = Vec::new(); for b in field_bs.clone().iter().cloned() { __result.extend((*b.diagnostics.clone()).iter().cloned()); } __result }); -Rc::new(KernelTypeBuild { - ty: enrich_base_with_fields(name.clone(), &base, fields), - diagnostics: field_diags, -}) -}, - None => Rc::new(KernelTypeBuild { - ty: base.clone(), - diagnostics: Rc::new(vec![]), -}), -} -} + match profile { + Some(p) => { + let field_bs = Rc::new({ + let mut __result = Vec::new(); + for template in algebra_templates_for_profile(p.clone()).iter().cloned() { + __result.push(instantiate_algebra_field(&template, &base, &source_indices)); + } + __result + }); + let fields = Rc::new({ + let mut __result = Vec::new(); + for b in field_bs.clone().iter().cloned() { + __result.push(b.ty.clone()); + } + __result + }); + let field_diags = Rc::new({ + let mut __result = Vec::new(); + for b in field_bs.clone().iter().cloned() { + __result.extend((*b.diagnostics.clone()).iter().cloned()); + } + __result + }); + Rc::new(KernelTypeBuild { + ty: enrich_base_with_fields(name.clone(), &base, fields), + diagnostics: field_diags, + }) + } + None => Rc::new(KernelTypeBuild { + ty: base.clone(), + diagnostics: Rc::new(vec![]), + }), + } + } } -pub fn unify_template(template: Rc, concrete: &Rc, receiver: &Rc, subst: Rc>>, source_indices: &Rc>>) -> Rc>> { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - match (*template).clone() { - AlgebraTypeTemplate::AlgebraTypeVariable { id: var_id, .. } => if (v2_rt::map_get(&subst, var_id.clone()) != None) { - subst.clone() - } else { - v2_rt::rc_map_insert(subst.clone(), var_id.clone(), concrete.clone()) - }, - AlgebraTypeTemplate::ReceiverSelf => { +pub fn unify_template( + template: Rc, + concrete: &Rc, + receiver: &Rc, + subst: Rc>>, + source_indices: &Rc>>, +) -> Rc>> { + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*template).clone() { + AlgebraTypeTemplate::AlgebraTypeVariable { id: var_id, .. } => { + if (v2_rt::map_get(&subst, var_id.clone()) != None) { + subst.clone() + } else { + v2_rt::rc_map_insert(subst.clone(), var_id.clone(), concrete.clone()) + } + } + AlgebraTypeTemplate::ReceiverSelf => { let s1 = match concrete.children.clone().first().cloned() { - Some(k) => if (v2_rt::map_get(&subst, "__key__".to_string()) != None) { + Some(k) => { + if (v2_rt::map_get(&subst, "__key__".to_string()) != None) { + subst.clone() + } else { + v2_rt::rc_map_insert( + subst.clone(), + "__key__".to_string(), + child_type_node(&k), + ) + } + } + None => subst.clone(), + }; + match concrete.children.clone().get(1 as usize).cloned() { + Some(v) => { + if (v2_rt::map_get(&s1, "__value__".to_string()) != None) { + s1.clone() + } else { + v2_rt::rc_map_insert( + s1.clone(), + "__value__".to_string(), + child_type_node(&v), + ) + } + } + None => s1.clone(), + } + } + AlgebraTypeTemplate::ReceiverKey => { + if (v2_rt::map_get(&subst, "__key__".to_string()) != None) { subst.clone() } else { - v2_rt::rc_map_insert(subst.clone(), "__key__".to_string(), child_type_node(&k)) - }, - None => subst.clone(), -}; -match concrete.children.clone().get(1 as usize).cloned() { - Some(v) => if (v2_rt::map_get(&s1, "__value__".to_string()) != None) { - s1.clone() + v2_rt::rc_map_insert(subst.clone(), "__key__".to_string(), concrete.clone()) + } + } + AlgebraTypeTemplate::ReceiverValue => { + if (v2_rt::map_get(&subst, "__value__".to_string()) != None) { + subst.clone() } else { - v2_rt::rc_map_insert(s1.clone(), "__value__".to_string(), child_type_node(&v)) - }, - None => s1.clone(), -} -}, - AlgebraTypeTemplate::ReceiverKey => if (v2_rt::map_get(&subst, "__key__".to_string()) != None) { - subst.clone() - } else { - v2_rt::rc_map_insert(subst.clone(), "__key__".to_string(), concrete.clone()) - }, - AlgebraTypeTemplate::ReceiverValue => if (v2_rt::map_get(&subst, "__value__".to_string()) != None) { - subst.clone() - } else { - v2_rt::rc_map_insert(subst.clone(), "__value__".to_string(), concrete.clone()) - }, - AlgebraTypeTemplate::ReceiverElement => if (v2_rt::map_get(&subst, "__element__".to_string()) != None) { - subst.clone() - } else { - v2_rt::rc_map_insert(subst.clone(), "__element__".to_string(), concrete.clone()) - }, - AlgebraTypeTemplate::CallableOf { return_type: ret_template, .. } => unify_template(ret_template.clone(), &concrete, &receiver, subst.clone(), &source_indices), - AlgebraTypeTemplate::ContainerOf { source: src, element: elem_template, .. } => { + v2_rt::rc_map_insert(subst.clone(), "__value__".to_string(), concrete.clone()) + } + } + AlgebraTypeTemplate::ReceiverElement => { + if (v2_rt::map_get(&subst, "__element__".to_string()) != None) { + subst.clone() + } else { + v2_rt::rc_map_insert(subst.clone(), "__element__".to_string(), concrete.clone()) + } + } + AlgebraTypeTemplate::CallableOf { + return_type: ret_template, + .. + } => unify_template( + ret_template.clone(), + &concrete, + &receiver, + subst.clone(), + &source_indices, + ), + AlgebraTypeTemplate::ContainerOf { + source: src, + element: elem_template, + .. + } => { let expected_name = match (*src.clone()).clone() { - ContainerSource::SameAsReceiver => authored_name_at(source_indices.clone(), &receiver), - ContainerSource::Named { name: n, .. } => n.clone(), -}; -if (authored_name_at(source_indices.clone(), &concrete).as_str() != expected_name.as_str()) { + ContainerSource::SameAsReceiver => { + authored_name_at(source_indices.clone(), &receiver) + } + ContainerSource::Named { name: n, .. } => n.clone(), + }; + if (authored_name_at(source_indices.clone(), &concrete).as_str() + != expected_name.as_str()) + { subst.clone() } else { match concrete.children.clone().first().cloned() { - Some(child) => unify_template(elem_template.clone(), &child_type_node(&child), &receiver, subst.clone(), &source_indices), - None => subst.clone(), -} + Some(child) => unify_template( + elem_template.clone(), + &child_type_node(&child), + &receiver, + subst.clone(), + &source_indices, + ), + None => subst.clone(), + } } -}, - AlgebraTypeTemplate::OptionalOf { inner: inner_template, .. } => match concrete.children.clone().first().cloned() { - Some(child) => unify_template(inner_template.clone(), &child_type_node(&child), &receiver, subst.clone(), &source_indices), - None => subst.clone(), -}, - AlgebraTypeTemplate::TupleOf { first: ft, second: st, .. } => { + } + AlgebraTypeTemplate::OptionalOf { + inner: inner_template, + .. + } => match concrete.children.clone().first().cloned() { + Some(child) => unify_template( + inner_template.clone(), + &child_type_node(&child), + &receiver, + subst.clone(), + &source_indices, + ), + None => subst.clone(), + }, + AlgebraTypeTemplate::TupleOf { + first: ft, + second: st, + .. + } => { let s2 = match concrete.children.clone().first().cloned() { - Some(c) => unify_template(ft.clone(), &child_type_node(&c), &receiver, subst.clone(), &source_indices), - None => subst.clone(), -}; -match concrete.children.clone().get(1 as usize).cloned() { - Some(c) => unify_template(st.clone(), &child_type_node(&c), &receiver, s2, &source_indices), - None => s2, -} -}, - _ => subst.clone(), -} + Some(c) => unify_template( + ft.clone(), + &child_type_node(&c), + &receiver, + subst.clone(), + &source_indices, + ), + None => subst.clone(), + }; + match concrete.children.clone().get(1 as usize).cloned() { + Some(c) => unify_template( + st.clone(), + &child_type_node(&c), + &receiver, + s2, + &source_indices, + ), + None => s2, + } + } + _ => subst.clone(), }) } pub fn is_receiver_self(t: Rc) -> bool { match (*t).clone() { - AlgebraTypeTemplate::ReceiverSelf => true, - _ => false, -} + AlgebraTypeTemplate::ReceiverSelf => true, + _ => false, + } } -pub fn build_type_substitution(param_templates: &Rc>>, arg_types: Rc>>, receiver: Rc, base_subst: Rc>>, source_indices: Rc>>) -> Rc>> { +pub fn build_type_substitution( + param_templates: &Rc>>, + arg_types: Rc>>, + receiver: Rc, + base_subst: Rc>>, + source_indices: Rc>>, +) -> Rc>> { { let first_is_self = match param_templates.clone().first().cloned() { - Some(t) => is_receiver_self(t.clone()), - None => false, -}; -let non_receiver_templates = if first_is_self { - Rc::new(param_templates.clone().iter().cloned().skip(1 as usize).collect::>()) + Some(t) => is_receiver_self(t.clone()), + None => false, + }; + let non_receiver_templates = if first_is_self { + Rc::new( + param_templates + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ) } else { param_templates.clone() }; -let pairs = Rc::new({ let mut __result = Vec::new(); for pair in Rc::new(non_receiver_templates.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (pair.0.clone() < (arg_types.clone().len() as i64)) { __result.push(pair); } } __result }); -pairs.iter().cloned().fold(base_subst.clone(), |subst: Rc>>, pair: (i64, Rc)| { - let arg_type = match Rc::new({ let mut __result = Vec::new(); for ap in Rc::new({ let mut __result = Vec::new(); for ap in Rc::new(arg_types.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (ap.0.clone() == pair.0.clone()) { __result.push(ap); } } __result }).iter().cloned() { __result.push(ap.1.clone()); } __result }).first().cloned() { - Some(a) => a.clone(), - None => error_type(), -}; -unify_template(pair.1.clone(), &arg_type, &receiver, subst, &source_indices) -}) -} + let pairs = Rc::new({ + let mut __result = Vec::new(); + for pair in Rc::new( + non_receiver_templates + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + if (pair.0.clone() < (arg_types.clone().len() as i64)) { + __result.push(pair); + } + } + __result + }); + pairs.iter().cloned().fold( + base_subst.clone(), + |subst: Rc>>, pair: (i64, Rc)| { + let arg_type = match Rc::new({ + let mut __result = Vec::new(); + for ap in Rc::new({ + let mut __result = Vec::new(); + for ap in Rc::new( + arg_types + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + if (ap.0.clone() == pair.0.clone()) { + __result.push(ap); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(ap.1.clone()); + } + __result + }) + .first() + .cloned() + { + Some(a) => a.clone(), + None => error_type(), + }; + unify_template(pair.1.clone(), &arg_type, &receiver, subst, &source_indices) + }, + ) + } } -pub fn apply_type_substitution(template: Rc, subst: &Rc>>, receiver: &Rc, source_indices: &Rc>>) -> Rc { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - match (*template).clone() { - AlgebraTypeTemplate::AlgebraTypeVariable { id: var_id, .. } => match v2_rt::map_get(&subst, var_id.clone()) { - Some(resolved) => Rc::new(KernelTypeBuild { - ty: resolved.clone(), - diagnostics: Rc::new(vec![]), -}), - None => Rc::new(KernelTypeBuild { - ty: type_variable_node(var_id.clone()), - diagnostics: Rc::new(vec![]), -}), -}, - AlgebraTypeTemplate::ReceiverSelf => { +pub fn apply_type_substitution( + template: Rc, + subst: &Rc>>, + receiver: &Rc, + source_indices: &Rc>>, +) -> Rc { + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*template).clone() { + AlgebraTypeTemplate::AlgebraTypeVariable { id: var_id, .. } => { + match v2_rt::map_get(&subst, var_id.clone()) { + Some(resolved) => Rc::new(KernelTypeBuild { + ty: resolved.clone(), + diagnostics: Rc::new(vec![]), + }), + None => Rc::new(KernelTypeBuild { + ty: type_variable_node(var_id.clone()), + diagnostics: Rc::new(vec![]), + }), + } + } + AlgebraTypeTemplate::ReceiverSelf => { let receiver_name_str = authored_name_at(source_indices.clone(), &receiver); -let is_bare = (is_container_type(receiver_name_str.clone()) && { let mut __all = true; for ch in receiver.children.clone().iter().cloned() { if !({ - let inner = child_type_node(&ch); -if (inner.inferred.clone() != None) { - is_type_variable(inner.inferred.clone().clone().unwrap()) - } else { - ((inner.ident_span.clone() == None) || !is_kernel_type(authored_name_at(source_indices.clone(), &inner))) + let is_bare = (is_container_type(receiver_name_str.clone()) && { + let mut __all = true; + for ch in receiver.children.clone().iter().cloned() { + if !({ + let inner = child_type_node(&ch); + if (inner.inferred.clone() != None) { + is_type_variable(inner.inferred.clone().clone().unwrap()) + } else { + ((inner.ident_span.clone() == None) + || !is_kernel_type(authored_name_at( + source_indices.clone(), + &inner, + ))) + } + }) { + __all = false; + break; + } } -}) { __all = false; break; } } __all }); -if is_bare { + __all + }); + if is_bare { { let arity = container_expected_arity(receiver_name_str.clone()); -if (arity.clone() == Some(2)) { + if (arity.clone() == Some(2)) { match v2_rt::map_get(&subst, "__key__".to_string()) { - Some(key) => { - let val = match v2_rt::map_get(&subst, "__value__".to_string()) { - Some(v) => v.clone(), - None => type_variable_node("V".to_string()), -}; -make_map_type(key.clone(), val) -}, - None => Rc::new(KernelTypeBuild { - ty: receiver.clone(), - diagnostics: Rc::new(vec![]), -}), -} + Some(key) => { + let val = match v2_rt::map_get(&subst, "__value__".to_string()) { + Some(v) => v.clone(), + None => type_variable_node("V".to_string()), + }; + make_map_type(key.clone(), val) + } + None => Rc::new(KernelTypeBuild { + ty: receiver.clone(), + diagnostics: Rc::new(vec![]), + }), + } } else { if (arity.clone() == Some(1)) { match v2_rt::map_get(&subst, "__element__".to_string()) { - Some(elem) => make_container_type(&receiver_name_str, elem.clone()), - None => Rc::new(KernelTypeBuild { - ty: receiver.clone(), - diagnostics: Rc::new(vec![]), -}), -} + Some(elem) => make_container_type(&receiver_name_str, elem.clone()), + None => Rc::new(KernelTypeBuild { + ty: receiver.clone(), + diagnostics: Rc::new(vec![]), + }), + } } else { Rc::new(KernelTypeBuild { - ty: receiver.clone(), - diagnostics: Rc::new(vec![]), -}) + ty: receiver.clone(), + diagnostics: Rc::new(vec![]), + }) } } -} + } } else { Rc::new(KernelTypeBuild { - ty: receiver.clone(), - diagnostics: Rc::new(vec![]), -}) + ty: receiver.clone(), + diagnostics: Rc::new(vec![]), + }) } -}, - AlgebraTypeTemplate::ReceiverElement => match receiver.children.clone().first().cloned() { - Some(child) => Rc::new(KernelTypeBuild { - ty: child_type_node(&child), - diagnostics: Rc::new(vec![]), -}), - None => match v2_rt::map_get(&subst, "__element__".to_string()) { - Some(elem) => Rc::new(KernelTypeBuild { - ty: elem.clone(), - diagnostics: Rc::new(vec![]), -}), - None => { - let rname = authored_name_at(source_indices.clone(), &receiver); -match container_param_name(rname.clone(), 0) { - Some(n) => Rc::new(KernelTypeBuild { - ty: type_variable_node(n.clone()), - diagnostics: Rc::new(vec![]), -}), - None => Rc::new(KernelTypeBuild { - ty: missing_kernel_container_profile_type(rname.clone()), - diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic(rname.clone())]), -}), -} -}, -}, -}, - AlgebraTypeTemplate::ReceiverKey => match receiver.children.clone().first().cloned() { - Some(child) => Rc::new(KernelTypeBuild { - ty: child_type_node(&child), - diagnostics: Rc::new(vec![]), -}), - None => match v2_rt::map_get(&subst, "__key__".to_string()) { - Some(key) => Rc::new(KernelTypeBuild { - ty: key.clone(), - diagnostics: Rc::new(vec![]), -}), - None => { - let rname = authored_name_at(source_indices.clone(), &receiver); -match container_param_name(rname.clone(), 0) { - Some(n) => Rc::new(KernelTypeBuild { - ty: type_variable_node(n.clone()), - diagnostics: Rc::new(vec![]), -}), - None => Rc::new(KernelTypeBuild { - ty: missing_kernel_container_profile_type(rname.clone()), - diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic(rname.clone())]), -}), -} -}, -}, -}, - AlgebraTypeTemplate::ReceiverValue => match receiver.children.clone().get(1 as usize).cloned() { - Some(child) => Rc::new(KernelTypeBuild { - ty: child_type_node(&child), - diagnostics: Rc::new(vec![]), -}), - None => match v2_rt::map_get(&subst, "__value__".to_string()) { - Some(val) => Rc::new(KernelTypeBuild { - ty: val, - diagnostics: Rc::new(vec![]), -}), - None => { - let rname = authored_name_at(source_indices.clone(), &receiver); -match container_param_name(rname.clone(), 1) { - Some(n) => Rc::new(KernelTypeBuild { - ty: type_variable_node(n.clone()), - diagnostics: Rc::new(vec![]), -}), - None => Rc::new(KernelTypeBuild { - ty: missing_kernel_container_profile_type(rname.clone()), - diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic(rname.clone())]), -}), -} -}, -}, -}, - AlgebraTypeTemplate::NamedTemplate { name: n, .. } => Rc::new(KernelTypeBuild { - ty: nominal_type_ref(&n), - diagnostics: Rc::new(vec![]), -}), - AlgebraTypeTemplate::ContainerOf { source: src, element: inner, .. } => { + } + AlgebraTypeTemplate::ReceiverElement => match receiver.children.clone().first().cloned() { + Some(child) => Rc::new(KernelTypeBuild { + ty: child_type_node(&child), + diagnostics: Rc::new(vec![]), + }), + None => match v2_rt::map_get(&subst, "__element__".to_string()) { + Some(elem) => Rc::new(KernelTypeBuild { + ty: elem.clone(), + diagnostics: Rc::new(vec![]), + }), + None => { + let rname = authored_name_at(source_indices.clone(), &receiver); + match container_param_name(rname.clone(), 0) { + Some(n) => Rc::new(KernelTypeBuild { + ty: type_variable_node(n.clone()), + diagnostics: Rc::new(vec![]), + }), + None => Rc::new(KernelTypeBuild { + ty: missing_kernel_container_profile_type(rname.clone()), + diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic( + rname.clone(), + )]), + }), + } + } + }, + }, + AlgebraTypeTemplate::ReceiverKey => match receiver.children.clone().first().cloned() { + Some(child) => Rc::new(KernelTypeBuild { + ty: child_type_node(&child), + diagnostics: Rc::new(vec![]), + }), + None => match v2_rt::map_get(&subst, "__key__".to_string()) { + Some(key) => Rc::new(KernelTypeBuild { + ty: key.clone(), + diagnostics: Rc::new(vec![]), + }), + None => { + let rname = authored_name_at(source_indices.clone(), &receiver); + match container_param_name(rname.clone(), 0) { + Some(n) => Rc::new(KernelTypeBuild { + ty: type_variable_node(n.clone()), + diagnostics: Rc::new(vec![]), + }), + None => Rc::new(KernelTypeBuild { + ty: missing_kernel_container_profile_type(rname.clone()), + diagnostics: Rc::new(vec![kernel_container_profile_miss_diagnostic( + rname.clone(), + )]), + }), + } + } + }, + }, + AlgebraTypeTemplate::ReceiverValue => { + match receiver.children.clone().get(1 as usize).cloned() { + Some(child) => Rc::new(KernelTypeBuild { + ty: child_type_node(&child), + diagnostics: Rc::new(vec![]), + }), + None => match v2_rt::map_get(&subst, "__value__".to_string()) { + Some(val) => Rc::new(KernelTypeBuild { + ty: val, + diagnostics: Rc::new(vec![]), + }), + None => { + let rname = authored_name_at(source_indices.clone(), &receiver); + match container_param_name(rname.clone(), 1) { + Some(n) => Rc::new(KernelTypeBuild { + ty: type_variable_node(n.clone()), + diagnostics: Rc::new(vec![]), + }), + None => Rc::new(KernelTypeBuild { + ty: missing_kernel_container_profile_type(rname.clone()), + diagnostics: Rc::new(vec![ + kernel_container_profile_miss_diagnostic(rname.clone()), + ]), + }), + } + } + }, + } + } + AlgebraTypeTemplate::NamedTemplate { name: n, .. } => Rc::new(KernelTypeBuild { + ty: nominal_type_ref(&n), + diagnostics: Rc::new(vec![]), + }), + AlgebraTypeTemplate::ContainerOf { + source: src, + element: inner, + .. + } => { let kind_name = match (*src.clone()).clone() { - ContainerSource::SameAsReceiver => authored_name_at(source_indices.clone(), &receiver), - ContainerSource::Named { name: n, .. } => n.clone(), -}; -let inner_applied = apply_type_substitution(inner.clone(), &subst, &receiver, &source_indices); -let built = make_container_type(&kind_name, inner_applied.ty.clone()); -Rc::new(KernelTypeBuild { - ty: built.ty.clone(), - diagnostics: v2_rt::concat(inner_applied.diagnostics.clone(), built.diagnostics.clone()), -}) -}, - AlgebraTypeTemplate::OptionalOf { inner, .. } => { + ContainerSource::SameAsReceiver => { + authored_name_at(source_indices.clone(), &receiver) + } + ContainerSource::Named { name: n, .. } => n.clone(), + }; + let inner_applied = + apply_type_substitution(inner.clone(), &subst, &receiver, &source_indices); + let built = make_container_type(&kind_name, inner_applied.ty.clone()); + Rc::new(KernelTypeBuild { + ty: built.ty.clone(), + diagnostics: v2_rt::concat( + inner_applied.diagnostics.clone(), + built.diagnostics.clone(), + ), + }) + } + AlgebraTypeTemplate::OptionalOf { inner, .. } => { let ib = apply_type_substitution(inner.clone(), &subst, &receiver, &source_indices); -Rc::new(KernelTypeBuild { - ty: with_optional_cardinality(&ib.ty.clone()), - diagnostics: ib.diagnostics.clone(), -}) -}, - AlgebraTypeTemplate::TupleOf { first: ft, second: st, .. } => { + Rc::new(KernelTypeBuild { + ty: with_optional_cardinality(&ib.ty.clone()), + diagnostics: ib.diagnostics.clone(), + }) + } + AlgebraTypeTemplate::TupleOf { + first: ft, + second: st, + .. + } => { let fb = apply_type_substitution(ft.clone(), &subst, &receiver, &source_indices); -let sb = apply_type_substitution(st.clone(), &subst, &receiver, &source_indices); -Rc::new(KernelTypeBuild { - ty: make_tuple_type(fb.ty.clone(), sb.ty.clone()), - diagnostics: v2_rt::concat(fb.diagnostics.clone(), sb.diagnostics.clone()), -}) -}, - AlgebraTypeTemplate::CallableOf { params: p, return_type: r, .. } => { - let param_bs = Rc::new({ let mut __result = Vec::new(); for tp in p.clone().iter().cloned() { __result.push(apply_type_substitution(tp.clone(), &subst, &receiver, &source_indices)); } __result }); -let param_nodes = Rc::new({ let mut __result = Vec::new(); for b in param_bs.clone().iter().cloned() { __result.push(b.ty.clone()); } __result }); -let param_diags = Rc::new({ let mut __result = Vec::new(); for b in param_bs.clone().iter().cloned() { __result.extend((*b.diagnostics.clone()).iter().cloned()); } __result }); -let rb = apply_type_substitution(r.clone(), &subst, &receiver, &source_indices); -Rc::new(KernelTypeBuild { - ty: make_callable_type(Rc::new({ let mut __result = Vec::new(); for pn in param_nodes.iter().cloned() { __result.push(make_param_node(&"_".to_string(), pn.clone(), None, no_span(), no_span())); } __result }), rb.ty.clone()), - diagnostics: v2_rt::concat(param_diags, rb.diagnostics.clone()), -}) -}, -} + let sb = apply_type_substitution(st.clone(), &subst, &receiver, &source_indices); + Rc::new(KernelTypeBuild { + ty: make_tuple_type(fb.ty.clone(), sb.ty.clone()), + diagnostics: v2_rt::concat(fb.diagnostics.clone(), sb.diagnostics.clone()), + }) + } + AlgebraTypeTemplate::CallableOf { + params: p, + return_type: r, + .. + } => { + let param_bs = Rc::new({ + let mut __result = Vec::new(); + for tp in p.clone().iter().cloned() { + __result.push(apply_type_substitution( + tp.clone(), + &subst, + &receiver, + &source_indices, + )); + } + __result + }); + let param_nodes = Rc::new({ + let mut __result = Vec::new(); + for b in param_bs.clone().iter().cloned() { + __result.push(b.ty.clone()); + } + __result + }); + let param_diags = Rc::new({ + let mut __result = Vec::new(); + for b in param_bs.clone().iter().cloned() { + __result.extend((*b.diagnostics.clone()).iter().cloned()); + } + __result + }); + let rb = apply_type_substitution(r.clone(), &subst, &receiver, &source_indices); + Rc::new(KernelTypeBuild { + ty: make_callable_type( + Rc::new({ + let mut __result = Vec::new(); + for pn in param_nodes.iter().cloned() { + __result.push(make_param_node( + &"_".to_string(), + pn.clone(), + None, + no_span(), + no_span(), + )); + } + __result + }), + rb.ty.clone(), + ), + diagnostics: v2_rt::concat(param_diags, rb.diagnostics.clone()), + }) + } }) } @@ -1024,255 +1374,341 @@ pub fn template_return_has_variables(template: Rc) -> bool } pub fn has_type_variable(t: Rc) -> bool { - stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - match (*t).clone() { - AlgebraTypeTemplate::AlgebraTypeVariable { .. } => true, - AlgebraTypeTemplate::ContainerOf { element: inner, .. } => has_type_variable(inner.clone()), - AlgebraTypeTemplate::OptionalOf { inner, .. } => has_type_variable(inner.clone()), - AlgebraTypeTemplate::TupleOf { first: f, second: s, .. } => (has_type_variable(f.clone()) || has_type_variable(s.clone())), - AlgebraTypeTemplate::CallableOf { return_type: r, .. } => has_type_variable(r.clone()), - _ => false, -} + stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || match (*t).clone() { + AlgebraTypeTemplate::AlgebraTypeVariable { .. } => true, + AlgebraTypeTemplate::ContainerOf { element: inner, .. } => has_type_variable(inner.clone()), + AlgebraTypeTemplate::OptionalOf { inner, .. } => has_type_variable(inner.clone()), + AlgebraTypeTemplate::TupleOf { + first: f, + second: s, + .. + } => (has_type_variable(f.clone()) || has_type_variable(s.clone())), + AlgebraTypeTemplate::CallableOf { return_type: r, .. } => has_type_variable(r.clone()), + _ => false, }) } -pub fn resolve_type_variables_from_template(template: &Rc, arg_types: Rc>>, receiver_type: &Rc, overrides: Rc>>, source_indices: &Rc>>) -> Rc { +pub fn resolve_type_variables_from_template( + template: &Rc, + arg_types: Rc>>, + receiver_type: &Rc, + overrides: Rc>>, + source_indices: &Rc>>, +) -> Rc { { - let subst = build_type_substitution(&template.param_types.clone(), arg_types, receiver_type.clone(), overrides, source_indices.clone()); -apply_type_substitution(template.return_type.clone(), &subst, &receiver_type, &source_indices) -} + let subst = build_type_substitution( + &template.param_types.clone(), + arg_types, + receiver_type.clone(), + overrides, + source_indices.clone(), + ); + apply_type_substitution( + template.return_type.clone(), + &subst, + &receiver_type, + &source_indices, + ) + } } pub fn callable_inferred(n: &Rc) -> Rc { { let is_callable = ((n.params.clone().len() as i64) > 0); -if is_callable { + if is_callable { match n.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: ret, .. }) => ret.clone(), - None => error_type(), - _ => error_type(), -} + Some(InferredNode::Resolved { node: ret, .. }) => ret.clone(), + None => error_type(), + _ => error_type(), + } } else { n.clone() } -} + } } pub fn normalize_access_type_node(mut n: Rc) -> Rc { loop { let has_structure = (n.connective.clone() != Connective::NoConnective); -let unwrapped = if ((n.type_annotation.clone() != None) && has_structure) { + let unwrapped = if ((n.type_annotation.clone() != None) && has_structure) { n.children.clone().first().cloned() } else { None }; -match unwrapped { - Some(base) => { { - let __tco_0 = base.clone(); -n = __tco_0; -continue; -} }, - None => { break n.clone(); }, -} -} + match unwrapped { + Some(base) => { + let __tco_0 = base.clone(); + n = __tco_0; + continue; + } + None => { + break n.clone(); + } + } + } } -pub fn node_type_shape(n: &Rc, source_indices: &Rc>>) -> String { +pub fn node_type_shape( + n: &Rc, + source_indices: &Rc>>, +) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let __is_leaf = (((n.connective.clone() == Connective::NoConnective) && ((n.children.clone().len() as i64) == 0)) && ((n.properties.clone().len() as i64) == 0)); -let n_name = authored_name_at(source_indices.clone(), &n); -if __is_leaf { - { - let __is_named_ref = match n.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => (((((rt.connective.clone() == Connective::NoConnective) && ((rt.children.clone().len() as i64) == 0)) && (rt.ident_span.clone() != None)) && (authored_name_at(source_indices.clone(), &rt).as_str() != "None".to_string().as_str())) && (is_kernel_type(authored_name_at(source_indices.clone(), &rt)) == false)), - _ => false, -}; -if __is_named_ref { - v2_rt::concat(v2_rt::concat("Named(".to_string(), n_name), ")".to_string()) + let __is_leaf = (((n.connective.clone() == Connective::NoConnective) + && ((n.children.clone().len() as i64) == 0)) + && ((n.properties.clone().len() as i64) == 0)); + let n_name = authored_name_at(source_indices.clone(), &n); + if __is_leaf { + { + let __is_named_ref = match n.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + (((((rt.connective.clone() == Connective::NoConnective) + && ((rt.children.clone().len() as i64) == 0)) + && (rt.ident_span.clone() != None)) + && (authored_name_at(source_indices.clone(), &rt).as_str() + != "None".to_string().as_str())) + && (is_kernel_type(authored_name_at(source_indices.clone(), &rt)) + == false)) + } + _ => false, + }; + if __is_named_ref { + v2_rt::concat(v2_rt::concat("Named(".to_string(), n_name), ")".to_string()) + } else { + v2_rt::concat( + v2_rt::concat("Primitive(".to_string(), n_name), + ")".to_string(), + ) + } + } + } else { + { + let is_product = (n.connective.clone() == Connective::Conj); + let is_coproduct = (n.connective.clone() == Connective::Disj); + if is_product { + if (n.ident_span.clone() == None) { + "Product()".to_string() } else { - v2_rt::concat(v2_rt::concat("Primitive(".to_string(), n_name), ")".to_string()) + v2_rt::concat( + v2_rt::concat("Product(".to_string(), n_name), + ")".to_string(), + ) } -} - } else { - { - let is_product = (n.connective.clone() == Connective::Conj); -let is_coproduct = (n.connective.clone() == Connective::Disj); -if is_product { + } else { + if is_coproduct { if (n.ident_span.clone() == None) { - "Product()".to_string() + "Coproduct()".to_string() } else { - v2_rt::concat(v2_rt::concat("Product(".to_string(), n_name), ")".to_string()) + v2_rt::concat( + v2_rt::concat("Coproduct(".to_string(), n_name), + ")".to_string(), + ) } } else { - if is_coproduct { - if (n.ident_span.clone() == None) { - "Coproduct()".to_string() + { + let __is_container = + node_is_element_collection(&n, source_indices.clone()); + let is_optional = + (n.return_cardinality.clone() == Cardinality::CardOptional); + let is_map = node_is_keyed_collection(&n, source_indices.clone()); + if __is_container { + { + let elem_shape = match n.children.clone().first().cloned() { + Some(el) => { + node_type_shape(&child_type_node(&el), &source_indices) + } + None => "?".to_string(), + }; + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("Container(".to_string(), n_name), + ",".to_string(), + ), + elem_shape, + ), + ")".to_string(), + ) + } } else { - v2_rt::concat(v2_rt::concat("Coproduct(".to_string(), n_name), ")".to_string()) - } - } else { - { - let __is_container = node_is_element_collection(&n, source_indices.clone()); -let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); -let is_map = node_is_keyed_collection(&n, source_indices.clone()); -if __is_container { + if is_optional { { - let elem_shape = match n.children.clone().first().cloned() { - Some(el) => node_type_shape(&child_type_node(&el), &source_indices), - None => "?".to_string(), -}; -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("Container(".to_string(), n_name), ",".to_string()), elem_shape), ")".to_string()) -} + let inner_shape = node_type_shape( + &with_required_cardinality(&n), + &source_indices, + ); + v2_rt::concat( + v2_rt::concat("Optional(".to_string(), inner_shape), + ")".to_string(), + ) + } } else { - if is_optional { - { - let inner_shape = node_type_shape(&with_required_cardinality(&n), &source_indices); -v2_rt::concat(v2_rt::concat("Optional(".to_string(), inner_shape), ")".to_string()) -} + if is_map { + "Map(...)".to_string() } else { - if is_map { - "Map(...)".to_string() - } else { - v2_rt::concat(v2_rt::concat("Node(".to_string(), n_name), ")".to_string()) - } + v2_rt::concat( + v2_rt::concat("Node(".to_string(), n_name), + ")".to_string(), + ) } } -} + } } } -} + } } -} + } }) } -pub fn node_type_compatible(mut left: Rc, mut right: Rc, mut source_indices: Rc>>) -> bool { +pub fn node_type_compatible( + mut left: Rc, + mut right: Rc, + mut source_indices: Rc>>, +) -> bool { loop { let left_err = if (left.inferred.clone() != None) { is_compiler_error(left.inferred.clone().clone().unwrap()) } else { false }; -let right_err = if (right.inferred.clone() != None) { + let right_err = if (right.inferred.clone() != None) { is_compiler_error(right.inferred.clone().clone().unwrap()) } else { false }; -let left_tv = if (left.inferred.clone() != None) { + let left_tv = if (left.inferred.clone() != None) { is_type_variable(left.inferred.clone().clone().unwrap()) } else { false }; -let right_tv = if (right.inferred.clone() != None) { + let right_tv = if (right.inferred.clone() != None) { is_type_variable(right.inferred.clone().clone().unwrap()) } else { false }; -let left_opt = (left.return_cardinality.clone() == Cardinality::CardOptional); -let right_opt = (right.return_cardinality.clone() == Cardinality::CardOptional); -let right_is_unit = is_unit_like(&right); -let left_is_unit = is_unit_like(&left); -if (left_err || right_err) { + let left_opt = (left.return_cardinality.clone() == Cardinality::CardOptional); + let right_opt = (right.return_cardinality.clone() == Cardinality::CardOptional); + let right_is_unit = is_unit_like(&right); + let left_is_unit = is_unit_like(&left); + if (left_err || right_err) { break true; -} else { + } else { if (left_tv || right_tv) { break true; -} else { + } else { if (left_opt.clone() && right_is_unit) { break true; -} else { + } else { if (left_is_unit && right_opt.clone()) { break true; -} else { - let left_is_container = node_is_element_collection(&left, source_indices.clone()); -let right_is_container = node_is_element_collection(&right, source_indices.clone()); -if (left_is_container && right_is_container) { - if (authored_name_at(source_indices.clone(), &left).as_str() != authored_name_at(source_indices.clone(), &right).as_str()) { + } else { + let left_is_container = + node_is_element_collection(&left, source_indices.clone()); + let right_is_container = + node_is_element_collection(&right, source_indices.clone()); + if (left_is_container && right_is_container) { + if (authored_name_at(source_indices.clone(), &left).as_str() + != authored_name_at(source_indices.clone(), &right).as_str()) + { break false; -} else { + } else { match left.children.clone().first().cloned() { - Some(left_ch) => { match right.children.clone().first().cloned() { - Some(right_ch) => { let left_el = child_type_node(&left_ch); -let right_el = child_type_node(&right_ch); -let left_el_is_unit = is_unit_like(&left_el); -let right_el_is_unit = is_unit_like(&right_el); -if (left_el_is_unit || right_el_is_unit) { - break true; -} else { - { - let __tco_0 = left_el.clone(); -let __tco_1 = right_el.clone(); -left = __tco_0; -right = __tco_1; -continue; -} -} }, - None => { break true; }, -} }, - None => { break true; }, -} -} -} else { + Some(left_ch) => { + match right.children.clone().first().cloned() { + Some(right_ch) => { + let left_el = child_type_node(&left_ch); + let right_el = child_type_node(&right_ch); + let left_el_is_unit = is_unit_like(&left_el); + let right_el_is_unit = is_unit_like(&right_el); + if (left_el_is_unit || right_el_is_unit) { + break true; + } else { + { + let __tco_0 = left_el.clone(); + let __tco_1 = right_el.clone(); + left = __tco_0; + right = __tco_1; + continue; + } + } + } + None => { + break true; + } + } + } + None => { + break true; + } + } + } + } else { if (left_opt.clone() && right_opt.clone()) { let left_inner = with_required_cardinality(&left); -let right_inner = with_required_cardinality(&right); -let left_inner_is_unit = is_unit_like(&left_inner); -let right_inner_is_unit = is_unit_like(&right_inner); -if (left_inner_is_unit || right_inner_is_unit) { + let right_inner = with_required_cardinality(&right); + let left_inner_is_unit = is_unit_like(&left_inner); + let right_inner_is_unit = is_unit_like(&right_inner); + if (left_inner_is_unit || right_inner_is_unit) { break true; -} else { + } else { { let __tco_0 = left_inner.clone(); -let __tco_1 = right_inner.clone(); -left = __tco_0; -right = __tco_1; -continue; -} -} -} else { + let __tco_1 = right_inner.clone(); + left = __tco_0; + right = __tco_1; + continue; + } + } + } else { if (left_opt.clone() || right_opt.clone()) { break false; -} else { - break (authored_name_at(source_indices.clone(), &left).as_str() == authored_name_at(source_indices.clone(), &right).as_str()); -} -} -} -} -} -} -} -} + } else { + break (authored_name_at(source_indices.clone(), &left) + .as_str() + == authored_name_at(source_indices.clone(), &right) + .as_str()); + } + } + } + } + } + } + } + } } -pub fn prefer_specific_type(left: Rc, right: Rc, source_indices: &Rc>>) -> Rc { +pub fn prefer_specific_type( + left: Rc, + right: Rc, + source_indices: &Rc>>, +) -> Rc { { let left_is_container = node_is_element_collection(&left, source_indices.clone()); -let left_is_optional = (left.return_cardinality.clone() == Cardinality::CardOptional); -let left_first_child = left.children.clone().first().cloned(); -let left_norm_name = authored_name_at(source_indices.clone(), &left); -let left_is_unit_inner = if left_is_container.clone() { + let left_is_optional = (left.return_cardinality.clone() == Cardinality::CardOptional); + let left_first_child = left.children.clone().first().cloned(); + let left_norm_name = authored_name_at(source_indices.clone(), &left); + let left_is_unit_inner = if left_is_container.clone() { match left_first_child { - Some(ch) => { - let el = child_type_node(&ch); -let el_is_unit = is_unit_like(&el); -el_is_unit -}, - None => false, -} + Some(ch) => { + let el = child_type_node(&ch); + let el_is_unit = is_unit_like(&el); + el_is_unit + } + None => false, + } } else { if left_is_optional.clone() { { let left_is_unit = is_unit_like(&left); -left_is_unit -} + left_is_unit + } } else { false } }; -let right_is_container = node_is_element_collection(&right, source_indices.clone()); -let right_is_optional = (right.return_cardinality.clone() == Cardinality::CardOptional); -let same_kind = if (left_is_container.clone() && right_is_container) { + let right_is_container = node_is_element_collection(&right, source_indices.clone()); + let right_is_optional = (right.return_cardinality.clone() == Cardinality::CardOptional); + let same_kind = if (left_is_container.clone() && right_is_container) { (left_norm_name.as_str() == authored_name_at(source_indices.clone(), &right).as_str()) } else { if (left_is_optional.clone() && right_is_optional) { @@ -1281,45 +1717,51 @@ let same_kind = if (left_is_container.clone() && right_is_container) { false } }; -if (same_kind && left_is_unit_inner) { + if (same_kind && left_is_unit_inner) { right.clone() } else { - if (is_fully_resolved(&right, &source_indices) && !is_fully_resolved(&left, &source_indices)) { + if (is_fully_resolved(&right, &source_indices) + && !is_fully_resolved(&left, &source_indices)) + { right.clone() } else { left.clone() } } -} + } } -pub fn node_type_equals(left: &Rc, right: &Rc, source_indices: Rc>>) -> bool { +pub fn node_type_equals( + left: &Rc, + right: &Rc, + source_indices: Rc>>, +) -> bool { { let left_err = if (left.inferred.clone() != None) { is_compiler_error(left.inferred.clone().clone().unwrap()) } else { false }; -let right_err = if (right.inferred.clone() != None) { + let right_err = if (right.inferred.clone() != None) { is_compiler_error(right.inferred.clone().clone().unwrap()) } else { false }; -let left_tv = if (left.inferred.clone() != None) { + let left_tv = if (left.inferred.clone() != None) { is_type_variable(left.inferred.clone().clone().unwrap()) } else { false }; -let right_tv = if (right.inferred.clone() != None) { + let right_tv = if (right.inferred.clone() != None) { is_type_variable(right.inferred.clone().clone().unwrap()) } else { false }; -let left_opt = (left.return_cardinality.clone() == Cardinality::CardOptional); -let right_opt = (right.return_cardinality.clone() == Cardinality::CardOptional); -let right_is_unit_eq = is_unit_like(&right); -let left_is_unit_eq = is_unit_like(&left); -if (left_err || right_err) { + let left_opt = (left.return_cardinality.clone() == Cardinality::CardOptional); + let right_opt = (right.return_cardinality.clone() == Cardinality::CardOptional); + let right_is_unit_eq = is_unit_like(&right); + let left_is_unit_eq = is_unit_like(&left); + if (left_err || right_err) { true } else { if (left_tv.clone() && right_tv.clone()) { @@ -1335,7 +1777,11 @@ if (left_err || right_err) { true } else { if (left_opt.clone() && right_opt.clone()) { - node_type_equals_core(&with_required_cardinality(&left), &with_required_cardinality(&right), &source_indices) + node_type_equals_core( + &with_required_cardinality(&left), + &with_required_cardinality(&right), + &source_indices, + ) } else { node_type_equals_core(&left, &right, &source_indices) } @@ -1344,34 +1790,75 @@ if (left_err || right_err) { } } } -} + } } -pub fn node_type_equals_core(left: &Rc, right: &Rc, source_indices: &Rc>>) -> bool { +pub fn node_type_equals_core( + left: &Rc, + right: &Rc, + source_indices: &Rc>>, +) -> bool { { - let left_leaf = (((left.connective.clone() == Connective::NoConnective) && ((left.children.clone().len() as i64) == 0)) && ((left.properties.clone().len() as i64) == 0)); -let right_leaf = (((right.connective.clone() == Connective::NoConnective) && ((right.children.clone().len() as i64) == 0)) && ((right.properties.clone().len() as i64) == 0)); -let left_struct = (left.connective.clone() != Connective::NoConnective); -let right_struct = (right.connective.clone() != Connective::NoConnective); -let left_name = authored_name_at(source_indices.clone(), &left); -let right_name = authored_name_at(source_indices.clone(), &right); -if (left_leaf.clone() && right_leaf.clone()) { + let left_leaf = (((left.connective.clone() == Connective::NoConnective) + && ((left.children.clone().len() as i64) == 0)) + && ((left.properties.clone().len() as i64) == 0)); + let right_leaf = (((right.connective.clone() == Connective::NoConnective) + && ((right.children.clone().len() as i64) == 0)) + && ((right.properties.clone().len() as i64) == 0)); + let left_struct = (left.connective.clone() != Connective::NoConnective); + let right_struct = (right.connective.clone() != Connective::NoConnective); + let left_name = authored_name_at(source_indices.clone(), &left); + let right_name = authored_name_at(source_indices.clone(), &right); + if (left_leaf.clone() && right_leaf.clone()) { (left_name.as_str() == right_name.as_str()) } else { if (left_struct.clone() && right_struct.clone()) { if (left_name.as_str() != right_name.as_str()) { false } else { - if ((left.connective.clone() == Connective::Conj) != (right.connective.clone() == Connective::Conj)) { + if ((left.connective.clone() == Connective::Conj) + != (right.connective.clone() == Connective::Conj)) + { false } else { - if ((left.children.clone().len() as i64) != (right.children.clone().len() as i64)) { + if ((left.children.clone().len() as i64) + != (right.children.clone().len() as i64)) + { false } else { - { let mut __all = true; for pair in Rc::new(left.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if !(match right.children.clone().get(pair.0.clone() as usize).cloned() { - Some(right_child) => node_type_equals(&pair.1.clone(), &right_child, source_indices.clone()), - None => false, -}) { __all = false; break; } } __all } + { + let mut __all = true; + for pair in Rc::new( + left.children + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + if !(match right + .children + .clone() + .get(pair.0.clone() as usize) + .cloned() + { + Some(right_child) => node_type_equals( + &pair.1.clone(), + &right_child, + source_indices.clone(), + ), + None => false, + }) { + __all = false; + break; + } + } + __all + } } } } @@ -1383,222 +1870,370 @@ if (left_leaf.clone() && right_leaf.clone()) { (left_name.as_str() == right_name.as_str()) } else { { - let left_is_container = node_is_element_collection(&left, source_indices.clone()); -let right_is_container = node_is_element_collection(&right, source_indices.clone()); -if (left_is_container && right_is_container) { + let left_is_container = + node_is_element_collection(&left, source_indices.clone()); + let right_is_container = + node_is_element_collection(&right, source_indices.clone()); + if (left_is_container && right_is_container) { if (left_name.as_str() != right_name.as_str()) { false } else { match left.children.clone().first().cloned() { - Some(left_ch) => match right.children.clone().first().cloned() { - Some(right_ch) => node_type_equals(&child_type_node(&left_ch), &child_type_node(&right_ch), source_indices.clone()), - None => false, -}, - None => false, -} + Some(left_ch) => { + match right.children.clone().first().cloned() { + Some(right_ch) => node_type_equals( + &child_type_node(&left_ch), + &child_type_node(&right_ch), + source_indices.clone(), + ), + None => false, + } + } + None => false, + } } } else { { - let both_maps = (node_is_keyed_collection(&left, source_indices.clone()) && node_is_keyed_collection(&right, source_indices.clone())); -if both_maps { - if (((left.children.clone().len() as i64) == 2) && ((right.children.clone().len() as i64) == 2)) { + let both_maps = + (node_is_keyed_collection(&left, source_indices.clone()) + && node_is_keyed_collection( + &right, + source_indices.clone(), + )); + if both_maps { + if (((left.children.clone().len() as i64) == 2) + && ((right.children.clone().len() as i64) == 2)) + { match left.children.clone().first().cloned() { - Some(left_first) => match right.children.clone().first().cloned() { - Some(right_first) => match left.children.clone().get(1 as usize).cloned() { - Some(left_second) => match right.children.clone().get(1 as usize).cloned() { - Some(right_second) => (node_type_equals(&child_type_node(&left_first), &child_type_node(&right_first), source_indices.clone()) && node_type_equals(&child_type_node(&left_second), &child_type_node(&right_second), source_indices.clone())), - None => false, -}, - None => false, -}, - None => false, -}, - None => false, -} + Some(left_first) => match right + .children + .clone() + .first() + .cloned() + { + Some(right_first) => match left + .children + .clone() + .get(1 as usize) + .cloned() + { + Some(left_second) => match right + .children + .clone() + .get(1 as usize) + .cloned() + { + Some(right_second) => { + (node_type_equals( + &child_type_node(&left_first), + &child_type_node(&right_first), + source_indices.clone(), + ) && node_type_equals( + &child_type_node(&left_second), + &child_type_node(&right_second), + source_indices.clone(), + )) + } + None => false, + }, + None => false, + }, + None => false, + }, + None => false, + } } else { false } } else { - if (((left.params.clone().len() as i64) > 0) && ((right.params.clone().len() as i64) > 0)) { - if ((left.params.clone().len() as i64) != (right.params.clone().len() as i64)) { + if (((left.params.clone().len() as i64) > 0) + && ((right.params.clone().len() as i64) > 0)) + { + if ((left.params.clone().len() as i64) + != (right.params.clone().len() as i64)) + { false } else { { - let params_eq = { let mut __all = true; for pair in Rc::new(left.params.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if !(match right.params.clone().get(pair.0.clone() as usize).cloned() { - Some(right_param) => node_type_equals(¶m_node_type_expr(&pair.1.clone()), ¶m_node_type_expr(&right_param), source_indices.clone()), - None => false, -}) { __all = false; break; } } __all }; -if (params_eq == false) { + let params_eq = { + let mut __all = true; + for pair in Rc::new( + left.params + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + if !(match right + .params + .clone() + .get(pair.0.clone() as usize) + .cloned() + { + Some(right_param) => { + node_type_equals( + ¶m_node_type_expr( + &pair.1.clone(), + ), + ¶m_node_type_expr( + &right_param, + ), + source_indices.clone(), + ) + } + None => false, + }) { + __all = false; + break; + } + } + __all + }; + if (params_eq == false) { false } else { - match left.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: left_ret, .. }) => match right.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: right_ret, .. }) => node_type_equals(&left_ret, &right_ret, source_indices.clone()), - None => false, - _ => false, -}, - None => (right.inferred.clone() == None), - _ => false, -} + match left + .inferred + .clone() + .as_deref() + .cloned() + { + Some(InferredNode::Resolved { + node: left_ret, + .. + }) => match right + .inferred + .clone() + .as_deref() + .cloned() + { + Some(InferredNode::Resolved { + node: right_ret, + .. + }) => node_type_equals( + &left_ret, + &right_ret, + source_indices.clone(), + ), + None => false, + _ => false, + }, + None => { + (right.inferred.clone() == None) + } + _ => false, + } } -} + } } } else { false } } -} + } } -} + } } } } } -} + } } -pub fn node_type_deps(n: &Rc, source_indices: &Rc>>) -> Rc> { +pub fn node_type_deps( + n: &Rc, + source_indices: &Rc>>, +) -> Rc> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let n_is_type_var = if (n.inferred.clone() != None) { - is_type_variable(n.inferred.clone().clone().unwrap()) - } else { - false - }; -if n_is_type_var { - return Rc::new(vec![]) + let n_is_type_var = if (n.inferred.clone() != None) { + is_type_variable(n.inferred.clone().clone().unwrap()) + } else { + false + }; + if n_is_type_var { + return Rc::new(vec![]); + } + let __is_named_ref = if (n.inferred.clone() == None) { + false + } else { + match n.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + (((((rt.connective.clone() == Connective::NoConnective) + && ((rt.children.clone().len() as i64) == 0)) + && (rt.ident_span.clone() != None)) + && (authored_name_at(source_indices.clone(), &rt).as_str() + != "None".to_string().as_str())) + && (is_kernel_type(authored_name_at(source_indices.clone(), &rt)) == false)) + } + _ => false, } -let __is_named_ref = if (n.inferred.clone() == None) { - false - } else { - match n.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => (((((rt.connective.clone() == Connective::NoConnective) && ((rt.children.clone().len() as i64) == 0)) && (rt.ident_span.clone() != None)) && (authored_name_at(source_indices.clone(), &rt).as_str() != "None".to_string().as_str())) && (is_kernel_type(authored_name_at(source_indices.clone(), &rt)) == false)), - _ => false, -} - }; -let has_structure = (n.connective.clone() != Connective::NoConnective); -let n_name = authored_name_at(source_indices.clone(), &n); -if __is_named_ref { - match n.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => Rc::new(vec![authored_name_at(source_indices.clone(), &rt)]), - _ => Rc::new(vec![]), -} + }; + let has_structure = (n.connective.clone() != Connective::NoConnective); + let n_name = authored_name_at(source_indices.clone(), &n); + if __is_named_ref { + match n.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + Rc::new(vec![authored_name_at(source_indices.clone(), &rt)]) + } + _ => Rc::new(vec![]), + } + } else { + if has_structure { + Rc::new({ + let mut __result = Vec::new(); + for child in n.children.clone().iter().cloned() { + __result.extend( + (*match child.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + node_type_deps(&rt, &source_indices) + } + _ => { + if (child.inferred.clone() == None) { + node_type_deps(&child, &source_indices) + } else { + Rc::new(vec![]) + } + } + }) + .iter() + .cloned(), + ); + } + __result + }) } else { - if has_structure { - Rc::new({ let mut __result = Vec::new(); for child in n.children.clone().iter().cloned() { __result.extend((*match child.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => node_type_deps(&rt, &source_indices), - _ => if (child.inferred.clone() == None) { - node_type_deps(&child, &source_indices) - } else { - Rc::new(vec![]) - }, -}).iter().cloned()); } __result }) + if (n.inferred.clone() != None) { + match n.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + node_type_deps(&rt, &source_indices) + } + _ => Rc::new(vec![]), + } } else { - if (n.inferred.clone() != None) { - match n.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => node_type_deps(&rt, &source_indices), - _ => Rc::new(vec![]), -} - } else { - if ((n.children.clone().len() as i64) > 0) { - { - let child_deps = Rc::new({ let mut __result = Vec::new(); for child in n.children.clone().iter().cloned() { __result.extend((*node_type_deps(&child, &source_indices)).iter().cloned()); } __result }); -if ((n.ident_span.clone() != None) && (is_kernel_type(n_name.clone()) == false)) { - v2_rt::concat(Rc::new(vec![n_name.clone()]), child_deps) - } else { - child_deps + if ((n.children.clone().len() as i64) > 0) { + { + let child_deps = Rc::new({ + let mut __result = Vec::new(); + for child in n.children.clone().iter().cloned() { + __result.extend( + (*node_type_deps(&child, &source_indices)).iter().cloned(), + ); } -} - } else { - if ((is_kernel_type(n_name.clone()) || (n_name.clone().as_str() == "None".to_string().as_str())) || (n.ident_span.clone() == None)) { - Rc::new(vec![]) + __result + }); + if ((n.ident_span.clone() != None) + && (is_kernel_type(n_name.clone()) == false)) + { + v2_rt::concat(Rc::new(vec![n_name.clone()]), child_deps) } else { - Rc::new(vec![n_name.clone()]) + child_deps } } + } else { + if ((is_kernel_type(n_name.clone()) + || (n_name.clone().as_str() == "None".to_string().as_str())) + || (n.ident_span.clone() == None)) + { + Rc::new(vec![]) + } else { + Rc::new(vec![n_name.clone()]) + } } } } -} + } }) } pub fn infer_literal_node(lit: Rc) -> Rc { match (*lit).clone() { - LiteralValue::LitStr { .. } => string_type(), - LiteralValue::LitInt { .. } => int_type(), - LiteralValue::LitFloat { .. } => float_type(), - LiteralValue::LitBool { .. } => bool_type(), - LiteralValue::LitNull => with_optional_cardinality(&unit_type()), -} + LiteralValue::LitStr { .. } => string_type(), + LiteralValue::LitInt { .. } => int_type(), + LiteralValue::LitFloat { .. } => float_type(), + LiteralValue::LitBool { .. } => bool_type(), + LiteralValue::LitNull => with_optional_cardinality(&unit_type()), + } } -pub fn method_receiver_element_node(receiver_type: Rc, source_indices: Rc>>) -> Rc { +pub fn method_receiver_element_node( + receiver_type: Rc, + source_indices: Rc>>, +) -> Rc { { let normed = normalize_access_type_node(receiver_type.clone()); -let maybe_element = if node_is_keyed_collection(&normed, source_indices) { + let maybe_element = if node_is_keyed_collection(&normed, source_indices) { match normed.children.clone().get(1 as usize).cloned() { - Some(ch) => Some(child_type_node(&ch)), - None => None, -} + Some(ch) => Some(child_type_node(&ch)), + None => None, + } } else { - if ((normed.connective.clone() == Connective::NoConnective) && ((normed.children.clone().len() as i64) == 1)) { + if ((normed.connective.clone() == Connective::NoConnective) + && ((normed.children.clone().len() as i64) == 1)) + { match normed.children.clone().first().cloned() { - Some(ch) => Some(child_type_node(&ch)), - None => None, -} + Some(ch) => Some(child_type_node(&ch)), + None => None, + } } else { None } }; -match maybe_element { - Some(el) => el.clone(), - None => receiver_type.clone(), -} -} + match maybe_element { + Some(el) => el.clone(), + None => receiver_type.clone(), + } + } } pub fn extract_optional_inner_node(n: &Rc) -> Rc { { let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); -if is_optional { + if is_optional { with_required_cardinality(&n) } else { n.clone() } -} + } } pub fn algebra_field_kind_name(kind: AlgebraFieldKind) -> String { match kind { - AlgebraFieldKind::AlgAdd => "add".to_string(), - AlgebraFieldKind::AlgMul => "mul".to_string(), - AlgebraFieldKind::AlgReciprocal => "reciprocal".to_string(), - AlgebraFieldKind::AlgQuotient => "quotient".to_string(), - AlgebraFieldKind::AlgRemainder => "remainder".to_string(), - AlgebraFieldKind::AlgCompare => "compare".to_string(), - AlgebraFieldKind::AlgMeet => "meet".to_string(), - AlgebraFieldKind::AlgJoin => "join".to_string(), -} + AlgebraFieldKind::AlgAdd => "add".to_string(), + AlgebraFieldKind::AlgMul => "mul".to_string(), + AlgebraFieldKind::AlgReciprocal => "reciprocal".to_string(), + AlgebraFieldKind::AlgQuotient => "quotient".to_string(), + AlgebraFieldKind::AlgRemainder => "remainder".to_string(), + AlgebraFieldKind::AlgCompare => "compare".to_string(), + AlgebraFieldKind::AlgMeet => "meet".to_string(), + AlgebraFieldKind::AlgJoin => "join".to_string(), + } } pub fn binop_algebra_fields(op: BinOp) -> Rc> { match op { - BinOp::Add => Rc::new(vec![AlgebraFieldKind::AlgAdd]), - BinOp::Sub => Rc::new(vec![AlgebraFieldKind::AlgAdd]), - BinOp::Mul => Rc::new(vec![AlgebraFieldKind::AlgMul]), - BinOp::Div => Rc::new(vec![AlgebraFieldKind::AlgReciprocal, AlgebraFieldKind::AlgQuotient]), - BinOp::Mod => Rc::new(vec![AlgebraFieldKind::AlgRemainder]), - BinOp::Eq => Rc::new(vec![AlgebraFieldKind::AlgCompare]), - BinOp::Ne => Rc::new(vec![AlgebraFieldKind::AlgCompare]), - BinOp::Lt => Rc::new(vec![AlgebraFieldKind::AlgCompare]), - BinOp::Gt => Rc::new(vec![AlgebraFieldKind::AlgCompare]), - BinOp::Le => Rc::new(vec![AlgebraFieldKind::AlgCompare]), - BinOp::Ge => Rc::new(vec![AlgebraFieldKind::AlgCompare]), - BinOp::And => Rc::new(vec![AlgebraFieldKind::AlgMeet]), - BinOp::Or => Rc::new(vec![AlgebraFieldKind::AlgJoin]), - BinOp::NullCoalesce => Rc::new(vec![]), -} + BinOp::Add => Rc::new(vec![AlgebraFieldKind::AlgAdd]), + BinOp::Sub => Rc::new(vec![AlgebraFieldKind::AlgAdd]), + BinOp::Mul => Rc::new(vec![AlgebraFieldKind::AlgMul]), + BinOp::Div => Rc::new(vec![ + AlgebraFieldKind::AlgReciprocal, + AlgebraFieldKind::AlgQuotient, + ]), + BinOp::Mod => Rc::new(vec![AlgebraFieldKind::AlgRemainder]), + BinOp::Eq => Rc::new(vec![AlgebraFieldKind::AlgCompare]), + BinOp::Ne => Rc::new(vec![AlgebraFieldKind::AlgCompare]), + BinOp::Lt => Rc::new(vec![AlgebraFieldKind::AlgCompare]), + BinOp::Gt => Rc::new(vec![AlgebraFieldKind::AlgCompare]), + BinOp::Le => Rc::new(vec![AlgebraFieldKind::AlgCompare]), + BinOp::Ge => Rc::new(vec![AlgebraFieldKind::AlgCompare]), + BinOp::And => Rc::new(vec![AlgebraFieldKind::AlgMeet]), + BinOp::Or => Rc::new(vec![AlgebraFieldKind::AlgJoin]), + BinOp::NullCoalesce => Rc::new(vec![]), + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -1607,23 +2242,43 @@ pub struct AlgebraFieldMatch { pub field_node: Rc, } -pub fn first_matching_algebra_field(mut n: Rc, mut candidates: Rc>, mut source_indices: Rc>>) -> Option> { +pub fn first_matching_algebra_field( + mut n: Rc, + mut candidates: Rc>, + mut source_indices: Rc>>, +) -> Option> { loop { match candidates.clone().first().cloned() { - None => { break None; }, - Some(kind) => { match find_child_named(n.clone(), algebra_field_kind_name(kind.clone()), source_indices.clone()) { - Some(f) => { break Some(Rc::new(AlgebraFieldMatch { - field_kind: kind.clone(), - field_node: f.clone(), -})); }, - None => { { - let __tco_0 = Rc::new(candidates.iter().cloned().skip(1 as usize).collect::>()); -candidates = __tco_0; -continue; -} }, -} }, -} -} + None => { + break None; + } + Some(kind) => { + match find_child_named( + n.clone(), + algebra_field_kind_name(kind.clone()), + source_indices.clone(), + ) { + Some(f) => { + break Some(Rc::new(AlgebraFieldMatch { + field_kind: kind.clone(), + field_node: f.clone(), + })); + } + None => { + let __tco_0 = Rc::new( + candidates + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + candidates = __tco_0; + continue; + } + } + } + } + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -1632,113 +2287,132 @@ pub struct BinOpInferred { pub algebra_field: Option, } -pub fn infer_binop_type_node(op: &BinOp, left_type: &Rc, source_indices: Rc>>) -> Rc { +pub fn infer_binop_type_node( + op: &BinOp, + left_type: &Rc, + source_indices: Rc>>, +) -> Rc { match op.clone() { - BinOp::Eq => Rc::new(BinOpInferred { - result_type: bool_type(), - algebra_field: None, -}), - BinOp::Ne => Rc::new(BinOpInferred { - result_type: bool_type(), - algebra_field: None, -}), - BinOp::Lt => Rc::new(BinOpInferred { - result_type: bool_type(), - algebra_field: None, -}), - BinOp::Gt => Rc::new(BinOpInferred { - result_type: bool_type(), - algebra_field: None, -}), - BinOp::Le => Rc::new(BinOpInferred { - result_type: bool_type(), - algebra_field: None, -}), - BinOp::Ge => Rc::new(BinOpInferred { - result_type: bool_type(), - algebra_field: None, -}), - BinOp::And => Rc::new(BinOpInferred { - result_type: bool_type(), - algebra_field: None, -}), - BinOp::Or => Rc::new(BinOpInferred { - result_type: bool_type(), - algebra_field: None, -}), - BinOp::NullCoalesce => Rc::new(BinOpInferred { - result_type: extract_optional_inner_node(&left_type), - algebra_field: None, -}), - _ => { - let candidates = binop_algebra_fields(op.clone()); -let is_product = (left_type.connective.clone() == Connective::Conj); -if is_product { - match first_matching_algebra_field(left_type.clone(), candidates, source_indices) { - Some(m) => match m.field_node.clone().inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => if ((rt.params.clone().len() as i64) > 0) { - match rt.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: return_type, .. }) => Rc::new(BinOpInferred { - result_type: return_type.clone(), - algebra_field: Some(m.field_kind.clone()), -}), - _ => Rc::new(BinOpInferred { - result_type: left_type.clone(), - algebra_field: Some(m.field_kind.clone()), -}), -} + BinOp::Eq => Rc::new(BinOpInferred { + result_type: bool_type(), + algebra_field: None, + }), + BinOp::Ne => Rc::new(BinOpInferred { + result_type: bool_type(), + algebra_field: None, + }), + BinOp::Lt => Rc::new(BinOpInferred { + result_type: bool_type(), + algebra_field: None, + }), + BinOp::Gt => Rc::new(BinOpInferred { + result_type: bool_type(), + algebra_field: None, + }), + BinOp::Le => Rc::new(BinOpInferred { + result_type: bool_type(), + algebra_field: None, + }), + BinOp::Ge => Rc::new(BinOpInferred { + result_type: bool_type(), + algebra_field: None, + }), + BinOp::And => Rc::new(BinOpInferred { + result_type: bool_type(), + algebra_field: None, + }), + BinOp::Or => Rc::new(BinOpInferred { + result_type: bool_type(), + algebra_field: None, + }), + BinOp::NullCoalesce => Rc::new(BinOpInferred { + result_type: extract_optional_inner_node(&left_type), + algebra_field: None, + }), + _ => { + let candidates = binop_algebra_fields(op.clone()); + let is_product = (left_type.connective.clone() == Connective::Conj); + if is_product { + match first_matching_algebra_field(left_type.clone(), candidates, source_indices) { + Some(m) => match m.field_node.clone().inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + if ((rt.params.clone().len() as i64) > 0) { + match rt.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { + node: return_type, .. + }) => Rc::new(BinOpInferred { + result_type: return_type.clone(), + algebra_field: Some(m.field_kind.clone()), + }), + _ => Rc::new(BinOpInferred { + result_type: left_type.clone(), + algebra_field: Some(m.field_kind.clone()), + }), + } + } else { + Rc::new(BinOpInferred { + result_type: rt.clone(), + algebra_field: Some(m.field_kind.clone()), + }) + } + } + _ => Rc::new(BinOpInferred { + result_type: left_type.clone(), + algebra_field: None, + }), + }, + None => Rc::new(BinOpInferred { + result_type: left_type.clone(), + algebra_field: None, + }), + } } else { Rc::new(BinOpInferred { - result_type: rt.clone(), - algebra_field: Some(m.field_kind.clone()), -}) - }, - _ => Rc::new(BinOpInferred { - result_type: left_type.clone(), - algebra_field: None, -}), -}, - None => Rc::new(BinOpInferred { - result_type: left_type.clone(), - algebra_field: None, -}), -} - } else { - Rc::new(BinOpInferred { - result_type: left_type.clone(), - algebra_field: None, -}) + result_type: left_type.clone(), + algebra_field: None, + }) + } } -}, -} + } } -pub fn for_each_element_type_node(n: Rc, source_indices: Rc>>) -> Rc { +pub fn for_each_element_type_node( + n: Rc, + source_indices: Rc>>, +) -> Rc { { let normed = normalize_access_type_node(n); -let is_single_child = ((normed.connective.clone() == Connective::NoConnective) && ((normed.children.clone().len() as i64) == 1)); -let extracted = if is_single_child { + let is_single_child = ((normed.connective.clone() == Connective::NoConnective) + && ((normed.children.clone().len() as i64) == 1)); + let extracted = if is_single_child { match normed.children.clone().first().cloned() { - Some(ch) => Some(child_type_node(&ch)), - None => None, -} + Some(ch) => Some(child_type_node(&ch)), + None => None, + } } else { None }; -match extracted { - Some(el) => el.clone(), - None => if ((((normed.connective.clone() == Connective::NoConnective) && ((normed.children.clone().len() as i64) == 0)) && ((normed.properties.clone().len() as i64) == 0)) && (authored_name_at(source_indices, &normed).as_str() == "String".to_string().as_str())) { - string_type() - } else { - normed.clone() - }, -} -} + match extracted { + Some(el) => el.clone(), + None => { + if ((((normed.connective.clone() == Connective::NoConnective) + && ((normed.children.clone().len() as i64) == 0)) + && ((normed.properties.clone().len() as i64) == 0)) + && (authored_name_at(source_indices, &normed).as_str() + == "String".to_string().as_str())) + { + string_type() + } else { + normed.clone() + } + } + } + } } pub fn emit_map_has(m: Rc>, key: String) -> bool { match v2_rt::map_get(&m, key) { - Some(_) => true, - None => false, -} + Some(_) => true, + None => false, + } } diff --git a/src/v2/stage0/src/v2_compiler_languages.rs b/src/v2/stage0/src/v2_compiler_languages.rs index 13c3f2be93f..5656cb0a11b 100644 --- a/src/v2/stage0/src/v2_compiler_languages.rs +++ b/src/v2/stage0/src/v2_compiler_languages.rs @@ -1,47 +1,89 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.languages -use std::collections::HashMap; -use std::rc::Rc; -use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::v2_compiler_artifact::{RenderTarget}; -use crate::v2_compiler_artifact::RenderTarget::{Rust, Python, Go, Dag}; -pub use crate::v2_std_core::{BinOp, LiteralValue}; -use crate::v2_std_core::BinOp::{Add, Sub, Mul, Div, Mod, Eq, Ne, Lt, Gt, Le, Ge, And, Or, NullCoalesce}; -use crate::v2_std_core::LiteralValue::*; -pub use crate::std_syntax::{ItemForm, ItemFormKind, OperatorSpec, SyntaxSpec, AlgebraFieldKind, BodyKind}; -use crate::std_syntax::ItemFormKind::{FuncForm, StructForm, EnumForm, TypeAliasForm, ModuleForm, OtherForm}; -use crate::std_syntax::BodyKind::{ExprBody, BlockBody, TypeBody, ValueBody, NoBody, ServiceBody, ResourceBody}; -use crate::std_syntax::AlgebraFieldKind::*; -pub use crate::extdeps_languages_rust_syntax::{rust_operators, rust_item_forms}; -pub use crate::extdeps_languages_python_syntax::{python_operators, python_item_forms}; -pub use crate::extdeps_languages_go_syntax::{go_operators, go_item_forms}; -pub use crate::extdeps_languages_dag_syntax::{dag_operators}; -pub use crate::extdeps_languages_rust_emit::{rust_keywords, rust_container_templates, rust_reserved, rust_reserved_escape_prefix, rust_struct_derives, rust_struct_derives_copy, rust_enum_derives, rust_enum_derives_copy, rust_serde_tag, rust_serde_rename_template, rust_source_extension, rust_source_dir, rust_visibility, rust_string_types, rust_method_templates, rust_func_keyword, rust_async_prefix, rust_struct_keyword, rust_enum_keyword, rust_type_alias_keyword, rust_param_separator, rust_return_arrow, rust_param_type_sep, rust_module_keyword, rust_import_keyword, rust_import_from_keyword, rust_lambda_template, rust_error_expr_template, rust_list_literal_empty, rust_list_literal_template, rust_null_coalesce_template, rust_error_type_template, rust_type_arg_open, rust_type_arg_close, rust_void_type, rust_tuple_empty, rust_tuple_pair_template, rust_tuple_multi_template, rust_tuple_separator}; -pub use crate::extdeps_languages_python_emit::{python_keywords, python_reserved, python_reserved_escape_suffix, python_derive_attribute, python_default_value, python_source_extension, python_module_init, python_method_templates, python_string_types, python_func_keyword, python_async_prefix, python_struct_keyword, python_enum_keyword, python_type_alias_keyword, python_param_separator, python_return_arrow, python_param_type_sep, python_module_keyword, python_import_keyword, python_import_from_keyword, python_lambda_template, python_error_expr_template, python_list_literal_empty, python_list_literal_template, python_null_coalesce_template, python_error_type_template, python_type_arg_open, python_type_arg_close, python_void_type, python_tuple_empty, python_tuple_pair_template, python_tuple_multi_template, python_tuple_separator}; -pub use crate::extdeps_languages_go_emit::{go_keywords, go_reserved, go_reserved_escape_suffix, go_manifest_file, go_source_extension, go_method_templates, go_string_types, go_func_keyword, go_async_prefix, go_struct_keyword, go_enum_keyword, go_type_alias_keyword, go_param_separator, go_return_arrow, go_param_type_sep, go_module_keyword, go_import_keyword, go_import_from_keyword, go_lambda_template, go_error_expr_template, go_list_literal_empty, go_list_literal_template, go_null_coalesce_template, go_error_type_template, go_type_arg_open, go_type_arg_close, go_void_type, go_tuple_empty, go_tuple_pair_template, go_tuple_multi_template, go_tuple_separator}; -pub use crate::extdeps_languages_dag_emit::{dag_keywords, dag_container_templates, dag_reserved, dag_string_types, dag_func_keyword, dag_async_prefix, dag_struct_keyword, dag_enum_keyword, dag_type_alias_keyword, dag_param_separator, dag_return_arrow, dag_param_type_sep, dag_module_keyword, dag_import_keyword, dag_import_from_keyword, dag_source_extension, dag_lambda_template, dag_error_expr_template, dag_list_literal_empty, dag_list_literal_template, dag_null_coalesce_template, dag_error_type_template, dag_type_arg_open, dag_type_arg_close, dag_void_type, dag_tuple_empty, dag_tuple_pair_template, dag_tuple_multi_template, dag_tuple_separator}; -use self::ReservedWordStrategy::*; -use self::TestNameStyle::*; -use self::ImportTrigger::*; use self::IfValueForm::*; +use self::ImportTrigger::*; +use self::InterpStyle::*; use self::NamingCase::*; -use self::VisibilitySpec::*; +use self::ReservedWordStrategy::*; use self::ServiceMethodStrategy::*; use self::ServiceReturnStrategy::*; -use self::InterpStyle::*; +use self::TestNameStyle::*; +use self::VisibilitySpec::*; +pub use crate::extdeps_languages_dag_emit::{ + dag_async_prefix, dag_container_templates, dag_enum_keyword, dag_error_expr_template, + dag_error_type_template, dag_func_keyword, dag_import_from_keyword, dag_import_keyword, + dag_keywords, dag_lambda_template, dag_list_literal_empty, dag_list_literal_template, + dag_module_keyword, dag_null_coalesce_template, dag_param_separator, dag_param_type_sep, + dag_reserved, dag_return_arrow, dag_source_extension, dag_string_types, dag_struct_keyword, + dag_tuple_empty, dag_tuple_multi_template, dag_tuple_pair_template, dag_tuple_separator, + dag_type_alias_keyword, dag_type_arg_close, dag_type_arg_open, dag_void_type, +}; +pub use crate::extdeps_languages_dag_syntax::dag_operators; +pub use crate::extdeps_languages_go_emit::{ + go_async_prefix, go_enum_keyword, go_error_expr_template, go_error_type_template, + go_func_keyword, go_import_from_keyword, go_import_keyword, go_keywords, go_lambda_template, + go_list_literal_empty, go_list_literal_template, go_manifest_file, go_method_templates, + go_module_keyword, go_null_coalesce_template, go_param_separator, go_param_type_sep, + go_reserved, go_reserved_escape_suffix, go_return_arrow, go_source_extension, go_string_types, + go_struct_keyword, go_tuple_empty, go_tuple_multi_template, go_tuple_pair_template, + go_tuple_separator, go_type_alias_keyword, go_type_arg_close, go_type_arg_open, go_void_type, +}; +pub use crate::extdeps_languages_go_syntax::{go_item_forms, go_operators}; +pub use crate::extdeps_languages_python_emit::{ + python_async_prefix, python_default_value, python_derive_attribute, python_enum_keyword, + python_error_expr_template, python_error_type_template, python_func_keyword, + python_import_from_keyword, python_import_keyword, python_keywords, python_lambda_template, + python_list_literal_empty, python_list_literal_template, python_method_templates, + python_module_init, python_module_keyword, python_null_coalesce_template, + python_param_separator, python_param_type_sep, python_reserved, python_reserved_escape_suffix, + python_return_arrow, python_source_extension, python_string_types, python_struct_keyword, + python_tuple_empty, python_tuple_multi_template, python_tuple_pair_template, + python_tuple_separator, python_type_alias_keyword, python_type_arg_close, python_type_arg_open, + python_void_type, +}; +pub use crate::extdeps_languages_python_syntax::{python_item_forms, python_operators}; +pub use crate::extdeps_languages_rust_emit::{ + rust_async_prefix, rust_container_templates, rust_enum_derives, rust_enum_derives_copy, + rust_enum_keyword, rust_error_expr_template, rust_error_type_template, rust_func_keyword, + rust_import_from_keyword, rust_import_keyword, rust_keywords, rust_lambda_template, + rust_list_literal_empty, rust_list_literal_template, rust_method_templates, + rust_module_keyword, rust_null_coalesce_template, rust_param_separator, rust_param_type_sep, + rust_reserved, rust_reserved_escape_prefix, rust_return_arrow, rust_serde_rename_template, + rust_serde_tag, rust_source_dir, rust_source_extension, rust_string_types, rust_struct_derives, + rust_struct_derives_copy, rust_struct_keyword, rust_tuple_empty, rust_tuple_multi_template, + rust_tuple_pair_template, rust_tuple_separator, rust_type_alias_keyword, rust_type_arg_close, + rust_type_arg_open, rust_visibility, rust_void_type, +}; +pub use crate::extdeps_languages_rust_syntax::{rust_item_forms, rust_operators}; +use crate::std_syntax::AlgebraFieldKind::*; +use crate::std_syntax::BodyKind::{ + BlockBody, ExprBody, NoBody, ResourceBody, ServiceBody, TypeBody, ValueBody, +}; +use crate::std_syntax::ItemFormKind::{ + EnumForm, FuncForm, ModuleForm, OtherForm, StructForm, TypeAliasForm, +}; +pub use crate::std_syntax::{ + AlgebraFieldKind, BodyKind, ItemForm, ItemFormKind, OperatorSpec, SyntaxSpec, +}; +pub use crate::v2_compiler_artifact::RenderTarget; +use crate::v2_compiler_artifact::RenderTarget::{Dag, Go, Python, Rust}; +use crate::v2_rt; +use crate::v2_std_core::BinOp::{ + Add, And, Div, Eq, Ge, Gt, Le, Lt, Mod, Mul, Ne, NullCoalesce, Or, Sub, +}; +use crate::v2_std_core::LiteralValue::*; +pub use crate::v2_std_core::{BinOp, LiteralValue}; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum ReservedWordStrategy { - PrefixEscape { - prefix: String, - }, - SuffixEscape { - suffix: String, - }, + PrefixEscape { prefix: String }, + SuffixEscape { suffix: String }, NoEscape, } @@ -91,18 +133,10 @@ pub struct TestConventions { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum ImportTrigger { - TypeUsageTrigger { - type_name: String, - }, - TraitImplTrigger { - trait_name: String, - }, - DeriveMacroTrigger { - macro_name: String, - }, - ContainerUsageTrigger { - container: String, - }, + TypeUsageTrigger { type_name: String }, + TraitImplTrigger { trait_name: String }, + DeriveMacroTrigger { macro_name: String }, + ContainerUsageTrigger { container: String }, AsyncUsageTrigger, } @@ -211,12 +245,8 @@ pub enum NamingCase { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum VisibilitySpec { - KeywordVisibility { - prefix: String, - }, - CaseVisibility { - export_case: NamingCase, - }, + KeywordVisibility { prefix: String }, + CaseVisibility { export_case: NamingCase }, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -232,64 +262,74 @@ pub struct TcoSyntax { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum ServiceMethodStrategy { - SelfInParams { - self_param: String, - }, - ExternalReceiver { - var_name: String, - }, + SelfInParams { self_param: String }, + ExternalReceiver { var_name: String }, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum ServiceReturnStrategy { ArrowReturn, - ErrorTupleReturn { - error_type: String, - }, + ErrorTupleReturn { error_type: String }, } impl ServiceReturnStrategy { pub fn error_type(&self) -> String { match self { ServiceReturnStrategy::ArrowReturn => panic!("no error_type on unit variant"), - ServiceReturnStrategy::ErrorTupleReturn { error_type: __val, .. } => __val.clone(), + ServiceReturnStrategy::ErrorTupleReturn { + error_type: __val, .. + } => __val.clone(), } } } pub fn service_self_param(spec: Rc) -> String { match (*spec.service_method.clone()).clone() { - ServiceMethodStrategy::SelfInParams { self_param: sp, .. } => sp.clone(), - ServiceMethodStrategy::ExternalReceiver { .. } => "".to_string(), -} + ServiceMethodStrategy::SelfInParams { self_param: sp, .. } => sp.clone(), + ServiceMethodStrategy::ExternalReceiver { .. } => "".to_string(), + } } pub fn service_receiver_str(spec: Rc, service_name: String) -> String { match (*spec.service_method.clone()).clone() { - ServiceMethodStrategy::SelfInParams { .. } => "".to_string(), - ServiceMethodStrategy::ExternalReceiver { var_name: v, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("(".to_string(), v.clone()), " *".to_string()), service_name), ") ".to_string()), -} + ServiceMethodStrategy::SelfInParams { .. } => "".to_string(), + ServiceMethodStrategy::ExternalReceiver { var_name: v, .. } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat(v2_rt::concat("(".to_string(), v.clone()), " *".to_string()), + service_name, + ), + ") ".to_string(), + ), + } } pub fn service_method_depth(spec: Rc) -> i64 { match (*spec.service_method.clone()).clone() { - ServiceMethodStrategy::SelfInParams { .. } => 1, - ServiceMethodStrategy::ExternalReceiver { .. } => 0, -} + ServiceMethodStrategy::SelfInParams { .. } => 1, + ServiceMethodStrategy::ExternalReceiver { .. } => 0, + } } pub fn service_methods_inside_class(spec: Rc) -> bool { match (*spec.service_method.clone()).clone() { - ServiceMethodStrategy::SelfInParams { .. } => true, - ServiceMethodStrategy::ExternalReceiver { .. } => false, -} + ServiceMethodStrategy::SelfInParams { .. } => true, + ServiceMethodStrategy::ExternalReceiver { .. } => false, + } } pub fn service_return_str(spec: &Rc, ret_type: String) -> String { match (*spec.service_return.clone()).clone() { - ServiceReturnStrategy::ArrowReturn => v2_rt::concat(spec.items.clone().return_arrow.clone(), ret_type), - ServiceReturnStrategy::ErrorTupleReturn { error_type: et, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(" (".to_string(), ret_type), ", ".to_string()), et.clone()), ")".to_string()), -} + ServiceReturnStrategy::ArrowReturn => { + v2_rt::concat(spec.items.clone().return_arrow.clone(), ret_type) + } + ServiceReturnStrategy::ErrorTupleReturn { error_type: et, .. } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat(v2_rt::concat(" (".to_string(), ret_type), ", ".to_string()), + et.clone(), + ), + ")".to_string(), + ), + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -309,12 +349,20 @@ pub struct ItemKeywords { pub fn item_keyword_for_kind(forms: Rc>>, kind: ItemFormKind) -> String { { - let matching = Rc::new({ let mut __result = Vec::new(); for f in forms.iter().cloned() { if (f.kind.clone() == kind.clone()) { __result.push(f); } } __result }); -match matching.first().cloned() { - Some(f) => f.keyword.clone(), - None => "__MISSING_ITEM_KEYWORD__".to_string(), -} -} + let matching = Rc::new({ + let mut __result = Vec::new(); + for f in forms.iter().cloned() { + if (f.kind.clone() == kind.clone()) { + __result.push(f); + } + } + __result + }); + match matching.first().cloned() { + Some(f) => f.keyword.clone(), + None => "__MISSING_ITEM_KEYWORD__".to_string(), + } + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -383,15 +431,15 @@ pub struct RecordLitSyntax { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum InterpStyle { - FormatArgs { - placeholder: String, - }, + FormatArgs { placeholder: String }, InlineExpr, } impl InterpStyle { pub fn placeholder(&self) -> String { match self { - InterpStyle::FormatArgs { placeholder: __val, .. } => __val.clone(), + InterpStyle::FormatArgs { + placeholder: __val, .. + } => __val.clone(), InterpStyle::InlineExpr => panic!("no placeholder on unit variant"), } } @@ -413,760 +461,838 @@ pub struct StringInterpSyntax { pub fn rust_spec() -> Rc { Rc::new(LanguageSpec { - target_name: "rust".to_string(), - reserved_words: Rc::new(ReservedWords { - keywords: rust_reserved(), - strategy: Rc::new(ReservedWordStrategy::PrefixEscape { - prefix: rust_reserved_escape_prefix(), -}), -}), - scaffold: Rc::new(ProjectScaffold { - manifest_file: Some("Cargo.toml".to_string()), - module_init_file: None, - source_file_extension: rust_source_extension(), - source_dir: Some(rust_source_dir()), -}), - serialization: Rc::new(SerializationSpec { - struct_derives: Some(rust_struct_derives()), - struct_derives_copy: Some(rust_struct_derives_copy()), - enum_derives: Some(rust_enum_derives()), - enum_derives_copy: Some(rust_enum_derives_copy()), - tag_attribute: Some(rust_serde_tag()), - rename_attribute_template: Some(rust_serde_rename_template()), - derive_attribute: None, - default_value: None, -}), - test_conventions: Rc::new(TestConventions { - file_prefix: "".to_string(), - file_suffix: "_test".to_string(), - file_dir: Some("tests/".to_string()), - function_prefix: "test_".to_string(), - name_style: TestNameStyle::SnakeCaseTestNames, - async_decorator: Some("#[tokio::test]".to_string()), -}), - visibility: Rc::new(VisibilitySpec::KeywordVisibility { - prefix: rust_visibility(), -}), - sharing: Rc::new(SharingStrategy { - needs_sharing: true, - wrap_template: "Rc<{0}>".to_string(), - clone_value: "{0}.clone()".to_string(), - deref_clone: "(*{0}).clone()".to_string(), - field_clone: "{0}.{1}.clone()".to_string(), - iter_owned: "{0}.iter().cloned()".to_string(), - clone_suffix: ".cloned()".to_string(), - borrow_param_template: "&{0}".to_string(), - borrow_arg_template: "&{0}".to_string(), -}), - indexing: Rc::new(IndexingSemantics { - list_index: "{0}[({1}) as usize].clone()".to_string(), - map_index: "({0}).get(&{1}).cloned()".to_string(), - string_index: "v2_rt::char_at(&{0}, {1})".to_string(), - list_slice: None, - string_slice: Some("v2_rt::substring(&{0}, {1}, {2})".to_string()), -}), - annotations: Rc::new(AnnotationRequirements { - let_binding_inferred: "let {0} = {1};".to_string(), - let_binding_annotated: "let {0}: {1} = {2};".to_string(), - lambda_param_typed: "{0}: {1}".to_string(), - lambda_param_untyped: "{0}".to_string(), -}), - method_templates: Some(rust_method_templates()), - service_fields: Rc::new(ServiceFieldTemplates { - rest_decl: " pub base_url: String,\n".to_string(), - auth_decl: " pub auth_token: String,\n".to_string(), - shell_decl: " pub working_dir: Option,\n".to_string(), - file_decl: " pub base_path: String,\n".to_string(), - rest_ctor: " base_url: \"{0}\".to_string(),\n".to_string(), - auth_ctor: " auth_token: String::new(),\n".to_string(), - shell_ctor: " working_dir: None,\n".to_string(), - file_ctor: " base_path: \".\".to_string(),\n".to_string(), -}), - block_syntax: Rc::new(BlockSyntax { - block_open: " {\n".to_string(), - block_close: "}".to_string(), - else_clause: "} else {\n".to_string(), - match_keyword: "match ".to_string(), - case_keyword: "".to_string(), - arm_separator: ",".to_string(), - stmt_terminator: ";".to_string(), - significant_whitespace: false, -}), - for_each_syntax: Rc::new(ForEachSyntax { - prefix: "for ".to_string(), - separator: " in ".to_string(), -}), - tco: Rc::new(TcoSyntax { - loop_keyword: "loop".to_string(), - break_return: "break".to_string(), - continue_str: "continue;".to_string(), - temp_var_prefix: "__tco_".to_string(), - temp_decl_prefix: "let ".to_string(), - temp_assign_op: " = ".to_string(), -}), - items: Rc::new(ItemKeywords { - func_keyword: item_keyword_for_kind(rust_item_forms(), ItemFormKind::FuncForm), - async_prefix: rust_async_prefix(), - struct_keyword: item_keyword_for_kind(rust_item_forms(), ItemFormKind::StructForm), - enum_keyword: item_keyword_for_kind(rust_item_forms(), ItemFormKind::EnumForm), - type_alias_keyword: item_keyword_for_kind(rust_item_forms(), ItemFormKind::TypeAliasForm), - param_separator: rust_param_separator(), - return_arrow: rust_return_arrow(), - param_type_sep: rust_param_type_sep(), - module_keyword: item_keyword_for_kind(rust_item_forms(), ItemFormKind::ModuleForm), - import_keyword: rust_import_keyword(), - import_from_keyword: rust_import_from_keyword(), -}), - expression_semantics: Rc::new(ExpressionSemantics { - if_value_form: IfValueForm::IfExpression, - wildcard_case: None, - variant_pattern: Some(Rc::new(VariantPatternSyntax { - open: " { ".to_string(), - close: " }".to_string(), - binding_sep: ": ".to_string(), - empty_suffix: "".to_string(), -})), - guard_prefix: Some(" if ".to_string()), - empty_return_value: "()".to_string(), - return_suffix: "".to_string(), - suppress_unit_return: false, -}), - lambda_template: rust_lambda_template(), - error_expr_template: rust_error_expr_template(), - list_literal_empty: rust_list_literal_empty(), - list_literal_template: rust_list_literal_template(), - null_coalesce_template: rust_null_coalesce_template(), - error_type_template: rust_error_type_template(), - type_arg_open: rust_type_arg_open(), - type_arg_close: rust_type_arg_close(), - void_type: rust_void_type(), - tuple_syntax: Rc::new(TupleSyntax { - empty: rust_tuple_empty(), - pair_template: rust_tuple_pair_template(), - multi_template: rust_tuple_multi_template(), - separator: rust_tuple_separator(), - first_accessor: ".0".to_string(), - second_accessor: ".1".to_string(), -}), - string_interp: Rc::new(StringInterpSyntax { - style: Rc::new(InterpStyle::FormatArgs { - placeholder: "{}".to_string(), -}), - format_template: "format!(\"{0}\", {1})".to_string(), - plain_template: "\"{0}\".to_string()".to_string(), - escape_pairs: Rc::new(vec![Rc::new(EscapePair { - from: "{".to_string(), - to: "{{".to_string(), -}), Rc::new(EscapePair { - from: "}".to_string(), - to: "}}".to_string(), -})]), -}), - callable_type_template: Some("Rc {return}>".to_string()), - naming_case: NamingCase::SnakeCase, - async_call_prefix: "".to_string(), - bridge_method_prefix: "".to_string(), - bridge_method_case: NamingCase::SnakeCase, - bridge_method_overrides: v2_rt::rc_empty_map::(), - record_lit: Rc::new(RecordLitSyntax { - named_open: " {".to_string(), - named_close: "}".to_string(), - named_empty: " {}".to_string(), - named_field_sep: ": ".to_string(), - named_field_join: ", ".to_string(), - anon_empty: "{}".to_string(), - anon_prefix: "{\n".to_string(), - anon_suffix: "}".to_string(), - anon_field_indent: " ".to_string(), -}), - service_method: Rc::new(ServiceMethodStrategy::SelfInParams { - self_param: "&self".to_string(), -}), - service_return: Rc::new(ServiceReturnStrategy::ArrowReturn), -}) + target_name: "rust".to_string(), + reserved_words: Rc::new(ReservedWords { + keywords: rust_reserved(), + strategy: Rc::new(ReservedWordStrategy::PrefixEscape { + prefix: rust_reserved_escape_prefix(), + }), + }), + scaffold: Rc::new(ProjectScaffold { + manifest_file: Some("Cargo.toml".to_string()), + module_init_file: None, + source_file_extension: rust_source_extension(), + source_dir: Some(rust_source_dir()), + }), + serialization: Rc::new(SerializationSpec { + struct_derives: Some(rust_struct_derives()), + struct_derives_copy: Some(rust_struct_derives_copy()), + enum_derives: Some(rust_enum_derives()), + enum_derives_copy: Some(rust_enum_derives_copy()), + tag_attribute: Some(rust_serde_tag()), + rename_attribute_template: Some(rust_serde_rename_template()), + derive_attribute: None, + default_value: None, + }), + test_conventions: Rc::new(TestConventions { + file_prefix: "".to_string(), + file_suffix: "_test".to_string(), + file_dir: Some("tests/".to_string()), + function_prefix: "test_".to_string(), + name_style: TestNameStyle::SnakeCaseTestNames, + async_decorator: Some("#[tokio::test]".to_string()), + }), + visibility: Rc::new(VisibilitySpec::KeywordVisibility { + prefix: rust_visibility(), + }), + sharing: Rc::new(SharingStrategy { + needs_sharing: true, + wrap_template: "Rc<{0}>".to_string(), + clone_value: "{0}.clone()".to_string(), + deref_clone: "(*{0}).clone()".to_string(), + field_clone: "{0}.{1}.clone()".to_string(), + iter_owned: "{0}.iter().cloned()".to_string(), + clone_suffix: ".cloned()".to_string(), + borrow_param_template: "&{0}".to_string(), + borrow_arg_template: "&{0}".to_string(), + }), + indexing: Rc::new(IndexingSemantics { + list_index: "{0}[({1}) as usize].clone()".to_string(), + map_index: "({0}).get(&{1}).cloned()".to_string(), + string_index: "v2_rt::char_at(&{0}, {1})".to_string(), + list_slice: None, + string_slice: Some("v2_rt::substring(&{0}, {1}, {2})".to_string()), + }), + annotations: Rc::new(AnnotationRequirements { + let_binding_inferred: "let {0} = {1};".to_string(), + let_binding_annotated: "let {0}: {1} = {2};".to_string(), + lambda_param_typed: "{0}: {1}".to_string(), + lambda_param_untyped: "{0}".to_string(), + }), + method_templates: Some(rust_method_templates()), + service_fields: Rc::new(ServiceFieldTemplates { + rest_decl: " pub base_url: String,\n".to_string(), + auth_decl: " pub auth_token: String,\n".to_string(), + shell_decl: " pub working_dir: Option,\n".to_string(), + file_decl: " pub base_path: String,\n".to_string(), + rest_ctor: " base_url: \"{0}\".to_string(),\n".to_string(), + auth_ctor: " auth_token: String::new(),\n".to_string(), + shell_ctor: " working_dir: None,\n".to_string(), + file_ctor: " base_path: \".\".to_string(),\n".to_string(), + }), + block_syntax: Rc::new(BlockSyntax { + block_open: " {\n".to_string(), + block_close: "}".to_string(), + else_clause: "} else {\n".to_string(), + match_keyword: "match ".to_string(), + case_keyword: "".to_string(), + arm_separator: ",".to_string(), + stmt_terminator: ";".to_string(), + significant_whitespace: false, + }), + for_each_syntax: Rc::new(ForEachSyntax { + prefix: "for ".to_string(), + separator: " in ".to_string(), + }), + tco: Rc::new(TcoSyntax { + loop_keyword: "loop".to_string(), + break_return: "break".to_string(), + continue_str: "continue;".to_string(), + temp_var_prefix: "__tco_".to_string(), + temp_decl_prefix: "let ".to_string(), + temp_assign_op: " = ".to_string(), + }), + items: Rc::new(ItemKeywords { + func_keyword: item_keyword_for_kind(rust_item_forms(), ItemFormKind::FuncForm), + async_prefix: rust_async_prefix(), + struct_keyword: item_keyword_for_kind(rust_item_forms(), ItemFormKind::StructForm), + enum_keyword: item_keyword_for_kind(rust_item_forms(), ItemFormKind::EnumForm), + type_alias_keyword: item_keyword_for_kind( + rust_item_forms(), + ItemFormKind::TypeAliasForm, + ), + param_separator: rust_param_separator(), + return_arrow: rust_return_arrow(), + param_type_sep: rust_param_type_sep(), + module_keyword: item_keyword_for_kind(rust_item_forms(), ItemFormKind::ModuleForm), + import_keyword: rust_import_keyword(), + import_from_keyword: rust_import_from_keyword(), + }), + expression_semantics: Rc::new(ExpressionSemantics { + if_value_form: IfValueForm::IfExpression, + wildcard_case: None, + variant_pattern: Some(Rc::new(VariantPatternSyntax { + open: " { ".to_string(), + close: " }".to_string(), + binding_sep: ": ".to_string(), + empty_suffix: "".to_string(), + })), + guard_prefix: Some(" if ".to_string()), + empty_return_value: "()".to_string(), + return_suffix: "".to_string(), + suppress_unit_return: false, + }), + lambda_template: rust_lambda_template(), + error_expr_template: rust_error_expr_template(), + list_literal_empty: rust_list_literal_empty(), + list_literal_template: rust_list_literal_template(), + null_coalesce_template: rust_null_coalesce_template(), + error_type_template: rust_error_type_template(), + type_arg_open: rust_type_arg_open(), + type_arg_close: rust_type_arg_close(), + void_type: rust_void_type(), + tuple_syntax: Rc::new(TupleSyntax { + empty: rust_tuple_empty(), + pair_template: rust_tuple_pair_template(), + multi_template: rust_tuple_multi_template(), + separator: rust_tuple_separator(), + first_accessor: ".0".to_string(), + second_accessor: ".1".to_string(), + }), + string_interp: Rc::new(StringInterpSyntax { + style: Rc::new(InterpStyle::FormatArgs { + placeholder: "{}".to_string(), + }), + format_template: "format!(\"{0}\", {1})".to_string(), + plain_template: "\"{0}\".to_string()".to_string(), + escape_pairs: Rc::new(vec![ + Rc::new(EscapePair { + from: "{".to_string(), + to: "{{".to_string(), + }), + Rc::new(EscapePair { + from: "}".to_string(), + to: "}}".to_string(), + }), + ]), + }), + callable_type_template: Some("Rc {return}>".to_string()), + naming_case: NamingCase::SnakeCase, + async_call_prefix: "".to_string(), + bridge_method_prefix: "".to_string(), + bridge_method_case: NamingCase::SnakeCase, + bridge_method_overrides: v2_rt::rc_empty_map::(), + record_lit: Rc::new(RecordLitSyntax { + named_open: " {".to_string(), + named_close: "}".to_string(), + named_empty: " {}".to_string(), + named_field_sep: ": ".to_string(), + named_field_join: ", ".to_string(), + anon_empty: "{}".to_string(), + anon_prefix: "{\n".to_string(), + anon_suffix: "}".to_string(), + anon_field_indent: " ".to_string(), + }), + service_method: Rc::new(ServiceMethodStrategy::SelfInParams { + self_param: "&self".to_string(), + }), + service_return: Rc::new(ServiceReturnStrategy::ArrowReturn), + }) } pub fn python_spec() -> Rc { Rc::new(LanguageSpec { - target_name: "python".to_string(), - reserved_words: Rc::new(ReservedWords { - keywords: python_reserved(), - strategy: Rc::new(ReservedWordStrategy::SuffixEscape { - suffix: python_reserved_escape_suffix(), -}), -}), - scaffold: Rc::new(ProjectScaffold { - manifest_file: Some("requirements.txt".to_string()), - module_init_file: Some(python_module_init()), - source_file_extension: python_source_extension(), - source_dir: None, -}), - serialization: Rc::new(SerializationSpec { - struct_derives: None, - struct_derives_copy: None, - enum_derives: None, - enum_derives_copy: None, - tag_attribute: None, - rename_attribute_template: None, - derive_attribute: Some(python_derive_attribute()), - default_value: Some(python_default_value()), -}), - test_conventions: Rc::new(TestConventions { - file_prefix: "test_".to_string(), - file_suffix: "".to_string(), - file_dir: Some("tests/".to_string()), - function_prefix: "test_".to_string(), - name_style: TestNameStyle::SnakeCaseTestNames, - async_decorator: None, -}), - visibility: Rc::new(VisibilitySpec::KeywordVisibility { - prefix: "".to_string(), -}), - sharing: Rc::new(SharingStrategy { - needs_sharing: false, - wrap_template: "{0}".to_string(), - clone_value: "{0}".to_string(), - deref_clone: "{0}".to_string(), - field_clone: "{0}.{1}".to_string(), - iter_owned: "{0}".to_string(), - clone_suffix: "".to_string(), - borrow_param_template: "{0}".to_string(), - borrow_arg_template: "{0}".to_string(), -}), - indexing: Rc::new(IndexingSemantics { - list_index: "{0}[{1}]".to_string(), - map_index: "{0}[{1}]".to_string(), - string_index: "{0}[{1}]".to_string(), - list_slice: Some("{0}[{1}:{2}]".to_string()), - string_slice: Some("{0}[{1}:{2}]".to_string()), -}), - annotations: Rc::new(AnnotationRequirements { - let_binding_inferred: "{0} = {1}".to_string(), - let_binding_annotated: "{0}: {1} = {2}".to_string(), - lambda_param_typed: "{0}: {1}".to_string(), - lambda_param_untyped: "{0}".to_string(), -}), - method_templates: Some(python_method_templates()), - service_fields: Rc::new(ServiceFieldTemplates { - rest_decl: "base_url: str".to_string(), - auth_decl: "auth_token: str".to_string(), - shell_decl: "working_dir: str | None = None".to_string(), - file_decl: "base_path: str".to_string(), - rest_ctor: "self.base_url = base_url".to_string(), - auth_ctor: "self.auth_token = auth_token".to_string(), - shell_ctor: "self.working_dir = working_dir".to_string(), - file_ctor: "self.base_path = base_path".to_string(), -}), - block_syntax: Rc::new(BlockSyntax { - block_open: ":\n".to_string(), - block_close: "".to_string(), - else_clause: "else:\n".to_string(), - match_keyword: "match ".to_string(), - case_keyword: "case ".to_string(), - arm_separator: "\n".to_string(), - stmt_terminator: "".to_string(), - significant_whitespace: true, -}), - for_each_syntax: Rc::new(ForEachSyntax { - prefix: "for ".to_string(), - separator: " in ".to_string(), -}), - tco: Rc::new(TcoSyntax { - loop_keyword: "while True".to_string(), - break_return: "return".to_string(), - continue_str: "continue".to_string(), - temp_var_prefix: "__tco_".to_string(), - temp_decl_prefix: "".to_string(), - temp_assign_op: " = ".to_string(), -}), - items: Rc::new(ItemKeywords { - func_keyword: item_keyword_for_kind(python_item_forms(), ItemFormKind::FuncForm), - async_prefix: python_async_prefix(), - struct_keyword: item_keyword_for_kind(python_item_forms(), ItemFormKind::StructForm), - enum_keyword: item_keyword_for_kind(python_item_forms(), ItemFormKind::EnumForm), - type_alias_keyword: item_keyword_for_kind(python_item_forms(), ItemFormKind::TypeAliasForm), - param_separator: python_param_separator(), - return_arrow: python_return_arrow(), - param_type_sep: python_param_type_sep(), - module_keyword: item_keyword_for_kind(python_item_forms(), ItemFormKind::ModuleForm), - import_keyword: python_import_keyword(), - import_from_keyword: python_import_from_keyword(), -}), - expression_semantics: Rc::new(ExpressionSemantics { - if_value_form: IfValueForm::ConditionalTernary, - wildcard_case: None, - variant_pattern: Some(Rc::new(VariantPatternSyntax { - open: "(".to_string(), - close: ")".to_string(), - binding_sep: "=".to_string(), - empty_suffix: "()".to_string(), -})), - guard_prefix: Some(" if ".to_string()), - empty_return_value: "None".to_string(), - return_suffix: "".to_string(), - suppress_unit_return: false, -}), - lambda_template: python_lambda_template(), - error_expr_template: python_error_expr_template(), - list_literal_empty: python_list_literal_empty(), - list_literal_template: python_list_literal_template(), - null_coalesce_template: python_null_coalesce_template(), - error_type_template: python_error_type_template(), - type_arg_open: python_type_arg_open(), - type_arg_close: python_type_arg_close(), - void_type: python_void_type(), - tuple_syntax: Rc::new(TupleSyntax { - empty: python_tuple_empty(), - pair_template: python_tuple_pair_template(), - multi_template: python_tuple_multi_template(), - separator: python_tuple_separator(), - first_accessor: "[0]".to_string(), - second_accessor: "[1]".to_string(), -}), - string_interp: Rc::new(StringInterpSyntax { - style: Rc::new(InterpStyle::InlineExpr), - format_template: "f\"{0}\"".to_string(), - plain_template: "f\"{0}\"".to_string(), - escape_pairs: Rc::new(vec![Rc::new(EscapePair { - from: "{".to_string(), - to: "{{".to_string(), -}), Rc::new(EscapePair { - from: "}".to_string(), - to: "}}".to_string(), -})]), -}), - callable_type_template: None, - naming_case: NamingCase::SnakeCase, - async_call_prefix: "await ".to_string(), - bridge_method_prefix: "".to_string(), - bridge_method_case: NamingCase::SnakeCase, - bridge_method_overrides: v2_rt::rc_map_insert(v2_rt::rc_empty_map::(), "with".to_string(), "with_update".to_string()), - record_lit: Rc::new(RecordLitSyntax { - named_open: "(".to_string(), - named_close: ")".to_string(), - named_empty: "()".to_string(), - named_field_sep: "=".to_string(), - named_field_join: ", ".to_string(), - anon_empty: "{}".to_string(), - anon_prefix: "{\n".to_string(), - anon_suffix: "}".to_string(), - anon_field_indent: " ".to_string(), -}), - service_method: Rc::new(ServiceMethodStrategy::SelfInParams { - self_param: "self".to_string(), -}), - service_return: Rc::new(ServiceReturnStrategy::ArrowReturn), -}) + target_name: "python".to_string(), + reserved_words: Rc::new(ReservedWords { + keywords: python_reserved(), + strategy: Rc::new(ReservedWordStrategy::SuffixEscape { + suffix: python_reserved_escape_suffix(), + }), + }), + scaffold: Rc::new(ProjectScaffold { + manifest_file: Some("requirements.txt".to_string()), + module_init_file: Some(python_module_init()), + source_file_extension: python_source_extension(), + source_dir: None, + }), + serialization: Rc::new(SerializationSpec { + struct_derives: None, + struct_derives_copy: None, + enum_derives: None, + enum_derives_copy: None, + tag_attribute: None, + rename_attribute_template: None, + derive_attribute: Some(python_derive_attribute()), + default_value: Some(python_default_value()), + }), + test_conventions: Rc::new(TestConventions { + file_prefix: "test_".to_string(), + file_suffix: "".to_string(), + file_dir: Some("tests/".to_string()), + function_prefix: "test_".to_string(), + name_style: TestNameStyle::SnakeCaseTestNames, + async_decorator: None, + }), + visibility: Rc::new(VisibilitySpec::KeywordVisibility { + prefix: "".to_string(), + }), + sharing: Rc::new(SharingStrategy { + needs_sharing: false, + wrap_template: "{0}".to_string(), + clone_value: "{0}".to_string(), + deref_clone: "{0}".to_string(), + field_clone: "{0}.{1}".to_string(), + iter_owned: "{0}".to_string(), + clone_suffix: "".to_string(), + borrow_param_template: "{0}".to_string(), + borrow_arg_template: "{0}".to_string(), + }), + indexing: Rc::new(IndexingSemantics { + list_index: "{0}[{1}]".to_string(), + map_index: "{0}[{1}]".to_string(), + string_index: "{0}[{1}]".to_string(), + list_slice: Some("{0}[{1}:{2}]".to_string()), + string_slice: Some("{0}[{1}:{2}]".to_string()), + }), + annotations: Rc::new(AnnotationRequirements { + let_binding_inferred: "{0} = {1}".to_string(), + let_binding_annotated: "{0}: {1} = {2}".to_string(), + lambda_param_typed: "{0}: {1}".to_string(), + lambda_param_untyped: "{0}".to_string(), + }), + method_templates: Some(python_method_templates()), + service_fields: Rc::new(ServiceFieldTemplates { + rest_decl: "base_url: str".to_string(), + auth_decl: "auth_token: str".to_string(), + shell_decl: "working_dir: str | None = None".to_string(), + file_decl: "base_path: str".to_string(), + rest_ctor: "self.base_url = base_url".to_string(), + auth_ctor: "self.auth_token = auth_token".to_string(), + shell_ctor: "self.working_dir = working_dir".to_string(), + file_ctor: "self.base_path = base_path".to_string(), + }), + block_syntax: Rc::new(BlockSyntax { + block_open: ":\n".to_string(), + block_close: "".to_string(), + else_clause: "else:\n".to_string(), + match_keyword: "match ".to_string(), + case_keyword: "case ".to_string(), + arm_separator: "\n".to_string(), + stmt_terminator: "".to_string(), + significant_whitespace: true, + }), + for_each_syntax: Rc::new(ForEachSyntax { + prefix: "for ".to_string(), + separator: " in ".to_string(), + }), + tco: Rc::new(TcoSyntax { + loop_keyword: "while True".to_string(), + break_return: "return".to_string(), + continue_str: "continue".to_string(), + temp_var_prefix: "__tco_".to_string(), + temp_decl_prefix: "".to_string(), + temp_assign_op: " = ".to_string(), + }), + items: Rc::new(ItemKeywords { + func_keyword: item_keyword_for_kind(python_item_forms(), ItemFormKind::FuncForm), + async_prefix: python_async_prefix(), + struct_keyword: item_keyword_for_kind(python_item_forms(), ItemFormKind::StructForm), + enum_keyword: item_keyword_for_kind(python_item_forms(), ItemFormKind::EnumForm), + type_alias_keyword: item_keyword_for_kind( + python_item_forms(), + ItemFormKind::TypeAliasForm, + ), + param_separator: python_param_separator(), + return_arrow: python_return_arrow(), + param_type_sep: python_param_type_sep(), + module_keyword: item_keyword_for_kind(python_item_forms(), ItemFormKind::ModuleForm), + import_keyword: python_import_keyword(), + import_from_keyword: python_import_from_keyword(), + }), + expression_semantics: Rc::new(ExpressionSemantics { + if_value_form: IfValueForm::ConditionalTernary, + wildcard_case: None, + variant_pattern: Some(Rc::new(VariantPatternSyntax { + open: "(".to_string(), + close: ")".to_string(), + binding_sep: "=".to_string(), + empty_suffix: "()".to_string(), + })), + guard_prefix: Some(" if ".to_string()), + empty_return_value: "None".to_string(), + return_suffix: "".to_string(), + suppress_unit_return: false, + }), + lambda_template: python_lambda_template(), + error_expr_template: python_error_expr_template(), + list_literal_empty: python_list_literal_empty(), + list_literal_template: python_list_literal_template(), + null_coalesce_template: python_null_coalesce_template(), + error_type_template: python_error_type_template(), + type_arg_open: python_type_arg_open(), + type_arg_close: python_type_arg_close(), + void_type: python_void_type(), + tuple_syntax: Rc::new(TupleSyntax { + empty: python_tuple_empty(), + pair_template: python_tuple_pair_template(), + multi_template: python_tuple_multi_template(), + separator: python_tuple_separator(), + first_accessor: "[0]".to_string(), + second_accessor: "[1]".to_string(), + }), + string_interp: Rc::new(StringInterpSyntax { + style: Rc::new(InterpStyle::InlineExpr), + format_template: "f\"{0}\"".to_string(), + plain_template: "f\"{0}\"".to_string(), + escape_pairs: Rc::new(vec![ + Rc::new(EscapePair { + from: "{".to_string(), + to: "{{".to_string(), + }), + Rc::new(EscapePair { + from: "}".to_string(), + to: "}}".to_string(), + }), + ]), + }), + callable_type_template: None, + naming_case: NamingCase::SnakeCase, + async_call_prefix: "await ".to_string(), + bridge_method_prefix: "".to_string(), + bridge_method_case: NamingCase::SnakeCase, + bridge_method_overrides: v2_rt::rc_map_insert( + v2_rt::rc_empty_map::(), + "with".to_string(), + "with_update".to_string(), + ), + record_lit: Rc::new(RecordLitSyntax { + named_open: "(".to_string(), + named_close: ")".to_string(), + named_empty: "()".to_string(), + named_field_sep: "=".to_string(), + named_field_join: ", ".to_string(), + anon_empty: "{}".to_string(), + anon_prefix: "{\n".to_string(), + anon_suffix: "}".to_string(), + anon_field_indent: " ".to_string(), + }), + service_method: Rc::new(ServiceMethodStrategy::SelfInParams { + self_param: "self".to_string(), + }), + service_return: Rc::new(ServiceReturnStrategy::ArrowReturn), + }) } pub fn go_spec() -> Rc { Rc::new(LanguageSpec { - target_name: "go".to_string(), - reserved_words: Rc::new(ReservedWords { - keywords: go_reserved(), - strategy: Rc::new(ReservedWordStrategy::SuffixEscape { - suffix: go_reserved_escape_suffix(), -}), -}), - scaffold: Rc::new(ProjectScaffold { - manifest_file: Some("go.mod".to_string()), - module_init_file: None, - source_file_extension: ".go".to_string(), - source_dir: None, -}), - serialization: Rc::new(SerializationSpec { - struct_derives: None, - struct_derives_copy: None, - enum_derives: None, - enum_derives_copy: None, - tag_attribute: None, - rename_attribute_template: None, - derive_attribute: None, - default_value: None, -}), - test_conventions: Rc::new(TestConventions { - file_prefix: "".to_string(), - file_suffix: "_test".to_string(), - file_dir: None, - function_prefix: "Test".to_string(), - name_style: TestNameStyle::PascalCaseTestNames, - async_decorator: None, -}), - visibility: Rc::new(VisibilitySpec::CaseVisibility { - export_case: NamingCase::PascalCase, -}), - sharing: Rc::new(SharingStrategy { - needs_sharing: false, - wrap_template: "{0}".to_string(), - clone_value: "{0}".to_string(), - deref_clone: "{0}".to_string(), - field_clone: "{0}.{1}".to_string(), - iter_owned: "{0}".to_string(), - clone_suffix: "".to_string(), - borrow_param_template: "{0}".to_string(), - borrow_arg_template: "{0}".to_string(), -}), - indexing: Rc::new(IndexingSemantics { - list_index: "{0}[{1}]".to_string(), - map_index: "{0}[{1}]".to_string(), - string_index: "{0}[{1}]".to_string(), - list_slice: Some("{0}[{1}:{2}]".to_string()), - string_slice: Some("{0}[{1}:{2}]".to_string()), -}), - annotations: Rc::new(AnnotationRequirements { - let_binding_inferred: "{0} := {1}".to_string(), - let_binding_annotated: "var {0} {1} = {2}".to_string(), - lambda_param_typed: "{0} {1}".to_string(), - lambda_param_untyped: "{0} interface{}".to_string(), -}), - method_templates: Some(go_method_templates()), - service_fields: Rc::new(ServiceFieldTemplates { - rest_decl: "\tBaseURL string".to_string(), - auth_decl: "\tAuthToken string".to_string(), - shell_decl: "\tWorkingDir string".to_string(), - file_decl: "\tBasePath string".to_string(), - rest_ctor: "".to_string(), - auth_ctor: "".to_string(), - shell_ctor: "".to_string(), - file_ctor: "".to_string(), -}), - block_syntax: Rc::new(BlockSyntax { - block_open: " {\n".to_string(), - block_close: "}".to_string(), - else_clause: "} else {\n".to_string(), - match_keyword: "switch ".to_string(), - case_keyword: "case ".to_string(), - arm_separator: "\n".to_string(), - stmt_terminator: "".to_string(), - significant_whitespace: false, -}), - for_each_syntax: Rc::new(ForEachSyntax { - prefix: "for _, ".to_string(), - separator: " := range ".to_string(), -}), - tco: Rc::new(TcoSyntax { - loop_keyword: "for".to_string(), - break_return: "return".to_string(), - continue_str: "continue".to_string(), - temp_var_prefix: "tco".to_string(), - temp_decl_prefix: "".to_string(), - temp_assign_op: " := ".to_string(), -}), - items: Rc::new(ItemKeywords { - func_keyword: item_keyword_for_kind(go_item_forms(), ItemFormKind::FuncForm), - async_prefix: go_async_prefix(), - struct_keyword: item_keyword_for_kind(go_item_forms(), ItemFormKind::StructForm), - enum_keyword: item_keyword_for_kind(go_item_forms(), ItemFormKind::EnumForm), - type_alias_keyword: item_keyword_for_kind(go_item_forms(), ItemFormKind::TypeAliasForm), - param_separator: go_param_separator(), - return_arrow: go_return_arrow(), - param_type_sep: go_param_type_sep(), - module_keyword: item_keyword_for_kind(go_item_forms(), ItemFormKind::ModuleForm), - import_keyword: go_import_keyword(), - import_from_keyword: go_import_from_keyword(), -}), - expression_semantics: Rc::new(ExpressionSemantics { - if_value_form: IfValueForm::IfStatement, - wildcard_case: Some("default".to_string()), - variant_pattern: None, - guard_prefix: None, - empty_return_value: "struct{}{}, nil".to_string(), - return_suffix: ", nil".to_string(), - suppress_unit_return: true, -}), - lambda_template: go_lambda_template(), - error_expr_template: go_error_expr_template(), - list_literal_empty: go_list_literal_empty(), - list_literal_template: go_list_literal_template(), - null_coalesce_template: go_null_coalesce_template(), - error_type_template: go_error_type_template(), - type_arg_open: go_type_arg_open(), - type_arg_close: go_type_arg_close(), - void_type: go_void_type(), - tuple_syntax: Rc::new(TupleSyntax { - empty: go_tuple_empty(), - pair_template: go_tuple_pair_template(), - multi_template: go_tuple_multi_template(), - separator: go_tuple_separator(), - first_accessor: ".First".to_string(), - second_accessor: ".Second".to_string(), -}), - string_interp: Rc::new(StringInterpSyntax { - style: Rc::new(InterpStyle::FormatArgs { - placeholder: "%v".to_string(), -}), - format_template: "fmt.Sprintf(\"{0}\", {1})".to_string(), - plain_template: "\"{0}\"".to_string(), - escape_pairs: Rc::new(vec![Rc::new(EscapePair { - from: "%".to_string(), - to: "%%".to_string(), -})]), -}), - callable_type_template: None, - naming_case: NamingCase::CamelCase, - async_call_prefix: "".to_string(), - bridge_method_prefix: "v2rt.".to_string(), - bridge_method_case: NamingCase::PascalCase, - bridge_method_overrides: v2_rt::rc_empty_map::(), - record_lit: Rc::new(RecordLitSyntax { - named_open: "{".to_string(), - named_close: "}".to_string(), - named_empty: "{}".to_string(), - named_field_sep: ": ".to_string(), - named_field_join: ", ".to_string(), - anon_empty: "map[string]interface{}{}".to_string(), - anon_prefix: "map[string]interface{}{\n".to_string(), - anon_suffix: "}".to_string(), - anon_field_indent: "\t".to_string(), -}), - service_method: Rc::new(ServiceMethodStrategy::ExternalReceiver { - var_name: "c".to_string(), -}), - service_return: Rc::new(ServiceReturnStrategy::ErrorTupleReturn { - error_type: "error".to_string(), -}), -}) + target_name: "go".to_string(), + reserved_words: Rc::new(ReservedWords { + keywords: go_reserved(), + strategy: Rc::new(ReservedWordStrategy::SuffixEscape { + suffix: go_reserved_escape_suffix(), + }), + }), + scaffold: Rc::new(ProjectScaffold { + manifest_file: Some("go.mod".to_string()), + module_init_file: None, + source_file_extension: ".go".to_string(), + source_dir: None, + }), + serialization: Rc::new(SerializationSpec { + struct_derives: None, + struct_derives_copy: None, + enum_derives: None, + enum_derives_copy: None, + tag_attribute: None, + rename_attribute_template: None, + derive_attribute: None, + default_value: None, + }), + test_conventions: Rc::new(TestConventions { + file_prefix: "".to_string(), + file_suffix: "_test".to_string(), + file_dir: None, + function_prefix: "Test".to_string(), + name_style: TestNameStyle::PascalCaseTestNames, + async_decorator: None, + }), + visibility: Rc::new(VisibilitySpec::CaseVisibility { + export_case: NamingCase::PascalCase, + }), + sharing: Rc::new(SharingStrategy { + needs_sharing: false, + wrap_template: "{0}".to_string(), + clone_value: "{0}".to_string(), + deref_clone: "{0}".to_string(), + field_clone: "{0}.{1}".to_string(), + iter_owned: "{0}".to_string(), + clone_suffix: "".to_string(), + borrow_param_template: "{0}".to_string(), + borrow_arg_template: "{0}".to_string(), + }), + indexing: Rc::new(IndexingSemantics { + list_index: "{0}[{1}]".to_string(), + map_index: "{0}[{1}]".to_string(), + string_index: "{0}[{1}]".to_string(), + list_slice: Some("{0}[{1}:{2}]".to_string()), + string_slice: Some("{0}[{1}:{2}]".to_string()), + }), + annotations: Rc::new(AnnotationRequirements { + let_binding_inferred: "{0} := {1}".to_string(), + let_binding_annotated: "var {0} {1} = {2}".to_string(), + lambda_param_typed: "{0} {1}".to_string(), + lambda_param_untyped: "{0} interface{}".to_string(), + }), + method_templates: Some(go_method_templates()), + service_fields: Rc::new(ServiceFieldTemplates { + rest_decl: "\tBaseURL string".to_string(), + auth_decl: "\tAuthToken string".to_string(), + shell_decl: "\tWorkingDir string".to_string(), + file_decl: "\tBasePath string".to_string(), + rest_ctor: "".to_string(), + auth_ctor: "".to_string(), + shell_ctor: "".to_string(), + file_ctor: "".to_string(), + }), + block_syntax: Rc::new(BlockSyntax { + block_open: " {\n".to_string(), + block_close: "}".to_string(), + else_clause: "} else {\n".to_string(), + match_keyword: "switch ".to_string(), + case_keyword: "case ".to_string(), + arm_separator: "\n".to_string(), + stmt_terminator: "".to_string(), + significant_whitespace: false, + }), + for_each_syntax: Rc::new(ForEachSyntax { + prefix: "for _, ".to_string(), + separator: " := range ".to_string(), + }), + tco: Rc::new(TcoSyntax { + loop_keyword: "for".to_string(), + break_return: "return".to_string(), + continue_str: "continue".to_string(), + temp_var_prefix: "tco".to_string(), + temp_decl_prefix: "".to_string(), + temp_assign_op: " := ".to_string(), + }), + items: Rc::new(ItemKeywords { + func_keyword: item_keyword_for_kind(go_item_forms(), ItemFormKind::FuncForm), + async_prefix: go_async_prefix(), + struct_keyword: item_keyword_for_kind(go_item_forms(), ItemFormKind::StructForm), + enum_keyword: item_keyword_for_kind(go_item_forms(), ItemFormKind::EnumForm), + type_alias_keyword: item_keyword_for_kind(go_item_forms(), ItemFormKind::TypeAliasForm), + param_separator: go_param_separator(), + return_arrow: go_return_arrow(), + param_type_sep: go_param_type_sep(), + module_keyword: item_keyword_for_kind(go_item_forms(), ItemFormKind::ModuleForm), + import_keyword: go_import_keyword(), + import_from_keyword: go_import_from_keyword(), + }), + expression_semantics: Rc::new(ExpressionSemantics { + if_value_form: IfValueForm::IfStatement, + wildcard_case: Some("default".to_string()), + variant_pattern: None, + guard_prefix: None, + empty_return_value: "struct{}{}, nil".to_string(), + return_suffix: ", nil".to_string(), + suppress_unit_return: true, + }), + lambda_template: go_lambda_template(), + error_expr_template: go_error_expr_template(), + list_literal_empty: go_list_literal_empty(), + list_literal_template: go_list_literal_template(), + null_coalesce_template: go_null_coalesce_template(), + error_type_template: go_error_type_template(), + type_arg_open: go_type_arg_open(), + type_arg_close: go_type_arg_close(), + void_type: go_void_type(), + tuple_syntax: Rc::new(TupleSyntax { + empty: go_tuple_empty(), + pair_template: go_tuple_pair_template(), + multi_template: go_tuple_multi_template(), + separator: go_tuple_separator(), + first_accessor: ".First".to_string(), + second_accessor: ".Second".to_string(), + }), + string_interp: Rc::new(StringInterpSyntax { + style: Rc::new(InterpStyle::FormatArgs { + placeholder: "%v".to_string(), + }), + format_template: "fmt.Sprintf(\"{0}\", {1})".to_string(), + plain_template: "\"{0}\"".to_string(), + escape_pairs: Rc::new(vec![Rc::new(EscapePair { + from: "%".to_string(), + to: "%%".to_string(), + })]), + }), + callable_type_template: None, + naming_case: NamingCase::CamelCase, + async_call_prefix: "".to_string(), + bridge_method_prefix: "v2rt.".to_string(), + bridge_method_case: NamingCase::PascalCase, + bridge_method_overrides: v2_rt::rc_empty_map::(), + record_lit: Rc::new(RecordLitSyntax { + named_open: "{".to_string(), + named_close: "}".to_string(), + named_empty: "{}".to_string(), + named_field_sep: ": ".to_string(), + named_field_join: ", ".to_string(), + anon_empty: "map[string]interface{}{}".to_string(), + anon_prefix: "map[string]interface{}{\n".to_string(), + anon_suffix: "}".to_string(), + anon_field_indent: "\t".to_string(), + }), + service_method: Rc::new(ServiceMethodStrategy::ExternalReceiver { + var_name: "c".to_string(), + }), + service_return: Rc::new(ServiceReturnStrategy::ErrorTupleReturn { + error_type: "error".to_string(), + }), + }) } pub fn dag_spec() -> Rc { Rc::new(LanguageSpec { - target_name: "dag".to_string(), - reserved_words: Rc::new(ReservedWords { - keywords: dag_reserved(), - strategy: Rc::new(ReservedWordStrategy::NoEscape), -}), - scaffold: Rc::new(ProjectScaffold { - manifest_file: None, - module_init_file: None, - source_file_extension: dag_source_extension(), - source_dir: None, -}), - serialization: Rc::new(SerializationSpec { - struct_derives: None, - struct_derives_copy: None, - enum_derives: None, - enum_derives_copy: None, - tag_attribute: None, - rename_attribute_template: None, - derive_attribute: None, - default_value: None, -}), - test_conventions: Rc::new(TestConventions { - file_prefix: "test_".to_string(), - file_suffix: "".to_string(), - file_dir: Some("tests/".to_string()), - function_prefix: "test_".to_string(), - name_style: TestNameStyle::SnakeCaseTestNames, - async_decorator: None, -}), - visibility: Rc::new(VisibilitySpec::KeywordVisibility { - prefix: "".to_string(), -}), - sharing: Rc::new(SharingStrategy { - needs_sharing: true, - wrap_template: "Rc<{0}>".to_string(), - clone_value: "{0}.clone()".to_string(), - deref_clone: "(*{0}).clone()".to_string(), - field_clone: "{0}.{1}.clone()".to_string(), - iter_owned: "{0}.iter().cloned()".to_string(), - clone_suffix: ".cloned()".to_string(), - borrow_param_template: "&{0}".to_string(), - borrow_arg_template: "&{0}".to_string(), -}), - indexing: Rc::new(IndexingSemantics { - list_index: "{0}[({1}) as usize].clone()".to_string(), - map_index: "({0}).get(&{1}).cloned()".to_string(), - string_index: "v2_rt::char_at(&{0}, {1})".to_string(), - list_slice: None, - string_slice: Some("v2_rt::substring(&{0}, {1}, {2})".to_string()), -}), - annotations: Rc::new(AnnotationRequirements { - let_binding_inferred: "let {0} = {1}".to_string(), - let_binding_annotated: "let {0}: {1} = {2}".to_string(), - lambda_param_typed: "{0}: {1}".to_string(), - lambda_param_untyped: "{0}".to_string(), -}), - method_templates: Some(rust_method_templates()), - service_fields: Rc::new(ServiceFieldTemplates { - rest_decl: " pub base_url: String,\n".to_string(), - auth_decl: " pub auth_token: String,\n".to_string(), - shell_decl: " pub working_dir: Option,\n".to_string(), - file_decl: " pub base_path: String,\n".to_string(), - rest_ctor: " base_url: \"{0}\".to_string(),\n".to_string(), - auth_ctor: " auth_token: String::new(),\n".to_string(), - shell_ctor: " working_dir: None,\n".to_string(), - file_ctor: " base_path: \".\".to_string(),\n".to_string(), -}), - block_syntax: Rc::new(BlockSyntax { - block_open: " {\n".to_string(), - block_close: "}".to_string(), - else_clause: "} else {\n".to_string(), - match_keyword: "match ".to_string(), - case_keyword: "".to_string(), - arm_separator: ",".to_string(), - stmt_terminator: ";".to_string(), - significant_whitespace: false, -}), - for_each_syntax: Rc::new(ForEachSyntax { - prefix: "for ".to_string(), - separator: " in ".to_string(), -}), - tco: Rc::new(TcoSyntax { - loop_keyword: "loop".to_string(), - break_return: "break".to_string(), - continue_str: "continue;".to_string(), - temp_var_prefix: "__tco_".to_string(), - temp_decl_prefix: "let ".to_string(), - temp_assign_op: " = ".to_string(), -}), - items: Rc::new(ItemKeywords { - func_keyword: dag_func_keyword(), - async_prefix: dag_async_prefix(), - struct_keyword: dag_struct_keyword(), - enum_keyword: dag_enum_keyword(), - type_alias_keyword: dag_type_alias_keyword(), - param_separator: dag_param_separator(), - return_arrow: dag_return_arrow(), - param_type_sep: dag_param_type_sep(), - module_keyword: dag_module_keyword(), - import_keyword: dag_import_keyword(), - import_from_keyword: dag_import_from_keyword(), -}), - expression_semantics: Rc::new(ExpressionSemantics { - if_value_form: IfValueForm::IfExpression, - wildcard_case: None, - variant_pattern: Some(Rc::new(VariantPatternSyntax { - open: " { ".to_string(), - close: " }".to_string(), - binding_sep: ": ".to_string(), - empty_suffix: "".to_string(), -})), - guard_prefix: Some(" if ".to_string()), - empty_return_value: "()".to_string(), - return_suffix: "".to_string(), - suppress_unit_return: false, -}), - lambda_template: dag_lambda_template(), - error_expr_template: dag_error_expr_template(), - list_literal_empty: dag_list_literal_empty(), - list_literal_template: dag_list_literal_template(), - null_coalesce_template: dag_null_coalesce_template(), - error_type_template: dag_error_type_template(), - type_arg_open: dag_type_arg_open(), - type_arg_close: dag_type_arg_close(), - void_type: dag_void_type(), - tuple_syntax: Rc::new(TupleSyntax { - empty: dag_tuple_empty(), - pair_template: dag_tuple_pair_template(), - multi_template: dag_tuple_multi_template(), - separator: dag_tuple_separator(), - first_accessor: ".0".to_string(), - second_accessor: ".1".to_string(), -}), - string_interp: Rc::new(StringInterpSyntax { - style: Rc::new(InterpStyle::InlineExpr), - format_template: "\"{0}\"".to_string(), - plain_template: "\"{0}\"".to_string(), - escape_pairs: Rc::new(vec![Rc::new(EscapePair { - from: "{".to_string(), - to: "\\{".to_string(), -}), Rc::new(EscapePair { - from: "}".to_string(), - to: "\\}".to_string(), -})]), -}), - callable_type_template: None, - naming_case: NamingCase::AsAuthored, - async_call_prefix: "".to_string(), - bridge_method_prefix: "".to_string(), - bridge_method_case: NamingCase::SnakeCase, - bridge_method_overrides: v2_rt::rc_empty_map::(), - record_lit: Rc::new(RecordLitSyntax { - named_open: " {".to_string(), - named_close: "}".to_string(), - named_empty: " {}".to_string(), - named_field_sep: ": ".to_string(), - named_field_join: ", ".to_string(), - anon_empty: "{}".to_string(), - anon_prefix: "{\n".to_string(), - anon_suffix: "}".to_string(), - anon_field_indent: " ".to_string(), -}), - service_method: Rc::new(ServiceMethodStrategy::SelfInParams { - self_param: "".to_string(), -}), - service_return: Rc::new(ServiceReturnStrategy::ArrowReturn), -}) + target_name: "dag".to_string(), + reserved_words: Rc::new(ReservedWords { + keywords: dag_reserved(), + strategy: Rc::new(ReservedWordStrategy::NoEscape), + }), + scaffold: Rc::new(ProjectScaffold { + manifest_file: None, + module_init_file: None, + source_file_extension: dag_source_extension(), + source_dir: None, + }), + serialization: Rc::new(SerializationSpec { + struct_derives: None, + struct_derives_copy: None, + enum_derives: None, + enum_derives_copy: None, + tag_attribute: None, + rename_attribute_template: None, + derive_attribute: None, + default_value: None, + }), + test_conventions: Rc::new(TestConventions { + file_prefix: "test_".to_string(), + file_suffix: "".to_string(), + file_dir: Some("tests/".to_string()), + function_prefix: "test_".to_string(), + name_style: TestNameStyle::SnakeCaseTestNames, + async_decorator: None, + }), + visibility: Rc::new(VisibilitySpec::KeywordVisibility { + prefix: "".to_string(), + }), + sharing: Rc::new(SharingStrategy { + needs_sharing: true, + wrap_template: "Rc<{0}>".to_string(), + clone_value: "{0}.clone()".to_string(), + deref_clone: "(*{0}).clone()".to_string(), + field_clone: "{0}.{1}.clone()".to_string(), + iter_owned: "{0}.iter().cloned()".to_string(), + clone_suffix: ".cloned()".to_string(), + borrow_param_template: "&{0}".to_string(), + borrow_arg_template: "&{0}".to_string(), + }), + indexing: Rc::new(IndexingSemantics { + list_index: "{0}[({1}) as usize].clone()".to_string(), + map_index: "({0}).get(&{1}).cloned()".to_string(), + string_index: "v2_rt::char_at(&{0}, {1})".to_string(), + list_slice: None, + string_slice: Some("v2_rt::substring(&{0}, {1}, {2})".to_string()), + }), + annotations: Rc::new(AnnotationRequirements { + let_binding_inferred: "let {0} = {1}".to_string(), + let_binding_annotated: "let {0}: {1} = {2}".to_string(), + lambda_param_typed: "{0}: {1}".to_string(), + lambda_param_untyped: "{0}".to_string(), + }), + method_templates: Some(rust_method_templates()), + service_fields: Rc::new(ServiceFieldTemplates { + rest_decl: " pub base_url: String,\n".to_string(), + auth_decl: " pub auth_token: String,\n".to_string(), + shell_decl: " pub working_dir: Option,\n".to_string(), + file_decl: " pub base_path: String,\n".to_string(), + rest_ctor: " base_url: \"{0}\".to_string(),\n".to_string(), + auth_ctor: " auth_token: String::new(),\n".to_string(), + shell_ctor: " working_dir: None,\n".to_string(), + file_ctor: " base_path: \".\".to_string(),\n".to_string(), + }), + block_syntax: Rc::new(BlockSyntax { + block_open: " {\n".to_string(), + block_close: "}".to_string(), + else_clause: "} else {\n".to_string(), + match_keyword: "match ".to_string(), + case_keyword: "".to_string(), + arm_separator: ",".to_string(), + stmt_terminator: ";".to_string(), + significant_whitespace: false, + }), + for_each_syntax: Rc::new(ForEachSyntax { + prefix: "for ".to_string(), + separator: " in ".to_string(), + }), + tco: Rc::new(TcoSyntax { + loop_keyword: "loop".to_string(), + break_return: "break".to_string(), + continue_str: "continue;".to_string(), + temp_var_prefix: "__tco_".to_string(), + temp_decl_prefix: "let ".to_string(), + temp_assign_op: " = ".to_string(), + }), + items: Rc::new(ItemKeywords { + func_keyword: dag_func_keyword(), + async_prefix: dag_async_prefix(), + struct_keyword: dag_struct_keyword(), + enum_keyword: dag_enum_keyword(), + type_alias_keyword: dag_type_alias_keyword(), + param_separator: dag_param_separator(), + return_arrow: dag_return_arrow(), + param_type_sep: dag_param_type_sep(), + module_keyword: dag_module_keyword(), + import_keyword: dag_import_keyword(), + import_from_keyword: dag_import_from_keyword(), + }), + expression_semantics: Rc::new(ExpressionSemantics { + if_value_form: IfValueForm::IfExpression, + wildcard_case: None, + variant_pattern: Some(Rc::new(VariantPatternSyntax { + open: " { ".to_string(), + close: " }".to_string(), + binding_sep: ": ".to_string(), + empty_suffix: "".to_string(), + })), + guard_prefix: Some(" if ".to_string()), + empty_return_value: "()".to_string(), + return_suffix: "".to_string(), + suppress_unit_return: false, + }), + lambda_template: dag_lambda_template(), + error_expr_template: dag_error_expr_template(), + list_literal_empty: dag_list_literal_empty(), + list_literal_template: dag_list_literal_template(), + null_coalesce_template: dag_null_coalesce_template(), + error_type_template: dag_error_type_template(), + type_arg_open: dag_type_arg_open(), + type_arg_close: dag_type_arg_close(), + void_type: dag_void_type(), + tuple_syntax: Rc::new(TupleSyntax { + empty: dag_tuple_empty(), + pair_template: dag_tuple_pair_template(), + multi_template: dag_tuple_multi_template(), + separator: dag_tuple_separator(), + first_accessor: ".0".to_string(), + second_accessor: ".1".to_string(), + }), + string_interp: Rc::new(StringInterpSyntax { + style: Rc::new(InterpStyle::InlineExpr), + format_template: "\"{0}\"".to_string(), + plain_template: "\"{0}\"".to_string(), + escape_pairs: Rc::new(vec![ + Rc::new(EscapePair { + from: "{".to_string(), + to: "\\{".to_string(), + }), + Rc::new(EscapePair { + from: "}".to_string(), + to: "\\}".to_string(), + }), + ]), + }), + callable_type_template: None, + naming_case: NamingCase::AsAuthored, + async_call_prefix: "".to_string(), + bridge_method_prefix: "".to_string(), + bridge_method_case: NamingCase::SnakeCase, + bridge_method_overrides: v2_rt::rc_empty_map::(), + record_lit: Rc::new(RecordLitSyntax { + named_open: " {".to_string(), + named_close: "}".to_string(), + named_empty: " {}".to_string(), + named_field_sep: ": ".to_string(), + named_field_join: ", ".to_string(), + anon_empty: "{}".to_string(), + anon_prefix: "{\n".to_string(), + anon_suffix: "}".to_string(), + anon_field_indent: " ".to_string(), + }), + service_method: Rc::new(ServiceMethodStrategy::SelfInParams { + self_param: "".to_string(), + }), + service_return: Rc::new(ServiceReturnStrategy::ArrowReturn), + }) } pub fn language_spec_for_target(target: RenderTarget) -> Rc { match target { - RenderTarget::Rust => rust_spec(), - RenderTarget::Go => go_spec(), - RenderTarget::Python => python_spec(), - RenderTarget::Dag => dag_spec(), -} + RenderTarget::Rust => rust_spec(), + RenderTarget::Go => go_spec(), + RenderTarget::Python => python_spec(), + RenderTarget::Dag => dag_spec(), + } } pub fn target_keyword(target: RenderTarget, key: String) -> String { match target { - RenderTarget::Rust => match v2_rt::lookup(&rust_keywords(), key.clone()) { - Some(kw) => kw.clone(), - None => key.clone(), -}, - RenderTarget::Go => match v2_rt::lookup(&go_keywords(), key.clone()) { - Some(kw) => kw.clone(), - None => key.clone(), -}, - RenderTarget::Python => match v2_rt::lookup(&python_keywords(), key.clone()) { - Some(kw) => kw.clone(), - None => key.clone(), -}, - RenderTarget::Dag => key.clone(), -} + RenderTarget::Rust => match v2_rt::lookup(&rust_keywords(), key.clone()) { + Some(kw) => kw.clone(), + None => key.clone(), + }, + RenderTarget::Go => match v2_rt::lookup(&go_keywords(), key.clone()) { + Some(kw) => kw.clone(), + None => key.clone(), + }, + RenderTarget::Python => match v2_rt::lookup(&python_keywords(), key.clone()) { + Some(kw) => kw.clone(), + None => key.clone(), + }, + RenderTarget::Dag => key.clone(), + } } pub fn target_operators(target: RenderTarget) -> Rc>> { match target { - RenderTarget::Rust => rust_operators(), - RenderTarget::Python => python_operators(), - RenderTarget::Go => go_operators(), - RenderTarget::Dag => dag_operators(), -} + RenderTarget::Rust => rust_operators(), + RenderTarget::Python => python_operators(), + RenderTarget::Go => go_operators(), + RenderTarget::Dag => dag_operators(), + } } -pub fn binop_symbol(target: RenderTarget, op: BinOp, algebra_field: Option) -> Option { +pub fn binop_symbol( + target: RenderTarget, + op: BinOp, + algebra_field: Option, +) -> Option { { let ops = target_operators(target); -let op_matching = Rc::new({ let mut __result = Vec::new(); for spec in ops.iter().cloned() { if match spec.binop.clone() { - Some(b) => (b.clone() == op.clone()), - None => false, -} { __result.push(spec); } } __result }); -let specific = match algebra_field { - Some(af) => Rc::new({ let mut __result = Vec::new(); for spec in op_matching.clone().iter().cloned() { if match spec.algebra_field.clone() { - Some(sf) => (sf.clone() == af.clone()), - _ => false, -} { __result.push(spec); } } __result }).first().cloned(), - None => None, -}; -let result = match specific.clone() { - Some(_) => specific.clone(), - None => Rc::new({ let mut __result = Vec::new(); for spec in op_matching.clone().iter().cloned() { if (spec.algebra_field.clone() == None) { __result.push(spec); } } __result }).first().cloned(), -}; -match result { - Some(spec) => Some(spec.symbol.clone()), - None => None, -} -} + let op_matching = Rc::new({ + let mut __result = Vec::new(); + for spec in ops.iter().cloned() { + if match spec.binop.clone() { + Some(b) => (b.clone() == op.clone()), + None => false, + } { + __result.push(spec); + } + } + __result + }); + let specific = match algebra_field { + Some(af) => Rc::new({ + let mut __result = Vec::new(); + for spec in op_matching.clone().iter().cloned() { + if match spec.algebra_field.clone() { + Some(sf) => (sf.clone() == af.clone()), + _ => false, + } { + __result.push(spec); + } + } + __result + }) + .first() + .cloned(), + None => None, + }; + let result = match specific.clone() { + Some(_) => specific.clone(), + None => Rc::new({ + let mut __result = Vec::new(); + for spec in op_matching.clone().iter().cloned() { + if (spec.algebra_field.clone() == None) { + __result.push(spec); + } + } + __result + }) + .first() + .cloned(), + }; + match result { + Some(spec) => Some(spec.symbol.clone()), + None => None, + } + } } pub fn is_string_like(target: RenderTarget, name: String) -> bool { match target { - RenderTarget::Rust => { let mut __found = false; for t in rust_string_types().iter().cloned() { if (t.clone().as_str() == name.clone().as_str()) { __found = true; break; } } __found }, - RenderTarget::Go => { let mut __found = false; for t in go_string_types().iter().cloned() { if (t.clone().as_str() == name.clone().as_str()) { __found = true; break; } } __found }, - RenderTarget::Python => { let mut __found = false; for t in python_string_types().iter().cloned() { if (t.clone().as_str() == name.clone().as_str()) { __found = true; break; } } __found }, - RenderTarget::Dag => false, -} + RenderTarget::Rust => { + let mut __found = false; + for t in rust_string_types().iter().cloned() { + if (t.clone().as_str() == name.clone().as_str()) { + __found = true; + break; + } + } + __found + } + RenderTarget::Go => { + let mut __found = false; + for t in go_string_types().iter().cloned() { + if (t.clone().as_str() == name.clone().as_str()) { + __found = true; + break; + } + } + __found + } + RenderTarget::Python => { + let mut __found = false; + for t in python_string_types().iter().cloned() { + if (t.clone().as_str() == name.clone().as_str()) { + __found = true; + break; + } + } + __found + } + RenderTarget::Dag => false, + } } pub fn scaffold_for_target(target: RenderTarget) -> Rc { @@ -1190,12 +1316,14 @@ pub fn sharing_for_target(target: RenderTarget) -> Rc { } pub fn expression_semantics_for_target(target: RenderTarget) -> Rc { - language_spec_for_target(target).expression_semantics.clone() + language_spec_for_target(target) + .expression_semantics + .clone() } pub fn wrap_shared_type(target: RenderTarget, inner: String) -> String { { let tmpl = sharing_for_target(target).wrap_template.clone(); -v2_rt::replace(tmpl, "{0}".to_string(), inner) -} + v2_rt::replace(tmpl, "{0}".to_string(), inner) + } } diff --git a/src/v2/stage0/src/v2_compiler_normalize.rs b/src/v2/stage0/src/v2_compiler_normalize.rs index 165dbb3cf6f..a3adf7bac7f 100644 --- a/src/v2/stage0/src/v2_compiler_normalize.rs +++ b/src/v2/stage0/src/v2_compiler_normalize.rs @@ -1,18 +1,21 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.normalize -use std::collections::HashMap; -use std::rc::Rc; +pub use crate::std_types::container_expected_arity; +pub use crate::v2_compiler_resolve::{ModuleGraph, ResolvedModule}; use crate::v2_rt; -use crate::NonEmptyVec; +use crate::v2_std_core::CompilerDiagnostic::ArityMismatch; +use crate::v2_std_core::Connective::NoConnective; +use crate::v2_std_core::ExprData::NoExprData; +use crate::v2_std_core::InferredNode::{CompilerError, Resolved}; +pub use crate::v2_std_core::{ + authored_name_at, make_error_node, module_items, CompilerDiagnostic, Connective, ErrorNode, + ExprData, InferredNode, NewlineIndex, Node, +}; use crate::NonEmptyBTreeSet; -pub use crate::v2_std_core::{Node, ErrorNode, NewlineIndex, InferredNode, ExprData, make_error_node, module_items, authored_name_at, Connective, CompilerDiagnostic}; -use crate::v2_std_core::InferredNode::{Resolved, CompilerError}; -use crate::v2_std_core::ExprData::{NoExprData}; -use crate::v2_std_core::Connective::{NoConnective}; -use crate::v2_std_core::CompilerDiagnostic::{ArityMismatch}; -pub use crate::v2_compiler_resolve::{ModuleGraph, ResolvedModule}; -pub use crate::std_types::{container_expected_arity}; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct NormalizeResult { @@ -20,72 +23,174 @@ pub struct NormalizeResult { pub diagnostics: Rc>>, } -pub fn check_bare_containers(n: &Rc, module_name: &String, source_indices: &Rc>>) -> Rc>> { +pub fn check_bare_containers( + n: &Rc, + module_name: &String, + source_indices: &Rc>>, +) -> Rc>> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let has_structure = ((match n.body.clone() { - Some(_) => true, - None => false, -} || ((n.uses.clone().len() as i64) > 0)) || ((n.properties.clone().len() as i64) > 0)); -let is_expr = match (*n.expr_data.clone()).clone() { - ExprData::NoExprData => false, - _ => true, -}; -let nname = authored_name_at(source_indices.clone(), &n); -let self_diags = if is_expr { - Rc::new(vec![]) - } else { - match container_expected_arity(nname.clone()) { - Some(expected) => if (((((n.children.clone().len() as i64) == 0) && ((n.params.clone().len() as i64) == 0)) && (n.connective.clone() == Connective::NoConnective)) && !has_structure) { - Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::ArityMismatch { - name: nname.clone(), - expected: expected.clone(), - got: 0, - span: n.span.clone(), -}), module_name.clone())]) - } else { - Rc::new(vec![]) + let has_structure = ((match n.body.clone() { + Some(_) => true, + None => false, + } || ((n.uses.clone().len() as i64) > 0)) + || ((n.properties.clone().len() as i64) > 0)); + let is_expr = match (*n.expr_data.clone()).clone() { + ExprData::NoExprData => false, + _ => true, + }; + let nname = authored_name_at(source_indices.clone(), &n); + let self_diags = if is_expr { + Rc::new(vec![]) + } else { + match container_expected_arity(nname.clone()) { + Some(expected) => { + if (((((n.children.clone().len() as i64) == 0) + && ((n.params.clone().len() as i64) == 0)) + && (n.connective.clone() == Connective::NoConnective)) + && !has_structure) + { + Rc::new(vec![make_error_node( + Rc::new(CompilerDiagnostic::ArityMismatch { + name: nname.clone(), + expected: expected.clone(), + got: 0, + span: n.span.clone(), + }), + module_name.clone(), + )]) + } else { + Rc::new(vec![]) + } + } + None => Rc::new(vec![]), + } + }; + let child_diags = Rc::new({ + let mut __result = Vec::new(); + for c in n.children.clone().iter().cloned() { + __result.extend( + (*check_bare_containers(&c, &module_name, &source_indices)) + .iter() + .cloned(), + ); + } + __result + }); + let param_diags = Rc::new({ + let mut __result = Vec::new(); + for p in n.params.clone().iter().cloned() { + __result.extend( + (*check_bare_containers(&p, &module_name, &source_indices)) + .iter() + .cloned(), + ); + } + __result + }); + let type_ann_diags = match n.type_annotation.clone() { + Some(ta) => check_bare_containers(&ta, &module_name, &source_indices), + None => Rc::new(vec![]), + }; + let body_diags = match n.body.clone() { + Some(b) => check_bare_containers(&b, &module_name, &source_indices), + None => Rc::new(vec![]), + }; + let inferred_diags = if ((n.params.clone().len() as i64) > 0) { + Rc::new(vec![]) + } else { + match n.inferred.clone() { + Some(inf) => match (*inf.clone()).clone() { + InferredNode::Resolved { node: rn, .. } => { + check_bare_containers(&rn, &module_name, &source_indices) + } + _ => Rc::new(vec![]), }, - None => Rc::new(vec![]), -} - }; -let child_diags = Rc::new({ let mut __result = Vec::new(); for c in n.children.clone().iter().cloned() { __result.extend((*check_bare_containers(&c, &module_name, &source_indices)).iter().cloned()); } __result }); -let param_diags = Rc::new({ let mut __result = Vec::new(); for p in n.params.clone().iter().cloned() { __result.extend((*check_bare_containers(&p, &module_name, &source_indices)).iter().cloned()); } __result }); -let type_ann_diags = match n.type_annotation.clone() { - Some(ta) => check_bare_containers(&ta, &module_name, &source_indices), - None => Rc::new(vec![]), -}; -let body_diags = match n.body.clone() { - Some(b) => check_bare_containers(&b, &module_name, &source_indices), - None => Rc::new(vec![]), -}; -let inferred_diags = if ((n.params.clone().len() as i64) > 0) { - Rc::new(vec![]) - } else { - match n.inferred.clone() { - Some(inf) => match (*inf.clone()).clone() { - InferredNode::Resolved { node: rn, .. } => check_bare_containers(&rn, &module_name, &source_indices), - _ => Rc::new(vec![]), -}, - None => Rc::new(vec![]), -} - }; -let uses_diags = Rc::new({ let mut __result = Vec::new(); for u in n.uses.clone().iter().cloned() { __result.extend((*check_bare_containers(&u, &module_name, &source_indices)).iter().cloned()); } __result }); -let prop_diags = Rc::new({ let mut __result = Vec::new(); for p in n.properties.clone().iter().cloned() { __result.extend((*check_bare_containers(&p, &module_name, &source_indices)).iter().cloned()); } __result }); -Rc::new({ let mut __result = Vec::new(); for d in Rc::new(vec![self_diags, child_diags, param_diags, type_ann_diags, inferred_diags, body_diags, uses_diags, prop_diags]).iter().cloned() { __result.extend((*d.clone()).iter().cloned()); } __result }) -} + None => Rc::new(vec![]), + } + }; + let uses_diags = Rc::new({ + let mut __result = Vec::new(); + for u in n.uses.clone().iter().cloned() { + __result.extend( + (*check_bare_containers(&u, &module_name, &source_indices)) + .iter() + .cloned(), + ); + } + __result + }); + let prop_diags = Rc::new({ + let mut __result = Vec::new(); + for p in n.properties.clone().iter().cloned() { + __result.extend( + (*check_bare_containers(&p, &module_name, &source_indices)) + .iter() + .cloned(), + ); + } + __result + }); + Rc::new({ + let mut __result = Vec::new(); + for d in Rc::new(vec![ + self_diags, + child_diags, + param_diags, + type_ann_diags, + inferred_diags, + body_diags, + uses_diags, + prop_diags, + ]) + .iter() + .cloned() + { + __result.extend((*d.clone()).iter().cloned()); + } + __result + }) }) } -pub fn normalize_graph(graph: &Rc, source_indices: Rc>>) -> Rc { +pub fn normalize_graph( + graph: &Rc, + source_indices: Rc>>, +) -> Rc { { - let diags = Rc::new({ let mut __result = Vec::new(); for m in graph.modules.clone().iter().cloned() { __result.extend((*{ - let items = module_items(m.module.clone()); -Rc::new({ let mut __result = Vec::new(); for item in items.clone().iter().cloned() { __result.extend((*check_bare_containers(&item, &authored_name_at(source_indices.clone(), &m.module.clone()), &source_indices)).iter().cloned()); } __result }) -}).iter().cloned()); } __result }); -Rc::new(NormalizeResult { - graph: graph.clone(), - diagnostics: diags, -}) -} + let diags = Rc::new({ + let mut __result = Vec::new(); + for m in graph.modules.clone().iter().cloned() { + __result.extend( + (*{ + let items = module_items(m.module.clone()); + Rc::new({ + let mut __result = Vec::new(); + for item in items.clone().iter().cloned() { + __result.extend( + (*check_bare_containers( + &item, + &authored_name_at( + source_indices.clone(), + &m.module.clone(), + ), + &source_indices, + )) + .iter() + .cloned(), + ); + } + __result + }) + }) + .iter() + .cloned(), + ); + } + __result + }); + Rc::new(NormalizeResult { + graph: graph.clone(), + diagnostics: diags, + }) + } } diff --git a/src/v2/stage0/src/v2_compiler_ownership.rs b/src/v2/stage0/src/v2_compiler_ownership.rs index 27f235518dc..2abaab65c4d 100644 --- a/src/v2/stage0/src/v2_compiler_ownership.rs +++ b/src/v2/stage0/src/v2_compiler_ownership.rs @@ -1,19 +1,28 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.ownership -use std::collections::HashMap; -use std::rc::Rc; -use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::v2_std_core::{Node, ExprData, VarBindingKind, InferredNode, Cardinality, arg_value, arm_body, field_access_base, if_condition, if_then_branch, if_else_branch, let_value, let_body, lambda_body, lambda_param_names_at, match_scrutinee, match_arm_nodes, method_receiver, method_arg_nodes, foreach_collection, foreach_body, expr_var_name_at, expr_call_func_at, expr_method_name_at, field_access_field_at, authored_name_at, NewlineIndex}; -use crate::v2_std_core::ExprData::{NoExprData, ExprError, ExprLiteral, ExprVar, ExprFieldAccess, ExprCall, ExprMethodCall, ExprMatch, ExprIf, ExprLet, ExprBlock, ExprReturn, ExprLambda, ExprForEach, ExprRecordLit}; -use crate::v2_std_core::VarBindingKind::{LocalValueBinding, FunctionValueBinding}; -use crate::v2_std_core::InferredNode::{Resolved}; -use crate::v2_std_core::Cardinality::{Required}; -pub use crate::v2_compiler_emit::{to_string}; use self::EdgeKind::*; use self::OwnershipDecision::*; +pub use crate::v2_compiler_emit::to_string; +use crate::v2_rt; +use crate::v2_std_core::Cardinality::Required; +use crate::v2_std_core::ExprData::{ + ExprBlock, ExprCall, ExprError, ExprFieldAccess, ExprForEach, ExprIf, ExprLambda, ExprLet, + ExprLiteral, ExprMatch, ExprMethodCall, ExprRecordLit, ExprReturn, ExprVar, NoExprData, +}; +use crate::v2_std_core::InferredNode::Resolved; +use crate::v2_std_core::VarBindingKind::{FunctionValueBinding, LocalValueBinding}; +pub use crate::v2_std_core::{ + arg_value, arm_body, authored_name_at, expr_call_func_at, expr_method_name_at, + expr_var_name_at, field_access_base, field_access_field_at, foreach_body, foreach_collection, + if_condition, if_else_branch, if_then_branch, lambda_body, lambda_param_names_at, let_body, + let_value, match_arm_nodes, match_scrutinee, method_arg_nodes, method_receiver, Cardinality, + ExprData, InferredNode, NewlineIndex, Node, VarBindingKind, +}; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] @@ -39,17 +48,35 @@ pub struct BindingUsage { } pub fn semantic_consumer_count(usage: Rc) -> i64 { - (Rc::new({ let mut __result = Vec::new(); for c in usage.consumers.clone().iter().cloned() { if match c.kind.clone() { - EdgeKind::Consumed => true, - _ => false, -} { __result.push(c); } } __result }).len() as i64) + (Rc::new({ + let mut __result = Vec::new(); + for c in usage.consumers.clone().iter().cloned() { + if match c.kind.clone() { + EdgeKind::Consumed => true, + _ => false, + } { + __result.push(c); + } + } + __result + }) + .len() as i64) } pub fn binding_fan_out(usage: Rc) -> i64 { - (Rc::new({ let mut __result = Vec::new(); for c in usage.consumers.clone().iter().cloned() { if match c.kind.clone() { - EdgeKind::Threaded => false, - _ => true, -} { __result.push(c); } } __result }).len() as i64) + (Rc::new({ + let mut __result = Vec::new(); + for c in usage.consumers.clone().iter().cloned() { + if match c.kind.clone() { + EdgeKind::Threaded => false, + _ => true, + } { + __result.push(c); + } + } + __result + }) + .len() as i64) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -113,41 +140,48 @@ pub struct UsageAccum { pub fn empty_usage_accum() -> Rc { Rc::new(UsageAccum { - bindings: v2_rt::rc_empty_map::>(), - fold_call_nodes: Rc::new(vec![]), -}) + bindings: v2_rt::rc_empty_map::>(), + fold_call_nodes: Rc::new(vec![]), + }) } -pub fn record_use(accum: &Rc, name: &String, kind: EdgeKind, site: String, binding_kind: Option>, span_start: i64) -> Rc { +pub fn record_use( + accum: &Rc, + name: &String, + kind: EdgeKind, + site: String, + binding_kind: Option>, + span_start: i64, +) -> Rc { { let edge = Rc::new(EdgeClassification { - kind: kind, - site: site, - span_start: span_start, -}); -let existing = match v2_rt::map_get(&accum.bindings.clone(), name.clone()) { - Some(usage) => usage.clone(), - None => Rc::new(BindingUsage { - name: name.clone(), - binding_kind: None, - consumers: Rc::new(vec![]), -}), -}; -let effective_kind = if (existing.binding_kind.clone() != None) { + kind: kind, + site: site, + span_start: span_start, + }); + let existing = match v2_rt::map_get(&accum.bindings.clone(), name.clone()) { + Some(usage) => usage.clone(), + None => Rc::new(BindingUsage { + name: name.clone(), + binding_kind: None, + consumers: Rc::new(vec![]), + }), + }; + let effective_kind = if (existing.binding_kind.clone() != None) { existing.binding_kind.clone() } else { binding_kind }; -let updated = Rc::new(BindingUsage { - name: name.clone(), - binding_kind: effective_kind, - consumers: v2_rt::rc_list_push(existing.consumers.clone(), edge), -}); -Rc::new(UsageAccum { - bindings: v2_rt::rc_map_insert(accum.bindings.clone(), name.clone(), updated), - fold_call_nodes: accum.fold_call_nodes.clone(), -}) -} + let updated = Rc::new(BindingUsage { + name: name.clone(), + binding_kind: effective_kind, + consumers: v2_rt::rc_list_push(existing.consumers.clone(), edge), + }); + Rc::new(UsageAccum { + bindings: v2_rt::rc_map_insert(accum.bindings.clone(), name.clone(), updated), + fold_call_nodes: accum.fold_call_nodes.clone(), + }) + } } pub fn max_usage_by_fan_out(a: Rc, b: Rc) -> Rc { @@ -158,510 +192,1014 @@ pub fn max_usage_by_fan_out(a: Rc, b: Rc) -> Rc>>, key: &String, new_val: Rc) -> Rc>> { +pub fn map_usage_merge_at( + base: &Rc>>, + key: &String, + new_val: Rc, +) -> Rc>> { match v2_rt::map_get(&base, key.clone()) { - Some(existing) => v2_rt::rc_map_insert(base.clone(), key.clone(), max_usage_by_fan_out(existing.clone(), new_val)), - None => v2_rt::rc_map_insert(base.clone(), key.clone(), new_val), -} + Some(existing) => v2_rt::rc_map_insert( + base.clone(), + key.clone(), + max_usage_by_fan_out(existing.clone(), new_val), + ), + None => v2_rt::rc_map_insert(base.clone(), key.clone(), new_val), + } } -pub fn merge_branch_usages(base: &Rc, branches: &Rc>>) -> Rc { +pub fn merge_branch_usages( + base: &Rc, + branches: &Rc>>, +) -> Rc { { - let binding_merged = branches.clone().iter().cloned().fold(base.bindings.clone(), |merged: Rc>>, branch: Rc| Rc::new(v2_rt::map_values(&branch.bindings.clone())).iter().cloned().fold(merged, |acc: Rc>>, usage: Rc| map_usage_merge_at(&acc, &usage.name.clone(), usage.clone()))); -let base_fold_count = (base.fold_call_nodes.clone().len() as i64); -let branch_fold_nodes = Rc::new({ let mut __result = Vec::new(); for b in branches.clone().iter().cloned() { __result.extend((*Rc::new(b.fold_call_nodes.clone().iter().cloned().skip(base_fold_count.clone() as usize).collect::>())).iter().cloned()); } __result }); -Rc::new(UsageAccum { - bindings: binding_merged, - fold_call_nodes: v2_rt::concat(base.fold_call_nodes.clone(), branch_fold_nodes), -}) -} + let binding_merged = branches.clone().iter().cloned().fold( + base.bindings.clone(), + |merged: Rc>>, branch: Rc| { + Rc::new(v2_rt::map_values(&branch.bindings.clone())) + .iter() + .cloned() + .fold( + merged, + |acc: Rc>>, usage: Rc| { + map_usage_merge_at(&acc, &usage.name.clone(), usage.clone()) + }, + ) + }, + ); + let base_fold_count = (base.fold_call_nodes.clone().len() as i64); + let branch_fold_nodes = Rc::new({ + let mut __result = Vec::new(); + for b in branches.clone().iter().cloned() { + __result.extend( + (*Rc::new( + b.fold_call_nodes + .clone() + .iter() + .cloned() + .skip(base_fold_count.clone() as usize) + .collect::>(), + )) + .iter() + .cloned(), + ); + } + __result + }); + Rc::new(UsageAccum { + bindings: binding_merged, + fold_call_nodes: v2_rt::concat(base.fold_call_nodes.clone(), branch_fold_nodes), + }) + } } -pub fn walk_expr(accum: Rc, texpr: &Rc, in_tail: bool, si: &Rc>>) -> Rc { +pub fn walk_expr( + accum: Rc, + texpr: &Rc, + in_tail: bool, + si: &Rc>>, +) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprVar { binding_kind: bk, .. } => { - let n = expr_var_name_at(texpr.clone(), si.clone()); -if in_tail.clone() { - record_use(&accum, &n, EdgeKind::Consumed, "return".to_string(), bk.clone(), texpr.span.clone().start.clone()) - } else { - record_use(&accum, &n, EdgeKind::Read, "read".to_string(), bk.clone(), texpr.span.clone().start.clone()) - } -}, - ExprData::ExprLiteral { .. } => accum, - ExprData::ExprFieldAccess { .. } => { - let base_node = field_access_base(texpr.clone()); -match (*base_node.expr_data.clone()).clone() { - ExprData::ExprVar { binding_kind: bk, .. } => { - let vn = expr_var_name_at(base_node.clone(), si.clone()); -let f = field_access_field_at(texpr.clone(), si.clone()); -record_use(&accum, &vn, EdgeKind::Projected, v2_rt::concat(".".to_string(), f), bk.clone(), texpr.span.clone().start.clone()) -}, - _ => walk_expr(accum, &base_node, false, &si), -} -}, - ExprData::ExprCall { .. } => { - let fname = expr_call_func_at(texpr.clone(), si.clone()); -if (fname.as_str() == "fold".to_string().as_str()) { - { - let init_arg = Rc::new({ let mut __result = Vec::new(); for a in texpr.children.clone().iter().cloned() { if (authored_name_at(si.clone(), &a).as_str() == "init".to_string().as_str()) { __result.push(a); } } __result }).first().cloned(); -let threaded_accum = match init_arg { - Some(ia) => { - let ia_val = arg_value(&ia); -match (*ia_val.expr_data.clone()).clone() { - ExprData::ExprVar { binding_kind: bk, .. } => { - let vn = expr_var_name_at(ia_val.clone(), si.clone()); -record_use(&accum, &vn, EdgeKind::Threaded, "fold_init".to_string(), bk.clone(), ia_val.span.clone().start.clone()) -}, - _ => walk_expr(accum, &ia_val, false, &si), -} -}, - None => accum, -}; -let non_init = Rc::new({ let mut __result = Vec::new(); for a in texpr.children.clone().iter().cloned() { if (authored_name_at(si.clone(), &a).as_str() != "init".to_string().as_str()) { __result.push(a); } } __result }); -non_init.iter().cloned().fold(threaded_accum.clone(), |acc: Rc, a: Rc| walk_expr(acc, &arg_value(&a), false, &si)) -} - } else { - texpr.children.clone().iter().cloned().fold(accum, |acc: Rc, a: Rc| walk_expr(acc, &arg_value(&a), false, &si)) - } -}, - ExprData::ExprMethodCall { .. } => { - let recv = method_receiver(texpr.clone()); -let mc_args = method_arg_nodes(texpr.clone()); -let mname = expr_method_name_at(texpr.clone(), si.clone()); -if (mname.as_str() == "fold".to_string().as_str()) { - { - let recv_accum = walk_expr(accum, &recv, false, &si); -let init_arg = Rc::new({ let mut __result = Vec::new(); for a in mc_args.clone().iter().cloned() { if (authored_name_at(si.clone(), &a).as_str() == "init".to_string().as_str()) { __result.push(a); } } __result }).first().cloned(); -let threaded_accum = match init_arg { - Some(ia) => { - let ia_val = arg_value(&ia); -match (*ia_val.expr_data.clone()).clone() { - ExprData::ExprVar { binding_kind: bk, .. } => { - let vn = expr_var_name_at(ia_val.clone(), si.clone()); -record_use(&recv_accum, &vn, EdgeKind::Threaded, "fold_init".to_string(), bk.clone(), ia_val.span.clone().start.clone()) -}, - _ => walk_expr(recv_accum, &ia_val, false, &si), -} -}, - None => recv_accum, -}; -let non_init = Rc::new({ let mut __result = Vec::new(); for a in mc_args.clone().iter().cloned() { if (authored_name_at(si.clone(), &a).as_str() != "init".to_string().as_str()) { __result.push(a); } } __result }); -let walked = non_init.iter().cloned().fold(threaded_accum.clone(), |acc: Rc, a: Rc| walk_expr(acc, &arg_value(&a), false, &si)); -Rc::new(UsageAccum { - bindings: walked.bindings.clone(), - fold_call_nodes: v2_rt::rc_list_push(walked.fold_call_nodes.clone(), texpr.clone()), -}) -} - } else { - { - let recv_accum = walk_expr(accum, &recv, false, &si); -mc_args.clone().iter().cloned().fold(recv_accum, |acc: Rc, a: Rc| walk_expr(acc, &arg_value(&a), false, &si)) -} - } -}, - ExprData::ExprMatch => { - let scrut = match_scrutinee(texpr.clone()); -let arm_nodes = match_arm_nodes(texpr.clone()); -let s_accum = walk_expr(accum, &scrut, false, &si); -let branch_accums = Rc::new({ let mut __result = Vec::new(); for arm_node in arm_nodes.iter().cloned() { __result.push(walk_expr(s_accum.clone(), &arm_body(&arm_node), in_tail.clone(), &si)); } __result }); -merge_branch_usages(&s_accum, &branch_accums) -}, - ExprData::ExprIf => { - let c = if_condition(texpr.clone()); -let t = if_then_branch(texpr.clone()); -let c_accum = walk_expr(accum, &c, false, &si); -let t_accum = walk_expr(c_accum.clone(), &t, in_tail.clone(), &si); -let e_accum = match if_else_branch(texpr.clone()) { - Some(eb) => walk_expr(c_accum.clone(), &eb, in_tail.clone(), &si), - None => c_accum.clone(), -}; -merge_branch_usages(&c_accum, &Rc::new(vec![t_accum, e_accum])) -}, - ExprData::ExprLet => { - let v = let_value(texpr.clone()); -let v_accum = walk_expr(accum, &v, false, &si); -match let_body(texpr.clone()) { - Some(b) => walk_expr(v_accum, &b, in_tail.clone(), &si), - None => v_accum, -} -}, - ExprData::ExprBlock => { - let ss = texpr.children.clone(); -let ss_count = (ss.clone().len() as i64); -if (ss_count.clone() == 0) { - accum - } else { - { - let init_accum = Rc::new({ let mut __result = Vec::new(); for p in Rc::new(ss.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (p.0.clone() < (ss_count.clone() - 1)) { __result.push(p); } } __result }).iter().cloned().fold(accum, |acc: Rc, p: (i64, Rc)| walk_expr(acc, &p.1.clone(), false, &si)); -match ss.clone().last().cloned() { - Some(last_expr) => walk_expr(init_accum, &last_expr, in_tail.clone(), &si), - None => init_accum, -} -} - } -}, - ExprData::ExprReturn => texpr.children.clone().iter().cloned().fold(accum, |acc: Rc, child: Rc| walk_expr(acc, &child, true, &si)), - ExprData::ExprLambda => { - let body = lambda_body(texpr.clone()); -let inner = walk_expr(empty_usage_accum(), &body, false, &si); -let binding_merged = Rc::new(v2_rt::map_values(&inner.bindings.clone())).iter().cloned().fold(accum, |acc: Rc, usage: Rc| { - let a1 = record_use(&acc, &usage.name.clone(), EdgeKind::Read, "lambda-capture".to_string(), None, 0); -record_use(&a1, &usage.name.clone(), EdgeKind::Read, "lambda-capture".to_string(), None, 0) -}); -Rc::new(UsageAccum { - bindings: binding_merged.bindings.clone(), - fold_call_nodes: v2_rt::concat(binding_merged.fold_call_nodes.clone(), inner.fold_call_nodes.clone()), -}) -}, - ExprData::ExprForEach => { - let coll = foreach_collection(texpr.clone()); -let coll_accum = walk_expr(accum, &coll, false, &si); -let body = foreach_body(texpr.clone()); -let inner = walk_expr(empty_usage_accum(), &body, false, &si); -let binding_merged = Rc::new(v2_rt::map_values(&inner.bindings.clone())).iter().cloned().fold(coll_accum.clone(), |acc: Rc, usage: Rc| { - let a1 = record_use(&acc, &usage.name.clone(), EdgeKind::Read, "foreach-capture".to_string(), None, 0); -record_use(&a1, &usage.name.clone(), EdgeKind::Read, "foreach-capture".to_string(), None, 0) -}); -Rc::new(UsageAccum { - bindings: binding_merged.bindings.clone(), - fold_call_nodes: v2_rt::concat(binding_merged.fold_call_nodes.clone(), inner.fold_call_nodes.clone()), -}) -}, - _ => texpr.children.clone().iter().cloned().fold(accum, |acc: Rc, child: Rc| walk_expr(acc, &child, false, &si)), -} + ExprData::ExprVar { + binding_kind: bk, .. + } => { + let n = expr_var_name_at(texpr.clone(), si.clone()); + if in_tail.clone() { + record_use( + &accum, + &n, + EdgeKind::Consumed, + "return".to_string(), + bk.clone(), + texpr.span.clone().start.clone(), + ) + } else { + record_use( + &accum, + &n, + EdgeKind::Read, + "read".to_string(), + bk.clone(), + texpr.span.clone().start.clone(), + ) + } + } + ExprData::ExprLiteral { .. } => accum, + ExprData::ExprFieldAccess { .. } => { + let base_node = field_access_base(texpr.clone()); + match (*base_node.expr_data.clone()).clone() { + ExprData::ExprVar { + binding_kind: bk, .. + } => { + let vn = expr_var_name_at(base_node.clone(), si.clone()); + let f = field_access_field_at(texpr.clone(), si.clone()); + record_use( + &accum, + &vn, + EdgeKind::Projected, + v2_rt::concat(".".to_string(), f), + bk.clone(), + texpr.span.clone().start.clone(), + ) + } + _ => walk_expr(accum, &base_node, false, &si), + } + } + ExprData::ExprCall { .. } => { + let fname = expr_call_func_at(texpr.clone(), si.clone()); + if (fname.as_str() == "fold".to_string().as_str()) { + { + let init_arg = Rc::new({ + let mut __result = Vec::new(); + for a in texpr.children.clone().iter().cloned() { + if (authored_name_at(si.clone(), &a).as_str() + == "init".to_string().as_str()) + { + __result.push(a); + } + } + __result + }) + .first() + .cloned(); + let threaded_accum = match init_arg { + Some(ia) => { + let ia_val = arg_value(&ia); + match (*ia_val.expr_data.clone()).clone() { + ExprData::ExprVar { + binding_kind: bk, .. + } => { + let vn = expr_var_name_at(ia_val.clone(), si.clone()); + record_use( + &accum, + &vn, + EdgeKind::Threaded, + "fold_init".to_string(), + bk.clone(), + ia_val.span.clone().start.clone(), + ) + } + _ => walk_expr(accum, &ia_val, false, &si), + } + } + None => accum, + }; + let non_init = Rc::new({ + let mut __result = Vec::new(); + for a in texpr.children.clone().iter().cloned() { + if (authored_name_at(si.clone(), &a).as_str() + != "init".to_string().as_str()) + { + __result.push(a); + } + } + __result + }); + non_init.iter().cloned().fold( + threaded_accum.clone(), + |acc: Rc, a: Rc| { + walk_expr(acc, &arg_value(&a), false, &si) + }, + ) + } + } else { + texpr.children.clone().iter().cloned().fold( + accum, + |acc: Rc, a: Rc| { + walk_expr(acc, &arg_value(&a), false, &si) + }, + ) + } + } + ExprData::ExprMethodCall { .. } => { + let recv = method_receiver(texpr.clone()); + let mc_args = method_arg_nodes(texpr.clone()); + let mname = expr_method_name_at(texpr.clone(), si.clone()); + if (mname.as_str() == "fold".to_string().as_str()) { + { + let recv_accum = walk_expr(accum, &recv, false, &si); + let init_arg = Rc::new({ + let mut __result = Vec::new(); + for a in mc_args.clone().iter().cloned() { + if (authored_name_at(si.clone(), &a).as_str() + == "init".to_string().as_str()) + { + __result.push(a); + } + } + __result + }) + .first() + .cloned(); + let threaded_accum = match init_arg { + Some(ia) => { + let ia_val = arg_value(&ia); + match (*ia_val.expr_data.clone()).clone() { + ExprData::ExprVar { + binding_kind: bk, .. + } => { + let vn = expr_var_name_at(ia_val.clone(), si.clone()); + record_use( + &recv_accum, + &vn, + EdgeKind::Threaded, + "fold_init".to_string(), + bk.clone(), + ia_val.span.clone().start.clone(), + ) + } + _ => walk_expr(recv_accum, &ia_val, false, &si), + } + } + None => recv_accum, + }; + let non_init = Rc::new({ + let mut __result = Vec::new(); + for a in mc_args.clone().iter().cloned() { + if (authored_name_at(si.clone(), &a).as_str() + != "init".to_string().as_str()) + { + __result.push(a); + } + } + __result + }); + let walked = non_init.iter().cloned().fold( + threaded_accum.clone(), + |acc: Rc, a: Rc| { + walk_expr(acc, &arg_value(&a), false, &si) + }, + ); + Rc::new(UsageAccum { + bindings: walked.bindings.clone(), + fold_call_nodes: v2_rt::rc_list_push( + walked.fold_call_nodes.clone(), + texpr.clone(), + ), + }) + } + } else { + { + let recv_accum = walk_expr(accum, &recv, false, &si); + mc_args.clone().iter().cloned().fold( + recv_accum, + |acc: Rc, a: Rc| { + walk_expr(acc, &arg_value(&a), false, &si) + }, + ) + } + } + } + ExprData::ExprMatch => { + let scrut = match_scrutinee(texpr.clone()); + let arm_nodes = match_arm_nodes(texpr.clone()); + let s_accum = walk_expr(accum, &scrut, false, &si); + let branch_accums = Rc::new({ + let mut __result = Vec::new(); + for arm_node in arm_nodes.iter().cloned() { + __result.push(walk_expr( + s_accum.clone(), + &arm_body(&arm_node), + in_tail.clone(), + &si, + )); + } + __result + }); + merge_branch_usages(&s_accum, &branch_accums) + } + ExprData::ExprIf => { + let c = if_condition(texpr.clone()); + let t = if_then_branch(texpr.clone()); + let c_accum = walk_expr(accum, &c, false, &si); + let t_accum = walk_expr(c_accum.clone(), &t, in_tail.clone(), &si); + let e_accum = match if_else_branch(texpr.clone()) { + Some(eb) => walk_expr(c_accum.clone(), &eb, in_tail.clone(), &si), + None => c_accum.clone(), + }; + merge_branch_usages(&c_accum, &Rc::new(vec![t_accum, e_accum])) + } + ExprData::ExprLet => { + let v = let_value(texpr.clone()); + let v_accum = walk_expr(accum, &v, false, &si); + match let_body(texpr.clone()) { + Some(b) => walk_expr(v_accum, &b, in_tail.clone(), &si), + None => v_accum, + } + } + ExprData::ExprBlock => { + let ss = texpr.children.clone(); + let ss_count = (ss.clone().len() as i64); + if (ss_count.clone() == 0) { + accum + } else { + { + let init_accum = Rc::new({ + let mut __result = Vec::new(); + for p in Rc::new( + ss.clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + if (p.0.clone() < (ss_count.clone() - 1)) { + __result.push(p); + } + } + __result + }) + .iter() + .cloned() + .fold( + accum, + |acc: Rc, p: (i64, Rc)| { + walk_expr(acc, &p.1.clone(), false, &si) + }, + ); + match ss.clone().last().cloned() { + Some(last_expr) => { + walk_expr(init_accum, &last_expr, in_tail.clone(), &si) + } + None => init_accum, + } + } + } + } + ExprData::ExprReturn => texpr + .children + .clone() + .iter() + .cloned() + .fold(accum, |acc: Rc, child: Rc| { + walk_expr(acc, &child, true, &si) + }), + ExprData::ExprLambda => { + let body = lambda_body(texpr.clone()); + let inner = walk_expr(empty_usage_accum(), &body, false, &si); + let binding_merged = Rc::new(v2_rt::map_values(&inner.bindings.clone())) + .iter() + .cloned() + .fold(accum, |acc: Rc, usage: Rc| { + let a1 = record_use( + &acc, + &usage.name.clone(), + EdgeKind::Read, + "lambda-capture".to_string(), + None, + 0, + ); + record_use( + &a1, + &usage.name.clone(), + EdgeKind::Read, + "lambda-capture".to_string(), + None, + 0, + ) + }); + Rc::new(UsageAccum { + bindings: binding_merged.bindings.clone(), + fold_call_nodes: v2_rt::concat( + binding_merged.fold_call_nodes.clone(), + inner.fold_call_nodes.clone(), + ), + }) + } + ExprData::ExprForEach => { + let coll = foreach_collection(texpr.clone()); + let coll_accum = walk_expr(accum, &coll, false, &si); + let body = foreach_body(texpr.clone()); + let inner = walk_expr(empty_usage_accum(), &body, false, &si); + let binding_merged = Rc::new(v2_rt::map_values(&inner.bindings.clone())) + .iter() + .cloned() + .fold( + coll_accum.clone(), + |acc: Rc, usage: Rc| { + let a1 = record_use( + &acc, + &usage.name.clone(), + EdgeKind::Read, + "foreach-capture".to_string(), + None, + 0, + ); + record_use( + &a1, + &usage.name.clone(), + EdgeKind::Read, + "foreach-capture".to_string(), + None, + 0, + ) + }, + ); + Rc::new(UsageAccum { + bindings: binding_merged.bindings.clone(), + fold_call_nodes: v2_rt::concat( + binding_merged.fold_call_nodes.clone(), + inner.fold_call_nodes.clone(), + ), + }) + } + _ => texpr + .children + .clone() + .iter() + .cloned() + .fold(accum, |acc: Rc, child: Rc| { + walk_expr(acc, &child, false, &si) + }), + } }) } pub fn make_decision(usage: &Rc) -> Rc { { let sc = semantic_consumer_count(usage.clone()); -if (sc.clone() == 1) { + if (sc.clone() == 1) { { - let consumed_sites = Rc::new({ let mut __result = Vec::new(); for c in usage.consumers.clone().iter().cloned() { if match c.kind.clone() { - EdgeKind::Consumed => true, - _ => false, -} { __result.push(c); } } __result }); -let site = match consumed_sites.first().cloned() { - Some(c) => c.site.clone(), - None => "unknown".to_string(), -}; -Rc::new(OwnershipDecision::SoleOwner { - binding: usage.name.clone(), - site: site, -}) -} + let consumed_sites = Rc::new({ + let mut __result = Vec::new(); + for c in usage.consumers.clone().iter().cloned() { + if match c.kind.clone() { + EdgeKind::Consumed => true, + _ => false, + } { + __result.push(c); + } + } + __result + }); + let site = match consumed_sites.first().cloned() { + Some(c) => c.site.clone(), + None => "unknown".to_string(), + }; + Rc::new(OwnershipDecision::SoleOwner { + binding: usage.name.clone(), + site: site, + }) + } } else { if (sc.clone() > 1) { { - let sites = Rc::new({ let mut __result = Vec::new(); for c in Rc::new({ let mut __result = Vec::new(); for c in usage.consumers.clone().iter().cloned() { if match c.kind.clone() { - EdgeKind::Consumed => true, - _ => false, -} { __result.push(c); } } __result }).iter().cloned() { __result.push(c.site.clone()); } __result }); -Rc::new(OwnershipDecision::SharedError { - binding: usage.name.clone(), - consumer_count: sc.clone(), - sites: sites, -}) -} + let sites = Rc::new({ + let mut __result = Vec::new(); + for c in Rc::new({ + let mut __result = Vec::new(); + for c in usage.consumers.clone().iter().cloned() { + if match c.kind.clone() { + EdgeKind::Consumed => true, + _ => false, + } { + __result.push(c); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(c.site.clone()); + } + __result + }); + Rc::new(OwnershipDecision::SharedError { + binding: usage.name.clone(), + consumer_count: sc.clone(), + sites: sites, + }) + } } else { Rc::new(OwnershipDecision::Unclassified { - binding: usage.name.clone(), - reason: "no consumers found".to_string(), -}) + binding: usage.name.clone(), + reason: "no consumers found".to_string(), + }) } } -} + } } pub fn is_owned_local(kind: Option>) -> bool { match kind.as_deref().cloned() { - Some(VarBindingKind::LocalValueBinding) => true, - _ => false, -} + Some(VarBindingKind::LocalValueBinding) => true, + _ => false, + } } -pub fn build_movable_set(proof: Rc) -> Rc> { - Rc::new({ let mut __result = Vec::new(); for usage in Rc::new(v2_rt::map_values(&proof.bindings.clone())).iter().cloned() { if ((binding_fan_out(usage.clone()) == 1) && is_owned_local(usage.binding_kind.clone())) { __result.push(usage); } } __result }).iter().cloned().fold(empty_set(), |acc: Rc>, usage: Rc| set_insert(acc, usage.name.clone())) +pub fn build_movable_set(proof: Rc) -> Rc> { + Rc::new({ + let mut __result = Vec::new(); + for usage in Rc::new(v2_rt::map_values(&proof.bindings.clone())) + .iter() + .cloned() + { + if ((binding_fan_out(usage.clone()) == 1) && is_owned_local(usage.binding_kind.clone())) + { + __result.push(usage); + } + } + __result + }) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, usage: Rc| { + v2_rt::rc_map_insert(acc, usage.name.clone(), true) + }, + ) } -pub fn build_read_only_params(proof: Rc, param_names: Rc>) -> Rc> { - Rc::new({ let mut __result = Vec::new(); for usage in Rc::new(v2_rt::map_values(&proof.bindings.clone())).iter().cloned() { if (((set_contains(param_names.clone(), usage.name.clone()) && is_owned_local(usage.binding_kind.clone())) && (binding_fan_out(usage.clone()) > 1)) && { let mut __all = true; for c in usage.consumers.clone().iter().cloned() { if !(match c.kind.clone() { - EdgeKind::Read => true, - EdgeKind::Projected => true, - EdgeKind::Threaded => true, - _ => false, -}) { __all = false; break; } } __all }) { __result.push(usage); } } __result }).iter().cloned().fold(empty_set(), |acc: Rc>, usage: Rc| set_insert(acc, usage.name.clone())) +pub fn build_read_only_params( + proof: Rc, + param_names: Rc>, +) -> Rc> { + Rc::new({ + let mut __result = Vec::new(); + for usage in Rc::new(v2_rt::map_values(&proof.bindings.clone())) + .iter() + .cloned() + { + if (((v2_rt::map_contains_key(¶m_names, usage.name.clone()) + && is_owned_local(usage.binding_kind.clone())) + && (binding_fan_out(usage.clone()) > 1)) + && { + let mut __all = true; + for c in usage.consumers.clone().iter().cloned() { + if !(match c.kind.clone() { + EdgeKind::Read => true, + EdgeKind::Projected => true, + EdgeKind::Threaded => true, + _ => false, + }) { + __all = false; + break; + } + } + __all + }) + { + __result.push(usage); + } + } + __result + }) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, usage: Rc| { + v2_rt::rc_map_insert(acc, usage.name.clone(), true) + }, + ) } -pub fn collect_callable_refs(texpr: &Rc, si: &Rc>>) -> Rc> { +pub fn collect_callable_refs( + texpr: &Rc, + si: &Rc>>, +) -> Rc> { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprVar { binding_kind: bk, .. } => match bk.clone().as_deref().cloned() { - Some(VarBindingKind::FunctionValueBinding) => { - let n = expr_var_name_at(texpr.clone(), si.clone()); -set_insert(empty_set(), n) -}, - _ => empty_set(), -}, - ExprData::ExprLiteral { .. } => empty_set(), - ExprData::ExprFieldAccess { .. } => collect_callable_refs(&field_access_base(texpr.clone()), &si), - ExprData::ExprCall { .. } => texpr.children.clone().iter().cloned().fold(empty_set(), |acc: Rc>, a: Rc| set_union(acc, collect_callable_refs(&arg_value(&a), &si))), - ExprData::ExprMethodCall { .. } => { - let recv = collect_callable_refs(&method_receiver(texpr.clone()), &si); -method_arg_nodes(texpr.clone()).iter().cloned().fold(recv.clone(), |acc: Rc>, a: Rc| set_union(acc, collect_callable_refs(&arg_value(&a), &si))) -}, - ExprData::ExprIf => { - let cond = collect_callable_refs(&if_condition(texpr.clone()), &si); -let then_br = collect_callable_refs(&if_then_branch(texpr.clone()), &si); -let else_br = match if_else_branch(texpr.clone()) { - Some(eb) => collect_callable_refs(&eb, &si), - None => empty_set(), -}; -set_union(set_union(cond, then_br), else_br) -}, - ExprData::ExprMatch => { - let scrut = collect_callable_refs(&match_scrutinee(texpr.clone()), &si); -match_arm_nodes(texpr.clone()).iter().cloned().fold(scrut.clone(), |acc: Rc>, arm: Rc| set_union(acc, collect_callable_refs(&arm_body(&arm), &si))) -}, - ExprData::ExprLet => { - let val = collect_callable_refs(&let_value(texpr.clone()), &si); -match let_body(texpr.clone()) { - Some(lb) => set_union(val, collect_callable_refs(&lb, &si)), - None => val, -} -}, - ExprData::ExprBlock => texpr.children.clone().iter().cloned().fold(empty_set(), |acc: Rc>, child: Rc| set_union(acc, collect_callable_refs(&child, &si))), - ExprData::ExprReturn => match texpr.children.clone().first().cloned() { - Some(child) => collect_callable_refs(&child, &si), - None => empty_set(), -}, - ExprData::ExprLambda => collect_callable_refs(&lambda_body(texpr.clone()), &si), - ExprData::ExprForEach => { - let col = collect_callable_refs(&foreach_collection(texpr.clone()), &si); -set_union(col, collect_callable_refs(&foreach_body(texpr.clone()), &si)) -}, - ExprData::ExprRecordLit { .. } => texpr.children.clone().iter().cloned().fold(empty_set(), |acc: Rc>, field: Rc| set_union(acc, collect_callable_refs(&arg_value(&field), &si))), - _ => empty_set(), -} + ExprData::ExprVar { + binding_kind: bk, .. + } => match bk.clone().as_deref().cloned() { + Some(VarBindingKind::FunctionValueBinding) => { + let n = expr_var_name_at(texpr.clone(), si.clone()); + v2_rt::rc_map_insert(v2_rt::rc_empty_map::(), n, true) + } + _ => v2_rt::rc_empty_map::(), + }, + ExprData::ExprLiteral { .. } => v2_rt::rc_empty_map::(), + ExprData::ExprFieldAccess { .. } => { + collect_callable_refs(&field_access_base(texpr.clone()), &si) + } + ExprData::ExprCall { .. } => texpr.children.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, a: Rc| { + v2_rt::rc_map_merge(acc, collect_callable_refs(&arg_value(&a), &si)) + }, + ), + ExprData::ExprMethodCall { .. } => { + let recv = collect_callable_refs(&method_receiver(texpr.clone()), &si); + method_arg_nodes(texpr.clone()).iter().cloned().fold( + recv.clone(), + |acc: Rc>, a: Rc| { + v2_rt::rc_map_merge(acc, collect_callable_refs(&arg_value(&a), &si)) + }, + ) + } + ExprData::ExprIf => { + let cond = collect_callable_refs(&if_condition(texpr.clone()), &si); + let then_br = collect_callable_refs(&if_then_branch(texpr.clone()), &si); + let else_br = match if_else_branch(texpr.clone()) { + Some(eb) => collect_callable_refs(&eb, &si), + None => v2_rt::rc_empty_map::(), + }; + v2_rt::rc_map_merge(v2_rt::rc_map_merge(cond, then_br), else_br) + } + ExprData::ExprMatch => { + let scrut = collect_callable_refs(&match_scrutinee(texpr.clone()), &si); + match_arm_nodes(texpr.clone()).iter().cloned().fold( + scrut.clone(), + |acc: Rc>, arm: Rc| { + v2_rt::rc_map_merge(acc, collect_callable_refs(&arm_body(&arm), &si)) + }, + ) + } + ExprData::ExprLet => { + let val = collect_callable_refs(&let_value(texpr.clone()), &si); + match let_body(texpr.clone()) { + Some(lb) => v2_rt::rc_map_merge(val, collect_callable_refs(&lb, &si)), + None => val, + } + } + ExprData::ExprBlock => texpr.children.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, child: Rc| { + v2_rt::rc_map_merge(acc, collect_callable_refs(&child, &si)) + }, + ), + ExprData::ExprReturn => match texpr.children.clone().first().cloned() { + Some(child) => collect_callable_refs(&child, &si), + None => v2_rt::rc_empty_map::(), + }, + ExprData::ExprLambda => collect_callable_refs(&lambda_body(texpr.clone()), &si), + ExprData::ExprForEach => { + let col = collect_callable_refs(&foreach_collection(texpr.clone()), &si); + v2_rt::rc_map_merge( + col, + collect_callable_refs(&foreach_body(texpr.clone()), &si), + ) + } + ExprData::ExprRecordLit { .. } => texpr.children.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, field: Rc| { + v2_rt::rc_map_merge(acc, collect_callable_refs(&arg_value(&field), &si)) + }, + ), + _ => v2_rt::rc_empty_map::(), + } }) } pub fn fold_terminal_expr(mut body: Rc) -> Rc { loop { match (*body.expr_data.clone()).clone() { - ExprData::ExprLet => { match let_body(body.clone()) { - Some(inner) => { { - let __tco_0 = inner.clone(); -body = __tco_0; -continue; -} }, - None => { break body.clone(); }, -} }, - ExprData::ExprBlock => { match body.children.clone().last().cloned() { - Some(last_child) => { { - let __tco_0 = last_child.clone(); -body = __tco_0; -continue; -} }, - None => { break body.clone(); }, -} }, - _ => { break body.clone(); }, -} -} + ExprData::ExprLet => match let_body(body.clone()) { + Some(inner) => { + let __tco_0 = inner.clone(); + body = __tco_0; + continue; + } + None => { + break body.clone(); + } + }, + ExprData::ExprBlock => match body.children.clone().last().cloned() { + Some(last_child) => { + let __tco_0 = last_child.clone(); + body = __tco_0; + continue; + } + None => { + break body.clone(); + } + }, + _ => { + break body.clone(); + } + } + } } pub fn empty_fold_acc_use_summary() -> Rc { Rc::new(FoldAccUseSummary { - whole_acc_uses: 0, - field_moves: Rc::new(vec![]), - nested_acc_refs: false, -}) + whole_acc_uses: 0, + field_moves: Rc::new(vec![]), + nested_acc_refs: false, + }) } -pub fn merge_fold_acc_use_summaries(left: &Rc, right: &Rc) -> Rc { +pub fn merge_fold_acc_use_summaries( + left: &Rc, + right: &Rc, +) -> Rc { Rc::new(FoldAccUseSummary { - whole_acc_uses: (left.whole_acc_uses.clone() + right.whole_acc_uses.clone()), - field_moves: v2_rt::concat(left.field_moves.clone(), right.field_moves.clone()), - nested_acc_refs: (left.nested_acc_refs.clone() || right.nested_acc_refs.clone()), -}) + whole_acc_uses: (left.whole_acc_uses.clone() + right.whole_acc_uses.clone()), + field_moves: v2_rt::concat(left.field_moves.clone(), right.field_moves.clone()), + nested_acc_refs: (left.nested_acc_refs.clone() || right.nested_acc_refs.clone()), + }) } -pub fn summarize_fold_acc_uses(node: &Rc, acc_name: &String, si: &Rc>>, inside_nested: bool) -> Rc { +pub fn summarize_fold_acc_uses( + node: &Rc, + acc_name: &String, + si: &Rc>>, + inside_nested: bool, +) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*node.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => if (expr_var_name_at(node.clone(), si.clone()).as_str() == acc_name.clone().as_str()) { - if inside_nested.clone() { - Rc::new(FoldAccUseSummary { - whole_acc_uses: 0, - field_moves: Rc::new(vec![]), - nested_acc_refs: true, -}) - } else { - Rc::new(FoldAccUseSummary { - whole_acc_uses: 1, - field_moves: Rc::new(vec![]), - nested_acc_refs: false, -}) + ExprData::ExprVar { .. } => { + if (expr_var_name_at(node.clone(), si.clone()).as_str() + == acc_name.clone().as_str()) + { + if inside_nested.clone() { + Rc::new(FoldAccUseSummary { + whole_acc_uses: 0, + field_moves: Rc::new(vec![]), + nested_acc_refs: true, + }) + } else { + Rc::new(FoldAccUseSummary { + whole_acc_uses: 1, + field_moves: Rc::new(vec![]), + nested_acc_refs: false, + }) + } + } else { + empty_fold_acc_use_summary() + } } - } else { - empty_fold_acc_use_summary() - }, - ExprData::ExprFieldAccess { .. } => { - let base = field_access_base(node.clone()); -let is_direct = match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => (expr_var_name_at(base.clone(), si.clone()).as_str() == acc_name.clone().as_str()), - _ => false, -}; -if is_direct { - if inside_nested.clone() { - Rc::new(FoldAccUseSummary { - whole_acc_uses: 0, - field_moves: Rc::new(vec![]), - nested_acc_refs: true, -}) + ExprData::ExprFieldAccess { .. } => { + let base = field_access_base(node.clone()); + let is_direct = match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + (expr_var_name_at(base.clone(), si.clone()).as_str() + == acc_name.clone().as_str()) + } + _ => false, + }; + if is_direct { + if inside_nested.clone() { + Rc::new(FoldAccUseSummary { + whole_acc_uses: 0, + field_moves: Rc::new(vec![]), + nested_acc_refs: true, + }) + } else { + Rc::new(FoldAccUseSummary { + whole_acc_uses: 0, + field_moves: Rc::new(vec![field_access_field_at( + node.clone(), + si.clone(), + )]), + nested_acc_refs: false, + }) + } } else { + node.children.clone().iter().cloned().fold( + empty_fold_acc_use_summary(), + |acc: Rc, child: Rc| { + merge_fold_acc_use_summaries( + &acc, + &summarize_fold_acc_uses( + &child, + &acc_name, + &si, + inside_nested.clone(), + ), + ) + }, + ) + } + } + ExprData::ExprLambda => { + let body_summary = + summarize_fold_acc_uses(&lambda_body(node.clone()), &acc_name, &si, true); + if (((body_summary.whole_acc_uses.clone() > 0) + || ((body_summary.field_moves.clone().len() as i64) > 0)) + || body_summary.nested_acc_refs.clone()) + { Rc::new(FoldAccUseSummary { - whole_acc_uses: 0, - field_moves: Rc::new(vec![field_access_field_at(node.clone(), si.clone())]), - nested_acc_refs: false, -}) + whole_acc_uses: 0, + field_moves: Rc::new(vec![]), + nested_acc_refs: true, + }) + } else { + empty_fold_acc_use_summary() } - } else { - node.children.clone().iter().cloned().fold(empty_fold_acc_use_summary(), |acc: Rc, child: Rc| merge_fold_acc_use_summaries(&acc, &summarize_fold_acc_uses(&child, &acc_name, &si, inside_nested.clone()))) - } -}, - ExprData::ExprLambda => { - let body_summary = summarize_fold_acc_uses(&lambda_body(node.clone()), &acc_name, &si, true); -if (((body_summary.whole_acc_uses.clone() > 0) || ((body_summary.field_moves.clone().len() as i64) > 0)) || body_summary.nested_acc_refs.clone()) { - Rc::new(FoldAccUseSummary { - whole_acc_uses: 0, - field_moves: Rc::new(vec![]), - nested_acc_refs: true, -}) - } else { - empty_fold_acc_use_summary() - } -}, - ExprData::ExprForEach => { - let coll_summary = summarize_fold_acc_uses(&foreach_collection(node.clone()), &acc_name, &si, inside_nested.clone()); -let body_summary = summarize_fold_acc_uses(&foreach_body(node.clone()), &acc_name, &si, true); -let nested_summary = if (((body_summary.whole_acc_uses.clone() > 0) || ((body_summary.field_moves.clone().len() as i64) > 0)) || body_summary.nested_acc_refs.clone()) { - Rc::new(FoldAccUseSummary { - whole_acc_uses: 0, - field_moves: Rc::new(vec![]), - nested_acc_refs: true, -}) - } else { - empty_fold_acc_use_summary() - }; -merge_fold_acc_use_summaries(&coll_summary, &nested_summary) -}, - _ => node.children.clone().iter().cloned().fold(empty_fold_acc_use_summary(), |acc: Rc, child: Rc| merge_fold_acc_use_summaries(&acc, &summarize_fold_acc_uses(&child, &acc_name, &si, inside_nested.clone()))), -} + } + ExprData::ExprForEach => { + let coll_summary = summarize_fold_acc_uses( + &foreach_collection(node.clone()), + &acc_name, + &si, + inside_nested.clone(), + ); + let body_summary = + summarize_fold_acc_uses(&foreach_body(node.clone()), &acc_name, &si, true); + let nested_summary = if (((body_summary.whole_acc_uses.clone() > 0) + || ((body_summary.field_moves.clone().len() as i64) > 0)) + || body_summary.nested_acc_refs.clone()) + { + Rc::new(FoldAccUseSummary { + whole_acc_uses: 0, + field_moves: Rc::new(vec![]), + nested_acc_refs: true, + }) + } else { + empty_fold_acc_use_summary() + }; + merge_fold_acc_use_summaries(&coll_summary, &nested_summary) + } + _ => node.children.clone().iter().cloned().fold( + empty_fold_acc_use_summary(), + |acc: Rc, child: Rc| { + merge_fold_acc_use_summaries( + &acc, + &summarize_fold_acc_uses(&child, &acc_name, &si, inside_nested.clone()), + ) + }, + ), + } }) } -pub fn fold_lambda_acc_use_summary(lambda_node: &Rc, acc_name: String, si: Rc>>) -> Rc { +pub fn fold_lambda_acc_use_summary( + lambda_node: &Rc, + acc_name: String, + si: Rc>>, +) -> Rc { match (*lambda_node.expr_data.clone()).clone() { - ExprData::ExprLambda => summarize_fold_acc_uses(&lambda_body(lambda_node.clone()), &acc_name, &si, false), - _ => empty_fold_acc_use_summary(), -} + ExprData::ExprLambda => { + summarize_fold_acc_uses(&lambda_body(lambda_node.clone()), &acc_name, &si, false) + } + _ => empty_fold_acc_use_summary(), + } } -pub fn fold_body_constructs_acc_struct(lambda_node: &Rc, acc_type_name: String, si: Rc>>) -> bool { +pub fn fold_body_constructs_acc_struct( + lambda_node: &Rc, + acc_type_name: String, + si: Rc>>, +) -> bool { match (*lambda_node.expr_data.clone()).clone() { - ExprData::ExprLambda => { - let body = lambda_body(lambda_node.clone()); -let terminal = fold_terminal_expr(body); -match (*terminal.expr_data.clone()).clone() { - ExprData::ExprRecordLit { .. } => (authored_name_at(si, &terminal).as_str() == acc_type_name.as_str()), - _ => false, -} -}, - _ => false, -} + ExprData::ExprLambda => { + let body = lambda_body(lambda_node.clone()); + let terminal = fold_terminal_expr(body); + match (*terminal.expr_data.clone()).clone() { + ExprData::ExprRecordLit { .. } => { + (authored_name_at(si, &terminal).as_str() == acc_type_name.as_str()) + } + _ => false, + } + } + _ => false, + } } -pub fn fold_body_safe_field_moves(lambda_node: Rc, acc_name: String, si: Rc>>) -> bool { +pub fn fold_body_safe_field_moves( + lambda_node: Rc, + acc_name: String, + si: Rc>>, +) -> bool { { let summary = fold_lambda_acc_use_summary(&lambda_node, acc_name, si); -let deduped = summary.field_moves.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |seen: Rc>, field: String| v2_rt::rc_map_insert(seen, field.clone(), true)); -((!summary.nested_acc_refs.clone() && (summary.whole_acc_uses.clone() == 0)) && ((Rc::new(v2_rt::map_keys(&deduped)).len() as i64) == (summary.field_moves.clone().len() as i64))) -} + let deduped = summary.field_moves.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |seen: Rc>, field: String| { + v2_rt::rc_map_insert(seen, field.clone(), true) + }, + ); + ((!summary.nested_acc_refs.clone() && (summary.whole_acc_uses.clone() == 0)) + && ((Rc::new(v2_rt::map_keys(&deduped)).len() as i64) + == (summary.field_moves.clone().len() as i64))) + } } -pub fn fold_body_consumes_acc_once(lambda_node: Rc, acc_name: String, si: Rc>>) -> bool { +pub fn fold_body_consumes_acc_once( + lambda_node: Rc, + acc_name: String, + si: Rc>>, +) -> bool { { let summary = fold_lambda_acc_use_summary(&lambda_node, acc_name, si); -((!summary.nested_acc_refs.clone() && (summary.whole_acc_uses.clone() == 1)) && ((summary.field_moves.clone().len() as i64) == 0)) -} + ((!summary.nested_acc_refs.clone() && (summary.whole_acc_uses.clone() == 1)) + && ((summary.field_moves.clone().len() as i64) == 0)) + } } -pub fn analyze_single_fold(method_call: &Rc, si: &Rc>>) -> Rc { +pub fn analyze_single_fold( + method_call: &Rc, + si: &Rc>>, +) -> Rc { { let args = method_arg_nodes(method_call.clone()); -let init_arg_node = match args.clone().first().cloned() { - Some(a) => arg_value(&a), - None => method_call.clone(), -}; -let fold_lambda_node = match args.clone().get(1 as usize).cloned() { - Some(a) => arg_value(&a), - None => method_call.clone(), -}; -let acc_param_name = match (*fold_lambda_node.expr_data.clone()).clone() { - ExprData::ExprLambda => match lambda_param_names_at(fold_lambda_node.clone(), si.clone()).first().cloned() { - Some(n) => n.clone(), - None => "".to_string(), -}, - _ => "".to_string(), -}; -let acc_type_name = match init_arg_node.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: type_node, .. }) => authored_name_at(si.clone(), &type_node), - _ => "".to_string(), -}; -let cond_required = match init_arg_node.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: type_node, .. }) => (type_node.return_cardinality.clone() == Cardinality::Required), - _ => false, -}; -let cond_struct = fold_body_constructs_acc_struct(&fold_lambda_node, acc_type_name.clone(), si.clone()); -let cond_whole_acc = fold_body_consumes_acc_once(fold_lambda_node.clone(), acc_param_name.clone(), si.clone()); -let cond_safe = fold_body_safe_field_moves(fold_lambda_node.clone(), acc_param_name.clone(), si.clone()); -let eligible = ((cond_required && (acc_type_name.clone().as_str() != "".to_string().as_str())) && ((cond_struct.clone() && cond_safe.clone()) || cond_whole_acc.clone())); -Rc::new(FoldAccUnwrapProof { - site_key: (method_call.span.clone().start.clone()).to_string(), - acc_param_name: acc_param_name.clone(), - acc_type_name: acc_type_name.clone(), - body_constructs_acc: cond_struct.clone(), - whole_acc_single_use: cond_whole_acc.clone(), - safe_field_moves: cond_safe.clone(), - eligible: eligible, -}) -} -} - -pub fn analyze_ownership(func_name: String, params: Rc>>, body: Rc, si: &Rc>>) -> Rc { - { - let initial = params.iter().cloned().fold(empty_usage_accum(), |acc: Rc, p: Rc| { let acc = Rc::try_unwrap(acc).unwrap_or_else(|rc| (*rc).clone()); { - let p_name = authored_name_at(si.clone(), &p); -Rc::new(UsageAccum { - bindings: v2_rt::rc_map_insert(acc.bindings, p_name.clone(), Rc::new(BindingUsage { - name: p_name.clone(), - binding_kind: None, - consumers: Rc::new(vec![]), -})), - fold_call_nodes: acc.fold_call_nodes, -}) -} }); -let result = walk_expr(initial, &body, true, &si); -let binding_list = Rc::new(v2_rt::map_values(&result.bindings.clone())); -let decisions = Rc::new({ let mut __result = Vec::new(); for usage in binding_list.iter().cloned() { __result.push(make_decision(&usage)); } __result }); -let fold_proofs = Rc::new({ let mut __result = Vec::new(); for n in result.fold_call_nodes.clone().iter().cloned() { __result.push(analyze_single_fold(&n, &si)); } __result }); -Rc::new(OwnershipProof { - func_name: func_name, - bindings: result.bindings.clone(), - decisions: decisions, - fold_acc_unwrap: fold_proofs, -}) + let init_arg_node = match args.clone().first().cloned() { + Some(a) => arg_value(&a), + None => method_call.clone(), + }; + let fold_lambda_node = match args.clone().get(1 as usize).cloned() { + Some(a) => arg_value(&a), + None => method_call.clone(), + }; + let acc_param_name = match (*fold_lambda_node.expr_data.clone()).clone() { + ExprData::ExprLambda => { + match lambda_param_names_at(fold_lambda_node.clone(), si.clone()) + .first() + .cloned() + { + Some(n) => n.clone(), + None => "".to_string(), + } + } + _ => "".to_string(), + }; + let acc_type_name = match init_arg_node.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { + node: type_node, .. + }) => authored_name_at(si.clone(), &type_node), + _ => "".to_string(), + }; + let cond_required = match init_arg_node.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { + node: type_node, .. + }) => (type_node.return_cardinality.clone() == Cardinality::Required), + _ => false, + }; + let cond_struct = + fold_body_constructs_acc_struct(&fold_lambda_node, acc_type_name.clone(), si.clone()); + let cond_whole_acc = fold_body_consumes_acc_once( + fold_lambda_node.clone(), + acc_param_name.clone(), + si.clone(), + ); + let cond_safe = fold_body_safe_field_moves( + fold_lambda_node.clone(), + acc_param_name.clone(), + si.clone(), + ); + let eligible = ((cond_required + && (acc_type_name.clone().as_str() != "".to_string().as_str())) + && ((cond_struct.clone() && cond_safe.clone()) || cond_whole_acc.clone())); + Rc::new(FoldAccUnwrapProof { + site_key: (method_call.span.clone().start.clone()).to_string(), + acc_param_name: acc_param_name.clone(), + acc_type_name: acc_type_name.clone(), + body_constructs_acc: cond_struct.clone(), + whole_acc_single_use: cond_whole_acc.clone(), + safe_field_moves: cond_safe.clone(), + eligible: eligible, + }) + } } + +pub fn analyze_ownership( + func_name: String, + params: Rc>>, + body: Rc, + si: &Rc>>, +) -> Rc { + { + let initial = + params + .iter() + .cloned() + .fold(empty_usage_accum(), |acc: Rc, p: Rc| { + let acc = Rc::try_unwrap(acc).unwrap_or_else(|rc| (*rc).clone()); + { + let p_name = authored_name_at(si.clone(), &p); + Rc::new(UsageAccum { + bindings: v2_rt::rc_map_insert( + acc.bindings, + p_name.clone(), + Rc::new(BindingUsage { + name: p_name.clone(), + binding_kind: None, + consumers: Rc::new(vec![]), + }), + ), + fold_call_nodes: acc.fold_call_nodes, + }) + } + }); + let result = walk_expr(initial, &body, true, &si); + let binding_list = Rc::new(v2_rt::map_values(&result.bindings.clone())); + let decisions = Rc::new({ + let mut __result = Vec::new(); + for usage in binding_list.iter().cloned() { + __result.push(make_decision(&usage)); + } + __result + }); + let fold_proofs = Rc::new({ + let mut __result = Vec::new(); + for n in result.fold_call_nodes.clone().iter().cloned() { + __result.push(analyze_single_fold(&n, &si)); + } + __result + }); + Rc::new(OwnershipProof { + func_name: func_name, + bindings: result.bindings.clone(), + decisions: decisions, + fold_acc_unwrap: fold_proofs, + }) + } } diff --git a/src/v2/stage0/src/v2_compiler_parse.rs b/src/v2/stage0/src/v2_compiler_parse.rs index 7c21933f300..f70bb1e0fd1 100644 --- a/src/v2/stage0/src/v2_compiler_parse.rs +++ b/src/v2/stage0/src/v2_compiler_parse.rs @@ -1,35 +1,68 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.parse -use std::collections::HashMap; -use std::rc::Rc; -use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::v2_std_core::{module_node, import_node, Node, InferredNode, Connective, is_container_type, Cardinality, make_param_node, param_node_type_expr, param_node_default_value, make_field_node, field_node_name_at, field_node_type_expr, field_node_cardinality, field_node_default_value, field_node_from_key, make_variant_node, variant_node_name_at, variant_node_fields, leaf_node_with_span, ExprData, make_expr_node, make_named_expr_node, make_expr_error_node, expr_var_name_at, field_access_field_at, expr_call_func_at, make_arg_node, arg_name_at, arg_value, make_arm_node, make_field_init_node, make_resource_use_node, make_text_part_node, make_interp_part_node, MatchPattern, make_field_binding_node, field_binding_pattern, LiteralValue, ExprErrorKind, BinOp, UnaryOpKind, StringPart, local_transport_node, rest_transport_node, shell_transport_node, file_transport_node, transport_url_key, transport_path_key, transport_method_key, transport_path_template_key, transport_query_key, transport_body_key, transport_stdin_key, transport_response_format_key, transport_headers_key, service_config_properties, OperationModifier, Token, TokenShape, SourceSpan, make_span, ErrorNode, make_error_node, with_required_cardinality, error_type, is_compiler_error, node_name_span, no_span, NewlineIndex, authored_name_at, InternTable, InternResult, empty_intern_table, intern, pre_intern_tokens, CompilerDiagnostic}; -use crate::v2_std_core::InferredNode::{Resolved, CompilerError, TypeVariable}; -use crate::v2_std_core::Connective::{Conj, Disj, NoConnective, Arrow}; -use crate::v2_std_core::Cardinality::{Required, CardOptional}; -use crate::v2_std_core::ExprData::{NoExprData, ExprLiteral, ExprVar, ExprFieldAccess, ExprCall, ExprMethodCall, ExprMatch, ExprIf, ExprLet, ExprRecordLit, ExprListLit, ExprBinOp, ExprUnaryOp, ExprLambda, ExprStringInterp, ExprBlock, ExprCast, ExprForEach, ExprIndex, ExprSlice, ExprReturn}; -use crate::v2_std_core::MatchPattern::{Bind, LitPattern, VariantPattern, Wildcard}; -use crate::v2_std_core::LiteralValue::{LitStr, LitInt, LitFloat, LitBool, LitNull}; -use crate::v2_std_core::ExprErrorKind::{ParseRecoveryError}; -use crate::v2_std_core::BinOp::{Add, Sub, Mul, Div, Mod, Eq, Ne, Lt, Gt, Le, Ge, And, Or, NullCoalesce}; -use crate::v2_std_core::UnaryOpKind::{Not, Neg}; -use crate::v2_std_core::StringPart::{Text, Interpolation}; -use crate::v2_std_core::OperationModifier::{Idempotent, Readonly, Hermetic}; -use crate::v2_std_core::TokenShape::{ShKeyword, ShLBrace, ShRBrace, ShLParen, ShRParen, ShLBracket, ShRBracket, ShLt, ShGt, ShLe, ShGe, ShFatArrow, ShArrow, ShColon, ShComma, ShDot, ShDotDot, ShEq, ShEqEq, ShNe, ShPlus, ShMinus, ShStar, ShSlash, ShPercent, ShBang, ShAnd, ShOr, ShQuestion, ShNullCoalesce, ShPipe, ShPipeArrow, ShLitStr, ShLitInt, ShLitFloat, ShIdent, ShStrBegin, ShStrMid, ShStrEnd, ShNewline, ShEof, ShUnknown}; -use crate::v2_std_core::CompilerDiagnostic::{ParseError}; -pub use crate::v2_compiler_languages::{ItemForm, ItemFormKind, BodyKind, OperatorSpec, SyntaxSpec}; -use crate::v2_compiler_languages::ItemFormKind::{OtherForm}; -use crate::v2_compiler_languages::BodyKind::{ExprBody, BlockBody, TypeBody, ValueBody, NoBody, ServiceBody, ResourceBody}; -pub use crate::extdeps_languages_dag_syntax::{dag_syntax_spec, dag_non_name_keywords}; use self::AdvanceResult::*; use self::EatResult::*; use self::ExpectedToken::*; -use self::ParserHelperIdentity::*; use self::ParserCallIdentity::*; +use self::ParserHelperIdentity::*; use self::ParserResultWitness::*; +pub use crate::extdeps_languages_dag_syntax::{dag_non_name_keywords, dag_syntax_spec}; +use crate::v2_compiler_languages::BodyKind::{ + BlockBody, ExprBody, NoBody, ResourceBody, ServiceBody, TypeBody, ValueBody, +}; +use crate::v2_compiler_languages::ItemFormKind::OtherForm; +pub use crate::v2_compiler_languages::{ + BodyKind, ItemForm, ItemFormKind, OperatorSpec, SyntaxSpec, +}; +use crate::v2_rt; +use crate::v2_std_core::BinOp::{ + Add, And, Div, Eq, Ge, Gt, Le, Lt, Mod, Mul, Ne, NullCoalesce, Or, Sub, +}; +use crate::v2_std_core::Cardinality::{CardOptional, Required}; +use crate::v2_std_core::CompilerDiagnostic::ParseError; +use crate::v2_std_core::Connective::{Arrow, Conj, Disj, NoConnective}; +use crate::v2_std_core::ExprData::{ + ExprBinOp, ExprBlock, ExprCall, ExprCast, ExprFieldAccess, ExprForEach, ExprIf, ExprIndex, + ExprLambda, ExprLet, ExprListLit, ExprLiteral, ExprMatch, ExprMethodCall, ExprRecordLit, + ExprReturn, ExprSlice, ExprStringInterp, ExprUnaryOp, ExprVar, NoExprData, +}; +use crate::v2_std_core::ExprErrorKind::ParseRecoveryError; +use crate::v2_std_core::InferredNode::{CompilerError, Resolved, TypeVariable}; +use crate::v2_std_core::LiteralValue::{LitBool, LitFloat, LitInt, LitNull, LitStr}; +use crate::v2_std_core::MatchPattern::{Bind, LitPattern, VariantPattern, Wildcard}; +use crate::v2_std_core::OperationModifier::{Hermetic, Idempotent, Readonly}; +use crate::v2_std_core::StringPart::{Interpolation, Text}; +use crate::v2_std_core::TokenShape::{ + ShAnd, ShArrow, ShBang, ShColon, ShComma, ShDot, ShDotDot, ShEof, ShEq, ShEqEq, ShFatArrow, + ShGe, ShGt, ShIdent, ShKeyword, ShLBrace, ShLBracket, ShLParen, ShLe, ShLitFloat, ShLitInt, + ShLitStr, ShLt, ShMinus, ShNe, ShNewline, ShNullCoalesce, ShOr, ShPercent, ShPipe, ShPipeArrow, + ShPlus, ShQuestion, ShRBrace, ShRBracket, ShRParen, ShSlash, ShStar, ShStrBegin, ShStrEnd, + ShStrMid, ShUnknown, +}; +use crate::v2_std_core::UnaryOpKind::{Neg, Not}; +pub use crate::v2_std_core::{ + arg_name_at, arg_value, authored_name_at, empty_intern_table, error_type, expr_call_func_at, + expr_var_name_at, field_access_field_at, field_binding_pattern, field_node_cardinality, + field_node_default_value, field_node_from_key, field_node_name_at, field_node_type_expr, + file_transport_node, import_node, intern, is_compiler_error, is_container_type, + leaf_node_with_span, local_transport_node, make_arg_node, make_arm_node, make_error_node, + make_expr_error_node, make_expr_node, make_field_binding_node, make_field_init_node, + make_field_node, make_interp_part_node, make_named_expr_node, make_param_node, + make_resource_use_node, make_span, make_text_part_node, make_variant_node, module_node, + no_span, node_name_span, param_node_default_value, param_node_type_expr, pre_intern_tokens, + rest_transport_node, service_config_properties, shell_transport_node, transport_body_key, + transport_headers_key, transport_method_key, transport_path_key, transport_path_template_key, + transport_query_key, transport_response_format_key, transport_stdin_key, transport_url_key, + variant_node_fields, variant_node_name_at, with_required_cardinality, BinOp, Cardinality, + CompilerDiagnostic, Connective, ErrorNode, ExprData, ExprErrorKind, InferredNode, InternResult, + InternTable, LiteralValue, MatchPattern, NewlineIndex, Node, OperationModifier, SourceSpan, + StringPart, Token, TokenShape, UnaryOpKind, +}; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct ParseContext { @@ -284,9 +317,7 @@ pub struct BindingPower { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum ExpectedToken { - ExpectKeyword { - text: String, - }, + ExpectKeyword { text: String }, ExpectLBrace, ExpectRBrace, ExpectLParen, @@ -644,12 +675,8 @@ pub enum ParserHelperIdentity { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum ParserCallIdentity { - ParserCallHelper { - helper: ParserHelperIdentity, - }, - ParserCallFunction { - name: String, - }, + ParserCallHelper { helper: ParserHelperIdentity }, + ParserCallFunction { name: String }, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -658,9 +685,7 @@ pub enum ParserResultWitness { ParserWitnessAdvance, ParserWitnessExpect, ParserWitnessEat, - ParserWitnessCall { - callee: Rc, - }, + ParserWitnessCall { callee: Rc }, ParserWitnessOpaque, } impl ParserResultWitness { @@ -683,424 +708,482 @@ pub struct DescResult { pub fn token_span(tok: Option>) -> Rc { match tok { - Some(t) => t.span.clone(), - None => make_span(0, 0), -} + Some(t) => t.span.clone(), + None => make_span(0, 0), + } } pub fn advance(tokens: &Rc>>) -> Rc { match tokens.clone().first().cloned() { - Some(t) => Rc::new(AdvanceResult::AdvanceOk { - token: t.clone(), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), -}), - None => Rc::new(AdvanceResult::AdvanceEof), -} + Some(t) => Rc::new(AdvanceResult::AdvanceOk { + token: t.clone(), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + }), + None => Rc::new(AdvanceResult::AdvanceEof), + } } pub fn parse_error(msg: String, span: Rc) -> Rc { - make_error_node(Rc::new(CompilerDiagnostic::ParseError { - message: msg, - span: span, -}), "".to_string()) + make_error_node( + Rc::new(CompilerDiagnostic::ParseError { + message: msg, + span: span, + }), + "".to_string(), + ) } pub fn has_err(err: Option>) -> bool { match err { - Some(_) => true, - None => false, -} + Some(_) => true, + None => false, + } } pub fn parse_string_literal_value(tokens: &Rc>>) -> Rc { { let tok = tokens.clone().first().cloned(); -match tok.clone() { - Some(t) => match t.shape.clone() { - TokenShape::ShLitStr => Rc::new(StringLitResult { - value: t.text.clone(), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - err: None, -}), - _ => Rc::new(StringLitResult { - value: "".to_string(), - tokens: tokens.clone(), - err: Some(parse_error("expected string literal".to_string(), token_span(tok.clone()))), -}), -}, - None => Rc::new(StringLitResult { - value: "".to_string(), - tokens: tokens.clone(), - err: Some(parse_error("expected string literal".to_string(), make_span(0, 0))), -}), -} -} + match tok.clone() { + Some(t) => match t.shape.clone() { + TokenShape::ShLitStr => Rc::new(StringLitResult { + value: t.text.clone(), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + err: None, + }), + _ => Rc::new(StringLitResult { + value: "".to_string(), + tokens: tokens.clone(), + err: Some(parse_error( + "expected string literal".to_string(), + token_span(tok.clone()), + )), + }), + }, + None => Rc::new(StringLitResult { + value: "".to_string(), + tokens: tokens.clone(), + err: Some(parse_error( + "expected string literal".to_string(), + make_span(0, 0), + )), + }), + } + } } pub fn parse_int_literal_value(tokens: &Rc>>) -> Rc { { let tok = tokens.clone().first().cloned(); -match tok.clone() { - Some(t) => match t.shape.clone() { - TokenShape::ShLitInt => { - let n_opt = v2_rt::parse_int(t.text.clone()); -match n_opt { - Some(n) => Rc::new(IntLitResult { - value: n.clone(), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - err: None, -}), - None => Rc::new(IntLitResult { - value: 0, - tokens: tokens.clone(), - err: Some(parse_error(v2_rt::concat(v2_rt::concat("internal: ShLitInt token text not parseable as int: '".to_string(), t.text.clone()), "'".to_string()), token_span(tok.clone()))), -}), -} -}, - _ => Rc::new(IntLitResult { - value: 0, - tokens: tokens.clone(), - err: Some(parse_error("expected integer literal".to_string(), token_span(tok.clone()))), -}), -}, - None => Rc::new(IntLitResult { - value: 0, - tokens: tokens.clone(), - err: Some(parse_error("expected integer literal".to_string(), make_span(0, 0))), -}), -} -} + match tok.clone() { + Some(t) => match t.shape.clone() { + TokenShape::ShLitInt => { + let n_opt = v2_rt::parse_int(t.text.clone()); + match n_opt { + Some(n) => Rc::new(IntLitResult { + value: n.clone(), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + err: None, + }), + None => Rc::new(IntLitResult { + value: 0, + tokens: tokens.clone(), + err: Some(parse_error( + v2_rt::concat( + v2_rt::concat( + "internal: ShLitInt token text not parseable as int: '" + .to_string(), + t.text.clone(), + ), + "'".to_string(), + ), + token_span(tok.clone()), + )), + }), + } + } + _ => Rc::new(IntLitResult { + value: 0, + tokens: tokens.clone(), + err: Some(parse_error( + "expected integer literal".to_string(), + token_span(tok.clone()), + )), + }), + }, + None => Rc::new(IntLitResult { + value: 0, + tokens: tokens.clone(), + err: Some(parse_error( + "expected integer literal".to_string(), + make_span(0, 0), + )), + }), + } + } } pub fn is_ident_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShIdent => true, - _ => false, -} + TokenShape::ShIdent => true, + _ => false, + } } pub fn is_lit_str_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShLitStr => true, - _ => false, -} + TokenShape::ShLitStr => true, + _ => false, + } } pub fn is_lit_int_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShLitInt => true, - _ => false, -} + TokenShape::ShLitInt => true, + _ => false, + } } pub fn is_lit_float_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShLitFloat => true, - _ => false, -} + TokenShape::ShLitFloat => true, + _ => false, + } } pub fn is_str_begin_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShStrBegin => true, - _ => false, -} + TokenShape::ShStrBegin => true, + _ => false, + } } pub fn is_str_mid_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShStrMid => true, - _ => false, -} + TokenShape::ShStrMid => true, + _ => false, + } } pub fn is_str_end_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShStrEnd => true, - _ => false, -} + TokenShape::ShStrEnd => true, + _ => false, + } } pub fn is_unknown_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShUnknown => true, - _ => false, -} + TokenShape::ShUnknown => true, + _ => false, + } } pub fn is_newline_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShNewline => true, - _ => false, -} + TokenShape::ShNewline => true, + _ => false, + } } pub fn is_eof_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShEof => true, - _ => false, -} + TokenShape::ShEof => true, + _ => false, + } } pub fn is_keyword_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShKeyword => true, - _ => false, -} + TokenShape::ShKeyword => true, + _ => false, + } } pub fn is_lbrace_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShLBrace => true, - _ => false, -} + TokenShape::ShLBrace => true, + _ => false, + } } pub fn is_rbrace_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShRBrace => true, - _ => false, -} + TokenShape::ShRBrace => true, + _ => false, + } } pub fn is_lparen_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShLParen => true, - _ => false, -} + TokenShape::ShLParen => true, + _ => false, + } } pub fn is_rparen_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShRParen => true, - _ => false, -} + TokenShape::ShRParen => true, + _ => false, + } } pub fn is_lbracket_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShLBracket => true, - _ => false, -} + TokenShape::ShLBracket => true, + _ => false, + } } pub fn is_rbracket_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShRBracket => true, - _ => false, -} + TokenShape::ShRBracket => true, + _ => false, + } } pub fn is_lt_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShLt => true, - _ => false, -} + TokenShape::ShLt => true, + _ => false, + } } pub fn is_gt_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShGt => true, - _ => false, -} + TokenShape::ShGt => true, + _ => false, + } } pub fn is_le_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShLe => true, - _ => false, -} + TokenShape::ShLe => true, + _ => false, + } } pub fn is_ge_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShGe => true, - _ => false, -} + TokenShape::ShGe => true, + _ => false, + } } pub fn is_fat_arrow_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShFatArrow => true, - _ => false, -} + TokenShape::ShFatArrow => true, + _ => false, + } } pub fn is_arrow_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShArrow => true, - _ => false, -} + TokenShape::ShArrow => true, + _ => false, + } } pub fn is_colon_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShColon => true, - _ => false, -} + TokenShape::ShColon => true, + _ => false, + } } pub fn is_comma_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShComma => true, - _ => false, -} + TokenShape::ShComma => true, + _ => false, + } } pub fn is_dot_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShDot => true, - _ => false, -} + TokenShape::ShDot => true, + _ => false, + } } pub fn is_dot_dot_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShDotDot => true, - _ => false, -} + TokenShape::ShDotDot => true, + _ => false, + } } pub fn is_eq_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShEq => true, - _ => false, -} + TokenShape::ShEq => true, + _ => false, + } } pub fn is_eq_eq_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShEqEq => true, - _ => false, -} + TokenShape::ShEqEq => true, + _ => false, + } } pub fn is_ne_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShNe => true, - _ => false, -} + TokenShape::ShNe => true, + _ => false, + } } pub fn is_plus_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShPlus => true, - _ => false, -} + TokenShape::ShPlus => true, + _ => false, + } } pub fn is_minus_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShMinus => true, - _ => false, -} + TokenShape::ShMinus => true, + _ => false, + } } pub fn is_star_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShStar => true, - _ => false, -} + TokenShape::ShStar => true, + _ => false, + } } pub fn is_slash_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShSlash => true, - _ => false, -} + TokenShape::ShSlash => true, + _ => false, + } } pub fn is_percent_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShPercent => true, - _ => false, -} + TokenShape::ShPercent => true, + _ => false, + } } pub fn is_bang_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShBang => true, - _ => false, -} + TokenShape::ShBang => true, + _ => false, + } } pub fn is_and_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShAnd => true, - _ => false, -} + TokenShape::ShAnd => true, + _ => false, + } } pub fn is_or_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShOr => true, - _ => false, -} + TokenShape::ShOr => true, + _ => false, + } } pub fn is_question_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShQuestion => true, - _ => false, -} + TokenShape::ShQuestion => true, + _ => false, + } } pub fn is_null_coalesce_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShNullCoalesce => true, - _ => false, -} + TokenShape::ShNullCoalesce => true, + _ => false, + } } pub fn is_pipe_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShPipe => true, - _ => false, -} + TokenShape::ShPipe => true, + _ => false, + } } pub fn is_pipe_arrow_shape(shape: TokenShape) -> bool { match shape { - TokenShape::ShPipeArrow => true, - _ => false, -} + TokenShape::ShPipeArrow => true, + _ => false, + } } pub fn tok_is_keyword(tok: Option>, kw: String) -> bool { match tok { - Some(t) => (is_keyword_shape(t.shape.clone()) && (t.text.clone().as_str() == kw.as_str())), - None => false, -} + Some(t) => (is_keyword_shape(t.shape.clone()) && (t.text.clone().as_str() == kw.as_str())), + None => false, + } } pub fn tok_keyword_text(tok: Option>) -> String { match tok { - Some(t) => if is_keyword_shape(t.shape.clone()) { - t.text.clone() - } else { - "".to_string() - }, - None => "".to_string(), -} + Some(t) => { + if is_keyword_shape(t.shape.clone()) { + t.text.clone() + } else { + "".to_string() + } + } + None => "".to_string(), + } } pub fn tok_is_ident(tok: Option>) -> bool { match tok { - Some(t) => is_ident_shape(t.shape.clone()), - None => false, -} + Some(t) => is_ident_shape(t.shape.clone()), + None => false, + } } pub fn tok_is_ident_text(tok: Option>, text: String) -> bool { match tok { - Some(t) => (is_ident_shape(t.shape.clone()) && (t.text.clone().as_str() == text.as_str())), - None => false, -} + Some(t) => (is_ident_shape(t.shape.clone()) && (t.text.clone().as_str() == text.as_str())), + None => false, + } } -pub fn drop_leading_type_modifier(tokens: &Rc>>, modifier: String) -> Rc>> { +pub fn drop_leading_type_modifier( + tokens: &Rc>>, + modifier: String, +) -> Rc>> { if tok_is_ident_text(tokens.clone().first().cloned(), modifier) { - skip_newlines(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>())) + skip_newlines(Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + )) } else { tokens.clone() } @@ -1112,226 +1195,231 @@ pub fn type_body_tokens_after_modifiers(tokens: Rc>>) -> Rc>) -> bool { match tok { - Some(t) => is_newline_shape(t.shape.clone()), - None => false, -} + Some(t) => is_newline_shape(t.shape.clone()), + None => false, + } } pub fn tok_is_eof(tok: Option>) -> bool { match tok { - Some(t) => is_eof_shape(t.shape.clone()), - None => true, -} + Some(t) => is_eof_shape(t.shape.clone()), + None => true, + } } pub fn tok_is_lit_str(tok: Option>) -> bool { match tok { - Some(t) => is_lit_str_shape(t.shape.clone()), - None => false, -} + Some(t) => is_lit_str_shape(t.shape.clone()), + None => false, + } } pub fn tok_is_lbrace(tok: Option>) -> bool { match tok { - Some(t) => is_lbrace_shape(t.shape.clone()), - None => false, -} + Some(t) => is_lbrace_shape(t.shape.clone()), + None => false, + } } pub fn tok_is_rbrace(tok: Option>) -> bool { match tok { - Some(t) => is_rbrace_shape(t.shape.clone()), - None => false, -} + Some(t) => is_rbrace_shape(t.shape.clone()), + None => false, + } } pub fn tok_is_lparen(tok: Option>) -> bool { match tok { - Some(t) => is_lparen_shape(t.shape.clone()), - None => false, -} + Some(t) => is_lparen_shape(t.shape.clone()), + None => false, + } } pub fn tok_is_rparen(tok: Option>) -> bool { match tok { - Some(t) => is_rparen_shape(t.shape.clone()), - None => false, -} + Some(t) => is_rparen_shape(t.shape.clone()), + None => false, + } } pub fn tok_is_lbracket(tok: Option>) -> bool { match tok { - Some(t) => is_lbracket_shape(t.shape.clone()), - None => false, -} + Some(t) => is_lbracket_shape(t.shape.clone()), + None => false, + } } pub fn tok_is_rbracket(tok: Option>) -> bool { match tok { - Some(t) => is_rbracket_shape(t.shape.clone()), - None => false, -} + Some(t) => is_rbracket_shape(t.shape.clone()), + None => false, + } } pub fn tok_is_colon(tok: Option>) -> bool { match tok { - Some(t) => is_colon_shape(t.shape.clone()), - None => false, -} + Some(t) => is_colon_shape(t.shape.clone()), + None => false, + } } pub fn tok_is_comma(tok: Option>) -> bool { match tok { - Some(t) => is_comma_shape(t.shape.clone()), - None => false, -} + Some(t) => is_comma_shape(t.shape.clone()), + None => false, + } } pub fn tok_is_dot(tok: Option>) -> bool { match tok { - Some(t) => is_dot_shape(t.shape.clone()), - None => false, -} + Some(t) => is_dot_shape(t.shape.clone()), + None => false, + } } pub fn tok_is_dot_dot(tok: Option>) -> bool { match tok { - Some(t) => is_dot_dot_shape(t.shape.clone()), - None => false, -} + Some(t) => is_dot_dot_shape(t.shape.clone()), + None => false, + } } pub fn tok_is_eq(tok: Option>) -> bool { match tok { - Some(t) => is_eq_shape(t.shape.clone()), - None => false, -} + Some(t) => is_eq_shape(t.shape.clone()), + None => false, + } } pub fn tok_is_fat_arrow(tok: Option>) -> bool { match tok { - Some(t) => is_fat_arrow_shape(t.shape.clone()), - None => false, -} + Some(t) => is_fat_arrow_shape(t.shape.clone()), + None => false, + } } pub fn tok_is_arrow(tok: Option>) -> bool { match tok { - Some(t) => is_arrow_shape(t.shape.clone()), - None => false, -} + Some(t) => is_arrow_shape(t.shape.clone()), + None => false, + } } pub fn tok_is_lt(tok: Option>) -> bool { match tok { - Some(t) => is_lt_shape(t.shape.clone()), - None => false, -} + Some(t) => is_lt_shape(t.shape.clone()), + None => false, + } } pub fn tok_is_gt(tok: Option>) -> bool { match tok { - Some(t) => is_gt_shape(t.shape.clone()), - None => false, -} + Some(t) => is_gt_shape(t.shape.clone()), + None => false, + } } pub fn tok_is_pipe(tok: Option>) -> bool { match tok { - Some(t) => is_pipe_shape(t.shape.clone()), - None => false, -} + Some(t) => is_pipe_shape(t.shape.clone()), + None => false, + } } pub fn tok_is_pipe_arrow(tok: Option>) -> bool { match tok { - Some(t) => is_pipe_arrow_shape(t.shape.clone()), - None => false, -} + Some(t) => is_pipe_arrow_shape(t.shape.clone()), + None => false, + } } pub fn tok_is_question(tok: Option>) -> bool { match tok { - Some(t) => is_question_shape(t.shape.clone()), - None => false, -} + Some(t) => is_question_shape(t.shape.clone()), + None => false, + } } pub fn tok_span(tok: Option>) -> Rc { match tok { - Some(t) => t.span.clone(), - None => make_span(0, 0), -} + Some(t) => t.span.clone(), + None => make_span(0, 0), + } } pub fn tok_keyword_to_name(tok: Option>) -> Option { match tok { - Some(t) => if is_name_keyword(&t) { - Some(t.text.clone()) - } else { - None - }, - None => None, -} + Some(t) => { + if is_name_keyword(&t) { + Some(t.text.clone()) + } else { + None + } + } + None => None, + } } pub fn tok_is_keyword_name(tok: Option>) -> bool { match tok_keyword_to_name(tok) { - Some(_) => true, - None => false, -} + Some(_) => true, + None => false, + } } pub fn shape_display_name(shape: TokenShape) -> String { match shape { - TokenShape::ShKeyword => "keyword".to_string(), - TokenShape::ShLBrace => "LBrace".to_string(), - TokenShape::ShRBrace => "RBrace".to_string(), - TokenShape::ShLParen => "LParen".to_string(), - TokenShape::ShRParen => "RParen".to_string(), - TokenShape::ShLBracket => "LBracket".to_string(), - TokenShape::ShRBracket => "RBracket".to_string(), - TokenShape::ShLt => "Lt".to_string(), - TokenShape::ShGt => "Gt".to_string(), - TokenShape::ShLe => "Le".to_string(), - TokenShape::ShGe => "Ge".to_string(), - TokenShape::ShFatArrow => "FatArrow".to_string(), - TokenShape::ShArrow => "Arrow".to_string(), - TokenShape::ShColon => "Colon".to_string(), - TokenShape::ShComma => "Comma".to_string(), - TokenShape::ShDot => "Dot".to_string(), - TokenShape::ShDotDot => "DotDot".to_string(), - TokenShape::ShEq => "Eq".to_string(), - TokenShape::ShEqEq => "EqEq".to_string(), - TokenShape::ShNe => "Ne".to_string(), - TokenShape::ShPlus => "Plus".to_string(), - TokenShape::ShMinus => "Minus".to_string(), - TokenShape::ShStar => "Star".to_string(), - TokenShape::ShSlash => "Slash".to_string(), - TokenShape::ShPercent => "Percent".to_string(), - TokenShape::ShBang => "Bang".to_string(), - TokenShape::ShAnd => "And".to_string(), - TokenShape::ShOr => "Or".to_string(), - TokenShape::ShQuestion => "Question".to_string(), - TokenShape::ShNullCoalesce => "NullCoalesce".to_string(), - TokenShape::ShPipe => "Pipe".to_string(), - TokenShape::ShPipeArrow => "PipeArrow".to_string(), - TokenShape::ShLitStr => "LitStr".to_string(), - TokenShape::ShLitInt => "LitInt".to_string(), - TokenShape::ShLitFloat => "LitFloat".to_string(), - TokenShape::ShIdent => "Ident".to_string(), - TokenShape::ShStrBegin => "StrBegin".to_string(), - TokenShape::ShStrMid => "StrMid".to_string(), - TokenShape::ShStrEnd => "StrEnd".to_string(), - TokenShape::ShNewline => "Newline".to_string(), - TokenShape::ShEof => "Eof".to_string(), - TokenShape::ShUnknown => "Unknown".to_string(), -} + TokenShape::ShKeyword => "keyword".to_string(), + TokenShape::ShLBrace => "LBrace".to_string(), + TokenShape::ShRBrace => "RBrace".to_string(), + TokenShape::ShLParen => "LParen".to_string(), + TokenShape::ShRParen => "RParen".to_string(), + TokenShape::ShLBracket => "LBracket".to_string(), + TokenShape::ShRBracket => "RBracket".to_string(), + TokenShape::ShLt => "Lt".to_string(), + TokenShape::ShGt => "Gt".to_string(), + TokenShape::ShLe => "Le".to_string(), + TokenShape::ShGe => "Ge".to_string(), + TokenShape::ShFatArrow => "FatArrow".to_string(), + TokenShape::ShArrow => "Arrow".to_string(), + TokenShape::ShColon => "Colon".to_string(), + TokenShape::ShComma => "Comma".to_string(), + TokenShape::ShDot => "Dot".to_string(), + TokenShape::ShDotDot => "DotDot".to_string(), + TokenShape::ShEq => "Eq".to_string(), + TokenShape::ShEqEq => "EqEq".to_string(), + TokenShape::ShNe => "Ne".to_string(), + TokenShape::ShPlus => "Plus".to_string(), + TokenShape::ShMinus => "Minus".to_string(), + TokenShape::ShStar => "Star".to_string(), + TokenShape::ShSlash => "Slash".to_string(), + TokenShape::ShPercent => "Percent".to_string(), + TokenShape::ShBang => "Bang".to_string(), + TokenShape::ShAnd => "And".to_string(), + TokenShape::ShOr => "Or".to_string(), + TokenShape::ShQuestion => "Question".to_string(), + TokenShape::ShNullCoalesce => "NullCoalesce".to_string(), + TokenShape::ShPipe => "Pipe".to_string(), + TokenShape::ShPipeArrow => "PipeArrow".to_string(), + TokenShape::ShLitStr => "LitStr".to_string(), + TokenShape::ShLitInt => "LitInt".to_string(), + TokenShape::ShLitFloat => "LitFloat".to_string(), + TokenShape::ShIdent => "Ident".to_string(), + TokenShape::ShStrBegin => "StrBegin".to_string(), + TokenShape::ShStrMid => "StrMid".to_string(), + TokenShape::ShStrEnd => "StrEnd".to_string(), + TokenShape::ShNewline => "Newline".to_string(), + TokenShape::ShEof => "Eof".to_string(), + TokenShape::ShUnknown => "Unknown".to_string(), + } } pub fn token_display_name(token: &Rc) -> String { if is_keyword_shape(token.shape.clone()) { - v2_rt::concat("keyword '".to_string(), v2_rt::concat(token.text.clone(), "'".to_string())) + v2_rt::concat( + "keyword '".to_string(), + v2_rt::concat(token.text.clone(), "'".to_string()), + ) } else { shape_display_name(token.shape.clone()) } @@ -1339,170 +1427,213 @@ pub fn token_display_name(token: &Rc) -> String { pub fn expected_token_name(expected: Rc) -> String { match (*expected).clone() { - ExpectedToken::ExpectKeyword { text: kw, .. } => v2_rt::concat("keyword '".to_string(), v2_rt::concat(kw.clone(), "'".to_string())), - ExpectedToken::ExpectLBrace => "LBrace".to_string(), - ExpectedToken::ExpectRBrace => "RBrace".to_string(), - ExpectedToken::ExpectLParen => "LParen".to_string(), - ExpectedToken::ExpectRParen => "RParen".to_string(), - ExpectedToken::ExpectLBracket => "LBracket".to_string(), - ExpectedToken::ExpectRBracket => "RBracket".to_string(), - ExpectedToken::ExpectLt => "Lt".to_string(), - ExpectedToken::ExpectGt => "Gt".to_string(), - ExpectedToken::ExpectFatArrow => "FatArrow".to_string(), - ExpectedToken::ExpectArrow => "Arrow".to_string(), - ExpectedToken::ExpectColon => "Colon".to_string(), - ExpectedToken::ExpectComma => "Comma".to_string(), - ExpectedToken::ExpectDot => "Dot".to_string(), - ExpectedToken::ExpectEq => "Eq".to_string(), - ExpectedToken::ExpectQuestion => "Question".to_string(), - ExpectedToken::ExpectPipe => "Pipe".to_string(), -} + ExpectedToken::ExpectKeyword { text: kw, .. } => v2_rt::concat( + "keyword '".to_string(), + v2_rt::concat(kw.clone(), "'".to_string()), + ), + ExpectedToken::ExpectLBrace => "LBrace".to_string(), + ExpectedToken::ExpectRBrace => "RBrace".to_string(), + ExpectedToken::ExpectLParen => "LParen".to_string(), + ExpectedToken::ExpectRParen => "RParen".to_string(), + ExpectedToken::ExpectLBracket => "LBracket".to_string(), + ExpectedToken::ExpectRBracket => "RBracket".to_string(), + ExpectedToken::ExpectLt => "Lt".to_string(), + ExpectedToken::ExpectGt => "Gt".to_string(), + ExpectedToken::ExpectFatArrow => "FatArrow".to_string(), + ExpectedToken::ExpectArrow => "Arrow".to_string(), + ExpectedToken::ExpectColon => "Colon".to_string(), + ExpectedToken::ExpectComma => "Comma".to_string(), + ExpectedToken::ExpectDot => "Dot".to_string(), + ExpectedToken::ExpectEq => "Eq".to_string(), + ExpectedToken::ExpectQuestion => "Question".to_string(), + ExpectedToken::ExpectPipe => "Pipe".to_string(), + } } pub fn token_matches_expected(token: &Rc, expected: Rc) -> bool { match (*expected).clone() { - ExpectedToken::ExpectKeyword { text: kw, .. } => (is_keyword_shape(token.shape.clone()) && (token.text.clone().as_str() == kw.clone().as_str())), - ExpectedToken::ExpectLBrace => is_lbrace_shape(token.shape.clone()), - ExpectedToken::ExpectRBrace => is_rbrace_shape(token.shape.clone()), - ExpectedToken::ExpectLParen => is_lparen_shape(token.shape.clone()), - ExpectedToken::ExpectRParen => is_rparen_shape(token.shape.clone()), - ExpectedToken::ExpectLBracket => is_lbracket_shape(token.shape.clone()), - ExpectedToken::ExpectRBracket => is_rbracket_shape(token.shape.clone()), - ExpectedToken::ExpectLt => is_lt_shape(token.shape.clone()), - ExpectedToken::ExpectGt => is_gt_shape(token.shape.clone()), - ExpectedToken::ExpectFatArrow => is_fat_arrow_shape(token.shape.clone()), - ExpectedToken::ExpectArrow => is_arrow_shape(token.shape.clone()), - ExpectedToken::ExpectColon => is_colon_shape(token.shape.clone()), - ExpectedToken::ExpectComma => is_comma_shape(token.shape.clone()), - ExpectedToken::ExpectDot => is_dot_shape(token.shape.clone()), - ExpectedToken::ExpectEq => is_eq_shape(token.shape.clone()), - ExpectedToken::ExpectQuestion => is_question_shape(token.shape.clone()), - ExpectedToken::ExpectPipe => is_pipe_shape(token.shape.clone()), -} + ExpectedToken::ExpectKeyword { text: kw, .. } => { + (is_keyword_shape(token.shape.clone()) + && (token.text.clone().as_str() == kw.clone().as_str())) + } + ExpectedToken::ExpectLBrace => is_lbrace_shape(token.shape.clone()), + ExpectedToken::ExpectRBrace => is_rbrace_shape(token.shape.clone()), + ExpectedToken::ExpectLParen => is_lparen_shape(token.shape.clone()), + ExpectedToken::ExpectRParen => is_rparen_shape(token.shape.clone()), + ExpectedToken::ExpectLBracket => is_lbracket_shape(token.shape.clone()), + ExpectedToken::ExpectRBracket => is_rbracket_shape(token.shape.clone()), + ExpectedToken::ExpectLt => is_lt_shape(token.shape.clone()), + ExpectedToken::ExpectGt => is_gt_shape(token.shape.clone()), + ExpectedToken::ExpectFatArrow => is_fat_arrow_shape(token.shape.clone()), + ExpectedToken::ExpectArrow => is_arrow_shape(token.shape.clone()), + ExpectedToken::ExpectColon => is_colon_shape(token.shape.clone()), + ExpectedToken::ExpectComma => is_comma_shape(token.shape.clone()), + ExpectedToken::ExpectDot => is_dot_shape(token.shape.clone()), + ExpectedToken::ExpectEq => is_eq_shape(token.shape.clone()), + ExpectedToken::ExpectQuestion => is_question_shape(token.shape.clone()), + ExpectedToken::ExpectPipe => is_pipe_shape(token.shape.clone()), + } } pub fn expect(tokens: &Rc>>, expected: &Rc) -> Rc { { let tok = tokens.clone().first().cloned(); -let matches = match tok.clone() { - Some(t) => token_matches_expected(&t, expected.clone()), - None => false, -}; -if matches { + let matches = match tok.clone() { + Some(t) => token_matches_expected(&t, expected.clone()), + None => false, + }; + if matches { Rc::new(TokenResult { - token: tok.clone().unwrap(), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - err: None, -}) + token: tok.clone().unwrap(), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + err: None, + }) } else { { let found = match tok.clone() { - Some(t) => token_display_name(&t), - None => "EOF".to_string(), -}; -let wanted = expected_token_name(expected.clone()); -Rc::new(TokenResult { - token: Rc::new(Token { - text: "".to_string(), - span: make_span(0, 0), - shape: TokenShape::ShEof, -}), - tokens: tokens.clone(), - err: Some(parse_error(format!("expected {}, found {}", wanted, found), token_span(tok.clone()))), -}) -} + Some(t) => token_display_name(&t), + None => "EOF".to_string(), + }; + let wanted = expected_token_name(expected.clone()); + Rc::new(TokenResult { + token: Rc::new(Token { + text: "".to_string(), + span: make_span(0, 0), + shape: TokenShape::ShEof, + }), + tokens: tokens.clone(), + err: Some(parse_error( + format!("expected {}, found {}", wanted, found), + token_span(tok.clone()), + )), + }) + } } -} + } } pub fn expect_ident(tokens: &Rc>>) -> Rc { { let tok = tokens.clone().first().cloned(); -let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, -}; -match sh.clone() { - Some(TokenShape::ShIdent) => { - let n = tok.clone().unwrap().text.clone(); -let span = tok.clone().unwrap().span.clone(); -Rc::new(NameResult { - name: n, - span: span, - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - err: None, -}) -}, - _ => { - let found = match sh.clone() { - Some(shape) => shape_display_name(shape.clone()), - None => "EOF".to_string(), -}; -Rc::new(NameResult { - name: "".to_string(), - span: token_span(tok.clone()), - tokens: tokens.clone(), - err: Some(parse_error(v2_rt::concat("expected identifier, found ".to_string(), found), token_span(tok.clone()))), -}) -}, -} -} + let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, + }; + match sh.clone() { + Some(TokenShape::ShIdent) => { + let n = tok.clone().unwrap().text.clone(); + let span = tok.clone().unwrap().span.clone(); + Rc::new(NameResult { + name: n, + span: span, + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + err: None, + }) + } + _ => { + let found = match sh.clone() { + Some(shape) => shape_display_name(shape.clone()), + None => "EOF".to_string(), + }; + Rc::new(NameResult { + name: "".to_string(), + span: token_span(tok.clone()), + tokens: tokens.clone(), + err: Some(parse_error( + v2_rt::concat("expected identifier, found ".to_string(), found), + token_span(tok.clone()), + )), + }) + } + } + } } pub fn expect_name(tokens: &Rc>>) -> Rc { { let tok = tokens.clone().first().cloned(); -let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, -}; -match sh { - Some(TokenShape::ShIdent) => { - let n = tok.clone().unwrap().text.clone(); -let span = tok.clone().unwrap().span.clone(); -Rc::new(NameResult { - name: n, - span: span, - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - err: None, -}) -}, - _ => { - let kw_name = tok_keyword_to_name(tok.clone()); -match kw_name { - Some(n) => { + let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, + }; + match sh { + Some(TokenShape::ShIdent) => { + let n = tok.clone().unwrap().text.clone(); let span = tok.clone().unwrap().span.clone(); -Rc::new(NameResult { - name: n, - span: span, - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - err: None, -}) -}, - None => { - let found = match tok.clone() { - Some(t) => token_display_name(&t), - None => "EOF".to_string(), -}; -Rc::new(NameResult { - name: "".to_string(), - span: token_span(tok.clone()), - tokens: tokens.clone(), - err: Some(parse_error(v2_rt::concat("expected name, found ".to_string(), found), token_span(tok.clone()))), -}) -}, -} -}, -} -} + Rc::new(NameResult { + name: n, + span: span, + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + err: None, + }) + } + _ => { + let kw_name = tok_keyword_to_name(tok.clone()); + match kw_name { + Some(n) => { + let span = tok.clone().unwrap().span.clone(); + Rc::new(NameResult { + name: n, + span: span, + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + err: None, + }) + } + None => { + let found = match tok.clone() { + Some(t) => token_display_name(&t), + None => "EOF".to_string(), + }; + Rc::new(NameResult { + name: "".to_string(), + span: token_span(tok.clone()), + tokens: tokens.clone(), + err: Some(parse_error( + v2_rt::concat("expected name, found ".to_string(), found), + token_span(tok.clone()), + )), + }) + } + } + } + } + } } pub fn is_name_keyword(token: &Rc) -> bool { if is_keyword_shape(token.shape.clone()) { match v2_rt::lookup(&dag_non_name_keywords(), token.text.clone()) { - Some(_) => false, - None => true, -} + Some(_) => false, + None => true, + } } else { false } @@ -1511,109 +1642,153 @@ pub fn is_name_keyword(token: &Rc) -> bool { pub fn skip_newlines(mut tokens: Rc>>) -> Rc>> { loop { match tokens.clone().first().cloned() { - Some(t) => { if is_newline_shape(t.shape.clone()) { - { - let __tco_0 = Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); -tokens = __tco_0; -continue; -} -} else { - break tokens.clone(); -} }, - None => { break tokens.clone(); }, -} -} + Some(t) => { + if is_newline_shape(t.shape.clone()) { + { + let __tco_0 = + Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); + tokens = __tco_0; + continue; + } + } else { + break tokens.clone(); + } + } + None => { + break tokens.clone(); + } + } + } } pub fn is_continuation_shape(shape: &TokenShape) -> bool { - (((is_pipe_arrow_shape(shape.clone()) || is_dot_shape(shape.clone())) || is_or_shape(shape.clone())) || is_and_shape(shape.clone())) + (((is_pipe_arrow_shape(shape.clone()) || is_dot_shape(shape.clone())) + || is_or_shape(shape.clone())) + || is_and_shape(shape.clone())) } pub fn skip_continuation_newlines(tokens: &Rc>>) -> Rc>> { { let tok = tokens.clone().first().cloned(); -let is_continuation = if tok_is_newline(tok) { + let is_continuation = if tok_is_newline(tok) { { let after = skip_newlines(tokens.clone()); -match after.first().cloned() { - Some(next) => is_continuation_shape(&next.shape.clone()), - None => false, -} -} + match after.first().cloned() { + Some(next) => is_continuation_shape(&next.shape.clone()), + None => false, + } + } } else { false }; -if is_continuation { + if is_continuation { skip_newlines(tokens.clone()) } else { tokens.clone() } -} + } } pub fn eat(tokens: &Rc>>, expected: Rc) -> Rc { match tokens.clone().first().cloned() { - Some(t) => if token_matches_expected(&t, expected) { - Rc::new(EatResult::EatConsumed { - token: t.clone(), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), -}) - } else { - Rc::new(EatResult::EatUnchanged { - tokens: tokens.clone(), -}) - }, - None => Rc::new(EatResult::EatUnchanged { - tokens: tokens.clone(), -}), -} + Some(t) => { + if token_matches_expected(&t, expected) { + Rc::new(EatResult::EatConsumed { + token: t.clone(), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + }) + } else { + Rc::new(EatResult::EatUnchanged { + tokens: tokens.clone(), + }) + } + } + None => Rc::new(EatResult::EatUnchanged { + tokens: tokens.clone(), + }), + } } -pub fn parser_result_base_var(expr: &Rc, source_indices: Rc>>) -> Option { +pub fn parser_result_base_var( + expr: &Rc, + source_indices: Rc>>, +) -> Option { match (*expr.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => match expr.children.clone().first().cloned() { - Some(base) => match (*base.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => Some(expr_var_name_at(base.clone(), source_indices)), - _ => None, -}, - None => None, -}, - _ => None, -} + ExprData::ExprFieldAccess { .. } => match expr.children.clone().first().cloned() { + Some(base) => match (*base.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => Some(expr_var_name_at(base.clone(), source_indices)), + _ => None, + }, + None => None, + }, + _ => None, + } } -pub fn parser_helper_state_arg_expr(call_node: Rc, source_indices: Rc>>) -> Option> { - Rc::new(call_node.children.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(None, |acc: _, pair: (i64, Rc)| if (acc.clone() != None) { - acc.clone() - } else { - { - let idx = pair.0.clone(); -let arg_node = pair.1.clone(); -let matches_state = match arg_name_at(arg_node.clone(), source_indices.clone()) { - Some(name) => ((name.clone().as_str() == "state".to_string().as_str()) || (name.clone().as_str() == "tokens".to_string().as_str())), - None => (idx.clone() == 0), -}; -if matches_state.clone() { - Some(arg_value(&arg_node)) - } else { - None +pub fn parser_helper_state_arg_expr( + call_node: Rc, + source_indices: Rc>>, +) -> Option> { + Rc::new( + call_node + .children + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + .fold(None, |acc: _, pair: (i64, Rc)| { + if (acc.clone() != None) { + acc.clone() + } else { + { + let idx = pair.0.clone(); + let arg_node = pair.1.clone(); + let matches_state = match arg_name_at(arg_node.clone(), source_indices.clone()) { + Some(name) => { + ((name.clone().as_str() == "state".to_string().as_str()) + || (name.clone().as_str() == "tokens".to_string().as_str())) + } + None => (idx.clone() == 0), + }; + if matches_state.clone() { + Some(arg_value(&arg_node)) + } else { + None + } } -} + } }) } -pub fn parser_progress_flag_var(expr: &Rc, source_indices: &Rc>>) -> Option { +pub fn parser_progress_flag_var( + expr: &Rc, + source_indices: &Rc>>, +) -> Option { match (*expr.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { .. } => { - let field = field_access_field_at(expr.clone(), source_indices.clone()); -if ((field.clone().as_str() == "consumed".to_string().as_str()) || (field.clone().as_str() == "changed".to_string().as_str())) { - parser_result_base_var(&expr, source_indices.clone()) - } else { - None + ExprData::ExprFieldAccess { .. } => { + let field = field_access_field_at(expr.clone(), source_indices.clone()); + if ((field.clone().as_str() == "consumed".to_string().as_str()) + || (field.clone().as_str() == "changed".to_string().as_str())) + { + parser_result_base_var(&expr, source_indices.clone()) + } else { + None + } } -}, - _ => None, -} + _ => None, + } } pub fn parser_helper_identity(callee: &String) -> Option { @@ -1632,69 +1807,83 @@ pub fn parser_helper_identity(callee: &String) -> Option { } } -pub fn parser_passthrough_state_expr(expr: &Rc, source_indices: &Rc>>) -> Option> { +pub fn parser_passthrough_state_expr( + expr: &Rc, + source_indices: &Rc>>, +) -> Option> { match (*expr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => match parser_helper_identity(&expr_call_func_at(expr.clone(), source_indices.clone())) { - Some(ParserHelperIdentity::ParserHelperSkipNewlines) => parser_helper_state_arg_expr(expr.clone(), source_indices.clone()), - Some(ParserHelperIdentity::ParserHelperSkipContinuationNewlines) => parser_helper_state_arg_expr(expr.clone(), source_indices.clone()), - Some(ParserHelperIdentity::ParserHelperWith) => match expr.children.clone().first().cloned() { - Some(base_arg) => Some(arg_value(&base_arg)), - None => None, -}, - None => None, -}, - _ => None, -} + ExprData::ExprCall { .. } => { + match parser_helper_identity(&expr_call_func_at(expr.clone(), source_indices.clone())) { + Some(ParserHelperIdentity::ParserHelperSkipNewlines) => { + parser_helper_state_arg_expr(expr.clone(), source_indices.clone()) + } + Some(ParserHelperIdentity::ParserHelperSkipContinuationNewlines) => { + parser_helper_state_arg_expr(expr.clone(), source_indices.clone()) + } + Some(ParserHelperIdentity::ParserHelperWith) => { + match expr.children.clone().first().cloned() { + Some(base_arg) => Some(arg_value(&base_arg)), + None => None, + } + } + None => None, + } + } + _ => None, + } } -pub fn parser_result_witness(expr: &Rc, source_indices: Rc>>) -> Rc { +pub fn parser_result_witness( + expr: &Rc, + source_indices: Rc>>, +) -> Rc { match (*expr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => match expr_call_func_at(expr.clone(), source_indices) { - ref __s if __s == "advance" => Rc::new(ParserResultWitness::ParserWitnessAdvance), - ref __s if __s == "expect" => Rc::new(ParserResultWitness::ParserWitnessExpect), - ref __s if __s == "eat" => Rc::new(ParserResultWitness::ParserWitnessEat), - callee => match parser_helper_identity(&callee) { - Some(helper) => Rc::new(ParserResultWitness::ParserWitnessCall { - callee: Rc::new(ParserCallIdentity::ParserCallHelper { - helper: helper.clone(), -}), -}), - None => Rc::new(ParserResultWitness::ParserWitnessCall { - callee: Rc::new(ParserCallIdentity::ParserCallFunction { - name: callee.clone(), -}), -}), -}, -}, - _ => Rc::new(ParserResultWitness::ParserWitnessOpaque), -} + ExprData::ExprCall { .. } => match expr_call_func_at(expr.clone(), source_indices) { + ref __s if __s == "advance" => Rc::new(ParserResultWitness::ParserWitnessAdvance), + ref __s if __s == "expect" => Rc::new(ParserResultWitness::ParserWitnessExpect), + ref __s if __s == "eat" => Rc::new(ParserResultWitness::ParserWitnessEat), + callee => match parser_helper_identity(&callee) { + Some(helper) => Rc::new(ParserResultWitness::ParserWitnessCall { + callee: Rc::new(ParserCallIdentity::ParserCallHelper { + helper: helper.clone(), + }), + }), + None => Rc::new(ParserResultWitness::ParserWitnessCall { + callee: Rc::new(ParserCallIdentity::ParserCallFunction { + name: callee.clone(), + }), + }), + }, + }, + _ => Rc::new(ParserResultWitness::ParserWitnessOpaque), + } } pub fn leaf_type_node(name: &String, span: &Rc) -> Rc { Rc::new(Node { - name: name.clone(), - span: span.clone(), - ident_span: if (name.clone().as_str() == "".to_string().as_str()) { - None - } else { - Some(span.clone()) - }, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) + name: name.clone(), + span: span.clone(), + ident_span: if (name.clone().as_str() == "".to_string().as_str()) { + None + } else { + Some(span.clone()) + }, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) } pub fn is_conj_with_children(n: &Rc) -> bool { @@ -1703,338 +1892,455 @@ pub fn is_conj_with_children(n: &Rc) -> bool { pub fn child_inferred_or_empty(ch: Rc) -> Rc { match ch.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => rt.clone(), - _ => error_type(), -} + Some(InferredNode::Resolved { node: rt, .. }) => rt.clone(), + _ => error_type(), + } } -pub fn node_inferred_to_outputs(rt: &Rc, source_indices: Rc>>) -> Rc>> { +pub fn node_inferred_to_outputs( + rt: &Rc, + source_indices: Rc>>, +) -> Rc>> { if is_conj_with_children(&rt) { { - let all_children_typed = { let mut __all = true; for ch in rt.children.clone().iter().cloned() { if !(match ch.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { .. }) => true, - _ => false, -}) { __all = false; break; } } __all }; -if all_children_typed { - Rc::new({ let mut __result = Vec::new(); for ch in rt.children.clone().iter().cloned() { __result.push(make_field_node(&authored_name_at(source_indices.clone(), &ch), child_inferred_or_empty(ch.clone()), Cardinality::Required, ch.body.clone(), None, ch.span.clone(), node_name_span(&ch))); } __result }) + let all_children_typed = { + let mut __all = true; + for ch in rt.children.clone().iter().cloned() { + if !(match ch.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { .. }) => true, + _ => false, + }) { + __all = false; + break; + } + } + __all + }; + if all_children_typed { + Rc::new({ + let mut __result = Vec::new(); + for ch in rt.children.clone().iter().cloned() { + __result.push(make_field_node( + &authored_name_at(source_indices.clone(), &ch), + child_inferred_or_empty(ch.clone()), + Cardinality::Required, + ch.body.clone(), + None, + ch.span.clone(), + node_name_span(&ch), + )); + } + __result + }) } else { Rc::new(vec![]) } -} + } } else { - Rc::new(vec![make_field_node(&"value".to_string(), rt.clone(), Cardinality::Required, None, None, rt.span.clone(), no_span())]) + Rc::new(vec![make_field_node( + &"value".to_string(), + rt.clone(), + Cardinality::Required, + None, + None, + rt.span.clone(), + no_span(), + )]) } } pub fn parse_dotted_ident(tokens: Rc>>) -> Rc { { let r = expect_name(&tokens); -if has_err(r.err.clone()) { - return r.clone() + if has_err(r.err.clone()) { + return r.clone(); } -parse_dotted_ident_rest(r.tokens.clone(), r.name.clone(), r.span.clone()) -} + parse_dotted_ident_rest(r.tokens.clone(), r.name.clone(), r.span.clone()) + } } -pub fn parse_dotted_ident_rest(mut tokens: Rc>>, mut acc: String, mut span: Rc) -> Rc { +pub fn parse_dotted_ident_rest( + mut tokens: Rc>>, + mut acc: String, + mut span: Rc, +) -> Rc { loop { match (*eat(&tokens, Rc::new(ExpectedToken::ExpectDot))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { let r = expect_name(&__ec); -if has_err(r.err.clone()) { - return r.clone() - } -let extended = Rc::new(SourceSpan { - file: span.file.clone(), - start: span.start.clone(), - end: r.span.clone().end.clone(), -}); -{ - let __tco_0 = r.tokens.clone(); -let __tco_1 = v2_rt::concat(v2_rt::concat(acc, ".".to_string()), r.name.clone()); -let __tco_2 = extended; -tokens = __tco_0; -acc = __tco_1; -span = __tco_2; -continue; -} }, - EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(NameResult { - name: acc, - span: span.clone(), - tokens: __eu.clone(), - err: None, -}); }, -} -} + EatResult::EatConsumed { tokens: __ec, .. } => { + let r = expect_name(&__ec); + if has_err(r.err.clone()) { + return r.clone(); + } + let extended = Rc::new(SourceSpan { + file: span.file.clone(), + start: span.start.clone(), + end: r.span.clone().end.clone(), + }); + { + let __tco_0 = r.tokens.clone(); + let __tco_1 = + v2_rt::concat(v2_rt::concat(acc, ".".to_string()), r.name.clone()); + let __tco_2 = extended; + tokens = __tco_0; + acc = __tco_1; + span = __tco_2; + continue; + } + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + break Rc::new(NameResult { + name: acc, + span: span.clone(), + tokens: __eu.clone(), + err: None, + }); + } + } + } } -pub fn parse_with_table(tokens: &Rc>>, source_indices: Rc>>, intern_table: Rc) -> Rc { +pub fn parse_with_table( + tokens: &Rc>>, + source_indices: Rc>>, + intern_table: Rc, +) -> Rc { { let pre_interned = pre_intern_tokens(tokens.clone(), intern_table); -let ctx = Rc::new(ParseContext { - source_indices: source_indices, - intern_table: pre_interned, -}); -let r = parse_module(&tokens, &ctx); -if has_err(r.err.clone()) { + let ctx = Rc::new(ParseContext { + source_indices: source_indices, + intern_table: pre_interned, + }); + let r = parse_module(&tokens, &ctx); + if has_err(r.err.clone()) { Rc::new(ParseWithTableResult { - result: Rc::new(ParseResult { - module: None, - error: r.err.clone(), -}), - intern_table: r.ctx.clone().intern_table.clone(), -}) + result: Rc::new(ParseResult { + module: None, + error: r.err.clone(), + }), + intern_table: r.ctx.clone().intern_table.clone(), + }) } else { Rc::new(ParseWithTableResult { - result: Rc::new(ParseResult { - module: Some(r.module.clone()), - error: None, -}), - intern_table: r.ctx.clone().intern_table.clone(), -}) + result: Rc::new(ParseResult { + module: Some(r.module.clone()), + error: None, + }), + intern_table: r.ctx.clone().intern_table.clone(), + }) } -} + } } -pub fn parse(tokens: Rc>>, source_indices: Rc>>) -> Rc { - parse_with_table(&tokens, source_indices, empty_intern_table()).result.clone() +pub fn parse( + tokens: Rc>>, + source_indices: Rc>>, +) -> Rc { + parse_with_table(&tokens, source_indices, empty_intern_table()) + .result + .clone() } pub fn parse_module(tokens: &Rc>>, ctx: &Rc) -> Rc { { let tokens = skip_newlines(tokens.clone()); -let start_span = token_span(tokens.clone().first().cloned()); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { - text: "module".to_string(), -})); -if has_err(r.err.clone()) { + let start_span = token_span(tokens.clone().first().cloned()); + let r = expect( + &tokens, + &Rc::new(ExpectedToken::ExpectKeyword { + text: "module".to_string(), + }), + ); + if has_err(r.err.clone()) { return Rc::new(ModuleResult { - module: module_node(&"".to_string(), Rc::new(vec![]), Rc::new(vec![]), &start_span), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let tokens = r.tokens.clone(); -let r = parse_dotted_ident(tokens.clone()); -if has_err(r.err.clone()) { + module: module_node( + &"".to_string(), + Rc::new(vec![]), + Rc::new(vec![]), + &start_span, + ), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let tokens = r.tokens.clone(); + let r = parse_dotted_ident(tokens.clone()); + if has_err(r.err.clone()) { return Rc::new(ModuleResult { - module: module_node(&"".to_string(), Rc::new(vec![]), Rc::new(vec![]), &start_span), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let mod_name = r.name.clone(); -let mod_name_span = r.span.clone(); -let tokens = skip_newlines(r.tokens.clone()); -let r = parse_imports(tokens.clone(), ctx.clone()); -if has_err(r.err.clone()) { + module: module_node( + &"".to_string(), + Rc::new(vec![]), + Rc::new(vec![]), + &start_span, + ), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let mod_name = r.name.clone(); + let mod_name_span = r.span.clone(); + let tokens = skip_newlines(r.tokens.clone()); + let r = parse_imports(tokens.clone(), ctx.clone()); + if has_err(r.err.clone()) { return Rc::new(ModuleResult { - module: module_node(&"".to_string(), Rc::new(vec![]), Rc::new(vec![]), &start_span), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let imports = r.imports.clone(); -let tokens = r.tokens.clone(); -let ctx = r.ctx.clone(); -let r = parse_items(tokens.clone(), ctx.clone()); -if has_err(r.err.clone()) { + module: module_node( + &"".to_string(), + Rc::new(vec![]), + Rc::new(vec![]), + &start_span, + ), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let imports = r.imports.clone(); + let tokens = r.tokens.clone(); + let ctx = r.ctx.clone(); + let r = parse_items(tokens.clone(), ctx.clone()); + if has_err(r.err.clone()) { return Rc::new(ModuleResult { - module: module_node(&"".to_string(), Rc::new(vec![]), Rc::new(vec![]), &start_span), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let items = r.items.clone(); -let tokens = r.tokens.clone(); -let ctx = r.ctx.clone(); -let mod_ir = intern(&ctx.intern_table.clone(), &mod_name); -let ctx = Rc::new(ParseContext { intern_table: mod_ir.table.clone(), ..(*ctx.clone()).clone() }); -let base_mod = Rc::new(Node { - name: mod_name.clone(), - span: start_span.clone(), - ident_span: Some(mod_name_span), - children: items, - connective: Connective::NoConnective, - params: imports, - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let r#mod = Rc::new(Node { ident: Some(mod_ir.id.clone()), ..(*base_mod).clone() }); -Rc::new(ModuleResult { - module: r#mod, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) -} + module: module_node( + &"".to_string(), + Rc::new(vec![]), + Rc::new(vec![]), + &start_span, + ), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let items = r.items.clone(); + let tokens = r.tokens.clone(); + let ctx = r.ctx.clone(); + let mod_ir = intern(&ctx.intern_table.clone(), &mod_name); + let ctx = Rc::new(ParseContext { + intern_table: mod_ir.table.clone(), + ..(*ctx.clone()).clone() + }); + let base_mod = Rc::new(Node { + name: mod_name.clone(), + span: start_span.clone(), + ident_span: Some(mod_name_span), + children: items, + connective: Connective::NoConnective, + params: imports, + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let r#mod = Rc::new(Node { + ident: Some(mod_ir.id.clone()), + ..(*base_mod).clone() + }); + Rc::new(ModuleResult { + module: r#mod, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } } pub fn parse_imports(tokens: Rc>>, ctx: Rc) -> Rc { parse_imports_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_imports_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_imports_acc( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -if tok_is_keyword(tokens.clone().first().cloned(), "import".to_string()) { + if tok_is_keyword(tokens.clone().first().cloned(), "import".to_string()) { let r = parse_import(&tokens, &ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ImportsResult { - imports: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + imports: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -{ + { let __tco_0 = r.tokens.clone(); -let __tco_1 = r.ctx.clone(); -let __tco_2 = v2_rt::rc_list_push(acc, r.import.clone()); -tokens = __tco_0; -ctx = __tco_1; -acc = __tco_2; -continue; -} -} else { + let __tco_1 = r.ctx.clone(); + let __tco_2 = v2_rt::rc_list_push(acc, r.import.clone()); + tokens = __tco_0; + ctx = __tco_1; + acc = __tco_2; + continue; + } + } else { break Rc::new(ImportsResult { - imports: acc, - tokens: tokens.clone(), - ctx: ctx, - err: None, -}); -} -} + imports: acc, + tokens: tokens.clone(), + ctx: ctx, + err: None, + }); + } + } } pub fn parse_items(tokens: Rc>>, ctx: Rc) -> Rc { parse_items_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_items_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_items_acc( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -if tok_is_eof(tokens.clone().first().cloned()) { + if tok_is_eof(tokens.clone().first().cloned()) { break Rc::new(ItemsResult { - items: acc.clone(), - tokens: tokens.clone(), - ctx: ctx, - err: None, -}); -} else { + items: acc.clone(), + tokens: tokens.clone(), + ctx: ctx, + err: None, + }); + } else { let r = parse_item(&tokens, ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ItemsResult { - items: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + items: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -{ + { let __tco_0 = r.tokens.clone(); -let __tco_1 = r.ctx.clone(); -let __tco_2 = v2_rt::rc_list_push(acc, r.item.clone()); -tokens = __tco_0; -ctx = __tco_1; -acc = __tco_2; -continue; -} -} -} + let __tco_1 = r.ctx.clone(); + let __tco_2 = v2_rt::rc_list_push(acc, r.item.clone()); + tokens = __tco_0; + ctx = __tco_1; + acc = __tco_2; + continue; + } + } + } } pub fn parse_import(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); -let err_import = import_node("".to_string(), false, Rc::new(vec![]), &start_span, start_span.clone()); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { - text: "import".to_string(), -})); -if has_err(r.err.clone()) { + let err_import = import_node( + "".to_string(), + false, + Rc::new(vec![]), + &start_span, + start_span.clone(), + ); + let r = expect( + &tokens, + &Rc::new(ExpectedToken::ExpectKeyword { + text: "import".to_string(), + }), + ); + if has_err(r.err.clone()) { return Rc::new(ImportResult { - import: err_import.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let tokens = r.tokens.clone(); -let r = parse_dotted_ident(tokens.clone()); -if has_err(r.err.clone()) { + import: err_import.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let tokens = r.tokens.clone(); + let r = parse_dotted_ident(tokens.clone()); + if has_err(r.err.clone()) { return Rc::new(ImportResult { - import: err_import.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let mod_path = r.name.clone(); -let mod_path_span = r.span.clone(); -let tokens = r.tokens.clone(); -match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLBrace))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r = parse_import_names(__ec.clone(), ctx.clone()); -if has_err(r.err.clone()) { - return Rc::new(ImportResult { - import: err_import.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let names = r.names.clone(); -let tokens = r.tokens.clone(); -let ctx = r.ctx.clone(); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r.err.clone()) { - return Rc::new(ImportResult { - import: err_import.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let tokens = skip_newlines(r.tokens.clone()); -let base_imp = import_node(mod_path.clone(), false, names, &start_span, mod_path_span); -let imp_ir = intern(&ctx.intern_table.clone(), &mod_path); -let ctx = Rc::new(ParseContext { intern_table: imp_ir.table.clone(), ..(*ctx.clone()).clone() }); -let imp = Rc::new(Node { ident: Some(imp_ir.id.clone()), ..(*base_imp).clone() }); -Rc::new(ImportResult { - import: imp, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) -}, - EatResult::EatUnchanged { tokens: __eu, .. } => { - let tokens = skip_newlines(tokens.clone()); -let base_imp = import_node(mod_path.clone(), true, Rc::new(vec![]), &start_span, mod_path_span); -let imp_ir = intern(&ctx.intern_table.clone(), &mod_path); -let ctx = Rc::new(ParseContext { intern_table: imp_ir.table.clone(), ..(*ctx.clone()).clone() }); -let imp = Rc::new(Node { ident: Some(imp_ir.id.clone()), ..(*base_imp).clone() }); -Rc::new(ImportResult { - import: imp, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) -}, -} -} + import: err_import.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let mod_path = r.name.clone(); + let mod_path_span = r.span.clone(); + let tokens = r.tokens.clone(); + match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLBrace))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let r = parse_import_names(__ec.clone(), ctx.clone()); + if has_err(r.err.clone()) { + return Rc::new(ImportResult { + import: err_import.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let names = r.names.clone(); + let tokens = r.tokens.clone(); + let ctx = r.ctx.clone(); + let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); + if has_err(r.err.clone()) { + return Rc::new(ImportResult { + import: err_import.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let tokens = skip_newlines(r.tokens.clone()); + let base_imp = + import_node(mod_path.clone(), false, names, &start_span, mod_path_span); + let imp_ir = intern(&ctx.intern_table.clone(), &mod_path); + let ctx = Rc::new(ParseContext { + intern_table: imp_ir.table.clone(), + ..(*ctx.clone()).clone() + }); + let imp = Rc::new(Node { + ident: Some(imp_ir.id.clone()), + ..(*base_imp).clone() + }); + Rc::new(ImportResult { + import: imp, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + let tokens = skip_newlines(tokens.clone()); + let base_imp = import_node( + mod_path.clone(), + true, + Rc::new(vec![]), + &start_span, + mod_path_span, + ); + let imp_ir = intern(&ctx.intern_table.clone(), &mod_path); + let ctx = Rc::new(ParseContext { + intern_table: imp_ir.table.clone(), + ..(*ctx.clone()).clone() + }); + let imp = Rc::new(Node { + ident: Some(imp_ir.id.clone()), + ..(*base_imp).clone() + }); + Rc::new(ImportResult { + import: imp, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } + } + } } pub fn parse_import_names(tokens: Rc>>, ctx: Rc) -> Rc { @@ -2045,60 +2351,72 @@ pub fn parsed_name_leaf(name: String, span: Rc) -> Rc { leaf_node_with_span(&name, &span) } -pub fn parse_import_names_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_import_names_acc( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -if tok_is_rbrace(tokens.clone().first().cloned()) { + if tok_is_rbrace(tokens.clone().first().cloned()) { break Rc::new(NamesResult { - names: acc, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); -} else { + names: acc, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } else { let r = parse_dotted_ident(tokens.clone()); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(NamesResult { - names: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let name_node = parsed_name_leaf(r.name.clone(), r.span.clone()); -tokens = skip_newlines(r.tokens.clone()); -let e = eat(&tokens, Rc::new(ExpectedToken::ExpectComma)); -tokens = skip_newlines(match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => tokens.clone(), -}); -{ + names: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let name_node = parsed_name_leaf(r.name.clone(), r.span.clone()); + tokens = skip_newlines(r.tokens.clone()); + let e = eat(&tokens, Rc::new(ExpectedToken::ExpectComma)); + tokens = skip_newlines(match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => tokens.clone(), + }); + { let __tco_0 = v2_rt::rc_list_push(acc, name_node); -acc = __tco_0; -continue; -} -} -} + acc = __tco_0; + continue; + } + } + } } pub fn find_item_form(forms: Rc>>, keyword: String) -> Option> { { - let matches = Rc::new({ let mut __result = Vec::new(); for f in forms.iter().cloned() { if (f.keyword.clone().as_str() == keyword.clone().as_str()) { __result.push(f); } } __result }); -match (matches.clone().len() as i64) { - 0 => None, - _ => Some(matches.clone().first().cloned().clone().unwrap()), -} -} + let matches = Rc::new({ + let mut __result = Vec::new(); + for f in forms.iter().cloned() { + if (f.keyword.clone().as_str() == keyword.clone().as_str()) { + __result.push(f); + } + } + __result + }); + match (matches.clone().len() as i64) { + 0 => None, + _ => Some(matches.clone().first().cloned().clone().unwrap()), + } + } } pub fn parse_item(tokens: &Rc>>, ctx: Rc) -> Rc { { let tokens = skip_newlines(tokens.clone()); -let tok = tokens.clone().first().cloned(); -let kw = tok_keyword_text(tok.clone()); -let span = token_span(tok.clone()); -let form = find_item_form(dag_syntax_spec().item_forms.clone(), kw); -match form { + let tok = tokens.clone().first().cloned(); + let kw = tok_keyword_text(tok.clone()); + let span = token_span(tok.clone()); + let form = find_item_form(dag_syntax_spec().item_forms.clone(), kw); + match form { Some(f) => parse_item_by_form(&tokens, &ctx, &f), None => Rc::new(ItemResult { item: Rc::new(Node { @@ -2126,947 +2444,1127 @@ match form { err: Some(parse_error("expected item declaration (type, fn, func, service, resource, data, extern, pattern, interface)".to_string(), span.clone())), }), } -} + } } -pub fn parse_item_prefix(tokens: &Rc>>, ctx: &Rc, form: &Rc) -> Rc { +pub fn parse_item_prefix( + tokens: &Rc>>, + ctx: &Rc, + form: &Rc, +) -> Rc { { let r = expect_ident(&tokens); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ItemPrefixResult { - name: "".to_string(), - name_span: r.span.clone(), - type_params: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - uses: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let name = r.name.clone(); -let name_span = r.span.clone(); -let tokens = r.tokens.clone(); -let tp_result = if form.has_type_params.clone() { + name: "".to_string(), + name_span: r.span.clone(), + type_params: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + uses: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let name = r.name.clone(); + let name_span = r.span.clone(); + let tokens = r.tokens.clone(); + let tp_result = if form.has_type_params.clone() { parse_optional_type_params(&tokens, ctx.clone()) } else { Rc::new(TypeParamsResult { - params: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), -}) + params: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), + }) }; -let tokens = tp_result.tokens.clone(); -let ctx = tp_result.ctx.clone(); -let params_result = if form.has_params.clone() { + let tokens = tp_result.tokens.clone(); + let ctx = tp_result.ctx.clone(); + let params_result = if form.has_params.clone() { parse_params(&tokens, &ctx) } else { Rc::new(ParamsResult { - params: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) + params: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) }; -if has_err(params_result.err.clone()) { + if has_err(params_result.err.clone()) { return Rc::new(ItemPrefixResult { - name: name.clone(), - name_span: name_span.clone(), - type_params: tp_result.params.clone(), - params: Rc::new(vec![]), - inferred: None, - uses: Rc::new(vec![]), - tokens: params_result.tokens.clone(), - ctx: params_result.ctx.clone(), - err: params_result.err.clone(), -}) - } -let tokens = params_result.tokens.clone(); -let ctx = params_result.ctx.clone(); -let ret_result = if form.has_return_type.clone() { + name: name.clone(), + name_span: name_span.clone(), + type_params: tp_result.params.clone(), + params: Rc::new(vec![]), + inferred: None, + uses: Rc::new(vec![]), + tokens: params_result.tokens.clone(), + ctx: params_result.ctx.clone(), + err: params_result.err.clone(), + }); + } + let tokens = params_result.tokens.clone(); + let ctx = params_result.ctx.clone(); + let ret_result = if form.has_return_type.clone() { parse_optional_inferred(&tokens, ctx.clone()) } else { Rc::new(OptRetResult { - inferred: None, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) + inferred: None, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) }; -if has_err(ret_result.err.clone()) { + if has_err(ret_result.err.clone()) { return Rc::new(ItemPrefixResult { - name: name.clone(), - name_span: name_span.clone(), - type_params: tp_result.params.clone(), - params: params_result.params.clone(), - inferred: None, - uses: Rc::new(vec![]), - tokens: ret_result.tokens.clone(), - ctx: ret_result.ctx.clone(), - err: ret_result.err.clone(), -}) - } -let tokens = ret_result.tokens.clone(); -let ctx = ret_result.ctx.clone(); -let missing_required_ret = (form.return_required.clone() && match ret_result.inferred.clone() { - Some(_) => false, - None => true, -}); -if missing_required_ret { + name: name.clone(), + name_span: name_span.clone(), + type_params: tp_result.params.clone(), + params: params_result.params.clone(), + inferred: None, + uses: Rc::new(vec![]), + tokens: ret_result.tokens.clone(), + ctx: ret_result.ctx.clone(), + err: ret_result.err.clone(), + }); + } + let tokens = ret_result.tokens.clone(); + let ctx = ret_result.ctx.clone(); + let missing_required_ret = (form.return_required.clone() + && match ret_result.inferred.clone() { + Some(_) => false, + None => true, + }); + if missing_required_ret { return Rc::new(ItemPrefixResult { - name: name.clone(), - name_span: name_span.clone(), - type_params: tp_result.params.clone(), - params: params_result.params.clone(), - inferred: None, - uses: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error(v2_rt::concat("expected return type annotation (-> Type) for '".to_string(), v2_rt::concat(form.keyword.clone(), v2_rt::concat(" ".to_string(), name.clone()))), token_span(tokens.clone().first().cloned()))), -}) - } -let uses_result = if form.has_uses.clone() { + name: name.clone(), + name_span: name_span.clone(), + type_params: tp_result.params.clone(), + params: params_result.params.clone(), + inferred: None, + uses: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error( + v2_rt::concat( + "expected return type annotation (-> Type) for '".to_string(), + v2_rt::concat( + form.keyword.clone(), + v2_rt::concat(" ".to_string(), name.clone()), + ), + ), + token_span(tokens.clone().first().cloned()), + )), + }); + } + let uses_result = if form.has_uses.clone() { parse_uses_clause(&skip_newlines(tokens.clone()), ctx.clone()) } else { Rc::new(UsesResult { - uses: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) + uses: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) }; -if has_err(uses_result.err.clone()) { + if has_err(uses_result.err.clone()) { return Rc::new(ItemPrefixResult { - name: name.clone(), - name_span: name_span.clone(), - type_params: tp_result.params.clone(), - params: params_result.params.clone(), - inferred: ret_result.inferred.clone(), - uses: Rc::new(vec![]), - tokens: uses_result.tokens.clone(), - ctx: uses_result.ctx.clone(), - err: uses_result.err.clone(), -}) - } -Rc::new(ItemPrefixResult { - name: name.clone(), - name_span: name_span.clone(), - type_params: tp_result.params.clone(), - params: params_result.params.clone(), - inferred: ret_result.inferred.clone(), - uses: uses_result.uses.clone(), - tokens: uses_result.tokens.clone(), - ctx: uses_result.ctx.clone(), - err: None, -}) -} -} - -pub fn parse_item_by_form(tokens: &Rc>>, ctx: &Rc, form: &Rc) -> Rc { + name: name.clone(), + name_span: name_span.clone(), + type_params: tp_result.params.clone(), + params: params_result.params.clone(), + inferred: ret_result.inferred.clone(), + uses: Rc::new(vec![]), + tokens: uses_result.tokens.clone(), + ctx: uses_result.ctx.clone(), + err: uses_result.err.clone(), + }); + } + Rc::new(ItemPrefixResult { + name: name.clone(), + name_span: name_span.clone(), + type_params: tp_result.params.clone(), + params: params_result.params.clone(), + inferred: ret_result.inferred.clone(), + uses: uses_result.uses.clone(), + tokens: uses_result.tokens.clone(), + ctx: uses_result.ctx.clone(), + err: None, + }) + } +} + +pub fn parse_item_by_form( + tokens: &Rc>>, + ctx: &Rc, + form: &Rc, +) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); -let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { - text: form.keyword.clone(), -})); -if has_err(r.err.clone()) { + let dummy = Rc::new(Node { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let r = expect( + &tokens, + &Rc::new(ExpectedToken::ExpectKeyword { + text: form.keyword.clone(), + }), + ); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let tokens = r.tokens.clone(); -match form.body_kind.clone() { - BodyKind::TypeBody => { - let prefix = parse_item_prefix(&tokens, &ctx, &form); -if has_err(prefix.err.clone()) { - return Rc::new(ItemResult { - item: dummy.clone(), - tokens: prefix.tokens.clone(), - ctx: prefix.ctx.clone(), - err: prefix.err.clone(), -}) - } -parse_type_body_from_prefix(&prefix, &start_span) -}, - BodyKind::ExprBody => { - let prefix = parse_item_prefix(&tokens, &ctx, &form); -if has_err(prefix.err.clone()) { - return Rc::new(ItemResult { - item: dummy.clone(), - tokens: prefix.tokens.clone(), - ctx: prefix.ctx.clone(), - err: prefix.err.clone(), -}) - } -parse_fn_body_from_prefix(&prefix, &start_span) -}, - BodyKind::BlockBody => { - let prefix = parse_item_prefix(&tokens, &ctx, &form); -if has_err(prefix.err.clone()) { - return Rc::new(ItemResult { - item: dummy.clone(), - tokens: prefix.tokens.clone(), - ctx: prefix.ctx.clone(), - err: prefix.err.clone(), -}) - } -parse_block_body_from_prefix(&prefix, &start_span) -}, - BodyKind::ServiceBody => parse_service_after_kw(&tokens, &ctx, &start_span), - BodyKind::ResourceBody => parse_resource_after_kw(tokens.clone(), &ctx, &start_span), - BodyKind::ValueBody => parse_data_after_kw(tokens.clone(), &ctx, &start_span), - BodyKind::NoBody => { - let prefix = parse_item_prefix(&tokens, &ctx, &form); -if has_err(prefix.err.clone()) { - return Rc::new(ItemResult { - item: dummy.clone(), - tokens: prefix.tokens.clone(), - ctx: prefix.ctx.clone(), - err: prefix.err.clone(), -}) - } -parse_no_body_from_prefix(&prefix, start_span.clone()) -}, -} -} -} - -pub fn field_to_child_node(field: &Rc, source_indices: &Rc>>) -> Rc { - { - let ret_type = field_node_type_expr(&field); -let props = match field_node_from_key(field.clone(), source_indices.clone()) { - Some(key) => Rc::new(vec![make_field_init_node(&"from_key".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: key.clone(), -}), -}), Rc::new(vec![]), None, field.span.clone()), field.span.clone(), no_span())]), - None => Rc::new(vec![]), -}; -Rc::new(Node { - name: field_node_name_at(field.clone(), source_indices.clone()), - span: field.span.clone(), - ident_span: field.ident_span.clone(), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::Resolved { - node: ret_type, -})), - return_cardinality: field_node_cardinality(field.clone()), - uses: Rc::new(vec![]), - body: field_node_default_value(&field), - transport: None, - properties: props, - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) + item: dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let tokens = r.tokens.clone(); + match form.body_kind.clone() { + BodyKind::TypeBody => { + let prefix = parse_item_prefix(&tokens, &ctx, &form); + if has_err(prefix.err.clone()) { + return Rc::new(ItemResult { + item: dummy.clone(), + tokens: prefix.tokens.clone(), + ctx: prefix.ctx.clone(), + err: prefix.err.clone(), + }); + } + parse_type_body_from_prefix(&prefix, &start_span) + } + BodyKind::ExprBody => { + let prefix = parse_item_prefix(&tokens, &ctx, &form); + if has_err(prefix.err.clone()) { + return Rc::new(ItemResult { + item: dummy.clone(), + tokens: prefix.tokens.clone(), + ctx: prefix.ctx.clone(), + err: prefix.err.clone(), + }); + } + parse_fn_body_from_prefix(&prefix, &start_span) + } + BodyKind::BlockBody => { + let prefix = parse_item_prefix(&tokens, &ctx, &form); + if has_err(prefix.err.clone()) { + return Rc::new(ItemResult { + item: dummy.clone(), + tokens: prefix.tokens.clone(), + ctx: prefix.ctx.clone(), + err: prefix.err.clone(), + }); + } + parse_block_body_from_prefix(&prefix, &start_span) + } + BodyKind::ServiceBody => parse_service_after_kw(&tokens, &ctx, &start_span), + BodyKind::ResourceBody => parse_resource_after_kw(tokens.clone(), &ctx, &start_span), + BodyKind::ValueBody => parse_data_after_kw(tokens.clone(), &ctx, &start_span), + BodyKind::NoBody => { + let prefix = parse_item_prefix(&tokens, &ctx, &form); + if has_err(prefix.err.clone()) { + return Rc::new(ItemResult { + item: dummy.clone(), + tokens: prefix.tokens.clone(), + ctx: prefix.ctx.clone(), + err: prefix.err.clone(), + }); + } + parse_no_body_from_prefix(&prefix, start_span.clone()) + } + } + } } + +pub fn field_to_child_node( + field: &Rc, + source_indices: &Rc>>, +) -> Rc { + { + let ret_type = field_node_type_expr(&field); + let props = match field_node_from_key(field.clone(), source_indices.clone()) { + Some(key) => Rc::new(vec![make_field_init_node( + &"from_key".to_string(), + make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { value: key.clone() }), + }), + Rc::new(vec![]), + None, + field.span.clone(), + ), + field.span.clone(), + no_span(), + )]), + None => Rc::new(vec![]), + }; + Rc::new(Node { + name: field_node_name_at(field.clone(), source_indices.clone()), + span: field.span.clone(), + ident_span: field.ident_span.clone(), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::Resolved { node: ret_type })), + return_cardinality: field_node_cardinality(field.clone()), + uses: Rc::new(vec![]), + body: field_node_default_value(&field), + transport: None, + properties: props, + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) + } } -pub fn variant_to_child_node(variant: &Rc, source_indices: &Rc>>) -> Rc { +pub fn variant_to_child_node( + variant: &Rc, + source_indices: &Rc>>, +) -> Rc { { let fields = variant_node_fields(variant.clone()); -let children = Rc::new({ let mut __result = Vec::new(); for f in fields.clone().iter().cloned() { __result.push(field_to_child_node(&f, &source_indices)); } __result }); -Rc::new(Node { - name: variant_node_name_at(variant.clone(), source_indices.clone()), - span: variant.span.clone(), - ident_span: variant.ident_span.clone(), - children: children, - connective: if ((fields.clone().len() as i64) > 0) { - Connective::Conj - } else { - Connective::NoConnective - }, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) -} + let children = Rc::new({ + let mut __result = Vec::new(); + for f in fields.clone().iter().cloned() { + __result.push(field_to_child_node(&f, &source_indices)); + } + __result + }); + Rc::new(Node { + name: variant_node_name_at(variant.clone(), source_indices.clone()), + span: variant.span.clone(), + ident_span: variant.ident_span.clone(), + children: children, + connective: if ((fields.clone().len() as i64) > 0) { + Connective::Conj + } else { + Connective::NoConnective + }, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) + } } -pub fn outputs_to_inferred(outputs: &Rc>>, span: Rc, source_indices: Rc>>) -> Option> { +pub fn outputs_to_inferred( + outputs: &Rc>>, + span: Rc, + source_indices: Rc>>, +) -> Option> { if ((outputs.clone().len() as i64) > 0) { Some(Rc::new(InferredNode::Resolved { - node: Rc::new(Node { - name: "".to_string(), - span: span, - ident_span: None, - children: Rc::new({ let mut __result = Vec::new(); for f in outputs.clone().iter().cloned() { __result.push(field_to_child_node(&f, &source_indices)); } __result }), - connective: Connective::Conj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}), -})) + node: Rc::new(Node { + name: "".to_string(), + span: span, + ident_span: None, + children: Rc::new({ + let mut __result = Vec::new(); + for f in outputs.clone().iter().cloned() { + __result.push(field_to_child_node(&f, &source_indices)); + } + __result + }), + connective: Connective::Conj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }), + })) } else { None } } -pub fn make_operation_node(name: String, ident_span: Option>, inputs: Rc>>, outputs: Rc>>, response_props: Rc>>, mock_props: Rc>>, exit_props: Rc>>, modifier_props: Rc>>, transport: Option>, span: &Rc, source_indices: &Rc>>) -> Rc { +pub fn make_operation_node( + name: String, + ident_span: Option>, + inputs: Rc>>, + outputs: Rc>>, + response_props: Rc>>, + mock_props: Rc>>, + exit_props: Rc>>, + modifier_props: Rc>>, + transport: Option>, + span: &Rc, + source_indices: &Rc>>, +) -> Rc { { - let all_props = v2_rt::concat(v2_rt::concat(v2_rt::concat(modifier_props, response_props), exit_props), mock_props); -Rc::new(Node { - name: name, - span: span.clone(), - ident_span: ident_span, - children: Rc::new(vec![]), - params: Rc::new({ let mut __result = Vec::new(); for f in inputs.iter().cloned() { __result.push(make_param_node(&field_node_name_at(f.clone(), source_indices.clone()), field_node_type_expr(&f), field_node_default_value(&f), f.span.clone(), node_name_span(&f))); } __result }), - inferred: outputs_to_inferred(&outputs, span.clone(), source_indices.clone()), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: transport, - properties: all_props, - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) -} + let all_props = v2_rt::concat( + v2_rt::concat(v2_rt::concat(modifier_props, response_props), exit_props), + mock_props, + ); + Rc::new(Node { + name: name, + span: span.clone(), + ident_span: ident_span, + children: Rc::new(vec![]), + params: Rc::new({ + let mut __result = Vec::new(); + for f in inputs.iter().cloned() { + __result.push(make_param_node( + &field_node_name_at(f.clone(), source_indices.clone()), + field_node_type_expr(&f), + field_node_default_value(&f), + f.span.clone(), + node_name_span(&f), + )); + } + __result + }), + inferred: outputs_to_inferred(&outputs, span.clone(), source_indices.clone()), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: transport, + properties: all_props, + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) + } } -pub fn make_capability_node(name: String, ident_span: Option>, inputs: Rc>>, outputs: Rc>>, span: &Rc, source_indices: &Rc>>) -> Rc { +pub fn make_capability_node( + name: String, + ident_span: Option>, + inputs: Rc>>, + outputs: Rc>>, + span: &Rc, + source_indices: &Rc>>, +) -> Rc { Rc::new(Node { - name: name, - span: span.clone(), - ident_span: ident_span, - children: Rc::new(vec![]), - params: Rc::new({ let mut __result = Vec::new(); for f in inputs.iter().cloned() { __result.push(make_param_node(&field_node_name_at(f.clone(), source_indices.clone()), field_node_type_expr(&f), field_node_default_value(&f), f.span.clone(), node_name_span(&f))); } __result }), - inferred: outputs_to_inferred(&outputs, span.clone(), source_indices.clone()), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) + name: name, + span: span.clone(), + ident_span: ident_span, + children: Rc::new(vec![]), + params: Rc::new({ + let mut __result = Vec::new(); + for f in inputs.iter().cloned() { + __result.push(make_param_node( + &field_node_name_at(f.clone(), source_indices.clone()), + field_node_type_expr(&f), + field_node_default_value(&f), + f.span.clone(), + node_name_span(&f), + )); + } + __result + }), + inferred: outputs_to_inferred(&outputs, span.clone(), source_indices.clone()), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) } pub fn parse_type_def(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); -let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { - text: "type".to_string(), -})); -if has_err(r.err.clone()) { + let dummy = Rc::new(Node { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let r = expect( + &tokens, + &Rc::new(ExpectedToken::ExpectKeyword { + text: "type".to_string(), + }), + ); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + item: dummy, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -parse_type_after_kw(&r.tokens.clone(), &ctx, &start_span) -} + parse_type_after_kw(&r.tokens.clone(), &ctx, &start_span) + } } -pub fn parse_type_after_kw(tokens: &Rc>>, ctx: &Rc, start_span: &Rc) -> Rc { +pub fn parse_type_after_kw( + tokens: &Rc>>, + ctx: &Rc, + start_span: &Rc, +) -> Rc { { let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let r = expect_ident(&tokens); -if has_err(r.err.clone()) { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let r = expect_ident(&tokens); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let name = r.name.clone(); -let name_span = r.span.clone(); -let tokens = r.tokens.clone(); -let type_params_result = parse_optional_type_params(&tokens, ctx.clone()); -let type_params = type_params_result.params.clone(); -let tokens = skip_newlines(type_params_result.tokens.clone()); -let ctx = type_params_result.ctx.clone(); -let tokens = type_body_tokens_after_modifiers(tokens.clone()); -match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLBrace))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r = parse_field_list(skip_newlines(__ec.clone()), ctx.clone()); -let named_dummy = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: type_params.clone(), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -if has_err(r.err.clone()) { - return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let tokens = skip_newlines(r.tokens.clone()); -let ctx = r.ctx.clone(); -let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r2.err.clone()) { - return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) - } -let type_children = Rc::new({ let mut __result = Vec::new(); for f in r.fields.clone().iter().cloned() { __result.push(field_to_child_node(&f, &ctx.source_indices.clone())); } __result }); -let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: type_children, - connective: Connective::Conj, - params: type_params.clone(), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -Rc::new(ItemResult { - item: item, - tokens: skip_newlines(r2.tokens.clone()), - ctx: ctx.clone(), - err: None, -}) -}, - EatResult::EatUnchanged { tokens: __eu, .. } => match (*eat(&tokens, Rc::new(ExpectedToken::ExpectEq))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let tokens = skip_newlines(__ec.clone()); -parse_type_body_after_eq(&tokens, &ctx, &name, &name_span, &start_span, &type_params) -}, - EatResult::EatUnchanged { tokens: __eu, .. } => { - let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: type_params.clone(), - inferred: Some(Rc::new(InferredNode::Resolved { - node: leaf_type_node(&name, &name_span), -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -Rc::new(ItemResult { - item: item, - tokens: __eu.clone(), - ctx: ctx.clone(), - err: None, -}) -}, -}, -} -} + item: dummy, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let name = r.name.clone(); + let name_span = r.span.clone(); + let tokens = r.tokens.clone(); + let type_params_result = parse_optional_type_params(&tokens, ctx.clone()); + let type_params = type_params_result.params.clone(); + let tokens = skip_newlines(type_params_result.tokens.clone()); + let ctx = type_params_result.ctx.clone(); + let tokens = type_body_tokens_after_modifiers(tokens.clone()); + match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLBrace))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let r = parse_field_list(skip_newlines(__ec.clone()), ctx.clone()); + let named_dummy = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: type_params.clone(), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + if has_err(r.err.clone()) { + return Rc::new(ItemResult { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let tokens = skip_newlines(r.tokens.clone()); + let ctx = r.ctx.clone(); + let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); + if has_err(r2.err.clone()) { + return Rc::new(ItemResult { + item: named_dummy.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); + } + let type_children = Rc::new({ + let mut __result = Vec::new(); + for f in r.fields.clone().iter().cloned() { + __result.push(field_to_child_node(&f, &ctx.source_indices.clone())); + } + __result + }); + let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: type_children, + connective: Connective::Conj, + params: type_params.clone(), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + Rc::new(ItemResult { + item: item, + tokens: skip_newlines(r2.tokens.clone()), + ctx: ctx.clone(), + err: None, + }) + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + match (*eat(&tokens, Rc::new(ExpectedToken::ExpectEq))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let tokens = skip_newlines(__ec.clone()); + parse_type_body_after_eq( + &tokens, + &ctx, + &name, + &name_span, + &start_span, + &type_params, + ) + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: type_params.clone(), + inferred: Some(Rc::new(InferredNode::Resolved { + node: leaf_type_node(&name, &name_span), + })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + Rc::new(ItemResult { + item: item, + tokens: __eu.clone(), + ctx: ctx.clone(), + err: None, + }) + } + } + } + } + } } -pub fn parse_type_body_from_prefix(prefix: &Rc, start_span: &Rc) -> Rc { +pub fn parse_type_body_from_prefix( + prefix: &Rc, + start_span: &Rc, +) -> Rc { { let name = prefix.name.clone(); -let name_span = prefix.name_span.clone(); -let type_params = prefix.type_params.clone(); -let ctx = prefix.ctx.clone(); -let named_dummy = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: type_params.clone(), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let tokens = type_body_tokens_after_modifiers(skip_newlines(prefix.tokens.clone())); -match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLBrace))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r = parse_field_list(skip_newlines(__ec.clone()), ctx.clone()); -if has_err(r.err.clone()) { - return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let tokens = skip_newlines(r.tokens.clone()); -let ctx = r.ctx.clone(); -let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r2.err.clone()) { - return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) - } -let type_children = Rc::new({ let mut __result = Vec::new(); for f in r.fields.clone().iter().cloned() { __result.push(field_to_child_node(&f, &ctx.source_indices.clone())); } __result }); -let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: type_children, - connective: Connective::Conj, - params: type_params.clone(), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -Rc::new(ItemResult { - item: item, - tokens: skip_newlines(r2.tokens.clone()), - ctx: ctx.clone(), - err: None, -}) -}, - EatResult::EatUnchanged { tokens: __eu, .. } => match (*eat(&tokens, Rc::new(ExpectedToken::ExpectEq))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let tokens = skip_newlines(__ec.clone()); -parse_type_body_after_eq(&tokens, &ctx, &name, &name_span, &start_span, &type_params) -}, - EatResult::EatUnchanged { tokens: __eu, .. } => { - let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: type_params.clone(), - inferred: Some(Rc::new(InferredNode::Resolved { - node: leaf_type_node(&name, &name_span), -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -Rc::new(ItemResult { - item: item, - tokens: __eu.clone(), - ctx: ctx.clone(), - err: None, -}) -}, -}, -} -} + let name_span = prefix.name_span.clone(); + let type_params = prefix.type_params.clone(); + let ctx = prefix.ctx.clone(); + let named_dummy = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: type_params.clone(), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let tokens = type_body_tokens_after_modifiers(skip_newlines(prefix.tokens.clone())); + match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLBrace))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let r = parse_field_list(skip_newlines(__ec.clone()), ctx.clone()); + if has_err(r.err.clone()) { + return Rc::new(ItemResult { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let tokens = skip_newlines(r.tokens.clone()); + let ctx = r.ctx.clone(); + let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); + if has_err(r2.err.clone()) { + return Rc::new(ItemResult { + item: named_dummy.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); + } + let type_children = Rc::new({ + let mut __result = Vec::new(); + for f in r.fields.clone().iter().cloned() { + __result.push(field_to_child_node(&f, &ctx.source_indices.clone())); + } + __result + }); + let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: type_children, + connective: Connective::Conj, + params: type_params.clone(), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + Rc::new(ItemResult { + item: item, + tokens: skip_newlines(r2.tokens.clone()), + ctx: ctx.clone(), + err: None, + }) + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + match (*eat(&tokens, Rc::new(ExpectedToken::ExpectEq))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let tokens = skip_newlines(__ec.clone()); + parse_type_body_after_eq( + &tokens, + &ctx, + &name, + &name_span, + &start_span, + &type_params, + ) + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: type_params.clone(), + inferred: Some(Rc::new(InferredNode::Resolved { + node: leaf_type_node(&name, &name_span), + })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + Rc::new(ItemResult { + item: item, + tokens: __eu.clone(), + ctx: ctx.clone(), + err: None, + }) + } + } + } + } + } } -pub fn parse_type_body_after_eq(tokens: &Rc>>, ctx: &Rc, name: &String, name_span: &Rc, start_span: &Rc, type_params: &Rc>>) -> Rc { +pub fn parse_type_body_after_eq( + tokens: &Rc>>, + ctx: &Rc, + name: &String, + name_span: &Rc, + start_span: &Rc, + type_params: &Rc>>, +) -> Rc { { let dummy = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: type_params.clone(), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -if tok_is_ident(tokens.clone().first().cloned()) { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: type_params.clone(), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + if tok_is_ident(tokens.clone().first().cloned()) { { let r = expect_ident(&tokens); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + item: dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -let first_name = r.name.clone(); -let first_name_span = r.span.clone(); -let tokens = skip_newlines(r.tokens.clone()); -if (tok_is_lbrace(tokens.clone().first().cloned()) || tok_is_pipe(tokens.clone().first().cloned())) { - { - let r = parse_variant_fields(&tokens, ctx.clone(), &first_name, &first_name_span); -if has_err(r.err.clone()) { - return Rc::new(ItemResult { - item: dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let first_variant = r.variant.clone(); -let rest = parse_more_variants_acc(r.tokens.clone(), r.ctx.clone(), Rc::new(vec![first_variant])); -if has_err(rest.err.clone()) { - return Rc::new(ItemResult { - item: dummy.clone(), - tokens: rest.tokens.clone(), - ctx: rest.ctx.clone(), - err: rest.err.clone(), -}) - } -let variants = rest.variants.clone(); -let type_children = Rc::new({ let mut __result = Vec::new(); for v in variants.iter().cloned() { __result.push(variant_to_child_node(&v, &ctx.source_indices.clone())); } __result }); -let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: type_children, - connective: Connective::Disj, - params: type_params.clone(), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -Rc::new(ItemResult { - item: item, - tokens: skip_newlines(rest.tokens.clone()), - ctx: rest.ctx.clone(), - err: None, -}) -} + let first_name = r.name.clone(); + let first_name_span = r.span.clone(); + let tokens = skip_newlines(r.tokens.clone()); + if (tok_is_lbrace(tokens.clone().first().cloned()) + || tok_is_pipe(tokens.clone().first().cloned())) + { + { + let r = parse_variant_fields( + &tokens, + ctx.clone(), + &first_name, + &first_name_span, + ); + if has_err(r.err.clone()) { + return Rc::new(ItemResult { + item: dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let first_variant = r.variant.clone(); + let rest = parse_more_variants_acc( + r.tokens.clone(), + r.ctx.clone(), + Rc::new(vec![first_variant]), + ); + if has_err(rest.err.clone()) { + return Rc::new(ItemResult { + item: dummy.clone(), + tokens: rest.tokens.clone(), + ctx: rest.ctx.clone(), + err: rest.err.clone(), + }); + } + let variants = rest.variants.clone(); + let type_children = Rc::new({ + let mut __result = Vec::new(); + for v in variants.iter().cloned() { + __result + .push(variant_to_child_node(&v, &ctx.source_indices.clone())); + } + __result + }); + let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: type_children, + connective: Connective::Disj, + params: type_params.clone(), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + Rc::new(ItemResult { + item: item, + tokens: skip_newlines(rest.tokens.clone()), + ctx: rest.ctx.clone(), + err: None, + }) + } } else { { - let r = finish_type_expr_from_name(&tokens, ctx.clone(), &first_name, &first_name_span); -if has_err(r.err.clone()) { + let r = finish_type_expr_from_name( + &tokens, + ctx.clone(), + &first_name, + &first_name_span, + ); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + item: dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -let wr = try_where_clause(&r.tokens.clone(), r.ctx.clone(), &r.type_expr.clone(), &start_span); -if has_err(wr.err.clone()) { + let wr = try_where_clause( + &r.tokens.clone(), + r.ctx.clone(), + &r.type_expr.clone(), + &start_span, + ); + if has_err(wr.err.clone()) { return Rc::new(ItemResult { - item: dummy.clone(), - tokens: wr.tokens.clone(), - ctx: wr.ctx.clone(), - err: wr.err.clone(), -}) + item: dummy.clone(), + tokens: wr.tokens.clone(), + ctx: wr.ctx.clone(), + err: wr.err.clone(), + }); } -let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: type_params.clone(), - inferred: Some(Rc::new(InferredNode::Resolved { - node: wr.type_expr.clone(), -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -Rc::new(ItemResult { - item: item, - tokens: skip_newlines(wr.tokens.clone()), - ctx: wr.ctx.clone(), - err: None, -}) -} + let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: type_params.clone(), + inferred: Some(Rc::new(InferredNode::Resolved { + node: wr.type_expr.clone(), + })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + Rc::new(ItemResult { + item: item, + tokens: skip_newlines(wr.tokens.clone()), + ctx: wr.ctx.clone(), + err: None, + }) + } } -} + } } else { { let r = parse_type_expr(&tokens, &ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let wr = try_where_clause(&r.tokens.clone(), r.ctx.clone(), &r.type_expr.clone(), &start_span); -if has_err(wr.err.clone()) { + item: dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let wr = try_where_clause( + &r.tokens.clone(), + r.ctx.clone(), + &r.type_expr.clone(), + &start_span, + ); + if has_err(wr.err.clone()) { return Rc::new(ItemResult { - item: dummy.clone(), - tokens: wr.tokens.clone(), - ctx: wr.ctx.clone(), - err: wr.err.clone(), -}) - } -let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: type_params.clone(), - inferred: Some(Rc::new(InferredNode::Resolved { - node: wr.type_expr.clone(), -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -Rc::new(ItemResult { - item: item, - tokens: skip_newlines(wr.tokens.clone()), - ctx: wr.ctx.clone(), - err: None, -}) -} + item: dummy.clone(), + tokens: wr.tokens.clone(), + ctx: wr.ctx.clone(), + err: wr.err.clone(), + }); + } + let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: type_params.clone(), + inferred: Some(Rc::new(InferredNode::Resolved { + node: wr.type_expr.clone(), + })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + Rc::new(ItemResult { + item: item, + tokens: skip_newlines(wr.tokens.clone()), + ctx: wr.ctx.clone(), + err: None, + }) + } } -} + } } -pub fn try_where_clause(tokens: &Rc>>, ctx: Rc, base_te: &Rc, start_span: &Rc) -> Rc { +pub fn try_where_clause( + tokens: &Rc>>, + ctx: Rc, + base_te: &Rc, + start_span: &Rc, +) -> Rc { if tok_is_keyword(tokens.clone().first().cloned(), "where".to_string()) { match (*advance(&tokens)).clone() { - AdvanceResult::AdvanceOk { tokens: rest, .. } => { - let r = parse_predicates(rest.clone(), ctx); -if has_err(r.err.clone()) { - return Rc::new(TypeResult { - type_expr: base_te.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let predicate_node = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: r.predicates.clone(), - connective: Connective::Conj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let refined = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![base_te.clone()]), - connective: Connective::Conj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: Some(predicate_node), - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -Rc::new(TypeResult { - type_expr: refined, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -}, - AdvanceResult::AdvanceEof => Rc::new(TypeResult { - type_expr: base_te.clone(), - tokens: tokens.clone(), - ctx: ctx, - err: None, -}), -} + AdvanceResult::AdvanceOk { tokens: rest, .. } => { + let r = parse_predicates(rest.clone(), ctx); + if has_err(r.err.clone()) { + return Rc::new(TypeResult { + type_expr: base_te.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let predicate_node = Rc::new(Node { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: r.predicates.clone(), + connective: Connective::Conj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let refined = Rc::new(Node { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![base_te.clone()]), + connective: Connective::Conj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: Some(predicate_node), + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + Rc::new(TypeResult { + type_expr: refined, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } + AdvanceResult::AdvanceEof => Rc::new(TypeResult { + type_expr: base_te.clone(), + tokens: tokens.clone(), + ctx: ctx, + err: None, + }), + } } else { Rc::new(TypeResult { - type_expr: base_te.clone(), - tokens: tokens.clone(), - ctx: ctx, - err: None, -}) + type_expr: base_te.clone(), + tokens: tokens.clone(), + ctx: ctx, + err: None, + }) } } @@ -3074,757 +3572,1005 @@ pub fn parse_predicates(tokens: Rc>>, ctx: Rc) -> Rc parse_predicates_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_predicates_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_predicates_acc( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { let r = parse_single_predicate(&tokens, &ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(PredsResult { - predicates: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -acc = v2_rt::rc_list_push(acc.clone(), r.predicate.clone()); -match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { { - let __tco_0 = skip_newlines(__ec.clone()); -let __tco_1 = r.ctx.clone(); -tokens = __tco_0; -ctx = __tco_1; -continue; -} }, - EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(PredsResult { - predicates: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}); }, -} -} -} - -pub fn parse_single_predicate(tokens: &Rc>>, ctx: &Rc) -> Rc { + predicates: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + acc = v2_rt::rc_list_push(acc.clone(), r.predicate.clone()); + match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let __tco_0 = skip_newlines(__ec.clone()); + let __tco_1 = r.ctx.clone(); + tokens = __tco_0; + ctx = __tco_1; + continue; + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + break Rc::new(PredsResult { + predicates: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }); + } + } + } +} + +pub fn parse_single_predicate( + tokens: &Rc>>, + ctx: &Rc, +) -> Rc { { let zero_span = make_span(0, 0); -let dummy_pred = make_field_init_node(&"".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitBool { - value: false, -}), -}), Rc::new(vec![]), None, zero_span.clone()), zero_span.clone(), zero_span.clone()); -let r = expect_name(&tokens); -if has_err(r.err.clone()) { + let dummy_pred = make_field_init_node( + &"".to_string(), + make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitBool { value: false }), + }), + Rc::new(vec![]), + None, + zero_span.clone(), + ), + zero_span.clone(), + zero_span.clone(), + ); + let r = expect_name(&tokens); + if has_err(r.err.clone()) { return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let pred_name = r.name.clone(); -let tokens = r.tokens.clone(); -match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLParen))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let tokens = __ec.clone(); -match pred_name.clone().as_str() { - "pattern" => { - let r2 = parse_string_literal_value(&tokens); -if has_err(r2.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); -if has_err(r3.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: r3.err.clone(), -}) - } -Rc::new(PredResult { - predicate: make_field_init_node(&"Pattern".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: r2.value.clone(), -}), -}), Rc::new(vec![]), None, zero_span.clone()), zero_span.clone(), zero_span.clone()), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: None, -}) -}, - "format" => { - let r2 = expect_ident(&tokens); -if has_err(r2.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); -if has_err(r3.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: r3.err.clone(), -}) - } -Rc::new(PredResult { - predicate: make_field_init_node(&"Format".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: r2.name.clone(), -}), -}), Rc::new(vec![]), None, zero_span.clone()), zero_span.clone(), zero_span.clone()), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: None, -}) -}, - "brand" => { - let r2 = parse_string_literal_value(&tokens); -if has_err(r2.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); -if has_err(r3.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: r3.err.clone(), -}) - } -Rc::new(PredResult { - predicate: make_field_init_node(&"Brand".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: r2.value.clone(), -}), -}), Rc::new(vec![]), None, zero_span.clone()), zero_span.clone(), zero_span.clone()), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: None, -}) -}, - "content" => { - let r2 = expect_ident(&tokens); -if has_err(r2.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); -if has_err(r3.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: r3.err.clone(), -}) - } -Rc::new(PredResult { - predicate: make_field_init_node(&"ContentEncoding".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: r2.name.clone(), -}), -}), Rc::new(vec![]), None, zero_span.clone()), zero_span.clone(), zero_span.clone()), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: None, -}) -}, - "domain" => { - let r2 = expect_ident(&tokens); -if has_err(r2.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); -if has_err(r3.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: r3.err.clone(), -}) + predicate: dummy_pred.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let pred_name = r.name.clone(); + let tokens = r.tokens.clone(); + match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLParen))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let tokens = __ec.clone(); + match pred_name.clone().as_str() { + "pattern" => { + let r2 = parse_string_literal_value(&tokens); + if has_err(r2.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); + if has_err(r3.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: r3.err.clone(), + }); + } + Rc::new(PredResult { + predicate: make_field_init_node( + &"Pattern".to_string(), + make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: r2.value.clone(), + }), + }), + Rc::new(vec![]), + None, + zero_span.clone(), + ), + zero_span.clone(), + zero_span.clone(), + ), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } + "format" => { + let r2 = expect_ident(&tokens); + if has_err(r2.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); + if has_err(r3.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: r3.err.clone(), + }); + } + Rc::new(PredResult { + predicate: make_field_init_node( + &"Format".to_string(), + make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: r2.name.clone(), + }), + }), + Rc::new(vec![]), + None, + zero_span.clone(), + ), + zero_span.clone(), + zero_span.clone(), + ), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } + "brand" => { + let r2 = parse_string_literal_value(&tokens); + if has_err(r2.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); + if has_err(r3.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: r3.err.clone(), + }); + } + Rc::new(PredResult { + predicate: make_field_init_node( + &"Brand".to_string(), + make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: r2.value.clone(), + }), + }), + Rc::new(vec![]), + None, + zero_span.clone(), + ), + zero_span.clone(), + zero_span.clone(), + ), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } + "content" => { + let r2 = expect_ident(&tokens); + if has_err(r2.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); + if has_err(r3.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: r3.err.clone(), + }); + } + Rc::new(PredResult { + predicate: make_field_init_node( + &"ContentEncoding".to_string(), + make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: r2.name.clone(), + }), + }), + Rc::new(vec![]), + None, + zero_span.clone(), + ), + zero_span.clone(), + zero_span.clone(), + ), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } + "domain" => { + let r2 = expect_ident(&tokens); + if has_err(r2.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); + if has_err(r3.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: r3.err.clone(), + }); + } + Rc::new(PredResult { + predicate: make_field_init_node( + &"Domain".to_string(), + make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: r2.name.clone(), + }), + }), + Rc::new(vec![]), + None, + zero_span.clone(), + ), + zero_span.clone(), + zero_span.clone(), + ), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } + "range" => { + let r2 = parse_named_int_args(tokens.clone(), ctx.clone()); + if has_err(r2.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); + if has_err(r3.err.clone()) { + return Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), + }); + } + let min_fields = if (r2.min_val.clone() != None) { + Rc::new(vec![make_field_init_node( + &"min".to_string(), + make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitInt { + value: r2.min_val.clone().clone().unwrap(), + }), + }), + Rc::new(vec![]), + None, + zero_span.clone(), + ), + zero_span.clone(), + zero_span.clone(), + )]) + } else { + Rc::new(vec![]) + }; + let max_fields = if (r2.max_val.clone() != None) { + Rc::new(vec![make_field_init_node( + &"max".to_string(), + make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitInt { + value: r2.max_val.clone().clone().unwrap(), + }), + }), + Rc::new(vec![]), + None, + zero_span.clone(), + ), + zero_span.clone(), + zero_span.clone(), + )]) + } else { + Rc::new(vec![]) + }; + Rc::new(PredResult { + predicate: make_field_init_node( + &"Range".to_string(), + make_expr_node( + Rc::new(ExprData::ExprRecordLit { parent_enum: None }), + v2_rt::concat(min_fields, max_fields), + None, + zero_span.clone(), + ), + zero_span.clone(), + zero_span.clone(), + ), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: None, + }) + } + _ => Rc::new(PredResult { + predicate: dummy_pred.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error( + v2_rt::concat( + v2_rt::concat( + "unknown where predicate `".to_string(), + pred_name.clone(), + ), + "`".to_string(), + ), + token_span(tokens.clone().first().cloned()), + )), + }), } -Rc::new(PredResult { - predicate: make_field_init_node(&"Domain".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: r2.name.clone(), -}), -}), Rc::new(vec![]), None, zero_span.clone()), zero_span.clone(), zero_span.clone()), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: None, -}) -}, - "range" => { - let r2 = parse_named_int_args(tokens.clone(), ctx.clone()); -if has_err(r2.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); -if has_err(r3.err.clone()) { - return Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), -}) - } -let min_fields = if (r2.min_val.clone() != None) { - Rc::new(vec![make_field_init_node(&"min".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitInt { - value: r2.min_val.clone().clone().unwrap(), -}), -}), Rc::new(vec![]), None, zero_span.clone()), zero_span.clone(), zero_span.clone())]) - } else { - Rc::new(vec![]) - }; -let max_fields = if (r2.max_val.clone() != None) { - Rc::new(vec![make_field_init_node(&"max".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitInt { - value: r2.max_val.clone().clone().unwrap(), -}), -}), Rc::new(vec![]), None, zero_span.clone()), zero_span.clone(), zero_span.clone())]) - } else { - Rc::new(vec![]) - }; -Rc::new(PredResult { - predicate: make_field_init_node(&"Range".to_string(), make_expr_node(Rc::new(ExprData::ExprRecordLit { - parent_enum: None, -}), v2_rt::concat(min_fields, max_fields), None, zero_span.clone()), zero_span.clone(), zero_span.clone()), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: None, -}) -}, - _ => Rc::new(PredResult { - predicate: dummy_pred.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error(v2_rt::concat(v2_rt::concat("unknown where predicate `".to_string(), pred_name.clone()), "`".to_string()), token_span(tokens.clone().first().cloned()))), -}), -} -}, - EatResult::EatUnchanged { tokens: __eu, .. } => match pred_name.clone().as_str() { - "non_empty" => Rc::new(PredResult { - predicate: make_field_init_node(&"NonEmpty".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitBool { - value: true, -}), -}), Rc::new(vec![]), None, zero_span.clone()), zero_span.clone(), zero_span.clone()), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}), - _ => Rc::new(PredResult { - predicate: make_field_init_node(&pred_name, make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitBool { - value: true, -}), -}), Rc::new(vec![]), None, zero_span.clone()), zero_span.clone(), zero_span.clone()), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}), -}, -} -} + } + EatResult::EatUnchanged { tokens: __eu, .. } => match pred_name.clone().as_str() { + "non_empty" => Rc::new(PredResult { + predicate: make_field_init_node( + &"NonEmpty".to_string(), + make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitBool { value: true }), + }), + Rc::new(vec![]), + None, + zero_span.clone(), + ), + zero_span.clone(), + zero_span.clone(), + ), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }), + _ => Rc::new(PredResult { + predicate: make_field_init_node( + &pred_name, + make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitBool { value: true }), + }), + Rc::new(vec![]), + None, + zero_span.clone(), + ), + zero_span.clone(), + zero_span.clone(), + ), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }), + }, + } + } } -pub fn parse_named_int_args(tokens: Rc>>, ctx: Rc) -> Rc { +pub fn parse_named_int_args( + tokens: Rc>>, + ctx: Rc, +) -> Rc { { let r = parse_single_named_int(tokens, &ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(RangeArgsResult { - min_val: None, - max_val: None, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r2 = parse_single_named_int(skip_newlines(__ec.clone()), &r.ctx.clone()); -if has_err(r2.err.clone()) { - return Rc::new(RangeArgsResult { - min_val: None, - max_val: None, - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), -}) - } -let min_val = if (r.arg_name.clone().as_str() == "min".to_string().as_str()) { - Some(r.arg_value.clone()) - } else { - if (r2.arg_name.clone().as_str() == "min".to_string().as_str()) { - Some(r2.arg_value.clone()) + min_val: None, + max_val: None, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let r2 = parse_single_named_int(skip_newlines(__ec.clone()), &r.ctx.clone()); + if has_err(r2.err.clone()) { + return Rc::new(RangeArgsResult { + min_val: None, + max_val: None, + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), + }); + } + let min_val = if (r.arg_name.clone().as_str() == "min".to_string().as_str()) { + Some(r.arg_value.clone()) + } else { + if (r2.arg_name.clone().as_str() == "min".to_string().as_str()) { + Some(r2.arg_value.clone()) + } else { + None + } + }; + let max_val = if (r.arg_name.clone().as_str() == "max".to_string().as_str()) { + Some(r.arg_value.clone()) + } else { + if (r2.arg_name.clone().as_str() == "max".to_string().as_str()) { + Some(r2.arg_value.clone()) + } else { + None + } + }; + Rc::new(RangeArgsResult { + min_val: min_val, + max_val: max_val, + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: None, + }) + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + let min_val = if (r.arg_name.clone().as_str() == "min".to_string().as_str()) { + Some(r.arg_value.clone()) } else { None - } - }; -let max_val = if (r.arg_name.clone().as_str() == "max".to_string().as_str()) { - Some(r.arg_value.clone()) - } else { - if (r2.arg_name.clone().as_str() == "max".to_string().as_str()) { - Some(r2.arg_value.clone()) + }; + let max_val = if (r.arg_name.clone().as_str() == "max".to_string().as_str()) { + Some(r.arg_value.clone()) } else { None - } - }; -Rc::new(RangeArgsResult { - min_val: min_val, - max_val: max_val, - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: None, -}) -}, - EatResult::EatUnchanged { tokens: __eu, .. } => { - let min_val = if (r.arg_name.clone().as_str() == "min".to_string().as_str()) { - Some(r.arg_value.clone()) - } else { - None - }; -let max_val = if (r.arg_name.clone().as_str() == "max".to_string().as_str()) { - Some(r.arg_value.clone()) - } else { - None - }; -Rc::new(RangeArgsResult { - min_val: min_val, - max_val: max_val, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -}, -} -} + }; + Rc::new(RangeArgsResult { + min_val: min_val, + max_val: max_val, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } + } + } } -pub fn parse_single_named_int(tokens: Rc>>, ctx: &Rc) -> Rc { +pub fn parse_single_named_int( + tokens: Rc>>, + ctx: &Rc, +) -> Rc { { let r = expect_ident(&tokens); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(NamedIntResult { - arg_name: "".to_string(), - arg_value: 0, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let name = r.name.clone(); -let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); -if has_err(r2.err.clone()) { + arg_name: "".to_string(), + arg_value: 0, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let name = r.name.clone(); + let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); + if has_err(r2.err.clone()) { return Rc::new(NamedIntResult { - arg_name: name.clone(), - arg_value: 0, - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = parse_int_literal_value(&r2.tokens.clone()); -if has_err(r3.err.clone()) { + arg_name: name.clone(), + arg_value: 0, + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = parse_int_literal_value(&r2.tokens.clone()); + if has_err(r3.err.clone()) { return Rc::new(NamedIntResult { - arg_name: name.clone(), - arg_value: 0, - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: r3.err.clone(), -}) - } -Rc::new(NamedIntResult { - arg_name: name.clone(), - arg_value: r3.value.clone(), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: None, -}) -} + arg_name: name.clone(), + arg_value: 0, + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: r3.err.clone(), + }); + } + Rc::new(NamedIntResult { + arg_name: name.clone(), + arg_value: r3.value.clone(), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } } -pub fn parse_variant_fields(tokens: &Rc>>, ctx: Rc, vname: &String, vname_span: &Rc) -> Rc { +pub fn parse_variant_fields( + tokens: &Rc>>, + ctx: Rc, + vname: &String, + vname_span: &Rc, +) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); -match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLBrace))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r = parse_field_list(skip_newlines(__ec.clone()), ctx); -if has_err(r.err.clone()) { - return Rc::new(VariantResult { - variant: make_variant_node(&vname, Rc::new(vec![]), start_span.clone(), vname_span.clone()), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let tokens = skip_newlines(r.tokens.clone()); -let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r2.err.clone()) { - return Rc::new(VariantResult { - variant: make_variant_node(&vname, Rc::new(vec![]), start_span.clone(), vname_span.clone()), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), -}) - } -let v = make_variant_node(&vname, r.fields.clone(), start_span.clone(), vname_span.clone()); -Rc::new(VariantResult { - variant: v, - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -}, - EatResult::EatUnchanged { tokens: __eu, .. } => { - let v = make_variant_node(&vname, Rc::new(vec![]), vname_span.clone(), vname_span.clone()); -Rc::new(VariantResult { - variant: v, - tokens: tokens.clone(), - ctx: ctx, - err: None, -}) -}, -} -} + match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLBrace))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let r = parse_field_list(skip_newlines(__ec.clone()), ctx); + if has_err(r.err.clone()) { + return Rc::new(VariantResult { + variant: make_variant_node( + &vname, + Rc::new(vec![]), + start_span.clone(), + vname_span.clone(), + ), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let tokens = skip_newlines(r.tokens.clone()); + let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); + if has_err(r2.err.clone()) { + return Rc::new(VariantResult { + variant: make_variant_node( + &vname, + Rc::new(vec![]), + start_span.clone(), + vname_span.clone(), + ), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), + }); + } + let v = make_variant_node( + &vname, + r.fields.clone(), + start_span.clone(), + vname_span.clone(), + ); + Rc::new(VariantResult { + variant: v, + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + let v = make_variant_node( + &vname, + Rc::new(vec![]), + vname_span.clone(), + vname_span.clone(), + ); + Rc::new(VariantResult { + variant: v, + tokens: tokens.clone(), + ctx: ctx, + err: None, + }) + } + } + } } -pub fn parse_more_variants(tokens: Rc>>, ctx: Rc) -> Rc { +pub fn parse_more_variants( + tokens: Rc>>, + ctx: Rc, +) -> Rc { parse_more_variants_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_more_variants_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_more_variants_acc( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -match (*eat(&tokens, Rc::new(ExpectedToken::ExpectPipe))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { tokens = skip_newlines(__ec.clone()); -let r = expect_ident(&tokens); -if has_err(r.err.clone()) { - return Rc::new(VariantsResult { - variants: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r2 = parse_variant_fields(&r.tokens.clone(), ctx.clone(), &r.name.clone(), &r.span.clone()); -if has_err(r2.err.clone()) { - return Rc::new(VariantsResult { - variants: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), -}) - } -{ - let __tco_0 = r2.tokens.clone(); -let __tco_1 = r2.ctx.clone(); -let __tco_2 = v2_rt::rc_list_push(acc, r2.variant.clone()); -tokens = __tco_0; -ctx = __tco_1; -acc = __tco_2; -continue; -} }, - EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(VariantsResult { - variants: acc, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); }, -} -} + match (*eat(&tokens, Rc::new(ExpectedToken::ExpectPipe))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + tokens = skip_newlines(__ec.clone()); + let r = expect_ident(&tokens); + if has_err(r.err.clone()) { + return Rc::new(VariantsResult { + variants: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r2 = parse_variant_fields( + &r.tokens.clone(), + ctx.clone(), + &r.name.clone(), + &r.span.clone(), + ); + if has_err(r2.err.clone()) { + return Rc::new(VariantsResult { + variants: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), + }); + } + { + let __tco_0 = r2.tokens.clone(); + let __tco_1 = r2.ctx.clone(); + let __tco_2 = v2_rt::rc_list_push(acc, r2.variant.clone()); + tokens = __tco_0; + ctx = __tco_1; + acc = __tco_2; + continue; + } + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + break Rc::new(VariantsResult { + variants: acc, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } + } + } } pub fn parse_type_expr(tokens: &Rc>>, ctx: &Rc) -> Rc { { let tokens = skip_newlines(tokens.clone()); -let tok = tokens.clone().first().cloned(); -let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, -}; -let span = token_span(tok.clone()); -match sh { - Some(TokenShape::ShLBrace) => { - let r = parse_field_list(skip_newlines(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>())), ctx.clone()); -if has_err(r.err.clone()) { - return Rc::new(TypeResult { - type_expr: leaf_type_node(&"".to_string(), &span), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let tokens = skip_newlines(r.tokens.clone()); -let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r2.err.clone()) { - return Rc::new(TypeResult { - type_expr: leaf_type_node(&"".to_string(), &span), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), -}) - } -let te = Rc::new(Node { - name: "".to_string(), - span: span.clone(), - ident_span: None, - children: Rc::new({ let mut __result = Vec::new(); for f in r.fields.clone().iter().cloned() { __result.push(field_to_child_node(&f, &ctx.source_indices.clone())); } __result }), - connective: Connective::Conj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -Rc::new(TypeResult { - type_expr: te, - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -}, - Some(TokenShape::ShKeyword) => if (tok.clone().unwrap().text.clone().as_str() == "fn".to_string().as_str()) { - parse_callable_type_expr(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &ctx, &span) - } else { - Rc::new(TypeResult { - type_expr: leaf_type_node(&"".to_string(), &span), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error("expected type expression".to_string(), span.clone())), -}) - }, - Some(TokenShape::ShIdent) => { - let n = tok.clone().unwrap().text.clone(); -finish_type_expr_from_name(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx.clone(), &n, &span) -}, - _ => Rc::new(TypeResult { - type_expr: leaf_type_node(&"".to_string(), &span), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error("expected type expression".to_string(), span.clone())), -}), -} -} + let tok = tokens.clone().first().cloned(); + let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, + }; + let span = token_span(tok.clone()); + match sh { + Some(TokenShape::ShLBrace) => { + let r = parse_field_list( + skip_newlines(Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + )), + ctx.clone(), + ); + if has_err(r.err.clone()) { + return Rc::new(TypeResult { + type_expr: leaf_type_node(&"".to_string(), &span), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let tokens = skip_newlines(r.tokens.clone()); + let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); + if has_err(r2.err.clone()) { + return Rc::new(TypeResult { + type_expr: leaf_type_node(&"".to_string(), &span), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), + }); + } + let te = Rc::new(Node { + name: "".to_string(), + span: span.clone(), + ident_span: None, + children: Rc::new({ + let mut __result = Vec::new(); + for f in r.fields.clone().iter().cloned() { + __result.push(field_to_child_node(&f, &ctx.source_indices.clone())); + } + __result + }), + connective: Connective::Conj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + Rc::new(TypeResult { + type_expr: te, + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } + Some(TokenShape::ShKeyword) => { + if (tok.clone().unwrap().text.clone().as_str() == "fn".to_string().as_str()) { + parse_callable_type_expr( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + &ctx, + &span, + ) + } else { + Rc::new(TypeResult { + type_expr: leaf_type_node(&"".to_string(), &span), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error( + "expected type expression".to_string(), + span.clone(), + )), + }) + } + } + Some(TokenShape::ShIdent) => { + let n = tok.clone().unwrap().text.clone(); + finish_type_expr_from_name( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx.clone(), + &n, + &span, + ) + } + _ => Rc::new(TypeResult { + type_expr: leaf_type_node(&"".to_string(), &span), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error( + "expected type expression".to_string(), + span.clone(), + )), + }), + } + } } -pub fn parse_callable_type_expr(tokens: &Rc>>, ctx: &Rc, start_span: &Rc) -> Rc { +pub fn parse_callable_type_expr( + tokens: &Rc>>, + ctx: &Rc, + start_span: &Rc, +) -> Rc { { let dummy_te = leaf_type_node(&"".to_string(), &start_span); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLParen)); -if has_err(r.err.clone()) { + let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLParen)); + if has_err(r.err.clone()) { return Rc::new(TypeResult { - type_expr: dummy_te.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let tokens = skip_newlines(r.tokens.clone()); -let params_result = if tok_is_rparen(tokens.clone().first().cloned()) { + type_expr: dummy_te.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let tokens = skip_newlines(r.tokens.clone()); + let params_result = if tok_is_rparen(tokens.clone().first().cloned()) { Rc::new(ParamsResult { - params: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) + params: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) } else { parse_callable_param_types(tokens.clone(), ctx.clone(), Rc::new(vec![])) }; -if has_err(params_result.err.clone()) { + if has_err(params_result.err.clone()) { return Rc::new(TypeResult { - type_expr: dummy_te.clone(), - tokens: params_result.tokens.clone(), - ctx: params_result.ctx.clone(), - err: params_result.err.clone(), -}) - } -let tokens = skip_newlines(params_result.tokens.clone()); -let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRParen)); -if has_err(r2.err.clone()) { + type_expr: dummy_te.clone(), + tokens: params_result.tokens.clone(), + ctx: params_result.ctx.clone(), + err: params_result.err.clone(), + }); + } + let tokens = skip_newlines(params_result.tokens.clone()); + let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRParen)); + if has_err(r2.err.clone()) { return Rc::new(TypeResult { - type_expr: dummy_te.clone(), - tokens: r2.tokens.clone(), - ctx: params_result.ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectArrow)); -if has_err(r3.err.clone()) { + type_expr: dummy_te.clone(), + tokens: r2.tokens.clone(), + ctx: params_result.ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectArrow)); + if has_err(r3.err.clone()) { return Rc::new(TypeResult { - type_expr: dummy_te.clone(), - tokens: r3.tokens.clone(), - ctx: params_result.ctx.clone(), - err: r3.err.clone(), -}) - } -let ret = parse_type_expr(&r3.tokens.clone(), ¶ms_result.ctx.clone()); -if has_err(ret.err.clone()) { + type_expr: dummy_te.clone(), + tokens: r3.tokens.clone(), + ctx: params_result.ctx.clone(), + err: r3.err.clone(), + }); + } + let ret = parse_type_expr(&r3.tokens.clone(), ¶ms_result.ctx.clone()); + if has_err(ret.err.clone()) { return Rc::new(TypeResult { - type_expr: dummy_te.clone(), - tokens: ret.tokens.clone(), - ctx: ret.ctx.clone(), - err: ret.err.clone(), -}) - } -let te = Rc::new(Node { - name: "Callable".to_string(), - span: start_span.clone(), - ident_span: Some(start_span.clone()), - children: Rc::new(vec![]), - connective: Connective::Arrow, - params: params_result.params.clone(), - inferred: Some(Rc::new(InferredNode::Resolved { - node: ret.type_expr.clone(), -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -maybe_optional(&ret.tokens.clone(), ret.ctx.clone(), &te, start_span.clone()) -} + type_expr: dummy_te.clone(), + tokens: ret.tokens.clone(), + ctx: ret.ctx.clone(), + err: ret.err.clone(), + }); + } + let te = Rc::new(Node { + name: "Callable".to_string(), + span: start_span.clone(), + ident_span: Some(start_span.clone()), + children: Rc::new(vec![]), + connective: Connective::Arrow, + params: params_result.params.clone(), + inferred: Some(Rc::new(InferredNode::Resolved { + node: ret.type_expr.clone(), + })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + maybe_optional( + &ret.tokens.clone(), + ret.ctx.clone(), + &te, + start_span.clone(), + ) + } } -pub fn parse_callable_param_types(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_callable_param_types( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { let r = parse_type_expr(&tokens, &ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ParamsResult { - params: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let param = make_param_node(&"".to_string(), r.type_expr.clone(), None, r.type_expr.clone().span.clone(), r.type_expr.clone().span.clone()); -acc = v2_rt::rc_list_push(acc.clone(), param); -match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { tokens = skip_newlines(__ec.clone()); -if tok_is_rparen(tokens.clone().first().cloned()) { - break Rc::new(ParamsResult { - params: acc.clone(), - tokens: tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}); -} else { - { - let __tco_0 = r.ctx.clone(); -ctx = __tco_0; -continue; -} -} }, - EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(ParamsResult { - params: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}); }, -} -} + params: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let param = make_param_node( + &"".to_string(), + r.type_expr.clone(), + None, + r.type_expr.clone().span.clone(), + r.type_expr.clone().span.clone(), + ); + acc = v2_rt::rc_list_push(acc.clone(), param); + match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + tokens = skip_newlines(__ec.clone()); + if tok_is_rparen(tokens.clone().first().cloned()) { + break Rc::new(ParamsResult { + params: acc.clone(), + tokens: tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }); + } else { + { + let __tco_0 = r.ctx.clone(); + ctx = __tco_0; + continue; + } + } + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + break Rc::new(ParamsResult { + params: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }); + } + } + } } -pub fn finish_type_expr_from_name(tokens: &Rc>>, ctx: Rc, type_name: &String, start_span: &Rc) -> Rc { +pub fn finish_type_expr_from_name( + tokens: &Rc>>, + ctx: Rc, + type_name: &String, + start_span: &Rc, +) -> Rc { { let dummy_te = leaf_type_node(&type_name, &start_span); -match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLt))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r = parse_type_expr(&__ec, &ctx); -if has_err(r.err.clone()) { - return r.clone() - } -let first_arg = r.type_expr.clone(); -let type_args = collect_type_args(r.tokens.clone(), r.ctx.clone(), Rc::new(vec![first_arg])); -if has_err(type_args.err.clone()) { - return Rc::new(TypeResult { - type_expr: dummy_te.clone(), - tokens: type_args.tokens.clone(), - ctx: type_args.ctx.clone(), - err: type_args.err.clone(), -}) - } -let r3 = expect(&type_args.tokens.clone(), &Rc::new(ExpectedToken::ExpectGt)); -if has_err(r3.err.clone()) { - return Rc::new(TypeResult { - type_expr: dummy_te.clone(), - tokens: r3.tokens.clone(), - ctx: type_args.ctx.clone(), - err: r3.err.clone(), -}) - } -let te = Rc::new(Node { - name: type_name.clone(), - span: start_span.clone(), - ident_span: Some(start_span.clone()), - children: type_args.args.clone(), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -maybe_optional(&r3.tokens.clone(), type_args.ctx.clone(), &te, start_span.clone()) -}, - EatResult::EatUnchanged { tokens: __eu, .. } => { - let te = leaf_type_node(&type_name, &start_span); -maybe_optional(&tokens, ctx, &te, start_span.clone()) -}, -} -} + match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLt))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let r = parse_type_expr(&__ec, &ctx); + if has_err(r.err.clone()) { + return r.clone(); + } + let first_arg = r.type_expr.clone(); + let type_args = + collect_type_args(r.tokens.clone(), r.ctx.clone(), Rc::new(vec![first_arg])); + if has_err(type_args.err.clone()) { + return Rc::new(TypeResult { + type_expr: dummy_te.clone(), + tokens: type_args.tokens.clone(), + ctx: type_args.ctx.clone(), + err: type_args.err.clone(), + }); + } + let r3 = expect(&type_args.tokens.clone(), &Rc::new(ExpectedToken::ExpectGt)); + if has_err(r3.err.clone()) { + return Rc::new(TypeResult { + type_expr: dummy_te.clone(), + tokens: r3.tokens.clone(), + ctx: type_args.ctx.clone(), + err: r3.err.clone(), + }); + } + let te = Rc::new(Node { + name: type_name.clone(), + span: start_span.clone(), + ident_span: Some(start_span.clone()), + children: type_args.args.clone(), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + maybe_optional( + &r3.tokens.clone(), + type_args.ctx.clone(), + &te, + start_span.clone(), + ) + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + let te = leaf_type_node(&type_name, &start_span); + maybe_optional(&tokens, ctx, &te, start_span.clone()) + } + } + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -3834,54 +4580,72 @@ pub struct TypeParamsResult { pub ctx: Rc, } -pub fn parse_optional_type_params(tokens: &Rc>>, ctx: Rc) -> Rc { +pub fn parse_optional_type_params( + tokens: &Rc>>, + ctx: Rc, +) -> Rc { match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLt))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let params_result = collect_type_param_names(__ec.clone(), ctx, Rc::new(vec![])); -let r = expect(¶ms_result.tokens.clone(), &Rc::new(ExpectedToken::ExpectGt)); -Rc::new(TypeParamsResult { - params: params_result.params.clone(), - tokens: r.tokens.clone(), - ctx: params_result.ctx.clone(), -}) -}, - EatResult::EatUnchanged { tokens: __eu, .. } => Rc::new(TypeParamsResult { - params: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx, -}), -} + EatResult::EatConsumed { tokens: __ec, .. } => { + let params_result = collect_type_param_names(__ec.clone(), ctx, Rc::new(vec![])); + let r = expect( + ¶ms_result.tokens.clone(), + &Rc::new(ExpectedToken::ExpectGt), + ); + Rc::new(TypeParamsResult { + params: params_result.params.clone(), + tokens: r.tokens.clone(), + ctx: params_result.ctx.clone(), + }) + } + EatResult::EatUnchanged { tokens: __eu, .. } => Rc::new(TypeParamsResult { + params: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx, + }), + } } -pub fn collect_type_param_names(mut tokens: Rc>>, mut ctx: Rc, mut params: Rc>>) -> Rc { +pub fn collect_type_param_names( + mut tokens: Rc>>, + mut ctx: Rc, + mut params: Rc>>, +) -> Rc { loop { if tok_is_ident(tokens.clone().first().cloned()) { let r = expect_ident(&tokens); -let span = r.span.clone(); -let param = make_param_node(&r.name.clone(), leaf_type_node(&r.name.clone(), &span), None, span.clone(), span.clone()); -let next_params = v2_rt::rc_list_push(params, param); -match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { { - let __tco_0 = __ec.clone(); -let __tco_1 = next_params; -tokens = __tco_0; -params = __tco_1; -continue; -} }, - EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(TypeParamsResult { - params: next_params, - tokens: r.tokens.clone(), - ctx: ctx, -}); }, -} -} else { + let span = r.span.clone(); + let param = make_param_node( + &r.name.clone(), + leaf_type_node(&r.name.clone(), &span), + None, + span.clone(), + span.clone(), + ); + let next_params = v2_rt::rc_list_push(params, param); + match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let __tco_0 = __ec.clone(); + let __tco_1 = next_params; + tokens = __tco_0; + params = __tco_1; + continue; + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + break Rc::new(TypeParamsResult { + params: next_params, + tokens: r.tokens.clone(), + ctx: ctx, + }); + } + } + } else { break Rc::new(TypeParamsResult { - params: params, - tokens: tokens.clone(), - ctx: ctx, -}); -} -} + params: params, + tokens: tokens.clone(), + ctx: ctx, + }); + } + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -3892,954 +4656,1075 @@ pub struct TypeArgsResult { pub err: Option>, } -pub fn collect_type_args(mut tokens: Rc>>, mut ctx: Rc, mut args: Rc>>) -> Rc { +pub fn collect_type_args( + mut tokens: Rc>>, + mut ctx: Rc, + mut args: Rc>>, +) -> Rc { loop { match (*eat(&tokens, Rc::new(ExpectedToken::ExpectComma))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { let r = parse_type_expr(&__ec, &ctx); -if has_err(r.err.clone()) { - return Rc::new(TypeArgsResult { - args: args.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -{ - let __tco_0 = r.tokens.clone(); -let __tco_1 = r.ctx.clone(); -let __tco_2 = v2_rt::rc_list_push(args, r.type_expr.clone()); -tokens = __tco_0; -ctx = __tco_1; -args = __tco_2; -continue; -} }, - EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(TypeArgsResult { - args: args.clone(), - tokens: tokens.clone(), - ctx: ctx, - err: None, -}); }, -} -} + EatResult::EatConsumed { tokens: __ec, .. } => { + let r = parse_type_expr(&__ec, &ctx); + if has_err(r.err.clone()) { + return Rc::new(TypeArgsResult { + args: args.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + { + let __tco_0 = r.tokens.clone(); + let __tco_1 = r.ctx.clone(); + let __tco_2 = v2_rt::rc_list_push(args, r.type_expr.clone()); + tokens = __tco_0; + ctx = __tco_1; + args = __tco_2; + continue; + } + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + break Rc::new(TypeArgsResult { + args: args.clone(), + tokens: tokens.clone(), + ctx: ctx, + err: None, + }); + } + } + } } -pub fn maybe_optional(tokens: &Rc>>, ctx: Rc, te: &Rc, start_span: Rc) -> Rc { +pub fn maybe_optional( + tokens: &Rc>>, + ctx: Rc, + te: &Rc, + start_span: Rc, +) -> Rc { match (*eat(&tokens, Rc::new(ExpectedToken::ExpectQuestion))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let ote = Rc::new(Node { - name: te.name.clone(), - span: te.span.clone(), - ident_span: te.ident_span.clone(), - children: te.children.clone(), - connective: te.connective.clone(), - params: te.params.clone(), - inferred: te.inferred.clone(), - return_cardinality: Cardinality::CardOptional, - uses: te.uses.clone(), - body: te.body.clone(), - transport: te.transport.clone(), - properties: te.properties.clone(), - type_annotation: te.type_annotation.clone(), - is_self_recursive: te.is_self_recursive.clone(), - has_non_tail_self_call: te.has_non_tail_self_call.clone(), - match_pattern: te.match_pattern.clone(), - expr_data: te.expr_data.clone(), - ident: None, -}); -Rc::new(TypeResult { - type_expr: ote, - tokens: __ec.clone(), - ctx: ctx, - err: None, -}) -}, - EatResult::EatUnchanged { tokens: __eu, .. } => Rc::new(TypeResult { - type_expr: te.clone(), - tokens: tokens.clone(), - ctx: ctx, - err: None, -}), -} + EatResult::EatConsumed { tokens: __ec, .. } => { + let ote = Rc::new(Node { + name: te.name.clone(), + span: te.span.clone(), + ident_span: te.ident_span.clone(), + children: te.children.clone(), + connective: te.connective.clone(), + params: te.params.clone(), + inferred: te.inferred.clone(), + return_cardinality: Cardinality::CardOptional, + uses: te.uses.clone(), + body: te.body.clone(), + transport: te.transport.clone(), + properties: te.properties.clone(), + type_annotation: te.type_annotation.clone(), + is_self_recursive: te.is_self_recursive.clone(), + has_non_tail_self_call: te.has_non_tail_self_call.clone(), + match_pattern: te.match_pattern.clone(), + expr_data: te.expr_data.clone(), + ident: None, + }); + Rc::new(TypeResult { + type_expr: ote, + tokens: __ec.clone(), + ctx: ctx, + err: None, + }) + } + EatResult::EatUnchanged { tokens: __eu, .. } => Rc::new(TypeResult { + type_expr: te.clone(), + tokens: tokens.clone(), + ctx: ctx, + err: None, + }), + } } pub fn parse_field_list(tokens: Rc>>, ctx: Rc) -> Rc { parse_field_list_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_field_list_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_field_list_acc( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -let tok = tokens.clone().first().cloned(); -if ((tok_is_rbrace(tok.clone()) || tok_is_rparen(tok.clone())) || tok_is_eof(tok.clone())) { + let tok = tokens.clone().first().cloned(); + if ((tok_is_rbrace(tok.clone()) || tok_is_rparen(tok.clone())) || tok_is_eof(tok.clone())) { break Rc::new(FieldsResult { - fields: acc, - tokens: tokens.clone(), - ctx: ctx, - err: None, -}); -} else { + fields: acc, + tokens: tokens.clone(), + ctx: ctx, + err: None, + }); + } else { if (tok_is_ident(tok.clone()) || tok_is_keyword_name(tok.clone())) { let r = parse_field(&tokens, &ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(FieldsResult { - fields: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -tokens = r.tokens.clone(); -let e = eat(&tokens, Rc::new(ExpectedToken::ExpectComma)); -tokens = skip_newlines(match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => tokens.clone(), -}); -{ + fields: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + tokens = r.tokens.clone(); + let e = eat(&tokens, Rc::new(ExpectedToken::ExpectComma)); + tokens = skip_newlines(match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => tokens.clone(), + }); + { let __tco_0 = r.ctx.clone(); -let __tco_1 = v2_rt::rc_list_push(acc, r.field.clone()); -ctx = __tco_0; -acc = __tco_1; -continue; -} -} else { + let __tco_1 = v2_rt::rc_list_push(acc, r.field.clone()); + ctx = __tco_0; + acc = __tco_1; + continue; + } + } else { break Rc::new(FieldsResult { - fields: acc, - tokens: tokens.clone(), - ctx: ctx, - err: None, -}); -} -} -} + fields: acc, + tokens: tokens.clone(), + ctx: ctx, + err: None, + }); + } + } + } } pub fn parse_field(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); -let dummy_field = make_field_node(&"".to_string(), leaf_type_node(&"".to_string(), &start_span), Cardinality::Required, None, None, start_span.clone(), start_span.clone()); -let r = expect_name(&tokens); -if has_err(r.err.clone()) { + let dummy_field = make_field_node( + &"".to_string(), + leaf_type_node(&"".to_string(), &start_span), + Cardinality::Required, + None, + None, + start_span.clone(), + start_span.clone(), + ); + let r = expect_name(&tokens); + if has_err(r.err.clone()) { return Rc::new(FieldResult { - field: dummy_field.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let name = r.name.clone(); -let name_span = r.span.clone(); -let tokens = r.tokens.clone(); -let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectColon)); -if has_err(r2.err.clone()) { + field: dummy_field.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let name = r.name.clone(); + let name_span = r.span.clone(); + let tokens = r.tokens.clone(); + let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectColon)); + if has_err(r2.err.clone()) { return Rc::new(FieldResult { - field: dummy_field.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = parse_type_expr(&r2.tokens.clone(), &ctx); -if has_err(r3.err.clone()) { + field: dummy_field.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = parse_type_expr(&r2.tokens.clone(), &ctx); + if has_err(r3.err.clone()) { return Rc::new(FieldResult { - field: dummy_field.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), -}) - } -let wr = try_where_clause(&r3.tokens.clone(), r3.ctx.clone(), &r3.type_expr.clone(), &start_span); -if has_err(wr.err.clone()) { + field: dummy_field.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), + }); + } + let wr = try_where_clause( + &r3.tokens.clone(), + r3.ctx.clone(), + &r3.type_expr.clone(), + &start_span, + ); + if has_err(wr.err.clone()) { return Rc::new(FieldResult { - field: dummy_field.clone(), - tokens: wr.tokens.clone(), - ctx: wr.ctx.clone(), - err: wr.err.clone(), -}) - } -let te = wr.type_expr.clone(); -let tokens = wr.tokens.clone(); -let ctx = wr.ctx.clone(); -let from_r = parse_optional_from_key(&tokens, ctx.clone()); -let from_key = from_r.from_key.clone(); -let tokens = from_r.tokens.clone(); -let ctx = from_r.ctx.clone(); -match (*eat(&tokens, Rc::new(ExpectedToken::ExpectEq))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r4 = parse_expr(__ec.clone(), ctx.clone()); -if has_err(r4.err.clone()) { - return Rc::new(FieldResult { - field: dummy_field.clone(), - tokens: r4.tokens.clone(), - ctx: r4.ctx.clone(), - err: r4.err.clone(), -}) - } -let f = make_field_node(&name, te.clone(), te.return_cardinality.clone(), Some(r4.expr.clone()), from_key, start_span.clone(), name_span); -Rc::new(FieldResult { - field: f, - tokens: r4.tokens.clone(), - ctx: r4.ctx.clone(), - err: None, -}) -}, - EatResult::EatUnchanged { tokens: __eu, .. } => { - let f = make_field_node(&name, te.clone(), te.return_cardinality.clone(), None, from_key, start_span.clone(), name_span); -Rc::new(FieldResult { - field: f, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) -}, -} -} + field: dummy_field.clone(), + tokens: wr.tokens.clone(), + ctx: wr.ctx.clone(), + err: wr.err.clone(), + }); + } + let te = wr.type_expr.clone(); + let tokens = wr.tokens.clone(); + let ctx = wr.ctx.clone(); + let from_r = parse_optional_from_key(&tokens, ctx.clone()); + let from_key = from_r.from_key.clone(); + let tokens = from_r.tokens.clone(); + let ctx = from_r.ctx.clone(); + match (*eat(&tokens, Rc::new(ExpectedToken::ExpectEq))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let r4 = parse_expr(__ec.clone(), ctx.clone()); + if has_err(r4.err.clone()) { + return Rc::new(FieldResult { + field: dummy_field.clone(), + tokens: r4.tokens.clone(), + ctx: r4.ctx.clone(), + err: r4.err.clone(), + }); + } + let f = make_field_node( + &name, + te.clone(), + te.return_cardinality.clone(), + Some(r4.expr.clone()), + from_key, + start_span.clone(), + name_span, + ); + Rc::new(FieldResult { + field: f, + tokens: r4.tokens.clone(), + ctx: r4.ctx.clone(), + err: None, + }) + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + let f = make_field_node( + &name, + te.clone(), + te.return_cardinality.clone(), + None, + from_key, + start_span.clone(), + name_span, + ); + Rc::new(FieldResult { + field: f, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } + } + } } -pub fn parse_optional_from_key(tokens: &Rc>>, ctx: Rc) -> Rc { +pub fn parse_optional_from_key( + tokens: &Rc>>, + ctx: Rc, +) -> Rc { { let tok = tokens.clone().first().cloned(); -let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, -}; -match sh { - Some(TokenShape::ShIdent) => if (tok.clone().unwrap().text.clone().as_str() == "from".to_string().as_str()) { - { - let tok2 = tokens.clone().get(1 as usize).cloned(); -let sh2 = match tok2.clone() { - Some(t) => Some(t.shape.clone()), - None => None, -}; -match sh2 { - Some(TokenShape::ShLitStr) => { - let key = tok2.clone().unwrap().text.clone(); -Rc::new(FromKeyResult { - from_key: Some(key), - tokens: Rc::new(tokens.clone().iter().cloned().skip(2 as usize).collect::>()), - ctx: ctx, - err: None, -}) -}, - _ => Rc::new(FromKeyResult { - from_key: None, - tokens: tokens.clone(), - ctx: ctx, - err: None, -}), -} -} - } else { - Rc::new(FromKeyResult { - from_key: None, - tokens: tokens.clone(), - ctx: ctx, - err: None, -}) - }, - _ => Rc::new(FromKeyResult { - from_key: None, - tokens: tokens.clone(), - ctx: ctx, - err: None, -}), -} -} + let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, + }; + match sh { + Some(TokenShape::ShIdent) => { + if (tok.clone().unwrap().text.clone().as_str() == "from".to_string().as_str()) { + { + let tok2 = tokens.clone().get(1 as usize).cloned(); + let sh2 = match tok2.clone() { + Some(t) => Some(t.shape.clone()), + None => None, + }; + match sh2 { + Some(TokenShape::ShLitStr) => { + let key = tok2.clone().unwrap().text.clone(); + Rc::new(FromKeyResult { + from_key: Some(key), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(2 as usize) + .collect::>(), + ), + ctx: ctx, + err: None, + }) + } + _ => Rc::new(FromKeyResult { + from_key: None, + tokens: tokens.clone(), + ctx: ctx, + err: None, + }), + } + } + } else { + Rc::new(FromKeyResult { + from_key: None, + tokens: tokens.clone(), + ctx: ctx, + err: None, + }) + } + } + _ => Rc::new(FromKeyResult { + from_key: None, + tokens: tokens.clone(), + ctx: ctx, + err: None, + }), + } + } } pub fn parse_fn_def(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); -let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { - text: "fn".to_string(), -})); -if has_err(r.err.clone()) { + let dummy = Rc::new(Node { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let r = expect( + &tokens, + &Rc::new(ExpectedToken::ExpectKeyword { + text: "fn".to_string(), + }), + ); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + item: dummy, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -parse_fn_after_kw(&r.tokens.clone(), &ctx, &start_span) -} + parse_fn_after_kw(&r.tokens.clone(), &ctx, &start_span) + } } -pub fn parse_fn_after_kw(tokens: &Rc>>, ctx: &Rc, start_span: &Rc) -> Rc { +pub fn parse_fn_after_kw( + tokens: &Rc>>, + ctx: &Rc, + start_span: &Rc, +) -> Rc { { let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let r = expect_ident(&tokens); -if has_err(r.err.clone()) { - return Rc::new(ItemResult { - item: dummy, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let name = r.name.clone(); -let name_span = r.span.clone(); -let tokens = r.tokens.clone(); -let named_dummy = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let r = parse_params(&tokens, &ctx); -if has_err(r.err.clone()) { - return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let params = r.params.clone(); -let tokens = r.tokens.clone(); -let ctx = r.ctx.clone(); -let ret = parse_optional_inferred(&tokens, ctx.clone()); -if has_err(ret.err.clone()) { - return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: ret.tokens.clone(), - ctx: ret.ctx.clone(), - err: ret.err.clone(), -}) - } -let inferred = ret.inferred.clone(); -let tokens = ret.tokens.clone(); -let ctx = ret.ctx.clone(); -let r = parse_block(&skip_newlines(tokens.clone()), &ctx); -if has_err(r.err.clone()) { - return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let body = r.expr.clone(); -let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: params, - inferred: inferred, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: Some(body), - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -Rc::new(ItemResult { - item: item, - tokens: skip_newlines(r.tokens.clone()), - ctx: r.ctx.clone(), - err: None, -}) -} -} - -pub fn parse_fn_body_from_prefix(prefix: &Rc, start_span: &Rc) -> Rc { - { - let name = prefix.name.clone(); -let name_span = prefix.name_span.clone(); -let type_params = prefix.type_params.clone(); -let params = prefix.params.clone(); -let inferred = prefix.inferred.clone(); -let ctx = prefix.ctx.clone(); -let all_params = v2_rt::concat(type_params, params); -let named_dummy = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: all_params.clone(), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let r = parse_block(&skip_newlines(prefix.tokens.clone()), &ctx); -if has_err(r.err.clone()) { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let r = expect_ident(&tokens); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let body = r.expr.clone(); -let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: all_params.clone(), - inferred: inferred, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: Some(body), - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -Rc::new(ItemResult { - item: item, - tokens: skip_newlines(r.tokens.clone()), - ctx: r.ctx.clone(), - err: None, -}) + item: dummy, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let name = r.name.clone(); + let name_span = r.span.clone(); + let tokens = r.tokens.clone(); + let named_dummy = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let r = parse_params(&tokens, &ctx); + if has_err(r.err.clone()) { + return Rc::new(ItemResult { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let params = r.params.clone(); + let tokens = r.tokens.clone(); + let ctx = r.ctx.clone(); + let ret = parse_optional_inferred(&tokens, ctx.clone()); + if has_err(ret.err.clone()) { + return Rc::new(ItemResult { + item: named_dummy.clone(), + tokens: ret.tokens.clone(), + ctx: ret.ctx.clone(), + err: ret.err.clone(), + }); + } + let inferred = ret.inferred.clone(); + let tokens = ret.tokens.clone(); + let ctx = ret.ctx.clone(); + let r = parse_block(&skip_newlines(tokens.clone()), &ctx); + if has_err(r.err.clone()) { + return Rc::new(ItemResult { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let body = r.expr.clone(); + let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: params, + inferred: inferred, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: Some(body), + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + Rc::new(ItemResult { + item: item, + tokens: skip_newlines(r.tokens.clone()), + ctx: r.ctx.clone(), + err: None, + }) + } } + +pub fn parse_fn_body_from_prefix( + prefix: &Rc, + start_span: &Rc, +) -> Rc { + { + let name = prefix.name.clone(); + let name_span = prefix.name_span.clone(); + let type_params = prefix.type_params.clone(); + let params = prefix.params.clone(); + let inferred = prefix.inferred.clone(); + let ctx = prefix.ctx.clone(); + let all_params = v2_rt::concat(type_params, params); + let named_dummy = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: all_params.clone(), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let r = parse_block(&skip_newlines(prefix.tokens.clone()), &ctx); + if has_err(r.err.clone()) { + return Rc::new(ItemResult { + item: named_dummy, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let body = r.expr.clone(); + let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: all_params.clone(), + inferred: inferred, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: Some(body), + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + Rc::new(ItemResult { + item: item, + tokens: skip_newlines(r.tokens.clone()), + ctx: r.ctx.clone(), + err: None, + }) + } } pub fn parse_func_def(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); -let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let kw = tok_keyword_text(tokens.clone().first().cloned()); -let r = if (kw.clone().as_str() == "func".to_string().as_str()) { - expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { - text: "func".to_string(), -})) + let dummy = Rc::new(Node { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let kw = tok_keyword_text(tokens.clone().first().cloned()); + let r = if (kw.clone().as_str() == "func".to_string().as_str()) { + expect( + &tokens, + &Rc::new(ExpectedToken::ExpectKeyword { + text: "func".to_string(), + }), + ) } else { if (kw.clone().as_str() == "pattern".to_string().as_str()) { - expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { - text: "pattern".to_string(), -})) + expect( + &tokens, + &Rc::new(ExpectedToken::ExpectKeyword { + text: "pattern".to_string(), + }), + ) } else { if (kw.clone().as_str() == "interface".to_string().as_str()) { - expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { - text: "interface".to_string(), -})) + expect( + &tokens, + &Rc::new(ExpectedToken::ExpectKeyword { + text: "interface".to_string(), + }), + ) } else { - expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { - text: "func".to_string(), -})) + expect( + &tokens, + &Rc::new(ExpectedToken::ExpectKeyword { + text: "func".to_string(), + }), + ) } } }; -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let has_uses = (kw.clone().as_str() == "func".to_string().as_str()); -let form = Rc::new(ItemForm { - kind: ItemFormKind::OtherForm, - keyword: kw.clone(), - has_type_params: false, - has_params: true, - has_return_type: true, - return_required: false, - has_uses: has_uses, - body_kind: BodyKind::BlockBody, -}); -let prefix = parse_item_prefix(&r.tokens.clone(), &ctx, &form); -if has_err(prefix.err.clone()) { + item: dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let has_uses = (kw.clone().as_str() == "func".to_string().as_str()); + let form = Rc::new(ItemForm { + kind: ItemFormKind::OtherForm, + keyword: kw.clone(), + has_type_params: false, + has_params: true, + has_return_type: true, + return_required: false, + has_uses: has_uses, + body_kind: BodyKind::BlockBody, + }); + let prefix = parse_item_prefix(&r.tokens.clone(), &ctx, &form); + if has_err(prefix.err.clone()) { return Rc::new(ItemResult { - item: dummy.clone(), - tokens: prefix.tokens.clone(), - ctx: prefix.ctx.clone(), - err: prefix.err.clone(), -}) + item: dummy.clone(), + tokens: prefix.tokens.clone(), + ctx: prefix.ctx.clone(), + err: prefix.err.clone(), + }); } -parse_block_body_from_prefix(&prefix, &start_span) -} + parse_block_body_from_prefix(&prefix, &start_span) + } } -pub fn parse_block_item_after_kw(tokens: &Rc>>, ctx: &Rc, start_span: &Rc, form: Rc) -> Rc { +pub fn parse_block_item_after_kw( + tokens: &Rc>>, + ctx: &Rc, + start_span: &Rc, + form: Rc, +) -> Rc { { let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let r = expect_ident(&tokens); -if has_err(r.err.clone()) { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let r = expect_ident(&tokens); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let name = r.name.clone(); -let name_span = r.span.clone(); -let tokens = r.tokens.clone(); -let named_dummy = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let r = parse_params(&tokens, &ctx); -if has_err(r.err.clone()) { + item: dummy, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let name = r.name.clone(); + let name_span = r.span.clone(); + let tokens = r.tokens.clone(); + let named_dummy = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let r = parse_params(&tokens, &ctx); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let params = r.params.clone(); -let tokens = r.tokens.clone(); -let ctx = r.ctx.clone(); -let ret = parse_optional_inferred(&tokens, ctx.clone()); -if has_err(ret.err.clone()) { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let params = r.params.clone(); + let tokens = r.tokens.clone(); + let ctx = r.ctx.clone(); + let ret = parse_optional_inferred(&tokens, ctx.clone()); + if has_err(ret.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: ret.tokens.clone(), - ctx: ret.ctx.clone(), - err: ret.err.clone(), -}) - } -let inferred = ret.inferred.clone(); -let tokens = ret.tokens.clone(); -let ctx = ret.ctx.clone(); -let uses_r = if form.has_uses.clone() { + item: named_dummy.clone(), + tokens: ret.tokens.clone(), + ctx: ret.ctx.clone(), + err: ret.err.clone(), + }); + } + let inferred = ret.inferred.clone(); + let tokens = ret.tokens.clone(); + let ctx = ret.ctx.clone(); + let uses_r = if form.has_uses.clone() { parse_uses_clause(&skip_newlines(tokens.clone()), ctx.clone()) } else { Rc::new(UsesResult { - uses: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) + uses: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) }; -if has_err(uses_r.err.clone()) { + if has_err(uses_r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: uses_r.tokens.clone(), - ctx: uses_r.ctx.clone(), - err: uses_r.err.clone(), -}) - } -let uses = uses_r.uses.clone(); -let tokens = uses_r.tokens.clone(); -let ctx = uses_r.ctx.clone(); -let r = parse_block(&skip_newlines(tokens.clone()), &ctx); -if has_err(r.err.clone()) { + item: named_dummy.clone(), + tokens: uses_r.tokens.clone(), + ctx: uses_r.ctx.clone(), + err: uses_r.err.clone(), + }); + } + let uses = uses_r.uses.clone(); + let tokens = uses_r.tokens.clone(); + let ctx = uses_r.ctx.clone(); + let r = parse_block(&skip_newlines(tokens.clone()), &ctx); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let body = r.expr.clone(); -let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: params, - inferred: inferred, - return_cardinality: Cardinality::Required, - uses: uses, - body: Some(body), - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -Rc::new(ItemResult { - item: item, - tokens: skip_newlines(r.tokens.clone()), - ctx: r.ctx.clone(), - err: None, -}) -} + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let body = r.expr.clone(); + let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: params, + inferred: inferred, + return_cardinality: Cardinality::Required, + uses: uses, + body: Some(body), + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + Rc::new(ItemResult { + item: item, + tokens: skip_newlines(r.tokens.clone()), + ctx: r.ctx.clone(), + err: None, + }) + } } -pub fn parse_block_body_from_prefix(prefix: &Rc, start_span: &Rc) -> Rc { +pub fn parse_block_body_from_prefix( + prefix: &Rc, + start_span: &Rc, +) -> Rc { { let name = prefix.name.clone(); -let name_span = prefix.name_span.clone(); -let params = prefix.params.clone(); -let inferred = prefix.inferred.clone(); -let uses = prefix.uses.clone(); -let ctx = prefix.ctx.clone(); -let named_dummy = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let r = parse_block(&skip_newlines(prefix.tokens.clone()), &ctx); -if has_err(r.err.clone()) { + let name_span = prefix.name_span.clone(); + let params = prefix.params.clone(); + let inferred = prefix.inferred.clone(); + let uses = prefix.uses.clone(); + let ctx = prefix.ctx.clone(); + let named_dummy = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let r = parse_block(&skip_newlines(prefix.tokens.clone()), &ctx); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let body = r.expr.clone(); -let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: params, - inferred: inferred, - return_cardinality: Cardinality::Required, - uses: uses, - body: Some(body), - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -Rc::new(ItemResult { - item: item, - tokens: skip_newlines(r.tokens.clone()), - ctx: r.ctx.clone(), - err: None, -}) -} + item: named_dummy, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let body = r.expr.clone(); + let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: params, + inferred: inferred, + return_cardinality: Cardinality::Required, + uses: uses, + body: Some(body), + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + Rc::new(ItemResult { + item: item, + tokens: skip_newlines(r.tokens.clone()), + ctx: r.ctx.clone(), + err: None, + }) + } } -pub fn parse_no_body_from_prefix(prefix: &Rc, start_span: Rc) -> Rc { +pub fn parse_no_body_from_prefix( + prefix: &Rc, + start_span: Rc, +) -> Rc { { let item = Rc::new(Node { - name: prefix.name.clone(), - span: start_span, - ident_span: Some(prefix.name_span.clone()), - children: Rc::new(vec![]), - params: prefix.params.clone(), - inferred: prefix.inferred.clone(), - return_cardinality: Cardinality::Required, - uses: prefix.uses.clone(), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -Rc::new(ItemResult { - item: item, - tokens: prefix.tokens.clone(), - ctx: prefix.ctx.clone(), - err: None, -}) -} + name: prefix.name.clone(), + span: start_span, + ident_span: Some(prefix.name_span.clone()), + children: Rc::new(vec![]), + params: prefix.params.clone(), + inferred: prefix.inferred.clone(), + return_cardinality: Cardinality::Required, + uses: prefix.uses.clone(), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + Rc::new(ItemResult { + item: item, + tokens: prefix.tokens.clone(), + ctx: prefix.ctx.clone(), + err: None, + }) + } } pub fn parse_uses_clause(tokens: &Rc>>, ctx: Rc) -> Rc { { let tokens = skip_newlines(tokens.clone()); -let tok = tokens.clone().first().cloned(); -let is_uses = match tok { - Some(t) => (is_ident_shape(t.shape.clone()) && (t.text.clone().as_str() == "uses".to_string().as_str())), - None => false, -}; -if is_uses { + let tok = tokens.clone().first().cloned(); + let is_uses = match tok { + Some(t) => { + (is_ident_shape(t.shape.clone()) + && (t.text.clone().as_str() == "uses".to_string().as_str())) + } + None => false, + }; + if is_uses { { - let r = parse_uses_list(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx); -if has_err(r.err.clone()) { - return r.clone() + let r = parse_uses_list( + Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx, + ); + if has_err(r.err.clone()) { + return r.clone(); } -Rc::new(UsesResult { - uses: r.uses.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + Rc::new(UsesResult { + uses: r.uses.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } else { Rc::new(UsesResult { - uses: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx, - err: None, -}) + uses: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx, + err: None, + }) } -} + } } pub fn parse_uses_list(tokens: Rc>>, ctx: Rc) -> Rc { parse_uses_list_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_uses_list_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_uses_list_acc( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { let r = parse_uses_entry(&tokens, &ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(UsesResult { - uses: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -acc = v2_rt::rc_list_push(acc.clone(), r.resource_use.clone()); -match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { { - let __tco_0 = __ec.clone(); -let __tco_1 = r.ctx.clone(); -tokens = __tco_0; -ctx = __tco_1; -continue; -} }, - EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(UsesResult { - uses: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}); }, -} -} + uses: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + acc = v2_rt::rc_list_push(acc.clone(), r.resource_use.clone()); + match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let __tco_0 = __ec.clone(); + let __tco_1 = r.ctx.clone(); + tokens = __tco_0; + ctx = __tco_1; + continue; + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + break Rc::new(UsesResult { + uses: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }); + } + } + } } pub fn parse_uses_entry(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); -let dummy = make_resource_use_node(&"".to_string(), leaf_type_node(&"".to_string(), &start_span), start_span.clone(), start_span.clone()); -let r = expect_ident(&tokens); -if has_err(r.err.clone()) { + let dummy = make_resource_use_node( + &"".to_string(), + leaf_type_node(&"".to_string(), &start_span), + start_span.clone(), + start_span.clone(), + ); + let r = expect_ident(&tokens); + if has_err(r.err.clone()) { return Rc::new(ResUseResult { - resource_use: dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let name = r.name.clone(); -let tokens = r.tokens.clone(); -let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectColon)); -if has_err(r2.err.clone()) { + resource_use: dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let name = r.name.clone(); + let tokens = r.tokens.clone(); + let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectColon)); + if has_err(r2.err.clone()) { return Rc::new(ResUseResult { - resource_use: dummy.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = parse_type_expr(&r2.tokens.clone(), &ctx); -if has_err(r3.err.clone()) { + resource_use: dummy.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = parse_type_expr(&r2.tokens.clone(), &ctx); + if has_err(r3.err.clone()) { return Rc::new(ResUseResult { - resource_use: dummy.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), -}) - } -match (*eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectLParen))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let ar = parse_resource_config_args(__ec.clone(), r3.ctx.clone()); -if has_err(ar.err.clone()) { - return Rc::new(ResUseResult { - resource_use: dummy.clone(), - tokens: ar.tokens.clone(), - ctx: ar.ctx.clone(), - err: ar.err.clone(), -}) - } -let r4 = expect(&ar.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); -if has_err(r4.err.clone()) { - return Rc::new(ResUseResult { - resource_use: dummy.clone(), - tokens: r4.tokens.clone(), - ctx: ar.ctx.clone(), - err: r4.err.clone(), -}) - } -let res_node = Rc::new(Node { - name: r3.type_expr.clone().name.clone(), - span: r3.type_expr.clone().span.clone(), - ident_span: r3.type_expr.clone().ident_span.clone(), - children: r3.type_expr.clone().children.clone(), - params: r3.type_expr.clone().params.clone(), - inferred: r3.type_expr.clone().inferred.clone(), - return_cardinality: r3.type_expr.clone().return_cardinality.clone(), - uses: r3.type_expr.clone().uses.clone(), - body: r3.type_expr.clone().body.clone(), - connective: r3.type_expr.clone().connective.clone(), - transport: r3.type_expr.clone().transport.clone(), - properties: ar.fields.clone(), - type_annotation: r3.type_expr.clone().type_annotation.clone(), - is_self_recursive: r3.type_expr.clone().is_self_recursive.clone(), - has_non_tail_self_call: r3.type_expr.clone().has_non_tail_self_call.clone(), - match_pattern: r3.type_expr.clone().match_pattern.clone(), - expr_data: r3.type_expr.clone().expr_data.clone(), - ident: None, -}); -let ru = make_resource_use_node(&name, res_node, start_span.clone(), r.span.clone()); -Rc::new(ResUseResult { - resource_use: ru, - tokens: r4.tokens.clone(), - ctx: ar.ctx.clone(), - err: None, -}) -}, - EatResult::EatUnchanged { tokens: __eu, .. } => { - let ru = make_resource_use_node(&name, r3.type_expr.clone(), start_span.clone(), r.span.clone()); -Rc::new(ResUseResult { - resource_use: ru, - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: None, -}) -}, -} -} + resource_use: dummy.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), + }); + } + match (*eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectLParen))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let ar = parse_resource_config_args(__ec.clone(), r3.ctx.clone()); + if has_err(ar.err.clone()) { + return Rc::new(ResUseResult { + resource_use: dummy.clone(), + tokens: ar.tokens.clone(), + ctx: ar.ctx.clone(), + err: ar.err.clone(), + }); + } + let r4 = expect(&ar.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); + if has_err(r4.err.clone()) { + return Rc::new(ResUseResult { + resource_use: dummy.clone(), + tokens: r4.tokens.clone(), + ctx: ar.ctx.clone(), + err: r4.err.clone(), + }); + } + let res_node = Rc::new(Node { + name: r3.type_expr.clone().name.clone(), + span: r3.type_expr.clone().span.clone(), + ident_span: r3.type_expr.clone().ident_span.clone(), + children: r3.type_expr.clone().children.clone(), + params: r3.type_expr.clone().params.clone(), + inferred: r3.type_expr.clone().inferred.clone(), + return_cardinality: r3.type_expr.clone().return_cardinality.clone(), + uses: r3.type_expr.clone().uses.clone(), + body: r3.type_expr.clone().body.clone(), + connective: r3.type_expr.clone().connective.clone(), + transport: r3.type_expr.clone().transport.clone(), + properties: ar.fields.clone(), + type_annotation: r3.type_expr.clone().type_annotation.clone(), + is_self_recursive: r3.type_expr.clone().is_self_recursive.clone(), + has_non_tail_self_call: r3.type_expr.clone().has_non_tail_self_call.clone(), + match_pattern: r3.type_expr.clone().match_pattern.clone(), + expr_data: r3.type_expr.clone().expr_data.clone(), + ident: None, + }); + let ru = + make_resource_use_node(&name, res_node, start_span.clone(), r.span.clone()); + Rc::new(ResUseResult { + resource_use: ru, + tokens: r4.tokens.clone(), + ctx: ar.ctx.clone(), + err: None, + }) + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + let ru = make_resource_use_node( + &name, + r3.type_expr.clone(), + start_span.clone(), + r.span.clone(), + ); + Rc::new(ResUseResult { + resource_use: ru, + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: None, + }) + } + } + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -4850,768 +5735,981 @@ pub struct ResConfigResult { pub err: Option>, } -pub fn parse_resource_config_args(tokens: Rc>>, ctx: Rc) -> Rc { +pub fn parse_resource_config_args( + tokens: Rc>>, + ctx: Rc, +) -> Rc { parse_resource_config_acc(skip_newlines(tokens), ctx, Rc::new(vec![])) } -pub fn parse_resource_config_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_resource_config_acc( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { if tok_is_rparen(tokens.clone().first().cloned()) { return Rc::new(ResConfigResult { - fields: acc.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) + fields: acc.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); } -let zero_span = make_span(0, 0); -let r = expect_name(&tokens); -if has_err(r.err.clone()) { + let zero_span = make_span(0, 0); + let r = expect_name(&tokens); + if has_err(r.err.clone()) { return Rc::new(ResConfigResult { - fields: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let field_name = r.name.clone(); -let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); -if has_err(r2.err.clone()) { + fields: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let field_name = r.name.clone(); + let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); + if has_err(r2.err.clone()) { return Rc::new(ResConfigResult { - fields: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); -if has_err(r3.err.clone()) { + fields: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); + if has_err(r3.err.clone()) { return Rc::new(ResConfigResult { - fields: Rc::new(vec![]), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), -}) - } -let fi = make_field_init_node(&field_name, r3.expr.clone(), zero_span, r.span.clone()); -acc = v2_rt::rc_list_push(acc.clone(), fi); -match (*eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { { - let __tco_0 = skip_newlines(__ec.clone()); -let __tco_1 = r3.ctx.clone(); -tokens = __tco_0; -ctx = __tco_1; -continue; -} }, - EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(ResConfigResult { - fields: acc.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: None, -}); }, -} -} -} - -pub fn parse_optional_inferred(tokens: &Rc>>, ctx: Rc) -> Rc { - match (*eat(&tokens, Rc::new(ExpectedToken::ExpectArrow))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r = parse_type_expr(&__ec, &ctx); -if has_err(r.err.clone()) { - return Rc::new(OptRetResult { - inferred: None, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -Rc::new(OptRetResult { - inferred: Some(Rc::new(InferredNode::Resolved { - node: r.type_expr.clone(), -})), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -}, - EatResult::EatUnchanged { tokens: __eu, .. } => Rc::new(OptRetResult { - inferred: None, - tokens: tokens.clone(), - ctx: ctx, - err: None, -}), + fields: Rc::new(vec![]), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), + }); + } + let fi = make_field_init_node(&field_name, r3.expr.clone(), zero_span, r.span.clone()); + acc = v2_rt::rc_list_push(acc.clone(), fi); + match (*eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let __tco_0 = skip_newlines(__ec.clone()); + let __tco_1 = r3.ctx.clone(); + tokens = __tco_0; + ctx = __tco_1; + continue; + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + break Rc::new(ResConfigResult { + fields: acc.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: None, + }); + } + } + } } + +pub fn parse_optional_inferred( + tokens: &Rc>>, + ctx: Rc, +) -> Rc { + match (*eat(&tokens, Rc::new(ExpectedToken::ExpectArrow))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let r = parse_type_expr(&__ec, &ctx); + if has_err(r.err.clone()) { + return Rc::new(OptRetResult { + inferred: None, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + Rc::new(OptRetResult { + inferred: Some(Rc::new(InferredNode::Resolved { + node: r.type_expr.clone(), + })), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } + EatResult::EatUnchanged { tokens: __eu, .. } => Rc::new(OptRetResult { + inferred: None, + tokens: tokens.clone(), + ctx: ctx, + err: None, + }), + } } pub fn parse_service_def(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); -let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { - text: "service".to_string(), -})); -if has_err(r.err.clone()) { + let dummy = Rc::new(Node { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let r = expect( + &tokens, + &Rc::new(ExpectedToken::ExpectKeyword { + text: "service".to_string(), + }), + ); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + item: dummy, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -parse_service_after_kw(&r.tokens.clone(), &ctx, &start_span) -} + parse_service_after_kw(&r.tokens.clone(), &ctx, &start_span) + } } -pub fn parse_service_after_kw(tokens: &Rc>>, ctx: &Rc, start_span: &Rc) -> Rc { +pub fn parse_service_after_kw( + tokens: &Rc>>, + ctx: &Rc, + start_span: &Rc, +) -> Rc { { let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let r_ns = expect_name(&tokens); -if has_err(r_ns.err.clone()) { - return Rc::new(ItemResult { - item: dummy, - tokens: r_ns.tokens.clone(), - ctx: ctx.clone(), - err: r_ns.err.clone(), -}) - } -let namespace_root = r_ns.name.clone(); -let r = parse_dotted_ident_rest(r_ns.tokens.clone(), namespace_root.clone(), r_ns.span.clone()); -let name = r.name.clone(); -let svc_name_span = r.span.clone(); -let named_dummy = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(svc_name_span.clone()), - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectLBrace)); -if has_err(r.err.clone()) { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let r_ns = expect_name(&tokens); + if has_err(r_ns.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let tokens = skip_newlines(r.tokens.clone()); -let r = parse_service_body(&tokens, ctx.clone()); -if has_err(r.err.clone()) { + item: dummy, + tokens: r_ns.tokens.clone(), + ctx: ctx.clone(), + err: r_ns.err.clone(), + }); + } + let namespace_root = r_ns.name.clone(); + let r = parse_dotted_ident_rest( + r_ns.tokens.clone(), + namespace_root.clone(), + r_ns.span.clone(), + ); + let name = r.name.clone(); + let svc_name_span = r.span.clone(); + let named_dummy = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(svc_name_span.clone()), + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectLBrace)); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let tokens = skip_newlines(r.tokens.clone()); -let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r2.err.clone()) { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let tokens = skip_newlines(r.tokens.clone()); + let r = parse_service_body(&tokens, ctx.clone()); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), -}) - } -let ns_prop = make_field_init_node(&"namespace_root".to_string(), make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: namespace_root.clone(), -}), -}), Rc::new(vec![]), None, start_span.clone()), start_span.clone(), no_span()); -let svc_props = match r.config.clone() { - Some(cfg) => service_config_properties(cfg.endpoint.clone(), cfg.auth.clone(), cfg.auth_input.clone(), cfg.auth_source.clone(), cfg.rate_limit.clone(), cfg.retry.clone()), - None => Rc::new(vec![]), -}; -let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(svc_name_span.clone()), - children: r.operations.clone(), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: Some(r.transport.clone()), - properties: v2_rt::concat(Rc::new(vec![ns_prop]), svc_props), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -Rc::new(ItemResult { - item: item, - tokens: skip_newlines(r2.tokens.clone()), - ctx: r.ctx.clone(), - err: None, -}) -} -} - -pub fn parse_service_body(tokens: &Rc>>, ctx: Rc) -> Rc { - parse_service_entries(tokens.clone(), ctx, None, local_transport_node(token_span(tokens.clone().first().cloned())), Rc::new(vec![])) + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let tokens = skip_newlines(r.tokens.clone()); + let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); + if has_err(r2.err.clone()) { + return Rc::new(ItemResult { + item: named_dummy.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), + }); + } + let ns_prop = make_field_init_node( + &"namespace_root".to_string(), + make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: namespace_root.clone(), + }), + }), + Rc::new(vec![]), + None, + start_span.clone(), + ), + start_span.clone(), + no_span(), + ); + let svc_props = match r.config.clone() { + Some(cfg) => service_config_properties( + cfg.endpoint.clone(), + cfg.auth.clone(), + cfg.auth_input.clone(), + cfg.auth_source.clone(), + cfg.rate_limit.clone(), + cfg.retry.clone(), + ), + None => Rc::new(vec![]), + }; + let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(svc_name_span.clone()), + children: r.operations.clone(), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: Some(r.transport.clone()), + properties: v2_rt::concat(Rc::new(vec![ns_prop]), svc_props), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + Rc::new(ItemResult { + item: item, + tokens: skip_newlines(r2.tokens.clone()), + ctx: r.ctx.clone(), + err: None, + }) + } } -pub fn parse_service_entries(mut tokens: Rc>>, mut ctx: Rc, mut config: Option>, mut transport: Rc, mut operations: Rc>>) -> Rc { +pub fn parse_service_body( + tokens: &Rc>>, + ctx: Rc, +) -> Rc { + parse_service_entries( + tokens.clone(), + ctx, + None, + local_transport_node(token_span(tokens.clone().first().cloned())), + Rc::new(vec![]), + ) +} + +pub fn parse_service_entries( + mut tokens: Rc>>, + mut ctx: Rc, + mut config: Option>, + mut transport: Rc, + mut operations: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -let tok = tokens.clone().first().cloned(); -if (tok_is_rbrace(tok.clone()) || tok_is_eof(tok.clone())) { + let tok = tokens.clone().first().cloned(); + if (tok_is_rbrace(tok.clone()) || tok_is_eof(tok.clone())) { break Rc::new(ServiceBodyResult { - config: config.clone(), - transport: transport.clone(), - operations: operations.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); -} else { + config: config.clone(), + transport: transport.clone(), + operations: operations.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } else { let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, -}; -let span = token_span(tok.clone()); -match sh { - Some(TokenShape::ShIdent) => { let id = tok.clone().unwrap().text.clone(); -if (id.clone().as_str() == "config".to_string().as_str()) { - let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); -if has_err(r.err.clone()) { - return Rc::new(ServiceBodyResult { - config: config.clone(), - transport: transport.clone(), - operations: operations.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r2 = parse_service_config_block(skip_newlines(r.tokens.clone()), ctx.clone()); -if has_err(r2.err.clone()) { - return Rc::new(ServiceBodyResult { - config: config.clone(), - transport: transport.clone(), - operations: operations.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), -}) - } -tokens = skip_newlines(r2.tokens.clone()); -let r3 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r3.err.clone()) { - return Rc::new(ServiceBodyResult { - config: config.clone(), - transport: transport.clone(), - operations: operations.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), -}) - } -{ - let __tco_0 = r3.tokens.clone(); -let __tco_1 = r2.ctx.clone(); -let __tco_2 = Some(r2.config.clone()); -tokens = __tco_0; -ctx = __tco_1; -config = __tco_2; -continue; -} -} else { - if (id.clone().as_str() == "transport".to_string().as_str()) { - let r = parse_transport_binding(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &ctx); -if has_err(r.err.clone()) { - return Rc::new(ServiceBodyResult { - config: config.clone(), - transport: transport.clone(), - operations: operations.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + Some(t) => Some(t.shape.clone()), + None => None, + }; + let span = token_span(tok.clone()); + match sh { + Some(TokenShape::ShIdent) => { + let id = tok.clone().unwrap().text.clone(); + if (id.clone().as_str() == "config".to_string().as_str()) { + let r = expect( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + &Rc::new(ExpectedToken::ExpectLBrace), + ); + if has_err(r.err.clone()) { + return Rc::new(ServiceBodyResult { + config: config.clone(), + transport: transport.clone(), + operations: operations.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r2 = parse_service_config_block( + skip_newlines(r.tokens.clone()), + ctx.clone(), + ); + if has_err(r2.err.clone()) { + return Rc::new(ServiceBodyResult { + config: config.clone(), + transport: transport.clone(), + operations: operations.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), + }); + } + tokens = skip_newlines(r2.tokens.clone()); + let r3 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); + if has_err(r3.err.clone()) { + return Rc::new(ServiceBodyResult { + config: config.clone(), + transport: transport.clone(), + operations: operations.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), + }); + } + { + let __tco_0 = r3.tokens.clone(); + let __tco_1 = r2.ctx.clone(); + let __tco_2 = Some(r2.config.clone()); + tokens = __tco_0; + ctx = __tco_1; + config = __tco_2; + continue; + } + } else { + if (id.clone().as_str() == "transport".to_string().as_str()) { + let r = parse_transport_binding( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + &ctx, + ); + if has_err(r.err.clone()) { + return Rc::new(ServiceBodyResult { + config: config.clone(), + transport: transport.clone(), + operations: operations.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + { + let __tco_0 = r.tokens.clone(); + let __tco_1 = r.ctx.clone(); + let __tco_2 = r.transport.clone(); + tokens = __tco_0; + ctx = __tco_1; + transport = __tco_2; + continue; + } + } else { + break Rc::new(ServiceBodyResult { + config: config.clone(), + transport: transport.clone(), + operations: operations.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error( + "expected config, transport, or operation in service block" + .to_string(), + span, + )), + }); + } } -{ - let __tco_0 = r.tokens.clone(); -let __tco_1 = r.ctx.clone(); -let __tco_2 = r.transport.clone(); -tokens = __tco_0; -ctx = __tco_1; -transport = __tco_2; -continue; -} -} else { + } + Some(TokenShape::ShKeyword) => { + let kw_text = tok.clone().unwrap().text.clone(); + if (kw_text.as_str() == "operation".to_string().as_str()) { + let r = parse_operation_def(&tokens, &ctx); + if has_err(r.err.clone()) { + return Rc::new(ServiceBodyResult { + config: config.clone(), + transport: transport.clone(), + operations: operations.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + { + let __tco_0 = r.tokens.clone(); + let __tco_1 = r.ctx.clone(); + let __tco_2 = v2_rt::rc_list_push(operations, r.operation.clone()); + tokens = __tco_0; + ctx = __tco_1; + operations = __tco_2; + continue; + } + } else { + break Rc::new(ServiceBodyResult { + config: config.clone(), + transport: transport.clone(), + operations: operations.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error( + "expected config, transport, or operation in service block" + .to_string(), + span, + )), + }); + } + } + _ => { break Rc::new(ServiceBodyResult { - config: config.clone(), - transport: transport.clone(), - operations: operations.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error("expected config, transport, or operation in service block".to_string(), span)), -}); -} -} }, - Some(TokenShape::ShKeyword) => { let kw_text = tok.clone().unwrap().text.clone(); -if (kw_text.as_str() == "operation".to_string().as_str()) { - let r = parse_operation_def(&tokens, &ctx); -if has_err(r.err.clone()) { - return Rc::new(ServiceBodyResult { - config: config.clone(), - transport: transport.clone(), - operations: operations.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -{ - let __tco_0 = r.tokens.clone(); -let __tco_1 = r.ctx.clone(); -let __tco_2 = v2_rt::rc_list_push(operations, r.operation.clone()); -tokens = __tco_0; -ctx = __tco_1; -operations = __tco_2; -continue; -} -} else { - break Rc::new(ServiceBodyResult { - config: config.clone(), - transport: transport.clone(), - operations: operations.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error("expected config, transport, or operation in service block".to_string(), span)), -}); -} }, - _ => { break Rc::new(ServiceBodyResult { - config: config.clone(), - transport: transport.clone(), - operations: operations.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error("expected config, transport, or operation in service block".to_string(), span)), -}); }, -} -} -} + config: config.clone(), + transport: transport.clone(), + operations: operations.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error( + "expected config, transport, or operation in service block".to_string(), + span, + )), + }); + } + } + } + } } -pub fn parse_service_config_block(tokens: Rc>>, ctx: Rc) -> Rc { +pub fn parse_service_config_block( + tokens: Rc>>, + ctx: Rc, +) -> Rc { parse_config_fields(tokens, ctx, None, None, None, None, None, None) } -pub fn parse_config_fields(mut tokens: Rc>>, mut ctx: Rc, mut endpoint: Option>, mut auth: Option>, mut auth_input: Option>, mut auth_source: Option>, mut rate_limit: Option>, mut retry: Option>) -> Rc { +pub fn parse_config_fields( + mut tokens: Rc>>, + mut ctx: Rc, + mut endpoint: Option>, + mut auth: Option>, + mut auth_input: Option>, + mut auth_source: Option>, + mut rate_limit: Option>, + mut retry: Option>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { + if (tok_is_rbrace(tokens.clone().first().cloned()) + || tok_is_eof(tokens.clone().first().cloned())) + { let cfg = Rc::new(ServiceConfig { - endpoint: match endpoint { - Some(e) => e.clone(), - None => make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: "".to_string(), -}), -}), Rc::new(vec![]), None, make_span(0, 0)), -}, - auth: auth, - auth_input: auth_input, - auth_source: auth_source, - rate_limit: rate_limit, - retry: retry, -}); -break Rc::new(ConfigResult { - config: cfg, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); -} else { + endpoint: match endpoint { + Some(e) => e.clone(), + None => make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: "".to_string(), + }), + }), + Rc::new(vec![]), + None, + make_span(0, 0), + ), + }, + auth: auth, + auth_input: auth_input, + auth_source: auth_source, + rate_limit: rate_limit, + retry: retry, + }); + break Rc::new(ConfigResult { + config: cfg, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } else { let dummy_cfg = Rc::new(ServiceConfig { - endpoint: make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: "".to_string(), -}), -}), Rc::new(vec![]), None, make_span(0, 0)), - auth: None, - auth_input: None, - auth_source: None, - rate_limit: None, - retry: None, -}); -let r = expect_ident(&tokens); -if has_err(r.err.clone()) { + endpoint: make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: "".to_string(), + }), + }), + Rc::new(vec![]), + None, + make_span(0, 0), + ), + auth: None, + auth_input: None, + auth_source: None, + rate_limit: None, + retry: None, + }); + let r = expect_ident(&tokens); + if has_err(r.err.clone()) { return Rc::new(ConfigResult { - config: dummy_cfg.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + config: dummy_cfg.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -let fname = r.name.clone(); -let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); -if has_err(r2.err.clone()) { + let fname = r.name.clone(); + let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); + if has_err(r2.err.clone()) { return Rc::new(ConfigResult { - config: dummy_cfg.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) + config: dummy_cfg.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); } -let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); -if has_err(r3.err.clone()) { + let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); + if has_err(r3.err.clone()) { return Rc::new(ConfigResult { - config: dummy_cfg.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), -}) - } -tokens = r3.tokens.clone(); -ctx = r3.ctx.clone(); -let e = eat(&tokens, Rc::new(ExpectedToken::ExpectComma)); -tokens = match (*e.clone()).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => tokens.clone(), -}; -match fname.as_str() { - "endpoint" => { { - let __tco_0 = Some(r3.expr.clone()); -endpoint = __tco_0; -continue; -} }, - "auth" => { { - let __tco_0 = Some(r3.expr.clone()); -auth = __tco_0; -continue; -} }, - "auth_input" => { { - let __tco_0 = Some(r3.expr.clone()); -auth_input = __tco_0; -continue; -} }, - "auth_source" => { { - let __tco_0 = Some(r3.expr.clone()); -auth_source = __tco_0; -continue; -} }, - "rate_limit" => { { - let __tco_0 = Some(r3.expr.clone()); -rate_limit = __tco_0; -continue; -} }, - "retry" => { { - let __tco_0 = Some(r3.expr.clone()); -retry = __tco_0; -continue; -} }, - _ => { { - continue; -} }, -} -} -} + config: dummy_cfg.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), + }); + } + tokens = r3.tokens.clone(); + ctx = r3.ctx.clone(); + let e = eat(&tokens, Rc::new(ExpectedToken::ExpectComma)); + tokens = match (*e.clone()).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => tokens.clone(), + }; + match fname.as_str() { + "endpoint" => { + let __tco_0 = Some(r3.expr.clone()); + endpoint = __tco_0; + continue; + } + "auth" => { + let __tco_0 = Some(r3.expr.clone()); + auth = __tco_0; + continue; + } + "auth_input" => { + let __tco_0 = Some(r3.expr.clone()); + auth_input = __tco_0; + continue; + } + "auth_source" => { + let __tco_0 = Some(r3.expr.clone()); + auth_source = __tco_0; + continue; + } + "rate_limit" => { + let __tco_0 = Some(r3.expr.clone()); + rate_limit = __tco_0; + continue; + } + "retry" => { + let __tco_0 = Some(r3.expr.clone()); + retry = __tco_0; + continue; + } + _ => { + continue; + } + } + } + } } -pub fn parse_transport_binding(tokens: &Rc>>, ctx: &Rc) -> Rc { +pub fn parse_transport_binding( + tokens: &Rc>>, + ctx: &Rc, +) -> Rc { { let span = token_span(tokens.clone().first().cloned()); -let dummy = local_transport_node(span); -let tok = tokens.clone().first().cloned(); -let tok_text = match tok.clone() { - Some(t) => t.text.clone(), - None => "".to_string(), -}; -let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, -}; -match sh { - Some(TokenShape::ShIdent) => if (tok_text.clone().as_str() == "rest".to_string().as_str()) { - { - let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); -if has_err(r.err.clone()) { - return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r2 = parse_rest_binding_body(skip_newlines(r.tokens.clone()), ctx.clone()); -if has_err(r2.err.clone()) { - return Rc::new(TransportResult { - transport: r2.transport.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r3.err.clone()) { - return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), -}) - } -Rc::new(TransportResult { - transport: r2.transport.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: None, -}) -} - } else { - if (tok_text.clone().as_str() == "shell".to_string().as_str()) { - { - let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); -if has_err(r.err.clone()) { - return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r2 = parse_shell_binding_body(skip_newlines(r.tokens.clone()), ctx.clone()); -if has_err(r2.err.clone()) { - return Rc::new(TransportResult { - transport: r2.transport.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r3.err.clone()) { - return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), -}) - } -Rc::new(TransportResult { - transport: r2.transport.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: None, -}) -} - } else { - if (tok_text.clone().as_str() == "file".to_string().as_str()) { + let dummy = local_transport_node(span); + let tok = tokens.clone().first().cloned(); + let tok_text = match tok.clone() { + Some(t) => t.text.clone(), + None => "".to_string(), + }; + let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, + }; + match sh { + Some(TokenShape::ShIdent) => { + if (tok_text.clone().as_str() == "rest".to_string().as_str()) { { - let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); -if has_err(r.err.clone()) { + let r = expect( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + &Rc::new(ExpectedToken::ExpectLBrace), + ); + if has_err(r.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + transport: dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -let r2 = parse_file_binding_body(skip_newlines(r.tokens.clone()), ctx.clone()); -if has_err(r2.err.clone()) { + let r2 = + parse_rest_binding_body(skip_newlines(r.tokens.clone()), ctx.clone()); + if has_err(r2.err.clone()) { return Rc::new(TransportResult { - transport: r2.transport.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), -}) + transport: r2.transport.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), + }); } -let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r3.err.clone()) { + let r3 = expect( + &skip_newlines(r2.tokens.clone()), + &Rc::new(ExpectedToken::ExpectRBrace), + ); + if has_err(r3.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), -}) + transport: dummy.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), + }); } -Rc::new(TransportResult { - transport: r2.transport.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: None, -}) -} + Rc::new(TransportResult { + transport: r2.transport.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: None, + }) + } } else { - Rc::new(TransportResult { - transport: dummy.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) + if (tok_text.clone().as_str() == "shell".to_string().as_str()) { + { + let r = expect( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + &Rc::new(ExpectedToken::ExpectLBrace), + ); + if has_err(r.err.clone()) { + return Rc::new(TransportResult { + transport: dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r2 = parse_shell_binding_body( + skip_newlines(r.tokens.clone()), + ctx.clone(), + ); + if has_err(r2.err.clone()) { + return Rc::new(TransportResult { + transport: r2.transport.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = expect( + &skip_newlines(r2.tokens.clone()), + &Rc::new(ExpectedToken::ExpectRBrace), + ); + if has_err(r3.err.clone()) { + return Rc::new(TransportResult { + transport: dummy.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), + }); + } + Rc::new(TransportResult { + transport: r2.transport.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: None, + }) + } + } else { + if (tok_text.clone().as_str() == "file".to_string().as_str()) { + { + let r = expect( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + &Rc::new(ExpectedToken::ExpectLBrace), + ); + if has_err(r.err.clone()) { + return Rc::new(TransportResult { + transport: dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r2 = parse_file_binding_body( + skip_newlines(r.tokens.clone()), + ctx.clone(), + ); + if has_err(r2.err.clone()) { + return Rc::new(TransportResult { + transport: r2.transport.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = expect( + &skip_newlines(r2.tokens.clone()), + &Rc::new(ExpectedToken::ExpectRBrace), + ); + if has_err(r3.err.clone()) { + return Rc::new(TransportResult { + transport: dummy.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), + }); + } + Rc::new(TransportResult { + transport: r2.transport.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: None, + }) + } + } else { + Rc::new(TransportResult { + transport: dummy.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } + } } } - }, - _ => Rc::new(TransportResult { - transport: dummy.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}), -} -} -} - -pub fn parse_rest_binding_body(tokens: Rc>>, ctx: Rc) -> Rc { - parse_rest_fields(tokens, ctx, None, None, None, None, None, None, Rc::new(vec![])) + _ => Rc::new(TransportResult { + transport: dummy.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }), + } + } } -pub fn parse_rest_fields(mut tokens: Rc>>, mut ctx: Rc, mut base_url: Option>, mut method: Option>, mut path_template: Option>, mut query: Option>, mut request_body: Option>, mut response_format: Option>, mut headers: Rc>>) -> Rc { +pub fn parse_rest_binding_body( + tokens: Rc>>, + ctx: Rc, +) -> Rc { + parse_rest_fields( + tokens, + ctx, + None, + None, + None, + None, + None, + None, + Rc::new(vec![]), + ) +} + +pub fn parse_rest_fields( + mut tokens: Rc>>, + mut ctx: Rc, + mut base_url: Option>, + mut method: Option>, + mut path_template: Option>, + mut query: Option>, + mut request_body: Option>, + mut response_format: Option>, + mut headers: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -let span = token_span(tokens.clone().first().cloned()); -let dummy = local_transport_node(span.clone()); -if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { + let span = token_span(tokens.clone().first().cloned()); + let dummy = local_transport_node(span.clone()); + if (tok_is_rbrace(tokens.clone().first().cloned()) + || tok_is_eof(tokens.clone().first().cloned())) + { let bu = match base_url { - Some(e) => e.clone(), - None => make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: "".to_string(), -}), -}), Rc::new(vec![]), None, make_span(0, 0)), -}; -break Rc::new(TransportResult { - transport: rest_transport_node(bu, Rc::new(vec![]), headers, method, path_template, query, request_body, response_format, span.clone()), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); -} else { + Some(e) => e.clone(), + None => make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: "".to_string(), + }), + }), + Rc::new(vec![]), + None, + make_span(0, 0), + ), + }; + break Rc::new(TransportResult { + transport: rest_transport_node( + bu, + Rc::new(vec![]), + headers, + method, + path_template, + query, + request_body, + response_format, + span.clone(), + ), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } else { let r = expect_ident(&tokens); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + transport: dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -let fname = r.name.clone(); -let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); -if has_err(r2.err.clone()) { + let fname = r.name.clone(); + let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); + if has_err(r2.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) + transport: dummy.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); } -let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); -if has_err(r3.err.clone()) { + let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); + if has_err(r3.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), -}) - } -let e = eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); -tokens = match (*e.clone()).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => r3.tokens.clone(), -}; -ctx = r3.ctx.clone(); -if (fname.clone().as_str() == transport_url_key().as_str()) { + transport: dummy.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), + }); + } + let e = eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); + tokens = match (*e.clone()).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => r3.tokens.clone(), + }; + ctx = r3.ctx.clone(); + if (fname.clone().as_str() == transport_url_key().as_str()) { { let __tco_0 = Some(r3.expr.clone()); -base_url = __tco_0; -continue; -} -} else { + base_url = __tco_0; + continue; + } + } else { if (fname.clone().as_str() == transport_method_key().as_str()) { { let __tco_0 = Some(r3.expr.clone()); -method = __tco_0; -continue; -} -} else { + method = __tco_0; + continue; + } + } else { if (fname.clone().as_str() == transport_path_template_key().as_str()) { { let __tco_0 = Some(r3.expr.clone()); -path_template = __tco_0; -continue; -} -} else { + path_template = __tco_0; + continue; + } + } else { if (fname.clone().as_str() == transport_query_key().as_str()) { { let __tco_0 = Some(r3.expr.clone()); -query = __tco_0; -continue; -} -} else { + query = __tco_0; + continue; + } + } else { if (fname.clone().as_str() == transport_body_key().as_str()) { { let __tco_0 = Some(r3.expr.clone()); -request_body = __tco_0; -continue; -} -} else { - if (fname.clone().as_str() == transport_response_format_key().as_str()) { + request_body = __tco_0; + continue; + } + } else { + if (fname.clone().as_str() + == transport_response_format_key().as_str()) + { { let __tco_0 = Some(r3.expr.clone()); -response_format = __tco_0; -continue; -} -} else { - if (fname.clone().as_str() == transport_headers_key().as_str()) { + response_format = __tco_0; + continue; + } + } else { + if (fname.clone().as_str() == transport_headers_key().as_str()) + { let h = match (*r3.expr.clone().expr_data.clone()).clone() { ExprData::ExprRecordLit { .. } => r3.expr.clone().children.clone(), _ => return Rc::new(TransportResult { @@ -5624,812 +6722,1048 @@ continue; }), "".to_string())), }), }; -{ + { let __tco_0 = h; -headers = __tco_0; -continue; -} -} else { + headers = __tco_0; + continue; + } + } else { { continue; -} -} -} -} -} -} -} -} -} -} + } + } + } + } + } + } + } + } + } + } } -pub fn parse_shell_binding_body(tokens: Rc>>, ctx: Rc) -> Rc { +pub fn parse_shell_binding_body( + tokens: Rc>>, + ctx: Rc, +) -> Rc { parse_shell_fields(tokens, ctx, Rc::new(vec![]), None) } -pub fn parse_shell_fields(mut tokens: Rc>>, mut ctx: Rc, mut argv: Rc>>, mut stdin: Option>) -> Rc { +pub fn parse_shell_fields( + mut tokens: Rc>>, + mut ctx: Rc, + mut argv: Rc>>, + mut stdin: Option>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -let span = token_span(tokens.clone().first().cloned()); -let dummy = local_transport_node(span.clone()); -if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { + let span = token_span(tokens.clone().first().cloned()); + let dummy = local_transport_node(span.clone()); + if (tok_is_rbrace(tokens.clone().first().cloned()) + || tok_is_eof(tokens.clone().first().cloned())) + { break Rc::new(TransportResult { - transport: shell_transport_node(argv, Rc::new(vec![]), stdin, &span), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); -} else { + transport: shell_transport_node(argv, Rc::new(vec![]), stdin, &span), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } else { let r = expect_ident(&tokens); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + transport: dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -let fname = r.name.clone(); -let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); -if has_err(r2.err.clone()) { + let fname = r.name.clone(); + let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); + if has_err(r2.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) + transport: dummy.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); } -if (fname.clone().as_str() == "argv".to_string().as_str()) { + if (fname.clone().as_str() == "argv".to_string().as_str()) { let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectLBracket)); -if has_err(r3.err.clone()) { + if has_err(r3.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: r3.err.clone(), -}) + transport: dummy.clone(), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: r3.err.clone(), + }); } -let r4 = parse_expr_list_until(r3.tokens.clone(), ctx.clone(), Rc::new(ExpectedToken::ExpectRBracket)); -if has_err(r4.err.clone()) { + let r4 = parse_expr_list_until( + r3.tokens.clone(), + ctx.clone(), + Rc::new(ExpectedToken::ExpectRBracket), + ); + if has_err(r4.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r4.tokens.clone(), - ctx: r4.ctx.clone(), - err: r4.err.clone(), -}) + transport: dummy.clone(), + tokens: r4.tokens.clone(), + ctx: r4.ctx.clone(), + err: r4.err.clone(), + }); } -let r5 = expect(&r4.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBracket)); -if has_err(r5.err.clone()) { + let r5 = expect(&r4.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBracket)); + if has_err(r5.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r5.tokens.clone(), - ctx: r4.ctx.clone(), - err: r5.err.clone(), -}) - } -let e = eat(&r5.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); -tokens = match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => r5.tokens.clone(), -}; -{ + transport: dummy.clone(), + tokens: r5.tokens.clone(), + ctx: r4.ctx.clone(), + err: r5.err.clone(), + }); + } + let e = eat(&r5.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); + tokens = match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => r5.tokens.clone(), + }; + { let __tco_0 = r4.ctx.clone(); -let __tco_1 = r4.exprs.clone(); -ctx = __tco_0; -argv = __tco_1; -continue; -} -} else { + let __tco_1 = r4.exprs.clone(); + ctx = __tco_0; + argv = __tco_1; + continue; + } + } else { if (fname.clone().as_str() == transport_stdin_key().as_str()) { let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); -if has_err(r3.err.clone()) { + if has_err(r3.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), -}) + transport: dummy.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), + }); } -let e = eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); -tokens = match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => r3.tokens.clone(), -}; -{ + let e = eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); + tokens = match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => r3.tokens.clone(), + }; + { let __tco_0 = r3.ctx.clone(); -let __tco_1 = Some(r3.expr.clone()); -ctx = __tco_0; -stdin = __tco_1; -continue; -} -} else { + let __tco_1 = Some(r3.expr.clone()); + ctx = __tco_0; + stdin = __tco_1; + continue; + } + } else { let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); -if has_err(r3.err.clone()) { + if has_err(r3.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), -}) + transport: dummy.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), + }); } -let e = eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); -tokens = match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => r3.tokens.clone(), -}; -{ + let e = eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); + tokens = match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => r3.tokens.clone(), + }; + { let __tco_0 = r3.ctx.clone(); -ctx = __tco_0; -continue; -} -} -} -} -} + ctx = __tco_0; + continue; + } + } + } + } + } } -pub fn parse_file_binding_body(tokens: Rc>>, ctx: Rc) -> Rc { +pub fn parse_file_binding_body( + tokens: Rc>>, + ctx: Rc, +) -> Rc { parse_file_fields(tokens, ctx, None) } -pub fn parse_file_fields(mut tokens: Rc>>, mut ctx: Rc, mut base_path: Option>) -> Rc { +pub fn parse_file_fields( + mut tokens: Rc>>, + mut ctx: Rc, + mut base_path: Option>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -let span = token_span(tokens.clone().first().cloned()); -let dummy = local_transport_node(span.clone()); -if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { + let span = token_span(tokens.clone().first().cloned()); + let dummy = local_transport_node(span.clone()); + if (tok_is_rbrace(tokens.clone().first().cloned()) + || tok_is_eof(tokens.clone().first().cloned())) + { let bp = match base_path { - Some(e) => e.clone(), - None => make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: "".to_string(), -}), -}), Rc::new(vec![]), None, make_span(0, 0)), -}; -break Rc::new(TransportResult { - transport: file_transport_node(bp, span.clone()), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); -} else { + Some(e) => e.clone(), + None => make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: "".to_string(), + }), + }), + Rc::new(vec![]), + None, + make_span(0, 0), + ), + }; + break Rc::new(TransportResult { + transport: file_transport_node(bp, span.clone()), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } else { let r = expect_ident(&tokens); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + transport: dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -let fname = r.name.clone(); -let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); -if has_err(r2.err.clone()) { + let fname = r.name.clone(); + let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); + if has_err(r2.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) + transport: dummy.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); } -let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); -if has_err(r3.err.clone()) { + let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); + if has_err(r3.err.clone()) { return Rc::new(TransportResult { - transport: dummy.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), -}) - } -let e = eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); -tokens = match (*e.clone()).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => r3.tokens.clone(), -}; -if ((fname.clone().as_str() == "path".to_string().as_str()) || (fname.clone().as_str() == transport_path_key().as_str())) { + transport: dummy.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), + }); + } + let e = eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); + tokens = match (*e.clone()).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => r3.tokens.clone(), + }; + if ((fname.clone().as_str() == "path".to_string().as_str()) + || (fname.clone().as_str() == transport_path_key().as_str())) + { { let __tco_0 = r3.ctx.clone(); -let __tco_1 = Some(r3.expr.clone()); -ctx = __tco_0; -base_path = __tco_1; -continue; -} -} else { + let __tco_1 = Some(r3.expr.clone()); + ctx = __tco_0; + base_path = __tco_1; + continue; + } + } else { { let __tco_0 = r3.ctx.clone(); -ctx = __tco_0; -continue; -} -} -} -} + ctx = __tco_0; + continue; + } + } + } + } } pub fn parse_operation_def(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); -let dummy_op = make_operation_node("".to_string(), None, Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), None, &start_span, &ctx.source_indices.clone()); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { - text: "operation".to_string(), -})); -if has_err(r.err.clone()) { + let dummy_op = make_operation_node( + "".to_string(), + None, + Rc::new(vec![]), + Rc::new(vec![]), + Rc::new(vec![]), + Rc::new(vec![]), + Rc::new(vec![]), + Rc::new(vec![]), + None, + &start_span, + &ctx.source_indices.clone(), + ); + let r = expect( + &tokens, + &Rc::new(ExpectedToken::ExpectKeyword { + text: "operation".to_string(), + }), + ); + if has_err(r.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r = expect_ident(&r.tokens.clone()); -if has_err(r.err.clone()) { + operation: dummy_op.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r = expect_ident(&r.tokens.clone()); + if has_err(r.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let name = r.name.clone(); -let name_span = r.span.clone(); -let tokens = skip_newlines(r.tokens.clone()); -if tok_is_lbrace(tokens.clone().first().cloned()) { + operation: dummy_op.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let name = r.name.clone(); + let name_span = r.span.clone(); + let tokens = skip_newlines(r.tokens.clone()); + if tok_is_lbrace(tokens.clone().first().cloned()) { parse_operation_v1_body(&tokens, &ctx, name, name_span, &start_span) } else { parse_operation_v2_inline(&tokens, &ctx, name, name_span, &start_span) } -} + } } -pub fn parse_operation_v2_inline(tokens: &Rc>>, ctx: &Rc, name: String, name_span: Rc, start_span: &Rc) -> Rc { +pub fn parse_operation_v2_inline( + tokens: &Rc>>, + ctx: &Rc, + name: String, + name_span: Rc, + start_span: &Rc, +) -> Rc { { - let dummy_op = make_operation_node("".to_string(), None, Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), None, &start_span, &ctx.source_indices.clone()); -let mods_r = parse_operation_modifiers(tokens.clone(), ctx.clone()); -let modifiers = mods_r.modifiers.clone(); -let mod_props = modifiers_to_props(modifiers, start_span.clone()); -let tokens = mods_r.tokens.clone(); -let ctx = mods_r.ctx.clone(); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLParen)); -if has_err(r.err.clone()) { + let dummy_op = make_operation_node( + "".to_string(), + None, + Rc::new(vec![]), + Rc::new(vec![]), + Rc::new(vec![]), + Rc::new(vec![]), + Rc::new(vec![]), + Rc::new(vec![]), + None, + &start_span, + &ctx.source_indices.clone(), + ); + let mods_r = parse_operation_modifiers(tokens.clone(), ctx.clone()); + let modifiers = mods_r.modifiers.clone(); + let mod_props = modifiers_to_props(modifiers, start_span.clone()); + let tokens = mods_r.tokens.clone(); + let ctx = mods_r.ctx.clone(); + let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLParen)); + if has_err(r.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r = parse_field_list(skip_newlines(r.tokens.clone()), ctx.clone()); -if has_err(r.err.clone()) { + operation: dummy_op.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r = parse_field_list(skip_newlines(r.tokens.clone()), ctx.clone()); + if has_err(r.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let inputs = r.fields.clone(); -let r = expect(&skip_newlines(r.tokens.clone()), &Rc::new(ExpectedToken::ExpectRParen)); -if has_err(r.err.clone()) { + operation: dummy_op.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let inputs = r.fields.clone(); + let r = expect( + &skip_newlines(r.tokens.clone()), + &Rc::new(ExpectedToken::ExpectRParen), + ); + if has_err(r.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let tokens = r.tokens.clone(); -let ret = parse_optional_inferred(&tokens, ctx.clone()); -if has_err(ret.err.clone()) { + operation: dummy_op.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let tokens = r.tokens.clone(); + let ret = parse_optional_inferred(&tokens, ctx.clone()); + if has_err(ret.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: ret.tokens.clone(), - ctx: ret.ctx.clone(), - err: ret.err.clone(), -}) - } -let tokens = ret.tokens.clone(); -let ctx = ret.ctx.clone(); -let outputs = match ret.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => node_inferred_to_outputs(&rt, ctx.source_indices.clone()), - _ => Rc::new(vec![]), -}; -let tokens = skip_newlines(tokens.clone()); -let resp_r = parse_optional_response_block(&tokens, &ctx); -if has_err(resp_r.err.clone()) { + operation: dummy_op.clone(), + tokens: ret.tokens.clone(), + ctx: ret.ctx.clone(), + err: ret.err.clone(), + }); + } + let tokens = ret.tokens.clone(); + let ctx = ret.ctx.clone(); + let outputs = match ret.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + node_inferred_to_outputs(&rt, ctx.source_indices.clone()) + } + _ => Rc::new(vec![]), + }; + let tokens = skip_newlines(tokens.clone()); + let resp_r = parse_optional_response_block(&tokens, &ctx); + if has_err(resp_r.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: resp_r.tokens.clone(), - ctx: resp_r.ctx.clone(), - err: resp_r.err.clone(), -}) - } -let tokens = skip_newlines(resp_r.tokens.clone()); -let ctx = resp_r.ctx.clone(); -let mock_r = parse_optional_mock_response_block(&tokens, &ctx); -if has_err(mock_r.err.clone()) { + operation: dummy_op.clone(), + tokens: resp_r.tokens.clone(), + ctx: resp_r.ctx.clone(), + err: resp_r.err.clone(), + }); + } + let tokens = skip_newlines(resp_r.tokens.clone()); + let ctx = resp_r.ctx.clone(); + let mock_r = parse_optional_mock_response_block(&tokens, &ctx); + if has_err(mock_r.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: mock_r.tokens.clone(), - ctx: mock_r.ctx.clone(), - err: mock_r.err.clone(), -}) - } -let tokens = skip_newlines(mock_r.tokens.clone()); -let ctx = mock_r.ctx.clone(); -let op = make_operation_node(name, Some(name_span), inputs, outputs, resp_r.responses.clone(), mock_r.mocks.clone(), Rc::new(vec![]), mod_props, None, &start_span, &ctx.source_indices.clone()); -Rc::new(OpResult { - operation: op, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) -} + operation: dummy_op.clone(), + tokens: mock_r.tokens.clone(), + ctx: mock_r.ctx.clone(), + err: mock_r.err.clone(), + }); + } + let tokens = skip_newlines(mock_r.tokens.clone()); + let ctx = mock_r.ctx.clone(); + let op = make_operation_node( + name, + Some(name_span), + inputs, + outputs, + resp_r.responses.clone(), + mock_r.mocks.clone(), + Rc::new(vec![]), + mod_props, + None, + &start_span, + &ctx.source_indices.clone(), + ); + Rc::new(OpResult { + operation: op, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } } -pub fn parse_operation_v1_body(tokens: &Rc>>, ctx: &Rc, name: String, name_span: Rc, start_span: &Rc) -> Rc { +pub fn parse_operation_v1_body( + tokens: &Rc>>, + ctx: &Rc, + name: String, + name_span: Rc, + start_span: &Rc, +) -> Rc { { - let dummy_op = make_operation_node("".to_string(), None, Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), None, &start_span, &ctx.source_indices.clone()); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBrace)); -if has_err(r.err.clone()) { + let dummy_op = make_operation_node( + "".to_string(), + None, + Rc::new(vec![]), + Rc::new(vec![]), + Rc::new(vec![]), + Rc::new(vec![]), + Rc::new(vec![]), + Rc::new(vec![]), + None, + &start_span, + &ctx.source_indices.clone(), + ); + let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBrace)); + if has_err(r.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let tokens = skip_newlines(r.tokens.clone()); -let r2 = parse_op_body_entries(tokens.clone(), ctx.clone(), Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![]), None, Rc::new(vec![]), Rc::new(vec![]), Rc::new(vec![])); -if has_err(r2.err.clone()) { + operation: dummy_op.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let tokens = skip_newlines(r.tokens.clone()); + let r2 = parse_op_body_entries( + tokens.clone(), + ctx.clone(), + Rc::new(vec![]), + Rc::new(vec![]), + Rc::new(vec![]), + None, + Rc::new(vec![]), + Rc::new(vec![]), + Rc::new(vec![]), + ); + if has_err(r2.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r3.err.clone()) { + operation: dummy_op.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = expect( + &skip_newlines(r2.tokens.clone()), + &Rc::new(ExpectedToken::ExpectRBrace), + ); + if has_err(r3.err.clone()) { return Rc::new(OpResult { - operation: dummy_op.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), -}) - } -let op = make_operation_node(name, Some(name_span), r2.inputs.clone(), r2.outputs.clone(), r2.response_props.clone(), r2.mock_props.clone(), r2.exit_props.clone(), r2.modifier_props.clone(), r2.transport.clone(), &start_span, &ctx.source_indices.clone()); -Rc::new(OpResult { - operation: op, - tokens: skip_newlines(r3.tokens.clone()), - ctx: r2.ctx.clone(), - err: None, -}) -} + operation: dummy_op.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), + }); + } + let op = make_operation_node( + name, + Some(name_span), + r2.inputs.clone(), + r2.outputs.clone(), + r2.response_props.clone(), + r2.mock_props.clone(), + r2.exit_props.clone(), + r2.modifier_props.clone(), + r2.transport.clone(), + &start_span, + &ctx.source_indices.clone(), + ); + Rc::new(OpResult { + operation: op, + tokens: skip_newlines(r3.tokens.clone()), + ctx: r2.ctx.clone(), + err: None, + }) + } } -pub fn parse_op_body_entries(mut tokens: Rc>>, mut ctx: Rc, mut inputs: Rc>>, mut outputs: Rc>>, mut modifier_props: Rc>>, mut transport: Option>, mut exit_props: Rc>>, mut response_props: Rc>>, mut mock_props: Rc>>) -> Rc { +pub fn parse_op_body_entries( + mut tokens: Rc>>, + mut ctx: Rc, + mut inputs: Rc>>, + mut outputs: Rc>>, + mut modifier_props: Rc>>, + mut transport: Option>, + mut exit_props: Rc>>, + mut response_props: Rc>>, + mut mock_props: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -let tok = tokens.clone().first().cloned(); -let span = token_span(tok.clone()); -let mk_result = Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); -if (tok_is_rbrace(tok.clone()) || tok_is_eof(tok.clone())) { + let tok = tokens.clone().first().cloned(); + let span = token_span(tok.clone()); + let mk_result = Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + if (tok_is_rbrace(tok.clone()) || tok_is_eof(tok.clone())) { break mk_result; -} else { + } else { let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, -}; -match sh { - Some(TokenShape::ShKeyword) => { let kw_text = tok.clone().unwrap().text.clone(); -if (kw_text.clone().as_str() == "input".to_string().as_str()) { - let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); -if has_err(r.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r2 = parse_field_list(skip_newlines(r.tokens.clone()), ctx.clone()); -if has_err(r2.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r3.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), -}) - } -{ - let __tco_0 = r3.tokens.clone(); -let __tco_1 = r2.ctx.clone(); -let __tco_2 = r2.fields.clone(); -tokens = __tco_0; -ctx = __tco_1; -inputs = __tco_2; -continue; -} -} else { - if (kw_text.clone().as_str() == "output".to_string().as_str()) { - let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); -if has_err(r.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r2 = parse_field_list(skip_newlines(r.tokens.clone()), ctx.clone()); -if has_err(r2.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r3.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), -}) - } -{ - let __tco_0 = r3.tokens.clone(); -let __tco_1 = r2.ctx.clone(); -let __tco_2 = r2.fields.clone(); -tokens = __tco_0; -ctx = __tco_1; -outputs = __tco_2; -continue; -} -} else { - if (kw_text.clone().as_str() == "idempotent".to_string().as_str()) { - let prop = modifier_to_prop("idempotent".to_string(), &span); -{ - let __tco_0 = Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); -let __tco_1 = v2_rt::rc_list_push(modifier_props, prop); -tokens = __tco_0; -modifier_props = __tco_1; -continue; -} -} else { - if (kw_text.clone().as_str() == "readonly".to_string().as_str()) { - let prop = modifier_to_prop("readonly".to_string(), &span); -{ - let __tco_0 = Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); -let __tco_1 = v2_rt::rc_list_push(modifier_props, prop); -tokens = __tco_0; -modifier_props = __tco_1; -continue; -} -} else { - if (kw_text.clone().as_str() == "hermetic".to_string().as_str()) { - let prop = modifier_to_prop("hermetic".to_string(), &span); -{ - let __tco_0 = Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); -let __tco_1 = v2_rt::rc_list_push(modifier_props, prop); -tokens = __tco_0; -modifier_props = __tco_1; -continue; -} -} else { - break mk_result; -} -} -} -} -} }, - Some(TokenShape::ShIdent) => { let id = tok.clone().unwrap().text.clone(); -if (id.clone().as_str() == "transport".to_string().as_str()) { - let r = parse_transport_binding(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &ctx); -if has_err(r.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -{ - let __tco_0 = r.tokens.clone(); -let __tco_1 = r.ctx.clone(); -let __tco_2 = Some(r.transport.clone()); -tokens = __tco_0; -ctx = __tco_1; -transport = __tco_2; -continue; -} -} else { - if (id.clone().as_str() == "exit".to_string().as_str()) { - let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); -if has_err(r.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r2 = parse_exit_entries(skip_newlines(r.tokens.clone()), ctx.clone()); -if has_err(r2.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r3.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), -}) + Some(t) => Some(t.shape.clone()), + None => None, + }; + match sh { + Some(TokenShape::ShKeyword) => { + let kw_text = tok.clone().unwrap().text.clone(); + if (kw_text.clone().as_str() == "input".to_string().as_str()) { + let r = expect( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + &Rc::new(ExpectedToken::ExpectLBrace), + ); + if has_err(r.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r2 = parse_field_list(skip_newlines(r.tokens.clone()), ctx.clone()); + if has_err(r2.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = expect( + &skip_newlines(r2.tokens.clone()), + &Rc::new(ExpectedToken::ExpectRBrace), + ); + if has_err(r3.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), + }); + } + { + let __tco_0 = r3.tokens.clone(); + let __tco_1 = r2.ctx.clone(); + let __tco_2 = r2.fields.clone(); + tokens = __tco_0; + ctx = __tco_1; + inputs = __tco_2; + continue; + } + } else { + if (kw_text.clone().as_str() == "output".to_string().as_str()) { + let r = expect( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + &Rc::new(ExpectedToken::ExpectLBrace), + ); + if has_err(r.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r2 = parse_field_list(skip_newlines(r.tokens.clone()), ctx.clone()); + if has_err(r2.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = expect( + &skip_newlines(r2.tokens.clone()), + &Rc::new(ExpectedToken::ExpectRBrace), + ); + if has_err(r3.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), + }); + } + { + let __tco_0 = r3.tokens.clone(); + let __tco_1 = r2.ctx.clone(); + let __tco_2 = r2.fields.clone(); + tokens = __tco_0; + ctx = __tco_1; + outputs = __tco_2; + continue; + } + } else { + if (kw_text.clone().as_str() == "idempotent".to_string().as_str()) { + let prop = modifier_to_prop("idempotent".to_string(), &span); + { + let __tco_0 = Rc::new( + tokens.iter().cloned().skip(1 as usize).collect::>(), + ); + let __tco_1 = v2_rt::rc_list_push(modifier_props, prop); + tokens = __tco_0; + modifier_props = __tco_1; + continue; + } + } else { + if (kw_text.clone().as_str() == "readonly".to_string().as_str()) { + let prop = modifier_to_prop("readonly".to_string(), &span); + { + let __tco_0 = Rc::new( + tokens + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + let __tco_1 = v2_rt::rc_list_push(modifier_props, prop); + tokens = __tco_0; + modifier_props = __tco_1; + continue; + } + } else { + if (kw_text.clone().as_str() == "hermetic".to_string().as_str()) + { + let prop = modifier_to_prop("hermetic".to_string(), &span); + { + let __tco_0 = Rc::new( + tokens + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + let __tco_1 = v2_rt::rc_list_push(modifier_props, prop); + tokens = __tco_0; + modifier_props = __tco_1; + continue; + } + } else { + break mk_result; + } + } + } + } } -{ - let __tco_0 = r3.tokens.clone(); -let __tco_1 = r2.ctx.clone(); -let __tco_2 = r2.entries.clone(); -tokens = __tco_0; -ctx = __tco_1; -exit_props = __tco_2; -continue; -} -} else { - if (id.clone().as_str() == "response".to_string().as_str()) { - let r = parse_optional_response_block(&tokens, &ctx); -if has_err(r.err.clone()) { + } + Some(TokenShape::ShIdent) => { + let id = tok.clone().unwrap().text.clone(); + if (id.clone().as_str() == "transport".to_string().as_str()) { + let r = parse_transport_binding( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + &ctx, + ); + if has_err(r.err.clone()) { return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -{ + { let __tco_0 = r.tokens.clone(); -let __tco_1 = r.ctx.clone(); -let __tco_2 = r.responses.clone(); -tokens = __tco_0; -ctx = __tco_1; -response_props = __tco_2; -continue; -} -} else { - if (id.clone().as_str() == "mock_response".to_string().as_str()) { - let r = parse_optional_mock_response_block(&tokens, &ctx); -if has_err(r.err.clone()) { + let __tco_1 = r.ctx.clone(); + let __tco_2 = Some(r.transport.clone()); + tokens = __tco_0; + ctx = __tco_1; + transport = __tco_2; + continue; + } + } else { + if (id.clone().as_str() == "exit".to_string().as_str()) { + let r = expect( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + &Rc::new(ExpectedToken::ExpectLBrace), + ); + if has_err(r.err.clone()) { return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -{ - let __tco_0 = r.tokens.clone(); -let __tco_1 = r.ctx.clone(); -let __tco_2 = r.mocks.clone(); -tokens = __tco_0; -ctx = __tco_1; -mock_props = __tco_2; -continue; -} -} else { - if peek_is_colon_after_ident(tokens.clone()) { - let r = expect_ident(&tokens); -if has_err(r.err.clone()) { + let r2 = + parse_exit_entries(skip_newlines(r.tokens.clone()), ctx.clone()); + if has_err(r2.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = expect( + &skip_newlines(r2.tokens.clone()), + &Rc::new(ExpectedToken::ExpectRBrace), + ); + if has_err(r3.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), + }); + } + { + let __tco_0 = r3.tokens.clone(); + let __tco_1 = r2.ctx.clone(); + let __tco_2 = r2.entries.clone(); + tokens = __tco_0; + ctx = __tco_1; + exit_props = __tco_2; + continue; + } + } else { + if (id.clone().as_str() == "response".to_string().as_str()) { + let r = parse_optional_response_block(&tokens, &ctx); + if has_err(r.err.clone()) { return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); -if has_err(r2.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) + { + let __tco_0 = r.tokens.clone(); + let __tco_1 = r.ctx.clone(); + let __tco_2 = r.responses.clone(); + tokens = __tco_0; + ctx = __tco_1; + response_props = __tco_2; + continue; } -let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); -if has_err(r3.err.clone()) { - return Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), -}) + } else { + if (id.clone().as_str() == "mock_response".to_string().as_str()) { + let r = parse_optional_mock_response_block(&tokens, &ctx); + if has_err(r.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + { + let __tco_0 = r.tokens.clone(); + let __tco_1 = r.ctx.clone(); + let __tco_2 = r.mocks.clone(); + tokens = __tco_0; + ctx = __tco_1; + mock_props = __tco_2; + continue; + } + } else { + if peek_is_colon_after_ident(tokens.clone()) { + let r = expect_ident(&tokens); + if has_err(r.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r2 = expect( + &r.tokens.clone(), + &Rc::new(ExpectedToken::ExpectColon), + ); + if has_err(r2.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); + if has_err(r3.err.clone()) { + return Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), + }); + } + { + let __tco_0 = skip_newlines(r3.tokens.clone()); + let __tco_1 = r3.ctx.clone(); + tokens = __tco_0; + ctx = __tco_1; + continue; + } + } else { + break Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error( + format!( + "unexpected '{}' in operation body", + id.clone() + ), + span, + )), + }); + } } -{ - let __tco_0 = skip_newlines(r3.tokens.clone()); -let __tco_1 = r3.ctx.clone(); -tokens = __tco_0; -ctx = __tco_1; -continue; -} -} else { - break Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error(format!("unexpected '{}' in operation body", id.clone()), span)), -}); -} -} -} -} -} }, - _ => { break Rc::new(OpBodyResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - modifier_props: modifier_props.clone(), - transport: transport.clone(), - exit_props: exit_props.clone(), - response_props: response_props.clone(), - mock_props: mock_props.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error("unexpected token in operation body".to_string(), span)), -}); }, -} -} -} + } + } + } + } + _ => { + break Rc::new(OpBodyResult { + inputs: inputs.clone(), + outputs: outputs.clone(), + modifier_props: modifier_props.clone(), + transport: transport.clone(), + exit_props: exit_props.clone(), + response_props: response_props.clone(), + mock_props: mock_props.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error( + "unexpected token in operation body".to_string(), + span, + )), + }); + } + } + } + } } pub fn modifier_to_prop(name: String, span: &Rc) -> Rc { - make_field_init_node(&name, make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitBool { - value: true, -}), -}), Rc::new(vec![]), None, span.clone()), span.clone(), span.clone()) -} - -pub fn modifiers_to_props(modifiers: Rc>, span: Rc) -> Rc>> { - Rc::new({ let mut __result = Vec::new(); for m in modifiers.iter().cloned() { __result.push(match m.clone() { - OperationModifier::Idempotent => modifier_to_prop("idempotent".to_string(), &span), - OperationModifier::Readonly => modifier_to_prop("readonly".to_string(), &span), - OperationModifier::Hermetic => modifier_to_prop("hermetic".to_string(), &span), -}); } __result }) + make_field_init_node( + &name, + make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitBool { value: true }), + }), + Rc::new(vec![]), + None, + span.clone(), + ), + span.clone(), + span.clone(), + ) +} + +pub fn modifiers_to_props( + modifiers: Rc>, + span: Rc, +) -> Rc>> { + Rc::new({ + let mut __result = Vec::new(); + for m in modifiers.iter().cloned() { + __result.push(match m.clone() { + OperationModifier::Idempotent => modifier_to_prop("idempotent".to_string(), &span), + OperationModifier::Readonly => modifier_to_prop("readonly".to_string(), &span), + OperationModifier::Hermetic => modifier_to_prop("hermetic".to_string(), &span), + }); + } + __result + }) } -pub fn status_expr_to_str(expr: &Rc, source_indices: Rc>>) -> String { +pub fn status_expr_to_str( + expr: &Rc, + source_indices: Rc>>, +) -> String { match (*expr.expr_data.clone()).clone() { - ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { - LiteralValue::LitInt { value: n, .. } => int_to_string(n.clone()), - LiteralValue::LitStr { value: s, .. } => s.clone(), - _ => "_".to_string(), -}, - ExprData::ExprVar { .. } => expr_var_name_at(expr.clone(), source_indices), - _ => "_".to_string(), -} + ExprData::ExprLiteral { value: v, .. } => match (*v.clone()).clone() { + LiteralValue::LitInt { value: n, .. } => int_to_string(n.clone()), + LiteralValue::LitStr { value: s, .. } => s.clone(), + _ => "_".to_string(), + }, + ExprData::ExprVar { .. } => expr_var_name_at(expr.clone(), source_indices), + _ => "_".to_string(), + } } pub fn int_to_string(value: i64) -> String { @@ -6438,8 +7772,8 @@ pub fn int_to_string(value: i64) -> String { } else { { let digits = int_to_string_acc(value.clone(), Rc::new(vec![])); -digits.join(&"".to_string()) -} + digits.join(&"".to_string()) + } } } @@ -6447,2195 +7781,2828 @@ pub fn int_to_string_acc(mut value: i64, mut acc: Rc>) -> Rc>()).iter().cloned() { if (p.0.clone() == digit.clone()) { __result.push(p); } } __result }).first().cloned() { - Some(p) => p.1.clone(), - None => "?".to_string(), -}; -{ + let digit = (value.clone() - (rest.clone() * 10)); + let digit_chars = Rc::new(vec![ + "0".to_string(), + "1".to_string(), + "2".to_string(), + "3".to_string(), + "4".to_string(), + "5".to_string(), + "6".to_string(), + "7".to_string(), + "8".to_string(), + "9".to_string(), + ]); + let ch = match Rc::new({ + let mut __result = Vec::new(); + for p in Rc::new( + digit_chars + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + if (p.0.clone() == digit.clone()) { + __result.push(p); + } + } + __result + }) + .first() + .cloned() + { + Some(p) => p.1.clone(), + None => "?".to_string(), + }; + { let __tco_0 = rest.clone(); -let __tco_1 = v2_rt::concat(Rc::new(vec![ch]), acc); -value = __tco_0; -acc = __tco_1; -continue; -} -} -} + let __tco_1 = v2_rt::concat(Rc::new(vec![ch]), acc); + value = __tco_0; + acc = __tco_1; + continue; + } + } + } } pub fn first_child_or_self(n: Rc) -> Rc { match n.children.clone().first().cloned() { - Some(ch) => ch.clone(), - None => n.clone(), -} + Some(ch) => ch.clone(), + None => n.clone(), + } } pub fn last_child_or_self(n: Rc) -> Rc { match n.children.clone().last().cloned() { - Some(ch) => ch.clone(), - None => n.clone(), -} + Some(ch) => ch.clone(), + None => n.clone(), + } } -pub fn node_to_name_str(n: &Rc, source_indices: &Rc>>) -> String { +pub fn node_to_name_str( + n: &Rc, + source_indices: &Rc>>, +) -> String { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); -let effective_n = if is_optional.clone() { - with_required_cardinality(&n) - } else { - n.clone() - }; -let opt_prefix = if is_optional.clone() { - "Optional_".to_string() - } else { - "".to_string() - }; -let effective_name = authored_name_at(source_indices.clone(), &effective_n); -let is_keyed_container = (is_container_type(effective_name.clone()) && ((effective_n.children.clone().len() as i64) == 2)); -if is_keyed_container { - match effective_n.children.clone().last().cloned() { - Some(ch) => v2_rt::concat(v2_rt::concat(v2_rt::concat(opt_prefix, effective_name.clone()), "_".to_string()), node_to_name_str(&ch, &source_indices)), - None => v2_rt::concat(opt_prefix, effective_name.clone()), -} + let is_optional = (n.return_cardinality.clone() == Cardinality::CardOptional); + let effective_n = if is_optional.clone() { + with_required_cardinality(&n) + } else { + n.clone() + }; + let opt_prefix = if is_optional.clone() { + "Optional_".to_string() + } else { + "".to_string() + }; + let effective_name = authored_name_at(source_indices.clone(), &effective_n); + let is_keyed_container = (is_container_type(effective_name.clone()) + && ((effective_n.children.clone().len() as i64) == 2)); + if is_keyed_container { + match effective_n.children.clone().last().cloned() { + Some(ch) => v2_rt::concat( + v2_rt::concat( + v2_rt::concat(opt_prefix, effective_name.clone()), + "_".to_string(), + ), + node_to_name_str(&ch, &source_indices), + ), + None => v2_rt::concat(opt_prefix, effective_name.clone()), + } + } else { + if (effective_n.type_annotation.clone() != None) { + match effective_n.children.clone().first().cloned() { + Some(ch) => v2_rt::concat(opt_prefix, node_to_name_str(&ch, &source_indices)), + None => v2_rt::concat(opt_prefix, effective_name.clone()), + } } else { - if (effective_n.type_annotation.clone() != None) { + if is_container_type(effective_name.clone()) { match effective_n.children.clone().first().cloned() { - Some(ch) => v2_rt::concat(opt_prefix, node_to_name_str(&ch, &source_indices)), - None => v2_rt::concat(opt_prefix, effective_name.clone()), -} + Some(ch) => v2_rt::concat( + v2_rt::concat(opt_prefix, "List_".to_string()), + node_to_name_str(&ch, &source_indices), + ), + None => v2_rt::concat(opt_prefix, effective_name.clone()), + } } else { - if is_container_type(effective_name.clone()) { - match effective_n.children.clone().first().cloned() { - Some(ch) => v2_rt::concat(v2_rt::concat(opt_prefix, "List_".to_string()), node_to_name_str(&ch, &source_indices)), - None => v2_rt::concat(opt_prefix, effective_name.clone()), -} - } else { - if (effective_n.ident_span.clone() == None) { - { - let is_conj = (effective_n.connective.clone() == Connective::Conj); -let is_disj = (effective_n.connective.clone() == Connective::Disj); -if is_conj { - v2_rt::concat(opt_prefix, "Record".to_string()) + if (effective_n.ident_span.clone() == None) { + { + let is_conj = (effective_n.connective.clone() == Connective::Conj); + let is_disj = (effective_n.connective.clone() == Connective::Disj); + if is_conj { + v2_rt::concat(opt_prefix, "Record".to_string()) + } else { + if is_disj { + v2_rt::concat(opt_prefix, "Union".to_string()) } else { - if is_disj { - v2_rt::concat(opt_prefix, "Union".to_string()) - } else { - v2_rt::concat(opt_prefix, effective_name.clone()) - } + v2_rt::concat(opt_prefix, effective_name.clone()) } -} - } else { - v2_rt::concat(opt_prefix, effective_name.clone()) + } } + } else { + v2_rt::concat(opt_prefix, effective_name.clone()) } } } -} + } }) } -pub fn parse_exit_entries(tokens: Rc>>, ctx: Rc) -> Rc { +pub fn parse_exit_entries( + tokens: Rc>>, + ctx: Rc, +) -> Rc { parse_exit_entries_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_exit_entries_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_exit_entries_acc( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { + if (tok_is_rbrace(tokens.clone().first().cloned()) + || tok_is_eof(tokens.clone().first().cloned())) + { break Rc::new(ExitEntriesResult { - entries: acc, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); -} else { + entries: acc, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } else { let r = parse_status_pattern(&tokens, &ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ExitEntriesResult { - entries: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let code = r.expr.clone(); -let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectFatArrow)); -if has_err(r2.err.clone()) { + entries: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let code = r.expr.clone(); + let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectFatArrow)); + if has_err(r2.err.clone()) { return Rc::new(ExitEntriesResult { - entries: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = parse_type_expr(&r2.tokens.clone(), &r.ctx.clone()); -if has_err(r3.err.clone()) { + entries: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = parse_type_expr(&r2.tokens.clone(), &r.ctx.clone()); + if has_err(r3.err.clone()) { return Rc::new(ExitEntriesResult { - entries: Rc::new(vec![]), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), -}) - } -let desc_tok = r3.tokens.clone().first().cloned(); -let desc_sh = match desc_tok { - Some(t) => Some(t.shape.clone()), - None => None, -}; -let desc_tokens = match desc_sh { - Some(TokenShape::ShLitStr) => Rc::new(r3.tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - _ => r3.tokens.clone(), -}; -let code_str = status_expr_to_str(&code, ctx.source_indices.clone()); -let type_name = node_to_name_str(&r3.type_expr.clone(), &ctx.source_indices.clone()); -let prop_name = v2_rt::concat("exit_".to_string(), code_str); -let entry = make_field_init_node(&prop_name, make_named_expr_node(&type_name, Rc::new(ExprData::ExprVar { - binding_kind: None, -}), Rc::new(vec![]), None, r3.type_expr.clone().span.clone(), r3.type_expr.clone().span.clone()), r3.type_expr.clone().span.clone(), no_span()); -let e = eat(&desc_tokens, Rc::new(ExpectedToken::ExpectComma)); -tokens = skip_newlines(match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => desc_tokens.clone(), -}); -{ + entries: Rc::new(vec![]), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), + }); + } + let desc_tok = r3.tokens.clone().first().cloned(); + let desc_sh = match desc_tok { + Some(t) => Some(t.shape.clone()), + None => None, + }; + let desc_tokens = match desc_sh { + Some(TokenShape::ShLitStr) => Rc::new( + r3.tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + _ => r3.tokens.clone(), + }; + let code_str = status_expr_to_str(&code, ctx.source_indices.clone()); + let type_name = node_to_name_str(&r3.type_expr.clone(), &ctx.source_indices.clone()); + let prop_name = v2_rt::concat("exit_".to_string(), code_str); + let entry = make_field_init_node( + &prop_name, + make_named_expr_node( + &type_name, + Rc::new(ExprData::ExprVar { binding_kind: None }), + Rc::new(vec![]), + None, + r3.type_expr.clone().span.clone(), + r3.type_expr.clone().span.clone(), + ), + r3.type_expr.clone().span.clone(), + no_span(), + ); + let e = eat(&desc_tokens, Rc::new(ExpectedToken::ExpectComma)); + tokens = skip_newlines(match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => desc_tokens.clone(), + }); + { let __tco_0 = r3.ctx.clone(); -let __tco_1 = v2_rt::rc_list_push(acc, entry); -ctx = __tco_0; -acc = __tco_1; -continue; -} -} -} + let __tco_1 = v2_rt::rc_list_push(acc, entry); + ctx = __tco_0; + acc = __tco_1; + continue; + } + } + } } -pub fn parse_operation_modifiers(tokens: Rc>>, ctx: Rc) -> Rc { +pub fn parse_operation_modifiers( + tokens: Rc>>, + ctx: Rc, +) -> Rc { parse_operation_modifiers_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_operation_modifiers_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>) -> Rc { +pub fn parse_operation_modifiers_acc( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>, +) -> Rc { loop { let kw = tok_keyword_text(tokens.clone().first().cloned()); -if (kw.clone().as_str() == "idempotent".to_string().as_str()) { + if (kw.clone().as_str() == "idempotent".to_string().as_str()) { { let __tco_0 = Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); -let __tco_1 = v2_rt::rc_list_push(acc, OperationModifier::Idempotent); -tokens = __tco_0; -acc = __tco_1; -continue; -} -} else { + let __tco_1 = v2_rt::rc_list_push(acc, OperationModifier::Idempotent); + tokens = __tco_0; + acc = __tco_1; + continue; + } + } else { if (kw.clone().as_str() == "readonly".to_string().as_str()) { { - let __tco_0 = Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); -let __tco_1 = v2_rt::rc_list_push(acc, OperationModifier::Readonly); -tokens = __tco_0; -acc = __tco_1; -continue; -} -} else { + let __tco_0 = + Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); + let __tco_1 = v2_rt::rc_list_push(acc, OperationModifier::Readonly); + tokens = __tco_0; + acc = __tco_1; + continue; + } + } else { if (kw.clone().as_str() == "hermetic".to_string().as_str()) { { - let __tco_0 = Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); -let __tco_1 = v2_rt::rc_list_push(acc, OperationModifier::Hermetic); -tokens = __tco_0; -acc = __tco_1; -continue; -} -} else { + let __tco_0 = + Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); + let __tco_1 = v2_rt::rc_list_push(acc, OperationModifier::Hermetic); + tokens = __tco_0; + acc = __tco_1; + continue; + } + } else { break Rc::new(ModsResult { - modifiers: acc, - tokens: tokens.clone(), - ctx: ctx, - err: None, -}); -} -} -} -} + modifiers: acc, + tokens: tokens.clone(), + ctx: ctx, + err: None, + }); + } + } + } + } } pub fn parse_status_pattern(tokens: &Rc>>, ctx: &Rc) -> Rc { { let tok = tokens.clone().first().cloned(); -let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, -}; -let span = token_span(tok.clone()); -match sh { - Some(TokenShape::ShLitInt) => { - let n_opt = v2_rt::parse_int(tok.clone().unwrap().text.clone()); -let n = match n_opt { - Some(v) => v.clone(), - None => return Rc::new(ExprResult { - expr: make_expr_error_node(ExprErrorKind::InternalExprError, &v2_rt::concat(v2_rt::concat("internal: ShLitInt token text not parseable as int: '".to_string(), tok.clone().unwrap().text.clone()), "'".to_string()), &span), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}), -}; -let next_tok = tokens.clone().get(1 as usize).cloned(); -match next_tok { - Some(t) => if (is_ident_shape(t.shape.clone()) && (t.text.clone().as_str() == "xx".to_string().as_str())) { - Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: format!("{}xx", n), -}), -}), Rc::new(vec![]), None, span.clone()), - tokens: Rc::new(tokens.clone().iter().cloned().skip(2 as usize).collect::>()), - ctx: ctx.clone(), - err: None, -}) - } else { - Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitInt { - value: n, -}), -}), Rc::new(vec![]), None, span.clone()), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - ctx: ctx.clone(), - err: None, -}) - }, - None => Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitInt { - value: n, -}), -}), Rc::new(vec![]), None, span.clone()), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - ctx: ctx.clone(), - err: None, -}), -} -}, - Some(TokenShape::ShIdent) => { - let id = tok.clone().unwrap().text.clone(); -Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: id, -}), -}), Rc::new(vec![]), None, span.clone()), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - ctx: ctx.clone(), - err: None, -}) -}, - _ => Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: "_".to_string(), -}), -}), Rc::new(vec![]), None, span.clone()), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - ctx: ctx.clone(), - err: None, -}), -} -} + let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, + }; + let span = token_span(tok.clone()); + match sh { + Some(TokenShape::ShLitInt) => { + let n_opt = v2_rt::parse_int(tok.clone().unwrap().text.clone()); + let n = match n_opt { + Some(v) => v.clone(), + None => { + return Rc::new(ExprResult { + expr: make_expr_error_node( + ExprErrorKind::InternalExprError, + &v2_rt::concat( + v2_rt::concat( + "internal: ShLitInt token text not parseable as int: '" + .to_string(), + tok.clone().unwrap().text.clone(), + ), + "'".to_string(), + ), + &span, + ), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } + }; + let next_tok = tokens.clone().get(1 as usize).cloned(); + match next_tok { + Some(t) => { + if (is_ident_shape(t.shape.clone()) + && (t.text.clone().as_str() == "xx".to_string().as_str())) + { + Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: format!("{}xx", n), + }), + }), + Rc::new(vec![]), + None, + span.clone(), + ), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(2 as usize) + .collect::>(), + ), + ctx: ctx.clone(), + err: None, + }) + } else { + Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitInt { value: n }), + }), + Rc::new(vec![]), + None, + span.clone(), + ), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx: ctx.clone(), + err: None, + }) + } + } + None => Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitInt { value: n }), + }), + Rc::new(vec![]), + None, + span.clone(), + ), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx: ctx.clone(), + err: None, + }), + } + } + Some(TokenShape::ShIdent) => { + let id = tok.clone().unwrap().text.clone(); + Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { value: id }), + }), + Rc::new(vec![]), + None, + span.clone(), + ), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx: ctx.clone(), + err: None, + }) + } + _ => Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { + value: "_".to_string(), + }), + }), + Rc::new(vec![]), + None, + span.clone(), + ), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx: ctx.clone(), + err: None, + }), + } + } } -pub fn parse_optional_response_block(tokens: &Rc>>, ctx: &Rc) -> Rc { +pub fn parse_optional_response_block( + tokens: &Rc>>, + ctx: &Rc, +) -> Rc { { let tok = tokens.clone().first().cloned(); -let is_response = match tok { - Some(t) => (is_ident_shape(t.shape.clone()) && (t.text.clone().as_str() == "response".to_string().as_str())), - None => false, -}; -if is_response { + let is_response = match tok { + Some(t) => { + (is_ident_shape(t.shape.clone()) + && (t.text.clone().as_str() == "response".to_string().as_str())) + } + None => false, + }; + if is_response { { - let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); -if has_err(r.err.clone()) { + let r = expect( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + &Rc::new(ExpectedToken::ExpectLBrace), + ); + if has_err(r.err.clone()) { return Rc::new(ResponsesResult { - responses: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + responses: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -let r2 = parse_response_entries(skip_newlines(r.tokens.clone()), ctx.clone()); -if has_err(r2.err.clone()) { + let r2 = parse_response_entries(skip_newlines(r.tokens.clone()), ctx.clone()); + if has_err(r2.err.clone()) { return Rc::new(ResponsesResult { - responses: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r3.err.clone()) { + responses: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = expect( + &skip_newlines(r2.tokens.clone()), + &Rc::new(ExpectedToken::ExpectRBrace), + ); + if has_err(r3.err.clone()) { return Rc::new(ResponsesResult { - responses: Rc::new(vec![]), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), -}) - } -Rc::new(ResponsesResult { - responses: r2.entries.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: None, -}) -} + responses: Rc::new(vec![]), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), + }); + } + Rc::new(ResponsesResult { + responses: r2.entries.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: None, + }) + } } else { Rc::new(ResponsesResult { - responses: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) + responses: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) } -} + } } -pub fn parse_response_entries(tokens: Rc>>, ctx: Rc) -> Rc { +pub fn parse_response_entries( + tokens: Rc>>, + ctx: Rc, +) -> Rc { parse_response_entries_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_response_entries_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_response_entries_acc( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { + if (tok_is_rbrace(tokens.clone().first().cloned()) + || tok_is_eof(tokens.clone().first().cloned())) + { break Rc::new(RespEntriesResult { - entries: acc, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); -} else { + entries: acc, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } else { let r = parse_status_pattern(&tokens, &ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(RespEntriesResult { - entries: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let status = r.expr.clone(); -let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectFatArrow)); -if has_err(r2.err.clone()) { + entries: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let status = r.expr.clone(); + let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectFatArrow)); + if has_err(r2.err.clone()) { return Rc::new(RespEntriesResult { - entries: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = parse_type_expr(&r2.tokens.clone(), &r.ctx.clone()); -if has_err(r3.err.clone()) { + entries: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = parse_type_expr(&r2.tokens.clone(), &r.ctx.clone()); + if has_err(r3.err.clone()) { return Rc::new(RespEntriesResult { - entries: Rc::new(vec![]), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), -}) - } -let status_str = status_expr_to_str(&status, ctx.source_indices.clone()); -let type_name = node_to_name_str(&r3.type_expr.clone(), &ctx.source_indices.clone()); -let prop_name = v2_rt::concat("response_".to_string(), status_str); -let entry = make_field_init_node(&prop_name, make_named_expr_node(&type_name, Rc::new(ExprData::ExprVar { - binding_kind: None, -}), Rc::new(vec![]), None, r3.type_expr.clone().span.clone(), r3.type_expr.clone().span.clone()), r3.type_expr.clone().span.clone(), no_span()); -let e = eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); -tokens = skip_newlines(match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => r3.tokens.clone(), -}); -{ + entries: Rc::new(vec![]), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), + }); + } + let status_str = status_expr_to_str(&status, ctx.source_indices.clone()); + let type_name = node_to_name_str(&r3.type_expr.clone(), &ctx.source_indices.clone()); + let prop_name = v2_rt::concat("response_".to_string(), status_str); + let entry = make_field_init_node( + &prop_name, + make_named_expr_node( + &type_name, + Rc::new(ExprData::ExprVar { binding_kind: None }), + Rc::new(vec![]), + None, + r3.type_expr.clone().span.clone(), + r3.type_expr.clone().span.clone(), + ), + r3.type_expr.clone().span.clone(), + no_span(), + ); + let e = eat(&r3.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); + tokens = skip_newlines(match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => r3.tokens.clone(), + }); + { let __tco_0 = r3.ctx.clone(); -let __tco_1 = v2_rt::rc_list_push(acc, entry); -ctx = __tco_0; -acc = __tco_1; -continue; -} -} -} + let __tco_1 = v2_rt::rc_list_push(acc, entry); + ctx = __tco_0; + acc = __tco_1; + continue; + } + } + } } -pub fn parse_optional_mock_response_block(tokens: &Rc>>, ctx: &Rc) -> Rc { +pub fn parse_optional_mock_response_block( + tokens: &Rc>>, + ctx: &Rc, +) -> Rc { { let tok = tokens.clone().first().cloned(); -let is_mock = match tok { - Some(t) => (is_ident_shape(t.shape.clone()) && (t.text.clone().as_str() == "mock_response".to_string().as_str())), - None => false, -}; -if is_mock { + let is_mock = match tok { + Some(t) => { + (is_ident_shape(t.shape.clone()) + && (t.text.clone().as_str() == "mock_response".to_string().as_str())) + } + None => false, + }; + if is_mock { { - let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); -if has_err(r.err.clone()) { + let r = expect( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + &Rc::new(ExpectedToken::ExpectLBrace), + ); + if has_err(r.err.clone()) { return Rc::new(MocksResult { - mocks: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + mocks: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -let r2 = parse_mock_response_entries(skip_newlines(r.tokens.clone()), ctx.clone()); -if has_err(r2.err.clone()) { + let r2 = parse_mock_response_entries(skip_newlines(r.tokens.clone()), ctx.clone()); + if has_err(r2.err.clone()) { return Rc::new(MocksResult { - mocks: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r3.err.clone()) { + mocks: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = expect( + &skip_newlines(r2.tokens.clone()), + &Rc::new(ExpectedToken::ExpectRBrace), + ); + if has_err(r3.err.clone()) { return Rc::new(MocksResult { - mocks: Rc::new(vec![]), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), -}) - } -Rc::new(MocksResult { - mocks: r2.entries.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: None, -}) -} + mocks: Rc::new(vec![]), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), + }); + } + Rc::new(MocksResult { + mocks: r2.entries.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: None, + }) + } } else { Rc::new(MocksResult { - mocks: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) + mocks: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) } -} + } } -pub fn parse_mock_response_entries(tokens: Rc>>, ctx: Rc) -> Rc { +pub fn parse_mock_response_entries( + tokens: Rc>>, + ctx: Rc, +) -> Rc { parse_mock_response_entries_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_mock_response_entries_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_mock_response_entries_acc( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { + if (tok_is_rbrace(tokens.clone().first().cloned()) + || tok_is_eof(tokens.clone().first().cloned())) + { break Rc::new(MockEntriesResult { - entries: acc, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); -} else { + entries: acc, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } else { let r = parse_status_pattern(&tokens, &ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(MockEntriesResult { - entries: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let status = r.expr.clone(); -let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectFatArrow)); -if has_err(r2.err.clone()) { + entries: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let status = r.expr.clone(); + let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectFatArrow)); + if has_err(r2.err.clone()) { return Rc::new(MockEntriesResult { - entries: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = parse_expr(r2.tokens.clone(), r.ctx.clone()); -if has_err(r3.err.clone()) { + entries: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = parse_expr(r2.tokens.clone(), r.ctx.clone()); + if has_err(r3.err.clone()) { return Rc::new(MockEntriesResult { - entries: Rc::new(vec![]), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), -}) - } -let body = r3.expr.clone(); -let desc_tok = r3.tokens.clone().first().cloned(); -let desc_sh = match desc_tok { - Some(t) => Some(t.shape.clone()), - None => None, -}; -let desc_tokens = match desc_sh { - Some(TokenShape::ShLitStr) => Rc::new(r3.tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - _ => r3.tokens.clone(), -}; -let status_str = status_expr_to_str(&status, ctx.source_indices.clone()); -let prop_name = v2_rt::concat("mock_".to_string(), status_str); -let entry = make_field_init_node(&prop_name, body, make_span(0, 0), make_span(0, 0)); -let e = eat(&desc_tokens, Rc::new(ExpectedToken::ExpectComma)); -tokens = skip_newlines(match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => desc_tokens.clone(), -}); -{ + entries: Rc::new(vec![]), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), + }); + } + let body = r3.expr.clone(); + let desc_tok = r3.tokens.clone().first().cloned(); + let desc_sh = match desc_tok { + Some(t) => Some(t.shape.clone()), + None => None, + }; + let desc_tokens = match desc_sh { + Some(TokenShape::ShLitStr) => Rc::new( + r3.tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + _ => r3.tokens.clone(), + }; + let status_str = status_expr_to_str(&status, ctx.source_indices.clone()); + let prop_name = v2_rt::concat("mock_".to_string(), status_str); + let entry = make_field_init_node(&prop_name, body, make_span(0, 0), make_span(0, 0)); + let e = eat(&desc_tokens, Rc::new(ExpectedToken::ExpectComma)); + tokens = skip_newlines(match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => desc_tokens.clone(), + }); + { let __tco_0 = r3.ctx.clone(); -let __tco_1 = v2_rt::rc_list_push(acc, entry); -ctx = __tco_0; -acc = __tco_1; -continue; -} -} -} + let __tco_1 = v2_rt::rc_list_push(acc, entry); + ctx = __tco_0; + acc = __tco_1; + continue; + } + } + } } pub fn parse_resource_def(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); -let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { - text: "resource".to_string(), -})); -if has_err(r.err.clone()) { + let dummy = Rc::new(Node { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let r = expect( + &tokens, + &Rc::new(ExpectedToken::ExpectKeyword { + text: "resource".to_string(), + }), + ); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + item: dummy, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -parse_resource_after_kw(r.tokens.clone(), &ctx, &start_span) -} + parse_resource_after_kw(r.tokens.clone(), &ctx, &start_span) + } } -pub fn parse_resource_after_kw(tokens: Rc>>, ctx: &Rc, start_span: &Rc) -> Rc { +pub fn parse_resource_after_kw( + tokens: Rc>>, + ctx: &Rc, + start_span: &Rc, +) -> Rc { { let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let r = expect_ident(&tokens); -if has_err(r.err.clone()) { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let r = expect_ident(&tokens); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let name = r.name.clone(); -let name_span = r.span.clone(); -let named_dummy = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectLBrace)); -if has_err(r.err.clone()) { + item: dummy, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let name = r.name.clone(); + let name_span = r.span.clone(); + let named_dummy = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectLBrace)); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r = parse_resource_entries(skip_newlines(r.tokens.clone()), ctx.clone(), Rc::new(vec![]), Rc::new(vec![])); -if has_err(r.err.clone()) { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r = parse_resource_entries( + skip_newlines(r.tokens.clone()), + ctx.clone(), + Rc::new(vec![]), + Rc::new(vec![]), + ); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let r2 = expect(&skip_newlines(r.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r2.err.clone()) { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let r2 = expect( + &skip_newlines(r.tokens.clone()), + &Rc::new(ExpectedToken::ExpectRBrace), + ); + if has_err(r2.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), -}) - } -let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: r.capabilities.clone(), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: r.properties.clone(), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -Rc::new(ItemResult { - item: item, - tokens: skip_newlines(r2.tokens.clone()), - ctx: r.ctx.clone(), - err: None, -}) -} + item: named_dummy.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), + }); + } + let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: r.capabilities.clone(), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: r.properties.clone(), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + Rc::new(ItemResult { + item: item, + tokens: skip_newlines(r2.tokens.clone()), + ctx: r.ctx.clone(), + err: None, + }) + } } -pub fn parse_resource_entries(mut tokens: Rc>>, mut ctx: Rc, mut properties: Rc>>, mut capabilities: Rc>>) -> Rc { +pub fn parse_resource_entries( + mut tokens: Rc>>, + mut ctx: Rc, + mut properties: Rc>>, + mut capabilities: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -let tok = tokens.clone().first().cloned(); -let span = token_span(tok.clone()); -if (tok_is_rbrace(tok.clone()) || tok_is_eof(tok.clone())) { + let tok = tokens.clone().first().cloned(); + let span = token_span(tok.clone()); + if (tok_is_rbrace(tok.clone()) || tok_is_eof(tok.clone())) { break Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); -} else { + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } else { let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, -}; -match sh { - Some(TokenShape::ShKeyword) => { let kw_text = tok_keyword_text(tok.clone()); -if (kw_text.clone().as_str() == "capability".to_string().as_str()) { - let r = parse_capability(&tokens, &ctx); -if has_err(r.err.clone()) { - return Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -{ - let __tco_0 = r.tokens.clone(); -let __tco_1 = r.ctx.clone(); -let __tco_2 = v2_rt::rc_list_push(capabilities, r.capability.clone()); -tokens = __tco_0; -ctx = __tco_1; -capabilities = __tco_2; -continue; -} -} else { - if (kw_text.clone().as_str() == "acquire".to_string().as_str()) { - let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); -if has_err(r.err.clone()) { - return Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r2 = skip_until_rbrace(&skip_newlines(r.tokens.clone())); -let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r3.err.clone()) { - return Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: r3.err.clone(), -}) + Some(t) => Some(t.shape.clone()), + None => None, + }; + match sh { + Some(TokenShape::ShKeyword) => { + let kw_text = tok_keyword_text(tok.clone()); + if (kw_text.clone().as_str() == "capability".to_string().as_str()) { + let r = parse_capability(&tokens, &ctx); + if has_err(r.err.clone()) { + return Rc::new(ResPropResult { + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + { + let __tco_0 = r.tokens.clone(); + let __tco_1 = r.ctx.clone(); + let __tco_2 = v2_rt::rc_list_push(capabilities, r.capability.clone()); + tokens = __tco_0; + ctx = __tco_1; + capabilities = __tco_2; + continue; + } + } else { + if (kw_text.clone().as_str() == "acquire".to_string().as_str()) { + let r = expect( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + &Rc::new(ExpectedToken::ExpectLBrace), + ); + if has_err(r.err.clone()) { + return Rc::new(ResPropResult { + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r2 = skip_until_rbrace(&skip_newlines(r.tokens.clone())); + let r3 = + expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBrace)); + if has_err(r3.err.clone()) { + return Rc::new(ResPropResult { + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: r3.err.clone(), + }); + } + { + let __tco_0 = skip_newlines(r3.tokens.clone()); + tokens = __tco_0; + continue; + } + } else { + if (kw_text.clone().as_str() == "release".to_string().as_str()) { + let r = expect( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + &Rc::new(ExpectedToken::ExpectLBrace), + ); + if has_err(r.err.clone()) { + return Rc::new(ResPropResult { + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r2 = skip_until_rbrace(&skip_newlines(r.tokens.clone())); + let r3 = expect( + &r2.tokens.clone(), + &Rc::new(ExpectedToken::ExpectRBrace), + ); + if has_err(r3.err.clone()) { + return Rc::new(ResPropResult { + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: r3.tokens.clone(), + ctx: ctx.clone(), + err: r3.err.clone(), + }); + } + { + let __tco_0 = skip_newlines(r3.tokens.clone()); + tokens = __tco_0; + continue; + } + } else { + break Rc::new(ResPropResult { + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error( + "unexpected keyword in resource block".to_string(), + span, + )), + }); + } + } } -{ - let __tco_0 = skip_newlines(r3.tokens.clone()); -tokens = __tco_0; -continue; -} -} else { - if (kw_text.clone().as_str() == "release".to_string().as_str()) { - let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); -if has_err(r.err.clone()) { + } + Some(TokenShape::ShIdent) => { + if peek_is_colon_after_ident(tokens.clone()) { + let r = expect_ident(&tokens); + if has_err(r.err.clone()) { return Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -let r2 = skip_until_rbrace(&skip_newlines(r.tokens.clone())); -let r3 = expect(&r2.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r3.err.clone()) { + let fname = r.name.clone(); + let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); + if has_err(r2.err.clone()) { return Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: r3.tokens.clone(), - ctx: ctx.clone(), - err: r3.err.clone(), -}) + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); + if has_err(r3.err.clone()) { + return Rc::new(ResPropResult { + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), + }); } -{ + let fi = make_field_init_node( + &fname, + r3.expr.clone(), + make_span(0, 0), + r.span.clone(), + ); + { let __tco_0 = skip_newlines(r3.tokens.clone()); -tokens = __tco_0; -continue; -} -} else { + let __tco_1 = r3.ctx.clone(); + let __tco_2 = v2_rt::rc_list_push(properties, fi); + tokens = __tco_0; + ctx = __tco_1; + properties = __tco_2; + continue; + } + } else { break Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error("unexpected keyword in resource block".to_string(), span)), -}); -} -} -} }, - Some(TokenShape::ShIdent) => { if peek_is_colon_after_ident(tokens.clone()) { - let r = expect_ident(&tokens); -if has_err(r.err.clone()) { - return Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let fname = r.name.clone(); -let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); -if has_err(r2.err.clone()) { - return Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); -if has_err(r3.err.clone()) { - return Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), -}) - } -let fi = make_field_init_node(&fname, r3.expr.clone(), make_span(0, 0), r.span.clone()); -{ - let __tco_0 = skip_newlines(r3.tokens.clone()); -let __tco_1 = r3.ctx.clone(); -let __tco_2 = v2_rt::rc_list_push(properties, fi); -tokens = __tco_0; -ctx = __tco_1; -properties = __tco_2; -continue; -} -} else { - break Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error("unexpected token in resource block".to_string(), span)), -}); -} }, - _ => { break Rc::new(ResPropResult { - properties: properties.clone(), - capabilities: capabilities.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error("expected capability, acquire, release, or property in resource block".to_string(), span)), -}); }, -} -} -} + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error( + "unexpected token in resource block".to_string(), + span, + )), + }); + } + } + _ => { + break Rc::new(ResPropResult { + properties: properties.clone(), + capabilities: capabilities.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error( + "expected capability, acquire, release, or property in resource block" + .to_string(), + span, + )), + }); + } + } + } + } } pub fn skip_until_rbrace(tokens: &Rc>>) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { - { - let tokens = skip_newlines(tokens.clone()); -let tok = tokens.clone().first().cloned(); -if (tok_is_rbrace(tok.clone()) || tok_is_eof(tok.clone())) { - Rc::new(UnitResult { - tokens: tokens.clone(), - err: None, -}) - } else { - { - let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, -}; -match sh { - Some(TokenShape::ShLBrace) => { - let inner = skip_until_rbrace(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>())); -let r = expect(&inner.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r.err.clone()) { + let tokens = skip_newlines(tokens.clone()); + let tok = tokens.clone().first().cloned(); + if (tok_is_rbrace(tok.clone()) || tok_is_eof(tok.clone())) { + Rc::new(UnitResult { + tokens: tokens.clone(), + err: None, + }) + } else { + { + let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, + }; + match sh { + Some(TokenShape::ShLBrace) => { + let inner = skip_until_rbrace(&Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + )); + let r = + expect(&inner.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBrace)); + if has_err(r.err.clone()) { return Rc::new(UnitResult { - tokens: r.tokens.clone(), - err: r.err.clone(), -}) + tokens: r.tokens.clone(), + err: r.err.clone(), + }); } -skip_until_rbrace(&r.tokens.clone()) -}, - _ => skip_until_rbrace(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>())), -} -} + skip_until_rbrace(&r.tokens.clone()) + } + _ => skip_until_rbrace(&Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + )), + } } -} + } }) } pub fn parse_capability(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); -let dummy_cap = make_capability_node("".to_string(), None, Rc::new(vec![]), Rc::new(vec![]), &start_span, &ctx.source_indices.clone()); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { - text: "capability".to_string(), -})); -if has_err(r.err.clone()) { + let dummy_cap = make_capability_node( + "".to_string(), + None, + Rc::new(vec![]), + Rc::new(vec![]), + &start_span, + &ctx.source_indices.clone(), + ); + let r = expect( + &tokens, + &Rc::new(ExpectedToken::ExpectKeyword { + text: "capability".to_string(), + }), + ); + if has_err(r.err.clone()) { return Rc::new(CapResult { - capability: dummy_cap.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r = expect_ident(&r.tokens.clone()); -if has_err(r.err.clone()) { + capability: dummy_cap.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r = expect_ident(&r.tokens.clone()); + if has_err(r.err.clone()) { return Rc::new(CapResult { - capability: dummy_cap.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let name = r.name.clone(); -let name_span = r.span.clone(); -let tokens = r.tokens.clone(); -if tok_is_lbrace(tokens.clone().first().cloned()) { + capability: dummy_cap.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let name = r.name.clone(); + let name_span = r.span.clone(); + let tokens = r.tokens.clone(); + if tok_is_lbrace(tokens.clone().first().cloned()) { { let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBrace)); -if has_err(r2.err.clone()) { + if has_err(r2.err.clone()) { return Rc::new(CapResult { - capability: dummy_cap.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) + capability: dummy_cap.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); } -let io = parse_input_output_blocks(skip_newlines(r2.tokens.clone()), ctx.clone()); -if has_err(io.err.clone()) { + let io = parse_input_output_blocks(skip_newlines(r2.tokens.clone()), ctx.clone()); + if has_err(io.err.clone()) { return Rc::new(CapResult { - capability: dummy_cap.clone(), - tokens: io.tokens.clone(), - ctx: io.ctx.clone(), - err: io.err.clone(), -}) - } -let r3 = expect(&skip_newlines(io.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r3.err.clone()) { + capability: dummy_cap.clone(), + tokens: io.tokens.clone(), + ctx: io.ctx.clone(), + err: io.err.clone(), + }); + } + let r3 = expect( + &skip_newlines(io.tokens.clone()), + &Rc::new(ExpectedToken::ExpectRBrace), + ); + if has_err(r3.err.clone()) { return Rc::new(CapResult { - capability: dummy_cap.clone(), - tokens: r3.tokens.clone(), - ctx: io.ctx.clone(), - err: r3.err.clone(), -}) - } -let cap = make_capability_node(name, Some(name_span), io.inputs.clone(), io.outputs.clone(), &start_span, &ctx.source_indices.clone()); -Rc::new(CapResult { - capability: cap, - tokens: skip_newlines(r3.tokens.clone()), - ctx: io.ctx.clone(), - err: None, -}) -} + capability: dummy_cap.clone(), + tokens: r3.tokens.clone(), + ctx: io.ctx.clone(), + err: r3.err.clone(), + }); + } + let cap = make_capability_node( + name, + Some(name_span), + io.inputs.clone(), + io.outputs.clone(), + &start_span, + &ctx.source_indices.clone(), + ); + Rc::new(CapResult { + capability: cap, + tokens: skip_newlines(r3.tokens.clone()), + ctx: io.ctx.clone(), + err: None, + }) + } } else { if tok_is_lparen(tokens.clone().first().cloned()) { { let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectLParen)); -if has_err(r2.err.clone()) { + if has_err(r2.err.clone()) { return Rc::new(CapResult { - capability: dummy_cap.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) + capability: dummy_cap.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); } -let r3 = parse_field_list(skip_newlines(r2.tokens.clone()), ctx.clone()); -if has_err(r3.err.clone()) { + let r3 = parse_field_list(skip_newlines(r2.tokens.clone()), ctx.clone()); + if has_err(r3.err.clone()) { return Rc::new(CapResult { - capability: dummy_cap.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), -}) + capability: dummy_cap.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), + }); } -let inputs = r3.fields.clone(); -let r4 = expect(&skip_newlines(r3.tokens.clone()), &Rc::new(ExpectedToken::ExpectRParen)); -if has_err(r4.err.clone()) { + let inputs = r3.fields.clone(); + let r4 = expect( + &skip_newlines(r3.tokens.clone()), + &Rc::new(ExpectedToken::ExpectRParen), + ); + if has_err(r4.err.clone()) { return Rc::new(CapResult { - capability: dummy_cap.clone(), - tokens: r4.tokens.clone(), - ctx: r3.ctx.clone(), - err: r4.err.clone(), -}) + capability: dummy_cap.clone(), + tokens: r4.tokens.clone(), + ctx: r3.ctx.clone(), + err: r4.err.clone(), + }); } -let ret = parse_optional_inferred(&r4.tokens.clone(), r3.ctx.clone()); -if has_err(ret.err.clone()) { + let ret = parse_optional_inferred(&r4.tokens.clone(), r3.ctx.clone()); + if has_err(ret.err.clone()) { return Rc::new(CapResult { - capability: dummy_cap.clone(), - tokens: ret.tokens.clone(), - ctx: ret.ctx.clone(), - err: ret.err.clone(), -}) + capability: dummy_cap.clone(), + tokens: ret.tokens.clone(), + ctx: ret.ctx.clone(), + err: ret.err.clone(), + }); } -let outputs = match ret.inferred.clone().as_deref().cloned() { - Some(InferredNode::Resolved { node: rt, .. }) => node_inferred_to_outputs(&rt, ret.ctx.clone().source_indices.clone()), - _ => Rc::new(vec![]), -}; -let cap = make_capability_node(name, Some(name_span), inputs, outputs, &start_span, &ctx.source_indices.clone()); -Rc::new(CapResult { - capability: cap, - tokens: skip_newlines(ret.tokens.clone()), - ctx: ret.ctx.clone(), - err: None, -}) -} + let outputs = match ret.inferred.clone().as_deref().cloned() { + Some(InferredNode::Resolved { node: rt, .. }) => { + node_inferred_to_outputs(&rt, ret.ctx.clone().source_indices.clone()) + } + _ => Rc::new(vec![]), + }; + let cap = make_capability_node( + name, + Some(name_span), + inputs, + outputs, + &start_span, + &ctx.source_indices.clone(), + ); + Rc::new(CapResult { + capability: cap, + tokens: skip_newlines(ret.tokens.clone()), + ctx: ret.ctx.clone(), + err: None, + }) + } } else { { - let cap = make_capability_node(name, Some(name_span), Rc::new(vec![]), Rc::new(vec![]), &start_span, &ctx.source_indices.clone()); -Rc::new(CapResult { - capability: cap, - tokens: skip_newlines(tokens.clone()), - ctx: ctx.clone(), - err: None, -}) -} + let cap = make_capability_node( + name, + Some(name_span), + Rc::new(vec![]), + Rc::new(vec![]), + &start_span, + &ctx.source_indices.clone(), + ); + Rc::new(CapResult { + capability: cap, + tokens: skip_newlines(tokens.clone()), + ctx: ctx.clone(), + err: None, + }) + } } } -} + } } -pub fn parse_input_output_blocks(tokens: Rc>>, ctx: Rc) -> Rc { +pub fn parse_input_output_blocks( + tokens: Rc>>, + ctx: Rc, +) -> Rc { parse_io_blocks_acc(tokens, ctx, Rc::new(vec![]), Rc::new(vec![])) } -pub fn parse_io_blocks_acc(mut tokens: Rc>>, mut ctx: Rc, mut inputs: Rc>>, mut outputs: Rc>>) -> Rc { +pub fn parse_io_blocks_acc( + mut tokens: Rc>>, + mut ctx: Rc, + mut inputs: Rc>>, + mut outputs: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { + if (tok_is_rbrace(tokens.clone().first().cloned()) + || tok_is_eof(tokens.clone().first().cloned())) + { break Rc::new(IOResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); -} else { + inputs: inputs.clone(), + outputs: outputs.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } else { let kw = tok_keyword_text(tokens.clone().first().cloned()); -if (kw.clone().as_str() == "input".to_string().as_str()) { - let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); -if has_err(r.err.clone()) { + if (kw.clone().as_str() == "input".to_string().as_str()) { + let r = expect( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + &Rc::new(ExpectedToken::ExpectLBrace), + ); + if has_err(r.err.clone()) { return Rc::new(IOResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + inputs: inputs.clone(), + outputs: outputs.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -let r2 = parse_field_list(skip_newlines(r.tokens.clone()), ctx.clone()); -if has_err(r2.err.clone()) { + let r2 = parse_field_list(skip_newlines(r.tokens.clone()), ctx.clone()); + if has_err(r2.err.clone()) { return Rc::new(IOResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r3.err.clone()) { + inputs: inputs.clone(), + outputs: outputs.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = expect( + &skip_newlines(r2.tokens.clone()), + &Rc::new(ExpectedToken::ExpectRBrace), + ); + if has_err(r3.err.clone()) { return Rc::new(IOResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), -}) - } -{ + inputs: inputs.clone(), + outputs: outputs.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), + }); + } + { let __tco_0 = r3.tokens.clone(); -let __tco_1 = r2.ctx.clone(); -let __tco_2 = r2.fields.clone(); -tokens = __tco_0; -ctx = __tco_1; -inputs = __tco_2; -continue; -} -} else { + let __tco_1 = r2.ctx.clone(); + let __tco_2 = r2.fields.clone(); + tokens = __tco_0; + ctx = __tco_1; + inputs = __tco_2; + continue; + } + } else { if (kw.clone().as_str() == "output".to_string().as_str()) { - let r = expect(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &Rc::new(ExpectedToken::ExpectLBrace)); -if has_err(r.err.clone()) { + let r = expect( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + &Rc::new(ExpectedToken::ExpectLBrace), + ); + if has_err(r.err.clone()) { return Rc::new(IOResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + inputs: inputs.clone(), + outputs: outputs.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -let r2 = parse_field_list(skip_newlines(r.tokens.clone()), ctx.clone()); -if has_err(r2.err.clone()) { + let r2 = parse_field_list(skip_newlines(r.tokens.clone()), ctx.clone()); + if has_err(r2.err.clone()) { return Rc::new(IOResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), -}) + inputs: inputs.clone(), + outputs: outputs.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), + }); } -let r3 = expect(&skip_newlines(r2.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r3.err.clone()) { + let r3 = expect( + &skip_newlines(r2.tokens.clone()), + &Rc::new(ExpectedToken::ExpectRBrace), + ); + if has_err(r3.err.clone()) { return Rc::new(IOResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - tokens: r3.tokens.clone(), - ctx: r2.ctx.clone(), - err: r3.err.clone(), -}) + inputs: inputs.clone(), + outputs: outputs.clone(), + tokens: r3.tokens.clone(), + ctx: r2.ctx.clone(), + err: r3.err.clone(), + }); } -{ + { let __tco_0 = r3.tokens.clone(); -let __tco_1 = r2.ctx.clone(); -let __tco_2 = r2.fields.clone(); -tokens = __tco_0; -ctx = __tco_1; -outputs = __tco_2; -continue; -} -} else { + let __tco_1 = r2.ctx.clone(); + let __tco_2 = r2.fields.clone(); + tokens = __tco_0; + ctx = __tco_1; + outputs = __tco_2; + continue; + } + } else { break Rc::new(IOResult { - inputs: inputs.clone(), - outputs: outputs.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); -} -} -} -} + inputs: inputs.clone(), + outputs: outputs.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } + } + } + } } pub fn parse_data_def(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); -let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { - text: "data".to_string(), -})); -if has_err(r.err.clone()) { + let dummy = Rc::new(Node { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let r = expect( + &tokens, + &Rc::new(ExpectedToken::ExpectKeyword { + text: "data".to_string(), + }), + ); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + item: dummy, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -parse_data_after_kw(r.tokens.clone(), &ctx, &start_span) -} + parse_data_after_kw(r.tokens.clone(), &ctx, &start_span) + } } -pub fn parse_data_after_kw(tokens: Rc>>, ctx: &Rc, start_span: &Rc) -> Rc { +pub fn parse_data_after_kw( + tokens: Rc>>, + ctx: &Rc, + start_span: &Rc, +) -> Rc { { let dummy = Rc::new(Node { - name: "".to_string(), - span: start_span.clone(), - ident_span: None, - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let r = expect_ident(&tokens); -if has_err(r.err.clone()) { + name: "".to_string(), + span: start_span.clone(), + ident_span: None, + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let r = expect_ident(&tokens); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: dummy, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let name = r.name.clone(); -let name_span = r.span.clone(); -let named_dummy = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); -if has_err(r.err.clone()) { + item: dummy, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let name = r.name.clone(); + let name_span = r.span.clone(); + let named_dummy = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r = parse_type_expr(&r.tokens.clone(), &ctx); -if has_err(r.err.clone()) { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r = parse_type_expr(&r.tokens.clone(), &ctx); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let te = r.type_expr.clone(); -let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectEq)); -if has_err(r.err.clone()) { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let te = r.type_expr.clone(); + let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectEq)); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r = parse_expr(r.tokens.clone(), ctx.clone()); -if has_err(r.err.clone()) { + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r = parse_expr(r.tokens.clone(), ctx.clone()); + if has_err(r.err.clone()) { return Rc::new(ItemResult { - item: named_dummy.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let item = Rc::new(Node { - name: name.clone(), - span: start_span.clone(), - ident_span: Some(name_span.clone()), - children: Rc::new(vec![]), - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: Some(r.expr.clone()), - connective: Connective::NoConnective, - transport: None, - properties: Rc::new(vec![]), - type_annotation: Some(te), - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -Rc::new(ItemResult { - item: item, - tokens: skip_newlines(r.tokens.clone()), - ctx: r.ctx.clone(), - err: None, -}) -} + item: named_dummy.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let item = Rc::new(Node { + name: name.clone(), + span: start_span.clone(), + ident_span: Some(name_span.clone()), + children: Rc::new(vec![]), + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: Some(r.expr.clone()), + connective: Connective::NoConnective, + transport: None, + properties: Rc::new(vec![]), + type_annotation: Some(te), + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + Rc::new(ItemResult { + item: item, + tokens: skip_newlines(r.tokens.clone()), + ctx: r.ctx.clone(), + err: None, + }) + } } pub fn parse_params(tokens: &Rc>>, ctx: &Rc) -> Rc { { let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLParen)); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ParamsResult { - params: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + params: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -let tokens = skip_newlines(r.tokens.clone()); -if tok_is_rparen(tokens.clone().first().cloned()) { + let tokens = skip_newlines(r.tokens.clone()); + if tok_is_rparen(tokens.clone().first().cloned()) { Rc::new(ParamsResult { - params: Rc::new(vec![]), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - ctx: ctx.clone(), - err: None, -}) + params: Rc::new(vec![]), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx: ctx.clone(), + err: None, + }) } else { { let r = parse_param_list(tokens.clone(), ctx.clone()); -if has_err(r.err.clone()) { - return r.clone() + if has_err(r.err.clone()) { + return r.clone(); } -let tokens = skip_newlines(r.tokens.clone()); -let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRParen)); -if has_err(r2.err.clone()) { + let tokens = skip_newlines(r.tokens.clone()); + let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRParen)); + if has_err(r2.err.clone()) { return Rc::new(ParamsResult { - params: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), -}) + params: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), + }); } -Rc::new(ParamsResult { - params: r.params.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + Rc::new(ParamsResult { + params: r.params.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } -} + } } pub fn parse_param_list(tokens: Rc>>, ctx: Rc) -> Rc { parse_param_list_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_param_list_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_param_list_acc( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { let r = parse_param(&tokens, &ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ParamsResult { - params: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -acc = v2_rt::rc_list_push(acc.clone(), r.param.clone()); -match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { tokens = skip_newlines(__ec.clone()); -if tok_is_rparen(tokens.clone().first().cloned()) { - break Rc::new(ParamsResult { - params: acc.clone(), - tokens: tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}); -} else { - { - let __tco_0 = r.ctx.clone(); -ctx = __tco_0; -continue; -} -} }, - EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(ParamsResult { - params: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}); }, -} -} + params: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + acc = v2_rt::rc_list_push(acc.clone(), r.param.clone()); + match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + tokens = skip_newlines(__ec.clone()); + if tok_is_rparen(tokens.clone().first().cloned()) { + break Rc::new(ParamsResult { + params: acc.clone(), + tokens: tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }); + } else { + { + let __tco_0 = r.ctx.clone(); + ctx = __tco_0; + continue; + } + } + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + break Rc::new(ParamsResult { + params: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }); + } + } + } } pub fn parse_param(tokens: &Rc>>, ctx: &Rc) -> Rc { { let start_span = token_span(tokens.clone().first().cloned()); -let dummy_param = make_param_node(&"".to_string(), leaf_type_node(&"".to_string(), &start_span), None, start_span.clone(), start_span.clone()); -let r = expect_name(&tokens); -if has_err(r.err.clone()) { + let dummy_param = make_param_node( + &"".to_string(), + leaf_type_node(&"".to_string(), &start_span), + None, + start_span.clone(), + start_span.clone(), + ); + let r = expect_name(&tokens); + if has_err(r.err.clone()) { return Rc::new(ParamResult { - param: dummy_param.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let name = r.name.clone(); -let name_span = r.span.clone(); -let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); -if has_err(r2.err.clone()) { + param: dummy_param.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let name = r.name.clone(); + let name_span = r.span.clone(); + let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectColon)); + if has_err(r2.err.clone()) { return Rc::new(ParamResult { - param: dummy_param.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = parse_type_expr(&r2.tokens.clone(), &ctx); -if has_err(r3.err.clone()) { + param: dummy_param.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = parse_type_expr(&r2.tokens.clone(), &ctx); + if has_err(r3.err.clone()) { return Rc::new(ParamResult { - param: dummy_param.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: r3.err.clone(), -}) - } -let wr = try_where_clause(&r3.tokens.clone(), r3.ctx.clone(), &r3.type_expr.clone(), &start_span); -if has_err(wr.err.clone()) { + param: dummy_param.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: r3.err.clone(), + }); + } + let wr = try_where_clause( + &r3.tokens.clone(), + r3.ctx.clone(), + &r3.type_expr.clone(), + &start_span, + ); + if has_err(wr.err.clone()) { return Rc::new(ParamResult { - param: dummy_param.clone(), - tokens: wr.tokens.clone(), - ctx: wr.ctx.clone(), - err: wr.err.clone(), -}) - } -let type_expr = wr.type_expr.clone(); -let tokens = wr.tokens.clone(); -let ctx = wr.ctx.clone(); -match (*eat(&tokens, Rc::new(ExpectedToken::ExpectEq))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r4 = parse_expr(__ec.clone(), ctx.clone()); -if has_err(r4.err.clone()) { - return Rc::new(ParamResult { - param: dummy_param.clone(), - tokens: r4.tokens.clone(), - ctx: r4.ctx.clone(), - err: r4.err.clone(), -}) - } -let p = make_param_node(&name, type_expr, Some(r4.expr.clone()), start_span.clone(), name_span); -Rc::new(ParamResult { - param: p, - tokens: r4.tokens.clone(), - ctx: r4.ctx.clone(), - err: None, -}) -}, - EatResult::EatUnchanged { tokens: __eu, .. } => { - let p = make_param_node(&name, type_expr, None, start_span.clone(), name_span); -Rc::new(ParamResult { - param: p, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) -}, -} -} + param: dummy_param.clone(), + tokens: wr.tokens.clone(), + ctx: wr.ctx.clone(), + err: wr.err.clone(), + }); + } + let type_expr = wr.type_expr.clone(); + let tokens = wr.tokens.clone(); + let ctx = wr.ctx.clone(); + match (*eat(&tokens, Rc::new(ExpectedToken::ExpectEq))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let r4 = parse_expr(__ec.clone(), ctx.clone()); + if has_err(r4.err.clone()) { + return Rc::new(ParamResult { + param: dummy_param.clone(), + tokens: r4.tokens.clone(), + ctx: r4.ctx.clone(), + err: r4.err.clone(), + }); + } + let p = make_param_node( + &name, + type_expr, + Some(r4.expr.clone()), + start_span.clone(), + name_span, + ); + Rc::new(ParamResult { + param: p, + tokens: r4.tokens.clone(), + ctx: r4.ctx.clone(), + err: None, + }) + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + let p = make_param_node(&name, type_expr, None, start_span.clone(), name_span); + Rc::new(ParamResult { + param: p, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } + } + } } pub fn parse_block(tokens: &Rc>>, ctx: &Rc) -> Rc { { let dummy_expr = parse_recovery_placeholder(); -let block_span = token_span(tokens.clone().first().cloned()); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBrace)); -if has_err(r.err.clone()) { + let block_span = token_span(tokens.clone().first().cloned()); + let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBrace)); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let tokens = skip_newlines(r.tokens.clone()); -let r = parse_stmts(tokens.clone(), ctx.clone()); -if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let tokens = skip_newlines(r.tokens.clone()); + let r = parse_stmts(tokens.clone(), ctx.clone()); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let stmts = r.stmts.clone(); -let tokens = skip_newlines(r.tokens.clone()); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let stmts = r.stmts.clone(); + let tokens = skip_newlines(r.tokens.clone()); + let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -if ((stmts.clone().len() as i64) == 1) { + if ((stmts.clone().len() as i64) == 1) { Rc::new(ExprResult { - expr: stmts.clone().first().cloned().clone().unwrap(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: None, -}) + expr: stmts.clone().first().cloned().clone().unwrap(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: None, + }) } else { Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprBlock), stmts.clone(), None, block_span), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: None, -}) + expr: make_expr_node( + Rc::new(ExprData::ExprBlock), + stmts.clone(), + None, + block_span, + ), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: None, + }) } -} + } } pub fn parse_stmts(tokens: Rc>>, ctx: Rc) -> Rc { parse_stmts_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_stmts_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_stmts_acc( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { + if (tok_is_rbrace(tokens.clone().first().cloned()) + || tok_is_eof(tokens.clone().first().cloned())) + { break Rc::new(StmtsResult { - stmts: acc.clone(), - tokens: tokens.clone(), - ctx: ctx, - err: None, -}); -} else { + stmts: acc.clone(), + tokens: tokens.clone(), + ctx: ctx, + err: None, + }); + } else { let r = parse_stmt(&tokens, ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(StmtsResult { - stmts: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + stmts: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -{ + { let __tco_0 = r.tokens.clone(); -let __tco_1 = r.ctx.clone(); -let __tco_2 = v2_rt::rc_list_push(acc, r.expr.clone()); -tokens = __tco_0; -ctx = __tco_1; -acc = __tco_2; -continue; -} -} -} + let __tco_1 = r.ctx.clone(); + let __tco_2 = v2_rt::rc_list_push(acc, r.expr.clone()); + tokens = __tco_0; + ctx = __tco_1; + acc = __tco_2; + continue; + } + } + } } pub fn parse_stmt(tokens: &Rc>>, ctx: Rc) -> Rc { { let tok = tokens.clone().first().cloned(); -let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, -}; -match sh { - Some(TokenShape::ShKeyword) => { - let kw_text = tok_keyword_text(tok.clone()); -if (kw_text.clone().as_str() == "let".to_string().as_str()) { - parse_let(&tokens, &ctx) - } else { - if (kw_text.clone().as_str() == "return".to_string().as_str()) { - parse_return(&tokens, &ctx) + let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, + }; + match sh { + Some(TokenShape::ShKeyword) => { + let kw_text = tok_keyword_text(tok.clone()); + if (kw_text.clone().as_str() == "let".to_string().as_str()) { + parse_let(&tokens, &ctx) } else { - if peek_is_eq_after_ident(tokens.clone()) { - parse_bare_assignment(&tokens, &ctx) + if (kw_text.clone().as_str() == "return".to_string().as_str()) { + parse_return(&tokens, &ctx) } else { - parse_expr(tokens.clone(), ctx) + if peek_is_eq_after_ident(tokens.clone()) { + parse_bare_assignment(&tokens, &ctx) + } else { + parse_expr(tokens.clone(), ctx) + } } } } -}, - Some(TokenShape::ShIdent) => if (peek_text_is(tokens.clone(), "node".to_string()) && peek_is_node_decl(&tokens)) { - parse_node_decl(&tokens, &ctx) - } else { - if peek_is_eq_after_ident(tokens.clone()) { - parse_bare_assignment(&tokens, &ctx) - } else { - if is_constraint_bracket_after_ident(&tokens) { - parse_constrained_assignment(&tokens, &ctx) + Some(TokenShape::ShIdent) => { + if (peek_text_is(tokens.clone(), "node".to_string()) && peek_is_node_decl(&tokens)) + { + parse_node_decl(&tokens, &ctx) } else { - parse_expr(tokens.clone(), ctx) + if peek_is_eq_after_ident(tokens.clone()) { + parse_bare_assignment(&tokens, &ctx) + } else { + if is_constraint_bracket_after_ident(&tokens) { + parse_constrained_assignment(&tokens, &ctx) + } else { + parse_expr(tokens.clone(), ctx) + } + } } } - }, - _ => parse_expr(tokens.clone(), ctx), -} -} + _ => parse_expr(tokens.clone(), ctx), + } + } } pub fn peek_is_eq_after_ident(tokens: Rc>>) -> bool { match tokens.get(1 as usize).cloned() { - Some(t) => is_eq_shape(t.shape.clone()), - None => false, -} + Some(t) => is_eq_shape(t.shape.clone()), + None => false, + } } pub fn peek_is_node_decl(tokens: &Rc>>) -> bool { { let t1 = tokens.clone().get(1 as usize).cloned(); -let t2 = tokens.clone().get(2 as usize).cloned(); -let name_ok = match t1 { - Some(t) => (is_ident_shape(t.shape.clone()) || is_name_keyword(&t)), - None => false, -}; -let decl_ok = match t2 { - Some(t) => ((is_colon_shape(t.shape.clone()) || is_lbracket_shape(t.shape.clone())) || is_eq_shape(t.shape.clone())), - None => false, -}; -(name_ok && decl_ok) -} + let t2 = tokens.clone().get(2 as usize).cloned(); + let name_ok = match t1 { + Some(t) => (is_ident_shape(t.shape.clone()) || is_name_keyword(&t)), + None => false, + }; + let decl_ok = match t2 { + Some(t) => { + ((is_colon_shape(t.shape.clone()) || is_lbracket_shape(t.shape.clone())) + || is_eq_shape(t.shape.clone())) + } + None => false, + }; + (name_ok && decl_ok) + } } pub fn is_constraint_bracket_after_ident(tokens: &Rc>>) -> bool { match tokens.clone().get(1 as usize).cloned() { - Some(t) => (is_lbracket_shape(t.shape.clone()) && is_constraint_bracket(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()))), - None => false, -} + Some(t) => { + (is_lbracket_shape(t.shape.clone()) + && is_constraint_bracket(Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ))) + } + None => false, + } } -pub fn parse_constrained_assignment(tokens: &Rc>>, ctx: &Rc) -> Rc { +pub fn parse_constrained_assignment( + tokens: &Rc>>, + ctx: &Rc, +) -> Rc { { let span = token_span(tokens.clone().first().cloned()); -let dummy_expr = parse_recovery_placeholder(); -let r = expect_name(&tokens); -if has_err(r.err.clone()) { + let dummy_expr = parse_recovery_placeholder(); + let r = expect_name(&tokens); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let name = r.name.clone(); -let name_span = r.span.clone(); -let cr = try_constraint_annotations(&r.tokens.clone(), ctx.clone()); -if has_err(cr.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let name = r.name.clone(); + let name_span = r.span.clone(); + let cr = try_constraint_annotations(&r.tokens.clone(), ctx.clone()); + if has_err(cr.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: cr.tokens.clone(), - ctx: cr.ctx.clone(), - err: cr.err.clone(), -}) - } -let r2 = expect(&cr.tokens.clone(), &Rc::new(ExpectedToken::ExpectEq)); -if has_err(r2.err.clone()) { + expr: dummy_expr.clone(), + tokens: cr.tokens.clone(), + ctx: cr.ctx.clone(), + err: cr.err.clone(), + }); + } + let r2 = expect(&cr.tokens.clone(), &Rc::new(ExpectedToken::ExpectEq)); + if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: cr.ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = parse_expr(r2.tokens.clone(), cr.ctx.clone()); -if has_err(r3.err.clone()) { - return r3.clone() - } -let node = make_named_expr_node(&name, Rc::new(ExprData::ExprLet), Rc::new(vec![r3.expr.clone()]), None, span, name_span); -let node = Rc::new(Node { - name: node.name.clone(), - span: node.span.clone(), - ident_span: node.ident_span.clone(), - children: node.children.clone(), - params: node.params.clone(), - inferred: node.inferred.clone(), - return_cardinality: node.return_cardinality.clone(), - uses: node.uses.clone(), - body: node.body.clone(), - connective: node.connective.clone(), - transport: node.transport.clone(), - properties: cr.constraints.clone(), - type_annotation: node.type_annotation.clone(), - is_self_recursive: node.is_self_recursive.clone(), - has_non_tail_self_call: node.has_non_tail_self_call.clone(), - match_pattern: node.match_pattern.clone(), - expr_data: node.expr_data.clone(), - ident: None, -}); -Rc::new(ExprResult { - expr: node.clone(), - tokens: r3.tokens.clone(), - ctx: r3.ctx.clone(), - err: None, -}) -} + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: cr.ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = parse_expr(r2.tokens.clone(), cr.ctx.clone()); + if has_err(r3.err.clone()) { + return r3.clone(); + } + let node = make_named_expr_node( + &name, + Rc::new(ExprData::ExprLet), + Rc::new(vec![r3.expr.clone()]), + None, + span, + name_span, + ); + let node = Rc::new(Node { + name: node.name.clone(), + span: node.span.clone(), + ident_span: node.ident_span.clone(), + children: node.children.clone(), + params: node.params.clone(), + inferred: node.inferred.clone(), + return_cardinality: node.return_cardinality.clone(), + uses: node.uses.clone(), + body: node.body.clone(), + connective: node.connective.clone(), + transport: node.transport.clone(), + properties: cr.constraints.clone(), + type_annotation: node.type_annotation.clone(), + is_self_recursive: node.is_self_recursive.clone(), + has_non_tail_self_call: node.has_non_tail_self_call.clone(), + match_pattern: node.match_pattern.clone(), + expr_data: node.expr_data.clone(), + ident: None, + }); + Rc::new(ExprResult { + expr: node.clone(), + tokens: r3.tokens.clone(), + ctx: r3.ctx.clone(), + err: None, + }) + } } pub fn peek_text_is(tokens: Rc>>, expected: String) -> bool { match tokens.first().cloned() { - Some(t) => (is_ident_shape(t.shape.clone()) && (t.text.clone().as_str() == expected.as_str())), - None => false, -} + Some(t) => { + (is_ident_shape(t.shape.clone()) && (t.text.clone().as_str() == expected.as_str())) + } + None => false, + } } pub fn parse_node_decl(tokens: &Rc>>, ctx: &Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); -let dummy_expr = parse_recovery_placeholder(); -let tokens = Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()); -let r = expect_name(&tokens); -if has_err(r.err.clone()) { + let dummy_expr = parse_recovery_placeholder(); + let tokens = Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + let r = expect_name(&tokens); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let name = r.name.clone(); -let name_span = r.span.clone(); -let cr = try_constraint_annotations(&r.tokens.clone(), ctx.clone()); -if has_err(cr.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let name = r.name.clone(); + let name_span = r.span.clone(); + let cr = try_constraint_annotations(&r.tokens.clone(), ctx.clone()); + if has_err(cr.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: cr.tokens.clone(), - ctx: cr.ctx.clone(), - err: cr.err.clone(), -}) - } -let e_colon = eat(&cr.tokens.clone(), Rc::new(ExpectedToken::ExpectColon)); -let tokens = match (*e_colon.clone()).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => { - let r2 = expect(&cr.tokens.clone(), &Rc::new(ExpectedToken::ExpectEq)); -if has_err(r2.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: cr.ctx.clone(), - err: r2.err.clone(), -}) - } -r2.tokens.clone() -}, -}; -let r3 = parse_expr(tokens.clone(), cr.ctx.clone()); -if has_err(r3.err.clone()) { - return r3.clone() + expr: dummy_expr.clone(), + tokens: cr.tokens.clone(), + ctx: cr.ctx.clone(), + err: cr.err.clone(), + }); + } + let e_colon = eat(&cr.tokens.clone(), Rc::new(ExpectedToken::ExpectColon)); + let tokens = match (*e_colon.clone()).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => { + let r2 = expect(&cr.tokens.clone(), &Rc::new(ExpectedToken::ExpectEq)); + if has_err(r2.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: cr.ctx.clone(), + err: r2.err.clone(), + }); + } + r2.tokens.clone() + } + }; + let r3 = parse_expr(tokens.clone(), cr.ctx.clone()); + if has_err(r3.err.clone()) { + return r3.clone(); } -let ret = parse_optional_inferred(&r3.tokens.clone(), r3.ctx.clone()); -if has_err(ret.err.clone()) { + let ret = parse_optional_inferred(&r3.tokens.clone(), r3.ctx.clone()); + if has_err(ret.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: ret.tokens.clone(), - ctx: ret.ctx.clone(), - err: ret.err.clone(), -}) - } -let type_ann = match (*e_colon.clone()).clone() { - EatResult::EatConsumed { .. } => Some(r3.expr.clone()), - EatResult::EatUnchanged { .. } => None, -}; -let node = Rc::new(Node { - name: name, - span: span, - ident_span: Some(name_span), - children: Rc::new(vec![r3.expr.clone()]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: ret.inferred.clone(), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: cr.constraints.clone(), - type_annotation: type_ann, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::ExprLet), - ident: None, -}); -Rc::new(ExprResult { - expr: node, - tokens: ret.tokens.clone(), - ctx: ret.ctx.clone(), - err: None, -}) -} + expr: dummy_expr.clone(), + tokens: ret.tokens.clone(), + ctx: ret.ctx.clone(), + err: ret.err.clone(), + }); + } + let type_ann = match (*e_colon.clone()).clone() { + EatResult::EatConsumed { .. } => Some(r3.expr.clone()), + EatResult::EatUnchanged { .. } => None, + }; + let node = Rc::new(Node { + name: name, + span: span, + ident_span: Some(name_span), + children: Rc::new(vec![r3.expr.clone()]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: ret.inferred.clone(), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: cr.constraints.clone(), + type_annotation: type_ann, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::ExprLet), + ident: None, + }); + Rc::new(ExprResult { + expr: node, + tokens: ret.tokens.clone(), + ctx: ret.ctx.clone(), + err: None, + }) + } } -pub fn parse_bare_assignment(tokens: &Rc>>, ctx: &Rc) -> Rc { +pub fn parse_bare_assignment( + tokens: &Rc>>, + ctx: &Rc, +) -> Rc { { let span = token_span(tokens.clone().first().cloned()); -let dummy_expr = parse_recovery_placeholder(); -let r = expect_name(&tokens); -if has_err(r.err.clone()) { + let dummy_expr = parse_recovery_placeholder(); + let r = expect_name(&tokens); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let name = r.name.clone(); -let name_span = r.span.clone(); -let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectEq)); -if has_err(r2.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let name = r.name.clone(); + let name_span = r.span.clone(); + let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectEq)); + if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) - } -let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); -if has_err(r3.err.clone()) { - return r3.clone() - } -let cr = try_constraint_annotations(&r3.tokens.clone(), r3.ctx.clone()); -if has_err(cr.err.clone()) { + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); + } + let r3 = parse_expr(r2.tokens.clone(), ctx.clone()); + if has_err(r3.err.clone()) { + return r3.clone(); + } + let cr = try_constraint_annotations(&r3.tokens.clone(), r3.ctx.clone()); + if has_err(cr.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: cr.tokens.clone(), - ctx: cr.ctx.clone(), - err: cr.err.clone(), -}) - } -let node = make_named_expr_node(&name, Rc::new(ExprData::ExprLet), Rc::new(vec![r3.expr.clone()]), None, span, name_span); -if ((cr.constraints.clone().len() as i64) > 0) { + expr: dummy_expr.clone(), + tokens: cr.tokens.clone(), + ctx: cr.ctx.clone(), + err: cr.err.clone(), + }); + } + let node = make_named_expr_node( + &name, + Rc::new(ExprData::ExprLet), + Rc::new(vec![r3.expr.clone()]), + None, + span, + name_span, + ); + if ((cr.constraints.clone().len() as i64) > 0) { { let node = Rc::new(Node { - name: node.name.clone(), - span: node.span.clone(), - ident_span: node.ident_span.clone(), - children: node.children.clone(), - params: node.params.clone(), - inferred: node.inferred.clone(), - return_cardinality: node.return_cardinality.clone(), - uses: node.uses.clone(), - body: node.body.clone(), - connective: node.connective.clone(), - transport: node.transport.clone(), - properties: cr.constraints.clone(), - type_annotation: node.type_annotation.clone(), - is_self_recursive: node.is_self_recursive.clone(), - has_non_tail_self_call: node.has_non_tail_self_call.clone(), - match_pattern: node.match_pattern.clone(), - expr_data: node.expr_data.clone(), - ident: None, -}); -Rc::new(ExprResult { - expr: node.clone(), - tokens: cr.tokens.clone(), - ctx: cr.ctx.clone(), - err: None, -}) -} + name: node.name.clone(), + span: node.span.clone(), + ident_span: node.ident_span.clone(), + children: node.children.clone(), + params: node.params.clone(), + inferred: node.inferred.clone(), + return_cardinality: node.return_cardinality.clone(), + uses: node.uses.clone(), + body: node.body.clone(), + connective: node.connective.clone(), + transport: node.transport.clone(), + properties: cr.constraints.clone(), + type_annotation: node.type_annotation.clone(), + is_self_recursive: node.is_self_recursive.clone(), + has_non_tail_self_call: node.has_non_tail_self_call.clone(), + match_pattern: node.match_pattern.clone(), + expr_data: node.expr_data.clone(), + ident: None, + }); + Rc::new(ExprResult { + expr: node.clone(), + tokens: cr.tokens.clone(), + ctx: cr.ctx.clone(), + err: None, + }) + } } else { Rc::new(ExprResult { - expr: node.clone(), - tokens: cr.tokens.clone(), - ctx: cr.ctx.clone(), - err: None, -}) + expr: node.clone(), + tokens: cr.tokens.clone(), + ctx: cr.ctx.clone(), + err: None, + }) } -} + } } pub fn parse_expr(tokens: Rc>>, ctx: Rc) -> Rc { parse_expr_bp(tokens, ctx, 0) } -pub fn parse_expr_bp(tokens: Rc>>, ctx: Rc, min_bp: i64) -> Rc { +pub fn parse_expr_bp( + tokens: Rc>>, + ctx: Rc, + min_bp: i64, +) -> Rc { { let r = parse_prefix(&tokens, ctx); -if has_err(r.err.clone()) { - return r.clone() + if has_err(r.err.clone()) { + return r.clone(); } -let lhs = r.expr.clone(); -parse_expr_loop(r.tokens.clone(), r.ctx.clone(), lhs, min_bp) -} + let lhs = r.expr.clone(); + parse_expr_loop(r.tokens.clone(), r.ctx.clone(), lhs, min_bp) + } } -pub fn parse_expr_loop(mut tokens: Rc>>, mut ctx: Rc, mut lhs: Rc, mut min_bp: i64) -> Rc { +pub fn parse_expr_loop( + mut tokens: Rc>>, + mut ctx: Rc, + mut lhs: Rc, + mut min_bp: i64, +) -> Rc { loop { if tok_is_eof(tokens.clone().first().cloned()) { break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); -} else { + expr: lhs.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } else { let loop_span = token_span(tokens.clone().first().cloned()); -tokens = skip_continuation_newlines(&tokens); -let post = try_postfix(&tokens, &ctx, &lhs, min_bp.clone()); -if has_err(post.err.clone()) { + tokens = skip_continuation_newlines(&tokens); + let post = try_postfix(&tokens, &ctx, &lhs, min_bp.clone()); + if has_err(post.err.clone()) { break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: post.tokens.clone(), - ctx: post.ctx.clone(), - err: post.err.clone(), -}); -} else { + expr: lhs.clone(), + tokens: post.tokens.clone(), + ctx: post.ctx.clone(), + err: post.err.clone(), + }); + } else { if post.changed.clone() { { let __tco_0 = post.tokens.clone(); -let __tco_1 = post.ctx.clone(); -let __tco_2 = post.expr.clone(); -tokens = __tco_0; -ctx = __tco_1; -lhs = __tco_2; -continue; -} -} else { + let __tco_1 = post.ctx.clone(); + let __tco_2 = post.expr.clone(); + tokens = __tco_0; + ctx = __tco_1; + lhs = __tco_2; + continue; + } + } else { let bp = infix_bp(tokens.clone()); -match bp { - Some(bps) => { if (bps.left.clone() < min_bp.clone()) { - break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); -} else { - match (*advance(&tokens)).clone() { - AdvanceResult::AdvanceOk { token: op_tok, tokens: rest, .. } => { let op_shape = op_tok.shape.clone(); -if is_dot_shape(op_shape.clone()) { - let r = expect_name(&rest); -if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: lhs.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let new_lhs = make_named_expr_node(&r.name.clone(), Rc::new(ExprData::ExprFieldAccess { - summary: None, -}), Rc::new(vec![lhs.clone()]), None, loop_span, r.span.clone()); -{ - let __tco_0 = r.tokens.clone(); -let __tco_1 = new_lhs; -tokens = __tco_0; -lhs = __tco_1; -continue; -} -} else { - if is_pipe_arrow_shape(op_shape.clone()) { - let r = parse_pipe_rhs(&rest, &ctx, lhs.clone(), loop_span); -if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -{ - let __tco_0 = r.tokens.clone(); -let __tco_1 = r.ctx.clone(); -let __tco_2 = r.expr.clone(); -tokens = __tco_0; -ctx = __tco_1; -lhs = __tco_2; -continue; -} -} else { - tokens = skip_newlines(rest.clone()); -let r = parse_expr_bp(tokens.clone(), ctx.clone(), bps.right.clone()); -if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + match bp { + Some(bps) => { + if (bps.left.clone() < min_bp.clone()) { + break Rc::new(ExprResult { + expr: lhs.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } else { + match (*advance(&tokens)).clone() { + AdvanceResult::AdvanceOk { + token: op_tok, + tokens: rest, + .. + } => { + let op_shape = op_tok.shape.clone(); + if is_dot_shape(op_shape.clone()) { + let r = expect_name(&rest); + if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: lhs.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let new_lhs = make_named_expr_node( + &r.name.clone(), + Rc::new(ExprData::ExprFieldAccess { + summary: None, + }), + Rc::new(vec![lhs.clone()]), + None, + loop_span, + r.span.clone(), + ); + { + let __tco_0 = r.tokens.clone(); + let __tco_1 = new_lhs; + tokens = __tco_0; + lhs = __tco_1; + continue; + } + } else { + if is_pipe_arrow_shape(op_shape.clone()) { + let r = parse_pipe_rhs( + &rest, + &ctx, + lhs.clone(), + loop_span, + ); + if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + { + let __tco_0 = r.tokens.clone(); + let __tco_1 = r.ctx.clone(); + let __tco_2 = r.expr.clone(); + tokens = __tco_0; + ctx = __tco_1; + lhs = __tco_2; + continue; + } + } else { + tokens = skip_newlines(rest.clone()); + let r = parse_expr_bp( + tokens.clone(), + ctx.clone(), + bps.right.clone(), + ); + if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let binop_opt = find_operator_binop( + dag_syntax_spec().operators.clone(), + op_tok.text.clone(), + ); + match binop_opt { + Some(binop) => { + let new_lhs = make_expr_node( + Rc::new(ExprData::ExprBinOp { + op: binop.clone(), + algebra_field: None, + }), + Rc::new(vec![ + lhs.clone(), + r.expr.clone(), + ]), + None, + loop_span, + ); + { + let __tco_0 = r.tokens.clone(); + let __tco_1 = r.ctx.clone(); + let __tco_2 = new_lhs; + tokens = __tco_0; + ctx = __tco_1; + lhs = __tco_2; + continue; + } + } + None => { + break Rc::new(ExprResult { + expr: lhs.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: Some(parse_error( + v2_rt::concat( + "unknown binary operator: " + .to_string(), + op_tok.text.clone(), + ), + loop_span, + )), + }); + } + } + } + } + } + AdvanceResult::AdvanceEof => { + break Rc::new(ExprResult { + expr: lhs.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } } -let binop_opt = find_operator_binop(dag_syntax_spec().operators.clone(), op_tok.text.clone()); -match binop_opt { - Some(binop) => { let new_lhs = make_expr_node(Rc::new(ExprData::ExprBinOp { - op: binop.clone(), - algebra_field: None, -}), Rc::new(vec![lhs.clone(), r.expr.clone()]), None, loop_span); -{ - let __tco_0 = r.tokens.clone(); -let __tco_1 = r.ctx.clone(); -let __tco_2 = new_lhs; -tokens = __tco_0; -ctx = __tco_1; -lhs = __tco_2; -continue; -} }, - None => { break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: Some(parse_error(v2_rt::concat("unknown binary operator: ".to_string(), op_tok.text.clone()), loop_span)), -}); }, -} -} -} }, - AdvanceResult::AdvanceEof => { break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); }, -} -} }, - None => { break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); }, -} -} -} -} -} + } + } + None => { + break Rc::new(ExprResult { + expr: lhs.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } + } + } + } + } + } } pub fn find_operator_bp(ops: Rc>>, symbol: String) -> Option { { - let matching = Rc::new({ let mut __result = Vec::new(); for op in ops.iter().cloned() { if (op.symbol.clone().as_str() == symbol.clone().as_str()) { __result.push(op); } } __result }); -if ((matching.clone().len() as i64) > 0) { + let matching = Rc::new({ + let mut __result = Vec::new(); + for op in ops.iter().cloned() { + if (op.symbol.clone().as_str() == symbol.clone().as_str()) { + __result.push(op); + } + } + __result + }); + if ((matching.clone().len() as i64) > 0) { { let op = matching.clone().first().cloned().clone().unwrap(); -Some(BindingPower { - left: op.left_bp.clone(), - right: op.right_bp.clone(), -}) -} + Some(BindingPower { + left: op.left_bp.clone(), + right: op.right_bp.clone(), + }) + } } else { None } -} + } } pub fn infix_bp(tokens: Rc>>) -> Option { match tokens.first().cloned() { - Some(t) => find_operator_bp(dag_syntax_spec().operators.clone(), t.text.clone()), - None => None, -} + Some(t) => find_operator_bp(dag_syntax_spec().operators.clone(), t.text.clone()), + None => None, + } } pub fn find_operator_binop(ops: Rc>>, symbol: String) -> Option { { - let matching = Rc::new({ let mut __result = Vec::new(); for op in ops.iter().cloned() { if (op.symbol.clone().as_str() == symbol.clone().as_str()) { __result.push(op); } } __result }); -if ((matching.clone().len() as i64) > 0) { - matching.clone().first().cloned().clone().unwrap().binop.clone() + let matching = Rc::new({ + let mut __result = Vec::new(); + for op in ops.iter().cloned() { + if (op.symbol.clone().as_str() == symbol.clone().as_str()) { + __result.push(op); + } + } + __result + }); + if ((matching.clone().len() as i64) > 0) { + matching + .clone() + .first() + .cloned() + .clone() + .unwrap() + .binop + .clone() } else { None } -} + } } -pub fn parse_pipe_rhs(tokens: &Rc>>, ctx: &Rc, receiver: Rc, span: Rc) -> Rc { +pub fn parse_pipe_rhs( + tokens: &Rc>>, + ctx: &Rc, + receiver: Rc, + span: Rc, +) -> Rc { { let dummy_expr = parse_recovery_placeholder(); -let r = expect_name(&tokens); -if has_err(r.err.clone()) { + let r = expect_name(&tokens); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let method = r.name.clone(); -let tokens = skip_newlines(r.tokens.clone()); -if tok_is_lparen(tokens.clone().first().cloned()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let method = r.name.clone(); + let tokens = skip_newlines(r.tokens.clone()); + if tok_is_lparen(tokens.clone().first().cloned()) { { let r2 = parse_call_args(&tokens, &ctx); -if has_err(r2.err.clone()) { + if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), -}) - } -Rc::new(ExprResult { - expr: make_named_expr_node(&method, Rc::new(ExprData::ExprMethodCall { - method_semantics: None, -}), v2_rt::concat(Rc::new(vec![receiver]), Rc::new({ let mut __result = Vec::new(); for na in r2.args.clone().iter().cloned() { __result.push(make_arg_node(arg_name_at(na.clone(), ctx.source_indices.clone()), arg_value(&na), na.span.clone(), node_name_span(&na))); } __result })), None, span, r.span.clone()), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: None, -}) -} + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), + }); + } + Rc::new(ExprResult { + expr: make_named_expr_node( + &method, + Rc::new(ExprData::ExprMethodCall { + method_semantics: None, + }), + v2_rt::concat( + Rc::new(vec![receiver]), + Rc::new({ + let mut __result = Vec::new(); + for na in r2.args.clone().iter().cloned() { + __result.push(make_arg_node( + arg_name_at(na.clone(), ctx.source_indices.clone()), + arg_value(&na), + na.span.clone(), + node_name_span(&na), + )); + } + __result + }), + ), + None, + span, + r.span.clone(), + ), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: None, + }) + } } else { Rc::new(ExprResult { - expr: make_named_expr_node(&method, Rc::new(ExprData::ExprMethodCall { - method_semantics: None, -}), Rc::new(vec![receiver]), None, span, r.span.clone()), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) + expr: make_named_expr_node( + &method, + Rc::new(ExprData::ExprMethodCall { + method_semantics: None, + }), + Rc::new(vec![receiver]), + None, + span, + r.span.clone(), + ), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) } -} + } } pub fn parse_prefix(tokens: &Rc>>, ctx: Rc) -> Rc { { let tok = tokens.clone().first().cloned(); -let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, -}; -let span = token_span(tok.clone()); -match sh { - Some(TokenShape::ShBang) => { - let r = parse_expr_bp(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx, 12); -if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprUnaryOp { - op: UnaryOpKind::Not, -}), Rc::new(vec![r.expr.clone()]), None, span), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -}, - Some(TokenShape::ShMinus) => { - let r = parse_expr_bp(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx, 12); -if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprUnaryOp { - op: UnaryOpKind::Neg, -}), Rc::new(vec![r.expr.clone()]), None, span), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -}, - _ => parse_primary(&tokens, &ctx), -} -} + let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, + }; + let span = token_span(tok.clone()); + match sh { + Some(TokenShape::ShBang) => { + let r = parse_expr_bp( + Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx, + 12, + ); + if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprUnaryOp { + op: UnaryOpKind::Not, + }), + Rc::new(vec![r.expr.clone()]), + None, + span, + ), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } + Some(TokenShape::ShMinus) => { + let r = parse_expr_bp( + Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx, + 12, + ); + if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprUnaryOp { + op: UnaryOpKind::Neg, + }), + Rc::new(vec![r.expr.clone()]), + None, + span, + ), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } + _ => parse_primary(&tokens, &ctx), + } + } } pub fn parse_primary(tokens: &Rc>>, ctx: &Rc) -> Rc { { let tok = tokens.clone().first().cloned(); -let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, -}; -let span = token_span(tok.clone()); -match sh.clone() { - Some(TokenShape::ShKeyword) => { - let kw_text = tok.clone().unwrap().text.clone(); -let lit_val = v2_rt::lookup(&dag_syntax_spec().keyword_literals.clone(), kw_text.clone()); -match lit_val { - Some(lv) => Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprLiteral { - value: lv.clone(), -}), Rc::new(vec![]), None, span.clone()), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - ctx: ctx.clone(), - err: None, -}), - None => if (kw_text.clone().as_str() == "match".to_string().as_str()) { - parse_match(&tokens, &ctx) - } else { - if (kw_text.clone().as_str() == "if".to_string().as_str()) { - parse_if(&tokens, &ctx) - } else { - if (kw_text.clone().as_str() == "for".to_string().as_str()) { - parse_for(&tokens, &ctx) - } else { - if (kw_text.clone().as_str() == "let".to_string().as_str()) { - parse_let(&tokens, &ctx) + let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, + }; + let span = token_span(tok.clone()); + match sh.clone() { + Some(TokenShape::ShKeyword) => { + let kw_text = tok.clone().unwrap().text.clone(); + let lit_val = + v2_rt::lookup(&dag_syntax_spec().keyword_literals.clone(), kw_text.clone()); + match lit_val { + Some(lv) => Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprLiteral { value: lv.clone() }), + Rc::new(vec![]), + None, + span.clone(), + ), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx: ctx.clone(), + err: None, + }), + None => { + if (kw_text.clone().as_str() == "match".to_string().as_str()) { + parse_match(&tokens, &ctx) } else { - if (kw_text.clone().as_str() == "return".to_string().as_str()) { - parse_return(&tokens, &ctx) + if (kw_text.clone().as_str() == "if".to_string().as_str()) { + parse_if(&tokens, &ctx) } else { - if (kw_text.clone().as_str() == "fn".to_string().as_str()) { - parse_fn_lambda(&tokens, &ctx) + if (kw_text.clone().as_str() == "for".to_string().as_str()) { + parse_for(&tokens, &ctx) } else { - { - let kw_name = tok_keyword_to_name(tok.clone()); -match kw_name { + if (kw_text.clone().as_str() == "let".to_string().as_str()) { + parse_let(&tokens, &ctx) + } else { + if (kw_text.clone().as_str() + == "return".to_string().as_str()) + { + parse_return(&tokens, &ctx) + } else { + if (kw_text.clone().as_str() + == "fn".to_string().as_str()) + { + parse_fn_lambda(&tokens, &ctx) + } else { + { + let kw_name = tok_keyword_to_name(tok.clone()); + match kw_name { Some(n) => parse_ident_expr(&tokens, ctx.clone(), &n), None => Rc::new(ExprResult { expr: parse_recovery_expr(span.clone(), format!("expected expression, found keyword '{}'", kw_text.clone())), @@ -8644,389 +10611,519 @@ match kw_name { err: Some(parse_error(format!("expected expression, found keyword '{}'", kw_text.clone()), span.clone())), }), } -} + } + } + } + } } } } } } - }, -} -}, - Some(TokenShape::ShLitInt) => { - let n_opt = v2_rt::parse_int(tok.clone().unwrap().text.clone()); -let n = match n_opt { - Some(v) => v.clone(), - None => return Rc::new(ExprResult { - expr: make_expr_error_node(ExprErrorKind::InternalExprError, &v2_rt::concat(v2_rt::concat("internal: ShLitInt token text not parseable as int: '".to_string(), tok.clone().unwrap().text.clone()), "'".to_string()), &span), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}), -}; -Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitInt { - value: n.clone(), -}), -}), Rc::new(vec![]), None, span.clone()), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - ctx: ctx.clone(), - err: None, -}) -}, - Some(TokenShape::ShLitFloat) => { - let f = tok.clone().unwrap().text.clone(); -Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitFloat { - value: f, -}), -}), Rc::new(vec![]), None, span.clone()), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - ctx: ctx.clone(), - err: None, -}) -}, - Some(TokenShape::ShLitStr) => { - let s = tok.clone().unwrap().text.clone(); -Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: s, -}), -}), Rc::new(vec![]), None, span.clone()), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - ctx: ctx.clone(), - err: None, -}) -}, - Some(TokenShape::ShStrBegin) => parse_string_interp(&tokens, ctx.clone()), - Some(TokenShape::ShIdent) => { - let n = tok.clone().unwrap().text.clone(); -parse_ident_expr(&tokens, ctx.clone(), &n) -}, - Some(TokenShape::ShLParen) => parse_paren_expr(&tokens, &ctx), - Some(TokenShape::ShLBracket) => parse_list_literal(&tokens, &ctx), - Some(TokenShape::ShLBrace) => parse_brace_expr(&tokens, ctx.clone()), - _ => { - let tag = match sh.clone() { - Some(shape) => shape_display_name(shape.clone()), - None => "EOF".to_string(), -}; -Rc::new(ExprResult { - expr: parse_recovery_expr(span.clone(), format!("expected expression, found {}", tag.clone())), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error(format!("expected expression, found {}", tag.clone()), span.clone())), -}) -}, -} -} + } + Some(TokenShape::ShLitInt) => { + let n_opt = v2_rt::parse_int(tok.clone().unwrap().text.clone()); + let n = match n_opt { + Some(v) => v.clone(), + None => { + return Rc::new(ExprResult { + expr: make_expr_error_node( + ExprErrorKind::InternalExprError, + &v2_rt::concat( + v2_rt::concat( + "internal: ShLitInt token text not parseable as int: '" + .to_string(), + tok.clone().unwrap().text.clone(), + ), + "'".to_string(), + ), + &span, + ), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } + }; + Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitInt { value: n.clone() }), + }), + Rc::new(vec![]), + None, + span.clone(), + ), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx: ctx.clone(), + err: None, + }) + } + Some(TokenShape::ShLitFloat) => { + let f = tok.clone().unwrap().text.clone(); + Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitFloat { value: f }), + }), + Rc::new(vec![]), + None, + span.clone(), + ), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx: ctx.clone(), + err: None, + }) + } + Some(TokenShape::ShLitStr) => { + let s = tok.clone().unwrap().text.clone(); + Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { value: s }), + }), + Rc::new(vec![]), + None, + span.clone(), + ), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx: ctx.clone(), + err: None, + }) + } + Some(TokenShape::ShStrBegin) => parse_string_interp(&tokens, ctx.clone()), + Some(TokenShape::ShIdent) => { + let n = tok.clone().unwrap().text.clone(); + parse_ident_expr(&tokens, ctx.clone(), &n) + } + Some(TokenShape::ShLParen) => parse_paren_expr(&tokens, &ctx), + Some(TokenShape::ShLBracket) => parse_list_literal(&tokens, &ctx), + Some(TokenShape::ShLBrace) => parse_brace_expr(&tokens, ctx.clone()), + _ => { + let tag = match sh.clone() { + Some(shape) => shape_display_name(shape.clone()), + None => "EOF".to_string(), + }; + Rc::new(ExprResult { + expr: parse_recovery_expr( + span.clone(), + format!("expected expression, found {}", tag.clone()), + ), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error( + format!("expected expression, found {}", tag.clone()), + span.clone(), + )), + }) + } + } + } } pub fn parse_lambda_body(tokens: &Rc>>, ctx: Rc) -> Rc { { let tokens = skip_newlines(tokens.clone()); -let tok = tokens.clone().first().cloned(); -let is_block = (tok_is_keyword(tok.clone(), "let".to_string()) || tok_is_keyword(tok.clone(), "return".to_string())); -if is_block { + let tok = tokens.clone().first().cloned(); + let is_block = (tok_is_keyword(tok.clone(), "let".to_string()) + || tok_is_keyword(tok.clone(), "return".to_string())); + if is_block { { let r = parse_lambda_stmts(tokens.clone(), ctx, Rc::new(vec![])); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: parse_recovery_placeholder(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let span = token_span(tokens.clone().first().cloned()); -if ((r.stmts.clone().len() as i64) == 1) { + expr: parse_recovery_placeholder(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let span = token_span(tokens.clone().first().cloned()); + if ((r.stmts.clone().len() as i64) == 1) { Rc::new(ExprResult { - expr: r.stmts.clone().first().cloned().clone().unwrap(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) + expr: r.stmts.clone().first().cloned().clone().unwrap(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) } else { Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprBlock), r.stmts.clone(), None, span), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) + expr: make_expr_node( + Rc::new(ExprData::ExprBlock), + r.stmts.clone(), + None, + span, + ), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) } -} + } } else { parse_expr(tokens.clone(), ctx) } -} + } } -pub fn parse_lambda_stmts(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_lambda_stmts( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -let tok = tokens.clone().first().cloned(); -if ((tok_is_rparen(tok.clone()) || tok_is_rbrace(tok.clone())) || tok_is_eof(tok.clone())) { + let tok = tokens.clone().first().cloned(); + if ((tok_is_rparen(tok.clone()) || tok_is_rbrace(tok.clone())) || tok_is_eof(tok.clone())) { break Rc::new(StmtsResult { - stmts: acc.clone(), - tokens: tokens.clone(), - ctx: ctx, - err: None, -}); -} else { + stmts: acc.clone(), + tokens: tokens.clone(), + ctx: ctx, + err: None, + }); + } else { let r = parse_stmt(&tokens, ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(StmtsResult { - stmts: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + stmts: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -{ + { let __tco_0 = r.tokens.clone(); -let __tco_1 = r.ctx.clone(); -let __tco_2 = v2_rt::rc_list_push(acc, r.expr.clone()); -tokens = __tco_0; -ctx = __tco_1; -acc = __tco_2; -continue; -} -} -} + let __tco_1 = r.ctx.clone(); + let __tco_2 = v2_rt::rc_list_push(acc, r.expr.clone()); + tokens = __tco_0; + ctx = __tco_1; + acc = __tco_2; + continue; + } + } + } } -pub fn parse_ident_expr(tokens: &Rc>>, ctx: Rc, name: &String) -> Rc { +pub fn parse_ident_expr( + tokens: &Rc>>, + ctx: Rc, + name: &String, +) -> Rc { { let span = token_span(tokens.clone().first().cloned()); -let tokens = Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()); -if tok_is_fat_arrow(tokens.clone().first().cloned()) { + let tokens = Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + if tok_is_fat_arrow(tokens.clone().first().cloned()) { { - let r = parse_lambda_body(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx); -if has_err(r.err.clone()) { - return r.clone() + let r = parse_lambda_body( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx, + ); + if has_err(r.err.clone()) { + return r.clone(); } -Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprLambda), v2_rt::concat(Rc::new(vec![r.expr.clone()]), Rc::new(vec![parsed_name_leaf(name.clone(), span.clone())])), None, span.clone()), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprLambda), + v2_rt::concat( + Rc::new(vec![r.expr.clone()]), + Rc::new(vec![parsed_name_leaf(name.clone(), span.clone())]), + ), + None, + span.clone(), + ), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } else { - if (is_uppercase_start(name.clone()) && tok_is_lbrace(tokens.clone().first().cloned())) { + if (is_uppercase_start(name.clone()) && tok_is_lbrace(tokens.clone().first().cloned())) + { parse_record_literal(&tokens, &ctx, name.clone(), &span) } else { Rc::new(ExprResult { - expr: make_named_expr_node(&name, Rc::new(ExprData::ExprVar { - binding_kind: None, -}), Rc::new(vec![]), None, span.clone(), span.clone()), - tokens: tokens.clone(), - ctx: ctx, - err: None, -}) + expr: make_named_expr_node( + &name, + Rc::new(ExprData::ExprVar { binding_kind: None }), + Rc::new(vec![]), + None, + span.clone(), + span.clone(), + ), + tokens: tokens.clone(), + ctx: ctx, + err: None, + }) } } -} + } } pub fn is_uppercase_start(name: String) -> bool { { let ch = v2_rt::char_at(&name, 0); -((ch.clone() >= "A".to_string()) && (ch.clone() <= "Z".to_string())) -} + ((ch.clone() >= "A".to_string()) && (ch.clone() <= "Z".to_string())) + } } -pub fn try_postfix(tokens: &Rc>>, ctx: &Rc, lhs: &Rc, min_bp: i64) -> Rc { +pub fn try_postfix( + tokens: &Rc>>, + ctx: &Rc, + lhs: &Rc, + min_bp: i64, +) -> Rc { { let tok = tokens.clone().first().cloned(); -let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, -}; -let span = token_span(tok.clone()); -match sh { - Some(TokenShape::ShLParen) => if (14 < min_bp) { - Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) - } else { - { - let r = parse_call_args(&tokens, &ctx); -if has_err(r.err.clone()) { - return Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let call_expr = make_call_expr(&lhs, r.args.clone(), span, ctx.source_indices.clone()); -Rc::new(PostfixResult { - expr: call_expr, - changed: true, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} - }, - Some(TokenShape::ShIdent) => if (tok.clone().unwrap().text.clone().as_str() == "as".to_string().as_str()) { - if (13 < min_bp) { - Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) - } else { - { - let r = parse_type_expr(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &ctx); -if has_err(r.err.clone()) { - return Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -Rc::new(PostfixResult { - expr: make_expr_node(Rc::new(ExprData::ExprCast), Rc::new(vec![lhs.clone(), r.type_expr.clone()]), None, span), - changed: true, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} - } - } else { - Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) - }, - Some(TokenShape::ShLBracket) => if (14 < min_bp) { - Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) - } else { - if is_constraint_bracket(tokens.clone()) { - Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) - } else { - { - let r = parse_index_or_slice(&tokens, &ctx, lhs.clone(), span); -if has_err(r.err.clone()) { - return Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -Rc::new(PostfixResult { - expr: r.expr.clone(), - changed: true, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} - } - }, - Some(TokenShape::ShLBrace) => match (*lhs.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => { - let n = expr_var_name_at(lhs.clone(), ctx.source_indices.clone()); -if (is_uppercase_start(n.clone()) && (14 <= min_bp)) { - Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) - } else { - if is_uppercase_start(n.clone()) { + let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, + }; + let span = token_span(tok.clone()); + match sh { + Some(TokenShape::ShLParen) => { + if (14 < min_bp) { + Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } else { { - let r = parse_record_literal(&tokens, &ctx, n.clone(), &lhs.span.clone()); -if has_err(r.err.clone()) { + let r = parse_call_args(&tokens, &ctx); + if has_err(r.err.clone()) { return Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + expr: lhs.clone(), + changed: false, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -Rc::new(PostfixResult { - expr: r.expr.clone(), - changed: true, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + let call_expr = + make_call_expr(&lhs, r.args.clone(), span, ctx.source_indices.clone()); + Rc::new(PostfixResult { + expr: call_expr, + changed: true, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } + } + } + Some(TokenShape::ShIdent) => { + if (tok.clone().unwrap().text.clone().as_str() == "as".to_string().as_str()) { + if (13 < min_bp) { + Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } else { + { + let r = parse_type_expr( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + &ctx, + ); + if has_err(r.err.clone()) { + return Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + Rc::new(PostfixResult { + expr: make_expr_node( + Rc::new(ExprData::ExprCast), + Rc::new(vec![lhs.clone(), r.type_expr.clone()]), + None, + span, + ), + changed: true, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } + } } else { Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) + expr: lhs.clone(), + changed: false, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) } } -}, - _ => Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}), -}, - _ => Rc::new(PostfixResult { - expr: lhs.clone(), - changed: false, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}), -} -} + Some(TokenShape::ShLBracket) => { + if (14 < min_bp) { + Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } else { + if is_constraint_bracket(tokens.clone()) { + Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } else { + { + let r = parse_index_or_slice(&tokens, &ctx, lhs.clone(), span); + if has_err(r.err.clone()) { + return Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + Rc::new(PostfixResult { + expr: r.expr.clone(), + changed: true, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } + } + } + } + Some(TokenShape::ShLBrace) => match (*lhs.expr_data.clone()).clone() { + ExprData::ExprVar { .. } => { + let n = expr_var_name_at(lhs.clone(), ctx.source_indices.clone()); + if (is_uppercase_start(n.clone()) && (14 <= min_bp)) { + Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } else { + if is_uppercase_start(n.clone()) { + { + let r = parse_record_literal( + &tokens, + &ctx, + n.clone(), + &lhs.span.clone(), + ); + if has_err(r.err.clone()) { + return Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + Rc::new(PostfixResult { + expr: r.expr.clone(), + changed: true, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } + } else { + Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } + } + } + _ => Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }), + }, + _ => Rc::new(PostfixResult { + expr: lhs.clone(), + changed: false, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }), + } + } } pub fn is_constraint_bracket(tokens: Rc>>) -> bool { match tokens.get(1 as usize).cloned() { - Some(t) => if is_ident_shape(t.shape.clone()) { - ((t.text.clone().as_str() == "after".to_string().as_str()) || (t.text.clone().as_str() == "when".to_string().as_str())) - } else { - false - }, - None => false, -} + Some(t) => { + if is_ident_shape(t.shape.clone()) { + ((t.text.clone().as_str() == "after".to_string().as_str()) + || (t.text.clone().as_str() == "when".to_string().as_str())) + } else { + false + } + } + None => false, + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -9037,2240 +11134,2964 @@ pub struct ConstraintsResult { pub err: Option>, } -pub fn parse_constraint_annotations(tokens: &Rc>>, ctx: Rc) -> Rc { +pub fn parse_constraint_annotations( + tokens: &Rc>>, + ctx: Rc, +) -> Rc { match (*eat(&tokens, Rc::new(ExpectedToken::ExpectLBracket))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { - let r = parse_constraint_list(__ec.clone(), ctx, Rc::new(vec![])); -if has_err(r.err.clone()) { - return r.clone() - } -let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBracket)); -if has_err(r2.err.clone()) { - return Rc::new(ConstraintsResult { - constraints: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), -}) - } -Rc::new(ConstraintsResult { - constraints: r.constraints.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -}, - EatResult::EatUnchanged { tokens: __eu, .. } => Rc::new(ConstraintsResult { - constraints: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx, - err: None, -}), -} + EatResult::EatConsumed { tokens: __ec, .. } => { + let r = parse_constraint_list(__ec.clone(), ctx, Rc::new(vec![])); + if has_err(r.err.clone()) { + return r.clone(); + } + let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBracket)); + if has_err(r2.err.clone()) { + return Rc::new(ConstraintsResult { + constraints: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), + }); + } + Rc::new(ConstraintsResult { + constraints: r.constraints.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } + EatResult::EatUnchanged { tokens: __eu, .. } => Rc::new(ConstraintsResult { + constraints: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx, + err: None, + }), + } } -pub fn parse_constraint_list(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_constraint_list( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -let tok = tokens.clone().first().cloned(); -let is_constraint_kw = match tok.clone() { - Some(t) => (is_ident_shape(t.shape.clone()) && ((t.text.clone().as_str() == "after".to_string().as_str()) || (t.text.clone().as_str() == "when".to_string().as_str()))), - None => false, -}; -if !is_constraint_kw { + let tok = tokens.clone().first().cloned(); + let is_constraint_kw = match tok.clone() { + Some(t) => { + (is_ident_shape(t.shape.clone()) + && ((t.text.clone().as_str() == "after".to_string().as_str()) + || (t.text.clone().as_str() == "when".to_string().as_str()))) + } + None => false, + }; + if !is_constraint_kw { return Rc::new(ConstraintsResult { - constraints: acc.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) - } -let kw_name = tok.clone().unwrap().text.clone(); -let r = parse_expr(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx.clone()); -if has_err(r.err.clone()) { + constraints: acc.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } + let kw_name = tok.clone().unwrap().text.clone(); + let r = parse_expr( + Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx.clone(), + ); + if has_err(r.err.clone()) { return Rc::new(ConstraintsResult { - constraints: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let fi = make_field_init_node(&kw_name, r.expr.clone(), make_span(0, 0), make_span(0, 0)); -acc = v2_rt::rc_list_push(acc.clone(), fi); -match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { { - let __tco_0 = __ec.clone(); -let __tco_1 = r.ctx.clone(); -tokens = __tco_0; -ctx = __tco_1; -continue; -} }, - EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(ConstraintsResult { - constraints: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}); }, -} -} -} - -pub fn try_constraint_annotations(tokens: &Rc>>, ctx: Rc) -> Rc { + constraints: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let fi = make_field_init_node(&kw_name, r.expr.clone(), make_span(0, 0), make_span(0, 0)); + acc = v2_rt::rc_list_push(acc.clone(), fi); + match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let __tco_0 = __ec.clone(); + let __tco_1 = r.ctx.clone(); + tokens = __tco_0; + ctx = __tco_1; + continue; + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + break Rc::new(ConstraintsResult { + constraints: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }); + } + } + } +} + +pub fn try_constraint_annotations( + tokens: &Rc>>, + ctx: Rc, +) -> Rc { if is_constraint_bracket(tokens.clone()) { parse_constraint_annotations(&tokens, ctx) } else { Rc::new(ConstraintsResult { - constraints: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx, - err: None, -}) + constraints: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx, + err: None, + }) } } -pub fn make_call_expr(lhs: &Rc, args: Rc>>, span: Rc, source_indices: Rc>>) -> Rc { +pub fn make_call_expr( + lhs: &Rc, + args: Rc>>, + span: Rc, + source_indices: Rc>>, +) -> Rc { match (*lhs.expr_data.clone()).clone() { - ExprData::ExprVar { .. } => make_named_expr_node(&expr_var_name_at(lhs.clone(), source_indices), Rc::new(ExprData::ExprCall { - call_semantics: None, - descent_evidence: None, -}), args, None, lhs.span.clone(), node_name_span(&lhs)), - ExprData::ExprFieldAccess { .. } => make_named_expr_node(&field_access_field_at(lhs.clone(), source_indices), Rc::new(ExprData::ExprMethodCall { - method_semantics: None, -}), v2_rt::concat(Rc::new(vec![lhs.children.clone().first().cloned().clone().unwrap()]), args), None, lhs.span.clone(), node_name_span(&lhs)), - _ => make_named_expr_node(&"".to_string(), Rc::new(ExprData::ExprCall { - call_semantics: None, - descent_evidence: None, -}), args, None, lhs.span.clone(), no_span()), -} + ExprData::ExprVar { .. } => make_named_expr_node( + &expr_var_name_at(lhs.clone(), source_indices), + Rc::new(ExprData::ExprCall { + call_semantics: None, + descent_evidence: None, + }), + args, + None, + lhs.span.clone(), + node_name_span(&lhs), + ), + ExprData::ExprFieldAccess { .. } => make_named_expr_node( + &field_access_field_at(lhs.clone(), source_indices), + Rc::new(ExprData::ExprMethodCall { + method_semantics: None, + }), + v2_rt::concat( + Rc::new(vec![lhs.children.clone().first().cloned().clone().unwrap()]), + args, + ), + None, + lhs.span.clone(), + node_name_span(&lhs), + ), + _ => make_named_expr_node( + &"".to_string(), + Rc::new(ExprData::ExprCall { + call_semantics: None, + descent_evidence: None, + }), + args, + None, + lhs.span.clone(), + no_span(), + ), + } } -pub fn parse_index_or_slice(tokens: &Rc>>, ctx: &Rc, base: Rc, span: Rc) -> Rc { +pub fn parse_index_or_slice( + tokens: &Rc>>, + ctx: &Rc, + base: Rc, + span: Rc, +) -> Rc { { let dummy_expr = parse_recovery_placeholder(); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBracket)); -if has_err(r.err.clone()) { + let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBracket)); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r = parse_expr(r.tokens.clone(), ctx.clone()); -if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r = parse_expr(r.tokens.clone(), ctx.clone()); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let first_expr = r.expr.clone(); -let tokens = r.tokens.clone(); -let ctx = r.ctx.clone(); -if tok_is_dot_dot(tokens.clone().first().cloned()) { + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let first_expr = r.expr.clone(); + let tokens = r.tokens.clone(); + let ctx = r.ctx.clone(); + if tok_is_dot_dot(tokens.clone().first().cloned()) { { - let r = parse_expr(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx.clone()); -if has_err(r.err.clone()) { + let r = parse_expr( + Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx.clone(), + ); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let end_expr = r.expr.clone(); -let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBracket)); -if has_err(r.err.clone()) { + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let end_expr = r.expr.clone(); + let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectRBracket)); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprSlice), Rc::new(vec![base, first_expr, end_expr]), None, span), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: None, -}) -} + Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprSlice), + Rc::new(vec![base, first_expr, end_expr]), + None, + span, + ), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } } else { { let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBracket)); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprIndex), Rc::new(vec![base, first_expr]), None, span), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: None, -}) -} + Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprIndex), + Rc::new(vec![base, first_expr]), + None, + span, + ), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } } -} + } } pub fn parse_call_args(tokens: &Rc>>, ctx: &Rc) -> Rc { { let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLParen)); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ArgsResult { - args: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + args: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -let tokens = skip_newlines(r.tokens.clone()); -if tok_is_rparen(tokens.clone().first().cloned()) { + let tokens = skip_newlines(r.tokens.clone()); + if tok_is_rparen(tokens.clone().first().cloned()) { Rc::new(ArgsResult { - args: Rc::new(vec![]), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - ctx: ctx.clone(), - err: None, -}) + args: Rc::new(vec![]), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx: ctx.clone(), + err: None, + }) } else { { let r = parse_arg_list(tokens.clone(), ctx.clone()); -if has_err(r.err.clone()) { - return r.clone() + if has_err(r.err.clone()) { + return r.clone(); } -let tokens = skip_newlines(r.tokens.clone()); -let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRParen)); -if has_err(r2.err.clone()) { + let tokens = skip_newlines(r.tokens.clone()); + let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRParen)); + if has_err(r2.err.clone()) { return Rc::new(ArgsResult { - args: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), -}) + args: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), + }); } -Rc::new(ArgsResult { - args: r.args.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + Rc::new(ArgsResult { + args: r.args.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } -} + } } pub fn parse_arg_list(tokens: Rc>>, ctx: Rc) -> Rc { parse_arg_list_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_arg_list_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_arg_list_acc( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -let r = parse_single_arg(&tokens, ctx); -if has_err(r.err.clone()) { + let r = parse_single_arg(&tokens, ctx); + if has_err(r.err.clone()) { return Rc::new(ArgsResult { - args: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -acc = v2_rt::rc_list_push(acc.clone(), r.arg.clone()); -match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { tokens = skip_newlines(__ec.clone()); -if tok_is_rparen(tokens.clone().first().cloned()) { - break Rc::new(ArgsResult { - args: acc.clone(), - tokens: tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}); -} else { - { - let __tco_0 = r.ctx.clone(); -ctx = __tco_0; -continue; -} -} }, - EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(ArgsResult { - args: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}); }, -} -} + args: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + acc = v2_rt::rc_list_push(acc.clone(), r.arg.clone()); + match (*eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + tokens = skip_newlines(__ec.clone()); + if tok_is_rparen(tokens.clone().first().cloned()) { + break Rc::new(ArgsResult { + args: acc.clone(), + tokens: tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }); + } else { + { + let __tco_0 = r.ctx.clone(); + ctx = __tco_0; + continue; + } + } + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + break Rc::new(ArgsResult { + args: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }); + } + } + } } pub fn parse_single_arg(tokens: &Rc>>, ctx: Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); -let dummy_arg = make_arg_node(None, parse_recovery_placeholder(), span.clone(), span.clone()); -let tok = tokens.clone().first().cloned(); -let is_name_token = (tok_is_ident(tok.clone()) || tok_is_keyword_name(tok.clone())); -if is_name_token { + let dummy_arg = make_arg_node( + None, + parse_recovery_placeholder(), + span.clone(), + span.clone(), + ); + let tok = tokens.clone().first().cloned(); + let is_name_token = (tok_is_ident(tok.clone()) || tok_is_keyword_name(tok.clone())); + if is_name_token { { let name_r = expect_name(&tokens); -if has_err(name_r.err.clone()) { + if has_err(name_r.err.clone()) { { let r = parse_expr(tokens.clone(), ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ArgResult { - arg: dummy_arg, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + arg: dummy_arg, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -let arg = make_arg_node(None, r.expr.clone(), span.clone(), span.clone()); -Rc::new(ArgResult { - arg: arg, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + let arg = make_arg_node(None, r.expr.clone(), span.clone(), span.clone()); + Rc::new(ArgResult { + arg: arg, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } else { if tok_is_colon(name_r.tokens.clone().first().cloned()) { { - let r = parse_expr(Rc::new(name_r.tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx); -if has_err(r.err.clone()) { + let r = parse_expr( + Rc::new( + name_r + .tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx, + ); + if has_err(r.err.clone()) { return Rc::new(ArgResult { - arg: dummy_arg, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + arg: dummy_arg, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -let arg = make_arg_node(Some(name_r.name.clone()), r.expr.clone(), span.clone(), name_r.span.clone()); -Rc::new(ArgResult { - arg: arg, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + let arg = make_arg_node( + Some(name_r.name.clone()), + r.expr.clone(), + span.clone(), + name_r.span.clone(), + ); + Rc::new(ArgResult { + arg: arg, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } else { { let r = parse_expr(tokens.clone(), ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ArgResult { - arg: dummy_arg, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + arg: dummy_arg, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -let arg = make_arg_node(None, r.expr.clone(), span.clone(), span.clone()); -Rc::new(ArgResult { - arg: arg, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + let arg = + make_arg_node(None, r.expr.clone(), span.clone(), span.clone()); + Rc::new(ArgResult { + arg: arg, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } } -} + } } else { { let r = parse_expr(tokens.clone(), ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ArgResult { - arg: dummy_arg, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + arg: dummy_arg, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -let arg = make_arg_node(None, r.expr.clone(), span.clone(), span.clone()); -Rc::new(ArgResult { - arg: arg, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + let arg = make_arg_node(None, r.expr.clone(), span.clone(), span.clone()); + Rc::new(ArgResult { + arg: arg, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } -} + } } pub fn parse_match(tokens: &Rc>>, ctx: &Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); -let dummy_expr = parse_recovery_placeholder(); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { - text: "match".to_string(), -})); -if has_err(r.err.clone()) { + let dummy_expr = parse_recovery_placeholder(); + let r = expect( + &tokens, + &Rc::new(ExpectedToken::ExpectKeyword { + text: "match".to_string(), + }), + ); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r = parse_expr_no_brace(r.tokens.clone(), ctx.clone()); -if has_err(r.err.clone()) { - return r.clone() - } -let scrutinee = r.expr.clone(); -let r = expect(&skip_newlines(r.tokens.clone()), &Rc::new(ExpectedToken::ExpectLBrace)); -if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r = parse_expr_no_brace(r.tokens.clone(), ctx.clone()); + if has_err(r.err.clone()) { + return r.clone(); + } + let scrutinee = r.expr.clone(); + let r = expect( + &skip_newlines(r.tokens.clone()), + &Rc::new(ExpectedToken::ExpectLBrace), + ); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r = parse_match_arms(skip_newlines(r.tokens.clone()), ctx.clone()); -if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r = parse_match_arms(skip_newlines(r.tokens.clone()), ctx.clone()); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let arms = r.arms.clone(); -let r = expect(&skip_newlines(r.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let arms = r.arms.clone(); + let r = expect( + &skip_newlines(r.tokens.clone()), + &Rc::new(ExpectedToken::ExpectRBrace), + ); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprMatch), v2_rt::concat(Rc::new(vec![scrutinee]), arms), None, span), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: None, -}) -} + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprMatch), + v2_rt::concat(Rc::new(vec![scrutinee]), arms), + None, + span, + ), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } } pub fn parse_expr_no_brace(tokens: Rc>>, ctx: Rc) -> Rc { parse_expr_bp_no_brace(tokens, ctx, 0) } -pub fn parse_expr_bp_no_brace(tokens: Rc>>, ctx: Rc, min_bp: i64) -> Rc { +pub fn parse_expr_bp_no_brace( + tokens: Rc>>, + ctx: Rc, + min_bp: i64, +) -> Rc { { let r = parse_prefix(&tokens, ctx); -if has_err(r.err.clone()) { - return r.clone() + if has_err(r.err.clone()) { + return r.clone(); } -let lhs = r.expr.clone(); -parse_expr_loop_no_brace(r.tokens.clone(), r.ctx.clone(), lhs, min_bp) -} + let lhs = r.expr.clone(); + parse_expr_loop_no_brace(r.tokens.clone(), r.ctx.clone(), lhs, min_bp) + } } -pub fn parse_expr_loop_no_brace(mut tokens: Rc>>, mut ctx: Rc, mut lhs: Rc, mut min_bp: i64) -> Rc { +pub fn parse_expr_loop_no_brace( + mut tokens: Rc>>, + mut ctx: Rc, + mut lhs: Rc, + mut min_bp: i64, +) -> Rc { loop { let tok = tokens.clone().first().cloned(); -if (tok_is_eof(tok.clone()) || tok_is_lbrace(tok.clone())) { + if (tok_is_eof(tok.clone()) || tok_is_lbrace(tok.clone())) { break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); -} else { + expr: lhs.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } else { let loop_span = token_span(tok.clone()); -tokens = skip_continuation_newlines(&tokens); -if (tok_is_lparen(tokens.clone().first().cloned()) && (14 >= min_bp.clone())) { + tokens = skip_continuation_newlines(&tokens); + if (tok_is_lparen(tokens.clone().first().cloned()) && (14 >= min_bp.clone())) { let r = parse_call_args(&tokens, &ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: lhs.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let span = token_span(tokens.clone().first().cloned()); -let new_lhs = make_call_expr(&lhs, r.args.clone(), span, ctx.source_indices.clone()); -{ + expr: lhs.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let span = token_span(tokens.clone().first().cloned()); + let new_lhs = + make_call_expr(&lhs, r.args.clone(), span, ctx.source_indices.clone()); + { let __tco_0 = r.tokens.clone(); -let __tco_1 = r.ctx.clone(); -let __tco_2 = new_lhs; -tokens = __tco_0; -ctx = __tco_1; -lhs = __tco_2; -continue; -} -} else { + let __tco_1 = r.ctx.clone(); + let __tco_2 = new_lhs; + tokens = __tco_0; + ctx = __tco_1; + lhs = __tco_2; + continue; + } + } else { if (tok_is_lbracket(tokens.clone().first().cloned()) && (14 >= min_bp.clone())) { let span = token_span(tokens.clone().first().cloned()); -let r = parse_index_or_slice(&tokens, &ctx, lhs.clone(), span); -if has_err(r.err.clone()) { + let r = parse_index_or_slice(&tokens, &ctx, lhs.clone(), span); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -{ + { let __tco_0 = r.tokens.clone(); -let __tco_1 = r.ctx.clone(); -let __tco_2 = r.expr.clone(); -tokens = __tco_0; -ctx = __tco_1; -lhs = __tco_2; -continue; -} -} else { + let __tco_1 = r.ctx.clone(); + let __tco_2 = r.expr.clone(); + tokens = __tco_0; + ctx = __tco_1; + lhs = __tco_2; + continue; + } + } else { let bp = infix_bp(tokens.clone()); -match bp { - Some(bps) => { if (bps.left.clone() < min_bp.clone()) { - break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); -} else { - match (*advance(&tokens)).clone() { - AdvanceResult::AdvanceOk { token: op_tok, tokens: rest, .. } => { let op_shape = op_tok.shape.clone(); -if is_dot_shape(op_shape.clone()) { - let r = expect_name(&rest); -if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: lhs.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let new_lhs = make_named_expr_node(&r.name.clone(), Rc::new(ExprData::ExprFieldAccess { - summary: None, -}), Rc::new(vec![lhs.clone()]), None, loop_span, r.span.clone()); -{ - let __tco_0 = r.tokens.clone(); -let __tco_1 = new_lhs; -tokens = __tco_0; -lhs = __tco_1; -continue; -} -} else { - if is_pipe_arrow_shape(op_shape.clone()) { - let r = parse_pipe_rhs(&rest, &ctx, lhs.clone(), loop_span); -if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -{ - let __tco_0 = r.tokens.clone(); -let __tco_1 = r.ctx.clone(); -let __tco_2 = r.expr.clone(); -tokens = __tco_0; -ctx = __tco_1; -lhs = __tco_2; -continue; -} -} else { - tokens = skip_newlines(rest.clone()); -let r = parse_expr_bp_no_brace(tokens.clone(), ctx.clone(), bps.right.clone()); -if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + match bp { + Some(bps) => { + if (bps.left.clone() < min_bp.clone()) { + break Rc::new(ExprResult { + expr: lhs.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } else { + match (*advance(&tokens)).clone() { + AdvanceResult::AdvanceOk { + token: op_tok, + tokens: rest, + .. + } => { + let op_shape = op_tok.shape.clone(); + if is_dot_shape(op_shape.clone()) { + let r = expect_name(&rest); + if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: lhs.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let new_lhs = make_named_expr_node( + &r.name.clone(), + Rc::new(ExprData::ExprFieldAccess { + summary: None, + }), + Rc::new(vec![lhs.clone()]), + None, + loop_span, + r.span.clone(), + ); + { + let __tco_0 = r.tokens.clone(); + let __tco_1 = new_lhs; + tokens = __tco_0; + lhs = __tco_1; + continue; + } + } else { + if is_pipe_arrow_shape(op_shape.clone()) { + let r = parse_pipe_rhs( + &rest, + &ctx, + lhs.clone(), + loop_span, + ); + if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + { + let __tco_0 = r.tokens.clone(); + let __tco_1 = r.ctx.clone(); + let __tco_2 = r.expr.clone(); + tokens = __tco_0; + ctx = __tco_1; + lhs = __tco_2; + continue; + } + } else { + tokens = skip_newlines(rest.clone()); + let r = parse_expr_bp_no_brace( + tokens.clone(), + ctx.clone(), + bps.right.clone(), + ); + if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let binop_opt = find_operator_binop( + dag_syntax_spec().operators.clone(), + op_tok.text.clone(), + ); + match binop_opt { + Some(binop) => { + let new_lhs = make_expr_node( + Rc::new(ExprData::ExprBinOp { + op: binop.clone(), + algebra_field: None, + }), + Rc::new(vec![ + lhs.clone(), + r.expr.clone(), + ]), + None, + loop_span, + ); + { + let __tco_0 = r.tokens.clone(); + let __tco_1 = r.ctx.clone(); + let __tco_2 = new_lhs; + tokens = __tco_0; + ctx = __tco_1; + lhs = __tco_2; + continue; + } + } + None => { + break Rc::new(ExprResult { + expr: lhs.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: Some(parse_error( + v2_rt::concat( + "unknown binary operator: " + .to_string(), + op_tok.text.clone(), + ), + loop_span, + )), + }); + } + } + } + } + } + AdvanceResult::AdvanceEof => { + break Rc::new(ExprResult { + expr: lhs.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } } -let binop_opt = find_operator_binop(dag_syntax_spec().operators.clone(), op_tok.text.clone()); -match binop_opt { - Some(binop) => { let new_lhs = make_expr_node(Rc::new(ExprData::ExprBinOp { - op: binop.clone(), - algebra_field: None, -}), Rc::new(vec![lhs.clone(), r.expr.clone()]), None, loop_span); -{ - let __tco_0 = r.tokens.clone(); -let __tco_1 = r.ctx.clone(); -let __tco_2 = new_lhs; -tokens = __tco_0; -ctx = __tco_1; -lhs = __tco_2; -continue; -} }, - None => { break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: Some(parse_error(v2_rt::concat("unknown binary operator: ".to_string(), op_tok.text.clone()), loop_span)), -}); }, -} -} -} }, - AdvanceResult::AdvanceEof => { break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); }, -} -} }, - None => { break Rc::new(ExprResult { - expr: lhs.clone(), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); }, -} -} -} -} -} + } + } + None => { + break Rc::new(ExprResult { + expr: lhs.clone(), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } + } + } + } + } + } } pub fn parse_match_arms(tokens: Rc>>, ctx: Rc) -> Rc { parse_match_arms_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_match_arms_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_match_arms_acc( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { + if (tok_is_rbrace(tokens.clone().first().cloned()) + || tok_is_eof(tokens.clone().first().cloned())) + { break Rc::new(ArmsResult { - arms: acc.clone(), - tokens: tokens.clone(), - ctx: ctx, - err: None, -}); -} else { + arms: acc.clone(), + tokens: tokens.clone(), + ctx: ctx, + err: None, + }); + } else { let r = parse_match_arm(&tokens, &ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ArmsResult { - arms: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let e = eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); -tokens = skip_newlines(match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => r.tokens.clone(), -}); -{ + arms: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let e = eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); + tokens = skip_newlines(match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => r.tokens.clone(), + }); + { let __tco_0 = r.ctx.clone(); -let __tco_1 = v2_rt::rc_list_push(acc, r.arm.clone()); -ctx = __tco_0; -acc = __tco_1; -continue; -} -} -} + let __tco_1 = v2_rt::rc_list_push(acc, r.arm.clone()); + ctx = __tco_0; + acc = __tco_1; + continue; + } + } + } } pub fn parse_match_arm(tokens: &Rc>>, ctx: &Rc) -> Rc { { let arm_span = token_span(tokens.clone().first().cloned()); -let dummy_arm = make_arm_node(Rc::new(MatchPattern::Wildcard), None, parse_recovery_placeholder(), make_span(0, 0)); -let r = parse_pattern(&tokens, &ctx); -if has_err(r.err.clone()) { + let dummy_arm = make_arm_node( + Rc::new(MatchPattern::Wildcard), + None, + parse_recovery_placeholder(), + make_span(0, 0), + ); + let r = parse_pattern(&tokens, &ctx); + if has_err(r.err.clone()) { return Rc::new(ArmResult { - arm: dummy_arm.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let pat = r.pattern.clone(); -let tokens = r.tokens.clone(); -let ctx = r.ctx.clone(); -let guard_r = parse_optional_guard(&tokens, ctx.clone()); -if has_err(guard_r.err.clone()) { + arm: dummy_arm.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let pat = r.pattern.clone(); + let tokens = r.tokens.clone(); + let ctx = r.ctx.clone(); + let guard_r = parse_optional_guard(&tokens, ctx.clone()); + if has_err(guard_r.err.clone()) { return Rc::new(ArmResult { - arm: dummy_arm.clone(), - tokens: guard_r.tokens.clone(), - ctx: guard_r.ctx.clone(), - err: guard_r.err.clone(), -}) - } -let guard = guard_r.guard.clone(); -let tokens = guard_r.tokens.clone(); -let ctx = guard_r.ctx.clone(); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectFatArrow)); -if has_err(r.err.clone()) { + arm: dummy_arm.clone(), + tokens: guard_r.tokens.clone(), + ctx: guard_r.ctx.clone(), + err: guard_r.err.clone(), + }); + } + let guard = guard_r.guard.clone(); + let tokens = guard_r.tokens.clone(); + let ctx = guard_r.ctx.clone(); + let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectFatArrow)); + if has_err(r.err.clone()) { return Rc::new(ArmResult { - arm: dummy_arm.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let tokens = skip_newlines(r.tokens.clone()); -let r = if tok_is_lbrace(tokens.clone().first().cloned()) { + arm: dummy_arm.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let tokens = skip_newlines(r.tokens.clone()); + let r = if tok_is_lbrace(tokens.clone().first().cloned()) { parse_block(&tokens, &ctx) } else { parse_match_arm_body(&tokens, ctx.clone()) }; -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ArmResult { - arm: dummy_arm.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let arm = make_arm_node(pat, guard, r.expr.clone(), arm_span); -Rc::new(ArmResult { - arm: arm, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + arm: dummy_arm.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let arm = make_arm_node(pat, guard, r.expr.clone(), arm_span); + Rc::new(ArmResult { + arm: arm, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } pub fn parse_match_arm_body(tokens: &Rc>>, ctx: Rc) -> Rc { { let tok = tokens.clone().first().cloned(); -let is_block = (tok_is_keyword(tok.clone(), "let".to_string()) || tok_is_keyword(tok.clone(), "return".to_string())); -if is_block { + let is_block = (tok_is_keyword(tok.clone(), "let".to_string()) + || tok_is_keyword(tok.clone(), "return".to_string())); + if is_block { { let r = parse_match_arm_stmts(tokens.clone(), ctx, Rc::new(vec![])); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: parse_recovery_placeholder(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let span = token_span(tokens.clone().first().cloned()); -if ((r.stmts.clone().len() as i64) == 1) { + expr: parse_recovery_placeholder(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let span = token_span(tokens.clone().first().cloned()); + if ((r.stmts.clone().len() as i64) == 1) { Rc::new(ExprResult { - expr: r.stmts.clone().first().cloned().clone().unwrap(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) + expr: r.stmts.clone().first().cloned().clone().unwrap(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) } else { Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprBlock), r.stmts.clone(), None, span), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) + expr: make_expr_node( + Rc::new(ExprData::ExprBlock), + r.stmts.clone(), + None, + span, + ), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) } -} + } } else { parse_expr(tokens.clone(), ctx) } -} + } } -pub fn parse_match_arm_stmts(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_match_arm_stmts( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { + if (tok_is_rbrace(tokens.clone().first().cloned()) + || tok_is_eof(tokens.clone().first().cloned())) + { break Rc::new(StmtsResult { - stmts: acc.clone(), - tokens: tokens.clone(), - ctx: ctx, - err: None, -}); -} else { + stmts: acc.clone(), + tokens: tokens.clone(), + ctx: ctx, + err: None, + }); + } else { if looks_like_arm_start(&tokens) { break Rc::new(StmtsResult { - stmts: acc.clone(), - tokens: tokens.clone(), - ctx: ctx, - err: None, -}); -} else { + stmts: acc.clone(), + tokens: tokens.clone(), + ctx: ctx, + err: None, + }); + } else { let r = parse_stmt(&tokens, ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(StmtsResult { - stmts: acc.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + stmts: acc.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -{ + { let __tco_0 = r.tokens.clone(); -let __tco_1 = r.ctx.clone(); -let __tco_2 = v2_rt::rc_list_push(acc, r.expr.clone()); -tokens = __tco_0; -ctx = __tco_1; -acc = __tco_2; -continue; -} -} -} -} + let __tco_1 = r.ctx.clone(); + let __tco_2 = v2_rt::rc_list_push(acc, r.expr.clone()); + tokens = __tco_0; + ctx = __tco_1; + acc = __tco_2; + continue; + } + } + } + } } pub fn looks_like_arm_start(tokens: &Rc>>) -> bool { { let tok = tokens.clone().first().cloned(); -let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, -}; -match sh { - Some(TokenShape::ShIdent) => { - let n = tok.clone().unwrap().text.clone(); -if (n.clone().as_str() == "_".to_string().as_str()) { - peek_is_fat_arrow_at(tokens.clone(), 1) - } else { - if is_uppercase_start(n.clone()) { - if peek_is_fat_arrow_at(tokens.clone(), 1) { - true - } else { - if peek_is_expected_at(tokens.clone(), 1, Rc::new(ExpectedToken::ExpectLBrace)) { - scan_for_fat_arrow_after_braces(Rc::new(tokens.clone().iter().cloned().skip(2 as usize).collect::>()), 1) + let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, + }; + match sh { + Some(TokenShape::ShIdent) => { + let n = tok.clone().unwrap().text.clone(); + if (n.clone().as_str() == "_".to_string().as_str()) { + peek_is_fat_arrow_at(tokens.clone(), 1) + } else { + if is_uppercase_start(n.clone()) { + if peek_is_fat_arrow_at(tokens.clone(), 1) { + true } else { - false + if peek_is_expected_at( + tokens.clone(), + 1, + Rc::new(ExpectedToken::ExpectLBrace), + ) { + scan_for_fat_arrow_after_braces( + Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(2 as usize) + .collect::>(), + ), + 1, + ) + } else { + false + } } + } else { + false } - } else { - false } } -}, - _ => false, -} -} + _ => false, + } + } } pub fn peek_is_fat_arrow_at(tokens: Rc>>, offset: i64) -> bool { match tokens.get(offset as usize).cloned() { - Some(t) => is_fat_arrow_shape(t.shape.clone()), - None => false, -} + Some(t) => is_fat_arrow_shape(t.shape.clone()), + None => false, + } } -pub fn peek_is_expected_at(tokens: Rc>>, offset: i64, expected: Rc) -> bool { +pub fn peek_is_expected_at( + tokens: Rc>>, + offset: i64, + expected: Rc, +) -> bool { match tokens.get(offset as usize).cloned() { - Some(t) => token_matches_expected(&t, expected), - None => false, -} + Some(t) => token_matches_expected(&t, expected), + None => false, + } } pub fn scan_for_fat_arrow_after_braces(mut remaining: Rc>>, mut depth: i64) -> bool { loop { if (depth.clone() <= 0) { match remaining.clone().first().cloned() { - Some(t) => { break is_fat_arrow_shape(t.shape.clone()); }, - None => { break false; }, -} -} else { + Some(t) => { + break is_fat_arrow_shape(t.shape.clone()); + } + None => { + break false; + } + } + } else { match remaining.clone().first().cloned() { - Some(t) => { if is_lbrace_shape(t.shape.clone()) { - { - let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); -let __tco_1 = (depth + 1); -remaining = __tco_0; -depth = __tco_1; -continue; -} -} else { - if is_rbrace_shape(t.shape.clone()) { - { - let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); -let __tco_1 = (depth - 1); -remaining = __tco_0; -depth = __tco_1; -continue; -} -} else { - { - let __tco_0 = Rc::new(remaining.iter().cloned().skip(1 as usize).collect::>()); -remaining = __tco_0; -continue; -} -} -} }, - None => { break false; }, -} -} -} + Some(t) => { + if is_lbrace_shape(t.shape.clone()) { + { + let __tco_0 = Rc::new( + remaining + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + let __tco_1 = (depth + 1); + remaining = __tco_0; + depth = __tco_1; + continue; + } + } else { + if is_rbrace_shape(t.shape.clone()) { + { + let __tco_0 = Rc::new( + remaining + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + let __tco_1 = (depth - 1); + remaining = __tco_0; + depth = __tco_1; + continue; + } + } else { + { + let __tco_0 = Rc::new( + remaining + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + remaining = __tco_0; + continue; + } + } + } + } + None => { + break false; + } + } + } + } } pub fn parse_optional_guard(tokens: &Rc>>, ctx: Rc) -> Rc { if tok_is_keyword(tokens.clone().first().cloned(), "if".to_string()) { { - let r = parse_expr(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx); -if has_err(r.err.clone()) { + let r = parse_expr( + Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx, + ); + if has_err(r.err.clone()) { return Rc::new(GuardResult { - guard: None, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -Rc::new(GuardResult { - guard: Some(r.expr.clone()), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + guard: None, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + Rc::new(GuardResult { + guard: Some(r.expr.clone()), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } else { Rc::new(GuardResult { - guard: None, - tokens: tokens.clone(), - ctx: ctx, - err: None, -}) + guard: None, + tokens: tokens.clone(), + ctx: ctx, + err: None, + }) } } pub fn parse_pattern(tokens: &Rc>>, ctx: &Rc) -> Rc { { let tok = tokens.clone().first().cloned(); -let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, -}; -let span = token_span(tok.clone()); -match sh { - Some(TokenShape::ShIdent) => { - let n = tok.clone().unwrap().text.clone(); -if (n.clone().as_str() == "_".to_string().as_str()) { - Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::Wildcard), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - ctx: ctx.clone(), - err: None, -}) - } else { - if is_uppercase_start(n.clone()) { - parse_variant_pattern(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx.clone(), n.clone()) - } else { + let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, + }; + let span = token_span(tok.clone()); + match sh { + Some(TokenShape::ShIdent) => { + let n = tok.clone().unwrap().text.clone(); + if (n.clone().as_str() == "_".to_string().as_str()) { Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::Bind { - name: n.clone(), -}), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - ctx: ctx.clone(), - err: None, -}) - } - } -}, - Some(TokenShape::ShKeyword) => { - let kw_text = tok.clone().unwrap().text.clone(); -let lit_val = v2_rt::lookup(&dag_syntax_spec().keyword_literals.clone(), kw_text); -match lit_val { - Some(lv) => Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::LitPattern { - value: lv.clone(), -}), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - ctx: ctx.clone(), - err: None, -}), - None => Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::Wildcard), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}), -} -}, - Some(TokenShape::ShLitInt) => { - let n_opt = v2_rt::parse_int(tok.clone().unwrap().text.clone()); -let n = match n_opt { - Some(v) => v.clone(), - None => return Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::Wildcard), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: Some(parse_error(v2_rt::concat(v2_rt::concat("internal: ShLitInt token text not parseable as int: '".to_string(), tok.clone().unwrap().text.clone()), "'".to_string()), span)), -}), -}; -Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::LitPattern { - value: Rc::new(LiteralValue::LitInt { - value: n.clone(), -}), -}), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - ctx: ctx.clone(), - err: None, -}) -}, - Some(TokenShape::ShLitStr) => { - let s = tok.clone().unwrap().text.clone(); -Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::LitPattern { - value: Rc::new(LiteralValue::LitStr { - value: s, -}), -}), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - ctx: ctx.clone(), - err: None, -}) -}, - _ => Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::Wildcard), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}), -} -} + pattern: Rc::new(MatchPattern::Wildcard), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx: ctx.clone(), + err: None, + }) + } else { + if is_uppercase_start(n.clone()) { + parse_variant_pattern( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx.clone(), + n.clone(), + ) + } else { + Rc::new(PatternResult { + pattern: Rc::new(MatchPattern::Bind { name: n.clone() }), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx: ctx.clone(), + err: None, + }) + } + } + } + Some(TokenShape::ShKeyword) => { + let kw_text = tok.clone().unwrap().text.clone(); + let lit_val = v2_rt::lookup(&dag_syntax_spec().keyword_literals.clone(), kw_text); + match lit_val { + Some(lv) => Rc::new(PatternResult { + pattern: Rc::new(MatchPattern::LitPattern { value: lv.clone() }), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx: ctx.clone(), + err: None, + }), + None => Rc::new(PatternResult { + pattern: Rc::new(MatchPattern::Wildcard), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }), + } + } + Some(TokenShape::ShLitInt) => { + let n_opt = v2_rt::parse_int(tok.clone().unwrap().text.clone()); + let n = match n_opt { + Some(v) => v.clone(), + None => { + return Rc::new(PatternResult { + pattern: Rc::new(MatchPattern::Wildcard), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: Some(parse_error( + v2_rt::concat( + v2_rt::concat( + "internal: ShLitInt token text not parseable as int: '" + .to_string(), + tok.clone().unwrap().text.clone(), + ), + "'".to_string(), + ), + span, + )), + }) + } + }; + Rc::new(PatternResult { + pattern: Rc::new(MatchPattern::LitPattern { + value: Rc::new(LiteralValue::LitInt { value: n.clone() }), + }), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx: ctx.clone(), + err: None, + }) + } + Some(TokenShape::ShLitStr) => { + let s = tok.clone().unwrap().text.clone(); + Rc::new(PatternResult { + pattern: Rc::new(MatchPattern::LitPattern { + value: Rc::new(LiteralValue::LitStr { value: s }), + }), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx: ctx.clone(), + err: None, + }) + } + _ => Rc::new(PatternResult { + pattern: Rc::new(MatchPattern::Wildcard), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }), + } + } } -pub fn parse_variant_pattern(tokens: &Rc>>, ctx: Rc, name: String) -> Rc { +pub fn parse_variant_pattern( + tokens: &Rc>>, + ctx: Rc, + name: String, +) -> Rc { { let span = token_span(tokens.clone().first().cloned()); -if tok_is_lbrace(tokens.clone().first().cloned()) { + if tok_is_lbrace(tokens.clone().first().cloned()) { { - let r = parse_variant_bindings_brace(skip_newlines(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>())), ctx); -if has_err(r.err.clone()) { + let r = parse_variant_bindings_brace( + skip_newlines(Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + )), + ctx, + ); + if has_err(r.err.clone()) { return Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::Wildcard), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let r2 = expect(&skip_newlines(r.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r2.err.clone()) { + pattern: Rc::new(MatchPattern::Wildcard), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let r2 = expect( + &skip_newlines(r.tokens.clone()), + &Rc::new(ExpectedToken::ExpectRBrace), + ); + if has_err(r2.err.clone()) { return Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::Wildcard), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), -}) - } -Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::VariantPattern { - name: name, - parent_enum: None, - field_bindings: r.field_bindings.clone(), -}), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + pattern: Rc::new(MatchPattern::Wildcard), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), + }); + } + Rc::new(PatternResult { + pattern: Rc::new(MatchPattern::VariantPattern { + name: name, + parent_enum: None, + field_bindings: r.field_bindings.clone(), + }), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } else { if tok_is_lparen(tokens.clone().first().cloned()) { { - let r = parse_pattern(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), &ctx); -if has_err(r.err.clone()) { + let r = parse_pattern( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + &ctx, + ); + if has_err(r.err.clone()) { return Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::Wildcard), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + pattern: Rc::new(MatchPattern::Wildcard), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); -if has_err(r2.err.clone()) { + let r2 = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); + if has_err(r2.err.clone()) { return Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::Wildcard), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), -}) + pattern: Rc::new(MatchPattern::Wildcard), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), + }); } -let fb = make_field_binding_node(&"0".to_string(), r.pattern.clone(), span.clone(), span.clone()); -Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::VariantPattern { - name: name, - parent_enum: None, - field_bindings: Rc::new(vec![fb]), -}), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + let fb = make_field_binding_node( + &"0".to_string(), + r.pattern.clone(), + span.clone(), + span.clone(), + ); + Rc::new(PatternResult { + pattern: Rc::new(MatchPattern::VariantPattern { + name: name, + parent_enum: None, + field_bindings: Rc::new(vec![fb]), + }), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } else { Rc::new(PatternResult { - pattern: Rc::new(MatchPattern::VariantPattern { - name: name, - parent_enum: None, - field_bindings: Rc::new(vec![]), -}), - tokens: tokens.clone(), - ctx: ctx, - err: None, -}) + pattern: Rc::new(MatchPattern::VariantPattern { + name: name, + parent_enum: None, + field_bindings: Rc::new(vec![]), + }), + tokens: tokens.clone(), + ctx: ctx, + err: None, + }) } } -} + } } -pub fn parse_variant_bindings_brace(tokens: Rc>>, ctx: Rc) -> Rc { +pub fn parse_variant_bindings_brace( + tokens: Rc>>, + ctx: Rc, +) -> Rc { parse_variant_bindings_brace_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_variant_bindings_brace_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_variant_bindings_brace_acc( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { + if (tok_is_rbrace(tokens.clone().first().cloned()) + || tok_is_eof(tokens.clone().first().cloned())) + { break Rc::new(BindingsResult { - field_bindings: acc, - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); -} else { + field_bindings: acc, + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } else { let bind_span = token_span(tokens.clone().first().cloned()); -let r = expect_name(&tokens); -if has_err(r.err.clone()) { - return Rc::new(BindingsResult { - field_bindings: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let field_name = r.name.clone(); -let field_name_span = r.span.clone(); -tokens = r.tokens.clone(); -match (*eat(&tokens, Rc::new(ExpectedToken::ExpectColon))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { let r2 = parse_pattern(&__ec, &ctx); -if has_err(r2.err.clone()) { + let r = expect_name(&tokens); + if has_err(r.err.clone()) { return Rc::new(BindingsResult { - field_bindings: Rc::new(vec![]), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), -}) - } -let e2 = eat(&r2.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); -tokens = skip_newlines(match (*e2).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => r2.tokens.clone(), -}); -let fb = make_field_binding_node(&field_name, r2.pattern.clone(), bind_span, field_name_span); -{ - let __tco_0 = r2.ctx.clone(); -let __tco_1 = v2_rt::rc_list_push(acc, fb); -ctx = __tco_0; -acc = __tco_1; -continue; -} }, - EatResult::EatUnchanged { tokens: __eu, .. } => { let e2 = eat(&tokens, Rc::new(ExpectedToken::ExpectComma)); -tokens = skip_newlines(match (*e2).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => tokens.clone(), -}); -let fb = make_field_binding_node(&field_name, Rc::new(MatchPattern::Bind { - name: field_name.clone(), -}), bind_span, field_name_span); -{ - let __tco_0 = v2_rt::rc_list_push(acc, fb); -acc = __tco_0; -continue; -} }, -} -} -} + field_bindings: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let field_name = r.name.clone(); + let field_name_span = r.span.clone(); + tokens = r.tokens.clone(); + match (*eat(&tokens, Rc::new(ExpectedToken::ExpectColon))).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => { + let r2 = parse_pattern(&__ec, &ctx); + if has_err(r2.err.clone()) { + return Rc::new(BindingsResult { + field_bindings: Rc::new(vec![]), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), + }); + } + let e2 = eat(&r2.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); + tokens = skip_newlines(match (*e2).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => r2.tokens.clone(), + }); + let fb = make_field_binding_node( + &field_name, + r2.pattern.clone(), + bind_span, + field_name_span, + ); + { + let __tco_0 = r2.ctx.clone(); + let __tco_1 = v2_rt::rc_list_push(acc, fb); + ctx = __tco_0; + acc = __tco_1; + continue; + } + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + let e2 = eat(&tokens, Rc::new(ExpectedToken::ExpectComma)); + tokens = skip_newlines(match (*e2).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => tokens.clone(), + }); + let fb = make_field_binding_node( + &field_name, + Rc::new(MatchPattern::Bind { + name: field_name.clone(), + }), + bind_span, + field_name_span, + ); + { + let __tco_0 = v2_rt::rc_list_push(acc, fb); + acc = __tco_0; + continue; + } + } + } + } + } } pub fn parse_if(tokens: &Rc>>, ctx: &Rc) -> Rc { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { + let span = token_span(tokens.clone().first().cloned()); + let dummy_expr = parse_recovery_placeholder(); + let r = expect( + &tokens, + &Rc::new(ExpectedToken::ExpectKeyword { + text: "if".to_string(), + }), + ); + if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r = parse_expr_no_brace(r.tokens.clone(), ctx.clone()); + if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let condition = r.expr.clone(); + let r = parse_block(&skip_newlines(r.tokens.clone()), &r.ctx.clone()); + if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let then_branch = r.expr.clone(); + let tokens = skip_newlines(r.tokens.clone()); + let ctx = r.ctx.clone(); + match (*eat( + &tokens, + Rc::new(ExpectedToken::ExpectKeyword { + text: "else".to_string(), + }), + )) + .clone() { - let span = token_span(tokens.clone().first().cloned()); -let dummy_expr = parse_recovery_placeholder(); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { - text: "if".to_string(), -})); -if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r = parse_expr_no_brace(r.tokens.clone(), ctx.clone()); -if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let condition = r.expr.clone(); -let r = parse_block(&skip_newlines(r.tokens.clone()), &r.ctx.clone()); -if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let then_branch = r.expr.clone(); -let tokens = skip_newlines(r.tokens.clone()); -let ctx = r.ctx.clone(); -match (*eat(&tokens, Rc::new(ExpectedToken::ExpectKeyword { - text: "else".to_string(), -}))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { + EatResult::EatConsumed { tokens: __ec, .. } => { let tokens = skip_newlines(__ec.clone()); -if tok_is_keyword(tokens.clone().first().cloned(), "if".to_string()) { + if tok_is_keyword(tokens.clone().first().cloned(), "if".to_string()) { { let r2 = parse_if(&tokens, &ctx); -if has_err(r2.err.clone()) { + if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: r2.expr.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), -}) + expr: r2.expr.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), + }); } -Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprIf), Rc::new(vec![condition, then_branch, r2.expr.clone()]), None, span), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: None, -}) -} + Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprIf), + Rc::new(vec![condition, then_branch, r2.expr.clone()]), + None, + span, + ), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: None, + }) + } } else { { let r2 = parse_block(&tokens, &ctx); -if has_err(r2.err.clone()) { + if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: r2.expr.clone(), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: r2.err.clone(), -}) + expr: r2.expr.clone(), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: r2.err.clone(), + }); } -Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprIf), Rc::new(vec![condition, then_branch, r2.expr.clone()]), None, span), - tokens: r2.tokens.clone(), - ctx: r2.ctx.clone(), - err: None, -}) -} + Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprIf), + Rc::new(vec![condition, then_branch, r2.expr.clone()]), + None, + span, + ), + tokens: r2.tokens.clone(), + ctx: r2.ctx.clone(), + err: None, + }) + } } -}, - EatResult::EatUnchanged { tokens: __eu, .. } => Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprIf), Rc::new(vec![condition, then_branch]), None, span), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}), -} -} + } + EatResult::EatUnchanged { tokens: __eu, .. } => Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprIf), + Rc::new(vec![condition, then_branch]), + None, + span, + ), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }), + } }) } pub fn parse_let(tokens: &Rc>>, ctx: &Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); -let dummy_expr = parse_recovery_placeholder(); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { - text: "let".to_string(), -})); -if has_err(r.err.clone()) { + let dummy_expr = parse_recovery_placeholder(); + let r = expect( + &tokens, + &Rc::new(ExpectedToken::ExpectKeyword { + text: "let".to_string(), + }), + ); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r = expect_name(&r.tokens.clone()); -if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r = expect_name(&r.tokens.clone()); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let name = r.name.clone(); -let name_span = r.span.clone(); -let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectEq)); -if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let name = r.name.clone(); + let name_span = r.span.clone(); + let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectEq)); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r = parse_expr(r.tokens.clone(), ctx.clone()); -if has_err(r.err.clone()) { - return r.clone() - } -Rc::new(ExprResult { - expr: make_named_expr_node(&name, Rc::new(ExprData::ExprLet), Rc::new(vec![r.expr.clone()]), None, span, name_span), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r = parse_expr(r.tokens.clone(), ctx.clone()); + if has_err(r.err.clone()) { + return r.clone(); + } + Rc::new(ExprResult { + expr: make_named_expr_node( + &name, + Rc::new(ExprData::ExprLet), + Rc::new(vec![r.expr.clone()]), + None, + span, + name_span, + ), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } pub fn parse_return(tokens: &Rc>>, ctx: &Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); -let dummy_expr = parse_recovery_placeholder(); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { - text: "return".to_string(), -})); -if has_err(r.err.clone()) { + let dummy_expr = parse_recovery_placeholder(); + let r = expect( + &tokens, + &Rc::new(ExpectedToken::ExpectKeyword { + text: "return".to_string(), + }), + ); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr, - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r = parse_expr(r.tokens.clone(), ctx.clone()); -if has_err(r.err.clone()) { - return r.clone() - } -Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprReturn), Rc::new(vec![r.expr.clone()]), None, span), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + expr: dummy_expr, + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r = parse_expr(r.tokens.clone(), ctx.clone()); + if has_err(r.err.clone()) { + return r.clone(); + } + Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprReturn), + Rc::new(vec![r.expr.clone()]), + None, + span, + ), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } pub fn parse_for(tokens: &Rc>>, ctx: &Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); -let dummy_expr = parse_recovery_placeholder(); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { - text: "for".to_string(), -})); -if has_err(r.err.clone()) { + let dummy_expr = parse_recovery_placeholder(); + let r = expect( + &tokens, + &Rc::new(ExpectedToken::ExpectKeyword { + text: "for".to_string(), + }), + ); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r = expect_name(&r.tokens.clone()); -if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r = expect_name(&r.tokens.clone()); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let var_name = r.name.clone(); -let var_name_span = r.span.clone(); -let r = expect(&r.tokens.clone(), &Rc::new(ExpectedToken::ExpectKeyword { - text: "in".to_string(), -})); -if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let var_name = r.name.clone(); + let var_name_span = r.span.clone(); + let r = expect( + &r.tokens.clone(), + &Rc::new(ExpectedToken::ExpectKeyword { + text: "in".to_string(), + }), + ); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r = parse_expr_no_brace(r.tokens.clone(), ctx.clone()); -if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r = parse_expr_no_brace(r.tokens.clone(), ctx.clone()); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let collection = r.expr.clone(); -let r = parse_block(&skip_newlines(r.tokens.clone()), &r.ctx.clone()); -if has_err(r.err.clone()) { + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let collection = r.expr.clone(); + let r = parse_block(&skip_newlines(r.tokens.clone()), &r.ctx.clone()); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let body = r.expr.clone(); -let for_expr = make_named_expr_node(&var_name, Rc::new(ExprData::ExprForEach), Rc::new(vec![collection, body]), None, span, var_name_span); -Rc::new(ExprResult { - expr: for_expr, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let body = r.expr.clone(); + let for_expr = make_named_expr_node( + &var_name, + Rc::new(ExprData::ExprForEach), + Rc::new(vec![collection, body]), + None, + span, + var_name_span, + ); + Rc::new(ExprResult { + expr: for_expr, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } -pub fn parse_record_literal(tokens: &Rc>>, ctx: &Rc, name: String, span: &Rc) -> Rc { +pub fn parse_record_literal( + tokens: &Rc>>, + ctx: &Rc, + name: String, + span: &Rc, +) -> Rc { { let dummy_expr = parse_recovery_placeholder(); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBrace)); -if has_err(r.err.clone()) { + let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBrace)); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let tokens = skip_newlines(r.tokens.clone()); -let r = parse_field_init_list(tokens.clone(), ctx.clone()); -if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let tokens = skip_newlines(r.tokens.clone()); + let r = parse_field_init_list(tokens.clone(), ctx.clone()); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let tokens = skip_newlines(r.tokens.clone()); -let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r2.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let tokens = skip_newlines(r.tokens.clone()); + let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); + if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), -}) - } -Rc::new(ExprResult { - expr: make_named_expr_node(&name, Rc::new(ExprData::ExprRecordLit { - parent_enum: None, -}), r.fields.clone(), None, span.clone(), span.clone()), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), + }); + } + Rc::new(ExprResult { + expr: make_named_expr_node( + &name, + Rc::new(ExprData::ExprRecordLit { parent_enum: None }), + r.fields.clone(), + None, + span.clone(), + span.clone(), + ), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } -pub fn parse_field_init_list(tokens: Rc>>, ctx: Rc) -> Rc { +pub fn parse_field_init_list( + tokens: Rc>>, + ctx: Rc, +) -> Rc { parse_field_init_list_acc(tokens, ctx, Rc::new(vec![])) } -pub fn parse_field_init_list_acc(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_field_init_list_acc( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -if (tok_is_rbrace(tokens.clone().first().cloned()) || tok_is_eof(tokens.clone().first().cloned())) { + if (tok_is_rbrace(tokens.clone().first().cloned()) + || tok_is_eof(tokens.clone().first().cloned())) + { break Rc::new(FieldInitsResult { - fields: acc, - tokens: tokens.clone(), - ctx: ctx, - err: None, -}); -} else { + fields: acc, + tokens: tokens.clone(), + ctx: ctx, + err: None, + }); + } else { let r = parse_field_init(&tokens, &ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(FieldInitsResult { - fields: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let e = eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); -tokens = skip_newlines(match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => r.tokens.clone(), -}); -{ + fields: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let e = eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); + tokens = skip_newlines(match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => r.tokens.clone(), + }); + { let __tco_0 = r.ctx.clone(); -let __tco_1 = v2_rt::rc_list_push(acc, r.field.clone()); -ctx = __tco_0; -acc = __tco_1; -continue; -} -} -} + let __tco_1 = v2_rt::rc_list_push(acc, r.field.clone()); + ctx = __tco_0; + acc = __tco_1; + continue; + } + } + } } -pub fn parse_field_init(tokens: &Rc>>, ctx: &Rc) -> Rc { +pub fn parse_field_init( + tokens: &Rc>>, + ctx: &Rc, +) -> Rc { { let zero_span = make_span(0, 0); -let span = token_span(tokens.clone().first().cloned()); -let dummy_fi = make_field_init_node(&"".to_string(), parse_recovery_placeholder(), zero_span.clone(), zero_span.clone()); -let tok = tokens.clone().first().cloned(); -if (tok_is_ident(tok.clone()) || tok_is_keyword_name(tok.clone())) { + let span = token_span(tokens.clone().first().cloned()); + let dummy_fi = make_field_init_node( + &"".to_string(), + parse_recovery_placeholder(), + zero_span.clone(), + zero_span.clone(), + ); + let tok = tokens.clone().first().cloned(); + if (tok_is_ident(tok.clone()) || tok_is_keyword_name(tok.clone())) { { let name_r = expect_name(&tokens); -if has_err(name_r.err.clone()) { + if has_err(name_r.err.clone()) { return Rc::new(FieldInitResult { - field: dummy_fi.clone(), - tokens: name_r.tokens.clone(), - ctx: ctx.clone(), - err: name_r.err.clone(), -}) + field: dummy_fi.clone(), + tokens: name_r.tokens.clone(), + ctx: ctx.clone(), + err: name_r.err.clone(), + }); } -let n = name_r.name.clone(); -if tok_is_colon(name_r.tokens.clone().first().cloned()) { + let n = name_r.name.clone(); + if tok_is_colon(name_r.tokens.clone().first().cloned()) { { - let r = parse_expr(Rc::new(name_r.tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx.clone()); -if has_err(r.err.clone()) { + let r = parse_expr( + Rc::new( + name_r + .tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx.clone(), + ); + if has_err(r.err.clone()) { return Rc::new(FieldInitResult { - field: dummy_fi.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + field: dummy_fi.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -let fi = make_field_init_node(&n, r.expr.clone(), span.clone(), name_r.span.clone()); -Rc::new(FieldInitResult { - field: fi, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + let fi = make_field_init_node( + &n, + r.expr.clone(), + span.clone(), + name_r.span.clone(), + ); + Rc::new(FieldInitResult { + field: fi, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } else { { - let fi = make_field_init_node(&n, make_named_expr_node(&n, Rc::new(ExprData::ExprVar { - binding_kind: None, -}), Rc::new(vec![]), None, span.clone(), name_r.span.clone()), span.clone(), name_r.span.clone()); -Rc::new(FieldInitResult { - field: fi, - tokens: name_r.tokens.clone(), - ctx: ctx.clone(), - err: None, -}) -} + let fi = make_field_init_node( + &n, + make_named_expr_node( + &n, + Rc::new(ExprData::ExprVar { binding_kind: None }), + Rc::new(vec![]), + None, + span.clone(), + name_r.span.clone(), + ), + span.clone(), + name_r.span.clone(), + ); + Rc::new(FieldInitResult { + field: fi, + tokens: name_r.tokens.clone(), + ctx: ctx.clone(), + err: None, + }) + } } -} + } } else { if (tok_is_lit_str(tok.clone()) && peek_is_colon_after_ident(tokens.clone())) { { let str_name = match tok.clone() { - Some(t) => t.text.clone(), - None => "_".to_string(), -}; -let r = parse_expr(Rc::new(tokens.clone().iter().cloned().skip(2 as usize).collect::>()), ctx.clone()); -if has_err(r.err.clone()) { + Some(t) => t.text.clone(), + None => "_".to_string(), + }; + let r = parse_expr( + Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(2 as usize) + .collect::>(), + ), + ctx.clone(), + ); + if has_err(r.err.clone()) { return Rc::new(FieldInitResult { - field: dummy_fi.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + field: dummy_fi.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -let fi = make_field_init_node(&str_name, r.expr.clone(), span.clone(), no_span()); -Rc::new(FieldInitResult { - field: fi, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + let fi = + make_field_init_node(&str_name, r.expr.clone(), span.clone(), no_span()); + Rc::new(FieldInitResult { + field: fi, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } else { { let r = parse_expr(tokens.clone(), ctx.clone()); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(FieldInitResult { - field: dummy_fi.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + field: dummy_fi.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -let fi = make_field_init_node(&"_".to_string(), r.expr.clone(), span.clone(), no_span()); -Rc::new(FieldInitResult { - field: fi, - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + let fi = make_field_init_node( + &"_".to_string(), + r.expr.clone(), + span.clone(), + no_span(), + ); + Rc::new(FieldInitResult { + field: fi, + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } } -} + } } pub fn parse_list_literal(tokens: &Rc>>, ctx: &Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); -let dummy_expr = parse_recovery_placeholder(); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBracket)); -if has_err(r.err.clone()) { + let dummy_expr = parse_recovery_placeholder(); + let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLBracket)); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) - } -let r = parse_expr_list_until(skip_newlines(r.tokens.clone()), ctx.clone(), Rc::new(ExpectedToken::ExpectRBracket)); -if has_err(r.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); + } + let r = parse_expr_list_until( + skip_newlines(r.tokens.clone()), + ctx.clone(), + Rc::new(ExpectedToken::ExpectRBracket), + ); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let r2 = expect(&skip_newlines(r.tokens.clone()), &Rc::new(ExpectedToken::ExpectRBracket)); -if has_err(r2.err.clone()) { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let r2 = expect( + &skip_newlines(r.tokens.clone()), + &Rc::new(ExpectedToken::ExpectRBracket), + ); + if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), -}) - } -Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprListLit), r.exprs.clone(), None, span), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), + }); + } + Rc::new(ExprResult { + expr: make_expr_node(Rc::new(ExprData::ExprListLit), r.exprs.clone(), None, span), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } -pub fn parse_expr_list_until(tokens: Rc>>, ctx: Rc, end_expected: Rc) -> Rc { +pub fn parse_expr_list_until( + tokens: Rc>>, + ctx: Rc, + end_expected: Rc, +) -> Rc { parse_expr_list_until_acc(tokens, ctx, end_expected, Rc::new(vec![])) } -pub fn parse_expr_list_until_acc(mut tokens: Rc>>, mut ctx: Rc, mut end_expected: Rc, mut acc: Rc>>) -> Rc { +pub fn parse_expr_list_until_acc( + mut tokens: Rc>>, + mut ctx: Rc, + mut end_expected: Rc, + mut acc: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -let at_end_tag = match tokens.clone().first().cloned() { - Some(t) => token_matches_expected(&t, end_expected.clone()), - None => false, -}; -if (at_end_tag || tok_is_eof(tokens.clone().first().cloned())) { + let at_end_tag = match tokens.clone().first().cloned() { + Some(t) => token_matches_expected(&t, end_expected.clone()), + None => false, + }; + if (at_end_tag || tok_is_eof(tokens.clone().first().cloned())) { break Rc::new(ExprsResult { - exprs: acc, - tokens: tokens.clone(), - ctx: ctx, - err: None, -}); -} else { + exprs: acc, + tokens: tokens.clone(), + ctx: ctx, + err: None, + }); + } else { let r = parse_expr(tokens.clone(), ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ExprsResult { - exprs: Rc::new(vec![]), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let e = eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); -tokens = skip_newlines(match (*e).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), - EatResult::EatUnchanged { .. } => r.tokens.clone(), -}); -{ + exprs: Rc::new(vec![]), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let e = eat(&r.tokens.clone(), Rc::new(ExpectedToken::ExpectComma)); + tokens = skip_newlines(match (*e).clone() { + EatResult::EatConsumed { tokens: __ec, .. } => __ec.clone(), + EatResult::EatUnchanged { .. } => r.tokens.clone(), + }); + { let __tco_0 = r.ctx.clone(); -let __tco_1 = v2_rt::rc_list_push(acc, r.expr.clone()); -ctx = __tco_0; -acc = __tco_1; -continue; -} -} -} + let __tco_1 = v2_rt::rc_list_push(acc, r.expr.clone()); + ctx = __tco_0; + acc = __tco_1; + continue; + } + } + } } pub fn parse_paren_expr(tokens: &Rc>>, ctx: &Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); -let dummy_expr = parse_recovery_placeholder(); -let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLParen)); -if has_err(r.err.clone()) { + let dummy_expr = parse_recovery_placeholder(); + let r = expect(&tokens, &Rc::new(ExpectedToken::ExpectLParen)); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: ctx.clone(), - err: r.err.clone(), -}) + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: ctx.clone(), + err: r.err.clone(), + }); } -let tokens = skip_newlines(r.tokens.clone()); -if tok_is_rparen(tokens.clone().first().cloned()) { + let tokens = skip_newlines(r.tokens.clone()); + if tok_is_rparen(tokens.clone().first().cloned()) { Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprRecordLit { - parent_enum: None, -}), Rc::new(vec![]), None, span), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - ctx: ctx.clone(), - err: None, -}) + expr: make_expr_node( + Rc::new(ExprData::ExprRecordLit { parent_enum: None }), + Rc::new(vec![]), + None, + span, + ), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx: ctx.clone(), + err: None, + }) } else { { let lambda_r = try_lambda_params(&tokens, &ctx); -if lambda_r.is_lambda.clone() { + if lambda_r.is_lambda.clone() { { let r = parse_lambda_body(&lambda_r.tokens.clone(), lambda_r.ctx.clone()); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprLambda), v2_rt::concat(Rc::new(vec![r.expr.clone()]), Rc::new({ let mut __result = Vec::new(); for p in lambda_r.params.clone().iter().cloned() { __result.push(parsed_name_leaf(p.name.clone(), p.span.clone())); } __result })), None, span), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprLambda), + v2_rt::concat( + Rc::new(vec![r.expr.clone()]), + Rc::new({ + let mut __result = Vec::new(); + for p in lambda_r.params.clone().iter().cloned() { + __result.push(parsed_name_leaf( + p.name.clone(), + p.span.clone(), + )); + } + __result + }), + ), + None, + span, + ), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } else { { let r = parse_expr(lambda_r.tokens.clone(), lambda_r.ctx.clone()); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + expr: r.expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -let tokens = skip_newlines(r.tokens.clone()); -let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRParen)); -if has_err(r2.err.clone()) { + let tokens = skip_newlines(r.tokens.clone()); + let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRParen)); + if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), -}) + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), + }); } -Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + Rc::new(ExprResult { + expr: r.expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } -} + } } -} + } } pub fn parse_fn_lambda(tokens: &Rc>>, ctx: &Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); -let dummy = parse_recovery_placeholder(); -let r1 = expect(&tokens, &Rc::new(ExpectedToken::ExpectKeyword { - text: "fn".to_string(), -})); -if has_err(r1.err.clone()) { + let dummy = parse_recovery_placeholder(); + let r1 = expect( + &tokens, + &Rc::new(ExpectedToken::ExpectKeyword { + text: "fn".to_string(), + }), + ); + if has_err(r1.err.clone()) { return Rc::new(ExprResult { - expr: dummy.clone(), - tokens: r1.tokens.clone(), - ctx: ctx.clone(), - err: r1.err.clone(), -}) - } -let r2 = expect(&r1.tokens.clone(), &Rc::new(ExpectedToken::ExpectLParen)); -if has_err(r2.err.clone()) { + expr: dummy.clone(), + tokens: r1.tokens.clone(), + ctx: ctx.clone(), + err: r1.err.clone(), + }); + } + let r2 = expect(&r1.tokens.clone(), &Rc::new(ExpectedToken::ExpectLParen)); + if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: dummy.clone(), - tokens: r2.tokens.clone(), - ctx: ctx.clone(), - err: r2.err.clone(), -}) - } -let params_r = collect_fn_lambda_params(r2.tokens.clone(), ctx.clone(), Rc::new(vec![])); -let r3 = expect(¶ms_r.tokens.clone(), &Rc::new(ExpectedToken::ExpectRParen)); -if has_err(r3.err.clone()) { + expr: dummy.clone(), + tokens: r2.tokens.clone(), + ctx: ctx.clone(), + err: r2.err.clone(), + }); + } + let params_r = collect_fn_lambda_params(r2.tokens.clone(), ctx.clone(), Rc::new(vec![])); + let r3 = expect( + ¶ms_r.tokens.clone(), + &Rc::new(ExpectedToken::ExpectRParen), + ); + if has_err(r3.err.clone()) { return Rc::new(ExprResult { - expr: dummy.clone(), - tokens: r3.tokens.clone(), - ctx: params_r.ctx.clone(), - err: r3.err.clone(), -}) - } -let tokens = skip_newlines(r3.tokens.clone()); -let body_r = parse_brace_expr(&tokens, params_r.ctx.clone()); -if has_err(body_r.err.clone()) { - return body_r.clone() - } -Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprLambda), v2_rt::concat(Rc::new(vec![body_r.expr.clone()]), Rc::new({ let mut __result = Vec::new(); for p in params_r.params.clone().iter().cloned() { __result.push(parsed_name_leaf(p.name.clone(), p.span.clone())); } __result })), None, span), - tokens: body_r.tokens.clone(), - ctx: body_r.ctx.clone(), - err: None, -}) -} + expr: dummy.clone(), + tokens: r3.tokens.clone(), + ctx: params_r.ctx.clone(), + err: r3.err.clone(), + }); + } + let tokens = skip_newlines(r3.tokens.clone()); + let body_r = parse_brace_expr(&tokens, params_r.ctx.clone()); + if has_err(body_r.err.clone()) { + return body_r.clone(); + } + Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprLambda), + v2_rt::concat( + Rc::new(vec![body_r.expr.clone()]), + Rc::new({ + let mut __result = Vec::new(); + for p in params_r.params.clone().iter().cloned() { + __result.push(parsed_name_leaf(p.name.clone(), p.span.clone())); + } + __result + }), + ), + None, + span, + ), + tokens: body_r.tokens.clone(), + ctx: body_r.ctx.clone(), + err: None, + }) + } } -pub fn collect_fn_lambda_params(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn collect_fn_lambda_params( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { tokens = skip_newlines(tokens.clone()); -if tok_is_rparen(tokens.clone().first().cloned()) { + if tok_is_rparen(tokens.clone().first().cloned()) { break Rc::new(IdentCollectResult { - success: true, - params: acc, - tokens: tokens.clone(), - ctx: ctx, - err: None, -}); -} else { + success: true, + params: acc, + tokens: tokens.clone(), + ctx: ctx, + err: None, + }); + } else { let name_r = expect_ident(&tokens); -if has_err(name_r.err.clone()) { + if has_err(name_r.err.clone()) { break Rc::new(IdentCollectResult { - success: false, - params: acc, - tokens: name_r.tokens.clone(), - ctx: ctx, - err: name_r.err.clone(), -}); -} else { + success: false, + params: acc, + tokens: name_r.tokens.clone(), + ctx: ctx, + err: name_r.err.clone(), + }); + } else { tokens = skip_newlines(name_r.tokens.clone()); -if tok_is_comma(tokens.clone().first().cloned()) { + if tok_is_comma(tokens.clone().first().cloned()) { { - let __tco_0 = Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); -let __tco_1 = v2_rt::rc_list_push(acc, Rc::new(ParserParam { - name: name_r.name.clone(), - span: name_r.span.clone(), -})); -tokens = __tco_0; -acc = __tco_1; -continue; -} -} else { + let __tco_0 = + Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); + let __tco_1 = v2_rt::rc_list_push( + acc, + Rc::new(ParserParam { + name: name_r.name.clone(), + span: name_r.span.clone(), + }), + ); + tokens = __tco_0; + acc = __tco_1; + continue; + } + } else { break Rc::new(IdentCollectResult { - success: true, - params: v2_rt::rc_list_push(acc, Rc::new(ParserParam { - name: name_r.name.clone(), - span: name_r.span.clone(), -})), - tokens: tokens.clone(), - ctx: ctx, - err: None, -}); -} -} -} -} + success: true, + params: v2_rt::rc_list_push( + acc, + Rc::new(ParserParam { + name: name_r.name.clone(), + span: name_r.span.clone(), + }), + ), + tokens: tokens.clone(), + ctx: ctx, + err: None, + }); + } + } + } + } } -pub fn try_lambda_params(tokens: &Rc>>, ctx: &Rc) -> Rc { +pub fn try_lambda_params( + tokens: &Rc>>, + ctx: &Rc, +) -> Rc { { let r = collect_lambda_idents(tokens.clone(), ctx.clone(), Rc::new(vec![])); -if (r.success.clone() && ((r.params.clone().len() as i64) >= 2)) { + if (r.success.clone() && ((r.params.clone().len() as i64) >= 2)) { if tok_is_rparen(r.tokens.clone().first().cloned()) { { - let after_rparen = Rc::new(r.tokens.clone().iter().cloned().skip(1 as usize).collect::>()); -if tok_is_fat_arrow(after_rparen.clone().first().cloned()) { + let after_rparen = Rc::new( + r.tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ); + if tok_is_fat_arrow(after_rparen.clone().first().cloned()) { Rc::new(LambdaCheckResult { - is_lambda: true, - params: r.params.clone(), - tokens: Rc::new(after_rparen.clone().iter().cloned().skip(1 as usize).collect::>()), - ctx: r.ctx.clone(), - err: None, -}) + is_lambda: true, + params: r.params.clone(), + tokens: Rc::new( + after_rparen + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx: r.ctx.clone(), + err: None, + }) } else { Rc::new(LambdaCheckResult { - is_lambda: false, - params: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) + is_lambda: false, + params: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) } -} + } } else { Rc::new(LambdaCheckResult { - is_lambda: false, - params: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) + is_lambda: false, + params: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) } } else { Rc::new(LambdaCheckResult { - is_lambda: false, - params: Rc::new(vec![]), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}) + is_lambda: false, + params: Rc::new(vec![]), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }) } -} + } } -pub fn collect_lambda_idents(mut tokens: Rc>>, mut ctx: Rc, mut acc: Rc>>) -> Rc { +pub fn collect_lambda_idents( + mut tokens: Rc>>, + mut ctx: Rc, + mut acc: Rc>>, +) -> Rc { loop { if tok_is_ident(tokens.clone().first().cloned()) { let tok = tokens.clone().first().cloned(); -let param = Rc::new(ParserParam { - name: tok.clone().unwrap().text.clone(), - span: tok.clone().unwrap().span.clone(), -}); -let new_acc = v2_rt::rc_list_push(acc, param); -match (*eat(&Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), Rc::new(ExpectedToken::ExpectComma))).clone() { - EatResult::EatConsumed { tokens: __ec, .. } => { { - let __tco_0 = __ec.clone(); -let __tco_1 = new_acc; -tokens = __tco_0; -acc = __tco_1; -continue; -} }, - EatResult::EatUnchanged { tokens: __eu, .. } => { break Rc::new(IdentCollectResult { - success: true, - params: new_acc, - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - ctx: ctx, - err: None, -}); }, -} -} else { + let param = Rc::new(ParserParam { + name: tok.clone().unwrap().text.clone(), + span: tok.clone().unwrap().span.clone(), + }); + let new_acc = v2_rt::rc_list_push(acc, param); + match (*eat( + &Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + Rc::new(ExpectedToken::ExpectComma), + )) + .clone() + { + EatResult::EatConsumed { tokens: __ec, .. } => { + let __tco_0 = __ec.clone(); + let __tco_1 = new_acc; + tokens = __tco_0; + acc = __tco_1; + continue; + } + EatResult::EatUnchanged { tokens: __eu, .. } => { + break Rc::new(IdentCollectResult { + success: true, + params: new_acc, + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx: ctx, + err: None, + }); + } + } + } else { break Rc::new(IdentCollectResult { - success: false, - params: acc, - tokens: tokens.clone(), - ctx: ctx, - err: None, -}); -} -} + success: false, + params: acc, + tokens: tokens.clone(), + ctx: ctx, + err: None, + }); + } + } } pub fn parse_string_interp(tokens: &Rc>>, ctx: Rc) -> Rc { { let tok = tokens.clone().first().cloned(); -let span = token_span(tok.clone()); -let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, -}; -match sh { - Some(TokenShape::ShStrBegin) => { - let prefix = tok.clone().unwrap().text.clone(); -let parts_init = if (v2_rt::string_length(&prefix) > 0) { - Rc::new(vec![Rc::new(StringPart::Text { - value: prefix.clone(), -})]) - } else { - Rc::new(vec![]) - }; -parse_interp_parts(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), ctx, parts_init, span.clone()) -}, - _ => Rc::new(ExprResult { - expr: parse_recovery_expr(span.clone(), "expected string interpolation".to_string()), - tokens: tokens.clone(), - ctx: ctx, - err: Some(parse_error("expected string interpolation".to_string(), span.clone())), -}), -} -} + let span = token_span(tok.clone()); + let sh = match tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, + }; + match sh { + Some(TokenShape::ShStrBegin) => { + let prefix = tok.clone().unwrap().text.clone(); + let parts_init = if (v2_rt::string_length(&prefix) > 0) { + Rc::new(vec![Rc::new(StringPart::Text { + value: prefix.clone(), + })]) + } else { + Rc::new(vec![]) + }; + parse_interp_parts( + Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx, + parts_init, + span.clone(), + ) + } + _ => Rc::new(ExprResult { + expr: parse_recovery_expr( + span.clone(), + "expected string interpolation".to_string(), + ), + tokens: tokens.clone(), + ctx: ctx, + err: Some(parse_error( + "expected string interpolation".to_string(), + span.clone(), + )), + }), + } + } } -pub fn parse_interp_parts(mut tokens: Rc>>, mut ctx: Rc, mut parts: Rc>>, mut span: Rc) -> Rc { +pub fn parse_interp_parts( + mut tokens: Rc>>, + mut ctx: Rc, + mut parts: Rc>>, + mut span: Rc, +) -> Rc { loop { let r = parse_expr(tokens.clone(), ctx.clone()); -if has_err(r.err.clone()) { - return r.clone() - } -let new_parts = v2_rt::rc_list_push(parts, Rc::new(StringPart::Interpolation { - expr: r.expr.clone(), -})); -tokens = r.tokens.clone(); -ctx = r.ctx.clone(); -let interp_tok = tokens.clone().first().cloned(); -let interp_sh = match interp_tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, -}; -match interp_sh { - Some(TokenShape::ShStrMid) => { let mid = interp_tok.clone().unwrap().text.clone(); -let mid_parts = if (v2_rt::string_length(&mid) > 0) { - v2_rt::rc_list_push(new_parts, Rc::new(StringPart::Text { - value: mid.clone(), -})) - } else { - new_parts - }; -{ - let __tco_0 = Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); -let __tco_1 = mid_parts; -tokens = __tco_0; -parts = __tco_1; -continue; -} }, - Some(TokenShape::ShStrEnd) => { let suffix = interp_tok.clone().unwrap().text.clone(); -let final_parts = if (v2_rt::string_length(&suffix) > 0) { - v2_rt::rc_list_push(new_parts, Rc::new(StringPart::Text { - value: suffix.clone(), -})) - } else { - new_parts + if has_err(r.err.clone()) { + return r.clone(); + } + let new_parts = v2_rt::rc_list_push( + parts, + Rc::new(StringPart::Interpolation { + expr: r.expr.clone(), + }), + ); + tokens = r.tokens.clone(); + ctx = r.ctx.clone(); + let interp_tok = tokens.clone().first().cloned(); + let interp_sh = match interp_tok.clone() { + Some(t) => Some(t.shape.clone()), + None => None, }; -break Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprStringInterp), Rc::new({ let mut __result = Vec::new(); for p in final_parts.iter().cloned() { __result.push(match (*p.clone()).clone() { - StringPart::Text { value: v, .. } => make_text_part_node(v.clone(), span.clone()), - StringPart::Interpolation { expr: e, .. } => make_interp_part_node(e.clone(), span.clone()), -}); } __result }), None, span.clone()), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - ctx: ctx.clone(), - err: None, -}); }, - _ => { break Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprStringInterp), Rc::new({ let mut __result = Vec::new(); for p in new_parts.iter().cloned() { __result.push(match (*p.clone()).clone() { - StringPart::Text { value: v, .. } => make_text_part_node(v.clone(), span.clone()), - StringPart::Interpolation { expr: e, .. } => make_interp_part_node(e.clone(), span.clone()), -}); } __result }), None, span.clone()), - tokens: tokens.clone(), - ctx: ctx.clone(), - err: None, -}); }, -} -} + match interp_sh { + Some(TokenShape::ShStrMid) => { + let mid = interp_tok.clone().unwrap().text.clone(); + let mid_parts = if (v2_rt::string_length(&mid) > 0) { + v2_rt::rc_list_push(new_parts, Rc::new(StringPart::Text { value: mid.clone() })) + } else { + new_parts + }; + { + let __tco_0 = + Rc::new(tokens.iter().cloned().skip(1 as usize).collect::>()); + let __tco_1 = mid_parts; + tokens = __tco_0; + parts = __tco_1; + continue; + } + } + Some(TokenShape::ShStrEnd) => { + let suffix = interp_tok.clone().unwrap().text.clone(); + let final_parts = if (v2_rt::string_length(&suffix) > 0) { + v2_rt::rc_list_push( + new_parts, + Rc::new(StringPart::Text { + value: suffix.clone(), + }), + ) + } else { + new_parts + }; + break Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprStringInterp), + Rc::new({ + let mut __result = Vec::new(); + for p in final_parts.iter().cloned() { + __result.push(match (*p.clone()).clone() { + StringPart::Text { value: v, .. } => { + make_text_part_node(v.clone(), span.clone()) + } + StringPart::Interpolation { expr: e, .. } => { + make_interp_part_node(e.clone(), span.clone()) + } + }); + } + __result + }), + None, + span.clone(), + ), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx: ctx.clone(), + err: None, + }); + } + _ => { + break Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprStringInterp), + Rc::new({ + let mut __result = Vec::new(); + for p in new_parts.iter().cloned() { + __result.push(match (*p.clone()).clone() { + StringPart::Text { value: v, .. } => { + make_text_part_node(v.clone(), span.clone()) + } + StringPart::Interpolation { expr: e, .. } => { + make_interp_part_node(e.clone(), span.clone()) + } + }); + } + __result + }), + None, + span.clone(), + ), + tokens: tokens.clone(), + ctx: ctx.clone(), + err: None, + }); + } + } + } } pub fn parse_brace_expr(tokens: &Rc>>, ctx: Rc) -> Rc { { let span = token_span(tokens.clone().first().cloned()); -let dummy_expr = parse_recovery_placeholder(); -let tokens = skip_newlines(Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>())); -let tok = tokens.clone().first().cloned(); -if tok_is_rbrace(tok.clone()) { + let dummy_expr = parse_recovery_placeholder(); + let tokens = skip_newlines(Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + )); + let tok = tokens.clone().first().cloned(); + if tok_is_rbrace(tok.clone()) { Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprRecordLit { - parent_enum: None, -}), Rc::new(vec![]), None, span), - tokens: Rc::new(tokens.clone().iter().cloned().skip(1 as usize).collect::>()), - ctx: ctx, - err: None, -}) + expr: make_expr_node( + Rc::new(ExprData::ExprRecordLit { parent_enum: None }), + Rc::new(vec![]), + None, + span, + ), + tokens: Rc::new( + tokens + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ), + ctx: ctx, + err: None, + }) } else { { let sh = match tok.clone() { - Some(t) => Some(t.shape.clone()), - None => None, -}; -match sh { - Some(TokenShape::ShKeyword) => { - let brace_kw = tok_keyword_text(tok.clone()); -if ((brace_kw.clone().as_str() == "let".to_string().as_str()) || (brace_kw.clone().as_str() == "return".to_string().as_str())) { + Some(t) => Some(t.shape.clone()), + None => None, + }; + match sh { + Some(TokenShape::ShKeyword) => { + let brace_kw = tok_keyword_text(tok.clone()); + if ((brace_kw.clone().as_str() == "let".to_string().as_str()) + || (brace_kw.clone().as_str() == "return".to_string().as_str())) { - let r = parse_stmts(tokens.clone(), ctx); -if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let tokens = skip_newlines(r.tokens.clone()); -let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r2.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), -}) - } -if ((r.stmts.clone().len() as i64) == 1) { - Rc::new(ExprResult { - expr: r.stmts.clone().first().cloned().clone().unwrap(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) - } else { - Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprBlock), r.stmts.clone(), None, span), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) - } -} - } else { - if (tok_is_keyword_name(tok.clone()) && peek_is_colon_after_ident(tokens.clone())) { { - let r = parse_field_init_list(tokens.clone(), ctx); -if has_err(r.err.clone()) { + let r = parse_stmts(tokens.clone(), ctx); + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -let tokens = skip_newlines(r.tokens.clone()); -let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r2.err.clone()) { + let tokens = skip_newlines(r.tokens.clone()); + let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); + if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), -}) + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), + }); } -Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprRecordLit { - parent_enum: None, -}), r.fields.clone(), None, span), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + if ((r.stmts.clone().len() as i64) == 1) { + Rc::new(ExprResult { + expr: r.stmts.clone().first().cloned().clone().unwrap(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } else { + Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprBlock), + r.stmts.clone(), + None, + span, + ), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } + } } else { + if (tok_is_keyword_name(tok.clone()) + && peek_is_colon_after_ident(tokens.clone())) { - let r = parse_expr(tokens.clone(), ctx); -if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + { + let r = parse_field_init_list(tokens.clone(), ctx); + if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let tokens = skip_newlines(r.tokens.clone()); + let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); + if has_err(r2.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), + }); + } + Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprRecordLit { parent_enum: None }), + r.fields.clone(), + None, + span, + ), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) } -let tokens = skip_newlines(r.tokens.clone()); -let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r2.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), -}) + } else { + { + let r = parse_expr(tokens.clone(), ctx); + if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let tokens = skip_newlines(r.tokens.clone()); + let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); + if has_err(r2.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), + }); + } + Rc::new(ExprResult { + expr: r.expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) } -Rc::new(ExprResult { - expr: r.expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + } } } -}, - _ => { - let ident_or_keyword = (tok_is_ident(tok.clone()) || tok_is_keyword_name(tok.clone())); -if (ident_or_keyword && peek_is_colon_after_ident(tokens.clone())) { - { - let r = parse_field_init_list(tokens.clone(), ctx); -if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let tokens = skip_newlines(r.tokens.clone()); -let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r2.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), -}) - } -Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprRecordLit { - parent_enum: None, -}), r.fields.clone(), None, span), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} - } else { - if (tok_is_lit_str(tok.clone()) && peek_is_colon_after_ident(tokens.clone())) { + _ => { + let ident_or_keyword = + (tok_is_ident(tok.clone()) || tok_is_keyword_name(tok.clone())); + if (ident_or_keyword && peek_is_colon_after_ident(tokens.clone())) { { let r = parse_field_init_list(tokens.clone(), ctx); -if has_err(r.err.clone()) { + if has_err(r.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); } -let tokens = skip_newlines(r.tokens.clone()); -let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r2.err.clone()) { + let tokens = skip_newlines(r.tokens.clone()); + let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); + if has_err(r2.err.clone()) { return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), -}) + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), + }); } -Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprRecordLit { - parent_enum: None, -}), r.fields.clone(), None, span), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) -} + Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprRecordLit { parent_enum: None }), + r.fields.clone(), + None, + span, + ), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } } else { + if (tok_is_lit_str(tok.clone()) + && peek_is_colon_after_ident(tokens.clone())) { - let r = parse_stmts(tokens.clone(), ctx); -if has_err(r.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r.tokens.clone(), - ctx: r.ctx.clone(), - err: r.err.clone(), -}) - } -let tokens = skip_newlines(r.tokens.clone()); -let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); -if has_err(r2.err.clone()) { - return Rc::new(ExprResult { - expr: dummy_expr.clone(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: r2.err.clone(), -}) - } -if ((r.stmts.clone().len() as i64) == 1) { - Rc::new(ExprResult { - expr: r.stmts.clone().first().cloned().clone().unwrap(), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) - } else { + { + let r = parse_field_init_list(tokens.clone(), ctx); + if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let tokens = skip_newlines(r.tokens.clone()); + let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); + if has_err(r2.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), + }); + } Rc::new(ExprResult { - expr: make_expr_node(Rc::new(ExprData::ExprBlock), r.stmts.clone(), None, span), - tokens: r2.tokens.clone(), - ctx: r.ctx.clone(), - err: None, -}) + expr: make_expr_node( + Rc::new(ExprData::ExprRecordLit { parent_enum: None }), + r.fields.clone(), + None, + span, + ), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) } -} + } else { + { + let r = parse_stmts(tokens.clone(), ctx); + if has_err(r.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r.tokens.clone(), + ctx: r.ctx.clone(), + err: r.err.clone(), + }); + } + let tokens = skip_newlines(r.tokens.clone()); + let r2 = expect(&tokens, &Rc::new(ExpectedToken::ExpectRBrace)); + if has_err(r2.err.clone()) { + return Rc::new(ExprResult { + expr: dummy_expr.clone(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: r2.err.clone(), + }); + } + if ((r.stmts.clone().len() as i64) == 1) { + Rc::new(ExprResult { + expr: r.stmts.clone().first().cloned().clone().unwrap(), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } else { + Rc::new(ExprResult { + expr: make_expr_node( + Rc::new(ExprData::ExprBlock), + r.stmts.clone(), + None, + span, + ), + tokens: r2.tokens.clone(), + ctx: r.ctx.clone(), + err: None, + }) + } + } + } } } -}, -} -} + } + } } -} + } } pub fn peek_is_colon_after_ident(tokens: Rc>>) -> bool { match tokens.get(1 as usize).cloned() { - Some(t) => is_colon_shape(t.shape.clone()), - None => false, -} + Some(t) => is_colon_shape(t.shape.clone()), + None => false, + } } diff --git a/src/v2/stage0/src/v2_compiler_resolve.rs b/src/v2/stage0/src/v2_compiler_resolve.rs index 6544945bd40..be03f94ffd6 100644 --- a/src/v2/stage0/src/v2_compiler_resolve.rs +++ b/src/v2/stage0/src/v2_compiler_resolve.rs @@ -1,15 +1,21 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.resolve -use std::collections::HashMap; -use std::rc::Rc; +pub use crate::std_types::kernel_type_set; use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::std_types::{kernel_type_set}; -pub use crate::v2_std_core::{Node, Connective, ErrorNode, make_error_node, no_span, module_node, import_node, import_is_all, import_specific_names_at, module_imports, module_items, NewlineIndex, authored_name_at, CompilerDiagnostic}; +use crate::v2_std_core::CompilerDiagnostic::{ + CircularDependency, DuplicateModule, MissingExport, UnresolvedImport, +}; use crate::v2_std_core::Connective::{Conj, Disj, NoConnective}; -use crate::v2_std_core::CompilerDiagnostic::{UnresolvedImport, MissingExport, DuplicateModule, CircularDependency}; +pub use crate::v2_std_core::{ + authored_name_at, import_is_all, import_node, import_specific_names_at, make_error_node, + module_imports, module_items, module_node, no_span, CompilerDiagnostic, Connective, ErrorNode, + NewlineIndex, Node, +}; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct ModuleGraph { @@ -46,56 +52,130 @@ pub struct ResolveAccum { pub fn map_has(m: Rc>, key: String) -> bool { match v2_rt::map_get(&m, key) { - Some(_) => true, - None => false, -} + Some(_) => true, + None => false, + } } -pub fn resolve_modules(modules: &Rc>>, source_indices: &Rc>>) -> Rc { +pub fn resolve_modules( + modules: &Rc>>, + source_indices: &Rc>>, +) -> Rc { { let dup_diags = check_duplicate_modules(modules.clone(), source_indices.clone()); -let module_index = modules.clone().iter().cloned().fold(v2_rt::rc_empty_map::>(), |acc: Rc>>, m: Rc| v2_rt::rc_map_insert(acc, authored_name_at(source_indices.clone(), &m), m.clone())); -let export_sets = modules.clone().iter().cloned().fold(v2_rt::rc_empty_map::>>(), |acc: Rc>>>, m: Rc| { - let exported = get_exported_names(&m, source_indices.clone()); -let exported_set = exported.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |inner_acc: Rc>, name: String| v2_rt::rc_map_insert(inner_acc, name.clone(), true)); -v2_rt::rc_map_insert(acc, authored_name_at(source_indices.clone(), &m), exported_set.clone()) -}); -let resolve_accum = modules.clone().iter().cloned().fold(Rc::new(ResolveAccum { - imports_by_name: v2_rt::rc_empty_map::>>>(), - diagnostics: Rc::new(vec![]), -}), |acc: Rc, m: Rc| { let acc = Rc::try_unwrap(acc).unwrap_or_else(|rc| (*rc).clone()); { - let result = resolve_module_imports(&m, module_index.clone(), export_sets.clone(), source_indices.clone()); -Rc::new(ResolveAccum { - imports_by_name: v2_rt::rc_map_insert(acc.imports_by_name, authored_name_at(source_indices.clone(), &m), result.resolved_imports.clone()), - diagnostics: v2_rt::concat(acc.diagnostics, result.diagnostics.clone()), -}) -} }); -let imports_by_name = resolve_accum.imports_by_name.clone(); -let import_diags = resolve_accum.diagnostics.clone(); -let topo_result = topological_sort(&modules, source_indices.clone()); -let topo_diags = match topo_result.cycle_error.clone() { - Some(diag) => Rc::new(vec![diag.clone()]), - None => Rc::new(vec![]), -}; -let sorted_names = topo_result.sorted.clone(); -let sorted_order_map = Rc::new(sorted_names.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, pair: (i64, String)| v2_rt::rc_map_insert(acc, pair.1.clone(), pair.0.clone())); -let acyclic_resolved = Rc::new({ let mut __result = Vec::new(); for m in modules.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&sorted_order_map, authored_name_at(source_indices.clone(), &m)) { - Some(order) => match v2_rt::map_get(&imports_by_name, authored_name_at(source_indices.clone(), &m)) { - Some(imps) => Rc::new(vec![Rc::new(ResolvedModule { - module: m.clone(), - resolved_imports: imps.clone(), - dep_order: order.clone(), -})]), - None => Rc::new(vec![]), -}, - None => Rc::new(vec![]), -}).iter().cloned()); } __result }); -let sorted_resolved = Rc::new({ let mut __sorted: Vec<_> = acyclic_resolved.iter().cloned().collect(); __sorted.sort_by(|a: &Rc, b: &Rc| { let __ka = (|m: Rc| m.dep_order.clone())(a.clone()); let __kb = (|m: Rc| m.dep_order.clone())(b.clone()); __ka.partial_cmp(&__kb).unwrap_or(std::cmp::Ordering::Equal) }); __sorted }); -Rc::new(ModuleGraph { - modules: sorted_resolved, - diagnostics: v2_rt::concat(v2_rt::concat(dup_diags, import_diags), topo_diags), -}) -} + let module_index = modules.clone().iter().cloned().fold( + v2_rt::rc_empty_map::>(), + |acc: Rc>>, m: Rc| { + v2_rt::rc_map_insert(acc, authored_name_at(source_indices.clone(), &m), m.clone()) + }, + ); + let export_sets = modules.clone().iter().cloned().fold( + v2_rt::rc_empty_map::>>(), + |acc: Rc>>>, m: Rc| { + let exported = get_exported_names(&m, source_indices.clone()); + let exported_set = exported.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |inner_acc: Rc>, name: String| { + v2_rt::rc_map_insert(inner_acc, name.clone(), true) + }, + ); + v2_rt::rc_map_insert( + acc, + authored_name_at(source_indices.clone(), &m), + exported_set.clone(), + ) + }, + ); + let resolve_accum = modules.clone().iter().cloned().fold( + Rc::new(ResolveAccum { + imports_by_name: v2_rt::rc_empty_map::>>>(), + diagnostics: Rc::new(vec![]), + }), + |acc: Rc, m: Rc| { + let acc = Rc::try_unwrap(acc).unwrap_or_else(|rc| (*rc).clone()); + { + let result = resolve_module_imports( + &m, + module_index.clone(), + export_sets.clone(), + source_indices.clone(), + ); + Rc::new(ResolveAccum { + imports_by_name: v2_rt::rc_map_insert( + acc.imports_by_name, + authored_name_at(source_indices.clone(), &m), + result.resolved_imports.clone(), + ), + diagnostics: v2_rt::concat(acc.diagnostics, result.diagnostics.clone()), + }) + } + }, + ); + let imports_by_name = resolve_accum.imports_by_name.clone(); + let import_diags = resolve_accum.diagnostics.clone(); + let topo_result = topological_sort(&modules, source_indices.clone()); + let topo_diags = match topo_result.cycle_error.clone() { + Some(diag) => Rc::new(vec![diag.clone()]), + None => Rc::new(vec![]), + }; + let sorted_names = topo_result.sorted.clone(); + let sorted_order_map = Rc::new( + sorted_names + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, pair: (i64, String)| { + v2_rt::rc_map_insert(acc, pair.1.clone(), pair.0.clone()) + }, + ); + let acyclic_resolved = Rc::new({ + let mut __result = Vec::new(); + for m in modules.clone().iter().cloned() { + __result.extend( + (*match v2_rt::map_get( + &sorted_order_map, + authored_name_at(source_indices.clone(), &m), + ) { + Some(order) => match v2_rt::map_get( + &imports_by_name, + authored_name_at(source_indices.clone(), &m), + ) { + Some(imps) => Rc::new(vec![Rc::new(ResolvedModule { + module: m.clone(), + resolved_imports: imps.clone(), + dep_order: order.clone(), + })]), + None => Rc::new(vec![]), + }, + None => Rc::new(vec![]), + }) + .iter() + .cloned(), + ); + } + __result + }); + let sorted_resolved = Rc::new({ + let mut __sorted: Vec<_> = acyclic_resolved.iter().cloned().collect(); + __sorted.sort_by(|a: &Rc, b: &Rc| { + let __ka = (|m: Rc| m.dep_order.clone())(a.clone()); + let __kb = (|m: Rc| m.dep_order.clone())(b.clone()); + __ka.partial_cmp(&__kb).unwrap_or(std::cmp::Ordering::Equal) + }); + __sorted + }); + Rc::new(ModuleGraph { + modules: sorted_resolved, + diagnostics: v2_rt::concat(v2_rt::concat(dup_diags, import_diags), topo_diags), + }) + } } pub fn find_module(module_index: Rc>>, path: String) -> Option> { @@ -108,16 +188,58 @@ pub struct ModuleResolveResult { pub diagnostics: Rc>>, } -pub fn resolve_module_imports(module: &Rc, module_index: Rc>>, export_sets: Rc>>>, source_indices: Rc>>) -> Rc { +pub fn resolve_module_imports( + module: &Rc, + module_index: Rc>>, + export_sets: Rc>>>, + source_indices: Rc>>, +) -> Rc { { - let results = Rc::new({ let mut __result = Vec::new(); for imp in module_imports(module.clone()).iter().cloned() { __result.push(resolve_import(&imp, module_index.clone(), &authored_name_at(source_indices.clone(), &module), export_sets.clone(), &source_indices)); } __result }); -let resolved = Rc::new({ let mut __result = Vec::new(); for r in Rc::new({ let mut __result = Vec::new(); for r in results.clone().iter().cloned() { if ((r.resolved.clone().target_module.clone() != None) && ((r.diagnostics.clone().len() as i64) == 0)) { __result.push(r); } } __result }).iter().cloned() { __result.push(r.resolved.clone()); } __result }); -let diags = Rc::new({ let mut __result = Vec::new(); for r in results.clone().iter().cloned() { __result.extend((*r.diagnostics.clone()).iter().cloned()); } __result }); -Rc::new(ModuleResolveResult { - resolved_imports: resolved, - diagnostics: diags, -}) -} + let results = Rc::new({ + let mut __result = Vec::new(); + for imp in module_imports(module.clone()).iter().cloned() { + __result.push(resolve_import( + &imp, + module_index.clone(), + &authored_name_at(source_indices.clone(), &module), + export_sets.clone(), + &source_indices, + )); + } + __result + }); + let resolved = Rc::new({ + let mut __result = Vec::new(); + for r in Rc::new({ + let mut __result = Vec::new(); + for r in results.clone().iter().cloned() { + if ((r.resolved.clone().target_module.clone() != None) + && ((r.diagnostics.clone().len() as i64) == 0)) + { + __result.push(r); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(r.resolved.clone()); + } + __result + }); + let diags = Rc::new({ + let mut __result = Vec::new(); + for r in results.clone().iter().cloned() { + __result.extend((*r.diagnostics.clone()).iter().cloned()); + } + __result + }); + Rc::new(ModuleResolveResult { + resolved_imports: resolved, + diagnostics: diags, + }) + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -126,82 +248,165 @@ pub struct ImportResolveResult { pub diagnostics: Rc>>, } -pub fn resolve_import(import: &Rc, module_index: Rc>>, importing_module: &String, export_sets: Rc>>>, source_indices: &Rc>>) -> Rc { +pub fn resolve_import( + import: &Rc, + module_index: Rc>>, + importing_module: &String, + export_sets: Rc>>>, + source_indices: &Rc>>, +) -> Rc { { let import_path = authored_name_at(source_indices.clone(), &import); -let target = find_module(module_index, import_path.clone()); -match target { - None => { - let diag = make_error_node(Rc::new(CompilerDiagnostic::UnresolvedImport { - module_path: import_path.clone(), - importing_module: importing_module.clone(), - span: import.span.clone(), -}), importing_module.clone()); -Rc::new(ImportResolveResult { - resolved: Rc::new(ResolvedImport { - module_path: import_path.clone(), - is_all: import_is_all(import.clone()), - specific_names: import_specific_names_at(import.clone(), source_indices.clone()), - target_module: None, -}), - diagnostics: Rc::new(vec![diag]), -}) -}, - Some(target_mod) => { - let exported_set = match v2_rt::map_get(&export_sets, import_path.clone()) { - Some(set) => set.clone(), - None => v2_rt::rc_empty_map::(), -}; -let name_diags = if import_is_all(import.clone()) { - Rc::new(vec![]) - } else { - Rc::new({ let mut __result = Vec::new(); for child in Rc::new({ let mut __result = Vec::new(); for child in import.children.clone().iter().cloned() { if (v2_rt::map_has(&exported_set, authored_name_at(source_indices.clone(), &child)) == false) { __result.push(child); } } __result }).iter().cloned() { __result.push(make_error_node(Rc::new(CompilerDiagnostic::MissingExport { - name: authored_name_at(source_indices.clone(), &child), - module_path: import_path.clone(), - importing_module: importing_module.clone(), - span: child.span.clone(), -}), importing_module.clone())); } __result }) - }; -Rc::new(ImportResolveResult { - resolved: Rc::new(ResolvedImport { - module_path: import_path.clone(), - is_all: import_is_all(import.clone()), - specific_names: import_specific_names_at(import.clone(), source_indices.clone()), - target_module: Some(target_mod.clone()), -}), - diagnostics: name_diags, -}) -}, -} -} + let target = find_module(module_index, import_path.clone()); + match target { + None => { + let diag = make_error_node( + Rc::new(CompilerDiagnostic::UnresolvedImport { + module_path: import_path.clone(), + importing_module: importing_module.clone(), + span: import.span.clone(), + }), + importing_module.clone(), + ); + Rc::new(ImportResolveResult { + resolved: Rc::new(ResolvedImport { + module_path: import_path.clone(), + is_all: import_is_all(import.clone()), + specific_names: import_specific_names_at( + import.clone(), + source_indices.clone(), + ), + target_module: None, + }), + diagnostics: Rc::new(vec![diag]), + }) + } + Some(target_mod) => { + let exported_set = match v2_rt::map_get(&export_sets, import_path.clone()) { + Some(set) => set.clone(), + None => v2_rt::rc_empty_map::(), + }; + let name_diags = if import_is_all(import.clone()) { + Rc::new(vec![]) + } else { + Rc::new({ + let mut __result = Vec::new(); + for child in Rc::new({ + let mut __result = Vec::new(); + for child in import.children.clone().iter().cloned() { + if (v2_rt::map_has( + &exported_set, + authored_name_at(source_indices.clone(), &child), + ) == false) + { + __result.push(child); + } + } + __result + }) + .iter() + .cloned() + { + __result.push(make_error_node( + Rc::new(CompilerDiagnostic::MissingExport { + name: authored_name_at(source_indices.clone(), &child), + module_path: import_path.clone(), + importing_module: importing_module.clone(), + span: child.span.clone(), + }), + importing_module.clone(), + )); + } + __result + }) + }; + Rc::new(ImportResolveResult { + resolved: Rc::new(ResolvedImport { + module_path: import_path.clone(), + is_all: import_is_all(import.clone()), + specific_names: import_specific_names_at( + import.clone(), + source_indices.clone(), + ), + target_module: Some(target_mod.clone()), + }), + diagnostics: name_diags, + }) + } + } + } } -pub fn get_exported_names(module: &Rc, source_indices: Rc>>) -> Rc> { +pub fn get_exported_names( + module: &Rc, + source_indices: Rc>>, +) -> Rc> { { - let item_names = Rc::new({ let mut __result = Vec::new(); for item in module_items(module.clone()).iter().cloned() { __result.push(get_item_name(item.clone(), source_indices.clone())); } __result }); -let variant_names = Rc::new({ let mut __result = Vec::new(); for item in module_items(module.clone()).iter().cloned() { __result.extend((*get_variant_names(&item, source_indices.clone())).iter().cloned()); } __result }); -let imported_names = Rc::new({ let mut __result = Vec::new(); for imp in module_imports(module.clone()).iter().cloned() { __result.extend((*if import_is_all(imp.clone()) { - Rc::new(vec![]) - } else { - import_specific_names_at(imp.clone(), source_indices.clone()) - }).iter().cloned()); } __result }); -v2_rt::concat(v2_rt::concat(v2_rt::concat(item_names, variant_names), imported_names), Rc::new(v2_rt::map_keys(&kernel_type_set()))) -} + let item_names = Rc::new({ + let mut __result = Vec::new(); + for item in module_items(module.clone()).iter().cloned() { + __result.push(get_item_name(item.clone(), source_indices.clone())); + } + __result + }); + let variant_names = Rc::new({ + let mut __result = Vec::new(); + for item in module_items(module.clone()).iter().cloned() { + __result.extend( + (*get_variant_names(&item, source_indices.clone())) + .iter() + .cloned(), + ); + } + __result + }); + let imported_names = Rc::new({ + let mut __result = Vec::new(); + for imp in module_imports(module.clone()).iter().cloned() { + __result.extend( + (*if import_is_all(imp.clone()) { + Rc::new(vec![]) + } else { + import_specific_names_at(imp.clone(), source_indices.clone()) + }) + .iter() + .cloned(), + ); + } + __result + }); + v2_rt::concat( + v2_rt::concat(v2_rt::concat(item_names, variant_names), imported_names), + Rc::new(v2_rt::map_keys(&kernel_type_set())), + ) + } } -pub fn get_item_name(item: Rc, source_indices: Rc>>) -> String { +pub fn get_item_name( + item: Rc, + source_indices: Rc>>, +) -> String { authored_name_at(source_indices, &item) } -pub fn get_variant_names(item: &Rc, source_indices: Rc>>) -> Rc> { +pub fn get_variant_names( + item: &Rc, + source_indices: Rc>>, +) -> Rc> { { let is_coproduct = (item.connective.clone() == Connective::Disj); -if is_coproduct { - Rc::new({ let mut __result = Vec::new(); for c in item.children.clone().iter().cloned() { __result.push(authored_name_at(source_indices.clone(), &c)); } __result }) + if is_coproduct { + Rc::new({ + let mut __result = Vec::new(); + for c in item.children.clone().iter().cloned() { + __result.push(authored_name_at(source_indices.clone(), &c)); + } + __result + }) } else { Rc::new(vec![]) } -} + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -210,31 +415,47 @@ pub struct DuplicateCheckState { pub diagnostics: Rc>>, } -pub fn check_duplicate_modules(modules: Rc>>, source_indices: Rc>>) -> Rc>> { +pub fn check_duplicate_modules( + modules: Rc>>, + source_indices: Rc>>, +) -> Rc>> { { - let result = modules.iter().cloned().fold(Rc::new(DuplicateCheckState { - seen_names: v2_rt::rc_empty_map::(), - diagnostics: Rc::new(vec![]), -}), |state: Rc, m: Rc| { - let m_name = authored_name_at(source_indices.clone(), &m); -let is_dup = v2_rt::map_has(&state.seen_names.clone(), m_name.clone()); -if is_dup.clone() { - Rc::new(DuplicateCheckState { - seen_names: state.seen_names.clone(), - diagnostics: v2_rt::concat(state.diagnostics.clone(), Rc::new(vec![make_error_node(Rc::new(CompilerDiagnostic::DuplicateModule { - name: m_name.clone(), - span: m.span.clone(), -}), m_name.clone())])), -}) - } else { - Rc::new(DuplicateCheckState { - seen_names: v2_rt::rc_map_insert(state.seen_names.clone(), m_name.clone(), true), - diagnostics: state.diagnostics.clone(), -}) - } -}); -result.diagnostics.clone() -} + let result = modules.iter().cloned().fold( + Rc::new(DuplicateCheckState { + seen_names: v2_rt::rc_empty_map::(), + diagnostics: Rc::new(vec![]), + }), + |state: Rc, m: Rc| { + let m_name = authored_name_at(source_indices.clone(), &m); + let is_dup = v2_rt::map_has(&state.seen_names.clone(), m_name.clone()); + if is_dup.clone() { + Rc::new(DuplicateCheckState { + seen_names: state.seen_names.clone(), + diagnostics: v2_rt::concat( + state.diagnostics.clone(), + Rc::new(vec![make_error_node( + Rc::new(CompilerDiagnostic::DuplicateModule { + name: m_name.clone(), + span: m.span.clone(), + }), + m_name.clone(), + )]), + ), + }) + } else { + Rc::new(DuplicateCheckState { + seen_names: v2_rt::rc_map_insert( + state.seen_names.clone(), + m_name.clone(), + true, + ), + diagnostics: state.diagnostics.clone(), + }) + } + }, + ); + result.diagnostics.clone() + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -243,14 +464,22 @@ pub struct TopoResult { pub cycle_error: Option>, } -pub fn adjacency_add_edge(adjacency: &Rc>>>, from_module: &String, to_module: String) -> Rc>>> { +pub fn adjacency_add_edge( + adjacency: &Rc>>>, + from_module: &String, + to_module: String, +) -> Rc>>> { { let existing = match v2_rt::map_get(&adjacency, from_module.clone()) { - Some(lst) => lst.clone(), - None => Rc::new(vec![]), -}; -v2_rt::rc_map_insert(adjacency.clone(), from_module.clone(), v2_rt::rc_list_push(existing, to_module)) -} + Some(lst) => lst.clone(), + None => Rc::new(vec![]), + }; + v2_rt::rc_map_insert( + adjacency.clone(), + from_module.clone(), + v2_rt::rc_list_push(existing, to_module), + ) + } } pub fn topo_sort_key(name: String) -> String { @@ -261,67 +490,201 @@ pub fn topo_sort_key(name: String) -> String { } } -pub fn topological_sort(modules: &Rc>>, source_indices: Rc>>) -> Rc { +pub fn topological_sort( + modules: &Rc>>, + source_indices: Rc>>, +) -> Rc { { - let module_names = Rc::new({ let mut __result = Vec::new(); for m in modules.clone().iter().cloned() { __result.push(authored_name_at(source_indices.clone(), &m)); } __result }); -let has_std_types = { let mut __found = false; for name in module_names.clone().iter().cloned() { if (name.clone().as_str() == "std.types".to_string().as_str()) { __found = true; break; } } __found }; -let explicit_edges = Rc::new({ let mut __result = Vec::new(); for m in modules.clone().iter().cloned() { __result.extend((*Rc::new({ let mut __result = Vec::new(); for imp in module_imports(m.clone()).iter().cloned() { __result.push(Rc::new(DepEdge { - from_module: authored_name_at(source_indices.clone(), &imp), - to_module: authored_name_at(source_indices.clone(), &m), -})); } __result })).iter().cloned()); } __result }); -let implicit_std_types_edges = if has_std_types.clone() { - Rc::new({ let mut __result = Vec::new(); for m in modules.clone().iter().cloned() { __result.extend((*{ - let m_name = authored_name_at(source_indices.clone(), &m); -let imports_std_types = { let mut __found = false; for imp in module_imports(m.clone()).iter().cloned() { if (authored_name_at(source_indices.clone(), &imp).as_str() == "std.types".to_string().as_str()) { __found = true; break; } } __found }; -if ((((m_name.clone().as_str() != "std.types".to_string().as_str()) && (m_name.clone().as_str() != "std.algebra".to_string().as_str())) && (m_name.clone().as_str() != "std.error_primitives".to_string().as_str())) && (imports_std_types.clone() == false)) { - Rc::new(vec![Rc::new(DepEdge { - from_module: "std.types".to_string(), - to_module: m_name.clone(), -})]) - } else { - Rc::new(vec![]) + let module_names = Rc::new({ + let mut __result = Vec::new(); + for m in modules.clone().iter().cloned() { + __result.push(authored_name_at(source_indices.clone(), &m)); + } + __result + }); + let has_std_types = { + let mut __found = false; + for name in module_names.clone().iter().cloned() { + if (name.clone().as_str() == "std.types".to_string().as_str()) { + __found = true; + break; + } + } + __found + }; + let explicit_edges = Rc::new({ + let mut __result = Vec::new(); + for m in modules.clone().iter().cloned() { + __result.extend( + (*Rc::new({ + let mut __result = Vec::new(); + for imp in module_imports(m.clone()).iter().cloned() { + __result.push(Rc::new(DepEdge { + from_module: authored_name_at(source_indices.clone(), &imp), + to_module: authored_name_at(source_indices.clone(), &m), + })); + } + __result + })) + .iter() + .cloned(), + ); + } + __result + }); + let implicit_std_types_edges = if has_std_types.clone() { + Rc::new({ + let mut __result = Vec::new(); + for m in modules.clone().iter().cloned() { + __result.extend( + (*{ + let m_name = authored_name_at(source_indices.clone(), &m); + let imports_std_types = { + let mut __found = false; + for imp in module_imports(m.clone()).iter().cloned() { + if (authored_name_at(source_indices.clone(), &imp).as_str() + == "std.types".to_string().as_str()) + { + __found = true; + break; + } + } + __found + }; + if ((((m_name.clone().as_str() != "std.types".to_string().as_str()) + && (m_name.clone().as_str() + != "std.algebra".to_string().as_str())) + && (m_name.clone().as_str() + != "std.error_primitives".to_string().as_str())) + && (imports_std_types.clone() == false)) + { + Rc::new(vec![Rc::new(DepEdge { + from_module: "std.types".to_string(), + to_module: m_name.clone(), + })]) + } else { + Rc::new(vec![]) + } + }) + .iter() + .cloned(), + ); } -}).iter().cloned()); } __result }) + __result + }) } else { Rc::new(vec![]) }; -let adjacency = v2_rt::concat(explicit_edges, implicit_std_types_edges).iter().cloned().fold(v2_rt::rc_empty_map::>>(), |acc: Rc>>>, edge: Rc| adjacency_add_edge(&acc, &edge.from_module.clone(), edge.to_module.clone())); -let in_degree_map = modules.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, m: Rc| { - let m_name = authored_name_at(source_indices.clone(), &m); -let imports_std_types = { let mut __found = false; for imp in module_imports(m.clone()).iter().cloned() { if (authored_name_at(source_indices.clone(), &imp).as_str() == "std.types".to_string().as_str()) { __found = true; break; } } __found }; -let implicit_std_types_in_degree = if ((((has_std_types.clone() && (m_name.clone().as_str() != "std.types".to_string().as_str())) && (m_name.clone().as_str() != "std.algebra".to_string().as_str())) && (m_name.clone().as_str() != "std.error_primitives".to_string().as_str())) && (imports_std_types.clone() == false)) { - 1 - } else { - 0 - }; -v2_rt::rc_map_insert(acc, m_name.clone(), ((module_imports(m.clone()).len() as i64) + implicit_std_types_in_degree.clone())) -}); -let initial_queue = Rc::new({ let mut __sorted: Vec<_> = Rc::new({ let mut __result = Vec::new(); for name in module_names.clone().iter().cloned() { if match v2_rt::map_get(&in_degree_map, name.clone()) { - Some(0) => true, - _ => false, -} { __result.push(name); } } __result }).iter().cloned().collect(); __sorted.sort_by(|a: &String, b: &String| { let __ka = (|name: String| topo_sort_key(name.clone()))(a.clone()); let __kb = (|name: String| topo_sort_key(name.clone()))(b.clone()); __ka.partial_cmp(&__kb).unwrap_or(std::cmp::Ordering::Equal) }); __sorted }); -let module_count = (modules.clone().len() as i64); -let result = kahn_drain(initial_queue, Rc::new(vec![]), in_degree_map.clone(), adjacency, module_count.clone()); -if ((result.sorted.clone().len() as i64) == module_count.clone()) { + let adjacency = v2_rt::concat(explicit_edges, implicit_std_types_edges) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::>>(), + |acc: Rc>>>, edge: Rc| { + adjacency_add_edge(&acc, &edge.from_module.clone(), edge.to_module.clone()) + }, + ); + let in_degree_map = modules.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, m: Rc| { + let m_name = authored_name_at(source_indices.clone(), &m); + let imports_std_types = { + let mut __found = false; + for imp in module_imports(m.clone()).iter().cloned() { + if (authored_name_at(source_indices.clone(), &imp).as_str() + == "std.types".to_string().as_str()) + { + __found = true; + break; + } + } + __found + }; + let implicit_std_types_in_degree = if ((((has_std_types.clone() + && (m_name.clone().as_str() != "std.types".to_string().as_str())) + && (m_name.clone().as_str() != "std.algebra".to_string().as_str())) + && (m_name.clone().as_str() != "std.error_primitives".to_string().as_str())) + && (imports_std_types.clone() == false)) + { + 1 + } else { + 0 + }; + v2_rt::rc_map_insert( + acc, + m_name.clone(), + ((module_imports(m.clone()).len() as i64) + + implicit_std_types_in_degree.clone()), + ) + }, + ); + let initial_queue = Rc::new({ + let mut __sorted: Vec<_> = Rc::new({ + let mut __result = Vec::new(); + for name in module_names.clone().iter().cloned() { + if match v2_rt::map_get(&in_degree_map, name.clone()) { + Some(0) => true, + _ => false, + } { + __result.push(name); + } + } + __result + }) + .iter() + .cloned() + .collect(); + __sorted.sort_by(|a: &String, b: &String| { + let __ka = (|name: String| topo_sort_key(name.clone()))(a.clone()); + let __kb = (|name: String| topo_sort_key(name.clone()))(b.clone()); + __ka.partial_cmp(&__kb).unwrap_or(std::cmp::Ordering::Equal) + }); + __sorted + }); + let module_count = (modules.clone().len() as i64); + let result = kahn_drain( + initial_queue, + Rc::new(vec![]), + in_degree_map.clone(), + adjacency, + module_count.clone(), + ); + if ((result.sorted.clone().len() as i64) == module_count.clone()) { Rc::new(TopoResult { - sorted: result.sorted.clone(), - cycle_error: None, -}) + sorted: result.sorted.clone(), + cycle_error: None, + }) } else { { - let sorted_set = result.sorted.clone().iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, name.clone(), true)); -let cycle_members = Rc::new({ let mut __result = Vec::new(); for name in module_names.clone().iter().cloned() { if (v2_rt::map_has(&sorted_set, name.clone()) == false) { __result.push(name); } } __result }); -let cycle_desc = cycle_members.clone().join(&" -> ".to_string()); -Rc::new(TopoResult { - sorted: result.sorted.clone(), - cycle_error: Some(make_error_node(Rc::new(CompilerDiagnostic::CircularDependency { - modules: cycle_members.clone(), - span: no_span(), -}), "".to_string())), -}) -} + let sorted_set = result.sorted.clone().iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, name: String| { + v2_rt::rc_map_insert(acc, name.clone(), true) + }, + ); + let cycle_members = Rc::new({ + let mut __result = Vec::new(); + for name in module_names.clone().iter().cloned() { + if (v2_rt::map_has(&sorted_set, name.clone()) == false) { + __result.push(name); + } + } + __result + }); + let cycle_desc = cycle_members.clone().join(&" -> ".to_string()); + Rc::new(TopoResult { + sorted: result.sorted.clone(), + cycle_error: Some(make_error_node( + Rc::new(CompilerDiagnostic::CircularDependency { + modules: cycle_members.clone(), + span: no_span(), + }), + "".to_string(), + )), + }) + } } -} + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -330,53 +693,112 @@ pub struct KahnDrainState { pub in_degree_map: Rc>, } -pub fn kahn_drain(mut queue: Rc>, mut sorted: Rc>, mut in_degree_map: Rc>, mut adjacency: Rc>>>, mut fuel: i64) -> Rc { +pub fn kahn_drain( + mut queue: Rc>, + mut sorted: Rc>, + mut in_degree_map: Rc>, + mut adjacency: Rc>>>, + mut fuel: i64, +) -> Rc { loop { if ((queue.clone().len() as i64) == 0) { return Rc::new(KahnDrainState { - sorted: sorted.clone(), - in_degree_map: in_degree_map.clone(), -}) + sorted: sorted.clone(), + in_degree_map: in_degree_map.clone(), + }); } -let batch_result = queue.clone().iter().cloned().fold(Rc::new(KahnDrainState { - sorted: sorted.clone(), - in_degree_map: in_degree_map.clone(), -}), |state: Rc, node: String| { let state = Rc::try_unwrap(state).unwrap_or_else(|rc| (*rc).clone()); { - let new_sorted = v2_rt::rc_list_push(state.sorted, node.clone()); -let neighbors = match v2_rt::map_get(&adjacency, node.clone()) { - Some(ns) => ns.clone(), - None => Rc::new(vec![]), -}; -let new_degrees = neighbors.clone().iter().cloned().fold(state.in_degree_map, |deg_map: Rc>, neighbor: String| { - let current = match v2_rt::map_get(°_map, neighbor.clone()) { - Some(d) => d.clone(), - None => 0, -}; -v2_rt::rc_map_insert(deg_map.clone(), neighbor.clone(), (current.clone() - 1)) -}); -Rc::new(KahnDrainState { - sorted: new_sorted.clone(), - in_degree_map: new_degrees.clone(), -}) -} }); -let new_zero_set = Rc::new({ let mut __result = Vec::new(); for neighbor in Rc::new({ let mut __result = Vec::new(); for node in queue.clone().iter().cloned() { __result.extend((*match v2_rt::map_get(&adjacency, node.clone()) { - Some(ns) => ns.clone(), - None => Rc::new(vec![]), -}).iter().cloned()); } __result }).iter().cloned() { if match v2_rt::map_get(&batch_result.in_degree_map.clone(), neighbor.clone()) { - Some(0) => true, - _ => false, -} { __result.push(neighbor); } } __result }).iter().cloned().fold(v2_rt::rc_empty_map::(), |acc: Rc>, name: String| v2_rt::rc_map_insert(acc, name.clone(), true)); -let new_zero = Rc::new({ let mut __sorted: Vec<_> = Rc::new(v2_rt::map_keys(&new_zero_set)).iter().cloned().collect(); __sorted.sort_by(|a: &String, b: &String| { let __ka = (|name: String| name.clone())(a.clone()); let __kb = (|name: String| name.clone())(b.clone()); __ka.partial_cmp(&__kb).unwrap_or(std::cmp::Ordering::Equal) }); __sorted }); -{ + let batch_result = queue.clone().iter().cloned().fold( + Rc::new(KahnDrainState { + sorted: sorted.clone(), + in_degree_map: in_degree_map.clone(), + }), + |state: Rc, node: String| { + let state = Rc::try_unwrap(state).unwrap_or_else(|rc| (*rc).clone()); + { + let new_sorted = v2_rt::rc_list_push(state.sorted, node.clone()); + let neighbors = match v2_rt::map_get(&adjacency, node.clone()) { + Some(ns) => ns.clone(), + None => Rc::new(vec![]), + }; + let new_degrees = neighbors.clone().iter().cloned().fold( + state.in_degree_map, + |deg_map: Rc>, neighbor: String| { + let current = match v2_rt::map_get(°_map, neighbor.clone()) { + Some(d) => d.clone(), + None => 0, + }; + v2_rt::rc_map_insert( + deg_map.clone(), + neighbor.clone(), + (current.clone() - 1), + ) + }, + ); + Rc::new(KahnDrainState { + sorted: new_sorted.clone(), + in_degree_map: new_degrees.clone(), + }) + } + }, + ); + let new_zero_set = Rc::new({ + let mut __result = Vec::new(); + for neighbor in Rc::new({ + let mut __result = Vec::new(); + for node in queue.clone().iter().cloned() { + __result.extend( + (*match v2_rt::map_get(&adjacency, node.clone()) { + Some(ns) => ns.clone(), + None => Rc::new(vec![]), + }) + .iter() + .cloned(), + ); + } + __result + }) + .iter() + .cloned() + { + if match v2_rt::map_get(&batch_result.in_degree_map.clone(), neighbor.clone()) { + Some(0) => true, + _ => false, + } { + __result.push(neighbor); + } + } + __result + }) + .iter() + .cloned() + .fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, name: String| { + v2_rt::rc_map_insert(acc, name.clone(), true) + }, + ); + let new_zero = Rc::new({ + let mut __sorted: Vec<_> = Rc::new(v2_rt::map_keys(&new_zero_set)) + .iter() + .cloned() + .collect(); + __sorted.sort_by(|a: &String, b: &String| { + let __ka = (|name: String| name.clone())(a.clone()); + let __kb = (|name: String| name.clone())(b.clone()); + __ka.partial_cmp(&__kb).unwrap_or(std::cmp::Ordering::Equal) + }); + __sorted + }); + { let __tco_0 = new_zero; -let __tco_1 = batch_result.sorted.clone(); -let __tco_2 = batch_result.in_degree_map.clone(); -let __tco_3 = (fuel - 1); -queue = __tco_0; -sorted = __tco_1; -in_degree_map = __tco_2; -fuel = __tco_3; -continue; -} -} + let __tco_1 = batch_result.sorted.clone(); + let __tco_2 = batch_result.in_degree_map.clone(); + let __tco_3 = (fuel - 1); + queue = __tco_0; + sorted = __tco_1; + in_degree_map = __tco_2; + fuel = __tco_3; + continue; + } + } } diff --git a/src/v2/stage0/src/v2_compiler_runtime_rust.rs b/src/v2/stage0/src/v2_compiler_runtime_rust.rs index a22f3550bd3..5c7fbc9d8fd 100644 --- a/src/v2/stage0/src/v2_compiler_runtime_rust.rs +++ b/src/v2/stage0/src/v2_compiler_runtime_rust.rs @@ -1,14 +1,26 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.runtime_rust -use std::collections::HashMap; -use std::rc::Rc; use crate::v2_rt; -use crate::NonEmptyVec; use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn rt_header() -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("//! Runtime shims for v2 compiler intrinsic operations.\n".to_string(), "//! Generated by the v2 compiler -- do not edit.\n\n".to_string()), "#![allow(unused_variables, dead_code)]\n\n".to_string()), "use std::collections::BTreeSet;\n".to_string()), "use std::collections::HashMap;\n".to_string()), "use std::rc::Rc;\n\n".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "//! Runtime shims for v2 compiler intrinsic operations.\n".to_string(), + "//! Generated by the v2 compiler -- do not edit.\n\n".to_string(), + ), + "#![allow(unused_variables, dead_code)]\n\n".to_string(), + ), + "use std::collections::HashMap;\n".to_string(), + ), + "use std::rc::Rc;\n\n".to_string(), + ) } pub fn rt_concat_trait() -> String { @@ -20,7 +32,7 @@ pub fn rt_string_ops() -> String { } pub fn rt_collection_ops() -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("pub fn lookup(table: &HashMap, key: String) -> Option {\n".to_string(), " table.get(&key).cloned()\n".to_string()), "}\n\n".to_string()), "pub fn index_by String>(list: Vec, key_fn: F) -> HashMap {\n".to_string()), " let mut map = HashMap::new();\n".to_string()), " for item in list { let key = key_fn(&item); map.insert(key, item); }\n".to_string()), " map\n".to_string()), "}\n\n".to_string()), "pub fn empty_map() -> HashMap { HashMap::new() }\n\n".to_string()), "pub fn map_insert(mut map: HashMap, key: K, value: V) -> HashMap {\n".to_string()), " map.insert(key, value); map\n".to_string()), "}\n\n".to_string()), "pub fn map_merge(mut base: HashMap, overlay: HashMap) -> HashMap {\n".to_string()), " base.extend(overlay); base\n".to_string()), "}\n\n".to_string()), "pub fn map_get(m: &HashMap, key: K) -> Option {\n".to_string()), " m.get(&key).cloned()\n".to_string()), "}\n\n".to_string()), "pub fn map_keys(m: &HashMap) -> Vec { m.keys().cloned().collect() }\n\n".to_string()), "pub fn map_values(m: &HashMap) -> Vec { m.values().cloned().collect() }\n\n".to_string()), "pub fn list_concat(mut a: Vec, b: Vec) -> Vec { a.extend(b); a }\n\n".to_string()), "pub fn list_push(mut list: Vec, item: T) -> Vec { list.push(item); list }\n\n".to_string()), "pub fn append(list: Rc>, item: T) -> Vec {\n".to_string()), " let mut v = (*list).clone();\n".to_string()), " v.push(item);\n".to_string()), " v\n".to_string()), "}\n\n".to_string()), "pub fn chars_to_string(chars: &Rc>, start: i64, end: i64) -> String {\n".to_string()), " let len = chars.len();\n".to_string()), " let start = (start.max(0) as usize).min(len);\n".to_string()), " let end = (end.max(0) as usize).min(len).max(start);\n".to_string()), " chars[start..end]\n".to_string()), " .iter()\n".to_string()), " .filter_map(|&cp| char::from_u32(cp as u32))\n".to_string()), " .collect()\n".to_string()), "}\n\n".to_string()), "pub fn parse_int(s: String) -> Option { s.parse::().ok() }\n\n".to_string()), "pub fn map_contains_key(m: &HashMap, key: K) -> bool {\n".to_string()), " m.contains_key(&key)\n".to_string()), "}\n\n".to_string()), "pub fn map_has(m: &HashMap, key: K) -> bool {\n".to_string()), " m.contains_key(&key)\n".to_string()), "}\n\n".to_string()), "pub fn rc_empty_set() -> Rc> {\n".to_string()), " Rc::new(BTreeSet::new())\n".to_string()), "}\n\n".to_string()), "pub fn rc_set_insert(mut s: Rc>, x: T) -> Rc> {\n".to_string()), " Rc::make_mut(&mut s).insert(x);\n".to_string()), " s\n".to_string()), "}\n\n".to_string()), "pub fn rc_set_union(a: Rc>, b: Rc>) -> Rc> {\n".to_string()), " let mut out = a;\n".to_string()), " for x in b.iter().cloned() {\n".to_string()), " Rc::make_mut(&mut out).insert(x);\n".to_string()), " }\n".to_string()), " out\n".to_string()), "}\n\n".to_string()), "pub fn set_contains(s: &BTreeSet, x: T) -> bool {\n".to_string()), " s.contains(&x)\n".to_string()), "}\n\n".to_string()), "pub fn reverse(list: Rc>) -> Rc> {\n".to_string()), " let mut v = (*list).clone(); v.reverse(); Rc::new(v)\n".to_string()), "}\n\n".to_string()), "pub fn replace(s: String, from: String, to: String) -> String {\n".to_string()), " s.replace(&from, &to)\n".to_string()), "}\n\n".to_string()) + v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("pub fn lookup(table: &HashMap, key: String) -> Option {\n".to_string(), " table.get(&key).cloned()\n".to_string()), "}\n\n".to_string()), "pub fn index_by String>(list: Vec, key_fn: F) -> HashMap {\n".to_string()), " let mut map = HashMap::new();\n".to_string()), " for item in list { let key = key_fn(&item); map.insert(key, item); }\n".to_string()), " map\n".to_string()), "}\n\n".to_string()), "pub fn empty_map() -> HashMap { HashMap::new() }\n\n".to_string()), "pub fn map_insert(mut map: HashMap, key: K, value: V) -> HashMap {\n".to_string()), " map.insert(key, value); map\n".to_string()), "}\n\n".to_string()), "pub fn map_merge(mut base: HashMap, overlay: HashMap) -> HashMap {\n".to_string()), " base.extend(overlay); base\n".to_string()), "}\n\n".to_string()), "pub fn map_get(m: &HashMap, key: K) -> Option {\n".to_string()), " m.get(&key).cloned()\n".to_string()), "}\n\n".to_string()), "pub fn map_keys(m: &HashMap) -> Vec { m.keys().cloned().collect() }\n\n".to_string()), "pub fn map_values(m: &HashMap) -> Vec { m.values().cloned().collect() }\n\n".to_string()), "pub fn list_concat(mut a: Vec, b: Vec) -> Vec { a.extend(b); a }\n\n".to_string()), "pub fn list_push(mut list: Vec, item: T) -> Vec { list.push(item); list }\n\n".to_string()), "pub fn append(list: Rc>, item: T) -> Vec {\n".to_string()), " let mut v = (*list).clone();\n".to_string()), " v.push(item);\n".to_string()), " v\n".to_string()), "}\n\n".to_string()), "pub fn chars_to_string(chars: &Rc>, start: i64, end: i64) -> String {\n".to_string()), " let len = chars.len();\n".to_string()), " let start = (start.max(0) as usize).min(len);\n".to_string()), " let end = (end.max(0) as usize).min(len).max(start);\n".to_string()), " chars[start..end]\n".to_string()), " .iter()\n".to_string()), " .filter_map(|&cp| char::from_u32(cp as u32))\n".to_string()), " .collect()\n".to_string()), "}\n\n".to_string()), "pub fn parse_int(s: String) -> Option { s.parse::().ok() }\n\n".to_string()), "pub fn map_contains_key(m: &HashMap, key: K) -> bool {\n".to_string()), " m.contains_key(&key)\n".to_string()), "}\n\n".to_string()), "pub fn map_has(m: &HashMap, key: K) -> bool {\n".to_string()), " m.contains_key(&key)\n".to_string()), "}\n\n".to_string()), "pub fn reverse(list: Rc>) -> Rc> {\n".to_string()), " let mut v = (*list).clone(); v.reverse(); Rc::new(v)\n".to_string()), "}\n\n".to_string()), "pub fn replace(s: String, from: String, to: String) -> String {\n".to_string()), " s.replace(&from, &to)\n".to_string()), "}\n\n".to_string()) } pub fn rt_scanner_ops() -> String { @@ -28,7 +40,23 @@ pub fn rt_scanner_ops() -> String { } pub fn rt_unicode_ops() -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("pub fn code_point(c: String) -> i64 {\n".to_string(), " c.chars().next().map(|ch| ch as i64).unwrap_or(0)\n".to_string()), "}\n\n".to_string()), "pub fn from_code_point(cp: i64) -> String {\n".to_string()), " char::from_u32(cp as u32).map(|c| c.to_string()).unwrap_or_default()\n".to_string()), "}\n\n".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "pub fn code_point(c: String) -> i64 {\n".to_string(), + " c.chars().next().map(|ch| ch as i64).unwrap_or(0)\n".to_string(), + ), + "}\n\n".to_string(), + ), + "pub fn from_code_point(cp: i64) -> String {\n".to_string(), + ), + " char::from_u32(cp as u32).map(|c| c.to_string()).unwrap_or_default()\n" + .to_string(), + ), + "}\n\n".to_string(), + ) } pub fn rt_rc_container_ops() -> String { @@ -36,9 +64,53 @@ pub fn rt_rc_container_ops() -> String { } pub fn rt_filesystem() -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("#[derive(Debug, Clone)]\n".to_string(), "pub struct FilesystemReadResult {\n".to_string()), " pub content: String,\n".to_string()), "}\n\n".to_string()), "pub fn filesystem_read(path: String) -> FilesystemReadResult {\n".to_string()), " let content = std::fs::read_to_string(&path)\n".to_string()), " .unwrap_or_else(|e| panic!(\"failed to read {}: {}\", path, e));\n".to_string()), " FilesystemReadResult { content }\n".to_string()), "}\n".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + "#[derive(Debug, Clone)]\n".to_string(), + "pub struct FilesystemReadResult {\n".to_string(), + ), + " pub content: String,\n".to_string(), + ), + "}\n\n".to_string(), + ), + "pub fn filesystem_read(path: String) -> FilesystemReadResult {\n" + .to_string(), + ), + " let content = std::fs::read_to_string(&path)\n".to_string(), + ), + " .unwrap_or_else(|e| panic!(\"failed to read {}: {}\", path, e));\n" + .to_string(), + ), + " FilesystemReadResult { content }\n".to_string(), + ), + "}\n".to_string(), + ) } pub fn rust_runtime_source() -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(rt_header(), rt_concat_trait()), rt_string_ops()), rt_collection_ops()), rt_rc_container_ops()), rt_scanner_ops()), rt_unicode_ops()), rt_filesystem()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(rt_header(), rt_concat_trait()), + rt_string_ops(), + ), + rt_collection_ops(), + ), + rt_rc_container_ops(), + ), + rt_scanner_ops(), + ), + rt_unicode_ops(), + ), + rt_filesystem(), + ) } diff --git a/src/v2/stage0/src/v2_compiler_tokenize.rs b/src/v2/stage0/src/v2_compiler_tokenize.rs index 74bb7d656f5..843451120d1 100644 --- a/src/v2/stage0/src/v2_compiler_tokenize.rs +++ b/src/v2/stage0/src/v2_compiler_tokenize.rs @@ -1,22 +1,28 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.tokenize -use std::collections::HashMap; -use std::rc::Rc; +use self::StringScanResult::*; +pub use crate::extdeps_languages_dag_syntax::dag_keyword_set; +pub use crate::std_types::SourceSpan; use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::std_types::{SourceSpan}; +use crate::v2_std_core::TokenShape::{ + ShAnd, ShArrow, ShBang, ShColon, ShComma, ShDot, ShDotDot, ShEof, ShEq, ShEqEq, ShFatArrow, + ShGe, ShGt, ShIdent, ShKeyword, ShLBrace, ShLBracket, ShLParen, ShLe, ShLitFloat, ShLitInt, + ShLitStr, ShLt, ShMinus, ShNe, ShNewline, ShNullCoalesce, ShOr, ShPercent, ShPipe, ShPipeArrow, + ShPlus, ShQuestion, ShRBrace, ShRBracket, ShRParen, ShSlash, ShStar, ShStrBegin, ShStrEnd, + ShStrMid, ShUnknown, +}; pub use crate::v2_std_core::{make_file_span, Token, TokenShape}; -use crate::v2_std_core::TokenShape::{ShKeyword, ShLBrace, ShRBrace, ShLParen, ShRParen, ShLBracket, ShRBracket, ShLt, ShGt, ShLe, ShGe, ShFatArrow, ShArrow, ShColon, ShComma, ShDot, ShDotDot, ShEq, ShEqEq, ShNe, ShPlus, ShMinus, ShStar, ShSlash, ShPercent, ShBang, ShAnd, ShOr, ShQuestion, ShNullCoalesce, ShPipe, ShPipeArrow, ShLitStr, ShLitInt, ShLitFloat, ShIdent, ShStrBegin, ShStrMid, ShStrEnd, ShNewline, ShEof, ShUnknown}; -pub use crate::extdeps_languages_dag_syntax::{dag_keyword_set}; -use self::StringScanResult::*; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; pub fn is_keyword_text(text: String) -> bool { match v2_rt::lookup(&dag_keyword_set(), text) { - Some(_) => true, - None => false, -} + Some(_) => true, + None => false, + } } pub fn single_punct() -> Rc> { @@ -69,10 +75,10 @@ pub struct SourceRef { pub fn make_token(text: String, span: Rc, shape: TokenShape) -> Rc { Rc::new(Token { - text: text, - span: span, - shape: shape, -}) + text: text, + span: span, + shape: shape, + }) } pub fn source_char(source: Rc, pos: i64) -> String { @@ -87,316 +93,520 @@ pub fn source_substring(source: Rc, start: i64, end: i64) -> String { v2_rt::chars_to_string(&source.source_chars.clone(), start, end) } -pub fn source_scan_while(mut source: Rc, mut start: i64, mut pred: impl Fn(String) -> bool + Clone) -> i64 { +pub fn source_scan_while( + mut source: Rc, + mut start: i64, + mut pred: impl Fn(String) -> bool + Clone, +) -> i64 { loop { if (start.clone() >= source_len(source.clone())) { break source_len(source.clone()); -} else { - if pred(v2_rt::from_code_point(source.source_chars.clone()[(start.clone()) as usize].clone())) { + } else { + if pred(v2_rt::from_code_point( + source.source_chars.clone()[(start.clone()) as usize].clone(), + )) { { let __tco_0 = (start + 1); -start = __tco_0; -continue; -} -} else { + start = __tco_0; + continue; + } + } else { break start.clone(); -} -} -} + } + } + } } pub fn source_skip_ws(mut source: Rc, mut start: i64) -> i64 { loop { if (start.clone() >= source_len(source.clone())) { break start.clone(); -} else { + } else { let ch = source.source_chars.clone()[(start.clone()) as usize].clone(); -if ((ch.clone() == v2_rt::code_point(" ".to_string())) || (ch.clone() == v2_rt::code_point("\t".to_string()))) { + if ((ch.clone() == v2_rt::code_point(" ".to_string())) + || (ch.clone() == v2_rt::code_point("\t".to_string()))) + { { let __tco_0 = (start + 1); -start = __tco_0; -continue; -} -} else { + start = __tco_0; + continue; + } + } else { break start.clone(); -} -} -} + } + } + } } pub fn source_scan_to_eol(mut source: Rc, mut start: i64) -> i64 { loop { if (start.clone() >= source_len(source.clone())) { break source_len(source.clone()); -} else { - if (source.source_chars.clone()[(start.clone()) as usize].clone() == v2_rt::code_point("\n".to_string())) { + } else { + if (source.source_chars.clone()[(start.clone()) as usize].clone() + == v2_rt::code_point("\n".to_string())) + { break start.clone(); -} else { + } else { { let __tco_0 = (start + 1); -start = __tco_0; -continue; -} -} -} -} + start = __tco_0; + continue; + } + } + } + } } pub fn tokenize(source: &String, file: String) -> Rc>> { { let c = Rc::new(source.clone().chars().map(|c| c as i64).collect::>()); -let src = Rc::new(SourceRef { - file: file, - text: source.clone(), - source_chars: c, -}); -let initial = Rc::new(TokPos { - pos: 0, - interp_depth: Rc::new(vec![]), -}); -let final_state = tokenize_loop(src.clone(), Rc::new(vec![]), initial, (source_len(src.clone()) + 1)); -let eof_span = make_file_span(src.file.clone(), final_state.pos.clone(), final_state.pos.clone()); -v2_rt::rc_list_push(final_state.tokens.clone(), make_token("".to_string(), eof_span, TokenShape::ShEof)) -} + let src = Rc::new(SourceRef { + file: file, + text: source.clone(), + source_chars: c, + }); + let initial = Rc::new(TokPos { + pos: 0, + interp_depth: Rc::new(vec![]), + }); + let final_state = tokenize_loop( + src.clone(), + Rc::new(vec![]), + initial, + (source_len(src.clone()) + 1), + ); + let eof_span = make_file_span( + src.file.clone(), + final_state.pos.clone(), + final_state.pos.clone(), + ); + v2_rt::rc_list_push( + final_state.tokens.clone(), + make_token("".to_string(), eof_span, TokenShape::ShEof), + ) + } } pub fn scan_next_token(source: &Rc, pos: &Rc) -> Rc { { let ch = source_char(source.clone(), pos.pos.clone()); -if (ch.clone().as_str() == "\n".to_string().as_str()) { + if (ch.clone().as_str() == "\n".to_string().as_str()) { return Rc::new(ScanResult { - pos: (pos.pos.clone() + 1), - token: make_token("\n".to_string(), make_file_span(source.file.clone(), pos.pos.clone(), (pos.pos.clone() + 1)), TokenShape::ShNewline), - interp_depth: pos.interp_depth.clone(), -}) + pos: (pos.pos.clone() + 1), + token: make_token( + "\n".to_string(), + make_file_span(source.file.clone(), pos.pos.clone(), (pos.pos.clone() + 1)), + TokenShape::ShNewline, + ), + interp_depth: pos.interp_depth.clone(), + }); } -if ((ch.clone().as_str() == "}".to_string().as_str()) && ((pos.interp_depth.clone().len() as i64) > 0)) { + if ((ch.clone().as_str() == "}".to_string().as_str()) + && ((pos.interp_depth.clone().len() as i64) > 0)) + { { let top = pos.interp_depth.clone().last().cloned().clone().unwrap(); -if (top.clone() == 0) { + if (top.clone() == 0) { { let popped = drop_last(&pos.interp_depth.clone()); -let cont_pos = Rc::new(TokPos { - pos: (pos.pos.clone() + 1), - interp_depth: popped, -}); -return scan_str_cont(&source, &cont_pos, pos.pos.clone()) -} + let cont_pos = Rc::new(TokPos { + pos: (pos.pos.clone() + 1), + interp_depth: popped, + }); + return scan_str_cont(&source, &cont_pos, pos.pos.clone()); + } } else { return Rc::new(ScanResult { - pos: (pos.pos.clone() + 1), - token: make_token("}".to_string(), make_file_span(source.file.clone(), pos.pos.clone(), (pos.pos.clone() + 1)), TokenShape::ShRBrace), - interp_depth: replace_last(pos.interp_depth.clone(), (top.clone() - 1)), -}) + pos: (pos.pos.clone() + 1), + token: make_token( + "}".to_string(), + make_file_span( + source.file.clone(), + pos.pos.clone(), + (pos.pos.clone() + 1), + ), + TokenShape::ShRBrace, + ), + interp_depth: replace_last(pos.interp_depth.clone(), (top.clone() - 1)), + }); } -} + } } -scan_token(&source, &pos, &ch) -} + scan_token(&source, &pos, &ch) + } } -pub fn tokenize_loop(mut source: Rc, mut tokens: Rc>>, mut pos: Rc, mut fuel: i64) -> Rc { +pub fn tokenize_loop( + mut source: Rc, + mut tokens: Rc>>, + mut pos: Rc, + mut fuel: i64, +) -> Rc { loop { let s = skip_spaces_and_comments(source.clone(), pos, fuel.clone()); -if (s.pos.clone() >= source_len(source.clone())) { + if (s.pos.clone() >= source_len(source.clone())) { return Rc::new(TokenizerState { - pos: s.pos.clone(), - tokens: tokens.clone(), - interp_depth: s.interp_depth.clone(), -}) + pos: s.pos.clone(), + tokens: tokens.clone(), + interp_depth: s.interp_depth.clone(), + }); } -let result = scan_next_token(&source, &s); -{ + let result = scan_next_token(&source, &s); + { let __tco_0 = v2_rt::rc_list_push(tokens, result.token.clone()); -let __tco_1 = Rc::new(TokPos { - pos: result.pos.clone(), - interp_depth: result.interp_depth.clone(), -}); -let __tco_2 = (fuel - 1); -tokens = __tco_0; -pos = __tco_1; -fuel = __tco_2; -continue; -} -} + let __tco_1 = Rc::new(TokPos { + pos: result.pos.clone(), + interp_depth: result.interp_depth.clone(), + }); + let __tco_2 = (fuel - 1); + tokens = __tco_0; + pos = __tco_1; + fuel = __tco_2; + continue; + } + } } pub fn scan_token(source: &Rc, pos: &Rc, ch: &String) -> Rc { { if (ch.clone().as_str() == "\"".to_string().as_str()) { - return scan_string(&source, &pos) + return scan_string(&source, &pos); } -if is_digit(ch.clone()) { - return scan_number(&source, &pos) + if is_digit(ch.clone()) { + return scan_number(&source, &pos); } -if is_ident_start(&ch) { - return scan_ident(&source, &pos) + if is_ident_start(&ch) { + return scan_ident(&source, &pos); } -let next_ch = if ((pos.pos.clone() + 1) < source_len(source.clone())) { + let next_ch = if ((pos.pos.clone() + 1) < source_len(source.clone())) { source_char(source.clone(), (pos.pos.clone() + 1)) } else { "".to_string() }; -if ((ch.clone().as_str() == "=".to_string().as_str()) && (next_ch.clone().as_str() == ">".to_string().as_str())) { - return emit(&pos, TokenShape::ShFatArrow, "=>".to_string(), 2, source.file.clone()) + if ((ch.clone().as_str() == "=".to_string().as_str()) + && (next_ch.clone().as_str() == ">".to_string().as_str())) + { + return emit( + &pos, + TokenShape::ShFatArrow, + "=>".to_string(), + 2, + source.file.clone(), + ); } -if ((ch.clone().as_str() == "-".to_string().as_str()) && (next_ch.clone().as_str() == ">".to_string().as_str())) { - return emit(&pos, TokenShape::ShArrow, "->".to_string(), 2, source.file.clone()) + if ((ch.clone().as_str() == "-".to_string().as_str()) + && (next_ch.clone().as_str() == ">".to_string().as_str())) + { + return emit( + &pos, + TokenShape::ShArrow, + "->".to_string(), + 2, + source.file.clone(), + ); } -if ((ch.clone().as_str() == "=".to_string().as_str()) && (next_ch.clone().as_str() == "=".to_string().as_str())) { - return emit(&pos, TokenShape::ShEqEq, "==".to_string(), 2, source.file.clone()) + if ((ch.clone().as_str() == "=".to_string().as_str()) + && (next_ch.clone().as_str() == "=".to_string().as_str())) + { + return emit( + &pos, + TokenShape::ShEqEq, + "==".to_string(), + 2, + source.file.clone(), + ); } -if ((ch.clone().as_str() == "!".to_string().as_str()) && (next_ch.clone().as_str() == "=".to_string().as_str())) { - return emit(&pos, TokenShape::ShNe, "!=".to_string(), 2, source.file.clone()) + if ((ch.clone().as_str() == "!".to_string().as_str()) + && (next_ch.clone().as_str() == "=".to_string().as_str())) + { + return emit( + &pos, + TokenShape::ShNe, + "!=".to_string(), + 2, + source.file.clone(), + ); } -if ((ch.clone().as_str() == "<".to_string().as_str()) && (next_ch.clone().as_str() == "=".to_string().as_str())) { - return emit(&pos, TokenShape::ShLe, "<=".to_string(), 2, source.file.clone()) + if ((ch.clone().as_str() == "<".to_string().as_str()) + && (next_ch.clone().as_str() == "=".to_string().as_str())) + { + return emit( + &pos, + TokenShape::ShLe, + "<=".to_string(), + 2, + source.file.clone(), + ); } -if ((ch.clone().as_str() == ">".to_string().as_str()) && (next_ch.clone().as_str() == "=".to_string().as_str())) { - return emit(&pos, TokenShape::ShGe, ">=".to_string(), 2, source.file.clone()) + if ((ch.clone().as_str() == ">".to_string().as_str()) + && (next_ch.clone().as_str() == "=".to_string().as_str())) + { + return emit( + &pos, + TokenShape::ShGe, + ">=".to_string(), + 2, + source.file.clone(), + ); } -if ((ch.clone().as_str() == "&".to_string().as_str()) && (next_ch.clone().as_str() == "&".to_string().as_str())) { - return emit(&pos, TokenShape::ShAnd, "&&".to_string(), 2, source.file.clone()) + if ((ch.clone().as_str() == "&".to_string().as_str()) + && (next_ch.clone().as_str() == "&".to_string().as_str())) + { + return emit( + &pos, + TokenShape::ShAnd, + "&&".to_string(), + 2, + source.file.clone(), + ); } -if ((ch.clone().as_str() == "|".to_string().as_str()) && (next_ch.clone().as_str() == "|".to_string().as_str())) { - return emit(&pos, TokenShape::ShOr, "||".to_string(), 2, source.file.clone()) + if ((ch.clone().as_str() == "|".to_string().as_str()) + && (next_ch.clone().as_str() == "|".to_string().as_str())) + { + return emit( + &pos, + TokenShape::ShOr, + "||".to_string(), + 2, + source.file.clone(), + ); } -if ((ch.clone().as_str() == "|".to_string().as_str()) && (next_ch.clone().as_str() == ">".to_string().as_str())) { - return emit(&pos, TokenShape::ShPipeArrow, "|>".to_string(), 2, source.file.clone()) + if ((ch.clone().as_str() == "|".to_string().as_str()) + && (next_ch.clone().as_str() == ">".to_string().as_str())) + { + return emit( + &pos, + TokenShape::ShPipeArrow, + "|>".to_string(), + 2, + source.file.clone(), + ); } -if (ch.clone().as_str() == "|".to_string().as_str()) { - return emit(&pos, TokenShape::ShPipe, "|".to_string(), 1, source.file.clone()) + if (ch.clone().as_str() == "|".to_string().as_str()) { + return emit( + &pos, + TokenShape::ShPipe, + "|".to_string(), + 1, + source.file.clone(), + ); } -if ((ch.clone().as_str() == "?".to_string().as_str()) && (next_ch.clone().as_str() == "?".to_string().as_str())) { - return emit(&pos, TokenShape::ShNullCoalesce, "??".to_string(), 2, source.file.clone()) + if ((ch.clone().as_str() == "?".to_string().as_str()) + && (next_ch.clone().as_str() == "?".to_string().as_str())) + { + return emit( + &pos, + TokenShape::ShNullCoalesce, + "??".to_string(), + 2, + source.file.clone(), + ); } -if ((ch.clone().as_str() == ".".to_string().as_str()) && (next_ch.clone().as_str() == ".".to_string().as_str())) { - return emit(&pos, TokenShape::ShDotDot, "..".to_string(), 2, source.file.clone()) + if ((ch.clone().as_str() == ".".to_string().as_str()) + && (next_ch.clone().as_str() == ".".to_string().as_str())) + { + return emit( + &pos, + TokenShape::ShDotDot, + "..".to_string(), + 2, + source.file.clone(), + ); } -if (ch.clone().as_str() == "=".to_string().as_str()) { - return emit(&pos, TokenShape::ShEq, "=".to_string(), 1, source.file.clone()) + if (ch.clone().as_str() == "=".to_string().as_str()) { + return emit( + &pos, + TokenShape::ShEq, + "=".to_string(), + 1, + source.file.clone(), + ); } -if (ch.clone().as_str() == "<".to_string().as_str()) { - return emit(&pos, TokenShape::ShLt, "<".to_string(), 1, source.file.clone()) + if (ch.clone().as_str() == "<".to_string().as_str()) { + return emit( + &pos, + TokenShape::ShLt, + "<".to_string(), + 1, + source.file.clone(), + ); } -if (ch.clone().as_str() == ">".to_string().as_str()) { - return emit(&pos, TokenShape::ShGt, ">".to_string(), 1, source.file.clone()) + if (ch.clone().as_str() == ">".to_string().as_str()) { + return emit( + &pos, + TokenShape::ShGt, + ">".to_string(), + 1, + source.file.clone(), + ); } -if (ch.clone().as_str() == "-".to_string().as_str()) { - return emit(&pos, TokenShape::ShMinus, "-".to_string(), 1, source.file.clone()) + if (ch.clone().as_str() == "-".to_string().as_str()) { + return emit( + &pos, + TokenShape::ShMinus, + "-".to_string(), + 1, + source.file.clone(), + ); } -if (ch.clone().as_str() == "!".to_string().as_str()) { - return emit(&pos, TokenShape::ShBang, "!".to_string(), 1, source.file.clone()) + if (ch.clone().as_str() == "!".to_string().as_str()) { + return emit( + &pos, + TokenShape::ShBang, + "!".to_string(), + 1, + source.file.clone(), + ); } -if (ch.clone().as_str() == "?".to_string().as_str()) { - return emit(&pos, TokenShape::ShQuestion, "?".to_string(), 1, source.file.clone()) + if (ch.clone().as_str() == "?".to_string().as_str()) { + return emit( + &pos, + TokenShape::ShQuestion, + "?".to_string(), + 1, + source.file.clone(), + ); } -if (ch.clone().as_str() == "{".to_string().as_str()) { + if (ch.clone().as_str() == "{".to_string().as_str()) { { let new_depth = if ((pos.interp_depth.clone().len() as i64) > 0) { - replace_last(pos.interp_depth.clone(), (pos.interp_depth.clone().last().cloned().clone().unwrap() + 1)) + replace_last( + pos.interp_depth.clone(), + (pos.interp_depth.clone().last().cloned().clone().unwrap() + 1), + ) } else { pos.interp_depth.clone() }; -let tok = make_token("{".to_string(), make_file_span(source.file.clone(), pos.pos.clone(), (pos.pos.clone() + 1)), TokenShape::ShLBrace); -return Rc::new(ScanResult { - pos: (pos.pos.clone() + 1), - token: tok.clone(), - interp_depth: new_depth, -}) -} + let tok = make_token( + "{".to_string(), + make_file_span(source.file.clone(), pos.pos.clone(), (pos.pos.clone() + 1)), + TokenShape::ShLBrace, + ); + return Rc::new(ScanResult { + pos: (pos.pos.clone() + 1), + token: tok.clone(), + interp_depth: new_depth, + }); + } } -if (ch.clone().as_str() == "}".to_string().as_str()) { + if (ch.clone().as_str() == "}".to_string().as_str()) { { - let tok = make_token("}".to_string(), make_file_span(source.file.clone(), pos.pos.clone(), (pos.pos.clone() + 1)), TokenShape::ShRBrace); -return Rc::new(ScanResult { - pos: (pos.pos.clone() + 1), - token: tok.clone(), - interp_depth: pos.interp_depth.clone(), -}) -} + let tok = make_token( + "}".to_string(), + make_file_span(source.file.clone(), pos.pos.clone(), (pos.pos.clone() + 1)), + TokenShape::ShRBrace, + ); + return Rc::new(ScanResult { + pos: (pos.pos.clone() + 1), + token: tok.clone(), + interp_depth: pos.interp_depth.clone(), + }); + } } -match v2_rt::lookup(&single_punct(), ch.clone()) { - Some(sh) => emit(&pos, sh.clone(), ch.clone(), 1, source.file.clone()), - None => emit(&pos, TokenShape::ShUnknown, ch.clone(), 1, source.file.clone()), -} -} + match v2_rt::lookup(&single_punct(), ch.clone()) { + Some(sh) => emit(&pos, sh.clone(), ch.clone(), 1, source.file.clone()), + None => emit( + &pos, + TokenShape::ShUnknown, + ch.clone(), + 1, + source.file.clone(), + ), + } + } } -pub fn emit(pos: &Rc, shape: TokenShape, text: String, len: i64, file: String) -> Rc { +pub fn emit( + pos: &Rc, + shape: TokenShape, + text: String, + len: i64, + file: String, +) -> Rc { { - let token = make_token(text, make_file_span(file, pos.pos.clone(), (pos.pos.clone() + len.clone())), shape); -Rc::new(ScanResult { - pos: (pos.pos.clone() + len.clone()), - token: token, - interp_depth: pos.interp_depth.clone(), -}) -} + let token = make_token( + text, + make_file_span(file, pos.pos.clone(), (pos.pos.clone() + len.clone())), + shape, + ); + Rc::new(ScanResult { + pos: (pos.pos.clone() + len.clone()), + token: token, + interp_depth: pos.interp_depth.clone(), + }) + } } pub fn scan_ident(source: &Rc, pos: &Rc) -> Rc { { let end = source_scan_while(source.clone(), pos.pos.clone(), is_ident_char); -let text = source_substring(source.clone(), pos.pos.clone(), end.clone()); -let shape = if is_keyword_text(text.clone()) { + let text = source_substring(source.clone(), pos.pos.clone(), end.clone()); + let shape = if is_keyword_text(text.clone()) { TokenShape::ShKeyword } else { TokenShape::ShIdent }; -let token = make_token(text.clone(), make_file_span(source.file.clone(), pos.pos.clone(), end.clone()), shape); -Rc::new(ScanResult { - pos: end.clone(), - token: token, - interp_depth: pos.interp_depth.clone(), -}) -} + let token = make_token( + text.clone(), + make_file_span(source.file.clone(), pos.pos.clone(), end.clone()), + shape, + ); + Rc::new(ScanResult { + pos: end.clone(), + token: token, + interp_depth: pos.interp_depth.clone(), + }) + } } pub fn scan_number(source: &Rc, pos: &Rc) -> Rc { { let int_end = source_scan_while(source.clone(), pos.pos.clone(), is_digit); -if ((((int_end.clone() + 1) < source_len(source.clone())) && (source_char(source.clone(), int_end.clone()).as_str() == ".".to_string().as_str())) && is_digit(source_char(source.clone(), (int_end.clone() + 1)))) { + if ((((int_end.clone() + 1) < source_len(source.clone())) + && (source_char(source.clone(), int_end.clone()).as_str() == ".".to_string().as_str())) + && is_digit(source_char(source.clone(), (int_end.clone() + 1)))) + { { let frac_end = source_scan_while(source.clone(), (int_end.clone() + 1), is_digit); -let text = source_substring(source.clone(), pos.pos.clone(), frac_end.clone()); -let token = make_token(text.clone(), make_file_span(source.file.clone(), pos.pos.clone(), frac_end.clone()), TokenShape::ShLitFloat); -return Rc::new(ScanResult { - pos: frac_end.clone(), - token: token.clone(), - interp_depth: pos.interp_depth.clone(), -}) -} - } -let text = source_substring(source.clone(), pos.pos.clone(), int_end.clone()); -let parsed = v2_rt::parse_int(text.clone()); -let shape = match parsed { - Some(_) => TokenShape::ShLitInt, - None => TokenShape::ShUnknown, -}; -let token = make_token(text.clone(), make_file_span(source.file.clone(), pos.pos.clone(), int_end.clone()), shape); -Rc::new(ScanResult { - pos: int_end.clone(), - token: token.clone(), - interp_depth: pos.interp_depth.clone(), -}) -} + let text = source_substring(source.clone(), pos.pos.clone(), frac_end.clone()); + let token = make_token( + text.clone(), + make_file_span(source.file.clone(), pos.pos.clone(), frac_end.clone()), + TokenShape::ShLitFloat, + ); + return Rc::new(ScanResult { + pos: frac_end.clone(), + token: token.clone(), + interp_depth: pos.interp_depth.clone(), + }); + } + } + let text = source_substring(source.clone(), pos.pos.clone(), int_end.clone()); + let parsed = v2_rt::parse_int(text.clone()); + let shape = match parsed { + Some(_) => TokenShape::ShLitInt, + None => TokenShape::ShUnknown, + }; + let token = make_token( + text.clone(), + make_file_span(source.file.clone(), pos.pos.clone(), int_end.clone()), + shape, + ); + Rc::new(ScanResult { + pos: int_end.clone(), + token: token.clone(), + interp_depth: pos.interp_depth.clone(), + }) + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum StringScanResult { - ClosedString { - content: String, - end_pos: i64, - }, - InterpolationStart { - content: String, - end_pos: i64, - }, - UnterminatedString { - content: String, - end_pos: i64, - }, + ClosedString { content: String, end_pos: i64 }, + InterpolationStart { content: String, end_pos: i64 }, + UnterminatedString { content: String, end_pos: i64 }, } impl StringScanResult { pub fn content(&self) -> String { @@ -418,135 +628,179 @@ impl StringScanResult { pub fn scan_string(source: &Rc, pos: &Rc) -> Rc { { let span_start = pos.pos.clone(); -let body_start = (pos.pos.clone() + 1); -let result = scan_string_body(source.clone(), body_start, Rc::new(vec![])); -match (*result).clone() { - StringScanResult::ClosedString { content, end_pos, .. } => { - let processed = process_escapes(content.clone()); -let token = make_token(processed, make_file_span(source.file.clone(), span_start, (end_pos.clone() + 1)), TokenShape::ShLitStr); -Rc::new(ScanResult { - pos: (end_pos.clone() + 1), - token: token, - interp_depth: pos.interp_depth.clone(), -}) -}, - StringScanResult::InterpolationStart { content, end_pos, .. } => { - let processed = process_escapes(content.clone()); -let token = make_token(processed, make_file_span(source.file.clone(), span_start, (end_pos.clone() + 1)), TokenShape::ShStrBegin); -Rc::new(ScanResult { - pos: (end_pos.clone() + 1), - token: token, - interp_depth: Rc::new(v2_rt::append(pos.interp_depth.clone(), 0)), -}) -}, - StringScanResult::UnterminatedString { content, end_pos, .. } => { - let processed = process_escapes(content.clone()); -let token = make_token(processed, make_file_span(source.file.clone(), span_start, end_pos.clone()), TokenShape::ShUnknown); -Rc::new(ScanResult { - pos: end_pos.clone(), - token: token, - interp_depth: pos.interp_depth.clone(), -}) -}, -} -} + let body_start = (pos.pos.clone() + 1); + let result = scan_string_body(source.clone(), body_start, Rc::new(vec![])); + match (*result).clone() { + StringScanResult::ClosedString { + content, end_pos, .. + } => { + let processed = process_escapes(content.clone()); + let token = make_token( + processed, + make_file_span(source.file.clone(), span_start, (end_pos.clone() + 1)), + TokenShape::ShLitStr, + ); + Rc::new(ScanResult { + pos: (end_pos.clone() + 1), + token: token, + interp_depth: pos.interp_depth.clone(), + }) + } + StringScanResult::InterpolationStart { + content, end_pos, .. + } => { + let processed = process_escapes(content.clone()); + let token = make_token( + processed, + make_file_span(source.file.clone(), span_start, (end_pos.clone() + 1)), + TokenShape::ShStrBegin, + ); + Rc::new(ScanResult { + pos: (end_pos.clone() + 1), + token: token, + interp_depth: Rc::new(v2_rt::append(pos.interp_depth.clone(), 0)), + }) + } + StringScanResult::UnterminatedString { + content, end_pos, .. + } => { + let processed = process_escapes(content.clone()); + let token = make_token( + processed, + make_file_span(source.file.clone(), span_start, end_pos.clone()), + TokenShape::ShUnknown, + ); + Rc::new(ScanResult { + pos: end_pos.clone(), + token: token, + interp_depth: pos.interp_depth.clone(), + }) + } + } + } } pub fn scan_str_cont(source: &Rc, pos: &Rc, span_start: i64) -> Rc { { let result = scan_string_body(source.clone(), pos.pos.clone(), Rc::new(vec![])); -match (*result).clone() { - StringScanResult::ClosedString { content, end_pos, .. } => { - let processed = process_escapes(content.clone()); -let token = make_token(processed, make_file_span(source.file.clone(), span_start, (end_pos.clone() + 1)), TokenShape::ShStrEnd); -Rc::new(ScanResult { - pos: (end_pos.clone() + 1), - token: token, - interp_depth: pos.interp_depth.clone(), -}) -}, - StringScanResult::InterpolationStart { content, end_pos, .. } => { - let processed = process_escapes(content.clone()); -let token = make_token(processed, make_file_span(source.file.clone(), span_start, (end_pos.clone() + 1)), TokenShape::ShStrMid); -Rc::new(ScanResult { - pos: (end_pos.clone() + 1), - token: token, - interp_depth: Rc::new(v2_rt::append(pos.interp_depth.clone(), 0)), -}) -}, - StringScanResult::UnterminatedString { content, end_pos, .. } => { - let processed = process_escapes(content.clone()); -let token = make_token(processed, make_file_span(source.file.clone(), span_start, end_pos.clone()), TokenShape::ShUnknown); -Rc::new(ScanResult { - pos: end_pos.clone(), - token: token, - interp_depth: pos.interp_depth.clone(), -}) -}, -} -} -} - -pub fn scan_string_body(mut source: Rc, mut pos: i64, mut acc: Rc>) -> Rc { + match (*result).clone() { + StringScanResult::ClosedString { + content, end_pos, .. + } => { + let processed = process_escapes(content.clone()); + let token = make_token( + processed, + make_file_span(source.file.clone(), span_start, (end_pos.clone() + 1)), + TokenShape::ShStrEnd, + ); + Rc::new(ScanResult { + pos: (end_pos.clone() + 1), + token: token, + interp_depth: pos.interp_depth.clone(), + }) + } + StringScanResult::InterpolationStart { + content, end_pos, .. + } => { + let processed = process_escapes(content.clone()); + let token = make_token( + processed, + make_file_span(source.file.clone(), span_start, (end_pos.clone() + 1)), + TokenShape::ShStrMid, + ); + Rc::new(ScanResult { + pos: (end_pos.clone() + 1), + token: token, + interp_depth: Rc::new(v2_rt::append(pos.interp_depth.clone(), 0)), + }) + } + StringScanResult::UnterminatedString { + content, end_pos, .. + } => { + let processed = process_escapes(content.clone()); + let token = make_token( + processed, + make_file_span(source.file.clone(), span_start, end_pos.clone()), + TokenShape::ShUnknown, + ); + Rc::new(ScanResult { + pos: end_pos.clone(), + token: token, + interp_depth: pos.interp_depth.clone(), + }) + } + } + } +} + +pub fn scan_string_body( + mut source: Rc, + mut pos: i64, + mut acc: Rc>, +) -> Rc { loop { if (pos.clone() >= source_len(source.clone())) { break Rc::new(StringScanResult::UnterminatedString { - content: acc.join(&"".to_string()), - end_pos: pos.clone(), -}); -} else { + content: acc.join(&"".to_string()), + end_pos: pos.clone(), + }); + } else { let ch = source_char(source.clone(), pos.clone()); -if (ch.clone().as_str() == "\"".to_string().as_str()) { + if (ch.clone().as_str() == "\"".to_string().as_str()) { break Rc::new(StringScanResult::ClosedString { - content: acc.join(&"".to_string()), - end_pos: pos.clone(), -}); -} else { + content: acc.join(&"".to_string()), + end_pos: pos.clone(), + }); + } else { if (ch.clone().as_str() == "\\".to_string().as_str()) { if ((pos.clone() + 1) < source_len(source.clone())) { let escaped = source_char(source.clone(), (pos.clone() + 1)); -{ + { let __tco_0 = (pos + 2); -let __tco_1 = v2_rt::rc_list_push(v2_rt::rc_list_push(acc, "\\".to_string()), escaped); -pos = __tco_0; -acc = __tco_1; -continue; -} -} else { + let __tco_1 = v2_rt::rc_list_push( + v2_rt::rc_list_push(acc, "\\".to_string()), + escaped, + ); + pos = __tco_0; + acc = __tco_1; + continue; + } + } else { break Rc::new(StringScanResult::UnterminatedString { - content: v2_rt::rc_list_push(acc, "\\".to_string()).join(&"".to_string()), - end_pos: (pos.clone() + 1), -}); -} -} else { + content: v2_rt::rc_list_push(acc, "\\".to_string()) + .join(&"".to_string()), + end_pos: (pos.clone() + 1), + }); + } + } else { if (ch.clone().as_str() == "{".to_string().as_str()) { if should_start_interpolation(&source, pos.clone()) { break Rc::new(StringScanResult::InterpolationStart { - content: acc.join(&"".to_string()), - end_pos: pos.clone(), -}); -} else { + content: acc.join(&"".to_string()), + end_pos: pos.clone(), + }); + } else { { let __tco_0 = (pos + 1); -let __tco_1 = v2_rt::rc_list_push(acc, "{".to_string()); -pos = __tco_0; -acc = __tco_1; -continue; -} -} -} else { + let __tco_1 = v2_rt::rc_list_push(acc, "{".to_string()); + pos = __tco_0; + acc = __tco_1; + continue; + } + } + } else { { let __tco_0 = (pos + 1); -let __tco_1 = v2_rt::rc_list_push(acc, ch.clone()); -pos = __tco_0; -acc = __tco_1; -continue; -} -} -} -} -} -} + let __tco_1 = v2_rt::rc_list_push(acc, ch.clone()); + pos = __tco_0; + acc = __tco_1; + continue; + } + } + } + } + } + } } pub fn should_start_interpolation(source: &Rc, pos: i64) -> bool { @@ -555,8 +809,10 @@ pub fn should_start_interpolation(source: &Rc, pos: i64) -> bool { } else { { let next = source_char(source.clone(), (pos.clone() + 1)); -(((is_ident_start(&next) || (next.clone().as_str() == "(".to_string().as_str())) || (next.clone().as_str() == "!".to_string().as_str())) || (next.clone().as_str() == "-".to_string().as_str())) -} + (((is_ident_start(&next) || (next.clone().as_str() == "(".to_string().as_str())) + || (next.clone().as_str() == "!".to_string().as_str())) + || (next.clone().as_str() == "-".to_string().as_str())) + } } } @@ -568,11 +824,13 @@ pub fn process_escapes_loop(mut source: String, mut pos: i64, mut acc: Rc= v2_rt::string_length(&source)) { break acc.join(&"".to_string()); -} else { + } else { let ch = v2_rt::char_at(&source, pos.clone()); -if ((ch.clone().as_str() == "\\".to_string().as_str()) && ((pos.clone() + 1) < v2_rt::string_length(&source))) { + if ((ch.clone().as_str() == "\\".to_string().as_str()) + && ((pos.clone() + 1) < v2_rt::string_length(&source))) + { let next = v2_rt::char_at(&source, (pos.clone() + 1)); -let resolved = if (next.clone().as_str() == "\"".to_string().as_str()) { + let resolved = if (next.clone().as_str() == "\"".to_string().as_str()) { "\"".to_string() } else { if (next.clone().as_str() == "\\".to_string().as_str()) { @@ -597,61 +855,85 @@ let resolved = if (next.clone().as_str() == "\"".to_string().as_str()) { } } }; -{ + { let __tco_0 = (pos + 2); -let __tco_1 = v2_rt::rc_list_push(acc, resolved); -pos = __tco_0; -acc = __tco_1; -continue; -} -} else { + let __tco_1 = v2_rt::rc_list_push(acc, resolved); + pos = __tco_0; + acc = __tco_1; + continue; + } + } else { { let __tco_0 = (pos + 1); -let __tco_1 = v2_rt::rc_list_push(acc, ch.clone()); -pos = __tco_0; -acc = __tco_1; -continue; -} -} -} -} + let __tco_1 = v2_rt::rc_list_push(acc, ch.clone()); + pos = __tco_0; + acc = __tco_1; + continue; + } + } + } + } } pub fn drop_last(stack: &Rc>) -> Rc> { { let len = (stack.clone().len() as i64); -Rc::new(stack.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(Rc::new(vec![]), |result: Rc>, pair: (i64, i64)| if (pair.0.clone() < (len.clone() - 1)) { - Rc::new(v2_rt::append(result.clone(), pair.1.clone())) - } else { - result.clone() + Rc::new( + stack + .clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + .fold(Rc::new(vec![]), |result: Rc>, pair: (i64, i64)| { + if (pair.0.clone() < (len.clone() - 1)) { + Rc::new(v2_rt::append(result.clone(), pair.1.clone())) + } else { + result.clone() + } }) -} + } } pub fn replace_last(stack: Rc>, value: i64) -> Rc> { { let prefix = drop_last(&stack); -Rc::new(v2_rt::append(prefix, value)) -} + Rc::new(v2_rt::append(prefix, value)) + } } -pub fn skip_spaces_and_comments(mut source: Rc, mut pos: Rc, mut fuel: i64) -> Rc { +pub fn skip_spaces_and_comments( + mut source: Rc, + mut pos: Rc, + mut fuel: i64, +) -> Rc { loop { let p = source_skip_ws(source.clone(), pos.pos.clone()); -if ((((p.clone() + 1) < source_len(source.clone())) && (source_char(source.clone(), p.clone()).as_str() == "/".to_string().as_str())) && (source_char(source.clone(), (p.clone() + 1)).as_str() == "/".to_string().as_str())) { + if ((((p.clone() + 1) < source_len(source.clone())) + && (source_char(source.clone(), p.clone()).as_str() == "/".to_string().as_str())) + && (source_char(source.clone(), (p.clone() + 1)).as_str() == "/".to_string().as_str())) + { { let eol = source_scan_to_eol(source.clone(), p.clone()); -return skip_spaces_and_comments(source.clone(), Rc::new(TokPos { - pos: eol, - interp_depth: pos.interp_depth.clone(), -}), (fuel - 1)) -} + return skip_spaces_and_comments( + source.clone(), + Rc::new(TokPos { + pos: eol, + interp_depth: pos.interp_depth.clone(), + }), + (fuel - 1), + ); + } } -break Rc::new(TokPos { - pos: p.clone(), - interp_depth: pos.interp_depth.clone(), -}); -} + break Rc::new(TokPos { + pos: p.clone(), + interp_depth: pos.interp_depth.clone(), + }); + } } pub fn is_digit(ch: String) -> bool { @@ -659,7 +941,9 @@ pub fn is_digit(ch: String) -> bool { } pub fn is_ident_start(ch: &String) -> bool { - ((((ch.clone() >= "a".to_string()) && (ch.clone() <= "z".to_string())) || ((ch.clone() >= "A".to_string()) && (ch.clone() <= "Z".to_string()))) || (ch.clone().as_str() == "_".to_string().as_str())) + ((((ch.clone() >= "a".to_string()) && (ch.clone() <= "z".to_string())) + || ((ch.clone() >= "A".to_string()) && (ch.clone() <= "Z".to_string()))) + || (ch.clone().as_str() == "_".to_string().as_str())) } pub fn is_ident_char(ch: String) -> bool { diff --git a/src/v2/stage0/src/v2_compiler_trace.rs b/src/v2/stage0/src/v2_compiler_trace.rs index 5fe94ef6c4b..33e848a24bd 100644 --- a/src/v2/stage0/src/v2_compiler_trace.rs +++ b/src/v2/stage0/src/v2_compiler_trace.rs @@ -1,14 +1,14 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.compiler.trace -use std::collections::HashMap; -use std::rc::Rc; -use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::v2_std_core::{SourceSpan}; use self::TraceEvent::*; use self::TraceFilter::*; +use crate::v2_rt; +pub use crate::v2_std_core::SourceSpan; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct SpanMapping { @@ -67,103 +67,193 @@ pub struct Trace { pub fn empty_trace() -> Rc { Rc::new(Trace { - events: Rc::new(vec![]), - stack: Rc::new(vec![]), -}) + events: Rc::new(vec![]), + stack: Rc::new(vec![]), + }) } pub fn trace_push_event(trace: &Rc, event: Rc) -> Rc { Rc::new(Trace { - events: v2_rt::rc_list_push(trace.events.clone(), event), - stack: trace.stack.clone(), -}) + events: v2_rt::rc_list_push(trace.events.clone(), event), + stack: trace.stack.clone(), + }) } pub fn trace_push_frame(trace: &Rc, frame: Rc) -> Rc { Rc::new(Trace { - events: trace.events.clone(), - stack: v2_rt::rc_list_push(trace.stack.clone(), frame), -}) + events: trace.events.clone(), + stack: v2_rt::rc_list_push(trace.stack.clone(), frame), + }) } pub fn trace_pop_frame(trace: &Rc) -> Rc { { let n = (trace.stack.clone().len() as i64); -if (n.clone() <= 1) { + if (n.clone() <= 1) { Rc::new(Trace { - events: trace.events.clone(), - stack: Rc::new(vec![]), -}) + events: trace.events.clone(), + stack: Rc::new(vec![]), + }) } else { Rc::new(Trace { - events: trace.events.clone(), - stack: Rc::new(trace.stack.clone().iter().cloned().take((n.clone() - 1) as usize).collect::>()), -}) + events: trace.events.clone(), + stack: Rc::new( + trace + .stack + .clone() + .iter() + .cloned() + .take((n.clone() - 1) as usize) + .collect::>(), + ), + }) } -} + } } pub fn event_span(event: Rc) -> Rc { match (*event).clone() { - TraceEvent::TraceEnter { span: s, .. } => s.clone(), - TraceEvent::TraceExit { span: s, .. } => s.clone(), - TraceEvent::TraceError { span: s, .. } => s.clone(), -} + TraceEvent::TraceEnter { span: s, .. } => s.clone(), + TraceEvent::TraceExit { span: s, .. } => s.clone(), + TraceEvent::TraceError { span: s, .. } => s.clone(), + } } pub fn event_node_id(event: Rc) -> String { match (*event).clone() { - TraceEvent::TraceEnter { node_id: id, .. } => id.clone(), - TraceEvent::TraceExit { node_id: id, .. } => id.clone(), - TraceEvent::TraceError { node_id: id, .. } => id.clone(), -} + TraceEvent::TraceEnter { node_id: id, .. } => id.clone(), + TraceEvent::TraceExit { node_id: id, .. } => id.clone(), + TraceEvent::TraceError { node_id: id, .. } => id.clone(), + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum TraceFilter { - FilterByFunc { - func_name: String, - }, - FilterBySpan { - start: i64, - end: i64, - }, + FilterByFunc { func_name: String }, + FilterBySpan { start: i64, end: i64 }, FilterErrors, } pub fn event_matches_span(event: Rc, filter_start: i64, filter_end: i64) -> bool { { let sp = event_span(event); -((sp.start.clone() >= filter_start) && (sp.start.clone() < filter_end)) -} + ((sp.start.clone() >= filter_start) && (sp.start.clone() < filter_end)) + } } pub fn replay_trace(trace: Rc, filter: Rc) -> Rc>> { match (*filter).clone() { - TraceFilter::FilterByFunc { func_name: name, .. } => Rc::new({ let mut __result = Vec::new(); for e in trace.events.clone().iter().cloned() { if (event_node_id(e.clone()).as_str() == name.clone().as_str()) { __result.push(e); } } __result }), - TraceFilter::FilterBySpan { start: s, end: e, .. } => Rc::new({ let mut __result = Vec::new(); for ev in trace.events.clone().iter().cloned() { if event_matches_span(ev.clone(), s.clone(), e.clone()) { __result.push(ev); } } __result }), - TraceFilter::FilterErrors => Rc::new({ let mut __result = Vec::new(); for e in trace.events.clone().iter().cloned() { if match (*e.clone()).clone() { - TraceEvent::TraceError { .. } => true, - _ => false, -} { __result.push(e); } } __result }), -} + TraceFilter::FilterByFunc { + func_name: name, .. + } => Rc::new({ + let mut __result = Vec::new(); + for e in trace.events.clone().iter().cloned() { + if (event_node_id(e.clone()).as_str() == name.clone().as_str()) { + __result.push(e); + } + } + __result + }), + TraceFilter::FilterBySpan { + start: s, end: e, .. + } => Rc::new({ + let mut __result = Vec::new(); + for ev in trace.events.clone().iter().cloned() { + if event_matches_span(ev.clone(), s.clone(), e.clone()) { + __result.push(ev); + } + } + __result + }), + TraceFilter::FilterErrors => Rc::new({ + let mut __result = Vec::new(); + for e in trace.events.clone().iter().cloned() { + if match (*e.clone()).clone() { + TraceEvent::TraceError { .. } => true, + _ => false, + } { + __result.push(e); + } + } + __result + }), + } } pub fn format_span(sp: &Rc) -> String { - v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("[".to_string(), (sp.start.clone()).to_string()), "..".to_string()), (sp.end.clone()).to_string()), ")".to_string()) + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("[".to_string(), (sp.start.clone()).to_string()), + "..".to_string(), + ), + (sp.end.clone()).to_string(), + ), + ")".to_string(), + ) } pub fn format_trace_event(event: Rc) -> String { match (*event).clone() { - TraceEvent::TraceEnter { node_id: id, span: sp, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat("> ".to_string(), id.clone()), " at ".to_string()), format_span(&sp)), - TraceEvent::TraceExit { node_id: id, span: sp, output: out, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("< ".to_string(), id.clone()), " at ".to_string()), format_span(&sp)), ": ".to_string()), out.clone()), - TraceEvent::TraceError { node_id: id, span: sp, message: msg, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("! ".to_string(), id.clone()), " at ".to_string()), format_span(&sp)), ": ".to_string()), msg.clone()), -} + TraceEvent::TraceEnter { + node_id: id, + span: sp, + .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat("> ".to_string(), id.clone()), + " at ".to_string(), + ), + format_span(&sp), + ), + TraceEvent::TraceExit { + node_id: id, + span: sp, + output: out, + .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("< ".to_string(), id.clone()), + " at ".to_string(), + ), + format_span(&sp), + ), + ": ".to_string(), + ), + out.clone(), + ), + TraceEvent::TraceError { + node_id: id, + span: sp, + message: msg, + .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("! ".to_string(), id.clone()), + " at ".to_string(), + ), + format_span(&sp), + ), + ": ".to_string(), + ), + msg.clone(), + ), + } } pub fn format_trace(trace: Rc) -> Rc> { - Rc::new({ let mut __result = Vec::new(); for e in trace.events.clone().iter().cloned() { __result.push(format_trace_event(e.clone())); } __result }) + Rc::new({ + let mut __result = Vec::new(); + for e in trace.events.clone().iter().cloned() { + __result.push(format_trace_event(e.clone())); + } + __result + }) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -174,13 +264,17 @@ pub struct ReproCase { pub trace: Option>, } -pub fn capture_repro(func_name: String, inputs: Rc>, trace: Rc) -> Rc { +pub fn capture_repro( + func_name: String, + inputs: Rc>, + trace: Rc, +) -> Rc { Rc::new(ReproCase { - func_name: func_name, - inputs: inputs, - expected_output: None, - trace: Some(trace), -}) + func_name: func_name, + inputs: inputs, + expected_output: None, + trace: Some(trace), + }) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -190,5 +284,16 @@ pub struct SourceMap { } pub fn remap_location(source_map: Rc, generated_line: i64) -> Option> { - Rc::new({ let mut __result = Vec::new(); for m in source_map.mappings.clone().iter().cloned() { if (m.generated_line.clone() <= generated_line.clone()) { __result.push(m); } } __result }).last().cloned().map(|m| m.source_span.clone()) + Rc::new({ + let mut __result = Vec::new(); + for m in source_map.mappings.clone().iter().cloned() { + if (m.generated_line.clone() <= generated_line.clone()) { + __result.push(m); + } + } + __result + }) + .last() + .cloned() + .map(|m| m.source_span.clone()) } diff --git a/src/v2/stage0/src/v2_rt.rs b/src/v2/stage0/src/v2_rt.rs index 8e6da305b01..ffaae8d00d3 100644 --- a/src/v2/stage0/src/v2_rt.rs +++ b/src/v2/stage0/src/v2_rt.rs @@ -11,52 +11,84 @@ pub trait V2Concat { } impl V2Concat for String { - fn v2_concat(mut self, other: String) -> String { self.push_str(&other); self } + fn v2_concat(mut self, other: String) -> String { + self.push_str(&other); + self + } } impl V2Concat for Vec { - fn v2_concat(mut self, other: Vec) -> Vec { self.extend(other); self } + fn v2_concat(mut self, other: Vec) -> Vec { + self.extend(other); + self + } } -pub fn concat(a: T, b: T) -> T { a.v2_concat(b) } +pub fn concat(a: T, b: T) -> T { + a.v2_concat(b) +} pub fn char_at(s: &str, pos: i64) -> String { let pos = pos.max(0) as usize; if s.is_ascii() { let bytes = s.as_bytes(); - if pos >= bytes.len() { return String::new(); } + if pos >= bytes.len() { + return String::new(); + } return String::from(bytes[pos] as char); } - s.chars().nth(pos).map(|ch| ch.to_string()).unwrap_or_default() + s.chars() + .nth(pos) + .map(|ch| ch.to_string()) + .unwrap_or_default() } pub fn string_length(s: &str) -> i64 { - if s.is_ascii() { s.len() as i64 } else { s.chars().count() as i64 } + if s.is_ascii() { + s.len() as i64 + } else { + s.chars().count() as i64 + } } pub fn substring(s: &str, start: i64, end: i64) -> String { let start = start.max(0) as usize; let end = end.max(0) as usize; - if end <= start { return String::new(); } + if end <= start { + return String::new(); + } if s.is_ascii() { let len = s.len(); - if start >= len { return String::new(); } + if start >= len { + return String::new(); + } return s[start..end.min(len)].to_string(); } - s.chars().skip(start).take(end.saturating_sub(start)).collect() + s.chars() + .skip(start) + .take(end.saturating_sub(start)) + .collect() } pub fn string_contains(s: &str, sub: String) -> bool { s.contains(&*sub) } -pub fn contains(s: String, sub: String) -> bool { string_contains(&s, sub) } +pub fn contains(s: String, sub: String) -> bool { + string_contains(&s, sub) +} -pub fn count(items: Rc>) -> i64 { items.len() as i64 } +pub fn count(items: Rc>) -> i64 { + items.len() as i64 +} -pub fn str_eq(a: String, b: String) -> bool { a == b } +pub fn str_eq(a: String, b: String) -> bool { + a == b +} -pub fn to_string(value: i64) -> String { value.to_string() } +pub fn to_string(value: i64) -> String { + value.to_string() +} pub fn clamp(val: i64, min_val: i64, max_val: i64) -> i64 { val.clamp(min_val, max_val) @@ -68,31 +100,58 @@ pub fn lookup(table: &HashMap, key: String) -> Option { pub fn index_by String>(list: Vec, key_fn: F) -> HashMap { let mut map = HashMap::new(); - for item in list { let key = key_fn(&item); map.insert(key, item); } + for item in list { + let key = key_fn(&item); + map.insert(key, item); + } map } -pub fn empty_map() -> HashMap { HashMap::new() } +pub fn empty_map() -> HashMap { + HashMap::new() +} -pub fn map_insert(mut map: HashMap, key: K, value: V) -> HashMap { - map.insert(key, value); map +pub fn map_insert( + mut map: HashMap, + key: K, + value: V, +) -> HashMap { + map.insert(key, value); + map } -pub fn map_merge(mut base: HashMap, overlay: HashMap) -> HashMap { - base.extend(overlay); base +pub fn map_merge( + mut base: HashMap, + overlay: HashMap, +) -> HashMap { + base.extend(overlay); + base } -pub fn map_get(m: &HashMap, key: K) -> Option { +pub fn map_get( + m: &HashMap, + key: K, +) -> Option { m.get(&key).cloned() } -pub fn map_keys(m: &HashMap) -> Vec { m.keys().cloned().collect() } +pub fn map_keys(m: &HashMap) -> Vec { + m.keys().cloned().collect() +} -pub fn map_values(m: &HashMap) -> Vec { m.values().cloned().collect() } +pub fn map_values(m: &HashMap) -> Vec { + m.values().cloned().collect() +} -pub fn list_concat(mut a: Vec, b: Vec) -> Vec { a.extend(b); a } +pub fn list_concat(mut a: Vec, b: Vec) -> Vec { + a.extend(b); + a +} -pub fn list_push(mut list: Vec, item: T) -> Vec { list.push(item); list } +pub fn list_push(mut list: Vec, item: T) -> Vec { + list.push(item); + list +} pub fn append(list: Rc>, item: T) -> Vec { let mut v = (*list).clone(); @@ -110,7 +169,9 @@ pub fn chars_to_string(chars: &Rc>, start: i64, end: i64) -> String { .collect() } -pub fn parse_int(s: String) -> Option { s.parse::().ok() } +pub fn parse_int(s: String) -> Option { + s.parse::().ok() +} pub fn map_contains_key(m: &HashMap, key: K) -> bool { m.contains_key(&key) @@ -121,7 +182,9 @@ pub fn map_has(m: &HashMap, key: K) } pub fn reverse(list: Rc>) -> Rc> { - let mut v = (*list).clone(); v.reverse(); Rc::new(v) + let mut v = (*list).clone(); + v.reverse(); + Rc::new(v) } pub fn replace(s: String, from: String, to: String) -> String { @@ -146,13 +209,20 @@ pub fn rc_list_concat(a: Rc>, b: Rc>) -> Rc> { result } -pub fn rc_map_insert(map: Rc>, key: K, value: V) -> Rc> { +pub fn rc_map_insert( + map: Rc>, + key: K, + value: V, +) -> Rc> { let mut m = map; Rc::make_mut(&mut m).insert(key, value); m } -pub fn rc_map_merge(base: Rc>, overlay: Rc>) -> Rc> { +pub fn rc_map_merge( + base: Rc>, + overlay: Rc>, +) -> Rc> { let mut result = base; let inner = Rc::make_mut(&mut result); for (k, v) in overlay.iter() { @@ -161,14 +231,21 @@ pub fn rc_map_merge(base: R result } -pub fn rc_index_by String>(list: Rc>, key_fn: F) -> Rc> { +pub fn rc_index_by String>( + list: Rc>, + key_fn: F, +) -> Rc> { Rc::new(list.iter().map(|v| (key_fn(v), v.clone())).collect()) } -pub fn rc_empty_map() -> Rc> { Rc::new(HashMap::new()) } +pub fn rc_empty_map() -> Rc> { + Rc::new(HashMap::new()) +} impl V2Concat for Rc> { - fn v2_concat(self, other: Rc>) -> Rc> { rc_list_concat(self, other) } + fn v2_concat(self, other: Rc>) -> Rc> { + rc_list_concat(self, other) + } } pub fn scan_while(s: &str, start: i64, pred: impl Fn(String) -> bool) -> i64 { @@ -176,14 +253,20 @@ pub fn scan_while(s: &str, start: i64, pred: impl Fn(String) -> bool) -> i64 { if s.is_ascii() { let bytes = s.as_bytes(); let mut pos = start.min(bytes.len()); - while pos < bytes.len() && pred(String::from(bytes[pos] as char)) { pos += 1; } + while pos < bytes.len() && pred(String::from(bytes[pos] as char)) { + pos += 1; + } return pos as i64; } let char_len = s.chars().count(); let start = start.min(char_len); let mut pos = start; for ch in s.chars().skip(start) { - if pred(ch.to_string()) { pos += 1; } else { break; } + if pred(ch.to_string()) { + pos += 1; + } else { + break; + } } pos as i64 } @@ -193,14 +276,20 @@ pub fn skip_horizontal_ws(s: &str, start: i64) -> i64 { if s.is_ascii() { let bytes = s.as_bytes(); let mut pos = start.min(bytes.len()); - while pos < bytes.len() && (bytes[pos] == b' ' || bytes[pos] == b'\t') { pos += 1; } + while pos < bytes.len() && (bytes[pos] == b' ' || bytes[pos] == b'\t') { + pos += 1; + } return pos as i64; } let char_len = s.chars().count(); let start = start.min(char_len); let mut pos = start; for ch in s.chars().skip(start) { - if ch == ' ' || ch == '\t' { pos += 1; } else { break; } + if ch == ' ' || ch == '\t' { + pos += 1; + } else { + break; + } } pos as i64 } @@ -210,14 +299,20 @@ pub fn scan_to_eol(s: &str, start: i64) -> i64 { if s.is_ascii() { let bytes = s.as_bytes(); let start = start.min(bytes.len()); - for i in start..bytes.len() { if bytes[i] == b'\n' { return i as i64; } } + for i in start..bytes.len() { + if bytes[i] == b'\n' { + return i as i64; + } + } return bytes.len() as i64; } let char_len = s.chars().count(); let start = start.min(char_len); let mut pos = start; for ch in s.chars().skip(start) { - if ch == '\n' { return pos as i64; } + if ch == '\n' { + return pos as i64; + } pos += 1; } pos as i64 @@ -229,9 +324,13 @@ pub fn scan_string_end(s: &str, start: i64) -> i64 { let bytes = s.as_bytes(); let mut pos = start.min(bytes.len()); while pos < bytes.len() { - if bytes[pos] == b'\\' { pos += 2; } - else if bytes[pos] == b'\"' { return (pos + 1) as i64; } - else { pos += 1; } + if bytes[pos] == b'\\' { + pos += 2; + } else if bytes[pos] == b'\"' { + return (pos + 1) as i64; + } else { + pos += 1; + } } return bytes.len() as i64; } @@ -260,7 +359,9 @@ pub fn code_point(c: String) -> i64 { } pub fn from_code_point(cp: i64) -> String { - char::from_u32(cp as u32).map(|c| c.to_string()).unwrap_or_default() + char::from_u32(cp as u32) + .map(|c| c.to_string()) + .unwrap_or_default() } #[derive(Debug, Clone)] @@ -269,7 +370,7 @@ pub struct FilesystemReadResult { } pub fn filesystem_read(path: String) -> FilesystemReadResult { - let content = std::fs::read_to_string(&path) - .unwrap_or_else(|e| panic!("failed to read {}: {}", path, e)); + let content = + std::fs::read_to_string(&path).unwrap_or_else(|e| panic!("failed to read {}: {}", path, e)); FilesystemReadResult { content } } diff --git a/src/v2/stage0/src/v2_std_core.rs b/src/v2/stage0/src/v2_std_core.rs index edbf24b96d4..800cac37ccc 100644 --- a/src/v2/stage0/src/v2_std_core.rs +++ b/src/v2/stage0/src/v2_std_core.rs @@ -1,39 +1,46 @@ // Generated by v2 compiler -- do not edit. // Source module: v2.std.core -use std::collections::HashMap; -use std::rc::Rc; -use crate::v2_rt; -use crate::NonEmptyVec; -use crate::NonEmptyBTreeSet; -pub use crate::std_types::{FilePath, NonEmptyStr, SourceSpan, kernel_type_set, is_kernel_type, container_type_arity, is_container_type, container_expected_arity}; -pub use crate::std_syntax::{BinOp, LiteralValue, AlgebraFieldKind}; -use crate::std_syntax::BinOp::{Add, Sub, Mul, Div, Mod, Eq, Ne, Lt, Gt, Le, Ge, And, Or, NullCoalesce}; -use crate::std_syntax::LiteralValue::{LitStr, LitInt, LitFloat, LitBool, LitNull}; -use crate::std_syntax::AlgebraFieldKind::{AlgAdd, AlgMul, AlgReciprocal, AlgQuotient, AlgRemainder, AlgCompare, AlgMeet, AlgJoin}; -pub use crate::std_algebra::{CollectionSizeEffect, CostShape, AlgebraFieldTemplate}; -use crate::std_algebra::CollectionSizeEffect::*; -use crate::std_algebra::CostShape::*; -pub use crate::std_induction::{SubValueRelation}; -use crate::std_induction::SubValueRelation::*; -use self::TokenShape::*; -use self::Connective::*; +use self::CallSemantics::*; use self::Cardinality::*; +use self::CompilerDiagnostic::*; +use self::Connective::*; +use self::ExprData::*; +use self::ExprErrorKind::*; use self::FieldAccessStyle::*; use self::FieldValueShape::*; +use self::FunctionSizeEffect::*; use self::InferredNode::*; -use self::VarBindingKind::*; -use self::CallSemantics::*; -use self::MethodSemantics::*; -use self::ExprErrorKind::*; -use self::ExprData::*; use self::MatchPattern::*; -use self::UnaryOpKind::*; -use self::StringPart::*; -use self::OperationModifier::*; -use self::CompilerDiagnostic::*; +use self::MethodSemantics::*; use self::NodeFieldRole::*; -use self::FunctionSizeEffect::*; +use self::OperationModifier::*; +use self::StringPart::*; +use self::TokenShape::*; +use self::UnaryOpKind::*; +use self::VarBindingKind::*; +use crate::std_algebra::CollectionSizeEffect::*; +use crate::std_algebra::CostShape::*; +pub use crate::std_algebra::{AlgebraFieldTemplate, CollectionSizeEffect, CostShape}; +pub use crate::std_induction::SubValueRelation; +use crate::std_induction::SubValueRelation::*; +use crate::std_syntax::AlgebraFieldKind::{ + AlgAdd, AlgCompare, AlgJoin, AlgMeet, AlgMul, AlgQuotient, AlgReciprocal, AlgRemainder, +}; +use crate::std_syntax::BinOp::{ + Add, And, Div, Eq, Ge, Gt, Le, Lt, Mod, Mul, Ne, NullCoalesce, Or, Sub, +}; +use crate::std_syntax::LiteralValue::{LitBool, LitFloat, LitInt, LitNull, LitStr}; +pub use crate::std_syntax::{AlgebraFieldKind, BinOp, LiteralValue}; +pub use crate::std_types::{ + container_expected_arity, container_type_arity, is_container_type, is_kernel_type, + kernel_type_set, FilePath, NonEmptyStr, SourceSpan, +}; +use crate::v2_rt; +use crate::NonEmptyBTreeSet; +use crate::NonEmptyVec; +use std::collections::HashMap; +use std::rc::Rc; #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] pub struct Token { @@ -145,18 +152,18 @@ pub enum InferredNode { pub fn inferred_to_node(inferred: Rc) -> Option> { match (*inferred).clone() { - InferredNode::Resolved { node: n, .. } => Some(n.clone()), - InferredNode::CompilerError { .. } => None, - InferredNode::TypeVariable { .. } => None, -} + InferredNode::Resolved { node: n, .. } => Some(n.clone()), + InferredNode::CompilerError { .. } => None, + InferredNode::TypeVariable { .. } => None, + } } pub fn is_compiler_error(inferred: Rc) -> bool { match (*inferred).clone() { - InferredNode::Resolved { .. } => false, - InferredNode::CompilerError { .. } => true, - InferredNode::TypeVariable { .. } => false, -} + InferredNode::Resolved { .. } => false, + InferredNode::CompilerError { .. } => true, + InferredNode::TypeVariable { .. } => false, + } } pub fn has_inferred(n: Rc) -> bool { @@ -168,9 +175,7 @@ pub fn has_inferred(n: Rc) -> bool { pub enum VarBindingKind { LocalValueBinding, FunctionValueBinding, - VariantValueBinding { - parent_enum: String, - }, + VariantValueBinding { parent_enum: String }, MatchBoundBinding, } impl VarBindingKind { @@ -178,7 +183,9 @@ impl VarBindingKind { match self { VarBindingKind::LocalValueBinding => panic!("no parent_enum on unit variant"), VarBindingKind::FunctionValueBinding => panic!("no parent_enum on unit variant"), - VarBindingKind::VariantValueBinding { parent_enum: __val, .. } => __val.clone(), + VarBindingKind::VariantValueBinding { + parent_enum: __val, .. + } => __val.clone(), VarBindingKind::MatchBoundBinding => panic!("no parent_enum on unit variant"), } } @@ -291,12 +298,8 @@ pub enum UnaryOpKind { #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] #[serde(tag = "_variant")] pub enum StringPart { - Text { - value: String, - }, - Interpolation { - expr: Rc, - }, + Text { value: String }, + Interpolation { expr: Rc }, } #[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize)] @@ -437,44 +440,208 @@ pub struct ErrorDAG { pub fn diagnostic_to_span(d: Rc) -> Rc { match (*d).clone() { - CompilerDiagnostic::UnresolvedImport { span: s, .. } => s.clone(), - CompilerDiagnostic::MissingExport { span: s, .. } => s.clone(), - CompilerDiagnostic::UnresolvedType { span: s, .. } => s.clone(), - CompilerDiagnostic::TypeMismatch { span: s, .. } => s.clone(), - CompilerDiagnostic::ArityMismatch { span: s, .. } => s.clone(), - CompilerDiagnostic::VariantNotFound { span: s, .. } => s.clone(), - CompilerDiagnostic::FieldNotFound { span: s, .. } => s.clone(), - CompilerDiagnostic::NonExhaustiveMatch { span: s, .. } => s.clone(), - CompilerDiagnostic::CircularDependency { span: s, .. } => s.clone(), - CompilerDiagnostic::DuplicateModule { span: s, .. } => s.clone(), - CompilerDiagnostic::MissingAnnotation { span: s, .. } => s.clone(), - CompilerDiagnostic::ParseError { span: s, .. } => s.clone(), - CompilerDiagnostic::InternalError { span: s, .. } => s.clone(), - CompilerDiagnostic::ComplexityUnknown { span: s, .. } => s.clone(), - CompilerDiagnostic::OwnershipViolation { span: s, .. } => s.clone(), - CompilerDiagnostic::VariantCollision { span: s, .. } => s.clone(), -} + CompilerDiagnostic::UnresolvedImport { span: s, .. } => s.clone(), + CompilerDiagnostic::MissingExport { span: s, .. } => s.clone(), + CompilerDiagnostic::UnresolvedType { span: s, .. } => s.clone(), + CompilerDiagnostic::TypeMismatch { span: s, .. } => s.clone(), + CompilerDiagnostic::ArityMismatch { span: s, .. } => s.clone(), + CompilerDiagnostic::VariantNotFound { span: s, .. } => s.clone(), + CompilerDiagnostic::FieldNotFound { span: s, .. } => s.clone(), + CompilerDiagnostic::NonExhaustiveMatch { span: s, .. } => s.clone(), + CompilerDiagnostic::CircularDependency { span: s, .. } => s.clone(), + CompilerDiagnostic::DuplicateModule { span: s, .. } => s.clone(), + CompilerDiagnostic::MissingAnnotation { span: s, .. } => s.clone(), + CompilerDiagnostic::ParseError { span: s, .. } => s.clone(), + CompilerDiagnostic::InternalError { span: s, .. } => s.clone(), + CompilerDiagnostic::ComplexityUnknown { span: s, .. } => s.clone(), + CompilerDiagnostic::OwnershipViolation { span: s, .. } => s.clone(), + CompilerDiagnostic::VariantCollision { span: s, .. } => s.clone(), + } } pub fn diagnostic_to_message(d: Rc) -> String { match (*d).clone() { - CompilerDiagnostic::UnresolvedImport { module_path: m, importing_module: i, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("unresolved import: module '".to_string(), m.clone()), "' not found (imported by '".to_string()), i.clone()), "')".to_string()), - CompilerDiagnostic::MissingExport { name: n, module_path: m, importing_module: i, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("name '".to_string(), n.clone()), "' not found in module '".to_string()), m.clone()), "' (imported by '".to_string()), i.clone()), "')".to_string()), - CompilerDiagnostic::UnresolvedType { name: n, .. } => v2_rt::concat(v2_rt::concat("unresolved type '".to_string(), n.clone()), "'".to_string()), - CompilerDiagnostic::TypeMismatch { expected: e, got: g, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("type mismatch: expected '".to_string(), e.clone()), "', got '".to_string()), g.clone()), "'".to_string()), - CompilerDiagnostic::ArityMismatch { name: n, expected: e, got: g, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("type ".to_string(), n.clone()), " expects ".to_string()), (e.clone()).to_string()), " type arguments, got ".to_string()), (g.clone()).to_string()), - CompilerDiagnostic::VariantNotFound { variant: v, type_name: t, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("variant '".to_string(), v.clone()), "' not found in type '".to_string()), t.clone()), "'".to_string()), - CompilerDiagnostic::FieldNotFound { field: f, type_name: t, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("field '".to_string(), f.clone()), "' not found in type '".to_string()), t.clone()), "'".to_string()), - CompilerDiagnostic::NonExhaustiveMatch { missing: ms, .. } => v2_rt::concat("non-exhaustive match: missing variant(s) ".to_string(), ms.clone().join(&", ".to_string())), - CompilerDiagnostic::CircularDependency { modules: ms, .. } => v2_rt::concat("circular dependency detected: ".to_string(), ms.clone().join(&" -> ".to_string())), - CompilerDiagnostic::DuplicateModule { name: n, .. } => v2_rt::concat(v2_rt::concat("duplicate module declaration: '".to_string(), n.clone()), "'".to_string()), - CompilerDiagnostic::MissingAnnotation { fn_name: f, what: w, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("function '".to_string(), f.clone()), "' requires ".to_string()), w.clone()), " annotation".to_string()), - CompilerDiagnostic::ParseError { message: m, .. } => m.clone(), - CompilerDiagnostic::InternalError { message: m, .. } => m.clone(), - CompilerDiagnostic::ComplexityUnknown { func_name: f, reason: r, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat("complexity: ".to_string(), f.clone()), ": ".to_string()), r.clone()), - CompilerDiagnostic::OwnershipViolation { binding: b, fn_name: f, consumers: c, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("ownership: binding '".to_string(), b.clone()), "' in '".to_string()), f.clone()), "' has ".to_string()), (c.clone()).to_string()), " consumers".to_string()), - CompilerDiagnostic::VariantCollision { variant: v, enum1: e1, enum2: e2, .. } => v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat("variant '".to_string(), v.clone()), "' appears in both '".to_string()), e1.clone()), "' and '".to_string()), e2.clone()), "'".to_string()), -} + CompilerDiagnostic::UnresolvedImport { + module_path: m, + importing_module: i, + .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("unresolved import: module '".to_string(), m.clone()), + "' not found (imported by '".to_string(), + ), + i.clone(), + ), + "')".to_string(), + ), + CompilerDiagnostic::MissingExport { + name: n, + module_path: m, + importing_module: i, + .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("name '".to_string(), n.clone()), + "' not found in module '".to_string(), + ), + m.clone(), + ), + "' (imported by '".to_string(), + ), + i.clone(), + ), + "')".to_string(), + ), + CompilerDiagnostic::UnresolvedType { name: n, .. } => v2_rt::concat( + v2_rt::concat("unresolved type '".to_string(), n.clone()), + "'".to_string(), + ), + CompilerDiagnostic::TypeMismatch { + expected: e, + got: g, + .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("type mismatch: expected '".to_string(), e.clone()), + "', got '".to_string(), + ), + g.clone(), + ), + "'".to_string(), + ), + CompilerDiagnostic::ArityMismatch { + name: n, + expected: e, + got: g, + .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("type ".to_string(), n.clone()), + " expects ".to_string(), + ), + (e.clone()).to_string(), + ), + " type arguments, got ".to_string(), + ), + (g.clone()).to_string(), + ), + CompilerDiagnostic::VariantNotFound { + variant: v, + type_name: t, + .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("variant '".to_string(), v.clone()), + "' not found in type '".to_string(), + ), + t.clone(), + ), + "'".to_string(), + ), + CompilerDiagnostic::FieldNotFound { + field: f, + type_name: t, + .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("field '".to_string(), f.clone()), + "' not found in type '".to_string(), + ), + t.clone(), + ), + "'".to_string(), + ), + CompilerDiagnostic::NonExhaustiveMatch { missing: ms, .. } => v2_rt::concat( + "non-exhaustive match: missing variant(s) ".to_string(), + ms.clone().join(&", ".to_string()), + ), + CompilerDiagnostic::CircularDependency { modules: ms, .. } => v2_rt::concat( + "circular dependency detected: ".to_string(), + ms.clone().join(&" -> ".to_string()), + ), + CompilerDiagnostic::DuplicateModule { name: n, .. } => v2_rt::concat( + v2_rt::concat("duplicate module declaration: '".to_string(), n.clone()), + "'".to_string(), + ), + CompilerDiagnostic::MissingAnnotation { + fn_name: f, + what: w, + .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("function '".to_string(), f.clone()), + "' requires ".to_string(), + ), + w.clone(), + ), + " annotation".to_string(), + ), + CompilerDiagnostic::ParseError { message: m, .. } => m.clone(), + CompilerDiagnostic::InternalError { message: m, .. } => m.clone(), + CompilerDiagnostic::ComplexityUnknown { + func_name: f, + reason: r, + .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat("complexity: ".to_string(), f.clone()), + ": ".to_string(), + ), + r.clone(), + ), + CompilerDiagnostic::OwnershipViolation { + binding: b, + fn_name: f, + consumers: c, + .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("ownership: binding '".to_string(), b.clone()), + "' in '".to_string(), + ), + f.clone(), + ), + "' has ".to_string(), + ), + (c.clone()).to_string(), + ), + " consumers".to_string(), + ), + CompilerDiagnostic::VariantCollision { + variant: v, + enum1: e1, + enum2: e2, + .. + } => v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat("variant '".to_string(), v.clone()), + "' appears in both '".to_string(), + ), + e1.clone(), + ), + "' and '".to_string(), + ), + e2.clone(), + ), + "'".to_string(), + ), + } } pub fn is_error_diagnostic(d: Rc) -> bool { @@ -483,16 +650,16 @@ pub fn is_error_diagnostic(d: Rc) -> bool { pub fn is_interpreter_blocking_diagnostic(d: Rc) -> bool { match (*d).clone() { - CompilerDiagnostic::ComplexityUnknown { .. } => false, - _ => true, -} + CompilerDiagnostic::ComplexityUnknown { .. } => false, + _ => true, + } } pub fn make_error_node(diagnostic: Rc, module_name: String) -> Rc { Rc::new(ErrorNode { - diagnostic: diagnostic, - module_name: module_name, -}) + diagnostic: diagnostic, + module_name: module_name, + }) } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -502,7 +669,8 @@ pub struct DeclaredFuncSig { pub inferred: Option>, pub is_async: bool, pub output_provenance: Rc>>>>, - pub variant_provenance: Rc>>>>>>, + pub variant_provenance: + Rc>>>>>>, } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -542,359 +710,464 @@ pub fn default_ident_span(name: String, span: Rc) -> Option) -> Rc { match n.ident_span.clone() { - Some(s) => s.clone(), - None => n.span.clone(), -} + Some(s) => s.clone(), + None => n.span.clone(), + } } -pub fn make_expr_node(expr_data: Rc, children: Rc>>, inferred: Option>, span: Rc) -> Rc { +pub fn make_expr_node( + expr_data: Rc, + children: Rc>>, + inferred: Option>, + span: Rc, +) -> Rc { Rc::new(Node { - name: "".to_string(), - span: span, - ident_span: None, - children: children, - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: inferred, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: expr_data, - ident: None, -}) -} - -pub fn make_named_expr_node(name: &String, expr_data: Rc, children: Rc>>, inferred: Option>, span: Rc, name_span: Rc) -> Rc { + name: "".to_string(), + span: span, + ident_span: None, + children: children, + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: inferred, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: expr_data, + ident: None, + }) +} + +pub fn make_named_expr_node( + name: &String, + expr_data: Rc, + children: Rc>>, + inferred: Option>, + span: Rc, + name_span: Rc, +) -> Rc { Rc::new(Node { - name: name.clone(), - span: span, - ident_span: default_ident_span(name.clone(), name_span), - children: children, - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: inferred, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: expr_data, - ident: None, -}) -} - -pub fn make_expr_error_node(kind: ExprErrorKind, message: &String, span: &Rc) -> Rc { + name: name.clone(), + span: span, + ident_span: default_ident_span(name.clone(), name_span), + children: children, + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: inferred, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: expr_data, + ident: None, + }) +} + +pub fn make_expr_error_node( + kind: ExprErrorKind, + message: &String, + span: &Rc, +) -> Rc { Rc::new(Node { - name: "".to_string(), - span: span.clone(), - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::CompilerError { - message: message.clone(), - span: span.clone(), -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::ExprError { - kind: kind, - message: message.clone(), -}), - ident: None, -}) -} - -pub fn make_arg_node(name: Option, value: Rc, span: Rc, name_span: Rc) -> Rc { + name: "".to_string(), + span: span.clone(), + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::CompilerError { + message: message.clone(), + span: span.clone(), + })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::ExprError { + kind: kind, + message: message.clone(), + }), + ident: None, + }) +} + +pub fn make_arg_node( + name: Option, + value: Rc, + span: Rc, + name_span: Rc, +) -> Rc { { let arg_name = match name { - Some(n) => n.clone(), - None => "".to_string(), -}; -Rc::new(Node { - name: arg_name.clone(), - span: span, - ident_span: default_ident_span(arg_name.clone(), name_span), - children: Rc::new(vec![value]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) -} -} - -pub fn make_arm_node(pattern: Rc, guard: Option>, body: Rc, span: Rc) -> Rc { + Some(n) => n.clone(), + None => "".to_string(), + }; + Rc::new(Node { + name: arg_name.clone(), + span: span, + ident_span: default_ident_span(arg_name.clone(), name_span), + children: Rc::new(vec![value]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) + } +} + +pub fn make_arm_node( + pattern: Rc, + guard: Option>, + body: Rc, + span: Rc, +) -> Rc { { let children = match guard { - Some(g) => Rc::new(vec![g.clone(), body]), - None => Rc::new(vec![body]), -}; -Rc::new(Node { - name: "".to_string(), - span: span, - ident_span: None, - children: children, - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: Some(pattern), - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) -} -} - -pub fn make_resource_use_node(name: &String, resource: Rc, span: Rc, name_span: Rc) -> Rc { + Some(g) => Rc::new(vec![g.clone(), body]), + None => Rc::new(vec![body]), + }; + Rc::new(Node { + name: "".to_string(), + span: span, + ident_span: None, + children: children, + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: Some(pattern), + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) + } +} + +pub fn make_resource_use_node( + name: &String, + resource: Rc, + span: Rc, + name_span: Rc, +) -> Rc { Rc::new(Node { - name: name.clone(), - span: span, - ident_span: default_ident_span(name.clone(), name_span), - children: Rc::new(vec![resource]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) -} - -pub fn resource_use_name_at(n: Rc, source_indices: Rc>>) -> String { + name: name.clone(), + span: span, + ident_span: default_ident_span(name.clone(), name_span), + children: Rc::new(vec![resource]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) +} + +pub fn resource_use_name_at( + n: Rc, + source_indices: Rc>>, +) -> String { authored_name_at(source_indices, &n) } pub fn resource_use_resource(n: &Rc) -> Rc { match n.children.clone().first().cloned() { - Some(v) => v.clone(), - None => make_expr_error_node(ExprErrorKind::InternalExprError, &"malformed resource-use: missing resource".to_string(), &n.span.clone()), -} + Some(v) => v.clone(), + None => make_expr_error_node( + ExprErrorKind::InternalExprError, + &"malformed resource-use: missing resource".to_string(), + &n.span.clone(), + ), + } } -pub fn make_field_init_node(name: &String, value: Rc, span: Rc, name_span: Rc) -> Rc { +pub fn make_field_init_node( + name: &String, + value: Rc, + span: Rc, + name_span: Rc, +) -> Rc { Rc::new(Node { - name: name.clone(), - span: span, - ident_span: default_ident_span(name.clone(), name_span), - children: Rc::new(vec![value]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) -} - -pub fn make_field_binding_node(field_name: &String, binding: Rc, span: Rc, name_span: Rc) -> Rc { + name: name.clone(), + span: span, + ident_span: default_ident_span(name.clone(), name_span), + children: Rc::new(vec![value]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) +} + +pub fn make_field_binding_node( + field_name: &String, + binding: Rc, + span: Rc, + name_span: Rc, +) -> Rc { Rc::new(Node { - name: field_name.clone(), - span: span, - ident_span: default_ident_span(field_name.clone(), name_span), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: Some(binding), - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) -} - -pub fn field_binding_name_at(n: Rc, source_indices: Rc>>) -> String { + name: field_name.clone(), + span: span, + ident_span: default_ident_span(field_name.clone(), name_span), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: Some(binding), + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) +} + +pub fn field_binding_name_at( + n: Rc, + source_indices: Rc>>, +) -> String { authored_name_at(source_indices, &n) } pub fn field_binding_pattern(n: Rc) -> Rc { match n.match_pattern.clone() { - Some(p) => p.clone(), - None => Rc::new(MatchPattern::Wildcard), -} + Some(p) => p.clone(), + None => Rc::new(MatchPattern::Wildcard), + } } pub fn make_text_part_node(text: String, span: Rc) -> Rc { Rc::new(Node { - name: "".to_string(), - span: span, - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::ExprLiteral { - value: Rc::new(LiteralValue::LitStr { - value: text, -}), -}), - ident: None, -}) + name: "".to_string(), + span: span, + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::ExprLiteral { + value: Rc::new(LiteralValue::LitStr { value: text }), + }), + ident: None, + }) } pub fn make_interp_part_node(expr: Rc, span: Rc) -> Rc { Rc::new(Node { - name: "".to_string(), - span: span, - ident_span: None, - children: Rc::new(vec![expr]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) -} - -pub fn make_param_node(name: &String, type_expr: Rc, default_value: Option>, span: Rc, name_span: Rc) -> Rc { + name: "".to_string(), + span: span, + ident_span: None, + children: Rc::new(vec![expr]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) +} + +pub fn make_param_node( + name: &String, + type_expr: Rc, + default_value: Option>, + span: Rc, + name_span: Rc, +) -> Rc { { let children = match default_value { - Some(dv) => Rc::new(vec![type_expr, dv.clone()]), - None => Rc::new(vec![type_expr]), -}; -Rc::new(Node { - name: name.clone(), - span: span, - ident_span: default_ident_span(name.clone(), name_span), - children: children, - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) -} -} - -pub fn param_node_name_at(n: Rc, source_indices: Rc>>) -> String { + Some(dv) => Rc::new(vec![type_expr, dv.clone()]), + None => Rc::new(vec![type_expr]), + }; + Rc::new(Node { + name: name.clone(), + span: span, + ident_span: default_ident_span(name.clone(), name_span), + children: children, + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) + } +} + +pub fn param_node_name_at( + n: Rc, + source_indices: Rc>>, +) -> String { authored_name_at(source_indices, &n) } -pub fn generic_param_name_at(n: Rc, source_indices: Rc>>) -> String { +pub fn generic_param_name_at( + n: Rc, + source_indices: Rc>>, +) -> String { authored_name_at(source_indices, &n) } -pub fn authored_name_at(source_indices: Rc>>, node: &Rc) -> String { +pub fn authored_name_at( + source_indices: Rc>>, + node: &Rc, +) -> String { match node.ident_span.clone() { - Some(span) => match v2_rt::map_get(&source_indices, span.file.clone()) { - Some(index) => { - let text = source_text_at(index.clone(), &span); -if (text.clone().as_str() == "".to_string().as_str()) { - "".to_string() - } else { - text.clone() - } -}, - None => if ((v2_rt::string_length(&span.file.clone()) > 8) && (v2_rt::substring(&span.file.clone(), 0, 8).as_str() == " "".to_string(), -} + Some(span) => match v2_rt::map_get(&source_indices, span.file.clone()) { + Some(index) => { + let text = source_text_at(index.clone(), &span); + if (text.clone().as_str() == "".to_string().as_str()) { + "".to_string() + } else { + text.clone() + } + } + None => { + if ((v2_rt::string_length(&span.file.clone()) > 8) + && (v2_rt::substring(&span.file.clone(), 0, 8).as_str() + == " "".to_string(), + } } -pub fn find_child_named(n: Rc, name: String, source_indices: Rc>>) -> Option> { - match Rc::new({ let mut __result = Vec::new(); for c in n.children.clone().iter().cloned() { if (authored_name_at(source_indices.clone(), &c).as_str() == name.clone().as_str()) { __result.push(c); } } __result }).first().cloned() { - Some(ch) => Some(ch.clone()), - None => None, -} +pub fn find_child_named( + n: Rc, + name: String, + source_indices: Rc>>, +) -> Option> { + match Rc::new({ + let mut __result = Vec::new(); + for c in n.children.clone().iter().cloned() { + if (authored_name_at(source_indices.clone(), &c).as_str() == name.clone().as_str()) { + __result.push(c); + } + } + __result + }) + .first() + .cloned() + { + Some(ch) => Some(ch.clone()), + None => None, + } } -pub fn has_child_named(n: Rc, name: String, source_indices: Rc>>) -> bool { - { let mut __found = false; for c in n.children.clone().iter().cloned() { if (authored_name_at(source_indices.clone(), &c).as_str() == name.clone().as_str()) { __found = true; break; } } __found } +pub fn has_child_named( + n: Rc, + name: String, + source_indices: Rc>>, +) -> bool { + { + let mut __found = false; + for c in n.children.clone().iter().cloned() { + if (authored_name_at(source_indices.clone(), &c).as_str() == name.clone().as_str()) { + __found = true; + break; + } + } + __found + } } pub fn param_node_type_expr(n: &Rc) -> Rc { match n.children.clone().first().cloned() { - Some(v) => v.clone(), - None => make_expr_error_node(ExprErrorKind::InternalExprError, &"malformed param: missing type_expr".to_string(), &n.span.clone()), -} + Some(v) => v.clone(), + None => make_expr_error_node( + ExprErrorKind::InternalExprError, + &"malformed param: missing type_expr".to_string(), + &n.span.clone(), + ), + } } pub fn param_node_default_value(n: &Rc) -> Option> { @@ -909,67 +1182,82 @@ pub fn param_node_span(n: Rc) -> Rc { n.span.clone() } -pub fn make_field_node(name: &String, type_expr: Rc, cardinality: Cardinality, default_value: Option>, from_key: Option, span: Rc, name_span: Rc) -> Rc { +pub fn make_field_node( + name: &String, + type_expr: Rc, + cardinality: Cardinality, + default_value: Option>, + from_key: Option, + span: Rc, + name_span: Rc, +) -> Rc { { let children = match default_value { - Some(dv) => Rc::new(vec![type_expr, dv.clone()]), - None => Rc::new(vec![type_expr]), -}; -let props = match from_key { - Some(fk) => Rc::new(vec![Rc::new(Node { - name: fk.clone(), - span: make_span(0, 0), - ident_span: default_ident_span(fk.clone(), make_span(0, 0)), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -})]), - None => Rc::new(vec![]), -}; -Rc::new(Node { - name: name.clone(), - span: span, - ident_span: default_ident_span(name.clone(), name_span), - children: children, - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: cardinality, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: props, - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) -} -} - -pub fn field_node_name_at(n: Rc, source_indices: Rc>>) -> String { + Some(dv) => Rc::new(vec![type_expr, dv.clone()]), + None => Rc::new(vec![type_expr]), + }; + let props = match from_key { + Some(fk) => Rc::new(vec![Rc::new(Node { + name: fk.clone(), + span: make_span(0, 0), + ident_span: default_ident_span(fk.clone(), make_span(0, 0)), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + })]), + None => Rc::new(vec![]), + }; + Rc::new(Node { + name: name.clone(), + span: span, + ident_span: default_ident_span(name.clone(), name_span), + children: children, + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: cardinality, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: props, + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) + } +} + +pub fn field_node_name_at( + n: Rc, + source_indices: Rc>>, +) -> String { authored_name_at(source_indices, &n) } pub fn field_node_type_expr(n: &Rc) -> Rc { match n.children.clone().first().cloned() { - Some(v) => v.clone(), - None => make_expr_error_node(ExprErrorKind::InternalExprError, &"malformed field: missing type_expr".to_string(), &n.span.clone()), -} + Some(v) => v.clone(), + None => make_expr_error_node( + ExprErrorKind::InternalExprError, + &"malformed field: missing type_expr".to_string(), + &n.span.clone(), + ), + } } pub fn field_node_cardinality(n: Rc) -> Cardinality { @@ -984,41 +1272,52 @@ pub fn field_node_default_value(n: &Rc) -> Option> { } } -pub fn field_node_from_key(n: Rc, source_indices: Rc>>) -> Option { +pub fn field_node_from_key( + n: Rc, + source_indices: Rc>>, +) -> Option { match n.properties.clone().first().cloned() { - Some(p) => Some(authored_name_at(source_indices, &p)), - None => None, -} + Some(p) => Some(authored_name_at(source_indices, &p)), + None => None, + } } pub fn field_node_span(n: Rc) -> Rc { n.span.clone() } -pub fn make_variant_node(name: &String, fields: Rc>>, span: Rc, name_span: Rc) -> Rc { +pub fn make_variant_node( + name: &String, + fields: Rc>>, + span: Rc, + name_span: Rc, +) -> Rc { Rc::new(Node { - name: name.clone(), - span: span, - ident_span: default_ident_span(name.clone(), name_span), - children: fields, - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) -} - -pub fn variant_node_name_at(n: Rc, source_indices: Rc>>) -> String { + name: name.clone(), + span: span, + ident_span: default_ident_span(name.clone(), name_span), + children: fields, + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) +} + +pub fn variant_node_name_at( + n: Rc, + source_indices: Rc>>, +) -> String { authored_name_at(source_indices, &n) } @@ -1059,7 +1358,49 @@ pub fn wrapper_child_roles() -> Rc>>>> { } pub fn is_child_accessor_in_model(name: String) -> bool { - ({ let mut __found = false; for roles in Rc::new(v2_rt::map_values(&expr_child_roles())).iter().cloned() { if { let mut __found = false; for r in roles.clone().iter().cloned() { if (r.accessor.clone().as_str() == name.clone().as_str()) { __found = true; break; } } __found } { __found = true; break; } } __found } || { let mut __found = false; for roles in Rc::new(v2_rt::map_values(&wrapper_child_roles())).iter().cloned() { if { let mut __found = false; for r in roles.clone().iter().cloned() { if (r.accessor.clone().as_str() == name.clone().as_str()) { __found = true; break; } } __found } { __found = true; break; } } __found }) + ({ + let mut __found = false; + for roles in Rc::new(v2_rt::map_values(&expr_child_roles())) + .iter() + .cloned() + { + if { + let mut __found = false; + for r in roles.clone().iter().cloned() { + if (r.accessor.clone().as_str() == name.clone().as_str()) { + __found = true; + break; + } + } + __found + } { + __found = true; + break; + } + } + __found + } || { + let mut __found = false; + for roles in Rc::new(v2_rt::map_values(&wrapper_child_roles())) + .iter() + .cloned() + { + if { + let mut __found = false; + for r in roles.clone().iter().cloned() { + if (r.accessor.clone().as_str() == name.clone().as_str()) { + __found = true; + break; + } + } + __found + } { + __found = true; + break; + } + } + __found + }) } pub fn child_roles_for_variant(variant_name: String) -> Option>>> { @@ -1091,17 +1432,17 @@ pub fn node_field_roles() -> Rc> { pub fn is_children_list_field(field_name: String) -> bool { match v2_rt::lookup(&node_field_roles(), field_name) { - Some(NodeFieldRole::ChildrenListField) => true, - _ => false, -} + Some(NodeFieldRole::ChildrenListField) => true, + _ => false, + } } pub fn is_sub_value_field(field_name: String) -> bool { match v2_rt::lookup(&node_field_roles(), field_name) { - Some(NodeFieldRole::SubValueField) => true, - Some(NodeFieldRole::ChildrenListField) => true, - _ => false, -} + Some(NodeFieldRole::SubValueField) => true, + Some(NodeFieldRole::ChildrenListField) => true, + _ => false, + } } #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] @@ -1109,91 +1450,111 @@ pub fn is_sub_value_field(field_name: String) -> bool { pub enum FunctionSizeEffect { TreeSizePreserving, TreeSizeReducing, - PropertyContraction { - domain_size: i64, - }, + PropertyContraction { domain_size: i64 }, } impl FunctionSizeEffect { pub fn domain_size(&self) -> i64 { match self { FunctionSizeEffect::TreeSizePreserving => panic!("no domain_size on unit variant"), FunctionSizeEffect::TreeSizeReducing => panic!("no domain_size on unit variant"), - FunctionSizeEffect::PropertyContraction { domain_size: __val, .. } => __val.clone(), + FunctionSizeEffect::PropertyContraction { + domain_size: __val, .. + } => __val.clone(), } } } pub fn function_size_effects() -> Rc>> { thread_local! { - static CACHED: Rc>> = { - let mut __m = HashMap::new(); - __m.insert("with_required_cardinality".to_string(), Rc::new(FunctionSizeEffect::PropertyContraction { - domain_size: 2, -})); - __m.insert("resolved_type".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); - __m.insert("param_node_type_expr".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); - __m.insert("field_binding_pattern".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); - __m.insert("wrapper_inner_arg".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); - __m.insert("extractor_inner_arg".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); - __m.insert("child_type_node".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); - Rc::new(__m) - }; - } + static CACHED: Rc>> = { + let mut __m = HashMap::new(); + __m.insert("with_required_cardinality".to_string(), Rc::new(FunctionSizeEffect::PropertyContraction { + domain_size: 2, + })); + __m.insert("resolved_type".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); + __m.insert("param_node_type_expr".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); + __m.insert("field_binding_pattern".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); + __m.insert("wrapper_inner_arg".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); + __m.insert("extractor_inner_arg".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); + __m.insert("child_type_node".to_string(), Rc::new(FunctionSizeEffect::TreeSizeReducing)); + Rc::new(__m) + }; + } CACHED.with(|c| c.clone()) } pub fn is_tree_size_preserving(func_name: String) -> bool { - match v2_rt::lookup(&function_size_effects(), func_name).as_deref().cloned() { - Some(FunctionSizeEffect::TreeSizePreserving) => true, - Some(FunctionSizeEffect::PropertyContraction { .. }) => true, - _ => false, -} + match v2_rt::lookup(&function_size_effects(), func_name) + .as_deref() + .cloned() + { + Some(FunctionSizeEffect::TreeSizePreserving) => true, + Some(FunctionSizeEffect::PropertyContraction { .. }) => true, + _ => false, + } } pub fn is_tree_size_reducing(func_name: String) -> bool { - match v2_rt::lookup(&function_size_effects(), func_name).as_deref().cloned() { - Some(FunctionSizeEffect::TreeSizeReducing) => true, - _ => false, -} + match v2_rt::lookup(&function_size_effects(), func_name) + .as_deref() + .cloned() + { + Some(FunctionSizeEffect::TreeSizeReducing) => true, + _ => false, + } } pub fn is_property_contraction(func_name: String) -> bool { - match v2_rt::lookup(&function_size_effects(), func_name).as_deref().cloned() { - Some(FunctionSizeEffect::PropertyContraction { .. }) => true, - _ => false, -} + match v2_rt::lookup(&function_size_effects(), func_name) + .as_deref() + .cloned() + { + Some(FunctionSizeEffect::PropertyContraction { .. }) => true, + _ => false, + } } pub fn expr_child_at(texpr: &Rc, index: i64, role: String) -> Rc { match texpr.children.clone().get(index as usize).cloned() { - Some(v) => v.clone(), - None => make_expr_error_node(ExprErrorKind::InternalExprError, &v2_rt::concat("malformed node: missing ".to_string(), role), &texpr.span.clone()), -} + Some(v) => v.clone(), + None => make_expr_error_node( + ExprErrorKind::InternalExprError, + &v2_rt::concat("malformed node: missing ".to_string(), role), + &texpr.span.clone(), + ), + } } -pub fn arg_name_at(n: Rc, source_indices: Rc>>) -> Option { +pub fn arg_name_at( + n: Rc, + source_indices: Rc>>, +) -> Option { { let name = authored_name_at(source_indices, &n); -if (name.clone().as_str() == "".to_string().as_str()) { + if (name.clone().as_str() == "".to_string().as_str()) { None } else { Some(name.clone()) } -} + } } pub fn arg_value(n: &Rc) -> Rc { match n.children.clone().first().cloned() { - Some(v) => v.clone(), - None => make_expr_error_node(ExprErrorKind::InternalExprError, &"malformed arg: missing value".to_string(), &n.span.clone()), -} + Some(v) => v.clone(), + None => make_expr_error_node( + ExprErrorKind::InternalExprError, + &"malformed arg: missing value".to_string(), + &n.span.clone(), + ), + } } pub fn arm_pattern(n: Rc) -> Rc { match n.match_pattern.clone() { - Some(p) => p.clone(), - None => Rc::new(MatchPattern::Wildcard), -} + Some(p) => p.clone(), + None => Rc::new(MatchPattern::Wildcard), + } } pub fn arm_guard(n: &Rc) -> Option> { @@ -1206,20 +1567,31 @@ pub fn arm_guard(n: &Rc) -> Option> { pub fn arm_body(n: &Rc) -> Rc { match n.children.clone().last().cloned() { - Some(v) => v.clone(), - None => make_expr_error_node(ExprErrorKind::InternalExprError, &"malformed arm: missing body".to_string(), &n.span.clone()), -} + Some(v) => v.clone(), + None => make_expr_error_node( + ExprErrorKind::InternalExprError, + &"malformed arm: missing body".to_string(), + &n.span.clone(), + ), + } } -pub fn field_init_node_name_at(n: Rc, source_indices: Rc>>) -> String { +pub fn field_init_node_name_at( + n: Rc, + source_indices: Rc>>, +) -> String { authored_name_at(source_indices, &n) } pub fn field_init_node_value(n: &Rc) -> Rc { match n.children.clone().first().cloned() { - Some(v) => v.clone(), - None => make_expr_error_node(ExprErrorKind::InternalExprError, &"malformed field-init: missing value".to_string(), &n.span.clone()), -} + Some(v) => v.clone(), + None => make_expr_error_node( + ExprErrorKind::InternalExprError, + &"malformed field-init: missing value".to_string(), + &n.span.clone(), + ), + } } pub fn if_condition(texpr: Rc) -> Rc { @@ -1239,7 +1611,15 @@ pub fn match_scrutinee(texpr: Rc) -> Rc { } pub fn match_arm_nodes(texpr: Rc) -> Rc>> { - Rc::new(texpr.children.clone().iter().cloned().skip(1 as usize).collect::>()) + Rc::new( + texpr + .children + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ) } pub fn binop_left(texpr: Rc) -> Rc { @@ -1254,7 +1634,10 @@ pub fn unaryop_operand(texpr: Rc) -> Rc { expr_child_at(&texpr, 0, "unaryop operand".to_string()) } -pub fn expr_var_name_at(texpr: Rc, source_indices: Rc>>) -> String { +pub fn expr_var_name_at( + texpr: Rc, + source_indices: Rc>>, +) -> String { authored_name_at(source_indices, &texpr) } @@ -1262,26 +1645,35 @@ pub fn field_access_base(texpr: Rc) -> Rc { expr_child_at(&texpr, 0, "field access base".to_string()) } -pub fn field_access_field_at(texpr: Rc, source_indices: Rc>>) -> String { +pub fn field_access_field_at( + texpr: Rc, + source_indices: Rc>>, +) -> String { authored_name_at(source_indices, &texpr) } pub fn expr_field_access_summary(texpr: Rc) -> Option> { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprFieldAccess { summary: s, .. } => s.clone(), - _ => None, -} + ExprData::ExprFieldAccess { summary: s, .. } => s.clone(), + _ => None, + } } -pub fn expr_call_func_at(texpr: Rc, source_indices: Rc>>) -> String { +pub fn expr_call_func_at( + texpr: Rc, + source_indices: Rc>>, +) -> String { authored_name_at(source_indices, &texpr) } pub fn expr_call_descent_evidence(texpr: Rc) -> Option>>> { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprCall { descent_evidence: de, .. } => de.clone(), - _ => None, -} + ExprData::ExprCall { + descent_evidence: de, + .. + } => de.clone(), + _ => None, + } } pub fn method_receiver(texpr: Rc) -> Rc { @@ -1289,26 +1681,60 @@ pub fn method_receiver(texpr: Rc) -> Rc { } pub fn method_arg_nodes(texpr: Rc) -> Rc>> { - Rc::new(texpr.children.clone().iter().cloned().skip(1 as usize).collect::>()) -} - -pub fn expr_method_name_at(texpr: Rc, source_indices: Rc>>) -> String { + Rc::new( + texpr + .children + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ) +} + +pub fn expr_method_name_at( + texpr: Rc, + source_indices: Rc>>, +) -> String { authored_name_at(source_indices, &texpr) } pub fn expr_method_call_semantics(texpr: Rc) -> Option> { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprMethodCall { method_semantics: ms, .. } => ms.clone(), - _ => None, -} + ExprData::ExprMethodCall { + method_semantics: ms, + .. + } => ms.clone(), + _ => None, + } } pub fn lambda_body(texpr: Rc) -> Rc { expr_child_at(&texpr, 0, "lambda body".to_string()) } -pub fn lambda_param_names_at(texpr: Rc, source_indices: Rc>>) -> Rc> { - Rc::new({ let mut __result = Vec::new(); for n in Rc::new(texpr.children.clone().iter().cloned().skip(1 as usize).collect::>()).iter().cloned() { __result.push(authored_name_at(source_indices.clone(), &n)); } __result }) +pub fn lambda_param_names_at( + texpr: Rc, + source_indices: Rc>>, +) -> Rc> { + Rc::new({ + let mut __result = Vec::new(); + for n in Rc::new( + texpr + .children + .clone() + .iter() + .cloned() + .skip(1 as usize) + .collect::>(), + ) + .iter() + .cloned() + { + __result.push(authored_name_at(source_indices.clone(), &n)); + } + __result + }) } pub fn let_value(texpr: Rc) -> Rc { @@ -1319,7 +1745,10 @@ pub fn let_body(texpr: Rc) -> Option> { texpr.children.clone().get(1 as usize).cloned() } -pub fn let_binding_name_at(texpr: Rc, source_indices: Rc>>) -> String { +pub fn let_binding_name_at( + texpr: Rc, + source_indices: Rc>>, +) -> String { authored_name_at(source_indices, &texpr) } @@ -1339,7 +1768,10 @@ pub fn foreach_body(texpr: Rc) -> Rc { expr_child_at(&texpr, 1, "foreach body".to_string()) } -pub fn foreach_variable_at(texpr: Rc, source_indices: Rc>>) -> String { +pub fn foreach_variable_at( + texpr: Rc, + source_indices: Rc>>, +) -> String { authored_name_at(source_indices, &texpr) } @@ -1371,15 +1803,18 @@ pub fn block_stmts(texpr: Rc) -> Rc>> { texpr.children.clone() } -pub fn record_lit_type_name_at(texpr: Rc, source_indices: Rc>>) -> Option { +pub fn record_lit_type_name_at( + texpr: Rc, + source_indices: Rc>>, +) -> Option { { let name = authored_name_at(source_indices, &texpr); -if (name.clone().as_str() == "".to_string().as_str()) { + if (name.clone().as_str() == "".to_string().as_str()) { None } else { Some(name.clone()) } -} + } } pub fn transport_url_key() -> String { @@ -1490,138 +1925,245 @@ pub fn transport_headers_key() -> String { CACHED.with(|c| c.clone()) } -pub fn make_transport_node(properties: Rc>>, children: Rc>>, body: Option>, span: Rc) -> Rc { +pub fn make_transport_node( + properties: Rc>>, + children: Rc>>, + body: Option>, + span: Rc, +) -> Rc { Rc::new(Node { - name: "".to_string(), - span: span, - ident_span: None, - children: children, - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: body, - transport: None, - properties: properties, - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) + name: "".to_string(), + span: span, + ident_span: None, + children: children, + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: body, + transport: None, + properties: properties, + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) } pub fn local_transport_node(span: Rc) -> Rc { make_transport_node(Rc::new(vec![]), Rc::new(vec![]), None, span) } -pub fn rest_transport_node(base_url: Rc, auth_props: Rc>>, headers: Rc>>, method: Option>, path: Option>, query: Option>, request_body: Option>, response_format: Option>, span: Rc) -> Rc { +pub fn rest_transport_node( + base_url: Rc, + auth_props: Rc>>, + headers: Rc>>, + method: Option>, + path: Option>, + query: Option>, + request_body: Option>, + response_format: Option>, + span: Rc, +) -> Rc { { let zero_span = make_span(0, 0); -let url_field = make_field_init_node(&transport_url_key(), base_url, zero_span.clone(), zero_span.clone()); -let method_props = match method { - Some(m) => Rc::new(vec![make_field_init_node(&transport_method_key(), m.clone(), zero_span.clone(), zero_span.clone())]), - None => Rc::new(vec![]), -}; -let path_props = match path { - Some(p) => Rc::new(vec![make_field_init_node(&transport_path_template_key(), p.clone(), zero_span.clone(), zero_span.clone())]), - None => Rc::new(vec![]), -}; -let query_props = match query { - Some(q) => Rc::new(vec![make_field_init_node(&transport_query_key(), q.clone(), zero_span.clone(), zero_span.clone())]), - None => Rc::new(vec![]), -}; -let body_props = match request_body { - Some(b) => Rc::new(vec![make_field_init_node(&transport_body_key(), b.clone(), zero_span.clone(), zero_span.clone())]), - None => Rc::new(vec![]), -}; -let rf_props = match response_format { - Some(rf) => Rc::new(vec![make_field_init_node(&transport_response_format_key(), rf.clone(), zero_span.clone(), zero_span.clone())]), - None => Rc::new(vec![]), -}; -let props = v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(Rc::new(vec![url_field]), method_props), path_props), query_props), body_props), rf_props), auth_props), headers); -make_transport_node(props, Rc::new(vec![]), None, span) -} + let url_field = make_field_init_node( + &transport_url_key(), + base_url, + zero_span.clone(), + zero_span.clone(), + ); + let method_props = match method { + Some(m) => Rc::new(vec![make_field_init_node( + &transport_method_key(), + m.clone(), + zero_span.clone(), + zero_span.clone(), + )]), + None => Rc::new(vec![]), + }; + let path_props = match path { + Some(p) => Rc::new(vec![make_field_init_node( + &transport_path_template_key(), + p.clone(), + zero_span.clone(), + zero_span.clone(), + )]), + None => Rc::new(vec![]), + }; + let query_props = match query { + Some(q) => Rc::new(vec![make_field_init_node( + &transport_query_key(), + q.clone(), + zero_span.clone(), + zero_span.clone(), + )]), + None => Rc::new(vec![]), + }; + let body_props = match request_body { + Some(b) => Rc::new(vec![make_field_init_node( + &transport_body_key(), + b.clone(), + zero_span.clone(), + zero_span.clone(), + )]), + None => Rc::new(vec![]), + }; + let rf_props = match response_format { + Some(rf) => Rc::new(vec![make_field_init_node( + &transport_response_format_key(), + rf.clone(), + zero_span.clone(), + zero_span.clone(), + )]), + None => Rc::new(vec![]), + }; + let props = v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(Rc::new(vec![url_field]), method_props), + path_props, + ), + query_props, + ), + body_props, + ), + rf_props, + ), + auth_props, + ), + headers, + ); + make_transport_node(props, Rc::new(vec![]), None, span) + } } -pub fn shell_transport_node(argv: Rc>>, env: Rc>>, stdin: Option>, span: &Rc) -> Rc { +pub fn shell_transport_node( + argv: Rc>>, + env: Rc>>, + stdin: Option>, + span: &Rc, +) -> Rc { { let shell_marker = Rc::new(Node { - name: "".to_string(), - span: span.clone(), - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}); -let zero_span = make_span(0, 0); -let stdin_props = match stdin { - Some(s) => Rc::new(vec![make_field_init_node(&transport_stdin_key(), s.clone(), zero_span.clone(), zero_span.clone())]), - None => Rc::new(vec![]), -}; -let all_props = v2_rt::concat(env, stdin_props); -Rc::new(Node { - name: "".to_string(), - span: span.clone(), - ident_span: None, - children: argv, - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: Some(shell_marker), - transport: None, - properties: all_props, - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) -} + name: "".to_string(), + span: span.clone(), + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }); + let zero_span = make_span(0, 0); + let stdin_props = match stdin { + Some(s) => Rc::new(vec![make_field_init_node( + &transport_stdin_key(), + s.clone(), + zero_span.clone(), + zero_span.clone(), + )]), + None => Rc::new(vec![]), + }; + let all_props = v2_rt::concat(env, stdin_props); + Rc::new(Node { + name: "".to_string(), + span: span.clone(), + ident_span: None, + children: argv, + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: Some(shell_marker), + transport: None, + properties: all_props, + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) + } } pub fn file_transport_node(base_path: Rc, span: Rc) -> Rc { { - let path_field = make_field_init_node(&transport_path_key(), base_path, make_span(0, 0), make_span(0, 0)); -make_transport_node(Rc::new(vec![path_field]), Rc::new(vec![]), None, span) -} + let path_field = make_field_init_node( + &transport_path_key(), + base_path, + make_span(0, 0), + make_span(0, 0), + ); + make_transport_node(Rc::new(vec![path_field]), Rc::new(vec![]), None, span) + } } -pub fn find_property(props: Rc>>, prop_name: String, source_indices: Rc>>) -> Option> { - match Rc::new({ let mut __result = Vec::new(); for p in props.iter().cloned() { if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() == prop_name.clone().as_str()) { __result.push(p); } } __result }).first().cloned() { - Some(fi) => Some(field_init_node_value(&fi)), - None => None, -} +pub fn find_property( + props: Rc>>, + prop_name: String, + source_indices: Rc>>, +) -> Option> { + match Rc::new({ + let mut __result = Vec::new(); + for p in props.iter().cloned() { + if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() + == prop_name.clone().as_str()) + { + __result.push(p); + } + } + __result + }) + .first() + .cloned() + { + Some(fi) => Some(field_init_node_value(&fi)), + None => None, + } } -pub fn find_property_string(props: Rc>>, prop_name: String, source_indices: Rc>>) -> Option { +pub fn find_property_string( + props: Rc>>, + prop_name: String, + source_indices: Rc>>, +) -> Option { match find_property(props, prop_name, source_indices) { - Some(n) => match (*n.expr_data.clone()).clone() { - ExprData::ExprLiteral { ref value, .. } => { let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { unreachable!() }; Some(s.clone()) }, - _ => None, -}, - None => None, -} + Some(n) => match (*n.expr_data.clone()).clone() { + ExprData::ExprLiteral { ref value, .. } => { + let LiteralValue::LitStr { value: s, .. } = value.as_ref() else { + unreachable!() + }; + Some(s.clone()) + } + _ => None, + }, + None => None, + } } -pub fn transport_base_path(t: Rc, source_indices: Rc>>) -> Option> { +pub fn transport_base_path( + t: Rc, + source_indices: Rc>>, +) -> Option> { find_property(t.properties.clone(), transport_path_key(), source_indices) } @@ -1629,7 +2171,10 @@ pub fn transport_has_argv(t: Rc) -> bool { ((t.children.clone().len() as i64) > 0) } -pub fn is_rest_transport(t: Rc, source_indices: Rc>>) -> bool { +pub fn is_rest_transport( + t: Rc, + source_indices: Rc>>, +) -> bool { (transport_base_url(t, source_indices) != None) } @@ -1637,18 +2182,28 @@ pub fn is_shell_transport(t: Rc) -> bool { (t.body.clone() != None) } -pub fn is_file_transport(t: Rc, source_indices: Rc>>) -> bool { +pub fn is_file_transport( + t: Rc, + source_indices: Rc>>, +) -> bool { (transport_base_path(t, source_indices) != None) } -pub fn is_local_transport(t: &Rc, source_indices: &Rc>>) -> bool { - ((!is_rest_transport(t.clone(), source_indices.clone()) && !is_shell_transport(t.clone())) && !is_file_transport(t.clone(), source_indices.clone())) +pub fn is_local_transport( + t: &Rc, + source_indices: &Rc>>, +) -> bool { + ((!is_rest_transport(t.clone(), source_indices.clone()) && !is_shell_transport(t.clone())) + && !is_file_transport(t.clone(), source_indices.clone())) } -pub fn field_init_operation_modifier(field_init: Rc, source_indices: Rc>>) -> Option { +pub fn field_init_operation_modifier( + field_init: Rc, + source_indices: Rc>>, +) -> Option { { let fi_name = field_init_node_name_at(field_init, source_indices); -if (fi_name.clone().as_str() == "idempotent".to_string().as_str()) { + if (fi_name.clone().as_str() == "idempotent".to_string().as_str()) { Some(OperationModifier::Idempotent) } else { if (fi_name.clone().as_str() == "readonly".to_string().as_str()) { @@ -1661,304 +2216,700 @@ if (fi_name.clone().as_str() == "idempotent".to_string().as_str()) { } } } -} + } } pub fn operation_modifier_name(modifier: OperationModifier) -> String { match modifier { - OperationModifier::Idempotent => "idempotent".to_string(), - OperationModifier::Readonly => "readonly".to_string(), - OperationModifier::Hermetic => "hermetic".to_string(), -} + OperationModifier::Idempotent => "idempotent".to_string(), + OperationModifier::Readonly => "readonly".to_string(), + OperationModifier::Hermetic => "hermetic".to_string(), + } } -pub fn transport_base_url(t: Rc, source_indices: Rc>>) -> Option> { +pub fn transport_base_url( + t: Rc, + source_indices: Rc>>, +) -> Option> { find_property(t.properties.clone(), transport_url_key(), source_indices) } -pub fn transport_auth_token(t: Rc, source_indices: Rc>>) -> Option> { - find_property(t.properties.clone(), transport_auth_token_key(), source_indices) -} - -pub fn transport_auth_header_name(t: Rc, source_indices: Rc>>) -> Option { - find_property_string(t.properties.clone(), transport_auth_header_key(), source_indices) -} - -pub fn transport_has_auth(t: Rc, source_indices: Rc>>) -> bool { - match find_property(t.properties.clone(), transport_auth_token_key(), source_indices) { - Some(_) => true, - None => false, -} +pub fn transport_auth_token( + t: Rc, + source_indices: Rc>>, +) -> Option> { + find_property( + t.properties.clone(), + transport_auth_token_key(), + source_indices, + ) +} + +pub fn transport_auth_header_name( + t: Rc, + source_indices: Rc>>, +) -> Option { + find_property_string( + t.properties.clone(), + transport_auth_header_key(), + source_indices, + ) +} + +pub fn transport_has_auth( + t: Rc, + source_indices: Rc>>, +) -> bool { + match find_property( + t.properties.clone(), + transport_auth_token_key(), + source_indices, + ) { + Some(_) => true, + None => false, + } } -pub fn transport_method(t: Rc, source_indices: Rc>>) -> Option> { +pub fn transport_method( + t: Rc, + source_indices: Rc>>, +) -> Option> { find_property(t.properties.clone(), transport_method_key(), source_indices) } -pub fn transport_path_template(t: Rc, source_indices: Rc>>) -> Option> { - find_property(t.properties.clone(), transport_path_template_key(), source_indices) +pub fn transport_path_template( + t: Rc, + source_indices: Rc>>, +) -> Option> { + find_property( + t.properties.clone(), + transport_path_template_key(), + source_indices, + ) } -pub fn transport_query(t: Rc, source_indices: Rc>>) -> Option> { +pub fn transport_query( + t: Rc, + source_indices: Rc>>, +) -> Option> { find_property(t.properties.clone(), transport_query_key(), source_indices) } -pub fn transport_request_body(t: Rc, source_indices: Rc>>) -> Option> { +pub fn transport_request_body( + t: Rc, + source_indices: Rc>>, +) -> Option> { find_property(t.properties.clone(), transport_body_key(), source_indices) } -pub fn transport_stdin(t: Rc, source_indices: Rc>>) -> Option> { +pub fn transport_stdin( + t: Rc, + source_indices: Rc>>, +) -> Option> { find_property(t.properties.clone(), transport_stdin_key(), source_indices) } -pub fn transport_response_format(t: Rc, source_indices: Rc>>) -> Option> { - find_property(t.properties.clone(), transport_response_format_key(), source_indices) +pub fn transport_response_format( + t: Rc, + source_indices: Rc>>, +) -> Option> { + find_property( + t.properties.clone(), + transport_response_format_key(), + source_indices, + ) } pub fn is_config_reserved_key(name: &String) -> bool { - ((((((((((((name.clone().as_str() == transport_url_key().as_str()) || (name.clone().as_str() == transport_path_key().as_str())) || (name.clone().as_str() == transport_auth_scheme_key().as_str())) || (name.clone().as_str() == transport_auth_header_key().as_str())) || (name.clone().as_str() == transport_auth_token_key().as_str())) || (name.clone().as_str() == transport_method_key().as_str())) || (name.clone().as_str() == transport_path_template_key().as_str())) || (name.clone().as_str() == transport_query_key().as_str())) || (name.clone().as_str() == transport_body_key().as_str())) || (name.clone().as_str() == transport_stdin_key().as_str())) || (name.clone().as_str() == transport_response_format_key().as_str())) || (name.clone().as_str() == transport_headers_key().as_str())) -} - -pub fn transport_headers(t: Rc, source_indices: Rc>>) -> Rc>> { - Rc::new({ let mut __result = Vec::new(); for p in t.properties.clone().iter().cloned() { if !is_config_reserved_key(&field_init_node_name_at(p.clone(), source_indices.clone())) { __result.push(p); } } __result }) + ((((((((((((name.clone().as_str() == transport_url_key().as_str()) + || (name.clone().as_str() == transport_path_key().as_str())) + || (name.clone().as_str() == transport_auth_scheme_key().as_str())) + || (name.clone().as_str() == transport_auth_header_key().as_str())) + || (name.clone().as_str() == transport_auth_token_key().as_str())) + || (name.clone().as_str() == transport_method_key().as_str())) + || (name.clone().as_str() == transport_path_template_key().as_str())) + || (name.clone().as_str() == transport_query_key().as_str())) + || (name.clone().as_str() == transport_body_key().as_str())) + || (name.clone().as_str() == transport_stdin_key().as_str())) + || (name.clone().as_str() == transport_response_format_key().as_str())) + || (name.clone().as_str() == transport_headers_key().as_str())) +} + +pub fn transport_headers( + t: Rc, + source_indices: Rc>>, +) -> Rc>> { + Rc::new({ + let mut __result = Vec::new(); + for p in t.properties.clone().iter().cloned() { + if !is_config_reserved_key(&field_init_node_name_at(p.clone(), source_indices.clone())) + { + __result.push(p); + } + } + __result + }) } -pub fn transport_env(t: Rc, source_indices: Rc>>) -> Rc>> { - Rc::new({ let mut __result = Vec::new(); for p in t.properties.clone().iter().cloned() { if !is_config_reserved_key(&field_init_node_name_at(p.clone(), source_indices.clone())) { __result.push(p); } } __result }) +pub fn transport_env( + t: Rc, + source_indices: Rc>>, +) -> Rc>> { + Rc::new({ + let mut __result = Vec::new(); + for p in t.properties.clone().iter().cloned() { + if !is_config_reserved_key(&field_init_node_name_at(p.clone(), source_indices.clone())) + { + __result.push(p); + } + } + __result + }) } pub fn map_children(node: &Rc, transform: impl Fn(Rc) -> Rc + Clone) -> Rc { Rc::new(Node { - name: node.name.clone(), - ident: node.ident.clone(), - span: node.span.clone(), - ident_span: node.ident_span.clone(), - children: Rc::new({ let mut __result = Vec::new(); for child in node.children.clone().iter().cloned() { __result.push(transform(child.clone())); } __result }), - connective: node.connective.clone(), - params: node.params.clone(), - inferred: node.inferred.clone(), - return_cardinality: node.return_cardinality.clone(), - uses: node.uses.clone(), - body: node.body.clone(), - transport: node.transport.clone(), - properties: node.properties.clone(), - type_annotation: node.type_annotation.clone(), - is_self_recursive: node.is_self_recursive.clone(), - has_non_tail_self_call: node.has_non_tail_self_call.clone(), - match_pattern: node.match_pattern.clone(), - expr_data: node.expr_data.clone(), -}) -} - -pub fn expr_has_self_call(texpr: &Rc, fn_name: &String, source_indices: &Rc>>) -> bool { + name: node.name.clone(), + ident: node.ident.clone(), + span: node.span.clone(), + ident_span: node.ident_span.clone(), + children: Rc::new({ + let mut __result = Vec::new(); + for child in node.children.clone().iter().cloned() { + __result.push(transform(child.clone())); + } + __result + }), + connective: node.connective.clone(), + params: node.params.clone(), + inferred: node.inferred.clone(), + return_cardinality: node.return_cardinality.clone(), + uses: node.uses.clone(), + body: node.body.clone(), + transport: node.transport.clone(), + properties: node.properties.clone(), + type_annotation: node.type_annotation.clone(), + is_self_recursive: node.is_self_recursive.clone(), + has_non_tail_self_call: node.has_non_tail_self_call.clone(), + match_pattern: node.match_pattern.clone(), + expr_data: node.expr_data.clone(), + }) +} + +pub fn expr_has_self_call( + texpr: &Rc, + fn_name: &String, + source_indices: &Rc>>, +) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => if (expr_call_func_at(texpr.clone(), source_indices.clone()).as_str() == fn_name.clone().as_str()) { - true - } else { - { let mut __found = false; for child in texpr.children.clone().iter().cloned() { if expr_has_self_call(&child, &fn_name, &source_indices) { __found = true; break; } } __found } - }, - _ => { let mut __found = false; for child in texpr.children.clone().iter().cloned() { if expr_has_self_call(&child, &fn_name, &source_indices) { __found = true; break; } } __found }, -} + ExprData::ExprCall { .. } => { + if (expr_call_func_at(texpr.clone(), source_indices.clone()).as_str() + == fn_name.clone().as_str()) + { + true + } else { + { + let mut __found = false; + for child in texpr.children.clone().iter().cloned() { + if expr_has_self_call(&child, &fn_name, &source_indices) { + __found = true; + break; + } + } + __found + } + } + } + _ => { + let mut __found = false; + for child in texpr.children.clone().iter().cloned() { + if expr_has_self_call(&child, &fn_name, &source_indices) { + __found = true; + break; + } + } + __found + } + } }) } -pub fn expr_has_non_tail_self_call(texpr: &Rc, fn_name: &String, in_tail: bool, source_indices: &Rc>>) -> bool { +pub fn expr_has_non_tail_self_call( + texpr: &Rc, + fn_name: &String, + in_tail: bool, + source_indices: &Rc>>, +) -> bool { stacker::maybe_grow(512 * 1024, 2 * 1024 * 1024, || { match (*texpr.expr_data.clone()).clone() { - ExprData::ExprCall { .. } => if (expr_call_func_at(texpr.clone(), source_indices.clone()).as_str() == fn_name.clone().as_str()) { - if (in_tail.clone() == false) { - true - } else { - { let mut __found = false; for child in texpr.children.clone().iter().cloned() { if expr_has_non_tail_self_call(&child, &fn_name, false, &source_indices) { __found = true; break; } } __found } - } - } else { - { let mut __found = false; for child in texpr.children.clone().iter().cloned() { if expr_has_non_tail_self_call(&child, &fn_name, false, &source_indices) { __found = true; break; } } __found } - }, - ExprData::ExprError { .. } => false, - ExprData::ExprVar { .. } => false, - ExprData::ExprLiteral { .. } => false, - ExprData::ExprFieldAccess { .. } => { let mut __found = false; for child in texpr.children.clone().iter().cloned() { if expr_has_non_tail_self_call(&child, &fn_name, false, &source_indices) { __found = true; break; } } __found }, - ExprData::ExprMethodCall { .. } => { let mut __found = false; for child in texpr.children.clone().iter().cloned() { if expr_has_non_tail_self_call(&child, &fn_name, false, &source_indices) { __found = true; break; } } __found }, - ExprData::ExprIf => { - let cond_bad = expr_has_non_tail_self_call(&if_condition(texpr.clone()), &fn_name, false, &source_indices); -let then_bad = expr_has_non_tail_self_call(&if_then_branch(texpr.clone()), &fn_name, in_tail.clone(), &source_indices); -let else_bad = match if_else_branch(texpr.clone()) { - Some(e) => expr_has_non_tail_self_call(&e, &fn_name, in_tail.clone(), &source_indices), - None => false, -}; -((cond_bad || then_bad) || else_bad) -}, - ExprData::ExprMatch => { - let scrut_bad = expr_has_non_tail_self_call(&match_scrutinee(texpr.clone()), &fn_name, false, &source_indices); -let arms_bad = { let mut __found = false; for arm_node in match_arm_nodes(texpr.clone()).iter().cloned() { if expr_has_non_tail_self_call(&arm_body(&arm_node), &fn_name, in_tail.clone(), &source_indices) { __found = true; break; } } __found }; -(scrut_bad || arms_bad) -}, - ExprData::ExprLet => { - let val_bad = expr_has_non_tail_self_call(&let_value(texpr.clone()), &fn_name, false, &source_indices); -let body_bad = match let_body(texpr.clone()) { - Some(b) => expr_has_non_tail_self_call(&b, &fn_name, in_tail.clone(), &source_indices), - None => false, -}; -(val_bad || body_bad) -}, - ExprData::ExprBlock => { - let ss = texpr.children.clone(); -let ss_count = (ss.clone().len() as i64); -if (ss_count.clone() == 0) { - false - } else { + ExprData::ExprCall { .. } => { + if (expr_call_func_at(texpr.clone(), source_indices.clone()).as_str() + == fn_name.clone().as_str()) { - let init_bad = { let mut __found = false; for p in Rc::new({ let mut __result = Vec::new(); for p in Rc::new(ss.clone().iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned() { if (p.0.clone() < (ss_count.clone() - 1)) { __result.push(p); } } __result }).iter().cloned() { if expr_has_non_tail_self_call(&p.1.clone(), &fn_name, false, &source_indices) { __found = true; break; } } __found }; -let last_bad = match ss.clone().last().cloned() { - Some(last_expr) => expr_has_non_tail_self_call(&last_expr, &fn_name, in_tail.clone(), &source_indices), - None => false, -}; -(init_bad || last_bad) -} + if (in_tail.clone() == false) { + true + } else { + { + let mut __found = false; + for child in texpr.children.clone().iter().cloned() { + if expr_has_non_tail_self_call( + &child, + &fn_name, + false, + &source_indices, + ) { + __found = true; + break; + } + } + __found + } + } + } else { + { + let mut __found = false; + for child in texpr.children.clone().iter().cloned() { + if expr_has_non_tail_self_call(&child, &fn_name, false, &source_indices) + { + __found = true; + break; + } + } + __found + } + } } -}, - ExprData::ExprReturn => { let mut __found = false; for child in texpr.children.clone().iter().cloned() { if expr_has_non_tail_self_call(&child, &fn_name, true, &source_indices) { __found = true; break; } } __found }, - ExprData::NoExprData => { let mut __found = false; for child in texpr.children.clone().iter().cloned() { if expr_has_non_tail_self_call(&child, &fn_name, in_tail.clone(), &source_indices) { __found = true; break; } } __found }, - _ => { let mut __found = false; for child in texpr.children.clone().iter().cloned() { if expr_has_non_tail_self_call(&child, &fn_name, false, &source_indices) { __found = true; break; } } __found }, -} + ExprData::ExprError { .. } => false, + ExprData::ExprVar { .. } => false, + ExprData::ExprLiteral { .. } => false, + ExprData::ExprFieldAccess { .. } => { + let mut __found = false; + for child in texpr.children.clone().iter().cloned() { + if expr_has_non_tail_self_call(&child, &fn_name, false, &source_indices) { + __found = true; + break; + } + } + __found + } + ExprData::ExprMethodCall { .. } => { + let mut __found = false; + for child in texpr.children.clone().iter().cloned() { + if expr_has_non_tail_self_call(&child, &fn_name, false, &source_indices) { + __found = true; + break; + } + } + __found + } + ExprData::ExprIf => { + let cond_bad = expr_has_non_tail_self_call( + &if_condition(texpr.clone()), + &fn_name, + false, + &source_indices, + ); + let then_bad = expr_has_non_tail_self_call( + &if_then_branch(texpr.clone()), + &fn_name, + in_tail.clone(), + &source_indices, + ); + let else_bad = match if_else_branch(texpr.clone()) { + Some(e) => { + expr_has_non_tail_self_call(&e, &fn_name, in_tail.clone(), &source_indices) + } + None => false, + }; + ((cond_bad || then_bad) || else_bad) + } + ExprData::ExprMatch => { + let scrut_bad = expr_has_non_tail_self_call( + &match_scrutinee(texpr.clone()), + &fn_name, + false, + &source_indices, + ); + let arms_bad = { + let mut __found = false; + for arm_node in match_arm_nodes(texpr.clone()).iter().cloned() { + if expr_has_non_tail_self_call( + &arm_body(&arm_node), + &fn_name, + in_tail.clone(), + &source_indices, + ) { + __found = true; + break; + } + } + __found + }; + (scrut_bad || arms_bad) + } + ExprData::ExprLet => { + let val_bad = expr_has_non_tail_self_call( + &let_value(texpr.clone()), + &fn_name, + false, + &source_indices, + ); + let body_bad = match let_body(texpr.clone()) { + Some(b) => { + expr_has_non_tail_self_call(&b, &fn_name, in_tail.clone(), &source_indices) + } + None => false, + }; + (val_bad || body_bad) + } + ExprData::ExprBlock => { + let ss = texpr.children.clone(); + let ss_count = (ss.clone().len() as i64); + if (ss_count.clone() == 0) { + false + } else { + { + let init_bad = { + let mut __found = false; + for p in Rc::new({ + let mut __result = Vec::new(); + for p in Rc::new( + ss.clone() + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + { + if (p.0.clone() < (ss_count.clone() - 1)) { + __result.push(p); + } + } + __result + }) + .iter() + .cloned() + { + if expr_has_non_tail_self_call( + &p.1.clone(), + &fn_name, + false, + &source_indices, + ) { + __found = true; + break; + } + } + __found + }; + let last_bad = match ss.clone().last().cloned() { + Some(last_expr) => expr_has_non_tail_self_call( + &last_expr, + &fn_name, + in_tail.clone(), + &source_indices, + ), + None => false, + }; + (init_bad || last_bad) + } + } + } + ExprData::ExprReturn => { + let mut __found = false; + for child in texpr.children.clone().iter().cloned() { + if expr_has_non_tail_self_call(&child, &fn_name, true, &source_indices) { + __found = true; + break; + } + } + __found + } + ExprData::NoExprData => { + let mut __found = false; + for child in texpr.children.clone().iter().cloned() { + if expr_has_non_tail_self_call( + &child, + &fn_name, + in_tail.clone(), + &source_indices, + ) { + __found = true; + break; + } + } + __found + } + _ => { + let mut __found = false; + for child in texpr.children.clone().iter().cloned() { + if expr_has_non_tail_self_call(&child, &fn_name, false, &source_indices) { + __found = true; + break; + } + } + __found + } + } }) } -pub fn service_config_properties(endpoint: Rc, auth: Option>, auth_input: Option>, auth_source: Option>, rate_limit: Option>, retry: Option>) -> Rc>> { +pub fn service_config_properties( + endpoint: Rc, + auth: Option>, + auth_input: Option>, + auth_source: Option>, + rate_limit: Option>, + retry: Option>, +) -> Rc>> { { let zero_span = make_span(0, 0); -let ep_prop = Rc::new(vec![make_field_init_node(&"svc_endpoint".to_string(), endpoint, zero_span.clone(), zero_span.clone())]); -let auth_prop = match auth { - Some(a) => Rc::new(vec![make_field_init_node(&"svc_auth".to_string(), a.clone(), zero_span.clone(), zero_span.clone())]), - None => Rc::new(vec![]), -}; -let auth_input_prop = match auth_input { - Some(ai) => Rc::new(vec![make_field_init_node(&"svc_auth_input".to_string(), ai.clone(), zero_span.clone(), zero_span.clone())]), - None => Rc::new(vec![]), -}; -let auth_source_prop = match auth_source { - Some(src) => Rc::new(vec![make_field_init_node(&"svc_auth_source".to_string(), src.clone(), zero_span.clone(), zero_span.clone())]), - None => Rc::new(vec![]), -}; -let rate_prop = match rate_limit { - Some(r) => Rc::new(vec![make_field_init_node(&"svc_rate_limit".to_string(), r.clone(), zero_span.clone(), zero_span.clone())]), - None => Rc::new(vec![]), -}; -let retry_prop = match retry { - Some(r) => Rc::new(vec![make_field_init_node(&"svc_retry".to_string(), r.clone(), zero_span.clone(), zero_span.clone())]), - None => Rc::new(vec![]), -}; -v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(v2_rt::concat(ep_prop, auth_prop), auth_input_prop), auth_source_prop), rate_prop), retry_prop) -} + let ep_prop = Rc::new(vec![make_field_init_node( + &"svc_endpoint".to_string(), + endpoint, + zero_span.clone(), + zero_span.clone(), + )]); + let auth_prop = match auth { + Some(a) => Rc::new(vec![make_field_init_node( + &"svc_auth".to_string(), + a.clone(), + zero_span.clone(), + zero_span.clone(), + )]), + None => Rc::new(vec![]), + }; + let auth_input_prop = match auth_input { + Some(ai) => Rc::new(vec![make_field_init_node( + &"svc_auth_input".to_string(), + ai.clone(), + zero_span.clone(), + zero_span.clone(), + )]), + None => Rc::new(vec![]), + }; + let auth_source_prop = match auth_source { + Some(src) => Rc::new(vec![make_field_init_node( + &"svc_auth_source".to_string(), + src.clone(), + zero_span.clone(), + zero_span.clone(), + )]), + None => Rc::new(vec![]), + }; + let rate_prop = match rate_limit { + Some(r) => Rc::new(vec![make_field_init_node( + &"svc_rate_limit".to_string(), + r.clone(), + zero_span.clone(), + zero_span.clone(), + )]), + None => Rc::new(vec![]), + }; + let retry_prop = match retry { + Some(r) => Rc::new(vec![make_field_init_node( + &"svc_retry".to_string(), + r.clone(), + zero_span.clone(), + zero_span.clone(), + )]), + None => Rc::new(vec![]), + }; + v2_rt::concat( + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(v2_rt::concat(ep_prop, auth_prop), auth_input_prop), + auth_source_prop, + ), + rate_prop, + ), + retry_prop, + ) + } } -pub fn has_service_config(n: Rc, source_indices: Rc>>) -> bool { - { let mut __found = false; for p in n.properties.clone().iter().cloned() { if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() == "svc_endpoint".to_string().as_str()) { __found = true; break; } } __found } +pub fn has_service_config( + n: Rc, + source_indices: Rc>>, +) -> bool { + { + let mut __found = false; + for p in n.properties.clone().iter().cloned() { + if (field_init_node_name_at(p.clone(), source_indices.clone()).as_str() + == "svc_endpoint".to_string().as_str()) + { + __found = true; + break; + } + } + __found + } } -pub fn service_config_endpoint(n: Rc, source_indices: Rc>>) -> Option> { - find_property(n.properties.clone(), "svc_endpoint".to_string(), source_indices) +pub fn service_config_endpoint( + n: Rc, + source_indices: Rc>>, +) -> Option> { + find_property( + n.properties.clone(), + "svc_endpoint".to_string(), + source_indices, + ) } -pub fn service_config_auth(n: Rc, source_indices: Rc>>) -> Option> { +pub fn service_config_auth( + n: Rc, + source_indices: Rc>>, +) -> Option> { find_property(n.properties.clone(), "svc_auth".to_string(), source_indices) } -pub fn service_config_rate_limit(n: Rc, source_indices: Rc>>) -> Option> { - find_property(n.properties.clone(), "svc_rate_limit".to_string(), source_indices) -} - -pub fn service_config_retry(n: Rc, source_indices: Rc>>) -> Option> { - find_property(n.properties.clone(), "svc_retry".to_string(), source_indices) -} - -pub fn service_config_auth_input(n: Rc, source_indices: Rc>>) -> Option> { - find_property(n.properties.clone(), "svc_auth_input".to_string(), source_indices) -} - -pub fn service_config_auth_source(n: Rc, source_indices: Rc>>) -> Option> { - find_property(n.properties.clone(), "svc_auth_source".to_string(), source_indices) +pub fn service_config_rate_limit( + n: Rc, + source_indices: Rc>>, +) -> Option> { + find_property( + n.properties.clone(), + "svc_rate_limit".to_string(), + source_indices, + ) +} + +pub fn service_config_retry( + n: Rc, + source_indices: Rc>>, +) -> Option> { + find_property( + n.properties.clone(), + "svc_retry".to_string(), + source_indices, + ) +} + +pub fn service_config_auth_input( + n: Rc, + source_indices: Rc>>, +) -> Option> { + find_property( + n.properties.clone(), + "svc_auth_input".to_string(), + source_indices, + ) +} + +pub fn service_config_auth_source( + n: Rc, + source_indices: Rc>>, +) -> Option> { + find_property( + n.properties.clone(), + "svc_auth_source".to_string(), + source_indices, + ) +} + +pub fn module_node( + name: &String, + imports: Rc>>, + items: Rc>>, + span: &Rc, +) -> Rc { + Rc::new(Node { + name: name.clone(), + span: span.clone(), + ident_span: default_ident_span(name.clone(), span.clone()), + children: items, + connective: Connective::NoConnective, + params: imports, + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) } -pub fn module_node(name: &String, imports: Rc>>, items: Rc>>, span: &Rc) -> Rc { - Rc::new(Node { - name: name.clone(), - span: span.clone(), - ident_span: default_ident_span(name.clone(), span.clone()), - children: items, - connective: Connective::NoConnective, - params: imports, - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) -} - -pub fn import_node(module_path: String, is_all: bool, specific_names: Rc>>, span: &Rc, name_span: Rc) -> Rc { +pub fn import_node( + module_path: String, + is_all: bool, + specific_names: Rc>>, + span: &Rc, + name_span: Rc, +) -> Rc { { let wildcard_marker = if is_all { Some(Rc::new(Node { - name: "".to_string(), - span: span.clone(), - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -})) + name: "".to_string(), + span: span.clone(), + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + })) } else { None }; -Rc::new(Node { - name: module_path, - span: span.clone(), - ident_span: Some(name_span), - children: specific_names, - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: wildcard_marker, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) -} + Rc::new(Node { + name: module_path, + span: span.clone(), + ident_span: Some(name_span), + children: specific_names, + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: wildcard_marker, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) + } } pub fn import_is_all(n: Rc) -> bool { (n.body.clone() != None) } -pub fn import_specific_names_at(n: Rc, source_indices: Rc>>) -> Rc> { - Rc::new({ let mut __result = Vec::new(); for c in n.children.clone().iter().cloned() { __result.push(authored_name_at(source_indices.clone(), &c)); } __result }) +pub fn import_specific_names_at( + n: Rc, + source_indices: Rc>>, +) -> Rc> { + Rc::new({ + let mut __result = Vec::new(); + for c in n.children.clone().iter().cloned() { + __result.push(authored_name_at(source_indices.clone(), &c)); + } + __result + }) } pub fn module_imports(n: Rc) -> Rc>> { @@ -1971,200 +2922,203 @@ pub fn module_items(n: Rc) -> Rc>> { pub fn leaf_node_with_span(name: &String, span: &Rc) -> Rc { Rc::new(Node { - name: name.clone(), - span: span.clone(), - ident_span: default_ident_span(name.clone(), span.clone()), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) + name: name.clone(), + span: span.clone(), + ident_span: default_ident_span(name.clone(), span.clone()), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) } pub fn kernel_span(name: &String) -> Rc { Rc::new(SourceSpan { - file: v2_rt::concat(v2_rt::concat("".to_string()), - start: 0, - end: v2_rt::string_length(&name), -}) + file: v2_rt::concat( + v2_rt::concat("".to_string(), + ), + start: 0, + end: v2_rt::string_length(&name), + }) } pub fn unit_type() -> Rc { thread_local! { - static CACHED: Rc = { - Rc::new(Node { - name: "Unit".to_string(), - span: kernel_span(&"Unit".to_string()), - ident_span: Some(kernel_span(&"Unit".to_string())), - children: Rc::new(vec![]), - connective: Connective::Conj, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) - }; - } + static CACHED: Rc = { + Rc::new(Node { + name: "Unit".to_string(), + span: kernel_span(&"Unit".to_string()), + ident_span: Some(kernel_span(&"Unit".to_string())), + children: Rc::new(vec![]), + connective: Connective::Conj, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) + }; + } CACHED.with(|c| c.clone()) } pub fn bool_type() -> Rc { thread_local! { - static CACHED: Rc = { - Rc::new(Node { - name: "Bool".to_string(), - span: kernel_span(&"Bool".to_string()), - ident_span: Some(kernel_span(&"Bool".to_string())), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) - }; - } + static CACHED: Rc = { + Rc::new(Node { + name: "Bool".to_string(), + span: kernel_span(&"Bool".to_string()), + ident_span: Some(kernel_span(&"Bool".to_string())), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) + }; + } CACHED.with(|c| c.clone()) } pub fn string_type() -> Rc { thread_local! { - static CACHED: Rc = { - Rc::new(Node { - name: "String".to_string(), - span: kernel_span(&"String".to_string()), - ident_span: Some(kernel_span(&"String".to_string())), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) - }; - } + static CACHED: Rc = { + Rc::new(Node { + name: "String".to_string(), + span: kernel_span(&"String".to_string()), + ident_span: Some(kernel_span(&"String".to_string())), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) + }; + } CACHED.with(|c| c.clone()) } pub fn int_type() -> Rc { thread_local! { - static CACHED: Rc = { - Rc::new(Node { - name: "Int".to_string(), - span: kernel_span(&"Int".to_string()), - ident_span: Some(kernel_span(&"Int".to_string())), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) - }; - } + static CACHED: Rc = { + Rc::new(Node { + name: "Int".to_string(), + span: kernel_span(&"Int".to_string()), + ident_span: Some(kernel_span(&"Int".to_string())), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) + }; + } CACHED.with(|c| c.clone()) } pub fn float_type() -> Rc { thread_local! { - static CACHED: Rc = { - Rc::new(Node { - name: "Float".to_string(), - span: kernel_span(&"Float".to_string()), - ident_span: Some(kernel_span(&"Float".to_string())), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) - }; - } + static CACHED: Rc = { + Rc::new(Node { + name: "Float".to_string(), + span: kernel_span(&"Float".to_string()), + ident_span: Some(kernel_span(&"Float".to_string())), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) + }; + } CACHED.with(|c| c.clone()) } pub fn none_type() -> Rc { thread_local! { - static CACHED: Rc = { - Rc::new(Node { - name: "None".to_string(), - span: kernel_span(&"None".to_string()), - ident_span: Some(kernel_span(&"None".to_string())), - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: None, - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::NoExprData), - ident: None, -}) - }; - } + static CACHED: Rc = { + Rc::new(Node { + name: "None".to_string(), + span: kernel_span(&"None".to_string()), + ident_span: Some(kernel_span(&"None".to_string())), + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: None, + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::NoExprData), + ident: None, + }) + }; + } CACHED.with(|c| c.clone()) } @@ -2179,52 +3133,52 @@ pub fn tuple_type_name() -> String { pub fn error_type() -> Rc { thread_local! { - static CACHED: Rc = { - Rc::new(Node { - name: "".to_string(), - span: make_span(0, 0), - ident_span: None, - children: Rc::new(vec![]), - connective: Connective::NoConnective, - params: Rc::new(vec![]), - inferred: Some(Rc::new(InferredNode::CompilerError { - message: "unresolved type".to_string(), - span: make_span(0, 0), -})), - return_cardinality: Cardinality::Required, - uses: Rc::new(vec![]), - body: None, - transport: None, - properties: Rc::new(vec![]), - type_annotation: None, - is_self_recursive: false, - has_non_tail_self_call: false, - match_pattern: None, - expr_data: Rc::new(ExprData::ExprError { - kind: ExprErrorKind::SemanticExprError, - message: "unresolved type".to_string(), -}), - ident: None, -}) - }; - } + static CACHED: Rc = { + Rc::new(Node { + name: "".to_string(), + span: make_span(0, 0), + ident_span: None, + children: Rc::new(vec![]), + connective: Connective::NoConnective, + params: Rc::new(vec![]), + inferred: Some(Rc::new(InferredNode::CompilerError { + message: "unresolved type".to_string(), + span: make_span(0, 0), + })), + return_cardinality: Cardinality::Required, + uses: Rc::new(vec![]), + body: None, + transport: None, + properties: Rc::new(vec![]), + type_annotation: None, + is_self_recursive: false, + has_non_tail_self_call: false, + match_pattern: None, + expr_data: Rc::new(ExprData::ExprError { + kind: ExprErrorKind::SemanticExprError, + message: "unresolved type".to_string(), + }), + ident: None, + }) + }; + } CACHED.with(|c| c.clone()) } pub fn make_span(start: i64, end: i64) -> Rc { Rc::new(SourceSpan { - file: "".to_string(), - start: start, - end: end, -}) + file: "".to_string(), + start: start, + end: end, + }) } pub fn make_file_span(file: String, start: i64, end: i64) -> Rc { Rc::new(SourceSpan { - file: file, - start: start, - end: end, -}) + file: file, + start: start, + end: end, + }) } pub fn no_span() -> Rc { @@ -2247,17 +3201,29 @@ pub struct NewlineIndex { pub fn build_newline_index(file: String, source: &String) -> Rc { { let char_codes = Rc::new(source.clone().chars().map(|c| c as i64).collect::>()); -let offsets = Rc::new(char_codes.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()).iter().cloned().fold(Rc::new(vec![]), |acc: _, pair: (i64, i64)| if (pair.1.clone() == 10) { - v2_rt::rc_list_push(acc.clone(), pair.0.clone()) - } else { - acc.clone() + let offsets = Rc::new( + char_codes + .iter() + .cloned() + .enumerate() + .map(|(i, v)| (i as i64, v)) + .collect::>(), + ) + .iter() + .cloned() + .fold(Rc::new(vec![]), |acc: _, pair: (i64, i64)| { + if (pair.1.clone() == 10) { + v2_rt::rc_list_push(acc.clone(), pair.0.clone()) + } else { + acc.clone() + } }); -Rc::new(NewlineIndex { - file: file, - offsets: offsets, - source: source.clone(), -}) -} + Rc::new(NewlineIndex { + file: file, + offsets: offsets, + source: source.clone(), + }) + } } pub fn byte_to_line_col(index: &Rc, offset: i64) -> LineCol { @@ -2267,40 +3233,65 @@ pub fn byte_to_line_col(index: &Rc, offset: i64) -> LineCol { } else { offset.clone() }; -let line = ((Rc::new({ let mut __result = Vec::new(); for o in index.offsets.clone().iter().cloned() { if (o.clone() < clamped.clone()) { __result.push(o); } } __result }).len() as i64) + 1); -let line_start = if (line.clone() <= 1) { + let line = ((Rc::new({ + let mut __result = Vec::new(); + for o in index.offsets.clone().iter().cloned() { + if (o.clone() < clamped.clone()) { + __result.push(o); + } + } + __result + }) + .len() as i64) + + 1); + let line_start = if (line.clone() <= 1) { 0 } else { - match index.offsets.clone().get((line.clone() - 2) as usize).cloned() { - Some(o) => (o.clone() + 1), - None => 0, -} + match index + .offsets + .clone() + .get((line.clone() - 2) as usize) + .cloned() + { + Some(o) => (o.clone() + 1), + None => 0, + } }; -let col = ((clamped.clone() - line_start) + 1); -LineCol { - line: line.clone(), - col: col, -} -} + let col = ((clamped.clone() - line_start) + 1); + LineCol { + line: line.clone(), + col: col, + } + } } pub fn source_line_at(index: &Rc, line: i64) -> String { { let src_len = v2_rt::string_length(&index.source.clone()); -let line_start = if (line.clone() <= 1) { + let line_start = if (line.clone() <= 1) { 0 } else { - match index.offsets.clone().get((line.clone() - 2) as usize).cloned() { - Some(o) => (o.clone() + 1), - None => src_len.clone(), -} + match index + .offsets + .clone() + .get((line.clone() - 2) as usize) + .cloned() + { + Some(o) => (o.clone() + 1), + None => src_len.clone(), + } }; -let line_end = match index.offsets.clone().get((line.clone() - 1) as usize).cloned() { - Some(o) => o.clone(), - None => src_len.clone(), -}; -v2_rt::substring(&index.source.clone(), line_start, line_end) -} + let line_end = match index + .offsets + .clone() + .get((line.clone() - 1) as usize) + .cloned() + { + Some(o) => o.clone(), + None => src_len.clone(), + }; + v2_rt::substring(&index.source.clone(), line_start, line_end) + } } pub fn source_text_at(index: Rc, span: &Rc) -> String { @@ -2322,119 +3313,135 @@ pub struct InternResult { pub fn empty_intern_table() -> Rc { Rc::new(InternTable { - strings: Rc::new(vec!["".to_string()]), - index: v2_rt::rc_map_insert(v2_rt::rc_empty_map::(), "".to_string(), 0), - next_id: 1, -}) + strings: Rc::new(vec!["".to_string()]), + index: v2_rt::rc_map_insert(v2_rt::rc_empty_map::(), "".to_string(), 0), + next_id: 1, + }) } pub fn intern(table: &Rc, s: &String) -> Rc { match v2_rt::map_get(&table.index.clone(), s.clone()) { - Some(id) => Rc::new(InternResult { - table: table.clone(), - id: id.clone(), -}), - None => { - let id = table.next_id.clone(); -Rc::new(InternResult { - table: Rc::new(InternTable { - strings: v2_rt::rc_list_push(table.strings.clone(), s.clone()), - index: v2_rt::rc_map_insert(table.index.clone(), s.clone(), id.clone()), - next_id: (id.clone() + 1), -}), - id: id.clone(), -}) -}, -} + Some(id) => Rc::new(InternResult { + table: table.clone(), + id: id.clone(), + }), + None => { + let id = table.next_id.clone(); + Rc::new(InternResult { + table: Rc::new(InternTable { + strings: v2_rt::rc_list_push(table.strings.clone(), s.clone()), + index: v2_rt::rc_map_insert(table.index.clone(), s.clone(), id.clone()), + next_id: (id.clone() + 1), + }), + id: id.clone(), + }) + } + } } pub fn intern_str(table: Rc, id: i64) -> String { match table.strings.clone().get(id as usize).cloned() { - Some(s) => s.clone(), - None => "".to_string(), -} + Some(s) => s.clone(), + None => "".to_string(), + } } pub fn intern_find(table: Rc, s: String) -> Option { match v2_rt::map_get(&table.index.clone(), s) { - Some(id) => Some(id.clone()), - None => None, -} + Some(id) => Some(id.clone()), + None => None, + } } pub fn intern_find_or_empty(table: Rc, s: String) -> i64 { match v2_rt::map_get(&table.index.clone(), s) { - Some(id) => id.clone(), - None => 0, -} + Some(id) => id.clone(), + None => 0, + } } pub fn merge_intern_tables(tables: Rc>>) -> Rc { - tables.iter().cloned().fold(empty_intern_table(), |merged: Rc, t: Rc| t.strings.clone().iter().cloned().fold(merged, |m: Rc, s: String| if (s.clone().as_str() == "".to_string().as_str()) { - m.clone() - } else { - intern(&m, &s).table.clone() - })) + tables.iter().cloned().fold( + empty_intern_table(), + |merged: Rc, t: Rc| { + t.strings + .clone() + .iter() + .cloned() + .fold(merged, |m: Rc, s: String| { + if (s.clone().as_str() == "".to_string().as_str()) { + m.clone() + } else { + intern(&m, &s).table.clone() + } + }) + }, + ) } pub fn is_internable_token(shape: TokenShape) -> bool { match shape { - TokenShape::ShIdent => true, - TokenShape::ShKeyword => true, - _ => false, -} + TokenShape::ShIdent => true, + TokenShape::ShKeyword => true, + _ => false, + } } pub fn pre_intern_tokens(tokens: Rc>>, table: Rc) -> Rc { - tokens.iter().cloned().fold(table, |t: Rc, tok: Rc| if is_internable_token(tok.shape.clone()) { - intern(&t, &tok.text.clone()).table.clone() - } else { - t.clone() - }) + tokens + .iter() + .cloned() + .fold(table, |t: Rc, tok: Rc| { + if is_internable_token(tok.shape.clone()) { + intern(&t, &tok.text.clone()).table.clone() + } else { + t.clone() + } + }) } pub fn with_optional_cardinality(n: &Rc) -> Rc { Rc::new(Node { - name: n.name.clone(), - ident: n.ident.clone(), - span: n.span.clone(), - ident_span: n.ident_span.clone(), - children: n.children.clone(), - connective: n.connective.clone(), - params: n.params.clone(), - inferred: n.inferred.clone(), - return_cardinality: Cardinality::CardOptional, - uses: n.uses.clone(), - body: n.body.clone(), - transport: n.transport.clone(), - properties: n.properties.clone(), - type_annotation: n.type_annotation.clone(), - is_self_recursive: n.is_self_recursive.clone(), - has_non_tail_self_call: n.has_non_tail_self_call.clone(), - match_pattern: n.match_pattern.clone(), - expr_data: n.expr_data.clone(), -}) + name: n.name.clone(), + ident: n.ident.clone(), + span: n.span.clone(), + ident_span: n.ident_span.clone(), + children: n.children.clone(), + connective: n.connective.clone(), + params: n.params.clone(), + inferred: n.inferred.clone(), + return_cardinality: Cardinality::CardOptional, + uses: n.uses.clone(), + body: n.body.clone(), + transport: n.transport.clone(), + properties: n.properties.clone(), + type_annotation: n.type_annotation.clone(), + is_self_recursive: n.is_self_recursive.clone(), + has_non_tail_self_call: n.has_non_tail_self_call.clone(), + match_pattern: n.match_pattern.clone(), + expr_data: n.expr_data.clone(), + }) } pub fn with_required_cardinality(n: &Rc) -> Rc { Rc::new(Node { - name: n.name.clone(), - ident: n.ident.clone(), - span: n.span.clone(), - ident_span: n.ident_span.clone(), - children: n.children.clone(), - connective: n.connective.clone(), - params: n.params.clone(), - inferred: n.inferred.clone(), - return_cardinality: Cardinality::Required, - uses: n.uses.clone(), - body: n.body.clone(), - transport: n.transport.clone(), - properties: n.properties.clone(), - type_annotation: n.type_annotation.clone(), - is_self_recursive: n.is_self_recursive.clone(), - has_non_tail_self_call: n.has_non_tail_self_call.clone(), - match_pattern: n.match_pattern.clone(), - expr_data: n.expr_data.clone(), -}) + name: n.name.clone(), + ident: n.ident.clone(), + span: n.span.clone(), + ident_span: n.ident_span.clone(), + children: n.children.clone(), + connective: n.connective.clone(), + params: n.params.clone(), + inferred: n.inferred.clone(), + return_cardinality: Cardinality::Required, + uses: n.uses.clone(), + body: n.body.clone(), + transport: n.transport.clone(), + properties: n.properties.clone(), + type_annotation: n.type_annotation.clone(), + is_self_recursive: n.is_self_recursive.clone(), + has_non_tail_self_call: n.has_non_tail_self_call.clone(), + match_pattern: n.match_pattern.clone(), + expr_data: n.expr_data.clone(), + }) } From 44e7e1a2542c3dc40069851e421745a2b5eda10d Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sun, 10 May 2026 14:02:24 -0400 Subject: [PATCH 07/18] =?UTF-8?q?WIP:=20T-Anthropic-Wire=20coproduct=20sli?= =?UTF-8?q?ce=202=20=E2=80=94=20Anthropic=20tool=5Fresult=5Fcontent=20wire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/v2/stage0/src/v2_compiler_emit_rust.rs | 145 +++++++++++++++--- src/v2/stage0/src/v2_compiler_infer.rs | 121 +++++++++++++++ .../stage0/src/v2_compiler_infer_emit_info.rs | 4 + 3 files changed, 250 insertions(+), 20 deletions(-) diff --git a/src/v2/stage0/src/v2_compiler_emit_rust.rs b/src/v2/stage0/src/v2_compiler_emit_rust.rs index f8beb7fa92b..3ee75274fbb 100644 --- a/src/v2/stage0/src/v2_compiler_emit_rust.rs +++ b/src/v2/stage0/src/v2_compiler_emit_rust.rs @@ -4820,21 +4820,38 @@ pub fn emit_variant_pattern( ), None => name.clone(), }; - let is_fielded = - match v2_rt::map_get(&emit_info.fielded_variants.clone(), fielded_key) { + let is_untagged_tuple = match v2_rt::map_get( + &emit_info.untagged_json_tuple_variants.clone(), + fielded_key.clone(), + ) { + Some(true) => true, + _ => match v2_rt::map_get( + &emit_info.untagged_json_tuple_variants.clone(), + qualified.clone(), + ) { Some(true) => true, - _ => match v2_rt::map_get( - &emit_info.fielded_variants.clone(), - qualified.clone(), - ) { - Some(true) => true, - _ => false, - }, - }; - if is_fielded { - v2_rt::concat(qualified.clone(), " { .. }".to_string()) + _ => false, + }, + }; + if is_untagged_tuple { + v2_rt::concat(qualified.clone(), "(..)".to_string()) } else { - qualified.clone() + let is_fielded = + match v2_rt::map_get(&emit_info.fielded_variants.clone(), fielded_key) { + Some(true) => true, + _ => match v2_rt::map_get( + &emit_info.fielded_variants.clone(), + qualified.clone(), + ) { + Some(true) => true, + _ => false, + }, + }; + if is_fielded { + v2_rt::concat(qualified.clone(), " { .. }".to_string()) + } else { + qualified.clone() + } } } } else { @@ -4860,27 +4877,114 @@ pub fn emit_variant_pattern( ), None => name.clone(), }; - let is_fielded2 = match v2_rt::map_get( - &emit_info.fielded_variants.clone(), - fielded_key2, + let is_untagged_tuple2 = match v2_rt::map_get( + &emit_info.untagged_json_tuple_variants.clone(), + fielded_key2.clone(), ) { Some(true) => true, _ => match v2_rt::map_get( - &emit_info.fielded_variants.clone(), + &emit_info.untagged_json_tuple_variants.clone(), qualified.clone(), ) { Some(true) => true, _ => false, }, }; - if is_fielded2 { - v2_rt::concat(qualified.clone(), " { .. }".to_string()) + if is_untagged_tuple2 { + v2_rt::concat(qualified.clone(), "(..)".to_string()) } else { - qualified.clone() + let is_fielded2 = match v2_rt::map_get( + &emit_info.fielded_variants.clone(), + fielded_key2, + ) { + Some(true) => true, + _ => match v2_rt::map_get( + &emit_info.fielded_variants.clone(), + qualified.clone(), + ) { + Some(true) => true, + _ => false, + }, + }; + if is_fielded2 { + v2_rt::concat(qualified.clone(), " { .. }".to_string()) + } else { + qualified.clone() + } } } } else { { + let tuple_key = match resolved_parent.clone() { + Some(parent) => v2_rt::concat( + v2_rt::concat(parent.clone(), "::".to_string()), + name.clone(), + ), + None => qualified.clone(), + }; + let is_untagged_tuple3 = match v2_rt::map_get( + &emit_info.untagged_json_tuple_variants.clone(), + tuple_key, + ) { + Some(true) => true, + _ => match v2_rt::map_get( + &emit_info.untagged_json_tuple_variants.clone(), + qualified.clone(), + ) { + Some(true) => true, + _ => false, + }, + }; + if (is_untagged_tuple3 + && ((effective_bindings.clone().len() as i64) == 1)) + { + match effective_bindings.clone().first().cloned() { + Some(fb) => { + let fb_name = field_binding_name_at( + fb.clone(), + source_indices.clone(), + ); + let fb_pat = field_binding_pattern(fb.clone()); + if is_string_lit_pattern(fb_pat.clone()) { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(qualified.clone(), "(ref ".to_string()), + emit_ident(fb_name.clone(), RenderTarget::Rust), + ), + ")".to_string(), + ) + } else { + let is_shorthand = match (*fb_pat.clone()).clone() { + MatchPattern::Bind { name: n, .. } => { + (n.clone().as_str() == fb_name.clone().as_str()) + } + _ => false, + }; + if is_shorthand { + v2_rt::concat( + v2_rt::concat(qualified.clone(), "(".to_string()), + emit_ident(fb_name.clone(), RenderTarget::Rust), + ) + + ")" + } else { + let pat_str = emit_pattern( + fb_pat.clone(), + shared_types.clone(), + "".to_string(), + source_indices.clone(), + emit_info.clone(), + ); + v2_rt::concat( + v2_rt::concat(qualified.clone(), "(".to_string()), + pat_str, + ) + + ")" + } + } + } + None => v2_rt::concat(qualified.clone(), " { .. }".to_string()), + } + } else { let binding_strs = Rc::new({ let mut __result = Vec::new(); for fb in effective_bindings.clone().iter().cloned() { @@ -4941,6 +5045,7 @@ pub fn emit_variant_pattern( ), ", .. }".to_string(), ) + } } } } diff --git a/src/v2/stage0/src/v2_compiler_infer.rs b/src/v2/stage0/src/v2_compiler_infer.rs index 8a2797bae99..126be01fe7c 100644 --- a/src/v2/stage0/src/v2_compiler_infer.rs +++ b/src/v2/stage0/src/v2_compiler_infer.rs @@ -11489,6 +11489,125 @@ pub fn collect_parent_envs( } } +pub fn infer_field_value_by_name_for_wire( + record: Rc, + field_name: String, + source_indices: Rc>>, +) -> Option> { + for fi in record.children.iter() { + if field_init_node_name_at(fi.clone(), source_indices.clone()) == field_name { + return Some(field_init_node_value(fi)); + } + } + None +} + +pub fn infer_literal_string_value_for_wire(n: Rc) -> Option { + match (*n.expr_data.clone()).clone() { + ExprData::ExprLiteral { value: lv, .. } => match (*lv.clone()).clone() { + LiteralValue::LitStr { value: s, .. } => Some(s.clone()), + _ => None, + }, + _ => None, + } +} + +pub fn infer_record_string_field_for_wire( + record: Rc, + field_name: String, + source_indices: Rc>>, +) -> Option { + infer_field_value_by_name_for_wire(record, field_name, source_indices.clone()) + .and_then(|vn| infer_literal_string_value_for_wire(vn)) +} + +pub fn build_untagged_json_tuple_variants( + modules: Rc>>, +) -> Rc> { + modules.iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, m: Rc| { + let si = m.type_env.clone().source_indices.clone(); + m.items.clone().iter().cloned().fold( + acc, + |inner: Rc>, item: Rc| { + if item_kind(&item) == ItemKind::DataItem { + match item.body.clone() { + Some(body) => { + match infer_record_string_field_for_wire( + body.clone(), + "coproduct".to_string(), + si.clone(), + ) { + Some(coproduct_name) => { + match infer_field_value_by_name_for_wire( + body.clone(), + "encoding".to_string(), + si.clone(), + ) { + Some(enc_node) => { + if authored_name_at(si.clone(), &enc_node).as_str() + == "UntaggedJsonStringOrArray" + { + match infer_record_string_field_for_wire( + enc_node.clone(), + "string_variant".to_string(), + si.clone(), + ) { + Some(sv) => { + match infer_record_string_field_for_wire( + enc_node.clone(), + "array_variant".to_string(), + si.clone(), + ) { + Some(av) => { + let k1 = v2_rt::concat( + v2_rt::concat( + coproduct_name.clone(), + "::".to_string(), + ), + sv.clone(), + ); + let k2 = v2_rt::concat( + v2_rt::concat( + coproduct_name.clone(), + "::".to_string(), + ), + av.clone(), + ); + let inner2 = v2_rt::rc_map_insert( + inner.clone(), + k1, + true, + ); + v2_rt::rc_map_insert(inner2, k2, true) + } + None => inner.clone(), + } + } + None => inner.clone(), + } + } else { + inner.clone() + } + } + None => inner.clone(), + } + } + None => inner.clone(), + } + } + None => inner.clone(), + } + } else { + inner.clone() + } + }, + ) + }, + ) +} + pub fn build_fielded_variants( modules: Rc>>, type_summaries: Rc>>, @@ -11588,11 +11707,13 @@ pub fn build_emit_graph_info(modules: &Rc>>) -> Rc(), ownership_index: v2_rt::rc_empty_map::>>(), movable: v2_rt::rc_empty_map::(), diff --git a/src/v2/stage0/src/v2_compiler_infer_emit_info.rs b/src/v2/stage0/src/v2_compiler_infer_emit_info.rs index 67d890b8ea6..632b2675584 100644 --- a/src/v2/stage0/src/v2_compiler_infer_emit_info.rs +++ b/src/v2/stage0/src/v2_compiler_infer_emit_info.rs @@ -61,6 +61,9 @@ pub struct EmitGraphInfo { pub type_summaries: Rc>>, pub recursive_type_set: Rc>, pub fielded_variants: Rc>, + /// Keys `EnumName::VariantName` for variants serialized as single-field tuple arms + /// under `UntaggedJsonStringOrArray` wire contracts. + pub untagged_json_tuple_variants: Rc>, pub shared_types: Rc>, pub ownership_index: Rc>>>, pub movable: Rc>, @@ -80,6 +83,7 @@ pub fn empty_emit_graph_info() -> Rc { type_summaries: v2_rt::rc_empty_map::>(), recursive_type_set: v2_rt::rc_empty_map::(), fielded_variants: v2_rt::rc_empty_map::(), + untagged_json_tuple_variants: v2_rt::rc_empty_map::(), shared_types: v2_rt::rc_empty_map::(), ownership_index: v2_rt::rc_empty_map::>>(), movable: v2_rt::rc_empty_map::(), From b768904a22f878d21a21fb697bb50f0dd0c5fe68 Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sun, 10 May 2026 14:05:43 -0400 Subject: [PATCH 08/18] =?UTF-8?q?WIP:=20T-Anthropic-Wire=20coproduct=20sli?= =?UTF-8?q?ce=202=20=E2=80=94=20Anthropic=20tool=5Fresult=5Fcontent=20wire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/v2/stage0/src/v2_compiler_emit_rust.rs | 197 ++++++++++++++++++--- 1 file changed, 171 insertions(+), 26 deletions(-) diff --git a/src/v2/stage0/src/v2_compiler_emit_rust.rs b/src/v2/stage0/src/v2_compiler_emit_rust.rs index 3ee75274fbb..6288442e258 100644 --- a/src/v2/stage0/src/v2_compiler_emit_rust.rs +++ b/src/v2/stage0/src/v2_compiler_emit_rust.rs @@ -1711,6 +1711,7 @@ pub fn emit_rust(typed: &Rc) -> Rc { type_summaries: base_info.type_summaries.clone(), recursive_type_set: base_info.recursive_type_set.clone(), fielded_variants: base_info.fielded_variants.clone(), + untagged_json_tuple_variants: base_info.untagged_json_tuple_variants.clone(), shared_types: shared, ownership_index: ownership.ownership_index.clone(), movable: v2_rt::rc_empty_map::(), @@ -1966,6 +1967,7 @@ pub fn emit_module( type_summaries: base_info.type_summaries.clone(), recursive_type_set: base_info.recursive_type_set.clone(), fielded_variants: base_info.fielded_variants.clone(), + untagged_json_tuple_variants: base_info.untagged_json_tuple_variants.clone(), shared_types: shared, ownership_index: base_info.ownership_index.clone(), movable: base_info.movable.clone(), @@ -2695,6 +2697,9 @@ pub fn emit_typed_item( type_summaries: emit_info.type_summaries.clone(), recursive_type_set: emit_info.recursive_type_set.clone(), fielded_variants: emit_info.fielded_variants.clone(), + untagged_json_tuple_variants: emit_info + .untagged_json_tuple_variants + .clone(), shared_types: emit_info.shared_types.clone(), ownership_index: emit_info.ownership_index.clone(), movable: fn_movable, @@ -4962,10 +4967,12 @@ pub fn emit_variant_pattern( }; if is_shorthand { v2_rt::concat( - v2_rt::concat(qualified.clone(), "(".to_string()), - emit_ident(fb_name.clone(), RenderTarget::Rust), + v2_rt::concat( + v2_rt::concat(qualified.clone(), "(".to_string()), + emit_ident(fb_name.clone(), RenderTarget::Rust), + ), + ")".to_string(), ) - + ")" } else { let pat_str = emit_pattern( fb_pat.clone(), @@ -4975,10 +4982,12 @@ pub fn emit_variant_pattern( emit_info.clone(), ); v2_rt::concat( - v2_rt::concat(qualified.clone(), "(".to_string()), - pat_str, + v2_rt::concat( + v2_rt::concat(qualified.clone(), "(".to_string()), + pat_str, + ), + ")".to_string(), ) - + ")" } } } @@ -5358,21 +5367,38 @@ pub fn emit_variant_pattern_rc_aware( ), None => name.clone(), }; - let is_fielded = - match v2_rt::map_get(&emit_info.fielded_variants.clone(), fielded_key) { + let is_untagged_tuple = match v2_rt::map_get( + &emit_info.untagged_json_tuple_variants.clone(), + fielded_key.clone(), + ) { + Some(true) => true, + _ => match v2_rt::map_get( + &emit_info.untagged_json_tuple_variants.clone(), + qualified.clone(), + ) { Some(true) => true, - _ => match v2_rt::map_get( - &emit_info.fielded_variants.clone(), - qualified.clone(), - ) { - Some(true) => true, - _ => false, - }, - }; - if is_fielded { - v2_rt::concat(qualified.clone(), " { .. }".to_string()) + _ => false, + }, + }; + if is_untagged_tuple { + v2_rt::concat(qualified.clone(), "(..)".to_string()) } else { - qualified.clone() + let is_fielded = + match v2_rt::map_get(&emit_info.fielded_variants.clone(), fielded_key) { + Some(true) => true, + _ => match v2_rt::map_get( + &emit_info.fielded_variants.clone(), + qualified.clone(), + ) { + Some(true) => true, + _ => false, + }, + }; + if is_fielded { + v2_rt::concat(qualified.clone(), " { .. }".to_string()) + } else { + qualified.clone() + } } } } else { @@ -5398,27 +5424,139 @@ pub fn emit_variant_pattern_rc_aware( ), None => name.clone(), }; - let is_fielded2 = match v2_rt::map_get( - &emit_info.fielded_variants.clone(), - fielded_key2, + let is_untagged_tuple2 = match v2_rt::map_get( + &emit_info.untagged_json_tuple_variants.clone(), + fielded_key2.clone(), ) { Some(true) => true, _ => match v2_rt::map_get( - &emit_info.fielded_variants.clone(), + &emit_info.untagged_json_tuple_variants.clone(), qualified.clone(), ) { Some(true) => true, _ => false, }, }; - if is_fielded2 { - v2_rt::concat(qualified.clone(), " { .. }".to_string()) + if is_untagged_tuple2 { + v2_rt::concat(qualified.clone(), "(..)".to_string()) } else { - qualified.clone() + let is_fielded2 = match v2_rt::map_get( + &emit_info.fielded_variants.clone(), + fielded_key2, + ) { + Some(true) => true, + _ => match v2_rt::map_get( + &emit_info.fielded_variants.clone(), + qualified.clone(), + ) { + Some(true) => true, + _ => false, + }, + }; + if is_fielded2 { + v2_rt::concat(qualified.clone(), " { .. }".to_string()) + } else { + qualified.clone() + } } } } else { { + let tuple_key = match resolved_parent.clone() { + Some(parent) => v2_rt::concat( + v2_rt::concat(parent.clone(), "::".to_string()), + name.clone(), + ), + None => qualified.clone(), + }; + let is_untagged_tuple3 = match v2_rt::map_get( + &emit_info.untagged_json_tuple_variants.clone(), + tuple_key, + ) { + Some(true) => true, + _ => match v2_rt::map_get( + &emit_info.untagged_json_tuple_variants.clone(), + qualified.clone(), + ) { + Some(true) => true, + _ => false, + }, + }; + if (is_untagged_tuple3 + && ((effective_bindings.clone().len() as i64) == 1)) + { + match effective_bindings.clone().first().cloned() { + Some(fb) => { + let fb_name = field_binding_name_at( + fb.clone(), + source_indices.clone(), + ); + let fb_pat = field_binding_pattern(fb.clone()); + if is_string_lit_pattern(fb_pat.clone()) { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(qualified.clone(), "(ref ".to_string()), + emit_ident(fb_name.clone(), RenderTarget::Rust), + ), + ")".to_string(), + ) + } else { + if field_needs_rc_ref( + fb_name.clone(), + rc_analysis.clone(), + ) { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(qualified.clone(), "(ref ".to_string()), + emit_ident(fb_name.clone(), RenderTarget::Rust), + ), + ")".to_string(), + ) + } else { + let is_shorthand = match (*fb_pat.clone()).clone() { + MatchPattern::Bind { name: n, .. } => { + (n.clone().as_str() == fb_name.clone().as_str()) + } + _ => false, + }; + if is_shorthand { + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(qualified.clone(), "(".to_string()), + emit_ident(fb_name.clone(), RenderTarget::Rust), + ), + ")".to_string(), + ) + } else { + let inner_analysis = analyze_rc_pattern( + fb_pat.clone(), + "".to_string(), + &shared_types, + &emit_info, + source_indices.clone(), + ); + let pat_str = emit_pattern_rc_aware( + fb_pat.clone(), + inner_analysis.clone(), + shared_types.clone(), + "".to_string(), + source_indices.clone(), + emit_info.clone(), + ); + v2_rt::concat( + v2_rt::concat( + v2_rt::concat(qualified.clone(), "(".to_string()), + pat_str, + ), + ")".to_string(), + ) + } + } + } + } + None => v2_rt::concat(qualified.clone(), " { .. }".to_string()), + } + } else { let binding_strs = Rc::new({ let mut __result = Vec::new(); for fb in effective_bindings.clone().iter().cloned() { @@ -5502,6 +5640,7 @@ pub fn emit_variant_pattern_rc_aware( ), ", .. }".to_string(), ) + } } } } @@ -8315,6 +8454,9 @@ pub fn emit_rust_fold_method_call( type_summaries: emit_info.type_summaries.clone(), recursive_type_set: emit_info.recursive_type_set.clone(), fielded_variants: emit_info.fielded_variants.clone(), + untagged_json_tuple_variants: emit_info + .untagged_json_tuple_variants + .clone(), shared_types: emit_info.shared_types.clone(), ownership_index: emit_info.ownership_index.clone(), movable: emit_info.movable.clone(), @@ -8345,6 +8487,9 @@ pub fn emit_rust_fold_method_call( type_summaries: emit_info.type_summaries.clone(), recursive_type_set: emit_info.recursive_type_set.clone(), fielded_variants: emit_info.fielded_variants.clone(), + untagged_json_tuple_variants: emit_info + .untagged_json_tuple_variants + .clone(), shared_types: emit_info.shared_types.clone(), ownership_index: emit_info.ownership_index.clone(), movable: v2_rt::rc_map_insert( From f81965d94e12f5a9bab14cff15fd10b7e95e2fcc Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sun, 10 May 2026 14:08:29 -0400 Subject: [PATCH 09/18] =?UTF-8?q?WIP:=20T-Anthropic-Wire=20coproduct=20sli?= =?UTF-8?q?ce=202=20=E2=80=94=20Anthropic=20tool=5Fresult=5Fcontent=20wire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/v2/stage0/src/v2_compiler_emit_rust.rs | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/v2/stage0/src/v2_compiler_emit_rust.rs b/src/v2/stage0/src/v2_compiler_emit_rust.rs index 6288442e258..d714cb8d21c 100644 --- a/src/v2/stage0/src/v2_compiler_emit_rust.rs +++ b/src/v2/stage0/src/v2_compiler_emit_rust.rs @@ -10773,6 +10773,58 @@ pub fn emit_typed_record_lit( empty_raw } } else { + if (((fields.clone().len() as i64) == 1) + && (match v2_rt::map_get( + &emit_info.untagged_json_tuple_variants.clone(), + display_tn.clone(), + ) { + Some(true) => true, + _ => false, + })) + { + match fields.clone().first().cloned() { + Some(f) => { + let f_name = field_init_node_name_at( + f.clone(), + scope.type_env.clone().source_indices.clone(), + ); + let f_value = field_init_node_value(&f); + let val_str = emit_field_value_with_context( + &f_value, + &resolved_type, + type_name.clone(), + &f_name, + registry.clone(), + &scope, + depth.clone(), + &shared_types, + &emit_info, + ); + let needs_wrap = (is_optional_struct_field( + emit_info.clone(), + tn.clone(), + f_name.clone(), + ) && (is_already_optional( + &f_value, + emit_info.clone(), + &scope, + ) == false)); + let field_val = if needs_wrap.clone() { + v2_rt::concat( + v2_rt::concat("Some(".to_string(), val_str.clone()), + ")".to_string(), + ) + } else { + val_str.clone() + }; + v2_rt::concat( + v2_rt::concat(display_tn.clone(), "(".to_string()), + v2_rt::concat(field_val, ")".to_string()), + ) + } + None => v2_rt::concat(display_tn.clone(), " {}".to_string()), + } + } else { { let field_strs = Rc::new({ let mut __result = Vec::new(); From 938fd6125890f70b97d6fbc53bf92f9915e6542f Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sun, 10 May 2026 14:11:47 -0400 Subject: [PATCH 10/18] =?UTF-8?q?WIP:=20T-Anthropic-Wire=20coproduct=20sli?= =?UTF-8?q?ce=202=20=E2=80=94=20Anthropic=20tool=5Fresult=5Fcontent=20wire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/v2/stage0/src/v2_compiler_emit_rust.rs | 1 + src/v3/grounding_coercion_fold/src/fold.rs | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/v2/stage0/src/v2_compiler_emit_rust.rs b/src/v2/stage0/src/v2_compiler_emit_rust.rs index d714cb8d21c..1fe1a174cd6 100644 --- a/src/v2/stage0/src/v2_compiler_emit_rust.rs +++ b/src/v2/stage0/src/v2_compiler_emit_rust.rs @@ -10973,6 +10973,7 @@ pub fn emit_typed_record_lit( ); raw } + } } } } diff --git a/src/v3/grounding_coercion_fold/src/fold.rs b/src/v3/grounding_coercion_fold/src/fold.rs index a8503552e14..8b761755526 100644 --- a/src/v3/grounding_coercion_fold/src/fold.rs +++ b/src/v3/grounding_coercion_fold/src/fold.rs @@ -151,7 +151,7 @@ fn reference_field(fields: &[(String, FieldValue)], label: &str) -> Option Option { match field(fields, label)? { - FieldValue::Literal(LiteralBits::Int(value)) => Some(*value), + FieldValue::Literal(LiteralBits::Int(value)) => value.parse().ok(), _ => None, } } @@ -188,7 +188,9 @@ fn parse_positive_interval_width(dag: &Dag, value: &FieldValue) -> Option { if let [FieldValue::Literal(LiteralBits::Int(units))] = payload.as_slice() { - return Some(PositiveIntervalWidth::UnitCount { units: *units }); + return Some(PositiveIntervalWidth::UnitCount { + units: units.parse().ok()?, + }); } if let [FieldValue::Record(fields)] = payload.as_slice() { return Some(PositiveIntervalWidth::UnitCount { @@ -248,7 +250,7 @@ fn parse_int_interval(dag: &Dag, value: &FieldValue) -> Option> { "BoundedInterval" => { if let [FieldValue::Literal(LiteralBits::Int(lower)), width] = payload.as_slice() { return Some(Interval::BoundedInterval { - lower: *lower, + lower: lower.parse().ok()?, width: parse_interval_width(dag, width)?, }); } From 38fe27c42527e70159cc43d0375e40cac71e612c Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sun, 10 May 2026 14:19:44 -0400 Subject: [PATCH 11/18] =?UTF-8?q?WIP:=20T-Anthropic-Wire=20coproduct=20sli?= =?UTF-8?q?ce=202=20=E2=80=94=20Anthropic=20tool=5Fresult=5Fcontent=20wire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/v2/stage0/src/v2_compiler_emit_rust.rs | 610 +++++++++++---------- 1 file changed, 331 insertions(+), 279 deletions(-) diff --git a/src/v2/stage0/src/v2_compiler_emit_rust.rs b/src/v2/stage0/src/v2_compiler_emit_rust.rs index 1fe1a174cd6..bfdf8598c0f 100644 --- a/src/v2/stage0/src/v2_compiler_emit_rust.rs +++ b/src/v2/stage0/src/v2_compiler_emit_rust.rs @@ -4841,17 +4841,19 @@ pub fn emit_variant_pattern( if is_untagged_tuple { v2_rt::concat(qualified.clone(), "(..)".to_string()) } else { - let is_fielded = - match v2_rt::map_get(&emit_info.fielded_variants.clone(), fielded_key) { + let is_fielded = match v2_rt::map_get( + &emit_info.fielded_variants.clone(), + fielded_key, + ) { + Some(true) => true, + _ => match v2_rt::map_get( + &emit_info.fielded_variants.clone(), + qualified.clone(), + ) { Some(true) => true, - _ => match v2_rt::map_get( - &emit_info.fielded_variants.clone(), - qualified.clone(), - ) { - Some(true) => true, - _ => false, - }, - }; + _ => false, + }, + }; if is_fielded { v2_rt::concat(qualified.clone(), " { .. }".to_string()) } else { @@ -4953,7 +4955,10 @@ pub fn emit_variant_pattern( if is_string_lit_pattern(fb_pat.clone()) { v2_rt::concat( v2_rt::concat( - v2_rt::concat(qualified.clone(), "(ref ".to_string()), + v2_rt::concat( + qualified.clone(), + "(ref ".to_string(), + ), emit_ident(fb_name.clone(), RenderTarget::Rust), ), ")".to_string(), @@ -4968,8 +4973,14 @@ pub fn emit_variant_pattern( if is_shorthand { v2_rt::concat( v2_rt::concat( - v2_rt::concat(qualified.clone(), "(".to_string()), - emit_ident(fb_name.clone(), RenderTarget::Rust), + v2_rt::concat( + qualified.clone(), + "(".to_string(), + ), + emit_ident( + fb_name.clone(), + RenderTarget::Rust, + ), ), ")".to_string(), ) @@ -4983,7 +4994,10 @@ pub fn emit_variant_pattern( ); v2_rt::concat( v2_rt::concat( - v2_rt::concat(qualified.clone(), "(".to_string()), + v2_rt::concat( + qualified.clone(), + "(".to_string(), + ), pat_str, ), ")".to_string(), @@ -4994,66 +5008,71 @@ pub fn emit_variant_pattern( None => v2_rt::concat(qualified.clone(), " { .. }".to_string()), } } else { - let binding_strs = Rc::new({ - let mut __result = Vec::new(); - for fb in effective_bindings.clone().iter().cloned() { - __result.push({ - let fb_name = field_binding_name_at( - fb.clone(), - source_indices.clone(), - ); - let fb_pat = field_binding_pattern(fb.clone()); - if is_string_lit_pattern(fb_pat.clone()) { - v2_rt::concat( - "ref ".to_string(), - emit_ident(fb_name.clone(), RenderTarget::Rust), - ) - } else { - { - let is_shorthand = match (*fb_pat.clone()).clone() { - MatchPattern::Bind { name: n, .. } => { - (n.clone().as_str() - == fb_name.clone().as_str()) - } - _ => false, - }; - if is_shorthand.clone() { - emit_ident(fb_name.clone(), RenderTarget::Rust) - } else { + let binding_strs = Rc::new({ + let mut __result = Vec::new(); + for fb in effective_bindings.clone().iter().cloned() { + __result.push({ + let fb_name = field_binding_name_at( + fb.clone(), + source_indices.clone(), + ); + let fb_pat = field_binding_pattern(fb.clone()); + if is_string_lit_pattern(fb_pat.clone()) { + v2_rt::concat( + "ref ".to_string(), + emit_ident(fb_name.clone(), RenderTarget::Rust), + ) + } else { + { + let is_shorthand = match (*fb_pat.clone()) + .clone() { - let pat_str = emit_pattern( - fb_pat.clone(), - shared_types.clone(), - "".to_string(), - source_indices.clone(), - emit_info.clone(), - ); - v2_rt::concat( + MatchPattern::Bind { name: n, .. } => { + (n.clone().as_str() + == fb_name.clone().as_str()) + } + _ => false, + }; + if is_shorthand.clone() { + emit_ident( + fb_name.clone(), + RenderTarget::Rust, + ) + } else { + { + let pat_str = emit_pattern( + fb_pat.clone(), + shared_types.clone(), + "".to_string(), + source_indices.clone(), + emit_info.clone(), + ); v2_rt::concat( - emit_ident( - fb_name.clone(), - RenderTarget::Rust, + v2_rt::concat( + emit_ident( + fb_name.clone(), + RenderTarget::Rust, + ), + ": ".to_string(), ), - ": ".to_string(), - ), - pat_str.clone(), - ) + pat_str.clone(), + ) + } } } } - } - }); - } - __result - }); - let bindings_str = binding_strs.join(&", ".to_string()); - v2_rt::concat( + }); + } + __result + }); + let bindings_str = binding_strs.join(&", ".to_string()); v2_rt::concat( - v2_rt::concat(qualified.clone(), " { ".to_string()), - bindings_str, - ), - ", .. }".to_string(), - ) + v2_rt::concat( + v2_rt::concat(qualified.clone(), " { ".to_string()), + bindings_str, + ), + ", .. }".to_string(), + ) } } } @@ -5383,17 +5402,19 @@ pub fn emit_variant_pattern_rc_aware( if is_untagged_tuple { v2_rt::concat(qualified.clone(), "(..)".to_string()) } else { - let is_fielded = - match v2_rt::map_get(&emit_info.fielded_variants.clone(), fielded_key) { + let is_fielded = match v2_rt::map_get( + &emit_info.fielded_variants.clone(), + fielded_key, + ) { + Some(true) => true, + _ => match v2_rt::map_get( + &emit_info.fielded_variants.clone(), + qualified.clone(), + ) { Some(true) => true, - _ => match v2_rt::map_get( - &emit_info.fielded_variants.clone(), - qualified.clone(), - ) { - Some(true) => true, - _ => false, - }, - }; + _ => false, + }, + }; if is_fielded { v2_rt::concat(qualified.clone(), " { .. }".to_string()) } else { @@ -5495,7 +5516,10 @@ pub fn emit_variant_pattern_rc_aware( if is_string_lit_pattern(fb_pat.clone()) { v2_rt::concat( v2_rt::concat( - v2_rt::concat(qualified.clone(), "(ref ".to_string()), + v2_rt::concat( + qualified.clone(), + "(ref ".to_string(), + ), emit_ident(fb_name.clone(), RenderTarget::Rust), ), ")".to_string(), @@ -5507,23 +5531,36 @@ pub fn emit_variant_pattern_rc_aware( ) { v2_rt::concat( v2_rt::concat( - v2_rt::concat(qualified.clone(), "(ref ".to_string()), - emit_ident(fb_name.clone(), RenderTarget::Rust), + v2_rt::concat( + qualified.clone(), + "(ref ".to_string(), + ), + emit_ident( + fb_name.clone(), + RenderTarget::Rust, + ), ), ")".to_string(), ) } else { let is_shorthand = match (*fb_pat.clone()).clone() { MatchPattern::Bind { name: n, .. } => { - (n.clone().as_str() == fb_name.clone().as_str()) + (n.clone().as_str() + == fb_name.clone().as_str()) } _ => false, }; if is_shorthand { v2_rt::concat( v2_rt::concat( - v2_rt::concat(qualified.clone(), "(".to_string()), - emit_ident(fb_name.clone(), RenderTarget::Rust), + v2_rt::concat( + qualified.clone(), + "(".to_string(), + ), + emit_ident( + fb_name.clone(), + RenderTarget::Rust, + ), ), ")".to_string(), ) @@ -5545,7 +5582,10 @@ pub fn emit_variant_pattern_rc_aware( ); v2_rt::concat( v2_rt::concat( - v2_rt::concat(qualified.clone(), "(".to_string()), + v2_rt::concat( + qualified.clone(), + "(".to_string(), + ), pat_str, ), ")".to_string(), @@ -5557,89 +5597,95 @@ pub fn emit_variant_pattern_rc_aware( None => v2_rt::concat(qualified.clone(), " { .. }".to_string()), } } else { - let binding_strs = Rc::new({ - let mut __result = Vec::new(); - for fb in effective_bindings.clone().iter().cloned() { - __result.push({ - let fb_name = field_binding_name_at( - fb.clone(), - source_indices.clone(), - ); - let fb_pat = field_binding_pattern(fb.clone()); - if is_string_lit_pattern(fb_pat.clone()) { - v2_rt::concat( - "ref ".to_string(), - emit_ident(fb_name.clone(), RenderTarget::Rust), - ) - } else { - if field_needs_rc_ref( - fb_name.clone(), - rc_analysis.clone(), - ) { + let binding_strs = Rc::new({ + let mut __result = Vec::new(); + for fb in effective_bindings.clone().iter().cloned() { + __result.push({ + let fb_name = field_binding_name_at( + fb.clone(), + source_indices.clone(), + ); + let fb_pat = field_binding_pattern(fb.clone()); + if is_string_lit_pattern(fb_pat.clone()) { v2_rt::concat( "ref ".to_string(), emit_ident(fb_name.clone(), RenderTarget::Rust), ) } else { - { - let is_shorthand = match (*fb_pat.clone()) - .clone() - { - MatchPattern::Bind { name: n, .. } => { - (n.clone().as_str() - == fb_name.clone().as_str()) - } - _ => false, - }; - if is_shorthand.clone() { + if field_needs_rc_ref( + fb_name.clone(), + rc_analysis.clone(), + ) { + v2_rt::concat( + "ref ".to_string(), emit_ident( fb_name.clone(), RenderTarget::Rust, - ) - } else { + ), + ) + } else { + { + let is_shorthand = match (*fb_pat.clone()) + .clone() { - let inner_analysis = analyze_rc_pattern( - fb_pat.clone(), - "".to_string(), - &shared_types, - &emit_info, - source_indices.clone(), - ); - let pat_str = emit_pattern_rc_aware( - fb_pat.clone(), - inner_analysis.clone(), - shared_types.clone(), - "".to_string(), - source_indices.clone(), - emit_info.clone(), - ); - v2_rt::concat( + MatchPattern::Bind { + name: n, .. + } => { + (n.clone().as_str() + == fb_name.clone().as_str()) + } + _ => false, + }; + if is_shorthand.clone() { + emit_ident( + fb_name.clone(), + RenderTarget::Rust, + ) + } else { + { + let inner_analysis = + analyze_rc_pattern( + fb_pat.clone(), + "".to_string(), + &shared_types, + &emit_info, + source_indices.clone(), + ); + let pat_str = emit_pattern_rc_aware( + fb_pat.clone(), + inner_analysis.clone(), + shared_types.clone(), + "".to_string(), + source_indices.clone(), + emit_info.clone(), + ); v2_rt::concat( - emit_ident( - fb_name.clone(), - RenderTarget::Rust, + v2_rt::concat( + emit_ident( + fb_name.clone(), + RenderTarget::Rust, + ), + ": ".to_string(), ), - ": ".to_string(), - ), - pat_str.clone(), - ) + pat_str.clone(), + ) + } } } } } - } - }); - } - __result - }); - let bindings_str = binding_strs.join(&", ".to_string()); - v2_rt::concat( + }); + } + __result + }); + let bindings_str = binding_strs.join(&", ".to_string()); v2_rt::concat( - v2_rt::concat(qualified.clone(), " { ".to_string()), - bindings_str, - ), - ", .. }".to_string(), - ) + v2_rt::concat( + v2_rt::concat(qualified.clone(), " { ".to_string()), + bindings_str, + ), + ", .. }".to_string(), + ) } } } @@ -10825,124 +10871,130 @@ pub fn emit_typed_record_lit( None => v2_rt::concat(display_tn.clone(), " {}".to_string()), } } else { - { - let field_strs = Rc::new({ - let mut __result = Vec::new(); - for f in fields.clone().iter().cloned() { - __result.push({ - let f_name = field_init_node_name_at( - f.clone(), - scope.type_env.clone().source_indices.clone(), - ); - let f_value = field_init_node_value(&f); - let val_str = emit_field_value_with_context( - &f_value, - &resolved_type, - type_name.clone(), - &f_name, - registry.clone(), - &scope, - depth.clone(), - &shared_types, - &emit_info, - ); - let needs_wrap = (is_optional_struct_field( - emit_info.clone(), - tn.clone(), - f_name.clone(), - ) && (is_already_optional( - &f_value, - emit_info.clone(), - &scope, - ) == false)); - let field_val = if needs_wrap.clone() { - v2_rt::concat( - v2_rt::concat("Some(".to_string(), val_str.clone()), - ")".to_string(), - ) - } else { - val_str.clone() - }; - v2_rt::concat( + { + let field_strs = Rc::new({ + let mut __result = Vec::new(); + for f in fields.clone().iter().cloned() { + __result.push({ + let f_name = field_init_node_name_at( + f.clone(), + scope.type_env.clone().source_indices.clone(), + ); + let f_value = field_init_node_value(&f); + let val_str = emit_field_value_with_context( + &f_value, + &resolved_type, + type_name.clone(), + &f_name, + registry.clone(), + &scope, + depth.clone(), + &shared_types, + &emit_info, + ); + let needs_wrap = (is_optional_struct_field( + emit_info.clone(), + tn.clone(), + f_name.clone(), + ) && (is_already_optional( + &f_value, + emit_info.clone(), + &scope, + ) == false)); + let field_val = if needs_wrap.clone() { + v2_rt::concat( + v2_rt::concat( + "Some(".to_string(), + val_str.clone(), + ), + ")".to_string(), + ) + } else { + val_str.clone() + }; v2_rt::concat( v2_rt::concat( v2_rt::concat( - " ".to_string(), - emit_ident( - f_name.clone(), - RenderTarget::Rust, + v2_rt::concat( + " ".to_string(), + emit_ident( + f_name.clone(), + RenderTarget::Rust, + ), ), + ": ".to_string(), ), - ": ".to_string(), + field_val.clone(), ), - field_val.clone(), - ), - ",".to_string(), - ) - }); - } - __result - }); - let provided_names = Rc::new({ - let mut __result = Vec::new(); - for f in fields.clone().iter().cloned() { - __result.push(field_init_node_name_at( - f.clone(), - scope.type_env.clone().source_indices.clone(), - )); - } - __result - }); - let provided_set = provided_names.iter().cloned().fold( - v2_rt::rc_empty_map::(), - |acc: Rc>, n: String| { - v2_rt::rc_map_insert(acc, n.clone(), true) - }, - ); - let summary = lookup_emit_type_summary(emit_info.clone(), tn.clone()); - let default_strs = match summary { - Some(s) => { - let fs = s.field_summaries.clone(); - let ftm = s.field_type_map.clone(); - let missing = Rc::new({ - let mut __result = Vec::new(); - for k in Rc::new(v2_rt::map_keys(&fs)).iter().cloned() { - if !emit_map_has(provided_set.clone(), k.clone()) { - __result.push(k); + ",".to_string(), + ) + }); + } + __result + }); + let provided_names = Rc::new({ + let mut __result = Vec::new(); + for f in fields.clone().iter().cloned() { + __result.push(field_init_node_name_at( + f.clone(), + scope.type_env.clone().source_indices.clone(), + )); + } + __result + }); + let provided_set = provided_names.iter().cloned().fold( + v2_rt::rc_empty_map::(), + |acc: Rc>, n: String| { + v2_rt::rc_map_insert(acc, n.clone(), true) + }, + ); + let summary = + lookup_emit_type_summary(emit_info.clone(), tn.clone()); + let default_strs = match summary { + Some(s) => { + let fs = s.field_summaries.clone(); + let ftm = s.field_type_map.clone(); + let missing = Rc::new({ + let mut __result = Vec::new(); + for k in Rc::new(v2_rt::map_keys(&fs)).iter().cloned() { + if !emit_map_has(provided_set.clone(), k.clone()) { + __result.push(k); + } } - } - __result - }); - let all_defaultable = { - let mut __all = true; - for fname in missing.clone().iter().cloned() { - if !({ - let has_zv = - match v2_rt::map_get(&ftm, fname.clone()) { - Some(ft) => match rust_zero_value(&ft) { - Some(_) => true, + __result + }); + let all_defaultable = { + let mut __all = true; + for fname in missing.clone().iter().cloned() { + if !({ + let has_zv = + match v2_rt::map_get(&ftm, fname.clone()) { + Some(ft) => { + match rust_zero_value(&ft) { + Some(_) => true, + None => false, + } + } None => false, - }, - None => false, - }; - (has_zv.clone() - || is_optional_struct_field( - emit_info.clone(), - tn.clone(), - fname.clone(), - )) - }) { - __all = false; - break; + }; + (has_zv.clone() + || is_optional_struct_field( + emit_info.clone(), + tn.clone(), + fname.clone(), + )) + }) { + __all = false; + break; + } } - } - __all - }; - if all_defaultable { - Rc::new({ - let mut __result = Vec::new(); - for fname in missing.clone().iter().cloned() { - __result.extend((*if is_optional_struct_field(emit_info.clone(), tn.clone(), fname.clone()) { + __all + }; + if all_defaultable { + Rc::new({ + let mut __result = Vec::new(); + for fname in missing.clone().iter().cloned() { + __result.extend((*if is_optional_struct_field(emit_info.clone(), tn.clone(), fname.clone()) { Rc::new(vec![v2_rt::concat(v2_rt::concat(" ".to_string(), emit_ident(fname.clone(), RenderTarget::Rust)), ": None,".to_string())]) } else { match v2_rt::map_get(&ftm, fname.clone()) { @@ -10953,26 +11005,26 @@ pub fn emit_typed_record_lit( None => Rc::new(vec![]), } }).iter().cloned()); - } - __result - }) - } else { - Rc::new(vec![]) + } + __result + }) + } else { + Rc::new(vec![]) + } } - } - None => Rc::new(vec![]), - }; - let all_field_strs = v2_rt::concat(field_strs, default_strs); - let fields_str = all_field_strs.join(&"\n".to_string()); - let raw = v2_rt::concat( - v2_rt::concat( - v2_rt::concat(display_tn, " {\n".to_string()), - fields_str, - ), - "\n}".to_string(), - ); - raw - } + None => Rc::new(vec![]), + }; + let all_field_strs = v2_rt::concat(field_strs, default_strs); + let fields_str = all_field_strs.join(&"\n".to_string()); + let raw = v2_rt::concat( + v2_rt::concat( + v2_rt::concat(display_tn, " {\n".to_string()), + fields_str, + ), + "\n}".to_string(), + ); + raw + } } } } From 77bfc6a706c37669b919fecb30e1be5d3f0ee8e3 Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sun, 10 May 2026 14:22:54 -0400 Subject: [PATCH 12/18] =?UTF-8?q?WIP:=20T-Anthropic-Wire=20coproduct=20sli?= =?UTF-8?q?ce=202=20=E2=80=94=20Anthropic=20tool=5Fresult=5Fcontent=20wire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pr-body-2646.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 pr-body-2646.md diff --git a/pr-body-2646.md b/pr-body-2646.md new file mode 100644 index 00000000000..c9882cf613c --- /dev/null +++ b/pr-body-2646.md @@ -0,0 +1,26 @@ +Auto-opened by session-dashboard for session `valiant-otter-36`. +Pushing to `session/valiant-otter-36` advances this PR. + +Closes #2606 + +## Worker attestation + +- Title names the Anthropic wire slice (not only the session id). +- Summary and test plan below replace the prior TODO placeholders. +- Local verification: `CTRL_BUILD_BYPASS_SHIMS=1 cargo check -p v2-compiler` and `CTRL_BUILD_BYPASS_SHIMS=1 cargo clippy --all-targets -- -D warnings` both succeeded on the pushed revision; `cargo fmt --all --check` clean. +- No secrets, credentials, or large binaries added. +- Branch commits are session work toward #2606 only. + +## Summary + +This PR lands **slice 2** of the Anthropic `tool_result_content` wire paydown: `AnthropicToolResultBlock` models `content` as a coproduct whose JSON wire accepts either a **scalar JSON string** or a **bare JSON array of nested content blocks** (Anthropic’s untagged union between string and array). + +The DSL adds `UntaggedJsonStringOrArray` in `dsl/std/serialization.dag`, extends `dsl/extdeps/llm/anthropic.dag` with the tool-result block shape, receipts, and wire contracts, and threads **`EmitGraphInfo.untagged_json_tuple_variants`** through the v2 compiler DAG (`04_emit_info`, `04_infer`, `05_emit_rust`) with matching **stage0** Rust in `src/v2/stage0/`. Codegen learns tuple-variant serde adjacency for untagged externals and correct construction in `emit_typed_record_lit` when a single record field participates in the untagged set. + +## Test plan + +- `cargo fmt --all --check` — pass. +- `CTRL_BUILD_BYPASS_SHIMS=1 cargo check -p v2-compiler` — pass. +- `CTRL_BUILD_BYPASS_SHIMS=1 cargo clippy --all-targets -- -D warnings` — pass. + +CI was previously **skipped** while the PR was a draft; fmt / ci / v3 / self_host should run after marking ready. From 9be498cff2a0e9b07e8607c6d5800e458fcc0ea5 Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sun, 10 May 2026 14:48:12 -0400 Subject: [PATCH 13/18] =?UTF-8?q?WIP:=20T-Anthropic-Wire=20coproduct=20sli?= =?UTF-8?q?ce=202=20=E2=80=94=20Anthropic=20tool=5Fresult=5Fcontent=20wire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pr-body-2646.md | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 pr-body-2646.md diff --git a/pr-body-2646.md b/pr-body-2646.md deleted file mode 100644 index c9882cf613c..00000000000 --- a/pr-body-2646.md +++ /dev/null @@ -1,26 +0,0 @@ -Auto-opened by session-dashboard for session `valiant-otter-36`. -Pushing to `session/valiant-otter-36` advances this PR. - -Closes #2606 - -## Worker attestation - -- Title names the Anthropic wire slice (not only the session id). -- Summary and test plan below replace the prior TODO placeholders. -- Local verification: `CTRL_BUILD_BYPASS_SHIMS=1 cargo check -p v2-compiler` and `CTRL_BUILD_BYPASS_SHIMS=1 cargo clippy --all-targets -- -D warnings` both succeeded on the pushed revision; `cargo fmt --all --check` clean. -- No secrets, credentials, or large binaries added. -- Branch commits are session work toward #2606 only. - -## Summary - -This PR lands **slice 2** of the Anthropic `tool_result_content` wire paydown: `AnthropicToolResultBlock` models `content` as a coproduct whose JSON wire accepts either a **scalar JSON string** or a **bare JSON array of nested content blocks** (Anthropic’s untagged union between string and array). - -The DSL adds `UntaggedJsonStringOrArray` in `dsl/std/serialization.dag`, extends `dsl/extdeps/llm/anthropic.dag` with the tool-result block shape, receipts, and wire contracts, and threads **`EmitGraphInfo.untagged_json_tuple_variants`** through the v2 compiler DAG (`04_emit_info`, `04_infer`, `05_emit_rust`) with matching **stage0** Rust in `src/v2/stage0/`. Codegen learns tuple-variant serde adjacency for untagged externals and correct construction in `emit_typed_record_lit` when a single record field participates in the untagged set. - -## Test plan - -- `cargo fmt --all --check` — pass. -- `CTRL_BUILD_BYPASS_SHIMS=1 cargo check -p v2-compiler` — pass. -- `CTRL_BUILD_BYPASS_SHIMS=1 cargo clippy --all-targets -- -D warnings` — pass. - -CI was previously **skipped** while the PR was a draft; fmt / ci / v3 / self_host should run after marking ready. From c43fae6ce1e4890a5aff8c39dfc513d911e65948 Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sun, 10 May 2026 14:25:56 -0400 Subject: [PATCH 14/18] =?UTF-8?q?WIP:=20T-Anthropic-Wire=20coproduct=20sli?= =?UTF-8?q?ce=202=20=E2=80=94=20Anthropic=20tool=5Fresult=5Fcontent=20wire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/v3/compiler/src/bootstrap_generated.rs | 16463 ++++++++-------- ...otstrap_generated_without_parse_surface.rs | 15557 +++++++-------- .../compiler/src/bootstrap_std_generated.rs | 71 +- 3 files changed, 16101 insertions(+), 15990 deletions(-) diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs index 0e63ad2f131..12ab530fc7b 100644 --- a/src/v3/compiler/src/bootstrap_generated.rs +++ b/src/v3/compiler/src/bootstrap_generated.rs @@ -8,7 +8,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag { ports: bootstrapped_fixture_dag_ports(), diagnostics: bootstrapped_fixture_dag_diagnostics(), next_node_id: 844, - next_declaration_id: 3217, + next_declaration_id: 3218, next_port_id: 1009, primitives: PrimitiveCache::default(), substrate_markers: SubstrateMarkers::default(), @@ -24,7 +24,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag { emit_model_variants: EmitModelVariants::default(), clusters: bootstrapped_fixture_dag_clusters(), optional_match_disjs: bootstrapped_fixture_dag_optional_match_disjs(), - declaration_append_begin_after_bootstrap: 3217, + declaration_append_begin_after_bootstrap: 3218, } } @@ -1386,7 +1386,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(180), - target: TransformTarget::Callable(DeclarationId(849)), + target: TransformTarget::Callable(DeclarationId(850)), inputs: vec![PortId(183), PortId(182)], output: PortId(184), span: SourceSpan::new("src/v3/std/algebra.dag", 10291, 10322), @@ -1402,21 +1402,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(182), - target: TransformTarget::Callable(DeclarationId(2030)), + target: TransformTarget::Callable(DeclarationId(2031)), inputs: vec![PortId(185)], output: PortId(187), span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(183), - target: TransformTarget::Callable(DeclarationId(2032)), + target: TransformTarget::Callable(DeclarationId(2033)), inputs: vec![PortId(187)], output: PortId(188), span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(184), - target: TransformTarget::Callable(DeclarationId(1976)), + target: TransformTarget::Callable(DeclarationId(1977)), inputs: vec![PortId(185), PortId(186), PortId(188)], output: PortId(189), span: SourceSpan::new("src/v3/std/algebra.dag", 11149, 11539), @@ -1432,7 +1432,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(186), - target: TransformTarget::Callable(DeclarationId(1978)), + target: TransformTarget::Callable(DeclarationId(1979)), inputs: vec![PortId(190), PortId(191), PortId(192)], output: PortId(193), span: SourceSpan::new("src/v3/std/algebra.dag", 11670, 11726), @@ -1448,7 +1448,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(188), - target: TransformTarget::Callable(DeclarationId(2033)), + target: TransformTarget::Callable(DeclarationId(2034)), inputs: vec![PortId(194)], output: PortId(195), span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810), @@ -1524,7 +1524,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(195), - target: TransformTarget::Callable(DeclarationId(856)), + target: TransformTarget::Callable(DeclarationId(857)), inputs: vec![PortId(203)], output: PortId(204), span: SourceSpan::new("src/v3/std/algebra.dag", 11975, 12003), @@ -1593,21 +1593,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(201), - target: TransformTarget::Callable(DeclarationId(853)), + target: TransformTarget::Callable(DeclarationId(854)), inputs: vec![PortId(209), PortId(210)], output: PortId(211), span: SourceSpan::new("src/v3/std/algebra.dag", 12333, 12348), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(202), - target: TransformTarget::Callable(DeclarationId(2017)), + target: TransformTarget::Callable(DeclarationId(2018)), inputs: vec![PortId(211)], output: PortId(212), span: SourceSpan::new("src/v3/std/algebra.dag", 12325, 12349), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(203), - target: TransformTarget::Callable(DeclarationId(869)), + target: TransformTarget::Callable(DeclarationId(870)), inputs: vec![PortId(212)], output: PortId(213), span: SourceSpan::new("src/v3/std/algebra.dag", 12315, 12350), @@ -1623,21 +1623,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(205), - target: TransformTarget::Callable(DeclarationId(853)), + target: TransformTarget::Callable(DeclarationId(854)), inputs: vec![PortId(214), PortId(215)], output: PortId(216), span: SourceSpan::new("src/v3/std/algebra.dag", 12630, 12652), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(206), - target: TransformTarget::Callable(DeclarationId(2015)), + target: TransformTarget::Callable(DeclarationId(2016)), inputs: vec![PortId(216)], output: PortId(217), span: SourceSpan::new("src/v3/std/algebra.dag", 12618, 12653), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(207), - target: TransformTarget::Callable(DeclarationId(869)), + target: TransformTarget::Callable(DeclarationId(870)), inputs: vec![PortId(217)], output: PortId(218), span: SourceSpan::new("src/v3/std/algebra.dag", 12608, 12654), @@ -1653,14 +1653,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(209), - target: TransformTarget::Callable(DeclarationId(862)), + target: TransformTarget::Callable(DeclarationId(863)), inputs: vec![PortId(220), PortId(219)], output: PortId(221), span: SourceSpan::new("src/v3/std/algebra.dag", 13598, 13623), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(210), - target: TransformTarget::Callable(DeclarationId(860)), + target: TransformTarget::Callable(DeclarationId(861)), inputs: vec![PortId(219), PortId(220)], output: PortId(222), span: SourceSpan::new("src/v3/std/algebra.dag", 13654, 13681), @@ -1703,14 +1703,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(213), - target: TransformTarget::Callable(DeclarationId(862)), + target: TransformTarget::Callable(DeclarationId(863)), inputs: vec![PortId(224), PortId(225)], output: PortId(226), span: SourceSpan::new("src/v3/std/algebra.dag", 13765, 13790), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(214), - target: TransformTarget::Callable(DeclarationId(857)), + target: TransformTarget::Callable(DeclarationId(858)), inputs: vec![PortId(224), PortId(225)], output: PortId(227), span: SourceSpan::new("src/v3/std/algebra.dag", 13815, 13841), @@ -1760,14 +1760,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(218), - target: TransformTarget::Callable(DeclarationId(2011)), + target: TransformTarget::Callable(DeclarationId(2012)), inputs: vec![PortId(230)], output: PortId(231), span: SourceSpan::new("src/v3/std/algebra.dag", 14214, 14229), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(219), - target: TransformTarget::Callable(DeclarationId(2035)), + target: TransformTarget::Callable(DeclarationId(2036)), inputs: vec![PortId(229), PortId(231)], output: PortId(232), span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245), @@ -1946,7 +1946,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(232), - target: TransformTarget::Callable(DeclarationId(863)), + target: TransformTarget::Callable(DeclarationId(864)), inputs: vec![PortId(253), PortId(258)], output: PortId(259), span: SourceSpan::new("src/v3/std/algebra.dag", 15597, 15623), @@ -2097,7 +2097,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(241), - target: TransformTarget::Callable(DeclarationId(863)), + target: TransformTarget::Callable(DeclarationId(864)), inputs: vec![PortId(275), PortId(274)], output: PortId(276), span: SourceSpan::new("src/v3/std/algebra.dag", 15912, 15942), @@ -2122,7 +2122,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(244), - target: TransformTarget::Callable(DeclarationId(863)), + target: TransformTarget::Callable(DeclarationId(864)), inputs: vec![PortId(278), PortId(279)], output: PortId(280), span: SourceSpan::new("src/v3/std/algebra.dag", 15986, 16020), @@ -2138,7 +2138,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(246), - target: TransformTarget::Callable(DeclarationId(856)), + target: TransformTarget::Callable(DeclarationId(857)), inputs: vec![PortId(281)], output: PortId(282), span: SourceSpan::new("src/v3/std/algebra.dag", 16038, 16059), @@ -2154,7 +2154,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(248), - target: TransformTarget::Callable(DeclarationId(856)), + target: TransformTarget::Callable(DeclarationId(857)), inputs: vec![PortId(283)], output: PortId(284), span: SourceSpan::new("src/v3/std/algebra.dag", 16063, 16084), @@ -2323,7 +2323,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(257), - target: TransformTarget::Callable(DeclarationId(863)), + target: TransformTarget::Callable(DeclarationId(864)), inputs: vec![PortId(295), PortId(298)], output: PortId(299), span: SourceSpan::new("src/v3/std/algebra.dag", 16308, 16334), @@ -2458,56 +2458,56 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(264), - target: TransformTarget::Callable(DeclarationId(870)), + target: TransformTarget::Callable(DeclarationId(871)), inputs: vec![PortId(311)], output: PortId(312), span: SourceSpan::new("src/v3/std/algebra.dag", 16927, 16945), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(265), - target: TransformTarget::Callable(DeclarationId(850)), + target: TransformTarget::Callable(DeclarationId(851)), inputs: vec![PortId(234)], output: PortId(313), span: SourceSpan::new("src/v3/std/algebra.dag", 16957, 16978), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(266), - target: TransformTarget::Callable(DeclarationId(2037)), + target: TransformTarget::Callable(DeclarationId(2038)), inputs: vec![PortId(312), PortId(313)], output: PortId(314), span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(267), - target: TransformTarget::Callable(DeclarationId(886)), + target: TransformTarget::Callable(DeclarationId(887)), inputs: vec![PortId(314)], output: PortId(315), span: SourceSpan::new("src/v3/std/algebra.dag", 16893, 17029), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(268), - target: TransformTarget::Callable(DeclarationId(870)), + target: TransformTarget::Callable(DeclarationId(871)), inputs: vec![PortId(316)], output: PortId(317), span: SourceSpan::new("src/v3/std/algebra.dag", 17092, 17110), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(269), - target: TransformTarget::Callable(DeclarationId(850)), + target: TransformTarget::Callable(DeclarationId(851)), inputs: vec![PortId(234)], output: PortId(318), span: SourceSpan::new("src/v3/std/algebra.dag", 17122, 17143), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(270), - target: TransformTarget::Callable(DeclarationId(2039)), + target: TransformTarget::Callable(DeclarationId(2040)), inputs: vec![PortId(317), PortId(318)], output: PortId(319), span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(271), - target: TransformTarget::Callable(DeclarationId(886)), + target: TransformTarget::Callable(DeclarationId(887)), inputs: vec![PortId(319)], output: PortId(320), span: SourceSpan::new("src/v3/std/algebra.dag", 17058, 17194), @@ -2616,7 +2616,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(274), - target: TransformTarget::Callable(DeclarationId(846)), + target: TransformTarget::Callable(DeclarationId(847)), inputs: vec![PortId(322), PortId(323)], output: PortId(324), span: SourceSpan::new("src/v3/std/algebra.dag", 17268, 17290), @@ -2811,14 +2811,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(290), - target: TransformTarget::Callable(DeclarationId(1212)), + target: TransformTarget::Callable(DeclarationId(1213)), inputs: vec![PortId(339)], output: PortId(344), span: SourceSpan::new("src/v3/std/algebra.dag", 18897, 18924), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(291), - target: TransformTarget::Callable(DeclarationId(1212)), + target: TransformTarget::Callable(DeclarationId(1213)), inputs: vec![PortId(343)], output: PortId(345), span: SourceSpan::new("src/v3/std/algebra.dag", 18928, 18955), @@ -3744,7 +3744,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(346), - target: TransformTarget::Callable(DeclarationId(865)), + target: TransformTarget::Callable(DeclarationId(866)), inputs: vec![PortId(404), PortId(405)], output: PortId(406), span: SourceSpan::new("src/v3/std/algebra.dag", 20681, 20707), @@ -3787,7 +3787,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(349), - target: TransformTarget::Callable(DeclarationId(865)), + target: TransformTarget::Callable(DeclarationId(866)), inputs: vec![PortId(408), PortId(409)], output: PortId(410), span: SourceSpan::new("src/v3/std/algebra.dag", 20814, 20840), @@ -3830,49 +3830,49 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(352), - target: TransformTarget::Callable(DeclarationId(870)), + target: TransformTarget::Callable(DeclarationId(871)), inputs: vec![PortId(413)], output: PortId(414), span: SourceSpan::new("src/v3/std/algebra.dag", 22044, 22062), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(353), - target: TransformTarget::Callable(DeclarationId(871)), + target: TransformTarget::Callable(DeclarationId(872)), inputs: vec![PortId(414)], output: PortId(415), span: SourceSpan::new("src/v3/std/algebra.dag", 22025, 22063), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(354), - target: TransformTarget::Callable(DeclarationId(877)), + target: TransformTarget::Callable(DeclarationId(878)), inputs: vec![PortId(415)], output: PortId(416), span: SourceSpan::new("src/v3/std/algebra.dag", 22014, 22064), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(355), - target: TransformTarget::Callable(DeclarationId(870)), + target: TransformTarget::Callable(DeclarationId(871)), inputs: vec![PortId(417)], output: PortId(418), span: SourceSpan::new("src/v3/std/algebra.dag", 22168, 22186), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(356), - target: TransformTarget::Callable(DeclarationId(872)), + target: TransformTarget::Callable(DeclarationId(873)), inputs: vec![PortId(418)], output: PortId(419), span: SourceSpan::new("src/v3/std/algebra.dag", 22136, 22187), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(357), - target: TransformTarget::Callable(DeclarationId(874)), + target: TransformTarget::Callable(DeclarationId(875)), inputs: vec![PortId(419)], output: PortId(420), span: SourceSpan::new("src/v3/std/algebra.dag", 22112, 22188), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(358), - target: TransformTarget::Callable(DeclarationId(879)), + target: TransformTarget::Callable(DeclarationId(880)), inputs: vec![PortId(420)], output: PortId(421), span: SourceSpan::new("src/v3/std/algebra.dag", 22097, 22189), @@ -3993,14 +3993,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(364), - target: TransformTarget::Callable(DeclarationId(2040)), + target: TransformTarget::Callable(DeclarationId(2041)), inputs: vec![PortId(425), PortId(426)], output: PortId(427), span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(365), - target: TransformTarget::Callable(DeclarationId(2041)), + target: TransformTarget::Callable(DeclarationId(2042)), inputs: vec![PortId(424), PortId(427)], output: PortId(428), span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324), @@ -4016,7 +4016,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(367), - target: TransformTarget::Callable(DeclarationId(2042)), + target: TransformTarget::Callable(DeclarationId(2043)), inputs: vec![], output: PortId(430), span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610), @@ -4032,7 +4032,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(369), - target: TransformTarget::Callable(DeclarationId(875)), + target: TransformTarget::Callable(DeclarationId(876)), inputs: vec![PortId(432)], output: PortId(433), span: SourceSpan::new("src/v3/std/algebra.dag", 22641, 22671), @@ -4048,7 +4048,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(371), - target: TransformTarget::Callable(DeclarationId(871)), + target: TransformTarget::Callable(DeclarationId(872)), inputs: vec![PortId(434)], output: PortId(435), span: SourceSpan::new("src/v3/std/algebra.dag", 22685, 22717), @@ -4073,14 +4073,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(374), - target: TransformTarget::Callable(DeclarationId(871)), + target: TransformTarget::Callable(DeclarationId(872)), inputs: vec![PortId(437)], output: PortId(438), span: SourceSpan::new("src/v3/std/algebra.dag", 22756, 22788), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(375), - target: TransformTarget::Callable(DeclarationId(2043)), + target: TransformTarget::Callable(DeclarationId(2044)), inputs: vec![PortId(436), PortId(438)], output: PortId(439), span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789), @@ -4162,7 +4162,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(380), - target: TransformTarget::Callable(DeclarationId(873)), + target: TransformTarget::Callable(DeclarationId(874)), inputs: vec![PortId(443)], output: PortId(444), span: SourceSpan::new("src/v3/std/algebra.dag", 23093, 23108), @@ -4176,21 +4176,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(382), - target: TransformTarget::Callable(DeclarationId(2011)), + target: TransformTarget::Callable(DeclarationId(2012)), inputs: vec![PortId(445)], output: PortId(446), span: SourceSpan::new("src/v3/std/algebra.dag", 23123, 23138), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(383), - target: TransformTarget::Callable(DeclarationId(2044)), + target: TransformTarget::Callable(DeclarationId(2045)), inputs: vec![], output: PortId(447), span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(384), - target: TransformTarget::Callable(DeclarationId(2045)), + target: TransformTarget::Callable(DeclarationId(2046)), inputs: vec![PortId(446), PortId(447)], output: PortId(448), span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148), @@ -4249,7 +4249,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(389), - target: TransformTarget::Callable(DeclarationId(875)), + target: TransformTarget::Callable(DeclarationId(876)), inputs: vec![PortId(453)], output: PortId(454), span: SourceSpan::new("src/v3/std/algebra.dag", 23272, 23302), @@ -4265,7 +4265,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(391), - target: TransformTarget::Callable(DeclarationId(873)), + target: TransformTarget::Callable(DeclarationId(874)), inputs: vec![PortId(455)], output: PortId(456), span: SourceSpan::new("src/v3/std/algebra.dag", 23306, 23328), @@ -4327,7 +4327,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(396), - target: TransformTarget::Callable(DeclarationId(2046)), + target: TransformTarget::Callable(DeclarationId(2047)), inputs: vec![], output: PortId(461), span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604), @@ -4343,7 +4343,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(398), - target: TransformTarget::Callable(DeclarationId(876)), + target: TransformTarget::Callable(DeclarationId(877)), inputs: vec![PortId(463)], output: PortId(464), span: SourceSpan::new("src/v3/std/algebra.dag", 23635, 23664), @@ -4359,7 +4359,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(400), - target: TransformTarget::Callable(DeclarationId(874)), + target: TransformTarget::Callable(DeclarationId(875)), inputs: vec![PortId(465)], output: PortId(466), span: SourceSpan::new("src/v3/std/algebra.dag", 23678, 23715), @@ -4384,14 +4384,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(403), - target: TransformTarget::Callable(DeclarationId(874)), + target: TransformTarget::Callable(DeclarationId(875)), inputs: vec![PortId(468)], output: PortId(469), span: SourceSpan::new("src/v3/std/algebra.dag", 23754, 23791), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(404), - target: TransformTarget::Callable(DeclarationId(2047)), + target: TransformTarget::Callable(DeclarationId(2048)), inputs: vec![PortId(467), PortId(469)], output: PortId(470), span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792), @@ -4796,7 +4796,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(430), - target: TransformTarget::Callable(DeclarationId(2011)), + target: TransformTarget::Callable(DeclarationId(2012)), inputs: vec![PortId(509)], output: PortId(510), span: SourceSpan::new("src/v3/std/algebra.dag", 25180, 25195), @@ -4839,21 +4839,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(435), - target: TransformTarget::Callable(DeclarationId(2048)), + target: TransformTarget::Callable(DeclarationId(2049)), inputs: vec![PortId(515), PortId(516)], output: PortId(517), span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(436), - target: TransformTarget::Callable(DeclarationId(889)), + target: TransformTarget::Callable(DeclarationId(890)), inputs: vec![PortId(517)], output: PortId(518), span: SourceSpan::new("src/v3/std/algebra.dag", 25302, 25350), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(437), - target: TransformTarget::Callable(DeclarationId(878)), + target: TransformTarget::Callable(DeclarationId(879)), inputs: vec![PortId(518)], output: PortId(519), span: SourceSpan::new("src/v3/std/algebra.dag", 25293, 25351), @@ -4936,7 +4936,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(442), - target: TransformTarget::Callable(DeclarationId(2011)), + target: TransformTarget::Callable(DeclarationId(2012)), inputs: vec![PortId(523)], output: PortId(524), span: SourceSpan::new("src/v3/std/algebra.dag", 25451, 25466), @@ -4988,14 +4988,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(448), - target: TransformTarget::Callable(DeclarationId(854)), + target: TransformTarget::Callable(DeclarationId(855)), inputs: vec![PortId(529), PortId(530), PortId(531)], output: PortId(532), span: SourceSpan::new("src/v3/std/algebra.dag", 25577, 25627), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(449), - target: TransformTarget::Callable(DeclarationId(2017)), + target: TransformTarget::Callable(DeclarationId(2018)), inputs: vec![PortId(532)], output: PortId(533), span: SourceSpan::new("src/v3/std/algebra.dag", 25569, 25628), @@ -5078,7 +5078,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(454), - target: TransformTarget::Callable(DeclarationId(2011)), + target: TransformTarget::Callable(DeclarationId(2012)), inputs: vec![PortId(537)], output: PortId(538), span: SourceSpan::new("src/v3/std/algebra.dag", 25917, 25932), @@ -5130,7 +5130,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(460), - target: TransformTarget::Callable(DeclarationId(880)), + target: TransformTarget::Callable(DeclarationId(881)), inputs: vec![PortId(544), PortId(545)], output: PortId(546), span: SourceSpan::new("src/v3/std/algebra.dag", 26086, 26135), @@ -5164,14 +5164,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(464), - target: TransformTarget::Callable(DeclarationId(854)), + target: TransformTarget::Callable(DeclarationId(855)), inputs: vec![PortId(548), PortId(549), PortId(550)], output: PortId(551), span: SourceSpan::new("src/v3/std/algebra.dag", 26171, 26221), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(465), - target: TransformTarget::Callable(DeclarationId(2015)), + target: TransformTarget::Callable(DeclarationId(2016)), inputs: vec![PortId(551)], output: PortId(552), span: SourceSpan::new("src/v3/std/algebra.dag", 26159, 26222), @@ -5277,49 +5277,49 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(470), - target: TransformTarget::Callable(DeclarationId(881)), + target: TransformTarget::Callable(DeclarationId(882)), inputs: vec![PortId(558), PortId(556), PortId(557)], output: PortId(559), span: SourceSpan::new("src/v3/std/algebra.dag", 26523, 26552), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(471), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(556), PortId(557)], output: PortId(561), span: SourceSpan::new("src/v3/std/algebra.dag", 26576, 26594), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(472), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(556), PortId(557)], output: PortId(563), span: SourceSpan::new("src/v3/std/algebra.dag", 26620, 26638), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(473), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(556), PortId(557)], output: PortId(565), span: SourceSpan::new("src/v3/std/algebra.dag", 26657, 26675), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(474), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(556), PortId(557)], output: PortId(567), span: SourceSpan::new("src/v3/std/algebra.dag", 26694, 26712), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(475), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(556), PortId(557)], output: PortId(569), span: SourceSpan::new("src/v3/std/algebra.dag", 26735, 26753), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(476), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(556), PortId(557)], output: PortId(571), span: SourceSpan::new("src/v3/std/algebra.dag", 26776, 26794), @@ -5428,49 +5428,49 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(479), - target: TransformTarget::Callable(DeclarationId(882)), + target: TransformTarget::Callable(DeclarationId(883)), inputs: vec![PortId(573), PortId(576), PortId(574), PortId(575)], output: PortId(577), span: SourceSpan::new("src/v3/std/algebra.dag", 26927, 26963), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(480), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(574), PortId(575)], output: PortId(579), span: SourceSpan::new("src/v3/std/algebra.dag", 26987, 27005), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(481), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(574), PortId(575)], output: PortId(581), span: SourceSpan::new("src/v3/std/algebra.dag", 27031, 27049), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(482), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(574), PortId(575)], output: PortId(583), span: SourceSpan::new("src/v3/std/algebra.dag", 27068, 27086), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(483), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(574), PortId(575)], output: PortId(585), span: SourceSpan::new("src/v3/std/algebra.dag", 27105, 27123), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(484), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(574), PortId(575)], output: PortId(587), span: SourceSpan::new("src/v3/std/algebra.dag", 27146, 27164), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(485), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(574), PortId(575)], output: PortId(589), span: SourceSpan::new("src/v3/std/algebra.dag", 27187, 27205), @@ -5579,21 +5579,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(488), - target: TransformTarget::Callable(DeclarationId(863)), + target: TransformTarget::Callable(DeclarationId(864)), inputs: vec![PortId(591), PortId(592)], output: PortId(595), span: SourceSpan::new("src/v3/std/algebra.dag", 27340, 27366), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(489), - target: TransformTarget::Callable(DeclarationId(883)), + target: TransformTarget::Callable(DeclarationId(884)), inputs: vec![PortId(591)], output: PortId(596), span: SourceSpan::new("src/v3/std/algebra.dag", 27376, 27397), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(490), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(593), PortId(594)], output: PortId(597), span: SourceSpan::new("src/v3/std/algebra.dag", 27409, 27427), @@ -5636,14 +5636,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(493), - target: TransformTarget::Callable(DeclarationId(853)), + target: TransformTarget::Callable(DeclarationId(854)), inputs: vec![PortId(599), PortId(600)], output: PortId(601), span: SourceSpan::new("src/v3/std/algebra.dag", 27617, 27632), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(494), - target: TransformTarget::Callable(DeclarationId(2015)), + target: TransformTarget::Callable(DeclarationId(2016)), inputs: vec![PortId(601)], output: PortId(602), span: SourceSpan::new("src/v3/std/algebra.dag", 27605, 27633), @@ -5677,7 +5677,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(498), - target: TransformTarget::Callable(DeclarationId(862)), + target: TransformTarget::Callable(DeclarationId(863)), inputs: vec![PortId(604), PortId(606)], output: PortId(607), span: SourceSpan::new("src/v3/std/algebra.dag", 27740, 27763), @@ -5700,7 +5700,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(501), - target: TransformTarget::Callable(DeclarationId(849)), + target: TransformTarget::Callable(DeclarationId(850)), inputs: vec![PortId(608), PortId(609)], output: PortId(610), span: SourceSpan::new("src/v3/std/algebra.dag", 27720, 27784), @@ -5734,7 +5734,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(505), - target: TransformTarget::Callable(DeclarationId(2049)), + target: TransformTarget::Callable(DeclarationId(2050)), inputs: vec![], output: PortId(615), span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995), @@ -5750,7 +5750,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(507), - target: TransformTarget::Callable(DeclarationId(862)), + target: TransformTarget::Callable(DeclarationId(863)), inputs: vec![PortId(614), PortId(617)], output: PortId(618), span: SourceSpan::new("src/v3/std/algebra.dag", 28026, 28057), @@ -5766,7 +5766,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(509), - target: TransformTarget::Callable(DeclarationId(887)), + target: TransformTarget::Callable(DeclarationId(888)), inputs: vec![PortId(619), PortId(614)], output: PortId(620), span: SourceSpan::new("src/v3/std/algebra.dag", 28071, 28116), @@ -5791,14 +5791,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(512), - target: TransformTarget::Callable(DeclarationId(887)), + target: TransformTarget::Callable(DeclarationId(888)), inputs: vec![PortId(622), PortId(614)], output: PortId(623), span: SourceSpan::new("src/v3/std/algebra.dag", 28155, 28200), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(513), - target: TransformTarget::Callable(DeclarationId(2050)), + target: TransformTarget::Callable(DeclarationId(2051)), inputs: vec![PortId(621), PortId(623)], output: PortId(624), span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201), @@ -5880,35 +5880,35 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(518), - target: TransformTarget::Callable(DeclarationId(850)), + target: TransformTarget::Callable(DeclarationId(851)), inputs: vec![PortId(629)], output: PortId(630), span: SourceSpan::new("src/v3/std/algebra.dag", 28329, 28353), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(519), - target: TransformTarget::Callable(DeclarationId(2052)), + target: TransformTarget::Callable(DeclarationId(2053)), inputs: vec![PortId(628), PortId(630)], output: PortId(631), span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(520), - target: TransformTarget::Callable(DeclarationId(886)), + target: TransformTarget::Callable(DeclarationId(887)), inputs: vec![PortId(631)], output: PortId(632), span: SourceSpan::new("src/v3/std/algebra.dag", 28310, 28378), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(521), - target: TransformTarget::Callable(DeclarationId(887)), + target: TransformTarget::Callable(DeclarationId(888)), inputs: vec![PortId(628), PortId(629)], output: PortId(633), span: SourceSpan::new("src/v3/std/algebra.dag", 28414, 28448), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(522), - target: TransformTarget::Callable(DeclarationId(2053)), + target: TransformTarget::Callable(DeclarationId(2054)), inputs: vec![PortId(629), PortId(633)], output: PortId(634), span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449), @@ -5951,14 +5951,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(525), - target: TransformTarget::Callable(DeclarationId(2054)), + target: TransformTarget::Callable(DeclarationId(2055)), inputs: vec![], output: PortId(637), span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(526), - target: TransformTarget::Callable(DeclarationId(2056)), + target: TransformTarget::Callable(DeclarationId(2057)), inputs: vec![PortId(636), PortId(637)], output: PortId(638), span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749), @@ -5981,7 +5981,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(529), - target: TransformTarget::Callable(DeclarationId(2011)), + target: TransformTarget::Callable(DeclarationId(2012)), inputs: vec![PortId(640)], output: PortId(641), span: SourceSpan::new("src/v3/std/induction.dag", 29099, 29114), @@ -5997,7 +5997,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(531), - target: TransformTarget::Callable(DeclarationId(1080)), + target: TransformTarget::Callable(DeclarationId(1081)), inputs: vec![PortId(643)], output: PortId(644), span: SourceSpan::new("src/v3/std/induction.dag", 29146, 29172), @@ -6013,7 +6013,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(533), - target: TransformTarget::Callable(DeclarationId(1081)), + target: TransformTarget::Callable(DeclarationId(1082)), inputs: vec![PortId(646)], output: PortId(647), span: SourceSpan::new("src/v3/std/induction.dag", 29209, 29238), @@ -6029,7 +6029,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(535), - target: TransformTarget::Callable(DeclarationId(1083)), + target: TransformTarget::Callable(DeclarationId(1084)), inputs: vec![PortId(649)], output: PortId(650), span: SourceSpan::new("src/v3/std/induction.dag", 29279, 29307), @@ -6054,7 +6054,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(538), - target: TransformTarget::Callable(DeclarationId(2019)), + target: TransformTarget::Callable(DeclarationId(2020)), inputs: vec![PortId(653)], output: PortId(654), span: SourceSpan::new("src/v3/std/induction.dag", 29338, 29412), @@ -6068,7 +6068,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(540), - target: TransformTarget::Callable(DeclarationId(2019)), + target: TransformTarget::Callable(DeclarationId(2020)), inputs: vec![PortId(655)], output: PortId(656), span: SourceSpan::new("src/v3/std/induction.dag", 29433, 29461), @@ -6082,7 +6082,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(542), - target: TransformTarget::Callable(DeclarationId(2019)), + target: TransformTarget::Callable(DeclarationId(2020)), inputs: vec![PortId(657)], output: PortId(658), span: SourceSpan::new("src/v3/std/induction.dag", 29480, 29513), @@ -6209,7 +6209,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(548), - target: TransformTarget::Callable(DeclarationId(2019)), + target: TransformTarget::Callable(DeclarationId(2020)), inputs: vec![PortId(664)], output: PortId(665), span: SourceSpan::new("src/v3/std/induction.dag", 29645, 29726), @@ -6234,7 +6234,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(551), - target: TransformTarget::Callable(DeclarationId(2019)), + target: TransformTarget::Callable(DeclarationId(2020)), inputs: vec![PortId(668)], output: PortId(669), span: SourceSpan::new("src/v3/std/induction.dag", 29761, 29835), @@ -6283,7 +6283,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(554), - target: TransformTarget::Callable(DeclarationId(1081)), + target: TransformTarget::Callable(DeclarationId(1082)), inputs: vec![PortId(671)], output: PortId(672), span: SourceSpan::new("src/v3/std/induction.dag", 30026, 30060), @@ -6299,28 +6299,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(556), - target: TransformTarget::Callable(DeclarationId(1237)), + target: TransformTarget::Callable(DeclarationId(1238)), inputs: vec![], output: PortId(676), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3031, 3059), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(557), - target: TransformTarget::Callable(DeclarationId(1246)), + target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![PortId(673), PortId(676)], output: PortId(677), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3007, 3060), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(558), - target: TransformTarget::Callable(DeclarationId(1237)), + target: TransformTarget::Callable(DeclarationId(1238)), inputs: vec![], output: PortId(678), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3096, 3124), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(559), - target: TransformTarget::Callable(DeclarationId(2483)), + target: TransformTarget::Callable(DeclarationId(2484)), inputs: vec![PortId(678)], output: PortId(679), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3087, 3125), @@ -6336,14 +6336,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(561), - target: TransformTarget::Callable(DeclarationId(1237)), + target: TransformTarget::Callable(DeclarationId(1238)), inputs: vec![], output: PortId(682), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3174, 3202), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(562), - target: TransformTarget::Callable(DeclarationId(2484)), + target: TransformTarget::Callable(DeclarationId(2485)), inputs: vec![PortId(682)], output: PortId(683), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3165, 3203), @@ -6388,28 +6388,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(564), - target: TransformTarget::Callable(DeclarationId(1237)), + target: TransformTarget::Callable(DeclarationId(1238)), inputs: vec![], output: PortId(686), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3268, 3296), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(565), - target: TransformTarget::Callable(DeclarationId(1246)), + target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![PortId(673), PortId(686)], output: PortId(687), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3244, 3297), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(566), - target: TransformTarget::Callable(DeclarationId(1237)), + target: TransformTarget::Callable(DeclarationId(1238)), inputs: vec![], output: PortId(688), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3333, 3361), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(567), - target: TransformTarget::Callable(DeclarationId(2485)), + target: TransformTarget::Callable(DeclarationId(2486)), inputs: vec![PortId(688)], output: PortId(689), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3324, 3362), @@ -6425,14 +6425,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(569), - target: TransformTarget::Callable(DeclarationId(1237)), + target: TransformTarget::Callable(DeclarationId(1238)), inputs: vec![], output: PortId(692), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3411, 3439), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(570), - target: TransformTarget::Callable(DeclarationId(2486)), + target: TransformTarget::Callable(DeclarationId(2487)), inputs: vec![PortId(692)], output: PortId(693), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3402, 3440), @@ -6477,28 +6477,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(572), - target: TransformTarget::Callable(DeclarationId(1237)), + target: TransformTarget::Callable(DeclarationId(1238)), inputs: vec![], output: PortId(696), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3502, 3530), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(573), - target: TransformTarget::Callable(DeclarationId(1246)), + target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![PortId(673), PortId(696)], output: PortId(697), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3478, 3531), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(574), - target: TransformTarget::Callable(DeclarationId(1237)), + target: TransformTarget::Callable(DeclarationId(1238)), inputs: vec![], output: PortId(698), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3567, 3595), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(575), - target: TransformTarget::Callable(DeclarationId(2487)), + target: TransformTarget::Callable(DeclarationId(2488)), inputs: vec![PortId(698)], output: PortId(699), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3558, 3596), @@ -6514,14 +6514,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(577), - target: TransformTarget::Callable(DeclarationId(1237)), + target: TransformTarget::Callable(DeclarationId(1238)), inputs: vec![], output: PortId(702), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3645, 3673), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(578), - target: TransformTarget::Callable(DeclarationId(2488)), + target: TransformTarget::Callable(DeclarationId(2489)), inputs: vec![PortId(702)], output: PortId(703), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3636, 3674), @@ -6566,28 +6566,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(580), - target: TransformTarget::Callable(DeclarationId(1237)), + target: TransformTarget::Callable(DeclarationId(1238)), inputs: vec![], output: PortId(706), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3734, 3762), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(581), - target: TransformTarget::Callable(DeclarationId(1246)), + target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![PortId(673), PortId(706)], output: PortId(707), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3710, 3763), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(582), - target: TransformTarget::Callable(DeclarationId(1237)), + target: TransformTarget::Callable(DeclarationId(1238)), inputs: vec![], output: PortId(708), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3799, 3827), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(583), - target: TransformTarget::Callable(DeclarationId(2489)), + target: TransformTarget::Callable(DeclarationId(2490)), inputs: vec![PortId(708)], output: PortId(709), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3790, 3828), @@ -6603,14 +6603,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(585), - target: TransformTarget::Callable(DeclarationId(1237)), + target: TransformTarget::Callable(DeclarationId(1238)), inputs: vec![], output: PortId(712), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3877, 3905), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(586), - target: TransformTarget::Callable(DeclarationId(2490)), + target: TransformTarget::Callable(DeclarationId(2491)), inputs: vec![PortId(712)], output: PortId(713), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3868, 3906), @@ -6655,28 +6655,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(588), - target: TransformTarget::Callable(DeclarationId(1237)), + target: TransformTarget::Callable(DeclarationId(1238)), inputs: vec![], output: PortId(716), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3966, 3994), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(589), - target: TransformTarget::Callable(DeclarationId(1246)), + target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![PortId(673), PortId(716)], output: PortId(717), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3942, 3995), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(590), - target: TransformTarget::Callable(DeclarationId(1237)), + target: TransformTarget::Callable(DeclarationId(1238)), inputs: vec![], output: PortId(718), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4031, 4059), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(591), - target: TransformTarget::Callable(DeclarationId(2491)), + target: TransformTarget::Callable(DeclarationId(2492)), inputs: vec![PortId(718)], output: PortId(719), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4022, 4060), @@ -6692,14 +6692,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(593), - target: TransformTarget::Callable(DeclarationId(1237)), + target: TransformTarget::Callable(DeclarationId(1238)), inputs: vec![], output: PortId(722), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4109, 4137), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(594), - target: TransformTarget::Callable(DeclarationId(2492)), + target: TransformTarget::Callable(DeclarationId(2493)), inputs: vec![PortId(722)], output: PortId(723), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4100, 4138), @@ -6842,7 +6842,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(598), - target: TransformTarget::Callable(DeclarationId(1186)), + target: TransformTarget::Callable(DeclarationId(1187)), inputs: vec![PortId(726), PortId(727)], output: PortId(728), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4541, 4566), @@ -6858,7 +6858,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(600), - target: TransformTarget::Callable(DeclarationId(2493)), + target: TransformTarget::Callable(DeclarationId(2494)), inputs: vec![], output: PortId(729), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4824, 4829), @@ -6874,7 +6874,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(602), - target: TransformTarget::Callable(DeclarationId(2494)), + target: TransformTarget::Callable(DeclarationId(2495)), inputs: vec![], output: PortId(730), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4889, 4894), @@ -6890,7 +6890,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(604), - target: TransformTarget::Callable(DeclarationId(2495)), + target: TransformTarget::Callable(DeclarationId(2496)), inputs: vec![], output: PortId(731), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4952, 4957), @@ -6906,7 +6906,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(606), - target: TransformTarget::Callable(DeclarationId(2496)), + target: TransformTarget::Callable(DeclarationId(2497)), inputs: vec![], output: PortId(732), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5015, 5020), @@ -6922,7 +6922,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(608), - target: TransformTarget::Callable(DeclarationId(2497)), + target: TransformTarget::Callable(DeclarationId(2498)), inputs: vec![], output: PortId(733), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5079, 5084), @@ -6938,7 +6938,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(610), - target: TransformTarget::Callable(DeclarationId(2498)), + target: TransformTarget::Callable(DeclarationId(2499)), inputs: vec![], output: PortId(734), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5159, 5164), @@ -6954,21 +6954,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(612), - target: TransformTarget::Callable(DeclarationId(2500)), + target: TransformTarget::Callable(DeclarationId(2501)), inputs: vec![PortId(735)], output: PortId(736), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5275, 5286), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(613), - target: TransformTarget::Callable(DeclarationId(1193)), + target: TransformTarget::Callable(DeclarationId(1194)), inputs: vec![], output: PortId(737), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5294, 5325), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(614), - target: TransformTarget::Callable(DeclarationId(2499)), + target: TransformTarget::Callable(DeclarationId(2500)), inputs: vec![PortId(736), PortId(737)], output: PortId(738), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5262, 5327), @@ -6984,14 +6984,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(616), - target: TransformTarget::Callable(DeclarationId(1192)), + target: TransformTarget::Callable(DeclarationId(1193)), inputs: vec![], output: PortId(740), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5428, 5459), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(617), - target: TransformTarget::Callable(DeclarationId(2501)), + target: TransformTarget::Callable(DeclarationId(2502)), inputs: vec![PortId(739), PortId(740)], output: PortId(741), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5403, 5461), @@ -7014,14 +7014,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(620), - target: TransformTarget::Callable(DeclarationId(1194)), + target: TransformTarget::Callable(DeclarationId(1195)), inputs: vec![PortId(742)], output: PortId(744), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5649, 5682), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(621), - target: TransformTarget::Callable(DeclarationId(2502)), + target: TransformTarget::Callable(DeclarationId(2503)), inputs: vec![PortId(743), PortId(742), PortId(744)], output: PortId(745), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5562, 5687), @@ -7044,21 +7044,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(624), - target: TransformTarget::Callable(DeclarationId(1195)), + target: TransformTarget::Callable(DeclarationId(1196)), inputs: vec![PortId(747)], output: PortId(749), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5881, 5915), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(625), - target: TransformTarget::Callable(DeclarationId(1194)), + target: TransformTarget::Callable(DeclarationId(1195)), inputs: vec![PortId(746)], output: PortId(750), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5932, 5965), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(626), - target: TransformTarget::Callable(DeclarationId(2503)), + target: TransformTarget::Callable(DeclarationId(2504)), inputs: vec![PortId(748), PortId(749), PortId(750)], output: PortId(751), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5808, 5970), @@ -7074,14 +7074,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(628), - target: TransformTarget::Callable(DeclarationId(1282)), + target: TransformTarget::Callable(DeclarationId(1283)), inputs: vec![PortId(752)], output: PortId(754), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6333, 6350), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(629), - target: TransformTarget::Callable(DeclarationId(1196)), + target: TransformTarget::Callable(DeclarationId(1197)), inputs: vec![PortId(753)], output: PortId(755), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6366, 6400), @@ -7106,7 +7106,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(632), - target: TransformTarget::Callable(DeclarationId(1196)), + target: TransformTarget::Callable(DeclarationId(1197)), inputs: vec![PortId(753)], output: PortId(759), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6436, 6470), @@ -7160,14 +7160,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(635), - target: TransformTarget::Callable(DeclarationId(1282)), + target: TransformTarget::Callable(DeclarationId(1283)), inputs: vec![PortId(761)], output: PortId(764), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6594, 6611), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(636), - target: TransformTarget::Callable(DeclarationId(1197)), + target: TransformTarget::Callable(DeclarationId(1198)), inputs: vec![PortId(762), PortId(763)], output: PortId(765), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6627, 6669), @@ -7192,7 +7192,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(639), - target: TransformTarget::Callable(DeclarationId(1197)), + target: TransformTarget::Callable(DeclarationId(1198)), inputs: vec![PortId(762), PortId(763)], output: PortId(769), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6705, 6747), @@ -7246,7 +7246,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(642), - target: TransformTarget::Callable(DeclarationId(1198)), + target: TransformTarget::Callable(DeclarationId(1199)), inputs: vec![PortId(771), PortId(772)], output: PortId(774), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6909, 6931), @@ -7262,7 +7262,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(644), - target: TransformTarget::Callable(DeclarationId(1199)), + target: TransformTarget::Callable(DeclarationId(1200)), inputs: vec![PortId(771), PortId(772), PortId(776)], output: PortId(777), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6970, 7000), @@ -7316,14 +7316,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(647), - target: TransformTarget::Callable(DeclarationId(1246)), + target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![PortId(779), PortId(781)], output: PortId(782), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7184, 7210), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(648), - target: TransformTarget::Callable(DeclarationId(1200)), + target: TransformTarget::Callable(DeclarationId(1201)), inputs: vec![PortId(779), PortId(781), PortId(782)], output: PortId(783), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7152, 7211), @@ -7348,28 +7348,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(651), - target: TransformTarget::Callable(DeclarationId(1237)), + target: TransformTarget::Callable(DeclarationId(1238)), inputs: vec![], output: PortId(787), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7296, 7324), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(652), - target: TransformTarget::Callable(DeclarationId(1240)), + target: TransformTarget::Callable(DeclarationId(1241)), inputs: vec![PortId(786)], output: PortId(788), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7382, 7412), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(653), - target: TransformTarget::Callable(DeclarationId(1241)), + target: TransformTarget::Callable(DeclarationId(1242)), inputs: vec![PortId(785), PortId(788)], output: PortId(789), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7334, 7413), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(654), - target: TransformTarget::Callable(DeclarationId(1199)), + target: TransformTarget::Callable(DeclarationId(1200)), inputs: vec![PortId(779), PortId(787), PortId(789)], output: PortId(790), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7257, 7421), @@ -7426,42 +7426,42 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(657), - target: TransformTarget::Callable(DeclarationId(1282)), + target: TransformTarget::Callable(DeclarationId(1283)), inputs: vec![PortId(792)], output: PortId(794), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8404, 8421), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(658), - target: TransformTarget::Callable(DeclarationId(711)), + target: TransformTarget::Callable(DeclarationId(712)), inputs: vec![PortId(794)], output: PortId(795), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8395, 8422), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(659), - target: TransformTarget::Callable(DeclarationId(1186)), + target: TransformTarget::Callable(DeclarationId(1187)), inputs: vec![PortId(792), PortId(793)], output: PortId(796), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8468, 8493), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(660), - target: TransformTarget::Callable(DeclarationId(1201)), + target: TransformTarget::Callable(DeclarationId(1202)), inputs: vec![PortId(792), PortId(796)], output: PortId(797), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8432, 8494), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(661), - target: TransformTarget::Callable(DeclarationId(1187)), + target: TransformTarget::Callable(DeclarationId(1188)), inputs: vec![PortId(792), PortId(793)], output: PortId(798), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8542, 8586), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(662), - target: TransformTarget::Callable(DeclarationId(1201)), + target: TransformTarget::Callable(DeclarationId(1202)), inputs: vec![PortId(792), PortId(798)], output: PortId(799), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8506, 8587), @@ -7528,7 +7528,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(667), - target: TransformTarget::Callable(DeclarationId(2542)), + target: TransformTarget::Callable(DeclarationId(2543)), inputs: vec![], output: PortId(802), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6287, 6297), @@ -7544,28 +7544,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(669), - target: TransformTarget::Callable(DeclarationId(2542)), + target: TransformTarget::Callable(DeclarationId(2543)), inputs: vec![], output: PortId(806), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6605, 6615), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(670), - target: TransformTarget::Callable(DeclarationId(2542)), + target: TransformTarget::Callable(DeclarationId(2543)), inputs: vec![], output: PortId(807), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6667, 6677), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(671), - target: TransformTarget::Callable(DeclarationId(2544)), + target: TransformTarget::Callable(DeclarationId(2545)), inputs: vec![], output: PortId(808), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6695, 6700), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(672), - target: TransformTarget::Callable(DeclarationId(2544)), + target: TransformTarget::Callable(DeclarationId(2545)), inputs: vec![], output: PortId(809), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6722, 6727), @@ -7581,7 +7581,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(674), - target: TransformTarget::Callable(DeclarationId(2544)), + target: TransformTarget::Callable(DeclarationId(2545)), inputs: vec![], output: PortId(812), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6764, 6769), @@ -7636,21 +7636,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(676), - target: TransformTarget::Callable(DeclarationId(2542)), + target: TransformTarget::Callable(DeclarationId(2543)), inputs: vec![], output: PortId(814), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6833, 6843), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(677), - target: TransformTarget::Callable(DeclarationId(2544)), + target: TransformTarget::Callable(DeclarationId(2545)), inputs: vec![], output: PortId(815), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6861, 6866), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(678), - target: TransformTarget::Callable(DeclarationId(2543)), + target: TransformTarget::Callable(DeclarationId(2544)), inputs: vec![], output: PortId(816), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6888, 6897), @@ -7666,7 +7666,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(680), - target: TransformTarget::Callable(DeclarationId(2543)), + target: TransformTarget::Callable(DeclarationId(2544)), inputs: vec![], output: PortId(819), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6934, 6943), @@ -7730,21 +7730,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(683), - target: TransformTarget::Callable(DeclarationId(2542)), + target: TransformTarget::Callable(DeclarationId(2543)), inputs: vec![], output: PortId(823), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7023, 7033), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(684), - target: TransformTarget::Callable(DeclarationId(2544)), + target: TransformTarget::Callable(DeclarationId(2545)), inputs: vec![], output: PortId(824), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7051, 7056), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(685), - target: TransformTarget::Callable(DeclarationId(2543)), + target: TransformTarget::Callable(DeclarationId(2544)), inputs: vec![], output: PortId(825), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7078, 7087), @@ -7785,14 +7785,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(690), - target: TransformTarget::Callable(DeclarationId(1227)), + target: TransformTarget::Callable(DeclarationId(1228)), inputs: vec![PortId(830)], output: PortId(831), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7187, 7217), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(691), - target: TransformTarget::Callable(DeclarationId(2541)), + target: TransformTarget::Callable(DeclarationId(2542)), inputs: vec![PortId(831)], output: PortId(832), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7166, 7219), @@ -7851,7 +7851,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(696), - target: TransformTarget::Callable(DeclarationId(2541)), + target: TransformTarget::Callable(DeclarationId(2542)), inputs: vec![PortId(836)], output: PortId(837), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7247, 7335), @@ -7997,7 +7997,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(702), - target: TransformTarget::Callable(DeclarationId(1234)), + target: TransformTarget::Callable(DeclarationId(1235)), inputs: vec![PortId(841), PortId(842), PortId(843)], output: PortId(844), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7515, 7558), @@ -8020,7 +8020,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(705), - target: TransformTarget::Callable(DeclarationId(1227)), + target: TransformTarget::Callable(DeclarationId(1228)), inputs: vec![PortId(845)], output: PortId(846), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7601, 7613), @@ -8036,14 +8036,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(707), - target: TransformTarget::Callable(DeclarationId(1236)), + target: TransformTarget::Callable(DeclarationId(1237)), inputs: vec![], output: PortId(847), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7693, 7711), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(708), - target: TransformTarget::Callable(DeclarationId(2541)), + target: TransformTarget::Callable(DeclarationId(2542)), inputs: vec![PortId(847)], output: PortId(848), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7672, 7713), @@ -8066,7 +8066,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(711), - target: TransformTarget::Callable(DeclarationId(1234)), + target: TransformTarget::Callable(DeclarationId(1235)), inputs: vec![PortId(849), PortId(850), PortId(851)], output: PortId(852), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7862, 7906), @@ -8082,7 +8082,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(713), - target: TransformTarget::Callable(DeclarationId(2546)), + target: TransformTarget::Callable(DeclarationId(2547)), inputs: vec![], output: PortId(853), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7967, 7972), @@ -8221,28 +8221,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(722), - target: TransformTarget::Callable(DeclarationId(2228)), + target: TransformTarget::Callable(DeclarationId(2229)), inputs: vec![], output: PortId(868), span: SourceSpan::new("src/v3/std/timing_lens.dag", 8722, 8734), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(723), - target: TransformTarget::Callable(DeclarationId(2234)), + target: TransformTarget::Callable(DeclarationId(2235)), inputs: vec![PortId(868)], output: PortId(869), span: SourceSpan::new("src/v3/std/timing_lens.dag", 8709, 8735), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(724), - target: TransformTarget::Callable(DeclarationId(1239)), + target: TransformTarget::Callable(DeclarationId(1240)), inputs: vec![], output: PortId(870), span: SourceSpan::new("src/v3/std/timing_lens.dag", 8778, 8809), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(725), - target: TransformTarget::Callable(DeclarationId(973)), + target: TransformTarget::Callable(DeclarationId(974)), inputs: vec![PortId(869), PortId(867), PortId(866), PortId(870)], output: PortId(871), span: SourceSpan::new("src/v3/std/timing_lens.dag", 8697, 8813), @@ -8258,7 +8258,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(727), - target: TransformTarget::Callable(DeclarationId(1226)), + target: TransformTarget::Callable(DeclarationId(1227)), inputs: vec![], output: PortId(872), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9120, 9153), @@ -8295,7 +8295,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(732), - target: TransformTarget::Callable(DeclarationId(1282)), + target: TransformTarget::Callable(DeclarationId(1283)), inputs: vec![PortId(876)], output: PortId(878), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9734, 9751), @@ -8329,35 +8329,35 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(736), - target: TransformTarget::Callable(DeclarationId(1241)), + target: TransformTarget::Callable(DeclarationId(1242)), inputs: vec![PortId(877), PortId(882)], output: PortId(883), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9862, 9926), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(737), - target: TransformTarget::Callable(DeclarationId(2262)), + target: TransformTarget::Callable(DeclarationId(2263)), inputs: vec![PortId(883)], output: PortId(884), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9826, 9938), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(738), - target: TransformTarget::Callable(DeclarationId(1242)), + target: TransformTarget::Callable(DeclarationId(1243)), inputs: vec![], output: PortId(885), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10082, 10121), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(739), - target: TransformTarget::Callable(DeclarationId(1241)), + target: TransformTarget::Callable(DeclarationId(1242)), inputs: vec![PortId(877), PortId(885)], output: PortId(886), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10002, 10135), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(740), - target: TransformTarget::Callable(DeclarationId(2262)), + target: TransformTarget::Callable(DeclarationId(2263)), inputs: vec![PortId(886)], output: PortId(887), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9966, 10147), @@ -8403,21 +8403,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(743), - target: TransformTarget::Callable(DeclarationId(1240)), + target: TransformTarget::Callable(DeclarationId(1241)), inputs: vec![PortId(890)], output: PortId(891), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10287, 10326), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(744), - target: TransformTarget::Callable(DeclarationId(1241)), + target: TransformTarget::Callable(DeclarationId(1242)), inputs: vec![PortId(877), PortId(891)], output: PortId(892), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10215, 10336), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(745), - target: TransformTarget::Callable(DeclarationId(2262)), + target: TransformTarget::Callable(DeclarationId(2263)), inputs: vec![PortId(892)], output: PortId(893), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10183, 10344), @@ -8472,14 +8472,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(749), - target: TransformTarget::Callable(DeclarationId(1233)), + target: TransformTarget::Callable(DeclarationId(1234)), inputs: vec![], output: PortId(900), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10862, 10893), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(750), - target: TransformTarget::Callable(DeclarationId(1233)), + target: TransformTarget::Callable(DeclarationId(1234)), inputs: vec![], output: PortId(902), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10916, 10947), @@ -8519,21 +8519,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(752), - target: TransformTarget::Callable(DeclarationId(2542)), + target: TransformTarget::Callable(DeclarationId(2543)), inputs: vec![], output: PortId(904), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10974, 10984), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(753), - target: TransformTarget::Callable(DeclarationId(2543)), + target: TransformTarget::Callable(DeclarationId(2544)), inputs: vec![], output: PortId(905), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11002, 11011), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(754), - target: TransformTarget::Callable(DeclarationId(2544)), + target: TransformTarget::Callable(DeclarationId(2545)), inputs: vec![], output: PortId(906), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11025, 11030), @@ -8597,42 +8597,42 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(757), - target: TransformTarget::Callable(DeclarationId(1282)), + target: TransformTarget::Callable(DeclarationId(1283)), inputs: vec![PortId(908)], output: PortId(911), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11930, 11947), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(758), - target: TransformTarget::Callable(DeclarationId(711)), + target: TransformTarget::Callable(DeclarationId(712)), inputs: vec![PortId(911)], output: PortId(912), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11921, 11948), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(759), - target: TransformTarget::Callable(DeclarationId(1233)), + target: TransformTarget::Callable(DeclarationId(1234)), inputs: vec![], output: PortId(913), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11963, 11994), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(760), - target: TransformTarget::Callable(DeclarationId(2547)), + target: TransformTarget::Callable(DeclarationId(2548)), inputs: vec![PortId(913)], output: PortId(914), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11954, 11995), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(761), - target: TransformTarget::Callable(DeclarationId(1233)), + target: TransformTarget::Callable(DeclarationId(1234)), inputs: vec![], output: PortId(915), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12010, 12041), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(762), - target: TransformTarget::Callable(DeclarationId(2548)), + target: TransformTarget::Callable(DeclarationId(2549)), inputs: vec![PortId(915)], output: PortId(916), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12001, 12042), @@ -8666,42 +8666,42 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(764), - target: TransformTarget::Callable(DeclarationId(1282)), + target: TransformTarget::Callable(DeclarationId(1283)), inputs: vec![PortId(908)], output: PortId(919), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12081, 12098), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(765), - target: TransformTarget::Callable(DeclarationId(711)), + target: TransformTarget::Callable(DeclarationId(712)), inputs: vec![PortId(919)], output: PortId(920), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12072, 12099), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(766), - target: TransformTarget::Callable(DeclarationId(1233)), + target: TransformTarget::Callable(DeclarationId(1234)), inputs: vec![], output: PortId(921), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12114, 12145), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(767), - target: TransformTarget::Callable(DeclarationId(2549)), + target: TransformTarget::Callable(DeclarationId(2550)), inputs: vec![PortId(921)], output: PortId(922), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12105, 12146), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(768), - target: TransformTarget::Callable(DeclarationId(1233)), + target: TransformTarget::Callable(DeclarationId(1234)), inputs: vec![], output: PortId(923), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12161, 12192), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(769), - target: TransformTarget::Callable(DeclarationId(2550)), + target: TransformTarget::Callable(DeclarationId(2551)), inputs: vec![PortId(923)], output: PortId(924), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12152, 12193), @@ -8735,42 +8735,42 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(771), - target: TransformTarget::Callable(DeclarationId(1282)), + target: TransformTarget::Callable(DeclarationId(1283)), inputs: vec![PortId(908)], output: PortId(927), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12229, 12246), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(772), - target: TransformTarget::Callable(DeclarationId(711)), + target: TransformTarget::Callable(DeclarationId(712)), inputs: vec![PortId(927)], output: PortId(928), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12220, 12247), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(773), - target: TransformTarget::Callable(DeclarationId(1233)), + target: TransformTarget::Callable(DeclarationId(1234)), inputs: vec![], output: PortId(929), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12262, 12293), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(774), - target: TransformTarget::Callable(DeclarationId(2551)), + target: TransformTarget::Callable(DeclarationId(2552)), inputs: vec![PortId(929)], output: PortId(930), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12253, 12294), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(775), - target: TransformTarget::Callable(DeclarationId(1233)), + target: TransformTarget::Callable(DeclarationId(1234)), inputs: vec![], output: PortId(931), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12309, 12340), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(776), - target: TransformTarget::Callable(DeclarationId(2552)), + target: TransformTarget::Callable(DeclarationId(2553)), inputs: vec![PortId(931)], output: PortId(932), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12300, 12341), @@ -8804,42 +8804,42 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(778), - target: TransformTarget::Callable(DeclarationId(1282)), + target: TransformTarget::Callable(DeclarationId(1283)), inputs: vec![PortId(908)], output: PortId(935), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12375, 12392), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(779), - target: TransformTarget::Callable(DeclarationId(711)), + target: TransformTarget::Callable(DeclarationId(712)), inputs: vec![PortId(935)], output: PortId(936), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12366, 12393), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(780), - target: TransformTarget::Callable(DeclarationId(1233)), + target: TransformTarget::Callable(DeclarationId(1234)), inputs: vec![], output: PortId(937), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12408, 12439), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(781), - target: TransformTarget::Callable(DeclarationId(2553)), + target: TransformTarget::Callable(DeclarationId(2554)), inputs: vec![PortId(937)], output: PortId(938), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12399, 12440), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(782), - target: TransformTarget::Callable(DeclarationId(1233)), + target: TransformTarget::Callable(DeclarationId(1234)), inputs: vec![], output: PortId(939), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12455, 12486), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(783), - target: TransformTarget::Callable(DeclarationId(2554)), + target: TransformTarget::Callable(DeclarationId(2555)), inputs: vec![PortId(939)], output: PortId(940), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12446, 12487), @@ -8873,42 +8873,42 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(785), - target: TransformTarget::Callable(DeclarationId(1282)), + target: TransformTarget::Callable(DeclarationId(1283)), inputs: vec![PortId(908)], output: PortId(943), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12521, 12538), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(786), - target: TransformTarget::Callable(DeclarationId(711)), + target: TransformTarget::Callable(DeclarationId(712)), inputs: vec![PortId(943)], output: PortId(944), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12512, 12539), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(787), - target: TransformTarget::Callable(DeclarationId(1233)), + target: TransformTarget::Callable(DeclarationId(1234)), inputs: vec![], output: PortId(945), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12554, 12585), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(788), - target: TransformTarget::Callable(DeclarationId(2555)), + target: TransformTarget::Callable(DeclarationId(2556)), inputs: vec![PortId(945)], output: PortId(946), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12545, 12586), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(789), - target: TransformTarget::Callable(DeclarationId(1233)), + target: TransformTarget::Callable(DeclarationId(1234)), inputs: vec![], output: PortId(947), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12601, 12632), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(790), - target: TransformTarget::Callable(DeclarationId(2556)), + target: TransformTarget::Callable(DeclarationId(2557)), inputs: vec![PortId(947)], output: PortId(948), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12592, 12633), @@ -9029,28 +9029,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(795), - target: TransformTarget::Callable(DeclarationId(1282)), + target: TransformTarget::Callable(DeclarationId(1283)), inputs: vec![PortId(951)], output: PortId(955), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12793, 12810), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(796), - target: TransformTarget::Callable(DeclarationId(711)), + target: TransformTarget::Callable(DeclarationId(712)), inputs: vec![PortId(955)], output: PortId(956), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12784, 12811), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(797), - target: TransformTarget::Callable(DeclarationId(2261)), + target: TransformTarget::Callable(DeclarationId(2262)), inputs: vec![], output: PortId(957), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12817, 12829), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(798), - target: TransformTarget::Callable(DeclarationId(2261)), + target: TransformTarget::Callable(DeclarationId(2262)), inputs: vec![], output: PortId(958), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12835, 12847), @@ -9085,7 +9085,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { nodes.push(Behavior::Value(ValueNode { id: NodeId(800), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Unobserved is not admissible evidence at this scaffold (missing external timing row).".to_string()), output: PortId(960), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12926, 13053), lane2_workflow: None })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(801), - target: TransformTarget::Callable(DeclarationId(1243)), + target: TransformTarget::Callable(DeclarationId(1244)), inputs: vec![PortId(951), PortId(960)], output: PortId(961), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12872, 13061), @@ -9093,7 +9093,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { nodes.push(Behavior::Value(ValueNode { id: NodeId(802), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Ambiguous is not admissible evidence at this scaffold (conflicting timing facts).".to_string()), output: PortId(962), span: SourceSpan::new("src/v3/std/timing_lens.dag", 13139, 13262), lane2_workflow: None })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(803), - target: TransformTarget::Callable(DeclarationId(1243)), + target: TransformTarget::Callable(DeclarationId(1244)), inputs: vec![PortId(951), PortId(962)], output: PortId(963), span: SourceSpan::new("src/v3/std/timing_lens.dag", 13085, 13270), @@ -9101,7 +9101,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { nodes.push(Behavior::Value(ValueNode { id: NodeId(804), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Stale is not admissible evidence at this scaffold (digest/run mismatch vs attachment).".to_string()), output: PortId(964), span: SourceSpan::new("src/v3/std/timing_lens.dag", 13344, 13472), lane2_workflow: None })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(805), - target: TransformTarget::Callable(DeclarationId(1243)), + target: TransformTarget::Callable(DeclarationId(1244)), inputs: vec![PortId(951), PortId(964)], output: PortId(965), span: SourceSpan::new("src/v3/std/timing_lens.dag", 13290, 13480), @@ -9734,7 +9734,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { #[allow(clippy::vec_init_then_push)] fn bootstrapped_fixture_dag_declarations() -> Vec { { - let mut declarations = Vec::with_capacity(3217); + let mut declarations = Vec::with_capacity(3218); declarations.push(Declaration { id: DeclarationId(0), name: Some("Classical".to_string()), @@ -12832,7 +12832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, - inhabits: Some(DeclarationId(684)), + inhabits: Some(DeclarationId(685)), value_body: None, refinement: None, nominal_opacity: None, @@ -17440,6 +17440,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { label: "TaggedVariant".to_string(), ty: DeclarationId(681), }, + Field { + label: "UntaggedJsonStringOrArray".to_string(), + ty: DeclarationId(682), + }, ], }, type_params: vec![], @@ -17450,7 +17454,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/std/serialization.dag", 2606, 2780), + span: SourceSpan::new("dsl/std/serialization.dag", 2990, 3312), }); declarations.push(Declaration { id: DeclarationId(313), @@ -17475,7 +17479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/std/serialization.dag", 3002, 3088), + span: SourceSpan::new("dsl/std/serialization.dag", 3534, 3620), }); declarations.push(Declaration { id: DeclarationId(314), @@ -17494,7 +17498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/std/serialization.dag", 3233, 3290), + span: SourceSpan::new("dsl/std/serialization.dag", 3765, 3822), }); declarations.push(Declaration { id: DeclarationId(315), @@ -17503,11 +17507,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Json".to_string(), - ty: DeclarationId(682), + ty: DeclarationId(683), }, Field { label: "Text".to_string(), - ty: DeclarationId(683), + ty: DeclarationId(684), }, ], }, @@ -17519,7 +17523,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/std/serialization.dag", 3481, 3510), + span: SourceSpan::new("dsl/std/serialization.dag", 4013, 4042), }); declarations.push(Declaration { id: DeclarationId(316), @@ -23832,7 +23836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/std/serialization.dag", 2631, 2670), + span: SourceSpan::new("dsl/std/serialization.dag", 3015, 3054), }); declarations.push(Declaration { id: DeclarationId(679), @@ -23857,7 +23861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/std/serialization.dag", 2675, 2742), + span: SourceSpan::new("dsl/std/serialization.dag", 3059, 3126), }); declarations.push(Declaration { id: DeclarationId(680), @@ -23871,7 +23875,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/std/serialization.dag", 2747, 2762), + span: SourceSpan::new("dsl/std/serialization.dag", 3131, 3146), }); declarations.push(Declaration { id: DeclarationId(681), @@ -23885,12 +23889,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/std/serialization.dag", 2767, 2780), + span: SourceSpan::new("dsl/std/serialization.dag", 3151, 3164), }); declarations.push(Declaration { id: DeclarationId(682), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Conj { + children: vec![ + Field { + label: "string_variant".to_string(), + ty: DeclarationId(230), + }, + Field { + label: "string_field".to_string(), + ty: DeclarationId(230), + }, + Field { + label: "array_variant".to_string(), + ty: DeclarationId(230), + }, + Field { + label: "array_field".to_string(), + ty: DeclarationId(230), + }, + ], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -23899,7 +23922,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/std/serialization.dag", 3499, 3503), + span: SourceSpan::new("dsl/std/serialization.dag", 3169, 3312), }); declarations.push(Declaration { id: DeclarationId(683), @@ -23913,11 +23936,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/std/serialization.dag", 3506, 3510), + span: SourceSpan::new("dsl/std/serialization.dag", 4031, 4035), }); declarations.push(Declaration { id: DeclarationId(684), name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/serialization.dag", 4038, 4042), + }); + declarations.push(Declaration { + id: DeclarationId(685), + name: None, connective: TypeConnective::Instantiation { template: DeclarationId(45), arguments: vec![TemplateArgument { @@ -23936,21 +23973,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 7574, 7598), }); declarations.push(Declaration { - id: DeclarationId(685), + id: DeclarationId(686), name: Some("List".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Empty".to_string(), - ty: DeclarationId(1782), + ty: DeclarationId(1783), }, Field { label: "Cons".to_string(), - ty: DeclarationId(1784), + ty: DeclarationId(1785), }, ], }, - type_params: vec![DeclarationId(686)], + type_params: vec![DeclarationId(687)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -23961,7 +23998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 2083, 2159), }); declarations.push(Declaration { - id: DeclarationId(686), + id: DeclarationId(687), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())), type_params: vec![], @@ -23975,14 +24012,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 2083, 2159), }); declarations.push(Declaration { - id: DeclarationId(687), + id: DeclarationId(688), name: Some("empty".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1752), + output: DeclarationId(1753), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)), }, - type_params: vec![DeclarationId(688)], + type_params: vec![DeclarationId(689)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -23993,7 +24030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3236, 3284), }); declarations.push(Declaration { - id: DeclarationId(688), + id: DeclarationId(689), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())), type_params: vec![], @@ -24007,14 +24044,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3236, 3284), }); declarations.push(Declaration { - id: DeclarationId(689), + id: DeclarationId(690), name: Some("cons".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(690), DeclarationId(1753)], - output: DeclarationId(1754), + inputs: vec![DeclarationId(691), DeclarationId(1754)], + output: DeclarationId(1755), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)), }, - type_params: vec![DeclarationId(690)], + type_params: vec![DeclarationId(691)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24025,7 +24062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3383, 3475), }); declarations.push(Declaration { - id: DeclarationId(690), + id: DeclarationId(691), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())), type_params: vec![], @@ -24039,14 +24076,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3383, 3475), }); declarations.push(Declaration { - id: DeclarationId(691), + id: DeclarationId(692), name: Some("singleton".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(692)], - output: DeclarationId(1755), + inputs: vec![DeclarationId(693)], + output: DeclarationId(1756), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)), }, - type_params: vec![DeclarationId(692)], + type_params: vec![DeclarationId(693)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24057,7 +24094,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3519, 3590), }); declarations.push(Declaration { - id: DeclarationId(692), + id: DeclarationId(693), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())), type_params: vec![], @@ -24071,14 +24108,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3519, 3590), }); declarations.push(Declaration { - id: DeclarationId(693), + id: DeclarationId(694), name: Some("fold".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1756), DeclarationId(695), DeclarationId(1757)], - output: DeclarationId(695), + inputs: vec![DeclarationId(1757), DeclarationId(696), DeclarationId(1758)], + output: DeclarationId(696), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)), }, - type_params: vec![DeclarationId(694), DeclarationId(695)], + type_params: vec![DeclarationId(695), DeclarationId(696)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24089,7 +24126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4142, 4307), }); declarations.push(Declaration { - id: DeclarationId(694), + id: DeclarationId(695), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())), type_params: vec![], @@ -24103,7 +24140,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4142, 4307), }); declarations.push(Declaration { - id: DeclarationId(695), + id: DeclarationId(696), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("U".to_string())), type_params: vec![], @@ -24117,14 +24154,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4142, 4307), }); declarations.push(Declaration { - id: DeclarationId(696), + id: DeclarationId(697), name: Some("fold_right".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1758), DeclarationId(698), DeclarationId(1759)], - output: DeclarationId(698), + inputs: vec![DeclarationId(1759), DeclarationId(699), DeclarationId(1760)], + output: DeclarationId(699), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)), }, - type_params: vec![DeclarationId(697), DeclarationId(698)], + type_params: vec![DeclarationId(698), DeclarationId(699)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24135,7 +24172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4591, 4768), }); declarations.push(Declaration { - id: DeclarationId(697), + id: DeclarationId(698), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())), type_params: vec![], @@ -24149,7 +24186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4591, 4768), }); declarations.push(Declaration { - id: DeclarationId(698), + id: DeclarationId(699), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("U".to_string())), type_params: vec![], @@ -24163,14 +24200,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4591, 4768), }); declarations.push(Declaration { - id: DeclarationId(699), + id: DeclarationId(700), name: Some("concat".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1760), DeclarationId(1761)], - output: DeclarationId(1762), + inputs: vec![DeclarationId(1761), DeclarationId(1762)], + output: DeclarationId(1763), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)), }, - type_params: vec![DeclarationId(700)], + type_params: vec![DeclarationId(701)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24181,7 +24218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5314, 5414), }); declarations.push(Declaration { - id: DeclarationId(700), + id: DeclarationId(701), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())), type_params: vec![], @@ -24195,14 +24232,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5314, 5414), }); declarations.push(Declaration { - id: DeclarationId(701), + id: DeclarationId(702), name: Some("map".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1763), DeclarationId(1764)], - output: DeclarationId(1765), + inputs: vec![DeclarationId(1764), DeclarationId(1765)], + output: DeclarationId(1766), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)), }, - type_params: vec![DeclarationId(702), DeclarationId(703)], + type_params: vec![DeclarationId(703), DeclarationId(704)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24213,7 +24250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5667, 5778), }); declarations.push(Declaration { - id: DeclarationId(702), + id: DeclarationId(703), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("A".to_string())), type_params: vec![], @@ -24227,7 +24264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5667, 5778), }); declarations.push(Declaration { - id: DeclarationId(703), + id: DeclarationId(704), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("B".to_string())), type_params: vec![], @@ -24241,14 +24278,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5667, 5778), }); declarations.push(Declaration { - id: DeclarationId(704), + id: DeclarationId(705), name: Some("filter".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1766), DeclarationId(1767)], - output: DeclarationId(1768), + inputs: vec![DeclarationId(1767), DeclarationId(1768)], + output: DeclarationId(1769), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)), }, - type_params: vec![DeclarationId(705)], + type_params: vec![DeclarationId(706)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24259,7 +24296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5848, 5988), }); declarations.push(Declaration { - id: DeclarationId(705), + id: DeclarationId(706), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())), type_params: vec![], @@ -24273,14 +24310,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5848, 5988), }); declarations.push(Declaration { - id: DeclarationId(706), + id: DeclarationId(707), name: Some("flat_map".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1769), DeclarationId(1771)], - output: DeclarationId(1772), + inputs: vec![DeclarationId(1770), DeclarationId(1772)], + output: DeclarationId(1773), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)), }, - type_params: vec![DeclarationId(707), DeclarationId(708)], + type_params: vec![DeclarationId(708), DeclarationId(709)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24291,7 +24328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6106, 6230), }); declarations.push(Declaration { - id: DeclarationId(707), + id: DeclarationId(708), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("A".to_string())), type_params: vec![], @@ -24305,7 +24342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6106, 6230), }); declarations.push(Declaration { - id: DeclarationId(708), + id: DeclarationId(709), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("B".to_string())), type_params: vec![], @@ -24319,14 +24356,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6106, 6230), }); declarations.push(Declaration { - id: DeclarationId(709), + id: DeclarationId(710), name: Some("length".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1773)], + inputs: vec![DeclarationId(1774)], output: DeclarationId(93), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)), }, - type_params: vec![DeclarationId(710)], + type_params: vec![DeclarationId(711)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24337,7 +24374,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6337, 6409), }); declarations.push(Declaration { - id: DeclarationId(710), + id: DeclarationId(711), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())), type_params: vec![], @@ -24351,14 +24388,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6337, 6409), }); declarations.push(Declaration { - id: DeclarationId(711), + id: DeclarationId(712), name: Some("is_empty".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1774)], + inputs: vec![DeclarationId(1775)], output: DeclarationId(128), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)), }, - type_params: vec![DeclarationId(712)], + type_params: vec![DeclarationId(713)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24369,7 +24406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6567, 6671), }); declarations.push(Declaration { - id: DeclarationId(712), + id: DeclarationId(713), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())), type_params: vec![], @@ -24383,7 +24420,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6567, 6671), }); declarations.push(Declaration { - id: DeclarationId(713), + id: DeclarationId(714), name: Some("IndexedElement".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -24393,11 +24430,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "value".to_string(), - ty: DeclarationId(714), + ty: DeclarationId(715), }, ], }, - type_params: vec![DeclarationId(714)], + type_params: vec![DeclarationId(715)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24408,7 +24445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6993, 7055), }); declarations.push(Declaration { - id: DeclarationId(714), + id: DeclarationId(715), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())), type_params: vec![], @@ -24422,14 +24459,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6993, 7055), }); declarations.push(Declaration { - id: DeclarationId(715), + id: DeclarationId(716), name: Some("enumerate".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1775)], - output: DeclarationId(1777), + inputs: vec![DeclarationId(1776)], + output: DeclarationId(1778), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)), }, - type_params: vec![DeclarationId(716)], + type_params: vec![DeclarationId(717)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24440,7 +24477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7180, 7269), }); declarations.push(Declaration { - id: DeclarationId(716), + id: DeclarationId(717), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())), type_params: vec![], @@ -24454,14 +24491,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7180, 7269), }); declarations.push(Declaration { - id: DeclarationId(717), + id: DeclarationId(718), name: Some("enumerate_helper".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1778), DeclarationId(93)], - output: DeclarationId(1780), + inputs: vec![DeclarationId(1779), DeclarationId(93)], + output: DeclarationId(1781), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)), }, - type_params: vec![DeclarationId(718)], + type_params: vec![DeclarationId(719)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24472,7 +24509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7386, 7644), }); declarations.push(Declaration { - id: DeclarationId(718), + id: DeclarationId(719), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())), type_params: vec![], @@ -24486,14 +24523,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7386, 7644), }); declarations.push(Declaration { - id: DeclarationId(719), + id: DeclarationId(720), name: Some("contains".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1781), DeclarationId(720)], + inputs: vec![DeclarationId(1782), DeclarationId(721)], output: DeclarationId(128), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)), }, - type_params: vec![DeclarationId(720)], + type_params: vec![DeclarationId(721)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24504,7 +24541,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 8156, 8332), }); declarations.push(Declaration { - id: DeclarationId(720), + id: DeclarationId(721), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())), type_params: vec![], @@ -24518,7 +24555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 8156, 8332), }); declarations.push(Declaration { - id: DeclarationId(721), + id: DeclarationId(722), name: Some("NodeId".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -24532,7 +24569,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1364, 1375), }); declarations.push(Declaration { - id: DeclarationId(722), + id: DeclarationId(723), name: Some("PortId".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -24546,7 +24583,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1376, 1387), }); declarations.push(Declaration { - id: DeclarationId(723), + id: DeclarationId(724), name: Some("DeclarationId".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -24560,7 +24597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1388, 1406), }); declarations.push(Declaration { - id: DeclarationId(724), + id: DeclarationId(725), name: Some("ClusterId".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -24574,21 +24611,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1407, 1421), }); declarations.push(Declaration { - id: DeclarationId(725), + id: DeclarationId(726), name: Some("NonEmptyList".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "first".to_string(), - ty: DeclarationId(726), + ty: DeclarationId(727), }, Field { label: "rest".to_string(), - ty: DeclarationId(1785), + ty: DeclarationId(1786), }, ], }, - type_params: vec![DeclarationId(726)], + type_params: vec![DeclarationId(727)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24599,7 +24636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1423, 1492), }); declarations.push(Declaration { - id: DeclarationId(726), + id: DeclarationId(727), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())), type_params: vec![], @@ -24613,25 +24650,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1423, 1492), }); declarations.push(Declaration { - id: DeclarationId(727), + id: DeclarationId(728), name: Some("NonSingletonList".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "first".to_string(), - ty: DeclarationId(728), + ty: DeclarationId(729), }, Field { label: "second".to_string(), - ty: DeclarationId(728), + ty: DeclarationId(729), }, Field { label: "rest".to_string(), - ty: DeclarationId(1786), + ty: DeclarationId(1787), }, ], }, - type_params: vec![DeclarationId(728)], + type_params: vec![DeclarationId(729)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24642,7 +24679,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1494, 1585), }); declarations.push(Declaration { - id: DeclarationId(728), + id: DeclarationId(729), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())), type_params: vec![], @@ -24656,17 +24693,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1494, 1585), }); declarations.push(Declaration { - id: DeclarationId(729), + id: DeclarationId(730), name: Some("UrlPathToken".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "LiteralToken".to_string(), - ty: DeclarationId(1801), + ty: DeclarationId(1802), }, Field { label: "ParamToken".to_string(), - ty: DeclarationId(1802), + ty: DeclarationId(1803), }, ], }, @@ -24681,12 +24718,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 7510, 7595), }); declarations.push(Declaration { - id: DeclarationId(730), + id: DeclarationId(731), name: Some("PathTemplate".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "tokens".to_string(), - ty: DeclarationId(1803), + ty: DeclarationId(1804), }], }, type_params: vec![], @@ -24700,17 +24737,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 7597, 7647), }); declarations.push(Declaration { - id: DeclarationId(731), + id: DeclarationId(732), name: Some("PathSegmentTokensResult".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ParsedSegmentTokens".to_string(), - ty: DeclarationId(1805), + ty: DeclarationId(1806), }, Field { label: "MalformedPathSegment".to_string(), - ty: DeclarationId(1806), + ty: DeclarationId(1807), }, ], }, @@ -24725,17 +24762,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8003, 8147), }); declarations.push(Declaration { - id: DeclarationId(732), + id: DeclarationId(733), name: Some("PathTemplateParseResult".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ParsedPathTemplate".to_string(), - ty: DeclarationId(1807), + ty: DeclarationId(1808), }, Field { label: "MalformedPathTemplate".to_string(), - ty: DeclarationId(1808), + ty: DeclarationId(1809), }, ], }, @@ -24750,11 +24787,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8477, 8630), }); declarations.push(Declaration { - id: DeclarationId(733), + id: DeclarationId(734), name: Some("parse_path_template".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], - output: DeclarationId(732), + output: DeclarationId(733), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 8695, 10000)), }, type_params: vec![], @@ -24768,11 +24805,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8632, 10000), }); declarations.push(Declaration { - id: DeclarationId(734), + id: DeclarationId(735), name: Some("parse_segment_tokens".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], - output: DeclarationId(731), + output: DeclarationId(732), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 10066, 11705)), }, type_params: vec![], @@ -24786,11 +24823,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 10002, 11705), }); declarations.push(Declaration { - id: DeclarationId(735), + id: DeclarationId(736), name: Some("last_path_param".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(730)], - output: DeclarationId(1787), + inputs: vec![DeclarationId(731)], + output: DeclarationId(1788), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)), }, type_params: vec![], @@ -24804,21 +24841,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 11707, 12044), }); declarations.push(Declaration { - id: DeclarationId(736), + id: DeclarationId(737), name: Some("IdempotentShape".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ReadEffect".to_string(), - ty: DeclarationId(1809), + ty: DeclarationId(1810), }, Field { label: "UpsertEffect".to_string(), - ty: DeclarationId(1810), + ty: DeclarationId(1811), }, Field { label: "DeleteEffect".to_string(), - ty: DeclarationId(1811), + ty: DeclarationId(1812), }, ], }, @@ -24833,17 +24870,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14330, 14451), }); declarations.push(Declaration { - id: DeclarationId(737), + id: DeclarationId(738), name: Some("BreakingShape".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "CreateEffect".to_string(), - ty: DeclarationId(1812), + ty: DeclarationId(1813), }, Field { label: "AppendEffect".to_string(), - ty: DeclarationId(1813), + ty: DeclarationId(1814), }, ], }, @@ -24858,17 +24895,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14674, 14749), }); declarations.push(Declaration { - id: DeclarationId(738), + id: DeclarationId(739), name: Some("EffectShape".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "IsIdempotent".to_string(), - ty: DeclarationId(1814), + ty: DeclarationId(1815), }, Field { label: "IsBreaking".to_string(), - ty: DeclarationId(1815), + ty: DeclarationId(1816), }, ], }, @@ -24883,17 +24920,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 15150, 15230), }); declarations.push(Declaration { - id: DeclarationId(739), + id: DeclarationId(740), name: Some("CreateCause".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "PostAlways".to_string(), - ty: DeclarationId(1816), + ty: DeclarationId(1817), }, Field { label: "KeylessFallback".to_string(), - ty: DeclarationId(1817), + ty: DeclarationId(1818), }, ], }, @@ -24908,21 +24945,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 15722, 15796), }); declarations.push(Declaration { - id: DeclarationId(740), + id: DeclarationId(741), name: Some("KeySource".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "PathParam".to_string(), - ty: DeclarationId(1818), + ty: DeclarationId(1819), }, Field { label: "InputField".to_string(), - ty: DeclarationId(1819), + ty: DeclarationId(1820), }, Field { label: "CompositeKey".to_string(), - ty: DeclarationId(1821), + ty: DeclarationId(1822), }, ], }, @@ -24937,21 +24974,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 16482, 16603), }); declarations.push(Declaration { - id: DeclarationId(741), + id: DeclarationId(742), name: Some("IdempotencyEvidence".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "LatticeEffect".to_string(), - ty: DeclarationId(1822), + ty: DeclarationId(1823), }, Field { label: "IdentityEffect".to_string(), - ty: DeclarationId(1823), + ty: DeclarationId(1824), }, Field { label: "NonIdempotent".to_string(), - ty: DeclarationId(1824), + ty: DeclarationId(1825), }, ], }, @@ -24966,10 +25003,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 17251, 17349), }); declarations.push(Declaration { - id: DeclarationId(742), + id: DeclarationId(743), name: Some("is_idempotent_effect".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(738)], + inputs: vec![DeclarationId(739)], output: DeclarationId(128), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17576, 17648)), }, @@ -24984,11 +25021,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 17524, 17648), }); declarations.push(Declaration { - id: DeclarationId(743), + id: DeclarationId(744), name: Some("derive_idempotency_evidence".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(738)], - output: DeclarationId(741), + inputs: vec![DeclarationId(739)], + output: DeclarationId(742), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 17861, 18381)), }, type_params: vec![], @@ -25002,7 +25039,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 17787, 18381), }); declarations.push(Declaration { - id: DeclarationId(744), + id: DeclarationId(745), name: Some("OperationEffect".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -25012,7 +25049,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "shape".to_string(), - ty: DeclarationId(738), + ty: DeclarationId(739), }, ], }, @@ -25027,21 +25064,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 19065, 19135), }); declarations.push(Declaration { - id: DeclarationId(745), + id: DeclarationId(746), name: Some("DeriveOpEffectResult".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "DerivedEffect".to_string(), - ty: DeclarationId(1825), + ty: DeclarationId(1826), }, Field { label: "UnknownHttpMethodInput".to_string(), - ty: DeclarationId(1826), + ty: DeclarationId(1827), }, Field { label: "MalformedPathInput".to_string(), - ty: DeclarationId(1827), + ty: DeclarationId(1828), }, ], }, @@ -25056,17 +25093,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 19489, 19789), }); declarations.push(Declaration { - id: DeclarationId(746), + id: DeclarationId(747), name: Some("CompositionVerdict".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "IdempotentComposition".to_string(), - ty: DeclarationId(1828), + ty: DeclarationId(1829), }, Field { label: "BrokenBy".to_string(), - ty: DeclarationId(1830), + ty: DeclarationId(1831), }, ], }, @@ -25081,10 +25118,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20510, 20619), }); declarations.push(Declaration { - id: DeclarationId(747), + id: DeclarationId(748), name: Some("operation_is_breaking".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(744)], + inputs: vec![DeclarationId(745)], output: DeclarationId(128), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20809, 20884)), }, @@ -25099,11 +25136,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20755, 20884), }); declarations.push(Declaration { - id: DeclarationId(748), + id: DeclarationId(749), name: Some("breaker_ref".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93)], - output: DeclarationId(1788), + output: DeclarationId(1789), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20944, 20966)), }, type_params: vec![], @@ -25117,11 +25154,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20886, 20966), }); declarations.push(Declaration { - id: DeclarationId(749), + id: DeclarationId(750), name: Some("indexed_breaker_ref".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1789)], - output: DeclarationId(1791), + inputs: vec![DeclarationId(1790)], + output: DeclarationId(1792), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21060, 21153)), }, type_params: vec![], @@ -25135,11 +25172,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20968, 21153), }); declarations.push(Declaration { - id: DeclarationId(750), + id: DeclarationId(751), name: Some("first_breaker_ref".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1792)], - output: DeclarationId(1794), + inputs: vec![DeclarationId(1793)], + output: DeclarationId(1795), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21240, 21423)), }, type_params: vec![], @@ -25153,11 +25190,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21155, 21423), }); declarations.push(Declaration { - id: DeclarationId(751), + id: DeclarationId(752), name: Some("compose_effects".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1795)], - output: DeclarationId(746), + inputs: vec![DeclarationId(1796)], + output: DeclarationId(747), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)), }, type_params: vec![], @@ -25171,12 +25208,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 22240, 22436), }); declarations.push(Declaration { - id: DeclarationId(752), + id: DeclarationId(753), name: Some("BoolPortRef".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "port".to_string(), - ty: DeclarationId(722), + ty: DeclarationId(723), }], }, type_params: vec![], @@ -25190,17 +25227,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 23637, 23672), }); declarations.push(Declaration { - id: DeclarationId(753), + id: DeclarationId(754), name: Some("BranchArm".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "condition".to_string(), - ty: DeclarationId(752), + ty: DeclarationId(753), }, Field { label: "body".to_string(), - ty: DeclarationId(754), + ty: DeclarationId(755), }, ], }, @@ -25215,25 +25252,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 23757, 23823), }); declarations.push(Declaration { - id: DeclarationId(754), + id: DeclarationId(755), name: Some("WorkflowEffect".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "LinearEffect".to_string(), - ty: DeclarationId(1832), + ty: DeclarationId(1833), }, Field { label: "BranchEffect".to_string(), - ty: DeclarationId(1834), + ty: DeclarationId(1835), }, Field { label: "LoopEffect".to_string(), - ty: DeclarationId(1835), + ty: DeclarationId(1836), }, Field { label: "ParallelEffect".to_string(), - ty: DeclarationId(1837), + ty: DeclarationId(1838), }, ], }, @@ -25248,7 +25285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24499, 24727), }); declarations.push(Declaration { - id: DeclarationId(755), + id: DeclarationId(756), name: Some("IdempotencyUnsupportedDetail".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -25277,17 +25314,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25086, 25190), }); declarations.push(Declaration { - id: DeclarationId(756), + id: DeclarationId(757), name: Some("WorkflowIdempotencyReport".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "WorkflowCompositionVerdict".to_string(), - ty: DeclarationId(1838), + ty: DeclarationId(1839), }, Field { label: "IdempotencyUnsupported".to_string(), - ty: DeclarationId(1839), + ty: DeclarationId(1840), }, ], }, @@ -25302,11 +25339,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25329, 25467), }); declarations.push(Declaration { - id: DeclarationId(757), + id: DeclarationId(758), name: Some("report_unsupported_workflow_variant".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(230)], - output: DeclarationId(756), + output: DeclarationId(757), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 25609, 25765)), }, type_params: vec![], @@ -25320,29 +25357,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25469, 25765), }); declarations.push(Declaration { - id: DeclarationId(758), + id: DeclarationId(759), name: Some("ParallelismUnsupportedKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "NoWorkflowProjection".to_string(), - ty: DeclarationId(1840), + ty: DeclarationId(1841), }, Field { label: "NotParallelEffectRoot".to_string(), - ty: DeclarationId(1841), + ty: DeclarationId(1842), }, Field { label: "NonLinearParallelBranch".to_string(), - ty: DeclarationId(1842), + ty: DeclarationId(1843), }, Field { label: "PairwiseNonCommute".to_string(), - ty: DeclarationId(1843), + ty: DeclarationId(1844), }, Field { label: "LensSurfacePending".to_string(), - ty: DeclarationId(1844), + ty: DeclarationId(1845), }, ], }, @@ -25357,13 +25394,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25928, 26084), }); declarations.push(Declaration { - id: DeclarationId(759), + id: DeclarationId(760), name: Some("ParallelismUnsupportedDetail".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "kind".to_string(), - ty: DeclarationId(758), + ty: DeclarationId(759), }, Field { label: "downstream_stage".to_string(), @@ -25386,17 +25423,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26086, 26202), }); declarations.push(Declaration { - id: DeclarationId(760), + id: DeclarationId(761), name: Some("WorkflowParallelismReport".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ParallelCompositionVerdict".to_string(), - ty: DeclarationId(1845), + ty: DeclarationId(1846), }, Field { label: "ParallelismUnsupported".to_string(), - ty: DeclarationId(1846), + ty: DeclarationId(1847), }, ], }, @@ -25411,11 +25448,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26366, 26504), }); declarations.push(Declaration { - id: DeclarationId(761), + id: DeclarationId(762), name: Some("report_parallelism_unsupported".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(758), DeclarationId(230)], - output: DeclarationId(760), + inputs: vec![DeclarationId(759), DeclarationId(230)], + output: DeclarationId(761), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 26625, 26780)), }, type_params: vec![], @@ -25429,11 +25466,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26506, 26780), }); declarations.push(Declaration { - id: DeclarationId(762), + id: DeclarationId(763), name: Some("lane2_workflow_idempotency_report".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(754)], - output: DeclarationId(756), + inputs: vec![DeclarationId(755)], + output: DeclarationId(757), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 27018, 27848)), }, type_params: vec![], @@ -25447,11 +25484,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26932, 27848), }); declarations.push(Declaration { - id: DeclarationId(763), + id: DeclarationId(764), name: Some("parse_http_method".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], - output: DeclarationId(1796), + output: DeclarationId(1797), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29707, 30005)), }, type_params: vec![], @@ -25465,11 +25502,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 29658, 30005), }); declarations.push(Declaration { - id: DeclarationId(764), + id: DeclarationId(765), name: Some("keyless_create".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(198)], - output: DeclarationId(738), + output: DeclarationId(739), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30060, 30136)), }, type_params: vec![], @@ -25483,11 +25520,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30007, 30136), }); declarations.push(Declaration { - id: DeclarationId(765), + id: DeclarationId(766), name: Some("upsert_or_create".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1797), DeclarationId(198)], - output: DeclarationId(738), + inputs: vec![DeclarationId(1798), DeclarationId(198)], + output: DeclarationId(739), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)), }, type_params: vec![], @@ -25501,11 +25538,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30400, 30628), }); declarations.push(Declaration { - id: DeclarationId(766), + id: DeclarationId(767), name: Some("delete_or_create".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1798), DeclarationId(198)], - output: DeclarationId(738), + inputs: vec![DeclarationId(1799), DeclarationId(198)], + output: DeclarationId(739), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)), }, type_params: vec![], @@ -25519,11 +25556,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30630, 30858), }); declarations.push(Declaration { - id: DeclarationId(767), + id: DeclarationId(768), name: Some("derive_effect_shape".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(198), DeclarationId(730)], - output: DeclarationId(738), + inputs: vec![DeclarationId(198), DeclarationId(731)], + output: DeclarationId(739), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30944, 31429)), }, type_params: vec![], @@ -25537,11 +25574,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30860, 31429), }); declarations.push(Declaration { - id: DeclarationId(768), + id: DeclarationId(769), name: Some("derive_op_effect".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(230), DeclarationId(198), DeclarationId(730)], - output: DeclarationId(745), + inputs: vec![DeclarationId(230), DeclarationId(198), DeclarationId(731)], + output: DeclarationId(746), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 31547, 31731)), }, type_params: vec![], @@ -25555,21 +25592,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 31431, 31731), }); declarations.push(Declaration { - id: DeclarationId(769), + id: DeclarationId(770), name: Some("ModifierAgreement".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Agrees".to_string(), - ty: DeclarationId(1847), + ty: DeclarationId(1848), }, Field { label: "Disagrees".to_string(), - ty: DeclarationId(1848), + ty: DeclarationId(1849), }, Field { label: "DerivationUnknown".to_string(), - ty: DeclarationId(1849), + ty: DeclarationId(1850), }, ], }, @@ -25584,17 +25621,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 32431, 32548), }); declarations.push(Declaration { - id: DeclarationId(770), + id: DeclarationId(771), name: Some("ModifierAxisCheck".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ModifierNotDeclared".to_string(), - ty: DeclarationId(1850), + ty: DeclarationId(1851), }, Field { label: "ModifierDeclared".to_string(), - ty: DeclarationId(1851), + ty: DeclarationId(1852), }, ], }, @@ -25609,7 +25646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 32995, 33095), }); declarations.push(Declaration { - id: DeclarationId(771), + id: DeclarationId(772), name: Some("ModifierCheck".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -25619,15 +25656,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "derived_shape".to_string(), - ty: DeclarationId(738), + ty: DeclarationId(739), }, Field { label: "idempotent_check".to_string(), - ty: DeclarationId(770), + ty: DeclarationId(771), }, Field { label: "readonly_check".to_string(), - ty: DeclarationId(770), + ty: DeclarationId(771), }, ], }, @@ -25642,11 +25679,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 33097, 33247), }); declarations.push(Declaration { - id: DeclarationId(772), + id: DeclarationId(773), name: Some("classify_idempotent_disagreement".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(737)], - output: DeclarationId(769), + inputs: vec![DeclarationId(738)], + output: DeclarationId(770), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 33886, 34428)), }, type_params: vec![], @@ -25660,11 +25697,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 33807, 34428), }); declarations.push(Declaration { - id: DeclarationId(773), + id: DeclarationId(774), name: Some("classify_readonly_agreement".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(738)], - output: DeclarationId(769), + inputs: vec![DeclarationId(739)], + output: DeclarationId(770), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 34832, 35274)), }, type_params: vec![], @@ -25678,11 +25715,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 34760, 35274), }); declarations.push(Declaration { - id: DeclarationId(774), + id: DeclarationId(775), name: Some("check_modifier_vs_derivation".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(744), DeclarationId(128), DeclarationId(128)], - output: DeclarationId(771), + inputs: vec![DeclarationId(745), DeclarationId(128), DeclarationId(128)], + output: DeclarationId(772), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 35406, 36055)), }, type_params: vec![], @@ -25696,7 +25733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 35276, 36055), }); declarations.push(Declaration { - id: DeclarationId(775), + id: DeclarationId(776), name: Some("IdempotencyTestObligation".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -25706,7 +25743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "effect_shape".to_string(), - ty: DeclarationId(738), + ty: DeclarationId(739), }, Field { label: "claim".to_string(), @@ -25729,11 +25766,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 36407, 36535), }); declarations.push(Declaration { - id: DeclarationId(776), + id: DeclarationId(777), name: Some("generate_idempotency_obligations".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1799)], - output: DeclarationId(1800), + inputs: vec![DeclarationId(1800)], + output: DeclarationId(1801), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36640, 36910)), }, type_params: vec![], @@ -25747,7 +25784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 36537, 36910), }); declarations.push(Declaration { - id: DeclarationId(777), + id: DeclarationId(778), name: Some("WorkflowEffectConcern".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -25776,12 +25813,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 37227, 37318), }); declarations.push(Declaration { - id: DeclarationId(778), + id: DeclarationId(779), name: Some("TypeShape".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "declaration".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }], }, type_params: vec![], @@ -25795,21 +25832,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 270, 317), }); declarations.push(Declaration { - id: DeclarationId(779), + id: DeclarationId(780), name: Some("PortState".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Uninferred".to_string(), - ty: DeclarationId(1860), + ty: DeclarationId(1861), }, Field { label: "Resolved".to_string(), - ty: DeclarationId(1861), + ty: DeclarationId(1862), }, Field { label: "Unresolved".to_string(), - ty: DeclarationId(1862), + ty: DeclarationId(1863), }, ], }, @@ -25824,21 +25861,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 460, 528), }); declarations.push(Declaration { - id: DeclarationId(780), + id: DeclarationId(781), name: Some("DagPort".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "id".to_string(), - ty: DeclarationId(722), + ty: DeclarationId(723), }, Field { label: "state".to_string(), - ty: DeclarationId(779), + ty: DeclarationId(780), }, Field { label: "produced_by".to_string(), - ty: DeclarationId(1863), + ty: DeclarationId(1864), }, ], }, @@ -25853,21 +25890,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 530, 601), }); declarations.push(Declaration { - id: DeclarationId(781), + id: DeclarationId(782), name: Some("LiteralBits".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "LitInt".to_string(), - ty: DeclarationId(1864), + ty: DeclarationId(1865), }, Field { label: "LitBool".to_string(), - ty: DeclarationId(1865), + ty: DeclarationId(1866), }, Field { label: "LitString".to_string(), - ty: DeclarationId(1866), + ty: DeclarationId(1867), }, ], }, @@ -25882,29 +25919,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 1083, 1158), }); declarations.push(Declaration { - id: DeclarationId(782), + id: DeclarationId(783), name: Some("AtomPayload".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Literal".to_string(), - ty: DeclarationId(1867), + ty: DeclarationId(1868), }, Field { label: "UnresolvedIdentifier".to_string(), - ty: DeclarationId(1868), + ty: DeclarationId(1869), }, Field { label: "ResolvedByStructure".to_string(), - ty: DeclarationId(1869), + ty: DeclarationId(1870), }, Field { label: "ResolvedByName".to_string(), - ty: DeclarationId(1870), + ty: DeclarationId(1871), }, Field { label: "TypeParam".to_string(), - ty: DeclarationId(1871), + ty: DeclarationId(1872), }, ], }, @@ -25919,21 +25956,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 3270, 3439), }); declarations.push(Declaration { - id: DeclarationId(783), + id: DeclarationId(784), name: Some("PositiveIntervalWidth".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "OneUnit".to_string(), - ty: DeclarationId(1872), + ty: DeclarationId(1873), }, Field { label: "AdditionalUnit".to_string(), - ty: DeclarationId(1873), + ty: DeclarationId(1874), }, Field { label: "UnitCount".to_string(), - ty: DeclarationId(1874), + ty: DeclarationId(1875), }, ], }, @@ -25948,17 +25985,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 4032, 5713), }); declarations.push(Declaration { - id: DeclarationId(784), + id: DeclarationId(785), name: Some("IntervalWidth".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ZeroWidth".to_string(), - ty: DeclarationId(1875), + ty: DeclarationId(1876), }, Field { label: "PositiveWidth".to_string(), - ty: DeclarationId(1876), + ty: DeclarationId(1877), }, ], }, @@ -25973,21 +26010,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5715, 5788), }); declarations.push(Declaration { - id: DeclarationId(785), + id: DeclarationId(786), name: Some("Interval".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "BoundedInterval".to_string(), - ty: DeclarationId(1877), + ty: DeclarationId(1878), }, Field { label: "Unbounded".to_string(), - ty: DeclarationId(1878), + ty: DeclarationId(1879), }, ], }, - type_params: vec![DeclarationId(786)], + type_params: vec![DeclarationId(787)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -25998,7 +26035,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6079, 6164), }); declarations.push(Declaration { - id: DeclarationId(786), + id: DeclarationId(787), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("D".to_string())), type_params: vec![], @@ -26012,12 +26049,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6079, 6164), }); declarations.push(Declaration { - id: DeclarationId(787), + id: DeclarationId(788), name: Some("IntInterval".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(785), + template: DeclarationId(786), arguments: vec![TemplateArgument { - parameter: DeclarationId(786), + parameter: DeclarationId(787), value: DeclarationId(93), }], }, @@ -26032,17 +26069,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6314, 6346), }); declarations.push(Declaration { - id: DeclarationId(788), + id: DeclarationId(789), name: Some("BoundDeclaration".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "StaticBound".to_string(), - ty: DeclarationId(1880), + ty: DeclarationId(1881), }, Field { label: "PlatformDependent".to_string(), - ty: DeclarationId(1881), + ty: DeclarationId(1882), }, ], }, @@ -26057,21 +26094,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6702, 6776), }); declarations.push(Declaration { - id: DeclarationId(789), + id: DeclarationId(790), name: Some("CardinalityBound".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Exact".to_string(), - ty: DeclarationId(1882), + ty: DeclarationId(1883), }, Field { label: "AtMostOne".to_string(), - ty: DeclarationId(1883), + ty: DeclarationId(1884), }, Field { label: "Unbounded".to_string(), - ty: DeclarationId(1884), + ty: DeclarationId(1885), }, ], }, @@ -26086,7 +26123,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7001, 7065), }); declarations.push(Declaration { - id: DeclarationId(790), + id: DeclarationId(791), name: Some("ConjField".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -26096,7 +26133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "ty".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }, ], }, @@ -26111,17 +26148,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7067, 7121), }); declarations.push(Declaration { - id: DeclarationId(791), + id: DeclarationId(792), name: Some("TemplateArgument".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "parameter".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }, Field { label: "value".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }, ], }, @@ -26136,7 +26173,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7123, 7198), }); declarations.push(Declaration { - id: DeclarationId(792), + id: DeclarationId(793), name: Some("FieldEntry".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -26146,7 +26183,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "value".to_string(), - ty: DeclarationId(793), + ty: DeclarationId(794), }, ], }, @@ -26161,33 +26198,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7200, 7255), }); declarations.push(Declaration { - id: DeclarationId(793), + id: DeclarationId(794), name: Some("FieldValue".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Literal".to_string(), - ty: DeclarationId(1885), + ty: DeclarationId(1886), }, Field { label: "Reference".to_string(), - ty: DeclarationId(1886), + ty: DeclarationId(1887), }, Field { label: "Record".to_string(), - ty: DeclarationId(1888), + ty: DeclarationId(1889), }, Field { label: "List".to_string(), - ty: DeclarationId(1890), + ty: DeclarationId(1891), }, Field { label: "Map".to_string(), - ty: DeclarationId(1892), + ty: DeclarationId(1893), }, Field { label: "Variant".to_string(), - ty: DeclarationId(1894), + ty: DeclarationId(1895), }, ], }, @@ -26202,29 +26239,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7472, 7708), }); declarations.push(Declaration { - id: DeclarationId(794), + id: DeclarationId(795), name: Some("ValueBody".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ValueBodyUnparsed".to_string(), - ty: DeclarationId(1895), + ty: DeclarationId(1896), }, Field { label: "ValueBodyStructural".to_string(), - ty: DeclarationId(1897), + ty: DeclarationId(1898), }, Field { label: "ValueBodyScalar".to_string(), - ty: DeclarationId(1898), + ty: DeclarationId(1899), }, Field { label: "ValueBodyList".to_string(), - ty: DeclarationId(1900), + ty: DeclarationId(1901), }, Field { label: "ValueBodyMap".to_string(), - ty: DeclarationId(1902), + ty: DeclarationId(1903), }, ], }, @@ -26239,12 +26276,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9302, 9507), }); declarations.push(Declaration { - id: DeclarationId(795), + id: DeclarationId(796), name: Some("BindNodeId".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "node".to_string(), - ty: DeclarationId(721), + ty: DeclarationId(722), }], }, type_params: vec![], @@ -26258,29 +26295,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10411, 10445), }); declarations.push(Declaration { - id: DeclarationId(796), + id: DeclarationId(797), name: Some("ArrowBody".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "UserDefined".to_string(), - ty: DeclarationId(1903), + ty: DeclarationId(1904), }, Field { label: "ExternalRealization".to_string(), - ty: DeclarationId(1904), + ty: DeclarationId(1905), }, Field { label: "Pending".to_string(), - ty: DeclarationId(1905), + ty: DeclarationId(1906), }, Field { label: "NoBody".to_string(), - ty: DeclarationId(1906), + ty: DeclarationId(1907), }, Field { label: "Unparsed".to_string(), - ty: DeclarationId(1907), + ty: DeclarationId(1908), }, ], }, @@ -26295,33 +26332,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10742, 10871), }); declarations.push(Declaration { - id: DeclarationId(797), + id: DeclarationId(798), name: Some("TypeConnective".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Atom".to_string(), - ty: DeclarationId(1908), + ty: DeclarationId(1909), }, Field { label: "Conj".to_string(), - ty: DeclarationId(1910), + ty: DeclarationId(1911), }, Field { label: "Disj".to_string(), - ty: DeclarationId(1912), + ty: DeclarationId(1913), }, Field { label: "Arrow".to_string(), - ty: DeclarationId(1914), + ty: DeclarationId(1915), }, Field { label: "Cardinality".to_string(), - ty: DeclarationId(1915), + ty: DeclarationId(1916), }, Field { label: "Instantiation".to_string(), - ty: DeclarationId(1917), + ty: DeclarationId(1918), }, ], }, @@ -26336,45 +26373,45 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11076, 11476), }); declarations.push(Declaration { - id: DeclarationId(798), + id: DeclarationId(799), name: Some("Declaration".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "id".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }, Field { label: "name".to_string(), - ty: DeclarationId(1918), + ty: DeclarationId(1919), }, Field { label: "connective".to_string(), - ty: DeclarationId(797), + ty: DeclarationId(798), }, Field { label: "type_params".to_string(), - ty: DeclarationId(1919), + ty: DeclarationId(1920), }, Field { label: "phantom_params".to_string(), - ty: DeclarationId(1920), + ty: DeclarationId(1921), }, Field { label: "meta_tag".to_string(), - ty: DeclarationId(1921), + ty: DeclarationId(1922), }, Field { label: "inhabits".to_string(), - ty: DeclarationId(1922), + ty: DeclarationId(1923), }, Field { label: "value_body".to_string(), - ty: DeclarationId(1923), + ty: DeclarationId(1924), }, Field { label: "nominal_opacity".to_string(), - ty: DeclarationId(1924), + ty: DeclarationId(1925), }, Field { label: "span".to_string(), @@ -26393,17 +26430,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11478, 11772), }); declarations.push(Declaration { - id: DeclarationId(799), + id: DeclarationId(800), name: Some("PhantomParameter".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "parameter".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }, Field { label: "algebra".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }, ], }, @@ -26418,12 +26455,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 12245, 12322), }); declarations.push(Declaration { - id: DeclarationId(800), + id: DeclarationId(801), name: Some("NominalOpacity".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "permitted_accessors".to_string(), - ty: DeclarationId(1925), + ty: DeclarationId(1926), }], }, type_params: vec![], @@ -26437,25 +26474,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 12829, 12895), }); declarations.push(Declaration { - id: DeclarationId(801), + id: DeclarationId(802), name: Some("ArithmeticOp".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Add".to_string(), - ty: DeclarationId(1926), + ty: DeclarationId(1927), }, Field { label: "Sub".to_string(), - ty: DeclarationId(1927), + ty: DeclarationId(1928), }, Field { label: "Mul".to_string(), - ty: DeclarationId(1928), + ty: DeclarationId(1929), }, Field { label: "Div".to_string(), - ty: DeclarationId(1929), + ty: DeclarationId(1930), }, ], }, @@ -26470,33 +26507,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13152, 13201), }); declarations.push(Declaration { - id: DeclarationId(802), + id: DeclarationId(803), name: Some("ComparisonOp".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Eq".to_string(), - ty: DeclarationId(1930), + ty: DeclarationId(1931), }, Field { label: "Ne".to_string(), - ty: DeclarationId(1931), + ty: DeclarationId(1932), }, Field { label: "Lt".to_string(), - ty: DeclarationId(1932), + ty: DeclarationId(1933), }, Field { label: "Le".to_string(), - ty: DeclarationId(1933), + ty: DeclarationId(1934), }, Field { label: "Gt".to_string(), - ty: DeclarationId(1934), + ty: DeclarationId(1935), }, Field { label: "Ge".to_string(), - ty: DeclarationId(1935), + ty: DeclarationId(1936), }, ], }, @@ -26511,7 +26548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13303, 13362), }); declarations.push(Declaration { - id: DeclarationId(803), + id: DeclarationId(804), name: Some("PerfBaselineMeasurement".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -26536,17 +26573,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13817, 13886), }); declarations.push(Declaration { - id: DeclarationId(804), + id: DeclarationId(805), name: Some("LogicalOp".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "And".to_string(), - ty: DeclarationId(1936), + ty: DeclarationId(1937), }, Field { label: "Or".to_string(), - ty: DeclarationId(1937), + ty: DeclarationId(1938), }, ], }, @@ -26561,21 +26598,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14120, 14149), }); declarations.push(Declaration { - id: DeclarationId(805), + id: DeclarationId(806), name: Some("OperatorKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Arithmetic".to_string(), - ty: DeclarationId(1938), + ty: DeclarationId(1939), }, Field { label: "Comparison".to_string(), - ty: DeclarationId(1939), + ty: DeclarationId(1940), }, Field { label: "Logical".to_string(), - ty: DeclarationId(1940), + ty: DeclarationId(1941), }, ], }, @@ -26590,25 +26627,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14363, 14461), }); declarations.push(Declaration { - id: DeclarationId(806), + id: DeclarationId(807), name: Some("TransformTarget".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Callable".to_string(), - ty: DeclarationId(1941), + ty: DeclarationId(1942), }, Field { label: "UnresolvedFieldProject".to_string(), - ty: DeclarationId(1942), + ty: DeclarationId(1943), }, Field { label: "ResolvedFieldProject".to_string(), - ty: DeclarationId(1943), + ty: DeclarationId(1944), }, Field { label: "Operator".to_string(), - ty: DeclarationId(1944), + ty: DeclarationId(1945), }, ], }, @@ -26623,17 +26660,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14623, 14818), }); declarations.push(Declaration { - id: DeclarationId(807), + id: DeclarationId(808), name: Some("BranchPattern".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "UnresolvedVariant".to_string(), - ty: DeclarationId(1945), + ty: DeclarationId(1946), }, Field { label: "ResolvedVariant".to_string(), - ty: DeclarationId(1946), + ty: DeclarationId(1947), }, ], }, @@ -26648,7 +26685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14920, 15030), }); declarations.push(Declaration { - id: DeclarationId(808), + id: DeclarationId(809), name: Some("PayloadBinding".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -26658,7 +26695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "payload_port".to_string(), - ty: DeclarationId(722), + ty: DeclarationId(723), }, ], }, @@ -26673,25 +26710,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15032, 15101), }); declarations.push(Declaration { - id: DeclarationId(809), + id: DeclarationId(810), name: Some("BranchPath".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "body".to_string(), - ty: DeclarationId(721), + ty: DeclarationId(722), }, Field { label: "result_port".to_string(), - ty: DeclarationId(722), + ty: DeclarationId(723), }, Field { label: "pattern".to_string(), - ty: DeclarationId(807), + ty: DeclarationId(808), }, Field { label: "binding".to_string(), - ty: DeclarationId(1947), + ty: DeclarationId(1948), }, ], }, @@ -26706,13 +26743,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15103, 15211), }); declarations.push(Declaration { - id: DeclarationId(810), + id: DeclarationId(811), name: Some("ParamRef".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "member".to_string(), - ty: DeclarationId(721), + ty: DeclarationId(722), }, Field { label: "slot".to_string(), @@ -26731,12 +26768,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15810, 15856), }); declarations.push(Declaration { - id: DeclarationId(811), + id: DeclarationId(812), name: Some("TransformRef".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "node".to_string(), - ty: DeclarationId(721), + ty: DeclarationId(722), }], }, type_params: vec![], @@ -26750,7 +26787,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16368, 16404), }); declarations.push(Declaration { - id: DeclarationId(812), + id: DeclarationId(813), name: Some("ElementRef".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -26758,7 +26795,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ty: DeclarationId(93), }], }, - type_params: vec![DeclarationId(813)], + type_params: vec![DeclarationId(814)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -26769,7 +26806,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 17021, 17062), }); declarations.push(Declaration { - id: DeclarationId(813), + id: DeclarationId(814), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())), type_params: vec![], @@ -26783,12 +26820,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 17021, 17062), }); declarations.push(Declaration { - id: DeclarationId(814), + id: DeclarationId(815), name: Some("MemberDescent".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "param".to_string(), - ty: DeclarationId(810), + ty: DeclarationId(811), }], }, type_params: vec![], @@ -26802,12 +26839,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 17064, 17104), }); declarations.push(Declaration { - id: DeclarationId(815), + id: DeclarationId(816), name: Some("IntraClusterCall".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "transform".to_string(), - ty: DeclarationId(811), + ty: DeclarationId(812), }], }, type_params: vec![], @@ -26821,17 +26858,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 17106, 17157), }); declarations.push(Declaration { - id: DeclarationId(816), + id: DeclarationId(817), name: Some("Cluster".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "members".to_string(), - ty: DeclarationId(1948), + ty: DeclarationId(1949), }, Field { label: "intra_cluster_calls".to_string(), - ty: DeclarationId(1949), + ty: DeclarationId(1950), }, ], }, @@ -26846,17 +26883,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 17159, 17272), }); declarations.push(Declaration { - id: DeclarationId(817), + id: DeclarationId(818), name: Some("LoopBound".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Cardinality".to_string(), - ty: DeclarationId(1950), + ty: DeclarationId(1951), }, Field { label: "Descent".to_string(), - ty: DeclarationId(1951), + ty: DeclarationId(1952), }, ], }, @@ -26871,11 +26908,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 17874, 17974), }); declarations.push(Declaration { - id: DeclarationId(818), + id: DeclarationId(819), name: Some("loop_bound_measure".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(817)], - output: DeclarationId(722), + inputs: vec![DeclarationId(818)], + output: DeclarationId(723), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(174))), }, type_params: vec![], @@ -26889,21 +26926,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 17976, 18129), }); declarations.push(Declaration { - id: DeclarationId(819), + id: DeclarationId(820), name: Some("ValueNode".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "id".to_string(), - ty: DeclarationId(721), + ty: DeclarationId(722), }, Field { label: "payload".to_string(), - ty: DeclarationId(781), + ty: DeclarationId(782), }, Field { label: "result_port".to_string(), - ty: DeclarationId(722), + ty: DeclarationId(723), }, Field { label: "span".to_string(), @@ -26911,7 +26948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "lane2_workflow".to_string(), - ty: DeclarationId(1952), + ty: DeclarationId(1953), }, ], }, @@ -26926,25 +26963,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18131, 18260), }); declarations.push(Declaration { - id: DeclarationId(820), + id: DeclarationId(821), name: Some("TransformNode".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "id".to_string(), - ty: DeclarationId(721), + ty: DeclarationId(722), }, Field { label: "target".to_string(), - ty: DeclarationId(806), + ty: DeclarationId(807), }, Field { label: "inputs".to_string(), - ty: DeclarationId(1953), + ty: DeclarationId(1954), }, Field { label: "result_port".to_string(), - ty: DeclarationId(722), + ty: DeclarationId(723), }, Field { label: "span".to_string(), @@ -26963,12 +27000,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18262, 18387), }); declarations.push(Declaration { - id: DeclarationId(821), + id: DeclarationId(822), name: Some("BranchEmitParticipation".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "UserMatch".to_string(), - ty: DeclarationId(1954), + ty: DeclarationId(1955), }], }, type_params: vec![], @@ -26982,25 +27019,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18552, 18594), }); declarations.push(Declaration { - id: DeclarationId(822), + id: DeclarationId(823), name: Some("BranchNode".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "id".to_string(), - ty: DeclarationId(721), + ty: DeclarationId(722), }, Field { label: "input".to_string(), - ty: DeclarationId(722), + ty: DeclarationId(723), }, Field { label: "paths".to_string(), - ty: DeclarationId(1955), + ty: DeclarationId(1956), }, Field { label: "result_port".to_string(), - ty: DeclarationId(722), + ty: DeclarationId(723), }, Field { label: "span".to_string(), @@ -27008,7 +27045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "emit_participation".to_string(), - ty: DeclarationId(1956), + ty: DeclarationId(1957), }, ], }, @@ -27023,33 +27060,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18596, 18758), }); declarations.push(Declaration { - id: DeclarationId(823), + id: DeclarationId(824), name: Some("LoopNode".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "id".to_string(), - ty: DeclarationId(721), + ty: DeclarationId(722), }, Field { label: "source".to_string(), - ty: DeclarationId(722), + ty: DeclarationId(723), }, Field { label: "init".to_string(), - ty: DeclarationId(722), + ty: DeclarationId(723), }, Field { label: "body".to_string(), - ty: DeclarationId(721), + ty: DeclarationId(722), }, Field { label: "bound".to_string(), - ty: DeclarationId(817), + ty: DeclarationId(818), }, Field { label: "result_port".to_string(), - ty: DeclarationId(722), + ty: DeclarationId(723), }, Field { label: "span".to_string(), @@ -27068,12 +27105,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18760, 18897), }); declarations.push(Declaration { - id: DeclarationId(824), + id: DeclarationId(825), name: Some("BindEmitParticipation".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "UserCallable".to_string(), - ty: DeclarationId(1957), + ty: DeclarationId(1958), }], }, type_params: vec![], @@ -27087,13 +27124,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19139, 19182), }); declarations.push(Declaration { - id: DeclarationId(825), + id: DeclarationId(826), name: Some("BindNode".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "id".to_string(), - ty: DeclarationId(721), + ty: DeclarationId(722), }, Field { label: "name".to_string(), @@ -27101,11 +27138,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "result_port".to_string(), - ty: DeclarationId(722), + ty: DeclarationId(723), }, Field { label: "params".to_string(), - ty: DeclarationId(1958), + ty: DeclarationId(1959), }, Field { label: "span".to_string(), @@ -27113,11 +27150,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "lane2_workflow".to_string(), - ty: DeclarationId(1959), + ty: DeclarationId(1960), }, Field { label: "emit_participation".to_string(), - ty: DeclarationId(1960), + ty: DeclarationId(1961), }, ], }, @@ -27132,29 +27169,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19184, 19372), }); declarations.push(Declaration { - id: DeclarationId(826), + id: DeclarationId(827), name: Some("Behavior".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Value".to_string(), - ty: DeclarationId(1961), + ty: DeclarationId(1962), }, Field { label: "Transform".to_string(), - ty: DeclarationId(1962), + ty: DeclarationId(1963), }, Field { label: "Branch".to_string(), - ty: DeclarationId(1963), + ty: DeclarationId(1964), }, Field { label: "Loop".to_string(), - ty: DeclarationId(1964), + ty: DeclarationId(1965), }, Field { label: "Bind".to_string(), - ty: DeclarationId(1965), + ty: DeclarationId(1966), }, ], }, @@ -27169,25 +27206,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19444, 19568), }); declarations.push(Declaration { - id: DeclarationId(827), + id: DeclarationId(828), name: Some("Dag".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "declarations".to_string(), - ty: DeclarationId(1966), + ty: DeclarationId(1967), }, Field { label: "nodes".to_string(), - ty: DeclarationId(1967), + ty: DeclarationId(1968), }, Field { label: "ports".to_string(), - ty: DeclarationId(1968), + ty: DeclarationId(1969), }, Field { label: "clusters".to_string(), - ty: DeclarationId(1969), + ty: DeclarationId(1970), }, ], }, @@ -27202,7 +27239,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19570, 19689), }); declarations.push(Declaration { - id: DeclarationId(828), + id: DeclarationId(829), name: Some("SubstrateAccessorRealization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -27221,21 +27258,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 21041, 21096), }); declarations.push(Declaration { - id: DeclarationId(829), + id: DeclarationId(830), name: Some("SubstrateAccessorBinding".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "accessor".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "realization".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "language".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, ], }, @@ -27250,11 +27287,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 21863, 21980), }); declarations.push(Declaration { - id: DeclarationId(830), + id: DeclarationId(831), name: Some("port".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(722)], - output: DeclarationId(1852), + inputs: vec![DeclarationId(828), DeclarationId(723)], + output: DeclarationId(1853), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 22022, @@ -27272,11 +27309,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 21982, 22037), }); declarations.push(Declaration { - id: DeclarationId(831), + id: DeclarationId(832), name: Some("node".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(721)], - output: DeclarationId(1853), + inputs: vec![DeclarationId(828), DeclarationId(722)], + output: DeclarationId(1854), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 22080, @@ -27294,11 +27331,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22039, 22095), }); declarations.push(Declaration { - id: DeclarationId(832), + id: DeclarationId(833), name: Some("resolve_producer".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(722)], - output: DeclarationId(1854), + inputs: vec![DeclarationId(828), DeclarationId(723)], + output: DeclarationId(1855), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 22155, @@ -27316,11 +27353,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22097, 22182), }); declarations.push(Declaration { - id: DeclarationId(833), + id: DeclarationId(834), name: Some("declaration_by_id".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(723)], - output: DeclarationId(1855), + inputs: vec![DeclarationId(828), DeclarationId(724)], + output: DeclarationId(1856), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 22544, @@ -27338,11 +27375,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22480, 22572), }); declarations.push(Declaration { - id: DeclarationId(834), + id: DeclarationId(835), name: Some("declaration_by_name".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(230)], - output: DeclarationId(1856), + inputs: vec![DeclarationId(828), DeclarationId(230)], + output: DeclarationId(1857), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 23419, @@ -27360,11 +27397,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23358, 23449), }); declarations.push(Declaration { - id: DeclarationId(835), + id: DeclarationId(836), name: Some("lane2_workflow_at".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(721)], - output: DeclarationId(1857), + inputs: vec![DeclarationId(828), DeclarationId(722)], + output: DeclarationId(1858), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 23745, @@ -27382,21 +27419,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23685, 23780), }); declarations.push(Declaration { - id: DeclarationId(836), + id: DeclarationId(837), name: Some("WorkflowRoot".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "SingleRoot".to_string(), - ty: DeclarationId(1970), + ty: DeclarationId(1971), }, Field { label: "NoRoot".to_string(), - ty: DeclarationId(1971), + ty: DeclarationId(1972), }, Field { label: "AmbiguousRoot".to_string(), - ty: DeclarationId(1973), + ty: DeclarationId(1974), }, ], }, @@ -27411,11 +27448,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 25748, 25858), }); declarations.push(Declaration { - id: DeclarationId(837), + id: DeclarationId(838), name: Some("workflow_root_port".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827)], - output: DeclarationId(836), + inputs: vec![DeclarationId(828)], + output: DeclarationId(837), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 27364, @@ -27433,11 +27470,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 27318, 27393), }); declarations.push(Declaration { - id: DeclarationId(838), + id: DeclarationId(839), name: Some("miss_declaration_id_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1858), + output: DeclarationId(1859), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 27750, @@ -27455,11 +27492,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 27693, 27760), }); declarations.push(Declaration { - id: DeclarationId(839), + id: DeclarationId(840), name: Some("hit_declaration_id_lookup".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(723)], - output: DeclarationId(1859), + inputs: vec![DeclarationId(724)], + output: DeclarationId(1860), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 27835, @@ -27477,12 +27514,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 27762, 27848), }); declarations.push(Declaration { - id: DeclarationId(840), + id: DeclarationId(841), name: Some("MethodRef".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "decl".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }], }, type_params: vec![], @@ -27496,21 +27533,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/methods.dag", 1604, 1645), }); declarations.push(Declaration { - id: DeclarationId(841), + id: DeclarationId(842), name: Some("CollectionSizeEffect".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ShrinkEffect".to_string(), - ty: DeclarationId(1998), + ty: DeclarationId(1999), }, Field { label: "ProjectionEffect".to_string(), - ty: DeclarationId(1999), + ty: DeclarationId(2000), }, Field { label: "IdentityEffect".to_string(), - ty: DeclarationId(2000), + ty: DeclarationId(2001), }, ], }, @@ -27525,25 +27562,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 4923, 5005), }); declarations.push(Declaration { - id: DeclarationId(842), + id: DeclarationId(843), name: Some("CostShape".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ShapeConstant".to_string(), - ty: DeclarationId(2001), + ty: DeclarationId(2002), }, Field { label: "ShapeLinearScan".to_string(), - ty: DeclarationId(2002), + ty: DeclarationId(2003), }, Field { label: "ShapeIterateBody".to_string(), - ty: DeclarationId(2003), + ty: DeclarationId(2004), }, Field { label: "ShapeSortBody".to_string(), - ty: DeclarationId(2004), + ty: DeclarationId(2005), }, ], }, @@ -27558,29 +27595,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 5836, 5927), }); declarations.push(Declaration { - id: DeclarationId(843), + id: DeclarationId(844), name: Some("MethodContract".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "algebra_id".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }, Field { label: "method_id".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }, Field { label: "size_effect".to_string(), - ty: DeclarationId(2005), + ty: DeclarationId(2006), }, Field { label: "cost_shape".to_string(), - ty: DeclarationId(2006), + ty: DeclarationId(2007), }, Field { label: "callback_element_position".to_string(), - ty: DeclarationId(2007), + ty: DeclarationId(2008), }, ], }, @@ -27595,17 +27632,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6688, 6862), }); declarations.push(Declaration { - id: DeclarationId(844), + id: DeclarationId(845), name: Some("SizeVariable".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "source_port".to_string(), - ty: DeclarationId(722), + ty: DeclarationId(723), }, Field { label: "display_name".to_string(), - ty: DeclarationId(2008), + ty: DeclarationId(2009), }, ], }, @@ -27620,11 +27657,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 7371, 7438), }); declarations.push(Declaration { - id: DeclarationId(845), + id: DeclarationId(846), name: Some("unnamed_size_variable".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(722)], - output: DeclarationId(844), + inputs: vec![DeclarationId(723)], + output: DeclarationId(845), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 7502, 7534)), }, type_params: vec![], @@ -27638,10 +27675,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 7440, 7534), }); declarations.push(Declaration { - id: DeclarationId(846), + id: DeclarationId(847), name: Some("size_variable_eq".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(844), DeclarationId(844)], + inputs: vec![DeclarationId(845), DeclarationId(845)], output: DeclarationId(128), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(178))), }, @@ -27656,17 +27693,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 7536, 7632), }); declarations.push(Declaration { - id: DeclarationId(847), + id: DeclarationId(848), name: Some("DegreeAtLeastTwo".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "DegreeTwo".to_string(), - ty: DeclarationId(2009), + ty: DeclarationId(2010), }, Field { label: "DegreeSuccessor".to_string(), - ty: DeclarationId(2010), + ty: DeclarationId(2011), }, ], }, @@ -27681,37 +27718,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8379, 8465), }); declarations.push(Declaration { - id: DeclarationId(848), + id: DeclarationId(849), name: Some("SymbolicCost".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ConstantCost".to_string(), - ty: DeclarationId(2011), + ty: DeclarationId(2012), }, Field { label: "LinearCost".to_string(), - ty: DeclarationId(2012), + ty: DeclarationId(2013), }, Field { label: "PolynomialCost".to_string(), - ty: DeclarationId(2013), + ty: DeclarationId(2014), }, Field { label: "ProductCost".to_string(), - ty: DeclarationId(2015), + ty: DeclarationId(2016), }, Field { label: "SumCost".to_string(), - ty: DeclarationId(2017), + ty: DeclarationId(2018), }, Field { label: "LogCost".to_string(), - ty: DeclarationId(2018), + ty: DeclarationId(2019), }, Field { label: "UnknownCost".to_string(), - ty: DeclarationId(2019), + ty: DeclarationId(2020), }, ], }, @@ -27719,14 +27756,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, - inhabits: Some(DeclarationId(2020)), + inhabits: Some(DeclarationId(2021)), value_body: None, refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/algebra.dag", 9452, 9761), }); declarations.push(Declaration { - id: DeclarationId(849), + id: DeclarationId(850), name: Some("DominateScanAcc".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -27736,7 +27773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "pivot".to_string(), - ty: DeclarationId(848), + ty: DeclarationId(849), }, ], }, @@ -27751,11 +27788,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10167, 10225), }); declarations.push(Declaration { - id: DeclarationId(850), + id: DeclarationId(851), name: Some("dominate_scan_init".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(848)], - output: DeclarationId(849), + inputs: vec![DeclarationId(849)], + output: DeclarationId(850), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(181))), }, type_params: vec![], @@ -27769,11 +27806,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10227, 10322), }); declarations.push(Declaration { - id: DeclarationId(851), + id: DeclarationId(852), name: Some("miss_symbolic_cost_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1974), + output: DeclarationId(1975), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 10963, 10973)), }, type_params: vec![], @@ -27787,11 +27824,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10908, 10973), }); declarations.push(Declaration { - id: DeclarationId(852), + id: DeclarationId(853), name: Some("hit_symbolic_cost_lookup".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(848)], - output: DeclarationId(1975), + inputs: vec![DeclarationId(849)], + output: DeclarationId(1976), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 11047, 11062)), }, type_params: vec![], @@ -27805,11 +27842,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10975, 11062), }); declarations.push(Declaration { - id: DeclarationId(853), + id: DeclarationId(854), name: Some("two_terms".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(848), DeclarationId(848)], - output: DeclarationId(1976), + inputs: vec![DeclarationId(849), DeclarationId(849)], + output: DeclarationId(1977), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(185))), }, type_params: vec![], @@ -27823,11 +27860,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 11064, 11539), }); declarations.push(Declaration { - id: DeclarationId(854), + id: DeclarationId(855), name: Some("many_terms".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(848), DeclarationId(848), DeclarationId(1977)], - output: DeclarationId(1978), + inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(1978)], + output: DeclarationId(1979), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(187))), }, type_params: vec![], @@ -27841,10 +27878,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 11541, 11726), }); declarations.push(Declaration { - id: DeclarationId(855), + id: DeclarationId(856), name: Some("reject_all_symbolic_costs".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(848)], + inputs: vec![DeclarationId(849)], output: DeclarationId(128), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(192))), }, @@ -27859,10 +27896,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 11728, 11856), }); declarations.push(Declaration { - id: DeclarationId(856), + id: DeclarationId(857), name: Some("degree_raw".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(847)], + inputs: vec![DeclarationId(848)], output: DeclarationId(93), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(200))), }, @@ -27877,11 +27914,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 11858, 12011), }); declarations.push(Declaration { - id: DeclarationId(857), + id: DeclarationId(858), name: Some("sequential".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(848), DeclarationId(848)], - output: DeclarationId(848), + inputs: vec![DeclarationId(849), DeclarationId(849)], + output: DeclarationId(849), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(204))), }, type_params: vec![], @@ -27895,11 +27932,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 12247, 12350), }); declarations.push(Declaration { - id: DeclarationId(858), + id: DeclarationId(859), name: Some("iterate".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(848), DeclarationId(848)], - output: DeclarationId(848), + inputs: vec![DeclarationId(849), DeclarationId(849)], + output: DeclarationId(849), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(208))), }, type_params: vec![], @@ -27913,11 +27950,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 12536, 12654), }); declarations.push(Declaration { - id: DeclarationId(859), + id: DeclarationId(860), name: Some("max_path_step".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(848), DeclarationId(848)], - output: DeclarationId(848), + inputs: vec![DeclarationId(849), DeclarationId(849)], + output: DeclarationId(849), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(212))), }, type_params: vec![], @@ -27931,11 +27968,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 13514, 13681), }); declarations.push(Declaration { - id: DeclarationId(860), + id: DeclarationId(861), name: Some("keep_or_sum".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(848), DeclarationId(848)], - output: DeclarationId(848), + inputs: vec![DeclarationId(849), DeclarationId(849)], + output: DeclarationId(849), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(216))), }, type_params: vec![], @@ -27949,11 +27986,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 13683, 13841), }); declarations.push(Declaration { - id: DeclarationId(861), + id: DeclarationId(862), name: Some("max_path".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1979)], - output: DeclarationId(848), + inputs: vec![DeclarationId(1980)], + output: DeclarationId(849), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(220))), }, type_params: vec![], @@ -27967,10 +28004,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 14143, 14245), }); declarations.push(Declaration { - id: DeclarationId(862), + id: DeclarationId(863), name: Some("dominates".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(848), DeclarationId(848)], + inputs: vec![DeclarationId(849), DeclarationId(849)], output: DeclarationId(128), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(273))), }, @@ -27985,10 +28022,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 15113, 17198), }); declarations.push(Declaration { - id: DeclarationId(863), + id: DeclarationId(864), name: Some("same_size_variable".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(844), DeclarationId(844)], + inputs: vec![DeclarationId(845), DeclarationId(845)], output: DeclarationId(128), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(275))), }, @@ -28003,41 +28040,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17200, 17290), }); declarations.push(Declaration { - id: DeclarationId(864), + id: DeclarationId(865), name: Some("AsymptoticClass".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ClassConstant".to_string(), - ty: DeclarationId(2021), + ty: DeclarationId(2022), }, Field { label: "ClassLog".to_string(), - ty: DeclarationId(2022), + ty: DeclarationId(2023), }, Field { label: "ClassLinear".to_string(), - ty: DeclarationId(2023), + ty: DeclarationId(2024), }, Field { label: "ClassLinearithmic".to_string(), - ty: DeclarationId(2024), + ty: DeclarationId(2025), }, Field { label: "ClassQuadratic".to_string(), - ty: DeclarationId(2025), + ty: DeclarationId(2026), }, Field { label: "ClassPolynomial".to_string(), - ty: DeclarationId(2026), + ty: DeclarationId(2027), }, Field { label: "ClassExponential".to_string(), - ty: DeclarationId(2027), + ty: DeclarationId(2028), }, Field { label: "ClassUnknown".to_string(), - ty: DeclarationId(2028), + ty: DeclarationId(2029), }, ], }, @@ -28045,17 +28082,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, - inhabits: Some(DeclarationId(2029)), + inhabits: Some(DeclarationId(2030)), value_body: None, refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/algebra.dag", 18077, 18318), }); declarations.push(Declaration { - id: DeclarationId(865), + id: DeclarationId(866), name: Some("asymptotic_dominates".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(864), DeclarationId(864)], + inputs: vec![DeclarationId(865), DeclarationId(865)], output: DeclarationId(128), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(345))), }, @@ -28070,11 +28107,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18320, 20588), }); declarations.push(Declaration { - id: DeclarationId(866), + id: DeclarationId(867), name: Some("meet_asymptotic_class".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(864), DeclarationId(864)], - output: DeclarationId(864), + inputs: vec![DeclarationId(865), DeclarationId(865)], + output: DeclarationId(865), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(348))), }, type_params: vec![], @@ -28088,11 +28125,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 20590, 20721), }); declarations.push(Declaration { - id: DeclarationId(867), + id: DeclarationId(868), name: Some("join_asymptotic_class".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(864), DeclarationId(864)], - output: DeclarationId(864), + inputs: vec![DeclarationId(865), DeclarationId(865)], + output: DeclarationId(865), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(351))), }, type_params: vec![], @@ -28106,11 +28143,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 20723, 20854), }); declarations.push(Declaration { - id: DeclarationId(868), + id: DeclarationId(869), name: Some("classify_symbolic_cost".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(848)], - output: DeclarationId(864), + inputs: vec![DeclarationId(849)], + output: DeclarationId(865), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 20921, 20954)), }, type_params: vec![], @@ -28124,11 +28161,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 20856, 20954), }); declarations.push(Declaration { - id: DeclarationId(869), + id: DeclarationId(870), name: Some("normalize".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(848)], - output: DeclarationId(848), + inputs: vec![DeclarationId(849)], + output: DeclarationId(849), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(360))), }, type_params: vec![], @@ -28142,11 +28179,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 21828, 22193), }); declarations.push(Declaration { - id: DeclarationId(870), + id: DeclarationId(871), name: Some("nsl_to_list".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1980)], - output: DeclarationId(1981), + inputs: vec![DeclarationId(1981)], + output: DeclarationId(1982), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(366))), }, type_params: vec![], @@ -28160,11 +28197,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22195, 22324), }); declarations.push(Declaration { - id: DeclarationId(871), + id: DeclarationId(872), name: Some("drop_additive_zero".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1982)], - output: DeclarationId(1983), + inputs: vec![DeclarationId(1983)], + output: DeclarationId(1984), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(379))), }, type_params: vec![], @@ -28178,11 +28215,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22501, 22793), }); declarations.push(Declaration { - id: DeclarationId(872), + id: DeclarationId(873), name: Some("collapse_on_multiplicative_zero".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1984)], - output: DeclarationId(1985), + inputs: vec![DeclarationId(1985)], + output: DeclarationId(1986), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(386))), }, type_params: vec![], @@ -28196,10 +28233,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23002, 23165), }); declarations.push(Declaration { - id: DeclarationId(873), + id: DeclarationId(874), name: Some("any_zero".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1986)], + inputs: vec![DeclarationId(1987)], output: DeclarationId(128), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(395))), }, @@ -28214,11 +28251,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23167, 23332), }); declarations.push(Declaration { - id: DeclarationId(874), + id: DeclarationId(875), name: Some("drop_multiplicative_one".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1987)], - output: DeclarationId(1988), + inputs: vec![DeclarationId(1988)], + output: DeclarationId(1989), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(408))), }, type_params: vec![], @@ -28232,10 +28269,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23490, 23796), }); declarations.push(Declaration { - id: DeclarationId(875), + id: DeclarationId(876), name: Some("is_zero_constant".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(848)], + inputs: vec![DeclarationId(849)], output: DeclarationId(128), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(418))), }, @@ -28250,10 +28287,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23798, 24052), }); declarations.push(Declaration { - id: DeclarationId(876), + id: DeclarationId(877), name: Some("is_one_constant".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(848)], + inputs: vec![DeclarationId(849)], output: DeclarationId(128), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(428))), }, @@ -28268,11 +28305,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 24054, 24307), }); declarations.push(Declaration { - id: DeclarationId(877), + id: DeclarationId(878), name: Some("reduce_sum".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1989)], - output: DeclarationId(848), + inputs: vec![DeclarationId(1990)], + output: DeclarationId(849), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(440))), }, type_params: vec![], @@ -28286,11 +28323,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 25092, 25363), }); declarations.push(Declaration { - id: DeclarationId(878), + id: DeclarationId(879), name: Some("wrap_sum".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1990)], - output: DeclarationId(848), + inputs: vec![DeclarationId(1991)], + output: DeclarationId(849), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(452))), }, type_params: vec![], @@ -28304,11 +28341,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 25365, 25640), }); declarations.push(Declaration { - id: DeclarationId(879), + id: DeclarationId(880), name: Some("reduce_product".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1991)], - output: DeclarationId(848), + inputs: vec![DeclarationId(1992)], + output: DeclarationId(849), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(469))), }, type_params: vec![], @@ -28322,11 +28359,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 25825, 26246), }); declarations.push(Declaration { - id: DeclarationId(880), + id: DeclarationId(881), name: Some("combine_binary_product".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(848), DeclarationId(848)], - output: DeclarationId(848), + inputs: vec![DeclarationId(849), DeclarationId(849)], + output: DeclarationId(849), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(478))), }, type_params: vec![], @@ -28340,11 +28377,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 26411, 26798), }); declarations.push(Declaration { - id: DeclarationId(881), + id: DeclarationId(882), name: Some("combine_linear_with".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(844), DeclarationId(848), DeclarationId(848)], - output: DeclarationId(848), + inputs: vec![DeclarationId(845), DeclarationId(849), DeclarationId(849)], + output: DeclarationId(849), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(487))), }, type_params: vec![], @@ -28358,16 +28395,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 26800, 27209), }); declarations.push(Declaration { - id: DeclarationId(882), + id: DeclarationId(883), name: Some("collapse_linear_square".to_string()), connective: TypeConnective::Arrow { inputs: vec![ - DeclarationId(844), - DeclarationId(844), - DeclarationId(848), - DeclarationId(848), + DeclarationId(845), + DeclarationId(845), + DeclarationId(849), + DeclarationId(849), ], - output: DeclarationId(848), + output: DeclarationId(849), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(492))), }, type_params: vec![], @@ -28381,11 +28418,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 27211, 27427), }); declarations.push(Declaration { - id: DeclarationId(883), + id: DeclarationId(884), name: Some("polynomial_square".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(844)], - output: DeclarationId(848), + inputs: vec![DeclarationId(845)], + output: DeclarationId(849), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 27483, 27533)), }, type_params: vec![], @@ -28399,11 +28436,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 27429, 27533), }); declarations.push(Declaration { - id: DeclarationId(884), + id: DeclarationId(885), name: Some("product_pair".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(848), DeclarationId(848)], - output: DeclarationId(848), + inputs: vec![DeclarationId(849), DeclarationId(849)], + output: DeclarationId(849), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(495))), }, type_params: vec![], @@ -28417,11 +28454,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 27535, 27633), }); declarations.push(Declaration { - id: DeclarationId(885), + id: DeclarationId(886), name: Some("fold_or_dominate_scan".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(849), DeclarationId(848)], - output: DeclarationId(849), + inputs: vec![DeclarationId(850), DeclarationId(849)], + output: DeclarationId(850), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(502))), }, type_params: vec![], @@ -28435,10 +28472,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 27635, 27784), }); declarations.push(Declaration { - id: DeclarationId(886), + id: DeclarationId(887), name: Some("scan_hit".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(849)], + inputs: vec![DeclarationId(850)], output: DeclarationId(128), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(504))), }, @@ -28453,11 +28490,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 27786, 27841), }); declarations.push(Declaration { - id: DeclarationId(887), + id: DeclarationId(888), name: Some("filter_not_dominated_by".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1992), DeclarationId(848)], - output: DeclarationId(1993), + inputs: vec![DeclarationId(1993), DeclarationId(849)], + output: DeclarationId(1994), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(517))), }, type_params: vec![], @@ -28471,11 +28508,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 27843, 28205), }); declarations.push(Declaration { - id: DeclarationId(888), + id: DeclarationId(889), name: Some("drop_dominated_step".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1994), DeclarationId(848)], - output: DeclarationId(1995), + inputs: vec![DeclarationId(1995), DeclarationId(849)], + output: DeclarationId(1996), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(524))), }, type_params: vec![], @@ -28489,11 +28526,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 28207, 28449), }); declarations.push(Declaration { - id: DeclarationId(889), + id: DeclarationId(890), name: Some("drop_dominated".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1996)], - output: DeclarationId(1997), + inputs: vec![DeclarationId(1997)], + output: DeclarationId(1998), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(527))), }, type_params: vec![], @@ -28507,18 +28544,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 28637, 28749), }); declarations.push(Declaration { - id: DeclarationId(890), + id: DeclarationId(891), name: Some("anthropic_messages".to_string()), connective: TypeConnective::Arrow { inputs: vec![ DeclarationId(147), DeclarationId(230), - DeclarationId(2057), - DeclarationId(93), DeclarationId(2058), + DeclarationId(93), DeclarationId(2059), + DeclarationId(2060), ], - output: DeclarationId(904), + output: DeclarationId(905), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/anthropic_messages.dag", 4627, @@ -28536,18 +28573,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4419, 4656), }); declarations.push(Declaration { - id: DeclarationId(891), + id: DeclarationId(892), name: Some("anthropic_operations".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1184), + parameter: DeclarationId(687), + value: DeclarationId(1185), }], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(2060)), + meta_tag: Some(DeclarationId(2061)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![])), @@ -28556,17 +28593,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6515, 6562), }); declarations.push(Declaration { - id: DeclarationId(892), + id: DeclarationId(893), name: Some("AnthropicChatMessage".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "UserMessage".to_string(), - ty: DeclarationId(2062), + ty: DeclarationId(2063), }, Field { label: "AssistantMessage".to_string(), - ty: DeclarationId(2064), + ty: DeclarationId(2065), }, ], }, @@ -28581,17 +28618,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2491, 2653), }); declarations.push(Declaration { - id: DeclarationId(893), + id: DeclarationId(894), name: Some("ImageSource".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Base64Image".to_string(), - ty: DeclarationId(2065), + ty: DeclarationId(2066), }, Field { label: "UrlImage".to_string(), - ty: DeclarationId(2066), + ty: DeclarationId(2067), }, ], }, @@ -28606,17 +28643,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3021, 3136), }); declarations.push(Declaration { - id: DeclarationId(894), + id: DeclarationId(895), name: Some("ContentBlock".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TextContent".to_string(), - ty: DeclarationId(2067), + ty: DeclarationId(2068), }, Field { label: "ImageContent".to_string(), - ty: DeclarationId(2068), + ty: DeclarationId(2069), }, ], }, @@ -28631,17 +28668,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3138, 3229), }); declarations.push(Declaration { - id: DeclarationId(895), + id: DeclarationId(896), name: Some("AnthropicToolResultContent".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ToolResultText".to_string(), - ty: DeclarationId(2069), + ty: DeclarationId(2070), }, Field { label: "ToolResultBlocks".to_string(), - ty: DeclarationId(2071), + ty: DeclarationId(2072), }, ], }, @@ -28656,17 +28693,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3505, 3624), }); declarations.push(Declaration { - id: DeclarationId(896), + id: DeclarationId(897), name: Some("AnthropicUserContentBlock".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "UserTextBlock".to_string(), - ty: DeclarationId(2072), + ty: DeclarationId(2073), }, Field { label: "UserToolResultBlock".to_string(), - ty: DeclarationId(2075), + ty: DeclarationId(2076), }, ], }, @@ -28681,17 +28718,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3870, 4064), }); declarations.push(Declaration { - id: DeclarationId(897), + id: DeclarationId(898), name: Some("AnthropicAssistantContentBlock".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "AssistantTextBlock".to_string(), - ty: DeclarationId(2076), + ty: DeclarationId(2077), }, Field { label: "AssistantToolUseBlock".to_string(), - ty: DeclarationId(2077), + ty: DeclarationId(2078), }, ], }, @@ -28706,37 +28743,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4471, 4637), }); declarations.push(Declaration { - id: DeclarationId(898), + id: DeclarationId(899), name: Some("AnthropicStopReason".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "EndTurn".to_string(), - ty: DeclarationId(2078), + ty: DeclarationId(2079), }, Field { label: "MaxTokens".to_string(), - ty: DeclarationId(2079), + ty: DeclarationId(2080), }, Field { label: "StopSequence".to_string(), - ty: DeclarationId(2080), + ty: DeclarationId(2081), }, Field { label: "ToolUse".to_string(), - ty: DeclarationId(2081), + ty: DeclarationId(2082), }, Field { label: "PauseTurn".to_string(), - ty: DeclarationId(2082), + ty: DeclarationId(2083), }, Field { label: "Refusal".to_string(), - ty: DeclarationId(2083), + ty: DeclarationId(2084), }, Field { label: "ModelContextWindowExceeded".to_string(), - ty: DeclarationId(2084), + ty: DeclarationId(2085), }, ], }, @@ -28751,29 +28788,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4966, 5102), }); declarations.push(Declaration { - id: DeclarationId(899), + id: DeclarationId(900), name: Some("AnthropicMessages200Citation".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "CharLocation".to_string(), - ty: DeclarationId(2087), + ty: DeclarationId(2088), }, Field { label: "PageLocation".to_string(), - ty: DeclarationId(2090), + ty: DeclarationId(2091), }, Field { label: "ContentBlockLocation".to_string(), - ty: DeclarationId(2093), + ty: DeclarationId(2094), }, Field { label: "WebSearchResultLocation".to_string(), - ty: DeclarationId(2095), + ty: DeclarationId(2096), }, Field { label: "SearchResultLocation".to_string(), - ty: DeclarationId(2097), + ty: DeclarationId(2098), }, ], }, @@ -28788,33 +28825,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5304, 6050), }); declarations.push(Declaration { - id: DeclarationId(900), + id: DeclarationId(901), name: Some("AnthropicMessages200ContentBlock".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "MessagesTextBlock".to_string(), - ty: DeclarationId(2100), + ty: DeclarationId(2101), }, Field { label: "MessagesThinkingBlock".to_string(), - ty: DeclarationId(2101), + ty: DeclarationId(2102), }, Field { label: "MessagesRedactedThinkingBlock".to_string(), - ty: DeclarationId(2102), + ty: DeclarationId(2103), }, Field { label: "MessagesToolUseBlock".to_string(), - ty: DeclarationId(2104), + ty: DeclarationId(2105), }, Field { label: "MessagesServerToolUseBlock".to_string(), - ty: DeclarationId(2106), + ty: DeclarationId(2107), }, Field { label: "MessagesWebSearchToolResultBlock".to_string(), - ty: DeclarationId(2108), + ty: DeclarationId(2109), }, ], }, @@ -28829,41 +28866,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6587, 7115), }); declarations.push(Declaration { - id: DeclarationId(901), + id: DeclarationId(902), name: Some("AnthropicServerToolName".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "WebSearch".to_string(), - ty: DeclarationId(2109), + ty: DeclarationId(2110), }, Field { label: "WebFetch".to_string(), - ty: DeclarationId(2110), + ty: DeclarationId(2111), }, Field { label: "CodeExecution".to_string(), - ty: DeclarationId(2111), + ty: DeclarationId(2112), }, Field { label: "BashCodeExecution".to_string(), - ty: DeclarationId(2112), + ty: DeclarationId(2113), }, Field { label: "TextEditorCodeExecution".to_string(), - ty: DeclarationId(2113), + ty: DeclarationId(2114), }, Field { label: "ToolSearchToolRegex".to_string(), - ty: DeclarationId(2114), + ty: DeclarationId(2115), }, Field { label: "ToolSearchToolBm25".to_string(), - ty: DeclarationId(2115), + ty: DeclarationId(2116), }, Field { label: "Advisor".to_string(), - ty: DeclarationId(2116), + ty: DeclarationId(2117), }, ], }, @@ -28878,7 +28915,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7303, 7485), }); declarations.push(Declaration { - id: DeclarationId(902), + id: DeclarationId(903), name: Some("AnthropicMessages200Usage".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -28892,15 +28929,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "cache_creation_input_tokens".to_string(), - ty: DeclarationId(2117), + ty: DeclarationId(2118), }, Field { label: "cache_read_input_tokens".to_string(), - ty: DeclarationId(2118), + ty: DeclarationId(2119), }, Field { label: "service_tier".to_string(), - ty: DeclarationId(2119), + ty: DeclarationId(2120), }, ], }, @@ -28915,12 +28952,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7601, 7816), }); declarations.push(Declaration { - id: DeclarationId(903), + id: DeclarationId(904), name: Some("AnthropicMessages200Role".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "Assistant".to_string(), - ty: DeclarationId(2120), + ty: DeclarationId(2121), }], }, type_params: vec![], @@ -28934,7 +28971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8137, 8180), }); declarations.push(Declaration { - id: DeclarationId(904), + id: DeclarationId(905), name: Some("AnthropicMessages200Body".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -28948,11 +28985,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "role".to_string(), - ty: DeclarationId(903), + ty: DeclarationId(904), }, Field { label: "content".to_string(), - ty: DeclarationId(2121), + ty: DeclarationId(2122), }, Field { label: "model".to_string(), @@ -28960,19 +28997,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "stop_reason".to_string(), - ty: DeclarationId(898), + ty: DeclarationId(899), }, Field { label: "stop_sequence".to_string(), - ty: DeclarationId(2122), + ty: DeclarationId(2123), }, Field { label: "usage".to_string(), - ty: DeclarationId(902), + ty: DeclarationId(903), }, Field { label: "container".to_string(), - ty: DeclarationId(2123), + ty: DeclarationId(2124), }, ], }, @@ -28987,7 +29024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8527, 8858), }); declarations.push(Declaration { - id: DeclarationId(905), + id: DeclarationId(906), name: Some("BinShim".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -29001,7 +29038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "entry".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, ], }, @@ -29016,29 +29053,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bin_shim.dag", 801, 894), }); declarations.push(Declaration { - id: DeclarationId(906), + id: DeclarationId(907), name: Some("BootstrapAuthority".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "StdAuthority".to_string(), - ty: DeclarationId(2124), + ty: DeclarationId(2125), }, Field { label: "V3StdAuthority".to_string(), - ty: DeclarationId(2125), + ty: DeclarationId(2126), }, Field { label: "V3SpecAuthority".to_string(), - ty: DeclarationId(2126), + ty: DeclarationId(2127), }, Field { label: "CompilerAuthority".to_string(), - ty: DeclarationId(2127), + ty: DeclarationId(2128), }, Field { label: "ExtdepsFixtureAuthority".to_string(), - ty: DeclarationId(2128), + ty: DeclarationId(2129), }, ], }, @@ -29053,7 +29090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 985, 1114), }); declarations.push(Declaration { - id: DeclarationId(907), + id: DeclarationId(908), name: Some("BootstrapAuthoritySet".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -29064,7 +29101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(139), - value: DeclarationId(906), + value: DeclarationId(907), }, ], }, @@ -29079,15 +29116,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1299, 1359), }); declarations.push(Declaration { - id: DeclarationId(908), + id: DeclarationId(909), name: Some("bootstrap_authority".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(907), + template: DeclarationId(908), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(907)), + meta_tag: Some(DeclarationId(908)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Map( @@ -29095,476 +29132,476 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "dsl/std/logic.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2124), + constructor: DeclarationId(2125), payload: vec![], }, ), ( "dsl/std/bit.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2124), + constructor: DeclarationId(2125), payload: vec![], }, ), ( "dsl/std/error_primitives.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2124), + constructor: DeclarationId(2125), payload: vec![], }, ), ( "dsl/std/algebra.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2124), + constructor: DeclarationId(2125), payload: vec![], }, ), ( "dsl/std/magnitude.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2124), + constructor: DeclarationId(2125), payload: vec![], }, ), ( "dsl/std/machine_constraints.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2124), + constructor: DeclarationId(2125), payload: vec![], }, ), ( "dsl/std/nat.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2124), + constructor: DeclarationId(2125), payload: vec![], }, ), ( "dsl/std/integer.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2124), + constructor: DeclarationId(2125), payload: vec![], }, ), ( "dsl/std/rational.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2124), + constructor: DeclarationId(2125), payload: vec![], }, ), ( "dsl/std/float.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2124), + constructor: DeclarationId(2125), payload: vec![], }, ), ( "dsl/std/types.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2124), + constructor: DeclarationId(2125), payload: vec![], }, ), ( "dsl/std/string_type.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2124), + constructor: DeclarationId(2125), payload: vec![], }, ), ( "dsl/std/unicode.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2124), + constructor: DeclarationId(2125), payload: vec![], }, ), ( "dsl/std/render_repeat_string_bootstrap.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2124), + constructor: DeclarationId(2125), payload: vec![], }, ), ( "dsl/std/methods.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2124), + constructor: DeclarationId(2125), payload: vec![], }, ), ( "dsl/std/serialization.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2124), + constructor: DeclarationId(2125), payload: vec![], }, ), ( "src/v3/std/algebra.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/anthropic_messages.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/anthropic_operations.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/anthropic_schema.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/approximate_field.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/bin_shim.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/bootstrap_authority.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/bridge_ledger.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/clean_emission.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/computation.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/computation_model.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/coproduct_projection.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/cross_target_coverage.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/diagnostics.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/dimensions.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/effects.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/emission_provenance.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/emit_model.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/go_method_template_contracts.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/induction.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/integer_diagnostic_order.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/lens.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/lens_application.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/list.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/lookup.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/methods.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/parse_surface.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/python_method_template_contracts.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/resources.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/runtime.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/rust_method_template_contracts.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/services.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/substrate.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/substrate_minimal.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/termination.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/t_ci_workflow_as_data_demo.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/timing_lens.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/tokenize.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/verification.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/std/workflows.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2125), + constructor: DeclarationId(2126), payload: vec![], }, ), ( "src/v3/spec/v3_l1.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2126), + constructor: DeclarationId(2127), payload: vec![], }, ), ( "src/v3/spec/go.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2126), + constructor: DeclarationId(2127), payload: vec![], }, ), ( "src/v3/spec/python.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2126), + constructor: DeclarationId(2127), payload: vec![], }, ), ( "src/v3/spec/rust.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2126), + constructor: DeclarationId(2127), payload: vec![], }, ), ( "src/v3/compiler/pipeline.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2127), + constructor: DeclarationId(2128), payload: vec![], }, ), ( "src/v3/compiler/operators.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2127), + constructor: DeclarationId(2128), payload: vec![], }, ), ( "src/v3/compiler/regen.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2127), + constructor: DeclarationId(2128), payload: vec![], }, ), ( "dsl/extdeps/languages/rust/primitives.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2128), + constructor: DeclarationId(2129), payload: vec![], }, ), ( "dsl/extdeps/cron_schedule_model.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2128), + constructor: DeclarationId(2129), payload: vec![], }, ), ( "dsl/extdeps/github/github.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2128), + constructor: DeclarationId(2129), payload: vec![], }, ), ( "dsl/extdeps/github/actions.dag".to_string(), FieldValue::Variant { - constructor: DeclarationId(2128), + constructor: DeclarationId(2129), payload: vec![], }, ), @@ -29576,17 +29613,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1361, 4876), }); declarations.push(Declaration { - id: DeclarationId(909), + id: DeclarationId(910), name: Some("BridgeStatus".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Retired".to_string(), - ty: DeclarationId(2129), + ty: DeclarationId(2130), }, Field { label: "Open".to_string(), - ty: DeclarationId(2130), + ty: DeclarationId(2131), }, ], }, @@ -29601,12 +29638,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4697, 4735), }); declarations.push(Declaration { - id: DeclarationId(910), + id: DeclarationId(911), name: Some("BridgeLedgerRef".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "decl".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }], }, type_params: vec![], @@ -29620,7 +29657,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 5699, 5746), }); declarations.push(Declaration { - id: DeclarationId(911), + id: DeclarationId(912), name: Some("BridgeLedgerRow".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -29634,7 +29671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "status".to_string(), - ty: DeclarationId(909), + ty: DeclarationId(910), }, Field { label: "authority".to_string(), @@ -29652,47 +29689,47 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6389, 6499), }); - declarations.push(Declaration { id: DeclarationId(912), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(911) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2131)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_source_span_file_participation_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R3".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2130), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("ROADMAP.md#lens-fold-file-path-semantics".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_mark_bootstrap_secret_nominal_opacity_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2129), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #937".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_dispatch_pr1183_slice_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2129), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/canonical_lens_bridge_ratchet_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2129), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2129), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2129), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2130), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) }); + declarations.push(Declaration { id: DeclarationId(913), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), value: DeclarationId(912) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2132)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_source_span_file_participation_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R3".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2131), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("ROADMAP.md#lens-fold-file-path-semantics".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_mark_bootstrap_secret_nominal_opacity_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2130), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #937".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_dispatch_pr1183_slice_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2130), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/canonical_lens_bridge_ratchet_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2130), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2130), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2130), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2131), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) }); declarations.push(Declaration { - id: DeclarationId(913), + id: DeclarationId(914), name: Some("CleanEmissionContract".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "expression_wrapping".to_string(), - ty: DeclarationId(915), + ty: DeclarationId(916), }, Field { label: "pattern_bindings".to_string(), - ty: DeclarationId(916), + ty: DeclarationId(917), }, Field { label: "variant_payload_field_access".to_string(), - ty: DeclarationId(917), + ty: DeclarationId(918), }, Field { label: "imports".to_string(), - ty: DeclarationId(918), + ty: DeclarationId(919), }, Field { label: "block_return".to_string(), - ty: DeclarationId(919), + ty: DeclarationId(920), }, Field { label: "variable_bindings".to_string(), - ty: DeclarationId(920), + ty: DeclarationId(921), }, Field { label: "match_arm_body".to_string(), - ty: DeclarationId(921), + ty: DeclarationId(922), }, Field { label: "correction_style".to_string(), - ty: DeclarationId(922), + ty: DeclarationId(923), }, Field { label: "post_emit_verifier".to_string(), - ty: DeclarationId(923), + ty: DeclarationId(924), }, ], }, @@ -29707,17 +29744,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 562, 944), }); declarations.push(Declaration { - id: DeclarationId(914), + id: DeclarationId(915), name: Some("TargetCleanEmissionBinding".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1042), + ty: DeclarationId(1043), }, Field { label: "clean_emission".to_string(), - ty: DeclarationId(913), + ty: DeclarationId(914), }, ], }, @@ -29732,21 +29769,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 1748, 1848), }); declarations.push(Declaration { - id: DeclarationId(915), + id: DeclarationId(916), name: Some("ExpressionWrappingRule".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "WrapEverything".to_string(), - ty: DeclarationId(2132), + ty: DeclarationId(2133), }, Field { label: "WrapOnlyInOperandPosition".to_string(), - ty: DeclarationId(2133), + ty: DeclarationId(2134), }, Field { label: "NoWrapping".to_string(), - ty: DeclarationId(2134), + ty: DeclarationId(2135), }, ], }, @@ -29761,25 +29798,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2192, 2283), }); declarations.push(Declaration { - id: DeclarationId(916), + id: DeclarationId(917), name: Some("PatternBindingRule".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "EmitBindingAlways".to_string(), - ty: DeclarationId(2135), + ty: DeclarationId(2136), }, Field { label: "EmitUnderscoreWhenUnused".to_string(), - ty: DeclarationId(2136), + ty: DeclarationId(2137), }, Field { label: "EmitPrefixedUnderscoreWhenUnused".to_string(), - ty: DeclarationId(2137), + ty: DeclarationId(2138), }, Field { label: "NotApplicablePatternBinding".to_string(), - ty: DeclarationId(2138), + ty: DeclarationId(2139), }, ], }, @@ -29794,17 +29831,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2520, 2663), }); declarations.push(Declaration { - id: DeclarationId(917), + id: DeclarationId(918), name: Some("VariantPayloadFieldAccessRule".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "AccessFromPayloadBinding".to_string(), - ty: DeclarationId(2139), + ty: DeclarationId(2140), }, Field { label: "OverrideNamedFieldsAtBindingSite".to_string(), - ty: DeclarationId(2140), + ty: DeclarationId(2141), }, ], }, @@ -29819,21 +29856,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3330, 3430), }); declarations.push(Declaration { - id: DeclarationId(918), + id: DeclarationId(919), name: Some("ImportRule".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ImportEverythingDeclared".to_string(), - ty: DeclarationId(2141), + ty: DeclarationId(2142), }, Field { label: "IncludeOnlyReferenced".to_string(), - ty: DeclarationId(2142), + ty: DeclarationId(2143), }, Field { label: "ImportPerUsageSite".to_string(), - ty: DeclarationId(2143), + ty: DeclarationId(2144), }, ], }, @@ -29848,21 +29885,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3544, 3637), }); declarations.push(Declaration { - id: DeclarationId(919), + id: DeclarationId(920), name: Some("BlockReturnRule".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "WrapReturnValue".to_string(), - ty: DeclarationId(2144), + ty: DeclarationId(2145), }, Field { label: "NoWrappingOnTerminalExpression".to_string(), - ty: DeclarationId(2145), + ty: DeclarationId(2146), }, Field { label: "ExplicitReturnKeyword".to_string(), - ty: DeclarationId(2146), + ty: DeclarationId(2147), }, ], }, @@ -29877,21 +29914,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3756, 3857), }); declarations.push(Declaration { - id: DeclarationId(920), + id: DeclarationId(921), name: Some("VariableBindingRule".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "EmitLetBindingAlways".to_string(), - ty: DeclarationId(2147), + ty: DeclarationId(2148), }, Field { label: "EmitLetUnderscoreWhenUnused".to_string(), - ty: DeclarationId(2148), + ty: DeclarationId(2149), }, Field { label: "OmitLetBinding".to_string(), - ty: DeclarationId(2149), + ty: DeclarationId(2150), }, ], }, @@ -29906,21 +29943,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3995, 4095), }); declarations.push(Declaration { - id: DeclarationId(921), + id: DeclarationId(922), name: Some("MatchArmBodyRule".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "WrapBody".to_string(), - ty: DeclarationId(2150), + ty: DeclarationId(2151), }, Field { label: "NoWrappingOnNonComplexBody".to_string(), - ty: DeclarationId(2151), + ty: DeclarationId(2152), }, Field { label: "NotApplicableMatchArmBody".to_string(), - ty: DeclarationId(2152), + ty: DeclarationId(2153), }, ], }, @@ -29935,7 +29972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4328, 4423), }); declarations.push(Declaration { - id: DeclarationId(922), + id: DeclarationId(923), name: Some("CorrectionStyle".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -29968,7 +30005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4736, 4854), }); declarations.push(Declaration { - id: DeclarationId(923), + id: DeclarationId(924), name: Some("PostEmitVerifier".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -29978,7 +30015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), - ty: DeclarationId(2153), + ty: DeclarationId(2154), }, Field { label: "syntax_only".to_string(), @@ -29990,7 +30027,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "output_policy".to_string(), - ty: DeclarationId(924), + ty: DeclarationId(925), }, ], }, @@ -30005,25 +30042,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5270, 5418), }); declarations.push(Declaration { - id: DeclarationId(924), + id: DeclarationId(925), name: Some("VerifierOutputPolicy".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "IgnoreVerifierOutput".to_string(), - ty: DeclarationId(2154), + ty: DeclarationId(2155), }, Field { label: "RequireEmptyStdout".to_string(), - ty: DeclarationId(2155), + ty: DeclarationId(2156), }, Field { label: "RequireEmptyStderr".to_string(), - ty: DeclarationId(2156), + ty: DeclarationId(2157), }, Field { label: "RequireEmptyStdoutAndStderr".to_string(), - ty: DeclarationId(2157), + ty: DeclarationId(2158), }, ], }, @@ -30038,41 +30075,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5663, 5791), }); declarations.push(Declaration { - id: DeclarationId(925), + id: DeclarationId(926), name: Some("SizeBound".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "CollectionSize".to_string(), - ty: DeclarationId(2163), + ty: DeclarationId(2164), }, Field { label: "ParserStreamSize".to_string(), - ty: DeclarationId(2164), + ty: DeclarationId(2165), }, Field { label: "WorklistDrainSize".to_string(), - ty: DeclarationId(2165), + ty: DeclarationId(2166), }, Field { label: "TreeSize".to_string(), - ty: DeclarationId(2166), + ty: DeclarationId(2167), }, Field { label: "ArithmeticParam".to_string(), - ty: DeclarationId(2167), + ty: DeclarationId(2168), }, Field { label: "ExplicitCountZero".to_string(), - ty: DeclarationId(2168), + ty: DeclarationId(2169), }, Field { label: "ExplicitCountPositive".to_string(), - ty: DeclarationId(2169), + ty: DeclarationId(2170), }, Field { label: "Forever".to_string(), - ty: DeclarationId(2170), + ty: DeclarationId(2171), }, ], }, @@ -30087,11 +30124,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1403, 1699), }); declarations.push(Declaration { - id: DeclarationId(926), + id: DeclarationId(927), name: Some("tree_size_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], - output: DeclarationId(925), + output: DeclarationId(926), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 1748, @@ -30109,41 +30146,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1701, 1779), }); declarations.push(Declaration { - id: DeclarationId(927), + id: DeclarationId(928), name: Some("CallPattern".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ChildAccessorCall".to_string(), - ty: DeclarationId(2171), + ty: DeclarationId(2172), }, Field { label: "CollectionShrinkCall".to_string(), - ty: DeclarationId(2172), + ty: DeclarationId(2173), }, Field { label: "ArithmeticSubtractCall".to_string(), - ty: DeclarationId(2173), + ty: DeclarationId(2174), }, Field { label: "ArithmeticDivideCall".to_string(), - ty: DeclarationId(2174), + ty: DeclarationId(2175), }, Field { label: "ParserAdvanceCall".to_string(), - ty: DeclarationId(2175), + ty: DeclarationId(2176), }, Field { label: "WorklistDrainCall".to_string(), - ty: DeclarationId(2176), + ty: DeclarationId(2177), }, Field { label: "FoldBodyCall".to_string(), - ty: DeclarationId(2177), + ty: DeclarationId(2178), }, Field { label: "SameArgumentCall".to_string(), - ty: DeclarationId(2178), + ty: DeclarationId(2179), }, ], }, @@ -30158,11 +30195,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2030, 2477), }); declarations.push(Declaration { - id: DeclarationId(928), + id: DeclarationId(929), name: Some("per_call_pattern_at".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(721)], - output: DeclarationId(2158), + inputs: vec![DeclarationId(828), DeclarationId(722)], + output: DeclarationId(2159), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 2756, @@ -30180,21 +30217,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2690, 2786), }); declarations.push(Declaration { - id: DeclarationId(929), + id: DeclarationId(930), name: Some("ShrinkFactor".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "UnitShrink".to_string(), - ty: DeclarationId(2179), + ty: DeclarationId(2180), }, Field { label: "ConstantShrink".to_string(), - ty: DeclarationId(2180), + ty: DeclarationId(2181), }, Field { label: "ProportionalShrink".to_string(), - ty: DeclarationId(2181), + ty: DeclarationId(2182), }, ], }, @@ -30209,21 +30246,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2976, 3116), }); declarations.push(Declaration { - id: DeclarationId(930), + id: DeclarationId(931), name: Some("IterationPrimitive".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Fold".to_string(), - ty: DeclarationId(2182), + ty: DeclarationId(2183), }, Field { label: "Descend".to_string(), - ty: DeclarationId(2183), + ty: DeclarationId(2184), }, Field { label: "Repeat".to_string(), - ty: DeclarationId(2184), + ty: DeclarationId(2185), }, ], }, @@ -30238,25 +30275,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3278, 3333), }); declarations.push(Declaration { - id: DeclarationId(931), + id: DeclarationId(932), name: Some("LoweringTarget".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "primitive".to_string(), - ty: DeclarationId(930), + ty: DeclarationId(931), }, Field { label: "bound".to_string(), - ty: DeclarationId(925), + ty: DeclarationId(926), }, Field { label: "evidence".to_string(), - ty: DeclarationId(1203), + ty: DeclarationId(1204), }, Field { label: "factor".to_string(), - ty: DeclarationId(2185), + ty: DeclarationId(2186), }, ], }, @@ -30271,11 +30308,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3525, 3651), }); declarations.push(Declaration { - id: DeclarationId(932), + id: DeclarationId(933), name: Some("lower_call_pattern".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(927)], - output: DeclarationId(931), + inputs: vec![DeclarationId(928)], + output: DeclarationId(932), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 3962, @@ -30293,11 +30330,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3900, 5513), }); declarations.push(Declaration { - id: DeclarationId(933), + id: DeclarationId(934), name: Some("size_bound_param".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(925)], - output: DeclarationId(2159), + inputs: vec![DeclarationId(926)], + output: DeclarationId(2160), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 5564, @@ -30315,10 +30352,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 5515, 5989), }); declarations.push(Declaration { - id: DeclarationId(934), + id: DeclarationId(935), name: Some("is_constant_bound".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(925)], + inputs: vec![DeclarationId(926)], output: DeclarationId(128), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", @@ -30337,7 +30374,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 5991, 6209), }); declarations.push(Declaration { - id: DeclarationId(935), + id: DeclarationId(936), name: Some("forever_iteration_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], @@ -30359,11 +30396,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 6290, 6349), }); declarations.push(Declaration { - id: DeclarationId(936), + id: DeclarationId(937), name: Some("constant_bound_value".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(925)], - output: DeclarationId(2160), + inputs: vec![DeclarationId(926)], + output: DeclarationId(2161), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 6492, @@ -30381,21 +30418,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 6442, 6757), }); declarations.push(Declaration { - id: DeclarationId(937), + id: DeclarationId(938), name: Some("IterationDimension".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TreeDescent".to_string(), - ty: DeclarationId(2186), + ty: DeclarationId(2187), }, Field { label: "CollectionFold".to_string(), - ty: DeclarationId(2187), + ty: DeclarationId(2188), }, Field { label: "ArithmeticRepeat".to_string(), - ty: DeclarationId(2188), + ty: DeclarationId(2189), }, ], }, @@ -30410,11 +30447,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7242, 7425), }); declarations.push(Declaration { - id: DeclarationId(938), + id: DeclarationId(939), name: Some("algebra_profile_to_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(53)], - output: DeclarationId(2161), + output: DeclarationId(2162), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 7558, @@ -30432,11 +30469,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7478, 8051), }); declarations.push(Declaration { - id: DeclarationId(939), + id: DeclarationId(940), name: Some("type_iteration_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], - output: DeclarationId(2162), + output: DeclarationId(2163), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 8123, @@ -30454,17 +30491,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 8053, 8342), }); declarations.push(Declaration { - id: DeclarationId(940), + id: DeclarationId(941), name: Some("Mutability".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Immutable".to_string(), - ty: DeclarationId(2189), + ty: DeclarationId(2190), }, Field { label: "Mutable".to_string(), - ty: DeclarationId(2190), + ty: DeclarationId(2191), }, ], }, @@ -30479,17 +30516,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 340, 381), }); declarations.push(Declaration { - id: DeclarationId(941), + id: DeclarationId(942), name: Some("Purity".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Pure".to_string(), - ty: DeclarationId(2191), + ty: DeclarationId(2192), }, Field { label: "Effectful".to_string(), - ty: DeclarationId(2192), + ty: DeclarationId(2193), }, ], }, @@ -30504,17 +30541,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 598, 632), }); declarations.push(Declaration { - id: DeclarationId(942), + id: DeclarationId(943), name: Some("Structure".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ExplicitDAG".to_string(), - ty: DeclarationId(2193), + ty: DeclarationId(2194), }, Field { label: "Arbitrary".to_string(), - ty: DeclarationId(2194), + ty: DeclarationId(2195), }, ], }, @@ -30529,17 +30566,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 891, 935), }); declarations.push(Declaration { - id: DeclarationId(943), + id: DeclarationId(944), name: Some("Iteration".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Bounded".to_string(), - ty: DeclarationId(2195), + ty: DeclarationId(2196), }, Field { label: "Unbounded".to_string(), - ty: DeclarationId(2196), + ty: DeclarationId(2197), }, ], }, @@ -30554,25 +30591,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 1147, 1187), }); declarations.push(Declaration { - id: DeclarationId(944), + id: DeclarationId(945), name: Some("ComputationModel".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "mutability".to_string(), - ty: DeclarationId(940), + ty: DeclarationId(941), }, Field { label: "purity".to_string(), - ty: DeclarationId(941), + ty: DeclarationId(942), }, Field { label: "structure".to_string(), - ty: DeclarationId(942), + ty: DeclarationId(943), }, Field { label: "iteration".to_string(), - ty: DeclarationId(943), + ty: DeclarationId(944), }, ], }, @@ -30587,15 +30624,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 1387, 1500), }); declarations.push(Declaration { - id: DeclarationId(945), + id: DeclarationId(946), name: Some("dag_model".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(944), + template: DeclarationId(945), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(944)), + meta_tag: Some(DeclarationId(945)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -30603,28 +30640,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "mutability".to_string(), FieldValue::Variant { - constructor: DeclarationId(2189), + constructor: DeclarationId(2190), payload: vec![], }, ), ( "purity".to_string(), FieldValue::Variant { - constructor: DeclarationId(2191), + constructor: DeclarationId(2192), payload: vec![], }, ), ( "structure".to_string(), FieldValue::Variant { - constructor: DeclarationId(2193), + constructor: DeclarationId(2194), payload: vec![], }, ), ( "iteration".to_string(), FieldValue::Variant { - constructor: DeclarationId(2195), + constructor: DeclarationId(2196), payload: vec![], }, ), @@ -30635,25 +30672,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 1502, 1625), }); declarations.push(Declaration { - id: DeclarationId(946), + id: DeclarationId(947), name: Some("MemoryModel".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ValueOnly".to_string(), - ty: DeclarationId(2197), + ty: DeclarationId(2198), }, Field { label: "GarbageCollected".to_string(), - ty: DeclarationId(2198), + ty: DeclarationId(2199), }, Field { label: "RefCounted".to_string(), - ty: DeclarationId(2199), + ty: DeclarationId(2200), }, Field { label: "OwnershipBased".to_string(), - ty: DeclarationId(2200), + ty: DeclarationId(2201), }, ], }, @@ -30668,17 +30705,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2014, 2099), }); declarations.push(Declaration { - id: DeclarationId(947), + id: DeclarationId(948), name: Some("ScopeModel".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "LexicalScoping".to_string(), - ty: DeclarationId(2201), + ty: DeclarationId(2202), }, Field { label: "DynamicScoping".to_string(), - ty: DeclarationId(2202), + ty: DeclarationId(2203), }, ], }, @@ -30693,17 +30730,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2365, 2418), }); declarations.push(Declaration { - id: DeclarationId(948), + id: DeclarationId(949), name: Some("TargetExecutionModel".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "memory".to_string(), - ty: DeclarationId(946), + ty: DeclarationId(947), }, Field { label: "scope".to_string(), - ty: DeclarationId(947), + ty: DeclarationId(948), }, ], }, @@ -30718,12 +30755,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2561, 2632), }); declarations.push(Declaration { - id: DeclarationId(949), + id: DeclarationId(950), name: Some("SourceFiltering".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "excluded_prefixes".to_string(), - ty: DeclarationId(2203), + ty: DeclarationId(2204), }], }, type_params: vec![], @@ -30737,17 +30774,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2774, 2832), }); declarations.push(Declaration { - id: DeclarationId(950), + id: DeclarationId(951), name: Some("ShapeATargetSourceFiltering".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "internal".to_string(), - ty: DeclarationId(949), + ty: DeclarationId(950), }, Field { label: "additional_excluded_prefixes".to_string(), - ty: DeclarationId(2204), + ty: DeclarationId(2205), }, ], }, @@ -30762,15 +30799,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 3115, 3224), }); declarations.push(Declaration { - id: DeclarationId(951), + id: DeclarationId(952), name: Some("internal_source_filtering".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(949), + template: DeclarationId(950), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(949)), + meta_tag: Some(DeclarationId(950)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -30789,17 +30826,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 3226, 3381), }); declarations.push(Declaration { - id: DeclarationId(952), + id: DeclarationId(953), name: Some("ExecutionModelRequirement".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "OwnershipBased".to_string(), - ty: DeclarationId(2205), + ty: DeclarationId(2206), }, Field { label: "GarbageCollected".to_string(), - ty: DeclarationId(2206), + ty: DeclarationId(2207), }, ], }, @@ -30814,7 +30851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 3659, 3729), }); declarations.push(Declaration { - id: DeclarationId(953), + id: DeclarationId(954), name: Some("VariantId".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -30831,12 +30868,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 5139, 5162), }); declarations.push(Declaration { - id: DeclarationId(954), + id: DeclarationId(955), name: Some("WireTagValue".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "StringTag".to_string(), - ty: DeclarationId(2207), + ty: DeclarationId(2208), }], }, type_params: vec![], @@ -30850,17 +30887,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6737, 6786), }); declarations.push(Declaration { - id: DeclarationId(955), + id: DeclarationId(956), name: Some("FieldProjection".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Empty".to_string(), - ty: DeclarationId(2208), + ty: DeclarationId(2209), }, Field { label: "Populated".to_string(), - ty: DeclarationId(2209), + ty: DeclarationId(2210), }, ], }, @@ -30875,17 +30912,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7586, 7630), }); declarations.push(Declaration { - id: DeclarationId(956), + id: DeclarationId(957), name: Some("CoproductVariantProjection".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "field_projection".to_string(), - ty: DeclarationId(955), + ty: DeclarationId(956), }, Field { label: "wire_tag_value".to_string(), - ty: DeclarationId(954), + ty: DeclarationId(955), }, ], }, @@ -30900,13 +30937,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 8046, 8150), }); declarations.push(Declaration { - id: DeclarationId(957), + id: DeclarationId(958), name: Some("CoproductProjection".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "declaration".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "wire_tag_field".to_string(), @@ -30914,7 +30951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "variant_projections".to_string(), - ty: DeclarationId(2210), + ty: DeclarationId(2211), }, ], }, @@ -30929,10 +30966,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9395, 9557), }); declarations.push(Declaration { - id: DeclarationId(958), + id: DeclarationId(959), name: Some("ShapeATarget".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1042), + template: DeclarationId(1043), arguments: vec![], }, type_params: vec![], @@ -30946,15 +30983,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2839, 2871), }); declarations.push(Declaration { - id: DeclarationId(959), + id: DeclarationId(960), name: Some("rust_shape_a_target".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(958), + template: DeclarationId(959), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(958)), + meta_tag: Some(DeclarationId(959)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -30967,15 +31004,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2873, 2927), }); declarations.push(Declaration { - id: DeclarationId(960), + id: DeclarationId(961), name: Some("python_shape_a_target".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(958), + template: DeclarationId(959), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(958)), + meta_tag: Some(DeclarationId(959)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -30988,15 +31025,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2928, 2986), }); declarations.push(Declaration { - id: DeclarationId(961), + id: DeclarationId(962), name: Some("go_shape_a_target".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(958), + template: DeclarationId(959), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(958)), + meta_tag: Some(DeclarationId(959)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -31009,33 +31046,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2987, 3037), }); declarations.push(Declaration { - id: DeclarationId(962), + id: DeclarationId(963), name: Some("FormAxis".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Atom".to_string(), - ty: DeclarationId(2211), + ty: DeclarationId(2212), }, Field { label: "Conj".to_string(), - ty: DeclarationId(2212), + ty: DeclarationId(2213), }, Field { label: "Disj".to_string(), - ty: DeclarationId(2213), + ty: DeclarationId(2214), }, Field { label: "Arrow".to_string(), - ty: DeclarationId(2214), + ty: DeclarationId(2215), }, Field { label: "Cardinality".to_string(), - ty: DeclarationId(2215), + ty: DeclarationId(2216), }, Field { label: "Instantiation".to_string(), - ty: DeclarationId(2216), + ty: DeclarationId(2217), }, ], }, @@ -31050,29 +31087,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3837, 3909), }); declarations.push(Declaration { - id: DeclarationId(963), + id: DeclarationId(964), name: Some("BehaviorAxis".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Value".to_string(), - ty: DeclarationId(2217), + ty: DeclarationId(2218), }, Field { label: "Transform".to_string(), - ty: DeclarationId(2218), + ty: DeclarationId(2219), }, Field { label: "Branch".to_string(), - ty: DeclarationId(2219), + ty: DeclarationId(2220), }, Field { label: "Loop".to_string(), - ty: DeclarationId(2220), + ty: DeclarationId(2221), }, Field { label: "Bind".to_string(), - ty: DeclarationId(2221), + ty: DeclarationId(2222), }, ], }, @@ -31087,17 +31124,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4469, 4529), }); declarations.push(Declaration { - id: DeclarationId(964), + id: DeclarationId(965), name: Some("MethodTemplateContractKey".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "target".to_string(), - ty: DeclarationId(958), + ty: DeclarationId(959), }, Field { label: "dag_method".to_string(), - ty: DeclarationId(840), + ty: DeclarationId(841), }, ], }, @@ -31112,17 +31149,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4913, 4994), }); declarations.push(Declaration { - id: DeclarationId(965), + id: DeclarationId(966), name: Some("EmissionCell".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "connective".to_string(), - ty: DeclarationId(962), + ty: DeclarationId(963), }, Field { label: "behavior".to_string(), - ty: DeclarationId(963), + ty: DeclarationId(964), }, ], }, @@ -31137,17 +31174,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5427, 5496), }); declarations.push(Declaration { - id: DeclarationId(966), + id: DeclarationId(967), name: Some("EmissionPathProjection".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "row_identity".to_string(), - ty: DeclarationId(964), + ty: DeclarationId(965), }, Field { label: "cells".to_string(), - ty: DeclarationId(2222), + ty: DeclarationId(2223), }, ], }, @@ -31162,18 +31199,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5842, 5943), }); declarations.push(Declaration { - id: DeclarationId(967), + id: DeclarationId(968), name: Some("emission_path_projections".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(966), + parameter: DeclarationId(687), + value: DeclarationId(967), }], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(2223)), + meta_tag: Some(DeclarationId(2224)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -31183,7 +31220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(959)), + FieldValue::Reference(DeclarationId(960)), ), ( "dag_method".to_string(), @@ -31200,14 +31237,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31220,7 +31257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(959)), + FieldValue::Reference(DeclarationId(960)), ), ( "dag_method".to_string(), @@ -31237,14 +31274,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31257,7 +31294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(959)), + FieldValue::Reference(DeclarationId(960)), ), ( "dag_method".to_string(), @@ -31274,14 +31311,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31294,7 +31331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(959)), + FieldValue::Reference(DeclarationId(960)), ), ( "dag_method".to_string(), @@ -31311,14 +31348,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31331,7 +31368,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(959)), + FieldValue::Reference(DeclarationId(960)), ), ( "dag_method".to_string(), @@ -31348,14 +31385,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31368,7 +31405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(959)), + FieldValue::Reference(DeclarationId(960)), ), ( "dag_method".to_string(), @@ -31385,14 +31422,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31405,7 +31442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(959)), + FieldValue::Reference(DeclarationId(960)), ), ( "dag_method".to_string(), @@ -31422,14 +31459,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31442,7 +31479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(959)), + FieldValue::Reference(DeclarationId(960)), ), ( "dag_method".to_string(), @@ -31459,14 +31496,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31479,7 +31516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(959)), + FieldValue::Reference(DeclarationId(960)), ), ( "dag_method".to_string(), @@ -31496,14 +31533,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31516,7 +31553,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(959)), + FieldValue::Reference(DeclarationId(960)), ), ( "dag_method".to_string(), @@ -31533,14 +31570,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31553,7 +31590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(959)), + FieldValue::Reference(DeclarationId(960)), ), ( "dag_method".to_string(), @@ -31570,14 +31607,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31590,7 +31627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(959)), + FieldValue::Reference(DeclarationId(960)), ), ( "dag_method".to_string(), @@ -31607,14 +31644,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31627,7 +31664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(959)), + FieldValue::Reference(DeclarationId(960)), ), ( "dag_method".to_string(), @@ -31644,14 +31681,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31664,7 +31701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -31681,14 +31718,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31701,7 +31738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -31718,14 +31755,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31738,7 +31775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -31755,14 +31792,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31775,7 +31812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -31792,14 +31829,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31812,7 +31849,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -31829,14 +31866,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31849,7 +31886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -31866,14 +31903,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31886,7 +31923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -31903,14 +31940,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31923,7 +31960,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -31940,14 +31977,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31960,7 +31997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -31977,14 +32014,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -31997,7 +32034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -32014,14 +32051,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -32034,7 +32071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -32051,14 +32088,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -32071,7 +32108,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -32088,14 +32125,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -32108,7 +32145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -32125,14 +32162,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -32145,7 +32182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -32162,14 +32199,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -32182,7 +32219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -32199,14 +32236,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -32219,7 +32256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -32236,14 +32273,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -32256,7 +32293,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -32273,14 +32310,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -32293,7 +32330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -32310,14 +32347,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -32330,7 +32367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -32347,14 +32384,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -32367,7 +32404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -32384,14 +32421,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -32404,7 +32441,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -32421,14 +32458,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -32441,7 +32478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -32458,14 +32495,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -32478,7 +32515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -32495,14 +32532,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -32515,7 +32552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -32532,14 +32569,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -32552,7 +32589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -32569,14 +32606,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -32589,7 +32626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -32606,14 +32643,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -32626,7 +32663,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -32643,14 +32680,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -32663,7 +32700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -32680,14 +32717,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { - constructor: DeclarationId(2215), + constructor: DeclarationId(2216), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { - constructor: DeclarationId(2218), + constructor: DeclarationId(2219), payload: vec![], }, ), @@ -32700,49 +32737,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6364, 12528), }); declarations.push(Declaration { - id: DeclarationId(968), + id: DeclarationId(969), name: Some("CompilerDiagnosticKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TokenizerError".to_string(), - ty: DeclarationId(2224), + ty: DeclarationId(2225), }, Field { label: "ParseError".to_string(), - ty: DeclarationId(2225), + ty: DeclarationId(2226), }, Field { label: "TypeMismatch".to_string(), - ty: DeclarationId(2226), + ty: DeclarationId(2227), }, Field { label: "ArityMismatch".to_string(), - ty: DeclarationId(2227), + ty: DeclarationId(2228), }, Field { label: "ResolveError".to_string(), - ty: DeclarationId(2228), + ty: DeclarationId(2229), }, Field { label: "UnitMismatch".to_string(), - ty: DeclarationId(2229), + ty: DeclarationId(2230), }, Field { label: "BranchConditionNotBool".to_string(), - ty: DeclarationId(2230), + ty: DeclarationId(2231), }, Field { label: "MagnitudeOutOfRange".to_string(), - ty: DeclarationId(2231), + ty: DeclarationId(2232), }, Field { label: "MalformedIntegerRangeFact".to_string(), - ty: DeclarationId(2232), + ty: DeclarationId(2233), }, Field { label: "NominalOpacityViolation".to_string(), - ty: DeclarationId(2233), + ty: DeclarationId(2234), }, ], }, @@ -32757,7 +32794,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1067, 1306), }); declarations.push(Declaration { - id: DeclarationId(969), + id: DeclarationId(970), name: Some("Correction".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -32786,7 +32823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1512, 1765), }); declarations.push(Declaration { - id: DeclarationId(970), + id: DeclarationId(971), name: Some("DiagnosticKindDecl".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -32796,7 +32833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "payload".to_string(), - ty: DeclarationId(778), + ty: DeclarationId(779), }, ], }, @@ -32811,12 +32848,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 2545, 2608), }); declarations.push(Declaration { - id: DeclarationId(971), + id: DeclarationId(972), name: Some("LensInstanceKindWitness".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "kind_decl".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }], }, type_params: vec![], @@ -32830,17 +32867,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 4810, 4870), }); declarations.push(Declaration { - id: DeclarationId(972), + id: DeclarationId(973), name: Some("AnyDiagnosticKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "CompilerKind".to_string(), - ty: DeclarationId(2234), + ty: DeclarationId(2235), }, Field { label: "LensInstanceKind".to_string(), - ty: DeclarationId(2235), + ty: DeclarationId(2236), }, ], }, @@ -32855,13 +32892,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 5479, 5588), }); declarations.push(Declaration { - id: DeclarationId(973), + id: DeclarationId(974), name: Some("Diagnostic".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "kind".to_string(), - ty: DeclarationId(972), + ty: DeclarationId(973), }, Field { label: "span".to_string(), @@ -32873,7 +32910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fixes".to_string(), - ty: DeclarationId(2236), + ty: DeclarationId(2237), }, ], }, @@ -32888,37 +32925,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 5957, 6065), }); declarations.push(Declaration { - id: DeclarationId(974), + id: DeclarationId(975), name: Some("EmissionDiagnostic".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "UnderRefined".to_string(), - ty: DeclarationId(2237), + ty: DeclarationId(2238), }, Field { label: "NoInhabitant".to_string(), - ty: DeclarationId(2238), + ty: DeclarationId(2239), }, Field { label: "ContradictoryUse".to_string(), - ty: DeclarationId(2240), + ty: DeclarationId(2241), }, Field { label: "OutOfR2Scope".to_string(), - ty: DeclarationId(2241), + ty: DeclarationId(2242), }, Field { label: "LifetimeProgramExtractionPending".to_string(), - ty: DeclarationId(2242), + ty: DeclarationId(2243), }, Field { label: "FoldNotImplemented".to_string(), - ty: DeclarationId(2243), + ty: DeclarationId(2244), }, Field { label: "MissingEmissionPath".to_string(), - ty: DeclarationId(2244), + ty: DeclarationId(2245), }, ], }, @@ -32933,21 +32970,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 8699, 11469), }); declarations.push(Declaration { - id: DeclarationId(975), + id: DeclarationId(976), name: Some("Witness".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Inhabits".to_string(), - ty: DeclarationId(2259), + ty: DeclarationId(2260), }, Field { label: "Violates".to_string(), - ty: DeclarationId(2260), + ty: DeclarationId(2261), }, ], }, - type_params: vec![DeclarationId(976)], + type_params: vec![DeclarationId(977)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -32958,7 +32995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1608, 1697), }); declarations.push(Declaration { - id: DeclarationId(976), + id: DeclarationId(977), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())), type_params: vec![], @@ -32972,17 +33009,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1608, 1697), }); declarations.push(Declaration { - id: DeclarationId(977), + id: DeclarationId(978), name: Some("OptionalDiagnostic".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "NoDiagnostic".to_string(), - ty: DeclarationId(2261), + ty: DeclarationId(2262), }, Field { label: "SomeDiagnostic".to_string(), - ty: DeclarationId(2262), + ty: DeclarationId(2263), }, ], }, @@ -32997,21 +33034,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1851, 1932), }); declarations.push(Declaration { - id: DeclarationId(978), + id: DeclarationId(979), name: Some("DimensionReport".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "DimensionOk".to_string(), - ty: DeclarationId(2265), + ty: DeclarationId(2266), }, Field { label: "DimensionFail".to_string(), - ty: DeclarationId(2269), + ty: DeclarationId(2270), }, ], }, - type_params: vec![DeclarationId(979)], + type_params: vec![DeclarationId(980)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -33022,7 +33059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2291, 2567), }); declarations.push(Declaration { - id: DeclarationId(979), + id: DeclarationId(980), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())), type_params: vec![], @@ -33036,7 +33073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2291, 2567), }); declarations.push(Declaration { - id: DeclarationId(980), + id: DeclarationId(981), name: Some("AnalysisDimension".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -33046,19 +33083,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "witness_of".to_string(), - ty: DeclarationId(2271), + ty: DeclarationId(2272), }, Field { label: "compose".to_string(), - ty: DeclarationId(2272), + ty: DeclarationId(2273), }, Field { label: "break_diagnostic".to_string(), - ty: DeclarationId(2273), + ty: DeclarationId(2274), }, ], }, - type_params: vec![DeclarationId(981)], + type_params: vec![DeclarationId(982)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -33069,7 +33106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3818, 4011), }); declarations.push(Declaration { - id: DeclarationId(981), + id: DeclarationId(982), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())), type_params: vec![], @@ -33083,18 +33120,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3818, 4011), }); declarations.push(Declaration { - id: DeclarationId(982), + id: DeclarationId(983), name: Some("Dimension".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "value".to_string(), - ty: DeclarationId(984), + ty: DeclarationId(985), }], }, - type_params: vec![DeclarationId(983), DeclarationId(984)], + type_params: vec![DeclarationId(984), DeclarationId(985)], phantom_params: vec![PhantomParameter { - parameter: DeclarationId(983), - algebra: DeclarationId(2274), + parameter: DeclarationId(984), + algebra: DeclarationId(2275), }], meta_tag: None, specialization_parent: None, @@ -33105,7 +33142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702), }); declarations.push(Declaration { - id: DeclarationId(983), + id: DeclarationId(984), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())), type_params: vec![], @@ -33119,7 +33156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702), }); declarations.push(Declaration { - id: DeclarationId(984), + id: DeclarationId(985), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())), type_params: vec![], @@ -33133,7 +33170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702), }); declarations.push(Declaration { - id: DeclarationId(985), + id: DeclarationId(986), name: Some("Meters".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -33147,7 +33184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4704, 4715), }); declarations.push(Declaration { - id: DeclarationId(986), + id: DeclarationId(987), name: Some("Seconds".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -33161,7 +33198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4716, 4728), }); declarations.push(Declaration { - id: DeclarationId(987), + id: DeclarationId(988), name: Some("Kilograms".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -33175,7 +33212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4729, 4743), }); declarations.push(Declaration { - id: DeclarationId(988), + id: DeclarationId(989), name: Some("Amperes".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -33189,7 +33226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4744, 4756), }); declarations.push(Declaration { - id: DeclarationId(989), + id: DeclarationId(990), name: Some("Kelvin".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -33203,7 +33240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4757, 4768), }); declarations.push(Declaration { - id: DeclarationId(990), + id: DeclarationId(991), name: Some("Moles".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -33217,7 +33254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4769, 4779), }); declarations.push(Declaration { - id: DeclarationId(991), + id: DeclarationId(992), name: Some("Candela".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -33231,18 +33268,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4780, 4792), }); declarations.push(Declaration { - id: DeclarationId(992), + id: DeclarationId(993), name: Some("add_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![ - DeclarationId(2245), DeclarationId(2246), DeclarationId(2247), + DeclarationId(2248), ], - output: DeclarationId(2248), + output: DeclarationId(2249), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)), }, - type_params: vec![DeclarationId(993), DeclarationId(994)], + type_params: vec![DeclarationId(994), DeclarationId(995)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -33253,7 +33290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988), }); declarations.push(Declaration { - id: DeclarationId(993), + id: DeclarationId(994), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())), type_params: vec![], @@ -33267,7 +33304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988), }); declarations.push(Declaration { - id: DeclarationId(994), + id: DeclarationId(995), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())), type_params: vec![], @@ -33281,18 +33318,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988), }); declarations.push(Declaration { - id: DeclarationId(995), + id: DeclarationId(996), name: Some("sub_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![ - DeclarationId(2249), DeclarationId(2250), DeclarationId(2251), + DeclarationId(2252), ], - output: DeclarationId(2252), + output: DeclarationId(2253), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)), }, - type_params: vec![DeclarationId(996), DeclarationId(997)], + type_params: vec![DeclarationId(997), DeclarationId(998)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -33303,7 +33340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184), }); declarations.push(Declaration { - id: DeclarationId(996), + id: DeclarationId(997), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())), type_params: vec![], @@ -33317,7 +33354,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184), }); declarations.push(Declaration { - id: DeclarationId(997), + id: DeclarationId(998), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())), type_params: vec![], @@ -33331,18 +33368,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184), }); declarations.push(Declaration { - id: DeclarationId(998), + id: DeclarationId(999), name: Some("mul_dimension_scalar".to_string()), connective: TypeConnective::Arrow { inputs: vec![ - DeclarationId(2253), DeclarationId(2254), - DeclarationId(1000), + DeclarationId(2255), + DeclarationId(1001), ], - output: DeclarationId(2255), + output: DeclarationId(2256), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)), }, - type_params: vec![DeclarationId(999), DeclarationId(1000)], + type_params: vec![DeclarationId(1000), DeclarationId(1001)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -33353,7 +33390,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379), }); declarations.push(Declaration { - id: DeclarationId(999), + id: DeclarationId(1000), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())), type_params: vec![], @@ -33367,7 +33404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379), }); declarations.push(Declaration { - id: DeclarationId(1000), + id: DeclarationId(1001), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())), type_params: vec![], @@ -33381,18 +33418,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379), }); declarations.push(Declaration { - id: DeclarationId(1001), + id: DeclarationId(1002), name: Some("div_dimension_scalar".to_string()), connective: TypeConnective::Arrow { inputs: vec![ - DeclarationId(2256), DeclarationId(2257), - DeclarationId(1003), + DeclarationId(2258), + DeclarationId(1004), ], - output: DeclarationId(2258), + output: DeclarationId(2259), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)), }, - type_params: vec![DeclarationId(1002), DeclarationId(1003)], + type_params: vec![DeclarationId(1003), DeclarationId(1004)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -33403,7 +33440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574), }); declarations.push(Declaration { - id: DeclarationId(1002), + id: DeclarationId(1003), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())), type_params: vec![], @@ -33417,7 +33454,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574), }); declarations.push(Declaration { - id: DeclarationId(1003), + id: DeclarationId(1004), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())), type_params: vec![], @@ -33431,7 +33468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574), }); declarations.push(Declaration { - id: DeclarationId(1004), + id: DeclarationId(1005), name: Some("EmissionRule".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -33448,17 +33485,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emission_provenance.dag", 2797, 2823), }); declarations.push(Declaration { - id: DeclarationId(1005), + id: DeclarationId(1006), name: Some("OptionalSourceSpan".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "NoSourceSpan".to_string(), - ty: DeclarationId(2275), + ty: DeclarationId(2276), }, Field { label: "SomeSourceSpan".to_string(), - ty: DeclarationId(2276), + ty: DeclarationId(2277), }, ], }, @@ -33473,7 +33510,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3681, 3762), }); declarations.push(Declaration { - id: DeclarationId(1006), + id: DeclarationId(1007), name: Some("EmissionProvenance".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -33483,11 +33520,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "rule".to_string(), - ty: DeclarationId(1004), + ty: DeclarationId(1005), }, Field { label: "source_span".to_string(), - ty: DeclarationId(1005), + ty: DeclarationId(1006), }, ], }, @@ -33502,17 +33539,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emission_provenance.dag", 4898, 5008), }); declarations.push(Declaration { - id: DeclarationId(1007), + id: DeclarationId(1008), name: Some("TypeRealization".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "target".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "carrier".to_string(), @@ -33524,7 +33561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fields".to_string(), - ty: DeclarationId(2277), + ty: DeclarationId(2278), }, Field { label: "cost".to_string(), @@ -33543,29 +33580,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 736, 887), }); declarations.push(Declaration { - id: DeclarationId(1008), + id: DeclarationId(1009), name: Some("TargetIntegerTypeInhabitance".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "kernel_integer".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "algebra".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "bound".to_string(), - ty: DeclarationId(1009), + ty: DeclarationId(1010), }, Field { label: "type_realization".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, ], }, @@ -33580,21 +33617,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 2385, 2840), }); declarations.push(Declaration { - id: DeclarationId(1009), + id: DeclarationId(1010), name: Some("TargetIntegerInhabitanceBound".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "BoundUnspecified".to_string(), - ty: DeclarationId(2278), + ty: DeclarationId(2279), }, Field { label: "StaticBoundFact".to_string(), - ty: DeclarationId(2279), + ty: DeclarationId(2280), }, Field { label: "PlatformDependentFact".to_string(), - ty: DeclarationId(2280), + ty: DeclarationId(2281), }, ], }, @@ -33609,7 +33646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4334, 4686), }); declarations.push(Declaration { - id: DeclarationId(1010), + id: DeclarationId(1011), name: Some("FieldBinding".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -33619,7 +33656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "access".to_string(), - ty: DeclarationId(1011), + ty: DeclarationId(1012), }, Field { label: "borrowed_read".to_string(), @@ -33638,17 +33675,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4688, 4772), }); declarations.push(Declaration { - id: DeclarationId(1011), + id: DeclarationId(1012), name: Some("FieldAccess".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "DirectField".to_string(), - ty: DeclarationId(2281), + ty: DeclarationId(2282), }, Field { label: "AccessorMethod".to_string(), - ty: DeclarationId(2282), + ty: DeclarationId(2283), }, ], }, @@ -33663,21 +33700,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 5155, 5222), }); declarations.push(Declaration { - id: DeclarationId(1012), + id: DeclarationId(1013), name: Some("OperatorRealization".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "target".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "op".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "carrier".to_string(), @@ -33700,17 +33737,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 5224, 5355), }); declarations.push(Declaration { - id: DeclarationId(1013), + id: DeclarationId(1014), name: Some("BehaviorRealization".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "target".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "carrier".to_string(), @@ -33733,25 +33770,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 5357, 5467), }); declarations.push(Declaration { - id: DeclarationId(1014), + id: DeclarationId(1015), name: Some("CallableRealization".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "target".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "strategy".to_string(), - ty: DeclarationId(1023), + ty: DeclarationId(1024), }, Field { label: "parameters".to_string(), - ty: DeclarationId(2283), + ty: DeclarationId(2284), }, Field { label: "cost".to_string(), @@ -33770,7 +33807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 5469, 5628), }); declarations.push(Declaration { - id: DeclarationId(1015), + id: DeclarationId(1016), name: Some("CallableParameter".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -33780,7 +33817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "disposition".to_string(), - ty: DeclarationId(1016), + ty: DeclarationId(1017), }, ], }, @@ -33795,17 +33832,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6050, 6124), }); declarations.push(Declaration { - id: DeclarationId(1016), + id: DeclarationId(1017), name: Some("ParameterDisposition".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Borrowed".to_string(), - ty: DeclarationId(2284), + ty: DeclarationId(2285), }, Field { label: "Consumed".to_string(), - ty: DeclarationId(2285), + ty: DeclarationId(2286), }, ], }, @@ -33820,17 +33857,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6581, 6632), }); declarations.push(Declaration { - id: DeclarationId(1017), + id: DeclarationId(1018), name: Some("StringOwnershipAxis".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Owned".to_string(), - ty: DeclarationId(2286), + ty: DeclarationId(2287), }, Field { label: "Borrowed".to_string(), - ty: DeclarationId(2287), + ty: DeclarationId(2288), }, ], }, @@ -33845,17 +33882,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7044, 7091), }); declarations.push(Declaration { - id: DeclarationId(1018), + id: DeclarationId(1019), name: Some("StringLifetimeAxis".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "SelfContained".to_string(), - ty: DeclarationId(2288), + ty: DeclarationId(2289), }, Field { label: "Caller".to_string(), - ty: DeclarationId(2289), + ty: DeclarationId(2290), }, ], }, @@ -33870,21 +33907,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7399, 7451), }); declarations.push(Declaration { - id: DeclarationId(1019), + id: DeclarationId(1020), name: Some("StringGrowabilityAxis".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Growable".to_string(), - ty: DeclarationId(2290), + ty: DeclarationId(2291), }, Field { label: "Fixed".to_string(), - ty: DeclarationId(2291), + ty: DeclarationId(2292), }, Field { label: "NotApplicable".to_string(), - ty: DeclarationId(2292), + ty: DeclarationId(2293), }, ], }, @@ -33899,12 +33936,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7678, 7745), }); declarations.push(Declaration { - id: DeclarationId(1020), + id: DeclarationId(1021), name: Some("StringEncodingAxis".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "Utf8FreeMonoidChar".to_string(), - ty: DeclarationId(2293), + ty: DeclarationId(2294), }], }, type_params: vec![], @@ -33918,37 +33955,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8054, 8100), }); declarations.push(Declaration { - id: DeclarationId(1021), + id: DeclarationId(1022), name: Some("StringFamilyInhabitanceRow".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "target_type".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "type_realization".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "ownership".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "lifetime".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "growability".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "encoding".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, ], }, @@ -33963,17 +34000,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8684, 8923), }); declarations.push(Declaration { - id: DeclarationId(1022), + id: DeclarationId(1023), name: Some("TypeInstantiationRealization".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "target".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "carrier".to_string(), @@ -33996,49 +34033,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8925, 9044), }); declarations.push(Declaration { - id: DeclarationId(1023), + id: DeclarationId(1024), name: Some("CallableStrategy".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ListEmpty".to_string(), - ty: DeclarationId(2294), + ty: DeclarationId(2295), }, Field { label: "ListSingleton".to_string(), - ty: DeclarationId(2295), + ty: DeclarationId(2296), }, Field { label: "ListCons".to_string(), - ty: DeclarationId(2296), + ty: DeclarationId(2297), }, Field { label: "ListConcat".to_string(), - ty: DeclarationId(2297), + ty: DeclarationId(2298), }, Field { label: "ListLength".to_string(), - ty: DeclarationId(2298), + ty: DeclarationId(2299), }, Field { label: "ListIsEmpty".to_string(), - ty: DeclarationId(2299), + ty: DeclarationId(2300), }, Field { label: "ListFold".to_string(), - ty: DeclarationId(2300), + ty: DeclarationId(2301), }, Field { label: "ListMap".to_string(), - ty: DeclarationId(2301), + ty: DeclarationId(2302), }, Field { label: "ListFilter".to_string(), - ty: DeclarationId(2302), + ty: DeclarationId(2303), }, Field { label: "ListContains".to_string(), - ty: DeclarationId(2303), + ty: DeclarationId(2304), }, ], }, @@ -34053,29 +34090,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9449, 9618), }); declarations.push(Declaration { - id: DeclarationId(1024), + id: DeclarationId(1025), name: Some("PatternRealization".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "target".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "strategy".to_string(), - ty: DeclarationId(1025), + ty: DeclarationId(1026), }, Field { label: "empty_variant".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "cons_variant".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "scrutinee".to_string(), @@ -34114,17 +34151,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 11557, 11846), }); declarations.push(Declaration { - id: DeclarationId(1025), + id: DeclarationId(1026), name: Some("PatternStrategy".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "PlaceholderPatternStrategy".to_string(), - ty: DeclarationId(2304), + ty: DeclarationId(2305), }, Field { label: "VectorList".to_string(), - ty: DeclarationId(2305), + ty: DeclarationId(2306), }, ], }, @@ -34139,7 +34176,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12286, 12352), }); declarations.push(Declaration { - id: DeclarationId(1026), + id: DeclarationId(1027), name: Some("StatementSyntax".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -34164,7 +34201,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12354, 12431), }); declarations.push(Declaration { - id: DeclarationId(1027), + id: DeclarationId(1028), name: Some("ExpressionSyntax".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -34193,7 +34230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12433, 12523), }); declarations.push(Declaration { - id: DeclarationId(1028), + id: DeclarationId(1029), name: Some("ForEachSyntax".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -34218,7 +34255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12525, 12584), }); declarations.push(Declaration { - id: DeclarationId(1029), + id: DeclarationId(1030), name: Some("ControlFlowSyntax".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -34232,7 +34269,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "for_each_syntax".to_string(), - ty: DeclarationId(1028), + ty: DeclarationId(1029), }, ], }, @@ -34247,7 +34284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12586, 12683), }); declarations.push(Declaration { - id: DeclarationId(1030), + id: DeclarationId(1031), name: Some("LiteralSyntax".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -34276,7 +34313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12685, 12781), }); declarations.push(Declaration { - id: DeclarationId(1031), + id: DeclarationId(1032), name: Some("ModuleSyntax".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -34295,7 +34332,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12783, 12829), }); declarations.push(Declaration { - id: DeclarationId(1032), + id: DeclarationId(1033), name: Some("FunctionSyntax".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -34332,7 +34369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12831, 12983), }); declarations.push(Declaration { - id: DeclarationId(1033), + id: DeclarationId(1034), name: Some("TypeApplicationSyntax".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -34351,7 +34388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12985, 13034), }); declarations.push(Declaration { - id: DeclarationId(1034), + id: DeclarationId(1035), name: Some("TypeDefinitionSyntax".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -34388,7 +34425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 13248, 13396), }); declarations.push(Declaration { - id: DeclarationId(1035), + id: DeclarationId(1036), name: Some("RecordDeriveTemplateBundle".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -34413,7 +34450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 14057, 14150), }); declarations.push(Declaration { - id: DeclarationId(1036), + id: DeclarationId(1037), name: Some("PatternMatchSyntax".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -34462,45 +34499,45 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 14854, 15094), }); declarations.push(Declaration { - id: DeclarationId(1037), + id: DeclarationId(1038), name: Some("CollectionOps".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "concat_contract".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "length_contract".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "is_empty_contract".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "fold_contract".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "filter_contract".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "flat_map_contract".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "any_contract".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "all_contract".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "map_contract".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "filter".to_string(), @@ -34535,7 +34572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 15096, 16332), }); declarations.push(Declaration { - id: DeclarationId(1038), + id: DeclarationId(1039), name: Some("ValueConstructionSyntax".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -34572,17 +34609,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 16334, 16520), }); declarations.push(Declaration { - id: DeclarationId(1039), + id: DeclarationId(1040), name: Some("RenderingModel".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "read".to_string(), - ty: DeclarationId(1040), + ty: DeclarationId(1041), }, Field { label: "construct".to_string(), - ty: DeclarationId(1041), + ty: DeclarationId(1042), }, ], }, @@ -34597,17 +34634,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 16522, 16597), }); declarations.push(Declaration { - id: DeclarationId(1040), + id: DeclarationId(1041), name: Some("ReadStrategy".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Borrow".to_string(), - ty: DeclarationId(2306), + ty: DeclarationId(2307), }, Field { label: "PassByValue".to_string(), - ty: DeclarationId(2307), + ty: DeclarationId(2308), }, ], }, @@ -34622,17 +34659,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17095, 17139), }); declarations.push(Declaration { - id: DeclarationId(1041), + id: DeclarationId(1042), name: Some("ConstructStrategy".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "CopyOrClone".to_string(), - ty: DeclarationId(2308), + ty: DeclarationId(2309), }, Field { label: "PassByValue".to_string(), - ty: DeclarationId(2309), + ty: DeclarationId(2310), }, ], }, @@ -34647,57 +34684,57 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17432, 17486), }); declarations.push(Declaration { - id: DeclarationId(1042), + id: DeclarationId(1043), name: Some("LanguageSpec".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "statements".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "expressions".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "control_flow".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "literals".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "modules".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "functions".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "type_applications".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "type_definitions".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "record_derive_templates".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "patterns".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "collection_ops".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "values".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, ], }, @@ -34712,17 +34749,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17488, 18014), }); declarations.push(Declaration { - id: DeclarationId(1043), + id: DeclarationId(1044), name: Some("PlaceholderConvention".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "IndexedArgs".to_string(), - ty: DeclarationId(2310), + ty: DeclarationId(2311), }, Field { label: "NamedArg".to_string(), - ty: DeclarationId(2311), + ty: DeclarationId(2312), }, ], }, @@ -34737,17 +34774,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 19388, 19443), }); declarations.push(Declaration { - id: DeclarationId(1044), + id: DeclarationId(1045), name: Some("MethodEmitTemplate".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "SingleTemplate".to_string(), - ty: DeclarationId(2312), + ty: DeclarationId(2313), }, Field { label: "HigherOrderTemplates".to_string(), - ty: DeclarationId(2313), + ty: DeclarationId(2314), }, ], }, @@ -34762,13 +34799,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 20578, 20734), }); declarations.push(Declaration { - id: DeclarationId(1045), + id: DeclarationId(1046), name: Some("MethodTemplateContract".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "dag_method".to_string(), - ty: DeclarationId(840), + ty: DeclarationId(841), }, Field { label: "runtime_template".to_string(), @@ -34776,7 +34813,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "emit_template".to_string(), - ty: DeclarationId(1044), + ty: DeclarationId(1045), }, Field { label: "wraps_result".to_string(), @@ -34784,7 +34821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "placeholder_convention".to_string(), - ty: DeclarationId(1043), + ty: DeclarationId(1044), }, ], }, @@ -34799,7 +34836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 22527, 22714), }); declarations.push(Declaration { - id: DeclarationId(1046), + id: DeclarationId(1047), name: Some("BootstrapFixture".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -34818,45 +34855,45 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1395, 1443), }); declarations.push(Declaration { - id: DeclarationId(1047), + id: DeclarationId(1048), name: Some("BootstrapFixtureSet".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "rust_pilot_primitives".to_string(), - ty: DeclarationId(1046), + ty: DeclarationId(1047), }, Field { label: "rust_method_template_contracts".to_string(), - ty: DeclarationId(1046), + ty: DeclarationId(1047), }, Field { label: "python_method_template_contracts".to_string(), - ty: DeclarationId(1046), + ty: DeclarationId(1047), }, Field { label: "go_method_template_contracts".to_string(), - ty: DeclarationId(1046), + ty: DeclarationId(1047), }, Field { label: "anthropic_operations".to_string(), - ty: DeclarationId(1046), + ty: DeclarationId(1047), }, Field { label: "cross_target_coverage".to_string(), - ty: DeclarationId(1046), + ty: DeclarationId(1047), }, Field { label: "extdeps_cron".to_string(), - ty: DeclarationId(1046), + ty: DeclarationId(1047), }, Field { label: "extdeps_github_github".to_string(), - ty: DeclarationId(1046), + ty: DeclarationId(1047), }, Field { label: "extdeps_github_actions".to_string(), - ty: DeclarationId(1046), + ty: DeclarationId(1047), }, ], }, @@ -34871,15 +34908,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1600, 2024), }); declarations.push(Declaration { - id: DeclarationId(1048), + id: DeclarationId(1049), name: Some("bootstrap_fixture_authority".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1047), + template: DeclarationId(1048), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1047)), + meta_tag: Some(DeclarationId(1048)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -34972,15 +35009,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 2026, 2920), }); declarations.push(Declaration { - id: DeclarationId(1049), + id: DeclarationId(1050), name: Some("go_language_spec_free_monoid_concat_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -35001,7 +35038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "append({left}, {right}...)".to_string(), ))], @@ -35014,7 +35051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -35025,15 +35062,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 3213, 3515), }); declarations.push(Declaration { - id: DeclarationId(1050), + id: DeclarationId(1051), name: Some("go_language_spec_free_monoid_length_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -35052,7 +35089,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "int64(len({recv}))".to_string(), ))], @@ -35065,7 +35102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -35076,15 +35113,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 3517, 3803), }); declarations.push(Declaration { - id: DeclarationId(1051), + id: DeclarationId(1052), name: Some("go_language_spec_free_monoid_emptiness_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -35103,7 +35140,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv}) == 0".to_string(), ))], @@ -35116,7 +35153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -35127,15 +35164,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 3895, 4182), }); declarations.push(Declaration { - id: DeclarationId(1052), + id: DeclarationId(1053), name: Some("go_language_spec_free_monoid_fold_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -35156,7 +35193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "/* fold({recv}, {init}, {body}) */".to_string(), ))], @@ -35169,7 +35206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -35180,15 +35217,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 4617, 4931), }); declarations.push(Declaration { - id: DeclarationId(1053), + id: DeclarationId(1054), name: Some("go_language_spec_map_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -35209,7 +35246,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "/* map({recv}, {body}) */".to_string(), ))], @@ -35222,7 +35259,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -35233,15 +35270,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 5417, 5699), }); declarations.push(Declaration { - id: DeclarationId(1054), + id: DeclarationId(1055), name: Some("go_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -35262,7 +35299,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Filter({recv}, {arg})".to_string(), ))], @@ -35275,7 +35312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -35286,15 +35323,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 5701, 5993), }); declarations.push(Declaration { - id: DeclarationId(1055), + id: DeclarationId(1056), name: Some("go_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -35315,7 +35352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Any({recv}, {arg})".to_string(), ))], @@ -35328,7 +35365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -35339,15 +35376,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 5995, 6275), }); declarations.push(Declaration { - id: DeclarationId(1056), + id: DeclarationId(1057), name: Some("go_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -35368,7 +35405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.All({recv}, {arg})".to_string(), ))], @@ -35381,7 +35418,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -35392,15 +35429,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6277, 6557), }); declarations.push(Declaration { - id: DeclarationId(1057), + id: DeclarationId(1058), name: Some("go_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -35421,7 +35458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.FlatMap({recv}, {arg})".to_string(), ))], @@ -35434,7 +35471,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -35445,18 +35482,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6559, 6857), }); declarations.push(Declaration { - id: DeclarationId(1058), + id: DeclarationId(1059), name: Some("go_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1045), + parameter: DeclarationId(687), + value: DeclarationId(1046), }], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(2314)), + meta_tag: Some(DeclarationId(2315)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -35475,7 +35512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -35488,7 +35525,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -35510,7 +35547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Join({recv}, {arg})".to_string(), ))], @@ -35523,7 +35560,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -35545,7 +35582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Split({recv}, {arg})".to_string(), ))], @@ -35558,15 +35595,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), ]), - FieldValue::Reference(DeclarationId(1054)), FieldValue::Reference(DeclarationId(1055)), FieldValue::Reference(DeclarationId(1056)), FieldValue::Reference(DeclarationId(1057)), + FieldValue::Reference(DeclarationId(1058)), FieldValue::Record(vec![ ( "dag_method".to_string(), @@ -35582,7 +35619,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[{arg}:]".to_string(), ))], @@ -35595,7 +35632,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -35615,7 +35652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[:{arg}]".to_string(), ))], @@ -35628,7 +35665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -35650,7 +35687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.SortBy({recv}, {arg})".to_string(), ))], @@ -35663,7 +35700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -35685,7 +35722,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "append({recv}, {arg})".to_string(), ))], @@ -35698,7 +35735,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -35720,7 +35757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Contains({recv}, {arg})".to_string(), ))], @@ -35733,7 +35770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -35744,29 +35781,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6859, 8941), }); declarations.push(Declaration { - id: DeclarationId(1059), + id: DeclarationId(1060), name: Some("RecursionShape".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "DirectRecursion".to_string(), - ty: DeclarationId(2328), + ty: DeclarationId(2329), }, Field { label: "ListRecursion".to_string(), - ty: DeclarationId(2329), + ty: DeclarationId(2330), }, Field { label: "OptionalRecursion".to_string(), - ty: DeclarationId(2330), + ty: DeclarationId(2331), }, Field { label: "SetRecursion".to_string(), - ty: DeclarationId(2331), + ty: DeclarationId(2332), }, Field { label: "MapValueRecursion".to_string(), - ty: DeclarationId(2332), + ty: DeclarationId(2333), }, ], }, @@ -35781,7 +35818,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5605, 5878), }); declarations.push(Declaration { - id: DeclarationId(1060), + id: DeclarationId(1061), name: Some("InductiveField".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -35799,7 +35836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "shape".to_string(), - ty: DeclarationId(1059), + ty: DeclarationId(1060), }, Field { label: "element_type".to_string(), @@ -35818,10 +35855,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 7170, 7592), }); declarations.push(Declaration { - id: DeclarationId(1061), + id: DeclarationId(1062), name: Some("recursion_shape_eq".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1059), DeclarationId(1059)], + inputs: vec![DeclarationId(1060), DeclarationId(1060)], output: DeclarationId(128), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 7662, 8034)), }, @@ -35836,10 +35873,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 7594, 8034), }); declarations.push(Declaration { - id: DeclarationId(1062), + id: DeclarationId(1063), name: Some("inductive_field_eq".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1060), DeclarationId(1060)], + inputs: vec![DeclarationId(1061), DeclarationId(1061)], output: DeclarationId(128), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8104, 8302)), }, @@ -35854,11 +35891,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 8036, 8302), }); declarations.push(Declaration { - id: DeclarationId(1063), + id: DeclarationId(1064), name: Some("inductive_field_to_dimension".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1060), DeclarationId(230)], - output: DeclarationId(1210), + inputs: vec![DeclarationId(1061), DeclarationId(230)], + output: DeclarationId(1211), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8768, 8799)), }, type_params: vec![], @@ -35872,29 +35909,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 8678, 8799), }); declarations.push(Declaration { - id: DeclarationId(1064), + id: DeclarationId(1065), name: Some("SubValueRelation".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "StrictSubValue".to_string(), - ty: DeclarationId(2333), + ty: DeclarationId(2334), }, Field { label: "IteratedSubValue".to_string(), - ty: DeclarationId(2334), + ty: DeclarationId(2335), }, Field { label: "ArithmeticDescent".to_string(), - ty: DeclarationId(2335), + ty: DeclarationId(2336), }, Field { label: "PreservedValue".to_string(), - ty: DeclarationId(2336), + ty: DeclarationId(2337), }, Field { label: "SubValueUnknown".to_string(), - ty: DeclarationId(2337), + ty: DeclarationId(2338), }, ], }, @@ -35909,11 +35946,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 9945, 10181), }); declarations.push(Declaration { - id: DeclarationId(1065), + id: DeclarationId(1066), name: Some("sub_value_to_evidence".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1064)], - output: DeclarationId(1203), + inputs: vec![DeclarationId(1065)], + output: DeclarationId(1204), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 11134, @@ -35931,10 +35968,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 11062, 11737), }); declarations.push(Declaration { - id: DeclarationId(1066), + id: DeclarationId(1067), name: Some("shrink_factor_eq".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(929), DeclarationId(929)], + inputs: vec![DeclarationId(930), DeclarationId(930)], output: DeclarationId(128), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", @@ -35953,11 +35990,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 12143, 12691), }); declarations.push(Declaration { - id: DeclarationId(1067), + id: DeclarationId(1068), name: Some("meet_sub_value".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1064), DeclarationId(1064)], - output: DeclarationId(1064), + inputs: vec![DeclarationId(1065), DeclarationId(1065)], + output: DeclarationId(1065), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 13282, @@ -35975,11 +36012,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 13202, 14694), }); declarations.push(Declaration { - id: DeclarationId(1068), + id: DeclarationId(1069), name: Some("join_sub_value".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1064), DeclarationId(1064)], - output: DeclarationId(1064), + inputs: vec![DeclarationId(1065), DeclarationId(1065)], + output: DeclarationId(1065), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 15026, @@ -35997,11 +36034,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 14946, 16329), }); declarations.push(Declaration { - id: DeclarationId(1069), + id: DeclarationId(1070), name: Some("compose_sub_value".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1064), DeclarationId(1060)], - output: DeclarationId(1064), + inputs: vec![DeclarationId(1065), DeclarationId(1061)], + output: DeclarationId(1065), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 17472, @@ -36019,11 +36056,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 17384, 17594), }); declarations.push(Declaration { - id: DeclarationId(1070), + id: DeclarationId(1071), name: Some("compose_sub_value_relations".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1064), DeclarationId(1064)], - output: DeclarationId(1064), + inputs: vec![DeclarationId(1065), DeclarationId(1065)], + output: DeclarationId(1065), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 18450, @@ -36041,11 +36078,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 18342, 19796), }); declarations.push(Declaration { - id: DeclarationId(1071), + id: DeclarationId(1072), name: Some("sub_value_to_call_pattern".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1064)], - output: DeclarationId(2315), + inputs: vec![DeclarationId(1065)], + output: DeclarationId(2316), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 20571, @@ -36063,11 +36100,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 20498, 21367), }); declarations.push(Declaration { - id: DeclarationId(1072), + id: DeclarationId(1073), name: Some("sub_value_to_lowering_target".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1064)], - output: DeclarationId(2316), + inputs: vec![DeclarationId(1065)], + output: DeclarationId(2317), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 21959, @@ -36085,25 +36122,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 21880, 22864), }); declarations.push(Declaration { - id: DeclarationId(1073), + id: DeclarationId(1074), name: Some("PolynomialExponent".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "IntegerExpZero".to_string(), - ty: DeclarationId(2338), + ty: DeclarationId(2339), }, Field { label: "IntegerExpPos".to_string(), - ty: DeclarationId(2339), + ty: DeclarationId(2340), }, Field { label: "FractionExp".to_string(), - ty: DeclarationId(2340), + ty: DeclarationId(2341), }, Field { label: "LogBasedExp".to_string(), - ty: DeclarationId(2341), + ty: DeclarationId(2342), }, ], }, @@ -36118,11 +36155,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24107, 24362), }); declarations.push(Declaration { - id: DeclarationId(1074), + id: DeclarationId(1075), name: Some("poly_exp_degree_one".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1073), + output: DeclarationId(1074), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 24411, @@ -36140,17 +36177,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24364, 24450), }); declarations.push(Declaration { - id: DeclarationId(1075), + id: DeclarationId(1076), name: Some("AtomicCost".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "PolyCost".to_string(), - ty: DeclarationId(2342), + ty: DeclarationId(2343), }, Field { label: "LogCost".to_string(), - ty: DeclarationId(2343), + ty: DeclarationId(2344), }, ], }, @@ -36165,37 +36202,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24962, 25079), }); declarations.push(Declaration { - id: DeclarationId(1076), + id: DeclarationId(1077), name: Some("CostBound".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ConstantBound".to_string(), - ty: DeclarationId(2344), + ty: DeclarationId(2345), }, Field { label: "AtomicBound".to_string(), - ty: DeclarationId(2345), + ty: DeclarationId(2346), }, Field { label: "ProductBound".to_string(), - ty: DeclarationId(2347), + ty: DeclarationId(2348), }, Field { label: "SumOfProductsBound".to_string(), - ty: DeclarationId(2350), + ty: DeclarationId(2351), }, Field { label: "SumBound".to_string(), - ty: DeclarationId(2352), + ty: DeclarationId(2353), }, Field { label: "ForeverBound".to_string(), - ty: DeclarationId(2353), + ty: DeclarationId(2354), }, Field { label: "ErrorBound".to_string(), - ty: DeclarationId(2354), + ty: DeclarationId(2355), }, ], }, @@ -36210,11 +36247,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26709, 27469), }); declarations.push(Declaration { - id: DeclarationId(1077), + id: DeclarationId(1078), name: Some("sum_bound".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(2317)], - output: DeclarationId(1076), + inputs: vec![DeclarationId(2318)], + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 27880, @@ -36232,10 +36269,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27830, 27986), }); declarations.push(Declaration { - id: DeclarationId(1078), + id: DeclarationId(1079), name: Some("cost_bound_is_sum_bound".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1076)], + inputs: vec![DeclarationId(1077)], output: DeclarationId(128), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", @@ -36254,11 +36291,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 28261, 28563), }); declarations.push(Declaration { - id: DeclarationId(1079), + id: DeclarationId(1080), name: Some("cost_bound_to_symbolic".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1076)], - output: DeclarationId(848), + inputs: vec![DeclarationId(1077)], + output: DeclarationId(849), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(544))), }, type_params: vec![], @@ -36272,11 +36309,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 29000, 29517), }); declarations.push(Declaration { - id: DeclarationId(1080), + id: DeclarationId(1081), name: Some("atomic_cost_to_symbolic".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1075)], - output: DeclarationId(848), + inputs: vec![DeclarationId(1076)], + output: DeclarationId(849), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(553))), }, type_params: vec![], @@ -36290,11 +36327,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 29519, 29839), }); declarations.push(Declaration { - id: DeclarationId(1081), + id: DeclarationId(1082), name: Some("product_atoms_to_symbolic".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(2318)], - output: DeclarationId(848), + inputs: vec![DeclarationId(2319)], + output: DeclarationId(849), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 29913, @@ -36312,11 +36349,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 29841, 29949), }); declarations.push(Declaration { - id: DeclarationId(1082), + id: DeclarationId(1083), name: Some("product_term_to_symbolic".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(2319)], - output: DeclarationId(848), + inputs: vec![DeclarationId(2320)], + output: DeclarationId(849), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(555))), }, type_params: vec![], @@ -36330,11 +36367,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 29951, 30060), }); declarations.push(Declaration { - id: DeclarationId(1083), + id: DeclarationId(1084), name: Some("sum_products_to_symbolic".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(2321)], - output: DeclarationId(848), + inputs: vec![DeclarationId(2322)], + output: DeclarationId(849), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 30137, @@ -36352,11 +36389,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 30062, 30172), }); declarations.push(Declaration { - id: DeclarationId(1084), + id: DeclarationId(1085), name: Some("cost_constant".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 30206, @@ -36374,11 +36411,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 30174, 30223), }); declarations.push(Declaration { - id: DeclarationId(1085), + id: DeclarationId(1086), name: Some("cost_linear".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 30267, @@ -36396,11 +36433,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 30224, 30351), }); declarations.push(Declaration { - id: DeclarationId(1086), + id: DeclarationId(1087), name: Some("cost_poly".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230), DeclarationId(93)], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 30406, @@ -36418,11 +36455,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 30352, 30805), }); declarations.push(Declaration { - id: DeclarationId(1087), + id: DeclarationId(1088), name: Some("cost_root".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230), DeclarationId(93)], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 30855, @@ -36440,11 +36477,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 30806, 31129), }); declarations.push(Declaration { - id: DeclarationId(1088), + id: DeclarationId(1089), name: Some("cost_sqrt".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 31171, @@ -36462,11 +36499,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 31130, 31204), }); declarations.push(Declaration { - id: DeclarationId(1089), + id: DeclarationId(1090), name: Some("cost_cbrt".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 31246, @@ -36484,11 +36521,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 31205, 31279), }); declarations.push(Declaration { - id: DeclarationId(1090), + id: DeclarationId(1091), name: Some("cost_log".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 31320, @@ -36506,11 +36543,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 31280, 31370), }); declarations.push(Declaration { - id: DeclarationId(1091), + id: DeclarationId(1092), name: Some("cost_nlogn".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 31414, @@ -36528,11 +36565,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 31372, 31532), }); declarations.push(Declaration { - id: DeclarationId(1092), + id: DeclarationId(1093), name: Some("cost_graph_linear".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230), DeclarationId(230)], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 31602, @@ -36550,7 +36587,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 31534, 31778), }); declarations.push(Declaration { - id: DeclarationId(1093), + id: DeclarationId(1094), name: Some("RecurrenceForm".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -36583,11 +36620,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 32935, 33026), }); declarations.push(Declaration { - id: DeclarationId(1094), + id: DeclarationId(1095), name: Some("int_add_checked".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93), DeclarationId(93)], - output: DeclarationId(2322), + output: DeclarationId(2323), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 33617, @@ -36605,11 +36642,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33574, 33868), }); declarations.push(Declaration { - id: DeclarationId(1095), + id: DeclarationId(1096), name: Some("int_mul_checked".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93), DeclarationId(93)], - output: DeclarationId(2323), + output: DeclarationId(2324), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 33913, @@ -36627,11 +36664,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33870, 34702), }); declarations.push(Declaration { - id: DeclarationId(1096), + id: DeclarationId(1097), name: Some("bounded_int_pow_exponent".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93)], - output: DeclarationId(2324), + output: DeclarationId(2325), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 35162, @@ -36649,11 +36686,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35118, 35285), }); declarations.push(Declaration { - id: DeclarationId(1097), + id: DeclarationId(1098), name: Some("int_pow_bounded".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93), DeclarationId(93)], - output: DeclarationId(2325), + output: DeclarationId(2326), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 35637, @@ -36671,11 +36708,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35589, 36682), }); declarations.push(Declaration { - id: DeclarationId(1098), + id: DeclarationId(1099), name: Some("ceil_log".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93), DeclarationId(93)], - output: DeclarationId(2326), + output: DeclarationId(2327), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 36900, @@ -36693,7 +36730,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 36854, 37015), }); declarations.push(Declaration { - id: DeclarationId(1099), + id: DeclarationId(1100), name: Some("ceil_log_iter".to_string()), connective: TypeConnective::Arrow { inputs: vec![ @@ -36702,7 +36739,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { DeclarationId(93), DeclarationId(93), ], - output: DeclarationId(2327), + output: DeclarationId(2328), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 37172, @@ -36720,11 +36757,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 37101, 37534), }); declarations.push(Declaration { - id: DeclarationId(1100), + id: DeclarationId(1101), name: Some("master_theorem".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1093)], - output: DeclarationId(1076), + inputs: vec![DeclarationId(1094)], + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 37589, @@ -36742,11 +36779,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 37536, 39626), }); declarations.push(Declaration { - id: DeclarationId(1101), + id: DeclarationId(1102), name: Some("catamorphism_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230), DeclarationId(93)], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 39979, @@ -36764,16 +36801,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 39909, 40137), }); declarations.push(Declaration { - id: DeclarationId(1102), + id: DeclarationId(1103), name: Some("derive_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![ DeclarationId(230), DeclarationId(93), - DeclarationId(929), + DeclarationId(930), DeclarationId(93), ], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 40636, @@ -36791,11 +36828,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 40535, 41660), }); declarations.push(Declaration { - id: DeclarationId(1103), + id: DeclarationId(1104), name: Some("tree_traversal_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 41993, @@ -36813,11 +36850,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 41954, 42050), }); declarations.push(Declaration { - id: DeclarationId(1104), + id: DeclarationId(1105), name: Some("nested_iteration_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 42093, @@ -36835,11 +36872,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 42052, 42151), }); declarations.push(Declaration { - id: DeclarationId(1105), + id: DeclarationId(1106), name: Some("linear_scan_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 42251, @@ -36857,11 +36894,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 42215, 42306), }); declarations.push(Declaration { - id: DeclarationId(1106), + id: DeclarationId(1107), name: Some("binary_search_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 42503, @@ -36879,11 +36916,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 42465, 42618), }); declarations.push(Declaration { - id: DeclarationId(1107), + id: DeclarationId(1108), name: Some("mergesort_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 42698, @@ -36901,11 +36938,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 42664, 42813), }); declarations.push(Declaration { - id: DeclarationId(1108), + id: DeclarationId(1109), name: Some("karatsuba_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 42980, @@ -36923,11 +36960,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 42946, 43099), }); declarations.push(Declaration { - id: DeclarationId(1109), + id: DeclarationId(1110), name: Some("strassen_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 43264, @@ -36945,11 +36982,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 43231, 43378), }); declarations.push(Declaration { - id: DeclarationId(1110), + id: DeclarationId(1111), name: Some("trial_division_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 43495, @@ -36967,11 +37004,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 43456, 43520), }); declarations.push(Declaration { - id: DeclarationId(1111), + id: DeclarationId(1112), name: Some("cube_root_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 43555, @@ -36989,11 +37026,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 43521, 43580), }); declarations.push(Declaration { - id: DeclarationId(1112), + id: DeclarationId(1113), name: Some("kth_root_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93)], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 43662, @@ -37011,11 +37048,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 43623, 43693), }); declarations.push(Declaration { - id: DeclarationId(1113), + id: DeclarationId(1114), name: Some("bfs_dfs_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 43929, @@ -37033,11 +37070,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 43897, 43980), }); declarations.push(Declaration { - id: DeclarationId(1114), + id: DeclarationId(1115), name: Some("dijkstra_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 44071, @@ -37055,11 +37092,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 44038, 44353), }); declarations.push(Declaration { - id: DeclarationId(1115), + id: DeclarationId(1116), name: Some("bellman_ford_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 44456, @@ -37077,11 +37114,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 44419, 44616), }); declarations.push(Declaration { - id: DeclarationId(1116), + id: DeclarationId(1117), name: Some("floyd_warshall_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1076), + output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 44723, @@ -37099,18 +37136,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 44684, 44761), }); declarations.push(Declaration { - id: DeclarationId(1117), + id: DeclarationId(1118), name: Some("signed_int_diagnostic_order".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1289), + parameter: DeclarationId(687), + value: DeclarationId(1290), }], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(2355)), + meta_tag: Some(DeclarationId(2356)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -37125,18 +37162,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1200, 1304), }); declarations.push(Declaration { - id: DeclarationId(1118), + id: DeclarationId(1119), name: Some("unsigned_int_diagnostic_order".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1289), + parameter: DeclarationId(687), + value: DeclarationId(1290), }], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(2356)), + meta_tag: Some(DeclarationId(2357)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -37151,7 +37188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1378, 1489), }); declarations.push(Declaration { - id: DeclarationId(1119), + id: DeclarationId(1120), name: Some("Lens".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -37161,27 +37198,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "read".to_string(), - ty: DeclarationId(2358), + ty: DeclarationId(2359), }, Field { label: "sequential".to_string(), - ty: DeclarationId(2359), + ty: DeclarationId(2360), }, Field { label: "branch".to_string(), - ty: DeclarationId(2360), + ty: DeclarationId(2361), }, Field { label: "iterate".to_string(), - ty: DeclarationId(2361), + ty: DeclarationId(2362), }, Field { label: "validate".to_string(), - ty: DeclarationId(2362), + ty: DeclarationId(2363), }, ], }, - type_params: vec![DeclarationId(1120)], + type_params: vec![DeclarationId(1121)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -37192,7 +37229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318), }); declarations.push(Declaration { - id: DeclarationId(1120), + id: DeclarationId(1121), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("C".to_string())), type_params: vec![], @@ -37206,17 +37243,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318), }); declarations.push(Declaration { - id: DeclarationId(1121), + id: DeclarationId(1122), name: Some("SectionRef".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "DeclarationScope".to_string(), - ty: DeclarationId(2363), + ty: DeclarationId(2364), }, Field { label: "NodeScope".to_string(), - ty: DeclarationId(2364), + ty: DeclarationId(2365), }, ], }, @@ -37231,12 +37268,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 3285, 3418), }); declarations.push(Declaration { - id: DeclarationId(1122), + id: DeclarationId(1123), name: Some("DiagnosticSeverity".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "Error".to_string(), - ty: DeclarationId(2365), + ty: DeclarationId(2366), }], }, type_params: vec![], @@ -37250,21 +37287,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 4271, 4302), }); declarations.push(Declaration { - id: DeclarationId(1123), + id: DeclarationId(1124), name: Some("LensEnforcement".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "project".to_string(), - ty: DeclarationId(2366), + ty: DeclarationId(2367), }, Field { label: "violates".to_string(), - ty: DeclarationId(2367), + ty: DeclarationId(2368), }, ], }, - type_params: vec![DeclarationId(1124), DeclarationId(1125)], + type_params: vec![DeclarationId(1125), DeclarationId(1126)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -37275,7 +37312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 5251, 5362), }); declarations.push(Declaration { - id: DeclarationId(1124), + id: DeclarationId(1125), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())), type_params: vec![], @@ -37289,7 +37326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 5251, 5362), }); declarations.push(Declaration { - id: DeclarationId(1125), + id: DeclarationId(1126), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())), type_params: vec![], @@ -37303,21 +37340,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 5251, 5362), }); declarations.push(Declaration { - id: DeclarationId(1126), + id: DeclarationId(1127), name: Some("EnforceableLens".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "lens".to_string(), - ty: DeclarationId(2368), + ty: DeclarationId(2369), }, Field { label: "enforcement".to_string(), - ty: DeclarationId(2369), + ty: DeclarationId(2370), }, ], }, - type_params: vec![DeclarationId(1127), DeclarationId(1128)], + type_params: vec![DeclarationId(1128), DeclarationId(1129)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -37328,7 +37365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 7313, 7421), }); declarations.push(Declaration { - id: DeclarationId(1127), + id: DeclarationId(1128), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())), type_params: vec![], @@ -37342,7 +37379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 7313, 7421), }); declarations.push(Declaration { - id: DeclarationId(1128), + id: DeclarationId(1129), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())), type_params: vec![], @@ -37356,25 +37393,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 7313, 7421), }); declarations.push(Declaration { - id: DeclarationId(1129), + id: DeclarationId(1130), name: Some("EnforcedApplication".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "enforceable_lens".to_string(), - ty: DeclarationId(2370), + ty: DeclarationId(2371), }, Field { label: "section".to_string(), - ty: DeclarationId(1121), + ty: DeclarationId(1122), }, Field { label: "budget".to_string(), - ty: DeclarationId(1131), + ty: DeclarationId(1132), }, Field { label: "diagnostic_severity".to_string(), - ty: DeclarationId(1122), + ty: DeclarationId(1123), }, Field { label: "span".to_string(), @@ -37382,7 +37419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, ], }, - type_params: vec![DeclarationId(1130), DeclarationId(1131)], + type_params: vec![DeclarationId(1131), DeclarationId(1132)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -37393,7 +37430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 9030, 9226), }); declarations.push(Declaration { - id: DeclarationId(1130), + id: DeclarationId(1131), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())), type_params: vec![], @@ -37407,7 +37444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 9030, 9226), }); declarations.push(Declaration { - id: DeclarationId(1131), + id: DeclarationId(1132), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())), type_params: vec![], @@ -37421,17 +37458,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 9030, 9226), }); declarations.push(Declaration { - id: DeclarationId(1132), + id: DeclarationId(1133), name: Some("IntrospectApplication".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "lens".to_string(), - ty: DeclarationId(2371), + ty: DeclarationId(2372), }, Field { label: "section".to_string(), - ty: DeclarationId(1121), + ty: DeclarationId(1122), }, Field { label: "span".to_string(), @@ -37439,7 +37476,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, ], }, - type_params: vec![DeclarationId(1133)], + type_params: vec![DeclarationId(1134)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -37450,7 +37487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 10099, 10199), }); declarations.push(Declaration { - id: DeclarationId(1133), + id: DeclarationId(1134), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())), type_params: vec![], @@ -37464,21 +37501,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 10099, 10199), }); declarations.push(Declaration { - id: DeclarationId(1134), + id: DeclarationId(1135), name: Some("Lookup".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Miss".to_string(), - ty: DeclarationId(2374), + ty: DeclarationId(2375), }, Field { label: "Hit".to_string(), - ty: DeclarationId(2375), + ty: DeclarationId(2376), }, ], }, - type_params: vec![DeclarationId(1135)], + type_params: vec![DeclarationId(1136)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -37489,7 +37526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4521, 4563), }); declarations.push(Declaration { - id: DeclarationId(1135), + id: DeclarationId(1136), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("value".to_string())), type_params: vec![], @@ -37503,11 +37540,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4521, 4563), }); declarations.push(Declaration { - id: DeclarationId(1136), + id: DeclarationId(1137), name: Some("miss_int_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(2372), + output: DeclarationId(2373), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4601, 4611)), }, type_params: vec![], @@ -37521,11 +37558,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4565, 4611), }); declarations.push(Declaration { - id: DeclarationId(1137), + id: DeclarationId(1138), name: Some("hit_int_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93)], - output: DeclarationId(2373), + output: DeclarationId(2374), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4654, 4666)), }, type_params: vec![], @@ -37539,7 +37576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4613, 4666), }); declarations.push(Declaration { - id: DeclarationId(1138), + id: DeclarationId(1139), name: Some("DagDifference".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -37558,12 +37595,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 684, 723), }); declarations.push(Declaration { - id: DeclarationId(1139), + id: DeclarationId(1140), name: Some("SurfaceModule".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "items".to_string(), - ty: DeclarationId(2376), + ty: DeclarationId(2377), }], }, type_params: vec![], @@ -37577,7 +37614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1149, 1198), }); declarations.push(Declaration { - id: DeclarationId(1140), + id: DeclarationId(1141), name: Some("SurfaceParam".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -37587,11 +37624,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "ty".to_string(), - ty: DeclarationId(1144), + ty: DeclarationId(1145), }, Field { label: "refinement".to_string(), - ty: DeclarationId(2377), + ty: DeclarationId(2378), }, ], }, @@ -37606,7 +37643,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1200, 1281), }); declarations.push(Declaration { - id: DeclarationId(1141), + id: DeclarationId(1142), name: Some("SurfaceField".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -37616,7 +37653,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "ty".to_string(), - ty: DeclarationId(1144), + ty: DeclarationId(1145), }, ], }, @@ -37631,7 +37668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1283, 1337), }); declarations.push(Declaration { - id: DeclarationId(1142), + id: DeclarationId(1143), name: Some("SurfaceVariant".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -37641,7 +37678,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "payload".to_string(), - ty: DeclarationId(1143), + ty: DeclarationId(1144), }, Field { label: "span".to_string(), @@ -37660,17 +37697,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1339, 1422), }); declarations.push(Declaration { - id: DeclarationId(1143), + id: DeclarationId(1144), name: Some("VariantPayload".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Positional".to_string(), - ty: DeclarationId(2379), + ty: DeclarationId(2380), }, Field { label: "Record".to_string(), - ty: DeclarationId(2381), + ty: DeclarationId(2382), }, ], }, @@ -37685,25 +37722,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1712, 1796), }); declarations.push(Declaration { - id: DeclarationId(1144), + id: DeclarationId(1145), name: Some("SurfaceType".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Named".to_string(), - ty: DeclarationId(2382), + ty: DeclarationId(2383), }, Field { label: "Parameterized".to_string(), - ty: DeclarationId(2384), + ty: DeclarationId(2385), }, Field { label: "Optional".to_string(), - ty: DeclarationId(2385), + ty: DeclarationId(2386), }, Field { label: "Arrow".to_string(), - ty: DeclarationId(2387), + ty: DeclarationId(2388), }, ], }, @@ -37718,7 +37755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2052, 2379), }); declarations.push(Declaration { - id: DeclarationId(1145), + id: DeclarationId(1146), name: Some("SurfaceRecordField".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -37728,7 +37765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "value".to_string(), - ty: DeclarationId(1151), + ty: DeclarationId(1152), }, Field { label: "span".to_string(), @@ -37747,7 +37784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2381, 2463), }); declarations.push(Declaration { - id: DeclarationId(1146), + id: DeclarationId(1147), name: Some("SurfaceMapEntry".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -37761,7 +37798,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "value".to_string(), - ty: DeclarationId(1151), + ty: DeclarationId(1152), }, Field { label: "span".to_string(), @@ -37780,17 +37817,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3353, 3454), }); declarations.push(Declaration { - id: DeclarationId(1147), + id: DeclarationId(1148), name: Some("SurfaceMatchArm".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "pattern".to_string(), - ty: DeclarationId(1149), + ty: DeclarationId(1150), }, Field { label: "body".to_string(), - ty: DeclarationId(1151), + ty: DeclarationId(1152), }, Field { label: "span".to_string(), @@ -37809,7 +37846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3456, 3545), }); declarations.push(Declaration { - id: DeclarationId(1148), + id: DeclarationId(1149), name: Some("SurfacePatternField".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -37838,21 +37875,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3547, 3627), }); declarations.push(Declaration { - id: DeclarationId(1149), + id: DeclarationId(1150), name: Some("SurfacePattern".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "BareVariant".to_string(), - ty: DeclarationId(2388), + ty: DeclarationId(2389), }, Field { label: "VariantWith".to_string(), - ty: DeclarationId(2389), + ty: DeclarationId(2390), }, Field { label: "VariantFields".to_string(), - ty: DeclarationId(2391), + ty: DeclarationId(2392), }, ], }, @@ -37867,21 +37904,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3725, 3991), }); declarations.push(Declaration { - id: DeclarationId(1150), + id: DeclarationId(1151), name: Some("SurfaceLiteral".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Int".to_string(), - ty: DeclarationId(2392), + ty: DeclarationId(2393), }, Field { label: "Bool".to_string(), - ty: DeclarationId(2393), + ty: DeclarationId(2394), }, Field { label: "String".to_string(), - ty: DeclarationId(2394), + ty: DeclarationId(2395), }, ], }, @@ -37896,61 +37933,61 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4639, 4708), }); declarations.push(Declaration { - id: DeclarationId(1151), + id: DeclarationId(1152), name: Some("SurfaceExpr".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Literal".to_string(), - ty: DeclarationId(2395), + ty: DeclarationId(2396), }, Field { label: "Var".to_string(), - ty: DeclarationId(2396), + ty: DeclarationId(2397), }, Field { label: "Path".to_string(), - ty: DeclarationId(2399), + ty: DeclarationId(2400), }, Field { label: "Call".to_string(), - ty: DeclarationId(2401), + ty: DeclarationId(2402), }, Field { label: "PathCall".to_string(), - ty: DeclarationId(2405), + ty: DeclarationId(2406), }, Field { label: "VariantRecord".to_string(), - ty: DeclarationId(2407), + ty: DeclarationId(2408), }, Field { label: "Operator".to_string(), - ty: DeclarationId(2409), + ty: DeclarationId(2410), }, Field { label: "Lambda".to_string(), - ty: DeclarationId(2411), + ty: DeclarationId(2412), }, Field { label: "If".to_string(), - ty: DeclarationId(2412), + ty: DeclarationId(2413), }, Field { label: "Match".to_string(), - ty: DeclarationId(2414), + ty: DeclarationId(2415), }, Field { label: "Record".to_string(), - ty: DeclarationId(2416), + ty: DeclarationId(2417), }, Field { label: "List".to_string(), - ty: DeclarationId(2418), + ty: DeclarationId(2419), }, Field { label: "Map".to_string(), - ty: DeclarationId(2420), + ty: DeclarationId(2421), }, ], }, @@ -37965,49 +38002,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4801, 8620), }); declarations.push(Declaration { - id: DeclarationId(1152), + id: DeclarationId(1153), name: Some("SurfaceItem".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Let".to_string(), - ty: DeclarationId(2422), + ty: DeclarationId(2423), }, Field { label: "Fn".to_string(), - ty: DeclarationId(2425), + ty: DeclarationId(2426), }, Field { label: "FnExternalBody".to_string(), - ty: DeclarationId(2428), + ty: DeclarationId(2429), }, Field { label: "Data".to_string(), - ty: DeclarationId(2430), + ty: DeclarationId(2431), }, Field { label: "Module".to_string(), - ty: DeclarationId(2432), + ty: DeclarationId(2433), }, Field { label: "Import".to_string(), - ty: DeclarationId(2435), + ty: DeclarationId(2436), }, Field { label: "TypeAtom".to_string(), - ty: DeclarationId(2437), + ty: DeclarationId(2438), }, Field { label: "TypeRecord".to_string(), - ty: DeclarationId(2440), + ty: DeclarationId(2441), }, Field { label: "TypeSum".to_string(), - ty: DeclarationId(2444), + ty: DeclarationId(2445), }, Field { label: "TypeAlias".to_string(), - ty: DeclarationId(2447), + ty: DeclarationId(2448), }, ], }, @@ -38022,15 +38059,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9489, 10807), }); declarations.push(Declaration { - id: DeclarationId(1153), + id: DeclarationId(1154), name: Some("python_language_spec_free_monoid_concat_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -38049,7 +38086,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "[*{left}, *{right}]".to_string(), ))], @@ -38062,7 +38099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -38077,15 +38114,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(1154), + id: DeclarationId(1155), name: Some("python_language_spec_free_monoid_length_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -38104,7 +38141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -38117,7 +38154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -38132,15 +38169,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(1155), + id: DeclarationId(1156), name: Some("python_language_spec_free_monoid_emptiness_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -38159,7 +38196,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "(len({recv}) == 0)".to_string(), ))], @@ -38172,7 +38209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -38187,15 +38224,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(1156), + id: DeclarationId(1157), name: Some("python_language_spec_free_monoid_fold_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -38216,7 +38253,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "__v3_fold({recv}, {init}, {body})".to_string(), ))], @@ -38229,7 +38266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -38244,15 +38281,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(1157), + id: DeclarationId(1158), name: Some("python_language_spec_map_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -38273,7 +38310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "[{body} for {item} in {recv}]".to_string(), ))], @@ -38286,7 +38323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -38301,15 +38338,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(1158), + id: DeclarationId(1159), name: Some("python_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -38330,7 +38367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "[x for x in {recv} if {arg}(x)]".to_string(), ))], @@ -38343,7 +38380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -38358,15 +38395,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(1159), + id: DeclarationId(1160), name: Some("python_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -38387,7 +38424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "any({arg}(x) for x in {recv})".to_string(), ))], @@ -38400,7 +38437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -38415,15 +38452,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(1160), + id: DeclarationId(1161), name: Some("python_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -38444,7 +38481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "all({arg}(x) for x in {recv})".to_string(), ))], @@ -38457,7 +38494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -38472,15 +38509,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(1161), + id: DeclarationId(1162), name: Some("python_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -38501,7 +38538,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "[y for x in {recv} for y in {arg}(x)]".to_string(), ))], @@ -38514,7 +38551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -38529,18 +38566,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(1162), + id: DeclarationId(1163), name: Some("python_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1045), + parameter: DeclarationId(687), + value: DeclarationId(1046), }], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(2448)), + meta_tag: Some(DeclarationId(2449)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -38559,7 +38596,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -38572,7 +38609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -38592,7 +38629,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "{arg}.join({recv})".to_string(), ))], @@ -38605,7 +38642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -38625,7 +38662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}.split({arg})".to_string(), ))], @@ -38638,7 +38675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -38660,7 +38697,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[-1] if {recv} else None".to_string(), ))], @@ -38673,7 +38710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -38695,7 +38732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[0] if {recv} else None".to_string(), ))], @@ -38708,7 +38745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -38730,7 +38767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "list(enumerate({recv}))".to_string(), ))], @@ -38743,7 +38780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -38765,7 +38802,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "[ord(c) for c in {recv}]".to_string(), ))], @@ -38778,15 +38815,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), ]), - FieldValue::Reference(DeclarationId(1158)), FieldValue::Reference(DeclarationId(1159)), FieldValue::Reference(DeclarationId(1160)), FieldValue::Reference(DeclarationId(1161)), + FieldValue::Reference(DeclarationId(1162)), FieldValue::Record(vec![ ( "dag_method".to_string(), @@ -38802,7 +38839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[{arg}:]".to_string(), ))], @@ -38815,7 +38852,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -38835,7 +38872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[:{arg}]".to_string(), ))], @@ -38848,7 +38885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -38870,7 +38907,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "sorted({recv}, key={arg})".to_string(), ))], @@ -38883,7 +38920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -38903,7 +38940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv} + [{arg}]".to_string(), ))], @@ -38916,7 +38953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -38936,7 +38973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "{arg} in {recv}".to_string(), ))], @@ -38949,7 +38986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -38964,7 +39001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(1163), + id: DeclarationId(1164), name: Some("ResourceHandle".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -38997,12 +39034,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/resources.dag", 739, 827), }); declarations.push(Declaration { - id: DeclarationId(1164), + id: DeclarationId(1165), name: Some("ResourceReference".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "target".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }], }, type_params: vec![], @@ -39016,7 +39053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/resources.dag", 829, 880), }); declarations.push(Declaration { - id: DeclarationId(1165), + id: DeclarationId(1166), name: Some("NamedField".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -39026,7 +39063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "value".to_string(), - ty: DeclarationId(1166), + ty: DeclarationId(1167), }, ], }, @@ -39041,29 +39078,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 760, 810), }); declarations.push(Declaration { - id: DeclarationId(1166), + id: DeclarationId(1167), name: Some("Value".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "LiteralValue".to_string(), - ty: DeclarationId(2450), + ty: DeclarationId(2451), }, Field { label: "RecordValue".to_string(), - ty: DeclarationId(2452), + ty: DeclarationId(2453), }, Field { label: "VariantValue".to_string(), - ty: DeclarationId(2453), + ty: DeclarationId(2454), }, Field { label: "NodeRef".to_string(), - ty: DeclarationId(2454), + ty: DeclarationId(2455), }, Field { label: "CardinalityValue".to_string(), - ty: DeclarationId(2455), + ty: DeclarationId(2456), }, ], }, @@ -39078,15 +39115,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2122, 2304), }); declarations.push(Declaration { - id: DeclarationId(1167), + id: DeclarationId(1168), name: Some("ProgramObservation".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "observed".to_string(), - ty: DeclarationId(1168), + ty: DeclarationId(1169), }], }, - type_params: vec![DeclarationId(1168)], + type_params: vec![DeclarationId(1169)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -39097,7 +39134,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 3208, 3264), }); declarations.push(Declaration { - id: DeclarationId(1168), + id: DeclarationId(1169), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())), type_params: vec![], @@ -39111,12 +39148,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 3208, 3264), }); declarations.push(Declaration { - id: DeclarationId(1169), + id: DeclarationId(1170), name: Some("EvalFrame".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "bindings".to_string(), - ty: DeclarationId(2456), + ty: DeclarationId(2457), }], }, type_params: vec![], @@ -39130,12 +39167,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 3907, 3956), }); declarations.push(Declaration { - id: DeclarationId(1170), + id: DeclarationId(1171), name: Some("EvalStateStack".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "frames".to_string(), - ty: DeclarationId(2457), + ty: DeclarationId(2458), }], }, type_params: vec![], @@ -39149,12 +39186,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 4510, 4559), }); declarations.push(Declaration { - id: DeclarationId(1171), + id: DeclarationId(1172), name: Some("EvalStateKey".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "state".to_string(), - ty: DeclarationId(1170), + ty: DeclarationId(1171), }], }, type_params: vec![], @@ -39168,12 +39205,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 4940, 4985), }); declarations.push(Declaration { - id: DeclarationId(1172), + id: DeclarationId(1173), name: Some("EvalStrategy".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "ApplicativeOrder".to_string(), - ty: DeclarationId(2458), + ty: DeclarationId(2459), }], }, type_params: vec![], @@ -39187,17 +39224,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 5368, 5442), }); declarations.push(Declaration { - id: DeclarationId(1173), + id: DeclarationId(1174), name: Some("InputEvaluationOrder".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "LeftFirst".to_string(), - ty: DeclarationId(2459), + ty: DeclarationId(2460), }, Field { label: "RightFirst".to_string(), - ty: DeclarationId(2460), + ty: DeclarationId(2461), }, ], }, @@ -39212,25 +39249,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 5654, 5704), }); declarations.push(Declaration { - id: DeclarationId(1174), + id: DeclarationId(1175), name: Some("EvalMemoKey".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "program".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }, Field { label: "node".to_string(), - ty: DeclarationId(721), + ty: DeclarationId(722), }, Field { label: "state_key".to_string(), - ty: DeclarationId(1171), + ty: DeclarationId(1172), }, Field { label: "strategy".to_string(), - ty: DeclarationId(1172), + ty: DeclarationId(1173), }, ], }, @@ -39245,11 +39282,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 6013, 6124), }); declarations.push(Declaration { - id: DeclarationId(1175), + id: DeclarationId(1176), name: Some("evaluate".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(721), DeclarationId(2449)], - output: DeclarationId(1166), + inputs: vec![DeclarationId(828), DeclarationId(722), DeclarationId(2450)], + output: DeclarationId(1167), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/runtime.dag", 11265, 11284)), }, type_params: vec![], @@ -39262,13 +39299,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/runtime.dag", 11196, 11284), }); - declarations.push(Declaration { id: DeclarationId(1176), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1045), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1045)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2311), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3551, 4204) }); - declarations.push(Declaration { id: DeclarationId(1177), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1045), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1045)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2311), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4206, 4701) }); - declarations.push(Declaration { id: DeclarationId(1178), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1045), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1045)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2311), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4703, 5192) }); - declarations.push(Declaration { id: DeclarationId(1179), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1045), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1045)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2311), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5194, 5725) }); - declarations.push(Declaration { id: DeclarationId(1180), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1045) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2461)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2311), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2311), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2311), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2311), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2311), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2311), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2311), payload: vec![] })]), FieldValue::Reference(DeclarationId(1176)), FieldValue::Reference(DeclarationId(1177)), FieldValue::Reference(DeclarationId(1178)), FieldValue::Reference(DeclarationId(1179)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2311), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2311), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5728, 8449) }); + declarations.push(Declaration { id: DeclarationId(1177), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2314), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3551, 4204) }); + declarations.push(Declaration { id: DeclarationId(1178), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2314), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4206, 4701) }); + declarations.push(Declaration { id: DeclarationId(1179), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2314), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4703, 5192) }); + declarations.push(Declaration { id: DeclarationId(1180), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2314), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5194, 5725) }); + declarations.push(Declaration { id: DeclarationId(1181), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), value: DeclarationId(1046) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2462)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Reference(DeclarationId(1177)), FieldValue::Reference(DeclarationId(1178)), FieldValue::Reference(DeclarationId(1179)), FieldValue::Reference(DeclarationId(1180)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5728, 8449) }); declarations.push(Declaration { - id: DeclarationId(1181), + id: DeclarationId(1182), name: Some("InputField".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -39282,7 +39319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 3686, 3704), }); declarations.push(Declaration { - id: DeclarationId(1182), + id: DeclarationId(1183), name: Some("RestEndpointBinding".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -39292,7 +39329,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "path".to_string(), - ty: DeclarationId(730), + ty: DeclarationId(731), }, ], }, @@ -39307,12 +39344,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 4616, 4688), }); declarations.push(Declaration { - id: DeclarationId(1183), + id: DeclarationId(1184), name: Some("CallableRef".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "decl".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }], }, type_params: vec![], @@ -39326,21 +39363,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 5496, 5539), }); declarations.push(Declaration { - id: DeclarationId(1184), + id: DeclarationId(1185), name: Some("Operation".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "callable".to_string(), - ty: DeclarationId(1183), + ty: DeclarationId(1184), }, Field { label: "inputs".to_string(), - ty: DeclarationId(2462), + ty: DeclarationId(2463), }, Field { label: "endpoint".to_string(), - ty: DeclarationId(1182), + ty: DeclarationId(1183), }, ], }, @@ -39355,15 +39392,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 6748, 6858), }); declarations.push(Declaration { - id: DeclarationId(1185), + id: DeclarationId(1186), name: Some("modeled_gunbc_ci_workflow".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1715), + template: DeclarationId(1716), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1715)), + meta_tag: Some(DeclarationId(1716)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -39376,11 +39413,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 1195, 2378), }); declarations.push(Declaration { - id: DeclarationId(1186), + id: DeclarationId(1187), name: Some("ci_demo_timing_read".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(826)], - output: DeclarationId(2463), + inputs: vec![DeclarationId(828), DeclarationId(827)], + output: DeclarationId(2464), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(597))), }, type_params: vec![], @@ -39394,11 +39431,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2891, 4150), }); declarations.push(Declaration { - id: DeclarationId(1187), + id: DeclarationId(1188), name: Some("ci_wad_modeled_workflow_timing_witness".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(826)], - output: DeclarationId(2464), + inputs: vec![DeclarationId(828), DeclarationId(827)], + output: DeclarationId(2465), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(599))), }, type_params: vec![], @@ -39412,11 +39449,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4444, 4566), }); declarations.push(Declaration { - id: DeclarationId(1188), + id: DeclarationId(1189), name: Some("_ci_wad_seed_list_declaration_empty".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(2465), + output: DeclarationId(2466), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(601))), }, type_params: vec![], @@ -39430,11 +39467,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4760, 4829), }); declarations.push(Declaration { - id: DeclarationId(1189), + id: DeclarationId(1190), name: Some("_ci_wad_seed_list_behavior_empty".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(2466), + output: DeclarationId(2467), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(603))), }, type_params: vec![], @@ -39448,11 +39485,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4831, 4894), }); declarations.push(Declaration { - id: DeclarationId(1190), + id: DeclarationId(1191), name: Some("_ci_wad_seed_list_dagport_empty".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(2467), + output: DeclarationId(2468), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(605))), }, type_params: vec![], @@ -39466,11 +39503,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4896, 4957), }); declarations.push(Declaration { - id: DeclarationId(1191), + id: DeclarationId(1192), name: Some("_ci_wad_seed_list_cluster_empty".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(2468), + output: DeclarationId(2469), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(607))), }, type_params: vec![], @@ -39484,11 +39521,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4959, 5020), }); declarations.push(Declaration { - id: DeclarationId(1192), + id: DeclarationId(1193), name: Some("_ci_wad_empty_list_diagnostic".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(2469), + output: DeclarationId(2470), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(609))), }, type_params: vec![], @@ -39502,11 +39539,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5022, 5084), }); declarations.push(Declaration { - id: DeclarationId(1193), + id: DeclarationId(1194), name: Some("_ci_wad_empty_list_witness_tm".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(2471), + output: DeclarationId(2472), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(611))), }, type_params: vec![], @@ -39520,11 +39557,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5086, 5164), }); declarations.push(Declaration { - id: DeclarationId(1194), + id: DeclarationId(1195), name: Some("_ci_wad_witnesses_singleton_tm".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1228)], - output: DeclarationId(2473), + inputs: vec![DeclarationId(1229)], + output: DeclarationId(2474), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(615))), }, type_params: vec![], @@ -39538,11 +39575,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5166, 5327), }); declarations.push(Declaration { - id: DeclarationId(1195), + id: DeclarationId(1196), name: Some("_ci_wad_violations_singleton".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(973)], - output: DeclarationId(2474), + inputs: vec![DeclarationId(974)], + output: DeclarationId(2475), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(618))), }, type_params: vec![], @@ -39556,11 +39593,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5329, 5461), }); declarations.push(Declaration { - id: DeclarationId(1196), + id: DeclarationId(1197), name: Some("_ci_wad_dimension_ok_tm_payload".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1228)], - output: DeclarationId(2475), + inputs: vec![DeclarationId(1229)], + output: DeclarationId(2476), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(622))), }, type_params: vec![], @@ -39574,11 +39611,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5463, 5687), }); declarations.push(Declaration { - id: DeclarationId(1197), + id: DeclarationId(1198), name: Some("_ci_wad_dimension_fail_tm_payload".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1228), DeclarationId(973)], - output: DeclarationId(2476), + inputs: vec![DeclarationId(1229), DeclarationId(974)], + output: DeclarationId(2477), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(627))), }, type_params: vec![], @@ -39592,11 +39629,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5689, 5970), }); declarations.push(Declaration { - id: DeclarationId(1198), + id: DeclarationId(1199), name: Some("report_dim_ok_tm".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(1228)], - output: DeclarationId(2477), + inputs: vec![DeclarationId(828), DeclarationId(1229)], + output: DeclarationId(2478), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(634))), }, type_params: vec![], @@ -39610,11 +39647,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6235, 6474), }); declarations.push(Declaration { - id: DeclarationId(1199), + id: DeclarationId(1200), name: Some("report_dim_fail_tm".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(1228), DeclarationId(973)], - output: DeclarationId(2478), + inputs: vec![DeclarationId(828), DeclarationId(1229), DeclarationId(974)], + output: DeclarationId(2479), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(641))), }, type_params: vec![], @@ -39628,11 +39665,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6476, 6751), }); declarations.push(Declaration { - id: DeclarationId(1200), + id: DeclarationId(1201), name: Some("report_inhabits_branch_tm".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(1228), DeclarationId(977)], - output: DeclarationId(2479), + inputs: vec![DeclarationId(828), DeclarationId(1229), DeclarationId(978)], + output: DeclarationId(2480), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(646))), }, type_params: vec![], @@ -39646,11 +39683,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6753, 7004), }); declarations.push(Declaration { - id: DeclarationId(1201), + id: DeclarationId(1202), name: Some("dimension_report_tm_from_witness".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(2480)], - output: DeclarationId(2481), + inputs: vec![DeclarationId(828), DeclarationId(2481)], + output: DeclarationId(2482), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(656))), }, type_params: vec![], @@ -39664,11 +39701,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7006, 7425), }); declarations.push(Declaration { - id: DeclarationId(1202), + id: DeclarationId(1203), name: Some("demo_ci_modeled_timing_dimension_report".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(826)], - output: DeclarationId(2482), + inputs: vec![DeclarationId(828), DeclarationId(827)], + output: DeclarationId(2483), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(664))), }, type_params: vec![], @@ -39682,21 +39719,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8286, 8587), }); declarations.push(Declaration { - id: DeclarationId(1203), + id: DeclarationId(1204), name: Some("DescentEvidence".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Strict".to_string(), - ty: DeclarationId(2512), + ty: DeclarationId(2513), }, Field { label: "NonIncreasing".to_string(), - ty: DeclarationId(2513), + ty: DeclarationId(2514), }, Field { label: "DescentUnknown".to_string(), - ty: DeclarationId(2514), + ty: DeclarationId(2515), }, ], }, @@ -39711,10 +39748,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 742, 810), }); declarations.push(Declaration { - id: DeclarationId(1204), + id: DeclarationId(1205), name: Some("evidence_rank".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1203)], + inputs: vec![DeclarationId(1204)], output: DeclarationId(93), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 856, 938)), }, @@ -39729,11 +39766,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 812, 938), }); declarations.push(Declaration { - id: DeclarationId(1205), + id: DeclarationId(1206), name: Some("merge_evidence".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1203), DeclarationId(1203)], - output: DeclarationId(1203), + inputs: vec![DeclarationId(1204), DeclarationId(1204)], + output: DeclarationId(1204), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 1082, @@ -39751,11 +39788,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 1005, 1410), }); declarations.push(Declaration { - id: DeclarationId(1206), + id: DeclarationId(1207), name: Some("join_evidence".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1203), DeclarationId(1203)], - output: DeclarationId(1203), + inputs: vec![DeclarationId(1204), DeclarationId(1204)], + output: DeclarationId(1204), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 1556, @@ -39773,11 +39810,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 1480, 1755), }); declarations.push(Declaration { - id: DeclarationId(1207), + id: DeclarationId(1208), name: Some("promote_to_strict".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1203)], - output: DeclarationId(1203), + inputs: vec![DeclarationId(1204)], + output: DeclarationId(1204), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2217, @@ -39795,11 +39832,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2150, 2336), }); declarations.push(Declaration { - id: DeclarationId(1208), + id: DeclarationId(1209), name: Some("optional_evidence_meet".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(2504), DeclarationId(2505)], - output: DeclarationId(2506), + inputs: vec![DeclarationId(2505), DeclarationId(2506)], + output: DeclarationId(2507), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2488, @@ -39817,11 +39854,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2400, 2664), }); declarations.push(Declaration { - id: DeclarationId(1209), + id: DeclarationId(1210), name: Some("map_evidence_merge_at".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(2507), DeclarationId(230), DeclarationId(1203)], - output: DeclarationId(2508), + inputs: vec![DeclarationId(2508), DeclarationId(230), DeclarationId(1204)], + output: DeclarationId(2509), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2833, @@ -39839,29 +39876,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2701, 3007), }); declarations.push(Declaration { - id: DeclarationId(1210), + id: DeclarationId(1211), name: Some("RankingDimension".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TreeSize".to_string(), - ty: DeclarationId(2515), + ty: DeclarationId(2516), }, Field { label: "ListLength".to_string(), - ty: DeclarationId(2516), + ty: DeclarationId(2517), }, Field { label: "ArithmeticValue".to_string(), - ty: DeclarationId(2517), + ty: DeclarationId(2518), }, Field { label: "TokenPosition".to_string(), - ty: DeclarationId(2518), + ty: DeclarationId(2519), }, Field { label: "SetCardinality".to_string(), - ty: DeclarationId(2519), + ty: DeclarationId(2520), }, ], }, @@ -39876,17 +39913,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3306, 3502), }); declarations.push(Declaration { - id: DeclarationId(1211), + id: DeclarationId(1212), name: Some("PositiveDescentAmount".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "OneStep".to_string(), - ty: DeclarationId(2520), + ty: DeclarationId(2521), }, Field { label: "AdditionalStep".to_string(), - ty: DeclarationId(2521), + ty: DeclarationId(2522), }, ], }, @@ -39901,10 +39938,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4478, 4571), }); declarations.push(Declaration { - id: DeclarationId(1212), + id: DeclarationId(1213), name: Some("positive_descent_count".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1211)], + inputs: vec![DeclarationId(1212)], output: DeclarationId(93), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", @@ -39923,17 +39960,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4818, 4989), }); declarations.push(Declaration { - id: DeclarationId(1213), + id: DeclarationId(1214), name: Some("ProportionalDivisor".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "DivideByTwo".to_string(), - ty: DeclarationId(2522), + ty: DeclarationId(2523), }, Field { label: "StrictlyLarger".to_string(), - ty: DeclarationId(2523), + ty: DeclarationId(2524), }, ], }, @@ -39948,10 +39985,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5455, 5545), }); declarations.push(Declaration { - id: DeclarationId(1214), + id: DeclarationId(1215), name: Some("proportional_divisor_to_int".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1213)], + inputs: vec![DeclarationId(1214)], output: DeclarationId(93), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", @@ -39970,7 +40007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5547, 5722), }); declarations.push(Declaration { - id: DeclarationId(1215), + id: DeclarationId(1216), name: Some("peano_literal_materialization_cap".to_string()), connective: TypeConnective::Arrow { inputs: vec![], @@ -39992,11 +40029,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5906, 5959), }); declarations.push(Declaration { - id: DeclarationId(1216), + id: DeclarationId(1217), name: Some("positive_descent_amount_from_positive_int".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93)], - output: DeclarationId(2509), + output: DeclarationId(2510), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 6420, @@ -40014,11 +40051,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6341, 6780), }); declarations.push(Declaration { - id: DeclarationId(1217), + id: DeclarationId(1218), name: Some("proportional_divisor_from_int_at_least_two".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93)], - output: DeclarationId(2510), + output: DeclarationId(2511), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 6860, @@ -40036,37 +40073,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6782, 7221), }); declarations.push(Declaration { - id: DeclarationId(1218), + id: DeclarationId(1219), name: Some("DescentSource".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ChildAccessor".to_string(), - ty: DeclarationId(2524), + ty: DeclarationId(2525), }, Field { label: "ListShrink".to_string(), - ty: DeclarationId(2525), + ty: DeclarationId(2526), }, Field { label: "ArithmeticSubtractDescent".to_string(), - ty: DeclarationId(2526), + ty: DeclarationId(2527), }, Field { label: "ArithmeticDivideDescent".to_string(), - ty: DeclarationId(2527), + ty: DeclarationId(2528), }, Field { label: "ParserAdvance".to_string(), - ty: DeclarationId(2528), + ty: DeclarationId(2529), }, Field { label: "SetRemoval".to_string(), - ty: DeclarationId(2529), + ty: DeclarationId(2530), }, Field { label: "FoldIteration".to_string(), - ty: DeclarationId(2530), + ty: DeclarationId(2531), }, ], }, @@ -40081,12 +40118,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7626, 7947), }); declarations.push(Declaration { - id: DeclarationId(1219), + id: DeclarationId(1220), name: Some("TerminationProof".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "dimensions".to_string(), - ty: DeclarationId(2531), + ty: DeclarationId(2532), }], }, type_params: vec![], @@ -40100,7 +40137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7949, 8011), }); declarations.push(Declaration { - id: DeclarationId(1220), + id: DeclarationId(1221), name: Some("ProofEdge".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -40114,7 +40151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "evidence".to_string(), - ty: DeclarationId(2532), + ty: DeclarationId(2533), }, ], }, @@ -40129,12 +40166,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 8156, 8242), }); declarations.push(Declaration { - id: DeclarationId(1221), + id: DeclarationId(1222), name: Some("StrictEvidence".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "Strict".to_string(), - ty: DeclarationId(2533), + ty: DeclarationId(2534), }], }, type_params: vec![], @@ -40148,17 +40185,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 8716, 8746), }); declarations.push(Declaration { - id: DeclarationId(1222), + id: DeclarationId(1223), name: Some("NonStrictEvidence".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "NonIncreasing".to_string(), - ty: DeclarationId(2534), + ty: DeclarationId(2535), }, Field { label: "DescentUnknown".to_string(), - ty: DeclarationId(2535), + ty: DeclarationId(2536), }, ], }, @@ -40173,17 +40210,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 9112, 9171), }); declarations.push(Declaration { - id: DeclarationId(1223), + id: DeclarationId(1224), name: Some("DescentResidual".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "EvidenceUnknown".to_string(), - ty: DeclarationId(2536), + ty: DeclarationId(2537), }, Field { label: "EvidenceIncomplete".to_string(), - ty: DeclarationId(2537), + ty: DeclarationId(2538), }, ], }, @@ -40198,21 +40235,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 10238, 10320), }); declarations.push(Declaration { - id: DeclarationId(1224), + id: DeclarationId(1225), name: Some("DescentExecutionProof".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "cluster".to_string(), - ty: DeclarationId(724), + ty: DeclarationId(725), }, Field { label: "port".to_string(), - ty: DeclarationId(722), + ty: DeclarationId(723), }, Field { label: "per_path".to_string(), - ty: DeclarationId(2538), + ty: DeclarationId(2539), }, ], }, @@ -40227,11 +40264,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 11157, 11263), }); declarations.push(Declaration { - id: DeclarationId(1225), + id: DeclarationId(1226), name: Some("descent_execution_proof".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(724), DeclarationId(722)], - output: DeclarationId(2511), + inputs: vec![DeclarationId(828), DeclarationId(725), DeclarationId(723)], + output: DeclarationId(2512), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 12400, @@ -40249,7 +40286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 12279, 12439), }); declarations.push(Declaration { - id: DeclarationId(1226), + id: DeclarationId(1227), name: Some("timing_lens_module_path_witness".to_string()), connective: TypeConnective::Arrow { inputs: vec![], @@ -40267,7 +40304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 1391, 1472), }); declarations.push(Declaration { - id: DeclarationId(1227), + id: DeclarationId(1228), name: Some("Nanoseconds".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -40286,25 +40323,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 1933, 1966), }); declarations.push(Declaration { - id: DeclarationId(1228), + id: DeclarationId(1229), name: Some("TimingMeasurement".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Observed".to_string(), - ty: DeclarationId(2541), + ty: DeclarationId(2542), }, Field { label: "Unobserved".to_string(), - ty: DeclarationId(2542), + ty: DeclarationId(2543), }, Field { label: "Ambiguous".to_string(), - ty: DeclarationId(2543), + ty: DeclarationId(2544), }, Field { label: "Stale".to_string(), - ty: DeclarationId(2544), + ty: DeclarationId(2545), }, ], }, @@ -40319,13 +40356,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 3977, 4077), }); declarations.push(Declaration { - id: DeclarationId(1229), + id: DeclarationId(1230), name: Some("WorkflowObservationAnchor".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "subject_node".to_string(), - ty: DeclarationId(721), + ty: DeclarationId(722), }, Field { label: "artifact_digest".to_string(), @@ -40345,7 +40382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "attached_at_ns".to_string(), - ty: DeclarationId(1227), + ty: DeclarationId(1228), }, Field { label: "workflow_run_id".to_string(), @@ -40364,12 +40401,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 5538, 5787), }); declarations.push(Declaration { - id: DeclarationId(1230), + id: DeclarationId(1231), name: Some("TimingObservationSet".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "observations".to_string(), - ty: DeclarationId(2545), + ty: DeclarationId(2546), }], }, type_params: vec![], @@ -40383,17 +40420,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 5871, 5945), }); declarations.push(Declaration { - id: DeclarationId(1231), + id: DeclarationId(1232), name: Some("TimingObservationEntry".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "anchor".to_string(), - ty: DeclarationId(1229), + ty: DeclarationId(1230), }, Field { label: "measurement".to_string(), - ty: DeclarationId(1228), + ty: DeclarationId(1229), }, ], }, @@ -40408,12 +40445,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 5947, 6047), }); declarations.push(Declaration { - id: DeclarationId(1232), + id: DeclarationId(1233), name: Some("TimingBudget".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "max".to_string(), - ty: DeclarationId(1227), + ty: DeclarationId(1228), }], }, type_params: vec![], @@ -40427,11 +40464,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 6185, 6225), }); declarations.push(Declaration { - id: DeclarationId(1233), + id: DeclarationId(1234), name: Some("timing_measurement_unobserved".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1228), + output: DeclarationId(1229), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(668))), }, type_params: vec![], @@ -40445,11 +40482,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 6227, 6297), }); declarations.push(Declaration { - id: DeclarationId(1234), + id: DeclarationId(1235), name: Some("timing_measurement_lens_combine".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1228), DeclarationId(1228), DeclarationId(128)], - output: DeclarationId(1228), + inputs: vec![DeclarationId(1229), DeclarationId(1229), DeclarationId(128)], + output: DeclarationId(1229), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(700))), }, type_params: vec![], @@ -40463,11 +40500,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 6455, 7347), }); declarations.push(Declaration { - id: DeclarationId(1235), + id: DeclarationId(1236), name: Some("timing_sequential_op".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1228), DeclarationId(1228)], - output: DeclarationId(1228), + inputs: vec![DeclarationId(1229), DeclarationId(1229)], + output: DeclarationId(1229), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(703))), }, type_params: vec![], @@ -40481,11 +40518,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 7422, 7558), }); declarations.push(Declaration { - id: DeclarationId(1236), + id: DeclarationId(1237), name: Some("nanoseconds_zero".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1227), + output: DeclarationId(1228), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(706))), }, type_params: vec![], @@ -40499,11 +40536,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 7560, 7613), }); declarations.push(Declaration { - id: DeclarationId(1237), + id: DeclarationId(1238), name: Some("timing_sequential_identity".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1228), + output: DeclarationId(1229), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(709))), }, type_params: vec![], @@ -40517,11 +40554,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 7615, 7713), }); declarations.push(Declaration { - id: DeclarationId(1238), + id: DeclarationId(1239), name: Some("timing_branch_op".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1228), DeclarationId(1228)], - output: DeclarationId(1228), + inputs: vec![DeclarationId(1229), DeclarationId(1229)], + output: DeclarationId(1229), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(712))), }, type_params: vec![], @@ -40535,11 +40572,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 7773, 7906), }); declarations.push(Declaration { - id: DeclarationId(1239), + id: DeclarationId(1240), name: Some("timing_lens_empty_corrections".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(2539), + output: DeclarationId(2540), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(714))), }, type_params: vec![], @@ -40553,10 +40590,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 7908, 7972), }); declarations.push(Declaration { - id: DeclarationId(1240), + id: DeclarationId(1241), name: Some("timing_lens_behavior_span".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(826)], + inputs: vec![DeclarationId(827)], output: DeclarationId(159), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(721))), }, @@ -40571,11 +40608,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 8155, 8354), }); declarations.push(Declaration { - id: DeclarationId(1241), + id: DeclarationId(1242), name: Some("timing_lens_scaffold_non_evidence_diagnostic".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230), DeclarationId(159)], - output: DeclarationId(973), + output: DeclarationId(974), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(726))), }, type_params: vec![], @@ -40589,7 +40626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 8601, 8813), }); declarations.push(Declaration { - id: DeclarationId(1242), + id: DeclarationId(1243), name: Some("timing_lens_degenerate_empty_dag_span".to_string()), connective: TypeConnective::Arrow { inputs: vec![], @@ -40607,11 +40644,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 9047, 9181), }); declarations.push(Declaration { - id: DeclarationId(1243), + id: DeclarationId(1244), name: Some("timing_lens_validate_non_observed".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(230)], - output: DeclarationId(977), + inputs: vec![DeclarationId(828), DeclarationId(230)], + output: DeclarationId(978), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(747))), }, type_params: vec![], @@ -40625,11 +40662,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 9643, 10348), }); declarations.push(Declaration { - id: DeclarationId(1244), + id: DeclarationId(1245), name: Some("timing_measurement_iterate".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1228), DeclarationId(817)], - output: DeclarationId(1228), + inputs: vec![DeclarationId(1229), DeclarationId(818)], + output: DeclarationId(1229), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(756))), }, type_params: vec![], @@ -40643,11 +40680,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 10673, 11034), }); declarations.push(Declaration { - id: DeclarationId(1245), + id: DeclarationId(1246), name: Some("timing_lens_read".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(826)], - output: DeclarationId(2540), + inputs: vec![DeclarationId(828), DeclarationId(827)], + output: DeclarationId(2541), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(793))), }, type_params: vec![], @@ -40661,11 +40698,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 11811, 12637), }); declarations.push(Declaration { - id: DeclarationId(1246), + id: DeclarationId(1247), name: Some("timing_lens_validate".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(1228)], - output: DeclarationId(977), + inputs: vec![DeclarationId(828), DeclarationId(1229)], + output: DeclarationId(978), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(807))), }, type_params: vec![], @@ -40679,189 +40716,189 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 12639, 13484), }); declarations.push(Declaration { - id: DeclarationId(1247), + id: DeclarationId(1248), name: Some("TokenKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "KwLet".to_string(), - ty: DeclarationId(2557), + ty: DeclarationId(2558), }, Field { label: "KwIf".to_string(), - ty: DeclarationId(2558), + ty: DeclarationId(2559), }, Field { label: "KwThen".to_string(), - ty: DeclarationId(2559), + ty: DeclarationId(2560), }, Field { label: "KwElse".to_string(), - ty: DeclarationId(2560), + ty: DeclarationId(2561), }, Field { label: "KwFn".to_string(), - ty: DeclarationId(2561), + ty: DeclarationId(2562), }, Field { label: "KwType".to_string(), - ty: DeclarationId(2562), + ty: DeclarationId(2563), }, Field { label: "KwModule".to_string(), - ty: DeclarationId(2563), + ty: DeclarationId(2564), }, Field { label: "KwImport".to_string(), - ty: DeclarationId(2564), + ty: DeclarationId(2565), }, Field { label: "KwMatch".to_string(), - ty: DeclarationId(2565), + ty: DeclarationId(2566), }, Field { label: "KwData".to_string(), - ty: DeclarationId(2566), + ty: DeclarationId(2567), }, Field { label: "KwWhere".to_string(), - ty: DeclarationId(2567), + ty: DeclarationId(2568), }, Field { label: "KwTrue".to_string(), - ty: DeclarationId(2568), + ty: DeclarationId(2569), }, Field { label: "KwFalse".to_string(), - ty: DeclarationId(2569), + ty: DeclarationId(2570), }, Field { label: "Ident".to_string(), - ty: DeclarationId(2570), + ty: DeclarationId(2571), }, Field { label: "IntLit".to_string(), - ty: DeclarationId(2571), + ty: DeclarationId(2572), }, Field { label: "StringLit".to_string(), - ty: DeclarationId(2572), + ty: DeclarationId(2573), }, Field { label: "Eq".to_string(), - ty: DeclarationId(2573), + ty: DeclarationId(2574), }, Field { label: "EqEq".to_string(), - ty: DeclarationId(2574), + ty: DeclarationId(2575), }, Field { label: "NotEq".to_string(), - ty: DeclarationId(2575), + ty: DeclarationId(2576), }, Field { label: "Lt".to_string(), - ty: DeclarationId(2576), + ty: DeclarationId(2577), }, Field { label: "Le".to_string(), - ty: DeclarationId(2577), + ty: DeclarationId(2578), }, Field { label: "Gt".to_string(), - ty: DeclarationId(2578), + ty: DeclarationId(2579), }, Field { label: "Ge".to_string(), - ty: DeclarationId(2579), + ty: DeclarationId(2580), }, Field { label: "Plus".to_string(), - ty: DeclarationId(2580), + ty: DeclarationId(2581), }, Field { label: "Minus".to_string(), - ty: DeclarationId(2581), + ty: DeclarationId(2582), }, Field { label: "Star".to_string(), - ty: DeclarationId(2582), + ty: DeclarationId(2583), }, Field { label: "Slash".to_string(), - ty: DeclarationId(2583), + ty: DeclarationId(2584), }, Field { label: "AmpAmp".to_string(), - ty: DeclarationId(2584), + ty: DeclarationId(2585), }, Field { label: "PipePipe".to_string(), - ty: DeclarationId(2585), + ty: DeclarationId(2586), }, Field { label: "Colon".to_string(), - ty: DeclarationId(2586), + ty: DeclarationId(2587), }, Field { label: "Arrow".to_string(), - ty: DeclarationId(2587), + ty: DeclarationId(2588), }, Field { label: "FatArrow".to_string(), - ty: DeclarationId(2588), + ty: DeclarationId(2589), }, Field { label: "PipeArrow".to_string(), - ty: DeclarationId(2589), + ty: DeclarationId(2590), }, Field { label: "Dot".to_string(), - ty: DeclarationId(2590), + ty: DeclarationId(2591), }, Field { label: "LParen".to_string(), - ty: DeclarationId(2591), + ty: DeclarationId(2592), }, Field { label: "RParen".to_string(), - ty: DeclarationId(2592), + ty: DeclarationId(2593), }, Field { label: "LBrace".to_string(), - ty: DeclarationId(2593), + ty: DeclarationId(2594), }, Field { label: "RBrace".to_string(), - ty: DeclarationId(2594), + ty: DeclarationId(2595), }, Field { label: "LBracket".to_string(), - ty: DeclarationId(2595), + ty: DeclarationId(2596), }, Field { label: "RBracket".to_string(), - ty: DeclarationId(2596), + ty: DeclarationId(2597), }, Field { label: "Comma".to_string(), - ty: DeclarationId(2597), + ty: DeclarationId(2598), }, Field { label: "Semicolon".to_string(), - ty: DeclarationId(2598), + ty: DeclarationId(2599), }, Field { label: "Pipe".to_string(), - ty: DeclarationId(2599), + ty: DeclarationId(2600), }, Field { label: "Question".to_string(), - ty: DeclarationId(2600), + ty: DeclarationId(2601), }, Field { label: "Eof".to_string(), - ty: DeclarationId(2601), + ty: DeclarationId(2602), }, ], }, @@ -40876,13 +40913,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 627, 1220), }); declarations.push(Declaration { - id: DeclarationId(1248), + id: DeclarationId(1249), name: Some("Token".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "kind".to_string(), - ty: DeclarationId(1247), + ty: DeclarationId(1248), }, Field { label: "span".to_string(), @@ -40901,61 +40938,61 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1355, 1406), }); declarations.push(Declaration { - id: DeclarationId(1249), + id: DeclarationId(1250), name: Some("KeywordTokenKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "KwLet".to_string(), - ty: DeclarationId(2602), + ty: DeclarationId(2603), }, Field { label: "KwIf".to_string(), - ty: DeclarationId(2603), + ty: DeclarationId(2604), }, Field { label: "KwThen".to_string(), - ty: DeclarationId(2604), + ty: DeclarationId(2605), }, Field { label: "KwElse".to_string(), - ty: DeclarationId(2605), + ty: DeclarationId(2606), }, Field { label: "KwFn".to_string(), - ty: DeclarationId(2606), + ty: DeclarationId(2607), }, Field { label: "KwType".to_string(), - ty: DeclarationId(2607), + ty: DeclarationId(2608), }, Field { label: "KwModule".to_string(), - ty: DeclarationId(2608), + ty: DeclarationId(2609), }, Field { label: "KwImport".to_string(), - ty: DeclarationId(2609), + ty: DeclarationId(2610), }, Field { label: "KwMatch".to_string(), - ty: DeclarationId(2610), + ty: DeclarationId(2611), }, Field { label: "KwData".to_string(), - ty: DeclarationId(2611), + ty: DeclarationId(2612), }, Field { label: "KwWhere".to_string(), - ty: DeclarationId(2612), + ty: DeclarationId(2613), }, Field { label: "KwTrue".to_string(), - ty: DeclarationId(2613), + ty: DeclarationId(2614), }, Field { label: "KwFalse".to_string(), - ty: DeclarationId(2614), + ty: DeclarationId(2615), }, ], }, @@ -40970,121 +41007,121 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1765, 1931), }); declarations.push(Declaration { - id: DeclarationId(1250), + id: DeclarationId(1251), name: Some("PunctTokenKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Eq".to_string(), - ty: DeclarationId(2615), + ty: DeclarationId(2616), }, Field { label: "EqEq".to_string(), - ty: DeclarationId(2616), + ty: DeclarationId(2617), }, Field { label: "NotEq".to_string(), - ty: DeclarationId(2617), + ty: DeclarationId(2618), }, Field { label: "Lt".to_string(), - ty: DeclarationId(2618), + ty: DeclarationId(2619), }, Field { label: "Le".to_string(), - ty: DeclarationId(2619), + ty: DeclarationId(2620), }, Field { label: "Gt".to_string(), - ty: DeclarationId(2620), + ty: DeclarationId(2621), }, Field { label: "Ge".to_string(), - ty: DeclarationId(2621), + ty: DeclarationId(2622), }, Field { label: "Plus".to_string(), - ty: DeclarationId(2622), + ty: DeclarationId(2623), }, Field { label: "Minus".to_string(), - ty: DeclarationId(2623), + ty: DeclarationId(2624), }, Field { label: "Star".to_string(), - ty: DeclarationId(2624), + ty: DeclarationId(2625), }, Field { label: "Slash".to_string(), - ty: DeclarationId(2625), + ty: DeclarationId(2626), }, Field { label: "AmpAmp".to_string(), - ty: DeclarationId(2626), + ty: DeclarationId(2627), }, Field { label: "PipePipe".to_string(), - ty: DeclarationId(2627), + ty: DeclarationId(2628), }, Field { label: "Colon".to_string(), - ty: DeclarationId(2628), + ty: DeclarationId(2629), }, Field { label: "Arrow".to_string(), - ty: DeclarationId(2629), + ty: DeclarationId(2630), }, Field { label: "FatArrow".to_string(), - ty: DeclarationId(2630), + ty: DeclarationId(2631), }, Field { label: "PipeArrow".to_string(), - ty: DeclarationId(2631), + ty: DeclarationId(2632), }, Field { label: "Dot".to_string(), - ty: DeclarationId(2632), + ty: DeclarationId(2633), }, Field { label: "LParen".to_string(), - ty: DeclarationId(2633), + ty: DeclarationId(2634), }, Field { label: "RParen".to_string(), - ty: DeclarationId(2634), + ty: DeclarationId(2635), }, Field { label: "LBrace".to_string(), - ty: DeclarationId(2635), + ty: DeclarationId(2636), }, Field { label: "RBrace".to_string(), - ty: DeclarationId(2636), + ty: DeclarationId(2637), }, Field { label: "LBracket".to_string(), - ty: DeclarationId(2637), + ty: DeclarationId(2638), }, Field { label: "RBracket".to_string(), - ty: DeclarationId(2638), + ty: DeclarationId(2639), }, Field { label: "Comma".to_string(), - ty: DeclarationId(2639), + ty: DeclarationId(2640), }, Field { label: "Semicolon".to_string(), - ty: DeclarationId(2640), + ty: DeclarationId(2641), }, Field { label: "Pipe".to_string(), - ty: DeclarationId(2641), + ty: DeclarationId(2642), }, Field { label: "Question".to_string(), - ty: DeclarationId(2642), + ty: DeclarationId(2643), }, ], }, @@ -41099,7 +41136,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2347, 2653), }); declarations.push(Declaration { - id: DeclarationId(1251), + id: DeclarationId(1252), name: Some("LocalPunctSpec".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -41109,7 +41146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "kind".to_string(), - ty: DeclarationId(1250), + ty: DeclarationId(1251), }, ], }, @@ -41124,7 +41161,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2863, 2927), }); declarations.push(Declaration { - id: DeclarationId(1252), + id: DeclarationId(1253), name: Some("StringEscapeSpec".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -41149,7 +41186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 3314, 3380), }); declarations.push(Declaration { - id: DeclarationId(1253), + id: DeclarationId(1254), name: Some("Path".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(158), @@ -41166,7 +41203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1340, 1360), }); declarations.push(Declaration { - id: DeclarationId(1254), + id: DeclarationId(1255), name: Some("SnapshotRef".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(151), @@ -41183,7 +41220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1361, 1391), }); declarations.push(Declaration { - id: DeclarationId(1255), + id: DeclarationId(1256), name: Some("CensusListConstant".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -41197,15 +41234,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1528, 1554), }); declarations.push(Declaration { - id: DeclarationId(1256), + id: DeclarationId(1257), name: Some("expected_hand_authored_non_test".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1255), + template: DeclarationId(1256), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1255)), + meta_tag: Some(DeclarationId(1256)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -41214,15 +41251,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1556, 1617), }); declarations.push(Declaration { - id: DeclarationId(1257), + id: DeclarationId(1258), name: Some("expected_hand_authored_test".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1255), + template: DeclarationId(1256), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1255)), + meta_tag: Some(DeclarationId(1256)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -41231,7 +41268,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1618, 1675), }); declarations.push(Declaration { - id: DeclarationId(1258), + id: DeclarationId(1259), name: Some("LensProducerFilesSubsetPredicate".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -41245,15 +41282,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1807, 1847), }); declarations.push(Declaration { - id: DeclarationId(1259), + id: DeclarationId(1260), name: Some("lens_producer_files_subset_predicate".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1258), + template: DeclarationId(1259), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1258)), + meta_tag: Some(DeclarationId(1259)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -41262,7 +41299,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1849, 1929), }); declarations.push(Declaration { - id: DeclarationId(1260), + id: DeclarationId(1261), name: Some("CompilerStdPositiveSetRatchet".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -41276,15 +41313,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2008, 2045), }); declarations.push(Declaration { - id: DeclarationId(1261), + id: DeclarationId(1262), name: Some("compiler_std_positive_set_ratchet".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1260), + template: DeclarationId(1261), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1260)), + meta_tag: Some(DeclarationId(1261)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -41293,49 +41330,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2047, 2121), }); declarations.push(Declaration { - id: DeclarationId(1262), + id: DeclarationId(1263), name: Some("DiagnosticKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TokenizerError".to_string(), - ty: DeclarationId(2646), + ty: DeclarationId(2647), }, Field { label: "ParseError".to_string(), - ty: DeclarationId(2647), + ty: DeclarationId(2648), }, Field { label: "TypeMismatch".to_string(), - ty: DeclarationId(2648), + ty: DeclarationId(2649), }, Field { label: "ArityMismatch".to_string(), - ty: DeclarationId(2649), + ty: DeclarationId(2650), }, Field { label: "ResolveError".to_string(), - ty: DeclarationId(2650), + ty: DeclarationId(2651), }, Field { label: "UnitMismatch".to_string(), - ty: DeclarationId(2651), + ty: DeclarationId(2652), }, Field { label: "BranchConditionNotBool".to_string(), - ty: DeclarationId(2652), + ty: DeclarationId(2653), }, Field { label: "MagnitudeOutOfRange".to_string(), - ty: DeclarationId(2653), + ty: DeclarationId(2654), }, Field { label: "MalformedIntegerRangeFact".to_string(), - ty: DeclarationId(2654), + ty: DeclarationId(2655), }, Field { label: "NominalOpacityViolation".to_string(), - ty: DeclarationId(2655), + ty: DeclarationId(2656), }, ], }, @@ -41350,17 +41387,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2456, 2687), }); declarations.push(Declaration { - id: DeclarationId(1263), + id: DeclarationId(1264), name: Some("DiagnosticDetailExpectation".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "AnyDetail".to_string(), - ty: DeclarationId(2656), + ty: DeclarationId(2657), }, Field { label: "Contains".to_string(), - ty: DeclarationId(2657), + ty: DeclarationId(2658), }, ], }, @@ -41375,17 +41412,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3056, 3123), }); declarations.push(Declaration { - id: DeclarationId(1264), + id: DeclarationId(1265), name: Some("DiagnosticReference".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "kind".to_string(), - ty: DeclarationId(1262), + ty: DeclarationId(1263), }, Field { label: "detail_contains".to_string(), - ty: DeclarationId(1263), + ty: DeclarationId(1264), }, ], }, @@ -41400,17 +41437,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3267, 3365), }); declarations.push(Declaration { - id: DeclarationId(1265), + id: DeclarationId(1266), name: Some("PortStateExpectation".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Resolved".to_string(), - ty: DeclarationId(2658), + ty: DeclarationId(2659), }, Field { label: "Unresolved".to_string(), - ty: DeclarationId(2659), + ty: DeclarationId(2660), }, ], }, @@ -41425,12 +41462,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3752, 3805), }); declarations.push(Declaration { - id: DeclarationId(1266), + id: DeclarationId(1267), name: Some("PerfBudgetComparisonOp".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "AtMostBudget".to_string(), - ty: DeclarationId(2660), + ty: DeclarationId(2661), }], }, type_params: vec![], @@ -41444,21 +41481,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3998, 4042), }); declarations.push(Declaration { - id: DeclarationId(1267), + id: DeclarationId(1268), name: Some("AlgebraicLawKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Associativity".to_string(), - ty: DeclarationId(2661), + ty: DeclarationId(2662), }, Field { label: "Commutativity".to_string(), - ty: DeclarationId(2662), + ty: DeclarationId(2663), }, Field { label: "Identity".to_string(), - ty: DeclarationId(2663), + ty: DeclarationId(2664), }, ], }, @@ -41473,12 +41510,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4831, 4901), }); declarations.push(Declaration { - id: DeclarationId(1268), + id: DeclarationId(1269), name: Some("ProgramGenerator".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "generator".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }], }, type_params: vec![], @@ -41492,12 +41529,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5138, 5191), }); declarations.push(Declaration { - id: DeclarationId(1269), + id: DeclarationId(1270), name: Some("ProgramShape".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "LiteralProgram".to_string(), - ty: DeclarationId(2664), + ty: DeclarationId(2665), }], }, type_params: vec![], @@ -41511,105 +41548,105 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5424, 5513), }); declarations.push(Declaration { - id: DeclarationId(1270), + id: DeclarationId(1271), name: Some("TestPredicate".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Compiles".to_string(), - ty: DeclarationId(2665), + ty: DeclarationId(2666), }, Field { label: "FailsWithDiagnostic".to_string(), - ty: DeclarationId(2666), + ty: DeclarationId(2667), }, Field { label: "OutputEquals".to_string(), - ty: DeclarationId(2667), + ty: DeclarationId(2668), }, Field { label: "PortHasState".to_string(), - ty: DeclarationId(2668), + ty: DeclarationId(2669), }, Field { label: "DeclarationHasRefinement".to_string(), - ty: DeclarationId(2669), + ty: DeclarationId(2670), }, Field { label: "CostBounded".to_string(), - ty: DeclarationId(2670), + ty: DeclarationId(2671), }, Field { label: "BehavioralObservation".to_string(), - ty: DeclarationId(2671), + ty: DeclarationId(2672), }, Field { label: "MockBackedInvariant".to_string(), - ty: DeclarationId(2672), + ty: DeclarationId(2673), }, Field { label: "ExecuteCommand".to_string(), - ty: DeclarationId(2674), + ty: DeclarationId(2675), }, Field { label: "ForAllTargets".to_string(), - ty: DeclarationId(2676), + ty: DeclarationId(2677), }, Field { label: "LensOutputEquals".to_string(), - ty: DeclarationId(2677), + ty: DeclarationId(2678), }, Field { label: "DifferentialEquals".to_string(), - ty: DeclarationId(2678), + ty: DeclarationId(2679), }, Field { label: "SymbolicCostExprEquals".to_string(), - ty: DeclarationId(2679), + ty: DeclarationId(2680), }, Field { label: "PerfWithinBaseline".to_string(), - ty: DeclarationId(2680), + ty: DeclarationId(2681), }, Field { label: "BinaryDimensionReportEquals".to_string(), - ty: DeclarationId(2681), + ty: DeclarationId(2682), }, Field { label: "AlgebraicLaw".to_string(), - ty: DeclarationId(2682), + ty: DeclarationId(2683), }, Field { label: "CensusBoundCheck".to_string(), - ty: DeclarationId(2683), + ty: DeclarationId(2684), }, Field { label: "CensusSubsetCount".to_string(), - ty: DeclarationId(2684), + ty: DeclarationId(2685), }, Field { label: "FixedPointConverges".to_string(), - ty: DeclarationId(2685), + ty: DeclarationId(2686), }, Field { label: "RatchetZero".to_string(), - ty: DeclarationId(2686), + ty: DeclarationId(2687), }, Field { label: "GeneratedFromDag".to_string(), - ty: DeclarationId(2688), + ty: DeclarationId(2689), }, Field { label: "ReleaseDeferredClaim".to_string(), - ty: DeclarationId(2689), + ty: DeclarationId(2690), }, Field { label: "SubstrateResearchDeferredClaim".to_string(), - ty: DeclarationId(2690), + ty: DeclarationId(2691), }, Field { label: "BridgeLedgerZero".to_string(), - ty: DeclarationId(2691), + ty: DeclarationId(2692), }, ], }, @@ -41624,7 +41661,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5515, 16437), }); declarations.push(Declaration { - id: DeclarationId(1271), + id: DeclarationId(1272), name: Some("ProgramInput".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -41638,12 +41675,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 16545, 16565), }); declarations.push(Declaration { - id: DeclarationId(1272), + id: DeclarationId(1273), name: Some("ProgramOutputBind".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "output_ref".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }], }, type_params: vec![], @@ -41657,7 +41694,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 16708, 16763), }); declarations.push(Declaration { - id: DeclarationId(1273), + id: DeclarationId(1274), name: Some("TestClaim".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -41675,11 +41712,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "predicate".to_string(), - ty: DeclarationId(1270), + ty: DeclarationId(1271), }, Field { label: "requires".to_string(), - ty: DeclarationId(2692), + ty: DeclarationId(2693), }, ], }, @@ -41694,17 +41731,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 17373, 17506), }); declarations.push(Declaration { - id: DeclarationId(1274), + id: DeclarationId(1275), name: Some("Quantifier".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ForAll".to_string(), - ty: DeclarationId(2693), + ty: DeclarationId(2694), }, Field { label: "Exists".to_string(), - ty: DeclarationId(2694), + ty: DeclarationId(2695), }, ], }, @@ -41719,7 +41756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 17687, 17724), }); declarations.push(Declaration { - id: DeclarationId(1275), + id: DeclarationId(1276), name: Some("QuantifiedTestClaim".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -41729,19 +41766,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "generator".to_string(), - ty: DeclarationId(1268), + ty: DeclarationId(1269), }, Field { label: "quantifier".to_string(), - ty: DeclarationId(1274), + ty: DeclarationId(1275), }, Field { label: "predicate".to_string(), - ty: DeclarationId(1270), + ty: DeclarationId(1271), }, Field { label: "requires".to_string(), - ty: DeclarationId(2695), + ty: DeclarationId(2696), }, ], }, @@ -41756,17 +41793,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 17726, 17887), }); declarations.push(Declaration { - id: DeclarationId(1276), + id: DeclarationId(1277), name: Some("SuiteClaim".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Enumerated".to_string(), - ty: DeclarationId(2696), + ty: DeclarationId(2697), }, Field { label: "Quantified".to_string(), - ty: DeclarationId(2697), + ty: DeclarationId(2698), }, ], }, @@ -41781,7 +41818,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 18323, 18400), }); declarations.push(Declaration { - id: DeclarationId(1277), + id: DeclarationId(1278), name: Some("TestSuite".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -41791,7 +41828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "claims".to_string(), - ty: DeclarationId(2698), + ty: DeclarationId(2699), }, ], }, @@ -41806,7 +41843,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 18402, 18461), }); declarations.push(Declaration { - id: DeclarationId(1278), + id: DeclarationId(1279), name: Some("TestObligation".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -41816,7 +41853,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "resources".to_string(), - ty: DeclarationId(2699), + ty: DeclarationId(2700), }, ], }, @@ -41831,11 +41868,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 18659, 18740), }); declarations.push(Declaration { - id: DeclarationId(1279), + id: DeclarationId(1280), name: Some("claim_obligation_resources".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1273)], - output: DeclarationId(2643), + inputs: vec![DeclarationId(1274)], + output: DeclarationId(2644), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 19182, @@ -41853,11 +41890,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 19111, 19198), }); declarations.push(Declaration { - id: DeclarationId(1280), + id: DeclarationId(1281), name: Some("obligation_for_claim".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1273)], - output: DeclarationId(1278), + inputs: vec![DeclarationId(1274)], + output: DeclarationId(1279), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 19256, @@ -41875,11 +41912,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 19200, 19341), }); declarations.push(Declaration { - id: DeclarationId(1281), + id: DeclarationId(1282), name: Some("materialize_test_obligations".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(2644)], - output: DeclarationId(2645), + inputs: vec![DeclarationId(2645)], + output: DeclarationId(2646), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 19424, @@ -41897,11 +41934,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 19343, 19463), }); declarations.push(Declaration { - id: DeclarationId(1282), + id: DeclarationId(1283), name: Some("behavior_spine".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827)], - output: DeclarationId(2700), + inputs: vec![DeclarationId(828)], + output: DeclarationId(2701), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(809))), }, type_params: vec![], @@ -41915,7 +41952,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/workflows.dag", 963, 1018), }); declarations.push(Declaration { - id: DeclarationId(1283), + id: DeclarationId(1284), name: Some("ValueBehavior".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -41929,7 +41966,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2935, 2956), }); declarations.push(Declaration { - id: DeclarationId(1284), + id: DeclarationId(1285), name: Some("Transform".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -41943,7 +41980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2957, 2974), }); declarations.push(Declaration { - id: DeclarationId(1285), + id: DeclarationId(1286), name: Some("Branch".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -41957,7 +41994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2975, 2989), }); declarations.push(Declaration { - id: DeclarationId(1286), + id: DeclarationId(1287), name: Some("Loop".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -41971,7 +42008,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2990, 3002), }); declarations.push(Declaration { - id: DeclarationId(1287), + id: DeclarationId(1288), name: Some("Bind".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -41985,7 +42022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3003, 3015), }); declarations.push(Declaration { - id: DeclarationId(1288), + id: DeclarationId(1289), name: Some("Main".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -41999,7 +42036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3016, 3028), }); declarations.push(Declaration { - id: DeclarationId(1289), + id: DeclarationId(1290), name: Some("DeclarationRef".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -42013,15 +42050,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3761, 3783), }); declarations.push(Declaration { - id: DeclarationId(1290), + id: DeclarationId(1291), name: Some("go_execution_model".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(948), + template: DeclarationId(949), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(948)), + meta_tag: Some(DeclarationId(949)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -42029,14 +42066,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "memory".to_string(), FieldValue::Variant { - constructor: DeclarationId(2198), + constructor: DeclarationId(2199), payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { - constructor: DeclarationId(2201), + constructor: DeclarationId(2202), payload: vec![], }, ), @@ -42047,22 +42084,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2055, 2157), }); declarations.push(Declaration { - id: DeclarationId(1291), + id: DeclarationId(1292), name: Some("go_source_filtering".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(950), + template: DeclarationId(951), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(950)), + meta_tag: Some(DeclarationId(951)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "internal".to_string(), - FieldValue::Reference(DeclarationId(951)), + FieldValue::Reference(DeclarationId(952)), ), ( "additional_excluded_prefixes".to_string(), @@ -42077,15 +42114,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2159, 2309), }); declarations.push(Declaration { - id: DeclarationId(1292), + id: DeclarationId(1293), name: Some("go_execution_requirement".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(952), + template: DeclarationId(953), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(952)), + meta_tag: Some(DeclarationId(953)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -42098,22 +42135,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2311, 2386), }); declarations.push(Declaration { - id: DeclarationId(1293), + id: DeclarationId(1294), name: Some("go_int".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), @@ -42139,22 +42176,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2388, 2518), }); declarations.push(Declaration { - id: DeclarationId(1294), + id: DeclarationId(1295), name: Some("go_int32".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), @@ -42180,22 +42217,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2520, 2654), }); declarations.push(Declaration { - id: DeclarationId(1295), + id: DeclarationId(1296), name: Some("go_integer_inhabit_i32_at_program_bound".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "kernel_integer".to_string(), @@ -42208,17 +42245,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(2279), + constructor: DeclarationId(2280), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1877), + constructor: DeclarationId(1878), payload: vec![ FieldValue::Literal(LiteralBits::Int( "-2147483648".to_string(), )), FieldValue::Variant { - constructor: DeclarationId(1876), + constructor: DeclarationId(1877), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1874), + constructor: DeclarationId(1875), payload: vec![FieldValue::Literal(LiteralBits::Int( "4294967295".to_string(), ))], @@ -42230,7 +42267,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1294)), + FieldValue::Reference(DeclarationId(1295)), ), ], }), @@ -42239,22 +42276,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2656, 2959), }); declarations.push(Declaration { - id: DeclarationId(1296), + id: DeclarationId(1297), name: Some("go_integer_inhabit_int_platform_dependent".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "kernel_integer".to_string(), @@ -42267,13 +42304,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(2280), + constructor: DeclarationId(2281), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1293)), + FieldValue::Reference(DeclarationId(1294)), ), ], }), @@ -42282,22 +42319,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3397, 3598), }); declarations.push(Declaration { - id: DeclarationId(1297), + id: DeclarationId(1298), name: Some("go_bool".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), @@ -42323,22 +42360,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3600, 3731), }); declarations.push(Declaration { - id: DeclarationId(1298), + id: DeclarationId(1299), name: Some("go_string".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), @@ -42364,26 +42401,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3733, 3870), }); declarations.push(Declaration { - id: DeclarationId(1299), + id: DeclarationId(1300), name: Some("go_node_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(721)), + FieldValue::Reference(DeclarationId(722)), ), ( "carrier".to_string(), @@ -42405,26 +42442,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3872, 4010), }); declarations.push(Declaration { - id: DeclarationId(1300), + id: DeclarationId(1301), name: Some("go_port_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(722)), + FieldValue::Reference(DeclarationId(723)), ), ( "carrier".to_string(), @@ -42446,26 +42483,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4012, 4150), }); declarations.push(Declaration { - id: DeclarationId(1301), + id: DeclarationId(1302), name: Some("go_declaration_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(723)), + FieldValue::Reference(DeclarationId(724)), ), ( "carrier".to_string(), @@ -42487,26 +42524,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4152, 4311), }); declarations.push(Declaration { - id: DeclarationId(1302), + id: DeclarationId(1303), name: Some("go_cluster_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(724)), + FieldValue::Reference(DeclarationId(725)), ), ( "carrier".to_string(), @@ -42528,26 +42565,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4313, 4460), }); declarations.push(Declaration { - id: DeclarationId(1303), + id: DeclarationId(1304), name: Some("go_type_shape".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(778)), + FieldValue::Reference(DeclarationId(779)), ), ( "carrier".to_string(), @@ -42567,7 +42604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "declaration".to_string(), ))], @@ -42590,26 +42627,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4462, 4703), }); declarations.push(Declaration { - id: DeclarationId(1304), + id: DeclarationId(1305), name: Some("go_port_state".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(779)), + FieldValue::Reference(DeclarationId(780)), ), ( "carrier".to_string(), @@ -42631,26 +42668,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4705, 4853), }); declarations.push(Declaration { - id: DeclarationId(1305), + id: DeclarationId(1306), name: Some("go_port".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(780)), + FieldValue::Reference(DeclarationId(781)), ), ( "carrier".to_string(), @@ -42671,7 +42708,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -42690,7 +42727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "state".to_string(), ))], @@ -42711,7 +42748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "produced_by".to_string(), ))], @@ -42735,22 +42772,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4855, 5238), }); declarations.push(Declaration { - id: DeclarationId(1306), + id: DeclarationId(1307), name: Some("go_source_span".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), @@ -42775,7 +42812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "file".to_string(), ))], @@ -42794,7 +42831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_start".to_string(), ))], @@ -42813,7 +42850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_end".to_string(), ))], @@ -42837,26 +42874,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5240, 5634), }); declarations.push(Declaration { - id: DeclarationId(1307), + id: DeclarationId(1308), name: Some("go_literal_bits".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(781)), + FieldValue::Reference(DeclarationId(782)), ), ( "carrier".to_string(), @@ -42878,26 +42915,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5636, 5790), }); declarations.push(Declaration { - id: DeclarationId(1308), + id: DeclarationId(1309), name: Some("go_atom_payload".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(782)), + FieldValue::Reference(DeclarationId(783)), ), ( "carrier".to_string(), @@ -42919,26 +42956,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5792, 5946), }); declarations.push(Declaration { - id: DeclarationId(1309), + id: DeclarationId(1310), name: Some("go_cardinality_bound".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(789)), + FieldValue::Reference(DeclarationId(790)), ), ( "carrier".to_string(), @@ -42960,26 +42997,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5948, 6117), }); declarations.push(Declaration { - id: DeclarationId(1310), + id: DeclarationId(1311), name: Some("go_interval".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(785)), + FieldValue::Reference(DeclarationId(786)), ), ( "carrier".to_string(), @@ -43001,26 +43038,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 6119, 6263), }); declarations.push(Declaration { - id: DeclarationId(1311), + id: DeclarationId(1312), name: Some("go_positive_interval_width".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(783)), + FieldValue::Reference(DeclarationId(784)), ), ( "carrier".to_string(), @@ -43044,26 +43081,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 6265, 6450), }); declarations.push(Declaration { - id: DeclarationId(1312), + id: DeclarationId(1313), name: Some("go_interval_width".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(784)), + FieldValue::Reference(DeclarationId(785)), ), ( "carrier".to_string(), @@ -43085,26 +43122,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 6452, 6612), }); declarations.push(Declaration { - id: DeclarationId(1313), + id: DeclarationId(1314), name: Some("go_conj_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(790)), + FieldValue::Reference(DeclarationId(791)), ), ( "carrier".to_string(), @@ -43125,7 +43162,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -43144,7 +43181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -43168,26 +43205,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 6614, 6916), }); declarations.push(Declaration { - id: DeclarationId(1314), + id: DeclarationId(1315), name: Some("go_template_argument".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(791)), + FieldValue::Reference(DeclarationId(792)), ), ( "carrier".to_string(), @@ -43210,7 +43247,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -43229,7 +43266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -43253,26 +43290,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 6918, 7255), }); declarations.push(Declaration { - id: DeclarationId(1315), + id: DeclarationId(1316), name: Some("go_phantom_parameter".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(799)), + FieldValue::Reference(DeclarationId(800)), ), ( "carrier".to_string(), @@ -43295,7 +43332,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -43314,7 +43351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "algebra".to_string(), ))], @@ -43338,26 +43375,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 7257, 7598), }); declarations.push(Declaration { - id: DeclarationId(1316), + id: DeclarationId(1317), name: Some("go_nominal_opacity".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(800)), + FieldValue::Reference(DeclarationId(801)), ), ( "carrier".to_string(), @@ -43379,7 +43416,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "permitted_accessors".to_string(), ))], @@ -43402,26 +43439,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 7600, 7872), }); declarations.push(Declaration { - id: DeclarationId(1317), + id: DeclarationId(1318), name: Some("go_field_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(792)), + FieldValue::Reference(DeclarationId(793)), ), ( "carrier".to_string(), @@ -43442,7 +43479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -43461,7 +43498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -43485,26 +43522,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 7874, 8185), }); declarations.push(Declaration { - id: DeclarationId(1318), + id: DeclarationId(1319), name: Some("go_non_empty_list".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(725)), + FieldValue::Reference(DeclarationId(726)), ), ( "carrier".to_string(), @@ -43525,7 +43562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -43544,7 +43581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -43568,26 +43605,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 8187, 8503), }); declarations.push(Declaration { - id: DeclarationId(1319), + id: DeclarationId(1320), name: Some("go_non_singleton_list".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(727)), + FieldValue::Reference(DeclarationId(728)), ), ( "carrier".to_string(), @@ -43608,7 +43645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -43627,7 +43664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "second".to_string(), ))], @@ -43646,7 +43683,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -43670,26 +43707,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 8505, 8914), }); declarations.push(Declaration { - id: DeclarationId(1320), + id: DeclarationId(1321), name: Some("go_param_ref".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(810)), + FieldValue::Reference(DeclarationId(811)), ), ( "carrier".to_string(), @@ -43710,7 +43747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "member_of".to_string(), ))], @@ -43729,7 +43766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "slot_of".to_string(), ))], @@ -43753,26 +43790,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 8916, 9232), }); declarations.push(Declaration { - id: DeclarationId(1321), + id: DeclarationId(1322), name: Some("go_transform_ref".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(811)), + FieldValue::Reference(DeclarationId(812)), ), ( "carrier".to_string(), @@ -43792,7 +43829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "node_id".to_string(), ))], @@ -43815,26 +43852,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9234, 9475), }); declarations.push(Declaration { - id: DeclarationId(1322), + id: DeclarationId(1323), name: Some("go_member_descent".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(814)), + FieldValue::Reference(DeclarationId(815)), ), ( "carrier".to_string(), @@ -43854,7 +43891,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "param".to_string(), ))], @@ -43877,26 +43914,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9477, 9718), }); declarations.push(Declaration { - id: DeclarationId(1323), + id: DeclarationId(1324), name: Some("go_intra_cluster_call".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(815)), + FieldValue::Reference(DeclarationId(816)), ), ( "carrier".to_string(), @@ -43916,7 +43953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "transform".to_string(), ))], @@ -43939,26 +43976,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9720, 9979), }); declarations.push(Declaration { - id: DeclarationId(1324), + id: DeclarationId(1325), name: Some("go_cluster".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(816)), + FieldValue::Reference(DeclarationId(817)), ), ( "carrier".to_string(), @@ -43979,7 +44016,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "members".to_string(), ))], @@ -44000,7 +44037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "intra_cluster_calls".to_string(), ))], @@ -44024,26 +44061,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9981, 10314), }); declarations.push(Declaration { - id: DeclarationId(1325), + id: DeclarationId(1326), name: Some("go_field_value".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(793)), + FieldValue::Reference(DeclarationId(794)), ), ( "carrier".to_string(), @@ -44065,26 +44102,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 10316, 10467), }); declarations.push(Declaration { - id: DeclarationId(1326), + id: DeclarationId(1327), name: Some("go_value_body".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(794)), + FieldValue::Reference(DeclarationId(795)), ), ( "carrier".to_string(), @@ -44106,26 +44143,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 10469, 10617), }); declarations.push(Declaration { - id: DeclarationId(1327), + id: DeclarationId(1328), name: Some("go_arrow_body".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(796)), + FieldValue::Reference(DeclarationId(797)), ), ( "carrier".to_string(), @@ -44147,26 +44184,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 10619, 10767), }); declarations.push(Declaration { - id: DeclarationId(1328), + id: DeclarationId(1329), name: Some("go_type_connective".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(797)), + FieldValue::Reference(DeclarationId(798)), ), ( "carrier".to_string(), @@ -44188,26 +44225,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 10769, 10932), }); declarations.push(Declaration { - id: DeclarationId(1329), + id: DeclarationId(1330), name: Some("go_declaration".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(798)), + FieldValue::Reference(DeclarationId(799)), ), ( "carrier".to_string(), @@ -44228,7 +44265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -44247,7 +44284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -44268,7 +44305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "connective".to_string(), ))], @@ -44289,7 +44326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "type_params".to_string(), ))], @@ -44310,7 +44347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "phantom_params".to_string(), ))], @@ -44331,7 +44368,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "meta_tag".to_string(), ))], @@ -44352,7 +44389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "inhabits".to_string(), ))], @@ -44373,7 +44410,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "value_body".to_string(), ))], @@ -44394,7 +44431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "nominal_opacity".to_string(), ))], @@ -44413,7 +44450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -44437,26 +44474,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 10934, 11951), }); declarations.push(Declaration { - id: DeclarationId(1330), + id: DeclarationId(1331), name: Some("go_arithmetic_op".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(801)), + FieldValue::Reference(DeclarationId(802)), ), ( "carrier".to_string(), @@ -44478,26 +44515,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 11953, 12110), }); declarations.push(Declaration { - id: DeclarationId(1331), + id: DeclarationId(1332), name: Some("go_comparison_op".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(802)), + FieldValue::Reference(DeclarationId(803)), ), ( "carrier".to_string(), @@ -44519,26 +44556,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 12112, 12269), }); declarations.push(Declaration { - id: DeclarationId(1332), + id: DeclarationId(1333), name: Some("go_logical_op".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(804)), + FieldValue::Reference(DeclarationId(805)), ), ( "carrier".to_string(), @@ -44560,26 +44597,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 12271, 12419), }); declarations.push(Declaration { - id: DeclarationId(1333), + id: DeclarationId(1334), name: Some("go_operator_kind".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(805)), + FieldValue::Reference(DeclarationId(806)), ), ( "carrier".to_string(), @@ -44601,26 +44638,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 12421, 12578), }); declarations.push(Declaration { - id: DeclarationId(1334), + id: DeclarationId(1335), name: Some("go_transform_target".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(806)), + FieldValue::Reference(DeclarationId(807)), ), ( "carrier".to_string(), @@ -44642,26 +44679,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 12580, 12746), }); declarations.push(Declaration { - id: DeclarationId(1335), + id: DeclarationId(1336), name: Some("go_branch_pattern".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(807)), + FieldValue::Reference(DeclarationId(808)), ), ( "carrier".to_string(), @@ -44683,26 +44720,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 12748, 12908), }); declarations.push(Declaration { - id: DeclarationId(1336), + id: DeclarationId(1337), name: Some("go_payload_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(808)), + FieldValue::Reference(DeclarationId(809)), ), ( "carrier".to_string(), @@ -44725,7 +44762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "binding_name".to_string(), ))], @@ -44746,7 +44783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "payload_port".to_string(), ))], @@ -44770,26 +44807,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 12910, 13261), }); declarations.push(Declaration { - id: DeclarationId(1337), + id: DeclarationId(1338), name: Some("go_branch_path".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(809)), + FieldValue::Reference(DeclarationId(810)), ), ( "carrier".to_string(), @@ -44810,7 +44847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -44831,7 +44868,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -44850,7 +44887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -44869,7 +44906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -44893,26 +44930,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 13263, 13750), }); declarations.push(Declaration { - id: DeclarationId(1338), + id: DeclarationId(1339), name: Some("go_loop_bound".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(817)), + FieldValue::Reference(DeclarationId(818)), ), ( "carrier".to_string(), @@ -44934,26 +44971,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 13752, 13900), }); declarations.push(Declaration { - id: DeclarationId(1339), + id: DeclarationId(1340), name: Some("go_value_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(819)), + FieldValue::Reference(DeclarationId(820)), ), ( "carrier".to_string(), @@ -44974,7 +45011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -44993,7 +45030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -45014,7 +45051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -45033,7 +45070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -45057,26 +45094,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 14374, 14848), }); declarations.push(Declaration { - id: DeclarationId(1340), + id: DeclarationId(1341), name: Some("go_transform_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(820)), + FieldValue::Reference(DeclarationId(821)), ), ( "carrier".to_string(), @@ -45097,7 +45134,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -45116,7 +45153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "target".to_string(), ))], @@ -45135,7 +45172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "inputs".to_string(), ))], @@ -45156,7 +45193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -45175,7 +45212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -45199,26 +45236,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 14850, 15415), }); declarations.push(Declaration { - id: DeclarationId(1341), + id: DeclarationId(1342), name: Some("go_branch_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(822)), + FieldValue::Reference(DeclarationId(823)), ), ( "carrier".to_string(), @@ -45239,7 +45276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -45258,7 +45295,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "input".to_string(), ))], @@ -45277,7 +45314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "paths".to_string(), ))], @@ -45298,7 +45335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -45317,7 +45354,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -45338,7 +45375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -45362,26 +45399,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 15417, 16074), }); declarations.push(Declaration { - id: DeclarationId(1342), + id: DeclarationId(1343), name: Some("go_loop_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(823)), + FieldValue::Reference(DeclarationId(824)), ), ( "carrier".to_string(), @@ -45402,7 +45439,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -45421,7 +45458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "source".to_string(), ))], @@ -45440,7 +45477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "init".to_string(), ))], @@ -45459,7 +45496,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -45478,7 +45515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "bound".to_string(), ))], @@ -45499,7 +45536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -45518,7 +45555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -45542,26 +45579,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 16076, 16778), }); declarations.push(Declaration { - id: DeclarationId(1343), + id: DeclarationId(1344), name: Some("go_bind_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(825)), + FieldValue::Reference(DeclarationId(826)), ), ( "carrier".to_string(), @@ -45582,7 +45619,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -45601,7 +45638,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -45622,7 +45659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -45641,7 +45678,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "params".to_string(), ))], @@ -45660,7 +45697,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -45681,7 +45718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -45705,26 +45742,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 16780, 17431), }); declarations.push(Declaration { - id: DeclarationId(1344), + id: DeclarationId(1345), name: Some("go_behavior".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(826)), + FieldValue::Reference(DeclarationId(827)), ), ( "carrier".to_string(), @@ -45746,26 +45783,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 17433, 17577), }); declarations.push(Declaration { - id: DeclarationId(1345), + id: DeclarationId(1346), name: Some("go_dag".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(827)), + FieldValue::Reference(DeclarationId(828)), ), ( "carrier".to_string(), @@ -45788,7 +45825,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "declarations".to_string(), ))], @@ -45807,7 +45844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "nodes".to_string(), ))], @@ -45826,7 +45863,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "ports".to_string(), ))], @@ -45847,7 +45884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "clusters".to_string(), ))], @@ -45871,26 +45908,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 17579, 18046), }); declarations.push(Declaration { - id: DeclarationId(1346), + id: DeclarationId(1347), name: Some("go_surface_module".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1139)), + FieldValue::Reference(DeclarationId(1140)), ), ( "carrier".to_string(), @@ -45910,7 +45947,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "items".to_string(), ))], @@ -45933,26 +45970,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 18349, 18590), }); declarations.push(Declaration { - id: DeclarationId(1347), + id: DeclarationId(1348), name: Some("go_surface_item".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1152)), + FieldValue::Reference(DeclarationId(1153)), ), ( "carrier".to_string(), @@ -45974,26 +46011,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 18592, 18746), }); declarations.push(Declaration { - id: DeclarationId(1348), + id: DeclarationId(1349), name: Some("go_surface_param".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1140)), + FieldValue::Reference(DeclarationId(1141)), ), ( "carrier".to_string(), @@ -46014,7 +46051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -46033,7 +46070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -46054,7 +46091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "refinement".to_string(), ))], @@ -46078,26 +46115,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 18748, 19146), }); declarations.push(Declaration { - id: DeclarationId(1349), + id: DeclarationId(1350), name: Some("go_surface_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1141)), + FieldValue::Reference(DeclarationId(1142)), ), ( "carrier".to_string(), @@ -46118,7 +46155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -46137,7 +46174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -46161,26 +46198,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 19148, 19457), }); declarations.push(Declaration { - id: DeclarationId(1350), + id: DeclarationId(1351), name: Some("go_surface_variant".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1142)), + FieldValue::Reference(DeclarationId(1143)), ), ( "carrier".to_string(), @@ -46201,7 +46238,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -46220,7 +46257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -46239,7 +46276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -46263,26 +46300,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 19459, 19861), }); declarations.push(Declaration { - id: DeclarationId(1351), + id: DeclarationId(1352), name: Some("go_variant_payload".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1143)), + FieldValue::Reference(DeclarationId(1144)), ), ( "carrier".to_string(), @@ -46304,26 +46341,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 19863, 20026), }); declarations.push(Declaration { - id: DeclarationId(1352), + id: DeclarationId(1353), name: Some("go_surface_type".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1144)), + FieldValue::Reference(DeclarationId(1145)), ), ( "carrier".to_string(), @@ -46345,26 +46382,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 20028, 20182), }); declarations.push(Declaration { - id: DeclarationId(1353), + id: DeclarationId(1354), name: Some("go_surface_record_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1145)), + FieldValue::Reference(DeclarationId(1146)), ), ( "carrier".to_string(), @@ -46385,7 +46422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -46404,7 +46441,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -46423,7 +46460,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -46447,26 +46484,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 20184, 20595), }); declarations.push(Declaration { - id: DeclarationId(1354), + id: DeclarationId(1355), name: Some("go_surface_map_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1146)), + FieldValue::Reference(DeclarationId(1147)), ), ( "carrier".to_string(), @@ -46487,7 +46524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "key".to_string(), ))], @@ -46508,7 +46545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "key_span".to_string(), ))], @@ -46527,7 +46564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -46546,7 +46583,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -46570,26 +46607,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 20597, 21082), }); declarations.push(Declaration { - id: DeclarationId(1355), + id: DeclarationId(1356), name: Some("go_surface_match_arm".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1147)), + FieldValue::Reference(DeclarationId(1148)), ), ( "carrier".to_string(), @@ -46610,7 +46647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -46629,7 +46666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -46648,7 +46685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -46672,26 +46709,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21084, 21490), }); declarations.push(Declaration { - id: DeclarationId(1356), + id: DeclarationId(1357), name: Some("go_surface_pattern_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1148)), + FieldValue::Reference(DeclarationId(1149)), ), ( "carrier".to_string(), @@ -46712,7 +46749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -46731,7 +46768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -46750,7 +46787,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -46774,26 +46811,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21492, 21910), }); declarations.push(Declaration { - id: DeclarationId(1357), + id: DeclarationId(1358), name: Some("go_surface_pattern".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1149)), + FieldValue::Reference(DeclarationId(1150)), ), ( "carrier".to_string(), @@ -46815,26 +46852,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21912, 22075), }); declarations.push(Declaration { - id: DeclarationId(1358), + id: DeclarationId(1359), name: Some("go_surface_literal".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1150)), + FieldValue::Reference(DeclarationId(1151)), ), ( "carrier".to_string(), @@ -46856,26 +46893,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22077, 22240), }); declarations.push(Declaration { - id: DeclarationId(1359), + id: DeclarationId(1360), name: Some("go_surface_expr".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1151)), + FieldValue::Reference(DeclarationId(1152)), ), ( "carrier".to_string(), @@ -46897,22 +46934,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22242, 22396), }); declarations.push(Declaration { - id: DeclarationId(1360), + id: DeclarationId(1361), name: Some("go_int_add".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), @@ -46934,22 +46971,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22398, 22539), }); declarations.push(Declaration { - id: DeclarationId(1361), + id: DeclarationId(1362), name: Some("go_int_sub".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), @@ -46971,22 +47008,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22541, 22682), }); declarations.push(Declaration { - id: DeclarationId(1362), + id: DeclarationId(1363), name: Some("go_int_mul".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), @@ -47008,22 +47045,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22684, 22825), }); declarations.push(Declaration { - id: DeclarationId(1363), + id: DeclarationId(1364), name: Some("go_int_div".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), @@ -47047,22 +47084,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22827, 22975), }); declarations.push(Declaration { - id: DeclarationId(1364), + id: DeclarationId(1365), name: Some("go_int_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), @@ -47084,26 +47121,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22977, 23117), }); declarations.push(Declaration { - id: DeclarationId(1365), + id: DeclarationId(1366), name: Some("go_node_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(721)), + FieldValue::Reference(DeclarationId(722)), ), ("op".to_string(), FieldValue::Reference(DeclarationId(359))), ( @@ -47121,26 +47158,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23119, 23266), }); declarations.push(Declaration { - id: DeclarationId(1366), + id: DeclarationId(1367), name: Some("go_port_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(722)), + FieldValue::Reference(DeclarationId(723)), ), ("op".to_string(), FieldValue::Reference(DeclarationId(359))), ( @@ -47158,26 +47195,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23268, 23415), }); declarations.push(Declaration { - id: DeclarationId(1367), + id: DeclarationId(1368), name: Some("go_declaration_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(723)), + FieldValue::Reference(DeclarationId(724)), ), ("op".to_string(), FieldValue::Reference(DeclarationId(359))), ( @@ -47195,22 +47232,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23417, 23578), }); declarations.push(Declaration { - id: DeclarationId(1368), + id: DeclarationId(1369), name: Some("go_int_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), @@ -47232,26 +47269,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23580, 23720), }); declarations.push(Declaration { - id: DeclarationId(1369), + id: DeclarationId(1370), name: Some("go_node_id_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(721)), + FieldValue::Reference(DeclarationId(722)), ), ("op".to_string(), FieldValue::Reference(DeclarationId(360))), ( @@ -47269,26 +47306,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23722, 23869), }); declarations.push(Declaration { - id: DeclarationId(1370), + id: DeclarationId(1371), name: Some("go_port_id_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(722)), + FieldValue::Reference(DeclarationId(723)), ), ("op".to_string(), FieldValue::Reference(DeclarationId(360))), ( @@ -47306,26 +47343,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23871, 24018), }); declarations.push(Declaration { - id: DeclarationId(1371), + id: DeclarationId(1372), name: Some("go_declaration_id_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(723)), + FieldValue::Reference(DeclarationId(724)), ), ("op".to_string(), FieldValue::Reference(DeclarationId(360))), ( @@ -47343,22 +47380,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24020, 24181), }); declarations.push(Declaration { - id: DeclarationId(1372), + id: DeclarationId(1373), name: Some("go_int_lt".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), @@ -47380,22 +47417,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24183, 24322), }); declarations.push(Declaration { - id: DeclarationId(1373), + id: DeclarationId(1374), name: Some("go_int_le".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), @@ -47417,22 +47454,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24324, 24464), }); declarations.push(Declaration { - id: DeclarationId(1374), + id: DeclarationId(1375), name: Some("go_int_gt".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), @@ -47454,22 +47491,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24466, 24605), }); declarations.push(Declaration { - id: DeclarationId(1375), + id: DeclarationId(1376), name: Some("go_int_ge".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), @@ -47491,22 +47528,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24607, 24747), }); declarations.push(Declaration { - id: DeclarationId(1376), + id: DeclarationId(1377), name: Some("go_bool_meet".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), @@ -47528,22 +47565,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24749, 24898), }); declarations.push(Declaration { - id: DeclarationId(1377), + id: DeclarationId(1378), name: Some("go_bool_join".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), @@ -47565,26 +47602,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24900, 25049), }); declarations.push(Declaration { - id: DeclarationId(1378), + id: DeclarationId(1379), name: Some("go_let_stmt".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1287)), + FieldValue::Reference(DeclarationId(1288)), ), ( "carrier".to_string(), @@ -47603,26 +47640,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 25051, 25184), }); declarations.push(Declaration { - id: DeclarationId(1379), + id: DeclarationId(1380), name: Some("go_if_expr".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1285)), + FieldValue::Reference(DeclarationId(1286)), ), ( "carrier".to_string(), @@ -47641,26 +47678,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 25186, 25329), }); declarations.push(Declaration { - id: DeclarationId(1380), + id: DeclarationId(1381), name: Some("go_main_wrap".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1288)), + FieldValue::Reference(DeclarationId(1289)), ), ( "carrier".to_string(), @@ -47679,31 +47716,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 25331, 25484), }); declarations.push(Declaration { - id: DeclarationId(1381), + id: DeclarationId(1382), name: Some("go_empty_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(687)), + FieldValue::Reference(DeclarationId(688)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2294), + constructor: DeclarationId(2295), payload: vec![], }, ), @@ -47719,31 +47756,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 25486, 25624), }); declarations.push(Declaration { - id: DeclarationId(1382), + id: DeclarationId(1383), name: Some("go_singleton_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(691)), + FieldValue::Reference(DeclarationId(692)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2295), + constructor: DeclarationId(2296), payload: vec![], }, ), @@ -47757,7 +47794,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2286), payload: vec![], }, ), @@ -47774,31 +47811,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 25626, 25818), }); declarations.push(Declaration { - id: DeclarationId(1383), + id: DeclarationId(1384), name: Some("go_cons_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(689)), + FieldValue::Reference(DeclarationId(690)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2296), + constructor: DeclarationId(2297), payload: vec![], }, ), @@ -47813,7 +47850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2286), payload: vec![], }, ), @@ -47826,7 +47863,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2286), payload: vec![], }, ), @@ -47844,31 +47881,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 25820, 26037), }); declarations.push(Declaration { - id: DeclarationId(1384), + id: DeclarationId(1385), name: Some("go_concat_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(699)), + FieldValue::Reference(DeclarationId(700)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2297), + constructor: DeclarationId(2298), payload: vec![], }, ), @@ -47883,7 +47920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2286), payload: vec![], }, ), @@ -47896,7 +47933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2286), payload: vec![], }, ), @@ -47914,31 +47951,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 26039, 26262), }); declarations.push(Declaration { - id: DeclarationId(1385), + id: DeclarationId(1386), name: Some("go_length_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(709)), + FieldValue::Reference(DeclarationId(710)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2298), + constructor: DeclarationId(2299), payload: vec![], }, ), @@ -47952,7 +47989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -47969,26 +48006,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 26264, 26447), }); declarations.push(Declaration { - id: DeclarationId(1386), + id: DeclarationId(1387), name: Some("go_list_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1022), + template: DeclarationId(1023), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1022)), + meta_tag: Some(DeclarationId(1023)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(685)), + FieldValue::Reference(DeclarationId(686)), ), ( "carrier".to_string(), @@ -48005,22 +48042,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 26449, 26585), }); declarations.push(Declaration { - id: DeclarationId(1387), + id: DeclarationId(1388), name: Some("go_result_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1022), + template: DeclarationId(1023), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1022)), + meta_tag: Some(DeclarationId(1023)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), @@ -48043,22 +48080,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 27271, 27424), }); declarations.push(Declaration { - id: DeclarationId(1388), + id: DeclarationId(1389), name: Some("go_map_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1022), + template: DeclarationId(1023), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1022)), + meta_tag: Some(DeclarationId(1023)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), @@ -48079,31 +48116,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 27426, 27566), }); declarations.push(Declaration { - id: DeclarationId(1389), + id: DeclarationId(1390), name: Some("go_is_empty_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(711)), + FieldValue::Reference(DeclarationId(712)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2299), + constructor: DeclarationId(2300), payload: vec![], }, ), @@ -48117,7 +48154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -48134,31 +48171,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 27568, 27756), }); declarations.push(Declaration { - id: DeclarationId(1390), + id: DeclarationId(1391), name: Some("go_fold_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(693)), + FieldValue::Reference(DeclarationId(694)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2300), + constructor: DeclarationId(2301), payload: vec![], }, ), @@ -48173,7 +48210,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -48186,7 +48223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2286), payload: vec![], }, ), @@ -48199,7 +48236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -48217,31 +48254,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 27758, 28015), }); declarations.push(Declaration { - id: DeclarationId(1391), + id: DeclarationId(1392), name: Some("go_map_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(701)), + FieldValue::Reference(DeclarationId(702)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2301), + constructor: DeclarationId(2302), payload: vec![], }, ), @@ -48256,7 +48293,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -48269,7 +48306,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -48287,31 +48324,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28017, 28231), }); declarations.push(Declaration { - id: DeclarationId(1392), + id: DeclarationId(1393), name: Some("go_filter_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(704)), + FieldValue::Reference(DeclarationId(705)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2302), + constructor: DeclarationId(2303), payload: vec![], }, ), @@ -48326,7 +48363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -48339,7 +48376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -48357,31 +48394,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28233, 28456), }); declarations.push(Declaration { - id: DeclarationId(1393), + id: DeclarationId(1394), name: Some("go_contains_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(719)), + FieldValue::Reference(DeclarationId(720)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2303), + constructor: DeclarationId(2304), payload: vec![], }, ), @@ -48396,7 +48433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -48409,7 +48446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -48427,41 +48464,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28458, 28687), }); declarations.push(Declaration { - id: DeclarationId(1394), + id: DeclarationId(1395), name: Some("go_list_pattern".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1024), + template: DeclarationId(1025), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1024)), + meta_tag: Some(DeclarationId(1025)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(685)), + FieldValue::Reference(DeclarationId(686)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2305), + constructor: DeclarationId(2306), payload: vec![], }, ), ( "empty_variant".to_string(), - FieldValue::Reference(DeclarationId(1782)), + FieldValue::Reference(DeclarationId(1783)), ), ( "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1784)), + FieldValue::Reference(DeclarationId(1785)), ), ( "scrutinee".to_string(), @@ -48494,15 +48531,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28774, 29080), }); declarations.push(Declaration { - id: DeclarationId(1395), + id: DeclarationId(1396), name: Some("go_statements".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1026), + template: DeclarationId(1027), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1026)), + meta_tag: Some(DeclarationId(1027)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48524,15 +48561,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 29082, 29212), }); declarations.push(Declaration { - id: DeclarationId(1396), + id: DeclarationId(1397), name: Some("go_expressions".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1027), + template: DeclarationId(1028), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1027)), + meta_tag: Some(DeclarationId(1028)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48558,15 +48595,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 29214, 29374), }); declarations.push(Declaration { - id: DeclarationId(1397), + id: DeclarationId(1398), name: Some("go_control_flow".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1029), + template: DeclarationId(1030), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1029)), + meta_tag: Some(DeclarationId(1030)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48603,15 +48640,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 29376, 29577), }); declarations.push(Declaration { - id: DeclarationId(1398), + id: DeclarationId(1399), name: Some("go_literals".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1030), + template: DeclarationId(1031), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1030)), + meta_tag: Some(DeclarationId(1031)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48635,15 +48672,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 29579, 29689), }); declarations.push(Declaration { - id: DeclarationId(1399), + id: DeclarationId(1400), name: Some("go_modules".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1031), + template: DeclarationId(1032), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1031)), + meta_tag: Some(DeclarationId(1032)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48657,15 +48694,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 29691, 29748), }); declarations.push(Declaration { - id: DeclarationId(1400), + id: DeclarationId(1401), name: Some("go_functions".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1032), + template: DeclarationId(1033), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1032)), + meta_tag: Some(DeclarationId(1033)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48703,15 +48740,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 29750, 30035), }); declarations.push(Declaration { - id: DeclarationId(1401), + id: DeclarationId(1402), name: Some("go_type_applications".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1033), + template: DeclarationId(1034), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1033)), + meta_tag: Some(DeclarationId(1034)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48725,15 +48762,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 30037, 30116), }); declarations.push(Declaration { - id: DeclarationId(1402), + id: DeclarationId(1403), name: Some("go_type_defs".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1034), + template: DeclarationId(1035), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1034)), + meta_tag: Some(DeclarationId(1035)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48769,15 +48806,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 30118, 30341), }); declarations.push(Declaration { - id: DeclarationId(1403), + id: DeclarationId(1404), name: Some("go_patterns".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1036), + template: DeclarationId(1037), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1036)), + meta_tag: Some(DeclarationId(1037)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48823,54 +48860,54 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 30343, 30635), }); declarations.push(Declaration { - id: DeclarationId(1404), + id: DeclarationId(1405), name: Some("go_collection_ops".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1037), + template: DeclarationId(1038), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1037)), + meta_tag: Some(DeclarationId(1038)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "concat_contract".to_string(), - FieldValue::Reference(DeclarationId(1049)), + FieldValue::Reference(DeclarationId(1050)), ), ( "length_contract".to_string(), - FieldValue::Reference(DeclarationId(1050)), + FieldValue::Reference(DeclarationId(1051)), ), ( "is_empty_contract".to_string(), - FieldValue::Reference(DeclarationId(1051)), + FieldValue::Reference(DeclarationId(1052)), ), ( "fold_contract".to_string(), - FieldValue::Reference(DeclarationId(1052)), + FieldValue::Reference(DeclarationId(1053)), ), ( "filter_contract".to_string(), - FieldValue::Reference(DeclarationId(1054)), + FieldValue::Reference(DeclarationId(1055)), ), ( "flat_map_contract".to_string(), - FieldValue::Reference(DeclarationId(1057)), + FieldValue::Reference(DeclarationId(1058)), ), ( "any_contract".to_string(), - FieldValue::Reference(DeclarationId(1055)), + FieldValue::Reference(DeclarationId(1056)), ), ( "all_contract".to_string(), - FieldValue::Reference(DeclarationId(1056)), + FieldValue::Reference(DeclarationId(1057)), ), ( "map_contract".to_string(), - FieldValue::Reference(DeclarationId(1053)), + FieldValue::Reference(DeclarationId(1054)), ), ( "filter".to_string(), @@ -48907,15 +48944,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 30637, 31402), }); declarations.push(Declaration { - id: DeclarationId(1405), + id: DeclarationId(1406), name: Some("go_value_construction".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1038), + template: DeclarationId(1039), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1038)), + meta_tag: Some(DeclarationId(1039)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48951,15 +48988,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 31404, 31672), }); declarations.push(Declaration { - id: DeclarationId(1406), + id: DeclarationId(1407), name: Some("go_record_derive_templates".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1035), + template: DeclarationId(1036), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1035)), + meta_tag: Some(DeclarationId(1036)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48979,66 +49016,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 32429, 32544), }); declarations.push(Declaration { - id: DeclarationId(1407), + id: DeclarationId(1408), name: Some("go_language".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1042), + template: DeclarationId(1043), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1042)), + meta_tag: Some(DeclarationId(1043)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "statements".to_string(), - FieldValue::Reference(DeclarationId(1395)), + FieldValue::Reference(DeclarationId(1396)), ), ( "expressions".to_string(), - FieldValue::Reference(DeclarationId(1396)), + FieldValue::Reference(DeclarationId(1397)), ), ( "control_flow".to_string(), - FieldValue::Reference(DeclarationId(1397)), + FieldValue::Reference(DeclarationId(1398)), ), ( "literals".to_string(), - FieldValue::Reference(DeclarationId(1398)), + FieldValue::Reference(DeclarationId(1399)), ), ( "modules".to_string(), - FieldValue::Reference(DeclarationId(1399)), + FieldValue::Reference(DeclarationId(1400)), ), ( "functions".to_string(), - FieldValue::Reference(DeclarationId(1400)), + FieldValue::Reference(DeclarationId(1401)), ), ( "type_applications".to_string(), - FieldValue::Reference(DeclarationId(1401)), + FieldValue::Reference(DeclarationId(1402)), ), ( "type_definitions".to_string(), - FieldValue::Reference(DeclarationId(1402)), + FieldValue::Reference(DeclarationId(1403)), ), ( "record_derive_templates".to_string(), - FieldValue::Reference(DeclarationId(1406)), + FieldValue::Reference(DeclarationId(1407)), ), ( "patterns".to_string(), - FieldValue::Reference(DeclarationId(1403)), + FieldValue::Reference(DeclarationId(1404)), ), ( "collection_ops".to_string(), - FieldValue::Reference(DeclarationId(1404)), + FieldValue::Reference(DeclarationId(1405)), ), ( "values".to_string(), - FieldValue::Reference(DeclarationId(1405)), + FieldValue::Reference(DeclarationId(1406)), ), ], }), @@ -49047,15 +49084,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 32546, 32965), }); declarations.push(Declaration { - id: DeclarationId(1408), + id: DeclarationId(1409), name: Some("go_correction_style".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(922), + template: DeclarationId(923), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(922)), + meta_tag: Some(DeclarationId(923)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -49083,15 +49120,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 34632, 34768), }); declarations.push(Declaration { - id: DeclarationId(1409), + id: DeclarationId(1410), name: Some("go_clean_emission".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(913), + template: DeclarationId(914), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(913)), + meta_tag: Some(DeclarationId(914)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -49099,55 +49136,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "expression_wrapping".to_string(), FieldValue::Variant { - constructor: DeclarationId(2133), + constructor: DeclarationId(2134), payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { - constructor: DeclarationId(2136), + constructor: DeclarationId(2137), payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2139), + constructor: DeclarationId(2140), payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { - constructor: DeclarationId(2142), + constructor: DeclarationId(2143), payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { - constructor: DeclarationId(2146), + constructor: DeclarationId(2147), payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { - constructor: DeclarationId(2148), + constructor: DeclarationId(2149), payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { - constructor: DeclarationId(2152), + constructor: DeclarationId(2153), payload: vec![], }, ), ( "correction_style".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "post_emit_verifier".to_string(), @@ -49173,7 +49210,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "output_policy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2155), + constructor: DeclarationId(2156), payload: vec![], }, ), @@ -49186,26 +49223,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 34770, 35328), }); declarations.push(Declaration { - id: DeclarationId(1410), + id: DeclarationId(1411), name: Some("go_clean_emission_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(914), + template: DeclarationId(915), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(914)), + meta_tag: Some(DeclarationId(915)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "clean_emission".to_string(), - FieldValue::Reference(DeclarationId(1409)), + FieldValue::Reference(DeclarationId(1410)), ), ], }), @@ -49214,15 +49251,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 35330, 35454), }); declarations.push(Declaration { - id: DeclarationId(1411), + id: DeclarationId(1412), name: Some("python_statements".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1026), + template: DeclarationId(1027), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1026)), + meta_tag: Some(DeclarationId(1027)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -49242,15 +49279,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2347, 2469), }); declarations.push(Declaration { - id: DeclarationId(1412), + id: DeclarationId(1413), name: Some("python_expressions".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1027), + template: DeclarationId(1028), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1027)), + meta_tag: Some(DeclarationId(1028)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -49276,15 +49313,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2471, 2624), }); declarations.push(Declaration { - id: DeclarationId(1413), + id: DeclarationId(1414), name: Some("python_control_flow".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1029), + template: DeclarationId(1030), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1029)), + meta_tag: Some(DeclarationId(1030)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -49321,15 +49358,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2626, 2841), }); declarations.push(Declaration { - id: DeclarationId(1414), + id: DeclarationId(1415), name: Some("python_literals".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1030), + template: DeclarationId(1031), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1030)), + meta_tag: Some(DeclarationId(1031)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -49353,15 +49390,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2843, 2957), }); declarations.push(Declaration { - id: DeclarationId(1415), + id: DeclarationId(1416), name: Some("python_modules".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1031), + template: DeclarationId(1032), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1031)), + meta_tag: Some(DeclarationId(1032)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -49375,15 +49412,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2959, 3020), }); declarations.push(Declaration { - id: DeclarationId(1416), + id: DeclarationId(1417), name: Some("python_functions".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1032), + template: DeclarationId(1033), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1032)), + meta_tag: Some(DeclarationId(1033)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -49421,15 +49458,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 3022, 3329), }); declarations.push(Declaration { - id: DeclarationId(1417), + id: DeclarationId(1418), name: Some("python_type_applications".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1033), + template: DeclarationId(1034), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1033)), + meta_tag: Some(DeclarationId(1034)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -49445,15 +49482,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 3331, 3430), }); declarations.push(Declaration { - id: DeclarationId(1418), + id: DeclarationId(1419), name: Some("python_type_definitions".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1034), + template: DeclarationId(1035), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1034)), + meta_tag: Some(DeclarationId(1035)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -49493,15 +49530,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 3432, 3763), }); declarations.push(Declaration { - id: DeclarationId(1419), + id: DeclarationId(1420), name: Some("python_patterns".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1036), + template: DeclarationId(1037), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1036)), + meta_tag: Some(DeclarationId(1037)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -49547,54 +49584,54 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 3765, 4095), }); declarations.push(Declaration { - id: DeclarationId(1420), + id: DeclarationId(1421), name: Some("python_collections".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1037), + template: DeclarationId(1038), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1037)), + meta_tag: Some(DeclarationId(1038)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "concat_contract".to_string(), - FieldValue::Reference(DeclarationId(1153)), + FieldValue::Reference(DeclarationId(1154)), ), ( "length_contract".to_string(), - FieldValue::Reference(DeclarationId(1154)), + FieldValue::Reference(DeclarationId(1155)), ), ( "is_empty_contract".to_string(), - FieldValue::Reference(DeclarationId(1155)), + FieldValue::Reference(DeclarationId(1156)), ), ( "fold_contract".to_string(), - FieldValue::Reference(DeclarationId(1156)), + FieldValue::Reference(DeclarationId(1157)), ), ( "filter_contract".to_string(), - FieldValue::Reference(DeclarationId(1158)), + FieldValue::Reference(DeclarationId(1159)), ), ( "flat_map_contract".to_string(), - FieldValue::Reference(DeclarationId(1161)), + FieldValue::Reference(DeclarationId(1162)), ), ( "any_contract".to_string(), - FieldValue::Reference(DeclarationId(1159)), + FieldValue::Reference(DeclarationId(1160)), ), ( "all_contract".to_string(), - FieldValue::Reference(DeclarationId(1160)), + FieldValue::Reference(DeclarationId(1161)), ), ( "map_contract".to_string(), - FieldValue::Reference(DeclarationId(1157)), + FieldValue::Reference(DeclarationId(1158)), ), ( "filter".to_string(), @@ -49625,15 +49662,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 4097, 4861), }); declarations.push(Declaration { - id: DeclarationId(1421), + id: DeclarationId(1422), name: Some("python_value_construction".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1038), + template: DeclarationId(1039), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1038)), + meta_tag: Some(DeclarationId(1039)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -49665,15 +49702,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 4863, 5115), }); declarations.push(Declaration { - id: DeclarationId(1422), + id: DeclarationId(1423), name: Some("python_record_derive_templates".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1035), + template: DeclarationId(1036), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1035)), + meta_tag: Some(DeclarationId(1036)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -49693,66 +49730,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 5318, 5437), }); declarations.push(Declaration { - id: DeclarationId(1423), + id: DeclarationId(1424), name: Some("python_language".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1042), + template: DeclarationId(1043), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1042)), + meta_tag: Some(DeclarationId(1043)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "statements".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1412)), ), ( "expressions".to_string(), - FieldValue::Reference(DeclarationId(1412)), + FieldValue::Reference(DeclarationId(1413)), ), ( "control_flow".to_string(), - FieldValue::Reference(DeclarationId(1413)), + FieldValue::Reference(DeclarationId(1414)), ), ( "literals".to_string(), - FieldValue::Reference(DeclarationId(1414)), + FieldValue::Reference(DeclarationId(1415)), ), ( "modules".to_string(), - FieldValue::Reference(DeclarationId(1415)), + FieldValue::Reference(DeclarationId(1416)), ), ( "functions".to_string(), - FieldValue::Reference(DeclarationId(1416)), + FieldValue::Reference(DeclarationId(1417)), ), ( "type_applications".to_string(), - FieldValue::Reference(DeclarationId(1417)), + FieldValue::Reference(DeclarationId(1418)), ), ( "type_definitions".to_string(), - FieldValue::Reference(DeclarationId(1418)), + FieldValue::Reference(DeclarationId(1419)), ), ( "record_derive_templates".to_string(), - FieldValue::Reference(DeclarationId(1422)), + FieldValue::Reference(DeclarationId(1423)), ), ( "patterns".to_string(), - FieldValue::Reference(DeclarationId(1419)), + FieldValue::Reference(DeclarationId(1420)), ), ( "collection_ops".to_string(), - FieldValue::Reference(DeclarationId(1420)), + FieldValue::Reference(DeclarationId(1421)), ), ( "values".to_string(), - FieldValue::Reference(DeclarationId(1421)), + FieldValue::Reference(DeclarationId(1422)), ), ], }), @@ -49761,15 +49798,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 5439, 5914), }); declarations.push(Declaration { - id: DeclarationId(1424), + id: DeclarationId(1425), name: Some("python_target".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(948), + template: DeclarationId(949), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(948)), + meta_tag: Some(DeclarationId(949)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -49777,14 +49814,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "memory".to_string(), FieldValue::Variant { - constructor: DeclarationId(2198), + constructor: DeclarationId(2199), payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { - constructor: DeclarationId(2201), + constructor: DeclarationId(2202), payload: vec![], }, ), @@ -49795,22 +49832,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 5916, 6013), }); declarations.push(Declaration { - id: DeclarationId(1425), + id: DeclarationId(1426), name: Some("python_source_filtering".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(950), + template: DeclarationId(951), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(950)), + meta_tag: Some(DeclarationId(951)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "internal".to_string(), - FieldValue::Reference(DeclarationId(951)), + FieldValue::Reference(DeclarationId(952)), ), ( "additional_excluded_prefixes".to_string(), @@ -49823,15 +49860,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6015, 6151), }); declarations.push(Declaration { - id: DeclarationId(1426), + id: DeclarationId(1427), name: Some("python_execution_requirement".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(952), + template: DeclarationId(953), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(952)), + meta_tag: Some(DeclarationId(953)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -49844,22 +49881,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6153, 6232), }); declarations.push(Declaration { - id: DeclarationId(1427), + id: DeclarationId(1428), name: Some("python_int".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), @@ -49885,22 +49922,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6234, 6370), }); declarations.push(Declaration { - id: DeclarationId(1428), + id: DeclarationId(1429), name: Some("python_integer_inhabit_at_i32_program_bound".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "kernel_integer".to_string(), @@ -49913,17 +49950,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(2279), + constructor: DeclarationId(2280), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1877), + constructor: DeclarationId(1878), payload: vec![ FieldValue::Literal(LiteralBits::Int( "-2147483648".to_string(), )), FieldValue::Variant { - constructor: DeclarationId(1876), + constructor: DeclarationId(1877), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1874), + constructor: DeclarationId(1875), payload: vec![FieldValue::Literal(LiteralBits::Int( "4294967295".to_string(), ))], @@ -49935,7 +49972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1427)), + FieldValue::Reference(DeclarationId(1428)), ), ], }), @@ -49944,22 +49981,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6463, 6772), }); declarations.push(Declaration { - id: DeclarationId(1429), + id: DeclarationId(1430), name: Some("python_integer_inhabit_unbounded_decl".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "kernel_integer".to_string(), @@ -49972,16 +50009,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(2279), + constructor: DeclarationId(2280), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1878), + constructor: DeclarationId(1879), payload: vec![], }], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1427)), + FieldValue::Reference(DeclarationId(1428)), ), ], }), @@ -49990,22 +50027,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6850, 7060), }); declarations.push(Declaration { - id: DeclarationId(1430), + id: DeclarationId(1431), name: Some("python_bool".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), @@ -50031,22 +50068,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7062, 7201), }); declarations.push(Declaration { - id: DeclarationId(1431), + id: DeclarationId(1432), name: Some("python_string".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), @@ -50072,26 +50109,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7203, 7345), }); declarations.push(Declaration { - id: DeclarationId(1432), + id: DeclarationId(1433), name: Some("python_node_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(721)), + FieldValue::Reference(DeclarationId(722)), ), ( "carrier".to_string(), @@ -50113,26 +50150,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7347, 7493), }); declarations.push(Declaration { - id: DeclarationId(1433), + id: DeclarationId(1434), name: Some("python_port_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(722)), + FieldValue::Reference(DeclarationId(723)), ), ( "carrier".to_string(), @@ -50154,26 +50191,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7495, 7641), }); declarations.push(Declaration { - id: DeclarationId(1434), + id: DeclarationId(1435), name: Some("python_declaration_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(723)), + FieldValue::Reference(DeclarationId(724)), ), ( "carrier".to_string(), @@ -50195,26 +50232,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7643, 7810), }); declarations.push(Declaration { - id: DeclarationId(1435), + id: DeclarationId(1436), name: Some("python_declaration_ref".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1289)), + FieldValue::Reference(DeclarationId(1290)), ), ( "carrier".to_string(), @@ -50236,22 +50273,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7812, 7981), }); declarations.push(Declaration { - id: DeclarationId(1436), + id: DeclarationId(1437), name: Some("python_source_span".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), @@ -50277,26 +50314,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7983, 8142), }); declarations.push(Declaration { - id: DeclarationId(1437), + id: DeclarationId(1438), name: Some("python_dag_port".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(780)), + FieldValue::Reference(DeclarationId(781)), ), ( "carrier".to_string(), @@ -50318,26 +50355,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8144, 8294), }); declarations.push(Declaration { - id: DeclarationId(1438), + id: DeclarationId(1439), name: Some("python_branch_path".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(809)), + FieldValue::Reference(DeclarationId(810)), ), ( "carrier".to_string(), @@ -50359,26 +50396,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8296, 8455), }); declarations.push(Declaration { - id: DeclarationId(1439), + id: DeclarationId(1440), name: Some("python_value_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(819)), + FieldValue::Reference(DeclarationId(820)), ), ( "carrier".to_string(), @@ -50400,26 +50437,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8457, 8613), }); declarations.push(Declaration { - id: DeclarationId(1440), + id: DeclarationId(1441), name: Some("python_transform_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(820)), + FieldValue::Reference(DeclarationId(821)), ), ( "carrier".to_string(), @@ -50441,26 +50478,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8615, 8783), }); declarations.push(Declaration { - id: DeclarationId(1441), + id: DeclarationId(1442), name: Some("python_branch_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(822)), + FieldValue::Reference(DeclarationId(823)), ), ( "carrier".to_string(), @@ -50482,26 +50519,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8785, 8944), }); declarations.push(Declaration { - id: DeclarationId(1442), + id: DeclarationId(1443), name: Some("python_loop_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(823)), + FieldValue::Reference(DeclarationId(824)), ), ( "carrier".to_string(), @@ -50523,26 +50560,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8946, 9099), }); declarations.push(Declaration { - id: DeclarationId(1443), + id: DeclarationId(1444), name: Some("python_bind_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(825)), + FieldValue::Reference(DeclarationId(826)), ), ( "carrier".to_string(), @@ -50564,26 +50601,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9101, 9254), }); declarations.push(Declaration { - id: DeclarationId(1444), + id: DeclarationId(1445), name: Some("python_behavior".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(826)), + FieldValue::Reference(DeclarationId(827)), ), ( "carrier".to_string(), @@ -50605,26 +50642,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9256, 9408), }); declarations.push(Declaration { - id: DeclarationId(1445), + id: DeclarationId(1446), name: Some("python_dag".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(827)), + FieldValue::Reference(DeclarationId(828)), ), ( "carrier".to_string(), @@ -50646,26 +50683,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9410, 9547), }); declarations.push(Declaration { - id: DeclarationId(1446), + id: DeclarationId(1447), name: Some("python_surface_module".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1139)), + FieldValue::Reference(DeclarationId(1140)), ), ( "carrier".to_string(), @@ -50685,7 +50722,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "items".to_string(), ))], @@ -50708,26 +50745,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9621, 9870), }); declarations.push(Declaration { - id: DeclarationId(1447), + id: DeclarationId(1448), name: Some("python_surface_item".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1152)), + FieldValue::Reference(DeclarationId(1153)), ), ( "carrier".to_string(), @@ -50749,26 +50786,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9872, 10034), }); declarations.push(Declaration { - id: DeclarationId(1448), + id: DeclarationId(1449), name: Some("python_surface_param".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1140)), + FieldValue::Reference(DeclarationId(1141)), ), ( "carrier".to_string(), @@ -50789,7 +50826,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -50808,7 +50845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -50829,7 +50866,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "refinement".to_string(), ))], @@ -50853,26 +50890,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 10036, 10442), }); declarations.push(Declaration { - id: DeclarationId(1449), + id: DeclarationId(1450), name: Some("python_surface_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1141)), + FieldValue::Reference(DeclarationId(1142)), ), ( "carrier".to_string(), @@ -50893,7 +50930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -50912,7 +50949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -50936,26 +50973,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 10444, 10761), }); declarations.push(Declaration { - id: DeclarationId(1450), + id: DeclarationId(1451), name: Some("python_surface_variant".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1142)), + FieldValue::Reference(DeclarationId(1143)), ), ( "carrier".to_string(), @@ -50976,7 +51013,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -50995,7 +51032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -51014,7 +51051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -51038,26 +51075,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 10763, 11173), }); declarations.push(Declaration { - id: DeclarationId(1451), + id: DeclarationId(1452), name: Some("python_variant_payload".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1143)), + FieldValue::Reference(DeclarationId(1144)), ), ( "carrier".to_string(), @@ -51079,26 +51116,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 11175, 11346), }); declarations.push(Declaration { - id: DeclarationId(1452), + id: DeclarationId(1453), name: Some("python_surface_type".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1144)), + FieldValue::Reference(DeclarationId(1145)), ), ( "carrier".to_string(), @@ -51120,26 +51157,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 11348, 11510), }); declarations.push(Declaration { - id: DeclarationId(1453), + id: DeclarationId(1454), name: Some("python_surface_record_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1145)), + FieldValue::Reference(DeclarationId(1146)), ), ( "carrier".to_string(), @@ -51160,7 +51197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -51179,7 +51216,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -51198,7 +51235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -51222,26 +51259,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 11512, 11931), }); declarations.push(Declaration { - id: DeclarationId(1454), + id: DeclarationId(1455), name: Some("python_surface_map_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1146)), + FieldValue::Reference(DeclarationId(1147)), ), ( "carrier".to_string(), @@ -51262,7 +51299,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "key".to_string(), ))], @@ -51283,7 +51320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "key_span".to_string(), ))], @@ -51302,7 +51339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -51321,7 +51358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -51345,26 +51382,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 11933, 12426), }); declarations.push(Declaration { - id: DeclarationId(1455), + id: DeclarationId(1456), name: Some("python_surface_match_arm".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1147)), + FieldValue::Reference(DeclarationId(1148)), ), ( "carrier".to_string(), @@ -51385,7 +51422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -51404,7 +51441,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -51423,7 +51460,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -51447,26 +51484,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 12428, 12842), }); declarations.push(Declaration { - id: DeclarationId(1456), + id: DeclarationId(1457), name: Some("python_surface_pattern_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1148)), + FieldValue::Reference(DeclarationId(1149)), ), ( "carrier".to_string(), @@ -51487,7 +51524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -51506,7 +51543,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -51525,7 +51562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -51549,26 +51586,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 12844, 13270), }); declarations.push(Declaration { - id: DeclarationId(1457), + id: DeclarationId(1458), name: Some("python_surface_pattern".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1149)), + FieldValue::Reference(DeclarationId(1150)), ), ( "carrier".to_string(), @@ -51590,26 +51627,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13272, 13443), }); declarations.push(Declaration { - id: DeclarationId(1458), + id: DeclarationId(1459), name: Some("python_surface_literal".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1150)), + FieldValue::Reference(DeclarationId(1151)), ), ( "carrier".to_string(), @@ -51631,26 +51668,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13445, 13616), }); declarations.push(Declaration { - id: DeclarationId(1459), + id: DeclarationId(1460), name: Some("python_surface_expr".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1151)), + FieldValue::Reference(DeclarationId(1152)), ), ( "carrier".to_string(), @@ -51672,22 +51709,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13618, 13780), }); declarations.push(Declaration { - id: DeclarationId(1460), + id: DeclarationId(1461), name: Some("python_int_add".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), @@ -51709,22 +51746,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13782, 13931), }); declarations.push(Declaration { - id: DeclarationId(1461), + id: DeclarationId(1462), name: Some("python_int_sub".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), @@ -51746,22 +51783,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13933, 14082), }); declarations.push(Declaration { - id: DeclarationId(1462), + id: DeclarationId(1463), name: Some("python_int_mul".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), @@ -51783,22 +51820,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14084, 14233), }); declarations.push(Declaration { - id: DeclarationId(1463), + id: DeclarationId(1464), name: Some("python_int_div".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), @@ -51822,22 +51859,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14235, 14394), }); declarations.push(Declaration { - id: DeclarationId(1464), + id: DeclarationId(1465), name: Some("python_int_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), @@ -51859,26 +51896,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14396, 14544), }); declarations.push(Declaration { - id: DeclarationId(1465), + id: DeclarationId(1466), name: Some("python_node_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(721)), + FieldValue::Reference(DeclarationId(722)), ), ("op".to_string(), FieldValue::Reference(DeclarationId(359))), ( @@ -51896,26 +51933,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14546, 14701), }); declarations.push(Declaration { - id: DeclarationId(1466), + id: DeclarationId(1467), name: Some("python_port_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(722)), + FieldValue::Reference(DeclarationId(723)), ), ("op".to_string(), FieldValue::Reference(DeclarationId(359))), ( @@ -51933,26 +51970,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14703, 14858), }); declarations.push(Declaration { - id: DeclarationId(1467), + id: DeclarationId(1468), name: Some("python_declaration_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(723)), + FieldValue::Reference(DeclarationId(724)), ), ("op".to_string(), FieldValue::Reference(DeclarationId(359))), ( @@ -51970,22 +52007,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14860, 15029), }); declarations.push(Declaration { - id: DeclarationId(1468), + id: DeclarationId(1469), name: Some("python_int_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), @@ -52007,22 +52044,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15031, 15179), }); declarations.push(Declaration { - id: DeclarationId(1469), + id: DeclarationId(1470), name: Some("python_int_lt".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), @@ -52044,22 +52081,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15181, 15328), }); declarations.push(Declaration { - id: DeclarationId(1470), + id: DeclarationId(1471), name: Some("python_int_le".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), @@ -52081,22 +52118,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15330, 15478), }); declarations.push(Declaration { - id: DeclarationId(1471), + id: DeclarationId(1472), name: Some("python_int_gt".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), @@ -52118,22 +52155,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15480, 15627), }); declarations.push(Declaration { - id: DeclarationId(1472), + id: DeclarationId(1473), name: Some("python_int_ge".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), @@ -52155,22 +52192,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15629, 15777), }); declarations.push(Declaration { - id: DeclarationId(1473), + id: DeclarationId(1474), name: Some("python_bool_meet".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), @@ -52192,22 +52229,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15779, 15937), }); declarations.push(Declaration { - id: DeclarationId(1474), + id: DeclarationId(1475), name: Some("python_bool_join".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), @@ -52229,31 +52266,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15939, 16096), }); declarations.push(Declaration { - id: DeclarationId(1475), + id: DeclarationId(1476), name: Some("python_empty_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(687)), + FieldValue::Reference(DeclarationId(688)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2294), + constructor: DeclarationId(2295), payload: vec![], }, ), @@ -52269,31 +52306,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 16098, 16244), }); declarations.push(Declaration { - id: DeclarationId(1476), + id: DeclarationId(1477), name: Some("python_singleton_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(691)), + FieldValue::Reference(DeclarationId(692)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2295), + constructor: DeclarationId(2296), payload: vec![], }, ), @@ -52307,7 +52344,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2286), payload: vec![], }, ), @@ -52324,31 +52361,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 16246, 16446), }); declarations.push(Declaration { - id: DeclarationId(1477), + id: DeclarationId(1478), name: Some("python_cons_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(689)), + FieldValue::Reference(DeclarationId(690)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2296), + constructor: DeclarationId(2297), payload: vec![], }, ), @@ -52363,7 +52400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2286), payload: vec![], }, ), @@ -52376,7 +52413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2286), payload: vec![], }, ), @@ -52394,31 +52431,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 16448, 16673), }); declarations.push(Declaration { - id: DeclarationId(1478), + id: DeclarationId(1479), name: Some("python_concat_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(699)), + FieldValue::Reference(DeclarationId(700)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2297), + constructor: DeclarationId(2298), payload: vec![], }, ), @@ -52433,7 +52470,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2286), payload: vec![], }, ), @@ -52446,7 +52483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2286), payload: vec![], }, ), @@ -52464,31 +52501,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 16675, 16906), }); declarations.push(Declaration { - id: DeclarationId(1479), + id: DeclarationId(1480), name: Some("python_length_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(709)), + FieldValue::Reference(DeclarationId(710)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2298), + constructor: DeclarationId(2299), payload: vec![], }, ), @@ -52502,7 +52539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -52519,31 +52556,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 16908, 17099), }); declarations.push(Declaration { - id: DeclarationId(1480), + id: DeclarationId(1481), name: Some("python_is_empty_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(711)), + FieldValue::Reference(DeclarationId(712)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2299), + constructor: DeclarationId(2300), payload: vec![], }, ), @@ -52557,7 +52594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -52574,31 +52611,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 17101, 17297), }); declarations.push(Declaration { - id: DeclarationId(1481), + id: DeclarationId(1482), name: Some("python_fold_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(693)), + FieldValue::Reference(DeclarationId(694)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2300), + constructor: DeclarationId(2301), payload: vec![], }, ), @@ -52613,7 +52650,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -52626,7 +52663,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2286), payload: vec![], }, ), @@ -52639,7 +52676,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -52657,31 +52694,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 17299, 17564), }); declarations.push(Declaration { - id: DeclarationId(1482), + id: DeclarationId(1483), name: Some("python_map_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(701)), + FieldValue::Reference(DeclarationId(702)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2301), + constructor: DeclarationId(2302), payload: vec![], }, ), @@ -52696,7 +52733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -52709,7 +52746,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -52727,31 +52764,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 17566, 17788), }); declarations.push(Declaration { - id: DeclarationId(1483), + id: DeclarationId(1484), name: Some("python_filter_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(704)), + FieldValue::Reference(DeclarationId(705)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2302), + constructor: DeclarationId(2303), payload: vec![], }, ), @@ -52766,7 +52803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -52779,7 +52816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -52797,31 +52834,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 17790, 18021), }); declarations.push(Declaration { - id: DeclarationId(1484), + id: DeclarationId(1485), name: Some("python_contains_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(719)), + FieldValue::Reference(DeclarationId(720)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2303), + constructor: DeclarationId(2304), payload: vec![], }, ), @@ -52836,7 +52873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -52849,7 +52886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -52867,26 +52904,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 18023, 18260), }); declarations.push(Declaration { - id: DeclarationId(1485), + id: DeclarationId(1486), name: Some("python_list_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1022), + template: DeclarationId(1023), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1022)), + meta_tag: Some(DeclarationId(1023)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(685)), + FieldValue::Reference(DeclarationId(686)), ), ( "carrier".to_string(), @@ -52902,28 +52939,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 18262, 18410), }); - declarations.push(Declaration { id: DeclarationId(1486), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1022), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1022)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1423))), ("target".to_string(), FieldValue::Reference(DeclarationId(11))), ("carrier".to_string(), FieldValue::Literal(LiteralBits::String("typing.Union[typing.Tuple[typing.Literal['Ok'], {key}], typing.Tuple[typing.Literal['Err'], {value}]]".to_string()))), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int("1".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 18526, 18764) }); + declarations.push(Declaration { id: DeclarationId(1487), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1023), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1023)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1424))), ("target".to_string(), FieldValue::Reference(DeclarationId(11))), ("carrier".to_string(), FieldValue::Literal(LiteralBits::String("typing.Union[typing.Tuple[typing.Literal['Ok'], {key}], typing.Tuple[typing.Literal['Err'], {value}]]".to_string()))), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int("1".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 18526, 18764) }); declarations.push(Declaration { - id: DeclarationId(1487), + id: DeclarationId(1488), name: Some("python_non_empty_list_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1022), + template: DeclarationId(1023), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1022)), + meta_tag: Some(DeclarationId(1023)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(725)), + FieldValue::Reference(DeclarationId(726)), ), ( "carrier".to_string(), @@ -52942,26 +52979,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 18855, 19029), }); declarations.push(Declaration { - id: DeclarationId(1488), + id: DeclarationId(1489), name: Some("python_non_singleton_list_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1022), + template: DeclarationId(1023), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1022)), + meta_tag: Some(DeclarationId(1023)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(727)), + FieldValue::Reference(DeclarationId(728)), ), ( "carrier".to_string(), @@ -52980,41 +53017,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 19031, 19217), }); declarations.push(Declaration { - id: DeclarationId(1489), + id: DeclarationId(1490), name: Some("python_list_pattern".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1024), + template: DeclarationId(1025), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1024)), + meta_tag: Some(DeclarationId(1025)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(685)), + FieldValue::Reference(DeclarationId(686)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2305), + constructor: DeclarationId(2306), payload: vec![], }, ), ( "empty_variant".to_string(), - FieldValue::Reference(DeclarationId(1782)), + FieldValue::Reference(DeclarationId(1783)), ), ( "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1784)), + FieldValue::Reference(DeclarationId(1785)), ), ( "scrutinee".to_string(), @@ -53047,15 +53084,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 19218, 19532), }); declarations.push(Declaration { - id: DeclarationId(1490), + id: DeclarationId(1491), name: Some("python_correction_style".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(922), + template: DeclarationId(923), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(922)), + meta_tag: Some(DeclarationId(923)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53083,15 +53120,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 21597, 21739), }); declarations.push(Declaration { - id: DeclarationId(1491), + id: DeclarationId(1492), name: Some("python_clean_emission".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(913), + template: DeclarationId(914), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(913)), + meta_tag: Some(DeclarationId(914)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53099,55 +53136,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "expression_wrapping".to_string(), FieldValue::Variant { - constructor: DeclarationId(2133), + constructor: DeclarationId(2134), payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { - constructor: DeclarationId(2138), + constructor: DeclarationId(2139), payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2139), + constructor: DeclarationId(2140), payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { - constructor: DeclarationId(2142), + constructor: DeclarationId(2143), payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { - constructor: DeclarationId(2146), + constructor: DeclarationId(2147), payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { - constructor: DeclarationId(2147), + constructor: DeclarationId(2148), payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { - constructor: DeclarationId(2152), + constructor: DeclarationId(2153), payload: vec![], }, ), ( "correction_style".to_string(), - FieldValue::Reference(DeclarationId(1490)), + FieldValue::Reference(DeclarationId(1491)), ), ( "post_emit_verifier".to_string(), @@ -53176,7 +53213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "output_policy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2154), + constructor: DeclarationId(2155), payload: vec![], }, ), @@ -53189,26 +53226,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 21741, 22321), }); declarations.push(Declaration { - id: DeclarationId(1492), + id: DeclarationId(1493), name: Some("python_clean_emission_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(914), + template: DeclarationId(915), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(914)), + meta_tag: Some(DeclarationId(915)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "clean_emission".to_string(), - FieldValue::Reference(DeclarationId(1491)), + FieldValue::Reference(DeclarationId(1492)), ), ], }), @@ -53217,15 +53254,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 22323, 22459), }); declarations.push(Declaration { - id: DeclarationId(1493), + id: DeclarationId(1494), name: Some("rust_execution_model".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(948), + template: DeclarationId(949), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(948)), + meta_tag: Some(DeclarationId(949)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53233,14 +53270,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "memory".to_string(), FieldValue::Variant { - constructor: DeclarationId(2200), + constructor: DeclarationId(2201), payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { - constructor: DeclarationId(2201), + constructor: DeclarationId(2202), payload: vec![], }, ), @@ -53251,22 +53288,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5045, 5147), }); declarations.push(Declaration { - id: DeclarationId(1494), + id: DeclarationId(1495), name: Some("rust_source_filtering".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(950), + template: DeclarationId(951), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(950)), + meta_tag: Some(DeclarationId(951)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "internal".to_string(), - FieldValue::Reference(DeclarationId(951)), + FieldValue::Reference(DeclarationId(952)), ), ( "additional_excluded_prefixes".to_string(), @@ -53281,15 +53318,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5149, 5301), }); declarations.push(Declaration { - id: DeclarationId(1495), + id: DeclarationId(1496), name: Some("rust_execution_requirement".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(952), + template: DeclarationId(953), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(952)), + meta_tag: Some(DeclarationId(953)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -53302,22 +53339,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5303, 5378), }); declarations.push(Declaration { - id: DeclarationId(1496), + id: DeclarationId(1497), name: Some("rust_int".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -53343,22 +53380,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5829, 5961), }); declarations.push(Declaration { - id: DeclarationId(1497), + id: DeclarationId(1498), name: Some("rust_uint8".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -53384,22 +53421,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5963, 6098), }); declarations.push(Declaration { - id: DeclarationId(1498), + id: DeclarationId(1499), name: Some("rust_i32".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -53425,22 +53462,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 6100, 6234), }); declarations.push(Declaration { - id: DeclarationId(1499), + id: DeclarationId(1500), name: Some("rust_u32".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -53466,22 +53503,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 6236, 6371), }); declarations.push(Declaration { - id: DeclarationId(1500), + id: DeclarationId(1501), name: Some("rust_i128".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -53507,22 +53544,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 6373, 6510), }); declarations.push(Declaration { - id: DeclarationId(1501), + id: DeclarationId(1502), name: Some("rust_u128".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -53548,22 +53585,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 6802, 6940), }); declarations.push(Declaration { - id: DeclarationId(1502), + id: DeclarationId(1503), name: Some("rust_isize".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -53589,22 +53626,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7343, 7487), }); declarations.push(Declaration { - id: DeclarationId(1503), + id: DeclarationId(1504), name: Some("rust_usize".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -53630,22 +53667,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7489, 7634), }); declarations.push(Declaration { - id: DeclarationId(1504), + id: DeclarationId(1505), name: Some("rust_integer_inhabit_u32_at_program_bound".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "kernel_integer".to_string(), @@ -53658,15 +53695,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(2279), + constructor: DeclarationId(2280), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1877), + constructor: DeclarationId(1878), payload: vec![ FieldValue::Literal(LiteralBits::Int("0".to_string())), FieldValue::Variant { - constructor: DeclarationId(1876), + constructor: DeclarationId(1877), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1874), + constructor: DeclarationId(1875), payload: vec![FieldValue::Literal(LiteralBits::Int( "4294967295".to_string(), ))], @@ -53678,7 +53715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1499)), + FieldValue::Reference(DeclarationId(1500)), ), ], }), @@ -53687,22 +53724,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8055, 8354), }); declarations.push(Declaration { - id: DeclarationId(1505), + id: DeclarationId(1506), name: Some("rust_integer_inhabit_i32_at_program_bound".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "kernel_integer".to_string(), @@ -53715,17 +53752,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(2279), + constructor: DeclarationId(2280), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1877), + constructor: DeclarationId(1878), payload: vec![ FieldValue::Literal(LiteralBits::Int( "-2147483648".to_string(), )), FieldValue::Variant { - constructor: DeclarationId(1876), + constructor: DeclarationId(1877), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1874), + constructor: DeclarationId(1875), payload: vec![FieldValue::Literal(LiteralBits::Int( "4294967295".to_string(), ))], @@ -53737,7 +53774,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1498)), + FieldValue::Reference(DeclarationId(1499)), ), ], }), @@ -53746,22 +53783,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8356, 8663), }); declarations.push(Declaration { - id: DeclarationId(1506), + id: DeclarationId(1507), name: Some("rust_integer_inhabit_i32_bound_unspecified".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "kernel_integer".to_string(), @@ -53774,13 +53811,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(2278), + constructor: DeclarationId(2279), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1498)), + FieldValue::Reference(DeclarationId(1499)), ), ], }), @@ -53789,22 +53826,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8665, 8870), }); declarations.push(Declaration { - id: DeclarationId(1507), + id: DeclarationId(1508), name: Some("rust_integer_inhabit_int64_bound_unspecified".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "kernel_integer".to_string(), @@ -53817,13 +53854,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(2278), + constructor: DeclarationId(2279), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1496)), + FieldValue::Reference(DeclarationId(1497)), ), ], }), @@ -53832,22 +53869,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8872, 9075), }); declarations.push(Declaration { - id: DeclarationId(1508), + id: DeclarationId(1509), name: Some("rust_integer_inhabit_i128_bound_unspecified".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "kernel_integer".to_string(), @@ -53860,13 +53897,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(2278), + constructor: DeclarationId(2279), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1500)), + FieldValue::Reference(DeclarationId(1501)), ), ], }), @@ -53875,22 +53912,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 9077, 9286), }); declarations.push(Declaration { - id: DeclarationId(1509), + id: DeclarationId(1510), name: Some("rust_integer_inhabit_u128_bound_unspecified".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "kernel_integer".to_string(), @@ -53903,13 +53940,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(2278), + constructor: DeclarationId(2279), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1501)), + FieldValue::Reference(DeclarationId(1502)), ), ], }), @@ -53918,22 +53955,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 9711, 9922), }); declarations.push(Declaration { - id: DeclarationId(1510), + id: DeclarationId(1511), name: Some("rust_integer_inhabit_isize_platform".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "kernel_integer".to_string(), @@ -53946,13 +53983,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(2280), + constructor: DeclarationId(2281), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1502)), + FieldValue::Reference(DeclarationId(1503)), ), ], }), @@ -53961,22 +53998,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10285, 10502), }); declarations.push(Declaration { - id: DeclarationId(1511), + id: DeclarationId(1512), name: Some("rust_integer_inhabit_usize_platform".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "kernel_integer".to_string(), @@ -53989,13 +54026,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(2280), + constructor: DeclarationId(2281), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1503)), + FieldValue::Reference(DeclarationId(1504)), ), ], }), @@ -54004,22 +54041,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10504, 10723), }); declarations.push(Declaration { - id: DeclarationId(1512), + id: DeclarationId(1513), name: Some("rust_bool".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -54045,22 +54082,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10725, 10860), }); declarations.push(Declaration { - id: DeclarationId(1513), + id: DeclarationId(1514), name: Some("rust_string".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -54086,26 +54123,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10862, 11004), }); declarations.push(Declaration { - id: DeclarationId(1514), + id: DeclarationId(1515), name: Some("rust_node_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(721)), + FieldValue::Reference(DeclarationId(722)), ), ( "carrier".to_string(), @@ -54127,26 +54164,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 11006, 11148), }); declarations.push(Declaration { - id: DeclarationId(1515), + id: DeclarationId(1516), name: Some("rust_port_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(722)), + FieldValue::Reference(DeclarationId(723)), ), ( "carrier".to_string(), @@ -54168,26 +54205,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 11150, 11292), }); declarations.push(Declaration { - id: DeclarationId(1516), + id: DeclarationId(1517), name: Some("rust_declaration_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(723)), + FieldValue::Reference(DeclarationId(724)), ), ( "carrier".to_string(), @@ -54209,26 +54246,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 11294, 11457), }); declarations.push(Declaration { - id: DeclarationId(1517), + id: DeclarationId(1518), name: Some("rust_cluster_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(724)), + FieldValue::Reference(DeclarationId(725)), ), ( "carrier".to_string(), @@ -54250,26 +54287,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 11459, 11610), }); declarations.push(Declaration { - id: DeclarationId(1518), + id: DeclarationId(1519), name: Some("rust_type_shape".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(778)), + FieldValue::Reference(DeclarationId(779)), ), ( "carrier".to_string(), @@ -54289,7 +54326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "declaration".to_string(), ))], @@ -54312,26 +54349,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 11612, 11857), }); declarations.push(Declaration { - id: DeclarationId(1519), + id: DeclarationId(1520), name: Some("rust_port_state".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(779)), + FieldValue::Reference(DeclarationId(780)), ), ( "carrier".to_string(), @@ -54353,26 +54390,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 11859, 12011), }); declarations.push(Declaration { - id: DeclarationId(1520), + id: DeclarationId(1521), name: Some("rust_port".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(780)), + FieldValue::Reference(DeclarationId(781)), ), ( "carrier".to_string(), @@ -54393,7 +54430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -54412,7 +54449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "state_value".to_string(), ))], @@ -54433,7 +54470,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "produced_by".to_string(), ))], @@ -54457,22 +54494,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 12013, 12409), }); declarations.push(Declaration { - id: DeclarationId(1521), + id: DeclarationId(1522), name: Some("rust_source_span".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -54497,7 +54534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "file".to_string(), ))], @@ -54516,7 +54553,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_start".to_string(), ))], @@ -54535,7 +54572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_end".to_string(), ))], @@ -54559,26 +54596,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 12411, 12809), }); declarations.push(Declaration { - id: DeclarationId(1522), + id: DeclarationId(1523), name: Some("rust_literal_bits".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(781)), + FieldValue::Reference(DeclarationId(782)), ), ( "carrier".to_string(), @@ -54600,26 +54637,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 12811, 12969), }); declarations.push(Declaration { - id: DeclarationId(1523), + id: DeclarationId(1524), name: Some("rust_atom_payload".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(782)), + FieldValue::Reference(DeclarationId(783)), ), ( "carrier".to_string(), @@ -54641,26 +54678,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 12971, 13129), }); declarations.push(Declaration { - id: DeclarationId(1524), + id: DeclarationId(1525), name: Some("rust_cardinality_bound".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(789)), + FieldValue::Reference(DeclarationId(790)), ), ( "carrier".to_string(), @@ -54682,26 +54719,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 13131, 13304), }); declarations.push(Declaration { - id: DeclarationId(1525), + id: DeclarationId(1526), name: Some("rust_interval".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(785)), + FieldValue::Reference(DeclarationId(786)), ), ( "carrier".to_string(), @@ -54723,26 +54760,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 13306, 13454), }); declarations.push(Declaration { - id: DeclarationId(1526), + id: DeclarationId(1527), name: Some("rust_positive_interval_width".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(783)), + FieldValue::Reference(DeclarationId(784)), ), ( "carrier".to_string(), @@ -54766,26 +54803,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 13456, 13645), }); declarations.push(Declaration { - id: DeclarationId(1527), + id: DeclarationId(1528), name: Some("rust_interval_width".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(784)), + FieldValue::Reference(DeclarationId(785)), ), ( "carrier".to_string(), @@ -54807,26 +54844,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 13647, 13811), }); declarations.push(Declaration { - id: DeclarationId(1528), + id: DeclarationId(1529), name: Some("rust_conj_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(790)), + FieldValue::Reference(DeclarationId(791)), ), ( "carrier".to_string(), @@ -54847,7 +54884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -54866,7 +54903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -54890,26 +54927,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 13813, 14115), }); declarations.push(Declaration { - id: DeclarationId(1529), + id: DeclarationId(1530), name: Some("rust_template_argument".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(791)), + FieldValue::Reference(DeclarationId(792)), ), ( "carrier".to_string(), @@ -54932,7 +54969,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -54951,7 +54988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -54975,26 +55012,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 14117, 14458), }); declarations.push(Declaration { - id: DeclarationId(1530), + id: DeclarationId(1531), name: Some("rust_phantom_parameter".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(799)), + FieldValue::Reference(DeclarationId(800)), ), ( "carrier".to_string(), @@ -55017,7 +55054,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -55036,7 +55073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "algebra".to_string(), ))], @@ -55060,26 +55097,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 14460, 14805), }); declarations.push(Declaration { - id: DeclarationId(1531), + id: DeclarationId(1532), name: Some("rust_nominal_opacity".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(800)), + FieldValue::Reference(DeclarationId(801)), ), ( "carrier".to_string(), @@ -55101,7 +55138,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "permitted_accessors".to_string(), ))], @@ -55124,26 +55161,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 14807, 15083), }); declarations.push(Declaration { - id: DeclarationId(1532), + id: DeclarationId(1533), name: Some("rust_field_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(792)), + FieldValue::Reference(DeclarationId(793)), ), ( "carrier".to_string(), @@ -55166,7 +55203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "0".to_string(), ))], @@ -55185,7 +55222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "1".to_string(), ))], @@ -55209,26 +55246,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 15085, 15402), }); declarations.push(Declaration { - id: DeclarationId(1533), + id: DeclarationId(1534), name: Some("rust_non_empty_list".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(725)), + FieldValue::Reference(DeclarationId(726)), ), ( "carrier".to_string(), @@ -55249,7 +55286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -55268,7 +55305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -55292,26 +55329,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 15404, 15724), }); declarations.push(Declaration { - id: DeclarationId(1534), + id: DeclarationId(1535), name: Some("rust_non_singleton_list".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(727)), + FieldValue::Reference(DeclarationId(728)), ), ( "carrier".to_string(), @@ -55332,7 +55369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -55351,7 +55388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "second".to_string(), ))], @@ -55370,7 +55407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -55394,26 +55431,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 15726, 16139), }); declarations.push(Declaration { - id: DeclarationId(1535), + id: DeclarationId(1536), name: Some("rust_element_ref".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(812)), + FieldValue::Reference(DeclarationId(813)), ), ( "carrier".to_string(), @@ -55433,7 +55470,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "index_of".to_string(), ))], @@ -55456,26 +55493,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16141, 16382), }); declarations.push(Declaration { - id: DeclarationId(1536), + id: DeclarationId(1537), name: Some("rust_param_ref".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(810)), + FieldValue::Reference(DeclarationId(811)), ), ( "carrier".to_string(), @@ -55496,7 +55533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "member_of".to_string(), ))], @@ -55515,7 +55552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "slot_of".to_string(), ))], @@ -55539,26 +55576,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16384, 16704), }); declarations.push(Declaration { - id: DeclarationId(1537), + id: DeclarationId(1538), name: Some("rust_transform_ref".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(811)), + FieldValue::Reference(DeclarationId(812)), ), ( "carrier".to_string(), @@ -55578,7 +55615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "node_id".to_string(), ))], @@ -55601,26 +55638,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16706, 16951), }); declarations.push(Declaration { - id: DeclarationId(1538), + id: DeclarationId(1539), name: Some("rust_member_descent".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(814)), + FieldValue::Reference(DeclarationId(815)), ), ( "carrier".to_string(), @@ -55640,7 +55677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "param".to_string(), ))], @@ -55663,26 +55700,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16953, 17198), }); declarations.push(Declaration { - id: DeclarationId(1539), + id: DeclarationId(1540), name: Some("rust_intra_cluster_call".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(815)), + FieldValue::Reference(DeclarationId(816)), ), ( "carrier".to_string(), @@ -55702,7 +55739,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "transform".to_string(), ))], @@ -55725,26 +55762,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 17200, 17463), }); declarations.push(Declaration { - id: DeclarationId(1540), + id: DeclarationId(1541), name: Some("rust_cluster".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(816)), + FieldValue::Reference(DeclarationId(817)), ), ( "carrier".to_string(), @@ -55765,7 +55802,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "members".to_string(), ))], @@ -55786,7 +55823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "intra_cluster_calls".to_string(), ))], @@ -55810,26 +55847,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 17465, 17802), }); declarations.push(Declaration { - id: DeclarationId(1541), + id: DeclarationId(1542), name: Some("rust_field_value".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(793)), + FieldValue::Reference(DeclarationId(794)), ), ( "carrier".to_string(), @@ -55851,26 +55888,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 17804, 17959), }); declarations.push(Declaration { - id: DeclarationId(1542), + id: DeclarationId(1543), name: Some("rust_value_body".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(794)), + FieldValue::Reference(DeclarationId(795)), ), ( "carrier".to_string(), @@ -55892,26 +55929,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 17961, 18113), }); declarations.push(Declaration { - id: DeclarationId(1543), + id: DeclarationId(1544), name: Some("rust_arrow_body".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(796)), + FieldValue::Reference(DeclarationId(797)), ), ( "carrier".to_string(), @@ -55933,26 +55970,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 18115, 18267), }); declarations.push(Declaration { - id: DeclarationId(1544), + id: DeclarationId(1545), name: Some("rust_type_connective".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(797)), + FieldValue::Reference(DeclarationId(798)), ), ( "carrier".to_string(), @@ -55974,26 +56011,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 18269, 18436), }); declarations.push(Declaration { - id: DeclarationId(1545), + id: DeclarationId(1546), name: Some("rust_declaration".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(798)), + FieldValue::Reference(DeclarationId(799)), ), ( "carrier".to_string(), @@ -56014,7 +56051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -56033,7 +56070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -56054,7 +56091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "connective".to_string(), ))], @@ -56075,7 +56112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "type_params".to_string(), ))], @@ -56096,7 +56133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "phantom_params".to_string(), ))], @@ -56117,7 +56154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "meta_tag".to_string(), ))], @@ -56138,7 +56175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "inhabits".to_string(), ))], @@ -56159,7 +56196,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "value_body".to_string(), ))], @@ -56180,7 +56217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "nominal_opacity".to_string(), ))], @@ -56199,7 +56236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -56223,26 +56260,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 18438, 19459), }); declarations.push(Declaration { - id: DeclarationId(1546), + id: DeclarationId(1547), name: Some("rust_arithmetic_op".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(801)), + FieldValue::Reference(DeclarationId(802)), ), ( "carrier".to_string(), @@ -56264,26 +56301,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 19461, 19622), }); declarations.push(Declaration { - id: DeclarationId(1547), + id: DeclarationId(1548), name: Some("rust_comparison_op".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(802)), + FieldValue::Reference(DeclarationId(803)), ), ( "carrier".to_string(), @@ -56305,26 +56342,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 19624, 19785), }); declarations.push(Declaration { - id: DeclarationId(1548), + id: DeclarationId(1549), name: Some("rust_logical_op".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(804)), + FieldValue::Reference(DeclarationId(805)), ), ( "carrier".to_string(), @@ -56346,26 +56383,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 19787, 19939), }); declarations.push(Declaration { - id: DeclarationId(1549), + id: DeclarationId(1550), name: Some("rust_operator_kind".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(805)), + FieldValue::Reference(DeclarationId(806)), ), ( "carrier".to_string(), @@ -56387,26 +56424,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 19941, 20102), }); declarations.push(Declaration { - id: DeclarationId(1550), + id: DeclarationId(1551), name: Some("rust_transform_target".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(806)), + FieldValue::Reference(DeclarationId(807)), ), ( "carrier".to_string(), @@ -56428,26 +56465,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 20104, 20274), }); declarations.push(Declaration { - id: DeclarationId(1551), + id: DeclarationId(1552), name: Some("rust_branch_pattern".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(807)), + FieldValue::Reference(DeclarationId(808)), ), ( "carrier".to_string(), @@ -56469,26 +56506,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 20276, 20440), }); declarations.push(Declaration { - id: DeclarationId(1552), + id: DeclarationId(1553), name: Some("rust_payload_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(808)), + FieldValue::Reference(DeclarationId(809)), ), ( "carrier".to_string(), @@ -56511,7 +56548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "binding_name".to_string(), ))], @@ -56532,7 +56569,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "payload_port".to_string(), ))], @@ -56556,26 +56593,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 20442, 20797), }); declarations.push(Declaration { - id: DeclarationId(1553), + id: DeclarationId(1554), name: Some("rust_branch_path".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(809)), + FieldValue::Reference(DeclarationId(810)), ), ( "carrier".to_string(), @@ -56596,7 +56633,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -56617,7 +56654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -56636,7 +56673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -56655,7 +56692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -56679,26 +56716,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 20799, 21287), }); declarations.push(Declaration { - id: DeclarationId(1554), + id: DeclarationId(1555), name: Some("rust_loop_bound".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(817)), + FieldValue::Reference(DeclarationId(818)), ), ( "carrier".to_string(), @@ -56720,26 +56757,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 21289, 21441), }); declarations.push(Declaration { - id: DeclarationId(1555), + id: DeclarationId(1556), name: Some("rust_value_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(819)), + FieldValue::Reference(DeclarationId(820)), ), ( "carrier".to_string(), @@ -56760,7 +56797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -56779,7 +56816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "data".to_string(), ))], @@ -56800,7 +56837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -56819,7 +56856,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -56840,7 +56877,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "lane2_workflow".to_string(), ))], @@ -56864,26 +56901,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 21443, 22216), }); declarations.push(Declaration { - id: DeclarationId(1556), + id: DeclarationId(1557), name: Some("rust_transform_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(820)), + FieldValue::Reference(DeclarationId(821)), ), ( "carrier".to_string(), @@ -56904,7 +56941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -56923,7 +56960,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "target".to_string(), ))], @@ -56942,7 +56979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "inputs".to_string(), ))], @@ -56963,7 +57000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -56982,7 +57019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -57006,26 +57043,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 22218, 22790), }); declarations.push(Declaration { - id: DeclarationId(1557), + id: DeclarationId(1558), name: Some("rust_branch_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(822)), + FieldValue::Reference(DeclarationId(823)), ), ( "carrier".to_string(), @@ -57046,7 +57083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -57065,7 +57102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "input".to_string(), ))], @@ -57084,7 +57121,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "paths".to_string(), ))], @@ -57105,7 +57142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -57124,7 +57161,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -57145,7 +57182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -57169,26 +57206,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 22792, 23459), }); declarations.push(Declaration { - id: DeclarationId(1558), + id: DeclarationId(1559), name: Some("rust_loop_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(823)), + FieldValue::Reference(DeclarationId(824)), ), ( "carrier".to_string(), @@ -57209,7 +57246,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -57228,7 +57265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "source".to_string(), ))], @@ -57247,7 +57284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "init".to_string(), ))], @@ -57266,7 +57303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -57285,7 +57322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "bound".to_string(), ))], @@ -57306,7 +57343,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -57325,7 +57362,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -57349,26 +57386,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 23461, 24170), }); declarations.push(Declaration { - id: DeclarationId(1559), + id: DeclarationId(1560), name: Some("rust_bind_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(825)), + FieldValue::Reference(DeclarationId(826)), ), ( "carrier".to_string(), @@ -57389,7 +57426,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -57408,7 +57445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -57429,7 +57466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -57448,7 +57485,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "params".to_string(), ))], @@ -57467,7 +57504,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -57488,7 +57525,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "lane2_workflow".to_string(), ))], @@ -57509,7 +57546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -57533,26 +57570,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 24172, 24932), }); declarations.push(Declaration { - id: DeclarationId(1560), + id: DeclarationId(1561), name: Some("rust_behavior".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(826)), + FieldValue::Reference(DeclarationId(827)), ), ( "carrier".to_string(), @@ -57574,26 +57611,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 24934, 25082), }); declarations.push(Declaration { - id: DeclarationId(1561), + id: DeclarationId(1562), name: Some("rust_dag".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(827)), + FieldValue::Reference(DeclarationId(828)), ), ( "carrier".to_string(), @@ -57616,7 +57653,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "declarations".to_string(), ))], @@ -57635,7 +57672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "nodes".to_string(), ))], @@ -57654,7 +57691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "ports".to_string(), ))], @@ -57675,7 +57712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2282), + constructor: DeclarationId(2283), payload: vec![FieldValue::Literal(LiteralBits::String( "clusters".to_string(), ))], @@ -57699,26 +57736,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 25084, 25564), }); declarations.push(Declaration { - id: DeclarationId(1562), + id: DeclarationId(1563), name: Some("rust_surface_module".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1139)), + FieldValue::Reference(DeclarationId(1140)), ), ( "carrier".to_string(), @@ -57740,7 +57777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "items".to_string(), ))], @@ -57763,26 +57800,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 25777, 26037), }); declarations.push(Declaration { - id: DeclarationId(1563), + id: DeclarationId(1564), name: Some("rust_surface_item".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1152)), + FieldValue::Reference(DeclarationId(1153)), ), ( "carrier".to_string(), @@ -57806,26 +57843,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 26039, 26212), }); declarations.push(Declaration { - id: DeclarationId(1564), + id: DeclarationId(1565), name: Some("rust_surface_param".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1140)), + FieldValue::Reference(DeclarationId(1141)), ), ( "carrier".to_string(), @@ -57848,7 +57885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -57867,7 +57904,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -57888,7 +57925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "refinement".to_string(), ))], @@ -57912,26 +57949,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 26214, 26631), }); declarations.push(Declaration { - id: DeclarationId(1565), + id: DeclarationId(1566), name: Some("rust_surface_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1141)), + FieldValue::Reference(DeclarationId(1142)), ), ( "carrier".to_string(), @@ -57954,7 +57991,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -57973,7 +58010,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -57997,26 +58034,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 26633, 26961), }); declarations.push(Declaration { - id: DeclarationId(1566), + id: DeclarationId(1567), name: Some("rust_surface_variant".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1142)), + FieldValue::Reference(DeclarationId(1143)), ), ( "carrier".to_string(), @@ -58039,7 +58076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -58058,7 +58095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -58077,7 +58114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -58101,26 +58138,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 26963, 27384), }); declarations.push(Declaration { - id: DeclarationId(1567), + id: DeclarationId(1568), name: Some("rust_variant_payload".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1143)), + FieldValue::Reference(DeclarationId(1144)), ), ( "carrier".to_string(), @@ -58144,26 +58181,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 27386, 27568), }); declarations.push(Declaration { - id: DeclarationId(1568), + id: DeclarationId(1569), name: Some("rust_surface_type".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1144)), + FieldValue::Reference(DeclarationId(1145)), ), ( "carrier".to_string(), @@ -58187,26 +58224,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 27570, 27743), }); declarations.push(Declaration { - id: DeclarationId(1569), + id: DeclarationId(1570), name: Some("rust_surface_record_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1145)), + FieldValue::Reference(DeclarationId(1146)), ), ( "carrier".to_string(), @@ -58229,7 +58266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -58248,7 +58285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -58267,7 +58304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -58291,26 +58328,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 27745, 28175), }); declarations.push(Declaration { - id: DeclarationId(1570), + id: DeclarationId(1571), name: Some("rust_surface_map_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1146)), + FieldValue::Reference(DeclarationId(1147)), ), ( "carrier".to_string(), @@ -58333,7 +58370,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "key".to_string(), ))], @@ -58354,7 +58391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "key_span".to_string(), ))], @@ -58373,7 +58410,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -58392,7 +58429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -58416,26 +58453,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 28177, 28681), }); declarations.push(Declaration { - id: DeclarationId(1571), + id: DeclarationId(1572), name: Some("rust_surface_match_arm".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1147)), + FieldValue::Reference(DeclarationId(1148)), ), ( "carrier".to_string(), @@ -58458,7 +58495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -58477,7 +58514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -58496,7 +58533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -58520,26 +58557,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 28683, 29108), }); declarations.push(Declaration { - id: DeclarationId(1572), + id: DeclarationId(1573), name: Some("rust_surface_pattern_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1148)), + FieldValue::Reference(DeclarationId(1149)), ), ( "carrier".to_string(), @@ -58562,7 +58599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -58581,7 +58618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -58600,7 +58637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2281), + constructor: DeclarationId(2282), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -58624,26 +58661,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29110, 29547), }); declarations.push(Declaration { - id: DeclarationId(1573), + id: DeclarationId(1574), name: Some("rust_surface_pattern".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1149)), + FieldValue::Reference(DeclarationId(1150)), ), ( "carrier".to_string(), @@ -58667,26 +58704,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29549, 29731), }); declarations.push(Declaration { - id: DeclarationId(1574), + id: DeclarationId(1575), name: Some("rust_surface_literal".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1150)), + FieldValue::Reference(DeclarationId(1151)), ), ( "carrier".to_string(), @@ -58710,26 +58747,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29733, 29915), }); declarations.push(Declaration { - id: DeclarationId(1575), + id: DeclarationId(1576), name: Some("rust_surface_expr".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1151)), + FieldValue::Reference(DeclarationId(1152)), ), ( "carrier".to_string(), @@ -58753,22 +58790,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29917, 30090), }); declarations.push(Declaration { - id: DeclarationId(1576), + id: DeclarationId(1577), name: Some("rust_int_add".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -58790,22 +58827,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30945, 31090), }); declarations.push(Declaration { - id: DeclarationId(1577), + id: DeclarationId(1578), name: Some("rust_int_sub".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -58827,22 +58864,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 31092, 31237), }); declarations.push(Declaration { - id: DeclarationId(1578), + id: DeclarationId(1579), name: Some("rust_int_mul".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -58864,22 +58901,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 31239, 31384), }); declarations.push(Declaration { - id: DeclarationId(1579), + id: DeclarationId(1580), name: Some("rust_int_div".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -58903,22 +58940,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 31386, 31544), }); declarations.push(Declaration { - id: DeclarationId(1580), + id: DeclarationId(1581), name: Some("rust_int_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -58940,26 +58977,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 31994, 32138), }); declarations.push(Declaration { - id: DeclarationId(1581), + id: DeclarationId(1582), name: Some("rust_node_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(721)), + FieldValue::Reference(DeclarationId(722)), ), ("op".to_string(), FieldValue::Reference(DeclarationId(359))), ( @@ -58977,26 +59014,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 32140, 32291), }); declarations.push(Declaration { - id: DeclarationId(1582), + id: DeclarationId(1583), name: Some("rust_port_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(722)), + FieldValue::Reference(DeclarationId(723)), ), ("op".to_string(), FieldValue::Reference(DeclarationId(359))), ( @@ -59014,26 +59051,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 32293, 32444), }); declarations.push(Declaration { - id: DeclarationId(1583), + id: DeclarationId(1584), name: Some("rust_declaration_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(723)), + FieldValue::Reference(DeclarationId(724)), ), ("op".to_string(), FieldValue::Reference(DeclarationId(359))), ( @@ -59051,22 +59088,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 32446, 32611), }); declarations.push(Declaration { - id: DeclarationId(1584), + id: DeclarationId(1585), name: Some("rust_string_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -59088,22 +59125,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 32804, 32954), }); declarations.push(Declaration { - id: DeclarationId(1585), + id: DeclarationId(1586), name: Some("rust_int_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -59125,26 +59162,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 32956, 33100), }); declarations.push(Declaration { - id: DeclarationId(1586), + id: DeclarationId(1587), name: Some("rust_node_id_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(721)), + FieldValue::Reference(DeclarationId(722)), ), ("op".to_string(), FieldValue::Reference(DeclarationId(360))), ( @@ -59162,26 +59199,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 33102, 33253), }); declarations.push(Declaration { - id: DeclarationId(1587), + id: DeclarationId(1588), name: Some("rust_port_id_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(722)), + FieldValue::Reference(DeclarationId(723)), ), ("op".to_string(), FieldValue::Reference(DeclarationId(360))), ( @@ -59199,26 +59236,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 33255, 33406), }); declarations.push(Declaration { - id: DeclarationId(1588), + id: DeclarationId(1589), name: Some("rust_declaration_id_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(723)), + FieldValue::Reference(DeclarationId(724)), ), ("op".to_string(), FieldValue::Reference(DeclarationId(360))), ( @@ -59236,22 +59273,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 33408, 33573), }); declarations.push(Declaration { - id: DeclarationId(1589), + id: DeclarationId(1590), name: Some("rust_int_lt".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -59273,22 +59310,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 33575, 33718), }); declarations.push(Declaration { - id: DeclarationId(1590), + id: DeclarationId(1591), name: Some("rust_int_le".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -59310,22 +59347,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 33720, 33864), }); declarations.push(Declaration { - id: DeclarationId(1591), + id: DeclarationId(1592), name: Some("rust_int_gt".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -59347,22 +59384,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 33866, 34009), }); declarations.push(Declaration { - id: DeclarationId(1592), + id: DeclarationId(1593), name: Some("rust_int_ge".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -59384,22 +59421,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 34011, 34155), }); declarations.push(Declaration { - id: DeclarationId(1593), + id: DeclarationId(1594), name: Some("rust_bool_meet".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -59421,22 +59458,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 34157, 34310), }); declarations.push(Declaration { - id: DeclarationId(1594), + id: DeclarationId(1595), name: Some("rust_bool_join".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1012), + template: DeclarationId(1013), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1012)), + meta_tag: Some(DeclarationId(1013)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -59458,26 +59495,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 34312, 34465), }); declarations.push(Declaration { - id: DeclarationId(1595), + id: DeclarationId(1596), name: Some("rust_let_stmt".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1287)), + FieldValue::Reference(DeclarationId(1288)), ), ( "carrier".to_string(), @@ -59496,26 +59533,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 35215, 35354), }); declarations.push(Declaration { - id: DeclarationId(1596), + id: DeclarationId(1597), name: Some("rust_if_expr".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1285)), + FieldValue::Reference(DeclarationId(1286)), ), ( "carrier".to_string(), @@ -59534,26 +59571,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 35356, 35503), }); declarations.push(Declaration { - id: DeclarationId(1597), + id: DeclarationId(1598), name: Some("rust_main_wrap".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1288)), + FieldValue::Reference(DeclarationId(1289)), ), ( "carrier".to_string(), @@ -59573,31 +59610,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 35505, 35675), }); declarations.push(Declaration { - id: DeclarationId(1598), + id: DeclarationId(1599), name: Some("rust_empty_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(687)), + FieldValue::Reference(DeclarationId(688)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2294), + constructor: DeclarationId(2295), payload: vec![], }, ), @@ -59613,31 +59650,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37052, 37194), }); declarations.push(Declaration { - id: DeclarationId(1599), + id: DeclarationId(1600), name: Some("rust_singleton_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(691)), + FieldValue::Reference(DeclarationId(692)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2295), + constructor: DeclarationId(2296), payload: vec![], }, ), @@ -59651,7 +59688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2286), payload: vec![], }, ), @@ -59668,31 +59705,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37196, 37392), }); declarations.push(Declaration { - id: DeclarationId(1600), + id: DeclarationId(1601), name: Some("rust_cons_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(689)), + FieldValue::Reference(DeclarationId(690)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2296), + constructor: DeclarationId(2297), payload: vec![], }, ), @@ -59707,7 +59744,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2286), payload: vec![], }, ), @@ -59720,7 +59757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2286), payload: vec![], }, ), @@ -59738,31 +59775,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37394, 37615), }); declarations.push(Declaration { - id: DeclarationId(1601), + id: DeclarationId(1602), name: Some("rust_concat_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(699)), + FieldValue::Reference(DeclarationId(700)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2297), + constructor: DeclarationId(2298), payload: vec![], }, ), @@ -59777,7 +59814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2286), payload: vec![], }, ), @@ -59790,7 +59827,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2286), payload: vec![], }, ), @@ -59808,31 +59845,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37617, 37844), }); declarations.push(Declaration { - id: DeclarationId(1602), + id: DeclarationId(1603), name: Some("rust_length_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(709)), + FieldValue::Reference(DeclarationId(710)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2298), + constructor: DeclarationId(2299), payload: vec![], }, ), @@ -59846,7 +59883,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -59863,26 +59900,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37846, 38033), }); declarations.push(Declaration { - id: DeclarationId(1603), + id: DeclarationId(1604), name: Some("rust_list_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1022), + template: DeclarationId(1023), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1022)), + meta_tag: Some(DeclarationId(1023)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(685)), + FieldValue::Reference(DeclarationId(686)), ), ( "carrier".to_string(), @@ -59899,22 +59936,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38035, 38178), }); declarations.push(Declaration { - id: DeclarationId(1604), + id: DeclarationId(1605), name: Some("rust_result_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1022), + template: DeclarationId(1023), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1022)), + meta_tag: Some(DeclarationId(1023)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -59937,26 +59974,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38457, 38628), }); declarations.push(Declaration { - id: DeclarationId(1605), + id: DeclarationId(1606), name: Some("rust_lookup_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1022), + template: DeclarationId(1023), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1022)), + meta_tag: Some(DeclarationId(1023)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1134)), + FieldValue::Reference(DeclarationId(1135)), ), ( "carrier".to_string(), @@ -59973,26 +60010,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38630, 38780), }); declarations.push(Declaration { - id: DeclarationId(1606), + id: DeclarationId(1607), name: Some("rust_witness_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1022), + template: DeclarationId(1023), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1022)), + meta_tag: Some(DeclarationId(1023)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(975)), + FieldValue::Reference(DeclarationId(976)), ), ( "carrier".to_string(), @@ -60009,26 +60046,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38782, 38935), }); declarations.push(Declaration { - id: DeclarationId(1607), + id: DeclarationId(1608), name: Some("rust_lens_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1022), + template: DeclarationId(1023), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1022)), + meta_tag: Some(DeclarationId(1023)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1119)), + FieldValue::Reference(DeclarationId(1120)), ), ( "carrier".to_string(), @@ -60045,22 +60082,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38937, 39081), }); declarations.push(Declaration { - id: DeclarationId(1608), + id: DeclarationId(1609), name: Some("rust_monoid_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1022), + template: DeclarationId(1023), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1022)), + meta_tag: Some(DeclarationId(1023)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -60081,26 +60118,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 39083, 39233), }); declarations.push(Declaration { - id: DeclarationId(1609), + id: DeclarationId(1610), name: Some("rust_lens_enforcement_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1022), + template: DeclarationId(1023), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1022)), + meta_tag: Some(DeclarationId(1023)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1123)), + FieldValue::Reference(DeclarationId(1124)), ), ( "carrier".to_string(), @@ -60119,26 +60156,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 39235, 39418), }); declarations.push(Declaration { - id: DeclarationId(1610), + id: DeclarationId(1611), name: Some("rust_enforceable_lens_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1022), + template: DeclarationId(1023), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1022)), + meta_tag: Some(DeclarationId(1023)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1126)), + FieldValue::Reference(DeclarationId(1127)), ), ( "carrier".to_string(), @@ -60157,22 +60194,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 39420, 39603), }); declarations.push(Declaration { - id: DeclarationId(1611), + id: DeclarationId(1612), name: Some("rust_map_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1022), + template: DeclarationId(1023), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1022)), + meta_tag: Some(DeclarationId(1023)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), @@ -60195,31 +60232,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 39605, 39755), }); declarations.push(Declaration { - id: DeclarationId(1612), + id: DeclarationId(1613), name: Some("rust_is_empty_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(711)), + FieldValue::Reference(DeclarationId(712)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2299), + constructor: DeclarationId(2300), payload: vec![], }, ), @@ -60233,7 +60270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -60250,31 +60287,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 39757, 39949), }); declarations.push(Declaration { - id: DeclarationId(1613), + id: DeclarationId(1614), name: Some("rust_fold_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(693)), + FieldValue::Reference(DeclarationId(694)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2300), + constructor: DeclarationId(2301), payload: vec![], }, ), @@ -60289,7 +60326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -60302,7 +60339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2286), payload: vec![], }, ), @@ -60315,7 +60352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -60333,31 +60370,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 39951, 40212), }); declarations.push(Declaration { - id: DeclarationId(1614), + id: DeclarationId(1615), name: Some("rust_map_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(701)), + FieldValue::Reference(DeclarationId(702)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2301), + constructor: DeclarationId(2302), payload: vec![], }, ), @@ -60372,7 +60409,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -60385,7 +60422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -60403,31 +60440,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 40214, 40432), }); declarations.push(Declaration { - id: DeclarationId(1615), + id: DeclarationId(1616), name: Some("rust_filter_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(704)), + FieldValue::Reference(DeclarationId(705)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2302), + constructor: DeclarationId(2303), payload: vec![], }, ), @@ -60442,7 +60479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -60455,7 +60492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -60473,31 +60510,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 40434, 40661), }); declarations.push(Declaration { - id: DeclarationId(1616), + id: DeclarationId(1617), name: Some("rust_contains_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(719)), + FieldValue::Reference(DeclarationId(720)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2303), + constructor: DeclarationId(2304), payload: vec![], }, ), @@ -60512,7 +60549,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -60525,7 +60562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2284), + constructor: DeclarationId(2285), payload: vec![], }, ), @@ -60543,41 +60580,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 40663, 40896), }); declarations.push(Declaration { - id: DeclarationId(1617), + id: DeclarationId(1618), name: Some("rust_list_pattern".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1024), + template: DeclarationId(1025), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1024)), + meta_tag: Some(DeclarationId(1025)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(685)), + FieldValue::Reference(DeclarationId(686)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2305), + constructor: DeclarationId(2306), payload: vec![], }, ), ( "empty_variant".to_string(), - FieldValue::Reference(DeclarationId(1782)), + FieldValue::Reference(DeclarationId(1783)), ), ( "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1784)), + FieldValue::Reference(DeclarationId(1785)), ), ( "scrutinee".to_string(), @@ -60612,15 +60649,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 41124, 41428), }); declarations.push(Declaration { - id: DeclarationId(1618), + id: DeclarationId(1619), name: Some("rust_statements".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1026), + template: DeclarationId(1027), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1026)), + meta_tag: Some(DeclarationId(1027)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -60644,15 +60681,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 41430, 41568), }); declarations.push(Declaration { - id: DeclarationId(1619), + id: DeclarationId(1620), name: Some("rust_expressions".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1027), + template: DeclarationId(1028), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1027)), + meta_tag: Some(DeclarationId(1028)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -60678,15 +60715,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 41570, 41723), }); declarations.push(Declaration { - id: DeclarationId(1620), + id: DeclarationId(1621), name: Some("rust_control_flow".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1029), + template: DeclarationId(1030), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1029)), + meta_tag: Some(DeclarationId(1030)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -60723,15 +60760,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 41725, 41915), }); declarations.push(Declaration { - id: DeclarationId(1621), + id: DeclarationId(1622), name: Some("rust_literals".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1030), + template: DeclarationId(1031), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1030)), + meta_tag: Some(DeclarationId(1031)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -60755,15 +60792,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 41917, 42029), }); declarations.push(Declaration { - id: DeclarationId(1622), + id: DeclarationId(1623), name: Some("rust_modules".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1031), + template: DeclarationId(1032), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1031)), + meta_tag: Some(DeclarationId(1032)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -60777,15 +60814,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 42031, 42091), }); declarations.push(Declaration { - id: DeclarationId(1623), + id: DeclarationId(1624), name: Some("rust_functions".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1032), + template: DeclarationId(1033), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1032)), + meta_tag: Some(DeclarationId(1033)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -60823,15 +60860,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 42093, 42371), }); declarations.push(Declaration { - id: DeclarationId(1624), + id: DeclarationId(1625), name: Some("rust_type_applications".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1033), + template: DeclarationId(1034), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1033)), + meta_tag: Some(DeclarationId(1034)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -60845,15 +60882,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 42373, 42461), }); declarations.push(Declaration { - id: DeclarationId(1625), + id: DeclarationId(1626), name: Some("rust_type_defs".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1034), + template: DeclarationId(1035), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1034)), + meta_tag: Some(DeclarationId(1035)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -60891,15 +60928,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 42463, 42765), }); declarations.push(Declaration { - id: DeclarationId(1626), + id: DeclarationId(1627), name: Some("rust_record_derive_templates".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1035), + template: DeclarationId(1036), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1035)), + meta_tag: Some(DeclarationId(1036)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -60923,15 +60960,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 42767, 42980), }); declarations.push(Declaration { - id: DeclarationId(1627), + id: DeclarationId(1628), name: Some("rust_patterns".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1036), + template: DeclarationId(1037), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1036)), + meta_tag: Some(DeclarationId(1037)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -60981,15 +61018,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 42982, 43317), }); declarations.push(Declaration { - id: DeclarationId(1628), + id: DeclarationId(1629), name: Some("rust_language_spec_free_monoid_concat_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -61011,7 +61048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "{ let mut __left = {left}; __left.extend({right}); __left }" .to_string(), @@ -61025,7 +61062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -61036,15 +61073,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 43319, 43689), }); declarations.push(Declaration { - id: DeclarationId(1629), + id: DeclarationId(1630), name: Some("rust_language_spec_free_monoid_length_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -61065,7 +61102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "({recv}).len() as i64".to_string(), ))], @@ -61078,7 +61115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -61089,15 +61126,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 43691, 43985), }); declarations.push(Declaration { - id: DeclarationId(1630), + id: DeclarationId(1631), name: Some("rust_language_spec_free_monoid_emptiness_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -61116,7 +61153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "({recv}).is_empty()".to_string(), ))], @@ -61129,7 +61166,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -61140,15 +61177,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44156, 44451), }); declarations.push(Declaration { - id: DeclarationId(1631), + id: DeclarationId(1632), name: Some("rust_language_spec_free_monoid_fold_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -61169,7 +61206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "({recv}).iter().fold({init}, {body})".to_string(), ))], @@ -61182,7 +61219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -61193,15 +61230,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44453, 44773), }); declarations.push(Declaration { - id: DeclarationId(1632), + id: DeclarationId(1633), name: Some("rust_language_spec_map_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1045), + template: DeclarationId(1046), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1045)), + meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -61222,7 +61259,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(2312), + constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String( "({recv}).iter().map({body}).collect::>()".to_string(), ))], @@ -61235,7 +61272,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(2311), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -61245,17 +61282,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 44775, 45103), }); - declarations.push(Declaration { id: DeclarationId(1633), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1037), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1037)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat_contract".to_string(), FieldValue::Reference(DeclarationId(1628))), ("length_contract".to_string(), FieldValue::Reference(DeclarationId(1629))), ("is_empty_contract".to_string(), FieldValue::Reference(DeclarationId(1630))), ("fold_contract".to_string(), FieldValue::Reference(DeclarationId(1631))), ("filter_contract".to_string(), FieldValue::Reference(DeclarationId(1176))), ("flat_map_contract".to_string(), FieldValue::Reference(DeclarationId(1179))), ("any_contract".to_string(), FieldValue::Reference(DeclarationId(1177))), ("all_contract".to_string(), FieldValue::Reference(DeclarationId(1178))), ("map_contract".to_string(), FieldValue::Reference(DeclarationId(1632))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 45105, 45981) }); + declarations.push(Declaration { id: DeclarationId(1634), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1038), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1038)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat_contract".to_string(), FieldValue::Reference(DeclarationId(1629))), ("length_contract".to_string(), FieldValue::Reference(DeclarationId(1630))), ("is_empty_contract".to_string(), FieldValue::Reference(DeclarationId(1631))), ("fold_contract".to_string(), FieldValue::Reference(DeclarationId(1632))), ("filter_contract".to_string(), FieldValue::Reference(DeclarationId(1177))), ("flat_map_contract".to_string(), FieldValue::Reference(DeclarationId(1180))), ("any_contract".to_string(), FieldValue::Reference(DeclarationId(1178))), ("all_contract".to_string(), FieldValue::Reference(DeclarationId(1179))), ("map_contract".to_string(), FieldValue::Reference(DeclarationId(1633))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 45105, 45981) }); declarations.push(Declaration { - id: DeclarationId(1634), + id: DeclarationId(1635), name: Some("rust_value_construction".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1038), + template: DeclarationId(1039), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1038)), + meta_tag: Some(DeclarationId(1039)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -61291,15 +61328,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 45983, 46255), }); declarations.push(Declaration { - id: DeclarationId(1635), + id: DeclarationId(1636), name: Some("rust_rendering".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1039), + template: DeclarationId(1040), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1039)), + meta_tag: Some(DeclarationId(1040)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -61307,14 +61344,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "read".to_string(), FieldValue::Variant { - constructor: DeclarationId(2306), + constructor: DeclarationId(2307), payload: vec![], }, ), ( "construct".to_string(), FieldValue::Variant { - constructor: DeclarationId(2308), + constructor: DeclarationId(2309), payload: vec![], }, ), @@ -61325,66 +61362,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 46257, 46338), }); declarations.push(Declaration { - id: DeclarationId(1636), + id: DeclarationId(1637), name: Some("rust_language".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1042), + template: DeclarationId(1043), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1042)), + meta_tag: Some(DeclarationId(1043)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "statements".to_string(), - FieldValue::Reference(DeclarationId(1618)), + FieldValue::Reference(DeclarationId(1619)), ), ( "expressions".to_string(), - FieldValue::Reference(DeclarationId(1619)), + FieldValue::Reference(DeclarationId(1620)), ), ( "control_flow".to_string(), - FieldValue::Reference(DeclarationId(1620)), + FieldValue::Reference(DeclarationId(1621)), ), ( "literals".to_string(), - FieldValue::Reference(DeclarationId(1621)), + FieldValue::Reference(DeclarationId(1622)), ), ( "modules".to_string(), - FieldValue::Reference(DeclarationId(1622)), + FieldValue::Reference(DeclarationId(1623)), ), ( "functions".to_string(), - FieldValue::Reference(DeclarationId(1623)), + FieldValue::Reference(DeclarationId(1624)), ), ( "type_applications".to_string(), - FieldValue::Reference(DeclarationId(1624)), + FieldValue::Reference(DeclarationId(1625)), ), ( "type_definitions".to_string(), - FieldValue::Reference(DeclarationId(1625)), + FieldValue::Reference(DeclarationId(1626)), ), ( "record_derive_templates".to_string(), - FieldValue::Reference(DeclarationId(1626)), + FieldValue::Reference(DeclarationId(1627)), ), ( "patterns".to_string(), - FieldValue::Reference(DeclarationId(1627)), + FieldValue::Reference(DeclarationId(1628)), ), ( "collection_ops".to_string(), - FieldValue::Reference(DeclarationId(1633)), + FieldValue::Reference(DeclarationId(1634)), ), ( "values".to_string(), - FieldValue::Reference(DeclarationId(1634)), + FieldValue::Reference(DeclarationId(1635)), ), ], }), @@ -61393,15 +61430,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 46340, 46785), }); declarations.push(Declaration { - id: DeclarationId(1637), + id: DeclarationId(1638), name: Some("rust_correction_style".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(922), + template: DeclarationId(923), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(922)), + meta_tag: Some(DeclarationId(923)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -61429,15 +61466,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 48209, 48348), }); declarations.push(Declaration { - id: DeclarationId(1638), + id: DeclarationId(1639), name: Some("rust_clean_emission".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(913), + template: DeclarationId(914), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(913)), + meta_tag: Some(DeclarationId(914)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -61445,55 +61482,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "expression_wrapping".to_string(), FieldValue::Variant { - constructor: DeclarationId(2133), + constructor: DeclarationId(2134), payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { - constructor: DeclarationId(2136), + constructor: DeclarationId(2137), payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { - constructor: DeclarationId(2140), + constructor: DeclarationId(2141), payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { - constructor: DeclarationId(2142), + constructor: DeclarationId(2143), payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { - constructor: DeclarationId(2145), + constructor: DeclarationId(2146), payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { - constructor: DeclarationId(2148), + constructor: DeclarationId(2149), payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { - constructor: DeclarationId(2151), + constructor: DeclarationId(2152), payload: vec![], }, ), ( "correction_style".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "post_emit_verifier".to_string(), @@ -61525,7 +61562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "output_policy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2154), + constructor: DeclarationId(2155), payload: vec![], }, ), @@ -61538,26 +61575,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 48350, 48963), }); declarations.push(Declaration { - id: DeclarationId(1639), + id: DeclarationId(1640), name: Some("rust_clean_emission_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(914), + template: DeclarationId(915), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(914)), + meta_tag: Some(DeclarationId(915)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "clean_emission".to_string(), - FieldValue::Reference(DeclarationId(1638)), + FieldValue::Reference(DeclarationId(1639)), ), ], }), @@ -61566,15 +61603,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 48965, 49095), }); declarations.push(Declaration { - id: DeclarationId(1640), + id: DeclarationId(1641), name: Some("rust_port_accessor".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(828), + template: DeclarationId(829), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(828)), + meta_tag: Some(DeclarationId(829)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -61590,15 +61627,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 50197, 50300), }); declarations.push(Declaration { - id: DeclarationId(1641), + id: DeclarationId(1642), name: Some("rust_node_accessor".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(828), + template: DeclarationId(829), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(828)), + meta_tag: Some(DeclarationId(829)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -61614,15 +61651,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 50302, 50405), }); declarations.push(Declaration { - id: DeclarationId(1642), + id: DeclarationId(1643), name: Some("rust_resolve_producer_accessor".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(828), + template: DeclarationId(829), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(828)), + meta_tag: Some(DeclarationId(829)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -61638,30 +61675,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 50407, 50534), }); declarations.push(Declaration { - id: DeclarationId(1643), + id: DeclarationId(1644), name: Some("port_binding_rust".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(829), + template: DeclarationId(830), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(829)), + meta_tag: Some(DeclarationId(830)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "accessor".to_string(), - FieldValue::Reference(DeclarationId(830)), + FieldValue::Reference(DeclarationId(831)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1640)), + FieldValue::Reference(DeclarationId(1641)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ], }), @@ -61670,30 +61707,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 50536, 50667), }); declarations.push(Declaration { - id: DeclarationId(1644), + id: DeclarationId(1645), name: Some("node_binding_rust".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(829), + template: DeclarationId(830), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(829)), + meta_tag: Some(DeclarationId(830)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "accessor".to_string(), - FieldValue::Reference(DeclarationId(831)), + FieldValue::Reference(DeclarationId(832)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1641)), + FieldValue::Reference(DeclarationId(1642)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ], }), @@ -61702,30 +61739,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 50669, 50800), }); declarations.push(Declaration { - id: DeclarationId(1645), + id: DeclarationId(1646), name: Some("resolve_producer_binding_rust".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(829), + template: DeclarationId(830), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(829)), + meta_tag: Some(DeclarationId(830)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "accessor".to_string(), - FieldValue::Reference(DeclarationId(832)), + FieldValue::Reference(DeclarationId(833)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1642)), + FieldValue::Reference(DeclarationId(1643)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ], }), @@ -61734,15 +61771,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 50802, 50969), }); declarations.push(Declaration { - id: DeclarationId(1646), + id: DeclarationId(1647), name: Some("rust_lane2_workflow_accessor".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(828), + template: DeclarationId(829), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(828)), + meta_tag: Some(DeclarationId(829)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -61758,30 +61795,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 51480, 51609), }); declarations.push(Declaration { - id: DeclarationId(1647), + id: DeclarationId(1648), name: Some("lane2_workflow_at_binding_rust".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(829), + template: DeclarationId(830), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(829)), + meta_tag: Some(DeclarationId(830)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "accessor".to_string(), - FieldValue::Reference(DeclarationId(835)), + FieldValue::Reference(DeclarationId(836)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1646)), + FieldValue::Reference(DeclarationId(1647)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ], }), @@ -61790,15 +61827,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 51611, 51778), }); declarations.push(Declaration { - id: DeclarationId(1648), + id: DeclarationId(1649), name: Some("rust_workflow_root_port_accessor".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(828), + template: DeclarationId(829), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(828)), + meta_tag: Some(DeclarationId(829)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -61814,30 +61851,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 52473, 52587), }); declarations.push(Declaration { - id: DeclarationId(1649), + id: DeclarationId(1650), name: Some("workflow_root_port_binding_rust".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(829), + template: DeclarationId(830), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(829)), + meta_tag: Some(DeclarationId(830)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "accessor".to_string(), - FieldValue::Reference(DeclarationId(837)), + FieldValue::Reference(DeclarationId(838)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1648)), + FieldValue::Reference(DeclarationId(1649)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ], }), @@ -61846,26 +61883,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 52589, 52762), }); declarations.push(Declaration { - id: DeclarationId(1650), + id: DeclarationId(1651), name: Some("rust_workflow_root".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1007), + template: DeclarationId(1008), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1007)), + meta_tag: Some(DeclarationId(1008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(836)), + FieldValue::Reference(DeclarationId(837)), ), ( "carrier".to_string(), @@ -61887,15 +61924,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 53174, 53335), }); declarations.push(Declaration { - id: DeclarationId(1651), + id: DeclarationId(1652), name: Some("rust_declaration_by_id_accessor".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(828), + template: DeclarationId(829), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(828)), + meta_tag: Some(DeclarationId(829)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -61911,30 +61948,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 53662, 53785), }); declarations.push(Declaration { - id: DeclarationId(1652), + id: DeclarationId(1653), name: Some("declaration_by_id_binding_rust".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(829), + template: DeclarationId(830), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(829)), + meta_tag: Some(DeclarationId(830)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "accessor".to_string(), - FieldValue::Reference(DeclarationId(833)), + FieldValue::Reference(DeclarationId(834)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1651)), + FieldValue::Reference(DeclarationId(1652)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ], }), @@ -61943,15 +61980,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 53787, 53957), }); declarations.push(Declaration { - id: DeclarationId(1653), + id: DeclarationId(1654), name: Some("rust_declaration_by_name_accessor".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(828), + template: DeclarationId(829), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(828)), + meta_tag: Some(DeclarationId(829)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -61967,30 +62004,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 54304, 54433), }); declarations.push(Declaration { - id: DeclarationId(1654), + id: DeclarationId(1655), name: Some("declaration_by_name_binding_rust".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(829), + template: DeclarationId(830), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(829)), + meta_tag: Some(DeclarationId(830)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "accessor".to_string(), - FieldValue::Reference(DeclarationId(834)), + FieldValue::Reference(DeclarationId(835)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1653)), + FieldValue::Reference(DeclarationId(1654)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ], }), @@ -61999,15 +62036,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 54435, 54611), }); declarations.push(Declaration { - id: DeclarationId(1655), + id: DeclarationId(1656), name: Some("rust_per_call_pattern_at_accessor".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(828), + template: DeclarationId(829), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(828)), + meta_tag: Some(DeclarationId(829)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -62023,30 +62060,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 54831, 54951), }); declarations.push(Declaration { - id: DeclarationId(1656), + id: DeclarationId(1657), name: Some("per_call_pattern_at_binding_rust".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(829), + template: DeclarationId(830), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(829)), + meta_tag: Some(DeclarationId(830)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "accessor".to_string(), - FieldValue::Reference(DeclarationId(928)), + FieldValue::Reference(DeclarationId(929)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1655)), + FieldValue::Reference(DeclarationId(1656)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1636)), + FieldValue::Reference(DeclarationId(1637)), ), ], }), @@ -62055,7 +62092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 54953, 55129), }); declarations.push(Declaration { - id: DeclarationId(1657), + id: DeclarationId(1658), name: Some("CompilerHostRealization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -62074,21 +62111,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 453, 502), }); declarations.push(Declaration { - id: DeclarationId(1658), + id: DeclarationId(1659), name: Some("PipelineSnapshotKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "SnapshotSurface".to_string(), - ty: DeclarationId(2701), + ty: DeclarationId(2702), }, Field { label: "SnapshotDag".to_string(), - ty: DeclarationId(2702), + ty: DeclarationId(2703), }, Field { label: "SnapshotText".to_string(), - ty: DeclarationId(2703), + ty: DeclarationId(2704), }, ], }, @@ -62103,21 +62140,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 504, 576), }); declarations.push(Declaration { - id: DeclarationId(1659), + id: DeclarationId(1660), name: Some("PipelineStageBinding".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "stage".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "realization".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "snapshot".to_string(), - ty: DeclarationId(1658), + ty: DeclarationId(1659), }, ], }, @@ -62132,7 +62169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 578, 694), }); declarations.push(Declaration { - id: DeclarationId(1660), + id: DeclarationId(1661), name: Some("parse_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -62142,7 +62179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1657)), + meta_tag: Some(DeclarationId(1658)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -62156,7 +62193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 696, 780), }); declarations.push(Declaration { - id: DeclarationId(1661), + id: DeclarationId(1662), name: Some("lower_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -62166,7 +62203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1657)), + meta_tag: Some(DeclarationId(1658)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -62180,7 +62217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 782, 866), }); declarations.push(Declaration { - id: DeclarationId(1662), + id: DeclarationId(1663), name: Some("infer_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -62190,7 +62227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1657)), + meta_tag: Some(DeclarationId(1658)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -62204,7 +62241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 868, 952), }); declarations.push(Declaration { - id: DeclarationId(1663), + id: DeclarationId(1664), name: Some("compute_ownership_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -62214,7 +62251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1657)), + meta_tag: Some(DeclarationId(1658)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -62230,7 +62267,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 954, 1062), }); declarations.push(Declaration { - id: DeclarationId(1664), + id: DeclarationId(1665), name: Some("emit_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -62240,7 +62277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1657)), + meta_tag: Some(DeclarationId(1658)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -62254,7 +62291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1064, 1146), }); declarations.push(Declaration { - id: DeclarationId(1665), + id: DeclarationId(1666), name: Some("lens_complexity_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -62264,7 +62301,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1657)), + meta_tag: Some(DeclarationId(1658)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -62280,31 +62317,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1148, 1252), }); declarations.push(Declaration { - id: DeclarationId(1666), + id: DeclarationId(1667), name: Some("parse_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1659), + template: DeclarationId(1660), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1659)), + meta_tag: Some(DeclarationId(1660)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1672)), + FieldValue::Reference(DeclarationId(1673)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1660)), + FieldValue::Reference(DeclarationId(1661)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2701), + constructor: DeclarationId(2702), payload: vec![], }, ), @@ -62315,31 +62352,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1254, 1382), }); declarations.push(Declaration { - id: DeclarationId(1667), + id: DeclarationId(1668), name: Some("lower_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1659), + template: DeclarationId(1660), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1659)), + meta_tag: Some(DeclarationId(1660)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1673)), + FieldValue::Reference(DeclarationId(1674)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1661)), + FieldValue::Reference(DeclarationId(1662)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2702), + constructor: DeclarationId(2703), payload: vec![], }, ), @@ -62350,31 +62387,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1384, 1508), }); declarations.push(Declaration { - id: DeclarationId(1668), + id: DeclarationId(1669), name: Some("infer_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1659), + template: DeclarationId(1660), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1659)), + meta_tag: Some(DeclarationId(1660)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1674)), + FieldValue::Reference(DeclarationId(1675)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1662)), + FieldValue::Reference(DeclarationId(1663)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2702), + constructor: DeclarationId(2703), payload: vec![], }, ), @@ -62385,31 +62422,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1510, 1634), }); declarations.push(Declaration { - id: DeclarationId(1669), + id: DeclarationId(1670), name: Some("compute_ownership_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1659), + template: DeclarationId(1660), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1659)), + meta_tag: Some(DeclarationId(1660)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1675)), + FieldValue::Reference(DeclarationId(1676)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1663)), + FieldValue::Reference(DeclarationId(1664)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2702), + constructor: DeclarationId(2703), payload: vec![], }, ), @@ -62420,31 +62457,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1636, 1796), }); declarations.push(Declaration { - id: DeclarationId(1670), + id: DeclarationId(1671), name: Some("lens_complexity_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1659), + template: DeclarationId(1660), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1659)), + meta_tag: Some(DeclarationId(1660)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1676)), + FieldValue::Reference(DeclarationId(1677)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1665)), + FieldValue::Reference(DeclarationId(1666)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2702), + constructor: DeclarationId(2703), payload: vec![], }, ), @@ -62455,31 +62492,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1798, 1952), }); declarations.push(Declaration { - id: DeclarationId(1671), + id: DeclarationId(1672), name: Some("emit_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1659), + template: DeclarationId(1660), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1659)), + meta_tag: Some(DeclarationId(1660)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1677)), + FieldValue::Reference(DeclarationId(1678)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1664)), + FieldValue::Reference(DeclarationId(1665)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2703), + constructor: DeclarationId(2704), payload: vec![], }, ), @@ -62490,12 +62527,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1954, 2076), }); declarations.push(Declaration { - id: DeclarationId(1672), + id: DeclarationId(1673), name: Some("parse".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230), DeclarationId(230)], - output: DeclarationId(827), - body: ArrowBody::ExternalRealization(DeclarationId(1660)), + output: DeclarationId(828), + body: ArrowBody::ExternalRealization(DeclarationId(1661)), }, type_params: vec![], phantom_params: Vec::new(), @@ -62508,12 +62545,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2078, 2140), }); declarations.push(Declaration { - id: DeclarationId(1673), + id: DeclarationId(1674), name: Some("lower".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827)], - output: DeclarationId(827), - body: ArrowBody::ExternalRealization(DeclarationId(1661)), + inputs: vec![DeclarationId(828)], + output: DeclarationId(828), + body: ArrowBody::ExternalRealization(DeclarationId(1662)), }, type_params: vec![], phantom_params: Vec::new(), @@ -62526,12 +62563,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2142, 2184), }); declarations.push(Declaration { - id: DeclarationId(1674), + id: DeclarationId(1675), name: Some("infer".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827)], - output: DeclarationId(827), - body: ArrowBody::ExternalRealization(DeclarationId(1662)), + inputs: vec![DeclarationId(828)], + output: DeclarationId(828), + body: ArrowBody::ExternalRealization(DeclarationId(1663)), }, type_params: vec![], phantom_params: Vec::new(), @@ -62544,12 +62581,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2186, 2228), }); declarations.push(Declaration { - id: DeclarationId(1675), + id: DeclarationId(1676), name: Some("compute_ownership".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827)], - output: DeclarationId(827), - body: ArrowBody::ExternalRealization(DeclarationId(1663)), + inputs: vec![DeclarationId(828)], + output: DeclarationId(828), + body: ArrowBody::ExternalRealization(DeclarationId(1664)), }, type_params: vec![], phantom_params: Vec::new(), @@ -62562,12 +62599,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2230, 2288), }); declarations.push(Declaration { - id: DeclarationId(1676), + id: DeclarationId(1677), name: Some("lens_complexity".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827)], - output: DeclarationId(827), - body: ArrowBody::ExternalRealization(DeclarationId(1665)), + inputs: vec![DeclarationId(828)], + output: DeclarationId(828), + body: ArrowBody::ExternalRealization(DeclarationId(1666)), }, type_params: vec![], phantom_params: Vec::new(), @@ -62580,17 +62617,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2290, 2347), }); declarations.push(Declaration { - id: DeclarationId(1677), + id: DeclarationId(1678), name: Some("emit".to_string()), connective: TypeConnective::Arrow { inputs: vec![ - DeclarationId(827), - DeclarationId(827), - DeclarationId(827), - DeclarationId(1042), + DeclarationId(828), + DeclarationId(828), + DeclarationId(828), + DeclarationId(1043), ], output: DeclarationId(230), - body: ArrowBody::ExternalRealization(DeclarationId(1664)), + body: ArrowBody::ExternalRealization(DeclarationId(1665)), }, type_params: vec![], phantom_params: Vec::new(), @@ -62603,10 +62640,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2349, 2460), }); declarations.push(Declaration { - id: DeclarationId(1678), + id: DeclarationId(1679), name: Some("compile".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(1042)], + inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(1043)], output: DeclarationId(230), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/compiler/pipeline.dag", @@ -62625,11 +62662,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2462, 2605), }); declarations.push(Declaration { - id: DeclarationId(1679), + id: DeclarationId(1680), name: Some("from_symbol".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], - output: DeclarationId(2704), + output: DeclarationId(2705), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/compiler/operators.dag", 156, @@ -62647,10 +62684,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 108, 771), }); declarations.push(Declaration { - id: DeclarationId(1680), + id: DeclarationId(1681), name: Some("symbol".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(805)], + inputs: vec![DeclarationId(806)], output: DeclarationId(230), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(826))), }, @@ -62665,10 +62702,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 773, 1214), }); declarations.push(Declaration { - id: DeclarationId(1681), + id: DeclarationId(1682), name: Some("algebra_field_name".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(805)], + inputs: vec![DeclarationId(806)], output: DeclarationId(230), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(843))), }, @@ -62683,7 +62720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 1216, 2017), }); declarations.push(Declaration { - id: DeclarationId(1682), + id: DeclarationId(1683), name: Some("LensRegistryEntry".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -62712,15 +62749,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 1950, 2045), }); declarations.push(Declaration { - id: DeclarationId(1683), + id: DeclarationId(1684), name: Some("lens_cost_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1682), + template: DeclarationId(1683), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1682)), + meta_tag: Some(DeclarationId(1683)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -62748,15 +62785,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2047, 2220), }); declarations.push(Declaration { - id: DeclarationId(1684), + id: DeclarationId(1685), name: Some("lens_cost_symbolic_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1682), + template: DeclarationId(1683), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1682)), + meta_tag: Some(DeclarationId(1683)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -62784,15 +62821,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2222, 2410), }); declarations.push(Declaration { - id: DeclarationId(1685), + id: DeclarationId(1686), name: Some("lens_cost_target_realization_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1682), + template: DeclarationId(1683), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1682)), + meta_tag: Some(DeclarationId(1683)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -62823,15 +62860,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2412, 2649), }); declarations.push(Declaration { - id: DeclarationId(1686), + id: DeclarationId(1687), name: Some("lens_effect_enumeration_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1682), + template: DeclarationId(1683), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1682)), + meta_tag: Some(DeclarationId(1683)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -62859,15 +62896,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2651, 2868), }); declarations.push(Declaration { - id: DeclarationId(1687), + id: DeclarationId(1688), name: Some("lens_provenance_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1682), + template: DeclarationId(1683), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1682)), + meta_tag: Some(DeclarationId(1683)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -62895,15 +62932,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2870, 3055), }); declarations.push(Declaration { - id: DeclarationId(1688), + id: DeclarationId(1689), name: Some("lens_structural_resolution_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1682), + template: DeclarationId(1683), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1682)), + meta_tag: Some(DeclarationId(1683)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -62934,15 +62971,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 3057, 3286), }); declarations.push(Declaration { - id: DeclarationId(1689), + id: DeclarationId(1690), name: Some("lens_unused_parameters_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1682), + template: DeclarationId(1683), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1682)), + meta_tag: Some(DeclarationId(1683)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -62970,15 +63007,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 3288, 3501), }); declarations.push(Declaration { - id: DeclarationId(1690), + id: DeclarationId(1691), name: Some("lens_infer_helpers_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1682), + template: DeclarationId(1683), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1682)), + meta_tag: Some(DeclarationId(1683)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -63006,15 +63043,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 4128, 4320), }); declarations.push(Declaration { - id: DeclarationId(1691), + id: DeclarationId(1692), name: Some("lens_variant_payload_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1682), + template: DeclarationId(1683), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1682)), + meta_tag: Some(DeclarationId(1683)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -63042,15 +63079,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 4322, 4522), }); declarations.push(Declaration { - id: DeclarationId(1692), + id: DeclarationId(1693), name: Some("lens_lower_helpers_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1682), + template: DeclarationId(1683), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1682)), + meta_tag: Some(DeclarationId(1683)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -63078,17 +63115,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 4772, 4964), }); declarations.push(Declaration { - id: DeclarationId(1693), + id: DeclarationId(1694), name: Some("IntegerAlgebra".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "OrderedRingAlgebra".to_string(), - ty: DeclarationId(2705), + ty: DeclarationId(2706), }, Field { label: "SemiringAlgebra".to_string(), - ty: DeclarationId(2706), + ty: DeclarationId(2707), }, ], }, @@ -63103,21 +63140,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6404, 6466), }); declarations.push(Declaration { - id: DeclarationId(1694), + id: DeclarationId(1695), name: Some("NonIntegerAlgebra".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ApproximateFieldAlgebra".to_string(), - ty: DeclarationId(2707), + ty: DeclarationId(2708), }, Field { label: "BooleanAlgebraAlgebra".to_string(), - ty: DeclarationId(2708), + ty: DeclarationId(2709), }, Field { label: "TerminalAlgebra".to_string(), - ty: DeclarationId(2709), + ty: DeclarationId(2710), }, ], }, @@ -63132,37 +63169,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6468, 6564), }); declarations.push(Declaration { - id: DeclarationId(1695), + id: DeclarationId(1696), name: Some("TargetCarrier".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "BitCarrier".to_string(), - ty: DeclarationId(2710), + ty: DeclarationId(2711), }, Field { label: "ByteCarrier".to_string(), - ty: DeclarationId(2711), + ty: DeclarationId(2712), }, Field { label: "Word16Carrier".to_string(), - ty: DeclarationId(2712), + ty: DeclarationId(2713), }, Field { label: "Word32Carrier".to_string(), - ty: DeclarationId(2713), + ty: DeclarationId(2714), }, Field { label: "Word64Carrier".to_string(), - ty: DeclarationId(2714), + ty: DeclarationId(2715), }, Field { label: "Word128Carrier".to_string(), - ty: DeclarationId(2715), + ty: DeclarationId(2716), }, Field { label: "TerminalCarrier".to_string(), - ty: DeclarationId(2716), + ty: DeclarationId(2717), }, ], }, @@ -63177,21 +63214,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8154, 8296), }); declarations.push(Declaration { - id: DeclarationId(1696), + id: DeclarationId(1697), name: Some("IntegerOverflow".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TwoComplementWrap".to_string(), - ty: DeclarationId(2717), + ty: DeclarationId(2718), }, Field { label: "Saturating".to_string(), - ty: DeclarationId(2718), + ty: DeclarationId(2719), }, Field { label: "Trap".to_string(), - ty: DeclarationId(2719), + ty: DeclarationId(2720), }, ], }, @@ -63206,17 +63243,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9013, 9079), }); declarations.push(Declaration { - id: DeclarationId(1697), + id: DeclarationId(1698), name: Some("RustPrimitive".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "IntegerPrimitive".to_string(), - ty: DeclarationId(2720), + ty: DeclarationId(2721), }, Field { label: "NonIntegerPrimitive".to_string(), - ty: DeclarationId(2721), + ty: DeclarationId(2722), }, ], }, @@ -63231,94 +63268,94 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9834, 10616), }); declarations.push(Declaration { - id: DeclarationId(1698), + id: DeclarationId(1699), name: Some("rust_pilot_primitives".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1697), + parameter: DeclarationId(687), + value: DeclarationId(1698), }], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(2722)), + meta_tag: Some(DeclarationId(2723)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ FieldValue::Variant { - constructor: DeclarationId(2720), + constructor: DeclarationId(2721), payload: vec![ FieldValue::Literal(LiteralBits::String("i8".to_string())), FieldValue::Variant { - constructor: DeclarationId(2705), + constructor: DeclarationId(2706), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2711), + constructor: DeclarationId(2712), payload: vec![], }, FieldValue::Literal(LiteralBits::String("-128".to_string())), FieldValue::Literal(LiteralBits::String("127".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2717), + constructor: DeclarationId(2718), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2720), + constructor: DeclarationId(2721), payload: vec![ FieldValue::Literal(LiteralBits::String("i16".to_string())), FieldValue::Variant { - constructor: DeclarationId(2705), + constructor: DeclarationId(2706), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2712), + constructor: DeclarationId(2713), payload: vec![], }, FieldValue::Literal(LiteralBits::String("-32768".to_string())), FieldValue::Literal(LiteralBits::String("32767".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2717), + constructor: DeclarationId(2718), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2720), + constructor: DeclarationId(2721), payload: vec![ FieldValue::Literal(LiteralBits::String("i32".to_string())), FieldValue::Variant { - constructor: DeclarationId(2705), + constructor: DeclarationId(2706), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2713), + constructor: DeclarationId(2714), payload: vec![], }, FieldValue::Literal(LiteralBits::String("-2147483648".to_string())), FieldValue::Literal(LiteralBits::String("2147483647".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2717), + constructor: DeclarationId(2718), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2720), + constructor: DeclarationId(2721), payload: vec![ FieldValue::Literal(LiteralBits::String("i64".to_string())), FieldValue::Variant { - constructor: DeclarationId(2705), + constructor: DeclarationId(2706), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2714), + constructor: DeclarationId(2715), payload: vec![], }, FieldValue::Literal(LiteralBits::String( @@ -63327,21 +63364,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2717), + constructor: DeclarationId(2718), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2720), + constructor: DeclarationId(2721), payload: vec![ FieldValue::Literal(LiteralBits::String("i128".to_string())), FieldValue::Variant { - constructor: DeclarationId(2705), + constructor: DeclarationId(2706), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2715), + constructor: DeclarationId(2716), payload: vec![], }, FieldValue::Literal(LiteralBits::String( @@ -63352,84 +63389,84 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { )), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2717), + constructor: DeclarationId(2718), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2720), + constructor: DeclarationId(2721), payload: vec![ FieldValue::Literal(LiteralBits::String("u8".to_string())), FieldValue::Variant { - constructor: DeclarationId(2706), + constructor: DeclarationId(2707), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2711), + constructor: DeclarationId(2712), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), FieldValue::Literal(LiteralBits::String("255".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2717), + constructor: DeclarationId(2718), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2720), + constructor: DeclarationId(2721), payload: vec![ FieldValue::Literal(LiteralBits::String("u16".to_string())), FieldValue::Variant { - constructor: DeclarationId(2706), + constructor: DeclarationId(2707), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2712), + constructor: DeclarationId(2713), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), FieldValue::Literal(LiteralBits::String("65535".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2717), + constructor: DeclarationId(2718), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2720), + constructor: DeclarationId(2721), payload: vec![ FieldValue::Literal(LiteralBits::String("u32".to_string())), FieldValue::Variant { - constructor: DeclarationId(2706), + constructor: DeclarationId(2707), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2713), + constructor: DeclarationId(2714), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), FieldValue::Literal(LiteralBits::String("4294967295".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2717), + constructor: DeclarationId(2718), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2720), + constructor: DeclarationId(2721), payload: vec![ FieldValue::Literal(LiteralBits::String("u64".to_string())), FieldValue::Variant { - constructor: DeclarationId(2706), + constructor: DeclarationId(2707), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2714), + constructor: DeclarationId(2715), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), @@ -63438,21 +63475,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { )), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2717), + constructor: DeclarationId(2718), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2720), + constructor: DeclarationId(2721), payload: vec![ FieldValue::Literal(LiteralBits::String("u128".to_string())), FieldValue::Variant { - constructor: DeclarationId(2706), + constructor: DeclarationId(2707), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2715), + constructor: DeclarationId(2716), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), @@ -63461,66 +63498,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { )), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2717), + constructor: DeclarationId(2718), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2721), + constructor: DeclarationId(2722), payload: vec![ FieldValue::Literal(LiteralBits::String("f32".to_string())), FieldValue::Variant { - constructor: DeclarationId(2707), + constructor: DeclarationId(2708), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2713), + constructor: DeclarationId(2714), payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), ], }, FieldValue::Variant { - constructor: DeclarationId(2721), + constructor: DeclarationId(2722), payload: vec![ FieldValue::Literal(LiteralBits::String("f64".to_string())), FieldValue::Variant { - constructor: DeclarationId(2707), + constructor: DeclarationId(2708), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2714), + constructor: DeclarationId(2715), payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), ], }, FieldValue::Variant { - constructor: DeclarationId(2721), + constructor: DeclarationId(2722), payload: vec![ FieldValue::Literal(LiteralBits::String("bool".to_string())), FieldValue::Variant { - constructor: DeclarationId(2708), + constructor: DeclarationId(2709), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2710), + constructor: DeclarationId(2711), payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), ], }, FieldValue::Variant { - constructor: DeclarationId(2721), + constructor: DeclarationId(2722), payload: vec![ FieldValue::Literal(LiteralBits::String("()".to_string())), FieldValue::Variant { - constructor: DeclarationId(2709), + constructor: DeclarationId(2710), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2716), + constructor: DeclarationId(2717), payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), @@ -63532,29 +63569,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10937, 15602), }); declarations.push(Declaration { - id: DeclarationId(1699), + id: DeclarationId(1700), name: Some("CronField".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Wildcard".to_string(), - ty: DeclarationId(2723), + ty: DeclarationId(2724), }, Field { label: "Exact".to_string(), - ty: DeclarationId(2724), + ty: DeclarationId(2725), }, Field { label: "Listed".to_string(), - ty: DeclarationId(2726), + ty: DeclarationId(2727), }, Field { label: "Ranged".to_string(), - ty: DeclarationId(2727), + ty: DeclarationId(2728), }, Field { label: "Step".to_string(), - ty: DeclarationId(2728), + ty: DeclarationId(2729), }, ], }, @@ -63569,29 +63606,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4214, 4433), }); declarations.push(Declaration { - id: DeclarationId(1700), + id: DeclarationId(1701), name: Some("CronSchedule".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "minute".to_string(), - ty: DeclarationId(1699), + ty: DeclarationId(1700), }, Field { label: "hour".to_string(), - ty: DeclarationId(1699), + ty: DeclarationId(1700), }, Field { label: "day_of_month".to_string(), - ty: DeclarationId(1699), + ty: DeclarationId(1700), }, Field { label: "month".to_string(), - ty: DeclarationId(1699), + ty: DeclarationId(1700), }, Field { label: "day_of_week".to_string(), - ty: DeclarationId(1699), + ty: DeclarationId(1700), }, ], }, @@ -63606,7 +63643,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4435, 4564), }); declarations.push(Declaration { - id: DeclarationId(1701), + id: DeclarationId(1702), name: Some("CronEntry".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -63616,7 +63653,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "schedule".to_string(), - ty: DeclarationId(1700), + ty: DeclarationId(1701), }, Field { label: "command".to_string(), @@ -63635,10 +63672,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4566, 4641), }); declarations.push(Declaration { - id: DeclarationId(1702), + id: DeclarationId(1703), name: Some("render_cron_field".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1699)], + inputs: vec![DeclarationId(1700)], output: DeclarationId(230), body: ArrowBody::Unparsed(SourceSpan::new( "dsl/extdeps/cron_schedule_model.dag", @@ -63657,10 +63694,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4643, 4963), }); declarations.push(Declaration { - id: DeclarationId(1703), + id: DeclarationId(1704), name: Some("render_cron_schedule".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1700)], + inputs: vec![DeclarationId(1701)], output: DeclarationId(230), body: ArrowBody::Unparsed(SourceSpan::new( "dsl/extdeps/cron_schedule_model.dag", @@ -63679,7 +63716,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4965, 5253), }); declarations.push(Declaration { - id: DeclarationId(1704), + id: DeclarationId(1705), name: Some("wire_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(312), @@ -63700,21 +63737,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 684, 758), }); declarations.push(Declaration { - id: DeclarationId(1705), + id: DeclarationId(1706), name: Some("UserType".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "User".to_string(), - ty: DeclarationId(2729), + ty: DeclarationId(2730), }, Field { label: "Bot".to_string(), - ty: DeclarationId(2730), + ty: DeclarationId(2731), }, Field { label: "Organization".to_string(), - ty: DeclarationId(2731), + ty: DeclarationId(2732), }, ], }, @@ -63729,7 +63766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 831, 872), }); declarations.push(Declaration { - id: DeclarationId(1706), + id: DeclarationId(1707), name: Some("GitHubUser".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -63743,7 +63780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type".to_string(), - ty: DeclarationId(1705), + ty: DeclarationId(1706), }, ], }, @@ -63758,7 +63795,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 874, 936), }); declarations.push(Declaration { - id: DeclarationId(1707), + id: DeclarationId(1708), name: Some("Repository".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -63795,7 +63832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1009, 1120), }); declarations.push(Declaration { - id: DeclarationId(1708), + id: DeclarationId(1709), name: Some("GitHubAuthToken".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -63805,11 +63842,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "scopes".to_string(), - ty: DeclarationId(2732), + ty: DeclarationId(2733), }, Field { label: "expires_at".to_string(), - ty: DeclarationId(2733), + ty: DeclarationId(2734), }, ], }, @@ -63824,29 +63861,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1193, 1286), }); declarations.push(Declaration { - id: DeclarationId(1709), + id: DeclarationId(1710), name: Some("GitHubScope".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ScopeRepo".to_string(), - ty: DeclarationId(2734), + ty: DeclarationId(2735), }, Field { label: "ScopeGist".to_string(), - ty: DeclarationId(2735), + ty: DeclarationId(2736), }, Field { label: "ScopeWorkflow".to_string(), - ty: DeclarationId(2736), + ty: DeclarationId(2737), }, Field { label: "ScopeReadOrg".to_string(), - ty: DeclarationId(2737), + ty: DeclarationId(2738), }, Field { label: "ScopeReadUser".to_string(), - ty: DeclarationId(2738), + ty: DeclarationId(2739), }, ], }, @@ -63861,7 +63898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1288, 1385), }); declarations.push(Declaration { - id: DeclarationId(1710), + id: DeclarationId(1711), name: Some("Pagination".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -63871,7 +63908,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "cursor".to_string(), - ty: DeclarationId(2739), + ty: DeclarationId(2740), }, Field { label: "has_next".to_string(), @@ -63890,21 +63927,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1510, 1580), }); declarations.push(Declaration { - id: DeclarationId(1711), + id: DeclarationId(1712), name: Some("GitHubPermission".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "PermRead".to_string(), - ty: DeclarationId(2740), + ty: DeclarationId(2741), }, Field { label: "PermWrite".to_string(), - ty: DeclarationId(2741), + ty: DeclarationId(2742), }, Field { label: "PermAdmin".to_string(), - ty: DeclarationId(2742), + ty: DeclarationId(2743), }, ], }, @@ -63919,7 +63956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1653, 1709), }); declarations.push(Declaration { - id: DeclarationId(1712), + id: DeclarationId(1713), name: Some("default_api_base".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -63938,7 +63975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1782, 1838), }); declarations.push(Declaration { - id: DeclarationId(1713), + id: DeclarationId(1714), name: Some("default_per_page".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(93), @@ -63955,7 +63992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1840, 1871), }); declarations.push(Declaration { - id: DeclarationId(1714), + id: DeclarationId(1715), name: Some("max_per_page".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(93), @@ -63972,7 +64009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1873, 1901), }); declarations.push(Declaration { - id: DeclarationId(1715), + id: DeclarationId(1716), name: Some("Workflow".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -63982,19 +64019,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "on".to_string(), - ty: DeclarationId(2743), + ty: DeclarationId(2744), }, Field { label: "jobs".to_string(), - ty: DeclarationId(2744), + ty: DeclarationId(2745), }, Field { label: "env".to_string(), - ty: DeclarationId(2745), + ty: DeclarationId(2746), }, Field { label: "permissions".to_string(), - ty: DeclarationId(2746), + ty: DeclarationId(2747), }, ], }, @@ -64009,25 +64046,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 792, 933), }); declarations.push(Declaration { - id: DeclarationId(1716), + id: DeclarationId(1717), name: Some("WorkflowPermissions".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "contents".to_string(), - ty: DeclarationId(1717), + ty: DeclarationId(1718), }, Field { label: "pull_requests".to_string(), - ty: DeclarationId(1717), + ty: DeclarationId(1718), }, Field { label: "issues".to_string(), - ty: DeclarationId(1717), + ty: DeclarationId(1718), }, Field { label: "actions".to_string(), - ty: DeclarationId(1717), + ty: DeclarationId(1718), }, ], }, @@ -64042,21 +64079,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 935, 1077), }); declarations.push(Declaration { - id: DeclarationId(1717), + id: DeclarationId(1718), name: Some("PermissionLevel".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "PermRead".to_string(), - ty: DeclarationId(2747), + ty: DeclarationId(2748), }, Field { label: "PermWrite".to_string(), - ty: DeclarationId(2748), + ty: DeclarationId(2749), }, Field { label: "PermNone".to_string(), - ty: DeclarationId(2749), + ty: DeclarationId(2750), }, ], }, @@ -64071,29 +64108,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1079, 1133), }); declarations.push(Declaration { - id: DeclarationId(1718), + id: DeclarationId(1719), name: Some("WorkflowTrigger".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Push".to_string(), - ty: DeclarationId(2752), + ty: DeclarationId(2753), }, Field { label: "PullRequest".to_string(), - ty: DeclarationId(2755), + ty: DeclarationId(2756), }, Field { label: "Schedule".to_string(), - ty: DeclarationId(2756), + ty: DeclarationId(2757), }, Field { label: "WorkflowDispatch".to_string(), - ty: DeclarationId(2758), + ty: DeclarationId(2759), }, Field { label: "WorkflowCall".to_string(), - ty: DeclarationId(2760), + ty: DeclarationId(2761), }, ], }, @@ -64108,25 +64145,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1249, 1541), }); declarations.push(Declaration { - id: DeclarationId(1719), + id: DeclarationId(1720), name: Some("PullRequestActivity".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Opened".to_string(), - ty: DeclarationId(2761), + ty: DeclarationId(2762), }, Field { label: "Synchronize".to_string(), - ty: DeclarationId(2762), + ty: DeclarationId(2763), }, Field { label: "Reopened".to_string(), - ty: DeclarationId(2763), + ty: DeclarationId(2764), }, Field { label: "Closed".to_string(), - ty: DeclarationId(2764), + ty: DeclarationId(2765), }, ], }, @@ -64141,7 +64178,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1543, 1618), }); declarations.push(Declaration { - id: DeclarationId(1720), + id: DeclarationId(1721), name: Some("DispatchInput".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -64151,7 +64188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "description".to_string(), - ty: DeclarationId(2765), + ty: DeclarationId(2766), }, Field { label: "required".to_string(), @@ -64159,11 +64196,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "default".to_string(), - ty: DeclarationId(2766), + ty: DeclarationId(2767), }, Field { label: "type".to_string(), - ty: DeclarationId(1721), + ty: DeclarationId(1722), }, ], }, @@ -64178,25 +64215,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1620, 1742), }); declarations.push(Declaration { - id: DeclarationId(1721), + id: DeclarationId(1722), name: Some("DispatchInputType".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "InputString".to_string(), - ty: DeclarationId(2767), + ty: DeclarationId(2768), }, Field { label: "InputBoolean".to_string(), - ty: DeclarationId(2768), + ty: DeclarationId(2769), }, Field { label: "InputChoice".to_string(), - ty: DeclarationId(2769), + ty: DeclarationId(2770), }, Field { label: "InputEnvironment".to_string(), - ty: DeclarationId(2770), + ty: DeclarationId(2771), }, ], }, @@ -64211,21 +64248,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1744, 1828), }); declarations.push(Declaration { - id: DeclarationId(1722), + id: DeclarationId(1723), name: Some("SecretScope".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "StepScope".to_string(), - ty: DeclarationId(2771), + ty: DeclarationId(2772), }, Field { label: "JobScope".to_string(), - ty: DeclarationId(2772), + ty: DeclarationId(2773), }, Field { label: "WorkflowScope".to_string(), - ty: DeclarationId(2773), + ty: DeclarationId(2774), }, ], }, @@ -64240,7 +64277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 3785, 3840), }); declarations.push(Declaration { - id: DeclarationId(1723), + id: DeclarationId(1724), name: Some("WorkflowSecret".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -64250,7 +64287,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "scope".to_string(), - ty: DeclarationId(1722), + ty: DeclarationId(1723), }, ], }, @@ -64265,7 +64302,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4115, 4178), }); declarations.push(Declaration { - id: DeclarationId(1724), + id: DeclarationId(1725), name: Some("Job".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -64275,35 +64312,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "name".to_string(), - ty: DeclarationId(2774), + ty: DeclarationId(2775), }, Field { label: "runner".to_string(), - ty: DeclarationId(1726), + ty: DeclarationId(1727), }, Field { label: "steps".to_string(), - ty: DeclarationId(2775), + ty: DeclarationId(2776), }, Field { label: "needs".to_string(), - ty: DeclarationId(2776), + ty: DeclarationId(2777), }, Field { label: "env".to_string(), - ty: DeclarationId(2777), + ty: DeclarationId(2778), }, Field { label: "if_condition".to_string(), - ty: DeclarationId(2778), + ty: DeclarationId(2779), }, Field { label: "strategy".to_string(), - ty: DeclarationId(2779), + ty: DeclarationId(2780), }, Field { label: "timeout_minutes".to_string(), - ty: DeclarationId(2780), + ty: DeclarationId(2781), }, Field { label: "continue_on_error".to_string(), @@ -64311,7 +64348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "concurrency".to_string(), - ty: DeclarationId(2781), + ty: DeclarationId(2782), }, ], }, @@ -64326,7 +64363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4322, 4587), }); declarations.push(Declaration { - id: DeclarationId(1725), + id: DeclarationId(1726), name: Some("ConcurrencySpec".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -64351,17 +64388,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4589, 4656), }); declarations.push(Declaration { - id: DeclarationId(1726), + id: DeclarationId(1727), name: Some("RunnerSpec".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "HostedRunner".to_string(), - ty: DeclarationId(2782), + ty: DeclarationId(2783), }, Field { label: "SelfHosted".to_string(), - ty: DeclarationId(2784), + ty: DeclarationId(2785), }, ], }, @@ -64376,33 +64413,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4772, 4867), }); declarations.push(Declaration { - id: DeclarationId(1727), + id: DeclarationId(1728), name: Some("RunnerLabel".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "UbuntuLatest".to_string(), - ty: DeclarationId(2785), + ty: DeclarationId(2786), }, Field { label: "Ubuntu2404".to_string(), - ty: DeclarationId(2786), + ty: DeclarationId(2787), }, Field { label: "Ubuntu2204".to_string(), - ty: DeclarationId(2787), + ty: DeclarationId(2788), }, Field { label: "MacosLatest".to_string(), - ty: DeclarationId(2788), + ty: DeclarationId(2789), }, Field { label: "Macos14".to_string(), - ty: DeclarationId(2789), + ty: DeclarationId(2790), }, Field { label: "WindowsLatest".to_string(), - ty: DeclarationId(2790), + ty: DeclarationId(2791), }, ], }, @@ -64417,17 +64454,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4869, 4978), }); declarations.push(Declaration { - id: DeclarationId(1728), + id: DeclarationId(1729), name: Some("Step".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "RunStep".to_string(), - ty: DeclarationId(2796), + ty: DeclarationId(2797), }, Field { label: "UsesStep".to_string(), - ty: DeclarationId(2802), + ty: DeclarationId(2803), }, ], }, @@ -64442,29 +64479,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5123, 5588), }); declarations.push(Declaration { - id: DeclarationId(1729), + id: DeclarationId(1730), name: Some("ShellType".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Bash".to_string(), - ty: DeclarationId(2803), + ty: DeclarationId(2804), }, Field { label: "Sh".to_string(), - ty: DeclarationId(2804), + ty: DeclarationId(2805), }, Field { label: "Pwsh".to_string(), - ty: DeclarationId(2805), + ty: DeclarationId(2806), }, Field { label: "Python".to_string(), - ty: DeclarationId(2806), + ty: DeclarationId(2807), }, Field { label: "Cmd".to_string(), - ty: DeclarationId(2807), + ty: DeclarationId(2808), }, ], }, @@ -64479,7 +64516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5590, 5638), }); declarations.push(Declaration { - id: DeclarationId(1730), + id: DeclarationId(1731), name: Some("ActionRef".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -64508,41 +64545,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5640, 5703), }); declarations.push(Declaration { - id: DeclarationId(1731), + id: DeclarationId(1732), name: Some("LogAnnotation".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "AnnotationError".to_string(), - ty: DeclarationId(2811), + ty: DeclarationId(2812), }, Field { label: "AnnotationWarning".to_string(), - ty: DeclarationId(2815), + ty: DeclarationId(2816), }, Field { label: "AnnotationNotice".to_string(), - ty: DeclarationId(2819), + ty: DeclarationId(2820), }, Field { label: "AnnotationGroup".to_string(), - ty: DeclarationId(2820), + ty: DeclarationId(2821), }, Field { label: "AnnotationEndGroup".to_string(), - ty: DeclarationId(2821), + ty: DeclarationId(2822), }, Field { label: "SetOutput".to_string(), - ty: DeclarationId(2822), + ty: DeclarationId(2823), }, Field { label: "AddMask".to_string(), - ty: DeclarationId(2823), + ty: DeclarationId(2824), }, Field { label: "StopCommands".to_string(), - ty: DeclarationId(2824), + ty: DeclarationId(2825), }, ], }, @@ -64557,7 +64594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5937, 6364), }); declarations.push(Declaration { - id: DeclarationId(1732), + id: DeclarationId(1733), name: Some("annotation_error_prefix".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -64576,7 +64613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6430, 6479), }); declarations.push(Declaration { - id: DeclarationId(1733), + id: DeclarationId(1734), name: Some("annotation_warning_prefix".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -64595,7 +64632,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6480, 6533), }); declarations.push(Declaration { - id: DeclarationId(1734), + id: DeclarationId(1735), name: Some("annotation_notice_prefix".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -64614,7 +64651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6534, 6585), }); declarations.push(Declaration { - id: DeclarationId(1735), + id: DeclarationId(1736), name: Some("annotation_group_prefix".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -64633,7 +64670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6586, 6636), }); declarations.push(Declaration { - id: DeclarationId(1736), + id: DeclarationId(1737), name: Some("annotation_endgroup".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -64652,7 +64689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6637, 6686), }); declarations.push(Declaration { - id: DeclarationId(1737), + id: DeclarationId(1738), name: Some("annotation_set_output_prefix".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -64671,7 +64708,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6687, 6751), }); declarations.push(Declaration { - id: DeclarationId(1738), + id: DeclarationId(1739), name: Some("annotation_add_mask_prefix".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -64690,7 +64727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6752, 6808), }); declarations.push(Declaration { - id: DeclarationId(1739), + id: DeclarationId(1740), name: Some("annotation_stop_commands_prefix".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -64709,17 +64746,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6809, 6875), }); declarations.push(Declaration { - id: DeclarationId(1740), + id: DeclarationId(1741), name: Some("ArtifactOp".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Upload".to_string(), - ty: DeclarationId(2826), + ty: DeclarationId(2827), }, Field { label: "Download".to_string(), - ty: DeclarationId(2828), + ty: DeclarationId(2829), }, ], }, @@ -64734,21 +64771,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7097, 7262), }); declarations.push(Declaration { - id: DeclarationId(1741), + id: DeclarationId(1742), name: Some("MissingFilesBehavior".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Warn".to_string(), - ty: DeclarationId(2829), + ty: DeclarationId(2830), }, Field { label: "ErrorOut".to_string(), - ty: DeclarationId(2830), + ty: DeclarationId(2831), }, Field { label: "Ignore".to_string(), - ty: DeclarationId(2831), + ty: DeclarationId(2832), }, ], }, @@ -64763,15 +64800,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7264, 7316), }); declarations.push(Declaration { - id: DeclarationId(1742), + id: DeclarationId(1743), name: Some("upload_artifact_action".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1730), + template: DeclarationId(1731), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1730)), + meta_tag: Some(DeclarationId(1731)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -64784,15 +64821,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7367, 7476), }); declarations.push(Declaration { - id: DeclarationId(1743), + id: DeclarationId(1744), name: Some("download_artifact_action".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1730), + template: DeclarationId(1731), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1730)), + meta_tag: Some(DeclarationId(1731)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -64805,21 +64842,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7478, 7591), }); declarations.push(Declaration { - id: DeclarationId(1744), + id: DeclarationId(1745), name: Some("MatrixStrategy".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "dimensions".to_string(), - ty: DeclarationId(2833), + ty: DeclarationId(2834), }, Field { label: "include".to_string(), - ty: DeclarationId(2835), + ty: DeclarationId(2836), }, Field { label: "exclude".to_string(), - ty: DeclarationId(2837), + ty: DeclarationId(2838), }, Field { label: "fail_fast".to_string(), @@ -64827,7 +64864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "max_parallel".to_string(), - ty: DeclarationId(2838), + ty: DeclarationId(2839), }, ], }, @@ -64842,33 +64879,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7730, 7906), }); declarations.push(Declaration { - id: DeclarationId(1745), + id: DeclarationId(1746), name: Some("CheckConclusion".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Success".to_string(), - ty: DeclarationId(2839), + ty: DeclarationId(2840), }, Field { label: "Failure".to_string(), - ty: DeclarationId(2840), + ty: DeclarationId(2841), }, Field { label: "Cancelled".to_string(), - ty: DeclarationId(2841), + ty: DeclarationId(2842), }, Field { label: "Skipped".to_string(), - ty: DeclarationId(2842), + ty: DeclarationId(2843), }, Field { label: "TimedOut".to_string(), - ty: DeclarationId(2843), + ty: DeclarationId(2844), }, Field { label: "ActionRequired".to_string(), - ty: DeclarationId(2844), + ty: DeclarationId(2845), }, ], }, @@ -64883,15 +64920,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8035, 8137), }); declarations.push(Declaration { - id: DeclarationId(1746), + id: DeclarationId(1747), name: Some("checkout_action".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1730), + template: DeclarationId(1731), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1730)), + meta_tag: Some(DeclarationId(1731)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -64904,15 +64941,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8263, 8358), }); declarations.push(Declaration { - id: DeclarationId(1747), + id: DeclarationId(1748), name: Some("setup_rust_action".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1730), + template: DeclarationId(1731), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1730)), + meta_tag: Some(DeclarationId(1731)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -64925,15 +64962,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8360, 8484), }); declarations.push(Declaration { - id: DeclarationId(1748), + id: DeclarationId(1749), name: Some("cache_action".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1730), + template: DeclarationId(1731), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1730)), + meta_tag: Some(DeclarationId(1731)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -64946,7 +64983,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8486, 8575), }); declarations.push(Declaration { - id: DeclarationId(1749), + id: DeclarationId(1750), name: Some("max_job_timeout_minutes".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(93), @@ -64963,7 +65000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8651, 8690), }); declarations.push(Declaration { - id: DeclarationId(1750), + id: DeclarationId(1751), name: Some("default_job_timeout_minutes".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(93), @@ -64980,7 +65017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8692, 8735), }); declarations.push(Declaration { - id: DeclarationId(1751), + id: DeclarationId(1752), name: Some("max_matrix_combinations".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(93), @@ -64997,13 +65034,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8737, 8776), }); declarations.push(Declaration { - id: DeclarationId(1752), + id: DeclarationId(1753), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(688), + parameter: DeclarationId(687), + value: DeclarationId(689), }], }, type_params: vec![], @@ -65017,13 +65054,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3259, 3272), }); declarations.push(Declaration { - id: DeclarationId(1753), + id: DeclarationId(1754), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(690), + parameter: DeclarationId(687), + value: DeclarationId(691), }], }, type_params: vec![], @@ -65037,13 +65074,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3421, 3434), }); declarations.push(Declaration { - id: DeclarationId(1754), + id: DeclarationId(1755), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(690), + parameter: DeclarationId(687), + value: DeclarationId(691), }], }, type_params: vec![], @@ -65057,13 +65094,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3439, 3452), }); declarations.push(Declaration { - id: DeclarationId(1755), + id: DeclarationId(1756), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(692), + parameter: DeclarationId(687), + value: DeclarationId(693), }], }, type_params: vec![], @@ -65077,13 +65114,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3556, 3569), }); declarations.push(Declaration { - id: DeclarationId(1756), + id: DeclarationId(1757), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(694), + parameter: DeclarationId(687), + value: DeclarationId(695), }], }, type_params: vec![], @@ -65097,11 +65134,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4162, 4169), }); declarations.push(Declaration { - id: DeclarationId(1757), + id: DeclarationId(1758), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(695), DeclarationId(694)], - output: DeclarationId(695), + inputs: vec![DeclarationId(696), DeclarationId(695)], + output: DeclarationId(696), body: ArrowBody::NoBody, }, type_params: vec![], @@ -65115,13 +65152,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(1758), + id: DeclarationId(1759), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(697), + parameter: DeclarationId(687), + value: DeclarationId(698), }], }, type_params: vec![], @@ -65135,11 +65172,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4617, 4624), }); declarations.push(Declaration { - id: DeclarationId(1759), + id: DeclarationId(1760), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(697), DeclarationId(698)], - output: DeclarationId(698), + inputs: vec![DeclarationId(698), DeclarationId(699)], + output: DeclarationId(699), body: ArrowBody::NoBody, }, type_params: vec![], @@ -65153,13 +65190,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4638, 4651), }); declarations.push(Declaration { - id: DeclarationId(1760), + id: DeclarationId(1761), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(700), + parameter: DeclarationId(687), + value: DeclarationId(701), }], }, type_params: vec![], @@ -65173,13 +65210,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5336, 5349), }); declarations.push(Declaration { - id: DeclarationId(1761), + id: DeclarationId(1762), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(700), + parameter: DeclarationId(687), + value: DeclarationId(701), }], }, type_params: vec![], @@ -65193,13 +65230,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5354, 5367), }); declarations.push(Declaration { - id: DeclarationId(1762), + id: DeclarationId(1763), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(700), + parameter: DeclarationId(687), + value: DeclarationId(701), }], }, type_params: vec![], @@ -65213,13 +65250,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5372, 5385), }); declarations.push(Declaration { - id: DeclarationId(1763), + id: DeclarationId(1764), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(702), + parameter: DeclarationId(687), + value: DeclarationId(703), }], }, type_params: vec![], @@ -65233,11 +65270,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5686, 5693), }); declarations.push(Declaration { - id: DeclarationId(1764), + id: DeclarationId(1765), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(702)], - output: DeclarationId(703), + inputs: vec![DeclarationId(703)], + output: DeclarationId(704), body: ArrowBody::NoBody, }, type_params: vec![], @@ -65251,13 +65288,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5698, 5708), }); declarations.push(Declaration { - id: DeclarationId(1765), + id: DeclarationId(1766), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(703), + parameter: DeclarationId(687), + value: DeclarationId(704), }], }, type_params: vec![], @@ -65271,13 +65308,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5713, 5720), }); declarations.push(Declaration { - id: DeclarationId(1766), + id: DeclarationId(1767), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(705), + parameter: DeclarationId(687), + value: DeclarationId(706), }], }, type_params: vec![], @@ -65291,10 +65328,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5867, 5874), }); declarations.push(Declaration { - id: DeclarationId(1767), + id: DeclarationId(1768), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(705)], + inputs: vec![DeclarationId(706)], output: DeclarationId(128), body: ArrowBody::NoBody, }, @@ -65309,13 +65346,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892), }); declarations.push(Declaration { - id: DeclarationId(1768), + id: DeclarationId(1769), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(705), + parameter: DeclarationId(687), + value: DeclarationId(706), }], }, type_params: vec![], @@ -65329,13 +65366,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5897, 5904), }); declarations.push(Declaration { - id: DeclarationId(1769), + id: DeclarationId(1770), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(707), + parameter: DeclarationId(687), + value: DeclarationId(708), }], }, type_params: vec![], @@ -65349,13 +65386,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6130, 6137), }); declarations.push(Declaration { - id: DeclarationId(1770), + id: DeclarationId(1771), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(708), + parameter: DeclarationId(687), + value: DeclarationId(709), }], }, type_params: vec![], @@ -65369,11 +65406,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6151, 6158), }); declarations.push(Declaration { - id: DeclarationId(1771), + id: DeclarationId(1772), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(707)], - output: DeclarationId(1770), + inputs: vec![DeclarationId(708)], + output: DeclarationId(1771), body: ArrowBody::NoBody, }, type_params: vec![], @@ -65387,13 +65424,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6142, 6158), }); declarations.push(Declaration { - id: DeclarationId(1772), + id: DeclarationId(1773), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(708), + parameter: DeclarationId(687), + value: DeclarationId(709), }], }, type_params: vec![], @@ -65407,13 +65444,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6163, 6170), }); declarations.push(Declaration { - id: DeclarationId(1773), + id: DeclarationId(1774), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(710), + parameter: DeclarationId(687), + value: DeclarationId(711), }], }, type_params: vec![], @@ -65427,13 +65464,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6356, 6363), }); declarations.push(Declaration { - id: DeclarationId(1774), + id: DeclarationId(1775), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(712), + parameter: DeclarationId(687), + value: DeclarationId(713), }], }, type_params: vec![], @@ -65447,13 +65484,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6588, 6595), }); declarations.push(Declaration { - id: DeclarationId(1775), + id: DeclarationId(1776), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(716), + parameter: DeclarationId(687), + value: DeclarationId(717), }], }, type_params: vec![], @@ -65467,13 +65504,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7202, 7209), }); declarations.push(Declaration { - id: DeclarationId(1776), + id: DeclarationId(1777), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(713), + template: DeclarationId(714), arguments: vec![TemplateArgument { - parameter: DeclarationId(714), - value: DeclarationId(716), + parameter: DeclarationId(715), + value: DeclarationId(717), }], }, type_params: vec![], @@ -65487,13 +65524,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7219, 7236), }); declarations.push(Declaration { - id: DeclarationId(1777), + id: DeclarationId(1778), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1776), + parameter: DeclarationId(687), + value: DeclarationId(1777), }], }, type_params: vec![], @@ -65507,13 +65544,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7214, 7237), }); declarations.push(Declaration { - id: DeclarationId(1778), + id: DeclarationId(1779), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(718), + parameter: DeclarationId(687), + value: DeclarationId(719), }], }, type_params: vec![], @@ -65527,13 +65564,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7415, 7422), }); declarations.push(Declaration { - id: DeclarationId(1779), + id: DeclarationId(1780), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(713), + template: DeclarationId(714), arguments: vec![TemplateArgument { - parameter: DeclarationId(714), - value: DeclarationId(718), + parameter: DeclarationId(715), + value: DeclarationId(719), }], }, type_params: vec![], @@ -65547,13 +65584,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7444, 7461), }); declarations.push(Declaration { - id: DeclarationId(1780), + id: DeclarationId(1781), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1779), + parameter: DeclarationId(687), + value: DeclarationId(1780), }], }, type_params: vec![], @@ -65567,13 +65604,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7439, 7462), }); declarations.push(Declaration { - id: DeclarationId(1781), + id: DeclarationId(1782), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(720), + parameter: DeclarationId(687), + value: DeclarationId(721), }], }, type_params: vec![], @@ -65587,7 +65624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 8177, 8184), }); declarations.push(Declaration { - id: DeclarationId(1782), + id: DeclarationId(1783), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -65601,13 +65638,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 2106, 2111), }); declarations.push(Declaration { - id: DeclarationId(1783), + id: DeclarationId(1784), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(686), + parameter: DeclarationId(687), + value: DeclarationId(687), }], }, type_params: vec![], @@ -65621,17 +65658,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 2144, 2157), }); declarations.push(Declaration { - id: DeclarationId(1784), + id: DeclarationId(1785), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "head".to_string(), - ty: DeclarationId(686), + ty: DeclarationId(687), }, Field { label: "tail".to_string(), - ty: DeclarationId(1783), + ty: DeclarationId(1784), }, ], }, @@ -65646,13 +65683,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 2116, 2159), }); declarations.push(Declaration { - id: DeclarationId(1785), + id: DeclarationId(1786), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(726), + parameter: DeclarationId(687), + value: DeclarationId(727), }], }, type_params: vec![], @@ -65666,13 +65703,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1477, 1490), }); declarations.push(Declaration { - id: DeclarationId(1786), + id: DeclarationId(1787), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(728), + parameter: DeclarationId(687), + value: DeclarationId(729), }], }, type_params: vec![], @@ -65686,7 +65723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1570, 1583), }); declarations.push(Declaration { - id: DeclarationId(1787), + id: DeclarationId(1788), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -65705,13 +65742,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), }); declarations.push(Declaration { - id: DeclarationId(1788), + id: DeclarationId(1789), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(812), + template: DeclarationId(813), arguments: vec![TemplateArgument { - parameter: DeclarationId(813), - value: DeclarationId(744), + parameter: DeclarationId(814), + value: DeclarationId(745), }], }, type_params: vec![], @@ -65725,13 +65762,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20916, 20943), }); declarations.push(Declaration { - id: DeclarationId(1789), + id: DeclarationId(1790), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(713), + template: DeclarationId(714), arguments: vec![TemplateArgument { - parameter: DeclarationId(714), - value: DeclarationId(744), + parameter: DeclarationId(715), + value: DeclarationId(745), }], }, type_params: vec![], @@ -65745,13 +65782,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20995, 21026), }); declarations.push(Declaration { - id: DeclarationId(1790), + id: DeclarationId(1791), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(812), + template: DeclarationId(813), arguments: vec![TemplateArgument { - parameter: DeclarationId(813), - value: DeclarationId(744), + parameter: DeclarationId(814), + value: DeclarationId(745), }], }, type_params: vec![], @@ -65765,11 +65802,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21058), }); declarations.push(Declaration { - id: DeclarationId(1791), + id: DeclarationId(1792), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1790), + DeclarationId(1791), CardinalityBound::AtMostOne, ), ), @@ -65784,13 +65821,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), }); declarations.push(Declaration { - id: DeclarationId(1792), + id: DeclarationId(1793), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(744), + parameter: DeclarationId(687), + value: DeclarationId(745), }], }, type_params: vec![], @@ -65804,13 +65841,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21185, 21206), }); declarations.push(Declaration { - id: DeclarationId(1793), + id: DeclarationId(1794), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(812), + template: DeclarationId(813), arguments: vec![TemplateArgument { - parameter: DeclarationId(813), - value: DeclarationId(744), + parameter: DeclarationId(814), + value: DeclarationId(745), }], }, type_params: vec![], @@ -65824,11 +65861,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21238), }); declarations.push(Declaration { - id: DeclarationId(1794), + id: DeclarationId(1795), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1793), + DeclarationId(1794), CardinalityBound::AtMostOne, ), ), @@ -65843,13 +65880,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), }); declarations.push(Declaration { - id: DeclarationId(1795), + id: DeclarationId(1796), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(744), + parameter: DeclarationId(687), + value: DeclarationId(745), }], }, type_params: vec![], @@ -65863,7 +65900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 22268, 22289), }); declarations.push(Declaration { - id: DeclarationId(1796), + id: DeclarationId(1797), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -65882,7 +65919,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), }); declarations.push(Declaration { - id: DeclarationId(1797), + id: DeclarationId(1798), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -65901,7 +65938,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), }); declarations.push(Declaration { - id: DeclarationId(1798), + id: DeclarationId(1799), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -65920,13 +65957,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), }); declarations.push(Declaration { - id: DeclarationId(1799), + id: DeclarationId(1800), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(744), + parameter: DeclarationId(687), + value: DeclarationId(745), }], }, type_params: vec![], @@ -65940,13 +65977,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 36581, 36602), }); declarations.push(Declaration { - id: DeclarationId(1800), + id: DeclarationId(1801), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(775), + parameter: DeclarationId(687), + value: DeclarationId(776), }], }, type_params: vec![], @@ -65960,7 +65997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 36608, 36639), }); declarations.push(Declaration { - id: DeclarationId(1801), + id: DeclarationId(1802), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -65979,7 +66016,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 7532, 7561), }); declarations.push(Declaration { - id: DeclarationId(1802), + id: DeclarationId(1803), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -65998,13 +66035,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 7566, 7595), }); declarations.push(Declaration { - id: DeclarationId(1803), + id: DeclarationId(1804), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(729), + parameter: DeclarationId(687), + value: DeclarationId(730), }], }, type_params: vec![], @@ -66018,13 +66055,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 7627, 7645), }); declarations.push(Declaration { - id: DeclarationId(1804), + id: DeclarationId(1805), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(729), + parameter: DeclarationId(687), + value: DeclarationId(730), }], }, type_params: vec![], @@ -66038,12 +66075,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8066, 8084), }); declarations.push(Declaration { - id: DeclarationId(1805), + id: DeclarationId(1806), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "tokens".to_string(), - ty: DeclarationId(1804), + ty: DeclarationId(1805), }], }, type_params: vec![], @@ -66057,7 +66094,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8036, 8086), }); declarations.push(Declaration { - id: DeclarationId(1806), + id: DeclarationId(1807), name: None, connective: TypeConnective::Conj { children: vec![ @@ -66082,12 +66119,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8091, 8147), }); declarations.push(Declaration { - id: DeclarationId(1807), + id: DeclarationId(1808), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "template".to_string(), - ty: DeclarationId(730), + ty: DeclarationId(731), }], }, type_params: vec![], @@ -66101,7 +66138,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8510, 8555), }); declarations.push(Declaration { - id: DeclarationId(1808), + id: DeclarationId(1809), name: None, connective: TypeConnective::Conj { children: vec![ @@ -66130,7 +66167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8560, 8630), }); declarations.push(Declaration { - id: DeclarationId(1809), + id: DeclarationId(1810), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66144,12 +66181,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14355, 14365), }); declarations.push(Declaration { - id: DeclarationId(1810), + id: DeclarationId(1811), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "key_source".to_string(), - ty: DeclarationId(740), + ty: DeclarationId(741), }], }, type_params: vec![], @@ -66163,12 +66200,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14370, 14408), }); declarations.push(Declaration { - id: DeclarationId(1811), + id: DeclarationId(1812), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "key_source".to_string(), - ty: DeclarationId(740), + ty: DeclarationId(741), }], }, type_params: vec![], @@ -66182,12 +66219,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14413, 14451), }); declarations.push(Declaration { - id: DeclarationId(1812), + id: DeclarationId(1813), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "cause".to_string(), - ty: DeclarationId(739), + ty: DeclarationId(740), }], }, type_params: vec![], @@ -66201,7 +66238,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14697, 14732), }); declarations.push(Declaration { - id: DeclarationId(1813), + id: DeclarationId(1814), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66215,12 +66252,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14737, 14749), }); declarations.push(Declaration { - id: DeclarationId(1814), + id: DeclarationId(1815), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(736), + ty: DeclarationId(737), }], }, type_params: vec![], @@ -66234,12 +66271,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 15171, 15200), }); declarations.push(Declaration { - id: DeclarationId(1815), + id: DeclarationId(1816), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(737), + ty: DeclarationId(738), }], }, type_params: vec![], @@ -66253,7 +66290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 15205, 15230), }); declarations.push(Declaration { - id: DeclarationId(1816), + id: DeclarationId(1817), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66267,7 +66304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 15743, 15753), }); declarations.push(Declaration { - id: DeclarationId(1817), + id: DeclarationId(1818), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -66286,7 +66323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 15758, 15796), }); declarations.push(Declaration { - id: DeclarationId(1818), + id: DeclarationId(1819), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -66305,7 +66342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 16501, 16528), }); declarations.push(Declaration { - id: DeclarationId(1819), + id: DeclarationId(1820), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -66324,12 +66361,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 16533, 16561), }); declarations.push(Declaration { - id: DeclarationId(1820), + id: DeclarationId(1821), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -66344,12 +66381,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 16589, 16601), }); declarations.push(Declaration { - id: DeclarationId(1821), + id: DeclarationId(1822), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "fields".to_string(), - ty: DeclarationId(1820), + ty: DeclarationId(1821), }], }, type_params: vec![], @@ -66363,7 +66400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 16566, 16603), }); declarations.push(Declaration { - id: DeclarationId(1822), + id: DeclarationId(1823), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66377,7 +66414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 17280, 17293), }); declarations.push(Declaration { - id: DeclarationId(1823), + id: DeclarationId(1824), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66391,7 +66428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 17298, 17312), }); declarations.push(Declaration { - id: DeclarationId(1824), + id: DeclarationId(1825), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -66410,12 +66447,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 17317, 17349), }); declarations.push(Declaration { - id: DeclarationId(1825), + id: DeclarationId(1826), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "effect".to_string(), - ty: DeclarationId(744), + ty: DeclarationId(745), }], }, type_params: vec![], @@ -66429,7 +66466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 19519, 19560), }); declarations.push(Declaration { - id: DeclarationId(1826), + id: DeclarationId(1827), name: None, connective: TypeConnective::Conj { children: vec![ @@ -66454,7 +66491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 19565, 19634), }); declarations.push(Declaration { - id: DeclarationId(1827), + id: DeclarationId(1828), name: None, connective: TypeConnective::Conj { children: vec![ @@ -66491,7 +66528,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 19639, 19789), }); declarations.push(Declaration { - id: DeclarationId(1828), + id: DeclarationId(1829), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66505,13 +66542,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20538, 20559), }); declarations.push(Declaration { - id: DeclarationId(1829), + id: DeclarationId(1830), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(812), + template: DeclarationId(813), arguments: vec![TemplateArgument { - parameter: DeclarationId(813), - value: DeclarationId(744), + parameter: DeclarationId(814), + value: DeclarationId(745), }], }, type_params: vec![], @@ -66525,12 +66562,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20590, 20617), }); declarations.push(Declaration { - id: DeclarationId(1830), + id: DeclarationId(1831), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "first_breaker".to_string(), - ty: DeclarationId(1829), + ty: DeclarationId(1830), }], }, type_params: vec![], @@ -66544,13 +66581,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20564, 20619), }); declarations.push(Declaration { - id: DeclarationId(1831), + id: DeclarationId(1832), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(744), + parameter: DeclarationId(687), + value: DeclarationId(745), }], }, type_params: vec![], @@ -66564,12 +66601,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24543, 24564), }); declarations.push(Declaration { - id: DeclarationId(1832), + id: DeclarationId(1833), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "ops".to_string(), - ty: DeclarationId(1831), + ty: DeclarationId(1832), }], }, type_params: vec![], @@ -66583,13 +66620,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24523, 24566), }); declarations.push(Declaration { - id: DeclarationId(1833), + id: DeclarationId(1834), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(727), + template: DeclarationId(728), arguments: vec![TemplateArgument { - parameter: DeclarationId(728), - value: DeclarationId(753), + parameter: DeclarationId(729), + value: DeclarationId(754), }], }, type_params: vec![], @@ -66603,12 +66640,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24592, 24619), }); declarations.push(Declaration { - id: DeclarationId(1834), + id: DeclarationId(1835), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "arms".to_string(), - ty: DeclarationId(1833), + ty: DeclarationId(1834), }], }, type_params: vec![], @@ -66622,12 +66659,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24571, 24621), }); declarations.push(Declaration { - id: DeclarationId(1835), + id: DeclarationId(1836), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "body".to_string(), - ty: DeclarationId(754), + ty: DeclarationId(755), }], }, type_params: vec![], @@ -66641,13 +66678,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24626, 24661), }); declarations.push(Declaration { - id: DeclarationId(1836), + id: DeclarationId(1837), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(727), + template: DeclarationId(728), arguments: vec![TemplateArgument { - parameter: DeclarationId(728), - value: DeclarationId(754), + parameter: DeclarationId(729), + value: DeclarationId(755), }], }, type_params: vec![], @@ -66661,12 +66698,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24693, 24725), }); declarations.push(Declaration { - id: DeclarationId(1837), + id: DeclarationId(1838), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "branches".to_string(), - ty: DeclarationId(1836), + ty: DeclarationId(1837), }], }, type_params: vec![], @@ -66680,12 +66717,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24666, 24727), }); declarations.push(Declaration { - id: DeclarationId(1838), + id: DeclarationId(1839), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(746), + ty: DeclarationId(747), }], }, type_params: vec![], @@ -66699,12 +66736,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25364, 25410), }); declarations.push(Declaration { - id: DeclarationId(1839), + id: DeclarationId(1840), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(755), + ty: DeclarationId(756), }], }, type_params: vec![], @@ -66718,7 +66755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25415, 25467), }); declarations.push(Declaration { - id: DeclarationId(1840), + id: DeclarationId(1841), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66732,7 +66769,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25964, 25984), }); declarations.push(Declaration { - id: DeclarationId(1841), + id: DeclarationId(1842), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66746,7 +66783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25989, 26010), }); declarations.push(Declaration { - id: DeclarationId(1842), + id: DeclarationId(1843), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66760,7 +66797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26015, 26038), }); declarations.push(Declaration { - id: DeclarationId(1843), + id: DeclarationId(1844), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66774,7 +66811,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26043, 26061), }); declarations.push(Declaration { - id: DeclarationId(1844), + id: DeclarationId(1845), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66788,12 +66825,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26066, 26084), }); declarations.push(Declaration { - id: DeclarationId(1845), + id: DeclarationId(1846), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(746), + ty: DeclarationId(747), }], }, type_params: vec![], @@ -66807,12 +66844,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26401, 26447), }); declarations.push(Declaration { - id: DeclarationId(1846), + id: DeclarationId(1847), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(759), + ty: DeclarationId(760), }], }, type_params: vec![], @@ -66826,7 +66863,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26452, 26504), }); declarations.push(Declaration { - id: DeclarationId(1847), + id: DeclarationId(1848), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66840,7 +66877,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 32458, 32464), }); declarations.push(Declaration { - id: DeclarationId(1848), + id: DeclarationId(1849), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -66859,7 +66896,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 32469, 32506), }); declarations.push(Declaration { - id: DeclarationId(1849), + id: DeclarationId(1850), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -66878,7 +66915,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 32511, 32548), }); declarations.push(Declaration { - id: DeclarationId(1850), + id: DeclarationId(1851), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66892,12 +66929,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 33022, 33041), }); declarations.push(Declaration { - id: DeclarationId(1851), + id: DeclarationId(1852), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "agreement".to_string(), - ty: DeclarationId(769), + ty: DeclarationId(770), }], }, type_params: vec![], @@ -66911,11 +66948,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 33046, 33095), }); declarations.push(Declaration { - id: DeclarationId(1852), + id: DeclarationId(1853), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(780), + DeclarationId(781), CardinalityBound::AtMostOne, ), ), @@ -66930,11 +66967,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), }); declarations.push(Declaration { - id: DeclarationId(1853), + id: DeclarationId(1854), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(826), + DeclarationId(827), CardinalityBound::AtMostOne, ), ), @@ -66949,11 +66986,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), }); declarations.push(Declaration { - id: DeclarationId(1854), + id: DeclarationId(1855), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(826), + DeclarationId(827), CardinalityBound::AtMostOne, ), ), @@ -66968,11 +67005,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), }); declarations.push(Declaration { - id: DeclarationId(1855), + id: DeclarationId(1856), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(798), + DeclarationId(799), CardinalityBound::AtMostOne, ), ), @@ -66987,11 +67024,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), }); declarations.push(Declaration { - id: DeclarationId(1856), + id: DeclarationId(1857), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(798), + DeclarationId(799), CardinalityBound::AtMostOne, ), ), @@ -67006,11 +67043,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), }); declarations.push(Declaration { - id: DeclarationId(1857), + id: DeclarationId(1858), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(754), + DeclarationId(755), CardinalityBound::AtMostOne, ), ), @@ -67025,13 +67062,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), }); declarations.push(Declaration { - id: DeclarationId(1858), + id: DeclarationId(1859), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1134), + template: DeclarationId(1135), arguments: vec![TemplateArgument { - parameter: DeclarationId(1135), - value: DeclarationId(723), + parameter: DeclarationId(1136), + value: DeclarationId(724), }], }, type_params: vec![], @@ -67045,13 +67082,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 27728, 27749), }); declarations.push(Declaration { - id: DeclarationId(1859), + id: DeclarationId(1860), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1134), + template: DeclarationId(1135), arguments: vec![TemplateArgument { - parameter: DeclarationId(1135), - value: DeclarationId(723), + parameter: DeclarationId(1136), + value: DeclarationId(724), }], }, type_params: vec![], @@ -67065,7 +67102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 27813, 27834), }); declarations.push(Declaration { - id: DeclarationId(1860), + id: DeclarationId(1861), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67079,12 +67116,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 479, 489), }); declarations.push(Declaration { - id: DeclarationId(1861), + id: DeclarationId(1862), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(778), + ty: DeclarationId(779), }], }, type_params: vec![], @@ -67098,7 +67135,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 494, 513), }); declarations.push(Declaration { - id: DeclarationId(1862), + id: DeclarationId(1863), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67112,11 +67149,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 518, 528), }); declarations.push(Declaration { - id: DeclarationId(1863), + id: DeclarationId(1864), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(721), + DeclarationId(722), CardinalityBound::AtMostOne, ), ), @@ -67131,7 +67168,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), }); declarations.push(Declaration { - id: DeclarationId(1864), + id: DeclarationId(1865), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67150,7 +67187,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 1104, 1118), }); declarations.push(Declaration { - id: DeclarationId(1865), + id: DeclarationId(1866), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67169,7 +67206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 1123, 1136), }); declarations.push(Declaration { - id: DeclarationId(1866), + id: DeclarationId(1867), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67188,12 +67225,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 1141, 1158), }); declarations.push(Declaration { - id: DeclarationId(1867), + id: DeclarationId(1868), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(781), + ty: DeclarationId(782), }], }, type_params: vec![], @@ -67207,7 +67244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 3291, 3311), }); declarations.push(Declaration { - id: DeclarationId(1868), + id: DeclarationId(1869), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67226,12 +67263,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 3316, 3344), }); declarations.push(Declaration { - id: DeclarationId(1869), + id: DeclarationId(1870), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }], }, type_params: vec![], @@ -67245,12 +67282,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 3349, 3383), }); declarations.push(Declaration { - id: DeclarationId(1870), + id: DeclarationId(1871), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }], }, type_params: vec![], @@ -67264,7 +67301,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 3388, 3417), }); declarations.push(Declaration { - id: DeclarationId(1871), + id: DeclarationId(1872), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67283,7 +67320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 3422, 3439), }); declarations.push(Declaration { - id: DeclarationId(1872), + id: DeclarationId(1873), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67297,12 +67334,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 4063, 4070), }); declarations.push(Declaration { - id: DeclarationId(1873), + id: DeclarationId(1874), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "previous".to_string(), - ty: DeclarationId(783), + ty: DeclarationId(784), }], }, type_params: vec![], @@ -67316,7 +67353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 4075, 4125), }); declarations.push(Declaration { - id: DeclarationId(1874), + id: DeclarationId(1875), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67335,7 +67372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5689, 5713), }); declarations.push(Declaration { - id: DeclarationId(1875), + id: DeclarationId(1876), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67349,12 +67386,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5738, 5747), }); declarations.push(Declaration { - id: DeclarationId(1876), + id: DeclarationId(1877), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(783), + ty: DeclarationId(784), }], }, type_params: vec![], @@ -67368,17 +67405,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5752, 5788), }); declarations.push(Declaration { - id: DeclarationId(1877), + id: DeclarationId(1878), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "lower".to_string(), - ty: DeclarationId(786), + ty: DeclarationId(787), }, Field { label: "width".to_string(), - ty: DeclarationId(784), + ty: DeclarationId(785), }, ], }, @@ -67393,7 +67430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6100, 6150), }); declarations.push(Declaration { - id: DeclarationId(1878), + id: DeclarationId(1879), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67407,12 +67444,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6155, 6164), }); declarations.push(Declaration { - id: DeclarationId(1879), + id: DeclarationId(1880), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(785), + template: DeclarationId(786), arguments: vec![TemplateArgument { - parameter: DeclarationId(786), + parameter: DeclarationId(787), value: DeclarationId(93), }], }, @@ -67427,12 +67464,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6740, 6753), }); declarations.push(Declaration { - id: DeclarationId(1880), + id: DeclarationId(1881), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1879), + ty: DeclarationId(1880), }], }, type_params: vec![], @@ -67446,7 +67483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6728, 6754), }); declarations.push(Declaration { - id: DeclarationId(1881), + id: DeclarationId(1882), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67460,7 +67497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6759, 6776), }); declarations.push(Declaration { - id: DeclarationId(1882), + id: DeclarationId(1883), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67479,7 +67516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7027, 7037), }); declarations.push(Declaration { - id: DeclarationId(1883), + id: DeclarationId(1884), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67493,7 +67530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7042, 7051), }); declarations.push(Declaration { - id: DeclarationId(1884), + id: DeclarationId(1885), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67507,12 +67544,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7056, 7065), }); declarations.push(Declaration { - id: DeclarationId(1885), + id: DeclarationId(1886), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(781), + ty: DeclarationId(782), }], }, type_params: vec![], @@ -67526,12 +67563,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7492, 7512), }); declarations.push(Declaration { - id: DeclarationId(1886), + id: DeclarationId(1887), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }], }, type_params: vec![], @@ -67545,13 +67582,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7517, 7541), }); declarations.push(Declaration { - id: DeclarationId(1887), + id: DeclarationId(1888), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(792), + parameter: DeclarationId(687), + value: DeclarationId(793), }], }, type_params: vec![], @@ -67565,12 +67602,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7553, 7569), }); declarations.push(Declaration { - id: DeclarationId(1888), + id: DeclarationId(1889), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1887), + ty: DeclarationId(1888), }], }, type_params: vec![], @@ -67584,13 +67621,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7546, 7570), }); declarations.push(Declaration { - id: DeclarationId(1889), + id: DeclarationId(1890), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(793), + parameter: DeclarationId(687), + value: DeclarationId(794), }], }, type_params: vec![], @@ -67604,12 +67641,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7580, 7596), }); declarations.push(Declaration { - id: DeclarationId(1890), + id: DeclarationId(1891), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1889), + ty: DeclarationId(1890), }], }, type_params: vec![], @@ -67623,13 +67660,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7575, 7597), }); declarations.push(Declaration { - id: DeclarationId(1891), + id: DeclarationId(1892), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(792), + parameter: DeclarationId(687), + value: DeclarationId(793), }], }, type_params: vec![], @@ -67643,12 +67680,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7606, 7622), }); declarations.push(Declaration { - id: DeclarationId(1892), + id: DeclarationId(1893), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1891), + ty: DeclarationId(1892), }], }, type_params: vec![], @@ -67662,13 +67699,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7602, 7623), }); declarations.push(Declaration { - id: DeclarationId(1893), + id: DeclarationId(1894), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(793), + parameter: DeclarationId(687), + value: DeclarationId(794), }], }, type_params: vec![], @@ -67682,17 +67719,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7686, 7702), }); declarations.push(Declaration { - id: DeclarationId(1894), + id: DeclarationId(1895), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "constructor".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }, Field { label: "payload".to_string(), - ty: DeclarationId(1893), + ty: DeclarationId(1894), }, ], }, @@ -67707,7 +67744,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7628, 7708), }); declarations.push(Declaration { - id: DeclarationId(1895), + id: DeclarationId(1896), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67726,13 +67763,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9321, 9350), }); declarations.push(Declaration { - id: DeclarationId(1896), + id: DeclarationId(1897), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(792), + parameter: DeclarationId(687), + value: DeclarationId(793), }], }, type_params: vec![], @@ -67746,12 +67783,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9385, 9401), }); declarations.push(Declaration { - id: DeclarationId(1897), + id: DeclarationId(1898), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "fields".to_string(), - ty: DeclarationId(1896), + ty: DeclarationId(1897), }], }, type_params: vec![], @@ -67765,12 +67802,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9355, 9403), }); declarations.push(Declaration { - id: DeclarationId(1898), + id: DeclarationId(1899), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(781), + ty: DeclarationId(782), }], }, type_params: vec![], @@ -67784,13 +67821,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9408, 9436), }); declarations.push(Declaration { - id: DeclarationId(1899), + id: DeclarationId(1900), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(793), + parameter: DeclarationId(687), + value: DeclarationId(794), }], }, type_params: vec![], @@ -67804,12 +67841,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9455, 9471), }); declarations.push(Declaration { - id: DeclarationId(1900), + id: DeclarationId(1901), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1899), + ty: DeclarationId(1900), }], }, type_params: vec![], @@ -67823,13 +67860,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9441, 9472), }); declarations.push(Declaration { - id: DeclarationId(1901), + id: DeclarationId(1902), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(792), + parameter: DeclarationId(687), + value: DeclarationId(793), }], }, type_params: vec![], @@ -67843,12 +67880,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9490, 9506), }); declarations.push(Declaration { - id: DeclarationId(1902), + id: DeclarationId(1903), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1901), + ty: DeclarationId(1902), }], }, type_params: vec![], @@ -67862,12 +67899,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9477, 9507), }); declarations.push(Declaration { - id: DeclarationId(1903), + id: DeclarationId(1904), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(795), + ty: DeclarationId(796), }], }, type_params: vec![], @@ -67881,12 +67918,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10761, 10784), }); declarations.push(Declaration { - id: DeclarationId(1904), + id: DeclarationId(1905), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }], }, type_params: vec![], @@ -67900,7 +67937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10789, 10823), }); declarations.push(Declaration { - id: DeclarationId(1905), + id: DeclarationId(1906), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67914,7 +67951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10828, 10835), }); declarations.push(Declaration { - id: DeclarationId(1906), + id: DeclarationId(1907), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67928,7 +67965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10840, 10846), }); declarations.push(Declaration { - id: DeclarationId(1907), + id: DeclarationId(1908), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67947,12 +67984,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10851, 10871), }); declarations.push(Declaration { - id: DeclarationId(1908), + id: DeclarationId(1909), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(782), + ty: DeclarationId(783), }], }, type_params: vec![], @@ -67966,13 +68003,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11100, 11117), }); declarations.push(Declaration { - id: DeclarationId(1909), + id: DeclarationId(1910), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(790), + parameter: DeclarationId(687), + value: DeclarationId(791), }], }, type_params: vec![], @@ -67986,12 +68023,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11139, 11154), }); declarations.push(Declaration { - id: DeclarationId(1910), + id: DeclarationId(1911), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "children".to_string(), - ty: DeclarationId(1909), + ty: DeclarationId(1910), }], }, type_params: vec![], @@ -68005,13 +68042,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11122, 11156), }); declarations.push(Declaration { - id: DeclarationId(1911), + id: DeclarationId(1912), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(790), + parameter: DeclarationId(687), + value: DeclarationId(791), }], }, type_params: vec![], @@ -68025,12 +68062,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11178, 11193), }); declarations.push(Declaration { - id: DeclarationId(1912), + id: DeclarationId(1913), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "variants".to_string(), - ty: DeclarationId(1911), + ty: DeclarationId(1912), }], }, type_params: vec![], @@ -68044,13 +68081,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11161, 11195), }); declarations.push(Declaration { - id: DeclarationId(1913), + id: DeclarationId(1914), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(723), + parameter: DeclarationId(687), + value: DeclarationId(724), }], }, type_params: vec![], @@ -68064,21 +68101,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11222, 11241), }); declarations.push(Declaration { - id: DeclarationId(1914), + id: DeclarationId(1915), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "inputs".to_string(), - ty: DeclarationId(1913), + ty: DeclarationId(1914), }, Field { label: "output".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }, Field { label: "body".to_string(), - ty: DeclarationId(796), + ty: DeclarationId(797), }, ], }, @@ -68093,17 +68130,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11200, 11297), }); declarations.push(Declaration { - id: DeclarationId(1915), + id: DeclarationId(1916), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "element".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }, Field { label: "bound".to_string(), - ty: DeclarationId(789), + ty: DeclarationId(790), }, ], }, @@ -68118,13 +68155,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11302, 11380), }); declarations.push(Declaration { - id: DeclarationId(1916), + id: DeclarationId(1917), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(791), + parameter: DeclarationId(687), + value: DeclarationId(792), }], }, type_params: vec![], @@ -68138,17 +68175,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11448, 11470), }); declarations.push(Declaration { - id: DeclarationId(1917), + id: DeclarationId(1918), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "template".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }, Field { label: "arguments".to_string(), - ty: DeclarationId(1916), + ty: DeclarationId(1917), }, ], }, @@ -68163,7 +68200,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11385, 11476), }); declarations.push(Declaration { - id: DeclarationId(1918), + id: DeclarationId(1919), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -68182,13 +68219,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), }); declarations.push(Declaration { - id: DeclarationId(1919), + id: DeclarationId(1920), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(723), + parameter: DeclarationId(687), + value: DeclarationId(724), }], }, type_params: vec![], @@ -68202,13 +68239,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11577, 11596), }); declarations.push(Declaration { - id: DeclarationId(1920), + id: DeclarationId(1921), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(799), + parameter: DeclarationId(687), + value: DeclarationId(800), }], }, type_params: vec![], @@ -68222,11 +68259,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11615, 11637), }); declarations.push(Declaration { - id: DeclarationId(1921), + id: DeclarationId(1922), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(723), + DeclarationId(724), CardinalityBound::AtMostOne, ), ), @@ -68241,11 +68278,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), }); declarations.push(Declaration { - id: DeclarationId(1922), + id: DeclarationId(1923), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(723), + DeclarationId(724), CardinalityBound::AtMostOne, ), ), @@ -68260,11 +68297,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), }); declarations.push(Declaration { - id: DeclarationId(1923), + id: DeclarationId(1924), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(794), + DeclarationId(795), CardinalityBound::AtMostOne, ), ), @@ -68279,11 +68316,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), }); declarations.push(Declaration { - id: DeclarationId(1924), + id: DeclarationId(1925), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(800), + DeclarationId(801), CardinalityBound::AtMostOne, ), ), @@ -68298,13 +68335,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), }); declarations.push(Declaration { - id: DeclarationId(1925), + id: DeclarationId(1926), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(723), + parameter: DeclarationId(687), + value: DeclarationId(724), }], }, type_params: vec![], @@ -68318,7 +68355,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 12874, 12893), }); declarations.push(Declaration { - id: DeclarationId(1926), + id: DeclarationId(1927), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -68332,7 +68369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13174, 13177), }); declarations.push(Declaration { - id: DeclarationId(1927), + id: DeclarationId(1928), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -68346,7 +68383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13182, 13185), }); declarations.push(Declaration { - id: DeclarationId(1928), + id: DeclarationId(1929), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -68360,7 +68397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13190, 13193), }); declarations.push(Declaration { - id: DeclarationId(1929), + id: DeclarationId(1930), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -68374,7 +68411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13198, 13201), }); declarations.push(Declaration { - id: DeclarationId(1930), + id: DeclarationId(1931), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -68388,7 +68425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13325, 13327), }); declarations.push(Declaration { - id: DeclarationId(1931), + id: DeclarationId(1932), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -68402,7 +68439,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13332, 13334), }); declarations.push(Declaration { - id: DeclarationId(1932), + id: DeclarationId(1933), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -68416,7 +68453,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13339, 13341), }); declarations.push(Declaration { - id: DeclarationId(1933), + id: DeclarationId(1934), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -68430,7 +68467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13346, 13348), }); declarations.push(Declaration { - id: DeclarationId(1934), + id: DeclarationId(1935), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -68444,7 +68481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13353, 13355), }); declarations.push(Declaration { - id: DeclarationId(1935), + id: DeclarationId(1936), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -68458,7 +68495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13360, 13362), }); declarations.push(Declaration { - id: DeclarationId(1936), + id: DeclarationId(1937), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -68472,7 +68509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14139, 14142), }); declarations.push(Declaration { - id: DeclarationId(1937), + id: DeclarationId(1938), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -68486,12 +68523,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14147, 14149), }); declarations.push(Declaration { - id: DeclarationId(1938), + id: DeclarationId(1939), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(801), + ty: DeclarationId(802), }], }, type_params: vec![], @@ -68505,12 +68542,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14385, 14409), }); declarations.push(Declaration { - id: DeclarationId(1939), + id: DeclarationId(1940), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(802), + ty: DeclarationId(803), }], }, type_params: vec![], @@ -68524,12 +68561,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14414, 14438), }); declarations.push(Declaration { - id: DeclarationId(1940), + id: DeclarationId(1941), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(804), + ty: DeclarationId(805), }], }, type_params: vec![], @@ -68543,12 +68580,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14443, 14461), }); declarations.push(Declaration { - id: DeclarationId(1941), + id: DeclarationId(1942), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }], }, type_params: vec![], @@ -68562,7 +68599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14648, 14671), }); declarations.push(Declaration { - id: DeclarationId(1942), + id: DeclarationId(1943), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -68581,7 +68618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14676, 14732), }); declarations.push(Declaration { - id: DeclarationId(1943), + id: DeclarationId(1944), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -68600,12 +68637,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14737, 14791), }); declarations.push(Declaration { - id: DeclarationId(1944), + id: DeclarationId(1945), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(805), + ty: DeclarationId(806), }], }, type_params: vec![], @@ -68619,7 +68656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14796, 14818), }); declarations.push(Declaration { - id: DeclarationId(1945), + id: DeclarationId(1946), name: None, connective: TypeConnective::Conj { children: vec![ @@ -68644,12 +68681,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14943, 14995), }); declarations.push(Declaration { - id: DeclarationId(1946), + id: DeclarationId(1947), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }], }, type_params: vec![], @@ -68663,11 +68700,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15000, 15030), }); declarations.push(Declaration { - id: DeclarationId(1947), + id: DeclarationId(1948), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(808), + DeclarationId(809), CardinalityBound::AtMostOne, ), ), @@ -68682,13 +68719,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), }); declarations.push(Declaration { - id: DeclarationId(1948), + id: DeclarationId(1949), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(727), + template: DeclarationId(728), arguments: vec![TemplateArgument { - parameter: DeclarationId(728), - value: DeclarationId(814), + parameter: DeclarationId(729), + value: DeclarationId(815), }], }, type_params: vec![], @@ -68702,13 +68739,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 17185, 17216), }); declarations.push(Declaration { - id: DeclarationId(1949), + id: DeclarationId(1950), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(725), + template: DeclarationId(726), arguments: vec![TemplateArgument { - parameter: DeclarationId(726), - value: DeclarationId(815), + parameter: DeclarationId(727), + value: DeclarationId(816), }], }, type_params: vec![], @@ -68722,12 +68759,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 17240, 17270), }); declarations.push(Declaration { - id: DeclarationId(1950), + id: DeclarationId(1951), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "count".to_string(), - ty: DeclarationId(722), + ty: DeclarationId(723), }], }, type_params: vec![], @@ -68741,17 +68778,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 17893, 17922), }); declarations.push(Declaration { - id: DeclarationId(1951), + id: DeclarationId(1952), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "cluster".to_string(), - ty: DeclarationId(724), + ty: DeclarationId(725), }, Field { label: "measure".to_string(), - ty: DeclarationId(722), + ty: DeclarationId(723), }, ], }, @@ -68766,11 +68803,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 17927, 17974), }); declarations.push(Declaration { - id: DeclarationId(1952), + id: DeclarationId(1953), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(754), + DeclarationId(755), CardinalityBound::AtMostOne, ), ), @@ -68785,13 +68822,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), }); declarations.push(Declaration { - id: DeclarationId(1953), + id: DeclarationId(1954), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(722), + parameter: DeclarationId(687), + value: DeclarationId(723), }], }, type_params: vec![], @@ -68805,7 +68842,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18332, 18344), }); declarations.push(Declaration { - id: DeclarationId(1954), + id: DeclarationId(1955), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -68819,13 +68856,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18585, 18594), }); declarations.push(Declaration { - id: DeclarationId(1955), + id: DeclarationId(1956), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(809), + parameter: DeclarationId(687), + value: DeclarationId(810), }], }, type_params: vec![], @@ -68839,11 +68876,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18652, 18668), }); declarations.push(Declaration { - id: DeclarationId(1956), + id: DeclarationId(1957), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(821), + DeclarationId(822), CardinalityBound::AtMostOne, ), ), @@ -68858,7 +68895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), }); declarations.push(Declaration { - id: DeclarationId(1957), + id: DeclarationId(1958), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -68872,13 +68909,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19170, 19182), }); declarations.push(Declaration { - id: DeclarationId(1958), + id: DeclarationId(1959), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(722), + parameter: DeclarationId(687), + value: DeclarationId(723), }], }, type_params: vec![], @@ -68892,11 +68929,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19260, 19272), }); declarations.push(Declaration { - id: DeclarationId(1959), + id: DeclarationId(1960), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(754), + DeclarationId(755), CardinalityBound::AtMostOne, ), ), @@ -68911,11 +68948,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), }); declarations.push(Declaration { - id: DeclarationId(1960), + id: DeclarationId(1961), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(824), + DeclarationId(825), CardinalityBound::AtMostOne, ), ), @@ -68930,12 +68967,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), }); declarations.push(Declaration { - id: DeclarationId(1961), + id: DeclarationId(1962), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(819), + ty: DeclarationId(820), }], }, type_params: vec![], @@ -68949,12 +68986,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19462, 19478), }); declarations.push(Declaration { - id: DeclarationId(1962), + id: DeclarationId(1963), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(820), + ty: DeclarationId(821), }], }, type_params: vec![], @@ -68968,12 +69005,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19483, 19507), }); declarations.push(Declaration { - id: DeclarationId(1963), + id: DeclarationId(1964), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(822), + ty: DeclarationId(823), }], }, type_params: vec![], @@ -68987,12 +69024,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19512, 19530), }); declarations.push(Declaration { - id: DeclarationId(1964), + id: DeclarationId(1965), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(823), + ty: DeclarationId(824), }], }, type_params: vec![], @@ -69006,12 +69043,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19535, 19549), }); declarations.push(Declaration { - id: DeclarationId(1965), + id: DeclarationId(1966), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(825), + ty: DeclarationId(826), }], }, type_params: vec![], @@ -69025,13 +69062,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19554, 19568), }); declarations.push(Declaration { - id: DeclarationId(1966), + id: DeclarationId(1967), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(798), + parameter: DeclarationId(687), + value: DeclarationId(799), }], }, type_params: vec![], @@ -69045,13 +69082,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19597, 19614), }); declarations.push(Declaration { - id: DeclarationId(1967), + id: DeclarationId(1968), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(826), + parameter: DeclarationId(687), + value: DeclarationId(827), }], }, type_params: vec![], @@ -69065,13 +69102,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19624, 19638), }); declarations.push(Declaration { - id: DeclarationId(1968), + id: DeclarationId(1969), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(780), + parameter: DeclarationId(687), + value: DeclarationId(781), }], }, type_params: vec![], @@ -69085,13 +69122,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19648, 19661), }); declarations.push(Declaration { - id: DeclarationId(1969), + id: DeclarationId(1970), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(816), + parameter: DeclarationId(687), + value: DeclarationId(817), }], }, type_params: vec![], @@ -69105,12 +69142,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19674, 19687), }); declarations.push(Declaration { - id: DeclarationId(1970), + id: DeclarationId(1971), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(722), + ty: DeclarationId(723), }], }, type_params: vec![], @@ -69124,7 +69161,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 25770, 25788), }); declarations.push(Declaration { - id: DeclarationId(1971), + id: DeclarationId(1972), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69138,13 +69175,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 25793, 25799), }); declarations.push(Declaration { - id: DeclarationId(1972), + id: DeclarationId(1973), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(727), + template: DeclarationId(728), arguments: vec![TemplateArgument { - parameter: DeclarationId(728), - value: DeclarationId(722), + parameter: DeclarationId(729), + value: DeclarationId(723), }], }, type_params: vec![], @@ -69158,12 +69195,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 25832, 25856), }); declarations.push(Declaration { - id: DeclarationId(1973), + id: DeclarationId(1974), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "candidates".to_string(), - ty: DeclarationId(1972), + ty: DeclarationId(1973), }], }, type_params: vec![], @@ -69177,13 +69214,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 25804, 25858), }); declarations.push(Declaration { - id: DeclarationId(1974), + id: DeclarationId(1975), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1134), + template: DeclarationId(1135), arguments: vec![TemplateArgument { - parameter: DeclarationId(1135), - value: DeclarationId(848), + parameter: DeclarationId(1136), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69197,13 +69234,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10942, 10962), }); declarations.push(Declaration { - id: DeclarationId(1975), + id: DeclarationId(1976), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1134), + template: DeclarationId(1135), arguments: vec![TemplateArgument { - parameter: DeclarationId(1135), - value: DeclarationId(848), + parameter: DeclarationId(1136), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69217,13 +69254,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 11026, 11046), }); declarations.push(Declaration { - id: DeclarationId(1976), + id: DeclarationId(1977), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(727), + template: DeclarationId(728), arguments: vec![TemplateArgument { - parameter: DeclarationId(728), - value: DeclarationId(848), + parameter: DeclarationId(729), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69237,13 +69274,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 11114, 11144), }); declarations.push(Declaration { - id: DeclarationId(1977), + id: DeclarationId(1978), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(848), + parameter: DeclarationId(687), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69257,13 +69294,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 11611, 11629), }); declarations.push(Declaration { - id: DeclarationId(1978), + id: DeclarationId(1979), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(727), + template: DeclarationId(728), arguments: vec![TemplateArgument { - parameter: DeclarationId(728), - value: DeclarationId(848), + parameter: DeclarationId(729), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69277,13 +69314,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 11635, 11665), }); declarations.push(Declaration { - id: DeclarationId(1979), + id: DeclarationId(1980), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(848), + parameter: DeclarationId(687), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69297,13 +69334,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 14162, 14180), }); declarations.push(Declaration { - id: DeclarationId(1980), + id: DeclarationId(1981), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(727), + template: DeclarationId(728), arguments: vec![TemplateArgument { - parameter: DeclarationId(728), - value: DeclarationId(848), + parameter: DeclarationId(729), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69317,13 +69354,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22217, 22247), }); declarations.push(Declaration { - id: DeclarationId(1981), + id: DeclarationId(1982), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(848), + parameter: DeclarationId(687), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69337,13 +69374,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22252, 22270), }); declarations.push(Declaration { - id: DeclarationId(1982), + id: DeclarationId(1983), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(848), + parameter: DeclarationId(687), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69357,13 +69394,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22530, 22548), }); declarations.push(Declaration { - id: DeclarationId(1983), + id: DeclarationId(1984), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(848), + parameter: DeclarationId(687), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69377,13 +69414,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22553, 22571), }); declarations.push(Declaration { - id: DeclarationId(1984), + id: DeclarationId(1985), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(848), + parameter: DeclarationId(687), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69397,13 +69434,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23044, 23062), }); declarations.push(Declaration { - id: DeclarationId(1985), + id: DeclarationId(1986), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(848), + parameter: DeclarationId(687), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69417,13 +69454,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23067, 23085), }); declarations.push(Declaration { - id: DeclarationId(1986), + id: DeclarationId(1987), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(848), + parameter: DeclarationId(687), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69437,13 +69474,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23186, 23204), }); declarations.push(Declaration { - id: DeclarationId(1987), + id: DeclarationId(1988), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(848), + parameter: DeclarationId(687), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69457,13 +69494,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23524, 23542), }); declarations.push(Declaration { - id: DeclarationId(1988), + id: DeclarationId(1989), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(848), + parameter: DeclarationId(687), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69477,13 +69514,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23547, 23565), }); declarations.push(Declaration { - id: DeclarationId(1989), + id: DeclarationId(1990), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(848), + parameter: DeclarationId(687), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69497,13 +69534,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 25113, 25131), }); declarations.push(Declaration { - id: DeclarationId(1990), + id: DeclarationId(1991), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(848), + parameter: DeclarationId(687), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69517,13 +69554,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 25384, 25402), }); declarations.push(Declaration { - id: DeclarationId(1991), + id: DeclarationId(1992), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(848), + parameter: DeclarationId(687), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69537,13 +69574,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 25850, 25868), }); declarations.push(Declaration { - id: DeclarationId(1992), + id: DeclarationId(1993), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(848), + parameter: DeclarationId(687), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69557,13 +69594,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 27885, 27903), }); declarations.push(Declaration { - id: DeclarationId(1993), + id: DeclarationId(1994), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(848), + parameter: DeclarationId(687), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69577,13 +69614,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 27933, 27951), }); declarations.push(Declaration { - id: DeclarationId(1994), + id: DeclarationId(1995), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(848), + parameter: DeclarationId(687), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69597,13 +69634,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 28238, 28256), }); declarations.push(Declaration { - id: DeclarationId(1995), + id: DeclarationId(1996), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(848), + parameter: DeclarationId(687), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69617,13 +69654,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 28284, 28302), }); declarations.push(Declaration { - id: DeclarationId(1996), + id: DeclarationId(1997), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(848), + parameter: DeclarationId(687), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69637,13 +69674,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 28662, 28680), }); declarations.push(Declaration { - id: DeclarationId(1997), + id: DeclarationId(1998), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(848), + parameter: DeclarationId(687), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69657,7 +69694,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 28685, 28703), }); declarations.push(Declaration { - id: DeclarationId(1998), + id: DeclarationId(1999), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69671,7 +69708,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 4953, 4965), }); declarations.push(Declaration { - id: DeclarationId(1999), + id: DeclarationId(2000), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69685,7 +69722,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 4970, 4986), }); declarations.push(Declaration { - id: DeclarationId(2000), + id: DeclarationId(2001), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69699,7 +69736,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 4991, 5005), }); declarations.push(Declaration { - id: DeclarationId(2001), + id: DeclarationId(2002), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69713,7 +69750,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 5855, 5868), }); declarations.push(Declaration { - id: DeclarationId(2002), + id: DeclarationId(2003), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69727,7 +69764,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 5873, 5888), }); declarations.push(Declaration { - id: DeclarationId(2003), + id: DeclarationId(2004), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69741,7 +69778,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 5893, 5909), }); declarations.push(Declaration { - id: DeclarationId(2004), + id: DeclarationId(2005), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69755,11 +69792,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 5914, 5927), }); declarations.push(Declaration { - id: DeclarationId(2005), + id: DeclarationId(2006), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(841), + DeclarationId(842), CardinalityBound::AtMostOne, ), ), @@ -69774,11 +69811,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), }); declarations.push(Declaration { - id: DeclarationId(2006), + id: DeclarationId(2007), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(842), + DeclarationId(843), CardinalityBound::AtMostOne, ), ), @@ -69793,7 +69830,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), }); declarations.push(Declaration { - id: DeclarationId(2007), + id: DeclarationId(2008), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -69812,7 +69849,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), }); declarations.push(Declaration { - id: DeclarationId(2008), + id: DeclarationId(2009), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -69831,7 +69868,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), }); declarations.push(Declaration { - id: DeclarationId(2009), + id: DeclarationId(2010), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69845,12 +69882,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8405, 8414), }); declarations.push(Declaration { - id: DeclarationId(2010), + id: DeclarationId(2011), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "previous".to_string(), - ty: DeclarationId(847), + ty: DeclarationId(848), }], }, type_params: vec![], @@ -69864,7 +69901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8419, 8465), }); declarations.push(Declaration { - id: DeclarationId(2011), + id: DeclarationId(2012), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -69883,12 +69920,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9506, 9523), }); declarations.push(Declaration { - id: DeclarationId(2012), + id: DeclarationId(2013), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(844), + ty: DeclarationId(845), }], }, type_params: vec![], @@ -69902,17 +69939,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9528, 9552), }); declarations.push(Declaration { - id: DeclarationId(2013), + id: DeclarationId(2014), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "var".to_string(), - ty: DeclarationId(844), + ty: DeclarationId(845), }, Field { label: "degree".to_string(), - ty: DeclarationId(847), + ty: DeclarationId(848), }, ], }, @@ -69927,13 +69964,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9557, 9619), }); declarations.push(Declaration { - id: DeclarationId(2014), + id: DeclarationId(2015), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(727), + template: DeclarationId(728), arguments: vec![TemplateArgument { - parameter: DeclarationId(728), - value: DeclarationId(848), + parameter: DeclarationId(729), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69947,12 +69984,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9636, 9666), }); declarations.push(Declaration { - id: DeclarationId(2015), + id: DeclarationId(2016), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(2014), + ty: DeclarationId(2015), }], }, type_params: vec![], @@ -69966,13 +70003,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9624, 9667), }); declarations.push(Declaration { - id: DeclarationId(2016), + id: DeclarationId(2017), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(727), + template: DeclarationId(728), arguments: vec![TemplateArgument { - parameter: DeclarationId(728), - value: DeclarationId(848), + parameter: DeclarationId(729), + value: DeclarationId(849), }], }, type_params: vec![], @@ -69986,12 +70023,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9680, 9710), }); declarations.push(Declaration { - id: DeclarationId(2017), + id: DeclarationId(2018), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(2016), + ty: DeclarationId(2017), }], }, type_params: vec![], @@ -70005,12 +70042,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9672, 9711), }); declarations.push(Declaration { - id: DeclarationId(2018), + id: DeclarationId(2019), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(844), + ty: DeclarationId(845), }], }, type_params: vec![], @@ -70024,7 +70061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9716, 9737), }); declarations.push(Declaration { - id: DeclarationId(2019), + id: DeclarationId(2020), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70043,13 +70080,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9742, 9761), }); declarations.push(Declaration { - id: DeclarationId(2020), + id: DeclarationId(2021), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(31), arguments: vec![TemplateArgument { parameter: DeclarationId(32), - value: DeclarationId(848), + value: DeclarationId(849), }], }, type_params: vec![], @@ -70063,7 +70100,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9479, 9501), }); declarations.push(Declaration { - id: DeclarationId(2021), + id: DeclarationId(2022), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70077,7 +70114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18143, 18156), }); declarations.push(Declaration { - id: DeclarationId(2022), + id: DeclarationId(2023), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70091,7 +70128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18161, 18169), }); declarations.push(Declaration { - id: DeclarationId(2023), + id: DeclarationId(2024), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70105,7 +70142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18174, 18185), }); declarations.push(Declaration { - id: DeclarationId(2024), + id: DeclarationId(2025), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70119,7 +70156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18190, 18207), }); declarations.push(Declaration { - id: DeclarationId(2025), + id: DeclarationId(2026), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70133,12 +70170,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18212, 18226), }); declarations.push(Declaration { - id: DeclarationId(2026), + id: DeclarationId(2027), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "degree".to_string(), - ty: DeclarationId(1211), + ty: DeclarationId(1212), }], }, type_params: vec![], @@ -70152,7 +70189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18231, 18280), }); declarations.push(Declaration { - id: DeclarationId(2027), + id: DeclarationId(2028), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70166,7 +70203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18285, 18301), }); declarations.push(Declaration { - id: DeclarationId(2028), + id: DeclarationId(2029), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70180,13 +70217,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18306, 18318), }); declarations.push(Declaration { - id: DeclarationId(2029), + id: DeclarationId(2030), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(43), arguments: vec![TemplateArgument { parameter: DeclarationId(44), - value: DeclarationId(864), + value: DeclarationId(865), }], }, type_params: vec![], @@ -70200,13 +70237,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18107, 18138), }); declarations.push(Declaration { - id: DeclarationId(2030), + id: DeclarationId(2031), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(691), + template: DeclarationId(692), arguments: vec![TemplateArgument { - parameter: DeclarationId(692), - value: DeclarationId(848), + parameter: DeclarationId(693), + value: DeclarationId(849), }], }, type_params: vec![], @@ -70220,10 +70257,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507), }); declarations.push(Declaration { - id: DeclarationId(2031), + id: DeclarationId(2032), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(728)], + inputs: vec![DeclarationId(729)], output: DeclarationId(128), body: ArrowBody::NoBody, }, @@ -70238,18 +70275,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892), }); declarations.push(Declaration { - id: DeclarationId(2032), + id: DeclarationId(2033), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(704), + template: DeclarationId(705), arguments: vec![ TemplateArgument { - parameter: DeclarationId(705), - value: DeclarationId(848), + parameter: DeclarationId(706), + value: DeclarationId(849), }, TemplateArgument { - parameter: DeclarationId(1767), - value: DeclarationId(855), + parameter: DeclarationId(1768), + value: DeclarationId(856), }, ], }, @@ -70264,13 +70301,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535), }); declarations.push(Declaration { - id: DeclarationId(2033), + id: DeclarationId(2034), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(691), + template: DeclarationId(692), arguments: vec![TemplateArgument { - parameter: DeclarationId(692), - value: DeclarationId(848), + parameter: DeclarationId(693), + value: DeclarationId(849), }], }, type_params: vec![], @@ -70284,11 +70321,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810), }); declarations.push(Declaration { - id: DeclarationId(2034), + id: DeclarationId(2035), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(848), DeclarationId(848)], - output: DeclarationId(848), + inputs: vec![DeclarationId(849), DeclarationId(849)], + output: DeclarationId(849), body: ArrowBody::NoBody, }, type_params: vec![], @@ -70302,22 +70339,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(2035), + id: DeclarationId(2036), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(693), + template: DeclarationId(694), arguments: vec![ TemplateArgument { - parameter: DeclarationId(695), - value: DeclarationId(848), + parameter: DeclarationId(696), + value: DeclarationId(849), }, TemplateArgument { - parameter: DeclarationId(694), - value: DeclarationId(848), + parameter: DeclarationId(695), + value: DeclarationId(849), }, TemplateArgument { - parameter: DeclarationId(1757), - value: DeclarationId(859), + parameter: DeclarationId(1758), + value: DeclarationId(860), }, ], }, @@ -70332,11 +70369,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245), }); declarations.push(Declaration { - id: DeclarationId(2036), + id: DeclarationId(2037), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(849), DeclarationId(694)], - output: DeclarationId(849), + inputs: vec![DeclarationId(850), DeclarationId(695)], + output: DeclarationId(850), body: ArrowBody::NoBody, }, type_params: vec![], @@ -70350,22 +70387,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(2037), + id: DeclarationId(2038), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(693), + template: DeclarationId(694), arguments: vec![ TemplateArgument { - parameter: DeclarationId(695), - value: DeclarationId(849), + parameter: DeclarationId(696), + value: DeclarationId(850), }, TemplateArgument { - parameter: DeclarationId(1757), - value: DeclarationId(885), + parameter: DeclarationId(1758), + value: DeclarationId(886), }, TemplateArgument { - parameter: DeclarationId(694), - value: DeclarationId(848), + parameter: DeclarationId(695), + value: DeclarationId(849), }, ], }, @@ -70380,11 +70417,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021), }); declarations.push(Declaration { - id: DeclarationId(2038), + id: DeclarationId(2039), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(849), DeclarationId(694)], - output: DeclarationId(849), + inputs: vec![DeclarationId(850), DeclarationId(695)], + output: DeclarationId(850), body: ArrowBody::NoBody, }, type_params: vec![], @@ -70398,22 +70435,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(2039), + id: DeclarationId(2040), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(693), + template: DeclarationId(694), arguments: vec![ TemplateArgument { - parameter: DeclarationId(695), - value: DeclarationId(849), + parameter: DeclarationId(696), + value: DeclarationId(850), }, TemplateArgument { - parameter: DeclarationId(1757), - value: DeclarationId(885), + parameter: DeclarationId(1758), + value: DeclarationId(886), }, TemplateArgument { - parameter: DeclarationId(694), - value: DeclarationId(848), + parameter: DeclarationId(695), + value: DeclarationId(849), }, ], }, @@ -70428,13 +70465,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186), }); declarations.push(Declaration { - id: DeclarationId(2040), + id: DeclarationId(2041), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(689), + template: DeclarationId(690), arguments: vec![TemplateArgument { - parameter: DeclarationId(690), - value: DeclarationId(848), + parameter: DeclarationId(691), + value: DeclarationId(849), }], }, type_params: vec![], @@ -70448,13 +70485,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323), }); declarations.push(Declaration { - id: DeclarationId(2041), + id: DeclarationId(2042), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(689), + template: DeclarationId(690), arguments: vec![TemplateArgument { - parameter: DeclarationId(690), - value: DeclarationId(848), + parameter: DeclarationId(691), + value: DeclarationId(849), }], }, type_params: vec![], @@ -70468,13 +70505,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324), }); declarations.push(Declaration { - id: DeclarationId(2042), + id: DeclarationId(2043), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(687), + template: DeclarationId(688), arguments: vec![TemplateArgument { - parameter: DeclarationId(688), - value: DeclarationId(848), + parameter: DeclarationId(689), + value: DeclarationId(849), }], }, type_params: vec![], @@ -70488,13 +70525,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610), }); declarations.push(Declaration { - id: DeclarationId(2043), + id: DeclarationId(2044), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(689), + template: DeclarationId(690), arguments: vec![TemplateArgument { - parameter: DeclarationId(690), - value: DeclarationId(848), + parameter: DeclarationId(691), + value: DeclarationId(849), }], }, type_params: vec![], @@ -70508,13 +70545,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789), }); declarations.push(Declaration { - id: DeclarationId(2044), + id: DeclarationId(2045), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(687), + template: DeclarationId(688), arguments: vec![TemplateArgument { - parameter: DeclarationId(688), - value: DeclarationId(848), + parameter: DeclarationId(689), + value: DeclarationId(849), }], }, type_params: vec![], @@ -70528,13 +70565,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147), }); declarations.push(Declaration { - id: DeclarationId(2045), + id: DeclarationId(2046), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(689), + template: DeclarationId(690), arguments: vec![TemplateArgument { - parameter: DeclarationId(690), - value: DeclarationId(848), + parameter: DeclarationId(691), + value: DeclarationId(849), }], }, type_params: vec![], @@ -70548,13 +70585,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148), }); declarations.push(Declaration { - id: DeclarationId(2046), + id: DeclarationId(2047), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(687), + template: DeclarationId(688), arguments: vec![TemplateArgument { - parameter: DeclarationId(688), - value: DeclarationId(848), + parameter: DeclarationId(689), + value: DeclarationId(849), }], }, type_params: vec![], @@ -70568,13 +70605,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604), }); declarations.push(Declaration { - id: DeclarationId(2047), + id: DeclarationId(2048), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(689), + template: DeclarationId(690), arguments: vec![TemplateArgument { - parameter: DeclarationId(690), - value: DeclarationId(848), + parameter: DeclarationId(691), + value: DeclarationId(849), }], }, type_params: vec![], @@ -70588,13 +70625,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792), }); declarations.push(Declaration { - id: DeclarationId(2048), + id: DeclarationId(2049), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(689), + template: DeclarationId(690), arguments: vec![TemplateArgument { - parameter: DeclarationId(690), - value: DeclarationId(848), + parameter: DeclarationId(691), + value: DeclarationId(849), }], }, type_params: vec![], @@ -70608,13 +70645,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349), }); declarations.push(Declaration { - id: DeclarationId(2049), + id: DeclarationId(2050), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(687), + template: DeclarationId(688), arguments: vec![TemplateArgument { - parameter: DeclarationId(688), - value: DeclarationId(848), + parameter: DeclarationId(689), + value: DeclarationId(849), }], }, type_params: vec![], @@ -70628,13 +70665,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995), }); declarations.push(Declaration { - id: DeclarationId(2050), + id: DeclarationId(2051), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(689), + template: DeclarationId(690), arguments: vec![TemplateArgument { - parameter: DeclarationId(690), - value: DeclarationId(848), + parameter: DeclarationId(691), + value: DeclarationId(849), }], }, type_params: vec![], @@ -70648,11 +70685,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201), }); declarations.push(Declaration { - id: DeclarationId(2051), + id: DeclarationId(2052), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(849), DeclarationId(848)], - output: DeclarationId(849), + inputs: vec![DeclarationId(850), DeclarationId(849)], + output: DeclarationId(850), body: ArrowBody::NoBody, }, type_params: vec![], @@ -70666,22 +70703,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(2052), + id: DeclarationId(2053), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(693), + template: DeclarationId(694), arguments: vec![ TemplateArgument { - parameter: DeclarationId(695), - value: DeclarationId(849), + parameter: DeclarationId(696), + value: DeclarationId(850), }, TemplateArgument { - parameter: DeclarationId(694), - value: DeclarationId(848), + parameter: DeclarationId(695), + value: DeclarationId(849), }, TemplateArgument { - parameter: DeclarationId(1757), - value: DeclarationId(885), + parameter: DeclarationId(1758), + value: DeclarationId(886), }, ], }, @@ -70696,13 +70733,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377), }); declarations.push(Declaration { - id: DeclarationId(2053), + id: DeclarationId(2054), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(689), + template: DeclarationId(690), arguments: vec![TemplateArgument { - parameter: DeclarationId(690), - value: DeclarationId(848), + parameter: DeclarationId(691), + value: DeclarationId(849), }], }, type_params: vec![], @@ -70716,13 +70753,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449), }); declarations.push(Declaration { - id: DeclarationId(2054), + id: DeclarationId(2055), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(687), + template: DeclarationId(688), arguments: vec![TemplateArgument { - parameter: DeclarationId(688), - value: DeclarationId(848), + parameter: DeclarationId(689), + value: DeclarationId(849), }], }, type_params: vec![], @@ -70736,11 +70773,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727), }); declarations.push(Declaration { - id: DeclarationId(2055), + id: DeclarationId(2056), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1997), DeclarationId(848)], - output: DeclarationId(1997), + inputs: vec![DeclarationId(1998), DeclarationId(849)], + output: DeclarationId(1998), body: ArrowBody::NoBody, }, type_params: vec![], @@ -70754,22 +70791,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(2056), + id: DeclarationId(2057), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(693), + template: DeclarationId(694), arguments: vec![ TemplateArgument { - parameter: DeclarationId(695), - value: DeclarationId(1997), + parameter: DeclarationId(696), + value: DeclarationId(1998), }, TemplateArgument { - parameter: DeclarationId(694), - value: DeclarationId(848), + parameter: DeclarationId(695), + value: DeclarationId(849), }, TemplateArgument { - parameter: DeclarationId(1757), - value: DeclarationId(888), + parameter: DeclarationId(1758), + value: DeclarationId(889), }, ], }, @@ -70784,13 +70821,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749), }); declarations.push(Declaration { - id: DeclarationId(2057), + id: DeclarationId(2058), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(892), + parameter: DeclarationId(687), + value: DeclarationId(893), }], }, type_params: vec![], @@ -70804,7 +70841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4503, 4529), }); declarations.push(Declaration { - id: DeclarationId(2058), + id: DeclarationId(2059), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -70823,7 +70860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), }); declarations.push(Declaration { - id: DeclarationId(2059), + id: DeclarationId(2060), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -70842,13 +70879,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), }); declarations.push(Declaration { - id: DeclarationId(2060), + id: DeclarationId(2061), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1184), + parameter: DeclarationId(687), + value: DeclarationId(1185), }], }, type_params: vec![], @@ -70862,13 +70899,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6542, 6557), }); declarations.push(Declaration { - id: DeclarationId(2061), + id: DeclarationId(2062), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(896), + parameter: DeclarationId(687), + value: DeclarationId(897), }], }, type_params: vec![], @@ -70882,12 +70919,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2549, 2580), }); declarations.push(Declaration { - id: DeclarationId(2062), + id: DeclarationId(2063), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "content".to_string(), - ty: DeclarationId(2061), + ty: DeclarationId(2062), }], }, type_params: vec![], @@ -70901,13 +70938,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2521, 2582), }); declarations.push(Declaration { - id: DeclarationId(2063), + id: DeclarationId(2064), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(897), + parameter: DeclarationId(687), + value: DeclarationId(898), }], }, type_params: vec![], @@ -70921,12 +70958,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2615, 2651), }); declarations.push(Declaration { - id: DeclarationId(2064), + id: DeclarationId(2065), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "content".to_string(), - ty: DeclarationId(2063), + ty: DeclarationId(2064), }], }, type_params: vec![], @@ -70940,7 +70977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2587, 2653), }); declarations.push(Declaration { - id: DeclarationId(2065), + id: DeclarationId(2066), name: None, connective: TypeConnective::Conj { children: vec![ @@ -70965,7 +71002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3042, 3107), }); declarations.push(Declaration { - id: DeclarationId(2066), + id: DeclarationId(2067), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70984,7 +71021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3112, 3136), }); declarations.push(Declaration { - id: DeclarationId(2067), + id: DeclarationId(2068), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -71003,12 +71040,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3160, 3188), }); declarations.push(Declaration { - id: DeclarationId(2068), + id: DeclarationId(2069), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "source".to_string(), - ty: DeclarationId(893), + ty: DeclarationId(894), }], }, type_params: vec![], @@ -71022,7 +71059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3193, 3229), }); declarations.push(Declaration { - id: DeclarationId(2069), + id: DeclarationId(2070), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -71041,13 +71078,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3541, 3572), }); declarations.push(Declaration { - id: DeclarationId(2070), + id: DeclarationId(2071), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(894), + parameter: DeclarationId(687), + value: DeclarationId(895), }], }, type_params: vec![], @@ -71061,12 +71098,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3604, 3622), }); declarations.push(Declaration { - id: DeclarationId(2071), + id: DeclarationId(2072), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "blocks".to_string(), - ty: DeclarationId(2070), + ty: DeclarationId(2071), }], }, type_params: vec![], @@ -71080,7 +71117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3577, 3624), }); declarations.push(Declaration { - id: DeclarationId(2072), + id: DeclarationId(2073), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -71099,11 +71136,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3905, 3941), }); declarations.push(Declaration { - id: DeclarationId(2073), + id: DeclarationId(2074), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(895), + DeclarationId(896), CardinalityBound::AtMostOne, ), ), @@ -71118,7 +71155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4009, 4036), }); declarations.push(Declaration { - id: DeclarationId(2074), + id: DeclarationId(2075), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71137,7 +71174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058), }); declarations.push(Declaration { - id: DeclarationId(2075), + id: DeclarationId(2076), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71147,11 +71184,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "content".to_string(), - ty: DeclarationId(2073), + ty: DeclarationId(2074), }, Field { label: "is_error".to_string(), - ty: DeclarationId(2074), + ty: DeclarationId(2075), }, ], }, @@ -71166,7 +71203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3946, 4064), }); declarations.push(Declaration { - id: DeclarationId(2076), + id: DeclarationId(2077), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -71185,7 +71222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4511, 4549), }); declarations.push(Declaration { - id: DeclarationId(2077), + id: DeclarationId(2078), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71214,7 +71251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4554, 4637), }); declarations.push(Declaration { - id: DeclarationId(2078), + id: DeclarationId(2079), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71228,7 +71265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4995, 5002), }); declarations.push(Declaration { - id: DeclarationId(2079), + id: DeclarationId(2080), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71242,7 +71279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5007, 5016), }); declarations.push(Declaration { - id: DeclarationId(2080), + id: DeclarationId(2081), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71256,7 +71293,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5021, 5033), }); declarations.push(Declaration { - id: DeclarationId(2081), + id: DeclarationId(2082), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71270,7 +71307,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5038, 5045), }); declarations.push(Declaration { - id: DeclarationId(2082), + id: DeclarationId(2083), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71284,7 +71321,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5050, 5059), }); declarations.push(Declaration { - id: DeclarationId(2083), + id: DeclarationId(2084), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71298,7 +71335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5064, 5071), }); declarations.push(Declaration { - id: DeclarationId(2084), + id: DeclarationId(2085), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71312,7 +71349,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5076, 5102), }); declarations.push(Declaration { - id: DeclarationId(2085), + id: DeclarationId(2086), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71331,7 +71368,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421), }); declarations.push(Declaration { - id: DeclarationId(2086), + id: DeclarationId(2087), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71350,7 +71387,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439), }); declarations.push(Declaration { - id: DeclarationId(2087), + id: DeclarationId(2088), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71364,11 +71401,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "document_title".to_string(), - ty: DeclarationId(2085), + ty: DeclarationId(2086), }, Field { label: "file_id".to_string(), - ty: DeclarationId(2086), + ty: DeclarationId(2087), }, Field { label: "start_char_index".to_string(), @@ -71391,7 +71428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5342, 5485), }); declarations.push(Declaration { - id: DeclarationId(2088), + id: DeclarationId(2089), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71410,7 +71447,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5562, 5569), }); declarations.push(Declaration { - id: DeclarationId(2089), + id: DeclarationId(2090), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71429,7 +71466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5580, 5587), }); declarations.push(Declaration { - id: DeclarationId(2090), + id: DeclarationId(2091), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71443,11 +71480,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "document_title".to_string(), - ty: DeclarationId(2088), + ty: DeclarationId(2089), }, Field { label: "file_id".to_string(), - ty: DeclarationId(2089), + ty: DeclarationId(2090), }, Field { label: "start_page_number".to_string(), @@ -71470,7 +71507,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5490, 5635), }); declarations.push(Declaration { - id: DeclarationId(2091), + id: DeclarationId(2092), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71489,7 +71526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5720, 5727), }); declarations.push(Declaration { - id: DeclarationId(2092), + id: DeclarationId(2093), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71508,7 +71545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5738, 5745), }); declarations.push(Declaration { - id: DeclarationId(2093), + id: DeclarationId(2094), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71522,11 +71559,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "document_title".to_string(), - ty: DeclarationId(2091), + ty: DeclarationId(2092), }, Field { label: "file_id".to_string(), - ty: DeclarationId(2092), + ty: DeclarationId(2093), }, Field { label: "start_block_index".to_string(), @@ -71549,7 +71586,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5640, 5793), }); declarations.push(Declaration { - id: DeclarationId(2094), + id: DeclarationId(2095), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71568,7 +71605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5876, 5883), }); declarations.push(Declaration { - id: DeclarationId(2095), + id: DeclarationId(2096), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71582,7 +71619,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "title".to_string(), - ty: DeclarationId(2094), + ty: DeclarationId(2095), }, Field { label: "url".to_string(), @@ -71601,7 +71638,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5798, 5898), }); declarations.push(Declaration { - id: DeclarationId(2096), + id: DeclarationId(2097), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71620,7 +71657,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5969, 5976), }); declarations.push(Declaration { - id: DeclarationId(2097), + id: DeclarationId(2098), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71634,7 +71671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "title".to_string(), - ty: DeclarationId(2096), + ty: DeclarationId(2097), }, Field { label: "search_result_index".to_string(), @@ -71661,13 +71698,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5903, 6050), }); declarations.push(Declaration { - id: DeclarationId(2098), + id: DeclarationId(2099), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(899), + parameter: DeclarationId(687), + value: DeclarationId(900), }], }, type_params: vec![], @@ -71681,11 +71718,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6674, 6708), }); declarations.push(Declaration { - id: DeclarationId(2099), + id: DeclarationId(2100), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(2098), + DeclarationId(2099), CardinalityBound::AtMostOne, ), ), @@ -71700,7 +71737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6674, 6709), }); declarations.push(Declaration { - id: DeclarationId(2100), + id: DeclarationId(2101), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71710,7 +71747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "citations".to_string(), - ty: DeclarationId(2099), + ty: DeclarationId(2100), }, ], }, @@ -71725,7 +71762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6629, 6711), }); declarations.push(Declaration { - id: DeclarationId(2101), + id: DeclarationId(2102), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71750,7 +71787,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6716, 6777), }); declarations.push(Declaration { - id: DeclarationId(2102), + id: DeclarationId(2103), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -71769,7 +71806,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6782, 6837), }); declarations.push(Declaration { - id: DeclarationId(2103), + id: DeclarationId(2104), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71788,7 +71825,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6912, 6917), }); declarations.push(Declaration { - id: DeclarationId(2104), + id: DeclarationId(2105), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71806,7 +71843,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "caller".to_string(), - ty: DeclarationId(2103), + ty: DeclarationId(2104), }, ], }, @@ -71821,7 +71858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6842, 6919), }); declarations.push(Declaration { - id: DeclarationId(2105), + id: DeclarationId(2106), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71840,7 +71877,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7017, 7022), }); declarations.push(Declaration { - id: DeclarationId(2106), + id: DeclarationId(2107), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71850,7 +71887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "name".to_string(), - ty: DeclarationId(901), + ty: DeclarationId(902), }, Field { label: "input".to_string(), @@ -71858,7 +71895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "caller".to_string(), - ty: DeclarationId(2105), + ty: DeclarationId(2106), }, ], }, @@ -71873,7 +71910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6924, 7024), }); declarations.push(Declaration { - id: DeclarationId(2107), + id: DeclarationId(2108), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71892,7 +71929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7108, 7113), }); declarations.push(Declaration { - id: DeclarationId(2108), + id: DeclarationId(2109), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71906,7 +71943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "caller".to_string(), - ty: DeclarationId(2107), + ty: DeclarationId(2108), }, ], }, @@ -71921,7 +71958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7029, 7115), }); declarations.push(Declaration { - id: DeclarationId(2109), + id: DeclarationId(2110), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71935,7 +71972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7336, 7345), }); declarations.push(Declaration { - id: DeclarationId(2110), + id: DeclarationId(2111), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71949,7 +71986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7350, 7358), }); declarations.push(Declaration { - id: DeclarationId(2111), + id: DeclarationId(2112), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71963,7 +72000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7363, 7376), }); declarations.push(Declaration { - id: DeclarationId(2112), + id: DeclarationId(2113), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71977,7 +72014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7381, 7398), }); declarations.push(Declaration { - id: DeclarationId(2113), + id: DeclarationId(2114), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71991,7 +72028,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7403, 7426), }); declarations.push(Declaration { - id: DeclarationId(2114), + id: DeclarationId(2115), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72005,7 +72042,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7431, 7450), }); declarations.push(Declaration { - id: DeclarationId(2115), + id: DeclarationId(2116), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72019,7 +72056,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7455, 7473), }); declarations.push(Declaration { - id: DeclarationId(2116), + id: DeclarationId(2117), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72033,7 +72070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7478, 7485), }); declarations.push(Declaration { - id: DeclarationId(2117), + id: DeclarationId(2118), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -72052,7 +72089,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739), }); declarations.push(Declaration { - id: DeclarationId(2118), + id: DeclarationId(2119), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -72071,7 +72108,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775), }); declarations.push(Declaration { - id: DeclarationId(2119), + id: DeclarationId(2120), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -72090,7 +72127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814), }); declarations.push(Declaration { - id: DeclarationId(2120), + id: DeclarationId(2121), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72104,13 +72141,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8171, 8180), }); declarations.push(Declaration { - id: DeclarationId(2121), + id: DeclarationId(2122), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(900), + parameter: DeclarationId(687), + value: DeclarationId(901), }], }, type_params: vec![], @@ -72124,7 +72161,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8666, 8704), }); declarations.push(Declaration { - id: DeclarationId(2122), + id: DeclarationId(2123), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -72143,7 +72180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8783, 8790), }); declarations.push(Declaration { - id: DeclarationId(2123), + id: DeclarationId(2124), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -72162,7 +72199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8851, 8856), }); declarations.push(Declaration { - id: DeclarationId(2124), + id: DeclarationId(2125), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72176,7 +72213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1013, 1025), }); declarations.push(Declaration { - id: DeclarationId(2125), + id: DeclarationId(2126), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72190,7 +72227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1030, 1044), }); declarations.push(Declaration { - id: DeclarationId(2126), + id: DeclarationId(2127), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72204,7 +72241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1049, 1064), }); declarations.push(Declaration { - id: DeclarationId(2127), + id: DeclarationId(2128), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72218,7 +72255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1069, 1086), }); declarations.push(Declaration { - id: DeclarationId(2128), + id: DeclarationId(2129), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72232,7 +72269,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1091, 1114), }); declarations.push(Declaration { - id: DeclarationId(2129), + id: DeclarationId(2130), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72246,7 +72283,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4719, 4726), }); declarations.push(Declaration { - id: DeclarationId(2130), + id: DeclarationId(2131), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72260,13 +72297,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4731, 4735), }); declarations.push(Declaration { - id: DeclarationId(2131), + id: DeclarationId(2132), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(911), + parameter: DeclarationId(687), + value: DeclarationId(912), }], }, type_params: vec![], @@ -72280,7 +72317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6983, 7004), }); declarations.push(Declaration { - id: DeclarationId(2132), + id: DeclarationId(2133), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72294,7 +72331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2224, 2238), }); declarations.push(Declaration { - id: DeclarationId(2133), + id: DeclarationId(2134), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72308,7 +72345,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2243, 2268), }); declarations.push(Declaration { - id: DeclarationId(2134), + id: DeclarationId(2135), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72322,7 +72359,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2273, 2283), }); declarations.push(Declaration { - id: DeclarationId(2135), + id: DeclarationId(2136), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72336,7 +72373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2548, 2565), }); declarations.push(Declaration { - id: DeclarationId(2136), + id: DeclarationId(2137), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72350,7 +72387,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2570, 2594), }); declarations.push(Declaration { - id: DeclarationId(2137), + id: DeclarationId(2138), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72364,7 +72401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2599, 2631), }); declarations.push(Declaration { - id: DeclarationId(2138), + id: DeclarationId(2139), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72378,7 +72415,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2636, 2663), }); declarations.push(Declaration { - id: DeclarationId(2139), + id: DeclarationId(2140), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72392,7 +72429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3369, 3393), }); declarations.push(Declaration { - id: DeclarationId(2140), + id: DeclarationId(2141), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72406,7 +72443,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3398, 3430), }); declarations.push(Declaration { - id: DeclarationId(2141), + id: DeclarationId(2142), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72420,7 +72457,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3564, 3588), }); declarations.push(Declaration { - id: DeclarationId(2142), + id: DeclarationId(2143), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72434,7 +72471,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3593, 3614), }); declarations.push(Declaration { - id: DeclarationId(2143), + id: DeclarationId(2144), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72448,7 +72485,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3619, 3637), }); declarations.push(Declaration { - id: DeclarationId(2144), + id: DeclarationId(2145), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72462,7 +72499,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3781, 3796), }); declarations.push(Declaration { - id: DeclarationId(2145), + id: DeclarationId(2146), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72476,7 +72513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3801, 3831), }); declarations.push(Declaration { - id: DeclarationId(2146), + id: DeclarationId(2147), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72490,7 +72527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3836, 3857), }); declarations.push(Declaration { - id: DeclarationId(2147), + id: DeclarationId(2148), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72504,7 +72541,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4024, 4044), }); declarations.push(Declaration { - id: DeclarationId(2148), + id: DeclarationId(2149), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72518,7 +72555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4049, 4076), }); declarations.push(Declaration { - id: DeclarationId(2149), + id: DeclarationId(2150), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72532,7 +72569,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4081, 4095), }); declarations.push(Declaration { - id: DeclarationId(2150), + id: DeclarationId(2151), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72546,7 +72583,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4354, 4362), }); declarations.push(Declaration { - id: DeclarationId(2151), + id: DeclarationId(2152), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72560,7 +72597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4367, 4393), }); declarations.push(Declaration { - id: DeclarationId(2152), + id: DeclarationId(2153), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72574,12 +72611,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4398, 4423), }); declarations.push(Declaration { - id: DeclarationId(2153), + id: DeclarationId(2154), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -72594,7 +72631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5320, 5332), }); declarations.push(Declaration { - id: DeclarationId(2154), + id: DeclarationId(2155), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72608,7 +72645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5693, 5713), }); declarations.push(Declaration { - id: DeclarationId(2155), + id: DeclarationId(2156), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72622,7 +72659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5718, 5736), }); declarations.push(Declaration { - id: DeclarationId(2156), + id: DeclarationId(2157), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72636,7 +72673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5741, 5759), }); declarations.push(Declaration { - id: DeclarationId(2157), + id: DeclarationId(2158), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72650,11 +72687,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5764, 5791), }); declarations.push(Declaration { - id: DeclarationId(2158), + id: DeclarationId(2159), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(927), + DeclarationId(928), CardinalityBound::AtMostOne, ), ), @@ -72669,7 +72706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755), }); declarations.push(Declaration { - id: DeclarationId(2159), + id: DeclarationId(2160), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -72688,7 +72725,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), }); declarations.push(Declaration { - id: DeclarationId(2160), + id: DeclarationId(2161), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -72707,11 +72744,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), }); declarations.push(Declaration { - id: DeclarationId(2161), + id: DeclarationId(2162), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(937), + DeclarationId(938), CardinalityBound::AtMostOne, ), ), @@ -72726,11 +72763,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), }); declarations.push(Declaration { - id: DeclarationId(2162), + id: DeclarationId(2163), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(937), + DeclarationId(938), CardinalityBound::AtMostOne, ), ), @@ -72745,7 +72782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), }); declarations.push(Declaration { - id: DeclarationId(2163), + id: DeclarationId(2164), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72764,7 +72801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1422, 1454), }); declarations.push(Declaration { - id: DeclarationId(2164), + id: DeclarationId(2165), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72783,7 +72820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1459, 1495), }); declarations.push(Declaration { - id: DeclarationId(2165), + id: DeclarationId(2166), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72802,7 +72839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1500, 1537), }); declarations.push(Declaration { - id: DeclarationId(2166), + id: DeclarationId(2167), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72821,7 +72858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1542, 1568), }); declarations.push(Declaration { - id: DeclarationId(2167), + id: DeclarationId(2168), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72840,7 +72877,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1573, 1606), }); declarations.push(Declaration { - id: DeclarationId(2168), + id: DeclarationId(2169), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72854,12 +72891,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1611, 1628), }); declarations.push(Declaration { - id: DeclarationId(2169), + id: DeclarationId(2170), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "steps".to_string(), - ty: DeclarationId(1211), + ty: DeclarationId(1212), }], }, type_params: vec![], @@ -72873,7 +72910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1633, 1687), }); declarations.push(Declaration { - id: DeclarationId(2170), + id: DeclarationId(2171), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72887,7 +72924,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1692, 1699), }); declarations.push(Declaration { - id: DeclarationId(2171), + id: DeclarationId(2172), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72906,13 +72943,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2051, 2089), }); declarations.push(Declaration { - id: DeclarationId(2172), + id: DeclarationId(2173), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "amount".to_string(), - ty: DeclarationId(1211), + ty: DeclarationId(1212), }, Field { label: "collection".to_string(), @@ -72931,13 +72968,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2094, 2168), }); declarations.push(Declaration { - id: DeclarationId(2173), + id: DeclarationId(2174), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "steps".to_string(), - ty: DeclarationId(1211), + ty: DeclarationId(1212), }, Field { label: "ring_param".to_string(), @@ -72956,13 +72993,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2173, 2248), }); declarations.push(Declaration { - id: DeclarationId(2174), + id: DeclarationId(2175), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "divisor".to_string(), - ty: DeclarationId(1213), + ty: DeclarationId(1214), }, Field { label: "ring_param".to_string(), @@ -72981,7 +73018,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2253, 2326), }); declarations.push(Declaration { - id: DeclarationId(2175), + id: DeclarationId(2176), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73000,7 +73037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2331, 2368), }); declarations.push(Declaration { - id: DeclarationId(2176), + id: DeclarationId(2177), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73019,7 +73056,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2373, 2410), }); declarations.push(Declaration { - id: DeclarationId(2177), + id: DeclarationId(2178), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73038,7 +73075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2415, 2456), }); declarations.push(Declaration { - id: DeclarationId(2178), + id: DeclarationId(2179), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73052,7 +73089,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2461, 2477), }); declarations.push(Declaration { - id: DeclarationId(2179), + id: DeclarationId(2180), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73066,12 +73103,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2998, 3008), }); declarations.push(Declaration { - id: DeclarationId(2180), + id: DeclarationId(2181), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "steps".to_string(), - ty: DeclarationId(1211), + ty: DeclarationId(1212), }], }, type_params: vec![], @@ -73085,12 +73122,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3013, 3060), }); declarations.push(Declaration { - id: DeclarationId(2181), + id: DeclarationId(2182), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "divisor".to_string(), - ty: DeclarationId(1213), + ty: DeclarationId(1214), }], }, type_params: vec![], @@ -73104,7 +73141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3065, 3116), }); declarations.push(Declaration { - id: DeclarationId(2182), + id: DeclarationId(2183), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73118,7 +73155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3306, 3310), }); declarations.push(Declaration { - id: DeclarationId(2183), + id: DeclarationId(2184), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73132,7 +73169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3315, 3322), }); declarations.push(Declaration { - id: DeclarationId(2184), + id: DeclarationId(2185), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73146,11 +73183,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3327, 3333), }); declarations.push(Declaration { - id: DeclarationId(2185), + id: DeclarationId(2186), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(929), + DeclarationId(930), CardinalityBound::AtMostOne, ), ), @@ -73165,7 +73202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), }); declarations.push(Declaration { - id: DeclarationId(2186), + id: DeclarationId(2187), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73179,7 +73216,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7270, 7281), }); declarations.push(Declaration { - id: DeclarationId(2187), + id: DeclarationId(2188), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73193,7 +73230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7330, 7344), }); declarations.push(Declaration { - id: DeclarationId(2188), + id: DeclarationId(2189), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73207,7 +73244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7409, 7425), }); declarations.push(Declaration { - id: DeclarationId(2189), + id: DeclarationId(2190), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73221,7 +73258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 360, 369), }); declarations.push(Declaration { - id: DeclarationId(2190), + id: DeclarationId(2191), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73235,7 +73272,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 374, 381), }); declarations.push(Declaration { - id: DeclarationId(2191), + id: DeclarationId(2192), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73249,7 +73286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 614, 618), }); declarations.push(Declaration { - id: DeclarationId(2192), + id: DeclarationId(2193), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73263,7 +73300,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 623, 632), }); declarations.push(Declaration { - id: DeclarationId(2193), + id: DeclarationId(2194), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73277,7 +73314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 910, 921), }); declarations.push(Declaration { - id: DeclarationId(2194), + id: DeclarationId(2195), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73291,7 +73328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 926, 935), }); declarations.push(Declaration { - id: DeclarationId(2195), + id: DeclarationId(2196), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73305,7 +73342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 1166, 1173), }); declarations.push(Declaration { - id: DeclarationId(2196), + id: DeclarationId(2197), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73319,7 +73356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 1178, 1187), }); declarations.push(Declaration { - id: DeclarationId(2197), + id: DeclarationId(2198), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73333,7 +73370,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2035, 2044), }); declarations.push(Declaration { - id: DeclarationId(2198), + id: DeclarationId(2199), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73347,7 +73384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2049, 2065), }); declarations.push(Declaration { - id: DeclarationId(2199), + id: DeclarationId(2200), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73361,7 +73398,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2070, 2080), }); declarations.push(Declaration { - id: DeclarationId(2200), + id: DeclarationId(2201), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73375,7 +73412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2085, 2099), }); declarations.push(Declaration { - id: DeclarationId(2201), + id: DeclarationId(2202), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73389,7 +73426,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2385, 2399), }); declarations.push(Declaration { - id: DeclarationId(2202), + id: DeclarationId(2203), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73403,12 +73440,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2404, 2418), }); declarations.push(Declaration { - id: DeclarationId(2203), + id: DeclarationId(2204), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -73423,12 +73460,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2818, 2830), }); declarations.push(Declaration { - id: DeclarationId(2204), + id: DeclarationId(2205), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -73443,7 +73480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 3210, 3222), }); declarations.push(Declaration { - id: DeclarationId(2205), + id: DeclarationId(2206), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73457,7 +73494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 3694, 3708), }); declarations.push(Declaration { - id: DeclarationId(2206), + id: DeclarationId(2207), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73471,7 +73508,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 3713, 3729), }); declarations.push(Declaration { - id: DeclarationId(2207), + id: DeclarationId(2208), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73490,7 +73527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6759, 6786), }); declarations.push(Declaration { - id: DeclarationId(2208), + id: DeclarationId(2209), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73504,7 +73541,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7611, 7616), }); declarations.push(Declaration { - id: DeclarationId(2209), + id: DeclarationId(2210), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73518,18 +73555,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7621, 7630), }); declarations.push(Declaration { - id: DeclarationId(2210), + id: DeclarationId(2211), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), arguments: vec![ TemplateArgument { parameter: DeclarationId(138), - value: DeclarationId(953), + value: DeclarationId(954), }, TemplateArgument { parameter: DeclarationId(139), - value: DeclarationId(956), + value: DeclarationId(957), }, ], }, @@ -73544,7 +73581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9513, 9555), }); declarations.push(Declaration { - id: DeclarationId(2211), + id: DeclarationId(2212), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73558,7 +73595,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3853, 3857), }); declarations.push(Declaration { - id: DeclarationId(2212), + id: DeclarationId(2213), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73572,7 +73609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3860, 3864), }); declarations.push(Declaration { - id: DeclarationId(2213), + id: DeclarationId(2214), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73586,7 +73623,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3867, 3871), }); declarations.push(Declaration { - id: DeclarationId(2214), + id: DeclarationId(2215), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73600,7 +73637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3874, 3879), }); declarations.push(Declaration { - id: DeclarationId(2215), + id: DeclarationId(2216), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73614,7 +73651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3882, 3893), }); declarations.push(Declaration { - id: DeclarationId(2216), + id: DeclarationId(2217), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73628,7 +73665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3896, 3909), }); declarations.push(Declaration { - id: DeclarationId(2217), + id: DeclarationId(2218), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73642,7 +73679,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4489, 4494), }); declarations.push(Declaration { - id: DeclarationId(2218), + id: DeclarationId(2219), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73656,7 +73693,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4497, 4506), }); declarations.push(Declaration { - id: DeclarationId(2219), + id: DeclarationId(2220), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73670,7 +73707,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4509, 4515), }); declarations.push(Declaration { - id: DeclarationId(2220), + id: DeclarationId(2221), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73684,7 +73721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4518, 4522), }); declarations.push(Declaration { - id: DeclarationId(2221), + id: DeclarationId(2222), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73698,13 +73735,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4525, 4529), }); declarations.push(Declaration { - id: DeclarationId(2222), + id: DeclarationId(2223), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(965), + parameter: DeclarationId(687), + value: DeclarationId(966), }], }, type_params: vec![], @@ -73718,13 +73755,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5923, 5941), }); declarations.push(Declaration { - id: DeclarationId(2223), + id: DeclarationId(2224), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(966), + parameter: DeclarationId(687), + value: DeclarationId(967), }], }, type_params: vec![], @@ -73738,7 +73775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6396, 6424), }); declarations.push(Declaration { - id: DeclarationId(2224), + id: DeclarationId(2225), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73752,7 +73789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1099, 1113), }); declarations.push(Declaration { - id: DeclarationId(2225), + id: DeclarationId(2226), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73766,7 +73803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1118, 1128), }); declarations.push(Declaration { - id: DeclarationId(2226), + id: DeclarationId(2227), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73780,7 +73817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1133, 1145), }); declarations.push(Declaration { - id: DeclarationId(2227), + id: DeclarationId(2228), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73794,7 +73831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1150, 1163), }); declarations.push(Declaration { - id: DeclarationId(2228), + id: DeclarationId(2229), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73808,7 +73845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1168, 1180), }); declarations.push(Declaration { - id: DeclarationId(2229), + id: DeclarationId(2230), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73822,7 +73859,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1185, 1197), }); declarations.push(Declaration { - id: DeclarationId(2230), + id: DeclarationId(2231), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73836,7 +73873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1202, 1224), }); declarations.push(Declaration { - id: DeclarationId(2231), + id: DeclarationId(2232), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73850,7 +73887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1229, 1248), }); declarations.push(Declaration { - id: DeclarationId(2232), + id: DeclarationId(2233), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73864,7 +73901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1253, 1278), }); declarations.push(Declaration { - id: DeclarationId(2233), + id: DeclarationId(2234), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73878,12 +73915,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1283, 1306), }); declarations.push(Declaration { - id: DeclarationId(2234), + id: DeclarationId(2235), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(968), + ty: DeclarationId(969), }], }, type_params: vec![], @@ -73897,12 +73934,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 5506, 5542), }); declarations.push(Declaration { - id: DeclarationId(2235), + id: DeclarationId(2236), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(971), + ty: DeclarationId(972), }], }, type_params: vec![], @@ -73916,13 +73953,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 5547, 5588), }); declarations.push(Declaration { - id: DeclarationId(2236), + id: DeclarationId(2237), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(969), + parameter: DeclarationId(687), + value: DeclarationId(970), }], }, type_params: vec![], @@ -73936,7 +73973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 6047, 6063), }); declarations.push(Declaration { - id: DeclarationId(2237), + id: DeclarationId(2238), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73955,7 +73992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9175, 9216), }); declarations.push(Declaration { - id: DeclarationId(2238), + id: DeclarationId(2239), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73969,12 +74006,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9513, 9525), }); declarations.push(Declaration { - id: DeclarationId(2239), + id: DeclarationId(2240), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -73989,7 +74026,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9795, 9807), }); declarations.push(Declaration { - id: DeclarationId(2240), + id: DeclarationId(2241), name: None, connective: TypeConnective::Conj { children: vec![ @@ -73999,7 +74036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "sites".to_string(), - ty: DeclarationId(2239), + ty: DeclarationId(2240), }, ], }, @@ -74014,7 +74051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9752, 9809), }); declarations.push(Declaration { - id: DeclarationId(2241), + id: DeclarationId(2242), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74033,7 +74070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 10119, 10153), }); declarations.push(Declaration { - id: DeclarationId(2242), + id: DeclarationId(2243), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74052,7 +74089,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 10556, 10607), }); declarations.push(Declaration { - id: DeclarationId(2243), + id: DeclarationId(2244), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74066,21 +74103,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 10950, 10968), }); declarations.push(Declaration { - id: DeclarationId(2244), + id: DeclarationId(2245), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "connective".to_string(), - ty: DeclarationId(962), + ty: DeclarationId(963), }, Field { label: "behavior".to_string(), - ty: DeclarationId(963), + ty: DeclarationId(964), }, Field { label: "target".to_string(), - ty: DeclarationId(958), + ty: DeclarationId(959), }, ], }, @@ -74095,13 +74132,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 11357, 11469), }); declarations.push(Declaration { - id: DeclarationId(2245), + id: DeclarationId(2246), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), arguments: vec![TemplateArgument { parameter: DeclarationId(38), - value: DeclarationId(994), + value: DeclarationId(995), }], }, type_params: vec![], @@ -74115,19 +74152,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4846, 4866), }); declarations.push(Declaration { - id: DeclarationId(2246), + id: DeclarationId(2247), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(982), + template: DeclarationId(983), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(983), - value: DeclarationId(993), - }, TemplateArgument { parameter: DeclarationId(984), value: DeclarationId(994), }, + TemplateArgument { + parameter: DeclarationId(985), + value: DeclarationId(995), + }, ], }, type_params: vec![], @@ -74141,19 +74178,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4876, 4900), }); declarations.push(Declaration { - id: DeclarationId(2247), + id: DeclarationId(2248), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(982), + template: DeclarationId(983), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(983), - value: DeclarationId(993), - }, TemplateArgument { parameter: DeclarationId(984), value: DeclarationId(994), }, + TemplateArgument { + parameter: DeclarationId(985), + value: DeclarationId(995), + }, ], }, type_params: vec![], @@ -74167,19 +74204,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4911, 4935), }); declarations.push(Declaration { - id: DeclarationId(2248), + id: DeclarationId(2249), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(982), + template: DeclarationId(983), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(983), - value: DeclarationId(993), - }, TemplateArgument { parameter: DeclarationId(984), value: DeclarationId(994), }, + TemplateArgument { + parameter: DeclarationId(985), + value: DeclarationId(995), + }, ], }, type_params: vec![], @@ -74193,13 +74230,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4941, 4965), }); declarations.push(Declaration { - id: DeclarationId(2249), + id: DeclarationId(2250), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), arguments: vec![TemplateArgument { parameter: DeclarationId(38), - value: DeclarationId(997), + value: DeclarationId(998), }], }, type_params: vec![], @@ -74213,19 +74250,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5042, 5062), }); declarations.push(Declaration { - id: DeclarationId(2250), + id: DeclarationId(2251), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(982), + template: DeclarationId(983), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(983), - value: DeclarationId(996), - }, TemplateArgument { parameter: DeclarationId(984), value: DeclarationId(997), }, + TemplateArgument { + parameter: DeclarationId(985), + value: DeclarationId(998), + }, ], }, type_params: vec![], @@ -74239,19 +74276,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5072, 5096), }); declarations.push(Declaration { - id: DeclarationId(2251), + id: DeclarationId(2252), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(982), + template: DeclarationId(983), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(983), - value: DeclarationId(996), - }, TemplateArgument { parameter: DeclarationId(984), value: DeclarationId(997), }, + TemplateArgument { + parameter: DeclarationId(985), + value: DeclarationId(998), + }, ], }, type_params: vec![], @@ -74265,19 +74302,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5107, 5131), }); declarations.push(Declaration { - id: DeclarationId(2252), + id: DeclarationId(2253), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(982), + template: DeclarationId(983), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(983), - value: DeclarationId(996), - }, TemplateArgument { parameter: DeclarationId(984), value: DeclarationId(997), }, + TemplateArgument { + parameter: DeclarationId(985), + value: DeclarationId(998), + }, ], }, type_params: vec![], @@ -74291,13 +74328,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5137, 5161), }); declarations.push(Declaration { - id: DeclarationId(2253), + id: DeclarationId(2254), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), arguments: vec![TemplateArgument { parameter: DeclarationId(38), - value: DeclarationId(1000), + value: DeclarationId(1001), }], }, type_params: vec![], @@ -74311,19 +74348,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5245, 5265), }); declarations.push(Declaration { - id: DeclarationId(2254), + id: DeclarationId(2255), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(982), + template: DeclarationId(983), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(983), - value: DeclarationId(999), - }, TemplateArgument { parameter: DeclarationId(984), value: DeclarationId(1000), }, + TemplateArgument { + parameter: DeclarationId(985), + value: DeclarationId(1001), + }, ], }, type_params: vec![], @@ -74337,19 +74374,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5276, 5300), }); declarations.push(Declaration { - id: DeclarationId(2255), + id: DeclarationId(2256), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(982), + template: DeclarationId(983), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(983), - value: DeclarationId(999), - }, TemplateArgument { parameter: DeclarationId(984), value: DeclarationId(1000), }, + TemplateArgument { + parameter: DeclarationId(985), + value: DeclarationId(1001), + }, ], }, type_params: vec![], @@ -74363,13 +74400,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5325, 5349), }); declarations.push(Declaration { - id: DeclarationId(2256), + id: DeclarationId(2257), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), arguments: vec![TemplateArgument { parameter: DeclarationId(38), - value: DeclarationId(1003), + value: DeclarationId(1004), }], }, type_params: vec![], @@ -74383,19 +74420,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5440, 5460), }); declarations.push(Declaration { - id: DeclarationId(2257), + id: DeclarationId(2258), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(982), + template: DeclarationId(983), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(983), - value: DeclarationId(1002), - }, TemplateArgument { parameter: DeclarationId(984), value: DeclarationId(1003), }, + TemplateArgument { + parameter: DeclarationId(985), + value: DeclarationId(1004), + }, ], }, type_params: vec![], @@ -74409,19 +74446,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5471, 5495), }); declarations.push(Declaration { - id: DeclarationId(2258), + id: DeclarationId(2259), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(982), + template: DeclarationId(983), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(983), - value: DeclarationId(1002), - }, TemplateArgument { parameter: DeclarationId(984), value: DeclarationId(1003), }, + TemplateArgument { + parameter: DeclarationId(985), + value: DeclarationId(1004), + }, ], }, type_params: vec![], @@ -74435,12 +74472,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5520, 5544), }); declarations.push(Declaration { - id: DeclarationId(2259), + id: DeclarationId(2260), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(976), + ty: DeclarationId(977), }], }, type_params: vec![], @@ -74454,7 +74491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1634, 1651), }); declarations.push(Declaration { - id: DeclarationId(2260), + id: DeclarationId(2261), name: None, connective: TypeConnective::Conj { children: vec![ @@ -74464,7 +74501,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "at".to_string(), - ty: DeclarationId(826), + ty: DeclarationId(827), }, ], }, @@ -74479,7 +74516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1656, 1697), }); declarations.push(Declaration { - id: DeclarationId(2261), + id: DeclarationId(2262), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74493,12 +74530,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1879, 1891), }); declarations.push(Declaration { - id: DeclarationId(2262), + id: DeclarationId(2263), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "value".to_string(), - ty: DeclarationId(973), + ty: DeclarationId(974), }], }, type_params: vec![], @@ -74512,13 +74549,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1896, 1932), }); declarations.push(Declaration { - id: DeclarationId(2263), + id: DeclarationId(2264), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(975), + template: DeclarationId(976), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(979), + parameter: DeclarationId(977), + value: DeclarationId(980), }], }, type_params: vec![], @@ -74532,13 +74569,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2414, 2430), }); declarations.push(Declaration { - id: DeclarationId(2264), + id: DeclarationId(2265), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(2263), + parameter: DeclarationId(687), + value: DeclarationId(2264), }], }, type_params: vec![], @@ -74552,7 +74589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2409, 2431), }); declarations.push(Declaration { - id: DeclarationId(2265), + id: DeclarationId(2266), name: None, connective: TypeConnective::Conj { children: vec![ @@ -74562,11 +74599,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "composed".to_string(), - ty: DeclarationId(979), + ty: DeclarationId(980), }, Field { label: "witnesses".to_string(), - ty: DeclarationId(2264), + ty: DeclarationId(2265), }, ], }, @@ -74581,13 +74618,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2325, 2437), }); declarations.push(Declaration { - id: DeclarationId(2266), + id: DeclarationId(2267), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(973), + parameter: DeclarationId(687), + value: DeclarationId(974), }], }, type_params: vec![], @@ -74601,13 +74638,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2505, 2521), }); declarations.push(Declaration { - id: DeclarationId(2267), + id: DeclarationId(2268), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(975), + template: DeclarationId(976), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(979), + parameter: DeclarationId(977), + value: DeclarationId(980), }], }, type_params: vec![], @@ -74621,13 +74658,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2544, 2560), }); declarations.push(Declaration { - id: DeclarationId(2268), + id: DeclarationId(2269), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(2267), + parameter: DeclarationId(687), + value: DeclarationId(2268), }], }, type_params: vec![], @@ -74641,7 +74678,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2539, 2561), }); declarations.push(Declaration { - id: DeclarationId(2269), + id: DeclarationId(2270), name: None, connective: TypeConnective::Conj { children: vec![ @@ -74651,11 +74688,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "violations".to_string(), - ty: DeclarationId(2266), + ty: DeclarationId(2267), }, Field { label: "witnesses".to_string(), - ty: DeclarationId(2268), + ty: DeclarationId(2269), }, ], }, @@ -74670,13 +74707,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2442, 2567), }); declarations.push(Declaration { - id: DeclarationId(2270), + id: DeclarationId(2271), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(975), + template: DeclarationId(976), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(981), + parameter: DeclarationId(977), + value: DeclarationId(982), }], }, type_params: vec![], @@ -74690,11 +74727,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3902, 3918), }); declarations.push(Declaration { - id: DeclarationId(2271), + id: DeclarationId(2272), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(826)], - output: DeclarationId(2270), + inputs: vec![DeclarationId(828), DeclarationId(827)], + output: DeclarationId(2271), body: ArrowBody::NoBody, }, type_params: vec![], @@ -74708,13 +74745,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3881, 3918), }); declarations.push(Declaration { - id: DeclarationId(2272), + id: DeclarationId(2273), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(19), arguments: vec![TemplateArgument { parameter: DeclarationId(20), - value: DeclarationId(981), + value: DeclarationId(982), }], }, type_params: vec![], @@ -74728,11 +74765,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3930, 3945), }); declarations.push(Declaration { - id: DeclarationId(2273), + id: DeclarationId(2274), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(826), DeclarationId(981)], - output: DeclarationId(977), + inputs: vec![DeclarationId(827), DeclarationId(982)], + output: DeclarationId(978), body: ArrowBody::NoBody, }, type_params: vec![], @@ -74746,13 +74783,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3966, 4009), }); declarations.push(Declaration { - id: DeclarationId(2274), + id: DeclarationId(2275), name: Some("DimensionUnitAbelianGroup".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(25), arguments: vec![TemplateArgument { parameter: DeclarationId(26), - value: DeclarationId(983), + value: DeclarationId(984), }], }, type_params: vec![], @@ -74766,7 +74803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702), }); declarations.push(Declaration { - id: DeclarationId(2275), + id: DeclarationId(2276), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74780,7 +74817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3709, 3721), }); declarations.push(Declaration { - id: DeclarationId(2276), + id: DeclarationId(2277), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74799,13 +74836,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3726, 3762), }); declarations.push(Declaration { - id: DeclarationId(2277), + id: DeclarationId(2278), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1010), + parameter: DeclarationId(687), + value: DeclarationId(1011), }], }, type_params: vec![], @@ -74819,7 +74856,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873), }); declarations.push(Declaration { - id: DeclarationId(2278), + id: DeclarationId(2279), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74833,12 +74870,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4373, 4389), }); declarations.push(Declaration { - id: DeclarationId(2279), + id: DeclarationId(2280), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(787), + ty: DeclarationId(788), }], }, type_params: vec![], @@ -74852,7 +74889,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4394, 4422), }); declarations.push(Declaration { - id: DeclarationId(2280), + id: DeclarationId(2281), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74866,7 +74903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4665, 4686), }); declarations.push(Declaration { - id: DeclarationId(2281), + id: DeclarationId(2282), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74885,7 +74922,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 5176, 5195), }); declarations.push(Declaration { - id: DeclarationId(2282), + id: DeclarationId(2283), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74904,13 +74941,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 5200, 5222), }); declarations.push(Declaration { - id: DeclarationId(2283), + id: DeclarationId(2284), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1015), + parameter: DeclarationId(687), + value: DeclarationId(1016), }], }, type_params: vec![], @@ -74924,7 +74961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 5591, 5614), }); declarations.push(Declaration { - id: DeclarationId(2284), + id: DeclarationId(2285), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74938,7 +74975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6611, 6619), }); declarations.push(Declaration { - id: DeclarationId(2285), + id: DeclarationId(2286), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74952,7 +74989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6632), }); declarations.push(Declaration { - id: DeclarationId(2286), + id: DeclarationId(2287), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74966,7 +75003,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7073, 7078), }); declarations.push(Declaration { - id: DeclarationId(2287), + id: DeclarationId(2288), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74980,7 +75017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7083, 7091), }); declarations.push(Declaration { - id: DeclarationId(2288), + id: DeclarationId(2289), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74994,7 +75031,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7427, 7440), }); declarations.push(Declaration { - id: DeclarationId(2289), + id: DeclarationId(2290), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75008,7 +75045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7445, 7451), }); declarations.push(Declaration { - id: DeclarationId(2290), + id: DeclarationId(2291), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75022,7 +75059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7709, 7717), }); declarations.push(Declaration { - id: DeclarationId(2291), + id: DeclarationId(2292), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75036,7 +75073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7722, 7727), }); declarations.push(Declaration { - id: DeclarationId(2292), + id: DeclarationId(2293), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75050,7 +75087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7732, 7745), }); declarations.push(Declaration { - id: DeclarationId(2293), + id: DeclarationId(2294), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75064,7 +75101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8082, 8100), }); declarations.push(Declaration { - id: DeclarationId(2294), + id: DeclarationId(2295), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75078,7 +75115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9475, 9484), }); declarations.push(Declaration { - id: DeclarationId(2295), + id: DeclarationId(2296), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75092,7 +75129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9489, 9502), }); declarations.push(Declaration { - id: DeclarationId(2296), + id: DeclarationId(2297), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75106,7 +75143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9507, 9515), }); declarations.push(Declaration { - id: DeclarationId(2297), + id: DeclarationId(2298), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75120,7 +75157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9520, 9530), }); declarations.push(Declaration { - id: DeclarationId(2298), + id: DeclarationId(2299), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75134,7 +75171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9535, 9545), }); declarations.push(Declaration { - id: DeclarationId(2299), + id: DeclarationId(2300), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75148,7 +75185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9550, 9561), }); declarations.push(Declaration { - id: DeclarationId(2300), + id: DeclarationId(2301), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75162,7 +75199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9566, 9574), }); declarations.push(Declaration { - id: DeclarationId(2301), + id: DeclarationId(2302), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75176,7 +75213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9579, 9586), }); declarations.push(Declaration { - id: DeclarationId(2302), + id: DeclarationId(2303), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75190,7 +75227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9591, 9601), }); declarations.push(Declaration { - id: DeclarationId(2303), + id: DeclarationId(2304), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75204,7 +75241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9606, 9618), }); declarations.push(Declaration { - id: DeclarationId(2304), + id: DeclarationId(2305), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75218,7 +75255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12311, 12337), }); declarations.push(Declaration { - id: DeclarationId(2305), + id: DeclarationId(2306), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75232,7 +75269,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12342, 12352), }); declarations.push(Declaration { - id: DeclarationId(2306), + id: DeclarationId(2307), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75246,7 +75283,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17117, 17123), }); declarations.push(Declaration { - id: DeclarationId(2307), + id: DeclarationId(2308), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75260,7 +75297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17128, 17139), }); declarations.push(Declaration { - id: DeclarationId(2308), + id: DeclarationId(2309), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75274,7 +75311,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17459, 17470), }); declarations.push(Declaration { - id: DeclarationId(2309), + id: DeclarationId(2310), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75288,7 +75325,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17475, 17486), }); declarations.push(Declaration { - id: DeclarationId(2310), + id: DeclarationId(2311), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75302,7 +75339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 19419, 19430), }); declarations.push(Declaration { - id: DeclarationId(2311), + id: DeclarationId(2312), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75316,7 +75353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 19435, 19443), }); declarations.push(Declaration { - id: DeclarationId(2312), + id: DeclarationId(2313), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75335,7 +75372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 20606, 20641), }); declarations.push(Declaration { - id: DeclarationId(2313), + id: DeclarationId(2314), name: None, connective: TypeConnective::Conj { children: vec![ @@ -75360,13 +75397,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 20646, 20734), }); declarations.push(Declaration { - id: DeclarationId(2314), + id: DeclarationId(2315), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1045), + parameter: DeclarationId(687), + value: DeclarationId(1046), }], }, type_params: vec![], @@ -75380,11 +75417,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6894, 6922), }); declarations.push(Declaration { - id: DeclarationId(2315), + id: DeclarationId(2316), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(927), + DeclarationId(928), CardinalityBound::AtMostOne, ), ), @@ -75399,11 +75436,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), }); declarations.push(Declaration { - id: DeclarationId(2316), + id: DeclarationId(2317), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(931), + DeclarationId(932), CardinalityBound::AtMostOne, ), ), @@ -75418,13 +75455,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), }); declarations.push(Declaration { - id: DeclarationId(2317), + id: DeclarationId(2318), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1076), + parameter: DeclarationId(687), + value: DeclarationId(1077), }], }, type_params: vec![], @@ -75438,13 +75475,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27850, 27865), }); declarations.push(Declaration { - id: DeclarationId(2318), + id: DeclarationId(2319), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1075), + parameter: DeclarationId(687), + value: DeclarationId(1076), }], }, type_params: vec![], @@ -75458,13 +75495,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 29879, 29895), }); declarations.push(Declaration { - id: DeclarationId(2319), + id: DeclarationId(2320), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1075), + parameter: DeclarationId(687), + value: DeclarationId(1076), }], }, type_params: vec![], @@ -75478,13 +75515,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 29988, 30004), }); declarations.push(Declaration { - id: DeclarationId(2320), + id: DeclarationId(2321), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1075), + parameter: DeclarationId(687), + value: DeclarationId(1076), }], }, type_params: vec![], @@ -75498,13 +75535,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 30102, 30118), }); declarations.push(Declaration { - id: DeclarationId(2321), + id: DeclarationId(2322), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(2320), + parameter: DeclarationId(687), + value: DeclarationId(2321), }], }, type_params: vec![], @@ -75518,7 +75555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 30097, 30119), }); declarations.push(Declaration { - id: DeclarationId(2322), + id: DeclarationId(2323), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75537,7 +75574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), }); declarations.push(Declaration { - id: DeclarationId(2323), + id: DeclarationId(2324), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75556,7 +75593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), }); declarations.push(Declaration { - id: DeclarationId(2324), + id: DeclarationId(2325), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75575,7 +75612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), }); declarations.push(Declaration { - id: DeclarationId(2325), + id: DeclarationId(2326), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75594,7 +75631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), }); declarations.push(Declaration { - id: DeclarationId(2326), + id: DeclarationId(2327), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75613,7 +75650,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), }); declarations.push(Declaration { - id: DeclarationId(2327), + id: DeclarationId(2328), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75632,7 +75669,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), }); declarations.push(Declaration { - id: DeclarationId(2328), + id: DeclarationId(2329), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75646,7 +75683,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5629, 5644), }); declarations.push(Declaration { - id: DeclarationId(2329), + id: DeclarationId(2330), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75660,7 +75697,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5684, 5697), }); declarations.push(Declaration { - id: DeclarationId(2330), + id: DeclarationId(2331), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75674,7 +75711,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5745, 5762), }); declarations.push(Declaration { - id: DeclarationId(2331), + id: DeclarationId(2332), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75688,7 +75725,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5801, 5813), }); declarations.push(Declaration { - id: DeclarationId(2332), + id: DeclarationId(2333), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75702,17 +75739,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5861, 5878), }); declarations.push(Declaration { - id: DeclarationId(2333), + id: DeclarationId(2334), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "field".to_string(), - ty: DeclarationId(1060), + ty: DeclarationId(1061), }, Field { label: "factor".to_string(), - ty: DeclarationId(929), + ty: DeclarationId(930), }, ], }, @@ -75727,12 +75764,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10033), }); declarations.push(Declaration { - id: DeclarationId(2334), + id: DeclarationId(2335), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "field".to_string(), - ty: DeclarationId(1060), + ty: DeclarationId(1061), }], }, type_params: vec![], @@ -75746,7 +75783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 10038, 10080), }); declarations.push(Declaration { - id: DeclarationId(2335), + id: DeclarationId(2336), name: None, connective: TypeConnective::Conj { children: vec![ @@ -75756,7 +75793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "factor".to_string(), - ty: DeclarationId(929), + ty: DeclarationId(930), }, ], }, @@ -75771,7 +75808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 10085, 10142), }); declarations.push(Declaration { - id: DeclarationId(2336), + id: DeclarationId(2337), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75785,7 +75822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 10147, 10161), }); declarations.push(Declaration { - id: DeclarationId(2337), + id: DeclarationId(2338), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75799,7 +75836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 10166, 10181), }); declarations.push(Declaration { - id: DeclarationId(2338), + id: DeclarationId(2339), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75813,12 +75850,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24135, 24149), }); declarations.push(Declaration { - id: DeclarationId(2339), + id: DeclarationId(2340), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "degree".to_string(), - ty: DeclarationId(1211), + ty: DeclarationId(1212), }], }, type_params: vec![], @@ -75832,17 +75869,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24154, 24201), }); declarations.push(Declaration { - id: DeclarationId(2340), + id: DeclarationId(2341), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "numerator".to_string(), - ty: DeclarationId(1211), + ty: DeclarationId(1212), }, Field { label: "root".to_string(), - ty: DeclarationId(1211), + ty: DeclarationId(1212), }, ], }, @@ -75857,17 +75894,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24206, 24283), }); declarations.push(Declaration { - id: DeclarationId(2341), + id: DeclarationId(2342), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "base".to_string(), - ty: DeclarationId(1213), + ty: DeclarationId(1214), }, Field { label: "argument".to_string(), - ty: DeclarationId(1211), + ty: DeclarationId(1212), }, ], }, @@ -75882,7 +75919,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24288, 24362), }); declarations.push(Declaration { - id: DeclarationId(2342), + id: DeclarationId(2343), name: None, connective: TypeConnective::Conj { children: vec![ @@ -75892,7 +75929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "exponent".to_string(), - ty: DeclarationId(1073), + ty: DeclarationId(1074), }, ], }, @@ -75907,7 +75944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24982, 25038), }); declarations.push(Declaration { - id: DeclarationId(2343), + id: DeclarationId(2344), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75926,7 +75963,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 25054, 25079), }); declarations.push(Declaration { - id: DeclarationId(2344), + id: DeclarationId(2345), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75940,12 +75977,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26728, 26741), }); declarations.push(Declaration { - id: DeclarationId(2345), + id: DeclarationId(2346), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "cost".to_string(), - ty: DeclarationId(1075), + ty: DeclarationId(1076), }], }, type_params: vec![], @@ -75959,13 +75996,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26785, 26817), }); declarations.push(Declaration { - id: DeclarationId(2346), + id: DeclarationId(2347), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1075), + parameter: DeclarationId(687), + value: DeclarationId(1076), }], }, type_params: vec![], @@ -75979,12 +76016,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26880, 26896), }); declarations.push(Declaration { - id: DeclarationId(2347), + id: DeclarationId(2348), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "factors".to_string(), - ty: DeclarationId(2346), + ty: DeclarationId(2347), }], }, type_params: vec![], @@ -75998,13 +76035,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26856, 26898), }); declarations.push(Declaration { - id: DeclarationId(2348), + id: DeclarationId(2349), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1075), + parameter: DeclarationId(687), + value: DeclarationId(1076), }], }, type_params: vec![], @@ -76018,13 +76055,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26960, 26976), }); declarations.push(Declaration { - id: DeclarationId(2349), + id: DeclarationId(2350), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(2348), + parameter: DeclarationId(687), + value: DeclarationId(2349), }], }, type_params: vec![], @@ -76038,12 +76075,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26955, 26977), }); declarations.push(Declaration { - id: DeclarationId(2350), + id: DeclarationId(2351), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "terms".to_string(), - ty: DeclarationId(2349), + ty: DeclarationId(2350), }], }, type_params: vec![], @@ -76057,13 +76094,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26927, 26979), }); declarations.push(Declaration { - id: DeclarationId(2351), + id: DeclarationId(2352), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1076), + parameter: DeclarationId(687), + value: DeclarationId(1077), }], }, type_params: vec![], @@ -76077,12 +76114,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27277, 27292), }); declarations.push(Declaration { - id: DeclarationId(2352), + id: DeclarationId(2353), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "terms".to_string(), - ty: DeclarationId(2351), + ty: DeclarationId(2352), }], }, type_params: vec![], @@ -76096,7 +76133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27259, 27294), }); declarations.push(Declaration { - id: DeclarationId(2353), + id: DeclarationId(2354), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -76110,7 +76147,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27377, 27389), }); declarations.push(Declaration { - id: DeclarationId(2354), + id: DeclarationId(2355), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -76124,13 +76161,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27459, 27469), }); declarations.push(Declaration { - id: DeclarationId(2355), + id: DeclarationId(2356), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1289), + parameter: DeclarationId(687), + value: DeclarationId(1290), }], }, type_params: vec![], @@ -76144,13 +76181,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1234, 1254), }); declarations.push(Declaration { - id: DeclarationId(2356), + id: DeclarationId(2357), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1289), + parameter: DeclarationId(687), + value: DeclarationId(1290), }], }, type_params: vec![], @@ -76164,13 +76201,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1414, 1434), }); declarations.push(Declaration { - id: DeclarationId(2357), + id: DeclarationId(2358), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(975), + template: DeclarationId(976), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1120), + parameter: DeclarationId(977), + value: DeclarationId(1121), }], }, type_params: vec![], @@ -76184,11 +76221,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190), }); declarations.push(Declaration { - id: DeclarationId(2358), + id: DeclarationId(2359), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(826)], - output: DeclarationId(2357), + inputs: vec![DeclarationId(828), DeclarationId(827)], + output: DeclarationId(2358), body: ArrowBody::NoBody, }, type_params: vec![], @@ -76202,13 +76239,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190), }); declarations.push(Declaration { - id: DeclarationId(2359), + id: DeclarationId(2360), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(19), arguments: vec![TemplateArgument { parameter: DeclarationId(20), - value: DeclarationId(1120), + value: DeclarationId(1121), }], }, type_params: vec![], @@ -76222,11 +76259,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214), }); declarations.push(Declaration { - id: DeclarationId(2360), + id: DeclarationId(2361), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1120), DeclarationId(1120)], - output: DeclarationId(1120), + inputs: vec![DeclarationId(1121), DeclarationId(1121)], + output: DeclarationId(1121), body: ArrowBody::NoBody, }, type_params: vec![], @@ -76240,11 +76277,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238), }); declarations.push(Declaration { - id: DeclarationId(2361), + id: DeclarationId(2362), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1120), DeclarationId(817)], - output: DeclarationId(1120), + inputs: vec![DeclarationId(1121), DeclarationId(818)], + output: DeclarationId(1121), body: ArrowBody::NoBody, }, type_params: vec![], @@ -76258,11 +76295,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271), }); declarations.push(Declaration { - id: DeclarationId(2362), + id: DeclarationId(2363), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(1120)], - output: DeclarationId(977), + inputs: vec![DeclarationId(828), DeclarationId(1121)], + output: DeclarationId(978), body: ArrowBody::NoBody, }, type_params: vec![], @@ -76276,12 +76313,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316), }); declarations.push(Declaration { - id: DeclarationId(2363), + id: DeclarationId(2364), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "declaration".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }], }, type_params: vec![], @@ -76295,17 +76332,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 3305, 3352), }); declarations.push(Declaration { - id: DeclarationId(2364), + id: DeclarationId(2365), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "declaration".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }, Field { label: "node".to_string(), - ty: DeclarationId(721), + ty: DeclarationId(722), }, ], }, @@ -76320,7 +76357,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 3357, 3418), }); declarations.push(Declaration { - id: DeclarationId(2365), + id: DeclarationId(2366), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -76334,11 +76371,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 4297, 4302), }); declarations.push(Declaration { - id: DeclarationId(2366), + id: DeclarationId(2367), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1124)], - output: DeclarationId(1125), + inputs: vec![DeclarationId(1125)], + output: DeclarationId(1126), body: ArrowBody::NoBody, }, type_params: vec![], @@ -76352,10 +76389,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 5301, 5321), }); declarations.push(Declaration { - id: DeclarationId(2367), + id: DeclarationId(2368), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1125), DeclarationId(1125)], + inputs: vec![DeclarationId(1126), DeclarationId(1126)], output: DeclarationId(128), body: ArrowBody::NoBody, }, @@ -76370,13 +76407,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 5334, 5360), }); declarations.push(Declaration { - id: DeclarationId(2368), + id: DeclarationId(2369), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1119), + template: DeclarationId(1120), arguments: vec![TemplateArgument { - parameter: DeclarationId(1120), - value: DeclarationId(1127), + parameter: DeclarationId(1121), + value: DeclarationId(1128), }], }, type_params: vec![], @@ -76390,19 +76427,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 7360, 7372), }); declarations.push(Declaration { - id: DeclarationId(2369), + id: DeclarationId(2370), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1123), + template: DeclarationId(1124), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(1124), - value: DeclarationId(1127), - }, TemplateArgument { parameter: DeclarationId(1125), value: DeclarationId(1128), }, + TemplateArgument { + parameter: DeclarationId(1126), + value: DeclarationId(1129), + }, ], }, type_params: vec![], @@ -76416,19 +76453,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 7388, 7419), }); declarations.push(Declaration { - id: DeclarationId(2370), + id: DeclarationId(2371), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1126), + template: DeclarationId(1127), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(1127), - value: DeclarationId(1130), - }, TemplateArgument { parameter: DeclarationId(1128), value: DeclarationId(1131), }, + TemplateArgument { + parameter: DeclarationId(1129), + value: DeclarationId(1132), + }, ], }, type_params: vec![], @@ -76442,13 +76479,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 9093, 9124), }); declarations.push(Declaration { - id: DeclarationId(2371), + id: DeclarationId(2372), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1119), + template: DeclarationId(1120), arguments: vec![TemplateArgument { - parameter: DeclarationId(1120), - value: DeclarationId(1133), + parameter: DeclarationId(1121), + value: DeclarationId(1134), }], }, type_params: vec![], @@ -76462,12 +76499,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 10144, 10156), }); declarations.push(Declaration { - id: DeclarationId(2372), + id: DeclarationId(2373), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1134), + template: DeclarationId(1135), arguments: vec![TemplateArgument { - parameter: DeclarationId(1135), + parameter: DeclarationId(1136), value: DeclarationId(93), }], }, @@ -76482,12 +76519,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4589, 4600), }); declarations.push(Declaration { - id: DeclarationId(2373), + id: DeclarationId(2374), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1134), + template: DeclarationId(1135), arguments: vec![TemplateArgument { - parameter: DeclarationId(1135), + parameter: DeclarationId(1136), value: DeclarationId(93), }], }, @@ -76502,7 +76539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4642, 4653), }); declarations.push(Declaration { - id: DeclarationId(2374), + id: DeclarationId(2375), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -76516,12 +76553,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4544, 4548), }); declarations.push(Declaration { - id: DeclarationId(2375), + id: DeclarationId(2376), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1135), + ty: DeclarationId(1136), }], }, type_params: vec![], @@ -76535,13 +76572,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4553, 4563), }); declarations.push(Declaration { - id: DeclarationId(2376), + id: DeclarationId(2377), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1152), + parameter: DeclarationId(687), + value: DeclarationId(1153), }], }, type_params: vec![], @@ -76555,11 +76592,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1179, 1196), }); declarations.push(Declaration { - id: DeclarationId(2377), + id: DeclarationId(2378), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1151), + DeclarationId(1152), CardinalityBound::AtMostOne, ), ), @@ -76574,13 +76611,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { - id: DeclarationId(2378), + id: DeclarationId(2379), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1144), + parameter: DeclarationId(687), + value: DeclarationId(1145), }], }, type_params: vec![], @@ -76594,12 +76631,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1747, 1764), }); declarations.push(Declaration { - id: DeclarationId(2379), + id: DeclarationId(2380), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(2378), + ty: DeclarationId(2379), }], }, type_params: vec![], @@ -76613,13 +76650,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1736, 1765), }); declarations.push(Declaration { - id: DeclarationId(2380), + id: DeclarationId(2381), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1141), + parameter: DeclarationId(687), + value: DeclarationId(1142), }], }, type_params: vec![], @@ -76633,12 +76670,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1777, 1795), }); declarations.push(Declaration { - id: DeclarationId(2381), + id: DeclarationId(2382), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(2380), + ty: DeclarationId(2381), }], }, type_params: vec![], @@ -76652,7 +76689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1770, 1796), }); declarations.push(Declaration { - id: DeclarationId(2382), + id: DeclarationId(2383), name: None, connective: TypeConnective::Conj { children: vec![ @@ -76677,13 +76714,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2073, 2113), }); declarations.push(Declaration { - id: DeclarationId(2383), + id: DeclarationId(2384), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1144), + parameter: DeclarationId(687), + value: DeclarationId(1145), }], }, type_params: vec![], @@ -76697,7 +76734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2165, 2182), }); declarations.push(Declaration { - id: DeclarationId(2384), + id: DeclarationId(2385), name: None, connective: TypeConnective::Conj { children: vec![ @@ -76707,7 +76744,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), - ty: DeclarationId(2383), + ty: DeclarationId(2384), }, Field { label: "span".to_string(), @@ -76726,13 +76763,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2118, 2211), }); declarations.push(Declaration { - id: DeclarationId(2385), + id: DeclarationId(2386), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "inner".to_string(), - ty: DeclarationId(1144), + ty: DeclarationId(1145), }, Field { label: "span".to_string(), @@ -76751,13 +76788,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2216, 2280), }); declarations.push(Declaration { - id: DeclarationId(2386), + id: DeclarationId(2387), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1144), + parameter: DeclarationId(687), + value: DeclarationId(1145), }], }, type_params: vec![], @@ -76771,17 +76808,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2307, 2324), }); declarations.push(Declaration { - id: DeclarationId(2387), + id: DeclarationId(2388), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "inputs".to_string(), - ty: DeclarationId(2386), + ty: DeclarationId(2387), }, Field { label: "output".to_string(), - ty: DeclarationId(1144), + ty: DeclarationId(1145), }, Field { label: "span".to_string(), @@ -76800,7 +76837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2285, 2379), }); declarations.push(Declaration { - id: DeclarationId(2388), + id: DeclarationId(2389), name: None, connective: TypeConnective::Conj { children: vec![ @@ -76825,7 +76862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3749, 3795), }); declarations.push(Declaration { - id: DeclarationId(2389), + id: DeclarationId(2390), name: None, connective: TypeConnective::Conj { children: vec![ @@ -76854,13 +76891,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3800, 3883), }); declarations.push(Declaration { - id: DeclarationId(2390), + id: DeclarationId(2391), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1148), + parameter: DeclarationId(687), + value: DeclarationId(1149), }], }, type_params: vec![], @@ -76874,7 +76911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3937, 3962), }); declarations.push(Declaration { - id: DeclarationId(2391), + id: DeclarationId(2392), name: None, connective: TypeConnective::Conj { children: vec![ @@ -76884,7 +76921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fields".to_string(), - ty: DeclarationId(2390), + ty: DeclarationId(2391), }, Field { label: "span".to_string(), @@ -76903,7 +76940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3888, 3991), }); declarations.push(Declaration { - id: DeclarationId(2392), + id: DeclarationId(2393), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -76922,7 +76959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4663, 4674), }); declarations.push(Declaration { - id: DeclarationId(2393), + id: DeclarationId(2394), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -76941,7 +76978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4679, 4689), }); declarations.push(Declaration { - id: DeclarationId(2394), + id: DeclarationId(2395), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -76960,13 +76997,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4694, 4708), }); declarations.push(Declaration { - id: DeclarationId(2395), + id: DeclarationId(2396), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "value".to_string(), - ty: DeclarationId(1150), + ty: DeclarationId(1151), }, Field { label: "span".to_string(), @@ -76985,7 +77022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4822, 4873), }); declarations.push(Declaration { - id: DeclarationId(2396), + id: DeclarationId(2397), name: None, connective: TypeConnective::Conj { children: vec![ @@ -77010,12 +77047,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4878, 4916), }); declarations.push(Declaration { - id: DeclarationId(2397), + id: DeclarationId(2398), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -77030,12 +77067,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4944, 4956), }); declarations.push(Declaration { - id: DeclarationId(2398), + id: DeclarationId(2399), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(159), }], }, @@ -77050,17 +77087,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4978, 4994), }); declarations.push(Declaration { - id: DeclarationId(2399), + id: DeclarationId(2400), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "segments".to_string(), - ty: DeclarationId(2397), + ty: DeclarationId(2398), }, Field { label: "segment_spans".to_string(), - ty: DeclarationId(2398), + ty: DeclarationId(2399), }, Field { label: "span".to_string(), @@ -77079,13 +77116,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4921, 5023), }); declarations.push(Declaration { - id: DeclarationId(2400), + id: DeclarationId(2401), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1151), + parameter: DeclarationId(687), + value: DeclarationId(1152), }], }, type_params: vec![], @@ -77099,7 +77136,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5068, 5085), }); declarations.push(Declaration { - id: DeclarationId(2401), + id: DeclarationId(2402), name: None, connective: TypeConnective::Conj { children: vec![ @@ -77109,7 +77146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), - ty: DeclarationId(2400), + ty: DeclarationId(2401), }, Field { label: "span".to_string(), @@ -77128,12 +77165,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5028, 5114), }); declarations.push(Declaration { - id: DeclarationId(2402), + id: DeclarationId(2403), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -77148,12 +77185,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5685, 5697), }); declarations.push(Declaration { - id: DeclarationId(2403), + id: DeclarationId(2404), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(159), }], }, @@ -77168,13 +77205,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5719, 5735), }); declarations.push(Declaration { - id: DeclarationId(2404), + id: DeclarationId(2405), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1151), + parameter: DeclarationId(687), + value: DeclarationId(1152), }], }, type_params: vec![], @@ -77188,21 +77225,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5748, 5765), }); declarations.push(Declaration { - id: DeclarationId(2405), + id: DeclarationId(2406), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "segments".to_string(), - ty: DeclarationId(2402), + ty: DeclarationId(2403), }, Field { label: "segment_spans".to_string(), - ty: DeclarationId(2403), + ty: DeclarationId(2404), }, Field { label: "args".to_string(), - ty: DeclarationId(2404), + ty: DeclarationId(2405), }, Field { label: "span".to_string(), @@ -77221,13 +77258,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5658, 5794), }); declarations.push(Declaration { - id: DeclarationId(2406), + id: DeclarationId(2407), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1145), + parameter: DeclarationId(687), + value: DeclarationId(1146), }], }, type_params: vec![], @@ -77241,7 +77278,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5850, 5874), }); declarations.push(Declaration { - id: DeclarationId(2407), + id: DeclarationId(2408), name: None, connective: TypeConnective::Conj { children: vec![ @@ -77251,7 +77288,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fields".to_string(), - ty: DeclarationId(2406), + ty: DeclarationId(2407), }, Field { label: "span".to_string(), @@ -77270,13 +77307,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5799, 5903), }); declarations.push(Declaration { - id: DeclarationId(2408), + id: DeclarationId(2409), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1151), + parameter: DeclarationId(687), + value: DeclarationId(1152), }], }, type_params: vec![], @@ -77290,17 +77327,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5954, 5971), }); declarations.push(Declaration { - id: DeclarationId(2409), + id: DeclarationId(2410), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "op".to_string(), - ty: DeclarationId(805), + ty: DeclarationId(806), }, Field { label: "args".to_string(), - ty: DeclarationId(2408), + ty: DeclarationId(2409), }, Field { label: "span".to_string(), @@ -77319,12 +77356,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5908, 6000), }); declarations.push(Declaration { - id: DeclarationId(2410), + id: DeclarationId(2411), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -77339,17 +77376,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6028, 6040), }); declarations.push(Declaration { - id: DeclarationId(2411), + id: DeclarationId(2412), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "params".to_string(), - ty: DeclarationId(2410), + ty: DeclarationId(2411), }, Field { label: "body".to_string(), - ty: DeclarationId(1151), + ty: DeclarationId(1152), }, Field { label: "span".to_string(), @@ -77368,21 +77405,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6005, 6093), }); declarations.push(Declaration { - id: DeclarationId(2412), + id: DeclarationId(2413), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "cond".to_string(), - ty: DeclarationId(1151), + ty: DeclarationId(1152), }, Field { label: "then_branch".to_string(), - ty: DeclarationId(1151), + ty: DeclarationId(1152), }, Field { label: "else_branch".to_string(), - ty: DeclarationId(1151), + ty: DeclarationId(1152), }, Field { label: "span".to_string(), @@ -77401,13 +77438,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6098, 6217), }); declarations.push(Declaration { - id: DeclarationId(2413), + id: DeclarationId(2414), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1147), + parameter: DeclarationId(687), + value: DeclarationId(1148), }], }, type_params: vec![], @@ -77421,17 +77458,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6271, 6292), }); declarations.push(Declaration { - id: DeclarationId(2414), + id: DeclarationId(2415), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "scrutinee".to_string(), - ty: DeclarationId(1151), + ty: DeclarationId(1152), }, Field { label: "arms".to_string(), - ty: DeclarationId(2413), + ty: DeclarationId(2414), }, Field { label: "span".to_string(), @@ -77450,13 +77487,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6222, 6321), }); declarations.push(Declaration { - id: DeclarationId(2415), + id: DeclarationId(2416), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1145), + parameter: DeclarationId(687), + value: DeclarationId(1146), }], }, type_params: vec![], @@ -77470,13 +77507,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6349, 6373), }); declarations.push(Declaration { - id: DeclarationId(2416), + id: DeclarationId(2417), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "fields".to_string(), - ty: DeclarationId(2415), + ty: DeclarationId(2416), }, Field { label: "span".to_string(), @@ -77495,13 +77532,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6326, 6402), }); declarations.push(Declaration { - id: DeclarationId(2417), + id: DeclarationId(2418), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1151), + parameter: DeclarationId(687), + value: DeclarationId(1152), }], }, type_params: vec![], @@ -77515,13 +77552,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6430, 6447), }); declarations.push(Declaration { - id: DeclarationId(2418), + id: DeclarationId(2419), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "elements".to_string(), - ty: DeclarationId(2417), + ty: DeclarationId(2418), }, Field { label: "span".to_string(), @@ -77540,13 +77577,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6407, 6476), }); declarations.push(Declaration { - id: DeclarationId(2419), + id: DeclarationId(2420), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1146), + parameter: DeclarationId(687), + value: DeclarationId(1147), }], }, type_params: vec![], @@ -77560,13 +77597,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 8570, 8591), }); declarations.push(Declaration { - id: DeclarationId(2420), + id: DeclarationId(2421), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "entries".to_string(), - ty: DeclarationId(2419), + ty: DeclarationId(2420), }, Field { label: "span".to_string(), @@ -77585,11 +77622,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 8549, 8620), }); declarations.push(Declaration { - id: DeclarationId(2421), + id: DeclarationId(2422), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1144), + DeclarationId(1145), CardinalityBound::AtMostOne, ), ), @@ -77604,7 +77641,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), }); declarations.push(Declaration { - id: DeclarationId(2422), + id: DeclarationId(2423), name: None, connective: TypeConnective::Conj { children: vec![ @@ -77614,11 +77651,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_ann".to_string(), - ty: DeclarationId(2421), + ty: DeclarationId(2422), }, Field { label: "expr".to_string(), - ty: DeclarationId(1151), + ty: DeclarationId(1152), }, ], }, @@ -77633,12 +77670,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9510, 9593), }); declarations.push(Declaration { - id: DeclarationId(2423), + id: DeclarationId(2424), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -77653,13 +77690,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9641, 9653), }); declarations.push(Declaration { - id: DeclarationId(2424), + id: DeclarationId(2425), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1140), + parameter: DeclarationId(687), + value: DeclarationId(1141), }], }, type_params: vec![], @@ -77673,7 +77710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9668, 9686), }); declarations.push(Declaration { - id: DeclarationId(2425), + id: DeclarationId(2426), name: None, connective: TypeConnective::Conj { children: vec![ @@ -77683,19 +77720,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(2423), + ty: DeclarationId(2424), }, Field { label: "params".to_string(), - ty: DeclarationId(2424), + ty: DeclarationId(2425), }, Field { label: "return_type".to_string(), - ty: DeclarationId(1144), + ty: DeclarationId(1145), }, Field { label: "body".to_string(), - ty: DeclarationId(1151), + ty: DeclarationId(1152), }, Field { label: "span".to_string(), @@ -77714,12 +77751,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9598, 9770), }); declarations.push(Declaration { - id: DeclarationId(2426), + id: DeclarationId(2427), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -77734,13 +77771,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9830, 9842), }); declarations.push(Declaration { - id: DeclarationId(2427), + id: DeclarationId(2428), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1140), + parameter: DeclarationId(687), + value: DeclarationId(1141), }], }, type_params: vec![], @@ -77754,7 +77791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9857, 9875), }); declarations.push(Declaration { - id: DeclarationId(2428), + id: DeclarationId(2429), name: None, connective: TypeConnective::Conj { children: vec![ @@ -77764,15 +77801,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(2426), + ty: DeclarationId(2427), }, Field { label: "params".to_string(), - ty: DeclarationId(2427), + ty: DeclarationId(2428), }, Field { label: "return_type".to_string(), - ty: DeclarationId(1144), + ty: DeclarationId(1145), }, Field { label: "body_span".to_string(), @@ -77795,11 +77832,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9775, 9963), }); declarations.push(Declaration { - id: DeclarationId(2429), + id: DeclarationId(2430), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1151), + DeclarationId(1152), CardinalityBound::AtMostOne, ), ), @@ -77814,7 +77851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), }); declarations.push(Declaration { - id: DeclarationId(2430), + id: DeclarationId(2431), name: None, connective: TypeConnective::Conj { children: vec![ @@ -77824,11 +77861,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "ty".to_string(), - ty: DeclarationId(1144), + ty: DeclarationId(1145), }, Field { label: "body".to_string(), - ty: DeclarationId(2429), + ty: DeclarationId(2430), }, Field { label: "body_span".to_string(), @@ -77851,12 +77888,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9968, 10097), }); declarations.push(Declaration { - id: DeclarationId(2431), + id: DeclarationId(2432), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -77871,13 +77908,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10117, 10129), }); declarations.push(Declaration { - id: DeclarationId(2432), + id: DeclarationId(2433), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "path".to_string(), - ty: DeclarationId(2431), + ty: DeclarationId(2432), }, Field { label: "span".to_string(), @@ -77896,12 +77933,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10102, 10149), }); declarations.push(Declaration { - id: DeclarationId(2433), + id: DeclarationId(2434), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -77916,12 +77953,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10175, 10187), }); declarations.push(Declaration { - id: DeclarationId(2434), + id: DeclarationId(2435), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -77936,17 +77973,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10201, 10213), }); declarations.push(Declaration { - id: DeclarationId(2435), + id: DeclarationId(2436), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "path".to_string(), - ty: DeclarationId(2433), + ty: DeclarationId(2434), }, Field { label: "names".to_string(), - ty: DeclarationId(2434), + ty: DeclarationId(2435), }, Field { label: "span".to_string(), @@ -77965,12 +78002,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10154, 10242), }); declarations.push(Declaration { - id: DeclarationId(2436), + id: DeclarationId(2437), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -77985,7 +78022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10296, 10308), }); declarations.push(Declaration { - id: DeclarationId(2437), + id: DeclarationId(2438), name: None, connective: TypeConnective::Conj { children: vec![ @@ -77995,7 +78032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(2436), + ty: DeclarationId(2437), }, Field { label: "span".to_string(), @@ -78014,12 +78051,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10247, 10337), }); declarations.push(Declaration { - id: DeclarationId(2438), + id: DeclarationId(2439), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -78034,13 +78071,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10393, 10405), }); declarations.push(Declaration { - id: DeclarationId(2439), + id: DeclarationId(2440), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1141), + parameter: DeclarationId(687), + value: DeclarationId(1142), }], }, type_params: vec![], @@ -78054,7 +78091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10420, 10438), }); declarations.push(Declaration { - id: DeclarationId(2440), + id: DeclarationId(2441), name: None, connective: TypeConnective::Conj { children: vec![ @@ -78064,11 +78101,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(2438), + ty: DeclarationId(2439), }, Field { label: "fields".to_string(), - ty: DeclarationId(2439), + ty: DeclarationId(2440), }, Field { label: "span".to_string(), @@ -78087,12 +78124,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10342, 10467), }); declarations.push(Declaration { - id: DeclarationId(2441), + id: DeclarationId(2442), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -78107,13 +78144,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10520, 10532), }); declarations.push(Declaration { - id: DeclarationId(2442), + id: DeclarationId(2443), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1142), + parameter: DeclarationId(687), + value: DeclarationId(1143), }], }, type_params: vec![], @@ -78127,11 +78164,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10549, 10569), }); declarations.push(Declaration { - id: DeclarationId(2443), + id: DeclarationId(2444), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1144), + DeclarationId(1145), CardinalityBound::AtMostOne, ), ), @@ -78146,7 +78183,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), }); declarations.push(Declaration { - id: DeclarationId(2444), + id: DeclarationId(2445), name: None, connective: TypeConnective::Conj { children: vec![ @@ -78156,15 +78193,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(2441), + ty: DeclarationId(2442), }, Field { label: "variants".to_string(), - ty: DeclarationId(2442), + ty: DeclarationId(2443), }, Field { label: "inhabits".to_string(), - ty: DeclarationId(2443), + ty: DeclarationId(2444), }, Field { label: "span".to_string(), @@ -78183,12 +78220,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10472, 10627), }); declarations.push(Declaration { - id: DeclarationId(2445), + id: DeclarationId(2446), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -78203,11 +78240,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10682, 10694), }); declarations.push(Declaration { - id: DeclarationId(2446), + id: DeclarationId(2447), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1151), + DeclarationId(1152), CardinalityBound::AtMostOne, ), ), @@ -78222,7 +78259,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), }); declarations.push(Declaration { - id: DeclarationId(2447), + id: DeclarationId(2448), name: None, connective: TypeConnective::Conj { children: vec![ @@ -78232,7 +78269,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(2445), + ty: DeclarationId(2446), }, Field { label: "nominal_opaque".to_string(), @@ -78240,11 +78277,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "target".to_string(), - ty: DeclarationId(1144), + ty: DeclarationId(1145), }, Field { label: "refinement".to_string(), - ty: DeclarationId(2446), + ty: DeclarationId(2447), }, Field { label: "span".to_string(), @@ -78263,13 +78300,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10632, 10807), }); declarations.push(Declaration { - id: DeclarationId(2448), + id: DeclarationId(2449), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1045), + parameter: DeclarationId(687), + value: DeclarationId(1046), }], }, type_params: vec![], @@ -78287,13 +78324,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(2449), + id: DeclarationId(2450), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1166), + parameter: DeclarationId(687), + value: DeclarationId(1167), }], }, type_params: vec![], @@ -78307,12 +78344,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 11243, 11254), }); declarations.push(Declaration { - id: DeclarationId(2450), + id: DeclarationId(2451), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(781), + ty: DeclarationId(782), }], }, type_params: vec![], @@ -78326,13 +78363,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2137, 2162), }); declarations.push(Declaration { - id: DeclarationId(2451), + id: DeclarationId(2452), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1165), + parameter: DeclarationId(687), + value: DeclarationId(1166), }], }, type_params: vec![], @@ -78346,12 +78383,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2179, 2195), }); declarations.push(Declaration { - id: DeclarationId(2452), + id: DeclarationId(2453), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(2451), + ty: DeclarationId(2452), }], }, type_params: vec![], @@ -78365,17 +78402,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2167, 2196), }); declarations.push(Declaration { - id: DeclarationId(2453), + id: DeclarationId(2454), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "tag".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }, Field { label: "payload".to_string(), - ty: DeclarationId(1166), + ty: DeclarationId(1167), }, ], }, @@ -78390,12 +78427,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2201, 2252), }); declarations.push(Declaration { - id: DeclarationId(2454), + id: DeclarationId(2455), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(721), + ty: DeclarationId(722), }], }, type_params: vec![], @@ -78409,12 +78446,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2257, 2272), }); declarations.push(Declaration { - id: DeclarationId(2455), + id: DeclarationId(2456), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(817), + ty: DeclarationId(818), }], }, type_params: vec![], @@ -78428,18 +78465,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2277, 2304), }); declarations.push(Declaration { - id: DeclarationId(2456), + id: DeclarationId(2457), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), arguments: vec![ TemplateArgument { parameter: DeclarationId(138), - value: DeclarationId(722), + value: DeclarationId(723), }, TemplateArgument { parameter: DeclarationId(139), - value: DeclarationId(1166), + value: DeclarationId(1167), }, ], }, @@ -78454,13 +78491,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 3936, 3954), }); declarations.push(Declaration { - id: DeclarationId(2457), + id: DeclarationId(2458), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1169), + parameter: DeclarationId(687), + value: DeclarationId(1170), }], }, type_params: vec![], @@ -78474,12 +78511,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 4542, 4557), }); declarations.push(Declaration { - id: DeclarationId(2458), + id: DeclarationId(2459), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "input_order".to_string(), - ty: DeclarationId(1173), + ty: DeclarationId(1174), }], }, type_params: vec![], @@ -78493,7 +78530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 5388, 5442), }); declarations.push(Declaration { - id: DeclarationId(2459), + id: DeclarationId(2460), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78507,7 +78544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 5682, 5691), }); declarations.push(Declaration { - id: DeclarationId(2460), + id: DeclarationId(2461), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78521,13 +78558,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 5694, 5704), }); declarations.push(Declaration { - id: DeclarationId(2461), + id: DeclarationId(2462), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1045), + parameter: DeclarationId(687), + value: DeclarationId(1046), }], }, type_params: vec![], @@ -78541,7 +78578,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5765, 5793), }); declarations.push(Declaration { - id: DeclarationId(2462), + id: DeclarationId(2463), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -78552,7 +78589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(139), - value: DeclarationId(1181), + value: DeclarationId(1182), }, ], }, @@ -78567,13 +78604,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 6801, 6824), }); declarations.push(Declaration { - id: DeclarationId(2463), + id: DeclarationId(2464), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(975), + template: DeclarationId(976), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -78587,13 +78624,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), }); declarations.push(Declaration { - id: DeclarationId(2464), + id: DeclarationId(2465), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(975), + template: DeclarationId(976), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -78607,13 +78644,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4510, 4536), }); declarations.push(Declaration { - id: DeclarationId(2465), + id: DeclarationId(2466), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(798), + parameter: DeclarationId(687), + value: DeclarationId(799), }], }, type_params: vec![], @@ -78627,13 +78664,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4804, 4821), }); declarations.push(Declaration { - id: DeclarationId(2466), + id: DeclarationId(2467), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(826), + parameter: DeclarationId(687), + value: DeclarationId(827), }], }, type_params: vec![], @@ -78647,13 +78684,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4872, 4886), }); declarations.push(Declaration { - id: DeclarationId(2467), + id: DeclarationId(2468), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(780), + parameter: DeclarationId(687), + value: DeclarationId(781), }], }, type_params: vec![], @@ -78667,13 +78704,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4936, 4949), }); declarations.push(Declaration { - id: DeclarationId(2468), + id: DeclarationId(2469), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(816), + parameter: DeclarationId(687), + value: DeclarationId(817), }], }, type_params: vec![], @@ -78687,13 +78724,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4999, 5012), }); declarations.push(Declaration { - id: DeclarationId(2469), + id: DeclarationId(2470), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(973), + parameter: DeclarationId(687), + value: DeclarationId(974), }], }, type_params: vec![], @@ -78707,13 +78744,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5060, 5076), }); declarations.push(Declaration { - id: DeclarationId(2470), + id: DeclarationId(2471), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(975), + template: DeclarationId(976), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -78727,13 +78764,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5129, 5155), }); declarations.push(Declaration { - id: DeclarationId(2471), + id: DeclarationId(2472), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(2470), + parameter: DeclarationId(687), + value: DeclarationId(2471), }], }, type_params: vec![], @@ -78747,13 +78784,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5124, 5156), }); declarations.push(Declaration { - id: DeclarationId(2472), + id: DeclarationId(2473), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(975), + template: DeclarationId(976), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -78767,13 +78804,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5230, 5256), }); declarations.push(Declaration { - id: DeclarationId(2473), + id: DeclarationId(2474), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(2472), + parameter: DeclarationId(687), + value: DeclarationId(2473), }], }, type_params: vec![], @@ -78787,13 +78824,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5225, 5257), }); declarations.push(Declaration { - id: DeclarationId(2474), + id: DeclarationId(2475), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(973), + parameter: DeclarationId(687), + value: DeclarationId(974), }], }, type_params: vec![], @@ -78807,13 +78844,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5382, 5398), }); declarations.push(Declaration { - id: DeclarationId(2475), + id: DeclarationId(2476), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(978), + template: DeclarationId(979), arguments: vec![TemplateArgument { - parameter: DeclarationId(979), - value: DeclarationId(1228), + parameter: DeclarationId(980), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -78827,13 +78864,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5523, 5557), }); declarations.push(Declaration { - id: DeclarationId(2476), + id: DeclarationId(2477), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(978), + template: DeclarationId(979), arguments: vec![TemplateArgument { - parameter: DeclarationId(979), - value: DeclarationId(1228), + parameter: DeclarationId(980), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -78847,13 +78884,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5769, 5803), }); declarations.push(Declaration { - id: DeclarationId(2477), + id: DeclarationId(2478), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(978), + template: DeclarationId(979), arguments: vec![TemplateArgument { - parameter: DeclarationId(979), - value: DeclarationId(1228), + parameter: DeclarationId(980), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -78867,13 +78904,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6288, 6322), }); declarations.push(Declaration { - id: DeclarationId(2478), + id: DeclarationId(2479), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(978), + template: DeclarationId(979), arguments: vec![TemplateArgument { - parameter: DeclarationId(979), - value: DeclarationId(1228), + parameter: DeclarationId(980), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -78887,13 +78924,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6549, 6583), }); declarations.push(Declaration { - id: DeclarationId(2479), + id: DeclarationId(2480), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(978), + template: DeclarationId(979), arguments: vec![TemplateArgument { - parameter: DeclarationId(979), - value: DeclarationId(1228), + parameter: DeclarationId(980), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -78907,13 +78944,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6839, 6873), }); declarations.push(Declaration { - id: DeclarationId(2480), + id: DeclarationId(2481), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(975), + template: DeclarationId(976), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -78927,13 +78964,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7053, 7079), }); declarations.push(Declaration { - id: DeclarationId(2481), + id: DeclarationId(2482), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(978), + template: DeclarationId(979), arguments: vec![TemplateArgument { - parameter: DeclarationId(979), - value: DeclarationId(1228), + parameter: DeclarationId(980), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -78947,13 +78984,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7084, 7118), }); declarations.push(Declaration { - id: DeclarationId(2482), + id: DeclarationId(2483), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(978), + template: DeclarationId(979), arguments: vec![TemplateArgument { - parameter: DeclarationId(979), - value: DeclarationId(1228), + parameter: DeclarationId(980), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -78967,13 +79004,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8353, 8387), }); declarations.push(Declaration { - id: DeclarationId(2483), + id: DeclarationId(2484), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2259), + template: DeclarationId(2260), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -78987,13 +79024,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), }); declarations.push(Declaration { - id: DeclarationId(2484), + id: DeclarationId(2485), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2259), + template: DeclarationId(2260), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -79007,13 +79044,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), }); declarations.push(Declaration { - id: DeclarationId(2485), + id: DeclarationId(2486), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2259), + template: DeclarationId(2260), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -79027,13 +79064,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), }); declarations.push(Declaration { - id: DeclarationId(2486), + id: DeclarationId(2487), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2259), + template: DeclarationId(2260), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -79047,13 +79084,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), }); declarations.push(Declaration { - id: DeclarationId(2487), + id: DeclarationId(2488), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2259), + template: DeclarationId(2260), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -79067,13 +79104,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), }); declarations.push(Declaration { - id: DeclarationId(2488), + id: DeclarationId(2489), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2259), + template: DeclarationId(2260), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -79087,13 +79124,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), }); declarations.push(Declaration { - id: DeclarationId(2489), + id: DeclarationId(2490), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2259), + template: DeclarationId(2260), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -79107,13 +79144,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), }); declarations.push(Declaration { - id: DeclarationId(2490), + id: DeclarationId(2491), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2259), + template: DeclarationId(2260), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -79127,13 +79164,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), }); declarations.push(Declaration { - id: DeclarationId(2491), + id: DeclarationId(2492), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2259), + template: DeclarationId(2260), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -79147,13 +79184,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), }); declarations.push(Declaration { - id: DeclarationId(2492), + id: DeclarationId(2493), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2259), + template: DeclarationId(2260), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -79167,13 +79204,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), }); declarations.push(Declaration { - id: DeclarationId(2493), + id: DeclarationId(2494), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1782), + template: DeclarationId(1783), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(798), + parameter: DeclarationId(687), + value: DeclarationId(799), }], }, type_params: vec![], @@ -79187,13 +79224,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4804, 4821), }); declarations.push(Declaration { - id: DeclarationId(2494), + id: DeclarationId(2495), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1782), + template: DeclarationId(1783), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(826), + parameter: DeclarationId(687), + value: DeclarationId(827), }], }, type_params: vec![], @@ -79207,13 +79244,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4872, 4886), }); declarations.push(Declaration { - id: DeclarationId(2495), + id: DeclarationId(2496), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1782), + template: DeclarationId(1783), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(780), + parameter: DeclarationId(687), + value: DeclarationId(781), }], }, type_params: vec![], @@ -79227,13 +79264,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4936, 4949), }); declarations.push(Declaration { - id: DeclarationId(2496), + id: DeclarationId(2497), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1782), + template: DeclarationId(1783), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(816), + parameter: DeclarationId(687), + value: DeclarationId(817), }], }, type_params: vec![], @@ -79247,13 +79284,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4999, 5012), }); declarations.push(Declaration { - id: DeclarationId(2497), + id: DeclarationId(2498), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1782), + template: DeclarationId(1783), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(973), + parameter: DeclarationId(687), + value: DeclarationId(974), }], }, type_params: vec![], @@ -79267,13 +79304,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5060, 5076), }); declarations.push(Declaration { - id: DeclarationId(2498), + id: DeclarationId(2499), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1782), + template: DeclarationId(1783), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(2470), + parameter: DeclarationId(687), + value: DeclarationId(2471), }], }, type_params: vec![], @@ -79287,13 +79324,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5124, 5156), }); declarations.push(Declaration { - id: DeclarationId(2499), + id: DeclarationId(2500), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1784), + template: DeclarationId(1785), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(2472), + parameter: DeclarationId(687), + value: DeclarationId(2473), }], }, type_params: vec![], @@ -79307,13 +79344,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5225, 5257), }); declarations.push(Declaration { - id: DeclarationId(2500), + id: DeclarationId(2501), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2259), + template: DeclarationId(2260), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -79327,13 +79364,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5230, 5256), }); declarations.push(Declaration { - id: DeclarationId(2501), + id: DeclarationId(2502), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1784), + template: DeclarationId(1785), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(973), + parameter: DeclarationId(687), + value: DeclarationId(974), }], }, type_params: vec![], @@ -79347,13 +79384,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5382, 5398), }); declarations.push(Declaration { - id: DeclarationId(2502), + id: DeclarationId(2503), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2265), + template: DeclarationId(2266), arguments: vec![TemplateArgument { - parameter: DeclarationId(979), - value: DeclarationId(1228), + parameter: DeclarationId(980), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -79367,13 +79404,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5523, 5557), }); declarations.push(Declaration { - id: DeclarationId(2503), + id: DeclarationId(2504), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2269), + template: DeclarationId(2270), arguments: vec![TemplateArgument { - parameter: DeclarationId(979), - value: DeclarationId(1228), + parameter: DeclarationId(980), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -79387,11 +79424,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5769, 5803), }); declarations.push(Declaration { - id: DeclarationId(2504), + id: DeclarationId(2505), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1203), + DeclarationId(1204), CardinalityBound::AtMostOne, ), ), @@ -79406,11 +79443,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), }); declarations.push(Declaration { - id: DeclarationId(2505), + id: DeclarationId(2506), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1203), + DeclarationId(1204), CardinalityBound::AtMostOne, ), ), @@ -79425,11 +79462,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), }); declarations.push(Declaration { - id: DeclarationId(2506), + id: DeclarationId(2507), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1203), + DeclarationId(1204), CardinalityBound::AtMostOne, ), ), @@ -79444,7 +79481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), }); declarations.push(Declaration { - id: DeclarationId(2507), + id: DeclarationId(2508), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -79455,7 +79492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(139), - value: DeclarationId(1203), + value: DeclarationId(1204), }, ], }, @@ -79470,7 +79507,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2732, 2760), }); declarations.push(Declaration { - id: DeclarationId(2508), + id: DeclarationId(2509), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -79481,7 +79518,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(139), - value: DeclarationId(1203), + value: DeclarationId(1204), }, ], }, @@ -79496,11 +79533,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2804, 2832), }); declarations.push(Declaration { - id: DeclarationId(2509), + id: DeclarationId(2510), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1211), + DeclarationId(1212), CardinalityBound::AtMostOne, ), ), @@ -79515,11 +79552,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), }); declarations.push(Declaration { - id: DeclarationId(2510), + id: DeclarationId(2511), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1213), + DeclarationId(1214), CardinalityBound::AtMostOne, ), ), @@ -79534,18 +79571,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), }); declarations.push(Declaration { - id: DeclarationId(2511), + id: DeclarationId(2512), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(11), arguments: vec![ TemplateArgument { parameter: DeclarationId(12), - value: DeclarationId(1224), + value: DeclarationId(1225), }, TemplateArgument { parameter: DeclarationId(13), - value: DeclarationId(1223), + value: DeclarationId(1224), }, ], }, @@ -79560,7 +79597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 12353, 12399), }); declarations.push(Declaration { - id: DeclarationId(2512), + id: DeclarationId(2513), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79574,7 +79611,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 767, 773), }); declarations.push(Declaration { - id: DeclarationId(2513), + id: DeclarationId(2514), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79588,7 +79625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 778, 791), }); declarations.push(Declaration { - id: DeclarationId(2514), + id: DeclarationId(2515), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79602,7 +79639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 796, 810), }); declarations.push(Declaration { - id: DeclarationId(2515), + id: DeclarationId(2516), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79621,7 +79658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3332, 3358), }); declarations.push(Declaration { - id: DeclarationId(2516), + id: DeclarationId(2517), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79640,7 +79677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3363, 3391), }); declarations.push(Declaration { - id: DeclarationId(2517), + id: DeclarationId(2518), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79659,7 +79696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3396, 3429), }); declarations.push(Declaration { - id: DeclarationId(2518), + id: DeclarationId(2519), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79678,7 +79715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3434, 3465), }); declarations.push(Declaration { - id: DeclarationId(2519), + id: DeclarationId(2520), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79697,7 +79734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3470, 3502), }); declarations.push(Declaration { - id: DeclarationId(2520), + id: DeclarationId(2521), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79711,12 +79748,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4509, 4516), }); declarations.push(Declaration { - id: DeclarationId(2521), + id: DeclarationId(2522), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "previous".to_string(), - ty: DeclarationId(1211), + ty: DeclarationId(1212), }], }, type_params: vec![], @@ -79730,7 +79767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4521, 4571), }); declarations.push(Declaration { - id: DeclarationId(2522), + id: DeclarationId(2523), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79744,12 +79781,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5484, 5495), }); declarations.push(Declaration { - id: DeclarationId(2523), + id: DeclarationId(2524), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "inner".to_string(), - ty: DeclarationId(1213), + ty: DeclarationId(1214), }], }, type_params: vec![], @@ -79763,7 +79800,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5500, 5545), }); declarations.push(Declaration { - id: DeclarationId(2524), + id: DeclarationId(2525), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79782,12 +79819,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7649, 7683), }); declarations.push(Declaration { - id: DeclarationId(2525), + id: DeclarationId(2526), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "amount".to_string(), - ty: DeclarationId(1211), + ty: DeclarationId(1212), }], }, type_params: vec![], @@ -79801,12 +79838,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7688, 7732), }); declarations.push(Declaration { - id: DeclarationId(2526), + id: DeclarationId(2527), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "steps".to_string(), - ty: DeclarationId(1211), + ty: DeclarationId(1212), }], }, type_params: vec![], @@ -79820,12 +79857,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7737, 7795), }); declarations.push(Declaration { - id: DeclarationId(2527), + id: DeclarationId(2528), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "divisor".to_string(), - ty: DeclarationId(1213), + ty: DeclarationId(1214), }], }, type_params: vec![], @@ -79839,7 +79876,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7800, 7856), }); declarations.push(Declaration { - id: DeclarationId(2528), + id: DeclarationId(2529), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79858,7 +79895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7861, 7894), }); declarations.push(Declaration { - id: DeclarationId(2529), + id: DeclarationId(2530), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79877,7 +79914,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7899, 7929), }); declarations.push(Declaration { - id: DeclarationId(2530), + id: DeclarationId(2531), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79891,13 +79928,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7934, 7947), }); declarations.push(Declaration { - id: DeclarationId(2531), + id: DeclarationId(2532), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1210), + parameter: DeclarationId(687), + value: DeclarationId(1211), }], }, type_params: vec![], @@ -79911,13 +79948,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7987, 8009), }); declarations.push(Declaration { - id: DeclarationId(2532), + id: DeclarationId(2533), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1203), + parameter: DeclarationId(687), + value: DeclarationId(1204), }], }, type_params: vec![], @@ -79931,7 +79968,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 8219, 8240), }); declarations.push(Declaration { - id: DeclarationId(2533), + id: DeclarationId(2534), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79945,7 +79982,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 8740, 8746), }); declarations.push(Declaration { - id: DeclarationId(2534), + id: DeclarationId(2535), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79959,7 +79996,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 9139, 9152), }); declarations.push(Declaration { - id: DeclarationId(2535), + id: DeclarationId(2536), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79973,12 +80010,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 9157, 9171), }); declarations.push(Declaration { - id: DeclarationId(2536), + id: DeclarationId(2537), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1222), + ty: DeclarationId(1223), }], }, type_params: vec![], @@ -79992,7 +80029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 10263, 10297), }); declarations.push(Declaration { - id: DeclarationId(2537), + id: DeclarationId(2538), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80006,7 +80043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 10302, 10320), }); declarations.push(Declaration { - id: DeclarationId(2538), + id: DeclarationId(2539), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -80017,7 +80054,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(139), - value: DeclarationId(1221), + value: DeclarationId(1222), }, ], }, @@ -80032,13 +80069,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 11234, 11261), }); declarations.push(Declaration { - id: DeclarationId(2539), + id: DeclarationId(2540), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(969), + parameter: DeclarationId(687), + value: DeclarationId(970), }], }, type_params: vec![], @@ -80052,13 +80089,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 7946, 7962), }); declarations.push(Declaration { - id: DeclarationId(2540), + id: DeclarationId(2541), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(975), + template: DeclarationId(976), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -80072,12 +80109,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), }); declarations.push(Declaration { - id: DeclarationId(2541), + id: DeclarationId(2542), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "duration".to_string(), - ty: DeclarationId(1227), + ty: DeclarationId(1228), }], }, type_params: vec![], @@ -80091,7 +80128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 4004, 4038), }); declarations.push(Declaration { - id: DeclarationId(2542), + id: DeclarationId(2543), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80105,7 +80142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 4043, 4053), }); declarations.push(Declaration { - id: DeclarationId(2543), + id: DeclarationId(2544), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80119,7 +80156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 4058, 4067), }); declarations.push(Declaration { - id: DeclarationId(2544), + id: DeclarationId(2545), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80133,13 +80170,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 4072, 4077), }); declarations.push(Declaration { - id: DeclarationId(2545), + id: DeclarationId(2546), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1231), + parameter: DeclarationId(687), + value: DeclarationId(1232), }], }, type_params: vec![], @@ -80153,13 +80190,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 5915, 5943), }); declarations.push(Declaration { - id: DeclarationId(2546), + id: DeclarationId(2547), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1782), + template: DeclarationId(1783), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(969), + parameter: DeclarationId(687), + value: DeclarationId(970), }], }, type_params: vec![], @@ -80173,13 +80210,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 7946, 7962), }); declarations.push(Declaration { - id: DeclarationId(2547), + id: DeclarationId(2548), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2259), + template: DeclarationId(2260), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -80193,13 +80230,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), }); declarations.push(Declaration { - id: DeclarationId(2548), + id: DeclarationId(2549), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2259), + template: DeclarationId(2260), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -80213,13 +80250,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), }); declarations.push(Declaration { - id: DeclarationId(2549), + id: DeclarationId(2550), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2259), + template: DeclarationId(2260), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -80233,13 +80270,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), }); declarations.push(Declaration { - id: DeclarationId(2550), + id: DeclarationId(2551), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2259), + template: DeclarationId(2260), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -80253,13 +80290,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), }); declarations.push(Declaration { - id: DeclarationId(2551), + id: DeclarationId(2552), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2259), + template: DeclarationId(2260), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -80273,13 +80310,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), }); declarations.push(Declaration { - id: DeclarationId(2552), + id: DeclarationId(2553), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2259), + template: DeclarationId(2260), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -80293,13 +80330,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), }); declarations.push(Declaration { - id: DeclarationId(2553), + id: DeclarationId(2554), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2259), + template: DeclarationId(2260), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -80313,13 +80350,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), }); declarations.push(Declaration { - id: DeclarationId(2554), + id: DeclarationId(2555), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2259), + template: DeclarationId(2260), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -80333,13 +80370,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), }); declarations.push(Declaration { - id: DeclarationId(2555), + id: DeclarationId(2556), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2259), + template: DeclarationId(2260), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -80353,13 +80390,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), }); declarations.push(Declaration { - id: DeclarationId(2556), + id: DeclarationId(2557), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2259), + template: DeclarationId(2260), arguments: vec![TemplateArgument { - parameter: DeclarationId(976), - value: DeclarationId(1228), + parameter: DeclarationId(977), + value: DeclarationId(1229), }], }, type_params: vec![], @@ -80373,7 +80410,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), }); declarations.push(Declaration { - id: DeclarationId(2557), + id: DeclarationId(2558), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80387,7 +80424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651), }); declarations.push(Declaration { - id: DeclarationId(2558), + id: DeclarationId(2559), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80401,7 +80438,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660), }); declarations.push(Declaration { - id: DeclarationId(2559), + id: DeclarationId(2560), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80415,7 +80452,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671), }); declarations.push(Declaration { - id: DeclarationId(2560), + id: DeclarationId(2561), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80429,7 +80466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682), }); declarations.push(Declaration { - id: DeclarationId(2561), + id: DeclarationId(2562), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80443,7 +80480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691), }); declarations.push(Declaration { - id: DeclarationId(2562), + id: DeclarationId(2563), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80457,7 +80494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702), }); declarations.push(Declaration { - id: DeclarationId(2563), + id: DeclarationId(2564), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80471,7 +80508,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715), }); declarations.push(Declaration { - id: DeclarationId(2564), + id: DeclarationId(2565), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80485,7 +80522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728), }); declarations.push(Declaration { - id: DeclarationId(2565), + id: DeclarationId(2566), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80499,7 +80536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740), }); declarations.push(Declaration { - id: DeclarationId(2566), + id: DeclarationId(2567), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80513,7 +80550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751), }); declarations.push(Declaration { - id: DeclarationId(2567), + id: DeclarationId(2568), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80527,7 +80564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763), }); declarations.push(Declaration { - id: DeclarationId(2568), + id: DeclarationId(2569), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80541,7 +80578,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 768, 774), }); declarations.push(Declaration { - id: DeclarationId(2569), + id: DeclarationId(2570), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80555,7 +80592,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 779, 786), }); declarations.push(Declaration { - id: DeclarationId(2570), + id: DeclarationId(2571), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -80574,7 +80611,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 791, 804), }); declarations.push(Declaration { - id: DeclarationId(2571), + id: DeclarationId(2572), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -80593,7 +80630,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 889, 903), }); declarations.push(Declaration { - id: DeclarationId(2572), + id: DeclarationId(2573), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -80612,7 +80649,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 925), }); declarations.push(Declaration { - id: DeclarationId(2573), + id: DeclarationId(2574), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80626,7 +80663,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 930, 932), }); declarations.push(Declaration { - id: DeclarationId(2574), + id: DeclarationId(2575), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80640,7 +80677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 937, 941), }); declarations.push(Declaration { - id: DeclarationId(2575), + id: DeclarationId(2576), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80654,7 +80691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 946, 951), }); declarations.push(Declaration { - id: DeclarationId(2576), + id: DeclarationId(2577), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80668,7 +80705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 956, 958), }); declarations.push(Declaration { - id: DeclarationId(2577), + id: DeclarationId(2578), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80682,7 +80719,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 963, 965), }); declarations.push(Declaration { - id: DeclarationId(2578), + id: DeclarationId(2579), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80696,7 +80733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 970, 972), }); declarations.push(Declaration { - id: DeclarationId(2579), + id: DeclarationId(2580), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80710,7 +80747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 979), }); declarations.push(Declaration { - id: DeclarationId(2580), + id: DeclarationId(2581), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80724,7 +80761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 984, 988), }); declarations.push(Declaration { - id: DeclarationId(2581), + id: DeclarationId(2582), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80738,7 +80775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 993, 998), }); declarations.push(Declaration { - id: DeclarationId(2582), + id: DeclarationId(2583), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80752,7 +80789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1003, 1007), }); declarations.push(Declaration { - id: DeclarationId(2583), + id: DeclarationId(2584), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80766,7 +80803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1012, 1017), }); declarations.push(Declaration { - id: DeclarationId(2584), + id: DeclarationId(2585), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80780,7 +80817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1022, 1028), }); declarations.push(Declaration { - id: DeclarationId(2585), + id: DeclarationId(2586), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80794,7 +80831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1033, 1041), }); declarations.push(Declaration { - id: DeclarationId(2586), + id: DeclarationId(2587), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80808,7 +80845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1046, 1051), }); declarations.push(Declaration { - id: DeclarationId(2587), + id: DeclarationId(2588), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80822,7 +80859,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1056, 1061), }); declarations.push(Declaration { - id: DeclarationId(2588), + id: DeclarationId(2589), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80836,7 +80873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1066, 1074), }); declarations.push(Declaration { - id: DeclarationId(2589), + id: DeclarationId(2590), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80850,7 +80887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1079, 1088), }); declarations.push(Declaration { - id: DeclarationId(2590), + id: DeclarationId(2591), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80864,7 +80901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1093, 1096), }); declarations.push(Declaration { - id: DeclarationId(2591), + id: DeclarationId(2592), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80878,7 +80915,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1101, 1107), }); declarations.push(Declaration { - id: DeclarationId(2592), + id: DeclarationId(2593), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80892,7 +80929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1118), }); declarations.push(Declaration { - id: DeclarationId(2593), + id: DeclarationId(2594), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80906,7 +80943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1123, 1129), }); declarations.push(Declaration { - id: DeclarationId(2594), + id: DeclarationId(2595), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80920,7 +80957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1134, 1140), }); declarations.push(Declaration { - id: DeclarationId(2595), + id: DeclarationId(2596), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80934,7 +80971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1145, 1153), }); declarations.push(Declaration { - id: DeclarationId(2596), + id: DeclarationId(2597), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80948,7 +80985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1158, 1166), }); declarations.push(Declaration { - id: DeclarationId(2597), + id: DeclarationId(2598), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80962,7 +80999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1171, 1176), }); declarations.push(Declaration { - id: DeclarationId(2598), + id: DeclarationId(2599), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80976,7 +81013,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1181, 1190), }); declarations.push(Declaration { - id: DeclarationId(2599), + id: DeclarationId(2600), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80990,7 +81027,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1195, 1199), }); declarations.push(Declaration { - id: DeclarationId(2600), + id: DeclarationId(2601), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81004,7 +81041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1204, 1212), }); declarations.push(Declaration { - id: DeclarationId(2601), + id: DeclarationId(2602), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81018,7 +81055,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1217, 1220), }); declarations.push(Declaration { - id: DeclarationId(2602), + id: DeclarationId(2603), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81032,7 +81069,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1791, 1796), }); declarations.push(Declaration { - id: DeclarationId(2603), + id: DeclarationId(2604), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81046,7 +81083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1801, 1805), }); declarations.push(Declaration { - id: DeclarationId(2604), + id: DeclarationId(2605), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81060,7 +81097,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1816), }); declarations.push(Declaration { - id: DeclarationId(2605), + id: DeclarationId(2606), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81074,7 +81111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1821, 1827), }); declarations.push(Declaration { - id: DeclarationId(2606), + id: DeclarationId(2607), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81088,7 +81125,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1832, 1836), }); declarations.push(Declaration { - id: DeclarationId(2607), + id: DeclarationId(2608), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81102,7 +81139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1841, 1847), }); declarations.push(Declaration { - id: DeclarationId(2608), + id: DeclarationId(2609), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81116,7 +81153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1852, 1860), }); declarations.push(Declaration { - id: DeclarationId(2609), + id: DeclarationId(2610), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81130,7 +81167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1865, 1873), }); declarations.push(Declaration { - id: DeclarationId(2610), + id: DeclarationId(2611), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81144,7 +81181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1878, 1885), }); declarations.push(Declaration { - id: DeclarationId(2611), + id: DeclarationId(2612), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81158,7 +81195,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1890, 1896), }); declarations.push(Declaration { - id: DeclarationId(2612), + id: DeclarationId(2613), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81172,7 +81209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1901, 1908), }); declarations.push(Declaration { - id: DeclarationId(2613), + id: DeclarationId(2614), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81186,7 +81223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1913, 1919), }); declarations.push(Declaration { - id: DeclarationId(2614), + id: DeclarationId(2615), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81200,7 +81237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1924, 1931), }); declarations.push(Declaration { - id: DeclarationId(2615), + id: DeclarationId(2616), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81214,7 +81251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2371, 2373), }); declarations.push(Declaration { - id: DeclarationId(2616), + id: DeclarationId(2617), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81228,7 +81265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2378, 2382), }); declarations.push(Declaration { - id: DeclarationId(2617), + id: DeclarationId(2618), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81242,7 +81279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2387, 2392), }); declarations.push(Declaration { - id: DeclarationId(2618), + id: DeclarationId(2619), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81256,7 +81293,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2397, 2399), }); declarations.push(Declaration { - id: DeclarationId(2619), + id: DeclarationId(2620), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81270,7 +81307,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2404, 2406), }); declarations.push(Declaration { - id: DeclarationId(2620), + id: DeclarationId(2621), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81284,7 +81321,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2411, 2413), }); declarations.push(Declaration { - id: DeclarationId(2621), + id: DeclarationId(2622), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81298,7 +81335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2418, 2420), }); declarations.push(Declaration { - id: DeclarationId(2622), + id: DeclarationId(2623), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81312,7 +81349,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2425, 2429), }); declarations.push(Declaration { - id: DeclarationId(2623), + id: DeclarationId(2624), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81326,7 +81363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2434, 2439), }); declarations.push(Declaration { - id: DeclarationId(2624), + id: DeclarationId(2625), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81340,7 +81377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2444, 2448), }); declarations.push(Declaration { - id: DeclarationId(2625), + id: DeclarationId(2626), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81354,7 +81391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2453, 2458), }); declarations.push(Declaration { - id: DeclarationId(2626), + id: DeclarationId(2627), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81368,7 +81405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2463, 2469), }); declarations.push(Declaration { - id: DeclarationId(2627), + id: DeclarationId(2628), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81382,7 +81419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2474, 2482), }); declarations.push(Declaration { - id: DeclarationId(2628), + id: DeclarationId(2629), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81396,7 +81433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2492), }); declarations.push(Declaration { - id: DeclarationId(2629), + id: DeclarationId(2630), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81410,7 +81447,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2497, 2502), }); declarations.push(Declaration { - id: DeclarationId(2630), + id: DeclarationId(2631), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81424,7 +81461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2507, 2515), }); declarations.push(Declaration { - id: DeclarationId(2631), + id: DeclarationId(2632), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81438,7 +81475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2529), }); declarations.push(Declaration { - id: DeclarationId(2632), + id: DeclarationId(2633), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81452,7 +81489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2534, 2537), }); declarations.push(Declaration { - id: DeclarationId(2633), + id: DeclarationId(2634), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81466,7 +81503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2542, 2548), }); declarations.push(Declaration { - id: DeclarationId(2634), + id: DeclarationId(2635), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81480,7 +81517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2553, 2559), }); declarations.push(Declaration { - id: DeclarationId(2635), + id: DeclarationId(2636), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81494,7 +81531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2564, 2570), }); declarations.push(Declaration { - id: DeclarationId(2636), + id: DeclarationId(2637), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81508,7 +81545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2575, 2581), }); declarations.push(Declaration { - id: DeclarationId(2637), + id: DeclarationId(2638), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81522,7 +81559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2586, 2594), }); declarations.push(Declaration { - id: DeclarationId(2638), + id: DeclarationId(2639), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81536,7 +81573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2599, 2607), }); declarations.push(Declaration { - id: DeclarationId(2639), + id: DeclarationId(2640), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81550,7 +81587,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2612, 2617), }); declarations.push(Declaration { - id: DeclarationId(2640), + id: DeclarationId(2641), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81564,7 +81601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2622, 2631), }); declarations.push(Declaration { - id: DeclarationId(2641), + id: DeclarationId(2642), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81578,7 +81615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2636, 2640), }); declarations.push(Declaration { - id: DeclarationId(2642), + id: DeclarationId(2643), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81592,13 +81629,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2645, 2653), }); declarations.push(Declaration { - id: DeclarationId(2643), + id: DeclarationId(2644), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1164), + parameter: DeclarationId(687), + value: DeclarationId(1165), }], }, type_params: vec![], @@ -81612,13 +81649,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 19158, 19181), }); declarations.push(Declaration { - id: DeclarationId(2644), + id: DeclarationId(2645), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1273), + parameter: DeclarationId(687), + value: DeclarationId(1274), }], }, type_params: vec![], @@ -81632,13 +81669,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 19383, 19398), }); declarations.push(Declaration { - id: DeclarationId(2645), + id: DeclarationId(2646), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1278), + parameter: DeclarationId(687), + value: DeclarationId(1279), }], }, type_params: vec![], @@ -81652,7 +81689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 19403, 19423), }); declarations.push(Declaration { - id: DeclarationId(2646), + id: DeclarationId(2647), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81666,7 +81703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2480, 2494), }); declarations.push(Declaration { - id: DeclarationId(2647), + id: DeclarationId(2648), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81680,7 +81717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2499, 2509), }); declarations.push(Declaration { - id: DeclarationId(2648), + id: DeclarationId(2649), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81694,7 +81731,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2514, 2526), }); declarations.push(Declaration { - id: DeclarationId(2649), + id: DeclarationId(2650), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81708,7 +81745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2531, 2544), }); declarations.push(Declaration { - id: DeclarationId(2650), + id: DeclarationId(2651), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81722,7 +81759,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2549, 2561), }); declarations.push(Declaration { - id: DeclarationId(2651), + id: DeclarationId(2652), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81736,7 +81773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2566, 2578), }); declarations.push(Declaration { - id: DeclarationId(2652), + id: DeclarationId(2653), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81750,7 +81787,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2583, 2605), }); declarations.push(Declaration { - id: DeclarationId(2653), + id: DeclarationId(2654), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81764,7 +81801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2610, 2629), }); declarations.push(Declaration { - id: DeclarationId(2654), + id: DeclarationId(2655), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81778,7 +81815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2634, 2659), }); declarations.push(Declaration { - id: DeclarationId(2655), + id: DeclarationId(2656), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81792,7 +81829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2664, 2687), }); declarations.push(Declaration { - id: DeclarationId(2656), + id: DeclarationId(2657), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81806,7 +81843,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3093, 3102), }); declarations.push(Declaration { - id: DeclarationId(2657), + id: DeclarationId(2658), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -81825,7 +81862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3107, 3123), }); declarations.push(Declaration { - id: DeclarationId(2658), + id: DeclarationId(2659), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81839,7 +81876,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3782, 3790), }); declarations.push(Declaration { - id: DeclarationId(2659), + id: DeclarationId(2660), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81853,7 +81890,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3795, 3805), }); declarations.push(Declaration { - id: DeclarationId(2660), + id: DeclarationId(2661), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81867,7 +81904,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4030, 4042), }); declarations.push(Declaration { - id: DeclarationId(2661), + id: DeclarationId(2662), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81881,7 +81918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4857, 4870), }); declarations.push(Declaration { - id: DeclarationId(2662), + id: DeclarationId(2663), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81895,7 +81932,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4875, 4888), }); declarations.push(Declaration { - id: DeclarationId(2663), + id: DeclarationId(2664), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81909,7 +81946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4893, 4901), }); declarations.push(Declaration { - id: DeclarationId(2664), + id: DeclarationId(2665), name: None, connective: TypeConnective::Conj { children: vec![ @@ -81934,7 +81971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5446, 5513), }); declarations.push(Declaration { - id: DeclarationId(2665), + id: DeclarationId(2666), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81948,12 +81985,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5538, 5546), }); declarations.push(Declaration { - id: DeclarationId(2666), + id: DeclarationId(2667), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1264), + ty: DeclarationId(1265), }], }, type_params: vec![], @@ -81967,7 +82004,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5551, 5591), }); declarations.push(Declaration { - id: DeclarationId(2667), + id: DeclarationId(2668), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -81986,7 +82023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5596, 5629), }); declarations.push(Declaration { - id: DeclarationId(2668), + id: DeclarationId(2669), name: None, connective: TypeConnective::Conj { children: vec![ @@ -81996,7 +82033,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "state".to_string(), - ty: DeclarationId(1265), + ty: DeclarationId(1266), }, ], }, @@ -82011,7 +82048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5634, 5712), }); declarations.push(Declaration { - id: DeclarationId(2669), + id: DeclarationId(2670), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82030,7 +82067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5878, 5941), }); declarations.push(Declaration { - id: DeclarationId(2670), + id: DeclarationId(2671), name: None, connective: TypeConnective::Conj { children: vec![ @@ -82040,7 +82077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "comparator".to_string(), - ty: DeclarationId(802), + ty: DeclarationId(803), }, Field { label: "bound".to_string(), @@ -82059,21 +82096,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5946, 6037), }); declarations.push(Declaration { - id: DeclarationId(2671), + id: DeclarationId(2672), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "input_sample".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "expected_output".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, ], }, @@ -82088,17 +82125,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 6042, 6174), }); declarations.push(Declaration { - id: DeclarationId(2672), + id: DeclarationId(2673), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "invariant".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, ], }, @@ -82113,12 +82150,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 6389, 6478), }); declarations.push(Declaration { - id: DeclarationId(2673), + id: DeclarationId(2674), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -82133,7 +82170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 7278, 7290), }); declarations.push(Declaration { - id: DeclarationId(2674), + id: DeclarationId(2675), name: None, connective: TypeConnective::Conj { children: vec![ @@ -82143,7 +82180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), - ty: DeclarationId(2673), + ty: DeclarationId(2674), }, Field { label: "expect_exit_code".to_string(), @@ -82162,12 +82199,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 7227, 7324), }); declarations.push(Declaration { - id: DeclarationId(2675), + id: DeclarationId(2676), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -82182,7 +82219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 8024, 8036), }); declarations.push(Declaration { - id: DeclarationId(2676), + id: DeclarationId(2677), name: None, connective: TypeConnective::Conj { children: vec![ @@ -82192,7 +82229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), - ty: DeclarationId(2675), + ty: DeclarationId(2676), }, Field { label: "expect_exit_code".to_string(), @@ -82211,21 +82248,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 7974, 8070), }); declarations.push(Declaration { - id: DeclarationId(2677), + id: DeclarationId(2678), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "lens_ref".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "input_ref".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "expected_ref".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, ], }, @@ -82240,21 +82277,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 8368, 8490), }); declarations.push(Declaration { - id: DeclarationId(2678), + id: DeclarationId(2679), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject_ref".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "oracle_ref".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "input_ref".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, ], }, @@ -82269,12 +82306,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 8752, 8877), }); declarations.push(Declaration { - id: DeclarationId(2679), + id: DeclarationId(2680), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "expected".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }], }, type_params: vec![], @@ -82288,21 +82325,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 10930, 10991), }); declarations.push(Declaration { - id: DeclarationId(2680), + id: DeclarationId(2681), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "comparator".to_string(), - ty: DeclarationId(1266), + ty: DeclarationId(1267), }, Field { label: "baseline_ref".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, ], }, @@ -82317,17 +82354,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 11345, 11477), }); declarations.push(Declaration { - id: DeclarationId(2681), + id: DeclarationId(2682), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "left_report_ref".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "right_report_ref".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, ], }, @@ -82342,17 +82379,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 12044, 12156), }); declarations.push(Declaration { - id: DeclarationId(2682), + id: DeclarationId(2683), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "law".to_string(), - ty: DeclarationId(1267), + ty: DeclarationId(1268), }, Field { label: "lens_ref".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, ], }, @@ -82367,17 +82404,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 12853, 12932), }); declarations.push(Declaration { - id: DeclarationId(2683), + id: DeclarationId(2684), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "list_constant".to_string(), - ty: DeclarationId(1255), + ty: DeclarationId(1256), }, Field { label: "bound".to_string(), @@ -82396,21 +82433,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13152, 13265), }); declarations.push(Declaration { - id: DeclarationId(2684), + id: DeclarationId(2685), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "list_constant".to_string(), - ty: DeclarationId(1255), + ty: DeclarationId(1256), }, Field { label: "subset_predicate".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, ], }, @@ -82425,17 +82462,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13270, 13406), }); declarations.push(Declaration { - id: DeclarationId(2685), + id: DeclarationId(2686), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "compile_target".to_string(), - ty: DeclarationId(1253), + ty: DeclarationId(1254), }, Field { label: "expected".to_string(), - ty: DeclarationId(1254), + ty: DeclarationId(1255), }, ], }, @@ -82450,17 +82487,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13411, 13493), }); declarations.push(Declaration { - id: DeclarationId(2686), + id: DeclarationId(2687), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "ratchet_kind".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, ], }, @@ -82475,13 +82512,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13498, 13584), }); declarations.push(Declaration { - id: DeclarationId(2687), + id: DeclarationId(2688), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1253), + parameter: DeclarationId(687), + value: DeclarationId(1254), }], }, type_params: vec![], @@ -82495,17 +82532,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13663, 13673), }); declarations.push(Declaration { - id: DeclarationId(2688), + id: DeclarationId(2689), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "generated_paths".to_string(), - ty: DeclarationId(2687), + ty: DeclarationId(2688), }, ], }, @@ -82520,21 +82557,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13589, 13679), }); declarations.push(Declaration { - id: DeclarationId(2689), + id: DeclarationId(2690), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "deferred_gate".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "target_lane".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "authority_doc".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, ], }, @@ -82549,21 +82586,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14621, 14755), }); declarations.push(Declaration { - id: DeclarationId(2690), + id: DeclarationId(2691), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "deferred_gate".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "target_lane".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, Field { label: "authority_doc".to_string(), - ty: DeclarationId(1289), + ty: DeclarationId(1290), }, ], }, @@ -82578,12 +82615,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 15394, 15538), }); declarations.push(Declaration { - id: DeclarationId(2691), + id: DeclarationId(2692), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "ledger".to_string(), - ty: DeclarationId(910), + ty: DeclarationId(911), }], }, type_params: vec![], @@ -82597,13 +82634,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 16383, 16437), }); declarations.push(Declaration { - id: DeclarationId(2692), + id: DeclarationId(2693), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1164), + parameter: DeclarationId(687), + value: DeclarationId(1165), }], }, type_params: vec![], @@ -82617,7 +82654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 17481, 17504), }); declarations.push(Declaration { - id: DeclarationId(2693), + id: DeclarationId(2694), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82631,7 +82668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 17707, 17713), }); declarations.push(Declaration { - id: DeclarationId(2694), + id: DeclarationId(2695), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82645,13 +82682,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 17718, 17724), }); declarations.push(Declaration { - id: DeclarationId(2695), + id: DeclarationId(2696), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1164), + parameter: DeclarationId(687), + value: DeclarationId(1165), }], }, type_params: vec![], @@ -82665,12 +82702,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 17862, 17885), }); declarations.push(Declaration { - id: DeclarationId(2696), + id: DeclarationId(2697), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1273), + ty: DeclarationId(1274), }], }, type_params: vec![], @@ -82684,12 +82721,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 18343, 18364), }); declarations.push(Declaration { - id: DeclarationId(2697), + id: DeclarationId(2698), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }], }, type_params: vec![], @@ -82703,13 +82740,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 18369, 18400), }); declarations.push(Declaration { - id: DeclarationId(2698), + id: DeclarationId(2699), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1273), + parameter: DeclarationId(687), + value: DeclarationId(1274), }], }, type_params: vec![], @@ -82723,13 +82760,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 18444, 18459), }); declarations.push(Declaration { - id: DeclarationId(2699), + id: DeclarationId(2700), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1164), + parameter: DeclarationId(687), + value: DeclarationId(1165), }], }, type_params: vec![], @@ -82743,13 +82780,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 18715, 18738), }); declarations.push(Declaration { - id: DeclarationId(2700), + id: DeclarationId(2701), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(826), + parameter: DeclarationId(687), + value: DeclarationId(827), }], }, type_params: vec![], @@ -82763,7 +82800,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006), }); declarations.push(Declaration { - id: DeclarationId(2701), + id: DeclarationId(2702), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82777,7 +82814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 532, 547), }); declarations.push(Declaration { - id: DeclarationId(2702), + id: DeclarationId(2703), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82791,7 +82828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 550, 561), }); declarations.push(Declaration { - id: DeclarationId(2703), + id: DeclarationId(2704), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82805,11 +82842,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576), }); declarations.push(Declaration { - id: DeclarationId(2704), + id: DeclarationId(2705), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(805), + DeclarationId(806), CardinalityBound::AtMostOne, ), ), @@ -82824,7 +82861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), }); declarations.push(Declaration { - id: DeclarationId(2705), + id: DeclarationId(2706), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82838,7 +82875,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6428, 6446), }); declarations.push(Declaration { - id: DeclarationId(2706), + id: DeclarationId(2707), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82852,7 +82889,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6451, 6466), }); declarations.push(Declaration { - id: DeclarationId(2707), + id: DeclarationId(2708), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82866,7 +82903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6495, 6518), }); declarations.push(Declaration { - id: DeclarationId(2708), + id: DeclarationId(2709), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82880,7 +82917,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6523, 6544), }); declarations.push(Declaration { - id: DeclarationId(2709), + id: DeclarationId(2710), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82894,7 +82931,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6549, 6564), }); declarations.push(Declaration { - id: DeclarationId(2710), + id: DeclarationId(2711), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82908,7 +82945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8177, 8187), }); declarations.push(Declaration { - id: DeclarationId(2711), + id: DeclarationId(2712), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82922,7 +82959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8192, 8203), }); declarations.push(Declaration { - id: DeclarationId(2712), + id: DeclarationId(2713), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82936,7 +82973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8208, 8221), }); declarations.push(Declaration { - id: DeclarationId(2713), + id: DeclarationId(2714), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82950,7 +82987,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8226, 8239), }); declarations.push(Declaration { - id: DeclarationId(2714), + id: DeclarationId(2715), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82964,7 +83001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8244, 8257), }); declarations.push(Declaration { - id: DeclarationId(2715), + id: DeclarationId(2716), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82978,7 +83015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8262, 8276), }); declarations.push(Declaration { - id: DeclarationId(2716), + id: DeclarationId(2717), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82992,7 +83029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8281, 8296), }); declarations.push(Declaration { - id: DeclarationId(2717), + id: DeclarationId(2718), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83006,7 +83043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9038, 9055), }); declarations.push(Declaration { - id: DeclarationId(2718), + id: DeclarationId(2719), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83020,7 +83057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9060, 9070), }); declarations.push(Declaration { - id: DeclarationId(2719), + id: DeclarationId(2720), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83034,7 +83071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9075, 9079), }); declarations.push(Declaration { - id: DeclarationId(2720), + id: DeclarationId(2721), name: None, connective: TypeConnective::Conj { children: vec![ @@ -83044,11 +83081,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "algebra".to_string(), - ty: DeclarationId(1693), + ty: DeclarationId(1694), }, Field { label: "carrier".to_string(), - ty: DeclarationId(1695), + ty: DeclarationId(1696), }, Field { label: "range_min_inclusive".to_string(), @@ -83064,7 +83101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "overflow".to_string(), - ty: DeclarationId(1696), + ty: DeclarationId(1697), }, ], }, @@ -83079,7 +83116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9857, 10429), }); declarations.push(Declaration { - id: DeclarationId(2721), + id: DeclarationId(2722), name: None, connective: TypeConnective::Conj { children: vec![ @@ -83089,11 +83126,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "algebra".to_string(), - ty: DeclarationId(1694), + ty: DeclarationId(1695), }, Field { label: "carrier".to_string(), - ty: DeclarationId(1695), + ty: DeclarationId(1696), }, Field { label: "is_copy".to_string(), @@ -83112,13 +83149,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10434, 10616), }); declarations.push(Declaration { - id: DeclarationId(2722), + id: DeclarationId(2723), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1697), + parameter: DeclarationId(687), + value: DeclarationId(1698), }], }, type_params: vec![], @@ -83132,7 +83169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10965, 10984), }); declarations.push(Declaration { - id: DeclarationId(2723), + id: DeclarationId(2724), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83146,7 +83183,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4233, 4241), }); declarations.push(Declaration { - id: DeclarationId(2724), + id: DeclarationId(2725), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -83165,12 +83202,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4246, 4277), }); declarations.push(Declaration { - id: DeclarationId(2725), + id: DeclarationId(2726), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(97), }], }, @@ -83185,12 +83222,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4299, 4319), }); declarations.push(Declaration { - id: DeclarationId(2726), + id: DeclarationId(2727), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "values".to_string(), - ty: DeclarationId(2725), + ty: DeclarationId(2726), }], }, type_params: vec![], @@ -83204,7 +83241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4282, 4321), }); declarations.push(Declaration { - id: DeclarationId(2727), + id: DeclarationId(2728), name: None, connective: TypeConnective::Conj { children: vec![ @@ -83229,7 +83266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4326, 4379), }); declarations.push(Declaration { - id: DeclarationId(2728), + id: DeclarationId(2729), name: None, connective: TypeConnective::Conj { children: vec![ @@ -83254,7 +83291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4384, 4433), }); declarations.push(Declaration { - id: DeclarationId(2729), + id: DeclarationId(2730), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83268,7 +83305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 847, 851), }); declarations.push(Declaration { - id: DeclarationId(2730), + id: DeclarationId(2731), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83282,7 +83319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 854, 857), }); declarations.push(Declaration { - id: DeclarationId(2731), + id: DeclarationId(2732), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83296,13 +83333,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 860, 872), }); declarations.push(Declaration { - id: DeclarationId(2732), + id: DeclarationId(2733), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1709), + parameter: DeclarationId(687), + value: DeclarationId(1710), }], }, type_params: vec![], @@ -83316,7 +83353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1242, 1259), }); declarations.push(Declaration { - id: DeclarationId(2733), + id: DeclarationId(2734), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -83335,7 +83372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), }); declarations.push(Declaration { - id: DeclarationId(2734), + id: DeclarationId(2735), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83349,7 +83386,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1309, 1318), }); declarations.push(Declaration { - id: DeclarationId(2735), + id: DeclarationId(2736), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83363,7 +83400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1323, 1332), }); declarations.push(Declaration { - id: DeclarationId(2736), + id: DeclarationId(2737), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83377,7 +83414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1337, 1350), }); declarations.push(Declaration { - id: DeclarationId(2737), + id: DeclarationId(2738), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83391,7 +83428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1355, 1367), }); declarations.push(Declaration { - id: DeclarationId(2738), + id: DeclarationId(2739), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83405,7 +83442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1372, 1385), }); declarations.push(Declaration { - id: DeclarationId(2739), + id: DeclarationId(2740), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -83424,7 +83461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), }); declarations.push(Declaration { - id: DeclarationId(2740), + id: DeclarationId(2741), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83438,7 +83475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1677, 1685), }); declarations.push(Declaration { - id: DeclarationId(2741), + id: DeclarationId(2742), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83452,7 +83489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1688, 1697), }); declarations.push(Declaration { - id: DeclarationId(2742), + id: DeclarationId(2743), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83466,13 +83503,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1700, 1709), }); declarations.push(Declaration { - id: DeclarationId(2743), + id: DeclarationId(2744), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1718), + parameter: DeclarationId(687), + value: DeclarationId(1719), }], }, type_params: vec![], @@ -83486,13 +83523,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 829, 850), }); declarations.push(Declaration { - id: DeclarationId(2744), + id: DeclarationId(2745), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1724), + parameter: DeclarationId(687), + value: DeclarationId(1725), }], }, type_params: vec![], @@ -83506,7 +83543,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 859, 868), }); declarations.push(Declaration { - id: DeclarationId(2745), + id: DeclarationId(2746), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -83532,11 +83569,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 876, 895), }); declarations.push(Declaration { - id: DeclarationId(2746), + id: DeclarationId(2747), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1716), + DeclarationId(1717), CardinalityBound::AtMostOne, ), ), @@ -83551,7 +83588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), }); declarations.push(Declaration { - id: DeclarationId(2747), + id: DeclarationId(2748), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83565,7 +83602,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1102, 1110), }); declarations.push(Declaration { - id: DeclarationId(2748), + id: DeclarationId(2749), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83579,7 +83616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1113, 1122), }); declarations.push(Declaration { - id: DeclarationId(2749), + id: DeclarationId(2750), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83593,12 +83630,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1125, 1133), }); declarations.push(Declaration { - id: DeclarationId(2750), + id: DeclarationId(2751), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -83613,12 +83650,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1291, 1303), }); declarations.push(Declaration { - id: DeclarationId(2751), + id: DeclarationId(2752), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -83633,17 +83670,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1312, 1324), }); declarations.push(Declaration { - id: DeclarationId(2752), + id: DeclarationId(2753), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "branches".to_string(), - ty: DeclarationId(2750), + ty: DeclarationId(2751), }, Field { label: "paths".to_string(), - ty: DeclarationId(2751), + ty: DeclarationId(2752), }, ], }, @@ -83658,12 +83695,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1274, 1326), }); declarations.push(Declaration { - id: DeclarationId(2753), + id: DeclarationId(2754), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -83678,13 +83715,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1355, 1367), }); declarations.push(Declaration { - id: DeclarationId(2754), + id: DeclarationId(2755), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1719), + parameter: DeclarationId(687), + value: DeclarationId(1720), }], }, type_params: vec![], @@ -83698,17 +83735,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1376, 1401), }); declarations.push(Declaration { - id: DeclarationId(2755), + id: DeclarationId(2756), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "branches".to_string(), - ty: DeclarationId(2753), + ty: DeclarationId(2754), }, Field { label: "types".to_string(), - ty: DeclarationId(2754), + ty: DeclarationId(2755), }, ], }, @@ -83723,12 +83760,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1331, 1403), }); declarations.push(Declaration { - id: DeclarationId(2756), + id: DeclarationId(2757), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "cron".to_string(), - ty: DeclarationId(1700), + ty: DeclarationId(1701), }], }, type_params: vec![], @@ -83742,13 +83779,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1408, 1439), }); declarations.push(Declaration { - id: DeclarationId(2757), + id: DeclarationId(2758), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1720), + parameter: DeclarationId(687), + value: DeclarationId(1721), }], }, type_params: vec![], @@ -83762,12 +83799,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1471, 1490), }); declarations.push(Declaration { - id: DeclarationId(2758), + id: DeclarationId(2759), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "inputs".to_string(), - ty: DeclarationId(2757), + ty: DeclarationId(2758), }], }, type_params: vec![], @@ -83781,13 +83818,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1444, 1492), }); declarations.push(Declaration { - id: DeclarationId(2759), + id: DeclarationId(2760), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1720), + parameter: DeclarationId(687), + value: DeclarationId(1721), }], }, type_params: vec![], @@ -83801,12 +83838,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1520, 1539), }); declarations.push(Declaration { - id: DeclarationId(2760), + id: DeclarationId(2761), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "inputs".to_string(), - ty: DeclarationId(2759), + ty: DeclarationId(2760), }], }, type_params: vec![], @@ -83820,7 +83857,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1497, 1541), }); declarations.push(Declaration { - id: DeclarationId(2761), + id: DeclarationId(2762), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83834,7 +83871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1572, 1578), }); declarations.push(Declaration { - id: DeclarationId(2762), + id: DeclarationId(2763), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83848,7 +83885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1583, 1594), }); declarations.push(Declaration { - id: DeclarationId(2763), + id: DeclarationId(2764), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83862,7 +83899,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1599, 1607), }); declarations.push(Declaration { - id: DeclarationId(2764), + id: DeclarationId(2765), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83876,7 +83913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1612, 1618), }); declarations.push(Declaration { - id: DeclarationId(2765), + id: DeclarationId(2766), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -83895,7 +83932,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), }); declarations.push(Declaration { - id: DeclarationId(2766), + id: DeclarationId(2767), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -83914,7 +83951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), }); declarations.push(Declaration { - id: DeclarationId(2767), + id: DeclarationId(2768), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83928,7 +83965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1769, 1780), }); declarations.push(Declaration { - id: DeclarationId(2768), + id: DeclarationId(2769), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83942,7 +83979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1783, 1795), }); declarations.push(Declaration { - id: DeclarationId(2769), + id: DeclarationId(2770), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83956,7 +83993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1798, 1809), }); declarations.push(Declaration { - id: DeclarationId(2770), + id: DeclarationId(2771), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83970,7 +84007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1812, 1828), }); declarations.push(Declaration { - id: DeclarationId(2771), + id: DeclarationId(2772), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83984,7 +84021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 3804, 3813), }); declarations.push(Declaration { - id: DeclarationId(2772), + id: DeclarationId(2773), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83998,7 +84035,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 3816, 3824), }); declarations.push(Declaration { - id: DeclarationId(2773), + id: DeclarationId(2774), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84012,7 +84049,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 3827, 3840), }); declarations.push(Declaration { - id: DeclarationId(2774), + id: DeclarationId(2775), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84031,13 +84068,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), }); declarations.push(Declaration { - id: DeclarationId(2775), + id: DeclarationId(2776), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1728), + parameter: DeclarationId(687), + value: DeclarationId(1729), }], }, type_params: vec![], @@ -84051,12 +84088,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4392, 4402), }); declarations.push(Declaration { - id: DeclarationId(2776), + id: DeclarationId(2777), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -84071,7 +84108,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4412, 4424), }); declarations.push(Declaration { - id: DeclarationId(2777), + id: DeclarationId(2778), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -84097,7 +84134,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4432, 4451), }); declarations.push(Declaration { - id: DeclarationId(2778), + id: DeclarationId(2779), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84116,11 +84153,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), }); declarations.push(Declaration { - id: DeclarationId(2779), + id: DeclarationId(2780), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1744), + DeclarationId(1745), CardinalityBound::AtMostOne, ), ), @@ -84135,7 +84172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), }); declarations.push(Declaration { - id: DeclarationId(2780), + id: DeclarationId(2781), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84154,11 +84191,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), }); declarations.push(Declaration { - id: DeclarationId(2781), + id: DeclarationId(2782), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1725), + DeclarationId(1726), CardinalityBound::AtMostOne, ), ), @@ -84173,12 +84210,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), }); declarations.push(Declaration { - id: DeclarationId(2782), + id: DeclarationId(2783), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "label".to_string(), - ty: DeclarationId(1727), + ty: DeclarationId(1728), }], }, type_params: vec![], @@ -84192,12 +84229,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4792, 4827), }); declarations.push(Declaration { - id: DeclarationId(2783), + id: DeclarationId(2784), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -84212,12 +84249,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4853, 4865), }); declarations.push(Declaration { - id: DeclarationId(2784), + id: DeclarationId(2785), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "labels".to_string(), - ty: DeclarationId(2783), + ty: DeclarationId(2784), }], }, type_params: vec![], @@ -84231,7 +84268,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4832, 4867), }); declarations.push(Declaration { - id: DeclarationId(2785), + id: DeclarationId(2786), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84245,7 +84282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4890, 4902), }); declarations.push(Declaration { - id: DeclarationId(2786), + id: DeclarationId(2787), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84259,7 +84296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4907, 4917), }); declarations.push(Declaration { - id: DeclarationId(2787), + id: DeclarationId(2788), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84273,7 +84310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4922, 4932), }); declarations.push(Declaration { - id: DeclarationId(2788), + id: DeclarationId(2789), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84287,7 +84324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4937, 4948), }); declarations.push(Declaration { - id: DeclarationId(2789), + id: DeclarationId(2790), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84301,7 +84338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4953, 4960), }); declarations.push(Declaration { - id: DeclarationId(2790), + id: DeclarationId(2791), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84315,7 +84352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4965, 4978), }); declarations.push(Declaration { - id: DeclarationId(2791), + id: DeclarationId(2792), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84334,7 +84371,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), }); declarations.push(Declaration { - id: DeclarationId(2792), + id: DeclarationId(2793), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -84360,7 +84397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5222, 5241), }); declarations.push(Declaration { - id: DeclarationId(2793), + id: DeclarationId(2794), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84379,7 +84416,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), }); declarations.push(Declaration { - id: DeclarationId(2794), + id: DeclarationId(2795), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84398,7 +84435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), }); declarations.push(Declaration { - id: DeclarationId(2795), + id: DeclarationId(2796), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84417,13 +84454,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), }); declarations.push(Declaration { - id: DeclarationId(2796), + id: DeclarationId(2797), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "name".to_string(), - ty: DeclarationId(2791), + ty: DeclarationId(2792), }, Field { label: "run".to_string(), @@ -84431,19 +84468,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "shell".to_string(), - ty: DeclarationId(1729), + ty: DeclarationId(1730), }, Field { label: "env".to_string(), - ty: DeclarationId(2792), + ty: DeclarationId(2793), }, Field { label: "working_directory".to_string(), - ty: DeclarationId(2793), + ty: DeclarationId(2794), }, Field { label: "if_condition".to_string(), - ty: DeclarationId(2794), + ty: DeclarationId(2795), }, Field { label: "continue_on_error".to_string(), @@ -84451,7 +84488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "timeout_minutes".to_string(), - ty: DeclarationId(2795), + ty: DeclarationId(2796), }, ], }, @@ -84466,7 +84503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5137, 5370), }); declarations.push(Declaration { - id: DeclarationId(2797), + id: DeclarationId(2798), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84485,7 +84522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), }); declarations.push(Declaration { - id: DeclarationId(2798), + id: DeclarationId(2799), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -84511,7 +84548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5442, 5461), }); declarations.push(Declaration { - id: DeclarationId(2799), + id: DeclarationId(2800), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -84537,7 +84574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5474, 5493), }); declarations.push(Declaration { - id: DeclarationId(2800), + id: DeclarationId(2801), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84556,7 +84593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), }); declarations.push(Declaration { - id: DeclarationId(2801), + id: DeclarationId(2802), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84575,29 +84612,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), }); declarations.push(Declaration { - id: DeclarationId(2802), + id: DeclarationId(2803), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "name".to_string(), - ty: DeclarationId(2797), + ty: DeclarationId(2798), }, Field { label: "uses".to_string(), - ty: DeclarationId(1730), + ty: DeclarationId(1731), }, Field { label: "with".to_string(), - ty: DeclarationId(2798), + ty: DeclarationId(2799), }, Field { label: "env".to_string(), - ty: DeclarationId(2799), + ty: DeclarationId(2800), }, Field { label: "if_condition".to_string(), - ty: DeclarationId(2800), + ty: DeclarationId(2801), }, Field { label: "continue_on_error".to_string(), @@ -84605,7 +84642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "timeout_minutes".to_string(), - ty: DeclarationId(2801), + ty: DeclarationId(2802), }, ], }, @@ -84620,7 +84657,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5375, 5588), }); declarations.push(Declaration { - id: DeclarationId(2803), + id: DeclarationId(2804), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84634,7 +84671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5607, 5611), }); declarations.push(Declaration { - id: DeclarationId(2804), + id: DeclarationId(2805), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84648,7 +84685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5614, 5616), }); declarations.push(Declaration { - id: DeclarationId(2805), + id: DeclarationId(2806), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84662,7 +84699,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5619, 5623), }); declarations.push(Declaration { - id: DeclarationId(2806), + id: DeclarationId(2807), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84676,7 +84713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5626, 5632), }); declarations.push(Declaration { - id: DeclarationId(2807), + id: DeclarationId(2808), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84690,7 +84727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5635, 5638), }); declarations.push(Declaration { - id: DeclarationId(2808), + id: DeclarationId(2809), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84709,7 +84746,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), }); declarations.push(Declaration { - id: DeclarationId(2809), + id: DeclarationId(2810), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84728,7 +84765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), }); declarations.push(Declaration { - id: DeclarationId(2810), + id: DeclarationId(2811), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84747,7 +84784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6027, 6031), }); declarations.push(Declaration { - id: DeclarationId(2811), + id: DeclarationId(2812), name: None, connective: TypeConnective::Conj { children: vec![ @@ -84757,15 +84794,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "file".to_string(), - ty: DeclarationId(2808), + ty: DeclarationId(2809), }, Field { label: "line".to_string(), - ty: DeclarationId(2809), + ty: DeclarationId(2810), }, Field { label: "col".to_string(), - ty: DeclarationId(2810), + ty: DeclarationId(2811), }, ], }, @@ -84780,7 +84817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5960, 6033), }); declarations.push(Declaration { - id: DeclarationId(2812), + id: DeclarationId(2813), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84799,7 +84836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), }); declarations.push(Declaration { - id: DeclarationId(2813), + id: DeclarationId(2814), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84818,7 +84855,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), }); declarations.push(Declaration { - id: DeclarationId(2814), + id: DeclarationId(2815), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84837,7 +84874,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), }); declarations.push(Declaration { - id: DeclarationId(2815), + id: DeclarationId(2816), name: None, connective: TypeConnective::Conj { children: vec![ @@ -84847,15 +84884,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "file".to_string(), - ty: DeclarationId(2812), + ty: DeclarationId(2813), }, Field { label: "line".to_string(), - ty: DeclarationId(2813), + ty: DeclarationId(2814), }, Field { label: "col".to_string(), - ty: DeclarationId(2814), + ty: DeclarationId(2815), }, ], }, @@ -84870,7 +84907,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6038, 6113), }); declarations.push(Declaration { - id: DeclarationId(2816), + id: DeclarationId(2817), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84889,7 +84926,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), }); declarations.push(Declaration { - id: DeclarationId(2817), + id: DeclarationId(2818), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84908,7 +84945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6175, 6179), }); declarations.push(Declaration { - id: DeclarationId(2818), + id: DeclarationId(2819), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84927,7 +84964,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6186, 6190), }); declarations.push(Declaration { - id: DeclarationId(2819), + id: DeclarationId(2820), name: None, connective: TypeConnective::Conj { children: vec![ @@ -84937,15 +84974,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "file".to_string(), - ty: DeclarationId(2816), + ty: DeclarationId(2817), }, Field { label: "line".to_string(), - ty: DeclarationId(2817), + ty: DeclarationId(2818), }, Field { label: "col".to_string(), - ty: DeclarationId(2818), + ty: DeclarationId(2819), }, ], }, @@ -84960,7 +84997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6118, 6192), }); declarations.push(Declaration { - id: DeclarationId(2820), + id: DeclarationId(2821), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -84979,7 +85016,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6197, 6230), }); declarations.push(Declaration { - id: DeclarationId(2821), + id: DeclarationId(2822), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84993,7 +85030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6235, 6253), }); declarations.push(Declaration { - id: DeclarationId(2822), + id: DeclarationId(2823), name: None, connective: TypeConnective::Conj { children: vec![ @@ -85018,7 +85055,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6258, 6299), }); declarations.push(Declaration { - id: DeclarationId(2823), + id: DeclarationId(2824), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85037,7 +85074,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6304, 6329), }); declarations.push(Declaration { - id: DeclarationId(2824), + id: DeclarationId(2825), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85056,7 +85093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6334, 6364), }); declarations.push(Declaration { - id: DeclarationId(2825), + id: DeclarationId(2826), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -85075,7 +85112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7170, 7174), }); declarations.push(Declaration { - id: DeclarationId(2826), + id: DeclarationId(2827), name: None, connective: TypeConnective::Conj { children: vec![ @@ -85089,11 +85126,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "retention_days".to_string(), - ty: DeclarationId(2825), + ty: DeclarationId(2826), }, Field { label: "if_no_files_found".to_string(), - ty: DeclarationId(1741), + ty: DeclarationId(1742), }, ], }, @@ -85108,7 +85145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7117, 7217), }); declarations.push(Declaration { - id: DeclarationId(2827), + id: DeclarationId(2828), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -85127,7 +85164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7253, 7260), }); declarations.push(Declaration { - id: DeclarationId(2828), + id: DeclarationId(2829), name: None, connective: TypeConnective::Conj { children: vec![ @@ -85137,7 +85174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "path".to_string(), - ty: DeclarationId(2827), + ty: DeclarationId(2828), }, ], }, @@ -85152,7 +85189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7222, 7262), }); declarations.push(Declaration { - id: DeclarationId(2829), + id: DeclarationId(2830), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85166,7 +85203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7292, 7296), }); declarations.push(Declaration { - id: DeclarationId(2830), + id: DeclarationId(2831), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85180,7 +85217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7299, 7307), }); declarations.push(Declaration { - id: DeclarationId(2831), + id: DeclarationId(2832), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85194,12 +85231,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7310, 7316), }); declarations.push(Declaration { - id: DeclarationId(2832), + id: DeclarationId(2833), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), + parameter: DeclarationId(687), value: DeclarationId(230), }], }, @@ -85214,7 +85251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7778, 7790), }); declarations.push(Declaration { - id: DeclarationId(2833), + id: DeclarationId(2834), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -85225,7 +85262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(139), - value: DeclarationId(2832), + value: DeclarationId(2833), }, ], }, @@ -85240,7 +85277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7766, 7791), }); declarations.push(Declaration { - id: DeclarationId(2834), + id: DeclarationId(2835), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -85266,13 +85303,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7808, 7827), }); declarations.push(Declaration { - id: DeclarationId(2835), + id: DeclarationId(2836), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(2834), + parameter: DeclarationId(687), + value: DeclarationId(2835), }], }, type_params: vec![], @@ -85286,7 +85323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7803, 7828), }); declarations.push(Declaration { - id: DeclarationId(2836), + id: DeclarationId(2837), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -85312,13 +85349,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7845, 7864), }); declarations.push(Declaration { - id: DeclarationId(2837), + id: DeclarationId(2838), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(2836), + parameter: DeclarationId(687), + value: DeclarationId(2837), }], }, type_params: vec![], @@ -85332,7 +85369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7840, 7865), }); declarations.push(Declaration { - id: DeclarationId(2838), + id: DeclarationId(2839), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -85351,7 +85388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7900, 7904), }); declarations.push(Declaration { - id: DeclarationId(2839), + id: DeclarationId(2840), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85365,7 +85402,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8060, 8067), }); declarations.push(Declaration { - id: DeclarationId(2840), + id: DeclarationId(2841), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85379,7 +85416,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8072, 8079), }); declarations.push(Declaration { - id: DeclarationId(2841), + id: DeclarationId(2842), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85393,7 +85430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8084, 8093), }); declarations.push(Declaration { - id: DeclarationId(2842), + id: DeclarationId(2843), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85407,7 +85444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8098, 8105), }); declarations.push(Declaration { - id: DeclarationId(2843), + id: DeclarationId(2844), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85421,7 +85458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8110, 8118), }); declarations.push(Declaration { - id: DeclarationId(2844), + id: DeclarationId(2845), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85435,7 +85472,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8123, 8137), }); declarations.push(Declaration { - id: DeclarationId(2845), + id: DeclarationId(2846), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85454,7 +85491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), }); declarations.push(Declaration { - id: DeclarationId(2846), + id: DeclarationId(2847), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85468,17 +85505,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), }); declarations.push(Declaration { - id: DeclarationId(2847), + id: DeclarationId(2848), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2845), + ty: DeclarationId(2846), }, Field { label: "None".to_string(), - ty: DeclarationId(2846), + ty: DeclarationId(2847), }, ], }, @@ -85493,7 +85530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), }); declarations.push(Declaration { - id: DeclarationId(2848), + id: DeclarationId(2849), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85512,7 +85549,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), }); declarations.push(Declaration { - id: DeclarationId(2849), + id: DeclarationId(2850), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85526,17 +85563,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), }); declarations.push(Declaration { - id: DeclarationId(2850), + id: DeclarationId(2851), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2848), + ty: DeclarationId(2849), }, Field { label: "None".to_string(), - ty: DeclarationId(2849), + ty: DeclarationId(2850), }, ], }, @@ -85551,7 +85588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), }); declarations.push(Declaration { - id: DeclarationId(2851), + id: DeclarationId(2852), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85570,7 +85607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), }); declarations.push(Declaration { - id: DeclarationId(2852), + id: DeclarationId(2853), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85584,17 +85621,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), }); declarations.push(Declaration { - id: DeclarationId(2853), + id: DeclarationId(2854), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2851), + ty: DeclarationId(2852), }, Field { label: "None".to_string(), - ty: DeclarationId(2852), + ty: DeclarationId(2853), }, ], }, @@ -85609,7 +85646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), }); declarations.push(Declaration { - id: DeclarationId(2854), + id: DeclarationId(2855), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85628,7 +85665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049), }); declarations.push(Declaration { - id: DeclarationId(2855), + id: DeclarationId(2856), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85642,17 +85679,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049), }); declarations.push(Declaration { - id: DeclarationId(2856), + id: DeclarationId(2857), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2854), + ty: DeclarationId(2855), }, Field { label: "None".to_string(), - ty: DeclarationId(2855), + ty: DeclarationId(2856), }, ], }, @@ -85667,7 +85704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049), }); declarations.push(Declaration { - id: DeclarationId(2857), + id: DeclarationId(2858), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85686,7 +85723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565), }); declarations.push(Declaration { - id: DeclarationId(2858), + id: DeclarationId(2859), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85700,17 +85737,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565), }); declarations.push(Declaration { - id: DeclarationId(2859), + id: DeclarationId(2860), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2857), + ty: DeclarationId(2858), }, Field { label: "None".to_string(), - ty: DeclarationId(2858), + ty: DeclarationId(2859), }, ], }, @@ -85725,7 +85762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565), }); declarations.push(Declaration { - id: DeclarationId(2860), + id: DeclarationId(2861), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85744,7 +85781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), }); declarations.push(Declaration { - id: DeclarationId(2861), + id: DeclarationId(2862), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85758,17 +85795,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), }); declarations.push(Declaration { - id: DeclarationId(2862), + id: DeclarationId(2863), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2860), + ty: DeclarationId(2861), }, Field { label: "None".to_string(), - ty: DeclarationId(2861), + ty: DeclarationId(2862), }, ], }, @@ -85783,7 +85820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), }); declarations.push(Declaration { - id: DeclarationId(2863), + id: DeclarationId(2864), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85802,7 +85839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), }); declarations.push(Declaration { - id: DeclarationId(2864), + id: DeclarationId(2865), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85816,17 +85853,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), }); declarations.push(Declaration { - id: DeclarationId(2865), + id: DeclarationId(2866), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2863), + ty: DeclarationId(2864), }, Field { label: "None".to_string(), - ty: DeclarationId(2864), + ty: DeclarationId(2865), }, ], }, @@ -85841,7 +85878,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), }); declarations.push(Declaration { - id: DeclarationId(2866), + id: DeclarationId(2867), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85860,7 +85897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), }); declarations.push(Declaration { - id: DeclarationId(2867), + id: DeclarationId(2868), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85874,17 +85911,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), }); declarations.push(Declaration { - id: DeclarationId(2868), + id: DeclarationId(2869), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2866), + ty: DeclarationId(2867), }, Field { label: "None".to_string(), - ty: DeclarationId(2867), + ty: DeclarationId(2868), }, ], }, @@ -85899,7 +85936,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), }); declarations.push(Declaration { - id: DeclarationId(2869), + id: DeclarationId(2870), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85918,7 +85955,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), }); declarations.push(Declaration { - id: DeclarationId(2870), + id: DeclarationId(2871), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85932,17 +85969,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), }); declarations.push(Declaration { - id: DeclarationId(2871), + id: DeclarationId(2872), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2869), + ty: DeclarationId(2870), }, Field { label: "None".to_string(), - ty: DeclarationId(2870), + ty: DeclarationId(2871), }, ], }, @@ -85957,7 +85994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), }); declarations.push(Declaration { - id: DeclarationId(2872), + id: DeclarationId(2873), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85976,7 +86013,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), }); declarations.push(Declaration { - id: DeclarationId(2873), + id: DeclarationId(2874), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85990,17 +86027,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), }); declarations.push(Declaration { - id: DeclarationId(2874), + id: DeclarationId(2875), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2872), + ty: DeclarationId(2873), }, Field { label: "None".to_string(), - ty: DeclarationId(2873), + ty: DeclarationId(2874), }, ], }, @@ -86015,7 +86052,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), }); declarations.push(Declaration { - id: DeclarationId(2875), + id: DeclarationId(2876), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86034,7 +86071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 16948, 16968), }); declarations.push(Declaration { - id: DeclarationId(2876), + id: DeclarationId(2877), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86048,17 +86085,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 16948, 16968), }); declarations.push(Declaration { - id: DeclarationId(2877), + id: DeclarationId(2878), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2875), + ty: DeclarationId(2876), }, Field { label: "None".to_string(), - ty: DeclarationId(2876), + ty: DeclarationId(2877), }, ], }, @@ -86073,7 +86110,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 16948, 16968), }); declarations.push(Declaration { - id: DeclarationId(2878), + id: DeclarationId(2879), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86092,7 +86129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 17604, 17611), }); declarations.push(Declaration { - id: DeclarationId(2879), + id: DeclarationId(2880), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86106,17 +86143,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 17604, 17611), }); declarations.push(Declaration { - id: DeclarationId(2880), + id: DeclarationId(2881), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2878), + ty: DeclarationId(2879), }, Field { label: "None".to_string(), - ty: DeclarationId(2879), + ty: DeclarationId(2880), }, ], }, @@ -86131,7 +86168,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 17604, 17611), }); declarations.push(Declaration { - id: DeclarationId(2881), + id: DeclarationId(2882), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86150,7 +86187,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21364, 21374), }); declarations.push(Declaration { - id: DeclarationId(2882), + id: DeclarationId(2883), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86164,17 +86201,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21364, 21374), }); declarations.push(Declaration { - id: DeclarationId(2883), + id: DeclarationId(2884), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2881), + ty: DeclarationId(2882), }, Field { label: "None".to_string(), - ty: DeclarationId(2882), + ty: DeclarationId(2883), }, ], }, @@ -86189,7 +86226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21364, 21374), }); declarations.push(Declaration { - id: DeclarationId(2884), + id: DeclarationId(2885), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86208,7 +86245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21499, 21506), }); declarations.push(Declaration { - id: DeclarationId(2885), + id: DeclarationId(2886), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86222,17 +86259,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21499, 21506), }); declarations.push(Declaration { - id: DeclarationId(2886), + id: DeclarationId(2887), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2884), + ty: DeclarationId(2885), }, Field { label: "None".to_string(), - ty: DeclarationId(2885), + ty: DeclarationId(2886), }, ], }, @@ -86247,7 +86284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21499, 21506), }); declarations.push(Declaration { - id: DeclarationId(2887), + id: DeclarationId(2888), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86266,7 +86303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), }); declarations.push(Declaration { - id: DeclarationId(2888), + id: DeclarationId(2889), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86280,17 +86317,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), }); declarations.push(Declaration { - id: DeclarationId(2889), + id: DeclarationId(2890), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2887), + ty: DeclarationId(2888), }, Field { label: "None".to_string(), - ty: DeclarationId(2888), + ty: DeclarationId(2889), }, ], }, @@ -86305,7 +86342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), }); declarations.push(Declaration { - id: DeclarationId(2890), + id: DeclarationId(2891), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86324,7 +86361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), }); declarations.push(Declaration { - id: DeclarationId(2891), + id: DeclarationId(2892), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86338,17 +86375,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), }); declarations.push(Declaration { - id: DeclarationId(2892), + id: DeclarationId(2893), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2890), + ty: DeclarationId(2891), }, Field { label: "None".to_string(), - ty: DeclarationId(2891), + ty: DeclarationId(2892), }, ], }, @@ -86363,7 +86400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), }); declarations.push(Declaration { - id: DeclarationId(2893), + id: DeclarationId(2894), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86382,7 +86419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), }); declarations.push(Declaration { - id: DeclarationId(2894), + id: DeclarationId(2895), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86396,17 +86433,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), }); declarations.push(Declaration { - id: DeclarationId(2895), + id: DeclarationId(2896), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2893), + ty: DeclarationId(2894), }, Field { label: "None".to_string(), - ty: DeclarationId(2894), + ty: DeclarationId(2895), }, ], }, @@ -86421,7 +86458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), }); declarations.push(Declaration { - id: DeclarationId(2896), + id: DeclarationId(2897), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86440,7 +86477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23950, 23957), }); declarations.push(Declaration { - id: DeclarationId(2897), + id: DeclarationId(2898), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86454,17 +86491,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23950, 23957), }); declarations.push(Declaration { - id: DeclarationId(2898), + id: DeclarationId(2899), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2896), + ty: DeclarationId(2897), }, Field { label: "None".to_string(), - ty: DeclarationId(2897), + ty: DeclarationId(2898), }, ], }, @@ -86479,7 +86516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23950, 23957), }); declarations.push(Declaration { - id: DeclarationId(2899), + id: DeclarationId(2900), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86498,7 +86535,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24180, 24195), }); declarations.push(Declaration { - id: DeclarationId(2900), + id: DeclarationId(2901), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86512,17 +86549,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24180, 24195), }); declarations.push(Declaration { - id: DeclarationId(2901), + id: DeclarationId(2902), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2899), + ty: DeclarationId(2900), }, Field { label: "None".to_string(), - ty: DeclarationId(2900), + ty: DeclarationId(2901), }, ], }, @@ -86537,7 +86574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24180, 24195), }); declarations.push(Declaration { - id: DeclarationId(2902), + id: DeclarationId(2903), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86556,7 +86593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24206, 24219), }); declarations.push(Declaration { - id: DeclarationId(2903), + id: DeclarationId(2904), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86570,17 +86607,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24206, 24219), }); declarations.push(Declaration { - id: DeclarationId(2904), + id: DeclarationId(2905), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2902), + ty: DeclarationId(2903), }, Field { label: "None".to_string(), - ty: DeclarationId(2903), + ty: DeclarationId(2904), }, ], }, @@ -86595,7 +86632,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24206, 24219), }); declarations.push(Declaration { - id: DeclarationId(2905), + id: DeclarationId(2906), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86614,7 +86651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), }); declarations.push(Declaration { - id: DeclarationId(2906), + id: DeclarationId(2907), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86628,17 +86665,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), }); declarations.push(Declaration { - id: DeclarationId(2907), + id: DeclarationId(2908), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2905), + ty: DeclarationId(2906), }, Field { label: "None".to_string(), - ty: DeclarationId(2906), + ty: DeclarationId(2907), }, ], }, @@ -86653,7 +86690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), }); declarations.push(Declaration { - id: DeclarationId(2908), + id: DeclarationId(2909), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86672,7 +86709,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), }); declarations.push(Declaration { - id: DeclarationId(2909), + id: DeclarationId(2910), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86686,17 +86723,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), }); declarations.push(Declaration { - id: DeclarationId(2910), + id: DeclarationId(2911), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2908), + ty: DeclarationId(2909), }, Field { label: "None".to_string(), - ty: DeclarationId(2909), + ty: DeclarationId(2910), }, ], }, @@ -86711,7 +86748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), }); declarations.push(Declaration { - id: DeclarationId(2911), + id: DeclarationId(2912), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86730,7 +86767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), }); declarations.push(Declaration { - id: DeclarationId(2912), + id: DeclarationId(2913), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86744,17 +86781,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), }); declarations.push(Declaration { - id: DeclarationId(2913), + id: DeclarationId(2914), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2911), + ty: DeclarationId(2912), }, Field { label: "None".to_string(), - ty: DeclarationId(2912), + ty: DeclarationId(2913), }, ], }, @@ -86769,12 +86806,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), }); declarations.push(Declaration { - id: DeclarationId(2914), + id: DeclarationId(2915), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1790), + ty: DeclarationId(1791), }], }, type_params: vec![], @@ -86788,7 +86825,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), }); declarations.push(Declaration { - id: DeclarationId(2915), + id: DeclarationId(2916), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86802,17 +86839,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), }); declarations.push(Declaration { - id: DeclarationId(2916), + id: DeclarationId(2917), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2914), + ty: DeclarationId(2915), }, Field { label: "None".to_string(), - ty: DeclarationId(2915), + ty: DeclarationId(2916), }, ], }, @@ -86827,12 +86864,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), }); declarations.push(Declaration { - id: DeclarationId(2917), + id: DeclarationId(2918), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1793), + ty: DeclarationId(1794), }], }, type_params: vec![], @@ -86846,7 +86883,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), }); declarations.push(Declaration { - id: DeclarationId(2918), + id: DeclarationId(2919), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86860,17 +86897,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), }); declarations.push(Declaration { - id: DeclarationId(2919), + id: DeclarationId(2920), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2917), + ty: DeclarationId(2918), }, Field { label: "None".to_string(), - ty: DeclarationId(2918), + ty: DeclarationId(2919), }, ], }, @@ -86885,7 +86922,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), }); declarations.push(Declaration { - id: DeclarationId(2920), + id: DeclarationId(2921), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86904,7 +86941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), }); declarations.push(Declaration { - id: DeclarationId(2921), + id: DeclarationId(2922), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86918,17 +86955,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), }); declarations.push(Declaration { - id: DeclarationId(2922), + id: DeclarationId(2923), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2920), + ty: DeclarationId(2921), }, Field { label: "None".to_string(), - ty: DeclarationId(2921), + ty: DeclarationId(2922), }, ], }, @@ -86943,7 +86980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), }); declarations.push(Declaration { - id: DeclarationId(2923), + id: DeclarationId(2924), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86962,7 +86999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), }); declarations.push(Declaration { - id: DeclarationId(2924), + id: DeclarationId(2925), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86976,17 +87013,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), }); declarations.push(Declaration { - id: DeclarationId(2925), + id: DeclarationId(2926), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2923), + ty: DeclarationId(2924), }, Field { label: "None".to_string(), - ty: DeclarationId(2924), + ty: DeclarationId(2925), }, ], }, @@ -87001,7 +87038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), }); declarations.push(Declaration { - id: DeclarationId(2926), + id: DeclarationId(2927), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87020,7 +87057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), }); declarations.push(Declaration { - id: DeclarationId(2927), + id: DeclarationId(2928), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87034,17 +87071,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), }); declarations.push(Declaration { - id: DeclarationId(2928), + id: DeclarationId(2929), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2926), + ty: DeclarationId(2927), }, Field { label: "None".to_string(), - ty: DeclarationId(2927), + ty: DeclarationId(2928), }, ], }, @@ -87059,12 +87096,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), }); declarations.push(Declaration { - id: DeclarationId(2929), + id: DeclarationId(2930), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(780), + ty: DeclarationId(781), }], }, type_params: vec![], @@ -87078,7 +87115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), }); declarations.push(Declaration { - id: DeclarationId(2930), + id: DeclarationId(2931), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87092,17 +87129,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), }); declarations.push(Declaration { - id: DeclarationId(2931), + id: DeclarationId(2932), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2929), + ty: DeclarationId(2930), }, Field { label: "None".to_string(), - ty: DeclarationId(2930), + ty: DeclarationId(2931), }, ], }, @@ -87117,12 +87154,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), }); declarations.push(Declaration { - id: DeclarationId(2932), + id: DeclarationId(2933), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(826), + ty: DeclarationId(827), }], }, type_params: vec![], @@ -87136,7 +87173,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), }); declarations.push(Declaration { - id: DeclarationId(2933), + id: DeclarationId(2934), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87150,17 +87187,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), }); declarations.push(Declaration { - id: DeclarationId(2934), + id: DeclarationId(2935), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2932), + ty: DeclarationId(2933), }, Field { label: "None".to_string(), - ty: DeclarationId(2933), + ty: DeclarationId(2934), }, ], }, @@ -87175,12 +87212,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), }); declarations.push(Declaration { - id: DeclarationId(2935), + id: DeclarationId(2936), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(826), + ty: DeclarationId(827), }], }, type_params: vec![], @@ -87194,7 +87231,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), }); declarations.push(Declaration { - id: DeclarationId(2936), + id: DeclarationId(2937), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87208,17 +87245,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), }); declarations.push(Declaration { - id: DeclarationId(2937), + id: DeclarationId(2938), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2935), + ty: DeclarationId(2936), }, Field { label: "None".to_string(), - ty: DeclarationId(2936), + ty: DeclarationId(2937), }, ], }, @@ -87233,12 +87270,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), }); declarations.push(Declaration { - id: DeclarationId(2938), + id: DeclarationId(2939), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(798), + ty: DeclarationId(799), }], }, type_params: vec![], @@ -87252,7 +87289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), }); declarations.push(Declaration { - id: DeclarationId(2939), + id: DeclarationId(2940), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87266,17 +87303,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), }); declarations.push(Declaration { - id: DeclarationId(2940), + id: DeclarationId(2941), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2938), + ty: DeclarationId(2939), }, Field { label: "None".to_string(), - ty: DeclarationId(2939), + ty: DeclarationId(2940), }, ], }, @@ -87291,12 +87328,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), }); declarations.push(Declaration { - id: DeclarationId(2941), + id: DeclarationId(2942), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(798), + ty: DeclarationId(799), }], }, type_params: vec![], @@ -87310,7 +87347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), }); declarations.push(Declaration { - id: DeclarationId(2942), + id: DeclarationId(2943), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87324,17 +87361,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), }); declarations.push(Declaration { - id: DeclarationId(2943), + id: DeclarationId(2944), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2941), + ty: DeclarationId(2942), }, Field { label: "None".to_string(), - ty: DeclarationId(2942), + ty: DeclarationId(2943), }, ], }, @@ -87349,12 +87386,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), }); declarations.push(Declaration { - id: DeclarationId(2944), + id: DeclarationId(2945), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(754), + ty: DeclarationId(755), }], }, type_params: vec![], @@ -87368,7 +87405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), }); declarations.push(Declaration { - id: DeclarationId(2945), + id: DeclarationId(2946), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87382,17 +87419,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), }); declarations.push(Declaration { - id: DeclarationId(2946), + id: DeclarationId(2947), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2944), + ty: DeclarationId(2945), }, Field { label: "None".to_string(), - ty: DeclarationId(2945), + ty: DeclarationId(2946), }, ], }, @@ -87407,12 +87444,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), }); declarations.push(Declaration { - id: DeclarationId(2947), + id: DeclarationId(2948), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(721), + ty: DeclarationId(722), }], }, type_params: vec![], @@ -87426,7 +87463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), }); declarations.push(Declaration { - id: DeclarationId(2948), + id: DeclarationId(2949), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87440,17 +87477,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), }); declarations.push(Declaration { - id: DeclarationId(2949), + id: DeclarationId(2950), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2947), + ty: DeclarationId(2948), }, Field { label: "None".to_string(), - ty: DeclarationId(2948), + ty: DeclarationId(2949), }, ], }, @@ -87465,7 +87502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), }); declarations.push(Declaration { - id: DeclarationId(2950), + id: DeclarationId(2951), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87484,7 +87521,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), }); declarations.push(Declaration { - id: DeclarationId(2951), + id: DeclarationId(2952), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87498,17 +87535,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), }); declarations.push(Declaration { - id: DeclarationId(2952), + id: DeclarationId(2953), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2950), + ty: DeclarationId(2951), }, Field { label: "None".to_string(), - ty: DeclarationId(2951), + ty: DeclarationId(2952), }, ], }, @@ -87523,12 +87560,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), }); declarations.push(Declaration { - id: DeclarationId(2953), + id: DeclarationId(2954), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }], }, type_params: vec![], @@ -87542,7 +87579,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), }); declarations.push(Declaration { - id: DeclarationId(2954), + id: DeclarationId(2955), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87556,17 +87593,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), }); declarations.push(Declaration { - id: DeclarationId(2955), + id: DeclarationId(2956), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2953), + ty: DeclarationId(2954), }, Field { label: "None".to_string(), - ty: DeclarationId(2954), + ty: DeclarationId(2955), }, ], }, @@ -87581,12 +87618,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), }); declarations.push(Declaration { - id: DeclarationId(2956), + id: DeclarationId(2957), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(723), + ty: DeclarationId(724), }], }, type_params: vec![], @@ -87600,7 +87637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), }); declarations.push(Declaration { - id: DeclarationId(2957), + id: DeclarationId(2958), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87614,17 +87651,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), }); declarations.push(Declaration { - id: DeclarationId(2958), + id: DeclarationId(2959), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2956), + ty: DeclarationId(2957), }, Field { label: "None".to_string(), - ty: DeclarationId(2957), + ty: DeclarationId(2958), }, ], }, @@ -87639,12 +87676,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), }); declarations.push(Declaration { - id: DeclarationId(2959), + id: DeclarationId(2960), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(794), + ty: DeclarationId(795), }], }, type_params: vec![], @@ -87658,7 +87695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), }); declarations.push(Declaration { - id: DeclarationId(2960), + id: DeclarationId(2961), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87672,17 +87709,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), }); declarations.push(Declaration { - id: DeclarationId(2961), + id: DeclarationId(2962), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2959), + ty: DeclarationId(2960), }, Field { label: "None".to_string(), - ty: DeclarationId(2960), + ty: DeclarationId(2961), }, ], }, @@ -87697,12 +87734,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), }); declarations.push(Declaration { - id: DeclarationId(2962), + id: DeclarationId(2963), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(800), + ty: DeclarationId(801), }], }, type_params: vec![], @@ -87716,7 +87753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), }); declarations.push(Declaration { - id: DeclarationId(2963), + id: DeclarationId(2964), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87730,17 +87767,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), }); declarations.push(Declaration { - id: DeclarationId(2964), + id: DeclarationId(2965), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2962), + ty: DeclarationId(2963), }, Field { label: "None".to_string(), - ty: DeclarationId(2963), + ty: DeclarationId(2964), }, ], }, @@ -87755,12 +87792,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), }); declarations.push(Declaration { - id: DeclarationId(2965), + id: DeclarationId(2966), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(808), + ty: DeclarationId(809), }], }, type_params: vec![], @@ -87774,7 +87811,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), }); declarations.push(Declaration { - id: DeclarationId(2966), + id: DeclarationId(2967), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87788,17 +87825,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), }); declarations.push(Declaration { - id: DeclarationId(2967), + id: DeclarationId(2968), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2965), + ty: DeclarationId(2966), }, Field { label: "None".to_string(), - ty: DeclarationId(2966), + ty: DeclarationId(2967), }, ], }, @@ -87813,12 +87850,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), }); declarations.push(Declaration { - id: DeclarationId(2968), + id: DeclarationId(2969), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(754), + ty: DeclarationId(755), }], }, type_params: vec![], @@ -87832,7 +87869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), }); declarations.push(Declaration { - id: DeclarationId(2969), + id: DeclarationId(2970), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87846,17 +87883,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), }); declarations.push(Declaration { - id: DeclarationId(2970), + id: DeclarationId(2971), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2968), + ty: DeclarationId(2969), }, Field { label: "None".to_string(), - ty: DeclarationId(2969), + ty: DeclarationId(2970), }, ], }, @@ -87871,12 +87908,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), }); declarations.push(Declaration { - id: DeclarationId(2971), + id: DeclarationId(2972), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(821), + ty: DeclarationId(822), }], }, type_params: vec![], @@ -87890,7 +87927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), }); declarations.push(Declaration { - id: DeclarationId(2972), + id: DeclarationId(2973), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87904,17 +87941,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), }); declarations.push(Declaration { - id: DeclarationId(2973), + id: DeclarationId(2974), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2971), + ty: DeclarationId(2972), }, Field { label: "None".to_string(), - ty: DeclarationId(2972), + ty: DeclarationId(2973), }, ], }, @@ -87929,12 +87966,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), }); declarations.push(Declaration { - id: DeclarationId(2974), + id: DeclarationId(2975), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(754), + ty: DeclarationId(755), }], }, type_params: vec![], @@ -87948,7 +87985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), }); declarations.push(Declaration { - id: DeclarationId(2975), + id: DeclarationId(2976), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87962,17 +87999,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), }); declarations.push(Declaration { - id: DeclarationId(2976), + id: DeclarationId(2977), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2974), + ty: DeclarationId(2975), }, Field { label: "None".to_string(), - ty: DeclarationId(2975), + ty: DeclarationId(2976), }, ], }, @@ -87987,12 +88024,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), }); declarations.push(Declaration { - id: DeclarationId(2977), + id: DeclarationId(2978), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(824), + ty: DeclarationId(825), }], }, type_params: vec![], @@ -88006,7 +88043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), }); declarations.push(Declaration { - id: DeclarationId(2978), + id: DeclarationId(2979), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88020,17 +88057,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), }); declarations.push(Declaration { - id: DeclarationId(2979), + id: DeclarationId(2980), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2977), + ty: DeclarationId(2978), }, Field { label: "None".to_string(), - ty: DeclarationId(2978), + ty: DeclarationId(2979), }, ], }, @@ -88045,12 +88082,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), }); declarations.push(Declaration { - id: DeclarationId(2980), + id: DeclarationId(2981), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(841), + ty: DeclarationId(842), }], }, type_params: vec![], @@ -88064,7 +88101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), }); declarations.push(Declaration { - id: DeclarationId(2981), + id: DeclarationId(2982), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88078,17 +88115,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), }); declarations.push(Declaration { - id: DeclarationId(2982), + id: DeclarationId(2983), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2980), + ty: DeclarationId(2981), }, Field { label: "None".to_string(), - ty: DeclarationId(2981), + ty: DeclarationId(2982), }, ], }, @@ -88103,12 +88140,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), }); declarations.push(Declaration { - id: DeclarationId(2983), + id: DeclarationId(2984), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(842), + ty: DeclarationId(843), }], }, type_params: vec![], @@ -88122,7 +88159,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), }); declarations.push(Declaration { - id: DeclarationId(2984), + id: DeclarationId(2985), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88136,17 +88173,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), }); declarations.push(Declaration { - id: DeclarationId(2985), + id: DeclarationId(2986), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2983), + ty: DeclarationId(2984), }, Field { label: "None".to_string(), - ty: DeclarationId(2984), + ty: DeclarationId(2985), }, ], }, @@ -88161,7 +88198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), }); declarations.push(Declaration { - id: DeclarationId(2986), + id: DeclarationId(2987), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88180,7 +88217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), }); declarations.push(Declaration { - id: DeclarationId(2987), + id: DeclarationId(2988), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88194,17 +88231,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), }); declarations.push(Declaration { - id: DeclarationId(2988), + id: DeclarationId(2989), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2986), + ty: DeclarationId(2987), }, Field { label: "None".to_string(), - ty: DeclarationId(2987), + ty: DeclarationId(2988), }, ], }, @@ -88219,7 +88256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), }); declarations.push(Declaration { - id: DeclarationId(2989), + id: DeclarationId(2990), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88238,7 +88275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), }); declarations.push(Declaration { - id: DeclarationId(2990), + id: DeclarationId(2991), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88252,17 +88289,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), }); declarations.push(Declaration { - id: DeclarationId(2991), + id: DeclarationId(2992), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2989), + ty: DeclarationId(2990), }, Field { label: "None".to_string(), - ty: DeclarationId(2990), + ty: DeclarationId(2991), }, ], }, @@ -88277,7 +88314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), }); declarations.push(Declaration { - id: DeclarationId(2992), + id: DeclarationId(2993), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88296,7 +88333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), }); declarations.push(Declaration { - id: DeclarationId(2993), + id: DeclarationId(2994), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88310,17 +88347,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), }); declarations.push(Declaration { - id: DeclarationId(2994), + id: DeclarationId(2995), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2992), + ty: DeclarationId(2993), }, Field { label: "None".to_string(), - ty: DeclarationId(2993), + ty: DeclarationId(2994), }, ], }, @@ -88335,7 +88372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), }); declarations.push(Declaration { - id: DeclarationId(2995), + id: DeclarationId(2996), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88354,7 +88391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), }); declarations.push(Declaration { - id: DeclarationId(2996), + id: DeclarationId(2997), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88368,17 +88405,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), }); declarations.push(Declaration { - id: DeclarationId(2997), + id: DeclarationId(2998), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2995), + ty: DeclarationId(2996), }, Field { label: "None".to_string(), - ty: DeclarationId(2996), + ty: DeclarationId(2997), }, ], }, @@ -88393,12 +88430,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), }); declarations.push(Declaration { - id: DeclarationId(2998), + id: DeclarationId(2999), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(895), + ty: DeclarationId(896), }], }, type_params: vec![], @@ -88412,7 +88449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4009, 4036), }); declarations.push(Declaration { - id: DeclarationId(2999), + id: DeclarationId(3000), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88426,17 +88463,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4009, 4036), }); declarations.push(Declaration { - id: DeclarationId(3000), + id: DeclarationId(3001), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2998), + ty: DeclarationId(2999), }, Field { label: "None".to_string(), - ty: DeclarationId(2999), + ty: DeclarationId(3000), }, ], }, @@ -88451,7 +88488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4009, 4036), }); declarations.push(Declaration { - id: DeclarationId(3001), + id: DeclarationId(3002), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88470,7 +88507,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058), }); declarations.push(Declaration { - id: DeclarationId(3002), + id: DeclarationId(3003), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88484,17 +88521,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058), }); declarations.push(Declaration { - id: DeclarationId(3003), + id: DeclarationId(3004), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3001), + ty: DeclarationId(3002), }, Field { label: "None".to_string(), - ty: DeclarationId(3002), + ty: DeclarationId(3003), }, ], }, @@ -88509,7 +88546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058), }); declarations.push(Declaration { - id: DeclarationId(3004), + id: DeclarationId(3005), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88528,7 +88565,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421), }); declarations.push(Declaration { - id: DeclarationId(3005), + id: DeclarationId(3006), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88542,17 +88579,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421), }); declarations.push(Declaration { - id: DeclarationId(3006), + id: DeclarationId(3007), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3004), + ty: DeclarationId(3005), }, Field { label: "None".to_string(), - ty: DeclarationId(3005), + ty: DeclarationId(3006), }, ], }, @@ -88567,7 +88604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421), }); declarations.push(Declaration { - id: DeclarationId(3007), + id: DeclarationId(3008), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88586,7 +88623,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439), }); declarations.push(Declaration { - id: DeclarationId(3008), + id: DeclarationId(3009), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88600,17 +88637,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439), }); declarations.push(Declaration { - id: DeclarationId(3009), + id: DeclarationId(3010), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3007), + ty: DeclarationId(3008), }, Field { label: "None".to_string(), - ty: DeclarationId(3008), + ty: DeclarationId(3009), }, ], }, @@ -88625,7 +88662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439), }); declarations.push(Declaration { - id: DeclarationId(3010), + id: DeclarationId(3011), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88644,7 +88681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5562, 5569), }); declarations.push(Declaration { - id: DeclarationId(3011), + id: DeclarationId(3012), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88658,17 +88695,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5562, 5569), }); declarations.push(Declaration { - id: DeclarationId(3012), + id: DeclarationId(3013), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3010), + ty: DeclarationId(3011), }, Field { label: "None".to_string(), - ty: DeclarationId(3011), + ty: DeclarationId(3012), }, ], }, @@ -88683,7 +88720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5562, 5569), }); declarations.push(Declaration { - id: DeclarationId(3013), + id: DeclarationId(3014), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88702,7 +88739,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5580, 5587), }); declarations.push(Declaration { - id: DeclarationId(3014), + id: DeclarationId(3015), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88716,17 +88753,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5580, 5587), }); declarations.push(Declaration { - id: DeclarationId(3015), + id: DeclarationId(3016), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3013), + ty: DeclarationId(3014), }, Field { label: "None".to_string(), - ty: DeclarationId(3014), + ty: DeclarationId(3015), }, ], }, @@ -88741,7 +88778,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5580, 5587), }); declarations.push(Declaration { - id: DeclarationId(3016), + id: DeclarationId(3017), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88760,7 +88797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5720, 5727), }); declarations.push(Declaration { - id: DeclarationId(3017), + id: DeclarationId(3018), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88774,17 +88811,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5720, 5727), }); declarations.push(Declaration { - id: DeclarationId(3018), + id: DeclarationId(3019), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3016), + ty: DeclarationId(3017), }, Field { label: "None".to_string(), - ty: DeclarationId(3017), + ty: DeclarationId(3018), }, ], }, @@ -88799,7 +88836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5720, 5727), }); declarations.push(Declaration { - id: DeclarationId(3019), + id: DeclarationId(3020), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88818,7 +88855,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5738, 5745), }); declarations.push(Declaration { - id: DeclarationId(3020), + id: DeclarationId(3021), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88832,17 +88869,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5738, 5745), }); declarations.push(Declaration { - id: DeclarationId(3021), + id: DeclarationId(3022), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3019), + ty: DeclarationId(3020), }, Field { label: "None".to_string(), - ty: DeclarationId(3020), + ty: DeclarationId(3021), }, ], }, @@ -88857,7 +88894,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5738, 5745), }); declarations.push(Declaration { - id: DeclarationId(3022), + id: DeclarationId(3023), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88876,7 +88913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5876, 5883), }); declarations.push(Declaration { - id: DeclarationId(3023), + id: DeclarationId(3024), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88890,17 +88927,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5876, 5883), }); declarations.push(Declaration { - id: DeclarationId(3024), + id: DeclarationId(3025), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3022), + ty: DeclarationId(3023), }, Field { label: "None".to_string(), - ty: DeclarationId(3023), + ty: DeclarationId(3024), }, ], }, @@ -88915,7 +88952,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5876, 5883), }); declarations.push(Declaration { - id: DeclarationId(3025), + id: DeclarationId(3026), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88934,7 +88971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5969, 5976), }); declarations.push(Declaration { - id: DeclarationId(3026), + id: DeclarationId(3027), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88948,17 +88985,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5969, 5976), }); declarations.push(Declaration { - id: DeclarationId(3027), + id: DeclarationId(3028), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3025), + ty: DeclarationId(3026), }, Field { label: "None".to_string(), - ty: DeclarationId(3026), + ty: DeclarationId(3027), }, ], }, @@ -88973,12 +89010,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5969, 5976), }); declarations.push(Declaration { - id: DeclarationId(3028), + id: DeclarationId(3029), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(2098), + ty: DeclarationId(2099), }], }, type_params: vec![], @@ -88992,7 +89029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6674, 6709), }); declarations.push(Declaration { - id: DeclarationId(3029), + id: DeclarationId(3030), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89006,17 +89043,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6674, 6709), }); declarations.push(Declaration { - id: DeclarationId(3030), + id: DeclarationId(3031), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3028), + ty: DeclarationId(3029), }, Field { label: "None".to_string(), - ty: DeclarationId(3029), + ty: DeclarationId(3030), }, ], }, @@ -89031,7 +89068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6674, 6709), }); declarations.push(Declaration { - id: DeclarationId(3031), + id: DeclarationId(3032), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89050,7 +89087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6912, 6917), }); declarations.push(Declaration { - id: DeclarationId(3032), + id: DeclarationId(3033), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89064,17 +89101,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6912, 6917), }); declarations.push(Declaration { - id: DeclarationId(3033), + id: DeclarationId(3034), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3031), + ty: DeclarationId(3032), }, Field { label: "None".to_string(), - ty: DeclarationId(3032), + ty: DeclarationId(3033), }, ], }, @@ -89089,7 +89126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6912, 6917), }); declarations.push(Declaration { - id: DeclarationId(3034), + id: DeclarationId(3035), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89108,7 +89145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7017, 7022), }); declarations.push(Declaration { - id: DeclarationId(3035), + id: DeclarationId(3036), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89122,17 +89159,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7017, 7022), }); declarations.push(Declaration { - id: DeclarationId(3036), + id: DeclarationId(3037), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3034), + ty: DeclarationId(3035), }, Field { label: "None".to_string(), - ty: DeclarationId(3035), + ty: DeclarationId(3036), }, ], }, @@ -89147,7 +89184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7017, 7022), }); declarations.push(Declaration { - id: DeclarationId(3037), + id: DeclarationId(3038), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89166,7 +89203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7108, 7113), }); declarations.push(Declaration { - id: DeclarationId(3038), + id: DeclarationId(3039), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89180,17 +89217,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7108, 7113), }); declarations.push(Declaration { - id: DeclarationId(3039), + id: DeclarationId(3040), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3037), + ty: DeclarationId(3038), }, Field { label: "None".to_string(), - ty: DeclarationId(3038), + ty: DeclarationId(3039), }, ], }, @@ -89205,7 +89242,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7108, 7113), }); declarations.push(Declaration { - id: DeclarationId(3040), + id: DeclarationId(3041), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89224,7 +89261,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739), }); declarations.push(Declaration { - id: DeclarationId(3041), + id: DeclarationId(3042), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89238,17 +89275,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739), }); declarations.push(Declaration { - id: DeclarationId(3042), + id: DeclarationId(3043), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3040), + ty: DeclarationId(3041), }, Field { label: "None".to_string(), - ty: DeclarationId(3041), + ty: DeclarationId(3042), }, ], }, @@ -89263,7 +89300,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739), }); declarations.push(Declaration { - id: DeclarationId(3043), + id: DeclarationId(3044), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89282,7 +89319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775), }); declarations.push(Declaration { - id: DeclarationId(3044), + id: DeclarationId(3045), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89296,17 +89333,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775), }); declarations.push(Declaration { - id: DeclarationId(3045), + id: DeclarationId(3046), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3043), + ty: DeclarationId(3044), }, Field { label: "None".to_string(), - ty: DeclarationId(3044), + ty: DeclarationId(3045), }, ], }, @@ -89321,7 +89358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775), }); declarations.push(Declaration { - id: DeclarationId(3046), + id: DeclarationId(3047), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89340,7 +89377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814), }); declarations.push(Declaration { - id: DeclarationId(3047), + id: DeclarationId(3048), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89354,17 +89391,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814), }); declarations.push(Declaration { - id: DeclarationId(3048), + id: DeclarationId(3049), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3046), + ty: DeclarationId(3047), }, Field { label: "None".to_string(), - ty: DeclarationId(3047), + ty: DeclarationId(3048), }, ], }, @@ -89379,7 +89416,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814), }); declarations.push(Declaration { - id: DeclarationId(3049), + id: DeclarationId(3050), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89398,7 +89435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8783, 8790), }); declarations.push(Declaration { - id: DeclarationId(3050), + id: DeclarationId(3051), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89412,17 +89449,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8783, 8790), }); declarations.push(Declaration { - id: DeclarationId(3051), + id: DeclarationId(3052), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3049), + ty: DeclarationId(3050), }, Field { label: "None".to_string(), - ty: DeclarationId(3050), + ty: DeclarationId(3051), }, ], }, @@ -89437,7 +89474,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8783, 8790), }); declarations.push(Declaration { - id: DeclarationId(3052), + id: DeclarationId(3053), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89456,7 +89493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8851, 8856), }); declarations.push(Declaration { - id: DeclarationId(3053), + id: DeclarationId(3054), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89470,17 +89507,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8851, 8856), }); declarations.push(Declaration { - id: DeclarationId(3054), + id: DeclarationId(3055), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3052), + ty: DeclarationId(3053), }, Field { label: "None".to_string(), - ty: DeclarationId(3053), + ty: DeclarationId(3054), }, ], }, @@ -89495,12 +89532,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8851, 8856), }); declarations.push(Declaration { - id: DeclarationId(3055), + id: DeclarationId(3056), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(927), + ty: DeclarationId(928), }], }, type_params: vec![], @@ -89514,7 +89551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755), }); declarations.push(Declaration { - id: DeclarationId(3056), + id: DeclarationId(3057), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89528,17 +89565,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755), }); declarations.push(Declaration { - id: DeclarationId(3057), + id: DeclarationId(3058), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3055), + ty: DeclarationId(3056), }, Field { label: "None".to_string(), - ty: DeclarationId(3056), + ty: DeclarationId(3057), }, ], }, @@ -89553,7 +89590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755), }); declarations.push(Declaration { - id: DeclarationId(3058), + id: DeclarationId(3059), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89572,7 +89609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), }); declarations.push(Declaration { - id: DeclarationId(3059), + id: DeclarationId(3060), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89586,17 +89623,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), }); declarations.push(Declaration { - id: DeclarationId(3060), + id: DeclarationId(3061), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3058), + ty: DeclarationId(3059), }, Field { label: "None".to_string(), - ty: DeclarationId(3059), + ty: DeclarationId(3060), }, ], }, @@ -89611,7 +89648,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), }); declarations.push(Declaration { - id: DeclarationId(3061), + id: DeclarationId(3062), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89630,7 +89667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), }); declarations.push(Declaration { - id: DeclarationId(3062), + id: DeclarationId(3063), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89644,17 +89681,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), }); declarations.push(Declaration { - id: DeclarationId(3063), + id: DeclarationId(3064), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3061), + ty: DeclarationId(3062), }, Field { label: "None".to_string(), - ty: DeclarationId(3062), + ty: DeclarationId(3063), }, ], }, @@ -89669,12 +89706,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), }); declarations.push(Declaration { - id: DeclarationId(3064), + id: DeclarationId(3065), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(937), + ty: DeclarationId(938), }], }, type_params: vec![], @@ -89688,7 +89725,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), }); declarations.push(Declaration { - id: DeclarationId(3065), + id: DeclarationId(3066), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89702,17 +89739,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), }); declarations.push(Declaration { - id: DeclarationId(3066), + id: DeclarationId(3067), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3064), + ty: DeclarationId(3065), }, Field { label: "None".to_string(), - ty: DeclarationId(3065), + ty: DeclarationId(3066), }, ], }, @@ -89727,12 +89764,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), }); declarations.push(Declaration { - id: DeclarationId(3067), + id: DeclarationId(3068), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(937), + ty: DeclarationId(938), }], }, type_params: vec![], @@ -89746,7 +89783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), }); declarations.push(Declaration { - id: DeclarationId(3068), + id: DeclarationId(3069), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89760,17 +89797,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), }); declarations.push(Declaration { - id: DeclarationId(3069), + id: DeclarationId(3070), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3067), + ty: DeclarationId(3068), }, Field { label: "None".to_string(), - ty: DeclarationId(3068), + ty: DeclarationId(3069), }, ], }, @@ -89785,12 +89822,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), }); declarations.push(Declaration { - id: DeclarationId(3070), + id: DeclarationId(3071), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(929), + ty: DeclarationId(930), }], }, type_params: vec![], @@ -89804,7 +89841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), }); declarations.push(Declaration { - id: DeclarationId(3071), + id: DeclarationId(3072), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89818,17 +89855,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), }); declarations.push(Declaration { - id: DeclarationId(3072), + id: DeclarationId(3073), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3070), + ty: DeclarationId(3071), }, Field { label: "None".to_string(), - ty: DeclarationId(3071), + ty: DeclarationId(3072), }, ], }, @@ -89843,12 +89880,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), }); declarations.push(Declaration { - id: DeclarationId(3073), + id: DeclarationId(3074), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(927), + ty: DeclarationId(928), }], }, type_params: vec![], @@ -89862,7 +89899,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), }); declarations.push(Declaration { - id: DeclarationId(3074), + id: DeclarationId(3075), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89876,17 +89913,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), }); declarations.push(Declaration { - id: DeclarationId(3075), + id: DeclarationId(3076), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3073), + ty: DeclarationId(3074), }, Field { label: "None".to_string(), - ty: DeclarationId(3074), + ty: DeclarationId(3075), }, ], }, @@ -89901,12 +89938,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), }); declarations.push(Declaration { - id: DeclarationId(3076), + id: DeclarationId(3077), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(931), + ty: DeclarationId(932), }], }, type_params: vec![], @@ -89920,7 +89957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), }); declarations.push(Declaration { - id: DeclarationId(3077), + id: DeclarationId(3078), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89934,17 +89971,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), }); declarations.push(Declaration { - id: DeclarationId(3078), + id: DeclarationId(3079), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3076), + ty: DeclarationId(3077), }, Field { label: "None".to_string(), - ty: DeclarationId(3077), + ty: DeclarationId(3078), }, ], }, @@ -89959,7 +89996,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), }); declarations.push(Declaration { - id: DeclarationId(3079), + id: DeclarationId(3080), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89978,7 +90015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), }); declarations.push(Declaration { - id: DeclarationId(3080), + id: DeclarationId(3081), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89992,17 +90029,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), }); declarations.push(Declaration { - id: DeclarationId(3081), + id: DeclarationId(3082), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3079), + ty: DeclarationId(3080), }, Field { label: "None".to_string(), - ty: DeclarationId(3080), + ty: DeclarationId(3081), }, ], }, @@ -90017,7 +90054,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), }); declarations.push(Declaration { - id: DeclarationId(3082), + id: DeclarationId(3083), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90036,7 +90073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), }); declarations.push(Declaration { - id: DeclarationId(3083), + id: DeclarationId(3084), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90050,17 +90087,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), }); declarations.push(Declaration { - id: DeclarationId(3084), + id: DeclarationId(3085), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3082), + ty: DeclarationId(3083), }, Field { label: "None".to_string(), - ty: DeclarationId(3083), + ty: DeclarationId(3084), }, ], }, @@ -90075,7 +90112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), }); declarations.push(Declaration { - id: DeclarationId(3085), + id: DeclarationId(3086), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90094,7 +90131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), }); declarations.push(Declaration { - id: DeclarationId(3086), + id: DeclarationId(3087), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90108,17 +90145,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), }); declarations.push(Declaration { - id: DeclarationId(3087), + id: DeclarationId(3088), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3085), + ty: DeclarationId(3086), }, Field { label: "None".to_string(), - ty: DeclarationId(3086), + ty: DeclarationId(3087), }, ], }, @@ -90133,7 +90170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), }); declarations.push(Declaration { - id: DeclarationId(3088), + id: DeclarationId(3089), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90152,7 +90189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), }); declarations.push(Declaration { - id: DeclarationId(3089), + id: DeclarationId(3090), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90166,17 +90203,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), }); declarations.push(Declaration { - id: DeclarationId(3090), + id: DeclarationId(3091), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3088), + ty: DeclarationId(3089), }, Field { label: "None".to_string(), - ty: DeclarationId(3089), + ty: DeclarationId(3090), }, ], }, @@ -90191,7 +90228,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), }); declarations.push(Declaration { - id: DeclarationId(3091), + id: DeclarationId(3092), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90210,7 +90247,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), }); declarations.push(Declaration { - id: DeclarationId(3092), + id: DeclarationId(3093), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90224,17 +90261,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), }); declarations.push(Declaration { - id: DeclarationId(3093), + id: DeclarationId(3094), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3091), + ty: DeclarationId(3092), }, Field { label: "None".to_string(), - ty: DeclarationId(3092), + ty: DeclarationId(3093), }, ], }, @@ -90249,7 +90286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), }); declarations.push(Declaration { - id: DeclarationId(3094), + id: DeclarationId(3095), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90268,7 +90305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), }); declarations.push(Declaration { - id: DeclarationId(3095), + id: DeclarationId(3096), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90282,17 +90319,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), }); declarations.push(Declaration { - id: DeclarationId(3096), + id: DeclarationId(3097), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3094), + ty: DeclarationId(3095), }, Field { label: "None".to_string(), - ty: DeclarationId(3095), + ty: DeclarationId(3096), }, ], }, @@ -90307,12 +90344,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), }); declarations.push(Declaration { - id: DeclarationId(3097), + id: DeclarationId(3098), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1151), + ty: DeclarationId(1152), }], }, type_params: vec![], @@ -90326,7 +90363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { - id: DeclarationId(3098), + id: DeclarationId(3099), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90340,17 +90377,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { - id: DeclarationId(3099), + id: DeclarationId(3100), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3097), + ty: DeclarationId(3098), }, Field { label: "None".to_string(), - ty: DeclarationId(3098), + ty: DeclarationId(3099), }, ], }, @@ -90365,12 +90402,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { - id: DeclarationId(3100), + id: DeclarationId(3101), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1144), + ty: DeclarationId(1145), }], }, type_params: vec![], @@ -90384,7 +90421,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), }); declarations.push(Declaration { - id: DeclarationId(3101), + id: DeclarationId(3102), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90398,17 +90435,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), }); declarations.push(Declaration { - id: DeclarationId(3102), + id: DeclarationId(3103), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3100), + ty: DeclarationId(3101), }, Field { label: "None".to_string(), - ty: DeclarationId(3101), + ty: DeclarationId(3102), }, ], }, @@ -90423,12 +90460,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), }); declarations.push(Declaration { - id: DeclarationId(3103), + id: DeclarationId(3104), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1151), + ty: DeclarationId(1152), }], }, type_params: vec![], @@ -90442,7 +90479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), }); declarations.push(Declaration { - id: DeclarationId(3104), + id: DeclarationId(3105), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90456,17 +90493,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), }); declarations.push(Declaration { - id: DeclarationId(3105), + id: DeclarationId(3106), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3103), + ty: DeclarationId(3104), }, Field { label: "None".to_string(), - ty: DeclarationId(3104), + ty: DeclarationId(3105), }, ], }, @@ -90481,12 +90518,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), }); declarations.push(Declaration { - id: DeclarationId(3106), + id: DeclarationId(3107), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1144), + ty: DeclarationId(1145), }], }, type_params: vec![], @@ -90500,7 +90537,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), }); declarations.push(Declaration { - id: DeclarationId(3107), + id: DeclarationId(3108), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90514,17 +90551,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), }); declarations.push(Declaration { - id: DeclarationId(3108), + id: DeclarationId(3109), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3106), + ty: DeclarationId(3107), }, Field { label: "None".to_string(), - ty: DeclarationId(3107), + ty: DeclarationId(3108), }, ], }, @@ -90539,12 +90576,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), }); declarations.push(Declaration { - id: DeclarationId(3109), + id: DeclarationId(3110), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1151), + ty: DeclarationId(1152), }], }, type_params: vec![], @@ -90558,7 +90595,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), }); declarations.push(Declaration { - id: DeclarationId(3110), + id: DeclarationId(3111), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90572,17 +90609,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), }); declarations.push(Declaration { - id: DeclarationId(3111), + id: DeclarationId(3112), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3109), + ty: DeclarationId(3110), }, Field { label: "None".to_string(), - ty: DeclarationId(3110), + ty: DeclarationId(3111), }, ], }, @@ -90597,12 +90634,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), }); declarations.push(Declaration { - id: DeclarationId(3112), + id: DeclarationId(3113), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1203), + ty: DeclarationId(1204), }], }, type_params: vec![], @@ -90616,7 +90653,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), }); declarations.push(Declaration { - id: DeclarationId(3113), + id: DeclarationId(3114), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90630,17 +90667,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), }); declarations.push(Declaration { - id: DeclarationId(3114), + id: DeclarationId(3115), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3112), + ty: DeclarationId(3113), }, Field { label: "None".to_string(), - ty: DeclarationId(3113), + ty: DeclarationId(3114), }, ], }, @@ -90655,12 +90692,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), }); declarations.push(Declaration { - id: DeclarationId(3115), + id: DeclarationId(3116), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1203), + ty: DeclarationId(1204), }], }, type_params: vec![], @@ -90674,7 +90711,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), }); declarations.push(Declaration { - id: DeclarationId(3116), + id: DeclarationId(3117), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90688,17 +90725,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), }); declarations.push(Declaration { - id: DeclarationId(3117), + id: DeclarationId(3118), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3115), + ty: DeclarationId(3116), }, Field { label: "None".to_string(), - ty: DeclarationId(3116), + ty: DeclarationId(3117), }, ], }, @@ -90713,12 +90750,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), }); declarations.push(Declaration { - id: DeclarationId(3118), + id: DeclarationId(3119), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1203), + ty: DeclarationId(1204), }], }, type_params: vec![], @@ -90732,7 +90769,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), }); declarations.push(Declaration { - id: DeclarationId(3119), + id: DeclarationId(3120), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90746,17 +90783,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), }); declarations.push(Declaration { - id: DeclarationId(3120), + id: DeclarationId(3121), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3118), + ty: DeclarationId(3119), }, Field { label: "None".to_string(), - ty: DeclarationId(3119), + ty: DeclarationId(3120), }, ], }, @@ -90771,12 +90808,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), }); declarations.push(Declaration { - id: DeclarationId(3121), + id: DeclarationId(3122), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1211), + ty: DeclarationId(1212), }], }, type_params: vec![], @@ -90790,7 +90827,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), }); declarations.push(Declaration { - id: DeclarationId(3122), + id: DeclarationId(3123), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90804,17 +90841,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), }); declarations.push(Declaration { - id: DeclarationId(3123), + id: DeclarationId(3124), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3121), + ty: DeclarationId(3122), }, Field { label: "None".to_string(), - ty: DeclarationId(3122), + ty: DeclarationId(3123), }, ], }, @@ -90829,12 +90866,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), }); declarations.push(Declaration { - id: DeclarationId(3124), + id: DeclarationId(3125), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1213), + ty: DeclarationId(1214), }], }, type_params: vec![], @@ -90848,7 +90885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), }); declarations.push(Declaration { - id: DeclarationId(3125), + id: DeclarationId(3126), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90862,17 +90899,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), }); declarations.push(Declaration { - id: DeclarationId(3126), + id: DeclarationId(3127), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3124), + ty: DeclarationId(3125), }, Field { label: "None".to_string(), - ty: DeclarationId(3125), + ty: DeclarationId(3126), }, ], }, @@ -90887,12 +90924,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), }); declarations.push(Declaration { - id: DeclarationId(3127), + id: DeclarationId(3128), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(805), + ty: DeclarationId(806), }], }, type_params: vec![], @@ -90906,7 +90943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), }); declarations.push(Declaration { - id: DeclarationId(3128), + id: DeclarationId(3129), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90920,17 +90957,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), }); declarations.push(Declaration { - id: DeclarationId(3129), + id: DeclarationId(3130), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3127), + ty: DeclarationId(3128), }, Field { label: "None".to_string(), - ty: DeclarationId(3128), + ty: DeclarationId(3129), }, ], }, @@ -90945,7 +90982,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), }); declarations.push(Declaration { - id: DeclarationId(3130), + id: DeclarationId(3131), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90964,7 +91001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), }); declarations.push(Declaration { - id: DeclarationId(3131), + id: DeclarationId(3132), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90978,17 +91015,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), }); declarations.push(Declaration { - id: DeclarationId(3132), + id: DeclarationId(3133), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3130), + ty: DeclarationId(3131), }, Field { label: "None".to_string(), - ty: DeclarationId(3131), + ty: DeclarationId(3132), }, ], }, @@ -91003,7 +91040,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), }); declarations.push(Declaration { - id: DeclarationId(3133), + id: DeclarationId(3134), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91022,7 +91059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), }); declarations.push(Declaration { - id: DeclarationId(3134), + id: DeclarationId(3135), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91036,17 +91073,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), }); declarations.push(Declaration { - id: DeclarationId(3135), + id: DeclarationId(3136), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3133), + ty: DeclarationId(3134), }, Field { label: "None".to_string(), - ty: DeclarationId(3134), + ty: DeclarationId(3135), }, ], }, @@ -91061,12 +91098,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), }); declarations.push(Declaration { - id: DeclarationId(3136), + id: DeclarationId(3137), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1716), + ty: DeclarationId(1717), }], }, type_params: vec![], @@ -91080,7 +91117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), }); declarations.push(Declaration { - id: DeclarationId(3137), + id: DeclarationId(3138), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91094,17 +91131,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), }); declarations.push(Declaration { - id: DeclarationId(3138), + id: DeclarationId(3139), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3136), + ty: DeclarationId(3137), }, Field { label: "None".to_string(), - ty: DeclarationId(3137), + ty: DeclarationId(3138), }, ], }, @@ -91119,7 +91156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), }); declarations.push(Declaration { - id: DeclarationId(3139), + id: DeclarationId(3140), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91138,7 +91175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), }); declarations.push(Declaration { - id: DeclarationId(3140), + id: DeclarationId(3141), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91152,17 +91189,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), }); declarations.push(Declaration { - id: DeclarationId(3141), + id: DeclarationId(3142), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3139), + ty: DeclarationId(3140), }, Field { label: "None".to_string(), - ty: DeclarationId(3140), + ty: DeclarationId(3141), }, ], }, @@ -91177,7 +91214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), }); declarations.push(Declaration { - id: DeclarationId(3142), + id: DeclarationId(3143), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91196,7 +91233,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), }); declarations.push(Declaration { - id: DeclarationId(3143), + id: DeclarationId(3144), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91210,17 +91247,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), }); declarations.push(Declaration { - id: DeclarationId(3144), + id: DeclarationId(3145), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3142), + ty: DeclarationId(3143), }, Field { label: "None".to_string(), - ty: DeclarationId(3143), + ty: DeclarationId(3144), }, ], }, @@ -91235,7 +91272,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), }); declarations.push(Declaration { - id: DeclarationId(3145), + id: DeclarationId(3146), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91254,7 +91291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), }); declarations.push(Declaration { - id: DeclarationId(3146), + id: DeclarationId(3147), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91268,17 +91305,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), }); declarations.push(Declaration { - id: DeclarationId(3147), + id: DeclarationId(3148), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3145), + ty: DeclarationId(3146), }, Field { label: "None".to_string(), - ty: DeclarationId(3146), + ty: DeclarationId(3147), }, ], }, @@ -91293,7 +91330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), }); declarations.push(Declaration { - id: DeclarationId(3148), + id: DeclarationId(3149), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91312,7 +91349,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), }); declarations.push(Declaration { - id: DeclarationId(3149), + id: DeclarationId(3150), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91326,17 +91363,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), }); declarations.push(Declaration { - id: DeclarationId(3150), + id: DeclarationId(3151), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3148), + ty: DeclarationId(3149), }, Field { label: "None".to_string(), - ty: DeclarationId(3149), + ty: DeclarationId(3150), }, ], }, @@ -91351,12 +91388,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), }); declarations.push(Declaration { - id: DeclarationId(3151), + id: DeclarationId(3152), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1744), + ty: DeclarationId(1745), }], }, type_params: vec![], @@ -91370,7 +91407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), }); declarations.push(Declaration { - id: DeclarationId(3152), + id: DeclarationId(3153), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91384,17 +91421,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), }); declarations.push(Declaration { - id: DeclarationId(3153), + id: DeclarationId(3154), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3151), + ty: DeclarationId(3152), }, Field { label: "None".to_string(), - ty: DeclarationId(3152), + ty: DeclarationId(3153), }, ], }, @@ -91409,7 +91446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), }); declarations.push(Declaration { - id: DeclarationId(3154), + id: DeclarationId(3155), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91428,7 +91465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), }); declarations.push(Declaration { - id: DeclarationId(3155), + id: DeclarationId(3156), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91442,17 +91479,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), }); declarations.push(Declaration { - id: DeclarationId(3156), + id: DeclarationId(3157), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3154), + ty: DeclarationId(3155), }, Field { label: "None".to_string(), - ty: DeclarationId(3155), + ty: DeclarationId(3156), }, ], }, @@ -91467,12 +91504,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), }); declarations.push(Declaration { - id: DeclarationId(3157), + id: DeclarationId(3158), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1725), + ty: DeclarationId(1726), }], }, type_params: vec![], @@ -91486,7 +91523,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), }); declarations.push(Declaration { - id: DeclarationId(3158), + id: DeclarationId(3159), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91500,17 +91537,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), }); declarations.push(Declaration { - id: DeclarationId(3159), + id: DeclarationId(3160), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3157), + ty: DeclarationId(3158), }, Field { label: "None".to_string(), - ty: DeclarationId(3158), + ty: DeclarationId(3159), }, ], }, @@ -91525,7 +91562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), }); declarations.push(Declaration { - id: DeclarationId(3160), + id: DeclarationId(3161), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91544,7 +91581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), }); declarations.push(Declaration { - id: DeclarationId(3161), + id: DeclarationId(3162), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91558,17 +91595,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), }); declarations.push(Declaration { - id: DeclarationId(3162), + id: DeclarationId(3163), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3160), + ty: DeclarationId(3161), }, Field { label: "None".to_string(), - ty: DeclarationId(3161), + ty: DeclarationId(3162), }, ], }, @@ -91583,7 +91620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), }); declarations.push(Declaration { - id: DeclarationId(3163), + id: DeclarationId(3164), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91602,7 +91639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), }); declarations.push(Declaration { - id: DeclarationId(3164), + id: DeclarationId(3165), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91616,17 +91653,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), }); declarations.push(Declaration { - id: DeclarationId(3165), + id: DeclarationId(3166), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3163), + ty: DeclarationId(3164), }, Field { label: "None".to_string(), - ty: DeclarationId(3164), + ty: DeclarationId(3165), }, ], }, @@ -91641,7 +91678,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), }); declarations.push(Declaration { - id: DeclarationId(3166), + id: DeclarationId(3167), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91660,7 +91697,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), }); declarations.push(Declaration { - id: DeclarationId(3167), + id: DeclarationId(3168), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91674,17 +91711,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), }); declarations.push(Declaration { - id: DeclarationId(3168), + id: DeclarationId(3169), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3166), + ty: DeclarationId(3167), }, Field { label: "None".to_string(), - ty: DeclarationId(3167), + ty: DeclarationId(3168), }, ], }, @@ -91699,7 +91736,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), }); declarations.push(Declaration { - id: DeclarationId(3169), + id: DeclarationId(3170), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91718,7 +91755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), }); declarations.push(Declaration { - id: DeclarationId(3170), + id: DeclarationId(3171), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91732,17 +91769,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), }); declarations.push(Declaration { - id: DeclarationId(3171), + id: DeclarationId(3172), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3169), + ty: DeclarationId(3170), }, Field { label: "None".to_string(), - ty: DeclarationId(3170), + ty: DeclarationId(3171), }, ], }, @@ -91757,7 +91794,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), }); declarations.push(Declaration { - id: DeclarationId(3172), + id: DeclarationId(3173), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91776,7 +91813,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), }); declarations.push(Declaration { - id: DeclarationId(3173), + id: DeclarationId(3174), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91790,17 +91827,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), }); declarations.push(Declaration { - id: DeclarationId(3174), + id: DeclarationId(3175), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3172), + ty: DeclarationId(3173), }, Field { label: "None".to_string(), - ty: DeclarationId(3173), + ty: DeclarationId(3174), }, ], }, @@ -91815,7 +91852,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), }); declarations.push(Declaration { - id: DeclarationId(3175), + id: DeclarationId(3176), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91834,7 +91871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), }); declarations.push(Declaration { - id: DeclarationId(3176), + id: DeclarationId(3177), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91848,17 +91885,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), }); declarations.push(Declaration { - id: DeclarationId(3177), + id: DeclarationId(3178), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3175), + ty: DeclarationId(3176), }, Field { label: "None".to_string(), - ty: DeclarationId(3176), + ty: DeclarationId(3177), }, ], }, @@ -91873,7 +91910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), }); declarations.push(Declaration { - id: DeclarationId(3178), + id: DeclarationId(3179), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91892,7 +91929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), }); declarations.push(Declaration { - id: DeclarationId(3179), + id: DeclarationId(3180), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91906,17 +91943,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), }); declarations.push(Declaration { - id: DeclarationId(3180), + id: DeclarationId(3181), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3178), + ty: DeclarationId(3179), }, Field { label: "None".to_string(), - ty: DeclarationId(3179), + ty: DeclarationId(3180), }, ], }, @@ -91931,7 +91968,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), }); declarations.push(Declaration { - id: DeclarationId(3181), + id: DeclarationId(3182), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91950,7 +91987,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), }); declarations.push(Declaration { - id: DeclarationId(3182), + id: DeclarationId(3183), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91964,17 +92001,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), }); declarations.push(Declaration { - id: DeclarationId(3183), + id: DeclarationId(3184), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3181), + ty: DeclarationId(3182), }, Field { label: "None".to_string(), - ty: DeclarationId(3182), + ty: DeclarationId(3183), }, ], }, @@ -91989,7 +92026,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), }); declarations.push(Declaration { - id: DeclarationId(3184), + id: DeclarationId(3185), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92008,7 +92045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), }); declarations.push(Declaration { - id: DeclarationId(3185), + id: DeclarationId(3186), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92022,17 +92059,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), }); declarations.push(Declaration { - id: DeclarationId(3186), + id: DeclarationId(3187), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3184), + ty: DeclarationId(3185), }, Field { label: "None".to_string(), - ty: DeclarationId(3185), + ty: DeclarationId(3186), }, ], }, @@ -92047,7 +92084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), }); declarations.push(Declaration { - id: DeclarationId(3187), + id: DeclarationId(3188), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92066,7 +92103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6027, 6031), }); declarations.push(Declaration { - id: DeclarationId(3188), + id: DeclarationId(3189), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92080,17 +92117,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6027, 6031), }); declarations.push(Declaration { - id: DeclarationId(3189), + id: DeclarationId(3190), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3187), + ty: DeclarationId(3188), }, Field { label: "None".to_string(), - ty: DeclarationId(3188), + ty: DeclarationId(3189), }, ], }, @@ -92105,7 +92142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6027, 6031), }); declarations.push(Declaration { - id: DeclarationId(3190), + id: DeclarationId(3191), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92124,7 +92161,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), }); declarations.push(Declaration { - id: DeclarationId(3191), + id: DeclarationId(3192), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92138,17 +92175,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), }); declarations.push(Declaration { - id: DeclarationId(3192), + id: DeclarationId(3193), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3190), + ty: DeclarationId(3191), }, Field { label: "None".to_string(), - ty: DeclarationId(3191), + ty: DeclarationId(3192), }, ], }, @@ -92163,7 +92200,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), }); declarations.push(Declaration { - id: DeclarationId(3193), + id: DeclarationId(3194), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92182,7 +92219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), }); declarations.push(Declaration { - id: DeclarationId(3194), + id: DeclarationId(3195), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92196,17 +92233,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), }); declarations.push(Declaration { - id: DeclarationId(3195), + id: DeclarationId(3196), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3193), + ty: DeclarationId(3194), }, Field { label: "None".to_string(), - ty: DeclarationId(3194), + ty: DeclarationId(3195), }, ], }, @@ -92221,7 +92258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), }); declarations.push(Declaration { - id: DeclarationId(3196), + id: DeclarationId(3197), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92240,7 +92277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), }); declarations.push(Declaration { - id: DeclarationId(3197), + id: DeclarationId(3198), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92254,17 +92291,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), }); declarations.push(Declaration { - id: DeclarationId(3198), + id: DeclarationId(3199), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3196), + ty: DeclarationId(3197), }, Field { label: "None".to_string(), - ty: DeclarationId(3197), + ty: DeclarationId(3198), }, ], }, @@ -92279,7 +92316,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), }); declarations.push(Declaration { - id: DeclarationId(3199), + id: DeclarationId(3200), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92298,7 +92335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), }); declarations.push(Declaration { - id: DeclarationId(3200), + id: DeclarationId(3201), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92312,17 +92349,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), }); declarations.push(Declaration { - id: DeclarationId(3201), + id: DeclarationId(3202), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3199), + ty: DeclarationId(3200), }, Field { label: "None".to_string(), - ty: DeclarationId(3200), + ty: DeclarationId(3201), }, ], }, @@ -92337,7 +92374,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), }); declarations.push(Declaration { - id: DeclarationId(3202), + id: DeclarationId(3203), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92356,7 +92393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6175, 6179), }); declarations.push(Declaration { - id: DeclarationId(3203), + id: DeclarationId(3204), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92370,17 +92407,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6175, 6179), }); declarations.push(Declaration { - id: DeclarationId(3204), + id: DeclarationId(3205), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3202), + ty: DeclarationId(3203), }, Field { label: "None".to_string(), - ty: DeclarationId(3203), + ty: DeclarationId(3204), }, ], }, @@ -92395,7 +92432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6175, 6179), }); declarations.push(Declaration { - id: DeclarationId(3205), + id: DeclarationId(3206), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92414,7 +92451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6186, 6190), }); declarations.push(Declaration { - id: DeclarationId(3206), + id: DeclarationId(3207), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92428,17 +92465,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6186, 6190), }); declarations.push(Declaration { - id: DeclarationId(3207), + id: DeclarationId(3208), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3205), + ty: DeclarationId(3206), }, Field { label: "None".to_string(), - ty: DeclarationId(3206), + ty: DeclarationId(3207), }, ], }, @@ -92453,7 +92490,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6186, 6190), }); declarations.push(Declaration { - id: DeclarationId(3208), + id: DeclarationId(3209), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92472,7 +92509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7170, 7174), }); declarations.push(Declaration { - id: DeclarationId(3209), + id: DeclarationId(3210), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92486,17 +92523,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7170, 7174), }); declarations.push(Declaration { - id: DeclarationId(3210), + id: DeclarationId(3211), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3208), + ty: DeclarationId(3209), }, Field { label: "None".to_string(), - ty: DeclarationId(3209), + ty: DeclarationId(3210), }, ], }, @@ -92511,7 +92548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7170, 7174), }); declarations.push(Declaration { - id: DeclarationId(3211), + id: DeclarationId(3212), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92530,7 +92567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7253, 7260), }); declarations.push(Declaration { - id: DeclarationId(3212), + id: DeclarationId(3213), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92544,17 +92581,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7253, 7260), }); declarations.push(Declaration { - id: DeclarationId(3213), + id: DeclarationId(3214), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3211), + ty: DeclarationId(3212), }, Field { label: "None".to_string(), - ty: DeclarationId(3212), + ty: DeclarationId(3213), }, ], }, @@ -92569,7 +92606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7253, 7260), }); declarations.push(Declaration { - id: DeclarationId(3214), + id: DeclarationId(3215), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92588,7 +92625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7900, 7904), }); declarations.push(Declaration { - id: DeclarationId(3215), + id: DeclarationId(3216), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92602,17 +92639,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7900, 7904), }); declarations.push(Declaration { - id: DeclarationId(3216), + id: DeclarationId(3217), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3214), + ty: DeclarationId(3215), }, Field { label: "None".to_string(), - ty: DeclarationId(3215), + ty: DeclarationId(3216), }, ], }, @@ -94005,7 +94042,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(171), Port { id: PortId(171), - state: PortState::Resolved(TypeShape::new(DeclarationId(817))), + state: PortState::Resolved(TypeShape::new(DeclarationId(818))), produced_by: None, }, ); @@ -94045,7 +94082,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(176), Port { id: PortId(176), - state: PortState::Resolved(TypeShape::new(DeclarationId(722))), + state: PortState::Resolved(TypeShape::new(DeclarationId(723))), produced_by: Some(NodeId(173)), }, ); @@ -94053,7 +94090,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(177), Port { id: PortId(177), - state: PortState::Resolved(TypeShape::new(DeclarationId(844))), + state: PortState::Resolved(TypeShape::new(DeclarationId(845))), produced_by: None, }, ); @@ -94061,7 +94098,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(178), Port { id: PortId(178), - state: PortState::Resolved(TypeShape::new(DeclarationId(844))), + state: PortState::Resolved(TypeShape::new(DeclarationId(845))), produced_by: None, }, ); @@ -94069,7 +94106,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(179), Port { id: PortId(179), - state: PortState::Resolved(TypeShape::new(DeclarationId(722))), + state: PortState::Resolved(TypeShape::new(DeclarationId(723))), produced_by: Some(NodeId(175)), }, ); @@ -94077,7 +94114,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(180), Port { id: PortId(180), - state: PortState::Resolved(TypeShape::new(DeclarationId(722))), + state: PortState::Resolved(TypeShape::new(DeclarationId(723))), produced_by: Some(NodeId(176)), }, ); @@ -94093,7 +94130,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(182), Port { id: PortId(182), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -94109,7 +94146,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(184), Port { id: PortId(184), - state: PortState::Resolved(TypeShape::new(DeclarationId(849))), + state: PortState::Resolved(TypeShape::new(DeclarationId(850))), produced_by: Some(NodeId(180)), }, ); @@ -94117,7 +94154,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(185), Port { id: PortId(185), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -94125,7 +94162,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(186), Port { id: PortId(186), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -94149,7 +94186,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(189), Port { id: PortId(189), - state: PortState::Resolved(TypeShape::new(DeclarationId(1976))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1977))), produced_by: Some(NodeId(184)), }, ); @@ -94157,7 +94194,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(190), Port { id: PortId(190), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -94165,7 +94202,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(191), Port { id: PortId(191), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -94173,7 +94210,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(192), Port { id: PortId(192), - state: PortState::Resolved(TypeShape::new(DeclarationId(1977))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1978))), produced_by: None, }, ); @@ -94181,7 +94218,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(193), Port { id: PortId(193), - state: PortState::Resolved(TypeShape::new(DeclarationId(1978))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1979))), produced_by: Some(NodeId(186)), }, ); @@ -94189,7 +94226,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(194), Port { id: PortId(194), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -94237,7 +94274,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(200), Port { id: PortId(200), - state: PortState::Resolved(TypeShape::new(DeclarationId(847))), + state: PortState::Resolved(TypeShape::new(DeclarationId(848))), produced_by: None, }, ); @@ -94309,7 +94346,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(209), Port { id: PortId(209), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -94317,7 +94354,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(210), Port { id: PortId(210), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -94341,7 +94378,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(213), Port { id: PortId(213), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: Some(NodeId(203)), }, ); @@ -94349,7 +94386,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(214), Port { id: PortId(214), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -94357,7 +94394,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(215), Port { id: PortId(215), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -94381,7 +94418,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(218), Port { id: PortId(218), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: Some(NodeId(207)), }, ); @@ -94389,7 +94426,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(219), Port { id: PortId(219), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -94397,7 +94434,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(220), Port { id: PortId(220), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -94421,7 +94458,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(223), Port { id: PortId(223), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: Some(NodeId(211)), }, ); @@ -94429,7 +94466,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(224), Port { id: PortId(224), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -94437,7 +94474,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(225), Port { id: PortId(225), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -94461,7 +94498,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(228), Port { id: PortId(228), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: Some(NodeId(215)), }, ); @@ -94469,7 +94506,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(229), Port { id: PortId(229), - state: PortState::Resolved(TypeShape::new(DeclarationId(1979))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1980))), produced_by: None, }, ); @@ -94493,7 +94530,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(232), Port { id: PortId(232), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: Some(NodeId(219)), }, ); @@ -94501,7 +94538,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(233), Port { id: PortId(233), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -94509,7 +94546,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(234), Port { id: PortId(234), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -95213,7 +95250,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(322), Port { id: PortId(322), - state: PortState::Resolved(TypeShape::new(DeclarationId(844))), + state: PortState::Resolved(TypeShape::new(DeclarationId(845))), produced_by: None, }, ); @@ -95221,7 +95258,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(323), Port { id: PortId(323), - state: PortState::Resolved(TypeShape::new(DeclarationId(844))), + state: PortState::Resolved(TypeShape::new(DeclarationId(845))), produced_by: None, }, ); @@ -95237,7 +95274,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(325), Port { id: PortId(325), - state: PortState::Resolved(TypeShape::new(DeclarationId(864))), + state: PortState::Resolved(TypeShape::new(DeclarationId(865))), produced_by: None, }, ); @@ -95245,7 +95282,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(326), Port { id: PortId(326), - state: PortState::Resolved(TypeShape::new(DeclarationId(864))), + state: PortState::Resolved(TypeShape::new(DeclarationId(865))), produced_by: None, }, ); @@ -95869,7 +95906,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(404), Port { id: PortId(404), - state: PortState::Resolved(TypeShape::new(DeclarationId(864))), + state: PortState::Resolved(TypeShape::new(DeclarationId(865))), produced_by: None, }, ); @@ -95877,7 +95914,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(405), Port { id: PortId(405), - state: PortState::Resolved(TypeShape::new(DeclarationId(864))), + state: PortState::Resolved(TypeShape::new(DeclarationId(865))), produced_by: None, }, ); @@ -95893,7 +95930,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(407), Port { id: PortId(407), - state: PortState::Resolved(TypeShape::new(DeclarationId(864))), + state: PortState::Resolved(TypeShape::new(DeclarationId(865))), produced_by: Some(NodeId(347)), }, ); @@ -95901,7 +95938,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(408), Port { id: PortId(408), - state: PortState::Resolved(TypeShape::new(DeclarationId(864))), + state: PortState::Resolved(TypeShape::new(DeclarationId(865))), produced_by: None, }, ); @@ -95909,7 +95946,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(409), Port { id: PortId(409), - state: PortState::Resolved(TypeShape::new(DeclarationId(864))), + state: PortState::Resolved(TypeShape::new(DeclarationId(865))), produced_by: None, }, ); @@ -95925,7 +95962,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(411), Port { id: PortId(411), - state: PortState::Resolved(TypeShape::new(DeclarationId(864))), + state: PortState::Resolved(TypeShape::new(DeclarationId(865))), produced_by: Some(NodeId(350)), }, ); @@ -95933,7 +95970,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(412), Port { id: PortId(412), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -96013,7 +96050,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(422), Port { id: PortId(422), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: Some(NodeId(359)), }, ); @@ -96021,7 +96058,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(423), Port { id: PortId(423), - state: PortState::Resolved(TypeShape::new(DeclarationId(1980))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1981))), produced_by: None, }, ); @@ -96029,7 +96066,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(424), Port { id: PortId(424), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: Some(NodeId(361)), }, ); @@ -96037,7 +96074,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(425), Port { id: PortId(425), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: Some(NodeId(362)), }, ); @@ -96045,7 +96082,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(426), Port { id: PortId(426), - state: PortState::Resolved(TypeShape::new(DeclarationId(1977))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1978))), produced_by: Some(NodeId(363)), }, ); @@ -96061,7 +96098,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(428), Port { id: PortId(428), - state: PortState::Resolved(TypeShape::new(DeclarationId(1981))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1982))), produced_by: Some(NodeId(365)), }, ); @@ -96069,7 +96106,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(429), Port { id: PortId(429), - state: PortState::Resolved(TypeShape::new(DeclarationId(1982))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1983))), produced_by: None, }, ); @@ -96173,7 +96210,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(442), Port { id: PortId(442), - state: PortState::Resolved(TypeShape::new(DeclarationId(1983))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1984))), produced_by: Some(NodeId(378)), }, ); @@ -96181,7 +96218,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(443), Port { id: PortId(443), - state: PortState::Resolved(TypeShape::new(DeclarationId(1984))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1985))), produced_by: None, }, ); @@ -96229,7 +96266,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(449), Port { id: PortId(449), - state: PortState::Resolved(TypeShape::new(DeclarationId(1985))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1986))), produced_by: Some(NodeId(385)), }, ); @@ -96237,7 +96274,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(450), Port { id: PortId(450), - state: PortState::Resolved(TypeShape::new(DeclarationId(1986))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1987))), produced_by: None, }, ); @@ -96317,7 +96354,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(460), Port { id: PortId(460), - state: PortState::Resolved(TypeShape::new(DeclarationId(1987))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1988))), produced_by: None, }, ); @@ -96421,7 +96458,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(473), Port { id: PortId(473), - state: PortState::Resolved(TypeShape::new(DeclarationId(1988))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1989))), produced_by: Some(NodeId(407)), }, ); @@ -96429,7 +96466,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(474), Port { id: PortId(474), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -96565,7 +96602,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(491), Port { id: PortId(491), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -96701,7 +96738,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(508), Port { id: PortId(508), - state: PortState::Resolved(TypeShape::new(DeclarationId(1989))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1990))), produced_by: None, }, ); @@ -96805,7 +96842,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(521), Port { id: PortId(521), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: Some(NodeId(439)), }, ); @@ -96813,7 +96850,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(522), Port { id: PortId(522), - state: PortState::Resolved(TypeShape::new(DeclarationId(1990))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1991))), produced_by: None, }, ); @@ -96917,7 +96954,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(535), Port { id: PortId(535), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: Some(NodeId(451)), }, ); @@ -96925,7 +96962,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(536), Port { id: PortId(536), - state: PortState::Resolved(TypeShape::new(DeclarationId(1991))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1992))), produced_by: None, }, ); @@ -97077,7 +97114,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(555), Port { id: PortId(555), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: Some(NodeId(468)), }, ); @@ -97085,7 +97122,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(556), Port { id: PortId(556), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -97093,7 +97130,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(557), Port { id: PortId(557), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -97213,7 +97250,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(572), Port { id: PortId(572), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: Some(NodeId(477)), }, ); @@ -97221,7 +97258,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(573), Port { id: PortId(573), - state: PortState::Resolved(TypeShape::new(DeclarationId(844))), + state: PortState::Resolved(TypeShape::new(DeclarationId(845))), produced_by: None, }, ); @@ -97229,7 +97266,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(574), Port { id: PortId(574), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -97237,7 +97274,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(575), Port { id: PortId(575), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -97357,7 +97394,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(590), Port { id: PortId(590), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: Some(NodeId(486)), }, ); @@ -97365,7 +97402,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(591), Port { id: PortId(591), - state: PortState::Resolved(TypeShape::new(DeclarationId(844))), + state: PortState::Resolved(TypeShape::new(DeclarationId(845))), produced_by: None, }, ); @@ -97373,7 +97410,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(592), Port { id: PortId(592), - state: PortState::Resolved(TypeShape::new(DeclarationId(844))), + state: PortState::Resolved(TypeShape::new(DeclarationId(845))), produced_by: None, }, ); @@ -97381,7 +97418,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(593), Port { id: PortId(593), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -97389,7 +97426,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(594), Port { id: PortId(594), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -97421,7 +97458,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(598), Port { id: PortId(598), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: Some(NodeId(491)), }, ); @@ -97429,7 +97466,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(599), Port { id: PortId(599), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -97437,7 +97474,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(600), Port { id: PortId(600), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -97453,7 +97490,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(602), Port { id: PortId(602), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: Some(NodeId(494)), }, ); @@ -97461,7 +97498,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(603), Port { id: PortId(603), - state: PortState::Resolved(TypeShape::new(DeclarationId(849))), + state: PortState::Resolved(TypeShape::new(DeclarationId(850))), produced_by: None, }, ); @@ -97469,7 +97506,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(604), Port { id: PortId(604), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -97485,7 +97522,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(606), Port { id: PortId(606), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: Some(NodeId(497)), }, ); @@ -97509,7 +97546,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(609), Port { id: PortId(609), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: Some(NodeId(500)), }, ); @@ -97517,7 +97554,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(610), Port { id: PortId(610), - state: PortState::Resolved(TypeShape::new(DeclarationId(849))), + state: PortState::Resolved(TypeShape::new(DeclarationId(850))), produced_by: Some(NodeId(501)), }, ); @@ -97525,7 +97562,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(611), Port { id: PortId(611), - state: PortState::Resolved(TypeShape::new(DeclarationId(849))), + state: PortState::Resolved(TypeShape::new(DeclarationId(850))), produced_by: None, }, ); @@ -97541,7 +97578,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(613), Port { id: PortId(613), - state: PortState::Resolved(TypeShape::new(DeclarationId(1992))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1993))), produced_by: None, }, ); @@ -97549,7 +97586,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(614), Port { id: PortId(614), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -97653,7 +97690,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(627), Port { id: PortId(627), - state: PortState::Resolved(TypeShape::new(DeclarationId(1993))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1994))), produced_by: Some(NodeId(516)), }, ); @@ -97661,7 +97698,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(628), Port { id: PortId(628), - state: PortState::Resolved(TypeShape::new(DeclarationId(1994))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1995))), produced_by: None, }, ); @@ -97669,7 +97706,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(629), Port { id: PortId(629), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: None, }, ); @@ -97717,7 +97754,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(635), Port { id: PortId(635), - state: PortState::Resolved(TypeShape::new(DeclarationId(1995))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1996))), produced_by: Some(NodeId(523)), }, ); @@ -97725,7 +97762,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(636), Port { id: PortId(636), - state: PortState::Resolved(TypeShape::new(DeclarationId(1996))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1997))), produced_by: None, }, ); @@ -97741,7 +97778,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(638), Port { id: PortId(638), - state: PortState::Resolved(TypeShape::new(DeclarationId(1997))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1998))), produced_by: Some(NodeId(526)), }, ); @@ -97749,7 +97786,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(639), Port { id: PortId(639), - state: PortState::Resolved(TypeShape::new(DeclarationId(1076))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1077))), produced_by: None, }, ); @@ -97909,7 +97946,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(659), Port { id: PortId(659), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: Some(NodeId(543)), }, ); @@ -97917,7 +97954,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(660), Port { id: PortId(660), - state: PortState::Resolved(TypeShape::new(DeclarationId(1075))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1076))), produced_by: None, }, ); @@ -97997,7 +98034,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(670), Port { id: PortId(670), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: Some(NodeId(552)), }, ); @@ -98005,7 +98042,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(671), Port { id: PortId(671), - state: PortState::Resolved(TypeShape::new(DeclarationId(2319))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2320))), produced_by: None, }, ); @@ -98013,7 +98050,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(672), Port { id: PortId(672), - state: PortState::Resolved(TypeShape::new(DeclarationId(848))), + state: PortState::Resolved(TypeShape::new(DeclarationId(849))), produced_by: Some(NodeId(554)), }, ); @@ -98021,7 +98058,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(673), Port { id: PortId(673), - state: PortState::Resolved(TypeShape::new(DeclarationId(827))), + state: PortState::Resolved(TypeShape::new(DeclarationId(828))), produced_by: None, }, ); @@ -98029,7 +98066,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(674), Port { id: PortId(674), - state: PortState::Resolved(TypeShape::new(DeclarationId(826))), + state: PortState::Resolved(TypeShape::new(DeclarationId(827))), produced_by: None, }, ); @@ -98437,7 +98474,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(725), Port { id: PortId(725), - state: PortState::Resolved(TypeShape::new(DeclarationId(2463))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2464))), produced_by: Some(NodeId(596)), }, ); @@ -98445,7 +98482,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(726), Port { id: PortId(726), - state: PortState::Resolved(TypeShape::new(DeclarationId(827))), + state: PortState::Resolved(TypeShape::new(DeclarationId(828))), produced_by: None, }, ); @@ -98453,7 +98490,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(727), Port { id: PortId(727), - state: PortState::Resolved(TypeShape::new(DeclarationId(826))), + state: PortState::Resolved(TypeShape::new(DeclarationId(827))), produced_by: None, }, ); @@ -98461,7 +98498,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(728), Port { id: PortId(728), - state: PortState::Resolved(TypeShape::new(DeclarationId(2464))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2465))), produced_by: Some(NodeId(598)), }, ); @@ -98469,7 +98506,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(729), Port { id: PortId(729), - state: PortState::Resolved(TypeShape::new(DeclarationId(2465))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2466))), produced_by: Some(NodeId(600)), }, ); @@ -98477,7 +98514,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(730), Port { id: PortId(730), - state: PortState::Resolved(TypeShape::new(DeclarationId(2466))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2467))), produced_by: Some(NodeId(602)), }, ); @@ -98485,7 +98522,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(731), Port { id: PortId(731), - state: PortState::Resolved(TypeShape::new(DeclarationId(2467))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2468))), produced_by: Some(NodeId(604)), }, ); @@ -98493,7 +98530,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(732), Port { id: PortId(732), - state: PortState::Resolved(TypeShape::new(DeclarationId(2468))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2469))), produced_by: Some(NodeId(606)), }, ); @@ -98501,7 +98538,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(733), Port { id: PortId(733), - state: PortState::Resolved(TypeShape::new(DeclarationId(2469))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2470))), produced_by: Some(NodeId(608)), }, ); @@ -98509,7 +98546,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(734), Port { id: PortId(734), - state: PortState::Resolved(TypeShape::new(DeclarationId(2471))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2472))), produced_by: Some(NodeId(610)), }, ); @@ -98517,7 +98554,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(735), Port { id: PortId(735), - state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), produced_by: None, }, ); @@ -98541,7 +98578,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(738), Port { id: PortId(738), - state: PortState::Resolved(TypeShape::new(DeclarationId(2473))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2474))), produced_by: Some(NodeId(614)), }, ); @@ -98549,7 +98586,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(739), Port { id: PortId(739), - state: PortState::Resolved(TypeShape::new(DeclarationId(973))), + state: PortState::Resolved(TypeShape::new(DeclarationId(974))), produced_by: None, }, ); @@ -98565,7 +98602,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(741), Port { id: PortId(741), - state: PortState::Resolved(TypeShape::new(DeclarationId(2474))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2475))), produced_by: Some(NodeId(617)), }, ); @@ -98573,7 +98610,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(742), Port { id: PortId(742), - state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), produced_by: None, }, ); @@ -98597,7 +98634,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(745), Port { id: PortId(745), - state: PortState::Resolved(TypeShape::new(DeclarationId(2475))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2476))), produced_by: Some(NodeId(621)), }, ); @@ -98605,7 +98642,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(746), Port { id: PortId(746), - state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), produced_by: None, }, ); @@ -98613,7 +98650,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(747), Port { id: PortId(747), - state: PortState::Resolved(TypeShape::new(DeclarationId(973))), + state: PortState::Resolved(TypeShape::new(DeclarationId(974))), produced_by: None, }, ); @@ -98645,7 +98682,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(751), Port { id: PortId(751), - state: PortState::Resolved(TypeShape::new(DeclarationId(2476))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2477))), produced_by: Some(NodeId(626)), }, ); @@ -98653,7 +98690,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(752), Port { id: PortId(752), - state: PortState::Resolved(TypeShape::new(DeclarationId(827))), + state: PortState::Resolved(TypeShape::new(DeclarationId(828))), produced_by: None, }, ); @@ -98661,7 +98698,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(753), Port { id: PortId(753), - state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), produced_by: None, }, ); @@ -98717,7 +98754,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(760), Port { id: PortId(760), - state: PortState::Resolved(TypeShape::new(DeclarationId(2477))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2478))), produced_by: Some(NodeId(633)), }, ); @@ -98725,7 +98762,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(761), Port { id: PortId(761), - state: PortState::Resolved(TypeShape::new(DeclarationId(827))), + state: PortState::Resolved(TypeShape::new(DeclarationId(828))), produced_by: None, }, ); @@ -98733,7 +98770,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(762), Port { id: PortId(762), - state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), produced_by: None, }, ); @@ -98741,7 +98778,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(763), Port { id: PortId(763), - state: PortState::Resolved(TypeShape::new(DeclarationId(973))), + state: PortState::Resolved(TypeShape::new(DeclarationId(974))), produced_by: None, }, ); @@ -98797,7 +98834,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(770), Port { id: PortId(770), - state: PortState::Resolved(TypeShape::new(DeclarationId(2478))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2479))), produced_by: Some(NodeId(640)), }, ); @@ -98805,7 +98842,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(771), Port { id: PortId(771), - state: PortState::Resolved(TypeShape::new(DeclarationId(827))), + state: PortState::Resolved(TypeShape::new(DeclarationId(828))), produced_by: None, }, ); @@ -98813,7 +98850,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(772), Port { id: PortId(772), - state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), produced_by: None, }, ); @@ -98821,7 +98858,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(773), Port { id: PortId(773), - state: PortState::Resolved(TypeShape::new(DeclarationId(977))), + state: PortState::Resolved(TypeShape::new(DeclarationId(978))), produced_by: None, }, ); @@ -98861,7 +98898,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(778), Port { id: PortId(778), - state: PortState::Resolved(TypeShape::new(DeclarationId(2479))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2480))), produced_by: Some(NodeId(645)), }, ); @@ -98869,7 +98906,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(779), Port { id: PortId(779), - state: PortState::Resolved(TypeShape::new(DeclarationId(827))), + state: PortState::Resolved(TypeShape::new(DeclarationId(828))), produced_by: None, }, ); @@ -98877,7 +98914,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(780), Port { id: PortId(780), - state: PortState::Resolved(TypeShape::new(DeclarationId(2480))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2481))), produced_by: None, }, ); @@ -98965,7 +99002,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(791), Port { id: PortId(791), - state: PortState::Resolved(TypeShape::new(DeclarationId(2481))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2482))), produced_by: Some(NodeId(655)), }, ); @@ -98973,7 +99010,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(792), Port { id: PortId(792), - state: PortState::Resolved(TypeShape::new(DeclarationId(827))), + state: PortState::Resolved(TypeShape::new(DeclarationId(828))), produced_by: None, }, ); @@ -98981,7 +99018,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(793), Port { id: PortId(793), - state: PortState::Resolved(TypeShape::new(DeclarationId(826))), + state: PortState::Resolved(TypeShape::new(DeclarationId(827))), produced_by: None, }, ); @@ -99037,7 +99074,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(800), Port { id: PortId(800), - state: PortState::Resolved(TypeShape::new(DeclarationId(2482))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2483))), produced_by: Some(NodeId(663)), }, ); @@ -99053,7 +99090,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(802), Port { id: PortId(802), - state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), produced_by: Some(NodeId(667)), }, ); @@ -99061,7 +99098,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(803), Port { id: PortId(803), - state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), produced_by: None, }, ); @@ -99069,7 +99106,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(804), Port { id: PortId(804), - state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), produced_by: None, }, ); @@ -99357,7 +99394,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(840), Port { id: PortId(840), - state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), produced_by: Some(NodeId(699)), }, ); @@ -99365,7 +99402,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(841), Port { id: PortId(841), - state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), produced_by: None, }, ); @@ -99373,7 +99410,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(842), Port { id: PortId(842), - state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), produced_by: None, }, ); @@ -99389,7 +99426,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(844), Port { id: PortId(844), - state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), produced_by: Some(NodeId(702)), }, ); @@ -99405,7 +99442,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(846), Port { id: PortId(846), - state: PortState::Resolved(TypeShape::new(DeclarationId(1227))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), produced_by: Some(NodeId(705)), }, ); @@ -99421,7 +99458,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(848), Port { id: PortId(848), - state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), produced_by: Some(NodeId(708)), }, ); @@ -99429,7 +99466,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(849), Port { id: PortId(849), - state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), produced_by: None, }, ); @@ -99437,7 +99474,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(850), Port { id: PortId(850), - state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), produced_by: None, }, ); @@ -99453,7 +99490,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(852), Port { id: PortId(852), - state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), produced_by: Some(NodeId(711)), }, ); @@ -99461,7 +99498,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(853), Port { id: PortId(853), - state: PortState::Resolved(TypeShape::new(DeclarationId(2539))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2540))), produced_by: Some(NodeId(713)), }, ); @@ -99469,7 +99506,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(854), Port { id: PortId(854), - state: PortState::Resolved(TypeShape::new(DeclarationId(826))), + state: PortState::Resolved(TypeShape::new(DeclarationId(827))), produced_by: None, }, ); @@ -99605,7 +99642,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(871), Port { id: PortId(871), - state: PortState::Resolved(TypeShape::new(DeclarationId(973))), + state: PortState::Resolved(TypeShape::new(DeclarationId(974))), produced_by: Some(NodeId(725)), }, ); @@ -99645,7 +99682,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(876), Port { id: PortId(876), - state: PortState::Resolved(TypeShape::new(DeclarationId(827))), + state: PortState::Resolved(TypeShape::new(DeclarationId(828))), produced_by: None, }, ); @@ -99669,7 +99706,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(879), Port { id: PortId(879), - state: PortState::Resolved(TypeShape::new(DeclarationId(1966))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1967))), produced_by: Some(NodeId(733)), }, ); @@ -99789,7 +99826,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(894), Port { id: PortId(894), - state: PortState::Resolved(TypeShape::new(DeclarationId(977))), + state: PortState::Resolved(TypeShape::new(DeclarationId(978))), produced_by: Some(NodeId(746)), }, ); @@ -99797,7 +99834,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(895), Port { id: PortId(895), - state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), produced_by: None, }, ); @@ -99805,7 +99842,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(896), Port { id: PortId(896), - state: PortState::Resolved(TypeShape::new(DeclarationId(817))), + state: PortState::Resolved(TypeShape::new(DeclarationId(818))), produced_by: None, }, ); @@ -99893,7 +99930,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(907), Port { id: PortId(907), - state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), produced_by: Some(NodeId(755)), }, ); @@ -99901,7 +99938,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(908), Port { id: PortId(908), - state: PortState::Resolved(TypeShape::new(DeclarationId(827))), + state: PortState::Resolved(TypeShape::new(DeclarationId(828))), produced_by: None, }, ); @@ -99909,7 +99946,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(909), Port { id: PortId(909), - state: PortState::Resolved(TypeShape::new(DeclarationId(826))), + state: PortState::Resolved(TypeShape::new(DeclarationId(827))), produced_by: None, }, ); @@ -100237,7 +100274,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(950), Port { id: PortId(950), - state: PortState::Resolved(TypeShape::new(DeclarationId(2540))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2541))), produced_by: Some(NodeId(792)), }, ); @@ -100245,7 +100282,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(951), Port { id: PortId(951), - state: PortState::Resolved(TypeShape::new(DeclarationId(827))), + state: PortState::Resolved(TypeShape::new(DeclarationId(828))), produced_by: None, }, ); @@ -100253,7 +100290,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(952), Port { id: PortId(952), - state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), produced_by: None, }, ); @@ -100365,7 +100402,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(966), Port { id: PortId(966), - state: PortState::Resolved(TypeShape::new(DeclarationId(977))), + state: PortState::Resolved(TypeShape::new(DeclarationId(978))), produced_by: Some(NodeId(806)), }, ); @@ -100373,7 +100410,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(967), Port { id: PortId(967), - state: PortState::Resolved(TypeShape::new(DeclarationId(827))), + state: PortState::Resolved(TypeShape::new(DeclarationId(828))), produced_by: None, }, ); @@ -100381,7 +100418,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(968), Port { id: PortId(968), - state: PortState::Resolved(TypeShape::new(DeclarationId(2700))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2701))), produced_by: Some(NodeId(808)), }, ); @@ -100389,7 +100426,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(969), Port { id: PortId(969), - state: PortState::Resolved(TypeShape::new(DeclarationId(805))), + state: PortState::Resolved(TypeShape::new(DeclarationId(806))), produced_by: None, }, ); @@ -100549,7 +100586,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(989), Port { id: PortId(989), - state: PortState::Resolved(TypeShape::new(DeclarationId(805))), + state: PortState::Resolved(TypeShape::new(DeclarationId(806))), produced_by: None, }, ); @@ -100720,130 +100757,130 @@ fn bootstrapped_fixture_dag_clusters() -> Vec { fn bootstrapped_fixture_dag_optional_match_disjs() -> HashMap { { let mut map = HashMap::new(); - map.insert(DeclarationId(389), DeclarationId(2847)); - map.insert(DeclarationId(391), DeclarationId(2850)); - map.insert(DeclarationId(423), DeclarationId(2853)); - map.insert(DeclarationId(426), DeclarationId(2856)); - map.insert(DeclarationId(471), DeclarationId(2859)); - map.insert(DeclarationId(472), DeclarationId(2862)); - map.insert(DeclarationId(473), DeclarationId(2865)); - map.insert(DeclarationId(513), DeclarationId(2868)); - map.insert(DeclarationId(515), DeclarationId(2871)); - map.insert(DeclarationId(516), DeclarationId(2874)); - map.insert(DeclarationId(539), DeclarationId(2877)); - map.insert(DeclarationId(582), DeclarationId(2880)); - map.insert(DeclarationId(602), DeclarationId(2883)); - map.insert(DeclarationId(603), DeclarationId(2886)); - map.insert(DeclarationId(605), DeclarationId(2889)); - map.insert(DeclarationId(608), DeclarationId(2892)); - map.insert(DeclarationId(613), DeclarationId(2895)); - map.insert(DeclarationId(614), DeclarationId(2898)); - map.insert(DeclarationId(618), DeclarationId(2901)); - map.insert(DeclarationId(619), DeclarationId(2904)); - map.insert(DeclarationId(620), DeclarationId(2907)); - map.insert(DeclarationId(625), DeclarationId(2910)); - map.insert(DeclarationId(1787), DeclarationId(2913)); - map.insert(DeclarationId(1791), DeclarationId(2916)); - map.insert(DeclarationId(1794), DeclarationId(2919)); - map.insert(DeclarationId(1796), DeclarationId(2922)); - map.insert(DeclarationId(1797), DeclarationId(2925)); - map.insert(DeclarationId(1798), DeclarationId(2928)); - map.insert(DeclarationId(1852), DeclarationId(2931)); - map.insert(DeclarationId(1853), DeclarationId(2934)); - map.insert(DeclarationId(1854), DeclarationId(2937)); - map.insert(DeclarationId(1855), DeclarationId(2940)); - map.insert(DeclarationId(1856), DeclarationId(2943)); - map.insert(DeclarationId(1857), DeclarationId(2946)); - map.insert(DeclarationId(1863), DeclarationId(2949)); - map.insert(DeclarationId(1918), DeclarationId(2952)); - map.insert(DeclarationId(1921), DeclarationId(2955)); - map.insert(DeclarationId(1922), DeclarationId(2958)); - map.insert(DeclarationId(1923), DeclarationId(2961)); - map.insert(DeclarationId(1924), DeclarationId(2964)); - map.insert(DeclarationId(1947), DeclarationId(2967)); - map.insert(DeclarationId(1952), DeclarationId(2970)); - map.insert(DeclarationId(1956), DeclarationId(2973)); - map.insert(DeclarationId(1959), DeclarationId(2976)); - map.insert(DeclarationId(1960), DeclarationId(2979)); - map.insert(DeclarationId(2005), DeclarationId(2982)); - map.insert(DeclarationId(2006), DeclarationId(2985)); - map.insert(DeclarationId(2007), DeclarationId(2988)); - map.insert(DeclarationId(2008), DeclarationId(2991)); - map.insert(DeclarationId(2058), DeclarationId(2994)); - map.insert(DeclarationId(2059), DeclarationId(2997)); - map.insert(DeclarationId(2073), DeclarationId(3000)); - map.insert(DeclarationId(2074), DeclarationId(3003)); - map.insert(DeclarationId(2085), DeclarationId(3006)); - map.insert(DeclarationId(2086), DeclarationId(3009)); - map.insert(DeclarationId(2088), DeclarationId(3012)); - map.insert(DeclarationId(2089), DeclarationId(3015)); - map.insert(DeclarationId(2091), DeclarationId(3018)); - map.insert(DeclarationId(2092), DeclarationId(3021)); - map.insert(DeclarationId(2094), DeclarationId(3024)); - map.insert(DeclarationId(2096), DeclarationId(3027)); - map.insert(DeclarationId(2099), DeclarationId(3030)); - map.insert(DeclarationId(2103), DeclarationId(3033)); - map.insert(DeclarationId(2105), DeclarationId(3036)); - map.insert(DeclarationId(2107), DeclarationId(3039)); - map.insert(DeclarationId(2117), DeclarationId(3042)); - map.insert(DeclarationId(2118), DeclarationId(3045)); - map.insert(DeclarationId(2119), DeclarationId(3048)); - map.insert(DeclarationId(2122), DeclarationId(3051)); - map.insert(DeclarationId(2123), DeclarationId(3054)); - map.insert(DeclarationId(2158), DeclarationId(3057)); - map.insert(DeclarationId(2159), DeclarationId(3060)); - map.insert(DeclarationId(2160), DeclarationId(3063)); - map.insert(DeclarationId(2161), DeclarationId(3066)); - map.insert(DeclarationId(2162), DeclarationId(3069)); - map.insert(DeclarationId(2185), DeclarationId(3072)); - map.insert(DeclarationId(2315), DeclarationId(3075)); - map.insert(DeclarationId(2316), DeclarationId(3078)); - map.insert(DeclarationId(2322), DeclarationId(3081)); - map.insert(DeclarationId(2323), DeclarationId(3084)); - map.insert(DeclarationId(2324), DeclarationId(3087)); - map.insert(DeclarationId(2325), DeclarationId(3090)); - map.insert(DeclarationId(2326), DeclarationId(3093)); - map.insert(DeclarationId(2327), DeclarationId(3096)); - map.insert(DeclarationId(2377), DeclarationId(3099)); - map.insert(DeclarationId(2421), DeclarationId(3102)); - map.insert(DeclarationId(2429), DeclarationId(3105)); - map.insert(DeclarationId(2443), DeclarationId(3108)); - map.insert(DeclarationId(2446), DeclarationId(3111)); - map.insert(DeclarationId(2504), DeclarationId(3114)); - map.insert(DeclarationId(2505), DeclarationId(3117)); - map.insert(DeclarationId(2506), DeclarationId(3120)); - map.insert(DeclarationId(2509), DeclarationId(3123)); - map.insert(DeclarationId(2510), DeclarationId(3126)); - map.insert(DeclarationId(2704), DeclarationId(3129)); - map.insert(DeclarationId(2733), DeclarationId(3132)); - map.insert(DeclarationId(2739), DeclarationId(3135)); - map.insert(DeclarationId(2746), DeclarationId(3138)); - map.insert(DeclarationId(2765), DeclarationId(3141)); - map.insert(DeclarationId(2766), DeclarationId(3144)); - map.insert(DeclarationId(2774), DeclarationId(3147)); - map.insert(DeclarationId(2778), DeclarationId(3150)); - map.insert(DeclarationId(2779), DeclarationId(3153)); - map.insert(DeclarationId(2780), DeclarationId(3156)); - map.insert(DeclarationId(2781), DeclarationId(3159)); - map.insert(DeclarationId(2791), DeclarationId(3162)); - map.insert(DeclarationId(2793), DeclarationId(3165)); - map.insert(DeclarationId(2794), DeclarationId(3168)); - map.insert(DeclarationId(2795), DeclarationId(3171)); - map.insert(DeclarationId(2797), DeclarationId(3174)); - map.insert(DeclarationId(2800), DeclarationId(3177)); - map.insert(DeclarationId(2801), DeclarationId(3180)); - map.insert(DeclarationId(2808), DeclarationId(3183)); - map.insert(DeclarationId(2809), DeclarationId(3186)); - map.insert(DeclarationId(2810), DeclarationId(3189)); - map.insert(DeclarationId(2812), DeclarationId(3192)); - map.insert(DeclarationId(2813), DeclarationId(3195)); - map.insert(DeclarationId(2814), DeclarationId(3198)); - map.insert(DeclarationId(2816), DeclarationId(3201)); - map.insert(DeclarationId(2817), DeclarationId(3204)); - map.insert(DeclarationId(2818), DeclarationId(3207)); - map.insert(DeclarationId(2825), DeclarationId(3210)); - map.insert(DeclarationId(2827), DeclarationId(3213)); - map.insert(DeclarationId(2838), DeclarationId(3216)); + map.insert(DeclarationId(389), DeclarationId(2848)); + map.insert(DeclarationId(391), DeclarationId(2851)); + map.insert(DeclarationId(423), DeclarationId(2854)); + map.insert(DeclarationId(426), DeclarationId(2857)); + map.insert(DeclarationId(471), DeclarationId(2860)); + map.insert(DeclarationId(472), DeclarationId(2863)); + map.insert(DeclarationId(473), DeclarationId(2866)); + map.insert(DeclarationId(513), DeclarationId(2869)); + map.insert(DeclarationId(515), DeclarationId(2872)); + map.insert(DeclarationId(516), DeclarationId(2875)); + map.insert(DeclarationId(539), DeclarationId(2878)); + map.insert(DeclarationId(582), DeclarationId(2881)); + map.insert(DeclarationId(602), DeclarationId(2884)); + map.insert(DeclarationId(603), DeclarationId(2887)); + map.insert(DeclarationId(605), DeclarationId(2890)); + map.insert(DeclarationId(608), DeclarationId(2893)); + map.insert(DeclarationId(613), DeclarationId(2896)); + map.insert(DeclarationId(614), DeclarationId(2899)); + map.insert(DeclarationId(618), DeclarationId(2902)); + map.insert(DeclarationId(619), DeclarationId(2905)); + map.insert(DeclarationId(620), DeclarationId(2908)); + map.insert(DeclarationId(625), DeclarationId(2911)); + map.insert(DeclarationId(1788), DeclarationId(2914)); + map.insert(DeclarationId(1792), DeclarationId(2917)); + map.insert(DeclarationId(1795), DeclarationId(2920)); + map.insert(DeclarationId(1797), DeclarationId(2923)); + map.insert(DeclarationId(1798), DeclarationId(2926)); + map.insert(DeclarationId(1799), DeclarationId(2929)); + map.insert(DeclarationId(1853), DeclarationId(2932)); + map.insert(DeclarationId(1854), DeclarationId(2935)); + map.insert(DeclarationId(1855), DeclarationId(2938)); + map.insert(DeclarationId(1856), DeclarationId(2941)); + map.insert(DeclarationId(1857), DeclarationId(2944)); + map.insert(DeclarationId(1858), DeclarationId(2947)); + map.insert(DeclarationId(1864), DeclarationId(2950)); + map.insert(DeclarationId(1919), DeclarationId(2953)); + map.insert(DeclarationId(1922), DeclarationId(2956)); + map.insert(DeclarationId(1923), DeclarationId(2959)); + map.insert(DeclarationId(1924), DeclarationId(2962)); + map.insert(DeclarationId(1925), DeclarationId(2965)); + map.insert(DeclarationId(1948), DeclarationId(2968)); + map.insert(DeclarationId(1953), DeclarationId(2971)); + map.insert(DeclarationId(1957), DeclarationId(2974)); + map.insert(DeclarationId(1960), DeclarationId(2977)); + map.insert(DeclarationId(1961), DeclarationId(2980)); + map.insert(DeclarationId(2006), DeclarationId(2983)); + map.insert(DeclarationId(2007), DeclarationId(2986)); + map.insert(DeclarationId(2008), DeclarationId(2989)); + map.insert(DeclarationId(2009), DeclarationId(2992)); + map.insert(DeclarationId(2059), DeclarationId(2995)); + map.insert(DeclarationId(2060), DeclarationId(2998)); + map.insert(DeclarationId(2074), DeclarationId(3001)); + map.insert(DeclarationId(2075), DeclarationId(3004)); + map.insert(DeclarationId(2086), DeclarationId(3007)); + map.insert(DeclarationId(2087), DeclarationId(3010)); + map.insert(DeclarationId(2089), DeclarationId(3013)); + map.insert(DeclarationId(2090), DeclarationId(3016)); + map.insert(DeclarationId(2092), DeclarationId(3019)); + map.insert(DeclarationId(2093), DeclarationId(3022)); + map.insert(DeclarationId(2095), DeclarationId(3025)); + map.insert(DeclarationId(2097), DeclarationId(3028)); + map.insert(DeclarationId(2100), DeclarationId(3031)); + map.insert(DeclarationId(2104), DeclarationId(3034)); + map.insert(DeclarationId(2106), DeclarationId(3037)); + map.insert(DeclarationId(2108), DeclarationId(3040)); + map.insert(DeclarationId(2118), DeclarationId(3043)); + map.insert(DeclarationId(2119), DeclarationId(3046)); + map.insert(DeclarationId(2120), DeclarationId(3049)); + map.insert(DeclarationId(2123), DeclarationId(3052)); + map.insert(DeclarationId(2124), DeclarationId(3055)); + map.insert(DeclarationId(2159), DeclarationId(3058)); + map.insert(DeclarationId(2160), DeclarationId(3061)); + map.insert(DeclarationId(2161), DeclarationId(3064)); + map.insert(DeclarationId(2162), DeclarationId(3067)); + map.insert(DeclarationId(2163), DeclarationId(3070)); + map.insert(DeclarationId(2186), DeclarationId(3073)); + map.insert(DeclarationId(2316), DeclarationId(3076)); + map.insert(DeclarationId(2317), DeclarationId(3079)); + map.insert(DeclarationId(2323), DeclarationId(3082)); + map.insert(DeclarationId(2324), DeclarationId(3085)); + map.insert(DeclarationId(2325), DeclarationId(3088)); + map.insert(DeclarationId(2326), DeclarationId(3091)); + map.insert(DeclarationId(2327), DeclarationId(3094)); + map.insert(DeclarationId(2328), DeclarationId(3097)); + map.insert(DeclarationId(2378), DeclarationId(3100)); + map.insert(DeclarationId(2422), DeclarationId(3103)); + map.insert(DeclarationId(2430), DeclarationId(3106)); + map.insert(DeclarationId(2444), DeclarationId(3109)); + map.insert(DeclarationId(2447), DeclarationId(3112)); + map.insert(DeclarationId(2505), DeclarationId(3115)); + map.insert(DeclarationId(2506), DeclarationId(3118)); + map.insert(DeclarationId(2507), DeclarationId(3121)); + map.insert(DeclarationId(2510), DeclarationId(3124)); + map.insert(DeclarationId(2511), DeclarationId(3127)); + map.insert(DeclarationId(2705), DeclarationId(3130)); + map.insert(DeclarationId(2734), DeclarationId(3133)); + map.insert(DeclarationId(2740), DeclarationId(3136)); + map.insert(DeclarationId(2747), DeclarationId(3139)); + map.insert(DeclarationId(2766), DeclarationId(3142)); + map.insert(DeclarationId(2767), DeclarationId(3145)); + map.insert(DeclarationId(2775), DeclarationId(3148)); + map.insert(DeclarationId(2779), DeclarationId(3151)); + map.insert(DeclarationId(2780), DeclarationId(3154)); + map.insert(DeclarationId(2781), DeclarationId(3157)); + map.insert(DeclarationId(2782), DeclarationId(3160)); + map.insert(DeclarationId(2792), DeclarationId(3163)); + map.insert(DeclarationId(2794), DeclarationId(3166)); + map.insert(DeclarationId(2795), DeclarationId(3169)); + map.insert(DeclarationId(2796), DeclarationId(3172)); + map.insert(DeclarationId(2798), DeclarationId(3175)); + map.insert(DeclarationId(2801), DeclarationId(3178)); + map.insert(DeclarationId(2802), DeclarationId(3181)); + map.insert(DeclarationId(2809), DeclarationId(3184)); + map.insert(DeclarationId(2810), DeclarationId(3187)); + map.insert(DeclarationId(2811), DeclarationId(3190)); + map.insert(DeclarationId(2813), DeclarationId(3193)); + map.insert(DeclarationId(2814), DeclarationId(3196)); + map.insert(DeclarationId(2815), DeclarationId(3199)); + map.insert(DeclarationId(2817), DeclarationId(3202)); + map.insert(DeclarationId(2818), DeclarationId(3205)); + map.insert(DeclarationId(2819), DeclarationId(3208)); + map.insert(DeclarationId(2826), DeclarationId(3211)); + map.insert(DeclarationId(2828), DeclarationId(3214)); + map.insert(DeclarationId(2839), DeclarationId(3217)); map } } diff --git a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs index 872428dd6ec..f1d87cb37ff 100644 --- a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs +++ b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs @@ -8,7 +8,7 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag { ports: bootstrapped_fixture_without_parse_surface_dag_ports(), diagnostics: bootstrapped_fixture_without_parse_surface_dag_diagnostics(), next_node_id: 844, - next_declaration_id: 3115, + next_declaration_id: 3116, next_port_id: 1009, primitives: PrimitiveCache::default(), substrate_markers: SubstrateMarkers::default(), @@ -24,7 +24,7 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag { emit_model_variants: EmitModelVariants::default(), clusters: bootstrapped_fixture_without_parse_surface_dag_clusters(), optional_match_disjs: bootstrapped_fixture_without_parse_surface_dag_optional_match_disjs(), - declaration_append_begin_after_bootstrap: 3115, + declaration_append_begin_after_bootstrap: 3116, } } @@ -1386,7 +1386,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(180), - target: TransformTarget::Callable(DeclarationId(849)), + target: TransformTarget::Callable(DeclarationId(850)), inputs: vec![PortId(183), PortId(182)], output: PortId(184), span: SourceSpan::new("src/v3/std/algebra.dag", 10291, 10322), @@ -1402,21 +1402,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(182), - target: TransformTarget::Callable(DeclarationId(2015)), + target: TransformTarget::Callable(DeclarationId(2016)), inputs: vec![PortId(185)], output: PortId(187), span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(183), - target: TransformTarget::Callable(DeclarationId(2017)), + target: TransformTarget::Callable(DeclarationId(2018)), inputs: vec![PortId(187)], output: PortId(188), span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(184), - target: TransformTarget::Callable(DeclarationId(1961)), + target: TransformTarget::Callable(DeclarationId(1962)), inputs: vec![PortId(185), PortId(186), PortId(188)], output: PortId(189), span: SourceSpan::new("src/v3/std/algebra.dag", 11149, 11539), @@ -1432,7 +1432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(186), - target: TransformTarget::Callable(DeclarationId(1963)), + target: TransformTarget::Callable(DeclarationId(1964)), inputs: vec![PortId(190), PortId(191), PortId(192)], output: PortId(193), span: SourceSpan::new("src/v3/std/algebra.dag", 11670, 11726), @@ -1448,7 +1448,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(188), - target: TransformTarget::Callable(DeclarationId(2018)), + target: TransformTarget::Callable(DeclarationId(2019)), inputs: vec![PortId(194)], output: PortId(195), span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810), @@ -1524,7 +1524,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(195), - target: TransformTarget::Callable(DeclarationId(856)), + target: TransformTarget::Callable(DeclarationId(857)), inputs: vec![PortId(203)], output: PortId(204), span: SourceSpan::new("src/v3/std/algebra.dag", 11975, 12003), @@ -1593,21 +1593,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(201), - target: TransformTarget::Callable(DeclarationId(853)), + target: TransformTarget::Callable(DeclarationId(854)), inputs: vec![PortId(209), PortId(210)], output: PortId(211), span: SourceSpan::new("src/v3/std/algebra.dag", 12333, 12348), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(202), - target: TransformTarget::Callable(DeclarationId(2002)), + target: TransformTarget::Callable(DeclarationId(2003)), inputs: vec![PortId(211)], output: PortId(212), span: SourceSpan::new("src/v3/std/algebra.dag", 12325, 12349), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(203), - target: TransformTarget::Callable(DeclarationId(869)), + target: TransformTarget::Callable(DeclarationId(870)), inputs: vec![PortId(212)], output: PortId(213), span: SourceSpan::new("src/v3/std/algebra.dag", 12315, 12350), @@ -1623,21 +1623,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(205), - target: TransformTarget::Callable(DeclarationId(853)), + target: TransformTarget::Callable(DeclarationId(854)), inputs: vec![PortId(214), PortId(215)], output: PortId(216), span: SourceSpan::new("src/v3/std/algebra.dag", 12630, 12652), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(206), - target: TransformTarget::Callable(DeclarationId(2000)), + target: TransformTarget::Callable(DeclarationId(2001)), inputs: vec![PortId(216)], output: PortId(217), span: SourceSpan::new("src/v3/std/algebra.dag", 12618, 12653), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(207), - target: TransformTarget::Callable(DeclarationId(869)), + target: TransformTarget::Callable(DeclarationId(870)), inputs: vec![PortId(217)], output: PortId(218), span: SourceSpan::new("src/v3/std/algebra.dag", 12608, 12654), @@ -1653,14 +1653,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(209), - target: TransformTarget::Callable(DeclarationId(862)), + target: TransformTarget::Callable(DeclarationId(863)), inputs: vec![PortId(220), PortId(219)], output: PortId(221), span: SourceSpan::new("src/v3/std/algebra.dag", 13598, 13623), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(210), - target: TransformTarget::Callable(DeclarationId(860)), + target: TransformTarget::Callable(DeclarationId(861)), inputs: vec![PortId(219), PortId(220)], output: PortId(222), span: SourceSpan::new("src/v3/std/algebra.dag", 13654, 13681), @@ -1703,14 +1703,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(213), - target: TransformTarget::Callable(DeclarationId(862)), + target: TransformTarget::Callable(DeclarationId(863)), inputs: vec![PortId(224), PortId(225)], output: PortId(226), span: SourceSpan::new("src/v3/std/algebra.dag", 13765, 13790), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(214), - target: TransformTarget::Callable(DeclarationId(857)), + target: TransformTarget::Callable(DeclarationId(858)), inputs: vec![PortId(224), PortId(225)], output: PortId(227), span: SourceSpan::new("src/v3/std/algebra.dag", 13815, 13841), @@ -1760,14 +1760,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(218), - target: TransformTarget::Callable(DeclarationId(1996)), + target: TransformTarget::Callable(DeclarationId(1997)), inputs: vec![PortId(230)], output: PortId(231), span: SourceSpan::new("src/v3/std/algebra.dag", 14214, 14229), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(219), - target: TransformTarget::Callable(DeclarationId(2020)), + target: TransformTarget::Callable(DeclarationId(2021)), inputs: vec![PortId(229), PortId(231)], output: PortId(232), span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245), @@ -1946,7 +1946,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(232), - target: TransformTarget::Callable(DeclarationId(863)), + target: TransformTarget::Callable(DeclarationId(864)), inputs: vec![PortId(253), PortId(258)], output: PortId(259), span: SourceSpan::new("src/v3/std/algebra.dag", 15597, 15623), @@ -2097,7 +2097,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(241), - target: TransformTarget::Callable(DeclarationId(863)), + target: TransformTarget::Callable(DeclarationId(864)), inputs: vec![PortId(275), PortId(274)], output: PortId(276), span: SourceSpan::new("src/v3/std/algebra.dag", 15912, 15942), @@ -2122,7 +2122,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(244), - target: TransformTarget::Callable(DeclarationId(863)), + target: TransformTarget::Callable(DeclarationId(864)), inputs: vec![PortId(278), PortId(279)], output: PortId(280), span: SourceSpan::new("src/v3/std/algebra.dag", 15986, 16020), @@ -2138,7 +2138,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(246), - target: TransformTarget::Callable(DeclarationId(856)), + target: TransformTarget::Callable(DeclarationId(857)), inputs: vec![PortId(281)], output: PortId(282), span: SourceSpan::new("src/v3/std/algebra.dag", 16038, 16059), @@ -2154,7 +2154,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(248), - target: TransformTarget::Callable(DeclarationId(856)), + target: TransformTarget::Callable(DeclarationId(857)), inputs: vec![PortId(283)], output: PortId(284), span: SourceSpan::new("src/v3/std/algebra.dag", 16063, 16084), @@ -2323,7 +2323,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(257), - target: TransformTarget::Callable(DeclarationId(863)), + target: TransformTarget::Callable(DeclarationId(864)), inputs: vec![PortId(295), PortId(298)], output: PortId(299), span: SourceSpan::new("src/v3/std/algebra.dag", 16308, 16334), @@ -2458,56 +2458,56 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(264), - target: TransformTarget::Callable(DeclarationId(870)), + target: TransformTarget::Callable(DeclarationId(871)), inputs: vec![PortId(311)], output: PortId(312), span: SourceSpan::new("src/v3/std/algebra.dag", 16927, 16945), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(265), - target: TransformTarget::Callable(DeclarationId(850)), + target: TransformTarget::Callable(DeclarationId(851)), inputs: vec![PortId(234)], output: PortId(313), span: SourceSpan::new("src/v3/std/algebra.dag", 16957, 16978), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(266), - target: TransformTarget::Callable(DeclarationId(2022)), + target: TransformTarget::Callable(DeclarationId(2023)), inputs: vec![PortId(312), PortId(313)], output: PortId(314), span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(267), - target: TransformTarget::Callable(DeclarationId(886)), + target: TransformTarget::Callable(DeclarationId(887)), inputs: vec![PortId(314)], output: PortId(315), span: SourceSpan::new("src/v3/std/algebra.dag", 16893, 17029), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(268), - target: TransformTarget::Callable(DeclarationId(870)), + target: TransformTarget::Callable(DeclarationId(871)), inputs: vec![PortId(316)], output: PortId(317), span: SourceSpan::new("src/v3/std/algebra.dag", 17092, 17110), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(269), - target: TransformTarget::Callable(DeclarationId(850)), + target: TransformTarget::Callable(DeclarationId(851)), inputs: vec![PortId(234)], output: PortId(318), span: SourceSpan::new("src/v3/std/algebra.dag", 17122, 17143), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(270), - target: TransformTarget::Callable(DeclarationId(2024)), + target: TransformTarget::Callable(DeclarationId(2025)), inputs: vec![PortId(317), PortId(318)], output: PortId(319), span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(271), - target: TransformTarget::Callable(DeclarationId(886)), + target: TransformTarget::Callable(DeclarationId(887)), inputs: vec![PortId(319)], output: PortId(320), span: SourceSpan::new("src/v3/std/algebra.dag", 17058, 17194), @@ -2616,7 +2616,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(274), - target: TransformTarget::Callable(DeclarationId(846)), + target: TransformTarget::Callable(DeclarationId(847)), inputs: vec![PortId(322), PortId(323)], output: PortId(324), span: SourceSpan::new("src/v3/std/algebra.dag", 17268, 17290), @@ -2811,14 +2811,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(290), - target: TransformTarget::Callable(DeclarationId(1197)), + target: TransformTarget::Callable(DeclarationId(1198)), inputs: vec![PortId(339)], output: PortId(344), span: SourceSpan::new("src/v3/std/algebra.dag", 18897, 18924), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(291), - target: TransformTarget::Callable(DeclarationId(1197)), + target: TransformTarget::Callable(DeclarationId(1198)), inputs: vec![PortId(343)], output: PortId(345), span: SourceSpan::new("src/v3/std/algebra.dag", 18928, 18955), @@ -3744,7 +3744,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(346), - target: TransformTarget::Callable(DeclarationId(865)), + target: TransformTarget::Callable(DeclarationId(866)), inputs: vec![PortId(404), PortId(405)], output: PortId(406), span: SourceSpan::new("src/v3/std/algebra.dag", 20681, 20707), @@ -3787,7 +3787,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(349), - target: TransformTarget::Callable(DeclarationId(865)), + target: TransformTarget::Callable(DeclarationId(866)), inputs: vec![PortId(408), PortId(409)], output: PortId(410), span: SourceSpan::new("src/v3/std/algebra.dag", 20814, 20840), @@ -3830,49 +3830,49 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(352), - target: TransformTarget::Callable(DeclarationId(870)), + target: TransformTarget::Callable(DeclarationId(871)), inputs: vec![PortId(413)], output: PortId(414), span: SourceSpan::new("src/v3/std/algebra.dag", 22044, 22062), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(353), - target: TransformTarget::Callable(DeclarationId(871)), + target: TransformTarget::Callable(DeclarationId(872)), inputs: vec![PortId(414)], output: PortId(415), span: SourceSpan::new("src/v3/std/algebra.dag", 22025, 22063), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(354), - target: TransformTarget::Callable(DeclarationId(877)), + target: TransformTarget::Callable(DeclarationId(878)), inputs: vec![PortId(415)], output: PortId(416), span: SourceSpan::new("src/v3/std/algebra.dag", 22014, 22064), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(355), - target: TransformTarget::Callable(DeclarationId(870)), + target: TransformTarget::Callable(DeclarationId(871)), inputs: vec![PortId(417)], output: PortId(418), span: SourceSpan::new("src/v3/std/algebra.dag", 22168, 22186), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(356), - target: TransformTarget::Callable(DeclarationId(872)), + target: TransformTarget::Callable(DeclarationId(873)), inputs: vec![PortId(418)], output: PortId(419), span: SourceSpan::new("src/v3/std/algebra.dag", 22136, 22187), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(357), - target: TransformTarget::Callable(DeclarationId(874)), + target: TransformTarget::Callable(DeclarationId(875)), inputs: vec![PortId(419)], output: PortId(420), span: SourceSpan::new("src/v3/std/algebra.dag", 22112, 22188), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(358), - target: TransformTarget::Callable(DeclarationId(879)), + target: TransformTarget::Callable(DeclarationId(880)), inputs: vec![PortId(420)], output: PortId(421), span: SourceSpan::new("src/v3/std/algebra.dag", 22097, 22189), @@ -3993,14 +3993,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(364), - target: TransformTarget::Callable(DeclarationId(2025)), + target: TransformTarget::Callable(DeclarationId(2026)), inputs: vec![PortId(425), PortId(426)], output: PortId(427), span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(365), - target: TransformTarget::Callable(DeclarationId(2026)), + target: TransformTarget::Callable(DeclarationId(2027)), inputs: vec![PortId(424), PortId(427)], output: PortId(428), span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324), @@ -4016,7 +4016,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(367), - target: TransformTarget::Callable(DeclarationId(2027)), + target: TransformTarget::Callable(DeclarationId(2028)), inputs: vec![], output: PortId(430), span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610), @@ -4032,7 +4032,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(369), - target: TransformTarget::Callable(DeclarationId(875)), + target: TransformTarget::Callable(DeclarationId(876)), inputs: vec![PortId(432)], output: PortId(433), span: SourceSpan::new("src/v3/std/algebra.dag", 22641, 22671), @@ -4048,7 +4048,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(371), - target: TransformTarget::Callable(DeclarationId(871)), + target: TransformTarget::Callable(DeclarationId(872)), inputs: vec![PortId(434)], output: PortId(435), span: SourceSpan::new("src/v3/std/algebra.dag", 22685, 22717), @@ -4073,14 +4073,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(374), - target: TransformTarget::Callable(DeclarationId(871)), + target: TransformTarget::Callable(DeclarationId(872)), inputs: vec![PortId(437)], output: PortId(438), span: SourceSpan::new("src/v3/std/algebra.dag", 22756, 22788), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(375), - target: TransformTarget::Callable(DeclarationId(2028)), + target: TransformTarget::Callable(DeclarationId(2029)), inputs: vec![PortId(436), PortId(438)], output: PortId(439), span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789), @@ -4162,7 +4162,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(380), - target: TransformTarget::Callable(DeclarationId(873)), + target: TransformTarget::Callable(DeclarationId(874)), inputs: vec![PortId(443)], output: PortId(444), span: SourceSpan::new("src/v3/std/algebra.dag", 23093, 23108), @@ -4176,21 +4176,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(382), - target: TransformTarget::Callable(DeclarationId(1996)), + target: TransformTarget::Callable(DeclarationId(1997)), inputs: vec![PortId(445)], output: PortId(446), span: SourceSpan::new("src/v3/std/algebra.dag", 23123, 23138), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(383), - target: TransformTarget::Callable(DeclarationId(2029)), + target: TransformTarget::Callable(DeclarationId(2030)), inputs: vec![], output: PortId(447), span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(384), - target: TransformTarget::Callable(DeclarationId(2030)), + target: TransformTarget::Callable(DeclarationId(2031)), inputs: vec![PortId(446), PortId(447)], output: PortId(448), span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148), @@ -4249,7 +4249,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(389), - target: TransformTarget::Callable(DeclarationId(875)), + target: TransformTarget::Callable(DeclarationId(876)), inputs: vec![PortId(453)], output: PortId(454), span: SourceSpan::new("src/v3/std/algebra.dag", 23272, 23302), @@ -4265,7 +4265,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(391), - target: TransformTarget::Callable(DeclarationId(873)), + target: TransformTarget::Callable(DeclarationId(874)), inputs: vec![PortId(455)], output: PortId(456), span: SourceSpan::new("src/v3/std/algebra.dag", 23306, 23328), @@ -4327,7 +4327,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(396), - target: TransformTarget::Callable(DeclarationId(2031)), + target: TransformTarget::Callable(DeclarationId(2032)), inputs: vec![], output: PortId(461), span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604), @@ -4343,7 +4343,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(398), - target: TransformTarget::Callable(DeclarationId(876)), + target: TransformTarget::Callable(DeclarationId(877)), inputs: vec![PortId(463)], output: PortId(464), span: SourceSpan::new("src/v3/std/algebra.dag", 23635, 23664), @@ -4359,7 +4359,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(400), - target: TransformTarget::Callable(DeclarationId(874)), + target: TransformTarget::Callable(DeclarationId(875)), inputs: vec![PortId(465)], output: PortId(466), span: SourceSpan::new("src/v3/std/algebra.dag", 23678, 23715), @@ -4384,14 +4384,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(403), - target: TransformTarget::Callable(DeclarationId(874)), + target: TransformTarget::Callable(DeclarationId(875)), inputs: vec![PortId(468)], output: PortId(469), span: SourceSpan::new("src/v3/std/algebra.dag", 23754, 23791), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(404), - target: TransformTarget::Callable(DeclarationId(2032)), + target: TransformTarget::Callable(DeclarationId(2033)), inputs: vec![PortId(467), PortId(469)], output: PortId(470), span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792), @@ -4796,7 +4796,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(430), - target: TransformTarget::Callable(DeclarationId(1996)), + target: TransformTarget::Callable(DeclarationId(1997)), inputs: vec![PortId(509)], output: PortId(510), span: SourceSpan::new("src/v3/std/algebra.dag", 25180, 25195), @@ -4839,21 +4839,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(435), - target: TransformTarget::Callable(DeclarationId(2033)), + target: TransformTarget::Callable(DeclarationId(2034)), inputs: vec![PortId(515), PortId(516)], output: PortId(517), span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(436), - target: TransformTarget::Callable(DeclarationId(889)), + target: TransformTarget::Callable(DeclarationId(890)), inputs: vec![PortId(517)], output: PortId(518), span: SourceSpan::new("src/v3/std/algebra.dag", 25302, 25350), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(437), - target: TransformTarget::Callable(DeclarationId(878)), + target: TransformTarget::Callable(DeclarationId(879)), inputs: vec![PortId(518)], output: PortId(519), span: SourceSpan::new("src/v3/std/algebra.dag", 25293, 25351), @@ -4936,7 +4936,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(442), - target: TransformTarget::Callable(DeclarationId(1996)), + target: TransformTarget::Callable(DeclarationId(1997)), inputs: vec![PortId(523)], output: PortId(524), span: SourceSpan::new("src/v3/std/algebra.dag", 25451, 25466), @@ -4988,14 +4988,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(448), - target: TransformTarget::Callable(DeclarationId(854)), + target: TransformTarget::Callable(DeclarationId(855)), inputs: vec![PortId(529), PortId(530), PortId(531)], output: PortId(532), span: SourceSpan::new("src/v3/std/algebra.dag", 25577, 25627), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(449), - target: TransformTarget::Callable(DeclarationId(2002)), + target: TransformTarget::Callable(DeclarationId(2003)), inputs: vec![PortId(532)], output: PortId(533), span: SourceSpan::new("src/v3/std/algebra.dag", 25569, 25628), @@ -5078,7 +5078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(454), - target: TransformTarget::Callable(DeclarationId(1996)), + target: TransformTarget::Callable(DeclarationId(1997)), inputs: vec![PortId(537)], output: PortId(538), span: SourceSpan::new("src/v3/std/algebra.dag", 25917, 25932), @@ -5130,7 +5130,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(460), - target: TransformTarget::Callable(DeclarationId(880)), + target: TransformTarget::Callable(DeclarationId(881)), inputs: vec![PortId(544), PortId(545)], output: PortId(546), span: SourceSpan::new("src/v3/std/algebra.dag", 26086, 26135), @@ -5164,14 +5164,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(464), - target: TransformTarget::Callable(DeclarationId(854)), + target: TransformTarget::Callable(DeclarationId(855)), inputs: vec![PortId(548), PortId(549), PortId(550)], output: PortId(551), span: SourceSpan::new("src/v3/std/algebra.dag", 26171, 26221), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(465), - target: TransformTarget::Callable(DeclarationId(2000)), + target: TransformTarget::Callable(DeclarationId(2001)), inputs: vec![PortId(551)], output: PortId(552), span: SourceSpan::new("src/v3/std/algebra.dag", 26159, 26222), @@ -5277,49 +5277,49 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(470), - target: TransformTarget::Callable(DeclarationId(881)), + target: TransformTarget::Callable(DeclarationId(882)), inputs: vec![PortId(558), PortId(556), PortId(557)], output: PortId(559), span: SourceSpan::new("src/v3/std/algebra.dag", 26523, 26552), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(471), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(556), PortId(557)], output: PortId(561), span: SourceSpan::new("src/v3/std/algebra.dag", 26576, 26594), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(472), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(556), PortId(557)], output: PortId(563), span: SourceSpan::new("src/v3/std/algebra.dag", 26620, 26638), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(473), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(556), PortId(557)], output: PortId(565), span: SourceSpan::new("src/v3/std/algebra.dag", 26657, 26675), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(474), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(556), PortId(557)], output: PortId(567), span: SourceSpan::new("src/v3/std/algebra.dag", 26694, 26712), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(475), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(556), PortId(557)], output: PortId(569), span: SourceSpan::new("src/v3/std/algebra.dag", 26735, 26753), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(476), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(556), PortId(557)], output: PortId(571), span: SourceSpan::new("src/v3/std/algebra.dag", 26776, 26794), @@ -5428,49 +5428,49 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(479), - target: TransformTarget::Callable(DeclarationId(882)), + target: TransformTarget::Callable(DeclarationId(883)), inputs: vec![PortId(573), PortId(576), PortId(574), PortId(575)], output: PortId(577), span: SourceSpan::new("src/v3/std/algebra.dag", 26927, 26963), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(480), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(574), PortId(575)], output: PortId(579), span: SourceSpan::new("src/v3/std/algebra.dag", 26987, 27005), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(481), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(574), PortId(575)], output: PortId(581), span: SourceSpan::new("src/v3/std/algebra.dag", 27031, 27049), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(482), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(574), PortId(575)], output: PortId(583), span: SourceSpan::new("src/v3/std/algebra.dag", 27068, 27086), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(483), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(574), PortId(575)], output: PortId(585), span: SourceSpan::new("src/v3/std/algebra.dag", 27105, 27123), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(484), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(574), PortId(575)], output: PortId(587), span: SourceSpan::new("src/v3/std/algebra.dag", 27146, 27164), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(485), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(574), PortId(575)], output: PortId(589), span: SourceSpan::new("src/v3/std/algebra.dag", 27187, 27205), @@ -5579,21 +5579,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(488), - target: TransformTarget::Callable(DeclarationId(863)), + target: TransformTarget::Callable(DeclarationId(864)), inputs: vec![PortId(591), PortId(592)], output: PortId(595), span: SourceSpan::new("src/v3/std/algebra.dag", 27340, 27366), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(489), - target: TransformTarget::Callable(DeclarationId(883)), + target: TransformTarget::Callable(DeclarationId(884)), inputs: vec![PortId(591)], output: PortId(596), span: SourceSpan::new("src/v3/std/algebra.dag", 27376, 27397), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(490), - target: TransformTarget::Callable(DeclarationId(884)), + target: TransformTarget::Callable(DeclarationId(885)), inputs: vec![PortId(593), PortId(594)], output: PortId(597), span: SourceSpan::new("src/v3/std/algebra.dag", 27409, 27427), @@ -5636,14 +5636,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(493), - target: TransformTarget::Callable(DeclarationId(853)), + target: TransformTarget::Callable(DeclarationId(854)), inputs: vec![PortId(599), PortId(600)], output: PortId(601), span: SourceSpan::new("src/v3/std/algebra.dag", 27617, 27632), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(494), - target: TransformTarget::Callable(DeclarationId(2000)), + target: TransformTarget::Callable(DeclarationId(2001)), inputs: vec![PortId(601)], output: PortId(602), span: SourceSpan::new("src/v3/std/algebra.dag", 27605, 27633), @@ -5677,7 +5677,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(498), - target: TransformTarget::Callable(DeclarationId(862)), + target: TransformTarget::Callable(DeclarationId(863)), inputs: vec![PortId(604), PortId(606)], output: PortId(607), span: SourceSpan::new("src/v3/std/algebra.dag", 27740, 27763), @@ -5700,7 +5700,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(501), - target: TransformTarget::Callable(DeclarationId(849)), + target: TransformTarget::Callable(DeclarationId(850)), inputs: vec![PortId(608), PortId(609)], output: PortId(610), span: SourceSpan::new("src/v3/std/algebra.dag", 27720, 27784), @@ -5734,7 +5734,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(505), - target: TransformTarget::Callable(DeclarationId(2034)), + target: TransformTarget::Callable(DeclarationId(2035)), inputs: vec![], output: PortId(615), span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995), @@ -5750,7 +5750,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(507), - target: TransformTarget::Callable(DeclarationId(862)), + target: TransformTarget::Callable(DeclarationId(863)), inputs: vec![PortId(614), PortId(617)], output: PortId(618), span: SourceSpan::new("src/v3/std/algebra.dag", 28026, 28057), @@ -5766,7 +5766,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(509), - target: TransformTarget::Callable(DeclarationId(887)), + target: TransformTarget::Callable(DeclarationId(888)), inputs: vec![PortId(619), PortId(614)], output: PortId(620), span: SourceSpan::new("src/v3/std/algebra.dag", 28071, 28116), @@ -5791,14 +5791,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(512), - target: TransformTarget::Callable(DeclarationId(887)), + target: TransformTarget::Callable(DeclarationId(888)), inputs: vec![PortId(622), PortId(614)], output: PortId(623), span: SourceSpan::new("src/v3/std/algebra.dag", 28155, 28200), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(513), - target: TransformTarget::Callable(DeclarationId(2035)), + target: TransformTarget::Callable(DeclarationId(2036)), inputs: vec![PortId(621), PortId(623)], output: PortId(624), span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201), @@ -5880,35 +5880,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(518), - target: TransformTarget::Callable(DeclarationId(850)), + target: TransformTarget::Callable(DeclarationId(851)), inputs: vec![PortId(629)], output: PortId(630), span: SourceSpan::new("src/v3/std/algebra.dag", 28329, 28353), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(519), - target: TransformTarget::Callable(DeclarationId(2037)), + target: TransformTarget::Callable(DeclarationId(2038)), inputs: vec![PortId(628), PortId(630)], output: PortId(631), span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(520), - target: TransformTarget::Callable(DeclarationId(886)), + target: TransformTarget::Callable(DeclarationId(887)), inputs: vec![PortId(631)], output: PortId(632), span: SourceSpan::new("src/v3/std/algebra.dag", 28310, 28378), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(521), - target: TransformTarget::Callable(DeclarationId(887)), + target: TransformTarget::Callable(DeclarationId(888)), inputs: vec![PortId(628), PortId(629)], output: PortId(633), span: SourceSpan::new("src/v3/std/algebra.dag", 28414, 28448), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(522), - target: TransformTarget::Callable(DeclarationId(2038)), + target: TransformTarget::Callable(DeclarationId(2039)), inputs: vec![PortId(629), PortId(633)], output: PortId(634), span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449), @@ -5951,14 +5951,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(525), - target: TransformTarget::Callable(DeclarationId(2039)), + target: TransformTarget::Callable(DeclarationId(2040)), inputs: vec![], output: PortId(637), span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(526), - target: TransformTarget::Callable(DeclarationId(2041)), + target: TransformTarget::Callable(DeclarationId(2042)), inputs: vec![PortId(636), PortId(637)], output: PortId(638), span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749), @@ -5981,7 +5981,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(529), - target: TransformTarget::Callable(DeclarationId(1996)), + target: TransformTarget::Callable(DeclarationId(1997)), inputs: vec![PortId(640)], output: PortId(641), span: SourceSpan::new("src/v3/std/induction.dag", 29099, 29114), @@ -5997,7 +5997,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(531), - target: TransformTarget::Callable(DeclarationId(1080)), + target: TransformTarget::Callable(DeclarationId(1081)), inputs: vec![PortId(643)], output: PortId(644), span: SourceSpan::new("src/v3/std/induction.dag", 29146, 29172), @@ -6013,7 +6013,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(533), - target: TransformTarget::Callable(DeclarationId(1081)), + target: TransformTarget::Callable(DeclarationId(1082)), inputs: vec![PortId(646)], output: PortId(647), span: SourceSpan::new("src/v3/std/induction.dag", 29209, 29238), @@ -6029,7 +6029,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(535), - target: TransformTarget::Callable(DeclarationId(1083)), + target: TransformTarget::Callable(DeclarationId(1084)), inputs: vec![PortId(649)], output: PortId(650), span: SourceSpan::new("src/v3/std/induction.dag", 29279, 29307), @@ -6054,7 +6054,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(538), - target: TransformTarget::Callable(DeclarationId(2004)), + target: TransformTarget::Callable(DeclarationId(2005)), inputs: vec![PortId(653)], output: PortId(654), span: SourceSpan::new("src/v3/std/induction.dag", 29338, 29412), @@ -6068,7 +6068,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(540), - target: TransformTarget::Callable(DeclarationId(2004)), + target: TransformTarget::Callable(DeclarationId(2005)), inputs: vec![PortId(655)], output: PortId(656), span: SourceSpan::new("src/v3/std/induction.dag", 29433, 29461), @@ -6082,7 +6082,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(542), - target: TransformTarget::Callable(DeclarationId(2004)), + target: TransformTarget::Callable(DeclarationId(2005)), inputs: vec![PortId(657)], output: PortId(658), span: SourceSpan::new("src/v3/std/induction.dag", 29480, 29513), @@ -6209,7 +6209,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(548), - target: TransformTarget::Callable(DeclarationId(2004)), + target: TransformTarget::Callable(DeclarationId(2005)), inputs: vec![PortId(664)], output: PortId(665), span: SourceSpan::new("src/v3/std/induction.dag", 29645, 29726), @@ -6234,7 +6234,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(551), - target: TransformTarget::Callable(DeclarationId(2004)), + target: TransformTarget::Callable(DeclarationId(2005)), inputs: vec![PortId(668)], output: PortId(669), span: SourceSpan::new("src/v3/std/induction.dag", 29761, 29835), @@ -6283,7 +6283,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(554), - target: TransformTarget::Callable(DeclarationId(1081)), + target: TransformTarget::Callable(DeclarationId(1082)), inputs: vec![PortId(671)], output: PortId(672), span: SourceSpan::new("src/v3/std/induction.dag", 30026, 30060), @@ -6299,28 +6299,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(556), - target: TransformTarget::Callable(DeclarationId(1222)), + target: TransformTarget::Callable(DeclarationId(1223)), inputs: vec![], output: PortId(676), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3031, 3059), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(557), - target: TransformTarget::Callable(DeclarationId(1231)), + target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![PortId(673), PortId(676)], output: PortId(677), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3007, 3060), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(558), - target: TransformTarget::Callable(DeclarationId(1222)), + target: TransformTarget::Callable(DeclarationId(1223)), inputs: vec![], output: PortId(678), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3096, 3124), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(559), - target: TransformTarget::Callable(DeclarationId(2396)), + target: TransformTarget::Callable(DeclarationId(2397)), inputs: vec![PortId(678)], output: PortId(679), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3087, 3125), @@ -6336,14 +6336,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(561), - target: TransformTarget::Callable(DeclarationId(1222)), + target: TransformTarget::Callable(DeclarationId(1223)), inputs: vec![], output: PortId(682), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3174, 3202), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(562), - target: TransformTarget::Callable(DeclarationId(2397)), + target: TransformTarget::Callable(DeclarationId(2398)), inputs: vec![PortId(682)], output: PortId(683), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3165, 3203), @@ -6388,28 +6388,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(564), - target: TransformTarget::Callable(DeclarationId(1222)), + target: TransformTarget::Callable(DeclarationId(1223)), inputs: vec![], output: PortId(686), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3268, 3296), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(565), - target: TransformTarget::Callable(DeclarationId(1231)), + target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![PortId(673), PortId(686)], output: PortId(687), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3244, 3297), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(566), - target: TransformTarget::Callable(DeclarationId(1222)), + target: TransformTarget::Callable(DeclarationId(1223)), inputs: vec![], output: PortId(688), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3333, 3361), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(567), - target: TransformTarget::Callable(DeclarationId(2398)), + target: TransformTarget::Callable(DeclarationId(2399)), inputs: vec![PortId(688)], output: PortId(689), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3324, 3362), @@ -6425,14 +6425,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(569), - target: TransformTarget::Callable(DeclarationId(1222)), + target: TransformTarget::Callable(DeclarationId(1223)), inputs: vec![], output: PortId(692), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3411, 3439), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(570), - target: TransformTarget::Callable(DeclarationId(2399)), + target: TransformTarget::Callable(DeclarationId(2400)), inputs: vec![PortId(692)], output: PortId(693), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3402, 3440), @@ -6477,28 +6477,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(572), - target: TransformTarget::Callable(DeclarationId(1222)), + target: TransformTarget::Callable(DeclarationId(1223)), inputs: vec![], output: PortId(696), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3502, 3530), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(573), - target: TransformTarget::Callable(DeclarationId(1231)), + target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![PortId(673), PortId(696)], output: PortId(697), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3478, 3531), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(574), - target: TransformTarget::Callable(DeclarationId(1222)), + target: TransformTarget::Callable(DeclarationId(1223)), inputs: vec![], output: PortId(698), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3567, 3595), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(575), - target: TransformTarget::Callable(DeclarationId(2400)), + target: TransformTarget::Callable(DeclarationId(2401)), inputs: vec![PortId(698)], output: PortId(699), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3558, 3596), @@ -6514,14 +6514,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(577), - target: TransformTarget::Callable(DeclarationId(1222)), + target: TransformTarget::Callable(DeclarationId(1223)), inputs: vec![], output: PortId(702), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3645, 3673), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(578), - target: TransformTarget::Callable(DeclarationId(2401)), + target: TransformTarget::Callable(DeclarationId(2402)), inputs: vec![PortId(702)], output: PortId(703), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3636, 3674), @@ -6566,28 +6566,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(580), - target: TransformTarget::Callable(DeclarationId(1222)), + target: TransformTarget::Callable(DeclarationId(1223)), inputs: vec![], output: PortId(706), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3734, 3762), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(581), - target: TransformTarget::Callable(DeclarationId(1231)), + target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![PortId(673), PortId(706)], output: PortId(707), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3710, 3763), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(582), - target: TransformTarget::Callable(DeclarationId(1222)), + target: TransformTarget::Callable(DeclarationId(1223)), inputs: vec![], output: PortId(708), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3799, 3827), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(583), - target: TransformTarget::Callable(DeclarationId(2402)), + target: TransformTarget::Callable(DeclarationId(2403)), inputs: vec![PortId(708)], output: PortId(709), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3790, 3828), @@ -6603,14 +6603,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(585), - target: TransformTarget::Callable(DeclarationId(1222)), + target: TransformTarget::Callable(DeclarationId(1223)), inputs: vec![], output: PortId(712), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3877, 3905), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(586), - target: TransformTarget::Callable(DeclarationId(2403)), + target: TransformTarget::Callable(DeclarationId(2404)), inputs: vec![PortId(712)], output: PortId(713), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3868, 3906), @@ -6655,28 +6655,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(588), - target: TransformTarget::Callable(DeclarationId(1222)), + target: TransformTarget::Callable(DeclarationId(1223)), inputs: vec![], output: PortId(716), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3966, 3994), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(589), - target: TransformTarget::Callable(DeclarationId(1231)), + target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![PortId(673), PortId(716)], output: PortId(717), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3942, 3995), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(590), - target: TransformTarget::Callable(DeclarationId(1222)), + target: TransformTarget::Callable(DeclarationId(1223)), inputs: vec![], output: PortId(718), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4031, 4059), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(591), - target: TransformTarget::Callable(DeclarationId(2404)), + target: TransformTarget::Callable(DeclarationId(2405)), inputs: vec![PortId(718)], output: PortId(719), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4022, 4060), @@ -6692,14 +6692,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(593), - target: TransformTarget::Callable(DeclarationId(1222)), + target: TransformTarget::Callable(DeclarationId(1223)), inputs: vec![], output: PortId(722), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4109, 4137), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(594), - target: TransformTarget::Callable(DeclarationId(2405)), + target: TransformTarget::Callable(DeclarationId(2406)), inputs: vec![PortId(722)], output: PortId(723), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4100, 4138), @@ -6842,7 +6842,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(598), - target: TransformTarget::Callable(DeclarationId(1171)), + target: TransformTarget::Callable(DeclarationId(1172)), inputs: vec![PortId(726), PortId(727)], output: PortId(728), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4541, 4566), @@ -6858,7 +6858,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(600), - target: TransformTarget::Callable(DeclarationId(2406)), + target: TransformTarget::Callable(DeclarationId(2407)), inputs: vec![], output: PortId(729), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4824, 4829), @@ -6874,7 +6874,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(602), - target: TransformTarget::Callable(DeclarationId(2407)), + target: TransformTarget::Callable(DeclarationId(2408)), inputs: vec![], output: PortId(730), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4889, 4894), @@ -6890,7 +6890,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(604), - target: TransformTarget::Callable(DeclarationId(2408)), + target: TransformTarget::Callable(DeclarationId(2409)), inputs: vec![], output: PortId(731), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4952, 4957), @@ -6906,7 +6906,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(606), - target: TransformTarget::Callable(DeclarationId(2409)), + target: TransformTarget::Callable(DeclarationId(2410)), inputs: vec![], output: PortId(732), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5015, 5020), @@ -6922,7 +6922,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(608), - target: TransformTarget::Callable(DeclarationId(2410)), + target: TransformTarget::Callable(DeclarationId(2411)), inputs: vec![], output: PortId(733), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5079, 5084), @@ -6938,7 +6938,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(610), - target: TransformTarget::Callable(DeclarationId(2411)), + target: TransformTarget::Callable(DeclarationId(2412)), inputs: vec![], output: PortId(734), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5159, 5164), @@ -6954,21 +6954,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(612), - target: TransformTarget::Callable(DeclarationId(2413)), + target: TransformTarget::Callable(DeclarationId(2414)), inputs: vec![PortId(735)], output: PortId(736), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5275, 5286), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(613), - target: TransformTarget::Callable(DeclarationId(1178)), + target: TransformTarget::Callable(DeclarationId(1179)), inputs: vec![], output: PortId(737), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5294, 5325), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(614), - target: TransformTarget::Callable(DeclarationId(2412)), + target: TransformTarget::Callable(DeclarationId(2413)), inputs: vec![PortId(736), PortId(737)], output: PortId(738), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5262, 5327), @@ -6984,14 +6984,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(616), - target: TransformTarget::Callable(DeclarationId(1177)), + target: TransformTarget::Callable(DeclarationId(1178)), inputs: vec![], output: PortId(740), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5428, 5459), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(617), - target: TransformTarget::Callable(DeclarationId(2414)), + target: TransformTarget::Callable(DeclarationId(2415)), inputs: vec![PortId(739), PortId(740)], output: PortId(741), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5403, 5461), @@ -7014,14 +7014,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(620), - target: TransformTarget::Callable(DeclarationId(1179)), + target: TransformTarget::Callable(DeclarationId(1180)), inputs: vec![PortId(742)], output: PortId(744), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5649, 5682), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(621), - target: TransformTarget::Callable(DeclarationId(2415)), + target: TransformTarget::Callable(DeclarationId(2416)), inputs: vec![PortId(743), PortId(742), PortId(744)], output: PortId(745), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5562, 5687), @@ -7044,21 +7044,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(624), - target: TransformTarget::Callable(DeclarationId(1180)), + target: TransformTarget::Callable(DeclarationId(1181)), inputs: vec![PortId(747)], output: PortId(749), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5881, 5915), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(625), - target: TransformTarget::Callable(DeclarationId(1179)), + target: TransformTarget::Callable(DeclarationId(1180)), inputs: vec![PortId(746)], output: PortId(750), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5932, 5965), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(626), - target: TransformTarget::Callable(DeclarationId(2416)), + target: TransformTarget::Callable(DeclarationId(2417)), inputs: vec![PortId(748), PortId(749), PortId(750)], output: PortId(751), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5808, 5970), @@ -7074,14 +7074,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(628), - target: TransformTarget::Callable(DeclarationId(1267)), + target: TransformTarget::Callable(DeclarationId(1268)), inputs: vec![PortId(752)], output: PortId(754), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6333, 6350), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(629), - target: TransformTarget::Callable(DeclarationId(1181)), + target: TransformTarget::Callable(DeclarationId(1182)), inputs: vec![PortId(753)], output: PortId(755), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6366, 6400), @@ -7106,7 +7106,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(632), - target: TransformTarget::Callable(DeclarationId(1181)), + target: TransformTarget::Callable(DeclarationId(1182)), inputs: vec![PortId(753)], output: PortId(759), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6436, 6470), @@ -7160,14 +7160,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(635), - target: TransformTarget::Callable(DeclarationId(1267)), + target: TransformTarget::Callable(DeclarationId(1268)), inputs: vec![PortId(761)], output: PortId(764), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6594, 6611), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(636), - target: TransformTarget::Callable(DeclarationId(1182)), + target: TransformTarget::Callable(DeclarationId(1183)), inputs: vec![PortId(762), PortId(763)], output: PortId(765), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6627, 6669), @@ -7192,7 +7192,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(639), - target: TransformTarget::Callable(DeclarationId(1182)), + target: TransformTarget::Callable(DeclarationId(1183)), inputs: vec![PortId(762), PortId(763)], output: PortId(769), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6705, 6747), @@ -7246,7 +7246,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(642), - target: TransformTarget::Callable(DeclarationId(1183)), + target: TransformTarget::Callable(DeclarationId(1184)), inputs: vec![PortId(771), PortId(772)], output: PortId(774), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6909, 6931), @@ -7262,7 +7262,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(644), - target: TransformTarget::Callable(DeclarationId(1184)), + target: TransformTarget::Callable(DeclarationId(1185)), inputs: vec![PortId(771), PortId(772), PortId(776)], output: PortId(777), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6970, 7000), @@ -7316,14 +7316,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(647), - target: TransformTarget::Callable(DeclarationId(1231)), + target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![PortId(779), PortId(781)], output: PortId(782), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7184, 7210), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(648), - target: TransformTarget::Callable(DeclarationId(1185)), + target: TransformTarget::Callable(DeclarationId(1186)), inputs: vec![PortId(779), PortId(781), PortId(782)], output: PortId(783), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7152, 7211), @@ -7348,28 +7348,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(651), - target: TransformTarget::Callable(DeclarationId(1222)), + target: TransformTarget::Callable(DeclarationId(1223)), inputs: vec![], output: PortId(787), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7296, 7324), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(652), - target: TransformTarget::Callable(DeclarationId(1225)), + target: TransformTarget::Callable(DeclarationId(1226)), inputs: vec![PortId(786)], output: PortId(788), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7382, 7412), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(653), - target: TransformTarget::Callable(DeclarationId(1226)), + target: TransformTarget::Callable(DeclarationId(1227)), inputs: vec![PortId(785), PortId(788)], output: PortId(789), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7334, 7413), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(654), - target: TransformTarget::Callable(DeclarationId(1184)), + target: TransformTarget::Callable(DeclarationId(1185)), inputs: vec![PortId(779), PortId(787), PortId(789)], output: PortId(790), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7257, 7421), @@ -7426,42 +7426,42 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(657), - target: TransformTarget::Callable(DeclarationId(1267)), + target: TransformTarget::Callable(DeclarationId(1268)), inputs: vec![PortId(792)], output: PortId(794), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8404, 8421), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(658), - target: TransformTarget::Callable(DeclarationId(711)), + target: TransformTarget::Callable(DeclarationId(712)), inputs: vec![PortId(794)], output: PortId(795), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8395, 8422), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(659), - target: TransformTarget::Callable(DeclarationId(1171)), + target: TransformTarget::Callable(DeclarationId(1172)), inputs: vec![PortId(792), PortId(793)], output: PortId(796), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8468, 8493), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(660), - target: TransformTarget::Callable(DeclarationId(1186)), + target: TransformTarget::Callable(DeclarationId(1187)), inputs: vec![PortId(792), PortId(796)], output: PortId(797), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8432, 8494), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(661), - target: TransformTarget::Callable(DeclarationId(1172)), + target: TransformTarget::Callable(DeclarationId(1173)), inputs: vec![PortId(792), PortId(793)], output: PortId(798), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8542, 8586), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(662), - target: TransformTarget::Callable(DeclarationId(1186)), + target: TransformTarget::Callable(DeclarationId(1187)), inputs: vec![PortId(792), PortId(798)], output: PortId(799), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8506, 8587), @@ -7528,7 +7528,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(667), - target: TransformTarget::Callable(DeclarationId(2455)), + target: TransformTarget::Callable(DeclarationId(2456)), inputs: vec![], output: PortId(802), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6287, 6297), @@ -7544,28 +7544,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(669), - target: TransformTarget::Callable(DeclarationId(2455)), + target: TransformTarget::Callable(DeclarationId(2456)), inputs: vec![], output: PortId(806), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6605, 6615), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(670), - target: TransformTarget::Callable(DeclarationId(2455)), + target: TransformTarget::Callable(DeclarationId(2456)), inputs: vec![], output: PortId(807), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6667, 6677), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(671), - target: TransformTarget::Callable(DeclarationId(2457)), + target: TransformTarget::Callable(DeclarationId(2458)), inputs: vec![], output: PortId(808), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6695, 6700), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(672), - target: TransformTarget::Callable(DeclarationId(2457)), + target: TransformTarget::Callable(DeclarationId(2458)), inputs: vec![], output: PortId(809), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6722, 6727), @@ -7581,7 +7581,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(674), - target: TransformTarget::Callable(DeclarationId(2457)), + target: TransformTarget::Callable(DeclarationId(2458)), inputs: vec![], output: PortId(812), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6764, 6769), @@ -7636,21 +7636,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(676), - target: TransformTarget::Callable(DeclarationId(2455)), + target: TransformTarget::Callable(DeclarationId(2456)), inputs: vec![], output: PortId(814), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6833, 6843), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(677), - target: TransformTarget::Callable(DeclarationId(2457)), + target: TransformTarget::Callable(DeclarationId(2458)), inputs: vec![], output: PortId(815), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6861, 6866), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(678), - target: TransformTarget::Callable(DeclarationId(2456)), + target: TransformTarget::Callable(DeclarationId(2457)), inputs: vec![], output: PortId(816), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6888, 6897), @@ -7666,7 +7666,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(680), - target: TransformTarget::Callable(DeclarationId(2456)), + target: TransformTarget::Callable(DeclarationId(2457)), inputs: vec![], output: PortId(819), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6934, 6943), @@ -7730,21 +7730,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(683), - target: TransformTarget::Callable(DeclarationId(2455)), + target: TransformTarget::Callable(DeclarationId(2456)), inputs: vec![], output: PortId(823), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7023, 7033), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(684), - target: TransformTarget::Callable(DeclarationId(2457)), + target: TransformTarget::Callable(DeclarationId(2458)), inputs: vec![], output: PortId(824), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7051, 7056), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(685), - target: TransformTarget::Callable(DeclarationId(2456)), + target: TransformTarget::Callable(DeclarationId(2457)), inputs: vec![], output: PortId(825), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7078, 7087), @@ -7785,14 +7785,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(690), - target: TransformTarget::Callable(DeclarationId(1212)), + target: TransformTarget::Callable(DeclarationId(1213)), inputs: vec![PortId(830)], output: PortId(831), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7187, 7217), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(691), - target: TransformTarget::Callable(DeclarationId(2454)), + target: TransformTarget::Callable(DeclarationId(2455)), inputs: vec![PortId(831)], output: PortId(832), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7166, 7219), @@ -7851,7 +7851,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(696), - target: TransformTarget::Callable(DeclarationId(2454)), + target: TransformTarget::Callable(DeclarationId(2455)), inputs: vec![PortId(836)], output: PortId(837), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7247, 7335), @@ -7997,7 +7997,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(702), - target: TransformTarget::Callable(DeclarationId(1219)), + target: TransformTarget::Callable(DeclarationId(1220)), inputs: vec![PortId(841), PortId(842), PortId(843)], output: PortId(844), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7515, 7558), @@ -8020,7 +8020,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(705), - target: TransformTarget::Callable(DeclarationId(1212)), + target: TransformTarget::Callable(DeclarationId(1213)), inputs: vec![PortId(845)], output: PortId(846), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7601, 7613), @@ -8036,14 +8036,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(707), - target: TransformTarget::Callable(DeclarationId(1221)), + target: TransformTarget::Callable(DeclarationId(1222)), inputs: vec![], output: PortId(847), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7693, 7711), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(708), - target: TransformTarget::Callable(DeclarationId(2454)), + target: TransformTarget::Callable(DeclarationId(2455)), inputs: vec![PortId(847)], output: PortId(848), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7672, 7713), @@ -8066,7 +8066,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(711), - target: TransformTarget::Callable(DeclarationId(1219)), + target: TransformTarget::Callable(DeclarationId(1220)), inputs: vec![PortId(849), PortId(850), PortId(851)], output: PortId(852), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7862, 7906), @@ -8082,7 +8082,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(713), - target: TransformTarget::Callable(DeclarationId(2459)), + target: TransformTarget::Callable(DeclarationId(2460)), inputs: vec![], output: PortId(853), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7967, 7972), @@ -8221,28 +8221,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(722), - target: TransformTarget::Callable(DeclarationId(2213)), + target: TransformTarget::Callable(DeclarationId(2214)), inputs: vec![], output: PortId(868), span: SourceSpan::new("src/v3/std/timing_lens.dag", 8722, 8734), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(723), - target: TransformTarget::Callable(DeclarationId(2219)), + target: TransformTarget::Callable(DeclarationId(2220)), inputs: vec![PortId(868)], output: PortId(869), span: SourceSpan::new("src/v3/std/timing_lens.dag", 8709, 8735), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(724), - target: TransformTarget::Callable(DeclarationId(1224)), + target: TransformTarget::Callable(DeclarationId(1225)), inputs: vec![], output: PortId(870), span: SourceSpan::new("src/v3/std/timing_lens.dag", 8778, 8809), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(725), - target: TransformTarget::Callable(DeclarationId(973)), + target: TransformTarget::Callable(DeclarationId(974)), inputs: vec![PortId(869), PortId(867), PortId(866), PortId(870)], output: PortId(871), span: SourceSpan::new("src/v3/std/timing_lens.dag", 8697, 8813), @@ -8258,7 +8258,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(727), - target: TransformTarget::Callable(DeclarationId(1211)), + target: TransformTarget::Callable(DeclarationId(1212)), inputs: vec![], output: PortId(872), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9120, 9153), @@ -8295,7 +8295,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(732), - target: TransformTarget::Callable(DeclarationId(1267)), + target: TransformTarget::Callable(DeclarationId(1268)), inputs: vec![PortId(876)], output: PortId(878), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9734, 9751), @@ -8329,35 +8329,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(736), - target: TransformTarget::Callable(DeclarationId(1226)), + target: TransformTarget::Callable(DeclarationId(1227)), inputs: vec![PortId(877), PortId(882)], output: PortId(883), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9862, 9926), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(737), - target: TransformTarget::Callable(DeclarationId(2247)), + target: TransformTarget::Callable(DeclarationId(2248)), inputs: vec![PortId(883)], output: PortId(884), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9826, 9938), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(738), - target: TransformTarget::Callable(DeclarationId(1227)), + target: TransformTarget::Callable(DeclarationId(1228)), inputs: vec![], output: PortId(885), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10082, 10121), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(739), - target: TransformTarget::Callable(DeclarationId(1226)), + target: TransformTarget::Callable(DeclarationId(1227)), inputs: vec![PortId(877), PortId(885)], output: PortId(886), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10002, 10135), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(740), - target: TransformTarget::Callable(DeclarationId(2247)), + target: TransformTarget::Callable(DeclarationId(2248)), inputs: vec![PortId(886)], output: PortId(887), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9966, 10147), @@ -8403,21 +8403,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(743), - target: TransformTarget::Callable(DeclarationId(1225)), + target: TransformTarget::Callable(DeclarationId(1226)), inputs: vec![PortId(890)], output: PortId(891), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10287, 10326), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(744), - target: TransformTarget::Callable(DeclarationId(1226)), + target: TransformTarget::Callable(DeclarationId(1227)), inputs: vec![PortId(877), PortId(891)], output: PortId(892), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10215, 10336), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(745), - target: TransformTarget::Callable(DeclarationId(2247)), + target: TransformTarget::Callable(DeclarationId(2248)), inputs: vec![PortId(892)], output: PortId(893), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10183, 10344), @@ -8472,14 +8472,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(749), - target: TransformTarget::Callable(DeclarationId(1218)), + target: TransformTarget::Callable(DeclarationId(1219)), inputs: vec![], output: PortId(900), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10862, 10893), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(750), - target: TransformTarget::Callable(DeclarationId(1218)), + target: TransformTarget::Callable(DeclarationId(1219)), inputs: vec![], output: PortId(902), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10916, 10947), @@ -8519,21 +8519,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(752), - target: TransformTarget::Callable(DeclarationId(2455)), + target: TransformTarget::Callable(DeclarationId(2456)), inputs: vec![], output: PortId(904), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10974, 10984), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(753), - target: TransformTarget::Callable(DeclarationId(2456)), + target: TransformTarget::Callable(DeclarationId(2457)), inputs: vec![], output: PortId(905), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11002, 11011), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(754), - target: TransformTarget::Callable(DeclarationId(2457)), + target: TransformTarget::Callable(DeclarationId(2458)), inputs: vec![], output: PortId(906), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11025, 11030), @@ -8597,42 +8597,42 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(757), - target: TransformTarget::Callable(DeclarationId(1267)), + target: TransformTarget::Callable(DeclarationId(1268)), inputs: vec![PortId(908)], output: PortId(911), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11930, 11947), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(758), - target: TransformTarget::Callable(DeclarationId(711)), + target: TransformTarget::Callable(DeclarationId(712)), inputs: vec![PortId(911)], output: PortId(912), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11921, 11948), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(759), - target: TransformTarget::Callable(DeclarationId(1218)), + target: TransformTarget::Callable(DeclarationId(1219)), inputs: vec![], output: PortId(913), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11963, 11994), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(760), - target: TransformTarget::Callable(DeclarationId(2460)), + target: TransformTarget::Callable(DeclarationId(2461)), inputs: vec![PortId(913)], output: PortId(914), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11954, 11995), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(761), - target: TransformTarget::Callable(DeclarationId(1218)), + target: TransformTarget::Callable(DeclarationId(1219)), inputs: vec![], output: PortId(915), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12010, 12041), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(762), - target: TransformTarget::Callable(DeclarationId(2461)), + target: TransformTarget::Callable(DeclarationId(2462)), inputs: vec![PortId(915)], output: PortId(916), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12001, 12042), @@ -8666,42 +8666,42 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(764), - target: TransformTarget::Callable(DeclarationId(1267)), + target: TransformTarget::Callable(DeclarationId(1268)), inputs: vec![PortId(908)], output: PortId(919), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12081, 12098), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(765), - target: TransformTarget::Callable(DeclarationId(711)), + target: TransformTarget::Callable(DeclarationId(712)), inputs: vec![PortId(919)], output: PortId(920), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12072, 12099), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(766), - target: TransformTarget::Callable(DeclarationId(1218)), + target: TransformTarget::Callable(DeclarationId(1219)), inputs: vec![], output: PortId(921), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12114, 12145), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(767), - target: TransformTarget::Callable(DeclarationId(2462)), + target: TransformTarget::Callable(DeclarationId(2463)), inputs: vec![PortId(921)], output: PortId(922), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12105, 12146), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(768), - target: TransformTarget::Callable(DeclarationId(1218)), + target: TransformTarget::Callable(DeclarationId(1219)), inputs: vec![], output: PortId(923), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12161, 12192), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(769), - target: TransformTarget::Callable(DeclarationId(2463)), + target: TransformTarget::Callable(DeclarationId(2464)), inputs: vec![PortId(923)], output: PortId(924), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12152, 12193), @@ -8735,42 +8735,42 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(771), - target: TransformTarget::Callable(DeclarationId(1267)), + target: TransformTarget::Callable(DeclarationId(1268)), inputs: vec![PortId(908)], output: PortId(927), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12229, 12246), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(772), - target: TransformTarget::Callable(DeclarationId(711)), + target: TransformTarget::Callable(DeclarationId(712)), inputs: vec![PortId(927)], output: PortId(928), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12220, 12247), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(773), - target: TransformTarget::Callable(DeclarationId(1218)), + target: TransformTarget::Callable(DeclarationId(1219)), inputs: vec![], output: PortId(929), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12262, 12293), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(774), - target: TransformTarget::Callable(DeclarationId(2464)), + target: TransformTarget::Callable(DeclarationId(2465)), inputs: vec![PortId(929)], output: PortId(930), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12253, 12294), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(775), - target: TransformTarget::Callable(DeclarationId(1218)), + target: TransformTarget::Callable(DeclarationId(1219)), inputs: vec![], output: PortId(931), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12309, 12340), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(776), - target: TransformTarget::Callable(DeclarationId(2465)), + target: TransformTarget::Callable(DeclarationId(2466)), inputs: vec![PortId(931)], output: PortId(932), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12300, 12341), @@ -8804,42 +8804,42 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(778), - target: TransformTarget::Callable(DeclarationId(1267)), + target: TransformTarget::Callable(DeclarationId(1268)), inputs: vec![PortId(908)], output: PortId(935), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12375, 12392), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(779), - target: TransformTarget::Callable(DeclarationId(711)), + target: TransformTarget::Callable(DeclarationId(712)), inputs: vec![PortId(935)], output: PortId(936), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12366, 12393), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(780), - target: TransformTarget::Callable(DeclarationId(1218)), + target: TransformTarget::Callable(DeclarationId(1219)), inputs: vec![], output: PortId(937), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12408, 12439), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(781), - target: TransformTarget::Callable(DeclarationId(2466)), + target: TransformTarget::Callable(DeclarationId(2467)), inputs: vec![PortId(937)], output: PortId(938), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12399, 12440), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(782), - target: TransformTarget::Callable(DeclarationId(1218)), + target: TransformTarget::Callable(DeclarationId(1219)), inputs: vec![], output: PortId(939), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12455, 12486), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(783), - target: TransformTarget::Callable(DeclarationId(2467)), + target: TransformTarget::Callable(DeclarationId(2468)), inputs: vec![PortId(939)], output: PortId(940), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12446, 12487), @@ -8873,42 +8873,42 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(785), - target: TransformTarget::Callable(DeclarationId(1267)), + target: TransformTarget::Callable(DeclarationId(1268)), inputs: vec![PortId(908)], output: PortId(943), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12521, 12538), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(786), - target: TransformTarget::Callable(DeclarationId(711)), + target: TransformTarget::Callable(DeclarationId(712)), inputs: vec![PortId(943)], output: PortId(944), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12512, 12539), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(787), - target: TransformTarget::Callable(DeclarationId(1218)), + target: TransformTarget::Callable(DeclarationId(1219)), inputs: vec![], output: PortId(945), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12554, 12585), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(788), - target: TransformTarget::Callable(DeclarationId(2468)), + target: TransformTarget::Callable(DeclarationId(2469)), inputs: vec![PortId(945)], output: PortId(946), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12545, 12586), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(789), - target: TransformTarget::Callable(DeclarationId(1218)), + target: TransformTarget::Callable(DeclarationId(1219)), inputs: vec![], output: PortId(947), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12601, 12632), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(790), - target: TransformTarget::Callable(DeclarationId(2469)), + target: TransformTarget::Callable(DeclarationId(2470)), inputs: vec![PortId(947)], output: PortId(948), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12592, 12633), @@ -9029,28 +9029,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(795), - target: TransformTarget::Callable(DeclarationId(1267)), + target: TransformTarget::Callable(DeclarationId(1268)), inputs: vec![PortId(951)], output: PortId(955), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12793, 12810), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(796), - target: TransformTarget::Callable(DeclarationId(711)), + target: TransformTarget::Callable(DeclarationId(712)), inputs: vec![PortId(955)], output: PortId(956), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12784, 12811), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(797), - target: TransformTarget::Callable(DeclarationId(2246)), + target: TransformTarget::Callable(DeclarationId(2247)), inputs: vec![], output: PortId(957), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12817, 12829), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(798), - target: TransformTarget::Callable(DeclarationId(2246)), + target: TransformTarget::Callable(DeclarationId(2247)), inputs: vec![], output: PortId(958), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12835, 12847), @@ -9085,7 +9085,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { nodes.push(Behavior::Value(ValueNode { id: NodeId(800), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Unobserved is not admissible evidence at this scaffold (missing external timing row).".to_string()), output: PortId(960), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12926, 13053), lane2_workflow: None })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(801), - target: TransformTarget::Callable(DeclarationId(1228)), + target: TransformTarget::Callable(DeclarationId(1229)), inputs: vec![PortId(951), PortId(960)], output: PortId(961), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12872, 13061), @@ -9093,7 +9093,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { nodes.push(Behavior::Value(ValueNode { id: NodeId(802), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Ambiguous is not admissible evidence at this scaffold (conflicting timing facts).".to_string()), output: PortId(962), span: SourceSpan::new("src/v3/std/timing_lens.dag", 13139, 13262), lane2_workflow: None })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(803), - target: TransformTarget::Callable(DeclarationId(1228)), + target: TransformTarget::Callable(DeclarationId(1229)), inputs: vec![PortId(951), PortId(962)], output: PortId(963), span: SourceSpan::new("src/v3/std/timing_lens.dag", 13085, 13270), @@ -9101,7 +9101,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { nodes.push(Behavior::Value(ValueNode { id: NodeId(804), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Stale is not admissible evidence at this scaffold (digest/run mismatch vs attachment).".to_string()), output: PortId(964), span: SourceSpan::new("src/v3/std/timing_lens.dag", 13344, 13472), lane2_workflow: None })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(805), - target: TransformTarget::Callable(DeclarationId(1228)), + target: TransformTarget::Callable(DeclarationId(1229)), inputs: vec![PortId(951), PortId(964)], output: PortId(965), span: SourceSpan::new("src/v3/std/timing_lens.dag", 13290, 13480), @@ -9734,7 +9734,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { #[allow(clippy::vec_init_then_push)] fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec { { - let mut declarations = Vec::with_capacity(3115); + let mut declarations = Vec::with_capacity(3116); declarations.push(Declaration { id: DeclarationId(0), name: Some("Classical".to_string()), @@ -12832,7 +12832,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2296), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3551, 4204) }); - declarations.push(Declaration { id: DeclarationId(1162), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1045), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1045)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2296), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4206, 4701) }); - declarations.push(Declaration { id: DeclarationId(1163), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1045), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1045)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2296), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4703, 5192) }); - declarations.push(Declaration { id: DeclarationId(1164), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1045), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1045)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2296), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5194, 5725) }); - declarations.push(Declaration { id: DeclarationId(1165), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1045) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2374)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2296), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2296), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2296), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2296), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2296), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2296), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2296), payload: vec![] })]), FieldValue::Reference(DeclarationId(1161)), FieldValue::Reference(DeclarationId(1162)), FieldValue::Reference(DeclarationId(1163)), FieldValue::Reference(DeclarationId(1164)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2296), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2296), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5728, 8449) }); + declarations.push(Declaration { id: DeclarationId(1162), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2299), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3551, 4204) }); + declarations.push(Declaration { id: DeclarationId(1163), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2299), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4206, 4701) }); + declarations.push(Declaration { id: DeclarationId(1164), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2299), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4703, 5192) }); + declarations.push(Declaration { id: DeclarationId(1165), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2299), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5194, 5725) }); + declarations.push(Declaration { id: DeclarationId(1166), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), value: DeclarationId(1046) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2375)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Reference(DeclarationId(1162)), FieldValue::Reference(DeclarationId(1163)), FieldValue::Reference(DeclarationId(1164)), FieldValue::Reference(DeclarationId(1165)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5728, 8449) }); declarations.push(Declaration { - id: DeclarationId(1166), + id: DeclarationId(1167), name: Some("InputField".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -38799,7 +38836,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>()".to_string(), ))], @@ -58528,7 +58565,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap { { let mut map = HashMap::new(); - map.insert(DeclarationId(389), DeclarationId(2760)); - map.insert(DeclarationId(391), DeclarationId(2763)); - map.insert(DeclarationId(423), DeclarationId(2766)); - map.insert(DeclarationId(426), DeclarationId(2769)); - map.insert(DeclarationId(471), DeclarationId(2772)); - map.insert(DeclarationId(472), DeclarationId(2775)); - map.insert(DeclarationId(473), DeclarationId(2778)); - map.insert(DeclarationId(513), DeclarationId(2781)); - map.insert(DeclarationId(515), DeclarationId(2784)); - map.insert(DeclarationId(516), DeclarationId(2787)); - map.insert(DeclarationId(539), DeclarationId(2790)); - map.insert(DeclarationId(582), DeclarationId(2793)); - map.insert(DeclarationId(602), DeclarationId(2796)); - map.insert(DeclarationId(603), DeclarationId(2799)); - map.insert(DeclarationId(605), DeclarationId(2802)); - map.insert(DeclarationId(608), DeclarationId(2805)); - map.insert(DeclarationId(613), DeclarationId(2808)); - map.insert(DeclarationId(614), DeclarationId(2811)); - map.insert(DeclarationId(618), DeclarationId(2814)); - map.insert(DeclarationId(619), DeclarationId(2817)); - map.insert(DeclarationId(620), DeclarationId(2820)); - map.insert(DeclarationId(625), DeclarationId(2823)); - map.insert(DeclarationId(1772), DeclarationId(2826)); - map.insert(DeclarationId(1776), DeclarationId(2829)); - map.insert(DeclarationId(1779), DeclarationId(2832)); - map.insert(DeclarationId(1781), DeclarationId(2835)); - map.insert(DeclarationId(1782), DeclarationId(2838)); - map.insert(DeclarationId(1783), DeclarationId(2841)); - map.insert(DeclarationId(1837), DeclarationId(2844)); - map.insert(DeclarationId(1838), DeclarationId(2847)); - map.insert(DeclarationId(1839), DeclarationId(2850)); - map.insert(DeclarationId(1840), DeclarationId(2853)); - map.insert(DeclarationId(1841), DeclarationId(2856)); - map.insert(DeclarationId(1842), DeclarationId(2859)); - map.insert(DeclarationId(1848), DeclarationId(2862)); - map.insert(DeclarationId(1903), DeclarationId(2865)); - map.insert(DeclarationId(1906), DeclarationId(2868)); - map.insert(DeclarationId(1907), DeclarationId(2871)); - map.insert(DeclarationId(1908), DeclarationId(2874)); - map.insert(DeclarationId(1909), DeclarationId(2877)); - map.insert(DeclarationId(1932), DeclarationId(2880)); - map.insert(DeclarationId(1937), DeclarationId(2883)); - map.insert(DeclarationId(1941), DeclarationId(2886)); - map.insert(DeclarationId(1944), DeclarationId(2889)); - map.insert(DeclarationId(1945), DeclarationId(2892)); - map.insert(DeclarationId(1990), DeclarationId(2895)); - map.insert(DeclarationId(1991), DeclarationId(2898)); - map.insert(DeclarationId(1992), DeclarationId(2901)); - map.insert(DeclarationId(1993), DeclarationId(2904)); - map.insert(DeclarationId(2043), DeclarationId(2907)); - map.insert(DeclarationId(2044), DeclarationId(2910)); - map.insert(DeclarationId(2058), DeclarationId(2913)); - map.insert(DeclarationId(2059), DeclarationId(2916)); - map.insert(DeclarationId(2070), DeclarationId(2919)); - map.insert(DeclarationId(2071), DeclarationId(2922)); - map.insert(DeclarationId(2073), DeclarationId(2925)); - map.insert(DeclarationId(2074), DeclarationId(2928)); - map.insert(DeclarationId(2076), DeclarationId(2931)); - map.insert(DeclarationId(2077), DeclarationId(2934)); - map.insert(DeclarationId(2079), DeclarationId(2937)); - map.insert(DeclarationId(2081), DeclarationId(2940)); - map.insert(DeclarationId(2084), DeclarationId(2943)); - map.insert(DeclarationId(2088), DeclarationId(2946)); - map.insert(DeclarationId(2090), DeclarationId(2949)); - map.insert(DeclarationId(2092), DeclarationId(2952)); - map.insert(DeclarationId(2102), DeclarationId(2955)); - map.insert(DeclarationId(2103), DeclarationId(2958)); - map.insert(DeclarationId(2104), DeclarationId(2961)); - map.insert(DeclarationId(2107), DeclarationId(2964)); - map.insert(DeclarationId(2108), DeclarationId(2967)); - map.insert(DeclarationId(2143), DeclarationId(2970)); - map.insert(DeclarationId(2144), DeclarationId(2973)); - map.insert(DeclarationId(2145), DeclarationId(2976)); - map.insert(DeclarationId(2146), DeclarationId(2979)); - map.insert(DeclarationId(2147), DeclarationId(2982)); - map.insert(DeclarationId(2170), DeclarationId(2985)); - map.insert(DeclarationId(2300), DeclarationId(2988)); - map.insert(DeclarationId(2301), DeclarationId(2991)); - map.insert(DeclarationId(2307), DeclarationId(2994)); - map.insert(DeclarationId(2308), DeclarationId(2997)); - map.insert(DeclarationId(2309), DeclarationId(3000)); - map.insert(DeclarationId(2310), DeclarationId(3003)); - map.insert(DeclarationId(2311), DeclarationId(3006)); - map.insert(DeclarationId(2312), DeclarationId(3009)); - map.insert(DeclarationId(2417), DeclarationId(3012)); - map.insert(DeclarationId(2418), DeclarationId(3015)); - map.insert(DeclarationId(2419), DeclarationId(3018)); - map.insert(DeclarationId(2422), DeclarationId(3021)); - map.insert(DeclarationId(2423), DeclarationId(3024)); - map.insert(DeclarationId(2617), DeclarationId(3027)); - map.insert(DeclarationId(2646), DeclarationId(3030)); - map.insert(DeclarationId(2652), DeclarationId(3033)); - map.insert(DeclarationId(2659), DeclarationId(3036)); - map.insert(DeclarationId(2678), DeclarationId(3039)); - map.insert(DeclarationId(2679), DeclarationId(3042)); - map.insert(DeclarationId(2687), DeclarationId(3045)); - map.insert(DeclarationId(2691), DeclarationId(3048)); - map.insert(DeclarationId(2692), DeclarationId(3051)); - map.insert(DeclarationId(2693), DeclarationId(3054)); - map.insert(DeclarationId(2694), DeclarationId(3057)); - map.insert(DeclarationId(2704), DeclarationId(3060)); - map.insert(DeclarationId(2706), DeclarationId(3063)); - map.insert(DeclarationId(2707), DeclarationId(3066)); - map.insert(DeclarationId(2708), DeclarationId(3069)); - map.insert(DeclarationId(2710), DeclarationId(3072)); - map.insert(DeclarationId(2713), DeclarationId(3075)); - map.insert(DeclarationId(2714), DeclarationId(3078)); - map.insert(DeclarationId(2721), DeclarationId(3081)); - map.insert(DeclarationId(2722), DeclarationId(3084)); - map.insert(DeclarationId(2723), DeclarationId(3087)); - map.insert(DeclarationId(2725), DeclarationId(3090)); - map.insert(DeclarationId(2726), DeclarationId(3093)); - map.insert(DeclarationId(2727), DeclarationId(3096)); - map.insert(DeclarationId(2729), DeclarationId(3099)); - map.insert(DeclarationId(2730), DeclarationId(3102)); - map.insert(DeclarationId(2731), DeclarationId(3105)); - map.insert(DeclarationId(2738), DeclarationId(3108)); - map.insert(DeclarationId(2740), DeclarationId(3111)); - map.insert(DeclarationId(2751), DeclarationId(3114)); + map.insert(DeclarationId(389), DeclarationId(2761)); + map.insert(DeclarationId(391), DeclarationId(2764)); + map.insert(DeclarationId(423), DeclarationId(2767)); + map.insert(DeclarationId(426), DeclarationId(2770)); + map.insert(DeclarationId(471), DeclarationId(2773)); + map.insert(DeclarationId(472), DeclarationId(2776)); + map.insert(DeclarationId(473), DeclarationId(2779)); + map.insert(DeclarationId(513), DeclarationId(2782)); + map.insert(DeclarationId(515), DeclarationId(2785)); + map.insert(DeclarationId(516), DeclarationId(2788)); + map.insert(DeclarationId(539), DeclarationId(2791)); + map.insert(DeclarationId(582), DeclarationId(2794)); + map.insert(DeclarationId(602), DeclarationId(2797)); + map.insert(DeclarationId(603), DeclarationId(2800)); + map.insert(DeclarationId(605), DeclarationId(2803)); + map.insert(DeclarationId(608), DeclarationId(2806)); + map.insert(DeclarationId(613), DeclarationId(2809)); + map.insert(DeclarationId(614), DeclarationId(2812)); + map.insert(DeclarationId(618), DeclarationId(2815)); + map.insert(DeclarationId(619), DeclarationId(2818)); + map.insert(DeclarationId(620), DeclarationId(2821)); + map.insert(DeclarationId(625), DeclarationId(2824)); + map.insert(DeclarationId(1773), DeclarationId(2827)); + map.insert(DeclarationId(1777), DeclarationId(2830)); + map.insert(DeclarationId(1780), DeclarationId(2833)); + map.insert(DeclarationId(1782), DeclarationId(2836)); + map.insert(DeclarationId(1783), DeclarationId(2839)); + map.insert(DeclarationId(1784), DeclarationId(2842)); + map.insert(DeclarationId(1838), DeclarationId(2845)); + map.insert(DeclarationId(1839), DeclarationId(2848)); + map.insert(DeclarationId(1840), DeclarationId(2851)); + map.insert(DeclarationId(1841), DeclarationId(2854)); + map.insert(DeclarationId(1842), DeclarationId(2857)); + map.insert(DeclarationId(1843), DeclarationId(2860)); + map.insert(DeclarationId(1849), DeclarationId(2863)); + map.insert(DeclarationId(1904), DeclarationId(2866)); + map.insert(DeclarationId(1907), DeclarationId(2869)); + map.insert(DeclarationId(1908), DeclarationId(2872)); + map.insert(DeclarationId(1909), DeclarationId(2875)); + map.insert(DeclarationId(1910), DeclarationId(2878)); + map.insert(DeclarationId(1933), DeclarationId(2881)); + map.insert(DeclarationId(1938), DeclarationId(2884)); + map.insert(DeclarationId(1942), DeclarationId(2887)); + map.insert(DeclarationId(1945), DeclarationId(2890)); + map.insert(DeclarationId(1946), DeclarationId(2893)); + map.insert(DeclarationId(1991), DeclarationId(2896)); + map.insert(DeclarationId(1992), DeclarationId(2899)); + map.insert(DeclarationId(1993), DeclarationId(2902)); + map.insert(DeclarationId(1994), DeclarationId(2905)); + map.insert(DeclarationId(2044), DeclarationId(2908)); + map.insert(DeclarationId(2045), DeclarationId(2911)); + map.insert(DeclarationId(2059), DeclarationId(2914)); + map.insert(DeclarationId(2060), DeclarationId(2917)); + map.insert(DeclarationId(2071), DeclarationId(2920)); + map.insert(DeclarationId(2072), DeclarationId(2923)); + map.insert(DeclarationId(2074), DeclarationId(2926)); + map.insert(DeclarationId(2075), DeclarationId(2929)); + map.insert(DeclarationId(2077), DeclarationId(2932)); + map.insert(DeclarationId(2078), DeclarationId(2935)); + map.insert(DeclarationId(2080), DeclarationId(2938)); + map.insert(DeclarationId(2082), DeclarationId(2941)); + map.insert(DeclarationId(2085), DeclarationId(2944)); + map.insert(DeclarationId(2089), DeclarationId(2947)); + map.insert(DeclarationId(2091), DeclarationId(2950)); + map.insert(DeclarationId(2093), DeclarationId(2953)); + map.insert(DeclarationId(2103), DeclarationId(2956)); + map.insert(DeclarationId(2104), DeclarationId(2959)); + map.insert(DeclarationId(2105), DeclarationId(2962)); + map.insert(DeclarationId(2108), DeclarationId(2965)); + map.insert(DeclarationId(2109), DeclarationId(2968)); + map.insert(DeclarationId(2144), DeclarationId(2971)); + map.insert(DeclarationId(2145), DeclarationId(2974)); + map.insert(DeclarationId(2146), DeclarationId(2977)); + map.insert(DeclarationId(2147), DeclarationId(2980)); + map.insert(DeclarationId(2148), DeclarationId(2983)); + map.insert(DeclarationId(2171), DeclarationId(2986)); + map.insert(DeclarationId(2301), DeclarationId(2989)); + map.insert(DeclarationId(2302), DeclarationId(2992)); + map.insert(DeclarationId(2308), DeclarationId(2995)); + map.insert(DeclarationId(2309), DeclarationId(2998)); + map.insert(DeclarationId(2310), DeclarationId(3001)); + map.insert(DeclarationId(2311), DeclarationId(3004)); + map.insert(DeclarationId(2312), DeclarationId(3007)); + map.insert(DeclarationId(2313), DeclarationId(3010)); + map.insert(DeclarationId(2418), DeclarationId(3013)); + map.insert(DeclarationId(2419), DeclarationId(3016)); + map.insert(DeclarationId(2420), DeclarationId(3019)); + map.insert(DeclarationId(2423), DeclarationId(3022)); + map.insert(DeclarationId(2424), DeclarationId(3025)); + map.insert(DeclarationId(2618), DeclarationId(3028)); + map.insert(DeclarationId(2647), DeclarationId(3031)); + map.insert(DeclarationId(2653), DeclarationId(3034)); + map.insert(DeclarationId(2660), DeclarationId(3037)); + map.insert(DeclarationId(2679), DeclarationId(3040)); + map.insert(DeclarationId(2680), DeclarationId(3043)); + map.insert(DeclarationId(2688), DeclarationId(3046)); + map.insert(DeclarationId(2692), DeclarationId(3049)); + map.insert(DeclarationId(2693), DeclarationId(3052)); + map.insert(DeclarationId(2694), DeclarationId(3055)); + map.insert(DeclarationId(2695), DeclarationId(3058)); + map.insert(DeclarationId(2705), DeclarationId(3061)); + map.insert(DeclarationId(2707), DeclarationId(3064)); + map.insert(DeclarationId(2708), DeclarationId(3067)); + map.insert(DeclarationId(2709), DeclarationId(3070)); + map.insert(DeclarationId(2711), DeclarationId(3073)); + map.insert(DeclarationId(2714), DeclarationId(3076)); + map.insert(DeclarationId(2715), DeclarationId(3079)); + map.insert(DeclarationId(2722), DeclarationId(3082)); + map.insert(DeclarationId(2723), DeclarationId(3085)); + map.insert(DeclarationId(2724), DeclarationId(3088)); + map.insert(DeclarationId(2726), DeclarationId(3091)); + map.insert(DeclarationId(2727), DeclarationId(3094)); + map.insert(DeclarationId(2728), DeclarationId(3097)); + map.insert(DeclarationId(2730), DeclarationId(3100)); + map.insert(DeclarationId(2731), DeclarationId(3103)); + map.insert(DeclarationId(2732), DeclarationId(3106)); + map.insert(DeclarationId(2739), DeclarationId(3109)); + map.insert(DeclarationId(2741), DeclarationId(3112)); + map.insert(DeclarationId(2752), DeclarationId(3115)); map } } diff --git a/src/v3/compiler/src/bootstrap_std_generated.rs b/src/v3/compiler/src/bootstrap_std_generated.rs index 0773db0d43b..d1153308ac8 100644 --- a/src/v3/compiler/src/bootstrap_std_generated.rs +++ b/src/v3/compiler/src/bootstrap_std_generated.rs @@ -8,7 +8,7 @@ pub(crate) fn bootstrapped_std_fixture_dag() -> Dag { ports: bootstrapped_std_fixture_dag_ports(), diagnostics: bootstrapped_std_fixture_dag_diagnostics(), next_node_id: 171, - next_declaration_id: 685, + next_declaration_id: 686, next_port_id: 171, primitives: PrimitiveCache::default(), substrate_markers: SubstrateMarkers::default(), @@ -24,7 +24,7 @@ pub(crate) fn bootstrapped_std_fixture_dag() -> Dag { emit_model_variants: EmitModelVariants::default(), clusters: bootstrapped_std_fixture_dag_clusters(), optional_match_disjs: bootstrapped_std_fixture_dag_optional_match_disjs(), - declaration_append_begin_after_bootstrap: 685, + declaration_append_begin_after_bootstrap: 686, } } @@ -1290,7 +1290,7 @@ fn bootstrapped_std_fixture_dag_nodes() -> Vec { #[allow(clippy::vec_init_then_push)] fn bootstrapped_std_fixture_dag_declarations() -> Vec { { - let mut declarations = Vec::with_capacity(685); + let mut declarations = Vec::with_capacity(686); declarations.push(Declaration { id: DeclarationId(0), name: Some("Classical".to_string()), @@ -4388,7 +4388,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec { phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, - inhabits: Some(DeclarationId(684)), + inhabits: Some(DeclarationId(685)), value_body: None, refinement: None, nominal_opacity: None, @@ -8996,6 +8996,10 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec { label: "TaggedVariant".to_string(), ty: DeclarationId(681), }, + Field { + label: "UntaggedJsonStringOrArray".to_string(), + ty: DeclarationId(682), + }, ], }, type_params: vec![], @@ -9006,7 +9010,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/std/serialization.dag", 2606, 2780), + span: SourceSpan::new("dsl/std/serialization.dag", 2990, 3312), }); declarations.push(Declaration { id: DeclarationId(313), @@ -9031,7 +9035,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/std/serialization.dag", 3002, 3088), + span: SourceSpan::new("dsl/std/serialization.dag", 3534, 3620), }); declarations.push(Declaration { id: DeclarationId(314), @@ -9050,7 +9054,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/std/serialization.dag", 3233, 3290), + span: SourceSpan::new("dsl/std/serialization.dag", 3765, 3822), }); declarations.push(Declaration { id: DeclarationId(315), @@ -9059,11 +9063,11 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Json".to_string(), - ty: DeclarationId(682), + ty: DeclarationId(683), }, Field { label: "Text".to_string(), - ty: DeclarationId(683), + ty: DeclarationId(684), }, ], }, @@ -9075,7 +9079,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/std/serialization.dag", 3481, 3510), + span: SourceSpan::new("dsl/std/serialization.dag", 4013, 4042), }); declarations.push(Declaration { id: DeclarationId(316), @@ -15388,7 +15392,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/std/serialization.dag", 2631, 2670), + span: SourceSpan::new("dsl/std/serialization.dag", 3015, 3054), }); declarations.push(Declaration { id: DeclarationId(679), @@ -15413,7 +15417,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/std/serialization.dag", 2675, 2742), + span: SourceSpan::new("dsl/std/serialization.dag", 3059, 3126), }); declarations.push(Declaration { id: DeclarationId(680), @@ -15427,7 +15431,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/std/serialization.dag", 2747, 2762), + span: SourceSpan::new("dsl/std/serialization.dag", 3131, 3146), }); declarations.push(Declaration { id: DeclarationId(681), @@ -15441,12 +15445,31 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/std/serialization.dag", 2767, 2780), + span: SourceSpan::new("dsl/std/serialization.dag", 3151, 3164), }); declarations.push(Declaration { id: DeclarationId(682), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Conj { + children: vec![ + Field { + label: "string_variant".to_string(), + ty: DeclarationId(230), + }, + Field { + label: "string_field".to_string(), + ty: DeclarationId(230), + }, + Field { + label: "array_variant".to_string(), + ty: DeclarationId(230), + }, + Field { + label: "array_field".to_string(), + ty: DeclarationId(230), + }, + ], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -15455,7 +15478,7 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/std/serialization.dag", 3499, 3503), + span: SourceSpan::new("dsl/std/serialization.dag", 3169, 3312), }); declarations.push(Declaration { id: DeclarationId(683), @@ -15469,11 +15492,25 @@ fn bootstrapped_std_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/std/serialization.dag", 3506, 3510), + span: SourceSpan::new("dsl/std/serialization.dag", 4031, 4035), }); declarations.push(Declaration { id: DeclarationId(684), name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/serialization.dag", 4038, 4042), + }); + declarations.push(Declaration { + id: DeclarationId(685), + name: None, connective: TypeConnective::Instantiation { template: DeclarationId(45), arguments: vec![TemplateArgument { From bd0a6f6ceefa8e520f125cf69651235fc6c31e24 Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sun, 10 May 2026 14:28:38 -0400 Subject: [PATCH 15/18] =?UTF-8?q?WIP:=20T-Anthropic-Wire=20coproduct=20sli?= =?UTF-8?q?ce=202=20=E2=80=94=20Anthropic=20tool=5Fresult=5Fcontent=20wire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/v3/grounding_coercion_fold/src/fold.rs | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/v3/grounding_coercion_fold/src/fold.rs b/src/v3/grounding_coercion_fold/src/fold.rs index 8b761755526..123e6812d75 100644 --- a/src/v3/grounding_coercion_fold/src/fold.rs +++ b/src/v3/grounding_coercion_fold/src/fold.rs @@ -149,9 +149,24 @@ fn reference_field(fields: &[(String, FieldValue)], label: &str) -> Option Option { + match s.parse::() { + Ok(value) => Some(value), + Err(error) => { + debug_assert!( + s.is_empty(), + "substrate Int literal must be valid decimal i64 text when non-empty (got {s:?}: {error})" + ); + None + } + } +} + fn int_literal_field(fields: &[(String, FieldValue)], label: &str) -> Option { match field(fields, label)? { - FieldValue::Literal(LiteralBits::Int(value)) => value.parse().ok(), + FieldValue::Literal(LiteralBits::Int(value)) => i64_from_substrate_int_text(value), _ => None, } } @@ -189,7 +204,7 @@ fn parse_positive_interval_width(dag: &Dag, value: &FieldValue) -> Option { if let [FieldValue::Literal(LiteralBits::Int(units))] = payload.as_slice() { return Some(PositiveIntervalWidth::UnitCount { - units: units.parse().ok()?, + units: i64_from_substrate_int_text(units)?, }); } if let [FieldValue::Record(fields)] = payload.as_slice() { @@ -250,7 +265,7 @@ fn parse_int_interval(dag: &Dag, value: &FieldValue) -> Option> { "BoundedInterval" => { if let [FieldValue::Literal(LiteralBits::Int(lower)), width] = payload.as_slice() { return Some(Interval::BoundedInterval { - lower: lower.parse().ok()?, + lower: i64_from_substrate_int_text(lower)?, width: parse_interval_width(dag, width)?, }); } From 6b21f968c00fedc0b891187be57d2d9fa20b4293 Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sun, 10 May 2026 14:49:34 -0400 Subject: [PATCH 16/18] =?UTF-8?q?WIP:=20T-Anthropic-Wire=20coproduct=20sli?= =?UTF-8?q?ce=202=20=E2=80=94=20Anthropic=20tool=5Fresult=5Fcontent=20wire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/v3/compiler/src/bootstrap_generated.rs | 19202 +++++++++++++++- ...otstrap_generated_without_parse_surface.rs | 17565 +++++++++++++- src/v3/grounding_coercion_fold/src/fold.rs | 25 +- src/v3/std/anthropic_schema.dag | 17 +- 4 files changed, 34634 insertions(+), 2175 deletions(-) diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs index 12ab530fc7b..92e1774b974 100644 --- a/src/v3/compiler/src/bootstrap_generated.rs +++ b/src/v3/compiler/src/bootstrap_generated.rs @@ -8,7 +8,11 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag { ports: bootstrapped_fixture_dag_ports(), diagnostics: bootstrapped_fixture_dag_diagnostics(), next_node_id: 844, +<<<<<<< HEAD next_declaration_id: 3218, +======= + next_declaration_id: 3225, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) next_port_id: 1009, primitives: PrimitiveCache::default(), substrate_markers: SubstrateMarkers::default(), @@ -24,7 +28,11 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag { emit_model_variants: EmitModelVariants::default(), clusters: bootstrapped_fixture_dag_clusters(), optional_match_disjs: bootstrapped_fixture_dag_optional_match_disjs(), +<<<<<<< HEAD declaration_append_begin_after_bootstrap: 3218, +======= + declaration_append_begin_after_bootstrap: 3225, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) } } @@ -6320,7 +6328,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(559), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2484)), +======= + target: TransformTarget::Callable(DeclarationId(2491)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(678)], output: PortId(679), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3087, 3125), @@ -6343,7 +6355,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(562), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2485)), +======= + target: TransformTarget::Callable(DeclarationId(2492)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(682)], output: PortId(683), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3165, 3203), @@ -6409,7 +6425,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(567), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2486)), +======= + target: TransformTarget::Callable(DeclarationId(2493)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(688)], output: PortId(689), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3324, 3362), @@ -6432,7 +6452,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(570), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2487)), +======= + target: TransformTarget::Callable(DeclarationId(2494)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(692)], output: PortId(693), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3402, 3440), @@ -6498,7 +6522,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(575), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2488)), +======= + target: TransformTarget::Callable(DeclarationId(2495)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(698)], output: PortId(699), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3558, 3596), @@ -6521,7 +6549,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(578), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2489)), +======= + target: TransformTarget::Callable(DeclarationId(2496)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(702)], output: PortId(703), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3636, 3674), @@ -6587,7 +6619,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(583), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2490)), +======= + target: TransformTarget::Callable(DeclarationId(2497)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(708)], output: PortId(709), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3790, 3828), @@ -6610,7 +6646,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(586), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2491)), +======= + target: TransformTarget::Callable(DeclarationId(2498)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(712)], output: PortId(713), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3868, 3906), @@ -6676,7 +6716,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(591), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2492)), +======= + target: TransformTarget::Callable(DeclarationId(2499)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(718)], output: PortId(719), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4022, 4060), @@ -6699,7 +6743,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(594), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2493)), +======= + target: TransformTarget::Callable(DeclarationId(2500)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(722)], output: PortId(723), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4100, 4138), @@ -6858,7 +6906,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(600), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2494)), +======= + target: TransformTarget::Callable(DeclarationId(2501)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(729), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4824, 4829), @@ -6874,7 +6926,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(602), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2495)), +======= + target: TransformTarget::Callable(DeclarationId(2502)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(730), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4889, 4894), @@ -6890,7 +6946,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(604), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2496)), +======= + target: TransformTarget::Callable(DeclarationId(2503)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(731), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4952, 4957), @@ -6906,7 +6966,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(606), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2497)), +======= + target: TransformTarget::Callable(DeclarationId(2504)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(732), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5015, 5020), @@ -6922,7 +6986,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(608), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2498)), +======= + target: TransformTarget::Callable(DeclarationId(2505)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(733), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5079, 5084), @@ -6938,7 +7006,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(610), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2499)), +======= + target: TransformTarget::Callable(DeclarationId(2506)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(734), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5159, 5164), @@ -6954,7 +7026,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(612), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2501)), +======= + target: TransformTarget::Callable(DeclarationId(2508)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(735)], output: PortId(736), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5275, 5286), @@ -6968,7 +7044,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(614), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2500)), +======= + target: TransformTarget::Callable(DeclarationId(2507)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(736), PortId(737)], output: PortId(738), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5262, 5327), @@ -6991,7 +7071,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(617), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2502)), +======= + target: TransformTarget::Callable(DeclarationId(2509)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(739), PortId(740)], output: PortId(741), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5403, 5461), @@ -7021,7 +7105,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(621), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2503)), +======= + target: TransformTarget::Callable(DeclarationId(2510)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(743), PortId(742), PortId(744)], output: PortId(745), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5562, 5687), @@ -7058,7 +7146,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(626), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2504)), +======= + target: TransformTarget::Callable(DeclarationId(2511)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(748), PortId(749), PortId(750)], output: PortId(751), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5808, 5970), @@ -7528,7 +7620,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(667), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2543)), +======= + target: TransformTarget::Callable(DeclarationId(2550)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(802), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6287, 6297), @@ -7544,28 +7640,44 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(669), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2543)), +======= + target: TransformTarget::Callable(DeclarationId(2550)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(806), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6605, 6615), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(670), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2543)), +======= + target: TransformTarget::Callable(DeclarationId(2550)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(807), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6667, 6677), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(671), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2545)), +======= + target: TransformTarget::Callable(DeclarationId(2552)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(808), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6695, 6700), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(672), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2545)), +======= + target: TransformTarget::Callable(DeclarationId(2552)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(809), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6722, 6727), @@ -7581,7 +7693,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(674), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2545)), +======= + target: TransformTarget::Callable(DeclarationId(2552)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(812), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6764, 6769), @@ -7636,21 +7752,33 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(676), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2543)), +======= + target: TransformTarget::Callable(DeclarationId(2550)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(814), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6833, 6843), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(677), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2545)), +======= + target: TransformTarget::Callable(DeclarationId(2552)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(815), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6861, 6866), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(678), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2544)), +======= + target: TransformTarget::Callable(DeclarationId(2551)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(816), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6888, 6897), @@ -7666,7 +7794,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(680), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2544)), +======= + target: TransformTarget::Callable(DeclarationId(2551)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(819), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6934, 6943), @@ -7730,21 +7862,33 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(683), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2543)), +======= + target: TransformTarget::Callable(DeclarationId(2550)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(823), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7023, 7033), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(684), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2545)), +======= + target: TransformTarget::Callable(DeclarationId(2552)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(824), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7051, 7056), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(685), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2544)), +======= + target: TransformTarget::Callable(DeclarationId(2551)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(825), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7078, 7087), @@ -7792,7 +7936,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(691), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2542)), +======= + target: TransformTarget::Callable(DeclarationId(2549)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(831)], output: PortId(832), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7166, 7219), @@ -7851,7 +7999,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(696), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2542)), +======= + target: TransformTarget::Callable(DeclarationId(2549)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(836)], output: PortId(837), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7247, 7335), @@ -8043,7 +8195,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(708), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2542)), +======= + target: TransformTarget::Callable(DeclarationId(2549)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(847)], output: PortId(848), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7672, 7713), @@ -8082,7 +8238,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(713), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2547)), +======= + target: TransformTarget::Callable(DeclarationId(2554)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(853), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7967, 7972), @@ -8221,14 +8381,22 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(722), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2229)), +======= + target: TransformTarget::Callable(DeclarationId(2236)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(868), span: SourceSpan::new("src/v3/std/timing_lens.dag", 8722, 8734), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(723), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2235)), +======= + target: TransformTarget::Callable(DeclarationId(2242)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(868)], output: PortId(869), span: SourceSpan::new("src/v3/std/timing_lens.dag", 8709, 8735), @@ -8336,7 +8504,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(737), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2263)), +======= + target: TransformTarget::Callable(DeclarationId(2270)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(883)], output: PortId(884), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9826, 9938), @@ -8357,7 +8529,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(740), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2263)), +======= + target: TransformTarget::Callable(DeclarationId(2270)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(886)], output: PortId(887), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9966, 10147), @@ -8417,7 +8593,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(745), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2263)), +======= + target: TransformTarget::Callable(DeclarationId(2270)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(892)], output: PortId(893), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10183, 10344), @@ -8519,21 +8699,33 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(752), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2543)), +======= + target: TransformTarget::Callable(DeclarationId(2550)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(904), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10974, 10984), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(753), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2544)), +======= + target: TransformTarget::Callable(DeclarationId(2551)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(905), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11002, 11011), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(754), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2545)), +======= + target: TransformTarget::Callable(DeclarationId(2552)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(906), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11025, 11030), @@ -8618,7 +8810,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(760), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2548)), +======= + target: TransformTarget::Callable(DeclarationId(2555)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(913)], output: PortId(914), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11954, 11995), @@ -8632,7 +8828,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(762), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2549)), +======= + target: TransformTarget::Callable(DeclarationId(2556)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(915)], output: PortId(916), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12001, 12042), @@ -8687,7 +8887,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(767), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2550)), +======= + target: TransformTarget::Callable(DeclarationId(2557)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(921)], output: PortId(922), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12105, 12146), @@ -8701,7 +8905,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(769), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2551)), +======= + target: TransformTarget::Callable(DeclarationId(2558)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(923)], output: PortId(924), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12152, 12193), @@ -8756,7 +8964,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(774), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2552)), +======= + target: TransformTarget::Callable(DeclarationId(2559)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(929)], output: PortId(930), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12253, 12294), @@ -8770,7 +8982,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(776), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2553)), +======= + target: TransformTarget::Callable(DeclarationId(2560)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(931)], output: PortId(932), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12300, 12341), @@ -8825,7 +9041,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(781), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2554)), +======= + target: TransformTarget::Callable(DeclarationId(2561)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(937)], output: PortId(938), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12399, 12440), @@ -8839,7 +9059,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(783), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2555)), +======= + target: TransformTarget::Callable(DeclarationId(2562)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(939)], output: PortId(940), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12446, 12487), @@ -8894,7 +9118,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(788), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2556)), +======= + target: TransformTarget::Callable(DeclarationId(2563)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(945)], output: PortId(946), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12545, 12586), @@ -8908,7 +9136,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(790), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2557)), +======= + target: TransformTarget::Callable(DeclarationId(2564)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(947)], output: PortId(948), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12592, 12633), @@ -9043,14 +9275,22 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(797), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2262)), +======= + target: TransformTarget::Callable(DeclarationId(2269)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(957), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12817, 12829), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(798), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2262)), +======= + target: TransformTarget::Callable(DeclarationId(2269)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(958), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12835, 12847), @@ -9734,7 +9974,11 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { #[allow(clippy::vec_init_then_push)] fn bootstrapped_fixture_dag_declarations() -> Vec { { +<<<<<<< HEAD let mut declarations = Vec::with_capacity(3218); +======= + let mut declarations = Vec::with_capacity(3225); +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) declarations.push(Declaration { id: DeclarationId(0), name: Some("Classical".to_string()), @@ -23999,9 +24243,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(687), +<<<<<<< HEAD name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())), type_params: vec![], +======= + name: Some("empty".to_string()), + connective: TypeConnective::Arrow { + inputs: vec![], + output: DeclarationId(1753), + body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)), + }, + type_params: vec![DeclarationId(688)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24031,9 +24285,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(689), +<<<<<<< HEAD name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())), type_params: vec![], +======= + name: Some("cons".to_string()), + connective: TypeConnective::Arrow { + inputs: vec![DeclarationId(690), DeclarationId(1754)], + output: DeclarationId(1755), + body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)), + }, + type_params: vec![DeclarationId(690)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24079,7 +24343,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(692), name: Some("singleton".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(693)], +======= + inputs: vec![DeclarationId(692)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1756), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)), }, @@ -24111,8 +24379,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(694), name: Some("fold".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(1757), DeclarationId(696), DeclarationId(1758)], output: DeclarationId(696), +======= + inputs: vec![DeclarationId(1757), DeclarationId(695), DeclarationId(1758)], + output: DeclarationId(695), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)), }, type_params: vec![DeclarationId(695), DeclarationId(696)], @@ -24157,8 +24430,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(697), name: Some("fold_right".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(1759), DeclarationId(699), DeclarationId(1760)], output: DeclarationId(699), +======= + inputs: vec![DeclarationId(1759), DeclarationId(698), DeclarationId(1760)], + output: DeclarationId(698), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)), }, type_params: vec![DeclarationId(698), DeclarationId(699)], @@ -24478,9 +24756,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(717), +<<<<<<< HEAD name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())), type_params: vec![], +======= + name: Some("enumerate_helper".to_string()), + connective: TypeConnective::Arrow { + inputs: vec![DeclarationId(1779), DeclarationId(93)], + output: DeclarationId(1781), + body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)), + }, + type_params: vec![DeclarationId(718)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24526,7 +24814,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(720), name: Some("contains".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(1782), DeclarationId(721)], +======= + inputs: vec![DeclarationId(1782), DeclarationId(720)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(128), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)), }, @@ -24826,7 +25118,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(736), name: Some("last_path_param".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(731)], +======= + inputs: vec![DeclarationId(730)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1788), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)), }, @@ -25194,7 +25490,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("compose_effects".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1796)], +<<<<<<< HEAD output: DeclarationId(747), +======= + output: DeclarationId(746), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)), }, type_params: vec![], @@ -25524,7 +25824,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("upsert_or_create".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1798), DeclarationId(198)], +<<<<<<< HEAD output: DeclarationId(739), +======= + output: DeclarationId(738), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)), }, type_params: vec![], @@ -25542,7 +25846,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("delete_or_create".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1799), DeclarationId(198)], +<<<<<<< HEAD output: DeclarationId(739), +======= + output: DeclarationId(738), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)), }, type_params: vec![], @@ -26387,7 +26695,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "connective".to_string(), +<<<<<<< HEAD ty: DeclarationId(798), +======= + ty: DeclarationId(797), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "type_params".to_string(), @@ -27290,7 +27602,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(831), name: Some("port".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(723)], +======= + inputs: vec![DeclarationId(827), DeclarationId(722)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1853), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", @@ -27312,7 +27628,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(832), name: Some("node".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(722)], +======= + inputs: vec![DeclarationId(827), DeclarationId(721)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1854), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", @@ -27334,7 +27654,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(833), name: Some("resolve_producer".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(723)], +======= + inputs: vec![DeclarationId(827), DeclarationId(722)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1855), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", @@ -27356,7 +27680,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(834), name: Some("declaration_by_id".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(724)], +======= + inputs: vec![DeclarationId(827), DeclarationId(723)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1856), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", @@ -27378,7 +27706,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(835), name: Some("declaration_by_name".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(230)], +======= + inputs: vec![DeclarationId(827), DeclarationId(230)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1857), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", @@ -27400,7 +27732,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(836), name: Some("lane2_workflow_at".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(722)], +======= + inputs: vec![DeclarationId(827), DeclarationId(721)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1858), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", @@ -27495,7 +27831,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(840), name: Some("hit_declaration_id_lookup".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(724)], +======= + inputs: vec![DeclarationId(723)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1860), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", @@ -27827,7 +28167,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(853), name: Some("hit_symbolic_cost_lookup".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(849)], +======= + inputs: vec![DeclarationId(848)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1976), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 11047, 11062)), }, @@ -27845,7 +28189,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(854), name: Some("two_terms".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(849), DeclarationId(849)], +======= + inputs: vec![DeclarationId(848), DeclarationId(848)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1977), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(185))), }, @@ -27863,7 +28211,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(855), name: Some("many_terms".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(1978)], +======= + inputs: vec![DeclarationId(848), DeclarationId(848), DeclarationId(1978)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1979), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(187))), }, @@ -27990,7 +28342,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("max_path".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1980)], +<<<<<<< HEAD output: DeclarationId(849), +======= + output: DeclarationId(848), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(220))), }, type_params: vec![], @@ -28309,7 +28665,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("reduce_sum".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1990)], +<<<<<<< HEAD output: DeclarationId(849), +======= + output: DeclarationId(848), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(440))), }, type_params: vec![], @@ -28327,7 +28687,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("wrap_sum".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1991)], +<<<<<<< HEAD output: DeclarationId(849), +======= + output: DeclarationId(848), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(452))), }, type_params: vec![], @@ -28345,7 +28709,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("reduce_product".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1992)], +<<<<<<< HEAD output: DeclarationId(849), +======= + output: DeclarationId(848), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(469))), }, type_params: vec![], @@ -28493,7 +28861,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(888), name: Some("filter_not_dominated_by".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(1993), DeclarationId(849)], +======= + inputs: vec![DeclarationId(1993), DeclarationId(848)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1994), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(517))), }, @@ -28511,7 +28883,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(889), name: Some("drop_dominated_step".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(1995), DeclarationId(849)], +======= + inputs: vec![DeclarationId(1995), DeclarationId(848)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1996), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(524))), }, @@ -28578,7 +28954,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1185), }], }, @@ -28668,17 +29048,65 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3138, 3229), }); declarations.push(Declaration { +<<<<<<< HEAD +======= + id: DeclarationId(895), + name: Some("AnthropicToolResultBlock".to_string()), + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "AnthropicTextBlock".to_string(), + ty: DeclarationId(2070), + }, + Field { + label: "AnthropicImageBlock".to_string(), + ty: DeclarationId(2071), + }, + Field { + label: "AnthropicDocumentBlock".to_string(), + ty: DeclarationId(2072), + }, + Field { + label: "AnthropicSearchResultBlock".to_string(), + ty: DeclarationId(2075), + }, + Field { + label: "AnthropicToolReferenceBlock".to_string(), + ty: DeclarationId(2076), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3553, 3888), + }); + declarations.push(Declaration { +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) id: DeclarationId(896), name: Some("AnthropicToolResultContent".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ToolResultText".to_string(), +<<<<<<< HEAD ty: DeclarationId(2070), }, Field { label: "ToolResultBlocks".to_string(), ty: DeclarationId(2072), +======= + ty: DeclarationId(2077), + }, + Field { + label: "ToolResultBlocks".to_string(), + ty: DeclarationId(2079), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -28690,7 +29118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3505, 3624), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4164, 4295), }); declarations.push(Declaration { id: DeclarationId(897), @@ -28699,11 +29127,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UserTextBlock".to_string(), +<<<<<<< HEAD ty: DeclarationId(2073), }, Field { label: "UserToolResultBlock".to_string(), ty: DeclarationId(2076), +======= + ty: DeclarationId(2080), + }, + Field { + label: "UserToolResultBlock".to_string(), + ty: DeclarationId(2083), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -28715,7 +29151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3870, 4064), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4541, 4735), }); declarations.push(Declaration { id: DeclarationId(898), @@ -28724,11 +29160,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "AssistantTextBlock".to_string(), +<<<<<<< HEAD ty: DeclarationId(2077), }, Field { label: "AssistantToolUseBlock".to_string(), ty: DeclarationId(2078), +======= + ty: DeclarationId(2084), + }, + Field { + label: "AssistantToolUseBlock".to_string(), + ty: DeclarationId(2085), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -28740,7 +29184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4471, 4637), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5142, 5308), }); declarations.push(Declaration { id: DeclarationId(899), @@ -28749,6 +29193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "EndTurn".to_string(), +<<<<<<< HEAD ty: DeclarationId(2079), }, Field { @@ -28770,6 +29215,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "Refusal".to_string(), ty: DeclarationId(2084), +======= + ty: DeclarationId(2086), + }, + Field { + label: "MaxTokens".to_string(), + ty: DeclarationId(2087), + }, + Field { + label: "StopSequence".to_string(), + ty: DeclarationId(2088), + }, + Field { + label: "ToolUse".to_string(), + ty: DeclarationId(2089), + }, + Field { + label: "PauseTurn".to_string(), + ty: DeclarationId(2090), + }, + Field { + label: "Refusal".to_string(), + ty: DeclarationId(2091), + }, + Field { + label: "ModelContextWindowExceeded".to_string(), + ty: DeclarationId(2092), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ModelContextWindowExceeded".to_string(), @@ -28785,7 +29257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4966, 5102), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5637, 5773), }); declarations.push(Declaration { id: DeclarationId(900), @@ -28794,6 +29266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "CharLocation".to_string(), +<<<<<<< HEAD ty: DeclarationId(2088), }, Field { @@ -28807,10 +29280,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "WebSearchResultLocation".to_string(), ty: DeclarationId(2096), +======= + ty: DeclarationId(2095), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + Field { + label: "PageLocation".to_string(), + ty: DeclarationId(2098), + }, + Field { + label: "ContentBlockLocation".to_string(), + ty: DeclarationId(2101), + }, + Field { + label: "WebSearchResultLocation".to_string(), + ty: DeclarationId(2103), }, Field { label: "SearchResultLocation".to_string(), +<<<<<<< HEAD ty: DeclarationId(2098), +======= + ty: DeclarationId(2105), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -28822,7 +29314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5304, 6050), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5975, 6721), }); declarations.push(Declaration { id: DeclarationId(901), @@ -28831,6 +29323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "MessagesTextBlock".to_string(), +<<<<<<< HEAD ty: DeclarationId(2101), }, Field { @@ -28896,6 +29389,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "ToolSearchToolBm25".to_string(), +======= + ty: DeclarationId(2108), + }, + Field { + label: "MessagesThinkingBlock".to_string(), + ty: DeclarationId(2109), + }, + Field { + label: "MessagesRedactedThinkingBlock".to_string(), + ty: DeclarationId(2110), + }, + Field { + label: "MessagesToolUseBlock".to_string(), + ty: DeclarationId(2112), + }, + Field { + label: "MessagesServerToolUseBlock".to_string(), + ty: DeclarationId(2114), + }, + Field { + label: "MessagesWebSearchToolResultBlock".to_string(), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ty: DeclarationId(2116), }, Field { @@ -28912,9 +29427,61 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7303, 7485), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7258, 7786), }); declarations.push(Declaration { +<<<<<<< HEAD +======= + id: DeclarationId(902), + name: Some("AnthropicServerToolName".to_string()), + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "WebSearch".to_string(), + ty: DeclarationId(2117), + }, + Field { + label: "WebFetch".to_string(), + ty: DeclarationId(2118), + }, + Field { + label: "CodeExecution".to_string(), + ty: DeclarationId(2119), + }, + Field { + label: "BashCodeExecution".to_string(), + ty: DeclarationId(2120), + }, + Field { + label: "TextEditorCodeExecution".to_string(), + ty: DeclarationId(2121), + }, + Field { + label: "ToolSearchToolRegex".to_string(), + ty: DeclarationId(2122), + }, + Field { + label: "ToolSearchToolBm25".to_string(), + ty: DeclarationId(2123), + }, + Field { + label: "Advisor".to_string(), + ty: DeclarationId(2124), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7974, 8156), + }); + declarations.push(Declaration { +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) id: DeclarationId(903), name: Some("AnthropicMessages200Usage".to_string()), connective: TypeConnective::Conj { @@ -28929,11 +29496,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "cache_creation_input_tokens".to_string(), +<<<<<<< HEAD ty: DeclarationId(2118), }, Field { label: "cache_read_input_tokens".to_string(), ty: DeclarationId(2119), +======= + ty: DeclarationId(2125), + }, + Field { + label: "cache_read_input_tokens".to_string(), + ty: DeclarationId(2126), + }, + Field { + label: "service_tier".to_string(), + ty: DeclarationId(2127), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "service_tier".to_string(), @@ -28949,7 +29528,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7601, 7816), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8272, 8487), }); declarations.push(Declaration { id: DeclarationId(904), @@ -28957,7 +29536,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Disj { variants: vec![Field { label: "Assistant".to_string(), +<<<<<<< HEAD ty: DeclarationId(2121), +======= + ty: DeclarationId(2128), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -28968,7 +29551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8137, 8180), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8808, 8851), }); declarations.push(Declaration { id: DeclarationId(905), @@ -28989,7 +29572,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "content".to_string(), +<<<<<<< HEAD ty: DeclarationId(2122), +======= + ty: DeclarationId(2129), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "model".to_string(), @@ -29001,7 +29588,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "stop_sequence".to_string(), +<<<<<<< HEAD ty: DeclarationId(2123), +======= + ty: DeclarationId(2130), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "usage".to_string(), @@ -29009,7 +29600,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "container".to_string(), +<<<<<<< HEAD ty: DeclarationId(2124), +======= + ty: DeclarationId(2131), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -29021,7 +29616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8527, 8858), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9198, 9529), }); declarations.push(Declaration { id: DeclarationId(906), @@ -29059,6 +29654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "StdAuthority".to_string(), +<<<<<<< HEAD ty: DeclarationId(2125), }, Field { @@ -29072,6 +29668,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "CompilerAuthority".to_string(), ty: DeclarationId(2128), +======= + ty: DeclarationId(2132), + }, + Field { + label: "V3StdAuthority".to_string(), + ty: DeclarationId(2133), + }, + Field { + label: "V3SpecAuthority".to_string(), + ty: DeclarationId(2134), + }, + Field { + label: "CompilerAuthority".to_string(), + ty: DeclarationId(2135), + }, + Field { + label: "ExtdepsFixtureAuthority".to_string(), + ty: DeclarationId(2136), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ExtdepsFixtureAuthority".to_string(), @@ -29132,476 +29747,748 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "dsl/std/logic.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2125), +======= + constructor: DeclarationId(2132), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/bit.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2125), +======= + constructor: DeclarationId(2132), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/error_primitives.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2125), +======= + constructor: DeclarationId(2132), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/algebra.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2125), +======= + constructor: DeclarationId(2132), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/magnitude.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2125), +======= + constructor: DeclarationId(2132), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/machine_constraints.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2125), +======= + constructor: DeclarationId(2132), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/nat.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2125), +======= + constructor: DeclarationId(2132), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/integer.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2125), +======= + constructor: DeclarationId(2132), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/rational.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2125), +======= + constructor: DeclarationId(2132), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/float.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2125), +======= + constructor: DeclarationId(2132), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/types.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2125), +======= + constructor: DeclarationId(2132), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/string_type.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2125), +======= + constructor: DeclarationId(2132), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/unicode.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2125), +======= + constructor: DeclarationId(2132), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/render_repeat_string_bootstrap.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2125), +======= + constructor: DeclarationId(2132), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/methods.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2125), +======= + constructor: DeclarationId(2132), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/serialization.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2125), +======= + constructor: DeclarationId(2132), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/algebra.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/anthropic_messages.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/anthropic_operations.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/anthropic_schema.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/approximate_field.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/bin_shim.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/bootstrap_authority.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/bridge_ledger.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/clean_emission.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/computation.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/computation_model.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/coproduct_projection.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/cross_target_coverage.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/diagnostics.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/dimensions.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/effects.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/emission_provenance.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/emit_model.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/go_method_template_contracts.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/induction.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/integer_diagnostic_order.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/lens.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/lens_application.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/list.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/lookup.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/methods.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/parse_surface.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/python_method_template_contracts.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/resources.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/runtime.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/rust_method_template_contracts.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/services.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/substrate.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/substrate_minimal.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/termination.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/t_ci_workflow_as_data_demo.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/timing_lens.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/tokenize.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/verification.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/workflows.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/spec/v3_l1.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2127), +======= + constructor: DeclarationId(2134), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/spec/go.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2127), +======= + constructor: DeclarationId(2134), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/spec/python.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2127), +======= + constructor: DeclarationId(2134), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/spec/rust.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2127), +======= + constructor: DeclarationId(2134), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/compiler/pipeline.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2128), +======= + constructor: DeclarationId(2135), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/compiler/operators.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2128), +======= + constructor: DeclarationId(2135), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/compiler/regen.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2128), +======= + constructor: DeclarationId(2135), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/extdeps/languages/rust/primitives.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2129), +======= + constructor: DeclarationId(2136), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/extdeps/cron_schedule_model.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2129), +======= + constructor: DeclarationId(2136), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/extdeps/github/github.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2129), +======= + constructor: DeclarationId(2136), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/extdeps/github/actions.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2129), +======= + constructor: DeclarationId(2136), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -29619,11 +30506,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Retired".to_string(), +<<<<<<< HEAD ty: DeclarationId(2130), }, Field { label: "Open".to_string(), ty: DeclarationId(2131), +======= + ty: DeclarationId(2137), + }, + Field { + label: "Open".to_string(), + ty: DeclarationId(2138), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -29689,7 +30584,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6389, 6499), }); +<<<<<<< HEAD declarations.push(Declaration { id: DeclarationId(913), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), value: DeclarationId(912) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2132)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_source_span_file_participation_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R3".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2131), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("ROADMAP.md#lens-fold-file-path-semantics".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_mark_bootstrap_secret_nominal_opacity_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2130), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #937".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_dispatch_pr1183_slice_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2130), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/canonical_lens_bridge_ratchet_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2130), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2130), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2130), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2131), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) }); +======= + declarations.push(Declaration { id: DeclarationId(913), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(912) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2139)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_source_span_file_participation_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R3".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2138), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("ROADMAP.md#lens-fold-file-path-semantics".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_mark_bootstrap_secret_nominal_opacity_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2137), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #937".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_dispatch_pr1183_slice_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2137), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/canonical_lens_bridge_ratchet_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2137), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2137), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2137), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2138), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) }); +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) declarations.push(Declaration { id: DeclarationId(914), name: Some("CleanEmissionContract".to_string()), @@ -29775,11 +30674,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "WrapEverything".to_string(), +<<<<<<< HEAD ty: DeclarationId(2133), }, Field { label: "WrapOnlyInOperandPosition".to_string(), ty: DeclarationId(2134), +======= + ty: DeclarationId(2140), + }, + Field { + label: "WrapOnlyInOperandPosition".to_string(), + ty: DeclarationId(2141), + }, + Field { + label: "NoWrapping".to_string(), + ty: DeclarationId(2142), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "NoWrapping".to_string(), @@ -29804,6 +30715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "EmitBindingAlways".to_string(), +<<<<<<< HEAD ty: DeclarationId(2136), }, Field { @@ -29813,6 +30725,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "EmitPrefixedUnderscoreWhenUnused".to_string(), ty: DeclarationId(2138), +======= + ty: DeclarationId(2143), + }, + Field { + label: "EmitUnderscoreWhenUnused".to_string(), + ty: DeclarationId(2144), + }, + Field { + label: "EmitPrefixedUnderscoreWhenUnused".to_string(), + ty: DeclarationId(2145), + }, + Field { + label: "NotApplicablePatternBinding".to_string(), + ty: DeclarationId(2146), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "NotApplicablePatternBinding".to_string(), @@ -29837,11 +30764,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "AccessFromPayloadBinding".to_string(), +<<<<<<< HEAD ty: DeclarationId(2140), }, Field { label: "OverrideNamedFieldsAtBindingSite".to_string(), ty: DeclarationId(2141), +======= + ty: DeclarationId(2147), + }, + Field { + label: "OverrideNamedFieldsAtBindingSite".to_string(), + ty: DeclarationId(2148), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -29862,11 +30797,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ImportEverythingDeclared".to_string(), +<<<<<<< HEAD ty: DeclarationId(2142), }, Field { label: "IncludeOnlyReferenced".to_string(), ty: DeclarationId(2143), +======= + ty: DeclarationId(2149), + }, + Field { + label: "IncludeOnlyReferenced".to_string(), + ty: DeclarationId(2150), + }, + Field { + label: "ImportPerUsageSite".to_string(), + ty: DeclarationId(2151), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ImportPerUsageSite".to_string(), @@ -29891,11 +30838,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "WrapReturnValue".to_string(), +<<<<<<< HEAD ty: DeclarationId(2145), }, Field { label: "NoWrappingOnTerminalExpression".to_string(), ty: DeclarationId(2146), +======= + ty: DeclarationId(2152), + }, + Field { + label: "NoWrappingOnTerminalExpression".to_string(), + ty: DeclarationId(2153), + }, + Field { + label: "ExplicitReturnKeyword".to_string(), + ty: DeclarationId(2154), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ExplicitReturnKeyword".to_string(), @@ -29920,11 +30879,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "EmitLetBindingAlways".to_string(), +<<<<<<< HEAD ty: DeclarationId(2148), }, Field { label: "EmitLetUnderscoreWhenUnused".to_string(), ty: DeclarationId(2149), +======= + ty: DeclarationId(2155), + }, + Field { + label: "EmitLetUnderscoreWhenUnused".to_string(), + ty: DeclarationId(2156), + }, + Field { + label: "OmitLetBinding".to_string(), + ty: DeclarationId(2157), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "OmitLetBinding".to_string(), @@ -29949,11 +30920,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "WrapBody".to_string(), +<<<<<<< HEAD ty: DeclarationId(2151), }, Field { label: "NoWrappingOnNonComplexBody".to_string(), ty: DeclarationId(2152), +======= + ty: DeclarationId(2158), + }, + Field { + label: "NoWrappingOnNonComplexBody".to_string(), + ty: DeclarationId(2159), + }, + Field { + label: "NotApplicableMatchArmBody".to_string(), + ty: DeclarationId(2160), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "NotApplicableMatchArmBody".to_string(), @@ -30015,7 +30998,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), +<<<<<<< HEAD ty: DeclarationId(2154), +======= + ty: DeclarationId(2161), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "syntax_only".to_string(), @@ -30048,6 +31035,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IgnoreVerifierOutput".to_string(), +<<<<<<< HEAD ty: DeclarationId(2155), }, Field { @@ -30057,6 +31045,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "RequireEmptyStderr".to_string(), ty: DeclarationId(2157), +======= + ty: DeclarationId(2162), + }, + Field { + label: "RequireEmptyStdout".to_string(), + ty: DeclarationId(2163), + }, + Field { + label: "RequireEmptyStderr".to_string(), + ty: DeclarationId(2164), + }, + Field { + label: "RequireEmptyStdoutAndStderr".to_string(), + ty: DeclarationId(2165), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "RequireEmptyStdoutAndStderr".to_string(), @@ -30081,6 +31084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "CollectionSize".to_string(), +<<<<<<< HEAD ty: DeclarationId(2164), }, Field { @@ -30106,6 +31110,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "ExplicitCountPositive".to_string(), ty: DeclarationId(2170), +======= + ty: DeclarationId(2171), + }, + Field { + label: "ParserStreamSize".to_string(), + ty: DeclarationId(2172), + }, + Field { + label: "WorklistDrainSize".to_string(), + ty: DeclarationId(2173), + }, + Field { + label: "TreeSize".to_string(), + ty: DeclarationId(2174), + }, + Field { + label: "ArithmeticParam".to_string(), + ty: DeclarationId(2175), + }, + Field { + label: "ExplicitCountZero".to_string(), + ty: DeclarationId(2176), + }, + Field { + label: "ExplicitCountPositive".to_string(), + ty: DeclarationId(2177), + }, + Field { + label: "Forever".to_string(), + ty: DeclarationId(2178), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Forever".to_string(), @@ -30152,6 +31187,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ChildAccessorCall".to_string(), +<<<<<<< HEAD ty: DeclarationId(2172), }, Field { @@ -30177,6 +31213,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "FoldBodyCall".to_string(), ty: DeclarationId(2178), +======= + ty: DeclarationId(2179), + }, + Field { + label: "CollectionShrinkCall".to_string(), + ty: DeclarationId(2180), + }, + Field { + label: "ArithmeticSubtractCall".to_string(), + ty: DeclarationId(2181), + }, + Field { + label: "ArithmeticDivideCall".to_string(), + ty: DeclarationId(2182), + }, + Field { + label: "ParserAdvanceCall".to_string(), + ty: DeclarationId(2183), + }, + Field { + label: "WorklistDrainCall".to_string(), + ty: DeclarationId(2184), + }, + Field { + label: "FoldBodyCall".to_string(), + ty: DeclarationId(2185), + }, + Field { + label: "SameArgumentCall".to_string(), + ty: DeclarationId(2186), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "SameArgumentCall".to_string(), @@ -30198,8 +31265,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(929), name: Some("per_call_pattern_at".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(722)], output: DeclarationId(2159), +======= + inputs: vec![DeclarationId(827), DeclarationId(721)], + output: DeclarationId(2166), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 2756, @@ -30223,11 +31295,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UnitShrink".to_string(), +<<<<<<< HEAD ty: DeclarationId(2180), }, Field { label: "ConstantShrink".to_string(), ty: DeclarationId(2181), +======= + ty: DeclarationId(2187), + }, + Field { + label: "ConstantShrink".to_string(), + ty: DeclarationId(2188), + }, + Field { + label: "ProportionalShrink".to_string(), + ty: DeclarationId(2189), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ProportionalShrink".to_string(), @@ -30252,11 +31336,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Fold".to_string(), +<<<<<<< HEAD ty: DeclarationId(2183), }, Field { label: "Descend".to_string(), ty: DeclarationId(2184), +======= + ty: DeclarationId(2190), + }, + Field { + label: "Descend".to_string(), + ty: DeclarationId(2191), + }, + Field { + label: "Repeat".to_string(), + ty: DeclarationId(2192), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Repeat".to_string(), @@ -30293,7 +31389,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "factor".to_string(), +<<<<<<< HEAD ty: DeclarationId(2186), +======= + ty: DeclarationId(2193), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -30334,7 +31434,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("size_bound_param".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(926)], +<<<<<<< HEAD output: DeclarationId(2160), +======= + output: DeclarationId(2167), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 5564, @@ -30400,7 +31504,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("constant_bound_value".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(926)], +<<<<<<< HEAD output: DeclarationId(2161), +======= + output: DeclarationId(2168), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 6492, @@ -30424,11 +31532,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "TreeDescent".to_string(), +<<<<<<< HEAD ty: DeclarationId(2187), }, Field { label: "CollectionFold".to_string(), ty: DeclarationId(2188), +======= + ty: DeclarationId(2194), + }, + Field { + label: "CollectionFold".to_string(), + ty: DeclarationId(2195), + }, + Field { + label: "ArithmeticRepeat".to_string(), + ty: DeclarationId(2196), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ArithmeticRepeat".to_string(), @@ -30451,7 +31571,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("algebra_profile_to_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(53)], +<<<<<<< HEAD output: DeclarationId(2162), +======= + output: DeclarationId(2169), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 7558, @@ -30473,7 +31597,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("type_iteration_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], +<<<<<<< HEAD output: DeclarationId(2163), +======= + output: DeclarationId(2170), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 8123, @@ -30497,11 +31625,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Immutable".to_string(), +<<<<<<< HEAD ty: DeclarationId(2190), }, Field { label: "Mutable".to_string(), ty: DeclarationId(2191), +======= + ty: DeclarationId(2197), + }, + Field { + label: "Mutable".to_string(), + ty: DeclarationId(2198), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -30522,11 +31658,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Pure".to_string(), +<<<<<<< HEAD ty: DeclarationId(2192), }, Field { label: "Effectful".to_string(), ty: DeclarationId(2193), +======= + ty: DeclarationId(2199), + }, + Field { + label: "Effectful".to_string(), + ty: DeclarationId(2200), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -30547,11 +31691,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ExplicitDAG".to_string(), +<<<<<<< HEAD ty: DeclarationId(2194), }, Field { label: "Arbitrary".to_string(), ty: DeclarationId(2195), +======= + ty: DeclarationId(2201), + }, + Field { + label: "Arbitrary".to_string(), + ty: DeclarationId(2202), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -30572,11 +31724,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Bounded".to_string(), +<<<<<<< HEAD ty: DeclarationId(2196), }, Field { label: "Unbounded".to_string(), ty: DeclarationId(2197), +======= + ty: DeclarationId(2203), + }, + Field { + label: "Unbounded".to_string(), + ty: DeclarationId(2204), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -30640,28 +31800,44 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "mutability".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2190), +======= + constructor: DeclarationId(2197), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "purity".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2192), +======= + constructor: DeclarationId(2199), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "structure".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2194), +======= + constructor: DeclarationId(2201), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "iteration".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2196), +======= + constructor: DeclarationId(2203), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -30678,6 +31854,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ValueOnly".to_string(), +<<<<<<< HEAD ty: DeclarationId(2198), }, Field { @@ -30687,6 +31864,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "RefCounted".to_string(), ty: DeclarationId(2200), +======= + ty: DeclarationId(2205), + }, + Field { + label: "GarbageCollected".to_string(), + ty: DeclarationId(2206), + }, + Field { + label: "RefCounted".to_string(), + ty: DeclarationId(2207), + }, + Field { + label: "OwnershipBased".to_string(), + ty: DeclarationId(2208), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "OwnershipBased".to_string(), @@ -30711,11 +31903,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LexicalScoping".to_string(), +<<<<<<< HEAD ty: DeclarationId(2202), }, Field { label: "DynamicScoping".to_string(), ty: DeclarationId(2203), +======= + ty: DeclarationId(2209), + }, + Field { + label: "DynamicScoping".to_string(), + ty: DeclarationId(2210), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -30760,7 +31960,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "excluded_prefixes".to_string(), +<<<<<<< HEAD ty: DeclarationId(2204), +======= + ty: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -30784,7 +31988,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "additional_excluded_prefixes".to_string(), +<<<<<<< HEAD ty: DeclarationId(2205), +======= + ty: DeclarationId(2212), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -30832,11 +32040,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "OwnershipBased".to_string(), +<<<<<<< HEAD ty: DeclarationId(2206), }, Field { label: "GarbageCollected".to_string(), ty: DeclarationId(2207), +======= + ty: DeclarationId(2213), + }, + Field { + label: "GarbageCollected".to_string(), + ty: DeclarationId(2214), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -30873,7 +32089,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Disj { variants: vec![Field { label: "StringTag".to_string(), +<<<<<<< HEAD ty: DeclarationId(2208), +======= + ty: DeclarationId(2215), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -30893,11 +32113,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Empty".to_string(), +<<<<<<< HEAD ty: DeclarationId(2209), }, Field { label: "Populated".to_string(), ty: DeclarationId(2210), +======= + ty: DeclarationId(2216), + }, + Field { + label: "Populated".to_string(), + ty: DeclarationId(2217), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -30951,7 +32179,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "variant_projections".to_string(), +<<<<<<< HEAD ty: DeclarationId(2211), +======= + ty: DeclarationId(2218), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -31052,6 +32284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Atom".to_string(), +<<<<<<< HEAD ty: DeclarationId(2212), }, Field { @@ -31069,6 +32302,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "Cardinality".to_string(), ty: DeclarationId(2216), +======= + ty: DeclarationId(2219), + }, + Field { + label: "Conj".to_string(), + ty: DeclarationId(2220), + }, + Field { + label: "Disj".to_string(), + ty: DeclarationId(2221), + }, + Field { + label: "Arrow".to_string(), + ty: DeclarationId(2222), + }, + Field { + label: "Cardinality".to_string(), + ty: DeclarationId(2223), + }, + Field { + label: "Instantiation".to_string(), + ty: DeclarationId(2224), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Instantiation".to_string(), @@ -31093,6 +32349,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Value".to_string(), +<<<<<<< HEAD ty: DeclarationId(2218), }, Field { @@ -31106,6 +32363,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "Loop".to_string(), ty: DeclarationId(2221), +======= + ty: DeclarationId(2225), + }, + Field { + label: "Transform".to_string(), + ty: DeclarationId(2226), + }, + Field { + label: "Branch".to_string(), + ty: DeclarationId(2227), + }, + Field { + label: "Loop".to_string(), + ty: DeclarationId(2228), + }, + Field { + label: "Bind".to_string(), + ty: DeclarationId(2229), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Bind".to_string(), @@ -31184,7 +32460,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "cells".to_string(), +<<<<<<< HEAD ty: DeclarationId(2223), +======= + ty: DeclarationId(2230), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -31204,13 +32484,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(967), }], }, type_params: vec![], phantom_params: Vec::new(), +<<<<<<< HEAD meta_tag: Some(DeclarationId(2224)), +======= + meta_tag: Some(DeclarationId(2231)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -31237,14 +32525,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31274,14 +32570,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31311,14 +32615,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31348,14 +32660,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31385,14 +32705,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31422,14 +32750,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31459,14 +32795,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31496,14 +32840,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31533,14 +32885,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31570,14 +32930,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31607,14 +32975,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31644,14 +33020,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31681,14 +33065,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31718,14 +33110,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31755,14 +33155,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31792,14 +33200,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31829,14 +33245,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31866,14 +33290,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31903,14 +33335,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31940,14 +33380,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31977,14 +33425,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32014,14 +33470,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32051,14 +33515,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32088,14 +33560,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32125,14 +33605,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32162,14 +33650,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32199,14 +33695,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32236,14 +33740,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32273,14 +33785,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32310,14 +33830,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32347,14 +33875,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32384,14 +33920,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32421,14 +33965,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32458,14 +34010,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32495,14 +34055,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32532,14 +34100,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32569,14 +34145,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32606,14 +34190,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32643,14 +34235,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32680,14 +34280,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32717,14 +34325,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2216), +======= + constructor: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2219), +======= + constructor: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32743,6 +34359,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "TokenizerError".to_string(), +<<<<<<< HEAD ty: DeclarationId(2225), }, Field { @@ -32781,6 +34398,46 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { label: "NominalOpacityViolation".to_string(), ty: DeclarationId(2234), }, +======= + ty: DeclarationId(2232), + }, + Field { + label: "ParseError".to_string(), + ty: DeclarationId(2233), + }, + Field { + label: "TypeMismatch".to_string(), + ty: DeclarationId(2234), + }, + Field { + label: "ArityMismatch".to_string(), + ty: DeclarationId(2235), + }, + Field { + label: "ResolveError".to_string(), + ty: DeclarationId(2236), + }, + Field { + label: "UnitMismatch".to_string(), + ty: DeclarationId(2237), + }, + Field { + label: "BranchConditionNotBool".to_string(), + ty: DeclarationId(2238), + }, + Field { + label: "MagnitudeOutOfRange".to_string(), + ty: DeclarationId(2239), + }, + Field { + label: "MalformedIntegerRangeFact".to_string(), + ty: DeclarationId(2240), + }, + Field { + label: "NominalOpacityViolation".to_string(), + ty: DeclarationId(2241), + }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -32873,11 +34530,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "CompilerKind".to_string(), +<<<<<<< HEAD ty: DeclarationId(2235), }, Field { label: "LensInstanceKind".to_string(), ty: DeclarationId(2236), +======= + ty: DeclarationId(2242), + }, + Field { + label: "LensInstanceKind".to_string(), + ty: DeclarationId(2243), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -32910,7 +34575,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fixes".to_string(), +<<<<<<< HEAD ty: DeclarationId(2237), +======= + ty: DeclarationId(2244), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -32931,6 +34600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UnderRefined".to_string(), +<<<<<<< HEAD ty: DeclarationId(2238), }, Field { @@ -32952,6 +34622,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "FoldNotImplemented".to_string(), ty: DeclarationId(2244), +======= + ty: DeclarationId(2245), + }, + Field { + label: "NoInhabitant".to_string(), + ty: DeclarationId(2246), + }, + Field { + label: "ContradictoryUse".to_string(), + ty: DeclarationId(2248), + }, + Field { + label: "OutOfR2Scope".to_string(), + ty: DeclarationId(2249), + }, + Field { + label: "LifetimeProgramExtractionPending".to_string(), + ty: DeclarationId(2250), + }, + Field { + label: "FoldNotImplemented".to_string(), + ty: DeclarationId(2251), + }, + Field { + label: "MissingEmissionPath".to_string(), + ty: DeclarationId(2252), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "MissingEmissionPath".to_string(), @@ -32976,11 +34673,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Inhabits".to_string(), +<<<<<<< HEAD ty: DeclarationId(2260), }, Field { label: "Violates".to_string(), ty: DeclarationId(2261), +======= + ty: DeclarationId(2267), + }, + Field { + label: "Violates".to_string(), + ty: DeclarationId(2268), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -33015,11 +34720,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NoDiagnostic".to_string(), +<<<<<<< HEAD ty: DeclarationId(2262), }, Field { label: "SomeDiagnostic".to_string(), ty: DeclarationId(2263), +======= + ty: DeclarationId(2269), + }, + Field { + label: "SomeDiagnostic".to_string(), + ty: DeclarationId(2270), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -33040,11 +34753,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DimensionOk".to_string(), +<<<<<<< HEAD ty: DeclarationId(2266), }, Field { label: "DimensionFail".to_string(), ty: DeclarationId(2270), +======= + ty: DeclarationId(2273), + }, + Field { + label: "DimensionFail".to_string(), + ty: DeclarationId(2277), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -33083,11 +34804,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "witness_of".to_string(), +<<<<<<< HEAD ty: DeclarationId(2272), }, Field { label: "compose".to_string(), ty: DeclarationId(2273), +======= + ty: DeclarationId(2279), + }, + Field { + label: "compose".to_string(), + ty: DeclarationId(2280), + }, + Field { + label: "break_diagnostic".to_string(), + ty: DeclarationId(2281), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "break_diagnostic".to_string(), @@ -33131,7 +34864,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { type_params: vec![DeclarationId(984), DeclarationId(985)], phantom_params: vec![PhantomParameter { parameter: DeclarationId(984), +<<<<<<< HEAD algebra: DeclarationId(2275), +======= + algebra: DeclarationId(2282), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], meta_tag: None, specialization_parent: None, @@ -33272,11 +35009,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("add_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![ +<<<<<<< HEAD DeclarationId(2246), DeclarationId(2247), DeclarationId(2248), ], output: DeclarationId(2249), +======= + DeclarationId(2253), + DeclarationId(2254), + DeclarationId(2255), + ], + output: DeclarationId(2256), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)), }, type_params: vec![DeclarationId(994), DeclarationId(995)], @@ -33322,11 +35067,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("sub_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![ +<<<<<<< HEAD DeclarationId(2250), DeclarationId(2251), DeclarationId(2252), ], output: DeclarationId(2253), +======= + DeclarationId(2257), + DeclarationId(2258), + DeclarationId(2259), + ], + output: DeclarationId(2260), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)), }, type_params: vec![DeclarationId(997), DeclarationId(998)], @@ -33372,11 +35125,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("mul_dimension_scalar".to_string()), connective: TypeConnective::Arrow { inputs: vec![ +<<<<<<< HEAD DeclarationId(2254), DeclarationId(2255), DeclarationId(1001), ], output: DeclarationId(2256), +======= + DeclarationId(2261), + DeclarationId(2262), + DeclarationId(1001), + ], + output: DeclarationId(2263), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)), }, type_params: vec![DeclarationId(1000), DeclarationId(1001)], @@ -33422,11 +35183,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("div_dimension_scalar".to_string()), connective: TypeConnective::Arrow { inputs: vec![ +<<<<<<< HEAD DeclarationId(2257), DeclarationId(2258), DeclarationId(1004), ], output: DeclarationId(2259), +======= + DeclarationId(2264), + DeclarationId(2265), + DeclarationId(1004), + ], + output: DeclarationId(2266), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)), }, type_params: vec![DeclarationId(1003), DeclarationId(1004)], @@ -33491,11 +35260,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NoSourceSpan".to_string(), +<<<<<<< HEAD ty: DeclarationId(2276), }, Field { label: "SomeSourceSpan".to_string(), ty: DeclarationId(2277), +======= + ty: DeclarationId(2283), + }, + Field { + label: "SomeSourceSpan".to_string(), + ty: DeclarationId(2284), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -33561,7 +35338,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fields".to_string(), +<<<<<<< HEAD ty: DeclarationId(2278), +======= + ty: DeclarationId(2285), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "cost".to_string(), @@ -33623,11 +35404,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "BoundUnspecified".to_string(), +<<<<<<< HEAD ty: DeclarationId(2279), }, Field { label: "StaticBoundFact".to_string(), ty: DeclarationId(2280), +======= + ty: DeclarationId(2286), + }, + Field { + label: "StaticBoundFact".to_string(), + ty: DeclarationId(2287), + }, + Field { + label: "PlatformDependentFact".to_string(), + ty: DeclarationId(2288), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "PlatformDependentFact".to_string(), @@ -33681,11 +35474,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DirectField".to_string(), +<<<<<<< HEAD ty: DeclarationId(2282), }, Field { label: "AccessorMethod".to_string(), ty: DeclarationId(2283), +======= + ty: DeclarationId(2289), + }, + Field { + label: "AccessorMethod".to_string(), + ty: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -33788,7 +35589,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "parameters".to_string(), +<<<<<<< HEAD ty: DeclarationId(2284), +======= + ty: DeclarationId(2291), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "cost".to_string(), @@ -33838,11 +35643,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Borrowed".to_string(), +<<<<<<< HEAD ty: DeclarationId(2285), }, Field { label: "Consumed".to_string(), ty: DeclarationId(2286), +======= + ty: DeclarationId(2292), + }, + Field { + label: "Consumed".to_string(), + ty: DeclarationId(2293), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -33863,11 +35676,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Owned".to_string(), +<<<<<<< HEAD ty: DeclarationId(2287), }, Field { label: "Borrowed".to_string(), ty: DeclarationId(2288), +======= + ty: DeclarationId(2294), + }, + Field { + label: "Borrowed".to_string(), + ty: DeclarationId(2295), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -33888,11 +35709,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "SelfContained".to_string(), +<<<<<<< HEAD ty: DeclarationId(2289), }, Field { label: "Caller".to_string(), ty: DeclarationId(2290), +======= + ty: DeclarationId(2296), + }, + Field { + label: "Caller".to_string(), + ty: DeclarationId(2297), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -33913,11 +35742,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Growable".to_string(), +<<<<<<< HEAD ty: DeclarationId(2291), }, Field { label: "Fixed".to_string(), ty: DeclarationId(2292), +======= + ty: DeclarationId(2298), + }, + Field { + label: "Fixed".to_string(), + ty: DeclarationId(2299), + }, + Field { + label: "NotApplicable".to_string(), + ty: DeclarationId(2300), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "NotApplicable".to_string(), @@ -33941,7 +35782,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Disj { variants: vec![Field { label: "Utf8FreeMonoidChar".to_string(), +<<<<<<< HEAD ty: DeclarationId(2294), +======= + ty: DeclarationId(2301), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -34039,6 +35884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ListEmpty".to_string(), +<<<<<<< HEAD ty: DeclarationId(2295), }, Field { @@ -34077,6 +35923,46 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { label: "ListContains".to_string(), ty: DeclarationId(2304), }, +======= + ty: DeclarationId(2302), + }, + Field { + label: "ListSingleton".to_string(), + ty: DeclarationId(2303), + }, + Field { + label: "ListCons".to_string(), + ty: DeclarationId(2304), + }, + Field { + label: "ListConcat".to_string(), + ty: DeclarationId(2305), + }, + Field { + label: "ListLength".to_string(), + ty: DeclarationId(2306), + }, + Field { + label: "ListIsEmpty".to_string(), + ty: DeclarationId(2307), + }, + Field { + label: "ListFold".to_string(), + ty: DeclarationId(2308), + }, + Field { + label: "ListMap".to_string(), + ty: DeclarationId(2309), + }, + Field { + label: "ListFilter".to_string(), + ty: DeclarationId(2310), + }, + Field { + label: "ListContains".to_string(), + ty: DeclarationId(2311), + }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -34157,11 +36043,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "PlaceholderPatternStrategy".to_string(), +<<<<<<< HEAD ty: DeclarationId(2305), }, Field { label: "VectorList".to_string(), ty: DeclarationId(2306), +======= + ty: DeclarationId(2312), + }, + Field { + label: "VectorList".to_string(), + ty: DeclarationId(2313), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -34640,11 +36534,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Borrow".to_string(), +<<<<<<< HEAD ty: DeclarationId(2307), }, Field { label: "PassByValue".to_string(), ty: DeclarationId(2308), +======= + ty: DeclarationId(2314), + }, + Field { + label: "PassByValue".to_string(), + ty: DeclarationId(2315), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -34665,11 +36567,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "CopyOrClone".to_string(), +<<<<<<< HEAD ty: DeclarationId(2309), }, Field { label: "PassByValue".to_string(), ty: DeclarationId(2310), +======= + ty: DeclarationId(2316), + }, + Field { + label: "PassByValue".to_string(), + ty: DeclarationId(2317), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -34755,11 +36665,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IndexedArgs".to_string(), +<<<<<<< HEAD ty: DeclarationId(2311), }, Field { label: "NamedArg".to_string(), ty: DeclarationId(2312), +======= + ty: DeclarationId(2318), + }, + Field { + label: "NamedArg".to_string(), + ty: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -34780,11 +36698,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "SingleTemplate".to_string(), +<<<<<<< HEAD ty: DeclarationId(2313), }, Field { label: "HigherOrderTemplates".to_string(), ty: DeclarationId(2314), +======= + ty: DeclarationId(2320), + }, + Field { + label: "HigherOrderTemplates".to_string(), + ty: DeclarationId(2321), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -35038,7 +36964,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "append({left}, {right}...)".to_string(), ))], @@ -35051,7 +36981,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35089,7 +37023,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "int64(len({recv}))".to_string(), ))], @@ -35102,7 +37040,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35140,7 +37082,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv}) == 0".to_string(), ))], @@ -35153,7 +37099,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35193,7 +37143,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "/* fold({recv}, {init}, {body}) */".to_string(), ))], @@ -35206,7 +37160,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35246,7 +37204,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "/* map({recv}, {body}) */".to_string(), ))], @@ -35259,7 +37221,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35299,7 +37265,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Filter({recv}, {arg})".to_string(), ))], @@ -35312,7 +37282,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35352,7 +37326,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Any({recv}, {arg})".to_string(), ))], @@ -35365,7 +37343,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35405,7 +37387,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.All({recv}, {arg})".to_string(), ))], @@ -35418,7 +37404,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35458,7 +37448,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.FlatMap({recv}, {arg})".to_string(), ))], @@ -35471,7 +37465,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35487,13 +37485,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1046), }], }, type_params: vec![], phantom_params: Vec::new(), +<<<<<<< HEAD meta_tag: Some(DeclarationId(2315)), +======= + meta_tag: Some(DeclarationId(2322)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -35512,7 +37518,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -35525,7 +37535,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35547,7 +37561,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Join({recv}, {arg})".to_string(), ))], @@ -35560,7 +37578,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35582,7 +37604,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Split({recv}, {arg})".to_string(), ))], @@ -35595,7 +37621,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35619,7 +37649,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[{arg}:]".to_string(), ))], @@ -35632,7 +37666,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35652,7 +37690,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[:{arg}]".to_string(), ))], @@ -35665,7 +37707,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35687,7 +37733,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.SortBy({recv}, {arg})".to_string(), ))], @@ -35700,7 +37750,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35722,7 +37776,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "append({recv}, {arg})".to_string(), ))], @@ -35735,7 +37793,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35757,7 +37819,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Contains({recv}, {arg})".to_string(), ))], @@ -35770,7 +37836,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35787,6 +37857,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DirectRecursion".to_string(), +<<<<<<< HEAD ty: DeclarationId(2329), }, Field { @@ -35800,6 +37871,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "SetRecursion".to_string(), ty: DeclarationId(2332), +======= + ty: DeclarationId(2336), + }, + Field { + label: "ListRecursion".to_string(), + ty: DeclarationId(2337), + }, + Field { + label: "OptionalRecursion".to_string(), + ty: DeclarationId(2338), + }, + Field { + label: "SetRecursion".to_string(), + ty: DeclarationId(2339), + }, + Field { + label: "MapValueRecursion".to_string(), + ty: DeclarationId(2340), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "MapValueRecursion".to_string(), @@ -35915,6 +38005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "StrictSubValue".to_string(), +<<<<<<< HEAD ty: DeclarationId(2334), }, Field { @@ -35928,6 +38019,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "PreservedValue".to_string(), ty: DeclarationId(2337), +======= + ty: DeclarationId(2341), + }, + Field { + label: "IteratedSubValue".to_string(), + ty: DeclarationId(2342), + }, + Field { + label: "ArithmeticDescent".to_string(), + ty: DeclarationId(2343), + }, + Field { + label: "PreservedValue".to_string(), + ty: DeclarationId(2344), + }, + Field { + label: "SubValueUnknown".to_string(), + ty: DeclarationId(2345), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "SubValueUnknown".to_string(), @@ -36082,7 +38192,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("sub_value_to_call_pattern".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1065)], +<<<<<<< HEAD output: DeclarationId(2316), +======= + output: DeclarationId(2323), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 20571, @@ -36104,7 +38218,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("sub_value_to_lowering_target".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1065)], +<<<<<<< HEAD output: DeclarationId(2317), +======= + output: DeclarationId(2324), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 21959, @@ -36128,6 +38246,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IntegerExpZero".to_string(), +<<<<<<< HEAD ty: DeclarationId(2339), }, Field { @@ -36137,6 +38256,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "FractionExp".to_string(), ty: DeclarationId(2341), +======= + ty: DeclarationId(2346), + }, + Field { + label: "IntegerExpPos".to_string(), + ty: DeclarationId(2347), + }, + Field { + label: "FractionExp".to_string(), + ty: DeclarationId(2348), + }, + Field { + label: "LogBasedExp".to_string(), + ty: DeclarationId(2349), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "LogBasedExp".to_string(), @@ -36183,11 +38317,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "PolyCost".to_string(), +<<<<<<< HEAD ty: DeclarationId(2343), }, Field { label: "LogCost".to_string(), ty: DeclarationId(2344), +======= + ty: DeclarationId(2350), + }, + Field { + label: "LogCost".to_string(), + ty: DeclarationId(2351), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -36208,6 +38350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ConstantBound".to_string(), +<<<<<<< HEAD ty: DeclarationId(2345), }, Field { @@ -36229,6 +38372,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "ForeverBound".to_string(), ty: DeclarationId(2354), +======= + ty: DeclarationId(2352), + }, + Field { + label: "AtomicBound".to_string(), + ty: DeclarationId(2353), + }, + Field { + label: "ProductBound".to_string(), + ty: DeclarationId(2355), + }, + Field { + label: "SumOfProductsBound".to_string(), + ty: DeclarationId(2358), + }, + Field { + label: "SumBound".to_string(), + ty: DeclarationId(2360), + }, + Field { + label: "ForeverBound".to_string(), + ty: DeclarationId(2361), + }, + Field { + label: "ErrorBound".to_string(), + ty: DeclarationId(2362), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ErrorBound".to_string(), @@ -36250,7 +38420,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1078), name: Some("sum_bound".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(2318)], +======= + inputs: vec![DeclarationId(2325)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", @@ -36295,7 +38469,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("cost_bound_to_symbolic".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1077)], +<<<<<<< HEAD output: DeclarationId(849), +======= + output: DeclarationId(848), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(544))), }, type_params: vec![], @@ -36313,7 +38491,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("atomic_cost_to_symbolic".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1076)], +<<<<<<< HEAD output: DeclarationId(849), +======= + output: DeclarationId(848), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(553))), }, type_params: vec![], @@ -36330,8 +38512,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1082), name: Some("product_atoms_to_symbolic".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(2319)], output: DeclarationId(849), +======= + inputs: vec![DeclarationId(2326)], + output: DeclarationId(848), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 29913, @@ -36352,8 +38539,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1083), name: Some("product_term_to_symbolic".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(2320)], output: DeclarationId(849), +======= + inputs: vec![DeclarationId(2327)], + output: DeclarationId(848), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(555))), }, type_params: vec![], @@ -36370,8 +38562,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1084), name: Some("sum_products_to_symbolic".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(2322)], output: DeclarationId(849), +======= + inputs: vec![DeclarationId(2329)], + output: DeclarationId(848), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 30137, @@ -36624,7 +38821,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("int_add_checked".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93), DeclarationId(93)], +<<<<<<< HEAD output: DeclarationId(2323), +======= + output: DeclarationId(2330), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 33617, @@ -36646,7 +38847,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("int_mul_checked".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93), DeclarationId(93)], +<<<<<<< HEAD output: DeclarationId(2324), +======= + output: DeclarationId(2331), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 33913, @@ -36668,7 +38873,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("bounded_int_pow_exponent".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93)], +<<<<<<< HEAD output: DeclarationId(2325), +======= + output: DeclarationId(2332), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 35162, @@ -36690,7 +38899,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("int_pow_bounded".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93), DeclarationId(93)], +<<<<<<< HEAD output: DeclarationId(2326), +======= + output: DeclarationId(2333), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 35637, @@ -36712,7 +38925,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("ceil_log".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93), DeclarationId(93)], +<<<<<<< HEAD output: DeclarationId(2327), +======= + output: DeclarationId(2334), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 36900, @@ -36739,7 +38956,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { DeclarationId(93), DeclarationId(93), ], +<<<<<<< HEAD output: DeclarationId(2328), +======= + output: DeclarationId(2335), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 37172, @@ -37141,13 +39362,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1290), }], }, type_params: vec![], phantom_params: Vec::new(), +<<<<<<< HEAD meta_tag: Some(DeclarationId(2356)), +======= + meta_tag: Some(DeclarationId(2363)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -37167,13 +39396,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1290), }], }, type_params: vec![], phantom_params: Vec::new(), +<<<<<<< HEAD meta_tag: Some(DeclarationId(2357)), +======= + meta_tag: Some(DeclarationId(2364)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -37198,6 +39435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "read".to_string(), +<<<<<<< HEAD ty: DeclarationId(2359), }, Field { @@ -37211,6 +39449,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "iterate".to_string(), ty: DeclarationId(2362), +======= + ty: DeclarationId(2366), + }, + Field { + label: "sequential".to_string(), + ty: DeclarationId(2367), + }, + Field { + label: "branch".to_string(), + ty: DeclarationId(2368), + }, + Field { + label: "iterate".to_string(), + ty: DeclarationId(2369), + }, + Field { + label: "validate".to_string(), + ty: DeclarationId(2370), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "validate".to_string(), @@ -37249,11 +39506,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DeclarationScope".to_string(), +<<<<<<< HEAD ty: DeclarationId(2364), }, Field { label: "NodeScope".to_string(), ty: DeclarationId(2365), +======= + ty: DeclarationId(2371), + }, + Field { + label: "NodeScope".to_string(), + ty: DeclarationId(2372), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -37273,7 +39538,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Disj { variants: vec![Field { label: "Error".to_string(), +<<<<<<< HEAD ty: DeclarationId(2366), +======= + ty: DeclarationId(2373), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -37293,11 +39562,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "project".to_string(), +<<<<<<< HEAD ty: DeclarationId(2367), }, Field { label: "violates".to_string(), ty: DeclarationId(2368), +======= + ty: DeclarationId(2374), + }, + Field { + label: "violates".to_string(), + ty: DeclarationId(2375), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -37346,11 +39623,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "lens".to_string(), +<<<<<<< HEAD ty: DeclarationId(2369), }, Field { label: "enforcement".to_string(), ty: DeclarationId(2370), +======= + ty: DeclarationId(2376), + }, + Field { + label: "enforcement".to_string(), + ty: DeclarationId(2377), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -37399,7 +39684,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "enforceable_lens".to_string(), +<<<<<<< HEAD ty: DeclarationId(2371), +======= + ty: DeclarationId(2378), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "section".to_string(), @@ -37464,7 +39753,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "lens".to_string(), +<<<<<<< HEAD ty: DeclarationId(2372), +======= + ty: DeclarationId(2379), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "section".to_string(), @@ -37507,11 +39800,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Miss".to_string(), +<<<<<<< HEAD ty: DeclarationId(2375), }, Field { label: "Hit".to_string(), ty: DeclarationId(2376), +======= + ty: DeclarationId(2382), + }, + Field { + label: "Hit".to_string(), + ty: DeclarationId(2383), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -37544,7 +39845,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("miss_int_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![], +<<<<<<< HEAD output: DeclarationId(2373), +======= + output: DeclarationId(2380), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4601, 4611)), }, type_params: vec![], @@ -37562,7 +39867,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("hit_int_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93)], +<<<<<<< HEAD output: DeclarationId(2374), +======= + output: DeclarationId(2381), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4654, 4666)), }, type_params: vec![], @@ -37600,7 +39909,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "items".to_string(), +<<<<<<< HEAD ty: DeclarationId(2377), +======= + ty: DeclarationId(2384), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -37628,7 +39941,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "refinement".to_string(), +<<<<<<< HEAD ty: DeclarationId(2378), +======= + ty: DeclarationId(2385), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -37703,11 +40020,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Positional".to_string(), +<<<<<<< HEAD ty: DeclarationId(2380), }, Field { label: "Record".to_string(), ty: DeclarationId(2382), +======= + ty: DeclarationId(2387), + }, + Field { + label: "Record".to_string(), + ty: DeclarationId(2389), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -37728,11 +40053,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Named".to_string(), +<<<<<<< HEAD ty: DeclarationId(2383), }, Field { label: "Parameterized".to_string(), ty: DeclarationId(2385), +======= + ty: DeclarationId(2390), + }, + Field { + label: "Parameterized".to_string(), + ty: DeclarationId(2392), + }, + Field { + label: "Optional".to_string(), + ty: DeclarationId(2393), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Optional".to_string(), @@ -37740,7 +40077,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "Arrow".to_string(), +<<<<<<< HEAD ty: DeclarationId(2388), +======= + ty: DeclarationId(2395), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -37881,7 +40222,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "BareVariant".to_string(), +<<<<<<< HEAD ty: DeclarationId(2389), +======= + ty: DeclarationId(2396), + }, + Field { + label: "VariantWith".to_string(), + ty: DeclarationId(2397), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "VariantWith".to_string(), @@ -37889,7 +40238,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "VariantFields".to_string(), +<<<<<<< HEAD ty: DeclarationId(2392), +======= + ty: DeclarationId(2399), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -37910,11 +40263,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Int".to_string(), +<<<<<<< HEAD ty: DeclarationId(2393), }, Field { label: "Bool".to_string(), ty: DeclarationId(2394), +======= + ty: DeclarationId(2400), + }, + Field { + label: "Bool".to_string(), + ty: DeclarationId(2401), + }, + Field { + label: "String".to_string(), + ty: DeclarationId(2402), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "String".to_string(), @@ -37939,7 +40304,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Literal".to_string(), +<<<<<<< HEAD ty: DeclarationId(2396), +======= + ty: DeclarationId(2403), + }, + Field { + label: "Var".to_string(), + ty: DeclarationId(2404), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Var".to_string(), @@ -37947,6 +40320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "Path".to_string(), +<<<<<<< HEAD ty: DeclarationId(2400), }, Field { @@ -37964,10 +40338,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "Operator".to_string(), ty: DeclarationId(2410), +======= + ty: DeclarationId(2407), + }, + Field { + label: "Call".to_string(), + ty: DeclarationId(2409), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + Field { + label: "PathCall".to_string(), + ty: DeclarationId(2413), + }, + Field { + label: "VariantRecord".to_string(), + ty: DeclarationId(2415), + }, + Field { + label: "Operator".to_string(), + ty: DeclarationId(2417), }, Field { label: "Lambda".to_string(), +<<<<<<< HEAD ty: DeclarationId(2412), +======= + ty: DeclarationId(2419), + }, + Field { + label: "If".to_string(), + ty: DeclarationId(2420), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "If".to_string(), @@ -37975,6 +40376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "Match".to_string(), +<<<<<<< HEAD ty: DeclarationId(2415), }, Field { @@ -37988,6 +40390,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "Map".to_string(), ty: DeclarationId(2421), +======= + ty: DeclarationId(2422), + }, + Field { + label: "Record".to_string(), + ty: DeclarationId(2424), + }, + Field { + label: "List".to_string(), + ty: DeclarationId(2426), + }, + Field { + label: "Map".to_string(), + ty: DeclarationId(2428), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -38008,6 +40425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Let".to_string(), +<<<<<<< HEAD ty: DeclarationId(2423), }, Field { @@ -38021,9 +40439,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "Data".to_string(), ty: DeclarationId(2431), +======= + ty: DeclarationId(2430), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + Field { + label: "Fn".to_string(), + ty: DeclarationId(2433), + }, + Field { + label: "FnExternalBody".to_string(), + ty: DeclarationId(2436), + }, + Field { + label: "Data".to_string(), + ty: DeclarationId(2438), }, Field { label: "Module".to_string(), +<<<<<<< HEAD ty: DeclarationId(2433), }, Field { @@ -38037,14 +40471,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "TypeRecord".to_string(), ty: DeclarationId(2441), +======= + ty: DeclarationId(2440), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + Field { + label: "Import".to_string(), + ty: DeclarationId(2443), + }, + Field { + label: "TypeAtom".to_string(), + ty: DeclarationId(2445), + }, + Field { + label: "TypeRecord".to_string(), + ty: DeclarationId(2448), }, Field { label: "TypeSum".to_string(), +<<<<<<< HEAD ty: DeclarationId(2445), }, Field { label: "TypeAlias".to_string(), ty: DeclarationId(2448), +======= + ty: DeclarationId(2452), + }, + Field { + label: "TypeAlias".to_string(), + ty: DeclarationId(2455), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -38086,7 +40543,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "[*{left}, *{right}]".to_string(), ))], @@ -38099,7 +40560,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38141,7 +40606,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -38154,7 +40623,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38196,7 +40669,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "(len({recv}) == 0)".to_string(), ))], @@ -38209,7 +40686,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38253,7 +40734,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "__v3_fold({recv}, {init}, {body})".to_string(), ))], @@ -38266,7 +40751,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38310,7 +40799,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "[{body} for {item} in {recv}]".to_string(), ))], @@ -38323,7 +40816,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38367,7 +40864,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "[x for x in {recv} if {arg}(x)]".to_string(), ))], @@ -38380,7 +40881,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38424,7 +40929,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "any({arg}(x) for x in {recv})".to_string(), ))], @@ -38437,7 +40946,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38481,7 +40994,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "all({arg}(x) for x in {recv})".to_string(), ))], @@ -38494,7 +41011,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38538,7 +41059,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "[y for x in {recv} for y in {arg}(x)]".to_string(), ))], @@ -38551,7 +41076,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38571,13 +41100,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1046), }], }, type_params: vec![], phantom_params: Vec::new(), +<<<<<<< HEAD meta_tag: Some(DeclarationId(2449)), +======= + meta_tag: Some(DeclarationId(2456)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -38596,7 +41133,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -38609,7 +41150,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38629,7 +41174,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{arg}.join({recv})".to_string(), ))], @@ -38642,7 +41191,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38662,7 +41215,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}.split({arg})".to_string(), ))], @@ -38675,7 +41232,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38697,7 +41258,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[-1] if {recv} else None".to_string(), ))], @@ -38710,7 +41275,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38732,7 +41301,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[0] if {recv} else None".to_string(), ))], @@ -38745,7 +41318,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38767,7 +41344,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "list(enumerate({recv}))".to_string(), ))], @@ -38780,7 +41361,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38802,7 +41387,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "[ord(c) for c in {recv}]".to_string(), ))], @@ -38815,7 +41404,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38839,7 +41432,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[{arg}:]".to_string(), ))], @@ -38852,7 +41449,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38872,7 +41473,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[:{arg}]".to_string(), ))], @@ -38885,7 +41490,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38907,7 +41516,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "sorted({recv}, key={arg})".to_string(), ))], @@ -38920,7 +41533,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38940,7 +41557,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{recv} + [{arg}]".to_string(), ))], @@ -38953,7 +41574,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38973,7 +41598,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{arg} in {recv}".to_string(), ))], @@ -38986,7 +41615,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -39084,6 +41717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LiteralValue".to_string(), +<<<<<<< HEAD ty: DeclarationId(2451), }, Field { @@ -39097,6 +41731,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "NodeRef".to_string(), ty: DeclarationId(2455), +======= + ty: DeclarationId(2458), + }, + Field { + label: "RecordValue".to_string(), + ty: DeclarationId(2460), + }, + Field { + label: "VariantValue".to_string(), + ty: DeclarationId(2461), + }, + Field { + label: "NodeRef".to_string(), + ty: DeclarationId(2462), + }, + Field { + label: "CardinalityValue".to_string(), + ty: DeclarationId(2463), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "CardinalityValue".to_string(), @@ -39153,7 +41806,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "bindings".to_string(), +<<<<<<< HEAD ty: DeclarationId(2457), +======= + ty: DeclarationId(2464), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -39172,7 +41829,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "frames".to_string(), +<<<<<<< HEAD ty: DeclarationId(2458), +======= + ty: DeclarationId(2465), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -39210,7 +41871,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Disj { variants: vec![Field { label: "ApplicativeOrder".to_string(), +<<<<<<< HEAD ty: DeclarationId(2459), +======= + ty: DeclarationId(2466), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -39230,11 +41895,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LeftFirst".to_string(), +<<<<<<< HEAD ty: DeclarationId(2460), }, Field { label: "RightFirst".to_string(), ty: DeclarationId(2461), +======= + ty: DeclarationId(2467), + }, + Field { + label: "RightFirst".to_string(), + ty: DeclarationId(2468), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -39285,7 +41958,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1176), name: Some("evaluate".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(722), DeclarationId(2450)], +======= + inputs: vec![DeclarationId(827), DeclarationId(721), DeclarationId(2457)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1167), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/runtime.dag", 11265, 11284)), }, @@ -39299,11 +41976,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/runtime.dag", 11196, 11284), }); +<<<<<<< HEAD declarations.push(Declaration { id: DeclarationId(1177), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2314), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3551, 4204) }); declarations.push(Declaration { id: DeclarationId(1178), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2314), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4206, 4701) }); declarations.push(Declaration { id: DeclarationId(1179), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2314), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4703, 5192) }); declarations.push(Declaration { id: DeclarationId(1180), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2314), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5194, 5725) }); declarations.push(Declaration { id: DeclarationId(1181), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), value: DeclarationId(1046) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2462)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Reference(DeclarationId(1177)), FieldValue::Reference(DeclarationId(1178)), FieldValue::Reference(DeclarationId(1179)), FieldValue::Reference(DeclarationId(1180)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5728, 8449) }); +======= + declarations.push(Declaration { id: DeclarationId(1177), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3551, 4204) }); + declarations.push(Declaration { id: DeclarationId(1178), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4206, 4701) }); + declarations.push(Declaration { id: DeclarationId(1179), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4703, 5192) }); + declarations.push(Declaration { id: DeclarationId(1180), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5194, 5725) }); + declarations.push(Declaration { id: DeclarationId(1181), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1046) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2469)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })]), FieldValue::Reference(DeclarationId(1177)), FieldValue::Reference(DeclarationId(1178)), FieldValue::Reference(DeclarationId(1179)), FieldValue::Reference(DeclarationId(1180)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5728, 8449) }); +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) declarations.push(Declaration { id: DeclarationId(1182), name: Some("InputField".to_string()), @@ -39373,7 +42058,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "inputs".to_string(), +<<<<<<< HEAD ty: DeclarationId(2463), +======= + ty: DeclarationId(2470), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "endpoint".to_string(), @@ -39416,8 +42105,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1187), name: Some("ci_demo_timing_read".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(827)], output: DeclarationId(2464), +======= + inputs: vec![DeclarationId(827), DeclarationId(826)], + output: DeclarationId(2471), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(597))), }, type_params: vec![], @@ -39434,8 +42128,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1188), name: Some("ci_wad_modeled_workflow_timing_witness".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(827)], output: DeclarationId(2465), +======= + inputs: vec![DeclarationId(827), DeclarationId(826)], + output: DeclarationId(2472), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(599))), }, type_params: vec![], @@ -39453,7 +42152,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("_ci_wad_seed_list_declaration_empty".to_string()), connective: TypeConnective::Arrow { inputs: vec![], +<<<<<<< HEAD output: DeclarationId(2466), +======= + output: DeclarationId(2473), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(601))), }, type_params: vec![], @@ -39471,7 +42174,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("_ci_wad_seed_list_behavior_empty".to_string()), connective: TypeConnective::Arrow { inputs: vec![], +<<<<<<< HEAD output: DeclarationId(2467), +======= + output: DeclarationId(2474), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(603))), }, type_params: vec![], @@ -39489,7 +42196,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("_ci_wad_seed_list_dagport_empty".to_string()), connective: TypeConnective::Arrow { inputs: vec![], +<<<<<<< HEAD output: DeclarationId(2468), +======= + output: DeclarationId(2475), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(605))), }, type_params: vec![], @@ -39507,7 +42218,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("_ci_wad_seed_list_cluster_empty".to_string()), connective: TypeConnective::Arrow { inputs: vec![], +<<<<<<< HEAD output: DeclarationId(2469), +======= + output: DeclarationId(2476), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(607))), }, type_params: vec![], @@ -39525,7 +42240,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("_ci_wad_empty_list_diagnostic".to_string()), connective: TypeConnective::Arrow { inputs: vec![], +<<<<<<< HEAD output: DeclarationId(2470), +======= + output: DeclarationId(2477), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(609))), }, type_params: vec![], @@ -39543,7 +42262,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("_ci_wad_empty_list_witness_tm".to_string()), connective: TypeConnective::Arrow { inputs: vec![], +<<<<<<< HEAD output: DeclarationId(2472), +======= + output: DeclarationId(2479), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(611))), }, type_params: vec![], @@ -39561,7 +42284,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("_ci_wad_witnesses_singleton_tm".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1229)], +<<<<<<< HEAD output: DeclarationId(2474), +======= + output: DeclarationId(2481), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(615))), }, type_params: vec![], @@ -39579,7 +42306,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("_ci_wad_violations_singleton".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(974)], +<<<<<<< HEAD output: DeclarationId(2475), +======= + output: DeclarationId(2482), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(618))), }, type_params: vec![], @@ -39597,7 +42328,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("_ci_wad_dimension_ok_tm_payload".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1229)], +<<<<<<< HEAD output: DeclarationId(2476), +======= + output: DeclarationId(2483), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(622))), }, type_params: vec![], @@ -39615,7 +42350,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("_ci_wad_dimension_fail_tm_payload".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1229), DeclarationId(974)], +<<<<<<< HEAD output: DeclarationId(2477), +======= + output: DeclarationId(2484), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(627))), }, type_params: vec![], @@ -39632,8 +42371,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1199), name: Some("report_dim_ok_tm".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(1229)], output: DeclarationId(2478), +======= + inputs: vec![DeclarationId(827), DeclarationId(1229)], + output: DeclarationId(2485), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(634))), }, type_params: vec![], @@ -39650,8 +42394,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1200), name: Some("report_dim_fail_tm".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(1229), DeclarationId(974)], output: DeclarationId(2479), +======= + inputs: vec![DeclarationId(827), DeclarationId(1229), DeclarationId(974)], + output: DeclarationId(2486), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(641))), }, type_params: vec![], @@ -39668,8 +42417,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1201), name: Some("report_inhabits_branch_tm".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(1229), DeclarationId(978)], output: DeclarationId(2480), +======= + inputs: vec![DeclarationId(827), DeclarationId(1229), DeclarationId(978)], + output: DeclarationId(2487), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(646))), }, type_params: vec![], @@ -39686,8 +42440,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1202), name: Some("dimension_report_tm_from_witness".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(2481)], output: DeclarationId(2482), +======= + inputs: vec![DeclarationId(827), DeclarationId(2488)], + output: DeclarationId(2489), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(656))), }, type_params: vec![], @@ -39704,8 +42463,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1203), name: Some("demo_ci_modeled_timing_dimension_report".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(827)], output: DeclarationId(2483), +======= + inputs: vec![DeclarationId(827), DeclarationId(826)], + output: DeclarationId(2490), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(664))), }, type_params: vec![], @@ -39725,11 +42489,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Strict".to_string(), +<<<<<<< HEAD ty: DeclarationId(2513), }, Field { label: "NonIncreasing".to_string(), ty: DeclarationId(2514), +======= + ty: DeclarationId(2520), + }, + Field { + label: "NonIncreasing".to_string(), + ty: DeclarationId(2521), + }, + Field { + label: "DescentUnknown".to_string(), + ty: DeclarationId(2522), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "DescentUnknown".to_string(), @@ -39835,8 +42611,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1209), name: Some("optional_evidence_meet".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(2505), DeclarationId(2506)], output: DeclarationId(2507), +======= + inputs: vec![DeclarationId(2512), DeclarationId(2513)], + output: DeclarationId(2514), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2488, @@ -39857,8 +42638,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1210), name: Some("map_evidence_merge_at".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(2508), DeclarationId(230), DeclarationId(1204)], output: DeclarationId(2509), +======= + inputs: vec![DeclarationId(2515), DeclarationId(230), DeclarationId(1204)], + output: DeclarationId(2516), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2833, @@ -39882,6 +42668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "TreeSize".to_string(), +<<<<<<< HEAD ty: DeclarationId(2516), }, Field { @@ -39895,6 +42682,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "TokenPosition".to_string(), ty: DeclarationId(2519), +======= + ty: DeclarationId(2523), + }, + Field { + label: "ListLength".to_string(), + ty: DeclarationId(2524), + }, + Field { + label: "ArithmeticValue".to_string(), + ty: DeclarationId(2525), + }, + Field { + label: "TokenPosition".to_string(), + ty: DeclarationId(2526), + }, + Field { + label: "SetCardinality".to_string(), + ty: DeclarationId(2527), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "SetCardinality".to_string(), @@ -39919,11 +42725,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "OneStep".to_string(), +<<<<<<< HEAD ty: DeclarationId(2521), }, Field { label: "AdditionalStep".to_string(), ty: DeclarationId(2522), +======= + ty: DeclarationId(2528), + }, + Field { + label: "AdditionalStep".to_string(), + ty: DeclarationId(2529), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -39966,11 +42780,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DivideByTwo".to_string(), +<<<<<<< HEAD ty: DeclarationId(2523), }, Field { label: "StrictlyLarger".to_string(), ty: DeclarationId(2524), +======= + ty: DeclarationId(2530), + }, + Field { + label: "StrictlyLarger".to_string(), + ty: DeclarationId(2531), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -40033,7 +42855,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("positive_descent_amount_from_positive_int".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93)], +<<<<<<< HEAD output: DeclarationId(2510), +======= + output: DeclarationId(2517), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 6420, @@ -40055,7 +42881,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("proportional_divisor_from_int_at_least_two".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93)], +<<<<<<< HEAD output: DeclarationId(2511), +======= + output: DeclarationId(2518), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 6860, @@ -40079,6 +42909,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ChildAccessor".to_string(), +<<<<<<< HEAD ty: DeclarationId(2525), }, Field { @@ -40100,6 +42931,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "SetRemoval".to_string(), ty: DeclarationId(2530), +======= + ty: DeclarationId(2532), + }, + Field { + label: "ListShrink".to_string(), + ty: DeclarationId(2533), + }, + Field { + label: "ArithmeticSubtractDescent".to_string(), + ty: DeclarationId(2534), + }, + Field { + label: "ArithmeticDivideDescent".to_string(), + ty: DeclarationId(2535), + }, + Field { + label: "ParserAdvance".to_string(), + ty: DeclarationId(2536), + }, + Field { + label: "SetRemoval".to_string(), + ty: DeclarationId(2537), + }, + Field { + label: "FoldIteration".to_string(), + ty: DeclarationId(2538), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "FoldIteration".to_string(), @@ -40123,7 +42981,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "dimensions".to_string(), +<<<<<<< HEAD ty: DeclarationId(2532), +======= + ty: DeclarationId(2539), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -40151,7 +43013,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "evidence".to_string(), +<<<<<<< HEAD ty: DeclarationId(2533), +======= + ty: DeclarationId(2540), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -40171,7 +43037,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Disj { variants: vec![Field { label: "Strict".to_string(), +<<<<<<< HEAD ty: DeclarationId(2534), +======= + ty: DeclarationId(2541), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -40191,11 +43061,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NonIncreasing".to_string(), +<<<<<<< HEAD ty: DeclarationId(2535), }, Field { label: "DescentUnknown".to_string(), ty: DeclarationId(2536), +======= + ty: DeclarationId(2542), + }, + Field { + label: "DescentUnknown".to_string(), + ty: DeclarationId(2543), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -40216,11 +43094,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "EvidenceUnknown".to_string(), +<<<<<<< HEAD ty: DeclarationId(2537), }, Field { label: "EvidenceIncomplete".to_string(), ty: DeclarationId(2538), +======= + ty: DeclarationId(2544), + }, + Field { + label: "EvidenceIncomplete".to_string(), + ty: DeclarationId(2545), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -40249,7 +43135,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "per_path".to_string(), +<<<<<<< HEAD ty: DeclarationId(2539), +======= + ty: DeclarationId(2546), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -40267,8 +43157,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1226), name: Some("descent_execution_proof".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(725), DeclarationId(723)], output: DeclarationId(2512), +======= + inputs: vec![DeclarationId(827), DeclarationId(724), DeclarationId(722)], + output: DeclarationId(2519), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 12400, @@ -40329,6 +43224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Observed".to_string(), +<<<<<<< HEAD ty: DeclarationId(2542), }, Field { @@ -40338,6 +43234,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "Ambiguous".to_string(), ty: DeclarationId(2544), +======= + ty: DeclarationId(2549), + }, + Field { + label: "Unobserved".to_string(), + ty: DeclarationId(2550), + }, + Field { + label: "Ambiguous".to_string(), + ty: DeclarationId(2551), + }, + Field { + label: "Stale".to_string(), + ty: DeclarationId(2552), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Stale".to_string(), @@ -40406,7 +43317,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "observations".to_string(), +<<<<<<< HEAD ty: DeclarationId(2546), +======= + ty: DeclarationId(2553), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -40576,7 +43491,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("timing_lens_empty_corrections".to_string()), connective: TypeConnective::Arrow { inputs: vec![], +<<<<<<< HEAD output: DeclarationId(2540), +======= + output: DeclarationId(2547), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(714))), }, type_params: vec![], @@ -40647,7 +43566,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1244), name: Some("timing_lens_validate_non_observed".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(230)], +======= + inputs: vec![DeclarationId(827), DeclarationId(230)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(978), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(747))), }, @@ -40665,7 +43588,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1245), name: Some("timing_measurement_iterate".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(1229), DeclarationId(818)], +======= + inputs: vec![DeclarationId(1229), DeclarationId(817)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1229), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(756))), }, @@ -40683,8 +43610,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1246), name: Some("timing_lens_read".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(827)], output: DeclarationId(2541), +======= + inputs: vec![DeclarationId(827), DeclarationId(826)], + output: DeclarationId(2548), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(793))), }, type_params: vec![], @@ -40701,7 +43633,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1247), name: Some("timing_lens_validate".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(1229)], +======= + inputs: vec![DeclarationId(827), DeclarationId(1229)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(978), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(807))), }, @@ -40722,6 +43658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "KwLet".to_string(), +<<<<<<< HEAD ty: DeclarationId(2558), }, Field { @@ -40900,6 +43837,186 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { label: "Eof".to_string(), ty: DeclarationId(2602), }, +======= + ty: DeclarationId(2565), + }, + Field { + label: "KwIf".to_string(), + ty: DeclarationId(2566), + }, + Field { + label: "KwThen".to_string(), + ty: DeclarationId(2567), + }, + Field { + label: "KwElse".to_string(), + ty: DeclarationId(2568), + }, + Field { + label: "KwFn".to_string(), + ty: DeclarationId(2569), + }, + Field { + label: "KwType".to_string(), + ty: DeclarationId(2570), + }, + Field { + label: "KwModule".to_string(), + ty: DeclarationId(2571), + }, + Field { + label: "KwImport".to_string(), + ty: DeclarationId(2572), + }, + Field { + label: "KwMatch".to_string(), + ty: DeclarationId(2573), + }, + Field { + label: "KwData".to_string(), + ty: DeclarationId(2574), + }, + Field { + label: "KwWhere".to_string(), + ty: DeclarationId(2575), + }, + Field { + label: "KwTrue".to_string(), + ty: DeclarationId(2576), + }, + Field { + label: "KwFalse".to_string(), + ty: DeclarationId(2577), + }, + Field { + label: "Ident".to_string(), + ty: DeclarationId(2578), + }, + Field { + label: "IntLit".to_string(), + ty: DeclarationId(2579), + }, + Field { + label: "StringLit".to_string(), + ty: DeclarationId(2580), + }, + Field { + label: "Eq".to_string(), + ty: DeclarationId(2581), + }, + Field { + label: "EqEq".to_string(), + ty: DeclarationId(2582), + }, + Field { + label: "NotEq".to_string(), + ty: DeclarationId(2583), + }, + Field { + label: "Lt".to_string(), + ty: DeclarationId(2584), + }, + Field { + label: "Le".to_string(), + ty: DeclarationId(2585), + }, + Field { + label: "Gt".to_string(), + ty: DeclarationId(2586), + }, + Field { + label: "Ge".to_string(), + ty: DeclarationId(2587), + }, + Field { + label: "Plus".to_string(), + ty: DeclarationId(2588), + }, + Field { + label: "Minus".to_string(), + ty: DeclarationId(2589), + }, + Field { + label: "Star".to_string(), + ty: DeclarationId(2590), + }, + Field { + label: "Slash".to_string(), + ty: DeclarationId(2591), + }, + Field { + label: "AmpAmp".to_string(), + ty: DeclarationId(2592), + }, + Field { + label: "PipePipe".to_string(), + ty: DeclarationId(2593), + }, + Field { + label: "Colon".to_string(), + ty: DeclarationId(2594), + }, + Field { + label: "Arrow".to_string(), + ty: DeclarationId(2595), + }, + Field { + label: "FatArrow".to_string(), + ty: DeclarationId(2596), + }, + Field { + label: "PipeArrow".to_string(), + ty: DeclarationId(2597), + }, + Field { + label: "Dot".to_string(), + ty: DeclarationId(2598), + }, + Field { + label: "LParen".to_string(), + ty: DeclarationId(2599), + }, + Field { + label: "RParen".to_string(), + ty: DeclarationId(2600), + }, + Field { + label: "LBrace".to_string(), + ty: DeclarationId(2601), + }, + Field { + label: "RBrace".to_string(), + ty: DeclarationId(2602), + }, + Field { + label: "LBracket".to_string(), + ty: DeclarationId(2603), + }, + Field { + label: "RBracket".to_string(), + ty: DeclarationId(2604), + }, + Field { + label: "Comma".to_string(), + ty: DeclarationId(2605), + }, + Field { + label: "Semicolon".to_string(), + ty: DeclarationId(2606), + }, + Field { + label: "Pipe".to_string(), + ty: DeclarationId(2607), + }, + Field { + label: "Question".to_string(), + ty: DeclarationId(2608), + }, + Field { + label: "Eof".to_string(), + ty: DeclarationId(2609), + }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -40944,6 +44061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "KwLet".to_string(), +<<<<<<< HEAD ty: DeclarationId(2603), }, Field { @@ -40994,6 +44112,58 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { label: "KwFalse".to_string(), ty: DeclarationId(2615), }, +======= + ty: DeclarationId(2610), + }, + Field { + label: "KwIf".to_string(), + ty: DeclarationId(2611), + }, + Field { + label: "KwThen".to_string(), + ty: DeclarationId(2612), + }, + Field { + label: "KwElse".to_string(), + ty: DeclarationId(2613), + }, + Field { + label: "KwFn".to_string(), + ty: DeclarationId(2614), + }, + Field { + label: "KwType".to_string(), + ty: DeclarationId(2615), + }, + Field { + label: "KwModule".to_string(), + ty: DeclarationId(2616), + }, + Field { + label: "KwImport".to_string(), + ty: DeclarationId(2617), + }, + Field { + label: "KwMatch".to_string(), + ty: DeclarationId(2618), + }, + Field { + label: "KwData".to_string(), + ty: DeclarationId(2619), + }, + Field { + label: "KwWhere".to_string(), + ty: DeclarationId(2620), + }, + Field { + label: "KwTrue".to_string(), + ty: DeclarationId(2621), + }, + Field { + label: "KwFalse".to_string(), + ty: DeclarationId(2622), + }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -41013,6 +44183,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Eq".to_string(), +<<<<<<< HEAD ty: DeclarationId(2616), }, Field { @@ -41123,6 +44294,118 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { label: "Question".to_string(), ty: DeclarationId(2643), }, +======= + ty: DeclarationId(2623), + }, + Field { + label: "EqEq".to_string(), + ty: DeclarationId(2624), + }, + Field { + label: "NotEq".to_string(), + ty: DeclarationId(2625), + }, + Field { + label: "Lt".to_string(), + ty: DeclarationId(2626), + }, + Field { + label: "Le".to_string(), + ty: DeclarationId(2627), + }, + Field { + label: "Gt".to_string(), + ty: DeclarationId(2628), + }, + Field { + label: "Ge".to_string(), + ty: DeclarationId(2629), + }, + Field { + label: "Plus".to_string(), + ty: DeclarationId(2630), + }, + Field { + label: "Minus".to_string(), + ty: DeclarationId(2631), + }, + Field { + label: "Star".to_string(), + ty: DeclarationId(2632), + }, + Field { + label: "Slash".to_string(), + ty: DeclarationId(2633), + }, + Field { + label: "AmpAmp".to_string(), + ty: DeclarationId(2634), + }, + Field { + label: "PipePipe".to_string(), + ty: DeclarationId(2635), + }, + Field { + label: "Colon".to_string(), + ty: DeclarationId(2636), + }, + Field { + label: "Arrow".to_string(), + ty: DeclarationId(2637), + }, + Field { + label: "FatArrow".to_string(), + ty: DeclarationId(2638), + }, + Field { + label: "PipeArrow".to_string(), + ty: DeclarationId(2639), + }, + Field { + label: "Dot".to_string(), + ty: DeclarationId(2640), + }, + Field { + label: "LParen".to_string(), + ty: DeclarationId(2641), + }, + Field { + label: "RParen".to_string(), + ty: DeclarationId(2642), + }, + Field { + label: "LBrace".to_string(), + ty: DeclarationId(2643), + }, + Field { + label: "RBrace".to_string(), + ty: DeclarationId(2644), + }, + Field { + label: "LBracket".to_string(), + ty: DeclarationId(2645), + }, + Field { + label: "RBracket".to_string(), + ty: DeclarationId(2646), + }, + Field { + label: "Comma".to_string(), + ty: DeclarationId(2647), + }, + Field { + label: "Semicolon".to_string(), + ty: DeclarationId(2648), + }, + Field { + label: "Pipe".to_string(), + ty: DeclarationId(2649), + }, + Field { + label: "Question".to_string(), + ty: DeclarationId(2650), + }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -41336,6 +44619,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "TokenizerError".to_string(), +<<<<<<< HEAD ty: DeclarationId(2647), }, Field { @@ -41374,6 +44658,46 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { label: "NominalOpacityViolation".to_string(), ty: DeclarationId(2656), }, +======= + ty: DeclarationId(2654), + }, + Field { + label: "ParseError".to_string(), + ty: DeclarationId(2655), + }, + Field { + label: "TypeMismatch".to_string(), + ty: DeclarationId(2656), + }, + Field { + label: "ArityMismatch".to_string(), + ty: DeclarationId(2657), + }, + Field { + label: "ResolveError".to_string(), + ty: DeclarationId(2658), + }, + Field { + label: "UnitMismatch".to_string(), + ty: DeclarationId(2659), + }, + Field { + label: "BranchConditionNotBool".to_string(), + ty: DeclarationId(2660), + }, + Field { + label: "MagnitudeOutOfRange".to_string(), + ty: DeclarationId(2661), + }, + Field { + label: "MalformedIntegerRangeFact".to_string(), + ty: DeclarationId(2662), + }, + Field { + label: "NominalOpacityViolation".to_string(), + ty: DeclarationId(2663), + }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -41393,11 +44717,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "AnyDetail".to_string(), +<<<<<<< HEAD ty: DeclarationId(2657), }, Field { label: "Contains".to_string(), ty: DeclarationId(2658), +======= + ty: DeclarationId(2664), + }, + Field { + label: "Contains".to_string(), + ty: DeclarationId(2665), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -41443,11 +44775,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Resolved".to_string(), +<<<<<<< HEAD ty: DeclarationId(2659), }, Field { label: "Unresolved".to_string(), ty: DeclarationId(2660), +======= + ty: DeclarationId(2666), + }, + Field { + label: "Unresolved".to_string(), + ty: DeclarationId(2667), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -41467,7 +44807,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Disj { variants: vec![Field { label: "AtMostBudget".to_string(), +<<<<<<< HEAD ty: DeclarationId(2661), +======= + ty: DeclarationId(2668), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -41487,11 +44831,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Associativity".to_string(), +<<<<<<< HEAD ty: DeclarationId(2662), }, Field { label: "Commutativity".to_string(), ty: DeclarationId(2663), +======= + ty: DeclarationId(2669), + }, + Field { + label: "Commutativity".to_string(), + ty: DeclarationId(2670), + }, + Field { + label: "Identity".to_string(), + ty: DeclarationId(2671), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Identity".to_string(), @@ -41534,7 +44890,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Disj { variants: vec![Field { label: "LiteralProgram".to_string(), +<<<<<<< HEAD ty: DeclarationId(2665), +======= + ty: DeclarationId(2672), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -41554,6 +44914,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Compiles".to_string(), +<<<<<<< HEAD ty: DeclarationId(2666), }, Field { @@ -41648,6 +45009,102 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { label: "BridgeLedgerZero".to_string(), ty: DeclarationId(2692), }, +======= + ty: DeclarationId(2673), + }, + Field { + label: "FailsWithDiagnostic".to_string(), + ty: DeclarationId(2674), + }, + Field { + label: "OutputEquals".to_string(), + ty: DeclarationId(2675), + }, + Field { + label: "PortHasState".to_string(), + ty: DeclarationId(2676), + }, + Field { + label: "DeclarationHasRefinement".to_string(), + ty: DeclarationId(2677), + }, + Field { + label: "CostBounded".to_string(), + ty: DeclarationId(2678), + }, + Field { + label: "BehavioralObservation".to_string(), + ty: DeclarationId(2679), + }, + Field { + label: "MockBackedInvariant".to_string(), + ty: DeclarationId(2680), + }, + Field { + label: "ExecuteCommand".to_string(), + ty: DeclarationId(2682), + }, + Field { + label: "ForAllTargets".to_string(), + ty: DeclarationId(2684), + }, + Field { + label: "LensOutputEquals".to_string(), + ty: DeclarationId(2685), + }, + Field { + label: "DifferentialEquals".to_string(), + ty: DeclarationId(2686), + }, + Field { + label: "SymbolicCostExprEquals".to_string(), + ty: DeclarationId(2687), + }, + Field { + label: "PerfWithinBaseline".to_string(), + ty: DeclarationId(2688), + }, + Field { + label: "BinaryDimensionReportEquals".to_string(), + ty: DeclarationId(2689), + }, + Field { + label: "AlgebraicLaw".to_string(), + ty: DeclarationId(2690), + }, + Field { + label: "CensusBoundCheck".to_string(), + ty: DeclarationId(2691), + }, + Field { + label: "CensusSubsetCount".to_string(), + ty: DeclarationId(2692), + }, + Field { + label: "FixedPointConverges".to_string(), + ty: DeclarationId(2693), + }, + Field { + label: "RatchetZero".to_string(), + ty: DeclarationId(2694), + }, + Field { + label: "GeneratedFromDag".to_string(), + ty: DeclarationId(2696), + }, + Field { + label: "ReleaseDeferredClaim".to_string(), + ty: DeclarationId(2697), + }, + Field { + label: "SubstrateResearchDeferredClaim".to_string(), + ty: DeclarationId(2698), + }, + Field { + label: "BridgeLedgerZero".to_string(), + ty: DeclarationId(2699), + }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -41716,7 +45173,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "requires".to_string(), +<<<<<<< HEAD ty: DeclarationId(2693), +======= + ty: DeclarationId(2700), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -41737,11 +45198,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ForAll".to_string(), +<<<<<<< HEAD ty: DeclarationId(2694), }, Field { label: "Exists".to_string(), ty: DeclarationId(2695), +======= + ty: DeclarationId(2701), + }, + Field { + label: "Exists".to_string(), + ty: DeclarationId(2702), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -41778,7 +45247,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "requires".to_string(), +<<<<<<< HEAD ty: DeclarationId(2696), +======= + ty: DeclarationId(2703), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -41799,11 +45272,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Enumerated".to_string(), +<<<<<<< HEAD ty: DeclarationId(2697), }, Field { label: "Quantified".to_string(), ty: DeclarationId(2698), +======= + ty: DeclarationId(2704), + }, + Field { + label: "Quantified".to_string(), + ty: DeclarationId(2705), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -41828,7 +45309,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "claims".to_string(), +<<<<<<< HEAD ty: DeclarationId(2699), +======= + ty: DeclarationId(2706), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -41853,7 +45338,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "resources".to_string(), +<<<<<<< HEAD ty: DeclarationId(2700), +======= + ty: DeclarationId(2707), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -41872,7 +45361,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("claim_obligation_resources".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1274)], +<<<<<<< HEAD output: DeclarationId(2644), +======= + output: DeclarationId(2651), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 19182, @@ -41915,8 +45408,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1282), name: Some("materialize_test_obligations".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(2645)], output: DeclarationId(2646), +======= + inputs: vec![DeclarationId(2652)], + output: DeclarationId(2653), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 19424, @@ -41937,8 +45435,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1283), name: Some("behavior_spine".to_string()), connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(828)], output: DeclarationId(2701), +======= + inputs: vec![DeclarationId(827)], + output: DeclarationId(2708), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(809))), }, type_params: vec![], @@ -42066,14 +45569,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "memory".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2199), +======= + constructor: DeclarationId(2206), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2202), +======= + constructor: DeclarationId(2209), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -42245,7 +45756,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2280), +======= + constructor: DeclarationId(2287), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Variant { constructor: DeclarationId(1878), payload: vec![ @@ -42304,7 +45819,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2281), +======= + constructor: DeclarationId(2288), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -42604,7 +46123,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "declaration".to_string(), ))], @@ -42708,7 +46231,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -42727,7 +46254,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "state".to_string(), ))], @@ -42748,7 +46279,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "produced_by".to_string(), ))], @@ -42812,7 +46347,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "file".to_string(), ))], @@ -42831,7 +46370,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "byte_start".to_string(), ))], @@ -42850,7 +46393,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "byte_end".to_string(), ))], @@ -43162,7 +46709,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -43181,7 +46732,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -43247,7 +46802,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -43266,7 +46825,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -43332,7 +46895,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -43351,7 +46918,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "algebra".to_string(), ))], @@ -43416,7 +46987,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "permitted_accessors".to_string(), ))], @@ -43479,7 +47054,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -43498,7 +47077,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -43562,7 +47145,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -43581,7 +47168,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -43645,7 +47236,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -43664,7 +47259,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "second".to_string(), ))], @@ -43683,7 +47282,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -43747,7 +47350,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "member_of".to_string(), ))], @@ -43766,7 +47373,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "slot_of".to_string(), ))], @@ -43829,7 +47440,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "node_id".to_string(), ))], @@ -43891,7 +47506,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "param".to_string(), ))], @@ -43953,7 +47572,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "transform".to_string(), ))], @@ -44016,7 +47639,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "members".to_string(), ))], @@ -44037,7 +47664,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "intra_cluster_calls".to_string(), ))], @@ -44265,7 +47896,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -44284,7 +47919,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -44305,7 +47944,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "connective".to_string(), ))], @@ -44326,7 +47969,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "type_params".to_string(), ))], @@ -44347,7 +47994,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "phantom_params".to_string(), ))], @@ -44368,7 +48019,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "meta_tag".to_string(), ))], @@ -44389,7 +48044,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "inhabits".to_string(), ))], @@ -44410,7 +48069,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "value_body".to_string(), ))], @@ -44431,7 +48094,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "nominal_opacity".to_string(), ))], @@ -44450,7 +48117,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -44762,7 +48433,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "binding_name".to_string(), ))], @@ -44783,7 +48458,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "payload_port".to_string(), ))], @@ -44847,7 +48526,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -44868,7 +48551,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -44887,7 +48574,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -44906,7 +48597,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -45011,7 +48706,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -45030,7 +48729,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -45051,7 +48754,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -45070,7 +48777,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -45134,7 +48845,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -45153,7 +48868,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "target".to_string(), ))], @@ -45172,7 +48891,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "inputs".to_string(), ))], @@ -45193,7 +48916,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -45212,7 +48939,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -45276,7 +49007,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -45295,7 +49030,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "input".to_string(), ))], @@ -45314,7 +49053,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "paths".to_string(), ))], @@ -45335,7 +49078,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -45354,7 +49101,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -45375,7 +49126,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -45439,7 +49194,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -45458,7 +49217,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "source".to_string(), ))], @@ -45477,7 +49240,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "init".to_string(), ))], @@ -45496,7 +49263,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -45515,7 +49286,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "bound".to_string(), ))], @@ -45536,7 +49311,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -45555,7 +49334,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -45619,7 +49402,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -45638,7 +49425,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -45659,7 +49450,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -45678,7 +49473,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "params".to_string(), ))], @@ -45697,7 +49496,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -45718,7 +49521,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -45825,7 +49632,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "declarations".to_string(), ))], @@ -45844,7 +49655,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "nodes".to_string(), ))], @@ -45863,7 +49678,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "ports".to_string(), ))], @@ -45884,7 +49703,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "clusters".to_string(), ))], @@ -45947,7 +49770,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "items".to_string(), ))], @@ -46051,7 +49878,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -46070,7 +49901,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -46091,7 +49926,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "refinement".to_string(), ))], @@ -46155,7 +49994,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -46174,7 +50017,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -46238,7 +50085,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -46257,7 +50108,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -46276,7 +50131,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -46422,7 +50281,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -46441,7 +50304,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -46460,7 +50327,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -46524,7 +50395,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "key".to_string(), ))], @@ -46545,7 +50420,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "key_span".to_string(), ))], @@ -46564,7 +50443,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -46583,7 +50466,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -46647,7 +50534,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -46666,7 +50557,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -46685,7 +50580,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -46749,7 +50648,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -46768,7 +50671,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -46787,7 +50694,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -47137,6 +51048,46 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "language".to_string(), FieldValue::Reference(DeclarationId(1408)), +<<<<<<< HEAD +======= + ), + ( + "target".to_string(), + FieldValue::Reference(DeclarationId(721)), + ), + ("op".to_string(), FieldValue::Reference(DeclarationId(359))), + ( + "carrier".to_string(), + FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())), + ), + ( + "cost".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/spec/go.dag", 23119, 23266), + }); + declarations.push(Declaration { + id: DeclarationId(1367), + name: Some("go_port_id_eq".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1013), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1013)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1408)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "target".to_string(), @@ -47158,8 +51109,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23119, 23266), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(1367), name: Some("go_port_id_eq".to_string()), +======= + id: DeclarationId(1368), + name: Some("go_declaration_id_eq".to_string()), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1013), arguments: vec![], @@ -47195,8 +51151,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23268, 23415), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(1368), name: Some("go_declaration_id_eq".to_string()), +======= + id: DeclarationId(1369), + name: Some("go_int_ne".to_string()), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1013), arguments: vec![], @@ -47211,6 +51172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "language".to_string(), FieldValue::Reference(DeclarationId(1408)), +<<<<<<< HEAD ), ( "target".to_string(), @@ -47248,6 +51210,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "language".to_string(), FieldValue::Reference(DeclarationId(1408)), +======= +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "target".to_string(), @@ -47285,6 +51249,46 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "language".to_string(), FieldValue::Reference(DeclarationId(1408)), +<<<<<<< HEAD +======= + ), + ( + "target".to_string(), + FieldValue::Reference(DeclarationId(721)), + ), + ("op".to_string(), FieldValue::Reference(DeclarationId(360))), + ( + "carrier".to_string(), + FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())), + ), + ( + "cost".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/spec/go.dag", 23722, 23869), + }); + declarations.push(Declaration { + id: DeclarationId(1371), + name: Some("go_port_id_ne".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1013), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1013)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1408)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "target".to_string(), @@ -47306,8 +51310,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23722, 23869), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(1371), name: Some("go_port_id_ne".to_string()), +======= + id: DeclarationId(1372), + name: Some("go_declaration_id_ne".to_string()), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1013), arguments: vec![], @@ -47343,8 +51352,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23871, 24018), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(1372), name: Some("go_declaration_id_ne".to_string()), +======= + id: DeclarationId(1373), + name: Some("go_int_lt".to_string()), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1013), arguments: vec![], @@ -47359,6 +51373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "language".to_string(), FieldValue::Reference(DeclarationId(1408)), +<<<<<<< HEAD ), ( "target".to_string(), @@ -47396,6 +51411,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "language".to_string(), FieldValue::Reference(DeclarationId(1408)), +======= +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "target".to_string(), @@ -47740,7 +51757,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2295), +======= + constructor: DeclarationId(2302), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -47780,6 +51801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2296), payload: vec![], }, @@ -47976,6 +51998,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { "strategy".to_string(), FieldValue::Variant { constructor: DeclarationId(2299), +======= + constructor: DeclarationId(2303), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -47989,7 +52014,204 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2293), + payload: vec![], + }, + ), + ])]), + ), + ( + "cost".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ], + }), + refinement: None, + nominal_opacity: None, +<<<<<<< HEAD +======= + span: SourceSpan::new("src/v3/spec/go.dag", 25626, 25818), + }); + declarations.push(Declaration { + id: DeclarationId(1384), + name: Some("go_cons_callable".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1015), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1015)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1408)), + ), + ( + "target".to_string(), + FieldValue::Reference(DeclarationId(689)), + ), + ( + "strategy".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2304), + payload: vec![], + }, + ), + ( + "parameters".to_string(), + FieldValue::List(vec![ + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("0".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2293), + payload: vec![], + }, + ), + ]), + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2293), + payload: vec![], + }, + ), + ]), + ]), + ), + ( + "cost".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/spec/go.dag", 25820, 26037), + }); + declarations.push(Declaration { + id: DeclarationId(1385), + name: Some("go_concat_callable".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1015), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1015)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1408)), + ), + ( + "target".to_string(), + FieldValue::Reference(DeclarationId(699)), + ), + ( + "strategy".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2305), + payload: vec![], + }, + ), + ( + "parameters".to_string(), + FieldValue::List(vec![ + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("0".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2293), + payload: vec![], + }, + ), + ]), + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2293), + payload: vec![], + }, + ), + ]), + ]), + ), + ( + "cost".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/spec/go.dag", 26039, 26262), + }); + declarations.push(Declaration { + id: DeclarationId(1386), + name: Some("go_length_callable".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1015), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1015)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1408)), + ), + ( + "target".to_string(), + FieldValue::Reference(DeclarationId(709)), + ), + ( + "strategy".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2306), + payload: vec![], + }, + ), + ( + "parameters".to_string(), + FieldValue::List(vec![FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("0".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2292), payload: vec![], }, ), @@ -48003,6 +52225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) span: SourceSpan::new("src/v3/spec/go.dag", 26264, 26447), }); declarations.push(Declaration { @@ -48140,7 +52363,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2300), +======= + constructor: DeclarationId(2307), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -48154,7 +52381,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2285), +======= + constructor: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -48190,12 +52421,99 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "target".to_string(), +<<<<<<< HEAD FieldValue::Reference(DeclarationId(694)), +======= + FieldValue::Reference(DeclarationId(693)), + ), + ( + "strategy".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2308), + payload: vec![], + }, + ), + ( + "parameters".to_string(), + FieldValue::List(vec![ + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("0".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2292), + payload: vec![], + }, + ), + ]), + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2293), + payload: vec![], + }, + ), + ]), + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("2".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2292), + payload: vec![], + }, + ), + ]), + ]), + ), + ( + "cost".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/spec/go.dag", 27758, 28015), + }); + declarations.push(Declaration { + id: DeclarationId(1392), + name: Some("go_map_callable".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1015), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1015)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1408)), + ), + ( + "target".to_string(), + FieldValue::Reference(DeclarationId(701)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2301), + constructor: DeclarationId(2309), payload: vec![], }, ), @@ -48210,7 +52528,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2285), +======= + constructor: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -48223,6 +52545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2286), payload: vec![], }, @@ -48237,6 +52560,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { "disposition".to_string(), FieldValue::Variant { constructor: DeclarationId(2285), +======= + constructor: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -48254,8 +52580,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 27758, 28015), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(1392), name: Some("go_map_callable".to_string()), +======= + id: DeclarationId(1393), + name: Some("go_filter_callable".to_string()), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1015), arguments: vec![], @@ -48278,7 +52609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2302), + constructor: DeclarationId(2310), payload: vec![], }, ), @@ -48293,7 +52624,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2285), +======= + constructor: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -48306,7 +52641,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2285), +======= + constructor: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -48324,8 +52663,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28017, 28231), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(1393), name: Some("go_filter_callable".to_string()), +======= + id: DeclarationId(1394), + name: Some("go_contains_callable".to_string()), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1015), arguments: vec![], @@ -48348,7 +52692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2303), + constructor: DeclarationId(2311), payload: vec![], }, ), @@ -48363,7 +52707,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2285), +======= + constructor: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -48376,6 +52724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2285), payload: vec![], }, @@ -48447,6 +52796,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { "disposition".to_string(), FieldValue::Variant { constructor: DeclarationId(2285), +======= + constructor: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -48488,7 +52840,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2306), +======= + constructor: DeclarationId(2313), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -49136,49 +53492,77 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "expression_wrapping".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2134), +======= + constructor: DeclarationId(2141), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2137), +======= + constructor: DeclarationId(2144), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2140), +======= + constructor: DeclarationId(2147), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2143), +======= + constructor: DeclarationId(2150), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2147), +======= + constructor: DeclarationId(2154), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2149), +======= + constructor: DeclarationId(2156), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2153), +======= + constructor: DeclarationId(2160), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -49210,7 +53594,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "output_policy".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2156), +======= + constructor: DeclarationId(2163), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -49814,14 +54202,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "memory".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2199), +======= + constructor: DeclarationId(2206), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2202), +======= + constructor: DeclarationId(2209), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -49950,7 +54346,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2280), +======= + constructor: DeclarationId(2287), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Variant { constructor: DeclarationId(1878), payload: vec![ @@ -50009,7 +54409,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2280), +======= + constructor: DeclarationId(2287), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Variant { constructor: DeclarationId(1879), payload: vec![], @@ -50722,7 +55126,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "items".to_string(), ))], @@ -50826,7 +55234,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -50845,7 +55257,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -50866,7 +55282,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "refinement".to_string(), ))], @@ -50930,7 +55350,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -50949,7 +55373,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -51013,7 +55441,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -51032,7 +55464,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -51051,7 +55487,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -51197,7 +55637,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -51216,7 +55660,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -51235,7 +55683,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -51299,7 +55751,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "key".to_string(), ))], @@ -51320,7 +55776,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "key_span".to_string(), ))], @@ -51339,7 +55799,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -51358,7 +55822,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -51422,7 +55890,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -51441,7 +55913,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -51460,7 +55936,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -51524,7 +56004,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -51543,7 +56027,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -51562,7 +56050,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -51912,6 +56404,46 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "language".to_string(), FieldValue::Reference(DeclarationId(1424)), +<<<<<<< HEAD +======= + ), + ( + "target".to_string(), + FieldValue::Reference(DeclarationId(721)), + ), + ("op".to_string(), FieldValue::Reference(DeclarationId(359))), + ( + "carrier".to_string(), + FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())), + ), + ( + "cost".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/spec/python.dag", 14546, 14701), + }); + declarations.push(Declaration { + id: DeclarationId(1467), + name: Some("python_port_id_eq".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1013), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1013)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1424)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "target".to_string(), @@ -51933,8 +56465,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14546, 14701), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(1467), name: Some("python_port_id_eq".to_string()), +======= + id: DeclarationId(1468), + name: Some("python_declaration_id_eq".to_string()), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1013), arguments: vec![], @@ -51970,8 +56507,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14703, 14858), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(1468), name: Some("python_declaration_id_eq".to_string()), +======= + id: DeclarationId(1469), + name: Some("python_int_ne".to_string()), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1013), arguments: vec![], @@ -51986,6 +56528,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "language".to_string(), FieldValue::Reference(DeclarationId(1424)), +<<<<<<< HEAD ), ( "target".to_string(), @@ -52023,6 +56566,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "language".to_string(), FieldValue::Reference(DeclarationId(1424)), +======= +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "target".to_string(), @@ -52290,7 +56835,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2295), +======= + constructor: DeclarationId(2302), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -52330,6 +56879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2296), payload: vec![], }, @@ -52526,6 +57076,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { "strategy".to_string(), FieldValue::Variant { constructor: DeclarationId(2299), +======= + constructor: DeclarationId(2303), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -52539,7 +57092,204 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2293), + payload: vec![], + }, + ), + ])]), + ), + ( + "cost".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ], + }), + refinement: None, + nominal_opacity: None, +<<<<<<< HEAD +======= + span: SourceSpan::new("src/v3/spec/python.dag", 16246, 16446), + }); + declarations.push(Declaration { + id: DeclarationId(1478), + name: Some("python_cons_callable".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1015), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1015)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1424)), + ), + ( + "target".to_string(), + FieldValue::Reference(DeclarationId(689)), + ), + ( + "strategy".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2304), + payload: vec![], + }, + ), + ( + "parameters".to_string(), + FieldValue::List(vec![ + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("0".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2293), + payload: vec![], + }, + ), + ]), + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2293), + payload: vec![], + }, + ), + ]), + ]), + ), + ( + "cost".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/spec/python.dag", 16448, 16673), + }); + declarations.push(Declaration { + id: DeclarationId(1479), + name: Some("python_concat_callable".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1015), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1015)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1424)), + ), + ( + "target".to_string(), + FieldValue::Reference(DeclarationId(699)), + ), + ( + "strategy".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2305), + payload: vec![], + }, + ), + ( + "parameters".to_string(), + FieldValue::List(vec![ + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("0".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2293), + payload: vec![], + }, + ), + ]), + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2293), + payload: vec![], + }, + ), + ]), + ]), + ), + ( + "cost".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/spec/python.dag", 16675, 16906), + }); + declarations.push(Declaration { + id: DeclarationId(1480), + name: Some("python_length_callable".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1015), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1015)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1424)), + ), + ( + "target".to_string(), + FieldValue::Reference(DeclarationId(709)), + ), + ( + "strategy".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2306), + payload: vec![], + }, + ), + ( + "parameters".to_string(), + FieldValue::List(vec![FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("0".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2292), payload: vec![], }, ), @@ -52553,6 +57303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) span: SourceSpan::new("src/v3/spec/python.dag", 16908, 17099), }); declarations.push(Declaration { @@ -52580,7 +57331,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2300), +======= + constructor: DeclarationId(2307), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -52594,7 +57349,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2285), +======= + constructor: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -52630,12 +57389,99 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "target".to_string(), +<<<<<<< HEAD FieldValue::Reference(DeclarationId(694)), +======= + FieldValue::Reference(DeclarationId(693)), + ), + ( + "strategy".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2308), + payload: vec![], + }, + ), + ( + "parameters".to_string(), + FieldValue::List(vec![ + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("0".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2292), + payload: vec![], + }, + ), + ]), + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2293), + payload: vec![], + }, + ), + ]), + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("2".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2292), + payload: vec![], + }, + ), + ]), + ]), + ), + ( + "cost".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/spec/python.dag", 17299, 17564), + }); + declarations.push(Declaration { + id: DeclarationId(1483), + name: Some("python_map_callable".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1015), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1015)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1424)), + ), + ( + "target".to_string(), + FieldValue::Reference(DeclarationId(701)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2301), + constructor: DeclarationId(2309), payload: vec![], }, ), @@ -52650,7 +57496,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2285), +======= + constructor: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -52663,6 +57513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2286), payload: vec![], }, @@ -52677,6 +57528,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { "disposition".to_string(), FieldValue::Variant { constructor: DeclarationId(2285), +======= + constructor: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -52694,8 +57548,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 17299, 17564), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(1483), name: Some("python_map_callable".to_string()), +======= + id: DeclarationId(1484), + name: Some("python_filter_callable".to_string()), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1015), arguments: vec![], @@ -52718,7 +57577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2302), + constructor: DeclarationId(2310), payload: vec![], }, ), @@ -52733,7 +57592,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2285), +======= + constructor: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -52746,7 +57609,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2285), +======= + constructor: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -52764,8 +57631,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 17566, 17788), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(1484), name: Some("python_filter_callable".to_string()), +======= + id: DeclarationId(1485), + name: Some("python_contains_callable".to_string()), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1015), arguments: vec![], @@ -52788,7 +57660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2303), + constructor: DeclarationId(2311), payload: vec![], }, ), @@ -52803,7 +57675,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2285), +======= + constructor: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -52816,6 +57692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2285), payload: vec![], }, @@ -52887,6 +57764,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { "disposition".to_string(), FieldValue::Variant { constructor: DeclarationId(2285), +======= + constructor: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -53041,7 +57921,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2306), +======= + constructor: DeclarationId(2313), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -53136,49 +58020,77 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "expression_wrapping".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2134), +======= + constructor: DeclarationId(2141), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2139), +======= + constructor: DeclarationId(2146), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2140), +======= + constructor: DeclarationId(2147), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2143), +======= + constructor: DeclarationId(2150), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2147), +======= + constructor: DeclarationId(2154), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2148), +======= + constructor: DeclarationId(2155), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2153), +======= + constructor: DeclarationId(2160), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -53213,7 +58125,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "output_policy".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2155), +======= + constructor: DeclarationId(2162), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -53270,14 +58186,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "memory".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2201), +======= + constructor: DeclarationId(2208), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2202), +======= + constructor: DeclarationId(2209), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -53695,7 +58619,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2280), +======= + constructor: DeclarationId(2287), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Variant { constructor: DeclarationId(1878), payload: vec![ @@ -53752,7 +58680,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2280), +======= + constructor: DeclarationId(2287), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Variant { constructor: DeclarationId(1878), payload: vec![ @@ -53811,7 +58743,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2279), +======= + constructor: DeclarationId(2286), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -53854,7 +58790,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2279), +======= + constructor: DeclarationId(2286), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -53897,7 +58837,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2279), +======= + constructor: DeclarationId(2286), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -53940,7 +58884,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2279), +======= + constructor: DeclarationId(2286), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -53983,7 +58931,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2281), +======= + constructor: DeclarationId(2288), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -54026,7 +58978,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2281), +======= + constructor: DeclarationId(2288), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -54326,7 +59282,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "declaration".to_string(), ))], @@ -54430,7 +59390,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -54449,7 +59413,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "state_value".to_string(), ))], @@ -54470,7 +59438,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "produced_by".to_string(), ))], @@ -54534,7 +59506,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "file".to_string(), ))], @@ -54553,7 +59529,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "byte_start".to_string(), ))], @@ -54572,7 +59552,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "byte_end".to_string(), ))], @@ -54884,7 +59868,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -54903,7 +59891,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -54969,7 +59961,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -54988,7 +59984,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -55054,7 +60054,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -55073,7 +60077,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "algebra".to_string(), ))], @@ -55138,7 +60146,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "permitted_accessors".to_string(), ))], @@ -55203,7 +60215,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "0".to_string(), ))], @@ -55222,7 +60238,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "1".to_string(), ))], @@ -55286,7 +60306,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -55305,7 +60329,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -55369,7 +60397,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -55388,7 +60420,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "second".to_string(), ))], @@ -55407,7 +60443,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -55470,7 +60510,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "index_of".to_string(), ))], @@ -55533,7 +60577,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "member_of".to_string(), ))], @@ -55552,7 +60600,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "slot_of".to_string(), ))], @@ -55615,7 +60667,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "node_id".to_string(), ))], @@ -55677,7 +60733,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "param".to_string(), ))], @@ -55739,7 +60799,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "transform".to_string(), ))], @@ -55802,7 +60866,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "members".to_string(), ))], @@ -55823,7 +60891,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "intra_cluster_calls".to_string(), ))], @@ -56051,7 +61123,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -56070,7 +61146,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -56091,7 +61171,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "connective".to_string(), ))], @@ -56112,7 +61196,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "type_params".to_string(), ))], @@ -56133,7 +61221,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "phantom_params".to_string(), ))], @@ -56154,7 +61246,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "meta_tag".to_string(), ))], @@ -56175,7 +61271,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "inhabits".to_string(), ))], @@ -56196,7 +61296,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "value_body".to_string(), ))], @@ -56217,7 +61321,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "nominal_opacity".to_string(), ))], @@ -56236,7 +61344,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -56548,7 +61660,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "binding_name".to_string(), ))], @@ -56569,7 +61685,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "payload_port".to_string(), ))], @@ -56633,7 +61753,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -56654,7 +61778,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -56673,7 +61801,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -56692,7 +61824,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -56797,7 +61933,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -56816,7 +61956,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "data".to_string(), ))], @@ -56837,7 +61981,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -56856,7 +62004,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -56877,7 +62029,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "lane2_workflow".to_string(), ))], @@ -56941,7 +62097,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -56960,7 +62120,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "target".to_string(), ))], @@ -56979,7 +62143,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "inputs".to_string(), ))], @@ -57000,7 +62168,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -57019,7 +62191,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -57083,7 +62259,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -57102,7 +62282,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "input".to_string(), ))], @@ -57121,7 +62305,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "paths".to_string(), ))], @@ -57142,7 +62330,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -57161,7 +62353,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -57182,7 +62378,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -57246,7 +62446,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -57265,7 +62469,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "source".to_string(), ))], @@ -57284,7 +62492,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "init".to_string(), ))], @@ -57303,7 +62515,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -57322,7 +62538,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "bound".to_string(), ))], @@ -57343,7 +62563,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -57362,7 +62586,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -57426,7 +62654,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -57445,7 +62677,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -57466,7 +62702,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -57485,7 +62725,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "params".to_string(), ))], @@ -57504,7 +62748,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -57525,7 +62773,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "lane2_workflow".to_string(), ))], @@ -57546,7 +62798,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -57653,7 +62909,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "declarations".to_string(), ))], @@ -57672,7 +62932,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "nodes".to_string(), ))], @@ -57691,7 +62955,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "ports".to_string(), ))], @@ -57712,7 +62980,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2283), +======= + constructor: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "clusters".to_string(), ))], @@ -57777,7 +63049,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "items".to_string(), ))], @@ -57885,7 +63161,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -57904,7 +63184,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -57925,7 +63209,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "refinement".to_string(), ))], @@ -57991,7 +63279,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -58010,7 +63302,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -58076,7 +63372,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -58095,7 +63395,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -58114,7 +63418,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -58266,7 +63574,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -58285,7 +63597,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -58304,7 +63620,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -58370,7 +63690,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "key".to_string(), ))], @@ -58391,7 +63715,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "key_span".to_string(), ))], @@ -58410,7 +63738,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -58429,7 +63761,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -58495,7 +63831,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -58514,7 +63854,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -58533,7 +63877,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -58599,7 +63947,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -58618,7 +63970,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -58637,7 +63993,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2282), +======= + constructor: DeclarationId(2289), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -58993,6 +64353,46 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "language".to_string(), FieldValue::Reference(DeclarationId(1637)), +<<<<<<< HEAD +======= + ), + ( + "target".to_string(), + FieldValue::Reference(DeclarationId(721)), + ), + ("op".to_string(), FieldValue::Reference(DeclarationId(359))), + ( + "carrier".to_string(), + FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())), + ), + ( + "cost".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/spec/rust.dag", 32140, 32291), + }); + declarations.push(Declaration { + id: DeclarationId(1583), + name: Some("rust_port_id_eq".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1013), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1013)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1637)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "target".to_string(), @@ -59014,8 +64414,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 32140, 32291), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(1583), name: Some("rust_port_id_eq".to_string()), +======= + id: DeclarationId(1584), + name: Some("rust_declaration_id_eq".to_string()), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1013), arguments: vec![], @@ -59051,8 +64456,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 32293, 32444), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(1584), name: Some("rust_declaration_id_eq".to_string()), +======= + id: DeclarationId(1585), + name: Some("rust_string_eq".to_string()), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1013), arguments: vec![], @@ -59067,6 +64477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "language".to_string(), FieldValue::Reference(DeclarationId(1637)), +<<<<<<< HEAD ), ( "target".to_string(), @@ -59104,6 +64515,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "language".to_string(), FieldValue::Reference(DeclarationId(1637)), +======= +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "target".to_string(), @@ -59178,6 +64591,46 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "language".to_string(), FieldValue::Reference(DeclarationId(1637)), +<<<<<<< HEAD +======= + ), + ( + "target".to_string(), + FieldValue::Reference(DeclarationId(721)), + ), + ("op".to_string(), FieldValue::Reference(DeclarationId(360))), + ( + "carrier".to_string(), + FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())), + ), + ( + "cost".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/spec/rust.dag", 33102, 33253), + }); + declarations.push(Declaration { + id: DeclarationId(1588), + name: Some("rust_port_id_ne".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1013), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1013)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1637)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "target".to_string(), @@ -59199,8 +64652,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 33102, 33253), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(1588), name: Some("rust_port_id_ne".to_string()), +======= + id: DeclarationId(1589), + name: Some("rust_declaration_id_ne".to_string()), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1013), arguments: vec![], @@ -59236,8 +64694,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 33255, 33406), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(1589), name: Some("rust_declaration_id_ne".to_string()), +======= + id: DeclarationId(1590), + name: Some("rust_int_lt".to_string()), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1013), arguments: vec![], @@ -59252,6 +64715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "language".to_string(), FieldValue::Reference(DeclarationId(1637)), +<<<<<<< HEAD ), ( "target".to_string(), @@ -59289,6 +64753,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "language".to_string(), FieldValue::Reference(DeclarationId(1637)), +======= +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "target".to_string(), @@ -59634,7 +65100,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2295), +======= + constructor: DeclarationId(2302), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -59674,6 +65144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2296), payload: vec![], }, @@ -59870,6 +65341,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { "strategy".to_string(), FieldValue::Variant { constructor: DeclarationId(2299), +======= + constructor: DeclarationId(2303), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -59883,7 +65357,204 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2293), + payload: vec![], + }, + ), + ])]), + ), + ( + "cost".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ], + }), + refinement: None, + nominal_opacity: None, +<<<<<<< HEAD +======= + span: SourceSpan::new("src/v3/spec/rust.dag", 37196, 37392), + }); + declarations.push(Declaration { + id: DeclarationId(1601), + name: Some("rust_cons_callable".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1015), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1015)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1637)), + ), + ( + "target".to_string(), + FieldValue::Reference(DeclarationId(689)), + ), + ( + "strategy".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2304), + payload: vec![], + }, + ), + ( + "parameters".to_string(), + FieldValue::List(vec![ + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("0".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2293), + payload: vec![], + }, + ), + ]), + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2293), + payload: vec![], + }, + ), + ]), + ]), + ), + ( + "cost".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/spec/rust.dag", 37394, 37615), + }); + declarations.push(Declaration { + id: DeclarationId(1602), + name: Some("rust_concat_callable".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1015), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1015)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1637)), + ), + ( + "target".to_string(), + FieldValue::Reference(DeclarationId(699)), + ), + ( + "strategy".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2305), + payload: vec![], + }, + ), + ( + "parameters".to_string(), + FieldValue::List(vec![ + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("0".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2293), + payload: vec![], + }, + ), + ]), + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2293), + payload: vec![], + }, + ), + ]), + ]), + ), + ( + "cost".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/spec/rust.dag", 37617, 37844), + }); + declarations.push(Declaration { + id: DeclarationId(1603), + name: Some("rust_length_callable".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1015), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1015)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1637)), + ), + ( + "target".to_string(), + FieldValue::Reference(DeclarationId(709)), + ), + ( + "strategy".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2306), + payload: vec![], + }, + ), + ( + "parameters".to_string(), + FieldValue::List(vec![FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("0".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2292), payload: vec![], }, ), @@ -59897,6 +65568,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) span: SourceSpan::new("src/v3/spec/rust.dag", 37846, 38033), }); declarations.push(Declaration { @@ -60256,7 +65928,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2300), +======= + constructor: DeclarationId(2307), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -60270,7 +65946,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2285), +======= + constructor: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -60306,12 +65986,99 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "target".to_string(), +<<<<<<< HEAD FieldValue::Reference(DeclarationId(694)), +======= + FieldValue::Reference(DeclarationId(693)), + ), + ( + "strategy".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2308), + payload: vec![], + }, + ), + ( + "parameters".to_string(), + FieldValue::List(vec![ + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("0".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2292), + payload: vec![], + }, + ), + ]), + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2293), + payload: vec![], + }, + ), + ]), + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("2".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2292), + payload: vec![], + }, + ), + ]), + ]), + ), + ( + "cost".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/spec/rust.dag", 39951, 40212), + }); + declarations.push(Declaration { + id: DeclarationId(1615), + name: Some("rust_map_callable".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1015), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1015)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1637)), + ), + ( + "target".to_string(), + FieldValue::Reference(DeclarationId(701)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2301), + constructor: DeclarationId(2309), payload: vec![], }, ), @@ -60326,7 +66093,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2285), +======= + constructor: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -60339,6 +66110,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2286), payload: vec![], }, @@ -60353,6 +66125,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { "disposition".to_string(), FieldValue::Variant { constructor: DeclarationId(2285), +======= + constructor: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -60370,8 +66145,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 39951, 40212), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(1615), name: Some("rust_map_callable".to_string()), +======= + id: DeclarationId(1616), + name: Some("rust_filter_callable".to_string()), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1015), arguments: vec![], @@ -60394,7 +66174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2302), + constructor: DeclarationId(2310), payload: vec![], }, ), @@ -60409,7 +66189,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2285), +======= + constructor: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -60422,7 +66206,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2285), +======= + constructor: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -60440,8 +66228,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 40214, 40432), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(1616), name: Some("rust_filter_callable".to_string()), +======= + id: DeclarationId(1617), + name: Some("rust_contains_callable".to_string()), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1015), arguments: vec![], @@ -60464,7 +66257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2303), + constructor: DeclarationId(2311), payload: vec![], }, ), @@ -60479,7 +66272,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2285), +======= + constructor: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -60492,6 +66289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2285), payload: vec![], }, @@ -60563,6 +66361,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { "disposition".to_string(), FieldValue::Variant { constructor: DeclarationId(2285), +======= + constructor: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -60604,7 +66405,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2306), +======= + constructor: DeclarationId(2313), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -61048,7 +66853,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{ let mut __left = {left}; __left.extend({right}); __left }" .to_string(), @@ -61062,7 +66871,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -61102,7 +66915,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "({recv}).len() as i64".to_string(), ))], @@ -61115,7 +66932,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -61153,7 +66974,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "({recv}).is_empty()".to_string(), ))], @@ -61166,7 +66991,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -61206,7 +67035,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "({recv}).iter().fold({init}, {body})".to_string(), ))], @@ -61219,7 +67052,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -61259,7 +67096,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2313), +======= + constructor: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "({recv}).iter().map({body}).collect::>()".to_string(), ))], @@ -61272,7 +67113,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2312), +======= + constructor: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -61344,14 +67189,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "read".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2307), +======= + constructor: DeclarationId(2314), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "construct".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2309), +======= + constructor: DeclarationId(2316), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -61482,49 +67335,77 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "expression_wrapping".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2134), +======= + constructor: DeclarationId(2141), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2137), +======= + constructor: DeclarationId(2144), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2141), +======= + constructor: DeclarationId(2148), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2143), +======= + constructor: DeclarationId(2150), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2146), +======= + constructor: DeclarationId(2153), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2149), +======= + constructor: DeclarationId(2156), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2152), +======= + constructor: DeclarationId(2159), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -61562,7 +67443,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "output_policy".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2155), +======= + constructor: DeclarationId(2162), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -61683,14 +67568,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), +<<<<<<< HEAD meta_tag: Some(DeclarationId(830)), +======= + meta_tag: Some(DeclarationId(829)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "accessor".to_string(), - FieldValue::Reference(DeclarationId(831)), + FieldValue::Reference(DeclarationId(830)), ), ( "realization".to_string(), @@ -61709,6 +67597,44 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { declarations.push(Declaration { id: DeclarationId(1645), name: Some("node_binding_rust".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(829), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(829)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "accessor".to_string(), + FieldValue::Reference(DeclarationId(831)), + ), + ( + "realization".to_string(), + FieldValue::Reference(DeclarationId(1642)), + ), + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1637)), + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/spec/rust.dag", 50536, 50667), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(1645), + name: Some("node_binding_rust".to_string()), +======= + id: DeclarationId(1646), + name: Some("resolve_producer_binding_rust".to_string()), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(830), arguments: vec![], @@ -61726,11 +67652,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1642)), + FieldValue::Reference(DeclarationId(1643)), ), ( "language".to_string(), FieldValue::Reference(DeclarationId(1637)), +<<<<<<< HEAD ), ], }), @@ -61763,6 +67690,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "language".to_string(), FieldValue::Reference(DeclarationId(1637)), +======= +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ], }), @@ -62117,11 +68046,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "SnapshotSurface".to_string(), +<<<<<<< HEAD ty: DeclarationId(2702), }, Field { label: "SnapshotDag".to_string(), ty: DeclarationId(2703), +======= + ty: DeclarationId(2709), + }, + Field { + label: "SnapshotDag".to_string(), + ty: DeclarationId(2710), + }, + Field { + label: "SnapshotText".to_string(), + ty: DeclarationId(2711), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "SnapshotText".to_string(), @@ -62341,7 +68282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2702), + constructor: DeclarationId(2709), payload: vec![], }, ), @@ -62376,7 +68317,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "snapshot".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2703), +======= + constructor: DeclarationId(2710), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -62411,7 +68356,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "snapshot".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2703), +======= + constructor: DeclarationId(2710), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -62442,11 +68391,84 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "realization".to_string(), FieldValue::Reference(DeclarationId(1664)), +<<<<<<< HEAD +======= ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2703), + constructor: DeclarationId(2710), + payload: vec![], + }, + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1636, 1796), + }); + declarations.push(Declaration { + id: DeclarationId(1671), + name: Some("lens_complexity_stage_binding".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1660), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1660)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "stage".to_string(), + FieldValue::Reference(DeclarationId(1677)), + ), + ( + "realization".to_string(), + FieldValue::Reference(DeclarationId(1666)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ), + ( + "snapshot".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2710), + payload: vec![], + }, + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1798, 1952), + }); + declarations.push(Declaration { + id: DeclarationId(1672), + name: Some("emit_stage_binding".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1660), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1660)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "stage".to_string(), + FieldValue::Reference(DeclarationId(1678)), + ), + ( + "realization".to_string(), + FieldValue::Reference(DeclarationId(1665)), + ), + ( + "snapshot".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2711), payload: vec![], }, ), @@ -62492,6 +68514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1798, 1952), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(1672), name: Some("emit_stage_binding".to_string()), connective: TypeConnective::Instantiation { @@ -62527,11 +68550,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1954, 2076), }); declarations.push(Declaration { +======= +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) id: DeclarationId(1673), name: Some("parse".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230), DeclarationId(230)], +<<<<<<< HEAD output: DeclarationId(828), +======= + output: DeclarationId(827), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::ExternalRealization(DeclarationId(1661)), }, type_params: vec![], @@ -62547,6 +68576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { declarations.push(Declaration { id: DeclarationId(1674), name: Some("lower".to_string()), +<<<<<<< HEAD connective: TypeConnective::Arrow { inputs: vec![DeclarationId(828)], output: DeclarationId(828), @@ -62565,6 +68595,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { declarations.push(Declaration { id: DeclarationId(1675), name: Some("infer".to_string()), +======= +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Arrow { inputs: vec![DeclarationId(828)], output: DeclarationId(828), @@ -62578,11 +68610,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2186, 2228), + span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2142, 2184), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(1676), name: Some("compute_ownership".to_string()), +======= + id: DeclarationId(1675), + name: Some("infer".to_string()), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Arrow { inputs: vec![DeclarationId(828)], output: DeclarationId(828), @@ -62596,14 +68633,40 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2230, 2288), + span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2186, 2228), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(1677), name: Some("lens_complexity".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(828)], output: DeclarationId(828), +======= + id: DeclarationId(1676), + name: Some("compute_ownership".to_string()), + connective: TypeConnective::Arrow { + inputs: vec![DeclarationId(827)], + output: DeclarationId(827), + body: ArrowBody::ExternalRealization(DeclarationId(1664)), + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2230, 2288), + }); + declarations.push(Declaration { + id: DeclarationId(1677), + name: Some("lens_complexity".to_string()), + connective: TypeConnective::Arrow { + inputs: vec![DeclarationId(827)], + output: DeclarationId(827), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::ExternalRealization(DeclarationId(1666)), }, type_params: vec![], @@ -62621,9 +68684,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("emit".to_string()), connective: TypeConnective::Arrow { inputs: vec![ +<<<<<<< HEAD DeclarationId(828), DeclarationId(828), DeclarationId(828), +======= + DeclarationId(827), + DeclarationId(827), + DeclarationId(827), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) DeclarationId(1043), ], output: DeclarationId(230), @@ -62666,7 +68735,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("from_symbol".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], +<<<<<<< HEAD output: DeclarationId(2705), +======= + output: DeclarationId(2712), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/compiler/operators.dag", 156, @@ -63121,11 +69194,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "OrderedRingAlgebra".to_string(), +<<<<<<< HEAD ty: DeclarationId(2706), }, Field { label: "SemiringAlgebra".to_string(), ty: DeclarationId(2707), +======= + ty: DeclarationId(2713), + }, + Field { + label: "SemiringAlgebra".to_string(), + ty: DeclarationId(2714), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -63146,11 +69227,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ApproximateFieldAlgebra".to_string(), +<<<<<<< HEAD ty: DeclarationId(2708), }, Field { label: "BooleanAlgebraAlgebra".to_string(), ty: DeclarationId(2709), +======= + ty: DeclarationId(2715), + }, + Field { + label: "BooleanAlgebraAlgebra".to_string(), + ty: DeclarationId(2716), + }, + Field { + label: "TerminalAlgebra".to_string(), + ty: DeclarationId(2717), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "TerminalAlgebra".to_string(), @@ -63175,6 +69268,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "BitCarrier".to_string(), +<<<<<<< HEAD ty: DeclarationId(2711), }, Field { @@ -63196,6 +69290,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "Word128Carrier".to_string(), ty: DeclarationId(2716), +======= + ty: DeclarationId(2718), + }, + Field { + label: "ByteCarrier".to_string(), + ty: DeclarationId(2719), + }, + Field { + label: "Word16Carrier".to_string(), + ty: DeclarationId(2720), + }, + Field { + label: "Word32Carrier".to_string(), + ty: DeclarationId(2721), + }, + Field { + label: "Word64Carrier".to_string(), + ty: DeclarationId(2722), + }, + Field { + label: "Word128Carrier".to_string(), + ty: DeclarationId(2723), + }, + Field { + label: "TerminalCarrier".to_string(), + ty: DeclarationId(2724), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "TerminalCarrier".to_string(), @@ -63220,11 +69341,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "TwoComplementWrap".to_string(), +<<<<<<< HEAD ty: DeclarationId(2718), }, Field { label: "Saturating".to_string(), ty: DeclarationId(2719), +======= + ty: DeclarationId(2725), + }, + Field { + label: "Saturating".to_string(), + ty: DeclarationId(2726), + }, + Field { + label: "Trap".to_string(), + ty: DeclarationId(2727), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Trap".to_string(), @@ -63249,11 +69382,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IntegerPrimitive".to_string(), +<<<<<<< HEAD ty: DeclarationId(2721), }, Field { label: "NonIntegerPrimitive".to_string(), ty: DeclarationId(2722), +======= + ty: DeclarationId(2728), + }, + Field { + label: "NonIntegerPrimitive".to_string(), + ty: DeclarationId(2729), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -63273,68 +69414,129 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1698), }], }, type_params: vec![], phantom_params: Vec::new(), +<<<<<<< HEAD meta_tag: Some(DeclarationId(2723)), +======= + meta_tag: Some(DeclarationId(2730)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2721), payload: vec![ FieldValue::Literal(LiteralBits::String("i8".to_string())), FieldValue::Variant { constructor: DeclarationId(2706), +======= + constructor: DeclarationId(2728), + payload: vec![ + FieldValue::Literal(LiteralBits::String("i8".to_string())), + FieldValue::Variant { + constructor: DeclarationId(2713), + payload: vec![], + }, + FieldValue::Variant { + constructor: DeclarationId(2719), + payload: vec![], + }, + FieldValue::Literal(LiteralBits::String("-128".to_string())), + FieldValue::Literal(LiteralBits::String("127".to_string())), + FieldValue::Literal(LiteralBits::Bool(true)), + FieldValue::Variant { + constructor: DeclarationId(2725), + payload: vec![], + }, + ], + }, + FieldValue::Variant { + constructor: DeclarationId(2728), + payload: vec![ + FieldValue::Literal(LiteralBits::String("i16".to_string())), + FieldValue::Variant { + constructor: DeclarationId(2713), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2712), + constructor: DeclarationId(2720), payload: vec![], }, FieldValue::Literal(LiteralBits::String("-128".to_string())), FieldValue::Literal(LiteralBits::String("127".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2718), +======= + constructor: DeclarationId(2725), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2721), +======= + constructor: DeclarationId(2728), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![ FieldValue::Literal(LiteralBits::String("i16".to_string())), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2706), +======= + constructor: DeclarationId(2713), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2713), + constructor: DeclarationId(2721), payload: vec![], }, FieldValue::Literal(LiteralBits::String("-32768".to_string())), FieldValue::Literal(LiteralBits::String("32767".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2718), +======= + constructor: DeclarationId(2725), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2721), +======= + constructor: DeclarationId(2728), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![ FieldValue::Literal(LiteralBits::String("i32".to_string())), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2706), +======= + constructor: DeclarationId(2713), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2714), + constructor: DeclarationId(2722), payload: vec![], }, FieldValue::Literal(LiteralBits::String("-2147483648".to_string())), @@ -63364,12 +69566,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2718), +======= + constructor: DeclarationId(2725), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2721), payload: vec![ FieldValue::Literal(LiteralBits::String("i128".to_string())), @@ -63379,6 +69586,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, FieldValue::Variant { constructor: DeclarationId(2716), +======= + constructor: DeclarationId(2728), + payload: vec![ + FieldValue::Literal(LiteralBits::String("i128".to_string())), + FieldValue::Variant { + constructor: DeclarationId(2713), + payload: vec![], + }, + FieldValue::Variant { + constructor: DeclarationId(2723), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, FieldValue::Literal(LiteralBits::String( @@ -63389,84 +69607,153 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { )), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2718), +======= + constructor: DeclarationId(2725), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2721), payload: vec![ FieldValue::Literal(LiteralBits::String("u8".to_string())), FieldValue::Variant { constructor: DeclarationId(2707), +======= + constructor: DeclarationId(2728), + payload: vec![ + FieldValue::Literal(LiteralBits::String("u8".to_string())), + FieldValue::Variant { + constructor: DeclarationId(2714), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2712), + constructor: DeclarationId(2719), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), FieldValue::Literal(LiteralBits::String("255".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { + constructor: DeclarationId(2725), + payload: vec![], + }, + ], + }, + FieldValue::Variant { + constructor: DeclarationId(2728), + payload: vec![ + FieldValue::Literal(LiteralBits::String("u16".to_string())), + FieldValue::Variant { + constructor: DeclarationId(2714), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + payload: vec![], + }, + FieldValue::Variant { + constructor: DeclarationId(2720), + payload: vec![], + }, + FieldValue::Literal(LiteralBits::String("0".to_string())), + FieldValue::Literal(LiteralBits::String("255".to_string())), + FieldValue::Literal(LiteralBits::Bool(true)), + FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2718), +======= + constructor: DeclarationId(2725), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2721), +======= + constructor: DeclarationId(2728), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![ FieldValue::Literal(LiteralBits::String("u16".to_string())), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2707), +======= + constructor: DeclarationId(2714), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2713), + constructor: DeclarationId(2721), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), FieldValue::Literal(LiteralBits::String("65535".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2718), +======= + constructor: DeclarationId(2725), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2721), +======= + constructor: DeclarationId(2728), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![ FieldValue::Literal(LiteralBits::String("u32".to_string())), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2707), +======= + constructor: DeclarationId(2714), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2714), + constructor: DeclarationId(2722), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), FieldValue::Literal(LiteralBits::String("4294967295".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2718), +======= + constructor: DeclarationId(2725), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2721), +======= + constructor: DeclarationId(2728), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![ FieldValue::Literal(LiteralBits::String("u64".to_string())), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2707), +======= + constructor: DeclarationId(2714), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2715), + constructor: DeclarationId(2723), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), @@ -63498,50 +69785,90 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { )), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2718), +======= + constructor: DeclarationId(2725), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2722), payload: vec![ FieldValue::Literal(LiteralBits::String("f32".to_string())), FieldValue::Variant { constructor: DeclarationId(2708), +======= + constructor: DeclarationId(2729), + payload: vec![ + FieldValue::Literal(LiteralBits::String("f32".to_string())), + FieldValue::Variant { + constructor: DeclarationId(2715), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2714), + constructor: DeclarationId(2721), payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), ], }, FieldValue::Variant { + constructor: DeclarationId(2729), + payload: vec![ + FieldValue::Literal(LiteralBits::String("f64".to_string())), + FieldValue::Variant { + constructor: DeclarationId(2715), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + payload: vec![], + }, + FieldValue::Variant { + constructor: DeclarationId(2722), + payload: vec![], + }, + FieldValue::Literal(LiteralBits::Bool(true)), + ], + }, + FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2722), +======= + constructor: DeclarationId(2729), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![ FieldValue::Literal(LiteralBits::String("f64".to_string())), FieldValue::Variant { - constructor: DeclarationId(2708), + constructor: DeclarationId(2716), payload: vec![], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2715), +======= + constructor: DeclarationId(2718), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), ], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2722), +======= + constructor: DeclarationId(2729), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![ FieldValue::Literal(LiteralBits::String("bool".to_string())), FieldValue::Variant { - constructor: DeclarationId(2709), + constructor: DeclarationId(2717), payload: vec![], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2711), payload: vec![], }, @@ -63558,6 +69885,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, FieldValue::Variant { constructor: DeclarationId(2717), +======= + constructor: DeclarationId(2724), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), @@ -63575,6 +69905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Wildcard".to_string(), +<<<<<<< HEAD ty: DeclarationId(2724), }, Field { @@ -63588,6 +69919,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "Ranged".to_string(), ty: DeclarationId(2728), +======= + ty: DeclarationId(2731), + }, + Field { + label: "Exact".to_string(), + ty: DeclarationId(2732), + }, + Field { + label: "Listed".to_string(), + ty: DeclarationId(2734), + }, + Field { + label: "Ranged".to_string(), + ty: DeclarationId(2735), + }, + Field { + label: "Step".to_string(), + ty: DeclarationId(2736), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Step".to_string(), @@ -63743,11 +70093,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "User".to_string(), +<<<<<<< HEAD ty: DeclarationId(2730), }, Field { label: "Bot".to_string(), ty: DeclarationId(2731), +======= + ty: DeclarationId(2737), + }, + Field { + label: "Bot".to_string(), + ty: DeclarationId(2738), + }, + Field { + label: "Organization".to_string(), + ty: DeclarationId(2739), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Organization".to_string(), @@ -63842,11 +70204,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "scopes".to_string(), +<<<<<<< HEAD ty: DeclarationId(2733), }, Field { label: "expires_at".to_string(), ty: DeclarationId(2734), +======= + ty: DeclarationId(2740), + }, + Field { + label: "expires_at".to_string(), + ty: DeclarationId(2741), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -63867,6 +70237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ScopeRepo".to_string(), +<<<<<<< HEAD ty: DeclarationId(2735), }, Field { @@ -63880,6 +70251,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "ScopeReadOrg".to_string(), ty: DeclarationId(2738), +======= + ty: DeclarationId(2742), + }, + Field { + label: "ScopeGist".to_string(), + ty: DeclarationId(2743), + }, + Field { + label: "ScopeWorkflow".to_string(), + ty: DeclarationId(2744), + }, + Field { + label: "ScopeReadOrg".to_string(), + ty: DeclarationId(2745), + }, + Field { + label: "ScopeReadUser".to_string(), + ty: DeclarationId(2746), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ScopeReadUser".to_string(), @@ -63908,7 +70298,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "cursor".to_string(), +<<<<<<< HEAD ty: DeclarationId(2740), +======= + ty: DeclarationId(2747), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "has_next".to_string(), @@ -63933,11 +70327,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "PermRead".to_string(), +<<<<<<< HEAD ty: DeclarationId(2741), }, Field { label: "PermWrite".to_string(), ty: DeclarationId(2742), +======= + ty: DeclarationId(2748), + }, + Field { + label: "PermWrite".to_string(), + ty: DeclarationId(2749), + }, + Field { + label: "PermAdmin".to_string(), + ty: DeclarationId(2750), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "PermAdmin".to_string(), @@ -64019,6 +70425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "on".to_string(), +<<<<<<< HEAD ty: DeclarationId(2744), }, Field { @@ -64028,6 +70435,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "env".to_string(), ty: DeclarationId(2746), +======= + ty: DeclarationId(2751), + }, + Field { + label: "jobs".to_string(), + ty: DeclarationId(2752), + }, + Field { + label: "env".to_string(), + ty: DeclarationId(2753), + }, + Field { + label: "permissions".to_string(), + ty: DeclarationId(2754), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "permissions".to_string(), @@ -64085,11 +70507,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "PermRead".to_string(), +<<<<<<< HEAD ty: DeclarationId(2748), }, Field { label: "PermWrite".to_string(), ty: DeclarationId(2749), +======= + ty: DeclarationId(2755), + }, + Field { + label: "PermWrite".to_string(), + ty: DeclarationId(2756), + }, + Field { + label: "PermNone".to_string(), + ty: DeclarationId(2757), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "PermNone".to_string(), @@ -64114,11 +70548,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Push".to_string(), +<<<<<<< HEAD ty: DeclarationId(2753), }, Field { label: "PullRequest".to_string(), ty: DeclarationId(2756), +======= + ty: DeclarationId(2760), + }, + Field { + label: "PullRequest".to_string(), + ty: DeclarationId(2763), + }, + Field { + label: "Schedule".to_string(), + ty: DeclarationId(2764), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Schedule".to_string(), @@ -64126,11 +70572,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "WorkflowDispatch".to_string(), +<<<<<<< HEAD ty: DeclarationId(2759), }, Field { label: "WorkflowCall".to_string(), ty: DeclarationId(2761), +======= + ty: DeclarationId(2766), + }, + Field { + label: "WorkflowCall".to_string(), + ty: DeclarationId(2768), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -64151,6 +70605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Opened".to_string(), +<<<<<<< HEAD ty: DeclarationId(2762), }, Field { @@ -64160,6 +70615,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "Reopened".to_string(), ty: DeclarationId(2764), +======= + ty: DeclarationId(2769), + }, + Field { + label: "Synchronize".to_string(), + ty: DeclarationId(2770), + }, + Field { + label: "Reopened".to_string(), + ty: DeclarationId(2771), + }, + Field { + label: "Closed".to_string(), + ty: DeclarationId(2772), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Closed".to_string(), @@ -64188,7 +70658,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "description".to_string(), +<<<<<<< HEAD ty: DeclarationId(2766), +======= + ty: DeclarationId(2773), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "required".to_string(), @@ -64196,7 +70670,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "default".to_string(), +<<<<<<< HEAD ty: DeclarationId(2767), +======= + ty: DeclarationId(2774), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "type".to_string(), @@ -64221,6 +70699,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "InputString".to_string(), +<<<<<<< HEAD ty: DeclarationId(2768), }, Field { @@ -64230,6 +70709,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "InputChoice".to_string(), ty: DeclarationId(2770), +======= + ty: DeclarationId(2775), + }, + Field { + label: "InputBoolean".to_string(), + ty: DeclarationId(2776), + }, + Field { + label: "InputChoice".to_string(), + ty: DeclarationId(2777), + }, + Field { + label: "InputEnvironment".to_string(), + ty: DeclarationId(2778), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "InputEnvironment".to_string(), @@ -64254,11 +70748,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "StepScope".to_string(), +<<<<<<< HEAD ty: DeclarationId(2772), }, Field { label: "JobScope".to_string(), ty: DeclarationId(2773), +======= + ty: DeclarationId(2779), + }, + Field { + label: "JobScope".to_string(), + ty: DeclarationId(2780), + }, + Field { + label: "WorkflowScope".to_string(), + ty: DeclarationId(2781), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "WorkflowScope".to_string(), @@ -64312,6 +70818,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "name".to_string(), +<<<<<<< HEAD ty: DeclarationId(2775), }, Field { @@ -64337,6 +70844,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "strategy".to_string(), ty: DeclarationId(2780), +======= + ty: DeclarationId(2782), + }, + Field { + label: "runner".to_string(), + ty: DeclarationId(1727), + }, + Field { + label: "steps".to_string(), + ty: DeclarationId(2783), + }, + Field { + label: "needs".to_string(), + ty: DeclarationId(2784), + }, + Field { + label: "env".to_string(), + ty: DeclarationId(2785), + }, + Field { + label: "if_condition".to_string(), + ty: DeclarationId(2786), + }, + Field { + label: "strategy".to_string(), + ty: DeclarationId(2787), + }, + Field { + label: "timeout_minutes".to_string(), + ty: DeclarationId(2788), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "timeout_minutes".to_string(), @@ -64348,7 +70886,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "concurrency".to_string(), +<<<<<<< HEAD ty: DeclarationId(2782), +======= + ty: DeclarationId(2789), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -64394,11 +70936,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "HostedRunner".to_string(), +<<<<<<< HEAD ty: DeclarationId(2783), }, Field { label: "SelfHosted".to_string(), ty: DeclarationId(2785), +======= + ty: DeclarationId(2790), + }, + Field { + label: "SelfHosted".to_string(), + ty: DeclarationId(2792), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -64419,6 +70969,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UbuntuLatest".to_string(), +<<<<<<< HEAD ty: DeclarationId(2786), }, Field { @@ -64436,6 +70987,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "Macos14".to_string(), ty: DeclarationId(2790), +======= + ty: DeclarationId(2793), + }, + Field { + label: "Ubuntu2404".to_string(), + ty: DeclarationId(2794), + }, + Field { + label: "Ubuntu2204".to_string(), + ty: DeclarationId(2795), + }, + Field { + label: "MacosLatest".to_string(), + ty: DeclarationId(2796), + }, + Field { + label: "Macos14".to_string(), + ty: DeclarationId(2797), + }, + Field { + label: "WindowsLatest".to_string(), + ty: DeclarationId(2798), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "WindowsLatest".to_string(), @@ -64460,11 +71034,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "RunStep".to_string(), +<<<<<<< HEAD ty: DeclarationId(2797), }, Field { label: "UsesStep".to_string(), ty: DeclarationId(2803), +======= + ty: DeclarationId(2804), + }, + Field { + label: "UsesStep".to_string(), + ty: DeclarationId(2810), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -64485,6 +71067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Bash".to_string(), +<<<<<<< HEAD ty: DeclarationId(2804), }, Field { @@ -64498,6 +71081,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "Python".to_string(), ty: DeclarationId(2807), +======= + ty: DeclarationId(2811), + }, + Field { + label: "Sh".to_string(), + ty: DeclarationId(2812), + }, + Field { + label: "Pwsh".to_string(), + ty: DeclarationId(2813), + }, + Field { + label: "Python".to_string(), + ty: DeclarationId(2814), + }, + Field { + label: "Cmd".to_string(), + ty: DeclarationId(2815), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Cmd".to_string(), @@ -64551,6 +71153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "AnnotationError".to_string(), +<<<<<<< HEAD ty: DeclarationId(2812), }, Field { @@ -64576,6 +71179,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "AddMask".to_string(), ty: DeclarationId(2824), +======= + ty: DeclarationId(2819), + }, + Field { + label: "AnnotationWarning".to_string(), + ty: DeclarationId(2823), + }, + Field { + label: "AnnotationNotice".to_string(), + ty: DeclarationId(2827), + }, + Field { + label: "AnnotationGroup".to_string(), + ty: DeclarationId(2828), + }, + Field { + label: "AnnotationEndGroup".to_string(), + ty: DeclarationId(2829), + }, + Field { + label: "SetOutput".to_string(), + ty: DeclarationId(2830), + }, + Field { + label: "AddMask".to_string(), + ty: DeclarationId(2831), + }, + Field { + label: "StopCommands".to_string(), + ty: DeclarationId(2832), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "StopCommands".to_string(), @@ -64752,11 +71386,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Upload".to_string(), +<<<<<<< HEAD ty: DeclarationId(2827), }, Field { label: "Download".to_string(), ty: DeclarationId(2829), +======= + ty: DeclarationId(2834), + }, + Field { + label: "Download".to_string(), + ty: DeclarationId(2836), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -64777,11 +71419,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Warn".to_string(), +<<<<<<< HEAD ty: DeclarationId(2830), }, Field { label: "ErrorOut".to_string(), ty: DeclarationId(2831), +======= + ty: DeclarationId(2837), + }, + Field { + label: "ErrorOut".to_string(), + ty: DeclarationId(2838), + }, + Field { + label: "Ignore".to_string(), + ty: DeclarationId(2839), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Ignore".to_string(), @@ -64848,6 +71502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "dimensions".to_string(), +<<<<<<< HEAD ty: DeclarationId(2834), }, Field { @@ -64857,6 +71512,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "exclude".to_string(), ty: DeclarationId(2838), +======= + ty: DeclarationId(2841), + }, + Field { + label: "include".to_string(), + ty: DeclarationId(2843), + }, + Field { + label: "exclude".to_string(), + ty: DeclarationId(2845), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "fail_fast".to_string(), @@ -64864,7 +71530,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "max_parallel".to_string(), +<<<<<<< HEAD ty: DeclarationId(2839), +======= + ty: DeclarationId(2846), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -64885,6 +71555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Success".to_string(), +<<<<<<< HEAD ty: DeclarationId(2840), }, Field { @@ -64902,6 +71573,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "TimedOut".to_string(), ty: DeclarationId(2844), +======= + ty: DeclarationId(2847), + }, + Field { + label: "Failure".to_string(), + ty: DeclarationId(2848), + }, + Field { + label: "Cancelled".to_string(), + ty: DeclarationId(2849), + }, + Field { + label: "Skipped".to_string(), + ty: DeclarationId(2850), + }, + Field { + label: "TimedOut".to_string(), + ty: DeclarationId(2851), + }, + Field { + label: "ActionRequired".to_string(), + ty: DeclarationId(2852), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ActionRequired".to_string(), @@ -65191,6 +71885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(1761), +<<<<<<< HEAD name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -65211,6 +71906,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(1762), +======= +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -65227,7 +71924,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/list.dag", 5354, 5367), + span: SourceSpan::new("src/v3/std/list.dag", 5336, 5349), }); declarations.push(Declaration { id: DeclarationId(1763), @@ -65247,7 +71944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/list.dag", 5372, 5385), + span: SourceSpan::new("src/v3/std/list.dag", 5354, 5367), }); declarations.push(Declaration { id: DeclarationId(1764), @@ -65255,8 +71952,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), value: DeclarationId(703), +======= + parameter: DeclarationId(686), + value: DeclarationId(700), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/list.dag", 5372, 5385), + }); + declarations.push(Declaration { + id: DeclarationId(1764), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(702), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -65409,7 +72131,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1772), name: None, connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(708)], +======= + inputs: vec![DeclarationId(707)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1771), body: ArrowBody::NoBody, }, @@ -65529,7 +72255,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1777), }], }, @@ -65589,7 +72319,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1780), }], }, @@ -66036,6 +72770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(1804), +<<<<<<< HEAD name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -66056,6 +72791,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(1805), +======= +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -66072,6 +72809,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 7627, 7645), + }); + declarations.push(Declaration { + id: DeclarationId(1806), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(729), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, span: SourceSpan::new("src/v3/std/effects.dag", 8066, 8084), }); declarations.push(Declaration { @@ -66182,6 +72939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(1811), +<<<<<<< HEAD name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -66201,6 +72959,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(1812), +======= +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -66216,6 +72976,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 14370, 14408), + }); + declarations.push(Declaration { + id: DeclarationId(1813), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "key_source".to_string(), + ty: DeclarationId(740), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, span: SourceSpan::new("src/v3/std/effects.dag", 14413, 14451), }); declarations.push(Declaration { @@ -66253,11 +73032,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(1815), +<<<<<<< HEAD +======= name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(737), + ty: DeclarationId(736), }], }, type_params: vec![], @@ -66272,6 +73053,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(1816), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(737), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 15171, 15200), + }); + declarations.push(Declaration { + id: DeclarationId(1817), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67068,7 +73869,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { template: DeclarationId(1135), arguments: vec![TemplateArgument { parameter: DeclarationId(1136), +<<<<<<< HEAD value: DeclarationId(724), +======= + value: DeclarationId(723), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -67088,7 +73893,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { template: DeclarationId(1135), arguments: vec![TemplateArgument { parameter: DeclarationId(1136), +<<<<<<< HEAD value: DeclarationId(724), +======= + value: DeclarationId(723), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -68524,11 +75333,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(1939), +<<<<<<< HEAD +======= name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(802), + ty: DeclarationId(801), }], }, type_params: vec![], @@ -68543,6 +75354,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(1940), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(802), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 14385, 14409), + }); + declarations.push(Declaration { + id: DeclarationId(1941), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -68600,6 +75431,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(1943), +<<<<<<< HEAD +======= name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -68619,6 +75452,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(1944), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "field_label".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 14676, 14732), + }); + declarations.push(Declaration { + id: DeclarationId(1945), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -68968,11 +75821,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(1962), +<<<<<<< HEAD +======= name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(820), + ty: DeclarationId(819), }], }, type_params: vec![], @@ -68987,6 +75842,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(1963), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(820), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 19462, 19478), + }); + declarations.push(Declaration { + id: DeclarationId(1964), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -69005,7 +75880,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19483, 19507), }); declarations.push(Declaration { - id: DeclarationId(1964), + id: DeclarationId(1965), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -69024,7 +75899,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19512, 19530), }); declarations.push(Declaration { - id: DeclarationId(1965), + id: DeclarationId(1966), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -69220,7 +76095,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { template: DeclarationId(1135), arguments: vec![TemplateArgument { parameter: DeclarationId(1136), +<<<<<<< HEAD value: DeclarationId(849), +======= + value: DeclarationId(848), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -69240,7 +76119,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { template: DeclarationId(1135), arguments: vec![TemplateArgument { parameter: DeclarationId(1136), +<<<<<<< HEAD value: DeclarationId(849), +======= + value: DeclarationId(848), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -69793,10 +76676,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(2006), +<<<<<<< HEAD +======= name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(842), + DeclarationId(841), CardinalityBound::AtMostOne, ), ), @@ -69812,6 +76697,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(2007), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(842), + CardinalityBound::AtMostOne, + ), + ), + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + }); + declarations.push(Declaration { + id: DeclarationId(2008), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -70286,7 +77191,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(1768), +<<<<<<< HEAD value: DeclarationId(856), +======= + value: DeclarationId(855), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -70353,8 +77262,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(849), }, TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(1758), value: DeclarationId(860), +======= + parameter: DeclarationId(694), + value: DeclarationId(848), + }, + TemplateArgument { + parameter: DeclarationId(1758), + value: DeclarationId(859), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -70404,6 +77322,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { parameter: DeclarationId(695), value: DeclarationId(849), }, +<<<<<<< HEAD +======= + TemplateArgument { + parameter: DeclarationId(1758), + value: DeclarationId(885), + }, + TemplateArgument { + parameter: DeclarationId(694), + value: DeclarationId(848), + }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -70452,6 +77381,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { parameter: DeclarationId(695), value: DeclarationId(849), }, +<<<<<<< HEAD +======= + TemplateArgument { + parameter: DeclarationId(1758), + value: DeclarationId(885), + }, + TemplateArgument { + parameter: DeclarationId(694), + value: DeclarationId(848), + }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -70717,8 +77657,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(849), }, TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(1758), value: DeclarationId(886), +======= + parameter: DeclarationId(694), + value: DeclarationId(848), + }, + TemplateArgument { + parameter: DeclarationId(1758), + value: DeclarationId(885), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -70776,7 +77725,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(2056), name: None, connective: TypeConnective::Arrow { +<<<<<<< HEAD inputs: vec![DeclarationId(1998), DeclarationId(849)], +======= + inputs: vec![DeclarationId(1998), DeclarationId(848)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1998), body: ArrowBody::NoBody, }, @@ -70802,11 +77755,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(695), +<<<<<<< HEAD value: DeclarationId(849), }, TemplateArgument { parameter: DeclarationId(1758), value: DeclarationId(889), +======= + value: DeclarationId(1998), + }, + TemplateArgument { + parameter: DeclarationId(694), + value: DeclarationId(848), + }, + TemplateArgument { + parameter: DeclarationId(1758), + value: DeclarationId(888), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -70884,7 +77849,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1185), }], }, @@ -70900,6 +77869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(2062), +<<<<<<< HEAD name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -70940,6 +77910,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { declarations.push(Declaration { id: DeclarationId(2064), name: None, +======= + name: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { @@ -70955,6 +77928,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2549, 2580), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2065), +======= + id: DeclarationId(2063), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "content".to_string(), +<<<<<<< HEAD +======= + ty: DeclarationId(2062), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2521, 2582), + }); + declarations.push(Declaration { + id: DeclarationId(2064), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(898), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2615, 2651), }); declarations.push(Declaration { @@ -70963,6 +77981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "content".to_string(), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ty: DeclarationId(2064), }], }, @@ -71075,6 +78094,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3541, 3572), }); declarations.push(Declaration { @@ -71096,14 +78116,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3604, 3622), +======= + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3587, 3622), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2072), name: None, connective: TypeConnective::Conj { children: vec![Field { +<<<<<<< HEAD label: "blocks".to_string(), ty: DeclarationId(2071), +======= + label: "source".to_string(), + ty: DeclarationId(893), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -71114,11 +78142,114 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3577, 3624), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3627, 3670), }); declarations.push(Declaration { id: DeclarationId(2073), name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "source".to_string(), + ty: DeclarationId(130), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3675, 3714), + }); + declarations.push(Declaration { + id: DeclarationId(2073), + name: None, + connective: TypeConnective::Atom(AtomPayload::UnresolvedIdentifier( + "AnthropicTextBlock".to_string(), + )), + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3768, 3786), + }); + declarations.push(Declaration { + id: DeclarationId(2074), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(2073), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3763, 3787), + }); + declarations.push(Declaration { + id: DeclarationId(2075), + name: None, + connective: TypeConnective::Conj { + children: vec![ + Field { + label: "content".to_string(), + ty: DeclarationId(2074), + }, + Field { + label: "source".to_string(), + ty: DeclarationId(230), + }, + Field { + label: "title".to_string(), + ty: DeclarationId(230), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3719, 3834), + }); + declarations.push(Declaration { + id: DeclarationId(2076), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "tool_name".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3839, 3888), + }); + declarations.push(Declaration { + id: DeclarationId(2077), + name: None, connective: TypeConnective::Conj { children: vec![Field { label: "text".to_string(), @@ -71133,10 +78264,72 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3905, 3941), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4200, 4231), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2074), +======= + id: DeclarationId(2078), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(895), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4263, 4293), + }); + declarations.push(Declaration { + id: DeclarationId(2079), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "blocks".to_string(), + ty: DeclarationId(2078), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4236, 4295), + }); + declarations.push(Declaration { + id: DeclarationId(2080), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "text".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4576, 4612), + }); + declarations.push(Declaration { + id: DeclarationId(2081), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71152,10 +78345,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4009, 4036), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4680, 4707), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2075), +======= + id: DeclarationId(2082), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71171,10 +78368,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4724, 4729), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2076), +======= + id: DeclarationId(2083), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -71184,11 +78385,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "content".to_string(), +<<<<<<< HEAD ty: DeclarationId(2074), }, Field { label: "is_error".to_string(), ty: DeclarationId(2075), +======= + ty: DeclarationId(2081), + }, + Field { + label: "is_error".to_string(), + ty: DeclarationId(2082), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -71200,10 +78409,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3946, 4064), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4617, 4735), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2077), +======= + id: DeclarationId(2084), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -71219,10 +78432,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4511, 4549), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5182, 5220), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2078), +======= + id: DeclarationId(2085), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -71248,6 +78465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4554, 4637), }); declarations.push(Declaration { @@ -71347,10 +78565,111 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5076, 5102), +======= + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5225, 5308), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2086), name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5666, 5673), + }); + declarations.push(Declaration { + id: DeclarationId(2087), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5678, 5687), + }); + declarations.push(Declaration { + id: DeclarationId(2088), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5692, 5704), + }); + declarations.push(Declaration { + id: DeclarationId(2089), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5709, 5716), + }); + declarations.push(Declaration { + id: DeclarationId(2090), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5721, 5730), + }); + declarations.push(Declaration { + id: DeclarationId(2091), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5735, 5742), + }); + declarations.push(Declaration { + id: DeclarationId(2092), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5747, 5773), + }); + declarations.push(Declaration { + id: DeclarationId(2093), + name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( DeclarationId(230), @@ -71365,10 +78684,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421), +======= + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6085, 6092), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { - id: DeclarationId(2087), + id: DeclarationId(2094), + name: None, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(230), + CardinalityBound::AtMostOne, + ), + ), + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6103, 6110), + }); + declarations.push(Declaration { + id: DeclarationId(2095), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71401,11 +78743,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "document_title".to_string(), +<<<<<<< HEAD ty: DeclarationId(2086), }, Field { label: "file_id".to_string(), ty: DeclarationId(2087), +======= + ty: DeclarationId(2093), + }, + Field { + label: "file_id".to_string(), + ty: DeclarationId(2094), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "start_char_index".to_string(), @@ -71425,10 +78775,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5342, 5485), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6013, 6156), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2089), +======= + id: DeclarationId(2096), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71444,10 +78798,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5562, 5569), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6233, 6240), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2090), +======= + id: DeclarationId(2097), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71463,10 +78821,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5580, 5587), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6251, 6258), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2091), +======= + id: DeclarationId(2098), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -71480,11 +78842,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "document_title".to_string(), +<<<<<<< HEAD ty: DeclarationId(2089), }, Field { label: "file_id".to_string(), ty: DeclarationId(2090), +======= + ty: DeclarationId(2096), + }, + Field { + label: "file_id".to_string(), + ty: DeclarationId(2097), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "start_page_number".to_string(), @@ -71504,10 +78874,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5490, 5635), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6161, 6306), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2092), +======= + id: DeclarationId(2099), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71523,10 +78897,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5720, 5727), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6391, 6398), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2093), +======= + id: DeclarationId(2100), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71542,10 +78920,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5738, 5745), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6409, 6416), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2094), +======= + id: DeclarationId(2101), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -71559,11 +78941,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "document_title".to_string(), +<<<<<<< HEAD ty: DeclarationId(2092), }, Field { label: "file_id".to_string(), ty: DeclarationId(2093), +======= + ty: DeclarationId(2099), + }, + Field { + label: "file_id".to_string(), + ty: DeclarationId(2100), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "start_block_index".to_string(), @@ -71583,10 +78973,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5640, 5793), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6311, 6464), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2095), +======= + id: DeclarationId(2102), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71602,10 +78996,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5876, 5883), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6547, 6554), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2096), +======= + id: DeclarationId(2103), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -71619,7 +79017,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "title".to_string(), +<<<<<<< HEAD ty: DeclarationId(2095), +======= + ty: DeclarationId(2102), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "url".to_string(), @@ -71635,10 +79037,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5798, 5898), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6469, 6569), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2097), +======= + id: DeclarationId(2104), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71654,10 +79060,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5969, 5976), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6640, 6647), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2098), +======= + id: DeclarationId(2105), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -71671,7 +79081,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "title".to_string(), +<<<<<<< HEAD ty: DeclarationId(2097), +======= + ty: DeclarationId(2104), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "search_result_index".to_string(), @@ -71695,15 +79109,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5903, 6050), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6574, 6721), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2099), +======= + id: DeclarationId(2106), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(900), }], }, @@ -71715,14 +79137,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6674, 6708), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7345, 7379), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2100), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( DeclarationId(2099), +======= + id: DeclarationId(2107), + name: None, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(2106), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) CardinalityBound::AtMostOne, ), ), @@ -71734,10 +79164,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6674, 6709), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7345, 7380), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2101), +======= + id: DeclarationId(2108), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -71747,7 +79181,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "citations".to_string(), +<<<<<<< HEAD ty: DeclarationId(2100), +======= + ty: DeclarationId(2107), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -71759,10 +79197,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6629, 6711), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7300, 7382), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2102), +======= + id: DeclarationId(2109), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -71784,10 +79226,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6716, 6777), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7387, 7448), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2103), +======= + id: DeclarationId(2110), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -71803,10 +79249,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6782, 6837), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7453, 7508), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2104), +======= + id: DeclarationId(2111), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71822,10 +79272,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6912, 6917), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7583, 7588), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2105), +======= + id: DeclarationId(2112), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -71843,7 +79297,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "caller".to_string(), +<<<<<<< HEAD ty: DeclarationId(2104), +======= + ty: DeclarationId(2111), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -71855,10 +79313,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6842, 6919), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7513, 7590), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2106), +======= + id: DeclarationId(2113), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71874,10 +79336,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7017, 7022), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7688, 7693), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2107), +======= + id: DeclarationId(2114), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -71895,7 +79361,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "caller".to_string(), +<<<<<<< HEAD ty: DeclarationId(2106), +======= + ty: DeclarationId(2113), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -71907,10 +79377,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6924, 7024), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7595, 7695), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2108), +======= + id: DeclarationId(2115), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -71926,10 +79400,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7108, 7113), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7779, 7784), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2109), +======= + id: DeclarationId(2116), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -71943,7 +79421,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "caller".to_string(), +<<<<<<< HEAD ty: DeclarationId(2108), +======= + ty: DeclarationId(2115), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -71955,6 +79437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7029, 7115), }); declarations.push(Declaration { @@ -72070,14 +79553,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7478, 7485), }); declarations.push(Declaration { +======= + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7700, 7786), + }); + declarations.push(Declaration { + id: DeclarationId(2117), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8007, 8016), + }); + declarations.push(Declaration { +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) id: DeclarationId(2118), name: None, - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(93), - CardinalityBound::AtMostOne, - ), - ), + connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -72086,11 +79583,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739), +======= + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8021, 8029), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2119), name: None, +<<<<<<< HEAD connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( DeclarationId(93), @@ -72116,6 +79618,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { CardinalityBound::AtMostOne, ), ), +======= + connective: TypeConnective::Conj { children: vec![] }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -72124,7 +79629,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8034, 8047), }); declarations.push(Declaration { id: DeclarationId(2121), @@ -72138,11 +79643,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8171, 8180), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8052, 8069), }); declarations.push(Declaration { id: DeclarationId(2122), name: None, +<<<<<<< HEAD connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { @@ -72150,6 +79656,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(901), }], }, +======= + connective: TypeConnective::Conj { children: vec![] }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8074, 8097), + }); + declarations.push(Declaration { + id: DeclarationId(2123), + name: None, + connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -72158,11 +79681,77 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8666, 8704), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8102, 8121), }); declarations.push(Declaration { id: DeclarationId(2123), name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8126, 8144), + }); + declarations.push(Declaration { + id: DeclarationId(2124), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8149, 8156), + }); + declarations.push(Declaration { + id: DeclarationId(2125), + name: None, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(93), + CardinalityBound::AtMostOne, + ), + ), + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8406, 8410), + }); + declarations.push(Declaration { + id: DeclarationId(2126), + name: None, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(93), + CardinalityBound::AtMostOne, + ), + ), + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8442, 8446), + }); + declarations.push(Declaration { + id: DeclarationId(2127), + name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( DeclarationId(230), @@ -72177,10 +79766,67 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8783, 8790), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8478, 8485), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2124), +======= + id: DeclarationId(2128), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8842, 8851), + }); + declarations.push(Declaration { + id: DeclarationId(2129), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(901), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9337, 9375), + }); + declarations.push(Declaration { + id: DeclarationId(2130), + name: None, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(230), + CardinalityBound::AtMostOne, + ), + ), + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9454, 9461), + }); + declarations.push(Declaration { + id: DeclarationId(2131), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -72196,6 +79842,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8851, 8856), }); declarations.push(Declaration { @@ -72315,6 +79962,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6983, 7004), +======= + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9522, 9527), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2133), @@ -72328,7 +79978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/clean_emission.dag", 2224, 2238), + span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1013, 1025), }); declarations.push(Declaration { id: DeclarationId(2134), @@ -72342,7 +79992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/clean_emission.dag", 2243, 2268), + span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1030, 1044), }); declarations.push(Declaration { id: DeclarationId(2135), @@ -72356,7 +80006,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/clean_emission.dag", 2273, 2283), + span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1049, 1064), }); declarations.push(Declaration { id: DeclarationId(2136), @@ -72370,7 +80020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/clean_emission.dag", 2548, 2565), + span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1069, 1086), }); declarations.push(Declaration { id: DeclarationId(2137), @@ -72384,7 +80034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/clean_emission.dag", 2570, 2594), + span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1091, 1114), }); declarations.push(Declaration { id: DeclarationId(2138), @@ -72398,7 +80048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/clean_emission.dag", 2599, 2631), + span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4719, 4726), }); declarations.push(Declaration { id: DeclarationId(2139), @@ -72412,11 +80062,129 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/clean_emission.dag", 2636, 2663), + span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4731, 4735), }); declarations.push(Declaration { id: DeclarationId(2140), name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(912), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6983, 7004), + }); + declarations.push(Declaration { + id: DeclarationId(2141), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/clean_emission.dag", 2224, 2238), + }); + declarations.push(Declaration { + id: DeclarationId(2142), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/clean_emission.dag", 2243, 2268), + }); + declarations.push(Declaration { + id: DeclarationId(2143), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/clean_emission.dag", 2273, 2283), + }); + declarations.push(Declaration { + id: DeclarationId(2144), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/clean_emission.dag", 2548, 2565), + }); + declarations.push(Declaration { + id: DeclarationId(2145), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/clean_emission.dag", 2570, 2594), + }); + declarations.push(Declaration { + id: DeclarationId(2146), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/clean_emission.dag", 2599, 2631), + }); + declarations.push(Declaration { + id: DeclarationId(2147), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/clean_emission.dag", 2636, 2663), + }); + declarations.push(Declaration { + id: DeclarationId(2148), + name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -72429,7 +80197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3369, 3393), }); declarations.push(Declaration { - id: DeclarationId(2141), + id: DeclarationId(2149), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72443,7 +80211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3398, 3430), }); declarations.push(Declaration { - id: DeclarationId(2142), + id: DeclarationId(2150), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72457,7 +80225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3564, 3588), }); declarations.push(Declaration { - id: DeclarationId(2143), + id: DeclarationId(2151), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72471,7 +80239,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3593, 3614), }); declarations.push(Declaration { - id: DeclarationId(2144), + id: DeclarationId(2152), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72485,7 +80253,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3619, 3637), }); declarations.push(Declaration { - id: DeclarationId(2145), + id: DeclarationId(2153), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72499,7 +80267,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3781, 3796), }); declarations.push(Declaration { - id: DeclarationId(2146), + id: DeclarationId(2154), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72513,7 +80281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3801, 3831), }); declarations.push(Declaration { - id: DeclarationId(2147), + id: DeclarationId(2154), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72527,7 +80295,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3836, 3857), }); declarations.push(Declaration { - id: DeclarationId(2148), + id: DeclarationId(2155), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72541,7 +80309,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4024, 4044), }); declarations.push(Declaration { - id: DeclarationId(2149), + id: DeclarationId(2156), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72555,7 +80323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4049, 4076), }); declarations.push(Declaration { - id: DeclarationId(2150), + id: DeclarationId(2157), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72569,7 +80337,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4081, 4095), }); declarations.push(Declaration { - id: DeclarationId(2151), + id: DeclarationId(2158), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72583,7 +80351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4354, 4362), }); declarations.push(Declaration { - id: DeclarationId(2152), + id: DeclarationId(2159), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72597,7 +80365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4367, 4393), }); declarations.push(Declaration { - id: DeclarationId(2153), + id: DeclarationId(2160), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72611,7 +80379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4398, 4423), }); declarations.push(Declaration { - id: DeclarationId(2154), + id: DeclarationId(2161), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -72631,7 +80399,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5320, 5332), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2155), +======= + id: DeclarationId(2162), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72645,7 +80417,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5693, 5713), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2156), +======= + id: DeclarationId(2163), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72659,7 +80435,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5718, 5736), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2157), +======= + id: DeclarationId(2164), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72673,7 +80453,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5741, 5759), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2158), +======= + id: DeclarationId(2165), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72687,7 +80471,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5764, 5791), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2159), +======= + id: DeclarationId(2166), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -72706,7 +80494,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2160), +======= + id: DeclarationId(2167), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -72725,7 +80517,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2161), +======= + id: DeclarationId(2168), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -72744,7 +80540,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2162), +======= + id: DeclarationId(2169), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -72763,7 +80563,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2163), +======= + id: DeclarationId(2170), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -72782,7 +80586,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2164), +======= + id: DeclarationId(2171), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72801,7 +80609,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1422, 1454), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2165), +======= + id: DeclarationId(2172), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72820,7 +80632,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1459, 1495), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2166), +======= + id: DeclarationId(2173), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72839,7 +80655,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1500, 1537), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2167), +======= + id: DeclarationId(2174), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72858,7 +80678,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1542, 1568), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2168), +======= + id: DeclarationId(2175), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72877,7 +80701,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1573, 1606), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2169), +======= + id: DeclarationId(2176), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72891,7 +80719,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1611, 1628), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2170), +======= + id: DeclarationId(2177), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72910,7 +80742,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1633, 1687), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2171), +======= + id: DeclarationId(2178), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72924,7 +80760,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1692, 1699), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2172), +======= + id: DeclarationId(2179), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72943,7 +80783,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2051, 2089), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2173), +======= + id: DeclarationId(2180), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -72968,7 +80812,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2094, 2168), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2174), +======= + id: DeclarationId(2181), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -72993,7 +80841,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2173, 2248), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2175), +======= + id: DeclarationId(2182), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -73018,7 +80870,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2253, 2326), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2176), +======= + id: DeclarationId(2183), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73037,7 +80893,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2331, 2368), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2177), +======= + id: DeclarationId(2184), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73056,7 +80916,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2373, 2410), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2178), +======= + id: DeclarationId(2185), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73075,7 +80939,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2415, 2456), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2179), +======= + id: DeclarationId(2186), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73089,7 +80957,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2461, 2477), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2180), +======= + id: DeclarationId(2187), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73103,7 +80975,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2998, 3008), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2181), +======= + id: DeclarationId(2188), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73122,7 +80998,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3013, 3060), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2182), +======= + id: DeclarationId(2189), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73141,7 +81021,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3065, 3116), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2183), +======= + id: DeclarationId(2190), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73155,7 +81039,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3306, 3310), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2184), +======= + id: DeclarationId(2191), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73169,7 +81057,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3315, 3322), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2185), +======= + id: DeclarationId(2192), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73183,7 +81075,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3327, 3333), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2186), +======= + id: DeclarationId(2193), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -73202,7 +81098,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2187), +======= + id: DeclarationId(2194), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73216,7 +81116,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7270, 7281), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2188), +======= + id: DeclarationId(2195), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73230,7 +81134,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7330, 7344), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2189), +======= + id: DeclarationId(2196), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73244,7 +81152,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7409, 7425), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2190), +======= + id: DeclarationId(2197), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73258,7 +81170,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 360, 369), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2191), +======= + id: DeclarationId(2198), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73272,7 +81188,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 374, 381), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2192), +======= + id: DeclarationId(2199), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73286,7 +81206,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 614, 618), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2193), +======= + id: DeclarationId(2200), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73300,7 +81224,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 623, 632), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2194), +======= + id: DeclarationId(2201), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73314,7 +81242,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 910, 921), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2195), +======= + id: DeclarationId(2202), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73328,7 +81260,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 926, 935), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2196), +======= + id: DeclarationId(2203), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73342,7 +81278,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 1166, 1173), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2197), +======= + id: DeclarationId(2204), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73356,7 +81296,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 1178, 1187), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2198), +======= + id: DeclarationId(2205), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73370,7 +81314,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2035, 2044), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2199), +======= + id: DeclarationId(2206), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73384,7 +81332,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2049, 2065), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2200), +======= + id: DeclarationId(2207), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73398,7 +81350,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2070, 2080), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2201), +======= + id: DeclarationId(2208), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73412,7 +81368,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2085, 2099), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2202), +======= + id: DeclarationId(2209), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73426,7 +81386,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2385, 2399), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2203), +======= + id: DeclarationId(2210), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73440,7 +81404,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2404, 2418), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2204), +======= + id: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -73460,7 +81428,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2818, 2830), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2205), +======= + id: DeclarationId(2212), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -73480,7 +81452,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 3210, 3222), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2206), +======= + id: DeclarationId(2213), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73494,7 +81470,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 3694, 3708), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2207), +======= + id: DeclarationId(2214), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73508,7 +81488,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 3713, 3729), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2208), +======= + id: DeclarationId(2215), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73527,7 +81511,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6759, 6786), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2209), +======= + id: DeclarationId(2216), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73541,7 +81529,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7611, 7616), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2210), +======= + id: DeclarationId(2217), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73555,7 +81547,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7621, 7630), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2211), +======= + id: DeclarationId(2218), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -73581,7 +81577,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9513, 9555), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2212), +======= + id: DeclarationId(2219), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73595,7 +81595,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3853, 3857), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2213), +======= + id: DeclarationId(2220), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73609,7 +81613,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3860, 3864), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2214), +======= + id: DeclarationId(2221), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73623,7 +81631,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3867, 3871), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2215), +======= + id: DeclarationId(2222), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73637,7 +81649,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3874, 3879), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2216), +======= + id: DeclarationId(2223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73651,7 +81667,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3882, 3893), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2217), +======= + id: DeclarationId(2224), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73665,7 +81685,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3896, 3909), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2218), +======= + id: DeclarationId(2225), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73679,7 +81703,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4489, 4494), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2219), +======= + id: DeclarationId(2226), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73693,7 +81721,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4497, 4506), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2220), +======= + id: DeclarationId(2227), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73707,7 +81739,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4509, 4515), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2221), +======= + id: DeclarationId(2228), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73721,7 +81757,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4518, 4522), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2222), +======= + id: DeclarationId(2229), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73735,6 +81775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4525, 4529), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2223), name: None, connective: TypeConnective::Instantiation { @@ -73756,6 +81797,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(2224), +======= + id: DeclarationId(2230), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -73772,6 +81816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6396, 6424), }); declarations.push(Declaration { @@ -73871,10 +81916,131 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/diagnostics.dag", 1202, 1224), +======= + span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5923, 5941), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2232), name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(967), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6396, 6424), + }); + declarations.push(Declaration { + id: DeclarationId(2233), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/diagnostics.dag", 1099, 1113), + }); + declarations.push(Declaration { + id: DeclarationId(2234), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/diagnostics.dag", 1118, 1128), + }); + declarations.push(Declaration { + id: DeclarationId(2235), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/diagnostics.dag", 1133, 1145), + }); + declarations.push(Declaration { + id: DeclarationId(2235), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/diagnostics.dag", 1150, 1163), + }); + declarations.push(Declaration { + id: DeclarationId(2236), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/diagnostics.dag", 1168, 1180), + }); + declarations.push(Declaration { + id: DeclarationId(2237), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/diagnostics.dag", 1185, 1197), + }); + declarations.push(Declaration { + id: DeclarationId(2238), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/diagnostics.dag", 1202, 1224), + }); + declarations.push(Declaration { + id: DeclarationId(2239), + name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -73887,7 +82053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1229, 1248), }); declarations.push(Declaration { - id: DeclarationId(2233), + id: DeclarationId(2240), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73901,7 +82067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1253, 1278), }); declarations.push(Declaration { - id: DeclarationId(2234), + id: DeclarationId(2241), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73915,7 +82081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1283, 1306), }); declarations.push(Declaration { - id: DeclarationId(2235), + id: DeclarationId(2242), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73934,7 +82100,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 5506, 5542), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2236), +======= + id: DeclarationId(2243), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73953,12 +82123,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 5547, 5588), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2237), +======= + id: DeclarationId(2244), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(970), }], }, @@ -73973,7 +82151,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 6047, 6063), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2238), +======= + id: DeclarationId(2245), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73992,7 +82174,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9175, 9216), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2239), +======= + id: DeclarationId(2246), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74006,7 +82192,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9513, 9525), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2240), +======= + id: DeclarationId(2247), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -74026,7 +82216,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9795, 9807), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2241), +======= + id: DeclarationId(2248), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -74036,7 +82230,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "sites".to_string(), +<<<<<<< HEAD ty: DeclarationId(2240), +======= + ty: DeclarationId(2247), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -74051,7 +82249,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9752, 9809), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2242), +======= + id: DeclarationId(2249), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74070,7 +82272,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 10119, 10153), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2243), +======= + id: DeclarationId(2250), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74089,7 +82295,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 10556, 10607), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2244), +======= + id: DeclarationId(2251), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74103,7 +82313,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 10950, 10968), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2245), +======= + id: DeclarationId(2252), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -74132,7 +82346,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 11357, 11469), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2246), +======= + id: DeclarationId(2253), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -74152,7 +82370,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4846, 4866), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2247), +======= + id: DeclarationId(2254), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(983), @@ -74178,7 +82400,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4876, 4900), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2248), +======= + id: DeclarationId(2255), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(983), @@ -74204,7 +82430,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4911, 4935), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2249), +======= + id: DeclarationId(2256), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(983), @@ -74230,7 +82460,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4941, 4965), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2250), +======= + id: DeclarationId(2257), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -74250,7 +82484,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5042, 5062), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2251), +======= + id: DeclarationId(2258), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(983), @@ -74276,7 +82514,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5072, 5096), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2252), +======= + id: DeclarationId(2259), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(983), @@ -74302,7 +82544,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5107, 5131), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2253), +======= + id: DeclarationId(2260), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(983), @@ -74328,7 +82574,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5137, 5161), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2254), +======= + id: DeclarationId(2261), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -74348,7 +82598,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5245, 5265), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2255), +======= + id: DeclarationId(2262), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(983), @@ -74374,7 +82628,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5276, 5300), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2256), +======= + id: DeclarationId(2263), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(983), @@ -74400,7 +82658,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5325, 5349), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2257), +======= + id: DeclarationId(2264), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -74420,7 +82682,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5440, 5460), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2258), +======= + id: DeclarationId(2265), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(983), @@ -74446,7 +82712,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5471, 5495), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2259), +======= + id: DeclarationId(2266), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(983), @@ -74472,7 +82742,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5520, 5544), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2260), +======= + id: DeclarationId(2267), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74491,7 +82765,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1634, 1651), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2261), +======= + id: DeclarationId(2268), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -74516,7 +82794,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1656, 1697), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2262), +======= + id: DeclarationId(2269), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74530,7 +82812,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1879, 1891), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2263), +======= + id: DeclarationId(2270), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74549,7 +82835,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1896, 1932), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2264), +======= + id: DeclarationId(2271), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(976), @@ -74569,13 +82859,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2414, 2430), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2265), +======= + id: DeclarationId(2272), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), value: DeclarationId(2264), +======= + parameter: DeclarationId(686), + value: DeclarationId(2271), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -74589,7 +82888,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2409, 2431), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2266), +======= + id: DeclarationId(2273), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -74603,7 +82906,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "witnesses".to_string(), +<<<<<<< HEAD ty: DeclarationId(2265), +======= + ty: DeclarationId(2272), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -74618,12 +82925,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2325, 2437), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2267), +======= + id: DeclarationId(2274), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(974), }], }, @@ -74638,7 +82953,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2505, 2521), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2268), +======= + id: DeclarationId(2275), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(976), @@ -74658,13 +82977,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2544, 2560), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2269), +======= + id: DeclarationId(2276), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), value: DeclarationId(2268), +======= + parameter: DeclarationId(686), + value: DeclarationId(2275), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -74678,7 +83006,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2539, 2561), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2270), +======= + id: DeclarationId(2277), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -74688,11 +83020,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "violations".to_string(), +<<<<<<< HEAD ty: DeclarationId(2267), }, Field { label: "witnesses".to_string(), ty: DeclarationId(2269), +======= + ty: DeclarationId(2274), + }, + Field { + label: "witnesses".to_string(), + ty: DeclarationId(2276), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -74707,7 +83047,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2442, 2567), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2271), +======= + id: DeclarationId(2278), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(976), @@ -74727,11 +83071,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3902, 3918), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2272), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(828), DeclarationId(827)], output: DeclarationId(2271), +======= + id: DeclarationId(2279), + name: None, + connective: TypeConnective::Arrow { + inputs: vec![DeclarationId(827), DeclarationId(826)], + output: DeclarationId(2278), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::NoBody, }, type_params: vec![], @@ -74745,7 +83097,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3881, 3918), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2273), +======= + id: DeclarationId(2280), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(19), @@ -74765,10 +83121,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3930, 3945), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2274), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(827), DeclarationId(982)], +======= + id: DeclarationId(2281), + name: None, + connective: TypeConnective::Arrow { + inputs: vec![DeclarationId(826), DeclarationId(982)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(978), body: ArrowBody::NoBody, }, @@ -74783,7 +83146,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3966, 4009), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2275), +======= + id: DeclarationId(2282), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: Some("DimensionUnitAbelianGroup".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(25), @@ -74803,7 +83170,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2276), +======= + id: DeclarationId(2283), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74817,7 +83188,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3709, 3721), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2277), +======= + id: DeclarationId(2284), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74836,12 +83211,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3726, 3762), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2278), +======= + id: DeclarationId(2285), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1011), }], }, @@ -74856,7 +83239,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2279), +======= + id: DeclarationId(2286), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74870,7 +83257,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4373, 4389), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2280), +======= + id: DeclarationId(2287), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74889,7 +83280,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4394, 4422), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2281), +======= + id: DeclarationId(2288), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74903,7 +83298,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4665, 4686), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2282), +======= + id: DeclarationId(2289), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74922,7 +83320,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 5176, 5195), }); declarations.push(Declaration { - id: DeclarationId(2283), + id: DeclarationId(2290), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/emit_model.dag", 5176, 5195), + }); + declarations.push(Declaration { + id: DeclarationId(2291), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74946,7 +83364,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1016), }], }, @@ -74961,7 +83383,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 5591, 5614), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2285), +======= + id: DeclarationId(2292), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74975,7 +83401,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6611, 6619), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2286), +======= + id: DeclarationId(2293), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74989,7 +83419,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6632), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2287), +======= + id: DeclarationId(2294), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75003,7 +83437,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7073, 7078), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2288), +======= + id: DeclarationId(2295), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75017,7 +83455,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7083, 7091), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2289), +======= + id: DeclarationId(2296), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75031,7 +83473,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7427, 7440), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2290), +======= + id: DeclarationId(2297), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75045,7 +83491,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7445, 7451), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2291), +======= + id: DeclarationId(2298), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75059,7 +83509,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7709, 7717), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2292), +======= + id: DeclarationId(2299), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75073,7 +83527,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7722, 7727), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2293), +======= + id: DeclarationId(2300), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75087,7 +83545,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7732, 7745), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2294), +======= + id: DeclarationId(2301), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75101,7 +83563,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8082, 8100), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2295), +======= + id: DeclarationId(2302), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75115,7 +83581,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9475, 9484), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2296), +======= + id: DeclarationId(2303), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75129,7 +83599,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9489, 9502), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2297), +======= + id: DeclarationId(2304), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75143,7 +83617,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9507, 9515), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2298), +======= + id: DeclarationId(2305), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75157,7 +83635,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9520, 9530), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2299), +======= + id: DeclarationId(2306), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75171,7 +83653,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9535, 9545), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2300), +======= + id: DeclarationId(2307), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75185,7 +83671,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9550, 9561), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2301), +======= + id: DeclarationId(2308), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75199,7 +83689,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9566, 9574), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2302), +======= + id: DeclarationId(2309), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75213,7 +83707,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9579, 9586), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2303), +======= + id: DeclarationId(2310), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75227,7 +83725,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9591, 9601), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2304), +======= + id: DeclarationId(2311), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75241,7 +83743,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9606, 9618), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2305), +======= + id: DeclarationId(2312), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75255,7 +83761,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12311, 12337), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2306), +======= + id: DeclarationId(2313), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75269,7 +83779,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12342, 12352), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2307), +======= + id: DeclarationId(2314), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75283,7 +83797,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17117, 17123), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2308), +======= + id: DeclarationId(2315), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75297,7 +83815,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17128, 17139), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2309), +======= + id: DeclarationId(2316), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75311,7 +83833,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17459, 17470), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2310), +======= + id: DeclarationId(2317), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75325,7 +83851,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17475, 17486), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2311), +======= + id: DeclarationId(2318), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75339,7 +83869,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 19419, 19430), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2312), +======= + id: DeclarationId(2319), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75353,7 +83887,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 19435, 19443), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2313), +======= + id: DeclarationId(2320), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75372,7 +83910,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 20606, 20641), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2314), +======= + id: DeclarationId(2321), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -75397,12 +83939,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 20646, 20734), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2315), +======= + id: DeclarationId(2322), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1046), }], }, @@ -75417,7 +83967,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6894, 6922), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2316), +======= + id: DeclarationId(2323), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75436,7 +83990,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2317), +======= + id: DeclarationId(2324), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75455,7 +84013,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2318), +======= + id: DeclarationId(2325), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(1077), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/induction.dag", 27850, 27865), + }); + declarations.push(Declaration { + id: DeclarationId(2326), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -75472,6 +84054,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("src/v3/std/induction.dag", 27850, 27865), }); declarations.push(Declaration { @@ -75496,11 +84079,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(2320), +======= + span: SourceSpan::new("src/v3/std/induction.dag", 29879, 29895), + }); + declarations.push(Declaration { + id: DeclarationId(2327), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1076), }], }, @@ -75515,12 +84108,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 29988, 30004), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2321), +======= + id: DeclarationId(2328), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1076), }], }, @@ -75535,13 +84136,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 30102, 30118), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2322), +======= + id: DeclarationId(2329), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), value: DeclarationId(2321), +======= + parameter: DeclarationId(686), + value: DeclarationId(2328), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -75555,7 +84165,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 30097, 30119), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2323), +======= + id: DeclarationId(2330), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75574,7 +84187,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), }); declarations.push(Declaration { - id: DeclarationId(2324), + id: DeclarationId(2331), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(93), + CardinalityBound::AtMostOne, + ), + ), + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), + }); + declarations.push(Declaration { + id: DeclarationId(2332), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75593,7 +84226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), }); declarations.push(Declaration { - id: DeclarationId(2325), + id: DeclarationId(2333), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75612,7 +84245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), }); declarations.push(Declaration { - id: DeclarationId(2326), + id: DeclarationId(2334), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75631,7 +84264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), }); declarations.push(Declaration { - id: DeclarationId(2327), + id: DeclarationId(2335), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75650,7 +84283,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), }); declarations.push(Declaration { - id: DeclarationId(2328), + id: DeclarationId(2336), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75669,7 +84302,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), }); declarations.push(Declaration { - id: DeclarationId(2329), + id: DeclarationId(2337), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75683,7 +84316,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5629, 5644), }); declarations.push(Declaration { - id: DeclarationId(2330), + id: DeclarationId(2338), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75697,7 +84330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5684, 5697), }); declarations.push(Declaration { - id: DeclarationId(2331), + id: DeclarationId(2339), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75711,7 +84344,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5745, 5762), }); declarations.push(Declaration { - id: DeclarationId(2332), + id: DeclarationId(2340), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75725,7 +84358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5801, 5813), }); declarations.push(Declaration { - id: DeclarationId(2333), + id: DeclarationId(2341), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75764,7 +84397,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10033), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2335), +======= + id: DeclarationId(2342), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75783,7 +84420,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 10038, 10080), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2336), +======= + id: DeclarationId(2343), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -75808,7 +84449,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 10085, 10142), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2337), +======= + id: DeclarationId(2344), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75822,7 +84467,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 10147, 10161), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2338), +======= + id: DeclarationId(2345), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75836,7 +84485,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 10166, 10181), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2339), +======= + id: DeclarationId(2346), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75850,7 +84503,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24135, 24149), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2340), +======= + id: DeclarationId(2347), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75869,7 +84526,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24154, 24201), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2341), +======= + id: DeclarationId(2348), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -75894,7 +84555,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24206, 24283), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2342), +======= + id: DeclarationId(2349), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -75919,7 +84584,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24288, 24362), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2343), +======= + id: DeclarationId(2350), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -75944,7 +84613,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24982, 25038), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2344), +======= + id: DeclarationId(2351), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75963,7 +84636,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 25054, 25079), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2345), +======= + id: DeclarationId(2352), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75977,7 +84654,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26728, 26741), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2346), +======= + id: DeclarationId(2353), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75996,6 +84677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26785, 26817), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2347), name: None, connective: TypeConnective::Instantiation { @@ -76095,6 +84777,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(2352), +======= + id: DeclarationId(2354), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -76111,15 +84796,121 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 27277, 27292), + span: SourceSpan::new("src/v3/std/induction.dag", 26880, 26896), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2353), +======= + id: DeclarationId(2355), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "factors".to_string(), + ty: DeclarationId(2354), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/induction.dag", 26856, 26898), + }); + declarations.push(Declaration { + id: DeclarationId(2356), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(1076), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/induction.dag", 26960, 26976), + }); + declarations.push(Declaration { + id: DeclarationId(2357), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(2356), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/induction.dag", 26955, 26977), + }); + declarations.push(Declaration { + id: DeclarationId(2358), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "terms".to_string(), +<<<<<<< HEAD ty: DeclarationId(2352), +======= + ty: DeclarationId(2357), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/induction.dag", 26927, 26979), + }); + declarations.push(Declaration { + id: DeclarationId(2359), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(1077), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/induction.dag", 27277, 27292), + }); + declarations.push(Declaration { + id: DeclarationId(2360), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "terms".to_string(), + ty: DeclarationId(2359), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -76133,7 +84924,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27259, 27294), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2354), +======= + id: DeclarationId(2361), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -76147,7 +84942,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27377, 27389), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2355), +======= + id: DeclarationId(2362), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -76161,12 +84960,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27459, 27469), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2356), +======= + id: DeclarationId(2363), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1290), }], }, @@ -76181,12 +84988,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1234, 1254), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2357), +======= + id: DeclarationId(2364), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1290), }], }, @@ -76201,7 +85016,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1414, 1434), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2358), +======= + id: DeclarationId(2365), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(976), @@ -76221,11 +85040,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2359), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(828), DeclarationId(827)], output: DeclarationId(2358), +======= + id: DeclarationId(2366), + name: None, + connective: TypeConnective::Arrow { + inputs: vec![DeclarationId(827), DeclarationId(826)], + output: DeclarationId(2365), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::NoBody, }, type_params: vec![], @@ -76239,7 +85066,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2360), +======= + id: DeclarationId(2367), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(19), @@ -76259,7 +85090,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2361), +======= + id: DeclarationId(2368), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1121), DeclarationId(1121)], @@ -76277,10 +85112,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2362), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1121), DeclarationId(818)], +======= + id: DeclarationId(2369), + name: None, + connective: TypeConnective::Arrow { + inputs: vec![DeclarationId(1121), DeclarationId(817)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1121), body: ArrowBody::NoBody, }, @@ -76295,10 +85137,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2363), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(828), DeclarationId(1121)], +======= + id: DeclarationId(2370), + name: None, + connective: TypeConnective::Arrow { + inputs: vec![DeclarationId(827), DeclarationId(1121)], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(978), body: ArrowBody::NoBody, }, @@ -76313,7 +85162,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2364), +======= + id: DeclarationId(2371), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -76332,7 +85185,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 3305, 3352), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2365), +======= + id: DeclarationId(2372), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -76357,7 +85214,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 3357, 3418), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2366), +======= + id: DeclarationId(2373), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -76371,7 +85232,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 4297, 4302), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2367), +======= + id: DeclarationId(2374), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1125)], @@ -76389,7 +85254,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 5301, 5321), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2368), +======= + id: DeclarationId(2375), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1126), DeclarationId(1126)], @@ -76407,7 +85276,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 5334, 5360), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2369), +======= + id: DeclarationId(2376), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1120), @@ -76427,7 +85300,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 7360, 7372), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2370), +======= + id: DeclarationId(2377), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1124), @@ -76453,7 +85330,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 7388, 7419), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2371), +======= + id: DeclarationId(2378), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1127), @@ -76479,7 +85360,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 9093, 9124), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2372), +======= + id: DeclarationId(2379), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1120), @@ -76499,7 +85384,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 10144, 10156), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2373), +======= + id: DeclarationId(2380), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1135), @@ -76519,7 +85408,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4589, 4600), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2374), +======= + id: DeclarationId(2381), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1135), @@ -76539,7 +85432,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4642, 4653), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2375), +======= + id: DeclarationId(2382), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -76553,7 +85450,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4544, 4548), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2376), +======= + id: DeclarationId(2383), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -76572,12 +85473,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4553, 4563), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2377), +======= + id: DeclarationId(2384), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1153), }], }, @@ -76592,7 +85501,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1179, 1196), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2378), +======= + id: DeclarationId(2385), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -76611,12 +85524,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2379), +======= + id: DeclarationId(2386), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1145), }], }, @@ -76631,12 +85552,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1747, 1764), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2380), +======= + id: DeclarationId(2387), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), +<<<<<<< HEAD ty: DeclarationId(2379), +======= + ty: DeclarationId(2386), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -76650,12 +85579,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1736, 1765), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2381), +======= + id: DeclarationId(2388), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1142), }], }, @@ -76670,12 +85607,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1777, 1795), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2382), +======= + id: DeclarationId(2389), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), +<<<<<<< HEAD ty: DeclarationId(2381), +======= + ty: DeclarationId(2388), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -76689,7 +85634,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1770, 1796), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2383), +======= + id: DeclarationId(2390), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -76714,12 +85663,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2073, 2113), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2384), +======= + id: DeclarationId(2391), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1145), }], }, @@ -76734,7 +85691,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2165, 2182), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2385), +======= + id: DeclarationId(2392), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -76744,7 +85705,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), +<<<<<<< HEAD ty: DeclarationId(2384), +======= + ty: DeclarationId(2391), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "span".to_string(), @@ -76763,7 +85728,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2118, 2211), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2386), +======= + id: DeclarationId(2393), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -76788,12 +85757,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2216, 2280), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2387), +======= + id: DeclarationId(2394), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1145), }], }, @@ -76808,13 +85785,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2307, 2324), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2388), +======= + id: DeclarationId(2395), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "inputs".to_string(), +<<<<<<< HEAD ty: DeclarationId(2387), +======= + ty: DeclarationId(2394), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "output".to_string(), @@ -76837,7 +85822,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2285, 2379), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2389), +======= + id: DeclarationId(2396), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -76862,7 +85851,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3749, 3795), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2390), +======= + id: DeclarationId(2397), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -76891,12 +85884,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3800, 3883), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2391), +======= + id: DeclarationId(2398), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1149), }], }, @@ -76911,7 +85912,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3937, 3962), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2392), +======= + id: DeclarationId(2399), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -76921,7 +85926,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fields".to_string(), +<<<<<<< HEAD ty: DeclarationId(2391), +======= + ty: DeclarationId(2398), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "span".to_string(), @@ -76940,7 +85949,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3888, 3991), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2393), +======= + id: DeclarationId(2400), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -76959,7 +85972,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4663, 4674), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2394), +======= + id: DeclarationId(2401), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -76978,7 +85995,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4679, 4689), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2395), +======= + id: DeclarationId(2402), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -76997,7 +86018,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4694, 4708), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2396), +======= + id: DeclarationId(2403), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -77022,7 +86047,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4822, 4873), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2397), +======= + id: DeclarationId(2404), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -77047,7 +86076,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4878, 4916), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2398), +======= + id: DeclarationId(2405), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -77067,7 +86100,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4944, 4956), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2399), +======= + id: DeclarationId(2406), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -77087,17 +86124,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4978, 4994), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2400), +======= + id: DeclarationId(2407), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "segments".to_string(), +<<<<<<< HEAD ty: DeclarationId(2398), }, Field { label: "segment_spans".to_string(), ty: DeclarationId(2399), +======= + ty: DeclarationId(2405), + }, + Field { + label: "segment_spans".to_string(), + ty: DeclarationId(2406), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "span".to_string(), @@ -77116,12 +86165,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4921, 5023), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2401), +======= + id: DeclarationId(2408), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1152), }], }, @@ -77136,6 +86193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5068, 5085), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2402), name: None, connective: TypeConnective::Conj { @@ -77328,12 +86386,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(2410), +======= + id: DeclarationId(2409), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ Field { +<<<<<<< HEAD label: "op".to_string(), ty: DeclarationId(806), +======= + label: "target".to_string(), + ty: DeclarationId(230), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "args".to_string(), @@ -77353,7 +86419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 5908, 6000), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 5028, 5114), }); declarations.push(Declaration { id: DeclarationId(2411), @@ -77373,16 +86439,211 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 6028, 6040), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 5685, 5697), + }); + declarations.push(Declaration { + id: DeclarationId(2412), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(159), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/parse_surface.dag", 5719, 5735), }); declarations.push(Declaration { id: DeclarationId(2412), name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(1152), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/parse_surface.dag", 5748, 5765), + }); + declarations.push(Declaration { + id: DeclarationId(2413), + name: None, + connective: TypeConnective::Conj { + children: vec![ + Field { + label: "segments".to_string(), + ty: DeclarationId(2410), + }, + Field { + label: "segment_spans".to_string(), + ty: DeclarationId(2411), + }, + Field { + label: "args".to_string(), + ty: DeclarationId(2412), + }, + Field { + label: "span".to_string(), + ty: DeclarationId(159), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/parse_surface.dag", 5658, 5794), + }); + declarations.push(Declaration { + id: DeclarationId(2414), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(1146), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/parse_surface.dag", 5850, 5874), + }); + declarations.push(Declaration { + id: DeclarationId(2415), + name: None, + connective: TypeConnective::Conj { + children: vec![ + Field { + label: "target".to_string(), + ty: DeclarationId(230), + }, + Field { + label: "fields".to_string(), + ty: DeclarationId(2414), + }, + Field { + label: "span".to_string(), + ty: DeclarationId(159), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/parse_surface.dag", 5799, 5903), + }); + declarations.push(Declaration { + id: DeclarationId(2416), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(1152), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/parse_surface.dag", 5954, 5971), + }); + declarations.push(Declaration { + id: DeclarationId(2417), + name: None, + connective: TypeConnective::Conj { + children: vec![ + Field { + label: "op".to_string(), + ty: DeclarationId(805), + }, + Field { + label: "args".to_string(), + ty: DeclarationId(2416), + }, + Field { + label: "span".to_string(), + ty: DeclarationId(159), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/parse_surface.dag", 5908, 6000), + }); + declarations.push(Declaration { + id: DeclarationId(2418), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/parse_surface.dag", 6028, 6040), + }); + declarations.push(Declaration { + id: DeclarationId(2419), + name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "params".to_string(), +<<<<<<< HEAD ty: DeclarationId(2411), +======= + ty: DeclarationId(2418), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "body".to_string(), @@ -77405,7 +86666,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6005, 6093), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2413), +======= + id: DeclarationId(2420), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -77438,12 +86703,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6098, 6217), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2414), +======= + id: DeclarationId(2421), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1148), }], }, @@ -77458,7 +86731,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6271, 6292), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2415), +======= + id: DeclarationId(2422), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -77468,7 +86745,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "arms".to_string(), +<<<<<<< HEAD ty: DeclarationId(2414), +======= + ty: DeclarationId(2421), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "span".to_string(), @@ -77487,12 +86768,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6222, 6321), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2416), +======= + id: DeclarationId(2423), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1146), }], }, @@ -77507,13 +86796,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6349, 6373), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2417), +======= + id: DeclarationId(2424), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "fields".to_string(), +<<<<<<< HEAD ty: DeclarationId(2416), +======= + ty: DeclarationId(2423), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "span".to_string(), @@ -77532,12 +86829,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6326, 6402), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2418), +======= + id: DeclarationId(2425), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1152), }], }, @@ -77552,13 +86857,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6430, 6447), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2419), +======= + id: DeclarationId(2426), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "elements".to_string(), +<<<<<<< HEAD ty: DeclarationId(2418), +======= + ty: DeclarationId(2425), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "span".to_string(), @@ -77577,12 +86890,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6407, 6476), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2420), +======= + id: DeclarationId(2427), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1147), }], }, @@ -77597,13 +86918,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 8570, 8591), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2421), +======= + id: DeclarationId(2428), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "entries".to_string(), +<<<<<<< HEAD ty: DeclarationId(2420), +======= + ty: DeclarationId(2427), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "span".to_string(), @@ -77622,7 +86951,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 8549, 8620), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2422), +======= + id: DeclarationId(2429), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -77641,7 +86974,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2423), +======= + id: DeclarationId(2430), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -77651,7 +86988,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_ann".to_string(), +<<<<<<< HEAD ty: DeclarationId(2422), +======= + ty: DeclarationId(2429), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "expr".to_string(), @@ -77670,7 +87011,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9510, 9593), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2424), +======= + id: DeclarationId(2431), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -77690,12 +87035,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9641, 9653), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2425), +======= + id: DeclarationId(2432), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1141), }], }, @@ -77710,7 +87063,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9668, 9686), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2426), +======= + id: DeclarationId(2433), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -77720,7 +87077,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), +<<<<<<< HEAD ty: DeclarationId(2424), +======= + ty: DeclarationId(2431), + }, + Field { + label: "params".to_string(), + ty: DeclarationId(2432), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "params".to_string(), @@ -77751,7 +87116,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9598, 9770), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2427), +======= + id: DeclarationId(2434), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -77771,12 +87140,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9830, 9842), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2428), +======= + id: DeclarationId(2435), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1141), }], }, @@ -77791,7 +87168,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9857, 9875), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2429), +======= + id: DeclarationId(2436), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -77801,7 +87182,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), +<<<<<<< HEAD ty: DeclarationId(2427), +======= + ty: DeclarationId(2434), + }, + Field { + label: "params".to_string(), + ty: DeclarationId(2435), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "params".to_string(), @@ -77832,7 +87221,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9775, 9963), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2430), +======= + id: DeclarationId(2437), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -77851,7 +87244,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2431), +======= + id: DeclarationId(2438), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -77865,7 +87262,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "body".to_string(), +<<<<<<< HEAD ty: DeclarationId(2430), +======= + ty: DeclarationId(2437), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "body_span".to_string(), @@ -77888,7 +87289,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9968, 10097), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2432), +======= + id: DeclarationId(2439), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -77908,6 +87313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10117, 10129), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2433), name: None, connective: TypeConnective::Conj { @@ -78092,10 +87498,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(2441), +======= + id: DeclarationId(2440), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ Field { +<<<<<<< HEAD label: "name".to_string(), ty: DeclarationId(230), }, @@ -78106,6 +87516,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "fields".to_string(), ty: DeclarationId(2440), +======= + label: "path".to_string(), + ty: DeclarationId(2439), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "span".to_string(), @@ -78121,7 +87535,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10342, 10467), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10102, 10149), }); declarations.push(Declaration { id: DeclarationId(2442), @@ -78141,7 +87555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10520, 10532), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10175, 10187), }); declarations.push(Declaration { id: DeclarationId(2443), @@ -78149,8 +87563,204 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), value: DeclarationId(1143), +======= + parameter: DeclarationId(686), + value: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10201, 10213), + }); + declarations.push(Declaration { + id: DeclarationId(2443), + name: None, + connective: TypeConnective::Conj { + children: vec![ + Field { + label: "path".to_string(), + ty: DeclarationId(2441), + }, + Field { + label: "names".to_string(), + ty: DeclarationId(2442), + }, + Field { + label: "span".to_string(), + ty: DeclarationId(159), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10154, 10242), + }); + declarations.push(Declaration { + id: DeclarationId(2444), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10296, 10308), + }); + declarations.push(Declaration { + id: DeclarationId(2445), + name: None, + connective: TypeConnective::Conj { + children: vec![ + Field { + label: "name".to_string(), + ty: DeclarationId(230), + }, + Field { + label: "type_params".to_string(), + ty: DeclarationId(2444), + }, + Field { + label: "span".to_string(), + ty: DeclarationId(159), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10247, 10337), + }); + declarations.push(Declaration { + id: DeclarationId(2446), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10393, 10405), + }); + declarations.push(Declaration { + id: DeclarationId(2447), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(1142), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10420, 10438), + }); + declarations.push(Declaration { + id: DeclarationId(2448), + name: None, + connective: TypeConnective::Conj { + children: vec![ + Field { + label: "name".to_string(), + ty: DeclarationId(230), + }, + Field { + label: "type_params".to_string(), + ty: DeclarationId(2446), + }, + Field { + label: "fields".to_string(), + ty: DeclarationId(2447), + }, + Field { + label: "span".to_string(), + ty: DeclarationId(159), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10342, 10467), + }); + declarations.push(Declaration { + id: DeclarationId(2449), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10520, 10532), + }); + declarations.push(Declaration { + id: DeclarationId(2450), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(1143), }], }, type_params: vec![], @@ -78164,7 +87774,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10549, 10569), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2444), +======= + id: DeclarationId(2451), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -78183,7 +87797,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2445), +======= + id: DeclarationId(2452), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -78193,11 +87811,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), +<<<<<<< HEAD ty: DeclarationId(2442), }, Field { label: "variants".to_string(), ty: DeclarationId(2443), +======= + ty: DeclarationId(2449), + }, + Field { + label: "variants".to_string(), + ty: DeclarationId(2450), + }, + Field { + label: "inhabits".to_string(), + ty: DeclarationId(2451), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "inhabits".to_string(), @@ -78220,7 +87850,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10472, 10627), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2446), +======= + id: DeclarationId(2453), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -78240,7 +87874,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10682, 10694), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2447), +======= + id: DeclarationId(2454), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -78259,7 +87897,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2448), +======= + id: DeclarationId(2455), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -78269,7 +87911,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), +<<<<<<< HEAD ty: DeclarationId(2446), +======= + ty: DeclarationId(2453), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "nominal_opaque".to_string(), @@ -78281,7 +87927,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "refinement".to_string(), +<<<<<<< HEAD ty: DeclarationId(2447), +======= + ty: DeclarationId(2454), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "span".to_string(), @@ -78300,12 +87950,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10632, 10807), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2449), +======= + id: DeclarationId(2456), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1046), }], }, @@ -78324,12 +87982,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2450), +======= + id: DeclarationId(2457), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1167), }], }, @@ -78344,7 +88010,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 11243, 11254), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2451), +======= + id: DeclarationId(2458), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -78363,12 +88033,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2137, 2162), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2452), +======= + id: DeclarationId(2459), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1166), }], }, @@ -78383,12 +88061,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2179, 2195), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2453), +======= + id: DeclarationId(2460), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), +<<<<<<< HEAD ty: DeclarationId(2452), +======= + ty: DeclarationId(2459), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -78402,7 +88088,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2167, 2196), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2454), +======= + id: DeclarationId(2461), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -78427,7 +88117,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2201, 2252), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2455), +======= + id: DeclarationId(2462), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -78446,7 +88140,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2257, 2272), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2456), +======= + id: DeclarationId(2463), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -78465,7 +88163,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2277, 2304), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2457), +======= + id: DeclarationId(2464), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -78491,12 +88193,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 3936, 3954), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2458), +======= + id: DeclarationId(2465), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1170), }], }, @@ -78511,7 +88221,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 4542, 4557), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2459), +======= + id: DeclarationId(2466), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -78530,7 +88244,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 5388, 5442), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2460), +======= + id: DeclarationId(2467), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78544,7 +88262,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 5682, 5691), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2461), +======= + id: DeclarationId(2468), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78558,12 +88280,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 5694, 5704), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2462), +======= + id: DeclarationId(2469), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1046), }], }, @@ -78578,7 +88308,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5765, 5793), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2463), +======= + id: DeclarationId(2470), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -78604,7 +88338,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 6801, 6824), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2464), +======= + id: DeclarationId(2471), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(976), @@ -78624,7 +88362,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2465), +======= + id: DeclarationId(2472), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(976), @@ -78644,7 +88386,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4510, 4536), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2466), +======= + id: DeclarationId(2473), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -78664,7 +88410,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4804, 4821), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2467), +======= + id: DeclarationId(2474), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -78684,7 +88434,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4872, 4886), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2468), +======= + id: DeclarationId(2475), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -78704,7 +88458,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4936, 4949), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2469), +======= + id: DeclarationId(2476), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -78724,12 +88482,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4999, 5012), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2470), +======= + id: DeclarationId(2477), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(974), }], }, @@ -78744,7 +88510,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5060, 5076), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2471), +======= + id: DeclarationId(2478), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(976), @@ -78764,13 +88534,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5129, 5155), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2472), +======= + id: DeclarationId(2479), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), value: DeclarationId(2471), +======= + parameter: DeclarationId(686), + value: DeclarationId(2478), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -78784,7 +88563,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5124, 5156), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2473), +======= + id: DeclarationId(2480), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(976), @@ -78804,13 +88587,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5230, 5256), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2474), +======= + id: DeclarationId(2481), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), value: DeclarationId(2473), +======= + parameter: DeclarationId(686), + value: DeclarationId(2480), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -78824,12 +88616,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5225, 5257), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2475), +======= + id: DeclarationId(2482), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(974), }], }, @@ -78844,7 +88644,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5382, 5398), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2476), +======= + id: DeclarationId(2483), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(979), @@ -78864,7 +88668,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5523, 5557), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2477), +======= + id: DeclarationId(2484), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(979), @@ -78884,7 +88692,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5769, 5803), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2478), +======= + id: DeclarationId(2485), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(979), @@ -78904,7 +88716,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6288, 6322), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2479), +======= + id: DeclarationId(2486), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(979), @@ -78924,7 +88740,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6549, 6583), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2480), +======= + id: DeclarationId(2487), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(979), @@ -78944,7 +88764,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6839, 6873), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2481), +======= + id: DeclarationId(2488), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(976), @@ -78964,7 +88788,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7053, 7079), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2482), +======= + id: DeclarationId(2489), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(979), @@ -78984,7 +88812,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7084, 7118), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2483), +======= + id: DeclarationId(2490), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(979), @@ -79004,6 +88836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8353, 8387), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2484), name: None, connective: TypeConnective::Instantiation { @@ -79148,6 +88981,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: None, connective: TypeConnective::Instantiation { template: DeclarationId(2260), +======= + id: DeclarationId(2491), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(2267), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) arguments: vec![TemplateArgument { parameter: DeclarationId(977), value: DeclarationId(1229), @@ -79167,7 +89006,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(2492), name: None, connective: TypeConnective::Instantiation { +<<<<<<< HEAD template: DeclarationId(2260), +======= + template: DeclarationId(2267), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) arguments: vec![TemplateArgument { parameter: DeclarationId(977), value: DeclarationId(1229), @@ -79187,7 +89030,171 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(2493), name: None, connective: TypeConnective::Instantiation { +<<<<<<< HEAD template: DeclarationId(2260), +======= + template: DeclarationId(2267), + arguments: vec![TemplateArgument { + parameter: DeclarationId(977), + value: DeclarationId(1229), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), + }); + declarations.push(Declaration { + id: DeclarationId(2494), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(2267), + arguments: vec![TemplateArgument { + parameter: DeclarationId(977), + value: DeclarationId(1229), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), + }); + declarations.push(Declaration { + id: DeclarationId(2495), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(2267), + arguments: vec![TemplateArgument { + parameter: DeclarationId(977), + value: DeclarationId(1229), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), + }); + declarations.push(Declaration { + id: DeclarationId(2496), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(2267), + arguments: vec![TemplateArgument { + parameter: DeclarationId(977), + value: DeclarationId(1229), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), + }); + declarations.push(Declaration { + id: DeclarationId(2497), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(2267), + arguments: vec![TemplateArgument { + parameter: DeclarationId(977), + value: DeclarationId(1229), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), + }); + declarations.push(Declaration { + id: DeclarationId(2498), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(2267), + arguments: vec![TemplateArgument { + parameter: DeclarationId(977), + value: DeclarationId(1229), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), + }); + declarations.push(Declaration { + id: DeclarationId(2499), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(2267), + arguments: vec![TemplateArgument { + parameter: DeclarationId(977), + value: DeclarationId(1229), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), + }); + declarations.push(Declaration { + id: DeclarationId(2500), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(2267), + arguments: vec![TemplateArgument { + parameter: DeclarationId(977), + value: DeclarationId(1229), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), + }); + declarations.push(Declaration { + id: DeclarationId(2501), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(1783), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) arguments: vec![TemplateArgument { parameter: DeclarationId(977), value: DeclarationId(1229), @@ -79224,7 +89231,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4804, 4821), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2495), +======= + id: DeclarationId(2502), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1783), @@ -79244,7 +89255,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4872, 4886), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2496), +======= + id: DeclarationId(2503), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1783), @@ -79264,7 +89279,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4936, 4949), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2497), +======= + id: DeclarationId(2504), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1783), @@ -79284,12 +89303,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4999, 5012), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2498), +======= + id: DeclarationId(2505), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1783), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(974), }], }, @@ -79304,13 +89331,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5060, 5076), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2499), +======= + id: DeclarationId(2506), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1783), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), value: DeclarationId(2471), +======= + parameter: DeclarationId(686), + value: DeclarationId(2478), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -79324,13 +89360,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5124, 5156), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2500), +======= + id: DeclarationId(2507), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1785), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), value: DeclarationId(2473), +======= + parameter: DeclarationId(686), + value: DeclarationId(2480), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -79344,10 +89389,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5225, 5257), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2501), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(2260), +======= + id: DeclarationId(2508), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(2267), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) arguments: vec![TemplateArgument { parameter: DeclarationId(977), value: DeclarationId(1229), @@ -79364,12 +89416,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5230, 5256), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2502), +======= + id: DeclarationId(2509), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1785), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(974), }], }, @@ -79384,10 +89444,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5382, 5398), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2503), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(2266), +======= + id: DeclarationId(2510), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(2273), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) arguments: vec![TemplateArgument { parameter: DeclarationId(980), value: DeclarationId(1229), @@ -79404,10 +89471,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5523, 5557), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2504), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(2270), +======= + id: DeclarationId(2511), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(2277), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) arguments: vec![TemplateArgument { parameter: DeclarationId(980), value: DeclarationId(1229), @@ -79424,7 +89498,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5769, 5803), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2505), +======= + id: DeclarationId(2512), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79443,7 +89521,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2506), +======= + id: DeclarationId(2513), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79462,7 +89544,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2507), +======= + id: DeclarationId(2514), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79481,7 +89567,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2508), +======= + id: DeclarationId(2515), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -79507,7 +89597,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2732, 2760), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2509), +======= + id: DeclarationId(2516), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -79533,7 +89627,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2804, 2832), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2510), +======= + id: DeclarationId(2517), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79552,7 +89650,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2511), +======= + id: DeclarationId(2518), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79571,7 +89673,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2512), +======= + id: DeclarationId(2519), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(11), @@ -79597,7 +89703,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 12353, 12399), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2513), +======= + id: DeclarationId(2520), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79611,7 +89721,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 767, 773), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2514), +======= + id: DeclarationId(2521), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79625,7 +89739,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 778, 791), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2515), +======= + id: DeclarationId(2522), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79639,7 +89757,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 796, 810), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2516), +======= + id: DeclarationId(2523), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79658,7 +89779,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3332, 3358), }); declarations.push(Declaration { - id: DeclarationId(2517), + id: DeclarationId(2524), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "param".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/termination.dag", 3332, 3358), + }); + declarations.push(Declaration { + id: DeclarationId(2525), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79677,7 +89818,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3363, 3391), }); declarations.push(Declaration { - id: DeclarationId(2518), + id: DeclarationId(2526), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79696,7 +89837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3396, 3429), }); declarations.push(Declaration { - id: DeclarationId(2519), + id: DeclarationId(2527), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79715,7 +89856,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3434, 3465), }); declarations.push(Declaration { - id: DeclarationId(2520), + id: DeclarationId(2528), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79748,7 +89889,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4509, 4516), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2522), +======= + id: DeclarationId(2529), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79767,7 +89912,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4521, 4571), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2523), +======= + id: DeclarationId(2530), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79781,7 +89930,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5484, 5495), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2524), +======= + id: DeclarationId(2531), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79800,7 +89953,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5500, 5545), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2525), +======= + id: DeclarationId(2532), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79819,7 +89976,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7649, 7683), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2526), +======= + id: DeclarationId(2533), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79838,7 +89999,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7688, 7732), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2527), +======= + id: DeclarationId(2534), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79857,7 +90022,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7737, 7795), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2528), +======= + id: DeclarationId(2535), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79876,7 +90045,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7800, 7856), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2529), +======= + id: DeclarationId(2536), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79895,7 +90068,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7861, 7894), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2530), +======= + id: DeclarationId(2537), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79914,7 +90091,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7899, 7929), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2531), +======= + id: DeclarationId(2538), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79928,12 +90109,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7934, 7947), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2532), +======= + id: DeclarationId(2539), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1211), }], }, @@ -79948,12 +90137,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7987, 8009), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2533), +======= + id: DeclarationId(2540), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1204), }], }, @@ -79968,7 +90165,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 8219, 8240), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2534), +======= + id: DeclarationId(2541), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79982,7 +90183,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 8740, 8746), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2535), +======= + id: DeclarationId(2542), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79996,7 +90201,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 9139, 9152), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2536), +======= + id: DeclarationId(2543), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80010,7 +90219,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 9157, 9171), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2537), +======= + id: DeclarationId(2544), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -80029,7 +90242,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 10263, 10297), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2538), +======= + id: DeclarationId(2545), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80043,7 +90260,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 10302, 10320), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2539), +======= + id: DeclarationId(2546), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -80069,6 +90290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 11234, 11261), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2540), name: None, connective: TypeConnective::Instantiation { @@ -80196,6 +90418,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { template: DeclarationId(1783), arguments: vec![TemplateArgument { parameter: DeclarationId(687), +======= + id: DeclarationId(2547), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(970), }], }, @@ -80213,7 +90443,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(2548), name: None, connective: TypeConnective::Instantiation { +<<<<<<< HEAD template: DeclarationId(2260), +======= + template: DeclarationId(976), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) arguments: vec![TemplateArgument { parameter: DeclarationId(977), value: DeclarationId(1229), @@ -80232,11 +90466,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { declarations.push(Declaration { id: DeclarationId(2549), name: None, +<<<<<<< HEAD connective: TypeConnective::Instantiation { template: DeclarationId(2260), arguments: vec![TemplateArgument { parameter: DeclarationId(977), value: DeclarationId(1229), +======= + connective: TypeConnective::Conj { + children: vec![Field { + label: "duration".to_string(), + ty: DeclarationId(1228), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -80247,11 +90488,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), + span: SourceSpan::new("src/v3/std/timing_lens.dag", 4004, 4038), }); declarations.push(Declaration { id: DeclarationId(2550), name: None, +<<<<<<< HEAD connective: TypeConnective::Instantiation { template: DeclarationId(2260), arguments: vec![TemplateArgument { @@ -80259,6 +90501,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(1229), }], }, +======= + connective: TypeConnective::Conj { children: vec![] }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -80267,11 +90512,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), + span: SourceSpan::new("src/v3/std/timing_lens.dag", 4043, 4053), }); declarations.push(Declaration { id: DeclarationId(2551), name: None, +<<<<<<< HEAD connective: TypeConnective::Instantiation { template: DeclarationId(2260), arguments: vec![TemplateArgument { @@ -80279,6 +90525,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(1229), }], }, +======= + connective: TypeConnective::Conj { children: vec![] }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -80287,11 +90536,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), + span: SourceSpan::new("src/v3/std/timing_lens.dag", 4058, 4067), }); declarations.push(Declaration { id: DeclarationId(2552), name: None, +<<<<<<< HEAD connective: TypeConnective::Instantiation { template: DeclarationId(2260), arguments: vec![TemplateArgument { @@ -80299,6 +90549,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(1229), }], }, +======= + connective: TypeConnective::Conj { children: vec![] }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -80307,16 +90560,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), + span: SourceSpan::new("src/v3/std/timing_lens.dag", 4072, 4077), }); declarations.push(Declaration { id: DeclarationId(2553), name: None, connective: TypeConnective::Instantiation { +<<<<<<< HEAD template: DeclarationId(2260), arguments: vec![TemplateArgument { parameter: DeclarationId(977), value: DeclarationId(1229), +======= + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(1232), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -80327,16 +90587,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), + span: SourceSpan::new("src/v3/std/timing_lens.dag", 5915, 5943), }); declarations.push(Declaration { id: DeclarationId(2554), name: None, connective: TypeConnective::Instantiation { +<<<<<<< HEAD template: DeclarationId(2260), arguments: vec![TemplateArgument { parameter: DeclarationId(977), value: DeclarationId(1229), +======= + template: DeclarationId(1783), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(970), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -80347,13 +90614,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), + span: SourceSpan::new("src/v3/std/timing_lens.dag", 7946, 7962), }); declarations.push(Declaration { id: DeclarationId(2555), name: None, connective: TypeConnective::Instantiation { +<<<<<<< HEAD template: DeclarationId(2260), +======= + template: DeclarationId(2267), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) arguments: vec![TemplateArgument { parameter: DeclarationId(977), value: DeclarationId(1229), @@ -80373,7 +90644,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(2556), name: None, connective: TypeConnective::Instantiation { +<<<<<<< HEAD template: DeclarationId(2260), +======= + template: DeclarationId(2267), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) arguments: vec![TemplateArgument { parameter: DeclarationId(977), value: DeclarationId(1229), @@ -80393,7 +90668,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(2557), name: None, connective: TypeConnective::Instantiation { +<<<<<<< HEAD template: DeclarationId(2260), +======= + template: DeclarationId(2267), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) arguments: vec![TemplateArgument { parameter: DeclarationId(977), value: DeclarationId(1229), @@ -80412,7 +90691,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { declarations.push(Declaration { id: DeclarationId(2558), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Instantiation { + template: DeclarationId(2267), + arguments: vec![TemplateArgument { + parameter: DeclarationId(977), + value: DeclarationId(1229), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -80421,12 +90706,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651), +======= + span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2559), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Instantiation { + template: DeclarationId(2267), + arguments: vec![TemplateArgument { + parameter: DeclarationId(977), + value: DeclarationId(1229), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -80435,12 +90730,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660), +======= + span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2560), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Instantiation { + template: DeclarationId(2267), + arguments: vec![TemplateArgument { + parameter: DeclarationId(977), + value: DeclarationId(1229), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -80449,12 +90754,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671), +======= + span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2561), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Instantiation { + template: DeclarationId(2267), + arguments: vec![TemplateArgument { + parameter: DeclarationId(977), + value: DeclarationId(1229), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -80463,12 +90778,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682), +======= + span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2562), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Instantiation { + template: DeclarationId(2267), + arguments: vec![TemplateArgument { + parameter: DeclarationId(977), + value: DeclarationId(1229), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -80477,12 +90802,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691), +======= + span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2563), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Instantiation { + template: DeclarationId(2267), + arguments: vec![TemplateArgument { + parameter: DeclarationId(977), + value: DeclarationId(1229), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -80491,12 +90826,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702), +======= + span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2564), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Instantiation { + template: DeclarationId(2267), + arguments: vec![TemplateArgument { + parameter: DeclarationId(977), + value: DeclarationId(1229), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -80505,7 +90850,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715), +======= + span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2565), @@ -80519,7 +90868,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728), +======= + span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2566), @@ -80533,7 +90886,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740), +======= + span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2567), @@ -80547,7 +90904,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751), +======= + span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2568), @@ -80561,7 +90922,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763), +======= + span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2569), @@ -80575,12 +90940,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("src/v3/std/tokenize.dag", 768, 774), +======= + span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2570), name: None, connective: TypeConnective::Conj { children: vec![] }, +<<<<<<< HEAD +======= type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -80589,11 +90960,129 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/tokenize.dag", 779, 786), + span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702), }); declarations.push(Declaration { id: DeclarationId(2571), name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715), + }); + declarations.push(Declaration { + id: DeclarationId(2572), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728), + }); + declarations.push(Declaration { + id: DeclarationId(2573), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740), + }); + declarations.push(Declaration { + id: DeclarationId(2574), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751), + }); + declarations.push(Declaration { + id: DeclarationId(2575), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763), + }); + declarations.push(Declaration { + id: DeclarationId(2576), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/tokenize.dag", 768, 774), + }); + declarations.push(Declaration { + id: DeclarationId(2577), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/tokenize.dag", 779, 786), + }); + declarations.push(Declaration { + id: DeclarationId(2578), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/tokenize.dag", 779, 786), + }); + declarations.push(Declaration { + id: DeclarationId(2579), + name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), @@ -80611,7 +91100,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 791, 804), }); declarations.push(Declaration { - id: DeclarationId(2572), + id: DeclarationId(2580), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -80630,7 +91119,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 889, 903), }); declarations.push(Declaration { - id: DeclarationId(2573), + id: DeclarationId(2581), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -80649,7 +91138,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 925), }); declarations.push(Declaration { - id: DeclarationId(2574), + id: DeclarationId(2582), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80663,7 +91152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 930, 932), }); declarations.push(Declaration { - id: DeclarationId(2575), + id: DeclarationId(2583), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80677,7 +91166,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 937, 941), }); declarations.push(Declaration { - id: DeclarationId(2576), + id: DeclarationId(2584), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80691,7 +91180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 946, 951), }); declarations.push(Declaration { - id: DeclarationId(2577), + id: DeclarationId(2585), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80705,7 +91194,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 956, 958), }); declarations.push(Declaration { - id: DeclarationId(2578), + id: DeclarationId(2586), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80719,7 +91208,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 963, 965), }); declarations.push(Declaration { - id: DeclarationId(2579), + id: DeclarationId(2587), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80733,7 +91222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 970, 972), }); declarations.push(Declaration { - id: DeclarationId(2580), + id: DeclarationId(2588), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80747,7 +91236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 979), }); declarations.push(Declaration { - id: DeclarationId(2581), + id: DeclarationId(2589), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80761,7 +91250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 984, 988), }); declarations.push(Declaration { - id: DeclarationId(2582), + id: DeclarationId(2590), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80775,7 +91264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 993, 998), }); declarations.push(Declaration { - id: DeclarationId(2583), + id: DeclarationId(2591), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80789,7 +91278,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1003, 1007), }); declarations.push(Declaration { - id: DeclarationId(2584), + id: DeclarationId(2592), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80803,7 +91292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1012, 1017), }); declarations.push(Declaration { - id: DeclarationId(2585), + id: DeclarationId(2593), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80817,7 +91306,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1022, 1028), }); declarations.push(Declaration { - id: DeclarationId(2586), + id: DeclarationId(2594), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80831,7 +91320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1033, 1041), }); declarations.push(Declaration { - id: DeclarationId(2587), + id: DeclarationId(2595), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80845,7 +91334,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1046, 1051), }); declarations.push(Declaration { - id: DeclarationId(2588), + id: DeclarationId(2596), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80859,7 +91348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1056, 1061), }); declarations.push(Declaration { - id: DeclarationId(2589), + id: DeclarationId(2597), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80873,7 +91362,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1066, 1074), }); declarations.push(Declaration { - id: DeclarationId(2590), + id: DeclarationId(2598), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80887,7 +91376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1079, 1088), }); declarations.push(Declaration { - id: DeclarationId(2591), + id: DeclarationId(2599), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80901,7 +91390,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1093, 1096), }); declarations.push(Declaration { - id: DeclarationId(2592), + id: DeclarationId(2600), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80915,7 +91404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1101, 1107), }); declarations.push(Declaration { - id: DeclarationId(2593), + id: DeclarationId(2601), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80929,7 +91418,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1118), }); declarations.push(Declaration { - id: DeclarationId(2594), + id: DeclarationId(2602), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80943,7 +91432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1123, 1129), }); declarations.push(Declaration { - id: DeclarationId(2595), + id: DeclarationId(2603), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80957,7 +91446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1134, 1140), }); declarations.push(Declaration { - id: DeclarationId(2596), + id: DeclarationId(2604), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80971,7 +91460,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1145, 1153), }); declarations.push(Declaration { - id: DeclarationId(2597), + id: DeclarationId(2605), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80985,7 +91474,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1158, 1166), }); declarations.push(Declaration { - id: DeclarationId(2598), + id: DeclarationId(2606), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80999,7 +91488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1171, 1176), }); declarations.push(Declaration { - id: DeclarationId(2599), + id: DeclarationId(2607), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81013,7 +91502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1181, 1190), }); declarations.push(Declaration { - id: DeclarationId(2600), + id: DeclarationId(2608), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81027,7 +91516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1195, 1199), }); declarations.push(Declaration { - id: DeclarationId(2601), + id: DeclarationId(2609), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81041,7 +91530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1204, 1212), }); declarations.push(Declaration { - id: DeclarationId(2602), + id: DeclarationId(2610), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81055,7 +91544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1217, 1220), }); declarations.push(Declaration { - id: DeclarationId(2603), + id: DeclarationId(2611), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81069,7 +91558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1791, 1796), }); declarations.push(Declaration { - id: DeclarationId(2604), + id: DeclarationId(2612), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81083,7 +91572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1801, 1805), }); declarations.push(Declaration { - id: DeclarationId(2605), + id: DeclarationId(2613), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81097,7 +91586,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1816), }); declarations.push(Declaration { - id: DeclarationId(2606), + id: DeclarationId(2614), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81111,7 +91600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1821, 1827), }); declarations.push(Declaration { - id: DeclarationId(2607), + id: DeclarationId(2615), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81125,7 +91614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1832, 1836), }); declarations.push(Declaration { - id: DeclarationId(2608), + id: DeclarationId(2616), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81139,7 +91628,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1841, 1847), }); declarations.push(Declaration { - id: DeclarationId(2609), + id: DeclarationId(2617), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81153,7 +91642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1852, 1860), }); declarations.push(Declaration { - id: DeclarationId(2610), + id: DeclarationId(2618), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81167,7 +91656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1865, 1873), }); declarations.push(Declaration { - id: DeclarationId(2611), + id: DeclarationId(2619), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81181,7 +91670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1878, 1885), }); declarations.push(Declaration { - id: DeclarationId(2612), + id: DeclarationId(2620), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81195,7 +91684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1890, 1896), }); declarations.push(Declaration { - id: DeclarationId(2613), + id: DeclarationId(2621), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81209,7 +91698,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1901, 1908), }); declarations.push(Declaration { - id: DeclarationId(2614), + id: DeclarationId(2622), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81223,7 +91712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1913, 1919), }); declarations.push(Declaration { - id: DeclarationId(2615), + id: DeclarationId(2623), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81237,7 +91726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1924, 1931), }); declarations.push(Declaration { - id: DeclarationId(2616), + id: DeclarationId(2624), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81251,7 +91740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2371, 2373), }); declarations.push(Declaration { - id: DeclarationId(2617), + id: DeclarationId(2625), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81265,7 +91754,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2378, 2382), }); declarations.push(Declaration { - id: DeclarationId(2618), + id: DeclarationId(2626), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81279,7 +91768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2387, 2392), }); declarations.push(Declaration { - id: DeclarationId(2619), + id: DeclarationId(2627), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81293,7 +91782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2397, 2399), }); declarations.push(Declaration { - id: DeclarationId(2620), + id: DeclarationId(2628), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81307,7 +91796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2404, 2406), }); declarations.push(Declaration { - id: DeclarationId(2621), + id: DeclarationId(2629), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81321,7 +91810,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2411, 2413), }); declarations.push(Declaration { - id: DeclarationId(2622), + id: DeclarationId(2630), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81335,7 +91824,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2418, 2420), }); declarations.push(Declaration { - id: DeclarationId(2623), + id: DeclarationId(2631), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81349,7 +91838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2425, 2429), }); declarations.push(Declaration { - id: DeclarationId(2624), + id: DeclarationId(2632), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81363,7 +91852,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2434, 2439), }); declarations.push(Declaration { - id: DeclarationId(2625), + id: DeclarationId(2633), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81377,7 +91866,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2444, 2448), }); declarations.push(Declaration { - id: DeclarationId(2626), + id: DeclarationId(2634), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81391,7 +91880,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2453, 2458), }); declarations.push(Declaration { - id: DeclarationId(2627), + id: DeclarationId(2635), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81405,7 +91894,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2463, 2469), }); declarations.push(Declaration { - id: DeclarationId(2628), + id: DeclarationId(2636), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81419,7 +91908,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2474, 2482), }); declarations.push(Declaration { - id: DeclarationId(2629), + id: DeclarationId(2637), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81433,7 +91922,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2492), }); declarations.push(Declaration { - id: DeclarationId(2630), + id: DeclarationId(2638), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81447,7 +91936,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2497, 2502), }); declarations.push(Declaration { - id: DeclarationId(2631), + id: DeclarationId(2639), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81461,7 +91950,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2507, 2515), }); declarations.push(Declaration { - id: DeclarationId(2632), + id: DeclarationId(2640), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81475,7 +91964,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2529), }); declarations.push(Declaration { - id: DeclarationId(2633), + id: DeclarationId(2641), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81489,7 +91978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2534, 2537), }); declarations.push(Declaration { - id: DeclarationId(2634), + id: DeclarationId(2642), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81503,7 +91992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2542, 2548), }); declarations.push(Declaration { - id: DeclarationId(2635), + id: DeclarationId(2643), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81517,7 +92006,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2553, 2559), }); declarations.push(Declaration { - id: DeclarationId(2636), + id: DeclarationId(2644), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81531,7 +92020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2564, 2570), }); declarations.push(Declaration { - id: DeclarationId(2637), + id: DeclarationId(2645), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81545,7 +92034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2575, 2581), }); declarations.push(Declaration { - id: DeclarationId(2638), + id: DeclarationId(2646), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81559,7 +92048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2586, 2594), }); declarations.push(Declaration { - id: DeclarationId(2639), + id: DeclarationId(2647), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81573,7 +92062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2599, 2607), }); declarations.push(Declaration { - id: DeclarationId(2640), + id: DeclarationId(2648), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81587,7 +92076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2612, 2617), }); declarations.push(Declaration { - id: DeclarationId(2641), + id: DeclarationId(2649), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81601,7 +92090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2622, 2631), }); declarations.push(Declaration { - id: DeclarationId(2642), + id: DeclarationId(2650), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81615,7 +92104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2636, 2640), }); declarations.push(Declaration { - id: DeclarationId(2643), + id: DeclarationId(2651), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81634,7 +92123,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1165), }], }, @@ -81649,12 +92142,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 19158, 19181), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2645), +======= + id: DeclarationId(2652), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1274), }], }, @@ -81669,12 +92170,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 19383, 19398), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2646), +======= + id: DeclarationId(2653), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1279), }], }, @@ -81689,7 +92198,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 19403, 19423), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2647), +======= + id: DeclarationId(2654), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81703,7 +92216,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2480, 2494), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2648), +======= + id: DeclarationId(2655), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81717,7 +92234,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2499, 2509), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2649), +======= + id: DeclarationId(2656), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81731,7 +92252,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2514, 2526), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2650), +======= + id: DeclarationId(2657), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81745,7 +92270,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2531, 2544), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2651), +======= + id: DeclarationId(2658), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81759,7 +92288,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2549, 2561), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2652), +======= + id: DeclarationId(2659), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81773,7 +92306,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2566, 2578), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2653), +======= + id: DeclarationId(2660), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81787,7 +92324,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2583, 2605), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2654), +======= + id: DeclarationId(2661), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81801,7 +92342,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2610, 2629), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2655), +======= + id: DeclarationId(2662), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81815,7 +92360,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2634, 2659), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2656), +======= + id: DeclarationId(2663), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81829,7 +92378,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2664, 2687), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2657), +======= + id: DeclarationId(2664), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81843,7 +92396,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3093, 3102), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2658), +======= + id: DeclarationId(2665), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -81862,7 +92419,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3107, 3123), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2659), +======= + id: DeclarationId(2666), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81876,7 +92437,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3782, 3790), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2660), +======= + id: DeclarationId(2667), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81890,7 +92455,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3795, 3805), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2661), +======= + id: DeclarationId(2668), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81904,7 +92473,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4030, 4042), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2662), +======= + id: DeclarationId(2669), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81918,7 +92491,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4857, 4870), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2663), +======= + id: DeclarationId(2670), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81932,7 +92509,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4875, 4888), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2664), +======= + id: DeclarationId(2671), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81946,7 +92527,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4893, 4901), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2665), +======= + id: DeclarationId(2672), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -81971,7 +92556,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5446, 5513), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2666), +======= + id: DeclarationId(2673), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81985,7 +92574,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5538, 5546), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2667), +======= + id: DeclarationId(2674), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82004,7 +92597,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5551, 5591), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2668), +======= + id: DeclarationId(2675), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82023,7 +92620,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5596, 5629), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2669), +======= + id: DeclarationId(2676), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -82048,7 +92649,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5634, 5712), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2670), +======= + id: DeclarationId(2677), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82067,7 +92672,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5878, 5941), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2671), +======= + id: DeclarationId(2678), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -82096,7 +92705,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5946, 6037), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2672), +======= + id: DeclarationId(2679), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -82125,7 +92738,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 6042, 6174), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2673), +======= + id: DeclarationId(2680), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -82150,7 +92767,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 6389, 6478), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2674), +======= + id: DeclarationId(2681), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -82170,7 +92791,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 7278, 7290), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2675), +======= + id: DeclarationId(2682), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -82180,7 +92805,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), +<<<<<<< HEAD ty: DeclarationId(2674), +======= + ty: DeclarationId(2681), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "expect_exit_code".to_string(), @@ -82199,7 +92828,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 7227, 7324), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2676), +======= + id: DeclarationId(2683), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -82219,7 +92852,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 8024, 8036), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2677), +======= + id: DeclarationId(2684), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -82229,7 +92866,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), +<<<<<<< HEAD ty: DeclarationId(2676), +======= + ty: DeclarationId(2683), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "expect_exit_code".to_string(), @@ -82248,7 +92889,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 7974, 8070), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2678), +======= + id: DeclarationId(2685), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -82277,7 +92922,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 8368, 8490), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2679), +======= + id: DeclarationId(2686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -82306,7 +92955,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 8752, 8877), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2680), +======= + id: DeclarationId(2687), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82325,7 +92978,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 10930, 10991), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2681), +======= + id: DeclarationId(2688), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -82354,7 +93011,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 11345, 11477), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2682), +======= + id: DeclarationId(2689), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -82379,7 +93040,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 12044, 12156), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2683), +======= + id: DeclarationId(2690), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -82404,7 +93069,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 12853, 12932), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2684), +======= + id: DeclarationId(2691), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -82433,7 +93102,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13152, 13265), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2685), +======= + id: DeclarationId(2692), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -82462,7 +93135,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13270, 13406), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2686), +======= + id: DeclarationId(2693), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -82487,7 +93164,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13411, 13493), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2687), +======= + id: DeclarationId(2694), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -82512,12 +93193,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13498, 13584), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2688), +======= + id: DeclarationId(2695), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1254), }], }, @@ -82532,7 +93221,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13663, 13673), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2689), +======= + id: DeclarationId(2696), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -82542,7 +93235,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "generated_paths".to_string(), +<<<<<<< HEAD ty: DeclarationId(2688), +======= + ty: DeclarationId(2695), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -82557,7 +93254,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13589, 13679), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2690), +======= + id: DeclarationId(2697), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -82586,7 +93287,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14621, 14755), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2691), +======= + id: DeclarationId(2698), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -82615,7 +93320,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 15394, 15538), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2692), +======= + id: DeclarationId(2699), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82634,12 +93343,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 16383, 16437), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2693), +======= + id: DeclarationId(2700), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1165), }], }, @@ -82654,7 +93371,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 17481, 17504), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2694), +======= + id: DeclarationId(2701), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82668,7 +93389,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 17707, 17713), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2695), +======= + id: DeclarationId(2702), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82682,12 +93407,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 17718, 17724), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2696), +======= + id: DeclarationId(2703), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1165), }], }, @@ -82702,7 +93435,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 17862, 17885), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2697), +======= + id: DeclarationId(2704), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82721,7 +93458,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 18343, 18364), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2698), +======= + id: DeclarationId(2705), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82740,12 +93481,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 18369, 18400), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2699), +======= + id: DeclarationId(2706), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1274), }], }, @@ -82760,12 +93509,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 18444, 18459), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2700), +======= + id: DeclarationId(2707), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1165), }], }, @@ -82780,7 +93537,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 18715, 18738), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2701), +======= + id: DeclarationId(2708), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -82800,7 +93561,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2702), +======= + id: DeclarationId(2709), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82814,7 +93579,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 532, 547), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2703), +======= + id: DeclarationId(2710), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82828,7 +93597,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 550, 561), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2704), +======= + id: DeclarationId(2711), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82842,7 +93615,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2705), +======= + id: DeclarationId(2712), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -82861,7 +93638,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2706), +======= + id: DeclarationId(2713), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82875,7 +93656,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6428, 6446), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2707), +======= + id: DeclarationId(2714), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82889,7 +93674,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6451, 6466), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2708), +======= + id: DeclarationId(2715), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82903,7 +93692,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6495, 6518), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2709), +======= + id: DeclarationId(2716), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82917,7 +93710,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6523, 6544), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2710), +======= + id: DeclarationId(2717), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82931,7 +93728,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6549, 6564), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2711), +======= + id: DeclarationId(2718), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82945,7 +93746,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8177, 8187), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2712), +======= + id: DeclarationId(2719), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82959,7 +93764,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8192, 8203), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2713), +======= + id: DeclarationId(2720), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82973,7 +93782,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8208, 8221), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2714), +======= + id: DeclarationId(2721), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82987,7 +93800,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8226, 8239), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2715), +======= + id: DeclarationId(2722), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83001,7 +93818,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8244, 8257), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2716), +======= + id: DeclarationId(2723), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83015,7 +93836,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8262, 8276), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2717), +======= + id: DeclarationId(2724), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83029,7 +93854,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8281, 8296), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2718), +======= + id: DeclarationId(2725), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83043,7 +93872,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9038, 9055), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2719), +======= + id: DeclarationId(2726), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83057,7 +93890,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9060, 9070), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2720), +======= + id: DeclarationId(2727), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83071,7 +93908,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9075, 9079), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2721), +======= + id: DeclarationId(2728), name: None, connective: TypeConnective::Conj { children: vec![ @@ -83115,6 +93955,53 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9857, 10429), }); + declarations.push(Declaration { + id: DeclarationId(2729), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![ + Field { + label: "target_name".to_string(), + ty: DeclarationId(230), + }, + Field { + label: "algebra".to_string(), + ty: DeclarationId(1695), + }, + Field { + label: "carrier".to_string(), + ty: DeclarationId(1696), +<<<<<<< HEAD + }, + Field { + label: "range_min_inclusive".to_string(), + ty: DeclarationId(230), + }, + Field { + label: "range_max_inclusive".to_string(), + ty: DeclarationId(230), + }, + Field { + label: "is_copy".to_string(), + ty: DeclarationId(128), + }, + Field { + label: "overflow".to_string(), + ty: DeclarationId(1697), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9857, 10429), + }); declarations.push(Declaration { id: DeclarationId(2722), name: None, @@ -83127,6 +94014,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "algebra".to_string(), ty: DeclarationId(1695), +======= +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "carrier".to_string(), @@ -83149,12 +94038,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10434, 10616), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2723), +======= + id: DeclarationId(2730), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1698), }], }, @@ -83169,7 +94066,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10965, 10984), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2724), +======= + id: DeclarationId(2731), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83183,7 +94084,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4233, 4241), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2725), +======= + id: DeclarationId(2732), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -83202,7 +94107,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4246, 4277), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2726), +======= + id: DeclarationId(2733), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -83222,12 +94131,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4299, 4319), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2727), +======= + id: DeclarationId(2734), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "values".to_string(), +<<<<<<< HEAD ty: DeclarationId(2726), +======= + ty: DeclarationId(2733), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -83241,7 +94158,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4282, 4321), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2728), +======= + id: DeclarationId(2735), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -83266,7 +94187,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4326, 4379), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2729), +======= + id: DeclarationId(2736), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -83291,7 +94216,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4384, 4433), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2730), +======= + id: DeclarationId(2737), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83305,7 +94234,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 847, 851), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2731), +======= + id: DeclarationId(2738), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83319,7 +94252,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 854, 857), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2732), +======= + id: DeclarationId(2739), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83333,12 +94270,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 860, 872), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2733), +======= + id: DeclarationId(2740), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1710), }], }, @@ -83353,7 +94298,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1242, 1259), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2734), +======= + id: DeclarationId(2741), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -83372,7 +94321,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2735), +======= + id: DeclarationId(2742), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83386,7 +94339,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1309, 1318), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2736), +======= + id: DeclarationId(2743), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83400,7 +94357,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1323, 1332), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2737), +======= + id: DeclarationId(2744), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83414,7 +94375,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1337, 1350), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2738), +======= + id: DeclarationId(2745), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83428,7 +94393,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1355, 1367), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2739), +======= + id: DeclarationId(2746), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83442,7 +94411,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1372, 1385), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2740), +======= + id: DeclarationId(2747), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -83461,7 +94434,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2741), +======= + id: DeclarationId(2748), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83475,7 +94452,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1677, 1685), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2742), +======= + id: DeclarationId(2749), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83489,7 +94470,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1688, 1697), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2743), +======= + id: DeclarationId(2750), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83503,12 +94488,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1700, 1709), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2744), +======= + id: DeclarationId(2751), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1719), }], }, @@ -83523,12 +94516,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 829, 850), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2745), +======= + id: DeclarationId(2752), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1725), }], }, @@ -83543,7 +94544,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 859, 868), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2746), +======= + id: DeclarationId(2753), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -83569,7 +94574,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 876, 895), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2747), +======= + id: DeclarationId(2754), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -83588,7 +94597,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2748), +======= + id: DeclarationId(2755), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83602,7 +94615,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1102, 1110), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2749), +======= + id: DeclarationId(2756), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83616,7 +94633,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1113, 1122), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2750), +======= + id: DeclarationId(2757), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83630,7 +94651,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1125, 1133), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2751), +======= + id: DeclarationId(2758), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -83650,7 +94675,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1291, 1303), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2752), +======= + id: DeclarationId(2759), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -83670,17 +94699,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1312, 1324), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2753), +======= + id: DeclarationId(2760), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "branches".to_string(), +<<<<<<< HEAD ty: DeclarationId(2751), }, Field { label: "paths".to_string(), ty: DeclarationId(2752), +======= + ty: DeclarationId(2758), + }, + Field { + label: "paths".to_string(), + ty: DeclarationId(2759), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -83695,7 +94736,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1274, 1326), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2754), +======= + id: DeclarationId(2761), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -83715,12 +94760,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1355, 1367), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2755), +======= + id: DeclarationId(2762), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1720), }], }, @@ -83735,17 +94788,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1376, 1401), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2756), +======= + id: DeclarationId(2763), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "branches".to_string(), +<<<<<<< HEAD ty: DeclarationId(2754), }, Field { label: "types".to_string(), ty: DeclarationId(2755), +======= + ty: DeclarationId(2761), + }, + Field { + label: "types".to_string(), + ty: DeclarationId(2762), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -83760,7 +94825,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1331, 1403), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2757), +======= + id: DeclarationId(2764), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -83779,12 +94848,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1408, 1439), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2758), +======= + id: DeclarationId(2765), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1721), }], }, @@ -83799,12 +94876,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1471, 1490), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2759), +======= + id: DeclarationId(2766), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "inputs".to_string(), +<<<<<<< HEAD ty: DeclarationId(2758), +======= + ty: DeclarationId(2765), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -83818,12 +94903,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1444, 1492), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2760), +======= + id: DeclarationId(2767), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1721), }], }, @@ -83838,12 +94931,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1520, 1539), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2761), +======= + id: DeclarationId(2768), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "inputs".to_string(), +<<<<<<< HEAD ty: DeclarationId(2760), +======= + ty: DeclarationId(2767), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -83857,7 +94958,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1497, 1541), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2762), +======= + id: DeclarationId(2769), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83871,7 +94976,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1572, 1578), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2763), +======= + id: DeclarationId(2770), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83885,7 +94994,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1583, 1594), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2764), +======= + id: DeclarationId(2771), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83899,7 +95012,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1599, 1607), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2765), +======= + id: DeclarationId(2772), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83913,7 +95030,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1612, 1618), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2766), +======= + id: DeclarationId(2773), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -83932,7 +95052,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), }); declarations.push(Declaration { - id: DeclarationId(2767), + id: DeclarationId(2774), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(230), + CardinalityBound::AtMostOne, + ), + ), + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), + }); + declarations.push(Declaration { + id: DeclarationId(2775), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -83951,7 +95091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), }); declarations.push(Declaration { - id: DeclarationId(2768), + id: DeclarationId(2776), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83965,7 +95105,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1769, 1780), }); declarations.push(Declaration { - id: DeclarationId(2769), + id: DeclarationId(2777), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83979,7 +95119,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1783, 1795), }); declarations.push(Declaration { - id: DeclarationId(2770), + id: DeclarationId(2778), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83993,7 +95133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1798, 1809), }); declarations.push(Declaration { - id: DeclarationId(2771), + id: DeclarationId(2779), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84007,7 +95147,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1812, 1828), }); declarations.push(Declaration { - id: DeclarationId(2772), + id: DeclarationId(2780), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84021,7 +95161,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 3804, 3813), }); declarations.push(Declaration { - id: DeclarationId(2773), + id: DeclarationId(2781), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84035,7 +95175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 3816, 3824), }); declarations.push(Declaration { - id: DeclarationId(2774), + id: DeclarationId(2782), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84068,12 +95208,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2776), +======= + id: DeclarationId(2783), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1729), }], }, @@ -84088,7 +95236,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4392, 4402), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2777), +======= + id: DeclarationId(2784), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -84108,7 +95260,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4412, 4424), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2778), +======= + id: DeclarationId(2785), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -84134,7 +95290,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4432, 4451), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2779), +======= + id: DeclarationId(2786), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84153,7 +95313,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2780), +======= + id: DeclarationId(2787), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84172,7 +95336,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2781), +======= + id: DeclarationId(2788), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84191,7 +95359,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2782), +======= + id: DeclarationId(2789), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84210,7 +95382,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2783), +======= + id: DeclarationId(2790), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -84229,7 +95405,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4792, 4827), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2784), +======= + id: DeclarationId(2791), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -84249,12 +95429,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4853, 4865), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2785), +======= + id: DeclarationId(2792), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "labels".to_string(), +<<<<<<< HEAD ty: DeclarationId(2784), +======= + ty: DeclarationId(2791), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -84268,7 +95456,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4832, 4867), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2786), +======= + id: DeclarationId(2793), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84282,7 +95474,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4890, 4902), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2787), +======= + id: DeclarationId(2794), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84296,7 +95492,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4907, 4917), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2788), +======= + id: DeclarationId(2795), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84310,7 +95510,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4922, 4932), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2789), +======= + id: DeclarationId(2796), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84324,7 +95528,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4937, 4948), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2790), +======= + id: DeclarationId(2797), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84338,7 +95546,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4953, 4960), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2791), +======= + id: DeclarationId(2798), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84352,7 +95564,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4965, 4978), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2792), +======= + id: DeclarationId(2799), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84371,7 +95587,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2793), +======= + id: DeclarationId(2800), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -84397,7 +95617,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5222, 5241), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2794), +======= + id: DeclarationId(2801), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84416,7 +95640,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2795), +======= + id: DeclarationId(2802), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84435,7 +95663,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2796), +======= + id: DeclarationId(2803), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84454,13 +95686,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2797), +======= + id: DeclarationId(2804), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "name".to_string(), +<<<<<<< HEAD ty: DeclarationId(2792), +======= + ty: DeclarationId(2799), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "run".to_string(), @@ -84472,11 +95712,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "env".to_string(), +<<<<<<< HEAD ty: DeclarationId(2793), }, Field { label: "working_directory".to_string(), ty: DeclarationId(2794), +======= + ty: DeclarationId(2800), + }, + Field { + label: "working_directory".to_string(), + ty: DeclarationId(2801), + }, + Field { + label: "if_condition".to_string(), + ty: DeclarationId(2802), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "if_condition".to_string(), @@ -84488,7 +95740,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "timeout_minutes".to_string(), +<<<<<<< HEAD ty: DeclarationId(2796), +======= + ty: DeclarationId(2803), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -84503,7 +95759,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5137, 5370), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2798), +======= + id: DeclarationId(2805), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84522,7 +95782,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2799), +======= + id: DeclarationId(2806), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -84548,7 +95811,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5442, 5461), }); declarations.push(Declaration { - id: DeclarationId(2800), + id: DeclarationId(2807), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(137), + arguments: vec![ + TemplateArgument { + parameter: DeclarationId(138), + value: DeclarationId(230), + }, + TemplateArgument { + parameter: DeclarationId(139), + value: DeclarationId(230), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5442, 5461), + }); + declarations.push(Declaration { + id: DeclarationId(2808), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -84593,7 +95883,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2802), +======= + id: DeclarationId(2809), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84612,12 +95906,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2803), +======= + id: DeclarationId(2810), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "name".to_string(), +<<<<<<< HEAD ty: DeclarationId(2798), }, Field { @@ -84631,6 +95930,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { Field { label: "env".to_string(), ty: DeclarationId(2800), +======= + ty: DeclarationId(2805), + }, + Field { + label: "uses".to_string(), + ty: DeclarationId(1731), + }, + Field { + label: "with".to_string(), + ty: DeclarationId(2806), + }, + Field { + label: "env".to_string(), + ty: DeclarationId(2807), + }, + Field { + label: "if_condition".to_string(), + ty: DeclarationId(2808), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "if_condition".to_string(), @@ -84642,7 +95960,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "timeout_minutes".to_string(), +<<<<<<< HEAD ty: DeclarationId(2802), +======= + ty: DeclarationId(2809), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -84657,7 +95979,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5375, 5588), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2804), +======= + id: DeclarationId(2811), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84671,7 +95997,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5607, 5611), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2805), +======= + id: DeclarationId(2812), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84685,7 +96015,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5614, 5616), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2806), +======= + id: DeclarationId(2813), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84699,7 +96033,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5619, 5623), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2807), +======= + id: DeclarationId(2814), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84713,7 +96051,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5626, 5632), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2808), +======= + id: DeclarationId(2815), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84727,6 +96069,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5635, 5638), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2809), name: None, connective: TypeConnective::Cardinality( @@ -84908,6 +96251,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(2817), +======= + id: DeclarationId(2816), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84923,7 +96269,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), }); declarations.push(Declaration { id: DeclarationId(2818), @@ -84942,7 +96288,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6175, 6179), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), }); declarations.push(Declaration { id: DeclarationId(2819), @@ -84961,7 +96307,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6186, 6190), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6027, 6031), }); declarations.push(Declaration { id: DeclarationId(2820), @@ -84994,11 +96340,191 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6118, 6192), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5960, 6033), + }); + declarations.push(Declaration { + id: DeclarationId(2821), + name: None, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(230), + CardinalityBound::AtMostOne, + ), + ), + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), }); declarations.push(Declaration { id: DeclarationId(2821), name: None, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(93), + CardinalityBound::AtMostOne, + ), + ), + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), + }); + declarations.push(Declaration { + id: DeclarationId(2822), + name: None, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(93), + CardinalityBound::AtMostOne, + ), + ), + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), + }); + declarations.push(Declaration { + id: DeclarationId(2823), + name: None, + connective: TypeConnective::Conj { + children: vec![ + Field { + label: "message".to_string(), + ty: DeclarationId(230), + }, + Field { + label: "file".to_string(), + ty: DeclarationId(2820), + }, + Field { + label: "line".to_string(), + ty: DeclarationId(2821), + }, + Field { + label: "col".to_string(), + ty: DeclarationId(2822), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6038, 6113), + }); + declarations.push(Declaration { + id: DeclarationId(2824), + name: None, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(230), + CardinalityBound::AtMostOne, + ), + ), + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), + }); + declarations.push(Declaration { + id: DeclarationId(2825), + name: None, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(93), + CardinalityBound::AtMostOne, + ), + ), + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6175, 6179), + }); + declarations.push(Declaration { + id: DeclarationId(2826), + name: None, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(93), + CardinalityBound::AtMostOne, + ), + ), + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6186, 6190), + }); + declarations.push(Declaration { + id: DeclarationId(2827), + name: None, + connective: TypeConnective::Conj { + children: vec![ + Field { + label: "message".to_string(), + ty: DeclarationId(230), + }, + Field { + label: "file".to_string(), + ty: DeclarationId(2824), + }, + Field { + label: "line".to_string(), + ty: DeclarationId(2825), + }, + Field { + label: "col".to_string(), + ty: DeclarationId(2826), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6118, 6192), + }); + declarations.push(Declaration { + id: DeclarationId(2828), + name: None, connective: TypeConnective::Conj { children: vec![Field { label: "title".to_string(), @@ -85016,7 +96542,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6197, 6230), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2822), +======= + id: DeclarationId(2829), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85030,7 +96560,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6235, 6253), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2823), +======= + id: DeclarationId(2830), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -85055,7 +96589,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6258, 6299), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2824), +======= + id: DeclarationId(2831), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85074,7 +96612,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6304, 6329), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2825), +======= + id: DeclarationId(2832), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85093,7 +96635,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6334, 6364), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2826), +======= + id: DeclarationId(2833), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -85112,7 +96658,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7170, 7174), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2827), +======= + id: DeclarationId(2834), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -85126,7 +96676,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "retention_days".to_string(), +<<<<<<< HEAD ty: DeclarationId(2826), +======= + ty: DeclarationId(2833), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "if_no_files_found".to_string(), @@ -85145,7 +96699,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7117, 7217), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2828), +======= + id: DeclarationId(2835), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -85164,7 +96722,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7253, 7260), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2829), +======= + id: DeclarationId(2836), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -85174,7 +96736,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "path".to_string(), +<<<<<<< HEAD ty: DeclarationId(2828), +======= + ty: DeclarationId(2835), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -85189,7 +96755,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7222, 7262), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2830), +======= + id: DeclarationId(2837), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85203,7 +96773,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7292, 7296), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2831), +======= + id: DeclarationId(2838), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85217,7 +96791,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7299, 7307), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2832), +======= + id: DeclarationId(2839), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85231,7 +96809,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7310, 7316), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2833), +======= + id: DeclarationId(2840), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -85251,7 +96833,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7778, 7790), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2834), +======= + id: DeclarationId(2841), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -85262,7 +96848,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(139), +<<<<<<< HEAD value: DeclarationId(2833), +======= + value: DeclarationId(2840), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -85277,7 +96867,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7766, 7791), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2835), +======= + id: DeclarationId(2842), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -85303,13 +96897,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7808, 7827), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2836), +======= + id: DeclarationId(2843), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), value: DeclarationId(2835), +======= + parameter: DeclarationId(686), + value: DeclarationId(2842), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -85323,7 +96926,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7803, 7828), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2837), +======= + id: DeclarationId(2844), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -85349,13 +96956,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7845, 7864), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2838), +======= + id: DeclarationId(2845), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), value: DeclarationId(2837), +======= + parameter: DeclarationId(686), + value: DeclarationId(2844), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -85369,7 +96985,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7840, 7865), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2839), +======= + id: DeclarationId(2846), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -85388,7 +97008,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7900, 7904), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2840), +======= + id: DeclarationId(2847), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85402,7 +97026,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8060, 8067), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2841), +======= + id: DeclarationId(2848), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85416,7 +97044,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8072, 8079), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2842), +======= + id: DeclarationId(2849), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85430,7 +97062,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8084, 8093), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2843), +======= + id: DeclarationId(2850), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85444,7 +97080,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8098, 8105), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2844), +======= + id: DeclarationId(2851), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85458,7 +97098,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8110, 8118), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2845), +======= + id: DeclarationId(2852), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85472,6 +97116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8123, 8137), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2846), name: None, connective: TypeConnective::Conj { @@ -85634,6 +97279,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ty: DeclarationId(2853), }, ], +======= + id: DeclarationId(2853), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(48), + }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -85643,11 +97297,166 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), + span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), }); declarations.push(Declaration { id: DeclarationId(2855), name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), + }); + declarations.push(Declaration { + id: DeclarationId(2855), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2853), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2854), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), + }); + declarations.push(Declaration { + id: DeclarationId(2856), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(48), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), + }); + declarations.push(Declaration { + id: DeclarationId(2857), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), + }); + declarations.push(Declaration { + id: DeclarationId(2858), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2856), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2857), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), + }); + declarations.push(Declaration { + id: DeclarationId(2859), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(51), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), + }); + declarations.push(Declaration { + id: DeclarationId(2860), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), + }); + declarations.push(Declaration { + id: DeclarationId(2861), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2859), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2860), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), + }); + declarations.push(Declaration { + id: DeclarationId(2862), + name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), @@ -85665,7 +97474,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2856), +======= + id: DeclarationId(2863), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85679,17 +97492,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2857), +======= + id: DeclarationId(2864), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2855), }, Field { label: "None".to_string(), ty: DeclarationId(2856), +======= + ty: DeclarationId(2862), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2863), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -85704,7 +97529,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2858), +======= + id: DeclarationId(2865), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85723,7 +97552,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2859), +======= + id: DeclarationId(2866), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85737,17 +97570,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2860), +======= + id: DeclarationId(2867), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2858), }, Field { label: "None".to_string(), ty: DeclarationId(2859), +======= + ty: DeclarationId(2865), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2866), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -85762,7 +97607,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2861), +======= + id: DeclarationId(2868), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85781,6 +97630,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2862), name: None, connective: TypeConnective::Conj { children: vec![] }, @@ -85925,6 +97775,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, ], }, +======= + id: DeclarationId(2869), + name: None, + connective: TypeConnective::Conj { children: vec![] }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -85933,17 +97788,167 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), +======= + span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2870), name: None, +<<<<<<< HEAD +======= + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2868), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2869), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), + }); + declarations.push(Declaration { + id: DeclarationId(2871), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(93), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), + }); + declarations.push(Declaration { + id: DeclarationId(2872), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), + }); + declarations.push(Declaration { + id: DeclarationId(2873), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2871), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2872), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), + }); + declarations.push(Declaration { + id: DeclarationId(2874), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(93), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), + }); + declarations.push(Declaration { + id: DeclarationId(2875), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), + }); + declarations.push(Declaration { + id: DeclarationId(2876), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2874), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2875), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), + }); + declarations.push(Declaration { + id: DeclarationId(2877), + name: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), ty: DeclarationId(230), }], }, +<<<<<<< HEAD +======= type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -85955,7 +97960,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), }); declarations.push(Declaration { - id: DeclarationId(2871), + id: DeclarationId(2878), + name: None, + connective: TypeConnective::Conj { children: vec![] }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), + }); + declarations.push(Declaration { + id: DeclarationId(2879), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85975,11 +97995,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2870), }, Field { label: "None".to_string(), ty: DeclarationId(2871), +======= + ty: DeclarationId(2877), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2878), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -85994,7 +98022,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2873), +======= + id: DeclarationId(2880), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86013,7 +98045,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2874), +======= + id: DeclarationId(2881), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86027,17 +98063,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2875), +======= + id: DeclarationId(2882), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2873), }, Field { label: "None".to_string(), ty: DeclarationId(2874), +======= + ty: DeclarationId(2880), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2881), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -86052,7 +98100,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2876), +======= + id: DeclarationId(2883), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86071,7 +98123,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 16948, 16968), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2877), +======= + id: DeclarationId(2884), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86085,17 +98141,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 16948, 16968), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2878), +======= + id: DeclarationId(2885), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2876), }, Field { label: "None".to_string(), ty: DeclarationId(2877), +======= + ty: DeclarationId(2883), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2884), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -86110,7 +98178,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 16948, 16968), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2879), +======= + id: DeclarationId(2886), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86129,7 +98201,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 17604, 17611), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2880), +======= + id: DeclarationId(2887), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86143,17 +98219,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 17604, 17611), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2881), +======= + id: DeclarationId(2888), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2879), }, Field { label: "None".to_string(), ty: DeclarationId(2880), +======= + ty: DeclarationId(2886), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2887), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -86168,7 +98256,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 17604, 17611), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2882), +======= + id: DeclarationId(2889), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86187,7 +98279,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21364, 21374), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2883), +======= + id: DeclarationId(2890), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86201,17 +98297,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21364, 21374), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2884), +======= + id: DeclarationId(2891), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2882), }, Field { label: "None".to_string(), ty: DeclarationId(2883), +======= + ty: DeclarationId(2889), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2890), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -86226,7 +98334,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21364, 21374), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2885), +======= + id: DeclarationId(2892), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86245,7 +98357,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21499, 21506), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2886), +======= + id: DeclarationId(2893), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86259,17 +98375,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21499, 21506), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2887), +======= + id: DeclarationId(2894), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2885), }, Field { label: "None".to_string(), ty: DeclarationId(2886), +======= + ty: DeclarationId(2892), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2893), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -86284,7 +98412,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21499, 21506), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2888), +======= + id: DeclarationId(2895), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86303,6 +98435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2889), name: None, connective: TypeConnective::Conj { children: vec![] }, @@ -86459,6 +98592,164 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(2897), +======= + id: DeclarationId(2896), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), + }); + declarations.push(Declaration { + id: DeclarationId(2898), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2895), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2896), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), + }); + declarations.push(Declaration { + id: DeclarationId(2898), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), + }); + declarations.push(Declaration { + id: DeclarationId(2899), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), + }); + declarations.push(Declaration { + id: DeclarationId(2900), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2898), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2899), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), + }); + declarations.push(Declaration { + id: DeclarationId(2901), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), + }); + declarations.push(Declaration { + id: DeclarationId(2902), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), + }); + declarations.push(Declaration { + id: DeclarationId(2903), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2901), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2902), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), + }); + declarations.push(Declaration { + id: DeclarationId(2904), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86477,7 +98768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23950, 23957), }); declarations.push(Declaration { - id: DeclarationId(2898), + id: DeclarationId(2905), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86491,17 +98782,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23950, 23957), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2899), +======= + id: DeclarationId(2906), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2897), }, Field { label: "None".to_string(), ty: DeclarationId(2898), +======= + ty: DeclarationId(2904), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2905), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -86516,7 +98819,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23950, 23957), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2900), +======= + id: DeclarationId(2907), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86535,7 +98842,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24180, 24195), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2901), +======= + id: DeclarationId(2908), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86549,17 +98860,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24180, 24195), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2902), +======= + id: DeclarationId(2909), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2900), }, Field { label: "None".to_string(), ty: DeclarationId(2901), +======= + ty: DeclarationId(2907), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2908), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -86574,7 +98897,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24180, 24195), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2903), +======= + id: DeclarationId(2910), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86593,7 +98920,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24206, 24219), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2904), +======= + id: DeclarationId(2911), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86607,17 +98938,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24206, 24219), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2905), +======= + id: DeclarationId(2912), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2903), }, Field { label: "None".to_string(), ty: DeclarationId(2904), +======= + ty: DeclarationId(2910), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2911), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -86632,7 +98975,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24206, 24219), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2906), +======= + id: DeclarationId(2913), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86651,6 +98998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2907), name: None, connective: TypeConnective::Conj { children: vec![] }, @@ -86795,6 +99143,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, ], }, +======= + id: DeclarationId(2914), + name: None, + connective: TypeConnective::Conj { children: vec![] }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -86803,17 +99156,167 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), +======= + span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2915), name: None, +<<<<<<< HEAD +======= + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2913), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2914), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), + }); + declarations.push(Declaration { + id: DeclarationId(2916), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), + }); + declarations.push(Declaration { + id: DeclarationId(2917), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), + }); + declarations.push(Declaration { + id: DeclarationId(2918), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2916), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2917), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), + }); + declarations.push(Declaration { + id: DeclarationId(2919), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), + }); + declarations.push(Declaration { + id: DeclarationId(2920), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), + }); + declarations.push(Declaration { + id: DeclarationId(2921), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2919), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2920), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), + }); + declarations.push(Declaration { + id: DeclarationId(2922), + name: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), ty: DeclarationId(1791), }], }, +<<<<<<< HEAD +======= type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -86825,7 +99328,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), }); declarations.push(Declaration { - id: DeclarationId(2916), + id: DeclarationId(2923), + name: None, + connective: TypeConnective::Conj { children: vec![] }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), + }); + declarations.push(Declaration { + id: DeclarationId(2924), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86845,11 +99363,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2915), }, Field { label: "None".to_string(), ty: DeclarationId(2916), +======= + ty: DeclarationId(2922), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2923), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -86864,7 +99390,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2918), +======= + id: DeclarationId(2925), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86883,7 +99413,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2919), +======= + id: DeclarationId(2926), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86897,17 +99431,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2920), +======= + id: DeclarationId(2927), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2918), }, Field { label: "None".to_string(), ty: DeclarationId(2919), +======= + ty: DeclarationId(2925), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2926), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -86922,7 +99468,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2921), +======= + id: DeclarationId(2928), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86941,6 +99491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(2922), name: None, connective: TypeConnective::Conj { children: vec![] }, @@ -87097,11 +99648,53 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(2930), +======= + id: DeclarationId(2929), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), + }); + declarations.push(Declaration { + id: DeclarationId(2930), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2928), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2929), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), + }); + declarations.push(Declaration { + id: DeclarationId(2931), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(781), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -87112,10 +99705,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), + span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), }); declarations.push(Declaration { - id: DeclarationId(2931), + id: DeclarationId(2932), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87126,20 +99719,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), + span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), }); declarations.push(Declaration { - id: DeclarationId(2932), + id: DeclarationId(2933), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2930), + ty: DeclarationId(2931), }, Field { label: "None".to_string(), - ty: DeclarationId(2931), + ty: DeclarationId(2932), }, ], }, @@ -87151,15 +99744,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), + span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), }); declarations.push(Declaration { - id: DeclarationId(2933), + id: DeclarationId(2934), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(827), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -87170,10 +99763,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), + span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), }); declarations.push(Declaration { - id: DeclarationId(2934), + id: DeclarationId(2935), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87184,20 +99777,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), + span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), }); declarations.push(Declaration { - id: DeclarationId(2935), + id: DeclarationId(2936), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2933), + ty: DeclarationId(2934), }, Field { label: "None".to_string(), - ty: DeclarationId(2934), + ty: DeclarationId(2935), }, ], }, @@ -87209,15 +99802,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), + span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), }); declarations.push(Declaration { - id: DeclarationId(2936), + id: DeclarationId(2937), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(827), + ty: DeclarationId(781), }], }, type_params: vec![], @@ -87228,10 +99821,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), + span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), }); declarations.push(Declaration { - id: DeclarationId(2937), +<<<<<<< HEAD + id: DeclarationId(2931), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87242,20 +99836,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), + span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), }); declarations.push(Declaration { - id: DeclarationId(2938), + id: DeclarationId(2932), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2936), + ty: DeclarationId(2930), }, Field { label: "None".to_string(), - ty: DeclarationId(2937), + ty: DeclarationId(2931), }, ], }, @@ -87267,15 +99861,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), + span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), }); declarations.push(Declaration { - id: DeclarationId(2939), + id: DeclarationId(2933), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(799), + ty: DeclarationId(827), }], }, type_params: vec![], @@ -87286,10 +99880,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), + span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), }); declarations.push(Declaration { - id: DeclarationId(2940), + id: DeclarationId(2934), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87300,20 +99894,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), + span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), }); declarations.push(Declaration { - id: DeclarationId(2941), + id: DeclarationId(2935), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2939), + ty: DeclarationId(2933), }, Field { label: "None".to_string(), - ty: DeclarationId(2940), + ty: DeclarationId(2934), }, ], }, @@ -87325,15 +99919,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), + span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), }); declarations.push(Declaration { - id: DeclarationId(2942), + id: DeclarationId(2936), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(799), + ty: DeclarationId(827), }], }, type_params: vec![], @@ -87344,10 +99938,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), + span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), }); declarations.push(Declaration { - id: DeclarationId(2943), + id: DeclarationId(2937), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87358,20 +99952,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), + span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), }); declarations.push(Declaration { - id: DeclarationId(2944), + id: DeclarationId(2938), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2942), + ty: DeclarationId(2936), }, Field { label: "None".to_string(), - ty: DeclarationId(2943), + ty: DeclarationId(2937), }, ], }, @@ -87383,17 +99977,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), + span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), }); declarations.push(Declaration { - id: DeclarationId(2945), + id: DeclarationId(2939), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(755), + ty: DeclarationId(799), }], }, +======= + id: DeclarationId(2938), + name: None, + connective: TypeConnective::Conj { children: vec![] }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -87402,10 +100001,57 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), + span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), }); declarations.push(Declaration { - id: DeclarationId(2946), +<<<<<<< HEAD + id: DeclarationId(2940), +======= + id: DeclarationId(2939), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2937), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2938), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), + }); + declarations.push(Declaration { + id: DeclarationId(2940), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(826), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), + }); + declarations.push(Declaration { + id: DeclarationId(2941), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87416,20 +100062,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), + span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), }); declarations.push(Declaration { - id: DeclarationId(2947), + id: DeclarationId(2942), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2945), + ty: DeclarationId(2940), }, Field { label: "None".to_string(), - ty: DeclarationId(2946), + ty: DeclarationId(2941), }, ], }, @@ -87441,15 +100087,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), + span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), }); declarations.push(Declaration { - id: DeclarationId(2948), + id: DeclarationId(2943), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(722), + ty: DeclarationId(826), }], }, type_params: vec![], @@ -87460,10 +100106,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), + span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), }); declarations.push(Declaration { - id: DeclarationId(2949), + id: DeclarationId(2944), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87474,20 +100120,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), + span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), }); declarations.push(Declaration { - id: DeclarationId(2950), + id: DeclarationId(2945), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2948), + ty: DeclarationId(2943), }, Field { label: "None".to_string(), - ty: DeclarationId(2949), + ty: DeclarationId(2944), }, ], }, @@ -87499,15 +100145,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), + span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), }); declarations.push(Declaration { - id: DeclarationId(2951), + id: DeclarationId(2946), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(798), }], }, type_params: vec![], @@ -87518,10 +100164,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), + span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), }); declarations.push(Declaration { - id: DeclarationId(2952), + id: DeclarationId(2947), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87532,20 +100178,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), + span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), }); declarations.push(Declaration { - id: DeclarationId(2953), + id: DeclarationId(2948), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), + }); + declarations.push(Declaration { + id: DeclarationId(2941), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2951), +<<<<<<< HEAD + ty: DeclarationId(2939), }, Field { label: "None".to_string(), - ty: DeclarationId(2952), + ty: DeclarationId(2940), +======= + ty: DeclarationId(2946), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2947), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -87557,15 +100226,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), + span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), }); declarations.push(Declaration { - id: DeclarationId(2954), +<<<<<<< HEAD + id: DeclarationId(2942), +======= + id: DeclarationId(2949), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(724), + ty: DeclarationId(799), }], }, type_params: vec![], @@ -87576,10 +100249,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), + span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), }); declarations.push(Declaration { - id: DeclarationId(2955), +<<<<<<< HEAD + id: DeclarationId(2943), +======= + id: DeclarationId(2950), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87590,20 +100266,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), + span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), }); declarations.push(Declaration { - id: DeclarationId(2956), + id: DeclarationId(2951), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), + }); + declarations.push(Declaration { + id: DeclarationId(2944), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2954), +<<<<<<< HEAD + ty: DeclarationId(2942), }, Field { label: "None".to_string(), - ty: DeclarationId(2955), + ty: DeclarationId(2943), +======= + ty: DeclarationId(2949), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2950), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -87615,15 +100314,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), + span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), }); declarations.push(Declaration { - id: DeclarationId(2957), +<<<<<<< HEAD + id: DeclarationId(2945), +======= + id: DeclarationId(2952), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(724), + ty: DeclarationId(755), }], }, type_params: vec![], @@ -87634,10 +100337,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), + span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), }); declarations.push(Declaration { - id: DeclarationId(2958), +<<<<<<< HEAD + id: DeclarationId(2946), +======= + id: DeclarationId(2953), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87648,20 +100354,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), + span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), }); declarations.push(Declaration { - id: DeclarationId(2959), + id: DeclarationId(2954), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), + }); + declarations.push(Declaration { + id: DeclarationId(2947), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2957), +<<<<<<< HEAD + ty: DeclarationId(2945), }, Field { label: "None".to_string(), - ty: DeclarationId(2958), + ty: DeclarationId(2946), +======= + ty: DeclarationId(2952), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2953), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -87673,15 +100402,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), + span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), }); declarations.push(Declaration { - id: DeclarationId(2960), +<<<<<<< HEAD + id: DeclarationId(2948), +======= + id: DeclarationId(2955), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(795), + ty: DeclarationId(722), }], }, type_params: vec![], @@ -87692,10 +100425,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), + span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), }); declarations.push(Declaration { - id: DeclarationId(2961), +<<<<<<< HEAD + id: DeclarationId(2949), +======= + id: DeclarationId(2956), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87706,20 +100443,3502 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), + span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), }); declarations.push(Declaration { - id: DeclarationId(2962), +<<<<<<< HEAD + id: DeclarationId(2950), +======= + id: DeclarationId(2957), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2960), +<<<<<<< HEAD + ty: DeclarationId(2948), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2949), +======= + ty: DeclarationId(2955), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2956), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2951), +======= + id: DeclarationId(2958), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2952), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), + }); + declarations.push(Declaration { + id: DeclarationId(2953), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2951), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2952), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), + }); + declarations.push(Declaration { + id: DeclarationId(2954), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(724), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), + }); + declarations.push(Declaration { + id: DeclarationId(2955), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), + }); + declarations.push(Declaration { + id: DeclarationId(2956), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2954), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2955), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), + }); + declarations.push(Declaration { + id: DeclarationId(2957), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(724), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), + }); + declarations.push(Declaration { + id: DeclarationId(2958), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), + }); + declarations.push(Declaration { + id: DeclarationId(2959), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2957), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2958), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), + }); + declarations.push(Declaration { + id: DeclarationId(2960), +======= + id: DeclarationId(2959), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), + }); + declarations.push(Declaration { + id: DeclarationId(2960), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2958), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2959), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), + }); + declarations.push(Declaration { + id: DeclarationId(2961), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(723), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), + }); + declarations.push(Declaration { + id: DeclarationId(2962), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), + }); + declarations.push(Declaration { + id: DeclarationId(2963), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2961), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2962), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), + }); + declarations.push(Declaration { + id: DeclarationId(2964), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(723), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), + }); + declarations.push(Declaration { + id: DeclarationId(2965), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), + }); + declarations.push(Declaration { + id: DeclarationId(2966), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2964), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2965), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), + }); + declarations.push(Declaration { + id: DeclarationId(2967), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(795), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2961), +======= + id: DeclarationId(2968), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), + }); + declarations.push(Declaration { + id: DeclarationId(2969), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), + }); + declarations.push(Declaration { + id: DeclarationId(2962), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2960), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2961), +======= + ty: DeclarationId(2967), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2968), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2963), +======= + id: DeclarationId(2970), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(801), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2964), +======= + id: DeclarationId(2971), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), + }); + declarations.push(Declaration { + id: DeclarationId(2972), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), + }); + declarations.push(Declaration { + id: DeclarationId(2965), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2963), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2964), +======= + ty: DeclarationId(2970), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2971), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2966), +======= + id: DeclarationId(2973), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(809), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2967), +======= + id: DeclarationId(2974), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), + }); + declarations.push(Declaration { + id: DeclarationId(2975), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), + }); + declarations.push(Declaration { + id: DeclarationId(2968), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2966), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2967), +======= + ty: DeclarationId(2973), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2974), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2969), +======= + id: DeclarationId(2976), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(755), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2970), +======= + id: DeclarationId(2977), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), + }); + declarations.push(Declaration { + id: DeclarationId(2978), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), + }); + declarations.push(Declaration { + id: DeclarationId(2971), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2969), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2970), +======= + ty: DeclarationId(2976), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2977), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2972), +======= + id: DeclarationId(2979), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(822), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2973), +======= + id: DeclarationId(2980), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), + }); + declarations.push(Declaration { + id: DeclarationId(2981), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), + }); + declarations.push(Declaration { + id: DeclarationId(2974), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2972), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2973), +======= + ty: DeclarationId(2979), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2980), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2975), +======= + id: DeclarationId(2982), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(755), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2976), +======= + id: DeclarationId(2983), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), + }); + declarations.push(Declaration { + id: DeclarationId(2984), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), + }); + declarations.push(Declaration { + id: DeclarationId(2977), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2975), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2976), +======= + ty: DeclarationId(2982), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2983), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2978), +======= + id: DeclarationId(2985), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(825), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2979), +======= + id: DeclarationId(2986), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), + }); + declarations.push(Declaration { + id: DeclarationId(2987), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), + }); + declarations.push(Declaration { + id: DeclarationId(2980), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2978), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2979), +======= + ty: DeclarationId(2985), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2986), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2981), + name: None, +======= + id: DeclarationId(2988), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(841), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + }); + declarations.push(Declaration { + id: DeclarationId(2989), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + }); + declarations.push(Declaration { + id: DeclarationId(2990), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2988), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2989), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + }); + declarations.push(Declaration { + id: DeclarationId(2991), + name: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(842), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + }); + declarations.push(Declaration { + id: DeclarationId(2982), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + }); + declarations.push(Declaration { + id: DeclarationId(2983), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2981), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2982), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + }); + declarations.push(Declaration { + id: DeclarationId(2992), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(843), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), + }); + declarations.push(Declaration { + id: DeclarationId(2993), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), + }); + declarations.push(Declaration { + id: DeclarationId(2986), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2984), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2985), +======= + ty: DeclarationId(2991), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2992), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2987), +======= + id: DeclarationId(2994), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(93), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2988), +======= + id: DeclarationId(2995), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2989), +======= + id: DeclarationId(2996), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2987), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2988), +======= + ty: DeclarationId(2994), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2995), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2990), +======= + id: DeclarationId(2997), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2991), +======= + id: DeclarationId(2998), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2992), +======= + id: DeclarationId(2999), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2990), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2991), +======= + ty: DeclarationId(2997), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2998), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2993), +======= + id: DeclarationId(3000), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(115), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2994), +======= + id: DeclarationId(3001), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2995), +======= + id: DeclarationId(3002), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2993), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2994), +======= + ty: DeclarationId(3000), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3001), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2996), +======= + id: DeclarationId(3003), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2997), + name: None, + connective: TypeConnective::Conj { children: vec![] }, +======= + id: DeclarationId(3004), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), + }); + declarations.push(Declaration { + id: DeclarationId(3005), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3003), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3004), + }, + ], + }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), + }); + declarations.push(Declaration { + id: DeclarationId(3006), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2996), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2997), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), + }); + declarations.push(Declaration { + id: DeclarationId(2999), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(896), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4680, 4707), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(3000), +======= + id: DeclarationId(3007), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4680, 4707), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(3001), +======= + id: DeclarationId(3008), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2999), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3000), +======= + ty: DeclarationId(3006), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3007), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4680, 4707), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(3002), +======= + id: DeclarationId(3009), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(128), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, +<<<<<<< HEAD + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058), + }); + declarations.push(Declaration { + id: DeclarationId(3003), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058), + }); + declarations.push(Declaration { + id: DeclarationId(3004), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3002), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3003), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058), + }); + declarations.push(Declaration { + id: DeclarationId(3005), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421), + }); + declarations.push(Declaration { + id: DeclarationId(3006), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421), + }); + declarations.push(Declaration { + id: DeclarationId(3007), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3005), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3006), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421), + }); + declarations.push(Declaration { + id: DeclarationId(3008), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439), + }); + declarations.push(Declaration { + id: DeclarationId(3009), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439), + }); + declarations.push(Declaration { + id: DeclarationId(3010), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3008), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3009), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439), +======= + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4724, 4729), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }); + declarations.push(Declaration { + id: DeclarationId(3011), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4724, 4729), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(3012), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5562, 5569), + }); + declarations.push(Declaration { + id: DeclarationId(3013), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3011), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3012), + }, + ], +======= + id: DeclarationId(3011), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3009), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3010), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4724, 4729), + }); + declarations.push(Declaration { + id: DeclarationId(3012), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6085, 6092), + }); + declarations.push(Declaration { + id: DeclarationId(3014), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6085, 6092), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(3015), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5580, 5587), + }); + declarations.push(Declaration { + id: DeclarationId(3016), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3014), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3015), + }, + ], +======= + id: DeclarationId(3014), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3012), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3013), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6085, 6092), + }); + declarations.push(Declaration { + id: DeclarationId(3015), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6103, 6110), + }); + declarations.push(Declaration { + id: DeclarationId(3017), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6103, 6110), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(3018), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5720, 5727), + }); + declarations.push(Declaration { + id: DeclarationId(3019), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3017), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3018), + }, + ], +======= + id: DeclarationId(3017), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3015), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3016), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6103, 6110), + }); + declarations.push(Declaration { + id: DeclarationId(3018), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6233, 6240), + }); + declarations.push(Declaration { + id: DeclarationId(3020), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6233, 6240), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(3021), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5738, 5745), + }); + declarations.push(Declaration { + id: DeclarationId(3022), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3020), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3021), + }, + ], +======= + id: DeclarationId(3020), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3018), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3019), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6233, 6240), + }); + declarations.push(Declaration { + id: DeclarationId(3021), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6251, 6258), + }); + declarations.push(Declaration { + id: DeclarationId(3023), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6251, 6258), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(3024), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5876, 5883), + }); + declarations.push(Declaration { + id: DeclarationId(3025), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3023), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3024), + }, + ], +======= + id: DeclarationId(3023), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3021), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3022), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6251, 6258), + }); + declarations.push(Declaration { + id: DeclarationId(3024), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6391, 6398), + }); + declarations.push(Declaration { + id: DeclarationId(3026), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6391, 6398), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(3027), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5969, 5976), + }); + declarations.push(Declaration { + id: DeclarationId(3028), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3026), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3027), + }, + ], +======= + id: DeclarationId(3026), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3024), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3025), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6391, 6398), + }); + declarations.push(Declaration { + id: DeclarationId(3027), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6409, 6416), + }); + declarations.push(Declaration { + id: DeclarationId(3029), + name: None, +<<<<<<< HEAD + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(2099), + }], + }, +======= + connective: TypeConnective::Conj { children: vec![] }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6409, 6416), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(3030), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6674, 6709), + }); + declarations.push(Declaration { + id: DeclarationId(3031), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3029), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3030), + }, + ], +======= + id: DeclarationId(3029), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3027), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3028), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6409, 6416), + }); + declarations.push(Declaration { + id: DeclarationId(3030), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6547, 6554), + }); + declarations.push(Declaration { + id: DeclarationId(3032), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6547, 6554), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(3033), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6912, 6917), + }); + declarations.push(Declaration { + id: DeclarationId(3034), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3032), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3033), + }, + ], +======= + id: DeclarationId(3032), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3030), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3031), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6547, 6554), + }); + declarations.push(Declaration { + id: DeclarationId(3033), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6640, 6647), + }); + declarations.push(Declaration { + id: DeclarationId(3035), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6640, 6647), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(3036), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7017, 7022), + }); + declarations.push(Declaration { + id: DeclarationId(3037), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3035), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3036), + }, + ], +======= + id: DeclarationId(3035), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3033), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3034), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6640, 6647), + }); + declarations.push(Declaration { + id: DeclarationId(3036), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(2106), + }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7345, 7380), + }); + declarations.push(Declaration { + id: DeclarationId(3038), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7345, 7380), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(3039), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7108, 7113), + }); + declarations.push(Declaration { + id: DeclarationId(3040), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3038), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3039), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7108, 7113), + }); + declarations.push(Declaration { + id: DeclarationId(3041), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(93), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739), + }); + declarations.push(Declaration { + id: DeclarationId(3042), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739), + }); + declarations.push(Declaration { + id: DeclarationId(3043), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3041), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3042), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739), + }); + declarations.push(Declaration { + id: DeclarationId(3044), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(93), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775), + }); + declarations.push(Declaration { + id: DeclarationId(3045), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775), + }); + declarations.push(Declaration { + id: DeclarationId(3046), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3044), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3045), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775), + }); + declarations.push(Declaration { + id: DeclarationId(3047), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814), + }); + declarations.push(Declaration { + id: DeclarationId(3048), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814), + }); + declarations.push(Declaration { + id: DeclarationId(3049), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3047), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3048), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814), + }); + declarations.push(Declaration { + id: DeclarationId(3050), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8783, 8790), + }); + declarations.push(Declaration { + id: DeclarationId(3051), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8783, 8790), + }); + declarations.push(Declaration { + id: DeclarationId(3052), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3050), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3051), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8783, 8790), + }); + declarations.push(Declaration { + id: DeclarationId(3053), + name: None, +======= + id: DeclarationId(3038), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3036), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3037), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7345, 7380), + }); + declarations.push(Declaration { + id: DeclarationId(3039), + name: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(130), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7583, 7588), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(3054), + name: None, + connective: TypeConnective::Conj { children: vec![] }, +======= + id: DeclarationId(3040), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7583, 7588), + }); + declarations.push(Declaration { + id: DeclarationId(3041), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3039), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3040), + }, + ], + }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7583, 7588), + }); + declarations.push(Declaration { + id: DeclarationId(3042), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3053), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3054), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8851, 8856), + }); + declarations.push(Declaration { + id: DeclarationId(3056), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), +<<<<<<< HEAD +======= + ty: DeclarationId(130), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7688, 7693), + }); + declarations.push(Declaration { + id: DeclarationId(3043), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7688, 7693), + }); + declarations.push(Declaration { + id: DeclarationId(3044), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3042), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3043), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7688, 7693), + }); + declarations.push(Declaration { + id: DeclarationId(3045), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(130), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7779, 7784), + }); + declarations.push(Declaration { + id: DeclarationId(3046), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7779, 7784), + }); + declarations.push(Declaration { + id: DeclarationId(3047), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3045), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3046), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7779, 7784), + }); + declarations.push(Declaration { + id: DeclarationId(3048), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(93), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8406, 8410), + }); + declarations.push(Declaration { + id: DeclarationId(3049), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8406, 8410), + }); + declarations.push(Declaration { + id: DeclarationId(3050), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3048), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3049), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8406, 8410), + }); + declarations.push(Declaration { + id: DeclarationId(3051), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(93), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8442, 8446), + }); + declarations.push(Declaration { + id: DeclarationId(3052), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8442, 8446), + }); + declarations.push(Declaration { + id: DeclarationId(3053), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3051), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3052), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8442, 8446), + }); + declarations.push(Declaration { + id: DeclarationId(3054), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8478, 8485), + }); + declarations.push(Declaration { + id: DeclarationId(3055), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8478, 8485), + }); + declarations.push(Declaration { + id: DeclarationId(3056), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3054), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3055), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8478, 8485), + }); + declarations.push(Declaration { + id: DeclarationId(3057), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9454, 9461), + }); + declarations.push(Declaration { + id: DeclarationId(3058), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9454, 9461), + }); + declarations.push(Declaration { + id: DeclarationId(3059), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3057), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3058), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9454, 9461), + }); + declarations.push(Declaration { + id: DeclarationId(3060), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(130), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9522, 9527), + }); + declarations.push(Declaration { + id: DeclarationId(3061), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9522, 9527), + }); + declarations.push(Declaration { + id: DeclarationId(3062), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3060), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3061), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9522, 9527), + }); + declarations.push(Declaration { + id: DeclarationId(3063), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(928), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(3057), +======= + id: DeclarationId(3064), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(3058), +======= + id: DeclarationId(3065), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(3056), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3057), +======= + ty: DeclarationId(3063), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3064), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(3059), +======= + id: DeclarationId(3066), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(3060), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), + }); + declarations.push(Declaration { + id: DeclarationId(3061), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3059), }, Field { label: "None".to_string(), - ty: DeclarationId(2961), + ty: DeclarationId(3060), }, ], }, @@ -87731,15 +103950,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), + span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), }); declarations.push(Declaration { - id: DeclarationId(2963), + id: DeclarationId(3062), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(801), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -87750,10 +103969,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), + span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), }); declarations.push(Declaration { - id: DeclarationId(2964), + id: DeclarationId(3063), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87764,20 +103983,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), + span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), }); declarations.push(Declaration { - id: DeclarationId(2965), + id: DeclarationId(3064), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2963), + ty: DeclarationId(3062), }, Field { label: "None".to_string(), - ty: DeclarationId(2964), + ty: DeclarationId(3063), }, ], }, @@ -87789,15 +104008,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), + span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), }); declarations.push(Declaration { - id: DeclarationId(2966), + id: DeclarationId(3065), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(809), + ty: DeclarationId(938), }], }, type_params: vec![], @@ -87808,10 +104027,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), + span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), }); declarations.push(Declaration { - id: DeclarationId(2967), + id: DeclarationId(3066), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87822,20 +104041,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), + span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), }); declarations.push(Declaration { - id: DeclarationId(2968), + id: DeclarationId(3067), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2966), + ty: DeclarationId(3065), }, Field { label: "None".to_string(), - ty: DeclarationId(2967), + ty: DeclarationId(3066), }, ], }, @@ -87847,31 +104066,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), + span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), }); declarations.push(Declaration { - id: DeclarationId(2969), + id: DeclarationId(3068), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(755), + ty: DeclarationId(938), }], }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), - }); - declarations.push(Declaration { - id: DeclarationId(2970), +======= + id: DeclarationId(3067), name: None, connective: TypeConnective::Conj { children: vec![] }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -87880,20 +104090,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), + span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), }); declarations.push(Declaration { - id: DeclarationId(2971), +<<<<<<< HEAD + id: DeclarationId(3069), + name: None, +======= + id: DeclarationId(3068), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2969), + ty: DeclarationId(3066), }, Field { label: "None".to_string(), - ty: DeclarationId(2970), + ty: DeclarationId(3067), }, ], }, @@ -87905,15 +104119,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), + span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), }); declarations.push(Declaration { - id: DeclarationId(2972), + id: DeclarationId(3069), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(822), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -87924,11 +104138,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), + span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), }); declarations.push(Declaration { - id: DeclarationId(2973), + id: DeclarationId(3070), name: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -87938,20 +104153,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), +<<<<<<< HEAD + span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), }); declarations.push(Declaration { - id: DeclarationId(2974), + id: DeclarationId(3070), +======= + span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), + }); + declarations.push(Declaration { + id: DeclarationId(3071), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2972), +<<<<<<< HEAD + ty: DeclarationId(3068), }, Field { label: "None".to_string(), - ty: DeclarationId(2973), + ty: DeclarationId(3069), +======= + ty: DeclarationId(3069), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3070), }, ], }, @@ -87963,15 +104192,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), + span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), }); declarations.push(Declaration { - id: DeclarationId(2975), + id: DeclarationId(3072), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(755), + ty: DeclarationId(938), }], }, type_params: vec![], @@ -87982,10 +104211,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), + span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), }); declarations.push(Declaration { - id: DeclarationId(2976), + id: DeclarationId(3073), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87996,20 +104225,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), + span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), }); declarations.push(Declaration { - id: DeclarationId(2977), + id: DeclarationId(3074), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2975), + ty: DeclarationId(3072), }, Field { label: "None".to_string(), - ty: DeclarationId(2976), + ty: DeclarationId(3073), }, ], }, @@ -88021,15 +104250,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), + span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), }); declarations.push(Declaration { - id: DeclarationId(2978), + id: DeclarationId(3075), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(825), + ty: DeclarationId(938), }], }, type_params: vec![], @@ -88040,10 +104269,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), + span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), }); declarations.push(Declaration { - id: DeclarationId(2979), + id: DeclarationId(3076), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88054,20 +104283,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), + span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), }); declarations.push(Declaration { - id: DeclarationId(2980), + id: DeclarationId(3077), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2978), + ty: DeclarationId(3075), }, Field { label: "None".to_string(), - ty: DeclarationId(2979), + ty: DeclarationId(3076), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -88079,15 +104309,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), + span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), }); declarations.push(Declaration { - id: DeclarationId(2981), +<<<<<<< HEAD + id: DeclarationId(3071), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(842), + ty: DeclarationId(930), }], }, type_params: vec![], @@ -88098,10 +104329,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), }); declarations.push(Declaration { - id: DeclarationId(2982), + id: DeclarationId(3072), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88112,20 +104343,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), }); declarations.push(Declaration { - id: DeclarationId(2983), + id: DeclarationId(3073), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2981), + ty: DeclarationId(3071), }, Field { label: "None".to_string(), - ty: DeclarationId(2982), + ty: DeclarationId(3072), }, ], }, @@ -88137,15 +104368,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), }); declarations.push(Declaration { - id: DeclarationId(2984), + id: DeclarationId(3074), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(843), + ty: DeclarationId(928), }], }, type_params: vec![], @@ -88156,10 +104387,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), + span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), }); declarations.push(Declaration { - id: DeclarationId(2985), + id: DeclarationId(3075), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88170,20 +104401,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), + span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), }); declarations.push(Declaration { - id: DeclarationId(2986), + id: DeclarationId(3076), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2984), + ty: DeclarationId(3074), }, Field { label: "None".to_string(), - ty: DeclarationId(2985), + ty: DeclarationId(3075), }, ], }, @@ -88195,15 +104426,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), + span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), }); declarations.push(Declaration { - id: DeclarationId(2987), + id: DeclarationId(3077), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(932), }], }, type_params: vec![], @@ -88214,10 +104445,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), + span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), }); declarations.push(Declaration { - id: DeclarationId(2988), + id: DeclarationId(3078), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88228,41 +104459,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), + span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), }); declarations.push(Declaration { - id: DeclarationId(2989), + id: DeclarationId(3079), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2987), + ty: DeclarationId(3077), }, Field { label: "None".to_string(), - ty: DeclarationId(2988), + ty: DeclarationId(3078), }, ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), - }); - declarations.push(Declaration { - id: DeclarationId(2990), +======= + id: DeclarationId(3078), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(930), }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -88272,10 +104493,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), + span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), }); declarations.push(Declaration { - id: DeclarationId(2991), + id: DeclarationId(3080), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88286,20 +104507,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), + span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), }); declarations.push(Declaration { - id: DeclarationId(2992), +<<<<<<< HEAD + id: DeclarationId(3081), + name: None, +======= + id: DeclarationId(3080), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2990), + ty: DeclarationId(3078), }, Field { label: "None".to_string(), - ty: DeclarationId(2991), + ty: DeclarationId(3079), }, ], }, @@ -88311,15 +104536,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), + span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), }); declarations.push(Declaration { - id: DeclarationId(2993), + id: DeclarationId(3081), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(115), + ty: DeclarationId(928), }], }, type_params: vec![], @@ -88330,11 +104555,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), + span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), }); declarations.push(Declaration { - id: DeclarationId(2994), + id: DeclarationId(3082), name: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -88344,20 +104570,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), +<<<<<<< HEAD + span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), }); declarations.push(Declaration { - id: DeclarationId(2995), + id: DeclarationId(3082), +======= + span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), + }); + declarations.push(Declaration { + id: DeclarationId(3083), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2993), +<<<<<<< HEAD + ty: DeclarationId(3080), }, Field { label: "None".to_string(), - ty: DeclarationId(2994), + ty: DeclarationId(3081), +======= + ty: DeclarationId(3081), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3082), }, ], }, @@ -88369,15 +104609,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), + span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), }); declarations.push(Declaration { - id: DeclarationId(2996), + id: DeclarationId(3084), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(932), }], }, type_params: vec![], @@ -88388,10 +104628,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), + span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), }); declarations.push(Declaration { - id: DeclarationId(2997), + id: DeclarationId(3085), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88402,20 +104642,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), + span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), }); declarations.push(Declaration { - id: DeclarationId(2998), + id: DeclarationId(3086), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2996), + ty: DeclarationId(3084), }, Field { label: "None".to_string(), - ty: DeclarationId(2997), + ty: DeclarationId(3085), }, ], }, @@ -88427,15 +104667,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), + span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), }); declarations.push(Declaration { - id: DeclarationId(2999), + id: DeclarationId(3087), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(896), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -88446,10 +104686,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4009, 4036), + span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), }); declarations.push(Declaration { - id: DeclarationId(3000), + id: DeclarationId(3088), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88460,20 +104700,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4009, 4036), + span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), }); declarations.push(Declaration { - id: DeclarationId(3001), + id: DeclarationId(3089), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2999), + ty: DeclarationId(3087), }, Field { label: "None".to_string(), - ty: DeclarationId(3000), + ty: DeclarationId(3088), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -88485,15 +104726,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4009, 4036), + span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), }); declarations.push(Declaration { - id: DeclarationId(3002), +<<<<<<< HEAD + id: DeclarationId(3083), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(128), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -88504,10 +104746,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058), + span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), }); declarations.push(Declaration { - id: DeclarationId(3003), + id: DeclarationId(3084), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88518,20 +104760,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058), + span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), }); declarations.push(Declaration { - id: DeclarationId(3004), + id: DeclarationId(3085), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3002), + ty: DeclarationId(3083), }, Field { label: "None".to_string(), - ty: DeclarationId(3003), + ty: DeclarationId(3084), }, ], }, @@ -88543,15 +104785,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058), + span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), }); declarations.push(Declaration { - id: DeclarationId(3005), + id: DeclarationId(3086), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -88562,10 +104804,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421), + span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), }); declarations.push(Declaration { - id: DeclarationId(3006), + id: DeclarationId(3087), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88576,20 +104818,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421), + span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), }); declarations.push(Declaration { - id: DeclarationId(3007), + id: DeclarationId(3088), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3005), + ty: DeclarationId(3086), }, Field { label: "None".to_string(), - ty: DeclarationId(3006), + ty: DeclarationId(3087), }, ], }, @@ -88601,15 +104843,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421), + span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), }); declarations.push(Declaration { - id: DeclarationId(3008), + id: DeclarationId(3089), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -88620,10 +104862,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439), + span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), }); declarations.push(Declaration { - id: DeclarationId(3009), + id: DeclarationId(3090), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88634,41 +104876,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439), + span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), }); declarations.push(Declaration { - id: DeclarationId(3010), + id: DeclarationId(3091), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3008), + ty: DeclarationId(3089), }, Field { label: "None".to_string(), - ty: DeclarationId(3009), + ty: DeclarationId(3090), }, ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439), - }); - declarations.push(Declaration { - id: DeclarationId(3011), +======= + id: DeclarationId(3090), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(93), }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -88678,10 +104910,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5562, 5569), + span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), }); declarations.push(Declaration { - id: DeclarationId(3012), + id: DeclarationId(3092), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88692,20 +104924,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5562, 5569), + span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), }); declarations.push(Declaration { - id: DeclarationId(3013), +<<<<<<< HEAD + id: DeclarationId(3093), +======= + id: DeclarationId(3092), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3011), + ty: DeclarationId(3090), }, Field { label: "None".to_string(), - ty: DeclarationId(3012), + ty: DeclarationId(3091), }, ], }, @@ -88717,15 +104952,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5562, 5569), + span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), }); declarations.push(Declaration { - id: DeclarationId(3014), + id: DeclarationId(3093), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -88736,10 +104971,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5580, 5587), + span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), }); declarations.push(Declaration { - id: DeclarationId(3015), + id: DeclarationId(3094), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88750,20 +104985,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5580, 5587), + span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), }); declarations.push(Declaration { - id: DeclarationId(3016), + id: DeclarationId(3095), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3014), + ty: DeclarationId(3093), }, Field { label: "None".to_string(), - ty: DeclarationId(3015), + ty: DeclarationId(3094), }, ], }, @@ -88775,15 +105010,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5580, 5587), + span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), }); declarations.push(Declaration { - id: DeclarationId(3017), + id: DeclarationId(3096), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -88794,10 +105029,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5720, 5727), + span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), }); declarations.push(Declaration { - id: DeclarationId(3018), + id: DeclarationId(3097), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88808,20 +105043,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5720, 5727), + span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), }); declarations.push(Declaration { - id: DeclarationId(3019), + id: DeclarationId(3098), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3017), + ty: DeclarationId(3096), }, Field { label: "None".to_string(), - ty: DeclarationId(3018), + ty: DeclarationId(3097), }, ], }, @@ -88833,15 +105068,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5720, 5727), + span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), }); declarations.push(Declaration { - id: DeclarationId(3020), + id: DeclarationId(3099), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -88852,10 +105087,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5738, 5745), + span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), }); declarations.push(Declaration { - id: DeclarationId(3021), + id: DeclarationId(3100), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88866,20 +105101,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5738, 5745), + span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), }); declarations.push(Declaration { - id: DeclarationId(3022), + id: DeclarationId(3101), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), + }); + declarations.push(Declaration { + id: DeclarationId(3094), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3020), +<<<<<<< HEAD + ty: DeclarationId(3092), }, Field { label: "None".to_string(), - ty: DeclarationId(3021), + ty: DeclarationId(3093), +======= + ty: DeclarationId(3099), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3100), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -88891,15 +105149,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5738, 5745), + span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), }); declarations.push(Declaration { - id: DeclarationId(3023), +<<<<<<< HEAD + id: DeclarationId(3095), +======= + id: DeclarationId(3102), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -88910,10 +105172,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5876, 5883), + span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), }); declarations.push(Declaration { - id: DeclarationId(3024), +<<<<<<< HEAD + id: DeclarationId(3096), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88924,20 +105187,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5876, 5883), + span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), }); declarations.push(Declaration { - id: DeclarationId(3025), + id: DeclarationId(3097), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3023), + ty: DeclarationId(3095), }, Field { label: "None".to_string(), - ty: DeclarationId(3024), + ty: DeclarationId(3096), }, ], }, @@ -88949,15 +105212,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5876, 5883), + span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), }); declarations.push(Declaration { - id: DeclarationId(3026), + id: DeclarationId(3098), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(1152), }], }, type_params: vec![], @@ -88968,10 +105231,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5969, 5976), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { - id: DeclarationId(3027), + id: DeclarationId(3099), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88982,20 +105245,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5969, 5976), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { - id: DeclarationId(3028), + id: DeclarationId(3100), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3026), + ty: DeclarationId(3098), }, Field { label: "None".to_string(), - ty: DeclarationId(3027), + ty: DeclarationId(3099), }, ], }, @@ -89007,15 +105270,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5969, 5976), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { - id: DeclarationId(3029), + id: DeclarationId(3101), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(2099), + ty: DeclarationId(1145), }], }, type_params: vec![], @@ -89026,10 +105289,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6674, 6709), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), }); declarations.push(Declaration { - id: DeclarationId(3030), + id: DeclarationId(3102), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89040,20 +105303,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6674, 6709), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), }); declarations.push(Declaration { - id: DeclarationId(3031), + id: DeclarationId(3103), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3029), + ty: DeclarationId(3101), }, Field { label: "None".to_string(), - ty: DeclarationId(3030), + ty: DeclarationId(3102), }, ], }, @@ -89065,31 +105328,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6674, 6709), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), }); declarations.push(Declaration { - id: DeclarationId(3032), + id: DeclarationId(3104), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(130), + ty: DeclarationId(1152), }], }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6912, 6917), - }); - declarations.push(Declaration { - id: DeclarationId(3033), +======= + id: DeclarationId(3103), name: None, connective: TypeConnective::Conj { children: vec![] }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -89098,20 +105352,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6912, 6917), + span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), }); declarations.push(Declaration { - id: DeclarationId(3034), +<<<<<<< HEAD + id: DeclarationId(3105), + name: None, +======= + id: DeclarationId(3104), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3032), + ty: DeclarationId(3102), }, Field { label: "None".to_string(), - ty: DeclarationId(3033), + ty: DeclarationId(3103), }, ], }, @@ -89123,15 +105381,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6912, 6917), + span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), }); declarations.push(Declaration { - id: DeclarationId(3035), + id: DeclarationId(3105), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(130), + ty: DeclarationId(1152), }], }, type_params: vec![], @@ -89142,11 +105400,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7017, 7022), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { - id: DeclarationId(3036), + id: DeclarationId(3106), name: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -89156,20 +105415,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7017, 7022), +<<<<<<< HEAD + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), }); declarations.push(Declaration { - id: DeclarationId(3037), + id: DeclarationId(3106), +======= + span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), + }); + declarations.push(Declaration { + id: DeclarationId(3107), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3035), +<<<<<<< HEAD + ty: DeclarationId(3104), }, Field { label: "None".to_string(), - ty: DeclarationId(3036), + ty: DeclarationId(3105), +======= + ty: DeclarationId(3105), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3106), }, ], }, @@ -89181,15 +105454,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7017, 7022), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { - id: DeclarationId(3038), + id: DeclarationId(3108), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(130), + ty: DeclarationId(1145), }], }, type_params: vec![], @@ -89200,10 +105473,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7108, 7113), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), }); declarations.push(Declaration { - id: DeclarationId(3039), + id: DeclarationId(3109), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89214,20 +105487,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7108, 7113), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), }); declarations.push(Declaration { - id: DeclarationId(3040), + id: DeclarationId(3110), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3038), + ty: DeclarationId(3108), }, Field { label: "None".to_string(), - ty: DeclarationId(3039), + ty: DeclarationId(3109), }, ], }, @@ -89239,15 +105512,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7108, 7113), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), }); declarations.push(Declaration { - id: DeclarationId(3041), + id: DeclarationId(3111), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(1152), }], }, type_params: vec![], @@ -89258,10 +105531,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), }); declarations.push(Declaration { - id: DeclarationId(3042), + id: DeclarationId(3112), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89272,20 +105545,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), }); declarations.push(Declaration { - id: DeclarationId(3043), + id: DeclarationId(3113), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3041), + ty: DeclarationId(3111), }, Field { label: "None".to_string(), - ty: DeclarationId(3042), + ty: DeclarationId(3112), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -89297,15 +105571,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), }); declarations.push(Declaration { - id: DeclarationId(3044), +<<<<<<< HEAD + id: DeclarationId(3107), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(1145), }], }, type_params: vec![], @@ -89316,10 +105591,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), }); declarations.push(Declaration { - id: DeclarationId(3045), + id: DeclarationId(3108), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89330,20 +105605,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), }); declarations.push(Declaration { - id: DeclarationId(3046), + id: DeclarationId(3109), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3044), + ty: DeclarationId(3107), }, Field { label: "None".to_string(), - ty: DeclarationId(3045), + ty: DeclarationId(3108), }, ], }, @@ -89355,15 +105630,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), }); declarations.push(Declaration { - id: DeclarationId(3047), + id: DeclarationId(3110), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(1152), }], }, type_params: vec![], @@ -89374,10 +105649,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), }); declarations.push(Declaration { - id: DeclarationId(3048), + id: DeclarationId(3111), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89388,20 +105663,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), }); declarations.push(Declaration { - id: DeclarationId(3049), + id: DeclarationId(3112), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3047), + ty: DeclarationId(3110), }, Field { label: "None".to_string(), - ty: DeclarationId(3048), + ty: DeclarationId(3111), }, ], }, @@ -89413,15 +105688,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), }); declarations.push(Declaration { - id: DeclarationId(3050), + id: DeclarationId(3113), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(1204), }], }, type_params: vec![], @@ -89432,10 +105707,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8783, 8790), + span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), }); declarations.push(Declaration { - id: DeclarationId(3051), + id: DeclarationId(3114), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89446,41 +105721,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8783, 8790), + span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), }); declarations.push(Declaration { - id: DeclarationId(3052), + id: DeclarationId(3115), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3050), + ty: DeclarationId(3113), }, Field { label: "None".to_string(), - ty: DeclarationId(3051), + ty: DeclarationId(3114), }, ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8783, 8790), - }); - declarations.push(Declaration { - id: DeclarationId(3053), +======= + id: DeclarationId(3114), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(130), + ty: DeclarationId(1145), }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -89490,12 +105755,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8851, 8856), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), }); declarations.push(Declaration { - id: DeclarationId(3054), + id: DeclarationId(3116), name: None, +<<<<<<< HEAD + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(1204), + }], + }, +======= connective: TypeConnective::Conj { children: vec![] }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -89504,20 +105778,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8851, 8856), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), }); declarations.push(Declaration { - id: DeclarationId(3055), +<<<<<<< HEAD + id: DeclarationId(3117), + name: None, +======= + id: DeclarationId(3116), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3053), + ty: DeclarationId(3114), }, Field { label: "None".to_string(), - ty: DeclarationId(3054), + ty: DeclarationId(3115), }, ], }, @@ -89529,15 +105807,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8851, 8856), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), }); declarations.push(Declaration { - id: DeclarationId(3056), + id: DeclarationId(3117), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(928), + ty: DeclarationId(1152), }], }, type_params: vec![], @@ -89548,11 +105826,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), }); declarations.push(Declaration { - id: DeclarationId(3057), + id: DeclarationId(3118), name: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -89562,20 +105841,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755), +<<<<<<< HEAD + span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), }); declarations.push(Declaration { - id: DeclarationId(3058), + id: DeclarationId(3118), +======= + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), + }); + declarations.push(Declaration { + id: DeclarationId(3119), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3056), +<<<<<<< HEAD + ty: DeclarationId(3116), }, Field { label: "None".to_string(), - ty: DeclarationId(3057), + ty: DeclarationId(3117), +======= + ty: DeclarationId(3117), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3118), }, ], }, @@ -89587,15 +105880,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), }); declarations.push(Declaration { - id: DeclarationId(3059), + id: DeclarationId(3120), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(1204), }], }, type_params: vec![], @@ -89606,10 +105899,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), + span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), }); declarations.push(Declaration { - id: DeclarationId(3060), + id: DeclarationId(3121), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89620,20 +105913,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), + span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), }); declarations.push(Declaration { - id: DeclarationId(3061), + id: DeclarationId(3122), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3059), + ty: DeclarationId(3120), }, Field { label: "None".to_string(), - ty: DeclarationId(3060), + ty: DeclarationId(3121), }, ], }, @@ -89645,15 +105938,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), + span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), }); declarations.push(Declaration { - id: DeclarationId(3062), + id: DeclarationId(3123), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(1204), }], }, type_params: vec![], @@ -89664,10 +105957,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), + span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), }); declarations.push(Declaration { - id: DeclarationId(3063), + id: DeclarationId(3124), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89678,20 +105971,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), + span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), }); declarations.push(Declaration { - id: DeclarationId(3064), + id: DeclarationId(3125), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3062), + ty: DeclarationId(3123), }, Field { label: "None".to_string(), - ty: DeclarationId(3063), + ty: DeclarationId(3124), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -89703,15 +105997,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), + span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), }); declarations.push(Declaration { - id: DeclarationId(3065), +<<<<<<< HEAD + id: DeclarationId(3119), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(938), + ty: DeclarationId(1204), }], }, type_params: vec![], @@ -89722,10 +106017,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), + span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), }); declarations.push(Declaration { - id: DeclarationId(3066), + id: DeclarationId(3120), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89736,20 +106031,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), + span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), }); declarations.push(Declaration { - id: DeclarationId(3067), + id: DeclarationId(3121), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3065), + ty: DeclarationId(3119), }, Field { label: "None".to_string(), - ty: DeclarationId(3066), + ty: DeclarationId(3120), }, ], }, @@ -89761,15 +106056,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), + span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), }); declarations.push(Declaration { - id: DeclarationId(3068), + id: DeclarationId(3122), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(938), + ty: DeclarationId(1212), }], }, type_params: vec![], @@ -89780,10 +106075,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), + span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), }); declarations.push(Declaration { - id: DeclarationId(3069), + id: DeclarationId(3123), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89794,20 +106089,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), + span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), }); declarations.push(Declaration { - id: DeclarationId(3070), + id: DeclarationId(3124), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3068), + ty: DeclarationId(3122), }, Field { label: "None".to_string(), - ty: DeclarationId(3069), + ty: DeclarationId(3123), }, ], }, @@ -89819,15 +106114,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), + span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), }); declarations.push(Declaration { - id: DeclarationId(3071), + id: DeclarationId(3125), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(930), + ty: DeclarationId(1214), }], }, type_params: vec![], @@ -89838,10 +106133,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), + span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), }); declarations.push(Declaration { - id: DeclarationId(3072), + id: DeclarationId(3126), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89852,41 +106147,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), + span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), }); declarations.push(Declaration { - id: DeclarationId(3073), + id: DeclarationId(3127), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3071), + ty: DeclarationId(3125), }, Field { label: "None".to_string(), - ty: DeclarationId(3072), + ty: DeclarationId(3126), }, ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), - }); - declarations.push(Declaration { - id: DeclarationId(3074), +======= + id: DeclarationId(3126), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(928), + ty: DeclarationId(1204), }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -89896,10 +106181,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), + span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), }); declarations.push(Declaration { - id: DeclarationId(3075), + id: DeclarationId(3128), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89910,20 +106195,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), + span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), }); declarations.push(Declaration { - id: DeclarationId(3076), + id: DeclarationId(3128), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3074), + ty: DeclarationId(3126), }, Field { label: "None".to_string(), - ty: DeclarationId(3075), + ty: DeclarationId(3127), }, ], }, @@ -89935,15 +106220,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), + span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), }); declarations.push(Declaration { - id: DeclarationId(3077), + id: DeclarationId(3129), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(932), + ty: DeclarationId(1212), }], }, type_params: vec![], @@ -89954,10 +106239,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), + span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), }); declarations.push(Declaration { - id: DeclarationId(3078), + id: DeclarationId(3130), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89968,20 +106253,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), + span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), }); declarations.push(Declaration { - id: DeclarationId(3079), + id: DeclarationId(3131), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3077), + ty: DeclarationId(3129), }, Field { label: "None".to_string(), - ty: DeclarationId(3078), + ty: DeclarationId(3130), }, ], }, @@ -89993,15 +106278,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), + span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), }); declarations.push(Declaration { - id: DeclarationId(3080), + id: DeclarationId(3132), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(1214), }], }, type_params: vec![], @@ -90012,10 +106297,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), + span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), }); declarations.push(Declaration { - id: DeclarationId(3081), + id: DeclarationId(3133), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90026,20 +106311,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), + span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), }); declarations.push(Declaration { - id: DeclarationId(3082), + id: DeclarationId(3134), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3080), + ty: DeclarationId(3132), }, Field { label: "None".to_string(), - ty: DeclarationId(3081), + ty: DeclarationId(3133), }, ], }, @@ -90051,15 +106336,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), + span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), }); declarations.push(Declaration { - id: DeclarationId(3083), + id: DeclarationId(3135), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(806), }], }, type_params: vec![], @@ -90070,10 +106355,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), + span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), }); declarations.push(Declaration { - id: DeclarationId(3084), +<<<<<<< HEAD + id: DeclarationId(3129), +======= + id: DeclarationId(3136), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90084,20 +106373,32 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), + span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), }); declarations.push(Declaration { - id: DeclarationId(3085), +<<<<<<< HEAD + id: DeclarationId(3130), +======= + id: DeclarationId(3137), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3083), +<<<<<<< HEAD + ty: DeclarationId(3128), }, Field { label: "None".to_string(), - ty: DeclarationId(3084), + ty: DeclarationId(3129), +======= + ty: DeclarationId(3135), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3136), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -90109,15 +106410,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), + span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), }); declarations.push(Declaration { - id: DeclarationId(3086), +<<<<<<< HEAD + id: DeclarationId(3131), +======= + id: DeclarationId(3138), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(160), }], }, type_params: vec![], @@ -90128,10 +106433,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), + span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), }); declarations.push(Declaration { - id: DeclarationId(3087), +<<<<<<< HEAD + id: DeclarationId(3132), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90142,20 +106448,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), + span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), }); declarations.push(Declaration { - id: DeclarationId(3088), + id: DeclarationId(3133), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3086), + ty: DeclarationId(3131), }, Field { label: "None".to_string(), - ty: DeclarationId(3087), + ty: DeclarationId(3132), }, ], }, @@ -90167,15 +106473,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), + span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), }); declarations.push(Declaration { - id: DeclarationId(3089), + id: DeclarationId(3134), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -90186,10 +106492,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), + span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), }); declarations.push(Declaration { - id: DeclarationId(3090), + id: DeclarationId(3135), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90200,20 +106506,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), + span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), }); declarations.push(Declaration { - id: DeclarationId(3091), + id: DeclarationId(3136), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3089), + ty: DeclarationId(3134), }, Field { label: "None".to_string(), - ty: DeclarationId(3090), + ty: DeclarationId(3135), }, ], }, @@ -90225,15 +106531,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), + span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), }); declarations.push(Declaration { - id: DeclarationId(3092), + id: DeclarationId(3137), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(1717), }], }, type_params: vec![], @@ -90244,10 +106550,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), }); declarations.push(Declaration { - id: DeclarationId(3093), + id: DeclarationId(3138), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90258,20 +106564,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), }); declarations.push(Declaration { - id: DeclarationId(3094), + id: DeclarationId(3139), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3092), + ty: DeclarationId(3137), }, Field { label: "None".to_string(), - ty: DeclarationId(3093), + ty: DeclarationId(3138), }, ], }, @@ -90283,29 +106589,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), - }); - declarations.push(Declaration { - id: DeclarationId(3095), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(93), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), }); declarations.push(Declaration { - id: DeclarationId(3096), + id: DeclarationId(3140), +======= + id: DeclarationId(3139), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90316,20 +106606,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), + span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), }); declarations.push(Declaration { - id: DeclarationId(3097), +<<<<<<< HEAD + id: DeclarationId(3141), + name: None, +======= + id: DeclarationId(3140), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3095), + ty: DeclarationId(3138), }, Field { label: "None".to_string(), - ty: DeclarationId(3096), + ty: DeclarationId(3139), }, ], }, @@ -90341,15 +106635,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), + span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), }); declarations.push(Declaration { - id: DeclarationId(3098), + id: DeclarationId(3141), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1152), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -90360,11 +106654,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), + span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), }); declarations.push(Declaration { - id: DeclarationId(3099), + id: DeclarationId(3142), name: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -90374,20 +106669,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), +<<<<<<< HEAD + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), }); declarations.push(Declaration { - id: DeclarationId(3100), + id: DeclarationId(3142), +======= + span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), + }); + declarations.push(Declaration { + id: DeclarationId(3143), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3098), +<<<<<<< HEAD + ty: DeclarationId(3140), }, Field { label: "None".to_string(), - ty: DeclarationId(3099), + ty: DeclarationId(3141), +======= + ty: DeclarationId(3141), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3142), }, ], }, @@ -90399,15 +106708,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), + span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), }); declarations.push(Declaration { - id: DeclarationId(3101), + id: DeclarationId(3144), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1145), + ty: DeclarationId(1717), }], }, type_params: vec![], @@ -90418,10 +106727,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), }); declarations.push(Declaration { - id: DeclarationId(3102), + id: DeclarationId(3145), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90432,20 +106741,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), }); declarations.push(Declaration { - id: DeclarationId(3103), + id: DeclarationId(3146), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3101), + ty: DeclarationId(3144), }, Field { label: "None".to_string(), - ty: DeclarationId(3102), + ty: DeclarationId(3145), }, ], }, @@ -90457,15 +106766,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), }); declarations.push(Declaration { - id: DeclarationId(3104), + id: DeclarationId(3147), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1152), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -90476,10 +106785,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), }); declarations.push(Declaration { - id: DeclarationId(3105), + id: DeclarationId(3148), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90490,20 +106799,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), }); declarations.push(Declaration { - id: DeclarationId(3106), + id: DeclarationId(3149), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3104), + ty: DeclarationId(3147), }, Field { label: "None".to_string(), - ty: DeclarationId(3105), + ty: DeclarationId(3148), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -90515,15 +106825,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), }); declarations.push(Declaration { - id: DeclarationId(3107), +<<<<<<< HEAD + id: DeclarationId(3143), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1145), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -90534,10 +106845,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), }); declarations.push(Declaration { - id: DeclarationId(3108), + id: DeclarationId(3144), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90548,20 +106859,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), }); declarations.push(Declaration { - id: DeclarationId(3109), + id: DeclarationId(3145), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3107), + ty: DeclarationId(3143), }, Field { label: "None".to_string(), - ty: DeclarationId(3108), + ty: DeclarationId(3144), }, ], }, @@ -90573,15 +106884,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), }); declarations.push(Declaration { - id: DeclarationId(3110), + id: DeclarationId(3146), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1152), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -90592,10 +106903,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), }); declarations.push(Declaration { - id: DeclarationId(3111), + id: DeclarationId(3147), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90606,20 +106917,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), }); declarations.push(Declaration { - id: DeclarationId(3112), + id: DeclarationId(3148), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3110), + ty: DeclarationId(3146), }, Field { label: "None".to_string(), - ty: DeclarationId(3111), + ty: DeclarationId(3147), }, ], }, @@ -90631,15 +106942,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), }); declarations.push(Declaration { - id: DeclarationId(3113), + id: DeclarationId(3149), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1204), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -90650,10 +106961,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), }); declarations.push(Declaration { - id: DeclarationId(3114), + id: DeclarationId(3150), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90664,41 +106975,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), }); declarations.push(Declaration { - id: DeclarationId(3115), + id: DeclarationId(3151), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3113), + ty: DeclarationId(3149), }, Field { label: "None".to_string(), - ty: DeclarationId(3114), + ty: DeclarationId(3150), }, ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), - }); - declarations.push(Declaration { - id: DeclarationId(3116), +======= + id: DeclarationId(3150), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1204), + ty: DeclarationId(230), }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -90708,12 +107009,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), }); declarations.push(Declaration { - id: DeclarationId(3117), + id: DeclarationId(3152), name: None, +<<<<<<< HEAD + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(1745), + }], + }, +======= connective: TypeConnective::Conj { children: vec![] }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -90722,20 +107032,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), }); declarations.push(Declaration { - id: DeclarationId(3118), +<<<<<<< HEAD + id: DeclarationId(3153), + name: None, +======= + id: DeclarationId(3152), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3116), + ty: DeclarationId(3150), }, Field { label: "None".to_string(), - ty: DeclarationId(3117), + ty: DeclarationId(3151), }, ], }, @@ -90747,15 +107061,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), }); declarations.push(Declaration { - id: DeclarationId(3119), + id: DeclarationId(3153), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1204), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -90766,11 +107080,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), }); declarations.push(Declaration { - id: DeclarationId(3120), + id: DeclarationId(3154), name: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -90780,20 +107095,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), +<<<<<<< HEAD + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), }); declarations.push(Declaration { - id: DeclarationId(3121), + id: DeclarationId(3154), +======= + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), + }); + declarations.push(Declaration { + id: DeclarationId(3155), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3119), +<<<<<<< HEAD + ty: DeclarationId(3152), }, Field { label: "None".to_string(), - ty: DeclarationId(3120), + ty: DeclarationId(3153), +======= + ty: DeclarationId(3153), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3154), }, ], }, @@ -90805,15 +107134,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), }); declarations.push(Declaration { - id: DeclarationId(3122), + id: DeclarationId(3156), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1212), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -90824,10 +107153,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), }); declarations.push(Declaration { - id: DeclarationId(3123), + id: DeclarationId(3157), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90838,20 +107167,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), }); declarations.push(Declaration { - id: DeclarationId(3124), + id: DeclarationId(3158), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3122), + ty: DeclarationId(3156), }, Field { label: "None".to_string(), - ty: DeclarationId(3123), + ty: DeclarationId(3157), }, ], }, @@ -90863,15 +107192,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), }); declarations.push(Declaration { - id: DeclarationId(3125), + id: DeclarationId(3159), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1214), + ty: DeclarationId(1745), }], }, type_params: vec![], @@ -90882,10 +107211,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), }); declarations.push(Declaration { - id: DeclarationId(3126), + id: DeclarationId(3160), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90896,20 +107225,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), }); declarations.push(Declaration { - id: DeclarationId(3127), + id: DeclarationId(3161), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3125), + ty: DeclarationId(3159), }, Field { label: "None".to_string(), - ty: DeclarationId(3126), + ty: DeclarationId(3160), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -90921,15 +107251,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), }); declarations.push(Declaration { - id: DeclarationId(3128), +<<<<<<< HEAD + id: DeclarationId(3155), +======= + id: DeclarationId(3162), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(806), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -90940,10 +107274,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), }); declarations.push(Declaration { - id: DeclarationId(3129), +<<<<<<< HEAD + id: DeclarationId(3156), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90954,20 +107289,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), }); declarations.push(Declaration { - id: DeclarationId(3130), + id: DeclarationId(3157), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3128), + ty: DeclarationId(3155), }, Field { label: "None".to_string(), - ty: DeclarationId(3129), + ty: DeclarationId(3156), }, ], }, @@ -90979,15 +107314,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), }); declarations.push(Declaration { - id: DeclarationId(3131), + id: DeclarationId(3158), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(160), + ty: DeclarationId(1726), }], }, type_params: vec![], @@ -90998,10 +107333,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), }); declarations.push(Declaration { - id: DeclarationId(3132), + id: DeclarationId(3159), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91012,20 +107347,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), }); declarations.push(Declaration { - id: DeclarationId(3133), + id: DeclarationId(3160), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3131), + ty: DeclarationId(3158), }, Field { label: "None".to_string(), - ty: DeclarationId(3132), + ty: DeclarationId(3159), }, ], }, @@ -91037,10 +107372,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), }); declarations.push(Declaration { - id: DeclarationId(3134), + id: DeclarationId(3161), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91056,10 +107391,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), }); declarations.push(Declaration { - id: DeclarationId(3135), + id: DeclarationId(3162), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91070,20 +107405,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), }); declarations.push(Declaration { - id: DeclarationId(3136), + id: DeclarationId(3163), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3134), + ty: DeclarationId(3161), }, Field { label: "None".to_string(), - ty: DeclarationId(3135), + ty: DeclarationId(3162), }, ], }, @@ -91095,29 +107430,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), - }); - declarations.push(Declaration { - id: DeclarationId(3137), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(1717), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), }); declarations.push(Declaration { - id: DeclarationId(3138), + id: DeclarationId(3164), +======= + id: DeclarationId(3163), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91128,20 +107447,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), }); declarations.push(Declaration { - id: DeclarationId(3139), +<<<<<<< HEAD + id: DeclarationId(3165), + name: None, +======= + id: DeclarationId(3164), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3137), + ty: DeclarationId(3162), }, Field { label: "None".to_string(), - ty: DeclarationId(3138), + ty: DeclarationId(3163), }, ], }, @@ -91153,15 +107476,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), }); declarations.push(Declaration { - id: DeclarationId(3140), + id: DeclarationId(3165), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(1726), }], }, type_params: vec![], @@ -91172,11 +107495,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), }); declarations.push(Declaration { - id: DeclarationId(3141), + id: DeclarationId(3166), name: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -91186,20 +107510,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), +<<<<<<< HEAD + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), }); declarations.push(Declaration { - id: DeclarationId(3142), + id: DeclarationId(3166), +======= + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), + }); + declarations.push(Declaration { + id: DeclarationId(3167), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3140), +<<<<<<< HEAD + ty: DeclarationId(3164), }, Field { label: "None".to_string(), - ty: DeclarationId(3141), + ty: DeclarationId(3165), +======= + ty: DeclarationId(3165), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3166), }, ], }, @@ -91211,10 +107549,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), }); declarations.push(Declaration { - id: DeclarationId(3143), + id: DeclarationId(3168), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91230,10 +107568,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), }); declarations.push(Declaration { - id: DeclarationId(3144), + id: DeclarationId(3169), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91244,20 +107582,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), }); declarations.push(Declaration { - id: DeclarationId(3145), + id: DeclarationId(3170), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3143), + ty: DeclarationId(3168), }, Field { label: "None".to_string(), - ty: DeclarationId(3144), + ty: DeclarationId(3169), }, ], }, @@ -91269,10 +107607,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), }); declarations.push(Declaration { - id: DeclarationId(3146), + id: DeclarationId(3171), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91288,10 +107626,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), }); declarations.push(Declaration { - id: DeclarationId(3147), + id: DeclarationId(3172), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91302,20 +107640,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), }); declarations.push(Declaration { - id: DeclarationId(3148), + id: DeclarationId(3173), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3146), + ty: DeclarationId(3171), }, Field { label: "None".to_string(), - ty: DeclarationId(3147), + ty: DeclarationId(3172), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -91327,10 +107666,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), }); declarations.push(Declaration { - id: DeclarationId(3149), +<<<<<<< HEAD + id: DeclarationId(3167), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91346,10 +107686,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), }); declarations.push(Declaration { - id: DeclarationId(3150), + id: DeclarationId(3168), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91360,20 +107700,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), }); declarations.push(Declaration { - id: DeclarationId(3151), + id: DeclarationId(3169), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3149), + ty: DeclarationId(3167), }, Field { label: "None".to_string(), - ty: DeclarationId(3150), + ty: DeclarationId(3168), }, ], }, @@ -91385,15 +107725,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), }); declarations.push(Declaration { - id: DeclarationId(3152), + id: DeclarationId(3170), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1745), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -91404,10 +107744,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), }); declarations.push(Declaration { - id: DeclarationId(3153), + id: DeclarationId(3171), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91418,20 +107758,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), }); declarations.push(Declaration { - id: DeclarationId(3154), + id: DeclarationId(3172), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3152), + ty: DeclarationId(3170), }, Field { label: "None".to_string(), - ty: DeclarationId(3153), + ty: DeclarationId(3171), }, ], }, @@ -91443,15 +107783,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), }); declarations.push(Declaration { - id: DeclarationId(3155), + id: DeclarationId(3173), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -91462,10 +107802,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), }); declarations.push(Declaration { - id: DeclarationId(3156), + id: DeclarationId(3174), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91476,41 +107816,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), }); declarations.push(Declaration { - id: DeclarationId(3157), + id: DeclarationId(3175), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3155), + ty: DeclarationId(3173), }, Field { label: "None".to_string(), - ty: DeclarationId(3156), + ty: DeclarationId(3174), }, ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), - }); - declarations.push(Declaration { - id: DeclarationId(3158), +======= + id: DeclarationId(3174), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1726), + ty: DeclarationId(230), }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -91520,10 +107850,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), }); declarations.push(Declaration { - id: DeclarationId(3159), + id: DeclarationId(3176), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91534,20 +107864,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), }); declarations.push(Declaration { - id: DeclarationId(3160), +<<<<<<< HEAD + id: DeclarationId(3177), + name: None, +======= + id: DeclarationId(3176), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3158), + ty: DeclarationId(3174), }, Field { label: "None".to_string(), - ty: DeclarationId(3159), + ty: DeclarationId(3175), }, ], }, @@ -91559,15 +107893,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), }); declarations.push(Declaration { - id: DeclarationId(3161), + id: DeclarationId(3177), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -91578,11 +107912,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), }); declarations.push(Declaration { - id: DeclarationId(3162), + id: DeclarationId(3178), name: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -91592,20 +107927,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), +<<<<<<< HEAD + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), }); declarations.push(Declaration { - id: DeclarationId(3163), + id: DeclarationId(3178), +======= + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), + }); + declarations.push(Declaration { + id: DeclarationId(3179), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3161), +<<<<<<< HEAD + ty: DeclarationId(3176), }, Field { label: "None".to_string(), - ty: DeclarationId(3162), + ty: DeclarationId(3177), +======= + ty: DeclarationId(3177), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3178), }, ], }, @@ -91617,10 +107966,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), }); declarations.push(Declaration { - id: DeclarationId(3164), + id: DeclarationId(3180), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91636,10 +107985,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), }); declarations.push(Declaration { - id: DeclarationId(3165), + id: DeclarationId(3181), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91650,20 +107999,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), }); declarations.push(Declaration { - id: DeclarationId(3166), + id: DeclarationId(3182), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3164), + ty: DeclarationId(3180), }, Field { label: "None".to_string(), - ty: DeclarationId(3165), + ty: DeclarationId(3181), }, ], }, @@ -91675,10 +108024,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), }); declarations.push(Declaration { - id: DeclarationId(3167), + id: DeclarationId(3183), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91694,10 +108043,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), }); declarations.push(Declaration { - id: DeclarationId(3168), + id: DeclarationId(3184), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91708,20 +108057,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), }); declarations.push(Declaration { - id: DeclarationId(3169), + id: DeclarationId(3185), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3167), + ty: DeclarationId(3183), }, Field { label: "None".to_string(), - ty: DeclarationId(3168), + ty: DeclarationId(3184), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -91733,10 +108083,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), }); declarations.push(Declaration { - id: DeclarationId(3170), +<<<<<<< HEAD + id: DeclarationId(3179), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91752,10 +108103,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), }); declarations.push(Declaration { - id: DeclarationId(3171), + id: DeclarationId(3180), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91766,20 +108117,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), }); declarations.push(Declaration { - id: DeclarationId(3172), + id: DeclarationId(3181), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3170), + ty: DeclarationId(3179), }, Field { label: "None".to_string(), - ty: DeclarationId(3171), + ty: DeclarationId(3180), }, ], }, @@ -91791,10 +108142,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), }); declarations.push(Declaration { - id: DeclarationId(3173), + id: DeclarationId(3182), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91810,10 +108161,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), }); declarations.push(Declaration { - id: DeclarationId(3174), + id: DeclarationId(3183), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91824,20 +108175,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), }); declarations.push(Declaration { - id: DeclarationId(3175), + id: DeclarationId(3184), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3173), + ty: DeclarationId(3182), }, Field { label: "None".to_string(), - ty: DeclarationId(3174), + ty: DeclarationId(3183), }, ], }, @@ -91849,15 +108200,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), }); declarations.push(Declaration { - id: DeclarationId(3176), + id: DeclarationId(3185), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -91868,10 +108219,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), }); declarations.push(Declaration { - id: DeclarationId(3177), + id: DeclarationId(3186), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91882,41 +108233,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), }); declarations.push(Declaration { - id: DeclarationId(3178), + id: DeclarationId(3187), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3176), + ty: DeclarationId(3185), }, Field { label: "None".to_string(), - ty: DeclarationId(3177), + ty: DeclarationId(3186), }, ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), - }); - declarations.push(Declaration { - id: DeclarationId(3179), +======= + id: DeclarationId(3186), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), ty: DeclarationId(93), }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -91929,7 +108270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), }); declarations.push(Declaration { - id: DeclarationId(3180), + id: DeclarationId(3188), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91943,17 +108284,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), }); declarations.push(Declaration { - id: DeclarationId(3181), +<<<<<<< HEAD + id: DeclarationId(3189), + name: None, +======= + id: DeclarationId(3188), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3179), + ty: DeclarationId(3186), }, Field { label: "None".to_string(), - ty: DeclarationId(3180), + ty: DeclarationId(3187), }, ], }, @@ -91968,7 +108313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), }); declarations.push(Declaration { - id: DeclarationId(3182), + id: DeclarationId(3189), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91987,8 +108332,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), }); declarations.push(Declaration { - id: DeclarationId(3183), + id: DeclarationId(3190), name: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -91998,20 +108344,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6027, 6031), + }); + declarations.push(Declaration { + id: DeclarationId(3190), +======= span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), }); declarations.push(Declaration { - id: DeclarationId(3184), + id: DeclarationId(3191), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3182), +<<<<<<< HEAD + ty: DeclarationId(3188), }, Field { label: "None".to_string(), - ty: DeclarationId(3183), + ty: DeclarationId(3189), +======= + ty: DeclarationId(3189), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3190), }, ], }, @@ -92026,7 +108386,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), }); declarations.push(Declaration { - id: DeclarationId(3185), + id: DeclarationId(3192), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92045,7 +108405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), }); declarations.push(Declaration { - id: DeclarationId(3186), + id: DeclarationId(3193), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92059,17 +108419,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), }); declarations.push(Declaration { - id: DeclarationId(3187), + id: DeclarationId(3194), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3185), + ty: DeclarationId(3192), }, Field { label: "None".to_string(), - ty: DeclarationId(3186), + ty: DeclarationId(3193), }, ], }, @@ -92084,7 +108444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), }); declarations.push(Declaration { - id: DeclarationId(3188), + id: DeclarationId(3195), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92103,7 +108463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6027, 6031), }); declarations.push(Declaration { - id: DeclarationId(3189), + id: DeclarationId(3196), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92117,17 +108477,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6027, 6031), }); declarations.push(Declaration { - id: DeclarationId(3190), + id: DeclarationId(3197), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3188), + ty: DeclarationId(3195), }, Field { label: "None".to_string(), - ty: DeclarationId(3189), + ty: DeclarationId(3196), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -92142,7 +108503,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6027, 6031), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(3191), +======= + id: DeclarationId(3198), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92161,6 +108526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(3192), name: None, connective: TypeConnective::Conj { children: vec![] }, @@ -92317,11 +108683,57 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(3200), +======= + id: DeclarationId(3199), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(3201), + name: None, +======= + id: DeclarationId(3200), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3198), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3199), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), + }); + declarations.push(Declaration { + id: DeclarationId(3201), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -92332,11 +108744,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), }); declarations.push(Declaration { - id: DeclarationId(3201), + id: DeclarationId(3202), name: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -92346,20 +108759,151 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, +<<<<<<< HEAD span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), }); declarations.push(Declaration { id: DeclarationId(3202), +======= + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), + }); + declarations.push(Declaration { + id: DeclarationId(3203), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(3200), }, Field { label: "None".to_string(), ty: DeclarationId(3201), +======= + ty: DeclarationId(3201), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3202), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), + }); + declarations.push(Declaration { + id: DeclarationId(3204), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(93), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), + }); + declarations.push(Declaration { + id: DeclarationId(3205), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), + }); + declarations.push(Declaration { + id: DeclarationId(3206), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3204), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3205), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), + }); + declarations.push(Declaration { + id: DeclarationId(3207), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), + }); + declarations.push(Declaration { + id: DeclarationId(3208), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), + }); + declarations.push(Declaration { + id: DeclarationId(3209), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3207), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3208), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -92374,6 +108918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(3203), name: None, connective: TypeConnective::Conj { @@ -92536,6 +109081,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ty: DeclarationId(3210), }, ], +======= + id: DeclarationId(3210), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(93), + }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -92545,11 +109099,166 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7170, 7174), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6175, 6179), + }); + declarations.push(Declaration { + id: DeclarationId(3212), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6175, 6179), }); declarations.push(Declaration { id: DeclarationId(3212), name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3210), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3211), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6175, 6179), + }); + declarations.push(Declaration { + id: DeclarationId(3213), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(93), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6186, 6190), + }); + declarations.push(Declaration { + id: DeclarationId(3214), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6186, 6190), + }); + declarations.push(Declaration { + id: DeclarationId(3215), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3213), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3214), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6186, 6190), + }); + declarations.push(Declaration { + id: DeclarationId(3216), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(93), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7170, 7174), + }); + declarations.push(Declaration { + id: DeclarationId(3217), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7170, 7174), + }); + declarations.push(Declaration { + id: DeclarationId(3218), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3216), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3217), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7170, 7174), + }); + declarations.push(Declaration { + id: DeclarationId(3219), + name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), @@ -92567,7 +109276,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7253, 7260), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(3213), +======= + id: DeclarationId(3220), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92581,17 +109294,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7253, 7260), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(3214), +======= + id: DeclarationId(3221), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(3212), }, Field { label: "None".to_string(), ty: DeclarationId(3213), +======= + ty: DeclarationId(3219), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3220), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -92606,7 +109331,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7253, 7260), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(3215), +======= + id: DeclarationId(3222), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92625,7 +109354,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7900, 7904), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(3216), +======= + id: DeclarationId(3223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92639,17 +109372,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7900, 7904), }); declarations.push(Declaration { +<<<<<<< HEAD id: DeclarationId(3217), +======= + id: DeclarationId(3224), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(3215), }, Field { label: "None".to_string(), ty: DeclarationId(3216), +======= + ty: DeclarationId(3222), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3223), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -98042,7 +114787,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(671), Port { id: PortId(671), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2320))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2327))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: None, }, ); @@ -98474,7 +115223,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(725), Port { id: PortId(725), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2464))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2471))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(596)), }, ); @@ -98498,7 +115251,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(728), Port { id: PortId(728), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2465))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2472))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(598)), }, ); @@ -98506,7 +115263,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(729), Port { id: PortId(729), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2466))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2473))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(600)), }, ); @@ -98514,7 +115275,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(730), Port { id: PortId(730), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2467))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2474))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(602)), }, ); @@ -98522,7 +115287,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(731), Port { id: PortId(731), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2468))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2475))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(604)), }, ); @@ -98530,7 +115299,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(732), Port { id: PortId(732), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2469))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2476))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(606)), }, ); @@ -98538,7 +115311,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(733), Port { id: PortId(733), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2470))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2477))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(608)), }, ); @@ -98546,7 +115323,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(734), Port { id: PortId(734), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2472))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2479))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(610)), }, ); @@ -98578,7 +115359,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(738), Port { id: PortId(738), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2474))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2481))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(614)), }, ); @@ -98602,7 +115387,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(741), Port { id: PortId(741), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2475))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2482))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(617)), }, ); @@ -98634,7 +115423,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(745), Port { id: PortId(745), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2476))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2483))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(621)), }, ); @@ -98682,7 +115475,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(751), Port { id: PortId(751), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2477))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2484))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(626)), }, ); @@ -98754,7 +115551,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(760), Port { id: PortId(760), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2478))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2485))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(633)), }, ); @@ -98834,7 +115635,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(770), Port { id: PortId(770), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2479))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2486))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(640)), }, ); @@ -98898,7 +115703,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(778), Port { id: PortId(778), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2480))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2487))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(645)), }, ); @@ -98914,7 +115723,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(780), Port { id: PortId(780), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2481))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2488))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: None, }, ); @@ -99002,7 +115815,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(791), Port { id: PortId(791), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2482))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2489))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(655)), }, ); @@ -99074,7 +115891,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(800), Port { id: PortId(800), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2483))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2490))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(663)), }, ); @@ -99498,7 +116319,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(853), Port { id: PortId(853), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2540))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2547))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(713)), }, ); @@ -100274,7 +117099,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(950), Port { id: PortId(950), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2541))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2548))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(792)), }, ); @@ -100418,7 +117247,11 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(968), Port { id: PortId(968), +<<<<<<< HEAD state: PortState::Resolved(TypeShape::new(DeclarationId(2701))), +======= + state: PortState::Resolved(TypeShape::new(DeclarationId(2708))), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(808)), }, ); @@ -100757,6 +117590,7 @@ fn bootstrapped_fixture_dag_clusters() -> Vec { fn bootstrapped_fixture_dag_optional_match_disjs() -> HashMap { { let mut map = HashMap::new(); +<<<<<<< HEAD map.insert(DeclarationId(389), DeclarationId(2848)); map.insert(DeclarationId(391), DeclarationId(2851)); map.insert(DeclarationId(423), DeclarationId(2854)); @@ -100881,6 +117715,132 @@ fn bootstrapped_fixture_dag_optional_match_disjs() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) map } } diff --git a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs index f1d87cb37ff..edaf354c0e7 100644 --- a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs +++ b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs @@ -8,7 +8,11 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag { ports: bootstrapped_fixture_without_parse_surface_dag_ports(), diagnostics: bootstrapped_fixture_without_parse_surface_dag_diagnostics(), next_node_id: 844, +<<<<<<< HEAD next_declaration_id: 3116, +======= + next_declaration_id: 3123, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) next_port_id: 1009, primitives: PrimitiveCache::default(), substrate_markers: SubstrateMarkers::default(), @@ -24,7 +28,11 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag { emit_model_variants: EmitModelVariants::default(), clusters: bootstrapped_fixture_without_parse_surface_dag_clusters(), optional_match_disjs: bootstrapped_fixture_without_parse_surface_dag_optional_match_disjs(), +<<<<<<< HEAD declaration_append_begin_after_bootstrap: 3116, +======= + declaration_append_begin_after_bootstrap: 3123, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) } } @@ -6320,7 +6328,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(559), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2397)), +======= + target: TransformTarget::Callable(DeclarationId(2404)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(678)], output: PortId(679), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3087, 3125), @@ -6343,7 +6355,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(562), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2398)), +======= + target: TransformTarget::Callable(DeclarationId(2405)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(682)], output: PortId(683), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3165, 3203), @@ -6409,7 +6425,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(567), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2399)), +======= + target: TransformTarget::Callable(DeclarationId(2406)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(688)], output: PortId(689), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3324, 3362), @@ -6432,7 +6452,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(570), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2400)), +======= + target: TransformTarget::Callable(DeclarationId(2407)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(692)], output: PortId(693), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3402, 3440), @@ -6498,7 +6522,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(575), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2401)), +======= + target: TransformTarget::Callable(DeclarationId(2408)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(698)], output: PortId(699), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3558, 3596), @@ -6521,7 +6549,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(578), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2402)), +======= + target: TransformTarget::Callable(DeclarationId(2409)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(702)], output: PortId(703), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3636, 3674), @@ -6587,7 +6619,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(583), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2403)), +======= + target: TransformTarget::Callable(DeclarationId(2410)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(708)], output: PortId(709), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3790, 3828), @@ -6610,7 +6646,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(586), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2404)), +======= + target: TransformTarget::Callable(DeclarationId(2411)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(712)], output: PortId(713), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3868, 3906), @@ -6676,7 +6716,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(591), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2405)), +======= + target: TransformTarget::Callable(DeclarationId(2412)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(718)], output: PortId(719), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4022, 4060), @@ -6699,7 +6743,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(594), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2406)), +======= + target: TransformTarget::Callable(DeclarationId(2413)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(722)], output: PortId(723), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4100, 4138), @@ -6858,7 +6906,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(600), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2407)), +======= + target: TransformTarget::Callable(DeclarationId(2414)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(729), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4824, 4829), @@ -6874,7 +6926,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(602), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2408)), +======= + target: TransformTarget::Callable(DeclarationId(2415)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(730), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4889, 4894), @@ -6890,7 +6946,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(604), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2409)), +======= + target: TransformTarget::Callable(DeclarationId(2416)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(731), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4952, 4957), @@ -6906,7 +6966,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(606), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2410)), +======= + target: TransformTarget::Callable(DeclarationId(2417)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(732), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5015, 5020), @@ -6922,7 +6986,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(608), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2411)), +======= + target: TransformTarget::Callable(DeclarationId(2418)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(733), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5079, 5084), @@ -6938,7 +7006,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(610), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2412)), +======= + target: TransformTarget::Callable(DeclarationId(2419)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(734), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5159, 5164), @@ -6954,7 +7026,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(612), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2414)), +======= + target: TransformTarget::Callable(DeclarationId(2421)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(735)], output: PortId(736), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5275, 5286), @@ -6968,7 +7044,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(614), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2413)), +======= + target: TransformTarget::Callable(DeclarationId(2420)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(736), PortId(737)], output: PortId(738), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5262, 5327), @@ -6991,7 +7071,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(617), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2415)), +======= + target: TransformTarget::Callable(DeclarationId(2422)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(739), PortId(740)], output: PortId(741), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5403, 5461), @@ -7021,7 +7105,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(621), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2416)), +======= + target: TransformTarget::Callable(DeclarationId(2423)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(743), PortId(742), PortId(744)], output: PortId(745), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5562, 5687), @@ -7058,7 +7146,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(626), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2417)), +======= + target: TransformTarget::Callable(DeclarationId(2424)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(748), PortId(749), PortId(750)], output: PortId(751), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5808, 5970), @@ -7528,7 +7620,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(667), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2456)), +======= + target: TransformTarget::Callable(DeclarationId(2463)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(802), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6287, 6297), @@ -7544,28 +7640,44 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(669), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2456)), +======= + target: TransformTarget::Callable(DeclarationId(2463)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(806), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6605, 6615), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(670), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2456)), +======= + target: TransformTarget::Callable(DeclarationId(2463)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(807), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6667, 6677), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(671), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2458)), +======= + target: TransformTarget::Callable(DeclarationId(2465)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(808), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6695, 6700), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(672), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2458)), +======= + target: TransformTarget::Callable(DeclarationId(2465)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(809), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6722, 6727), @@ -7581,7 +7693,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(674), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2458)), +======= + target: TransformTarget::Callable(DeclarationId(2465)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(812), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6764, 6769), @@ -7636,21 +7752,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(676), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2456)), +======= + target: TransformTarget::Callable(DeclarationId(2463)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(814), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6833, 6843), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(677), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2458)), +======= + target: TransformTarget::Callable(DeclarationId(2465)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(815), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6861, 6866), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(678), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2457)), +======= + target: TransformTarget::Callable(DeclarationId(2464)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(816), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6888, 6897), @@ -7666,7 +7794,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(680), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2457)), +======= + target: TransformTarget::Callable(DeclarationId(2464)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(819), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6934, 6943), @@ -7730,21 +7862,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(683), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2456)), +======= + target: TransformTarget::Callable(DeclarationId(2463)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(823), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7023, 7033), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(684), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2458)), +======= + target: TransformTarget::Callable(DeclarationId(2465)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(824), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7051, 7056), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(685), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2457)), +======= + target: TransformTarget::Callable(DeclarationId(2464)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(825), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7078, 7087), @@ -7792,7 +7936,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(691), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2455)), +======= + target: TransformTarget::Callable(DeclarationId(2462)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(831)], output: PortId(832), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7166, 7219), @@ -7851,7 +7999,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(696), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2455)), +======= + target: TransformTarget::Callable(DeclarationId(2462)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(836)], output: PortId(837), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7247, 7335), @@ -8043,7 +8195,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(708), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2455)), +======= + target: TransformTarget::Callable(DeclarationId(2462)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(847)], output: PortId(848), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7672, 7713), @@ -8082,7 +8238,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(713), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2460)), +======= + target: TransformTarget::Callable(DeclarationId(2467)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(853), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7967, 7972), @@ -8221,14 +8381,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(722), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2214)), +======= + target: TransformTarget::Callable(DeclarationId(2221)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(868), span: SourceSpan::new("src/v3/std/timing_lens.dag", 8722, 8734), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(723), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2220)), +======= + target: TransformTarget::Callable(DeclarationId(2227)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(868)], output: PortId(869), span: SourceSpan::new("src/v3/std/timing_lens.dag", 8709, 8735), @@ -8336,7 +8504,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(737), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2248)), +======= + target: TransformTarget::Callable(DeclarationId(2255)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(883)], output: PortId(884), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9826, 9938), @@ -8357,7 +8529,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(740), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2248)), +======= + target: TransformTarget::Callable(DeclarationId(2255)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(886)], output: PortId(887), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9966, 10147), @@ -8417,7 +8593,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(745), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2248)), +======= + target: TransformTarget::Callable(DeclarationId(2255)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(892)], output: PortId(893), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10183, 10344), @@ -8519,21 +8699,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(752), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2456)), +======= + target: TransformTarget::Callable(DeclarationId(2463)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(904), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10974, 10984), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(753), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2457)), +======= + target: TransformTarget::Callable(DeclarationId(2464)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(905), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11002, 11011), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(754), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2458)), +======= + target: TransformTarget::Callable(DeclarationId(2465)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(906), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11025, 11030), @@ -8618,7 +8810,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(760), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2461)), +======= + target: TransformTarget::Callable(DeclarationId(2468)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(913)], output: PortId(914), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11954, 11995), @@ -8632,7 +8828,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(762), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2462)), +======= + target: TransformTarget::Callable(DeclarationId(2469)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(915)], output: PortId(916), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12001, 12042), @@ -8687,7 +8887,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(767), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2463)), +======= + target: TransformTarget::Callable(DeclarationId(2470)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(921)], output: PortId(922), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12105, 12146), @@ -8701,7 +8905,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(769), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2464)), +======= + target: TransformTarget::Callable(DeclarationId(2471)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(923)], output: PortId(924), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12152, 12193), @@ -8756,7 +8964,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(774), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2465)), +======= + target: TransformTarget::Callable(DeclarationId(2472)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(929)], output: PortId(930), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12253, 12294), @@ -8770,7 +8982,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(776), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2466)), +======= + target: TransformTarget::Callable(DeclarationId(2473)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(931)], output: PortId(932), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12300, 12341), @@ -8825,7 +9041,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(781), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2467)), +======= + target: TransformTarget::Callable(DeclarationId(2474)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(937)], output: PortId(938), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12399, 12440), @@ -8839,7 +9059,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(783), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2468)), +======= + target: TransformTarget::Callable(DeclarationId(2475)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(939)], output: PortId(940), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12446, 12487), @@ -8894,7 +9118,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(788), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2469)), +======= + target: TransformTarget::Callable(DeclarationId(2476)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(945)], output: PortId(946), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12545, 12586), @@ -8908,7 +9136,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(790), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2470)), +======= + target: TransformTarget::Callable(DeclarationId(2477)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![PortId(947)], output: PortId(948), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12592, 12633), @@ -9043,14 +9275,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(797), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2247)), +======= + target: TransformTarget::Callable(DeclarationId(2254)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(957), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12817, 12829), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(798), +<<<<<<< HEAD target: TransformTarget::Callable(DeclarationId(2247)), +======= + target: TransformTarget::Callable(DeclarationId(2254)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) inputs: vec![], output: PortId(958), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12835, 12847), @@ -9734,7 +9974,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { #[allow(clippy::vec_init_then_push)] fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec { { +<<<<<<< HEAD let mut declarations = Vec::with_capacity(3116); +======= + let mut declarations = Vec::with_capacity(3123); +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) declarations.push(Declaration { id: DeclarationId(0), name: Some("Classical".to_string()), @@ -23999,9 +24243,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24031,9 +24285,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24079,7 +24343,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1741), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)), }, @@ -24111,8 +24379,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)), }, type_params: vec![DeclarationId(695), DeclarationId(696)], @@ -24157,8 +24430,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)), }, type_params: vec![DeclarationId(698), DeclarationId(699)], @@ -24478,9 +24756,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24526,7 +24814,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(128), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)), }, @@ -24826,7 +25118,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1773), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)), }, @@ -25194,7 +25490,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)), }, type_params: vec![], @@ -25524,7 +25824,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)), }, type_params: vec![], @@ -25542,7 +25846,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)), }, type_params: vec![], @@ -26387,7 +26695,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "type_params".to_string(), @@ -27290,7 +27602,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1838), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", @@ -27312,7 +27628,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1839), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", @@ -27334,7 +27654,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1840), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", @@ -27356,7 +27680,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1841), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", @@ -27378,7 +27706,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1842), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", @@ -27400,7 +27732,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1843), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", @@ -27495,7 +27831,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1845), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", @@ -27827,7 +28167,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1961), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 11047, 11062)), }, @@ -27845,7 +28189,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1962), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(185))), }, @@ -27863,7 +28211,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1964), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(187))), }, @@ -27990,7 +28342,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(220))), }, type_params: vec![], @@ -28309,7 +28665,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(440))), }, type_params: vec![], @@ -28327,7 +28687,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(452))), }, type_params: vec![], @@ -28345,7 +28709,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(469))), }, type_params: vec![], @@ -28493,7 +28861,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1979), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(517))), }, @@ -28511,7 +28883,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1981), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(524))), }, @@ -28578,7 +28954,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1170), }], }, @@ -28668,17 +29048,65 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) id: DeclarationId(896), name: Some("AnthropicToolResultContent".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ToolResultText".to_string(), +<<<<<<< HEAD ty: DeclarationId(2055), }, Field { label: "ToolResultBlocks".to_string(), ty: DeclarationId(2057), +======= + ty: DeclarationId(2062), + }, + Field { + label: "ToolResultBlocks".to_string(), + ty: DeclarationId(2064), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -28690,7 +29118,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -28715,7 +29151,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -28740,7 +29184,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ModelContextWindowExceeded".to_string(), @@ -28785,7 +29257,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + Field { + label: "PageLocation".to_string(), + ty: DeclarationId(2083), + }, + Field { + label: "ContentBlockLocation".to_string(), + ty: DeclarationId(2086), + }, + Field { + label: "WebSearchResultLocation".to_string(), + ty: DeclarationId(2088), }, Field { label: "SearchResultLocation".to_string(), +<<<<<<< HEAD ty: DeclarationId(2083), +======= + ty: DeclarationId(2090), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -28822,7 +29314,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ty: DeclarationId(2101), }, Field { @@ -28912,9 +29427,61 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) id: DeclarationId(903), name: Some("AnthropicMessages200Usage".to_string()), connective: TypeConnective::Conj { @@ -28929,11 +29496,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "service_tier".to_string(), @@ -28949,7 +29528,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -28968,7 +29551,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "model".to_string(), @@ -29001,7 +29588,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "usage".to_string(), @@ -29009,7 +29600,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -29021,7 +29616,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ExtdepsFixtureAuthority".to_string(), @@ -29132,476 +29747,748 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/bit.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2110), +======= + constructor: DeclarationId(2117), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/error_primitives.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2110), +======= + constructor: DeclarationId(2117), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/algebra.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2110), +======= + constructor: DeclarationId(2117), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/magnitude.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2110), +======= + constructor: DeclarationId(2117), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/machine_constraints.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2110), +======= + constructor: DeclarationId(2117), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/nat.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2110), +======= + constructor: DeclarationId(2117), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/integer.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2110), +======= + constructor: DeclarationId(2117), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/rational.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2110), +======= + constructor: DeclarationId(2117), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/float.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2110), +======= + constructor: DeclarationId(2117), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/types.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2110), +======= + constructor: DeclarationId(2117), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/string_type.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2110), +======= + constructor: DeclarationId(2117), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/unicode.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2110), +======= + constructor: DeclarationId(2117), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/render_repeat_string_bootstrap.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2110), +======= + constructor: DeclarationId(2117), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/methods.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2110), +======= + constructor: DeclarationId(2117), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/std/serialization.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2110), +======= + constructor: DeclarationId(2117), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/algebra.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/anthropic_messages.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/anthropic_operations.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/anthropic_schema.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/approximate_field.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/bin_shim.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/bootstrap_authority.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/bridge_ledger.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/clean_emission.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/computation.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/computation_model.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/coproduct_projection.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/cross_target_coverage.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/diagnostics.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/dimensions.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/effects.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/emission_provenance.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/emit_model.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/go_method_template_contracts.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/induction.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/integer_diagnostic_order.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/lens.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/lens_application.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/list.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/lookup.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/methods.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/parse_surface.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/python_method_template_contracts.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/resources.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/runtime.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/rust_method_template_contracts.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/services.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/substrate.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/substrate_minimal.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/termination.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/t_ci_workflow_as_data_demo.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/timing_lens.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/tokenize.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/verification.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/std/workflows.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2111), +======= + constructor: DeclarationId(2118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/spec/v3_l1.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2112), +======= + constructor: DeclarationId(2119), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/spec/go.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2112), +======= + constructor: DeclarationId(2119), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/spec/python.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2112), +======= + constructor: DeclarationId(2119), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/spec/rust.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2112), +======= + constructor: DeclarationId(2119), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/compiler/pipeline.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2113), +======= + constructor: DeclarationId(2120), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/compiler/operators.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2113), +======= + constructor: DeclarationId(2120), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "src/v3/compiler/regen.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2113), +======= + constructor: DeclarationId(2120), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/extdeps/languages/rust/primitives.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2114), +======= + constructor: DeclarationId(2121), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/extdeps/cron_schedule_model.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2114), +======= + constructor: DeclarationId(2121), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/extdeps/github/github.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2114), +======= + constructor: DeclarationId(2121), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "dsl/extdeps/github/actions.dag".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2114), +======= + constructor: DeclarationId(2121), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -29619,11 +30506,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -29689,7 +30584,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) declarations.push(Declaration { id: DeclarationId(914), name: Some("CleanEmissionContract".to_string()), @@ -29775,11 +30674,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "NoWrapping".to_string(), @@ -29804,6 +30715,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "NotApplicablePatternBinding".to_string(), @@ -29837,11 +30764,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -29862,11 +30797,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ImportPerUsageSite".to_string(), @@ -29891,11 +30838,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ExplicitReturnKeyword".to_string(), @@ -29920,11 +30879,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "OmitLetBinding".to_string(), @@ -29949,11 +30920,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "NotApplicableMatchArmBody".to_string(), @@ -30015,7 +30998,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "syntax_only".to_string(), @@ -30048,6 +31035,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "RequireEmptyStdoutAndStderr".to_string(), @@ -30081,6 +31084,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Forever".to_string(), @@ -30152,6 +31187,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "SameArgumentCall".to_string(), @@ -30198,8 +31265,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 2756, @@ -30223,11 +31295,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ProportionalShrink".to_string(), @@ -30252,11 +31336,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Repeat".to_string(), @@ -30293,7 +31389,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -30334,7 +31434,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 5564, @@ -30400,7 +31504,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 6492, @@ -30424,11 +31532,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ArithmeticRepeat".to_string(), @@ -30451,7 +31571,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 7558, @@ -30473,7 +31597,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 8123, @@ -30497,11 +31625,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -30522,11 +31658,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -30547,11 +31691,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -30572,11 +31724,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -30640,28 +31800,44 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "purity".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2177), +======= + constructor: DeclarationId(2184), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "structure".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2179), +======= + constructor: DeclarationId(2186), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "iteration".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2181), +======= + constructor: DeclarationId(2188), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -30678,6 +31854,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "OwnershipBased".to_string(), @@ -30711,11 +31903,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -30760,7 +31960,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -30784,7 +31988,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -30832,11 +32040,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -30873,7 +32089,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -30893,11 +32113,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -30951,7 +32179,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -31052,6 +32284,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Instantiation".to_string(), @@ -31093,6 +32349,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Bind".to_string(), @@ -31184,7 +32460,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -31204,13 +32484,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(967), }], }, type_params: vec![], phantom_params: Vec::new(), +<<<<<<< HEAD meta_tag: Some(DeclarationId(2209)), +======= + meta_tag: Some(DeclarationId(2216)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -31237,14 +32525,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31274,14 +32570,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31311,14 +32615,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31348,14 +32660,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31385,14 +32705,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31422,14 +32750,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31459,14 +32795,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31496,14 +32840,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31533,14 +32885,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31570,14 +32930,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31607,14 +32975,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31644,14 +33020,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31681,14 +33065,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31718,14 +33110,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31755,14 +33155,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31792,14 +33200,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31829,14 +33245,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31866,14 +33290,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31903,14 +33335,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31940,14 +33380,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -31977,14 +33425,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32014,14 +33470,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32051,14 +33515,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32088,14 +33560,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32125,14 +33605,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32162,14 +33650,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32199,14 +33695,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32236,14 +33740,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32273,14 +33785,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32310,14 +33830,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32347,14 +33875,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32384,14 +33920,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32421,14 +33965,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32458,14 +34010,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32495,14 +34055,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32532,14 +34100,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32569,14 +34145,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32606,14 +34190,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32643,14 +34235,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32680,14 +34280,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32717,14 +34325,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2204), +======= + constructor: DeclarationId(2211), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -32743,6 +34359,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -32873,11 +34530,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -32910,7 +34575,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -32931,6 +34600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "MissingEmissionPath".to_string(), @@ -32976,11 +34673,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -33015,11 +34720,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -33040,11 +34753,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -33083,11 +34804,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "break_diagnostic".to_string(), @@ -33131,7 +34864,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], meta_tag: None, specialization_parent: None, @@ -33272,11 +35009,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)), }, type_params: vec![DeclarationId(994), DeclarationId(995)], @@ -33322,11 +35067,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)), }, type_params: vec![DeclarationId(997), DeclarationId(998)], @@ -33372,11 +35125,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)), }, type_params: vec![DeclarationId(1000), DeclarationId(1001)], @@ -33422,11 +35183,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)), }, type_params: vec![DeclarationId(1003), DeclarationId(1004)], @@ -33491,11 +35260,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -33561,7 +35338,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "cost".to_string(), @@ -33623,11 +35404,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "PlatformDependentFact".to_string(), @@ -33681,11 +35474,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -33788,7 +35589,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "cost".to_string(), @@ -33838,11 +35643,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -33863,11 +35676,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -33888,11 +35709,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -33913,11 +35742,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "NotApplicable".to_string(), @@ -33941,7 +35782,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -34039,6 +35884,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -34157,11 +36043,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -34640,11 +36534,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -34665,11 +36567,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -34755,11 +36665,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -34780,11 +36698,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -35038,7 +36964,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "append({left}, {right}...)".to_string(), ))], @@ -35051,7 +36981,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35089,7 +37023,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "int64(len({recv}))".to_string(), ))], @@ -35102,7 +37040,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35140,7 +37082,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv}) == 0".to_string(), ))], @@ -35153,7 +37099,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35193,7 +37143,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "/* fold({recv}, {init}, {body}) */".to_string(), ))], @@ -35206,7 +37160,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35246,7 +37204,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "/* map({recv}, {body}) */".to_string(), ))], @@ -35259,7 +37221,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35299,7 +37265,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Filter({recv}, {arg})".to_string(), ))], @@ -35312,7 +37282,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35352,7 +37326,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Any({recv}, {arg})".to_string(), ))], @@ -35365,7 +37343,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35405,7 +37387,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.All({recv}, {arg})".to_string(), ))], @@ -35418,7 +37404,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35458,7 +37448,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.FlatMap({recv}, {arg})".to_string(), ))], @@ -35471,7 +37465,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35487,13 +37485,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1046), }], }, type_params: vec![], phantom_params: Vec::new(), +<<<<<<< HEAD meta_tag: Some(DeclarationId(2300)), +======= + meta_tag: Some(DeclarationId(2307)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -35512,7 +37518,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -35525,7 +37535,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35547,7 +37561,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Join({recv}, {arg})".to_string(), ))], @@ -35560,7 +37578,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35582,7 +37604,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Split({recv}, {arg})".to_string(), ))], @@ -35595,7 +37621,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35619,7 +37649,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[{arg}:]".to_string(), ))], @@ -35632,7 +37666,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35652,7 +37690,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[:{arg}]".to_string(), ))], @@ -35665,7 +37707,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35687,7 +37733,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.SortBy({recv}, {arg})".to_string(), ))], @@ -35700,7 +37750,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35722,7 +37776,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "append({recv}, {arg})".to_string(), ))], @@ -35735,7 +37793,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35757,7 +37819,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Contains({recv}, {arg})".to_string(), ))], @@ -35770,7 +37836,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -35787,6 +37857,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "MapValueRecursion".to_string(), @@ -35915,6 +38005,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "SubValueUnknown".to_string(), @@ -36082,7 +38192,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 20571, @@ -36104,7 +38218,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 21959, @@ -36128,6 +38246,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "LogBasedExp".to_string(), @@ -36183,11 +38317,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -36208,6 +38350,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ErrorBound".to_string(), @@ -36250,7 +38420,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1077), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", @@ -36295,7 +38469,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(544))), }, type_params: vec![], @@ -36313,7 +38491,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(553))), }, type_params: vec![], @@ -36330,8 +38512,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 29913, @@ -36352,8 +38539,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(555))), }, type_params: vec![], @@ -36370,8 +38562,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 30137, @@ -36624,7 +38821,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 33617, @@ -36646,7 +38847,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 33913, @@ -36668,7 +38873,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 35162, @@ -36690,7 +38899,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 35637, @@ -36712,7 +38925,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 36900, @@ -36739,7 +38956,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 37172, @@ -37141,13 +39362,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1275), }], }, type_params: vec![], phantom_params: Vec::new(), +<<<<<<< HEAD meta_tag: Some(DeclarationId(2341)), +======= + meta_tag: Some(DeclarationId(2348)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -37167,13 +39396,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1275), }], }, type_params: vec![], phantom_params: Vec::new(), +<<<<<<< HEAD meta_tag: Some(DeclarationId(2342)), +======= + meta_tag: Some(DeclarationId(2349)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -37198,6 +39435,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "validate".to_string(), @@ -37249,11 +39506,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -37273,7 +39538,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -37293,11 +39562,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -37346,11 +39623,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -37399,7 +39684,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "section".to_string(), @@ -37464,7 +39753,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "section".to_string(), @@ -37507,11 +39800,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -37544,7 +39845,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4601, 4611)), }, type_params: vec![], @@ -37562,7 +39867,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4654, 4666)), }, type_params: vec![], @@ -37603,7 +39912,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "[*{left}, *{right}]".to_string(), ))], @@ -37616,7 +39929,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -37658,7 +39975,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -37671,7 +39992,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -37713,7 +40038,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "(len({recv}) == 0)".to_string(), ))], @@ -37726,7 +40055,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -37770,7 +40103,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "__v3_fold({recv}, {init}, {body})".to_string(), ))], @@ -37783,7 +40120,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -37827,7 +40168,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "[{body} for {item} in {recv}]".to_string(), ))], @@ -37840,7 +40185,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -37884,7 +40233,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "[x for x in {recv} if {arg}(x)]".to_string(), ))], @@ -37897,7 +40250,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -37941,7 +40298,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "any({arg}(x) for x in {recv})".to_string(), ))], @@ -37954,7 +40315,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -37998,7 +40363,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "all({arg}(x) for x in {recv})".to_string(), ))], @@ -38011,7 +40380,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38055,7 +40428,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "[y for x in {recv} for y in {arg}(x)]".to_string(), ))], @@ -38068,7 +40445,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38088,13 +40469,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1046), }], }, type_params: vec![], phantom_params: Vec::new(), +<<<<<<< HEAD meta_tag: Some(DeclarationId(2362)), +======= + meta_tag: Some(DeclarationId(2369)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -38113,7 +40502,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -38126,7 +40519,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38146,7 +40543,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{arg}.join({recv})".to_string(), ))], @@ -38159,7 +40560,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38179,7 +40584,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}.split({arg})".to_string(), ))], @@ -38192,7 +40601,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38214,7 +40627,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[-1] if {recv} else None".to_string(), ))], @@ -38227,7 +40644,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38249,7 +40670,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[0] if {recv} else None".to_string(), ))], @@ -38262,7 +40687,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38284,7 +40713,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "list(enumerate({recv}))".to_string(), ))], @@ -38297,7 +40730,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38319,7 +40756,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "[ord(c) for c in {recv}]".to_string(), ))], @@ -38332,7 +40773,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38356,7 +40801,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[{arg}:]".to_string(), ))], @@ -38369,7 +40818,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38389,7 +40842,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[:{arg}]".to_string(), ))], @@ -38402,7 +40859,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38424,7 +40885,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "sorted({recv}, key={arg})".to_string(), ))], @@ -38437,7 +40902,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38457,7 +40926,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{recv} + [{arg}]".to_string(), ))], @@ -38470,7 +40943,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38490,7 +40967,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{arg} in {recv}".to_string(), ))], @@ -38503,7 +40984,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -38601,6 +41086,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "CardinalityValue".to_string(), @@ -38670,7 +41175,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -38689,7 +41198,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -38727,7 +41240,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -38747,11 +41264,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -38802,7 +41327,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1152), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/runtime.dag", 11265, 11284)), }, @@ -38816,11 +41345,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3551, 4204) }); declarations.push(Declaration { id: DeclarationId(1163), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2299), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4206, 4701) }); declarations.push(Declaration { id: DeclarationId(1164), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2299), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4703, 5192) }); declarations.push(Declaration { id: DeclarationId(1165), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2299), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5194, 5725) }); declarations.push(Declaration { id: DeclarationId(1166), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), value: DeclarationId(1046) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2375)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Reference(DeclarationId(1162)), FieldValue::Reference(DeclarationId(1163)), FieldValue::Reference(DeclarationId(1164)), FieldValue::Reference(DeclarationId(1165)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5728, 8449) }); +======= + declarations.push(Declaration { id: DeclarationId(1162), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3551, 4204) }); + declarations.push(Declaration { id: DeclarationId(1163), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4206, 4701) }); + declarations.push(Declaration { id: DeclarationId(1164), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4703, 5192) }); + declarations.push(Declaration { id: DeclarationId(1165), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5194, 5725) }); + declarations.push(Declaration { id: DeclarationId(1166), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1046) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2382)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })]), FieldValue::Reference(DeclarationId(1162)), FieldValue::Reference(DeclarationId(1163)), FieldValue::Reference(DeclarationId(1164)), FieldValue::Reference(DeclarationId(1165)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5728, 8449) }); +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) declarations.push(Declaration { id: DeclarationId(1167), name: Some("InputField".to_string()), @@ -38890,7 +41427,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "endpoint".to_string(), @@ -38933,8 +41474,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(597))), }, type_params: vec![], @@ -38951,8 +41497,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(599))), }, type_params: vec![], @@ -38970,7 +41521,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(601))), }, type_params: vec![], @@ -38988,7 +41543,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(603))), }, type_params: vec![], @@ -39006,7 +41565,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(605))), }, type_params: vec![], @@ -39024,7 +41587,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(607))), }, type_params: vec![], @@ -39042,7 +41609,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(609))), }, type_params: vec![], @@ -39060,7 +41631,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(611))), }, type_params: vec![], @@ -39078,7 +41653,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(615))), }, type_params: vec![], @@ -39096,7 +41675,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(618))), }, type_params: vec![], @@ -39114,7 +41697,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(622))), }, type_params: vec![], @@ -39132,7 +41719,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(627))), }, type_params: vec![], @@ -39149,8 +41740,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(634))), }, type_params: vec![], @@ -39167,8 +41763,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(641))), }, type_params: vec![], @@ -39185,8 +41786,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(646))), }, type_params: vec![], @@ -39203,8 +41809,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(656))), }, type_params: vec![], @@ -39221,8 +41832,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(664))), }, type_params: vec![], @@ -39242,11 +41858,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "DescentUnknown".to_string(), @@ -39352,8 +41980,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2488, @@ -39374,8 +42007,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2833, @@ -39399,6 +42037,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "SetCardinality".to_string(), @@ -39436,11 +42094,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -39483,11 +42149,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -39550,7 +42224,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 6420, @@ -39572,7 +42250,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 6860, @@ -39596,6 +42278,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "FoldIteration".to_string(), @@ -39640,7 +42350,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -39668,7 +42382,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -39688,7 +42406,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -39708,11 +42430,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -39733,11 +42463,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -39766,7 +42504,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -39784,8 +42526,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 12400, @@ -39846,6 +42593,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Stale".to_string(), @@ -39923,7 +42686,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -40093,7 +42860,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(714))), }, type_params: vec![], @@ -40164,7 +42935,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(978), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(747))), }, @@ -40182,7 +42957,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1214), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(756))), }, @@ -40200,8 +42979,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(793))), }, type_params: vec![], @@ -40218,7 +43002,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(978), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(807))), }, @@ -40239,6 +43027,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -40461,6 +43430,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -40530,6 +43552,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -40853,6 +43988,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -40910,11 +44086,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -40960,11 +44144,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -40984,7 +44176,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -41004,11 +44200,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Identity".to_string(), @@ -41051,7 +44259,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -41071,6 +44283,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -41233,7 +44542,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -41254,11 +44567,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -41295,7 +44616,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -41316,11 +44641,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -41345,7 +44678,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -41370,7 +44707,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -41389,7 +44730,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 19182, @@ -41432,8 +44777,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 19424, @@ -41454,8 +44804,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(809))), }, type_params: vec![], @@ -41583,14 +44938,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2187), +======= + constructor: DeclarationId(2194), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -41762,7 +45125,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Variant { constructor: DeclarationId(1863), payload: vec![ @@ -41821,7 +45188,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -42121,7 +45492,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "declaration".to_string(), ))], @@ -42225,7 +45600,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -42244,7 +45623,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "state".to_string(), ))], @@ -42265,7 +45648,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "produced_by".to_string(), ))], @@ -42329,7 +45716,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "file".to_string(), ))], @@ -42348,7 +45739,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "byte_start".to_string(), ))], @@ -42367,7 +45762,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "byte_end".to_string(), ))], @@ -42679,7 +46078,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -42698,7 +46101,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -42764,7 +46171,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -42783,7 +46194,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -42849,7 +46264,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -42868,7 +46287,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "algebra".to_string(), ))], @@ -42933,7 +46356,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "permitted_accessors".to_string(), ))], @@ -42996,7 +46423,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -43015,7 +46446,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -43079,7 +46514,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -43098,7 +46537,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -43162,7 +46605,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -43181,7 +46628,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "second".to_string(), ))], @@ -43200,7 +46651,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -43264,7 +46719,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "member_of".to_string(), ))], @@ -43283,7 +46742,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "slot_of".to_string(), ))], @@ -43346,7 +46809,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "node_id".to_string(), ))], @@ -43408,7 +46875,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "param".to_string(), ))], @@ -43470,7 +46941,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "transform".to_string(), ))], @@ -43533,7 +47008,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "members".to_string(), ))], @@ -43554,7 +47033,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "intra_cluster_calls".to_string(), ))], @@ -43782,7 +47265,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -43801,7 +47288,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -43822,7 +47313,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "connective".to_string(), ))], @@ -43843,7 +47338,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "type_params".to_string(), ))], @@ -43864,7 +47363,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "phantom_params".to_string(), ))], @@ -43885,7 +47388,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "meta_tag".to_string(), ))], @@ -43906,7 +47413,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "inhabits".to_string(), ))], @@ -43927,7 +47438,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "value_body".to_string(), ))], @@ -43948,7 +47463,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "nominal_opacity".to_string(), ))], @@ -43967,7 +47486,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -44279,7 +47802,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "binding_name".to_string(), ))], @@ -44300,7 +47827,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "payload_port".to_string(), ))], @@ -44364,7 +47895,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -44385,7 +47920,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -44404,7 +47943,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -44423,7 +47966,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -44528,7 +48075,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -44547,7 +48098,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -44568,7 +48123,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -44587,7 +48146,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -44651,7 +48214,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -44670,7 +48237,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "target".to_string(), ))], @@ -44689,7 +48260,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "inputs".to_string(), ))], @@ -44710,7 +48285,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -44729,7 +48308,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -44793,7 +48376,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -44812,7 +48399,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "input".to_string(), ))], @@ -44831,7 +48422,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "paths".to_string(), ))], @@ -44852,7 +48447,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -44871,7 +48470,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -44892,7 +48495,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -44956,7 +48563,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -44975,7 +48586,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "source".to_string(), ))], @@ -44994,7 +48609,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "init".to_string(), ))], @@ -45013,7 +48632,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -45032,7 +48655,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "bound".to_string(), ))], @@ -45053,7 +48680,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -45072,7 +48703,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -45136,7 +48771,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -45155,7 +48794,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -45176,7 +48819,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -45195,7 +48842,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "params".to_string(), ))], @@ -45214,7 +48865,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -45235,7 +48890,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -45342,7 +49001,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "declarations".to_string(), ))], @@ -45361,7 +49024,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "nodes".to_string(), ))], @@ -45380,7 +49047,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "ports".to_string(), ))], @@ -45401,7 +49072,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "clusters".to_string(), ))], @@ -45922,6 +49597,46 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "target".to_string(), @@ -45943,8 +49658,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1013), arguments: vec![], @@ -45980,8 +49700,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1013), arguments: vec![], @@ -45996,6 +49721,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "target".to_string(), @@ -46070,6 +49798,46 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "target".to_string(), @@ -46091,8 +49859,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1013), arguments: vec![], @@ -46128,8 +49901,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1013), arguments: vec![], @@ -46144,6 +49922,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "target".to_string(), @@ -46525,7 +50306,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -46565,6 +50350,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -46774,7 +50563,204 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) span: SourceSpan::new("src/v3/spec/go.dag", 26264, 26447), }); declarations.push(Declaration { @@ -46925,7 +50912,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -46939,7 +50930,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -46975,12 +50970,99 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2286), + constructor: DeclarationId(2294), payload: vec![], }, ), @@ -46995,7 +51077,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -47008,6 +51094,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -47039,8 +51129,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1015), arguments: vec![], @@ -47063,7 +51158,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -47091,7 +51190,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -47109,8 +51212,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1015), arguments: vec![], @@ -47133,7 +51241,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -47161,6 +51273,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -47273,7 +51389,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -47921,49 +52041,77 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2122), +======= + constructor: DeclarationId(2129), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2125), +======= + constructor: DeclarationId(2132), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2128), +======= + constructor: DeclarationId(2135), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2132), +======= + constructor: DeclarationId(2139), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2134), +======= + constructor: DeclarationId(2141), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2138), +======= + constructor: DeclarationId(2145), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -47995,7 +52143,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -48599,14 +52751,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2187), +======= + constructor: DeclarationId(2194), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -48735,7 +52895,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Variant { constructor: DeclarationId(1863), payload: vec![ @@ -48794,7 +52958,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Variant { constructor: DeclarationId(1864), payload: vec![], @@ -49965,6 +54133,46 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "target".to_string(), @@ -49986,8 +54194,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1013), arguments: vec![], @@ -50023,8 +54236,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1013), arguments: vec![], @@ -50039,6 +54257,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "target".to_string(), @@ -50343,7 +54564,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -50383,6 +54608,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -50592,7 +54821,204 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) span: SourceSpan::new("src/v3/spec/python.dag", 16908, 17099), }); declarations.push(Declaration { @@ -50633,7 +55060,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -50647,7 +55078,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -50683,12 +55118,99 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2286), + constructor: DeclarationId(2294), payload: vec![], }, ), @@ -50703,7 +55225,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -50716,6 +55242,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -50747,8 +55277,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1015), arguments: vec![], @@ -50771,7 +55306,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -50799,7 +55338,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -50817,8 +55360,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1015), arguments: vec![], @@ -50841,7 +55389,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -50869,6 +55421,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -51094,7 +55650,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -51189,49 +55749,77 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2124), +======= + constructor: DeclarationId(2131), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2125), +======= + constructor: DeclarationId(2132), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2128), +======= + constructor: DeclarationId(2135), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2132), +======= + constructor: DeclarationId(2139), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2133), +======= + constructor: DeclarationId(2140), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2138), +======= + constructor: DeclarationId(2145), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -51266,7 +55854,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -51323,14 +55915,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2187), +======= + constructor: DeclarationId(2194), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -51748,7 +56348,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Variant { constructor: DeclarationId(1863), payload: vec![ @@ -51805,7 +56409,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Variant { constructor: DeclarationId(1863), payload: vec![ @@ -51864,7 +56472,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -51907,7 +56519,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -51950,7 +56566,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -51993,7 +56613,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -52036,7 +56660,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -52079,7 +56707,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -52379,7 +57011,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "declaration".to_string(), ))], @@ -52483,7 +57119,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -52502,7 +57142,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "state_value".to_string(), ))], @@ -52523,7 +57167,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "produced_by".to_string(), ))], @@ -52587,7 +57235,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "file".to_string(), ))], @@ -52606,7 +57258,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "byte_start".to_string(), ))], @@ -52625,7 +57281,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "byte_end".to_string(), ))], @@ -52937,7 +57597,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -52956,7 +57620,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -53022,7 +57690,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -53041,7 +57713,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -53107,7 +57783,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -53126,7 +57806,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "algebra".to_string(), ))], @@ -53191,7 +57875,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "permitted_accessors".to_string(), ))], @@ -53256,7 +57944,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "0".to_string(), ))], @@ -53275,7 +57967,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "1".to_string(), ))], @@ -53339,7 +58035,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -53358,7 +58058,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -53422,7 +58126,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -53441,7 +58149,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "second".to_string(), ))], @@ -53460,7 +58172,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -53523,7 +58239,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "index_of".to_string(), ))], @@ -53586,7 +58306,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "member_of".to_string(), ))], @@ -53605,7 +58329,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "slot_of".to_string(), ))], @@ -53668,7 +58396,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "node_id".to_string(), ))], @@ -53730,7 +58462,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "param".to_string(), ))], @@ -53792,7 +58528,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "transform".to_string(), ))], @@ -53855,7 +58595,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "members".to_string(), ))], @@ -53876,7 +58620,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "intra_cluster_calls".to_string(), ))], @@ -54104,7 +58852,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -54123,7 +58875,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -54144,7 +58900,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "connective".to_string(), ))], @@ -54165,7 +58925,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "type_params".to_string(), ))], @@ -54186,7 +58950,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "phantom_params".to_string(), ))], @@ -54207,7 +58975,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "meta_tag".to_string(), ))], @@ -54228,7 +59000,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "inhabits".to_string(), ))], @@ -54249,7 +59025,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "value_body".to_string(), ))], @@ -54270,7 +59050,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "nominal_opacity".to_string(), ))], @@ -54289,7 +59073,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -54601,7 +59389,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "binding_name".to_string(), ))], @@ -54622,7 +59414,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "payload_port".to_string(), ))], @@ -54686,7 +59482,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -54707,7 +59507,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -54726,7 +59530,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -54745,7 +59553,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -54850,7 +59662,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -54869,7 +59685,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "data".to_string(), ))], @@ -54890,7 +59710,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -54909,7 +59733,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -54930,7 +59758,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "lane2_workflow".to_string(), ))], @@ -54994,7 +59826,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -55013,7 +59849,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "target".to_string(), ))], @@ -55032,7 +59872,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "inputs".to_string(), ))], @@ -55053,7 +59897,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -55072,7 +59920,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -55136,7 +59988,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -55155,7 +60011,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "input".to_string(), ))], @@ -55174,7 +60034,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "paths".to_string(), ))], @@ -55195,7 +60059,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -55214,7 +60082,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -55235,7 +60107,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -55299,7 +60175,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -55318,7 +60198,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "source".to_string(), ))], @@ -55337,7 +60221,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "init".to_string(), ))], @@ -55356,7 +60244,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -55375,7 +60267,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "bound".to_string(), ))], @@ -55396,7 +60292,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -55415,7 +60315,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -55479,7 +60383,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -55498,7 +60406,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -55519,7 +60431,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -55538,7 +60454,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "params".to_string(), ))], @@ -55557,7 +60477,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -55578,7 +60502,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "lane2_workflow".to_string(), ))], @@ -55599,7 +60527,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -55706,7 +60638,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "declarations".to_string(), ))], @@ -55725,7 +60661,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "nodes".to_string(), ))], @@ -55744,7 +60684,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "ports".to_string(), ))], @@ -55765,7 +60709,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "clusters".to_string(), ))], @@ -56286,6 +61234,46 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "target".to_string(), @@ -56307,8 +61295,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1013), arguments: vec![], @@ -56344,8 +61337,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1013), arguments: vec![], @@ -56360,6 +61358,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "target".to_string(), @@ -56471,6 +61472,46 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "target".to_string(), @@ -56492,8 +61533,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1013), arguments: vec![], @@ -56529,8 +61575,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1013), arguments: vec![], @@ -56545,6 +61596,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "target".to_string(), @@ -56927,7 +61981,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -56967,6 +62025,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -57176,7 +62238,204 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) span: SourceSpan::new("src/v3/spec/rust.dag", 37846, 38033), }); declarations.push(Declaration { @@ -57549,7 +62809,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -57563,7 +62827,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -57599,12 +62867,99 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2286), + constructor: DeclarationId(2294), payload: vec![], }, ), @@ -57619,7 +62974,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -57632,6 +62991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -57663,8 +63026,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1015), arguments: vec![], @@ -57687,7 +63055,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -57715,7 +63087,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -57733,8 +63109,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(1015), arguments: vec![], @@ -57757,7 +63138,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -57785,6 +63170,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -57897,7 +63286,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -58341,7 +63734,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "{ let mut __left = {left}; __left.extend({right}); __left }" .to_string(), @@ -58355,7 +63752,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -58395,7 +63796,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "({recv}).len() as i64".to_string(), ))], @@ -58408,7 +63813,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -58446,7 +63855,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "({recv}).is_empty()".to_string(), ))], @@ -58459,7 +63872,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -58499,7 +63916,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "({recv}).iter().fold({init}, {body})".to_string(), ))], @@ -58512,7 +63933,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -58552,7 +63977,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![FieldValue::Literal(LiteralBits::String( "({recv}).iter().map({body}).collect::>()".to_string(), ))], @@ -58565,7 +63994,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -58637,14 +64070,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "construct".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2294), +======= + constructor: DeclarationId(2301), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -58775,49 +64216,77 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2122), +======= + constructor: DeclarationId(2129), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2126), +======= + constructor: DeclarationId(2133), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2128), +======= + constructor: DeclarationId(2135), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2131), +======= + constructor: DeclarationId(2138), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2134), +======= + constructor: DeclarationId(2141), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2137), +======= + constructor: DeclarationId(2144), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -58855,7 +64324,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -58976,14 +64449,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "accessor".to_string(), + FieldValue::Reference(DeclarationId(831)), + ), + ( + "realization".to_string(), + FieldValue::Reference(DeclarationId(1627)), + ), + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1622)), + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/spec/rust.dag", 50536, 50667), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(1630), + name: Some("node_binding_rust".to_string()), +======= + id: DeclarationId(1631), + name: Some("resolve_producer_binding_rust".to_string()), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(830), arguments: vec![], @@ -59019,11 +64533,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ], }), @@ -59410,11 +64927,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "SnapshotText".to_string(), @@ -59634,7 +65163,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -59704,7 +65237,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -59735,11 +65272,84 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ), + ( + "snapshot".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2623), + payload: vec![], + }, + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1798, 1952), + }); + declarations.push(Declaration { + id: DeclarationId(1657), + name: Some("emit_stage_binding".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1645), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1645)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "stage".to_string(), + FieldValue::Reference(DeclarationId(1663)), + ), + ( + "realization".to_string(), + FieldValue::Reference(DeclarationId(1650)), + ), + ( + "snapshot".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2624), payload: vec![], }, ), @@ -59785,6 +65395,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) id: DeclarationId(1658), name: Some("parse".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230), DeclarationId(230)], +<<<<<<< HEAD output: DeclarationId(828), +======= + output: DeclarationId(827), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::ExternalRealization(DeclarationId(1646)), }, type_params: vec![], @@ -59840,6 +65457,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Arrow { inputs: vec![DeclarationId(828)], output: DeclarationId(828), @@ -59871,11 +65491,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Arrow { inputs: vec![DeclarationId(828)], output: DeclarationId(828), @@ -59889,14 +65514,40 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::ExternalRealization(DeclarationId(1651)), }, type_params: vec![], @@ -59914,9 +65565,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) DeclarationId(1043), ], output: DeclarationId(230), @@ -59959,7 +65616,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/compiler/operators.dag", 156, @@ -60414,11 +66075,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -60439,11 +66108,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "TerminalAlgebra".to_string(), @@ -60468,6 +66149,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "TerminalCarrier".to_string(), @@ -60513,11 +66222,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Trap".to_string(), @@ -60542,11 +66263,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -60566,68 +66295,129 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1683), }], }, type_params: vec![], phantom_params: Vec::new(), +<<<<<<< HEAD meta_tag: Some(DeclarationId(2636)), +======= + meta_tag: Some(DeclarationId(2643)), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2634), payload: vec![ FieldValue::Literal(LiteralBits::String("i8".to_string())), FieldValue::Variant { constructor: DeclarationId(2619), +======= + constructor: DeclarationId(2641), + payload: vec![ + FieldValue::Literal(LiteralBits::String("i8".to_string())), + FieldValue::Variant { + constructor: DeclarationId(2626), + payload: vec![], + }, + FieldValue::Variant { + constructor: DeclarationId(2632), + payload: vec![], + }, + FieldValue::Literal(LiteralBits::String("-128".to_string())), + FieldValue::Literal(LiteralBits::String("127".to_string())), + FieldValue::Literal(LiteralBits::Bool(true)), + FieldValue::Variant { + constructor: DeclarationId(2638), + payload: vec![], + }, + ], + }, + FieldValue::Variant { + constructor: DeclarationId(2641), + payload: vec![ + FieldValue::Literal(LiteralBits::String("i16".to_string())), + FieldValue::Variant { + constructor: DeclarationId(2626), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2625), + constructor: DeclarationId(2633), payload: vec![], }, FieldValue::Literal(LiteralBits::String("-128".to_string())), FieldValue::Literal(LiteralBits::String("127".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2631), +======= + constructor: DeclarationId(2638), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2634), +======= + constructor: DeclarationId(2641), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![ FieldValue::Literal(LiteralBits::String("i16".to_string())), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2619), +======= + constructor: DeclarationId(2626), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2626), + constructor: DeclarationId(2634), payload: vec![], }, FieldValue::Literal(LiteralBits::String("-32768".to_string())), FieldValue::Literal(LiteralBits::String("32767".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2631), +======= + constructor: DeclarationId(2638), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2634), +======= + constructor: DeclarationId(2641), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![ FieldValue::Literal(LiteralBits::String("i32".to_string())), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2619), +======= + constructor: DeclarationId(2626), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2627), + constructor: DeclarationId(2635), payload: vec![], }, FieldValue::Literal(LiteralBits::String("-2147483648".to_string())), @@ -60657,12 +66447,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2634), payload: vec![ FieldValue::Literal(LiteralBits::String("i128".to_string())), @@ -60672,6 +66467,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, FieldValue::Literal(LiteralBits::String( @@ -60682,84 +66488,153 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2634), payload: vec![ FieldValue::Literal(LiteralBits::String("u8".to_string())), FieldValue::Variant { constructor: DeclarationId(2620), +======= + constructor: DeclarationId(2641), + payload: vec![ + FieldValue::Literal(LiteralBits::String("u8".to_string())), + FieldValue::Variant { + constructor: DeclarationId(2627), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2625), + constructor: DeclarationId(2632), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), FieldValue::Literal(LiteralBits::String("255".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { + constructor: DeclarationId(2638), + payload: vec![], + }, + ], + }, + FieldValue::Variant { + constructor: DeclarationId(2641), + payload: vec![ + FieldValue::Literal(LiteralBits::String("u16".to_string())), + FieldValue::Variant { + constructor: DeclarationId(2627), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + payload: vec![], + }, + FieldValue::Variant { + constructor: DeclarationId(2633), + payload: vec![], + }, + FieldValue::Literal(LiteralBits::String("0".to_string())), + FieldValue::Literal(LiteralBits::String("255".to_string())), + FieldValue::Literal(LiteralBits::Bool(true)), + FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2631), +======= + constructor: DeclarationId(2638), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2634), +======= + constructor: DeclarationId(2641), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![ FieldValue::Literal(LiteralBits::String("u16".to_string())), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2620), +======= + constructor: DeclarationId(2627), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2626), + constructor: DeclarationId(2634), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), FieldValue::Literal(LiteralBits::String("65535".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2631), +======= + constructor: DeclarationId(2638), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2634), +======= + constructor: DeclarationId(2641), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![ FieldValue::Literal(LiteralBits::String("u32".to_string())), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2620), +======= + constructor: DeclarationId(2627), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2627), + constructor: DeclarationId(2635), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), FieldValue::Literal(LiteralBits::String("4294967295".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2631), +======= + constructor: DeclarationId(2638), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2634), +======= + constructor: DeclarationId(2641), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![ FieldValue::Literal(LiteralBits::String("u64".to_string())), FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2620), +======= + constructor: DeclarationId(2627), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2628), + constructor: DeclarationId(2636), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), @@ -60791,50 +66666,90 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2635), payload: vec![ FieldValue::Literal(LiteralBits::String("f32".to_string())), FieldValue::Variant { constructor: DeclarationId(2621), +======= + constructor: DeclarationId(2642), + payload: vec![ + FieldValue::Literal(LiteralBits::String("f32".to_string())), + FieldValue::Variant { + constructor: DeclarationId(2628), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2627), + constructor: DeclarationId(2634), payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), ], }, FieldValue::Variant { + constructor: DeclarationId(2642), + payload: vec![ + FieldValue::Literal(LiteralBits::String("f64".to_string())), + FieldValue::Variant { + constructor: DeclarationId(2628), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + payload: vec![], + }, + FieldValue::Variant { + constructor: DeclarationId(2635), + payload: vec![], + }, + FieldValue::Literal(LiteralBits::Bool(true)), + ], + }, + FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2635), +======= + constructor: DeclarationId(2642), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![ FieldValue::Literal(LiteralBits::String("f64".to_string())), FieldValue::Variant { - constructor: DeclarationId(2621), + constructor: DeclarationId(2629), payload: vec![], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2628), +======= + constructor: DeclarationId(2631), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), ], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2635), +======= + constructor: DeclarationId(2642), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![ FieldValue::Literal(LiteralBits::String("bool".to_string())), FieldValue::Variant { - constructor: DeclarationId(2622), + constructor: DeclarationId(2630), payload: vec![], }, FieldValue::Variant { +<<<<<<< HEAD constructor: DeclarationId(2624), payload: vec![], }, @@ -60851,6 +66766,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), @@ -60868,6 +66786,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Step".to_string(), @@ -61036,11 +66974,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Organization".to_string(), @@ -61135,11 +67085,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -61160,6 +67118,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ScopeReadUser".to_string(), @@ -61201,7 +67179,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "has_next".to_string(), @@ -61226,11 +67208,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "PermAdmin".to_string(), @@ -61312,6 +67306,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "permissions".to_string(), @@ -61378,11 +67388,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "PermNone".to_string(), @@ -61407,11 +67429,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Schedule".to_string(), @@ -61419,11 +67453,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -61444,6 +67486,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Closed".to_string(), @@ -61481,7 +67539,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "required".to_string(), @@ -61489,7 +67551,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "type".to_string(), @@ -61514,6 +67580,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "InputEnvironment".to_string(), @@ -61547,11 +67629,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "WorkflowScope".to_string(), @@ -61605,6 +67699,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "timeout_minutes".to_string(), @@ -61641,7 +67767,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -61687,11 +67817,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -61712,6 +67850,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "WindowsLatest".to_string(), @@ -61753,11 +67915,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -61778,6 +67948,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Cmd".to_string(), @@ -61844,6 +68034,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "StopCommands".to_string(), @@ -62045,11 +68267,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -62070,11 +68300,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Ignore".to_string(), @@ -62141,6 +68383,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "fail_fast".to_string(), @@ -62157,7 +68411,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -62178,6 +68436,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ActionRequired".to_string(), @@ -62484,6 +68766,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -62520,7 +68805,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -62702,7 +69012,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1756), body: ArrowBody::NoBody, }, @@ -62822,7 +69136,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1762), }], }, @@ -62882,7 +69200,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1765), }], }, @@ -63329,6 +69651,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -63365,6 +69690,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -63509,6 +69857,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(737), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 15171, 15200), + }); + declarations.push(Declaration { + id: DeclarationId(1802), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -64361,7 +70750,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -64381,7 +70774,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -65817,11 +72214,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(802), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 14385, 14409), + }); + declarations.push(Declaration { + id: DeclarationId(1926), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -65893,6 +72312,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "field_label".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 14676, 14732), + }); + declarations.push(Declaration { + id: DeclarationId(1930), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -66261,11 +72702,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(820), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 19462, 19478), + }); + declarations.push(Declaration { + id: DeclarationId(1949), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -66298,7 +72761,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -66533,7 +73000,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -67086,10 +73557,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(842), + CardinalityBound::AtMostOne, + ), + ), + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + }); + declarations.push(Declaration { + id: DeclarationId(1993), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -67579,7 +74072,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -67646,8 +74143,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -67697,6 +74203,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -67745,6 +74262,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -68010,8 +74538,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -68069,7 +74606,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1983), body: ArrowBody::NoBody, }, @@ -68095,11 +74636,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -68177,7 +74730,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1170), }], }, @@ -68193,6 +74750,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { @@ -68248,6 +74809,51 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "content".to_string(), +<<<<<<< HEAD +======= + ty: DeclarationId(2047), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2521, 2582), + }); + declarations.push(Declaration { + id: DeclarationId(2049), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(898), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2615, 2651), }); declarations.push(Declaration { @@ -68256,6 +74862,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ty: DeclarationId(2049), }], }, @@ -68368,6 +74975,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2057), name: None, connective: TypeConnective::Conj { children: vec![Field { +<<<<<<< HEAD label: "blocks".to_string(), ty: DeclarationId(2056), +======= + label: "source".to_string(), + ty: DeclarationId(893), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -68407,11 +75023,114 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -68445,10 +75226,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -68464,10 +75249,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -68477,11 +75266,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -68493,10 +75290,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -68512,10 +75313,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -68541,6 +75346,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2071), name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5666, 5673), + }); + declarations.push(Declaration { + id: DeclarationId(2072), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5678, 5687), + }); + declarations.push(Declaration { + id: DeclarationId(2073), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5692, 5704), + }); + declarations.push(Declaration { + id: DeclarationId(2074), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5709, 5716), + }); + declarations.push(Declaration { + id: DeclarationId(2075), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5721, 5730), + }); + declarations.push(Declaration { + id: DeclarationId(2076), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5735, 5742), + }); + declarations.push(Declaration { + id: DeclarationId(2077), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5747, 5773), + }); + declarations.push(Declaration { + id: DeclarationId(2078), + name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( DeclarationId(230), @@ -68658,10 +75565,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { - id: DeclarationId(2072), + id: DeclarationId(2079), + name: None, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(230), + CardinalityBound::AtMostOne, + ), + ), + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6103, 6110), + }); + declarations.push(Declaration { + id: DeclarationId(2080), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -68694,11 +75624,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "start_char_index".to_string(), @@ -68718,10 +75656,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -68737,10 +75679,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -68756,10 +75702,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -68773,11 +75723,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "start_page_number".to_string(), @@ -68797,10 +75755,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -68816,10 +75778,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -68835,10 +75801,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -68852,11 +75822,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "start_block_index".to_string(), @@ -68876,10 +75854,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -68895,10 +75877,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -68912,7 +75898,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "url".to_string(), @@ -68928,10 +75918,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -68947,10 +75941,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -68964,7 +75962,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "search_result_index".to_string(), @@ -68988,15 +75990,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(900), }], }, @@ -69008,14 +76018,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) CardinalityBound::AtMostOne, ), ), @@ -69027,10 +76045,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -69040,7 +76062,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -69052,10 +76078,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -69077,10 +76107,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -69096,10 +76130,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -69115,10 +76153,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -69136,7 +76178,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -69148,10 +76194,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -69167,10 +76217,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -69188,7 +76242,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -69200,10 +76258,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -69219,10 +76281,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -69236,7 +76302,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -69248,6 +76318,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) id: DeclarationId(2103), name: None, - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(93), - CardinalityBound::AtMostOne, - ), - ), + connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -69379,11 +76464,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2104), name: None, +<<<<<<< HEAD connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( DeclarationId(93), @@ -69409,6 +76499,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -69417,7 +76510,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8074, 8097), + }); + declarations.push(Declaration { + id: DeclarationId(2108), + name: None, + connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -69451,11 +76562,77 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -69489,6 +76723,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2118), @@ -69621,7 +76859,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69938,7 +77298,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69952,7 +77316,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69966,7 +77334,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69980,7 +77352,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -69999,7 +77375,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -70018,7 +77398,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -70037,7 +77421,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -70056,7 +77444,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -70075,7 +77467,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70094,7 +77490,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70113,7 +77513,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70132,7 +77536,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70151,7 +77559,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70170,7 +77582,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70184,7 +77600,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70203,7 +77623,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70217,7 +77641,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70236,7 +77664,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -70261,7 +77693,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -70286,7 +77722,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -70311,7 +77751,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70330,7 +77774,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70349,7 +77797,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70368,7 +77820,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70382,7 +77838,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70396,7 +77856,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70415,7 +77879,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70434,7 +77902,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70448,7 +77920,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70462,7 +77938,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70476,7 +77956,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -70495,7 +77979,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70509,7 +77997,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70523,7 +78015,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70537,7 +78033,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70551,7 +78051,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70565,7 +78069,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70579,7 +78087,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70593,7 +78105,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70607,7 +78123,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70621,7 +78141,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70635,7 +78159,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70649,7 +78177,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70663,7 +78195,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70677,7 +78213,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70691,7 +78231,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70705,7 +78249,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70719,7 +78267,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70733,7 +78285,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -70753,7 +78309,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -70773,7 +78333,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70787,7 +78351,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70801,7 +78369,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70820,7 +78392,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70834,7 +78410,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70848,7 +78428,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -70874,7 +78458,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70888,7 +78476,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70902,7 +78494,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70916,7 +78512,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70930,7 +78530,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70944,7 +78548,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70958,7 +78566,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70972,7 +78584,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70986,7 +78602,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71000,7 +78620,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71014,7 +78638,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71028,6 +78656,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -71065,6 +78697,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2217), name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(967), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6396, 6424), + }); + declarations.push(Declaration { + id: DeclarationId(2218), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/diagnostics.dag", 1099, 1113), + }); + declarations.push(Declaration { + id: DeclarationId(2219), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/diagnostics.dag", 1118, 1128), + }); + declarations.push(Declaration { + id: DeclarationId(2220), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/diagnostics.dag", 1133, 1145), + }); + declarations.push(Declaration { + id: DeclarationId(2220), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/diagnostics.dag", 1150, 1163), + }); + declarations.push(Declaration { + id: DeclarationId(2221), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/diagnostics.dag", 1168, 1180), + }); + declarations.push(Declaration { + id: DeclarationId(2222), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/diagnostics.dag", 1185, 1197), + }); + declarations.push(Declaration { + id: DeclarationId(2223), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/diagnostics.dag", 1202, 1224), + }); + declarations.push(Declaration { + id: DeclarationId(2224), + name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -71180,7 +78934,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -71246,12 +79004,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(970), }], }, @@ -71266,7 +79032,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -71285,7 +79055,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71299,7 +79073,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -71319,7 +79097,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -71329,7 +79111,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -71344,7 +79130,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -71363,7 +79153,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -71382,7 +79176,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71396,7 +79194,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -71425,7 +79227,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -71445,7 +79251,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(983), @@ -71471,7 +79281,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(983), @@ -71497,7 +79311,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(983), @@ -71523,7 +79341,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -71543,7 +79365,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(983), @@ -71569,7 +79395,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(983), @@ -71595,7 +79425,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(983), @@ -71621,7 +79455,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -71641,7 +79479,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(983), @@ -71667,7 +79509,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(983), @@ -71693,7 +79539,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -71713,7 +79563,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(983), @@ -71739,7 +79593,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(983), @@ -71765,7 +79623,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -71784,7 +79646,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -71809,7 +79675,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71823,7 +79693,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -71842,7 +79716,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(976), @@ -71862,13 +79740,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), value: DeclarationId(2249), +======= + parameter: DeclarationId(686), + value: DeclarationId(2256), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -71882,7 +79769,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -71896,7 +79787,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -71911,12 +79806,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(974), }], }, @@ -71931,7 +79834,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(976), @@ -71951,13 +79858,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), value: DeclarationId(2253), +======= + parameter: DeclarationId(686), + value: DeclarationId(2260), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -71971,7 +79887,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -71981,11 +79901,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -72000,7 +79928,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(976), @@ -72020,11 +79952,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::NoBody, }, type_params: vec![], @@ -72038,7 +79978,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(19), @@ -72058,10 +80002,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(978), body: ArrowBody::NoBody, }, @@ -72076,7 +80027,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: Some("DimensionUnitAbelianGroup".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(25), @@ -72096,7 +80051,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72110,7 +80069,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72129,12 +80092,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1011), }], }, @@ -72149,7 +80120,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72163,7 +80138,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72182,7 +80161,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72196,7 +80179,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/emit_model.dag", 5176, 5195), + }); + declarations.push(Declaration { + id: DeclarationId(2276), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72239,7 +80245,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1016), }], }, @@ -72254,7 +80264,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72268,7 +80282,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72282,7 +80300,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72296,7 +80318,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72310,7 +80336,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72324,7 +80354,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72338,7 +80372,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72352,7 +80390,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72366,7 +80408,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72380,7 +80426,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72394,7 +80444,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72408,7 +80462,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72422,7 +80480,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72436,7 +80498,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72450,7 +80516,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72464,7 +80534,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72478,7 +80552,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72492,7 +80570,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72506,7 +80588,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72520,7 +80606,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72534,7 +80624,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72548,7 +80642,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72562,7 +80660,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72576,7 +80678,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72590,7 +80696,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72604,7 +80714,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72618,7 +80732,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72632,7 +80750,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72646,7 +80768,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72665,7 +80791,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -72690,12 +80820,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1046), }], }, @@ -72710,7 +80848,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -72729,7 +80871,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -72748,7 +80894,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -72765,6 +80935,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1076), }], }, @@ -72808,12 +80989,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1076), }], }, @@ -72828,13 +81017,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), value: DeclarationId(2306), +======= + parameter: DeclarationId(686), + value: DeclarationId(2313), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -72848,7 +81046,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(93), + CardinalityBound::AtMostOne, + ), + ), + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), + }); + declarations.push(Declaration { + id: DeclarationId(2317), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -72886,7 +81107,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73076,7 +81301,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -73101,7 +81330,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73115,7 +81348,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73129,7 +81366,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73143,7 +81384,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73162,7 +81407,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -73187,7 +81436,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -73212,7 +81465,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -73237,7 +81494,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73256,7 +81517,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73270,7 +81535,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73289,6 +81558,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -73404,15 +81677,121 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "terms".to_string(), +<<<<<<< HEAD ty: DeclarationId(2337), +======= + ty: DeclarationId(2342), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/induction.dag", 26927, 26979), + }); + declarations.push(Declaration { + id: DeclarationId(2344), + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(685), + arguments: vec![TemplateArgument { + parameter: DeclarationId(686), + value: DeclarationId(1077), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/induction.dag", 27277, 27292), + }); + declarations.push(Declaration { + id: DeclarationId(2345), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "terms".to_string(), + ty: DeclarationId(2344), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -73426,7 +81805,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73440,7 +81823,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73454,12 +81841,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1275), }], }, @@ -73474,12 +81869,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1275), }], }, @@ -73494,7 +81897,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(976), @@ -73514,11 +81921,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::NoBody, }, type_params: vec![], @@ -73532,7 +81947,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(19), @@ -73552,7 +81971,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1121), DeclarationId(1121)], @@ -73570,10 +81993,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(1121), body: ArrowBody::NoBody, }, @@ -73588,10 +82018,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) output: DeclarationId(978), body: ArrowBody::NoBody, }, @@ -73606,7 +82043,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73625,7 +82066,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -73650,7 +82095,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73664,7 +82113,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1125)], @@ -73682,7 +82135,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(1126), DeclarationId(1126)], @@ -73700,7 +82157,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1120), @@ -73720,7 +82181,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1124), @@ -73746,7 +82211,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1127), @@ -73772,7 +82241,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1120), @@ -73792,7 +82265,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1135), @@ -73812,7 +82289,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1135), @@ -73832,7 +82313,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73846,7 +82331,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73865,12 +82354,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1046), }], }, @@ -73889,12 +82386,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1152), }], }, @@ -73909,7 +82414,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73928,12 +82437,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1151), }], }, @@ -73948,12 +82465,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), +<<<<<<< HEAD ty: DeclarationId(2365), +======= + ty: DeclarationId(2372), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -73967,7 +82492,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -73992,7 +82521,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74011,7 +82544,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74030,7 +82567,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -74056,12 +82597,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1155), }], }, @@ -74076,7 +82625,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74095,7 +82648,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74109,7 +82666,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74123,12 +82684,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1046), }], }, @@ -74143,7 +82712,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -74169,7 +82742,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(976), @@ -74189,7 +82766,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(976), @@ -74209,7 +82790,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -74229,7 +82814,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -74249,7 +82838,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -74269,7 +82862,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -74289,12 +82886,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(974), }], }, @@ -74309,7 +82914,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(976), @@ -74329,13 +82938,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), value: DeclarationId(2384), +======= + parameter: DeclarationId(686), + value: DeclarationId(2391), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -74349,7 +82967,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(976), @@ -74369,13 +82991,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), value: DeclarationId(2386), +======= + parameter: DeclarationId(686), + value: DeclarationId(2393), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -74389,12 +83020,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(974), }], }, @@ -74409,7 +83048,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(979), @@ -74429,7 +83072,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(979), @@ -74449,7 +83096,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(979), @@ -74469,7 +83120,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(979), @@ -74489,7 +83144,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(979), @@ -74509,7 +83168,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(976), @@ -74529,7 +83192,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(979), @@ -74549,7 +83216,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(979), @@ -74569,6 +83240,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) arguments: vec![TemplateArgument { parameter: DeclarationId(977), value: DeclarationId(1214), @@ -74732,7 +83410,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) arguments: vec![TemplateArgument { parameter: DeclarationId(977), value: DeclarationId(1214), @@ -74752,7 +83434,171 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) arguments: vec![TemplateArgument { parameter: DeclarationId(977), value: DeclarationId(1214), @@ -74789,7 +83635,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1768), @@ -74809,7 +83659,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1768), @@ -74829,7 +83683,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1768), @@ -74849,12 +83707,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1768), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(974), }], }, @@ -74869,13 +83735,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1768), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), value: DeclarationId(2384), +======= + parameter: DeclarationId(686), + value: DeclarationId(2391), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -74889,13 +83764,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1770), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), value: DeclarationId(2386), +======= + parameter: DeclarationId(686), + value: DeclarationId(2393), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -74909,10 +83793,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) arguments: vec![TemplateArgument { parameter: DeclarationId(977), value: DeclarationId(1214), @@ -74929,12 +83820,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(1770), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(974), }], }, @@ -74949,10 +83848,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) arguments: vec![TemplateArgument { parameter: DeclarationId(980), value: DeclarationId(1214), @@ -74969,10 +83875,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) arguments: vec![TemplateArgument { parameter: DeclarationId(980), value: DeclarationId(1214), @@ -74989,7 +83902,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75008,7 +83925,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75027,7 +83948,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75046,7 +83971,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -75072,7 +84001,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -75098,7 +84031,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75117,7 +84054,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75136,7 +84077,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(11), @@ -75162,7 +84107,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75176,7 +84125,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75190,7 +84143,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75204,7 +84161,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "param".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/termination.dag", 3332, 3358), + }); + declarations.push(Declaration { + id: DeclarationId(2438), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75242,7 +84222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75332,7 +84316,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75346,7 +84334,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75365,7 +84357,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75384,7 +84380,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75403,7 +84403,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75422,7 +84426,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75441,7 +84449,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75460,7 +84472,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75479,7 +84495,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75493,12 +84513,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1196), }], }, @@ -75513,12 +84541,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1189), }], }, @@ -75533,7 +84569,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75547,7 +84587,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75561,7 +84605,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75575,7 +84623,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75594,7 +84646,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75608,7 +84664,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -75634,6 +84694,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(970), }], }, @@ -75778,7 +84847,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) arguments: vec![TemplateArgument { parameter: DeclarationId(977), value: DeclarationId(1214), @@ -75797,11 +84870,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -75812,11 +84892,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -75832,11 +84916,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -75852,11 +84940,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -75872,16 +84964,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -75892,16 +84991,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -75912,13 +85018,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) arguments: vec![TemplateArgument { parameter: DeclarationId(977), value: DeclarationId(1214), @@ -75938,7 +85048,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) arguments: vec![TemplateArgument { parameter: DeclarationId(977), value: DeclarationId(1214), @@ -75958,7 +85072,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) arguments: vec![TemplateArgument { parameter: DeclarationId(977), value: DeclarationId(1214), @@ -75977,7 +85095,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2472), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Instantiation { + template: DeclarationId(2252), + arguments: vec![TemplateArgument { + parameter: DeclarationId(977), + value: DeclarationId(1214), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -76000,12 +85134,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2473), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Instantiation { + template: DeclarationId(2252), + arguments: vec![TemplateArgument { + parameter: DeclarationId(977), + value: DeclarationId(1214), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -76014,12 +85158,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2474), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Instantiation { + template: DeclarationId(2252), + arguments: vec![TemplateArgument { + parameter: DeclarationId(977), + value: DeclarationId(1214), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -76028,12 +85182,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2475), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Instantiation { + template: DeclarationId(2252), + arguments: vec![TemplateArgument { + parameter: DeclarationId(977), + value: DeclarationId(1214), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -76042,12 +85206,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2476), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Instantiation { + template: DeclarationId(2252), + arguments: vec![TemplateArgument { + parameter: DeclarationId(977), + value: DeclarationId(1214), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -76056,12 +85230,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2477), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Instantiation { + template: DeclarationId(2252), + arguments: vec![TemplateArgument { + parameter: DeclarationId(977), + value: DeclarationId(1214), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -76070,7 +85254,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2478), @@ -76084,7 +85272,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2479), @@ -76098,7 +85290,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2480), @@ -76112,7 +85308,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2481), @@ -76126,7 +85326,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2482), @@ -76140,12 +85344,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2483), name: None, connective: TypeConnective::Conj { children: vec![] }, +<<<<<<< HEAD +======= type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -76154,11 +85364,129 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/tokenize.dag", 779, 786), + }); + declarations.push(Declaration { + id: DeclarationId(2492), + name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), @@ -76176,7 +85504,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1150), }], }, @@ -77214,12 +86546,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1259), }], }, @@ -77234,12 +86574,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1264), }], }, @@ -77254,7 +86602,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77268,7 +86620,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77282,7 +86638,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77296,7 +86656,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77310,7 +86674,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77324,7 +86692,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77338,7 +86710,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77352,7 +86728,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77366,7 +86746,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77380,7 +86764,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77394,7 +86782,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77408,7 +86800,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -77427,7 +86823,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77441,7 +86841,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77455,7 +86859,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77469,7 +86877,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77483,7 +86895,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77497,7 +86913,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77511,7 +86931,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -77536,7 +86960,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77550,7 +86978,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -77569,7 +87001,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -77588,7 +87024,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -77613,7 +87053,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -77632,7 +87076,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -77661,7 +87109,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -77690,7 +87142,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -77715,7 +87171,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -77735,7 +87195,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -77745,7 +87209,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "expect_exit_code".to_string(), @@ -77764,7 +87232,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -77784,7 +87256,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -77794,7 +87270,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "expect_exit_code".to_string(), @@ -77813,7 +87293,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -77842,7 +87326,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -77871,7 +87359,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -77890,7 +87382,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -77919,7 +87415,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -77944,7 +87444,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -77969,7 +87473,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -77998,7 +87506,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -78027,7 +87539,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -78052,7 +87568,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -78077,12 +87597,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1239), }], }, @@ -78097,7 +87625,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -78107,7 +87639,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -78122,7 +87658,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -78151,7 +87691,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -78180,7 +87724,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -78199,12 +87747,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1150), }], }, @@ -78219,7 +87775,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78233,7 +87793,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78247,12 +87811,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1150), }], }, @@ -78267,7 +87839,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -78286,7 +87862,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -78305,12 +87885,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1259), }], }, @@ -78325,12 +87913,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1150), }], }, @@ -78345,7 +87941,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -78365,7 +87965,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78379,7 +87983,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78393,7 +88001,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78407,7 +88019,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -78426,7 +88042,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78440,7 +88060,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78454,7 +88078,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78468,7 +88096,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78482,7 +88114,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78496,7 +88132,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78510,7 +88150,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78524,7 +88168,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78538,7 +88186,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78552,7 +88204,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78566,7 +88222,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78580,7 +88240,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78594,7 +88258,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78608,7 +88276,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78622,7 +88294,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78636,7 +88312,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![ + Field { + label: "target_name".to_string(), + ty: DeclarationId(230), + }, + Field { + label: "algebra".to_string(), + ty: DeclarationId(1680), + }, + Field { + label: "carrier".to_string(), + ty: DeclarationId(1681), +<<<<<<< HEAD + }, + Field { + label: "range_min_inclusive".to_string(), + ty: DeclarationId(230), + }, + Field { + label: "range_max_inclusive".to_string(), + ty: DeclarationId(230), + }, + Field { + label: "is_copy".to_string(), + ty: DeclarationId(128), + }, + Field { + label: "overflow".to_string(), + ty: DeclarationId(1682), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9857, 10429), + }); declarations.push(Declaration { id: DeclarationId(2635), name: None, @@ -78692,6 +88418,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "carrier".to_string(), @@ -78714,12 +88442,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1683), }], }, @@ -78734,7 +88470,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78748,7 +88488,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -78767,7 +88511,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -78787,12 +88535,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "values".to_string(), +<<<<<<< HEAD ty: DeclarationId(2639), +======= + ty: DeclarationId(2646), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -78806,7 +88562,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -78831,7 +88591,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -78856,7 +88620,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78870,7 +88638,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78884,7 +88656,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78898,12 +88674,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1695), }], }, @@ -78918,7 +88702,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -78937,7 +88725,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78951,7 +88743,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78965,7 +88761,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78979,7 +88779,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78993,7 +88797,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79007,7 +88815,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79026,7 +88838,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79040,7 +88856,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79054,7 +88874,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79068,12 +88892,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1704), }], }, @@ -79088,12 +88920,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1710), }], }, @@ -79108,7 +88948,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -79134,7 +88978,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79153,7 +89001,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79167,7 +89019,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79181,7 +89037,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79195,7 +89055,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -79215,7 +89079,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -79235,17 +89103,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "branches".to_string(), +<<<<<<< HEAD ty: DeclarationId(2664), }, Field { label: "paths".to_string(), ty: DeclarationId(2665), +======= + ty: DeclarationId(2671), + }, + Field { + label: "paths".to_string(), + ty: DeclarationId(2672), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -79260,7 +89140,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -79280,12 +89164,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1705), }], }, @@ -79300,17 +89192,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "branches".to_string(), +<<<<<<< HEAD ty: DeclarationId(2667), }, Field { label: "types".to_string(), ty: DeclarationId(2668), +======= + ty: DeclarationId(2674), + }, + Field { + label: "types".to_string(), + ty: DeclarationId(2675), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -79325,7 +89229,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79344,12 +89252,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1706), }], }, @@ -79364,12 +89280,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "inputs".to_string(), +<<<<<<< HEAD ty: DeclarationId(2671), +======= + ty: DeclarationId(2678), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -79383,12 +89307,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1706), }], }, @@ -79403,12 +89335,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "inputs".to_string(), +<<<<<<< HEAD ty: DeclarationId(2673), +======= + ty: DeclarationId(2680), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -79422,7 +89362,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79436,7 +89380,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79450,7 +89398,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79464,7 +89416,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79478,7 +89434,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(230), + CardinalityBound::AtMostOne, + ), + ), + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), + }); + declarations.push(Declaration { + id: DeclarationId(2688), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79516,7 +89495,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), +======= + parameter: DeclarationId(686), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) value: DeclarationId(1714), }], }, @@ -79653,7 +89640,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -79673,7 +89664,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -79699,7 +89694,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79718,7 +89717,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79737,7 +89740,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79756,7 +89763,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79775,7 +89786,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79794,7 +89809,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -79814,12 +89833,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "labels".to_string(), +<<<<<<< HEAD ty: DeclarationId(2697), +======= + ty: DeclarationId(2704), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -79833,7 +89860,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79847,7 +89878,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79861,7 +89896,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79875,7 +89914,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79889,7 +89932,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79903,7 +89950,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79917,7 +89968,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79936,7 +89991,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -79962,7 +90021,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79981,7 +90044,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -80000,7 +90067,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -80019,13 +90090,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "name".to_string(), +<<<<<<< HEAD ty: DeclarationId(2705), +======= + ty: DeclarationId(2712), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "run".to_string(), @@ -80037,11 +90116,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "if_condition".to_string(), @@ -80053,7 +90144,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -80068,7 +90163,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -80087,7 +90186,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Instantiation { + template: DeclarationId(137), + arguments: vec![ + TemplateArgument { + parameter: DeclarationId(138), + value: DeclarationId(230), + }, + TemplateArgument { + parameter: DeclarationId(139), + value: DeclarationId(230), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5442, 5461), + }); + declarations.push(Declaration { + id: DeclarationId(2721), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -80158,7 +90287,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -80177,12 +90310,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "name".to_string(), +<<<<<<< HEAD ty: DeclarationId(2711), }, Field { @@ -80196,6 +90334,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "if_condition".to_string(), @@ -80207,7 +90364,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -80222,7 +90383,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80236,7 +90401,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80250,7 +90419,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80264,7 +90437,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80278,7 +90455,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80292,6 +90473,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -80488,7 +90673,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80595,7 +90964,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -80620,7 +90993,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -80639,7 +91016,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -80658,7 +91039,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -80677,7 +91062,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -80691,7 +91080,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "if_no_files_found".to_string(), @@ -80710,7 +91103,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -80729,7 +91126,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -80739,7 +91140,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -80754,7 +91159,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80768,7 +91177,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80782,7 +91195,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80796,7 +91213,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -80816,7 +91237,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -80827,7 +91252,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -80842,7 +91271,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -80868,13 +91301,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), value: DeclarationId(2748), +======= + parameter: DeclarationId(686), + value: DeclarationId(2755), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -80888,7 +91330,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -80914,13 +91360,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { +<<<<<<< HEAD parameter: DeclarationId(687), value: DeclarationId(2750), +======= + parameter: DeclarationId(686), + value: DeclarationId(2757), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -80934,7 +91389,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -80953,7 +91412,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80967,7 +91430,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80981,7 +91448,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80995,7 +91466,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81009,7 +91484,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81023,7 +91502,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81037,6 +91520,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -81208,11 +91701,166 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81244,17 +91896,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2768), }, Field { label: "None".to_string(), ty: DeclarationId(2769), +======= + ty: DeclarationId(2775), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2776), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -81269,7 +91933,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -81288,7 +91956,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81302,17 +91974,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2771), }, Field { label: "None".to_string(), ty: DeclarationId(2772), +======= + ty: DeclarationId(2778), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2779), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -81327,7 +92011,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -81346,6 +92034,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -81498,17 +92192,167 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2783), name: None, +<<<<<<< HEAD +======= + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2781), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2782), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), + }); + declarations.push(Declaration { + id: DeclarationId(2784), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(93), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), + }); + declarations.push(Declaration { + id: DeclarationId(2785), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), + }); + declarations.push(Declaration { + id: DeclarationId(2786), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2784), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2785), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), + }); + declarations.push(Declaration { + id: DeclarationId(2787), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(93), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), + }); + declarations.push(Declaration { + id: DeclarationId(2788), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), + }); + declarations.push(Declaration { + id: DeclarationId(2789), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2787), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2788), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), + }); + declarations.push(Declaration { + id: DeclarationId(2790), + name: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), ty: DeclarationId(230), }], }, +<<<<<<< HEAD +======= type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -81520,7 +92364,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), + }); + declarations.push(Declaration { + id: DeclarationId(2792), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81540,11 +92399,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -81559,7 +92426,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -81578,7 +92449,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81592,17 +92467,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2786), }, Field { label: "None".to_string(), ty: DeclarationId(2787), +======= + ty: DeclarationId(2793), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2794), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -81617,7 +92504,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -81636,7 +92527,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81650,17 +92545,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2789), }, Field { label: "None".to_string(), ty: DeclarationId(2790), +======= + ty: DeclarationId(2796), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2797), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -81675,7 +92582,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -81694,7 +92605,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81708,17 +92623,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2792), }, Field { label: "None".to_string(), ty: DeclarationId(2793), +======= + ty: DeclarationId(2799), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2800), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -81733,7 +92660,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -81752,7 +92683,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81766,17 +92701,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2795), }, Field { label: "None".to_string(), ty: DeclarationId(2796), +======= + ty: DeclarationId(2802), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2803), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -81791,7 +92738,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -81810,7 +92761,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81824,17 +92779,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2798), }, Field { label: "None".to_string(), ty: DeclarationId(2799), +======= + ty: DeclarationId(2805), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2806), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -81849,7 +92816,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -81868,6 +92839,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), + }); + declarations.push(Declaration { + id: DeclarationId(2811), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2808), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2809), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), + }); + declarations.push(Declaration { + id: DeclarationId(2811), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), + }); + declarations.push(Declaration { + id: DeclarationId(2812), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), + }); + declarations.push(Declaration { + id: DeclarationId(2813), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2811), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2812), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), + }); + declarations.push(Declaration { + id: DeclarationId(2814), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), + }); + declarations.push(Declaration { + id: DeclarationId(2815), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), + }); + declarations.push(Declaration { + id: DeclarationId(2816), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2814), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2815), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), + }); + declarations.push(Declaration { + id: DeclarationId(2817), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82042,7 +93172,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2810), }, Field { label: "None".to_string(), ty: DeclarationId(2811), +======= + ty: DeclarationId(2817), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2818), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -82081,7 +93223,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82100,7 +93246,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82114,17 +93264,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2813), }, Field { label: "None".to_string(), ty: DeclarationId(2814), +======= + ty: DeclarationId(2820), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2821), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -82139,7 +93301,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82158,7 +93324,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82172,17 +93342,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2816), }, Field { label: "None".to_string(), ty: DeclarationId(2817), +======= + ty: DeclarationId(2823), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2824), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -82197,7 +93379,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82216,6 +93402,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -82368,17 +93560,167 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2828), name: None, +<<<<<<< HEAD +======= + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2826), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2827), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), + }); + declarations.push(Declaration { + id: DeclarationId(2829), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), + }); + declarations.push(Declaration { + id: DeclarationId(2830), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), + }); + declarations.push(Declaration { + id: DeclarationId(2831), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2829), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2830), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), + }); + declarations.push(Declaration { + id: DeclarationId(2832), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), + }); + declarations.push(Declaration { + id: DeclarationId(2833), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), + }); + declarations.push(Declaration { + id: DeclarationId(2834), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2832), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2833), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), + }); + declarations.push(Declaration { + id: DeclarationId(2835), + name: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), ty: DeclarationId(1776), }], }, +<<<<<<< HEAD +======= type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -82390,7 +93732,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), + }); + declarations.push(Declaration { + id: DeclarationId(2837), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82410,11 +93767,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -82429,7 +93794,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82448,7 +93817,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82462,17 +93835,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(2831), }, Field { label: "None".to_string(), ty: DeclarationId(2832), +======= + ty: DeclarationId(2838), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2839), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -82487,7 +93872,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82506,6 +93895,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), + }); + declarations.push(Declaration { + id: DeclarationId(2843), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2841), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2842), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), + }); + declarations.push(Declaration { + id: DeclarationId(2844), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), + }); + declarations.push(Declaration { + id: DeclarationId(2845), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), + }); + declarations.push(Declaration { + id: DeclarationId(2846), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2844), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2845), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), + }); + declarations.push(Declaration { + id: DeclarationId(2847), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), + }); + declarations.push(Declaration { + id: DeclarationId(2848), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), + }); + declarations.push(Declaration { + id: DeclarationId(2849), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2847), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2848), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), + }); + declarations.push(Declaration { + id: DeclarationId(2850), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82680,6 +94228,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -82851,12 +94405,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), + }); + declarations.push(Declaration { + id: DeclarationId(2854), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2858), +<<<<<<< HEAD + ty: DeclarationId(2852), }, Field { label: "None".to_string(), + ty: DeclarationId(2853), +======= ty: DeclarationId(2859), }, + Field { + label: "None".to_string(), + ty: DeclarationId(2860), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, ], }, type_params: vec![], @@ -83006,15 +94630,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(722), + ty: DeclarationId(799), }], }, type_params: vec![], @@ -83025,10 +94653,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), + }); + declarations.push(Declaration { + id: DeclarationId(2857), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2861), +<<<<<<< HEAD + ty: DeclarationId(2855), }, Field { label: "None".to_string(), + ty: DeclarationId(2856), +======= ty: DeclarationId(2862), }, + Field { + label: "None".to_string(), + ty: DeclarationId(2863), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, ], }, type_params: vec![], @@ -83064,17 +94718,3037 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(755), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2859), +======= + id: DeclarationId(2866), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), + }); + declarations.push(Declaration { + id: DeclarationId(2867), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), + }); + declarations.push(Declaration { + id: DeclarationId(2860), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2858), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2859), +======= + ty: DeclarationId(2865), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2866), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2861), +======= + id: DeclarationId(2868), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(722), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2862), +======= + id: DeclarationId(2869), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2863), +======= + id: DeclarationId(2870), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2861), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2862), +======= + ty: DeclarationId(2868), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2869), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2864), +======= + id: DeclarationId(2871), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2865), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), + }); + declarations.push(Declaration { + id: DeclarationId(2866), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2864), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2865), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), + }); + declarations.push(Declaration { + id: DeclarationId(2867), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(724), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), + }); + declarations.push(Declaration { + id: DeclarationId(2868), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), + }); + declarations.push(Declaration { + id: DeclarationId(2869), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2867), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2868), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), + }); + declarations.push(Declaration { + id: DeclarationId(2870), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(724), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), + }); + declarations.push(Declaration { + id: DeclarationId(2871), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), + }); + declarations.push(Declaration { + id: DeclarationId(2872), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2870), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2871), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), + }); + declarations.push(Declaration { + id: DeclarationId(2873), +======= + id: DeclarationId(2872), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), + }); + declarations.push(Declaration { + id: DeclarationId(2873), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2871), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2872), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), + }); + declarations.push(Declaration { + id: DeclarationId(2874), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(723), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), + }); + declarations.push(Declaration { + id: DeclarationId(2875), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), + }); + declarations.push(Declaration { + id: DeclarationId(2876), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2874), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2875), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), + }); + declarations.push(Declaration { + id: DeclarationId(2877), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(723), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), + }); + declarations.push(Declaration { + id: DeclarationId(2878), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), + }); + declarations.push(Declaration { + id: DeclarationId(2879), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2877), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2878), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), + }); + declarations.push(Declaration { + id: DeclarationId(2880), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(795), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2874), +======= + id: DeclarationId(2881), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), + }); + declarations.push(Declaration { + id: DeclarationId(2882), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), + }); + declarations.push(Declaration { + id: DeclarationId(2875), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2873), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2874), +======= + ty: DeclarationId(2880), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2881), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2876), +======= + id: DeclarationId(2883), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(801), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2877), +======= + id: DeclarationId(2884), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), + }); + declarations.push(Declaration { + id: DeclarationId(2885), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), + }); + declarations.push(Declaration { + id: DeclarationId(2878), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2876), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2877), +======= + ty: DeclarationId(2883), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2884), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2879), +======= + id: DeclarationId(2886), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(809), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2880), +======= + id: DeclarationId(2887), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), + }); + declarations.push(Declaration { + id: DeclarationId(2888), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), + }); + declarations.push(Declaration { + id: DeclarationId(2881), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2879), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2880), +======= + ty: DeclarationId(2886), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2887), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2882), +======= + id: DeclarationId(2889), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(755), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2883), +======= + id: DeclarationId(2890), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), + }); + declarations.push(Declaration { + id: DeclarationId(2891), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), + }); + declarations.push(Declaration { + id: DeclarationId(2884), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2882), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2883), +======= + ty: DeclarationId(2889), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2890), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2885), +======= + id: DeclarationId(2892), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(822), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2886), +======= + id: DeclarationId(2893), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), + }); + declarations.push(Declaration { + id: DeclarationId(2894), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), + }); + declarations.push(Declaration { + id: DeclarationId(2887), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2885), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2886), +======= + ty: DeclarationId(2892), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2893), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2888), +======= + id: DeclarationId(2895), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(755), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2889), +======= + id: DeclarationId(2896), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), + }); + declarations.push(Declaration { + id: DeclarationId(2897), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), + }); + declarations.push(Declaration { + id: DeclarationId(2890), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2888), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2889), +======= + ty: DeclarationId(2895), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2896), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2891), +======= + id: DeclarationId(2898), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(825), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2892), +======= + id: DeclarationId(2899), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), + }); + declarations.push(Declaration { + id: DeclarationId(2900), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), + }); + declarations.push(Declaration { + id: DeclarationId(2893), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2891), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2892), +======= + ty: DeclarationId(2898), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2899), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2894), + name: None, +======= + id: DeclarationId(2901), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(841), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + }); + declarations.push(Declaration { + id: DeclarationId(2902), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + }); + declarations.push(Declaration { + id: DeclarationId(2903), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2901), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2902), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + }); + declarations.push(Declaration { + id: DeclarationId(2904), + name: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(842), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + }); + declarations.push(Declaration { + id: DeclarationId(2895), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + }); + declarations.push(Declaration { + id: DeclarationId(2896), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2894), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2895), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + }); + declarations.push(Declaration { + id: DeclarationId(2905), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(843), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), + }); + declarations.push(Declaration { + id: DeclarationId(2906), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), + }); + declarations.push(Declaration { + id: DeclarationId(2899), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2897), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2898), +======= + ty: DeclarationId(2904), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2905), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2900), +======= + id: DeclarationId(2907), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(93), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2901), +======= + id: DeclarationId(2908), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2902), +======= + id: DeclarationId(2909), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2900), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2901), +======= + ty: DeclarationId(2907), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2908), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2903), +======= + id: DeclarationId(2910), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2904), +======= + id: DeclarationId(2911), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2905), +======= + id: DeclarationId(2912), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2903), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2904), +======= + ty: DeclarationId(2910), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2911), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2906), +======= + id: DeclarationId(2913), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(115), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2907), +======= + id: DeclarationId(2914), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2908), +======= + id: DeclarationId(2915), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2906), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2907), +======= + ty: DeclarationId(2913), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2914), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2909), +======= + id: DeclarationId(2916), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2910), + name: None, + connective: TypeConnective::Conj { children: vec![] }, +======= + id: DeclarationId(2917), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), + }); + declarations.push(Declaration { + id: DeclarationId(2918), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2916), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2917), + }, + ], + }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), + }); + declarations.push(Declaration { + id: DeclarationId(2919), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2909), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2910), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), + }); + declarations.push(Declaration { + id: DeclarationId(2912), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(896), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4680, 4707), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2913), +======= + id: DeclarationId(2920), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4680, 4707), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2914), +======= + id: DeclarationId(2921), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), +<<<<<<< HEAD + ty: DeclarationId(2912), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2913), +======= + ty: DeclarationId(2919), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2920), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4680, 4707), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2915), +======= + id: DeclarationId(2922), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(128), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, +<<<<<<< HEAD + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058), + }); + declarations.push(Declaration { + id: DeclarationId(2916), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058), + }); + declarations.push(Declaration { + id: DeclarationId(2917), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2915), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2916), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058), + }); + declarations.push(Declaration { + id: DeclarationId(2918), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421), + }); + declarations.push(Declaration { + id: DeclarationId(2919), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421), + }); + declarations.push(Declaration { + id: DeclarationId(2920), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2918), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2919), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421), + }); + declarations.push(Declaration { + id: DeclarationId(2921), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439), + }); + declarations.push(Declaration { + id: DeclarationId(2922), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439), + }); + declarations.push(Declaration { + id: DeclarationId(2923), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2921), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2922), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439), +======= + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4724, 4729), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }); + declarations.push(Declaration { + id: DeclarationId(2924), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4724, 4729), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2925), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5562, 5569), + }); + declarations.push(Declaration { + id: DeclarationId(2926), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2924), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2925), + }, + ], +======= + id: DeclarationId(2924), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2922), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2923), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4724, 4729), + }); + declarations.push(Declaration { + id: DeclarationId(2925), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6085, 6092), + }); + declarations.push(Declaration { + id: DeclarationId(2927), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6085, 6092), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2928), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5580, 5587), + }); + declarations.push(Declaration { + id: DeclarationId(2929), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2927), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2928), + }, + ], +======= + id: DeclarationId(2927), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2925), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2926), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6085, 6092), + }); + declarations.push(Declaration { + id: DeclarationId(2928), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6103, 6110), + }); + declarations.push(Declaration { + id: DeclarationId(2930), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6103, 6110), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2931), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5720, 5727), + }); + declarations.push(Declaration { + id: DeclarationId(2932), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2930), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2931), + }, + ], +======= + id: DeclarationId(2930), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2928), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2929), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6103, 6110), + }); + declarations.push(Declaration { + id: DeclarationId(2931), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6233, 6240), + }); + declarations.push(Declaration { + id: DeclarationId(2933), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6233, 6240), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2934), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5738, 5745), + }); + declarations.push(Declaration { + id: DeclarationId(2935), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2933), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2934), + }, + ], +======= + id: DeclarationId(2933), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2931), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2932), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6233, 6240), + }); + declarations.push(Declaration { + id: DeclarationId(2934), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6251, 6258), + }); + declarations.push(Declaration { + id: DeclarationId(2936), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6251, 6258), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2937), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5876, 5883), + }); + declarations.push(Declaration { + id: DeclarationId(2938), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2936), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2937), + }, + ], +======= + id: DeclarationId(2936), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2934), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2935), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6251, 6258), + }); + declarations.push(Declaration { + id: DeclarationId(2937), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6391, 6398), + }); + declarations.push(Declaration { + id: DeclarationId(2939), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6391, 6398), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2940), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5969, 5976), + }); + declarations.push(Declaration { + id: DeclarationId(2941), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2939), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2940), + }, + ], +======= + id: DeclarationId(2939), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2937), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2938), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6391, 6398), + }); + declarations.push(Declaration { + id: DeclarationId(2940), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6409, 6416), + }); + declarations.push(Declaration { + id: DeclarationId(2942), + name: None, +<<<<<<< HEAD + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(2084), + }], + }, +======= + connective: TypeConnective::Conj { children: vec![] }, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6409, 6416), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2943), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6674, 6709), + }); + declarations.push(Declaration { + id: DeclarationId(2944), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2942), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2943), + }, + ], +======= + id: DeclarationId(2942), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2940), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2941), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6409, 6416), + }); + declarations.push(Declaration { + id: DeclarationId(2943), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6547, 6554), + }); + declarations.push(Declaration { + id: DeclarationId(2945), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6547, 6554), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2946), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6912, 6917), + }); + declarations.push(Declaration { + id: DeclarationId(2947), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2945), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2946), + }, + ], +======= + id: DeclarationId(2945), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2943), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2944), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6547, 6554), + }); + declarations.push(Declaration { + id: DeclarationId(2946), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6640, 6647), + }); + declarations.push(Declaration { + id: DeclarationId(2948), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6640, 6647), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2949), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7017, 7022), + }); + declarations.push(Declaration { + id: DeclarationId(2950), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2948), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2949), + }, + ], +======= + id: DeclarationId(2948), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2946), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2947), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6640, 6647), + }); + declarations.push(Declaration { + id: DeclarationId(2949), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(2091), + }], +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7345, 7380), + }); + declarations.push(Declaration { + id: DeclarationId(2951), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7345, 7380), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2952), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7108, 7113), + }); + declarations.push(Declaration { + id: DeclarationId(2953), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2951), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2952), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7108, 7113), + }); + declarations.push(Declaration { + id: DeclarationId(2954), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(93), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739), + }); + declarations.push(Declaration { + id: DeclarationId(2955), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739), + }); + declarations.push(Declaration { + id: DeclarationId(2956), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2954), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2955), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739), + }); + declarations.push(Declaration { + id: DeclarationId(2957), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(93), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775), + }); + declarations.push(Declaration { + id: DeclarationId(2958), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775), + }); + declarations.push(Declaration { + id: DeclarationId(2959), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2957), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2958), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775), + }); + declarations.push(Declaration { + id: DeclarationId(2960), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814), + }); + declarations.push(Declaration { + id: DeclarationId(2961), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814), + }); + declarations.push(Declaration { + id: DeclarationId(2962), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2960), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2961), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814), + }); + declarations.push(Declaration { + id: DeclarationId(2963), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8783, 8790), + }); + declarations.push(Declaration { + id: DeclarationId(2964), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8783, 8790), + }); + declarations.push(Declaration { + id: DeclarationId(2965), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2963), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2964), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8783, 8790), + }); + declarations.push(Declaration { + id: DeclarationId(2966), + name: None, +======= + id: DeclarationId(2951), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(2949), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2950), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7345, 7380), + }); + declarations.push(Declaration { + id: DeclarationId(2952), + name: None, +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(130), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7583, 7588), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(2967), name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, + connective: TypeConnective::Conj { children: vec![] }, +======= + id: DeclarationId(2953), + name: None, + connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -83083,12 +97757,24 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -83097,20 +97783,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(928), }], }, type_params: vec![], @@ -83547,10 +98236,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83561,20 +98254,32 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2888), +<<<<<<< HEAD + ty: DeclarationId(2969), }, Field { label: "None".to_string(), - ty: DeclarationId(2889), + ty: DeclarationId(2970), +======= + ty: DeclarationId(2976), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2977), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -83586,15 +98291,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(825), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -83605,10 +98314,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -83793,20 +98494,24 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -83851,20 +98557,34 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2903), +<<<<<<< HEAD + ty: DeclarationId(2981), }, Field { label: "None".to_string(), - ty: DeclarationId(2904), + ty: DeclarationId(2982), +======= + ty: DeclarationId(2982), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2983), }, ], }, @@ -83876,15 +98596,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -83992,15 +98713,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -84185,10 +98897,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -84257,20 +98974,34 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2924), +<<<<<<< HEAD + ty: DeclarationId(2993), }, Field { label: "None".to_string(), - ty: DeclarationId(2925), + ty: DeclarationId(2994), +======= + ty: DeclarationId(2994), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(2995), }, ], }, @@ -84282,15 +99013,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -84398,15 +99130,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -84591,10 +99314,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), + }); + declarations.push(Declaration { + id: DeclarationId(3007), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2951), +<<<<<<< HEAD + ty: DeclarationId(3005), }, Field { label: "None".to_string(), - ty: DeclarationId(2952), + ty: DeclarationId(3006), +======= + ty: DeclarationId(3012), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3013), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -84804,10 +99553,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -84823,10 +99576,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -85011,20 +99756,24 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -85069,20 +99819,34 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2966), +<<<<<<< HEAD + ty: DeclarationId(3017), }, Field { label: "None".to_string(), - ty: DeclarationId(2967), + ty: DeclarationId(3018), +======= + ty: DeclarationId(3018), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3019), }, ], }, @@ -85094,15 +99858,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -85210,15 +99975,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(1197), }], }, type_params: vec![], @@ -85229,10 +99998,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), + }); + declarations.push(Declaration { + id: DeclarationId(3022), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2975), +<<<<<<< HEAD + ty: DeclarationId(3020), }, Field { label: "None".to_string(), - ty: DeclarationId(2976), + ty: DeclarationId(3021), +======= + ty: DeclarationId(3027), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3028), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -85268,15 +100063,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(938), + ty: DeclarationId(1199), }], }, type_params: vec![], @@ -85287,10 +100086,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), + }); + declarations.push(Declaration { + id: DeclarationId(3025), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2978), +<<<<<<< HEAD + ty: DeclarationId(3023), }, Field { label: "None".to_string(), - ty: DeclarationId(2979), + ty: DeclarationId(3024), +======= + ty: DeclarationId(3030), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3031), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -85326,15 +100151,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(938), + ty: DeclarationId(806), }], }, type_params: vec![], @@ -85345,10 +100174,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85359,20 +100192,32 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2981), +<<<<<<< HEAD + ty: DeclarationId(3026), }, Field { label: "None".to_string(), - ty: DeclarationId(2982), + ty: DeclarationId(3027), +======= + ty: DeclarationId(3033), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3034), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -85384,15 +100229,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(930), + ty: DeclarationId(160), }], }, type_params: vec![], @@ -85403,10 +100252,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85591,20 +100425,24 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -85649,20 +100488,34 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2996), +<<<<<<< HEAD + ty: DeclarationId(3038), }, Field { label: "None".to_string(), - ty: DeclarationId(2997), + ty: DeclarationId(3039), +======= + ty: DeclarationId(3039), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3040), }, ], }, @@ -85674,15 +100527,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -85790,15 +100644,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -85983,12 +100828,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -85997,20 +100851,24 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -86055,20 +100914,34 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3017), +<<<<<<< HEAD + ty: DeclarationId(3050), }, Field { label: "None".to_string(), - ty: DeclarationId(3018), + ty: DeclarationId(3051), +======= + ty: DeclarationId(3051), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3052), }, ], }, @@ -86080,15 +100953,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -86196,15 +101070,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(806), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -86215,10 +101093,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86403,20 +101266,24 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -86461,20 +101329,34 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3038), +<<<<<<< HEAD + ty: DeclarationId(3062), }, Field { label: "None".to_string(), - ty: DeclarationId(3039), + ty: DeclarationId(3063), +======= + ty: DeclarationId(3063), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3064), }, ], }, @@ -86486,10 +101368,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -86602,10 +101485,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -86795,10 +101669,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -86867,20 +101746,34 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3059), +<<<<<<< HEAD + ty: DeclarationId(3074), }, Field { label: "None".to_string(), - ty: DeclarationId(3060), + ty: DeclarationId(3075), +======= + ty: DeclarationId(3075), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3076), }, ], }, @@ -86892,10 +101785,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -87008,10 +101902,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -87204,7 +102089,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -87273,20 +102163,34 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3080), +<<<<<<< HEAD + ty: DeclarationId(3086), }, Field { label: "None".to_string(), - ty: DeclarationId(3081), + ty: DeclarationId(3087), +======= + ty: DeclarationId(3087), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3088), }, ], }, @@ -87301,7 +102205,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -87417,7 +102322,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87436,6 +102345,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), + }); + declarations.push(Declaration { +<<<<<<< HEAD + id: DeclarationId(3099), + name: None, +======= + id: DeclarationId(3098), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3096), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3097), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), + }); + declarations.push(Declaration { + id: DeclarationId(3099), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -87607,11 +102563,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -87621,20 +102578,151 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(3098), }, Field { label: "None".to_string(), ty: DeclarationId(3099), +======= + ty: DeclarationId(3099), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3100), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), + }); + declarations.push(Declaration { + id: DeclarationId(3102), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(93), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), + }); + declarations.push(Declaration { + id: DeclarationId(3103), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), + }); + declarations.push(Declaration { + id: DeclarationId(3104), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3102), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3103), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), + }); + declarations.push(Declaration { + id: DeclarationId(3105), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), + }); + declarations.push(Declaration { + id: DeclarationId(3106), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), + }); + declarations.push(Declaration { + id: DeclarationId(3107), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3105), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3106), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -87649,6 +102737,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -87820,11 +102918,166 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87856,17 +103113,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(3110), }, Field { label: "None".to_string(), ty: DeclarationId(3111), +======= + ty: DeclarationId(3117), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3118), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -87881,7 +103150,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87900,7 +103173,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87914,17 +103191,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), +<<<<<<< HEAD ty: DeclarationId(3113), }, Field { label: "None".to_string(), ty: DeclarationId(3114), +======= + ty: DeclarationId(3120), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3121), +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -93317,7 +108606,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: None, }, ); @@ -93749,7 +109042,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(596)), }, ); @@ -93773,7 +109070,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(598)), }, ); @@ -93781,7 +109082,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(600)), }, ); @@ -93789,7 +109094,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(602)), }, ); @@ -93797,7 +109106,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(604)), }, ); @@ -93805,7 +109118,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(606)), }, ); @@ -93813,7 +109130,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(608)), }, ); @@ -93821,7 +109142,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(610)), }, ); @@ -93853,7 +109178,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(614)), }, ); @@ -93877,7 +109206,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(617)), }, ); @@ -93909,7 +109242,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(621)), }, ); @@ -93957,7 +109294,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(626)), }, ); @@ -94029,7 +109370,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(633)), }, ); @@ -94109,7 +109454,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(640)), }, ); @@ -94173,7 +109522,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(645)), }, ); @@ -94189,7 +109542,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: None, }, ); @@ -94277,7 +109634,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(655)), }, ); @@ -94349,7 +109710,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(663)), }, ); @@ -94773,7 +110138,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(713)), }, ); @@ -95549,7 +110918,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(792)), }, ); @@ -95693,7 +111066,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) produced_by: Some(NodeId(808)), }, ); @@ -96033,6 +111410,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_optional_match_disjs( ) -> HashMap { { let mut map = HashMap::new(); +<<<<<<< HEAD map.insert(DeclarationId(389), DeclarationId(2761)); map.insert(DeclarationId(391), DeclarationId(2764)); map.insert(DeclarationId(423), DeclarationId(2767)); @@ -96152,6 +111530,127 @@ fn bootstrapped_fixture_without_parse_surface_dag_optional_match_disjs( map.insert(DeclarationId(2739), DeclarationId(3109)); map.insert(DeclarationId(2741), DeclarationId(3112)); map.insert(DeclarationId(2752), DeclarationId(3115)); +======= + map.insert(DeclarationId(389), DeclarationId(2768)); + map.insert(DeclarationId(391), DeclarationId(2771)); + map.insert(DeclarationId(423), DeclarationId(2774)); + map.insert(DeclarationId(426), DeclarationId(2777)); + map.insert(DeclarationId(471), DeclarationId(2780)); + map.insert(DeclarationId(472), DeclarationId(2783)); + map.insert(DeclarationId(473), DeclarationId(2786)); + map.insert(DeclarationId(513), DeclarationId(2789)); + map.insert(DeclarationId(515), DeclarationId(2792)); + map.insert(DeclarationId(516), DeclarationId(2795)); + map.insert(DeclarationId(539), DeclarationId(2798)); + map.insert(DeclarationId(582), DeclarationId(2801)); + map.insert(DeclarationId(602), DeclarationId(2804)); + map.insert(DeclarationId(603), DeclarationId(2807)); + map.insert(DeclarationId(605), DeclarationId(2810)); + map.insert(DeclarationId(608), DeclarationId(2813)); + map.insert(DeclarationId(613), DeclarationId(2816)); + map.insert(DeclarationId(614), DeclarationId(2819)); + map.insert(DeclarationId(618), DeclarationId(2822)); + map.insert(DeclarationId(619), DeclarationId(2825)); + map.insert(DeclarationId(620), DeclarationId(2828)); + map.insert(DeclarationId(625), DeclarationId(2831)); + map.insert(DeclarationId(1773), DeclarationId(2834)); + map.insert(DeclarationId(1777), DeclarationId(2837)); + map.insert(DeclarationId(1780), DeclarationId(2840)); + map.insert(DeclarationId(1782), DeclarationId(2843)); + map.insert(DeclarationId(1783), DeclarationId(2846)); + map.insert(DeclarationId(1784), DeclarationId(2849)); + map.insert(DeclarationId(1838), DeclarationId(2852)); + map.insert(DeclarationId(1839), DeclarationId(2855)); + map.insert(DeclarationId(1840), DeclarationId(2858)); + map.insert(DeclarationId(1841), DeclarationId(2861)); + map.insert(DeclarationId(1842), DeclarationId(2864)); + map.insert(DeclarationId(1843), DeclarationId(2867)); + map.insert(DeclarationId(1849), DeclarationId(2870)); + map.insert(DeclarationId(1904), DeclarationId(2873)); + map.insert(DeclarationId(1907), DeclarationId(2876)); + map.insert(DeclarationId(1908), DeclarationId(2879)); + map.insert(DeclarationId(1909), DeclarationId(2882)); + map.insert(DeclarationId(1910), DeclarationId(2885)); + map.insert(DeclarationId(1933), DeclarationId(2888)); + map.insert(DeclarationId(1938), DeclarationId(2891)); + map.insert(DeclarationId(1942), DeclarationId(2894)); + map.insert(DeclarationId(1945), DeclarationId(2897)); + map.insert(DeclarationId(1946), DeclarationId(2900)); + map.insert(DeclarationId(1991), DeclarationId(2903)); + map.insert(DeclarationId(1992), DeclarationId(2906)); + map.insert(DeclarationId(1993), DeclarationId(2909)); + map.insert(DeclarationId(1994), DeclarationId(2912)); + map.insert(DeclarationId(2044), DeclarationId(2915)); + map.insert(DeclarationId(2045), DeclarationId(2918)); + map.insert(DeclarationId(2066), DeclarationId(2921)); + map.insert(DeclarationId(2067), DeclarationId(2924)); + map.insert(DeclarationId(2078), DeclarationId(2927)); + map.insert(DeclarationId(2079), DeclarationId(2930)); + map.insert(DeclarationId(2081), DeclarationId(2933)); + map.insert(DeclarationId(2082), DeclarationId(2936)); + map.insert(DeclarationId(2084), DeclarationId(2939)); + map.insert(DeclarationId(2085), DeclarationId(2942)); + map.insert(DeclarationId(2087), DeclarationId(2945)); + map.insert(DeclarationId(2089), DeclarationId(2948)); + map.insert(DeclarationId(2092), DeclarationId(2951)); + map.insert(DeclarationId(2096), DeclarationId(2954)); + map.insert(DeclarationId(2098), DeclarationId(2957)); + map.insert(DeclarationId(2100), DeclarationId(2960)); + map.insert(DeclarationId(2110), DeclarationId(2963)); + map.insert(DeclarationId(2111), DeclarationId(2966)); + map.insert(DeclarationId(2112), DeclarationId(2969)); + map.insert(DeclarationId(2115), DeclarationId(2972)); + map.insert(DeclarationId(2116), DeclarationId(2975)); + map.insert(DeclarationId(2151), DeclarationId(2978)); + map.insert(DeclarationId(2152), DeclarationId(2981)); + map.insert(DeclarationId(2153), DeclarationId(2984)); + map.insert(DeclarationId(2154), DeclarationId(2987)); + map.insert(DeclarationId(2155), DeclarationId(2990)); + map.insert(DeclarationId(2178), DeclarationId(2993)); + map.insert(DeclarationId(2308), DeclarationId(2996)); + map.insert(DeclarationId(2309), DeclarationId(2999)); + map.insert(DeclarationId(2315), DeclarationId(3002)); + map.insert(DeclarationId(2316), DeclarationId(3005)); + map.insert(DeclarationId(2317), DeclarationId(3008)); + map.insert(DeclarationId(2318), DeclarationId(3011)); + map.insert(DeclarationId(2319), DeclarationId(3014)); + map.insert(DeclarationId(2320), DeclarationId(3017)); + map.insert(DeclarationId(2425), DeclarationId(3020)); + map.insert(DeclarationId(2426), DeclarationId(3023)); + map.insert(DeclarationId(2427), DeclarationId(3026)); + map.insert(DeclarationId(2430), DeclarationId(3029)); + map.insert(DeclarationId(2431), DeclarationId(3032)); + map.insert(DeclarationId(2625), DeclarationId(3035)); + map.insert(DeclarationId(2654), DeclarationId(3038)); + map.insert(DeclarationId(2660), DeclarationId(3041)); + map.insert(DeclarationId(2667), DeclarationId(3044)); + map.insert(DeclarationId(2686), DeclarationId(3047)); + map.insert(DeclarationId(2687), DeclarationId(3050)); + map.insert(DeclarationId(2695), DeclarationId(3053)); + map.insert(DeclarationId(2699), DeclarationId(3056)); + map.insert(DeclarationId(2700), DeclarationId(3059)); + map.insert(DeclarationId(2701), DeclarationId(3062)); + map.insert(DeclarationId(2702), DeclarationId(3065)); + map.insert(DeclarationId(2712), DeclarationId(3068)); + map.insert(DeclarationId(2714), DeclarationId(3071)); + map.insert(DeclarationId(2715), DeclarationId(3074)); + map.insert(DeclarationId(2716), DeclarationId(3077)); + map.insert(DeclarationId(2718), DeclarationId(3080)); + map.insert(DeclarationId(2721), DeclarationId(3083)); + map.insert(DeclarationId(2722), DeclarationId(3086)); + map.insert(DeclarationId(2729), DeclarationId(3089)); + map.insert(DeclarationId(2730), DeclarationId(3092)); + map.insert(DeclarationId(2731), DeclarationId(3095)); + map.insert(DeclarationId(2733), DeclarationId(3098)); + map.insert(DeclarationId(2734), DeclarationId(3101)); + map.insert(DeclarationId(2735), DeclarationId(3104)); + map.insert(DeclarationId(2737), DeclarationId(3107)); + map.insert(DeclarationId(2738), DeclarationId(3110)); + map.insert(DeclarationId(2739), DeclarationId(3113)); + map.insert(DeclarationId(2746), DeclarationId(3116)); + map.insert(DeclarationId(2748), DeclarationId(3119)); + map.insert(DeclarationId(2759), DeclarationId(3122)); +>>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) map } } diff --git a/src/v3/grounding_coercion_fold/src/fold.rs b/src/v3/grounding_coercion_fold/src/fold.rs index 123e6812d75..c95b9ee9243 100644 --- a/src/v3/grounding_coercion_fold/src/fold.rs +++ b/src/v3/grounding_coercion_fold/src/fold.rs @@ -22,8 +22,8 @@ use std::collections::BTreeMap; use v3_compiler::dag::{ - Dag, Declaration, DeclarationId, FieldValue, Interval, IntervalWidth, LiteralBits, - PositiveIntervalWidth, TypeConnective, ValueBody, + literal_decimal_i64, Dag, Declaration, DeclarationId, FieldValue, Interval, IntervalWidth, + LiteralBits, PositiveIntervalWidth, TypeConnective, ValueBody, }; use v3_grounding_lifetime::{BindingId, LifetimeAnalysisReport}; @@ -149,24 +149,9 @@ fn reference_field(fields: &[(String, FieldValue)], label: &str) -> Option Option { - match s.parse::() { - Ok(value) => Some(value), - Err(error) => { - debug_assert!( - s.is_empty(), - "substrate Int literal must be valid decimal i64 text when non-empty (got {s:?}: {error})" - ); - None - } - } -} - fn int_literal_field(fields: &[(String, FieldValue)], label: &str) -> Option { match field(fields, label)? { - FieldValue::Literal(LiteralBits::Int(value)) => i64_from_substrate_int_text(value), + FieldValue::Literal(LiteralBits::Int(value)) => literal_decimal_i64(value.as_str()), _ => None, } } @@ -204,7 +189,7 @@ fn parse_positive_interval_width(dag: &Dag, value: &FieldValue) -> Option { if let [FieldValue::Literal(LiteralBits::Int(units))] = payload.as_slice() { return Some(PositiveIntervalWidth::UnitCount { - units: i64_from_substrate_int_text(units)?, + units: literal_decimal_i64(units.as_str())?, }); } if let [FieldValue::Record(fields)] = payload.as_slice() { @@ -265,7 +250,7 @@ fn parse_int_interval(dag: &Dag, value: &FieldValue) -> Option> { "BoundedInterval" => { if let [FieldValue::Literal(LiteralBits::Int(lower)), width] = payload.as_slice() { return Some(Interval::BoundedInterval { - lower: i64_from_substrate_int_text(lower)?, + lower: literal_decimal_i64(lower.as_str())?, width: parse_interval_width(dag, width)?, }); } diff --git a/src/v3/std/anthropic_schema.dag b/src/v3/std/anthropic_schema.dag index 97f0758dfc8..d26251488f3 100644 --- a/src/v3/std/anthropic_schema.dag +++ b/src/v3/std/anthropic_schema.dag @@ -60,13 +60,28 @@ type ContentBlock = TextContent { text: String } | ImageContent { source: ImageSource } +// 🟢 TERMINAL provider-domain coproduct mirroring `AnthropicToolResultBlock` +// (`dsl/extdeps/llm/anthropic.dag:89-94`). Nested tool-result array rows use +// Anthropic-prefixed wire `type` tags (`anthropic_tool_result_block_wire_contract`); +// text/image arms mirror shared shapes under those tags, not `ContentBlock`. +type AnthropicToolResultBlock + = AnthropicTextBlock { text: String } + | AnthropicImageBlock { source: ImageSource } + | AnthropicDocumentBlock { source: Json } + | AnthropicSearchResultBlock { + content: List + source: String + title: String + } + | AnthropicToolReferenceBlock { tool_name: String } + // 🟢 TERMINAL provider-domain coproduct mirroring `AnthropicToolResultContent` // (`dsl/extdeps/llm/anthropic.dag`). Scalar text and nested content blocks are // alternatives in Anthropic's tool-result content slot, not optional sibling // fields on the tool-result row. type AnthropicToolResultContent = ToolResultText { text: String } - | ToolResultBlocks { blocks: List } + | ToolResultBlocks { blocks: List } // 🟢 TERMINAL provider-domain coproduct mirroring `AnthropicUserContentBlock` // (`dsl/extdeps/llm/anthropic.dag`). Tool-result content is optional on the From cdaee211367704afc968d624c77b3d4d8bed05ea Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sun, 10 May 2026 14:51:04 -0400 Subject: [PATCH 17/18] =?UTF-8?q?WIP:=20T-Anthropic-Wire=20coproduct=20sli?= =?UTF-8?q?ce=202=20=E2=80=94=20Anthropic=20tool=5Fresult=5Fcontent=20wire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/v3/compiler/src/bootstrap_generated.rs | 31526 ++++------------ ...otstrap_generated_without_parse_surface.rs | 29419 ++++---------- 2 files changed, 14421 insertions(+), 46524 deletions(-) diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs index 92e1774b974..fd149136904 100644 --- a/src/v3/compiler/src/bootstrap_generated.rs +++ b/src/v3/compiler/src/bootstrap_generated.rs @@ -8,11 +8,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag { ports: bootstrapped_fixture_dag_ports(), diagnostics: bootstrapped_fixture_dag_diagnostics(), next_node_id: 844, -<<<<<<< HEAD - next_declaration_id: 3218, -======= - next_declaration_id: 3225, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + next_declaration_id: 3226, next_port_id: 1009, primitives: PrimitiveCache::default(), substrate_markers: SubstrateMarkers::default(), @@ -28,11 +24,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag { emit_model_variants: EmitModelVariants::default(), clusters: bootstrapped_fixture_dag_clusters(), optional_match_disjs: bootstrapped_fixture_dag_optional_match_disjs(), -<<<<<<< HEAD - declaration_append_begin_after_bootstrap: 3218, -======= - declaration_append_begin_after_bootstrap: 3225, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + declaration_append_begin_after_bootstrap: 3226, } } @@ -1410,21 +1402,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(182), - target: TransformTarget::Callable(DeclarationId(2031)), + target: TransformTarget::Callable(DeclarationId(2032)), inputs: vec![PortId(185)], output: PortId(187), span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(183), - target: TransformTarget::Callable(DeclarationId(2033)), + target: TransformTarget::Callable(DeclarationId(2034)), inputs: vec![PortId(187)], output: PortId(188), span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(184), - target: TransformTarget::Callable(DeclarationId(1977)), + target: TransformTarget::Callable(DeclarationId(1978)), inputs: vec![PortId(185), PortId(186), PortId(188)], output: PortId(189), span: SourceSpan::new("src/v3/std/algebra.dag", 11149, 11539), @@ -1440,7 +1432,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(186), - target: TransformTarget::Callable(DeclarationId(1979)), + target: TransformTarget::Callable(DeclarationId(1980)), inputs: vec![PortId(190), PortId(191), PortId(192)], output: PortId(193), span: SourceSpan::new("src/v3/std/algebra.dag", 11670, 11726), @@ -1456,7 +1448,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(188), - target: TransformTarget::Callable(DeclarationId(2034)), + target: TransformTarget::Callable(DeclarationId(2035)), inputs: vec![PortId(194)], output: PortId(195), span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810), @@ -1608,7 +1600,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(202), - target: TransformTarget::Callable(DeclarationId(2018)), + target: TransformTarget::Callable(DeclarationId(2019)), inputs: vec![PortId(211)], output: PortId(212), span: SourceSpan::new("src/v3/std/algebra.dag", 12325, 12349), @@ -1638,7 +1630,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(206), - target: TransformTarget::Callable(DeclarationId(2016)), + target: TransformTarget::Callable(DeclarationId(2017)), inputs: vec![PortId(216)], output: PortId(217), span: SourceSpan::new("src/v3/std/algebra.dag", 12618, 12653), @@ -1768,14 +1760,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(218), - target: TransformTarget::Callable(DeclarationId(2012)), + target: TransformTarget::Callable(DeclarationId(2013)), inputs: vec![PortId(230)], output: PortId(231), span: SourceSpan::new("src/v3/std/algebra.dag", 14214, 14229), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(219), - target: TransformTarget::Callable(DeclarationId(2036)), + target: TransformTarget::Callable(DeclarationId(2037)), inputs: vec![PortId(229), PortId(231)], output: PortId(232), span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245), @@ -2480,7 +2472,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(266), - target: TransformTarget::Callable(DeclarationId(2038)), + target: TransformTarget::Callable(DeclarationId(2039)), inputs: vec![PortId(312), PortId(313)], output: PortId(314), span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021), @@ -2508,7 +2500,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(270), - target: TransformTarget::Callable(DeclarationId(2040)), + target: TransformTarget::Callable(DeclarationId(2041)), inputs: vec![PortId(317), PortId(318)], output: PortId(319), span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186), @@ -2819,14 +2811,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(290), - target: TransformTarget::Callable(DeclarationId(1213)), + target: TransformTarget::Callable(DeclarationId(1214)), inputs: vec![PortId(339)], output: PortId(344), span: SourceSpan::new("src/v3/std/algebra.dag", 18897, 18924), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(291), - target: TransformTarget::Callable(DeclarationId(1213)), + target: TransformTarget::Callable(DeclarationId(1214)), inputs: vec![PortId(343)], output: PortId(345), span: SourceSpan::new("src/v3/std/algebra.dag", 18928, 18955), @@ -4001,14 +3993,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(364), - target: TransformTarget::Callable(DeclarationId(2041)), + target: TransformTarget::Callable(DeclarationId(2042)), inputs: vec![PortId(425), PortId(426)], output: PortId(427), span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(365), - target: TransformTarget::Callable(DeclarationId(2042)), + target: TransformTarget::Callable(DeclarationId(2043)), inputs: vec![PortId(424), PortId(427)], output: PortId(428), span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324), @@ -4024,7 +4016,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(367), - target: TransformTarget::Callable(DeclarationId(2043)), + target: TransformTarget::Callable(DeclarationId(2044)), inputs: vec![], output: PortId(430), span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610), @@ -4088,7 +4080,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(375), - target: TransformTarget::Callable(DeclarationId(2044)), + target: TransformTarget::Callable(DeclarationId(2045)), inputs: vec![PortId(436), PortId(438)], output: PortId(439), span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789), @@ -4184,21 +4176,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(382), - target: TransformTarget::Callable(DeclarationId(2012)), + target: TransformTarget::Callable(DeclarationId(2013)), inputs: vec![PortId(445)], output: PortId(446), span: SourceSpan::new("src/v3/std/algebra.dag", 23123, 23138), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(383), - target: TransformTarget::Callable(DeclarationId(2045)), + target: TransformTarget::Callable(DeclarationId(2046)), inputs: vec![], output: PortId(447), span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(384), - target: TransformTarget::Callable(DeclarationId(2046)), + target: TransformTarget::Callable(DeclarationId(2047)), inputs: vec![PortId(446), PortId(447)], output: PortId(448), span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148), @@ -4335,7 +4327,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(396), - target: TransformTarget::Callable(DeclarationId(2047)), + target: TransformTarget::Callable(DeclarationId(2048)), inputs: vec![], output: PortId(461), span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604), @@ -4399,7 +4391,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(404), - target: TransformTarget::Callable(DeclarationId(2048)), + target: TransformTarget::Callable(DeclarationId(2049)), inputs: vec![PortId(467), PortId(469)], output: PortId(470), span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792), @@ -4804,7 +4796,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(430), - target: TransformTarget::Callable(DeclarationId(2012)), + target: TransformTarget::Callable(DeclarationId(2013)), inputs: vec![PortId(509)], output: PortId(510), span: SourceSpan::new("src/v3/std/algebra.dag", 25180, 25195), @@ -4847,7 +4839,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(435), - target: TransformTarget::Callable(DeclarationId(2049)), + target: TransformTarget::Callable(DeclarationId(2050)), inputs: vec![PortId(515), PortId(516)], output: PortId(517), span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349), @@ -4944,7 +4936,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(442), - target: TransformTarget::Callable(DeclarationId(2012)), + target: TransformTarget::Callable(DeclarationId(2013)), inputs: vec![PortId(523)], output: PortId(524), span: SourceSpan::new("src/v3/std/algebra.dag", 25451, 25466), @@ -5003,7 +4995,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(449), - target: TransformTarget::Callable(DeclarationId(2018)), + target: TransformTarget::Callable(DeclarationId(2019)), inputs: vec![PortId(532)], output: PortId(533), span: SourceSpan::new("src/v3/std/algebra.dag", 25569, 25628), @@ -5086,7 +5078,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(454), - target: TransformTarget::Callable(DeclarationId(2012)), + target: TransformTarget::Callable(DeclarationId(2013)), inputs: vec![PortId(537)], output: PortId(538), span: SourceSpan::new("src/v3/std/algebra.dag", 25917, 25932), @@ -5179,7 +5171,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(465), - target: TransformTarget::Callable(DeclarationId(2016)), + target: TransformTarget::Callable(DeclarationId(2017)), inputs: vec![PortId(551)], output: PortId(552), span: SourceSpan::new("src/v3/std/algebra.dag", 26159, 26222), @@ -5651,7 +5643,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(494), - target: TransformTarget::Callable(DeclarationId(2016)), + target: TransformTarget::Callable(DeclarationId(2017)), inputs: vec![PortId(601)], output: PortId(602), span: SourceSpan::new("src/v3/std/algebra.dag", 27605, 27633), @@ -5742,7 +5734,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(505), - target: TransformTarget::Callable(DeclarationId(2050)), + target: TransformTarget::Callable(DeclarationId(2051)), inputs: vec![], output: PortId(615), span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995), @@ -5806,7 +5798,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(513), - target: TransformTarget::Callable(DeclarationId(2051)), + target: TransformTarget::Callable(DeclarationId(2052)), inputs: vec![PortId(621), PortId(623)], output: PortId(624), span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201), @@ -5895,7 +5887,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(519), - target: TransformTarget::Callable(DeclarationId(2053)), + target: TransformTarget::Callable(DeclarationId(2054)), inputs: vec![PortId(628), PortId(630)], output: PortId(631), span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377), @@ -5916,7 +5908,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(522), - target: TransformTarget::Callable(DeclarationId(2054)), + target: TransformTarget::Callable(DeclarationId(2055)), inputs: vec![PortId(629), PortId(633)], output: PortId(634), span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449), @@ -5959,14 +5951,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(525), - target: TransformTarget::Callable(DeclarationId(2055)), + target: TransformTarget::Callable(DeclarationId(2056)), inputs: vec![], output: PortId(637), span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(526), - target: TransformTarget::Callable(DeclarationId(2057)), + target: TransformTarget::Callable(DeclarationId(2058)), inputs: vec![PortId(636), PortId(637)], output: PortId(638), span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749), @@ -5989,7 +5981,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(529), - target: TransformTarget::Callable(DeclarationId(2012)), + target: TransformTarget::Callable(DeclarationId(2013)), inputs: vec![PortId(640)], output: PortId(641), span: SourceSpan::new("src/v3/std/induction.dag", 29099, 29114), @@ -6005,7 +5997,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(531), - target: TransformTarget::Callable(DeclarationId(1081)), + target: TransformTarget::Callable(DeclarationId(1082)), inputs: vec![PortId(643)], output: PortId(644), span: SourceSpan::new("src/v3/std/induction.dag", 29146, 29172), @@ -6021,7 +6013,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(533), - target: TransformTarget::Callable(DeclarationId(1082)), + target: TransformTarget::Callable(DeclarationId(1083)), inputs: vec![PortId(646)], output: PortId(647), span: SourceSpan::new("src/v3/std/induction.dag", 29209, 29238), @@ -6037,7 +6029,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(535), - target: TransformTarget::Callable(DeclarationId(1084)), + target: TransformTarget::Callable(DeclarationId(1085)), inputs: vec![PortId(649)], output: PortId(650), span: SourceSpan::new("src/v3/std/induction.dag", 29279, 29307), @@ -6062,7 +6054,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(538), - target: TransformTarget::Callable(DeclarationId(2020)), + target: TransformTarget::Callable(DeclarationId(2021)), inputs: vec![PortId(653)], output: PortId(654), span: SourceSpan::new("src/v3/std/induction.dag", 29338, 29412), @@ -6076,7 +6068,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(540), - target: TransformTarget::Callable(DeclarationId(2020)), + target: TransformTarget::Callable(DeclarationId(2021)), inputs: vec![PortId(655)], output: PortId(656), span: SourceSpan::new("src/v3/std/induction.dag", 29433, 29461), @@ -6090,7 +6082,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(542), - target: TransformTarget::Callable(DeclarationId(2020)), + target: TransformTarget::Callable(DeclarationId(2021)), inputs: vec![PortId(657)], output: PortId(658), span: SourceSpan::new("src/v3/std/induction.dag", 29480, 29513), @@ -6217,7 +6209,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(548), - target: TransformTarget::Callable(DeclarationId(2020)), + target: TransformTarget::Callable(DeclarationId(2021)), inputs: vec![PortId(664)], output: PortId(665), span: SourceSpan::new("src/v3/std/induction.dag", 29645, 29726), @@ -6242,7 +6234,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(551), - target: TransformTarget::Callable(DeclarationId(2020)), + target: TransformTarget::Callable(DeclarationId(2021)), inputs: vec![PortId(668)], output: PortId(669), span: SourceSpan::new("src/v3/std/induction.dag", 29761, 29835), @@ -6291,7 +6283,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(554), - target: TransformTarget::Callable(DeclarationId(1082)), + target: TransformTarget::Callable(DeclarationId(1083)), inputs: vec![PortId(671)], output: PortId(672), span: SourceSpan::new("src/v3/std/induction.dag", 30026, 30060), @@ -6307,32 +6299,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(556), - target: TransformTarget::Callable(DeclarationId(1238)), + target: TransformTarget::Callable(DeclarationId(1239)), inputs: vec![], output: PortId(676), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3031, 3059), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(557), - target: TransformTarget::Callable(DeclarationId(1247)), + target: TransformTarget::Callable(DeclarationId(1248)), inputs: vec![PortId(673), PortId(676)], output: PortId(677), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3007, 3060), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(558), - target: TransformTarget::Callable(DeclarationId(1238)), + target: TransformTarget::Callable(DeclarationId(1239)), inputs: vec![], output: PortId(678), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3096, 3124), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(559), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2484)), -======= - target: TransformTarget::Callable(DeclarationId(2491)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2492)), inputs: vec![PortId(678)], output: PortId(679), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3087, 3125), @@ -6348,18 +6336,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(561), - target: TransformTarget::Callable(DeclarationId(1238)), + target: TransformTarget::Callable(DeclarationId(1239)), inputs: vec![], output: PortId(682), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3174, 3202), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(562), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2485)), -======= - target: TransformTarget::Callable(DeclarationId(2492)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2493)), inputs: vec![PortId(682)], output: PortId(683), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3165, 3203), @@ -6404,32 +6388,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(564), - target: TransformTarget::Callable(DeclarationId(1238)), + target: TransformTarget::Callable(DeclarationId(1239)), inputs: vec![], output: PortId(686), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3268, 3296), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(565), - target: TransformTarget::Callable(DeclarationId(1247)), + target: TransformTarget::Callable(DeclarationId(1248)), inputs: vec![PortId(673), PortId(686)], output: PortId(687), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3244, 3297), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(566), - target: TransformTarget::Callable(DeclarationId(1238)), + target: TransformTarget::Callable(DeclarationId(1239)), inputs: vec![], output: PortId(688), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3333, 3361), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(567), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2486)), -======= - target: TransformTarget::Callable(DeclarationId(2493)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2494)), inputs: vec![PortId(688)], output: PortId(689), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3324, 3362), @@ -6445,18 +6425,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(569), - target: TransformTarget::Callable(DeclarationId(1238)), + target: TransformTarget::Callable(DeclarationId(1239)), inputs: vec![], output: PortId(692), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3411, 3439), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(570), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2487)), -======= - target: TransformTarget::Callable(DeclarationId(2494)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2495)), inputs: vec![PortId(692)], output: PortId(693), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3402, 3440), @@ -6501,32 +6477,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(572), - target: TransformTarget::Callable(DeclarationId(1238)), + target: TransformTarget::Callable(DeclarationId(1239)), inputs: vec![], output: PortId(696), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3502, 3530), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(573), - target: TransformTarget::Callable(DeclarationId(1247)), + target: TransformTarget::Callable(DeclarationId(1248)), inputs: vec![PortId(673), PortId(696)], output: PortId(697), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3478, 3531), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(574), - target: TransformTarget::Callable(DeclarationId(1238)), + target: TransformTarget::Callable(DeclarationId(1239)), inputs: vec![], output: PortId(698), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3567, 3595), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(575), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2488)), -======= - target: TransformTarget::Callable(DeclarationId(2495)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2496)), inputs: vec![PortId(698)], output: PortId(699), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3558, 3596), @@ -6542,18 +6514,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(577), - target: TransformTarget::Callable(DeclarationId(1238)), + target: TransformTarget::Callable(DeclarationId(1239)), inputs: vec![], output: PortId(702), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3645, 3673), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(578), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2489)), -======= - target: TransformTarget::Callable(DeclarationId(2496)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2497)), inputs: vec![PortId(702)], output: PortId(703), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3636, 3674), @@ -6598,32 +6566,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(580), - target: TransformTarget::Callable(DeclarationId(1238)), + target: TransformTarget::Callable(DeclarationId(1239)), inputs: vec![], output: PortId(706), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3734, 3762), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(581), - target: TransformTarget::Callable(DeclarationId(1247)), + target: TransformTarget::Callable(DeclarationId(1248)), inputs: vec![PortId(673), PortId(706)], output: PortId(707), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3710, 3763), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(582), - target: TransformTarget::Callable(DeclarationId(1238)), + target: TransformTarget::Callable(DeclarationId(1239)), inputs: vec![], output: PortId(708), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3799, 3827), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(583), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2490)), -======= - target: TransformTarget::Callable(DeclarationId(2497)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2498)), inputs: vec![PortId(708)], output: PortId(709), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3790, 3828), @@ -6639,18 +6603,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(585), - target: TransformTarget::Callable(DeclarationId(1238)), + target: TransformTarget::Callable(DeclarationId(1239)), inputs: vec![], output: PortId(712), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3877, 3905), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(586), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2491)), -======= - target: TransformTarget::Callable(DeclarationId(2498)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2499)), inputs: vec![PortId(712)], output: PortId(713), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3868, 3906), @@ -6695,32 +6655,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(588), - target: TransformTarget::Callable(DeclarationId(1238)), + target: TransformTarget::Callable(DeclarationId(1239)), inputs: vec![], output: PortId(716), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3966, 3994), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(589), - target: TransformTarget::Callable(DeclarationId(1247)), + target: TransformTarget::Callable(DeclarationId(1248)), inputs: vec![PortId(673), PortId(716)], output: PortId(717), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3942, 3995), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(590), - target: TransformTarget::Callable(DeclarationId(1238)), + target: TransformTarget::Callable(DeclarationId(1239)), inputs: vec![], output: PortId(718), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4031, 4059), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(591), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2492)), -======= - target: TransformTarget::Callable(DeclarationId(2499)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2500)), inputs: vec![PortId(718)], output: PortId(719), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4022, 4060), @@ -6736,18 +6692,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(593), - target: TransformTarget::Callable(DeclarationId(1238)), + target: TransformTarget::Callable(DeclarationId(1239)), inputs: vec![], output: PortId(722), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4109, 4137), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(594), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2493)), -======= - target: TransformTarget::Callable(DeclarationId(2500)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2501)), inputs: vec![PortId(722)], output: PortId(723), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4100, 4138), @@ -6890,7 +6842,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(598), - target: TransformTarget::Callable(DeclarationId(1187)), + target: TransformTarget::Callable(DeclarationId(1188)), inputs: vec![PortId(726), PortId(727)], output: PortId(728), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4541, 4566), @@ -6906,11 +6858,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(600), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2494)), -======= - target: TransformTarget::Callable(DeclarationId(2501)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2502)), inputs: vec![], output: PortId(729), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4824, 4829), @@ -6926,11 +6874,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(602), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2495)), -======= - target: TransformTarget::Callable(DeclarationId(2502)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2503)), inputs: vec![], output: PortId(730), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4889, 4894), @@ -6946,11 +6890,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(604), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2496)), -======= - target: TransformTarget::Callable(DeclarationId(2503)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2504)), inputs: vec![], output: PortId(731), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4952, 4957), @@ -6966,11 +6906,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(606), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2497)), -======= - target: TransformTarget::Callable(DeclarationId(2504)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2505)), inputs: vec![], output: PortId(732), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5015, 5020), @@ -6986,11 +6922,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(608), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2498)), -======= - target: TransformTarget::Callable(DeclarationId(2505)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2506)), inputs: vec![], output: PortId(733), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5079, 5084), @@ -7006,11 +6938,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(610), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2499)), -======= - target: TransformTarget::Callable(DeclarationId(2506)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2507)), inputs: vec![], output: PortId(734), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5159, 5164), @@ -7026,29 +6954,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(612), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2501)), -======= - target: TransformTarget::Callable(DeclarationId(2508)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2509)), inputs: vec![PortId(735)], output: PortId(736), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5275, 5286), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(613), - target: TransformTarget::Callable(DeclarationId(1194)), + target: TransformTarget::Callable(DeclarationId(1195)), inputs: vec![], output: PortId(737), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5294, 5325), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(614), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2500)), -======= - target: TransformTarget::Callable(DeclarationId(2507)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2508)), inputs: vec![PortId(736), PortId(737)], output: PortId(738), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5262, 5327), @@ -7064,18 +6984,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(616), - target: TransformTarget::Callable(DeclarationId(1193)), + target: TransformTarget::Callable(DeclarationId(1194)), inputs: vec![], output: PortId(740), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5428, 5459), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(617), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2502)), -======= - target: TransformTarget::Callable(DeclarationId(2509)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2510)), inputs: vec![PortId(739), PortId(740)], output: PortId(741), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5403, 5461), @@ -7098,18 +7014,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(620), - target: TransformTarget::Callable(DeclarationId(1195)), + target: TransformTarget::Callable(DeclarationId(1196)), inputs: vec![PortId(742)], output: PortId(744), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5649, 5682), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(621), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2503)), -======= - target: TransformTarget::Callable(DeclarationId(2510)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2511)), inputs: vec![PortId(743), PortId(742), PortId(744)], output: PortId(745), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5562, 5687), @@ -7132,25 +7044,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(624), - target: TransformTarget::Callable(DeclarationId(1196)), + target: TransformTarget::Callable(DeclarationId(1197)), inputs: vec![PortId(747)], output: PortId(749), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5881, 5915), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(625), - target: TransformTarget::Callable(DeclarationId(1195)), + target: TransformTarget::Callable(DeclarationId(1196)), inputs: vec![PortId(746)], output: PortId(750), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5932, 5965), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(626), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2504)), -======= - target: TransformTarget::Callable(DeclarationId(2511)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2512)), inputs: vec![PortId(748), PortId(749), PortId(750)], output: PortId(751), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5808, 5970), @@ -7166,14 +7074,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(628), - target: TransformTarget::Callable(DeclarationId(1283)), + target: TransformTarget::Callable(DeclarationId(1284)), inputs: vec![PortId(752)], output: PortId(754), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6333, 6350), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(629), - target: TransformTarget::Callable(DeclarationId(1197)), + target: TransformTarget::Callable(DeclarationId(1198)), inputs: vec![PortId(753)], output: PortId(755), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6366, 6400), @@ -7198,7 +7106,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(632), - target: TransformTarget::Callable(DeclarationId(1197)), + target: TransformTarget::Callable(DeclarationId(1198)), inputs: vec![PortId(753)], output: PortId(759), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6436, 6470), @@ -7252,14 +7160,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(635), - target: TransformTarget::Callable(DeclarationId(1283)), + target: TransformTarget::Callable(DeclarationId(1284)), inputs: vec![PortId(761)], output: PortId(764), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6594, 6611), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(636), - target: TransformTarget::Callable(DeclarationId(1198)), + target: TransformTarget::Callable(DeclarationId(1199)), inputs: vec![PortId(762), PortId(763)], output: PortId(765), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6627, 6669), @@ -7284,7 +7192,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(639), - target: TransformTarget::Callable(DeclarationId(1198)), + target: TransformTarget::Callable(DeclarationId(1199)), inputs: vec![PortId(762), PortId(763)], output: PortId(769), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6705, 6747), @@ -7338,7 +7246,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(642), - target: TransformTarget::Callable(DeclarationId(1199)), + target: TransformTarget::Callable(DeclarationId(1200)), inputs: vec![PortId(771), PortId(772)], output: PortId(774), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6909, 6931), @@ -7354,7 +7262,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(644), - target: TransformTarget::Callable(DeclarationId(1200)), + target: TransformTarget::Callable(DeclarationId(1201)), inputs: vec![PortId(771), PortId(772), PortId(776)], output: PortId(777), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6970, 7000), @@ -7408,14 +7316,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(647), - target: TransformTarget::Callable(DeclarationId(1247)), + target: TransformTarget::Callable(DeclarationId(1248)), inputs: vec![PortId(779), PortId(781)], output: PortId(782), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7184, 7210), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(648), - target: TransformTarget::Callable(DeclarationId(1201)), + target: TransformTarget::Callable(DeclarationId(1202)), inputs: vec![PortId(779), PortId(781), PortId(782)], output: PortId(783), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7152, 7211), @@ -7440,28 +7348,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(651), - target: TransformTarget::Callable(DeclarationId(1238)), + target: TransformTarget::Callable(DeclarationId(1239)), inputs: vec![], output: PortId(787), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7296, 7324), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(652), - target: TransformTarget::Callable(DeclarationId(1241)), + target: TransformTarget::Callable(DeclarationId(1242)), inputs: vec![PortId(786)], output: PortId(788), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7382, 7412), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(653), - target: TransformTarget::Callable(DeclarationId(1242)), + target: TransformTarget::Callable(DeclarationId(1243)), inputs: vec![PortId(785), PortId(788)], output: PortId(789), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7334, 7413), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(654), - target: TransformTarget::Callable(DeclarationId(1200)), + target: TransformTarget::Callable(DeclarationId(1201)), inputs: vec![PortId(779), PortId(787), PortId(789)], output: PortId(790), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7257, 7421), @@ -7518,7 +7426,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(657), - target: TransformTarget::Callable(DeclarationId(1283)), + target: TransformTarget::Callable(DeclarationId(1284)), inputs: vec![PortId(792)], output: PortId(794), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8404, 8421), @@ -7532,28 +7440,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(659), - target: TransformTarget::Callable(DeclarationId(1187)), + target: TransformTarget::Callable(DeclarationId(1188)), inputs: vec![PortId(792), PortId(793)], output: PortId(796), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8468, 8493), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(660), - target: TransformTarget::Callable(DeclarationId(1202)), + target: TransformTarget::Callable(DeclarationId(1203)), inputs: vec![PortId(792), PortId(796)], output: PortId(797), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8432, 8494), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(661), - target: TransformTarget::Callable(DeclarationId(1188)), + target: TransformTarget::Callable(DeclarationId(1189)), inputs: vec![PortId(792), PortId(793)], output: PortId(798), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8542, 8586), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(662), - target: TransformTarget::Callable(DeclarationId(1202)), + target: TransformTarget::Callable(DeclarationId(1203)), inputs: vec![PortId(792), PortId(798)], output: PortId(799), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8506, 8587), @@ -7620,11 +7528,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(667), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2543)), -======= - target: TransformTarget::Callable(DeclarationId(2550)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2551)), inputs: vec![], output: PortId(802), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6287, 6297), @@ -7640,44 +7544,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(669), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2543)), -======= - target: TransformTarget::Callable(DeclarationId(2550)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2551)), inputs: vec![], output: PortId(806), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6605, 6615), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(670), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2543)), -======= - target: TransformTarget::Callable(DeclarationId(2550)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2551)), inputs: vec![], output: PortId(807), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6667, 6677), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(671), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2545)), -======= - target: TransformTarget::Callable(DeclarationId(2552)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2553)), inputs: vec![], output: PortId(808), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6695, 6700), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(672), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2545)), -======= - target: TransformTarget::Callable(DeclarationId(2552)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2553)), inputs: vec![], output: PortId(809), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6722, 6727), @@ -7693,11 +7581,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(674), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2545)), -======= - target: TransformTarget::Callable(DeclarationId(2552)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2553)), inputs: vec![], output: PortId(812), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6764, 6769), @@ -7752,33 +7636,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(676), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2543)), -======= - target: TransformTarget::Callable(DeclarationId(2550)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2551)), inputs: vec![], output: PortId(814), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6833, 6843), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(677), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2545)), -======= - target: TransformTarget::Callable(DeclarationId(2552)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2553)), inputs: vec![], output: PortId(815), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6861, 6866), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(678), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2544)), -======= - target: TransformTarget::Callable(DeclarationId(2551)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2552)), inputs: vec![], output: PortId(816), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6888, 6897), @@ -7794,11 +7666,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(680), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2544)), -======= - target: TransformTarget::Callable(DeclarationId(2551)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2552)), inputs: vec![], output: PortId(819), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6934, 6943), @@ -7862,33 +7730,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(683), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2543)), -======= - target: TransformTarget::Callable(DeclarationId(2550)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2551)), inputs: vec![], output: PortId(823), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7023, 7033), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(684), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2545)), -======= - target: TransformTarget::Callable(DeclarationId(2552)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2553)), inputs: vec![], output: PortId(824), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7051, 7056), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(685), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2544)), -======= - target: TransformTarget::Callable(DeclarationId(2551)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2552)), inputs: vec![], output: PortId(825), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7078, 7087), @@ -7929,18 +7785,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(690), - target: TransformTarget::Callable(DeclarationId(1228)), + target: TransformTarget::Callable(DeclarationId(1229)), inputs: vec![PortId(830)], output: PortId(831), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7187, 7217), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(691), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2542)), -======= - target: TransformTarget::Callable(DeclarationId(2549)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2550)), inputs: vec![PortId(831)], output: PortId(832), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7166, 7219), @@ -7999,11 +7851,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(696), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2542)), -======= - target: TransformTarget::Callable(DeclarationId(2549)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2550)), inputs: vec![PortId(836)], output: PortId(837), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7247, 7335), @@ -8149,7 +7997,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(702), - target: TransformTarget::Callable(DeclarationId(1235)), + target: TransformTarget::Callable(DeclarationId(1236)), inputs: vec![PortId(841), PortId(842), PortId(843)], output: PortId(844), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7515, 7558), @@ -8172,7 +8020,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(705), - target: TransformTarget::Callable(DeclarationId(1228)), + target: TransformTarget::Callable(DeclarationId(1229)), inputs: vec![PortId(845)], output: PortId(846), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7601, 7613), @@ -8188,18 +8036,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(707), - target: TransformTarget::Callable(DeclarationId(1237)), + target: TransformTarget::Callable(DeclarationId(1238)), inputs: vec![], output: PortId(847), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7693, 7711), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(708), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2542)), -======= - target: TransformTarget::Callable(DeclarationId(2549)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2550)), inputs: vec![PortId(847)], output: PortId(848), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7672, 7713), @@ -8222,7 +8066,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(711), - target: TransformTarget::Callable(DeclarationId(1235)), + target: TransformTarget::Callable(DeclarationId(1236)), inputs: vec![PortId(849), PortId(850), PortId(851)], output: PortId(852), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7862, 7906), @@ -8238,11 +8082,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(713), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2547)), -======= - target: TransformTarget::Callable(DeclarationId(2554)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2555)), inputs: vec![], output: PortId(853), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7967, 7972), @@ -8381,36 +8221,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(722), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2229)), -======= - target: TransformTarget::Callable(DeclarationId(2236)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2237)), inputs: vec![], output: PortId(868), span: SourceSpan::new("src/v3/std/timing_lens.dag", 8722, 8734), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(723), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2235)), -======= - target: TransformTarget::Callable(DeclarationId(2242)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2243)), inputs: vec![PortId(868)], output: PortId(869), span: SourceSpan::new("src/v3/std/timing_lens.dag", 8709, 8735), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(724), - target: TransformTarget::Callable(DeclarationId(1240)), + target: TransformTarget::Callable(DeclarationId(1241)), inputs: vec![], output: PortId(870), span: SourceSpan::new("src/v3/std/timing_lens.dag", 8778, 8809), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(725), - target: TransformTarget::Callable(DeclarationId(974)), + target: TransformTarget::Callable(DeclarationId(975)), inputs: vec![PortId(869), PortId(867), PortId(866), PortId(870)], output: PortId(871), span: SourceSpan::new("src/v3/std/timing_lens.dag", 8697, 8813), @@ -8426,7 +8258,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(727), - target: TransformTarget::Callable(DeclarationId(1227)), + target: TransformTarget::Callable(DeclarationId(1228)), inputs: vec![], output: PortId(872), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9120, 9153), @@ -8463,7 +8295,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(732), - target: TransformTarget::Callable(DeclarationId(1283)), + target: TransformTarget::Callable(DeclarationId(1284)), inputs: vec![PortId(876)], output: PortId(878), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9734, 9751), @@ -8497,43 +8329,35 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(736), - target: TransformTarget::Callable(DeclarationId(1242)), + target: TransformTarget::Callable(DeclarationId(1243)), inputs: vec![PortId(877), PortId(882)], output: PortId(883), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9862, 9926), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(737), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2263)), -======= - target: TransformTarget::Callable(DeclarationId(2270)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2271)), inputs: vec![PortId(883)], output: PortId(884), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9826, 9938), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(738), - target: TransformTarget::Callable(DeclarationId(1243)), + target: TransformTarget::Callable(DeclarationId(1244)), inputs: vec![], output: PortId(885), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10082, 10121), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(739), - target: TransformTarget::Callable(DeclarationId(1242)), + target: TransformTarget::Callable(DeclarationId(1243)), inputs: vec![PortId(877), PortId(885)], output: PortId(886), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10002, 10135), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(740), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2263)), -======= - target: TransformTarget::Callable(DeclarationId(2270)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2271)), inputs: vec![PortId(886)], output: PortId(887), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9966, 10147), @@ -8579,25 +8403,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(743), - target: TransformTarget::Callable(DeclarationId(1241)), + target: TransformTarget::Callable(DeclarationId(1242)), inputs: vec![PortId(890)], output: PortId(891), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10287, 10326), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(744), - target: TransformTarget::Callable(DeclarationId(1242)), + target: TransformTarget::Callable(DeclarationId(1243)), inputs: vec![PortId(877), PortId(891)], output: PortId(892), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10215, 10336), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(745), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2263)), -======= - target: TransformTarget::Callable(DeclarationId(2270)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2271)), inputs: vec![PortId(892)], output: PortId(893), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10183, 10344), @@ -8652,14 +8472,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(749), - target: TransformTarget::Callable(DeclarationId(1234)), + target: TransformTarget::Callable(DeclarationId(1235)), inputs: vec![], output: PortId(900), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10862, 10893), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(750), - target: TransformTarget::Callable(DeclarationId(1234)), + target: TransformTarget::Callable(DeclarationId(1235)), inputs: vec![], output: PortId(902), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10916, 10947), @@ -8699,33 +8519,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(752), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2543)), -======= - target: TransformTarget::Callable(DeclarationId(2550)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2551)), inputs: vec![], output: PortId(904), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10974, 10984), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(753), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2544)), -======= - target: TransformTarget::Callable(DeclarationId(2551)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2552)), inputs: vec![], output: PortId(905), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11002, 11011), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(754), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2545)), -======= - target: TransformTarget::Callable(DeclarationId(2552)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2553)), inputs: vec![], output: PortId(906), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11025, 11030), @@ -8789,7 +8597,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(757), - target: TransformTarget::Callable(DeclarationId(1283)), + target: TransformTarget::Callable(DeclarationId(1284)), inputs: vec![PortId(908)], output: PortId(911), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11930, 11947), @@ -8803,36 +8611,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(759), - target: TransformTarget::Callable(DeclarationId(1234)), + target: TransformTarget::Callable(DeclarationId(1235)), inputs: vec![], output: PortId(913), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11963, 11994), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(760), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2548)), -======= - target: TransformTarget::Callable(DeclarationId(2555)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2556)), inputs: vec![PortId(913)], output: PortId(914), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11954, 11995), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(761), - target: TransformTarget::Callable(DeclarationId(1234)), + target: TransformTarget::Callable(DeclarationId(1235)), inputs: vec![], output: PortId(915), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12010, 12041), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(762), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2549)), -======= - target: TransformTarget::Callable(DeclarationId(2556)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2557)), inputs: vec![PortId(915)], output: PortId(916), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12001, 12042), @@ -8866,7 +8666,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(764), - target: TransformTarget::Callable(DeclarationId(1283)), + target: TransformTarget::Callable(DeclarationId(1284)), inputs: vec![PortId(908)], output: PortId(919), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12081, 12098), @@ -8880,36 +8680,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(766), - target: TransformTarget::Callable(DeclarationId(1234)), + target: TransformTarget::Callable(DeclarationId(1235)), inputs: vec![], output: PortId(921), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12114, 12145), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(767), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2550)), -======= - target: TransformTarget::Callable(DeclarationId(2557)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2558)), inputs: vec![PortId(921)], output: PortId(922), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12105, 12146), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(768), - target: TransformTarget::Callable(DeclarationId(1234)), + target: TransformTarget::Callable(DeclarationId(1235)), inputs: vec![], output: PortId(923), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12161, 12192), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(769), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2551)), -======= - target: TransformTarget::Callable(DeclarationId(2558)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2559)), inputs: vec![PortId(923)], output: PortId(924), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12152, 12193), @@ -8943,7 +8735,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(771), - target: TransformTarget::Callable(DeclarationId(1283)), + target: TransformTarget::Callable(DeclarationId(1284)), inputs: vec![PortId(908)], output: PortId(927), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12229, 12246), @@ -8957,36 +8749,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(773), - target: TransformTarget::Callable(DeclarationId(1234)), + target: TransformTarget::Callable(DeclarationId(1235)), inputs: vec![], output: PortId(929), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12262, 12293), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(774), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2552)), -======= - target: TransformTarget::Callable(DeclarationId(2559)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2560)), inputs: vec![PortId(929)], output: PortId(930), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12253, 12294), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(775), - target: TransformTarget::Callable(DeclarationId(1234)), + target: TransformTarget::Callable(DeclarationId(1235)), inputs: vec![], output: PortId(931), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12309, 12340), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(776), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2553)), -======= - target: TransformTarget::Callable(DeclarationId(2560)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2561)), inputs: vec![PortId(931)], output: PortId(932), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12300, 12341), @@ -9020,7 +8804,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(778), - target: TransformTarget::Callable(DeclarationId(1283)), + target: TransformTarget::Callable(DeclarationId(1284)), inputs: vec![PortId(908)], output: PortId(935), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12375, 12392), @@ -9034,36 +8818,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(780), - target: TransformTarget::Callable(DeclarationId(1234)), + target: TransformTarget::Callable(DeclarationId(1235)), inputs: vec![], output: PortId(937), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12408, 12439), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(781), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2554)), -======= - target: TransformTarget::Callable(DeclarationId(2561)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2562)), inputs: vec![PortId(937)], output: PortId(938), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12399, 12440), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(782), - target: TransformTarget::Callable(DeclarationId(1234)), + target: TransformTarget::Callable(DeclarationId(1235)), inputs: vec![], output: PortId(939), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12455, 12486), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(783), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2555)), -======= - target: TransformTarget::Callable(DeclarationId(2562)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2563)), inputs: vec![PortId(939)], output: PortId(940), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12446, 12487), @@ -9097,7 +8873,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(785), - target: TransformTarget::Callable(DeclarationId(1283)), + target: TransformTarget::Callable(DeclarationId(1284)), inputs: vec![PortId(908)], output: PortId(943), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12521, 12538), @@ -9111,36 +8887,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(787), - target: TransformTarget::Callable(DeclarationId(1234)), + target: TransformTarget::Callable(DeclarationId(1235)), inputs: vec![], output: PortId(945), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12554, 12585), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(788), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2556)), -======= - target: TransformTarget::Callable(DeclarationId(2563)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2564)), inputs: vec![PortId(945)], output: PortId(946), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12545, 12586), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(789), - target: TransformTarget::Callable(DeclarationId(1234)), + target: TransformTarget::Callable(DeclarationId(1235)), inputs: vec![], output: PortId(947), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12601, 12632), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(790), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2557)), -======= - target: TransformTarget::Callable(DeclarationId(2564)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2565)), inputs: vec![PortId(947)], output: PortId(948), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12592, 12633), @@ -9261,7 +9029,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(795), - target: TransformTarget::Callable(DeclarationId(1283)), + target: TransformTarget::Callable(DeclarationId(1284)), inputs: vec![PortId(951)], output: PortId(955), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12793, 12810), @@ -9275,22 +9043,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(797), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2262)), -======= - target: TransformTarget::Callable(DeclarationId(2269)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2270)), inputs: vec![], output: PortId(957), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12817, 12829), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(798), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2262)), -======= - target: TransformTarget::Callable(DeclarationId(2269)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2270)), inputs: vec![], output: PortId(958), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12835, 12847), @@ -9325,7 +9085,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { nodes.push(Behavior::Value(ValueNode { id: NodeId(800), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Unobserved is not admissible evidence at this scaffold (missing external timing row).".to_string()), output: PortId(960), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12926, 13053), lane2_workflow: None })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(801), - target: TransformTarget::Callable(DeclarationId(1244)), + target: TransformTarget::Callable(DeclarationId(1245)), inputs: vec![PortId(951), PortId(960)], output: PortId(961), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12872, 13061), @@ -9333,7 +9093,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { nodes.push(Behavior::Value(ValueNode { id: NodeId(802), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Ambiguous is not admissible evidence at this scaffold (conflicting timing facts).".to_string()), output: PortId(962), span: SourceSpan::new("src/v3/std/timing_lens.dag", 13139, 13262), lane2_workflow: None })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(803), - target: TransformTarget::Callable(DeclarationId(1244)), + target: TransformTarget::Callable(DeclarationId(1245)), inputs: vec![PortId(951), PortId(962)], output: PortId(963), span: SourceSpan::new("src/v3/std/timing_lens.dag", 13085, 13270), @@ -9341,7 +9101,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { nodes.push(Behavior::Value(ValueNode { id: NodeId(804), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Stale is not admissible evidence at this scaffold (digest/run mismatch vs attachment).".to_string()), output: PortId(964), span: SourceSpan::new("src/v3/std/timing_lens.dag", 13344, 13472), lane2_workflow: None })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(805), - target: TransformTarget::Callable(DeclarationId(1244)), + target: TransformTarget::Callable(DeclarationId(1245)), inputs: vec![PortId(951), PortId(964)], output: PortId(965), span: SourceSpan::new("src/v3/std/timing_lens.dag", 13290, 13480), @@ -9974,11 +9734,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { #[allow(clippy::vec_init_then_push)] fn bootstrapped_fixture_dag_declarations() -> Vec { { -<<<<<<< HEAD - let mut declarations = Vec::with_capacity(3218); -======= - let mut declarations = Vec::with_capacity(3225); ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + let mut declarations = Vec::with_capacity(3226); declarations.push(Declaration { id: DeclarationId(0), name: Some("Classical".to_string()), @@ -24223,11 +23979,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Empty".to_string(), - ty: DeclarationId(1783), + ty: DeclarationId(1784), }, Field { label: "Cons".to_string(), - ty: DeclarationId(1785), + ty: DeclarationId(1786), }, ], }, @@ -24243,19 +23999,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(687), -<<<<<<< HEAD name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())), type_params: vec![], -======= - name: Some("empty".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![], - output: DeclarationId(1753), - body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)), - }, - type_params: vec![DeclarationId(688)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24270,7 +24016,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("empty".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1753), + output: DeclarationId(1754), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)), }, type_params: vec![DeclarationId(689)], @@ -24285,19 +24031,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(689), -<<<<<<< HEAD name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("element".to_string())), type_params: vec![], -======= - name: Some("cons".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(690), DeclarationId(1754)], - output: DeclarationId(1755), - body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)), - }, - type_params: vec![DeclarationId(690)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24311,8 +24047,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(690), name: Some("cons".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(691), DeclarationId(1754)], - output: DeclarationId(1755), + inputs: vec![DeclarationId(691), DeclarationId(1755)], + output: DeclarationId(1756), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)), }, type_params: vec![DeclarationId(691)], @@ -24343,12 +24079,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(692), name: Some("singleton".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD inputs: vec![DeclarationId(693)], -======= - inputs: vec![DeclarationId(692)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1756), + output: DeclarationId(1757), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)), }, type_params: vec![DeclarationId(693)], @@ -24379,13 +24111,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(694), name: Some("fold".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1757), DeclarationId(696), DeclarationId(1758)], + inputs: vec![DeclarationId(1758), DeclarationId(696), DeclarationId(1759)], output: DeclarationId(696), -======= - inputs: vec![DeclarationId(1757), DeclarationId(695), DeclarationId(1758)], - output: DeclarationId(695), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)), }, type_params: vec![DeclarationId(695), DeclarationId(696)], @@ -24430,13 +24157,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(697), name: Some("fold_right".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1759), DeclarationId(699), DeclarationId(1760)], + inputs: vec![DeclarationId(1760), DeclarationId(699), DeclarationId(1761)], output: DeclarationId(699), -======= - inputs: vec![DeclarationId(1759), DeclarationId(698), DeclarationId(1760)], - output: DeclarationId(698), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)), }, type_params: vec![DeclarationId(698), DeclarationId(699)], @@ -24481,8 +24203,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(700), name: Some("concat".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1761), DeclarationId(1762)], - output: DeclarationId(1763), + inputs: vec![DeclarationId(1762), DeclarationId(1763)], + output: DeclarationId(1764), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)), }, type_params: vec![DeclarationId(701)], @@ -24513,8 +24235,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(702), name: Some("map".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1764), DeclarationId(1765)], - output: DeclarationId(1766), + inputs: vec![DeclarationId(1765), DeclarationId(1766)], + output: DeclarationId(1767), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)), }, type_params: vec![DeclarationId(703), DeclarationId(704)], @@ -24559,8 +24281,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(705), name: Some("filter".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1767), DeclarationId(1768)], - output: DeclarationId(1769), + inputs: vec![DeclarationId(1768), DeclarationId(1769)], + output: DeclarationId(1770), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)), }, type_params: vec![DeclarationId(706)], @@ -24591,8 +24313,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(707), name: Some("flat_map".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1770), DeclarationId(1772)], - output: DeclarationId(1773), + inputs: vec![DeclarationId(1771), DeclarationId(1773)], + output: DeclarationId(1774), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)), }, type_params: vec![DeclarationId(708), DeclarationId(709)], @@ -24637,7 +24359,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(710), name: Some("length".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1774)], + inputs: vec![DeclarationId(1775)], output: DeclarationId(93), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)), }, @@ -24669,7 +24391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(712), name: Some("is_empty".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1775)], + inputs: vec![DeclarationId(1776)], output: DeclarationId(128), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)), }, @@ -24740,8 +24462,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(716), name: Some("enumerate".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1776)], - output: DeclarationId(1778), + inputs: vec![DeclarationId(1777)], + output: DeclarationId(1779), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)), }, type_params: vec![DeclarationId(717)], @@ -24756,19 +24478,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(717), -<<<<<<< HEAD name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("T".to_string())), type_params: vec![], -======= - name: Some("enumerate_helper".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1779), DeclarationId(93)], - output: DeclarationId(1781), - body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)), - }, - type_params: vec![DeclarationId(718)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24782,8 +24494,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(718), name: Some("enumerate_helper".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1779), DeclarationId(93)], - output: DeclarationId(1781), + inputs: vec![DeclarationId(1780), DeclarationId(93)], + output: DeclarationId(1782), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)), }, type_params: vec![DeclarationId(719)], @@ -24814,11 +24526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(720), name: Some("contains".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1782), DeclarationId(721)], -======= - inputs: vec![DeclarationId(1782), DeclarationId(720)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(1783), DeclarationId(721)], output: DeclarationId(128), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)), }, @@ -24913,7 +24621,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "rest".to_string(), - ty: DeclarationId(1786), + ty: DeclarationId(1787), }, ], }, @@ -24956,7 +24664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "rest".to_string(), - ty: DeclarationId(1787), + ty: DeclarationId(1788), }, ], }, @@ -24991,11 +24699,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LiteralToken".to_string(), - ty: DeclarationId(1802), + ty: DeclarationId(1803), }, Field { label: "ParamToken".to_string(), - ty: DeclarationId(1803), + ty: DeclarationId(1804), }, ], }, @@ -25015,7 +24723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "tokens".to_string(), - ty: DeclarationId(1804), + ty: DeclarationId(1805), }], }, type_params: vec![], @@ -25035,11 +24743,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ParsedSegmentTokens".to_string(), - ty: DeclarationId(1806), + ty: DeclarationId(1807), }, Field { label: "MalformedPathSegment".to_string(), - ty: DeclarationId(1807), + ty: DeclarationId(1808), }, ], }, @@ -25060,11 +24768,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ParsedPathTemplate".to_string(), - ty: DeclarationId(1808), + ty: DeclarationId(1809), }, Field { label: "MalformedPathTemplate".to_string(), - ty: DeclarationId(1809), + ty: DeclarationId(1810), }, ], }, @@ -25118,12 +24826,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(736), name: Some("last_path_param".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD inputs: vec![DeclarationId(731)], -======= - inputs: vec![DeclarationId(730)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1788), + output: DeclarationId(1789), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)), }, type_params: vec![], @@ -25143,15 +24847,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ReadEffect".to_string(), - ty: DeclarationId(1810), + ty: DeclarationId(1811), }, Field { label: "UpsertEffect".to_string(), - ty: DeclarationId(1811), + ty: DeclarationId(1812), }, Field { label: "DeleteEffect".to_string(), - ty: DeclarationId(1812), + ty: DeclarationId(1813), }, ], }, @@ -25172,11 +24876,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "CreateEffect".to_string(), - ty: DeclarationId(1813), + ty: DeclarationId(1814), }, Field { label: "AppendEffect".to_string(), - ty: DeclarationId(1814), + ty: DeclarationId(1815), }, ], }, @@ -25197,11 +24901,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IsIdempotent".to_string(), - ty: DeclarationId(1815), + ty: DeclarationId(1816), }, Field { label: "IsBreaking".to_string(), - ty: DeclarationId(1816), + ty: DeclarationId(1817), }, ], }, @@ -25222,11 +24926,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "PostAlways".to_string(), - ty: DeclarationId(1817), + ty: DeclarationId(1818), }, Field { label: "KeylessFallback".to_string(), - ty: DeclarationId(1818), + ty: DeclarationId(1819), }, ], }, @@ -25247,15 +24951,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "PathParam".to_string(), - ty: DeclarationId(1819), + ty: DeclarationId(1820), }, Field { label: "InputField".to_string(), - ty: DeclarationId(1820), + ty: DeclarationId(1821), }, Field { label: "CompositeKey".to_string(), - ty: DeclarationId(1822), + ty: DeclarationId(1823), }, ], }, @@ -25276,15 +24980,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LatticeEffect".to_string(), - ty: DeclarationId(1823), + ty: DeclarationId(1824), }, Field { label: "IdentityEffect".to_string(), - ty: DeclarationId(1824), + ty: DeclarationId(1825), }, Field { label: "NonIdempotent".to_string(), - ty: DeclarationId(1825), + ty: DeclarationId(1826), }, ], }, @@ -25366,15 +25070,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DerivedEffect".to_string(), - ty: DeclarationId(1826), + ty: DeclarationId(1827), }, Field { label: "UnknownHttpMethodInput".to_string(), - ty: DeclarationId(1827), + ty: DeclarationId(1828), }, Field { label: "MalformedPathInput".to_string(), - ty: DeclarationId(1828), + ty: DeclarationId(1829), }, ], }, @@ -25395,11 +25099,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IdempotentComposition".to_string(), - ty: DeclarationId(1829), + ty: DeclarationId(1830), }, Field { label: "BrokenBy".to_string(), - ty: DeclarationId(1831), + ty: DeclarationId(1832), }, ], }, @@ -25436,7 +25140,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("breaker_ref".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93)], - output: DeclarationId(1789), + output: DeclarationId(1790), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20944, 20966)), }, type_params: vec![], @@ -25453,8 +25157,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(750), name: Some("indexed_breaker_ref".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1790)], - output: DeclarationId(1792), + inputs: vec![DeclarationId(1791)], + output: DeclarationId(1793), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21060, 21153)), }, type_params: vec![], @@ -25471,8 +25175,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(751), name: Some("first_breaker_ref".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1793)], - output: DeclarationId(1795), + inputs: vec![DeclarationId(1794)], + output: DeclarationId(1796), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21240, 21423)), }, type_params: vec![], @@ -25489,12 +25193,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(752), name: Some("compose_effects".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1796)], -<<<<<<< HEAD + inputs: vec![DeclarationId(1797)], output: DeclarationId(747), -======= - output: DeclarationId(746), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)), }, type_params: vec![], @@ -25558,19 +25258,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LinearEffect".to_string(), - ty: DeclarationId(1833), + ty: DeclarationId(1834), }, Field { label: "BranchEffect".to_string(), - ty: DeclarationId(1835), + ty: DeclarationId(1836), }, Field { label: "LoopEffect".to_string(), - ty: DeclarationId(1836), + ty: DeclarationId(1837), }, Field { label: "ParallelEffect".to_string(), - ty: DeclarationId(1838), + ty: DeclarationId(1839), }, ], }, @@ -25620,11 +25320,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "WorkflowCompositionVerdict".to_string(), - ty: DeclarationId(1839), + ty: DeclarationId(1840), }, Field { label: "IdempotencyUnsupported".to_string(), - ty: DeclarationId(1840), + ty: DeclarationId(1841), }, ], }, @@ -25663,23 +25363,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NoWorkflowProjection".to_string(), - ty: DeclarationId(1841), + ty: DeclarationId(1842), }, Field { label: "NotParallelEffectRoot".to_string(), - ty: DeclarationId(1842), + ty: DeclarationId(1843), }, Field { label: "NonLinearParallelBranch".to_string(), - ty: DeclarationId(1843), + ty: DeclarationId(1844), }, Field { label: "PairwiseNonCommute".to_string(), - ty: DeclarationId(1844), + ty: DeclarationId(1845), }, Field { label: "LensSurfacePending".to_string(), - ty: DeclarationId(1845), + ty: DeclarationId(1846), }, ], }, @@ -25729,11 +25429,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ParallelCompositionVerdict".to_string(), - ty: DeclarationId(1846), + ty: DeclarationId(1847), }, Field { label: "ParallelismUnsupported".to_string(), - ty: DeclarationId(1847), + ty: DeclarationId(1848), }, ], }, @@ -25788,7 +25488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("parse_http_method".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], - output: DeclarationId(1797), + output: DeclarationId(1798), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29707, 30005)), }, type_params: vec![], @@ -25823,12 +25523,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(766), name: Some("upsert_or_create".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1798), DeclarationId(198)], -<<<<<<< HEAD + inputs: vec![DeclarationId(1799), DeclarationId(198)], output: DeclarationId(739), -======= - output: DeclarationId(738), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)), }, type_params: vec![], @@ -25845,12 +25541,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(767), name: Some("delete_or_create".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1799), DeclarationId(198)], -<<<<<<< HEAD + inputs: vec![DeclarationId(1800), DeclarationId(198)], output: DeclarationId(739), -======= - output: DeclarationId(738), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)), }, type_params: vec![], @@ -25906,15 +25598,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Agrees".to_string(), - ty: DeclarationId(1848), + ty: DeclarationId(1849), }, Field { label: "Disagrees".to_string(), - ty: DeclarationId(1849), + ty: DeclarationId(1850), }, Field { label: "DerivationUnknown".to_string(), - ty: DeclarationId(1850), + ty: DeclarationId(1851), }, ], }, @@ -25935,11 +25627,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ModifierNotDeclared".to_string(), - ty: DeclarationId(1851), + ty: DeclarationId(1852), }, Field { label: "ModifierDeclared".to_string(), - ty: DeclarationId(1852), + ty: DeclarationId(1853), }, ], }, @@ -26077,8 +25769,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(777), name: Some("generate_idempotency_obligations".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1800)], - output: DeclarationId(1801), + inputs: vec![DeclarationId(1801)], + output: DeclarationId(1802), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 36640, 36910)), }, type_params: vec![], @@ -26146,15 +25838,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Uninferred".to_string(), - ty: DeclarationId(1861), + ty: DeclarationId(1862), }, Field { label: "Resolved".to_string(), - ty: DeclarationId(1862), + ty: DeclarationId(1863), }, Field { label: "Unresolved".to_string(), - ty: DeclarationId(1863), + ty: DeclarationId(1864), }, ], }, @@ -26183,7 +25875,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "produced_by".to_string(), - ty: DeclarationId(1864), + ty: DeclarationId(1865), }, ], }, @@ -26204,15 +25896,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LitInt".to_string(), - ty: DeclarationId(1865), + ty: DeclarationId(1866), }, Field { label: "LitBool".to_string(), - ty: DeclarationId(1866), + ty: DeclarationId(1867), }, Field { label: "LitString".to_string(), - ty: DeclarationId(1867), + ty: DeclarationId(1868), }, ], }, @@ -26233,23 +25925,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Literal".to_string(), - ty: DeclarationId(1868), + ty: DeclarationId(1869), }, Field { label: "UnresolvedIdentifier".to_string(), - ty: DeclarationId(1869), + ty: DeclarationId(1870), }, Field { label: "ResolvedByStructure".to_string(), - ty: DeclarationId(1870), + ty: DeclarationId(1871), }, Field { label: "ResolvedByName".to_string(), - ty: DeclarationId(1871), + ty: DeclarationId(1872), }, Field { label: "TypeParam".to_string(), - ty: DeclarationId(1872), + ty: DeclarationId(1873), }, ], }, @@ -26270,15 +25962,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "OneUnit".to_string(), - ty: DeclarationId(1873), + ty: DeclarationId(1874), }, Field { label: "AdditionalUnit".to_string(), - ty: DeclarationId(1874), + ty: DeclarationId(1875), }, Field { label: "UnitCount".to_string(), - ty: DeclarationId(1875), + ty: DeclarationId(1876), }, ], }, @@ -26299,11 +25991,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ZeroWidth".to_string(), - ty: DeclarationId(1876), + ty: DeclarationId(1877), }, Field { label: "PositiveWidth".to_string(), - ty: DeclarationId(1877), + ty: DeclarationId(1878), }, ], }, @@ -26324,11 +26016,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "BoundedInterval".to_string(), - ty: DeclarationId(1878), + ty: DeclarationId(1879), }, Field { label: "Unbounded".to_string(), - ty: DeclarationId(1879), + ty: DeclarationId(1880), }, ], }, @@ -26383,11 +26075,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "StaticBound".to_string(), - ty: DeclarationId(1881), + ty: DeclarationId(1882), }, Field { label: "PlatformDependent".to_string(), - ty: DeclarationId(1882), + ty: DeclarationId(1883), }, ], }, @@ -26408,15 +26100,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Exact".to_string(), - ty: DeclarationId(1883), + ty: DeclarationId(1884), }, Field { label: "AtMostOne".to_string(), - ty: DeclarationId(1884), + ty: DeclarationId(1885), }, Field { label: "Unbounded".to_string(), - ty: DeclarationId(1885), + ty: DeclarationId(1886), }, ], }, @@ -26512,27 +26204,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Literal".to_string(), - ty: DeclarationId(1886), + ty: DeclarationId(1887), }, Field { label: "Reference".to_string(), - ty: DeclarationId(1887), + ty: DeclarationId(1888), }, Field { label: "Record".to_string(), - ty: DeclarationId(1889), + ty: DeclarationId(1890), }, Field { label: "List".to_string(), - ty: DeclarationId(1891), + ty: DeclarationId(1892), }, Field { label: "Map".to_string(), - ty: DeclarationId(1893), + ty: DeclarationId(1894), }, Field { label: "Variant".to_string(), - ty: DeclarationId(1895), + ty: DeclarationId(1896), }, ], }, @@ -26553,23 +26245,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ValueBodyUnparsed".to_string(), - ty: DeclarationId(1896), + ty: DeclarationId(1897), }, Field { label: "ValueBodyStructural".to_string(), - ty: DeclarationId(1898), + ty: DeclarationId(1899), }, Field { label: "ValueBodyScalar".to_string(), - ty: DeclarationId(1899), + ty: DeclarationId(1900), }, Field { label: "ValueBodyList".to_string(), - ty: DeclarationId(1901), + ty: DeclarationId(1902), }, Field { label: "ValueBodyMap".to_string(), - ty: DeclarationId(1903), + ty: DeclarationId(1904), }, ], }, @@ -26609,23 +26301,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UserDefined".to_string(), - ty: DeclarationId(1904), + ty: DeclarationId(1905), }, Field { label: "ExternalRealization".to_string(), - ty: DeclarationId(1905), + ty: DeclarationId(1906), }, Field { label: "Pending".to_string(), - ty: DeclarationId(1906), + ty: DeclarationId(1907), }, Field { label: "NoBody".to_string(), - ty: DeclarationId(1907), + ty: DeclarationId(1908), }, Field { label: "Unparsed".to_string(), - ty: DeclarationId(1908), + ty: DeclarationId(1909), }, ], }, @@ -26646,27 +26338,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Atom".to_string(), - ty: DeclarationId(1909), + ty: DeclarationId(1910), }, Field { label: "Conj".to_string(), - ty: DeclarationId(1911), + ty: DeclarationId(1912), }, Field { label: "Disj".to_string(), - ty: DeclarationId(1913), + ty: DeclarationId(1914), }, Field { label: "Arrow".to_string(), - ty: DeclarationId(1915), + ty: DeclarationId(1916), }, Field { label: "Cardinality".to_string(), - ty: DeclarationId(1916), + ty: DeclarationId(1917), }, Field { label: "Instantiation".to_string(), - ty: DeclarationId(1918), + ty: DeclarationId(1919), }, ], }, @@ -26691,39 +26383,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "name".to_string(), - ty: DeclarationId(1919), + ty: DeclarationId(1920), }, Field { label: "connective".to_string(), -<<<<<<< HEAD ty: DeclarationId(798), -======= - ty: DeclarationId(797), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "type_params".to_string(), - ty: DeclarationId(1920), + ty: DeclarationId(1921), }, Field { label: "phantom_params".to_string(), - ty: DeclarationId(1921), + ty: DeclarationId(1922), }, Field { label: "meta_tag".to_string(), - ty: DeclarationId(1922), + ty: DeclarationId(1923), }, Field { label: "inhabits".to_string(), - ty: DeclarationId(1923), + ty: DeclarationId(1924), }, Field { label: "value_body".to_string(), - ty: DeclarationId(1924), + ty: DeclarationId(1925), }, Field { label: "nominal_opacity".to_string(), - ty: DeclarationId(1925), + ty: DeclarationId(1926), }, Field { label: "span".to_string(), @@ -26772,7 +26460,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "permitted_accessors".to_string(), - ty: DeclarationId(1926), + ty: DeclarationId(1927), }], }, type_params: vec![], @@ -26792,19 +26480,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Add".to_string(), - ty: DeclarationId(1927), + ty: DeclarationId(1928), }, Field { label: "Sub".to_string(), - ty: DeclarationId(1928), + ty: DeclarationId(1929), }, Field { label: "Mul".to_string(), - ty: DeclarationId(1929), + ty: DeclarationId(1930), }, Field { label: "Div".to_string(), - ty: DeclarationId(1930), + ty: DeclarationId(1931), }, ], }, @@ -26825,27 +26513,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Eq".to_string(), - ty: DeclarationId(1931), + ty: DeclarationId(1932), }, Field { label: "Ne".to_string(), - ty: DeclarationId(1932), + ty: DeclarationId(1933), }, Field { label: "Lt".to_string(), - ty: DeclarationId(1933), + ty: DeclarationId(1934), }, Field { label: "Le".to_string(), - ty: DeclarationId(1934), + ty: DeclarationId(1935), }, Field { label: "Gt".to_string(), - ty: DeclarationId(1935), + ty: DeclarationId(1936), }, Field { label: "Ge".to_string(), - ty: DeclarationId(1936), + ty: DeclarationId(1937), }, ], }, @@ -26891,11 +26579,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "And".to_string(), - ty: DeclarationId(1937), + ty: DeclarationId(1938), }, Field { label: "Or".to_string(), - ty: DeclarationId(1938), + ty: DeclarationId(1939), }, ], }, @@ -26916,15 +26604,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Arithmetic".to_string(), - ty: DeclarationId(1939), + ty: DeclarationId(1940), }, Field { label: "Comparison".to_string(), - ty: DeclarationId(1940), + ty: DeclarationId(1941), }, Field { label: "Logical".to_string(), - ty: DeclarationId(1941), + ty: DeclarationId(1942), }, ], }, @@ -26945,19 +26633,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Callable".to_string(), - ty: DeclarationId(1942), + ty: DeclarationId(1943), }, Field { label: "UnresolvedFieldProject".to_string(), - ty: DeclarationId(1943), + ty: DeclarationId(1944), }, Field { label: "ResolvedFieldProject".to_string(), - ty: DeclarationId(1944), + ty: DeclarationId(1945), }, Field { label: "Operator".to_string(), - ty: DeclarationId(1945), + ty: DeclarationId(1946), }, ], }, @@ -26978,11 +26666,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UnresolvedVariant".to_string(), - ty: DeclarationId(1946), + ty: DeclarationId(1947), }, Field { label: "ResolvedVariant".to_string(), - ty: DeclarationId(1947), + ty: DeclarationId(1948), }, ], }, @@ -27040,7 +26728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "binding".to_string(), - ty: DeclarationId(1948), + ty: DeclarationId(1949), }, ], }, @@ -27176,11 +26864,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "members".to_string(), - ty: DeclarationId(1949), + ty: DeclarationId(1950), }, Field { label: "intra_cluster_calls".to_string(), - ty: DeclarationId(1950), + ty: DeclarationId(1951), }, ], }, @@ -27201,11 +26889,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Cardinality".to_string(), - ty: DeclarationId(1951), + ty: DeclarationId(1952), }, Field { label: "Descent".to_string(), - ty: DeclarationId(1952), + ty: DeclarationId(1953), }, ], }, @@ -27260,7 +26948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "lane2_workflow".to_string(), - ty: DeclarationId(1953), + ty: DeclarationId(1954), }, ], }, @@ -27289,7 +26977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "inputs".to_string(), - ty: DeclarationId(1954), + ty: DeclarationId(1955), }, Field { label: "result_port".to_string(), @@ -27317,7 +27005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Disj { variants: vec![Field { label: "UserMatch".to_string(), - ty: DeclarationId(1955), + ty: DeclarationId(1956), }], }, type_params: vec![], @@ -27345,7 +27033,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "paths".to_string(), - ty: DeclarationId(1956), + ty: DeclarationId(1957), }, Field { label: "result_port".to_string(), @@ -27357,7 +27045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "emit_participation".to_string(), - ty: DeclarationId(1957), + ty: DeclarationId(1958), }, ], }, @@ -27422,7 +27110,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Disj { variants: vec![Field { label: "UserCallable".to_string(), - ty: DeclarationId(1958), + ty: DeclarationId(1959), }], }, type_params: vec![], @@ -27454,7 +27142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "params".to_string(), - ty: DeclarationId(1959), + ty: DeclarationId(1960), }, Field { label: "span".to_string(), @@ -27462,11 +27150,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "lane2_workflow".to_string(), - ty: DeclarationId(1960), + ty: DeclarationId(1961), }, Field { label: "emit_participation".to_string(), - ty: DeclarationId(1961), + ty: DeclarationId(1962), }, ], }, @@ -27487,23 +27175,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Value".to_string(), - ty: DeclarationId(1962), + ty: DeclarationId(1963), }, Field { label: "Transform".to_string(), - ty: DeclarationId(1963), + ty: DeclarationId(1964), }, Field { label: "Branch".to_string(), - ty: DeclarationId(1964), + ty: DeclarationId(1965), }, Field { label: "Loop".to_string(), - ty: DeclarationId(1965), + ty: DeclarationId(1966), }, Field { label: "Bind".to_string(), - ty: DeclarationId(1966), + ty: DeclarationId(1967), }, ], }, @@ -27524,19 +27212,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "declarations".to_string(), - ty: DeclarationId(1967), + ty: DeclarationId(1968), }, Field { label: "nodes".to_string(), - ty: DeclarationId(1968), + ty: DeclarationId(1969), }, Field { label: "ports".to_string(), - ty: DeclarationId(1969), + ty: DeclarationId(1970), }, Field { label: "clusters".to_string(), - ty: DeclarationId(1970), + ty: DeclarationId(1971), }, ], }, @@ -27576,15 +27264,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "accessor".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "realization".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "language".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, ], }, @@ -27602,12 +27290,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(831), name: Some("port".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(723)], -======= - inputs: vec![DeclarationId(827), DeclarationId(722)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1853), + output: DeclarationId(1854), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 22022, @@ -27628,12 +27312,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(832), name: Some("node".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(722)], -======= - inputs: vec![DeclarationId(827), DeclarationId(721)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1854), + output: DeclarationId(1855), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 22080, @@ -27654,12 +27334,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(833), name: Some("resolve_producer".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(723)], -======= - inputs: vec![DeclarationId(827), DeclarationId(722)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1855), + output: DeclarationId(1856), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 22155, @@ -27680,12 +27356,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(834), name: Some("declaration_by_id".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(724)], -======= - inputs: vec![DeclarationId(827), DeclarationId(723)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1856), + output: DeclarationId(1857), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 22544, @@ -27706,12 +27378,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(835), name: Some("declaration_by_name".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(230)], -======= - inputs: vec![DeclarationId(827), DeclarationId(230)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1857), + output: DeclarationId(1858), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 23419, @@ -27732,12 +27400,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(836), name: Some("lane2_workflow_at".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(722)], -======= - inputs: vec![DeclarationId(827), DeclarationId(721)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1858), + output: DeclarationId(1859), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 23745, @@ -27761,15 +27425,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "SingleRoot".to_string(), - ty: DeclarationId(1971), + ty: DeclarationId(1972), }, Field { label: "NoRoot".to_string(), - ty: DeclarationId(1972), + ty: DeclarationId(1973), }, Field { label: "AmbiguousRoot".to_string(), - ty: DeclarationId(1974), + ty: DeclarationId(1975), }, ], }, @@ -27810,7 +27474,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("miss_declaration_id_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1859), + output: DeclarationId(1860), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 27750, @@ -27831,12 +27495,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(840), name: Some("hit_declaration_id_lookup".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD inputs: vec![DeclarationId(724)], -======= - inputs: vec![DeclarationId(723)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1860), + output: DeclarationId(1861), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 27835, @@ -27859,7 +27519,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "decl".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }], }, type_params: vec![], @@ -27879,15 +27539,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ShrinkEffect".to_string(), - ty: DeclarationId(1999), + ty: DeclarationId(2000), }, Field { label: "ProjectionEffect".to_string(), - ty: DeclarationId(2000), + ty: DeclarationId(2001), }, Field { label: "IdentityEffect".to_string(), - ty: DeclarationId(2001), + ty: DeclarationId(2002), }, ], }, @@ -27908,19 +27568,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ShapeConstant".to_string(), - ty: DeclarationId(2002), + ty: DeclarationId(2003), }, Field { label: "ShapeLinearScan".to_string(), - ty: DeclarationId(2003), + ty: DeclarationId(2004), }, Field { label: "ShapeIterateBody".to_string(), - ty: DeclarationId(2004), + ty: DeclarationId(2005), }, Field { label: "ShapeSortBody".to_string(), - ty: DeclarationId(2005), + ty: DeclarationId(2006), }, ], }, @@ -27949,15 +27609,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "size_effect".to_string(), - ty: DeclarationId(2006), + ty: DeclarationId(2007), }, Field { label: "cost_shape".to_string(), - ty: DeclarationId(2007), + ty: DeclarationId(2008), }, Field { label: "callback_element_position".to_string(), - ty: DeclarationId(2008), + ty: DeclarationId(2009), }, ], }, @@ -27982,7 +27642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "display_name".to_string(), - ty: DeclarationId(2009), + ty: DeclarationId(2010), }, ], }, @@ -28039,11 +27699,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DegreeTwo".to_string(), - ty: DeclarationId(2010), + ty: DeclarationId(2011), }, Field { label: "DegreeSuccessor".to_string(), - ty: DeclarationId(2011), + ty: DeclarationId(2012), }, ], }, @@ -28064,31 +27724,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ConstantCost".to_string(), - ty: DeclarationId(2012), + ty: DeclarationId(2013), }, Field { label: "LinearCost".to_string(), - ty: DeclarationId(2013), + ty: DeclarationId(2014), }, Field { label: "PolynomialCost".to_string(), - ty: DeclarationId(2014), + ty: DeclarationId(2015), }, Field { label: "ProductCost".to_string(), - ty: DeclarationId(2016), + ty: DeclarationId(2017), }, Field { label: "SumCost".to_string(), - ty: DeclarationId(2018), + ty: DeclarationId(2019), }, Field { label: "LogCost".to_string(), - ty: DeclarationId(2019), + ty: DeclarationId(2020), }, Field { label: "UnknownCost".to_string(), - ty: DeclarationId(2020), + ty: DeclarationId(2021), }, ], }, @@ -28096,7 +27756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, - inhabits: Some(DeclarationId(2021)), + inhabits: Some(DeclarationId(2022)), value_body: None, refinement: None, nominal_opacity: None, @@ -28150,7 +27810,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("miss_symbolic_cost_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1975), + output: DeclarationId(1976), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 10963, 10973)), }, type_params: vec![], @@ -28167,12 +27827,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(853), name: Some("hit_symbolic_cost_lookup".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD inputs: vec![DeclarationId(849)], -======= - inputs: vec![DeclarationId(848)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1976), + output: DeclarationId(1977), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 11047, 11062)), }, type_params: vec![], @@ -28189,12 +27845,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(854), name: Some("two_terms".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD inputs: vec![DeclarationId(849), DeclarationId(849)], -======= - inputs: vec![DeclarationId(848), DeclarationId(848)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1977), + output: DeclarationId(1978), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(185))), }, type_params: vec![], @@ -28211,12 +27863,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(855), name: Some("many_terms".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(1978)], -======= - inputs: vec![DeclarationId(848), DeclarationId(848), DeclarationId(1978)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1979), + inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(1979)], + output: DeclarationId(1980), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(187))), }, type_params: vec![], @@ -28341,12 +27989,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(862), name: Some("max_path".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1980)], -<<<<<<< HEAD + inputs: vec![DeclarationId(1981)], output: DeclarationId(849), -======= - output: DeclarationId(848), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(220))), }, type_params: vec![], @@ -28402,35 +28046,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ClassConstant".to_string(), - ty: DeclarationId(2022), + ty: DeclarationId(2023), }, Field { label: "ClassLog".to_string(), - ty: DeclarationId(2023), + ty: DeclarationId(2024), }, Field { label: "ClassLinear".to_string(), - ty: DeclarationId(2024), + ty: DeclarationId(2025), }, Field { label: "ClassLinearithmic".to_string(), - ty: DeclarationId(2025), + ty: DeclarationId(2026), }, Field { label: "ClassQuadratic".to_string(), - ty: DeclarationId(2026), + ty: DeclarationId(2027), }, Field { label: "ClassPolynomial".to_string(), - ty: DeclarationId(2027), + ty: DeclarationId(2028), }, Field { label: "ClassExponential".to_string(), - ty: DeclarationId(2028), + ty: DeclarationId(2029), }, Field { label: "ClassUnknown".to_string(), - ty: DeclarationId(2029), + ty: DeclarationId(2030), }, ], }, @@ -28438,7 +28082,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, - inhabits: Some(DeclarationId(2030)), + inhabits: Some(DeclarationId(2031)), value_body: None, refinement: None, nominal_opacity: None, @@ -28538,8 +28182,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(871), name: Some("nsl_to_list".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1981)], - output: DeclarationId(1982), + inputs: vec![DeclarationId(1982)], + output: DeclarationId(1983), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(366))), }, type_params: vec![], @@ -28556,8 +28200,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(872), name: Some("drop_additive_zero".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1983)], - output: DeclarationId(1984), + inputs: vec![DeclarationId(1984)], + output: DeclarationId(1985), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(379))), }, type_params: vec![], @@ -28574,8 +28218,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(873), name: Some("collapse_on_multiplicative_zero".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1985)], - output: DeclarationId(1986), + inputs: vec![DeclarationId(1986)], + output: DeclarationId(1987), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(386))), }, type_params: vec![], @@ -28592,7 +28236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(874), name: Some("any_zero".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1987)], + inputs: vec![DeclarationId(1988)], output: DeclarationId(128), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(395))), }, @@ -28610,8 +28254,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(875), name: Some("drop_multiplicative_one".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1988)], - output: DeclarationId(1989), + inputs: vec![DeclarationId(1989)], + output: DeclarationId(1990), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(408))), }, type_params: vec![], @@ -28664,12 +28308,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(878), name: Some("reduce_sum".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1990)], -<<<<<<< HEAD + inputs: vec![DeclarationId(1991)], output: DeclarationId(849), -======= - output: DeclarationId(848), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(440))), }, type_params: vec![], @@ -28686,12 +28326,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(879), name: Some("wrap_sum".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1991)], -<<<<<<< HEAD + inputs: vec![DeclarationId(1992)], output: DeclarationId(849), -======= - output: DeclarationId(848), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(452))), }, type_params: vec![], @@ -28708,12 +28344,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(880), name: Some("reduce_product".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1992)], -<<<<<<< HEAD + inputs: vec![DeclarationId(1993)], output: DeclarationId(849), -======= - output: DeclarationId(848), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(469))), }, type_params: vec![], @@ -28861,12 +28493,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(888), name: Some("filter_not_dominated_by".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1993), DeclarationId(849)], -======= - inputs: vec![DeclarationId(1993), DeclarationId(848)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1994), + inputs: vec![DeclarationId(1994), DeclarationId(849)], + output: DeclarationId(1995), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(517))), }, type_params: vec![], @@ -28883,12 +28511,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(889), name: Some("drop_dominated_step".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1995), DeclarationId(849)], -======= - inputs: vec![DeclarationId(1995), DeclarationId(848)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1996), + inputs: vec![DeclarationId(1996), DeclarationId(849)], + output: DeclarationId(1997), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(524))), }, type_params: vec![], @@ -28905,8 +28529,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(890), name: Some("drop_dominated".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1997)], - output: DeclarationId(1998), + inputs: vec![DeclarationId(1998)], + output: DeclarationId(1999), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(527))), }, type_params: vec![], @@ -28926,12 +28550,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { inputs: vec![ DeclarationId(147), DeclarationId(230), - DeclarationId(2058), - DeclarationId(93), DeclarationId(2059), + DeclarationId(93), DeclarationId(2060), + DeclarationId(2061), ], - output: DeclarationId(905), + output: DeclarationId(906), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/anthropic_messages.dag", 4627, @@ -28954,17 +28578,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1185), + value: DeclarationId(1186), }], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(2061)), + meta_tag: Some(DeclarationId(2062)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![])), @@ -28979,11 +28599,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UserMessage".to_string(), - ty: DeclarationId(2063), + ty: DeclarationId(2064), }, Field { label: "AssistantMessage".to_string(), - ty: DeclarationId(2065), + ty: DeclarationId(2066), }, ], }, @@ -29004,11 +28624,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Base64Image".to_string(), - ty: DeclarationId(2066), + ty: DeclarationId(2067), }, Field { label: "UrlImage".to_string(), - ty: DeclarationId(2067), + ty: DeclarationId(2068), }, ], }, @@ -29029,11 +28649,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "TextContent".to_string(), - ty: DeclarationId(2068), + ty: DeclarationId(2069), }, Field { label: "ImageContent".to_string(), - ty: DeclarationId(2069), + ty: DeclarationId(2070), }, ], }, @@ -29048,31 +28668,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3138, 3229), }); declarations.push(Declaration { -<<<<<<< HEAD -======= - id: DeclarationId(895), + id: DeclarationId(896), name: Some("AnthropicToolResultBlock".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "AnthropicTextBlock".to_string(), - ty: DeclarationId(2070), + ty: DeclarationId(2071), }, Field { label: "AnthropicImageBlock".to_string(), - ty: DeclarationId(2071), + ty: DeclarationId(2072), }, Field { label: "AnthropicDocumentBlock".to_string(), - ty: DeclarationId(2072), + ty: DeclarationId(2073), }, Field { label: "AnthropicSearchResultBlock".to_string(), - ty: DeclarationId(2075), + ty: DeclarationId(2076), }, Field { label: "AnthropicToolReferenceBlock".to_string(), - ty: DeclarationId(2076), + ty: DeclarationId(2077), }, ], }, @@ -29087,26 +28705,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3553, 3888), }); declarations.push(Declaration { ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - id: DeclarationId(896), + id: DeclarationId(897), name: Some("AnthropicToolResultContent".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ToolResultText".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2070), - }, - Field { - label: "ToolResultBlocks".to_string(), - ty: DeclarationId(2072), -======= - ty: DeclarationId(2077), + ty: DeclarationId(2078), }, Field { label: "ToolResultBlocks".to_string(), - ty: DeclarationId(2079), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2080), }, ], }, @@ -29121,25 +28730,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4164, 4295), }); declarations.push(Declaration { - id: DeclarationId(897), + id: DeclarationId(898), name: Some("AnthropicUserContentBlock".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "UserTextBlock".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2073), - }, - Field { - label: "UserToolResultBlock".to_string(), - ty: DeclarationId(2076), -======= - ty: DeclarationId(2080), + ty: DeclarationId(2081), }, Field { label: "UserToolResultBlock".to_string(), - ty: DeclarationId(2083), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2084), }, ], }, @@ -29154,25 +28755,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4541, 4735), }); declarations.push(Declaration { - id: DeclarationId(898), + id: DeclarationId(899), name: Some("AnthropicAssistantContentBlock".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "AssistantTextBlock".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2077), - }, - Field { - label: "AssistantToolUseBlock".to_string(), - ty: DeclarationId(2078), -======= - ty: DeclarationId(2084), + ty: DeclarationId(2085), }, Field { label: "AssistantToolUseBlock".to_string(), - ty: DeclarationId(2085), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2086), }, ], }, @@ -29187,65 +28780,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5142, 5308), }); declarations.push(Declaration { - id: DeclarationId(899), + id: DeclarationId(900), name: Some("AnthropicStopReason".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "EndTurn".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2079), - }, - Field { - label: "MaxTokens".to_string(), - ty: DeclarationId(2080), - }, - Field { - label: "StopSequence".to_string(), - ty: DeclarationId(2081), - }, - Field { - label: "ToolUse".to_string(), - ty: DeclarationId(2082), - }, - Field { - label: "PauseTurn".to_string(), - ty: DeclarationId(2083), - }, - Field { - label: "Refusal".to_string(), - ty: DeclarationId(2084), -======= - ty: DeclarationId(2086), - }, - Field { - label: "MaxTokens".to_string(), ty: DeclarationId(2087), }, Field { - label: "StopSequence".to_string(), + label: "MaxTokens".to_string(), ty: DeclarationId(2088), }, Field { - label: "ToolUse".to_string(), + label: "StopSequence".to_string(), ty: DeclarationId(2089), }, Field { - label: "PauseTurn".to_string(), + label: "ToolUse".to_string(), ty: DeclarationId(2090), }, Field { - label: "Refusal".to_string(), + label: "PauseTurn".to_string(), ty: DeclarationId(2091), }, Field { - label: "ModelContextWindowExceeded".to_string(), + label: "Refusal".to_string(), ty: DeclarationId(2092), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ModelContextWindowExceeded".to_string(), - ty: DeclarationId(2085), + ty: DeclarationId(2093), }, ], }, @@ -29260,49 +28825,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5637, 5773), }); declarations.push(Declaration { - id: DeclarationId(900), + id: DeclarationId(901), name: Some("AnthropicMessages200Citation".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "CharLocation".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2088), - }, - Field { - label: "PageLocation".to_string(), - ty: DeclarationId(2091), - }, - Field { - label: "ContentBlockLocation".to_string(), - ty: DeclarationId(2094), - }, - Field { - label: "WebSearchResultLocation".to_string(), ty: DeclarationId(2096), -======= - ty: DeclarationId(2095), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "PageLocation".to_string(), - ty: DeclarationId(2098), + ty: DeclarationId(2099), }, Field { label: "ContentBlockLocation".to_string(), - ty: DeclarationId(2101), + ty: DeclarationId(2102), }, Field { label: "WebSearchResultLocation".to_string(), - ty: DeclarationId(2103), + ty: DeclarationId(2104), }, Field { label: "SearchResultLocation".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2098), -======= - ty: DeclarationId(2105), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2106), }, ], }, @@ -29317,104 +28862,32 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5975, 6721), }); declarations.push(Declaration { - id: DeclarationId(901), + id: DeclarationId(902), name: Some("AnthropicMessages200ContentBlock".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "MessagesTextBlock".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2101), - }, - Field { - label: "MessagesThinkingBlock".to_string(), - ty: DeclarationId(2102), - }, - Field { - label: "MessagesRedactedThinkingBlock".to_string(), - ty: DeclarationId(2103), - }, - Field { - label: "MessagesToolUseBlock".to_string(), - ty: DeclarationId(2105), - }, - Field { - label: "MessagesServerToolUseBlock".to_string(), - ty: DeclarationId(2107), - }, - Field { - label: "MessagesWebSearchToolResultBlock".to_string(), ty: DeclarationId(2109), }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6587, 7115), - }); - declarations.push(Declaration { - id: DeclarationId(902), - name: Some("AnthropicServerToolName".to_string()), - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "WebSearch".to_string(), - ty: DeclarationId(2110), - }, - Field { - label: "WebFetch".to_string(), - ty: DeclarationId(2111), - }, - Field { - label: "CodeExecution".to_string(), - ty: DeclarationId(2112), - }, - Field { - label: "BashCodeExecution".to_string(), - ty: DeclarationId(2113), - }, - Field { - label: "TextEditorCodeExecution".to_string(), - ty: DeclarationId(2114), - }, - Field { - label: "ToolSearchToolRegex".to_string(), - ty: DeclarationId(2115), - }, - Field { - label: "ToolSearchToolBm25".to_string(), -======= - ty: DeclarationId(2108), - }, Field { label: "MessagesThinkingBlock".to_string(), - ty: DeclarationId(2109), + ty: DeclarationId(2110), }, Field { label: "MessagesRedactedThinkingBlock".to_string(), - ty: DeclarationId(2110), + ty: DeclarationId(2111), }, Field { label: "MessagesToolUseBlock".to_string(), - ty: DeclarationId(2112), + ty: DeclarationId(2113), }, Field { label: "MessagesServerToolUseBlock".to_string(), - ty: DeclarationId(2114), + ty: DeclarationId(2115), }, Field { label: "MessagesWebSearchToolResultBlock".to_string(), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - ty: DeclarationId(2116), - }, - Field { - label: "Advisor".to_string(), ty: DeclarationId(2117), }, ], @@ -29430,43 +28903,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7258, 7786), }); declarations.push(Declaration { -<<<<<<< HEAD -======= - id: DeclarationId(902), + id: DeclarationId(903), name: Some("AnthropicServerToolName".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "WebSearch".to_string(), - ty: DeclarationId(2117), + ty: DeclarationId(2118), }, Field { label: "WebFetch".to_string(), - ty: DeclarationId(2118), + ty: DeclarationId(2119), }, Field { label: "CodeExecution".to_string(), - ty: DeclarationId(2119), + ty: DeclarationId(2120), }, Field { label: "BashCodeExecution".to_string(), - ty: DeclarationId(2120), + ty: DeclarationId(2121), }, Field { label: "TextEditorCodeExecution".to_string(), - ty: DeclarationId(2121), + ty: DeclarationId(2122), }, Field { label: "ToolSearchToolRegex".to_string(), - ty: DeclarationId(2122), + ty: DeclarationId(2123), }, Field { label: "ToolSearchToolBm25".to_string(), - ty: DeclarationId(2123), + ty: DeclarationId(2124), }, Field { label: "Advisor".to_string(), - ty: DeclarationId(2124), + ty: DeclarationId(2125), }, ], }, @@ -29481,8 +28952,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7974, 8156), }); declarations.push(Declaration { ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - id: DeclarationId(903), + id: DeclarationId(904), name: Some("AnthropicMessages200Usage".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -29496,27 +28966,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "cache_creation_input_tokens".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2118), - }, - Field { - label: "cache_read_input_tokens".to_string(), - ty: DeclarationId(2119), -======= - ty: DeclarationId(2125), - }, - Field { - label: "cache_read_input_tokens".to_string(), ty: DeclarationId(2126), }, Field { - label: "service_tier".to_string(), + label: "cache_read_input_tokens".to_string(), ty: DeclarationId(2127), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "service_tier".to_string(), - ty: DeclarationId(2120), + ty: DeclarationId(2128), }, ], }, @@ -29531,16 +28989,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8272, 8487), }); declarations.push(Declaration { - id: DeclarationId(904), + id: DeclarationId(905), name: Some("AnthropicMessages200Role".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "Assistant".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2121), -======= - ty: DeclarationId(2128), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2129), }], }, type_params: vec![], @@ -29554,7 +29008,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8808, 8851), }); declarations.push(Declaration { - id: DeclarationId(905), + id: DeclarationId(906), name: Some("AnthropicMessages200Body".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -29568,15 +29022,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "role".to_string(), - ty: DeclarationId(904), + ty: DeclarationId(905), }, Field { label: "content".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2122), -======= - ty: DeclarationId(2129), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2130), }, Field { label: "model".to_string(), @@ -29584,27 +29034,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "stop_reason".to_string(), - ty: DeclarationId(899), + ty: DeclarationId(900), }, Field { label: "stop_sequence".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2123), -======= - ty: DeclarationId(2130), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2131), }, Field { label: "usage".to_string(), - ty: DeclarationId(903), + ty: DeclarationId(904), }, Field { label: "container".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2124), -======= - ty: DeclarationId(2131), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2132), }, ], }, @@ -29619,7 +29061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9198, 9529), }); declarations.push(Declaration { - id: DeclarationId(906), + id: DeclarationId(907), name: Some("BinShim".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -29633,7 +29075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "entry".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, ], }, @@ -29648,49 +29090,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bin_shim.dag", 801, 894), }); declarations.push(Declaration { - id: DeclarationId(907), + id: DeclarationId(908), name: Some("BootstrapAuthority".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "StdAuthority".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2125), - }, - Field { - label: "V3StdAuthority".to_string(), - ty: DeclarationId(2126), - }, - Field { - label: "V3SpecAuthority".to_string(), - ty: DeclarationId(2127), - }, - Field { - label: "CompilerAuthority".to_string(), - ty: DeclarationId(2128), -======= - ty: DeclarationId(2132), - }, - Field { - label: "V3StdAuthority".to_string(), ty: DeclarationId(2133), }, Field { - label: "V3SpecAuthority".to_string(), + label: "V3StdAuthority".to_string(), ty: DeclarationId(2134), }, Field { - label: "CompilerAuthority".to_string(), + label: "V3SpecAuthority".to_string(), ty: DeclarationId(2135), }, Field { - label: "ExtdepsFixtureAuthority".to_string(), + label: "CompilerAuthority".to_string(), ty: DeclarationId(2136), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ExtdepsFixtureAuthority".to_string(), - ty: DeclarationId(2129), + ty: DeclarationId(2137), }, ], }, @@ -29705,7 +29127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 985, 1114), }); declarations.push(Declaration { - id: DeclarationId(908), + id: DeclarationId(909), name: Some("BootstrapAuthoritySet".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -29716,7 +29138,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(139), - value: DeclarationId(907), + value: DeclarationId(908), }, ], }, @@ -29731,15 +29153,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1299, 1359), }); declarations.push(Declaration { - id: DeclarationId(909), + id: DeclarationId(910), name: Some("bootstrap_authority".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(908), + template: DeclarationId(909), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(908)), + meta_tag: Some(DeclarationId(909)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Map( @@ -29747,748 +29169,476 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "dsl/std/logic.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2125), -======= - constructor: DeclarationId(2132), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2133), payload: vec![], }, ), ( "dsl/std/bit.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2125), -======= - constructor: DeclarationId(2132), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2133), payload: vec![], }, ), ( "dsl/std/error_primitives.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2125), -======= - constructor: DeclarationId(2132), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2133), payload: vec![], }, ), ( "dsl/std/algebra.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2125), -======= - constructor: DeclarationId(2132), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2133), payload: vec![], }, ), ( "dsl/std/magnitude.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2125), -======= - constructor: DeclarationId(2132), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2133), payload: vec![], }, ), ( "dsl/std/machine_constraints.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2125), -======= - constructor: DeclarationId(2132), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2133), payload: vec![], }, ), ( "dsl/std/nat.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2125), -======= - constructor: DeclarationId(2132), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2133), payload: vec![], }, ), ( "dsl/std/integer.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2125), -======= - constructor: DeclarationId(2132), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2133), payload: vec![], }, ), ( "dsl/std/rational.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2125), -======= - constructor: DeclarationId(2132), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2133), payload: vec![], }, ), ( "dsl/std/float.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2125), -======= - constructor: DeclarationId(2132), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2133), payload: vec![], }, ), ( "dsl/std/types.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2125), -======= - constructor: DeclarationId(2132), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2133), payload: vec![], }, ), ( "dsl/std/string_type.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2125), -======= - constructor: DeclarationId(2132), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2133), payload: vec![], }, ), ( "dsl/std/unicode.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2125), -======= - constructor: DeclarationId(2132), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2133), payload: vec![], }, ), ( "dsl/std/render_repeat_string_bootstrap.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2125), -======= - constructor: DeclarationId(2132), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2133), payload: vec![], }, ), ( "dsl/std/methods.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2125), -======= - constructor: DeclarationId(2132), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2133), payload: vec![], }, ), ( "dsl/std/serialization.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2125), -======= - constructor: DeclarationId(2132), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2133), payload: vec![], }, ), ( "src/v3/std/algebra.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/anthropic_messages.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/anthropic_operations.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/anthropic_schema.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/approximate_field.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/bin_shim.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/bootstrap_authority.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/bridge_ledger.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/clean_emission.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/computation.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/computation_model.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/coproduct_projection.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/cross_target_coverage.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/diagnostics.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/dimensions.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/effects.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/emission_provenance.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/emit_model.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/go_method_template_contracts.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/induction.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/integer_diagnostic_order.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/lens.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/lens_application.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/list.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/lookup.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/methods.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/parse_surface.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/python_method_template_contracts.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/resources.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/runtime.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/rust_method_template_contracts.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/services.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/substrate.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/substrate_minimal.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/termination.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/t_ci_workflow_as_data_demo.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/timing_lens.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/tokenize.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/verification.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/std/workflows.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "src/v3/spec/v3_l1.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2127), -======= - constructor: DeclarationId(2134), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2135), payload: vec![], }, ), ( "src/v3/spec/go.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2127), -======= - constructor: DeclarationId(2134), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2135), payload: vec![], }, ), ( "src/v3/spec/python.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2127), -======= - constructor: DeclarationId(2134), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2135), payload: vec![], }, ), ( "src/v3/spec/rust.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2127), -======= - constructor: DeclarationId(2134), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2135), payload: vec![], }, ), ( "src/v3/compiler/pipeline.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2128), -======= - constructor: DeclarationId(2135), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2136), payload: vec![], }, ), ( "src/v3/compiler/operators.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2128), -======= - constructor: DeclarationId(2135), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2136), payload: vec![], }, ), ( "src/v3/compiler/regen.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2128), -======= - constructor: DeclarationId(2135), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2136), payload: vec![], }, ), ( "dsl/extdeps/languages/rust/primitives.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2129), -======= - constructor: DeclarationId(2136), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2137), payload: vec![], }, ), ( "dsl/extdeps/cron_schedule_model.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2129), -======= - constructor: DeclarationId(2136), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2137), payload: vec![], }, ), ( "dsl/extdeps/github/github.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2129), -======= - constructor: DeclarationId(2136), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2137), payload: vec![], }, ), ( "dsl/extdeps/github/actions.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2129), -======= - constructor: DeclarationId(2136), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2137), payload: vec![], }, ), @@ -30500,25 +29650,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1361, 4876), }); declarations.push(Declaration { - id: DeclarationId(910), + id: DeclarationId(911), name: Some("BridgeStatus".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Retired".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2130), - }, - Field { - label: "Open".to_string(), - ty: DeclarationId(2131), -======= - ty: DeclarationId(2137), + ty: DeclarationId(2138), }, Field { label: "Open".to_string(), - ty: DeclarationId(2138), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2139), }, ], }, @@ -30533,12 +29675,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4697, 4735), }); declarations.push(Declaration { - id: DeclarationId(911), + id: DeclarationId(912), name: Some("BridgeLedgerRef".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "decl".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }], }, type_params: vec![], @@ -30552,7 +29694,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 5699, 5746), }); declarations.push(Declaration { - id: DeclarationId(912), + id: DeclarationId(913), name: Some("BridgeLedgerRow".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -30566,7 +29708,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "status".to_string(), - ty: DeclarationId(910), + ty: DeclarationId(911), }, Field { label: "authority".to_string(), @@ -30584,51 +29726,47 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6389, 6499), }); -<<<<<<< HEAD - declarations.push(Declaration { id: DeclarationId(913), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), value: DeclarationId(912) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2132)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_source_span_file_participation_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R3".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2131), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("ROADMAP.md#lens-fold-file-path-semantics".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_mark_bootstrap_secret_nominal_opacity_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2130), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #937".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_dispatch_pr1183_slice_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2130), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/canonical_lens_bridge_ratchet_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2130), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2130), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2130), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2131), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) }); -======= - declarations.push(Declaration { id: DeclarationId(913), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(912) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2139)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_source_span_file_participation_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R3".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2138), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("ROADMAP.md#lens-fold-file-path-semantics".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_mark_bootstrap_secret_nominal_opacity_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2137), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #937".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_dispatch_pr1183_slice_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2137), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/canonical_lens_bridge_ratchet_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2137), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2137), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2137), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2138), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) }); ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + declarations.push(Declaration { id: DeclarationId(914), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), value: DeclarationId(913) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2140)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_source_span_file_participation_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R3".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2139), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("ROADMAP.md#lens-fold-file-path-semantics".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_mark_bootstrap_secret_nominal_opacity_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2138), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #937".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_dispatch_pr1183_slice_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2138), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/canonical_lens_bridge_ratchet_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2138), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2138), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2138), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2139), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) }); declarations.push(Declaration { - id: DeclarationId(914), + id: DeclarationId(915), name: Some("CleanEmissionContract".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "expression_wrapping".to_string(), - ty: DeclarationId(916), + ty: DeclarationId(917), }, Field { label: "pattern_bindings".to_string(), - ty: DeclarationId(917), + ty: DeclarationId(918), }, Field { label: "variant_payload_field_access".to_string(), - ty: DeclarationId(918), + ty: DeclarationId(919), }, Field { label: "imports".to_string(), - ty: DeclarationId(919), + ty: DeclarationId(920), }, Field { label: "block_return".to_string(), - ty: DeclarationId(920), + ty: DeclarationId(921), }, Field { label: "variable_bindings".to_string(), - ty: DeclarationId(921), + ty: DeclarationId(922), }, Field { label: "match_arm_body".to_string(), - ty: DeclarationId(922), + ty: DeclarationId(923), }, Field { label: "correction_style".to_string(), - ty: DeclarationId(923), + ty: DeclarationId(924), }, Field { label: "post_emit_verifier".to_string(), - ty: DeclarationId(924), + ty: DeclarationId(925), }, ], }, @@ -30643,17 +29781,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 562, 944), }); declarations.push(Declaration { - id: DeclarationId(915), + id: DeclarationId(916), name: Some("TargetCleanEmissionBinding".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1043), + ty: DeclarationId(1044), }, Field { label: "clean_emission".to_string(), - ty: DeclarationId(914), + ty: DeclarationId(915), }, ], }, @@ -30668,33 +29806,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 1748, 1848), }); declarations.push(Declaration { - id: DeclarationId(916), + id: DeclarationId(917), name: Some("ExpressionWrappingRule".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "WrapEverything".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2133), - }, - Field { - label: "WrapOnlyInOperandPosition".to_string(), - ty: DeclarationId(2134), -======= - ty: DeclarationId(2140), - }, - Field { - label: "WrapOnlyInOperandPosition".to_string(), ty: DeclarationId(2141), }, Field { - label: "NoWrapping".to_string(), + label: "WrapOnlyInOperandPosition".to_string(), ty: DeclarationId(2142), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "NoWrapping".to_string(), - ty: DeclarationId(2135), + ty: DeclarationId(2143), }, ], }, @@ -30709,41 +29835,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2192, 2283), }); declarations.push(Declaration { - id: DeclarationId(917), + id: DeclarationId(918), name: Some("PatternBindingRule".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "EmitBindingAlways".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2136), - }, - Field { - label: "EmitUnderscoreWhenUnused".to_string(), - ty: DeclarationId(2137), - }, - Field { - label: "EmitPrefixedUnderscoreWhenUnused".to_string(), - ty: DeclarationId(2138), -======= - ty: DeclarationId(2143), - }, - Field { - label: "EmitUnderscoreWhenUnused".to_string(), ty: DeclarationId(2144), }, Field { - label: "EmitPrefixedUnderscoreWhenUnused".to_string(), + label: "EmitUnderscoreWhenUnused".to_string(), ty: DeclarationId(2145), }, Field { - label: "NotApplicablePatternBinding".to_string(), + label: "EmitPrefixedUnderscoreWhenUnused".to_string(), ty: DeclarationId(2146), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "NotApplicablePatternBinding".to_string(), - ty: DeclarationId(2139), + ty: DeclarationId(2147), }, ], }, @@ -30758,25 +29868,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2520, 2663), }); declarations.push(Declaration { - id: DeclarationId(918), + id: DeclarationId(919), name: Some("VariantPayloadFieldAccessRule".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "AccessFromPayloadBinding".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2140), - }, - Field { - label: "OverrideNamedFieldsAtBindingSite".to_string(), - ty: DeclarationId(2141), -======= - ty: DeclarationId(2147), + ty: DeclarationId(2148), }, Field { label: "OverrideNamedFieldsAtBindingSite".to_string(), - ty: DeclarationId(2148), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2149), }, ], }, @@ -30791,33 +29893,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3330, 3430), }); declarations.push(Declaration { - id: DeclarationId(919), + id: DeclarationId(920), name: Some("ImportRule".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ImportEverythingDeclared".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2142), - }, - Field { - label: "IncludeOnlyReferenced".to_string(), - ty: DeclarationId(2143), -======= - ty: DeclarationId(2149), - }, - Field { - label: "IncludeOnlyReferenced".to_string(), ty: DeclarationId(2150), }, Field { - label: "ImportPerUsageSite".to_string(), + label: "IncludeOnlyReferenced".to_string(), ty: DeclarationId(2151), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ImportPerUsageSite".to_string(), - ty: DeclarationId(2144), + ty: DeclarationId(2152), }, ], }, @@ -30832,33 +29922,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3544, 3637), }); declarations.push(Declaration { - id: DeclarationId(920), + id: DeclarationId(921), name: Some("BlockReturnRule".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "WrapReturnValue".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2145), - }, - Field { - label: "NoWrappingOnTerminalExpression".to_string(), - ty: DeclarationId(2146), -======= - ty: DeclarationId(2152), - }, - Field { - label: "NoWrappingOnTerminalExpression".to_string(), ty: DeclarationId(2153), }, Field { - label: "ExplicitReturnKeyword".to_string(), + label: "NoWrappingOnTerminalExpression".to_string(), ty: DeclarationId(2154), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ExplicitReturnKeyword".to_string(), - ty: DeclarationId(2147), + ty: DeclarationId(2155), }, ], }, @@ -30873,33 +29951,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3756, 3857), }); declarations.push(Declaration { - id: DeclarationId(921), + id: DeclarationId(922), name: Some("VariableBindingRule".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "EmitLetBindingAlways".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2148), - }, - Field { - label: "EmitLetUnderscoreWhenUnused".to_string(), - ty: DeclarationId(2149), -======= - ty: DeclarationId(2155), - }, - Field { - label: "EmitLetUnderscoreWhenUnused".to_string(), ty: DeclarationId(2156), }, Field { - label: "OmitLetBinding".to_string(), + label: "EmitLetUnderscoreWhenUnused".to_string(), ty: DeclarationId(2157), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "OmitLetBinding".to_string(), - ty: DeclarationId(2150), + ty: DeclarationId(2158), }, ], }, @@ -30914,33 +29980,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3995, 4095), }); declarations.push(Declaration { - id: DeclarationId(922), + id: DeclarationId(923), name: Some("MatchArmBodyRule".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "WrapBody".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2151), - }, - Field { - label: "NoWrappingOnNonComplexBody".to_string(), - ty: DeclarationId(2152), -======= - ty: DeclarationId(2158), - }, - Field { - label: "NoWrappingOnNonComplexBody".to_string(), ty: DeclarationId(2159), }, Field { - label: "NotApplicableMatchArmBody".to_string(), + label: "NoWrappingOnNonComplexBody".to_string(), ty: DeclarationId(2160), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "NotApplicableMatchArmBody".to_string(), - ty: DeclarationId(2153), + ty: DeclarationId(2161), }, ], }, @@ -30955,7 +30009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4328, 4423), }); declarations.push(Declaration { - id: DeclarationId(923), + id: DeclarationId(924), name: Some("CorrectionStyle".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -30988,7 +30042,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4736, 4854), }); declarations.push(Declaration { - id: DeclarationId(924), + id: DeclarationId(925), name: Some("PostEmitVerifier".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -30998,11 +30052,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2154), -======= - ty: DeclarationId(2161), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2162), }, Field { label: "syntax_only".to_string(), @@ -31014,7 +30064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "output_policy".to_string(), - ty: DeclarationId(925), + ty: DeclarationId(926), }, ], }, @@ -31029,41 +30079,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5270, 5418), }); declarations.push(Declaration { - id: DeclarationId(925), + id: DeclarationId(926), name: Some("VerifierOutputPolicy".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "IgnoreVerifierOutput".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2155), - }, - Field { - label: "RequireEmptyStdout".to_string(), - ty: DeclarationId(2156), - }, - Field { - label: "RequireEmptyStderr".to_string(), - ty: DeclarationId(2157), -======= - ty: DeclarationId(2162), - }, - Field { - label: "RequireEmptyStdout".to_string(), ty: DeclarationId(2163), }, Field { - label: "RequireEmptyStderr".to_string(), + label: "RequireEmptyStdout".to_string(), ty: DeclarationId(2164), }, Field { - label: "RequireEmptyStdoutAndStderr".to_string(), + label: "RequireEmptyStderr".to_string(), ty: DeclarationId(2165), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "RequireEmptyStdoutAndStderr".to_string(), - ty: DeclarationId(2158), + ty: DeclarationId(2166), }, ], }, @@ -31078,73 +30112,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5663, 5791), }); declarations.push(Declaration { - id: DeclarationId(926), + id: DeclarationId(927), name: Some("SizeBound".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "CollectionSize".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2164), - }, - Field { - label: "ParserStreamSize".to_string(), - ty: DeclarationId(2165), - }, - Field { - label: "WorklistDrainSize".to_string(), - ty: DeclarationId(2166), - }, - Field { - label: "TreeSize".to_string(), - ty: DeclarationId(2167), - }, - Field { - label: "ArithmeticParam".to_string(), - ty: DeclarationId(2168), - }, - Field { - label: "ExplicitCountZero".to_string(), - ty: DeclarationId(2169), - }, - Field { - label: "ExplicitCountPositive".to_string(), - ty: DeclarationId(2170), -======= - ty: DeclarationId(2171), - }, - Field { - label: "ParserStreamSize".to_string(), ty: DeclarationId(2172), }, Field { - label: "WorklistDrainSize".to_string(), + label: "ParserStreamSize".to_string(), ty: DeclarationId(2173), }, Field { - label: "TreeSize".to_string(), + label: "WorklistDrainSize".to_string(), ty: DeclarationId(2174), }, Field { - label: "ArithmeticParam".to_string(), + label: "TreeSize".to_string(), ty: DeclarationId(2175), }, Field { - label: "ExplicitCountZero".to_string(), + label: "ArithmeticParam".to_string(), ty: DeclarationId(2176), }, Field { - label: "ExplicitCountPositive".to_string(), + label: "ExplicitCountZero".to_string(), ty: DeclarationId(2177), }, Field { - label: "Forever".to_string(), + label: "ExplicitCountPositive".to_string(), ty: DeclarationId(2178), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Forever".to_string(), - ty: DeclarationId(2171), + ty: DeclarationId(2179), }, ], }, @@ -31159,11 +30161,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1403, 1699), }); declarations.push(Declaration { - id: DeclarationId(927), + id: DeclarationId(928), name: Some("tree_size_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], - output: DeclarationId(926), + output: DeclarationId(927), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 1748, @@ -31181,73 +30183,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1701, 1779), }); declarations.push(Declaration { - id: DeclarationId(928), + id: DeclarationId(929), name: Some("CallPattern".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ChildAccessorCall".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2172), - }, - Field { - label: "CollectionShrinkCall".to_string(), - ty: DeclarationId(2173), - }, - Field { - label: "ArithmeticSubtractCall".to_string(), - ty: DeclarationId(2174), - }, - Field { - label: "ArithmeticDivideCall".to_string(), - ty: DeclarationId(2175), - }, - Field { - label: "ParserAdvanceCall".to_string(), - ty: DeclarationId(2176), - }, - Field { - label: "WorklistDrainCall".to_string(), - ty: DeclarationId(2177), - }, - Field { - label: "FoldBodyCall".to_string(), - ty: DeclarationId(2178), -======= - ty: DeclarationId(2179), - }, - Field { - label: "CollectionShrinkCall".to_string(), ty: DeclarationId(2180), }, Field { - label: "ArithmeticSubtractCall".to_string(), + label: "CollectionShrinkCall".to_string(), ty: DeclarationId(2181), }, Field { - label: "ArithmeticDivideCall".to_string(), + label: "ArithmeticSubtractCall".to_string(), ty: DeclarationId(2182), }, Field { - label: "ParserAdvanceCall".to_string(), + label: "ArithmeticDivideCall".to_string(), ty: DeclarationId(2183), }, Field { - label: "WorklistDrainCall".to_string(), + label: "ParserAdvanceCall".to_string(), ty: DeclarationId(2184), }, Field { - label: "FoldBodyCall".to_string(), + label: "WorklistDrainCall".to_string(), ty: DeclarationId(2185), }, Field { - label: "SameArgumentCall".to_string(), + label: "FoldBodyCall".to_string(), ty: DeclarationId(2186), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "SameArgumentCall".to_string(), - ty: DeclarationId(2179), + ty: DeclarationId(2187), }, ], }, @@ -31262,16 +30232,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2030, 2477), }); declarations.push(Declaration { - id: DeclarationId(929), + id: DeclarationId(930), name: Some("per_call_pattern_at".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(722)], - output: DeclarationId(2159), -======= - inputs: vec![DeclarationId(827), DeclarationId(721)], - output: DeclarationId(2166), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2167), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 2756, @@ -31289,33 +30254,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2690, 2786), }); declarations.push(Declaration { - id: DeclarationId(930), + id: DeclarationId(931), name: Some("ShrinkFactor".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "UnitShrink".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2180), - }, - Field { - label: "ConstantShrink".to_string(), - ty: DeclarationId(2181), -======= - ty: DeclarationId(2187), - }, - Field { - label: "ConstantShrink".to_string(), ty: DeclarationId(2188), }, Field { - label: "ProportionalShrink".to_string(), + label: "ConstantShrink".to_string(), ty: DeclarationId(2189), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ProportionalShrink".to_string(), - ty: DeclarationId(2182), + ty: DeclarationId(2190), }, ], }, @@ -31330,33 +30283,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2976, 3116), }); declarations.push(Declaration { - id: DeclarationId(931), + id: DeclarationId(932), name: Some("IterationPrimitive".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Fold".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2183), - }, - Field { - label: "Descend".to_string(), - ty: DeclarationId(2184), -======= - ty: DeclarationId(2190), - }, - Field { - label: "Descend".to_string(), ty: DeclarationId(2191), }, Field { - label: "Repeat".to_string(), + label: "Descend".to_string(), ty: DeclarationId(2192), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Repeat".to_string(), - ty: DeclarationId(2185), + ty: DeclarationId(2193), }, ], }, @@ -31371,29 +30312,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3278, 3333), }); declarations.push(Declaration { - id: DeclarationId(932), + id: DeclarationId(933), name: Some("LoweringTarget".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "primitive".to_string(), - ty: DeclarationId(931), + ty: DeclarationId(932), }, Field { label: "bound".to_string(), - ty: DeclarationId(926), + ty: DeclarationId(927), }, Field { label: "evidence".to_string(), - ty: DeclarationId(1204), + ty: DeclarationId(1205), }, Field { label: "factor".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2186), -======= - ty: DeclarationId(2193), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2194), }, ], }, @@ -31408,11 +30345,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3525, 3651), }); declarations.push(Declaration { - id: DeclarationId(933), + id: DeclarationId(934), name: Some("lower_call_pattern".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(928)], - output: DeclarationId(932), + inputs: vec![DeclarationId(929)], + output: DeclarationId(933), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 3962, @@ -31430,15 +30367,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3900, 5513), }); declarations.push(Declaration { - id: DeclarationId(934), + id: DeclarationId(935), name: Some("size_bound_param".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(926)], -<<<<<<< HEAD - output: DeclarationId(2160), -======= - output: DeclarationId(2167), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(927)], + output: DeclarationId(2168), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 5564, @@ -31456,10 +30389,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 5515, 5989), }); declarations.push(Declaration { - id: DeclarationId(935), + id: DeclarationId(936), name: Some("is_constant_bound".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(926)], + inputs: vec![DeclarationId(927)], output: DeclarationId(128), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", @@ -31478,7 +30411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 5991, 6209), }); declarations.push(Declaration { - id: DeclarationId(936), + id: DeclarationId(937), name: Some("forever_iteration_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], @@ -31500,15 +30433,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 6290, 6349), }); declarations.push(Declaration { - id: DeclarationId(937), + id: DeclarationId(938), name: Some("constant_bound_value".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(926)], -<<<<<<< HEAD - output: DeclarationId(2161), -======= - output: DeclarationId(2168), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(927)], + output: DeclarationId(2169), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 6492, @@ -31526,33 +30455,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 6442, 6757), }); declarations.push(Declaration { - id: DeclarationId(938), + id: DeclarationId(939), name: Some("IterationDimension".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TreeDescent".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2187), - }, - Field { - label: "CollectionFold".to_string(), - ty: DeclarationId(2188), -======= - ty: DeclarationId(2194), - }, - Field { - label: "CollectionFold".to_string(), ty: DeclarationId(2195), }, Field { - label: "ArithmeticRepeat".to_string(), + label: "CollectionFold".to_string(), ty: DeclarationId(2196), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ArithmeticRepeat".to_string(), - ty: DeclarationId(2189), + ty: DeclarationId(2197), }, ], }, @@ -31567,15 +30484,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7242, 7425), }); declarations.push(Declaration { - id: DeclarationId(939), + id: DeclarationId(940), name: Some("algebra_profile_to_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(53)], -<<<<<<< HEAD - output: DeclarationId(2162), -======= - output: DeclarationId(2169), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2170), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 7558, @@ -31593,15 +30506,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7478, 8051), }); declarations.push(Declaration { - id: DeclarationId(940), + id: DeclarationId(941), name: Some("type_iteration_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], -<<<<<<< HEAD - output: DeclarationId(2163), -======= - output: DeclarationId(2170), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2171), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 8123, @@ -31619,25 +30528,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 8053, 8342), }); declarations.push(Declaration { - id: DeclarationId(941), + id: DeclarationId(942), name: Some("Mutability".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Immutable".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2190), - }, - Field { - label: "Mutable".to_string(), - ty: DeclarationId(2191), -======= - ty: DeclarationId(2197), + ty: DeclarationId(2198), }, Field { label: "Mutable".to_string(), - ty: DeclarationId(2198), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2199), }, ], }, @@ -31652,25 +30553,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 340, 381), }); declarations.push(Declaration { - id: DeclarationId(942), + id: DeclarationId(943), name: Some("Purity".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Pure".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2192), - }, - Field { - label: "Effectful".to_string(), - ty: DeclarationId(2193), -======= - ty: DeclarationId(2199), + ty: DeclarationId(2200), }, Field { label: "Effectful".to_string(), - ty: DeclarationId(2200), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2201), }, ], }, @@ -31685,25 +30578,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 598, 632), }); declarations.push(Declaration { - id: DeclarationId(943), + id: DeclarationId(944), name: Some("Structure".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ExplicitDAG".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2194), - }, - Field { - label: "Arbitrary".to_string(), - ty: DeclarationId(2195), -======= - ty: DeclarationId(2201), + ty: DeclarationId(2202), }, Field { label: "Arbitrary".to_string(), - ty: DeclarationId(2202), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2203), }, ], }, @@ -31718,25 +30603,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 891, 935), }); declarations.push(Declaration { - id: DeclarationId(944), + id: DeclarationId(945), name: Some("Iteration".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Bounded".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2196), - }, - Field { - label: "Unbounded".to_string(), - ty: DeclarationId(2197), -======= - ty: DeclarationId(2203), + ty: DeclarationId(2204), }, Field { label: "Unbounded".to_string(), - ty: DeclarationId(2204), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2205), }, ], }, @@ -31751,25 +30628,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 1147, 1187), }); declarations.push(Declaration { - id: DeclarationId(945), + id: DeclarationId(946), name: Some("ComputationModel".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "mutability".to_string(), - ty: DeclarationId(941), + ty: DeclarationId(942), }, Field { label: "purity".to_string(), - ty: DeclarationId(942), + ty: DeclarationId(943), }, Field { label: "structure".to_string(), - ty: DeclarationId(943), + ty: DeclarationId(944), }, Field { label: "iteration".to_string(), - ty: DeclarationId(944), + ty: DeclarationId(945), }, ], }, @@ -31784,15 +30661,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 1387, 1500), }); declarations.push(Declaration { - id: DeclarationId(946), + id: DeclarationId(947), name: Some("dag_model".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(945), + template: DeclarationId(946), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(945)), + meta_tag: Some(DeclarationId(946)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -31800,44 +30677,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "mutability".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2190), -======= - constructor: DeclarationId(2197), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2198), payload: vec![], }, ), ( "purity".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2192), -======= - constructor: DeclarationId(2199), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2200), payload: vec![], }, ), ( "structure".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2194), -======= - constructor: DeclarationId(2201), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2202), payload: vec![], }, ), ( "iteration".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2196), -======= - constructor: DeclarationId(2203), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2204), payload: vec![], }, ), @@ -31848,41 +30709,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 1502, 1625), }); declarations.push(Declaration { - id: DeclarationId(947), + id: DeclarationId(948), name: Some("MemoryModel".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ValueOnly".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2198), - }, - Field { - label: "GarbageCollected".to_string(), - ty: DeclarationId(2199), - }, - Field { - label: "RefCounted".to_string(), - ty: DeclarationId(2200), -======= - ty: DeclarationId(2205), - }, - Field { - label: "GarbageCollected".to_string(), ty: DeclarationId(2206), }, Field { - label: "RefCounted".to_string(), + label: "GarbageCollected".to_string(), ty: DeclarationId(2207), }, Field { - label: "OwnershipBased".to_string(), + label: "RefCounted".to_string(), ty: DeclarationId(2208), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "OwnershipBased".to_string(), - ty: DeclarationId(2201), + ty: DeclarationId(2209), }, ], }, @@ -31897,25 +30742,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2014, 2099), }); declarations.push(Declaration { - id: DeclarationId(948), + id: DeclarationId(949), name: Some("ScopeModel".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "LexicalScoping".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2202), - }, - Field { - label: "DynamicScoping".to_string(), - ty: DeclarationId(2203), -======= - ty: DeclarationId(2209), + ty: DeclarationId(2210), }, Field { label: "DynamicScoping".to_string(), - ty: DeclarationId(2210), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2211), }, ], }, @@ -31930,17 +30767,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2365, 2418), }); declarations.push(Declaration { - id: DeclarationId(949), + id: DeclarationId(950), name: Some("TargetExecutionModel".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "memory".to_string(), - ty: DeclarationId(947), + ty: DeclarationId(948), }, Field { label: "scope".to_string(), - ty: DeclarationId(948), + ty: DeclarationId(949), }, ], }, @@ -31955,16 +30792,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2561, 2632), }); declarations.push(Declaration { - id: DeclarationId(950), + id: DeclarationId(951), name: Some("SourceFiltering".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "excluded_prefixes".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2204), -======= - ty: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2212), }], }, type_params: vec![], @@ -31978,21 +30811,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2774, 2832), }); declarations.push(Declaration { - id: DeclarationId(951), + id: DeclarationId(952), name: Some("ShapeATargetSourceFiltering".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "internal".to_string(), - ty: DeclarationId(950), + ty: DeclarationId(951), }, Field { label: "additional_excluded_prefixes".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2205), -======= - ty: DeclarationId(2212), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2213), }, ], }, @@ -32007,15 +30836,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 3115, 3224), }); declarations.push(Declaration { - id: DeclarationId(952), + id: DeclarationId(953), name: Some("internal_source_filtering".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(950), + template: DeclarationId(951), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(950)), + meta_tag: Some(DeclarationId(951)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -32034,25 +30863,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 3226, 3381), }); declarations.push(Declaration { - id: DeclarationId(953), + id: DeclarationId(954), name: Some("ExecutionModelRequirement".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "OwnershipBased".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2206), - }, - Field { - label: "GarbageCollected".to_string(), - ty: DeclarationId(2207), -======= - ty: DeclarationId(2213), + ty: DeclarationId(2214), }, Field { label: "GarbageCollected".to_string(), - ty: DeclarationId(2214), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2215), }, ], }, @@ -32067,7 +30888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 3659, 3729), }); declarations.push(Declaration { - id: DeclarationId(954), + id: DeclarationId(955), name: Some("VariantId".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -32084,16 +30905,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 5139, 5162), }); declarations.push(Declaration { - id: DeclarationId(955), + id: DeclarationId(956), name: Some("WireTagValue".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "StringTag".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2208), -======= - ty: DeclarationId(2215), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2216), }], }, type_params: vec![], @@ -32107,25 +30924,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6737, 6786), }); declarations.push(Declaration { - id: DeclarationId(956), + id: DeclarationId(957), name: Some("FieldProjection".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Empty".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2209), - }, - Field { - label: "Populated".to_string(), - ty: DeclarationId(2210), -======= - ty: DeclarationId(2216), + ty: DeclarationId(2217), }, Field { label: "Populated".to_string(), - ty: DeclarationId(2217), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2218), }, ], }, @@ -32140,17 +30949,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7586, 7630), }); declarations.push(Declaration { - id: DeclarationId(957), + id: DeclarationId(958), name: Some("CoproductVariantProjection".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "field_projection".to_string(), - ty: DeclarationId(956), + ty: DeclarationId(957), }, Field { label: "wire_tag_value".to_string(), - ty: DeclarationId(955), + ty: DeclarationId(956), }, ], }, @@ -32165,13 +30974,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 8046, 8150), }); declarations.push(Declaration { - id: DeclarationId(958), + id: DeclarationId(959), name: Some("CoproductProjection".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "declaration".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "wire_tag_field".to_string(), @@ -32179,11 +30988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "variant_projections".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2211), -======= - ty: DeclarationId(2218), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2219), }, ], }, @@ -32198,10 +31003,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9395, 9557), }); declarations.push(Declaration { - id: DeclarationId(959), + id: DeclarationId(960), name: Some("ShapeATarget".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1043), + template: DeclarationId(1044), arguments: vec![], }, type_params: vec![], @@ -32215,15 +31020,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2839, 2871), }); declarations.push(Declaration { - id: DeclarationId(960), + id: DeclarationId(961), name: Some("rust_shape_a_target".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(959), + template: DeclarationId(960), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(959)), + meta_tag: Some(DeclarationId(960)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -32236,15 +31041,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2873, 2927), }); declarations.push(Declaration { - id: DeclarationId(961), + id: DeclarationId(962), name: Some("python_shape_a_target".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(959), + template: DeclarationId(960), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(959)), + meta_tag: Some(DeclarationId(960)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -32257,15 +31062,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2928, 2986), }); declarations.push(Declaration { - id: DeclarationId(962), + id: DeclarationId(963), name: Some("go_shape_a_target".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(959), + template: DeclarationId(960), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(959)), + meta_tag: Some(DeclarationId(960)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -32278,57 +31083,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 2987, 3037), }); declarations.push(Declaration { - id: DeclarationId(963), + id: DeclarationId(964), name: Some("FormAxis".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Atom".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2212), - }, - Field { - label: "Conj".to_string(), - ty: DeclarationId(2213), - }, - Field { - label: "Disj".to_string(), - ty: DeclarationId(2214), - }, - Field { - label: "Arrow".to_string(), - ty: DeclarationId(2215), - }, - Field { - label: "Cardinality".to_string(), - ty: DeclarationId(2216), -======= - ty: DeclarationId(2219), - }, - Field { - label: "Conj".to_string(), ty: DeclarationId(2220), }, Field { - label: "Disj".to_string(), + label: "Conj".to_string(), ty: DeclarationId(2221), }, Field { - label: "Arrow".to_string(), + label: "Disj".to_string(), ty: DeclarationId(2222), }, Field { - label: "Cardinality".to_string(), + label: "Arrow".to_string(), ty: DeclarationId(2223), }, Field { - label: "Instantiation".to_string(), + label: "Cardinality".to_string(), ty: DeclarationId(2224), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Instantiation".to_string(), - ty: DeclarationId(2217), + ty: DeclarationId(2225), }, ], }, @@ -32343,49 +31124,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3837, 3909), }); declarations.push(Declaration { - id: DeclarationId(964), + id: DeclarationId(965), name: Some("BehaviorAxis".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Value".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2218), - }, - Field { - label: "Transform".to_string(), - ty: DeclarationId(2219), - }, - Field { - label: "Branch".to_string(), - ty: DeclarationId(2220), - }, - Field { - label: "Loop".to_string(), - ty: DeclarationId(2221), -======= - ty: DeclarationId(2225), - }, - Field { - label: "Transform".to_string(), ty: DeclarationId(2226), }, Field { - label: "Branch".to_string(), + label: "Transform".to_string(), ty: DeclarationId(2227), }, Field { - label: "Loop".to_string(), + label: "Branch".to_string(), ty: DeclarationId(2228), }, Field { - label: "Bind".to_string(), + label: "Loop".to_string(), ty: DeclarationId(2229), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Bind".to_string(), - ty: DeclarationId(2222), + ty: DeclarationId(2230), }, ], }, @@ -32400,13 +31161,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4469, 4529), }); declarations.push(Declaration { - id: DeclarationId(965), + id: DeclarationId(966), name: Some("MethodTemplateContractKey".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "target".to_string(), - ty: DeclarationId(959), + ty: DeclarationId(960), }, Field { label: "dag_method".to_string(), @@ -32425,17 +31186,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4913, 4994), }); declarations.push(Declaration { - id: DeclarationId(966), + id: DeclarationId(967), name: Some("EmissionCell".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "connective".to_string(), - ty: DeclarationId(963), + ty: DeclarationId(964), }, Field { label: "behavior".to_string(), - ty: DeclarationId(964), + ty: DeclarationId(965), }, ], }, @@ -32450,21 +31211,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5427, 5496), }); declarations.push(Declaration { - id: DeclarationId(967), + id: DeclarationId(968), name: Some("EmissionPathProjection".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "row_identity".to_string(), - ty: DeclarationId(965), + ty: DeclarationId(966), }, Field { label: "cells".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2223), -======= - ty: DeclarationId(2230), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2231), }, ], }, @@ -32479,26 +31236,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5842, 5943), }); declarations.push(Declaration { - id: DeclarationId(968), + id: DeclarationId(969), name: Some("emission_path_projections".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(967), + value: DeclarationId(968), }], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(2224)), -======= - meta_tag: Some(DeclarationId(2231)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + meta_tag: Some(DeclarationId(2232)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -32508,7 +31257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -32525,22 +31274,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -32553,7 +31294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -32570,22 +31311,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -32598,7 +31331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -32615,22 +31348,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -32643,7 +31368,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -32660,22 +31385,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -32688,7 +31405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -32705,22 +31422,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -32733,7 +31442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -32750,22 +31459,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -32778,7 +31479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -32795,22 +31496,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -32823,7 +31516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -32840,22 +31533,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -32868,7 +31553,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -32885,22 +31570,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -32913,7 +31590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -32930,22 +31607,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -32958,7 +31627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -32975,22 +31644,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33003,7 +31664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -33020,22 +31681,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33048,7 +31701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(960)), + FieldValue::Reference(DeclarationId(961)), ), ( "dag_method".to_string(), @@ -33065,22 +31718,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33093,7 +31738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -33110,22 +31755,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33138,7 +31775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -33155,22 +31792,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33183,7 +31812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -33200,22 +31829,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33228,7 +31849,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -33245,22 +31866,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33273,7 +31886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -33290,22 +31903,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33318,7 +31923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -33335,22 +31940,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33363,7 +31960,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -33380,22 +31977,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33408,7 +31997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -33425,22 +32014,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33453,7 +32034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -33470,22 +32051,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33498,7 +32071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -33515,22 +32088,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33543,7 +32108,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -33560,22 +32125,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33588,7 +32145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -33605,22 +32162,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33633,7 +32182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -33650,22 +32199,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33678,7 +32219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -33695,22 +32236,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33723,7 +32256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -33740,22 +32273,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33768,7 +32293,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(961)), + FieldValue::Reference(DeclarationId(962)), ), ( "dag_method".to_string(), @@ -33785,22 +32310,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33813,7 +32330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(962)), + FieldValue::Reference(DeclarationId(963)), ), ( "dag_method".to_string(), @@ -33830,22 +32347,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33858,7 +32367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(962)), + FieldValue::Reference(DeclarationId(963)), ), ( "dag_method".to_string(), @@ -33875,22 +32384,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33903,7 +32404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(962)), + FieldValue::Reference(DeclarationId(963)), ), ( "dag_method".to_string(), @@ -33920,22 +32421,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33948,7 +32441,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(962)), + FieldValue::Reference(DeclarationId(963)), ), ( "dag_method".to_string(), @@ -33965,22 +32458,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -33993,7 +32478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(962)), + FieldValue::Reference(DeclarationId(963)), ), ( "dag_method".to_string(), @@ -34010,22 +32495,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -34038,7 +32515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(962)), + FieldValue::Reference(DeclarationId(963)), ), ( "dag_method".to_string(), @@ -34055,22 +32532,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -34083,7 +32552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(962)), + FieldValue::Reference(DeclarationId(963)), ), ( "dag_method".to_string(), @@ -34100,22 +32569,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -34128,7 +32589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(962)), + FieldValue::Reference(DeclarationId(963)), ), ( "dag_method".to_string(), @@ -34145,22 +32606,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -34173,7 +32626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(962)), + FieldValue::Reference(DeclarationId(963)), ), ( "dag_method".to_string(), @@ -34190,22 +32643,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -34218,7 +32663,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(962)), + FieldValue::Reference(DeclarationId(963)), ), ( "dag_method".to_string(), @@ -34235,22 +32680,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -34263,7 +32700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(962)), + FieldValue::Reference(DeclarationId(963)), ), ( "dag_method".to_string(), @@ -34280,22 +32717,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -34308,7 +32737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Record(vec![ ( "target".to_string(), - FieldValue::Reference(DeclarationId(962)), + FieldValue::Reference(DeclarationId(963)), ), ( "dag_method".to_string(), @@ -34325,22 +32754,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "connective".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2216), -======= - constructor: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2224), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2219), -======= - constructor: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2227), payload: vec![], }, ), @@ -34353,91 +32774,50 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6364, 12528), }); declarations.push(Declaration { - id: DeclarationId(969), + id: DeclarationId(970), name: Some("CompilerDiagnosticKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TokenizerError".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2225), - }, - Field { - label: "ParseError".to_string(), - ty: DeclarationId(2226), - }, - Field { - label: "TypeMismatch".to_string(), - ty: DeclarationId(2227), - }, - Field { - label: "ArityMismatch".to_string(), - ty: DeclarationId(2228), - }, - Field { - label: "ResolveError".to_string(), - ty: DeclarationId(2229), - }, - Field { - label: "UnitMismatch".to_string(), - ty: DeclarationId(2230), - }, - Field { - label: "BranchConditionNotBool".to_string(), - ty: DeclarationId(2231), - }, - Field { - label: "MagnitudeOutOfRange".to_string(), - ty: DeclarationId(2232), - }, - Field { - label: "MalformedIntegerRangeFact".to_string(), ty: DeclarationId(2233), }, - Field { - label: "NominalOpacityViolation".to_string(), - ty: DeclarationId(2234), - }, -======= - ty: DeclarationId(2232), - }, Field { label: "ParseError".to_string(), - ty: DeclarationId(2233), + ty: DeclarationId(2234), }, Field { label: "TypeMismatch".to_string(), - ty: DeclarationId(2234), + ty: DeclarationId(2235), }, Field { label: "ArityMismatch".to_string(), - ty: DeclarationId(2235), + ty: DeclarationId(2236), }, Field { label: "ResolveError".to_string(), - ty: DeclarationId(2236), + ty: DeclarationId(2237), }, Field { label: "UnitMismatch".to_string(), - ty: DeclarationId(2237), + ty: DeclarationId(2238), }, Field { label: "BranchConditionNotBool".to_string(), - ty: DeclarationId(2238), + ty: DeclarationId(2239), }, Field { label: "MagnitudeOutOfRange".to_string(), - ty: DeclarationId(2239), + ty: DeclarationId(2240), }, Field { label: "MalformedIntegerRangeFact".to_string(), - ty: DeclarationId(2240), + ty: DeclarationId(2241), }, Field { label: "NominalOpacityViolation".to_string(), - ty: DeclarationId(2241), + ty: DeclarationId(2242), }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -34451,7 +32831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1067, 1306), }); declarations.push(Declaration { - id: DeclarationId(970), + id: DeclarationId(971), name: Some("Correction".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -34480,7 +32860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1512, 1765), }); declarations.push(Declaration { - id: DeclarationId(971), + id: DeclarationId(972), name: Some("DiagnosticKindDecl".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -34505,12 +32885,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 2545, 2608), }); declarations.push(Declaration { - id: DeclarationId(972), + id: DeclarationId(973), name: Some("LensInstanceKindWitness".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "kind_decl".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }], }, type_params: vec![], @@ -34524,25 +32904,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 4810, 4870), }); declarations.push(Declaration { - id: DeclarationId(973), + id: DeclarationId(974), name: Some("AnyDiagnosticKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "CompilerKind".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2235), - }, - Field { - label: "LensInstanceKind".to_string(), - ty: DeclarationId(2236), -======= - ty: DeclarationId(2242), + ty: DeclarationId(2243), }, Field { label: "LensInstanceKind".to_string(), - ty: DeclarationId(2243), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2244), }, ], }, @@ -34557,13 +32929,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 5479, 5588), }); declarations.push(Declaration { - id: DeclarationId(974), + id: DeclarationId(975), name: Some("Diagnostic".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "kind".to_string(), - ty: DeclarationId(973), + ty: DeclarationId(974), }, Field { label: "span".to_string(), @@ -34575,11 +32947,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fixes".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2237), -======= - ty: DeclarationId(2244), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2245), }, ], }, @@ -34594,65 +32962,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 5957, 6065), }); declarations.push(Declaration { - id: DeclarationId(975), + id: DeclarationId(976), name: Some("EmissionDiagnostic".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "UnderRefined".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2238), - }, - Field { - label: "NoInhabitant".to_string(), - ty: DeclarationId(2239), - }, - Field { - label: "ContradictoryUse".to_string(), - ty: DeclarationId(2241), - }, - Field { - label: "OutOfR2Scope".to_string(), - ty: DeclarationId(2242), - }, - Field { - label: "LifetimeProgramExtractionPending".to_string(), - ty: DeclarationId(2243), - }, - Field { - label: "FoldNotImplemented".to_string(), - ty: DeclarationId(2244), -======= - ty: DeclarationId(2245), + ty: DeclarationId(2246), }, Field { label: "NoInhabitant".to_string(), - ty: DeclarationId(2246), + ty: DeclarationId(2247), }, Field { label: "ContradictoryUse".to_string(), - ty: DeclarationId(2248), - }, - Field { - label: "OutOfR2Scope".to_string(), ty: DeclarationId(2249), }, Field { - label: "LifetimeProgramExtractionPending".to_string(), + label: "OutOfR2Scope".to_string(), ty: DeclarationId(2250), }, Field { - label: "FoldNotImplemented".to_string(), + label: "LifetimeProgramExtractionPending".to_string(), ty: DeclarationId(2251), }, Field { - label: "MissingEmissionPath".to_string(), + label: "FoldNotImplemented".to_string(), ty: DeclarationId(2252), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "MissingEmissionPath".to_string(), - ty: DeclarationId(2245), + ty: DeclarationId(2253), }, ], }, @@ -34667,29 +33007,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 8699, 11469), }); declarations.push(Declaration { - id: DeclarationId(976), + id: DeclarationId(977), name: Some("Witness".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Inhabits".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2260), - }, - Field { - label: "Violates".to_string(), - ty: DeclarationId(2261), -======= - ty: DeclarationId(2267), + ty: DeclarationId(2268), }, Field { label: "Violates".to_string(), - ty: DeclarationId(2268), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2269), }, ], }, - type_params: vec![DeclarationId(977)], + type_params: vec![DeclarationId(978)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -34700,7 +33032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1608, 1697), }); declarations.push(Declaration { - id: DeclarationId(977), + id: DeclarationId(978), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())), type_params: vec![], @@ -34714,25 +33046,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1608, 1697), }); declarations.push(Declaration { - id: DeclarationId(978), + id: DeclarationId(979), name: Some("OptionalDiagnostic".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "NoDiagnostic".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2262), - }, - Field { - label: "SomeDiagnostic".to_string(), - ty: DeclarationId(2263), -======= - ty: DeclarationId(2269), + ty: DeclarationId(2270), }, Field { label: "SomeDiagnostic".to_string(), - ty: DeclarationId(2270), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2271), }, ], }, @@ -34747,29 +33071,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1851, 1932), }); declarations.push(Declaration { - id: DeclarationId(979), + id: DeclarationId(980), name: Some("DimensionReport".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "DimensionOk".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2266), - }, - Field { - label: "DimensionFail".to_string(), - ty: DeclarationId(2270), -======= - ty: DeclarationId(2273), + ty: DeclarationId(2274), }, Field { label: "DimensionFail".to_string(), - ty: DeclarationId(2277), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2278), }, ], }, - type_params: vec![DeclarationId(980)], + type_params: vec![DeclarationId(981)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -34780,7 +33096,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2291, 2567), }); declarations.push(Declaration { - id: DeclarationId(980), + id: DeclarationId(981), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())), type_params: vec![], @@ -34794,7 +33110,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2291, 2567), }); declarations.push(Declaration { - id: DeclarationId(981), + id: DeclarationId(982), name: Some("AnalysisDimension".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -34804,31 +33120,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "witness_of".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2272), - }, - Field { - label: "compose".to_string(), - ty: DeclarationId(2273), -======= - ty: DeclarationId(2279), - }, - Field { - label: "compose".to_string(), ty: DeclarationId(2280), }, Field { - label: "break_diagnostic".to_string(), + label: "compose".to_string(), ty: DeclarationId(2281), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "break_diagnostic".to_string(), - ty: DeclarationId(2274), + ty: DeclarationId(2282), }, ], }, - type_params: vec![DeclarationId(982)], + type_params: vec![DeclarationId(983)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -34839,7 +33143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3818, 4011), }); declarations.push(Declaration { - id: DeclarationId(982), + id: DeclarationId(983), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())), type_params: vec![], @@ -34853,22 +33157,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3818, 4011), }); declarations.push(Declaration { - id: DeclarationId(983), + id: DeclarationId(984), name: Some("Dimension".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "value".to_string(), - ty: DeclarationId(985), + ty: DeclarationId(986), }], }, - type_params: vec![DeclarationId(984), DeclarationId(985)], + type_params: vec![DeclarationId(985), DeclarationId(986)], phantom_params: vec![PhantomParameter { - parameter: DeclarationId(984), -<<<<<<< HEAD - algebra: DeclarationId(2275), -======= - algebra: DeclarationId(2282), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + parameter: DeclarationId(985), + algebra: DeclarationId(2283), }], meta_tag: None, specialization_parent: None, @@ -34879,7 +33179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702), }); declarations.push(Declaration { - id: DeclarationId(984), + id: DeclarationId(985), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())), type_params: vec![], @@ -34893,7 +33193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702), }); declarations.push(Declaration { - id: DeclarationId(985), + id: DeclarationId(986), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())), type_params: vec![], @@ -34907,7 +33207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702), }); declarations.push(Declaration { - id: DeclarationId(986), + id: DeclarationId(987), name: Some("Meters".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -34921,7 +33221,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4704, 4715), }); declarations.push(Declaration { - id: DeclarationId(987), + id: DeclarationId(988), name: Some("Seconds".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -34935,7 +33235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4716, 4728), }); declarations.push(Declaration { - id: DeclarationId(988), + id: DeclarationId(989), name: Some("Kilograms".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -34949,7 +33249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4729, 4743), }); declarations.push(Declaration { - id: DeclarationId(989), + id: DeclarationId(990), name: Some("Amperes".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -34963,7 +33263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4744, 4756), }); declarations.push(Declaration { - id: DeclarationId(990), + id: DeclarationId(991), name: Some("Kelvin".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -34977,7 +33277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4757, 4768), }); declarations.push(Declaration { - id: DeclarationId(991), + id: DeclarationId(992), name: Some("Moles".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -34991,7 +33291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4769, 4779), }); declarations.push(Declaration { - id: DeclarationId(992), + id: DeclarationId(993), name: Some("Candela".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -35005,26 +33305,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4780, 4792), }); declarations.push(Declaration { - id: DeclarationId(993), + id: DeclarationId(994), name: Some("add_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![ -<<<<<<< HEAD - DeclarationId(2246), - DeclarationId(2247), - DeclarationId(2248), - ], - output: DeclarationId(2249), -======= - DeclarationId(2253), DeclarationId(2254), DeclarationId(2255), + DeclarationId(2256), ], - output: DeclarationId(2256), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2257), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)), }, - type_params: vec![DeclarationId(994), DeclarationId(995)], + type_params: vec![DeclarationId(995), DeclarationId(996)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -35035,7 +33327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988), }); declarations.push(Declaration { - id: DeclarationId(994), + id: DeclarationId(995), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())), type_params: vec![], @@ -35049,7 +33341,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988), }); declarations.push(Declaration { - id: DeclarationId(995), + id: DeclarationId(996), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())), type_params: vec![], @@ -35063,26 +33355,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4794, 4988), }); declarations.push(Declaration { - id: DeclarationId(996), + id: DeclarationId(997), name: Some("sub_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![ -<<<<<<< HEAD - DeclarationId(2250), - DeclarationId(2251), - DeclarationId(2252), - ], - output: DeclarationId(2253), -======= - DeclarationId(2257), DeclarationId(2258), DeclarationId(2259), + DeclarationId(2260), ], - output: DeclarationId(2260), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2261), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)), }, - type_params: vec![DeclarationId(997), DeclarationId(998)], + type_params: vec![DeclarationId(998), DeclarationId(999)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -35093,7 +33377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184), }); declarations.push(Declaration { - id: DeclarationId(997), + id: DeclarationId(998), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())), type_params: vec![], @@ -35107,7 +33391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184), }); declarations.push(Declaration { - id: DeclarationId(998), + id: DeclarationId(999), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())), type_params: vec![], @@ -35121,26 +33405,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4990, 5184), }); declarations.push(Declaration { - id: DeclarationId(999), + id: DeclarationId(1000), name: Some("mul_dimension_scalar".to_string()), connective: TypeConnective::Arrow { inputs: vec![ -<<<<<<< HEAD - DeclarationId(2254), - DeclarationId(2255), - DeclarationId(1001), - ], - output: DeclarationId(2256), -======= - DeclarationId(2261), DeclarationId(2262), - DeclarationId(1001), + DeclarationId(2263), + DeclarationId(1002), ], - output: DeclarationId(2263), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2264), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)), }, - type_params: vec![DeclarationId(1000), DeclarationId(1001)], + type_params: vec![DeclarationId(1001), DeclarationId(1002)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -35151,7 +33427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379), }); declarations.push(Declaration { - id: DeclarationId(1000), + id: DeclarationId(1001), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())), type_params: vec![], @@ -35165,7 +33441,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379), }); declarations.push(Declaration { - id: DeclarationId(1001), + id: DeclarationId(1002), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())), type_params: vec![], @@ -35179,26 +33455,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5186, 5379), }); declarations.push(Declaration { - id: DeclarationId(1002), + id: DeclarationId(1003), name: Some("div_dimension_scalar".to_string()), connective: TypeConnective::Arrow { inputs: vec![ -<<<<<<< HEAD - DeclarationId(2257), - DeclarationId(2258), - DeclarationId(1004), - ], - output: DeclarationId(2259), -======= - DeclarationId(2264), DeclarationId(2265), - DeclarationId(1004), + DeclarationId(2266), + DeclarationId(1005), ], - output: DeclarationId(2266), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2267), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)), }, - type_params: vec![DeclarationId(1003), DeclarationId(1004)], + type_params: vec![DeclarationId(1004), DeclarationId(1005)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -35209,7 +33477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574), }); declarations.push(Declaration { - id: DeclarationId(1003), + id: DeclarationId(1004), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Unit".to_string())), type_params: vec![], @@ -35223,7 +33491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574), }); declarations.push(Declaration { - id: DeclarationId(1004), + id: DeclarationId(1005), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())), type_params: vec![], @@ -35237,7 +33505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5381, 5574), }); declarations.push(Declaration { - id: DeclarationId(1005), + id: DeclarationId(1006), name: Some("EmissionRule".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -35254,25 +33522,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emission_provenance.dag", 2797, 2823), }); declarations.push(Declaration { - id: DeclarationId(1006), + id: DeclarationId(1007), name: Some("OptionalSourceSpan".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "NoSourceSpan".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2276), - }, - Field { - label: "SomeSourceSpan".to_string(), - ty: DeclarationId(2277), -======= - ty: DeclarationId(2283), + ty: DeclarationId(2284), }, Field { label: "SomeSourceSpan".to_string(), - ty: DeclarationId(2284), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2285), }, ], }, @@ -35287,7 +33547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3681, 3762), }); declarations.push(Declaration { - id: DeclarationId(1007), + id: DeclarationId(1008), name: Some("EmissionProvenance".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -35297,11 +33557,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "rule".to_string(), - ty: DeclarationId(1005), + ty: DeclarationId(1006), }, Field { label: "source_span".to_string(), - ty: DeclarationId(1006), + ty: DeclarationId(1007), }, ], }, @@ -35316,17 +33576,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emission_provenance.dag", 4898, 5008), }); declarations.push(Declaration { - id: DeclarationId(1008), + id: DeclarationId(1009), name: Some("TypeRealization".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "target".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "carrier".to_string(), @@ -35338,11 +33598,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fields".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2278), -======= - ty: DeclarationId(2285), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2286), }, Field { label: "cost".to_string(), @@ -35361,29 +33617,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 736, 887), }); declarations.push(Declaration { - id: DeclarationId(1009), + id: DeclarationId(1010), name: Some("TargetIntegerTypeInhabitance".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "kernel_integer".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "algebra".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "bound".to_string(), - ty: DeclarationId(1010), + ty: DeclarationId(1011), }, Field { label: "type_realization".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, ], }, @@ -35398,33 +33654,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 2385, 2840), }); declarations.push(Declaration { - id: DeclarationId(1010), + id: DeclarationId(1011), name: Some("TargetIntegerInhabitanceBound".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "BoundUnspecified".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2279), - }, - Field { - label: "StaticBoundFact".to_string(), - ty: DeclarationId(2280), -======= - ty: DeclarationId(2286), - }, - Field { - label: "StaticBoundFact".to_string(), ty: DeclarationId(2287), }, Field { - label: "PlatformDependentFact".to_string(), + label: "StaticBoundFact".to_string(), ty: DeclarationId(2288), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "PlatformDependentFact".to_string(), - ty: DeclarationId(2281), + ty: DeclarationId(2289), }, ], }, @@ -35439,7 +33683,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4334, 4686), }); declarations.push(Declaration { - id: DeclarationId(1011), + id: DeclarationId(1012), name: Some("FieldBinding".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -35449,7 +33693,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "access".to_string(), - ty: DeclarationId(1012), + ty: DeclarationId(1013), }, Field { label: "borrowed_read".to_string(), @@ -35468,25 +33712,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4688, 4772), }); declarations.push(Declaration { - id: DeclarationId(1012), + id: DeclarationId(1013), name: Some("FieldAccess".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "DirectField".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2282), - }, - Field { - label: "AccessorMethod".to_string(), - ty: DeclarationId(2283), -======= - ty: DeclarationId(2289), + ty: DeclarationId(2290), }, Field { label: "AccessorMethod".to_string(), - ty: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2291), }, ], }, @@ -35501,21 +33737,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 5155, 5222), }); declarations.push(Declaration { - id: DeclarationId(1013), + id: DeclarationId(1014), name: Some("OperatorRealization".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "target".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "op".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "carrier".to_string(), @@ -35538,17 +33774,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 5224, 5355), }); declarations.push(Declaration { - id: DeclarationId(1014), + id: DeclarationId(1015), name: Some("BehaviorRealization".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "target".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "carrier".to_string(), @@ -35571,29 +33807,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 5357, 5467), }); declarations.push(Declaration { - id: DeclarationId(1015), + id: DeclarationId(1016), name: Some("CallableRealization".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "target".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "strategy".to_string(), - ty: DeclarationId(1024), + ty: DeclarationId(1025), }, Field { label: "parameters".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2284), -======= - ty: DeclarationId(2291), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2292), }, Field { label: "cost".to_string(), @@ -35612,7 +33844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 5469, 5628), }); declarations.push(Declaration { - id: DeclarationId(1016), + id: DeclarationId(1017), name: Some("CallableParameter".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -35622,7 +33854,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "disposition".to_string(), - ty: DeclarationId(1017), + ty: DeclarationId(1018), }, ], }, @@ -35637,25 +33869,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6050, 6124), }); declarations.push(Declaration { - id: DeclarationId(1017), + id: DeclarationId(1018), name: Some("ParameterDisposition".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Borrowed".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2285), - }, - Field { - label: "Consumed".to_string(), - ty: DeclarationId(2286), -======= - ty: DeclarationId(2292), + ty: DeclarationId(2293), }, Field { label: "Consumed".to_string(), - ty: DeclarationId(2293), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2294), }, ], }, @@ -35670,25 +33894,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6581, 6632), }); declarations.push(Declaration { - id: DeclarationId(1018), + id: DeclarationId(1019), name: Some("StringOwnershipAxis".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Owned".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2287), - }, - Field { - label: "Borrowed".to_string(), - ty: DeclarationId(2288), -======= - ty: DeclarationId(2294), + ty: DeclarationId(2295), }, Field { label: "Borrowed".to_string(), - ty: DeclarationId(2295), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2296), }, ], }, @@ -35703,25 +33919,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7044, 7091), }); declarations.push(Declaration { - id: DeclarationId(1019), + id: DeclarationId(1020), name: Some("StringLifetimeAxis".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "SelfContained".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2289), - }, - Field { - label: "Caller".to_string(), - ty: DeclarationId(2290), -======= - ty: DeclarationId(2296), + ty: DeclarationId(2297), }, Field { label: "Caller".to_string(), - ty: DeclarationId(2297), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2298), }, ], }, @@ -35736,33 +33944,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7399, 7451), }); declarations.push(Declaration { - id: DeclarationId(1020), + id: DeclarationId(1021), name: Some("StringGrowabilityAxis".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Growable".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2291), - }, - Field { - label: "Fixed".to_string(), - ty: DeclarationId(2292), -======= - ty: DeclarationId(2298), - }, - Field { - label: "Fixed".to_string(), ty: DeclarationId(2299), }, Field { - label: "NotApplicable".to_string(), + label: "Fixed".to_string(), ty: DeclarationId(2300), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "NotApplicable".to_string(), - ty: DeclarationId(2293), + ty: DeclarationId(2301), }, ], }, @@ -35777,16 +33973,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7678, 7745), }); declarations.push(Declaration { - id: DeclarationId(1021), + id: DeclarationId(1022), name: Some("StringEncodingAxis".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "Utf8FreeMonoidChar".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2294), -======= - ty: DeclarationId(2301), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2302), }], }, type_params: vec![], @@ -35800,37 +33992,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8054, 8100), }); declarations.push(Declaration { - id: DeclarationId(1022), + id: DeclarationId(1023), name: Some("StringFamilyInhabitanceRow".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "target_type".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "type_realization".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "ownership".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "lifetime".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "growability".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "encoding".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, ], }, @@ -35845,17 +34037,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8684, 8923), }); declarations.push(Declaration { - id: DeclarationId(1023), + id: DeclarationId(1024), name: Some("TypeInstantiationRealization".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "target".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "carrier".to_string(), @@ -35878,91 +34070,50 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8925, 9044), }); declarations.push(Declaration { - id: DeclarationId(1024), + id: DeclarationId(1025), name: Some("CallableStrategy".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ListEmpty".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2295), - }, - Field { - label: "ListSingleton".to_string(), - ty: DeclarationId(2296), - }, - Field { - label: "ListCons".to_string(), - ty: DeclarationId(2297), - }, - Field { - label: "ListConcat".to_string(), - ty: DeclarationId(2298), - }, - Field { - label: "ListLength".to_string(), - ty: DeclarationId(2299), - }, - Field { - label: "ListIsEmpty".to_string(), - ty: DeclarationId(2300), - }, - Field { - label: "ListFold".to_string(), - ty: DeclarationId(2301), - }, - Field { - label: "ListMap".to_string(), - ty: DeclarationId(2302), - }, - Field { - label: "ListFilter".to_string(), ty: DeclarationId(2303), }, - Field { - label: "ListContains".to_string(), - ty: DeclarationId(2304), - }, -======= - ty: DeclarationId(2302), - }, Field { label: "ListSingleton".to_string(), - ty: DeclarationId(2303), + ty: DeclarationId(2304), }, Field { label: "ListCons".to_string(), - ty: DeclarationId(2304), + ty: DeclarationId(2305), }, Field { label: "ListConcat".to_string(), - ty: DeclarationId(2305), + ty: DeclarationId(2306), }, Field { label: "ListLength".to_string(), - ty: DeclarationId(2306), + ty: DeclarationId(2307), }, Field { label: "ListIsEmpty".to_string(), - ty: DeclarationId(2307), + ty: DeclarationId(2308), }, Field { label: "ListFold".to_string(), - ty: DeclarationId(2308), + ty: DeclarationId(2309), }, Field { label: "ListMap".to_string(), - ty: DeclarationId(2309), + ty: DeclarationId(2310), }, Field { label: "ListFilter".to_string(), - ty: DeclarationId(2310), + ty: DeclarationId(2311), }, Field { label: "ListContains".to_string(), - ty: DeclarationId(2311), + ty: DeclarationId(2312), }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -35976,29 +34127,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9449, 9618), }); declarations.push(Declaration { - id: DeclarationId(1025), + id: DeclarationId(1026), name: Some("PatternRealization".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "target".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "strategy".to_string(), - ty: DeclarationId(1026), + ty: DeclarationId(1027), }, Field { label: "empty_variant".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "cons_variant".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "scrutinee".to_string(), @@ -36037,25 +34188,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 11557, 11846), }); declarations.push(Declaration { - id: DeclarationId(1026), + id: DeclarationId(1027), name: Some("PatternStrategy".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "PlaceholderPatternStrategy".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2305), - }, - Field { - label: "VectorList".to_string(), - ty: DeclarationId(2306), -======= - ty: DeclarationId(2312), + ty: DeclarationId(2313), }, Field { label: "VectorList".to_string(), - ty: DeclarationId(2313), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2314), }, ], }, @@ -36070,7 +34213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12286, 12352), }); declarations.push(Declaration { - id: DeclarationId(1027), + id: DeclarationId(1028), name: Some("StatementSyntax".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -36095,7 +34238,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12354, 12431), }); declarations.push(Declaration { - id: DeclarationId(1028), + id: DeclarationId(1029), name: Some("ExpressionSyntax".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -36124,7 +34267,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12433, 12523), }); declarations.push(Declaration { - id: DeclarationId(1029), + id: DeclarationId(1030), name: Some("ForEachSyntax".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -36149,7 +34292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12525, 12584), }); declarations.push(Declaration { - id: DeclarationId(1030), + id: DeclarationId(1031), name: Some("ControlFlowSyntax".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -36163,7 +34306,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "for_each_syntax".to_string(), - ty: DeclarationId(1029), + ty: DeclarationId(1030), }, ], }, @@ -36178,7 +34321,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12586, 12683), }); declarations.push(Declaration { - id: DeclarationId(1031), + id: DeclarationId(1032), name: Some("LiteralSyntax".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -36207,7 +34350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12685, 12781), }); declarations.push(Declaration { - id: DeclarationId(1032), + id: DeclarationId(1033), name: Some("ModuleSyntax".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -36226,7 +34369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12783, 12829), }); declarations.push(Declaration { - id: DeclarationId(1033), + id: DeclarationId(1034), name: Some("FunctionSyntax".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -36263,7 +34406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12831, 12983), }); declarations.push(Declaration { - id: DeclarationId(1034), + id: DeclarationId(1035), name: Some("TypeApplicationSyntax".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -36282,7 +34425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12985, 13034), }); declarations.push(Declaration { - id: DeclarationId(1035), + id: DeclarationId(1036), name: Some("TypeDefinitionSyntax".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -36319,7 +34462,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 13248, 13396), }); declarations.push(Declaration { - id: DeclarationId(1036), + id: DeclarationId(1037), name: Some("RecordDeriveTemplateBundle".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -36344,7 +34487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 14057, 14150), }); declarations.push(Declaration { - id: DeclarationId(1037), + id: DeclarationId(1038), name: Some("PatternMatchSyntax".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -36393,45 +34536,45 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 14854, 15094), }); declarations.push(Declaration { - id: DeclarationId(1038), + id: DeclarationId(1039), name: Some("CollectionOps".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "concat_contract".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "length_contract".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "is_empty_contract".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "fold_contract".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "filter_contract".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "flat_map_contract".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "any_contract".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "all_contract".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "map_contract".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "filter".to_string(), @@ -36466,7 +34609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 15096, 16332), }); declarations.push(Declaration { - id: DeclarationId(1039), + id: DeclarationId(1040), name: Some("ValueConstructionSyntax".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -36503,17 +34646,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 16334, 16520), }); declarations.push(Declaration { - id: DeclarationId(1040), + id: DeclarationId(1041), name: Some("RenderingModel".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "read".to_string(), - ty: DeclarationId(1041), + ty: DeclarationId(1042), }, Field { label: "construct".to_string(), - ty: DeclarationId(1042), + ty: DeclarationId(1043), }, ], }, @@ -36528,25 +34671,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 16522, 16597), }); declarations.push(Declaration { - id: DeclarationId(1041), + id: DeclarationId(1042), name: Some("ReadStrategy".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Borrow".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2307), - }, - Field { - label: "PassByValue".to_string(), - ty: DeclarationId(2308), -======= - ty: DeclarationId(2314), + ty: DeclarationId(2315), }, Field { label: "PassByValue".to_string(), - ty: DeclarationId(2315), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2316), }, ], }, @@ -36561,25 +34696,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17095, 17139), }); declarations.push(Declaration { - id: DeclarationId(1042), + id: DeclarationId(1043), name: Some("ConstructStrategy".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "CopyOrClone".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2309), - }, - Field { - label: "PassByValue".to_string(), - ty: DeclarationId(2310), -======= - ty: DeclarationId(2316), + ty: DeclarationId(2317), }, Field { label: "PassByValue".to_string(), - ty: DeclarationId(2317), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2318), }, ], }, @@ -36594,57 +34721,57 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17432, 17486), }); declarations.push(Declaration { - id: DeclarationId(1043), + id: DeclarationId(1044), name: Some("LanguageSpec".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "statements".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "expressions".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "control_flow".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "literals".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "modules".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "functions".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "type_applications".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "type_definitions".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "record_derive_templates".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "patterns".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "collection_ops".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "values".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, ], }, @@ -36659,25 +34786,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17488, 18014), }); declarations.push(Declaration { - id: DeclarationId(1044), + id: DeclarationId(1045), name: Some("PlaceholderConvention".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "IndexedArgs".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2311), - }, - Field { - label: "NamedArg".to_string(), - ty: DeclarationId(2312), -======= - ty: DeclarationId(2318), + ty: DeclarationId(2319), }, Field { label: "NamedArg".to_string(), - ty: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2320), }, ], }, @@ -36692,25 +34811,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 19388, 19443), }); declarations.push(Declaration { - id: DeclarationId(1045), + id: DeclarationId(1046), name: Some("MethodEmitTemplate".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "SingleTemplate".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2313), - }, - Field { - label: "HigherOrderTemplates".to_string(), - ty: DeclarationId(2314), -======= - ty: DeclarationId(2320), + ty: DeclarationId(2321), }, Field { label: "HigherOrderTemplates".to_string(), - ty: DeclarationId(2321), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2322), }, ], }, @@ -36725,7 +34836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 20578, 20734), }); declarations.push(Declaration { - id: DeclarationId(1046), + id: DeclarationId(1047), name: Some("MethodTemplateContract".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -36739,7 +34850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "emit_template".to_string(), - ty: DeclarationId(1045), + ty: DeclarationId(1046), }, Field { label: "wraps_result".to_string(), @@ -36747,7 +34858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "placeholder_convention".to_string(), - ty: DeclarationId(1044), + ty: DeclarationId(1045), }, ], }, @@ -36762,7 +34873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 22527, 22714), }); declarations.push(Declaration { - id: DeclarationId(1047), + id: DeclarationId(1048), name: Some("BootstrapFixture".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -36781,45 +34892,45 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1395, 1443), }); declarations.push(Declaration { - id: DeclarationId(1048), + id: DeclarationId(1049), name: Some("BootstrapFixtureSet".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "rust_pilot_primitives".to_string(), - ty: DeclarationId(1047), + ty: DeclarationId(1048), }, Field { label: "rust_method_template_contracts".to_string(), - ty: DeclarationId(1047), + ty: DeclarationId(1048), }, Field { label: "python_method_template_contracts".to_string(), - ty: DeclarationId(1047), + ty: DeclarationId(1048), }, Field { label: "go_method_template_contracts".to_string(), - ty: DeclarationId(1047), + ty: DeclarationId(1048), }, Field { label: "anthropic_operations".to_string(), - ty: DeclarationId(1047), + ty: DeclarationId(1048), }, Field { label: "cross_target_coverage".to_string(), - ty: DeclarationId(1047), + ty: DeclarationId(1048), }, Field { label: "extdeps_cron".to_string(), - ty: DeclarationId(1047), + ty: DeclarationId(1048), }, Field { label: "extdeps_github_github".to_string(), - ty: DeclarationId(1047), + ty: DeclarationId(1048), }, Field { label: "extdeps_github_actions".to_string(), - ty: DeclarationId(1047), + ty: DeclarationId(1048), }, ], }, @@ -36834,15 +34945,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 1600, 2024), }); declarations.push(Declaration { - id: DeclarationId(1049), + id: DeclarationId(1050), name: Some("bootstrap_fixture_authority".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1048), + template: DeclarationId(1049), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1048)), + meta_tag: Some(DeclarationId(1049)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -36935,15 +35046,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/extdeps_bootstrap_fixtures.dag", 2026, 2920), }); declarations.push(Declaration { - id: DeclarationId(1050), + id: DeclarationId(1051), name: Some("go_language_spec_free_monoid_concat_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -36964,11 +35075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "append({left}, {right}...)".to_string(), ))], @@ -36981,11 +35088,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -36996,15 +35099,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 3213, 3515), }); declarations.push(Declaration { - id: DeclarationId(1051), + id: DeclarationId(1052), name: Some("go_language_spec_free_monoid_length_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -37023,11 +35126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "int64(len({recv}))".to_string(), ))], @@ -37040,11 +35139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -37055,15 +35150,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 3517, 3803), }); declarations.push(Declaration { - id: DeclarationId(1052), + id: DeclarationId(1053), name: Some("go_language_spec_free_monoid_emptiness_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -37082,11 +35177,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv}) == 0".to_string(), ))], @@ -37099,11 +35190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -37114,15 +35201,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 3895, 4182), }); declarations.push(Declaration { - id: DeclarationId(1053), + id: DeclarationId(1054), name: Some("go_language_spec_free_monoid_fold_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -37143,11 +35230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "/* fold({recv}, {init}, {body}) */".to_string(), ))], @@ -37160,11 +35243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -37175,15 +35254,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 4617, 4931), }); declarations.push(Declaration { - id: DeclarationId(1054), + id: DeclarationId(1055), name: Some("go_language_spec_map_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -37204,11 +35283,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "/* map({recv}, {body}) */".to_string(), ))], @@ -37221,11 +35296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -37236,15 +35307,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 5417, 5699), }); declarations.push(Declaration { - id: DeclarationId(1055), + id: DeclarationId(1056), name: Some("go_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -37265,11 +35336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Filter({recv}, {arg})".to_string(), ))], @@ -37282,11 +35349,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -37297,15 +35360,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 5701, 5993), }); declarations.push(Declaration { - id: DeclarationId(1056), + id: DeclarationId(1057), name: Some("go_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -37326,11 +35389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Any({recv}, {arg})".to_string(), ))], @@ -37343,11 +35402,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -37358,15 +35413,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 5995, 6275), }); declarations.push(Declaration { - id: DeclarationId(1057), + id: DeclarationId(1058), name: Some("go_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -37387,11 +35442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.All({recv}, {arg})".to_string(), ))], @@ -37404,11 +35455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -37419,15 +35466,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6277, 6557), }); declarations.push(Declaration { - id: DeclarationId(1058), + id: DeclarationId(1059), name: Some("go_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -37448,11 +35495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.FlatMap({recv}, {arg})".to_string(), ))], @@ -37465,11 +35508,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -37480,26 +35519,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6559, 6857), }); declarations.push(Declaration { - id: DeclarationId(1059), + id: DeclarationId(1060), name: Some("go_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1046), + value: DeclarationId(1047), }], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(2315)), -======= - meta_tag: Some(DeclarationId(2322)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + meta_tag: Some(DeclarationId(2323)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -37518,11 +35549,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -37535,11 +35562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -37561,11 +35584,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Join({recv}, {arg})".to_string(), ))], @@ -37578,11 +35597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -37604,11 +35619,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Split({recv}, {arg})".to_string(), ))], @@ -37621,19 +35632,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), ]), - FieldValue::Reference(DeclarationId(1055)), FieldValue::Reference(DeclarationId(1056)), FieldValue::Reference(DeclarationId(1057)), FieldValue::Reference(DeclarationId(1058)), + FieldValue::Reference(DeclarationId(1059)), FieldValue::Record(vec![ ( "dag_method".to_string(), @@ -37649,11 +35656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[{arg}:]".to_string(), ))], @@ -37666,11 +35669,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -37690,11 +35689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[:{arg}]".to_string(), ))], @@ -37707,11 +35702,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -37733,11 +35724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.SortBy({recv}, {arg})".to_string(), ))], @@ -37750,11 +35737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -37776,11 +35759,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "append({recv}, {arg})".to_string(), ))], @@ -37793,11 +35772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -37819,11 +35794,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Contains({recv}, {arg})".to_string(), ))], @@ -37836,11 +35807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -37851,49 +35818,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6859, 8941), }); declarations.push(Declaration { - id: DeclarationId(1060), + id: DeclarationId(1061), name: Some("RecursionShape".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "DirectRecursion".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2329), - }, - Field { - label: "ListRecursion".to_string(), - ty: DeclarationId(2330), - }, - Field { - label: "OptionalRecursion".to_string(), - ty: DeclarationId(2331), - }, - Field { - label: "SetRecursion".to_string(), - ty: DeclarationId(2332), -======= - ty: DeclarationId(2336), - }, - Field { - label: "ListRecursion".to_string(), ty: DeclarationId(2337), }, Field { - label: "OptionalRecursion".to_string(), + label: "ListRecursion".to_string(), ty: DeclarationId(2338), }, Field { - label: "SetRecursion".to_string(), + label: "OptionalRecursion".to_string(), ty: DeclarationId(2339), }, Field { - label: "MapValueRecursion".to_string(), + label: "SetRecursion".to_string(), ty: DeclarationId(2340), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "MapValueRecursion".to_string(), - ty: DeclarationId(2333), + ty: DeclarationId(2341), }, ], }, @@ -37908,7 +35855,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5605, 5878), }); declarations.push(Declaration { - id: DeclarationId(1061), + id: DeclarationId(1062), name: Some("InductiveField".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -37926,7 +35873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "shape".to_string(), - ty: DeclarationId(1060), + ty: DeclarationId(1061), }, Field { label: "element_type".to_string(), @@ -37945,10 +35892,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 7170, 7592), }); declarations.push(Declaration { - id: DeclarationId(1062), + id: DeclarationId(1063), name: Some("recursion_shape_eq".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1060), DeclarationId(1060)], + inputs: vec![DeclarationId(1061), DeclarationId(1061)], output: DeclarationId(128), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 7662, 8034)), }, @@ -37963,10 +35910,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 7594, 8034), }); declarations.push(Declaration { - id: DeclarationId(1063), + id: DeclarationId(1064), name: Some("inductive_field_eq".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1061), DeclarationId(1061)], + inputs: vec![DeclarationId(1062), DeclarationId(1062)], output: DeclarationId(128), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8104, 8302)), }, @@ -37981,11 +35928,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 8036, 8302), }); declarations.push(Declaration { - id: DeclarationId(1064), + id: DeclarationId(1065), name: Some("inductive_field_to_dimension".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1061), DeclarationId(230)], - output: DeclarationId(1211), + inputs: vec![DeclarationId(1062), DeclarationId(230)], + output: DeclarationId(1212), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8768, 8799)), }, type_params: vec![], @@ -37999,49 +35946,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 8678, 8799), }); declarations.push(Declaration { - id: DeclarationId(1065), + id: DeclarationId(1066), name: Some("SubValueRelation".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "StrictSubValue".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2334), - }, - Field { - label: "IteratedSubValue".to_string(), - ty: DeclarationId(2335), - }, - Field { - label: "ArithmeticDescent".to_string(), - ty: DeclarationId(2336), - }, - Field { - label: "PreservedValue".to_string(), - ty: DeclarationId(2337), -======= - ty: DeclarationId(2341), - }, - Field { - label: "IteratedSubValue".to_string(), ty: DeclarationId(2342), }, Field { - label: "ArithmeticDescent".to_string(), + label: "IteratedSubValue".to_string(), ty: DeclarationId(2343), }, Field { - label: "PreservedValue".to_string(), + label: "ArithmeticDescent".to_string(), ty: DeclarationId(2344), }, Field { - label: "SubValueUnknown".to_string(), + label: "PreservedValue".to_string(), ty: DeclarationId(2345), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "SubValueUnknown".to_string(), - ty: DeclarationId(2338), + ty: DeclarationId(2346), }, ], }, @@ -38056,11 +35983,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 9945, 10181), }); declarations.push(Declaration { - id: DeclarationId(1066), + id: DeclarationId(1067), name: Some("sub_value_to_evidence".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1065)], - output: DeclarationId(1204), + inputs: vec![DeclarationId(1066)], + output: DeclarationId(1205), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 11134, @@ -38078,10 +36005,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 11062, 11737), }); declarations.push(Declaration { - id: DeclarationId(1067), + id: DeclarationId(1068), name: Some("shrink_factor_eq".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(930), DeclarationId(930)], + inputs: vec![DeclarationId(931), DeclarationId(931)], output: DeclarationId(128), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", @@ -38100,11 +36027,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 12143, 12691), }); declarations.push(Declaration { - id: DeclarationId(1068), + id: DeclarationId(1069), name: Some("meet_sub_value".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1065), DeclarationId(1065)], - output: DeclarationId(1065), + inputs: vec![DeclarationId(1066), DeclarationId(1066)], + output: DeclarationId(1066), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 13282, @@ -38122,11 +36049,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 13202, 14694), }); declarations.push(Declaration { - id: DeclarationId(1069), + id: DeclarationId(1070), name: Some("join_sub_value".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1065), DeclarationId(1065)], - output: DeclarationId(1065), + inputs: vec![DeclarationId(1066), DeclarationId(1066)], + output: DeclarationId(1066), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 15026, @@ -38144,11 +36071,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 14946, 16329), }); declarations.push(Declaration { - id: DeclarationId(1070), + id: DeclarationId(1071), name: Some("compose_sub_value".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1065), DeclarationId(1061)], - output: DeclarationId(1065), + inputs: vec![DeclarationId(1066), DeclarationId(1062)], + output: DeclarationId(1066), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 17472, @@ -38166,11 +36093,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 17384, 17594), }); declarations.push(Declaration { - id: DeclarationId(1071), + id: DeclarationId(1072), name: Some("compose_sub_value_relations".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1065), DeclarationId(1065)], - output: DeclarationId(1065), + inputs: vec![DeclarationId(1066), DeclarationId(1066)], + output: DeclarationId(1066), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 18450, @@ -38188,15 +36115,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 18342, 19796), }); declarations.push(Declaration { - id: DeclarationId(1072), + id: DeclarationId(1073), name: Some("sub_value_to_call_pattern".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1065)], -<<<<<<< HEAD - output: DeclarationId(2316), -======= - output: DeclarationId(2323), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(1066)], + output: DeclarationId(2324), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 20571, @@ -38214,15 +36137,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 20498, 21367), }); declarations.push(Declaration { - id: DeclarationId(1073), + id: DeclarationId(1074), name: Some("sub_value_to_lowering_target".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1065)], -<<<<<<< HEAD - output: DeclarationId(2317), -======= - output: DeclarationId(2324), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(1066)], + output: DeclarationId(2325), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 21959, @@ -38240,41 +36159,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 21880, 22864), }); declarations.push(Declaration { - id: DeclarationId(1074), + id: DeclarationId(1075), name: Some("PolynomialExponent".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "IntegerExpZero".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2339), - }, - Field { - label: "IntegerExpPos".to_string(), - ty: DeclarationId(2340), - }, - Field { - label: "FractionExp".to_string(), - ty: DeclarationId(2341), -======= - ty: DeclarationId(2346), - }, - Field { - label: "IntegerExpPos".to_string(), ty: DeclarationId(2347), }, Field { - label: "FractionExp".to_string(), + label: "IntegerExpPos".to_string(), ty: DeclarationId(2348), }, Field { - label: "LogBasedExp".to_string(), + label: "FractionExp".to_string(), ty: DeclarationId(2349), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "LogBasedExp".to_string(), - ty: DeclarationId(2342), + ty: DeclarationId(2350), }, ], }, @@ -38289,11 +36192,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24107, 24362), }); declarations.push(Declaration { - id: DeclarationId(1075), + id: DeclarationId(1076), name: Some("poly_exp_degree_one".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1074), + output: DeclarationId(1075), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 24411, @@ -38311,25 +36214,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24364, 24450), }); declarations.push(Declaration { - id: DeclarationId(1076), + id: DeclarationId(1077), name: Some("AtomicCost".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "PolyCost".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2343), - }, - Field { - label: "LogCost".to_string(), - ty: DeclarationId(2344), -======= - ty: DeclarationId(2350), + ty: DeclarationId(2351), }, Field { label: "LogCost".to_string(), - ty: DeclarationId(2351), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2352), }, ], }, @@ -38344,65 +36239,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24962, 25079), }); declarations.push(Declaration { - id: DeclarationId(1077), + id: DeclarationId(1078), name: Some("CostBound".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ConstantBound".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2345), - }, - Field { - label: "AtomicBound".to_string(), - ty: DeclarationId(2346), - }, - Field { - label: "ProductBound".to_string(), - ty: DeclarationId(2348), - }, - Field { - label: "SumOfProductsBound".to_string(), - ty: DeclarationId(2351), - }, - Field { - label: "SumBound".to_string(), ty: DeclarationId(2353), }, - Field { - label: "ForeverBound".to_string(), - ty: DeclarationId(2354), -======= - ty: DeclarationId(2352), - }, Field { label: "AtomicBound".to_string(), - ty: DeclarationId(2353), + ty: DeclarationId(2354), }, Field { label: "ProductBound".to_string(), - ty: DeclarationId(2355), + ty: DeclarationId(2356), }, Field { label: "SumOfProductsBound".to_string(), - ty: DeclarationId(2358), + ty: DeclarationId(2359), }, Field { label: "SumBound".to_string(), - ty: DeclarationId(2360), - }, - Field { - label: "ForeverBound".to_string(), ty: DeclarationId(2361), }, Field { - label: "ErrorBound".to_string(), + label: "ForeverBound".to_string(), ty: DeclarationId(2362), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ErrorBound".to_string(), - ty: DeclarationId(2355), + ty: DeclarationId(2363), }, ], }, @@ -38417,15 +36284,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26709, 27469), }); declarations.push(Declaration { - id: DeclarationId(1078), + id: DeclarationId(1079), name: Some("sum_bound".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(2318)], -======= - inputs: vec![DeclarationId(2325)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1077), + inputs: vec![DeclarationId(2326)], + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 27880, @@ -38443,10 +36306,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27830, 27986), }); declarations.push(Declaration { - id: DeclarationId(1079), + id: DeclarationId(1080), name: Some("cost_bound_is_sum_bound".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1077)], + inputs: vec![DeclarationId(1078)], output: DeclarationId(128), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", @@ -38465,15 +36328,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 28261, 28563), }); declarations.push(Declaration { - id: DeclarationId(1080), + id: DeclarationId(1081), name: Some("cost_bound_to_symbolic".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1077)], -<<<<<<< HEAD + inputs: vec![DeclarationId(1078)], output: DeclarationId(849), -======= - output: DeclarationId(848), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(544))), }, type_params: vec![], @@ -38487,15 +36346,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 29000, 29517), }); declarations.push(Declaration { - id: DeclarationId(1081), + id: DeclarationId(1082), name: Some("atomic_cost_to_symbolic".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1076)], -<<<<<<< HEAD + inputs: vec![DeclarationId(1077)], output: DeclarationId(849), -======= - output: DeclarationId(848), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(553))), }, type_params: vec![], @@ -38509,16 +36364,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 29519, 29839), }); declarations.push(Declaration { - id: DeclarationId(1082), + id: DeclarationId(1083), name: Some("product_atoms_to_symbolic".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(2319)], + inputs: vec![DeclarationId(2327)], output: DeclarationId(849), -======= - inputs: vec![DeclarationId(2326)], - output: DeclarationId(848), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 29913, @@ -38536,16 +36386,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 29841, 29949), }); declarations.push(Declaration { - id: DeclarationId(1083), + id: DeclarationId(1084), name: Some("product_term_to_symbolic".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(2320)], + inputs: vec![DeclarationId(2328)], output: DeclarationId(849), -======= - inputs: vec![DeclarationId(2327)], - output: DeclarationId(848), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(555))), }, type_params: vec![], @@ -38559,16 +36404,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 29951, 30060), }); declarations.push(Declaration { - id: DeclarationId(1084), + id: DeclarationId(1085), name: Some("sum_products_to_symbolic".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(2322)], + inputs: vec![DeclarationId(2330)], output: DeclarationId(849), -======= - inputs: vec![DeclarationId(2329)], - output: DeclarationId(848), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 30137, @@ -38586,11 +36426,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 30062, 30172), }); declarations.push(Declaration { - id: DeclarationId(1085), + id: DeclarationId(1086), name: Some("cost_constant".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 30206, @@ -38608,11 +36448,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 30174, 30223), }); declarations.push(Declaration { - id: DeclarationId(1086), + id: DeclarationId(1087), name: Some("cost_linear".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 30267, @@ -38630,11 +36470,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 30224, 30351), }); declarations.push(Declaration { - id: DeclarationId(1087), + id: DeclarationId(1088), name: Some("cost_poly".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230), DeclarationId(93)], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 30406, @@ -38652,11 +36492,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 30352, 30805), }); declarations.push(Declaration { - id: DeclarationId(1088), + id: DeclarationId(1089), name: Some("cost_root".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230), DeclarationId(93)], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 30855, @@ -38674,11 +36514,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 30806, 31129), }); declarations.push(Declaration { - id: DeclarationId(1089), + id: DeclarationId(1090), name: Some("cost_sqrt".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 31171, @@ -38696,11 +36536,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 31130, 31204), }); declarations.push(Declaration { - id: DeclarationId(1090), + id: DeclarationId(1091), name: Some("cost_cbrt".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 31246, @@ -38718,11 +36558,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 31205, 31279), }); declarations.push(Declaration { - id: DeclarationId(1091), + id: DeclarationId(1092), name: Some("cost_log".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 31320, @@ -38740,11 +36580,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 31280, 31370), }); declarations.push(Declaration { - id: DeclarationId(1092), + id: DeclarationId(1093), name: Some("cost_nlogn".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 31414, @@ -38762,11 +36602,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 31372, 31532), }); declarations.push(Declaration { - id: DeclarationId(1093), + id: DeclarationId(1094), name: Some("cost_graph_linear".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230), DeclarationId(230)], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 31602, @@ -38784,7 +36624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 31534, 31778), }); declarations.push(Declaration { - id: DeclarationId(1094), + id: DeclarationId(1095), name: Some("RecurrenceForm".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -38817,15 +36657,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 32935, 33026), }); declarations.push(Declaration { - id: DeclarationId(1095), + id: DeclarationId(1096), name: Some("int_add_checked".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93), DeclarationId(93)], -<<<<<<< HEAD - output: DeclarationId(2323), -======= - output: DeclarationId(2330), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2331), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 33617, @@ -38843,15 +36679,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33574, 33868), }); declarations.push(Declaration { - id: DeclarationId(1096), + id: DeclarationId(1097), name: Some("int_mul_checked".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93), DeclarationId(93)], -<<<<<<< HEAD - output: DeclarationId(2324), -======= - output: DeclarationId(2331), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2332), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 33913, @@ -38869,15 +36701,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33870, 34702), }); declarations.push(Declaration { - id: DeclarationId(1097), + id: DeclarationId(1098), name: Some("bounded_int_pow_exponent".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93)], -<<<<<<< HEAD - output: DeclarationId(2325), -======= - output: DeclarationId(2332), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2333), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 35162, @@ -38895,15 +36723,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35118, 35285), }); declarations.push(Declaration { - id: DeclarationId(1098), + id: DeclarationId(1099), name: Some("int_pow_bounded".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93), DeclarationId(93)], -<<<<<<< HEAD - output: DeclarationId(2326), -======= - output: DeclarationId(2333), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2334), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 35637, @@ -38921,15 +36745,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35589, 36682), }); declarations.push(Declaration { - id: DeclarationId(1099), + id: DeclarationId(1100), name: Some("ceil_log".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93), DeclarationId(93)], -<<<<<<< HEAD - output: DeclarationId(2327), -======= - output: DeclarationId(2334), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2335), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 36900, @@ -38947,7 +36767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 36854, 37015), }); declarations.push(Declaration { - id: DeclarationId(1100), + id: DeclarationId(1101), name: Some("ceil_log_iter".to_string()), connective: TypeConnective::Arrow { inputs: vec![ @@ -38956,11 +36776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { DeclarationId(93), DeclarationId(93), ], -<<<<<<< HEAD - output: DeclarationId(2328), -======= - output: DeclarationId(2335), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2336), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 37172, @@ -38978,11 +36794,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 37101, 37534), }); declarations.push(Declaration { - id: DeclarationId(1101), + id: DeclarationId(1102), name: Some("master_theorem".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1094)], - output: DeclarationId(1077), + inputs: vec![DeclarationId(1095)], + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 37589, @@ -39000,11 +36816,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 37536, 39626), }); declarations.push(Declaration { - id: DeclarationId(1102), + id: DeclarationId(1103), name: Some("catamorphism_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230), DeclarationId(93)], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 39979, @@ -39022,16 +36838,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 39909, 40137), }); declarations.push(Declaration { - id: DeclarationId(1103), + id: DeclarationId(1104), name: Some("derive_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![ DeclarationId(230), DeclarationId(93), - DeclarationId(930), + DeclarationId(931), DeclarationId(93), ], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 40636, @@ -39049,11 +36865,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 40535, 41660), }); declarations.push(Declaration { - id: DeclarationId(1104), + id: DeclarationId(1105), name: Some("tree_traversal_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 41993, @@ -39071,11 +36887,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 41954, 42050), }); declarations.push(Declaration { - id: DeclarationId(1105), + id: DeclarationId(1106), name: Some("nested_iteration_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 42093, @@ -39093,11 +36909,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 42052, 42151), }); declarations.push(Declaration { - id: DeclarationId(1106), + id: DeclarationId(1107), name: Some("linear_scan_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 42251, @@ -39115,11 +36931,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 42215, 42306), }); declarations.push(Declaration { - id: DeclarationId(1107), + id: DeclarationId(1108), name: Some("binary_search_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 42503, @@ -39137,11 +36953,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 42465, 42618), }); declarations.push(Declaration { - id: DeclarationId(1108), + id: DeclarationId(1109), name: Some("mergesort_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 42698, @@ -39159,11 +36975,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 42664, 42813), }); declarations.push(Declaration { - id: DeclarationId(1109), + id: DeclarationId(1110), name: Some("karatsuba_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 42980, @@ -39181,11 +36997,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 42946, 43099), }); declarations.push(Declaration { - id: DeclarationId(1110), + id: DeclarationId(1111), name: Some("strassen_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 43264, @@ -39203,11 +37019,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 43231, 43378), }); declarations.push(Declaration { - id: DeclarationId(1111), + id: DeclarationId(1112), name: Some("trial_division_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 43495, @@ -39225,11 +37041,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 43456, 43520), }); declarations.push(Declaration { - id: DeclarationId(1112), + id: DeclarationId(1113), name: Some("cube_root_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 43555, @@ -39247,11 +37063,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 43521, 43580), }); declarations.push(Declaration { - id: DeclarationId(1113), + id: DeclarationId(1114), name: Some("kth_root_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93)], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 43662, @@ -39269,11 +37085,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 43623, 43693), }); declarations.push(Declaration { - id: DeclarationId(1114), + id: DeclarationId(1115), name: Some("bfs_dfs_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 43929, @@ -39291,11 +37107,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 43897, 43980), }); declarations.push(Declaration { - id: DeclarationId(1115), + id: DeclarationId(1116), name: Some("dijkstra_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 44071, @@ -39313,11 +37129,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 44038, 44353), }); declarations.push(Declaration { - id: DeclarationId(1116), + id: DeclarationId(1117), name: Some("bellman_ford_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 44456, @@ -39335,11 +37151,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 44419, 44616), }); declarations.push(Declaration { - id: DeclarationId(1117), + id: DeclarationId(1118), name: Some("floyd_warshall_bound".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1077), + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 44723, @@ -39357,26 +37173,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 44684, 44761), }); declarations.push(Declaration { - id: DeclarationId(1118), + id: DeclarationId(1119), name: Some("signed_int_diagnostic_order".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1290), + value: DeclarationId(1291), }], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(2356)), -======= - meta_tag: Some(DeclarationId(2363)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + meta_tag: Some(DeclarationId(2364)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -39391,26 +37199,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1200, 1304), }); declarations.push(Declaration { - id: DeclarationId(1119), + id: DeclarationId(1120), name: Some("unsigned_int_diagnostic_order".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1290), + value: DeclarationId(1291), }], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(2357)), -======= - meta_tag: Some(DeclarationId(2364)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + meta_tag: Some(DeclarationId(2365)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -39425,7 +37225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1378, 1489), }); declarations.push(Declaration { - id: DeclarationId(1120), + id: DeclarationId(1121), name: Some("Lens".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -39435,47 +37235,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "read".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2359), - }, - Field { - label: "sequential".to_string(), - ty: DeclarationId(2360), - }, - Field { - label: "branch".to_string(), - ty: DeclarationId(2361), - }, - Field { - label: "iterate".to_string(), - ty: DeclarationId(2362), -======= - ty: DeclarationId(2366), - }, - Field { - label: "sequential".to_string(), ty: DeclarationId(2367), }, Field { - label: "branch".to_string(), + label: "sequential".to_string(), ty: DeclarationId(2368), }, Field { - label: "iterate".to_string(), + label: "branch".to_string(), ty: DeclarationId(2369), }, Field { - label: "validate".to_string(), + label: "iterate".to_string(), ty: DeclarationId(2370), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "validate".to_string(), - ty: DeclarationId(2363), + ty: DeclarationId(2371), }, ], }, - type_params: vec![DeclarationId(1121)], + type_params: vec![DeclarationId(1122)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -39486,7 +37266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318), }); declarations.push(Declaration { - id: DeclarationId(1121), + id: DeclarationId(1122), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("C".to_string())), type_params: vec![], @@ -39500,25 +37280,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4121, 4318), }); declarations.push(Declaration { - id: DeclarationId(1122), + id: DeclarationId(1123), name: Some("SectionRef".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "DeclarationScope".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2364), - }, - Field { - label: "NodeScope".to_string(), - ty: DeclarationId(2365), -======= - ty: DeclarationId(2371), + ty: DeclarationId(2372), }, Field { label: "NodeScope".to_string(), - ty: DeclarationId(2372), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2373), }, ], }, @@ -39533,16 +37305,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 3285, 3418), }); declarations.push(Declaration { - id: DeclarationId(1123), + id: DeclarationId(1124), name: Some("DiagnosticSeverity".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "Error".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2366), -======= - ty: DeclarationId(2373), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2374), }], }, type_params: vec![], @@ -39556,29 +37324,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 4271, 4302), }); declarations.push(Declaration { - id: DeclarationId(1124), + id: DeclarationId(1125), name: Some("LensEnforcement".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "project".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2367), - }, - Field { - label: "violates".to_string(), - ty: DeclarationId(2368), -======= - ty: DeclarationId(2374), + ty: DeclarationId(2375), }, Field { label: "violates".to_string(), - ty: DeclarationId(2375), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2376), }, ], }, - type_params: vec![DeclarationId(1125), DeclarationId(1126)], + type_params: vec![DeclarationId(1126), DeclarationId(1127)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -39589,7 +37349,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 5251, 5362), }); declarations.push(Declaration { - id: DeclarationId(1125), + id: DeclarationId(1126), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())), type_params: vec![], @@ -39603,7 +37363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 5251, 5362), }); declarations.push(Declaration { - id: DeclarationId(1126), + id: DeclarationId(1127), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())), type_params: vec![], @@ -39617,29 +37377,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 5251, 5362), }); declarations.push(Declaration { - id: DeclarationId(1127), + id: DeclarationId(1128), name: Some("EnforceableLens".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "lens".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2369), - }, - Field { - label: "enforcement".to_string(), - ty: DeclarationId(2370), -======= - ty: DeclarationId(2376), + ty: DeclarationId(2377), }, Field { label: "enforcement".to_string(), - ty: DeclarationId(2377), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2378), }, ], }, - type_params: vec![DeclarationId(1128), DeclarationId(1129)], + type_params: vec![DeclarationId(1129), DeclarationId(1130)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -39650,7 +37402,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 7313, 7421), }); declarations.push(Declaration { - id: DeclarationId(1128), + id: DeclarationId(1129), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())), type_params: vec![], @@ -39664,7 +37416,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 7313, 7421), }); declarations.push(Declaration { - id: DeclarationId(1129), + id: DeclarationId(1130), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())), type_params: vec![], @@ -39678,29 +37430,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 7313, 7421), }); declarations.push(Declaration { - id: DeclarationId(1130), + id: DeclarationId(1131), name: Some("EnforcedApplication".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "enforceable_lens".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2371), -======= - ty: DeclarationId(2378), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2379), }, Field { label: "section".to_string(), - ty: DeclarationId(1122), + ty: DeclarationId(1123), }, Field { label: "budget".to_string(), - ty: DeclarationId(1132), + ty: DeclarationId(1133), }, Field { label: "diagnostic_severity".to_string(), - ty: DeclarationId(1123), + ty: DeclarationId(1124), }, Field { label: "span".to_string(), @@ -39708,7 +37456,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, ], }, - type_params: vec![DeclarationId(1131), DeclarationId(1132)], + type_params: vec![DeclarationId(1132), DeclarationId(1133)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -39719,7 +37467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 9030, 9226), }); declarations.push(Declaration { - id: DeclarationId(1131), + id: DeclarationId(1132), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())), type_params: vec![], @@ -39733,7 +37481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 9030, 9226), }); declarations.push(Declaration { - id: DeclarationId(1132), + id: DeclarationId(1133), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Budget".to_string())), type_params: vec![], @@ -39747,21 +37495,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 9030, 9226), }); declarations.push(Declaration { - id: DeclarationId(1133), + id: DeclarationId(1134), name: Some("IntrospectApplication".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "lens".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2372), -======= - ty: DeclarationId(2379), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2380), }, Field { label: "section".to_string(), - ty: DeclarationId(1122), + ty: DeclarationId(1123), }, Field { label: "span".to_string(), @@ -39769,7 +37513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, ], }, - type_params: vec![DeclarationId(1134)], + type_params: vec![DeclarationId(1135)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -39780,7 +37524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 10099, 10199), }); declarations.push(Declaration { - id: DeclarationId(1134), + id: DeclarationId(1135), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Output".to_string())), type_params: vec![], @@ -39794,29 +37538,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 10099, 10199), }); declarations.push(Declaration { - id: DeclarationId(1135), + id: DeclarationId(1136), name: Some("Lookup".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Miss".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2375), - }, - Field { - label: "Hit".to_string(), - ty: DeclarationId(2376), -======= - ty: DeclarationId(2382), + ty: DeclarationId(2383), }, Field { label: "Hit".to_string(), - ty: DeclarationId(2383), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2384), }, ], }, - type_params: vec![DeclarationId(1136)], + type_params: vec![DeclarationId(1137)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -39827,7 +37563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4521, 4563), }); declarations.push(Declaration { - id: DeclarationId(1136), + id: DeclarationId(1137), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("value".to_string())), type_params: vec![], @@ -39841,15 +37577,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4521, 4563), }); declarations.push(Declaration { - id: DeclarationId(1137), + id: DeclarationId(1138), name: Some("miss_int_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![], -<<<<<<< HEAD - output: DeclarationId(2373), -======= - output: DeclarationId(2380), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2381), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4601, 4611)), }, type_params: vec![], @@ -39863,15 +37595,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4565, 4611), }); declarations.push(Declaration { - id: DeclarationId(1138), + id: DeclarationId(1139), name: Some("hit_int_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93)], -<<<<<<< HEAD - output: DeclarationId(2374), -======= - output: DeclarationId(2381), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2382), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4654, 4666)), }, type_params: vec![], @@ -39885,7 +37613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4613, 4666), }); declarations.push(Declaration { - id: DeclarationId(1139), + id: DeclarationId(1140), name: Some("DagDifference".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -39904,16 +37632,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 684, 723), }); declarations.push(Declaration { - id: DeclarationId(1140), + id: DeclarationId(1141), name: Some("SurfaceModule".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "items".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2377), -======= - ty: DeclarationId(2384), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2385), }], }, type_params: vec![], @@ -39927,7 +37651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1149, 1198), }); declarations.push(Declaration { - id: DeclarationId(1141), + id: DeclarationId(1142), name: Some("SurfaceParam".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -39937,15 +37661,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "ty".to_string(), - ty: DeclarationId(1145), + ty: DeclarationId(1146), }, Field { label: "refinement".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2378), -======= - ty: DeclarationId(2385), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2386), }, ], }, @@ -39960,7 +37680,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1200, 1281), }); declarations.push(Declaration { - id: DeclarationId(1142), + id: DeclarationId(1143), name: Some("SurfaceField".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -39970,7 +37690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "ty".to_string(), - ty: DeclarationId(1145), + ty: DeclarationId(1146), }, ], }, @@ -39985,7 +37705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1283, 1337), }); declarations.push(Declaration { - id: DeclarationId(1143), + id: DeclarationId(1144), name: Some("SurfaceVariant".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -39995,7 +37715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "payload".to_string(), - ty: DeclarationId(1144), + ty: DeclarationId(1145), }, Field { label: "span".to_string(), @@ -40014,25 +37734,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1339, 1422), }); declarations.push(Declaration { - id: DeclarationId(1144), + id: DeclarationId(1145), name: Some("VariantPayload".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Positional".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2380), - }, - Field { - label: "Record".to_string(), - ty: DeclarationId(2382), -======= - ty: DeclarationId(2387), + ty: DeclarationId(2388), }, Field { label: "Record".to_string(), - ty: DeclarationId(2389), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2390), }, ], }, @@ -40047,41 +37759,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1712, 1796), }); declarations.push(Declaration { - id: DeclarationId(1145), + id: DeclarationId(1146), name: Some("SurfaceType".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Named".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2383), - }, - Field { - label: "Parameterized".to_string(), - ty: DeclarationId(2385), -======= - ty: DeclarationId(2390), + ty: DeclarationId(2391), }, Field { label: "Parameterized".to_string(), - ty: DeclarationId(2392), - }, - Field { - label: "Optional".to_string(), ty: DeclarationId(2393), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Optional".to_string(), - ty: DeclarationId(2386), + ty: DeclarationId(2394), }, Field { label: "Arrow".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2388), -======= - ty: DeclarationId(2395), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2396), }, ], }, @@ -40096,7 +37792,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2052, 2379), }); declarations.push(Declaration { - id: DeclarationId(1146), + id: DeclarationId(1147), name: Some("SurfaceRecordField".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -40106,7 +37802,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "value".to_string(), - ty: DeclarationId(1152), + ty: DeclarationId(1153), }, Field { label: "span".to_string(), @@ -40125,7 +37821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2381, 2463), }); declarations.push(Declaration { - id: DeclarationId(1147), + id: DeclarationId(1148), name: Some("SurfaceMapEntry".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -40139,7 +37835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "value".to_string(), - ty: DeclarationId(1152), + ty: DeclarationId(1153), }, Field { label: "span".to_string(), @@ -40158,17 +37854,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3353, 3454), }); declarations.push(Declaration { - id: DeclarationId(1148), + id: DeclarationId(1149), name: Some("SurfaceMatchArm".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "pattern".to_string(), - ty: DeclarationId(1150), + ty: DeclarationId(1151), }, Field { label: "body".to_string(), - ty: DeclarationId(1152), + ty: DeclarationId(1153), }, Field { label: "span".to_string(), @@ -40187,7 +37883,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3456, 3545), }); declarations.push(Declaration { - id: DeclarationId(1149), + id: DeclarationId(1150), name: Some("SurfacePatternField".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -40216,33 +37912,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3547, 3627), }); declarations.push(Declaration { - id: DeclarationId(1150), + id: DeclarationId(1151), name: Some("SurfacePattern".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "BareVariant".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2389), -======= - ty: DeclarationId(2396), - }, - Field { - label: "VariantWith".to_string(), ty: DeclarationId(2397), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "VariantWith".to_string(), - ty: DeclarationId(2390), + ty: DeclarationId(2398), }, Field { label: "VariantFields".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2392), -======= - ty: DeclarationId(2399), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2400), }, ], }, @@ -40257,33 +37941,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3725, 3991), }); declarations.push(Declaration { - id: DeclarationId(1151), + id: DeclarationId(1152), name: Some("SurfaceLiteral".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Int".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2393), - }, - Field { - label: "Bool".to_string(), - ty: DeclarationId(2394), -======= - ty: DeclarationId(2400), - }, - Field { - label: "Bool".to_string(), ty: DeclarationId(2401), }, Field { - label: "String".to_string(), + label: "Bool".to_string(), ty: DeclarationId(2402), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "String".to_string(), - ty: DeclarationId(2395), + ty: DeclarationId(2403), }, ], }, @@ -40298,113 +37970,61 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4639, 4708), }); declarations.push(Declaration { - id: DeclarationId(1152), + id: DeclarationId(1153), name: Some("SurfaceExpr".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Literal".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2396), -======= - ty: DeclarationId(2403), - }, - Field { - label: "Var".to_string(), ty: DeclarationId(2404), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Var".to_string(), - ty: DeclarationId(2397), + ty: DeclarationId(2405), }, Field { label: "Path".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2400), - }, - Field { - label: "Call".to_string(), - ty: DeclarationId(2402), - }, - Field { - label: "PathCall".to_string(), - ty: DeclarationId(2406), - }, - Field { - label: "VariantRecord".to_string(), ty: DeclarationId(2408), }, - Field { - label: "Operator".to_string(), - ty: DeclarationId(2410), -======= - ty: DeclarationId(2407), - }, Field { label: "Call".to_string(), - ty: DeclarationId(2409), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2410), }, Field { label: "PathCall".to_string(), - ty: DeclarationId(2413), + ty: DeclarationId(2414), }, Field { label: "VariantRecord".to_string(), - ty: DeclarationId(2415), + ty: DeclarationId(2416), }, Field { label: "Operator".to_string(), - ty: DeclarationId(2417), + ty: DeclarationId(2418), }, Field { label: "Lambda".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2412), -======= - ty: DeclarationId(2419), - }, - Field { - label: "If".to_string(), ty: DeclarationId(2420), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "If".to_string(), - ty: DeclarationId(2413), + ty: DeclarationId(2421), }, Field { label: "Match".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2415), - }, - Field { - label: "Record".to_string(), - ty: DeclarationId(2417), - }, - Field { - label: "List".to_string(), - ty: DeclarationId(2419), - }, - Field { - label: "Map".to_string(), - ty: DeclarationId(2421), -======= - ty: DeclarationId(2422), + ty: DeclarationId(2423), }, Field { label: "Record".to_string(), - ty: DeclarationId(2424), + ty: DeclarationId(2425), }, Field { label: "List".to_string(), - ty: DeclarationId(2426), + ty: DeclarationId(2427), }, Field { label: "Map".to_string(), - ty: DeclarationId(2428), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2429), }, ], }, @@ -40419,89 +38039,49 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4801, 8620), }); declarations.push(Declaration { - id: DeclarationId(1153), + id: DeclarationId(1154), name: Some("SurfaceItem".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Let".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2423), - }, - Field { - label: "Fn".to_string(), - ty: DeclarationId(2426), - }, - Field { - label: "FnExternalBody".to_string(), - ty: DeclarationId(2429), - }, - Field { - label: "Data".to_string(), ty: DeclarationId(2431), -======= - ty: DeclarationId(2430), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Fn".to_string(), - ty: DeclarationId(2433), + ty: DeclarationId(2434), }, Field { label: "FnExternalBody".to_string(), - ty: DeclarationId(2436), + ty: DeclarationId(2437), }, Field { label: "Data".to_string(), - ty: DeclarationId(2438), + ty: DeclarationId(2439), }, Field { label: "Module".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2433), - }, - Field { - label: "Import".to_string(), - ty: DeclarationId(2436), - }, - Field { - label: "TypeAtom".to_string(), - ty: DeclarationId(2438), - }, - Field { - label: "TypeRecord".to_string(), ty: DeclarationId(2441), -======= - ty: DeclarationId(2440), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Import".to_string(), - ty: DeclarationId(2443), + ty: DeclarationId(2444), }, Field { label: "TypeAtom".to_string(), - ty: DeclarationId(2445), + ty: DeclarationId(2446), }, Field { label: "TypeRecord".to_string(), - ty: DeclarationId(2448), + ty: DeclarationId(2449), }, Field { label: "TypeSum".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2445), - }, - Field { - label: "TypeAlias".to_string(), - ty: DeclarationId(2448), -======= - ty: DeclarationId(2452), + ty: DeclarationId(2453), }, Field { label: "TypeAlias".to_string(), - ty: DeclarationId(2455), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2456), }, ], }, @@ -40516,15 +38096,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9489, 10807), }); declarations.push(Declaration { - id: DeclarationId(1154), + id: DeclarationId(1155), name: Some("python_language_spec_free_monoid_concat_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -40543,11 +38123,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "[*{left}, *{right}]".to_string(), ))], @@ -40560,11 +38136,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -40579,15 +38151,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(1155), + id: DeclarationId(1156), name: Some("python_language_spec_free_monoid_length_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -40606,11 +38178,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -40623,11 +38191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -40642,15 +38206,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(1156), + id: DeclarationId(1157), name: Some("python_language_spec_free_monoid_emptiness_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -40669,11 +38233,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "(len({recv}) == 0)".to_string(), ))], @@ -40686,11 +38246,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -40705,15 +38261,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(1157), + id: DeclarationId(1158), name: Some("python_language_spec_free_monoid_fold_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -40734,11 +38290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "__v3_fold({recv}, {init}, {body})".to_string(), ))], @@ -40751,11 +38303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -40770,15 +38318,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(1158), + id: DeclarationId(1159), name: Some("python_language_spec_map_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -40799,11 +38347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "[{body} for {item} in {recv}]".to_string(), ))], @@ -40816,11 +38360,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -40835,15 +38375,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(1159), + id: DeclarationId(1160), name: Some("python_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -40864,11 +38404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "[x for x in {recv} if {arg}(x)]".to_string(), ))], @@ -40881,11 +38417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -40900,15 +38432,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(1160), + id: DeclarationId(1161), name: Some("python_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -40929,11 +38461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "any({arg}(x) for x in {recv})".to_string(), ))], @@ -40946,11 +38474,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -40965,15 +38489,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(1161), + id: DeclarationId(1162), name: Some("python_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -40994,11 +38518,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "all({arg}(x) for x in {recv})".to_string(), ))], @@ -41011,11 +38531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -41030,15 +38546,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(1162), + id: DeclarationId(1163), name: Some("python_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -41059,11 +38575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "[y for x in {recv} for y in {arg}(x)]".to_string(), ))], @@ -41076,11 +38588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -41095,26 +38603,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(1163), + id: DeclarationId(1164), name: Some("python_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1046), + value: DeclarationId(1047), }], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(2449)), -======= - meta_tag: Some(DeclarationId(2456)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + meta_tag: Some(DeclarationId(2457)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -41133,11 +38633,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -41150,11 +38646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -41174,11 +38666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "{arg}.join({recv})".to_string(), ))], @@ -41191,11 +38679,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -41215,11 +38699,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}.split({arg})".to_string(), ))], @@ -41232,11 +38712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -41258,11 +38734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[-1] if {recv} else None".to_string(), ))], @@ -41275,11 +38747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -41301,11 +38769,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[0] if {recv} else None".to_string(), ))], @@ -41318,11 +38782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -41344,11 +38804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "list(enumerate({recv}))".to_string(), ))], @@ -41361,11 +38817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -41387,11 +38839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "[ord(c) for c in {recv}]".to_string(), ))], @@ -41404,19 +38852,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), ]), - FieldValue::Reference(DeclarationId(1159)), FieldValue::Reference(DeclarationId(1160)), FieldValue::Reference(DeclarationId(1161)), FieldValue::Reference(DeclarationId(1162)), + FieldValue::Reference(DeclarationId(1163)), FieldValue::Record(vec![ ( "dag_method".to_string(), @@ -41432,11 +38876,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[{arg}:]".to_string(), ))], @@ -41449,11 +38889,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -41473,11 +38909,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[:{arg}]".to_string(), ))], @@ -41490,11 +38922,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -41516,11 +38944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "sorted({recv}, key={arg})".to_string(), ))], @@ -41533,11 +38957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -41557,11 +38977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv} + [{arg}]".to_string(), ))], @@ -41574,11 +38990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -41598,11 +39010,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "{arg} in {recv}".to_string(), ))], @@ -41615,11 +39023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -41634,7 +39038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(1164), + id: DeclarationId(1165), name: Some("ResourceHandle".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -41667,12 +39071,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/resources.dag", 739, 827), }); declarations.push(Declaration { - id: DeclarationId(1165), + id: DeclarationId(1166), name: Some("ResourceReference".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "target".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }], }, type_params: vec![], @@ -41686,7 +39090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/resources.dag", 829, 880), }); declarations.push(Declaration { - id: DeclarationId(1166), + id: DeclarationId(1167), name: Some("NamedField".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -41696,7 +39100,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "value".to_string(), - ty: DeclarationId(1167), + ty: DeclarationId(1168), }, ], }, @@ -41711,49 +39115,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 760, 810), }); declarations.push(Declaration { - id: DeclarationId(1167), + id: DeclarationId(1168), name: Some("Value".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "LiteralValue".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2451), + ty: DeclarationId(2459), }, Field { label: "RecordValue".to_string(), - ty: DeclarationId(2453), - }, - Field { - label: "VariantValue".to_string(), - ty: DeclarationId(2454), - }, - Field { - label: "NodeRef".to_string(), - ty: DeclarationId(2455), -======= - ty: DeclarationId(2458), - }, - Field { - label: "RecordValue".to_string(), - ty: DeclarationId(2460), - }, - Field { - label: "VariantValue".to_string(), ty: DeclarationId(2461), }, Field { - label: "NodeRef".to_string(), + label: "VariantValue".to_string(), ty: DeclarationId(2462), }, Field { - label: "CardinalityValue".to_string(), + label: "NodeRef".to_string(), ty: DeclarationId(2463), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "CardinalityValue".to_string(), - ty: DeclarationId(2456), + ty: DeclarationId(2464), }, ], }, @@ -41768,15 +39152,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2122, 2304), }); declarations.push(Declaration { - id: DeclarationId(1168), + id: DeclarationId(1169), name: Some("ProgramObservation".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "observed".to_string(), - ty: DeclarationId(1169), + ty: DeclarationId(1170), }], }, - type_params: vec![DeclarationId(1169)], + type_params: vec![DeclarationId(1170)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -41787,7 +39171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 3208, 3264), }); declarations.push(Declaration { - id: DeclarationId(1169), + id: DeclarationId(1170), name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())), type_params: vec![], @@ -41801,16 +39185,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 3208, 3264), }); declarations.push(Declaration { - id: DeclarationId(1170), + id: DeclarationId(1171), name: Some("EvalFrame".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "bindings".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2457), -======= - ty: DeclarationId(2464), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2465), }], }, type_params: vec![], @@ -41824,16 +39204,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 3907, 3956), }); declarations.push(Declaration { - id: DeclarationId(1171), + id: DeclarationId(1172), name: Some("EvalStateStack".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "frames".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2458), -======= - ty: DeclarationId(2465), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2466), }], }, type_params: vec![], @@ -41847,12 +39223,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 4510, 4559), }); declarations.push(Declaration { - id: DeclarationId(1172), + id: DeclarationId(1173), name: Some("EvalStateKey".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "state".to_string(), - ty: DeclarationId(1171), + ty: DeclarationId(1172), }], }, type_params: vec![], @@ -41866,16 +39242,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 4940, 4985), }); declarations.push(Declaration { - id: DeclarationId(1173), + id: DeclarationId(1174), name: Some("EvalStrategy".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "ApplicativeOrder".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2459), -======= - ty: DeclarationId(2466), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2467), }], }, type_params: vec![], @@ -41889,25 +39261,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 5368, 5442), }); declarations.push(Declaration { - id: DeclarationId(1174), + id: DeclarationId(1175), name: Some("InputEvaluationOrder".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "LeftFirst".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2460), - }, - Field { - label: "RightFirst".to_string(), - ty: DeclarationId(2461), -======= - ty: DeclarationId(2467), + ty: DeclarationId(2468), }, Field { label: "RightFirst".to_string(), - ty: DeclarationId(2468), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2469), }, ], }, @@ -41922,7 +39286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 5654, 5704), }); declarations.push(Declaration { - id: DeclarationId(1175), + id: DeclarationId(1176), name: Some("EvalMemoKey".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -41936,11 +39300,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "state_key".to_string(), - ty: DeclarationId(1172), + ty: DeclarationId(1173), }, Field { label: "strategy".to_string(), - ty: DeclarationId(1173), + ty: DeclarationId(1174), }, ], }, @@ -41955,15 +39319,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 6013, 6124), }); declarations.push(Declaration { - id: DeclarationId(1176), + id: DeclarationId(1177), name: Some("evaluate".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(828), DeclarationId(722), DeclarationId(2450)], -======= - inputs: vec![DeclarationId(827), DeclarationId(721), DeclarationId(2457)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1167), + inputs: vec![DeclarationId(828), DeclarationId(722), DeclarationId(2458)], + output: DeclarationId(1168), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/runtime.dag", 11265, 11284)), }, type_params: vec![], @@ -41976,21 +39336,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/runtime.dag", 11196, 11284), }); -<<<<<<< HEAD - declarations.push(Declaration { id: DeclarationId(1177), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2314), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3551, 4204) }); - declarations.push(Declaration { id: DeclarationId(1178), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2314), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4206, 4701) }); - declarations.push(Declaration { id: DeclarationId(1179), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2314), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4703, 5192) }); - declarations.push(Declaration { id: DeclarationId(1180), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2314), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5194, 5725) }); - declarations.push(Declaration { id: DeclarationId(1181), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), value: DeclarationId(1046) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2462)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Reference(DeclarationId(1177)), FieldValue::Reference(DeclarationId(1178)), FieldValue::Reference(DeclarationId(1179)), FieldValue::Reference(DeclarationId(1180)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2313), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2312), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5728, 8449) }); -======= - declarations.push(Declaration { id: DeclarationId(1177), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3551, 4204) }); - declarations.push(Declaration { id: DeclarationId(1178), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4206, 4701) }); - declarations.push(Declaration { id: DeclarationId(1179), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4703, 5192) }); - declarations.push(Declaration { id: DeclarationId(1180), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5194, 5725) }); - declarations.push(Declaration { id: DeclarationId(1181), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1046) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2469)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })]), FieldValue::Reference(DeclarationId(1177)), FieldValue::Reference(DeclarationId(1178)), FieldValue::Reference(DeclarationId(1179)), FieldValue::Reference(DeclarationId(1180)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2319), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5728, 8449) }); ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - declarations.push(Declaration { - id: DeclarationId(1182), + declarations.push(Declaration { id: DeclarationId(1178), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1047), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2322), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3551, 4204) }); + declarations.push(Declaration { id: DeclarationId(1179), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1047), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2322), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4206, 4701) }); + declarations.push(Declaration { id: DeclarationId(1180), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1047), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2322), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4703, 5192) }); + declarations.push(Declaration { id: DeclarationId(1181), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1047), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2322), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5194, 5725) }); + declarations.push(Declaration { id: DeclarationId(1182), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), value: DeclarationId(1047) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2470)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![] })]), FieldValue::Reference(DeclarationId(1178)), FieldValue::Reference(DeclarationId(1179)), FieldValue::Reference(DeclarationId(1180)), FieldValue::Reference(DeclarationId(1181)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2320), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5728, 8449) }); + declarations.push(Declaration { + id: DeclarationId(1183), name: Some("InputField".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -42004,7 +39356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 3686, 3704), }); declarations.push(Declaration { - id: DeclarationId(1183), + id: DeclarationId(1184), name: Some("RestEndpointBinding".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -42029,12 +39381,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 4616, 4688), }); declarations.push(Declaration { - id: DeclarationId(1184), + id: DeclarationId(1185), name: Some("CallableRef".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "decl".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }], }, type_params: vec![], @@ -42048,25 +39400,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 5496, 5539), }); declarations.push(Declaration { - id: DeclarationId(1185), + id: DeclarationId(1186), name: Some("Operation".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "callable".to_string(), - ty: DeclarationId(1184), + ty: DeclarationId(1185), }, Field { label: "inputs".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2463), -======= - ty: DeclarationId(2470), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2471), }, Field { label: "endpoint".to_string(), - ty: DeclarationId(1183), + ty: DeclarationId(1184), }, ], }, @@ -42081,15 +39429,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 6748, 6858), }); declarations.push(Declaration { - id: DeclarationId(1186), + id: DeclarationId(1187), name: Some("modeled_gunbc_ci_workflow".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1716), + template: DeclarationId(1717), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1716)), + meta_tag: Some(DeclarationId(1717)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -42102,16 +39450,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 1195, 2378), }); declarations.push(Declaration { - id: DeclarationId(1187), + id: DeclarationId(1188), name: Some("ci_demo_timing_read".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(827)], - output: DeclarationId(2464), -======= - inputs: vec![DeclarationId(827), DeclarationId(826)], - output: DeclarationId(2471), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2472), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(597))), }, type_params: vec![], @@ -42125,16 +39468,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2891, 4150), }); declarations.push(Declaration { - id: DeclarationId(1188), + id: DeclarationId(1189), name: Some("ci_wad_modeled_workflow_timing_witness".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(827)], - output: DeclarationId(2465), -======= - inputs: vec![DeclarationId(827), DeclarationId(826)], - output: DeclarationId(2472), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2473), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(599))), }, type_params: vec![], @@ -42148,15 +39486,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4444, 4566), }); declarations.push(Declaration { - id: DeclarationId(1189), + id: DeclarationId(1190), name: Some("_ci_wad_seed_list_declaration_empty".to_string()), connective: TypeConnective::Arrow { inputs: vec![], -<<<<<<< HEAD - output: DeclarationId(2466), -======= - output: DeclarationId(2473), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2474), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(601))), }, type_params: vec![], @@ -42170,15 +39504,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4760, 4829), }); declarations.push(Declaration { - id: DeclarationId(1190), + id: DeclarationId(1191), name: Some("_ci_wad_seed_list_behavior_empty".to_string()), connective: TypeConnective::Arrow { inputs: vec![], -<<<<<<< HEAD - output: DeclarationId(2467), -======= - output: DeclarationId(2474), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2475), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(603))), }, type_params: vec![], @@ -42192,15 +39522,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4831, 4894), }); declarations.push(Declaration { - id: DeclarationId(1191), + id: DeclarationId(1192), name: Some("_ci_wad_seed_list_dagport_empty".to_string()), connective: TypeConnective::Arrow { inputs: vec![], -<<<<<<< HEAD - output: DeclarationId(2468), -======= - output: DeclarationId(2475), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2476), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(605))), }, type_params: vec![], @@ -42214,15 +39540,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4896, 4957), }); declarations.push(Declaration { - id: DeclarationId(1192), + id: DeclarationId(1193), name: Some("_ci_wad_seed_list_cluster_empty".to_string()), connective: TypeConnective::Arrow { inputs: vec![], -<<<<<<< HEAD - output: DeclarationId(2469), -======= - output: DeclarationId(2476), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2477), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(607))), }, type_params: vec![], @@ -42236,15 +39558,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4959, 5020), }); declarations.push(Declaration { - id: DeclarationId(1193), + id: DeclarationId(1194), name: Some("_ci_wad_empty_list_diagnostic".to_string()), connective: TypeConnective::Arrow { inputs: vec![], -<<<<<<< HEAD - output: DeclarationId(2470), -======= - output: DeclarationId(2477), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2478), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(609))), }, type_params: vec![], @@ -42258,15 +39576,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5022, 5084), }); declarations.push(Declaration { - id: DeclarationId(1194), + id: DeclarationId(1195), name: Some("_ci_wad_empty_list_witness_tm".to_string()), connective: TypeConnective::Arrow { inputs: vec![], -<<<<<<< HEAD - output: DeclarationId(2472), -======= - output: DeclarationId(2479), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2480), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(611))), }, type_params: vec![], @@ -42280,15 +39594,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5086, 5164), }); declarations.push(Declaration { - id: DeclarationId(1195), + id: DeclarationId(1196), name: Some("_ci_wad_witnesses_singleton_tm".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1229)], -<<<<<<< HEAD - output: DeclarationId(2474), -======= - output: DeclarationId(2481), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(1230)], + output: DeclarationId(2482), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(615))), }, type_params: vec![], @@ -42302,15 +39612,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5166, 5327), }); declarations.push(Declaration { - id: DeclarationId(1196), + id: DeclarationId(1197), name: Some("_ci_wad_violations_singleton".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(974)], -<<<<<<< HEAD - output: DeclarationId(2475), -======= - output: DeclarationId(2482), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(975)], + output: DeclarationId(2483), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(618))), }, type_params: vec![], @@ -42324,15 +39630,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5329, 5461), }); declarations.push(Declaration { - id: DeclarationId(1197), + id: DeclarationId(1198), name: Some("_ci_wad_dimension_ok_tm_payload".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1229)], -<<<<<<< HEAD - output: DeclarationId(2476), -======= - output: DeclarationId(2483), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(1230)], + output: DeclarationId(2484), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(622))), }, type_params: vec![], @@ -42346,15 +39648,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5463, 5687), }); declarations.push(Declaration { - id: DeclarationId(1198), + id: DeclarationId(1199), name: Some("_ci_wad_dimension_fail_tm_payload".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1229), DeclarationId(974)], -<<<<<<< HEAD - output: DeclarationId(2477), -======= - output: DeclarationId(2484), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(1230), DeclarationId(975)], + output: DeclarationId(2485), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(627))), }, type_params: vec![], @@ -42368,16 +39666,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5689, 5970), }); declarations.push(Declaration { - id: DeclarationId(1199), + id: DeclarationId(1200), name: Some("report_dim_ok_tm".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(828), DeclarationId(1229)], - output: DeclarationId(2478), -======= - inputs: vec![DeclarationId(827), DeclarationId(1229)], - output: DeclarationId(2485), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(828), DeclarationId(1230)], + output: DeclarationId(2486), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(634))), }, type_params: vec![], @@ -42391,16 +39684,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6235, 6474), }); declarations.push(Declaration { - id: DeclarationId(1200), + id: DeclarationId(1201), name: Some("report_dim_fail_tm".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(828), DeclarationId(1229), DeclarationId(974)], - output: DeclarationId(2479), -======= - inputs: vec![DeclarationId(827), DeclarationId(1229), DeclarationId(974)], - output: DeclarationId(2486), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(828), DeclarationId(1230), DeclarationId(975)], + output: DeclarationId(2487), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(641))), }, type_params: vec![], @@ -42414,16 +39702,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6476, 6751), }); declarations.push(Declaration { - id: DeclarationId(1201), + id: DeclarationId(1202), name: Some("report_inhabits_branch_tm".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(828), DeclarationId(1229), DeclarationId(978)], - output: DeclarationId(2480), -======= - inputs: vec![DeclarationId(827), DeclarationId(1229), DeclarationId(978)], - output: DeclarationId(2487), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(828), DeclarationId(1230), DeclarationId(979)], + output: DeclarationId(2488), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(646))), }, type_params: vec![], @@ -42437,16 +39720,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6753, 7004), }); declarations.push(Declaration { - id: DeclarationId(1202), + id: DeclarationId(1203), name: Some("dimension_report_tm_from_witness".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(828), DeclarationId(2481)], - output: DeclarationId(2482), -======= - inputs: vec![DeclarationId(827), DeclarationId(2488)], - output: DeclarationId(2489), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(828), DeclarationId(2489)], + output: DeclarationId(2490), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(656))), }, type_params: vec![], @@ -42460,16 +39738,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7006, 7425), }); declarations.push(Declaration { - id: DeclarationId(1203), + id: DeclarationId(1204), name: Some("demo_ci_modeled_timing_dimension_report".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(827)], - output: DeclarationId(2483), -======= - inputs: vec![DeclarationId(827), DeclarationId(826)], - output: DeclarationId(2490), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2491), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(664))), }, type_params: vec![], @@ -42483,33 +39756,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8286, 8587), }); declarations.push(Declaration { - id: DeclarationId(1204), + id: DeclarationId(1205), name: Some("DescentEvidence".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Strict".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2513), - }, - Field { - label: "NonIncreasing".to_string(), - ty: DeclarationId(2514), -======= - ty: DeclarationId(2520), - }, - Field { - label: "NonIncreasing".to_string(), ty: DeclarationId(2521), }, Field { - label: "DescentUnknown".to_string(), + label: "NonIncreasing".to_string(), ty: DeclarationId(2522), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "DescentUnknown".to_string(), - ty: DeclarationId(2515), + ty: DeclarationId(2523), }, ], }, @@ -42524,10 +39785,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 742, 810), }); declarations.push(Declaration { - id: DeclarationId(1205), + id: DeclarationId(1206), name: Some("evidence_rank".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1204)], + inputs: vec![DeclarationId(1205)], output: DeclarationId(93), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 856, 938)), }, @@ -42542,11 +39803,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 812, 938), }); declarations.push(Declaration { - id: DeclarationId(1206), + id: DeclarationId(1207), name: Some("merge_evidence".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1204), DeclarationId(1204)], - output: DeclarationId(1204), + inputs: vec![DeclarationId(1205), DeclarationId(1205)], + output: DeclarationId(1205), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 1082, @@ -42564,11 +39825,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 1005, 1410), }); declarations.push(Declaration { - id: DeclarationId(1207), + id: DeclarationId(1208), name: Some("join_evidence".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1204), DeclarationId(1204)], - output: DeclarationId(1204), + inputs: vec![DeclarationId(1205), DeclarationId(1205)], + output: DeclarationId(1205), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 1556, @@ -42586,11 +39847,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 1480, 1755), }); declarations.push(Declaration { - id: DeclarationId(1208), + id: DeclarationId(1209), name: Some("promote_to_strict".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1204)], - output: DeclarationId(1204), + inputs: vec![DeclarationId(1205)], + output: DeclarationId(1205), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2217, @@ -42608,16 +39869,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2150, 2336), }); declarations.push(Declaration { - id: DeclarationId(1209), + id: DeclarationId(1210), name: Some("optional_evidence_meet".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(2505), DeclarationId(2506)], - output: DeclarationId(2507), -======= - inputs: vec![DeclarationId(2512), DeclarationId(2513)], - output: DeclarationId(2514), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(2513), DeclarationId(2514)], + output: DeclarationId(2515), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2488, @@ -42635,16 +39891,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2400, 2664), }); declarations.push(Declaration { - id: DeclarationId(1210), + id: DeclarationId(1211), name: Some("map_evidence_merge_at".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(2508), DeclarationId(230), DeclarationId(1204)], - output: DeclarationId(2509), -======= - inputs: vec![DeclarationId(2515), DeclarationId(230), DeclarationId(1204)], - output: DeclarationId(2516), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(2516), DeclarationId(230), DeclarationId(1205)], + output: DeclarationId(2517), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2833, @@ -42662,49 +39913,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2701, 3007), }); declarations.push(Declaration { - id: DeclarationId(1211), + id: DeclarationId(1212), name: Some("RankingDimension".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TreeSize".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2516), - }, - Field { - label: "ListLength".to_string(), - ty: DeclarationId(2517), - }, - Field { - label: "ArithmeticValue".to_string(), - ty: DeclarationId(2518), - }, - Field { - label: "TokenPosition".to_string(), - ty: DeclarationId(2519), -======= - ty: DeclarationId(2523), - }, - Field { - label: "ListLength".to_string(), ty: DeclarationId(2524), }, Field { - label: "ArithmeticValue".to_string(), + label: "ListLength".to_string(), ty: DeclarationId(2525), }, Field { - label: "TokenPosition".to_string(), + label: "ArithmeticValue".to_string(), ty: DeclarationId(2526), }, Field { - label: "SetCardinality".to_string(), + label: "TokenPosition".to_string(), ty: DeclarationId(2527), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "SetCardinality".to_string(), - ty: DeclarationId(2520), + ty: DeclarationId(2528), }, ], }, @@ -42719,25 +39950,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3306, 3502), }); declarations.push(Declaration { - id: DeclarationId(1212), + id: DeclarationId(1213), name: Some("PositiveDescentAmount".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "OneStep".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2521), - }, - Field { - label: "AdditionalStep".to_string(), - ty: DeclarationId(2522), -======= - ty: DeclarationId(2528), + ty: DeclarationId(2529), }, Field { label: "AdditionalStep".to_string(), - ty: DeclarationId(2529), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2530), }, ], }, @@ -42752,10 +39975,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4478, 4571), }); declarations.push(Declaration { - id: DeclarationId(1213), + id: DeclarationId(1214), name: Some("positive_descent_count".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1212)], + inputs: vec![DeclarationId(1213)], output: DeclarationId(93), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", @@ -42774,25 +39997,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4818, 4989), }); declarations.push(Declaration { - id: DeclarationId(1214), + id: DeclarationId(1215), name: Some("ProportionalDivisor".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "DivideByTwo".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2523), - }, - Field { - label: "StrictlyLarger".to_string(), - ty: DeclarationId(2524), -======= - ty: DeclarationId(2530), + ty: DeclarationId(2531), }, Field { label: "StrictlyLarger".to_string(), - ty: DeclarationId(2531), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2532), }, ], }, @@ -42807,10 +40022,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5455, 5545), }); declarations.push(Declaration { - id: DeclarationId(1215), + id: DeclarationId(1216), name: Some("proportional_divisor_to_int".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1214)], + inputs: vec![DeclarationId(1215)], output: DeclarationId(93), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", @@ -42829,7 +40044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5547, 5722), }); declarations.push(Declaration { - id: DeclarationId(1216), + id: DeclarationId(1217), name: Some("peano_literal_materialization_cap".to_string()), connective: TypeConnective::Arrow { inputs: vec![], @@ -42851,15 +40066,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5906, 5959), }); declarations.push(Declaration { - id: DeclarationId(1217), + id: DeclarationId(1218), name: Some("positive_descent_amount_from_positive_int".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93)], -<<<<<<< HEAD - output: DeclarationId(2510), -======= - output: DeclarationId(2517), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2518), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 6420, @@ -42877,15 +40088,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6341, 6780), }); declarations.push(Declaration { - id: DeclarationId(1218), + id: DeclarationId(1219), name: Some("proportional_divisor_from_int_at_least_two".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(93)], -<<<<<<< HEAD - output: DeclarationId(2511), -======= - output: DeclarationId(2518), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2519), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 6860, @@ -42903,65 +40110,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6782, 7221), }); declarations.push(Declaration { - id: DeclarationId(1219), + id: DeclarationId(1220), name: Some("DescentSource".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ChildAccessor".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2525), - }, - Field { - label: "ListShrink".to_string(), - ty: DeclarationId(2526), - }, - Field { - label: "ArithmeticSubtractDescent".to_string(), - ty: DeclarationId(2527), - }, - Field { - label: "ArithmeticDivideDescent".to_string(), - ty: DeclarationId(2528), - }, - Field { - label: "ParserAdvance".to_string(), - ty: DeclarationId(2529), - }, - Field { - label: "SetRemoval".to_string(), - ty: DeclarationId(2530), -======= - ty: DeclarationId(2532), - }, - Field { - label: "ListShrink".to_string(), ty: DeclarationId(2533), }, Field { - label: "ArithmeticSubtractDescent".to_string(), + label: "ListShrink".to_string(), ty: DeclarationId(2534), }, Field { - label: "ArithmeticDivideDescent".to_string(), + label: "ArithmeticSubtractDescent".to_string(), ty: DeclarationId(2535), }, Field { - label: "ParserAdvance".to_string(), + label: "ArithmeticDivideDescent".to_string(), ty: DeclarationId(2536), }, Field { - label: "SetRemoval".to_string(), + label: "ParserAdvance".to_string(), ty: DeclarationId(2537), }, Field { - label: "FoldIteration".to_string(), + label: "SetRemoval".to_string(), ty: DeclarationId(2538), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "FoldIteration".to_string(), - ty: DeclarationId(2531), + ty: DeclarationId(2539), }, ], }, @@ -42976,16 +40155,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7626, 7947), }); declarations.push(Declaration { - id: DeclarationId(1220), + id: DeclarationId(1221), name: Some("TerminationProof".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "dimensions".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2532), -======= - ty: DeclarationId(2539), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2540), }], }, type_params: vec![], @@ -42999,7 +40174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7949, 8011), }); declarations.push(Declaration { - id: DeclarationId(1221), + id: DeclarationId(1222), name: Some("ProofEdge".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -43013,11 +40188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "evidence".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2533), -======= - ty: DeclarationId(2540), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2541), }, ], }, @@ -43032,16 +40203,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 8156, 8242), }); declarations.push(Declaration { - id: DeclarationId(1222), + id: DeclarationId(1223), name: Some("StrictEvidence".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "Strict".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2534), -======= - ty: DeclarationId(2541), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2542), }], }, type_params: vec![], @@ -43055,25 +40222,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 8716, 8746), }); declarations.push(Declaration { - id: DeclarationId(1223), + id: DeclarationId(1224), name: Some("NonStrictEvidence".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "NonIncreasing".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2535), - }, - Field { - label: "DescentUnknown".to_string(), - ty: DeclarationId(2536), -======= - ty: DeclarationId(2542), + ty: DeclarationId(2543), }, Field { label: "DescentUnknown".to_string(), - ty: DeclarationId(2543), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2544), }, ], }, @@ -43088,25 +40247,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 9112, 9171), }); declarations.push(Declaration { - id: DeclarationId(1224), + id: DeclarationId(1225), name: Some("DescentResidual".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "EvidenceUnknown".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2537), - }, - Field { - label: "EvidenceIncomplete".to_string(), - ty: DeclarationId(2538), -======= - ty: DeclarationId(2544), + ty: DeclarationId(2545), }, Field { label: "EvidenceIncomplete".to_string(), - ty: DeclarationId(2545), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2546), }, ], }, @@ -43121,7 +40272,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 10238, 10320), }); declarations.push(Declaration { - id: DeclarationId(1225), + id: DeclarationId(1226), name: Some("DescentExecutionProof".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -43135,11 +40286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "per_path".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2539), -======= - ty: DeclarationId(2546), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2547), }, ], }, @@ -43154,16 +40301,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 11157, 11263), }); declarations.push(Declaration { - id: DeclarationId(1226), + id: DeclarationId(1227), name: Some("descent_execution_proof".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(725), DeclarationId(723)], - output: DeclarationId(2512), -======= - inputs: vec![DeclarationId(827), DeclarationId(724), DeclarationId(722)], - output: DeclarationId(2519), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2520), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 12400, @@ -43181,7 +40323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 12279, 12439), }); declarations.push(Declaration { - id: DeclarationId(1227), + id: DeclarationId(1228), name: Some("timing_lens_module_path_witness".to_string()), connective: TypeConnective::Arrow { inputs: vec![], @@ -43199,7 +40341,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 1391, 1472), }); declarations.push(Declaration { - id: DeclarationId(1228), + id: DeclarationId(1229), name: Some("Nanoseconds".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -43218,41 +40360,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 1933, 1966), }); declarations.push(Declaration { - id: DeclarationId(1229), + id: DeclarationId(1230), name: Some("TimingMeasurement".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Observed".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2542), - }, - Field { - label: "Unobserved".to_string(), - ty: DeclarationId(2543), - }, - Field { - label: "Ambiguous".to_string(), - ty: DeclarationId(2544), -======= - ty: DeclarationId(2549), - }, - Field { - label: "Unobserved".to_string(), ty: DeclarationId(2550), }, Field { - label: "Ambiguous".to_string(), + label: "Unobserved".to_string(), ty: DeclarationId(2551), }, Field { - label: "Stale".to_string(), + label: "Ambiguous".to_string(), ty: DeclarationId(2552), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Stale".to_string(), - ty: DeclarationId(2545), + ty: DeclarationId(2553), }, ], }, @@ -43267,7 +40393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 3977, 4077), }); declarations.push(Declaration { - id: DeclarationId(1230), + id: DeclarationId(1231), name: Some("WorkflowObservationAnchor".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -43293,7 +40419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "attached_at_ns".to_string(), - ty: DeclarationId(1228), + ty: DeclarationId(1229), }, Field { label: "workflow_run_id".to_string(), @@ -43312,16 +40438,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 5538, 5787), }); declarations.push(Declaration { - id: DeclarationId(1231), + id: DeclarationId(1232), name: Some("TimingObservationSet".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "observations".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2546), -======= - ty: DeclarationId(2553), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2554), }], }, type_params: vec![], @@ -43335,17 +40457,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 5871, 5945), }); declarations.push(Declaration { - id: DeclarationId(1232), + id: DeclarationId(1233), name: Some("TimingObservationEntry".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "anchor".to_string(), - ty: DeclarationId(1230), + ty: DeclarationId(1231), }, Field { label: "measurement".to_string(), - ty: DeclarationId(1229), + ty: DeclarationId(1230), }, ], }, @@ -43360,12 +40482,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 5947, 6047), }); declarations.push(Declaration { - id: DeclarationId(1233), + id: DeclarationId(1234), name: Some("TimingBudget".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "max".to_string(), - ty: DeclarationId(1228), + ty: DeclarationId(1229), }], }, type_params: vec![], @@ -43379,11 +40501,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 6185, 6225), }); declarations.push(Declaration { - id: DeclarationId(1234), + id: DeclarationId(1235), name: Some("timing_measurement_unobserved".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1229), + output: DeclarationId(1230), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(668))), }, type_params: vec![], @@ -43397,11 +40519,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 6227, 6297), }); declarations.push(Declaration { - id: DeclarationId(1235), + id: DeclarationId(1236), name: Some("timing_measurement_lens_combine".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1229), DeclarationId(1229), DeclarationId(128)], - output: DeclarationId(1229), + inputs: vec![DeclarationId(1230), DeclarationId(1230), DeclarationId(128)], + output: DeclarationId(1230), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(700))), }, type_params: vec![], @@ -43415,11 +40537,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 6455, 7347), }); declarations.push(Declaration { - id: DeclarationId(1236), + id: DeclarationId(1237), name: Some("timing_sequential_op".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1229), DeclarationId(1229)], - output: DeclarationId(1229), + inputs: vec![DeclarationId(1230), DeclarationId(1230)], + output: DeclarationId(1230), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(703))), }, type_params: vec![], @@ -43433,11 +40555,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 7422, 7558), }); declarations.push(Declaration { - id: DeclarationId(1237), + id: DeclarationId(1238), name: Some("nanoseconds_zero".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1228), + output: DeclarationId(1229), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(706))), }, type_params: vec![], @@ -43451,11 +40573,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 7560, 7613), }); declarations.push(Declaration { - id: DeclarationId(1238), + id: DeclarationId(1239), name: Some("timing_sequential_identity".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1229), + output: DeclarationId(1230), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(709))), }, type_params: vec![], @@ -43469,11 +40591,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 7615, 7713), }); declarations.push(Declaration { - id: DeclarationId(1239), + id: DeclarationId(1240), name: Some("timing_branch_op".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1229), DeclarationId(1229)], - output: DeclarationId(1229), + inputs: vec![DeclarationId(1230), DeclarationId(1230)], + output: DeclarationId(1230), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(712))), }, type_params: vec![], @@ -43487,15 +40609,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 7773, 7906), }); declarations.push(Declaration { - id: DeclarationId(1240), + id: DeclarationId(1241), name: Some("timing_lens_empty_corrections".to_string()), connective: TypeConnective::Arrow { inputs: vec![], -<<<<<<< HEAD - output: DeclarationId(2540), -======= - output: DeclarationId(2547), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2548), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(714))), }, type_params: vec![], @@ -43509,7 +40627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 7908, 7972), }); declarations.push(Declaration { - id: DeclarationId(1241), + id: DeclarationId(1242), name: Some("timing_lens_behavior_span".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(827)], @@ -43527,11 +40645,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 8155, 8354), }); declarations.push(Declaration { - id: DeclarationId(1242), + id: DeclarationId(1243), name: Some("timing_lens_scaffold_non_evidence_diagnostic".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230), DeclarationId(159)], - output: DeclarationId(974), + output: DeclarationId(975), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(726))), }, type_params: vec![], @@ -43545,7 +40663,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 8601, 8813), }); declarations.push(Declaration { - id: DeclarationId(1243), + id: DeclarationId(1244), name: Some("timing_lens_degenerate_empty_dag_span".to_string()), connective: TypeConnective::Arrow { inputs: vec![], @@ -43563,15 +40681,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 9047, 9181), }); declarations.push(Declaration { - id: DeclarationId(1244), + id: DeclarationId(1245), name: Some("timing_lens_validate_non_observed".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(230)], -======= - inputs: vec![DeclarationId(827), DeclarationId(230)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(978), + output: DeclarationId(979), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(747))), }, type_params: vec![], @@ -43585,15 +40699,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 9643, 10348), }); declarations.push(Declaration { - id: DeclarationId(1245), + id: DeclarationId(1246), name: Some("timing_measurement_iterate".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1229), DeclarationId(818)], -======= - inputs: vec![DeclarationId(1229), DeclarationId(817)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1229), + inputs: vec![DeclarationId(1230), DeclarationId(818)], + output: DeclarationId(1230), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(756))), }, type_params: vec![], @@ -43607,16 +40717,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 10673, 11034), }); declarations.push(Declaration { - id: DeclarationId(1246), + id: DeclarationId(1247), name: Some("timing_lens_read".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD inputs: vec![DeclarationId(828), DeclarationId(827)], - output: DeclarationId(2541), -======= - inputs: vec![DeclarationId(827), DeclarationId(826)], - output: DeclarationId(2548), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2549), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(793))), }, type_params: vec![], @@ -43630,15 +40735,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 11811, 12637), }); declarations.push(Declaration { - id: DeclarationId(1247), + id: DeclarationId(1248), name: Some("timing_lens_validate".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(828), DeclarationId(1229)], -======= - inputs: vec![DeclarationId(827), DeclarationId(1229)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(978), + inputs: vec![DeclarationId(828), DeclarationId(1230)], + output: DeclarationId(979), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(807))), }, type_params: vec![], @@ -43652,371 +40753,190 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 12639, 13484), }); declarations.push(Declaration { - id: DeclarationId(1248), + id: DeclarationId(1249), name: Some("TokenKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "KwLet".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2558), - }, - Field { - label: "KwIf".to_string(), - ty: DeclarationId(2559), - }, - Field { - label: "KwThen".to_string(), - ty: DeclarationId(2560), - }, - Field { - label: "KwElse".to_string(), - ty: DeclarationId(2561), - }, - Field { - label: "KwFn".to_string(), - ty: DeclarationId(2562), - }, - Field { - label: "KwType".to_string(), - ty: DeclarationId(2563), - }, - Field { - label: "KwModule".to_string(), - ty: DeclarationId(2564), - }, - Field { - label: "KwImport".to_string(), - ty: DeclarationId(2565), - }, - Field { - label: "KwMatch".to_string(), ty: DeclarationId(2566), }, - Field { - label: "KwData".to_string(), - ty: DeclarationId(2567), - }, - Field { - label: "KwWhere".to_string(), - ty: DeclarationId(2568), - }, - Field { - label: "KwTrue".to_string(), - ty: DeclarationId(2569), - }, - Field { - label: "KwFalse".to_string(), - ty: DeclarationId(2570), - }, - Field { - label: "Ident".to_string(), - ty: DeclarationId(2571), - }, - Field { - label: "IntLit".to_string(), - ty: DeclarationId(2572), - }, - Field { - label: "StringLit".to_string(), - ty: DeclarationId(2573), - }, - Field { - label: "Eq".to_string(), - ty: DeclarationId(2574), - }, - Field { - label: "EqEq".to_string(), - ty: DeclarationId(2575), - }, - Field { - label: "NotEq".to_string(), - ty: DeclarationId(2576), - }, - Field { - label: "Lt".to_string(), - ty: DeclarationId(2577), - }, - Field { - label: "Le".to_string(), - ty: DeclarationId(2578), - }, - Field { - label: "Gt".to_string(), - ty: DeclarationId(2579), - }, - Field { - label: "Ge".to_string(), - ty: DeclarationId(2580), - }, - Field { - label: "Plus".to_string(), - ty: DeclarationId(2581), - }, - Field { - label: "Minus".to_string(), - ty: DeclarationId(2582), - }, - Field { - label: "Star".to_string(), - ty: DeclarationId(2583), - }, - Field { - label: "Slash".to_string(), - ty: DeclarationId(2584), - }, - Field { - label: "AmpAmp".to_string(), - ty: DeclarationId(2585), - }, - Field { - label: "PipePipe".to_string(), - ty: DeclarationId(2586), - }, - Field { - label: "Colon".to_string(), - ty: DeclarationId(2587), - }, - Field { - label: "Arrow".to_string(), - ty: DeclarationId(2588), - }, - Field { - label: "FatArrow".to_string(), - ty: DeclarationId(2589), - }, - Field { - label: "PipeArrow".to_string(), - ty: DeclarationId(2590), - }, - Field { - label: "Dot".to_string(), - ty: DeclarationId(2591), - }, - Field { - label: "LParen".to_string(), - ty: DeclarationId(2592), - }, - Field { - label: "RParen".to_string(), - ty: DeclarationId(2593), - }, - Field { - label: "LBrace".to_string(), - ty: DeclarationId(2594), - }, - Field { - label: "RBrace".to_string(), - ty: DeclarationId(2595), - }, - Field { - label: "LBracket".to_string(), - ty: DeclarationId(2596), - }, - Field { - label: "RBracket".to_string(), - ty: DeclarationId(2597), - }, - Field { - label: "Comma".to_string(), - ty: DeclarationId(2598), - }, - Field { - label: "Semicolon".to_string(), - ty: DeclarationId(2599), - }, - Field { - label: "Pipe".to_string(), - ty: DeclarationId(2600), - }, - Field { - label: "Question".to_string(), - ty: DeclarationId(2601), - }, - Field { - label: "Eof".to_string(), - ty: DeclarationId(2602), - }, -======= - ty: DeclarationId(2565), - }, Field { label: "KwIf".to_string(), - ty: DeclarationId(2566), + ty: DeclarationId(2567), }, Field { label: "KwThen".to_string(), - ty: DeclarationId(2567), + ty: DeclarationId(2568), }, Field { label: "KwElse".to_string(), - ty: DeclarationId(2568), + ty: DeclarationId(2569), }, Field { label: "KwFn".to_string(), - ty: DeclarationId(2569), + ty: DeclarationId(2570), }, Field { label: "KwType".to_string(), - ty: DeclarationId(2570), + ty: DeclarationId(2571), }, Field { label: "KwModule".to_string(), - ty: DeclarationId(2571), + ty: DeclarationId(2572), }, Field { label: "KwImport".to_string(), - ty: DeclarationId(2572), + ty: DeclarationId(2573), }, Field { label: "KwMatch".to_string(), - ty: DeclarationId(2573), + ty: DeclarationId(2574), }, Field { label: "KwData".to_string(), - ty: DeclarationId(2574), + ty: DeclarationId(2575), }, Field { label: "KwWhere".to_string(), - ty: DeclarationId(2575), + ty: DeclarationId(2576), }, Field { label: "KwTrue".to_string(), - ty: DeclarationId(2576), + ty: DeclarationId(2577), }, Field { label: "KwFalse".to_string(), - ty: DeclarationId(2577), + ty: DeclarationId(2578), }, Field { label: "Ident".to_string(), - ty: DeclarationId(2578), + ty: DeclarationId(2579), }, Field { label: "IntLit".to_string(), - ty: DeclarationId(2579), + ty: DeclarationId(2580), }, Field { label: "StringLit".to_string(), - ty: DeclarationId(2580), + ty: DeclarationId(2581), }, Field { label: "Eq".to_string(), - ty: DeclarationId(2581), + ty: DeclarationId(2582), }, Field { label: "EqEq".to_string(), - ty: DeclarationId(2582), + ty: DeclarationId(2583), }, Field { label: "NotEq".to_string(), - ty: DeclarationId(2583), + ty: DeclarationId(2584), }, Field { label: "Lt".to_string(), - ty: DeclarationId(2584), + ty: DeclarationId(2585), }, Field { label: "Le".to_string(), - ty: DeclarationId(2585), + ty: DeclarationId(2586), }, Field { label: "Gt".to_string(), - ty: DeclarationId(2586), + ty: DeclarationId(2587), }, Field { label: "Ge".to_string(), - ty: DeclarationId(2587), + ty: DeclarationId(2588), }, Field { label: "Plus".to_string(), - ty: DeclarationId(2588), + ty: DeclarationId(2589), }, Field { label: "Minus".to_string(), - ty: DeclarationId(2589), + ty: DeclarationId(2590), }, Field { label: "Star".to_string(), - ty: DeclarationId(2590), + ty: DeclarationId(2591), }, Field { label: "Slash".to_string(), - ty: DeclarationId(2591), + ty: DeclarationId(2592), }, Field { label: "AmpAmp".to_string(), - ty: DeclarationId(2592), + ty: DeclarationId(2593), }, Field { label: "PipePipe".to_string(), - ty: DeclarationId(2593), + ty: DeclarationId(2594), }, Field { label: "Colon".to_string(), - ty: DeclarationId(2594), + ty: DeclarationId(2595), }, Field { label: "Arrow".to_string(), - ty: DeclarationId(2595), + ty: DeclarationId(2596), }, Field { label: "FatArrow".to_string(), - ty: DeclarationId(2596), + ty: DeclarationId(2597), }, Field { label: "PipeArrow".to_string(), - ty: DeclarationId(2597), + ty: DeclarationId(2598), }, Field { label: "Dot".to_string(), - ty: DeclarationId(2598), + ty: DeclarationId(2599), }, Field { label: "LParen".to_string(), - ty: DeclarationId(2599), + ty: DeclarationId(2600), }, Field { label: "RParen".to_string(), - ty: DeclarationId(2600), + ty: DeclarationId(2601), }, Field { label: "LBrace".to_string(), - ty: DeclarationId(2601), + ty: DeclarationId(2602), }, Field { label: "RBrace".to_string(), - ty: DeclarationId(2602), + ty: DeclarationId(2603), }, Field { label: "LBracket".to_string(), - ty: DeclarationId(2603), + ty: DeclarationId(2604), }, Field { label: "RBracket".to_string(), - ty: DeclarationId(2604), + ty: DeclarationId(2605), }, Field { label: "Comma".to_string(), - ty: DeclarationId(2605), + ty: DeclarationId(2606), }, Field { label: "Semicolon".to_string(), - ty: DeclarationId(2606), + ty: DeclarationId(2607), }, Field { label: "Pipe".to_string(), - ty: DeclarationId(2607), + ty: DeclarationId(2608), }, Field { label: "Question".to_string(), - ty: DeclarationId(2608), + ty: DeclarationId(2609), }, Field { label: "Eof".to_string(), - ty: DeclarationId(2609), + ty: DeclarationId(2610), }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -44030,13 +40950,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 627, 1220), }); declarations.push(Declaration { - id: DeclarationId(1249), + id: DeclarationId(1250), name: Some("Token".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "kind".to_string(), - ty: DeclarationId(1248), + ty: DeclarationId(1249), }, Field { label: "span".to_string(), @@ -44055,115 +40975,62 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1355, 1406), }); declarations.push(Declaration { - id: DeclarationId(1250), + id: DeclarationId(1251), name: Some("KeywordTokenKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "KwLet".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2603), - }, - Field { - label: "KwIf".to_string(), - ty: DeclarationId(2604), - }, - Field { - label: "KwThen".to_string(), - ty: DeclarationId(2605), - }, - Field { - label: "KwElse".to_string(), - ty: DeclarationId(2606), - }, - Field { - label: "KwFn".to_string(), - ty: DeclarationId(2607), - }, - Field { - label: "KwType".to_string(), - ty: DeclarationId(2608), - }, - Field { - label: "KwModule".to_string(), - ty: DeclarationId(2609), - }, - Field { - label: "KwImport".to_string(), - ty: DeclarationId(2610), - }, - Field { - label: "KwMatch".to_string(), ty: DeclarationId(2611), }, - Field { - label: "KwData".to_string(), - ty: DeclarationId(2612), - }, - Field { - label: "KwWhere".to_string(), - ty: DeclarationId(2613), - }, - Field { - label: "KwTrue".to_string(), - ty: DeclarationId(2614), - }, - Field { - label: "KwFalse".to_string(), - ty: DeclarationId(2615), - }, -======= - ty: DeclarationId(2610), - }, Field { label: "KwIf".to_string(), - ty: DeclarationId(2611), + ty: DeclarationId(2612), }, Field { label: "KwThen".to_string(), - ty: DeclarationId(2612), + ty: DeclarationId(2613), }, Field { label: "KwElse".to_string(), - ty: DeclarationId(2613), + ty: DeclarationId(2614), }, Field { label: "KwFn".to_string(), - ty: DeclarationId(2614), + ty: DeclarationId(2615), }, Field { label: "KwType".to_string(), - ty: DeclarationId(2615), + ty: DeclarationId(2616), }, Field { label: "KwModule".to_string(), - ty: DeclarationId(2616), + ty: DeclarationId(2617), }, Field { label: "KwImport".to_string(), - ty: DeclarationId(2617), + ty: DeclarationId(2618), }, Field { label: "KwMatch".to_string(), - ty: DeclarationId(2618), + ty: DeclarationId(2619), }, Field { label: "KwData".to_string(), - ty: DeclarationId(2619), + ty: DeclarationId(2620), }, Field { label: "KwWhere".to_string(), - ty: DeclarationId(2620), + ty: DeclarationId(2621), }, Field { label: "KwTrue".to_string(), - ty: DeclarationId(2621), + ty: DeclarationId(2622), }, Field { label: "KwFalse".to_string(), - ty: DeclarationId(2622), + ty: DeclarationId(2623), }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -44177,235 +41044,122 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1765, 1931), }); declarations.push(Declaration { - id: DeclarationId(1251), + id: DeclarationId(1252), name: Some("PunctTokenKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Eq".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2616), - }, - Field { - label: "EqEq".to_string(), - ty: DeclarationId(2617), - }, - Field { - label: "NotEq".to_string(), - ty: DeclarationId(2618), - }, - Field { - label: "Lt".to_string(), - ty: DeclarationId(2619), - }, - Field { - label: "Le".to_string(), - ty: DeclarationId(2620), - }, - Field { - label: "Gt".to_string(), - ty: DeclarationId(2621), - }, - Field { - label: "Ge".to_string(), - ty: DeclarationId(2622), - }, - Field { - label: "Plus".to_string(), - ty: DeclarationId(2623), - }, - Field { - label: "Minus".to_string(), ty: DeclarationId(2624), }, - Field { - label: "Star".to_string(), - ty: DeclarationId(2625), - }, - Field { - label: "Slash".to_string(), - ty: DeclarationId(2626), - }, - Field { - label: "AmpAmp".to_string(), - ty: DeclarationId(2627), - }, - Field { - label: "PipePipe".to_string(), - ty: DeclarationId(2628), - }, - Field { - label: "Colon".to_string(), - ty: DeclarationId(2629), - }, - Field { - label: "Arrow".to_string(), - ty: DeclarationId(2630), - }, - Field { - label: "FatArrow".to_string(), - ty: DeclarationId(2631), - }, - Field { - label: "PipeArrow".to_string(), - ty: DeclarationId(2632), - }, - Field { - label: "Dot".to_string(), - ty: DeclarationId(2633), - }, - Field { - label: "LParen".to_string(), - ty: DeclarationId(2634), - }, - Field { - label: "RParen".to_string(), - ty: DeclarationId(2635), - }, - Field { - label: "LBrace".to_string(), - ty: DeclarationId(2636), - }, - Field { - label: "RBrace".to_string(), - ty: DeclarationId(2637), - }, - Field { - label: "LBracket".to_string(), - ty: DeclarationId(2638), - }, - Field { - label: "RBracket".to_string(), - ty: DeclarationId(2639), - }, - Field { - label: "Comma".to_string(), - ty: DeclarationId(2640), - }, - Field { - label: "Semicolon".to_string(), - ty: DeclarationId(2641), - }, - Field { - label: "Pipe".to_string(), - ty: DeclarationId(2642), - }, - Field { - label: "Question".to_string(), - ty: DeclarationId(2643), - }, -======= - ty: DeclarationId(2623), - }, Field { label: "EqEq".to_string(), - ty: DeclarationId(2624), + ty: DeclarationId(2625), }, Field { label: "NotEq".to_string(), - ty: DeclarationId(2625), + ty: DeclarationId(2626), }, Field { label: "Lt".to_string(), - ty: DeclarationId(2626), + ty: DeclarationId(2627), }, Field { label: "Le".to_string(), - ty: DeclarationId(2627), + ty: DeclarationId(2628), }, Field { label: "Gt".to_string(), - ty: DeclarationId(2628), + ty: DeclarationId(2629), }, Field { label: "Ge".to_string(), - ty: DeclarationId(2629), + ty: DeclarationId(2630), }, Field { label: "Plus".to_string(), - ty: DeclarationId(2630), + ty: DeclarationId(2631), }, Field { label: "Minus".to_string(), - ty: DeclarationId(2631), + ty: DeclarationId(2632), }, Field { label: "Star".to_string(), - ty: DeclarationId(2632), + ty: DeclarationId(2633), }, Field { label: "Slash".to_string(), - ty: DeclarationId(2633), + ty: DeclarationId(2634), }, Field { label: "AmpAmp".to_string(), - ty: DeclarationId(2634), + ty: DeclarationId(2635), }, Field { label: "PipePipe".to_string(), - ty: DeclarationId(2635), + ty: DeclarationId(2636), }, Field { label: "Colon".to_string(), - ty: DeclarationId(2636), + ty: DeclarationId(2637), }, Field { label: "Arrow".to_string(), - ty: DeclarationId(2637), + ty: DeclarationId(2638), }, Field { label: "FatArrow".to_string(), - ty: DeclarationId(2638), + ty: DeclarationId(2639), }, Field { label: "PipeArrow".to_string(), - ty: DeclarationId(2639), + ty: DeclarationId(2640), }, Field { label: "Dot".to_string(), - ty: DeclarationId(2640), + ty: DeclarationId(2641), }, Field { label: "LParen".to_string(), - ty: DeclarationId(2641), + ty: DeclarationId(2642), }, Field { label: "RParen".to_string(), - ty: DeclarationId(2642), + ty: DeclarationId(2643), }, Field { label: "LBrace".to_string(), - ty: DeclarationId(2643), + ty: DeclarationId(2644), }, Field { label: "RBrace".to_string(), - ty: DeclarationId(2644), + ty: DeclarationId(2645), }, Field { label: "LBracket".to_string(), - ty: DeclarationId(2645), + ty: DeclarationId(2646), }, Field { label: "RBracket".to_string(), - ty: DeclarationId(2646), + ty: DeclarationId(2647), }, Field { label: "Comma".to_string(), - ty: DeclarationId(2647), + ty: DeclarationId(2648), }, Field { label: "Semicolon".to_string(), - ty: DeclarationId(2648), + ty: DeclarationId(2649), }, Field { label: "Pipe".to_string(), - ty: DeclarationId(2649), + ty: DeclarationId(2650), }, Field { label: "Question".to_string(), - ty: DeclarationId(2650), + ty: DeclarationId(2651), }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -44419,7 +41173,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2347, 2653), }); declarations.push(Declaration { - id: DeclarationId(1252), + id: DeclarationId(1253), name: Some("LocalPunctSpec".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -44429,7 +41183,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "kind".to_string(), - ty: DeclarationId(1251), + ty: DeclarationId(1252), }, ], }, @@ -44444,7 +41198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2863, 2927), }); declarations.push(Declaration { - id: DeclarationId(1253), + id: DeclarationId(1254), name: Some("StringEscapeSpec".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -44469,7 +41223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 3314, 3380), }); declarations.push(Declaration { - id: DeclarationId(1254), + id: DeclarationId(1255), name: Some("Path".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(158), @@ -44486,7 +41240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1340, 1360), }); declarations.push(Declaration { - id: DeclarationId(1255), + id: DeclarationId(1256), name: Some("SnapshotRef".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(151), @@ -44503,7 +41257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1361, 1391), }); declarations.push(Declaration { - id: DeclarationId(1256), + id: DeclarationId(1257), name: Some("CensusListConstant".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -44517,15 +41271,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1528, 1554), }); declarations.push(Declaration { - id: DeclarationId(1257), + id: DeclarationId(1258), name: Some("expected_hand_authored_non_test".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1256), + template: DeclarationId(1257), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1256)), + meta_tag: Some(DeclarationId(1257)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -44534,15 +41288,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1556, 1617), }); declarations.push(Declaration { - id: DeclarationId(1258), + id: DeclarationId(1259), name: Some("expected_hand_authored_test".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1256), + template: DeclarationId(1257), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1256)), + meta_tag: Some(DeclarationId(1257)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -44551,7 +41305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1618, 1675), }); declarations.push(Declaration { - id: DeclarationId(1259), + id: DeclarationId(1260), name: Some("LensProducerFilesSubsetPredicate".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -44565,15 +41319,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1807, 1847), }); declarations.push(Declaration { - id: DeclarationId(1260), + id: DeclarationId(1261), name: Some("lens_producer_files_subset_predicate".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1259), + template: DeclarationId(1260), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1259)), + meta_tag: Some(DeclarationId(1260)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -44582,7 +41336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1849, 1929), }); declarations.push(Declaration { - id: DeclarationId(1261), + id: DeclarationId(1262), name: Some("CompilerStdPositiveSetRatchet".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -44596,15 +41350,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2008, 2045), }); declarations.push(Declaration { - id: DeclarationId(1262), + id: DeclarationId(1263), name: Some("compiler_std_positive_set_ratchet".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1261), + template: DeclarationId(1262), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1261)), + meta_tag: Some(DeclarationId(1262)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -44613,91 +41367,50 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2047, 2121), }); declarations.push(Declaration { - id: DeclarationId(1263), + id: DeclarationId(1264), name: Some("DiagnosticKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TokenizerError".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2647), - }, - Field { - label: "ParseError".to_string(), - ty: DeclarationId(2648), - }, - Field { - label: "TypeMismatch".to_string(), - ty: DeclarationId(2649), - }, - Field { - label: "ArityMismatch".to_string(), - ty: DeclarationId(2650), - }, - Field { - label: "ResolveError".to_string(), - ty: DeclarationId(2651), - }, - Field { - label: "UnitMismatch".to_string(), - ty: DeclarationId(2652), - }, - Field { - label: "BranchConditionNotBool".to_string(), - ty: DeclarationId(2653), - }, - Field { - label: "MagnitudeOutOfRange".to_string(), - ty: DeclarationId(2654), - }, - Field { - label: "MalformedIntegerRangeFact".to_string(), ty: DeclarationId(2655), }, - Field { - label: "NominalOpacityViolation".to_string(), - ty: DeclarationId(2656), - }, -======= - ty: DeclarationId(2654), - }, Field { label: "ParseError".to_string(), - ty: DeclarationId(2655), + ty: DeclarationId(2656), }, Field { label: "TypeMismatch".to_string(), - ty: DeclarationId(2656), + ty: DeclarationId(2657), }, Field { label: "ArityMismatch".to_string(), - ty: DeclarationId(2657), + ty: DeclarationId(2658), }, Field { label: "ResolveError".to_string(), - ty: DeclarationId(2658), + ty: DeclarationId(2659), }, Field { label: "UnitMismatch".to_string(), - ty: DeclarationId(2659), + ty: DeclarationId(2660), }, Field { label: "BranchConditionNotBool".to_string(), - ty: DeclarationId(2660), + ty: DeclarationId(2661), }, Field { label: "MagnitudeOutOfRange".to_string(), - ty: DeclarationId(2661), + ty: DeclarationId(2662), }, Field { label: "MalformedIntegerRangeFact".to_string(), - ty: DeclarationId(2662), + ty: DeclarationId(2663), }, Field { label: "NominalOpacityViolation".to_string(), - ty: DeclarationId(2663), + ty: DeclarationId(2664), }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -44711,25 +41424,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2456, 2687), }); declarations.push(Declaration { - id: DeclarationId(1264), + id: DeclarationId(1265), name: Some("DiagnosticDetailExpectation".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "AnyDetail".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2657), - }, - Field { - label: "Contains".to_string(), - ty: DeclarationId(2658), -======= - ty: DeclarationId(2664), + ty: DeclarationId(2665), }, Field { label: "Contains".to_string(), - ty: DeclarationId(2665), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2666), }, ], }, @@ -44744,17 +41449,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3056, 3123), }); declarations.push(Declaration { - id: DeclarationId(1265), + id: DeclarationId(1266), name: Some("DiagnosticReference".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "kind".to_string(), - ty: DeclarationId(1263), + ty: DeclarationId(1264), }, Field { label: "detail_contains".to_string(), - ty: DeclarationId(1264), + ty: DeclarationId(1265), }, ], }, @@ -44769,25 +41474,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3267, 3365), }); declarations.push(Declaration { - id: DeclarationId(1266), + id: DeclarationId(1267), name: Some("PortStateExpectation".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Resolved".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2659), - }, - Field { - label: "Unresolved".to_string(), - ty: DeclarationId(2660), -======= - ty: DeclarationId(2666), + ty: DeclarationId(2667), }, Field { label: "Unresolved".to_string(), - ty: DeclarationId(2667), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2668), }, ], }, @@ -44802,16 +41499,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3752, 3805), }); declarations.push(Declaration { - id: DeclarationId(1267), + id: DeclarationId(1268), name: Some("PerfBudgetComparisonOp".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "AtMostBudget".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2661), -======= - ty: DeclarationId(2668), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2669), }], }, type_params: vec![], @@ -44825,33 +41518,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3998, 4042), }); declarations.push(Declaration { - id: DeclarationId(1268), + id: DeclarationId(1269), name: Some("AlgebraicLawKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Associativity".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2662), - }, - Field { - label: "Commutativity".to_string(), - ty: DeclarationId(2663), -======= - ty: DeclarationId(2669), - }, - Field { - label: "Commutativity".to_string(), ty: DeclarationId(2670), }, Field { - label: "Identity".to_string(), + label: "Commutativity".to_string(), ty: DeclarationId(2671), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Identity".to_string(), - ty: DeclarationId(2664), + ty: DeclarationId(2672), }, ], }, @@ -44866,12 +41547,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4831, 4901), }); declarations.push(Declaration { - id: DeclarationId(1269), + id: DeclarationId(1270), name: Some("ProgramGenerator".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "generator".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }], }, type_params: vec![], @@ -44885,16 +41566,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5138, 5191), }); declarations.push(Declaration { - id: DeclarationId(1270), + id: DeclarationId(1271), name: Some("ProgramShape".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "LiteralProgram".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2665), -======= - ty: DeclarationId(2672), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2673), }], }, type_params: vec![], @@ -44908,203 +41585,106 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5424, 5513), }); declarations.push(Declaration { - id: DeclarationId(1271), + id: DeclarationId(1272), name: Some("TestPredicate".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Compiles".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2666), + ty: DeclarationId(2674), }, Field { label: "FailsWithDiagnostic".to_string(), - ty: DeclarationId(2667), - }, - Field { - label: "OutputEquals".to_string(), - ty: DeclarationId(2668), - }, - Field { - label: "PortHasState".to_string(), - ty: DeclarationId(2669), - }, - Field { - label: "DeclarationHasRefinement".to_string(), - ty: DeclarationId(2670), - }, - Field { - label: "CostBounded".to_string(), - ty: DeclarationId(2671), - }, - Field { - label: "BehavioralObservation".to_string(), - ty: DeclarationId(2672), - }, - Field { - label: "MockBackedInvariant".to_string(), - ty: DeclarationId(2673), - }, - Field { - label: "ExecuteCommand".to_string(), ty: DeclarationId(2675), }, - Field { - label: "ForAllTargets".to_string(), - ty: DeclarationId(2677), - }, - Field { - label: "LensOutputEquals".to_string(), - ty: DeclarationId(2678), - }, - Field { - label: "DifferentialEquals".to_string(), - ty: DeclarationId(2679), - }, - Field { - label: "SymbolicCostExprEquals".to_string(), - ty: DeclarationId(2680), - }, - Field { - label: "PerfWithinBaseline".to_string(), - ty: DeclarationId(2681), - }, - Field { - label: "BinaryDimensionReportEquals".to_string(), - ty: DeclarationId(2682), - }, - Field { - label: "AlgebraicLaw".to_string(), - ty: DeclarationId(2683), - }, - Field { - label: "CensusBoundCheck".to_string(), - ty: DeclarationId(2684), - }, - Field { - label: "CensusSubsetCount".to_string(), - ty: DeclarationId(2685), - }, - Field { - label: "FixedPointConverges".to_string(), - ty: DeclarationId(2686), - }, - Field { - label: "RatchetZero".to_string(), - ty: DeclarationId(2687), - }, - Field { - label: "GeneratedFromDag".to_string(), - ty: DeclarationId(2689), - }, - Field { - label: "ReleaseDeferredClaim".to_string(), - ty: DeclarationId(2690), - }, - Field { - label: "SubstrateResearchDeferredClaim".to_string(), - ty: DeclarationId(2691), - }, - Field { - label: "BridgeLedgerZero".to_string(), - ty: DeclarationId(2692), - }, -======= - ty: DeclarationId(2673), - }, - Field { - label: "FailsWithDiagnostic".to_string(), - ty: DeclarationId(2674), - }, Field { label: "OutputEquals".to_string(), - ty: DeclarationId(2675), + ty: DeclarationId(2676), }, Field { label: "PortHasState".to_string(), - ty: DeclarationId(2676), + ty: DeclarationId(2677), }, Field { label: "DeclarationHasRefinement".to_string(), - ty: DeclarationId(2677), + ty: DeclarationId(2678), }, Field { label: "CostBounded".to_string(), - ty: DeclarationId(2678), + ty: DeclarationId(2679), }, Field { label: "BehavioralObservation".to_string(), - ty: DeclarationId(2679), + ty: DeclarationId(2680), }, Field { label: "MockBackedInvariant".to_string(), - ty: DeclarationId(2680), + ty: DeclarationId(2681), }, Field { label: "ExecuteCommand".to_string(), - ty: DeclarationId(2682), + ty: DeclarationId(2683), }, Field { label: "ForAllTargets".to_string(), - ty: DeclarationId(2684), + ty: DeclarationId(2685), }, Field { label: "LensOutputEquals".to_string(), - ty: DeclarationId(2685), + ty: DeclarationId(2686), }, Field { label: "DifferentialEquals".to_string(), - ty: DeclarationId(2686), + ty: DeclarationId(2687), }, Field { label: "SymbolicCostExprEquals".to_string(), - ty: DeclarationId(2687), + ty: DeclarationId(2688), }, Field { label: "PerfWithinBaseline".to_string(), - ty: DeclarationId(2688), + ty: DeclarationId(2689), }, Field { label: "BinaryDimensionReportEquals".to_string(), - ty: DeclarationId(2689), + ty: DeclarationId(2690), }, Field { label: "AlgebraicLaw".to_string(), - ty: DeclarationId(2690), + ty: DeclarationId(2691), }, Field { label: "CensusBoundCheck".to_string(), - ty: DeclarationId(2691), + ty: DeclarationId(2692), }, Field { label: "CensusSubsetCount".to_string(), - ty: DeclarationId(2692), + ty: DeclarationId(2693), }, Field { label: "FixedPointConverges".to_string(), - ty: DeclarationId(2693), + ty: DeclarationId(2694), }, Field { label: "RatchetZero".to_string(), - ty: DeclarationId(2694), + ty: DeclarationId(2695), }, Field { label: "GeneratedFromDag".to_string(), - ty: DeclarationId(2696), + ty: DeclarationId(2697), }, Field { label: "ReleaseDeferredClaim".to_string(), - ty: DeclarationId(2697), + ty: DeclarationId(2698), }, Field { label: "SubstrateResearchDeferredClaim".to_string(), - ty: DeclarationId(2698), + ty: DeclarationId(2699), }, Field { label: "BridgeLedgerZero".to_string(), - ty: DeclarationId(2699), + ty: DeclarationId(2700), }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -45118,7 +41698,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5515, 16437), }); declarations.push(Declaration { - id: DeclarationId(1272), + id: DeclarationId(1273), name: Some("ProgramInput".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -45132,12 +41712,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 16545, 16565), }); declarations.push(Declaration { - id: DeclarationId(1273), + id: DeclarationId(1274), name: Some("ProgramOutputBind".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "output_ref".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }], }, type_params: vec![], @@ -45151,7 +41731,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 16708, 16763), }); declarations.push(Declaration { - id: DeclarationId(1274), + id: DeclarationId(1275), name: Some("TestClaim".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -45169,15 +41749,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "predicate".to_string(), - ty: DeclarationId(1271), + ty: DeclarationId(1272), }, Field { label: "requires".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2693), -======= - ty: DeclarationId(2700), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2701), }, ], }, @@ -45192,25 +41768,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 17373, 17506), }); declarations.push(Declaration { - id: DeclarationId(1275), + id: DeclarationId(1276), name: Some("Quantifier".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ForAll".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2694), - }, - Field { - label: "Exists".to_string(), - ty: DeclarationId(2695), -======= - ty: DeclarationId(2701), + ty: DeclarationId(2702), }, Field { label: "Exists".to_string(), - ty: DeclarationId(2702), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2703), }, ], }, @@ -45225,7 +41793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 17687, 17724), }); declarations.push(Declaration { - id: DeclarationId(1276), + id: DeclarationId(1277), name: Some("QuantifiedTestClaim".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -45235,23 +41803,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "generator".to_string(), - ty: DeclarationId(1269), + ty: DeclarationId(1270), }, Field { label: "quantifier".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, Field { label: "predicate".to_string(), - ty: DeclarationId(1271), + ty: DeclarationId(1272), }, Field { label: "requires".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2696), -======= - ty: DeclarationId(2703), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2704), }, ], }, @@ -45266,25 +41830,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 17726, 17887), }); declarations.push(Declaration { - id: DeclarationId(1277), + id: DeclarationId(1278), name: Some("SuiteClaim".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Enumerated".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2697), - }, - Field { - label: "Quantified".to_string(), - ty: DeclarationId(2698), -======= - ty: DeclarationId(2704), + ty: DeclarationId(2705), }, Field { label: "Quantified".to_string(), - ty: DeclarationId(2705), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2706), }, ], }, @@ -45299,7 +41855,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 18323, 18400), }); declarations.push(Declaration { - id: DeclarationId(1278), + id: DeclarationId(1279), name: Some("TestSuite".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -45309,11 +41865,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "claims".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2699), -======= - ty: DeclarationId(2706), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2707), }, ], }, @@ -45328,7 +41880,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 18402, 18461), }); declarations.push(Declaration { - id: DeclarationId(1279), + id: DeclarationId(1280), name: Some("TestObligation".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -45338,11 +41890,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "resources".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2700), -======= - ty: DeclarationId(2707), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2708), }, ], }, @@ -45357,15 +41905,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 18659, 18740), }); declarations.push(Declaration { - id: DeclarationId(1280), + id: DeclarationId(1281), name: Some("claim_obligation_resources".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1274)], -<<<<<<< HEAD - output: DeclarationId(2644), -======= - output: DeclarationId(2651), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(1275)], + output: DeclarationId(2652), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 19182, @@ -45383,11 +41927,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 19111, 19198), }); declarations.push(Declaration { - id: DeclarationId(1281), + id: DeclarationId(1282), name: Some("obligation_for_claim".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1274)], - output: DeclarationId(1279), + inputs: vec![DeclarationId(1275)], + output: DeclarationId(1280), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 19256, @@ -45405,16 +41949,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 19200, 19341), }); declarations.push(Declaration { - id: DeclarationId(1282), + id: DeclarationId(1283), name: Some("materialize_test_obligations".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(2645)], - output: DeclarationId(2646), -======= - inputs: vec![DeclarationId(2652)], - output: DeclarationId(2653), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(2653)], + output: DeclarationId(2654), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 19424, @@ -45432,16 +41971,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 19343, 19463), }); declarations.push(Declaration { - id: DeclarationId(1283), + id: DeclarationId(1284), name: Some("behavior_spine".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD inputs: vec![DeclarationId(828)], - output: DeclarationId(2701), -======= - inputs: vec![DeclarationId(827)], - output: DeclarationId(2708), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2709), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(809))), }, type_params: vec![], @@ -45455,7 +41989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/workflows.dag", 963, 1018), }); declarations.push(Declaration { - id: DeclarationId(1284), + id: DeclarationId(1285), name: Some("ValueBehavior".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -45469,7 +42003,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2935, 2956), }); declarations.push(Declaration { - id: DeclarationId(1285), + id: DeclarationId(1286), name: Some("Transform".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -45483,7 +42017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2957, 2974), }); declarations.push(Declaration { - id: DeclarationId(1286), + id: DeclarationId(1287), name: Some("Branch".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -45497,7 +42031,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2975, 2989), }); declarations.push(Declaration { - id: DeclarationId(1287), + id: DeclarationId(1288), name: Some("Loop".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -45511,7 +42045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2990, 3002), }); declarations.push(Declaration { - id: DeclarationId(1288), + id: DeclarationId(1289), name: Some("Bind".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -45525,7 +42059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3003, 3015), }); declarations.push(Declaration { - id: DeclarationId(1289), + id: DeclarationId(1290), name: Some("Main".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -45539,7 +42073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3016, 3028), }); declarations.push(Declaration { - id: DeclarationId(1290), + id: DeclarationId(1291), name: Some("DeclarationRef".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -45553,15 +42087,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3761, 3783), }); declarations.push(Declaration { - id: DeclarationId(1291), + id: DeclarationId(1292), name: Some("go_execution_model".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(949), + template: DeclarationId(950), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(949)), + meta_tag: Some(DeclarationId(950)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -45569,22 +42103,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "memory".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2199), -======= - constructor: DeclarationId(2206), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2207), payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2202), -======= - constructor: DeclarationId(2209), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2210), payload: vec![], }, ), @@ -45595,22 +42121,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2055, 2157), }); declarations.push(Declaration { - id: DeclarationId(1292), + id: DeclarationId(1293), name: Some("go_source_filtering".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(951), + template: DeclarationId(952), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(951)), + meta_tag: Some(DeclarationId(952)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "internal".to_string(), - FieldValue::Reference(DeclarationId(952)), + FieldValue::Reference(DeclarationId(953)), ), ( "additional_excluded_prefixes".to_string(), @@ -45625,15 +42151,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2159, 2309), }); declarations.push(Declaration { - id: DeclarationId(1293), + id: DeclarationId(1294), name: Some("go_execution_requirement".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(953), + template: DeclarationId(954), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(953)), + meta_tag: Some(DeclarationId(954)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -45646,22 +42172,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2311, 2386), }); declarations.push(Declaration { - id: DeclarationId(1294), + id: DeclarationId(1295), name: Some("go_int".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -45687,22 +42213,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2388, 2518), }); declarations.push(Declaration { - id: DeclarationId(1295), + id: DeclarationId(1296), name: Some("go_int32".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -45728,22 +42254,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2520, 2654), }); declarations.push(Declaration { - id: DeclarationId(1296), + id: DeclarationId(1297), name: Some("go_integer_inhabit_i32_at_program_bound".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1009), + template: DeclarationId(1010), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1009)), + meta_tag: Some(DeclarationId(1010)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "kernel_integer".to_string(), @@ -45756,21 +42282,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2280), -======= - constructor: DeclarationId(2287), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2288), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1878), + constructor: DeclarationId(1879), payload: vec![ FieldValue::Literal(LiteralBits::Int( "-2147483648".to_string(), )), FieldValue::Variant { - constructor: DeclarationId(1877), + constructor: DeclarationId(1878), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1875), + constructor: DeclarationId(1876), payload: vec![FieldValue::Literal(LiteralBits::Int( "4294967295".to_string(), ))], @@ -45782,7 +42304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1295)), + FieldValue::Reference(DeclarationId(1296)), ), ], }), @@ -45791,22 +42313,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2656, 2959), }); declarations.push(Declaration { - id: DeclarationId(1297), + id: DeclarationId(1298), name: Some("go_integer_inhabit_int_platform_dependent".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1009), + template: DeclarationId(1010), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1009)), + meta_tag: Some(DeclarationId(1010)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "kernel_integer".to_string(), @@ -45819,17 +42341,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2281), -======= - constructor: DeclarationId(2288), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2289), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1294)), + FieldValue::Reference(DeclarationId(1295)), ), ], }), @@ -45838,22 +42356,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3397, 3598), }); declarations.push(Declaration { - id: DeclarationId(1298), + id: DeclarationId(1299), name: Some("go_bool".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -45879,22 +42397,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3600, 3731), }); declarations.push(Declaration { - id: DeclarationId(1299), + id: DeclarationId(1300), name: Some("go_string".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -45920,22 +42438,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3733, 3870), }); declarations.push(Declaration { - id: DeclarationId(1300), + id: DeclarationId(1301), name: Some("go_node_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -45961,22 +42479,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3872, 4010), }); declarations.push(Declaration { - id: DeclarationId(1301), + id: DeclarationId(1302), name: Some("go_port_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -46002,22 +42520,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4012, 4150), }); declarations.push(Declaration { - id: DeclarationId(1302), + id: DeclarationId(1303), name: Some("go_declaration_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -46043,22 +42561,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4152, 4311), }); declarations.push(Declaration { - id: DeclarationId(1303), + id: DeclarationId(1304), name: Some("go_cluster_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -46084,22 +42602,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4313, 4460), }); declarations.push(Declaration { - id: DeclarationId(1304), + id: DeclarationId(1305), name: Some("go_type_shape".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -46123,11 +42641,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "declaration".to_string(), ))], @@ -46150,22 +42664,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4462, 4703), }); declarations.push(Declaration { - id: DeclarationId(1305), + id: DeclarationId(1306), name: Some("go_port_state".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -46191,22 +42705,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4705, 4853), }); declarations.push(Declaration { - id: DeclarationId(1306), + id: DeclarationId(1307), name: Some("go_port".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -46231,11 +42745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -46254,11 +42764,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "state".to_string(), ))], @@ -46279,11 +42785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "produced_by".to_string(), ))], @@ -46307,22 +42809,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4855, 5238), }); declarations.push(Declaration { - id: DeclarationId(1307), + id: DeclarationId(1308), name: Some("go_source_span".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -46347,11 +42849,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "file".to_string(), ))], @@ -46370,11 +42868,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_start".to_string(), ))], @@ -46393,11 +42887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_end".to_string(), ))], @@ -46421,22 +42911,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5240, 5634), }); declarations.push(Declaration { - id: DeclarationId(1308), + id: DeclarationId(1309), name: Some("go_literal_bits".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -46462,22 +42952,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5636, 5790), }); declarations.push(Declaration { - id: DeclarationId(1309), + id: DeclarationId(1310), name: Some("go_atom_payload".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -46503,22 +42993,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5792, 5946), }); declarations.push(Declaration { - id: DeclarationId(1310), + id: DeclarationId(1311), name: Some("go_cardinality_bound".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -46544,22 +43034,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5948, 6117), }); declarations.push(Declaration { - id: DeclarationId(1311), + id: DeclarationId(1312), name: Some("go_interval".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -46585,22 +43075,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 6119, 6263), }); declarations.push(Declaration { - id: DeclarationId(1312), + id: DeclarationId(1313), name: Some("go_positive_interval_width".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -46628,22 +43118,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 6265, 6450), }); declarations.push(Declaration { - id: DeclarationId(1313), + id: DeclarationId(1314), name: Some("go_interval_width".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -46669,22 +43159,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 6452, 6612), }); declarations.push(Declaration { - id: DeclarationId(1314), + id: DeclarationId(1315), name: Some("go_conj_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -46709,11 +43199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -46732,11 +43218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -46760,22 +43242,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 6614, 6916), }); declarations.push(Declaration { - id: DeclarationId(1315), + id: DeclarationId(1316), name: Some("go_template_argument".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -46802,11 +43284,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -46825,11 +43303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -46853,22 +43327,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 6918, 7255), }); declarations.push(Declaration { - id: DeclarationId(1316), + id: DeclarationId(1317), name: Some("go_phantom_parameter".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -46895,11 +43369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -46918,11 +43388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "algebra".to_string(), ))], @@ -46946,22 +43412,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 7257, 7598), }); declarations.push(Declaration { - id: DeclarationId(1317), + id: DeclarationId(1318), name: Some("go_nominal_opacity".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -46987,11 +43453,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "permitted_accessors".to_string(), ))], @@ -47014,22 +43476,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 7600, 7872), }); declarations.push(Declaration { - id: DeclarationId(1318), + id: DeclarationId(1319), name: Some("go_field_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -47054,11 +43516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -47077,11 +43535,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -47105,22 +43559,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 7874, 8185), }); declarations.push(Declaration { - id: DeclarationId(1319), + id: DeclarationId(1320), name: Some("go_non_empty_list".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -47145,11 +43599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -47168,11 +43618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -47196,22 +43642,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 8187, 8503), }); declarations.push(Declaration { - id: DeclarationId(1320), + id: DeclarationId(1321), name: Some("go_non_singleton_list".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -47236,11 +43682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -47259,11 +43701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "second".to_string(), ))], @@ -47282,11 +43720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -47310,22 +43744,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 8505, 8914), }); declarations.push(Declaration { - id: DeclarationId(1321), + id: DeclarationId(1322), name: Some("go_param_ref".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -47350,11 +43784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "member_of".to_string(), ))], @@ -47373,11 +43803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "slot_of".to_string(), ))], @@ -47401,22 +43827,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 8916, 9232), }); declarations.push(Declaration { - id: DeclarationId(1322), + id: DeclarationId(1323), name: Some("go_transform_ref".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -47440,11 +43866,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "node_id".to_string(), ))], @@ -47467,22 +43889,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9234, 9475), }); declarations.push(Declaration { - id: DeclarationId(1323), + id: DeclarationId(1324), name: Some("go_member_descent".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -47506,11 +43928,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "param".to_string(), ))], @@ -47533,22 +43951,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9477, 9718), }); declarations.push(Declaration { - id: DeclarationId(1324), + id: DeclarationId(1325), name: Some("go_intra_cluster_call".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -47572,11 +43990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "transform".to_string(), ))], @@ -47599,22 +44013,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9720, 9979), }); declarations.push(Declaration { - id: DeclarationId(1325), + id: DeclarationId(1326), name: Some("go_cluster".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -47639,11 +44053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "members".to_string(), ))], @@ -47664,11 +44074,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "intra_cluster_calls".to_string(), ))], @@ -47692,22 +44098,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9981, 10314), }); declarations.push(Declaration { - id: DeclarationId(1326), + id: DeclarationId(1327), name: Some("go_field_value".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -47733,22 +44139,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 10316, 10467), }); declarations.push(Declaration { - id: DeclarationId(1327), + id: DeclarationId(1328), name: Some("go_value_body".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -47774,22 +44180,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 10469, 10617), }); declarations.push(Declaration { - id: DeclarationId(1328), + id: DeclarationId(1329), name: Some("go_arrow_body".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -47815,22 +44221,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 10619, 10767), }); declarations.push(Declaration { - id: DeclarationId(1329), + id: DeclarationId(1330), name: Some("go_type_connective".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -47856,22 +44262,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 10769, 10932), }); declarations.push(Declaration { - id: DeclarationId(1330), + id: DeclarationId(1331), name: Some("go_declaration".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -47896,11 +44302,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -47919,11 +44321,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -47944,11 +44342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "connective".to_string(), ))], @@ -47969,11 +44363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "type_params".to_string(), ))], @@ -47994,11 +44384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "phantom_params".to_string(), ))], @@ -48019,11 +44405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "meta_tag".to_string(), ))], @@ -48044,11 +44426,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "inhabits".to_string(), ))], @@ -48069,11 +44447,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "value_body".to_string(), ))], @@ -48094,11 +44468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "nominal_opacity".to_string(), ))], @@ -48117,11 +44487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -48145,22 +44511,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 10934, 11951), }); declarations.push(Declaration { - id: DeclarationId(1331), + id: DeclarationId(1332), name: Some("go_arithmetic_op".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -48186,22 +44552,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 11953, 12110), }); declarations.push(Declaration { - id: DeclarationId(1332), + id: DeclarationId(1333), name: Some("go_comparison_op".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -48227,22 +44593,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 12112, 12269), }); declarations.push(Declaration { - id: DeclarationId(1333), + id: DeclarationId(1334), name: Some("go_logical_op".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -48268,22 +44634,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 12271, 12419), }); declarations.push(Declaration { - id: DeclarationId(1334), + id: DeclarationId(1335), name: Some("go_operator_kind".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -48309,22 +44675,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 12421, 12578), }); declarations.push(Declaration { - id: DeclarationId(1335), + id: DeclarationId(1336), name: Some("go_transform_target".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -48350,22 +44716,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 12580, 12746), }); declarations.push(Declaration { - id: DeclarationId(1336), + id: DeclarationId(1337), name: Some("go_branch_pattern".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -48391,22 +44757,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 12748, 12908), }); declarations.push(Declaration { - id: DeclarationId(1337), + id: DeclarationId(1338), name: Some("go_payload_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -48433,11 +44799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "binding_name".to_string(), ))], @@ -48458,11 +44820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "payload_port".to_string(), ))], @@ -48486,22 +44844,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 12910, 13261), }); declarations.push(Declaration { - id: DeclarationId(1338), + id: DeclarationId(1339), name: Some("go_branch_path".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -48526,11 +44884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -48551,11 +44905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -48574,11 +44924,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -48597,11 +44943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -48625,22 +44967,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 13263, 13750), }); declarations.push(Declaration { - id: DeclarationId(1339), + id: DeclarationId(1340), name: Some("go_loop_bound".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -48666,22 +45008,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 13752, 13900), }); declarations.push(Declaration { - id: DeclarationId(1340), + id: DeclarationId(1341), name: Some("go_value_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -48706,11 +45048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -48729,11 +45067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -48754,11 +45088,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -48777,11 +45107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -48805,22 +45131,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 14374, 14848), }); declarations.push(Declaration { - id: DeclarationId(1341), + id: DeclarationId(1342), name: Some("go_transform_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -48845,11 +45171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -48868,11 +45190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "target".to_string(), ))], @@ -48891,11 +45209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "inputs".to_string(), ))], @@ -48916,11 +45230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -48939,11 +45249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -48967,22 +45273,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 14850, 15415), }); declarations.push(Declaration { - id: DeclarationId(1342), + id: DeclarationId(1343), name: Some("go_branch_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -49007,11 +45313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -49030,11 +45332,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "input".to_string(), ))], @@ -49053,11 +45351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "paths".to_string(), ))], @@ -49078,11 +45372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -49101,11 +45391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -49126,11 +45412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -49154,22 +45436,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 15417, 16074), }); declarations.push(Declaration { - id: DeclarationId(1343), + id: DeclarationId(1344), name: Some("go_loop_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -49194,11 +45476,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -49217,11 +45495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "source".to_string(), ))], @@ -49240,11 +45514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "init".to_string(), ))], @@ -49263,11 +45533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -49286,11 +45552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "bound".to_string(), ))], @@ -49311,11 +45573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -49334,11 +45592,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -49362,22 +45616,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 16076, 16778), }); declarations.push(Declaration { - id: DeclarationId(1344), + id: DeclarationId(1345), name: Some("go_bind_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -49402,11 +45656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -49425,11 +45675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -49450,11 +45696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -49473,11 +45715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "params".to_string(), ))], @@ -49496,11 +45734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -49521,11 +45755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -49549,22 +45779,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 16780, 17431), }); declarations.push(Declaration { - id: DeclarationId(1345), + id: DeclarationId(1346), name: Some("go_behavior".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -49590,22 +45820,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 17433, 17577), }); declarations.push(Declaration { - id: DeclarationId(1346), + id: DeclarationId(1347), name: Some("go_dag".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -49632,11 +45862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "declarations".to_string(), ))], @@ -49655,11 +45881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "nodes".to_string(), ))], @@ -49678,11 +45900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "ports".to_string(), ))], @@ -49703,11 +45921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "clusters".to_string(), ))], @@ -49731,26 +45945,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 17579, 18046), }); declarations.push(Declaration { - id: DeclarationId(1347), + id: DeclarationId(1348), name: Some("go_surface_module".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1140)), + FieldValue::Reference(DeclarationId(1141)), ), ( "carrier".to_string(), @@ -49770,11 +45984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "items".to_string(), ))], @@ -49797,26 +46007,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 18349, 18590), }); declarations.push(Declaration { - id: DeclarationId(1348), + id: DeclarationId(1349), name: Some("go_surface_item".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1153)), + FieldValue::Reference(DeclarationId(1154)), ), ( "carrier".to_string(), @@ -49838,26 +46048,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 18592, 18746), }); declarations.push(Declaration { - id: DeclarationId(1349), + id: DeclarationId(1350), name: Some("go_surface_param".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1141)), + FieldValue::Reference(DeclarationId(1142)), ), ( "carrier".to_string(), @@ -49878,11 +46088,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -49901,11 +46107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -49926,11 +46128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "refinement".to_string(), ))], @@ -49954,26 +46152,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 18748, 19146), }); declarations.push(Declaration { - id: DeclarationId(1350), + id: DeclarationId(1351), name: Some("go_surface_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1142)), + FieldValue::Reference(DeclarationId(1143)), ), ( "carrier".to_string(), @@ -49994,11 +46192,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -50017,11 +46211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -50045,26 +46235,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 19148, 19457), }); declarations.push(Declaration { - id: DeclarationId(1351), + id: DeclarationId(1352), name: Some("go_surface_variant".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1143)), + FieldValue::Reference(DeclarationId(1144)), ), ( "carrier".to_string(), @@ -50085,11 +46275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -50108,11 +46294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -50131,11 +46313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -50159,26 +46337,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 19459, 19861), }); declarations.push(Declaration { - id: DeclarationId(1352), + id: DeclarationId(1353), name: Some("go_variant_payload".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1144)), + FieldValue::Reference(DeclarationId(1145)), ), ( "carrier".to_string(), @@ -50200,26 +46378,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 19863, 20026), }); declarations.push(Declaration { - id: DeclarationId(1353), + id: DeclarationId(1354), name: Some("go_surface_type".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1145)), + FieldValue::Reference(DeclarationId(1146)), ), ( "carrier".to_string(), @@ -50241,26 +46419,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 20028, 20182), }); declarations.push(Declaration { - id: DeclarationId(1354), + id: DeclarationId(1355), name: Some("go_surface_record_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1146)), + FieldValue::Reference(DeclarationId(1147)), ), ( "carrier".to_string(), @@ -50281,11 +46459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -50304,11 +46478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -50327,11 +46497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -50355,26 +46521,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 20184, 20595), }); declarations.push(Declaration { - id: DeclarationId(1355), + id: DeclarationId(1356), name: Some("go_surface_map_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1147)), + FieldValue::Reference(DeclarationId(1148)), ), ( "carrier".to_string(), @@ -50395,11 +46561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "key".to_string(), ))], @@ -50420,11 +46582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "key_span".to_string(), ))], @@ -50443,11 +46601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -50466,11 +46620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -50494,26 +46644,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 20597, 21082), }); declarations.push(Declaration { - id: DeclarationId(1356), + id: DeclarationId(1357), name: Some("go_surface_match_arm".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1148)), + FieldValue::Reference(DeclarationId(1149)), ), ( "carrier".to_string(), @@ -50534,11 +46684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -50557,11 +46703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -50580,11 +46722,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -50608,26 +46746,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21084, 21490), }); declarations.push(Declaration { - id: DeclarationId(1357), + id: DeclarationId(1358), name: Some("go_surface_pattern_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1149)), + FieldValue::Reference(DeclarationId(1150)), ), ( "carrier".to_string(), @@ -50648,11 +46786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -50671,11 +46805,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -50694,11 +46824,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -50722,26 +46848,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21492, 21910), }); declarations.push(Declaration { - id: DeclarationId(1358), + id: DeclarationId(1359), name: Some("go_surface_pattern".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1150)), + FieldValue::Reference(DeclarationId(1151)), ), ( "carrier".to_string(), @@ -50763,26 +46889,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21912, 22075), }); declarations.push(Declaration { - id: DeclarationId(1359), + id: DeclarationId(1360), name: Some("go_surface_literal".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1151)), + FieldValue::Reference(DeclarationId(1152)), ), ( "carrier".to_string(), @@ -50804,26 +46930,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22077, 22240), }); declarations.push(Declaration { - id: DeclarationId(1360), + id: DeclarationId(1361), name: Some("go_surface_expr".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1152)), + FieldValue::Reference(DeclarationId(1153)), ), ( "carrier".to_string(), @@ -50845,22 +46971,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22242, 22396), }); declarations.push(Declaration { - id: DeclarationId(1361), + id: DeclarationId(1362), name: Some("go_int_add".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -50882,22 +47008,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22398, 22539), }); declarations.push(Declaration { - id: DeclarationId(1362), + id: DeclarationId(1363), name: Some("go_int_sub".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -50919,22 +47045,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22541, 22682), }); declarations.push(Declaration { - id: DeclarationId(1363), + id: DeclarationId(1364), name: Some("go_int_mul".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -50956,22 +47082,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22684, 22825), }); declarations.push(Declaration { - id: DeclarationId(1364), + id: DeclarationId(1365), name: Some("go_int_div".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -50995,22 +47121,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22827, 22975), }); declarations.push(Declaration { - id: DeclarationId(1365), + id: DeclarationId(1366), name: Some("go_int_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -51031,63 +47157,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/spec/go.dag", 22977, 23117), }); - declarations.push(Declaration { - id: DeclarationId(1366), - name: Some("go_node_id_eq".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1013), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), -<<<<<<< HEAD -======= - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(721)), - ), - ("op".to_string(), FieldValue::Reference(DeclarationId(359))), - ( - "carrier".to_string(), - FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/go.dag", 23119, 23266), - }); declarations.push(Declaration { id: DeclarationId(1367), - name: Some("go_port_id_eq".to_string()), + name: Some("go_node_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -51109,27 +47195,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23119, 23266), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1367), - name: Some("go_port_id_eq".to_string()), -======= id: DeclarationId(1368), - name: Some("go_declaration_id_eq".to_string()), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("go_port_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -51151,28 +47232,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23268, 23415), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1368), - name: Some("go_declaration_id_eq".to_string()), -======= id: DeclarationId(1369), - name: Some("go_int_ne".to_string()), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("go_declaration_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), -<<<<<<< HEAD + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -51194,24 +47269,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23417, 23578), }); declarations.push(Declaration { - id: DeclarationId(1369), + id: DeclarationId(1370), name: Some("go_int_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), -======= ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -51232,63 +47305,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/spec/go.dag", 23580, 23720), }); - declarations.push(Declaration { - id: DeclarationId(1370), - name: Some("go_node_id_ne".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1013), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), -<<<<<<< HEAD -======= - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(721)), - ), - ("op".to_string(), FieldValue::Reference(DeclarationId(360))), - ( - "carrier".to_string(), - FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/go.dag", 23722, 23869), - }); declarations.push(Declaration { id: DeclarationId(1371), - name: Some("go_port_id_ne".to_string()), + name: Some("go_node_id_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -51310,27 +47343,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23722, 23869), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1371), - name: Some("go_port_id_ne".to_string()), -======= id: DeclarationId(1372), - name: Some("go_declaration_id_ne".to_string()), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("go_port_id_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -51352,28 +47380,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23871, 24018), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1372), - name: Some("go_declaration_id_ne".to_string()), -======= id: DeclarationId(1373), - name: Some("go_int_lt".to_string()), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("go_declaration_id_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), -<<<<<<< HEAD + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -51395,24 +47417,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24020, 24181), }); declarations.push(Declaration { - id: DeclarationId(1373), + id: DeclarationId(1374), name: Some("go_int_lt".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), -======= ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -51434,22 +47454,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24183, 24322), }); declarations.push(Declaration { - id: DeclarationId(1374), + id: DeclarationId(1375), name: Some("go_int_le".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -51471,22 +47491,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24324, 24464), }); declarations.push(Declaration { - id: DeclarationId(1375), + id: DeclarationId(1376), name: Some("go_int_gt".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -51508,22 +47528,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24466, 24605), }); declarations.push(Declaration { - id: DeclarationId(1376), + id: DeclarationId(1377), name: Some("go_int_ge".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -51545,22 +47565,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24607, 24747), }); declarations.push(Declaration { - id: DeclarationId(1377), + id: DeclarationId(1378), name: Some("go_bool_meet".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -51582,22 +47602,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24749, 24898), }); declarations.push(Declaration { - id: DeclarationId(1378), + id: DeclarationId(1379), name: Some("go_bool_join".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -51619,26 +47639,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24900, 25049), }); declarations.push(Declaration { - id: DeclarationId(1379), + id: DeclarationId(1380), name: Some("go_let_stmt".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1288)), + FieldValue::Reference(DeclarationId(1289)), ), ( "carrier".to_string(), @@ -51657,26 +47677,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 25051, 25184), }); declarations.push(Declaration { - id: DeclarationId(1380), + id: DeclarationId(1381), name: Some("go_if_expr".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1286)), + FieldValue::Reference(DeclarationId(1287)), ), ( "carrier".to_string(), @@ -51695,26 +47715,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 25186, 25329), }); declarations.push(Declaration { - id: DeclarationId(1381), + id: DeclarationId(1382), name: Some("go_main_wrap".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1289)), + FieldValue::Reference(DeclarationId(1290)), ), ( "carrier".to_string(), @@ -51733,22 +47753,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 25331, 25484), }); declarations.push(Declaration { - id: DeclarationId(1382), + id: DeclarationId(1383), name: Some("go_empty_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -51757,11 +47777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2295), -======= - constructor: DeclarationId(2302), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2303), payload: vec![], }, ), @@ -51777,22 +47793,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 25486, 25624), }); declarations.push(Declaration { - id: DeclarationId(1383), + id: DeclarationId(1384), name: Some("go_singleton_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -51801,8 +47817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2296), + constructor: DeclarationId(2304), payload: vec![], }, ), @@ -51816,7 +47831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2286), + constructor: DeclarationId(2294), payload: vec![], }, ), @@ -51833,22 +47848,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 25626, 25818), }); declarations.push(Declaration { - id: DeclarationId(1384), + id: DeclarationId(1385), name: Some("go_cons_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -51857,7 +47872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2297), + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -51872,7 +47887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2286), + constructor: DeclarationId(2294), payload: vec![], }, ), @@ -51885,7 +47900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2286), + constructor: DeclarationId(2294), payload: vec![], }, ), @@ -51903,22 +47918,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 25820, 26037), }); declarations.push(Declaration { - id: DeclarationId(1385), + id: DeclarationId(1386), name: Some("go_concat_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -51927,7 +47942,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2298), + constructor: DeclarationId(2306), payload: vec![], }, ), @@ -51942,7 +47957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2286), + constructor: DeclarationId(2294), payload: vec![], }, ), @@ -51955,7 +47970,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2286), + constructor: DeclarationId(2294), payload: vec![], }, ), @@ -51973,22 +47988,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 26039, 26262), }); declarations.push(Declaration { - id: DeclarationId(1386), + id: DeclarationId(1387), name: Some("go_length_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -51997,10 +48012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2299), -======= - constructor: DeclarationId(2303), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2307), payload: vec![], }, ), @@ -52028,36 +48040,199 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, -<<<<<<< HEAD -======= - span: SourceSpan::new("src/v3/spec/go.dag", 25626, 25818), + span: SourceSpan::new("src/v3/spec/go.dag", 26264, 26447), }); declarations.push(Declaration { - id: DeclarationId(1384), - name: Some("go_cons_callable".to_string()), + id: DeclarationId(1388), + name: Some("go_list_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1024), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1024)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), + ), + ( + "target".to_string(), + FieldValue::Reference(DeclarationId(686)), + ), + ( + "carrier".to_string(), + FieldValue::Literal(LiteralBits::String("[]{element}".to_string())), + ), + ( + "cost".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/spec/go.dag", 26449, 26585), + }); + declarations.push(Declaration { + id: DeclarationId(1389), + name: Some("go_result_instantiation".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1024), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1024)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1409)), + ), + ( + "target".to_string(), + FieldValue::Reference(DeclarationId(11)), + ), + ( + "carrier".to_string(), + FieldValue::Literal(LiteralBits::String( + "v3Result[{key}, {value}]".to_string(), + )), + ), + ( + "cost".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/spec/go.dag", 27271, 27424), + }); + declarations.push(Declaration { + id: DeclarationId(1390), + name: Some("go_map_instantiation".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1024), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1024)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1409)), + ), + ( + "target".to_string(), + FieldValue::Reference(DeclarationId(137)), + ), + ( + "carrier".to_string(), + FieldValue::Literal(LiteralBits::String("map[{key}]{value}".to_string())), + ), + ( + "cost".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/spec/go.dag", 27426, 27566), + }); + declarations.push(Declaration { + id: DeclarationId(1391), + name: Some("go_is_empty_callable".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1016), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1016)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(689)), + FieldValue::Reference(DeclarationId(712)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2304), + constructor: DeclarationId(2308), + payload: vec![], + }, + ), + ( + "parameters".to_string(), + FieldValue::List(vec![FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("0".to_string())), + ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2293), + payload: vec![], + }, + ), + ])]), + ), + ( + "cost".to_string(), + FieldValue::Literal(LiteralBits::Int("1".to_string())), + ), + ], + }), + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/spec/go.dag", 27568, 27756), + }); + declarations.push(Declaration { + id: DeclarationId(1392), + name: Some("go_fold_callable".to_string()), + connective: TypeConnective::Instantiation { + template: DeclarationId(1016), + arguments: vec![], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: Some(DeclarationId(1016)), + specialization_parent: None, + inhabits: None, + value_body: Some(ValueBody::Structural { + fields: vec![ + ( + "language".to_string(), + FieldValue::Reference(DeclarationId(1409)), + ), + ( + "target".to_string(), + FieldValue::Reference(DeclarationId(694)), + ), + ( + "strategy".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2309), payload: vec![], }, ), @@ -52082,6 +48257,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { "slot".to_string(), FieldValue::Literal(LiteralBits::Int("1".to_string())), ), + ( + "disposition".to_string(), + FieldValue::Variant { + constructor: DeclarationId(2294), + payload: vec![], + }, + ), + ]), + FieldValue::Record(vec![ + ( + "slot".to_string(), + FieldValue::Literal(LiteralBits::Int("2".to_string())), + ), ( "disposition".to_string(), FieldValue::Variant { @@ -52100,34 +48288,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/go.dag", 25820, 26037), + span: SourceSpan::new("src/v3/spec/go.dag", 27758, 28015), }); declarations.push(Declaration { - id: DeclarationId(1385), - name: Some("go_concat_callable".to_string()), + id: DeclarationId(1393), + name: Some("go_map_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(699)), + FieldValue::Reference(DeclarationId(702)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2305), + constructor: DeclarationId(2310), payload: vec![], }, ), @@ -52170,520 +48358,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/go.dag", 26039, 26262), - }); - declarations.push(Declaration { - id: DeclarationId(1386), - name: Some("go_length_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1015), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(709)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2306), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("0".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2292), - payload: vec![], - }, - ), - ])]), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - span: SourceSpan::new("src/v3/spec/go.dag", 26264, 26447), - }); - declarations.push(Declaration { - id: DeclarationId(1387), - name: Some("go_list_instantiation".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1023), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1023)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(686)), - ), - ( - "carrier".to_string(), - FieldValue::Literal(LiteralBits::String("[]{element}".to_string())), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/go.dag", 26449, 26585), - }); - declarations.push(Declaration { - id: DeclarationId(1388), - name: Some("go_result_instantiation".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1023), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1023)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(11)), - ), - ( - "carrier".to_string(), - FieldValue::Literal(LiteralBits::String( - "v3Result[{key}, {value}]".to_string(), - )), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/go.dag", 27271, 27424), - }); - declarations.push(Declaration { - id: DeclarationId(1389), - name: Some("go_map_instantiation".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1023), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1023)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(137)), - ), - ( - "carrier".to_string(), - FieldValue::Literal(LiteralBits::String("map[{key}]{value}".to_string())), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/go.dag", 27426, 27566), - }); - declarations.push(Declaration { - id: DeclarationId(1390), - name: Some("go_is_empty_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1015), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(712)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2300), -======= - constructor: DeclarationId(2307), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("0".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - payload: vec![], - }, - ), - ])]), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/go.dag", 27568, 27756), - }); - declarations.push(Declaration { - id: DeclarationId(1391), - name: Some("go_fold_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1015), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), - ), - ( - "target".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(694)), -======= - FieldValue::Reference(DeclarationId(693)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2308), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("0".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2292), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2293), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("2".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2292), - payload: vec![], - }, - ), - ]), - ]), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/go.dag", 27758, 28015), - }); - declarations.push(Declaration { - id: DeclarationId(1392), - name: Some("go_map_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1015), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(701)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2309), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("0".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2286), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("2".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - payload: vec![], - }, - ), - ]), - ]), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/go.dag", 27758, 28015), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1392), - name: Some("go_map_callable".to_string()), -======= - id: DeclarationId(1393), - name: Some("go_filter_callable".to_string()), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - connective: TypeConnective::Instantiation { - template: DeclarationId(1015), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(702)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2310), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("0".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - payload: vec![], - }, - ), - ]), - ]), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, span: SourceSpan::new("src/v3/spec/go.dag", 28017, 28231), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1393), - name: Some("go_filter_callable".to_string()), -======= id: DeclarationId(1394), - name: Some("go_contains_callable".to_string()), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("go_filter_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -52707,11 +48400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -52724,8 +48413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2285), + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -52743,22 +48431,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28233, 28456), }); declarations.push(Declaration { - id: DeclarationId(1394), + id: DeclarationId(1395), name: Some("go_contains_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -52767,7 +48455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2304), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -52782,7 +48470,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -52795,10 +48483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -52816,22 +48501,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28458, 28687), }); declarations.push(Declaration { - id: DeclarationId(1395), + id: DeclarationId(1396), name: Some("go_list_pattern".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1025), + template: DeclarationId(1026), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1025)), + meta_tag: Some(DeclarationId(1026)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "target".to_string(), @@ -52840,21 +48525,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2306), -======= - constructor: DeclarationId(2313), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2314), payload: vec![], }, ), ( "empty_variant".to_string(), - FieldValue::Reference(DeclarationId(1783)), + FieldValue::Reference(DeclarationId(1784)), ), ( "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1785)), + FieldValue::Reference(DeclarationId(1786)), ), ( "scrutinee".to_string(), @@ -52887,15 +48568,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28774, 29080), }); declarations.push(Declaration { - id: DeclarationId(1396), + id: DeclarationId(1397), name: Some("go_statements".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1027), + template: DeclarationId(1028), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1027)), + meta_tag: Some(DeclarationId(1028)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -52917,15 +48598,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 29082, 29212), }); declarations.push(Declaration { - id: DeclarationId(1397), + id: DeclarationId(1398), name: Some("go_expressions".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1028), + template: DeclarationId(1029), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1028)), + meta_tag: Some(DeclarationId(1029)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -52951,15 +48632,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 29214, 29374), }); declarations.push(Declaration { - id: DeclarationId(1398), + id: DeclarationId(1399), name: Some("go_control_flow".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1030), + template: DeclarationId(1031), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1030)), + meta_tag: Some(DeclarationId(1031)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -52996,15 +48677,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 29376, 29577), }); declarations.push(Declaration { - id: DeclarationId(1399), + id: DeclarationId(1400), name: Some("go_literals".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1031), + template: DeclarationId(1032), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1031)), + meta_tag: Some(DeclarationId(1032)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53028,15 +48709,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 29579, 29689), }); declarations.push(Declaration { - id: DeclarationId(1400), + id: DeclarationId(1401), name: Some("go_modules".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1032), + template: DeclarationId(1033), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1032)), + meta_tag: Some(DeclarationId(1033)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53050,15 +48731,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 29691, 29748), }); declarations.push(Declaration { - id: DeclarationId(1401), + id: DeclarationId(1402), name: Some("go_functions".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1033), + template: DeclarationId(1034), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1033)), + meta_tag: Some(DeclarationId(1034)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53096,15 +48777,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 29750, 30035), }); declarations.push(Declaration { - id: DeclarationId(1402), + id: DeclarationId(1403), name: Some("go_type_applications".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1034), + template: DeclarationId(1035), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1034)), + meta_tag: Some(DeclarationId(1035)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53118,15 +48799,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 30037, 30116), }); declarations.push(Declaration { - id: DeclarationId(1403), + id: DeclarationId(1404), name: Some("go_type_defs".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1035), + template: DeclarationId(1036), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1035)), + meta_tag: Some(DeclarationId(1036)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53162,15 +48843,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 30118, 30341), }); declarations.push(Declaration { - id: DeclarationId(1404), + id: DeclarationId(1405), name: Some("go_patterns".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1037), + template: DeclarationId(1038), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1037)), + meta_tag: Some(DeclarationId(1038)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53216,54 +48897,54 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 30343, 30635), }); declarations.push(Declaration { - id: DeclarationId(1405), + id: DeclarationId(1406), name: Some("go_collection_ops".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1038), + template: DeclarationId(1039), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1038)), + meta_tag: Some(DeclarationId(1039)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "concat_contract".to_string(), - FieldValue::Reference(DeclarationId(1050)), + FieldValue::Reference(DeclarationId(1051)), ), ( "length_contract".to_string(), - FieldValue::Reference(DeclarationId(1051)), + FieldValue::Reference(DeclarationId(1052)), ), ( "is_empty_contract".to_string(), - FieldValue::Reference(DeclarationId(1052)), + FieldValue::Reference(DeclarationId(1053)), ), ( "fold_contract".to_string(), - FieldValue::Reference(DeclarationId(1053)), + FieldValue::Reference(DeclarationId(1054)), ), ( "filter_contract".to_string(), - FieldValue::Reference(DeclarationId(1055)), + FieldValue::Reference(DeclarationId(1056)), ), ( "flat_map_contract".to_string(), - FieldValue::Reference(DeclarationId(1058)), + FieldValue::Reference(DeclarationId(1059)), ), ( "any_contract".to_string(), - FieldValue::Reference(DeclarationId(1056)), + FieldValue::Reference(DeclarationId(1057)), ), ( "all_contract".to_string(), - FieldValue::Reference(DeclarationId(1057)), + FieldValue::Reference(DeclarationId(1058)), ), ( "map_contract".to_string(), - FieldValue::Reference(DeclarationId(1054)), + FieldValue::Reference(DeclarationId(1055)), ), ( "filter".to_string(), @@ -53300,15 +48981,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 30637, 31402), }); declarations.push(Declaration { - id: DeclarationId(1406), + id: DeclarationId(1407), name: Some("go_value_construction".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1039), + template: DeclarationId(1040), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1039)), + meta_tag: Some(DeclarationId(1040)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53344,15 +49025,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 31404, 31672), }); declarations.push(Declaration { - id: DeclarationId(1407), + id: DeclarationId(1408), name: Some("go_record_derive_templates".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1036), + template: DeclarationId(1037), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1036)), + meta_tag: Some(DeclarationId(1037)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53372,66 +49053,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 32429, 32544), }); declarations.push(Declaration { - id: DeclarationId(1408), + id: DeclarationId(1409), name: Some("go_language".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1043), + template: DeclarationId(1044), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1043)), + meta_tag: Some(DeclarationId(1044)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "statements".to_string(), - FieldValue::Reference(DeclarationId(1396)), + FieldValue::Reference(DeclarationId(1397)), ), ( "expressions".to_string(), - FieldValue::Reference(DeclarationId(1397)), + FieldValue::Reference(DeclarationId(1398)), ), ( "control_flow".to_string(), - FieldValue::Reference(DeclarationId(1398)), + FieldValue::Reference(DeclarationId(1399)), ), ( "literals".to_string(), - FieldValue::Reference(DeclarationId(1399)), + FieldValue::Reference(DeclarationId(1400)), ), ( "modules".to_string(), - FieldValue::Reference(DeclarationId(1400)), + FieldValue::Reference(DeclarationId(1401)), ), ( "functions".to_string(), - FieldValue::Reference(DeclarationId(1401)), + FieldValue::Reference(DeclarationId(1402)), ), ( "type_applications".to_string(), - FieldValue::Reference(DeclarationId(1402)), + FieldValue::Reference(DeclarationId(1403)), ), ( "type_definitions".to_string(), - FieldValue::Reference(DeclarationId(1403)), + FieldValue::Reference(DeclarationId(1404)), ), ( "record_derive_templates".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1408)), ), ( "patterns".to_string(), - FieldValue::Reference(DeclarationId(1404)), + FieldValue::Reference(DeclarationId(1405)), ), ( "collection_ops".to_string(), - FieldValue::Reference(DeclarationId(1405)), + FieldValue::Reference(DeclarationId(1406)), ), ( "values".to_string(), - FieldValue::Reference(DeclarationId(1406)), + FieldValue::Reference(DeclarationId(1407)), ), ], }), @@ -53440,15 +49121,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 32546, 32965), }); declarations.push(Declaration { - id: DeclarationId(1409), + id: DeclarationId(1410), name: Some("go_correction_style".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(923), + template: DeclarationId(924), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(923)), + meta_tag: Some(DeclarationId(924)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53476,15 +49157,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 34632, 34768), }); declarations.push(Declaration { - id: DeclarationId(1410), + id: DeclarationId(1411), name: Some("go_clean_emission".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(914), + template: DeclarationId(915), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(914)), + meta_tag: Some(DeclarationId(915)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53492,83 +49173,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "expression_wrapping".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2134), -======= - constructor: DeclarationId(2141), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2142), payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2137), -======= - constructor: DeclarationId(2144), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2145), payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2140), -======= - constructor: DeclarationId(2147), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2148), payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2143), -======= - constructor: DeclarationId(2150), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2151), payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2147), -======= - constructor: DeclarationId(2154), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2155), payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2149), -======= - constructor: DeclarationId(2156), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2157), payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2153), -======= - constructor: DeclarationId(2160), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2161), payload: vec![], }, ), ( "correction_style".to_string(), - FieldValue::Reference(DeclarationId(1409)), + FieldValue::Reference(DeclarationId(1410)), ), ( "post_emit_verifier".to_string(), @@ -53594,11 +49247,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "output_policy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2156), -======= - constructor: DeclarationId(2163), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2164), payload: vec![], }, ), @@ -53611,26 +49260,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 34770, 35328), }); declarations.push(Declaration { - id: DeclarationId(1411), + id: DeclarationId(1412), name: Some("go_clean_emission_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(915), + template: DeclarationId(916), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(915)), + meta_tag: Some(DeclarationId(916)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1409)), ), ( "clean_emission".to_string(), - FieldValue::Reference(DeclarationId(1410)), + FieldValue::Reference(DeclarationId(1411)), ), ], }), @@ -53639,15 +49288,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 35330, 35454), }); declarations.push(Declaration { - id: DeclarationId(1412), + id: DeclarationId(1413), name: Some("python_statements".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1027), + template: DeclarationId(1028), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1027)), + meta_tag: Some(DeclarationId(1028)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53667,15 +49316,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2347, 2469), }); declarations.push(Declaration { - id: DeclarationId(1413), + id: DeclarationId(1414), name: Some("python_expressions".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1028), + template: DeclarationId(1029), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1028)), + meta_tag: Some(DeclarationId(1029)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53701,15 +49350,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2471, 2624), }); declarations.push(Declaration { - id: DeclarationId(1414), + id: DeclarationId(1415), name: Some("python_control_flow".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1030), + template: DeclarationId(1031), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1030)), + meta_tag: Some(DeclarationId(1031)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53746,15 +49395,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2626, 2841), }); declarations.push(Declaration { - id: DeclarationId(1415), + id: DeclarationId(1416), name: Some("python_literals".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1031), + template: DeclarationId(1032), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1031)), + meta_tag: Some(DeclarationId(1032)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53778,15 +49427,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2843, 2957), }); declarations.push(Declaration { - id: DeclarationId(1416), + id: DeclarationId(1417), name: Some("python_modules".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1032), + template: DeclarationId(1033), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1032)), + meta_tag: Some(DeclarationId(1033)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53800,15 +49449,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2959, 3020), }); declarations.push(Declaration { - id: DeclarationId(1417), + id: DeclarationId(1418), name: Some("python_functions".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1033), + template: DeclarationId(1034), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1033)), + meta_tag: Some(DeclarationId(1034)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53846,15 +49495,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 3022, 3329), }); declarations.push(Declaration { - id: DeclarationId(1418), + id: DeclarationId(1419), name: Some("python_type_applications".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1034), + template: DeclarationId(1035), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1034)), + meta_tag: Some(DeclarationId(1035)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53870,15 +49519,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 3331, 3430), }); declarations.push(Declaration { - id: DeclarationId(1419), + id: DeclarationId(1420), name: Some("python_type_definitions".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1035), + template: DeclarationId(1036), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1035)), + meta_tag: Some(DeclarationId(1036)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53918,15 +49567,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 3432, 3763), }); declarations.push(Declaration { - id: DeclarationId(1420), + id: DeclarationId(1421), name: Some("python_patterns".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1037), + template: DeclarationId(1038), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1037)), + meta_tag: Some(DeclarationId(1038)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53972,54 +49621,54 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 3765, 4095), }); declarations.push(Declaration { - id: DeclarationId(1421), + id: DeclarationId(1422), name: Some("python_collections".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1038), + template: DeclarationId(1039), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1038)), + meta_tag: Some(DeclarationId(1039)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "concat_contract".to_string(), - FieldValue::Reference(DeclarationId(1154)), + FieldValue::Reference(DeclarationId(1155)), ), ( "length_contract".to_string(), - FieldValue::Reference(DeclarationId(1155)), + FieldValue::Reference(DeclarationId(1156)), ), ( "is_empty_contract".to_string(), - FieldValue::Reference(DeclarationId(1156)), + FieldValue::Reference(DeclarationId(1157)), ), ( "fold_contract".to_string(), - FieldValue::Reference(DeclarationId(1157)), + FieldValue::Reference(DeclarationId(1158)), ), ( "filter_contract".to_string(), - FieldValue::Reference(DeclarationId(1159)), + FieldValue::Reference(DeclarationId(1160)), ), ( "flat_map_contract".to_string(), - FieldValue::Reference(DeclarationId(1162)), + FieldValue::Reference(DeclarationId(1163)), ), ( "any_contract".to_string(), - FieldValue::Reference(DeclarationId(1160)), + FieldValue::Reference(DeclarationId(1161)), ), ( "all_contract".to_string(), - FieldValue::Reference(DeclarationId(1161)), + FieldValue::Reference(DeclarationId(1162)), ), ( "map_contract".to_string(), - FieldValue::Reference(DeclarationId(1158)), + FieldValue::Reference(DeclarationId(1159)), ), ( "filter".to_string(), @@ -54050,15 +49699,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 4097, 4861), }); declarations.push(Declaration { - id: DeclarationId(1422), + id: DeclarationId(1423), name: Some("python_value_construction".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1039), + template: DeclarationId(1040), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1039)), + meta_tag: Some(DeclarationId(1040)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -54090,15 +49739,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 4863, 5115), }); declarations.push(Declaration { - id: DeclarationId(1423), + id: DeclarationId(1424), name: Some("python_record_derive_templates".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1036), + template: DeclarationId(1037), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1036)), + meta_tag: Some(DeclarationId(1037)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -54118,66 +49767,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 5318, 5437), }); declarations.push(Declaration { - id: DeclarationId(1424), + id: DeclarationId(1425), name: Some("python_language".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1043), + template: DeclarationId(1044), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1043)), + meta_tag: Some(DeclarationId(1044)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "statements".to_string(), - FieldValue::Reference(DeclarationId(1412)), + FieldValue::Reference(DeclarationId(1413)), ), ( "expressions".to_string(), - FieldValue::Reference(DeclarationId(1413)), + FieldValue::Reference(DeclarationId(1414)), ), ( "control_flow".to_string(), - FieldValue::Reference(DeclarationId(1414)), + FieldValue::Reference(DeclarationId(1415)), ), ( "literals".to_string(), - FieldValue::Reference(DeclarationId(1415)), + FieldValue::Reference(DeclarationId(1416)), ), ( "modules".to_string(), - FieldValue::Reference(DeclarationId(1416)), + FieldValue::Reference(DeclarationId(1417)), ), ( "functions".to_string(), - FieldValue::Reference(DeclarationId(1417)), + FieldValue::Reference(DeclarationId(1418)), ), ( "type_applications".to_string(), - FieldValue::Reference(DeclarationId(1418)), + FieldValue::Reference(DeclarationId(1419)), ), ( "type_definitions".to_string(), - FieldValue::Reference(DeclarationId(1419)), + FieldValue::Reference(DeclarationId(1420)), ), ( "record_derive_templates".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1424)), ), ( "patterns".to_string(), - FieldValue::Reference(DeclarationId(1420)), + FieldValue::Reference(DeclarationId(1421)), ), ( "collection_ops".to_string(), - FieldValue::Reference(DeclarationId(1421)), + FieldValue::Reference(DeclarationId(1422)), ), ( "values".to_string(), - FieldValue::Reference(DeclarationId(1422)), + FieldValue::Reference(DeclarationId(1423)), ), ], }), @@ -54186,15 +49835,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 5439, 5914), }); declarations.push(Declaration { - id: DeclarationId(1425), + id: DeclarationId(1426), name: Some("python_target".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(949), + template: DeclarationId(950), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(949)), + meta_tag: Some(DeclarationId(950)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -54202,22 +49851,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "memory".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2199), -======= - constructor: DeclarationId(2206), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2207), payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2202), -======= - constructor: DeclarationId(2209), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2210), payload: vec![], }, ), @@ -54228,22 +49869,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 5916, 6013), }); declarations.push(Declaration { - id: DeclarationId(1426), + id: DeclarationId(1427), name: Some("python_source_filtering".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(951), + template: DeclarationId(952), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(951)), + meta_tag: Some(DeclarationId(952)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "internal".to_string(), - FieldValue::Reference(DeclarationId(952)), + FieldValue::Reference(DeclarationId(953)), ), ( "additional_excluded_prefixes".to_string(), @@ -54256,15 +49897,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6015, 6151), }); declarations.push(Declaration { - id: DeclarationId(1427), + id: DeclarationId(1428), name: Some("python_execution_requirement".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(953), + template: DeclarationId(954), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(953)), + meta_tag: Some(DeclarationId(954)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -54277,22 +49918,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6153, 6232), }); declarations.push(Declaration { - id: DeclarationId(1428), + id: DeclarationId(1429), name: Some("python_int".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -54318,22 +49959,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6234, 6370), }); declarations.push(Declaration { - id: DeclarationId(1429), + id: DeclarationId(1430), name: Some("python_integer_inhabit_at_i32_program_bound".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1009), + template: DeclarationId(1010), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1009)), + meta_tag: Some(DeclarationId(1010)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "kernel_integer".to_string(), @@ -54346,21 +49987,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2280), -======= - constructor: DeclarationId(2287), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2288), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1878), + constructor: DeclarationId(1879), payload: vec![ FieldValue::Literal(LiteralBits::Int( "-2147483648".to_string(), )), FieldValue::Variant { - constructor: DeclarationId(1877), + constructor: DeclarationId(1878), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1875), + constructor: DeclarationId(1876), payload: vec![FieldValue::Literal(LiteralBits::Int( "4294967295".to_string(), ))], @@ -54372,7 +50009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1428)), + FieldValue::Reference(DeclarationId(1429)), ), ], }), @@ -54381,22 +50018,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6463, 6772), }); declarations.push(Declaration { - id: DeclarationId(1430), + id: DeclarationId(1431), name: Some("python_integer_inhabit_unbounded_decl".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1009), + template: DeclarationId(1010), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1009)), + meta_tag: Some(DeclarationId(1010)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "kernel_integer".to_string(), @@ -54409,20 +50046,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2280), -======= - constructor: DeclarationId(2287), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2288), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1879), + constructor: DeclarationId(1880), payload: vec![], }], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1428)), + FieldValue::Reference(DeclarationId(1429)), ), ], }), @@ -54431,22 +50064,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6850, 7060), }); declarations.push(Declaration { - id: DeclarationId(1431), + id: DeclarationId(1432), name: Some("python_bool".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -54472,22 +50105,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7062, 7201), }); declarations.push(Declaration { - id: DeclarationId(1432), + id: DeclarationId(1433), name: Some("python_string".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -54513,22 +50146,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7203, 7345), }); declarations.push(Declaration { - id: DeclarationId(1433), + id: DeclarationId(1434), name: Some("python_node_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -54554,22 +50187,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7347, 7493), }); declarations.push(Declaration { - id: DeclarationId(1434), + id: DeclarationId(1435), name: Some("python_port_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -54595,22 +50228,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7495, 7641), }); declarations.push(Declaration { - id: DeclarationId(1435), + id: DeclarationId(1436), name: Some("python_declaration_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -54636,26 +50269,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7643, 7810), }); declarations.push(Declaration { - id: DeclarationId(1436), + id: DeclarationId(1437), name: Some("python_declaration_ref".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1290)), + FieldValue::Reference(DeclarationId(1291)), ), ( "carrier".to_string(), @@ -54677,22 +50310,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7812, 7981), }); declarations.push(Declaration { - id: DeclarationId(1437), + id: DeclarationId(1438), name: Some("python_source_span".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -54718,22 +50351,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7983, 8142), }); declarations.push(Declaration { - id: DeclarationId(1438), + id: DeclarationId(1439), name: Some("python_dag_port".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -54759,22 +50392,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8144, 8294), }); declarations.push(Declaration { - id: DeclarationId(1439), + id: DeclarationId(1440), name: Some("python_branch_path".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -54800,22 +50433,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8296, 8455), }); declarations.push(Declaration { - id: DeclarationId(1440), + id: DeclarationId(1441), name: Some("python_value_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -54841,22 +50474,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8457, 8613), }); declarations.push(Declaration { - id: DeclarationId(1441), + id: DeclarationId(1442), name: Some("python_transform_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -54882,22 +50515,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8615, 8783), }); declarations.push(Declaration { - id: DeclarationId(1442), + id: DeclarationId(1443), name: Some("python_branch_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -54923,22 +50556,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8785, 8944), }); declarations.push(Declaration { - id: DeclarationId(1443), + id: DeclarationId(1444), name: Some("python_loop_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -54964,22 +50597,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8946, 9099), }); declarations.push(Declaration { - id: DeclarationId(1444), + id: DeclarationId(1445), name: Some("python_bind_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -55005,22 +50638,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9101, 9254), }); declarations.push(Declaration { - id: DeclarationId(1445), + id: DeclarationId(1446), name: Some("python_behavior".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -55046,22 +50679,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9256, 9408), }); declarations.push(Declaration { - id: DeclarationId(1446), + id: DeclarationId(1447), name: Some("python_dag".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -55087,26 +50720,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9410, 9547), }); declarations.push(Declaration { - id: DeclarationId(1447), + id: DeclarationId(1448), name: Some("python_surface_module".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1140)), + FieldValue::Reference(DeclarationId(1141)), ), ( "carrier".to_string(), @@ -55126,11 +50759,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "items".to_string(), ))], @@ -55153,26 +50782,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9621, 9870), }); declarations.push(Declaration { - id: DeclarationId(1448), + id: DeclarationId(1449), name: Some("python_surface_item".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1153)), + FieldValue::Reference(DeclarationId(1154)), ), ( "carrier".to_string(), @@ -55194,26 +50823,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9872, 10034), }); declarations.push(Declaration { - id: DeclarationId(1449), + id: DeclarationId(1450), name: Some("python_surface_param".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1141)), + FieldValue::Reference(DeclarationId(1142)), ), ( "carrier".to_string(), @@ -55234,11 +50863,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -55257,11 +50882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -55282,11 +50903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "refinement".to_string(), ))], @@ -55310,26 +50927,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 10036, 10442), }); declarations.push(Declaration { - id: DeclarationId(1450), + id: DeclarationId(1451), name: Some("python_surface_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1142)), + FieldValue::Reference(DeclarationId(1143)), ), ( "carrier".to_string(), @@ -55350,11 +50967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -55373,11 +50986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -55401,26 +51010,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 10444, 10761), }); declarations.push(Declaration { - id: DeclarationId(1451), + id: DeclarationId(1452), name: Some("python_surface_variant".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1143)), + FieldValue::Reference(DeclarationId(1144)), ), ( "carrier".to_string(), @@ -55441,11 +51050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -55464,11 +51069,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -55487,11 +51088,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -55515,26 +51112,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 10763, 11173), }); declarations.push(Declaration { - id: DeclarationId(1452), + id: DeclarationId(1453), name: Some("python_variant_payload".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1144)), + FieldValue::Reference(DeclarationId(1145)), ), ( "carrier".to_string(), @@ -55556,26 +51153,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 11175, 11346), }); declarations.push(Declaration { - id: DeclarationId(1453), + id: DeclarationId(1454), name: Some("python_surface_type".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1145)), + FieldValue::Reference(DeclarationId(1146)), ), ( "carrier".to_string(), @@ -55597,26 +51194,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 11348, 11510), }); declarations.push(Declaration { - id: DeclarationId(1454), + id: DeclarationId(1455), name: Some("python_surface_record_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1146)), + FieldValue::Reference(DeclarationId(1147)), ), ( "carrier".to_string(), @@ -55637,11 +51234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -55660,11 +51253,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -55683,11 +51272,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -55711,26 +51296,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 11512, 11931), }); declarations.push(Declaration { - id: DeclarationId(1455), + id: DeclarationId(1456), name: Some("python_surface_map_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1147)), + FieldValue::Reference(DeclarationId(1148)), ), ( "carrier".to_string(), @@ -55751,11 +51336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "key".to_string(), ))], @@ -55776,11 +51357,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "key_span".to_string(), ))], @@ -55799,11 +51376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -55822,11 +51395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -55850,26 +51419,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 11933, 12426), }); declarations.push(Declaration { - id: DeclarationId(1456), + id: DeclarationId(1457), name: Some("python_surface_match_arm".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1148)), + FieldValue::Reference(DeclarationId(1149)), ), ( "carrier".to_string(), @@ -55890,11 +51459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -55913,11 +51478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -55936,11 +51497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -55964,26 +51521,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 12428, 12842), }); declarations.push(Declaration { - id: DeclarationId(1457), + id: DeclarationId(1458), name: Some("python_surface_pattern_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1149)), + FieldValue::Reference(DeclarationId(1150)), ), ( "carrier".to_string(), @@ -56004,11 +51561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -56027,11 +51580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -56050,11 +51599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -56078,26 +51623,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 12844, 13270), }); declarations.push(Declaration { - id: DeclarationId(1458), + id: DeclarationId(1459), name: Some("python_surface_pattern".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1150)), + FieldValue::Reference(DeclarationId(1151)), ), ( "carrier".to_string(), @@ -56119,26 +51664,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13272, 13443), }); declarations.push(Declaration { - id: DeclarationId(1459), + id: DeclarationId(1460), name: Some("python_surface_literal".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1151)), + FieldValue::Reference(DeclarationId(1152)), ), ( "carrier".to_string(), @@ -56160,26 +51705,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13445, 13616), }); declarations.push(Declaration { - id: DeclarationId(1460), + id: DeclarationId(1461), name: Some("python_surface_expr".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1152)), + FieldValue::Reference(DeclarationId(1153)), ), ( "carrier".to_string(), @@ -56201,22 +51746,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13618, 13780), }); declarations.push(Declaration { - id: DeclarationId(1461), + id: DeclarationId(1462), name: Some("python_int_add".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -56238,22 +51783,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13782, 13931), }); declarations.push(Declaration { - id: DeclarationId(1462), + id: DeclarationId(1463), name: Some("python_int_sub".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -56275,22 +51820,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13933, 14082), }); declarations.push(Declaration { - id: DeclarationId(1463), + id: DeclarationId(1464), name: Some("python_int_mul".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -56312,22 +51857,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14084, 14233), }); declarations.push(Declaration { - id: DeclarationId(1464), + id: DeclarationId(1465), name: Some("python_int_div".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -56351,22 +51896,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14235, 14394), }); declarations.push(Declaration { - id: DeclarationId(1465), + id: DeclarationId(1466), name: Some("python_int_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -56387,63 +51932,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 14396, 14544), }); - declarations.push(Declaration { - id: DeclarationId(1466), - name: Some("python_node_id_eq".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1013), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), -<<<<<<< HEAD -======= - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(721)), - ), - ("op".to_string(), FieldValue::Reference(DeclarationId(359))), - ( - "carrier".to_string(), - FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/python.dag", 14546, 14701), - }); declarations.push(Declaration { id: DeclarationId(1467), - name: Some("python_port_id_eq".to_string()), + name: Some("python_node_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -56465,27 +51970,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14546, 14701), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1467), - name: Some("python_port_id_eq".to_string()), -======= id: DeclarationId(1468), - name: Some("python_declaration_id_eq".to_string()), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("python_port_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -56507,28 +52007,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14703, 14858), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1468), - name: Some("python_declaration_id_eq".to_string()), -======= id: DeclarationId(1469), - name: Some("python_int_ne".to_string()), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("python_declaration_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), -<<<<<<< HEAD + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -56550,24 +52044,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14860, 15029), }); declarations.push(Declaration { - id: DeclarationId(1469), + id: DeclarationId(1470), name: Some("python_int_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), -======= ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -56589,22 +52081,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15031, 15179), }); declarations.push(Declaration { - id: DeclarationId(1470), + id: DeclarationId(1471), name: Some("python_int_lt".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -56626,22 +52118,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15181, 15328), }); declarations.push(Declaration { - id: DeclarationId(1471), + id: DeclarationId(1472), name: Some("python_int_le".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -56663,22 +52155,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15330, 15478), }); declarations.push(Declaration { - id: DeclarationId(1472), + id: DeclarationId(1473), name: Some("python_int_gt".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -56700,22 +52192,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15480, 15627), }); declarations.push(Declaration { - id: DeclarationId(1473), + id: DeclarationId(1474), name: Some("python_int_ge".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -56737,22 +52229,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15629, 15777), }); declarations.push(Declaration { - id: DeclarationId(1474), + id: DeclarationId(1475), name: Some("python_bool_meet".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -56774,22 +52266,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15779, 15937), }); declarations.push(Declaration { - id: DeclarationId(1475), + id: DeclarationId(1476), name: Some("python_bool_join".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -56811,22 +52303,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15939, 16096), }); declarations.push(Declaration { - id: DeclarationId(1476), + id: DeclarationId(1477), name: Some("python_empty_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -56835,11 +52327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2295), -======= - constructor: DeclarationId(2302), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2303), payload: vec![], }, ), @@ -56855,22 +52343,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 16098, 16244), }); declarations.push(Declaration { - id: DeclarationId(1477), + id: DeclarationId(1478), name: Some("python_singleton_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -56879,8 +52367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2296), + constructor: DeclarationId(2304), payload: vec![], }, ), @@ -56894,7 +52381,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2286), + constructor: DeclarationId(2294), payload: vec![], }, ), @@ -56911,22 +52398,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 16246, 16446), }); declarations.push(Declaration { - id: DeclarationId(1478), + id: DeclarationId(1479), name: Some("python_cons_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -56935,7 +52422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2297), + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -56950,7 +52437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2286), + constructor: DeclarationId(2294), payload: vec![], }, ), @@ -56963,7 +52450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2286), + constructor: DeclarationId(2294), payload: vec![], }, ), @@ -56981,22 +52468,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 16448, 16673), }); declarations.push(Declaration { - id: DeclarationId(1479), + id: DeclarationId(1480), name: Some("python_concat_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -57005,7 +52492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2298), + constructor: DeclarationId(2306), payload: vec![], }, ), @@ -57020,7 +52507,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2286), + constructor: DeclarationId(2294), payload: vec![], }, ), @@ -57033,7 +52520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2286), + constructor: DeclarationId(2294), payload: vec![], }, ), @@ -57051,22 +52538,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 16675, 16906), }); declarations.push(Declaration { - id: DeclarationId(1480), + id: DeclarationId(1481), name: Some("python_length_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -57075,10 +52562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2299), -======= - constructor: DeclarationId(2303), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2307), payload: vec![], }, ), @@ -57106,223 +52590,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, -<<<<<<< HEAD -======= - span: SourceSpan::new("src/v3/spec/python.dag", 16246, 16446), - }); - declarations.push(Declaration { - id: DeclarationId(1478), - name: Some("python_cons_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1015), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(689)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2304), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("0".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2293), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2293), - payload: vec![], - }, - ), - ]), - ]), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/python.dag", 16448, 16673), - }); - declarations.push(Declaration { - id: DeclarationId(1479), - name: Some("python_concat_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1015), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(699)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2305), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("0".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2293), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2293), - payload: vec![], - }, - ), - ]), - ]), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/python.dag", 16675, 16906), - }); - declarations.push(Declaration { - id: DeclarationId(1480), - name: Some("python_length_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1015), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(709)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2306), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("0".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2292), - payload: vec![], - }, - ), - ])]), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) span: SourceSpan::new("src/v3/spec/python.dag", 16908, 17099), }); declarations.push(Declaration { - id: DeclarationId(1481), + id: DeclarationId(1482), name: Some("python_is_empty_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -57331,11 +52617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2300), -======= - constructor: DeclarationId(2307), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2308), payload: vec![], }, ), @@ -57349,11 +52631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -57370,113 +52648,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 17101, 17297), }); declarations.push(Declaration { - id: DeclarationId(1482), + id: DeclarationId(1483), name: Some("python_fold_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), -<<<<<<< HEAD FieldValue::Reference(DeclarationId(694)), -======= - FieldValue::Reference(DeclarationId(693)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2308), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("0".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2292), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2293), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("2".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2292), - payload: vec![], - }, - ), - ]), - ]), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/python.dag", 17299, 17564), - }); - declarations.push(Declaration { - id: DeclarationId(1483), - name: Some("python_map_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1015), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(701)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "strategy".to_string(), @@ -57496,11 +52687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -57513,8 +52700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2286), + constructor: DeclarationId(2294), payload: vec![], }, ), @@ -57527,10 +52713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -57548,27 +52731,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 17299, 17564), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1483), - name: Some("python_map_callable".to_string()), -======= id: DeclarationId(1484), - name: Some("python_filter_callable".to_string()), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("python_map_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -57592,11 +52770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -57609,11 +52783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -57631,27 +52801,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 17566, 17788), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1484), - name: Some("python_filter_callable".to_string()), -======= id: DeclarationId(1485), - name: Some("python_contains_callable".to_string()), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("python_filter_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -57675,11 +52840,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -57692,8 +52853,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2285), + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -57711,22 +52871,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 17790, 18021), }); declarations.push(Declaration { - id: DeclarationId(1485), + id: DeclarationId(1486), name: Some("python_contains_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -57735,7 +52895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2304), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -57750,7 +52910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -57763,10 +52923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -57784,22 +52941,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 18023, 18260), }); declarations.push(Declaration { - id: DeclarationId(1486), + id: DeclarationId(1487), name: Some("python_list_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1023), + template: DeclarationId(1024), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1023)), + meta_tag: Some(DeclarationId(1024)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -57819,24 +52976,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 18262, 18410), }); - declarations.push(Declaration { id: DeclarationId(1487), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1023), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1023)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1424))), ("target".to_string(), FieldValue::Reference(DeclarationId(11))), ("carrier".to_string(), FieldValue::Literal(LiteralBits::String("typing.Union[typing.Tuple[typing.Literal['Ok'], {key}], typing.Tuple[typing.Literal['Err'], {value}]]".to_string()))), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int("1".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 18526, 18764) }); + declarations.push(Declaration { id: DeclarationId(1488), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1024), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1024)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1425))), ("target".to_string(), FieldValue::Reference(DeclarationId(11))), ("carrier".to_string(), FieldValue::Literal(LiteralBits::String("typing.Union[typing.Tuple[typing.Literal['Ok'], {key}], typing.Tuple[typing.Literal['Err'], {value}]]".to_string()))), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int("1".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 18526, 18764) }); declarations.push(Declaration { - id: DeclarationId(1488), + id: DeclarationId(1489), name: Some("python_non_empty_list_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1023), + template: DeclarationId(1024), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1023)), + meta_tag: Some(DeclarationId(1024)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -57859,22 +53016,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 18855, 19029), }); declarations.push(Declaration { - id: DeclarationId(1489), + id: DeclarationId(1490), name: Some("python_non_singleton_list_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1023), + template: DeclarationId(1024), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1023)), + meta_tag: Some(DeclarationId(1024)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -57897,22 +53054,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 19031, 19217), }); declarations.push(Declaration { - id: DeclarationId(1490), + id: DeclarationId(1491), name: Some("python_list_pattern".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1025), + template: DeclarationId(1026), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1025)), + meta_tag: Some(DeclarationId(1026)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "target".to_string(), @@ -57921,21 +53078,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2306), -======= - constructor: DeclarationId(2313), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2314), payload: vec![], }, ), ( "empty_variant".to_string(), - FieldValue::Reference(DeclarationId(1783)), + FieldValue::Reference(DeclarationId(1784)), ), ( "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1785)), + FieldValue::Reference(DeclarationId(1786)), ), ( "scrutinee".to_string(), @@ -57968,15 +53121,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 19218, 19532), }); declarations.push(Declaration { - id: DeclarationId(1491), + id: DeclarationId(1492), name: Some("python_correction_style".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(923), + template: DeclarationId(924), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(923)), + meta_tag: Some(DeclarationId(924)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -58004,15 +53157,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 21597, 21739), }); declarations.push(Declaration { - id: DeclarationId(1492), + id: DeclarationId(1493), name: Some("python_clean_emission".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(914), + template: DeclarationId(915), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(914)), + meta_tag: Some(DeclarationId(915)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -58020,83 +53173,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "expression_wrapping".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2134), -======= - constructor: DeclarationId(2141), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2142), payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2139), -======= - constructor: DeclarationId(2146), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2147), payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2140), -======= - constructor: DeclarationId(2147), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2148), payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2143), -======= - constructor: DeclarationId(2150), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2151), payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2147), -======= - constructor: DeclarationId(2154), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2155), payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2148), -======= - constructor: DeclarationId(2155), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2156), payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2153), -======= - constructor: DeclarationId(2160), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2161), payload: vec![], }, ), ( "correction_style".to_string(), - FieldValue::Reference(DeclarationId(1491)), + FieldValue::Reference(DeclarationId(1492)), ), ( "post_emit_verifier".to_string(), @@ -58125,11 +53250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "output_policy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2155), -======= - constructor: DeclarationId(2162), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2163), payload: vec![], }, ), @@ -58142,26 +53263,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 21741, 22321), }); declarations.push(Declaration { - id: DeclarationId(1493), + id: DeclarationId(1494), name: Some("python_clean_emission_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(915), + template: DeclarationId(916), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(915)), + meta_tag: Some(DeclarationId(916)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1424)), + FieldValue::Reference(DeclarationId(1425)), ), ( "clean_emission".to_string(), - FieldValue::Reference(DeclarationId(1492)), + FieldValue::Reference(DeclarationId(1493)), ), ], }), @@ -58170,15 +53291,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 22323, 22459), }); declarations.push(Declaration { - id: DeclarationId(1494), + id: DeclarationId(1495), name: Some("rust_execution_model".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(949), + template: DeclarationId(950), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(949)), + meta_tag: Some(DeclarationId(950)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -58186,22 +53307,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "memory".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2201), -======= - constructor: DeclarationId(2208), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2202), -======= - constructor: DeclarationId(2209), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2210), payload: vec![], }, ), @@ -58212,22 +53325,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5045, 5147), }); declarations.push(Declaration { - id: DeclarationId(1495), + id: DeclarationId(1496), name: Some("rust_source_filtering".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(951), + template: DeclarationId(952), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(951)), + meta_tag: Some(DeclarationId(952)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "internal".to_string(), - FieldValue::Reference(DeclarationId(952)), + FieldValue::Reference(DeclarationId(953)), ), ( "additional_excluded_prefixes".to_string(), @@ -58242,15 +53355,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5149, 5301), }); declarations.push(Declaration { - id: DeclarationId(1496), + id: DeclarationId(1497), name: Some("rust_execution_requirement".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(953), + template: DeclarationId(954), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(953)), + meta_tag: Some(DeclarationId(954)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -58263,22 +53376,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5303, 5378), }); declarations.push(Declaration { - id: DeclarationId(1497), + id: DeclarationId(1498), name: Some("rust_int".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -58304,22 +53417,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5829, 5961), }); declarations.push(Declaration { - id: DeclarationId(1498), + id: DeclarationId(1499), name: Some("rust_uint8".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -58345,22 +53458,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5963, 6098), }); declarations.push(Declaration { - id: DeclarationId(1499), + id: DeclarationId(1500), name: Some("rust_i32".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -58386,22 +53499,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 6100, 6234), }); declarations.push(Declaration { - id: DeclarationId(1500), + id: DeclarationId(1501), name: Some("rust_u32".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -58427,22 +53540,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 6236, 6371), }); declarations.push(Declaration { - id: DeclarationId(1501), + id: DeclarationId(1502), name: Some("rust_i128".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -58468,22 +53581,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 6373, 6510), }); declarations.push(Declaration { - id: DeclarationId(1502), + id: DeclarationId(1503), name: Some("rust_u128".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -58509,22 +53622,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 6802, 6940), }); declarations.push(Declaration { - id: DeclarationId(1503), + id: DeclarationId(1504), name: Some("rust_isize".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -58550,22 +53663,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7343, 7487), }); declarations.push(Declaration { - id: DeclarationId(1504), + id: DeclarationId(1505), name: Some("rust_usize".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -58591,22 +53704,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7489, 7634), }); declarations.push(Declaration { - id: DeclarationId(1505), + id: DeclarationId(1506), name: Some("rust_integer_inhabit_u32_at_program_bound".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1009), + template: DeclarationId(1010), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1009)), + meta_tag: Some(DeclarationId(1010)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "kernel_integer".to_string(), @@ -58619,19 +53732,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2280), -======= - constructor: DeclarationId(2287), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2288), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1878), + constructor: DeclarationId(1879), payload: vec![ FieldValue::Literal(LiteralBits::Int("0".to_string())), FieldValue::Variant { - constructor: DeclarationId(1877), + constructor: DeclarationId(1878), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1875), + constructor: DeclarationId(1876), payload: vec![FieldValue::Literal(LiteralBits::Int( "4294967295".to_string(), ))], @@ -58643,7 +53752,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1500)), + FieldValue::Reference(DeclarationId(1501)), ), ], }), @@ -58652,22 +53761,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8055, 8354), }); declarations.push(Declaration { - id: DeclarationId(1506), + id: DeclarationId(1507), name: Some("rust_integer_inhabit_i32_at_program_bound".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1009), + template: DeclarationId(1010), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1009)), + meta_tag: Some(DeclarationId(1010)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "kernel_integer".to_string(), @@ -58680,21 +53789,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2280), -======= - constructor: DeclarationId(2287), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2288), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1878), + constructor: DeclarationId(1879), payload: vec![ FieldValue::Literal(LiteralBits::Int( "-2147483648".to_string(), )), FieldValue::Variant { - constructor: DeclarationId(1877), + constructor: DeclarationId(1878), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1875), + constructor: DeclarationId(1876), payload: vec![FieldValue::Literal(LiteralBits::Int( "4294967295".to_string(), ))], @@ -58706,7 +53811,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1499)), + FieldValue::Reference(DeclarationId(1500)), ), ], }), @@ -58715,22 +53820,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8356, 8663), }); declarations.push(Declaration { - id: DeclarationId(1507), + id: DeclarationId(1508), name: Some("rust_integer_inhabit_i32_bound_unspecified".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1009), + template: DeclarationId(1010), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1009)), + meta_tag: Some(DeclarationId(1010)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "kernel_integer".to_string(), @@ -58743,17 +53848,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2279), -======= - constructor: DeclarationId(2286), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2287), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1499)), + FieldValue::Reference(DeclarationId(1500)), ), ], }), @@ -58762,22 +53863,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8665, 8870), }); declarations.push(Declaration { - id: DeclarationId(1508), + id: DeclarationId(1509), name: Some("rust_integer_inhabit_int64_bound_unspecified".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1009), + template: DeclarationId(1010), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1009)), + meta_tag: Some(DeclarationId(1010)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "kernel_integer".to_string(), @@ -58790,17 +53891,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2279), -======= - constructor: DeclarationId(2286), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2287), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1497)), + FieldValue::Reference(DeclarationId(1498)), ), ], }), @@ -58809,22 +53906,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8872, 9075), }); declarations.push(Declaration { - id: DeclarationId(1509), + id: DeclarationId(1510), name: Some("rust_integer_inhabit_i128_bound_unspecified".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1009), + template: DeclarationId(1010), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1009)), + meta_tag: Some(DeclarationId(1010)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "kernel_integer".to_string(), @@ -58837,17 +53934,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2279), -======= - constructor: DeclarationId(2286), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2287), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1501)), + FieldValue::Reference(DeclarationId(1502)), ), ], }), @@ -58856,22 +53949,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 9077, 9286), }); declarations.push(Declaration { - id: DeclarationId(1510), + id: DeclarationId(1511), name: Some("rust_integer_inhabit_u128_bound_unspecified".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1009), + template: DeclarationId(1010), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1009)), + meta_tag: Some(DeclarationId(1010)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "kernel_integer".to_string(), @@ -58884,17 +53977,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2279), -======= - constructor: DeclarationId(2286), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2287), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1502)), + FieldValue::Reference(DeclarationId(1503)), ), ], }), @@ -58903,22 +53992,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 9711, 9922), }); declarations.push(Declaration { - id: DeclarationId(1511), + id: DeclarationId(1512), name: Some("rust_integer_inhabit_isize_platform".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1009), + template: DeclarationId(1010), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1009)), + meta_tag: Some(DeclarationId(1010)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "kernel_integer".to_string(), @@ -58931,17 +54020,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2281), -======= - constructor: DeclarationId(2288), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2289), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1503)), + FieldValue::Reference(DeclarationId(1504)), ), ], }), @@ -58950,22 +54035,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10285, 10502), }); declarations.push(Declaration { - id: DeclarationId(1512), + id: DeclarationId(1513), name: Some("rust_integer_inhabit_usize_platform".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1009), + template: DeclarationId(1010), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1009)), + meta_tag: Some(DeclarationId(1010)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "kernel_integer".to_string(), @@ -58978,17 +54063,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2281), -======= - constructor: DeclarationId(2288), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2289), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1504)), + FieldValue::Reference(DeclarationId(1505)), ), ], }), @@ -58997,22 +54078,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10504, 10723), }); declarations.push(Declaration { - id: DeclarationId(1513), + id: DeclarationId(1514), name: Some("rust_bool".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -59038,22 +54119,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10725, 10860), }); declarations.push(Declaration { - id: DeclarationId(1514), + id: DeclarationId(1515), name: Some("rust_string".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -59079,22 +54160,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10862, 11004), }); declarations.push(Declaration { - id: DeclarationId(1515), + id: DeclarationId(1516), name: Some("rust_node_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -59120,22 +54201,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 11006, 11148), }); declarations.push(Declaration { - id: DeclarationId(1516), + id: DeclarationId(1517), name: Some("rust_port_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -59161,22 +54242,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 11150, 11292), }); declarations.push(Declaration { - id: DeclarationId(1517), + id: DeclarationId(1518), name: Some("rust_declaration_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -59202,22 +54283,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 11294, 11457), }); declarations.push(Declaration { - id: DeclarationId(1518), + id: DeclarationId(1519), name: Some("rust_cluster_id".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -59243,22 +54324,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 11459, 11610), }); declarations.push(Declaration { - id: DeclarationId(1519), + id: DeclarationId(1520), name: Some("rust_type_shape".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -59282,11 +54363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "declaration".to_string(), ))], @@ -59309,22 +54386,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 11612, 11857), }); declarations.push(Declaration { - id: DeclarationId(1520), + id: DeclarationId(1521), name: Some("rust_port_state".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -59350,22 +54427,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 11859, 12011), }); declarations.push(Declaration { - id: DeclarationId(1521), + id: DeclarationId(1522), name: Some("rust_port".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -59390,11 +54467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -59413,11 +54486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "state_value".to_string(), ))], @@ -59438,11 +54507,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "produced_by".to_string(), ))], @@ -59466,22 +54531,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 12013, 12409), }); declarations.push(Declaration { - id: DeclarationId(1522), + id: DeclarationId(1523), name: Some("rust_source_span".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -59506,11 +54571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "file".to_string(), ))], @@ -59529,11 +54590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_start".to_string(), ))], @@ -59552,11 +54609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_end".to_string(), ))], @@ -59580,22 +54633,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 12411, 12809), }); declarations.push(Declaration { - id: DeclarationId(1523), + id: DeclarationId(1524), name: Some("rust_literal_bits".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -59621,22 +54674,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 12811, 12969), }); declarations.push(Declaration { - id: DeclarationId(1524), + id: DeclarationId(1525), name: Some("rust_atom_payload".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -59662,22 +54715,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 12971, 13129), }); declarations.push(Declaration { - id: DeclarationId(1525), + id: DeclarationId(1526), name: Some("rust_cardinality_bound".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -59703,22 +54756,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 13131, 13304), }); declarations.push(Declaration { - id: DeclarationId(1526), + id: DeclarationId(1527), name: Some("rust_interval".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -59744,22 +54797,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 13306, 13454), }); declarations.push(Declaration { - id: DeclarationId(1527), + id: DeclarationId(1528), name: Some("rust_positive_interval_width".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -59787,22 +54840,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 13456, 13645), }); declarations.push(Declaration { - id: DeclarationId(1528), + id: DeclarationId(1529), name: Some("rust_interval_width".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -59828,22 +54881,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 13647, 13811), }); declarations.push(Declaration { - id: DeclarationId(1529), + id: DeclarationId(1530), name: Some("rust_conj_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -59868,11 +54921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -59891,11 +54940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -59919,22 +54964,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 13813, 14115), }); declarations.push(Declaration { - id: DeclarationId(1530), + id: DeclarationId(1531), name: Some("rust_template_argument".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -59961,11 +55006,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -59984,11 +55025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -60012,22 +55049,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 14117, 14458), }); declarations.push(Declaration { - id: DeclarationId(1531), + id: DeclarationId(1532), name: Some("rust_phantom_parameter".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -60054,11 +55091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -60077,11 +55110,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "algebra".to_string(), ))], @@ -60105,22 +55134,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 14460, 14805), }); declarations.push(Declaration { - id: DeclarationId(1532), + id: DeclarationId(1533), name: Some("rust_nominal_opacity".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -60146,11 +55175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "permitted_accessors".to_string(), ))], @@ -60173,22 +55198,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 14807, 15083), }); declarations.push(Declaration { - id: DeclarationId(1533), + id: DeclarationId(1534), name: Some("rust_field_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -60215,11 +55240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "0".to_string(), ))], @@ -60238,11 +55259,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "1".to_string(), ))], @@ -60266,22 +55283,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 15085, 15402), }); declarations.push(Declaration { - id: DeclarationId(1534), + id: DeclarationId(1535), name: Some("rust_non_empty_list".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -60306,11 +55323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -60329,11 +55342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -60357,22 +55366,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 15404, 15724), }); declarations.push(Declaration { - id: DeclarationId(1535), + id: DeclarationId(1536), name: Some("rust_non_singleton_list".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -60397,11 +55406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -60420,11 +55425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "second".to_string(), ))], @@ -60443,11 +55444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -60471,22 +55468,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 15726, 16139), }); declarations.push(Declaration { - id: DeclarationId(1536), + id: DeclarationId(1537), name: Some("rust_element_ref".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -60510,11 +55507,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "index_of".to_string(), ))], @@ -60537,22 +55530,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16141, 16382), }); declarations.push(Declaration { - id: DeclarationId(1537), + id: DeclarationId(1538), name: Some("rust_param_ref".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -60577,11 +55570,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "member_of".to_string(), ))], @@ -60600,11 +55589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "slot_of".to_string(), ))], @@ -60628,22 +55613,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16384, 16704), }); declarations.push(Declaration { - id: DeclarationId(1538), + id: DeclarationId(1539), name: Some("rust_transform_ref".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -60667,11 +55652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "node_id".to_string(), ))], @@ -60694,22 +55675,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16706, 16951), }); declarations.push(Declaration { - id: DeclarationId(1539), + id: DeclarationId(1540), name: Some("rust_member_descent".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -60733,11 +55714,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "param".to_string(), ))], @@ -60760,22 +55737,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16953, 17198), }); declarations.push(Declaration { - id: DeclarationId(1540), + id: DeclarationId(1541), name: Some("rust_intra_cluster_call".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -60799,11 +55776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "transform".to_string(), ))], @@ -60826,22 +55799,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 17200, 17463), }); declarations.push(Declaration { - id: DeclarationId(1541), + id: DeclarationId(1542), name: Some("rust_cluster".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -60866,11 +55839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "members".to_string(), ))], @@ -60891,11 +55860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "intra_cluster_calls".to_string(), ))], @@ -60919,22 +55884,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 17465, 17802), }); declarations.push(Declaration { - id: DeclarationId(1542), + id: DeclarationId(1543), name: Some("rust_field_value".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -60960,22 +55925,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 17804, 17959), }); declarations.push(Declaration { - id: DeclarationId(1543), + id: DeclarationId(1544), name: Some("rust_value_body".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -61001,22 +55966,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 17961, 18113), }); declarations.push(Declaration { - id: DeclarationId(1544), + id: DeclarationId(1545), name: Some("rust_arrow_body".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -61042,22 +56007,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 18115, 18267), }); declarations.push(Declaration { - id: DeclarationId(1545), + id: DeclarationId(1546), name: Some("rust_type_connective".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -61083,22 +56048,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 18269, 18436), }); declarations.push(Declaration { - id: DeclarationId(1546), + id: DeclarationId(1547), name: Some("rust_declaration".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -61123,11 +56088,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -61146,11 +56107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -61171,11 +56128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "connective".to_string(), ))], @@ -61196,11 +56149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "type_params".to_string(), ))], @@ -61221,11 +56170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "phantom_params".to_string(), ))], @@ -61246,11 +56191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "meta_tag".to_string(), ))], @@ -61271,11 +56212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "inhabits".to_string(), ))], @@ -61296,11 +56233,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "value_body".to_string(), ))], @@ -61321,11 +56254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "nominal_opacity".to_string(), ))], @@ -61344,11 +56273,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -61372,22 +56297,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 18438, 19459), }); declarations.push(Declaration { - id: DeclarationId(1547), + id: DeclarationId(1548), name: Some("rust_arithmetic_op".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -61413,22 +56338,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 19461, 19622), }); declarations.push(Declaration { - id: DeclarationId(1548), + id: DeclarationId(1549), name: Some("rust_comparison_op".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -61454,22 +56379,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 19624, 19785), }); declarations.push(Declaration { - id: DeclarationId(1549), + id: DeclarationId(1550), name: Some("rust_logical_op".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -61495,22 +56420,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 19787, 19939), }); declarations.push(Declaration { - id: DeclarationId(1550), + id: DeclarationId(1551), name: Some("rust_operator_kind".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -61536,22 +56461,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 19941, 20102), }); declarations.push(Declaration { - id: DeclarationId(1551), + id: DeclarationId(1552), name: Some("rust_transform_target".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -61577,22 +56502,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 20104, 20274), }); declarations.push(Declaration { - id: DeclarationId(1552), + id: DeclarationId(1553), name: Some("rust_branch_pattern".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -61618,22 +56543,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 20276, 20440), }); declarations.push(Declaration { - id: DeclarationId(1553), + id: DeclarationId(1554), name: Some("rust_payload_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -61660,11 +56585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "binding_name".to_string(), ))], @@ -61685,11 +56606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "payload_port".to_string(), ))], @@ -61713,22 +56630,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 20442, 20797), }); declarations.push(Declaration { - id: DeclarationId(1554), + id: DeclarationId(1555), name: Some("rust_branch_path".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -61753,11 +56670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -61778,11 +56691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -61801,11 +56710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -61824,11 +56729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -61852,22 +56753,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 20799, 21287), }); declarations.push(Declaration { - id: DeclarationId(1555), + id: DeclarationId(1556), name: Some("rust_loop_bound".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -61893,22 +56794,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 21289, 21441), }); declarations.push(Declaration { - id: DeclarationId(1556), + id: DeclarationId(1557), name: Some("rust_value_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -61933,11 +56834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -61956,11 +56853,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "data".to_string(), ))], @@ -61981,11 +56874,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -62004,11 +56893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -62029,11 +56914,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "lane2_workflow".to_string(), ))], @@ -62057,22 +56938,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 21443, 22216), }); declarations.push(Declaration { - id: DeclarationId(1557), + id: DeclarationId(1558), name: Some("rust_transform_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -62097,11 +56978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -62120,11 +56997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "target".to_string(), ))], @@ -62143,11 +57016,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "inputs".to_string(), ))], @@ -62168,11 +57037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -62191,11 +57056,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -62219,22 +57080,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 22218, 22790), }); declarations.push(Declaration { - id: DeclarationId(1558), + id: DeclarationId(1559), name: Some("rust_branch_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -62259,11 +57120,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -62282,11 +57139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "input".to_string(), ))], @@ -62305,11 +57158,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "paths".to_string(), ))], @@ -62330,11 +57179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -62353,11 +57198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -62378,11 +57219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -62406,22 +57243,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 22792, 23459), }); declarations.push(Declaration { - id: DeclarationId(1559), + id: DeclarationId(1560), name: Some("rust_loop_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -62446,11 +57283,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -62469,11 +57302,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "source".to_string(), ))], @@ -62492,11 +57321,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "init".to_string(), ))], @@ -62515,11 +57340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -62538,11 +57359,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "bound".to_string(), ))], @@ -62563,11 +57380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -62586,11 +57399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -62614,22 +57423,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 23461, 24170), }); declarations.push(Declaration { - id: DeclarationId(1560), + id: DeclarationId(1561), name: Some("rust_bind_node".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -62654,11 +57463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -62677,11 +57482,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -62702,11 +57503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -62725,11 +57522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "params".to_string(), ))], @@ -62748,11 +57541,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -62773,11 +57562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "lane2_workflow".to_string(), ))], @@ -62798,11 +57583,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -62826,22 +57607,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 24172, 24932), }); declarations.push(Declaration { - id: DeclarationId(1561), + id: DeclarationId(1562), name: Some("rust_behavior".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -62867,22 +57648,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 24934, 25082), }); declarations.push(Declaration { - id: DeclarationId(1562), + id: DeclarationId(1563), name: Some("rust_dag".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -62909,11 +57690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "declarations".to_string(), ))], @@ -62932,11 +57709,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "nodes".to_string(), ))], @@ -62955,11 +57728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "ports".to_string(), ))], @@ -62980,11 +57749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2283), -======= - constructor: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2291), payload: vec![FieldValue::Literal(LiteralBits::String( "clusters".to_string(), ))], @@ -63008,26 +57773,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 25084, 25564), }); declarations.push(Declaration { - id: DeclarationId(1563), + id: DeclarationId(1564), name: Some("rust_surface_module".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1140)), + FieldValue::Reference(DeclarationId(1141)), ), ( "carrier".to_string(), @@ -63049,11 +57814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "items".to_string(), ))], @@ -63076,26 +57837,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 25777, 26037), }); declarations.push(Declaration { - id: DeclarationId(1564), + id: DeclarationId(1565), name: Some("rust_surface_item".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1153)), + FieldValue::Reference(DeclarationId(1154)), ), ( "carrier".to_string(), @@ -63119,26 +57880,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 26039, 26212), }); declarations.push(Declaration { - id: DeclarationId(1565), + id: DeclarationId(1566), name: Some("rust_surface_param".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1141)), + FieldValue::Reference(DeclarationId(1142)), ), ( "carrier".to_string(), @@ -63161,11 +57922,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -63184,11 +57941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -63209,11 +57962,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "refinement".to_string(), ))], @@ -63237,26 +57986,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 26214, 26631), }); declarations.push(Declaration { - id: DeclarationId(1566), + id: DeclarationId(1567), name: Some("rust_surface_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1142)), + FieldValue::Reference(DeclarationId(1143)), ), ( "carrier".to_string(), @@ -63279,11 +58028,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -63302,11 +58047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -63330,26 +58071,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 26633, 26961), }); declarations.push(Declaration { - id: DeclarationId(1567), + id: DeclarationId(1568), name: Some("rust_surface_variant".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1143)), + FieldValue::Reference(DeclarationId(1144)), ), ( "carrier".to_string(), @@ -63372,11 +58113,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -63395,11 +58132,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -63418,11 +58151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -63446,26 +58175,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 26963, 27384), }); declarations.push(Declaration { - id: DeclarationId(1568), + id: DeclarationId(1569), name: Some("rust_variant_payload".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1144)), + FieldValue::Reference(DeclarationId(1145)), ), ( "carrier".to_string(), @@ -63489,26 +58218,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 27386, 27568), }); declarations.push(Declaration { - id: DeclarationId(1569), + id: DeclarationId(1570), name: Some("rust_surface_type".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1145)), + FieldValue::Reference(DeclarationId(1146)), ), ( "carrier".to_string(), @@ -63532,26 +58261,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 27570, 27743), }); declarations.push(Declaration { - id: DeclarationId(1570), + id: DeclarationId(1571), name: Some("rust_surface_record_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1146)), + FieldValue::Reference(DeclarationId(1147)), ), ( "carrier".to_string(), @@ -63574,11 +58303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -63597,11 +58322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -63620,11 +58341,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -63648,26 +58365,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 27745, 28175), }); declarations.push(Declaration { - id: DeclarationId(1571), + id: DeclarationId(1572), name: Some("rust_surface_map_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1147)), + FieldValue::Reference(DeclarationId(1148)), ), ( "carrier".to_string(), @@ -63690,11 +58407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "key".to_string(), ))], @@ -63715,11 +58428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "key_span".to_string(), ))], @@ -63738,11 +58447,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -63761,11 +58466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -63789,26 +58490,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 28177, 28681), }); declarations.push(Declaration { - id: DeclarationId(1572), + id: DeclarationId(1573), name: Some("rust_surface_match_arm".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1148)), + FieldValue::Reference(DeclarationId(1149)), ), ( "carrier".to_string(), @@ -63831,11 +58532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -63854,11 +58551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -63877,11 +58570,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -63905,26 +58594,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 28683, 29108), }); declarations.push(Declaration { - id: DeclarationId(1573), + id: DeclarationId(1574), name: Some("rust_surface_pattern_field".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1149)), + FieldValue::Reference(DeclarationId(1150)), ), ( "carrier".to_string(), @@ -63947,11 +58636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -63970,11 +58655,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -63993,11 +58674,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2282), -======= - constructor: DeclarationId(2289), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2290), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -64021,26 +58698,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29110, 29547), }); declarations.push(Declaration { - id: DeclarationId(1574), + id: DeclarationId(1575), name: Some("rust_surface_pattern".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1150)), + FieldValue::Reference(DeclarationId(1151)), ), ( "carrier".to_string(), @@ -64064,26 +58741,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29549, 29731), }); declarations.push(Declaration { - id: DeclarationId(1575), + id: DeclarationId(1576), name: Some("rust_surface_literal".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1151)), + FieldValue::Reference(DeclarationId(1152)), ), ( "carrier".to_string(), @@ -64107,26 +58784,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29733, 29915), }); declarations.push(Declaration { - id: DeclarationId(1576), + id: DeclarationId(1577), name: Some("rust_surface_expr".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1152)), + FieldValue::Reference(DeclarationId(1153)), ), ( "carrier".to_string(), @@ -64150,22 +58827,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29917, 30090), }); declarations.push(Declaration { - id: DeclarationId(1577), + id: DeclarationId(1578), name: Some("rust_int_add".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -64187,22 +58864,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30945, 31090), }); declarations.push(Declaration { - id: DeclarationId(1578), + id: DeclarationId(1579), name: Some("rust_int_sub".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -64224,22 +58901,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 31092, 31237), }); declarations.push(Declaration { - id: DeclarationId(1579), + id: DeclarationId(1580), name: Some("rust_int_mul".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -64261,22 +58938,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 31239, 31384), }); declarations.push(Declaration { - id: DeclarationId(1580), + id: DeclarationId(1581), name: Some("rust_int_div".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -64300,22 +58977,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 31386, 31544), }); declarations.push(Declaration { - id: DeclarationId(1581), + id: DeclarationId(1582), name: Some("rust_int_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -64336,63 +59013,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 31994, 32138), }); - declarations.push(Declaration { - id: DeclarationId(1582), - name: Some("rust_node_id_eq".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1013), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), -<<<<<<< HEAD -======= - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(721)), - ), - ("op".to_string(), FieldValue::Reference(DeclarationId(359))), - ( - "carrier".to_string(), - FieldValue::Literal(LiteralBits::String("({lhs} == {rhs})".to_string())), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/rust.dag", 32140, 32291), - }); declarations.push(Declaration { id: DeclarationId(1583), - name: Some("rust_port_id_eq".to_string()), + name: Some("rust_node_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -64414,27 +59051,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 32140, 32291), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1583), - name: Some("rust_port_id_eq".to_string()), -======= id: DeclarationId(1584), - name: Some("rust_declaration_id_eq".to_string()), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("rust_port_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -64456,28 +59088,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 32293, 32444), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1584), - name: Some("rust_declaration_id_eq".to_string()), -======= id: DeclarationId(1585), - name: Some("rust_string_eq".to_string()), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("rust_declaration_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), -<<<<<<< HEAD + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -64499,24 +59125,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 32446, 32611), }); declarations.push(Declaration { - id: DeclarationId(1585), + id: DeclarationId(1586), name: Some("rust_string_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), -======= ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -64538,22 +59162,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 32804, 32954), }); declarations.push(Declaration { - id: DeclarationId(1586), + id: DeclarationId(1587), name: Some("rust_int_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -64574,63 +59198,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 32956, 33100), }); - declarations.push(Declaration { - id: DeclarationId(1587), - name: Some("rust_node_id_ne".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1013), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), -<<<<<<< HEAD -======= - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(721)), - ), - ("op".to_string(), FieldValue::Reference(DeclarationId(360))), - ( - "carrier".to_string(), - FieldValue::Literal(LiteralBits::String("({lhs} != {rhs})".to_string())), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/rust.dag", 33102, 33253), - }); declarations.push(Declaration { id: DeclarationId(1588), - name: Some("rust_port_id_ne".to_string()), + name: Some("rust_node_id_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -64652,27 +59236,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 33102, 33253), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1588), - name: Some("rust_port_id_ne".to_string()), -======= id: DeclarationId(1589), - name: Some("rust_declaration_id_ne".to_string()), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("rust_port_id_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -64694,28 +59273,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 33255, 33406), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1589), - name: Some("rust_declaration_id_ne".to_string()), -======= id: DeclarationId(1590), - name: Some("rust_int_lt".to_string()), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("rust_declaration_id_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), -<<<<<<< HEAD + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -64737,24 +59310,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 33408, 33573), }); declarations.push(Declaration { - id: DeclarationId(1590), + id: DeclarationId(1591), name: Some("rust_int_lt".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), -======= ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -64776,22 +59347,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 33575, 33718), }); declarations.push(Declaration { - id: DeclarationId(1591), + id: DeclarationId(1592), name: Some("rust_int_le".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -64813,22 +59384,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 33720, 33864), }); declarations.push(Declaration { - id: DeclarationId(1592), + id: DeclarationId(1593), name: Some("rust_int_gt".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -64850,22 +59421,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 33866, 34009), }); declarations.push(Declaration { - id: DeclarationId(1593), + id: DeclarationId(1594), name: Some("rust_int_ge".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -64887,22 +59458,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 34011, 34155), }); declarations.push(Declaration { - id: DeclarationId(1594), + id: DeclarationId(1595), name: Some("rust_bool_meet".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -64924,22 +59495,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 34157, 34310), }); declarations.push(Declaration { - id: DeclarationId(1595), + id: DeclarationId(1596), name: Some("rust_bool_join".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -64961,26 +59532,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 34312, 34465), }); declarations.push(Declaration { - id: DeclarationId(1596), + id: DeclarationId(1597), name: Some("rust_let_stmt".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1288)), + FieldValue::Reference(DeclarationId(1289)), ), ( "carrier".to_string(), @@ -64999,26 +59570,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 35215, 35354), }); declarations.push(Declaration { - id: DeclarationId(1597), + id: DeclarationId(1598), name: Some("rust_if_expr".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1286)), + FieldValue::Reference(DeclarationId(1287)), ), ( "carrier".to_string(), @@ -65037,26 +59608,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 35356, 35503), }); declarations.push(Declaration { - id: DeclarationId(1598), + id: DeclarationId(1599), name: Some("rust_main_wrap".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1014), + template: DeclarationId(1015), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1014)), + meta_tag: Some(DeclarationId(1015)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1289)), + FieldValue::Reference(DeclarationId(1290)), ), ( "carrier".to_string(), @@ -65076,22 +59647,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 35505, 35675), }); declarations.push(Declaration { - id: DeclarationId(1599), + id: DeclarationId(1600), name: Some("rust_empty_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -65100,11 +59671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2295), -======= - constructor: DeclarationId(2302), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2303), payload: vec![], }, ), @@ -65120,22 +59687,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37052, 37194), }); declarations.push(Declaration { - id: DeclarationId(1600), + id: DeclarationId(1601), name: Some("rust_singleton_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -65144,8 +59711,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2296), + constructor: DeclarationId(2304), payload: vec![], }, ), @@ -65159,7 +59725,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2286), + constructor: DeclarationId(2294), payload: vec![], }, ), @@ -65176,22 +59742,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37196, 37392), }); declarations.push(Declaration { - id: DeclarationId(1601), + id: DeclarationId(1602), name: Some("rust_cons_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -65200,7 +59766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2297), + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -65215,7 +59781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2286), + constructor: DeclarationId(2294), payload: vec![], }, ), @@ -65228,7 +59794,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2286), + constructor: DeclarationId(2294), payload: vec![], }, ), @@ -65246,22 +59812,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37394, 37615), }); declarations.push(Declaration { - id: DeclarationId(1602), + id: DeclarationId(1603), name: Some("rust_concat_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -65270,7 +59836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2298), + constructor: DeclarationId(2306), payload: vec![], }, ), @@ -65285,7 +59851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2286), + constructor: DeclarationId(2294), payload: vec![], }, ), @@ -65298,7 +59864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2286), + constructor: DeclarationId(2294), payload: vec![], }, ), @@ -65316,22 +59882,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37617, 37844), }); declarations.push(Declaration { - id: DeclarationId(1603), + id: DeclarationId(1604), name: Some("rust_length_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -65340,10 +59906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2299), -======= - constructor: DeclarationId(2303), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2307), payload: vec![], }, ), @@ -65371,223 +59934,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, -<<<<<<< HEAD -======= - span: SourceSpan::new("src/v3/spec/rust.dag", 37196, 37392), - }); - declarations.push(Declaration { - id: DeclarationId(1601), - name: Some("rust_cons_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1015), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(689)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2304), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("0".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2293), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2293), - payload: vec![], - }, - ), - ]), - ]), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/rust.dag", 37394, 37615), - }); - declarations.push(Declaration { - id: DeclarationId(1602), - name: Some("rust_concat_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1015), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(699)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2305), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("0".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2293), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2293), - payload: vec![], - }, - ), - ]), - ]), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/rust.dag", 37617, 37844), - }); - declarations.push(Declaration { - id: DeclarationId(1603), - name: Some("rust_length_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1015), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(709)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2306), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("0".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2292), - payload: vec![], - }, - ), - ])]), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) span: SourceSpan::new("src/v3/spec/rust.dag", 37846, 38033), }); declarations.push(Declaration { - id: DeclarationId(1604), + id: DeclarationId(1605), name: Some("rust_list_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1023), + template: DeclarationId(1024), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1023)), + meta_tag: Some(DeclarationId(1024)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -65608,22 +59973,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38035, 38178), }); declarations.push(Declaration { - id: DeclarationId(1605), + id: DeclarationId(1606), name: Some("rust_result_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1023), + template: DeclarationId(1024), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1023)), + meta_tag: Some(DeclarationId(1024)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -65646,26 +60011,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38457, 38628), }); declarations.push(Declaration { - id: DeclarationId(1606), + id: DeclarationId(1607), name: Some("rust_lookup_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1023), + template: DeclarationId(1024), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1023)), + meta_tag: Some(DeclarationId(1024)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1135)), + FieldValue::Reference(DeclarationId(1136)), ), ( "carrier".to_string(), @@ -65682,26 +60047,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38630, 38780), }); declarations.push(Declaration { - id: DeclarationId(1607), + id: DeclarationId(1608), name: Some("rust_witness_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1023), + template: DeclarationId(1024), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1023)), + meta_tag: Some(DeclarationId(1024)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(976)), + FieldValue::Reference(DeclarationId(977)), ), ( "carrier".to_string(), @@ -65718,26 +60083,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38782, 38935), }); declarations.push(Declaration { - id: DeclarationId(1608), + id: DeclarationId(1609), name: Some("rust_lens_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1023), + template: DeclarationId(1024), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1023)), + meta_tag: Some(DeclarationId(1024)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1120)), + FieldValue::Reference(DeclarationId(1121)), ), ( "carrier".to_string(), @@ -65754,22 +60119,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38937, 39081), }); declarations.push(Declaration { - id: DeclarationId(1609), + id: DeclarationId(1610), name: Some("rust_monoid_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1023), + template: DeclarationId(1024), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1023)), + meta_tag: Some(DeclarationId(1024)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -65790,26 +60155,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 39083, 39233), }); declarations.push(Declaration { - id: DeclarationId(1610), + id: DeclarationId(1611), name: Some("rust_lens_enforcement_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1023), + template: DeclarationId(1024), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1023)), + meta_tag: Some(DeclarationId(1024)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1124)), + FieldValue::Reference(DeclarationId(1125)), ), ( "carrier".to_string(), @@ -65828,26 +60193,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 39235, 39418), }); declarations.push(Declaration { - id: DeclarationId(1611), + id: DeclarationId(1612), name: Some("rust_enforceable_lens_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1023), + template: DeclarationId(1024), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1023)), + meta_tag: Some(DeclarationId(1024)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1127)), + FieldValue::Reference(DeclarationId(1128)), ), ( "carrier".to_string(), @@ -65866,22 +60231,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 39420, 39603), }); declarations.push(Declaration { - id: DeclarationId(1612), + id: DeclarationId(1613), name: Some("rust_map_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1023), + template: DeclarationId(1024), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1023)), + meta_tag: Some(DeclarationId(1024)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -65904,22 +60269,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 39605, 39755), }); declarations.push(Declaration { - id: DeclarationId(1613), + id: DeclarationId(1614), name: Some("rust_is_empty_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -65928,11 +60293,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2300), -======= - constructor: DeclarationId(2307), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2308), payload: vec![], }, ), @@ -65946,11 +60307,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -65967,113 +60324,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 39757, 39949), }); declarations.push(Declaration { - id: DeclarationId(1614), + id: DeclarationId(1615), name: Some("rust_fold_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), -<<<<<<< HEAD FieldValue::Reference(DeclarationId(694)), -======= - FieldValue::Reference(DeclarationId(693)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2308), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("0".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2292), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2293), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("2".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2292), - payload: vec![], - }, - ), - ]), - ]), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/rust.dag", 39951, 40212), - }); - declarations.push(Declaration { - id: DeclarationId(1615), - name: Some("rust_map_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1015), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(701)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "strategy".to_string(), @@ -66093,11 +60363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -66110,8 +60376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2286), + constructor: DeclarationId(2294), payload: vec![], }, ), @@ -66124,10 +60389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -66145,27 +60407,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 39951, 40212), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1615), - name: Some("rust_map_callable".to_string()), -======= id: DeclarationId(1616), - name: Some("rust_filter_callable".to_string()), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("rust_map_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -66189,11 +60446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -66206,11 +60459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -66228,27 +60477,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 40214, 40432), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1616), - name: Some("rust_filter_callable".to_string()), -======= id: DeclarationId(1617), - name: Some("rust_contains_callable".to_string()), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("rust_filter_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -66272,11 +60516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -66289,8 +60529,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2285), + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -66308,22 +60547,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 40434, 40661), }); declarations.push(Declaration { - id: DeclarationId(1617), + id: DeclarationId(1618), name: Some("rust_contains_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -66332,7 +60571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(2304), + constructor: DeclarationId(2312), payload: vec![], }, ), @@ -66347,7 +60586,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -66360,10 +60599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -66381,22 +60617,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 40663, 40896), }); declarations.push(Declaration { - id: DeclarationId(1618), + id: DeclarationId(1619), name: Some("rust_list_pattern".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1025), + template: DeclarationId(1026), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1025)), + meta_tag: Some(DeclarationId(1026)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -66405,21 +60641,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2306), -======= - constructor: DeclarationId(2313), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2314), payload: vec![], }, ), ( "empty_variant".to_string(), - FieldValue::Reference(DeclarationId(1783)), + FieldValue::Reference(DeclarationId(1784)), ), ( "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1785)), + FieldValue::Reference(DeclarationId(1786)), ), ( "scrutinee".to_string(), @@ -66454,15 +60686,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 41124, 41428), }); declarations.push(Declaration { - id: DeclarationId(1619), + id: DeclarationId(1620), name: Some("rust_statements".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1027), + template: DeclarationId(1028), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1027)), + meta_tag: Some(DeclarationId(1028)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -66486,15 +60718,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 41430, 41568), }); declarations.push(Declaration { - id: DeclarationId(1620), + id: DeclarationId(1621), name: Some("rust_expressions".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1028), + template: DeclarationId(1029), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1028)), + meta_tag: Some(DeclarationId(1029)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -66520,15 +60752,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 41570, 41723), }); declarations.push(Declaration { - id: DeclarationId(1621), + id: DeclarationId(1622), name: Some("rust_control_flow".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1030), + template: DeclarationId(1031), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1030)), + meta_tag: Some(DeclarationId(1031)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -66565,15 +60797,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 41725, 41915), }); declarations.push(Declaration { - id: DeclarationId(1622), + id: DeclarationId(1623), name: Some("rust_literals".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1031), + template: DeclarationId(1032), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1031)), + meta_tag: Some(DeclarationId(1032)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -66597,15 +60829,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 41917, 42029), }); declarations.push(Declaration { - id: DeclarationId(1623), + id: DeclarationId(1624), name: Some("rust_modules".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1032), + template: DeclarationId(1033), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1032)), + meta_tag: Some(DeclarationId(1033)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -66619,15 +60851,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 42031, 42091), }); declarations.push(Declaration { - id: DeclarationId(1624), + id: DeclarationId(1625), name: Some("rust_functions".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1033), + template: DeclarationId(1034), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1033)), + meta_tag: Some(DeclarationId(1034)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -66665,15 +60897,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 42093, 42371), }); declarations.push(Declaration { - id: DeclarationId(1625), + id: DeclarationId(1626), name: Some("rust_type_applications".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1034), + template: DeclarationId(1035), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1034)), + meta_tag: Some(DeclarationId(1035)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -66687,15 +60919,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 42373, 42461), }); declarations.push(Declaration { - id: DeclarationId(1626), + id: DeclarationId(1627), name: Some("rust_type_defs".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1035), + template: DeclarationId(1036), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1035)), + meta_tag: Some(DeclarationId(1036)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -66733,15 +60965,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 42463, 42765), }); declarations.push(Declaration { - id: DeclarationId(1627), + id: DeclarationId(1628), name: Some("rust_record_derive_templates".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1036), + template: DeclarationId(1037), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1036)), + meta_tag: Some(DeclarationId(1037)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -66765,15 +60997,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 42767, 42980), }); declarations.push(Declaration { - id: DeclarationId(1628), + id: DeclarationId(1629), name: Some("rust_patterns".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1037), + template: DeclarationId(1038), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1037)), + meta_tag: Some(DeclarationId(1038)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -66823,15 +61055,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 42982, 43317), }); declarations.push(Declaration { - id: DeclarationId(1629), + id: DeclarationId(1630), name: Some("rust_language_spec_free_monoid_concat_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -66853,11 +61085,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "{ let mut __left = {left}; __left.extend({right}); __left }" .to_string(), @@ -66871,11 +61099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -66886,15 +61110,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 43319, 43689), }); declarations.push(Declaration { - id: DeclarationId(1630), + id: DeclarationId(1631), name: Some("rust_language_spec_free_monoid_length_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -66915,11 +61139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "({recv}).len() as i64".to_string(), ))], @@ -66932,11 +61152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -66947,15 +61163,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 43691, 43985), }); declarations.push(Declaration { - id: DeclarationId(1631), + id: DeclarationId(1632), name: Some("rust_language_spec_free_monoid_emptiness_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -66974,11 +61190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "({recv}).is_empty()".to_string(), ))], @@ -66991,11 +61203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -67006,15 +61214,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44156, 44451), }); declarations.push(Declaration { - id: DeclarationId(1632), + id: DeclarationId(1633), name: Some("rust_language_spec_free_monoid_fold_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -67035,11 +61243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "({recv}).iter().fold({init}, {body})".to_string(), ))], @@ -67052,11 +61256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -67067,15 +61267,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44453, 44773), }); declarations.push(Declaration { - id: DeclarationId(1633), + id: DeclarationId(1634), name: Some("rust_language_spec_map_contract".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1046), + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1046)), + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -67096,11 +61296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2313), -======= - constructor: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2321), payload: vec![FieldValue::Literal(LiteralBits::String( "({recv}).iter().map({body}).collect::>()".to_string(), ))], @@ -67113,11 +61309,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2312), -======= - constructor: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2320), payload: vec![], }, ), @@ -67127,17 +61319,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 44775, 45103), }); - declarations.push(Declaration { id: DeclarationId(1634), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1038), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1038)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat_contract".to_string(), FieldValue::Reference(DeclarationId(1629))), ("length_contract".to_string(), FieldValue::Reference(DeclarationId(1630))), ("is_empty_contract".to_string(), FieldValue::Reference(DeclarationId(1631))), ("fold_contract".to_string(), FieldValue::Reference(DeclarationId(1632))), ("filter_contract".to_string(), FieldValue::Reference(DeclarationId(1177))), ("flat_map_contract".to_string(), FieldValue::Reference(DeclarationId(1180))), ("any_contract".to_string(), FieldValue::Reference(DeclarationId(1178))), ("all_contract".to_string(), FieldValue::Reference(DeclarationId(1179))), ("map_contract".to_string(), FieldValue::Reference(DeclarationId(1633))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 45105, 45981) }); + declarations.push(Declaration { id: DeclarationId(1635), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1039), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1039)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat_contract".to_string(), FieldValue::Reference(DeclarationId(1630))), ("length_contract".to_string(), FieldValue::Reference(DeclarationId(1631))), ("is_empty_contract".to_string(), FieldValue::Reference(DeclarationId(1632))), ("fold_contract".to_string(), FieldValue::Reference(DeclarationId(1633))), ("filter_contract".to_string(), FieldValue::Reference(DeclarationId(1178))), ("flat_map_contract".to_string(), FieldValue::Reference(DeclarationId(1181))), ("any_contract".to_string(), FieldValue::Reference(DeclarationId(1179))), ("all_contract".to_string(), FieldValue::Reference(DeclarationId(1180))), ("map_contract".to_string(), FieldValue::Reference(DeclarationId(1634))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 45105, 45981) }); declarations.push(Declaration { - id: DeclarationId(1635), + id: DeclarationId(1636), name: Some("rust_value_construction".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1039), + template: DeclarationId(1040), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1039)), + meta_tag: Some(DeclarationId(1040)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -67173,15 +61365,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 45983, 46255), }); declarations.push(Declaration { - id: DeclarationId(1636), + id: DeclarationId(1637), name: Some("rust_rendering".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1040), + template: DeclarationId(1041), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1040)), + meta_tag: Some(DeclarationId(1041)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -67189,22 +61381,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "read".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2307), -======= - constructor: DeclarationId(2314), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2315), payload: vec![], }, ), ( "construct".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2309), -======= - constructor: DeclarationId(2316), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2317), payload: vec![], }, ), @@ -67215,66 +61399,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 46257, 46338), }); declarations.push(Declaration { - id: DeclarationId(1637), + id: DeclarationId(1638), name: Some("rust_language".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1043), + template: DeclarationId(1044), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1043)), + meta_tag: Some(DeclarationId(1044)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "statements".to_string(), - FieldValue::Reference(DeclarationId(1619)), + FieldValue::Reference(DeclarationId(1620)), ), ( "expressions".to_string(), - FieldValue::Reference(DeclarationId(1620)), + FieldValue::Reference(DeclarationId(1621)), ), ( "control_flow".to_string(), - FieldValue::Reference(DeclarationId(1621)), + FieldValue::Reference(DeclarationId(1622)), ), ( "literals".to_string(), - FieldValue::Reference(DeclarationId(1622)), + FieldValue::Reference(DeclarationId(1623)), ), ( "modules".to_string(), - FieldValue::Reference(DeclarationId(1623)), + FieldValue::Reference(DeclarationId(1624)), ), ( "functions".to_string(), - FieldValue::Reference(DeclarationId(1624)), + FieldValue::Reference(DeclarationId(1625)), ), ( "type_applications".to_string(), - FieldValue::Reference(DeclarationId(1625)), + FieldValue::Reference(DeclarationId(1626)), ), ( "type_definitions".to_string(), - FieldValue::Reference(DeclarationId(1626)), + FieldValue::Reference(DeclarationId(1627)), ), ( "record_derive_templates".to_string(), - FieldValue::Reference(DeclarationId(1627)), + FieldValue::Reference(DeclarationId(1628)), ), ( "patterns".to_string(), - FieldValue::Reference(DeclarationId(1628)), + FieldValue::Reference(DeclarationId(1629)), ), ( "collection_ops".to_string(), - FieldValue::Reference(DeclarationId(1634)), + FieldValue::Reference(DeclarationId(1635)), ), ( "values".to_string(), - FieldValue::Reference(DeclarationId(1635)), + FieldValue::Reference(DeclarationId(1636)), ), ], }), @@ -67283,15 +61467,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 46340, 46785), }); declarations.push(Declaration { - id: DeclarationId(1638), + id: DeclarationId(1639), name: Some("rust_correction_style".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(923), + template: DeclarationId(924), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(923)), + meta_tag: Some(DeclarationId(924)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -67319,15 +61503,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 48209, 48348), }); declarations.push(Declaration { - id: DeclarationId(1639), + id: DeclarationId(1640), name: Some("rust_clean_emission".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(914), + template: DeclarationId(915), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(914)), + meta_tag: Some(DeclarationId(915)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -67335,83 +61519,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "expression_wrapping".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2134), -======= - constructor: DeclarationId(2141), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2142), payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2137), -======= - constructor: DeclarationId(2144), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2145), payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2141), -======= - constructor: DeclarationId(2148), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2149), payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2143), -======= - constructor: DeclarationId(2150), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2151), payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2146), -======= - constructor: DeclarationId(2153), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2154), payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2149), -======= - constructor: DeclarationId(2156), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2157), payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2152), -======= - constructor: DeclarationId(2159), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2160), payload: vec![], }, ), ( "correction_style".to_string(), - FieldValue::Reference(DeclarationId(1638)), + FieldValue::Reference(DeclarationId(1639)), ), ( "post_emit_verifier".to_string(), @@ -67443,11 +61599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "output_policy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2155), -======= - constructor: DeclarationId(2162), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2163), payload: vec![], }, ), @@ -67460,26 +61612,26 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 48350, 48963), }); declarations.push(Declaration { - id: DeclarationId(1640), + id: DeclarationId(1641), name: Some("rust_clean_emission_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(915), + template: DeclarationId(916), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(915)), + meta_tag: Some(DeclarationId(916)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "clean_emission".to_string(), - FieldValue::Reference(DeclarationId(1639)), + FieldValue::Reference(DeclarationId(1640)), ), ], }), @@ -67488,7 +61640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 48965, 49095), }); declarations.push(Declaration { - id: DeclarationId(1641), + id: DeclarationId(1642), name: Some("rust_port_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(829), @@ -67512,7 +61664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 50197, 50300), }); declarations.push(Declaration { - id: DeclarationId(1642), + id: DeclarationId(1643), name: Some("rust_node_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(829), @@ -67536,7 +61688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 50302, 50405), }); declarations.push(Declaration { - id: DeclarationId(1643), + id: DeclarationId(1644), name: Some("rust_resolve_producer_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(829), @@ -67560,7 +61712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 50407, 50534), }); declarations.push(Declaration { - id: DeclarationId(1644), + id: DeclarationId(1645), name: Some("port_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(830), @@ -67568,43 +61720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD meta_tag: Some(DeclarationId(830)), -======= - meta_tag: Some(DeclarationId(829)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "accessor".to_string(), - FieldValue::Reference(DeclarationId(830)), - ), - ( - "realization".to_string(), - FieldValue::Reference(DeclarationId(1641)), - ), - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/rust.dag", 50536, 50667), - }); - declarations.push(Declaration { - id: DeclarationId(1645), - name: Some("node_binding_rust".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(829), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(829)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -67619,7 +61735,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ], }), @@ -67628,13 +61744,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 50536, 50667), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1645), - name: Some("node_binding_rust".to_string()), -======= id: DeclarationId(1646), - name: Some("resolve_producer_binding_rust".to_string()), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("node_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(830), arguments: vec![], @@ -67656,8 +61767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), -<<<<<<< HEAD + FieldValue::Reference(DeclarationId(1638)), ), ], }), @@ -67666,7 +61776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 50669, 50800), }); declarations.push(Declaration { - id: DeclarationId(1646), + id: DeclarationId(1647), name: Some("resolve_producer_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(830), @@ -67685,13 +61795,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1643)), + FieldValue::Reference(DeclarationId(1644)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), -======= ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1638)), ), ], }), @@ -67700,7 +61808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 50802, 50969), }); declarations.push(Declaration { - id: DeclarationId(1647), + id: DeclarationId(1648), name: Some("rust_lane2_workflow_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(829), @@ -67724,7 +61832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 51480, 51609), }); declarations.push(Declaration { - id: DeclarationId(1648), + id: DeclarationId(1649), name: Some("lane2_workflow_at_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(830), @@ -67743,11 +61851,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1647)), + FieldValue::Reference(DeclarationId(1648)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ], }), @@ -67756,7 +61864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 51611, 51778), }); declarations.push(Declaration { - id: DeclarationId(1649), + id: DeclarationId(1650), name: Some("rust_workflow_root_port_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(829), @@ -67780,7 +61888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 52473, 52587), }); declarations.push(Declaration { - id: DeclarationId(1650), + id: DeclarationId(1651), name: Some("workflow_root_port_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(830), @@ -67799,11 +61907,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1649)), + FieldValue::Reference(DeclarationId(1650)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ], }), @@ -67812,22 +61920,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 52589, 52762), }); declarations.push(Declaration { - id: DeclarationId(1651), + id: DeclarationId(1652), name: Some("rust_workflow_root".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1008), + template: DeclarationId(1009), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1008)), + meta_tag: Some(DeclarationId(1009)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ( "target".to_string(), @@ -67853,7 +61961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 53174, 53335), }); declarations.push(Declaration { - id: DeclarationId(1652), + id: DeclarationId(1653), name: Some("rust_declaration_by_id_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(829), @@ -67877,7 +61985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 53662, 53785), }); declarations.push(Declaration { - id: DeclarationId(1653), + id: DeclarationId(1654), name: Some("declaration_by_id_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(830), @@ -67896,11 +62004,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1652)), + FieldValue::Reference(DeclarationId(1653)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ], }), @@ -67909,7 +62017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 53787, 53957), }); declarations.push(Declaration { - id: DeclarationId(1654), + id: DeclarationId(1655), name: Some("rust_declaration_by_name_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(829), @@ -67933,7 +62041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 54304, 54433), }); declarations.push(Declaration { - id: DeclarationId(1655), + id: DeclarationId(1656), name: Some("declaration_by_name_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(830), @@ -67952,11 +62060,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1654)), + FieldValue::Reference(DeclarationId(1655)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ], }), @@ -67965,7 +62073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 54435, 54611), }); declarations.push(Declaration { - id: DeclarationId(1656), + id: DeclarationId(1657), name: Some("rust_per_call_pattern_at_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(829), @@ -67989,7 +62097,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 54831, 54951), }); declarations.push(Declaration { - id: DeclarationId(1657), + id: DeclarationId(1658), name: Some("per_call_pattern_at_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(830), @@ -68004,15 +62112,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "accessor".to_string(), - FieldValue::Reference(DeclarationId(929)), + FieldValue::Reference(DeclarationId(930)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1656)), + FieldValue::Reference(DeclarationId(1657)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1637)), + FieldValue::Reference(DeclarationId(1638)), ), ], }), @@ -68021,7 +62129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 54953, 55129), }); declarations.push(Declaration { - id: DeclarationId(1658), + id: DeclarationId(1659), name: Some("CompilerHostRealization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -68040,33 +62148,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 453, 502), }); declarations.push(Declaration { - id: DeclarationId(1659), + id: DeclarationId(1660), name: Some("PipelineSnapshotKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "SnapshotSurface".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2702), - }, - Field { - label: "SnapshotDag".to_string(), - ty: DeclarationId(2703), -======= - ty: DeclarationId(2709), - }, - Field { - label: "SnapshotDag".to_string(), ty: DeclarationId(2710), }, Field { - label: "SnapshotText".to_string(), + label: "SnapshotDag".to_string(), ty: DeclarationId(2711), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "SnapshotText".to_string(), - ty: DeclarationId(2704), + ty: DeclarationId(2712), }, ], }, @@ -68081,21 +62177,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 504, 576), }); declarations.push(Declaration { - id: DeclarationId(1660), + id: DeclarationId(1661), name: Some("PipelineStageBinding".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "stage".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "realization".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "snapshot".to_string(), - ty: DeclarationId(1659), + ty: DeclarationId(1660), }, ], }, @@ -68110,7 +62206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 578, 694), }); declarations.push(Declaration { - id: DeclarationId(1661), + id: DeclarationId(1662), name: Some("parse_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -68120,7 +62216,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1658)), + meta_tag: Some(DeclarationId(1659)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -68134,7 +62230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 696, 780), }); declarations.push(Declaration { - id: DeclarationId(1662), + id: DeclarationId(1663), name: Some("lower_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -68144,7 +62240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1658)), + meta_tag: Some(DeclarationId(1659)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -68158,7 +62254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 782, 866), }); declarations.push(Declaration { - id: DeclarationId(1663), + id: DeclarationId(1664), name: Some("infer_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -68168,7 +62264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1658)), + meta_tag: Some(DeclarationId(1659)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -68182,7 +62278,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 868, 952), }); declarations.push(Declaration { - id: DeclarationId(1664), + id: DeclarationId(1665), name: Some("compute_ownership_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -68192,7 +62288,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1658)), + meta_tag: Some(DeclarationId(1659)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -68208,7 +62304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 954, 1062), }); declarations.push(Declaration { - id: DeclarationId(1665), + id: DeclarationId(1666), name: Some("emit_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -68218,7 +62314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1658)), + meta_tag: Some(DeclarationId(1659)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -68232,7 +62328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1064, 1146), }); declarations.push(Declaration { - id: DeclarationId(1666), + id: DeclarationId(1667), name: Some("lens_complexity_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -68242,7 +62338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1658)), + meta_tag: Some(DeclarationId(1659)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -68257,51 +62353,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1148, 1252), }); - declarations.push(Declaration { - id: DeclarationId(1667), - name: Some("parse_stage_binding".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1660), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1660)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "stage".to_string(), - FieldValue::Reference(DeclarationId(1673)), - ), - ( - "realization".to_string(), - FieldValue::Reference(DeclarationId(1661)), - ), - ( - "snapshot".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2709), - payload: vec![], - }, - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1254, 1382), - }); declarations.push(Declaration { id: DeclarationId(1668), - name: Some("lower_stage_binding".to_string()), + name: Some("parse_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1660), + template: DeclarationId(1661), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1660)), + meta_tag: Some(DeclarationId(1661)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -68317,11 +62378,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "snapshot".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2703), -======= constructor: DeclarationId(2710), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -68329,18 +62386,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1384, 1508), + span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1254, 1382), }); declarations.push(Declaration { id: DeclarationId(1669), - name: Some("infer_stage_binding".to_string()), + name: Some("lower_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1660), + template: DeclarationId(1661), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1660)), + meta_tag: Some(DeclarationId(1661)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -68356,11 +62413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "snapshot".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2703), -======= - constructor: DeclarationId(2710), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2711), payload: vec![], }, ), @@ -68368,18 +62421,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1510, 1634), + span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1384, 1508), }); declarations.push(Declaration { id: DeclarationId(1670), - name: Some("compute_ownership_stage_binding".to_string()), + name: Some("infer_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1660), + template: DeclarationId(1661), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1660)), + meta_tag: Some(DeclarationId(1661)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -68391,13 +62444,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "realization".to_string(), FieldValue::Reference(DeclarationId(1664)), -<<<<<<< HEAD -======= ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2710), + constructor: DeclarationId(2711), payload: vec![], }, ), @@ -68405,18 +62456,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1636, 1796), + span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1510, 1634), }); declarations.push(Declaration { id: DeclarationId(1671), - name: Some("lens_complexity_stage_binding".to_string()), + name: Some("compute_ownership_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1660), + template: DeclarationId(1661), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1660)), + meta_tag: Some(DeclarationId(1661)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -68425,42 +62476,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { "stage".to_string(), FieldValue::Reference(DeclarationId(1677)), ), - ( - "realization".to_string(), - FieldValue::Reference(DeclarationId(1666)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - ), - ( - "snapshot".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2710), - payload: vec![], - }, - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1798, 1952), - }); - declarations.push(Declaration { - id: DeclarationId(1672), - name: Some("emit_stage_binding".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1660), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1660)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "stage".to_string(), - FieldValue::Reference(DeclarationId(1678)), - ), ( "realization".to_string(), FieldValue::Reference(DeclarationId(1665)), @@ -68479,31 +62494,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1636, 1796), }); declarations.push(Declaration { - id: DeclarationId(1671), + id: DeclarationId(1672), name: Some("lens_complexity_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1660), + template: DeclarationId(1661), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1660)), + meta_tag: Some(DeclarationId(1661)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1677)), + FieldValue::Reference(DeclarationId(1678)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1666)), + FieldValue::Reference(DeclarationId(1667)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2703), + constructor: DeclarationId(2711), payload: vec![], }, ), @@ -68514,32 +62529,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1798, 1952), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1672), + id: DeclarationId(1673), name: Some("emit_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1660), + template: DeclarationId(1661), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1660)), + meta_tag: Some(DeclarationId(1661)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1678)), + FieldValue::Reference(DeclarationId(1679)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1665)), + FieldValue::Reference(DeclarationId(1666)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2704), + constructor: DeclarationId(2712), payload: vec![], }, ), @@ -68550,35 +62564,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1954, 2076), }); declarations.push(Declaration { -======= ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - id: DeclarationId(1673), + id: DeclarationId(1674), name: Some("parse".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230), DeclarationId(230)], -<<<<<<< HEAD - output: DeclarationId(828), -======= - output: DeclarationId(827), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - body: ArrowBody::ExternalRealization(DeclarationId(1661)), - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2078, 2140), - }); - declarations.push(Declaration { - id: DeclarationId(1674), - name: Some("lower".to_string()), -<<<<<<< HEAD - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(828)], output: DeclarationId(828), body: ArrowBody::ExternalRealization(DeclarationId(1662)), }, @@ -68590,13 +62579,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2142, 2184), + span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2078, 2140), }); declarations.push(Declaration { id: DeclarationId(1675), - name: Some("infer".to_string()), -======= ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("lower".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(828)], output: DeclarationId(828), @@ -68613,13 +62600,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2142, 2184), }); declarations.push(Declaration { -<<<<<<< HEAD id: DeclarationId(1676), - name: Some("compute_ownership".to_string()), -======= - id: DeclarationId(1675), name: Some("infer".to_string()), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Arrow { inputs: vec![DeclarationId(828)], output: DeclarationId(828), @@ -68636,19 +62618,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2186, 2228), }); declarations.push(Declaration { -<<<<<<< HEAD id: DeclarationId(1677), - name: Some("lens_complexity".to_string()), + name: Some("compute_ownership".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(828)], output: DeclarationId(828), -======= - id: DeclarationId(1676), - name: Some("compute_ownership".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827)], - output: DeclarationId(827), - body: ArrowBody::ExternalRealization(DeclarationId(1664)), + body: ArrowBody::ExternalRealization(DeclarationId(1665)), }, type_params: vec![], phantom_params: Vec::new(), @@ -68661,13 +62636,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2230, 2288), }); declarations.push(Declaration { - id: DeclarationId(1677), + id: DeclarationId(1678), name: Some("lens_complexity".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827)], - output: DeclarationId(827), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - body: ArrowBody::ExternalRealization(DeclarationId(1666)), + inputs: vec![DeclarationId(828)], + output: DeclarationId(828), + body: ArrowBody::ExternalRealization(DeclarationId(1667)), }, type_params: vec![], phantom_params: Vec::new(), @@ -68680,23 +62654,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2290, 2347), }); declarations.push(Declaration { - id: DeclarationId(1678), + id: DeclarationId(1679), name: Some("emit".to_string()), connective: TypeConnective::Arrow { inputs: vec![ -<<<<<<< HEAD DeclarationId(828), DeclarationId(828), DeclarationId(828), -======= - DeclarationId(827), - DeclarationId(827), - DeclarationId(827), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - DeclarationId(1043), + DeclarationId(1044), ], output: DeclarationId(230), - body: ArrowBody::ExternalRealization(DeclarationId(1665)), + body: ArrowBody::ExternalRealization(DeclarationId(1666)), }, type_params: vec![], phantom_params: Vec::new(), @@ -68709,10 +62677,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2349, 2460), }); declarations.push(Declaration { - id: DeclarationId(1679), + id: DeclarationId(1680), name: Some("compile".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(1043)], + inputs: vec![DeclarationId(230), DeclarationId(230), DeclarationId(1044)], output: DeclarationId(230), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/compiler/pipeline.dag", @@ -68731,15 +62699,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2462, 2605), }); declarations.push(Declaration { - id: DeclarationId(1680), + id: DeclarationId(1681), name: Some("from_symbol".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230)], -<<<<<<< HEAD - output: DeclarationId(2705), -======= - output: DeclarationId(2712), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2713), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/compiler/operators.dag", 156, @@ -68757,7 +62721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 108, 771), }); declarations.push(Declaration { - id: DeclarationId(1681), + id: DeclarationId(1682), name: Some("symbol".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(806)], @@ -68775,7 +62739,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 773, 1214), }); declarations.push(Declaration { - id: DeclarationId(1682), + id: DeclarationId(1683), name: Some("algebra_field_name".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(806)], @@ -68793,7 +62757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 1216, 2017), }); declarations.push(Declaration { - id: DeclarationId(1683), + id: DeclarationId(1684), name: Some("LensRegistryEntry".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -68822,15 +62786,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 1950, 2045), }); declarations.push(Declaration { - id: DeclarationId(1684), + id: DeclarationId(1685), name: Some("lens_cost_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1683), + template: DeclarationId(1684), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1683)), + meta_tag: Some(DeclarationId(1684)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -68858,15 +62822,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2047, 2220), }); declarations.push(Declaration { - id: DeclarationId(1685), + id: DeclarationId(1686), name: Some("lens_cost_symbolic_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1683), + template: DeclarationId(1684), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1683)), + meta_tag: Some(DeclarationId(1684)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -68894,15 +62858,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2222, 2410), }); declarations.push(Declaration { - id: DeclarationId(1686), + id: DeclarationId(1687), name: Some("lens_cost_target_realization_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1683), + template: DeclarationId(1684), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1683)), + meta_tag: Some(DeclarationId(1684)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -68933,15 +62897,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2412, 2649), }); declarations.push(Declaration { - id: DeclarationId(1687), + id: DeclarationId(1688), name: Some("lens_effect_enumeration_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1683), + template: DeclarationId(1684), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1683)), + meta_tag: Some(DeclarationId(1684)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -68969,15 +62933,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2651, 2868), }); declarations.push(Declaration { - id: DeclarationId(1688), + id: DeclarationId(1689), name: Some("lens_provenance_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1683), + template: DeclarationId(1684), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1683)), + meta_tag: Some(DeclarationId(1684)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -69005,15 +62969,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2870, 3055), }); declarations.push(Declaration { - id: DeclarationId(1689), + id: DeclarationId(1690), name: Some("lens_structural_resolution_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1683), + template: DeclarationId(1684), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1683)), + meta_tag: Some(DeclarationId(1684)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -69044,15 +63008,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 3057, 3286), }); declarations.push(Declaration { - id: DeclarationId(1690), + id: DeclarationId(1691), name: Some("lens_unused_parameters_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1683), + template: DeclarationId(1684), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1683)), + meta_tag: Some(DeclarationId(1684)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -69080,15 +63044,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 3288, 3501), }); declarations.push(Declaration { - id: DeclarationId(1691), + id: DeclarationId(1692), name: Some("lens_infer_helpers_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1683), + template: DeclarationId(1684), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1683)), + meta_tag: Some(DeclarationId(1684)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -69116,15 +63080,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 4128, 4320), }); declarations.push(Declaration { - id: DeclarationId(1692), + id: DeclarationId(1693), name: Some("lens_variant_payload_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1683), + template: DeclarationId(1684), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1683)), + meta_tag: Some(DeclarationId(1684)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -69152,15 +63116,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 4322, 4522), }); declarations.push(Declaration { - id: DeclarationId(1693), + id: DeclarationId(1694), name: Some("lens_lower_helpers_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1683), + template: DeclarationId(1684), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1683)), + meta_tag: Some(DeclarationId(1684)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -69188,25 +63152,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 4772, 4964), }); declarations.push(Declaration { - id: DeclarationId(1694), + id: DeclarationId(1695), name: Some("IntegerAlgebra".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "OrderedRingAlgebra".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2706), - }, - Field { - label: "SemiringAlgebra".to_string(), - ty: DeclarationId(2707), -======= - ty: DeclarationId(2713), + ty: DeclarationId(2714), }, Field { label: "SemiringAlgebra".to_string(), - ty: DeclarationId(2714), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2715), }, ], }, @@ -69221,33 +63177,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6404, 6466), }); declarations.push(Declaration { - id: DeclarationId(1695), + id: DeclarationId(1696), name: Some("NonIntegerAlgebra".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ApproximateFieldAlgebra".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2708), - }, - Field { - label: "BooleanAlgebraAlgebra".to_string(), - ty: DeclarationId(2709), -======= - ty: DeclarationId(2715), - }, - Field { - label: "BooleanAlgebraAlgebra".to_string(), ty: DeclarationId(2716), }, Field { - label: "TerminalAlgebra".to_string(), + label: "BooleanAlgebraAlgebra".to_string(), ty: DeclarationId(2717), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "TerminalAlgebra".to_string(), - ty: DeclarationId(2710), + ty: DeclarationId(2718), }, ], }, @@ -69262,65 +63206,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6468, 6564), }); declarations.push(Declaration { - id: DeclarationId(1696), + id: DeclarationId(1697), name: Some("TargetCarrier".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "BitCarrier".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2711), - }, - Field { - label: "ByteCarrier".to_string(), - ty: DeclarationId(2712), - }, - Field { - label: "Word16Carrier".to_string(), - ty: DeclarationId(2713), - }, - Field { - label: "Word32Carrier".to_string(), - ty: DeclarationId(2714), - }, - Field { - label: "Word64Carrier".to_string(), - ty: DeclarationId(2715), - }, - Field { - label: "Word128Carrier".to_string(), - ty: DeclarationId(2716), -======= - ty: DeclarationId(2718), - }, - Field { - label: "ByteCarrier".to_string(), ty: DeclarationId(2719), }, Field { - label: "Word16Carrier".to_string(), + label: "ByteCarrier".to_string(), ty: DeclarationId(2720), }, Field { - label: "Word32Carrier".to_string(), + label: "Word16Carrier".to_string(), ty: DeclarationId(2721), }, Field { - label: "Word64Carrier".to_string(), + label: "Word32Carrier".to_string(), ty: DeclarationId(2722), }, Field { - label: "Word128Carrier".to_string(), + label: "Word64Carrier".to_string(), ty: DeclarationId(2723), }, Field { - label: "TerminalCarrier".to_string(), + label: "Word128Carrier".to_string(), ty: DeclarationId(2724), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "TerminalCarrier".to_string(), - ty: DeclarationId(2717), + ty: DeclarationId(2725), }, ], }, @@ -69335,33 +63251,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8154, 8296), }); declarations.push(Declaration { - id: DeclarationId(1697), + id: DeclarationId(1698), name: Some("IntegerOverflow".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TwoComplementWrap".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2718), - }, - Field { - label: "Saturating".to_string(), - ty: DeclarationId(2719), -======= - ty: DeclarationId(2725), - }, - Field { - label: "Saturating".to_string(), ty: DeclarationId(2726), }, Field { - label: "Trap".to_string(), + label: "Saturating".to_string(), ty: DeclarationId(2727), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Trap".to_string(), - ty: DeclarationId(2720), + ty: DeclarationId(2728), }, ], }, @@ -69376,25 +63280,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9013, 9079), }); declarations.push(Declaration { - id: DeclarationId(1698), + id: DeclarationId(1699), name: Some("RustPrimitive".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "IntegerPrimitive".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2721), - }, - Field { - label: "NonIntegerPrimitive".to_string(), - ty: DeclarationId(2722), -======= - ty: DeclarationId(2728), + ty: DeclarationId(2729), }, Field { label: "NonIntegerPrimitive".to_string(), - ty: DeclarationId(2729), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2730), }, ], }, @@ -69409,64 +63305,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9834, 10616), }); declarations.push(Declaration { - id: DeclarationId(1699), + id: DeclarationId(1700), name: Some("rust_pilot_primitives".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1698), + value: DeclarationId(1699), }], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(2723)), -======= - meta_tag: Some(DeclarationId(2730)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + meta_tag: Some(DeclarationId(2731)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2721), - payload: vec![ - FieldValue::Literal(LiteralBits::String("i8".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2706), -======= - constructor: DeclarationId(2728), + constructor: DeclarationId(2729), payload: vec![ FieldValue::Literal(LiteralBits::String("i8".to_string())), FieldValue::Variant { - constructor: DeclarationId(2713), - payload: vec![], - }, - FieldValue::Variant { - constructor: DeclarationId(2719), - payload: vec![], - }, - FieldValue::Literal(LiteralBits::String("-128".to_string())), - FieldValue::Literal(LiteralBits::String("127".to_string())), - FieldValue::Literal(LiteralBits::Bool(true)), - FieldValue::Variant { - constructor: DeclarationId(2725), - payload: vec![], - }, - ], - }, - FieldValue::Variant { - constructor: DeclarationId(2728), - payload: vec![ - FieldValue::Literal(LiteralBits::String("i16".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2713), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2714), payload: vec![], }, FieldValue::Variant { @@ -69477,29 +63336,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Literal(LiteralBits::String("127".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2718), -======= - constructor: DeclarationId(2725), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2726), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2721), -======= - constructor: DeclarationId(2728), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2729), payload: vec![ FieldValue::Literal(LiteralBits::String("i16".to_string())), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2706), -======= - constructor: DeclarationId(2713), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2714), payload: vec![], }, FieldValue::Variant { @@ -69510,29 +63357,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Literal(LiteralBits::String("32767".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2718), -======= - constructor: DeclarationId(2725), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2726), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2721), -======= - constructor: DeclarationId(2728), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2729), payload: vec![ FieldValue::Literal(LiteralBits::String("i32".to_string())), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2706), -======= - constructor: DeclarationId(2713), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2714), payload: vec![], }, FieldValue::Variant { @@ -69543,21 +63378,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Literal(LiteralBits::String("2147483647".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2718), + constructor: DeclarationId(2726), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2721), + constructor: DeclarationId(2729), payload: vec![ FieldValue::Literal(LiteralBits::String("i64".to_string())), FieldValue::Variant { - constructor: DeclarationId(2706), + constructor: DeclarationId(2714), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2715), + constructor: DeclarationId(2723), payload: vec![], }, FieldValue::Literal(LiteralBits::String( @@ -69566,37 +63401,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2718), -======= - constructor: DeclarationId(2725), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2726), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2721), - payload: vec![ - FieldValue::Literal(LiteralBits::String("i128".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2706), - payload: vec![], - }, - FieldValue::Variant { - constructor: DeclarationId(2716), -======= - constructor: DeclarationId(2728), + constructor: DeclarationId(2729), payload: vec![ FieldValue::Literal(LiteralBits::String("i128".to_string())), FieldValue::Variant { - constructor: DeclarationId(2713), + constructor: DeclarationId(2714), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2723), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2724), payload: vec![], }, FieldValue::Literal(LiteralBits::String( @@ -69607,50 +63426,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { )), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2718), -======= - constructor: DeclarationId(2725), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2726), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2721), - payload: vec![ - FieldValue::Literal(LiteralBits::String("u8".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2707), -======= - constructor: DeclarationId(2728), + constructor: DeclarationId(2729), payload: vec![ FieldValue::Literal(LiteralBits::String("u8".to_string())), FieldValue::Variant { - constructor: DeclarationId(2714), - payload: vec![], - }, - FieldValue::Variant { - constructor: DeclarationId(2719), - payload: vec![], - }, - FieldValue::Literal(LiteralBits::String("0".to_string())), - FieldValue::Literal(LiteralBits::String("255".to_string())), - FieldValue::Literal(LiteralBits::Bool(true)), - FieldValue::Variant { - constructor: DeclarationId(2725), - payload: vec![], - }, - ], - }, - FieldValue::Variant { - constructor: DeclarationId(2728), - payload: vec![ - FieldValue::Literal(LiteralBits::String("u16".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2714), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2715), payload: vec![], }, FieldValue::Variant { @@ -69661,29 +63447,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Literal(LiteralBits::String("255".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2718), -======= - constructor: DeclarationId(2725), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2726), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2721), -======= - constructor: DeclarationId(2728), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2729), payload: vec![ FieldValue::Literal(LiteralBits::String("u16".to_string())), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2707), -======= - constructor: DeclarationId(2714), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2715), payload: vec![], }, FieldValue::Variant { @@ -69694,29 +63468,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Literal(LiteralBits::String("65535".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2718), -======= - constructor: DeclarationId(2725), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2726), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2721), -======= - constructor: DeclarationId(2728), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2729), payload: vec![ FieldValue::Literal(LiteralBits::String("u32".to_string())), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2707), -======= - constructor: DeclarationId(2714), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2715), payload: vec![], }, FieldValue::Variant { @@ -69727,29 +63489,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Literal(LiteralBits::String("4294967295".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2718), -======= - constructor: DeclarationId(2725), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2726), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2721), -======= - constructor: DeclarationId(2728), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2729), payload: vec![ FieldValue::Literal(LiteralBits::String("u64".to_string())), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2707), -======= - constructor: DeclarationId(2714), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2715), payload: vec![], }, FieldValue::Variant { @@ -69762,21 +63512,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { )), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2718), + constructor: DeclarationId(2726), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2721), + constructor: DeclarationId(2729), payload: vec![ FieldValue::Literal(LiteralBits::String("u128".to_string())), FieldValue::Variant { - constructor: DeclarationId(2707), + constructor: DeclarationId(2715), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2716), + constructor: DeclarationId(2724), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), @@ -69785,44 +63535,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { )), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2718), -======= - constructor: DeclarationId(2725), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2726), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2722), + constructor: DeclarationId(2730), payload: vec![ FieldValue::Literal(LiteralBits::String("f32".to_string())), FieldValue::Variant { - constructor: DeclarationId(2708), -======= - constructor: DeclarationId(2729), - payload: vec![ - FieldValue::Literal(LiteralBits::String("f32".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2715), - payload: vec![], - }, - FieldValue::Variant { - constructor: DeclarationId(2721), - payload: vec![], - }, - FieldValue::Literal(LiteralBits::Bool(true)), - ], - }, - FieldValue::Variant { - constructor: DeclarationId(2729), - payload: vec![ - FieldValue::Literal(LiteralBits::String("f64".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2715), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2716), payload: vec![], }, FieldValue::Variant { @@ -69833,11 +63556,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2722), -======= - constructor: DeclarationId(2729), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2730), payload: vec![ FieldValue::Literal(LiteralBits::String("f64".to_string())), FieldValue::Variant { @@ -69845,22 +63564,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { payload: vec![], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2715), -======= - constructor: DeclarationId(2718), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2723), payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2722), -======= - constructor: DeclarationId(2729), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2730), payload: vec![ FieldValue::Literal(LiteralBits::String("bool".to_string())), FieldValue::Variant { @@ -69868,26 +63579,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { payload: vec![], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2711), + constructor: DeclarationId(2719), payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), ], }, FieldValue::Variant { - constructor: DeclarationId(2722), + constructor: DeclarationId(2730), payload: vec![ FieldValue::Literal(LiteralBits::String("()".to_string())), FieldValue::Variant { - constructor: DeclarationId(2710), + constructor: DeclarationId(2718), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2717), -======= - constructor: DeclarationId(2724), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2725), payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), @@ -69899,49 +63606,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10937, 15602), }); declarations.push(Declaration { - id: DeclarationId(1700), + id: DeclarationId(1701), name: Some("CronField".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Wildcard".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2724), - }, - Field { - label: "Exact".to_string(), - ty: DeclarationId(2725), - }, - Field { - label: "Listed".to_string(), - ty: DeclarationId(2727), - }, - Field { - label: "Ranged".to_string(), - ty: DeclarationId(2728), -======= - ty: DeclarationId(2731), + ty: DeclarationId(2732), }, Field { label: "Exact".to_string(), - ty: DeclarationId(2732), + ty: DeclarationId(2733), }, Field { label: "Listed".to_string(), - ty: DeclarationId(2734), - }, - Field { - label: "Ranged".to_string(), ty: DeclarationId(2735), }, Field { - label: "Step".to_string(), + label: "Ranged".to_string(), ty: DeclarationId(2736), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Step".to_string(), - ty: DeclarationId(2729), + ty: DeclarationId(2737), }, ], }, @@ -69956,29 +63643,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4214, 4433), }); declarations.push(Declaration { - id: DeclarationId(1701), + id: DeclarationId(1702), name: Some("CronSchedule".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "minute".to_string(), - ty: DeclarationId(1700), + ty: DeclarationId(1701), }, Field { label: "hour".to_string(), - ty: DeclarationId(1700), + ty: DeclarationId(1701), }, Field { label: "day_of_month".to_string(), - ty: DeclarationId(1700), + ty: DeclarationId(1701), }, Field { label: "month".to_string(), - ty: DeclarationId(1700), + ty: DeclarationId(1701), }, Field { label: "day_of_week".to_string(), - ty: DeclarationId(1700), + ty: DeclarationId(1701), }, ], }, @@ -69993,7 +63680,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4435, 4564), }); declarations.push(Declaration { - id: DeclarationId(1702), + id: DeclarationId(1703), name: Some("CronEntry".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -70003,7 +63690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "schedule".to_string(), - ty: DeclarationId(1701), + ty: DeclarationId(1702), }, Field { label: "command".to_string(), @@ -70022,10 +63709,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4566, 4641), }); declarations.push(Declaration { - id: DeclarationId(1703), + id: DeclarationId(1704), name: Some("render_cron_field".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1700)], + inputs: vec![DeclarationId(1701)], output: DeclarationId(230), body: ArrowBody::Unparsed(SourceSpan::new( "dsl/extdeps/cron_schedule_model.dag", @@ -70044,10 +63731,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4643, 4963), }); declarations.push(Declaration { - id: DeclarationId(1704), + id: DeclarationId(1705), name: Some("render_cron_schedule".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1701)], + inputs: vec![DeclarationId(1702)], output: DeclarationId(230), body: ArrowBody::Unparsed(SourceSpan::new( "dsl/extdeps/cron_schedule_model.dag", @@ -70066,7 +63753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4965, 5253), }); declarations.push(Declaration { - id: DeclarationId(1705), + id: DeclarationId(1706), name: Some("wire_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(312), @@ -70087,33 +63774,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 684, 758), }); declarations.push(Declaration { - id: DeclarationId(1706), + id: DeclarationId(1707), name: Some("UserType".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "User".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2730), - }, - Field { - label: "Bot".to_string(), - ty: DeclarationId(2731), -======= - ty: DeclarationId(2737), - }, - Field { - label: "Bot".to_string(), ty: DeclarationId(2738), }, Field { - label: "Organization".to_string(), + label: "Bot".to_string(), ty: DeclarationId(2739), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Organization".to_string(), - ty: DeclarationId(2732), + ty: DeclarationId(2740), }, ], }, @@ -70128,7 +63803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 831, 872), }); declarations.push(Declaration { - id: DeclarationId(1707), + id: DeclarationId(1708), name: Some("GitHubUser".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -70142,7 +63817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type".to_string(), - ty: DeclarationId(1706), + ty: DeclarationId(1707), }, ], }, @@ -70157,7 +63832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 874, 936), }); declarations.push(Declaration { - id: DeclarationId(1708), + id: DeclarationId(1709), name: Some("Repository".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -70194,7 +63869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1009, 1120), }); declarations.push(Declaration { - id: DeclarationId(1709), + id: DeclarationId(1710), name: Some("GitHubAuthToken".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -70204,19 +63879,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "scopes".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2733), - }, - Field { - label: "expires_at".to_string(), - ty: DeclarationId(2734), -======= - ty: DeclarationId(2740), + ty: DeclarationId(2741), }, Field { label: "expires_at".to_string(), - ty: DeclarationId(2741), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2742), }, ], }, @@ -70231,49 +63898,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1193, 1286), }); declarations.push(Declaration { - id: DeclarationId(1710), + id: DeclarationId(1711), name: Some("GitHubScope".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ScopeRepo".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2735), - }, - Field { - label: "ScopeGist".to_string(), - ty: DeclarationId(2736), - }, - Field { - label: "ScopeWorkflow".to_string(), - ty: DeclarationId(2737), - }, - Field { - label: "ScopeReadOrg".to_string(), - ty: DeclarationId(2738), -======= - ty: DeclarationId(2742), - }, - Field { - label: "ScopeGist".to_string(), ty: DeclarationId(2743), }, Field { - label: "ScopeWorkflow".to_string(), + label: "ScopeGist".to_string(), ty: DeclarationId(2744), }, Field { - label: "ScopeReadOrg".to_string(), + label: "ScopeWorkflow".to_string(), ty: DeclarationId(2745), }, Field { - label: "ScopeReadUser".to_string(), + label: "ScopeReadOrg".to_string(), ty: DeclarationId(2746), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ScopeReadUser".to_string(), - ty: DeclarationId(2739), + ty: DeclarationId(2747), }, ], }, @@ -70288,7 +63935,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1288, 1385), }); declarations.push(Declaration { - id: DeclarationId(1711), + id: DeclarationId(1712), name: Some("Pagination".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -70298,11 +63945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "cursor".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2740), -======= - ty: DeclarationId(2747), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2748), }, Field { label: "has_next".to_string(), @@ -70321,33 +63964,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1510, 1580), }); declarations.push(Declaration { - id: DeclarationId(1712), + id: DeclarationId(1713), name: Some("GitHubPermission".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "PermRead".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2741), - }, - Field { - label: "PermWrite".to_string(), - ty: DeclarationId(2742), -======= - ty: DeclarationId(2748), - }, - Field { - label: "PermWrite".to_string(), ty: DeclarationId(2749), }, Field { - label: "PermAdmin".to_string(), + label: "PermWrite".to_string(), ty: DeclarationId(2750), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "PermAdmin".to_string(), - ty: DeclarationId(2743), + ty: DeclarationId(2751), }, ], }, @@ -70362,7 +63993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1653, 1709), }); declarations.push(Declaration { - id: DeclarationId(1713), + id: DeclarationId(1714), name: Some("default_api_base".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -70381,7 +64012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1782, 1838), }); declarations.push(Declaration { - id: DeclarationId(1714), + id: DeclarationId(1715), name: Some("default_per_page".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(93), @@ -70398,7 +64029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1840, 1871), }); declarations.push(Declaration { - id: DeclarationId(1715), + id: DeclarationId(1716), name: Some("max_per_page".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(93), @@ -70415,7 +64046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1873, 1901), }); declarations.push(Declaration { - id: DeclarationId(1716), + id: DeclarationId(1717), name: Some("Workflow".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -70425,35 +64056,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "on".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2744), - }, - Field { - label: "jobs".to_string(), - ty: DeclarationId(2745), - }, - Field { - label: "env".to_string(), - ty: DeclarationId(2746), -======= - ty: DeclarationId(2751), - }, - Field { - label: "jobs".to_string(), ty: DeclarationId(2752), }, Field { - label: "env".to_string(), + label: "jobs".to_string(), ty: DeclarationId(2753), }, Field { - label: "permissions".to_string(), + label: "env".to_string(), ty: DeclarationId(2754), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "permissions".to_string(), - ty: DeclarationId(2747), + ty: DeclarationId(2755), }, ], }, @@ -70468,25 +64083,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 792, 933), }); declarations.push(Declaration { - id: DeclarationId(1717), + id: DeclarationId(1718), name: Some("WorkflowPermissions".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "contents".to_string(), - ty: DeclarationId(1718), + ty: DeclarationId(1719), }, Field { label: "pull_requests".to_string(), - ty: DeclarationId(1718), + ty: DeclarationId(1719), }, Field { label: "issues".to_string(), - ty: DeclarationId(1718), + ty: DeclarationId(1719), }, Field { label: "actions".to_string(), - ty: DeclarationId(1718), + ty: DeclarationId(1719), }, ], }, @@ -70501,33 +64116,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 935, 1077), }); declarations.push(Declaration { - id: DeclarationId(1718), + id: DeclarationId(1719), name: Some("PermissionLevel".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "PermRead".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2748), - }, - Field { - label: "PermWrite".to_string(), - ty: DeclarationId(2749), -======= - ty: DeclarationId(2755), - }, - Field { - label: "PermWrite".to_string(), ty: DeclarationId(2756), }, Field { - label: "PermNone".to_string(), + label: "PermWrite".to_string(), ty: DeclarationId(2757), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "PermNone".to_string(), - ty: DeclarationId(2750), + ty: DeclarationId(2758), }, ], }, @@ -70542,49 +64145,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1079, 1133), }); declarations.push(Declaration { - id: DeclarationId(1719), + id: DeclarationId(1720), name: Some("WorkflowTrigger".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Push".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2753), - }, - Field { - label: "PullRequest".to_string(), - ty: DeclarationId(2756), -======= - ty: DeclarationId(2760), + ty: DeclarationId(2761), }, Field { label: "PullRequest".to_string(), - ty: DeclarationId(2763), - }, - Field { - label: "Schedule".to_string(), ty: DeclarationId(2764), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Schedule".to_string(), - ty: DeclarationId(2757), + ty: DeclarationId(2765), }, Field { label: "WorkflowDispatch".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2759), - }, - Field { - label: "WorkflowCall".to_string(), - ty: DeclarationId(2761), -======= - ty: DeclarationId(2766), + ty: DeclarationId(2767), }, Field { label: "WorkflowCall".to_string(), - ty: DeclarationId(2768), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2769), }, ], }, @@ -70599,41 +64182,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1249, 1541), }); declarations.push(Declaration { - id: DeclarationId(1720), + id: DeclarationId(1721), name: Some("PullRequestActivity".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Opened".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2762), - }, - Field { - label: "Synchronize".to_string(), - ty: DeclarationId(2763), - }, - Field { - label: "Reopened".to_string(), - ty: DeclarationId(2764), -======= - ty: DeclarationId(2769), - }, - Field { - label: "Synchronize".to_string(), ty: DeclarationId(2770), }, Field { - label: "Reopened".to_string(), + label: "Synchronize".to_string(), ty: DeclarationId(2771), }, Field { - label: "Closed".to_string(), + label: "Reopened".to_string(), ty: DeclarationId(2772), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Closed".to_string(), - ty: DeclarationId(2765), + ty: DeclarationId(2773), }, ], }, @@ -70648,7 +64215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1543, 1618), }); declarations.push(Declaration { - id: DeclarationId(1721), + id: DeclarationId(1722), name: Some("DispatchInput".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -70658,11 +64225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "description".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2766), -======= - ty: DeclarationId(2773), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2774), }, Field { label: "required".to_string(), @@ -70670,15 +64233,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "default".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2767), -======= - ty: DeclarationId(2774), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2775), }, Field { label: "type".to_string(), - ty: DeclarationId(1722), + ty: DeclarationId(1723), }, ], }, @@ -70693,41 +64252,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1620, 1742), }); declarations.push(Declaration { - id: DeclarationId(1722), + id: DeclarationId(1723), name: Some("DispatchInputType".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "InputString".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2768), - }, - Field { - label: "InputBoolean".to_string(), - ty: DeclarationId(2769), - }, - Field { - label: "InputChoice".to_string(), - ty: DeclarationId(2770), -======= - ty: DeclarationId(2775), - }, - Field { - label: "InputBoolean".to_string(), ty: DeclarationId(2776), }, Field { - label: "InputChoice".to_string(), + label: "InputBoolean".to_string(), ty: DeclarationId(2777), }, Field { - label: "InputEnvironment".to_string(), + label: "InputChoice".to_string(), ty: DeclarationId(2778), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "InputEnvironment".to_string(), - ty: DeclarationId(2771), + ty: DeclarationId(2779), }, ], }, @@ -70742,33 +64285,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1744, 1828), }); declarations.push(Declaration { - id: DeclarationId(1723), + id: DeclarationId(1724), name: Some("SecretScope".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "StepScope".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2772), - }, - Field { - label: "JobScope".to_string(), - ty: DeclarationId(2773), -======= - ty: DeclarationId(2779), - }, - Field { - label: "JobScope".to_string(), ty: DeclarationId(2780), }, Field { - label: "WorkflowScope".to_string(), + label: "JobScope".to_string(), ty: DeclarationId(2781), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "WorkflowScope".to_string(), - ty: DeclarationId(2774), + ty: DeclarationId(2782), }, ], }, @@ -70783,7 +64314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 3785, 3840), }); declarations.push(Declaration { - id: DeclarationId(1724), + id: DeclarationId(1725), name: Some("WorkflowSecret".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -70793,7 +64324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "scope".to_string(), - ty: DeclarationId(1723), + ty: DeclarationId(1724), }, ], }, @@ -70808,7 +64339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4115, 4178), }); declarations.push(Declaration { - id: DeclarationId(1725), + id: DeclarationId(1726), name: Some("Job".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -70818,67 +64349,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "name".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2775), - }, - Field { - label: "runner".to_string(), - ty: DeclarationId(1727), - }, - Field { - label: "steps".to_string(), - ty: DeclarationId(2776), - }, - Field { - label: "needs".to_string(), - ty: DeclarationId(2777), - }, - Field { - label: "env".to_string(), - ty: DeclarationId(2778), - }, - Field { - label: "if_condition".to_string(), - ty: DeclarationId(2779), - }, - Field { - label: "strategy".to_string(), - ty: DeclarationId(2780), -======= - ty: DeclarationId(2782), + ty: DeclarationId(2783), }, Field { label: "runner".to_string(), - ty: DeclarationId(1727), + ty: DeclarationId(1728), }, Field { label: "steps".to_string(), - ty: DeclarationId(2783), - }, - Field { - label: "needs".to_string(), ty: DeclarationId(2784), }, Field { - label: "env".to_string(), + label: "needs".to_string(), ty: DeclarationId(2785), }, Field { - label: "if_condition".to_string(), + label: "env".to_string(), ty: DeclarationId(2786), }, Field { - label: "strategy".to_string(), + label: "if_condition".to_string(), ty: DeclarationId(2787), }, Field { - label: "timeout_minutes".to_string(), + label: "strategy".to_string(), ty: DeclarationId(2788), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "timeout_minutes".to_string(), - ty: DeclarationId(2781), + ty: DeclarationId(2789), }, Field { label: "continue_on_error".to_string(), @@ -70886,11 +64385,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "concurrency".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2782), -======= - ty: DeclarationId(2789), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2790), }, ], }, @@ -70905,7 +64400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4322, 4587), }); declarations.push(Declaration { - id: DeclarationId(1726), + id: DeclarationId(1727), name: Some("ConcurrencySpec".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -70930,25 +64425,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4589, 4656), }); declarations.push(Declaration { - id: DeclarationId(1727), + id: DeclarationId(1728), name: Some("RunnerSpec".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "HostedRunner".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2783), - }, - Field { - label: "SelfHosted".to_string(), - ty: DeclarationId(2785), -======= - ty: DeclarationId(2790), + ty: DeclarationId(2791), }, Field { label: "SelfHosted".to_string(), - ty: DeclarationId(2792), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2793), }, ], }, @@ -70963,57 +64450,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4772, 4867), }); declarations.push(Declaration { - id: DeclarationId(1728), + id: DeclarationId(1729), name: Some("RunnerLabel".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "UbuntuLatest".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2786), - }, - Field { - label: "Ubuntu2404".to_string(), - ty: DeclarationId(2787), - }, - Field { - label: "Ubuntu2204".to_string(), - ty: DeclarationId(2788), - }, - Field { - label: "MacosLatest".to_string(), - ty: DeclarationId(2789), - }, - Field { - label: "Macos14".to_string(), - ty: DeclarationId(2790), -======= - ty: DeclarationId(2793), - }, - Field { - label: "Ubuntu2404".to_string(), ty: DeclarationId(2794), }, Field { - label: "Ubuntu2204".to_string(), + label: "Ubuntu2404".to_string(), ty: DeclarationId(2795), }, Field { - label: "MacosLatest".to_string(), + label: "Ubuntu2204".to_string(), ty: DeclarationId(2796), }, Field { - label: "Macos14".to_string(), + label: "MacosLatest".to_string(), ty: DeclarationId(2797), }, Field { - label: "WindowsLatest".to_string(), + label: "Macos14".to_string(), ty: DeclarationId(2798), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "WindowsLatest".to_string(), - ty: DeclarationId(2791), + ty: DeclarationId(2799), }, ], }, @@ -71028,25 +64491,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4869, 4978), }); declarations.push(Declaration { - id: DeclarationId(1729), + id: DeclarationId(1730), name: Some("Step".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "RunStep".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2797), - }, - Field { - label: "UsesStep".to_string(), - ty: DeclarationId(2803), -======= - ty: DeclarationId(2804), + ty: DeclarationId(2805), }, Field { label: "UsesStep".to_string(), - ty: DeclarationId(2810), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2811), }, ], }, @@ -71061,49 +64516,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5123, 5588), }); declarations.push(Declaration { - id: DeclarationId(1730), + id: DeclarationId(1731), name: Some("ShellType".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Bash".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2804), - }, - Field { - label: "Sh".to_string(), - ty: DeclarationId(2805), - }, - Field { - label: "Pwsh".to_string(), - ty: DeclarationId(2806), - }, - Field { - label: "Python".to_string(), - ty: DeclarationId(2807), -======= - ty: DeclarationId(2811), - }, - Field { - label: "Sh".to_string(), ty: DeclarationId(2812), }, Field { - label: "Pwsh".to_string(), + label: "Sh".to_string(), ty: DeclarationId(2813), }, Field { - label: "Python".to_string(), + label: "Pwsh".to_string(), ty: DeclarationId(2814), }, Field { - label: "Cmd".to_string(), + label: "Python".to_string(), ty: DeclarationId(2815), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Cmd".to_string(), - ty: DeclarationId(2808), + ty: DeclarationId(2816), }, ], }, @@ -71118,7 +64553,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5590, 5638), }); declarations.push(Declaration { - id: DeclarationId(1731), + id: DeclarationId(1732), name: Some("ActionRef".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -71147,73 +64582,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5640, 5703), }); declarations.push(Declaration { - id: DeclarationId(1732), + id: DeclarationId(1733), name: Some("LogAnnotation".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "AnnotationError".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2812), - }, - Field { - label: "AnnotationWarning".to_string(), - ty: DeclarationId(2816), - }, - Field { - label: "AnnotationNotice".to_string(), ty: DeclarationId(2820), }, - Field { - label: "AnnotationGroup".to_string(), - ty: DeclarationId(2821), - }, - Field { - label: "AnnotationEndGroup".to_string(), - ty: DeclarationId(2822), - }, - Field { - label: "SetOutput".to_string(), - ty: DeclarationId(2823), - }, - Field { - label: "AddMask".to_string(), - ty: DeclarationId(2824), -======= - ty: DeclarationId(2819), - }, Field { label: "AnnotationWarning".to_string(), - ty: DeclarationId(2823), + ty: DeclarationId(2824), }, Field { label: "AnnotationNotice".to_string(), - ty: DeclarationId(2827), - }, - Field { - label: "AnnotationGroup".to_string(), ty: DeclarationId(2828), }, Field { - label: "AnnotationEndGroup".to_string(), + label: "AnnotationGroup".to_string(), ty: DeclarationId(2829), }, Field { - label: "SetOutput".to_string(), + label: "AnnotationEndGroup".to_string(), ty: DeclarationId(2830), }, Field { - label: "AddMask".to_string(), + label: "SetOutput".to_string(), ty: DeclarationId(2831), }, Field { - label: "StopCommands".to_string(), + label: "AddMask".to_string(), ty: DeclarationId(2832), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "StopCommands".to_string(), - ty: DeclarationId(2825), + ty: DeclarationId(2833), }, ], }, @@ -71228,7 +64631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5937, 6364), }); declarations.push(Declaration { - id: DeclarationId(1733), + id: DeclarationId(1734), name: Some("annotation_error_prefix".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -71247,7 +64650,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6430, 6479), }); declarations.push(Declaration { - id: DeclarationId(1734), + id: DeclarationId(1735), name: Some("annotation_warning_prefix".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -71266,7 +64669,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6480, 6533), }); declarations.push(Declaration { - id: DeclarationId(1735), + id: DeclarationId(1736), name: Some("annotation_notice_prefix".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -71285,7 +64688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6534, 6585), }); declarations.push(Declaration { - id: DeclarationId(1736), + id: DeclarationId(1737), name: Some("annotation_group_prefix".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -71304,7 +64707,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6586, 6636), }); declarations.push(Declaration { - id: DeclarationId(1737), + id: DeclarationId(1738), name: Some("annotation_endgroup".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -71323,7 +64726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6637, 6686), }); declarations.push(Declaration { - id: DeclarationId(1738), + id: DeclarationId(1739), name: Some("annotation_set_output_prefix".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -71342,7 +64745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6687, 6751), }); declarations.push(Declaration { - id: DeclarationId(1739), + id: DeclarationId(1740), name: Some("annotation_add_mask_prefix".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -71361,7 +64764,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6752, 6808), }); declarations.push(Declaration { - id: DeclarationId(1740), + id: DeclarationId(1741), name: Some("annotation_stop_commands_prefix".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(230), @@ -71380,25 +64783,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6809, 6875), }); declarations.push(Declaration { - id: DeclarationId(1741), + id: DeclarationId(1742), name: Some("ArtifactOp".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Upload".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2827), - }, - Field { - label: "Download".to_string(), - ty: DeclarationId(2829), -======= - ty: DeclarationId(2834), + ty: DeclarationId(2835), }, Field { label: "Download".to_string(), - ty: DeclarationId(2836), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2837), }, ], }, @@ -71413,33 +64808,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7097, 7262), }); declarations.push(Declaration { - id: DeclarationId(1742), + id: DeclarationId(1743), name: Some("MissingFilesBehavior".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Warn".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2830), - }, - Field { - label: "ErrorOut".to_string(), - ty: DeclarationId(2831), -======= - ty: DeclarationId(2837), - }, - Field { - label: "ErrorOut".to_string(), ty: DeclarationId(2838), }, Field { - label: "Ignore".to_string(), + label: "ErrorOut".to_string(), ty: DeclarationId(2839), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Ignore".to_string(), - ty: DeclarationId(2832), + ty: DeclarationId(2840), }, ], }, @@ -71454,15 +64837,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7264, 7316), }); declarations.push(Declaration { - id: DeclarationId(1743), + id: DeclarationId(1744), name: Some("upload_artifact_action".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1731), + template: DeclarationId(1732), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1731)), + meta_tag: Some(DeclarationId(1732)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -71475,15 +64858,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7367, 7476), }); declarations.push(Declaration { - id: DeclarationId(1744), + id: DeclarationId(1745), name: Some("download_artifact_action".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1731), + template: DeclarationId(1732), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1731)), + meta_tag: Some(DeclarationId(1732)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -71496,33 +64879,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7478, 7591), }); declarations.push(Declaration { - id: DeclarationId(1745), + id: DeclarationId(1746), name: Some("MatrixStrategy".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "dimensions".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2834), - }, - Field { - label: "include".to_string(), - ty: DeclarationId(2836), - }, - Field { - label: "exclude".to_string(), - ty: DeclarationId(2838), -======= - ty: DeclarationId(2841), + ty: DeclarationId(2842), }, Field { label: "include".to_string(), - ty: DeclarationId(2843), + ty: DeclarationId(2844), }, Field { label: "exclude".to_string(), - ty: DeclarationId(2845), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2846), }, Field { label: "fail_fast".to_string(), @@ -71530,11 +64901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "max_parallel".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2839), -======= - ty: DeclarationId(2846), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2847), }, ], }, @@ -71549,57 +64916,33 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7730, 7906), }); declarations.push(Declaration { - id: DeclarationId(1746), + id: DeclarationId(1747), name: Some("CheckConclusion".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Success".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2840), - }, - Field { - label: "Failure".to_string(), - ty: DeclarationId(2841), - }, - Field { - label: "Cancelled".to_string(), - ty: DeclarationId(2842), - }, - Field { - label: "Skipped".to_string(), - ty: DeclarationId(2843), - }, - Field { - label: "TimedOut".to_string(), - ty: DeclarationId(2844), -======= - ty: DeclarationId(2847), - }, - Field { - label: "Failure".to_string(), ty: DeclarationId(2848), }, Field { - label: "Cancelled".to_string(), + label: "Failure".to_string(), ty: DeclarationId(2849), }, Field { - label: "Skipped".to_string(), + label: "Cancelled".to_string(), ty: DeclarationId(2850), }, Field { - label: "TimedOut".to_string(), + label: "Skipped".to_string(), ty: DeclarationId(2851), }, Field { - label: "ActionRequired".to_string(), + label: "TimedOut".to_string(), ty: DeclarationId(2852), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ActionRequired".to_string(), - ty: DeclarationId(2845), + ty: DeclarationId(2853), }, ], }, @@ -71614,15 +64957,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8035, 8137), }); declarations.push(Declaration { - id: DeclarationId(1747), + id: DeclarationId(1748), name: Some("checkout_action".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1731), + template: DeclarationId(1732), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1731)), + meta_tag: Some(DeclarationId(1732)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -71635,15 +64978,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8263, 8358), }); declarations.push(Declaration { - id: DeclarationId(1748), + id: DeclarationId(1749), name: Some("setup_rust_action".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1731), + template: DeclarationId(1732), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1731)), + meta_tag: Some(DeclarationId(1732)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -71656,15 +64999,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8360, 8484), }); declarations.push(Declaration { - id: DeclarationId(1749), + id: DeclarationId(1750), name: Some("cache_action".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1731), + template: DeclarationId(1732), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1731)), + meta_tag: Some(DeclarationId(1732)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( @@ -71677,7 +65020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8486, 8575), }); declarations.push(Declaration { - id: DeclarationId(1750), + id: DeclarationId(1751), name: Some("max_job_timeout_minutes".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(93), @@ -71694,7 +65037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8651, 8690), }); declarations.push(Declaration { - id: DeclarationId(1751), + id: DeclarationId(1752), name: Some("default_job_timeout_minutes".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(93), @@ -71711,7 +65054,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8692, 8735), }); declarations.push(Declaration { - id: DeclarationId(1752), + id: DeclarationId(1753), name: Some("max_matrix_combinations".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(93), @@ -71728,7 +65071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8737, 8776), }); declarations.push(Declaration { - id: DeclarationId(1753), + id: DeclarationId(1754), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -71748,7 +65091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3259, 3272), }); declarations.push(Declaration { - id: DeclarationId(1754), + id: DeclarationId(1755), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -71768,7 +65111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3421, 3434), }); declarations.push(Declaration { - id: DeclarationId(1755), + id: DeclarationId(1756), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -71788,7 +65131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3439, 3452), }); declarations.push(Declaration { - id: DeclarationId(1756), + id: DeclarationId(1757), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -71808,7 +65151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3556, 3569), }); declarations.push(Declaration { - id: DeclarationId(1757), + id: DeclarationId(1758), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -71828,7 +65171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4162, 4169), }); declarations.push(Declaration { - id: DeclarationId(1758), + id: DeclarationId(1759), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(696), DeclarationId(695)], @@ -71846,7 +65189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(1759), + id: DeclarationId(1760), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -71866,7 +65209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4617, 4624), }); declarations.push(Declaration { - id: DeclarationId(1760), + id: DeclarationId(1761), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(698), DeclarationId(699)], @@ -71883,31 +65226,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/list.dag", 4638, 4651), }); - declarations.push(Declaration { - id: DeclarationId(1761), -<<<<<<< HEAD - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(686), - arguments: vec![TemplateArgument { - parameter: DeclarationId(687), - value: DeclarationId(701), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/list.dag", 5336, 5349), - }); declarations.push(Declaration { id: DeclarationId(1762), -======= ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -71952,12 +65272,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), - value: DeclarationId(703), -======= - parameter: DeclarationId(686), - value: DeclarationId(700), + value: DeclarationId(701), }], }, type_params: vec![], @@ -71971,14 +65287,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5372, 5385), }); declarations.push(Declaration { - id: DeclarationId(1764), + id: DeclarationId(1765), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(702), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + parameter: DeclarationId(687), + value: DeclarationId(703), }], }, type_params: vec![], @@ -71992,7 +65307,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5686, 5693), }); declarations.push(Declaration { - id: DeclarationId(1765), + id: DeclarationId(1766), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(703)], @@ -72010,7 +65325,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5698, 5708), }); declarations.push(Declaration { - id: DeclarationId(1766), + id: DeclarationId(1767), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -72030,7 +65345,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5713, 5720), }); declarations.push(Declaration { - id: DeclarationId(1767), + id: DeclarationId(1768), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -72050,7 +65365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5867, 5874), }); declarations.push(Declaration { - id: DeclarationId(1768), + id: DeclarationId(1769), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(706)], @@ -72068,7 +65383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892), }); declarations.push(Declaration { - id: DeclarationId(1769), + id: DeclarationId(1770), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -72088,7 +65403,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5897, 5904), }); declarations.push(Declaration { - id: DeclarationId(1770), + id: DeclarationId(1771), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -72108,7 +65423,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6130, 6137), }); declarations.push(Declaration { - id: DeclarationId(1771), + id: DeclarationId(1772), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -72128,15 +65443,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6151, 6158), }); declarations.push(Declaration { - id: DeclarationId(1772), + id: DeclarationId(1773), name: None, connective: TypeConnective::Arrow { -<<<<<<< HEAD inputs: vec![DeclarationId(708)], -======= - inputs: vec![DeclarationId(707)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1771), + output: DeclarationId(1772), body: ArrowBody::NoBody, }, type_params: vec![], @@ -72150,7 +65461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6142, 6158), }); declarations.push(Declaration { - id: DeclarationId(1773), + id: DeclarationId(1774), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -72170,7 +65481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6163, 6170), }); declarations.push(Declaration { - id: DeclarationId(1774), + id: DeclarationId(1775), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -72190,7 +65501,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6356, 6363), }); declarations.push(Declaration { - id: DeclarationId(1775), + id: DeclarationId(1776), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -72210,7 +65521,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6588, 6595), }); declarations.push(Declaration { - id: DeclarationId(1776), + id: DeclarationId(1777), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -72230,7 +65541,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7202, 7209), }); declarations.push(Declaration { - id: DeclarationId(1777), + id: DeclarationId(1778), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(714), @@ -72250,17 +65561,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7219, 7236), }); declarations.push(Declaration { - id: DeclarationId(1778), + id: DeclarationId(1779), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1777), + value: DeclarationId(1778), }], }, type_params: vec![], @@ -72274,7 +65581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7214, 7237), }); declarations.push(Declaration { - id: DeclarationId(1779), + id: DeclarationId(1780), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -72294,7 +65601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7415, 7422), }); declarations.push(Declaration { - id: DeclarationId(1780), + id: DeclarationId(1781), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(714), @@ -72314,17 +65621,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7444, 7461), }); declarations.push(Declaration { - id: DeclarationId(1781), + id: DeclarationId(1782), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1780), + value: DeclarationId(1781), }], }, type_params: vec![], @@ -72338,7 +65641,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7439, 7462), }); declarations.push(Declaration { - id: DeclarationId(1782), + id: DeclarationId(1783), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -72358,7 +65661,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 8177, 8184), }); declarations.push(Declaration { - id: DeclarationId(1783), + id: DeclarationId(1784), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72372,7 +65675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 2106, 2111), }); declarations.push(Declaration { - id: DeclarationId(1784), + id: DeclarationId(1785), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -72392,7 +65695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 2144, 2157), }); declarations.push(Declaration { - id: DeclarationId(1785), + id: DeclarationId(1786), name: None, connective: TypeConnective::Conj { children: vec![ @@ -72402,7 +65705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "tail".to_string(), - ty: DeclarationId(1784), + ty: DeclarationId(1785), }, ], }, @@ -72417,7 +65720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 2116, 2159), }); declarations.push(Declaration { - id: DeclarationId(1786), + id: DeclarationId(1787), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -72437,7 +65740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1477, 1490), }); declarations.push(Declaration { - id: DeclarationId(1787), + id: DeclarationId(1788), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -72457,7 +65760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1570, 1583), }); declarations.push(Declaration { - id: DeclarationId(1788), + id: DeclarationId(1789), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -72476,7 +65779,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), }); declarations.push(Declaration { - id: DeclarationId(1789), + id: DeclarationId(1790), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(813), @@ -72496,7 +65799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20916, 20943), }); declarations.push(Declaration { - id: DeclarationId(1790), + id: DeclarationId(1791), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(714), @@ -72516,7 +65819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20995, 21026), }); declarations.push(Declaration { - id: DeclarationId(1791), + id: DeclarationId(1792), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(813), @@ -72536,11 +65839,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21058), }); declarations.push(Declaration { - id: DeclarationId(1792), + id: DeclarationId(1793), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1791), + DeclarationId(1792), CardinalityBound::AtMostOne, ), ), @@ -72555,7 +65858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), }); declarations.push(Declaration { - id: DeclarationId(1793), + id: DeclarationId(1794), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -72575,7 +65878,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21185, 21206), }); declarations.push(Declaration { - id: DeclarationId(1794), + id: DeclarationId(1795), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(813), @@ -72595,11 +65898,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21238), }); declarations.push(Declaration { - id: DeclarationId(1795), + id: DeclarationId(1796), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1794), + DeclarationId(1795), CardinalityBound::AtMostOne, ), ), @@ -72614,7 +65917,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), }); declarations.push(Declaration { - id: DeclarationId(1796), + id: DeclarationId(1797), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -72634,7 +65937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 22268, 22289), }); declarations.push(Declaration { - id: DeclarationId(1797), + id: DeclarationId(1798), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -72653,7 +65956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), }); declarations.push(Declaration { - id: DeclarationId(1798), + id: DeclarationId(1799), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -72672,7 +65975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), }); declarations.push(Declaration { - id: DeclarationId(1799), + id: DeclarationId(1800), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -72691,7 +65994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), }); declarations.push(Declaration { - id: DeclarationId(1800), + id: DeclarationId(1801), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -72711,7 +66014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 36581, 36602), }); declarations.push(Declaration { - id: DeclarationId(1801), + id: DeclarationId(1802), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -72731,7 +66034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 36608, 36639), }); declarations.push(Declaration { - id: DeclarationId(1802), + id: DeclarationId(1803), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72750,7 +66053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 7532, 7561), }); declarations.push(Declaration { - id: DeclarationId(1803), + id: DeclarationId(1804), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72768,31 +66071,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/effects.dag", 7566, 7595), }); - declarations.push(Declaration { - id: DeclarationId(1804), -<<<<<<< HEAD - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(686), - arguments: vec![TemplateArgument { - parameter: DeclarationId(687), - value: DeclarationId(730), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 7627, 7645), - }); declarations.push(Declaration { id: DeclarationId(1805), -======= ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -72815,10 +66095,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1806), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(729), + parameter: DeclarationId(687), + value: DeclarationId(730), }], }, type_params: vec![], @@ -72832,12 +66112,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8066, 8084), }); declarations.push(Declaration { - id: DeclarationId(1806), + id: DeclarationId(1807), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "tokens".to_string(), - ty: DeclarationId(1805), + ty: DeclarationId(1806), }], }, type_params: vec![], @@ -72851,7 +66131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8036, 8086), }); declarations.push(Declaration { - id: DeclarationId(1807), + id: DeclarationId(1808), name: None, connective: TypeConnective::Conj { children: vec![ @@ -72876,7 +66156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8091, 8147), }); declarations.push(Declaration { - id: DeclarationId(1808), + id: DeclarationId(1809), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72895,7 +66175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8510, 8555), }); declarations.push(Declaration { - id: DeclarationId(1809), + id: DeclarationId(1810), name: None, connective: TypeConnective::Conj { children: vec![ @@ -72924,7 +66204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8560, 8630), }); declarations.push(Declaration { - id: DeclarationId(1810), + id: DeclarationId(1811), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72937,30 +66217,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/effects.dag", 14355, 14365), }); - declarations.push(Declaration { - id: DeclarationId(1811), -<<<<<<< HEAD - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "key_source".to_string(), - ty: DeclarationId(741), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 14370, 14408), - }); declarations.push(Declaration { id: DeclarationId(1812), -======= ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72984,7 +66242,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "key_source".to_string(), - ty: DeclarationId(740), + ty: DeclarationId(741), }], }, type_params: vec![], @@ -72998,7 +66256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14413, 14451), }); declarations.push(Declaration { - id: DeclarationId(1813), + id: DeclarationId(1814), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73017,7 +66275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14697, 14732), }); declarations.push(Declaration { - id: DeclarationId(1814), + id: DeclarationId(1815), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73030,30 +66288,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/effects.dag", 14737, 14749), }); - declarations.push(Declaration { - id: DeclarationId(1815), -<<<<<<< HEAD -======= - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(736), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 15171, 15200), - }); declarations.push(Declaration { id: DeclarationId(1816), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73091,7 +66327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 15205, 15230), }); declarations.push(Declaration { - id: DeclarationId(1817), + id: DeclarationId(1818), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73105,7 +66341,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 15743, 15753), }); declarations.push(Declaration { - id: DeclarationId(1818), + id: DeclarationId(1819), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73124,7 +66360,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 15758, 15796), }); declarations.push(Declaration { - id: DeclarationId(1819), + id: DeclarationId(1820), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73143,7 +66379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 16501, 16528), }); declarations.push(Declaration { - id: DeclarationId(1820), + id: DeclarationId(1821), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73162,7 +66398,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 16533, 16561), }); declarations.push(Declaration { - id: DeclarationId(1821), + id: DeclarationId(1822), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -73182,12 +66418,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 16589, 16601), }); declarations.push(Declaration { - id: DeclarationId(1822), + id: DeclarationId(1823), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "fields".to_string(), - ty: DeclarationId(1821), + ty: DeclarationId(1822), }], }, type_params: vec![], @@ -73201,7 +66437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 16566, 16603), }); declarations.push(Declaration { - id: DeclarationId(1823), + id: DeclarationId(1824), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73215,7 +66451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 17280, 17293), }); declarations.push(Declaration { - id: DeclarationId(1824), + id: DeclarationId(1825), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73229,7 +66465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 17298, 17312), }); declarations.push(Declaration { - id: DeclarationId(1825), + id: DeclarationId(1826), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73248,7 +66484,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 17317, 17349), }); declarations.push(Declaration { - id: DeclarationId(1826), + id: DeclarationId(1827), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73267,7 +66503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 19519, 19560), }); declarations.push(Declaration { - id: DeclarationId(1827), + id: DeclarationId(1828), name: None, connective: TypeConnective::Conj { children: vec![ @@ -73292,7 +66528,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 19565, 19634), }); declarations.push(Declaration { - id: DeclarationId(1828), + id: DeclarationId(1829), name: None, connective: TypeConnective::Conj { children: vec![ @@ -73329,7 +66565,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 19639, 19789), }); declarations.push(Declaration { - id: DeclarationId(1829), + id: DeclarationId(1830), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73343,7 +66579,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20538, 20559), }); declarations.push(Declaration { - id: DeclarationId(1830), + id: DeclarationId(1831), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(813), @@ -73363,12 +66599,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20590, 20617), }); declarations.push(Declaration { - id: DeclarationId(1831), + id: DeclarationId(1832), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "first_breaker".to_string(), - ty: DeclarationId(1830), + ty: DeclarationId(1831), }], }, type_params: vec![], @@ -73382,7 +66618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20564, 20619), }); declarations.push(Declaration { - id: DeclarationId(1832), + id: DeclarationId(1833), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -73402,12 +66638,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24543, 24564), }); declarations.push(Declaration { - id: DeclarationId(1833), + id: DeclarationId(1834), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "ops".to_string(), - ty: DeclarationId(1832), + ty: DeclarationId(1833), }], }, type_params: vec![], @@ -73421,7 +66657,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24523, 24566), }); declarations.push(Declaration { - id: DeclarationId(1834), + id: DeclarationId(1835), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(728), @@ -73441,12 +66677,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24592, 24619), }); declarations.push(Declaration { - id: DeclarationId(1835), + id: DeclarationId(1836), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "arms".to_string(), - ty: DeclarationId(1834), + ty: DeclarationId(1835), }], }, type_params: vec![], @@ -73460,7 +66696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24571, 24621), }); declarations.push(Declaration { - id: DeclarationId(1836), + id: DeclarationId(1837), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73479,7 +66715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24626, 24661), }); declarations.push(Declaration { - id: DeclarationId(1837), + id: DeclarationId(1838), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(728), @@ -73499,12 +66735,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24693, 24725), }); declarations.push(Declaration { - id: DeclarationId(1838), + id: DeclarationId(1839), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "branches".to_string(), - ty: DeclarationId(1837), + ty: DeclarationId(1838), }], }, type_params: vec![], @@ -73518,7 +66754,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24666, 24727), }); declarations.push(Declaration { - id: DeclarationId(1839), + id: DeclarationId(1840), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73537,7 +66773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25364, 25410), }); declarations.push(Declaration { - id: DeclarationId(1840), + id: DeclarationId(1841), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73556,7 +66792,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25415, 25467), }); declarations.push(Declaration { - id: DeclarationId(1841), + id: DeclarationId(1842), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73570,7 +66806,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25964, 25984), }); declarations.push(Declaration { - id: DeclarationId(1842), + id: DeclarationId(1843), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73584,7 +66820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25989, 26010), }); declarations.push(Declaration { - id: DeclarationId(1843), + id: DeclarationId(1844), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73598,7 +66834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26015, 26038), }); declarations.push(Declaration { - id: DeclarationId(1844), + id: DeclarationId(1845), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73612,7 +66848,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26043, 26061), }); declarations.push(Declaration { - id: DeclarationId(1845), + id: DeclarationId(1846), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73626,7 +66862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26066, 26084), }); declarations.push(Declaration { - id: DeclarationId(1846), + id: DeclarationId(1847), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73645,7 +66881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26401, 26447), }); declarations.push(Declaration { - id: DeclarationId(1847), + id: DeclarationId(1848), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73664,7 +66900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26452, 26504), }); declarations.push(Declaration { - id: DeclarationId(1848), + id: DeclarationId(1849), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73678,7 +66914,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 32458, 32464), }); declarations.push(Declaration { - id: DeclarationId(1849), + id: DeclarationId(1850), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73697,7 +66933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 32469, 32506), }); declarations.push(Declaration { - id: DeclarationId(1850), + id: DeclarationId(1851), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73716,7 +66952,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 32511, 32548), }); declarations.push(Declaration { - id: DeclarationId(1851), + id: DeclarationId(1852), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73730,7 +66966,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 33022, 33041), }); declarations.push(Declaration { - id: DeclarationId(1852), + id: DeclarationId(1853), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73749,7 +66985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 33046, 33095), }); declarations.push(Declaration { - id: DeclarationId(1853), + id: DeclarationId(1854), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -73768,7 +67004,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), }); declarations.push(Declaration { - id: DeclarationId(1854), + id: DeclarationId(1855), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -73787,7 +67023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), }); declarations.push(Declaration { - id: DeclarationId(1855), + id: DeclarationId(1856), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -73806,7 +67042,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), }); declarations.push(Declaration { - id: DeclarationId(1856), + id: DeclarationId(1857), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -73825,7 +67061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), }); declarations.push(Declaration { - id: DeclarationId(1857), + id: DeclarationId(1858), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -73844,7 +67080,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), }); declarations.push(Declaration { - id: DeclarationId(1858), + id: DeclarationId(1859), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -73863,17 +67099,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), }); declarations.push(Declaration { - id: DeclarationId(1859), + id: DeclarationId(1860), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1135), + template: DeclarationId(1136), arguments: vec![TemplateArgument { - parameter: DeclarationId(1136), -<<<<<<< HEAD + parameter: DeclarationId(1137), value: DeclarationId(724), -======= - value: DeclarationId(723), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -73887,17 +67119,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 27728, 27749), }); declarations.push(Declaration { - id: DeclarationId(1860), + id: DeclarationId(1861), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1135), + template: DeclarationId(1136), arguments: vec![TemplateArgument { - parameter: DeclarationId(1136), -<<<<<<< HEAD + parameter: DeclarationId(1137), value: DeclarationId(724), -======= - value: DeclarationId(723), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -73911,7 +67139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 27813, 27834), }); declarations.push(Declaration { - id: DeclarationId(1861), + id: DeclarationId(1862), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73925,7 +67153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 479, 489), }); declarations.push(Declaration { - id: DeclarationId(1862), + id: DeclarationId(1863), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73944,7 +67172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 494, 513), }); declarations.push(Declaration { - id: DeclarationId(1863), + id: DeclarationId(1864), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73958,7 +67186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 518, 528), }); declarations.push(Declaration { - id: DeclarationId(1864), + id: DeclarationId(1865), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -73977,7 +67205,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), }); declarations.push(Declaration { - id: DeclarationId(1865), + id: DeclarationId(1866), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73996,7 +67224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 1104, 1118), }); declarations.push(Declaration { - id: DeclarationId(1866), + id: DeclarationId(1867), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74015,7 +67243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 1123, 1136), }); declarations.push(Declaration { - id: DeclarationId(1867), + id: DeclarationId(1868), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74034,7 +67262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 1141, 1158), }); declarations.push(Declaration { - id: DeclarationId(1868), + id: DeclarationId(1869), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74053,7 +67281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 3291, 3311), }); declarations.push(Declaration { - id: DeclarationId(1869), + id: DeclarationId(1870), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74072,7 +67300,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 3316, 3344), }); declarations.push(Declaration { - id: DeclarationId(1870), + id: DeclarationId(1871), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74091,7 +67319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 3349, 3383), }); declarations.push(Declaration { - id: DeclarationId(1871), + id: DeclarationId(1872), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74110,7 +67338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 3388, 3417), }); declarations.push(Declaration { - id: DeclarationId(1872), + id: DeclarationId(1873), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74129,7 +67357,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 3422, 3439), }); declarations.push(Declaration { - id: DeclarationId(1873), + id: DeclarationId(1874), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74143,7 +67371,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 4063, 4070), }); declarations.push(Declaration { - id: DeclarationId(1874), + id: DeclarationId(1875), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74162,7 +67390,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 4075, 4125), }); declarations.push(Declaration { - id: DeclarationId(1875), + id: DeclarationId(1876), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74181,7 +67409,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5689, 5713), }); declarations.push(Declaration { - id: DeclarationId(1876), + id: DeclarationId(1877), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74195,7 +67423,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5738, 5747), }); declarations.push(Declaration { - id: DeclarationId(1877), + id: DeclarationId(1878), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74214,7 +67442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5752, 5788), }); declarations.push(Declaration { - id: DeclarationId(1878), + id: DeclarationId(1879), name: None, connective: TypeConnective::Conj { children: vec![ @@ -74239,7 +67467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6100, 6150), }); declarations.push(Declaration { - id: DeclarationId(1879), + id: DeclarationId(1880), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74253,7 +67481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6155, 6164), }); declarations.push(Declaration { - id: DeclarationId(1880), + id: DeclarationId(1881), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(786), @@ -74273,12 +67501,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6740, 6753), }); declarations.push(Declaration { - id: DeclarationId(1881), + id: DeclarationId(1882), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1880), + ty: DeclarationId(1881), }], }, type_params: vec![], @@ -74292,7 +67520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6728, 6754), }); declarations.push(Declaration { - id: DeclarationId(1882), + id: DeclarationId(1883), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74306,7 +67534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6759, 6776), }); declarations.push(Declaration { - id: DeclarationId(1883), + id: DeclarationId(1884), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74325,7 +67553,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7027, 7037), }); declarations.push(Declaration { - id: DeclarationId(1884), + id: DeclarationId(1885), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74339,7 +67567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7042, 7051), }); declarations.push(Declaration { - id: DeclarationId(1885), + id: DeclarationId(1886), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74353,7 +67581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7056, 7065), }); declarations.push(Declaration { - id: DeclarationId(1886), + id: DeclarationId(1887), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74372,7 +67600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7492, 7512), }); declarations.push(Declaration { - id: DeclarationId(1887), + id: DeclarationId(1888), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74391,7 +67619,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7517, 7541), }); declarations.push(Declaration { - id: DeclarationId(1888), + id: DeclarationId(1889), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -74411,12 +67639,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7553, 7569), }); declarations.push(Declaration { - id: DeclarationId(1889), + id: DeclarationId(1890), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1888), + ty: DeclarationId(1889), }], }, type_params: vec![], @@ -74430,7 +67658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7546, 7570), }); declarations.push(Declaration { - id: DeclarationId(1890), + id: DeclarationId(1891), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -74450,12 +67678,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7580, 7596), }); declarations.push(Declaration { - id: DeclarationId(1891), + id: DeclarationId(1892), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1890), + ty: DeclarationId(1891), }], }, type_params: vec![], @@ -74469,7 +67697,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7575, 7597), }); declarations.push(Declaration { - id: DeclarationId(1892), + id: DeclarationId(1893), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -74489,12 +67717,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7606, 7622), }); declarations.push(Declaration { - id: DeclarationId(1893), + id: DeclarationId(1894), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1892), + ty: DeclarationId(1893), }], }, type_params: vec![], @@ -74508,7 +67736,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7602, 7623), }); declarations.push(Declaration { - id: DeclarationId(1894), + id: DeclarationId(1895), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -74528,7 +67756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7686, 7702), }); declarations.push(Declaration { - id: DeclarationId(1895), + id: DeclarationId(1896), name: None, connective: TypeConnective::Conj { children: vec![ @@ -74538,7 +67766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "payload".to_string(), - ty: DeclarationId(1894), + ty: DeclarationId(1895), }, ], }, @@ -74553,7 +67781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7628, 7708), }); declarations.push(Declaration { - id: DeclarationId(1896), + id: DeclarationId(1897), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74572,7 +67800,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9321, 9350), }); declarations.push(Declaration { - id: DeclarationId(1897), + id: DeclarationId(1898), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -74592,12 +67820,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9385, 9401), }); declarations.push(Declaration { - id: DeclarationId(1898), + id: DeclarationId(1899), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "fields".to_string(), - ty: DeclarationId(1897), + ty: DeclarationId(1898), }], }, type_params: vec![], @@ -74611,7 +67839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9355, 9403), }); declarations.push(Declaration { - id: DeclarationId(1899), + id: DeclarationId(1900), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74630,7 +67858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9408, 9436), }); declarations.push(Declaration { - id: DeclarationId(1900), + id: DeclarationId(1901), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -74650,12 +67878,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9455, 9471), }); declarations.push(Declaration { - id: DeclarationId(1901), + id: DeclarationId(1902), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1900), + ty: DeclarationId(1901), }], }, type_params: vec![], @@ -74669,7 +67897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9441, 9472), }); declarations.push(Declaration { - id: DeclarationId(1902), + id: DeclarationId(1903), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -74689,12 +67917,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9490, 9506), }); declarations.push(Declaration { - id: DeclarationId(1903), + id: DeclarationId(1904), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1902), + ty: DeclarationId(1903), }], }, type_params: vec![], @@ -74708,7 +67936,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9477, 9507), }); declarations.push(Declaration { - id: DeclarationId(1904), + id: DeclarationId(1905), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74727,7 +67955,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10761, 10784), }); declarations.push(Declaration { - id: DeclarationId(1905), + id: DeclarationId(1906), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74746,7 +67974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10789, 10823), }); declarations.push(Declaration { - id: DeclarationId(1906), + id: DeclarationId(1907), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74760,7 +67988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10828, 10835), }); declarations.push(Declaration { - id: DeclarationId(1907), + id: DeclarationId(1908), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74774,7 +68002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10840, 10846), }); declarations.push(Declaration { - id: DeclarationId(1908), + id: DeclarationId(1909), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74793,7 +68021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10851, 10871), }); declarations.push(Declaration { - id: DeclarationId(1909), + id: DeclarationId(1910), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74812,7 +68040,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11100, 11117), }); declarations.push(Declaration { - id: DeclarationId(1910), + id: DeclarationId(1911), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -74832,12 +68060,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11139, 11154), }); declarations.push(Declaration { - id: DeclarationId(1911), + id: DeclarationId(1912), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "children".to_string(), - ty: DeclarationId(1910), + ty: DeclarationId(1911), }], }, type_params: vec![], @@ -74851,7 +68079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11122, 11156), }); declarations.push(Declaration { - id: DeclarationId(1912), + id: DeclarationId(1913), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -74871,12 +68099,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11178, 11193), }); declarations.push(Declaration { - id: DeclarationId(1913), + id: DeclarationId(1914), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "variants".to_string(), - ty: DeclarationId(1912), + ty: DeclarationId(1913), }], }, type_params: vec![], @@ -74890,7 +68118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11161, 11195), }); declarations.push(Declaration { - id: DeclarationId(1914), + id: DeclarationId(1915), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -74910,13 +68138,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11222, 11241), }); declarations.push(Declaration { - id: DeclarationId(1915), + id: DeclarationId(1916), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "inputs".to_string(), - ty: DeclarationId(1914), + ty: DeclarationId(1915), }, Field { label: "output".to_string(), @@ -74939,7 +68167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11200, 11297), }); declarations.push(Declaration { - id: DeclarationId(1916), + id: DeclarationId(1917), name: None, connective: TypeConnective::Conj { children: vec![ @@ -74964,7 +68192,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11302, 11380), }); declarations.push(Declaration { - id: DeclarationId(1917), + id: DeclarationId(1918), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -74984,7 +68212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11448, 11470), }); declarations.push(Declaration { - id: DeclarationId(1918), + id: DeclarationId(1919), name: None, connective: TypeConnective::Conj { children: vec![ @@ -74994,7 +68222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "arguments".to_string(), - ty: DeclarationId(1917), + ty: DeclarationId(1918), }, ], }, @@ -75009,7 +68237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11385, 11476), }); declarations.push(Declaration { - id: DeclarationId(1919), + id: DeclarationId(1920), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75028,7 +68256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), }); declarations.push(Declaration { - id: DeclarationId(1920), + id: DeclarationId(1921), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -75048,7 +68276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11577, 11596), }); declarations.push(Declaration { - id: DeclarationId(1921), + id: DeclarationId(1922), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -75068,7 +68296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11615, 11637), }); declarations.push(Declaration { - id: DeclarationId(1922), + id: DeclarationId(1923), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75087,7 +68315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), }); declarations.push(Declaration { - id: DeclarationId(1923), + id: DeclarationId(1924), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75106,7 +68334,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), }); declarations.push(Declaration { - id: DeclarationId(1924), + id: DeclarationId(1925), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75125,7 +68353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), }); declarations.push(Declaration { - id: DeclarationId(1925), + id: DeclarationId(1926), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75144,7 +68372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), }); declarations.push(Declaration { - id: DeclarationId(1926), + id: DeclarationId(1927), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -75164,7 +68392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 12874, 12893), }); declarations.push(Declaration { - id: DeclarationId(1927), + id: DeclarationId(1928), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75178,7 +68406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13174, 13177), }); declarations.push(Declaration { - id: DeclarationId(1928), + id: DeclarationId(1929), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75192,7 +68420,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13182, 13185), }); declarations.push(Declaration { - id: DeclarationId(1929), + id: DeclarationId(1930), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75206,7 +68434,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13190, 13193), }); declarations.push(Declaration { - id: DeclarationId(1930), + id: DeclarationId(1931), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75220,7 +68448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13198, 13201), }); declarations.push(Declaration { - id: DeclarationId(1931), + id: DeclarationId(1932), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75234,7 +68462,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13325, 13327), }); declarations.push(Declaration { - id: DeclarationId(1932), + id: DeclarationId(1933), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75248,7 +68476,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13332, 13334), }); declarations.push(Declaration { - id: DeclarationId(1933), + id: DeclarationId(1934), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75262,7 +68490,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13339, 13341), }); declarations.push(Declaration { - id: DeclarationId(1934), + id: DeclarationId(1935), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75276,7 +68504,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13346, 13348), }); declarations.push(Declaration { - id: DeclarationId(1935), + id: DeclarationId(1936), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75290,7 +68518,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13353, 13355), }); declarations.push(Declaration { - id: DeclarationId(1936), + id: DeclarationId(1937), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75304,7 +68532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13360, 13362), }); declarations.push(Declaration { - id: DeclarationId(1937), + id: DeclarationId(1938), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75318,7 +68546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14139, 14142), }); declarations.push(Declaration { - id: DeclarationId(1938), + id: DeclarationId(1939), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75331,30 +68559,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/substrate.dag", 14147, 14149), }); - declarations.push(Declaration { - id: DeclarationId(1939), -<<<<<<< HEAD -======= - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(801), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 14385, 14409), - }); declarations.push(Declaration { id: DeclarationId(1940), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75392,7 +68598,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14414, 14438), }); declarations.push(Declaration { - id: DeclarationId(1941), + id: DeclarationId(1942), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75411,7 +68617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14443, 14461), }); declarations.push(Declaration { - id: DeclarationId(1942), + id: DeclarationId(1943), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75429,30 +68635,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/substrate.dag", 14648, 14671), }); - declarations.push(Declaration { - id: DeclarationId(1943), -<<<<<<< HEAD -======= - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "field_label".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 14676, 14732), - }); declarations.push(Declaration { id: DeclarationId(1944), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75490,7 +68674,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14737, 14791), }); declarations.push(Declaration { - id: DeclarationId(1945), + id: DeclarationId(1946), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75509,7 +68693,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14796, 14818), }); declarations.push(Declaration { - id: DeclarationId(1946), + id: DeclarationId(1947), name: None, connective: TypeConnective::Conj { children: vec![ @@ -75534,7 +68718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14943, 14995), }); declarations.push(Declaration { - id: DeclarationId(1947), + id: DeclarationId(1948), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75553,7 +68737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15000, 15030), }); declarations.push(Declaration { - id: DeclarationId(1948), + id: DeclarationId(1949), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75572,7 +68756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), }); declarations.push(Declaration { - id: DeclarationId(1949), + id: DeclarationId(1950), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(728), @@ -75592,7 +68776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 17185, 17216), }); declarations.push(Declaration { - id: DeclarationId(1950), + id: DeclarationId(1951), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(726), @@ -75612,7 +68796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 17240, 17270), }); declarations.push(Declaration { - id: DeclarationId(1951), + id: DeclarationId(1952), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75631,7 +68815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 17893, 17922), }); declarations.push(Declaration { - id: DeclarationId(1952), + id: DeclarationId(1953), name: None, connective: TypeConnective::Conj { children: vec![ @@ -75656,7 +68840,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 17927, 17974), }); declarations.push(Declaration { - id: DeclarationId(1953), + id: DeclarationId(1954), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75675,7 +68859,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), }); declarations.push(Declaration { - id: DeclarationId(1954), + id: DeclarationId(1955), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -75695,7 +68879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18332, 18344), }); declarations.push(Declaration { - id: DeclarationId(1955), + id: DeclarationId(1956), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75709,7 +68893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18585, 18594), }); declarations.push(Declaration { - id: DeclarationId(1956), + id: DeclarationId(1957), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -75729,7 +68913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18652, 18668), }); declarations.push(Declaration { - id: DeclarationId(1957), + id: DeclarationId(1958), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75748,7 +68932,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), }); declarations.push(Declaration { - id: DeclarationId(1958), + id: DeclarationId(1959), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75762,7 +68946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19170, 19182), }); declarations.push(Declaration { - id: DeclarationId(1959), + id: DeclarationId(1960), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -75782,7 +68966,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19260, 19272), }); declarations.push(Declaration { - id: DeclarationId(1960), + id: DeclarationId(1961), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75801,7 +68985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), }); declarations.push(Declaration { - id: DeclarationId(1961), + id: DeclarationId(1962), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75819,30 +69003,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), }); - declarations.push(Declaration { - id: DeclarationId(1962), -<<<<<<< HEAD -======= - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(819), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 19462, 19478), - }); declarations.push(Declaration { id: DeclarationId(1963), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75918,7 +69080,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19535, 19549), }); declarations.push(Declaration { - id: DeclarationId(1966), + id: DeclarationId(1967), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75937,7 +69099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19554, 19568), }); declarations.push(Declaration { - id: DeclarationId(1967), + id: DeclarationId(1968), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -75957,7 +69119,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19597, 19614), }); declarations.push(Declaration { - id: DeclarationId(1968), + id: DeclarationId(1969), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -75977,7 +69139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19624, 19638), }); declarations.push(Declaration { - id: DeclarationId(1969), + id: DeclarationId(1970), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -75997,7 +69159,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19648, 19661), }); declarations.push(Declaration { - id: DeclarationId(1970), + id: DeclarationId(1971), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -76017,7 +69179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19674, 19687), }); declarations.push(Declaration { - id: DeclarationId(1971), + id: DeclarationId(1972), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -76036,7 +69198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 25770, 25788), }); declarations.push(Declaration { - id: DeclarationId(1972), + id: DeclarationId(1973), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -76050,7 +69212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 25793, 25799), }); declarations.push(Declaration { - id: DeclarationId(1973), + id: DeclarationId(1974), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(728), @@ -76070,12 +69232,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 25832, 25856), }); declarations.push(Declaration { - id: DeclarationId(1974), + id: DeclarationId(1975), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "candidates".to_string(), - ty: DeclarationId(1973), + ty: DeclarationId(1974), }], }, type_params: vec![], @@ -76089,17 +69251,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 25804, 25858), }); declarations.push(Declaration { - id: DeclarationId(1975), + id: DeclarationId(1976), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1135), + template: DeclarationId(1136), arguments: vec![TemplateArgument { - parameter: DeclarationId(1136), -<<<<<<< HEAD + parameter: DeclarationId(1137), value: DeclarationId(849), -======= - value: DeclarationId(848), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -76113,17 +69271,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10942, 10962), }); declarations.push(Declaration { - id: DeclarationId(1976), + id: DeclarationId(1977), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1135), + template: DeclarationId(1136), arguments: vec![TemplateArgument { - parameter: DeclarationId(1136), -<<<<<<< HEAD + parameter: DeclarationId(1137), value: DeclarationId(849), -======= - value: DeclarationId(848), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -76137,7 +69291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 11026, 11046), }); declarations.push(Declaration { - id: DeclarationId(1977), + id: DeclarationId(1978), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(728), @@ -76157,7 +69311,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 11114, 11144), }); declarations.push(Declaration { - id: DeclarationId(1978), + id: DeclarationId(1979), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -76177,7 +69331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 11611, 11629), }); declarations.push(Declaration { - id: DeclarationId(1979), + id: DeclarationId(1980), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(728), @@ -76197,7 +69351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 11635, 11665), }); declarations.push(Declaration { - id: DeclarationId(1980), + id: DeclarationId(1981), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -76217,7 +69371,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 14162, 14180), }); declarations.push(Declaration { - id: DeclarationId(1981), + id: DeclarationId(1982), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(728), @@ -76237,7 +69391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22217, 22247), }); declarations.push(Declaration { - id: DeclarationId(1982), + id: DeclarationId(1983), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -76257,7 +69411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22252, 22270), }); declarations.push(Declaration { - id: DeclarationId(1983), + id: DeclarationId(1984), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -76277,7 +69431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22530, 22548), }); declarations.push(Declaration { - id: DeclarationId(1984), + id: DeclarationId(1985), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -76297,7 +69451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22553, 22571), }); declarations.push(Declaration { - id: DeclarationId(1985), + id: DeclarationId(1986), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -76317,7 +69471,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23044, 23062), }); declarations.push(Declaration { - id: DeclarationId(1986), + id: DeclarationId(1987), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -76337,7 +69491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23067, 23085), }); declarations.push(Declaration { - id: DeclarationId(1987), + id: DeclarationId(1988), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -76357,7 +69511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23186, 23204), }); declarations.push(Declaration { - id: DeclarationId(1988), + id: DeclarationId(1989), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -76377,7 +69531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23524, 23542), }); declarations.push(Declaration { - id: DeclarationId(1989), + id: DeclarationId(1990), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -76397,7 +69551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23547, 23565), }); declarations.push(Declaration { - id: DeclarationId(1990), + id: DeclarationId(1991), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -76417,7 +69571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 25113, 25131), }); declarations.push(Declaration { - id: DeclarationId(1991), + id: DeclarationId(1992), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -76437,7 +69591,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 25384, 25402), }); declarations.push(Declaration { - id: DeclarationId(1992), + id: DeclarationId(1993), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -76457,7 +69611,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 25850, 25868), }); declarations.push(Declaration { - id: DeclarationId(1993), + id: DeclarationId(1994), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -76477,7 +69631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 27885, 27903), }); declarations.push(Declaration { - id: DeclarationId(1994), + id: DeclarationId(1995), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -76497,7 +69651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 27933, 27951), }); declarations.push(Declaration { - id: DeclarationId(1995), + id: DeclarationId(1996), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -76517,7 +69671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 28238, 28256), }); declarations.push(Declaration { - id: DeclarationId(1996), + id: DeclarationId(1997), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -76537,7 +69691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 28284, 28302), }); declarations.push(Declaration { - id: DeclarationId(1997), + id: DeclarationId(1998), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -76557,7 +69711,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 28662, 28680), }); declarations.push(Declaration { - id: DeclarationId(1998), + id: DeclarationId(1999), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -76577,7 +69731,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 28685, 28703), }); declarations.push(Declaration { - id: DeclarationId(1999), + id: DeclarationId(2000), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -76591,7 +69745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 4953, 4965), }); declarations.push(Declaration { - id: DeclarationId(2000), + id: DeclarationId(2001), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -76605,7 +69759,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 4970, 4986), }); declarations.push(Declaration { - id: DeclarationId(2001), + id: DeclarationId(2002), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -76619,7 +69773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 4991, 5005), }); declarations.push(Declaration { - id: DeclarationId(2002), + id: DeclarationId(2003), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -76633,7 +69787,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 5855, 5868), }); declarations.push(Declaration { - id: DeclarationId(2003), + id: DeclarationId(2004), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -76647,7 +69801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 5873, 5888), }); declarations.push(Declaration { - id: DeclarationId(2004), + id: DeclarationId(2005), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -76661,7 +69815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 5893, 5909), }); declarations.push(Declaration { - id: DeclarationId(2005), + id: DeclarationId(2006), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -76674,30 +69828,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/algebra.dag", 5914, 5927), }); - declarations.push(Declaration { - id: DeclarationId(2006), -<<<<<<< HEAD -======= - name: None, - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(841), - CardinalityBound::AtMostOne, - ), - ), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), - }); declarations.push(Declaration { id: DeclarationId(2007), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -76735,7 +69867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), }); declarations.push(Declaration { - id: DeclarationId(2008), + id: DeclarationId(2009), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -76754,7 +69886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), }); declarations.push(Declaration { - id: DeclarationId(2009), + id: DeclarationId(2010), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -76773,7 +69905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), }); declarations.push(Declaration { - id: DeclarationId(2010), + id: DeclarationId(2011), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -76787,7 +69919,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8405, 8414), }); declarations.push(Declaration { - id: DeclarationId(2011), + id: DeclarationId(2012), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -76806,7 +69938,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8419, 8465), }); declarations.push(Declaration { - id: DeclarationId(2012), + id: DeclarationId(2013), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -76825,7 +69957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9506, 9523), }); declarations.push(Declaration { - id: DeclarationId(2013), + id: DeclarationId(2014), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -76844,7 +69976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9528, 9552), }); declarations.push(Declaration { - id: DeclarationId(2014), + id: DeclarationId(2015), name: None, connective: TypeConnective::Conj { children: vec![ @@ -76869,7 +70001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9557, 9619), }); declarations.push(Declaration { - id: DeclarationId(2015), + id: DeclarationId(2016), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(728), @@ -76889,12 +70021,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9636, 9666), }); declarations.push(Declaration { - id: DeclarationId(2016), + id: DeclarationId(2017), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(2015), + ty: DeclarationId(2016), }], }, type_params: vec![], @@ -76908,7 +70040,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9624, 9667), }); declarations.push(Declaration { - id: DeclarationId(2017), + id: DeclarationId(2018), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(728), @@ -76928,12 +70060,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9680, 9710), }); declarations.push(Declaration { - id: DeclarationId(2018), + id: DeclarationId(2019), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(2017), + ty: DeclarationId(2018), }], }, type_params: vec![], @@ -76947,7 +70079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9672, 9711), }); declarations.push(Declaration { - id: DeclarationId(2019), + id: DeclarationId(2020), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -76966,7 +70098,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9716, 9737), }); declarations.push(Declaration { - id: DeclarationId(2020), + id: DeclarationId(2021), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -76985,7 +70117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9742, 9761), }); declarations.push(Declaration { - id: DeclarationId(2021), + id: DeclarationId(2022), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(31), @@ -77005,7 +70137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9479, 9501), }); declarations.push(Declaration { - id: DeclarationId(2022), + id: DeclarationId(2023), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77019,7 +70151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18143, 18156), }); declarations.push(Declaration { - id: DeclarationId(2023), + id: DeclarationId(2024), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77033,7 +70165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18161, 18169), }); declarations.push(Declaration { - id: DeclarationId(2024), + id: DeclarationId(2025), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77047,7 +70179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18174, 18185), }); declarations.push(Declaration { - id: DeclarationId(2025), + id: DeclarationId(2026), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77061,7 +70193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18190, 18207), }); declarations.push(Declaration { - id: DeclarationId(2026), + id: DeclarationId(2027), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77075,12 +70207,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18212, 18226), }); declarations.push(Declaration { - id: DeclarationId(2027), + id: DeclarationId(2028), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "degree".to_string(), - ty: DeclarationId(1212), + ty: DeclarationId(1213), }], }, type_params: vec![], @@ -77094,7 +70226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18231, 18280), }); declarations.push(Declaration { - id: DeclarationId(2028), + id: DeclarationId(2029), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77108,7 +70240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18285, 18301), }); declarations.push(Declaration { - id: DeclarationId(2029), + id: DeclarationId(2030), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77122,7 +70254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18306, 18318), }); declarations.push(Declaration { - id: DeclarationId(2030), + id: DeclarationId(2031), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(43), @@ -77142,7 +70274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18107, 18138), }); declarations.push(Declaration { - id: DeclarationId(2031), + id: DeclarationId(2032), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(692), @@ -77162,7 +70294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507), }); declarations.push(Declaration { - id: DeclarationId(2032), + id: DeclarationId(2033), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(729)], @@ -77180,7 +70312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892), }); declarations.push(Declaration { - id: DeclarationId(2033), + id: DeclarationId(2034), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(705), @@ -77190,12 +70322,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(849), }, TemplateArgument { - parameter: DeclarationId(1768), -<<<<<<< HEAD + parameter: DeclarationId(1769), value: DeclarationId(856), -======= - value: DeclarationId(855), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -77210,7 +70338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535), }); declarations.push(Declaration { - id: DeclarationId(2034), + id: DeclarationId(2035), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(692), @@ -77230,7 +70358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810), }); declarations.push(Declaration { - id: DeclarationId(2035), + id: DeclarationId(2036), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(849), DeclarationId(849)], @@ -77248,7 +70376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(2036), + id: DeclarationId(2037), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(694), @@ -77262,17 +70390,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(849), }, TemplateArgument { -<<<<<<< HEAD - parameter: DeclarationId(1758), + parameter: DeclarationId(1759), value: DeclarationId(860), -======= - parameter: DeclarationId(694), - value: DeclarationId(848), - }, - TemplateArgument { - parameter: DeclarationId(1758), - value: DeclarationId(859), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -77287,7 +70406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245), }); declarations.push(Declaration { - id: DeclarationId(2037), + id: DeclarationId(2038), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(850), DeclarationId(695)], @@ -77305,7 +70424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(2038), + id: DeclarationId(2039), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(694), @@ -77315,24 +70434,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(850), }, TemplateArgument { - parameter: DeclarationId(1758), + parameter: DeclarationId(1759), value: DeclarationId(886), }, TemplateArgument { parameter: DeclarationId(695), value: DeclarationId(849), }, -<<<<<<< HEAD -======= - TemplateArgument { - parameter: DeclarationId(1758), - value: DeclarationId(885), - }, - TemplateArgument { - parameter: DeclarationId(694), - value: DeclarationId(848), - }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -77346,7 +70454,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021), }); declarations.push(Declaration { - id: DeclarationId(2039), + id: DeclarationId(2040), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(850), DeclarationId(695)], @@ -77364,7 +70472,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(2040), + id: DeclarationId(2041), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(694), @@ -77374,24 +70482,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(850), }, TemplateArgument { - parameter: DeclarationId(1758), + parameter: DeclarationId(1759), value: DeclarationId(886), }, TemplateArgument { parameter: DeclarationId(695), value: DeclarationId(849), }, -<<<<<<< HEAD -======= - TemplateArgument { - parameter: DeclarationId(1758), - value: DeclarationId(885), - }, - TemplateArgument { - parameter: DeclarationId(694), - value: DeclarationId(848), - }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -77405,7 +70502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186), }); declarations.push(Declaration { - id: DeclarationId(2041), + id: DeclarationId(2042), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(690), @@ -77425,7 +70522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323), }); declarations.push(Declaration { - id: DeclarationId(2042), + id: DeclarationId(2043), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(690), @@ -77445,7 +70542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324), }); declarations.push(Declaration { - id: DeclarationId(2043), + id: DeclarationId(2044), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(688), @@ -77465,7 +70562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610), }); declarations.push(Declaration { - id: DeclarationId(2044), + id: DeclarationId(2045), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(690), @@ -77485,7 +70582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789), }); declarations.push(Declaration { - id: DeclarationId(2045), + id: DeclarationId(2046), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(688), @@ -77505,7 +70602,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147), }); declarations.push(Declaration { - id: DeclarationId(2046), + id: DeclarationId(2047), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(690), @@ -77525,7 +70622,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148), }); declarations.push(Declaration { - id: DeclarationId(2047), + id: DeclarationId(2048), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(688), @@ -77545,7 +70642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604), }); declarations.push(Declaration { - id: DeclarationId(2048), + id: DeclarationId(2049), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(690), @@ -77565,7 +70662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792), }); declarations.push(Declaration { - id: DeclarationId(2049), + id: DeclarationId(2050), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(690), @@ -77585,7 +70682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349), }); declarations.push(Declaration { - id: DeclarationId(2050), + id: DeclarationId(2051), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(688), @@ -77605,7 +70702,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995), }); declarations.push(Declaration { - id: DeclarationId(2051), + id: DeclarationId(2052), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(690), @@ -77625,7 +70722,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201), }); declarations.push(Declaration { - id: DeclarationId(2052), + id: DeclarationId(2053), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(850), DeclarationId(849)], @@ -77643,7 +70740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(2053), + id: DeclarationId(2054), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(694), @@ -77657,17 +70754,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(849), }, TemplateArgument { -<<<<<<< HEAD - parameter: DeclarationId(1758), + parameter: DeclarationId(1759), value: DeclarationId(886), -======= - parameter: DeclarationId(694), - value: DeclarationId(848), - }, - TemplateArgument { - parameter: DeclarationId(1758), - value: DeclarationId(885), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -77682,7 +70770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377), }); declarations.push(Declaration { - id: DeclarationId(2054), + id: DeclarationId(2055), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(690), @@ -77702,7 +70790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449), }); declarations.push(Declaration { - id: DeclarationId(2055), + id: DeclarationId(2056), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(688), @@ -77722,15 +70810,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727), }); declarations.push(Declaration { - id: DeclarationId(2056), + id: DeclarationId(2057), name: None, connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1998), DeclarationId(849)], -======= - inputs: vec![DeclarationId(1998), DeclarationId(848)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1998), + inputs: vec![DeclarationId(1999), DeclarationId(849)], + output: DeclarationId(1999), body: ArrowBody::NoBody, }, type_params: vec![], @@ -77744,34 +70828,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(2057), + id: DeclarationId(2058), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(694), arguments: vec![ TemplateArgument { parameter: DeclarationId(696), - value: DeclarationId(1998), + value: DeclarationId(1999), }, TemplateArgument { parameter: DeclarationId(695), -<<<<<<< HEAD value: DeclarationId(849), }, TemplateArgument { - parameter: DeclarationId(1758), + parameter: DeclarationId(1759), value: DeclarationId(889), -======= - value: DeclarationId(1998), - }, - TemplateArgument { - parameter: DeclarationId(694), - value: DeclarationId(848), - }, - TemplateArgument { - parameter: DeclarationId(1758), - value: DeclarationId(888), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -77786,7 +70858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749), }); declarations.push(Declaration { - id: DeclarationId(2058), + id: DeclarationId(2059), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -77806,7 +70878,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4503, 4529), }); declarations.push(Declaration { - id: DeclarationId(2059), + id: DeclarationId(2060), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -77825,7 +70897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), }); declarations.push(Declaration { - id: DeclarationId(2060), + id: DeclarationId(2061), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -77843,39 +70915,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), }); - declarations.push(Declaration { - id: DeclarationId(2061), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(686), - arguments: vec![TemplateArgument { -<<<<<<< HEAD - parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1185), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6542, 6557), - }); declarations.push(Declaration { id: DeclarationId(2062), -<<<<<<< HEAD name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), - value: DeclarationId(897), + value: DeclarationId(1186), }], }, type_params: vec![], @@ -77886,33 +70933,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2549, 2580), + span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6542, 6557), }); declarations.push(Declaration { id: DeclarationId(2063), name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "content".to_string(), - ty: DeclarationId(2062), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2521, 2582), - }); - declarations.push(Declaration { - id: DeclarationId(2064), - name: None, -======= - name: None, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { @@ -77931,18 +70956,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2549, 2580), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2065), -======= - id: DeclarationId(2063), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2064), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "content".to_string(), -<<<<<<< HEAD -======= - ty: DeclarationId(2062), + ty: DeclarationId(2063), }], }, type_params: vec![], @@ -77956,13 +70975,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2521, 2582), }); declarations.push(Declaration { - id: DeclarationId(2064), + id: DeclarationId(2065), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(898), + parameter: DeclarationId(687), + value: DeclarationId(899), }], }, type_params: vec![], @@ -77976,13 +70995,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2615, 2651), }); declarations.push(Declaration { - id: DeclarationId(2065), + id: DeclarationId(2066), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "content".to_string(), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - ty: DeclarationId(2064), + ty: DeclarationId(2065), }], }, type_params: vec![], @@ -77996,7 +71014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2587, 2653), }); declarations.push(Declaration { - id: DeclarationId(2066), + id: DeclarationId(2067), name: None, connective: TypeConnective::Conj { children: vec![ @@ -78021,7 +71039,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3042, 3107), }); declarations.push(Declaration { - id: DeclarationId(2067), + id: DeclarationId(2068), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -78040,7 +71058,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3112, 3136), }); declarations.push(Declaration { - id: DeclarationId(2068), + id: DeclarationId(2069), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -78059,7 +71077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3160, 3188), }); declarations.push(Declaration { - id: DeclarationId(2069), + id: DeclarationId(2070), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -78078,7 +71096,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3193, 3229), }); declarations.push(Declaration { - id: DeclarationId(2070), + id: DeclarationId(2071), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -78094,44 +71112,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3541, 3572), - }); - declarations.push(Declaration { - id: DeclarationId(2071), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(686), - arguments: vec![TemplateArgument { - parameter: DeclarationId(687), - value: DeclarationId(895), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3604, 3622), -======= span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3587, 3622), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2072), name: None, connective: TypeConnective::Conj { children: vec![Field { -<<<<<<< HEAD - label: "blocks".to_string(), - ty: DeclarationId(2071), -======= label: "source".to_string(), - ty: DeclarationId(893), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(894), }], }, type_params: vec![], @@ -78164,7 +71153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3675, 3714), }); declarations.push(Declaration { - id: DeclarationId(2073), + id: DeclarationId(2074), name: None, connective: TypeConnective::Atom(AtomPayload::UnresolvedIdentifier( "AnthropicTextBlock".to_string(), @@ -78180,13 +71169,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3768, 3786), }); declarations.push(Declaration { - id: DeclarationId(2074), + id: DeclarationId(2075), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(2073), + parameter: DeclarationId(687), + value: DeclarationId(2074), }], }, type_params: vec![], @@ -78200,13 +71189,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3763, 3787), }); declarations.push(Declaration { - id: DeclarationId(2075), + id: DeclarationId(2076), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "content".to_string(), - ty: DeclarationId(2074), + ty: DeclarationId(2075), }, Field { label: "source".to_string(), @@ -78229,7 +71218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3719, 3834), }); declarations.push(Declaration { - id: DeclarationId(2076), + id: DeclarationId(2077), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -78248,7 +71237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3839, 3888), }); declarations.push(Declaration { - id: DeclarationId(2077), + id: DeclarationId(2078), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -78267,16 +71256,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4200, 4231), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2074), -======= - id: DeclarationId(2078), + id: DeclarationId(2079), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(895), + parameter: DeclarationId(687), + value: DeclarationId(896), }], }, type_params: vec![], @@ -78290,12 +71276,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4263, 4293), }); declarations.push(Declaration { - id: DeclarationId(2079), + id: DeclarationId(2080), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "blocks".to_string(), - ty: DeclarationId(2078), + ty: DeclarationId(2079), }], }, type_params: vec![], @@ -78309,7 +71295,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4236, 4295), }); declarations.push(Declaration { - id: DeclarationId(2080), + id: DeclarationId(2081), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -78328,12 +71314,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4576, 4612), }); declarations.push(Declaration { - id: DeclarationId(2081), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2082), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(896), + DeclarationId(897), CardinalityBound::AtMostOne, ), ), @@ -78348,11 +71333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4680, 4707), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2075), -======= - id: DeclarationId(2082), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2083), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -78371,11 +71352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4724, 4729), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2076), -======= - id: DeclarationId(2083), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2084), name: None, connective: TypeConnective::Conj { children: vec![ @@ -78385,19 +71362,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "content".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2074), - }, - Field { - label: "is_error".to_string(), - ty: DeclarationId(2075), -======= - ty: DeclarationId(2081), + ty: DeclarationId(2082), }, Field { label: "is_error".to_string(), - ty: DeclarationId(2082), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2083), }, ], }, @@ -78412,11 +71381,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4617, 4735), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2077), -======= - id: DeclarationId(2084), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2085), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -78435,11 +71400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5182, 5220), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2078), -======= - id: DeclarationId(2085), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2086), name: None, connective: TypeConnective::Conj { children: vec![ @@ -78465,112 +71426,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4554, 4637), - }); - declarations.push(Declaration { - id: DeclarationId(2079), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4995, 5002), - }); - declarations.push(Declaration { - id: DeclarationId(2080), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5007, 5016), - }); - declarations.push(Declaration { - id: DeclarationId(2081), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5021, 5033), - }); - declarations.push(Declaration { - id: DeclarationId(2082), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5038, 5045), - }); - declarations.push(Declaration { - id: DeclarationId(2083), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5050, 5059), - }); - declarations.push(Declaration { - id: DeclarationId(2084), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5064, 5071), - }); - declarations.push(Declaration { - id: DeclarationId(2085), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5076, 5102), -======= span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5225, 5308), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { - id: DeclarationId(2086), + id: DeclarationId(2087), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78584,7 +71443,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5666, 5673), }); declarations.push(Declaration { - id: DeclarationId(2087), + id: DeclarationId(2088), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78598,7 +71457,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5678, 5687), }); declarations.push(Declaration { - id: DeclarationId(2088), + id: DeclarationId(2089), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78612,7 +71471,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5692, 5704), }); declarations.push(Declaration { - id: DeclarationId(2089), + id: DeclarationId(2090), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78626,7 +71485,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5709, 5716), }); declarations.push(Declaration { - id: DeclarationId(2090), + id: DeclarationId(2091), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78640,7 +71499,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5721, 5730), }); declarations.push(Declaration { - id: DeclarationId(2091), + id: DeclarationId(2092), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78654,7 +71513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5735, 5742), }); declarations.push(Declaration { - id: DeclarationId(2092), + id: DeclarationId(2093), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78667,29 +71526,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5747, 5773), }); - declarations.push(Declaration { - id: DeclarationId(2093), - name: None, - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(230), - CardinalityBound::AtMostOne, - ), - ), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421), -======= - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6085, 6092), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }); declarations.push(Declaration { id: DeclarationId(2094), name: None, @@ -78707,7 +71543,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6103, 6110), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6085, 6092), }); declarations.push(Declaration { id: DeclarationId(2095), @@ -78726,10 +71562,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6103, 6110), }); declarations.push(Declaration { - id: DeclarationId(2088), + id: DeclarationId(2096), name: None, connective: TypeConnective::Conj { children: vec![ @@ -78743,19 +71579,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "document_title".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2086), - }, - Field { - label: "file_id".to_string(), - ty: DeclarationId(2087), -======= - ty: DeclarationId(2093), + ty: DeclarationId(2094), }, Field { label: "file_id".to_string(), - ty: DeclarationId(2094), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2095), }, Field { label: "start_char_index".to_string(), @@ -78778,11 +71606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6013, 6156), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2089), -======= - id: DeclarationId(2096), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2097), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -78801,11 +71625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6233, 6240), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2090), -======= - id: DeclarationId(2097), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2098), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -78824,11 +71644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6251, 6258), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2091), -======= - id: DeclarationId(2098), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2099), name: None, connective: TypeConnective::Conj { children: vec![ @@ -78842,19 +71658,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "document_title".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2089), - }, - Field { - label: "file_id".to_string(), - ty: DeclarationId(2090), -======= - ty: DeclarationId(2096), + ty: DeclarationId(2097), }, Field { label: "file_id".to_string(), - ty: DeclarationId(2097), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2098), }, Field { label: "start_page_number".to_string(), @@ -78877,11 +71685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6161, 6306), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2092), -======= - id: DeclarationId(2099), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2100), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -78900,11 +71704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6391, 6398), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2093), -======= - id: DeclarationId(2100), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2101), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -78923,11 +71723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6409, 6416), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2094), -======= - id: DeclarationId(2101), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2102), name: None, connective: TypeConnective::Conj { children: vec![ @@ -78941,19 +71737,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "document_title".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2092), - }, - Field { - label: "file_id".to_string(), - ty: DeclarationId(2093), -======= - ty: DeclarationId(2099), + ty: DeclarationId(2100), }, Field { label: "file_id".to_string(), - ty: DeclarationId(2100), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2101), }, Field { label: "start_block_index".to_string(), @@ -78976,11 +71764,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6311, 6464), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2095), -======= - id: DeclarationId(2102), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2103), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -78999,11 +71783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6547, 6554), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2096), -======= - id: DeclarationId(2103), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2104), name: None, connective: TypeConnective::Conj { children: vec![ @@ -79017,11 +71797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "title".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2095), -======= - ty: DeclarationId(2102), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2103), }, Field { label: "url".to_string(), @@ -79040,11 +71816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6469, 6569), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2097), -======= - id: DeclarationId(2104), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2105), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79063,11 +71835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6640, 6647), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2098), -======= - id: DeclarationId(2105), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2106), name: None, connective: TypeConnective::Conj { children: vec![ @@ -79081,11 +71849,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "title".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2097), -======= - ty: DeclarationId(2104), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2105), }, Field { label: "search_result_index".to_string(), @@ -79112,21 +71876,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6574, 6721), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2099), -======= - id: DeclarationId(2106), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2107), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(900), + value: DeclarationId(901), }], }, type_params: vec![], @@ -79140,19 +71896,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7345, 7379), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2100), - name: None, - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(2099), -======= - id: DeclarationId(2107), + id: DeclarationId(2108), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(2106), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + DeclarationId(2107), CardinalityBound::AtMostOne, ), ), @@ -79167,11 +71915,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7345, 7380), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2101), -======= - id: DeclarationId(2108), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2109), name: None, connective: TypeConnective::Conj { children: vec![ @@ -79181,11 +71925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "citations".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2100), -======= - ty: DeclarationId(2107), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2108), }, ], }, @@ -79200,11 +71940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7300, 7382), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2102), -======= - id: DeclarationId(2109), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2110), name: None, connective: TypeConnective::Conj { children: vec![ @@ -79229,11 +71965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7387, 7448), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2103), -======= - id: DeclarationId(2110), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2111), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79252,11 +71984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7453, 7508), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2104), -======= - id: DeclarationId(2111), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2112), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79275,11 +72003,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7583, 7588), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2105), -======= - id: DeclarationId(2112), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2113), name: None, connective: TypeConnective::Conj { children: vec![ @@ -79297,11 +72021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "caller".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2104), -======= - ty: DeclarationId(2111), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2112), }, ], }, @@ -79316,11 +72036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7513, 7590), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2106), -======= - id: DeclarationId(2113), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2114), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79339,11 +72055,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7688, 7693), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2107), -======= - id: DeclarationId(2114), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2115), name: None, connective: TypeConnective::Conj { children: vec![ @@ -79353,7 +72065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "name".to_string(), - ty: DeclarationId(902), + ty: DeclarationId(903), }, Field { label: "input".to_string(), @@ -79361,11 +72073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "caller".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2106), -======= - ty: DeclarationId(2113), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2114), }, ], }, @@ -79380,11 +72088,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7595, 7695), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2108), -======= - id: DeclarationId(2115), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2116), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79403,11 +72107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7779, 7784), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2109), -======= - id: DeclarationId(2116), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2117), name: None, connective: TypeConnective::Conj { children: vec![ @@ -79421,11 +72121,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "caller".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2108), -======= - ty: DeclarationId(2115), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2116), }, ], }, @@ -79437,127 +72133,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7029, 7115), - }); - declarations.push(Declaration { - id: DeclarationId(2110), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7336, 7345), - }); - declarations.push(Declaration { - id: DeclarationId(2111), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7350, 7358), - }); - declarations.push(Declaration { - id: DeclarationId(2112), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7363, 7376), - }); - declarations.push(Declaration { - id: DeclarationId(2113), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7381, 7398), - }); - declarations.push(Declaration { - id: DeclarationId(2114), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7403, 7426), - }); - declarations.push(Declaration { - id: DeclarationId(2115), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7431, 7450), - }); - declarations.push(Declaration { - id: DeclarationId(2116), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7455, 7473), - }); - declarations.push(Declaration { - id: DeclarationId(2117), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7478, 7485), - }); - declarations.push(Declaration { -======= span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7700, 7786), }); declarations.push(Declaration { - id: DeclarationId(2117), + id: DeclarationId(2118), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79571,8 +72150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8007, 8016), }); declarations.push(Declaration { ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - id: DeclarationId(2118), + id: DeclarationId(2119), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79583,44 +72161,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739), -======= span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8021, 8029), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }); - declarations.push(Declaration { - id: DeclarationId(2119), - name: None, -<<<<<<< HEAD - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(93), - CardinalityBound::AtMostOne, - ), - ), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775), }); declarations.push(Declaration { id: DeclarationId(2120), name: None, - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(230), - CardinalityBound::AtMostOne, - ), - ), -======= connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -79648,17 +72194,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { declarations.push(Declaration { id: DeclarationId(2122), name: None, -<<<<<<< HEAD - connective: TypeConnective::Instantiation { - template: DeclarationId(686), - arguments: vec![TemplateArgument { - parameter: DeclarationId(687), - value: DeclarationId(901), - }], - }, -======= connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -79684,7 +72220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8102, 8121), }); declarations.push(Declaration { - id: DeclarationId(2123), + id: DeclarationId(2124), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79698,7 +72234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8126, 8144), }); declarations.push(Declaration { - id: DeclarationId(2124), + id: DeclarationId(2125), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79712,7 +72248,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8149, 8156), }); declarations.push(Declaration { - id: DeclarationId(2125), + id: DeclarationId(2126), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79731,7 +72267,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8406, 8410), }); declarations.push(Declaration { - id: DeclarationId(2126), + id: DeclarationId(2127), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79750,7 +72286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8442, 8446), }); declarations.push(Declaration { - id: DeclarationId(2127), + id: DeclarationId(2128), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79769,10 +72305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8478, 8485), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2124), -======= - id: DeclarationId(2128), + id: DeclarationId(2129), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79786,13 +72319,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8842, 8851), }); declarations.push(Declaration { - id: DeclarationId(2129), + id: DeclarationId(2130), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(901), + parameter: DeclarationId(687), + value: DeclarationId(902), }], }, type_params: vec![], @@ -79806,7 +72339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9337, 9375), }); declarations.push(Declaration { - id: DeclarationId(2130), + id: DeclarationId(2131), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79825,8 +72358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9454, 9461), }); declarations.push(Declaration { - id: DeclarationId(2131), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2132), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -79842,129 +72374,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8851, 8856), - }); - declarations.push(Declaration { - id: DeclarationId(2125), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1013, 1025), - }); - declarations.push(Declaration { - id: DeclarationId(2126), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1030, 1044), - }); - declarations.push(Declaration { - id: DeclarationId(2127), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1049, 1064), - }); - declarations.push(Declaration { - id: DeclarationId(2128), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1069, 1086), - }); - declarations.push(Declaration { - id: DeclarationId(2129), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1091, 1114), - }); - declarations.push(Declaration { - id: DeclarationId(2130), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4719, 4726), - }); - declarations.push(Declaration { - id: DeclarationId(2131), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4731, 4735), - }); - declarations.push(Declaration { - id: DeclarationId(2132), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(686), - arguments: vec![TemplateArgument { - parameter: DeclarationId(687), - value: DeclarationId(912), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6983, 7004), -======= span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9522, 9527), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2133), @@ -80068,10 +72478,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(2140), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(912), + parameter: DeclarationId(687), + value: DeclarationId(913), }], }, type_params: vec![], @@ -80281,7 +72691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3801, 3831), }); declarations.push(Declaration { - id: DeclarationId(2154), + id: DeclarationId(2155), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80295,7 +72705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3836, 3857), }); declarations.push(Declaration { - id: DeclarationId(2155), + id: DeclarationId(2156), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80309,7 +72719,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4024, 4044), }); declarations.push(Declaration { - id: DeclarationId(2156), + id: DeclarationId(2157), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80323,7 +72733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4049, 4076), }); declarations.push(Declaration { - id: DeclarationId(2157), + id: DeclarationId(2158), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80337,7 +72747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4081, 4095), }); declarations.push(Declaration { - id: DeclarationId(2158), + id: DeclarationId(2159), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80351,7 +72761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4354, 4362), }); declarations.push(Declaration { - id: DeclarationId(2159), + id: DeclarationId(2160), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80365,7 +72775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4367, 4393), }); declarations.push(Declaration { - id: DeclarationId(2160), + id: DeclarationId(2161), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80379,7 +72789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4398, 4423), }); declarations.push(Declaration { - id: DeclarationId(2161), + id: DeclarationId(2162), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -80399,11 +72809,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5320, 5332), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2155), -======= - id: DeclarationId(2162), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2163), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80417,11 +72823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5693, 5713), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2156), -======= - id: DeclarationId(2163), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2164), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80435,11 +72837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5718, 5736), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2157), -======= - id: DeclarationId(2164), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2165), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80453,11 +72851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5741, 5759), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2158), -======= - id: DeclarationId(2165), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2166), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80471,15 +72865,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5764, 5791), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2159), -======= - id: DeclarationId(2166), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2167), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(928), + DeclarationId(929), CardinalityBound::AtMostOne, ), ), @@ -80494,11 +72884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2160), -======= - id: DeclarationId(2167), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2168), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -80517,11 +72903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2161), -======= - id: DeclarationId(2168), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2169), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -80540,15 +72922,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2162), -======= - id: DeclarationId(2169), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2170), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(938), + DeclarationId(939), CardinalityBound::AtMostOne, ), ), @@ -80563,15 +72941,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2163), -======= - id: DeclarationId(2170), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2171), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(938), + DeclarationId(939), CardinalityBound::AtMostOne, ), ), @@ -80586,11 +72960,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2164), -======= - id: DeclarationId(2171), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2172), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -80609,11 +72979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1422, 1454), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2165), -======= - id: DeclarationId(2172), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2173), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -80632,11 +72998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1459, 1495), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2166), -======= - id: DeclarationId(2173), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2174), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -80655,11 +73017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1500, 1537), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2167), -======= - id: DeclarationId(2174), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2175), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -80678,11 +73036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1542, 1568), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2168), -======= - id: DeclarationId(2175), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2176), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -80701,11 +73055,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1573, 1606), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2169), -======= - id: DeclarationId(2176), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2177), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80719,16 +73069,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1611, 1628), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2170), -======= - id: DeclarationId(2177), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2178), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "steps".to_string(), - ty: DeclarationId(1212), + ty: DeclarationId(1213), }], }, type_params: vec![], @@ -80742,11 +73088,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1633, 1687), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2171), -======= - id: DeclarationId(2178), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2179), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80760,11 +73102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1692, 1699), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2172), -======= - id: DeclarationId(2179), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2180), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -80783,17 +73121,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2051, 2089), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2173), -======= - id: DeclarationId(2180), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2181), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "amount".to_string(), - ty: DeclarationId(1212), + ty: DeclarationId(1213), }, Field { label: "collection".to_string(), @@ -80812,17 +73146,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2094, 2168), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2174), -======= - id: DeclarationId(2181), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2182), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "steps".to_string(), - ty: DeclarationId(1212), + ty: DeclarationId(1213), }, Field { label: "ring_param".to_string(), @@ -80841,17 +73171,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2173, 2248), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2175), -======= - id: DeclarationId(2182), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2183), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "divisor".to_string(), - ty: DeclarationId(1214), + ty: DeclarationId(1215), }, Field { label: "ring_param".to_string(), @@ -80870,11 +73196,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2253, 2326), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2176), -======= - id: DeclarationId(2183), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2184), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -80893,11 +73215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2331, 2368), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2177), -======= - id: DeclarationId(2184), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2185), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -80916,11 +73234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2373, 2410), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2178), -======= - id: DeclarationId(2185), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2186), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -80939,11 +73253,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2415, 2456), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2179), -======= - id: DeclarationId(2186), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2187), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80957,11 +73267,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2461, 2477), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2180), -======= - id: DeclarationId(2187), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2188), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80975,16 +73281,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2998, 3008), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2181), -======= - id: DeclarationId(2188), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2189), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "steps".to_string(), - ty: DeclarationId(1212), + ty: DeclarationId(1213), }], }, type_params: vec![], @@ -80998,16 +73300,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3013, 3060), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2182), -======= - id: DeclarationId(2189), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2190), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "divisor".to_string(), - ty: DeclarationId(1214), + ty: DeclarationId(1215), }], }, type_params: vec![], @@ -81021,11 +73319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3065, 3116), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2183), -======= - id: DeclarationId(2190), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2191), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81039,11 +73333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3306, 3310), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2184), -======= - id: DeclarationId(2191), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2192), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81057,11 +73347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3315, 3322), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2185), -======= - id: DeclarationId(2192), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2193), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81075,15 +73361,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3327, 3333), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2186), -======= - id: DeclarationId(2193), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2194), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(930), + DeclarationId(931), CardinalityBound::AtMostOne, ), ), @@ -81098,11 +73380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2187), -======= - id: DeclarationId(2194), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2195), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81116,11 +73394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7270, 7281), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2188), -======= - id: DeclarationId(2195), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2196), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81134,11 +73408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7330, 7344), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2189), -======= - id: DeclarationId(2196), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2197), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81152,11 +73422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7409, 7425), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2190), -======= - id: DeclarationId(2197), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2198), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81170,11 +73436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 360, 369), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2191), -======= - id: DeclarationId(2198), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2199), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81188,11 +73450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 374, 381), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2192), -======= - id: DeclarationId(2199), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2200), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81206,11 +73464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 614, 618), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2193), -======= - id: DeclarationId(2200), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2201), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81224,11 +73478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 623, 632), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2194), -======= - id: DeclarationId(2201), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2202), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81242,11 +73492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 910, 921), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2195), -======= - id: DeclarationId(2202), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2203), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81260,11 +73506,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 926, 935), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2196), -======= - id: DeclarationId(2203), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2204), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81278,11 +73520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 1166, 1173), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2197), -======= - id: DeclarationId(2204), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2205), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81296,11 +73534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 1178, 1187), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2198), -======= - id: DeclarationId(2205), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2206), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81314,11 +73548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2035, 2044), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2199), -======= - id: DeclarationId(2206), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2207), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81332,11 +73562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2049, 2065), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2200), -======= - id: DeclarationId(2207), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2208), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81350,11 +73576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2070, 2080), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2201), -======= - id: DeclarationId(2208), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2209), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81368,11 +73590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2085, 2099), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2202), -======= - id: DeclarationId(2209), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2210), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81386,11 +73604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2385, 2399), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2203), -======= - id: DeclarationId(2210), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2211), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81404,11 +73618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2404, 2418), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2204), -======= - id: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2212), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -81428,11 +73638,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2818, 2830), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2205), -======= - id: DeclarationId(2212), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2213), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -81452,11 +73658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 3210, 3222), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2206), -======= - id: DeclarationId(2213), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2214), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81470,11 +73672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 3694, 3708), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2207), -======= - id: DeclarationId(2214), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2215), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81488,11 +73686,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 3713, 3729), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2208), -======= - id: DeclarationId(2215), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2216), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -81511,11 +73705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 6759, 6786), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2209), -======= - id: DeclarationId(2216), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2217), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81529,11 +73719,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7611, 7616), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2210), -======= - id: DeclarationId(2217), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2218), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81547,22 +73733,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 7621, 7630), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2211), -======= - id: DeclarationId(2218), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2219), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), arguments: vec![ TemplateArgument { parameter: DeclarationId(138), - value: DeclarationId(954), + value: DeclarationId(955), }, TemplateArgument { parameter: DeclarationId(139), - value: DeclarationId(957), + value: DeclarationId(958), }, ], }, @@ -81577,11 +73759,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/coproduct_projection.dag", 9513, 9555), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2212), -======= - id: DeclarationId(2219), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2220), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81595,11 +73773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3853, 3857), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2213), -======= - id: DeclarationId(2220), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2221), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81613,11 +73787,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3860, 3864), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2214), -======= - id: DeclarationId(2221), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2222), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81631,11 +73801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3867, 3871), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2215), -======= - id: DeclarationId(2222), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2223), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81649,11 +73815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3874, 3879), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2216), -======= - id: DeclarationId(2223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2224), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81667,11 +73829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3882, 3893), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2217), -======= - id: DeclarationId(2224), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2225), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81685,11 +73843,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 3896, 3909), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2218), -======= - id: DeclarationId(2225), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2226), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81703,11 +73857,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4489, 4494), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2219), -======= - id: DeclarationId(2226), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2227), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81721,11 +73871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4497, 4506), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2220), -======= - id: DeclarationId(2227), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2228), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81739,11 +73885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4509, 4515), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2221), -======= - id: DeclarationId(2228), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2229), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81757,11 +73899,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4518, 4522), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2222), -======= - id: DeclarationId(2229), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2230), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81775,31 +73913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 4525, 4529), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2223), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(686), - arguments: vec![TemplateArgument { - parameter: DeclarationId(687), - value: DeclarationId(966), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5923, 5941), - }); - declarations.push(Declaration { - id: DeclarationId(2224), -======= - id: DeclarationId(2230), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2231), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -81816,118 +73930,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 6396, 6424), - }); - declarations.push(Declaration { - id: DeclarationId(2225), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/diagnostics.dag", 1099, 1113), - }); - declarations.push(Declaration { - id: DeclarationId(2226), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/diagnostics.dag", 1118, 1128), - }); - declarations.push(Declaration { - id: DeclarationId(2227), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/diagnostics.dag", 1133, 1145), - }); - declarations.push(Declaration { - id: DeclarationId(2228), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/diagnostics.dag", 1150, 1163), - }); - declarations.push(Declaration { - id: DeclarationId(2229), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/diagnostics.dag", 1168, 1180), - }); - declarations.push(Declaration { - id: DeclarationId(2230), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/diagnostics.dag", 1185, 1197), - }); - declarations.push(Declaration { - id: DeclarationId(2231), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/diagnostics.dag", 1202, 1224), -======= span: SourceSpan::new("src/v3/std/cross_target_coverage.dag", 5923, 5941), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2232), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(967), + parameter: DeclarationId(687), + value: DeclarationId(968), }], }, type_params: vec![], @@ -81983,7 +73995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1133, 1145), }); declarations.push(Declaration { - id: DeclarationId(2235), + id: DeclarationId(2236), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81997,7 +74009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1150, 1163), }); declarations.push(Declaration { - id: DeclarationId(2236), + id: DeclarationId(2237), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82011,7 +74023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1168, 1180), }); declarations.push(Declaration { - id: DeclarationId(2237), + id: DeclarationId(2238), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82025,7 +74037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1185, 1197), }); declarations.push(Declaration { - id: DeclarationId(2238), + id: DeclarationId(2239), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82039,7 +74051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1202, 1224), }); declarations.push(Declaration { - id: DeclarationId(2239), + id: DeclarationId(2240), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82053,7 +74065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1229, 1248), }); declarations.push(Declaration { - id: DeclarationId(2240), + id: DeclarationId(2241), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82067,7 +74079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1253, 1278), }); declarations.push(Declaration { - id: DeclarationId(2241), + id: DeclarationId(2242), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82081,12 +74093,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1283, 1306), }); declarations.push(Declaration { - id: DeclarationId(2242), + id: DeclarationId(2243), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(969), + ty: DeclarationId(970), }], }, type_params: vec![], @@ -82100,16 +74112,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 5506, 5542), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2236), -======= - id: DeclarationId(2243), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2244), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(972), + ty: DeclarationId(973), }], }, type_params: vec![], @@ -82123,21 +74131,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 5547, 5588), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2237), -======= - id: DeclarationId(2244), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2245), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(970), + value: DeclarationId(971), }], }, type_params: vec![], @@ -82151,11 +74151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 6047, 6063), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2238), -======= - id: DeclarationId(2245), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2246), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82174,11 +74170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9175, 9216), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2239), -======= - id: DeclarationId(2246), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2247), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82192,11 +74184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9513, 9525), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2240), -======= - id: DeclarationId(2247), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2248), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -82216,11 +74204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9795, 9807), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2241), -======= - id: DeclarationId(2248), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2249), name: None, connective: TypeConnective::Conj { children: vec![ @@ -82230,11 +74214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "sites".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2240), -======= - ty: DeclarationId(2247), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2248), }, ], }, @@ -82249,11 +74229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9752, 9809), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2242), -======= - id: DeclarationId(2249), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2250), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82272,11 +74248,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 10119, 10153), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2243), -======= - id: DeclarationId(2250), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2251), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82295,11 +74267,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 10556, 10607), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2244), -======= - id: DeclarationId(2251), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2252), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82313,25 +74281,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 10950, 10968), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2245), -======= - id: DeclarationId(2252), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2253), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "connective".to_string(), - ty: DeclarationId(963), + ty: DeclarationId(964), }, Field { label: "behavior".to_string(), - ty: DeclarationId(964), + ty: DeclarationId(965), }, Field { label: "target".to_string(), - ty: DeclarationId(959), + ty: DeclarationId(960), }, ], }, @@ -82346,17 +74310,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 11357, 11469), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2246), -======= - id: DeclarationId(2253), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2254), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), arguments: vec![TemplateArgument { parameter: DeclarationId(38), - value: DeclarationId(995), + value: DeclarationId(996), }], }, type_params: vec![], @@ -82370,23 +74330,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4846, 4866), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2247), -======= - id: DeclarationId(2254), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2255), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(983), + template: DeclarationId(984), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(984), - value: DeclarationId(994), - }, TemplateArgument { parameter: DeclarationId(985), value: DeclarationId(995), }, + TemplateArgument { + parameter: DeclarationId(986), + value: DeclarationId(996), + }, ], }, type_params: vec![], @@ -82400,23 +74356,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4876, 4900), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2248), -======= - id: DeclarationId(2255), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2256), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(983), + template: DeclarationId(984), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(984), - value: DeclarationId(994), - }, TemplateArgument { parameter: DeclarationId(985), value: DeclarationId(995), }, + TemplateArgument { + parameter: DeclarationId(986), + value: DeclarationId(996), + }, ], }, type_params: vec![], @@ -82430,23 +74382,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4911, 4935), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2249), -======= - id: DeclarationId(2256), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2257), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(983), + template: DeclarationId(984), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(984), - value: DeclarationId(994), - }, TemplateArgument { parameter: DeclarationId(985), value: DeclarationId(995), }, + TemplateArgument { + parameter: DeclarationId(986), + value: DeclarationId(996), + }, ], }, type_params: vec![], @@ -82460,17 +74408,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4941, 4965), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2250), -======= - id: DeclarationId(2257), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2258), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), arguments: vec![TemplateArgument { parameter: DeclarationId(38), - value: DeclarationId(998), + value: DeclarationId(999), }], }, type_params: vec![], @@ -82484,23 +74428,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5042, 5062), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2251), -======= - id: DeclarationId(2258), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2259), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(983), + template: DeclarationId(984), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(984), - value: DeclarationId(997), - }, TemplateArgument { parameter: DeclarationId(985), value: DeclarationId(998), }, + TemplateArgument { + parameter: DeclarationId(986), + value: DeclarationId(999), + }, ], }, type_params: vec![], @@ -82514,23 +74454,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5072, 5096), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2252), -======= - id: DeclarationId(2259), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2260), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(983), + template: DeclarationId(984), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(984), - value: DeclarationId(997), - }, TemplateArgument { parameter: DeclarationId(985), value: DeclarationId(998), }, + TemplateArgument { + parameter: DeclarationId(986), + value: DeclarationId(999), + }, ], }, type_params: vec![], @@ -82544,23 +74480,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5107, 5131), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2253), -======= - id: DeclarationId(2260), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2261), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(983), + template: DeclarationId(984), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(984), - value: DeclarationId(997), - }, TemplateArgument { parameter: DeclarationId(985), value: DeclarationId(998), }, + TemplateArgument { + parameter: DeclarationId(986), + value: DeclarationId(999), + }, ], }, type_params: vec![], @@ -82574,17 +74506,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5137, 5161), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2254), -======= - id: DeclarationId(2261), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2262), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), arguments: vec![TemplateArgument { parameter: DeclarationId(38), - value: DeclarationId(1001), + value: DeclarationId(1002), }], }, type_params: vec![], @@ -82598,23 +74526,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5245, 5265), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2255), -======= - id: DeclarationId(2262), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2263), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(983), + template: DeclarationId(984), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(984), - value: DeclarationId(1000), - }, TemplateArgument { parameter: DeclarationId(985), value: DeclarationId(1001), }, + TemplateArgument { + parameter: DeclarationId(986), + value: DeclarationId(1002), + }, ], }, type_params: vec![], @@ -82628,23 +74552,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5276, 5300), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2256), -======= - id: DeclarationId(2263), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2264), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(983), + template: DeclarationId(984), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(984), - value: DeclarationId(1000), - }, TemplateArgument { parameter: DeclarationId(985), value: DeclarationId(1001), }, + TemplateArgument { + parameter: DeclarationId(986), + value: DeclarationId(1002), + }, ], }, type_params: vec![], @@ -82658,17 +74578,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5325, 5349), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2257), -======= - id: DeclarationId(2264), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2265), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), arguments: vec![TemplateArgument { parameter: DeclarationId(38), - value: DeclarationId(1004), + value: DeclarationId(1005), }], }, type_params: vec![], @@ -82682,23 +74598,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5440, 5460), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2258), -======= - id: DeclarationId(2265), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2266), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(983), + template: DeclarationId(984), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(984), - value: DeclarationId(1003), - }, TemplateArgument { parameter: DeclarationId(985), value: DeclarationId(1004), }, + TemplateArgument { + parameter: DeclarationId(986), + value: DeclarationId(1005), + }, ], }, type_params: vec![], @@ -82712,23 +74624,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5471, 5495), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2259), -======= - id: DeclarationId(2266), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2267), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(983), + template: DeclarationId(984), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(984), - value: DeclarationId(1003), - }, TemplateArgument { parameter: DeclarationId(985), value: DeclarationId(1004), }, + TemplateArgument { + parameter: DeclarationId(986), + value: DeclarationId(1005), + }, ], }, type_params: vec![], @@ -82742,16 +74650,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 5520, 5544), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2260), -======= - id: DeclarationId(2267), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2268), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(977), + ty: DeclarationId(978), }], }, type_params: vec![], @@ -82765,11 +74669,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1634, 1651), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2261), -======= - id: DeclarationId(2268), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2269), name: None, connective: TypeConnective::Conj { children: vec![ @@ -82794,11 +74694,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1656, 1697), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2262), -======= - id: DeclarationId(2269), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2270), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82812,16 +74708,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1879, 1891), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2263), -======= - id: DeclarationId(2270), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2271), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "value".to_string(), - ty: DeclarationId(974), + ty: DeclarationId(975), }], }, type_params: vec![], @@ -82835,17 +74727,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1896, 1932), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2264), -======= - id: DeclarationId(2271), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2272), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(976), + template: DeclarationId(977), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(980), + parameter: DeclarationId(978), + value: DeclarationId(981), }], }, type_params: vec![], @@ -82859,22 +74747,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2414, 2430), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2265), -======= - id: DeclarationId(2272), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2273), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), - value: DeclarationId(2264), -======= - parameter: DeclarationId(686), - value: DeclarationId(2271), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + value: DeclarationId(2272), }], }, type_params: vec![], @@ -82888,11 +74767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2409, 2431), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2266), -======= - id: DeclarationId(2273), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2274), name: None, connective: TypeConnective::Conj { children: vec![ @@ -82902,15 +74777,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "composed".to_string(), - ty: DeclarationId(980), + ty: DeclarationId(981), }, Field { label: "witnesses".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2265), -======= - ty: DeclarationId(2272), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2273), }, ], }, @@ -82925,21 +74796,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2325, 2437), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2267), -======= - id: DeclarationId(2274), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2275), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(974), + value: DeclarationId(975), }], }, type_params: vec![], @@ -82953,17 +74816,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2505, 2521), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2268), -======= - id: DeclarationId(2275), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2276), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(976), + template: DeclarationId(977), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(980), + parameter: DeclarationId(978), + value: DeclarationId(981), }], }, type_params: vec![], @@ -82977,22 +74836,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2544, 2560), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2269), -======= - id: DeclarationId(2276), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2277), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), - value: DeclarationId(2268), -======= - parameter: DeclarationId(686), - value: DeclarationId(2275), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + value: DeclarationId(2276), }], }, type_params: vec![], @@ -83006,11 +74856,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2539, 2561), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2270), -======= - id: DeclarationId(2277), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2278), name: None, connective: TypeConnective::Conj { children: vec![ @@ -83020,19 +74866,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "violations".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2267), - }, - Field { - label: "witnesses".to_string(), - ty: DeclarationId(2269), -======= - ty: DeclarationId(2274), + ty: DeclarationId(2275), }, Field { label: "witnesses".to_string(), - ty: DeclarationId(2276), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2277), }, ], }, @@ -83047,17 +74885,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2442, 2567), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2271), -======= - id: DeclarationId(2278), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2279), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(976), + template: DeclarationId(977), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(982), + parameter: DeclarationId(978), + value: DeclarationId(983), }], }, type_params: vec![], @@ -83071,19 +74905,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3902, 3918), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2272), + id: DeclarationId(2280), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(828), DeclarationId(827)], - output: DeclarationId(2271), -======= - id: DeclarationId(2279), - name: None, - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(826)], - output: DeclarationId(2278), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2279), body: ArrowBody::NoBody, }, type_params: vec![], @@ -83097,17 +74923,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3881, 3918), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2273), -======= - id: DeclarationId(2280), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2281), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(19), arguments: vec![TemplateArgument { parameter: DeclarationId(20), - value: DeclarationId(982), + value: DeclarationId(983), }], }, type_params: vec![], @@ -83121,18 +74943,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3930, 3945), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2274), - name: None, - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(982)], -======= - id: DeclarationId(2281), + id: DeclarationId(2282), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(826), DeclarationId(982)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(978), + inputs: vec![DeclarationId(827), DeclarationId(983)], + output: DeclarationId(979), body: ArrowBody::NoBody, }, type_params: vec![], @@ -83146,17 +74961,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3966, 4009), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2275), -======= - id: DeclarationId(2282), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2283), name: Some("DimensionUnitAbelianGroup".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(25), arguments: vec![TemplateArgument { parameter: DeclarationId(26), - value: DeclarationId(984), + value: DeclarationId(985), }], }, type_params: vec![], @@ -83170,11 +74981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4652, 4702), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2276), -======= - id: DeclarationId(2283), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2284), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83188,11 +74995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3709, 3721), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2277), -======= - id: DeclarationId(2284), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2285), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -83211,21 +75014,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emission_provenance.dag", 3726, 3762), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2278), -======= - id: DeclarationId(2285), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2286), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1011), + value: DeclarationId(1012), }], }, type_params: vec![], @@ -83239,11 +75034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2279), -======= - id: DeclarationId(2286), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2287), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83257,11 +75048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4373, 4389), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2280), -======= - id: DeclarationId(2287), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2288), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -83280,11 +75067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4394, 4422), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2281), -======= - id: DeclarationId(2288), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2289), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83298,30 +75081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4665, 4686), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2282), -======= - id: DeclarationId(2289), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/emit_model.dag", 5176, 5195), - }); - declarations.push(Declaration { id: DeclarationId(2290), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -83359,17 +75119,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 5200, 5222), }); declarations.push(Declaration { - id: DeclarationId(2284), + id: DeclarationId(2292), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1016), + value: DeclarationId(1017), }], }, type_params: vec![], @@ -83383,11 +75139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 5591, 5614), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2285), -======= - id: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2293), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83401,11 +75153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6611, 6619), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2286), -======= - id: DeclarationId(2293), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2294), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83419,11 +75167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6632), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2287), -======= - id: DeclarationId(2294), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2295), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83437,11 +75181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7073, 7078), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2288), -======= - id: DeclarationId(2295), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2296), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83455,11 +75195,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7083, 7091), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2289), -======= - id: DeclarationId(2296), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2297), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83473,11 +75209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7427, 7440), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2290), -======= - id: DeclarationId(2297), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2298), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83491,11 +75223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7445, 7451), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2291), -======= - id: DeclarationId(2298), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2299), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83509,11 +75237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7709, 7717), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2292), -======= - id: DeclarationId(2299), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2300), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83527,11 +75251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7722, 7727), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2293), -======= - id: DeclarationId(2300), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2301), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83545,11 +75265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7732, 7745), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2294), -======= - id: DeclarationId(2301), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2302), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83563,11 +75279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8082, 8100), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2295), -======= - id: DeclarationId(2302), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2303), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83581,11 +75293,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9475, 9484), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2296), -======= - id: DeclarationId(2303), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2304), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83599,11 +75307,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9489, 9502), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2297), -======= - id: DeclarationId(2304), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2305), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83617,11 +75321,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9507, 9515), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2298), -======= - id: DeclarationId(2305), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2306), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83635,11 +75335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9520, 9530), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2299), -======= - id: DeclarationId(2306), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2307), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83653,11 +75349,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9535, 9545), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2300), -======= - id: DeclarationId(2307), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2308), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83671,11 +75363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9550, 9561), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2301), -======= - id: DeclarationId(2308), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2309), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83689,11 +75377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9566, 9574), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2302), -======= - id: DeclarationId(2309), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2310), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83707,11 +75391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9579, 9586), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2303), -======= - id: DeclarationId(2310), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2311), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83725,11 +75405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9591, 9601), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2304), -======= - id: DeclarationId(2311), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2312), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83743,11 +75419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 9606, 9618), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2305), -======= - id: DeclarationId(2312), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2313), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83761,11 +75433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12311, 12337), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2306), -======= - id: DeclarationId(2313), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2314), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83779,11 +75447,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 12342, 12352), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2307), -======= - id: DeclarationId(2314), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2315), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83797,11 +75461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17117, 17123), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2308), -======= - id: DeclarationId(2315), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2316), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83815,11 +75475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17128, 17139), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2309), -======= - id: DeclarationId(2316), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2317), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83833,11 +75489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17459, 17470), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2310), -======= - id: DeclarationId(2317), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2318), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83851,11 +75503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17475, 17486), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2311), -======= - id: DeclarationId(2318), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2319), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83869,11 +75517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 19419, 19430), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2312), -======= - id: DeclarationId(2319), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2320), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83887,11 +75531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 19435, 19443), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2313), -======= - id: DeclarationId(2320), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2321), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -83910,11 +75550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 20606, 20641), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2314), -======= - id: DeclarationId(2321), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2322), name: None, connective: TypeConnective::Conj { children: vec![ @@ -83939,21 +75575,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 20646, 20734), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2315), -======= - id: DeclarationId(2322), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2323), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1046), + value: DeclarationId(1047), }], }, type_params: vec![], @@ -83967,15 +75595,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 6894, 6922), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2316), -======= - id: DeclarationId(2323), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2324), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(928), + DeclarationId(929), CardinalityBound::AtMostOne, ), ), @@ -83990,15 +75614,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2317), -======= - id: DeclarationId(2324), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2325), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(932), + DeclarationId(933), CardinalityBound::AtMostOne, ), ), @@ -84013,37 +75633,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2318), -======= - id: DeclarationId(2325), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(685), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1077), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 27850, 27865), - }); - declarations.push(Declaration { id: DeclarationId(2326), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), - value: DeclarationId(1077), + value: DeclarationId(1078), }], }, type_params: vec![], @@ -84054,17 +75650,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD span: SourceSpan::new("src/v3/std/induction.dag", 27850, 27865), }); declarations.push(Declaration { - id: DeclarationId(2319), + id: DeclarationId(2327), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), - value: DeclarationId(1076), + value: DeclarationId(1077), }], }, type_params: vec![], @@ -84078,23 +75673,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 29879, 29895), }); declarations.push(Declaration { - id: DeclarationId(2320), -======= - span: SourceSpan::new("src/v3/std/induction.dag", 29879, 29895), - }); - declarations.push(Declaration { - id: DeclarationId(2327), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2328), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1076), + value: DeclarationId(1077), }], }, type_params: vec![], @@ -84108,21 +75693,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 29988, 30004), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2321), -======= - id: DeclarationId(2328), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2329), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1076), + value: DeclarationId(1077), }], }, type_params: vec![], @@ -84136,22 +75713,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 30102, 30118), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2322), -======= - id: DeclarationId(2329), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2330), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), - value: DeclarationId(2321), -======= - parameter: DeclarationId(686), - value: DeclarationId(2328), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + value: DeclarationId(2329), }], }, type_params: vec![], @@ -84165,30 +75733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 30097, 30119), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2323), -======= - id: DeclarationId(2330), - name: None, - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(93), - CardinalityBound::AtMostOne, - ), - ), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), - }); - declarations.push(Declaration { id: DeclarationId(2331), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84372,17 +75917,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5861, 5878), }); declarations.push(Declaration { - id: DeclarationId(2334), + id: DeclarationId(2342), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "field".to_string(), - ty: DeclarationId(1061), + ty: DeclarationId(1062), }, Field { label: "factor".to_string(), - ty: DeclarationId(930), + ty: DeclarationId(931), }, ], }, @@ -84397,16 +75942,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10033), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2335), -======= - id: DeclarationId(2342), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2343), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "field".to_string(), - ty: DeclarationId(1061), + ty: DeclarationId(1062), }], }, type_params: vec![], @@ -84420,11 +75961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 10038, 10080), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2336), -======= - id: DeclarationId(2343), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2344), name: None, connective: TypeConnective::Conj { children: vec![ @@ -84434,7 +75971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "factor".to_string(), - ty: DeclarationId(930), + ty: DeclarationId(931), }, ], }, @@ -84449,11 +75986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 10085, 10142), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2337), -======= - id: DeclarationId(2344), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2345), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84467,11 +76000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 10147, 10161), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2338), -======= - id: DeclarationId(2345), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2346), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84485,11 +76014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 10166, 10181), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2339), -======= - id: DeclarationId(2346), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2347), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84503,16 +76028,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24135, 24149), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2340), -======= - id: DeclarationId(2347), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2348), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "degree".to_string(), - ty: DeclarationId(1212), + ty: DeclarationId(1213), }], }, type_params: vec![], @@ -84526,21 +76047,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24154, 24201), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2341), -======= - id: DeclarationId(2348), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2349), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "numerator".to_string(), - ty: DeclarationId(1212), + ty: DeclarationId(1213), }, Field { label: "root".to_string(), - ty: DeclarationId(1212), + ty: DeclarationId(1213), }, ], }, @@ -84555,21 +76072,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24206, 24283), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2342), -======= - id: DeclarationId(2349), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2350), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "base".to_string(), - ty: DeclarationId(1214), + ty: DeclarationId(1215), }, Field { label: "argument".to_string(), - ty: DeclarationId(1212), + ty: DeclarationId(1213), }, ], }, @@ -84584,11 +76097,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24288, 24362), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2343), -======= - id: DeclarationId(2350), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2351), name: None, connective: TypeConnective::Conj { children: vec![ @@ -84598,7 +76107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "exponent".to_string(), - ty: DeclarationId(1074), + ty: DeclarationId(1075), }, ], }, @@ -84613,11 +76122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24982, 25038), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2344), -======= - id: DeclarationId(2351), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2352), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -84636,11 +76141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 25054, 25079), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2345), -======= - id: DeclarationId(2352), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2353), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84654,16 +76155,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26728, 26741), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2346), -======= - id: DeclarationId(2353), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2354), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "cost".to_string(), - ty: DeclarationId(1076), + ty: DeclarationId(1077), }], }, type_params: vec![], @@ -84677,14 +76174,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26785, 26817), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2347), + id: DeclarationId(2355), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), - value: DeclarationId(1076), + value: DeclarationId(1077), }], }, type_params: vec![], @@ -84698,12 +76194,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26880, 26896), }); declarations.push(Declaration { - id: DeclarationId(2348), + id: DeclarationId(2356), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "factors".to_string(), - ty: DeclarationId(2347), + ty: DeclarationId(2355), }], }, type_params: vec![], @@ -84717,13 +76213,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26856, 26898), }); declarations.push(Declaration { - id: DeclarationId(2349), + id: DeclarationId(2357), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), - value: DeclarationId(1076), + value: DeclarationId(1077), }], }, type_params: vec![], @@ -84737,13 +76233,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26960, 26976), }); declarations.push(Declaration { - id: DeclarationId(2350), + id: DeclarationId(2358), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), - value: DeclarationId(2349), + value: DeclarationId(2357), }], }, type_params: vec![], @@ -84757,12 +76253,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26955, 26977), }); declarations.push(Declaration { - id: DeclarationId(2351), + id: DeclarationId(2359), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "terms".to_string(), - ty: DeclarationId(2350), + ty: DeclarationId(2358), }], }, type_params: vec![], @@ -84776,121 +76272,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26927, 26979), }); declarations.push(Declaration { - id: DeclarationId(2352), -======= - id: DeclarationId(2354), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2360), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), - value: DeclarationId(1077), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26880, 26896), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2353), -======= - id: DeclarationId(2355), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "factors".to_string(), - ty: DeclarationId(2354), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26856, 26898), - }); - declarations.push(Declaration { - id: DeclarationId(2356), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(685), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1076), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26960, 26976), - }); - declarations.push(Declaration { - id: DeclarationId(2357), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(685), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(2356), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26955, 26977), - }); - declarations.push(Declaration { - id: DeclarationId(2358), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "terms".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2352), -======= - ty: DeclarationId(2357), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26927, 26979), - }); - declarations.push(Declaration { - id: DeclarationId(2359), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(685), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1077), + value: DeclarationId(1078), }], }, type_params: vec![], @@ -84904,13 +76292,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27277, 27292), }); declarations.push(Declaration { - id: DeclarationId(2360), + id: DeclarationId(2361), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "terms".to_string(), - ty: DeclarationId(2359), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2360), }], }, type_params: vec![], @@ -84924,11 +76311,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27259, 27294), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2354), -======= - id: DeclarationId(2361), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2362), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84942,11 +76325,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27377, 27389), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2355), -======= - id: DeclarationId(2362), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2363), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84960,21 +76339,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27459, 27469), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2356), -======= - id: DeclarationId(2363), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2364), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1290), + value: DeclarationId(1291), }], }, type_params: vec![], @@ -84988,21 +76359,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1234, 1254), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2357), -======= - id: DeclarationId(2364), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2365), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1290), + value: DeclarationId(1291), }], }, type_params: vec![], @@ -85016,17 +76379,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1414, 1434), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2358), -======= - id: DeclarationId(2365), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2366), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(976), + template: DeclarationId(977), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1121), + parameter: DeclarationId(978), + value: DeclarationId(1122), }], }, type_params: vec![], @@ -85040,19 +76399,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2359), + id: DeclarationId(2367), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(828), DeclarationId(827)], - output: DeclarationId(2358), -======= - id: DeclarationId(2366), - name: None, - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(826)], - output: DeclarationId(2365), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2366), body: ArrowBody::NoBody, }, type_params: vec![], @@ -85066,17 +76417,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2360), -======= - id: DeclarationId(2367), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2368), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(19), arguments: vec![TemplateArgument { parameter: DeclarationId(20), - value: DeclarationId(1121), + value: DeclarationId(1122), }], }, type_params: vec![], @@ -85090,15 +76437,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2361), -======= - id: DeclarationId(2368), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2369), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1121), DeclarationId(1121)], - output: DeclarationId(1121), + inputs: vec![DeclarationId(1122), DeclarationId(1122)], + output: DeclarationId(1122), body: ArrowBody::NoBody, }, type_params: vec![], @@ -85112,18 +76455,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2362), - name: None, - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1121), DeclarationId(818)], -======= - id: DeclarationId(2369), + id: DeclarationId(2370), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1121), DeclarationId(817)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1121), + inputs: vec![DeclarationId(1122), DeclarationId(818)], + output: DeclarationId(1122), body: ArrowBody::NoBody, }, type_params: vec![], @@ -85137,18 +76473,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2363), - name: None, - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(828), DeclarationId(1121)], -======= - id: DeclarationId(2370), + id: DeclarationId(2371), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(827), DeclarationId(1121)], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(978), + inputs: vec![DeclarationId(828), DeclarationId(1122)], + output: DeclarationId(979), body: ArrowBody::NoBody, }, type_params: vec![], @@ -85162,11 +76491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2364), -======= - id: DeclarationId(2371), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2372), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85185,11 +76510,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 3305, 3352), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2365), -======= - id: DeclarationId(2372), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2373), name: None, connective: TypeConnective::Conj { children: vec![ @@ -85214,11 +76535,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 3357, 3418), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2366), -======= - id: DeclarationId(2373), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2374), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85232,15 +76549,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 4297, 4302), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2367), -======= - id: DeclarationId(2374), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2375), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1125)], - output: DeclarationId(1126), + inputs: vec![DeclarationId(1126)], + output: DeclarationId(1127), body: ArrowBody::NoBody, }, type_params: vec![], @@ -85254,14 +76567,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 5301, 5321), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2368), -======= - id: DeclarationId(2375), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2376), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1126), DeclarationId(1126)], + inputs: vec![DeclarationId(1127), DeclarationId(1127)], output: DeclarationId(128), body: ArrowBody::NoBody, }, @@ -85276,17 +76585,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 5334, 5360), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2369), -======= - id: DeclarationId(2376), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2377), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1120), + template: DeclarationId(1121), arguments: vec![TemplateArgument { - parameter: DeclarationId(1121), - value: DeclarationId(1128), + parameter: DeclarationId(1122), + value: DeclarationId(1129), }], }, type_params: vec![], @@ -85300,23 +76605,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 7360, 7372), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2370), -======= - id: DeclarationId(2377), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2378), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1124), + template: DeclarationId(1125), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(1125), - value: DeclarationId(1128), - }, TemplateArgument { parameter: DeclarationId(1126), value: DeclarationId(1129), }, + TemplateArgument { + parameter: DeclarationId(1127), + value: DeclarationId(1130), + }, ], }, type_params: vec![], @@ -85330,23 +76631,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 7388, 7419), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2371), -======= - id: DeclarationId(2378), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2379), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1127), + template: DeclarationId(1128), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(1128), - value: DeclarationId(1131), - }, TemplateArgument { parameter: DeclarationId(1129), value: DeclarationId(1132), }, + TemplateArgument { + parameter: DeclarationId(1130), + value: DeclarationId(1133), + }, ], }, type_params: vec![], @@ -85360,17 +76657,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 9093, 9124), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2372), -======= - id: DeclarationId(2379), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2380), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1120), + template: DeclarationId(1121), arguments: vec![TemplateArgument { - parameter: DeclarationId(1121), - value: DeclarationId(1134), + parameter: DeclarationId(1122), + value: DeclarationId(1135), }], }, type_params: vec![], @@ -85384,16 +76677,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens_application.dag", 10144, 10156), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2373), -======= - id: DeclarationId(2380), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2381), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1135), + template: DeclarationId(1136), arguments: vec![TemplateArgument { - parameter: DeclarationId(1136), + parameter: DeclarationId(1137), value: DeclarationId(93), }], }, @@ -85408,16 +76697,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4589, 4600), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2374), -======= - id: DeclarationId(2381), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2382), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1135), + template: DeclarationId(1136), arguments: vec![TemplateArgument { - parameter: DeclarationId(1136), + parameter: DeclarationId(1137), value: DeclarationId(93), }], }, @@ -85432,11 +76717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4642, 4653), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2375), -======= - id: DeclarationId(2382), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2383), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85450,16 +76731,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4544, 4548), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2376), -======= - id: DeclarationId(2383), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2384), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1136), + ty: DeclarationId(1137), }], }, type_params: vec![], @@ -85473,21 +76750,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4553, 4563), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2377), -======= - id: DeclarationId(2384), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2385), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1153), + value: DeclarationId(1154), }], }, type_params: vec![], @@ -85501,15 +76770,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1179, 1196), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2378), -======= - id: DeclarationId(2385), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2386), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1152), + DeclarationId(1153), CardinalityBound::AtMostOne, ), ), @@ -85524,21 +76789,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2379), -======= - id: DeclarationId(2386), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2387), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1145), + value: DeclarationId(1146), }], }, type_params: vec![], @@ -85552,20 +76809,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1747, 1764), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2380), -======= - id: DeclarationId(2387), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2388), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2379), -======= - ty: DeclarationId(2386), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2387), }], }, type_params: vec![], @@ -85579,21 +76828,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1736, 1765), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2381), -======= - id: DeclarationId(2388), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2389), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1142), + value: DeclarationId(1143), }], }, type_params: vec![], @@ -85607,20 +76848,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1777, 1795), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2382), -======= - id: DeclarationId(2389), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2390), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2381), -======= - ty: DeclarationId(2388), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2389), }], }, type_params: vec![], @@ -85634,11 +76867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1770, 1796), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2383), -======= - id: DeclarationId(2390), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2391), name: None, connective: TypeConnective::Conj { children: vec![ @@ -85663,21 +76892,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2073, 2113), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2384), -======= - id: DeclarationId(2391), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2392), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1145), + value: DeclarationId(1146), }], }, type_params: vec![], @@ -85691,11 +76912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2165, 2182), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2385), -======= - id: DeclarationId(2392), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2393), name: None, connective: TypeConnective::Conj { children: vec![ @@ -85705,11 +76922,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2384), -======= - ty: DeclarationId(2391), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2392), }, Field { label: "span".to_string(), @@ -85728,17 +76941,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2118, 2211), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2386), -======= - id: DeclarationId(2393), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2394), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "inner".to_string(), - ty: DeclarationId(1145), + ty: DeclarationId(1146), }, Field { label: "span".to_string(), @@ -85757,21 +76966,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2216, 2280), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2387), -======= - id: DeclarationId(2394), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2395), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1145), + value: DeclarationId(1146), }], }, type_params: vec![], @@ -85785,25 +76986,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2307, 2324), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2388), -======= - id: DeclarationId(2395), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2396), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "inputs".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2387), -======= - ty: DeclarationId(2394), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2395), }, Field { label: "output".to_string(), - ty: DeclarationId(1145), + ty: DeclarationId(1146), }, Field { label: "span".to_string(), @@ -85822,11 +77015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2285, 2379), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2389), -======= - id: DeclarationId(2396), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2397), name: None, connective: TypeConnective::Conj { children: vec![ @@ -85851,11 +77040,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3749, 3795), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2390), -======= - id: DeclarationId(2397), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2398), name: None, connective: TypeConnective::Conj { children: vec![ @@ -85884,21 +77069,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3800, 3883), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2391), -======= - id: DeclarationId(2398), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2399), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1149), + value: DeclarationId(1150), }], }, type_params: vec![], @@ -85912,11 +77089,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3937, 3962), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2392), -======= - id: DeclarationId(2399), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2400), name: None, connective: TypeConnective::Conj { children: vec![ @@ -85926,11 +77099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fields".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2391), -======= - ty: DeclarationId(2398), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2399), }, Field { label: "span".to_string(), @@ -85949,11 +77118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3888, 3991), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2393), -======= - id: DeclarationId(2400), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2401), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85972,11 +77137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4663, 4674), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2394), -======= - id: DeclarationId(2401), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2402), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85995,11 +77156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4679, 4689), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2395), -======= - id: DeclarationId(2402), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2403), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86018,17 +77175,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4694, 4708), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2396), -======= - id: DeclarationId(2403), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2404), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "value".to_string(), - ty: DeclarationId(1151), + ty: DeclarationId(1152), }, Field { label: "span".to_string(), @@ -86047,11 +77200,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4822, 4873), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2397), -======= - id: DeclarationId(2404), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2405), name: None, connective: TypeConnective::Conj { children: vec![ @@ -86076,11 +77225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4878, 4916), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2398), -======= - id: DeclarationId(2405), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2406), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -86100,11 +77245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4944, 4956), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2399), -======= - id: DeclarationId(2406), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2407), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -86124,29 +77265,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4978, 4994), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2400), -======= - id: DeclarationId(2407), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2408), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "segments".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2398), - }, - Field { - label: "segment_spans".to_string(), - ty: DeclarationId(2399), -======= - ty: DeclarationId(2405), + ty: DeclarationId(2406), }, Field { label: "segment_spans".to_string(), - ty: DeclarationId(2406), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2407), }, Field { label: "span".to_string(), @@ -86165,21 +77294,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4921, 5023), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2401), -======= - id: DeclarationId(2408), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2409), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1152), + value: DeclarationId(1153), }], }, type_params: vec![], @@ -86193,8 +77314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5068, 5085), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2402), + id: DeclarationId(2410), name: None, connective: TypeConnective::Conj { children: vec![ @@ -86204,7 +77324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), - ty: DeclarationId(2401), + ty: DeclarationId(2409), }, Field { label: "span".to_string(), @@ -86223,7 +77343,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5028, 5114), }); declarations.push(Declaration { - id: DeclarationId(2403), + id: DeclarationId(2411), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -86243,7 +77363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5685, 5697), }); declarations.push(Declaration { - id: DeclarationId(2404), + id: DeclarationId(2412), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -86263,13 +77383,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5719, 5735), }); declarations.push(Declaration { - id: DeclarationId(2405), + id: DeclarationId(2413), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), - value: DeclarationId(1152), + value: DeclarationId(1153), }], }, type_params: vec![], @@ -86283,21 +77403,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5748, 5765), }); declarations.push(Declaration { - id: DeclarationId(2406), + id: DeclarationId(2414), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "segments".to_string(), - ty: DeclarationId(2403), + ty: DeclarationId(2411), }, Field { label: "segment_spans".to_string(), - ty: DeclarationId(2404), + ty: DeclarationId(2412), }, Field { label: "args".to_string(), - ty: DeclarationId(2405), + ty: DeclarationId(2413), }, Field { label: "span".to_string(), @@ -86316,13 +77436,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5658, 5794), }); declarations.push(Declaration { - id: DeclarationId(2407), + id: DeclarationId(2415), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), - value: DeclarationId(1146), + value: DeclarationId(1147), }], }, type_params: vec![], @@ -86336,7 +77456,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5850, 5874), }); declarations.push(Declaration { - id: DeclarationId(2408), + id: DeclarationId(2416), name: None, connective: TypeConnective::Conj { children: vec![ @@ -86346,7 +77466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fields".to_string(), - ty: DeclarationId(2407), + ty: DeclarationId(2415), }, Field { label: "span".to_string(), @@ -86365,13 +77485,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5799, 5903), }); declarations.push(Declaration { - id: DeclarationId(2409), + id: DeclarationId(2417), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), - value: DeclarationId(1152), + value: DeclarationId(1153), }], }, type_params: vec![], @@ -86385,25 +77505,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5954, 5971), }); declarations.push(Declaration { - id: DeclarationId(2410), -======= - id: DeclarationId(2409), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2418), name: None, connective: TypeConnective::Conj { children: vec![ Field { -<<<<<<< HEAD label: "op".to_string(), ty: DeclarationId(806), -======= - label: "target".to_string(), - ty: DeclarationId(230), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "args".to_string(), - ty: DeclarationId(2409), + ty: DeclarationId(2417), }, Field { label: "span".to_string(), @@ -86419,10 +77531,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 5028, 5114), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 5908, 6000), }); declarations.push(Declaration { - id: DeclarationId(2411), + id: DeclarationId(2419), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -86439,215 +77551,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 5685, 5697), - }); - declarations.push(Declaration { - id: DeclarationId(2412), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(685), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(159), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 5719, 5735), - }); - declarations.push(Declaration { - id: DeclarationId(2412), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(685), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1152), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 5748, 5765), - }); - declarations.push(Declaration { - id: DeclarationId(2413), - name: None, - connective: TypeConnective::Conj { - children: vec![ - Field { - label: "segments".to_string(), - ty: DeclarationId(2410), - }, - Field { - label: "segment_spans".to_string(), - ty: DeclarationId(2411), - }, - Field { - label: "args".to_string(), - ty: DeclarationId(2412), - }, - Field { - label: "span".to_string(), - ty: DeclarationId(159), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 5658, 5794), - }); - declarations.push(Declaration { - id: DeclarationId(2414), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(685), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1146), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 5850, 5874), - }); - declarations.push(Declaration { - id: DeclarationId(2415), - name: None, - connective: TypeConnective::Conj { - children: vec![ - Field { - label: "target".to_string(), - ty: DeclarationId(230), - }, - Field { - label: "fields".to_string(), - ty: DeclarationId(2414), - }, - Field { - label: "span".to_string(), - ty: DeclarationId(159), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 5799, 5903), - }); - declarations.push(Declaration { - id: DeclarationId(2416), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(685), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1152), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 5954, 5971), - }); - declarations.push(Declaration { - id: DeclarationId(2417), - name: None, - connective: TypeConnective::Conj { - children: vec![ - Field { - label: "op".to_string(), - ty: DeclarationId(805), - }, - Field { - label: "args".to_string(), - ty: DeclarationId(2416), - }, - Field { - label: "span".to_string(), - ty: DeclarationId(159), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 5908, 6000), - }); - declarations.push(Declaration { - id: DeclarationId(2418), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(685), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, span: SourceSpan::new("src/v3/std/parse_surface.dag", 6028, 6040), }); declarations.push(Declaration { - id: DeclarationId(2419), + id: DeclarationId(2420), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "params".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2411), -======= - ty: DeclarationId(2418), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2419), }, Field { label: "body".to_string(), - ty: DeclarationId(1152), + ty: DeclarationId(1153), }, Field { label: "span".to_string(), @@ -86666,25 +77583,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6005, 6093), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2413), -======= - id: DeclarationId(2420), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2421), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "cond".to_string(), - ty: DeclarationId(1152), + ty: DeclarationId(1153), }, Field { label: "then_branch".to_string(), - ty: DeclarationId(1152), + ty: DeclarationId(1153), }, Field { label: "else_branch".to_string(), - ty: DeclarationId(1152), + ty: DeclarationId(1153), }, Field { label: "span".to_string(), @@ -86703,21 +77616,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6098, 6217), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2414), -======= - id: DeclarationId(2421), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2422), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1148), + value: DeclarationId(1149), }], }, type_params: vec![], @@ -86731,25 +77636,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6271, 6292), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2415), -======= - id: DeclarationId(2422), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2423), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "scrutinee".to_string(), - ty: DeclarationId(1152), + ty: DeclarationId(1153), }, Field { label: "arms".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2414), -======= - ty: DeclarationId(2421), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2422), }, Field { label: "span".to_string(), @@ -86768,21 +77665,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6222, 6321), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2416), -======= - id: DeclarationId(2423), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2424), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1146), + value: DeclarationId(1147), }], }, type_params: vec![], @@ -86796,21 +77685,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6349, 6373), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2417), -======= - id: DeclarationId(2424), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2425), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "fields".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2416), -======= - ty: DeclarationId(2423), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2424), }, Field { label: "span".to_string(), @@ -86829,21 +77710,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6326, 6402), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2418), -======= - id: DeclarationId(2425), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2426), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1152), + value: DeclarationId(1153), }], }, type_params: vec![], @@ -86857,21 +77730,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6430, 6447), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2419), -======= - id: DeclarationId(2426), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2427), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "elements".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2418), -======= - ty: DeclarationId(2425), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2426), }, Field { label: "span".to_string(), @@ -86890,21 +77755,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 6407, 6476), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2420), -======= - id: DeclarationId(2427), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2428), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1147), + value: DeclarationId(1148), }], }, type_params: vec![], @@ -86918,21 +77775,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 8570, 8591), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2421), -======= - id: DeclarationId(2428), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2429), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "entries".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2420), -======= - ty: DeclarationId(2427), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2428), }, Field { label: "span".to_string(), @@ -86951,15 +77800,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 8549, 8620), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2422), -======= - id: DeclarationId(2429), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2430), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1145), + DeclarationId(1146), CardinalityBound::AtMostOne, ), ), @@ -86974,11 +77819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2423), -======= - id: DeclarationId(2430), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2431), name: None, connective: TypeConnective::Conj { children: vec![ @@ -86988,15 +77829,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_ann".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2422), -======= - ty: DeclarationId(2429), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2430), }, Field { label: "expr".to_string(), - ty: DeclarationId(1152), + ty: DeclarationId(1153), }, ], }, @@ -87011,11 +77848,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9510, 9593), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2424), -======= - id: DeclarationId(2431), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2432), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -87035,21 +77868,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9641, 9653), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2425), -======= - id: DeclarationId(2432), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2433), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1141), + value: DeclarationId(1142), }], }, type_params: vec![], @@ -87063,11 +77888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9668, 9686), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2426), -======= - id: DeclarationId(2433), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2434), name: None, connective: TypeConnective::Conj { children: vec![ @@ -87077,27 +77898,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2424), -======= - ty: DeclarationId(2431), - }, - Field { - label: "params".to_string(), ty: DeclarationId(2432), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "params".to_string(), - ty: DeclarationId(2425), + ty: DeclarationId(2433), }, Field { label: "return_type".to_string(), - ty: DeclarationId(1145), + ty: DeclarationId(1146), }, Field { label: "body".to_string(), - ty: DeclarationId(1152), + ty: DeclarationId(1153), }, Field { label: "span".to_string(), @@ -87116,11 +77929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9598, 9770), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2427), -======= - id: DeclarationId(2434), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2435), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -87140,21 +77949,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9830, 9842), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2428), -======= - id: DeclarationId(2435), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2436), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1141), + value: DeclarationId(1142), }], }, type_params: vec![], @@ -87168,11 +77969,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9857, 9875), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2429), -======= - id: DeclarationId(2436), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2437), name: None, connective: TypeConnective::Conj { children: vec![ @@ -87182,23 +77979,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2427), -======= - ty: DeclarationId(2434), - }, - Field { - label: "params".to_string(), ty: DeclarationId(2435), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "params".to_string(), - ty: DeclarationId(2428), + ty: DeclarationId(2436), }, Field { label: "return_type".to_string(), - ty: DeclarationId(1145), + ty: DeclarationId(1146), }, Field { label: "body_span".to_string(), @@ -87221,15 +78010,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9775, 9963), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2430), -======= - id: DeclarationId(2437), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2438), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1152), + DeclarationId(1153), CardinalityBound::AtMostOne, ), ), @@ -87244,11 +78029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2431), -======= - id: DeclarationId(2438), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2439), name: None, connective: TypeConnective::Conj { children: vec![ @@ -87258,15 +78039,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "ty".to_string(), - ty: DeclarationId(1145), + ty: DeclarationId(1146), }, Field { label: "body".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2430), -======= - ty: DeclarationId(2437), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2438), }, Field { label: "body_span".to_string(), @@ -87289,11 +78066,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9968, 10097), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2432), -======= - id: DeclarationId(2439), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2440), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -87313,14 +78086,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10117, 10129), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2433), + id: DeclarationId(2441), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "path".to_string(), - ty: DeclarationId(2432), + ty: DeclarationId(2440), }, Field { label: "span".to_string(), @@ -87339,7 +78111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10102, 10149), }); declarations.push(Declaration { - id: DeclarationId(2434), + id: DeclarationId(2442), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -87359,7 +78131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10175, 10187), }); declarations.push(Declaration { - id: DeclarationId(2435), + id: DeclarationId(2443), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -87379,17 +78151,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10201, 10213), }); declarations.push(Declaration { - id: DeclarationId(2436), + id: DeclarationId(2444), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "path".to_string(), - ty: DeclarationId(2434), + ty: DeclarationId(2442), }, Field { label: "names".to_string(), - ty: DeclarationId(2435), + ty: DeclarationId(2443), }, Field { label: "span".to_string(), @@ -87408,7 +78180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10154, 10242), }); declarations.push(Declaration { - id: DeclarationId(2437), + id: DeclarationId(2445), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -87428,7 +78200,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10296, 10308), }); declarations.push(Declaration { - id: DeclarationId(2438), + id: DeclarationId(2446), name: None, connective: TypeConnective::Conj { children: vec![ @@ -87438,7 +78210,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(2437), + ty: DeclarationId(2445), }, Field { label: "span".to_string(), @@ -87457,7 +78229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10247, 10337), }); declarations.push(Declaration { - id: DeclarationId(2439), + id: DeclarationId(2447), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -87477,13 +78249,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10393, 10405), }); declarations.push(Declaration { - id: DeclarationId(2440), + id: DeclarationId(2448), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), - value: DeclarationId(1142), + value: DeclarationId(1143), }], }, type_params: vec![], @@ -87497,29 +78269,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10420, 10438), }); declarations.push(Declaration { - id: DeclarationId(2441), -======= - id: DeclarationId(2440), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2449), name: None, connective: TypeConnective::Conj { children: vec![ Field { -<<<<<<< HEAD label: "name".to_string(), ty: DeclarationId(230), }, Field { label: "type_params".to_string(), - ty: DeclarationId(2439), + ty: DeclarationId(2447), }, Field { label: "fields".to_string(), - ty: DeclarationId(2440), -======= - label: "path".to_string(), - ty: DeclarationId(2439), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2448), }, Field { label: "span".to_string(), @@ -87535,10 +78299,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10102, 10149), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10342, 10467), }); declarations.push(Declaration { - id: DeclarationId(2442), + id: DeclarationId(2450), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -87555,212 +78319,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10175, 10187), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10520, 10532), }); declarations.push(Declaration { - id: DeclarationId(2443), + id: DeclarationId(2451), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), - value: DeclarationId(1143), -======= - parameter: DeclarationId(686), - value: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10201, 10213), - }); - declarations.push(Declaration { - id: DeclarationId(2443), - name: None, - connective: TypeConnective::Conj { - children: vec![ - Field { - label: "path".to_string(), - ty: DeclarationId(2441), - }, - Field { - label: "names".to_string(), - ty: DeclarationId(2442), - }, - Field { - label: "span".to_string(), - ty: DeclarationId(159), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10154, 10242), - }); - declarations.push(Declaration { - id: DeclarationId(2444), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(685), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10296, 10308), - }); - declarations.push(Declaration { - id: DeclarationId(2445), - name: None, - connective: TypeConnective::Conj { - children: vec![ - Field { - label: "name".to_string(), - ty: DeclarationId(230), - }, - Field { - label: "type_params".to_string(), - ty: DeclarationId(2444), - }, - Field { - label: "span".to_string(), - ty: DeclarationId(159), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10247, 10337), - }); - declarations.push(Declaration { - id: DeclarationId(2446), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(685), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10393, 10405), - }); - declarations.push(Declaration { - id: DeclarationId(2447), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(685), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1142), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10420, 10438), - }); - declarations.push(Declaration { - id: DeclarationId(2448), - name: None, - connective: TypeConnective::Conj { - children: vec![ - Field { - label: "name".to_string(), - ty: DeclarationId(230), - }, - Field { - label: "type_params".to_string(), - ty: DeclarationId(2446), - }, - Field { - label: "fields".to_string(), - ty: DeclarationId(2447), - }, - Field { - label: "span".to_string(), - ty: DeclarationId(159), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10342, 10467), - }); - declarations.push(Declaration { - id: DeclarationId(2449), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(685), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10520, 10532), - }); - declarations.push(Declaration { - id: DeclarationId(2450), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(685), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1143), + value: DeclarationId(1144), }], }, type_params: vec![], @@ -87774,15 +78342,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10549, 10569), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2444), -======= - id: DeclarationId(2451), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2452), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1145), + DeclarationId(1146), CardinalityBound::AtMostOne, ), ), @@ -87797,11 +78361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2445), -======= - id: DeclarationId(2452), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2453), name: None, connective: TypeConnective::Conj { children: vec![ @@ -87811,27 +78371,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2442), - }, - Field { - label: "variants".to_string(), - ty: DeclarationId(2443), -======= - ty: DeclarationId(2449), - }, - Field { - label: "variants".to_string(), ty: DeclarationId(2450), }, Field { - label: "inhabits".to_string(), + label: "variants".to_string(), ty: DeclarationId(2451), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "inhabits".to_string(), - ty: DeclarationId(2444), + ty: DeclarationId(2452), }, Field { label: "span".to_string(), @@ -87850,11 +78398,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10472, 10627), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2446), -======= - id: DeclarationId(2453), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2454), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -87874,15 +78418,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10682, 10694), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2447), -======= - id: DeclarationId(2454), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2455), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1152), + DeclarationId(1153), CardinalityBound::AtMostOne, ), ), @@ -87897,11 +78437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2448), -======= - id: DeclarationId(2455), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2456), name: None, connective: TypeConnective::Conj { children: vec![ @@ -87911,11 +78447,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2446), -======= - ty: DeclarationId(2453), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2454), }, Field { label: "nominal_opaque".to_string(), @@ -87923,15 +78455,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "target".to_string(), - ty: DeclarationId(1145), + ty: DeclarationId(1146), }, Field { label: "refinement".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2447), -======= - ty: DeclarationId(2454), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2455), }, Field { label: "span".to_string(), @@ -87950,21 +78478,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10632, 10807), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2449), -======= - id: DeclarationId(2456), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2457), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1046), + value: DeclarationId(1047), }], }, type_params: vec![], @@ -87982,21 +78502,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2450), -======= - id: DeclarationId(2457), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2458), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1167), + value: DeclarationId(1168), }], }, type_params: vec![], @@ -88010,11 +78522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 11243, 11254), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2451), -======= - id: DeclarationId(2458), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2459), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88033,21 +78541,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2137, 2162), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2452), -======= - id: DeclarationId(2459), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2460), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1166), + value: DeclarationId(1167), }], }, type_params: vec![], @@ -88061,20 +78561,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2179, 2195), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2453), -======= - id: DeclarationId(2460), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2461), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2452), -======= - ty: DeclarationId(2459), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2460), }], }, type_params: vec![], @@ -88088,11 +78580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2167, 2196), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2454), -======= - id: DeclarationId(2461), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2462), name: None, connective: TypeConnective::Conj { children: vec![ @@ -88102,7 +78590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "payload".to_string(), - ty: DeclarationId(1167), + ty: DeclarationId(1168), }, ], }, @@ -88117,11 +78605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2201, 2252), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2455), -======= - id: DeclarationId(2462), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2463), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88140,11 +78624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2257, 2272), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2456), -======= - id: DeclarationId(2463), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2464), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88163,11 +78643,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2277, 2304), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2457), -======= - id: DeclarationId(2464), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2465), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -88178,7 +78654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(139), - value: DeclarationId(1167), + value: DeclarationId(1168), }, ], }, @@ -88193,21 +78669,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 3936, 3954), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2458), -======= - id: DeclarationId(2465), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2466), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1170), + value: DeclarationId(1171), }], }, type_params: vec![], @@ -88221,16 +78689,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 4542, 4557), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2459), -======= - id: DeclarationId(2466), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2467), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "input_order".to_string(), - ty: DeclarationId(1174), + ty: DeclarationId(1175), }], }, type_params: vec![], @@ -88244,11 +78708,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 5388, 5442), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2460), -======= - id: DeclarationId(2467), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2468), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88262,11 +78722,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 5682, 5691), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2461), -======= - id: DeclarationId(2468), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2469), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88280,21 +78736,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 5694, 5704), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2462), -======= - id: DeclarationId(2469), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2470), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1046), + value: DeclarationId(1047), }], }, type_params: vec![], @@ -88308,11 +78756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5765, 5793), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2463), -======= - id: DeclarationId(2470), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2471), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -88323,7 +78767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(139), - value: DeclarationId(1182), + value: DeclarationId(1183), }, ], }, @@ -88338,17 +78782,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 6801, 6824), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2464), -======= - id: DeclarationId(2471), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2472), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(976), + template: DeclarationId(977), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -88362,17 +78802,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2465), -======= - id: DeclarationId(2472), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2473), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(976), + template: DeclarationId(977), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -88386,11 +78822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4510, 4536), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2466), -======= - id: DeclarationId(2473), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2474), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -88410,11 +78842,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4804, 4821), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2467), -======= - id: DeclarationId(2474), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2475), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -88434,11 +78862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4872, 4886), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2468), -======= - id: DeclarationId(2475), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2476), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -88458,11 +78882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4936, 4949), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2469), -======= - id: DeclarationId(2476), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2477), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -88482,21 +78902,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4999, 5012), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2470), -======= - id: DeclarationId(2477), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2478), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(974), + value: DeclarationId(975), }], }, type_params: vec![], @@ -88510,17 +78922,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5060, 5076), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2471), -======= - id: DeclarationId(2478), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2479), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(976), + template: DeclarationId(977), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -88534,22 +78942,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5129, 5155), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2472), -======= - id: DeclarationId(2479), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2480), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), - value: DeclarationId(2471), -======= - parameter: DeclarationId(686), - value: DeclarationId(2478), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + value: DeclarationId(2479), }], }, type_params: vec![], @@ -88563,17 +78962,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5124, 5156), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2473), -======= - id: DeclarationId(2480), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2481), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(976), + template: DeclarationId(977), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -88587,22 +78982,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5230, 5256), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2474), -======= - id: DeclarationId(2481), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2482), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), - value: DeclarationId(2473), -======= - parameter: DeclarationId(686), - value: DeclarationId(2480), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + value: DeclarationId(2481), }], }, type_params: vec![], @@ -88616,21 +79002,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5225, 5257), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2475), -======= - id: DeclarationId(2482), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2483), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(974), + value: DeclarationId(975), }], }, type_params: vec![], @@ -88644,65 +79022,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5382, 5398), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2476), -======= - id: DeclarationId(2483), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(979), - arguments: vec![TemplateArgument { - parameter: DeclarationId(980), - value: DeclarationId(1229), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5523, 5557), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2477), -======= id: DeclarationId(2484), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(979), - arguments: vec![TemplateArgument { - parameter: DeclarationId(980), - value: DeclarationId(1229), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5769, 5803), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2478), -======= - id: DeclarationId(2485), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(979), + template: DeclarationId(980), arguments: vec![TemplateArgument { - parameter: DeclarationId(980), - value: DeclarationId(1229), + parameter: DeclarationId(981), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -88713,157 +79039,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6288, 6322), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2479), -======= - id: DeclarationId(2486), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(979), - arguments: vec![TemplateArgument { - parameter: DeclarationId(980), - value: DeclarationId(1229), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6549, 6583), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2480), -======= - id: DeclarationId(2487), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(979), - arguments: vec![TemplateArgument { - parameter: DeclarationId(980), - value: DeclarationId(1229), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6839, 6873), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2481), -======= - id: DeclarationId(2488), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(976), - arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7053, 7079), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2482), -======= - id: DeclarationId(2489), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(979), - arguments: vec![TemplateArgument { - parameter: DeclarationId(980), - value: DeclarationId(1229), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7084, 7118), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2483), -======= - id: DeclarationId(2490), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(979), - arguments: vec![TemplateArgument { - parameter: DeclarationId(980), - value: DeclarationId(1229), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8353, 8387), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2484), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(2260), - arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5523, 5557), }); declarations.push(Declaration { id: DeclarationId(2485), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2260), + template: DeclarationId(980), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(981), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -88874,16 +79059,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5769, 5803), }); declarations.push(Declaration { id: DeclarationId(2486), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2260), + template: DeclarationId(980), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(981), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -88894,16 +79079,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6288, 6322), }); declarations.push(Declaration { id: DeclarationId(2487), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2260), + template: DeclarationId(980), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(981), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -88914,16 +79099,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6549, 6583), }); declarations.push(Declaration { id: DeclarationId(2488), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2260), + template: DeclarationId(980), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(981), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -88934,16 +79119,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6839, 6873), }); declarations.push(Declaration { id: DeclarationId(2489), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2260), + template: DeclarationId(977), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -88954,16 +79139,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7053, 7079), }); declarations.push(Declaration { id: DeclarationId(2490), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2260), + template: DeclarationId(980), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(981), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -88974,22 +79159,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7084, 7118), }); declarations.push(Declaration { id: DeclarationId(2491), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2260), -======= - id: DeclarationId(2491), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(2267), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + template: DeclarationId(980), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(981), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -89000,20 +79179,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8353, 8387), }); declarations.push(Declaration { id: DeclarationId(2492), name: None, connective: TypeConnective::Instantiation { -<<<<<<< HEAD - template: DeclarationId(2260), -======= - template: DeclarationId(2267), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + template: DeclarationId(2268), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -89030,13 +79205,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(2493), name: None, connective: TypeConnective::Instantiation { -<<<<<<< HEAD - template: DeclarationId(2260), -======= - template: DeclarationId(2267), + template: DeclarationId(2268), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -89053,10 +79225,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(2494), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2267), + template: DeclarationId(2268), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -89073,10 +79245,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(2495), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2267), + template: DeclarationId(2268), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -89093,10 +79265,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(2496), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2267), + template: DeclarationId(2268), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -89113,10 +79285,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(2497), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2267), + template: DeclarationId(2268), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -89133,10 +79305,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(2498), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2267), + template: DeclarationId(2268), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -89153,10 +79325,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(2499), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2267), + template: DeclarationId(2268), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -89173,10 +79345,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(2500), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2267), + template: DeclarationId(2268), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -89193,11 +79365,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(2501), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1783), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + template: DeclarationId(2268), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -89211,10 +79382,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2938, 2964), }); declarations.push(Declaration { - id: DeclarationId(2494), + id: DeclarationId(2502), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1783), + template: DeclarationId(1784), arguments: vec![TemplateArgument { parameter: DeclarationId(687), value: DeclarationId(799), @@ -89231,14 +79402,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4804, 4821), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2495), -======= - id: DeclarationId(2502), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2503), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1783), + template: DeclarationId(1784), arguments: vec![TemplateArgument { parameter: DeclarationId(687), value: DeclarationId(827), @@ -89255,14 +79422,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4872, 4886), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2496), -======= - id: DeclarationId(2503), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2504), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1783), + template: DeclarationId(1784), arguments: vec![TemplateArgument { parameter: DeclarationId(687), value: DeclarationId(781), @@ -89279,14 +79442,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4936, 4949), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2497), -======= - id: DeclarationId(2504), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2505), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1783), + template: DeclarationId(1784), arguments: vec![TemplateArgument { parameter: DeclarationId(687), value: DeclarationId(817), @@ -89303,21 +79462,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4999, 5012), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2498), -======= - id: DeclarationId(2505), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2506), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1783), + template: DeclarationId(1784), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(974), + value: DeclarationId(975), }], }, type_params: vec![], @@ -89331,22 +79482,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5060, 5076), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2499), -======= - id: DeclarationId(2506), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2507), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1783), + template: DeclarationId(1784), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), - value: DeclarationId(2471), -======= - parameter: DeclarationId(686), - value: DeclarationId(2478), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + value: DeclarationId(2479), }], }, type_params: vec![], @@ -89360,22 +79502,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5124, 5156), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2500), -======= - id: DeclarationId(2507), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2508), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1785), + template: DeclarationId(1786), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), - value: DeclarationId(2473), -======= - parameter: DeclarationId(686), - value: DeclarationId(2480), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + value: DeclarationId(2481), }], }, type_params: vec![], @@ -89389,20 +79522,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5225, 5257), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2501), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(2260), -======= - id: DeclarationId(2508), + id: DeclarationId(2509), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2267), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + template: DeclarationId(2268), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -89416,21 +79542,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5230, 5256), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2502), -======= - id: DeclarationId(2509), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2510), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1785), + template: DeclarationId(1786), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(974), + value: DeclarationId(975), }], }, type_params: vec![], @@ -89444,20 +79562,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5382, 5398), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2503), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(2266), -======= - id: DeclarationId(2510), + id: DeclarationId(2511), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2273), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + template: DeclarationId(2274), arguments: vec![TemplateArgument { - parameter: DeclarationId(980), - value: DeclarationId(1229), + parameter: DeclarationId(981), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -89471,20 +79582,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5523, 5557), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2504), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(2270), -======= - id: DeclarationId(2511), + id: DeclarationId(2512), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2277), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + template: DeclarationId(2278), arguments: vec![TemplateArgument { - parameter: DeclarationId(980), - value: DeclarationId(1229), + parameter: DeclarationId(981), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -89498,15 +79602,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5769, 5803), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2505), -======= - id: DeclarationId(2512), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2513), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1204), + DeclarationId(1205), CardinalityBound::AtMostOne, ), ), @@ -89521,15 +79621,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2506), -======= - id: DeclarationId(2513), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2514), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1204), + DeclarationId(1205), CardinalityBound::AtMostOne, ), ), @@ -89544,15 +79640,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2507), -======= - id: DeclarationId(2514), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2515), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1204), + DeclarationId(1205), CardinalityBound::AtMostOne, ), ), @@ -89567,11 +79659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2508), -======= - id: DeclarationId(2515), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2516), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -89582,7 +79670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(139), - value: DeclarationId(1204), + value: DeclarationId(1205), }, ], }, @@ -89597,11 +79685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2732, 2760), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2509), -======= - id: DeclarationId(2516), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2517), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -89612,7 +79696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(139), - value: DeclarationId(1204), + value: DeclarationId(1205), }, ], }, @@ -89627,15 +79711,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2804, 2832), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2510), -======= - id: DeclarationId(2517), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2518), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1212), + DeclarationId(1213), CardinalityBound::AtMostOne, ), ), @@ -89650,15 +79730,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2511), -======= - id: DeclarationId(2518), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2519), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1214), + DeclarationId(1215), CardinalityBound::AtMostOne, ), ), @@ -89673,22 +79749,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2512), -======= - id: DeclarationId(2519), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2520), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(11), arguments: vec![ TemplateArgument { parameter: DeclarationId(12), - value: DeclarationId(1225), + value: DeclarationId(1226), }, TemplateArgument { parameter: DeclarationId(13), - value: DeclarationId(1224), + value: DeclarationId(1225), }, ], }, @@ -89703,11 +79775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 12353, 12399), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2513), -======= - id: DeclarationId(2520), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2521), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89721,11 +79789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 767, 773), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2514), -======= - id: DeclarationId(2521), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2522), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89739,11 +79803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 778, 791), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2515), -======= - id: DeclarationId(2522), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2523), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89757,30 +79817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 796, 810), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2516), -======= - id: DeclarationId(2523), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "param".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 3332, 3358), - }); - declarations.push(Declaration { id: DeclarationId(2524), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89875,7 +79912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3470, 3502), }); declarations.push(Declaration { - id: DeclarationId(2521), + id: DeclarationId(2529), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89889,16 +79926,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4509, 4516), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2522), -======= - id: DeclarationId(2529), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2530), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "previous".to_string(), - ty: DeclarationId(1212), + ty: DeclarationId(1213), }], }, type_params: vec![], @@ -89912,11 +79945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4521, 4571), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2523), -======= - id: DeclarationId(2530), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2531), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89930,16 +79959,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5484, 5495), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2524), -======= - id: DeclarationId(2531), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2532), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "inner".to_string(), - ty: DeclarationId(1214), + ty: DeclarationId(1215), }], }, type_params: vec![], @@ -89953,11 +79978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5500, 5545), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2525), -======= - id: DeclarationId(2532), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2533), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89976,16 +79997,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7649, 7683), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2526), -======= - id: DeclarationId(2533), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2534), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "amount".to_string(), - ty: DeclarationId(1212), + ty: DeclarationId(1213), }], }, type_params: vec![], @@ -89999,16 +80016,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7688, 7732), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2527), -======= - id: DeclarationId(2534), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2535), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "steps".to_string(), - ty: DeclarationId(1212), + ty: DeclarationId(1213), }], }, type_params: vec![], @@ -90022,16 +80035,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7737, 7795), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2528), -======= - id: DeclarationId(2535), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2536), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "divisor".to_string(), - ty: DeclarationId(1214), + ty: DeclarationId(1215), }], }, type_params: vec![], @@ -90045,11 +80054,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7800, 7856), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2529), -======= - id: DeclarationId(2536), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2537), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90068,11 +80073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7861, 7894), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2530), -======= - id: DeclarationId(2537), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2538), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90091,11 +80092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7899, 7929), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2531), -======= - id: DeclarationId(2538), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2539), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90109,21 +80106,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7934, 7947), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2532), -======= - id: DeclarationId(2539), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2540), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1211), + value: DeclarationId(1212), }], }, type_params: vec![], @@ -90137,21 +80126,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7987, 8009), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2533), -======= - id: DeclarationId(2540), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2541), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1204), + value: DeclarationId(1205), }], }, type_params: vec![], @@ -90165,11 +80146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 8219, 8240), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2534), -======= - id: DeclarationId(2541), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2542), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90183,11 +80160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 8740, 8746), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2535), -======= - id: DeclarationId(2542), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2543), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90201,11 +80174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 9139, 9152), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2536), -======= - id: DeclarationId(2543), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2544), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90219,16 +80188,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 9157, 9171), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2537), -======= - id: DeclarationId(2544), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2545), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1223), + ty: DeclarationId(1224), }], }, type_params: vec![], @@ -90242,11 +80207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 10263, 10297), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2538), -======= - id: DeclarationId(2545), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2546), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90260,11 +80221,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 10302, 10320), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2539), -======= - id: DeclarationId(2546), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2547), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -90275,7 +80232,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(139), - value: DeclarationId(1222), + value: DeclarationId(1223), }, ], }, @@ -90290,14 +80247,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 11234, 11261), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2540), + id: DeclarationId(2548), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), - value: DeclarationId(970), + value: DeclarationId(971), }], }, type_params: vec![], @@ -90311,13 +80267,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 7946, 7962), }); declarations.push(Declaration { - id: DeclarationId(2541), + id: DeclarationId(2549), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(976), + template: DeclarationId(977), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -90331,12 +80287,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), }); declarations.push(Declaration { - id: DeclarationId(2542), + id: DeclarationId(2550), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "duration".to_string(), - ty: DeclarationId(1228), + ty: DeclarationId(1229), }], }, type_params: vec![], @@ -90350,7 +80306,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 4004, 4038), }); declarations.push(Declaration { - id: DeclarationId(2543), + id: DeclarationId(2551), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90364,7 +80320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 4043, 4053), }); declarations.push(Declaration { - id: DeclarationId(2544), + id: DeclarationId(2552), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90378,7 +80334,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 4058, 4067), }); declarations.push(Declaration { - id: DeclarationId(2545), + id: DeclarationId(2553), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90392,13 +80348,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 4072, 4077), }); declarations.push(Declaration { - id: DeclarationId(2546), + id: DeclarationId(2554), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), - value: DeclarationId(1232), + value: DeclarationId(1233), }], }, type_params: vec![], @@ -90412,21 +80368,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/timing_lens.dag", 5915, 5943), }); declarations.push(Declaration { - id: DeclarationId(2547), + id: DeclarationId(2555), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1783), + template: DeclarationId(1784), arguments: vec![TemplateArgument { parameter: DeclarationId(687), -======= - id: DeclarationId(2547), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(685), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(970), + value: DeclarationId(971), }], }, type_params: vec![], @@ -90439,219 +80387,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/timing_lens.dag", 7946, 7962), }); - declarations.push(Declaration { - id: DeclarationId(2548), - name: None, - connective: TypeConnective::Instantiation { -<<<<<<< HEAD - template: DeclarationId(2260), -======= - template: DeclarationId(976), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), - }); - declarations.push(Declaration { - id: DeclarationId(2549), - name: None, -<<<<<<< HEAD - connective: TypeConnective::Instantiation { - template: DeclarationId(2260), - arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), -======= - connective: TypeConnective::Conj { - children: vec![Field { - label: "duration".to_string(), - ty: DeclarationId(1228), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 4004, 4038), - }); - declarations.push(Declaration { - id: DeclarationId(2550), - name: None, -<<<<<<< HEAD - connective: TypeConnective::Instantiation { - template: DeclarationId(2260), - arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), - }], - }, -======= - connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 4043, 4053), - }); - declarations.push(Declaration { - id: DeclarationId(2551), - name: None, -<<<<<<< HEAD - connective: TypeConnective::Instantiation { - template: DeclarationId(2260), - arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), - }], - }, -======= - connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 4058, 4067), - }); - declarations.push(Declaration { - id: DeclarationId(2552), - name: None, -<<<<<<< HEAD - connective: TypeConnective::Instantiation { - template: DeclarationId(2260), - arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), - }], - }, -======= - connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 4072, 4077), - }); - declarations.push(Declaration { - id: DeclarationId(2553), - name: None, - connective: TypeConnective::Instantiation { -<<<<<<< HEAD - template: DeclarationId(2260), - arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), -======= - template: DeclarationId(685), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1232), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 5915, 5943), - }); - declarations.push(Declaration { - id: DeclarationId(2554), - name: None, - connective: TypeConnective::Instantiation { -<<<<<<< HEAD - template: DeclarationId(2260), - arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), -======= - template: DeclarationId(1783), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(970), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 7946, 7962), - }); - declarations.push(Declaration { - id: DeclarationId(2555), - name: None, - connective: TypeConnective::Instantiation { -<<<<<<< HEAD - template: DeclarationId(2260), -======= - template: DeclarationId(2267), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), - }); declarations.push(Declaration { id: DeclarationId(2556), name: None, connective: TypeConnective::Instantiation { -<<<<<<< HEAD - template: DeclarationId(2260), -======= - template: DeclarationId(2267), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + template: DeclarationId(2268), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -90668,14 +80411,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(2557), name: None, connective: TypeConnective::Instantiation { -<<<<<<< HEAD - template: DeclarationId(2260), -======= - template: DeclarationId(2267), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + template: DeclarationId(2268), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -90692,10 +80431,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(2558), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2267), + template: DeclarationId(2268), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -90706,20 +80445,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651), -======= span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2559), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2267), + template: DeclarationId(2268), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -90730,20 +80465,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660), -======= span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2560), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2267), + template: DeclarationId(2268), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -90754,20 +80485,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671), -======= span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2561), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2267), + template: DeclarationId(2268), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -90778,20 +80505,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682), -======= span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2562), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2267), + template: DeclarationId(2268), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -90802,20 +80525,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691), -======= span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2563), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2267), + template: DeclarationId(2268), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -90826,20 +80545,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702), -======= span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2564), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2267), + template: DeclarationId(2268), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1229), + parameter: DeclarationId(978), + value: DeclarationId(1230), }], }, type_params: vec![], @@ -90850,16 +80565,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715), -======= span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2565), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Instantiation { + template: DeclarationId(2268), + arguments: vec![TemplateArgument { + parameter: DeclarationId(978), + value: DeclarationId(1230), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -90868,11 +80585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728), -======= - span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), }); declarations.push(Declaration { id: DeclarationId(2566), @@ -90886,11 +80599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740), -======= - span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651), }); declarations.push(Declaration { id: DeclarationId(2567), @@ -90904,11 +80613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751), -======= - span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660), }); declarations.push(Declaration { id: DeclarationId(2568), @@ -90922,11 +80627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763), -======= - span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671), }); declarations.push(Declaration { id: DeclarationId(2569), @@ -90940,18 +80641,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/tokenize.dag", 768, 774), -======= - span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682), }); declarations.push(Declaration { id: DeclarationId(2570), name: None, connective: TypeConnective::Conj { children: vec![] }, -<<<<<<< HEAD -======= type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -90960,7 +80655,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702), + span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691), }); declarations.push(Declaration { id: DeclarationId(2571), @@ -90974,7 +80669,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715), + span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702), }); declarations.push(Declaration { id: DeclarationId(2572), @@ -90988,7 +80683,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728), + span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 715), }); declarations.push(Declaration { id: DeclarationId(2573), @@ -91002,7 +80697,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740), + span: SourceSpan::new("src/v3/std/tokenize.dag", 720, 728), }); declarations.push(Declaration { id: DeclarationId(2574), @@ -91016,7 +80711,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751), + span: SourceSpan::new("src/v3/std/tokenize.dag", 733, 740), }); declarations.push(Declaration { id: DeclarationId(2575), @@ -91030,7 +80725,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763), + span: SourceSpan::new("src/v3/std/tokenize.dag", 745, 751), }); declarations.push(Declaration { id: DeclarationId(2576), @@ -91044,7 +80739,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/tokenize.dag", 768, 774), + span: SourceSpan::new("src/v3/std/tokenize.dag", 756, 763), }); declarations.push(Declaration { id: DeclarationId(2577), @@ -91058,18 +80753,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/tokenize.dag", 779, 786), + span: SourceSpan::new("src/v3/std/tokenize.dag", 768, 774), }); declarations.push(Declaration { id: DeclarationId(2578), name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -92118,17 +81807,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2645, 2653), }); declarations.push(Declaration { - id: DeclarationId(2644), + id: DeclarationId(2652), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1165), + value: DeclarationId(1166), }], }, type_params: vec![], @@ -92142,21 +81827,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 19158, 19181), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2645), -======= - id: DeclarationId(2652), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2653), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1274), + value: DeclarationId(1275), }], }, type_params: vec![], @@ -92170,21 +81847,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 19383, 19398), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2646), -======= - id: DeclarationId(2653), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2654), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1279), + value: DeclarationId(1280), }], }, type_params: vec![], @@ -92198,11 +81867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 19403, 19423), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2647), -======= - id: DeclarationId(2654), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2655), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92216,11 +81881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2480, 2494), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2648), -======= - id: DeclarationId(2655), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2656), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92234,11 +81895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2499, 2509), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2649), -======= - id: DeclarationId(2656), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2657), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92252,11 +81909,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2514, 2526), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2650), -======= - id: DeclarationId(2657), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2658), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92270,11 +81923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2531, 2544), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2651), -======= - id: DeclarationId(2658), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2659), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92288,11 +81937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2549, 2561), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2652), -======= - id: DeclarationId(2659), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2660), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92306,11 +81951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2566, 2578), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2653), -======= - id: DeclarationId(2660), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2661), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92324,11 +81965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2583, 2605), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2654), -======= - id: DeclarationId(2661), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2662), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92342,11 +81979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2610, 2629), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2655), -======= - id: DeclarationId(2662), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2663), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92360,11 +81993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2634, 2659), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2656), -======= - id: DeclarationId(2663), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2664), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92378,11 +82007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2664, 2687), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2657), -======= - id: DeclarationId(2664), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2665), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92396,11 +82021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3093, 3102), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2658), -======= - id: DeclarationId(2665), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2666), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92419,11 +82040,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3107, 3123), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2659), -======= - id: DeclarationId(2666), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2667), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92437,11 +82054,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3782, 3790), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2660), -======= - id: DeclarationId(2667), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2668), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92455,11 +82068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3795, 3805), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2661), -======= - id: DeclarationId(2668), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2669), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92473,11 +82082,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4030, 4042), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2662), -======= - id: DeclarationId(2669), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2670), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92491,11 +82096,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4857, 4870), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2663), -======= - id: DeclarationId(2670), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2671), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92509,11 +82110,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4875, 4888), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2664), -======= - id: DeclarationId(2671), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2672), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92527,11 +82124,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4893, 4901), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2665), -======= - id: DeclarationId(2672), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2673), name: None, connective: TypeConnective::Conj { children: vec![ @@ -92556,11 +82149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5446, 5513), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2666), -======= - id: DeclarationId(2673), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2674), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92574,16 +82163,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5538, 5546), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2667), -======= - id: DeclarationId(2674), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2675), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1265), + ty: DeclarationId(1266), }], }, type_params: vec![], @@ -92597,11 +82182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5551, 5591), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2668), -======= - id: DeclarationId(2675), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2676), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92620,11 +82201,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5596, 5629), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2669), -======= - id: DeclarationId(2676), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2677), name: None, connective: TypeConnective::Conj { children: vec![ @@ -92634,7 +82211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "state".to_string(), - ty: DeclarationId(1266), + ty: DeclarationId(1267), }, ], }, @@ -92649,11 +82226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5634, 5712), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2670), -======= - id: DeclarationId(2677), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2678), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92672,11 +82245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5878, 5941), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2671), -======= - id: DeclarationId(2678), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2679), name: None, connective: TypeConnective::Conj { children: vec![ @@ -92705,25 +82274,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5946, 6037), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2672), -======= - id: DeclarationId(2679), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2680), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "input_sample".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "expected_output".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, ], }, @@ -92738,21 +82303,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 6042, 6174), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2673), -======= - id: DeclarationId(2680), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2681), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "invariant".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, ], }, @@ -92767,11 +82328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 6389, 6478), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2674), -======= - id: DeclarationId(2681), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2682), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -92791,11 +82348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 7278, 7290), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2675), -======= - id: DeclarationId(2682), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2683), name: None, connective: TypeConnective::Conj { children: vec![ @@ -92805,11 +82358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2674), -======= - ty: DeclarationId(2681), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2682), }, Field { label: "expect_exit_code".to_string(), @@ -92828,11 +82377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 7227, 7324), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2676), -======= - id: DeclarationId(2683), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2684), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -92852,11 +82397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 8024, 8036), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2677), -======= - id: DeclarationId(2684), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2685), name: None, connective: TypeConnective::Conj { children: vec![ @@ -92866,11 +82407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2676), -======= - ty: DeclarationId(2683), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2684), }, Field { label: "expect_exit_code".to_string(), @@ -92889,25 +82426,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 7974, 8070), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2678), -======= - id: DeclarationId(2685), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2686), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "lens_ref".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "input_ref".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "expected_ref".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, ], }, @@ -92922,25 +82455,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 8368, 8490), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2679), -======= - id: DeclarationId(2686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2687), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject_ref".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "oracle_ref".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "input_ref".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, ], }, @@ -92955,16 +82484,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 8752, 8877), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2680), -======= - id: DeclarationId(2687), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2688), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "expected".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }], }, type_params: vec![], @@ -92978,25 +82503,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 10930, 10991), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2681), -======= - id: DeclarationId(2688), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2689), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "comparator".to_string(), - ty: DeclarationId(1267), + ty: DeclarationId(1268), }, Field { label: "baseline_ref".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, ], }, @@ -93011,21 +82532,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 11345, 11477), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2682), -======= - id: DeclarationId(2689), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2690), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "left_report_ref".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "right_report_ref".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, ], }, @@ -93040,21 +82557,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 12044, 12156), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2683), -======= - id: DeclarationId(2690), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2691), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "law".to_string(), - ty: DeclarationId(1268), + ty: DeclarationId(1269), }, Field { label: "lens_ref".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, ], }, @@ -93069,21 +82582,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 12853, 12932), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2684), -======= - id: DeclarationId(2691), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2692), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "list_constant".to_string(), - ty: DeclarationId(1256), + ty: DeclarationId(1257), }, Field { label: "bound".to_string(), @@ -93102,25 +82611,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13152, 13265), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2685), -======= - id: DeclarationId(2692), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2693), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "list_constant".to_string(), - ty: DeclarationId(1256), + ty: DeclarationId(1257), }, Field { label: "subset_predicate".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, ], }, @@ -93135,21 +82640,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13270, 13406), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2686), -======= - id: DeclarationId(2693), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2694), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "compile_target".to_string(), - ty: DeclarationId(1254), + ty: DeclarationId(1255), }, Field { label: "expected".to_string(), - ty: DeclarationId(1255), + ty: DeclarationId(1256), }, ], }, @@ -93164,21 +82665,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13411, 13493), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2687), -======= - id: DeclarationId(2694), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2695), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "ratchet_kind".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, ], }, @@ -93193,21 +82690,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13498, 13584), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2688), -======= - id: DeclarationId(2695), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2696), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1254), + value: DeclarationId(1255), }], }, type_params: vec![], @@ -93221,25 +82710,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13663, 13673), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2689), -======= - id: DeclarationId(2696), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2697), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "generated_paths".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2688), -======= - ty: DeclarationId(2695), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2696), }, ], }, @@ -93254,25 +82735,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13589, 13679), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2690), -======= - id: DeclarationId(2697), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2698), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "deferred_gate".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "target_lane".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "authority_doc".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, ], }, @@ -93287,25 +82764,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14621, 14755), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2691), -======= - id: DeclarationId(2698), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2699), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "deferred_gate".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "target_lane".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, Field { label: "authority_doc".to_string(), - ty: DeclarationId(1290), + ty: DeclarationId(1291), }, ], }, @@ -93320,16 +82793,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 15394, 15538), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2692), -======= - id: DeclarationId(2699), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2700), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "ledger".to_string(), - ty: DeclarationId(911), + ty: DeclarationId(912), }], }, type_params: vec![], @@ -93343,21 +82812,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 16383, 16437), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2693), -======= - id: DeclarationId(2700), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2701), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1165), + value: DeclarationId(1166), }], }, type_params: vec![], @@ -93371,11 +82832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 17481, 17504), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2694), -======= - id: DeclarationId(2701), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2702), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93389,11 +82846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 17707, 17713), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2695), -======= - id: DeclarationId(2702), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2703), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93407,21 +82860,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 17718, 17724), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2696), -======= - id: DeclarationId(2703), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2704), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1165), + value: DeclarationId(1166), }], }, type_params: vec![], @@ -93435,16 +82880,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 17862, 17885), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2697), -======= - id: DeclarationId(2704), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2705), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1274), + ty: DeclarationId(1275), }], }, type_params: vec![], @@ -93458,16 +82899,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 18343, 18364), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2698), -======= - id: DeclarationId(2705), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2706), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1276), + ty: DeclarationId(1277), }], }, type_params: vec![], @@ -93481,21 +82918,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 18369, 18400), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2699), -======= - id: DeclarationId(2706), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2707), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1274), + value: DeclarationId(1275), }], }, type_params: vec![], @@ -93509,21 +82938,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 18444, 18459), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2700), -======= - id: DeclarationId(2707), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2708), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1165), + value: DeclarationId(1166), }], }, type_params: vec![], @@ -93537,11 +82958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 18715, 18738), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2701), -======= - id: DeclarationId(2708), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2709), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -93561,11 +82978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2702), -======= - id: DeclarationId(2709), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2710), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93579,11 +82992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 532, 547), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2703), -======= - id: DeclarationId(2710), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2711), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93597,11 +83006,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 550, 561), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2704), -======= - id: DeclarationId(2711), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2712), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93615,11 +83020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2705), -======= - id: DeclarationId(2712), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2713), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -93638,11 +83039,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2706), -======= - id: DeclarationId(2713), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2714), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93656,11 +83053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6428, 6446), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2707), -======= - id: DeclarationId(2714), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2715), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93674,11 +83067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6451, 6466), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2708), -======= - id: DeclarationId(2715), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2716), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93692,11 +83081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6495, 6518), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2709), -======= - id: DeclarationId(2716), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2717), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93710,11 +83095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6523, 6544), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2710), -======= - id: DeclarationId(2717), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2718), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93728,11 +83109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6549, 6564), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2711), -======= - id: DeclarationId(2718), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2719), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93746,11 +83123,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8177, 8187), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2712), -======= - id: DeclarationId(2719), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2720), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93764,11 +83137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8192, 8203), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2713), -======= - id: DeclarationId(2720), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2721), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93782,11 +83151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8208, 8221), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2714), -======= - id: DeclarationId(2721), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2722), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93800,11 +83165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8226, 8239), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2715), -======= - id: DeclarationId(2722), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2723), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93818,11 +83179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8244, 8257), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2716), -======= - id: DeclarationId(2723), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2724), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93836,11 +83193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8262, 8276), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2717), -======= - id: DeclarationId(2724), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2725), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93854,11 +83207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8281, 8296), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2718), -======= - id: DeclarationId(2725), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2726), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93872,11 +83221,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9038, 9055), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2719), -======= - id: DeclarationId(2726), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2727), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93890,11 +83235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9060, 9070), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2720), -======= - id: DeclarationId(2727), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2728), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93908,56 +83249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9075, 9079), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2721), -======= - id: DeclarationId(2728), - name: None, - connective: TypeConnective::Conj { - children: vec![ - Field { - label: "target_name".to_string(), - ty: DeclarationId(230), - }, - Field { - label: "algebra".to_string(), - ty: DeclarationId(1694), - }, - Field { - label: "carrier".to_string(), - ty: DeclarationId(1696), - }, - Field { - label: "range_min_inclusive".to_string(), - ty: DeclarationId(230), - }, - Field { - label: "range_max_inclusive".to_string(), - ty: DeclarationId(230), - }, - Field { - label: "is_copy".to_string(), - ty: DeclarationId(128), - }, - Field { - label: "overflow".to_string(), - ty: DeclarationId(1697), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9857, 10429), - }); - declarations.push(Declaration { id: DeclarationId(2729), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -93971,8 +83263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "carrier".to_string(), - ty: DeclarationId(1696), -<<<<<<< HEAD + ty: DeclarationId(1697), }, Field { label: "range_min_inclusive".to_string(), @@ -93988,7 +83279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "overflow".to_string(), - ty: DeclarationId(1697), + ty: DeclarationId(1698), }, ], }, @@ -94003,7 +83294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9857, 10429), }); declarations.push(Declaration { - id: DeclarationId(2722), + id: DeclarationId(2730), name: None, connective: TypeConnective::Conj { children: vec![ @@ -94013,13 +83304,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "algebra".to_string(), - ty: DeclarationId(1695), -======= ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(1696), }, Field { label: "carrier".to_string(), - ty: DeclarationId(1696), + ty: DeclarationId(1697), }, Field { label: "is_copy".to_string(), @@ -94038,21 +83327,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10434, 10616), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2723), -======= - id: DeclarationId(2730), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2731), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1698), + value: DeclarationId(1699), }], }, type_params: vec![], @@ -94066,11 +83347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10965, 10984), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2724), -======= - id: DeclarationId(2731), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2732), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94084,11 +83361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4233, 4241), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2725), -======= - id: DeclarationId(2732), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2733), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -94107,11 +83380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4246, 4277), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2726), -======= - id: DeclarationId(2733), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2734), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -94131,20 +83400,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4299, 4319), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2727), -======= - id: DeclarationId(2734), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2735), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "values".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2726), -======= - ty: DeclarationId(2733), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2734), }], }, type_params: vec![], @@ -94158,11 +83419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4282, 4321), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2728), -======= - id: DeclarationId(2735), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2736), name: None, connective: TypeConnective::Conj { children: vec![ @@ -94187,11 +83444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4326, 4379), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2729), -======= - id: DeclarationId(2736), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2737), name: None, connective: TypeConnective::Conj { children: vec![ @@ -94216,11 +83469,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4384, 4433), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2730), -======= - id: DeclarationId(2737), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2738), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94234,11 +83483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 847, 851), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2731), -======= - id: DeclarationId(2738), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2739), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94252,11 +83497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 854, 857), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2732), -======= - id: DeclarationId(2739), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2740), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94270,21 +83511,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 860, 872), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2733), -======= - id: DeclarationId(2740), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2741), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1710), + value: DeclarationId(1711), }], }, type_params: vec![], @@ -94298,11 +83531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1242, 1259), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2734), -======= - id: DeclarationId(2741), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2742), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -94321,11 +83550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2735), -======= - id: DeclarationId(2742), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2743), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94339,11 +83564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1309, 1318), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2736), -======= - id: DeclarationId(2743), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2744), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94357,11 +83578,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1323, 1332), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2737), -======= - id: DeclarationId(2744), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2745), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94375,11 +83592,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1337, 1350), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2738), -======= - id: DeclarationId(2745), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2746), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94393,11 +83606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1355, 1367), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2739), -======= - id: DeclarationId(2746), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2747), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94411,11 +83620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1372, 1385), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2740), -======= - id: DeclarationId(2747), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2748), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -94434,11 +83639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2741), -======= - id: DeclarationId(2748), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2749), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94452,11 +83653,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1677, 1685), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2742), -======= - id: DeclarationId(2749), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2750), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94470,11 +83667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1688, 1697), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2743), -======= - id: DeclarationId(2750), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2751), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94488,21 +83681,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1700, 1709), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2744), -======= - id: DeclarationId(2751), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2752), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1719), + value: DeclarationId(1720), }], }, type_params: vec![], @@ -94516,21 +83701,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 829, 850), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2745), -======= - id: DeclarationId(2752), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2753), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1725), + value: DeclarationId(1726), }], }, type_params: vec![], @@ -94544,11 +83721,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 859, 868), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2746), -======= - id: DeclarationId(2753), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2754), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -94574,15 +83747,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 876, 895), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2747), -======= - id: DeclarationId(2754), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2755), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1717), + DeclarationId(1718), CardinalityBound::AtMostOne, ), ), @@ -94597,11 +83766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2748), -======= - id: DeclarationId(2755), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2756), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94615,11 +83780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1102, 1110), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2749), -======= - id: DeclarationId(2756), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2757), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94633,11 +83794,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1113, 1122), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2750), -======= - id: DeclarationId(2757), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2758), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94651,11 +83808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1125, 1133), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2751), -======= - id: DeclarationId(2758), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2759), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -94675,11 +83828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1291, 1303), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2752), -======= - id: DeclarationId(2759), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2760), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -94699,29 +83848,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1312, 1324), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2753), -======= - id: DeclarationId(2760), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2761), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "branches".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2751), - }, - Field { - label: "paths".to_string(), - ty: DeclarationId(2752), -======= - ty: DeclarationId(2758), + ty: DeclarationId(2759), }, Field { label: "paths".to_string(), - ty: DeclarationId(2759), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2760), }, ], }, @@ -94736,11 +83873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1274, 1326), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2754), -======= - id: DeclarationId(2761), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2762), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -94760,21 +83893,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1355, 1367), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2755), -======= - id: DeclarationId(2762), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2763), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1720), + value: DeclarationId(1721), }], }, type_params: vec![], @@ -94788,29 +83913,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1376, 1401), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2756), -======= - id: DeclarationId(2763), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2764), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "branches".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2754), - }, - Field { - label: "types".to_string(), - ty: DeclarationId(2755), -======= - ty: DeclarationId(2761), + ty: DeclarationId(2762), }, Field { label: "types".to_string(), - ty: DeclarationId(2762), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2763), }, ], }, @@ -94825,16 +83938,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1331, 1403), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2757), -======= - id: DeclarationId(2764), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2765), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "cron".to_string(), - ty: DeclarationId(1701), + ty: DeclarationId(1702), }], }, type_params: vec![], @@ -94848,21 +83957,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1408, 1439), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2758), -======= - id: DeclarationId(2765), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2766), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1721), + value: DeclarationId(1722), }], }, type_params: vec![], @@ -94876,20 +83977,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1471, 1490), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2759), -======= - id: DeclarationId(2766), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2767), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "inputs".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2758), -======= - ty: DeclarationId(2765), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2766), }], }, type_params: vec![], @@ -94903,21 +83996,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1444, 1492), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2760), -======= - id: DeclarationId(2767), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2768), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1721), + value: DeclarationId(1722), }], }, type_params: vec![], @@ -94931,20 +84016,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1520, 1539), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2761), -======= - id: DeclarationId(2768), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2769), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "inputs".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2760), -======= - ty: DeclarationId(2767), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2768), }], }, type_params: vec![], @@ -94958,11 +84035,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1497, 1541), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2762), -======= - id: DeclarationId(2769), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2770), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94976,11 +84049,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1572, 1578), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2763), -======= - id: DeclarationId(2770), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2771), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94994,11 +84063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1583, 1594), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2764), -======= - id: DeclarationId(2771), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2772), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95012,11 +84077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1599, 1607), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2765), -======= - id: DeclarationId(2772), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2773), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95030,30 +84091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1612, 1618), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2766), -======= - id: DeclarationId(2773), - name: None, - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(230), - CardinalityBound::AtMostOne, - ), - ), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), - }); - declarations.push(Declaration { id: DeclarationId(2774), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -95189,7 +84227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 3827, 3840), }); declarations.push(Declaration { - id: DeclarationId(2775), + id: DeclarationId(2783), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -95208,21 +84246,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2776), -======= - id: DeclarationId(2783), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2784), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1729), + value: DeclarationId(1730), }], }, type_params: vec![], @@ -95236,11 +84266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4392, 4402), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2777), -======= - id: DeclarationId(2784), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2785), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -95260,11 +84286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4412, 4424), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2778), -======= - id: DeclarationId(2785), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2786), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -95290,11 +84312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4432, 4451), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2779), -======= - id: DeclarationId(2786), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2787), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -95313,15 +84331,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2780), -======= - id: DeclarationId(2787), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2788), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1745), + DeclarationId(1746), CardinalityBound::AtMostOne, ), ), @@ -95336,11 +84350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2781), -======= - id: DeclarationId(2788), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2789), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -95359,15 +84369,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2782), -======= - id: DeclarationId(2789), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2790), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1726), + DeclarationId(1727), CardinalityBound::AtMostOne, ), ), @@ -95382,16 +84388,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2783), -======= - id: DeclarationId(2790), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2791), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "label".to_string(), - ty: DeclarationId(1728), + ty: DeclarationId(1729), }], }, type_params: vec![], @@ -95405,11 +84407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4792, 4827), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2784), -======= - id: DeclarationId(2791), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2792), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -95429,20 +84427,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4853, 4865), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2785), -======= - id: DeclarationId(2792), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2793), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "labels".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2784), -======= - ty: DeclarationId(2791), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2792), }], }, type_params: vec![], @@ -95456,11 +84446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4832, 4867), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2786), -======= - id: DeclarationId(2793), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2794), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95474,11 +84460,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4890, 4902), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2787), -======= - id: DeclarationId(2794), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2795), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95492,11 +84474,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4907, 4917), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2788), -======= - id: DeclarationId(2795), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2796), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95510,11 +84488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4922, 4932), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2789), -======= - id: DeclarationId(2796), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2797), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95528,11 +84502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4937, 4948), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2790), -======= - id: DeclarationId(2797), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2798), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95546,11 +84516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4953, 4960), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2791), -======= - id: DeclarationId(2798), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2799), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95564,11 +84530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4965, 4978), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2792), -======= - id: DeclarationId(2799), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2800), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -95587,11 +84549,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2793), -======= - id: DeclarationId(2800), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2801), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -95617,11 +84575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5222, 5241), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2794), -======= - id: DeclarationId(2801), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2802), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -95640,11 +84594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2795), -======= - id: DeclarationId(2802), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2803), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -95663,11 +84613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2796), -======= - id: DeclarationId(2803), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2804), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -95686,21 +84632,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2797), -======= - id: DeclarationId(2804), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2805), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "name".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2792), -======= - ty: DeclarationId(2799), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2800), }, Field { label: "run".to_string(), @@ -95708,31 +84646,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "shell".to_string(), - ty: DeclarationId(1730), + ty: DeclarationId(1731), }, Field { label: "env".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2793), - }, - Field { - label: "working_directory".to_string(), - ty: DeclarationId(2794), -======= - ty: DeclarationId(2800), - }, - Field { - label: "working_directory".to_string(), ty: DeclarationId(2801), }, Field { - label: "if_condition".to_string(), + label: "working_directory".to_string(), ty: DeclarationId(2802), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "if_condition".to_string(), - ty: DeclarationId(2795), + ty: DeclarationId(2803), }, Field { label: "continue_on_error".to_string(), @@ -95740,11 +84666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "timeout_minutes".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2796), -======= - ty: DeclarationId(2803), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2804), }, ], }, @@ -95759,11 +84681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5137, 5370), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2798), -======= - id: DeclarationId(2805), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2806), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -95782,37 +84700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2799), -======= - id: DeclarationId(2806), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(137), - arguments: vec![ - TemplateArgument { - parameter: DeclarationId(138), - value: DeclarationId(230), - }, - TemplateArgument { - parameter: DeclarationId(139), - value: DeclarationId(230), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5442, 5461), - }); - declarations.push(Declaration { id: DeclarationId(2807), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -95864,7 +84752,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5474, 5493), }); declarations.push(Declaration { - id: DeclarationId(2801), + id: DeclarationId(2809), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -95883,11 +84771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2802), -======= - id: DeclarationId(2809), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2810), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -95906,53 +84790,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2803), -======= - id: DeclarationId(2810), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2811), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "name".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2798), - }, - Field { - label: "uses".to_string(), - ty: DeclarationId(1731), - }, - Field { - label: "with".to_string(), - ty: DeclarationId(2799), - }, - Field { - label: "env".to_string(), - ty: DeclarationId(2800), -======= - ty: DeclarationId(2805), + ty: DeclarationId(2806), }, Field { label: "uses".to_string(), - ty: DeclarationId(1731), + ty: DeclarationId(1732), }, Field { label: "with".to_string(), - ty: DeclarationId(2806), - }, - Field { - label: "env".to_string(), ty: DeclarationId(2807), }, Field { - label: "if_condition".to_string(), + label: "env".to_string(), ty: DeclarationId(2808), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "if_condition".to_string(), - ty: DeclarationId(2801), + ty: DeclarationId(2809), }, Field { label: "continue_on_error".to_string(), @@ -95960,11 +84820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "timeout_minutes".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2802), -======= - ty: DeclarationId(2809), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2810), }, ], }, @@ -95979,11 +84835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5375, 5588), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2804), -======= - id: DeclarationId(2811), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2812), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95997,11 +84849,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5607, 5611), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2805), -======= - id: DeclarationId(2812), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2813), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -96015,11 +84863,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5614, 5616), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2806), -======= - id: DeclarationId(2813), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2814), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -96033,11 +84877,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5619, 5623), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2807), -======= - id: DeclarationId(2814), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2815), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -96051,11 +84891,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5626, 5632), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2808), -======= - id: DeclarationId(2815), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2816), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -96069,191 +84905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5635, 5638), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2809), - name: None, - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(230), - CardinalityBound::AtMostOne, - ), - ), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), - }); - declarations.push(Declaration { - id: DeclarationId(2810), - name: None, - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(93), - CardinalityBound::AtMostOne, - ), - ), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), - }); - declarations.push(Declaration { - id: DeclarationId(2811), - name: None, - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(93), - CardinalityBound::AtMostOne, - ), - ), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6027, 6031), - }); - declarations.push(Declaration { - id: DeclarationId(2812), - name: None, - connective: TypeConnective::Conj { - children: vec![ - Field { - label: "message".to_string(), - ty: DeclarationId(230), - }, - Field { - label: "file".to_string(), - ty: DeclarationId(2809), - }, - Field { - label: "line".to_string(), - ty: DeclarationId(2810), - }, - Field { - label: "col".to_string(), - ty: DeclarationId(2811), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5960, 6033), - }); - declarations.push(Declaration { - id: DeclarationId(2813), - name: None, - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(230), - CardinalityBound::AtMostOne, - ), - ), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), - }); - declarations.push(Declaration { - id: DeclarationId(2814), - name: None, - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(93), - CardinalityBound::AtMostOne, - ), - ), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), - }); - declarations.push(Declaration { - id: DeclarationId(2815), - name: None, - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(93), - CardinalityBound::AtMostOne, - ), - ), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), - }); - declarations.push(Declaration { - id: DeclarationId(2816), - name: None, - connective: TypeConnective::Conj { - children: vec![ - Field { - label: "message".to_string(), - ty: DeclarationId(230), - }, - Field { - label: "file".to_string(), - ty: DeclarationId(2813), - }, - Field { - label: "line".to_string(), - ty: DeclarationId(2814), - }, - Field { - label: "col".to_string(), - ty: DeclarationId(2815), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6038, 6113), - }); - declarations.push(Declaration { id: DeclarationId(2817), -======= - id: DeclarationId(2816), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -96362,7 +85014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), }); declarations.push(Declaration { - id: DeclarationId(2821), + id: DeclarationId(2822), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -96381,7 +85033,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), }); declarations.push(Declaration { - id: DeclarationId(2822), + id: DeclarationId(2823), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -96400,7 +85052,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), }); declarations.push(Declaration { - id: DeclarationId(2823), + id: DeclarationId(2824), name: None, connective: TypeConnective::Conj { children: vec![ @@ -96410,15 +85062,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "file".to_string(), - ty: DeclarationId(2820), + ty: DeclarationId(2821), }, Field { label: "line".to_string(), - ty: DeclarationId(2821), + ty: DeclarationId(2822), }, Field { label: "col".to_string(), - ty: DeclarationId(2822), + ty: DeclarationId(2823), }, ], }, @@ -96433,7 +85085,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6038, 6113), }); declarations.push(Declaration { - id: DeclarationId(2824), + id: DeclarationId(2825), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -96451,25 +85103,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), }); - declarations.push(Declaration { - id: DeclarationId(2825), - name: None, - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(93), - CardinalityBound::AtMostOne, - ), - ), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6175, 6179), - }); declarations.push(Declaration { id: DeclarationId(2826), name: None, @@ -96487,159 +85120,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6186, 6190), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6175, 6179), }); declarations.push(Declaration { id: DeclarationId(2827), - name: None, - connective: TypeConnective::Conj { - children: vec![ - Field { - label: "message".to_string(), - ty: DeclarationId(230), - }, - Field { - label: "file".to_string(), - ty: DeclarationId(2824), - }, - Field { - label: "line".to_string(), - ty: DeclarationId(2825), - }, - Field { - label: "col".to_string(), - ty: DeclarationId(2826), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6118, 6192), - }); - declarations.push(Declaration { - id: DeclarationId(2828), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "title".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6197, 6230), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2822), -======= - id: DeclarationId(2829), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6235, 6253), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2823), -======= - id: DeclarationId(2830), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![ - Field { - label: "name".to_string(), - ty: DeclarationId(230), - }, - Field { - label: "value".to_string(), - ty: DeclarationId(230), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6258, 6299), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2824), -======= - id: DeclarationId(2831), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "value".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6304, 6329), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2825), -======= - id: DeclarationId(2832), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "token".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6334, 6364), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2826), -======= - id: DeclarationId(2833), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -96655,4417 +85139,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7170, 7174), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2827), -======= - id: DeclarationId(2834), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![ - Field { - label: "name".to_string(), - ty: DeclarationId(230), - }, - Field { - label: "path".to_string(), - ty: DeclarationId(230), - }, - Field { - label: "retention_days".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2826), -======= - ty: DeclarationId(2833), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - Field { - label: "if_no_files_found".to_string(), - ty: DeclarationId(1742), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7117, 7217), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6186, 6190), }); declarations.push(Declaration { -<<<<<<< HEAD id: DeclarationId(2828), -======= - id: DeclarationId(2835), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(230), - CardinalityBound::AtMostOne, - ), - ), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7253, 7260), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2829), -======= - id: DeclarationId(2836), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ Field { - label: "name".to_string(), - ty: DeclarationId(230), - }, - Field { - label: "path".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2828), -======= - ty: DeclarationId(2835), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7222, 7262), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2830), -======= - id: DeclarationId(2837), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7292, 7296), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2831), -======= - id: DeclarationId(2838), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7299, 7307), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2832), -======= - id: DeclarationId(2839), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7310, 7316), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2833), -======= - id: DeclarationId(2840), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(686), - arguments: vec![TemplateArgument { - parameter: DeclarationId(687), - value: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7778, 7790), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2834), -======= - id: DeclarationId(2841), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(137), - arguments: vec![ - TemplateArgument { - parameter: DeclarationId(138), - value: DeclarationId(230), - }, - TemplateArgument { - parameter: DeclarationId(139), -<<<<<<< HEAD - value: DeclarationId(2833), -======= - value: DeclarationId(2840), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7766, 7791), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2835), -======= - id: DeclarationId(2842), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(137), - arguments: vec![ - TemplateArgument { - parameter: DeclarationId(138), - value: DeclarationId(230), - }, - TemplateArgument { - parameter: DeclarationId(139), - value: DeclarationId(230), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7808, 7827), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2836), -======= - id: DeclarationId(2843), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(686), - arguments: vec![TemplateArgument { -<<<<<<< HEAD - parameter: DeclarationId(687), - value: DeclarationId(2835), -======= - parameter: DeclarationId(686), - value: DeclarationId(2842), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7803, 7828), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2837), -======= - id: DeclarationId(2844), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(137), - arguments: vec![ - TemplateArgument { - parameter: DeclarationId(138), - value: DeclarationId(230), - }, - TemplateArgument { - parameter: DeclarationId(139), - value: DeclarationId(230), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7845, 7864), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2838), -======= - id: DeclarationId(2845), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(686), - arguments: vec![TemplateArgument { -<<<<<<< HEAD - parameter: DeclarationId(687), - value: DeclarationId(2837), -======= - parameter: DeclarationId(686), - value: DeclarationId(2844), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7840, 7865), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2839), -======= - id: DeclarationId(2846), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(93), - CardinalityBound::AtMostOne, - ), - ), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7900, 7904), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2840), -======= - id: DeclarationId(2847), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8060, 8067), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2841), -======= - id: DeclarationId(2848), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8072, 8079), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2842), -======= - id: DeclarationId(2849), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8084, 8093), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2843), -======= - id: DeclarationId(2850), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8098, 8105), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2844), -======= - id: DeclarationId(2851), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8110, 8118), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2845), -======= - id: DeclarationId(2852), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8123, 8137), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2846), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(48), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), - }); - declarations.push(Declaration { - id: DeclarationId(2847), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), - }); - declarations.push(Declaration { - id: DeclarationId(2848), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2846), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2847), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), - }); - declarations.push(Declaration { - id: DeclarationId(2849), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(48), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), - }); - declarations.push(Declaration { - id: DeclarationId(2850), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), - }); - declarations.push(Declaration { - id: DeclarationId(2851), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2849), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2850), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), - }); - declarations.push(Declaration { - id: DeclarationId(2852), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(51), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), - }); - declarations.push(Declaration { - id: DeclarationId(2853), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), - }); - declarations.push(Declaration { - id: DeclarationId(2854), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2852), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2853), - }, - ], -======= - id: DeclarationId(2853), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(48), - }], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), - }); - declarations.push(Declaration { - id: DeclarationId(2855), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), - }); - declarations.push(Declaration { - id: DeclarationId(2855), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2853), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2854), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), - }); - declarations.push(Declaration { - id: DeclarationId(2856), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(48), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), - }); - declarations.push(Declaration { - id: DeclarationId(2857), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), - }); - declarations.push(Declaration { - id: DeclarationId(2858), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2856), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2857), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), - }); - declarations.push(Declaration { - id: DeclarationId(2859), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(51), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), - }); - declarations.push(Declaration { - id: DeclarationId(2860), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), - }); - declarations.push(Declaration { - id: DeclarationId(2861), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2859), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2860), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), - }); - declarations.push(Declaration { - id: DeclarationId(2862), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(51), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2856), -======= - id: DeclarationId(2863), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2857), -======= - id: DeclarationId(2864), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2855), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2856), -======= - ty: DeclarationId(2862), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2863), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2858), -======= - id: DeclarationId(2865), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(56), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2859), -======= - id: DeclarationId(2866), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2860), -======= - id: DeclarationId(2867), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2858), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2859), -======= - ty: DeclarationId(2865), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2866), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2861), -======= - id: DeclarationId(2868), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(57), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2862), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), - }); - declarations.push(Declaration { - id: DeclarationId(2863), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2861), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2862), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), - }); - declarations.push(Declaration { - id: DeclarationId(2864), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(93), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), - }); - declarations.push(Declaration { - id: DeclarationId(2865), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), - }); - declarations.push(Declaration { - id: DeclarationId(2866), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2864), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2865), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), - }); - declarations.push(Declaration { - id: DeclarationId(2867), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(93), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), - }); - declarations.push(Declaration { - id: DeclarationId(2868), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), - }); - declarations.push(Declaration { - id: DeclarationId(2869), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2867), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2868), - }, - ], - }, -======= - id: DeclarationId(2869), - name: None, - connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), -======= - span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }); - declarations.push(Declaration { - id: DeclarationId(2870), - name: None, -<<<<<<< HEAD -======= - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2868), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2869), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), - }); - declarations.push(Declaration { - id: DeclarationId(2871), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(93), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), - }); - declarations.push(Declaration { - id: DeclarationId(2872), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), - }); - declarations.push(Declaration { - id: DeclarationId(2873), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2871), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2872), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), - }); - declarations.push(Declaration { - id: DeclarationId(2874), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(93), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), - }); - declarations.push(Declaration { - id: DeclarationId(2875), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), - }); - declarations.push(Declaration { - id: DeclarationId(2876), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2874), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2875), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), - }); - declarations.push(Declaration { - id: DeclarationId(2877), - name: None, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, -<<<<<<< HEAD -======= - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), - }); - declarations.push(Declaration { - id: DeclarationId(2878), - name: None, - connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), - }); - declarations.push(Declaration { - id: DeclarationId(2879), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), - }); - declarations.push(Declaration { - id: DeclarationId(2872), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2870), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2871), -======= - ty: DeclarationId(2877), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2878), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2873), -======= - id: DeclarationId(2880), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2874), -======= - id: DeclarationId(2881), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2875), -======= - id: DeclarationId(2882), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2873), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2874), -======= - ty: DeclarationId(2880), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2881), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2876), -======= - id: DeclarationId(2883), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(180), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 16948, 16968), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2877), -======= - id: DeclarationId(2884), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 16948, 16968), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2878), -======= - id: DeclarationId(2885), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2876), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2877), -======= - ty: DeclarationId(2883), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2884), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 16948, 16968), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2879), -======= - id: DeclarationId(2886), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(189), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 17604, 17611), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2880), -======= - id: DeclarationId(2887), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 17604, 17611), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2881), -======= - id: DeclarationId(2888), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2879), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2880), -======= - ty: DeclarationId(2886), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2887), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 17604, 17611), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2882), -======= - id: DeclarationId(2889), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(160), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21364, 21374), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2883), -======= - id: DeclarationId(2890), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21364, 21374), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2884), -======= - id: DeclarationId(2891), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2882), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2883), -======= - ty: DeclarationId(2889), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2890), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21364, 21374), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2885), -======= - id: DeclarationId(2892), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21499, 21506), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2886), -======= - id: DeclarationId(2893), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21499, 21506), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2887), -======= - id: DeclarationId(2894), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2885), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2886), -======= - ty: DeclarationId(2892), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2893), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21499, 21506), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2888), -======= - id: DeclarationId(2895), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(93), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2889), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), - }); - declarations.push(Declaration { - id: DeclarationId(2890), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2888), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2889), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), - }); - declarations.push(Declaration { - id: DeclarationId(2891), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), - }); - declarations.push(Declaration { - id: DeclarationId(2892), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), - }); - declarations.push(Declaration { - id: DeclarationId(2893), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2891), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2892), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), - }); - declarations.push(Declaration { - id: DeclarationId(2894), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), - }); - declarations.push(Declaration { - id: DeclarationId(2895), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), - }); - declarations.push(Declaration { - id: DeclarationId(2896), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2894), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2895), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), - }); - declarations.push(Declaration { - id: DeclarationId(2897), -======= - id: DeclarationId(2896), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), - }); - declarations.push(Declaration { - id: DeclarationId(2898), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2895), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2896), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), - }); - declarations.push(Declaration { - id: DeclarationId(2898), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), - }); - declarations.push(Declaration { - id: DeclarationId(2899), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), - }); - declarations.push(Declaration { - id: DeclarationId(2900), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2898), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2899), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), - }); - declarations.push(Declaration { - id: DeclarationId(2901), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), - }); - declarations.push(Declaration { - id: DeclarationId(2902), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), - }); - declarations.push(Declaration { - id: DeclarationId(2903), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2901), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2902), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), - }); - declarations.push(Declaration { - id: DeclarationId(2904), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23950, 23957), - }); - declarations.push(Declaration { - id: DeclarationId(2905), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23950, 23957), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2899), -======= - id: DeclarationId(2906), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2897), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2898), -======= - ty: DeclarationId(2904), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2905), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23950, 23957), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2900), -======= - id: DeclarationId(2907), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(225), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24180, 24195), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2901), -======= - id: DeclarationId(2908), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24180, 24195), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2902), -======= - id: DeclarationId(2909), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2900), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2901), -======= - ty: DeclarationId(2907), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2908), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24180, 24195), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2903), -======= - id: DeclarationId(2910), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(191), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24206, 24219), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2904), -======= - id: DeclarationId(2911), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24206, 24219), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2905), -======= - id: DeclarationId(2912), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2903), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2904), -======= - ty: DeclarationId(2910), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2911), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24206, 24219), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2906), -======= - id: DeclarationId(2913), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(190), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2907), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), - }); - declarations.push(Declaration { - id: DeclarationId(2908), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2906), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2907), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), - }); - declarations.push(Declaration { - id: DeclarationId(2909), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), - }); - declarations.push(Declaration { - id: DeclarationId(2910), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), - }); - declarations.push(Declaration { - id: DeclarationId(2911), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2909), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2910), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), - }); - declarations.push(Declaration { - id: DeclarationId(2912), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), - }); - declarations.push(Declaration { - id: DeclarationId(2913), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), - }); - declarations.push(Declaration { - id: DeclarationId(2914), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2912), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2913), - }, - ], - }, -======= - id: DeclarationId(2914), - name: None, - connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), -======= - span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }); - declarations.push(Declaration { - id: DeclarationId(2915), - name: None, -<<<<<<< HEAD -======= - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2913), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2914), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), - }); - declarations.push(Declaration { - id: DeclarationId(2916), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), - }); - declarations.push(Declaration { - id: DeclarationId(2917), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), - }); - declarations.push(Declaration { - id: DeclarationId(2918), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2916), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2917), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), - }); - declarations.push(Declaration { - id: DeclarationId(2919), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), - }); - declarations.push(Declaration { - id: DeclarationId(2920), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), - }); - declarations.push(Declaration { - id: DeclarationId(2921), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2919), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2920), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), - }); - declarations.push(Declaration { - id: DeclarationId(2922), - name: None, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(1791), - }], - }, -<<<<<<< HEAD -======= - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), - }); - declarations.push(Declaration { - id: DeclarationId(2923), - name: None, - connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), - }); - declarations.push(Declaration { - id: DeclarationId(2924), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), - }); - declarations.push(Declaration { - id: DeclarationId(2917), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2915), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2916), -======= - ty: DeclarationId(2922), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2923), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2918), -======= - id: DeclarationId(2925), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(1794), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2919), -======= - id: DeclarationId(2926), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2920), -======= - id: DeclarationId(2927), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2918), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2919), -======= - ty: DeclarationId(2925), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2926), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2921), -======= - id: DeclarationId(2928), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(198), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2922), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), - }); - declarations.push(Declaration { - id: DeclarationId(2923), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2921), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2922), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), - }); - declarations.push(Declaration { - id: DeclarationId(2924), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), - }); - declarations.push(Declaration { - id: DeclarationId(2925), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), - }); - declarations.push(Declaration { - id: DeclarationId(2926), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2924), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2925), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), - }); - declarations.push(Declaration { - id: DeclarationId(2927), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), - }); - declarations.push(Declaration { - id: DeclarationId(2928), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), - }); - declarations.push(Declaration { - id: DeclarationId(2929), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2927), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2928), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), - }); - declarations.push(Declaration { - id: DeclarationId(2930), -======= - id: DeclarationId(2929), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), - }); - declarations.push(Declaration { - id: DeclarationId(2930), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2928), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2929), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), - }); - declarations.push(Declaration { - id: DeclarationId(2931), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), - }); - declarations.push(Declaration { - id: DeclarationId(2932), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), - }); - declarations.push(Declaration { - id: DeclarationId(2933), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2931), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2932), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), - }); - declarations.push(Declaration { - id: DeclarationId(2934), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), - }); - declarations.push(Declaration { - id: DeclarationId(2935), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), - }); - declarations.push(Declaration { - id: DeclarationId(2936), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2934), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2935), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), - }); - declarations.push(Declaration { - id: DeclarationId(2937), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(781), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2931), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), - }); - declarations.push(Declaration { - id: DeclarationId(2932), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2930), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2931), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), - }); - declarations.push(Declaration { - id: DeclarationId(2933), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(827), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), - }); - declarations.push(Declaration { - id: DeclarationId(2934), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), - }); - declarations.push(Declaration { - id: DeclarationId(2935), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2933), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2934), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), - }); - declarations.push(Declaration { - id: DeclarationId(2936), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(827), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), - }); - declarations.push(Declaration { - id: DeclarationId(2937), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), - }); - declarations.push(Declaration { - id: DeclarationId(2938), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2936), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2937), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), - }); - declarations.push(Declaration { - id: DeclarationId(2939), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(799), - }], - }, -======= - id: DeclarationId(2938), - name: None, - connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2940), -======= - id: DeclarationId(2939), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2937), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2938), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), - }); - declarations.push(Declaration { - id: DeclarationId(2940), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(826), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), - }); - declarations.push(Declaration { - id: DeclarationId(2941), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), - }); - declarations.push(Declaration { - id: DeclarationId(2942), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2940), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2941), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), - }); - declarations.push(Declaration { - id: DeclarationId(2943), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(826), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), - }); - declarations.push(Declaration { - id: DeclarationId(2944), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), - }); - declarations.push(Declaration { - id: DeclarationId(2945), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2943), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2944), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), - }); - declarations.push(Declaration { - id: DeclarationId(2946), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(798), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), - }); - declarations.push(Declaration { - id: DeclarationId(2947), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), - }); - declarations.push(Declaration { - id: DeclarationId(2948), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), - }); - declarations.push(Declaration { - id: DeclarationId(2941), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2939), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2940), -======= - ty: DeclarationId(2946), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2947), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2942), -======= - id: DeclarationId(2949), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(799), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2943), -======= - id: DeclarationId(2950), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), - }); - declarations.push(Declaration { - id: DeclarationId(2951), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), - }); - declarations.push(Declaration { - id: DeclarationId(2944), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2942), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2943), -======= - ty: DeclarationId(2949), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2950), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2945), -======= - id: DeclarationId(2952), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(755), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2946), -======= - id: DeclarationId(2953), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), - }); - declarations.push(Declaration { - id: DeclarationId(2954), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), - }); - declarations.push(Declaration { - id: DeclarationId(2947), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2945), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2946), -======= - ty: DeclarationId(2952), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2953), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2948), -======= - id: DeclarationId(2955), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(722), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2949), -======= - id: DeclarationId(2956), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2950), -======= - id: DeclarationId(2957), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2948), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2949), -======= - ty: DeclarationId(2955), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2956), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2951), -======= - id: DeclarationId(2958), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2952), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), - }); - declarations.push(Declaration { - id: DeclarationId(2953), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2951), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2952), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), - }); - declarations.push(Declaration { - id: DeclarationId(2954), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(724), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), - }); - declarations.push(Declaration { - id: DeclarationId(2955), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), - }); - declarations.push(Declaration { - id: DeclarationId(2956), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2954), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2955), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), - }); - declarations.push(Declaration { - id: DeclarationId(2957), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(724), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), - }); - declarations.push(Declaration { - id: DeclarationId(2958), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), - }); - declarations.push(Declaration { - id: DeclarationId(2959), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2957), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2958), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), - }); - declarations.push(Declaration { - id: DeclarationId(2960), -======= - id: DeclarationId(2959), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), - }); - declarations.push(Declaration { - id: DeclarationId(2960), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2958), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2959), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), - }); - declarations.push(Declaration { - id: DeclarationId(2961), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(723), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), - }); - declarations.push(Declaration { - id: DeclarationId(2962), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), - }); - declarations.push(Declaration { - id: DeclarationId(2963), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2961), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2962), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), - }); - declarations.push(Declaration { - id: DeclarationId(2964), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(723), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), - }); - declarations.push(Declaration { - id: DeclarationId(2965), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), - }); - declarations.push(Declaration { - id: DeclarationId(2966), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2964), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2965), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), - }); - declarations.push(Declaration { - id: DeclarationId(2967), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(795), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2961), -======= - id: DeclarationId(2968), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), - }); - declarations.push(Declaration { - id: DeclarationId(2969), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), - }); - declarations.push(Declaration { - id: DeclarationId(2962), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2960), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2961), -======= - ty: DeclarationId(2967), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2968), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2963), -======= - id: DeclarationId(2970), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(801), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2964), -======= - id: DeclarationId(2971), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), - }); - declarations.push(Declaration { - id: DeclarationId(2972), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), - }); - declarations.push(Declaration { - id: DeclarationId(2965), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2963), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2964), -======= - ty: DeclarationId(2970), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2971), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2966), -======= - id: DeclarationId(2973), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(809), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2967), -======= - id: DeclarationId(2974), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), - }); - declarations.push(Declaration { - id: DeclarationId(2975), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), - }); - declarations.push(Declaration { - id: DeclarationId(2968), - name: None, - connective: TypeConnective::Disj { - variants: vec![ + label: "message".to_string(), + ty: DeclarationId(230), + }, Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2966), + label: "file".to_string(), + ty: DeclarationId(2825), }, Field { - label: "None".to_string(), - ty: DeclarationId(2967), -======= - ty: DeclarationId(2973), + label: "line".to_string(), + ty: DeclarationId(2826), }, Field { - label: "None".to_string(), - ty: DeclarationId(2974), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + label: "col".to_string(), + ty: DeclarationId(2827), }, ], }, @@ -101077,19 +85172,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6118, 6192), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2969), -======= - id: DeclarationId(2976), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2829), name: None, connective: TypeConnective::Conj { children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(755), + label: "title".to_string(), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -101100,28 +85191,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2970), -======= - id: DeclarationId(2977), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6197, 6230), }); declarations.push(Declaration { - id: DeclarationId(2978), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2830), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -101132,28 +85205,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6235, 6253), }); declarations.push(Declaration { - id: DeclarationId(2971), + id: DeclarationId(2831), name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2969), - }, + connective: TypeConnective::Conj { + children: vec![ Field { - label: "None".to_string(), - ty: DeclarationId(2970), -======= - ty: DeclarationId(2976), + label: "name".to_string(), + ty: DeclarationId(230), }, Field { - label: "None".to_string(), - ty: DeclarationId(2977), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + label: "value".to_string(), + ty: DeclarationId(230), }, ], }, @@ -101165,19 +85230,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6258, 6299), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2972), -======= - id: DeclarationId(2979), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2832), name: None, connective: TypeConnective::Conj { children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(822), + label: "value".to_string(), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -101188,15 +85249,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6304, 6329), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2973), -======= - id: DeclarationId(2980), + id: DeclarationId(2833), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Conj { + children: vec![Field { + label: "token".to_string(), + ty: DeclarationId(230), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -101205,13 +85268,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6334, 6364), }); declarations.push(Declaration { - id: DeclarationId(2981), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2834), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(93), + CardinalityBound::AtMostOne, + ), + ), type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -101220,28 +85287,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7170, 7174), }); declarations.push(Declaration { - id: DeclarationId(2974), + id: DeclarationId(2835), name: None, - connective: TypeConnective::Disj { - variants: vec![ + connective: TypeConnective::Conj { + children: vec![ Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2972), + label: "name".to_string(), + ty: DeclarationId(230), }, Field { - label: "None".to_string(), - ty: DeclarationId(2973), -======= - ty: DeclarationId(2979), + label: "path".to_string(), + ty: DeclarationId(230), }, Field { - label: "None".to_string(), - ty: DeclarationId(2980), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + label: "retention_days".to_string(), + ty: DeclarationId(2834), + }, + Field { + label: "if_no_files_found".to_string(), + ty: DeclarationId(1743), }, ], }, @@ -101253,21 +85320,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7117, 7217), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2975), -======= - id: DeclarationId(2982), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2836), name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(755), - }], - }, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(230), + CardinalityBound::AtMostOne, + ), + ), type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -101276,15 +85339,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7253, 7260), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2976), -======= - id: DeclarationId(2983), + id: DeclarationId(2837), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Conj { + children: vec![ + Field { + label: "name".to_string(), + ty: DeclarationId(230), + }, + Field { + label: "path".to_string(), + ty: DeclarationId(2836), + }, + ], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -101293,11 +85364,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7222, 7262), }); declarations.push(Declaration { - id: DeclarationId(2984), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2838), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -101308,31 +85378,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7292, 7296), }); declarations.push(Declaration { - id: DeclarationId(2977), + id: DeclarationId(2839), name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2975), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2976), -======= - ty: DeclarationId(2982), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2983), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, + connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -101341,21 +85392,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7299, 7307), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2978), -======= - id: DeclarationId(2985), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2840), name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(825), - }], - }, + connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -101364,15 +85406,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7310, 7316), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2979), -======= - id: DeclarationId(2986), + id: DeclarationId(2841), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Instantiation { + template: DeclarationId(686), + arguments: vec![TemplateArgument { + parameter: DeclarationId(687), + value: DeclarationId(230), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -101381,13 +85426,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7778, 7790), }); declarations.push(Declaration { - id: DeclarationId(2987), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2842), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Instantiation { + template: DeclarationId(137), + arguments: vec![ + TemplateArgument { + parameter: DeclarationId(138), + value: DeclarationId(230), + }, + TemplateArgument { + parameter: DeclarationId(139), + value: DeclarationId(2841), + }, + ], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -101396,28 +85452,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7766, 7791), }); declarations.push(Declaration { - id: DeclarationId(2980), + id: DeclarationId(2843), name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2978), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2979), -======= - ty: DeclarationId(2985), + connective: TypeConnective::Instantiation { + template: DeclarationId(137), + arguments: vec![ + TemplateArgument { + parameter: DeclarationId(138), + value: DeclarationId(230), }, - Field { - label: "None".to_string(), - ty: DeclarationId(2986), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + TemplateArgument { + parameter: DeclarationId(139), + value: DeclarationId(230), }, ], }, @@ -101429,19 +85478,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7808, 7827), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2981), - name: None, -======= - id: DeclarationId(2988), + id: DeclarationId(2844), name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(841), + connective: TypeConnective::Instantiation { + template: DeclarationId(686), + arguments: vec![TemplateArgument { + parameter: DeclarationId(687), + value: DeclarationId(2843), }], }, type_params: vec![], @@ -101452,12 +85498,24 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7803, 7828), }); declarations.push(Declaration { - id: DeclarationId(2989), + id: DeclarationId(2845), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Instantiation { + template: DeclarationId(137), + arguments: vec![ + TemplateArgument { + parameter: DeclarationId(138), + value: DeclarationId(230), + }, + TemplateArgument { + parameter: DeclarationId(139), + value: DeclarationId(230), + }, + ], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -101466,22 +85524,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7845, 7864), }); declarations.push(Declaration { - id: DeclarationId(2990), + id: DeclarationId(2846), name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2988), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2989), - }, - ], + connective: TypeConnective::Instantiation { + template: DeclarationId(686), + arguments: vec![TemplateArgument { + parameter: DeclarationId(687), + value: DeclarationId(2845), + }], }, type_params: vec![], phantom_params: Vec::new(), @@ -101491,18 +85544,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7840, 7865), }); declarations.push(Declaration { - id: DeclarationId(2991), + id: DeclarationId(2847), name: None, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(842), - }], - }, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(93), + CardinalityBound::AtMostOne, + ), + ), type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -101511,10 +85563,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7900, 7904), }); declarations.push(Declaration { - id: DeclarationId(2982), + id: DeclarationId(2848), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -101525,23 +85577,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8060, 8067), }); declarations.push(Declaration { - id: DeclarationId(2983), + id: DeclarationId(2849), name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2981), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2982), - }, - ], - }, + connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -101550,17 +85591,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8072, 8079), }); declarations.push(Declaration { - id: DeclarationId(2992), + id: DeclarationId(2850), name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(843), - }], - }, + connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -101569,10 +85605,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8084, 8093), }); declarations.push(Declaration { - id: DeclarationId(2993), + id: DeclarationId(2851), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -101583,31 +85619,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8098, 8105), }); declarations.push(Declaration { - id: DeclarationId(2986), + id: DeclarationId(2852), name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2984), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2985), -======= - ty: DeclarationId(2991), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2992), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, + connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -101616,19 +85633,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8110, 8118), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2987), -======= - id: DeclarationId(2994), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2853), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8123, 8137), + }); + declarations.push(Declaration { + id: DeclarationId(2854), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(48), }], }, type_params: vec![], @@ -101639,14 +85666,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), + span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2988), -======= - id: DeclarationId(2995), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2855), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -101657,32 +85680,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), + span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2989), -======= - id: DeclarationId(2996), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2856), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2987), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2988), -======= - ty: DeclarationId(2994), + ty: DeclarationId(2854), }, Field { label: "None".to_string(), - ty: DeclarationId(2995), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2855), }, ], }, @@ -101694,19 +85705,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), + span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2990), -======= - id: DeclarationId(2997), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2857), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(48), }], }, type_params: vec![], @@ -101717,14 +85724,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), + span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2991), -======= - id: DeclarationId(2998), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2858), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -101735,32 +85738,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), + span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2992), -======= - id: DeclarationId(2999), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2859), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2990), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2991), -======= - ty: DeclarationId(2997), + ty: DeclarationId(2857), }, Field { label: "None".to_string(), - ty: DeclarationId(2998), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2858), }, ], }, @@ -101772,19 +85763,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), + span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2993), -======= - id: DeclarationId(3000), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2860), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(115), + ty: DeclarationId(51), }], }, type_params: vec![], @@ -101795,14 +85782,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), + span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2994), -======= - id: DeclarationId(3001), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2861), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -101813,32 +85796,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), + span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2995), -======= - id: DeclarationId(3002), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2862), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2993), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2994), -======= - ty: DeclarationId(3000), + ty: DeclarationId(2860), }, Field { label: "None".to_string(), - ty: DeclarationId(3001), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2861), }, ], }, @@ -101850,19 +85821,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), + span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2996), -======= - id: DeclarationId(3003), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2863), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(51), }], }, type_params: vec![], @@ -101873,15 +85840,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), + span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2997), - name: None, - connective: TypeConnective::Conj { children: vec![] }, -======= - id: DeclarationId(3004), + id: DeclarationId(2864), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -101892,46 +85854,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), - }); - declarations.push(Declaration { - id: DeclarationId(3005), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(3003), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3004), - }, - ], - }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), + span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049), }); declarations.push(Declaration { - id: DeclarationId(3006), + id: DeclarationId(2865), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2996), + ty: DeclarationId(2863), }, Field { label: "None".to_string(), - ty: DeclarationId(2997), + ty: DeclarationId(2864), }, ], }, @@ -101943,15 +85879,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), + span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049), }); declarations.push(Declaration { - id: DeclarationId(2999), + id: DeclarationId(2866), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(896), + ty: DeclarationId(56), }], }, type_params: vec![], @@ -101962,14 +85898,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4680, 4707), + span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3000), -======= - id: DeclarationId(3007), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2867), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -101980,32 +85912,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4680, 4707), + span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3001), -======= - id: DeclarationId(3008), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2868), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2999), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3000), -======= - ty: DeclarationId(3006), + ty: DeclarationId(2866), }, Field { label: "None".to_string(), - ty: DeclarationId(3007), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2867), }, ], }, @@ -102017,19 +85937,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4680, 4707), + span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3002), -======= - id: DeclarationId(3009), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2869), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(128), + ty: DeclarationId(57), }], }, type_params: vec![], @@ -102040,11 +85956,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058), + span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), }); declarations.push(Declaration { - id: DeclarationId(3003), + id: DeclarationId(2870), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -102055,20 +85970,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058), + span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), }); declarations.push(Declaration { - id: DeclarationId(3004), + id: DeclarationId(2871), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3002), + ty: DeclarationId(2869), }, Field { label: "None".to_string(), - ty: DeclarationId(3003), + ty: DeclarationId(2870), }, ], }, @@ -102080,15 +85995,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058), + span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), }); declarations.push(Declaration { - id: DeclarationId(3005), + id: DeclarationId(2872), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -102099,10 +86014,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421), + span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), }); declarations.push(Declaration { - id: DeclarationId(3006), + id: DeclarationId(2873), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -102113,20 +86028,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421), + span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), }); declarations.push(Declaration { - id: DeclarationId(3007), + id: DeclarationId(2874), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3005), + ty: DeclarationId(2872), }, Field { label: "None".to_string(), - ty: DeclarationId(3006), + ty: DeclarationId(2873), }, ], }, @@ -102138,15 +86053,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421), + span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), }); declarations.push(Declaration { - id: DeclarationId(3008), + id: DeclarationId(2875), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -102157,10 +86072,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439), + span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), }); declarations.push(Declaration { - id: DeclarationId(3009), + id: DeclarationId(2876), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -102171,20 +86086,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439), + span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), }); declarations.push(Declaration { - id: DeclarationId(3010), + id: DeclarationId(2877), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3008), + ty: DeclarationId(2875), }, Field { label: "None".to_string(), - ty: DeclarationId(3009), + ty: DeclarationId(2876), }, ], }, @@ -102196,15 +86111,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439), -======= - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4724, 4729), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), }); declarations.push(Declaration { - id: DeclarationId(3011), + id: DeclarationId(2878), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -102213,11 +86130,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4724, 4729), + span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3012), + id: DeclarationId(2879), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -102228,34 +86144,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5562, 5569), + span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), }); declarations.push(Declaration { - id: DeclarationId(3013), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(3011), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3012), - }, - ], -======= - id: DeclarationId(3011), + id: DeclarationId(2880), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3009), + ty: DeclarationId(2878), }, Field { label: "None".to_string(), - ty: DeclarationId(3010), + ty: DeclarationId(2879), }, ], }, @@ -102267,17 +86169,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4724, 4729), + span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), }); declarations.push(Declaration { - id: DeclarationId(3012), + id: DeclarationId(2881), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), ty: DeclarationId(230), }], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -102287,25 +86188,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6085, 6092), - }); - declarations.push(Declaration { - id: DeclarationId(3014), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6085, 6092), + span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3015), + id: DeclarationId(2882), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -102316,34 +86202,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5580, 5587), + span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), }); declarations.push(Declaration { - id: DeclarationId(3016), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(3014), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3015), - }, - ], -======= - id: DeclarationId(3014), + id: DeclarationId(2883), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3012), + ty: DeclarationId(2881), }, Field { label: "None".to_string(), - ty: DeclarationId(3013), + ty: DeclarationId(2882), }, ], }, @@ -102355,17 +86227,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6085, 6092), + span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), }); declarations.push(Declaration { - id: DeclarationId(3015), + id: DeclarationId(2884), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(180), }], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -102375,25 +86246,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6103, 6110), - }); - declarations.push(Declaration { - id: DeclarationId(3017), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6103, 6110), + span: SourceSpan::new("dsl/std/types.dag", 16948, 16968), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3018), + id: DeclarationId(2885), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -102404,34 +86260,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5720, 5727), + span: SourceSpan::new("dsl/std/types.dag", 16948, 16968), }); declarations.push(Declaration { - id: DeclarationId(3019), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(3017), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3018), - }, - ], -======= - id: DeclarationId(3017), + id: DeclarationId(2886), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3015), + ty: DeclarationId(2884), }, Field { label: "None".to_string(), - ty: DeclarationId(3016), + ty: DeclarationId(2885), }, ], }, @@ -102443,17 +86285,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6103, 6110), + span: SourceSpan::new("dsl/std/types.dag", 16948, 16968), }); declarations.push(Declaration { - id: DeclarationId(3018), + id: DeclarationId(2887), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(189), }], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -102463,25 +86304,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6233, 6240), - }); - declarations.push(Declaration { - id: DeclarationId(3020), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6233, 6240), + span: SourceSpan::new("dsl/std/types.dag", 17604, 17611), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3021), + id: DeclarationId(2888), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -102492,34 +86318,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5738, 5745), + span: SourceSpan::new("dsl/std/types.dag", 17604, 17611), }); declarations.push(Declaration { - id: DeclarationId(3022), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(3020), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3021), - }, - ], -======= - id: DeclarationId(3020), + id: DeclarationId(2889), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3018), + ty: DeclarationId(2887), }, Field { label: "None".to_string(), - ty: DeclarationId(3019), + ty: DeclarationId(2888), }, ], }, @@ -102531,17 +86343,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6233, 6240), + span: SourceSpan::new("dsl/std/types.dag", 17604, 17611), }); declarations.push(Declaration { - id: DeclarationId(3021), + id: DeclarationId(2890), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(160), }], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -102551,25 +86362,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6251, 6258), - }); - declarations.push(Declaration { - id: DeclarationId(3023), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6251, 6258), + span: SourceSpan::new("dsl/std/types.dag", 21364, 21374), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3024), + id: DeclarationId(2891), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -102580,34 +86376,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5876, 5883), + span: SourceSpan::new("dsl/std/types.dag", 21364, 21374), }); declarations.push(Declaration { - id: DeclarationId(3025), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(3023), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3024), - }, - ], -======= - id: DeclarationId(3023), + id: DeclarationId(2892), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3021), + ty: DeclarationId(2890), }, Field { label: "None".to_string(), - ty: DeclarationId(3022), + ty: DeclarationId(2891), }, ], }, @@ -102619,17 +86401,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6251, 6258), + span: SourceSpan::new("dsl/std/types.dag", 21364, 21374), }); declarations.push(Declaration { - id: DeclarationId(3024), + id: DeclarationId(2893), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), ty: DeclarationId(230), }], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -102639,25 +86420,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6391, 6398), - }); - declarations.push(Declaration { - id: DeclarationId(3026), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6391, 6398), + span: SourceSpan::new("dsl/std/types.dag", 21499, 21506), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3027), + id: DeclarationId(2894), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -102668,34 +86434,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5969, 5976), + span: SourceSpan::new("dsl/std/types.dag", 21499, 21506), }); declarations.push(Declaration { - id: DeclarationId(3028), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(3026), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3027), - }, - ], -======= - id: DeclarationId(3026), + id: DeclarationId(2895), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3024), + ty: DeclarationId(2893), }, Field { label: "None".to_string(), - ty: DeclarationId(3025), + ty: DeclarationId(2894), }, ], }, @@ -102707,41 +86459,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6391, 6398), - }); - declarations.push(Declaration { - id: DeclarationId(3027), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6409, 6416), + span: SourceSpan::new("dsl/std/types.dag", 21499, 21506), }); declarations.push(Declaration { - id: DeclarationId(3029), + id: DeclarationId(2896), name: None, -<<<<<<< HEAD connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(2099), + ty: DeclarationId(93), }], }, -======= - connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -102750,11 +86478,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6409, 6416), + span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3030), + id: DeclarationId(2897), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -102765,34 +86492,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6674, 6709), + span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), }); declarations.push(Declaration { - id: DeclarationId(3031), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(3029), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3030), - }, - ], -======= - id: DeclarationId(3029), + id: DeclarationId(2898), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3027), + ty: DeclarationId(2896), }, Field { label: "None".to_string(), - ty: DeclarationId(3028), + ty: DeclarationId(2897), }, ], }, @@ -102804,17 +86517,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6409, 6416), + span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), }); declarations.push(Declaration { - id: DeclarationId(3030), + id: DeclarationId(2899), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), ty: DeclarationId(230), }], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -102824,25 +86536,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6547, 6554), - }); - declarations.push(Declaration { - id: DeclarationId(3032), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6547, 6554), + span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3033), + id: DeclarationId(2900), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -102853,34 +86550,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6912, 6917), + span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), }); declarations.push(Declaration { - id: DeclarationId(3034), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(3032), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3033), - }, - ], -======= - id: DeclarationId(3032), + id: DeclarationId(2901), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3030), + ty: DeclarationId(2899), }, Field { label: "None".to_string(), - ty: DeclarationId(3031), + ty: DeclarationId(2900), }, ], }, @@ -102892,17 +86575,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6547, 6554), + span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), }); declarations.push(Declaration { - id: DeclarationId(3033), + id: DeclarationId(2902), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), ty: DeclarationId(230), }], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -102912,25 +86594,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6640, 6647), - }); - declarations.push(Declaration { - id: DeclarationId(3035), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6640, 6647), + span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3036), + id: DeclarationId(2903), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -102941,34 +86608,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7017, 7022), + span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), }); declarations.push(Declaration { - id: DeclarationId(3037), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(3035), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3036), - }, - ], -======= - id: DeclarationId(3035), + id: DeclarationId(2904), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3033), + ty: DeclarationId(2902), }, Field { label: "None".to_string(), - ty: DeclarationId(3034), + ty: DeclarationId(2903), }, ], }, @@ -102980,17 +86633,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6640, 6647), + span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), }); declarations.push(Declaration { - id: DeclarationId(3036), + id: DeclarationId(2905), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(2106), + ty: DeclarationId(230), }], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -103000,25 +86652,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7345, 7380), - }); - declarations.push(Declaration { - id: DeclarationId(3038), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7345, 7380), + span: SourceSpan::new("dsl/std/types.dag", 23950, 23957), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3039), + id: DeclarationId(2906), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -103029,20 +86666,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7108, 7113), + span: SourceSpan::new("dsl/std/types.dag", 23950, 23957), }); declarations.push(Declaration { - id: DeclarationId(3040), + id: DeclarationId(2907), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3038), + ty: DeclarationId(2905), }, Field { label: "None".to_string(), - ty: DeclarationId(3039), + ty: DeclarationId(2906), }, ], }, @@ -103054,15 +86691,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7108, 7113), + span: SourceSpan::new("dsl/std/types.dag", 23950, 23957), }); declarations.push(Declaration { - id: DeclarationId(3041), + id: DeclarationId(2908), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(225), }], }, type_params: vec![], @@ -103073,10 +86710,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739), + span: SourceSpan::new("dsl/std/types.dag", 24180, 24195), }); declarations.push(Declaration { - id: DeclarationId(3042), + id: DeclarationId(2909), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -103087,20 +86724,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739), + span: SourceSpan::new("dsl/std/types.dag", 24180, 24195), }); declarations.push(Declaration { - id: DeclarationId(3043), + id: DeclarationId(2910), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3041), + ty: DeclarationId(2908), }, Field { label: "None".to_string(), - ty: DeclarationId(3042), + ty: DeclarationId(2909), }, ], }, @@ -103112,15 +86749,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739), + span: SourceSpan::new("dsl/std/types.dag", 24180, 24195), }); declarations.push(Declaration { - id: DeclarationId(3044), + id: DeclarationId(2911), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(191), }], }, type_params: vec![], @@ -103131,10 +86768,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775), + span: SourceSpan::new("dsl/std/types.dag", 24206, 24219), }); declarations.push(Declaration { - id: DeclarationId(3045), + id: DeclarationId(2912), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -103145,20 +86782,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775), + span: SourceSpan::new("dsl/std/types.dag", 24206, 24219), }); declarations.push(Declaration { - id: DeclarationId(3046), + id: DeclarationId(2913), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3044), + ty: DeclarationId(2911), }, Field { label: "None".to_string(), - ty: DeclarationId(3045), + ty: DeclarationId(2912), }, ], }, @@ -103170,15 +86807,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775), + span: SourceSpan::new("dsl/std/types.dag", 24206, 24219), }); declarations.push(Declaration { - id: DeclarationId(3047), + id: DeclarationId(2914), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(190), }], }, type_params: vec![], @@ -103189,10 +86826,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814), + span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), }); declarations.push(Declaration { - id: DeclarationId(3048), + id: DeclarationId(2915), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -103203,20 +86840,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814), + span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), }); declarations.push(Declaration { - id: DeclarationId(3049), + id: DeclarationId(2916), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3047), + ty: DeclarationId(2914), }, Field { label: "None".to_string(), - ty: DeclarationId(3048), + ty: DeclarationId(2915), }, ], }, @@ -103228,10 +86865,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814), + span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), }); declarations.push(Declaration { - id: DeclarationId(3050), + id: DeclarationId(2917), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -103247,10 +86884,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8783, 8790), + span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), }); declarations.push(Declaration { - id: DeclarationId(3051), + id: DeclarationId(2918), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -103261,48 +86898,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8783, 8790), - }); - declarations.push(Declaration { - id: DeclarationId(3052), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(3050), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3051), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8783, 8790), + span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), }); declarations.push(Declaration { - id: DeclarationId(3053), - name: None, -======= - id: DeclarationId(3038), + id: DeclarationId(2919), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3036), + ty: DeclarationId(2917), }, Field { label: "None".to_string(), - ty: DeclarationId(3037), + ty: DeclarationId(2918), }, ], }, @@ -103314,16 +86923,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7345, 7380), + span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), }); declarations.push(Declaration { - id: DeclarationId(3039), + id: DeclarationId(2920), name: None, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(130), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -103334,15 +86942,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7583, 7588), + span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3054), - name: None, - connective: TypeConnective::Conj { children: vec![] }, -======= - id: DeclarationId(3040), + id: DeclarationId(2921), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -103353,24 +86956,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7583, 7588), + span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), }); declarations.push(Declaration { - id: DeclarationId(3041), + id: DeclarationId(2922), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3039), + ty: DeclarationId(2920), }, Field { label: "None".to_string(), - ty: DeclarationId(3040), + ty: DeclarationId(2921), }, ], }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -103379,20 +86981,53 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7583, 7588), + span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), }); declarations.push(Declaration { - id: DeclarationId(3042), + id: DeclarationId(2923), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(1792), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), + }); + declarations.push(Declaration { + id: DeclarationId(2924), + name: None, + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), + }); + declarations.push(Declaration { + id: DeclarationId(2925), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3053), + ty: DeclarationId(2923), }, Field { label: "None".to_string(), - ty: DeclarationId(3054), + ty: DeclarationId(2924), }, ], }, @@ -103404,17 +87039,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8851, 8856), + span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), }); declarations.push(Declaration { - id: DeclarationId(3056), + id: DeclarationId(2926), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD -======= - ty: DeclarationId(130), + ty: DeclarationId(1795), }], }, type_params: vec![], @@ -103425,10 +87058,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7688, 7693), + span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), }); declarations.push(Declaration { - id: DeclarationId(3043), + id: DeclarationId(2927), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -103439,20 +87072,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7688, 7693), + span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), }); declarations.push(Declaration { - id: DeclarationId(3044), + id: DeclarationId(2928), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3042), + ty: DeclarationId(2926), }, Field { label: "None".to_string(), - ty: DeclarationId(3043), + ty: DeclarationId(2927), }, ], }, @@ -103464,15 +87097,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7688, 7693), + span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), }); declarations.push(Declaration { - id: DeclarationId(3045), + id: DeclarationId(2929), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(130), + ty: DeclarationId(198), }], }, type_params: vec![], @@ -103483,10 +87116,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7779, 7784), + span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), }); declarations.push(Declaration { - id: DeclarationId(3046), + id: DeclarationId(2930), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -103497,20 +87130,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7779, 7784), + span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), }); declarations.push(Declaration { - id: DeclarationId(3047), + id: DeclarationId(2931), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3045), + ty: DeclarationId(2929), }, Field { label: "None".to_string(), - ty: DeclarationId(3046), + ty: DeclarationId(2930), }, ], }, @@ -103522,15 +87155,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7779, 7784), + span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), }); declarations.push(Declaration { - id: DeclarationId(3048), + id: DeclarationId(2932), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -103541,10 +87174,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8406, 8410), + span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), }); declarations.push(Declaration { - id: DeclarationId(3049), + id: DeclarationId(2933), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -103555,20 +87188,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8406, 8410), + span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), }); declarations.push(Declaration { - id: DeclarationId(3050), + id: DeclarationId(2934), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3048), + ty: DeclarationId(2932), }, Field { label: "None".to_string(), - ty: DeclarationId(3049), + ty: DeclarationId(2933), }, ], }, @@ -103580,15 +87213,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8406, 8410), + span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), }); declarations.push(Declaration { - id: DeclarationId(3051), + id: DeclarationId(2935), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -103599,10 +87232,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8442, 8446), + span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), }); declarations.push(Declaration { - id: DeclarationId(3052), + id: DeclarationId(2936), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -103613,20 +87246,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8442, 8446), + span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), }); declarations.push(Declaration { - id: DeclarationId(3053), + id: DeclarationId(2937), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3051), + ty: DeclarationId(2935), }, Field { label: "None".to_string(), - ty: DeclarationId(3052), + ty: DeclarationId(2936), }, ], }, @@ -103638,15 +87271,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8442, 8446), + span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), }); declarations.push(Declaration { - id: DeclarationId(3054), + id: DeclarationId(2938), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(781), }], }, type_params: vec![], @@ -103657,10 +87290,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8478, 8485), + span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), }); declarations.push(Declaration { - id: DeclarationId(3055), + id: DeclarationId(2939), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -103671,20 +87304,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8478, 8485), + span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), }); declarations.push(Declaration { - id: DeclarationId(3056), + id: DeclarationId(2940), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3054), + ty: DeclarationId(2938), }, Field { label: "None".to_string(), - ty: DeclarationId(3055), + ty: DeclarationId(2939), }, ], }, @@ -103696,15 +87329,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8478, 8485), + span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), }); declarations.push(Declaration { - id: DeclarationId(3057), + id: DeclarationId(2941), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(827), }], }, type_params: vec![], @@ -103715,10 +87348,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9454, 9461), + span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), }); declarations.push(Declaration { - id: DeclarationId(3058), + id: DeclarationId(2942), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -103729,20 +87362,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9454, 9461), + span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), }); declarations.push(Declaration { - id: DeclarationId(3059), + id: DeclarationId(2943), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3057), + ty: DeclarationId(2941), }, Field { label: "None".to_string(), - ty: DeclarationId(3058), + ty: DeclarationId(2942), }, ], }, @@ -103754,15 +87387,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9454, 9461), + span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), }); declarations.push(Declaration { - id: DeclarationId(3060), + id: DeclarationId(2944), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(130), + ty: DeclarationId(827), }], }, type_params: vec![], @@ -103773,10 +87406,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9522, 9527), + span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), }); declarations.push(Declaration { - id: DeclarationId(3061), + id: DeclarationId(2945), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -103787,20 +87420,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9522, 9527), + span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), }); declarations.push(Declaration { - id: DeclarationId(3062), + id: DeclarationId(2946), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3060), + ty: DeclarationId(2944), }, Field { label: "None".to_string(), - ty: DeclarationId(3061), + ty: DeclarationId(2945), }, ], }, @@ -103812,16 +87445,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9522, 9527), + span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), }); declarations.push(Declaration { - id: DeclarationId(3063), + id: DeclarationId(2947), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - ty: DeclarationId(928), + ty: DeclarationId(799), }], }, type_params: vec![], @@ -103832,14 +87464,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755), + span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3057), -======= - id: DeclarationId(3064), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2948), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -103850,32 +87478,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755), + span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3058), -======= - id: DeclarationId(3065), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2949), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3056), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3057), -======= - ty: DeclarationId(3063), + ty: DeclarationId(2947), }, Field { label: "None".to_string(), - ty: DeclarationId(3064), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2948), }, ], }, @@ -103887,19 +87503,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755), + span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3059), -======= - id: DeclarationId(3066), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2950), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(799), }], }, type_params: vec![], @@ -103910,11 +87522,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), + span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3060), + id: DeclarationId(2951), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -103925,20 +87536,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), + span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), }); declarations.push(Declaration { - id: DeclarationId(3061), + id: DeclarationId(2952), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3059), + ty: DeclarationId(2950), }, Field { label: "None".to_string(), - ty: DeclarationId(3060), + ty: DeclarationId(2951), }, ], }, @@ -103950,15 +87561,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), + span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), }); declarations.push(Declaration { - id: DeclarationId(3062), + id: DeclarationId(2953), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(755), }], }, type_params: vec![], @@ -103969,10 +87580,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), + span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), }); declarations.push(Declaration { - id: DeclarationId(3063), + id: DeclarationId(2954), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -103983,20 +87594,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), + span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), }); declarations.push(Declaration { - id: DeclarationId(3064), + id: DeclarationId(2955), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3062), + ty: DeclarationId(2953), }, Field { label: "None".to_string(), - ty: DeclarationId(3063), + ty: DeclarationId(2954), }, ], }, @@ -104008,15 +87619,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), + span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), }); declarations.push(Declaration { - id: DeclarationId(3065), + id: DeclarationId(2956), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(938), + ty: DeclarationId(722), }], }, type_params: vec![], @@ -104027,10 +87638,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), + span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), }); declarations.push(Declaration { - id: DeclarationId(3066), + id: DeclarationId(2957), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -104041,20 +87652,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), + span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), }); declarations.push(Declaration { - id: DeclarationId(3067), + id: DeclarationId(2958), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3065), + ty: DeclarationId(2956), }, Field { label: "None".to_string(), - ty: DeclarationId(3066), + ty: DeclarationId(2957), }, ], }, @@ -104066,22 +87677,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), + span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), }); declarations.push(Declaration { - id: DeclarationId(3068), + id: DeclarationId(2959), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(938), + ty: DeclarationId(230), }], }, -======= - id: DeclarationId(3067), + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), + }); + declarations.push(Declaration { + id: DeclarationId(2960), name: None, connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -104090,24 +87710,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), + span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3069), - name: None, -======= - id: DeclarationId(3068), + id: DeclarationId(2961), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3066), + ty: DeclarationId(2959), }, Field { label: "None".to_string(), - ty: DeclarationId(3067), + ty: DeclarationId(2960), }, ], }, @@ -104119,15 +87735,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), + span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), }); declarations.push(Declaration { - id: DeclarationId(3069), + id: DeclarationId(2962), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(724), }], }, type_params: vec![], @@ -104138,12 +87754,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), + span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), }); declarations.push(Declaration { - id: DeclarationId(3070), + id: DeclarationId(2963), name: None, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -104153,34 +87768,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), - }); - declarations.push(Declaration { - id: DeclarationId(3070), -======= - span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), + span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), }); declarations.push(Declaration { - id: DeclarationId(3071), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2964), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3068), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3069), -======= - ty: DeclarationId(3069), + ty: DeclarationId(2962), }, Field { label: "None".to_string(), - ty: DeclarationId(3070), + ty: DeclarationId(2963), }, ], }, @@ -104192,15 +87793,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), + span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), }); declarations.push(Declaration { - id: DeclarationId(3072), + id: DeclarationId(2965), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(938), + ty: DeclarationId(724), }], }, type_params: vec![], @@ -104211,10 +87812,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), + span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), }); declarations.push(Declaration { - id: DeclarationId(3073), + id: DeclarationId(2966), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -104225,20 +87826,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), + span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), }); declarations.push(Declaration { - id: DeclarationId(3074), + id: DeclarationId(2967), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3072), + ty: DeclarationId(2965), }, Field { label: "None".to_string(), - ty: DeclarationId(3073), + ty: DeclarationId(2966), }, ], }, @@ -104250,15 +87851,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), + span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), }); declarations.push(Declaration { - id: DeclarationId(3075), + id: DeclarationId(2968), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(938), + ty: DeclarationId(795), }], }, type_params: vec![], @@ -104269,10 +87870,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), + span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), }); declarations.push(Declaration { - id: DeclarationId(3076), + id: DeclarationId(2969), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -104283,21 +87884,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), + span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), }); declarations.push(Declaration { - id: DeclarationId(3077), + id: DeclarationId(2970), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3075), + ty: DeclarationId(2968), }, Field { label: "None".to_string(), - ty: DeclarationId(3076), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2969), }, ], }, @@ -104309,16 +87909,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), + span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3071), + id: DeclarationId(2971), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(930), + ty: DeclarationId(801), }], }, type_params: vec![], @@ -104329,10 +87928,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), + span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), }); declarations.push(Declaration { - id: DeclarationId(3072), + id: DeclarationId(2972), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -104343,20 +87942,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), + span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), }); declarations.push(Declaration { - id: DeclarationId(3073), + id: DeclarationId(2973), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3071), + ty: DeclarationId(2971), }, Field { label: "None".to_string(), - ty: DeclarationId(3072), + ty: DeclarationId(2972), }, ], }, @@ -104368,15 +87967,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), + span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), }); declarations.push(Declaration { - id: DeclarationId(3074), + id: DeclarationId(2974), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(928), + ty: DeclarationId(809), }], }, type_params: vec![], @@ -104387,10 +87986,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), + span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), }); declarations.push(Declaration { - id: DeclarationId(3075), + id: DeclarationId(2975), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -104401,20 +88000,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), + span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), }); declarations.push(Declaration { - id: DeclarationId(3076), + id: DeclarationId(2976), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3074), + ty: DeclarationId(2974), }, Field { label: "None".to_string(), - ty: DeclarationId(3075), + ty: DeclarationId(2975), }, ], }, @@ -104426,15 +88025,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), + span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), }); declarations.push(Declaration { - id: DeclarationId(3077), + id: DeclarationId(2977), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(932), + ty: DeclarationId(755), }], }, type_params: vec![], @@ -104445,10 +88044,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), + span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), }); declarations.push(Declaration { - id: DeclarationId(3078), + id: DeclarationId(2978), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -104459,31 +88058,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), + span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), }); declarations.push(Declaration { - id: DeclarationId(3079), + id: DeclarationId(2979), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3077), + ty: DeclarationId(2977), }, Field { label: "None".to_string(), - ty: DeclarationId(3078), + ty: DeclarationId(2978), }, ], -======= - id: DeclarationId(3078), + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), + }); + declarations.push(Declaration { + id: DeclarationId(2980), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(930), + ty: DeclarationId(822), }], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -104493,10 +88102,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), + span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), }); declarations.push(Declaration { - id: DeclarationId(3080), + id: DeclarationId(2981), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -104507,24 +88116,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), + span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3081), - name: None, -======= - id: DeclarationId(3080), + id: DeclarationId(2982), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3078), + ty: DeclarationId(2980), }, Field { label: "None".to_string(), - ty: DeclarationId(3079), + ty: DeclarationId(2981), }, ], }, @@ -104536,15 +88141,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), + span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), }); declarations.push(Declaration { - id: DeclarationId(3081), + id: DeclarationId(2983), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(928), + ty: DeclarationId(755), }], }, type_params: vec![], @@ -104555,12 +88160,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), + span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), }); declarations.push(Declaration { - id: DeclarationId(3082), + id: DeclarationId(2984), name: None, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -104570,34 +88174,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), - }); - declarations.push(Declaration { - id: DeclarationId(3082), -======= - span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), + span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), }); declarations.push(Declaration { - id: DeclarationId(3083), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2985), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3080), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3081), -======= - ty: DeclarationId(3081), + ty: DeclarationId(2983), }, Field { label: "None".to_string(), - ty: DeclarationId(3082), + ty: DeclarationId(2984), }, ], }, @@ -104609,15 +88199,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), + span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), }); declarations.push(Declaration { - id: DeclarationId(3084), + id: DeclarationId(2986), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(932), + ty: DeclarationId(825), }], }, type_params: vec![], @@ -104628,10 +88218,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), + span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), }); declarations.push(Declaration { - id: DeclarationId(3085), + id: DeclarationId(2987), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -104642,20 +88232,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), + span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), }); declarations.push(Declaration { - id: DeclarationId(3086), + id: DeclarationId(2988), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3084), + ty: DeclarationId(2986), }, Field { label: "None".to_string(), - ty: DeclarationId(3085), + ty: DeclarationId(2987), }, ], }, @@ -104667,15 +88257,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), + span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), }); declarations.push(Declaration { - id: DeclarationId(3087), + id: DeclarationId(2989), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(842), }], }, type_params: vec![], @@ -104686,10 +88276,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), + span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), }); declarations.push(Declaration { - id: DeclarationId(3088), + id: DeclarationId(2990), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -104700,21 +88290,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), + span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), }); declarations.push(Declaration { - id: DeclarationId(3089), + id: DeclarationId(2991), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3087), + ty: DeclarationId(2989), }, Field { label: "None".to_string(), - ty: DeclarationId(3088), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2990), }, ], }, @@ -104726,16 +88315,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), + span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3083), + id: DeclarationId(2992), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(843), }], }, type_params: vec![], @@ -104746,10 +88334,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), + span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), }); declarations.push(Declaration { - id: DeclarationId(3084), + id: DeclarationId(2993), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -104760,20 +88348,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), + span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), }); declarations.push(Declaration { - id: DeclarationId(3085), + id: DeclarationId(2994), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3083), + ty: DeclarationId(2992), }, Field { label: "None".to_string(), - ty: DeclarationId(3084), + ty: DeclarationId(2993), }, ], }, @@ -104785,10 +88373,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), + span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), }); declarations.push(Declaration { - id: DeclarationId(3086), + id: DeclarationId(2995), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -104804,10 +88392,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), + span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), }); declarations.push(Declaration { - id: DeclarationId(3087), + id: DeclarationId(2996), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -104818,20 +88406,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), + span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), }); declarations.push(Declaration { - id: DeclarationId(3088), + id: DeclarationId(2997), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3086), + ty: DeclarationId(2995), }, Field { label: "None".to_string(), - ty: DeclarationId(3087), + ty: DeclarationId(2996), }, ], }, @@ -104843,15 +88431,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), + span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), }); declarations.push(Declaration { - id: DeclarationId(3089), + id: DeclarationId(2998), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -104862,10 +88450,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), + span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), }); declarations.push(Declaration { - id: DeclarationId(3090), + id: DeclarationId(2999), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -104876,31 +88464,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), + span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), }); declarations.push(Declaration { - id: DeclarationId(3091), + id: DeclarationId(3000), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3089), + ty: DeclarationId(2998), }, Field { label: "None".to_string(), - ty: DeclarationId(3090), + ty: DeclarationId(2999), }, ], -======= - id: DeclarationId(3090), + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), + }); + declarations.push(Declaration { + id: DeclarationId(3001), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(115), }], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -104910,10 +88508,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), + span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), }); declarations.push(Declaration { - id: DeclarationId(3092), + id: DeclarationId(3002), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -104924,23 +88522,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), + span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3093), -======= - id: DeclarationId(3092), + id: DeclarationId(3003), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3090), + ty: DeclarationId(3001), }, Field { label: "None".to_string(), - ty: DeclarationId(3091), + ty: DeclarationId(3002), }, ], }, @@ -104952,15 +88547,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), + span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), }); declarations.push(Declaration { - id: DeclarationId(3093), + id: DeclarationId(3004), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -104971,10 +88566,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), + span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), }); declarations.push(Declaration { - id: DeclarationId(3094), + id: DeclarationId(3005), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -104985,20 +88580,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), + span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), }); declarations.push(Declaration { - id: DeclarationId(3095), + id: DeclarationId(3006), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3093), + ty: DeclarationId(3004), }, Field { label: "None".to_string(), - ty: DeclarationId(3094), + ty: DeclarationId(3005), }, ], }, @@ -105010,15 +88605,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), + span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), }); declarations.push(Declaration { - id: DeclarationId(3096), + id: DeclarationId(3007), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(897), }], }, type_params: vec![], @@ -105029,10 +88624,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4680, 4707), }); declarations.push(Declaration { - id: DeclarationId(3097), + id: DeclarationId(3008), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -105043,20 +88638,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4680, 4707), }); declarations.push(Declaration { - id: DeclarationId(3098), + id: DeclarationId(3009), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3096), + ty: DeclarationId(3007), }, Field { label: "None".to_string(), - ty: DeclarationId(3097), + ty: DeclarationId(3008), }, ], }, @@ -105068,15 +88663,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4680, 4707), }); declarations.push(Declaration { - id: DeclarationId(3099), + id: DeclarationId(3010), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(128), }], }, type_params: vec![], @@ -105087,25 +88682,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), - }); - declarations.push(Declaration { - id: DeclarationId(3100), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4724, 4729), }); declarations.push(Declaration { - id: DeclarationId(3101), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3011), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -105116,28 +88696,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4724, 4729), }); declarations.push(Declaration { - id: DeclarationId(3094), + id: DeclarationId(3012), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3092), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3093), -======= - ty: DeclarationId(3099), + ty: DeclarationId(3010), }, Field { label: "None".to_string(), - ty: DeclarationId(3100), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(3011), }, ], }, @@ -105149,19 +88721,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4724, 4729), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3095), -======= - id: DeclarationId(3102), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3013), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -105172,11 +88740,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6085, 6092), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3096), + id: DeclarationId(3014), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -105187,20 +88754,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6085, 6092), }); declarations.push(Declaration { - id: DeclarationId(3097), + id: DeclarationId(3015), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3095), + ty: DeclarationId(3013), }, Field { label: "None".to_string(), - ty: DeclarationId(3096), + ty: DeclarationId(3014), }, ], }, @@ -105212,15 +88779,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6085, 6092), }); declarations.push(Declaration { - id: DeclarationId(3098), + id: DeclarationId(3016), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1152), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -105231,10 +88798,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6103, 6110), }); declarations.push(Declaration { - id: DeclarationId(3099), + id: DeclarationId(3017), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -105245,20 +88812,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6103, 6110), }); declarations.push(Declaration { - id: DeclarationId(3100), + id: DeclarationId(3018), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3098), + ty: DeclarationId(3016), }, Field { label: "None".to_string(), - ty: DeclarationId(3099), + ty: DeclarationId(3017), }, ], }, @@ -105270,15 +88837,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6103, 6110), }); declarations.push(Declaration { - id: DeclarationId(3101), + id: DeclarationId(3019), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1145), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -105289,10 +88856,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6233, 6240), }); declarations.push(Declaration { - id: DeclarationId(3102), + id: DeclarationId(3020), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -105303,20 +88870,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6233, 6240), }); declarations.push(Declaration { - id: DeclarationId(3103), + id: DeclarationId(3021), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3101), + ty: DeclarationId(3019), }, Field { label: "None".to_string(), - ty: DeclarationId(3102), + ty: DeclarationId(3020), }, ], }, @@ -105328,22 +88895,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6233, 6240), }); declarations.push(Declaration { - id: DeclarationId(3104), + id: DeclarationId(3022), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1152), + ty: DeclarationId(230), }], }, -======= - id: DeclarationId(3103), + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6251, 6258), + }); + declarations.push(Declaration { + id: DeclarationId(3023), name: None, connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -105352,24 +88928,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6251, 6258), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3105), - name: None, -======= - id: DeclarationId(3104), + id: DeclarationId(3024), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3102), + ty: DeclarationId(3022), }, Field { label: "None".to_string(), - ty: DeclarationId(3103), + ty: DeclarationId(3023), }, ], }, @@ -105381,15 +88953,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6251, 6258), }); declarations.push(Declaration { - id: DeclarationId(3105), + id: DeclarationId(3025), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1152), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -105400,12 +88972,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6391, 6398), }); declarations.push(Declaration { - id: DeclarationId(3106), + id: DeclarationId(3026), name: None, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -105415,34 +88986,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), - }); - declarations.push(Declaration { - id: DeclarationId(3106), -======= - span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6391, 6398), }); declarations.push(Declaration { - id: DeclarationId(3107), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3027), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3104), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3105), -======= - ty: DeclarationId(3105), + ty: DeclarationId(3025), }, Field { label: "None".to_string(), - ty: DeclarationId(3106), + ty: DeclarationId(3026), }, ], }, @@ -105454,15 +89011,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6391, 6398), }); declarations.push(Declaration { - id: DeclarationId(3108), + id: DeclarationId(3028), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1145), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -105473,10 +89030,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6409, 6416), }); declarations.push(Declaration { - id: DeclarationId(3109), + id: DeclarationId(3029), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -105487,20 +89044,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6409, 6416), }); declarations.push(Declaration { - id: DeclarationId(3110), + id: DeclarationId(3030), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3108), + ty: DeclarationId(3028), }, Field { label: "None".to_string(), - ty: DeclarationId(3109), + ty: DeclarationId(3029), }, ], }, @@ -105512,15 +89069,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6409, 6416), }); declarations.push(Declaration { - id: DeclarationId(3111), + id: DeclarationId(3031), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1152), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -105531,10 +89088,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6547, 6554), }); declarations.push(Declaration { - id: DeclarationId(3112), + id: DeclarationId(3032), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -105545,21 +89102,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6547, 6554), }); declarations.push(Declaration { - id: DeclarationId(3113), + id: DeclarationId(3033), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3111), + ty: DeclarationId(3031), }, Field { label: "None".to_string(), - ty: DeclarationId(3112), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(3032), }, ], }, @@ -105571,16 +89127,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6547, 6554), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3107), + id: DeclarationId(3034), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1145), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -105591,10 +89146,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6640, 6647), }); declarations.push(Declaration { - id: DeclarationId(3108), + id: DeclarationId(3035), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -105605,20 +89160,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6640, 6647), }); declarations.push(Declaration { - id: DeclarationId(3109), + id: DeclarationId(3036), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3107), + ty: DeclarationId(3034), }, Field { label: "None".to_string(), - ty: DeclarationId(3108), + ty: DeclarationId(3035), }, ], }, @@ -105630,15 +89185,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6640, 6647), }); declarations.push(Declaration { - id: DeclarationId(3110), + id: DeclarationId(3037), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1152), + ty: DeclarationId(2107), }], }, type_params: vec![], @@ -105649,10 +89204,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7345, 7380), }); declarations.push(Declaration { - id: DeclarationId(3111), + id: DeclarationId(3038), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -105663,20 +89218,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7345, 7380), }); declarations.push(Declaration { - id: DeclarationId(3112), + id: DeclarationId(3039), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3110), + ty: DeclarationId(3037), }, Field { label: "None".to_string(), - ty: DeclarationId(3111), + ty: DeclarationId(3038), }, ], }, @@ -105688,15 +89243,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7345, 7380), }); declarations.push(Declaration { - id: DeclarationId(3113), + id: DeclarationId(3040), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1204), + ty: DeclarationId(130), }], }, type_params: vec![], @@ -105707,10 +89262,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7583, 7588), }); declarations.push(Declaration { - id: DeclarationId(3114), + id: DeclarationId(3041), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -105721,31 +89276,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7583, 7588), }); declarations.push(Declaration { - id: DeclarationId(3115), + id: DeclarationId(3042), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3113), + ty: DeclarationId(3040), }, Field { label: "None".to_string(), - ty: DeclarationId(3114), + ty: DeclarationId(3041), }, ], -======= - id: DeclarationId(3114), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(1145), - }], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -105755,21 +89301,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7583, 7588), }); declarations.push(Declaration { - id: DeclarationId(3116), + id: DeclarationId(3043), name: None, -<<<<<<< HEAD connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1204), + ty: DeclarationId(130), }], }, -======= - connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -105778,24 +89320,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7688, 7693), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3117), + id: DeclarationId(3044), name: None, -======= - id: DeclarationId(3116), + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7688, 7693), + }); + declarations.push(Declaration { + id: DeclarationId(3045), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3114), + ty: DeclarationId(3043), }, Field { label: "None".to_string(), - ty: DeclarationId(3115), + ty: DeclarationId(3044), }, ], }, @@ -105807,15 +89359,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7688, 7693), }); declarations.push(Declaration { - id: DeclarationId(3117), + id: DeclarationId(3046), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1152), + ty: DeclarationId(130), }], }, type_params: vec![], @@ -105826,12 +89378,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7779, 7784), }); declarations.push(Declaration { - id: DeclarationId(3118), + id: DeclarationId(3047), name: None, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -105841,34 +89392,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), - }); - declarations.push(Declaration { - id: DeclarationId(3118), -======= - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7779, 7784), }); declarations.push(Declaration { - id: DeclarationId(3119), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3048), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3116), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3117), -======= - ty: DeclarationId(3117), + ty: DeclarationId(3046), }, Field { label: "None".to_string(), - ty: DeclarationId(3118), + ty: DeclarationId(3047), }, ], }, @@ -105880,15 +89417,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7779, 7784), }); declarations.push(Declaration { - id: DeclarationId(3120), + id: DeclarationId(3049), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1204), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -105899,10 +89436,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8406, 8410), }); declarations.push(Declaration { - id: DeclarationId(3121), + id: DeclarationId(3050), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -105913,20 +89450,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8406, 8410), }); declarations.push(Declaration { - id: DeclarationId(3122), + id: DeclarationId(3051), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3120), + ty: DeclarationId(3049), }, Field { label: "None".to_string(), - ty: DeclarationId(3121), + ty: DeclarationId(3050), }, ], }, @@ -105938,15 +89475,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8406, 8410), }); declarations.push(Declaration { - id: DeclarationId(3123), + id: DeclarationId(3052), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1204), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -105957,10 +89494,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8442, 8446), }); declarations.push(Declaration { - id: DeclarationId(3124), + id: DeclarationId(3053), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -105971,21 +89508,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8442, 8446), }); declarations.push(Declaration { - id: DeclarationId(3125), + id: DeclarationId(3054), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3123), + ty: DeclarationId(3052), }, Field { label: "None".to_string(), - ty: DeclarationId(3124), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(3053), }, ], }, @@ -105997,16 +89533,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8442, 8446), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3119), + id: DeclarationId(3055), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1204), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -106017,10 +89552,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8478, 8485), }); declarations.push(Declaration { - id: DeclarationId(3120), + id: DeclarationId(3056), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -106031,20 +89566,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8478, 8485), }); declarations.push(Declaration { - id: DeclarationId(3121), + id: DeclarationId(3057), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3119), + ty: DeclarationId(3055), }, Field { label: "None".to_string(), - ty: DeclarationId(3120), + ty: DeclarationId(3056), }, ], }, @@ -106056,15 +89591,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8478, 8485), }); declarations.push(Declaration { - id: DeclarationId(3122), + id: DeclarationId(3058), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1212), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -106075,10 +89610,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9454, 9461), }); declarations.push(Declaration { - id: DeclarationId(3123), + id: DeclarationId(3059), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -106089,20 +89624,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9454, 9461), }); declarations.push(Declaration { - id: DeclarationId(3124), + id: DeclarationId(3060), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3122), + ty: DeclarationId(3058), }, Field { label: "None".to_string(), - ty: DeclarationId(3123), + ty: DeclarationId(3059), }, ], }, @@ -106114,15 +89649,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9454, 9461), }); declarations.push(Declaration { - id: DeclarationId(3125), + id: DeclarationId(3061), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1214), + ty: DeclarationId(130), }], }, type_params: vec![], @@ -106133,10 +89668,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9522, 9527), }); declarations.push(Declaration { - id: DeclarationId(3126), + id: DeclarationId(3062), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -106147,31 +89682,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9522, 9527), }); declarations.push(Declaration { - id: DeclarationId(3127), + id: DeclarationId(3063), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3125), + ty: DeclarationId(3061), }, Field { label: "None".to_string(), - ty: DeclarationId(3126), + ty: DeclarationId(3062), }, ], -======= - id: DeclarationId(3126), + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9522, 9527), + }); + declarations.push(Declaration { + id: DeclarationId(3064), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1204), + ty: DeclarationId(929), }], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -106181,10 +89726,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), + span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755), }); declarations.push(Declaration { - id: DeclarationId(3128), + id: DeclarationId(3065), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -106195,20 +89740,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), + span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755), }); declarations.push(Declaration { - id: DeclarationId(3128), + id: DeclarationId(3066), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3126), + ty: DeclarationId(3064), }, Field { label: "None".to_string(), - ty: DeclarationId(3127), + ty: DeclarationId(3065), }, ], }, @@ -106220,15 +89765,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), + span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755), }); declarations.push(Declaration { - id: DeclarationId(3129), + id: DeclarationId(3067), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1212), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -106239,10 +89784,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), + span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), }); declarations.push(Declaration { - id: DeclarationId(3130), + id: DeclarationId(3068), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -106253,20 +89798,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), + span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), }); declarations.push(Declaration { - id: DeclarationId(3131), + id: DeclarationId(3069), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3129), + ty: DeclarationId(3067), }, Field { label: "None".to_string(), - ty: DeclarationId(3130), + ty: DeclarationId(3068), }, ], }, @@ -106278,15 +89823,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), + span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), }); declarations.push(Declaration { - id: DeclarationId(3132), + id: DeclarationId(3070), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1214), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -106297,10 +89842,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), + span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), }); declarations.push(Declaration { - id: DeclarationId(3133), + id: DeclarationId(3071), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -106311,20 +89856,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), + span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), }); declarations.push(Declaration { - id: DeclarationId(3134), + id: DeclarationId(3072), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3132), + ty: DeclarationId(3070), }, Field { label: "None".to_string(), - ty: DeclarationId(3133), + ty: DeclarationId(3071), }, ], }, @@ -106336,15 +89881,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), + span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), }); declarations.push(Declaration { - id: DeclarationId(3135), + id: DeclarationId(3073), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(806), + ty: DeclarationId(939), }], }, type_params: vec![], @@ -106355,14 +89900,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), + span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3129), -======= - id: DeclarationId(3136), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3074), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -106373,32 +89914,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), + span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3130), -======= - id: DeclarationId(3137), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3075), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3128), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3129), -======= - ty: DeclarationId(3135), + ty: DeclarationId(3073), }, Field { label: "None".to_string(), - ty: DeclarationId(3136), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(3074), }, ], }, @@ -106410,19 +89939,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), + span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3131), -======= - id: DeclarationId(3138), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3076), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(160), + ty: DeclarationId(939), }], }, type_params: vec![], @@ -106433,11 +89958,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), + span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3132), + id: DeclarationId(3077), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -106448,20 +89972,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), + span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), }); declarations.push(Declaration { - id: DeclarationId(3133), + id: DeclarationId(3078), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3131), + ty: DeclarationId(3076), }, Field { label: "None".to_string(), - ty: DeclarationId(3132), + ty: DeclarationId(3077), }, ], }, @@ -106473,15 +89997,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), + span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), }); declarations.push(Declaration { - id: DeclarationId(3134), + id: DeclarationId(3079), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(931), }], }, type_params: vec![], @@ -106492,10 +90016,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), + span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), }); declarations.push(Declaration { - id: DeclarationId(3135), + id: DeclarationId(3080), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -106506,20 +90030,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), + span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), }); declarations.push(Declaration { - id: DeclarationId(3136), + id: DeclarationId(3081), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3134), + ty: DeclarationId(3079), }, Field { label: "None".to_string(), - ty: DeclarationId(3135), + ty: DeclarationId(3080), }, ], }, @@ -106531,15 +90055,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), + span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), }); declarations.push(Declaration { - id: DeclarationId(3137), + id: DeclarationId(3082), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1717), + ty: DeclarationId(929), }], }, type_params: vec![], @@ -106550,10 +90074,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), + span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), }); declarations.push(Declaration { - id: DeclarationId(3138), + id: DeclarationId(3083), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -106564,20 +90088,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), + span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), }); declarations.push(Declaration { - id: DeclarationId(3139), + id: DeclarationId(3084), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3137), + ty: DeclarationId(3082), }, Field { label: "None".to_string(), - ty: DeclarationId(3138), + ty: DeclarationId(3083), }, ], }, @@ -106589,15 +90113,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), + span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), }); declarations.push(Declaration { - id: DeclarationId(3140), -======= - id: DeclarationId(3139), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3085), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(933), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -106606,24 +90132,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), + span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3141), + id: DeclarationId(3086), name: None, -======= - id: DeclarationId(3140), + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), + }); + declarations.push(Declaration { + id: DeclarationId(3087), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3138), + ty: DeclarationId(3085), }, Field { label: "None".to_string(), - ty: DeclarationId(3139), + ty: DeclarationId(3086), }, ], }, @@ -106635,15 +90171,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), + span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), }); declarations.push(Declaration { - id: DeclarationId(3141), + id: DeclarationId(3088), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -106654,12 +90190,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), + span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), }); declarations.push(Declaration { - id: DeclarationId(3142), + id: DeclarationId(3089), name: None, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -106669,34 +90204,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), - }); - declarations.push(Declaration { - id: DeclarationId(3142), -======= - span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), + span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), }); declarations.push(Declaration { - id: DeclarationId(3143), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3090), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3140), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3141), -======= - ty: DeclarationId(3141), + ty: DeclarationId(3088), }, Field { label: "None".to_string(), - ty: DeclarationId(3142), + ty: DeclarationId(3089), }, ], }, @@ -106708,15 +90229,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), + span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), }); declarations.push(Declaration { - id: DeclarationId(3144), + id: DeclarationId(3091), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1717), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -106727,10 +90248,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), + span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), }); declarations.push(Declaration { - id: DeclarationId(3145), + id: DeclarationId(3092), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -106741,20 +90262,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), + span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), }); declarations.push(Declaration { - id: DeclarationId(3146), + id: DeclarationId(3093), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3144), + ty: DeclarationId(3091), }, Field { label: "None".to_string(), - ty: DeclarationId(3145), + ty: DeclarationId(3092), }, ], }, @@ -106766,15 +90287,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), + span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), }); declarations.push(Declaration { - id: DeclarationId(3147), + id: DeclarationId(3094), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -106785,10 +90306,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), + span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), }); declarations.push(Declaration { - id: DeclarationId(3148), + id: DeclarationId(3095), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -106799,21 +90320,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), + span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), }); declarations.push(Declaration { - id: DeclarationId(3149), + id: DeclarationId(3096), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3147), + ty: DeclarationId(3094), }, Field { label: "None".to_string(), - ty: DeclarationId(3148), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(3095), }, ], }, @@ -106825,16 +90345,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), + span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3143), + id: DeclarationId(3097), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -106845,10 +90364,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), + span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), }); declarations.push(Declaration { - id: DeclarationId(3144), + id: DeclarationId(3098), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -106859,20 +90378,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), + span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), }); declarations.push(Declaration { - id: DeclarationId(3145), + id: DeclarationId(3099), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3143), + ty: DeclarationId(3097), }, Field { label: "None".to_string(), - ty: DeclarationId(3144), + ty: DeclarationId(3098), }, ], }, @@ -106884,15 +90403,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), + span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), }); declarations.push(Declaration { - id: DeclarationId(3146), + id: DeclarationId(3100), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -106903,10 +90422,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), + span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), }); declarations.push(Declaration { - id: DeclarationId(3147), + id: DeclarationId(3101), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -106917,20 +90436,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), + span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), }); declarations.push(Declaration { - id: DeclarationId(3148), + id: DeclarationId(3102), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3146), + ty: DeclarationId(3100), }, Field { label: "None".to_string(), - ty: DeclarationId(3147), + ty: DeclarationId(3101), }, ], }, @@ -106942,15 +90461,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), + span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), }); declarations.push(Declaration { - id: DeclarationId(3149), + id: DeclarationId(3103), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -106961,10 +90480,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), + span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), }); declarations.push(Declaration { - id: DeclarationId(3150), + id: DeclarationId(3104), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -106975,31 +90494,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), + span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), }); declarations.push(Declaration { - id: DeclarationId(3151), + id: DeclarationId(3105), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3149), + ty: DeclarationId(3103), }, Field { label: "None".to_string(), - ty: DeclarationId(3150), + ty: DeclarationId(3104), }, ], -======= - id: DeclarationId(3150), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -107009,21 +90519,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), + span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), }); declarations.push(Declaration { - id: DeclarationId(3152), + id: DeclarationId(3106), name: None, -<<<<<<< HEAD connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1745), + ty: DeclarationId(1153), }], }, -======= - connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -107032,24 +90538,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3153), + id: DeclarationId(3107), name: None, -======= - id: DeclarationId(3152), + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), + }); + declarations.push(Declaration { + id: DeclarationId(3108), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3150), + ty: DeclarationId(3106), }, Field { label: "None".to_string(), - ty: DeclarationId(3151), + ty: DeclarationId(3107), }, ], }, @@ -107061,15 +90577,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { - id: DeclarationId(3153), + id: DeclarationId(3109), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(1146), }], }, type_params: vec![], @@ -107080,12 +90596,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), }); declarations.push(Declaration { - id: DeclarationId(3154), + id: DeclarationId(3110), name: None, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -107095,34 +90610,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), - }); - declarations.push(Declaration { - id: DeclarationId(3154), -======= - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), }); declarations.push(Declaration { - id: DeclarationId(3155), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3111), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3152), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3153), -======= - ty: DeclarationId(3153), + ty: DeclarationId(3109), }, Field { label: "None".to_string(), - ty: DeclarationId(3154), + ty: DeclarationId(3110), }, ], }, @@ -107134,15 +90635,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), }); declarations.push(Declaration { - id: DeclarationId(3156), + id: DeclarationId(3112), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(1153), }], }, type_params: vec![], @@ -107153,10 +90654,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), }); declarations.push(Declaration { - id: DeclarationId(3157), + id: DeclarationId(3113), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -107167,20 +90668,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), }); declarations.push(Declaration { - id: DeclarationId(3158), + id: DeclarationId(3114), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3156), + ty: DeclarationId(3112), }, Field { label: "None".to_string(), - ty: DeclarationId(3157), + ty: DeclarationId(3113), }, ], }, @@ -107192,15 +90693,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), }); declarations.push(Declaration { - id: DeclarationId(3159), + id: DeclarationId(3115), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1745), + ty: DeclarationId(1146), }], }, type_params: vec![], @@ -107211,10 +90712,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), }); declarations.push(Declaration { - id: DeclarationId(3160), + id: DeclarationId(3116), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -107225,21 +90726,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), }); declarations.push(Declaration { - id: DeclarationId(3161), + id: DeclarationId(3117), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3159), + ty: DeclarationId(3115), }, Field { label: "None".to_string(), - ty: DeclarationId(3160), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(3116), }, ], }, @@ -107251,19 +90751,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3155), -======= - id: DeclarationId(3162), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3118), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(1153), }], }, type_params: vec![], @@ -107274,11 +90770,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3156), + id: DeclarationId(3119), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -107289,20 +90784,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), }); declarations.push(Declaration { - id: DeclarationId(3157), + id: DeclarationId(3120), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3155), + ty: DeclarationId(3118), }, Field { label: "None".to_string(), - ty: DeclarationId(3156), + ty: DeclarationId(3119), }, ], }, @@ -107314,15 +90809,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), + span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), }); declarations.push(Declaration { - id: DeclarationId(3158), + id: DeclarationId(3121), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1726), + ty: DeclarationId(1205), }], }, type_params: vec![], @@ -107333,10 +90828,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), + span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), }); declarations.push(Declaration { - id: DeclarationId(3159), + id: DeclarationId(3122), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -107347,20 +90842,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), + span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), }); declarations.push(Declaration { - id: DeclarationId(3160), + id: DeclarationId(3123), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3158), + ty: DeclarationId(3121), }, Field { label: "None".to_string(), - ty: DeclarationId(3159), + ty: DeclarationId(3122), }, ], }, @@ -107372,15 +90867,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), + span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), }); declarations.push(Declaration { - id: DeclarationId(3161), + id: DeclarationId(3124), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(1205), }], }, type_params: vec![], @@ -107391,10 +90886,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), + span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), }); declarations.push(Declaration { - id: DeclarationId(3162), + id: DeclarationId(3125), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -107405,20 +90900,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), + span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), }); declarations.push(Declaration { - id: DeclarationId(3163), + id: DeclarationId(3126), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3161), + ty: DeclarationId(3124), }, Field { label: "None".to_string(), - ty: DeclarationId(3162), + ty: DeclarationId(3125), }, ], }, @@ -107430,15 +90925,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), + span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), }); declarations.push(Declaration { - id: DeclarationId(3164), -======= - id: DeclarationId(3163), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3127), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(1205), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -107447,24 +90944,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), + span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3165), + id: DeclarationId(3128), name: None, -======= - id: DeclarationId(3164), + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), + }); + declarations.push(Declaration { + id: DeclarationId(3129), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3162), + ty: DeclarationId(3127), }, Field { label: "None".to_string(), - ty: DeclarationId(3163), + ty: DeclarationId(3128), }, ], }, @@ -107476,15 +90983,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), + span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), }); declarations.push(Declaration { - id: DeclarationId(3165), + id: DeclarationId(3130), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1726), + ty: DeclarationId(1213), }], }, type_params: vec![], @@ -107495,12 +91002,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), + span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), }); declarations.push(Declaration { - id: DeclarationId(3166), + id: DeclarationId(3131), name: None, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -107510,34 +91016,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), - }); - declarations.push(Declaration { - id: DeclarationId(3166), -======= - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), + span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), }); declarations.push(Declaration { - id: DeclarationId(3167), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3132), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3164), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3165), -======= - ty: DeclarationId(3165), + ty: DeclarationId(3130), }, Field { label: "None".to_string(), - ty: DeclarationId(3166), + ty: DeclarationId(3131), }, ], }, @@ -107549,15 +91041,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), + span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), }); declarations.push(Declaration { - id: DeclarationId(3168), + id: DeclarationId(3133), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(1215), }], }, type_params: vec![], @@ -107568,10 +91060,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), + span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), }); declarations.push(Declaration { - id: DeclarationId(3169), + id: DeclarationId(3134), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -107582,20 +91074,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), + span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), }); declarations.push(Declaration { - id: DeclarationId(3170), + id: DeclarationId(3135), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3168), + ty: DeclarationId(3133), }, Field { label: "None".to_string(), - ty: DeclarationId(3169), + ty: DeclarationId(3134), }, ], }, @@ -107607,15 +91099,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), + span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), }); declarations.push(Declaration { - id: DeclarationId(3171), + id: DeclarationId(3136), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(806), }], }, type_params: vec![], @@ -107626,10 +91118,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), + span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), }); declarations.push(Declaration { - id: DeclarationId(3172), + id: DeclarationId(3137), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -107640,21 +91132,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), + span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), }); declarations.push(Declaration { - id: DeclarationId(3173), + id: DeclarationId(3138), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3171), + ty: DeclarationId(3136), }, Field { label: "None".to_string(), - ty: DeclarationId(3172), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(3137), }, ], }, @@ -107666,16 +91157,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), + span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3167), + id: DeclarationId(3139), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(160), }], }, type_params: vec![], @@ -107686,10 +91176,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), + span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), }); declarations.push(Declaration { - id: DeclarationId(3168), + id: DeclarationId(3140), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -107700,20 +91190,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), + span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), }); declarations.push(Declaration { - id: DeclarationId(3169), + id: DeclarationId(3141), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3167), + ty: DeclarationId(3139), }, Field { label: "None".to_string(), - ty: DeclarationId(3168), + ty: DeclarationId(3140), }, ], }, @@ -107725,15 +91215,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), + span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), }); declarations.push(Declaration { - id: DeclarationId(3170), + id: DeclarationId(3142), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -107744,10 +91234,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), + span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), }); declarations.push(Declaration { - id: DeclarationId(3171), + id: DeclarationId(3143), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -107758,20 +91248,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), + span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), }); declarations.push(Declaration { - id: DeclarationId(3172), + id: DeclarationId(3144), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3170), + ty: DeclarationId(3142), }, Field { label: "None".to_string(), - ty: DeclarationId(3171), + ty: DeclarationId(3143), }, ], }, @@ -107783,15 +91273,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), + span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), }); declarations.push(Declaration { - id: DeclarationId(3173), + id: DeclarationId(3145), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(1718), }], }, type_params: vec![], @@ -107802,10 +91292,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), }); declarations.push(Declaration { - id: DeclarationId(3174), + id: DeclarationId(3146), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -107816,31 +91306,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), }); declarations.push(Declaration { - id: DeclarationId(3175), + id: DeclarationId(3147), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3173), + ty: DeclarationId(3145), }, Field { label: "None".to_string(), - ty: DeclarationId(3174), + ty: DeclarationId(3146), }, ], -======= - id: DeclarationId(3174), + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), + }); + declarations.push(Declaration { + id: DeclarationId(3148), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), ty: DeclarationId(230), }], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -107850,10 +91350,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), }); declarations.push(Declaration { - id: DeclarationId(3176), + id: DeclarationId(3149), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -107864,24 +91364,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3177), - name: None, -======= - id: DeclarationId(3176), + id: DeclarationId(3150), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3174), + ty: DeclarationId(3148), }, Field { label: "None".to_string(), - ty: DeclarationId(3175), + ty: DeclarationId(3149), }, ], }, @@ -107893,15 +91389,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), }); declarations.push(Declaration { - id: DeclarationId(3177), + id: DeclarationId(3151), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -107912,12 +91408,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), }); declarations.push(Declaration { - id: DeclarationId(3178), + id: DeclarationId(3152), name: None, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -107927,34 +91422,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), - }); - declarations.push(Declaration { - id: DeclarationId(3178), -======= - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), }); declarations.push(Declaration { - id: DeclarationId(3179), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3153), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3176), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3177), -======= - ty: DeclarationId(3177), + ty: DeclarationId(3151), }, Field { label: "None".to_string(), - ty: DeclarationId(3178), + ty: DeclarationId(3152), }, ], }, @@ -107966,10 +91447,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), }); declarations.push(Declaration { - id: DeclarationId(3180), + id: DeclarationId(3154), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -107985,10 +91466,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), }); declarations.push(Declaration { - id: DeclarationId(3181), + id: DeclarationId(3155), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -107999,20 +91480,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), }); declarations.push(Declaration { - id: DeclarationId(3182), + id: DeclarationId(3156), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3180), + ty: DeclarationId(3154), }, Field { label: "None".to_string(), - ty: DeclarationId(3181), + ty: DeclarationId(3155), }, ], }, @@ -108024,10 +91505,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), }); declarations.push(Declaration { - id: DeclarationId(3183), + id: DeclarationId(3157), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -108043,10 +91524,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), }); declarations.push(Declaration { - id: DeclarationId(3184), + id: DeclarationId(3158), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -108057,21 +91538,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), }); declarations.push(Declaration { - id: DeclarationId(3185), + id: DeclarationId(3159), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3183), + ty: DeclarationId(3157), }, Field { label: "None".to_string(), - ty: DeclarationId(3184), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(3158), }, ], }, @@ -108083,16 +91563,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3179), + id: DeclarationId(3160), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(1746), }], }, type_params: vec![], @@ -108103,10 +91582,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), }); declarations.push(Declaration { - id: DeclarationId(3180), + id: DeclarationId(3161), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -108117,20 +91596,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), }); declarations.push(Declaration { - id: DeclarationId(3181), + id: DeclarationId(3162), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3179), + ty: DeclarationId(3160), }, Field { label: "None".to_string(), - ty: DeclarationId(3180), + ty: DeclarationId(3161), }, ], }, @@ -108142,15 +91621,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), }); declarations.push(Declaration { - id: DeclarationId(3182), + id: DeclarationId(3163), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -108161,10 +91640,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), }); declarations.push(Declaration { - id: DeclarationId(3183), + id: DeclarationId(3164), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -108175,20 +91654,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), }); declarations.push(Declaration { - id: DeclarationId(3184), + id: DeclarationId(3165), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3182), + ty: DeclarationId(3163), }, Field { label: "None".to_string(), - ty: DeclarationId(3183), + ty: DeclarationId(3164), }, ], }, @@ -108200,15 +91679,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), }); declarations.push(Declaration { - id: DeclarationId(3185), + id: DeclarationId(3166), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(1727), }], }, type_params: vec![], @@ -108219,10 +91698,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), }); declarations.push(Declaration { - id: DeclarationId(3186), + id: DeclarationId(3167), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -108233,31 +91712,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), }); declarations.push(Declaration { - id: DeclarationId(3187), + id: DeclarationId(3168), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3185), + ty: DeclarationId(3166), }, Field { label: "None".to_string(), - ty: DeclarationId(3186), + ty: DeclarationId(3167), }, ], -======= - id: DeclarationId(3186), + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), + }); + declarations.push(Declaration { + id: DeclarationId(3169), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(230), }], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -108267,10 +91756,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), }); declarations.push(Declaration { - id: DeclarationId(3188), + id: DeclarationId(3170), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -108281,24 +91770,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3189), - name: None, -======= - id: DeclarationId(3188), + id: DeclarationId(3171), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3186), + ty: DeclarationId(3169), }, Field { label: "None".to_string(), - ty: DeclarationId(3187), + ty: DeclarationId(3170), }, ], }, @@ -108310,10 +91795,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), }); declarations.push(Declaration { - id: DeclarationId(3189), + id: DeclarationId(3172), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -108329,12 +91814,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), }); declarations.push(Declaration { - id: DeclarationId(3190), + id: DeclarationId(3173), name: None, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -108344,34 +91828,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6027, 6031), - }); - declarations.push(Declaration { - id: DeclarationId(3190), -======= - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), }); declarations.push(Declaration { - id: DeclarationId(3191), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3174), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3188), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3189), -======= - ty: DeclarationId(3189), + ty: DeclarationId(3172), }, Field { label: "None".to_string(), - ty: DeclarationId(3190), + ty: DeclarationId(3173), }, ], }, @@ -108383,15 +91853,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), }); declarations.push(Declaration { - id: DeclarationId(3192), + id: DeclarationId(3175), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -108402,10 +91872,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), }); declarations.push(Declaration { - id: DeclarationId(3193), + id: DeclarationId(3176), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -108416,20 +91886,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), }); declarations.push(Declaration { - id: DeclarationId(3194), + id: DeclarationId(3177), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3192), + ty: DeclarationId(3175), }, Field { label: "None".to_string(), - ty: DeclarationId(3193), + ty: DeclarationId(3176), }, ], }, @@ -108441,10 +91911,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), }); declarations.push(Declaration { - id: DeclarationId(3195), + id: DeclarationId(3178), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -108460,10 +91930,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6027, 6031), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), }); declarations.push(Declaration { - id: DeclarationId(3196), + id: DeclarationId(3179), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -108474,21 +91944,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6027, 6031), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), }); declarations.push(Declaration { - id: DeclarationId(3197), + id: DeclarationId(3180), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3195), + ty: DeclarationId(3178), }, Field { label: "None".to_string(), - ty: DeclarationId(3196), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(3179), }, ], }, @@ -108500,14 +91969,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6027, 6031), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3191), -======= - id: DeclarationId(3198), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3181), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -108523,11 +91988,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3192), + id: DeclarationId(3182), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -108538,20 +92002,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), }); declarations.push(Declaration { - id: DeclarationId(3193), + id: DeclarationId(3183), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3191), + ty: DeclarationId(3181), }, Field { label: "None".to_string(), - ty: DeclarationId(3192), + ty: DeclarationId(3182), }, ], }, @@ -108563,15 +92027,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), }); declarations.push(Declaration { - id: DeclarationId(3194), + id: DeclarationId(3184), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -108582,10 +92046,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), }); declarations.push(Declaration { - id: DeclarationId(3195), + id: DeclarationId(3185), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -108596,20 +92060,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), }); declarations.push(Declaration { - id: DeclarationId(3196), + id: DeclarationId(3186), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3194), + ty: DeclarationId(3184), }, Field { label: "None".to_string(), - ty: DeclarationId(3195), + ty: DeclarationId(3185), }, ], }, @@ -108621,10 +92085,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), }); declarations.push(Declaration { - id: DeclarationId(3197), + id: DeclarationId(3187), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -108640,10 +92104,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), }); declarations.push(Declaration { - id: DeclarationId(3198), + id: DeclarationId(3188), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -108654,20 +92118,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), }); declarations.push(Declaration { - id: DeclarationId(3199), + id: DeclarationId(3189), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3197), + ty: DeclarationId(3187), }, Field { label: "None".to_string(), - ty: DeclarationId(3198), + ty: DeclarationId(3188), }, ], }, @@ -108679,15 +92143,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), }); declarations.push(Declaration { - id: DeclarationId(3200), -======= - id: DeclarationId(3199), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3190), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -108696,24 +92162,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3201), + id: DeclarationId(3191), name: None, -======= - id: DeclarationId(3200), + connective: TypeConnective::Conj { children: vec![] }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), + }); + declarations.push(Declaration { + id: DeclarationId(3192), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3198), + ty: DeclarationId(3190), }, Field { label: "None".to_string(), - ty: DeclarationId(3199), + ty: DeclarationId(3191), }, ], }, @@ -108725,10 +92201,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), }); declarations.push(Declaration { - id: DeclarationId(3201), + id: DeclarationId(3193), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -108744,12 +92220,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), }); declarations.push(Declaration { - id: DeclarationId(3202), + id: DeclarationId(3194), name: None, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -108759,34 +92234,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), - }); - declarations.push(Declaration { - id: DeclarationId(3202), -======= - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), }); declarations.push(Declaration { - id: DeclarationId(3203), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3195), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3200), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3201), -======= - ty: DeclarationId(3201), + ty: DeclarationId(3193), }, Field { label: "None".to_string(), - ty: DeclarationId(3202), + ty: DeclarationId(3194), }, ], }, @@ -108798,10 +92259,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), }); declarations.push(Declaration { - id: DeclarationId(3204), + id: DeclarationId(3196), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -108817,10 +92278,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6027, 6031), }); declarations.push(Declaration { - id: DeclarationId(3205), + id: DeclarationId(3197), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -108831,20 +92292,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6027, 6031), }); declarations.push(Declaration { - id: DeclarationId(3206), + id: DeclarationId(3198), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3204), + ty: DeclarationId(3196), }, Field { label: "None".to_string(), - ty: DeclarationId(3205), + ty: DeclarationId(3197), }, ], }, @@ -108856,10 +92317,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6027, 6031), }); declarations.push(Declaration { - id: DeclarationId(3207), + id: DeclarationId(3199), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -108875,10 +92336,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), }); declarations.push(Declaration { - id: DeclarationId(3208), + id: DeclarationId(3200), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -108889,21 +92350,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), }); declarations.push(Declaration { - id: DeclarationId(3209), + id: DeclarationId(3201), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3207), + ty: DeclarationId(3199), }, Field { label: "None".to_string(), - ty: DeclarationId(3208), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(3200), }, ], }, @@ -108915,11 +92375,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3203), + id: DeclarationId(3202), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -108935,10 +92394,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6175, 6179), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), }); declarations.push(Declaration { - id: DeclarationId(3204), + id: DeclarationId(3203), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -108949,20 +92408,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6175, 6179), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), }); declarations.push(Declaration { - id: DeclarationId(3205), + id: DeclarationId(3204), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3203), + ty: DeclarationId(3202), }, Field { label: "None".to_string(), - ty: DeclarationId(3204), + ty: DeclarationId(3203), }, ], }, @@ -108974,10 +92433,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6175, 6179), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), }); declarations.push(Declaration { - id: DeclarationId(3206), + id: DeclarationId(3205), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -108993,10 +92452,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6186, 6190), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), }); declarations.push(Declaration { - id: DeclarationId(3207), + id: DeclarationId(3206), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -109007,20 +92466,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6186, 6190), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), }); declarations.push(Declaration { - id: DeclarationId(3208), + id: DeclarationId(3207), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3206), + ty: DeclarationId(3205), }, Field { label: "None".to_string(), - ty: DeclarationId(3207), + ty: DeclarationId(3206), }, ], }, @@ -109032,15 +92491,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6186, 6190), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), }); declarations.push(Declaration { - id: DeclarationId(3209), + id: DeclarationId(3208), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -109051,10 +92510,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7170, 7174), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), }); declarations.push(Declaration { - id: DeclarationId(3210), + id: DeclarationId(3209), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -109065,31 +92524,41 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7170, 7174), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), }); declarations.push(Declaration { - id: DeclarationId(3211), + id: DeclarationId(3210), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3209), + ty: DeclarationId(3208), }, Field { label: "None".to_string(), - ty: DeclarationId(3210), + ty: DeclarationId(3209), }, ], -======= - id: DeclarationId(3210), + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), + }); + declarations.push(Declaration { + id: DeclarationId(3211), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), ty: DeclarationId(93), }], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -109116,17 +92585,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6175, 6179), }); declarations.push(Declaration { - id: DeclarationId(3212), + id: DeclarationId(3213), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3210), + ty: DeclarationId(3211), }, Field { label: "None".to_string(), - ty: DeclarationId(3211), + ty: DeclarationId(3212), }, ], }, @@ -109141,7 +92610,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6175, 6179), }); declarations.push(Declaration { - id: DeclarationId(3213), + id: DeclarationId(3214), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -109160,7 +92629,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6186, 6190), }); declarations.push(Declaration { - id: DeclarationId(3214), + id: DeclarationId(3215), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -109174,17 +92643,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6186, 6190), }); declarations.push(Declaration { - id: DeclarationId(3215), + id: DeclarationId(3216), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3213), + ty: DeclarationId(3214), }, Field { label: "None".to_string(), - ty: DeclarationId(3214), + ty: DeclarationId(3215), }, ], }, @@ -109199,7 +92668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6186, 6190), }); declarations.push(Declaration { - id: DeclarationId(3216), + id: DeclarationId(3217), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -109218,7 +92687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7170, 7174), }); declarations.push(Declaration { - id: DeclarationId(3217), + id: DeclarationId(3218), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -109232,17 +92701,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7170, 7174), }); declarations.push(Declaration { - id: DeclarationId(3218), + id: DeclarationId(3219), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3216), + ty: DeclarationId(3217), }, Field { label: "None".to_string(), - ty: DeclarationId(3217), + ty: DeclarationId(3218), }, ], }, @@ -109257,7 +92726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7170, 7174), }); declarations.push(Declaration { - id: DeclarationId(3219), + id: DeclarationId(3220), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -109276,11 +92745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7253, 7260), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3213), -======= - id: DeclarationId(3220), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3221), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -109294,29 +92759,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7253, 7260), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3214), -======= - id: DeclarationId(3221), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3222), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3212), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3213), -======= - ty: DeclarationId(3219), + ty: DeclarationId(3220), }, Field { label: "None".to_string(), - ty: DeclarationId(3220), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(3221), }, ], }, @@ -109331,11 +92784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7253, 7260), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3215), -======= - id: DeclarationId(3222), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3223), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -109354,11 +92803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7900, 7904), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3216), -======= - id: DeclarationId(3223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3224), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -109372,29 +92817,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7900, 7904), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(3217), -======= - id: DeclarationId(3224), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3225), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3215), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3216), -======= - ty: DeclarationId(3222), + ty: DeclarationId(3223), }, Field { label: "None".to_string(), - ty: DeclarationId(3223), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(3224), }, ], }, @@ -110931,7 +94364,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(189), Port { id: PortId(189), - state: PortState::Resolved(TypeShape::new(DeclarationId(1977))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1978))), produced_by: Some(NodeId(184)), }, ); @@ -110955,7 +94388,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(192), Port { id: PortId(192), - state: PortState::Resolved(TypeShape::new(DeclarationId(1978))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1979))), produced_by: None, }, ); @@ -110963,7 +94396,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(193), Port { id: PortId(193), - state: PortState::Resolved(TypeShape::new(DeclarationId(1979))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1980))), produced_by: Some(NodeId(186)), }, ); @@ -111251,7 +94684,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(229), Port { id: PortId(229), - state: PortState::Resolved(TypeShape::new(DeclarationId(1980))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1981))), produced_by: None, }, ); @@ -112803,7 +96236,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(423), Port { id: PortId(423), - state: PortState::Resolved(TypeShape::new(DeclarationId(1981))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1982))), produced_by: None, }, ); @@ -112827,7 +96260,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(426), Port { id: PortId(426), - state: PortState::Resolved(TypeShape::new(DeclarationId(1978))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1979))), produced_by: Some(NodeId(363)), }, ); @@ -112843,7 +96276,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(428), Port { id: PortId(428), - state: PortState::Resolved(TypeShape::new(DeclarationId(1982))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1983))), produced_by: Some(NodeId(365)), }, ); @@ -112851,7 +96284,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(429), Port { id: PortId(429), - state: PortState::Resolved(TypeShape::new(DeclarationId(1983))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1984))), produced_by: None, }, ); @@ -112955,7 +96388,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(442), Port { id: PortId(442), - state: PortState::Resolved(TypeShape::new(DeclarationId(1984))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1985))), produced_by: Some(NodeId(378)), }, ); @@ -112963,7 +96396,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(443), Port { id: PortId(443), - state: PortState::Resolved(TypeShape::new(DeclarationId(1985))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1986))), produced_by: None, }, ); @@ -113011,7 +96444,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(449), Port { id: PortId(449), - state: PortState::Resolved(TypeShape::new(DeclarationId(1986))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1987))), produced_by: Some(NodeId(385)), }, ); @@ -113019,7 +96452,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(450), Port { id: PortId(450), - state: PortState::Resolved(TypeShape::new(DeclarationId(1987))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1988))), produced_by: None, }, ); @@ -113099,7 +96532,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(460), Port { id: PortId(460), - state: PortState::Resolved(TypeShape::new(DeclarationId(1988))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1989))), produced_by: None, }, ); @@ -113203,7 +96636,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(473), Port { id: PortId(473), - state: PortState::Resolved(TypeShape::new(DeclarationId(1989))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1990))), produced_by: Some(NodeId(407)), }, ); @@ -113483,7 +96916,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(508), Port { id: PortId(508), - state: PortState::Resolved(TypeShape::new(DeclarationId(1990))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1991))), produced_by: None, }, ); @@ -113595,7 +97028,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(522), Port { id: PortId(522), - state: PortState::Resolved(TypeShape::new(DeclarationId(1991))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1992))), produced_by: None, }, ); @@ -113707,7 +97140,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(536), Port { id: PortId(536), - state: PortState::Resolved(TypeShape::new(DeclarationId(1992))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1993))), produced_by: None, }, ); @@ -114323,7 +97756,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(613), Port { id: PortId(613), - state: PortState::Resolved(TypeShape::new(DeclarationId(1993))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1994))), produced_by: None, }, ); @@ -114435,7 +97868,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(627), Port { id: PortId(627), - state: PortState::Resolved(TypeShape::new(DeclarationId(1994))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1995))), produced_by: Some(NodeId(516)), }, ); @@ -114443,7 +97876,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(628), Port { id: PortId(628), - state: PortState::Resolved(TypeShape::new(DeclarationId(1995))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1996))), produced_by: None, }, ); @@ -114499,7 +97932,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(635), Port { id: PortId(635), - state: PortState::Resolved(TypeShape::new(DeclarationId(1996))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1997))), produced_by: Some(NodeId(523)), }, ); @@ -114507,7 +97940,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(636), Port { id: PortId(636), - state: PortState::Resolved(TypeShape::new(DeclarationId(1997))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1998))), produced_by: None, }, ); @@ -114523,7 +97956,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(638), Port { id: PortId(638), - state: PortState::Resolved(TypeShape::new(DeclarationId(1998))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1999))), produced_by: Some(NodeId(526)), }, ); @@ -114531,7 +97964,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(639), Port { id: PortId(639), - state: PortState::Resolved(TypeShape::new(DeclarationId(1077))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1078))), produced_by: None, }, ); @@ -114699,7 +98132,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(660), Port { id: PortId(660), - state: PortState::Resolved(TypeShape::new(DeclarationId(1076))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1077))), produced_by: None, }, ); @@ -114787,11 +98220,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(671), Port { id: PortId(671), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2320))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2327))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2328))), produced_by: None, }, ); @@ -115223,11 +98652,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(725), Port { id: PortId(725), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2464))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2471))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2472))), produced_by: Some(NodeId(596)), }, ); @@ -115251,11 +98676,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(728), Port { id: PortId(728), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2465))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2472))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2473))), produced_by: Some(NodeId(598)), }, ); @@ -115263,11 +98684,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(729), Port { id: PortId(729), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2466))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2473))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2474))), produced_by: Some(NodeId(600)), }, ); @@ -115275,11 +98692,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(730), Port { id: PortId(730), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2467))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2474))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2475))), produced_by: Some(NodeId(602)), }, ); @@ -115287,11 +98700,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(731), Port { id: PortId(731), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2468))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2475))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2476))), produced_by: Some(NodeId(604)), }, ); @@ -115299,11 +98708,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(732), Port { id: PortId(732), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2469))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2476))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2477))), produced_by: Some(NodeId(606)), }, ); @@ -115311,11 +98716,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(733), Port { id: PortId(733), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2470))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2477))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2478))), produced_by: Some(NodeId(608)), }, ); @@ -115323,11 +98724,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(734), Port { id: PortId(734), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2472))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2479))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2480))), produced_by: Some(NodeId(610)), }, ); @@ -115335,7 +98732,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(735), Port { id: PortId(735), - state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1230))), produced_by: None, }, ); @@ -115359,11 +98756,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(738), Port { id: PortId(738), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2474))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2481))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2482))), produced_by: Some(NodeId(614)), }, ); @@ -115371,7 +98764,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(739), Port { id: PortId(739), - state: PortState::Resolved(TypeShape::new(DeclarationId(974))), + state: PortState::Resolved(TypeShape::new(DeclarationId(975))), produced_by: None, }, ); @@ -115387,11 +98780,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(741), Port { id: PortId(741), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2475))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2482))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2483))), produced_by: Some(NodeId(617)), }, ); @@ -115399,7 +98788,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(742), Port { id: PortId(742), - state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1230))), produced_by: None, }, ); @@ -115423,11 +98812,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(745), Port { id: PortId(745), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2476))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2483))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2484))), produced_by: Some(NodeId(621)), }, ); @@ -115435,7 +98820,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(746), Port { id: PortId(746), - state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1230))), produced_by: None, }, ); @@ -115443,7 +98828,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(747), Port { id: PortId(747), - state: PortState::Resolved(TypeShape::new(DeclarationId(974))), + state: PortState::Resolved(TypeShape::new(DeclarationId(975))), produced_by: None, }, ); @@ -115475,11 +98860,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(751), Port { id: PortId(751), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2477))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2484))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2485))), produced_by: Some(NodeId(626)), }, ); @@ -115495,7 +98876,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(753), Port { id: PortId(753), - state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1230))), produced_by: None, }, ); @@ -115551,11 +98932,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(760), Port { id: PortId(760), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2478))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2485))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2486))), produced_by: Some(NodeId(633)), }, ); @@ -115571,7 +98948,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(762), Port { id: PortId(762), - state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1230))), produced_by: None, }, ); @@ -115579,7 +98956,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(763), Port { id: PortId(763), - state: PortState::Resolved(TypeShape::new(DeclarationId(974))), + state: PortState::Resolved(TypeShape::new(DeclarationId(975))), produced_by: None, }, ); @@ -115635,11 +99012,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(770), Port { id: PortId(770), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2479))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2486))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2487))), produced_by: Some(NodeId(640)), }, ); @@ -115655,7 +99028,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(772), Port { id: PortId(772), - state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1230))), produced_by: None, }, ); @@ -115663,7 +99036,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(773), Port { id: PortId(773), - state: PortState::Resolved(TypeShape::new(DeclarationId(978))), + state: PortState::Resolved(TypeShape::new(DeclarationId(979))), produced_by: None, }, ); @@ -115703,11 +99076,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(778), Port { id: PortId(778), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2480))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2487))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2488))), produced_by: Some(NodeId(645)), }, ); @@ -115723,11 +99092,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(780), Port { id: PortId(780), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2481))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2488))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2489))), produced_by: None, }, ); @@ -115815,11 +99180,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(791), Port { id: PortId(791), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2482))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2489))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2490))), produced_by: Some(NodeId(655)), }, ); @@ -115891,11 +99252,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(800), Port { id: PortId(800), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2483))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2490))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2491))), produced_by: Some(NodeId(663)), }, ); @@ -115911,7 +99268,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(802), Port { id: PortId(802), - state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1230))), produced_by: Some(NodeId(667)), }, ); @@ -115919,7 +99276,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(803), Port { id: PortId(803), - state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1230))), produced_by: None, }, ); @@ -115927,7 +99284,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(804), Port { id: PortId(804), - state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1230))), produced_by: None, }, ); @@ -116215,7 +99572,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(840), Port { id: PortId(840), - state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1230))), produced_by: Some(NodeId(699)), }, ); @@ -116223,7 +99580,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(841), Port { id: PortId(841), - state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1230))), produced_by: None, }, ); @@ -116231,7 +99588,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(842), Port { id: PortId(842), - state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1230))), produced_by: None, }, ); @@ -116247,7 +99604,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(844), Port { id: PortId(844), - state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1230))), produced_by: Some(NodeId(702)), }, ); @@ -116263,7 +99620,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(846), Port { id: PortId(846), - state: PortState::Resolved(TypeShape::new(DeclarationId(1228))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), produced_by: Some(NodeId(705)), }, ); @@ -116279,7 +99636,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(848), Port { id: PortId(848), - state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1230))), produced_by: Some(NodeId(708)), }, ); @@ -116287,7 +99644,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(849), Port { id: PortId(849), - state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1230))), produced_by: None, }, ); @@ -116295,7 +99652,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(850), Port { id: PortId(850), - state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1230))), produced_by: None, }, ); @@ -116311,7 +99668,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(852), Port { id: PortId(852), - state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1230))), produced_by: Some(NodeId(711)), }, ); @@ -116319,11 +99676,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(853), Port { id: PortId(853), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2540))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2547))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2548))), produced_by: Some(NodeId(713)), }, ); @@ -116467,7 +99820,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(871), Port { id: PortId(871), - state: PortState::Resolved(TypeShape::new(DeclarationId(974))), + state: PortState::Resolved(TypeShape::new(DeclarationId(975))), produced_by: Some(NodeId(725)), }, ); @@ -116531,7 +99884,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(879), Port { id: PortId(879), - state: PortState::Resolved(TypeShape::new(DeclarationId(1967))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1968))), produced_by: Some(NodeId(733)), }, ); @@ -116651,7 +100004,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(894), Port { id: PortId(894), - state: PortState::Resolved(TypeShape::new(DeclarationId(978))), + state: PortState::Resolved(TypeShape::new(DeclarationId(979))), produced_by: Some(NodeId(746)), }, ); @@ -116659,7 +100012,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(895), Port { id: PortId(895), - state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1230))), produced_by: None, }, ); @@ -116755,7 +100108,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(907), Port { id: PortId(907), - state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1230))), produced_by: Some(NodeId(755)), }, ); @@ -117099,11 +100452,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(950), Port { id: PortId(950), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2541))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2548))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2549))), produced_by: Some(NodeId(792)), }, ); @@ -117119,7 +100468,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(952), Port { id: PortId(952), - state: PortState::Resolved(TypeShape::new(DeclarationId(1229))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1230))), produced_by: None, }, ); @@ -117231,7 +100580,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(966), Port { id: PortId(966), - state: PortState::Resolved(TypeShape::new(DeclarationId(978))), + state: PortState::Resolved(TypeShape::new(DeclarationId(979))), produced_by: Some(NodeId(806)), }, ); @@ -117247,11 +100596,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(968), Port { id: PortId(968), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2701))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2708))), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2709))), produced_by: Some(NodeId(808)), }, ); @@ -117590,257 +100935,130 @@ fn bootstrapped_fixture_dag_clusters() -> Vec { fn bootstrapped_fixture_dag_optional_match_disjs() -> HashMap { { let mut map = HashMap::new(); -<<<<<<< HEAD - map.insert(DeclarationId(389), DeclarationId(2848)); - map.insert(DeclarationId(391), DeclarationId(2851)); - map.insert(DeclarationId(423), DeclarationId(2854)); - map.insert(DeclarationId(426), DeclarationId(2857)); - map.insert(DeclarationId(471), DeclarationId(2860)); - map.insert(DeclarationId(472), DeclarationId(2863)); - map.insert(DeclarationId(473), DeclarationId(2866)); - map.insert(DeclarationId(513), DeclarationId(2869)); - map.insert(DeclarationId(515), DeclarationId(2872)); - map.insert(DeclarationId(516), DeclarationId(2875)); - map.insert(DeclarationId(539), DeclarationId(2878)); - map.insert(DeclarationId(582), DeclarationId(2881)); - map.insert(DeclarationId(602), DeclarationId(2884)); - map.insert(DeclarationId(603), DeclarationId(2887)); - map.insert(DeclarationId(605), DeclarationId(2890)); - map.insert(DeclarationId(608), DeclarationId(2893)); - map.insert(DeclarationId(613), DeclarationId(2896)); - map.insert(DeclarationId(614), DeclarationId(2899)); - map.insert(DeclarationId(618), DeclarationId(2902)); - map.insert(DeclarationId(619), DeclarationId(2905)); - map.insert(DeclarationId(620), DeclarationId(2908)); - map.insert(DeclarationId(625), DeclarationId(2911)); - map.insert(DeclarationId(1788), DeclarationId(2914)); - map.insert(DeclarationId(1792), DeclarationId(2917)); - map.insert(DeclarationId(1795), DeclarationId(2920)); - map.insert(DeclarationId(1797), DeclarationId(2923)); - map.insert(DeclarationId(1798), DeclarationId(2926)); - map.insert(DeclarationId(1799), DeclarationId(2929)); - map.insert(DeclarationId(1853), DeclarationId(2932)); - map.insert(DeclarationId(1854), DeclarationId(2935)); - map.insert(DeclarationId(1855), DeclarationId(2938)); - map.insert(DeclarationId(1856), DeclarationId(2941)); - map.insert(DeclarationId(1857), DeclarationId(2944)); - map.insert(DeclarationId(1858), DeclarationId(2947)); - map.insert(DeclarationId(1864), DeclarationId(2950)); - map.insert(DeclarationId(1919), DeclarationId(2953)); - map.insert(DeclarationId(1922), DeclarationId(2956)); - map.insert(DeclarationId(1923), DeclarationId(2959)); - map.insert(DeclarationId(1924), DeclarationId(2962)); - map.insert(DeclarationId(1925), DeclarationId(2965)); - map.insert(DeclarationId(1948), DeclarationId(2968)); - map.insert(DeclarationId(1953), DeclarationId(2971)); - map.insert(DeclarationId(1957), DeclarationId(2974)); - map.insert(DeclarationId(1960), DeclarationId(2977)); - map.insert(DeclarationId(1961), DeclarationId(2980)); - map.insert(DeclarationId(2006), DeclarationId(2983)); - map.insert(DeclarationId(2007), DeclarationId(2986)); - map.insert(DeclarationId(2008), DeclarationId(2989)); - map.insert(DeclarationId(2009), DeclarationId(2992)); - map.insert(DeclarationId(2059), DeclarationId(2995)); - map.insert(DeclarationId(2060), DeclarationId(2998)); - map.insert(DeclarationId(2074), DeclarationId(3001)); - map.insert(DeclarationId(2075), DeclarationId(3004)); - map.insert(DeclarationId(2086), DeclarationId(3007)); - map.insert(DeclarationId(2087), DeclarationId(3010)); - map.insert(DeclarationId(2089), DeclarationId(3013)); - map.insert(DeclarationId(2090), DeclarationId(3016)); - map.insert(DeclarationId(2092), DeclarationId(3019)); - map.insert(DeclarationId(2093), DeclarationId(3022)); - map.insert(DeclarationId(2095), DeclarationId(3025)); - map.insert(DeclarationId(2097), DeclarationId(3028)); - map.insert(DeclarationId(2100), DeclarationId(3031)); - map.insert(DeclarationId(2104), DeclarationId(3034)); - map.insert(DeclarationId(2106), DeclarationId(3037)); - map.insert(DeclarationId(2108), DeclarationId(3040)); - map.insert(DeclarationId(2118), DeclarationId(3043)); - map.insert(DeclarationId(2119), DeclarationId(3046)); - map.insert(DeclarationId(2120), DeclarationId(3049)); - map.insert(DeclarationId(2123), DeclarationId(3052)); - map.insert(DeclarationId(2124), DeclarationId(3055)); - map.insert(DeclarationId(2159), DeclarationId(3058)); - map.insert(DeclarationId(2160), DeclarationId(3061)); - map.insert(DeclarationId(2161), DeclarationId(3064)); - map.insert(DeclarationId(2162), DeclarationId(3067)); - map.insert(DeclarationId(2163), DeclarationId(3070)); - map.insert(DeclarationId(2186), DeclarationId(3073)); - map.insert(DeclarationId(2316), DeclarationId(3076)); - map.insert(DeclarationId(2317), DeclarationId(3079)); - map.insert(DeclarationId(2323), DeclarationId(3082)); - map.insert(DeclarationId(2324), DeclarationId(3085)); - map.insert(DeclarationId(2325), DeclarationId(3088)); - map.insert(DeclarationId(2326), DeclarationId(3091)); - map.insert(DeclarationId(2327), DeclarationId(3094)); - map.insert(DeclarationId(2328), DeclarationId(3097)); - map.insert(DeclarationId(2378), DeclarationId(3100)); - map.insert(DeclarationId(2422), DeclarationId(3103)); - map.insert(DeclarationId(2430), DeclarationId(3106)); - map.insert(DeclarationId(2444), DeclarationId(3109)); - map.insert(DeclarationId(2447), DeclarationId(3112)); - map.insert(DeclarationId(2505), DeclarationId(3115)); - map.insert(DeclarationId(2506), DeclarationId(3118)); - map.insert(DeclarationId(2507), DeclarationId(3121)); - map.insert(DeclarationId(2510), DeclarationId(3124)); - map.insert(DeclarationId(2511), DeclarationId(3127)); - map.insert(DeclarationId(2705), DeclarationId(3130)); - map.insert(DeclarationId(2734), DeclarationId(3133)); - map.insert(DeclarationId(2740), DeclarationId(3136)); - map.insert(DeclarationId(2747), DeclarationId(3139)); - map.insert(DeclarationId(2766), DeclarationId(3142)); - map.insert(DeclarationId(2767), DeclarationId(3145)); - map.insert(DeclarationId(2775), DeclarationId(3148)); - map.insert(DeclarationId(2779), DeclarationId(3151)); - map.insert(DeclarationId(2780), DeclarationId(3154)); - map.insert(DeclarationId(2781), DeclarationId(3157)); - map.insert(DeclarationId(2782), DeclarationId(3160)); - map.insert(DeclarationId(2792), DeclarationId(3163)); - map.insert(DeclarationId(2794), DeclarationId(3166)); - map.insert(DeclarationId(2795), DeclarationId(3169)); - map.insert(DeclarationId(2796), DeclarationId(3172)); - map.insert(DeclarationId(2798), DeclarationId(3175)); - map.insert(DeclarationId(2801), DeclarationId(3178)); - map.insert(DeclarationId(2802), DeclarationId(3181)); - map.insert(DeclarationId(2809), DeclarationId(3184)); - map.insert(DeclarationId(2810), DeclarationId(3187)); - map.insert(DeclarationId(2811), DeclarationId(3190)); - map.insert(DeclarationId(2813), DeclarationId(3193)); - map.insert(DeclarationId(2814), DeclarationId(3196)); - map.insert(DeclarationId(2815), DeclarationId(3199)); - map.insert(DeclarationId(2817), DeclarationId(3202)); - map.insert(DeclarationId(2818), DeclarationId(3205)); - map.insert(DeclarationId(2819), DeclarationId(3208)); - map.insert(DeclarationId(2826), DeclarationId(3211)); - map.insert(DeclarationId(2828), DeclarationId(3214)); - map.insert(DeclarationId(2839), DeclarationId(3217)); -======= - map.insert(DeclarationId(389), DeclarationId(2855)); - map.insert(DeclarationId(391), DeclarationId(2858)); - map.insert(DeclarationId(423), DeclarationId(2861)); - map.insert(DeclarationId(426), DeclarationId(2864)); - map.insert(DeclarationId(471), DeclarationId(2867)); - map.insert(DeclarationId(472), DeclarationId(2870)); - map.insert(DeclarationId(473), DeclarationId(2873)); - map.insert(DeclarationId(513), DeclarationId(2876)); - map.insert(DeclarationId(515), DeclarationId(2879)); - map.insert(DeclarationId(516), DeclarationId(2882)); - map.insert(DeclarationId(539), DeclarationId(2885)); - map.insert(DeclarationId(582), DeclarationId(2888)); - map.insert(DeclarationId(602), DeclarationId(2891)); - map.insert(DeclarationId(603), DeclarationId(2894)); - map.insert(DeclarationId(605), DeclarationId(2897)); - map.insert(DeclarationId(608), DeclarationId(2900)); - map.insert(DeclarationId(613), DeclarationId(2903)); - map.insert(DeclarationId(614), DeclarationId(2906)); - map.insert(DeclarationId(618), DeclarationId(2909)); - map.insert(DeclarationId(619), DeclarationId(2912)); - map.insert(DeclarationId(620), DeclarationId(2915)); - map.insert(DeclarationId(625), DeclarationId(2918)); - map.insert(DeclarationId(1788), DeclarationId(2921)); - map.insert(DeclarationId(1792), DeclarationId(2924)); - map.insert(DeclarationId(1795), DeclarationId(2927)); - map.insert(DeclarationId(1797), DeclarationId(2930)); - map.insert(DeclarationId(1798), DeclarationId(2933)); - map.insert(DeclarationId(1799), DeclarationId(2936)); - map.insert(DeclarationId(1853), DeclarationId(2939)); - map.insert(DeclarationId(1854), DeclarationId(2942)); - map.insert(DeclarationId(1855), DeclarationId(2945)); - map.insert(DeclarationId(1856), DeclarationId(2948)); - map.insert(DeclarationId(1857), DeclarationId(2951)); - map.insert(DeclarationId(1858), DeclarationId(2954)); - map.insert(DeclarationId(1864), DeclarationId(2957)); - map.insert(DeclarationId(1919), DeclarationId(2960)); - map.insert(DeclarationId(1922), DeclarationId(2963)); - map.insert(DeclarationId(1923), DeclarationId(2966)); - map.insert(DeclarationId(1924), DeclarationId(2969)); - map.insert(DeclarationId(1925), DeclarationId(2972)); - map.insert(DeclarationId(1948), DeclarationId(2975)); - map.insert(DeclarationId(1953), DeclarationId(2978)); - map.insert(DeclarationId(1957), DeclarationId(2981)); - map.insert(DeclarationId(1960), DeclarationId(2984)); - map.insert(DeclarationId(1961), DeclarationId(2987)); - map.insert(DeclarationId(2006), DeclarationId(2990)); - map.insert(DeclarationId(2007), DeclarationId(2993)); - map.insert(DeclarationId(2008), DeclarationId(2996)); - map.insert(DeclarationId(2009), DeclarationId(2999)); - map.insert(DeclarationId(2059), DeclarationId(3002)); - map.insert(DeclarationId(2060), DeclarationId(3005)); - map.insert(DeclarationId(2081), DeclarationId(3008)); - map.insert(DeclarationId(2082), DeclarationId(3011)); - map.insert(DeclarationId(2093), DeclarationId(3014)); - map.insert(DeclarationId(2094), DeclarationId(3017)); - map.insert(DeclarationId(2096), DeclarationId(3020)); - map.insert(DeclarationId(2097), DeclarationId(3023)); - map.insert(DeclarationId(2099), DeclarationId(3026)); - map.insert(DeclarationId(2100), DeclarationId(3029)); - map.insert(DeclarationId(2102), DeclarationId(3032)); - map.insert(DeclarationId(2104), DeclarationId(3035)); - map.insert(DeclarationId(2107), DeclarationId(3038)); - map.insert(DeclarationId(2111), DeclarationId(3041)); - map.insert(DeclarationId(2113), DeclarationId(3044)); - map.insert(DeclarationId(2115), DeclarationId(3047)); - map.insert(DeclarationId(2125), DeclarationId(3050)); - map.insert(DeclarationId(2126), DeclarationId(3053)); - map.insert(DeclarationId(2127), DeclarationId(3056)); - map.insert(DeclarationId(2130), DeclarationId(3059)); - map.insert(DeclarationId(2131), DeclarationId(3062)); - map.insert(DeclarationId(2166), DeclarationId(3065)); - map.insert(DeclarationId(2167), DeclarationId(3068)); - map.insert(DeclarationId(2168), DeclarationId(3071)); - map.insert(DeclarationId(2169), DeclarationId(3074)); - map.insert(DeclarationId(2170), DeclarationId(3077)); - map.insert(DeclarationId(2193), DeclarationId(3080)); - map.insert(DeclarationId(2323), DeclarationId(3083)); - map.insert(DeclarationId(2324), DeclarationId(3086)); - map.insert(DeclarationId(2330), DeclarationId(3089)); - map.insert(DeclarationId(2331), DeclarationId(3092)); - map.insert(DeclarationId(2332), DeclarationId(3095)); - map.insert(DeclarationId(2333), DeclarationId(3098)); - map.insert(DeclarationId(2334), DeclarationId(3101)); - map.insert(DeclarationId(2335), DeclarationId(3104)); - map.insert(DeclarationId(2385), DeclarationId(3107)); - map.insert(DeclarationId(2429), DeclarationId(3110)); - map.insert(DeclarationId(2437), DeclarationId(3113)); - map.insert(DeclarationId(2451), DeclarationId(3116)); - map.insert(DeclarationId(2454), DeclarationId(3119)); - map.insert(DeclarationId(2512), DeclarationId(3122)); - map.insert(DeclarationId(2513), DeclarationId(3125)); - map.insert(DeclarationId(2514), DeclarationId(3128)); - map.insert(DeclarationId(2517), DeclarationId(3131)); - map.insert(DeclarationId(2518), DeclarationId(3134)); - map.insert(DeclarationId(2712), DeclarationId(3137)); - map.insert(DeclarationId(2741), DeclarationId(3140)); - map.insert(DeclarationId(2747), DeclarationId(3143)); - map.insert(DeclarationId(2754), DeclarationId(3146)); - map.insert(DeclarationId(2773), DeclarationId(3149)); - map.insert(DeclarationId(2774), DeclarationId(3152)); - map.insert(DeclarationId(2782), DeclarationId(3155)); - map.insert(DeclarationId(2786), DeclarationId(3158)); - map.insert(DeclarationId(2787), DeclarationId(3161)); - map.insert(DeclarationId(2788), DeclarationId(3164)); - map.insert(DeclarationId(2789), DeclarationId(3167)); - map.insert(DeclarationId(2799), DeclarationId(3170)); - map.insert(DeclarationId(2801), DeclarationId(3173)); - map.insert(DeclarationId(2802), DeclarationId(3176)); - map.insert(DeclarationId(2803), DeclarationId(3179)); - map.insert(DeclarationId(2805), DeclarationId(3182)); - map.insert(DeclarationId(2808), DeclarationId(3185)); - map.insert(DeclarationId(2809), DeclarationId(3188)); - map.insert(DeclarationId(2816), DeclarationId(3191)); - map.insert(DeclarationId(2817), DeclarationId(3194)); - map.insert(DeclarationId(2818), DeclarationId(3197)); - map.insert(DeclarationId(2820), DeclarationId(3200)); - map.insert(DeclarationId(2821), DeclarationId(3203)); - map.insert(DeclarationId(2822), DeclarationId(3206)); - map.insert(DeclarationId(2824), DeclarationId(3209)); - map.insert(DeclarationId(2825), DeclarationId(3212)); - map.insert(DeclarationId(2826), DeclarationId(3215)); - map.insert(DeclarationId(2833), DeclarationId(3218)); - map.insert(DeclarationId(2835), DeclarationId(3221)); - map.insert(DeclarationId(2846), DeclarationId(3224)); ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + map.insert(DeclarationId(389), DeclarationId(2856)); + map.insert(DeclarationId(391), DeclarationId(2859)); + map.insert(DeclarationId(423), DeclarationId(2862)); + map.insert(DeclarationId(426), DeclarationId(2865)); + map.insert(DeclarationId(471), DeclarationId(2868)); + map.insert(DeclarationId(472), DeclarationId(2871)); + map.insert(DeclarationId(473), DeclarationId(2874)); + map.insert(DeclarationId(513), DeclarationId(2877)); + map.insert(DeclarationId(515), DeclarationId(2880)); + map.insert(DeclarationId(516), DeclarationId(2883)); + map.insert(DeclarationId(539), DeclarationId(2886)); + map.insert(DeclarationId(582), DeclarationId(2889)); + map.insert(DeclarationId(602), DeclarationId(2892)); + map.insert(DeclarationId(603), DeclarationId(2895)); + map.insert(DeclarationId(605), DeclarationId(2898)); + map.insert(DeclarationId(608), DeclarationId(2901)); + map.insert(DeclarationId(613), DeclarationId(2904)); + map.insert(DeclarationId(614), DeclarationId(2907)); + map.insert(DeclarationId(618), DeclarationId(2910)); + map.insert(DeclarationId(619), DeclarationId(2913)); + map.insert(DeclarationId(620), DeclarationId(2916)); + map.insert(DeclarationId(625), DeclarationId(2919)); + map.insert(DeclarationId(1789), DeclarationId(2922)); + map.insert(DeclarationId(1793), DeclarationId(2925)); + map.insert(DeclarationId(1796), DeclarationId(2928)); + map.insert(DeclarationId(1798), DeclarationId(2931)); + map.insert(DeclarationId(1799), DeclarationId(2934)); + map.insert(DeclarationId(1800), DeclarationId(2937)); + map.insert(DeclarationId(1854), DeclarationId(2940)); + map.insert(DeclarationId(1855), DeclarationId(2943)); + map.insert(DeclarationId(1856), DeclarationId(2946)); + map.insert(DeclarationId(1857), DeclarationId(2949)); + map.insert(DeclarationId(1858), DeclarationId(2952)); + map.insert(DeclarationId(1859), DeclarationId(2955)); + map.insert(DeclarationId(1865), DeclarationId(2958)); + map.insert(DeclarationId(1920), DeclarationId(2961)); + map.insert(DeclarationId(1923), DeclarationId(2964)); + map.insert(DeclarationId(1924), DeclarationId(2967)); + map.insert(DeclarationId(1925), DeclarationId(2970)); + map.insert(DeclarationId(1926), DeclarationId(2973)); + map.insert(DeclarationId(1949), DeclarationId(2976)); + map.insert(DeclarationId(1954), DeclarationId(2979)); + map.insert(DeclarationId(1958), DeclarationId(2982)); + map.insert(DeclarationId(1961), DeclarationId(2985)); + map.insert(DeclarationId(1962), DeclarationId(2988)); + map.insert(DeclarationId(2007), DeclarationId(2991)); + map.insert(DeclarationId(2008), DeclarationId(2994)); + map.insert(DeclarationId(2009), DeclarationId(2997)); + map.insert(DeclarationId(2010), DeclarationId(3000)); + map.insert(DeclarationId(2060), DeclarationId(3003)); + map.insert(DeclarationId(2061), DeclarationId(3006)); + map.insert(DeclarationId(2082), DeclarationId(3009)); + map.insert(DeclarationId(2083), DeclarationId(3012)); + map.insert(DeclarationId(2094), DeclarationId(3015)); + map.insert(DeclarationId(2095), DeclarationId(3018)); + map.insert(DeclarationId(2097), DeclarationId(3021)); + map.insert(DeclarationId(2098), DeclarationId(3024)); + map.insert(DeclarationId(2100), DeclarationId(3027)); + map.insert(DeclarationId(2101), DeclarationId(3030)); + map.insert(DeclarationId(2103), DeclarationId(3033)); + map.insert(DeclarationId(2105), DeclarationId(3036)); + map.insert(DeclarationId(2108), DeclarationId(3039)); + map.insert(DeclarationId(2112), DeclarationId(3042)); + map.insert(DeclarationId(2114), DeclarationId(3045)); + map.insert(DeclarationId(2116), DeclarationId(3048)); + map.insert(DeclarationId(2126), DeclarationId(3051)); + map.insert(DeclarationId(2127), DeclarationId(3054)); + map.insert(DeclarationId(2128), DeclarationId(3057)); + map.insert(DeclarationId(2131), DeclarationId(3060)); + map.insert(DeclarationId(2132), DeclarationId(3063)); + map.insert(DeclarationId(2167), DeclarationId(3066)); + map.insert(DeclarationId(2168), DeclarationId(3069)); + map.insert(DeclarationId(2169), DeclarationId(3072)); + map.insert(DeclarationId(2170), DeclarationId(3075)); + map.insert(DeclarationId(2171), DeclarationId(3078)); + map.insert(DeclarationId(2194), DeclarationId(3081)); + map.insert(DeclarationId(2324), DeclarationId(3084)); + map.insert(DeclarationId(2325), DeclarationId(3087)); + map.insert(DeclarationId(2331), DeclarationId(3090)); + map.insert(DeclarationId(2332), DeclarationId(3093)); + map.insert(DeclarationId(2333), DeclarationId(3096)); + map.insert(DeclarationId(2334), DeclarationId(3099)); + map.insert(DeclarationId(2335), DeclarationId(3102)); + map.insert(DeclarationId(2336), DeclarationId(3105)); + map.insert(DeclarationId(2386), DeclarationId(3108)); + map.insert(DeclarationId(2430), DeclarationId(3111)); + map.insert(DeclarationId(2438), DeclarationId(3114)); + map.insert(DeclarationId(2452), DeclarationId(3117)); + map.insert(DeclarationId(2455), DeclarationId(3120)); + map.insert(DeclarationId(2513), DeclarationId(3123)); + map.insert(DeclarationId(2514), DeclarationId(3126)); + map.insert(DeclarationId(2515), DeclarationId(3129)); + map.insert(DeclarationId(2518), DeclarationId(3132)); + map.insert(DeclarationId(2519), DeclarationId(3135)); + map.insert(DeclarationId(2713), DeclarationId(3138)); + map.insert(DeclarationId(2742), DeclarationId(3141)); + map.insert(DeclarationId(2748), DeclarationId(3144)); + map.insert(DeclarationId(2755), DeclarationId(3147)); + map.insert(DeclarationId(2774), DeclarationId(3150)); + map.insert(DeclarationId(2775), DeclarationId(3153)); + map.insert(DeclarationId(2783), DeclarationId(3156)); + map.insert(DeclarationId(2787), DeclarationId(3159)); + map.insert(DeclarationId(2788), DeclarationId(3162)); + map.insert(DeclarationId(2789), DeclarationId(3165)); + map.insert(DeclarationId(2790), DeclarationId(3168)); + map.insert(DeclarationId(2800), DeclarationId(3171)); + map.insert(DeclarationId(2802), DeclarationId(3174)); + map.insert(DeclarationId(2803), DeclarationId(3177)); + map.insert(DeclarationId(2804), DeclarationId(3180)); + map.insert(DeclarationId(2806), DeclarationId(3183)); + map.insert(DeclarationId(2809), DeclarationId(3186)); + map.insert(DeclarationId(2810), DeclarationId(3189)); + map.insert(DeclarationId(2817), DeclarationId(3192)); + map.insert(DeclarationId(2818), DeclarationId(3195)); + map.insert(DeclarationId(2819), DeclarationId(3198)); + map.insert(DeclarationId(2821), DeclarationId(3201)); + map.insert(DeclarationId(2822), DeclarationId(3204)); + map.insert(DeclarationId(2823), DeclarationId(3207)); + map.insert(DeclarationId(2825), DeclarationId(3210)); + map.insert(DeclarationId(2826), DeclarationId(3213)); + map.insert(DeclarationId(2827), DeclarationId(3216)); + map.insert(DeclarationId(2834), DeclarationId(3219)); + map.insert(DeclarationId(2836), DeclarationId(3222)); + map.insert(DeclarationId(2847), DeclarationId(3225)); map } } diff --git a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs index edaf354c0e7..d11a62cd46b 100644 --- a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs +++ b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs @@ -8,11 +8,7 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag { ports: bootstrapped_fixture_without_parse_surface_dag_ports(), diagnostics: bootstrapped_fixture_without_parse_surface_dag_diagnostics(), next_node_id: 844, -<<<<<<< HEAD - next_declaration_id: 3116, -======= - next_declaration_id: 3123, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + next_declaration_id: 3124, next_port_id: 1009, primitives: PrimitiveCache::default(), substrate_markers: SubstrateMarkers::default(), @@ -28,11 +24,7 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag { emit_model_variants: EmitModelVariants::default(), clusters: bootstrapped_fixture_without_parse_surface_dag_clusters(), optional_match_disjs: bootstrapped_fixture_without_parse_surface_dag_optional_match_disjs(), -<<<<<<< HEAD - declaration_append_begin_after_bootstrap: 3116, -======= - declaration_append_begin_after_bootstrap: 3123, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + declaration_append_begin_after_bootstrap: 3124, } } @@ -1410,21 +1402,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(182), - target: TransformTarget::Callable(DeclarationId(2016)), + target: TransformTarget::Callable(DeclarationId(2017)), inputs: vec![PortId(185)], output: PortId(187), span: SourceSpan::new("src/v3/std/algebra.dag", 11495, 11507), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(183), - target: TransformTarget::Callable(DeclarationId(2018)), + target: TransformTarget::Callable(DeclarationId(2019)), inputs: vec![PortId(187)], output: PortId(188), span: SourceSpan::new("src/v3/std/algebra.dag", 11488, 11535), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(184), - target: TransformTarget::Callable(DeclarationId(1962)), + target: TransformTarget::Callable(DeclarationId(1963)), inputs: vec![PortId(185), PortId(186), PortId(188)], output: PortId(189), span: SourceSpan::new("src/v3/std/algebra.dag", 11149, 11539), @@ -1440,7 +1432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(186), - target: TransformTarget::Callable(DeclarationId(1964)), + target: TransformTarget::Callable(DeclarationId(1965)), inputs: vec![PortId(190), PortId(191), PortId(192)], output: PortId(193), span: SourceSpan::new("src/v3/std/algebra.dag", 11670, 11726), @@ -1456,7 +1448,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(188), - target: TransformTarget::Callable(DeclarationId(2019)), + target: TransformTarget::Callable(DeclarationId(2020)), inputs: vec![PortId(194)], output: PortId(195), span: SourceSpan::new("src/v3/std/algebra.dag", 11795, 11810), @@ -1608,7 +1600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(202), - target: TransformTarget::Callable(DeclarationId(2003)), + target: TransformTarget::Callable(DeclarationId(2004)), inputs: vec![PortId(211)], output: PortId(212), span: SourceSpan::new("src/v3/std/algebra.dag", 12325, 12349), @@ -1638,7 +1630,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(206), - target: TransformTarget::Callable(DeclarationId(2001)), + target: TransformTarget::Callable(DeclarationId(2002)), inputs: vec![PortId(216)], output: PortId(217), span: SourceSpan::new("src/v3/std/algebra.dag", 12618, 12653), @@ -1768,14 +1760,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(218), - target: TransformTarget::Callable(DeclarationId(1997)), + target: TransformTarget::Callable(DeclarationId(1998)), inputs: vec![PortId(230)], output: PortId(231), span: SourceSpan::new("src/v3/std/algebra.dag", 14214, 14229), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(219), - target: TransformTarget::Callable(DeclarationId(2021)), + target: TransformTarget::Callable(DeclarationId(2022)), inputs: vec![PortId(229), PortId(231)], output: PortId(232), span: SourceSpan::new("src/v3/std/algebra.dag", 14202, 14245), @@ -2480,7 +2472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(266), - target: TransformTarget::Callable(DeclarationId(2023)), + target: TransformTarget::Callable(DeclarationId(2024)), inputs: vec![PortId(312), PortId(313)], output: PortId(314), span: SourceSpan::new("src/v3/std/algebra.dag", 16911, 17021), @@ -2508,7 +2500,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(270), - target: TransformTarget::Callable(DeclarationId(2025)), + target: TransformTarget::Callable(DeclarationId(2026)), inputs: vec![PortId(317), PortId(318)], output: PortId(319), span: SourceSpan::new("src/v3/std/algebra.dag", 17076, 17186), @@ -2819,14 +2811,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(290), - target: TransformTarget::Callable(DeclarationId(1198)), + target: TransformTarget::Callable(DeclarationId(1199)), inputs: vec![PortId(339)], output: PortId(344), span: SourceSpan::new("src/v3/std/algebra.dag", 18897, 18924), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(291), - target: TransformTarget::Callable(DeclarationId(1198)), + target: TransformTarget::Callable(DeclarationId(1199)), inputs: vec![PortId(343)], output: PortId(345), span: SourceSpan::new("src/v3/std/algebra.dag", 18928, 18955), @@ -4001,14 +3993,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(364), - target: TransformTarget::Callable(DeclarationId(2026)), + target: TransformTarget::Callable(DeclarationId(2027)), inputs: vec![PortId(425), PortId(426)], output: PortId(427), span: SourceSpan::new("src/v3/std/algebra.dag", 22293, 22323), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(365), - target: TransformTarget::Callable(DeclarationId(2027)), + target: TransformTarget::Callable(DeclarationId(2028)), inputs: vec![PortId(424), PortId(427)], output: PortId(428), span: SourceSpan::new("src/v3/std/algebra.dag", 22275, 22324), @@ -4024,7 +4016,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(367), - target: TransformTarget::Callable(DeclarationId(2028)), + target: TransformTarget::Callable(DeclarationId(2029)), inputs: vec![], output: PortId(430), span: SourceSpan::new("src/v3/std/algebra.dag", 22603, 22610), @@ -4088,7 +4080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(375), - target: TransformTarget::Callable(DeclarationId(2029)), + target: TransformTarget::Callable(DeclarationId(2030)), inputs: vec![PortId(436), PortId(438)], output: PortId(439), span: SourceSpan::new("src/v3/std/algebra.dag", 22737, 22789), @@ -4184,21 +4176,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(382), - target: TransformTarget::Callable(DeclarationId(1997)), + target: TransformTarget::Callable(DeclarationId(1998)), inputs: vec![PortId(445)], output: PortId(446), span: SourceSpan::new("src/v3/std/algebra.dag", 23123, 23138), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(383), - target: TransformTarget::Callable(DeclarationId(2030)), + target: TransformTarget::Callable(DeclarationId(2031)), inputs: vec![], output: PortId(447), span: SourceSpan::new("src/v3/std/algebra.dag", 23140, 23147), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(384), - target: TransformTarget::Callable(DeclarationId(2031)), + target: TransformTarget::Callable(DeclarationId(2032)), inputs: vec![PortId(446), PortId(447)], output: PortId(448), span: SourceSpan::new("src/v3/std/algebra.dag", 23118, 23148), @@ -4335,7 +4327,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(396), - target: TransformTarget::Callable(DeclarationId(2032)), + target: TransformTarget::Callable(DeclarationId(2033)), inputs: vec![], output: PortId(461), span: SourceSpan::new("src/v3/std/algebra.dag", 23597, 23604), @@ -4399,7 +4391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(404), - target: TransformTarget::Callable(DeclarationId(2033)), + target: TransformTarget::Callable(DeclarationId(2034)), inputs: vec![PortId(467), PortId(469)], output: PortId(470), span: SourceSpan::new("src/v3/std/algebra.dag", 23735, 23792), @@ -4804,7 +4796,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(430), - target: TransformTarget::Callable(DeclarationId(1997)), + target: TransformTarget::Callable(DeclarationId(1998)), inputs: vec![PortId(509)], output: PortId(510), span: SourceSpan::new("src/v3/std/algebra.dag", 25180, 25195), @@ -4847,7 +4839,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(435), - target: TransformTarget::Callable(DeclarationId(2034)), + target: TransformTarget::Callable(DeclarationId(2035)), inputs: vec![PortId(515), PortId(516)], output: PortId(517), span: SourceSpan::new("src/v3/std/algebra.dag", 25317, 25349), @@ -4944,7 +4936,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(442), - target: TransformTarget::Callable(DeclarationId(1997)), + target: TransformTarget::Callable(DeclarationId(1998)), inputs: vec![PortId(523)], output: PortId(524), span: SourceSpan::new("src/v3/std/algebra.dag", 25451, 25466), @@ -5003,7 +4995,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(449), - target: TransformTarget::Callable(DeclarationId(2003)), + target: TransformTarget::Callable(DeclarationId(2004)), inputs: vec![PortId(532)], output: PortId(533), span: SourceSpan::new("src/v3/std/algebra.dag", 25569, 25628), @@ -5086,7 +5078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(454), - target: TransformTarget::Callable(DeclarationId(1997)), + target: TransformTarget::Callable(DeclarationId(1998)), inputs: vec![PortId(537)], output: PortId(538), span: SourceSpan::new("src/v3/std/algebra.dag", 25917, 25932), @@ -5179,7 +5171,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(465), - target: TransformTarget::Callable(DeclarationId(2001)), + target: TransformTarget::Callable(DeclarationId(2002)), inputs: vec![PortId(551)], output: PortId(552), span: SourceSpan::new("src/v3/std/algebra.dag", 26159, 26222), @@ -5651,7 +5643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(494), - target: TransformTarget::Callable(DeclarationId(2001)), + target: TransformTarget::Callable(DeclarationId(2002)), inputs: vec![PortId(601)], output: PortId(602), span: SourceSpan::new("src/v3/std/algebra.dag", 27605, 27633), @@ -5742,7 +5734,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(505), - target: TransformTarget::Callable(DeclarationId(2035)), + target: TransformTarget::Callable(DeclarationId(2036)), inputs: vec![], output: PortId(615), span: SourceSpan::new("src/v3/std/algebra.dag", 27988, 27995), @@ -5806,7 +5798,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(513), - target: TransformTarget::Callable(DeclarationId(2036)), + target: TransformTarget::Callable(DeclarationId(2037)), inputs: vec![PortId(621), PortId(623)], output: PortId(624), span: SourceSpan::new("src/v3/std/algebra.dag", 28136, 28201), @@ -5895,7 +5887,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(519), - target: TransformTarget::Callable(DeclarationId(2038)), + target: TransformTarget::Callable(DeclarationId(2039)), inputs: vec![PortId(628), PortId(630)], output: PortId(631), span: SourceSpan::new("src/v3/std/algebra.dag", 28319, 28377), @@ -5916,7 +5908,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(522), - target: TransformTarget::Callable(DeclarationId(2039)), + target: TransformTarget::Callable(DeclarationId(2040)), inputs: vec![PortId(629), PortId(633)], output: PortId(634), span: SourceSpan::new("src/v3/std/algebra.dag", 28403, 28449), @@ -5959,14 +5951,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(525), - target: TransformTarget::Callable(DeclarationId(2040)), + target: TransformTarget::Callable(DeclarationId(2041)), inputs: vec![], output: PortId(637), span: SourceSpan::new("src/v3/std/algebra.dag", 28720, 28727), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(526), - target: TransformTarget::Callable(DeclarationId(2042)), + target: TransformTarget::Callable(DeclarationId(2043)), inputs: vec![PortId(636), PortId(637)], output: PortId(638), span: SourceSpan::new("src/v3/std/algebra.dag", 28708, 28749), @@ -5989,7 +5981,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(529), - target: TransformTarget::Callable(DeclarationId(1997)), + target: TransformTarget::Callable(DeclarationId(1998)), inputs: vec![PortId(640)], output: PortId(641), span: SourceSpan::new("src/v3/std/induction.dag", 29099, 29114), @@ -6005,7 +5997,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(531), - target: TransformTarget::Callable(DeclarationId(1081)), + target: TransformTarget::Callable(DeclarationId(1082)), inputs: vec![PortId(643)], output: PortId(644), span: SourceSpan::new("src/v3/std/induction.dag", 29146, 29172), @@ -6021,7 +6013,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(533), - target: TransformTarget::Callable(DeclarationId(1082)), + target: TransformTarget::Callable(DeclarationId(1083)), inputs: vec![PortId(646)], output: PortId(647), span: SourceSpan::new("src/v3/std/induction.dag", 29209, 29238), @@ -6037,7 +6029,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(535), - target: TransformTarget::Callable(DeclarationId(1084)), + target: TransformTarget::Callable(DeclarationId(1085)), inputs: vec![PortId(649)], output: PortId(650), span: SourceSpan::new("src/v3/std/induction.dag", 29279, 29307), @@ -6062,7 +6054,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(538), - target: TransformTarget::Callable(DeclarationId(2005)), + target: TransformTarget::Callable(DeclarationId(2006)), inputs: vec![PortId(653)], output: PortId(654), span: SourceSpan::new("src/v3/std/induction.dag", 29338, 29412), @@ -6076,7 +6068,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(540), - target: TransformTarget::Callable(DeclarationId(2005)), + target: TransformTarget::Callable(DeclarationId(2006)), inputs: vec![PortId(655)], output: PortId(656), span: SourceSpan::new("src/v3/std/induction.dag", 29433, 29461), @@ -6090,7 +6082,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(542), - target: TransformTarget::Callable(DeclarationId(2005)), + target: TransformTarget::Callable(DeclarationId(2006)), inputs: vec![PortId(657)], output: PortId(658), span: SourceSpan::new("src/v3/std/induction.dag", 29480, 29513), @@ -6217,7 +6209,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(548), - target: TransformTarget::Callable(DeclarationId(2005)), + target: TransformTarget::Callable(DeclarationId(2006)), inputs: vec![PortId(664)], output: PortId(665), span: SourceSpan::new("src/v3/std/induction.dag", 29645, 29726), @@ -6242,7 +6234,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(551), - target: TransformTarget::Callable(DeclarationId(2005)), + target: TransformTarget::Callable(DeclarationId(2006)), inputs: vec![PortId(668)], output: PortId(669), span: SourceSpan::new("src/v3/std/induction.dag", 29761, 29835), @@ -6291,7 +6283,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(554), - target: TransformTarget::Callable(DeclarationId(1082)), + target: TransformTarget::Callable(DeclarationId(1083)), inputs: vec![PortId(671)], output: PortId(672), span: SourceSpan::new("src/v3/std/induction.dag", 30026, 30060), @@ -6307,32 +6299,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(556), - target: TransformTarget::Callable(DeclarationId(1223)), + target: TransformTarget::Callable(DeclarationId(1224)), inputs: vec![], output: PortId(676), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3031, 3059), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(557), - target: TransformTarget::Callable(DeclarationId(1232)), + target: TransformTarget::Callable(DeclarationId(1233)), inputs: vec![PortId(673), PortId(676)], output: PortId(677), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3007, 3060), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(558), - target: TransformTarget::Callable(DeclarationId(1223)), + target: TransformTarget::Callable(DeclarationId(1224)), inputs: vec![], output: PortId(678), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3096, 3124), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(559), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2397)), -======= - target: TransformTarget::Callable(DeclarationId(2404)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2405)), inputs: vec![PortId(678)], output: PortId(679), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3087, 3125), @@ -6348,18 +6336,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(561), - target: TransformTarget::Callable(DeclarationId(1223)), + target: TransformTarget::Callable(DeclarationId(1224)), inputs: vec![], output: PortId(682), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3174, 3202), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(562), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2398)), -======= - target: TransformTarget::Callable(DeclarationId(2405)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2406)), inputs: vec![PortId(682)], output: PortId(683), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3165, 3203), @@ -6404,32 +6388,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(564), - target: TransformTarget::Callable(DeclarationId(1223)), + target: TransformTarget::Callable(DeclarationId(1224)), inputs: vec![], output: PortId(686), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3268, 3296), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(565), - target: TransformTarget::Callable(DeclarationId(1232)), + target: TransformTarget::Callable(DeclarationId(1233)), inputs: vec![PortId(673), PortId(686)], output: PortId(687), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3244, 3297), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(566), - target: TransformTarget::Callable(DeclarationId(1223)), + target: TransformTarget::Callable(DeclarationId(1224)), inputs: vec![], output: PortId(688), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3333, 3361), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(567), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2399)), -======= - target: TransformTarget::Callable(DeclarationId(2406)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2407)), inputs: vec![PortId(688)], output: PortId(689), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3324, 3362), @@ -6445,18 +6425,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(569), - target: TransformTarget::Callable(DeclarationId(1223)), + target: TransformTarget::Callable(DeclarationId(1224)), inputs: vec![], output: PortId(692), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3411, 3439), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(570), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2400)), -======= - target: TransformTarget::Callable(DeclarationId(2407)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2408)), inputs: vec![PortId(692)], output: PortId(693), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3402, 3440), @@ -6501,32 +6477,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(572), - target: TransformTarget::Callable(DeclarationId(1223)), + target: TransformTarget::Callable(DeclarationId(1224)), inputs: vec![], output: PortId(696), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3502, 3530), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(573), - target: TransformTarget::Callable(DeclarationId(1232)), + target: TransformTarget::Callable(DeclarationId(1233)), inputs: vec![PortId(673), PortId(696)], output: PortId(697), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3478, 3531), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(574), - target: TransformTarget::Callable(DeclarationId(1223)), + target: TransformTarget::Callable(DeclarationId(1224)), inputs: vec![], output: PortId(698), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3567, 3595), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(575), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2401)), -======= - target: TransformTarget::Callable(DeclarationId(2408)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2409)), inputs: vec![PortId(698)], output: PortId(699), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3558, 3596), @@ -6542,18 +6514,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(577), - target: TransformTarget::Callable(DeclarationId(1223)), + target: TransformTarget::Callable(DeclarationId(1224)), inputs: vec![], output: PortId(702), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3645, 3673), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(578), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2402)), -======= - target: TransformTarget::Callable(DeclarationId(2409)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2410)), inputs: vec![PortId(702)], output: PortId(703), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3636, 3674), @@ -6598,32 +6566,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(580), - target: TransformTarget::Callable(DeclarationId(1223)), + target: TransformTarget::Callable(DeclarationId(1224)), inputs: vec![], output: PortId(706), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3734, 3762), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(581), - target: TransformTarget::Callable(DeclarationId(1232)), + target: TransformTarget::Callable(DeclarationId(1233)), inputs: vec![PortId(673), PortId(706)], output: PortId(707), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3710, 3763), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(582), - target: TransformTarget::Callable(DeclarationId(1223)), + target: TransformTarget::Callable(DeclarationId(1224)), inputs: vec![], output: PortId(708), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3799, 3827), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(583), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2403)), -======= - target: TransformTarget::Callable(DeclarationId(2410)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2411)), inputs: vec![PortId(708)], output: PortId(709), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3790, 3828), @@ -6639,18 +6603,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(585), - target: TransformTarget::Callable(DeclarationId(1223)), + target: TransformTarget::Callable(DeclarationId(1224)), inputs: vec![], output: PortId(712), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3877, 3905), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(586), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2404)), -======= - target: TransformTarget::Callable(DeclarationId(2411)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2412)), inputs: vec![PortId(712)], output: PortId(713), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3868, 3906), @@ -6695,32 +6655,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(588), - target: TransformTarget::Callable(DeclarationId(1223)), + target: TransformTarget::Callable(DeclarationId(1224)), inputs: vec![], output: PortId(716), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3966, 3994), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(589), - target: TransformTarget::Callable(DeclarationId(1232)), + target: TransformTarget::Callable(DeclarationId(1233)), inputs: vec![PortId(673), PortId(716)], output: PortId(717), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3942, 3995), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(590), - target: TransformTarget::Callable(DeclarationId(1223)), + target: TransformTarget::Callable(DeclarationId(1224)), inputs: vec![], output: PortId(718), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4031, 4059), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(591), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2405)), -======= - target: TransformTarget::Callable(DeclarationId(2412)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2413)), inputs: vec![PortId(718)], output: PortId(719), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4022, 4060), @@ -6736,18 +6692,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(593), - target: TransformTarget::Callable(DeclarationId(1223)), + target: TransformTarget::Callable(DeclarationId(1224)), inputs: vec![], output: PortId(722), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4109, 4137), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(594), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2406)), -======= - target: TransformTarget::Callable(DeclarationId(2413)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2414)), inputs: vec![PortId(722)], output: PortId(723), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4100, 4138), @@ -6890,7 +6842,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(598), - target: TransformTarget::Callable(DeclarationId(1172)), + target: TransformTarget::Callable(DeclarationId(1173)), inputs: vec![PortId(726), PortId(727)], output: PortId(728), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4541, 4566), @@ -6906,11 +6858,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(600), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2407)), -======= - target: TransformTarget::Callable(DeclarationId(2414)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2415)), inputs: vec![], output: PortId(729), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4824, 4829), @@ -6926,11 +6874,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(602), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2408)), -======= - target: TransformTarget::Callable(DeclarationId(2415)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2416)), inputs: vec![], output: PortId(730), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4889, 4894), @@ -6946,11 +6890,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(604), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2409)), -======= - target: TransformTarget::Callable(DeclarationId(2416)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2417)), inputs: vec![], output: PortId(731), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4952, 4957), @@ -6966,11 +6906,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(606), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2410)), -======= - target: TransformTarget::Callable(DeclarationId(2417)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2418)), inputs: vec![], output: PortId(732), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5015, 5020), @@ -6986,11 +6922,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(608), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2411)), -======= - target: TransformTarget::Callable(DeclarationId(2418)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2419)), inputs: vec![], output: PortId(733), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5079, 5084), @@ -7006,11 +6938,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(610), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2412)), -======= - target: TransformTarget::Callable(DeclarationId(2419)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2420)), inputs: vec![], output: PortId(734), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5159, 5164), @@ -7026,29 +6954,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(612), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2414)), -======= - target: TransformTarget::Callable(DeclarationId(2421)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2422)), inputs: vec![PortId(735)], output: PortId(736), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5275, 5286), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(613), - target: TransformTarget::Callable(DeclarationId(1179)), + target: TransformTarget::Callable(DeclarationId(1180)), inputs: vec![], output: PortId(737), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5294, 5325), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(614), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2413)), -======= - target: TransformTarget::Callable(DeclarationId(2420)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2421)), inputs: vec![PortId(736), PortId(737)], output: PortId(738), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5262, 5327), @@ -7064,18 +6984,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(616), - target: TransformTarget::Callable(DeclarationId(1178)), + target: TransformTarget::Callable(DeclarationId(1179)), inputs: vec![], output: PortId(740), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5428, 5459), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(617), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2415)), -======= - target: TransformTarget::Callable(DeclarationId(2422)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2423)), inputs: vec![PortId(739), PortId(740)], output: PortId(741), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5403, 5461), @@ -7098,18 +7014,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(620), - target: TransformTarget::Callable(DeclarationId(1180)), + target: TransformTarget::Callable(DeclarationId(1181)), inputs: vec![PortId(742)], output: PortId(744), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5649, 5682), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(621), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2416)), -======= - target: TransformTarget::Callable(DeclarationId(2423)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2424)), inputs: vec![PortId(743), PortId(742), PortId(744)], output: PortId(745), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5562, 5687), @@ -7132,25 +7044,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(624), - target: TransformTarget::Callable(DeclarationId(1181)), + target: TransformTarget::Callable(DeclarationId(1182)), inputs: vec![PortId(747)], output: PortId(749), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5881, 5915), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(625), - target: TransformTarget::Callable(DeclarationId(1180)), + target: TransformTarget::Callable(DeclarationId(1181)), inputs: vec![PortId(746)], output: PortId(750), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5932, 5965), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(626), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2417)), -======= - target: TransformTarget::Callable(DeclarationId(2424)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2425)), inputs: vec![PortId(748), PortId(749), PortId(750)], output: PortId(751), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5808, 5970), @@ -7166,14 +7074,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(628), - target: TransformTarget::Callable(DeclarationId(1268)), + target: TransformTarget::Callable(DeclarationId(1269)), inputs: vec![PortId(752)], output: PortId(754), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6333, 6350), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(629), - target: TransformTarget::Callable(DeclarationId(1182)), + target: TransformTarget::Callable(DeclarationId(1183)), inputs: vec![PortId(753)], output: PortId(755), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6366, 6400), @@ -7198,7 +7106,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(632), - target: TransformTarget::Callable(DeclarationId(1182)), + target: TransformTarget::Callable(DeclarationId(1183)), inputs: vec![PortId(753)], output: PortId(759), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6436, 6470), @@ -7252,14 +7160,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(635), - target: TransformTarget::Callable(DeclarationId(1268)), + target: TransformTarget::Callable(DeclarationId(1269)), inputs: vec![PortId(761)], output: PortId(764), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6594, 6611), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(636), - target: TransformTarget::Callable(DeclarationId(1183)), + target: TransformTarget::Callable(DeclarationId(1184)), inputs: vec![PortId(762), PortId(763)], output: PortId(765), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6627, 6669), @@ -7284,7 +7192,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(639), - target: TransformTarget::Callable(DeclarationId(1183)), + target: TransformTarget::Callable(DeclarationId(1184)), inputs: vec![PortId(762), PortId(763)], output: PortId(769), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6705, 6747), @@ -7338,7 +7246,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(642), - target: TransformTarget::Callable(DeclarationId(1184)), + target: TransformTarget::Callable(DeclarationId(1185)), inputs: vec![PortId(771), PortId(772)], output: PortId(774), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6909, 6931), @@ -7354,7 +7262,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(644), - target: TransformTarget::Callable(DeclarationId(1185)), + target: TransformTarget::Callable(DeclarationId(1186)), inputs: vec![PortId(771), PortId(772), PortId(776)], output: PortId(777), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6970, 7000), @@ -7408,14 +7316,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(647), - target: TransformTarget::Callable(DeclarationId(1232)), + target: TransformTarget::Callable(DeclarationId(1233)), inputs: vec![PortId(779), PortId(781)], output: PortId(782), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7184, 7210), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(648), - target: TransformTarget::Callable(DeclarationId(1186)), + target: TransformTarget::Callable(DeclarationId(1187)), inputs: vec![PortId(779), PortId(781), PortId(782)], output: PortId(783), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7152, 7211), @@ -7440,28 +7348,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(651), - target: TransformTarget::Callable(DeclarationId(1223)), + target: TransformTarget::Callable(DeclarationId(1224)), inputs: vec![], output: PortId(787), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7296, 7324), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(652), - target: TransformTarget::Callable(DeclarationId(1226)), + target: TransformTarget::Callable(DeclarationId(1227)), inputs: vec![PortId(786)], output: PortId(788), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7382, 7412), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(653), - target: TransformTarget::Callable(DeclarationId(1227)), + target: TransformTarget::Callable(DeclarationId(1228)), inputs: vec![PortId(785), PortId(788)], output: PortId(789), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7334, 7413), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(654), - target: TransformTarget::Callable(DeclarationId(1185)), + target: TransformTarget::Callable(DeclarationId(1186)), inputs: vec![PortId(779), PortId(787), PortId(789)], output: PortId(790), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7257, 7421), @@ -7518,7 +7426,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(657), - target: TransformTarget::Callable(DeclarationId(1268)), + target: TransformTarget::Callable(DeclarationId(1269)), inputs: vec![PortId(792)], output: PortId(794), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8404, 8421), @@ -7532,28 +7440,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(659), - target: TransformTarget::Callable(DeclarationId(1172)), + target: TransformTarget::Callable(DeclarationId(1173)), inputs: vec![PortId(792), PortId(793)], output: PortId(796), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8468, 8493), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(660), - target: TransformTarget::Callable(DeclarationId(1187)), + target: TransformTarget::Callable(DeclarationId(1188)), inputs: vec![PortId(792), PortId(796)], output: PortId(797), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8432, 8494), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(661), - target: TransformTarget::Callable(DeclarationId(1173)), + target: TransformTarget::Callable(DeclarationId(1174)), inputs: vec![PortId(792), PortId(793)], output: PortId(798), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8542, 8586), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(662), - target: TransformTarget::Callable(DeclarationId(1187)), + target: TransformTarget::Callable(DeclarationId(1188)), inputs: vec![PortId(792), PortId(798)], output: PortId(799), span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8506, 8587), @@ -7620,11 +7528,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(667), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2456)), -======= - target: TransformTarget::Callable(DeclarationId(2463)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2464)), inputs: vec![], output: PortId(802), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6287, 6297), @@ -7640,44 +7544,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(669), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2456)), -======= - target: TransformTarget::Callable(DeclarationId(2463)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2464)), inputs: vec![], output: PortId(806), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6605, 6615), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(670), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2456)), -======= - target: TransformTarget::Callable(DeclarationId(2463)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2464)), inputs: vec![], output: PortId(807), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6667, 6677), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(671), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2458)), -======= - target: TransformTarget::Callable(DeclarationId(2465)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2466)), inputs: vec![], output: PortId(808), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6695, 6700), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(672), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2458)), -======= - target: TransformTarget::Callable(DeclarationId(2465)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2466)), inputs: vec![], output: PortId(809), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6722, 6727), @@ -7693,11 +7581,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(674), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2458)), -======= - target: TransformTarget::Callable(DeclarationId(2465)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2466)), inputs: vec![], output: PortId(812), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6764, 6769), @@ -7752,33 +7636,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(676), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2456)), -======= - target: TransformTarget::Callable(DeclarationId(2463)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2464)), inputs: vec![], output: PortId(814), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6833, 6843), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(677), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2458)), -======= - target: TransformTarget::Callable(DeclarationId(2465)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2466)), inputs: vec![], output: PortId(815), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6861, 6866), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(678), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2457)), -======= - target: TransformTarget::Callable(DeclarationId(2464)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2465)), inputs: vec![], output: PortId(816), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6888, 6897), @@ -7794,11 +7666,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(680), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2457)), -======= - target: TransformTarget::Callable(DeclarationId(2464)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2465)), inputs: vec![], output: PortId(819), span: SourceSpan::new("src/v3/std/timing_lens.dag", 6934, 6943), @@ -7862,33 +7730,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(683), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2456)), -======= - target: TransformTarget::Callable(DeclarationId(2463)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2464)), inputs: vec![], output: PortId(823), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7023, 7033), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(684), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2458)), -======= - target: TransformTarget::Callable(DeclarationId(2465)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2466)), inputs: vec![], output: PortId(824), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7051, 7056), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(685), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2457)), -======= - target: TransformTarget::Callable(DeclarationId(2464)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2465)), inputs: vec![], output: PortId(825), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7078, 7087), @@ -7929,18 +7785,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(690), - target: TransformTarget::Callable(DeclarationId(1213)), + target: TransformTarget::Callable(DeclarationId(1214)), inputs: vec![PortId(830)], output: PortId(831), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7187, 7217), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(691), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2455)), -======= - target: TransformTarget::Callable(DeclarationId(2462)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2463)), inputs: vec![PortId(831)], output: PortId(832), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7166, 7219), @@ -7999,11 +7851,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(696), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2455)), -======= - target: TransformTarget::Callable(DeclarationId(2462)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2463)), inputs: vec![PortId(836)], output: PortId(837), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7247, 7335), @@ -8149,7 +7997,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(702), - target: TransformTarget::Callable(DeclarationId(1220)), + target: TransformTarget::Callable(DeclarationId(1221)), inputs: vec![PortId(841), PortId(842), PortId(843)], output: PortId(844), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7515, 7558), @@ -8172,7 +8020,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(705), - target: TransformTarget::Callable(DeclarationId(1213)), + target: TransformTarget::Callable(DeclarationId(1214)), inputs: vec![PortId(845)], output: PortId(846), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7601, 7613), @@ -8188,18 +8036,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(707), - target: TransformTarget::Callable(DeclarationId(1222)), + target: TransformTarget::Callable(DeclarationId(1223)), inputs: vec![], output: PortId(847), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7693, 7711), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(708), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2455)), -======= - target: TransformTarget::Callable(DeclarationId(2462)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2463)), inputs: vec![PortId(847)], output: PortId(848), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7672, 7713), @@ -8222,7 +8066,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(711), - target: TransformTarget::Callable(DeclarationId(1220)), + target: TransformTarget::Callable(DeclarationId(1221)), inputs: vec![PortId(849), PortId(850), PortId(851)], output: PortId(852), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7862, 7906), @@ -8238,11 +8082,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(713), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2460)), -======= - target: TransformTarget::Callable(DeclarationId(2467)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2468)), inputs: vec![], output: PortId(853), span: SourceSpan::new("src/v3/std/timing_lens.dag", 7967, 7972), @@ -8381,36 +8221,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(722), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2214)), -======= - target: TransformTarget::Callable(DeclarationId(2221)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2222)), inputs: vec![], output: PortId(868), span: SourceSpan::new("src/v3/std/timing_lens.dag", 8722, 8734), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(723), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2220)), -======= - target: TransformTarget::Callable(DeclarationId(2227)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2228)), inputs: vec![PortId(868)], output: PortId(869), span: SourceSpan::new("src/v3/std/timing_lens.dag", 8709, 8735), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(724), - target: TransformTarget::Callable(DeclarationId(1225)), + target: TransformTarget::Callable(DeclarationId(1226)), inputs: vec![], output: PortId(870), span: SourceSpan::new("src/v3/std/timing_lens.dag", 8778, 8809), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(725), - target: TransformTarget::Callable(DeclarationId(974)), + target: TransformTarget::Callable(DeclarationId(975)), inputs: vec![PortId(869), PortId(867), PortId(866), PortId(870)], output: PortId(871), span: SourceSpan::new("src/v3/std/timing_lens.dag", 8697, 8813), @@ -8426,7 +8258,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(727), - target: TransformTarget::Callable(DeclarationId(1212)), + target: TransformTarget::Callable(DeclarationId(1213)), inputs: vec![], output: PortId(872), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9120, 9153), @@ -8463,7 +8295,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(732), - target: TransformTarget::Callable(DeclarationId(1268)), + target: TransformTarget::Callable(DeclarationId(1269)), inputs: vec![PortId(876)], output: PortId(878), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9734, 9751), @@ -8497,43 +8329,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(736), - target: TransformTarget::Callable(DeclarationId(1227)), + target: TransformTarget::Callable(DeclarationId(1228)), inputs: vec![PortId(877), PortId(882)], output: PortId(883), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9862, 9926), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(737), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2248)), -======= - target: TransformTarget::Callable(DeclarationId(2255)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2256)), inputs: vec![PortId(883)], output: PortId(884), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9826, 9938), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(738), - target: TransformTarget::Callable(DeclarationId(1228)), + target: TransformTarget::Callable(DeclarationId(1229)), inputs: vec![], output: PortId(885), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10082, 10121), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(739), - target: TransformTarget::Callable(DeclarationId(1227)), + target: TransformTarget::Callable(DeclarationId(1228)), inputs: vec![PortId(877), PortId(885)], output: PortId(886), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10002, 10135), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(740), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2248)), -======= - target: TransformTarget::Callable(DeclarationId(2255)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2256)), inputs: vec![PortId(886)], output: PortId(887), span: SourceSpan::new("src/v3/std/timing_lens.dag", 9966, 10147), @@ -8579,25 +8403,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(743), - target: TransformTarget::Callable(DeclarationId(1226)), + target: TransformTarget::Callable(DeclarationId(1227)), inputs: vec![PortId(890)], output: PortId(891), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10287, 10326), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(744), - target: TransformTarget::Callable(DeclarationId(1227)), + target: TransformTarget::Callable(DeclarationId(1228)), inputs: vec![PortId(877), PortId(891)], output: PortId(892), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10215, 10336), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(745), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2248)), -======= - target: TransformTarget::Callable(DeclarationId(2255)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2256)), inputs: vec![PortId(892)], output: PortId(893), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10183, 10344), @@ -8652,14 +8472,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(749), - target: TransformTarget::Callable(DeclarationId(1219)), + target: TransformTarget::Callable(DeclarationId(1220)), inputs: vec![], output: PortId(900), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10862, 10893), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(750), - target: TransformTarget::Callable(DeclarationId(1219)), + target: TransformTarget::Callable(DeclarationId(1220)), inputs: vec![], output: PortId(902), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10916, 10947), @@ -8699,33 +8519,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(752), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2456)), -======= - target: TransformTarget::Callable(DeclarationId(2463)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2464)), inputs: vec![], output: PortId(904), span: SourceSpan::new("src/v3/std/timing_lens.dag", 10974, 10984), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(753), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2457)), -======= - target: TransformTarget::Callable(DeclarationId(2464)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2465)), inputs: vec![], output: PortId(905), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11002, 11011), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(754), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2458)), -======= - target: TransformTarget::Callable(DeclarationId(2465)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2466)), inputs: vec![], output: PortId(906), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11025, 11030), @@ -8789,7 +8597,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(757), - target: TransformTarget::Callable(DeclarationId(1268)), + target: TransformTarget::Callable(DeclarationId(1269)), inputs: vec![PortId(908)], output: PortId(911), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11930, 11947), @@ -8803,36 +8611,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(759), - target: TransformTarget::Callable(DeclarationId(1219)), + target: TransformTarget::Callable(DeclarationId(1220)), inputs: vec![], output: PortId(913), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11963, 11994), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(760), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2461)), -======= - target: TransformTarget::Callable(DeclarationId(2468)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2469)), inputs: vec![PortId(913)], output: PortId(914), span: SourceSpan::new("src/v3/std/timing_lens.dag", 11954, 11995), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(761), - target: TransformTarget::Callable(DeclarationId(1219)), + target: TransformTarget::Callable(DeclarationId(1220)), inputs: vec![], output: PortId(915), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12010, 12041), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(762), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2462)), -======= - target: TransformTarget::Callable(DeclarationId(2469)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2470)), inputs: vec![PortId(915)], output: PortId(916), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12001, 12042), @@ -8866,7 +8666,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(764), - target: TransformTarget::Callable(DeclarationId(1268)), + target: TransformTarget::Callable(DeclarationId(1269)), inputs: vec![PortId(908)], output: PortId(919), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12081, 12098), @@ -8880,36 +8680,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(766), - target: TransformTarget::Callable(DeclarationId(1219)), + target: TransformTarget::Callable(DeclarationId(1220)), inputs: vec![], output: PortId(921), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12114, 12145), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(767), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2463)), -======= - target: TransformTarget::Callable(DeclarationId(2470)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2471)), inputs: vec![PortId(921)], output: PortId(922), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12105, 12146), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(768), - target: TransformTarget::Callable(DeclarationId(1219)), + target: TransformTarget::Callable(DeclarationId(1220)), inputs: vec![], output: PortId(923), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12161, 12192), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(769), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2464)), -======= - target: TransformTarget::Callable(DeclarationId(2471)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2472)), inputs: vec![PortId(923)], output: PortId(924), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12152, 12193), @@ -8943,7 +8735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(771), - target: TransformTarget::Callable(DeclarationId(1268)), + target: TransformTarget::Callable(DeclarationId(1269)), inputs: vec![PortId(908)], output: PortId(927), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12229, 12246), @@ -8957,36 +8749,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(773), - target: TransformTarget::Callable(DeclarationId(1219)), + target: TransformTarget::Callable(DeclarationId(1220)), inputs: vec![], output: PortId(929), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12262, 12293), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(774), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2465)), -======= - target: TransformTarget::Callable(DeclarationId(2472)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2473)), inputs: vec![PortId(929)], output: PortId(930), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12253, 12294), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(775), - target: TransformTarget::Callable(DeclarationId(1219)), + target: TransformTarget::Callable(DeclarationId(1220)), inputs: vec![], output: PortId(931), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12309, 12340), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(776), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2466)), -======= - target: TransformTarget::Callable(DeclarationId(2473)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2474)), inputs: vec![PortId(931)], output: PortId(932), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12300, 12341), @@ -9020,7 +8804,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(778), - target: TransformTarget::Callable(DeclarationId(1268)), + target: TransformTarget::Callable(DeclarationId(1269)), inputs: vec![PortId(908)], output: PortId(935), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12375, 12392), @@ -9034,36 +8818,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(780), - target: TransformTarget::Callable(DeclarationId(1219)), + target: TransformTarget::Callable(DeclarationId(1220)), inputs: vec![], output: PortId(937), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12408, 12439), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(781), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2467)), -======= - target: TransformTarget::Callable(DeclarationId(2474)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2475)), inputs: vec![PortId(937)], output: PortId(938), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12399, 12440), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(782), - target: TransformTarget::Callable(DeclarationId(1219)), + target: TransformTarget::Callable(DeclarationId(1220)), inputs: vec![], output: PortId(939), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12455, 12486), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(783), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2468)), -======= - target: TransformTarget::Callable(DeclarationId(2475)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2476)), inputs: vec![PortId(939)], output: PortId(940), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12446, 12487), @@ -9097,7 +8873,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(785), - target: TransformTarget::Callable(DeclarationId(1268)), + target: TransformTarget::Callable(DeclarationId(1269)), inputs: vec![PortId(908)], output: PortId(943), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12521, 12538), @@ -9111,36 +8887,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(787), - target: TransformTarget::Callable(DeclarationId(1219)), + target: TransformTarget::Callable(DeclarationId(1220)), inputs: vec![], output: PortId(945), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12554, 12585), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(788), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2469)), -======= - target: TransformTarget::Callable(DeclarationId(2476)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2477)), inputs: vec![PortId(945)], output: PortId(946), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12545, 12586), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(789), - target: TransformTarget::Callable(DeclarationId(1219)), + target: TransformTarget::Callable(DeclarationId(1220)), inputs: vec![], output: PortId(947), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12601, 12632), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(790), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2470)), -======= - target: TransformTarget::Callable(DeclarationId(2477)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2478)), inputs: vec![PortId(947)], output: PortId(948), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12592, 12633), @@ -9261,7 +9029,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(795), - target: TransformTarget::Callable(DeclarationId(1268)), + target: TransformTarget::Callable(DeclarationId(1269)), inputs: vec![PortId(951)], output: PortId(955), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12793, 12810), @@ -9275,22 +9043,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(797), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2247)), -======= - target: TransformTarget::Callable(DeclarationId(2254)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2255)), inputs: vec![], output: PortId(957), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12817, 12829), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(798), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(2247)), -======= - target: TransformTarget::Callable(DeclarationId(2254)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + target: TransformTarget::Callable(DeclarationId(2255)), inputs: vec![], output: PortId(958), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12835, 12847), @@ -9325,7 +9085,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { nodes.push(Behavior::Value(ValueNode { id: NodeId(800), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Unobserved is not admissible evidence at this scaffold (missing external timing row).".to_string()), output: PortId(960), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12926, 13053), lane2_workflow: None })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(801), - target: TransformTarget::Callable(DeclarationId(1229)), + target: TransformTarget::Callable(DeclarationId(1230)), inputs: vec![PortId(951), PortId(960)], output: PortId(961), span: SourceSpan::new("src/v3/std/timing_lens.dag", 12872, 13061), @@ -9333,7 +9093,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { nodes.push(Behavior::Value(ValueNode { id: NodeId(802), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Ambiguous is not admissible evidence at this scaffold (conflicting timing facts).".to_string()), output: PortId(962), span: SourceSpan::new("src/v3/std/timing_lens.dag", 13139, 13262), lane2_workflow: None })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(803), - target: TransformTarget::Callable(DeclarationId(1229)), + target: TransformTarget::Callable(DeclarationId(1230)), inputs: vec![PortId(951), PortId(962)], output: PortId(963), span: SourceSpan::new("src/v3/std/timing_lens.dag", 13085, 13270), @@ -9341,7 +9101,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { nodes.push(Behavior::Value(ValueNode { id: NodeId(804), data: LiteralBits::String("timing_lens_validate: TimingMeasurement.Stale is not admissible evidence at this scaffold (digest/run mismatch vs attachment).".to_string()), output: PortId(964), span: SourceSpan::new("src/v3/std/timing_lens.dag", 13344, 13472), lane2_workflow: None })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(805), - target: TransformTarget::Callable(DeclarationId(1229)), + target: TransformTarget::Callable(DeclarationId(1230)), inputs: vec![PortId(951), PortId(964)], output: PortId(965), span: SourceSpan::new("src/v3/std/timing_lens.dag", 13290, 13480), @@ -9974,11 +9734,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { #[allow(clippy::vec_init_then_push)] fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec { { -<<<<<<< HEAD - let mut declarations = Vec::with_capacity(3116); -======= - let mut declarations = Vec::with_capacity(3123); ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + let mut declarations = Vec::with_capacity(3124); declarations.push(Declaration { id: DeclarationId(0), name: Some("Classical".to_string()), @@ -24223,11 +23979,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24270,7 +24016,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24311,8 +24047,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1741), + output: DeclarationId(1742), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)), }, type_params: vec![DeclarationId(693)], @@ -24379,13 +24111,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)), }, type_params: vec![DeclarationId(695), DeclarationId(696)], @@ -24430,13 +24157,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)), }, type_params: vec![DeclarationId(698), DeclarationId(699)], @@ -24481,8 +24203,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -24782,8 +24494,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(1768), DeclarationId(721)], output: DeclarationId(128), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)), }, @@ -24913,7 +24621,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1773), + output: DeclarationId(1774), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)), }, type_params: vec![], @@ -25143,15 +24847,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)), }, type_params: vec![], @@ -25558,19 +25258,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)), }, type_params: vec![], @@ -25845,12 +25541,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)), }, type_params: vec![], @@ -25906,15 +25598,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "type_params".to_string(), - ty: DeclarationId(1905), + ty: DeclarationId(1906), }, Field { label: "phantom_params".to_string(), - ty: DeclarationId(1906), + ty: DeclarationId(1907), }, Field { label: "meta_tag".to_string(), - ty: DeclarationId(1907), + ty: DeclarationId(1908), }, Field { label: "inhabits".to_string(), - ty: DeclarationId(1908), + ty: DeclarationId(1909), }, Field { label: "value_body".to_string(), - ty: DeclarationId(1909), + ty: DeclarationId(1910), }, Field { label: "nominal_opacity".to_string(), - ty: DeclarationId(1910), + ty: DeclarationId(1911), }, Field { label: "span".to_string(), @@ -26772,7 +26460,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1838), + output: DeclarationId(1839), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 22022, @@ -27628,12 +27312,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1839), + output: DeclarationId(1840), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 22080, @@ -27654,12 +27334,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1840), + output: DeclarationId(1841), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 22155, @@ -27680,12 +27356,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1841), + output: DeclarationId(1842), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 22544, @@ -27706,12 +27378,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1842), + output: DeclarationId(1843), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 23419, @@ -27732,12 +27400,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1843), + output: DeclarationId(1844), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 23745, @@ -27761,15 +27425,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1845), + output: DeclarationId(1846), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 27835, @@ -27859,7 +27519,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1961), + output: DeclarationId(1962), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 11047, 11062)), }, type_params: vec![], @@ -28189,12 +27845,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1962), + output: DeclarationId(1963), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(185))), }, type_params: vec![], @@ -28211,12 +27863,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1964), + inputs: vec![DeclarationId(849), DeclarationId(849), DeclarationId(1964)], + output: DeclarationId(1965), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(187))), }, type_params: vec![], @@ -28341,12 +27989,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(220))), }, type_params: vec![], @@ -28402,35 +28046,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(440))), }, type_params: vec![], @@ -28686,12 +28326,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(452))), }, type_params: vec![], @@ -28708,12 +28344,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(469))), }, type_params: vec![], @@ -28861,12 +28493,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1979), + inputs: vec![DeclarationId(1979), DeclarationId(849)], + output: DeclarationId(1980), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(517))), }, type_params: vec![], @@ -28883,12 +28511,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1981), + inputs: vec![DeclarationId(1981), DeclarationId(849)], + output: DeclarationId(1982), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(524))), }, type_params: vec![], @@ -28905,8 +28529,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1170), + value: DeclarationId(1171), }], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(2046)), + meta_tag: Some(DeclarationId(2047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![])), @@ -28979,11 +28599,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - id: DeclarationId(896), + id: DeclarationId(897), name: Some("AnthropicToolResultContent".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ToolResultText".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2055), - }, - Field { - label: "ToolResultBlocks".to_string(), - ty: DeclarationId(2057), -======= - ty: DeclarationId(2062), + ty: DeclarationId(2063), }, Field { label: "ToolResultBlocks".to_string(), - ty: DeclarationId(2064), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2065), }, ], }, @@ -29121,25 +28730,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2069), }, ], }, @@ -29154,25 +28755,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2071), }, ], }, @@ -29187,65 +28780,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ModelContextWindowExceeded".to_string(), - ty: DeclarationId(2070), + ty: DeclarationId(2078), }, ], }, @@ -29260,49 +28825,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "PageLocation".to_string(), - ty: DeclarationId(2083), + ty: DeclarationId(2084), }, Field { label: "ContentBlockLocation".to_string(), - ty: DeclarationId(2086), + ty: DeclarationId(2087), }, Field { label: "WebSearchResultLocation".to_string(), - ty: DeclarationId(2088), + ty: DeclarationId(2089), }, Field { label: "SearchResultLocation".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2083), -======= - ty: DeclarationId(2090), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2091), }, ], }, @@ -29317,104 +28862,32 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - ty: DeclarationId(2101), - }, - Field { - label: "Advisor".to_string(), ty: DeclarationId(2102), }, ], @@ -29430,43 +28903,41 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - id: DeclarationId(903), + id: DeclarationId(904), name: Some("AnthropicMessages200Usage".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -29496,27 +28966,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "service_tier".to_string(), - ty: DeclarationId(2105), + ty: DeclarationId(2113), }, ], }, @@ -29531,16 +28989,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2114), }], }, type_params: vec![], @@ -29554,7 +29008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2115), }, Field { label: "model".to_string(), @@ -29584,27 +29034,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2116), }, Field { label: "usage".to_string(), - ty: DeclarationId(903), + ty: DeclarationId(904), }, Field { label: "container".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2109), -======= - ty: DeclarationId(2116), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2117), }, ], }, @@ -29619,7 +29061,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ExtdepsFixtureAuthority".to_string(), - ty: DeclarationId(2114), + ty: DeclarationId(2122), }, ], }, @@ -29705,7 +29127,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2118), payload: vec![], }, ), ( "dsl/std/bit.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2110), -======= - constructor: DeclarationId(2117), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2118), payload: vec![], }, ), ( "dsl/std/error_primitives.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2110), -======= - constructor: DeclarationId(2117), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2118), payload: vec![], }, ), ( "dsl/std/algebra.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2110), -======= - constructor: DeclarationId(2117), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2118), payload: vec![], }, ), ( "dsl/std/magnitude.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2110), -======= - constructor: DeclarationId(2117), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2118), payload: vec![], }, ), ( "dsl/std/machine_constraints.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2110), -======= - constructor: DeclarationId(2117), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2118), payload: vec![], }, ), ( "dsl/std/nat.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2110), -======= - constructor: DeclarationId(2117), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2118), payload: vec![], }, ), ( "dsl/std/integer.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2110), -======= - constructor: DeclarationId(2117), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2118), payload: vec![], }, ), ( "dsl/std/rational.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2110), -======= - constructor: DeclarationId(2117), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2118), payload: vec![], }, ), ( "dsl/std/float.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2110), -======= - constructor: DeclarationId(2117), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2118), payload: vec![], }, ), ( "dsl/std/types.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2110), -======= - constructor: DeclarationId(2117), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2118), payload: vec![], }, ), ( "dsl/std/string_type.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2110), -======= - constructor: DeclarationId(2117), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2118), payload: vec![], }, ), ( "dsl/std/unicode.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2110), -======= - constructor: DeclarationId(2117), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2118), payload: vec![], }, ), ( "dsl/std/render_repeat_string_bootstrap.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2110), -======= - constructor: DeclarationId(2117), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2118), payload: vec![], }, ), ( "dsl/std/methods.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2110), -======= - constructor: DeclarationId(2117), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2118), payload: vec![], }, ), ( "dsl/std/serialization.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2110), -======= - constructor: DeclarationId(2117), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2118), payload: vec![], }, ), ( "src/v3/std/algebra.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/anthropic_messages.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/anthropic_operations.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/anthropic_schema.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/approximate_field.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/bin_shim.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/bootstrap_authority.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/bridge_ledger.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/clean_emission.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/computation.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/computation_model.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/coproduct_projection.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/cross_target_coverage.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/diagnostics.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/dimensions.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/effects.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/emission_provenance.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/emit_model.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/go_method_template_contracts.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/induction.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/integer_diagnostic_order.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/lens.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/lens_application.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/list.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/lookup.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/methods.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/parse_surface.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/python_method_template_contracts.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/resources.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/runtime.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/rust_method_template_contracts.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/services.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/substrate.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/substrate_minimal.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/termination.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/t_ci_workflow_as_data_demo.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/timing_lens.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/tokenize.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/verification.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/std/workflows.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2111), -======= - constructor: DeclarationId(2118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2119), payload: vec![], }, ), ( "src/v3/spec/v3_l1.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2112), -======= - constructor: DeclarationId(2119), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2120), payload: vec![], }, ), ( "src/v3/spec/go.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2112), -======= - constructor: DeclarationId(2119), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2120), payload: vec![], }, ), ( "src/v3/spec/python.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2112), -======= - constructor: DeclarationId(2119), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2120), payload: vec![], }, ), ( "src/v3/spec/rust.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2112), -======= - constructor: DeclarationId(2119), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2120), payload: vec![], }, ), ( "src/v3/compiler/pipeline.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2113), -======= - constructor: DeclarationId(2120), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2121), payload: vec![], }, ), ( "src/v3/compiler/operators.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2113), -======= - constructor: DeclarationId(2120), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2121), payload: vec![], }, ), ( "src/v3/compiler/regen.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2113), -======= - constructor: DeclarationId(2120), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2121), payload: vec![], }, ), ( "dsl/extdeps/languages/rust/primitives.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2114), -======= - constructor: DeclarationId(2121), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2122), payload: vec![], }, ), ( "dsl/extdeps/cron_schedule_model.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2114), -======= - constructor: DeclarationId(2121), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2122), payload: vec![], }, ), ( "dsl/extdeps/github/github.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2114), -======= - constructor: DeclarationId(2121), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2122), payload: vec![], }, ), ( "dsl/extdeps/github/actions.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2114), -======= - constructor: DeclarationId(2121), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2122), payload: vec![], }, ), @@ -30500,25 +29650,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2124), }, ], }, @@ -30533,12 +29675,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + declarations.push(Declaration { id: DeclarationId(914), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), value: DeclarationId(913) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2125)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_source_span_file_participation_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R3".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2124), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("ROADMAP.md#lens-fold-file-path-semantics".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_mark_bootstrap_secret_nominal_opacity_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2123), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #937".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_dispatch_pr1183_slice_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2123), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/canonical_lens_bridge_ratchet_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2123), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-pb-bridge-canonical-lens-name-dispatch-closure.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2123), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/l1_5_fixed_point_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2123), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/bridge_lower_helpers_patch_zero_residual_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_semantic_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(2124), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r3-v-bridge-row-4-exact-string-deeper-detail-receipt.md".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6963, 8416) }); declarations.push(Declaration { - id: DeclarationId(914), + id: DeclarationId(915), name: Some("CleanEmissionContract".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "expression_wrapping".to_string(), - ty: DeclarationId(916), + ty: DeclarationId(917), }, Field { label: "pattern_bindings".to_string(), - ty: DeclarationId(917), + ty: DeclarationId(918), }, Field { label: "variant_payload_field_access".to_string(), - ty: DeclarationId(918), + ty: DeclarationId(919), }, Field { label: "imports".to_string(), - ty: DeclarationId(919), + ty: DeclarationId(920), }, Field { label: "block_return".to_string(), - ty: DeclarationId(920), + ty: DeclarationId(921), }, Field { label: "variable_bindings".to_string(), - ty: DeclarationId(921), + ty: DeclarationId(922), }, Field { label: "match_arm_body".to_string(), - ty: DeclarationId(922), + ty: DeclarationId(923), }, Field { label: "correction_style".to_string(), - ty: DeclarationId(923), + ty: DeclarationId(924), }, Field { label: "post_emit_verifier".to_string(), - ty: DeclarationId(924), + ty: DeclarationId(925), }, ], }, @@ -30643,17 +29781,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "NoWrapping".to_string(), - ty: DeclarationId(2120), + ty: DeclarationId(2128), }, ], }, @@ -30709,41 +29835,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "NotApplicablePatternBinding".to_string(), - ty: DeclarationId(2124), + ty: DeclarationId(2132), }, ], }, @@ -30758,25 +29868,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2134), }, ], }, @@ -30791,33 +29893,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ImportPerUsageSite".to_string(), - ty: DeclarationId(2129), + ty: DeclarationId(2137), }, ], }, @@ -30832,33 +29922,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ExplicitReturnKeyword".to_string(), - ty: DeclarationId(2132), + ty: DeclarationId(2140), }, ], }, @@ -30873,33 +29951,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "OmitLetBinding".to_string(), - ty: DeclarationId(2135), + ty: DeclarationId(2143), }, ], }, @@ -30914,33 +29980,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "NotApplicableMatchArmBody".to_string(), - ty: DeclarationId(2138), + ty: DeclarationId(2146), }, ], }, @@ -30955,7 +30009,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2147), }, Field { label: "syntax_only".to_string(), @@ -31014,7 +30064,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "RequireEmptyStdoutAndStderr".to_string(), - ty: DeclarationId(2143), + ty: DeclarationId(2151), }, ], }, @@ -31078,73 +30112,41 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Forever".to_string(), - ty: DeclarationId(2156), + ty: DeclarationId(2164), }, ], }, @@ -31159,11 +30161,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "SameArgumentCall".to_string(), - ty: DeclarationId(2164), + ty: DeclarationId(2172), }, ], }, @@ -31262,16 +30232,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2152), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 2756, @@ -31289,33 +30254,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ProportionalShrink".to_string(), - ty: DeclarationId(2167), + ty: DeclarationId(2175), }, ], }, @@ -31330,33 +30283,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Repeat".to_string(), - ty: DeclarationId(2170), + ty: DeclarationId(2178), }, ], }, @@ -31371,29 +30312,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2179), }, ], }, @@ -31408,11 +30345,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(927)], + output: DeclarationId(2153), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 5564, @@ -31456,10 +30389,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(927)], + output: DeclarationId(2154), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 6492, @@ -31526,33 +30455,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ArithmeticRepeat".to_string(), - ty: DeclarationId(2174), + ty: DeclarationId(2182), }, ], }, @@ -31567,15 +30484,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2155), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 7558, @@ -31593,15 +30506,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2156), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 8123, @@ -31619,25 +30528,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2184), }, ], }, @@ -31652,25 +30553,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2186), }, ], }, @@ -31685,25 +30578,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2188), }, ], }, @@ -31718,25 +30603,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2190), }, ], }, @@ -31751,25 +30628,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2183), payload: vec![], }, ), ( "purity".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2177), -======= - constructor: DeclarationId(2184), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2185), payload: vec![], }, ), ( "structure".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2179), -======= - constructor: DeclarationId(2186), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2187), payload: vec![], }, ), ( "iteration".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2181), -======= - constructor: DeclarationId(2188), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2189), payload: vec![], }, ), @@ -31848,41 +30709,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "OwnershipBased".to_string(), - ty: DeclarationId(2186), + ty: DeclarationId(2194), }, ], }, @@ -31897,25 +30742,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2196), }, ], }, @@ -31930,17 +30767,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2197), }], }, type_params: vec![], @@ -31978,21 +30811,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2198), }, ], }, @@ -32007,15 +30836,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2200), }, ], }, @@ -32067,7 +30888,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2201), }], }, type_params: vec![], @@ -32107,25 +30924,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2203), }, ], }, @@ -32140,17 +30949,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2204), }, ], }, @@ -32198,10 +31003,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Instantiation".to_string(), - ty: DeclarationId(2202), + ty: DeclarationId(2210), }, ], }, @@ -32343,49 +31124,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Bind".to_string(), - ty: DeclarationId(2207), + ty: DeclarationId(2215), }, ], }, @@ -32400,13 +31161,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2216), }, ], }, @@ -32479,26 +31236,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(967), + value: DeclarationId(968), }], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(2209)), -======= - meta_tag: Some(DeclarationId(2216)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + meta_tag: Some(DeclarationId(2217)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -32508,7 +31257,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -32553,7 +31294,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -32598,7 +31331,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -32643,7 +31368,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -32688,7 +31405,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -32733,7 +31442,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -32778,7 +31479,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -32823,7 +31516,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -32868,7 +31553,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -32913,7 +31590,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -32958,7 +31627,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33003,7 +31664,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33048,7 +31701,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33093,7 +31738,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33138,7 +31775,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33183,7 +31812,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33228,7 +31849,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33273,7 +31886,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33318,7 +31923,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33363,7 +31960,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33408,7 +31997,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33453,7 +32034,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33498,7 +32071,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33543,7 +32108,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33588,7 +32145,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33633,7 +32182,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33678,7 +32219,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33723,7 +32256,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33768,7 +32293,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33813,7 +32330,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33858,7 +32367,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33903,7 +32404,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33948,7 +32441,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -33993,7 +32478,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -34038,7 +32515,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -34083,7 +32552,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -34128,7 +32589,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -34173,7 +32626,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -34218,7 +32663,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -34263,7 +32700,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -34308,7 +32737,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2209), payload: vec![], }, ), ( "behavior".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2204), -======= - constructor: DeclarationId(2211), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2212), payload: vec![], }, ), @@ -34353,91 +32774,50 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -34451,7 +32831,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2229), }, ], }, @@ -34557,13 +32929,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2230), }, ], }, @@ -34594,65 +32962,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "MissingEmissionPath".to_string(), - ty: DeclarationId(2230), + ty: DeclarationId(2238), }, ], }, @@ -34667,29 +33007,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2254), }, ], }, - type_params: vec![DeclarationId(977)], + type_params: vec![DeclarationId(978)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -34700,7 +33032,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2256), }, ], }, @@ -34747,29 +33071,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2263), }, ], }, - type_params: vec![DeclarationId(980)], + type_params: vec![DeclarationId(981)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -34780,7 +33096,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "break_diagnostic".to_string(), - ty: DeclarationId(2259), + ty: DeclarationId(2267), }, ], }, - type_params: vec![DeclarationId(982)], + type_params: vec![DeclarationId(983)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -34839,7 +33143,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + parameter: DeclarationId(985), + algebra: DeclarationId(2268), }], meta_tag: None, specialization_parent: None, @@ -34879,7 +33179,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2242), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4966, 4988)), }, - type_params: vec![DeclarationId(994), DeclarationId(995)], + type_params: vec![DeclarationId(995), DeclarationId(996)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -35035,7 +33327,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2246), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5162, 5184)), }, - type_params: vec![DeclarationId(997), DeclarationId(998)], + type_params: vec![DeclarationId(998), DeclarationId(999)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -35093,7 +33377,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2249), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5350, 5379)), }, - type_params: vec![DeclarationId(1000), DeclarationId(1001)], + type_params: vec![DeclarationId(1001), DeclarationId(1002)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -35151,7 +33427,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2252), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 5545, 5574)), }, - type_params: vec![DeclarationId(1003), DeclarationId(1004)], + type_params: vec![DeclarationId(1004), DeclarationId(1005)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -35209,7 +33477,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2270), }, ], }, @@ -35287,7 +33547,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2271), }, Field { label: "cost".to_string(), @@ -35361,29 +33617,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "PlatformDependentFact".to_string(), - ty: DeclarationId(2266), + ty: DeclarationId(2274), }, ], }, @@ -35439,7 +33683,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2276), }, ], }, @@ -35501,21 +33737,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2277), }, Field { label: "cost".to_string(), @@ -35612,7 +33844,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2279), }, ], }, @@ -35670,25 +33894,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2281), }, ], }, @@ -35703,25 +33919,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2283), }, ], }, @@ -35736,33 +33944,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "NotApplicable".to_string(), - ty: DeclarationId(2278), + ty: DeclarationId(2286), }, ], }, @@ -35777,16 +33973,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2287), }], }, type_params: vec![], @@ -35800,37 +33992,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -35976,29 +34127,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2299), }, ], }, @@ -36070,7 +34213,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2301), }, ], }, @@ -36561,25 +34696,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2303), }, ], }, @@ -36594,57 +34721,57 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2305), }, ], }, @@ -36692,25 +34811,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2307), }, ], }, @@ -36725,7 +34836,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "append({left}, {right}...)".to_string(), ))], @@ -36981,11 +35088,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -36996,15 +35099,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "int64(len({recv}))".to_string(), ))], @@ -37040,11 +35139,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -37055,15 +35150,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv}) == 0".to_string(), ))], @@ -37099,11 +35190,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -37114,15 +35201,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "/* fold({recv}, {init}, {body}) */".to_string(), ))], @@ -37160,11 +35243,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -37175,15 +35254,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "/* map({recv}, {body}) */".to_string(), ))], @@ -37221,11 +35296,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -37236,15 +35307,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Filter({recv}, {arg})".to_string(), ))], @@ -37282,11 +35349,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -37297,15 +35360,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Any({recv}, {arg})".to_string(), ))], @@ -37343,11 +35402,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -37358,15 +35413,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.All({recv}, {arg})".to_string(), ))], @@ -37404,11 +35455,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -37419,15 +35466,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.FlatMap({recv}, {arg})".to_string(), ))], @@ -37465,11 +35508,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -37480,26 +35519,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1046), + value: DeclarationId(1047), }], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(2300)), -======= - meta_tag: Some(DeclarationId(2307)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + meta_tag: Some(DeclarationId(2308)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -37518,11 +35549,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -37535,11 +35562,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -37561,11 +35584,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Join({recv}, {arg})".to_string(), ))], @@ -37578,11 +35597,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -37604,11 +35619,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Split({recv}, {arg})".to_string(), ))], @@ -37621,19 +35632,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), ]), - FieldValue::Reference(DeclarationId(1055)), FieldValue::Reference(DeclarationId(1056)), FieldValue::Reference(DeclarationId(1057)), FieldValue::Reference(DeclarationId(1058)), + FieldValue::Reference(DeclarationId(1059)), FieldValue::Record(vec![ ( "dag_method".to_string(), @@ -37649,11 +35656,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[{arg}:]".to_string(), ))], @@ -37666,11 +35669,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -37690,11 +35689,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[:{arg}]".to_string(), ))], @@ -37707,11 +35702,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -37733,11 +35724,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.SortBy({recv}, {arg})".to_string(), ))], @@ -37750,11 +35737,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -37776,11 +35759,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "append({recv}, {arg})".to_string(), ))], @@ -37793,11 +35772,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -37819,11 +35794,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Contains({recv}, {arg})".to_string(), ))], @@ -37836,11 +35807,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -37851,49 +35818,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "MapValueRecursion".to_string(), - ty: DeclarationId(2318), + ty: DeclarationId(2326), }, ], }, @@ -37908,7 +35855,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "SubValueUnknown".to_string(), - ty: DeclarationId(2323), + ty: DeclarationId(2331), }, ], }, @@ -38056,11 +35983,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(1066)], + output: DeclarationId(2309), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 20571, @@ -38214,15 +36137,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(1066)], + output: DeclarationId(2310), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 21959, @@ -38240,41 +36159,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "LogBasedExp".to_string(), - ty: DeclarationId(2327), + ty: DeclarationId(2335), }, ], }, @@ -38289,11 +36192,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2337), }, ], }, @@ -38344,65 +36239,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ErrorBound".to_string(), - ty: DeclarationId(2340), + ty: DeclarationId(2348), }, ], }, @@ -38417,15 +36284,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1077), + inputs: vec![DeclarationId(2311)], + output: DeclarationId(1078), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 27880, @@ -38443,10 +36306,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(544))), }, type_params: vec![], @@ -38487,15 +36346,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(553))), }, type_params: vec![], @@ -38509,16 +36364,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 29913, @@ -38536,16 +36386,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(555))), }, type_params: vec![], @@ -38559,16 +36404,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 30137, @@ -38586,11 +36426,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2316), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 33617, @@ -38843,15 +36679,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2317), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 33913, @@ -38869,15 +36701,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2318), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 35162, @@ -38895,15 +36723,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2319), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 35637, @@ -38921,15 +36745,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2320), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 36900, @@ -38947,7 +36767,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2321), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 37172, @@ -38978,11 +36794,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1275), + value: DeclarationId(1276), }], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(2341)), -======= - meta_tag: Some(DeclarationId(2348)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + meta_tag: Some(DeclarationId(2349)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -39391,26 +37199,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1275), + value: DeclarationId(1276), }], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(2342)), -======= - meta_tag: Some(DeclarationId(2349)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + meta_tag: Some(DeclarationId(2350)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -39425,7 +37225,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "validate".to_string(), - ty: DeclarationId(2348), + ty: DeclarationId(2356), }, ], }, - type_params: vec![DeclarationId(1121)], + type_params: vec![DeclarationId(1122)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -39486,7 +37266,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2358), }, ], }, @@ -39533,16 +37305,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2359), }], }, type_params: vec![], @@ -39556,29 +37324,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2361), }, ], }, - type_params: vec![DeclarationId(1125), DeclarationId(1126)], + type_params: vec![DeclarationId(1126), DeclarationId(1127)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -39589,7 +37349,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2363), }, ], }, - type_params: vec![DeclarationId(1128), DeclarationId(1129)], + type_params: vec![DeclarationId(1129), DeclarationId(1130)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -39650,7 +37402,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2364), }, Field { label: "section".to_string(), - ty: DeclarationId(1122), + ty: DeclarationId(1123), }, Field { label: "budget".to_string(), - ty: DeclarationId(1132), + ty: DeclarationId(1133), }, Field { label: "diagnostic_severity".to_string(), - ty: DeclarationId(1123), + ty: DeclarationId(1124), }, Field { label: "span".to_string(), @@ -39708,7 +37456,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2365), }, Field { label: "section".to_string(), - ty: DeclarationId(1122), + ty: DeclarationId(1123), }, Field { label: "span".to_string(), @@ -39769,7 +37513,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2369), }, ], }, - type_params: vec![DeclarationId(1136)], + type_params: vec![DeclarationId(1137)], phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -39827,7 +37563,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2366), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4601, 4611)), }, type_params: vec![], @@ -39863,15 +37595,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2367), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4654, 4666)), }, type_params: vec![], @@ -39885,15 +37613,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "[*{left}, *{right}]".to_string(), ))], @@ -39929,11 +37653,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -39948,15 +37668,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -39992,11 +37708,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -40011,15 +37723,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "(len({recv}) == 0)".to_string(), ))], @@ -40055,11 +37763,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -40074,15 +37778,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "__v3_fold({recv}, {init}, {body})".to_string(), ))], @@ -40120,11 +37820,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -40139,15 +37835,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "[{body} for {item} in {recv}]".to_string(), ))], @@ -40185,11 +37877,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -40204,15 +37892,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "[x for x in {recv} if {arg}(x)]".to_string(), ))], @@ -40250,11 +37934,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -40269,15 +37949,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "any({arg}(x) for x in {recv})".to_string(), ))], @@ -40315,11 +37991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -40334,15 +38006,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "all({arg}(x) for x in {recv})".to_string(), ))], @@ -40380,11 +38048,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -40399,15 +38063,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "[y for x in {recv} for y in {arg}(x)]".to_string(), ))], @@ -40445,11 +38105,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -40464,26 +38120,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1046), + value: DeclarationId(1047), }], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(2362)), -======= - meta_tag: Some(DeclarationId(2369)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + meta_tag: Some(DeclarationId(2370)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -40502,11 +38150,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -40519,11 +38163,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -40543,11 +38183,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "{arg}.join({recv})".to_string(), ))], @@ -40560,11 +38196,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -40584,11 +38216,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}.split({arg})".to_string(), ))], @@ -40601,11 +38229,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -40627,11 +38251,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[-1] if {recv} else None".to_string(), ))], @@ -40644,11 +38264,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -40670,11 +38286,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[0] if {recv} else None".to_string(), ))], @@ -40687,11 +38299,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -40713,11 +38321,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "list(enumerate({recv}))".to_string(), ))], @@ -40730,11 +38334,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -40756,11 +38356,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "[ord(c) for c in {recv}]".to_string(), ))], @@ -40773,19 +38369,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), ]), - FieldValue::Reference(DeclarationId(1144)), FieldValue::Reference(DeclarationId(1145)), FieldValue::Reference(DeclarationId(1146)), FieldValue::Reference(DeclarationId(1147)), + FieldValue::Reference(DeclarationId(1148)), FieldValue::Record(vec![ ( "dag_method".to_string(), @@ -40801,11 +38393,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[{arg}:]".to_string(), ))], @@ -40818,11 +38406,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -40842,11 +38426,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[:{arg}]".to_string(), ))], @@ -40859,11 +38439,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -40885,11 +38461,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "sorted({recv}, key={arg})".to_string(), ))], @@ -40902,11 +38474,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -40926,11 +38494,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv} + [{arg}]".to_string(), ))], @@ -40943,11 +38507,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -40967,11 +38527,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "{arg} in {recv}".to_string(), ))], @@ -40984,11 +38540,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -41003,7 +38555,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "CardinalityValue".to_string(), - ty: DeclarationId(2369), + ty: DeclarationId(2377), }, ], }, @@ -41137,15 +38669,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2378), }], }, type_params: vec![], @@ -41193,16 +38721,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2379), }], }, type_params: vec![], @@ -41216,12 +38740,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2380), }], }, type_params: vec![], @@ -41258,25 +38778,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2382), }, ], }, @@ -41291,7 +38803,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1152), + inputs: vec![DeclarationId(828), DeclarationId(722), DeclarationId(2371)], + output: DeclarationId(1153), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/runtime.dag", 11265, 11284)), }, type_params: vec![], @@ -41345,21 +38853,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3551, 4204) }); - declarations.push(Declaration { id: DeclarationId(1163), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2299), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4206, 4701) }); - declarations.push(Declaration { id: DeclarationId(1164), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2299), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4703, 5192) }); - declarations.push(Declaration { id: DeclarationId(1165), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2299), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5194, 5725) }); - declarations.push(Declaration { id: DeclarationId(1166), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), value: DeclarationId(1046) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2375)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Reference(DeclarationId(1162)), FieldValue::Reference(DeclarationId(1163)), FieldValue::Reference(DeclarationId(1164)), FieldValue::Reference(DeclarationId(1165)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2298), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2297), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5728, 8449) }); -======= - declarations.push(Declaration { id: DeclarationId(1162), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3551, 4204) }); - declarations.push(Declaration { id: DeclarationId(1163), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4206, 4701) }); - declarations.push(Declaration { id: DeclarationId(1164), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4703, 5192) }); - declarations.push(Declaration { id: DeclarationId(1165), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1046), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1046)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5194, 5725) }); - declarations.push(Declaration { id: DeclarationId(1166), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), value: DeclarationId(1046) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2382)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })]), FieldValue::Reference(DeclarationId(1162)), FieldValue::Reference(DeclarationId(1163)), FieldValue::Reference(DeclarationId(1164)), FieldValue::Reference(DeclarationId(1165)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2304), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5728, 8449) }); ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - declarations.push(Declaration { - id: DeclarationId(1167), + declarations.push(Declaration { id: DeclarationId(1163), name: Some("rust_filter_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1047), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(263)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2307), payload: vec![FieldValue::Literal(LiteralBits::String("{ let __filter_source = {iter}; let mut __result = Vec::new(); for {param} in __filter_source.iter() { if {body} { __result.push((*{param}).clone()); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3551, 4204) }); + declarations.push(Declaration { id: DeclarationId(1164), name: Some("rust_any_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1047), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(249)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2307), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4206, 4701) }); + declarations.push(Declaration { id: DeclarationId(1165), name: Some("rust_all_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1047), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(248)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2307), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 4703, 5192) }); + declarations.push(Declaration { id: DeclarationId(1166), name: Some("rust_flat_map_method_template_contract".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(1047), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(265)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2307), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![] })] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5194, 5725) }); + declarations.push(Declaration { id: DeclarationId(1167), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), value: DeclarationId(1047) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2383)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(258)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(271)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(295)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(273)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(262)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(252)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![] })]), FieldValue::Reference(DeclarationId(1163)), FieldValue::Reference(DeclarationId(1164)), FieldValue::Reference(DeclarationId(1165)), FieldValue::Reference(DeclarationId(1166)), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(293)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(299)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(2305), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 5728, 8449) }); + declarations.push(Declaration { + id: DeclarationId(1168), name: Some("InputField".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -41373,7 +38873,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2384), }, Field { label: "endpoint".to_string(), - ty: DeclarationId(1168), + ty: DeclarationId(1169), }, ], }, @@ -41450,15 +38946,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2385), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(597))), }, type_params: vec![], @@ -41494,16 +38985,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2386), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(599))), }, type_params: vec![], @@ -41517,15 +39003,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2387), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(601))), }, type_params: vec![], @@ -41539,15 +39021,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2388), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(603))), }, type_params: vec![], @@ -41561,15 +39039,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2389), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(605))), }, type_params: vec![], @@ -41583,15 +39057,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2390), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(607))), }, type_params: vec![], @@ -41605,15 +39075,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2391), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(609))), }, type_params: vec![], @@ -41627,15 +39093,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2393), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(611))), }, type_params: vec![], @@ -41649,15 +39111,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(1215)], + output: DeclarationId(2395), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(615))), }, type_params: vec![], @@ -41671,15 +39129,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(975)], + output: DeclarationId(2396), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(618))), }, type_params: vec![], @@ -41693,15 +39147,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(1215)], + output: DeclarationId(2397), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(622))), }, type_params: vec![], @@ -41715,15 +39165,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(1215), DeclarationId(975)], + output: DeclarationId(2398), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(627))), }, type_params: vec![], @@ -41737,16 +39183,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(828), DeclarationId(1215)], + output: DeclarationId(2399), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(634))), }, type_params: vec![], @@ -41760,16 +39201,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(828), DeclarationId(1215), DeclarationId(975)], + output: DeclarationId(2400), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(641))), }, type_params: vec![], @@ -41783,16 +39219,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(828), DeclarationId(1215), DeclarationId(979)], + output: DeclarationId(2401), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(646))), }, type_params: vec![], @@ -41806,16 +39237,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(828), DeclarationId(2402)], + output: DeclarationId(2403), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(656))), }, type_params: vec![], @@ -41829,16 +39255,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2404), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(664))), }, type_params: vec![], @@ -41852,33 +39273,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "DescentUnknown".to_string(), - ty: DeclarationId(2428), + ty: DeclarationId(2436), }, ], }, @@ -41893,10 +39302,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(2426), DeclarationId(2427)], + output: DeclarationId(2428), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2488, @@ -42004,16 +39408,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(2429), DeclarationId(230), DeclarationId(1190)], + output: DeclarationId(2430), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2833, @@ -42031,49 +39430,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "SetCardinality".to_string(), - ty: DeclarationId(2433), + ty: DeclarationId(2441), }, ], }, @@ -42088,25 +39467,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2443), }, ], }, @@ -42121,10 +39492,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2445), }, ], }, @@ -42176,10 +39539,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2431), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 6420, @@ -42246,15 +39605,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2432), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 6860, @@ -42272,65 +39627,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "FoldIteration".to_string(), - ty: DeclarationId(2444), + ty: DeclarationId(2452), }, ], }, @@ -42345,16 +39672,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2453), }], }, type_params: vec![], @@ -42368,7 +39691,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2454), }, ], }, @@ -42401,16 +39720,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2455), }], }, type_params: vec![], @@ -42424,25 +39739,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2457), }, ], }, @@ -42457,25 +39764,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2459), }, ], }, @@ -42490,7 +39789,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2460), }, ], }, @@ -42523,16 +39818,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2433), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 12400, @@ -42550,7 +39840,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Stale".to_string(), - ty: DeclarationId(2458), + ty: DeclarationId(2466), }, ], }, @@ -42636,7 +39910,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2467), }], }, type_params: vec![], @@ -42704,17 +39974,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2461), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(714))), }, type_params: vec![], @@ -42878,7 +40144,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(978), + output: DeclarationId(979), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(747))), }, type_params: vec![], @@ -42954,15 +40216,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1214), + inputs: vec![DeclarationId(1215), DeclarationId(818)], + output: DeclarationId(1215), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(756))), }, type_params: vec![], @@ -42976,16 +40234,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2462), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(793))), }, type_params: vec![], @@ -42999,15 +40252,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(978), + inputs: vec![DeclarationId(828), DeclarationId(1215)], + output: DeclarationId(979), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(807))), }, type_params: vec![], @@ -43021,371 +40270,190 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -43399,13 +40467,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -43546,284 +40561,171 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/tokenize.dag", 2347, 2653), - }); - declarations.push(Declaration { - id: DeclarationId(1237), - name: Some("LocalPunctSpec".to_string()), - connective: TypeConnective::Conj { - children: vec![ - Field { - label: "pattern".to_string(), - ty: DeclarationId(230), - }, - Field { - label: "kind".to_string(), - ty: DeclarationId(1236), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/tokenize.dag", 2863, 2927), - }); - declarations.push(Declaration { - id: DeclarationId(1238), - name: Some("StringEscapeSpec".to_string()), - connective: TypeConnective::Conj { - children: vec![ - Field { - label: "suffix".to_string(), - ty: DeclarationId(230), - }, - Field { - label: "output_codepoint".to_string(), - ty: DeclarationId(93), + label: "output_codepoint".to_string(), + ty: DeclarationId(93), }, ], }, @@ -43838,7 +40740,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -44080,25 +40941,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2579), }, ], }, @@ -44113,17 +40966,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2581), }, ], }, @@ -44171,16 +41016,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2582), }], }, type_params: vec![], @@ -44194,33 +41035,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Identity".to_string(), - ty: DeclarationId(2577), + ty: DeclarationId(2585), }, ], }, @@ -44235,12 +41064,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2586), }], }, type_params: vec![], @@ -44277,203 +41102,106 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -44487,7 +41215,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2614), }, ], }, @@ -44561,25 +41285,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2616), }, ], }, @@ -44594,7 +41310,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2617), }, ], }, @@ -44635,25 +41347,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2619), }, ], }, @@ -44668,7 +41372,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2620), }, ], }, @@ -44697,7 +41397,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2621), }, ], }, @@ -44726,15 +41422,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(1260)], + output: DeclarationId(2565), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 19182, @@ -44752,11 +41444,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + inputs: vec![DeclarationId(2566)], + output: DeclarationId(2567), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 19424, @@ -44801,16 +41488,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2622), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(809))), }, type_params: vec![], @@ -44824,7 +41506,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2192), payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2187), -======= - constructor: DeclarationId(2194), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2195), payload: vec![], }, ), @@ -44964,22 +41638,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2273), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1863), + constructor: DeclarationId(1864), payload: vec![ FieldValue::Literal(LiteralBits::Int( "-2147483648".to_string(), )), FieldValue::Variant { - constructor: DeclarationId(1862), + constructor: DeclarationId(1863), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1860), + constructor: DeclarationId(1861), payload: vec![FieldValue::Literal(LiteralBits::Int( "4294967295".to_string(), ))], @@ -45151,7 +41821,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2274), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1279)), + FieldValue::Reference(DeclarationId(1280)), ), ], }), @@ -45207,22 +41873,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "declaration".to_string(), ))], @@ -45519,22 +42181,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -45623,11 +42281,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "state".to_string(), ))], @@ -45648,11 +42302,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "produced_by".to_string(), ))], @@ -45676,22 +42326,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "file".to_string(), ))], @@ -45739,11 +42385,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_start".to_string(), ))], @@ -45762,11 +42404,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_end".to_string(), ))], @@ -45790,22 +42428,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -46101,11 +42735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -46129,22 +42759,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -46194,11 +42820,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -46222,22 +42844,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -46287,11 +42905,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "algebra".to_string(), ))], @@ -46315,22 +42929,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "permitted_accessors".to_string(), ))], @@ -46383,22 +42993,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -46446,11 +43052,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -46474,22 +43076,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -46537,11 +43135,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -46565,22 +43159,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -46628,11 +43218,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "second".to_string(), ))], @@ -46651,11 +43237,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -46679,22 +43261,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "member_of".to_string(), ))], @@ -46742,11 +43320,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "slot_of".to_string(), ))], @@ -46770,22 +43344,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "node_id".to_string(), ))], @@ -46836,22 +43406,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "param".to_string(), ))], @@ -46902,22 +43468,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "transform".to_string(), ))], @@ -46968,22 +43530,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "members".to_string(), ))], @@ -47033,11 +43591,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "intra_cluster_calls".to_string(), ))], @@ -47061,22 +43615,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -47288,11 +43838,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -47313,11 +43859,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "connective".to_string(), ))], @@ -47338,11 +43880,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "type_params".to_string(), ))], @@ -47363,11 +43901,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "phantom_params".to_string(), ))], @@ -47388,11 +43922,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "meta_tag".to_string(), ))], @@ -47413,11 +43943,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "inhabits".to_string(), ))], @@ -47438,11 +43964,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "value_body".to_string(), ))], @@ -47463,11 +43985,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "nominal_opacity".to_string(), ))], @@ -47486,11 +44004,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -47514,22 +44028,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "binding_name".to_string(), ))], @@ -47827,11 +44337,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "payload_port".to_string(), ))], @@ -47855,22 +44361,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -47920,11 +44422,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -47943,11 +44441,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -47966,11 +44460,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -47994,22 +44484,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -48098,11 +44584,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -48123,11 +44605,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -48146,11 +44624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -48174,22 +44648,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -48237,11 +44707,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "target".to_string(), ))], @@ -48260,11 +44726,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "inputs".to_string(), ))], @@ -48285,11 +44747,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -48308,11 +44766,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -48336,22 +44790,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -48399,11 +44849,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "input".to_string(), ))], @@ -48422,11 +44868,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "paths".to_string(), ))], @@ -48447,11 +44889,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -48470,11 +44908,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -48495,11 +44929,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -48523,22 +44953,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -48586,11 +45012,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "source".to_string(), ))], @@ -48609,11 +45031,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "init".to_string(), ))], @@ -48632,11 +45050,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -48655,11 +45069,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "bound".to_string(), ))], @@ -48680,11 +45090,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -48703,11 +45109,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -48731,22 +45133,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -48794,11 +45192,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -48819,11 +45213,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -48842,11 +45232,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "params".to_string(), ))], @@ -48865,11 +45251,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -48890,11 +45272,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -48918,22 +45296,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "declarations".to_string(), ))], @@ -49024,11 +45398,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "nodes".to_string(), ))], @@ -49047,11 +45417,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "ports".to_string(), ))], @@ -49072,11 +45438,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "clusters".to_string(), ))], @@ -49100,15 +45462,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1394)), ), ( "target".to_string(), @@ -49658,27 +45980,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("go_port_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1393)), + FieldValue::Reference(DeclarationId(1394)), ), ( "target".to_string(), @@ -49700,28 +46017,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("go_declaration_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1393)), -<<<<<<< HEAD + FieldValue::Reference(DeclarationId(1394)), ), ( "target".to_string(), @@ -49743,24 +46054,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1394)), ), ( "target".to_string(), @@ -49781,63 +46090,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1394)), ), ( "target".to_string(), @@ -49859,27 +46128,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("go_port_id_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1393)), + FieldValue::Reference(DeclarationId(1394)), ), ( "target".to_string(), @@ -49901,28 +46165,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("go_declaration_id_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1393)), -<<<<<<< HEAD + FieldValue::Reference(DeclarationId(1394)), ), ( "target".to_string(), @@ -49944,24 +46202,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1394)), ), ( "target".to_string(), @@ -49983,22 +46239,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2288), payload: vec![], }, ), @@ -50326,22 +46578,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2292), payload: vec![], }, ), @@ -50577,36 +46825,199 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - span: SourceSpan::new("src/v3/spec/go.dag", 26264, 26447), - }); - declarations.push(Declaration { - id: DeclarationId(1372), - name: Some("go_list_instantiation".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1023), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1023)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1393)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(686)), - ), - ( - "carrier".to_string(), - FieldValue::Literal(LiteralBits::String("[]{element}".to_string())), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/go.dag", 26449, 26585), - }); - declarations.push(Declaration { - id: DeclarationId(1373), - name: Some("go_result_instantiation".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1023), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1023)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1393)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(11)), - ), - ( - "carrier".to_string(), - FieldValue::Literal(LiteralBits::String( - "v3Result[{key}, {value}]".to_string(), - )), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/go.dag", 27271, 27424), - }); - declarations.push(Declaration { - id: DeclarationId(1374), - name: Some("go_map_instantiation".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1023), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1023)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1393)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(137)), - ), - ( - "carrier".to_string(), - FieldValue::Literal(LiteralBits::String("map[{key}]{value}".to_string())), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/go.dag", 27426, 27566), - }); - declarations.push(Declaration { - id: DeclarationId(1375), - name: Some("go_is_empty_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1015), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1393)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(712)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("0".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2270), -======= - constructor: DeclarationId(2277), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - payload: vec![], - }, - ), - ])]), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/go.dag", 27568, 27756), - }); - declarations.push(Declaration { - id: DeclarationId(1376), - name: Some("go_fold_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1015), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1393)), - ), - ( - "target".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(694)), -======= - FieldValue::Reference(DeclarationId(693)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2293), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("0".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2277), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2278), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("2".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2277), - payload: vec![], - }, - ), - ]), - ]), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/go.dag", 27758, 28015), - }); - declarations.push(Declaration { - id: DeclarationId(1377), - name: Some("go_map_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1015), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1393)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(701)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2294), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("0".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2270), -======= - constructor: DeclarationId(2277), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2271), + constructor: DeclarationId(2279), payload: vec![], }, ), @@ -51108,10 +47058,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2278), payload: vec![], }, ), @@ -51129,27 +47076,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("go_map_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1393)), + FieldValue::Reference(DeclarationId(1394)), ), ( "target".to_string(), @@ -51173,11 +47115,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2278), payload: vec![], }, ), @@ -51190,11 +47128,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2278), payload: vec![], }, ), @@ -51212,27 +47146,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("go_filter_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1393)), + FieldValue::Reference(DeclarationId(1394)), ), ( "target".to_string(), @@ -51256,11 +47185,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2278), payload: vec![], }, ), @@ -51273,8 +47198,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2278), payload: vec![], }, ), @@ -51365,22 +47286,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2299), payload: vec![], }, ), ( "empty_variant".to_string(), - FieldValue::Reference(DeclarationId(1768)), + FieldValue::Reference(DeclarationId(1769)), ), ( "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1770)), + FieldValue::Reference(DeclarationId(1771)), ), ( "scrutinee".to_string(), @@ -51436,15 +47353,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2127), payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2122), -======= - constructor: DeclarationId(2129), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2130), payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2125), -======= - constructor: DeclarationId(2132), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2133), payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2128), -======= - constructor: DeclarationId(2135), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2136), payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2132), -======= - constructor: DeclarationId(2139), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2140), payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2134), -======= - constructor: DeclarationId(2141), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2142), payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2138), -======= - constructor: DeclarationId(2145), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2146), payload: vec![], }, ), ( "correction_style".to_string(), - FieldValue::Reference(DeclarationId(1394)), + FieldValue::Reference(DeclarationId(1395)), ), ( "post_emit_verifier".to_string(), @@ -52143,11 +48032,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2149), payload: vec![], }, ), @@ -52160,26 +48045,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2192), payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2187), -======= - constructor: DeclarationId(2194), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2195), payload: vec![], }, ), @@ -52777,22 +48654,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2273), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1863), + constructor: DeclarationId(1864), payload: vec![ FieldValue::Literal(LiteralBits::Int( "-2147483648".to_string(), )), FieldValue::Variant { - constructor: DeclarationId(1862), + constructor: DeclarationId(1863), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1860), + constructor: DeclarationId(1861), payload: vec![FieldValue::Literal(LiteralBits::Int( "4294967295".to_string(), ))], @@ -52921,7 +48794,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2273), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1864), + constructor: DeclarationId(1865), payload: vec![], }], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1413)), + FieldValue::Reference(DeclarationId(1414)), ), ], }), @@ -52980,22 +48849,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1410)), ), ( "target".to_string(), @@ -54194,27 +50023,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("python_port_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1409)), + FieldValue::Reference(DeclarationId(1410)), ), ( "target".to_string(), @@ -54236,28 +50060,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("python_declaration_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1409)), -<<<<<<< HEAD + FieldValue::Reference(DeclarationId(1410)), ), ( "target".to_string(), @@ -54279,24 +50097,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1410)), ), ( "target".to_string(), @@ -54318,22 +50134,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2288), payload: vec![], }, ), @@ -54584,22 +50396,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2292), payload: vec![], }, ), @@ -54835,36 +50643,89 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - span: SourceSpan::new("src/v3/spec/python.dag", 16908, 17099), - }); - declarations.push(Declaration { - id: DeclarationId(1466), - name: Some("python_is_empty_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1015), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1409)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(712)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2285), -======= - constructor: DeclarationId(2292), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("0".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2270), -======= - constructor: DeclarationId(2277), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - payload: vec![], - }, - ), - ])]), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/python.dag", 17101, 17297), - }); - declarations.push(Declaration { - id: DeclarationId(1467), - name: Some("python_fold_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1015), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1409)), - ), - ( - "target".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(694)), -======= - FieldValue::Reference(DeclarationId(693)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2293), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("0".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2277), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2278), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("2".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2277), - payload: vec![], - }, - ), - ]), - ]), - ), - ( - "cost".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/python.dag", 17299, 17564), - }); - declarations.push(Declaration { - id: DeclarationId(1468), - name: Some("python_map_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1015), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1409)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(701)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2294), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("0".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2270), -======= - constructor: DeclarationId(2277), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ( - "slot".to_string(), - FieldValue::Literal(LiteralBits::Int("1".to_string())), - ), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2271), + constructor: DeclarationId(2279), payload: vec![], }, ), @@ -55256,10 +50766,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2278), payload: vec![], }, ), @@ -55277,27 +50784,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("python_map_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1409)), + FieldValue::Reference(DeclarationId(1410)), ), ( "target".to_string(), @@ -55321,11 +50823,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2278), payload: vec![], }, ), @@ -55338,11 +50836,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2278), payload: vec![], }, ), @@ -55360,27 +50854,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("python_filter_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1409)), + FieldValue::Reference(DeclarationId(1410)), ), ( "target".to_string(), @@ -55404,11 +50893,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2278), payload: vec![], }, ), @@ -55421,8 +50906,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2278), payload: vec![], }, ), @@ -55513,22 +50994,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2299), payload: vec![], }, ), ( "empty_variant".to_string(), - FieldValue::Reference(DeclarationId(1768)), + FieldValue::Reference(DeclarationId(1769)), ), ( "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1770)), + FieldValue::Reference(DeclarationId(1771)), ), ( "scrutinee".to_string(), @@ -55697,15 +51174,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2127), payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2124), -======= - constructor: DeclarationId(2131), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2132), payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2125), -======= - constructor: DeclarationId(2132), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2133), payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2128), -======= - constructor: DeclarationId(2135), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2136), payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2132), -======= - constructor: DeclarationId(2139), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2140), payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2133), -======= - constructor: DeclarationId(2140), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2141), payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2138), -======= - constructor: DeclarationId(2145), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2146), payload: vec![], }, ), ( "correction_style".to_string(), - FieldValue::Reference(DeclarationId(1476)), + FieldValue::Reference(DeclarationId(1477)), ), ( "post_emit_verifier".to_string(), @@ -55854,11 +51303,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2148), payload: vec![], }, ), @@ -55871,26 +51316,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2194), payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2187), -======= - constructor: DeclarationId(2194), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2195), payload: vec![], }, ), @@ -55941,22 +51378,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2273), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1863), + constructor: DeclarationId(1864), payload: vec![ FieldValue::Literal(LiteralBits::Int("0".to_string())), FieldValue::Variant { - constructor: DeclarationId(1862), + constructor: DeclarationId(1863), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1860), + constructor: DeclarationId(1861), payload: vec![FieldValue::Literal(LiteralBits::Int( "4294967295".to_string(), ))], @@ -56372,7 +51805,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2273), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1863), + constructor: DeclarationId(1864), payload: vec![ FieldValue::Literal(LiteralBits::Int( "-2147483648".to_string(), )), FieldValue::Variant { - constructor: DeclarationId(1862), + constructor: DeclarationId(1863), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1860), + constructor: DeclarationId(1861), payload: vec![FieldValue::Literal(LiteralBits::Int( "4294967295".to_string(), ))], @@ -56435,7 +51864,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2272), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1484)), + FieldValue::Reference(DeclarationId(1485)), ), ], }), @@ -56491,22 +51916,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2272), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1482)), + FieldValue::Reference(DeclarationId(1483)), ), ], }), @@ -56538,22 +51959,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2272), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1486)), + FieldValue::Reference(DeclarationId(1487)), ), ], }), @@ -56585,22 +52002,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2272), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1487)), + FieldValue::Reference(DeclarationId(1488)), ), ], }), @@ -56632,22 +52045,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2274), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1488)), + FieldValue::Reference(DeclarationId(1489)), ), ], }), @@ -56679,22 +52088,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2274), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1489)), + FieldValue::Reference(DeclarationId(1490)), ), ], }), @@ -56726,22 +52131,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "declaration".to_string(), ))], @@ -57038,22 +52439,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -57142,11 +52539,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "state_value".to_string(), ))], @@ -57167,11 +52560,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "produced_by".to_string(), ))], @@ -57195,22 +52584,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "file".to_string(), ))], @@ -57258,11 +52643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_start".to_string(), ))], @@ -57281,11 +52662,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_end".to_string(), ))], @@ -57309,22 +52686,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -57620,11 +52993,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -57648,22 +53017,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -57713,11 +53078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -57741,22 +53102,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -57806,11 +53163,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "algebra".to_string(), ))], @@ -57834,22 +53187,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "permitted_accessors".to_string(), ))], @@ -57902,22 +53251,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "0".to_string(), ))], @@ -57967,11 +53312,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "1".to_string(), ))], @@ -57995,22 +53336,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -58058,11 +53395,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -58086,22 +53419,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -58149,11 +53478,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "second".to_string(), ))], @@ -58172,11 +53497,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -58200,22 +53521,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "index_of".to_string(), ))], @@ -58266,22 +53583,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "member_of".to_string(), ))], @@ -58329,11 +53642,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "slot_of".to_string(), ))], @@ -58357,22 +53666,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "node_id".to_string(), ))], @@ -58423,22 +53728,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "param".to_string(), ))], @@ -58489,22 +53790,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "transform".to_string(), ))], @@ -58555,22 +53852,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "members".to_string(), ))], @@ -58620,11 +53913,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "intra_cluster_calls".to_string(), ))], @@ -58648,22 +53937,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -58875,11 +54160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -58900,11 +54181,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "connective".to_string(), ))], @@ -58925,11 +54202,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "type_params".to_string(), ))], @@ -58950,11 +54223,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "phantom_params".to_string(), ))], @@ -58975,11 +54244,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "meta_tag".to_string(), ))], @@ -59000,11 +54265,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "inhabits".to_string(), ))], @@ -59025,11 +54286,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "value_body".to_string(), ))], @@ -59050,11 +54307,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "nominal_opacity".to_string(), ))], @@ -59073,11 +54326,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -59101,22 +54350,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "binding_name".to_string(), ))], @@ -59414,11 +54659,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "payload_port".to_string(), ))], @@ -59442,22 +54683,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -59507,11 +54744,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -59530,11 +54763,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -59553,11 +54782,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -59581,22 +54806,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -59685,11 +54906,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "data".to_string(), ))], @@ -59710,11 +54927,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -59733,11 +54946,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -59758,11 +54967,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "lane2_workflow".to_string(), ))], @@ -59786,22 +54991,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -59849,11 +55050,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "target".to_string(), ))], @@ -59872,11 +55069,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "inputs".to_string(), ))], @@ -59897,11 +55090,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -59920,11 +55109,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -59948,22 +55133,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -60011,11 +55192,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "input".to_string(), ))], @@ -60034,11 +55211,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "paths".to_string(), ))], @@ -60059,11 +55232,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -60082,11 +55251,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -60107,11 +55272,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -60135,22 +55296,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -60198,11 +55355,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "source".to_string(), ))], @@ -60221,11 +55374,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "init".to_string(), ))], @@ -60244,11 +55393,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -60267,11 +55412,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "bound".to_string(), ))], @@ -60292,11 +55433,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -60315,11 +55452,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -60343,22 +55476,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -60406,11 +55535,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -60431,11 +55556,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -60454,11 +55575,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "params".to_string(), ))], @@ -60477,11 +55594,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2275), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -60502,11 +55615,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "lane2_workflow".to_string(), ))], @@ -60527,11 +55636,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -60555,22 +55660,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "declarations".to_string(), ))], @@ -60661,11 +55762,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "nodes".to_string(), ))], @@ -60684,11 +55781,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "ports".to_string(), ))], @@ -60709,11 +55802,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2276), payload: vec![FieldValue::Literal(LiteralBits::String( "clusters".to_string(), ))], @@ -60737,15 +55826,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1623)), ), ( "target".to_string(), @@ -61295,27 +56344,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("rust_port_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1622)), + FieldValue::Reference(DeclarationId(1623)), ), ( "target".to_string(), @@ -61337,28 +56381,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("rust_declaration_id_eq".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1622)), -<<<<<<< HEAD + FieldValue::Reference(DeclarationId(1623)), ), ( "target".to_string(), @@ -61380,24 +56418,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1623)), ), ( "target".to_string(), @@ -61419,22 +56455,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1623)), ), ( "target".to_string(), @@ -61533,27 +56529,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("rust_port_id_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1622)), + FieldValue::Reference(DeclarationId(1623)), ), ( "target".to_string(), @@ -61575,28 +56566,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("rust_declaration_id_ne".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1013), + template: DeclarationId(1014), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1013)), + meta_tag: Some(DeclarationId(1014)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1622)), -<<<<<<< HEAD + FieldValue::Reference(DeclarationId(1623)), ), ( "target".to_string(), @@ -61618,24 +56603,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1623)), ), ( "target".to_string(), @@ -61657,22 +56640,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2288), payload: vec![], }, ), @@ -62001,22 +56980,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2292), payload: vec![], }, ), @@ -62252,223 +57227,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) span: SourceSpan::new("src/v3/spec/rust.dag", 37846, 38033), }); declarations.push(Declaration { - id: DeclarationId(1589), + id: DeclarationId(1590), name: Some("rust_list_instantiation".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1023), + template: DeclarationId(1024), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1023)), + meta_tag: Some(DeclarationId(1024)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1622)), + FieldValue::Reference(DeclarationId(1623)), ), ( "target".to_string(), @@ -62489,22 +57266,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2293), payload: vec![], }, ), @@ -62827,11 +57600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2278), payload: vec![], }, ), @@ -62848,113 +57617,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ), ( "strategy".to_string(), @@ -62974,11 +57656,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2278), payload: vec![], }, ), @@ -62991,8 +57669,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2278), payload: vec![], }, ), @@ -63026,27 +57700,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("rust_map_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1622)), + FieldValue::Reference(DeclarationId(1623)), ), ( "target".to_string(), @@ -63070,11 +57739,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2278), payload: vec![], }, ), @@ -63087,11 +57752,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2278), payload: vec![], }, ), @@ -63109,27 +57770,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("rust_filter_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1015), + template: DeclarationId(1016), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1015)), + meta_tag: Some(DeclarationId(1016)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1622)), + FieldValue::Reference(DeclarationId(1623)), ), ( "target".to_string(), @@ -63153,11 +57809,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2278), payload: vec![], }, ), @@ -63170,8 +57822,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2278), payload: vec![], }, ), @@ -63262,22 +57910,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2299), payload: vec![], }, ), ( "empty_variant".to_string(), - FieldValue::Reference(DeclarationId(1768)), + FieldValue::Reference(DeclarationId(1769)), ), ( "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1770)), + FieldValue::Reference(DeclarationId(1771)), ), ( "scrutinee".to_string(), @@ -63335,15 +57979,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "{ let mut __left = {left}; __left.extend({right}); __left }" .to_string(), @@ -63752,11 +58392,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -63767,15 +58403,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "({recv}).len() as i64".to_string(), ))], @@ -63813,11 +58445,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -63828,15 +58456,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "({recv}).is_empty()".to_string(), ))], @@ -63872,11 +58496,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -63887,15 +58507,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "({recv}).iter().fold({init}, {body})".to_string(), ))], @@ -63933,11 +58549,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -63948,15 +58560,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2306), payload: vec![FieldValue::Literal(LiteralBits::String( "({recv}).iter().map({body}).collect::>()".to_string(), ))], @@ -63994,11 +58602,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2305), payload: vec![], }, ), @@ -64008,17 +58612,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2300), payload: vec![], }, ), ( "construct".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2294), -======= - constructor: DeclarationId(2301), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2302), payload: vec![], }, ), @@ -64096,66 +58692,66 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2127), payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2122), -======= - constructor: DeclarationId(2129), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2130), payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2126), -======= - constructor: DeclarationId(2133), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2134), payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2128), -======= - constructor: DeclarationId(2135), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2136), payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2131), -======= - constructor: DeclarationId(2138), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2139), payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2134), -======= - constructor: DeclarationId(2141), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2142), payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2137), -======= - constructor: DeclarationId(2144), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2145), payload: vec![], }, ), ( "correction_style".to_string(), - FieldValue::Reference(DeclarationId(1623)), + FieldValue::Reference(DeclarationId(1624)), ), ( "post_emit_verifier".to_string(), @@ -64324,11 +58892,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2148), payload: vec![], }, ), @@ -64341,26 +58905,26 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -64500,7 +59028,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("node_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(830), arguments: vec![], @@ -64537,8 +59060,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + FieldValue::Reference(DeclarationId(1623)), ), ], }), @@ -64581,7 +59101,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "SnapshotText".to_string(), - ty: DeclarationId(2617), + ty: DeclarationId(2625), }, ], }, @@ -64962,21 +59470,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) payload: vec![], }, ), @@ -65210,18 +59679,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2624), payload: vec![], }, ), @@ -65249,18 +59714,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - ), - ( - "snapshot".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2623), - payload: vec![], - }, - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1798, 1952), - }); - declarations.push(Declaration { - id: DeclarationId(1657), - name: Some("emit_stage_binding".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1645), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1645)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "stage".to_string(), - FieldValue::Reference(DeclarationId(1663)), - ), ( "realization".to_string(), FieldValue::Reference(DeclarationId(1650)), @@ -65360,31 +59787,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - id: DeclarationId(1658), + id: DeclarationId(1659), name: Some("parse".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(230), DeclarationId(230)], -<<<<<<< HEAD - output: DeclarationId(828), -======= - output: DeclarationId(827), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - body: ArrowBody::ExternalRealization(DeclarationId(1646)), - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2078, 2140), - }); - declarations.push(Declaration { - id: DeclarationId(1659), - name: Some("lower".to_string()), -<<<<<<< HEAD - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(828)], output: DeclarationId(828), body: ArrowBody::ExternalRealization(DeclarationId(1647)), }, @@ -65471,13 +59872,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + name: Some("lower".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(828)], output: DeclarationId(828), @@ -65494,13 +59893,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Arrow { inputs: vec![DeclarationId(828)], output: DeclarationId(828), @@ -65517,19 +59911,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - body: ArrowBody::ExternalRealization(DeclarationId(1651)), + inputs: vec![DeclarationId(828)], + output: DeclarationId(828), + body: ArrowBody::ExternalRealization(DeclarationId(1652)), }, type_params: vec![], phantom_params: Vec::new(), @@ -65561,23 +59947,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - DeclarationId(1043), + DeclarationId(1044), ], output: DeclarationId(230), - body: ArrowBody::ExternalRealization(DeclarationId(1650)), + body: ArrowBody::ExternalRealization(DeclarationId(1651)), }, type_params: vec![], phantom_params: Vec::new(), @@ -65590,10 +59970,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2626), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/compiler/operators.dag", 156, @@ -65638,7 +60014,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2628), }, ], }, @@ -66102,33 +60470,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "TerminalAlgebra".to_string(), - ty: DeclarationId(2623), + ty: DeclarationId(2631), }, ], }, @@ -66143,65 +60499,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "TerminalCarrier".to_string(), - ty: DeclarationId(2630), + ty: DeclarationId(2638), }, ], }, @@ -66216,33 +60544,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Trap".to_string(), - ty: DeclarationId(2633), + ty: DeclarationId(2641), }, ], }, @@ -66257,25 +60573,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2643), }, ], }, @@ -66290,64 +60598,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1683), + value: DeclarationId(1684), }], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(2636)), -======= - meta_tag: Some(DeclarationId(2643)), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + meta_tag: Some(DeclarationId(2644)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2634), - payload: vec![ - FieldValue::Literal(LiteralBits::String("i8".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2619), -======= - constructor: DeclarationId(2641), + constructor: DeclarationId(2642), payload: vec![ FieldValue::Literal(LiteralBits::String("i8".to_string())), FieldValue::Variant { - constructor: DeclarationId(2626), - payload: vec![], - }, - FieldValue::Variant { - constructor: DeclarationId(2632), - payload: vec![], - }, - FieldValue::Literal(LiteralBits::String("-128".to_string())), - FieldValue::Literal(LiteralBits::String("127".to_string())), - FieldValue::Literal(LiteralBits::Bool(true)), - FieldValue::Variant { - constructor: DeclarationId(2638), - payload: vec![], - }, - ], - }, - FieldValue::Variant { - constructor: DeclarationId(2641), - payload: vec![ - FieldValue::Literal(LiteralBits::String("i16".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2626), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2627), payload: vec![], }, FieldValue::Variant { @@ -66358,29 +60629,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2639), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2634), -======= - constructor: DeclarationId(2641), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2642), payload: vec![ FieldValue::Literal(LiteralBits::String("i16".to_string())), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2619), -======= - constructor: DeclarationId(2626), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2627), payload: vec![], }, FieldValue::Variant { @@ -66391,29 +60650,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2639), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2634), -======= - constructor: DeclarationId(2641), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2642), payload: vec![ FieldValue::Literal(LiteralBits::String("i32".to_string())), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2619), -======= - constructor: DeclarationId(2626), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2627), payload: vec![], }, FieldValue::Variant { @@ -66424,21 +60671,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2639), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2634), - payload: vec![ - FieldValue::Literal(LiteralBits::String("i128".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2619), - payload: vec![], - }, - FieldValue::Variant { - constructor: DeclarationId(2629), -======= - constructor: DeclarationId(2641), + constructor: DeclarationId(2642), payload: vec![ FieldValue::Literal(LiteralBits::String("i128".to_string())), FieldValue::Variant { - constructor: DeclarationId(2626), + constructor: DeclarationId(2627), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2636), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2637), payload: vec![], }, FieldValue::Literal(LiteralBits::String( @@ -66488,50 +60719,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2639), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2634), - payload: vec![ - FieldValue::Literal(LiteralBits::String("u8".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2620), -======= - constructor: DeclarationId(2641), + constructor: DeclarationId(2642), payload: vec![ FieldValue::Literal(LiteralBits::String("u8".to_string())), FieldValue::Variant { - constructor: DeclarationId(2627), - payload: vec![], - }, - FieldValue::Variant { - constructor: DeclarationId(2632), - payload: vec![], - }, - FieldValue::Literal(LiteralBits::String("0".to_string())), - FieldValue::Literal(LiteralBits::String("255".to_string())), - FieldValue::Literal(LiteralBits::Bool(true)), - FieldValue::Variant { - constructor: DeclarationId(2638), - payload: vec![], - }, - ], - }, - FieldValue::Variant { - constructor: DeclarationId(2641), - payload: vec![ - FieldValue::Literal(LiteralBits::String("u16".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2627), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2628), payload: vec![], }, FieldValue::Variant { @@ -66542,29 +60740,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2639), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2634), -======= - constructor: DeclarationId(2641), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2642), payload: vec![ FieldValue::Literal(LiteralBits::String("u16".to_string())), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2620), -======= - constructor: DeclarationId(2627), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2628), payload: vec![], }, FieldValue::Variant { @@ -66575,29 +60761,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2639), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2634), -======= - constructor: DeclarationId(2641), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2642), payload: vec![ FieldValue::Literal(LiteralBits::String("u32".to_string())), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2620), -======= - constructor: DeclarationId(2627), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2628), payload: vec![], }, FieldValue::Variant { @@ -66608,29 +60782,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2639), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2634), -======= - constructor: DeclarationId(2641), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2642), payload: vec![ FieldValue::Literal(LiteralBits::String("u64".to_string())), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2620), -======= - constructor: DeclarationId(2627), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2628), payload: vec![], }, FieldValue::Variant { @@ -66643,21 +60805,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2639), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2635), - payload: vec![ - FieldValue::Literal(LiteralBits::String("f32".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2621), -======= - constructor: DeclarationId(2642), + constructor: DeclarationId(2643), payload: vec![ FieldValue::Literal(LiteralBits::String("f32".to_string())), FieldValue::Variant { - constructor: DeclarationId(2628), - payload: vec![], - }, - FieldValue::Variant { - constructor: DeclarationId(2634), - payload: vec![], - }, - FieldValue::Literal(LiteralBits::Bool(true)), - ], - }, - FieldValue::Variant { - constructor: DeclarationId(2642), - payload: vec![ - FieldValue::Literal(LiteralBits::String("f64".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2628), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2629), payload: vec![], }, FieldValue::Variant { @@ -66714,11 +60849,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2643), payload: vec![ FieldValue::Literal(LiteralBits::String("f64".to_string())), FieldValue::Variant { @@ -66726,22 +60857,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2636), payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2635), -======= - constructor: DeclarationId(2642), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2643), payload: vec![ FieldValue::Literal(LiteralBits::String("bool".to_string())), FieldValue::Variant { @@ -66749,26 +60872,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + constructor: DeclarationId(2638), payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), @@ -66780,49 +60899,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Step".to_string(), - ty: DeclarationId(2642), + ty: DeclarationId(2650), }, ], }, @@ -66837,29 +60936,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Organization".to_string(), - ty: DeclarationId(2645), + ty: DeclarationId(2653), }, ], }, @@ -67009,7 +61096,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2655), }, ], }, @@ -67112,49 +61191,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ScopeReadUser".to_string(), - ty: DeclarationId(2652), + ty: DeclarationId(2660), }, ], }, @@ -67169,7 +61228,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2661), }, Field { label: "has_next".to_string(), @@ -67202,33 +61257,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "PermAdmin".to_string(), - ty: DeclarationId(2656), + ty: DeclarationId(2664), }, ], }, @@ -67243,7 +61286,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "permissions".to_string(), - ty: DeclarationId(2660), + ty: DeclarationId(2668), }, ], }, @@ -67349,25 +61376,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "PermNone".to_string(), - ty: DeclarationId(2663), + ty: DeclarationId(2671), }, ], }, @@ -67423,49 +61438,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Schedule".to_string(), - ty: DeclarationId(2670), + ty: DeclarationId(2678), }, Field { label: "WorkflowDispatch".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2672), - }, - Field { - label: "WorkflowCall".to_string(), - ty: DeclarationId(2674), -======= - ty: DeclarationId(2679), + ty: DeclarationId(2680), }, Field { label: "WorkflowCall".to_string(), - ty: DeclarationId(2681), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2682), }, ], }, @@ -67480,41 +61475,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Closed".to_string(), - ty: DeclarationId(2678), + ty: DeclarationId(2686), }, ], }, @@ -67529,7 +61508,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2687), }, Field { label: "required".to_string(), @@ -67551,15 +61526,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2688), }, Field { label: "type".to_string(), - ty: DeclarationId(1707), + ty: DeclarationId(1708), }, ], }, @@ -67574,41 +61545,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "InputEnvironment".to_string(), - ty: DeclarationId(2684), + ty: DeclarationId(2692), }, ], }, @@ -67623,33 +61578,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "WorkflowScope".to_string(), - ty: DeclarationId(2687), + ty: DeclarationId(2695), }, ], }, @@ -67664,7 +61607,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "timeout_minutes".to_string(), - ty: DeclarationId(2694), + ty: DeclarationId(2702), }, Field { label: "continue_on_error".to_string(), @@ -67767,11 +61678,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2703), }, ], }, @@ -67786,7 +61693,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2706), }, ], }, @@ -67844,57 +61743,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "WindowsLatest".to_string(), - ty: DeclarationId(2704), + ty: DeclarationId(2712), }, ], }, @@ -67909,25 +61784,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2724), }, ], }, @@ -67942,49 +61809,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Cmd".to_string(), - ty: DeclarationId(2721), + ty: DeclarationId(2729), }, ], }, @@ -67999,7 +61846,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "StopCommands".to_string(), - ty: DeclarationId(2738), + ty: DeclarationId(2746), }, ], }, @@ -68109,7 +61924,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2750), }, ], }, @@ -68294,33 +62101,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "Ignore".to_string(), - ty: DeclarationId(2745), + ty: DeclarationId(2753), }, ], }, @@ -68335,15 +62130,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2759), }, Field { label: "fail_fast".to_string(), @@ -68411,11 +62194,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2760), }, ], }, @@ -68430,57 +62209,33 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "ActionRequired".to_string(), - ty: DeclarationId(2758), + ty: DeclarationId(2766), }, ], }, @@ -68495,15 +62250,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -68833,12 +62565,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + parameter: DeclarationId(687), + value: DeclarationId(703), }], }, type_params: vec![], @@ -68873,7 +62600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1756), + output: DeclarationId(1757), body: ArrowBody::NoBody, }, type_params: vec![], @@ -69031,7 +62754,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1762), + value: DeclarationId(1763), }], }, type_params: vec![], @@ -69155,7 +62874,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1765), + value: DeclarationId(1766), }], }, type_params: vec![], @@ -69219,7 +62934,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -69696,10 +63388,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -69865,7 +63535,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -69972,7 +63620,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -70768,17 +64412,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -70792,7 +64432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72273,7 +65891,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72371,7 +65967,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -72799,7 +66373,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -72994,17 +66564,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }], }, type_params: vec![], @@ -73018,7 +66584,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -73616,7 +67160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -74091,7 +67631,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -74168,7 +67699,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -74227,7 +67747,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) ], }, type_params: vec![], @@ -74286,7 +67795,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -74563,7 +68063,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1983), + inputs: vec![DeclarationId(1984), DeclarationId(849)], + output: DeclarationId(1984), body: ArrowBody::NoBody, }, type_params: vec![], @@ -74625,34 +68121,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, ], }, @@ -74667,7 +68151,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1170), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6542, 6557), - }); declarations.push(Declaration { id: DeclarationId(2047), -<<<<<<< HEAD name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), - value: DeclarationId(897), + value: DeclarationId(1171), }], }, type_params: vec![], @@ -74767,33 +68226,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { @@ -74812,18 +68249,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2049), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "content".to_string(), -<<<<<<< HEAD -======= - ty: DeclarationId(2047), + ty: DeclarationId(2048), }], }, type_params: vec![], @@ -74837,13 +68268,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - ty: DeclarationId(2049), + ty: DeclarationId(2050), }], }, type_params: vec![], @@ -74877,7 +68307,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2057), name: None, connective: TypeConnective::Conj { children: vec![Field { -<<<<<<< HEAD - label: "blocks".to_string(), - ty: DeclarationId(2056), -======= label: "source".to_string(), - ty: DeclarationId(893), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(894), }], }, type_params: vec![], @@ -75045,7 +68446,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2067), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(896), + DeclarationId(897), CardinalityBound::AtMostOne, ), ), @@ -75229,11 +68626,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2068), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75252,11 +68645,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2069), name: None, connective: TypeConnective::Conj { children: vec![ @@ -75266,19 +68655,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2068), }, ], }, @@ -75293,11 +68674,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2070), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75316,11 +68693,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2071), name: None, connective: TypeConnective::Conj { children: vec![ @@ -75346,112 +68719,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { - id: DeclarationId(2071), + id: DeclarationId(2072), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75465,7 +68736,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }); declarations.push(Declaration { id: DeclarationId(2079), name: None, @@ -75588,7 +68836,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2080), }, Field { label: "start_char_index".to_string(), @@ -75659,11 +68899,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2082), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75682,11 +68918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2083), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75705,11 +68937,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2084), name: None, connective: TypeConnective::Conj { children: vec![ @@ -75723,19 +68951,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2083), }, Field { label: "start_page_number".to_string(), @@ -75758,11 +68978,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2085), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75781,11 +68997,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2086), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75804,11 +69016,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2087), name: None, connective: TypeConnective::Conj { children: vec![ @@ -75822,19 +69030,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2086), }, Field { label: "start_block_index".to_string(), @@ -75857,11 +69057,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2088), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75880,11 +69076,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2089), name: None, connective: TypeConnective::Conj { children: vec![ @@ -75898,11 +69090,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2088), }, Field { label: "url".to_string(), @@ -75921,11 +69109,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2090), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -75944,11 +69128,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2091), name: None, connective: TypeConnective::Conj { children: vec![ @@ -75962,11 +69142,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2090), }, Field { label: "search_result_index".to_string(), @@ -75993,21 +69169,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2092), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(900), + value: DeclarationId(901), }], }, type_params: vec![], @@ -76021,19 +69189,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + DeclarationId(2092), CardinalityBound::AtMostOne, ), ), @@ -76048,11 +69208,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2094), name: None, connective: TypeConnective::Conj { children: vec![ @@ -76062,11 +69218,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2093), }, ], }, @@ -76081,11 +69233,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2095), name: None, connective: TypeConnective::Conj { children: vec![ @@ -76110,11 +69258,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2096), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -76133,11 +69277,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2097), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -76156,11 +69296,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2098), name: None, connective: TypeConnective::Conj { children: vec![ @@ -76178,11 +69314,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2097), }, ], }, @@ -76197,11 +69329,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2099), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -76220,11 +69348,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2100), name: None, connective: TypeConnective::Conj { children: vec![ @@ -76234,7 +69358,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2099), }, ], }, @@ -76261,11 +69381,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2101), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -76284,11 +69400,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2102), name: None, connective: TypeConnective::Conj { children: vec![ @@ -76302,11 +69414,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2101), }, ], }, @@ -76318,127 +69426,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - id: DeclarationId(2103), + id: DeclarationId(2104), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -76464,44 +69454,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }); - declarations.push(Declaration { - id: DeclarationId(2104), - name: None, -<<<<<<< HEAD - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(93), - CardinalityBound::AtMostOne, - ), - ), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775), }); declarations.push(Declaration { id: DeclarationId(2105), name: None, - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(230), - CardinalityBound::AtMostOne, - ), - ), -======= connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -76529,17 +69487,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -76565,7 +69513,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2117), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -76723,129 +69667,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2118), @@ -76949,10 +69771,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2148), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77298,11 +70116,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2149), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77316,11 +70130,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2150), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77334,11 +70144,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2151), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77352,15 +70158,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2152), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(928), + DeclarationId(929), CardinalityBound::AtMostOne, ), ), @@ -77375,11 +70177,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2153), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -77398,11 +70196,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2154), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -77421,15 +70215,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2155), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(938), + DeclarationId(939), CardinalityBound::AtMostOne, ), ), @@ -77444,15 +70234,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2156), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(938), + DeclarationId(939), CardinalityBound::AtMostOne, ), ), @@ -77467,11 +70253,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2157), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -77490,11 +70272,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2158), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -77513,11 +70291,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2159), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -77536,11 +70310,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2160), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -77559,11 +70329,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2161), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -77582,11 +70348,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2162), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77600,16 +70362,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2163), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "steps".to_string(), - ty: DeclarationId(1197), + ty: DeclarationId(1198), }], }, type_params: vec![], @@ -77623,11 +70381,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2164), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77641,11 +70395,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2165), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -77664,17 +70414,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2166), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "amount".to_string(), - ty: DeclarationId(1197), + ty: DeclarationId(1198), }, Field { label: "collection".to_string(), @@ -77693,17 +70439,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2167), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "steps".to_string(), - ty: DeclarationId(1197), + ty: DeclarationId(1198), }, Field { label: "ring_param".to_string(), @@ -77722,17 +70464,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2168), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "divisor".to_string(), - ty: DeclarationId(1199), + ty: DeclarationId(1200), }, Field { label: "ring_param".to_string(), @@ -77751,11 +70489,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2169), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -77774,11 +70508,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2170), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -77797,11 +70527,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2171), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -77820,11 +70546,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2172), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77838,11 +70560,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2173), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77856,16 +70574,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2174), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "steps".to_string(), - ty: DeclarationId(1197), + ty: DeclarationId(1198), }], }, type_params: vec![], @@ -77879,16 +70593,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2175), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "divisor".to_string(), - ty: DeclarationId(1199), + ty: DeclarationId(1200), }], }, type_params: vec![], @@ -77902,11 +70612,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2176), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77920,11 +70626,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2177), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77938,11 +70640,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2178), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77956,15 +70654,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2179), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(930), + DeclarationId(931), CardinalityBound::AtMostOne, ), ), @@ -77979,11 +70673,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2180), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77997,11 +70687,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2181), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78015,11 +70701,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2182), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78033,11 +70715,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2183), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78051,11 +70729,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2184), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78069,11 +70743,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2185), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78087,11 +70757,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2186), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78105,11 +70771,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2187), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78123,11 +70785,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2188), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78141,11 +70799,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2189), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78159,11 +70813,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2190), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78177,11 +70827,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2191), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78195,11 +70841,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2192), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78213,11 +70855,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2193), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78231,11 +70869,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2194), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78249,11 +70883,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2195), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78267,11 +70897,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2196), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78285,11 +70911,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2197), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -78309,11 +70931,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2198), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -78333,11 +70951,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2199), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78351,11 +70965,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2200), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78369,11 +70979,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2201), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -78392,11 +70998,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2202), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78410,11 +71012,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2203), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78428,22 +71026,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2204), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), arguments: vec![ TemplateArgument { parameter: DeclarationId(138), - value: DeclarationId(954), + value: DeclarationId(955), }, TemplateArgument { parameter: DeclarationId(139), - value: DeclarationId(957), + value: DeclarationId(958), }, ], }, @@ -78458,11 +71052,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2205), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78476,11 +71066,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2206), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78494,11 +71080,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2207), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78512,11 +71094,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2208), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78530,11 +71108,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2209), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78548,11 +71122,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2210), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78566,11 +71136,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2211), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78584,11 +71150,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2212), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78602,11 +71164,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2213), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78620,11 +71178,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2214), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78638,11 +71192,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2215), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -78656,31 +71206,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2216), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -78697,118 +71223,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2217), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(685), + template: DeclarationId(686), arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(967), + parameter: DeclarationId(687), + value: DeclarationId(968), }], }, type_params: vec![], @@ -78864,7 +71288,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2229), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(972), + ty: DeclarationId(973), }], }, type_params: vec![], @@ -79004,21 +71424,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2230), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(970), + value: DeclarationId(971), }], }, type_params: vec![], @@ -79032,11 +71444,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2231), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79055,11 +71463,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2232), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79073,11 +71477,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2233), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -79097,11 +71497,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2234), name: None, connective: TypeConnective::Conj { children: vec![ @@ -79111,11 +71507,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2233), }, ], }, @@ -79130,11 +71522,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2235), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79153,11 +71541,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2236), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -79176,11 +71560,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2237), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79194,25 +71574,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2238), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "connective".to_string(), - ty: DeclarationId(963), + ty: DeclarationId(964), }, Field { label: "behavior".to_string(), - ty: DeclarationId(964), + ty: DeclarationId(965), }, Field { label: "target".to_string(), - ty: DeclarationId(959), + ty: DeclarationId(960), }, ], }, @@ -79227,17 +71603,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2239), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), arguments: vec![TemplateArgument { parameter: DeclarationId(38), - value: DeclarationId(995), + value: DeclarationId(996), }], }, type_params: vec![], @@ -79251,23 +71623,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2240), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(983), + template: DeclarationId(984), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(984), - value: DeclarationId(994), - }, TemplateArgument { parameter: DeclarationId(985), value: DeclarationId(995), }, + TemplateArgument { + parameter: DeclarationId(986), + value: DeclarationId(996), + }, ], }, type_params: vec![], @@ -79281,23 +71649,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2241), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(983), + template: DeclarationId(984), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(984), - value: DeclarationId(994), - }, TemplateArgument { parameter: DeclarationId(985), value: DeclarationId(995), }, + TemplateArgument { + parameter: DeclarationId(986), + value: DeclarationId(996), + }, ], }, type_params: vec![], @@ -79311,23 +71675,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2242), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(983), + template: DeclarationId(984), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(984), - value: DeclarationId(994), - }, TemplateArgument { parameter: DeclarationId(985), value: DeclarationId(995), }, + TemplateArgument { + parameter: DeclarationId(986), + value: DeclarationId(996), + }, ], }, type_params: vec![], @@ -79341,17 +71701,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2243), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), arguments: vec![TemplateArgument { parameter: DeclarationId(38), - value: DeclarationId(998), + value: DeclarationId(999), }], }, type_params: vec![], @@ -79365,23 +71721,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2244), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(983), + template: DeclarationId(984), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(984), - value: DeclarationId(997), - }, TemplateArgument { parameter: DeclarationId(985), value: DeclarationId(998), }, + TemplateArgument { + parameter: DeclarationId(986), + value: DeclarationId(999), + }, ], }, type_params: vec![], @@ -79395,23 +71747,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2245), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(983), + template: DeclarationId(984), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(984), - value: DeclarationId(997), - }, TemplateArgument { parameter: DeclarationId(985), value: DeclarationId(998), }, + TemplateArgument { + parameter: DeclarationId(986), + value: DeclarationId(999), + }, ], }, type_params: vec![], @@ -79425,23 +71773,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2246), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(983), + template: DeclarationId(984), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(984), - value: DeclarationId(997), - }, TemplateArgument { parameter: DeclarationId(985), value: DeclarationId(998), }, + TemplateArgument { + parameter: DeclarationId(986), + value: DeclarationId(999), + }, ], }, type_params: vec![], @@ -79455,17 +71799,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2247), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), arguments: vec![TemplateArgument { parameter: DeclarationId(38), - value: DeclarationId(1001), + value: DeclarationId(1002), }], }, type_params: vec![], @@ -79479,23 +71819,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2248), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(983), + template: DeclarationId(984), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(984), - value: DeclarationId(1000), - }, TemplateArgument { parameter: DeclarationId(985), value: DeclarationId(1001), }, + TemplateArgument { + parameter: DeclarationId(986), + value: DeclarationId(1002), + }, ], }, type_params: vec![], @@ -79509,23 +71845,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2249), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(983), + template: DeclarationId(984), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(984), - value: DeclarationId(1000), - }, TemplateArgument { parameter: DeclarationId(985), value: DeclarationId(1001), }, + TemplateArgument { + parameter: DeclarationId(986), + value: DeclarationId(1002), + }, ], }, type_params: vec![], @@ -79539,17 +71871,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2250), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), arguments: vec![TemplateArgument { parameter: DeclarationId(38), - value: DeclarationId(1004), + value: DeclarationId(1005), }], }, type_params: vec![], @@ -79563,23 +71891,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2251), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(983), + template: DeclarationId(984), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(984), - value: DeclarationId(1003), - }, TemplateArgument { parameter: DeclarationId(985), value: DeclarationId(1004), }, + TemplateArgument { + parameter: DeclarationId(986), + value: DeclarationId(1005), + }, ], }, type_params: vec![], @@ -79593,23 +71917,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2252), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(983), + template: DeclarationId(984), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(984), - value: DeclarationId(1003), - }, TemplateArgument { parameter: DeclarationId(985), value: DeclarationId(1004), }, + TemplateArgument { + parameter: DeclarationId(986), + value: DeclarationId(1005), + }, ], }, type_params: vec![], @@ -79623,16 +71943,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2253), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(977), + ty: DeclarationId(978), }], }, type_params: vec![], @@ -79646,11 +71962,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2254), name: None, connective: TypeConnective::Conj { children: vec![ @@ -79675,11 +71987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2255), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -79693,16 +72001,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2256), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "value".to_string(), - ty: DeclarationId(974), + ty: DeclarationId(975), }], }, type_params: vec![], @@ -79716,17 +72020,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2257), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(976), + template: DeclarationId(977), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(980), + parameter: DeclarationId(978), + value: DeclarationId(981), }], }, type_params: vec![], @@ -79740,22 +72040,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2258), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), - value: DeclarationId(2249), -======= - parameter: DeclarationId(686), - value: DeclarationId(2256), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + value: DeclarationId(2257), }], }, type_params: vec![], @@ -79769,11 +72060,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2259), name: None, connective: TypeConnective::Conj { children: vec![ @@ -79783,15 +72070,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2258), }, ], }, @@ -79806,21 +72089,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2260), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(974), + value: DeclarationId(975), }], }, type_params: vec![], @@ -79834,17 +72109,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2261), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(976), + template: DeclarationId(977), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(980), + parameter: DeclarationId(978), + value: DeclarationId(981), }], }, type_params: vec![], @@ -79858,22 +72129,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2262), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), - value: DeclarationId(2253), -======= - parameter: DeclarationId(686), - value: DeclarationId(2260), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + value: DeclarationId(2261), }], }, type_params: vec![], @@ -79887,11 +72149,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2263), name: None, connective: TypeConnective::Conj { children: vec![ @@ -79901,19 +72159,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2262), }, ], }, @@ -79928,17 +72178,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2264), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(976), + template: DeclarationId(977), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(982), + parameter: DeclarationId(978), + value: DeclarationId(983), }], }, type_params: vec![], @@ -79952,19 +72198,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2264), body: ArrowBody::NoBody, }, type_params: vec![], @@ -79978,17 +72216,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2266), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(19), arguments: vec![TemplateArgument { parameter: DeclarationId(20), - value: DeclarationId(982), + value: DeclarationId(983), }], }, type_params: vec![], @@ -80002,18 +72236,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(978), + inputs: vec![DeclarationId(827), DeclarationId(983)], + output: DeclarationId(979), body: ArrowBody::NoBody, }, type_params: vec![], @@ -80027,17 +72254,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2268), name: Some("DimensionUnitAbelianGroup".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(25), arguments: vec![TemplateArgument { parameter: DeclarationId(26), - value: DeclarationId(984), + value: DeclarationId(985), }], }, type_params: vec![], @@ -80051,11 +72274,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2269), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80069,11 +72288,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2270), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -80092,21 +72307,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2271), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1011), + value: DeclarationId(1012), }], }, type_params: vec![], @@ -80120,11 +72327,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2272), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80138,11 +72341,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2273), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -80161,11 +72360,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2274), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80179,30 +72374,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -80240,17 +72412,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1016), + value: DeclarationId(1017), }], }, type_params: vec![], @@ -80264,11 +72432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2278), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80282,11 +72446,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2279), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80300,11 +72460,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2280), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80318,11 +72474,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2281), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80336,11 +72488,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2282), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80354,11 +72502,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2283), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80372,11 +72516,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2284), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80390,11 +72530,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2285), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80408,11 +72544,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2286), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80426,11 +72558,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2287), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80444,11 +72572,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2288), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80462,11 +72586,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2289), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80480,11 +72600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2290), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80498,11 +72614,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2291), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80516,11 +72628,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2292), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80534,11 +72642,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2293), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80552,11 +72656,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2294), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80570,11 +72670,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2295), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80588,11 +72684,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2296), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80606,11 +72698,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2297), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80624,11 +72712,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2298), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80642,11 +72726,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2299), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80660,11 +72740,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2300), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80678,11 +72754,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2301), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80696,11 +72768,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2302), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80714,11 +72782,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2303), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80732,11 +72796,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2304), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80750,11 +72810,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2305), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -80768,11 +72824,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2306), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -80791,11 +72843,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2307), name: None, connective: TypeConnective::Conj { children: vec![ @@ -80820,21 +72868,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2308), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1046), + value: DeclarationId(1047), }], }, type_params: vec![], @@ -80848,15 +72888,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2309), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(928), + DeclarationId(929), CardinalityBound::AtMostOne, ), ), @@ -80871,15 +72907,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2310), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(932), + DeclarationId(933), CardinalityBound::AtMostOne, ), ), @@ -80894,37 +72926,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), - value: DeclarationId(1077), + value: DeclarationId(1078), }], }, type_params: vec![], @@ -80935,17 +72943,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2313), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1076), + value: DeclarationId(1077), }], }, type_params: vec![], @@ -80989,21 +72986,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2314), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1076), + value: DeclarationId(1077), }], }, type_params: vec![], @@ -81017,22 +73006,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2315), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), - value: DeclarationId(2306), -======= - parameter: DeclarationId(686), - value: DeclarationId(2313), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + value: DeclarationId(2314), }], }, type_params: vec![], @@ -81046,30 +73026,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -81253,17 +73210,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2328), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "field".to_string(), - ty: DeclarationId(1061), + ty: DeclarationId(1062), }], }, type_params: vec![], @@ -81301,11 +73254,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2329), name: None, connective: TypeConnective::Conj { children: vec![ @@ -81315,7 +73264,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2330), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81348,11 +73293,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2331), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81366,11 +73307,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2332), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81384,16 +73321,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2333), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "degree".to_string(), - ty: DeclarationId(1197), + ty: DeclarationId(1198), }], }, type_params: vec![], @@ -81407,21 +73340,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2334), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "numerator".to_string(), - ty: DeclarationId(1197), + ty: DeclarationId(1198), }, Field { label: "root".to_string(), - ty: DeclarationId(1197), + ty: DeclarationId(1198), }, ], }, @@ -81436,21 +73365,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2335), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "base".to_string(), - ty: DeclarationId(1199), + ty: DeclarationId(1200), }, Field { label: "argument".to_string(), - ty: DeclarationId(1197), + ty: DeclarationId(1198), }, ], }, @@ -81465,11 +73390,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2336), name: None, connective: TypeConnective::Conj { children: vec![ @@ -81479,7 +73400,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2337), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -81517,11 +73434,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2338), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81535,16 +73448,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2339), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "cost".to_string(), - ty: DeclarationId(1076), + ty: DeclarationId(1077), }], }, type_params: vec![], @@ -81558,14 +73467,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2345), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { parameter: DeclarationId(687), - value: DeclarationId(1077), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26880, 26896), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2338), -======= - id: DeclarationId(2340), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "factors".to_string(), - ty: DeclarationId(2339), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26856, 26898), - }); - declarations.push(Declaration { - id: DeclarationId(2341), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(685), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1076), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26960, 26976), - }); - declarations.push(Declaration { - id: DeclarationId(2342), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(685), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(2341), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26955, 26977), - }); - declarations.push(Declaration { - id: DeclarationId(2343), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "terms".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2337), -======= - ty: DeclarationId(2342), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26927, 26979), - }); - declarations.push(Declaration { - id: DeclarationId(2344), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(685), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1077), + value: DeclarationId(1078), }], }, type_params: vec![], @@ -81785,13 +73585,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2345), }], }, type_params: vec![], @@ -81805,11 +73604,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2347), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81823,11 +73618,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2348), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -81841,21 +73632,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2349), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1275), + value: DeclarationId(1276), }], }, type_params: vec![], @@ -81869,21 +73652,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2350), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1275), + value: DeclarationId(1276), }], }, type_params: vec![], @@ -81897,17 +73672,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2351), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(976), + template: DeclarationId(977), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1121), + parameter: DeclarationId(978), + value: DeclarationId(1122), }], }, type_params: vec![], @@ -81921,19 +73692,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + output: DeclarationId(2351), body: ArrowBody::NoBody, }, type_params: vec![], @@ -81947,17 +73710,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2353), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(19), arguments: vec![TemplateArgument { parameter: DeclarationId(20), - value: DeclarationId(1121), + value: DeclarationId(1122), }], }, type_params: vec![], @@ -81971,15 +73730,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2354), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1121), DeclarationId(1121)], - output: DeclarationId(1121), + inputs: vec![DeclarationId(1122), DeclarationId(1122)], + output: DeclarationId(1122), body: ArrowBody::NoBody, }, type_params: vec![], @@ -81993,18 +73748,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(1121), + inputs: vec![DeclarationId(1122), DeclarationId(818)], + output: DeclarationId(1122), body: ArrowBody::NoBody, }, type_params: vec![], @@ -82018,18 +73766,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - output: DeclarationId(978), + inputs: vec![DeclarationId(828), DeclarationId(1122)], + output: DeclarationId(979), body: ArrowBody::NoBody, }, type_params: vec![], @@ -82043,11 +73784,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2357), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82066,11 +73803,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2358), name: None, connective: TypeConnective::Conj { children: vec![ @@ -82095,11 +73828,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2359), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82113,15 +73842,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2360), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1125)], - output: DeclarationId(1126), + inputs: vec![DeclarationId(1126)], + output: DeclarationId(1127), body: ArrowBody::NoBody, }, type_params: vec![], @@ -82135,14 +73860,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2361), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1126), DeclarationId(1126)], + inputs: vec![DeclarationId(1127), DeclarationId(1127)], output: DeclarationId(128), body: ArrowBody::NoBody, }, @@ -82157,17 +73878,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2362), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1120), + template: DeclarationId(1121), arguments: vec![TemplateArgument { - parameter: DeclarationId(1121), - value: DeclarationId(1128), + parameter: DeclarationId(1122), + value: DeclarationId(1129), }], }, type_params: vec![], @@ -82181,23 +73898,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2363), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1124), + template: DeclarationId(1125), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(1125), - value: DeclarationId(1128), - }, TemplateArgument { parameter: DeclarationId(1126), value: DeclarationId(1129), }, + TemplateArgument { + parameter: DeclarationId(1127), + value: DeclarationId(1130), + }, ], }, type_params: vec![], @@ -82211,23 +73924,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2364), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1127), + template: DeclarationId(1128), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(1128), - value: DeclarationId(1131), - }, TemplateArgument { parameter: DeclarationId(1129), value: DeclarationId(1132), }, + TemplateArgument { + parameter: DeclarationId(1130), + value: DeclarationId(1133), + }, ], }, type_params: vec![], @@ -82241,17 +73950,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2365), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1120), + template: DeclarationId(1121), arguments: vec![TemplateArgument { - parameter: DeclarationId(1121), - value: DeclarationId(1134), + parameter: DeclarationId(1122), + value: DeclarationId(1135), }], }, type_params: vec![], @@ -82265,16 +73970,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2366), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1135), + template: DeclarationId(1136), arguments: vec![TemplateArgument { - parameter: DeclarationId(1136), + parameter: DeclarationId(1137), value: DeclarationId(93), }], }, @@ -82289,16 +73990,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2367), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1135), + template: DeclarationId(1136), arguments: vec![TemplateArgument { - parameter: DeclarationId(1136), + parameter: DeclarationId(1137), value: DeclarationId(93), }], }, @@ -82313,11 +74010,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2368), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82331,16 +74024,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2369), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1136), + ty: DeclarationId(1137), }], }, type_params: vec![], @@ -82354,21 +74043,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2370), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1046), + value: DeclarationId(1047), }], }, type_params: vec![], @@ -82386,21 +74067,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2371), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1152), + value: DeclarationId(1153), }], }, type_params: vec![], @@ -82414,11 +74087,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2372), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82437,21 +74106,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2373), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1151), + value: DeclarationId(1152), }], }, type_params: vec![], @@ -82465,20 +74126,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2374), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2365), -======= - ty: DeclarationId(2372), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2373), }], }, type_params: vec![], @@ -82492,11 +74145,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2375), name: None, connective: TypeConnective::Conj { children: vec![ @@ -82506,7 +74155,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2376), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82544,11 +74189,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2377), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82567,11 +74208,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2378), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -82582,7 +74219,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2379), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1155), + value: DeclarationId(1156), }], }, type_params: vec![], @@ -82625,16 +74254,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2380), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "input_order".to_string(), - ty: DeclarationId(1159), + ty: DeclarationId(1160), }], }, type_params: vec![], @@ -82648,11 +74273,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2381), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82666,11 +74287,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2382), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82684,21 +74301,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2383), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1046), + value: DeclarationId(1047), }], }, type_params: vec![], @@ -82712,11 +74321,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2384), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -82727,7 +74332,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2385), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(976), + template: DeclarationId(977), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), + parameter: DeclarationId(978), + value: DeclarationId(1215), }], }, type_params: vec![], @@ -82766,17 +74367,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2386), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(976), + template: DeclarationId(977), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), + parameter: DeclarationId(978), + value: DeclarationId(1215), }], }, type_params: vec![], @@ -82790,11 +74387,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2387), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -82814,11 +74407,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2388), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -82838,11 +74427,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2389), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -82862,11 +74447,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2390), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -82886,21 +74467,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2391), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(974), + value: DeclarationId(975), }], }, type_params: vec![], @@ -82914,17 +74487,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2392), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(976), + template: DeclarationId(977), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), + parameter: DeclarationId(978), + value: DeclarationId(1215), }], }, type_params: vec![], @@ -82938,22 +74507,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2393), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), - value: DeclarationId(2384), -======= - parameter: DeclarationId(686), - value: DeclarationId(2391), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + value: DeclarationId(2392), }], }, type_params: vec![], @@ -82967,17 +74527,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2394), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(976), + template: DeclarationId(977), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), + parameter: DeclarationId(978), + value: DeclarationId(1215), }], }, type_params: vec![], @@ -82991,22 +74547,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2395), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), - value: DeclarationId(2386), -======= - parameter: DeclarationId(686), - value: DeclarationId(2393), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + value: DeclarationId(2394), }], }, type_params: vec![], @@ -83020,21 +74567,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2396), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(974), + value: DeclarationId(975), }], }, type_params: vec![], @@ -83048,206 +74587,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(979), - arguments: vec![TemplateArgument { - parameter: DeclarationId(980), - value: DeclarationId(1214), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5523, 5557), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2390), -======= - id: DeclarationId(2397), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(979), - arguments: vec![TemplateArgument { - parameter: DeclarationId(980), - value: DeclarationId(1214), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5769, 5803), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2391), -======= - id: DeclarationId(2398), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(979), - arguments: vec![TemplateArgument { - parameter: DeclarationId(980), - value: DeclarationId(1214), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6288, 6322), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2392), -======= - id: DeclarationId(2399), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(979), - arguments: vec![TemplateArgument { - parameter: DeclarationId(980), - value: DeclarationId(1214), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6549, 6583), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2393), -======= - id: DeclarationId(2400), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(979), - arguments: vec![TemplateArgument { - parameter: DeclarationId(980), - value: DeclarationId(1214), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6839, 6873), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2394), -======= - id: DeclarationId(2401), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(976), - arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7053, 7079), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2395), -======= - id: DeclarationId(2402), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(979), - arguments: vec![TemplateArgument { - parameter: DeclarationId(980), - value: DeclarationId(1214), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7084, 7118), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2396), -======= - id: DeclarationId(2403), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(979), - arguments: vec![TemplateArgument { - parameter: DeclarationId(980), - value: DeclarationId(1214), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8353, 8387), - }); - declarations.push(Declaration { -<<<<<<< HEAD id: DeclarationId(2397), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2245), + template: DeclarationId(980), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), + parameter: DeclarationId(981), + value: DeclarationId(1215), }], }, type_params: vec![], @@ -83258,16 +74604,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + template: DeclarationId(980), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), + parameter: DeclarationId(981), + value: DeclarationId(1215), }], }, type_params: vec![], @@ -83404,20 +74744,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + template: DeclarationId(2253), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), + parameter: DeclarationId(978), + value: DeclarationId(1215), }], }, type_params: vec![], @@ -83434,13 +74770,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + template: DeclarationId(2253), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), + parameter: DeclarationId(978), + value: DeclarationId(1215), }], }, type_params: vec![], @@ -83615,10 +74947,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2416), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1768), + template: DeclarationId(1769), arguments: vec![TemplateArgument { parameter: DeclarationId(687), value: DeclarationId(827), @@ -83659,14 +74987,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2417), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1768), + template: DeclarationId(1769), arguments: vec![TemplateArgument { parameter: DeclarationId(687), value: DeclarationId(781), @@ -83683,14 +75007,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2418), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1768), + template: DeclarationId(1769), arguments: vec![TemplateArgument { parameter: DeclarationId(687), value: DeclarationId(817), @@ -83707,21 +75027,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2419), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1768), + template: DeclarationId(1769), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(974), + value: DeclarationId(975), }], }, type_params: vec![], @@ -83735,22 +75047,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2420), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1768), + template: DeclarationId(1769), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), - value: DeclarationId(2384), -======= - parameter: DeclarationId(686), - value: DeclarationId(2391), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + value: DeclarationId(2392), }], }, type_params: vec![], @@ -83764,22 +75067,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2421), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1770), + template: DeclarationId(1771), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), - value: DeclarationId(2386), -======= - parameter: DeclarationId(686), - value: DeclarationId(2393), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + value: DeclarationId(2394), }], }, type_params: vec![], @@ -83793,20 +75087,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + template: DeclarationId(2253), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), + parameter: DeclarationId(978), + value: DeclarationId(1215), }], }, type_params: vec![], @@ -83820,21 +75107,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2423), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(1770), + template: DeclarationId(1771), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(974), + value: DeclarationId(975), }], }, type_params: vec![], @@ -83848,20 +75127,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + template: DeclarationId(2259), arguments: vec![TemplateArgument { - parameter: DeclarationId(980), - value: DeclarationId(1214), + parameter: DeclarationId(981), + value: DeclarationId(1215), }], }, type_params: vec![], @@ -83875,20 +75147,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + template: DeclarationId(2263), arguments: vec![TemplateArgument { - parameter: DeclarationId(980), - value: DeclarationId(1214), + parameter: DeclarationId(981), + value: DeclarationId(1215), }], }, type_params: vec![], @@ -83902,15 +75167,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2426), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1189), + DeclarationId(1190), CardinalityBound::AtMostOne, ), ), @@ -83925,15 +75186,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2427), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1189), + DeclarationId(1190), CardinalityBound::AtMostOne, ), ), @@ -83948,15 +75205,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2428), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1189), + DeclarationId(1190), CardinalityBound::AtMostOne, ), ), @@ -83971,11 +75224,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2429), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -83986,7 +75235,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2430), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -84016,7 +75261,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2431), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1197), + DeclarationId(1198), CardinalityBound::AtMostOne, ), ), @@ -84054,15 +75295,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2432), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1199), + DeclarationId(1200), CardinalityBound::AtMostOne, ), ), @@ -84077,22 +75314,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2433), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(11), arguments: vec![ TemplateArgument { parameter: DeclarationId(12), - value: DeclarationId(1210), + value: DeclarationId(1211), }, TemplateArgument { parameter: DeclarationId(13), - value: DeclarationId(1209), + value: DeclarationId(1210), }, ], }, @@ -84107,11 +75340,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2434), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84125,11 +75354,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2435), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84143,11 +75368,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2436), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84161,30 +75382,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -84279,7 +75477,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2443), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "previous".to_string(), - ty: DeclarationId(1197), + ty: DeclarationId(1198), }], }, type_params: vec![], @@ -84316,11 +75510,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2444), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84334,16 +75524,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2445), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "inner".to_string(), - ty: DeclarationId(1199), + ty: DeclarationId(1200), }], }, type_params: vec![], @@ -84357,11 +75543,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2446), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -84380,16 +75562,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2447), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "amount".to_string(), - ty: DeclarationId(1197), + ty: DeclarationId(1198), }], }, type_params: vec![], @@ -84403,16 +75581,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2448), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "steps".to_string(), - ty: DeclarationId(1197), + ty: DeclarationId(1198), }], }, type_params: vec![], @@ -84426,16 +75600,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2449), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "divisor".to_string(), - ty: DeclarationId(1199), + ty: DeclarationId(1200), }], }, type_params: vec![], @@ -84449,11 +75619,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2450), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -84472,11 +75638,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2451), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -84495,11 +75657,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2452), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84513,21 +75671,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2453), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1196), + value: DeclarationId(1197), }], }, type_params: vec![], @@ -84541,21 +75691,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2454), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1189), + value: DeclarationId(1190), }], }, type_params: vec![], @@ -84569,11 +75711,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2455), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84587,11 +75725,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2456), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84605,11 +75739,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2457), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84623,16 +75753,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2458), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1208), + ty: DeclarationId(1209), }], }, type_params: vec![], @@ -84646,11 +75772,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2459), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84664,11 +75786,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2460), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -84679,7 +75797,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(970), + value: DeclarationId(971), }], }, type_params: vec![], @@ -84843,219 +75952,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), - }); - declarations.push(Declaration { - id: DeclarationId(2462), - name: None, -<<<<<<< HEAD - connective: TypeConnective::Instantiation { - template: DeclarationId(2245), - arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), -======= - connective: TypeConnective::Conj { - children: vec![Field { - label: "duration".to_string(), - ty: DeclarationId(1213), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 4004, 4038), - }); - declarations.push(Declaration { - id: DeclarationId(2463), - name: None, -<<<<<<< HEAD - connective: TypeConnective::Instantiation { - template: DeclarationId(2245), - arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), - }], - }, -======= - connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 4043, 4053), - }); - declarations.push(Declaration { - id: DeclarationId(2464), - name: None, -<<<<<<< HEAD - connective: TypeConnective::Instantiation { - template: DeclarationId(2245), - arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), - }], - }, -======= - connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 4058, 4067), - }); - declarations.push(Declaration { - id: DeclarationId(2465), - name: None, -<<<<<<< HEAD - connective: TypeConnective::Instantiation { - template: DeclarationId(2245), - arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), - }], - }, -======= - connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 4072, 4077), - }); - declarations.push(Declaration { - id: DeclarationId(2466), - name: None, - connective: TypeConnective::Instantiation { -<<<<<<< HEAD - template: DeclarationId(2245), - arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), -======= - template: DeclarationId(685), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(1217), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 5915, 5943), - }); - declarations.push(Declaration { - id: DeclarationId(2467), - name: None, - connective: TypeConnective::Instantiation { -<<<<<<< HEAD - template: DeclarationId(2245), - arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), -======= - template: DeclarationId(1768), - arguments: vec![TemplateArgument { - parameter: DeclarationId(686), - value: DeclarationId(970), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 7946, 7962), - }); - declarations.push(Declaration { - id: DeclarationId(2468), - name: None, - connective: TypeConnective::Instantiation { -<<<<<<< HEAD - template: DeclarationId(2245), -======= - template: DeclarationId(2252), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), - }); declarations.push(Declaration { id: DeclarationId(2469), name: None, connective: TypeConnective::Instantiation { -<<<<<<< HEAD - template: DeclarationId(2245), -======= - template: DeclarationId(2252), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + template: DeclarationId(2253), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), + parameter: DeclarationId(978), + value: DeclarationId(1215), }], }, type_params: vec![], @@ -85072,14 +75976,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + template: DeclarationId(2253), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), + parameter: DeclarationId(978), + value: DeclarationId(1215), }], }, type_params: vec![], @@ -85096,10 +75996,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2472), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2252), + template: DeclarationId(2253), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), + parameter: DeclarationId(978), + value: DeclarationId(1215), }], }, type_params: vec![], @@ -85134,20 +76030,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2473), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2252), + template: DeclarationId(2253), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), + parameter: DeclarationId(978), + value: DeclarationId(1215), }], }, type_params: vec![], @@ -85158,20 +76050,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2474), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2252), + template: DeclarationId(2253), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), + parameter: DeclarationId(978), + value: DeclarationId(1215), }], }, type_params: vec![], @@ -85182,20 +76070,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2475), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2252), + template: DeclarationId(2253), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), + parameter: DeclarationId(978), + value: DeclarationId(1215), }], }, type_params: vec![], @@ -85206,20 +76090,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2476), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2252), + template: DeclarationId(2253), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), + parameter: DeclarationId(978), + value: DeclarationId(1215), }], }, type_params: vec![], @@ -85230,20 +76110,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2477), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(2252), + template: DeclarationId(2253), arguments: vec![TemplateArgument { - parameter: DeclarationId(977), - value: DeclarationId(1214), + parameter: DeclarationId(978), + value: DeclarationId(1215), }], }, type_params: vec![], @@ -85254,16 +76130,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }); declarations.push(Declaration { id: DeclarationId(2478), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Instantiation { + template: DeclarationId(2253), + arguments: vec![TemplateArgument { + parameter: DeclarationId(978), + value: DeclarationId(1215), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -85272,11 +76150,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + span: SourceSpan::new("src/v3/std/timing_lens.dag", 11855, 11881), }); declarations.push(Declaration { id: DeclarationId(2479), @@ -85290,11 +76164,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651), }); declarations.push(Declaration { id: DeclarationId(2480), @@ -85308,11 +76178,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660), }); declarations.push(Declaration { id: DeclarationId(2481), @@ -85326,11 +76192,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671), }); declarations.push(Declaration { id: DeclarationId(2482), @@ -85344,18 +76206,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682), }); declarations.push(Declaration { id: DeclarationId(2483), name: None, connective: TypeConnective::Conj { children: vec![] }, -<<<<<<< HEAD -======= type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -85364,7 +76220,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -86522,17 +77372,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1150), + value: DeclarationId(1151), }], }, type_params: vec![], @@ -86546,21 +77392,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2566), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1259), + value: DeclarationId(1260), }], }, type_params: vec![], @@ -86574,21 +77412,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2567), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1264), + value: DeclarationId(1265), }], }, type_params: vec![], @@ -86602,11 +77432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2568), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86620,11 +77446,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2569), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86638,11 +77460,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2570), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86656,11 +77474,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2571), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86674,11 +77488,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2572), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86692,11 +77502,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2573), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86710,11 +77516,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2574), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86728,11 +77530,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2575), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86746,11 +77544,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2576), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86764,11 +77558,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2577), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86782,11 +77572,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2578), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86800,11 +77586,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2579), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86823,11 +77605,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2580), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86841,11 +77619,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2581), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86859,11 +77633,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2582), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86877,11 +77647,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2583), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86895,11 +77661,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2584), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86913,11 +77675,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2585), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86931,11 +77689,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2586), name: None, connective: TypeConnective::Conj { children: vec![ @@ -86960,11 +77714,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2587), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86978,16 +77728,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2588), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1250), + ty: DeclarationId(1251), }], }, type_params: vec![], @@ -87001,11 +77747,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2589), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87024,11 +77766,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2590), name: None, connective: TypeConnective::Conj { children: vec![ @@ -87038,7 +77776,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2591), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87076,11 +77810,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2592), name: None, connective: TypeConnective::Conj { children: vec![ @@ -87109,25 +77839,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2593), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, Field { label: "input_sample".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, Field { label: "expected_output".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, ], }, @@ -87142,21 +77868,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2594), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, Field { label: "invariant".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, ], }, @@ -87171,11 +77893,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2595), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -87195,11 +77913,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2596), name: None, connective: TypeConnective::Conj { children: vec![ @@ -87209,11 +77923,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2595), }, Field { label: "expect_exit_code".to_string(), @@ -87232,11 +77942,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2597), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -87256,11 +77962,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2598), name: None, connective: TypeConnective::Conj { children: vec![ @@ -87270,11 +77972,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2597), }, Field { label: "expect_exit_code".to_string(), @@ -87293,25 +77991,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2599), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "lens_ref".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, Field { label: "input_ref".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, Field { label: "expected_ref".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, ], }, @@ -87326,25 +78020,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2600), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject_ref".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, Field { label: "oracle_ref".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, Field { label: "input_ref".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, ], }, @@ -87359,16 +78049,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2601), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "expected".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }], }, type_params: vec![], @@ -87382,25 +78068,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2602), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, Field { label: "comparator".to_string(), - ty: DeclarationId(1252), + ty: DeclarationId(1253), }, Field { label: "baseline_ref".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, ], }, @@ -87415,21 +78097,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2603), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "left_report_ref".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, Field { label: "right_report_ref".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, ], }, @@ -87444,21 +78122,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2604), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "law".to_string(), - ty: DeclarationId(1253), + ty: DeclarationId(1254), }, Field { label: "lens_ref".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, ], }, @@ -87473,21 +78147,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2605), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, Field { label: "list_constant".to_string(), - ty: DeclarationId(1241), + ty: DeclarationId(1242), }, Field { label: "bound".to_string(), @@ -87506,25 +78176,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2606), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, Field { label: "list_constant".to_string(), - ty: DeclarationId(1241), + ty: DeclarationId(1242), }, Field { label: "subset_predicate".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, ], }, @@ -87539,21 +78205,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2607), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "compile_target".to_string(), - ty: DeclarationId(1239), + ty: DeclarationId(1240), }, Field { label: "expected".to_string(), - ty: DeclarationId(1240), + ty: DeclarationId(1241), }, ], }, @@ -87568,21 +78230,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2608), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, Field { label: "ratchet_kind".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, ], }, @@ -87597,21 +78255,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2609), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1239), + value: DeclarationId(1240), }], }, type_params: vec![], @@ -87625,25 +78275,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2610), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, Field { label: "generated_paths".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2601), -======= - ty: DeclarationId(2608), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2609), }, ], }, @@ -87658,25 +78300,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2611), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "deferred_gate".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, Field { label: "target_lane".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, Field { label: "authority_doc".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, ], }, @@ -87691,25 +78329,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2612), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "deferred_gate".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, Field { label: "target_lane".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, Field { label: "authority_doc".to_string(), - ty: DeclarationId(1275), + ty: DeclarationId(1276), }, ], }, @@ -87724,16 +78358,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2613), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "ledger".to_string(), - ty: DeclarationId(911), + ty: DeclarationId(912), }], }, type_params: vec![], @@ -87747,21 +78377,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2614), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1150), + value: DeclarationId(1151), }], }, type_params: vec![], @@ -87775,11 +78397,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2615), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87793,11 +78411,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2616), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87811,21 +78425,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2617), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1150), + value: DeclarationId(1151), }], }, type_params: vec![], @@ -87839,16 +78445,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2618), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1259), + ty: DeclarationId(1260), }], }, type_params: vec![], @@ -87862,16 +78464,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2619), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1261), + ty: DeclarationId(1262), }], }, type_params: vec![], @@ -87885,21 +78483,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2620), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1259), + value: DeclarationId(1260), }], }, type_params: vec![], @@ -87913,21 +78503,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2621), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1150), + value: DeclarationId(1151), }], }, type_params: vec![], @@ -87941,11 +78523,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2622), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -87965,11 +78543,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2623), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87983,11 +78557,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2624), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88001,11 +78571,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2625), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88019,11 +78585,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2626), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -88042,11 +78604,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2627), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88060,11 +78618,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2628), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88078,11 +78632,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2629), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88096,11 +78646,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2630), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88114,11 +78660,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2631), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88132,11 +78674,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2632), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88150,11 +78688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2633), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88168,11 +78702,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2634), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88186,11 +78716,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2635), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88204,11 +78730,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2636), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88222,11 +78744,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2637), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88240,11 +78758,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2638), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88258,11 +78772,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2639), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88276,11 +78786,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2640), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88294,11 +78800,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2641), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88312,56 +78814,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Conj { children: vec![ @@ -88375,8 +78828,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(1681), }, Field { label: "carrier".to_string(), - ty: DeclarationId(1681), + ty: DeclarationId(1682), }, Field { label: "is_copy".to_string(), @@ -88442,21 +78892,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2644), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1683), + value: DeclarationId(1684), }], }, type_params: vec![], @@ -88470,11 +78912,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2645), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88488,11 +78926,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2646), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88511,11 +78945,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2647), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -88535,20 +78965,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2648), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "values".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2639), -======= - ty: DeclarationId(2646), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2647), }], }, type_params: vec![], @@ -88562,11 +78984,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2649), name: None, connective: TypeConnective::Conj { children: vec![ @@ -88591,11 +79009,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2650), name: None, connective: TypeConnective::Conj { children: vec![ @@ -88620,11 +79034,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2651), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88638,11 +79048,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2652), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88656,11 +79062,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2653), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88674,21 +79076,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2654), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1695), + value: DeclarationId(1696), }], }, type_params: vec![], @@ -88702,11 +79096,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2655), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -88725,11 +79115,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2656), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88743,11 +79129,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2657), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88761,11 +79143,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2658), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88779,11 +79157,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2659), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88797,11 +79171,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2660), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88815,11 +79185,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2661), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -88838,11 +79204,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2662), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88856,11 +79218,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2663), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88874,11 +79232,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2664), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88892,21 +79246,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2665), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1704), + value: DeclarationId(1705), }], }, type_params: vec![], @@ -88920,21 +79266,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2666), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1710), + value: DeclarationId(1711), }], }, type_params: vec![], @@ -88948,11 +79286,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2667), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -88978,15 +79312,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2668), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1702), + DeclarationId(1703), CardinalityBound::AtMostOne, ), ), @@ -89001,11 +79331,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2669), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89019,11 +79345,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2670), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89037,11 +79359,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2671), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89055,11 +79373,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2672), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -89079,11 +79393,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2673), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -89103,29 +79413,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2674), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "branches".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2664), - }, - Field { - label: "paths".to_string(), - ty: DeclarationId(2665), -======= - ty: DeclarationId(2671), + ty: DeclarationId(2672), }, Field { label: "paths".to_string(), - ty: DeclarationId(2672), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2673), }, ], }, @@ -89140,11 +79438,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2675), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -89164,21 +79458,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2676), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1705), + value: DeclarationId(1706), }], }, type_params: vec![], @@ -89192,29 +79478,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2677), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "branches".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2667), - }, - Field { - label: "types".to_string(), - ty: DeclarationId(2668), -======= - ty: DeclarationId(2674), + ty: DeclarationId(2675), }, Field { label: "types".to_string(), - ty: DeclarationId(2675), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2676), }, ], }, @@ -89229,16 +79503,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2678), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "cron".to_string(), - ty: DeclarationId(1686), + ty: DeclarationId(1687), }], }, type_params: vec![], @@ -89252,21 +79522,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2679), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1706), + value: DeclarationId(1707), }], }, type_params: vec![], @@ -89280,20 +79542,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2680), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "inputs".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2671), -======= - ty: DeclarationId(2678), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2679), }], }, type_params: vec![], @@ -89307,21 +79561,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2681), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1706), + value: DeclarationId(1707), }], }, type_params: vec![], @@ -89335,20 +79581,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2682), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "inputs".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2673), -======= - ty: DeclarationId(2680), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2681), }], }, type_params: vec![], @@ -89362,11 +79600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2683), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89380,11 +79614,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2684), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89398,11 +79628,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2685), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89416,11 +79642,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2686), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89434,30 +79656,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -89593,7 +79792,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2697), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), arguments: vec![TemplateArgument { -<<<<<<< HEAD parameter: DeclarationId(687), -======= - parameter: DeclarationId(686), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - value: DeclarationId(1714), + value: DeclarationId(1715), }], }, type_params: vec![], @@ -89640,11 +79831,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2698), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -89664,11 +79851,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2699), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -89694,11 +79877,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2700), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -89717,15 +79896,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2701), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1730), + DeclarationId(1731), CardinalityBound::AtMostOne, ), ), @@ -89740,11 +79915,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2702), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -89763,15 +79934,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2703), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(1711), + DeclarationId(1712), CardinalityBound::AtMostOne, ), ), @@ -89786,16 +79953,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2704), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "label".to_string(), - ty: DeclarationId(1713), + ty: DeclarationId(1714), }], }, type_params: vec![], @@ -89809,11 +79972,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2705), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(686), @@ -89833,20 +79992,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2706), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "labels".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2697), -======= - ty: DeclarationId(2704), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2705), }], }, type_params: vec![], @@ -89860,11 +80011,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2707), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89878,11 +80025,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2708), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89896,11 +80039,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2709), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89914,11 +80053,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2710), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89932,11 +80067,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2711), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89950,11 +80081,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2712), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89968,11 +80095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2713), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -89991,11 +80114,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2714), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -90021,11 +80140,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2715), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -90044,11 +80159,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2716), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -90067,11 +80178,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2717), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -90090,21 +80197,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2718), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "name".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2705), -======= - ty: DeclarationId(2712), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2713), }, Field { label: "run".to_string(), @@ -90112,31 +80211,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "if_condition".to_string(), - ty: DeclarationId(2708), + ty: DeclarationId(2716), }, Field { label: "continue_on_error".to_string(), @@ -90144,11 +80231,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2717), }, ], }, @@ -90163,11 +80246,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2719), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -90186,37 +80265,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -90268,7 +80317,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2723), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -90310,53 +80355,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2724), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "name".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2711), - }, - Field { - label: "uses".to_string(), - ty: DeclarationId(1716), - }, - Field { - label: "with".to_string(), - ty: DeclarationId(2712), - }, - Field { - label: "env".to_string(), - ty: DeclarationId(2713), -======= - ty: DeclarationId(2718), + ty: DeclarationId(2719), }, Field { label: "uses".to_string(), - ty: DeclarationId(1716), + ty: DeclarationId(1717), }, Field { label: "with".to_string(), - ty: DeclarationId(2719), - }, - Field { - label: "env".to_string(), ty: DeclarationId(2720), }, Field { - label: "if_condition".to_string(), + label: "env".to_string(), ty: DeclarationId(2721), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, Field { label: "if_condition".to_string(), - ty: DeclarationId(2714), + ty: DeclarationId(2722), }, Field { label: "continue_on_error".to_string(), @@ -90364,11 +80385,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2723), }, ], }, @@ -90383,11 +80400,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2725), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90401,11 +80414,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2726), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90419,11 +80428,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2727), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90437,11 +80442,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2728), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90455,11 +80456,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2729), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90473,191 +80470,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -90766,7 +80579,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6235, 6253), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2736), -======= - id: DeclarationId(2743), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![ - Field { - label: "name".to_string(), - ty: DeclarationId(230), - }, - Field { - label: "value".to_string(), - ty: DeclarationId(230), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6258, 6299), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2737), -======= - id: DeclarationId(2744), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "value".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6304, 6329), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2738), -======= - id: DeclarationId(2745), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "token".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6334, 6364), - }); - declarations.push(Declaration { -<<<<<<< HEAD id: DeclarationId(2739), -======= - id: DeclarationId(2746), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( DeclarationId(93), CardinalityBound::AtMostOne, - ), - ), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7170, 7174), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2740), -======= - id: DeclarationId(2747), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![ - Field { - label: "name".to_string(), - ty: DeclarationId(230), - }, - Field { - label: "path".to_string(), - ty: DeclarationId(230), - }, - Field { - label: "retention_days".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2739), -======= - ty: DeclarationId(2746), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - Field { - label: "if_no_files_found".to_string(), - ty: DeclarationId(1727), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7117, 7217), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2741), -======= - id: DeclarationId(2748), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(230), - CardinalityBound::AtMostOne, - ), - ), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7253, 7260), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2742), -======= - id: DeclarationId(2749), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![ - Field { - label: "name".to_string(), - ty: DeclarationId(230), - }, - Field { - label: "path".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2741), -======= - ty: DeclarationId(2748), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7222, 7262), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2743), -======= - id: DeclarationId(2750), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7292, 7296), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2744), -======= - id: DeclarationId(2751), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7299, 7307), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2745), -======= - id: DeclarationId(2752), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7310, 7316), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2746), -======= - id: DeclarationId(2753), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(686), - arguments: vec![TemplateArgument { - parameter: DeclarationId(687), - value: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7778, 7790), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2747), -======= - id: DeclarationId(2754), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(137), - arguments: vec![ - TemplateArgument { - parameter: DeclarationId(138), - value: DeclarationId(230), - }, - TemplateArgument { - parameter: DeclarationId(139), -<<<<<<< HEAD - value: DeclarationId(2746), -======= - value: DeclarationId(2753), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7766, 7791), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2748), -======= - id: DeclarationId(2755), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(137), - arguments: vec![ - TemplateArgument { - parameter: DeclarationId(138), - value: DeclarationId(230), - }, - TemplateArgument { - parameter: DeclarationId(139), - value: DeclarationId(230), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7808, 7827), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2749), -======= - id: DeclarationId(2756), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(686), - arguments: vec![TemplateArgument { -<<<<<<< HEAD - parameter: DeclarationId(687), - value: DeclarationId(2748), -======= - parameter: DeclarationId(686), - value: DeclarationId(2755), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7803, 7828), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2750), -======= - id: DeclarationId(2757), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(137), - arguments: vec![ - TemplateArgument { - parameter: DeclarationId(138), - value: DeclarationId(230), - }, - TemplateArgument { - parameter: DeclarationId(139), - value: DeclarationId(230), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7845, 7864), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2751), -======= - id: DeclarationId(2758), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(686), - arguments: vec![TemplateArgument { -<<<<<<< HEAD - parameter: DeclarationId(687), - value: DeclarationId(2750), -======= - parameter: DeclarationId(686), - value: DeclarationId(2757), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7840, 7865), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2752), -======= - id: DeclarationId(2759), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Cardinality( - CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(93), - CardinalityBound::AtMostOne, - ), - ), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7900, 7904), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2753), -======= - id: DeclarationId(2760), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8060, 8067), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2754), -======= - id: DeclarationId(2761), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8072, 8079), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2755), -======= - id: DeclarationId(2762), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8084, 8093), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2756), -======= - id: DeclarationId(2763), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8098, 8105), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2757), -======= - id: DeclarationId(2764), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8110, 8118), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2758), -======= - id: DeclarationId(2765), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8123, 8137), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2759), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(48), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), - }); - declarations.push(Declaration { - id: DeclarationId(2760), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), - }); - declarations.push(Declaration { - id: DeclarationId(2761), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2759), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2760), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), - }); - declarations.push(Declaration { - id: DeclarationId(2762), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(48), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), - }); - declarations.push(Declaration { - id: DeclarationId(2763), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), - }); - declarations.push(Declaration { - id: DeclarationId(2764), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2762), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2763), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), - }); - declarations.push(Declaration { - id: DeclarationId(2765), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(51), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), - }); - declarations.push(Declaration { - id: DeclarationId(2766), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), - }); - declarations.push(Declaration { - id: DeclarationId(2767), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2765), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2766), - }, - ], -======= - id: DeclarationId(2766), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(48), - }], ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), - }); - declarations.push(Declaration { - id: DeclarationId(2768), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), - }); - declarations.push(Declaration { - id: DeclarationId(2768), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2766), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2767), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), - }); - declarations.push(Declaration { - id: DeclarationId(2769), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(48), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), - }); - declarations.push(Declaration { - id: DeclarationId(2770), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), - }); - declarations.push(Declaration { - id: DeclarationId(2771), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2769), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2770), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), - }); - declarations.push(Declaration { - id: DeclarationId(2772), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(51), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), - }); - declarations.push(Declaration { - id: DeclarationId(2773), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), - }); - declarations.push(Declaration { - id: DeclarationId(2774), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2772), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2773), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), - }); - declarations.push(Declaration { - id: DeclarationId(2775), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(51), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2769), -======= - id: DeclarationId(2776), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2770), -======= - id: DeclarationId(2777), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2768), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2769), -======= - ty: DeclarationId(2775), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2776), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2771), -======= - id: DeclarationId(2778), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(56), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2772), -======= - id: DeclarationId(2779), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2773), -======= - id: DeclarationId(2780), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2771), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2772), -======= - ty: DeclarationId(2778), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2779), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2774), -======= - id: DeclarationId(2781), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(57), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2775), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), - }); - declarations.push(Declaration { - id: DeclarationId(2776), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2774), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2775), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), - }); - declarations.push(Declaration { - id: DeclarationId(2777), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(93), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), - }); - declarations.push(Declaration { - id: DeclarationId(2778), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), - }); - declarations.push(Declaration { - id: DeclarationId(2779), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2777), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2778), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), - }); - declarations.push(Declaration { - id: DeclarationId(2780), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(93), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), - }); - declarations.push(Declaration { - id: DeclarationId(2781), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), - }); - declarations.push(Declaration { - id: DeclarationId(2782), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2780), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2781), - }, - ], - }, -======= - id: DeclarationId(2782), - name: None, - connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), -======= - span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }); - declarations.push(Declaration { - id: DeclarationId(2783), - name: None, -<<<<<<< HEAD -======= - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2781), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2782), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), - }); - declarations.push(Declaration { - id: DeclarationId(2784), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(93), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), - }); - declarations.push(Declaration { - id: DeclarationId(2785), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), - }); - declarations.push(Declaration { - id: DeclarationId(2786), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2784), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2785), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), - }); - declarations.push(Declaration { - id: DeclarationId(2787), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(93), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), - }); - declarations.push(Declaration { - id: DeclarationId(2788), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), - }); - declarations.push(Declaration { - id: DeclarationId(2789), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2787), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2788), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), - }); - declarations.push(Declaration { - id: DeclarationId(2790), - name: None, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, -<<<<<<< HEAD -======= - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), - }); - declarations.push(Declaration { - id: DeclarationId(2791), - name: None, - connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), - }); - declarations.push(Declaration { - id: DeclarationId(2792), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), - }); - declarations.push(Declaration { - id: DeclarationId(2785), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2783), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2784), -======= - ty: DeclarationId(2790), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2791), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2786), -======= - id: DeclarationId(2793), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2787), -======= - id: DeclarationId(2794), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2788), -======= - id: DeclarationId(2795), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2786), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2787), -======= - ty: DeclarationId(2793), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2794), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2789), -======= - id: DeclarationId(2796), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(180), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 16948, 16968), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2790), -======= - id: DeclarationId(2797), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 16948, 16968), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2791), -======= - id: DeclarationId(2798), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2789), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2790), -======= - ty: DeclarationId(2796), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2797), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 16948, 16968), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2792), -======= - id: DeclarationId(2799), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(189), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 17604, 17611), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2793), -======= - id: DeclarationId(2800), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 17604, 17611), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2794), -======= - id: DeclarationId(2801), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2792), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2793), -======= - ty: DeclarationId(2799), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2800), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 17604, 17611), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2795), -======= - id: DeclarationId(2802), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(160), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21364, 21374), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2796), -======= - id: DeclarationId(2803), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21364, 21374), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2797), -======= - id: DeclarationId(2804), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2795), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2796), -======= - ty: DeclarationId(2802), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2803), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21364, 21374), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2798), -======= - id: DeclarationId(2805), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21499, 21506), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2799), -======= - id: DeclarationId(2806), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21499, 21506), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2800), -======= - id: DeclarationId(2807), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2798), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2799), -======= - ty: DeclarationId(2805), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2806), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21499, 21506), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2801), -======= - id: DeclarationId(2808), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(93), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2802), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), - }); - declarations.push(Declaration { - id: DeclarationId(2803), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2801), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2802), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), - }); - declarations.push(Declaration { - id: DeclarationId(2804), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), - }); - declarations.push(Declaration { - id: DeclarationId(2805), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), - }); - declarations.push(Declaration { - id: DeclarationId(2806), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2804), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2805), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), - }); - declarations.push(Declaration { - id: DeclarationId(2807), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), - }); - declarations.push(Declaration { - id: DeclarationId(2808), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), - }); - declarations.push(Declaration { - id: DeclarationId(2809), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2807), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2808), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), - }); - declarations.push(Declaration { - id: DeclarationId(2810), -======= - id: DeclarationId(2809), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), - }); - declarations.push(Declaration { - id: DeclarationId(2811), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2808), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2809), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), - }); - declarations.push(Declaration { - id: DeclarationId(2811), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), - }); - declarations.push(Declaration { - id: DeclarationId(2812), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), - }); - declarations.push(Declaration { - id: DeclarationId(2813), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2811), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2812), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), - }); - declarations.push(Declaration { - id: DeclarationId(2814), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), - }); - declarations.push(Declaration { - id: DeclarationId(2815), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), - }); - declarations.push(Declaration { - id: DeclarationId(2816), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2814), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2815), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), - }); - declarations.push(Declaration { - id: DeclarationId(2817), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23950, 23957), - }); - declarations.push(Declaration { - id: DeclarationId(2818), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23950, 23957), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2812), -======= - id: DeclarationId(2819), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2810), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2811), -======= - ty: DeclarationId(2817), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2818), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 23950, 23957), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2813), -======= - id: DeclarationId(2820), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(225), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24180, 24195), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2814), -======= - id: DeclarationId(2821), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24180, 24195), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2815), -======= - id: DeclarationId(2822), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2813), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2814), -======= - ty: DeclarationId(2820), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2821), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24180, 24195), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2816), -======= - id: DeclarationId(2823), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(191), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24206, 24219), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2817), -======= - id: DeclarationId(2824), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24206, 24219), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2818), -======= - id: DeclarationId(2825), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2816), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2817), -======= - ty: DeclarationId(2823), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2824), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24206, 24219), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2819), -======= - id: DeclarationId(2826), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(190), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2820), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), - }); - declarations.push(Declaration { - id: DeclarationId(2821), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2819), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2820), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), - }); - declarations.push(Declaration { - id: DeclarationId(2822), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), - }); - declarations.push(Declaration { - id: DeclarationId(2823), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), - }); - declarations.push(Declaration { - id: DeclarationId(2824), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2822), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2823), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), - }); - declarations.push(Declaration { - id: DeclarationId(2825), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), - }); - declarations.push(Declaration { - id: DeclarationId(2826), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), - }); - declarations.push(Declaration { - id: DeclarationId(2827), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2825), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2826), - }, - ], - }, -======= - id: DeclarationId(2827), - name: None, - connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), -======= - span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }); - declarations.push(Declaration { - id: DeclarationId(2828), - name: None, -<<<<<<< HEAD -======= - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2826), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2827), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), - }); - declarations.push(Declaration { - id: DeclarationId(2829), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), - }); - declarations.push(Declaration { - id: DeclarationId(2830), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), - }); - declarations.push(Declaration { - id: DeclarationId(2831), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2829), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2830), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), - }); - declarations.push(Declaration { - id: DeclarationId(2832), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), - }); - declarations.push(Declaration { - id: DeclarationId(2833), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), - }); - declarations.push(Declaration { - id: DeclarationId(2834), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2832), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2833), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), - }); - declarations.push(Declaration { - id: DeclarationId(2835), - name: None, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(1776), - }], - }, -<<<<<<< HEAD -======= - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), - }); - declarations.push(Declaration { - id: DeclarationId(2836), - name: None, - connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), - }); - declarations.push(Declaration { - id: DeclarationId(2837), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), - }); - declarations.push(Declaration { - id: DeclarationId(2830), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2828), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2829), -======= - ty: DeclarationId(2835), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2836), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2831), -======= - id: DeclarationId(2838), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(1779), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2832), -======= - id: DeclarationId(2839), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2833), -======= - id: DeclarationId(2840), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2831), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2832), -======= - ty: DeclarationId(2838), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2839), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2834), -======= - id: DeclarationId(2841), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(198), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2835), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), - }); - declarations.push(Declaration { - id: DeclarationId(2836), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2834), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2835), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), - }); - declarations.push(Declaration { - id: DeclarationId(2837), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), - }); - declarations.push(Declaration { - id: DeclarationId(2838), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), - }); - declarations.push(Declaration { - id: DeclarationId(2839), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2837), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2838), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), - }); - declarations.push(Declaration { - id: DeclarationId(2840), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), - }); - declarations.push(Declaration { - id: DeclarationId(2841), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), - }); - declarations.push(Declaration { - id: DeclarationId(2842), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2840), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2841), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), - }); - declarations.push(Declaration { - id: DeclarationId(2843), -======= - id: DeclarationId(2842), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), - }); - declarations.push(Declaration { - id: DeclarationId(2843), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2841), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2842), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), - }); - declarations.push(Declaration { - id: DeclarationId(2844), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), - }); - declarations.push(Declaration { - id: DeclarationId(2845), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), - }); - declarations.push(Declaration { - id: DeclarationId(2846), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2844), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2845), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), - }); - declarations.push(Declaration { - id: DeclarationId(2847), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), - }); - declarations.push(Declaration { - id: DeclarationId(2848), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), - }); - declarations.push(Declaration { - id: DeclarationId(2849), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2847), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2848), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), - }); - declarations.push(Declaration { - id: DeclarationId(2850), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(781), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2844), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), - }); - declarations.push(Declaration { - id: DeclarationId(2845), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2843), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2844), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), - }); - declarations.push(Declaration { - id: DeclarationId(2846), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(827), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), - }); - declarations.push(Declaration { - id: DeclarationId(2847), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), - }); - declarations.push(Declaration { - id: DeclarationId(2848), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2846), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2847), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), - }); - declarations.push(Declaration { - id: DeclarationId(2849), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(827), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), - }); - declarations.push(Declaration { - id: DeclarationId(2850), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), - }); - declarations.push(Declaration { - id: DeclarationId(2851), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2849), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2850), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), - }); - declarations.push(Declaration { - id: DeclarationId(2852), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(799), - }], - }, -======= - id: DeclarationId(2851), - name: None, - connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2853), -======= - id: DeclarationId(2852), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2850), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2851), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), - }); - declarations.push(Declaration { - id: DeclarationId(2853), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(826), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), - }); - declarations.push(Declaration { - id: DeclarationId(2854), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), - }); - declarations.push(Declaration { - id: DeclarationId(2855), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2853), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2854), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), - }); - declarations.push(Declaration { - id: DeclarationId(2856), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(826), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), - }); - declarations.push(Declaration { - id: DeclarationId(2857), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), - }); - declarations.push(Declaration { - id: DeclarationId(2858), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2856), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2857), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), - }); - declarations.push(Declaration { - id: DeclarationId(2859), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(798), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), - }); - declarations.push(Declaration { - id: DeclarationId(2860), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), - }); - declarations.push(Declaration { - id: DeclarationId(2861), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), - }); - declarations.push(Declaration { - id: DeclarationId(2854), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2852), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2853), -======= - ty: DeclarationId(2859), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2860), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2855), -======= - id: DeclarationId(2862), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(799), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2856), -======= - id: DeclarationId(2863), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), - }); - declarations.push(Declaration { - id: DeclarationId(2864), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), - }); - declarations.push(Declaration { - id: DeclarationId(2857), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2855), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2856), -======= - ty: DeclarationId(2862), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2863), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2858), -======= - id: DeclarationId(2865), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(755), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2859), -======= - id: DeclarationId(2866), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), - }); - declarations.push(Declaration { - id: DeclarationId(2867), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), - }); - declarations.push(Declaration { - id: DeclarationId(2860), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2858), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2859), -======= - ty: DeclarationId(2865), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2866), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2861), -======= - id: DeclarationId(2868), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(722), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2862), -======= - id: DeclarationId(2869), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2863), -======= - id: DeclarationId(2870), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2861), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2862), -======= - ty: DeclarationId(2868), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2869), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2864), -======= - id: DeclarationId(2871), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(230), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2865), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), - }); - declarations.push(Declaration { - id: DeclarationId(2866), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2864), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2865), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), - }); - declarations.push(Declaration { - id: DeclarationId(2867), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(724), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), - }); - declarations.push(Declaration { - id: DeclarationId(2868), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), - }); - declarations.push(Declaration { - id: DeclarationId(2869), - name: None, - connective: TypeConnective::Disj { - variants: vec![ - Field { - label: "Some".to_string(), - ty: DeclarationId(2867), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2868), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), - }); - declarations.push(Declaration { - id: DeclarationId(2870), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(724), - }], - }, + ), + ), type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -95024,12 +80685,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2742), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "title".to_string(), + ty: DeclarationId(230), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6197, 6230), + }); + declarations.push(Declaration { + id: DeclarationId(2743), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95080,20 +80770,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2753), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95272,30 +80971,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], + connective: TypeConnective::Instantiation { + template: DeclarationId(686), + arguments: vec![TemplateArgument { + parameter: DeclarationId(687), + value: DeclarationId(230), + }], }, type_params: vec![], phantom_params: Vec::new(), @@ -95305,20 +80991,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2755), name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(801), - }], + connective: TypeConnective::Instantiation { + template: DeclarationId(137), + arguments: vec![ + TemplateArgument { + parameter: DeclarationId(138), + value: DeclarationId(230), + }, + TemplateArgument { + parameter: DeclarationId(139), + value: DeclarationId(2754), + }, + ], }, type_params: vec![], phantom_params: Vec::new(), @@ -95328,15 +81017,24 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2757), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Instantiation { + template: DeclarationId(686), + arguments: vec![TemplateArgument { + parameter: DeclarationId(687), + value: DeclarationId(2756), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -95360,28 +81063,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + TemplateArgument { + parameter: DeclarationId(139), + value: DeclarationId(230), }, ], }, @@ -95393,19 +81089,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2759), name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(809), + connective: TypeConnective::Instantiation { + template: DeclarationId(686), + arguments: vec![TemplateArgument { + parameter: DeclarationId(687), + value: DeclarationId(2758), }], }, type_params: vec![], @@ -95416,15 +81109,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2761), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95448,31 +81142,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, + connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -95481,21 +81156,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2763), name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(755), - }], - }, + connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -95504,13 +81170,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2765), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95536,31 +81198,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - ], - }, + connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -95569,19 +81212,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2767), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(822), + ty: DeclarationId(48), }], }, type_params: vec![], @@ -95592,28 +81231,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2768), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95624,28 +81245,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2768), }, ], }, @@ -95657,19 +81270,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2770), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(755), + ty: DeclarationId(48), }], }, type_params: vec![], @@ -95680,28 +81289,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2771), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95712,28 +81303,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2771), }, ], }, @@ -95745,19 +81328,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2773), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(825), + ty: DeclarationId(51), }], }, type_params: vec![], @@ -95768,28 +81347,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2774), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95800,28 +81361,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2774), }, ], }, @@ -95833,19 +81386,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(842), + ty: DeclarationId(56), }], }, type_params: vec![], @@ -95915,10 +81463,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2783), }, ], }, @@ -96020,14 +81560,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2785), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -96043,14 +81579,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2786), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -96061,32 +81593,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2787), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2900), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2901), -======= - ty: DeclarationId(2907), + ty: DeclarationId(2785), }, Field { label: "None".to_string(), - ty: DeclarationId(2908), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2786), }, ], }, @@ -96098,19 +81618,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2788), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -96121,14 +81637,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2789), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -96139,32 +81651,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2790), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2903), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2904), -======= - ty: DeclarationId(2910), + ty: DeclarationId(2788), }, Field { label: "None".to_string(), - ty: DeclarationId(2911), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2789), }, ], }, @@ -96176,19 +81676,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2791), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(115), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -96199,14 +81695,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2792), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -96217,32 +81709,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2793), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2906), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2907), -======= - ty: DeclarationId(2913), + ty: DeclarationId(2791), }, Field { label: "None".to_string(), - ty: DeclarationId(2914), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2792), }, ], }, @@ -96254,14 +81734,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2794), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -96277,15 +81753,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), + span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), }); declarations.push(Declaration { - id: DeclarationId(2919), + id: DeclarationId(2796), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2909), + ty: DeclarationId(2794), }, Field { label: "None".to_string(), - ty: DeclarationId(2910), + ty: DeclarationId(2795), }, ], }, @@ -96347,15 +81792,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2798), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -96384,32 +81825,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2799), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2912), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2913), -======= - ty: DeclarationId(2919), + ty: DeclarationId(2797), }, Field { label: "None".to_string(), - ty: DeclarationId(2920), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2798), }, ], }, @@ -96421,19 +81850,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2800), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(128), + ty: DeclarationId(189), }], }, type_params: vec![], @@ -96444,11 +81869,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + span: SourceSpan::new("dsl/std/types.dag", 21499, 21506), }); declarations.push(Declaration { - id: DeclarationId(2924), + id: DeclarationId(2809), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(93), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -96617,11 +82043,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -96691,25 +82101,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -96779,25 +82159,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -96867,25 +82217,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -96955,25 +82275,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -97043,25 +82333,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6409, 6416), + span: SourceSpan::new("dsl/std/types.dag", 24206, 24219), }); declarations.push(Declaration { - id: DeclarationId(2942), + id: DeclarationId(2827), name: None, -<<<<<<< HEAD connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(2084), + ty: DeclarationId(190), }], }, -======= - connective: TypeConnective::Conj { children: vec![] }, ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -97154,11 +82391,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6547, 6554), + span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), }); declarations.push(Declaration { - id: DeclarationId(2945), + id: DeclarationId(2830), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -97242,11 +82449,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -97316,25 +82507,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -97404,25 +82565,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(130), + ty: DeclarationId(827), }], }, type_params: vec![], @@ -97738,15 +82913,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7583, 7588), + span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), }); declarations.push(Declaration { - id: DeclarationId(2955), + id: DeclarationId(2856), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2966), + ty: DeclarationId(2854), }, Field { label: "None".to_string(), - ty: DeclarationId(2967), + ty: DeclarationId(2855), }, ], }, @@ -97808,17 +82952,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) - ty: DeclarationId(928), + ty: DeclarationId(724), }], }, type_params: vec![], @@ -98236,14 +83377,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2879), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -98254,32 +83391,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2880), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2969), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2970), -======= - ty: DeclarationId(2976), + ty: DeclarationId(2878), }, Field { label: "None".to_string(), - ty: DeclarationId(2977), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2879), }, ], }, @@ -98291,19 +83416,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2881), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(230), + ty: DeclarationId(795), }], }, type_params: vec![], @@ -98314,11 +83435,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -98494,24 +83623,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -98557,34 +83681,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2895), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2981), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2982), -======= - ty: DeclarationId(2982), + ty: DeclarationId(2893), }, Field { label: "None".to_string(), - ty: DeclarationId(2983), + ty: DeclarationId(2894), }, ], }, @@ -98596,15 +83706,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2900), }, ], }, @@ -98713,16 +83822,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -98897,10 +84015,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -98974,34 +84087,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2916), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2993), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(2994), -======= - ty: DeclarationId(2994), + ty: DeclarationId(2914), }, Field { label: "None".to_string(), - ty: DeclarationId(2995), + ty: DeclarationId(2915), }, ], }, @@ -99013,15 +84112,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2921), }, ], }, @@ -99130,16 +84228,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -99314,10 +84421,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2942), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -99520,28 +84609,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2942), }, ], }, @@ -99553,19 +84634,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2944), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(93), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -99576,11 +84653,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -99756,24 +84841,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -99819,34 +84899,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2958), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3017), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3018), -======= - ty: DeclarationId(3018), + ty: DeclarationId(2956), }, Field { label: "None".to_string(), - ty: DeclarationId(3019), + ty: DeclarationId(2957), }, ], }, @@ -99858,15 +84924,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2963), }, ], }, @@ -99975,19 +85040,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2965), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1197), + ty: DeclarationId(93), }], }, type_params: vec![], @@ -99998,28 +85059,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2966), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -100030,28 +85073,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2966), }, ], }, @@ -100063,19 +85098,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2968), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1199), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -100086,28 +85117,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2969), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -100118,28 +85131,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2969), }, ], }, @@ -100151,19 +85156,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2971), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(806), + ty: DeclarationId(230), }], }, type_params: vec![], @@ -100174,14 +85175,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2972), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -100192,32 +85189,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2973), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3026), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3027), -======= - ty: DeclarationId(3033), + ty: DeclarationId(2971), }, Field { label: "None".to_string(), - ty: DeclarationId(3034), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2972), }, ], }, @@ -100229,19 +85214,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2974), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(160), + ty: DeclarationId(130), }], }, type_params: vec![], @@ -100252,11 +85233,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2983), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(93), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -100425,24 +85407,34 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -100488,34 +85479,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(2988), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3038), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3039), -======= - ty: DeclarationId(3039), + ty: DeclarationId(2986), }, Field { label: "None".to_string(), - ty: DeclarationId(3040), + ty: DeclarationId(2987), }, ], }, @@ -100527,15 +85504,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(2993), }, ], }, @@ -100644,16 +85620,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -100828,21 +85794,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -100851,24 +85813,34 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -100914,34 +85885,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3009), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3050), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3051), -======= - ty: DeclarationId(3051), + ty: DeclarationId(3007), }, Field { label: "None".to_string(), - ty: DeclarationId(3052), + ty: DeclarationId(3008), }, ], }, @@ -100953,15 +85910,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(3014), }, ], }, @@ -101070,14 +86026,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3016), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -101093,11 +86045,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3025), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(1190), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -101266,24 +86219,34 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -101329,34 +86291,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3030), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3062), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3063), -======= - ty: DeclarationId(3063), + ty: DeclarationId(3028), }, Field { label: "None".to_string(), - ty: DeclarationId(3064), + ty: DeclarationId(3029), }, ], }, @@ -101368,15 +86316,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(3035), }, ], }, @@ -101485,16 +86432,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -101669,10 +86625,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -101746,34 +86697,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3051), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3074), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3075), -======= - ty: DeclarationId(3075), + ty: DeclarationId(3049), }, Field { label: "None".to_string(), - ty: DeclarationId(3076), + ty: DeclarationId(3050), }, ], }, @@ -101785,10 +86722,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(3056), }, ], }, @@ -101902,16 +86838,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -102086,10 +87031,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -102163,34 +87103,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3072), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3086), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3087), -======= - ty: DeclarationId(3087), + ty: DeclarationId(3070), }, Field { label: "None".to_string(), - ty: DeclarationId(3088), + ty: DeclarationId(3071), }, ], }, @@ -102202,15 +87128,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(3077), }, ], }, @@ -102319,14 +87244,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3079), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -102342,11 +87263,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3088), name: None, - connective: TypeConnective::Conj { children: vec![] }, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(230), + }], + }, type_params: vec![], phantom_params: Vec::new(), meta_tag: None, @@ -102515,24 +87437,34 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], phantom_params: Vec::new(), @@ -102578,34 +87509,20 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3093), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3098), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3099), -======= - ty: DeclarationId(3099), + ty: DeclarationId(3091), }, Field { label: "None".to_string(), - ty: DeclarationId(3100), + ty: DeclarationId(3092), }, ], }, @@ -102617,10 +87534,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(3098), }, ], }, @@ -102734,11 +87650,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) }, type_params: vec![], phantom_params: Vec::new(), @@ -102935,17 +87860,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3119), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -103113,29 +88034,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3120), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3110), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3111), -======= - ty: DeclarationId(3117), + ty: DeclarationId(3118), }, Field { label: "None".to_string(), - ty: DeclarationId(3118), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(3119), }, ], }, @@ -103150,11 +88059,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3121), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -103173,11 +88078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3122), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -103191,29 +88092,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + id: DeclarationId(3123), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), -<<<<<<< HEAD - ty: DeclarationId(3113), - }, - Field { - label: "None".to_string(), - ty: DeclarationId(3114), -======= - ty: DeclarationId(3120), + ty: DeclarationId(3121), }, Field { label: "None".to_string(), - ty: DeclarationId(3121), ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + ty: DeclarationId(3122), }, ], }, @@ -104750,7 +89639,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2313))), produced_by: None, }, ); @@ -109042,11 +93927,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2385))), produced_by: Some(NodeId(596)), }, ); @@ -109070,11 +93951,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2386))), produced_by: Some(NodeId(598)), }, ); @@ -109082,11 +93959,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2387))), produced_by: Some(NodeId(600)), }, ); @@ -109094,11 +93967,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2388))), produced_by: Some(NodeId(602)), }, ); @@ -109106,11 +93975,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2389))), produced_by: Some(NodeId(604)), }, ); @@ -109118,11 +93983,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2390))), produced_by: Some(NodeId(606)), }, ); @@ -109130,11 +93991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2391))), produced_by: Some(NodeId(608)), }, ); @@ -109142,11 +93999,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2393))), produced_by: Some(NodeId(610)), }, ); @@ -109154,7 +94007,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2395))), produced_by: Some(NodeId(614)), }, ); @@ -109190,7 +94039,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2396))), produced_by: Some(NodeId(617)), }, ); @@ -109218,7 +94063,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2397))), produced_by: Some(NodeId(621)), }, ); @@ -109254,7 +94095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap HashMap HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2398))), produced_by: Some(NodeId(626)), }, ); @@ -109314,7 +94151,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2399))), produced_by: Some(NodeId(633)), }, ); @@ -109390,7 +94223,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap HashMap HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2400))), produced_by: Some(NodeId(640)), }, ); @@ -109474,7 +94303,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap HashMap HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2401))), produced_by: Some(NodeId(645)), }, ); @@ -109542,11 +94367,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2402))), produced_by: None, }, ); @@ -109634,11 +94455,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2403))), produced_by: Some(NodeId(655)), }, ); @@ -109710,11 +94527,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2404))), produced_by: Some(NodeId(663)), }, ); @@ -109730,7 +94543,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2461))), produced_by: Some(NodeId(713)), }, ); @@ -110286,7 +95095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap HashMap HashMap HashMap HashMap HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2462))), produced_by: Some(NodeId(792)), }, ); @@ -110938,7 +95743,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap HashMap HashMap>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + state: PortState::Resolved(TypeShape::new(DeclarationId(2622))), produced_by: Some(NodeId(808)), }, ); @@ -111410,247 +96211,125 @@ fn bootstrapped_fixture_without_parse_surface_dag_optional_match_disjs( ) -> HashMap { { let mut map = HashMap::new(); -<<<<<<< HEAD - map.insert(DeclarationId(389), DeclarationId(2761)); - map.insert(DeclarationId(391), DeclarationId(2764)); - map.insert(DeclarationId(423), DeclarationId(2767)); - map.insert(DeclarationId(426), DeclarationId(2770)); - map.insert(DeclarationId(471), DeclarationId(2773)); - map.insert(DeclarationId(472), DeclarationId(2776)); - map.insert(DeclarationId(473), DeclarationId(2779)); - map.insert(DeclarationId(513), DeclarationId(2782)); - map.insert(DeclarationId(515), DeclarationId(2785)); - map.insert(DeclarationId(516), DeclarationId(2788)); - map.insert(DeclarationId(539), DeclarationId(2791)); - map.insert(DeclarationId(582), DeclarationId(2794)); - map.insert(DeclarationId(602), DeclarationId(2797)); - map.insert(DeclarationId(603), DeclarationId(2800)); - map.insert(DeclarationId(605), DeclarationId(2803)); - map.insert(DeclarationId(608), DeclarationId(2806)); - map.insert(DeclarationId(613), DeclarationId(2809)); - map.insert(DeclarationId(614), DeclarationId(2812)); - map.insert(DeclarationId(618), DeclarationId(2815)); - map.insert(DeclarationId(619), DeclarationId(2818)); - map.insert(DeclarationId(620), DeclarationId(2821)); - map.insert(DeclarationId(625), DeclarationId(2824)); - map.insert(DeclarationId(1773), DeclarationId(2827)); - map.insert(DeclarationId(1777), DeclarationId(2830)); - map.insert(DeclarationId(1780), DeclarationId(2833)); - map.insert(DeclarationId(1782), DeclarationId(2836)); - map.insert(DeclarationId(1783), DeclarationId(2839)); - map.insert(DeclarationId(1784), DeclarationId(2842)); - map.insert(DeclarationId(1838), DeclarationId(2845)); - map.insert(DeclarationId(1839), DeclarationId(2848)); - map.insert(DeclarationId(1840), DeclarationId(2851)); - map.insert(DeclarationId(1841), DeclarationId(2854)); - map.insert(DeclarationId(1842), DeclarationId(2857)); - map.insert(DeclarationId(1843), DeclarationId(2860)); - map.insert(DeclarationId(1849), DeclarationId(2863)); - map.insert(DeclarationId(1904), DeclarationId(2866)); - map.insert(DeclarationId(1907), DeclarationId(2869)); - map.insert(DeclarationId(1908), DeclarationId(2872)); - map.insert(DeclarationId(1909), DeclarationId(2875)); - map.insert(DeclarationId(1910), DeclarationId(2878)); - map.insert(DeclarationId(1933), DeclarationId(2881)); - map.insert(DeclarationId(1938), DeclarationId(2884)); - map.insert(DeclarationId(1942), DeclarationId(2887)); - map.insert(DeclarationId(1945), DeclarationId(2890)); - map.insert(DeclarationId(1946), DeclarationId(2893)); - map.insert(DeclarationId(1991), DeclarationId(2896)); - map.insert(DeclarationId(1992), DeclarationId(2899)); - map.insert(DeclarationId(1993), DeclarationId(2902)); - map.insert(DeclarationId(1994), DeclarationId(2905)); - map.insert(DeclarationId(2044), DeclarationId(2908)); - map.insert(DeclarationId(2045), DeclarationId(2911)); - map.insert(DeclarationId(2059), DeclarationId(2914)); - map.insert(DeclarationId(2060), DeclarationId(2917)); - map.insert(DeclarationId(2071), DeclarationId(2920)); - map.insert(DeclarationId(2072), DeclarationId(2923)); - map.insert(DeclarationId(2074), DeclarationId(2926)); - map.insert(DeclarationId(2075), DeclarationId(2929)); - map.insert(DeclarationId(2077), DeclarationId(2932)); - map.insert(DeclarationId(2078), DeclarationId(2935)); - map.insert(DeclarationId(2080), DeclarationId(2938)); - map.insert(DeclarationId(2082), DeclarationId(2941)); - map.insert(DeclarationId(2085), DeclarationId(2944)); - map.insert(DeclarationId(2089), DeclarationId(2947)); - map.insert(DeclarationId(2091), DeclarationId(2950)); - map.insert(DeclarationId(2093), DeclarationId(2953)); - map.insert(DeclarationId(2103), DeclarationId(2956)); - map.insert(DeclarationId(2104), DeclarationId(2959)); - map.insert(DeclarationId(2105), DeclarationId(2962)); - map.insert(DeclarationId(2108), DeclarationId(2965)); - map.insert(DeclarationId(2109), DeclarationId(2968)); - map.insert(DeclarationId(2144), DeclarationId(2971)); - map.insert(DeclarationId(2145), DeclarationId(2974)); - map.insert(DeclarationId(2146), DeclarationId(2977)); - map.insert(DeclarationId(2147), DeclarationId(2980)); - map.insert(DeclarationId(2148), DeclarationId(2983)); - map.insert(DeclarationId(2171), DeclarationId(2986)); - map.insert(DeclarationId(2301), DeclarationId(2989)); - map.insert(DeclarationId(2302), DeclarationId(2992)); - map.insert(DeclarationId(2308), DeclarationId(2995)); - map.insert(DeclarationId(2309), DeclarationId(2998)); - map.insert(DeclarationId(2310), DeclarationId(3001)); - map.insert(DeclarationId(2311), DeclarationId(3004)); - map.insert(DeclarationId(2312), DeclarationId(3007)); - map.insert(DeclarationId(2313), DeclarationId(3010)); - map.insert(DeclarationId(2418), DeclarationId(3013)); - map.insert(DeclarationId(2419), DeclarationId(3016)); - map.insert(DeclarationId(2420), DeclarationId(3019)); - map.insert(DeclarationId(2423), DeclarationId(3022)); - map.insert(DeclarationId(2424), DeclarationId(3025)); - map.insert(DeclarationId(2618), DeclarationId(3028)); - map.insert(DeclarationId(2647), DeclarationId(3031)); - map.insert(DeclarationId(2653), DeclarationId(3034)); - map.insert(DeclarationId(2660), DeclarationId(3037)); - map.insert(DeclarationId(2679), DeclarationId(3040)); - map.insert(DeclarationId(2680), DeclarationId(3043)); - map.insert(DeclarationId(2688), DeclarationId(3046)); - map.insert(DeclarationId(2692), DeclarationId(3049)); - map.insert(DeclarationId(2693), DeclarationId(3052)); - map.insert(DeclarationId(2694), DeclarationId(3055)); - map.insert(DeclarationId(2695), DeclarationId(3058)); - map.insert(DeclarationId(2705), DeclarationId(3061)); - map.insert(DeclarationId(2707), DeclarationId(3064)); - map.insert(DeclarationId(2708), DeclarationId(3067)); - map.insert(DeclarationId(2709), DeclarationId(3070)); - map.insert(DeclarationId(2711), DeclarationId(3073)); - map.insert(DeclarationId(2714), DeclarationId(3076)); - map.insert(DeclarationId(2715), DeclarationId(3079)); - map.insert(DeclarationId(2722), DeclarationId(3082)); - map.insert(DeclarationId(2723), DeclarationId(3085)); - map.insert(DeclarationId(2724), DeclarationId(3088)); - map.insert(DeclarationId(2726), DeclarationId(3091)); - map.insert(DeclarationId(2727), DeclarationId(3094)); - map.insert(DeclarationId(2728), DeclarationId(3097)); - map.insert(DeclarationId(2730), DeclarationId(3100)); - map.insert(DeclarationId(2731), DeclarationId(3103)); - map.insert(DeclarationId(2732), DeclarationId(3106)); - map.insert(DeclarationId(2739), DeclarationId(3109)); - map.insert(DeclarationId(2741), DeclarationId(3112)); - map.insert(DeclarationId(2752), DeclarationId(3115)); -======= - map.insert(DeclarationId(389), DeclarationId(2768)); - map.insert(DeclarationId(391), DeclarationId(2771)); - map.insert(DeclarationId(423), DeclarationId(2774)); - map.insert(DeclarationId(426), DeclarationId(2777)); - map.insert(DeclarationId(471), DeclarationId(2780)); - map.insert(DeclarationId(472), DeclarationId(2783)); - map.insert(DeclarationId(473), DeclarationId(2786)); - map.insert(DeclarationId(513), DeclarationId(2789)); - map.insert(DeclarationId(515), DeclarationId(2792)); - map.insert(DeclarationId(516), DeclarationId(2795)); - map.insert(DeclarationId(539), DeclarationId(2798)); - map.insert(DeclarationId(582), DeclarationId(2801)); - map.insert(DeclarationId(602), DeclarationId(2804)); - map.insert(DeclarationId(603), DeclarationId(2807)); - map.insert(DeclarationId(605), DeclarationId(2810)); - map.insert(DeclarationId(608), DeclarationId(2813)); - map.insert(DeclarationId(613), DeclarationId(2816)); - map.insert(DeclarationId(614), DeclarationId(2819)); - map.insert(DeclarationId(618), DeclarationId(2822)); - map.insert(DeclarationId(619), DeclarationId(2825)); - map.insert(DeclarationId(620), DeclarationId(2828)); - map.insert(DeclarationId(625), DeclarationId(2831)); - map.insert(DeclarationId(1773), DeclarationId(2834)); - map.insert(DeclarationId(1777), DeclarationId(2837)); - map.insert(DeclarationId(1780), DeclarationId(2840)); - map.insert(DeclarationId(1782), DeclarationId(2843)); - map.insert(DeclarationId(1783), DeclarationId(2846)); - map.insert(DeclarationId(1784), DeclarationId(2849)); - map.insert(DeclarationId(1838), DeclarationId(2852)); - map.insert(DeclarationId(1839), DeclarationId(2855)); - map.insert(DeclarationId(1840), DeclarationId(2858)); - map.insert(DeclarationId(1841), DeclarationId(2861)); - map.insert(DeclarationId(1842), DeclarationId(2864)); - map.insert(DeclarationId(1843), DeclarationId(2867)); - map.insert(DeclarationId(1849), DeclarationId(2870)); - map.insert(DeclarationId(1904), DeclarationId(2873)); - map.insert(DeclarationId(1907), DeclarationId(2876)); - map.insert(DeclarationId(1908), DeclarationId(2879)); - map.insert(DeclarationId(1909), DeclarationId(2882)); - map.insert(DeclarationId(1910), DeclarationId(2885)); - map.insert(DeclarationId(1933), DeclarationId(2888)); - map.insert(DeclarationId(1938), DeclarationId(2891)); - map.insert(DeclarationId(1942), DeclarationId(2894)); - map.insert(DeclarationId(1945), DeclarationId(2897)); - map.insert(DeclarationId(1946), DeclarationId(2900)); - map.insert(DeclarationId(1991), DeclarationId(2903)); - map.insert(DeclarationId(1992), DeclarationId(2906)); - map.insert(DeclarationId(1993), DeclarationId(2909)); - map.insert(DeclarationId(1994), DeclarationId(2912)); - map.insert(DeclarationId(2044), DeclarationId(2915)); - map.insert(DeclarationId(2045), DeclarationId(2918)); - map.insert(DeclarationId(2066), DeclarationId(2921)); - map.insert(DeclarationId(2067), DeclarationId(2924)); - map.insert(DeclarationId(2078), DeclarationId(2927)); - map.insert(DeclarationId(2079), DeclarationId(2930)); - map.insert(DeclarationId(2081), DeclarationId(2933)); - map.insert(DeclarationId(2082), DeclarationId(2936)); - map.insert(DeclarationId(2084), DeclarationId(2939)); - map.insert(DeclarationId(2085), DeclarationId(2942)); - map.insert(DeclarationId(2087), DeclarationId(2945)); - map.insert(DeclarationId(2089), DeclarationId(2948)); - map.insert(DeclarationId(2092), DeclarationId(2951)); - map.insert(DeclarationId(2096), DeclarationId(2954)); - map.insert(DeclarationId(2098), DeclarationId(2957)); - map.insert(DeclarationId(2100), DeclarationId(2960)); - map.insert(DeclarationId(2110), DeclarationId(2963)); - map.insert(DeclarationId(2111), DeclarationId(2966)); - map.insert(DeclarationId(2112), DeclarationId(2969)); - map.insert(DeclarationId(2115), DeclarationId(2972)); - map.insert(DeclarationId(2116), DeclarationId(2975)); - map.insert(DeclarationId(2151), DeclarationId(2978)); - map.insert(DeclarationId(2152), DeclarationId(2981)); - map.insert(DeclarationId(2153), DeclarationId(2984)); - map.insert(DeclarationId(2154), DeclarationId(2987)); - map.insert(DeclarationId(2155), DeclarationId(2990)); - map.insert(DeclarationId(2178), DeclarationId(2993)); - map.insert(DeclarationId(2308), DeclarationId(2996)); - map.insert(DeclarationId(2309), DeclarationId(2999)); - map.insert(DeclarationId(2315), DeclarationId(3002)); - map.insert(DeclarationId(2316), DeclarationId(3005)); - map.insert(DeclarationId(2317), DeclarationId(3008)); - map.insert(DeclarationId(2318), DeclarationId(3011)); - map.insert(DeclarationId(2319), DeclarationId(3014)); - map.insert(DeclarationId(2320), DeclarationId(3017)); - map.insert(DeclarationId(2425), DeclarationId(3020)); - map.insert(DeclarationId(2426), DeclarationId(3023)); - map.insert(DeclarationId(2427), DeclarationId(3026)); - map.insert(DeclarationId(2430), DeclarationId(3029)); - map.insert(DeclarationId(2431), DeclarationId(3032)); - map.insert(DeclarationId(2625), DeclarationId(3035)); - map.insert(DeclarationId(2654), DeclarationId(3038)); - map.insert(DeclarationId(2660), DeclarationId(3041)); - map.insert(DeclarationId(2667), DeclarationId(3044)); - map.insert(DeclarationId(2686), DeclarationId(3047)); - map.insert(DeclarationId(2687), DeclarationId(3050)); - map.insert(DeclarationId(2695), DeclarationId(3053)); - map.insert(DeclarationId(2699), DeclarationId(3056)); - map.insert(DeclarationId(2700), DeclarationId(3059)); - map.insert(DeclarationId(2701), DeclarationId(3062)); - map.insert(DeclarationId(2702), DeclarationId(3065)); - map.insert(DeclarationId(2712), DeclarationId(3068)); - map.insert(DeclarationId(2714), DeclarationId(3071)); - map.insert(DeclarationId(2715), DeclarationId(3074)); - map.insert(DeclarationId(2716), DeclarationId(3077)); - map.insert(DeclarationId(2718), DeclarationId(3080)); - map.insert(DeclarationId(2721), DeclarationId(3083)); - map.insert(DeclarationId(2722), DeclarationId(3086)); - map.insert(DeclarationId(2729), DeclarationId(3089)); - map.insert(DeclarationId(2730), DeclarationId(3092)); - map.insert(DeclarationId(2731), DeclarationId(3095)); - map.insert(DeclarationId(2733), DeclarationId(3098)); - map.insert(DeclarationId(2734), DeclarationId(3101)); - map.insert(DeclarationId(2735), DeclarationId(3104)); - map.insert(DeclarationId(2737), DeclarationId(3107)); - map.insert(DeclarationId(2738), DeclarationId(3110)); - map.insert(DeclarationId(2739), DeclarationId(3113)); - map.insert(DeclarationId(2746), DeclarationId(3116)); - map.insert(DeclarationId(2748), DeclarationId(3119)); - map.insert(DeclarationId(2759), DeclarationId(3122)); ->>>>>>> bcca4c30c (WIP: T-Anthropic-Wire coproduct slice 2 — Anthropic tool_result_content wire) + map.insert(DeclarationId(389), DeclarationId(2769)); + map.insert(DeclarationId(391), DeclarationId(2772)); + map.insert(DeclarationId(423), DeclarationId(2775)); + map.insert(DeclarationId(426), DeclarationId(2778)); + map.insert(DeclarationId(471), DeclarationId(2781)); + map.insert(DeclarationId(472), DeclarationId(2784)); + map.insert(DeclarationId(473), DeclarationId(2787)); + map.insert(DeclarationId(513), DeclarationId(2790)); + map.insert(DeclarationId(515), DeclarationId(2793)); + map.insert(DeclarationId(516), DeclarationId(2796)); + map.insert(DeclarationId(539), DeclarationId(2799)); + map.insert(DeclarationId(582), DeclarationId(2802)); + map.insert(DeclarationId(602), DeclarationId(2805)); + map.insert(DeclarationId(603), DeclarationId(2808)); + map.insert(DeclarationId(605), DeclarationId(2811)); + map.insert(DeclarationId(608), DeclarationId(2814)); + map.insert(DeclarationId(613), DeclarationId(2817)); + map.insert(DeclarationId(614), DeclarationId(2820)); + map.insert(DeclarationId(618), DeclarationId(2823)); + map.insert(DeclarationId(619), DeclarationId(2826)); + map.insert(DeclarationId(620), DeclarationId(2829)); + map.insert(DeclarationId(625), DeclarationId(2832)); + map.insert(DeclarationId(1774), DeclarationId(2835)); + map.insert(DeclarationId(1778), DeclarationId(2838)); + map.insert(DeclarationId(1781), DeclarationId(2841)); + map.insert(DeclarationId(1783), DeclarationId(2844)); + map.insert(DeclarationId(1784), DeclarationId(2847)); + map.insert(DeclarationId(1785), DeclarationId(2850)); + map.insert(DeclarationId(1839), DeclarationId(2853)); + map.insert(DeclarationId(1840), DeclarationId(2856)); + map.insert(DeclarationId(1841), DeclarationId(2859)); + map.insert(DeclarationId(1842), DeclarationId(2862)); + map.insert(DeclarationId(1843), DeclarationId(2865)); + map.insert(DeclarationId(1844), DeclarationId(2868)); + map.insert(DeclarationId(1850), DeclarationId(2871)); + map.insert(DeclarationId(1905), DeclarationId(2874)); + map.insert(DeclarationId(1908), DeclarationId(2877)); + map.insert(DeclarationId(1909), DeclarationId(2880)); + map.insert(DeclarationId(1910), DeclarationId(2883)); + map.insert(DeclarationId(1911), DeclarationId(2886)); + map.insert(DeclarationId(1934), DeclarationId(2889)); + map.insert(DeclarationId(1939), DeclarationId(2892)); + map.insert(DeclarationId(1943), DeclarationId(2895)); + map.insert(DeclarationId(1946), DeclarationId(2898)); + map.insert(DeclarationId(1947), DeclarationId(2901)); + map.insert(DeclarationId(1992), DeclarationId(2904)); + map.insert(DeclarationId(1993), DeclarationId(2907)); + map.insert(DeclarationId(1994), DeclarationId(2910)); + map.insert(DeclarationId(1995), DeclarationId(2913)); + map.insert(DeclarationId(2045), DeclarationId(2916)); + map.insert(DeclarationId(2046), DeclarationId(2919)); + map.insert(DeclarationId(2067), DeclarationId(2922)); + map.insert(DeclarationId(2068), DeclarationId(2925)); + map.insert(DeclarationId(2079), DeclarationId(2928)); + map.insert(DeclarationId(2080), DeclarationId(2931)); + map.insert(DeclarationId(2082), DeclarationId(2934)); + map.insert(DeclarationId(2083), DeclarationId(2937)); + map.insert(DeclarationId(2085), DeclarationId(2940)); + map.insert(DeclarationId(2086), DeclarationId(2943)); + map.insert(DeclarationId(2088), DeclarationId(2946)); + map.insert(DeclarationId(2090), DeclarationId(2949)); + map.insert(DeclarationId(2093), DeclarationId(2952)); + map.insert(DeclarationId(2097), DeclarationId(2955)); + map.insert(DeclarationId(2099), DeclarationId(2958)); + map.insert(DeclarationId(2101), DeclarationId(2961)); + map.insert(DeclarationId(2111), DeclarationId(2964)); + map.insert(DeclarationId(2112), DeclarationId(2967)); + map.insert(DeclarationId(2113), DeclarationId(2970)); + map.insert(DeclarationId(2116), DeclarationId(2973)); + map.insert(DeclarationId(2117), DeclarationId(2976)); + map.insert(DeclarationId(2152), DeclarationId(2979)); + map.insert(DeclarationId(2153), DeclarationId(2982)); + map.insert(DeclarationId(2154), DeclarationId(2985)); + map.insert(DeclarationId(2155), DeclarationId(2988)); + map.insert(DeclarationId(2156), DeclarationId(2991)); + map.insert(DeclarationId(2179), DeclarationId(2994)); + map.insert(DeclarationId(2309), DeclarationId(2997)); + map.insert(DeclarationId(2310), DeclarationId(3000)); + map.insert(DeclarationId(2316), DeclarationId(3003)); + map.insert(DeclarationId(2317), DeclarationId(3006)); + map.insert(DeclarationId(2318), DeclarationId(3009)); + map.insert(DeclarationId(2319), DeclarationId(3012)); + map.insert(DeclarationId(2320), DeclarationId(3015)); + map.insert(DeclarationId(2321), DeclarationId(3018)); + map.insert(DeclarationId(2426), DeclarationId(3021)); + map.insert(DeclarationId(2427), DeclarationId(3024)); + map.insert(DeclarationId(2428), DeclarationId(3027)); + map.insert(DeclarationId(2431), DeclarationId(3030)); + map.insert(DeclarationId(2432), DeclarationId(3033)); + map.insert(DeclarationId(2626), DeclarationId(3036)); + map.insert(DeclarationId(2655), DeclarationId(3039)); + map.insert(DeclarationId(2661), DeclarationId(3042)); + map.insert(DeclarationId(2668), DeclarationId(3045)); + map.insert(DeclarationId(2687), DeclarationId(3048)); + map.insert(DeclarationId(2688), DeclarationId(3051)); + map.insert(DeclarationId(2696), DeclarationId(3054)); + map.insert(DeclarationId(2700), DeclarationId(3057)); + map.insert(DeclarationId(2701), DeclarationId(3060)); + map.insert(DeclarationId(2702), DeclarationId(3063)); + map.insert(DeclarationId(2703), DeclarationId(3066)); + map.insert(DeclarationId(2713), DeclarationId(3069)); + map.insert(DeclarationId(2715), DeclarationId(3072)); + map.insert(DeclarationId(2716), DeclarationId(3075)); + map.insert(DeclarationId(2717), DeclarationId(3078)); + map.insert(DeclarationId(2719), DeclarationId(3081)); + map.insert(DeclarationId(2722), DeclarationId(3084)); + map.insert(DeclarationId(2723), DeclarationId(3087)); + map.insert(DeclarationId(2730), DeclarationId(3090)); + map.insert(DeclarationId(2731), DeclarationId(3093)); + map.insert(DeclarationId(2732), DeclarationId(3096)); + map.insert(DeclarationId(2734), DeclarationId(3099)); + map.insert(DeclarationId(2735), DeclarationId(3102)); + map.insert(DeclarationId(2736), DeclarationId(3105)); + map.insert(DeclarationId(2738), DeclarationId(3108)); + map.insert(DeclarationId(2739), DeclarationId(3111)); + map.insert(DeclarationId(2740), DeclarationId(3114)); + map.insert(DeclarationId(2747), DeclarationId(3117)); + map.insert(DeclarationId(2749), DeclarationId(3120)); + map.insert(DeclarationId(2760), DeclarationId(3123)); map } } From 8c48e6d60bb7918754485c1509aec9bd8c540919 Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sun, 10 May 2026 19:04:30 +0000 Subject: [PATCH 18/18] test(v3): refresh handwritten parse corpus manifest `anthropic_schema.dag` grew the AnthropicToolResultBlock mirror; rerun `refresh_handwritten_parse_snapshot_manifest` so SG-2 parse staging ratchet matches the parse surface. Co-authored-by: Cursor --- src/v3/compiler/tests/integration/parse_corpus_manifest.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/v3/compiler/tests/integration/parse_corpus_manifest.txt b/src/v3/compiler/tests/integration/parse_corpus_manifest.txt index 62a215ec5bf..b327e80a76c 100644 --- a/src/v3/compiler/tests/integration/parse_corpus_manifest.txt +++ b/src/v3/compiler/tests/integration/parse_corpus_manifest.txt @@ -28,7 +28,7 @@ src/v3/spec/v3_l1.dag 8 2246 57294d687b4753f4 src/v3/std/algebra.dag 55 445273 bddda5746a775d69 src/v3/std/anthropic_messages.dag 5 6056 25140dcf6faa8e6b src/v3/std/anthropic_operations.dag 6 3404 a729e7662be9af5f -src/v3/std/anthropic_schema.dag 14 69934 88552db16e48111b +src/v3/std/anthropic_schema.dag 15 76797 dd2fc25a694adbc3 src/v3/std/approximate_field.dag 11 16864 ccbe4826dc31c636 src/v3/std/bin_shim.dag 4 2544 9ac96f1b3feafe47 src/v3/std/bootstrap_authority.dag 4 75864 d9c5d8fb10e8dad0